diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 0000000000..f4bedc3725
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,10 @@
+{  
+    "instanceUrl": "https://devdiv.visualstudio.com/",
+    "template": "TFSDEVDIV",
+    "projectName": "DEVDIV",
+    "areaPath": "DevDiv\\Testing Platforms\\VSTest",
+    "iterationPath": "DevDiv",
+    "notificationAliases": [ "dotnetdevexprague@microsoft.com" ],
+    "repositoryName":"vstest",
+    "codebaseName": "vstest"
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..39f9dc14c9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,597 @@
+# The default style generated by dotnet new editorconfig, with some minor changes.
+# All changes are annotated with `# not default`
+
+root = true
+
+# All files
+[*]
+# indent_size intentionally not specified in this section.
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Shell scripts
+[*.sh]
+end_of_line = lf
+[*.{cmd,bat}]
+end_of_line = crlf
+
+# Xml files
+[*.xml]
+indent_size = 2
+
+# Markdown files
+[*.md]
+indent_size = 2
+trim_trailing_whitespace = false
+
+# PowerShell scripts
+[*.ps1]
+indent_size = 4
+
+# Visual Studio XML project files
+[*.{csproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+charset = utf-8
+
+# Visual Studio and .NET related XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# YAML files
+[*.{yml,yaml}]
+indent_size = 2
+
+# Translation files
+[*.xlf]
+indent_size = 2
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Do not set 'end_of_line = crlf' otherwise the rule IDE0055: Fix formatting will trigger on Linux/MAC OS.
+
+# Indentation and spacing
+indent_size = 4
+tab_width = 4
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = true
+dotnet_sort_system_directives_first = true
+
+# License header
+file_header_template = Copyright (c) Microsoft Corporation. All rights reserved.\nLicensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false:warning    # not default, default is false:silent, helped with removing this. prefixes
+dotnet_style_qualification_for_field = false:warning    # not default, same as above
+dotnet_style_qualification_for_method = false:warning   # not default, same as above
+dotnet_style_qualification_for_property = false:warning # not default, same as above
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_object_initializer = false:suggestion # not default, default is true, avoided because null references in object initializers are hard to diagnose from logs
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+
+# IDE0074: Use compound assignment
+dotnet_style_prefer_compound_assignment = true:warning  # not default, default is true:suggestion, increased severity to ensure it is used
+dotnet_diagnostic.IDE0074.severity = warning            # not default, set in accordance to previous setting
+
+# IDE0032: Use auto property
+dotnet_style_prefer_auto_properties = true:suggestion  # not default, default is true:suggestion, increased severity to ensure it is used
+dotnet_diagnostic.IDE0032.severity = suggestion        # not default, set in accordance to previous setting
+
+# Field preferences
+dotnet_style_readonly_field = true:warning
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all:warning
+# IDE0060: Remove unused parameter
+dotnet_diagnostic.IDE0060.severity = warning
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# IDE0090: Use 'new(...)'
+dotnet_diagnostic.IDE0090.severity = warning # not default, increased severity to go with simpler declarations
+
+# IDE0005: Remove unnecessary import
+dotnet_diagnostic.IDE0005.severity = warning # not default, increased severity to ensure it is used
+
+# 'using' directive preferences
+# Keep this in sync with the related C# rule: csharp_using_directive_placement
+dotnet_diagnostic.IDE0065.severity = warning
+
+# Use simple using statements
+# Keep this in sync with th related C# rule: csharp_prefer_simple_using_statement
+dotnet_diagnostic.IDE0063.severity = warning
+
+# CA2208: Instantiate argument exceptions correctly
+dotnet_diagnostic.CA2208.severity = warning # not default, increased severity to ensure it is always applied
+
+# CA2241: Provide correct arguments to formatting methods
+dotnet_diagnostic.CA2241.severity = warning # not default, increased severity to ensure it is always applied
+
+# IDE0053: Use expression body for lambda expressions
+# Keep this in sync with csharp_style_expression_bodied_lambdas
+dotnet_diagnostic.IDE0053.severity = warning # not default, increased severity to ensure it is applied
+
+# CA2016: Forward the 'CancellationToken' parameter to methods
+dotnet_diagnostic.CA2016.severity = warning # not default, increased severity to ensure it is applied
+
+# IDE0059: Remove unnecessary value assignment
+dotnet_diagnostic.IDE0059.severity=warning # not default, increased severity to ensure it is applied
+
+# CA2245: Do not assign a property to itself
+dotnet_diagnostic.CA2245.severity=warning # not default, increased severity to ensure it is applied
+
+# IDE0077: Avoid legacy format target in global 'SuppressMessageAttribute'
+dotnet_diagnostic.IDE0077.severity=warning # not default, increased severity to ensure it is applied
+
+# IDE0076: Remove invalid global 'SuppressMessageAttribute'
+dotnet_diagnostic.IDE0076.severity=warning # not default, increased severity to ensure it is applied
+
+# IDE0043: Invalid string format
+dotnet_diagnostic.IDE0043.severity=warning # not default, increased severity to ensure it is applied
+
+# CA1805: Do not initialize unnecessarily
+dotnet_diagnostic.CA1805.severity=warning # not default, increased severity to ensure it is applied
+
+# CA1507: Use nameof in place of string
+dotnet_diagnostic.CA1507.severity=warning # not default, increased severity to ensure it is applied
+
+# CA2215: Dispose methods should call base class dispose
+dotnet_diagnostic.CA2215.severity=warning # not default, increased severity to ensure it is applied
+
+# IDE0019: Use pattern matching
+# Keep this in sync with csharp_style_pattern_matching_over_as_with_null_check
+dotnet_diagnostic.IDE0019.severity = warning # not default, increased severity to ensure it is applied
+
+# IDE0020:
+# Keep this in sync with csharp_style_pattern_matching_over_is_with_cast_check
+dotnet_diagnostic.IDE0020.severity = warning # not default, increased severity to ensure it is applied
+
+# IDE0078: Use pattern matching
+# Keep this in sync with csharp_style_prefer_pattern_matching
+dotnet_diagnostic.IDE0078.severity = warning # not default, increased severity to ensure it is applied
+
+# IDE0083: Use pattern matching (not operator)
+# Keep this in sync with csharp_style_prefer_not_pattern
+dotnet_diagnostic.IDE0083.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1836: Prefer IsEmpty over Count
+dotnet_diagnostic.CA1836.severity = warning # not default, increased severity to ensure it is applied
+
+# CA2211: Non-constant fields should not be visible
+dotnet_diagnostic.CA2211.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1806: Do not ignore method results
+dotnet_diagnostic.CA1806.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1834: Consider using 'StringBuilder.Append(char)' when applicable
+dotnet_diagnostic.CA1834.severity = warning # not default, increased severity to ensure it is always applied
+
+# IDE0190: Null check can be simplified
+# Keep this in sync with the related C# rule: csharp_style_prefer_parameter_null_checking
+dotnet_diagnostic.IDE0190.severity = silent # not default, disabled as feature is no longer supported
+
+# CA1840: Use 'Environment.CurrentManagedThreadId'
+dotnet_diagnostic.CA1840.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1041: Provide ObsoleteAttribute message
+dotnet_diagnostic.CA1041.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1837: Use Environment.ProcessId instead of Process.GetCurrentProcess().Id
+dotnet_diagnostic.CA1837.severity = warning # not default, increased severity to ensure it is applied
+
+# RS0041: Public members should not use oblivious types
+# TODO: Move resx as internal OR use new resx generator (nullable aware) when available
+dotnet_diagnostic.RS0041.severity = none # not default, decreased severity because of public resources (resx) not being nullable aware
+
+# CA1824: Mark assemblies with NeutralResourcesLanguageAttribute
+dotnet_diagnostic.CA1824.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1001: Types that own disposable fields should be disposable
+dotnet_diagnostic.CA1001.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1000: Do not declare static members on generic types
+dotnet_diagnostic.CA1000.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1051.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1010: Collections should implement generic interface
+dotnet_diagnostic.CA1010.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1047: Do not declare protected members in sealed types
+dotnet_diagnostic.CA1047.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1050: Declare types in namespaces
+dotnet_diagnostic.CA1050.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1061: Do not hide base class methods
+dotnet_diagnostic.CA1061.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1069: Enums should not have duplicate values
+dotnet_diagnostic.CA1069.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1070: Do not declare event fields as virtual
+dotnet_diagnostic.CA1070.severity = warning # not default, increased severity to ensure it is applied
+
+# IDE0064: Make struct fields writable
+dotnet_diagnostic.IDE0064.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1304: Specify CultureInfo
+dotnet_diagnostic.CA1304.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1305: Specify IFormatProvider
+dotnet_diagnostic.CA1305.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1816: Dispose methods should call SuppressFinalize
+dotnet_diagnostic.CA1816.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1018: Mark attributes with AttributeUsageAttribute
+dotnet_diagnostic.CA1018.severity = warning # not default, increased severity to ensure it is applied
+
+# CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1051.severity = warning # not default, increased severity to ensure it is applied
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = false:silent               # not default, turned off for now
+csharp_style_var_for_built_in_types = false:silent      # not default, turned off for now
+csharp_style_var_when_type_is_apparent = false:silent   # not default, turned off for now
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+# Keep this in sync with IDE0053
+csharp_style_expression_bodied_lambdas = true:warning # not default, increased severity to ensure it is applied
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+
+# Pattern matching preferences
+# Keep this in sync with IDE0019
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+# Keep this in sync with IDE0020 and IDE0038
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+# Keep this in sync with IDE0083
+csharp_style_prefer_not_pattern = true:warning
+# Keep this in sync with IDE0078
+csharp_style_prefer_pattern_matching = true:warning
+csharp_style_prefer_switch_expression = true:warning
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Modifier preferences
+csharp_prefer_static_local_function = true:warning
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
+
+# Code-block preferences
+csharp_prefer_braces = true:silent
+# Keep this in sync with the related .NET rule: IDE0063
+csharp_prefer_simple_using_statement = true:warning # not default, default is true:suggestion, increased severity to ensure it is used
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = false:suggestion # not default, default is true, avoided because we use anonymous functions in multiple places and it does not make the code clearer
+csharp_style_prefer_index_operator = false:warning # not default, default is true, disabled because Index operator is not supported in all the TFMs we support. (supported on .Net Core 3.0+)
+csharp_style_prefer_range_operator = false:warning # not default, default is true, disabled because Range operator is not supported in all the TFMs we support. (supported on .Net Core 3.0+)
+csharp_style_throw_expression = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+# 'using' directive preferences
+# Keep this in sync with the related .NET rule: IDE0065
+csharp_using_directive_placement = outside_namespace:warning
+
+# IDE0190: Null check can be simplified
+# Keep this in sync with the related .NET rule: IDE0190
+csharp_style_prefer_parameter_null_checking = false # not default, disabled as no longer supported
+
+#### .NET Formatting Rules ####
+
+# IDE0055: Fix formatting - Set the severity of all .NET and C# formatting rules (https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules)
+dotnet_diagnostic.IDE0055.severity = warning # ensure all formatting rules are enforced on build
+
+# IDE0057: Use range operator
+dotnet_diagnostic.IDE0057.severity = none # Range operator is not supported in some TFMs.
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### .NET Naming styles ####
+
+# not default, we have a lot of multiplatform code in compiler directives that defines methods, but keeps the bodies empty
+# IDE0052: Remove unused private members
+dotnet_diagnostic.IDE0051.severity = silent
+
+# not default, we have a lot of multiplatform code in compiler directives that defines methods, but keeps the bodies empty
+# IDE0052: Remove unread private members
+dotnet_diagnostic.IDE0052.severity = silent
+
+# IDE1006: Naming Styles
+dotnet_diagnostic.IDE1006.severity = warning
+dotnet_diagnostic.IDE0073.severity = warning
+
+# Naming rules
+
+dotnet_style_namespace_match_folder = true:suggestion
+
+dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.symbols = types_and_namespaces
+dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.interfaces_should_be_ipascalcase.severity = suggestion
+dotnet_naming_rule.interfaces_should_be_ipascalcase.symbols = interfaces
+dotnet_naming_rule.interfaces_should_be_ipascalcase.style = ipascalcase
+
+dotnet_naming_rule.type_parameters_should_be_tpascalcase.severity = suggestion
+dotnet_naming_rule.type_parameters_should_be_tpascalcase.symbols = type_parameters
+dotnet_naming_rule.type_parameters_should_be_tpascalcase.style = tpascalcase
+
+dotnet_naming_rule.methods_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.methods_should_be_pascalcase.symbols = methods
+dotnet_naming_rule.methods_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.properties_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.properties_should_be_pascalcase.symbols = properties
+dotnet_naming_rule.properties_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.events_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.events_should_be_pascalcase.symbols = events
+dotnet_naming_rule.events_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.local_variables_should_be_camelcase.severity = suggestion
+dotnet_naming_rule.local_variables_should_be_camelcase.symbols = local_variables
+dotnet_naming_rule.local_variables_should_be_camelcase.style = camelcase
+
+dotnet_naming_rule.local_constants_should_be_camelcase.severity = suggestion
+dotnet_naming_rule.local_constants_should_be_camelcase.symbols = local_constants
+dotnet_naming_rule.local_constants_should_be_camelcase.style = camelcase
+
+dotnet_naming_rule.parameters_should_be_camelcase.severity = suggestion
+dotnet_naming_rule.parameters_should_be_camelcase.symbols = parameters
+dotnet_naming_rule.parameters_should_be_camelcase.style = camelcase
+
+dotnet_naming_rule.public_fields_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.public_fields_should_be_pascalcase.symbols = public_fields
+dotnet_naming_rule.public_fields_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.private_fields_should_be__camelcase.severity = suggestion
+dotnet_naming_rule.private_fields_should_be__camelcase.symbols = private_fields
+dotnet_naming_rule.private_fields_should_be__camelcase.style = _camelcase
+
+dotnet_naming_rule.private_static_fields_should_be_s_camelcase.severity = suggestion
+dotnet_naming_rule.private_static_fields_should_be_s_camelcase.symbols = private_static_fields
+dotnet_naming_rule.private_static_fields_should_be_s_camelcase.style = s_camelcase
+
+dotnet_naming_rule.public_constant_fields_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.public_constant_fields_should_be_pascalcase.symbols = public_constant_fields
+dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.private_constant_fields_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.private_constant_fields_should_be_pascalcase.symbols = private_constant_fields
+dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.symbols = public_static_readonly_fields
+dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.symbols = private_static_readonly_fields
+dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.enums_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.enums_should_be_pascalcase.symbols = enums
+dotnet_naming_rule.enums_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.local_functions_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.local_functions_should_be_pascalcase.symbols = local_functions
+dotnet_naming_rule.local_functions_should_be_pascalcase.style = pascalcase
+
+dotnet_naming_rule.non_field_members_should_be_pascalcase.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascalcase.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascalcase.style = pascalcase
+
+# Symbol specifications
+
+dotnet_naming_symbols.interfaces.applicable_kinds = interface
+dotnet_naming_symbols.interfaces.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interfaces.required_modifiers =
+
+dotnet_naming_symbols.enums.applicable_kinds = enum
+dotnet_naming_symbols.enums.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.enums.required_modifiers =
+
+dotnet_naming_symbols.events.applicable_kinds = event
+dotnet_naming_symbols.events.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.events.required_modifiers =
+
+dotnet_naming_symbols.methods.applicable_kinds = method
+dotnet_naming_symbols.methods.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.methods.required_modifiers =
+
+dotnet_naming_symbols.properties.applicable_kinds = property
+dotnet_naming_symbols.properties.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.properties.required_modifiers =
+
+dotnet_naming_symbols.public_fields.applicable_kinds = field
+dotnet_naming_symbols.public_fields.applicable_accessibilities = public, internal
+dotnet_naming_symbols.public_fields.required_modifiers =
+
+dotnet_naming_symbols.private_fields.applicable_kinds = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.private_fields.required_modifiers =
+
+dotnet_naming_symbols.private_static_fields.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.private_static_fields.required_modifiers = static
+
+dotnet_naming_symbols.types_and_namespaces.applicable_kinds = namespace, class, struct, interface, enum
+dotnet_naming_symbols.types_and_namespaces.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types_and_namespaces.required_modifiers =
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers =
+
+dotnet_naming_symbols.type_parameters.applicable_kinds = namespace
+dotnet_naming_symbols.type_parameters.applicable_accessibilities = *
+dotnet_naming_symbols.type_parameters.required_modifiers =
+
+dotnet_naming_symbols.private_constant_fields.applicable_kinds = field
+dotnet_naming_symbols.private_constant_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.private_constant_fields.required_modifiers = const
+
+dotnet_naming_symbols.local_variables.applicable_kinds = local
+dotnet_naming_symbols.local_variables.applicable_accessibilities = local
+dotnet_naming_symbols.local_variables.required_modifiers =
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.applicable_accessibilities = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+
+dotnet_naming_symbols.parameters.applicable_kinds = parameter
+dotnet_naming_symbols.parameters.applicable_accessibilities = *
+dotnet_naming_symbols.parameters.required_modifiers =
+
+dotnet_naming_symbols.public_constant_fields.applicable_kinds = field
+dotnet_naming_symbols.public_constant_fields.applicable_accessibilities = public, internal
+dotnet_naming_symbols.public_constant_fields.required_modifiers = const
+
+dotnet_naming_symbols.public_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.public_static_readonly_fields.applicable_accessibilities = public, internal
+dotnet_naming_symbols.public_static_readonly_fields.required_modifiers = readonly, static
+
+dotnet_naming_symbols.private_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.private_static_readonly_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = readonly, static
+
+dotnet_naming_symbols.local_functions.applicable_kinds = local_function
+dotnet_naming_symbols.local_functions.applicable_accessibilities = *
+dotnet_naming_symbols.local_functions.required_modifiers =
+
+# Naming styles
+
+dotnet_naming_style.pascalcase.required_prefix =
+dotnet_naming_style.pascalcase.required_suffix =
+dotnet_naming_style.pascalcase.word_separator =
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+
+dotnet_naming_style.ipascalcase.required_prefix = I
+dotnet_naming_style.ipascalcase.required_suffix =
+dotnet_naming_style.ipascalcase.word_separator =
+dotnet_naming_style.ipascalcase.capitalization = pascal_case
+
+dotnet_naming_style.tpascalcase.required_prefix = T
+dotnet_naming_style.tpascalcase.required_suffix =
+dotnet_naming_style.tpascalcase.word_separator =
+dotnet_naming_style.tpascalcase.capitalization = pascal_case
+
+dotnet_naming_style._camelcase.required_prefix = _
+dotnet_naming_style._camelcase.required_suffix =
+dotnet_naming_style._camelcase.word_separator =
+dotnet_naming_style._camelcase.capitalization = camel_case
+
+dotnet_naming_style.camelcase.required_prefix =
+dotnet_naming_style.camelcase.required_suffix =
+dotnet_naming_style.camelcase.word_separator =
+dotnet_naming_style.camelcase.capitalization = camel_case
+
+dotnet_naming_style.s_camelcase.required_prefix = s_
+dotnet_naming_style.s_camelcase.required_suffix =
+dotnet_naming_style.s_camelcase.word_separator =
+dotnet_naming_style.s_camelcase.capitalization = camel_case
+
+#### C# Naming styles ####
+
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+
+# Naming rules
+
+csharp_style_namespace_declarations = file_scoped:warning # not default, default is block_scoped:silent, changed to follow modern preferences
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000..3fc0cc7ab5
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,8 @@
+# Apply modern code styles (#3264)
+065f4d042e2ac8f1bd28deeabca38adf2c14b52a
+
+# Reformat projects and script files (#3290)
+5e425f80cb9b1de3be823b83c718c9a057df857a
+
+# Run dotnet format whitespace (#3307)
+cf2bd925e3e11a76bcbd965f5d337b2c8f4dbab1
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 219bd3bdee..7b7128ba70 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,45 @@
+---
+name: Issue
+about: Open a generic issue
+labels: [need-triage]
+---
+
 ## Description
-> **IMPORTANT**: if the defect is reproduced only in a workflow from within the Visual Studio IDE then do not report the issue here - instead, please report it using Visual Studio's "Send Feedback" option that can be accessed from the Help menu OR using this link https://developercommunity.visualstudio.com.
->
-> For a defect reproducable from the vstest command line, describe the issue you've observed.
+
+<!-- 
+Please describe the issue in as much detail as possible here. 
+-->
 
 ## Steps to reproduce
-> What steps can reproduce the defect?
-> Please share the setup, commandline for vstest.console, sample project, target
-> framework etc.
+
+<!-- 
+What steps can reproduce the defect?
+Please share the setup, command line for `vstest.console`, sample project, target
+framework etc.
+-->
 
 ## Expected behavior
-> Share the expected output
+
+<!--
+What is the expected behavior?
+-->
 
 ## Actual behavior
-> What is the behavior observed?
+
+<!--
+What is the observed behavior?
+-->
 
 ## Diagnostic logs
-> Please share test platform diagnostics logs. Instructions to collect logs are [here](https://github.com/Microsoft/vstest-docs/blob/main/docs/diagnose.md#test-platform-diagnostics).  
-> The logs may contain test assembly paths, kindly review and mask those before sharing.
+
+<!--
+Please share test platform diagnostics logs. Instructions to collect logs are [here](https://github.com/Microsoft/vstest/blob/main/docs/diagnose.md#test-platform-diagnostics).  
+The logs may contain test assembly paths, kindly review and mask those before sharing.
+-->
 
 ## Environment
-> Please share additional details about the test environment.
-> Operating system, Build version of vstest.console
+
+<!--
+Please share additional details about the test environment.
+Operating system version, `vstest.console` build version, etc.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 23ffcf0e67..79669f9c98 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,10 @@
 ## Description
+
 Please add a meaningful description for this change.
 Ensure the PR has required unit tests.
 
 ## Related issue
+
 Kindly link any related issues. E.g. Fixes #xyz.
+
+- [ ] I have ensured that there is a previously discussed and approved issue.
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000..19be10e2fa
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,30 @@
+This is a .NET based repository that contains the VSTest test platform. Please follow these guidelines when contributing:
+
+## Code Standards
+
+You MUST follow all code-formatting and naming conventions defined in [`.editorconfig`](../.editorconfig).
+
+In addition to the rules enforced by `.editorconfig`, you SHOULD:
+
+- Favor style and conventions that are consistent with the existing codebase.
+- Prefer file-scoped namespace declarations and single-line using directives.
+- Ensure that the final return statement of a method is on its own line.
+- Use pattern matching and switch expressions wherever possible.
+- Use `nameof` instead of string literals when referring to member names.
+- Always use `is null` or `is not null` instead of `== null` or `!= null`.
+- Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
+- Prefer `?.` if applicable (e.g. `scope?.Dispose()`).
+- Use `ObjectDisposedException.ThrowIf` where applicable.
+- Respect StyleCop.Analyzers rules, in particular:
+  - SA1028: Code must not contain trailing whitespace
+  - SA1316: Tuple element names should use correct casing
+  - SA1518: File is required to end with a single newline character
+
+You MUST minimize adding public API surface area but any newly added public API MUST be declared in the related `PublicAPI.Unshipped.txt` file.
+
+## Localization Guidelines
+
+Anytime you add a new localization resource, you MUST:
+- Add a corresponding entry in the localization resource file.
+- Add an entry in all `*.xlf` files related to the modified `.resx` file.
+- Do not modify existing entries in '*.xlf' files unless you are also modifying the corresponding `.resx` file.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..a1ef8b6a84
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "dotnet-sdk"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    ignore:
+      - dependency-name: "*"
+        update-types: 
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
diff --git a/.github/policies/BreakingChangeManagement.yml b/.github/policies/BreakingChangeManagement.yml
new file mode 100644
index 0000000000..1b32be5c25
--- /dev/null
+++ b/.github/policies/BreakingChangeManagement.yml
@@ -0,0 +1,43 @@
+id: 
+name: GitOps.BreakingChangeManagement
+description: GitOps.BreakingChangeManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addReply:
+          reply: >-
+            Refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md#required-process-for-all-net-sdk-breaking-changes)
+      description: Add breaking change doc instructions to issue
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
+
+
+            When you commit this breaking change:
+
+
+            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+            2. [ ] Ask a committer to mail the `.NET SDK Breaking Change Notification` email list.
+
+
+            You can refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md)
+      description: Add breaking change instructions to PR.
+onFailure: 
+onSuccess: 
diff --git a/.github/policies/LabelManagement.IssueClosed.yml b/.github/policies/LabelManagement.IssueClosed.yml
new file mode 100644
index 0000000000..e4865dc4f3
--- /dev/null
+++ b/.github/policies/LabelManagement.IssueClosed.yml
@@ -0,0 +1,36 @@
+id:
+name: LabelManagement.IssueClosed
+description: Handlers when an issue gets closed
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: Remove labels when an issue is closed
+        if:
+          - payloadType: Issues
+          - isAction:
+              action: Closed
+        then:
+          - removeLabel:
+              label: 'Needs: Triage :mag:'
+          - removeLabel:
+              label: 'Needs: Attention :wave:'
+          - removeLabel:
+              label: 'Needs: Author Feedback'
+          - removeLabel:
+              label: Help-Wanted
+      - description: Remove labels when a pull request is closed
+        if:
+          - payloadType: Pull_Request
+          - isAction:
+              action: Closed
+        then:
+          - removeLabel:
+              label: 'Needs: Attention :wave:'
+          - removeLabel:
+              label: 'Needs: Author Feedback'
+onFailure:
+onSuccess:
diff --git a/.github/policies/LabelManagement.IssueOpened.yml b/.github/policies/LabelManagement.IssueOpened.yml
new file mode 100644
index 0000000000..02b4d0bf22
--- /dev/null
+++ b/.github/policies/LabelManagement.IssueOpened.yml
@@ -0,0 +1,27 @@
+id:
+name: LabelManagement.IssueOpened
+description: Handlers when an issue is first opened
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: Add needs triage to new issues
+        if:
+          - payloadType: Issues
+          - isAction:
+              action: Opened
+          - and:
+            - not:
+                activitySenderHasPermission:
+                  permission: Admin
+            - not:
+                activitySenderHasPermission:
+                  permission: Write
+        then:
+          - addLabel:
+              label: 'Needs: Triage :mag:'
+onFailure:
+onSuccess:
diff --git a/.github/policies/LabelManagement.IssueUpdated.yml b/.github/policies/LabelManagement.IssueUpdated.yml
new file mode 100644
index 0000000000..fee7f3e06e
--- /dev/null
+++ b/.github/policies/LabelManagement.IssueUpdated.yml
@@ -0,0 +1,144 @@
+id:
+name: LabelManagement.IssueUpdated
+description: Handlers when an issue is updated but not closed
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: >-
+          Remove "State: No Recent Activity" when a pull request or issue is updated
+        if:
+          - or:
+              - payloadType: Pull_Request
+              - payloadType: Pull_Request_Review
+              - payloadType: Pull_Request_Review_Comment
+              - payloadType: Issue_Comment
+              - payloadType: Issues
+          - not:
+              isAction:
+                action: Closed
+          - hasLabel:
+              label: "State: No Recent Activity"
+        then:
+          - removeLabel:
+              label: "State: No Recent Activity"
+        # The policy service should not trigger itself here, or else the label would be removed immediately after being added
+        triggerOnOwnActions: False
+      - description: Clean email replies on every comment
+        if:
+          - payloadType: Issue_Comment
+        then:
+          - cleanEmailReply
+      - description: Remove "Help-Wanted" label when an issue goes into PR
+        if:
+          - payloadType: Issues
+          - labelAdded:
+              label: In-PR
+          - hasLabel:
+              label: Help-Wanted
+        then:
+          - removeLabel:
+              label: Help-Wanted
+      - description: >-
+          If an author responds to an issue which needs author feedback
+          * Remove the "Needs: Author Feedback" Label
+          * Add the "Needs: Attention :wave:" Label
+        if:
+          - or:
+              - payloadType: Pull_Request_Review
+              - payloadType: Pull_Request_Review_Comment
+              - payloadType: Issue_Comment
+          - isActivitySender:
+              issueAuthor: True
+          - hasLabel:
+              label: "Needs: Author Feedback"
+          - not:
+              isAction:
+                action: Synchronize
+        then:
+          - removeLabel:
+              label: "Needs: Author Feedback"
+          - addLabel:
+              label: "Needs: Attention :wave:"
+      - description: >-
+          If team members respond to an issue which needs attention
+          * Remove the "Needs: Attention :wave:" Label
+        if:
+          - or:
+              - payloadType: Pull_Request_Review
+              - payloadType: Pull_Request_Review_Comment
+              - payloadType: Issue_Comment
+          - isActivitySender:
+              issueAuthor: True
+          - hasLabel:
+              label: "Needs: Attention :wave:"
+          - not:
+              isAction:
+                action: Synchronize
+          - or:
+            - activitySenderHasAssociation:
+                association: Member
+            - activitySenderHasAssociation:
+                association: Owner
+            - activitySenderHasAssociation:
+                association: Collaborator
+        then:
+          - removeLabel:
+              label: "Needs: Attention :wave:"
+      - description: >-
+          If team members respond to an issue which needs triage
+          * Remove the "Needs: Triage :mag:" Label
+        if:
+          - or:
+              - payloadType: Pull_Request_Review
+              - payloadType: Pull_Request_Review_Comment
+              - payloadType: Issue_Comment
+          - isActivitySender:
+              issueAuthor: True
+          - hasLabel:
+              label: "Needs: Triage :mag:"
+          - not:
+              isAction:
+                action: Synchronize
+          - or:
+            - activitySenderHasAssociation:
+                association: Member
+            - activitySenderHasAssociation:
+                association: Owner
+            - activitySenderHasAssociation:
+                association: Collaborator
+        then:
+          - removeLabel:
+              label: "Needs: Triage :mag:"
+      - description: >-
+          When changes are requested on a pull request
+          * Disable automerge
+          * Assign to the author
+          * Label with "Needs: Author Feedback"
+        if:
+          - payloadType: Pull_Request_Review
+          - isAction:
+              action: Submitted
+          - isReviewState:
+              reviewState: Changes_requested
+        then:
+          - disableAutoMerge
+          - assignTo:
+              author: True
+          - addLabel:
+              label: "Needs: Author Feedback"
+      - description: Sync labels from issues on all pull request events
+        if:
+          - payloadType: Pull_Request
+        then:
+          - labelSync:
+              pattern: "Area:"
+          - labelSync:
+              pattern: "Type:"
+          - inPrLabel:
+              label: In-PR
+onFailure:
+onSuccess:
diff --git a/.github/policies/ScheduledSearch.AutoClose.yml b/.github/policies/ScheduledSearch.AutoClose.yml
new file mode 100644
index 0000000000..df645b7c6e
--- /dev/null
+++ b/.github/policies/ScheduledSearch.AutoClose.yml
@@ -0,0 +1,102 @@
+id: ScheduledSearch.AutoClose
+name: GitOps.PullRequestIssueManagement
+description: Housekeeping of issues that should be closed
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+      - description: >-
+          Search for PR where -
+          * Pull Request is Open
+          * Pull request has the label "State: No Recent Activity"
+          * Pull request has the label "Needs: Author Feedback"
+          * Has not had activity in the last 7 days
+
+          Then -
+          * Close the PR
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isPullRequest
+          - isOpen
+          - hasLabel:
+              label: "State: No Recent Activity"
+          - hasLabel:
+              label: "Needs: Author Feedback"
+          - noActivitySince:
+              days: 7
+        actions:
+          - closeIssue
+      - description: >-
+          Search for Issues where -
+          * Issue is Open
+          * Issue has the label "State: No Recent Activity"
+          * Issue has the label "Needs: Author Feedback"
+          * Has not had activity in the last 7 days
+
+          Then -
+          * Close the Issue
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isIssue
+          - isOpen
+          - hasLabel:
+              label: "State: No Recent Activity"
+          - hasLabel:
+              label: "Needs: Author Feedback"
+          - noActivitySince:
+              days: 7
+        actions:
+          - closeIssue
+      - description: >-
+          Search for Issues where -
+          * Issue is Open
+          * Issue has the label "State: Won't Fix"
+          * Has not had activity in the last 1 day
+
+          Then -
+          * Close the Issue
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isIssue
+          - isOpen
+          - hasLabel:
+              label: "State: Won't Fix"
+          - noActivitySince:
+              days: 1
+        actions:
+          - addReply:
+              reply: This issue has been marked as won't fix and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
+          - closeIssue
+      - description: >-
+          Search for Issues where -
+          * Issue is Open
+          * Issue has the label "Resolution: Duplicate"
+          * Has not had activity in the last 1 day
+
+          Then -
+          * Close the Issue
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isIssue
+          - isOpen
+          - hasLabel:
+              label: "Resolution: Duplicate"
+          - noActivitySince:
+              days: 1
+        actions:
+          - addReply:
+              reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
+          - closeIssue
+onFailure:
+onSuccess:
\ No newline at end of file
diff --git a/.github/policies/ScheduledSearch.MarkNoRecentActivity.yml b/.github/policies/ScheduledSearch.MarkNoRecentActivity.yml
new file mode 100644
index 0000000000..f4fd2da1a8
--- /dev/null
+++ b/.github/policies/ScheduledSearch.MarkNoRecentActivity.yml
@@ -0,0 +1,72 @@
+id: ScheduledSearch.MarkNoRecentActivity
+name: GitOps.PullRequestIssueManagement
+description: Mark issues and pull requests with no recent activity
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+      - description: >-
+          Search for PR where -
+          * Pull Request is Open
+          * Pull request does not have the label "State: No Recent Activity"
+          * Pull request has the label "Needs: Author Feedback"
+          * Has not had activity in the last 7 days
+
+          Then -
+          * Add "State: No Recent Activity" label
+          * Warn user about pending closure
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isPullRequest
+          - isOpen
+          - isNotLabeledWith:
+              label: "State: No Recent Activity"
+          - hasLabel:
+              label: "Needs: Author Feedback"
+          - noActivitySince:
+              days: 7
+        actions:
+          - addLabel:
+              label: "State: No Recent Activity"
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+                This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
+      - description: >-
+          Search for Issues where -
+          * Issue is Open
+          * Issue has the label "Needs: Author Feedback"
+          * Issue does not have the label "State: No Recent Activity"
+          * Has not had activity in the last 7 days
+
+          Then -
+          * Add "State: No Recent Activity" label
+          * Warn user about pending closure
+        frequencies:
+          - hourly:
+              hour: 6
+        filters:
+          - isIssue
+          - isOpen
+          - hasLabel:
+              label: "Needs: Author Feedback"
+          - isNotLabeledWith:
+              label: "State: No Recent Activity"
+          - noActivitySince:
+              days: 7
+        actions:
+          - addLabel:
+              label: "State: No Recent Activity"
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+                This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
+onFailure:
+onSuccess:
\ No newline at end of file
diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml
index 1cad1d4c1a..e89a936ff5 100644
--- a/.github/workflows/AzureDevOps.yml
+++ b/.github/workflows/AzureDevOps.yml
@@ -1,24 +1,61 @@
-name: Sync issue to Azure DevOps work item
+name: Sync GitHub Issues to Azure DevOps Work Items
 
 on:
   issues:
     types:
-      [labeled] #, opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned
+      - labeled
+  issue_comment:
+    types:
+      - created
+      - edited
+
+#concurrency:
+#  group: issue-${{ github.event.issue.number }}
+#  cancel-in-progress: false
+
+#permissions:
+#  id-token: write
+#  issues: write
+#  contents: read
 
 jobs:
   updateAzDO:
     if: github.event.label.name == 'sprint'
     runs-on: ubuntu-latest
+    environment: ado
+
     steps:
-      - uses: pavelhorak/github-actions-issue-to-work-item@master
+      # Step 1: Login to Azure using federated identity
+     # - name: Login to Azure
+     #   uses: azure/login@v2
+     #   with:
+     #     client-id: ${{ secrets.ENTRA_APP_CLIENT_ID }}
+     #     tenant-id: ${{ secrets.ENTRA_APP_TENANT_ID }}
+     #     subscription-id: ${{ secrets.ADO_SUBSCRIPTION_ID }}
+          # environment: azurecloud
+          # allow-no-subscriptions: true
+          # enable-debug-logs: true
+
+      # Step 2: Obtain Azure DevOps token
+     # - name: Get Azure DevOps token
+     #   id: get_ado_token
+     #   run: |
+          # Fetch Azure DevOps token using resource ID 499b84ac-1321-427f-aa17-267ca6975798
+     #     ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)
+     #     echo "ado_token=${ado_token}" >> $GITHUB_ENV
+
+      # Step 3: Sync GitHub issue to Azure DevOps work item
+      - name: Sync issue to Azure DevOps
+        uses: pavelhorak/github-actions-issue-to-work-item@main
         env:
+   #       ado_token: "${{ env.ado_token }}"
           ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
           github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
           ado_organization: "${{ secrets.ADO_ORGANIZATION }}"
           ado_project: "${{ secrets.ADO_PROJECT }}"
           ado_area_path: "${{ secrets.ADO_AREA_PATH }}"
-          ado_iteration_path: "${{ secrets.ADO_ITERATION_PATH }}" # this doesn't work: "@CurrentIteration('[DevDiv]\\.NET DevExp Prague')"
-          ado_wit: "User Story"
+          ado_iteration_path: "${{ secrets.ADO_ITERATION_PATH }}"
+          ado_wit: "User Story" # Work Item Type
           ado_new_state: "Committed"
           ado_active_state: "In Progress"
           ado_close_state: "Completed"
diff --git a/.github/workflows/enable-auto-merge.yml b/.github/workflows/enable-auto-merge.yml
new file mode 100644
index 0000000000..37cdec677f
--- /dev/null
+++ b/.github/workflows/enable-auto-merge.yml
@@ -0,0 +1,28 @@
+name: Enable auto merge
+on:
+  pull_request_target:
+    types: [opened, ready_for_review]
+permissions:
+  contents: write
+jobs:
+  add_milestone:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'microsoft/vstest' && github.event.pull_request.user.login == 'dotnet-maestro' && (startsWith(github.event.pull_request.title, '[main] Source code updates from dotnet/') || startsWith(github.event.pull_request.title, '[main] Update dependencies from dotnet/') || startsWith(github.event.pull_request.title, '[main] Update dependencies from devdiv/')) }}
+    steps:
+    - name: Enable pull request auto-merge
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PULL_REQUEST_ID: ${{ github.event.pull_request.node_id }}
+      run: |
+        gh api graphql -f query='
+          mutation($pull: ID!) {
+            enablePullRequestAutoMerge(input: {pullRequestId: $pull}) {
+              pullRequest {
+                id
+                number
+                autoMergeRequest {
+                  mergeMethod
+                }
+              }
+            }
+          }' -f pull=$PULL_REQUEST_ID
diff --git a/.gitignore b/.gitignore
index c8318272fa..9be479bc6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,14 +104,16 @@ ehthumbs.db
 # ===========================
 # Custom ignores
 # ===========================
-packages
-artifacts
-[tT]ools
+/packages/
+/artifacts/
+/[tT]ools/
 
 *.dmp
 *.nupkg
 *.zip
-src/package/sign/sign.nuget.targets
+/src/package/sign/sign.nuget.targets
+
+test/GeneratedTestAssets/
 
 # ===========================
 # Localized resx files
@@ -139,3 +141,9 @@ src/package/sign/sign.nuget.targets
 # diag log files
 # ===========================
 logs/
+
+.fake/
+.ionide/
+
+.idea/
+.tools/
diff --git a/CODEOWNERS b/CODEOWNERS
index a8721a9027..bf0b2d225a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,14 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners
 
-PublicAPI.Shipped.txt @nohwnd
-PublicAPI.Unshipped.txt @nohwnd
\ No newline at end of file
+PublicAPI.Shipped.txt @nohwnd @MarcoRossignoli
+PublicAPI.Unshipped.txt @nohwnd @MarcoRossignoli
+
+# Adding/removing telemetry or doing any kind of changes to the telemetry data constants is
+# something that should be treated with care and we should be transparent about it. It also
+# requires making sure all telemetry collection systems in place will continue to function well.
+TelemetryDataConstants.cs @cvpoienaru @nohwnd
+
+# Changes here might break our contracts with other adapters, and possibly
+# Visual Studio.
+/src/Microsoft.TestPlatform.AdapterUtilities/ @nohwnd @Evangelink
+/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ @nohwnd @Evangelink
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 076378c7f4..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,14 +0,0 @@
-### Contributing
-Welcome, and thank you for your interest in contributing. There are many ways to contribute:
-- [Submit issues](https://github.com/Microsoft/vstest/issues) and help verify fixes as they are checked in.
-- Review the [source code changes](https://github.com/Microsoft/vstest/pulls).
-- [Contribute features and fixes](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md).
-- Contribute to the [documentation](https://github.com/Microsoft/vstest-docs).
-
-### Building
-If you want to understand how **vstest** works or want to debug an issue, you'll want to get the source, build it, and run the tool locally. **vstest** can be built from within Visual Studio or from the CLI.
-- [Building with Visual Studio](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md#building-with-visual-studio)
-- [Building with CLI, CI, Editors](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md#building-with-cli-ci-editors)
-
-### Thank You!
-Your contributions to open source, large or small, make projects like this possible. Thank you for taking the time to contribute.
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000000..f8aef03798
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
+
+  <PropertyGroup>
+    <RepoRoot Condition=" '$(RepoRoot)' == '' ">$([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'LICENSE'))'))</RepoRoot>
+    <IsSourceFile>false</IsSourceFile>
+    <IsSourceFile Condition="$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath)).StartsWith('src/')) OR $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath)).StartsWith('src\'))">true</IsSourceFile>
+    <SrcPackageFolder>$(RepoRoot)src\package\</SrcPackageFolder>
+    <Nullable>enable</Nullable>
+    <!-- When building the .NET product, there's no need to publish Windows PDBs. Any conversion to Windows PDBs will be done during staging, if necessary. -->
+    <PublishWindowsPdb Condition="'$(DotNetBuild)' == 'true'">false</PublishWindowsPdb>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Override the AssemblyVersion as 15.0.0 since protocol depends on this version for serialization. This is also defined in build script. -->
+    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">15.0.0</AssemblyVersion>
+    <!-- Auto generating binding redirects breaks testhost when running under net8.0 vstest.console as .NET Framework net462.  -->
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <!-- But not autogenerating binding redirects also breaks build occasionally, so we tell MSBuild to unify assembly versions,
+    without outputting binding redirectes. -->
+    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
+  </PropertyGroup>
+
+  <!-- Language configuration -->
+  <PropertyGroup>
+    <!-- default to allowing all language features -->
+    <LangVersion>preview</LangVersion>
+    <!-- enable strict mode for Roslyn compiler -->
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <!-- default to max warnlevel -->
+    <AnalysisLevel>preview</AnalysisLevel>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CA1416;RS0037</NoWarn>
+  </PropertyGroup>
+
+  <!-- The TFMs to build and test against. -->
+  <PropertyGroup>
+    <!-- Naming is based on dotnet/runtime one -->
+    <NetFrameworkMinimum>net462</NetFrameworkMinimum>
+    <NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
+    <NetCoreAppStable>net9.0</NetCoreAppStable>
+    <!--
+      Arcade is making things hard to work with. This property is unset when its value is equal to NetMinimum.
+      https://github.com/dotnet/arcade/blob/66c9c5397d599af40f2a94989241944f5a73442a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props#L16-L18
+      Because I don't want to complexify further the logic on VSTest just for that, I will set it to NetMinimum.
+    -->
+    <NetPrevious Condition=" $(NetPrevious) == '' ">$(NetMinimum)</NetPrevious>
+
+    <!--
+      vstest.console.exe is shipped with VS, we can use the version of .NET Framework that VS requires to run (this might differ from the version is requires to install).
+      https://learn.microsoft.com/en-us/visualstudio/releases/2022/system-requirements#additional-requirements-and-guidance
+    -->
+    <NetFrameworkRunnerTargetFramework>net48</NetFrameworkRunnerTargetFramework>
+    <!--
+      vstest.console.dll or datacollector.dll are shipped with .NET SDK, target the tfms into which we insert.
+    -->
+    <NetSDKTargetFramework>$(NetCoreAppStable)</NetSDKTargetFramework>
+    <!--
+      vstest.console.dll and datacollector.dll are shipped in TestPlatform.Portable package, that should support
+      the oldest currently supported .NET, because we don't know with which runtime it will be used.
+      vstest.console.exe and datacollector.exe are shipped in there as well, choose the lowest version of
+      .NET Frameowork to support as well.
+    -->
+    <NetPortableTargetFrameworks>$(NetCoreAppMinimum)</NetPortableTargetFrameworks>
+    <NetRunnerTargetFrameworks>$(NetSDKTargetFramework);$(NetPortableTargetFrameworks)</NetRunnerTargetFrameworks>
+    <RunnerTargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(NetRunnerTargetFrameworks)</RunnerTargetFrameworks>
+
+    <!--
+
+    -->
+    <BundledExtensionTargetFrameworks>$(RunnerTargetFrameworks)</BundledExtensionTargetFrameworks>
+    <!--
+      Extensions that are shipped as standalone packages need to be netstandard2.0, because we don't know on which runtime
+      we will run.
+
+      This is the same for bundled extensions that are shipped together with vstest.console or datacollector. In ideal case
+      they would not need netstandard, but we load the same dll into .NET and .NET Framework datacollector.
+      So the need to target netstandard2.0 as well.
+    -->
+    <ExtensionTargetFrameworks>netstandard2.0</ExtensionTargetFrameworks>
+
+    <!--
+      Testhosts need to run on all currently supported target frameworks and newer.
+      https://learn.microsoft.com/en-us/visualstudio/releases/2022/compatibility#-visual-studio-2022-support-for-net-development
+      https://dotnet.microsoft.com/en-us/platform/support/policy
+      https://learn.microsoft.com/en-us/lifecycle/products/microsoft-net-framework
+
+      Currently that is net8 (until November 10, 2026) and .NET Framework 4.6.2 (until Jan 12, 2027).
+    -->
+    <TestHostMinimumTargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum)</TestHostMinimumTargetFrameworks>
+    <!--
+      Testhost needs to support every target framework from the minimum, and it also needs to build
+      all the .NET Framework target frameworks that are newer than the minimum, because we ship each of those
+      executables separately, and use it to load dlls into specific version of .NET Framework based on user
+      settings.
+
+      https://learn.microsoft.com/en-us/dotnet/standard/frameworks#supported-target-frameworks
+    -->
+    <TestHostAllTargetFrameworks>$(TestHostMinimumTargetFrameworks);net47;net471;net472;net48;net481</TestHostAllTargetFrameworks>
+
+    <!--
+      Library that is loaded by others and by us. We don't know where it will run (e.b. TranslationLayer),
+      we need to support all frameworks from minimum, and also netstandard2.0.
+    -->
+    <LibraryTargetFrameworks>$(NetFrameworkMinimum);netstandard2.0</LibraryTargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Build & pack config -->
+  <PropertyGroup>
+    <Copyright>$(CopyrightMicrosoft)</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/microsoft/vstest</PackageProjectUrl>
+    <!-- Prevent warning about deprecated target frameworks -->
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <DefineConstants Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(DefineConstants);DOTNET_BUILD_FROM_SOURCE</DefineConstants>
+    <!-- PDB -->
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>embedded</DebugType>
+    <!-- Default to all packages generating a corresponding symbol package -->
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
+  <!-- Sign config -->
+  <PropertyGroup>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+
+  <!-- Test config -->
+  <PropertyGroup>
+    <TestRunnerName>MSTest</TestRunnerName>
+    <!-- Skip windows only tests on non-windows systems. -->
+    <TestRunnerAdditionalArguments Condition=" '$(OS)' != 'Windows_NT' ">$(TestRunnerAdditionalArguments) --filter "TestCategory!=Windows&amp;TestCategory!=Windows-Review"</TestRunnerAdditionalArguments>
+    <!-- Do not capture test output on CI to help community see errors -->
+    <TestCaptureOutput Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">false</TestCaptureOutput>
+  </PropertyGroup>
+
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..40981720ca
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <!-- Temporary workaround for Arcade issue in net9-preview5 -->
+    <_NetFrameworkHostedCompilersVersion Condition="'$(_NetFrameworkHostedCompilersVersion)' == ''">4.11.0-3.24280.3</_NetFrameworkHostedCompilersVersion>
+  </PropertyGroup>
+  
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <!--
+    CI source build leg: this needs to build the current and previous source build TFM. Both are
+    necessary as the output of this leg is used in other CI source build legs. Those could be
+    targeting NetCurrent or NetPrevious hence we must produce both.
+  -->
+  <PropertyGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' != 'true' ">
+    <TargetFrameworks>$(NetPrevious);$(NetCurrent)</TargetFrameworks>
+  </PropertyGroup>
+
+  <!--
+    Source build the product: this is the all up build of the product which needs only NetCurrent
+  -->
+  <PropertyGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true' ">
+    <TargetFrameworks>$(NetCurrent)</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Test project settings -->
+  <Choose>
+    <When Condition="$(TestProject) == 'true'">
+      <PropertyGroup>
+        <!-- Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) test projects. -->
+        <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      </PropertyGroup>
+
+      <!-- Test projects are not discovered in test window without test container capability -->
+      <ItemGroup>
+        <ProjectCapability Include="TestContainer" />
+      </ItemGroup>
+
+      <!-- Test project references -->
+      <ItemGroup>
+        <!--
+          Test projects take a direct dependency on TestHost. Indirect dependencies must be included.
+          This is required to enable selfhost the latest testhost bits.
+
+          We don't want these references to be passed onto compiler. They are just required at runtime.
+          Mark them as content and copy to output directory.
+        -->
+        <ProjectReference Include="$(RepoRoot)src/testhost/testhost.csproj">
+          <FromP2P>true</FromP2P>
+        </ProjectReference>
+        <ProjectReference Include="$(RepoRoot)src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj">
+          <FromP2P>true</FromP2P>
+        </ProjectReference>
+        <ProjectReference Include="$(RepoRoot)src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj">
+          <FromP2P>true</FromP2P>
+        </ProjectReference>
+        <ProjectReference Include="$(RepoRoot)src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj">
+          <FromP2P>true</FromP2P>
+        </ProjectReference>
+        <ProjectReference Include="$(RepoRoot)src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj">
+          <FromP2P>true</FromP2P>
+        </ProjectReference>
+
+        <PackageReference Include="Moq" Version="$(MoqVersion)" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="$(MicrosoftCodeCoverageVersion)" />
+        <!--
+          The following packages are brought by arcade but we don't want to use them as we are testing TP with
+          currently built version of TP.
+        -->
+        <PackageReference Remove="Microsoft.NET.Test.Sdk" />
+        <PackageReference Remove="Microsoft.TestPlatform" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
+</Project>
diff --git a/LICENSE b/LICENSE
index a31c555819..d859446c69 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,8 @@
-Copyright (c) 2020 Microsoft Corporation
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Localize/LocProject.json b/Localize/LocProject.json
deleted file mode 100644
index 4dfd1f87b0..0000000000
--- a/Localize/LocProject.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-    "Projects": [
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\DataCollectors\\Microsoft.TestPlatform.Extensions.EventLogCollector\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\DataCollectors\\Microsoft.TestPlatform.Extensions.EventLogCollector\\Resources\\xlf",
-                    "SourceFile": "src\\DataCollectors\\Microsoft.TestPlatform.Extensions.EventLogCollector\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.AdapterUtilities\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.AdapterUtilities\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.AdapterUtilities\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Build\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Build\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Build\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Client\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Client\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Client\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Common\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Common\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Common\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.CommunicationUtilities\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.CommunicationUtilities\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.CommunicationUtilities\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.CoreUtilities\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.CoreUtilities\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.CoreUtilities\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.CrossPlatEngine\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.CrossPlatEngine\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.CrossPlatEngine\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Extensions.BlameDataCollector\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Extensions.BlameDataCollector\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Extensions.BlameDataCollector\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Extensions.HtmlLogger\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Extensions.HtmlLogger\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Extensions.HtmlLogger\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf\\CommonResources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf\\CommonResources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.ObjectModel\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.TestHostProvider\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.TestHostProvider\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.TestHostProvider\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.Utilities\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.Utilities\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.Utilities\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\\Resources\\xlf",
-                    "SourceFile": "src\\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\SettingsMigrator\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\SettingsMigrator\\Resources\\xlf",
-                    "SourceFile": "src\\SettingsMigrator\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        },
-        {
-            "LanguageSet": "VS_Main_Languages",
-            "LocItems": [
-                {
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\vstest.console\\Resources\\xlf\\Resources.xlf.lcl",
-                    "CopyOption": "LangIDOnName",
-                    "Languages": "",
-                    "OutputPath": "src\\vstest.console\\Resources\\xlf",
-                    "SourceFile": "src\\vstest.console\\Resources\\xlf\\Resources.xlf"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 7b56b47a55..0000000000
--- a/Localize/lcl/cs/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Došlo k výjimce při shromažďování finálních položek z protokolu událostí {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector pro protokol událostí nenašel eventLogContext pro DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[U protokolu událostí {0} došlo k výjimce. Některé události se mohly ztratit. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Protokol událostí {0} byl pravděpodobně při shromažďování vyčištěn. Některé události nemusely být shromážděny.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepodařilo se přečíst protokol událostí {0} z počítače {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 8107d7ac88..0000000000
--- a/Localize/lcl/cs/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Data pokrytí kódu nejsou dostupná. Pokrytí kódu se momentálně podporuje jenom ve Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adresář {0} se nepovedlo vytvořit. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se inicializovat kolekci dat pro pokrytí kódu. Chyba: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Od CodeCoverage.exe se nepřijala spuštěná událost. Zkontrolujte důvod selhání v protokolech událostí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Za {0} s se nepovedlo získat spuštěnou událost z CodeCoverage.exe. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {1} prosím časový limit prodlužte.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít CodeCoverage.exe v {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0c9fa61109..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Název ManagedName není úplný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arita metody musí být číselná.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Metoda {0} nebyla nalezena u typu {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typ {0} nebyl nalezen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neočekávané znaky na konci položky ManagedName (pozice: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V ManagedName se nepovoluje mezera (pozice: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Metoda {0}.{1} není na této platformě implementována.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b89490f2eb..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sestavení bylo dokončeno.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Začalo sestavování. Počkejte prosím...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přeskakuje se spuštění testu pro projekt {0}. Pokud chcete spustit testy pomocí příkazu dotnet test, přidejte do souboru projektu vlastnost <IsTestProject>true</IsTestProject>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh pro {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upozornění: Aktualizujte odkaz na balíček Microsoft.NET.Test.Sdk na verzi 15.8.0 nebo novější, aby se získalo pokrytí kódu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 8956e310d5..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh nešlo spustit, protože byl neplatný počáteční stav.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pro tento běh se nenašel žádný vhodný zprostředkovatel testů v režimu runtime.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh se ruší: byl překročen časový limit testovacího běhu ({0} ms).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V případě, že nejsou aktivní žádné testovací běhy, se operace čekání na dokončení nepovoluje. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3e59127c3c..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu. Další informace najdete v chybové zprávě:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operace se ruší na základě žádosti.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Shromažďování dat: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolekce dat {0} neposkytla informace o inicializaci. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolekce dat {0} během načítání typu, konstrukce nebo inicializace vyvolala výjimku: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zpráva kolekce dat {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít kolekci dat {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolekce dat {0} si v prostředí provedení testu vyžádala nastavení proměnné prostředí {1} na hodnotu {2}, ale jiná kolekce dat {3} si už vyžádala stejnou proměnnou prostředí s rozdílnou hodnotou {4}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Duplicitní identifikátor URI testu rozšíření {0}. Duplicitní rozšíření se ignoruje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Duplicitní poskytovatel nastavení s názvem {0}. Duplicitní poskytovatel se ignoruje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Našel se duplicitní oddíl nastavení běhu s názvem {0}. Duplicitní nastavení se ignoruje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Prázdné závorky ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít seznam nainstalovaných rozšíření testu jednotek. Důvod: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se načíst rozšíření ze souboru {0}. Další informace získáte pomocí parametru /diag.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při vytváření rychlého filtru došlo k chybě.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Existuje více konfigurací, které mají popisný název kolekce dat {0}. Duplicitní konfigurace se budou v testovacím běhu ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vnitřní výjimka:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Neplatná podmínka {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozšíření testu má neplatný identifikátor URI {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Neplatný operátor {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Během inicializace protokolovače s {0}: {1} došlo k výjimce. Protokolovač se nepoužije. Výjimka: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít protokolovač testu s kvalifikovaným názvem sestavení (AssemblyQualifiedName), identifikátorem URI (uri) nebo popisným názvem (FriendlyName) {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Chybí ).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Chybí (.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: Chybí operand.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chybějící operátor | nebo &]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolekce dat zachytila výjimku typu {0}: {1}. Další podrobnosti: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry spouštění jsou už načtené.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při načítání parametrů spouštění se stala chyba. Chyba: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadal se neplatný uzel nastavení. Vlastnost name uzlu nastavení nesmí být prázdná.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při inicializaci poskytovatele nastavení s názvem {0} se stala chyba. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Poskytovatel nastavení s názvem {0} se nenašel.  Nastavení nešlo načíst.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Trasování zásobníku:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nesprávný formát pro TestCaseFilter {0}. Zadejte správný formát a zkuste to znovu. Poznámka: Nesprávný formát může vést k tomu, že se nespustí žádný test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít datacollector s popisným názvem {0}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tato možnost funguje jenom se souborem vstest.console.exe nainstalovaným jako součást sady Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typy odvozené z kontextu shromažďování dat nelze použít pro posílání zpráv a dat. DataCollectionContext použitý pro posílání dat a zpráv musí pocházet z jedné z událostí vyvolaných na kolekci dat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3ef3efbd4f..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní zjišťování testu se přerušilo. Důvod: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní testovací běh se přerušil. Důvod: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ladicí program se nedá připojit k výchozímu hostiteli testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vzdálený hostitel vynutil ukončení existujícího připojení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Procesu {0} se nepovedlo připojit k procesu {1} ani po {2} s. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {3} prosím časový limit prodlužte.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces testovacího hostitele se chybově ukončil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se navázat komunikaci s procesem hostitele testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Byla přijata neočekávaná zpráva. Očekávaný typ zprávy: {0} Skutečný typ zprávy: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kontrola verze protokolu selhala. Ověřte, jestli je spouštěč testů kompatibilní s hostitelem.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepodařilo se vyjednat protokol. Po {0} s vypršel časový limit čekání na odezvu. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {1} prosím časový limit prodlužte.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 03f3f7dfd1..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nemůže být null nebo prázdný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informace: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upozornění: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument nemůže být prázdný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument nemůže být záporný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument musí být tohoto typu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument má následující vlastnost, která nemůže být prázdný řetězec: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument má následující vlastnost, která nemůže být záporná: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument má následující vlastnost, která nemůže být null: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný argument má následující vlastnost: {0}. Tato vlastnost musí být tohoto typu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při zpracování úlohy z fronty {0} došlo k neošetřené výjimce: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hostitele {0} nešlo najít. Ujistěte se, jestli je {0} nainstalovaný na počítači a dostupný v cestě určené proměnnou prostředí PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fronta {0} se už uvolnila.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Frontu {0} nejde uvolnit, když je pozastavená.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při získávání názvu procesu se stala chyba.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c90b99780e..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ladicí program se nedá připojit k výchozímu hostiteli testů s ID procesu {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Je povolené ladění kolekce dat. Pokud chcete pokračovat, připojte prosím ladicí program k procesu kolekce dat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mění se vyhledávání adaptéru. Pro další informace se podívejte sem: https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při vytváření instance nástroje zjišťování došlo k výjimce: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Našlo se více adaptérů testů se stejným identifikátorem URI {0}. Ignoruje se adaptér {1}. Pokud se chcete tomuto upozornění vyhnout, odinstalujte prosím konfliktní adaptéry.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignoruje se zadaný duplicitní zdroj {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V době, kdy nástroj zjišťování testů {0} načítal testy, došlo k výjimce. Výjimka: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při volání prováděcího modulu {0} došlo k výjimce: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Možnost ExecutionThreadApartmentState se pro rozhraní nepodporuje: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se spustit hostitele testu kvůli této chybě: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít soubor {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Je povolené ladění hostitele. Pokud chcete pokračovat, připojte prosím ladicí program k procesu testhost.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignoruje se prováděcí modul testování, který odpovídá nástroji zjišťování testů {0}, protože nástroj zjišťování nemá atribut DefaultExecutorUri. Možná bude nutné přeinstalovat doplněk adaptéru testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se inicializovat proxy klienta: nešlo se připojit k procesu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tato operace se v kontextu běhu bez ladění nepovoluje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít dostupný proxy server, který se má odebrat z fronty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde najít {0}. Ujistěte se, že na počítači je nainstalovaný dotnet.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít prováděcí modul testování s identifikátorem URI {0}. Ujistěte se, že je prováděcí modul testování nainstalovaný a že podporuje .NET runtime verze {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktuální správce relace nespravuje proxy s ID {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Žádný test neodpovídá danému filtru testovacích případů {0} v: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Žádný ze zadaných zdrojů {0} není platný. Opravte chyby/upozornění výše a zkuste to znovu. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít rozšíření: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Používáte starší verzi sady Microsoft.NET.Test.Sdk. Přejděte prosím na verzi 15.3.0 nebo vyšší.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proxy s ID {0} je už k dispozici a nedá se znovu zařadit do fronty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zjišťování testů bylo zrušeno.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V {0} nejsou dostupné žádné testy. Ujistěte se, že nástroje pro zjišťování a provádění testů jsou zaregistrované a že jsou vhodně zvolená nastavení verzí platformy a architektury, a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Protokolování diagnostiky TestHost v souboru: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Filtru neodpovídá žádný test, protože obsahuje nejméně jednu vlastnost, která není platná ({0}). Zadejte výraz filtru, který obsahuje platné vlastnosti ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f829f644c5..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní testovací běh se přerušil, protože proces hostitele se neočekávaně ukončil. Prověřte prosím výše zásobník volání, pokud je k dispozici. Nabídne vám další informace o původu výjimky.]D;]A;Test, který běžel, když došlo k chybovému ukončení: ]D;]A;{0}]D;]A;Tento test může a nemusí být příčinou chybového ukončení.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný klíč parametru blame {0} není platný. Tento klíč se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Klíč parametru blame {0} dokáže podporovat jen hodnoty {1}/{2}. Tento klíč se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bylo povoleno shromáždění výpisu, ale nebyl vygenerován žádný soubor výpisu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vytváří se výpis pro {0} – {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vytváří se výpis tohoto stromu procesu (zespod)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaná doba nečinnosti {0} {1} vypršela. Shromažďují se výpisy při zablokování z hostitele testhost a jeho podřízených procesů.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[minuty]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Všechny testy se dokončily. Soubor sekvence se nevygeneruje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nešlo spustit výpis procesu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vyžadovaná proměnná prostředí PROCDUMP_PATH má hodnotu Null nebo je prázdná. Nastavte pro ni cestu ke složce obsahující příslušný spustitelný soubor ProcDump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Byla povolena funkce CollectDump, ale soubor výpisu nebyl vygenerován.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[sekundy]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jako časový limit se přidala neočekávaná hodnota {0}. Zadejte prosím hodnotu v tomto formátu: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f9ba2b070b..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor HTML s výsledky testů: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba protokolovače HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry LogFileName a LogFilePrefix nelze uvést společně.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 7669434f4c..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nemůže být menší než 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nemůže být null nebo prázdný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde získat volný název pro {0}(1),(2),... v adresáři {1}. Vyčistěte prosím tento adresář.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít dostupný název souboru pro {0} pomocí formátu časového razítka {2} v {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[položka nasazení {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[položka nasazení {0} (výstupní adresář {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nezadala se nastavení testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní nastavení testu nedefinují adresář nasazení běhu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Výsledek není přidružený k testovacímu běhu. Použijte výsledek, který se získal z probíhajícího nebo dokončeného testovacího běhu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný název souboru nebo adresáře {0} není platný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se připojit soubory z {0}.]D;]A;Podrobnosti o chybě: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V testovacím běhu se přeskočil test {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry LogFileName a LogFilePrefix nejde použít společně. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Všechny načtené výsledky]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Výsledky neuvedené v seznamu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přerušené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dokončené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Odpojené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neúspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Probíhá]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neprůkazné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neprovedené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde spustit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné (běh se přerušil)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Čekající]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Časový limit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upozornění]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor výsledků: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[UPOZORNĚNÍ: Přepíše se soubor výsledků: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 89dba67fc2..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nemůže být null nebo prázdný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Otestujte zjištěné knihovny DLL, které se vytvořily pro různé verze architektury a platformy. Následující knihovny DLL neodpovídají aktuálnímu nastavení, tedy architektuře {0} a platformě {1}.{2}Další podrobnosti o správě těchto nastavení najdete v {3}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný soubor nastavení neodpovídá požadovanému formátu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Žádný s poskytnutých kontejnerů testů neodpovídá nastavení architektury platformy a rozhraní .NET Framework pro testovací běh. Platforma: {0}  .NET Framework: {1}. Další podrobnosti o správě těchto nastavení najdete na adrese http://go.microsoft.com/fwlink/?LinkID=330428.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Produkt {0} je sestaven pro rozhraní {1} a platformu {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index d0529e7522..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Název ManagedName není úplný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arita metody musí být číselná.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Metoda {0} nebyla nalezena u typu {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typ {0} nebyl nalezen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neočekávané znaky na konci položky ManagedName (pozice: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V ManagedName se nepovoluje mezera (pozice: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 1e6ab2d326..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nemůže být null nebo prázdný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor {0} neexistuje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Objekt musí být typu {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přerušené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dokončené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Odpojené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neúspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Probíhá]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neprůkazné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neprovedené]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde spustit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné (běh se přerušil)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Čekající]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Časový limit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upozornění]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde najít TypeConverter pro typ {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít uzel {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Z poskytnutého streamu nejde číst. Pokud stream nepodporuje čtení, jeho data nejde poslat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný název souboru {0} obsahuje tyto neplatné znaky: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný název souboru {0} je rezervovaný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vlastnost {0} nejde zaregistrovat jako typ hodnoty {1}, protože už je zaregistrovaná jako {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se vytvořit model COM pro relaci msdia. HResult: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se načíst knihovnu msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatný identifikátor URI v nastavení {0} kolekce dat]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kořenový uzel parametrů spouštění se musí jmenovat RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení {0}.  Pro {2} se zadala neplatná hodnota {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení {0}. Neočekávaný XmlAttribute: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení {0}. Neočekávaný XmlElement: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatný identifikátor URI {0} v nastavení {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení kolekce dat. Očekávaný atribut '{0}' nebyl nalezen.  Typické nastavení kolekce dat by mělo vypadat přibližně následovně <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení {0}. Očekával se alespoň jeden XmlAttribute: popisný název (friendlyName), identifikátor URI (uri) nebo kvalifikovaný název sestavení (assemblyQualifiedName).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter se nedá zadat pro konkrétní běh testů. Parametr FilterCriteria je určený jenom pro běhy se zdroji.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Četnost oznámení musí být kladné číslo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Časový limit upozornění musí být větší než nula.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adresář řešení {0} neexistuje. Ujistěte se prosím, že adresář řešení zadaný v nastavení Runsettings existuje a že máte oprávnění ho číst.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Řetězec filtru {0} zahrnuje nerozpoznanou řídicí sekvenci.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Číslo sloupce]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Identifikátor URI prováděcího modulu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta k souboru]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[PlněKvalifikovanýNázev]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Číslo řádku]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Název]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zdroj]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vlastnosti]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Zpráva: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Trasování zásobníku:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neúspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Žádné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenalezeno]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přeskočeno]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Název počítače]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zobrazovaný název výsledku testu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Doba trvání]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Čas ukončení]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Číslo sloupce chyby]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chybová zpráva]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Trasování zásobníku chyb]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Výsledek]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Čas zahájení]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Zprávy testů:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typ vlastnosti testu {0} vlastnosti {1} se nepodporuje. Použijte jeden z podporovaných typů vlastností (primitivní typy, identifikátor URI, řetězec, string[]5D;) a zkuste to znovu. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 7cd9936503..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Našlo se více verzí stejného rozšíření. Vybere se nejvyšší verze.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít hostitele {0} pro architekturu {1}.]D;]A;]D;]A;Problém můžete vyřešit instalací {1} technologie .NET.]D;]A;]D;]A;Zadaná architektura se dá najít tady:]D;]A;  – https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde najít {0}. Publikujte prosím svůj testovací projekt a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejde najít {0}. Ujistěte se, že testovací projekt má odkaz na balíček nuget Microsoft.NET.Test.Sdk.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3d3919c0ef..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kód XML parametrů spouštění neobsahuje uzel RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatné nastavení {0}. Pro {2} se zadala neplatná hodnota {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít uzel RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít uzel RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při načítání nastavení se stala chyba. Chyba: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nastavení cílové platformy {0} není kompatibilní s architekturou systému {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadal se neočekávaný soubor nastavení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d14ed323a1..0000000000
--- a/Localize/lcl/cs/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operace zahájení testovací relace se přerušila.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operace zastavení testovací relace se přerušila.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní zpracovávání příloh testovacího běhu se přerušilo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní zjišťování testů se přerušilo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktivní testovací běh se přerušil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se přijmout zprávu z procesu vstest.console.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor {0} neexistuje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces vstest.console se ukončil neobvyklým způsobem.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 509b39c830..0000000000
--- a/Localize/lcl/cs/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Všechny uzly LegacySettings, které už jsou v souboru Runsettings, se odstraní.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings neobsahuje žádné vložené testSettings, nemigruje se.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Migrovaný soubor RunSettings se vytvořil v: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Atributy agentNotRespondingTimeout, deploymentTimeout a scriptTimeout uzlu Timeouts nejsou podporované, takže se nebudou migrovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Platné použití:]D;]A;SettingsMigrator.exe <Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat>]D;]A;SettingsMigrator.exe <Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat> <Úplná cesta k souboru runsettings, který se má vytvořit>]D;]A;Příklady:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/cs/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/cs/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f1ecb41ae2..0000000000
--- a/Localize/lcl/cs/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Další informační zprávy:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se spustit testovací běh pro testy jednotek aplikace pro Windows Store: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V kontejnerech testů se nenašly žádné testy. Navíc Adaptér testování částí aplikací pro Microsoft Windows Store nepodporuje soubory .appxbundle. Při vytváření balíčku aplikace vytvořte soubor appx (nastavte možnost Generovat svazek aplikací na Nikdy) a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít testované sestavení. Ujistěte se prosím, že je projekt sestavený.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přílohy:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jsou k dispozici tyto doplňky zjišťování testů:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jsou k dispozici tyto doplňky pro provádění testů:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jsou k dispozici tyto doplňky protokolovače testu:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jsou k dispozici tyto doplňky poskytovatelů nastavení:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /BatchSize vyžaduje velikost dávky.  Příklad:  /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Shromažďování výpisů stavu systému pomocí možnosti CollectDump pro Blame se pro tuto platformu nepodporuje.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Shromažďování výpisů stavu systému při zablokování pomocí možnosti CollectDump s TestTimeout pro Blame se pro tuto platformu nepodporuje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný parametr blame {0} není platný. Tento parametr se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      Adresář, který obsahuje dočasné výstupy]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta k základu sestavení se nenašla, zadejte platnou cestu a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumenty RunSettings:]D;]A;      Argumenty k předání konfigurací runsettings prostřednictvím příkazového řádku. Argumenty je možné zadat jako dvojici název-hodnota ve formě [název]5D;=[hodnota]5D; po -- . Po -- následuje mezera. ]D;]A;      K oddělení více dvojic [název]5D;=[hodnota]5D; použijte mezeru.]D;]A;      Další informace o podpoře argumentů RunSettings: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nemůže být null nebo prázdné.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Povolit kolekci dat pro testovací běh. Další informace: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" není podporován, pokud je testovací běh nakonfigurován pomocí nastavení testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informace: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upozornění: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<konfigurace>]D;]A;      Konfigurace, pro kterou se projekt sestaví, tj. Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Všechna práva vyhrazena.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Popisný název kolekce dat {0} není platný. Kolekce dat se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zprávy trasování ladění:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Časový limit k propojení nebo zpracování žádosti pro DesignModeClient na portu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Příklad: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pro aplikace pro Windows Store není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pro aplikace pro Windows Phone není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při čtení nastavení adaptéru diagnostických dat se vyvolala výjimka {0}. Všechny adaptéry diagnostických dat se v tomto běhu přeskočí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pokud se spouští testy jednotek pro aplikace pro Windows Store, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pokud se spouští testy jednotek pro aplikace pro Windows Phone, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zjišťování pro dané zdroje selhalo. Výjimka: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr {0} by se měl poskytnout jenom jednou.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Spustí test v režimu blame. Tato možnost je užitečná při izolaci problematického testu, který způsobuje jeho chybové ukončení.]D;]A;      Vytvoří výstupní soubor v aktuálním adresáři jako Sequence.xml,]D;]A;      který zachytí pořadí provádění testu před chybovým ukončením.]D;]A;      Volitelně se můžete rozhodnout pro shromáždění výpisu procesu pro hostitele testu.]D;]A;      Pokud se rozhodnete pro shromáždění výpisu, shromáždí se ve výchozím nastavení při chybovém ukončení minivýpis.]D;]A;      Toto výchozí chování můžete také přepsat pomocí určitých volitelných parametrů:]D;]A;      CollectAlways – Pro shromáždění výpisu při ukončení, pokud nedojde k chybovému ukončení (true/false) ]D;]A;      DumpType – Pro zadání typu výpisu (mini/full)]D;]A;      Příklad: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Povolí kolekci dat CodeCoverage pro testovací běh.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<cesta k protokolu souboru>]D;]A;      Povolit protokoly pro testovací platformu]D;]A;      Protokoly se zapisují do zadaného souboru.]D;]A;]D;]A;      Změňte úroveň trasování pro protokoly tak, jak je uvedeno níže.]D;]A;      Příklad: /Diag:<cesta k protokolu souboru>;tracelevel=<výchozí hodnota je verbose>]D;]A;      Povolené hodnoty pro tracelevel: off, error, warning, info a verbose]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<identifikátor URI nebo popisný název protokolovacího nástroje>]D;]A;      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba]D;]A;      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=<výchozí hodnota je jedinečný název souboru>]5D;]D;]A;      Vytvoří soubor v adresáři TestResults s daným LogFileName.]D;]A;]D;]A;      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.]D;]A;      Příklad: /logger:console;verbosity=<výchozí hodnota je minimal>]D;]A;      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed]D;]A;]D;]A;      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.]D;]A;      Příklad: /logger:console;prefix=<výchozí hodnota je false>]D;]A;      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<identifikátor URI nebo popisný název protokolovacího nástroje>]D;]A;      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba]D;]A;      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=<výchozí hodnota je jedinečný název souboru>]5D;]D;]A;      Vytvoří soubor v adresáři TestResults s daným LogFileName.]D;]A;]D;]A;      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.]D;]A;      Příklad: /logger:console;verbosity=<výchozí hodnota je normal>]D;]A;      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed]D;]A;]D;]A;      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.]D;]A;      Příklad: /logger:console;prefix=<výchozí hodnota je false>]D;]A;      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NÁZEV>=<HODNOTA>]D;]A;      Nastaví hodnotu proměnné prostředí. Pokud proměnná neexistuje, vytvoří ji, a pokud existuje, přepíše ji. Tato možnost bude znamenat, že se použije přepínač /InIsolation a vynutí se spuštění testů v izolovaném procesu.]D;]A;      ]D;]A;      Tento argument se dá zadat vícekrát, může se tak poskytnout více proměnných.]D;]A;]D;]A;      Příklad: -e:PROMENNA1=HODNOTA1]D;]A;               -e:JINA_PROMENNA="HODNOTA S MEZERAMI"]D;]A;               -e:JINA_PROMENNA="HODNOTA;oddělená;středníky"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proměnná prostředí {0} se už definovala, ale přepsal ji argument -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chybová zpráva:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Pro spuštění testů:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Pro spuštění testů s dalšími nastaveními, třeba kolekcemi dat:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Při vytváření instance rozšíření {0} došlo k výjimce: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Celkový čas: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Identifikátor URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neúspěšné]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} se nenašel.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozhraní Framework35 není podporováno. Pro projekty, které cílí na rozhraní .Net Framework 3.5, bude test spuštěn v „režimu kompatibility“ CLR 4.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<verze rozhraní>]D;]A;      Cílová verze rozhraní .NET Framework, která se použije ke spuštění testu. ]D;]A;      Platné hodnoty jsou .NETFramework,Version=v4.5.1, .NETCoreApp,Version=v1.0 apod.]D;]A;      Další podporované hodnoty jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Framework vyžaduje cílovou verzi rozhraní .NET Framework pro testovací běh. Příklad: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Zobrazí tuto zprávu o používání.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumenty:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Popis: Spustí testy ze zadaných souborů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Možnosti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Použití: vstest.console.exe [argumenty]5D; [možnosti]5D; [[--]5D; <argumenty RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hodiny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Příznak /InIsolation je zastaralý. Testy se vždy spouští v samostatném procesu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Spustí testy v izolovaném procesu. Díky tomu je méně pravděpodobné,]D;]A;      že se proces vstest.console.exe zastaví, pokud se v testech stane chyba,]D;]A;      ale testy můžou být pomalejší.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} není platný. Pokud si chcete zobrazit seznam platných argumentů, použijte prosím možnost /help.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatná velikost dávky {0}. Velikost dávky by měla být větší než nula. Příklad:  /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument blame {0} není platný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaná konfigurace není platná.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument diag {0} není platný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta k souboru diag {0} není platná.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V příkazu EnableCodeCoverage se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /EnableCodeCoverage) a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatná verze rozhraní .NET Framework: {0}. Zadejte prosím úplný název cílového rozhraní (příklad: .NETCoreApp,Version=v2.0). Další podporované verze jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V příkazu InIsolation se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /InIsolation) a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument logger {0} není platný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V příkazu Parallel se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /Parallel) a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument --ParentProcessId|/ParentProcessId vyžaduje ID procesu, které je celočíselné. Zadejte ID nadřazeného procesu, který spustil tento proces.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Neplatný typ platformy: {0}. Platné typy platformy: {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument --Port|/Port vyžaduje celočíselné číslo portu. Zadejte port pro připojení soketu a přijímání zpráv událostí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta {0} zadaná v ResultsDirectory není platná. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta {0} zadaná v TestAdapterPath není platná. Chyba: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /TestCaseFilter nejde zadat spolu s argumentem /Tests. Když se zadají testy, filtrování testovacích případů nejde použít.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument parametru testovacího běhu {0} není platný. Použijte prosím formát uvedený níže.]D;]A;     Formát: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V příkazu UseVsixExtensions se argument {0} neočekává. Zadejte příkaz, který určí, jestli se mají rozšíření vsix používat, nebo přeskočit (třeba vstest.console.exe myTests.dll /UseVsixExtensions:true) a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Vypíše nainstalované nástroje zjišťování testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Vypíše nainstalované prováděcí moduly testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Vypíše nainstalované protokolovače testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Vypíše nainstalované poskytovatele nastavení testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jsou k dispozici následující testy:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<název souboru>]D;]A;      Vypíše všechny zjištěné testy z daného kontejneru testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaný soubor {0} je jen pro čtení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        PopisnýNázev: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se najít protokolovač testu s identifikátorem URI nebo popisným názvem {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Identifikátor URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nejméně jedno z nastavení Runsettings obsahuje neplatný token]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool verze {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minuty]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nezadaly se žádné zdrojové soubory testů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta {0} zadaná v TestAdapterPath neobsahuje žádné adaptéry testů. Zadejte platnou cestu a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nerozpoznaný parametr {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nezadaly se žádné argumenty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Store, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Store.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zjistilo se několik testů (celkem {0}), ale žádný z testů neodpovídá zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[V {0} nejsou dostupné žádné testy. Přesvědčte se, že nainstalované nástroje zjišťování testů, moduly provádění, nastavení verzí platformy a rozhraní jsou vhodné a zkuste to znova.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Projekt {0} je sestavený pro {1}/{2}. Testovací sestavení zadané v běhu by měly mít společné cílové rozhraní .NET Framework a platformu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Žádné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nespuštěno]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chyba při otevírání souboru odpovědí {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<výstup>]D;]A;      Adresář, který obsahuje binární soubory, které se mají spustit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta k výstupu se nenašla, zadejte platnou cestu a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Určí, že se testy mají provádět paralelně. Ve výchozím nastavení]D;]A;      se můžou použít všechna dostupná jádra počítače.]D;]A;      Počet jader, která se můžou použít, se dá nakonfigurovat v souboru nastavení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      ID nadřazeného procesu, který je odpovědný za spuštění aktuálního procesu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Úspěšné]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nepovedlo se spustit testovací běh pro testy aplikace pro Windows Phone: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Phone, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<typ platformy>]D;]A;      Cílová architektura platformy, která se použije ke spuštění testu. ]D;]A;      Platné hodnoty jsou x86, x64 a ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Platform vyžaduje, aby se pro testovací běh poskytl typ platformy.   Příklad:  /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<port>]D;]A;      Port pro připojení soketu a přijímání zpráv událostí]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Probíhá testovací běh]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cesta {0} neexistuje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      Načte další možnosti ze souboru odpovědí.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Na zadané cestě se vytvoří adresář pro výsledky testů, pokud ještě neexistuje.]D;]A;      Příklad:  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /ResultsDirectory vyžaduje hodnotu určující, kam se výsledky testů uloží. Příklad:  /ResultsDirectory:c:\MůjAdresářVýsledkůTestů]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<soubor nastavení>]D;]A;      Nastavení, která se použijí při testování.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor nastavení {0} se nenašel.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /Settings vyžaduje, aby se poskytl soubor nastavení.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pro spouštění testů se dá zadat jenom jeden balíček aplikace (soubor .appx).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<názvy testů>]D;]A;      Spustí testy s názvy odpovídajícími zadaným hodnotám. Chcete-li zadat více]D;]A;     hodnot, oddělte je čárkami.]D;]A;     Příklady: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Spusťte testy ze zadaných souborů nebo ze vzoru se zástupnými znaky. Oddělte více názvů nebo vzorů testovacích souborů pomocí mezer.]D;]A;      Nastavte úroveň podrobností protokolovacího nástroje konzoly na podrobnou, aby se zobrazily odpovídající testovací soubory.]D;]A;      Příklady: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolekce dat jiné než Pokrytí kódu a Microsoft Fakes konfigurované prostřednictvím nastavení běhu nejsou podporované s vloženým nastavením testů. Další informace viz https://aka.ms/vstest-configure-datacollector. Nastavení běhu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sekundy]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        NázevNastavení: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přeskočeno]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zjistilo se několik testů (celkem {0}), ale některé z testů neodpovídají zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Tests vyžaduje aspoň jeden konkrétní název testu nebo jeho podřetězec.]D;]A;       Příklady: /Tests:TestovaciMetoda1, /Tests:TestovaciMetoda1,metoda2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Trasování zásobníku:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Začínají se zjišťovat testy, počkejte prosím...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Začínají se provádět testy, počkejte prosím...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zprávy standardních chyb:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zprávy standardního výstupu:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kromě toho se cesta k adaptérům testů dá zadat pomocí příkazu /TestAdapterPath. Příklad:  /TestAdapterPath:<cesta_k_vlastním_adaptérům>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Podporované typy souborů:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ke spouštění testů jednotek pro aplikace pro Windows Store se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pro provádění testů se používá režim izolace tak, jak to vyžaduje nastavení platformy {0} a rozhraní .NET Framework {1} pro testovací běh. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ke spouštění testů jednotek pro aplikace pro Windows Phone se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ke spouštění testů se používá režim izolace, protože v nastavení Runsettings se povolily adaptéry diagnostických dat. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zadaná cesta pro vyhledávání vlastních adaptérů testů se nenašla. Zadejte platnou cestu a zkuste to znovu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Proces vstest.console.exe použije v testovacím běhu vlastní]D;]A;      adaptéry testu ze zadané cesty (pokud existují). ]D;]A;      Příklad:  /TestAdapterPath:<cesta_k_vlastním_adaptérům>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /TestAdapterPath vyžaduje hodnotu, která je součástí umístění obsahujícího vlastní adaptéry testů. Příklad:  /TestAdapterPath:c:\MojeVlastniAdaptery]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<výraz>]D;]A;      Spustí testy, které odpovídají danému výrazu.]D;]A;     <výraz> musí být formátu <vlastnost>operátor<hodnota>[|&<výraz>]5D;,]D;]A;     kde operátor je  =, != nebo ~ (operátor ~ má sémantiku]D;]A;     contains a je použitelný na vlastnosti řetězce, jako je DisplayName).]D;]A;     Závorky () mohou být použity pro seskupení podvýrazů.]D;]A;     Příklady: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument příkazu /TestCaseFilter vyžaduje hodnotu filtru.]D;]A;        Hodnota filtru by měla být typu<vlastnost>=<hodnota>.]D;]A;        Příklady: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh se přerušil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh se přerušil s chybou {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh se zrušil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh nebyl úspěšný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testovací běh byl úspěšný.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - Neúspěšné: {1}, Úspěšné: {2}, Přeskočeno: {3}, Celkem: {4}, Doba trvání: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Neúspěšné: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Celkový počet testů: neznámý]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Úspěšné: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Přeskočené: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Celkový počet testů: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ke spouštění testů se používá rozhraní {0}. Pokud chcete toto upozornění potlačit, zadejte /Framework:{1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Poskytnutý zdrojový soubor testu {0} se nenašel.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Celkový počet testovacích souborů, které odpovídají zadanému vzoru: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uplynulý čas:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Identifikátor URI výchozího prováděcího modulu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Příkaz /UseVsixExtensions je zastaralý. Použijte místo něj prosím příkaz /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Tato možnost určí, jestli má proces vstest.console.exe v testovacím běhu používat,]D;]A;      nebo přeskočit nainstalovaná rozšíření VSIX (pokud nějaká jsou). ]D;]A;      Příklad: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /UseVsixExtensions vyžaduje hodnotu. Pokud hodnota bude true, v testovacím běhu se použijí nainstalovaná rozšíření VSIX (pokud nějaká jsou). Pokud je hodnota false, budou se rozšíření ignorovat.   Příklad:  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Protokolování diagnostiky Vstest v souboru: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 58b2cb6bd6..0000000000
--- a/Localize/lcl/de/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Erfassen von abschließenden Einträgen aus dem Ereignisprotokoll "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der DataCollector des Ereignisprotokolls hat den eventLogContext für DataCollectionContext nicht gefunden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Beim Ereignisprotokoll "{0}" ist eine Ausnahme aufgetreten. Einige Ereignisse gehen möglicherweise verloren. Fehler: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Ereignisprotokoll "{0}" wurde während der Sammlung möglicherweise gelöscht. Einige Ereignisse wurden eventuell nicht erfasst.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Ereignisprotokoll "{0}" konnte vom Computer "{1}" nicht gelesen werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 89373d2073..0000000000
--- a/Localize/lcl/de/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es sind keine Code Coverage-Daten verfügbar. Code Coverage wird zurzeit nur unter Windows unterstützt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Erstellen des Verzeichnisses "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Initialisieren des Code Coverage-Datensammlers: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das ausgeführte Ereignis wurde von "CodeCoverage.exe" nicht erhalten. Suchen Sie in den Ereignisprotokollen nach der Fehlerursache.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Abrufen des ausgeführten Ereignisses von "CodeCoverage.exe" nach {0} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{1}" fest, um den Timeoutwert zu erhöhen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["CodeCoverage.exe" wurde unter "{0}" nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 67a7b06859..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName unvollständig]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Escapesequenz (Segment: {0}, Position: {1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Stelligkeit der Methode muss numerisch sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Methode "{0}" wurde für den Typ "{1}" nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Am Ende des Segments wurde ein schließendes einfaches Anführungszeichen erwartet (Segment: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Typ "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unerwartetes Zeichen nach dem Ende von ManagedName (Position: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Leerzeichen sind in einem ManagedName unzulässig (Position: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}.{1}" ist auf dieser Plattform nicht implementiert!]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 53de52126c..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Buildvorgang abgeschlossen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Buildvorgang gestartet, bitte warten...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Ausführung des Tests für das Projekt "{0}" wird übersprungen. Um Tests mit "dotnet test" auszuführen, fügen Sie der Projektdatei die Eigenschaft <IsTestProject>true</IsTestProject> hinzu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testlauf für "{0}" ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Warnung: Aktualisieren Sie die Microsoft.NET.Test.Sdk-Paketreferenz auf Version 15.8.0 oder höher, um von Code Coverage zu profitieren.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 69690487d3..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf konnte nicht ausgeführt werden, weil der Anfangszustand ungültig war.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Für diese Ausführung wurde kein geeigneter Testlaufzeitanbieter gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf wird abgebrochen: Das Timeout von {0} Millisekunden für den Testlauf wurde überschritten.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Warten auf den Fertigstellungsvorgang ist unzulässig, wenn kein aktiver Testlauf vorhanden ist. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c9f0bb4b30..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" von einem Ordner aus ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen. Weitere Informationen finden Sie in der Fehlermeldung:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Vorgang wird gemäß Anforderung abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Datensammlung: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vom Datensammler "{0}" wurden keine Initialisierungsinformationen bereitgestellt. Fehler: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Datensammler "{0}" hat beim Laden, bei der Konstruktion oder bei der Initialisierung des Typs eine Ausnahme ausgelöst: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Datensammler "{0}" – Meldung: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Datensammler "{0}" wurde nicht gefunden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Datensammler "{0}" hat das Festlegen der Umgebungsvariablen "{1}" mit dem Wert "{2}" in der Testausführungsumgebung angefordert, ein anderer Datensammler "{3}" hat jedoch die gleiche Umgebungsvariable mit dem anderen Wert "{4}" angefordert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Doppelter Testerweiterungs-URI "{0}". Die doppelte Erweiterung wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Doppelter Einstellungsanbieter namens "{0}". Der doppelte Anbieter wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Duplizierter Abschnitt mit Ausführungseinstellungen "{0}". Die Einstellungsduplikate werden ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Leere Klammern ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Liste installierter Komponententesterweiterungen wurde nicht gefunden. Ursache: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Laden von Erweiterungen aus der Datei "{0}". Verwenden Sie "/diag", um weitere Informationen zu erhalten.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Erstellen eines Schnellfilters.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es gibt mehrere Konfigurationen mit dem Datensammler-FriendlyName "{0}". Doppelte Konfigurationen werden beim Testlauf ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Innere Ausnahme:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Ungültige Bedingung "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Testerweiterung weist einen ungültigen URI "{0}" auf: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Ungültiger Operator "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Initialisieren der Protokollierung mit "{0}": "{1}". Die Protokollierung wird nicht verwendet. Ausnahme: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde keine Testprotokollierung mit AssemblyQualifiedName, URI oder FriendlyName "{0}" gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Fehlende Klammer ")"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Fehlende Klammer "("]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: Fehlender Operand.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operator "|" oder "&" fehlt]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Datensammler hat eine Ausnahme vom Typ "{0}" aufgefangen: "{1}". Weitere Informationen: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Laufzeiteinstellungen wurden bereits geladen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Laden der Laufzeiteinstellungen. Fehler: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde ein ungültiger Einstellungsknoten angegebenen. Die Eigenschaft "name" eines Einstellungsknotens darf nicht leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Initialisieren des Einstellungsanbieters namens "{0}". Fehler: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Einstellungsanbieter namens "{0}" wurde nicht gefunden. Die Einstellungen können nicht geladen werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Stapelüberwachung:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültiges Format für TestCaseFilter {0}. Geben Sie das richtige Format an, und versuchen Sie es erneut. Beachten Sie, dass das falsche Format dazu führen kann, dass kein Test ausgeführt wird.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[datacollector mit dem Anzeigenamen "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diese Option funktioniert nur, wenn "vstest.console.exe" als Teil von Visual Studio installiert wurde.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typen, die vom Datensammlungskontext abgeleitet werden, können nicht zum Senden von Daten und Meldungen verwendet werden. Der DataCollectionContext für das Senden von Daten und Meldungen muss aus einem der Ereignisse stammen, die für den Datensammler ausgelöst wurden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index fc7328e221..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die aktive Testermittlung wurde abgebrochen. Grund: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der aktive Testlauf wurde abgebrochen. Grund: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Debugger kann nicht an den Standardtesthost angefügt werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Schließen einer vorhandenen Verbindung wurde vom Remotehost erzwungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Herstellen einer Verbindung des Prozesses "{0}" mit dem Prozess "{1}" nach {2} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{3}" fest, um den Timeoutwert zu erhöhen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testhostprozess ist abgestürzt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Kommunikation mit dem Testhostprozess ist nicht möglich.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unerwartete Meldung empfangen. Erwarteter MessageType: {0}. Tatsächlicher MessageType: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Überprüfen der Protokollversion. Der Test Runner und der Host müssen kompatibel sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Verhandeln des Protokolls. Timeout beim Warten auf Antwort nach {0} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{1}" fest, um den Timeoutwert zu erhöhen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 11438cb380..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter darf nicht NULL oder leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informationen: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Warnung: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument darf nicht leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument darf nicht negativ sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument muss den folgenden Typ aufweisen: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument weist die folgende Eigenschaft auf, die keine leere Zeichenfolge sein darf: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument weist die folgende Eigenschaft auf, die nicht negativ sein darf: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument weist die folgende Eigenschaft auf, die nicht NULL sein darf: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das angegebene Argument weist die folgende Eigenschaft auf: {0}. Diese Eigenschaft muss den folgenden Typ aufweisen: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahmefehler beim Verarbeiten eines Auftrags aus der Warteschlange "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Host "{0}" wurde nicht gefunden. Stellen Sie sicher, dass "{0}" auf dem Computer installiert und in der PATH-Umgebungsvariablen verfügbar ist.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Warteschlange {0} wurde bereits verworfen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Warteschlange {0} kann nicht verworfen werden, während sie angehalten ist.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Abrufen des Prozessnamens.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 10a16e3b55..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" in einem Ordner ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Debugger kann nicht an den Standardtesthost mit der Prozess-ID {0} angefügt werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector-Debugging ist aktiviert. Fügen Sie den Debugger an den Datensammlerprozess an, um den Vorgang fortzusetzen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Adaptersuche wird geändert. Weitere Informationen finden Sie unter https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Instanziieren des Discoverers: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mehrere Testadapter mit dem gleichen URI "{0}" wurden gefunden. Der Adapter "{1}" wird ignoriert. Deinstallieren Sie die in Konflikt stehenden Adapter, um diese Warnung zu vermeiden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene doppelte Quelle "{0}" wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Laden von Tests durch den Testdiscoverer "{0}". Ausnahme: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Aufrufen von Executor "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die ExecutionThreadApartmentState-Option wird für das Framework nicht unterstützt: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Starten von Testhost: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Datei "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hostdebuggen ist aktiviert. Fügen Sie den Debugger an den Testhostprozess an, um den Vorgang fortzusetzen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testexecutor, der dem Testdiscoverer "{0}" entspricht, wird ignoriert, weil der Discoverer nicht das DefaultExecutorUri-Attribut aufweist. Sie müssen ggf. das Testadapter-Add-In erneut installieren.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Initialisieren des Clientproxys: Es konnte keine Verbindung mit dem Testprozess hergestellt werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dieser Vorgang ist im Kontext einer Nichtdebugausführung unzulässig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde kein verfügbarer Proxy für die Deque gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} wurde nicht gefunden. Stellen Sie sicher, dass das dotnet auf dem Computer installiert ist.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testexecutor mit dem URI "{0}" wurde nicht gefunden. Stellen Sie sicher, dass der Testexecutor installiert ist und .NET Runtime-Version {1} unterstützt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Proxy mit der ID {0} wird nicht vom aktuellen Sitzungs-Manager verwaltet.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kein Test entspricht dem angegebenen Testfallfilter "{0}" in "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Keine der angegebenen Quellen "{0}" ist gültig. Beheben Sie die oben aufgeführten Fehler/Warnungen, und versuchen Sie es erneut. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erweiterungen nicht gefunden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sie verwenden eine ältere Version von Microsoft.NET.Test.Sdk. Wechseln Sie zu Version 15.3.0 oder höher.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Proxy mit der ID {0} ist bereits verfügbar und kann nicht erneut in die Warteschlange eingereiht werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Ermittlung von Tests wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die Testdiscoverer und -executors registriert und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die TestHost-Diagnose wird in der Datei {0} protokolliert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es stimmten keine Tests mit dem Filter überein, weil er mindestens eine ungültige Eigenschaft enthält ({0}). Geben Sie einen Filterausdruck mit gültigen Eigenschaften an ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c0809ec9c7..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der aktive Testlauf wurde abgebrochen, weil der Hostprozess unerwartet beendet wurde. Überprüfen Sie die oben aufgeführte Aufrufliste, falls verfügbar, um weitere Informationen zur Ursache der Ausnahme zu erhalten.]D;]A;Beim Absturz ausgeführter Test: ]D;]A;{0}]D;]A;Dieser Test kann, muss aber nicht unbedingt die Absturzursache sein.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der angegebene blame-Parameterschlüssel "{0}" ist ungültig. Dieser Schlüssel wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der blame-Parameterschlüssel "{0}" kann nur die Werte "{1}"/"{2}" unterstützen. Dieser Schlüssel wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Abbilderfassung war aktiviert, aber es wurde keine Abbilddatei generiert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{1}" ({0}) wird gesichert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diese Prozessstruktur wird gesichert (von unten).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene Inaktivitätszeit von {0} {1} ist abgelaufen. Vom Testhost und den untergeordneten Prozessen werden Stillstandsicherungen erfasst.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minuten]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Alle Tests wurden ausgeführt. Die Datei "Sequence" wird nicht generiert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Prozesssicherung konnte nicht gestartet werden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die erforderliche Umgebungsvariable PROCDUMP_PATH war NULL oder leer. Legen Sie PROCDUMP_PATH auf den Pfad des Ordners fest, der die geeignete ausführbare procdump-Datei enthält.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump war aktiviert, aber es wurde keine Abbilddatei generiert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sekunden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unerwarteter Wert "{0}" als Timeout angegeben. Geben Sie einen Wert in folgendem Format an: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c80a367e1d..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML-Testergebnisdatei: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML-Protokollierungsfehler: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Parameter "LogFileName" und "LogFilePrefix" können nicht zusammen angegeben werden. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index da7fddbc3d..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter darf nicht kleiner als 0 sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter darf nicht NULL oder leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der freie Name für {0}(1),(2),... im Verzeichnis "{1}" kann nicht abgerufen werden. Bereinigen Sie dieses Verzeichnis.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unter "{1}" wurde kein verfügbarer Dateiname für "{0}" mit dem Zeitstempelformat "{2}" abgerufen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bereitstellungselement "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bereitstellungselement "{0}" (Ausgabeverzeichnis "{1}")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurden keine Testeinstellungen angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die aktiven Testeinstellungen definieren nicht das Bereitstellungsverzeichnis der Ausführung.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Ergebnis ist keinem Testlauf zugeordnet. Verwenden Sie ein Ergebnis, das aus einem aktuell ausgeführten oder abgeschlossenen Testlauf stammt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der angegebene Datei-/Verzeichnisname "{0}" ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(NULL)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Anfügen von Dateien: {0}]D;]A;Fehlerdetails: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Test "{0}" wurde im Testlauf übersprungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Parameter "LogFileName" und "LogFilePrefix" können nicht zusammen verwendet werden. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Alle geladenen Ergebnisse]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ergebnisse nicht in einer Liste]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abgebrochen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abgeschlossen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Getrennt]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In Bearbeitung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht eindeutig]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht ausgeführt]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht ausführbar]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden (Ausführung abgebrochen)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausstehend]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Warnung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ergebnisdatei: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[WARNUNG: Ergebnisdatei wird überschrieben: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 7292896d4e..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter darf nicht NULL oder leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Beim Testlauf wurden DLLs erkannt, die für verschiedene Framework- und Plattformversionen erstellt wurden. Die folgenden DLLs entsprechen nicht den aktuellen Einstellungen: Framework {0} und Plattform {1}.{2}Wechseln Sie zu {3}, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene Einstellungsdatei entspricht nicht dem erforderlichen Format.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Keiner der angegebenen Testcontainer stimmt mit der Plattformarchitektur und den .NET Framework-Einstellungen für den Testlauf überein. Plattform: {0}, .NET Framework: {1}. Navigieren Sie zu http://go.microsoft.com/fwlink/?LinkID=330428, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" wurde für das Framework {1} und die Plattform {2} erstellt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 7a6691717a..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName unvollständig]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Stelligkeit der Methode muss numerisch sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Methode "{0}" wurde für den Typ "{1}" nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Typ "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unerwartetes Zeichen nach dem Ende von ManagedName (Position: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Leerzeichen sind in einem ManagedName unzulässig (Position: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c09b3bdc3e..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter darf nicht NULL oder leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Datei "{0}" ist nicht vorhanden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Objekt muss vom Typ {0} sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abgebrochen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abgeschlossen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Getrennt]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In Bearbeitung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht eindeutig]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht ausgeführt]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht ausführbar]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden (Ausführung abgebrochen)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausstehend]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Warnung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TypeConverter für den Typ "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Knoten "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aus dem bereitgestellten Datenstrom kann nicht gelesen werden. Daten aus einem Datenstrom können nur gesendet werden, wenn der Datenstrom Lesevorgänge unterstützt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der angegebene Dateiname "{0}" enthält die folgenden ungültigen Zeichen: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der angegebene Dateiname "{0}" ist reserviert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Eigenschaft "{0}" kann nicht als Werttyp "{1}" registriert werden, weil sie bereits als "{2}" registriert wurde.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Erstellen von MSDIA-Sitzung. COM-HRESULT "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Laden von MSDIA.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültiger URI in Datensammlereinstellungen "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Stammknoten der Laufzeiteinstellungen muss "RunSettings" heißen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Einstellung "{0}". Es wurde ein ungültiger Wert "{1}" für "{2}" angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Einstellungen "{0}". Unerwartetes XmlAttribute: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Einstellungen "{0}". Unerwartetes XmlElement: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültiger URI "{0}" in den Einstellungen "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Datensammlereinstellungen. Das erwartete Attribut '{0}' fehlt. Eine typische Datensammlereinstellung hat das folgende Format: <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Einstellungen "{0}". Erwartet wird mindestens ein XmlAttribute: "friendlyName", "uri" oder "assemblyQualifiedName".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter kann nicht für einen bestimmten Testlauf angegeben werden. FilterCriteria gilt nur für Ausführungen mit Quellen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Benachrichtigungshäufigkeit muss ein positiver Wert sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Benachrichtigungstimeout muss größer als null sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(NULL)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Projektmappenverzeichnis "{0}" ist nicht vorhanden. Stellen Sie sicher, dass das in "runsettings" angegebene Projektmappenverzeichnis vorhanden ist und über Leseberechtigungen für das Verzeichnis verfügt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Filterzeichenfolge "{0}" umfasst eine nicht erkannte Escapesequenz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Spaltennummer]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Executor-URI]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dateipfad]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zeilennummer]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Name]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Quelle]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Merkmale]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Meldung: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Keine]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Übersprungen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Computername]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult-Anzeigename]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dauer]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Endzeit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Spaltennummer des Fehlers]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehlermeldung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehlerstapelüberwachung]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ergebnis]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Startzeit]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Testmeldungen:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testeigenschaftentyp "{0}" der Eigenschaft "{1}" wird nicht unterstützt. Verwenden Sie einen der unterstützten Eigenschaftentypen (primitive Typen, uri, string, string[]5D;), und versuchen Sie es erneut. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a68aa48e6f..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurden mehrere Versionen derselben Erweiterung gefunden. Die höchste Version wird ausgewählt.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Host "{0}" für die Architektur "{1}" wurde nicht gefunden.]D;]A;]D;]A;Sie können das Problem beheben, indem Sie .NET "{1}" installieren.]D;]A;]D;]A;Das angegebene Framework finden Sie unter:]D;]A; – https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" wurde nicht gefunden. Veröffentlichen Sie Ihr Testprojekt, und versuchen Sie es noch mal.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" wurde nicht gefunden. Stellen Sie sicher, dass das Testprojekt einen NuGet-Verweis des Pakets "Microsoft.NET.Test.Sdk" aufweist.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9da7cccf20..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Laufzeiteinstellungen-XML enthält nicht den Knoten "RunSettings".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Einstellung "{0}". Für "{2}" wurde ein ungültiger Wert "{1}" angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Knoten "RunSettings" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Knoten "RunSettings" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Laden der Einstellungen. Fehler: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Inkompatible Zielplattformeinstellungen "{0}" mit der Systemarchitektur "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde eine unerwartete Einstellungsdatei angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 92a17f76a8..0000000000
--- a/Localize/lcl/de/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Vorgang zum Starten der Testsitzung wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Vorgang zum Beenden der Testsitzung wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Verarbeitung aktiver Testlaufanlagen wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die aktive Testermittlung wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der aktive Testlauf wurde abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Empfangen der Nachricht aus dem vstest.console-Prozess.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Datei "{0}" ist nicht vorhanden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der vstest.console-Prozess wurde anormal beendet.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 2bb1c885f0..0000000000
--- a/Localize/lcl/de/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bereits in RunSettings vorhandene LegacySettings-Knoten werden entfernt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings enthält keine eingebetteten testSettings. Die Migration wird nicht durchgeführt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die migrierte RunSettings-Datei wurde in folgendem Verzeichnis erstellt: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Attribute "agentNotRespondingTimeout", "deploymentTimeout" und "scriptTimeout" des Knotens "Timeouts" werden nicht unterstützt und daher nicht migriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gültige Syntax:]D;]A;SettingsMigrator.exe <vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration>]D;]A;SettingsMigrator.exe <vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration> <vollständiger Pfad zur zu erstellenden RUNSETTINGS-Datei>]D;]A;Beispiele:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/de/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/de/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 57dff98822..0000000000
--- a/Localize/lcl/de/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="de-DE" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Weitere Informationsmeldungen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf für Komponententests für die Windows Store-App konnte nicht gestartet werden: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde kein Test in den angegebenen Testcontainern gefunden. Darüber hinaus unterstützt der Microsoft Windows Store-Komponententestadapter keine APPXBUNDLE-Dateien. Erstellen Sie eine APPX-Datei (legen Sie die Option "App-Bundle generieren" auf "Nie" fest), wenn Sie das App-Paket erstellen, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die aktuell getestete Assembly wurde nicht gefunden. Stellen Sie sicher, dass das Projekt erstellt wird.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anlagen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die folgenden Testermittlungs-Add-Ins sind verfügbar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die folgenden Testausführungs-Add-Ins sind verfügbar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die folgenden Testprotokollierungs-Add-Ins sind verfügbar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die folgende Einstellungenanbieter-Add-Ins sind verfügbar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "/BatchSize" erfordert die Größe des Batches. Beispiel: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Sammeln von Absturzabbildern über die Option "CollectDump" für "Blame" wird für diese Plattform nicht unterstützt.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Sammeln von Abbildern bei Reaktionsunfähigkeit über die Option "CollectDump" mit "TestTimeout" für "Blame" wird für diese Plattform nicht unterstützt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der mit "blame" angegebene blame-Parameter "{0}" ist ungültig. Dieser Parameter wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<Buildbasispfad>]D;]A;      Das Verzeichnis mit den temporären Ausgaben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der BuildBasePath wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings-Argumente:]D;]A;      An die RunSettings-Konfigurationen über die Befehlszeile zu übergebende Argumente. Argumente werden unter Umständen als Name-Wert-Paar der Form [Name]5D;=[Wert]5D; nach "-- " übergeben. Beachten Sie das Leerzeichen nach "--".]D;]A;      Trennen Sie mehrere Paare der Form [Name]5D;=[Wert]5D; mithilfe von Leerzeichen.]D;]A;      Weitere Informationen zur Unterstützung von RunSettings-Argumenten: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Darf nicht NULL oder leer sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<Datensammler-Anzeigename>]D;]A;      Aktiviert den Datensammler für den Testlauf. Weitere Informationen finden Sie unter https://aka.ms/vstest-collect.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" wird nicht unterstützt, wenn der Testlauf mithilfe von "testsettings" konfiguriert wurde.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informationen: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Warnung: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Konfiguration>]D;]A;      Die Konfiguration, für die das Projekt erstellt wird, d. h. Debug/Release.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Alle Rechte vorbehalten.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der benutzerfreundliche Name des Datensammlers "{0}" ist ungültig. Der Datensammler wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tage]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Meldungen zu Debugablaufverfolgungen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout zum Herstellen einer Verbindung oder zum Verarbeiten von Anfragen für DesignModeClient an Port: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Beispiel: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Code Coverage ist für Windows Store-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Code Coverage ist für Windows Phone-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Lesen der Einstellungen des Adapters für diagnostische Daten hat eine ausgeführte "{0}" ausgelöst. Alle Adapter für diagnostische Daten werden in diesem Testlauf übersprungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Store-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Phone-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler bei der Ermittlung für die angegebenen Quellen. Ausnahme: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter "{0}" sollte nur ein Mal angegeben werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Führt den Test im blame-Modus aus. Diese Option ist hilfreich zum Isolieren des problematischen Tests, der einen Absturz des Testhosts verursacht.]D;]A;      Im aktuellen Verzeichnis wird eine Ausgabedatei namens "Sequence.xml" erstellt,]D;]A;      in der die Reihenfolge der Testausführung vor dem Absturz erfasst wird.]D;]A;      Optional können Sie eine Prozesssicherung für den Testhost erfassen.]D;]A;      Wenn Sie sich zum Erfassen einer Sicherung entschließen, wird bei einem Absturz standardmäßig eine Minisicherung erfasst.]D;]A;      Dieses Standardverhalten können Sie durch einige optionale Parameter außer Kraft setzen:]D;]A;      CollectAlways: Zum Erfassen einer Sicherung beim Beenden, selbst wenn kein Absturz eintritt (TRUE/FALSE). ]D;]A;      DumpType: Zur Angabe des Sicherungstyps (mini/full).]D;]A;      Beispiel: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Aktiviert den Datensammler "CodeCoverage" für den Testlauf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Pfad zur Protokolldatei>]D;]A;      Aktivieren Sie die Protokolle für die Testplattform.]D;]A;      Protokolle werden in die bereitgestellte Datei geschrieben.]D;]A;]D;]A;      Ändern Sie die Ablaufverfolgungsebene für Protokolle wie folgt:]D;]A;      Beispiel: /Diag:<Pfad zur Protokolldatei>;tracelevel=<standardmäßig "verbose">]D;]A;      Zulässige Werte für tracelevel: off, error, warning, info, verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/Anzeigename für Protokollierung>]D;]A;      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer]D;]A;      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=<Standardmäßig eindeutiger Dateiname>]5D;]D;]A;      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.]D;]A;]D;]A;      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:]D;]A;      Beispiel: /logger:console;verbosity=<Standardmäßig "minimal">]D;]A;      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.]D;]A;]D;]A;      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:]D;]A;      Beispiel: /logger:console;prefix=<Standardmäßig "false">]D;]A;      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/Anzeigename für Protokollierung>]D;]A;      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer]D;]A;      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=<Standardmäßig eindeutiger Dateiname>]5D;]D;]A;      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.]D;]A;]D;]A;      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:]D;]A;      Beispiel: /logger:console;verbosity=<Standardmäßig "normal">]D;]A;      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.]D;]A;]D;]A;      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:]D;]A;      Beispiel: /logger:console;prefix=<Standardmäßig "false">]D;]A;      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Legt den Wert einer Umgebungsvariablen fest. Erstellt die Variable, wenn Sie nicht vorhanden ist, und setzt sie andernfalls außer Kraft. Dies impliziert die Option "/InIsolation" und erzwingt die Ausführung der Tests in einem isolierten Prozess.]D;]A;      ]D;]A;      Dieses Argument kann mehrmals angegeben werden, um mehrere Variablen bereitzustellen.]D;]A;]D;]A;      Beispiel: -e:VARIABLE1=WERT1]D;]A;               -e:WEITERE_VARIABLE="WERT MIT LEERZEICHEN"]D;]A;               -e:WEITERE_VARIABLE="WERT;getrennt durch;Semikolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Umgebungsvariable "{0}" wurde bereits definiert, sie wird jedoch durch das Argument "-Environment" überschrieben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehlermeldung:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Zum Ausführen von Tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Zum Ausführen von Tests mit zusätzlichen Einstellungen wie Datensammlern:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ausnahme beim Instanziieren der Erweiterung "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Gesamtzeit: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 wird nicht unterstützt. Bei Projekten für Zielversion .NET Framework 3.5 wird der Test im CLR 4.0-Kompatibilitätsmodus ausgeführt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Frameworkversion>]D;]A;      Die .NET-Framework-Zielversion für die Testausführung. ]D;]A;      Gültige Werte sind ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" usw.]D;]A;      Weitere unterstützte Werte: Framework40, Framework45, FrameworkCore10, FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das /Framework-Argument erfordert die .NET Framework-Zielversion für den Testlauf. Beispiel: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Zeigt diese Syntaxmeldung an.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumente:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Beschreibung: Führt Tests aus den angegebenen Dateien aus.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Optionen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Syntax: vstest.console.exe [Argumente]5D; [Optionen]5D; [[--]5D; <RunSettings-Argumente>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Stunden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Flag "/InIsolation" ist veraltet. Die Tests werden immer in einem separaten Prozess ausgeführt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation/InIsolation]D;]A;      Führt die Tests in einem isolierten Prozess aus. Auf diese Weise ist es unwahrscheinlicher, dass der Prozess]D;]A;      "vstest.console.exe" bei einem Fehler in den Tests beendet wird.]D;]A;      Tests werden aber ggf. langsamer ausgeführt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "{0}" ist ungültig. Verwenden Sie die /help-Option, um die Liste gültiger Argumente anzuzeigen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige Batchgröße {0}. Die Batchgröße muss größer als null sein. Beispiel: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das blame-Argument "{0}" ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene Konfiguration ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das diag-Argument "{0}" ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Diagnosedateipfad "{0}" ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "{0}" wird im Befehl "EnableCodeCoverage" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /EnableCodeCoverage), und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültige .NET Framework-Version: {0}. Geben Sie den vollständigen Namen von TargetFramework an (Beispiel: .NETCoreApp,Version=v2.0). Weitere unterstützte .NET Framework-Versionen sind "Framework40", "Framework45", "FrameworkCore10" und "FrameworkUap10".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "{0}" wird im Befehl "InIsolation" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /InIsolation), und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das logger-Argument "{0}" ist ungültig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "{0}" wird im Befehl "Parallel" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /Parallel), und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "--ParentProcessId|/ParentProcessId" erfordert die Prozess-ID (Integerwert). Geben Sie die Prozess-ID des übergeordneten Prozesses an, der diesen Prozess gestartet hat.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ungültiger Plattformtyp: {0}. Gültige Plattformtypen sind {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "--Port|/Port" erfordert die Portnummer (Integerwert). Geben Sie den Port für die Socketverbindung und den Empfang von Ereignismeldungen an.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der in "ResultsDirectory" angegebene Pfad "{0}" ist ungültig. Fehler: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der in "TestAdapterPath" angegebene Pfad "{0}" ist ungültig. Fehler: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "/TestCaseFilter" kann nicht mit "/Tests" angegeben werden. Das Filtern von Testfällen ist nicht anwendbar, wenn Tests angegeben werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Parameterargument "{0}" für den Testlauf ist ungültig. Verwenden Sie das nachstehende Format.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Argument "{0}" wird im Befehl "UseVsixExtensions" nicht erwartet. Geben Sie den Befehl mit der Angabe an, ob die VSIX-Extensions verwendet oder übersprungen werden sollen (Beispiel: vstest.console.exe myTests.dll /UseVsixExtensions:true), und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListDiscoverers]D;]A;      Listet die installierten Testdiscoverer auf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListExecutors]D;]A;      Listet die installierten Testexecutors auf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListLoggers]D;]A;      Listet die installierten Testprotokollierungen auf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListSettingsProviders]D;]A;      Listet die installierten Testeinstellungenanbieter auf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die folgenden Tests sind verfügbar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<Dateiname>]D;]A;      Listet alle gefundenen Tests aus dem angegebenen Testcontainer auf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene Datei "{0}" ist schreibgeschützt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurde keine Testprotokollierung mit dem URI oder FriendlyName "{0}" gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mindestens eine angegebene RUNSETTINGS-Datei enthält ein ungültiges Token]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Testausführungs-Befehlszeilentool Version {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minuten]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurden keine Testquelldateien angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der in "TestAdapterPath" angegebene Pfad "{0}" enthält keine Testadapter. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Unbekannter Parameter "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es wurden keine Argumente angegeben.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Store-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Store-App.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Insgesamt {0} Tests wurden ermittelt, aber kein Test stimmt mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die installierten Test-Discoverer und -Executor und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} wurde für {1}/{2} erstellt. Den in einem Testlauf angegebenen Testassemblys muss ein .NET-Zielframework und eine Zielplattform gemeinsam sein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Keine]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nicht ausgeführt]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Öffnen der Antwortdatei "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Ausgabe>]D;]A;      Das Verzeichnis mit den auszuführenden Binärdateien.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Ausgabepfad wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Gibt an, dass die Tests parallel ausgeführt werden. Standardmäßig werden]D;]A;      alle verfügbaren Kerne auf dem Computer verwendet.]D;]A;      Die Anzahl der zu verwendenden Kerne kann ggf. mithilfe einer Einstellungsdatei konfiguriert werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ÜbergeordneteProzess-ID>]D;]A;      Die Prozess-ID des übergeordneten Prozesses, der für das Starten des aktuellen Prozesses zuständig ist.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bestanden]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf für die Tests für die Windows Phone-App konnte nicht gestartet werden: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Phone-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Phone-App.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Plattformtyp>]D;]A;      Zielplattformarchitektur für die Testausführung. ]D;]A;      Gültige Werte sind x86, x64 und ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Für das /Platform-Argument muss der Zielplattformtyp für den Testlauf angegeben werden. Beispiel: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Port>]D;]A;      Der Port für die Socketverbindung und das Empfangen von Ereignismeldungen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testlauf wird ausgeführt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Pfad "{0}" ist nicht vorhanden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<Datei>]D;]A;      Antwortdatei mit weiteren Optionen lesen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Das Testergebnisverzeichnis wird im angegebenen Pfad erstellt, wenn es noch nicht vorhanden ist.]D;]A;      Beispiel: /ResultsDirectory:<Pfad_zu_Ergebnisverzeichnis>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Parameter "/ResultsDirectory" erfordert einen Wert, wobei die Testergebnisse gespeichert werden müssen. Beispiel: /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Einstellungsdatei>]D;]A;      Einstellungen für die Ausführung der Tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Einstellungsdatei "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Für den Parameter "/Settings" muss eine Einstellungsdatei angegeben werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zum Ausführen von Tests kann nur ein App-Paket (APPX-Datei) angegeben werden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Testnamen >]D;]A;      Führt Tests aus, die mit den eingegebenen Werten übereinstimmen. Verwenden Sie zum]D;]A;      Angeben mehrerer Werte Kommas als Trennzeichen.]D;]A;      Beispiele: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Hiermit führen Sie Tests über die angegebenen Dateien oder das Platzhaltermuster aus. Trennen Sie mehrere Testdateinamen oder Muster]D;]A;      durch Leerzeichen. Legen Sie die Ausführlichkeit der Konsolenprotokollierung auf "detailed" fest, um übereinstimmende Testdateien anzuzeigen.]D;]A;      Beispiele: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Eingebettete Testeinstellungen werden – mit Ausnahme von Code Coverage und Microsoft Fakes – nicht für Datensammler unterstützt, die über Ausführungseinstellungen konfiguriert wurden. Weitere Informationen finden Sie unter https://aka.ms/vstest-configure-datacollector. Ausführungseinstellungen: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sekunden]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Übersprungen]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Insgesamt {0} Tests wurden ermittelt, aber einige Tests stimmen nicht mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das /Tests-Argument erfordert mindestens einen bestimmten Testnamen oder seine Teilzeichenfolgen.]D;]A;       Beispiele: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Stapelverfolgung:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Testermittlung wird gestartet, bitte warten...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Testausführung wird gestartet, bitte warten...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standardfehlermeldungen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standardausgabemeldungen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Pfad zu Testadaptern kann zudem mit dem Befehl /TestAdapterPath angegeben werden. Beispiel: /TestAdapterPath:<Pfad_zu_benutzerdefinierten_Adaptern>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Unterstützte Dateitypen:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Store-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Isolationsmodus wird zum Ausführen von Tests gemäß den Einstellungen der effektiven Plattform {0} und von .NET Framework {1} für den Testlauf verwendet. Verwenden Sie den /inIsolation-Parameter, um diese Warnung zu unterdrücken.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Phone-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Isolationsmodus wird zum Ausführen der Tests verwendet, weil Adapter für diagnostische Daten in den "runsettings" aktiviert wurden. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der angegebene benutzerdefinierte Testadapter-Suchpfad wurde nicht gefunden. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Hierdurch verwendet der Prozess "vstest.console.exe" im Testlauf]D;]A;      benutzerdefinierte Testadapter aus einem angegeben Pfad (soweit vorhanden). ]D;]A;      Beispiel: /TestAdapterPath:<Pfad_zu_benutzerdefinierten_Adaptern>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der /TestAdapterPath-Parameter erfordert einen Wert. Dabei handelt es sich um den Pfad eines Speicherorts mit benutzerdefinierten Testadaptern. Beispiel: /TestAdapterPath:c:\MeineBenutzerdefiniertenAdapter]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Ausdruck>]D;]A;      Führt Tests aus, die mit dem angegebenen Ausdruck übereinstimmen.]D;]A;      <Ausdruck> entspricht dem Format <Eigenschaft>Operator<Wert>[|&<Ausdruck>]5D;,]D;]A;         wobei Operator entweder "=", "!=" oder "~" ist (Der Operator "~" verfügt über eine contains-]D;]A;         Semantik und kann auf Zeichenfolgeneigenschaften, z. B. DisplayName, angewendet werden).]D;]A;         Zum Gruppieren von Unterausdrücken können Klammern () verwendet werden.]D;]A;      Beispiele: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Für das Argument /TestCaseFilter ist der Filterwert erforderlich.]D;]A;        Filterwert kann von folgendem Typ sein: <Eigenschaft>=<Wert>.]D;]A;        Beispiele: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testlauf abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf wurde mit dem Fehler {0} abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testlauf abgebrochen.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fehler beim Testlauf.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der Testlauf war erfolgreich.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}: Fehler: {1}, erfolgreich: {2}, übersprungen: {3}, gesamt: {4}, Dauer: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Nicht bestanden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gesamtzahl Tests: unbekannt]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Bestanden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Übersprungen: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gesamtzahl Tests: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Das Framework {0} wird zum Ausführen der Tests verwendet. Geben Sie /Framework:{1} an, um diese Warnung zu unterdrücken.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die angegebene Testquelldatei "{0}" wurde nicht gefunden.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Insgesamt {0} Testdateien stimmten mit dem angegebenen Muster überein.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Verstrichene Zeit:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Standard-Executor-URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions wird demnächst eingestellt. Verwenden Sie stattdessen /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Bewirkt, dass der Prozess "vstest.console.exe" die installierten VSIX-Extensions ]D;]A;      (sofern vorhanden) im Testlauf verwendet oder überspringt.]D;]A;      Beispiel /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der /UseVsixExtensions-Parameter erfordert einen Wert. Wenn TRUE, werden die installierten VSIX-Extensions (falls vorhanden) im Testlauf verwendet. Wenn FALSE, werden sie ignoriert. Beispiel: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Vstest-Diagnose wird in der Datei {0} protokolliert.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 6d897d6812..0000000000
--- a/Localize/lcl/es/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Excepción al recopilar las entradas finales del registro de eventos "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La propiedad DataCollector del registro de eventos no encontró eventLogContext para el contexto de DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El registro de eventos "{0}" ha encontrado una excepción; algunos eventos pueden haberse perdido. Error: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Es posible que el registro de eventos "{0}" se haya borrado durante la recopilación; algunos eventos pueden no haberse recopilado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede leer el registro de eventos "{0}" desde el equipo "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a51318fb24..0000000000
--- a/Localize/lcl/es/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No hay datos de la cobertura de código disponibles. La cobertura de código solo se admite en Windows actualmente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo crear el directorio {0} debido al error {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo inicializar el recopilador de datos de la cobertura de código debido al error {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se recibió el evento en ejecución de CodeCoverage.exe. Compruebe los registros del evento para ver el motivo del error.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo recibir el evento en ejecución de CodeCoverage.exe en {0} segundos. Esto puede deberse a la lentitud de la máquina. Configure la variable de entorno {1} para aumentar el tiempo de espera.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el archivo CodeCoverage.exe en {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 27e5d6bcdb..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName está incompleto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La aridad del método debe ser numérica]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Método "{0}" no encontrado en el tipo "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo "{0}" no encontrado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caracteres inesperados después del final de ManagedName (posición: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El espacio en blanco no es válido en un elemento ManagedName (posición: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}.{1}" no se ha implementado en esta plataforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 6567e87f70..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se completó la compilación.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilación iniciada, espere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Omitiendo la ejecución de la prueba para el proyecto {0}. Para ejecutar pruebas con dotnet test, agregue la propiedad "<IsTestProject>true</IsTestProject>" al archivo del proyecto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serie de pruebas para {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Advertencia: Actualice la referencia del paquete Microsoft.NET.Test.Sdk a la versión 15.8.0 o posterior para recopilar la cobertura de código.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 49226cc502..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo ejecutar la serie de pruebas porque el estado inicial no era válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encontró un proveedor de tiempo de ejecución de prueba adecuado para esta ejecución.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anulando la serie de pruebas: se superó el tiempo de espera de {0} milisegundos para la serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La operación “Esperar que termine” no se permite cuando no hay ninguna serie de pruebas activa. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d554cbf2ce..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar el problema: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura. Para obtener más información, consulte el mensaje de error:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La operación se cancelará como se ha solicitado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Recopilación de datos: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El recopilador de datos "{0}" no pudo proporcionar información de inicialización. Error: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El recopilador de datos "{0}" produjo una excepción durante la carga, creación o inicialización del tipo: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensaje del recopilador de datos "{0}": {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo encontrar el recopilador de datos "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El recopilador de datos "{0}" solicitó que la variable de entorno "{1}" con el valor "{2}" se estableciera en el entorno de ejecución de pruebas, pero otro recopilador de datos "{3}" ya ha solicitado la misma variable de entorno con otro valor "{4}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI de extensión de pruebas duplicado ({0}). Se omitirá la extensión duplicada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proveedor de configuración duplicado con el nombre '{0}'. Se omitirá el proveedor duplicado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sección de parámetros de ejecución duplicada con el nombre "{0}". Se omitirán los parámetros duplicados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Paréntesis vacío ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo encontrar la lista de extensiones de prueba unitaria instaladas. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudieron cargar las extensiones del archivo "{0}". Use /diag para obtener más información.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al crear el filtro rápido.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hay varias configuraciones que tienen el nombre descriptivo del recopilador de datos "{0}". Se omitirán las configuraciones duplicadas en la serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Excepción interna:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Condición '{0}' no válida]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La extensión de pruebas tiene un URI no válido ({0}): {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Operador no válido ({0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción al inicializar el registrador con {0}: "{1}". No se usará el registrador. Excepción: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra ningún registrador de pruebas con AssemblyQualifiedName, URI o FriendlyName "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Falta ')']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Falta '(']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: Falta un operando]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falta el operador "|" o "&"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El recopilador de datos detectó una excepción de tipo "{0}": "{1}". Más detalles: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los parámetros de ejecución ya se han cargado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al cargar los parámetros de ejecución. Error: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se especificó un nodo de configuración no válido. La propiedad de nombre del nodo de configuración no debe estar vacía.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al inicializar el proveedor de configuración '{0}'. Error: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el proveedor de configuración '{0}'. No se puede cargar la configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Seguimiento de la pila:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Formato incorrecto de TestCaseFilter {0}. Especifique el formato correcto y vuelva a intentarlo. Tenga en cuenta que un formato incorrecto puede dar lugar a que no se ejecute ninguna prueba.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra ningún objeto datacollector con el nombre descriptivo "{0}".]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esta opción funciona solo con vstest.console.exe instalado como parte de Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los tipos derivados del contexto de recolección de datos no se pueden usar para enviar datos y mensajes. El elemento DataCollectionContext usado para enviar datos y mensajes debe proceder de alguno de los eventos generados para el recolector de datos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4405631ba9..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha anulado la detección de pruebas activa. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha anulado la serie de pruebas activa. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede asociar el depurador al host de prueba predeterminado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El host remoto forzó el cierre de una conexión.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El proceso {0} no pudo conectar con el proceso {1} después de {2} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {3} para aumentar el tiempo de espera.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proceso de host de pruebas bloqueado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede establecer comunicación con el proceso del host de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha recibido un mensaje inesperado. Tipo de mensaje esperado: {0} Tipo de mensaje real: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error en la comprobación de la versión del protocolo. Asegúrese de que el ejecutor de pruebas y el host son compatibles.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo negociar el protocolo, se agotó el tiempo de espera para la respuesta después de {0} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {1} para aumentar el tiempo de espera.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 8e2e47af28..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro no puede ser nulo ni estar vacío.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Información: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Advertencia: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado no puede estar vacío.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado no puede ser negativo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado debe tener el tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado tiene la siguiente propiedad, que no puede ser una cadena vacía: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado tiene la siguiente propiedad, que no puede ser negativa: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado tiene la siguiente propiedad, que no puede ser nula: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento especificado tiene la siguiente propiedad: {0}. Esta propiedad debe tener el tipo {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción no controlada al procesar un trabajo de la cola '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo encontrar el host "{0}". Asegúrese de que "{0}" está instalado en el equipo y está disponible en la variable de entorno PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La cola {0} ya se ha eliminado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La cola {0} no se puede eliminar mientras está en pausa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al obtener el nombre del proceso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index de5530698a..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar la incidencia: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede asociar el depurador al host de prueba predeterminado con el id. de proceso: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La depuración del recopilador de datos está habilitada. Asocie el depurador al proceso del recopilador de datos para continuar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se está cambiando la búsqueda de adaptador. Siga https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obtener más detalles.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción al crear una instancia del programa de detección: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se han encontrado varios adaptadores de prueba con el mismo URI ({0}). Se omitirá el adaptador '{1}'. Desinstale los adaptadores que están en conflicto para evitar esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se omitirá el origen duplicado especificado ({0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción cuando el programa de detección de pruebas '{0}' estaba cargando pruebas. Excepción: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción al invocar al ejecutor '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opción ExecutionThreadApartmentState de ejecución no admitida para el marco: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo iniciar el host de prueba con el error: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el archivo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La depuración host está habilitada. Asocie el depurador al proceso de host de prueba para continuar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se omitirá el ejecutor de pruebas correspondiente al programa de detección de pruebas {0}, porque este último no tiene el atributo DefaultExecutorUri. Puede ser necesario reinstalar el complemento del adaptador de prueba.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo inicializar el proxy de cliente: no se puede conectar al proceso de prueba.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esta operación no se permite en el contexto de una ejecución que no sea de depuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encontró ningún proxy disponible para quitar de la cola.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo encontrar {0}. Asegúrese de que dotnet esté instalado en la máquina.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el ejecutor de pruebas con el URI '{0}'. Asegúrese de que el ejecutor de pruebas está instalado y admite el entorno de ejecución .NET, versión {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El administrador de la sesión actual no administra el proxy con el identificador {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguna prueba coincide con el filtro de casos de prueba proporcionado "{0}" en {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguno de los orígenes especificados ({0}) es válido. Corrija los errores o advertencias y vuelva a intentarlo. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudieron encontrar las extensiones {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Está utilizando una versión anterior de Microsoft.NET.Test.Sdk. Cámbiese a una versión igual o superior a 15.3.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El proxy con el identificador {0} ya está disponible y no se puede volver a poner en cola.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha cancelado la detección de las pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No hay ninguna prueba disponible en {0}. Asegúrese de que los detectores y ejecutores de pruebas están registrados y de que la configuración de versión de la plataforma y de Framework es correcta y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registrando diagnóstico de TestHost en el archivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguna prueba coincide con el filtro porque contiene una o varias propiedades no válidas ({0}). Especifique una expresión de filtro que contenga propiedades válidas ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a19711bc1b..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La serie de pruebas activa se anuló porque el proceso de host se cerró de forma inesperada. Compruebe la pila de llamadas anterior, si está disponible, para obtener más información sobre el origen de la excepción.]D;]A;Prueba en ejecución cuando se produjo el bloqueo: ]D;]A;{0}]D;]A;Esta prueba puede ser el origen del bloqueo o no serlo.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La clave de parámetro blame especificada {0} no es válida. Se omitirá esta clave.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La clave de parámetro blame {0} solo puede admitir valores {1}/{2}. Se omitirá esta clave.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La opción para recopilar un volcado de memoria estaba habilitada, pero no se generó ningún archivo de volcado de memoria.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Volcando {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Volcando este árbol de procesos (desde abajo)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El tiempo de inactividad de {0} {1} que se ha especificado ha transcurrido. Recopilando volcados de bloqueos del host de pruebas y sus procesos secundarios]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[minutos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Todas las pruebas han terminado de ejecutarse; no se generará el archivo Sequence.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se ha podido iniciar el volcado de proceso: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variable de entorno PROCDUMP_PATH requerida era NULL o estaba vacía. Establezca PROCDUMP_PATH en la ruta de acceso de la carpeta que contiene el ejecutable procdump correcto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump estaba habilitado pero no se ha generado el archivo de volcado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[segundos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Valor inesperado "{0}" proporcionado como tiempo de espera. Indique un valor en este formato: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 1f4523cad4..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Archivo de resultados de pruebas HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error del registrador HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los parámetros LogFileName y LogFilePrefix no se pueden proporcionar juntos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 12f7f549cb..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro no puede ser menor que 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro no puede ser nulo ni estar vacío.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede obtener el nombre libre de {0}(1),(2),... en el directorio {1}. Limpie este directorio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra ningún nombre de archivo disponible para {0} con el formato de marca de tiempo "{2}" en {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[elemento de implementación '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[elemento de implementación '{0}' (directorio de salida '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se ha especificado ninguna configuración de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configuración de pruebas activa no define el directorio de implementación de ejecución.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El resultado no está asociado a una serie de pruebas. Use un resultado que se haya obtenido de una serie de pruebas finalizada o en curso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El nombre del archivo o directorio especificado ({0}) no es válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(nulo)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudieron asociar archivos de: {0}]D;]A;Detalles del error: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha omitido la prueba '{0}' en la serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los parámetros LogFileName y LogFilePrefix no se pueden usar juntos. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Todos los resultados cargados]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Resultados sin formato de lista]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anuladas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Finalizadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Desconectadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En curso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No concluyentes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No ejecutadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No ejecutables]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas (ejecución anulada)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pendientes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tiempo de espera agotado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Advertencia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Archivo de resultados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ADVERTENCIA: Se sobrescribirá el archivo de resultados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 57c98eec7e..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro no puede ser nulo ni estar vacío.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La serie de pruebas detectó archivos DLL que se compilaron para diferentes versiones de marco de trabajo y plataforma. Los siguientes archivos DLL no coinciden con la configuración actual, que es el marco de trabajo {0} y la plataforma {1}. {2}Vaya a {3} para obtener más información sobre cómo administrar esta configuración.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo de configuración proporcionado no tiene el formato requerido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguno de los contenedores de prueba proporcionados coincide con la configuración de arquitectura de plataforma y .Net Framework de la serie de pruebas. Plataforma: {0}, .Net Framework: {1}. Vaya a http://go.microsoft.com/fwlink/?LinkID=330428 para obtener más información sobre cómo administrar esta configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} se ha compilado para el marco {1} y la plataforma {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index c00289315d..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName está incompleto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La aridad del método debe ser numérica]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Método "{0}" no encontrado en el tipo "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo "{0}" no encontrado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caracteres inesperados después del final de ManagedName (posición: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El espacio en blanco no es válido en un elemento ManagedName (posición: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3a92b1d568..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro no puede ser nulo ni estar vacío.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo {0} no existe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El objeto debe ser de tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anuladas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Finalizadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Desconectadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En curso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No concluyentes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No ejecutadas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No ejecutables]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas (ejecución anulada)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pendientes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tiempo de espera agotado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Advertencia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra TypeConverter para el tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el nodo '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede leer el flujo proporcionado. Los datos de un flujo no se pueden enviar si el flujo no admite lectura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El nombre de archivo proporcionado ({0}) contiene los siguientes caracteres no válidos: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El nombre de archivo proporcionado ({0}) es un nombre reservado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede registrar la propiedad '{0}' como tipo de valor '{1}' porque ya se registró como '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo crear msdia Session COM HResult "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo cargar msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI no válido en la configuración del recopilador de datos "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El nodo raíz de los parámetros de ejecución debe denominarse 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configuración no válida: '{0}'. Se ha especificado un valor no válido ('{1}') para '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configuración no válida: '{0}'. Atributo XML no esperado: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configuración no válida: '{0}'. Elemento XML no esperado: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI "{0}" no válido en la configuración "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configuración del recolector de datos no es válida. Falta el atributo esperado '{0}'. Una configuración de colector de datos típica debería ser similar a <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configuración "{0}" no válida. Se esperaba al menos uno de los siguientes valores de XmlAttribute: friendlyName, uri y assemblyQualifiedName.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede especificar TestCaseFilter para series de pruebas específicas. FilterCriteria se usa solo para ejecuciones con orígenes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La frecuencia de notificación debe ser un valor positivo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El tiempo de espera de notificación debe ser mayor que cero.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(nulo)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El directorio de solución '{0}' no existe. Asegúrese de que el directorio de solución especificado en Runsettings existe y de que tiene permisos de lectura para el directorio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La cadena de filtro "{0}" incluye una secuencia de escape no reconocida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número de columna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI del ejecutor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ruta de acceso del archivo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre completo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Id.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número de línea]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Origen]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rasgos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Mensaje: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Seguimiento de la pila:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha omitido]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre de equipo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre para mostrar del resultado de la prueba]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Duración]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hora de finalización]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número de columna de error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensaje de error]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Seguimiento de la pila de errores]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Resultado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hora de inicio]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Mensajes de prueba:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se admite el tipo '{0}' de la propiedad de prueba '{1}'. Use un tipo de propiedad admitido (tipos primitivos, URI, string, string[]5D;) y vuelva a intentarlo. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e04261dcbd..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se encontraron varias versiones de la misma extensión. Seleccionando la versión más alta.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encontró el host "{0}" para la arquitectura "{1}".]D;]A;]D;]A;Puede resolver el problema instalando el .NET "{1}".]D;]A;]D;]A;El marco especificado se puede encontrar en:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra {0}. Publique el proyecto de prueba y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra {0}. Asegúrese de que el proyecto de prueba tenga una referencia NuGet del paquete "Microsoft.NET.Test.Sdk".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ee0ddaa0eb..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo XML de parámetros de ejecución no contiene el nodo "RunSettings".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parámetro '{0}' no válido. Se ha especificado un valor no válido ({1}) para '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el nodo 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el nodo 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al cargar la configuración. Error: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configuración de plataforma de destino '{0}' es incompatible con la arquitectura del sistema '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha especificado un archivo de configuración no esperado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 82ac52f636..0000000000
--- a/Localize/lcl/es/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La operación de inicio de la sesión de prueba se ha anulado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La operación de detención de la sesión de prueba se ha anulado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha anulado el procesamiento de los datos adjuntos de la serie de pruebas activa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha anulado la detección de pruebas activa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha anulado la serie de pruebas activa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo recibir el mensaje del proceso vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo {0} no existe]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El proceso vstest.console finalizó de forma anómala]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c80ffc4bca..0000000000
--- a/Localize/lcl/es/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se quitará cualquier nodo de LegacySettings que ya exista en el archivo RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings no contiene ningún valor de testSettings incrustado, por lo que no se migrará.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo RunSettings migrado se ha creado a las {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts no se admiten, por lo que no se migrarán.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uso válido:]D;]A;SettingsMigrator.exe <Ruta completa al archivo testsettings o runsettings que se va a migrar>]D;]A;SettingsMigrator.exe <Ruta completa al archivo testsettings o runsettings que se va a migrar> <Ruta completa al archivo runsettings que se va a crear>]D;]A;Ejemplos:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/es/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/es/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index fe1a1ace7b..0000000000
--- a/Localize/lcl/es/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="es-ES" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensajes con información adicional:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede iniciar la serie de pruebas unitarias para la aplicación de la Tienda Windows: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se han encontrado pruebas en los contenedores de pruebas especificados. Además, el adaptador de pruebas unitarias de la Tienda Microsoft Windows no admite archivos .appxbundle. Cree un archivo .appx (establezca la opción Generar paquete de aplicaciones en Nunca) cuando cree el paquete de la aplicación y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el ensamblado sometido a pruebas. Asegúrese de que el proyecto se ha compilado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Datos adjuntos:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los siguientes complementos de detección de pruebas están disponibles:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los siguientes complementos de ejecución de pruebas están disponibles:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los siguientes complementos de registrador de pruebas están disponibles:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los siguientes complementos de proveedores de configuración están disponibles:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /BatchSize requiere el tamaño del lote. Ejemplo: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La recopilación de volcados de memoria mediante la opción CollectDump para Blame no se admite en esta plataforma.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La recopilación de volcados de memoria mediante la opción CollectDump con TestTimeout para Blame no se admite en esta plataforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro blame especificado con blame, {0} no es válido. Se omitirá este parámetro.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<Ruta de acceso base de la compilación>]D;]A;      Directorio que contiene las salidas temporales.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra la ruta de acceso base de la compilación. Proporcione una ruta de acceso válida y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumentos de RunSettings:]D;]A;      Argumentos para pasar configuraciones de runsettings a través de la línea de comandos. Los argumentos se pueden especificar como un par nombre-valor en la forma [nombre]5D;=[valor]5D; después de "-- ". Observe que hay un espacio después de --. ]D;]A;      Use un espacio para separar varios pares de [nombre]5D;=[valor]5D;.]D;]A;      Más información sobre la compatibilidad de argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No puede ser nulo ni estar vacío]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<Nombre descriptivo del recopilador de datos>]D;]A;      Habilita el recopilador de datos para la serie de pruebas. Más información aquí: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" no se admite si la serie de pruebas está configurada mediante testsettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Información: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Advertencia: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuración>]D;]A;      Configuración para la que se ha compilado el proyecto, es decir, Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Todos los derechos reservados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El nombre descriptivo del recopilador de datos "{0}" no es válido. El recopilador de datos se ignorará.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Días]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Depurar mensajes de trazas:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tiempo de espera para conectar o procesar la solicitud para DesignModeClient en el puerto: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Ejemplo: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La cobertura de código no está disponible para aplicaciones de la Tienda Windows. Se omitirá el análisis de cobertura de código para esta serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La cobertura de código no está disponible para aplicaciones de Windows Phone. Se omitirá el análisis de cobertura de código para esta serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Al leer la configuración de adaptador de datos de diagnóstico, se produjo una excepción al ejecutar '{0}'. Se omitirán todos los adaptadores de datos de diagnóstico en esta ejecución.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de la Tienda Windows. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de Windows Phone. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo llevar a cabo la detección en los orígenes dados. Excepción: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro "{0}" debe proporcionarse solo una vez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Ejecuta la prueba en modo blame. Esta opción es útil a la hora de aislar la prueba problemática que provoca el bloqueo del host de prueba.]D;]A;      Crea un archivo de salida en el directorio actual como "Sequence.xml",]D;]A;      que captura el orden de ejecución de la prueba antes del bloqueo.]D;]A;      Tiene la opción de elegir recopilar el volcado de proceso para el host de prueba.]D;]A;      Cuando elige recopilar el volcado, de forma predeterminada se recopila un mini volcado en un bloqueo.]D;]A;      También puede elegir invalidar este comportamiento predeterminado mediante algunos parámetros opcionales:]D;]A;      CollectAlways: para recopilar un volcado al salir incluso aunque no haya un bloqueo (true/false) ]D;]A;      DumpType: para especificar el tipo de volcado (mini/completo).]D;]A;      Ejemplo: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Habilita el recopilador de datos "CodeCoverage" para la serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Ruta al archivo de registro>]D;]A;      Habilita los registros para la plataforma de pruebas.]D;]A;      Los registros se escriben en el archivo proporcionado.]D;]A;]D;]A;      Cambie el nivel de seguimiento de los registros tal y como se muestra a continuación]D;]A;      Ejemplo: /Diag:<Ruta al archivo de registro>;tracelevel=<Valor predeterminado: "verbose">]D;]A;      Valores permitidos para el nivel de seguimiento: off, error, warning, info y verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI del registrador/Nombre descriptivo>]D;]A;      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en ]D;]A;      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=<Valor predeterminado: nombre de archivo único>]5D;]D;]A;      Crea un archivo en el directorio TestResults con el valor LogFileName dado.]D;]A;]D;]A;      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación]D;]A;      Ejemplo: /logger:console;verbosity=<Valor predeterminado: "minimal">]D;]A;      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.]D;]A;]D;]A;      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación]D;]A;      Ejemplo: /logger:console;prefix=<Valor predeterminado: "false">]D;]A;      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI del registrador/Nombre descriptivo>]D;]A;      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en ]D;]A;      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=<Valor predeterminado: nombre de archivo único>]5D;]D;]A;      Crea un archivo en el directorio TestResults con el valor LogFileName dado.]D;]A;]D;]A;      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación]D;]A;      Ejemplo: /logger:console;verbosity=<Valor predeterminado: "normal">]D;]A;      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.]D;]A;]D;]A;      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación]D;]A;      Ejemplo: /logger:console;prefix=<Valor predeterminado: "false">]D;]A;      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NOMBRE>=<VALOR>]D;]A;      Establece el valor de una variable de entorno. Crea la variable si no existe o la reemplaza en caso de que exista. Esto implica el conmutador /InIsolation y fuerza la ejecución de las pruebas en un proceso aislado.]D;]A;      ]D;]A;      Este argumento se puede especificar varias veces para proporcionar múltiples variables.]D;]A;]D;]A;      Ejemplo: -e:VARIABLE1=VALOR1]D;]A;               -e:OTRA_VARIABLE="VALOR CON ESPACIOS"]D;]A;               -e:OTRA_VARIABLE="VALOR;separado por;puntoycoma"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variable de entorno "{0}" ya se definió, pero se reemplaza por el argumento -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensaje de error:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Para ejecutar pruebas:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Para ejecutar pruebas con configuración adicional como recolectores de datos:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se produjo una excepción al crear una instancia de la extensión '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Tiempo total: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con error]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se admite Framework35. Para los proyectos que tienen como destino .NET Framework 3.5, la prueba se ejecutará en el "modo de compatibilidad" de CLR 4.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Versión de Framework>]D;]A;      Versión de .NET Framework de destino que se usará para la ejecución de pruebas. ]D;]A;      Los valores válidos son ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc.]D;]A;      Otros valores admitidos son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /Framework requiere la versión de .Net Framework de destino para la serie de pruebas. Ejemplo: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Muestra este mensaje de uso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumentos:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Descripción: Ejecuta pruebas de los archivos especificados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opciones:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uso: vstest.console.exe [Argumentos]5D; [Opciones]5D; [[--]5D; <Argumentos de RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Horas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La marca /InIsolation está en desuso. Las pruebas se ejecutan siempre en un proceso independiente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Ejecuta las pruebas en un proceso aislado. De ese modo, es menos probable que el proceso vstest.console.exe se]D;]A;      detenga ante un error en las pruebas, pero es posible que]D;]A;      las pruebas se ejecuten con más lentitud.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento {0} no es válido. Use la opción /help para comprobar la lista de argumentos válidos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tamaño de lote no válido ({0}). El tamaño de lote debe ser mayor que cero. Ejemplo: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento de Blame "{0}" no es válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configuración dada no es válida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento de Diag "{0}" no es válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ruta de acceso al archivo Diag "{0}" no es válida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento {0} no se espera en el comando 'EnableCodeCoverage'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Versión de .Net Framework no válida: {0}. Proporcione el nombre completo de TargetFramework (ejemplo: .NETCoreApp,Version=v2.0). Otras versiones de .Net Framework admitidas son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento {0} no se espera en el comando 'InIsolation'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /InIsolation) y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento de Logger "{0}" no es válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento {0} no se espera en el comando 'Parallel'. Especifique el comando sin el argumento (ejemplo: vstest.console.exe myTests.dll /Parallel) y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento --ParentProcessId|/ParentProcessId requiere el identificador del proceso, que es un entero. Especifique el identificador del proceso principal que inició este proceso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo de plataforma no válido: {0}. Los tipos de plataforma válidos son {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento --Port|/Port requiere el número de puerto, que es un entero. Especifique el puerto para la conexión de socket y la recepción de mensajes de eventos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ruta de acceso "{0}" especificada en "ResultsDirectory" no es válida. Error: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ruta de acceso '{0}' especificada en 'TestAdapterPath' no es válida. Error: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /TestCaseFilter no se puede especificar con /Tests. El filtrado de casos de prueba no es aplicable cuando se especifican pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento del parámetro de la serie de pruebas "{0}" no es válido. Use el formato siguiente.]D;]A;     Formato: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento {0} no se espera en el comando 'UseVsixExtensions'. Especifique el comando indicando si deben usarse u omitirse las extensiones vsix (ejemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Enumera los programas de detección de pruebas instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Enumera los ejecutores de pruebas instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Enumera los registradores de pruebas instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Enumera los proveedores de configuración de pruebas instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Las siguientes pruebas están disponibles:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<nombreArchivo]D;]A;      Muestra todas las pruebas detectadas del contenedor de pruebas especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El archivo {0} proporcionado es de solo lectura]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Nombre descriptivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra un registrador de pruebas con el URI o el nombre descriptivo '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uno o varios runsettings proporcionados contienen un token no válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Herramienta de línea de comandos de ejecución de pruebas de Microsoft(R), versión {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minutos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se han especificado archivos de código fuente de prueba.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ruta de acceso '{0}' especificada en 'TestAdapterPath' no contiene ningún adaptador de prueba. Proporcione una ruta de acceso válida y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se reconoce el parámetro "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se han especificado argumentos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El paquete de la aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de la Tienda Windows, cree un paquete de aplicación usando el proyecto Biblioteca de pruebas unitarias para aplicaciones de la Tienda Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha detectado un total de {0} pruebas, pero ninguna de ellas coincide con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No hay ninguna prueba disponible en {0}. Asegúrese de que la configuración de detectores y ejecutores de pruebas, plataforma y versión de .NET Framework sea correcta e inténtelo de nuevo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} se ha creado para {1}/{2}. Los ensamblados de prueba especificados en una ejecución deben tener una versión de .Net Framework y una plataforma comunes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ninguno]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sin ejecutar]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Error al abrir el archivo de respuesta "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Salida>]D;]A;      Directorio que contiene los binarios que se van a ejecutar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra la ruta de acceso de salida. Proporcione una ruta de acceso válida y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Especifica que las pruebas se ejecuten en paralelo. De forma]D;]A;      predeterminada, se pueden usar todos los núcleos disponibles]D;]A;      en la máquina. El número de núcleos que debe usarse se puede]D;]A;      especificar en el archivo de configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<idProcesoPrimario>]D;]A;      Identificador del proceso primario responsable del inicio del proceso actual.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Correctas]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede iniciar la serie de pruebas para la aplicación de Windows Phone: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El paquete de aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de Windows Phone, cree un paquete de aplicación usando el proyecto Aplicación de pruebas unitarias para Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<tipoPlataforma>]D;]A;      Arquitectura de la plataforma de destino que se usará para la ejecución de pruebas. ]D;]A;      Los valores válidos son x86, x64 y ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /Platform requiere que se proporcione el tipo de plataforma de destino para la serie de pruebas. Ejemplo: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Puerto>]D;]A;      Puerto para la conexión de socket y la recepción de mensajes de eventos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serie de pruebas en curso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ruta de acceso {0} no existe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      Leer el archivo de respuesta para ver más opciones.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      El directorio de resultados de pruebas se creará en la ruta de acceso especificada, si no existe.]D;]A;      Ejemplo  /ResultsDirectory:<Ruta al directorio de resultados>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro /ResultsDirectory requiere un valor, donde deben guardarse los resultados de la prueba. Ejemplo: /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<archivoConfiguración>]D;]A;      Configuración que se usará cuando se ejecuten pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el archivo de configuración '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro /Settings requiere que se proporcione un archivo de configuración.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Solo se puede especificar un paquete de aplicación (archivo .appx) para ejecutar pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<nombres de pruebas>]D;]A;      Ejecuta las pruebas con nombres que coinciden con los valores proporcionados. Para proporcionar varios]D;]A;      valores, sepárelos con comas]D;]A;      Ejemplos: /Tests:MétodoPrueba1]D;]A;                /Tests:MétodoPrueba1,MétodoPrueba2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Ejecuta las pruebas del patrón con comodines o los archivos especificados. Separe varios patrones o]D;]A;      nombres de archivo de prueba con espacios. Establezca el nivel de detalle del]D;]A;      registrador en detallado para ver los archivos de prueba coincidentes.]D;]A;      Ejemplos: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Los recopiladores de datos diferentes de Cobertura de código y Microsoft Fakes configurados a través de la configuración de ejecución no se admiten con la configuración de pruebas integrada. Consulte https://aka.ms/vstest-configure-datacollector para obtener más información. Configuración de ejecución: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Segundos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Nombre de configuración: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Omitidas]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha detectado un total de {0} pruebas, pero algunas no coinciden con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /Tests requiere uno o varios nombres de pruebas específicas o sus subcadenas.]D;]A;       Ejemplos: /Tests:MétodoDePrueba1, /Tests:MétodoDePrueba1,método2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Seguimiento de la pila:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Iniciando la detección de pruebas, espere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Iniciando la ejecución de pruebas, espere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensajes de error estándar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensajes de salida estándar:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Además, la ruta de acceso a los adaptadores de pruebas se puede especificar con el comando /TestAdapterPath. Ejemplo  /TestAdapterPath:<rutaAAdaptadoresPersonalizados>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Tipos de archivos admitidos:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de la Tienda Windows. Use el parámetro /InIsolation para suprimir esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se usará el modo de aislamiento para ejecutar las pruebas, según requiere la configuración de la plataforma efectiva ({0}) y .Net Framework ({1}) para la serie de pruebas. Use el parámetro /inIsolation para suprimir esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de Windows Phone. Use el parámetro /InIsolation para suprimir esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se usará el modo de aislamiento para ejecutar las pruebas, ya que los adaptadores de datos de diagnóstico estaban habilitados en RunSettings. Use el parámetro de aislamiento /inIsolation para suprimir esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra la ruta de búsqueda de adaptadores de prueba personalizados especificada. Proporcione una ruta de acceso válida y vuelva a intentarlo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Permite que el proceso vstest.console.exe use adaptadores de pruebas personalizados]D;]A;      de una ruta de acceso especificada (si existe alguna) en la serie de pruebas. ]D;]A;      Ejemplo  /TestAdapterPath:<rutaAAdaptadoresPersonalizados>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro /TestAdapterPath requiere un valor, que es la ruta de acceso de una ubicación que contiene adaptadores de prueba personalizados. Ejemplo: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expresión>]D;]A;      Ejecuta pruebas que coinciden con la expresión dada.]D;]A;      <Expresión> tiene el formato <propiedad>Operador<valor>[|&<Expresión>]5D;]D;]A;         donde Operador es uno de =, != o ~ (el operador ~ tiene la semántica]D;]A;         "contiene" y es aplicable a propiedades de cadena como DisplayName).]D;]A;         Se pueden usar paréntesis () para agrupar subexpresiones.]D;]A;      Ejemplos: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MiMétodoDePrueba)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El argumento /TestCaseFilter requiere el valor del filtro.]D;]A;        El valor del filtro puede ser del tipo <propiedad>=<valor>.]D;]A;        Ejemplos: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serie de pruebas anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La serie de pruebas se ha anulado con el error {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serie de pruebas cancelada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se pudo ejecutar la serie de pruebas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La serie de pruebas se ejecutó correctamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - Con error: {1}, Superado: {2}, Omitido: {3}, Total: {4}, Duración: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Incorrecto: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pruebas totales: desconocido]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Correcto: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Omitido: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pruebas totales: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se usará el marco {0} para ejecutar las pruebas. Especifique /Framework:{1} para suprimir esta advertencia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encuentra el archivo de código fuente de prueba "{0}" proporcionado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} archivos de prueba en total coincidieron con el patrón especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tiempo transcurrido:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI del ejecutor predeterminado: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions se está quedando obsoleto. Utilice /TestAdapterPath en su lugar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Hace que el proceso vstest.console.exe utilice u omita las ]D;]A;      extensiones VSIX instaladas (si las hay) en la serie de]D;]A;      pruebas. ]D;]A;      Ejemplo: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El parámetro /UseVsixExtensions requiere un valor. Si es “true”, se usarán las extensiones VSIX instaladas (si las hay) en la serie de pruebas. Si es “false”, se omitirá. Ejemplo: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registrando diagnósticos de Vstest en el archivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 88cdc102ab..0000000000
--- a/Localize/lcl/fr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant la collecte des entrées finales dans le journal des événements '{0}' : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le DataCollector du journal des événements n'a pas trouvé eventLogContext pour DataCollectionContext : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le journal des événements '{0}' a rencontré une exception, certains événements risquent d'être perdus. Erreur : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le journal des événements '{0}' a peut-être été effacé durant la collecte. Il est possible que certains événements n'aient pas été collectés]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de lire le journal des événements '{0}' de l'ordinateur '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f4568dd423..0000000000
--- a/Localize/lcl/fr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les données de couverture du code ne sont pas disponibles. La couverture du code est actuellement prise en charge uniquement sur Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de la création du répertoire : {0} avec l’erreur :{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de l’initialisation du collecteur de données de couverture du code avec l’erreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Événement en cours d’exécution non reçu de CodeCoverage.exe. Pour en connaître la raison, consultez les journaux des événements.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de recevoir l’événement en cours d’exécution de CodeCoverage.exe en {0} secondes. Cette situation peut se produire à cause de la lenteur de l’ordinateur. Définissez la variable d’environnement {1} de sorte à augmenter le délai d’expiration.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe introuvable à l’emplacement {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3e85653a1f..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName est incomplet]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Séquence d'échappement non valide ! (segment : {0}, position : {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'arité de la méthode doit être numérique]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Méthode '{0}' introuvable sur le type '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Un guillemet simple fermant était attendu à la fin du segment ! (segment : {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Type '{0}' introuvable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caractères inattendus après la fin de ManagedName (pos. : {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les espaces blancs ne sont pas valides dans un ManagedName (pos. : {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' n'est pas implémenté sur cette plateforme !]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 8e52471d31..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fin de la build.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La build a démarré. Patientez…]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le test en cours d'exécution est ignoré pour le projet {0}. Pour exécuter des tests avec dotnet test, ajoutez la propriété "<IsTestProject>true</IsTestProject>" au fichier projet.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Série de tests pour {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avertissement : mettez à jour la référence de package Microsoft.NET.Test.Sdk vers la version 15.8.0 ou ultérieure pour collecter la couverture du code.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c2bde3d657..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'exécuter la série de tests, car l'état initial est non valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun fournisseur d'exécution de tests approprié n'a été trouvé pour cette série.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abandon de la série de tests : dépassement du délai d'expiration de la série de tests fixé à {0} millisecondes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'attente de la fin de l'exécution d'une opération n'est pas autorisée quand il n'existe aucune série de tests active. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e368ab90d5..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture. Pour plus d'informations, consultez le message d'erreur :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Annulation de l'opération, comme demandé.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Collecte de données : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le collecteur de données '{0}' n'a pas pu fournir les informations d'initialisation. Erreur : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le collecteur de données '{0}' a levé une exception pendant le chargement, la construction ou l'initialisation du type : {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Message du collecteur de données '{0}' : {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Collecteur de données '{0}' introuvable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le collecteur de données '{0}' exige que la variable d'environnement '{1}' avec la valeur '{2}' soit définie dans un environnement d'exécution de test, mais un autre collecteur de données '{3}' a déjà exigé la même variable d'environnement avec une autre valeur '{4}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI d'extension de test '{0}' est dupliquée. L'extension dupliquée est ignorée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fournisseur de paramètres nommé '{0}' est dupliqué. Le fournisseur dupliqué est ignoré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La section de paramètres d'exécution nommée '{0}' est dupliquée. Les paramètres dupliqués sont ignorés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : parenthèses vides ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La liste des extensions de test unitaire installées est introuvable. Raison : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chargement des extensions à partir du fichier '{0}' a échoué. Pour plus d'informations, utilisez /diag.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une erreur s'est produite durant la création du filtre rapide.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plusieurs configurations ont comme FriendlyName de collecteur de données '{0}'. Les configurations dupliquées seront ignorées dans la série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Exception interne :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : condition non valide '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI d'extension de test est non valide '{0}' : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : opérateur non valide '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant l'initialisation de l'enregistreur d'événements avec {0} : '{1}'. L'enregistreur d'événements ne sera pas utilisé. Exception : {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de localiser un enregistreur d'événements de test ayant pour AssemblyQualifiedName, URI ou FriendlyName '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : ')' manquante]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : '(' manquante]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : opérande manquant]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opérateur manquant '|' ou '&']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le collecteur de données a intercepté une exception de type '{0}' : '{1}'. Plus de détails : {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les paramètres d'exécution ont déjà été chargés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une erreur s'est produite durant le chargement des paramètres d'exécution. Erreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nœud de paramètres spécifié est non valide. La propriété name du nœud de paramètres ne doit pas être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une erreur s'est produite durant l'initialisation du fournisseur de paramètres nommé '{0}'. Erreur : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fournisseur de paramètres nommé '{0}' est introuvable. Impossible de charger les paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arborescence des appels de procédure :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Format incorrect pour le TestCaseFilter {0}. Spécifiez le format approprié, puis réessayez. Notez que si le format est incorrect, aucun test n'est exécuté.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le datacollector ayant le nom convivial '{0}' est introuvable.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cette option fonctionne uniquement si vstest.console.exe est installé dans le cadre de Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'utiliser les types qui dérivent du contexte de collecte de données pour envoyer des données et des messages. La valeur DataCollectionContext utilisée pour envoyer des données et des messages doit provenir de l'un des événements déclenchés par le collecteur de données.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 533c45cf21..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La découverte de tests active a été abandonnée. Raison : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La série de tests active a été abandonnée. Raison : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'attacher le débogueur à l'hôte de test par défaut.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une connexion existante a été fermée de force par l'hôte distant.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le processus {0} n’a pas réussi à se connecter au processus {1} après {2} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {3} de sorte à augmenter le délai d’expiration.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plantage du processus hôte de test]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de communiquer avec le processus hôte du test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Message inattendu reçu. MessageType attendu : {0} MessageType réel : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de la vérification de la version du protocole. Vérifiez que Test Runner et l'hôte sont compatibles.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de négociation du protocole, en attente d’une réponse dont le délai expire après {0} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {1} de sorte à augmenter le délai d’expiration.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4292787eb4..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre ne peut pas avoir une valeur null ou être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informations : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avertissement : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié ne peut pas être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié ne peut pas être négatif.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié doit être du type suivant : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié a la propriété suivante, laquelle ne peut pas être une chaîne vide : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié a la propriété suivante, laquelle ne peut pas être négative : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié a la propriété suivante, laquelle ne peut pas être une valeur null : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument spécifié a la propriété suivante : {0}. Cette propriété doit avoir le type suivant : {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception non prise en charge s'est produite durant le traitement d'un travail à partir de la file d'attente '{0}' : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'hôte '{0}' est introuvable. Vérifiez que '{0}' est installé sur la machine et qu'il est disponible dans la variable d'environnement PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La file d'attente {0} a déjà été supprimée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de supprimer la file d'attente {0} pendant qu'elle est en pause.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur d'obtention du nom du processus.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index dc98f913af..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'attacher le débogueur à l'hôte de test par défaut ayant l'ID de processus : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le débogage de collecteur de données est activé. Attachez le débogueur au processus datacollector pour continuer.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La fonctionnalité de recherche d’adaptateur fait actuellement l’objet de modifications. Pour plus d’informations, veuillez consulter https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant l'instanciation du découvreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plusieurs adaptateurs de tests ayant le même URI '{0}' ont été trouvés. Adaptateur '{1}' ignoré. Désinstallez les adaptateurs en conflit pour éviter cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La source dupliquée spécifiée '{0}' est ignorée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant le chargement des tests par le découvreur de tests '{0}'. Exception : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant l'appel de l'exécuteur '{0}' : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'option ExecutionThreadApartmentState n'est pas prise en charge pour le framework : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec du lancement de l'hôte de test. Erreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fichier {0} introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le débogage de l'hôte est activé. Attachez le débogueur au processus testhost pour continuer.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'exécuteur de tests correspondant au découvreur de tests {0} est ignoré, car le découvreur n'a pas l'attribut DefaultExecutorUri. Vous devrez peut-être réinstaller le complément d'adaptateur de test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec d'initialisation du proxy client : connexion impossible au processus de test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cette opération n'est pas autorisée dans le contexte d'une exécution qui ne sert pas au débogage.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de localiser un proxy disponible à dépiler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} est introuvable. Vérifiez que le dotnet est installé sur la machine.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'exécuteur de tests ayant l'URI '{0}' est introuvable. Vérifiez que l'exécuteur de tests est installé et qu'il prend en charge le runtime .NET version {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le proxy ayant l'ID {0} n'est pas géré par le gestionnaire de session actuel.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun test ne correspond au filtre testcase donné `{0}` dans {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucune des sources spécifiées '{0}' n'est valide. Corrigez les erreurs/avertissements ci-dessus, puis réessayez. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Extensions introuvables : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vous utilisez une ancienne version de Microsoft.NET.Test.Sdk. Passez à une version égale ou supérieure à la version 15.3.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le proxy ayant l'ID {0} est déjà disponible et ne peut pas être empilé à nouveau.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Découverte de tests annulée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun test n'est disponible dans {0}. Vérifiez que les découvreurs et exécuteurs de tests sont inscrits. Vérifiez également que les paramètres de version de plateforme et de framework sont appropriés, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Journalisation des diagnostics TestHost dans le fichier : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun test ne correspond au filtre, car il contient une ou plusieurs propriétés non valides ({0}). Spécifiez une expression de filtre contenant des propriétés valides ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c6975f4eed..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La série de tests active a été abandonnée, car le processus hôte s'est arrêté de manière inattendue. Inspectez la pile des appels ci-dessus, le cas échéant, pour obtenir plus d'informations sur l'origine de l'exception.]D;]A;Test en cours d'exécution au moment du plantage : ]D;]A;{0}]D;]A;Ce test est éventuellement à l'origine du plantage.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La clé de paramètre blame spécifiée {0} n'est pas valide. Cette clé est ignorée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La clé de paramètre blame {0} peut prendre en charge uniquement les valeurs {1}/{2}. Cette clé est ignorée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La collecte de fichiers dump a été activée, mais aucun fichier dump n'a été généré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Création d'une image mémoire {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Création d'une image mémoire de cette arborescence de processus (à partir du bas)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le délai d'inactivité spécifié ({0} {1}) s'est écoulé. Collecte d'images mémoire des plantages de l'hôte de test et de ses processus enfants]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[minutes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tous les tests ont fini de s'exécuter. Le fichier de séquence ne sera pas généré]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de démarrer le fichier dump du processus : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variable d'environnement exigée PROCDUMP_PATH était null ou vide. Affectez à PROCDUMP_PATH le chemin du dossier contenant l'exécutable procdump approprié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump a été activé, mais le fichier dump n'a pas été généré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[secondes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Valeur inattendue '{0}' fournie en tant que délai d'expiration. Indiquez une valeur au format suivant : 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 00d8d17909..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fichier de résultats des tests HTML : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur de l'enregistreur d'événements HTML : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les paramètres LogFileName et LogFilePrefix ne peuvent pas être donnés ensemble. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 667c71ddeb..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre ne peut pas être inférieur à 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre ne peut pas avoir une valeur null ou être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'obtenir un nom libre pour {0}(1),(2),... dans le répertoire {1}. Nettoyez ce répertoire.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de trouver un nom de fichier disponible pour {0} avec le format d'horodatage '{2}' à l'emplacement {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[élément de déploiement '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[élément de déploiement '{0}' (répertoire de sortie '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les paramètres de test ne sont pas spécifiés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les paramètres de test ne définissent pas le répertoire de déploiement de la série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le résultat n'est pas associé à une série de tests. Utilisez un résultat obtenu à partir d'une série de tests en cours d'exécution ou achevée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nom de fichier/répertoire spécifié '{0}' est non valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de joindre des fichiers à partir de : {0}]D;]A;Détails de l'erreur : {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le test '{0}' a été ignoré dans la série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les paramètres LogFileName et LogFilePrefix ne peuvent pas être utilisés ensemble. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tous les résultats chargés]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les résultats ne figurent pas dans une liste]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abandonné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Effectué]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Déconnecté]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En cours]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non concluant]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non exécuté]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non exécutable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussite]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussi (exécution abandonnée)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En attente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Délai d'expiration]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avertissement]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fichier de résultats : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AVERTISSEMENT : Fichier de résultats en cours de remplacement : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 1129ae5507..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre ne peut pas avoir une valeur null ou être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La série de tests a détecté une ou plusieurs DLL qui ont été générées pour d'autres versions de framework et de plateforme. La ou les DLL suivantes ne correspondent pas aux paramètres actuels : framework {0} et plateforme {1}.{2}Accédez à {3} pour plus d'informations sur la gestion de ces paramètres.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier de paramètres fourni n'est pas conforme au format requis.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun des conteneurs de tests fournis ne correspond aux paramètres d'architecture de la plateforme et du .Net Framework pour la série de tests. Plateforme : {0} .Net Framework : {1}. Accédez à http://go.microsoft.com/fwlink/?LinkID=330428 pour plus de détails sur la gestion de ces paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} est généré pour le framework {1} et la plateforme {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 0aa727db04..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName est incomplet]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'arité de la méthode doit être numérique]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Méthode '{0}' introuvable sur le type '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Type '{0}' introuvable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caractères inattendus après la fin de ManagedName (pos. : {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les espaces blancs ne sont pas valides dans un ManagedName (pos. : {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 41ea770b30..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre ne peut pas avoir une valeur null ou être vide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier {0} n'existe pas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'objet doit être de type {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Abandonné]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Effectué]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Déconnecté]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En cours]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non concluant]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non exécuté]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non exécutable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussite]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussi (exécution abandonnée)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[En attente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Délai d'expiration]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avertissement]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TypeConverter introuvable pour le type {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nœud '{0}' introuvable]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de lire le flux fourni. Impossible d'envoyer les données d'un flux s'il ne prend pas en charge la lecture.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nom de fichier '{0}' fourni contient les caractères non valides suivants : '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nom de fichier '{0}' fourni est réservé.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'inscrire la propriété '{0}' en tant que type valeur '{1}', car elle est déjà inscrite en tant que '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de la création du HResult COM de la session msdia : '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec du chargement de msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI non valide dans les paramètres de collecteur de données '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nœud racine des paramètres d'exécution doit être nommé 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres non valides '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres non valides '{0}'. XmlAttribute inattendu : '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres non valides '{0}'. XmlElement inattendu : '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI '{0}' non valide dans les paramètres '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres de collecteur de données non valides. Attribut attendu '{0}' manquant. Un paramétrage de collecteur de données classique se présente comme suit : <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres '{0}' non valides. Au moins un des attributs XmlAttribute (friendlyName, uri ou assemblyQualifiedName) était attendu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de spécifier TestCaseFilter pour l'exécution de tests spécifiques. FilterCriteria est destiné uniquement à l'exécution avec des sources.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La fréquence de notification doit être une valeur positive.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le délai d'expiration de notification doit être supérieur à zéro.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le répertoire de solution '{0}' n'existe pas. Vérifiez que le répertoire de solution spécifié dans runsettings existe, et que vous disposez d'autorisations d'accès en lecture pour celui-ci.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La chaîne de filtre '{0}' inclut une séquence d'échappement non reconnue.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numéro de colonne]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI de l'exécuteur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Chemin du fichier]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numéro de ligne]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nom]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Source]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caractéristiques]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Message : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace :]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussite]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignoré]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0} :]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nom de l'ordinateur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nom d'affichage de TestResult]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Durée]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Heure de fin]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numéro de colonne d'erreur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Message d'erreur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arborescence des appels de procédure d'erreur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Résultat]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Heure de début]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Messages de test :]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le type de propriété de test '{0}' de la propriété '{1}' n'est pas pris en charge. Utilisez l'un des types de propriété pris en charge (types primitifs, uri, string, string[]5D;), puis réessayez. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index eed3ab1bb5..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plusieurs versions de la même extension ont été trouvées. Sélection de la version la plus élevée.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hôte « {0} » introuvable pour l’architecture '{1}'.]D;]A;]D;]A;Vous pouvez résoudre le problème en installant le fichier .NET '{1}'.]D;]A;]D;]A;L’infrastructure spécifiée se trouve à l’adresse suivante :]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} est introuvable. Publiez votre projet de test et réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} est introuvable. Vérifiez que le projet de test a une référence nuget du package "Microsoft.NET.Test.Sdk".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 32f34cc009..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier XML des paramètres d'exécution ne contient pas le nœud "RunSettings".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètre non valide '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nœud 'RunSettings' introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nœud 'RunSettings' introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une erreur s'est produite durant le chargement des paramètres. Erreur : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètres de plateforme cible '{0}' incompatibles avec l'architecture système '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Un fichier de paramètres inattendu a été spécifié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 811ea9f2bd..0000000000
--- a/Localize/lcl/fr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'opération de démarrage de la session de test a été abandonnée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'opération d'arrêt de la session de test a été abandonnée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le traitement des pièces jointes de série de tests actif a été abandonné.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La découverte de tests active a été abandonnée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La série de tests active a été abandonnée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de réception du message du processus vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier {0} n'existe pas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sortie anormale du processus vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 6ee9a298c5..0000000000
--- a/Localize/lcl/fr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tout nœud LegacySettings déjà présent dans les paramètres d’exécution sera supprimé.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings ne contient pas de testSettings incorporé. Échec de la migration.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier RunSettings migré a été créé à : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les attributs agentNotRespondingTimeout, deploymentTimeout et scriptTimeout du nœud Timeouts ne sont pas pris en charge. Ils ne seront donc pas migrés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation valide :]D;]A;SettingsMigrator.exe <chemin complet du fichier testsettings ou runsettings à migrer>]D;]A;SettingsMigrator.exe <chemin complet du fichier testsettings ou runsettings à migrer> <chemin complet du fichier runsettings à créer>]D;]A;Exemples :]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/fr/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/fr/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 54ea2d2c1f..0000000000
--- a/Localize/lcl/fr/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="fr-FR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messages d'informations supplémentaires :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de démarrer la série de tests des tests unitaires pour une application du Windows Store : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tests introuvables dans les conteneurs de tests spécifiés. De plus, l'Adaptateur de test unitaire Microsoft Windows Store ne prend pas en charge les fichiers .appxbundle. Créez un fichier .appx (affectez la valeur Jamais à l'option Générer l'ensemble d'applications) durant la création du package de l'application, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'assembly testé est introuvable. Vérifiez que le projet est généré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pièces jointes :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les compléments de découverte de tests suivants sont disponibles :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les compléments d'exécution de tests suivants sont disponibles :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0} : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les compléments suivants de type enregistreur d'événements de tests sont disponibles :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les compléments suivants de type fournisseurs de paramètres sont disponibles :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument /BatchSize nécessite la taille du lot. Exemple : /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La collecte des vidages sur incident à l'aide de l'option CollectDump pour Blame n'est pas prise en charge pour cette plateforme.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La collecte des vidages sur blocage par l'option CollectDump avec TestTimeout pour Blame n'est pas prise en charge pour cette plateforme.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre blame spécifié avec blame, {0} n'est pas valide. Ce paramètre est ignoré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<chemin de base de la build>]D;]A;      Répertoire contenant les sorties temporaires.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[BuildBasePath est introuvable. Fournissez un chemin valide, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arguments RunSettings :]D;]A;      Arguments pour passer des configurations runsettings via la ligne de commande. Les arguments peuvent être spécifiés comme paire nom-valeur sous la forme [nom]5D;=[valeur]5D; après "-- ". Notez l'espace après --. ]D;]A;      Utilisez un espace pour séparer plusieurs [nom]5D;=[valeur]5D;.]D;]A;      Plus d'informations sur la prise en charge des arguments RunSettings : https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ne peut pas avoir une valeur null ou être vide]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<nom convivial du collecteur de données>]D;]A;      Active le collecteur de données pour la série de tests. Plus d'informations ici : https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" n'est pas pris en charge si la série de tests est configurée avec testsettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informations : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avertissement : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<configuration>]D;]A;      Configuration pour laquelle le projet est généré. Exemple : Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Tous droits réservés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le nom convivial du collecteur de données '{0}' n'est pas valide. Le collecteur de données est ignoré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Jours]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Déboguer les messages de traces :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Délai expiré pour se connecter ou traiter la requête pour DesignModeClient sur le port : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Exemple : /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La couverture du code n'est pas disponible pour les applications du Windows Store. L'analyse de la couverture du code a été ignorée pour cette série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La couverture du code n'est pas disponible pour les applications Windows Phone. L'analyse de la couverture du code a été ignorée pour cette série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La lecture des paramètres de l'adaptateur de données de diagnostic a levé une exception durant l'exécution de '{0}'. Tous les adaptateurs de données de diagnostic seront ignorés dans cette série.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications du Windows Store. Supprimez les adaptateurs de données de diagnostic des paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications Windows Phone. Supprimez les adaptateurs de données de diagnostic des paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de la découverte pour les sources indiquées. Exception : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre "{0}" ne doit être fourni qu'une seule fois.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Exécute le test en mode blame. Cette option est utile pour isoler le test problématique qui cause le plantage de l'hôte de test.]D;]A;      Il crée un fichier de sortie dans le répertoire actif nommé "Sequence.xml",]D;]A;      qui capture l'ordre d'exécution du test avant le plantage.]D;]A;      Vous pouvez éventuellement choisir de collecter le fichier dump du processus de l'hôte de test.]D;]A;      Quand vous choisissez de collecter le fichier dump, par défaut, un mini-dump est collecté lors du plantage.]D;]A;      Vous pouvez aussi choisir de remplacer ce comportement par défaut par des paramètres facultatifs :]D;]A;      CollectAlways - Pour collecter le fichier dump à la fermeture, même s'il n'y pas de plantage (true/false) ]D;]A;      DumpType - Pour spécifier le type de fichier dump (mini/full).]D;]A;      Exemple : /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Active le collecteur de données 'CodeCoverage' pour la série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<chemin du fichier journal>]D;]A;      Permet d'activer les journaux pour la plateforme de test.]D;]A;      Les journaux sont écrits dans le fichier fourni.]D;]A;]D;]A;      Change le niveau de trace des journaux comme indiqué ci-dessous]D;]A;      Exemple : /Diag:<chemin du fichier journal>;tracelevel=<"verbose" par défaut>]D;]A;      Valeurs autorisées pour tracelevel : off, error, warning, info et verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/nom convivial du journaliseur>]D;]A;      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un ]D;]A;      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=<nom de fichier unique par défaut>]5D;]D;]A;      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.]D;]A;]D;]A;      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous]D;]A;      Exemple : /logger:console;verbosity=<"minimal" par défaut>]D;]A;      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.]D;]A;]D;]A;      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous]D;]A;      Exemple : /logger:console;prefix=<"false" par défaut>]D;]A;      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/nom convivial du journaliseur>]D;]A;      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un ]D;]A;      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=<nom de fichier unique par défaut>]5D;]D;]A;      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.]D;]A;]D;]A;      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous]D;]A;      Exemple : /logger:console;verbosity=<"normal" par défaut>]D;]A;      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.]D;]A;]D;]A;      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous]D;]A;      Exemple : /logger:console;prefix=<"false" par défaut>]D;]A;      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NOM>=<VALEUR>]D;]A;      Définit la valeur d'une variable d'environnement. Crée la variable si elle n'existe pas, et la remplace si elle existe. Cela implique l'utilisation du commutateur /InIsolation et l'exécution forcée des tests dans un processus isolé.]D;]A;      ]D;]A;      Vous pouvez spécifier cet argument plusieurs fois pour fournir plusieurs variables.]D;]A;]D;]A;      Exemple : -e:VARIABLE1=VALEUR1]D;]A;               -e:AUTRE_VARIABLE="VALEUR AVEC ESPACES"]D;]A;               -e:AUTRE_VARIABLE="VALEUR;séparée;par;des;points-virgules"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variable d'environnement '{0}' est déjà définie, mais elle est substituée par l'argument -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Message d'erreur :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Pour exécuter les tests :]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Pour exécuter les tests avec des paramètres supplémentaires, par exemple des collecteurs de données :]D;]A;    >vstest.console.exe tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Une exception s'est produite durant l'instanciation de l'extension '{0}' : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Durée totale : {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échoué]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 n'est pas pris en charge. Pour les projets ciblant .NET Framework 3.5, le test s'exécutera dans CLR 4.0 en « mode de compatibilité ».]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<version du framework>]D;]A;      Version cible du .Net Framework à utiliser pour l'exécution des tests. ]D;]A;      Les valeurs valides sont : ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc.]D;]A;      Les autres valeurs prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument /Framework nécessite la version cible du .Net Framework pour la série de tests. Exemple : /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Permet d'afficher ce message d'utilisation.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arguments :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Description : exécute les tests à partir des fichiers spécifiés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Options :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation : vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <arguments de RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Heures]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'indicateur /InIsolation est déprécié. Les tests sont toujours exécutés dans un processus distinct]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Exécute les tests dans un processus isolé. Le processus vstest.console.exe ]D;]A;      est moins susceptible de s'arrêter en cas d'erreur durant les tests, mais ces derniers ]D;]A;      risquent de s'exécuter plus lentement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L’argument {0} n'est pas valide. Utilisez l'option /help pour vérifier la liste des arguments valides.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Taille de lot non valide {0}. La taille du lot doit être supérieure à zéro. Exemple : /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument blame '{0}' n'est pas valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configuration indiquée est non valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument diag '{0}' n'est pas valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin du fichier Diag '{0}' n'est pas valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument {0} n'est pas attendu dans la commande 'EnableCodeCoverage'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /EnableCodeCoverage), puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Version non valide du .Net Framework : {0}. Indiquez le nom complet de TargetFramework (exemple : .NETCoreApp,Version=v2.0). Les autres versions du .Net Framework prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument {0} n'est pas attendu dans la commande 'InIsolation'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /InIsolation), puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument logger '{0}' n'est pas valide.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument {0} n'est pas attendu dans la commande 'Parallel'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /Parallel), puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument --ParentProcessId|/ParentProcessId nécessite l'ID de processus, qui doit être indiqué sous forme d'entier. Spécifiez l'ID de processus du processus parent qui a lancé ce processus.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Type de plate-forme non valide : {0}. Les types de plates-formes valides sont {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument --Port|/Port nécessite le numéro de port, qui doit être indiqué sous forme d'entier. Spécifiez le port de connexion du socket et de réception des messages d'événement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin '{0}' spécifié dans 'ResultsDirectory' est non valide. Erreur : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin '{0}' spécifié dans 'TestAdapterPath' est non valide. Erreur : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de spécifier l'argument /TestCaseFilter avec /Tests. Le filtrage des cas de test est non applicable quand des tests sont spécifiés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument de paramètre de série de tests '{0}' est non valide. Utilisez le format ci-dessous.]D;]A;     Format : TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument {0} n'est pas attendu dans la commande 'UseVsixExtensions'. Spécifiez la commande indiquant si les extensions vsix doivent être utilisées ou ignorées (exemple : vstest.console.exe myTests.dll /UseVsixExtensions:true), puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Liste les découvreurs de tests installés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Liste les exécuteurs de tests installés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Liste les enregistreurs d'événements de tests installés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Liste les fournisseurs de paramètres de test installés.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les tests suivants sont disponibles :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<nom de fichier>]D;]A;      Liste tous les tests découverts dans le conteneur de tests spécifié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier {0} fourni est en lecture seule]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de localiser un enregistreur d'événements de tests ayant pour URI ou FriendlyName '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Un ou plusieurs paramètres d'exécution fournis contiennent un jeton non valide]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Outil en ligne de commande d'exécution de tests Microsoft (R), version {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minutes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun fichier source de test n'a été spécifié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin '{0}' spécifié dans 'TestAdapterPath' ne contient aucun adaptateur de test. Indiquez un chemin valide, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Paramètre non reconnu "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun argument n'a été spécifié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications du Windows Store, créez un package de l'application à l'aide du projet de bibliothèque de tests unitaires d'applications du Windows Store.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Au total, {0} tests ont été découverts mais aucun d'entre eux ne correspond aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun test disponible dans {0}. Vérifiez que les paramètres des découvreurs, des exécuteurs, de la plateforme et de la version de Framework installés sont appropriés, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} est généré pour {1}/{2}. Les assemblys de tests spécifiés dans une série doivent avoir une version cible du .Net Framework et une plateforme communes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aucun(e)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pas exécuté]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erreur au moment de l'ouverture du fichier réponse '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<sortie>]D;]A;      Répertoire contenant les fichiers binaires à exécuter.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin associé à Output est introuvable. Fournissez un chemin valide, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Spécifie que les tests doivent être exécutés en parallèle. Par défaut, il est]D;]A;      possible d'utiliser la totalité des cœurs disponibles sur la machine.]D;]A;      Vous pouvez configurer le nombre de cœurs à utiliser à l'aide d'un fichier de paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<id du processus parent>]D;]A;      ID de processus du processus parent chargé de lancer le processus actuel.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Réussi]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible de démarrer la série de tests pour les tests d'une application Windows Phone : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications Windows Phone, créez un package de l'application à l'aide du projet d'application de tests unitaires Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<type de plateforme>]D;]A;      Architecture de plateforme cible à utiliser pour l'exécution des tests. ]D;]A;      Les valeurs valides sont x86, x64 et ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si vous utilisez l'argument /Platform, le type de plateforme cible de la série de tests doit être fourni. Exemple : /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<port>]D;]A;      Port de connexion du socket et de réception des messages d'événement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Série de tests en cours]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin {0} n'existe pas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<fichier>]D;]A;      Consultez le fichier réponse pour plus d'options.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Le répertoire des résultats des tests est créé dans le chemin spécifié, s'il n'existe pas.]D;]A;      Exemple : /ResultsDirectory:<chemin du répertoire des résultats>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre /ResultsDirectory nécessite une valeur, où les résultats des tests doivent être enregistrés. Exemple :  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<fichier de paramètres>]D;]A;      Paramètres à utiliser durant l'exécution des tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier de paramètres '{0}' est introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre /Settings nécessite un fichier de paramètres.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Un seul package d'application (fichier .appx) peut être spécifié pour l'exécution de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<noms de tests>]D;]A;      Permet d'exécuter les tests dont les noms correspondent aux valeurs fournies. Pour fournir plusieurs]D;]A;      valeurs, séparez-les par des virgules.]D;]A;      Exemples : /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Exécutez des tests à partir des fichiers ou des modèles de caractères génériques spécifiés. Séparez plusieurs modèles ou noms de fichiers de test]D;]A;      par des espaces. Affectez à la verbosité du journaliseur de console la valeur Detailed pour voir les fichiers de test correspondants.]D;]A;      Exemples : mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les collecteurs de données autres que la couverture du code et Microsoft Fakes configurés via les paramètres d'exécution ne sont pas pris en charge avec les paramètres de test incorporés. Pour plus d'informations, consultez https://aka.ms/vstest-configure-datacollector. Paramètres d'exécution : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Secondes]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignoré]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Au total, {0} tests ont été découverts mais certains d'entre eux ne correspondent pas aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument /Tests nécessite un ou plusieurs noms de tests spécifiques ou leurs sous-chaînes.]D;]A;       Exemples : /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arborescence des appels de procédure :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Démarrage de la découverte de tests, patientez...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Démarrage de l'exécution de tests, patientez...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messages d'erreur standard :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messages de sortie standard :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[De plus, vous pouvez spécifier le chemin des adaptateurs de tests à l'aide de la commande /TestAdapterPath. Exemple : /TestAdapterPath:<chemin d'adaptateurs personnalisés>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Types de fichier pris en charge :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation du mode Isolation pour exécuter les tests unitaires des applications du Windows Store. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation du mode Isolation pour exécuter les tests, conformément aux paramètres effectifs de la plateforme : {0} et du .Net Framework :{1} de la série de tests. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation du mode Isolation pour exécuter les tests unitaires des applications Windows Phone. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation du mode Isolation pour exécuter les tests, car les adaptateurs de données de diagnostic ont été activés dans les paramètres d'exécution. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le chemin de recherche fourni pour l'adaptateur de test personnalisé est introuvable. Indiquez un chemin valide, puis réessayez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Le processus vstest.console.exe utilise des adaptateurs de tests personnalisés]D;]A;      à partir du chemin spécifié (le cas échéant) dans la série de tests. ]D;]A;      Exemple : /TestAdapterPath:<chemin d'adaptateurs personnalisés>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre /TestAdapterPath nécessite une valeur qui représente le chemin des adaptateurs de tests personnalisés. Exemple : /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<expression>]D;]A;      Permet d'exécuter les tests qui correspondent à l'expression indiquée.]D;]A;      <Expression> est au format <property>Operator<value>[|&<Expression>]5D;]D;]A;         où Operator correspond à =, != ou ~ (Operator ~ utilise la sémantique 'contient']D;]A;         et s'applique aux propriétés de chaîne telles que DisplayName).]D;]A;         Vous pouvez utiliser des parenthèses () pour regrouper les sous-expressions.]D;]A;      Exemples : /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argument /TestCaseFilter requiert la valeur du filtre.]D;]A;        La valeur du filtre peut être de type <property>=<value>.]D;]A;        Exemples : "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Série de tests abandonnée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Désolé... Nous n’avons pas pu procéder à la série de tests, car nous avons rencontré l’erreur suivante : {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Série de tests annulée.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Échec de la série de tests.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Série de tests réussie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - échec : {1}, réussite : {2}, ignorée(s) : {3}, total : {4}, durée : {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Non réussi(s) : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre total de tests : inconnu]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Réussi(s) : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Ignoré(s) : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nombre total de tests : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilisation du framework {0} pour exécuter les tests. Spécifiez /Framework:{1} pour supprimer cet avertissement.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le fichier source de test "{0}" fourni est introuvable.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Au total, {0} fichiers de test ont correspondu au modèle spécifié.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Temps écoulé :]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI de l'exécuteur par défaut : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions est progressivement déprécié. Utilisez /TestAdapterPath à la place.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Le processus vstest.console.exe utilise ou ignore les extensions VSIX ]D;]A;      installées (le cas échéant) durant la série de tests. ]D;]A;      Exemple : /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le paramètre /UseVsixExtensions nécessite une valeur. Si la valeur est 'true', les extensions VSIX installées (le cas échéant) sont utilisées dans la série de tests. Si la valeur est false, elles sont ignorées. Exemple : /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Journalisation des diagnostics Vstest dans le fichier : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 31e345bbb0..0000000000
--- a/Localize/lcl/it/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante la raccolta delle voci finali del log eventi '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati del log eventi non ha trovato l'elemento eventLogContext per DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il log eventi '{0}' ha rilevato un'eccezione. È possibile che alcuni eventi siano stati persi. Errore: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[È possibile che il log eventi '{0}' sia stato cancellato durante la raccolta. Alcuni eventi non sono stati raccolti]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile leggere il log eventi '{0}' dal computer '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index db8d9a5707..0000000000
--- a/Localize/lcl/it/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[I dati di code coverage non sono disponibili. Il code coverage è attualmente supportato solo in Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile creare la directory: {0}. Errore:{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile inizializzare l'agente di raccolta dati di code coverage. Errore: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Evento in esecuzione non ricevuto da CodeCoverage.exe. Per la causa dell'errore, vedere i log eventi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile ricevere l'evento in esecuzione da CodeCoverage.exe in {0} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {1} in modo da incrementare il timeout.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe non è stato trovato in {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a91b7d4146..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'elemento ManagedName è incompleto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La sequenza di escape non è valida. Segmento: {0}. Posizione: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il grado del metodo deve essere numerico]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il metodo '{0}' non è stato trovato nel tipo '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Alla fine del segmento era prevista una virgoletta singola di chiusura. Segmento: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il tipo '{0}' non è stato trovato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caratteri imprevisti dopo la fine dell'elemento ManagedName (pos.: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli spazi vuoti non sono validi in un elemento ManagedName (pos.: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' non è implementato in questa piattaforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4bf1f6083c..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilazione completata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilazione avviata. Attendere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione del test per il progetto {0} verrà ignorata. Per eseguire test con dotnet test, aggiungere la proprietà "<IsTestProject>true</IsTestProject>" al file di progetto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esecuzione dei test per {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avviso: per raccogliere i dati di code coverage, aggiornare il riferimento al pacchetto Microsoft.NET.Test.Sdk alla versione 15.8.0 o successiva.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 28f9c881e2..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile completare l'esecuzione dei test perché lo stato iniziale non era valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun provider di runtime dei test adatto per questa esecuzione.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Interruzione dell'esecuzione dei test: è stato superato il timeout dell'esecuzione dei test, pari a {0} millisecondi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'operazione di attesa completamento non è consentita se non sono presenti esecuzioni dei test attive. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 76d357cd9c..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura. Per altre informazioni, vedere il messaggio di errore:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'operazione verrà annullata come richiesto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Raccolta dei dati: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati '{0}' non ha fornito le informazioni di inizializzazione. Errore: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati '{0}' ha generato un'eccezione durante la costruzione, l'inizializzazione o il caricamento dei tipi: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggio '{0}' dell'agente di raccolta dati: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati '{0}' non è stato trovato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati '{0}' ha richiesto che la variabile di ambiente '{1}' con valore '{2}' fosse impostata nell'ambiente di esecuzione dei test, ma un altro agente di raccolta dati '{3}' ha già richiesto la stessa variabile di ambiente con un valore diverso '{4}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI dell'estensione di test '{0}' è duplicato. L'estensione duplicata verrà ignorata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il provider di impostazioni denominato '{0}' è duplicato. Il provider duplicato verrà ignorato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La sezione delle impostazioni esecuzione test denominata '{0}' è duplicata. Le impostazioni duplicate verranno ignorate.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: parentesi vuote ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'elenco delle estensioni degli unit test installate non è stato trovato. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile caricare le estensioni dal file '{0}'. Per altre informazioni, usare /diag.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificato un errore durante la creazione del filtro Fast.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono presenti più configurazioni in cui il nome descrittivo dell'agente di raccolta dati è '{0}'. Le configurazioni duplicate verranno ignorate nell'esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Eccezione interna:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: condizione non valida '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI '{0}' dell'estensione di test non è valido: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: operatore non valido '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante l'inizializzazione del logger con {0}: '{1}'. Il logger non verrà usato. Eccezione: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun logger di test con AssemblyQualifiedName, URI o FriendlyName '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: manca ')']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: manca '(']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: manca l'operando]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Manca l'operatore '|' o '&']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'agente di raccolta dati ha rilevato un'eccezione di tipo '{0}': '{1}'. Altri dettagli: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni esecuzione test sono già state caricate.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore durante il caricamento delle impostazioni esecuzione test. Errore: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nodo impostazioni specificato non è valido. La proprietà del nome del nodo impostazioni non deve essere vuota.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificato un errore durante l'inizializzazione del provider di impostazioni denominato '{0}'. Errore: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il provider di impostazioni denominato '{0}' non è stato trovato. Non è possibile caricare le impostazioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Analisi dello stack:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il formato per TestCaseFilter {0} non è corretto. Specificare il formato corretto e riprovare. Se il formato non è corretto, potrebbe non essere eseguito alcun test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile trovare un oggetto datacollector con nome descrittivo '{0}'.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Questa opzione funziona solo se vstest.console.exe è installato con Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile usare i tipi che derivano da DataCollectionContext per inviare dati e messaggi. L'elemento DataCollectionContext usato per inviare dati e messaggi deve provenire da uno degli eventi generati per l'agente di raccolta dati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 55140759af..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'individuazione dei test attivi è stata interrotta. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test attivi è stata interrotta. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile collegare il debugger all'host di test predefinito.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Una connessione esistente è stata chiusa forzatamente dall'host remoto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il processo {0} non è riuscito a connettersi al processo {1} dopo {2} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {3} in modo da incrementare il timeout.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arresto anomalo del processo host di test]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile comunicare con il processo host dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[È stato ricevuto un messaggio imprevisto. Tipo di messaggio previsto: {0}. Tipo di messaggio effettivo: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il controllo della versione del protocollo non è riuscito. Assicurarsi che runner e host dei test siano compatibili.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile negoziare il protocollo: in attesa del timeout della risposta dopo {0} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {1} in modo da incrementare il timeout.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 2717e7ab00..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro non può essere vuoto o Null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informazioni: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avviso: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato non può essere vuoto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato non può essere negativo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato deve essere del tipo seguente: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato presenta la proprietà seguente, che non può essere una stringa vuota: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato presenta la proprietà seguente, che non può essere negativa: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato presenta la proprietà seguente, che non può essere Null: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento specificato presenta la proprietà seguente: {0}. Tale proprietà deve essere del tipo seguente: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione non gestita durante l'elaborazione di un processo dalla coda di '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'host '{0}' non è stato trovato. Assicurarsi che '{0}' sia installato nel computer e che sia disponibile nella variabile di ambiente PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La coda {0} è già stata eliminata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile eliminare la coda {0} mentre è in sospeso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificato un errore durante il recupero del nome del processo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b0daf1f7d5..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile collegare il debugger all'host di test predefinito con ID processo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il debug dell'agente di raccolta dati è abilitato. Per continuare, collegare il debugger al processo dell'agente di raccolta dati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La ricerca degli adattatori verrà modificata a breve. Per maggiori dettagli, vedere https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante la creazione dell'istanza dell'agente di individuazione: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono stati trovati più adattatori di test con lo stesso URI '{0}'. L'adattatore '{1}' verrà ignorato. Per evitare che venga visualizzato questo avviso, disinstallare gli adattatori in conflitto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'origine duplicata specificata verrà ignorata: '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante il caricamento dei test da parte dell'agente di individuazione test '{0}'. Eccezione: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante la chiamata dell'executor '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'opzione ExecutionThreadApartmentState non è supportata per il framework: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile avviare testhost. Errore: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file {0} non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il debug dell'host è abilitato. Per continuare, collegare il debugger al processo testhost.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'executor di test corrispondente all'agente di individuazione del test {0} verrà ignorato perché manca l'attributo DefaultExecutorUri dell'agente di individuazione. Potrebbe essere necessario reinstallare il componente aggiuntivo dell'adattatore di test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Inizializzazione del proxy client non riuscita: non è stato possibile connettersi al processo di test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Questa operazione non è consentita nel contesto di un'esecuzione non di debug.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile trovare un proxy disponibile da rimuovere dalla coda.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} non è stato trovato. Assicurarsi che dotnet sia installato nel computer.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun executor di test con URI '{0}'. Verificare che l'executor di test sia installato e supporti la versione {1} di .NET Runtime.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il proxy con ID {0} non è gestito dallo strumento di gestione sessioni corrente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessun test corrisponde al filtro di test case specificato `{0}` in {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessuna delle origini specificate '{0}' è valida. Correggere gli errori/avvisi precedenti e riprovare. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile trovare le estensioni: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La versione di Microsoft.NET.Test.Sdk è obsoleta. Passare alla versione 15.3.0 o a una versione successiva.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il proxy con ID {0} è già disponibile e non può essere riaccodato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Individuazione dei test annullata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non ci sono test disponibili in {0}. Assicurarsi che l'agente di individuazione test e gli executor di test siano registrati e che le impostazioni delle versioni di piattaforma e framework siano appropriate, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registrazione della diagnostica di TestHost nel file: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessun test corrisponde al filtro perché contiene una o più proprietà non valide ({0}). Specificare un'espressione di filtro contenente proprietà valide ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 20bc5a547a..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test attiva è stata interrotta perché il processo host è stato terminato in modo imprevisto. Esaminare lo stack di chiamate in alto, se disponibile, per ottenere altre informazioni sull'origine dell'eccezione.]D;]A;Test in esecuzione quando si è verificato l'arresto anomalo: ]D;]A;{0}]D;]A;Il test potrebbe essere l'origine dell'arresto anomalo.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La chiave specificata {0} del parametro di Blame non è valida e verrà ignorata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La chiave {0} del parametro di Blame può supportare solo valori {1}/{2}. Questa chiave verrà ignorata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La raccolta del dump è stata abilitata ma non è stato generato alcun file di dump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dump di {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dump di questo albero processi (dal basso)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il tempo di inattività specificato di {0} {1} è scaduto. Verranno raccolti i dump in sospeso da testhost e dai relativi processi figlio]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[minuti]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione di tutti i test è stata completata. Il file di sequenza non verrà generato]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[All tests finished running, Sequence file will not be generated.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile avviare il dump del processo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variabile di ambiente PROCDUMP_PATH richiesta è Null o vuota. Impostare PROCDUMP_PATH sul percorso della cartella che contiene il file eseguibile appropriato di procdump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump è stato abilitato ma non è stato generato alcun file di dump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[secondi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il valore '{0}', specificato come timeout, è imprevisto. Specificare un valore in questo formato: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a1b4f84f19..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[File di risultati del test HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore del logger HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile specificare insieme i parametri LogFileName e LogFilePrefix.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 6926eb57ad..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro non può essere minore di 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro non può essere vuoto o Null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile ottenere un nome disponibile per {0}(1), (2) e così via, nella directory {1}. Pulire la directory.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile ottenere o trovare un nome file disponibile per {0} che usa il formato timestamp '{2}' nella directory {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[elemento di distribuzione '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[elemento di distribuzione '{0}' (directory di output '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni test non sono state specificate.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nelle impostazioni test attive non è definita la directory di distribuzione dell'esecuzione.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il risultato non è associato a un'esecuzione dei test. Usare un risultato ottenuto da un'esecuzione dei test in corso o completata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nome di file o directory specificato '{0}' non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(Null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile allegare i file da: {0}]D;]A;Dettagli errore: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il test '{0}' è stato ignorato nell'esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile usare insieme i parametri LogFileName e LogFilePrefix. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tutti i risultati caricati]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Risultati non in elenco]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Interrotto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Completato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Disconnesso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In corso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Senza risultati]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non eseguito]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non eseguibile]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato (esecuzione interrotta)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In sospeso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avviso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[File di risultati: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AVVISO: il file dei risultati {0} verrà sovrascritto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 37aa009696..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro non può essere vuoto o Null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test ha rilevato DLL compilate per versioni diverse del framework e della piattaforma. Le DLL seguenti non corrispondono alle impostazioni correnti, ovvero al framework {0} e alla piattaforma {1}.{2}Per altri dettagli sulla gestione di queste impostazioni, vedere {3}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file di impostazioni specificato non è conforme al formato richiesto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessuno dei contenitori di test specificati corrisponde alle impostazioni di architettura della piattaforma e .NET Framework per l'esecuzione dei test. Piattaforma: {0} .NET Framework: {1}. Per altre informazioni sulla gestione di tali impostazioni, visitare http://go.microsoft.com/fwlink/?LinkID=330428]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} viene compilato per il framework {1} e la piattaforma {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index e715a2abc0..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'elemento ManagedName è incompleto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il grado del metodo deve essere numerico]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il metodo '{0}' non è stato trovato nel tipo '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il tipo '{0}' non è stato trovato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caratteri imprevisti dopo la fine dell'elemento ManagedName (pos.: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli spazi vuoti non sono validi in un elemento ManagedName (pos.: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index bd20a30d15..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro non può essere vuoto o Null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file {0} non esiste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'oggetto deve essere di tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Interrotto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Completato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Disconnesso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In corso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Senza risultati]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non eseguito]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non eseguibile]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato (esecuzione interrotta)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In sospeso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avviso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun convertitore di tipo per il tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nodo '{0}' non è stato trovato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile leggere dal flusso specificato. I dati di un flusso non possono essere inviati se il flusso non supporta l'operazione di lettura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nome file '{0}' specificato contiene i seguenti caratteri non validi: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nome file '{0}' specificato è riservato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile registrare la proprietà '{0}' come tipo valore '{1}' perché è stata già registrata come '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile creare la sessione msdia. HResult COM: '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile caricare msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI non valido nelle impostazioni '{0}' dell'agente di raccolta dati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Al nodo radice delle impostazioni esecuzione test è necessario assegnare il nome 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni '{0}' non sono valide. È stato specificato un valore '{1}' non valido per '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni '{0}' non sono valide. Elemento XmlAttribute imprevisto: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni '{0}' non sono valide. Elemento XmlElement imprevisto: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI '{0}' non valido nelle impostazioni '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impostazioni agente di raccolta dati non valide. Attributo previsto '{0}' mancante. Un'impostazione tipica dell'agente di raccolta dati è analoga alla seguente: <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impostazioni '{0}' non valide. È previsto almeno un elemento XmlAttribute, tra friendlyName, uri e assemblyQualifiedName.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile specificare TestCaseFilter per la specifica esecuzione dei test. FilterCriteria è valido solo per l'esecuzione con origini.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La frequenza di notifica deve essere un valore positivo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il timeout di notifica deve essere un valore maggiore di zero.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(Null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La directory '{0}' della soluzione non esiste. Assicurarsi che la directory della soluzione specificata in runsettings esista e che siano disponibili le autorizzazioni di lettura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La stringa di filtro '{0}' include una sequenza di escape non riconosciuta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numero di colonna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI executor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Percorso file]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome completo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numero di riga]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Origine]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tratti]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Messaggio: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Analisi dello stack:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessuno]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non trovato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome computer]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome visualizzato TestResult]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Durata]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ora di fine]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numero di colonna errore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggio di errore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Analisi dello stack errore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Risultato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ora di inizio]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Messaggi di test:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il tipo '{0}' della proprietà di test '{1}' non è supportato. Usare un tipo di proprietà supportato (tipi primitivi, uri, string, string[]5D;) e riprovare. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0274b4eb85..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono state trovate più versioni della stessa estensione. Verrà selezionata quella più recente.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile trovare l'{0}' host per l'architettura '{1}'.]D;]A;]D;]A;Per risolvere il problema, installare il '{1}' .NET.]D;]A;]D;]A;Il framework specificato è disponibile in:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile trovare {0}. Pubblicare il progetto di test e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile trovare {0}. Assicurarsi che il progetto di test includa un riferimento NuGet del pacchetto "Microsoft.NET.Test.Sdk".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 920ca05a7e..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'XML delle impostazioni esecuzione test non contiene il nodo "RunSettings".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'impostazione '{0}' non è valida. Il valore '{1}' specificato per '{2}' non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nodo 'RunSettings' non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nodo 'RunSettings' non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificato un errore durante il caricamento delle impostazioni. Errore: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le impostazioni della piattaforma di destinazione '{0}' non sono compatibili con l'architettura di sistema '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[È stato specificato un file di impostazioni imprevisto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b9d17d7d79..0000000000
--- a/Localize/lcl/it/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'operazione di avvio della sessione di test è stata interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'operazione di arresto della sessione di test è stata interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'elaborazione degli allegati dell'esecuzione dei test attiva è stata interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'individuazione dei test attiva è stata interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test attiva è stata interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile ricevere il messaggio dal processo vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file {0} non esiste]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il processo vstest.console è stato chiuso in modo anomalo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 182c6fc0dd..0000000000
--- a/Localize/lcl/it/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'eventuale nodo LegacySettings già presente nel file RunSettings verrà rimosso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file RunSettings non contiene un elemento testSettings incorporato. La migrazione non verrà eseguita.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file RunSettings di cui è stata eseguita la migrazione è stato creato in: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli attributi agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts non sono supportati, di conseguenza non ne verrà eseguita la migrazione.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sintassi valida:]D;]A;SettingsMigrator.exe <percorso completo del file testsettings o runsettings di cui eseguire la migrazione>]D;]A;SettingsMigrator.exe <percorso completo del file testsettings o runsettings di cui eseguire la migrazione> <percorso completo del file runsettings da creare>]D;]A;Esempi:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/it/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/it/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 47afeed586..0000000000
--- a/Localize/lcl/it/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ulteriori messaggi informativi:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile avviare l'esecuzione dei test per unit test per l'app di Windows Store: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun test nei contenitori di test specificati. L'adattatore di unit test di Microsoft Windows Store, inoltre, non supporta i file con estensione appxbundle. Durante la creazione di un pacchetto dell'app, creare un file appx impostando l'opzione Genera il bundle dell'app su Mai, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'assembly sottoposto a test non è stato trovato. Assicurarsi che il progetto sia compilato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Allegati:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono disponibili i componenti aggiuntivi di individuazione dei test seguenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono disponibili i componenti aggiuntivi di esecuzione dei test seguenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono disponibili i componenti aggiuntivi di logger di test seguenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono disponibili i componenti aggiuntivi di provider di impostazioni seguenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con l'argomento /BatchSize sono richieste le dimensioni del batch. Esempio: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'opzione CollectDump per Blame non supporta la raccolta dei dump di arresto anomalo del sistema per questa piattaforma.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'opzione CollectDump con TestTimeout per Blame non supporta la raccolta dei dump di blocco per questa piattaforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro di Blame specificato con Blame {0} non è valido e verrà ignorato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<PercorsoBaseCompilazione>]D;]A;      Directory che contiene gli output temporanei.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso di base di compilazione non è stato trovato. Specificare un percorso valido e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argomenti di RunSettings:]D;]A;      Argomenti per passare le configurazioni di runsettings tramite la riga di comando. È possibile specificare gli argomenti come coppia nome-valore in formato [nome]5D;=[valore]5D; dopo "-- ". Notare lo spazio dopo --. ]D;]A;      Usare uno spazio per separare più coppie [nome]5D;=[valore]5D;.]D;]A;      Per altre informazioni sul supporto degli argomenti di RunSettings, vedere: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non può essere Null o vuoto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<Nome descrittivo agente di raccolta dati>]D;]A;      Abilita l'agente di raccolta dati per l'esecuzione dei test. Per altre informazioni, vedere: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" non è supportato se l'esecuzione dei test viene configurata con testsettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Errore: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informazioni: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avviso: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configurazione>]D;]A;      Configurazione per cui viene compilato il progetto, ad esempio Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Tutti i diritti sono riservati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il nome descrittivo '{0}' dell'agente di raccolta dati non è valido. L'agente di raccolta dati verrà ignorato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Giorni]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggi delle tracce di debug:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeout per la connessione o l'elaborazione della richiesta relativa a DesignModeClient sulla porta: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Esempio: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il code coverage non è disponibile per le app di Windows Store. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il code coverage non è disponibile per le app di Windows Phone. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La lettura delle impostazioni dell'adattatore dati di diagnostica ha generato un oggetto '{0}' di esecuzione. Tutti gli adattatori dati di diagnostica verranno ignorati durante questa esecuzione.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Store. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Phone. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'individuazione non è riuscita per le origini specificate. Eccezione: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro "{0}" deve essere specificato una sola volta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Valore]5D;;[DumpType]5D;=[Valore]5D;]D;]A;      Esegue il test in modalità di segnalazione errore. Questa opzione è utile per isolare il test problematico che causa l'arresto anomalo di Test Host.]D;]A;      Crea nella directory corrente un file di output "Sequence.xml", che]D;]A;      acquisisce l'ordine di esecuzione del test prima dell'arresto anomalo.]D;]A;      Si può scegliere di raccogliere il dump del processo per Test Host.]D;]A;      Quando si sceglie di raccogliere il dump, per impostazione predefinita viene raccolto un minidump in caso di arresto anomalo.]D;]A;      Si può anche scegliere di eseguire l'override di questo comportamento predefinito usando alcuni parametri facoltativi:]D;]A;      CollectAlways: per raccogliere il dump all'uscita anche in assenza di arresto anomalo (true/false) ]D;]A;      DumpType: per specificare il tipo di dump (mini/full).]D;]A;      Esempio: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Abilita l'agente di raccolta dati 'CodeCoverage' per l'esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<percorso del file di log>]D;]A;      Abilita i log per la piattaforma di test.]D;]A;      I log vengono scritti nel file specificato.]D;]A;]D;]A;      Modifica il livello di traccia per i log come illustrato di seguito:]D;]A;      Esempio: /Diag:<percorso del file di logfile>;tracelevel=<impostazione predefinita: "verbose">]D;]A;      Valori consentiti per tracelevel: off, error, warning, info e verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/Nome descrittivo logger>]D;]A;      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un ]D;]A;      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=<impostazione predefinita: nome file univoco>]5D;]D;]A;      Crea nella directory TestResults il file con il valore specificato per LogFileName.]D;]A;]D;]A;      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:]D;]A;      Esempio: /logger:console;verbosity=<impostazione predefinita: "minimal">]D;]A;      Valori consentiti per verbosity: quiet, minimal, normal e detailed.]D;]A;]D;]A;      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:]D;]A;      Esempio: /logger:console;prefix=<impostazione predefinita: "false">]D;]A;      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/Nome descrittivo logger>]D;]A;      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un ]D;]A;      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=<impostazione predefinita: nome file univoco>]5D;]D;]A;      Crea nella directory TestResults il file con il valore specificato per LogFileName.]D;]A;]D;]A;      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:]D;]A;      Esempio: /logger:console;verbosity=<impostazione predefinita: "normal">]D;]A;      Valori consentiti per verbosity: quiet, minimal, normal e detailed.]D;]A;]D;]A;      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:]D;]A;      Esempio: /logger:console;prefix=<impostazione predefinita: "false">]D;]A;      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NOME>=<VALORE>]D;]A;      Imposta il valore di una variabile di ambiente. Crea la variabile se non esiste e la sostituisce se esiste. Implica l'opzione /InIsolation e forza l'esecuzione dei test in un processo isolato.]D;]A;      ]D;]A;      È possibile specificare più volte questo argomento per fornire più variabili.]D;]A;]D;]A;      Esempio: -e:VARIABILE1=VALORE1]D;]A;               -e:ALTRA_VARIABILE="VALORE CON SPAZI"]D;]A;               -e:ALTRA_VARIABILE="VALORE;delimitato da;punti e virgola"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La variabile di ambiente '{0}' è già stata definita, ma viene sostituita dall'argomento -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggio di errore:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Per eseguire test:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Per eseguire test con impostazioni aggiuntive, quali agenti di raccolta dati:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificata un'eccezione durante la creazione dell'istanza dell'estensione '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Tempo totale: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non superato]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, i test verranno eseguiti nella modalità di compatibilità di CLR 4.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Versione framework>]D;]A;      Versione di .NET Framework di destinazione da usare per l'esecuzione dei test. ]D;]A;      Valori validi: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" e così via.]D;]A;      Altri valori supportati: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con l'argomento /Framework è richiesta la versione di .NET Framework di destinazione per l'esecuzione dei test. Esempio: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Visualizza questo messaggio relativo alla sintassi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argomenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Descrizione: esegue test dai file specificati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opzioni:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Utilizzo: vstest.console.exe [Argomenti]5D; [Opzioni]5D; [[--]5D; <argomenti di RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ore]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il flag /InIsolation è deprecato. I test verranno sempre eseguiti in un processo separato]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Esegue i test in un processo isolato. In questo modo è meno probabile che ]D;]A;      il processo vstest.console.exe venga arrestato in caso di errore nei test,]D;]A;      che però potrebbero risultare più lenti.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento {0} non è valido. Usare l'opzione/help per verificare l'elenco di argomenti validi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le dimensioni {0} del batch non sono valide. Devono essere maggiori di zero. Esempio: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento '{0}' di Blame non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La configurazione specificata non è valida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento '{0}' di Diag non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso '{0}' del file di Diag non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento {0} non è previsto nel comando 'EnableCodeCoverage'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /EnableCodeCoverage, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[La versione di .NET Framework {0} non è valida. Specificare il nome completo della versione di .NET Framework di destinazione ad esempio .NETCoreApp,Version=v2.0. Altre versioni di .NET Framework supportate: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento {0} non è previsto nel comando 'InIsolation'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /InIsolation, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento '{0}' di Logger non è valido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento {0} non è previsto nel comando 'Parallel'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /Parallel, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con l'argomento --ParentProcessId|/ParentProcessId è richiesto l'ID processo che corrisponde a un numero intero. Specificare l'ID del processo padre che ha avviato questo processo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo di piattaforma non valido: {0}. I tipi di piattaforma validi sono {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con l'argomento --Port|/Port è richiesto un numero di porta che corrisponde a un numero intero. Specificare la porta per la connessione socket e la ricezione dei messaggi dell'evento.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso '{0}' specificato in 'ResultsDirectory' non è valido. Errore: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso '{0}' specificato in 'TestAdapterPath' non è valido. Errore: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è possibile specificare l'argomento /TestCaseFilter con /Tests. Il filtro dei test case non è applicabile quando si specificano test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento '{0}' del parametro di esecuzione dei test non è valido. Usare il formato seguente.]D;]A;     Formato: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento {0} non è previsto nel comando 'UseVsixExtensions'. Specificare il comando indicando se le estensioni vsix devono essere usate o ignorate, ad esempio vstest.console.exe myTests.dll /UseVsixExtensions:true, quindi riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Elenca gli agenti di individuazione test installati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Elenca gli executor di test installati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Elenca i logger di test installati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Elenca i provider di impostazioni test installati.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sono disponibili i test seguenti:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<Nome file>]D;]A;      Elenca tutti i test individuati dal contenitore di test specificato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file specificato {0} è di sola lettura]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Nome descrittivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato trovato alcun logger di test con URI o nome descrittivo '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uno o più file runsettings specificati contengono un token non valido]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Strumento da riga di comando per l'esecuzione di test Microsoft (R) Versione {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minuti]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non sono stati specificati file di origine test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso '{0}' specificato in 'TestAdapterPath' non contiene alcun adattatore di test. Specificare un percorso valido e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il parametro "{0}" non è stato riconosciuto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non sono stati specificati argomenti.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Store, creare il pacchetto dell'app usando il progetto Libreria unit test per app di Windows Store.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In totale sono stati individuati {0} test, ma nessuno corrisponde ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è disponibile alcun test in {0}. Verificare che le impostazioni delle versioni installate di piattaforma e framework, agenti di individuazione ed executor di test siano appropriate e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} è compilato per {1}/{2}. Gli assembly di test specificati in un'esecuzione devono disporre di una piattaforma e di un .NET Framework di destinazione comuni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nessuno]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non eseguito]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Si è verificato un errore durante l'apertura del file di risposta '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      Directory contenente i file binari da eseguire.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso di output non è stato trovato. Specificare un percorso valido e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifica che i test devono essere eseguiti in parallelo. Per impostazione]D;]A;       predefinita, è possibile usare al massimo tutti i core disponibili in questo computer.]D;]A;       Il numero di core da usare può essere configurato con un file di impostazioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      ID del processo padre responsabile dell'avvio del processo corrente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Superato]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Non è stato possibile avviare l'esecuzione dei test per i test per l'app di Windows Phone: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Phone, creare il pacchetto dell'app con il progetto App unit test di Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Tipo di piattaforma>]D;]A;       Architettura della piattaforma di destinazione da usare per l'esecuzione dei test. ]D;]A;       Valori validi: x86, x64 e ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento /Platform richiede il tipo di piattaforma di destinazione per l'esecuzione dei test. Ad esempio: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Porta>]D;]A;      Porta per la connessione socket e la ricezione dei messaggi dell'evento.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esecuzione dei test in corso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso {0} non esiste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      Legge il file di risposta per altre opzioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Se non esiste già, la directory dei risultati dei test verrà creata nel percorso specificato.]D;]A;      Esempio: /ResultsDirectory:<percorsoDirectoryRisultati>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con il parametro /ResultsDirectory è richiesto un valore, corrispondente alla directory in cui verranno salvati i risultati dei test. Esempio: /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<FileImpostazioni>]D;]A;      Impostazioni da usare per l'esecuzione dei test.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file di impostazioni '{0}' non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con il parametro /Settings è necessario specificare un file di impostazioni.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per i test in esecuzione è possibile specificare un solo pacchetto dell'app (file con estensione appx).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Nomi test>]D;]A;      Esegue test con nomi corrispondenti ai valori specificati. Per specificare più]D;]A;      valori, separarli con virgole.]D;]A;      Esempi: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[NomiFileDiTest]5D;]D;]A;      Esegue i test corrispondenti ai file specificati o al carattere jolly. Separare più nomi di file di test o]D;]A;       caratteri jolly con uno spazio. Impostare il livello di dettaglio del logger della console su dettagliato per visualizzare i file di test corrispondenti.]D;]A;      Esempi: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gli agenti di raccolta dati diversi da Code Coverage e Microsoft Fakes configurati tramite le impostazioni esecuzione test non sono supportati con impostazioni di test incorporate. Per altre informazioni, vedere https://aka.ms/vstest-configure-datacollector. Impostazioni esecuzione test: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Secondi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Nome impostazione: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorato]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[In totale sono stati individuati {0} test, ma alcuni test non corrispondono ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con l'argomento /Tests sono richiesti uno o più nomi di test specifici o relative sottostringhe.]D;]A;       Esempi: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Analisi dello stack:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avvio dell'individuazione dei test in corso. Attendere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Avvio dell'esecuzione dei test in corso. Attendere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggi di errore standard:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Messaggi di output standard:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[È anche possibile specificare il percorso degli adattatori di test con il comando /TestAdapterPath. Esempio: /TestAdapterPath:<percorsoAdattatoriPersonalizzati>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Tipi di file supportati:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per eseguire gli unit test per le app di Windows Store, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per eseguire i test, verrà usata la modalità di isolamento in base a quanto specificato nelle impostazioni effettive di piattaforma {0} e .NET Framework {1} per l'esecuzione dei test. Usare il parametro /inIsolation per non visualizzare più questo avviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per eseguire gli unit test per le app di Windows Phone, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per eseguire i test, verrà usata la modalità di isolamento perché gli adattatori dati di diagnostica sono stati abilitati in runsettings. Usare il parametro /inIsolation per non visualizzare più questo avviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il percorso di ricerca dell'adattatore di test personalizzato non è stato trovato. Specificare un percorso valido e riprovare.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Determina se il processo vstest.console.exe usa adattatori di test personalizzati]D;]A;      da un percorso eventualmente specificato nell'esecuzione dei test. ]D;]A;      Esempio  /TestAdapterPath:<percorsoAdattatoriPersonalizzati>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con il parametro /TestAdapterPath è richiesto un valore, corrispondente al percorso di una posizione contenente adattatori di test personalizzati. Esempio: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Espressione>]D;]A;      Esegue test corrispondenti all'espressione specificata.]D;]A;      <Espressione> è nel formato <proprietà>Operatore<valore>[|&<Espressione>]5D;]D;]A;         dopo l'operatore è =, != oppure ~  (l'operatore ~ implica semantica 'contains']D;]A;         ed è applicabile solo per proprietà di stringhe quali DisplayName).]D;]A;         È possibile usare le parentesi () per raggruppare sottoespressioni.]D;]A;      Esempi: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'argomento /TestCaseFilter richiede il valore di filtro.]D;]A;        Il valore di filtro può essere di tipo <proprietà>=<valore>.]D;]A;        Esempi: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esecuzione dei test interrotta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esecuzione dei test interrotta con errore {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esecuzione dei test annullata.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test non è riuscita.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[L'esecuzione dei test è riuscita.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - Non superati: {1}. Superati: {2}. Ignorati: {3}. Totale: {4}. Durata: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Non superati: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Totale test: sconosciuto]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Superati: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Ignorati: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Totale test: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Per eseguire i test, verrà usato il framework {0}. Specificare /Framework:{1} per non visualizzare più questo avviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Il file di origine test "{0}" specificato non è stato trovato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Un totale di {0} file di test corrisponde al criterio specificato.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo trascorso:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI executor predefinito: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions verrà deprecato. Usare /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Determina se il processo vstest.console.exe usa o ignora le estensioni VSIX ]D;]A;      eventualmente installate nell'esecuzione dei test. ]D;]A;      Esempio: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Con il parametro /UseVsixExtensions è richiesto un valore. Se è 'true', le estensioni VSIX eventualmente installate verranno usate nell'esecuzione dei test. Se è false, verranno ignorate. Esempio: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registrazione della diagnostica di Vstest nel file: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e4f254bed5..0000000000
--- a/Localize/lcl/ja/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[イベント ログ '{0}' からの最後のエントリの収集中に例外が発生しました: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[イベント ログ DataCollector では、DataCollectionContext の eventLogContext が見つかりませんでした: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' イベント ログで例外が発生しました。一部のイベントが失われる可能性があります。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[収集中に '{0}' イベント ログがクリアされた可能性があるため、一部のイベントが収集されていない可能性があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[イベント ログ '{0}' をコンピューター '{1}' から読み取れません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index edce083a50..0000000000
--- a/Localize/lcl/ja/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[コード カバレッジ データを利用できません。現在、コード カバレッジは Windows でのみサポートされています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ディレクトリ {0} の作成に失敗しました。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のエラーが原因で、コード カバレッジ データ コレクターを初期化できませんでした: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行中イベントが CodeCoverage.exe から受信されません。エラーの原因については、EventLog をご確認ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行中イベントを CodeCoverage.exe から {0} 秒以内に受信できませんでした。これは、マシンの遅さが原因で発生する可能性があるため、環境変数 {1} を設定してタイムアウト時間を増やしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe が次の場所に見つかりません: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c019859a7e..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName が不完全です]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無効なエスケープ シーケンスです。(セグメント: {0}、位置: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[メソッドのアリティは、数値でなければなりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[メソッド '{0}' が型 '{1}' に見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[セグメントの最後に対応する一重引用符を指定する必要があります。(セグメント: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[型 '{0}' が見つかりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName の末尾の後ろに予期しない文字があります (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName では空白は無効です (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' はこのプラットフォームに実装されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a1c6a5b9eb..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ビルドが完了しました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ビルドが開始されました。しばらくお待ちください...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロジェクト {0} へのテストの実行をスキップしています。dotnet テストでテストを実行するには、"<IsTestProject>true</IsTestProject>" プロパティをプロジェクト ファイルに追加します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} ({1}) のテスト実行]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: コード カバレッジを収集するには、Microsoft.NET.Test.Sdk パッケージ参照をバージョン 15.8.0 以降に更新してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c3e554033c..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[初期状態が無効なため、テストの実行を実行できませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[この実行に対して適切なテスト ランタイム プロバイダーが見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行を中止しています: テスト実行のタイムアウト {0} ミリ秒を超過しました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテストの実行がない場合、完了の待機操作は許可されません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index fe8bf08178..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み権限のあるフォルダーから vstest.console.exe を実行してください。詳細については、次のエラー メッセージをご覧ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[操作のキャンセルが要求されたため、キャンセルしています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクション : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター '{0}' で初期化情報を表示できませんでした。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター '{0}' が型の読み込み、作成、または初期化中に例外をスローしました: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター '{0}' メッセージ: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター '{0}' が見つかりませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター '{0}' が値 '{2}' の環境変数 '{1}' をテスト実行時環境で設定するように要求しましたが、別のデータ コレクター '{3}' が既に別の値 '{4}' を持つ同じ環境変数を要求しています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト拡張 URI '{0}' は重複しています。重複する拡張を無視しています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' という名前の設定プロバイダーが重複しています。重複するプロバイダーを無視しています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' という名前の重複した実行設定セクションが見つかりました。重複する設定を無視しています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: かっこ ( ) が空です]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[インストール済みの単体テスト拡張の一覧が見つかりませんでした。理由: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ファイル '{0}' から拡張機能を読み込めませんでした。詳細な情報を得るには、/diag をご使用ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[高速フィルターを作成中にエラーが発生しました。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクターの FriendlyName が '{0}' の構成が複数あります。テストの実行では、重複した構成は無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[内部例外:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: 条件 '{0}' が無効です]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト拡張に無効な URI '{0}' があります: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: 演算子 '{0}' が無効です]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}: '{1}' でのロガーの初期化中に例外が発生しました。ロガーは使用されません。例外: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AssemblyQualifiedName、URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: ')' がありません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: '(' がありません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: オペランドがありません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[演算子 '|' または '&' がありません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクターが型 '{0}' の例外をキャッチしました: '{1}'。詳細: {2}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行設定は既に読み込まれています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行設定の読み込み中にエラーが発生しました。エラー: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無効な設定ノードが指定されました。設定ノードの名前プロパティを空白にしないようにしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' という名前の設定プロバイダーを初期化中にエラーが発生しました。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' という名前の設定プロバイダーが見つかりませんでした。設定を読み込めません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[スタック トレース:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter {0} の形式が正しくありません。正しい形式を指定してもう一度お試しください。形式が正しくないと、テストが実行されないことがあります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[フレンドリ名が '{0}' の datacollector が見つかりません。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[このオプションは Visual Studio の一部として vstest.console.exe がインストールされている場合のみ使用できます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクション コンテキストから派生する型をデータおよびメッセージの送信に使用することはできません。データおよびメッセージの送信に使用される DataCollectionContext は、データ コレクターに対して発生したイベントの 1 つからのものである必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index db0bfbb9fb..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテスト探索が中止されました。理由: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテストの実行が中止されました。理由: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[デバッガーを既定のテスト ホストにアタッチできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[既存の接続はリモート ホストに強制的に切断されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} プロセスでは、{2} 秒後に {1} プロセスへ接続できませんでした。これは、マシンの遅さが原因で発生する可能性があるため、環境変数 {3} を設定してタイムアウト時間を増やしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストのホスト プロセスがクラッシュしました]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト ホスト プロセスと通信できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[予期しないメッセージを受信しました。予想されたメッセージの種類: {0} 実際のメッセージの種類: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロトコルのバージョンを確認できませんでした。テスト ランナーとホストに互換性があることをご確認ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロトコルをネゴシエートできませんでした。応答への待機が {0} 秒後にタイムアウトしました。これはマシンの遅さが原因で発生する可能性があるため、環境変数 {1} を設定してタイムアウト時間を増やしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a5a47c0c62..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーターを null または空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[情報: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定した引数を空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定した引数を負の値にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された引数は次の型でなければなりません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された引数には次のプロパティがあり、これを空の文字列にすることはできません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定した引数には次のプロパティがあります。このプロパティを負の値にすることはできません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定した引数には次のプロパティがあります。このプロパティを null にすることはできません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された引数には次のプロパティがあります: {0}。このプロパティは次の型でなければなりません: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' キューからジョブを処理中にハンドルされない例外が発生しました: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ホストが見つかりませんでした。'{0}' がコンピューターにインストールされており、PATH 環境変数で使用できることを確認してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} キューは既に破棄されています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} キューは一時停止中に破棄できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロセス名の取得エラーです。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ab1eb8ed25..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み特権のあるフォルダーから vstest.console.exe を実行してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[デバッガーをプロセス ID: {0} の既定のテスト ホストにアタッチできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector のデバッグが有効です。続行するにはデバッガーを datacollector プロセスにアタッチしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アダプター検索は変更中です。詳細については、https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap をご覧ください。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[探索プログラムのインスタンス化中に例外が発生しました: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[同じ URI '{0}' を持つ複数のテスト アダプターが見つかりました。アダプター '{1}' を無視します。この警告が表示されないようにするには、競合するアダプターをアンインストールしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された重複データ ソース '{0}' を無視します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト探索プログラム '{0}' がテストを読み込んでいるときに例外が発生しました。例外: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行プログラム '{0}' の呼び出し中に例外が発生しました: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[フレームワークでの ThreadApartmentState オプションの実行はサポートされていません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラーが発生したため、TestHost を起動できませんでした: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ファイル {0} は見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ホスト デバッグが有効です。続行するにはデバッガーをテスト ホスト プロセスにアタッチしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト探索プログラム {0} には DefaultExecutorUri 属性が含まれていないため、このテスト探索プログラムに対応するテスト実行プログラムを無視しています。テスト アダプター アドインの再インストールが必要になる場合があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[クライアント プロキシを初期化できませんでした。テスト プロセスに接続できませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[この操作は、非デバッグ実行のコンテキストでは許可されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[デキューするために使用できるプロキシが見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} が見つかりませんでした。dotnet がマシンにインストールされていることを確認してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI が '{0}' のテスト実行プログラムが見つかりませんでした。テスト実行プログラムがインストールされ、.net ランタイム バージョン {1} をサポートしていることをご確認ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID が {0} のプロキシは、現在のセッション マネージャーで管理されません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定のテストケース フィルター `{0}` に一致するテストは {1} にありません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたソース '{0}' がいずれも有効ではありません。上記のエラーおよび警告を修正してから、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[拡張機能が見つかりませんでした: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft.NET.Test.Sdk の古いバージョンを使用しています。15.3.0 以降のバージョンに移行することをお勧めします。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID が {0} のプロキシは、既に使用可能になっているため、再度エンキューすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの検出が取り消されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} で使用できるテストはありません。テスト探索プログラムおよび実行プログラムが登録されており、プラットフォームおよびフレームワークのバージョン設定が適切であることを確認してから、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のファイルで TestHost 診断をログ記録しています: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[フィルターに一致するテストがありません。フィルターに無効なプロパティが 1 つ以上含まれています ({0})。有効なプロパティを含むフィルター式 ({1}) を指定してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 50f799d26c..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ホスト プロセスが予期せずに終了したため、アクティブなテストの実行が中止されました。(使用可能な場合) 上記の呼び出し履歴を調べて、例外の発生元に関する詳細情報を取得してください。]D;]A;クラッシュの発生時に実行中だったテスト: ]D;]A;{0}]D;]A;このテストは、必ずしもクラッシュの原因ではない場合もあります。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された blame パラメーター キー {0} は無効です。このキーは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[blame パラメーター キー {0} は値 {1}/{2} のみをサポートします。このキーは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ダンプの収集は有効化されましたが、ダンプ ファイルは生成されませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - {1} をダンプしています]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[このプロセス ツリーをダンプしています (下から)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された非アイドル時間 {0} {1} が経過しました。testhost およびその子プロセスからのハング ダンプを収集しています]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[すべてのテストの実行が完了しました。Sequence ファイルは生成されません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロセス ダンプを開始できませんでした: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[必須の環境変数 PROCDUMP_PATH は Null または空でした。PROCDUMP_PATH を、適切な procdump 実行可能ファイルを含むフォルダーのパスに設定してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump は有効になりましたが、ダンプ ファイルは生成されませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[予期しない値 '{0}' がタイムアウトとして指定されました。次の形式で値を指定してください: 1.5h、90m、5400s、5400000ms、5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 2f816e80de..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML テスト結果ファイル: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML ロガー エラー: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーター LogFileName と LogFilePrefix を同時に指定することはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index a8f6b93831..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーターを 0 より小さい値にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーターを null または空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}(1),(2),... に対して、ディレクトリ {1} で使用可能な名前を取得できません。このディレクトリをクリーンアップしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1} でタイムスタンプ形式 '{2}' を使用して {0} の使用可能なファイル名を取得できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[配置項目 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[配置項目 '{0}' (出力ディレクトリ ' {1} ')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの設定が指定されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテストの設定は実行配置ディレクトリを定義していません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[この結果はテストの実行に関連付けられていません。進行中または完了したテストの実行から取得した結果をご使用ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたファイルまたはディレクトリ名 '{0}' は有効ではありません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次の場所からのファイルの添付に失敗しました: {0}]D;]A;エラーの詳細: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行でテスト '{0}' がスキップされました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーター LogFileName と LogFilePrefix を同時に使用することはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[読み込まれたすべての結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[一覧に存在しない結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[完了]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[切断]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[処理中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果不確定]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行されませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行できませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功 (中止された実行)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[保留中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[タイムアウト]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果ファイル: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: 結果ファイルを上書きしています: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index cc30534fbb..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーターを null または空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行で、別のフレームワークとプラットフォームのバージョン用にビルドされた DLL が検出されました。以下の DLL は、現在の設定と一致しません。現在のフレームワーク: {0}、プラットフォーム: {1}。{2}これらの設定を管理することについて詳しくは、{3} にアクセスしてください。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定された設定ファイルは、必要な形式に準拠していません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供されたどのテスト コンテナーも、テスト実行のプラットフォーム アーキテクチャおよび .NET Framework 設定に一致しません。プラットフォーム: {0}、.NET Framework: {1}。これらの設定の管理方法の詳細については、http://go.microsoft.com/fwlink/?LinkID=330428 にアクセスしてください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} はフレームワーク {1} およびプラットフォーム {2} 向けにビルドされます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 80709a62d7..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName が不完全です]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[メソッドのアリティは、数値でなければなりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[メソッド '{0}' が型 '{1}' に見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[型 '{0}' が見つかりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName の末尾の後ろに予期しない文字があります (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName では空白は無効です (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 642bdb15d2..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーターを null または空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ファイル {0} は存在しません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[オブジェクトは {0} 型でなければなりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[完了]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[切断]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[処理中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果不確定]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行されませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行できませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功 (中止された実行)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[保留中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[タイムアウト]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[型 {0} の TypeConverter が見つかりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ノードが見つかりませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたストリームからデータを読み取ることができません。ストリームで読み取りがサポートされていない場合は、ストリームのデータを送信できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたファイル名 '{0}' に次の無効な文字が含まれています: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたファイル名 '{0}' は、予約済みです。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロパティ '{0}' は既に値の型 '{2}' として登録されていたため、'{1}' として登録できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[msdia Session COM HResult '{0}' を作成できませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[msdia を読み込めませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクター設定 '{0}' の URI は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行設定のルート ノードには 'RunSettings' という名前を付ける必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無効な設定です: '{0}'。'{2}' に対して無効な値 '{1}' が指定されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' は無効です。予期しない XmlAttribute: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' は無効です。予期しない XmlElement: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{1}' の URI '{0}' は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクターの設定が無効です。予期された属性 '{0}' が見つかりません。通常のデータ コレクターの設定は <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"> のようになります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' は無効です。friendlyName、uri、assemblyQualifiedName のうち少なくとも一つの XmlAttribute が必要です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[特定のテストの実行には TestCaseFilter を指定できません。FilterCriteria は、ソースでの実行だけで使用できます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知頻度は正の値である必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知タイムアウトは 0 より大きくする必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ソリューション ディレクトリ '{0}' は存在しません。実行設定で指定したソリューション ディレクトリが存在することと、ディレクトリの読み取りアクセス許可があることをご確認ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[フィルター文字列 '{0}' には、認識されないエスケープ シーケンスが含まれています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[列番号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行プログラムの URI]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ファイル パス]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[行番号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名前]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ソース]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[特徴]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  メッセージ: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  スタック トレース:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[なし]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[スキップ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[コンピューター名]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult 表示名]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[期間]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[終了時刻]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー列番号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー メッセージ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラーのスタック トレース]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[開始時刻]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  テスト メッセージ:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プロパティ '{1}' のテスト プロパティの型 '{0}' はサポートされていません。サポートされているプロパティの型 (プリミティブ型、URI、string、string[]5D;) のいずれかを使用して、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 85aa750a64..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[同じ拡張子で複数のバージョンが見つかりました。最新のバージョンを選択しています。]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' アーキテクチャの '{0}' ホストが見つかりませんでした。]D;]A;]D;]A;'{1}' .NET をインストールすると、問題を解決できます。]D;]A;]D;]A;指定したフレームワークは次の場所にあります:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} を見つけることができません。テスト プロジェクトを公開してもう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} を見つけることができません。テスト プロジェクトにパッケージ "Microsoft.NET.Test.Sdk" の NuGet 参照があることを確認してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 798a08649a..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行設定 XML に "RunSettings" ノードがありません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' は無効です。無効な値 '{1}' が '{2}' に指定されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' ノードが見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' ノードが見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定の読み込み中にエラーが発生しました。エラー: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ターゲット プラットフォームの設定 '{0}' はシステム アーキテクチャ '{1}' と互換性がありません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[予期しない設定ファイルが指定されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f5957a9993..0000000000
--- a/Localize/lcl/ja/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト セッションの開始操作が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト セッションの停止操作が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテストの実行の添付ファイルの処理が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテスト探索が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アクティブなテストの実行が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console プロセスからメッセージを受信できませんでした]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ファイル {0} が存在しません]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console プロセスが異常終了しました]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ca686fe62b..0000000000
--- a/Localize/lcl/ja/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 内に既に存在するすべての LegacySettings ノードは削除されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings には埋め込み testSettings が含まれていないため、移行されません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[移行された RunSettings ファイルは次の場所に作成されました: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeouts ノードの agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 属性はサポートされていないため、これらは移行されません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[有効な使用法:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to testsettings file or runsettings file to be migrated>]D;]A;例:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ja/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ja/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a581b1a72b..0000000000
--- a/Localize/lcl/ja/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ja-JP" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[追加情報メッセージ:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows ストア アプリの単体テストのテスト実行を開始できません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたテスト コンテナーにテストが見つかりません。さらに、Microsoft Windows ストア単体テスト アダプターで .appxbundle ファイルがサポートされていません。アプリ パッケージの作成時に appx ([アプリ バンドルの生成]5D; オプションを [しない]5D; に設定) し、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト中のアセンブリが見つかりません。プロジェクトがビルドされたことをご確認ください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[添付ファイル:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のテスト探索アドインを使用できます:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のテスト実行アドインを使用できます:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のテスト ロガー アドインを使用できます:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次の設定プロバイダー アドインを使用できます:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/BatchSize 引数には、バッチのサイズが必要です。例: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[このプラットフォームでは、Blame の CollectDump オプションによるクラッシュ ダンプの収集はサポートされていません。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[このプラットフォームでは、Blame の TestTimeout を使用する CollectDump オプションによるハング ダンプの収集はサポートされていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[blame で指定された blame パラメーター {0} は無効です。このパラメーターは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      一時的な出力を含むディレクトリです。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[BuildBasePath が見つかりませんでした。有効なパスを指定してもう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 引数:]D;]A;      commandline 経由で runsettings 構成を渡す引数。引数は、"-- " の後に [name]5D;=[value]5D; の形式で名前と値のペアとして指定できます。-- の後のスペースにご注意ください。]D;]A;      複数の [name]5D;=[value]5D; を区切るにはスペースを使用します。]D;]A;      RunSettings 引数のサポートに関する詳細情報: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[null または空にすることはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      テストの実行用のデータ コレクターを有効にします。詳細情報はこちら: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" は、testsettings を使用してテストの実行が構成されている場合、サポートされません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[情報: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      プロジェクトをビルドする構成です。つまり、Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[データ コレクターのフレンドリ名 '{0}' が無効です。データ コレクターは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[日数]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[デバッグ トレース メッセージ:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ポートで接続または DesignModeClient の要求処理のタイムアウト: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     例: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows ストア アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[診断データ アダプターの設定の読み取り中に実行中の '{0}' がスローされました。この実行では、すべての診断データ アダプターがスキップされます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows ストア アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定したソースで検出が失敗しました。例外 : {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーター "{0}" は一度しか指定できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      テストを Blame モードで実行します。このオプションは、テスト ホストのクラッシュを引き起こしているテストを分離するのに役立ちます。]D;]A;      現在のディレクトリに "Sequence.xml" という出力ファイルを作成し、]D;]A;      そのファイルにクラッシュ前のテストの実行順序をキャプチャします。]D;]A;      必要に応じて、テスト ホストのプロセス ダンプを収集することもできます。]D;]A;      ダンプを収集するように選択すると、既定ではクラッシュ時にミニ ダンプが収集されます。]D;]A;      この既定の動作を次のオプション パラメーターでオーバーライドすることもできます:]D;]A;      CollectAlways - クラッシュが発生していなくても終了時にダンプを収集します (true/false) ]D;]A;      DumpType - ダンプの種類を指定します (mini/full)。]D;]A;      例: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      テストの実行用にデータ コレクター 'CodeCoverage' を有効にします。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      テスト プラットフォームに対してログを有効にします。]D;]A;      ログは指定されたファイルに書き込まれます。]D;]A;]D;]A;      次のようにログのトレース レベルを変更します。]D;]A;      例: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      トレース レベルに使用できる値: off、error、warning、info、verbose。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      テスト結果のロガーを指定します。たとえば、結果のログを]D;]A;      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=<Defaults to unique file name>]5D; を使用します]D;]A;      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。]D;]A;]D;]A;      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します]D;]A;      例: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      詳細レベルに使用できる値: quiet、minimal、normal、detailed。]D;]A;]D;]A;      コンソール ロガーの診断レベルのプレフィックスを次のように変更します]D;]A;      例: /logger:console;prefix=<Defaults to "false">]D;]A;      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      テスト結果のロガーを指定します。たとえば、結果のログを]D;]A;      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=<Defaults to unique file name>]5D; を使用します]D;]A;      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。]D;]A;]D;]A;      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します]D;]A;      例: /logger:console;verbosity=<Defaults to "normal">]D;]A;      詳細レベルに使用できる値: quiet、minimal、normal、detailed。]D;]A;]D;]A;      コンソール ロガーの診断レベルのプレフィックスを次のように変更します]D;]A;      例: /logger:console;prefix=<Defaults to "false">]D;]A;      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      環境変数の値を設定します。変数が存在しない場合は作成され、存在する場合はオーバーライドされます。これにより、/InIsolation スイッチが暗黙に指定されるため、テストは強制的に分離プロセスで実行されます。]D;]A;      ]D;]A;      この引数は、複数の変数を指定するために複数回指定できます。]D;]A;]D;]A;      例: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[環境変数 '{0}' は既に定義されていますが、-Environment 引数でオーバーライドされます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[エラー メッセージ:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  テストを実行する:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  テストをデータ コレクターなどの追加設定を指定して実行する:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[拡張をインスタンス化しているときに例外が発生しました: '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[合計時間: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' が見つかりません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 はサポートされていません。.Net Framework 3.5 を対象にしたプロジェクトでは、CLR 4.0 の「互換モード」でテストが実行されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      テストの実行に使用する、.Net Framework のターゲット バージョン。]D;]A;      有効な値は ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" などです。]D;]A;      サポートされている他の値は、Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Framework 引数には、テストの実行対象とする .Net Framework バージョンが必要です。例: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      この使用方法に関するメッセージを表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引数:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[説明: 指定されたファイルからテストを実行します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[オプション:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用法: vstest.console.exe [引数]5D; [オプション]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[時間]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation フラグは非推奨です。テストは常に別個のプロセスで実行されます]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      分離プロセスでテストを実行します。これにより、vstest.console.exe ]D;]A;      プロセスがテスト時にエラーで停止する可能性は低くなりますが、]D;]A;      テストの速度が遅くなる場合があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引数 {0} が無効です。有効な引数の一覧を確認するには、/help オプションを使用してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[バッチ サイズ {0} は無効です。バッチ サイズには、0 より大きい値を指定してください。例: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame 引数 '{0}' は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定の構成が無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag 引数 '{0}' は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag ファイル パス '{0}' は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引数 {0} は、'EnableCodeCoverage' コマンドでは必要ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /EnableCodeCoverage)、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[.Net Framework バージョンが無効です: {0}。TargetFramework の完全な名前を指定してください (例: .NETCoreApp,Version=v2.0)。その他のサポートされる .Net Framework バージョンは Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['InIsolation' コマンドでは、引数 {0} は適切ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /InIsolation)、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Logger 引数 '{0}' は無効です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引数 {0} は 'Parallel' コマンド内で使用できません。引数を使用せずにコマンドを指定して (例: vstest.console.exe myTests.dll /Parallel)、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId 引数には整数であるプロセス ID を指定する必要があります。このプロセスを開始した親プロセスのプロセス ID を指定してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[プラットフォームの種類が無効です: {0}。有効なプラットフォームの種類は {1} です。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port 引数には、整数であるポート番号を指定する必要があります。ソケット接続およびイベント メッセージ受信用のポートを指定してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['ResultsDirectory' に指定されているパス '{0}' は無効です。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' に指定されているパス '{0}' は無効です。エラー: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 引数を /Tests と共に指定することはできません。テストが指定されている場合、テスト ケースのフィルター処理は適用できません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行パラメーターの引数 '{0}' が無効です。以下の形式を使用してください。]D;]A;     形式: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['UseVsixExtensions' コマンドでは、引数 {0} は適切ではありません。vsix 拡張機能を使用するのかスキップするのかを示すコマンドを指定し (例: vstest.console.exe myTests.dll /UseVsixExtensions:true)、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      インストール済みのテスト探索プログラムを一覧表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      インストール済みのテスト実行プログラムを一覧表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      インストール済みのテスト ロガーを一覧表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      インストール済みのテスト設定プロバイダーを一覧表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のテストを使用できます:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<ファイル名>]D;]A;      指定されたテスト コンテナーから、すべての探索されたテストを一覧表示します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたファイル {0} は読み取り専用です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        表示名: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定の runsettings の 1 つ以上に無効なトークンが含まれています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト ソース ファイルが指定されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' に指定されているパス '{0}' には、テスト アダプターがありません。有効なパスを指定して、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パラメーター "{0}" は認識されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引数が指定されていません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows ストア アプリの単体テストを実行する場合は、Windows ストア アプリ単体テスト ライブラリ プロジェクトを使用して、アプリ パッケージを作成してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致するテストはありません。適切な値を使用して、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} で使用できるテストはありません。インストールされているテスト探索プログラム、実行プログラム、プラットフォーム、およびフレームワークのバージョン設定が適切であることを確認し、再試行してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} は {1}/{2} 用にビルドされています。実行で指定されるテスト アセンブリは、対象とする .NET Framework およびプラットフォームを共通にする必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[なし]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未実行]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[応答ファイル '{0}' を開くときにエラーが発生しました]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      実行するバイナリを含むディレクトリです。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Output パスが見つかりませんでした。有効なパスを指定してもう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      テストを並列で実行するように指定します。既定では、]D;]A;      コンピューター上の使用可能なコア数まで使用できます。]D;]A;      使用するコアの数は、設定ファイルを使用して構成できます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      現在のプロセスを起動する親プロセスのプロセス ID です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone アプリに対するテストのテスト実行を開始できません: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows Phone アプリの単体テストを実行する場合は、Windows Phone 単体テスト アプリ プロジェクトを使用して、アプリ パッケージを作成してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      テストの実行に使用するターゲット プラットフォームのアーキテクチャです。]D;]A;      有効な値は、x86、x64、ARM です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Platform 引数には、テストの実行対象とするプラットフォームの種類を指定する必要があります。例: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Port>]D;]A;      ソケット接続およびイベント メッセージを受信するためのポートです。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行が処理中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[パス {0} は存在しません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      その他のオプションについては、応答ファイルを参照してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      存在しない場合、テスト結果のディレクトリが指定されたパスに作成されます。]D;]A;      例: /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ResultsDirectory パラメーターには値が必要であり、そこにテスト結果が保存されます。例:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      テストを実行する際に使用する設定です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定ファイル '{0}' が見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Settings パラメーターには、設定ファイルを指定する必要があります。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行する複数のテストには、1 つのアプリ パッケージ (.appx ファイル) だけを指定できます。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      指定された値に一致する名前のテストを実行します。複数の値を]D;]A;      指定する場合、コンマで区切ります。]D;]A;      例: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      指定されたファイルまたはワイルド カード パターンからテストを実行します。複数のテスト ファイル名または]D;]A;      パターンをスペースで区切ります。一致したテスト ファイルを表示するには、コンソール ロガーの詳細度を detailed に設定します。]D;]A;      例: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[実行設定を経由して構成されているコード カバレッジと Microsoft Fakes 以外のデータ コレクターは、埋め込まれたテストの設定ではサポートされていません。詳細については、https://aka.ms/vstest-configure-datacollector をご覧ください。実行設定: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[スキップ]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致しないテストがあります。適切な値を使用して、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Tests 引数には、1 つ以上の特定のテスト名またはその部分文字列が必要です。]D;]A;       例: /Tests:TestsMethod1、/Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[スタック トレース:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト探索を開始しています。お待ちください...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト実行を開始しています。お待ちください...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[標準エラー メッセージ:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[標準出力メッセージ:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[さらに、/TestAdapterPath コマンドを使用してテスト アダプターのパスを指定できます。例: /TestAdapterPath:<pathToCustomAdapters>。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        サポートされているファイルの種類:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows ストア アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト実行のための効果的なプラットフォーム: {0} および .Net Framework: {1} の設定で必要とされるため、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[診断データ アダプターが実行設定で有効になっていたので、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[カスタム テスト アダプターの指定された検索パスが見つかりませんでした。有効なパスを指定して、もう一度お試しください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      テストの実行で、vstest.console.exe プロセスが指定されたパス (ある場合) ]D;]A;      からのカスタム テスト アダプターを使用するようにします。]D;]A;      例  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestAdapterPath パラメーターには、値として、カスタム テスト アダプターがある場所のパスが必要です。例: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      指定された式と一致するテストを実行します。]D;]A;      <Expression> の形式は <property>演算子<value>[|&<Expression>]5D;]D;]A;         で、演算子は =、!=、~ のいずれかです (演算子 ~ には '含む']D;]A;         セマンティクスがあり、DisplayName などの文字列プロパティに適用されます)。]D;]A;         かっこ () は、サブ式のグループ化に使用できます。]D;]A;      例: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 引数には、フィルター値が必要です。]D;]A;        フィルター値は、<プロパティ>=<値> という型で指定できます。]D;]A;        例: "Priority=1"、"TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト実行が中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行がエラー {0} により中止されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テスト実行が取り消されました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行に失敗しました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの実行に成功しました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} -失敗: {1}、合格: {2}、スキップ: {3}、合計: {4}、期間: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     失敗: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの合計数: 不明]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     成功: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    スキップ: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[テストの合計数: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[フレームワーク {0} を使用してテストを実行します。この警告を表示しないようにするには、/Framework:{1} を指定します。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定されたテスト ソース ファイル "{0}" が見つかりませんでした。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[合計 {0} 個のテスト ファイルが指定されたパターンと一致しました。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[経過時間:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        既定の実行プログラムの URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions は非推奨になりました。代わりに /TestAdapterPath を使用してください。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      これにより、テストの実行で vstest.console.exe プロセスによってインストール済みの]D;]A;      VSIX 拡張機能 (ある場合) が使用またはスキップされます。 ]D;]A;      例 /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions パラメーターに値を指定する必要があります。'true' を指定すると、インストール済みの VSIX 拡張機能 (ある場合) がテストの実行で使用されます。false を指定すると、これらは無視されます。例: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[次のファイルで Vstest 診断をログ記録しています: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d0c0117d07..0000000000
--- a/Localize/lcl/ko/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이벤트 로그 ‘{0}’에서 최종 항목을 수집하는 동안 예외가 발생했습니다. {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이벤트 로그 DataCollector에서 DataCollectionContext에 대한 eventLogContext를 찾지 못했습니다. {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[‘{0}’ 이벤트 로그에서 예외가 발생했습니다. 일부 이벤트가 손실되었을 수 있습니다. 오류: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[수집 중 ‘{0}’ 이벤트 로그가 지워졌을 수 있습니다. 일부 이벤트는 수집되지 않았을 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[‘{1}’ 컴퓨터에서 이벤트 로그 ‘{0}’을(를) 읽을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e49faa32f3..0000000000
--- a/Localize/lcl/ko/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[사용할 수 있는 코드 검사 데이터가 없습니다. 코드 검사는 현재 Windows에서만 지원됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 오류가 발생하여 {0} 디렉터리를 만들지 못했습니다.{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 오류가 발생하여 코드 검사 datacollector를 초기화하지 못했습니다. {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe에서 실행 중인 이벤트를 받지 못했습니다. 실패 원인은 이벤트 로그를 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe에서 실행 중인 이벤트를 {0}초 내에 받지 못했습니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {1}을(를) 설정하여 시간 제한을 늘리세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}에서 CodeCoverage.exe를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f43ae06d64..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName이 불완전함]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이스케이프 시퀀스가 잘못되었습니다. (세그먼트: {0}, pos: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[메서드 인자 수는 숫자여야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 메서드를 '{1}' 형식에서 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[세그먼트 끝에 닫는 작은따옴표가 있어야 합니다. (세그먼트: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 형식을 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName의 끝 다음에 예기치 않은 문자가 있습니다(pos: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName에서 공백은 유효하지 않습니다(pos: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}'이(가)이 플랫폼에서 구현되지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 03321f3cab..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[빌드가 완료되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[빌드가 시작되었습니다. 잠시 기다려 주세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로젝트 {0}에 대한 테스트 실행을 건너뜁니다. dotnet 테스트와 함께 테스트를 실행하려면 "<IsTestProject>true</IsTestProject>" 속성을 프로젝트 파일에 추가합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}({1})에 대한 테스트 실행]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고: 코드 검사를 수집하려면 Microsoft.NET.Test.Sdk 패키지 참조를 버전 15.8.0 이상으로 업데이트하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b2ad001d77..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[초기 상태가 잘못되어 테스트 실행을 실행할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이 실행에 적합한 테스트 런타임 공급자를 찾지 못했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행 중단 중: 테스트 실행 시간 제한 {0}밀리초가 초과되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 실행이 없으면 완료 작업을 대기할 수 없습니다. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b4b5c4de7a..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요. 자세한 내용은 다음 오류 메시지를 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[요청한 대로 작업을 취소하는 중입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 '{0}'에서 초기화 정보를 제공하지 못했습니다. 오류: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[형식 로드, 생성 또는 초기화 중에 데이터 수집기 '{0}'에서 예외를 throw했습니다. {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 '{0}' 메시지: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 '{0}'을(를) 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 '{0}'에서 값이 '{2}'인 환경 변수 '{1}'을(를) 테스트 실행 환경에서 설정하도록 요청했는데, 다른 데이터 수집기 '{3}'이(가) 다른 값('{4}')을 포함하는 동일 환경 변수를 이미 요청했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 확장 URI '{0}'이(가) 중복됩니다. 중복 확장을 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설정 공급자 '{0}'이(가) 중복됩니다. 중복 공급자를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[중복 실행 설정 섹션 '{0}'이(가) 있습니다. 중복 설정을 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: 빈 괄호 ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설치된 단위 테스트 확장 목록을 찾지 못했습니다. 이유: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 파일에서 확장을 로드하지 못했습니다. 자세한 내용을 보려면 /diag를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[빠른 필터를 만드는 중 오류가 발생했습니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 FriendlyName이 '{0}'인 여러 개의 구성이 있습니다. 중복 구성은 테스트 실행에서 무시됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[내부 예외:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: 잘못된 조건 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 확장의 URI '{0}'이(가) 잘못되었습니다. {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: 잘못된 연산자 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}: '{1}'인 로거를 초기화하는 동안 예외가 발생했습니다. 로거가 사용되지 않습니다. 예외: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AssemblyQualifiedName, URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: ')' 누락]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: '(' 누락]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: 피연산자 누락]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['|' 또는 '&' 연산자 누락]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기에서 '{0}': '{1}' 형식의 예외를 catch했습니다. 자세한 정보: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행 설정이 이미 로드되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행 설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[잘못된 설정 노드를 지정했습니다. 설정 노드의 이름 속성이 비어 있어서는 안 됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설정 공급자 '{0}'을(를) 초기화하는 동안 오류가 발생했습니다. 오류: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설정 공급자 '{0}'을(를) 찾을 수 없습니다. 설정을 로드할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[스택 추적:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter {0}의 형식이 잘못되었습니다. 올바른 형식을 지정하고 다시 시도하세요. 잘못된 형식을 사용하면 테스트가 실행되지 않을 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이름이 '{0}'인 datacollector를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이 옵션은 Visual Studio의 일부로 설치된 vstest.console.exe에서만 실행됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 컬렉션 컨텍스트에서 파생된 형식을 사용하여 데이터 및 메시지를 보낼 수 없습니다.  데이터 및 메시지를 보내는 데 사용되는 DataCollectionContext는 데이터에 대해 발생한 이벤트 중 하나에서 가져와야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 81f585a261..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 검색이 중단되었습니다. 이유: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 실행이 중단되었습니다. 이유: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[기본 테스트 호스트에 디버거를 연결할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[원격 호스트에 의해 기존 연결이 강제로 종료되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 프로세스가 {2}초 후 {1} 프로세스에 연결하지 못했습니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {3}을(를) 설정하여 시간 제한을 늘리세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 호스트 프로세스 작동이 중단됨]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 호스트 프로세스와 통신할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[예기치 않은 메시지를 수신했습니다. 필요한 MessageType: {0} 실제 MessageType: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로토콜 버전을 확인하지 못했습니다. Test Runner와 호스트가 호환되는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로토콜을 협상하지 못했습니다. {0}초 후 응답 시간이 초과될 때까지 기다리는 중입니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {1}을(를) 설정하여 시간 제한을 늘리세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 69aa943da7..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[매개 변수는 null이거나 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[정보: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수는 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수는 음수일 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수는 {0} 형식이어야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수에 {0} 속성이 있습니다. 이 속성은 빈 문자열일 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수에 {0} 속성이 있습니다. 이 속성은 음수일 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수에 {0} 속성이 있습니다. 이 속성은 null일 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 인수에 {0} 속성이 있습니다. 이 속성은 {1} 형식이어야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 큐에서 작업을 처리하는 동안 처리되지 않은 예외가 발생했습니다. {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[‘{0}’ 호스트를 찾을 수 없습니다. ‘{0}’이(가) 컴퓨터에 설치되어 있고 PATH 환경 변수에서 사용할 수 있는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 큐가 이미 삭제되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[일시 중지된 동안에는 {0} 큐를 삭제할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로세스 이름을 가져오는 동안 오류가 발생했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4ea1ba95ea..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로세스 ID가 {0}인 기본 테스트 호스트에 디버거를 연결할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector 디버깅을 사용하도록 설정했습니다. datacollector 프로세스를 계속하려면 디버거를 연결하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[어댑터 조회가 변경됩니다. 자세한 내용은 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap을 참조하세요.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Discoverer를 인스턴스화하는 중 예외가 발생했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[동일한 URI '{0}'을(를) 가진 테스트 어댑터가 여러 개 있습니다. '{1}' 어댑터를 무시합니다. 이 경고가 발생하지 않게 하려면 충돌하는 어댑터를 제거하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 중복되는 '{0}' 소스를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 Discoverer '{0}'에서 테스트를 로드하는 동안 예외가 발생했습니다. 예외: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' Executor를 호출하는 동안 예외가 발생했습니다. {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프레임워크 {0}에 대해 ExecutionThreadApartmentState 옵션이 지원되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost를 시작하지 못했습니다(오류: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 파일을 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[호스트 디버깅을 사용하도록 설정했습니다. testhost 프로세스를 계속하려면 디버거를 연결하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Discoverer에 DefaultExecutorUri 특성이 없으므로 테스트 Discoverer {0}에 해당하는 테스트 Executor를 무시합니다. 테스트 어댑터 추가 기능을 다시 설치해야 할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[클라이언트 프록시를 초기화하지 못했습니다. 테스트 프로세스에 연결할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[디버그가 아닌 실행의 컨텍스트에서는 이 작업을 수행할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[큐에서 제거하기 위해 사용할 수 있는 프록시를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}을(를) 찾을 수 없습니다. 컴퓨터에 dotnet이 설치되어 있는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI가 '{0}'인 테스트 Executor를 찾을 수 없습니다. 테스트 Executor가 설치되어 있고 .NET 런타임 버전 {1}을(를) 지원하는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID가 {0}인 프록시가 현재 세션 관리자에서 관리되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1}에 지정된 테스트 사례 필터 `{0}`과(와) 일치하는 테스트가 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 '{0}' 소스가 올바르지 않습니다. 위의 오류/경고를 해결한 후 다시 시도하세요. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[확장을 찾을 수 없음: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이전 버전의 Microsoft.NET.Test.Sdk를 사용하고 있습니다. 15.3.0 이상 버전으로 이동하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID가 {0}인 프록시를 이미 사용할 수 있으며 큐에 다시 넣을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 검색이 취소되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}에서 테스트를 사용할 수 없습니다. 테스트 Discoverer 및 Executor가 등록되고 플랫폼 및 프레임워크 버전 설정이 적절한지 확인하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 파일에 TestHost Diagnostics 로깅 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[필터에 잘못된 속성({0})이 하나 이상 포함되어 있으므로 해당 필터와 일치하는 테스트가 없습니다. 유효한 속성({1})을 포함하는 필터 식을 지정하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 91c61eb350..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[호스트 프로세스가 예기치 않게 종료되어 활성 테스트 실행이 중단되었습니다. 사용 가능한 경우 예외가 발생한 위치에 대한 자세한 정보를 보려면 위의 호출 스택을 검사하세요.]D;]A;크래시가 발생했을 때 실행 중이었던 테스트: ]D;]A;{0}]D;]A;이 테스트는 크래시의 원인이거나 원인이 아닐 수 있습니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정된 blame 매개 변수 키 {0}이(가) 잘못되었습니다. 이 키를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[blame 매개 변수 키 {0}은(는) {1}/{2} 값만 지원할 수 있습니다. 이 키를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[덤프 수집이 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[덤프 {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이 프로세스 트리 덤핑(아래쪽에서)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 비활성 시간({0}{1})이 경과되었습니다. Testhost 및 해당 자식 프로세스에서 중단 덤프를 수집하는 중]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[분]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[모든 테스트 실행이 완료되었지만, 시퀀스 파일이 생성되지 않습니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[All tests finished running, Sequence file will not be generated.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[프로세스 덤프를 시작할 수 없음: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[필요한 환경 변수 PROCDUMP_PATH가 null이거나 비어 있습니다. 적절한 procdump 실행 파일이 포함된 폴더의 경로에 PROCDUMP_PATH를 설정하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump가 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[초]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[예기치 않은 값 '{0}'이(가) 시간 제한으로 제공되었습니다. 1.5h/90m/5400s/5400000ms/5400000 형식으로 값을 제공하세요.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e44a4c92b9..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML 테스트 결과 파일: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML 로거 오류: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[LogFileName 및 LogFilePrefix 매개 변수는 함께 제공할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 21532cf816..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[매개 변수는 0보다 작을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[매개 변수는 null이거나 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1} 디렉터리에 {0}(1),(2),..의 형식으로 새 이름을 지정할 수 없습니다. 이 디렉터리를 정리하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1}에서 타임스탬프 형식 '{2}'을(를) 사용하는 {0}의 사용 가능한 파일 이름을 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[배포 항목 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[배포 항목 '{0}'(출력 디렉터리 '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 설정이 지정되지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 설정에 실행 배포 디렉터리가 정의되어 있지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[결과가 테스트 실행과 연결되어 있지 않습니다. 진행 중이거나 완료된 테스트 실행에서 가져온 결과를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 파일/디렉터리 이름 '{0}'이(가) 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}의 파일에 연결하지 못했습니다.]D;]A;오류 정보: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행에서 ‘{0}’ 테스트를 건너뛰었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[LogFileName 및 LogFilePrefix 매개 변수는 함께 사용할 수 없습니다. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[로드된 모든 결과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[목록에 없는 결과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[중단됨]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[완료됨]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[연결 끊김]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실패]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[진행 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[결과 불충분]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행되지 않음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행할 수 없음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과(실행이 중단됨)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[보류 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[시간 초과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[결과 파일: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고: 결과 파일을 덮어쓰는 중: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index f285a1f8a7..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[매개 변수는 null이거나 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행에서 다른 프레임워크 및 플랫폼 버전용으로 빌드된 DLL을 감지했습니다. 다음 DLL은 현재 설정({0} 프레임워크 및 {1} 플랫폼)과 일치하지 않습니다.{2}이 설정을 관리하는 방법에 대한 자세한 내용을 보려면 {3}(으)로 이동하세요.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 설정 파일이 필요한 형식에 맞지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 테스트 컨테이너 중에 테스트 실행을 위한 플랫폼 아키텍처 및 .NET Framework 설정과 일치하는 것이 없습니다. 플랫폼: {0}, .NET Framework: {1}. 이러한 설정의 관리에 대한 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=330428을 참조하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}은(는) 프레임워크 {1} 및 플랫폼 {2}을(를) 대상으로 빌드됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 1f99ba81b0..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName이 불완전함]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[메서드 인자 수는 숫자여야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 메서드를 '{1}' 형식에서 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 형식을 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName의 끝 다음에 예기치 않은 문자가 있습니다(pos: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName에서 공백은 유효하지 않습니다(pos: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9a6cb69c70..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[매개 변수는 null이거나 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 파일이 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[개체는 {0} 형식이어야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[중단됨]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[완료됨]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[연결 끊김]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실패]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[진행 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[결과 불충분]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행되지 않음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행할 수 없음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과(실행이 중단됨)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[보류 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[시간 초과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 형식에 대해 TypeConverter를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 노드를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 스트림에서 읽을 수 없습니다. 스트림에서 읽기를 지원하지 않으면 스트림의 데이터를 보낼 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 파일 이름 '{0}'에 다음과 같은 잘못된 문자가 들어 있습니다. '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 파일 이름 '{0}'이(가) 예약되어 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 속성은 이미 '{2}'(으)로 등록되었으므로 '{1}' 값 형식으로 등록할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[msdia 세션 COM HResult '{0}'을(를) 만들지 못했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[msdia 로드 실패]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 설정 '{0}'의 URI가 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행 설정의 루트 노드 이름은 'RunSettings'여야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 설정이 잘못되었습니다. 예기치 않은 XmlAttribute '{1}'이(가) 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 설정이 잘못되었습니다. 예기치 않은 XmlElement '{1}'이(가) 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' 설정의 '{0}' URI가 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 설정이 잘못되었습니다. 필요한 '{0}' 특성이 없습니다. 일반적인 데이터 수집기 설정은 <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">와 같습니다. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 설정이 잘못되었습니다. friendlyName, URI 및 assemblyQualifiedName 중 하나 이상의 XmlAttribute가 필요합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[특정 테스트 실행에 대해 TestCaseFilter를 지정할 수 없습니다. FilterCriteria는 소스와 실행하기 위한 용도로만 사용됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[알림 빈도는 양수 값이어야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[알림 시간 제한은 0보다 커야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[솔루션 디렉터리 '{0}'이(가) 없습니다. runsettings에 지정된 솔루션 디렉터리가 존재하는지와 디렉터리에 대한 읽기 권한이 있는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[필터 문자열 '{0}'에 인식할 수 없는 이스케이프 시퀀스가 포함되어 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[열 번호]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Executor URI]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[파일 경로]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[줄 번호]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[이름]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[소스]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[특성]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  메시지: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실패]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[없음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[건너뜀]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[컴퓨터 이름]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult 표시 이름]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[기간]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[종료 시간]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류 열 번호]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류 메시지]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류 스택 추적]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[결과]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[시작 시간]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  테스트 메시지:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[속성 '{1}'의 테스트 속성 형식 '{0}'이(가) 지원되지 않습니다. 지원되는 속성 형식(기본 형식, URI, 문자열, string[]5D;) 중 하나를 사용하고 다시 시도하세요. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 453e942626..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[동일한 확장의 여러 버전을 찾았습니다. 가장 높은 버전을 선택합니다.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' 아키텍처에 대한 '{0}' 호스트를 찾을 수 없습니다..]D;]A;]D;]A;'{1}' .NET을 사용하여 문제를 해결할 수 있습니다.]D;]A;]D;]A;지정된 프레임워크는 다음에서 찾을 수 있습니다.]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}을(를) 찾을 수 없습니다. 테스트 프로젝트를 게시하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}을(를) 찾을 수 없습니다. 테스트 프로젝트에 "Microsoft.NET.Test.Sdk" 패키지의 nuget 참조가 포함되어 있는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 6492081309..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행 설정 XML에 "RunSettings" 노드가 포함되어 있지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' 노드를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' 노드를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[대상 플랫폼 설정 '{0}'이(가) 시스템 아키텍처 '{1}'과(와) 호환되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[예기치 않은 설정 파일을 지정했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9b1d309a7b..0000000000
--- a/Localize/lcl/ko/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 세션 시작 작업이 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 세션 중지 작업이 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 실행 첨부 파일 처리가 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 검색이 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[활성 테스트 실행이 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console 프로세스에서 메시지를 받지 못했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 파일이 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console 프로세스가 비정상적으로 종료되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3e9e52701d..0000000000
--- a/Localize/lcl/ko/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[runsettings에 이미 존재하는 LegacySettings 노드가 제거됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings에 포함된 testSettings이 없으며 마이그레이션되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[마이그레이션된 RunSettings 파일은 {0}에 생성되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[시간 제한 노드의 agentNotRespondingTimeout, deploymentTimeout, scriptTimeout 특성은 지원되지 않으므로 마이그레이션되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[유효한 사용법:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ko/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ko/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 424dc78792..0000000000
--- a/Localize/lcl/ko/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ko-KR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[추가 정보 메시지:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows 스토어 앱에 대한 단위 테스트의 테스트 실행을 시작할 수 없습니다. {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 테스트 컨테이너에 테스트가 없습니다. 또한 Microsoft Windows 스토어 단위 테스트 어댑터에서 .appxbundle 파일을 지원하지 않습니다. 앱 패키지를 만들 때는 appx를 생성([앱 번들 생성]5D; 옵션을 [사용 안 함]5D;으로 설정)하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 중인 어셈블리를 찾을 수 없습니다. 프로젝트가 빌드되었는지 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[첨부 파일:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 테스트 검색 추가 기능을 사용할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 테스트 실행 추가 기능을 사용할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 테스트 로거 추가 기능을 사용할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 설정 공급자 추가 기능을 사용할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/BatchSize 인수에는 일괄 처리 크기가 필요합니다. 예: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame에 대한 CollectDump 옵션에 의한 크래시 덤프 수집은 이 플랫폼에서 지원되지 않습니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame에 대한 TestTimeout이 있는 CollectDump 옵션에 의한 중단 덤프 수집은 이 플랫폼에서 지원되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[blame으로 지정된 blame 매개 변수 {0}이(가) 잘못되었습니다. 이 매개 변수를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      임시 출력을 포함하는 디렉터리입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[BuildBasePath를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 인수:]D;]A;      명령줄을 통해 runsettings 구성을 전달하기 위한 인수입니다. 인수는 "--" 뒤에 [name]5D;=[value]5D; 형식의 이름-값 쌍으로 지정할 수 있습니다. -- 뒤의 공백에 주의하세요. ]D;]A;      여러 [name]5D;=[value]5D;를 구분하려면 공백을 사용합니다.]D;]A;      RunSettings 인수 지원에 대한 자세한 정보: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[null이거나 비워 둘 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      테스트 실행을 위해 데이터 수집기를 사용하도록 설정합니다. 자세한 내용은 https://aka.ms/vstest-collect를 참조하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:testsettings를 사용하여 테스트 실행을 구성하는 경우 "{0}"은(는) 지원되지 않습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[정보: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경고: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      디버그/릴리스를 위해 프로젝트가 빌드되는 구성입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. All rights reserved.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[데이터 수집기 이름 '{0}'이(가) 잘못되었습니다. 데이터 수집기가 무시됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[일]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[디버그 추적 메시지:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[포트에서 DesignModeClient에 대한 요청을 연결하거나 처리하는 작업에 대한 시간 제한: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     예: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows 스토어 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[진단 데이터 어댑터 설정을 읽는 중에 실행 중인 '{0}'이(가) throw되었습니다. 이 실행에서 모든 진단 데이터 어댑터를 건너뜁니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows 스토어 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정한 소스에 대한 검색이 실패했습니다. 예외: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" 매개 변수는 한 번만 제공해야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      원인 모드에서 테스트를 실행합니다. 이 옵션은 테스트 호스트 크래시를 유발하는 문제 있는 테스트를 격리하는 데 유용합니다.]D;]A;      이 경우 현재 디렉터리에 "Sequence.xml"라는 출력 파일을 만들며,]D;]A;      이 파일에는 크래시 이전 테스트 실행 순서가 캡처되어 있습니다.]D;]A;      필요에 따라 테스트 호스트에 대한 프로세스 덤프를 수집하도록 선택할 수 있습니다.]D;]A;      덤프를 수집하도록 선택하는 경우 기본적으로 크래시에 대한 미니 덤프가 수집됩니다.]D;]A;      다음과 같은 몇 가지 선택적 매개 변수로 이 기본 동작을 재정의하도록 선택할 수도 있습니다.]D;]A;      CollectAlways - 크래시가 없는 경우에도 종료 시 덤프를 수집함(true/false) ]D;]A;      DumpType - 덤프 유형을 지정함(mini/full).]D;]A;      예: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      테스트 실행에 대해 데이터 수집기 'CodeCoverage'를 사용하도록 설정합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      테스트 플랫폼의 로그를 사용하도록 설정합니다.]D;]A;      로그는 제공된 파일에 기록됩니다.]D;]A;]D;]A;      아래 표시된 대로 로그의 추적 수준을 변경합니다.]D;]A;      예: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      허용되는 추적 수준 값: off, error, warning, info 및 verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      테스트 결과의 로거를 지정합니다. 예를 들어 ]D;]A;      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=<Defaults to unique file name>]5D;를 사용합니다.]D;]A;      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.]D;]A;]D;]A;      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.]D;]A;      예: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.]D;]A;]D;]A;      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.]D;]A;      예: /logger:console;prefix=<Defaults to "false">]D;]A;      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      테스트 결과의 로거를 지정합니다. 예를 들어 ]D;]A;      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=<Defaults to unique file name>]5D;를 사용합니다.]D;]A;      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.]D;]A;]D;]A;      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.]D;]A;      예: /logger:console;verbosity=<Defaults to "normal">]D;]A;      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.]D;]A;]D;]A;      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.]D;]A;      예: /logger:console;prefix=<Defaults to "false">]D;]A;      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      환경 변수의 값을 설정합니다. 변수가 없는 경우 변수를 만들고, 변수가 있으면 재정의합니다. 이는 /InIsolation 전환을 의미하며 격리된 프로세스에서 테스트를 강제로 실행합니다.]D;]A;      ]D;]A;      이 인수를 여러 번 지정하여 여러 변수를 제공할 수 있습니다.]D;]A;]D;]A;      예: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[환경 변수 '{0}'이(가) 이미 정의되어 있지만 -Environment 인수로 재정의되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[오류 메시지:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  테스트를 실행하려면:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  데이터 수집기와 같은 추가 설정을 사용하여 테스트를 실행하려면:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 확장을 인스턴스화할 때 예외가 발생했습니다. {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ 총 시간: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실패]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}'을(를) 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35가 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 테스트가 CLR 4.0 "호환 모드"에서 실행됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      테스트 실행에 사용할 대상 .NET Framework 버전입니다. ]D;]A;      유효한 값은 ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" 등입니다.]D;]A;      기타 지원되는 값은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Framework 인수에는 테스트 실행의 대상 .NET Framework 버전이 필요합니다. 예: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      이 사용법 메시지를 표시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[인수:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설명: 지정한 파일에서 테스트를 실행합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[옵션:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[사용법: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[시간]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation 플래그는 사용되지 않습니다. 테스트는 항상 별도의 프로세스에서 실행됩니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      격리 모드에서 테스트를 실행합니다. 이렇게 하면 테스트에서 오류가 발생해도 ]D;]A;      vstest.console.exe가 중지될 가능성이 작아지지만 테스트 실행 속도가 ]D;]A;      느려질 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 인수가 잘못되었습니다. /help 옵션을 사용하여 유효한 인수 목록을 확인하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[일괄 처리 크기 {0}이(가) 잘못되었습니다. 일괄 처리 크기는 0보다 커야 합니다. 예: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame 인수 '{0}'이(가) 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정된 구성이 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag 인수 '{0}'이(가) 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag 파일 경로 '{0}'이(가) 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['EnableCodeCoverage' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /EnableCodeCoverage) 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[.NET Framework 버전 {0}이(가) 잘못되었습니다. TargetFramework의 전체 이름을 지정하세요(예: .NETCoreApp,Version=v2.0). 지원되는 다른 .NET Framework 버전은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['InIsolation' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /InIsolation) 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Logger 인수 '{0}'이(가) 잘못되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['Parallel' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /Parallel) 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId 인수에는 정수인 프로세스 ID가 필요합니다. 이 프로세스를 시작한 부모 프로세스의 프로세스 ID를 지정하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 플랫폼 형식이 잘못되었습니다. 올바른 플랫폼 형식은 {1}입니다.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port 인수에는 정수인 포트 번호가 필요합니다. 소켓 연결 및 이벤트 메시지 수신에 사용할 포트를 지정하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['ResultsDirectory'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 인수는 /Tests로 지정할 수 없습니다. 테스트가 지정된 경우 테스트 사례 필터링은 적용할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행 매개 변수 인수 '{0}'이(가) 잘못되었습니다. 아래 형식을 사용하세요.]D;]A;     형식: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['UseVsixExtensions' 명령에는 {0} 인수가 필요하지 않습니다. vstest.console.exe myTests.dll /UseVsixExtensions:true와 같이 vsix 확장을 사용할지 건너뛸지를 나타내는 명령을 지정하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      설치된 테스트 Discoverer를 나열합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      설치된 테스트 Executor를 나열합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      설치된 테스트 로거를 나열합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      설치된 테스트 설정 공급자를 나열합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[다음 테스트를 사용할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      지정된 테스트 컨테이너에서 검색된 모든 테스트를 나열합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공한 {0} 파일은 읽기 전용입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 하나 이상의 runsettings에 잘못된 토큰이 포함되어 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[분]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 소스 파일을 지정하지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath'에 지정된 경로 '{0}'에 테스트 어댑터가 포함되지 않습니다. 올바른 경로를 제공하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" 매개 변수를 인식할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[인수를 지정하지 않았습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows 스토어 앱에 대한 단위 테스트를 실행하려면 Windows 스토어 앱 단위 테스트 라이브러리 프로젝트를 사용하여 앱 패키지를 만드세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[총 {0}개의 테스트가 검색되었지만 지정된 선택 기준({1})과 일치하는 테스트가 없습니다. 올바른 값을 사용하여 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}에서 테스트를 사용할 수 없습니다. 설치된 테스트 Discoverer와 Executor, 플랫폼 및 프레임워크 버전 설정이 적절한지 확인한 후에 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}은(는) {1}/{2}에 대해 빌드됩니다. 실행 중에 지정된 테스트 어셈블리는 공통 대상 .NET Framework와 플랫폼을 사용해야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[없음]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행되지 않음]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지시 파일 '{0}'을(를) 여는 중 오류가 발생했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      실행할 이진 파일을 포함하는 디렉터리입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[출력 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      테스트가 병렬로 실행되도록 지정합니다. 기본적으로]D;]A;      컴퓨터에서 사용 가능한 모든 코어를 사용할 수 있습니다.]D;]A;      사용할 코어 수는 설정 파일을 사용하여 구성할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      현재 프로세스를 시작해야 하는 부모 프로세스의 프로세스 ID입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[통과]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone 앱 {0}에 대한 테스트를 위해 테스트 실행을 시작할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows Phone 앱에 대한 단위 테스트를 실행하려면 Windows Phone 앱 단위 테스트 앱 프로젝트를 사용하여 앱 패키지를 만드세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      테스트를 실행하는 데 사용할 대상 플랫폼 아키텍처입니다. ]D;]A;      유효한 값은 x86, x64 및 ARM입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Platform 인수에는 테스트 실행의 대상 플랫폼 형식을 제공해야 합니다. 예: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Port>]D;]A;      소켓 연결 및 이벤트 메시지 수신용 포트입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행 중]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 경로가 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      추가 옵션에 대한 지시 파일을 읽습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      테스트 결과 디렉터리가 지정된 경로에 생성됩니다(없는 경우).]D;]A;      예: /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ResultsDirectory 매개 변수에는 테스트 결과가 저장되어야 하는 값이 필요합니다. 예:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      테스트를 실행할 때 사용할 설정입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[설정 파일 '{0}'을(를) 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Settings 매개 변수에는 설정 파일을 제공해야 합니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행을 위해 하나의 app 패키지(.appx file)만 지정할 수 있습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      제공된 값과 일치하는 이름으로 테스트를 실행합니다. 여러 값을 제공하려면 ]D;]A;      쉼표로 구분합니다.]D;]A;      예: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      지정된 파일 또는 와일드카드 패턴에서 테스트를 실행합니다. 여러 테스트 파일 이름 또는 패턴을]D;]A;      공백으로 구분합니다. 일치한 테스트 파일을 보려면 콘솔 로거 세부 정보 표시를 [상세]5D;로 설정합니다.]D;]A;      예: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[실행 설정을 통해 구성된 코드 검사 및 Microsoft Fakes 이외의 데이터 수집기는 포함된 테스트 설정으로는 지원되지 않습니다. 자세한 내용은 https://aka.ms/vstest-configure-datacollector를 참조하세요. 실행 설정: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[초]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[건너뜀]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[총 {0}개의 테스트가 검색되었지만 일부 테스트는 지정된 선택 기준({1})과 일치하지 않습니다. 올바른 값을 사용하여 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Tests 인수에는 하나 이상의 특정 테스트 이름 또는 해당 하위 문자열이 필요합니다.]D;]A;       예: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[스택 추적:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 검색을 시작하는 중입니다. 잠시 기다려 주세요...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행을 시작하는 중입니다. 잠시 기다려 주세요...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[표준 오류 메시지:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[표준 출력 메시지:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[또한 테스트 어댑터의 경로는 /TestAdapterPath 명령을 사용하여 지정할 수 있습니다. 예: /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        지원되는 파일 형식:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[격리 모드를 사용하여 Windows 스토어 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[유효 플랫폼 {0} 및 .NET Framework {1} 설정에서 테스트 실행에 요구하는 대로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[격리 모드를 사용하여 Windows Phone 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[진단 데이터 어댑터가 runsettings에서 사용하도록 설정되었으므로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공한 사용자 지정 테스트 어댑터 검색 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행 시]D;]A;      지정된 경로(있는 경우)에서 사용자 지정 테스트 어댑터를 사용합니다. ]D;]A;      예:  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestAdapterPath 매개 변수에는 사용자 지정 테스트 어댑터가 포함된 위치의 일부인 값이 필요합니다. 예: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      지정된 식과 일치하는 테스트를 실행합니다.]D;]A;      <Expression>은 <property>연산자<value>[|&<Expression>]5D;]D;]A;         형식이며, 여기서 연산자는 =, !=, ~ 중 하나입니다(~ 연산자는 '포함' 의미 체계를]D;]A;         사용하며 DisplayName 같은 문자열 속성에 적용됩니다).]D;]A;         괄호 ()를 사용하여 하위 식을 그룹화할 수 있습니다.]D;]A;      예: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 인수에는 필터 값이 필요합니다.]D;]A;        필터 값은 <property>=<value> 형식이 될 수 있습니다.]D;]A;        예: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행이 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행이 {0} 오류로 인해 중단되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행이 취소되었습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트 실행이 실패했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[테스트를 실행했습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - 실패: {1}, 통과: {2}, 건너뜀: {3}, 전체: {4}, 기간: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     실패: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[총 테스트 수: 알 수 없음]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     통과: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    건너뜀: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[총 테스트 수: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 프레임워크를 사용하여 테스트를 실행합니다. 이 경고가 표시되지 않게 하려면 /Framework:{1}을(를) 지정하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[제공된 테스트 소스 파일 "{0}"을(를) 찾을 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[지정된 패턴과 일치한 총 테스트 파일 수는 {0}개입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[경과 시간:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        기본 Executor URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions는 더 이상 사용되지 않습니다. 대신 /TestAdapterPath를 사용하세요.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행에서 설치된 VSIX 확장(있는 경우)을 ]D;]A;      사용하거나 건너뛸 수 있습니다. ]D;]A;      예:  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions 매개 변수에는 값이 필요합니다. 'true'인 경우 테스트 실행에서 설치된 VSIX 확장(있는 경우)이 사용됩니다. false인 경우에는 확장이 무시됩니다.   예:  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[파일에 Vstest Diagnostics 로깅 중: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0319a1a39a..0000000000
--- a/Localize/lcl/pl/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas zbierania końcowych wpisów z dziennika zdarzeń „{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Element DataCollector dziennika zdarzeń nie znalazł elementu eventLogContext dla elementu DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dziennik zdarzeń „{0}” napotkał wyjątek, niektóre zdarzenia mogły zostać utracone. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dziennik zdarzeń „{0}” mógł zostać wyczyszczony podczas zbierania; niektóre zdarzenia mogły nie zostać zebrane]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odczytać dziennika zdarzeń „{0}” z komputera „{1}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 79b22ec39c..0000000000
--- a/Localize/lcl/pl/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dane pokrycia kodu są niedostępne. Pokrycie kodu jest obecnie obsługiwane wyłącznie w systemie Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można utworzyć katalogu: {0}. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie udało się zainicjować modułu zbierającego dane pokrycia kodu. Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie odebrano bieżącego zdarzenia z pliku CodeCoverage.exe. Sprawdź dziennik zdarzeń, aby poznać przyczynę niepowodzenia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie udało się odebrać bieżącego zdarzenia z programu CodeCoverage.exe w ciągu {0} sek. Przyczyną może być wolne działanie maszyny. Aby zwiększyć limit czasu, ustaw zmienną środowiskową {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć pliku CodeCoverage.exe w lokalizacji {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 92805ec3c4..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wartość ManagedName jest niekompletna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowa sekwencja ucieczki (segment: {0}, pozycja: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Liczba argumentów metody musi być liczbą]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono metody „{0}” w typie „{1}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Oczekiwano zamykającego cudzysłowu pojedynczego na końcu segmentu. (segment: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono typu „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieoczekiwane znaki po zakończeniu wartości ManagedName (pozycja: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Biały znak jest niedozwolony w wartości ManagedName (pozycja: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Element „{0}.{1}” nie jest zaimplementowany na tej platformie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0e21e953b0..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kompilacja zakończona.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kompilacja została rozpoczęta, czekaj...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pomijanie uruchamiania testu dla projektu {0}. Aby uruchomić testy za pomocą polecenia dotnet test, dodaj właściwość „<IsTestProject>true</IsTestProject>” do pliku projektu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testu dla: {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ostrzeżenie: zaktualizuj odwołanie do pakietu Microsoft.NET.Test.Sdk do wersji 15.8.0 lub nowszej w celu zbierania danych dotyczących pokrycia kodu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b7aa674c4f..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można wykonać przebiegu testu, ponieważ stan początkowy jest nieprawidłowy.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono odpowiedniego dostawcy testowego środowiska uruchomieniowego dla tego uruchomienia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przerywanie przebiegu testu: przekroczono limit czasu dla przebiegu testu równy {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Oczekiwanie na operację zakończenia nie jest dozwolone, gdy nie ma aktywnego przebiegu testu. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 5b9486b188..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu. Więcej informacji można znaleźć w komunikacie o błędzie:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anulowanie operacji zgodnie z żądaniem.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zbieranie danych: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostarczenie informacji o inicjowaniu przez moduł zbierający dane „{0}” nie powiodło się. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Moduł zbierający dane „{0}” zgłosił wyjątek w trakcie ładowania, konstruowania lub inicjowania typu: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Komunikat modułu zbierającego dane „{0}”: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć modułu zbierającego dane „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Moduł zbierający dane „{0}” zażądał ustawienia zmiennej środowiskowej „{1}” o wartości „{2}” w środowisku wykonywania testu, ale inny moduł zbierający dane „{3}” już zażądał ustawienia tej zmiennej środowiskowej na wartość „{4}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zduplikowany identyfikator URI rozszerzenia testu „{0}”. Zduplikowane rozszerzenie zostanie zignorowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zduplikowany dostawca ustawień o nazwie „{0}”. Zduplikowany dostawca zostanie zignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Znaleziono zduplikowaną sekcję parametrów uruchomieniowych o nazwie „{0}”. Zduplikowane ustawienia zostaną zignorowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: puste nawiasy ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć listy zainstalowanych rozszerzeń testów jednostkowych. Przyczyna: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można załadować rozszerzeń z pliku „{0}”. Aby uzyskać więcej informacji, użyj opcji /diag.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił błąd podczas tworzenia szybkiego filtru.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Istnieje wiele konfiguracji, które zawierają przyjazną nazwę modułu zbierającego dane „{0}”. Zduplikowane konfiguracje będą ignorowane w przebiegu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wewnętrzny wyjątek:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: nieprawidłowy warunek „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozszerzenie testu ma nieprawidłowy identyfikator URI „{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: nieprawidłowy operator „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas inicjowania rejestratora o identyfikatorze {0}: „{1}”. Rejestrator nie będzie używany. Wyjątek: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć rejestratora testów z atrybutem AssemblyQualifiedName, identyfikatorem URI lub przyjazną nazwą „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: brak znaku „)”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: brak znaku „(”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: brak argumentu operacji]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Brak operatora „|” lub „&”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Moduł zbierający dane przechwycił wyjątek typu „{0}”: „{1}”. Więcej szczegółów: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry uruchomieniowe zostały już załadowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił błąd podczas ładowania parametrów uruchomieniowych. Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określono nieprawidłowy węzeł ustawień. Właściwość name węzła ustawień nie może być pusta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił błąd podczas inicjowania dostawcy ustawień o nazwie „{0}”. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono dostawcy ustawień o nazwie „{0}”. Nie można załadować ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ślad stosu:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niepoprawny format elementu TestCaseFilter {0}. Określ poprawny format i spróbuj ponownie. Należy pamiętać, że niepoprawny format może spowodować, że żadne testy nie zostaną wykonane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć elementu datacollector o przyjaznej nazwie „{0}”.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ta opcja działa wyłącznie z elementem vstest.console.exe zainstalowanym jako część programu Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typy pochodzące od kontekstu kolekcji danych nie mogą być używane do wysyłania danych i komunikatów. Element DataCollectionContext służący do wysyłania danych i komunikatów musi pochodzić z jednego ze zdarzeń wywołanych dla modułu zbierającego dane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index bee64a266d..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywny proces wykrywania testu został przerwany. Przyczyna: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywny przebieg testu został przerwany. Przyczyna: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można dołączyć debugera do domyślnego hosta testowego.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zamknięcie istniejącego połączenia zostało wymuszone przez host zdalny.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces {0} nie mógł połączyć się z procesem {1} w ciągu {2} sekund. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {3}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpiła awaria procesu hosta testu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można nawiązać komunikacji z procesem hosta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Otrzymano nieoczekiwany komunikat. Oczekiwany typ komunikatu: {0}, otrzymany typ komunikatu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sprawdzanie wersji protokołu nie powiodło się. Upewnij się, że moduł uruchamiający testy i host są zgodne.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Negocjowanie protokołu nie powiodło się, po upływie {0} sekund został przekroczony limit czasu oczekiwania na odpowiedź. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3a9bdb2332..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nie może mieć wartości null ani być pusty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informacje: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ostrzeżenie: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument nie może być pusty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument nie może być ujemny.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument musi być następującego typu: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument ma następującą właściwość, która nie może być pustym ciągiem: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument ma następującą właściwość, która nie może być ujemna: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument ma następującą właściwość, która nie może mieć wartości null: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określony argument ma następującą właściwość: {0}. Ta właściwość musi być następującego typu: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił nieobsługiwany wyjątek podczas przetwarzania zadania z kolejki „{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć hosta „{0}”. Upewnij się, że element „{0}” jest zainstalowany na maszynie i jest dostępny w zmiennej środowiskowej PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kolejka {0} została już usunięta.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można usunąć kolejki {0} podczas wstrzymania.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd podczas pobierania nazwy procesu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 679846ca4a..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można dołączyć debugera do domyślnego hosta testowego z identyfikatorem procesu: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Debugowanie modułu zbierającego dane zostało włączone. Dołącz debuger do procesu datacollector, aby kontynuować.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wyszukiwanie adaptera jest zmieniane. Aby uzyskać więcej szczegółów, przejdź do strony https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas tworzenia wystąpienia wykrywacza: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Znaleziono wiele adapterów testowych z takim samym identyfikatorem URI „{0}”. Adapter „{1}” zostanie zignorowany. Aby uniknąć tego ostrzeżenia, odinstaluj adaptery powodujące konflikt.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określone zduplikowane źródło „{0}” zostanie zignorowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas ładowania testów przez wykrywacz testów „{0}”. Wyjątek: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas wywoływania modułu wykonywania „{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opcja ExecutionThreadApartmentState nie jest obsługiwana dla platformy: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można uruchomić hosta testów. Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć pliku {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Debugowanie hosta zostało włączone. Dołącz debuger do procesu testhost, aby kontynuować.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Moduł wykonywania testów odpowiadający wykrywaczowi testów {0} zostanie zignorowany, ponieważ wykrywacz nie ma atrybutu DefaultExecutorUri. Konieczna może być ponowna instalacja dodatku adaptera testowego.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zainicjowanie serwera proxy klienta nie powiodło się: nie można nawiązać połączenia z procesem testowania.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ta operacja jest niedozwolona w kontekście uruchamiania bez debugowania.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można było znaleźć dostępnego serwera proxy do umieszczenia w kolejce dwukierunkowej.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono elementu {0}. Upewnij się, że program dotnet jest zainstalowany na maszynie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć modułu wykonywania testów o identyfikatorze URI „{0}”. Upewnij się, że moduł wykonywania testów został zainstalowany i obsługuje środowisko uruchomieniowe platformy .NET w wersji {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serwer proxy o identyfikatorze {0} nie jest zarządzany przez bieżącego menedżera sesji.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Żaden test nie jest zgodny z podanym filtrem przypadku testowego „{0}” w elemencie {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wszystkie określone źródła „{0}” są nieprawidłowe. Napraw powyższe błędy/ostrzeżenia i spróbuj ponownie. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć rozszerzeń: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używamy starszej wersji zestawu Microsoft.NET.Test.Sdk. Przejdź na wersję 15.3.0 lub nowszą.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Serwer proxy o identyfikatorze {0} jest już dostępny i nie można go ponownie umieścić w kolejce.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Odnajdywanie testów zostało anulowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[W elemencie {0} nie są dostępne żadne testy. Upewnij się, że wykrywacze i moduły wykonywania testów są zarejestrowane oraz że ustawienia wersji platformy i struktury są odpowiednie, a następnie spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rejestrowanie diagnostyki TestHost w pliku: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Brak testów zgodnych z filtrem, ponieważ zawiera on co najmniej jedną nieprawidłową właściwość ({0}). Określ wyrażenie filtru zawierające prawidłowe właściwości ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 15ba083e99..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywny przebieg testu został przerwany, ponieważ proces hosta nieoczekiwanie zakończył działanie. Sprawdź powyższy stos wywołań, jeśli jest dostępny, aby uzyskać więcej informacji na temat miejsca, z którego pochodzi wyjątek.]D;]A;Test uruchomiony w momencie wystąpienia awarii: ]D;]A;{0}]D;]A;Ten test może, ale nie musi być źródłem awarii.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podany klucz parametru blame {0} nie jest prawidłowy. Ten klucz jest ignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Klucz parametru blame {0} może obsługiwać tylko wartości {1}/{2}. Ten klucz jest ignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zbieranie zrzutów zostało włączone, ale nie wygenerowano żadnego pliku zrzutu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tworzenie zrzutu: {0} — {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tworzenie zrzutu tego drzewa procesów (od dołu)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upłynął czas nieaktywności {0} {1}. Zbieranie zrzutów podczas zawieszenia z procesu testhost i jego procesów podrzędnych]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[min]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wszystkie testy zakończyły działanie, plik sekwencji nie zostanie wygenerowany]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można rozpocząć zrzutu procesu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wymagana zmienna środowiskowa PROCDUMP_PATH miała wartość null lub była pusta. Ustaw zmienną PROCDUMP_PATH na ścieżkę lub folder zawierające odpowiedni plik wykonywalny procdump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opcja CollectDump została włączona, ale nie wygenerowano pliku zrzutu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[s]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podano nieoczekiwaną wartość „{0}” jako limit czasu. Podaj wartość w następującym formacie: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c5f656a862..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik wyników testu HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd rejestratora HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry LogFileName i LogFilePrefix nie mogą być podawane razem. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 744cf625e8..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nie może być mniejszy niż 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nie może mieć wartości null ani być pusty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można pobrać wolnej nazwy dla elementu {0}(1),(2)... w katalogu {1}. Wyczyść ten katalog.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć dostępnej nazwy pliku dla elementu {0} przy użyciu formatu sygnatury czasowej „{2}” o {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[element wdrożenia „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[element wdrożenia „{0}” (katalog wyjściowy „{1}”)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ustawienia testu nie są określone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ustawienia aktywnego testu nie definiują katalogu uruchamiania wdrożenia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wynik nie został skojarzony z przebiegiem testu. Użyj wyniku uzyskanego z przebiegu testu, który jest w toku lub który został zakończony.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nazwa określonego pliku/katalogu „{0}” jest nieprawidłowa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można dołączyć plików z katalogu: {0}]D;]A;Szczegóły błędu: {1}: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test „{0}” został pominięty w przebiegu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametry LogFileName i LogFilePrefix nie mogą być używane razem. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wszystkie załadowane wyniki]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wyniki, których nie ma na liście]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przerwano]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zakończono]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozłączono]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niepowodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[W toku]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niejednoznaczny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niewykonany]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niemożliwy do uruchomienia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie (uruchomienie zostało przerwane)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Oczekiwanie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Limit czasu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ostrzeżenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik wynikowy: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[OSTRZEŻENIE: Plik wynikowy jest zastępowany: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index e6ab8553ef..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nie może mieć wartości null ani być pusty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testowy wykrył biblioteki DLL utworzone dla innych wersji struktury i platformy. Następujące biblioteki DLL są niezgodne z bieżącymi ustawieniami (określającymi strukturę {0} i platformę {1}).{2}Aby uzyskać więcej informacji o zarządzaniu tymi ustawieniami, przejdź do: {3}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podany plik ustawień nie jest zgodny z wymaganym formatem.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Żaden z dostarczonych kontenerów testów nie odpowiada architekturze platformy i ustawieniom programu .NET Framework dotyczącym przebiegu testu. Platforma: {0}. Program .NET Framework: {1}. Aby uzyskać więcej informacji na temat zarządzania tymi ustawieniami, przejdź do strony http://go.microsoft.com/fwlink/?LinkID=330428.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Element {0} został skompilowany dla struktury {1} i platformy {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index f3e5a357b3..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wartość ManagedName jest niekompletna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Liczba argumentów metody musi być liczbą]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono metody „{0}” w typie „{1}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono typu „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieoczekiwane znaki po zakończeniu wartości ManagedName (pozycja: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Biały znak jest niedozwolony w wartości ManagedName (pozycja: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 2320b0cddf..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr nie może mieć wartości null ani być pusty.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik {0} nie istnieje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Obiekt musi być typu {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przerwano]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zakończono]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozłączono]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niepowodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[W toku]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niejednoznaczny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niewykonany]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niemożliwy do uruchomienia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie (uruchomienie zostało przerwane)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Oczekiwanie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Limit czasu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ostrzeżenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć elementu TypeConverter dla typu {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć węzła „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można przeprowadzić odczytu z podanego strumienia. Nie można wysłać danych ze strumienia, jeśli strumień nie obsługuje odczytu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podana nazwa pliku „{0}” zawiera następujące nieprawidłowe znaki: „{1}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podana nazwa pliku „{0}” została zarezerwowana.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można zarejestrować właściwości „{0}” jako typu wartości „{1}”, ponieważ została już ona zarejestrowana jako „{2}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można utworzyć modelu COM sesji msdia, wartość HResult: „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można załadować elementu msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowy identyfikator URI w ustawieniach modułu zbierającego dane „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Węzeł główny ustawień uruchamiania musi mieć nazwę „RunSettings”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienia „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlAttribute: „{1}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlElement: „{1}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowy identyfikator URI „{0}” w ustawieniach „{1}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienia modułów zbierających dane. Brak oczekiwanego atrybutu „{0}”.  Typowe ustawienia modułu zbierającego dane typowe mają postać <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienia „{0}”. Oczekiwany jest co najmniej jeden atrybut XmlAttribute wraz z przyjazną nazwą, identyfikatorem URI oraz kwalifikowaną nazwą zestawu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można określić elementu TestCaseFilter dla określonego przebiegu testów. Element FilterCriteria jest przeznaczony tylko dla przebiegu ze źródłami.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Częstotliwość powiadomień musi być wartością dodatnią.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Limit czasu powiadomienia musi mieć wartość większą niż zero.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Katalog „{0}” rozwiązania nie istnieje. Upewnij się, że katalog rozwiązania podany w pliku runsettings istnieje, a Ty masz uprawnienia odczytu wobec katalogu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ciąg filtra „{0}” obejmuje nierozpoznaną sekwencję ucieczki.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numer kolumny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Identyfikator URI modułu wykonywania]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka do pliku]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[W pełni kwalifikowana nazwa]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Identyfikator]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numer wiersza]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nazwa]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Źródło]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cechy]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Komunikat: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Ślad stosu:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niepowodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Brak]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie znaleziono]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pominięto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nazwa komputera]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nazwa wyświetlana wyniku testu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Czas trwania]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Czas zakończenia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Numer kolumny błędu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Komunikat o błędzie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ślad stosu błędów]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wynik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Czas rozpoczęcia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Komunikaty testowe:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Typ „{0}” właściwości testu „{1}” nie jest obsługiwany. Użyj jednego z obsługiwanych typów właściwości (typy pierwotne, identyfikator URI, ciąg, ciąg[]5D;) i spróbuj ponownie. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9336f8df1d..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Znaleziono wiele wersji tego samego rozszerzenia. Wybierana jest najwyższa wersja.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć hosta „{0}” dla architektury „{1}”.]D;]A;]D;]A;Problem można rozwiązać, instalując program .NET „{1}”.]D;]A;]D;]A;Określoną strukturę można znaleźć pod adresem:]D;]A; — https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć elementu {0}. Opublikuj swój projekt testowy i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można znaleźć elementu {0}. Upewnij się, że projekt testowy ma odwołanie nuget do pakietu „Microsoft.NET.Test.Sdk”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0dc66293e4..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik XML parametrów uruchomieniowych nie zawiera węzła „RunSettings”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowe ustawienie „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć węzła „RunSettings”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć węzła „RunSettings”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił błąd podczas ładowania ustawień. Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niezgodne ustawienia platformy docelowej „{0}” z architekturą systemu „{1}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Określono nieoczekiwany plik ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0ed175dd54..0000000000
--- a/Localize/lcl/pl/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operacja uruchamiania sesji testowania została przerwana.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Operacja zatrzymywania sesji testowania została przerwana.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywne przetwarzanie załączników przebiegu testu zostało przerwane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywny proces wykrywania testów został przerwany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aktywny przebieg testów został przerwany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odebrać komunikatu z procesu vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik {0} nie istnieje]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proces vstest.console zakończył się nieprawidłowo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a6e7127bf1..0000000000
--- a/Localize/lcl/pl/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wszelkie węzły LegacySettings już istniejące w pliku runsettings zostaną usunięte.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Plik RunSettings nie zawiera osadzonego elementu testSettings, migracja nie jest wykonywana.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zmigrowany plik RunSettings został utworzony w: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Atrybuty agentNotRespondingTimeout, deploymentTimeout i scriptTimeout węzła Timeouts nie są obsługiwane, więc nie zostaną zmigrowane.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Prawidłowe użycie:]D;]A;SettingsMigrator.exe <pełna ścieżka do pliku testsettings lub runsettings do zmigrowania>]D;]A;SettingsMigrator.exe <pełna ścieżka do pliku testsettings lub runsettings do zmigrowania> <pełna ścieżka do pliku runsettings do utworzenia>]D;]A;Przykłady:]D;]A;SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings]D;]A;SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings]D;]A;SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings]D;]A;SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pl/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pl/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b3c976b5b3..0000000000
--- a/Localize/lcl/pl/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pl-PL" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodatkowe komunikaty informacyjne:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można rozpocząć przebiegu testu dla testów jednostkowych aplikacji ze Sklepu Windows: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie odnaleziono żadnych testów w określonych kontenerach testów. Ponadto adapter testów jednostkowych Sklepu Windows firmy Microsoft nie obsługuje plików appxbundle. Utwórz plik appx (ustaw opcję generowania zbioru aplikacji na wartość Nigdy) podczas tworzenia pakietu aplikacji, a następnie spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć testowanego zestawu. Upewnij się, że projekt został skompilowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Załączniki:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostępne są następujące dodatki służące do wykrywania testów:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostępne są następujące dodatki służące do wykonywania testów:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostępne są następujące dodatki rejestratora testów:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostępne są następujące dodatki dostawców ustawień:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /BatchSize wymaga podania wielkości partii. Przykład: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zbieranie zrzutów awaryjnych przez opcję CollectDump programu Blame nie jest obsługiwane w przypadku tej platformy.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zbieranie zrzutów po zawieszeniu przez opcję CollectDump z opcją TestTimeout programu Blame nie jest obsługiwane w przypadku tej platformy.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr blame określony z argumentem blame, {0} jest nieprawidłowy. Ten parametr jest ignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<podstawowa ścieżka do kompilacji>]D;]A;      Katalog zawierający tymczasowe dane wyjściowe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć parametru BuildBasePath. Podaj prawidłową ścieżkę i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumenty RunSettings:]D;]A;      Argumenty do przekazania konfiguracji runsettings za pośrednictwem wiersza polecenia. Argumenty mogą być określone jako para nazwa-wartość formularza [nazwa]5D;=[wartość]5D; po „-- ”. Pamiętaj o spacji po --. ]D;]A;      Oddziel wiele par [nazwa]5D;=[wartość]5D; za pomocą spacji.]D;]A;      Więcej informacji na temat obsługi argumentów RunSettings: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie może mieć wartości null ani być pusty]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<przyjazna nazwa modułu zbierającego dane>]D;]A;      Włącza moduł zbierający dane dla przebiegu testu. Więcej informacji: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect: element „{0}” nie jest obsługiwany, jeśli przebieg testu został skonfigurowany za pomocą pliku testsettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informacje: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ostrzeżenie: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<konfiguracja>]D;]A;      Konfiguracja, na potrzeby której kompilowany jest projekt, na przykład Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Wszelkie prawa zastrzeżone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przyjazna nazwa modułu zbierającego dane „{0}” jest nieprawidłowa. Moduł zbierający dane będzie ignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dni]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Komunikaty śledzenia debugowania:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przekroczono limit czasu żądania nawiązywania połączenia lub przetwarzania dla elementu DesignModeClient na porcie: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Przykład: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pokrycie kodu nie jest dostępne dla aplikacji ze Sklepu Windows. Pominięto analizę pokrycia kodu dla tego przebiegu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pokrycie kodu nie jest dostępne dla aplikacji systemu Windows Phone. Pominięto analizę pokrycia kodu dla tego przebiegu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podczas odczytywania ustawień adaptera danych diagnostycznych został zgłoszony uruchomiony element „{0}”. Wszystkie adaptery danych diagnostycznych zostaną pominięte podczas tego uruchomienia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji ze Sklepu Windows. Usuń ustawienia adapterów danych diagnostycznych z ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Usuń ustawienia adapterów danych diagnostycznych z ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wykrywanie nie powiodło się dla podanych źródeł. Wyjątek: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr „{0}” należy podać tylko raz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Uruchamia test w trybie Blame. Ta opcja jest pomocna w odizolowaniu problematycznego testu powodującego awarię hosta testów.]D;]A;      Tworzy w bieżącym katalogu plik wyjściowy „Sequence.xml”,]D;]A;      który przechwytuje kolejność wykonywania testu przed awarią.]D;]A;      Opcjonalnie możesz zebrać zrzut procesu dla hosta testów.]D;]A;      Gdy zdecydujesz się na zebranie zrzutu, domyślnie w momencie awarii zostanie zebrany minizrzut.]D;]A;      Możesz także przesłonić to zachowanie domyślne opcjonalnymi parametrami:]D;]A;      CollectAlways — zrzut jest zbierany przy wychodzeniu, nawet jeśli nie ma awarii (true/false) ]D;]A;      DumpType — określa typ zrzutu (mini/full).]D;]A;      Przykład: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Włącza moduł zbierający dane „CodeCoverage” dla przebiegu testu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<ścieżka do pliku dziennika>]D;]A;      Włącz dzienniki dla platformy testowej.]D;]A;      Dzienniki są zapisywanie w podanym pliku.]D;]A;]D;]A;      Zmień poziom śledzenia dla dzienników, jak pokazano poniżej]D;]A;      Przykład: /Diag:<ścieżka do pliku dziennika>;tracelevel=<wartość domyślna to „verbose”>]D;]A;      Dozwolone wartości dla elementu tracelevel: off, error, warning, info i verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<identyfikator URI/przyjazna nazwa rejestratora>]D;]A;      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu ]D;]A;      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=<wartość domyślna to unikatowa nazwa pliku>]5D;]D;]A;      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.]D;]A;]D;]A;      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej]D;]A;      Przykład: /logger:console;verbosity=<wartość domyślna to „minimal”> ]D;]A;      Dozwolone wartości szczegółowości: quiet, minimal i normal.]D;]A;]D;]A;      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej]D;]A;      Przykład: /logger:console;prefix=<wartość domyślna to „false”>]D;]A;      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<identyfikator URI/przyjazna nazwa rejestratora>]D;]A;      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu ]D;]A;      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=<wartość domyślna to unikatowa nazwa pliku>]5D;]D;]A;      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.]D;]A;]D;]A;      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej]D;]A;      Przykład: /logger:console;verbosity=<wartość domyślna to „normal”> ]D;]A;      Dozwolone wartości szczegółowości: quiet, minimal i normal.]D;]A;]D;]A;      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej]D;]A;      Przykład: /logger:console;prefix=<wartość domyślna to „false”>]D;]A;      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Ustawia wartość zmiennej środowiskowej. Jeśli zmienna nie istnieje, tworzy ją, a w przeciwnym wypadku przesłania ją. Powoduje to określenie przełącznika /InIsolation i wymuszenie uruchomienia testów w procesie izolowanym.]D;]A;      ]D;]A;      Ten argument może być określany wielokrotnie w celu dostarczenia wielu zmiennych.]D;]A;]D;]A;      Przykład: -e:ZMIENNA1=WARTOŚĆ1]D;]A;               -e:INNA_ZMIENNA="WARTOŚĆ ZE SPACJAMI"]D;]A;               -e:INNA_ZMIENNA="WARTOŚCI;oddzielone;średnikami"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zmienna środowiskowa „{0}” została już zdefiniowana, ale została przysłonięta przez argument by-Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Komunikat o błędzie:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Aby uruchomić testy:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Aby uruchomić testy z użyciem ustawień dodatkowych, takich jak moduły zbierające dane:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wystąpił wyjątek podczas tworzenia wystąpienia rozszerzenia „{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Łączny czas: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Identyfikator URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Niepowodzenie]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć elementu „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Program Framework35 nie jest obsługiwany. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 testy zostaną uruchomione w aparacie CLR 4.0 w trybie zgodności.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<wersja struktury>]D;]A;      Docelowa wersja programu .NET Framework, która zostanie użyta na potrzeby wykonania testu. ]D;]A;      Prawidłowe wartości to ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" itp.]D;]A;      Inne obsługiwane wartości to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Framework wymaga docelowej wersji programu .NET Framework na potrzeby przebiegu testu. Przykład: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Wyświetla ten komunikat dotyczący sposobu użycia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumenty:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opis: uruchamia testy z określonych plików.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opcje:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sposób użycia: vstest.console.exe [argumenty]5D; [opcje]5D; [[--]5D; <argumenty RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Godziny]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Flaga /InIsolation jest przestarzała. Testy zawsze są uruchamiane w oddzielnym procesie]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Uruchamia testy w procesie izolowanym. Dzięki temu mniej prawdopodobne jest ]D;]A;      zatrzymanie procesu vstest.console.exe po wystąpieniu błędu w testach, ale ]D;]A;      testy mogą działać wolniej.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} jest nieprawidłowy. Użyj opcji /help, aby sprawdzić listę prawidłowych argumentów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rozmiar partii {0} jest nieprawidłowy. Rozmiar partii powinien być większy niż zero. Przykład: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument Blame „{0}” jest nieprawidłowy.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podana konfiguracja jest nieprawidłowa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument Diag „{0}” jest nieprawidłowy.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka pliku Diag „{0}” jest nieprawidłowa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} nie jest oczekiwany w poleceniu „EnableCodeCoverage”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /EnableCodeCoverage) i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowa wersja programu .NET Framework: {0}. Podaj pełną nazwę struktury docelowej (np. .NETCoreApp,Version=v2.0). Inne obsługiwane wersje programu .NET Framework to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} nie jest oczekiwany w poleceniu „InIsolation”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /InIsolation) i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument Logger „{0}” jest nieprawidłowy.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} nie jest oczekiwany w poleceniu „Parallel”. Określ polecenie bez tego argumentu (przykład: vstest.console.exe mojeTesty.dll /Parallel), a następnie spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument --ParentProcessId|/ParentProcessId wymaga identyfikatora procesu będącego liczbą całkowitą. Określ identyfikator procesu nadrzędnego, który uruchomił ten proces.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nieprawidłowy typ platformy: {0}. Prawidłowe typy platform to {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument --Port|/Port wymaga numeru portu będącego liczbą całkowitą. Określ port na potrzeby połączenia z gniazdem i odbierania komunikatów zdarzeń.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka „{0}” określona w parametrze „ResultsDirectory” jest nieprawidłowa. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka „{0}” określona w parametrze „TestAdapterPath” jest nieprawidłowa. Błąd: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można określać argumentu /TestCaseFilter z argumentem /Tests. Filtrowanie przypadków testowych nie jest stosowane, gdy testy zostały określone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument parametru przebiegu testu „{0}” jest nieprawidłowy. Użyj poniższego formatu.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument {0} nie jest oczekiwany w poleceniu „UseVsixExtensions”. Określ polecenie wskazujące, czy rozszerzenia vsix mają zostać użyte, czy pominięte (przykład: vstest.console.exe mojeTesty.dll /UseVsixExtensions:true), a następnie spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Wyświetla listę zainstalowanych wykrywaczy testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Wyświetla listę zainstalowanych modułów wykonywania testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Wyświetla listę zainstalowanych rejestratorów testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Wyświetla listę zainstalowanych dostawców ustawień testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dostępne są następujące testy:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<nazwa pliku>]D;]A;      Wyświetla listę wszystkich wykrytych testów z danego kontenera testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podany plik {0} jest tylko do odczytu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Przyjazna nazwa: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć rejestratora testów z identyfikatorem URI lub przyjazną nazwą „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Identyfikator URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Co najmniej jedne z podanych ustawień uruchamiania zawierają nieprawidłowy token]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Narzędzie wiersza polecenia firmy Microsoft (R) służące do wykonania testów (wersja {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minuty]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie określono żadnych plików źródłowych testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka „{0}” określona w parametrze „TestAdapterPath” nie zawiera żadnych adapterów testowych. Podaj prawidłową ścieżkę i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nierozpoznany parametr „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie określono żadnych argumentów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji ze Sklepu Windows, utwórz pakiet aplikacji za pomocą projektu biblioteki testów jednostkowych aplikacji ze Sklepu Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wykryto łącznie następującą liczbę testów: {0}. Żaden z nich nie jest zgodny z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Brak dostępnych testów w elemencie {0}. Upewnij się, że ustawienia zainstalowanych wykrywaczy testów, modułów wykonywania, platform i wersji struktur są odpowiednie, i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Element {0} jest kompilowany dla elementu {1}/{2}. Zestawy testowe określone w ramach uruchomienia powinny mieć wspólny docelowy program .NET Framework i wspólną docelową platformę.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Brak]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie uruchomiono]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Błąd podczas otwierania pliku odpowiedzi „{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<dane wyjściowe>]D;]A;      Katalog zawierający pliki binarne do uruchomienia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć ścieżki wyjściowej. Podaj prawidłową ścieżkę i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Określa, że testy będą wykonywane równolegle. Domyślnie mogą zostać użyte]D;]A;      wszystkie dostępne rdzenie maszyny.]D;]A;      Liczbę rdzeni do użycia można skonfigurować za pomocą pliku ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<identyfikator procesu nadrzędnego>]D;]A;      Identyfikator procesu nadrzędnego odpowiedzialnego za uruchomienie bieżącego procesu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Powodzenie]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można rozpocząć przebiegu testu dla testów dla aplikacji Windows Phone: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji systemu Windows Phone, utwórz projekt aplikacji testów jednostkowych systemu Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<typ platformy>]D;]A;      Docelowa architektura platformy, która zostanie użyta do wykonania testu. ]D;]A;      Prawidłowe wartości to x86, x64 i ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Platform wymaga podania typu platformy docelowej dla przebiegu testu. Przykład: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<port>]D;]A;      Port służący do połączenia z gniazdem i odbierania komunikatów zdarzeń.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uruchomienie testu w toku]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ścieżka {0} nie istnieje.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      Przeczytaj zawartość pliku odpowiedzi w celu uzyskania dodatkowych opcji.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Jeśli katalog wyników nie istnieje, zostanie utworzony w określonej ścieżce.]D;]A;      Przykład /ResultsDirectory:<ŚcieżkaDoKataloguWyników>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /ResultsDirectory wymaga wartości określającej miejsce zapisania wyników testu. Przykład: /ResultsDirectory:c:\KatalogWynikówTestu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<plik ustawień>]D;]A;      Ustawienia, które mają być używane podczas uruchamiania testów.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie można odnaleźć pliku ustawień „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /Settings wymaga podania pliku ustawień.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Na potrzeby uruchamiania testów można określić tylko jeden pakiet aplikacji (plik appx).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<nazwy testów>]D;]A;      Uruchom testy z nazwami, które są zgodne z podanymi wartościami. Aby]D;]A;      podać wiele wartości, oddziel je przecinkami.]D;]A;      Przykłady: /Tests:MetodaTestowa1]D;]A;                /Tests:MetodaTestowa1,MetodaTestowa2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Uruchom testy z określonych plików lub wzorca symbolu wieloznacznego. Rozdziel wiele nazw lub wzorców plików testowych]D;]A;      spacjami. Ustaw szczegółowość rejestratora konsoli na Szczegółowy, aby wyświetlić dopasowane pliki testowe.]D;]A;      Przykłady: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Moduły zbierające dane inne niż Pokrycie kodu i Microsoft Fakes skonfigurowane za pośrednictwem ustawień uruchamiania nie są obsługiwane przez osadzone ustawienia testów. Zobacz https://aka.ms/vstest-configure-datacollector w celu uzyskania dalszych informacji. Ustawienia uruchamiania: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sekundy]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Nazwa ustawienia: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pominięto]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Wykryto łącznie następującą liczbę testów: {0}. Niektóre z nich nie są zgodne z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /Tests wymaga co najmniej jednej określonej nazwy testu lub jej podciągu.]D;]A;       Przykłady: /Tests:MetodaTestowa1, /Tests:MetodaTestowa1,metoda2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ślad stosu:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Trwa rozpoczynanie wykrywania testu, czekaj...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Trwa rozpoczynanie wykonywania testu, czekaj...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standardowe komunikaty o błędach:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standardowe komunikaty wyjściowe:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodatkowo ścieżkę do adapterów testów można określić za pomocą polecenia /TestAdapterPath. Przykład: /TestAdapterPath:<ścieżka_do_adapterów_niestandardowych>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Obsługiwane typy plików:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używanie trybu izolacji do uruchomienia testów jednostkowych dla aplikacji ze Sklepu Windows. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używanie trybu izolacji do uruchomienia testów w sposób wymagany przez obowiązujące ustawienia platformy ({0}) i programu .NET Framework ({1}) dla przebiegu testu. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używanie trybu izolacji do uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używanie trybu izolacji do uruchomienia testów jako adapterów danych diagnostycznych zostało włączone w pliku runsettings. Użyj parametru /inIsolation, aby pominąć to ostrzeżenie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie odnaleziono podanej ścieżki wyszukiwania niestandardowego adaptera testowego. Podaj prawidłową ścieżkę i spróbuj ponownie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath | / TestAdapterPath]D;]A;      Powoduje to, że proces vstest.console.exe używa niestandardowych adapterów]D;]A;      testowych z podanej ścieżki (jeśli istnieje) w ramach przebiegu testu. ]D;]A;      Przykład: /TestAdapterPath:<ścieżka do adapterów niestandardowych>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /TestAdapterPath wymaga wartości, którą jest ścieżką do lokalizacji zawierającej niestandardowe adaptery testowe. Przykład: /TestAdapterPath:c:\MojeAdapteryNiestandardowe]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<wyrażenie>]D;]A;      Uruchamia testy, które są zgodne z danym wyrażeniem.]D;]A;      Element <wyrażenie> jest w formacie <właściwość>Operator<wartość>[|&<wyrażenie>]5D;]D;]A;         gdzie Operator to =, != lub ~  (operator ~ ma semantykę „zawiera”]D;]A;         i jest stosowany dla właściwości ciągów, takich jak nazwa wyświetlana).]D;]A;         Nawiasy () mogą służyć do grupowania wyrażeń podrzędnych.]D;]A;      Przykłady: /TestCaseFilter:"Priority=1"]D;]A;                 /TestCaseFilter:"(FullyQualifiedName~Nocne]D;]A;                                  |Name=MojaMetodaTestowa)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argument /TestCaseFilter wymaga wartości filtru.]D;]A;        Wartość filtru może być typu <property>=<value> .]D;]A;        Przykłady: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testu został przerwany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testowy został przerwany z powodu błędu {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testu został anulowany.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testu nie powiódł się.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Przebieg testu zakończony powodzeniem.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} — niepowodzenie: {1}, powodzenie: {2}, pominięto: {3}, łącznie: {4}, czas trwania: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Zakończone niepowodzeniem: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Łączna liczba testów: nieznana]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Zakończone pomyślnie: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Pominięte: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Łączna liczba testów: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Używanie platformy {0} do uruchamiania testów. Określ parametr /Framework:{1}, aby pominąć to ostrzeżenie.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nie odnaleziono podanego pliku źródłowego testu „{0}”.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Łączna liczba plików testowych dopasowanych do określonego wzorca: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Czas, który upłynął:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Domyślny identyfikator URI modułu wykonywania: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Polecenie /UseVsixExtensions jest wycofywane. Użyj zamiast niego polecenia /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Powoduje to, że proces vstest.console.exe używa lub pomija zainstalowane ]D;]A;      rozszerzenia VSIX (jeśli istnieją) w przebiegu testu.]D;]A;      Przykład: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametr /UseVsixExtensions wymaga podania wartości. Jeśli wartość to „true”, zainstalowane rozszerzenia VSIX (jeśli istnieją) zostaną użyte w ramach przebiegu testu. Jeśli wartość to „false”, rozszerzenia zostaną zignorowane. Przykład: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rejestrowanie diagnostyki Vstest w pliku: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0f9f31c901..0000000000
--- a/Localize/lcl/pt-BR/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção ao coletar entradas finais do log de eventos '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O DataCollector de Log de Eventos não encontrou o eventLogContext para DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O log de eventos '{0}' encontrou uma exceção, alguns eventos podem ser perdidos. Erro: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O log de evento '{0}' pode ter sido limpo durante a coleção; alguns eventos podem não ter sido coletados]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível ler o log de eventos '{0}' do computador '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9e6ad3c88f..0000000000
--- a/Localize/lcl/pt-BR/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum dado de cobertura do código disponível. A cobertura do código é suportada atualmente apenas no Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao criar o diretório: {0} com erro:{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao inicializar o datacollector de cobertura do código com o erro: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Evento de execução não recebido de CodeCoverage.exe. Verifique os logs de eventos para ver o motivo da falha.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao receber o evento de execução de CodeCoverage.exe em {0} segundo(s). Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {1} para aumentar o tempo limite.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível encontrar CodeCoverage.exe em {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 60f1051def..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O ManagedName está incompleto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A aridade do método deve ser numérica]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Método '{0}' não encontrado no tipo '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo '{0}' não encontrado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caracteres inesperados após o final de ManagedName (posição: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O espaço em branco não é válido em um ManagedName (posição: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' não está implementado nesta plataforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c7e2f4d59a..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Build concluído.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Build iniciada, aguarde...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorando a execução de teste do projeto {0}. Para executar testes com dotnet test, adicione a propriedade "<IsTestProject>true</IsTestProject>" ao arquivo de projeto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de teste para {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aviso: Atualize a referência do pacote Microsoft.NET.Test.Sdk para a versão 15.8.0 ou posterior para coletar a cobertura do código.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 71f8f3833f..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A execução de teste não pôde ser realizada porque o estado inicial era inválido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum provedor de runtime de teste encontrado para esta execução.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anulando a execução de teste: o tempo limite da execução de teste de {0} milissegundos foi excedido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A operação esperar conclusão não é permitida quando não há nenhuma execução de teste ativa. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 70d80c4ace..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação. Para obter mais informações, verifique a mensagem de erro:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Cancelando a operação conforme solicitado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Coleção de dados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O coletor de dados '{0}' falhou ao fornecer informações de inicialização. Erro: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O coletor de dados '{0}' lançou uma exceção durante a inicialização, construção ou carregamento de tipo: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Coletor de dados '{0}' mensagem: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível encontrar o coletor de dados '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O coletor de dados '{0}' solicitou a variável de ambiente '{1}' com valor '{2}' para ser definida no ambiente de execução de teste, mas outro coletor de dados '{3}' já solicitou a mesma variável de ambiente com um valor diferente '{4}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI da extensão do teste '{0}' duplicada. Ignorando a extensão duplicada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Provedor de configurações denominado '{0}' duplicado. Ignorando o provedor duplicado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Foi encontrada uma seção de configurações de execução denominada '{0}' duplicada. Ignorando as configurações duplicadas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: parênteses vazios ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao encontrar a lista de extensões de teste de unidade. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao carregar as extensões do arquivo '{0}'. Use /diag para obter mais informações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu um erro ao criar o filtro Rápido.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Existem várias configurações que têm o FriendlyName do coletor de dados como '{0}'. Configurações duplicadas serão ignoradas na execução de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Exceção interna:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: condição inválida '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A Extensão do Teste tem um URI inválido '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: operador inválido '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção durante a inicialização do agente com {0}: ‘{1}’. O agente não será usado. Exceção: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar um agente de teste com o AssemblyQualifiedName, o URI ou o FriendlyName '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: ')' ausente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: '(' ausente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: operando ausente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Faltando operador '|' ou '&']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O coletor de dados capturou uma exceção do tipo '{0}': '{1}'. Mais detalhes: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[As Configurações de Execução já foram carregadas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu um erro ao carregar as configurações de execução. Erro: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nó de configurações inválido especificado. A propriedade de nome do nó de configurações não deve estar vazia.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu um erro ao inicializar o provedor de configurações denominado '{0}'. Erro: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O Provedor de Configurações denominado '{0}' não foi encontrado. Não é possível carregar as configurações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rastreamento de pilha:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Formato incorreto para TestCaseFilter {0}. Especifique o formato correto e tente novamente. Observe que o formato incorreto pode fazer com que nenhum teste seja executado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível localizar um datacollector com o nome amigável '{0}'.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Essa opção funciona somente com vstest.console.exe instalado como parte do Visual Studio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipos derivados de DataCollectionContext não podem ser usados para enviar dados e mensagens. Os DataCollectionContext usado para enviar dados e mensagens devem vir de um dos eventos adicionados ao coletor de dados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a07e9affa7..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A descoberta de teste ativa foi anulada. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A execução de teste ativa foi anulada. Motivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível anexar o depurador ao host de teste padrão.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uma conexão existente foi fechada à força pelo host remoto.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O processo {0} falha ao se conectar ao processo {1} após {2} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {3} para aumentar o tempo limite.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha no processo do host de teste]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível se comunicar com o processo de host de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagem inesperada recebida. MessageType esperada: {0} MessageType real: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha na verificação da versão do protocolo. Verifique se o executor de testes e o host são compatíveis.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao negociar o protocolo, aguardando pelo tempo limite de resposta após {0} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {1} para aumentar o tempo limite.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3ff6c71ef4..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro não pode ser nulo ou estar vazio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informações: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aviso: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado não pode estar vazio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado não pode ser negativo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado deve ter o seguinte tipo: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado tem a seguinte propriedade, que não pode ser uma cadeia de caracteres vazia: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado tem a seguinte propriedade, que não pode ser negativa: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado tem a seguinte propriedade, que não pode ser nula: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento especificado tem a seguinte propriedade: {0}. Esta propriedade deve ter o seguinte tipo: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção sem tratamento ao processar um trabalho da fila '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível encontrar o host '{0}'. Verifique se o '{0}' está instalado no computador e está disponível na variável de ambiente PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A fila {0} já foi descartada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A fila {0} não pode ser descartada enquanto está em pausa.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro ao obter o nome do processo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 5344f176f8..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível anexar o depurador ao host de teste padrão com a ID de processo: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A depuração do DataCollector está habilitada. Anexe o depurador ao processo datacollector para continuar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A pesquisa do adaptador está sendo alterada, siga https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obter mais detalhes.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção ao criar uma instância do discoverer: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Foram encontrados vários adaptadores de teste com o mesmo URI '{0}'. Ignorando o adaptador '{1}'. Desinstale os adaptadores conflitantes para evitar este aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorando a fonte duplicada especificada '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção enquanto o discoverer de testes '{0}' estava carregando testes. Exceção: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção ao chamar o executor '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A opção ExecutionThreadApartmentState não tem suporte para a estrutura: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao iniciar o host de teste com o erro: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar o arquivo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O host de depuração está habilitado. Anexe o depurador ao processo de testhost para continuar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorando o executor de teste correspondente ao discoverer de teste {0} porque o discoverer não tem o atributo DefaultExecutorUri. Talvez seja necessário instalar novamente o suplemento do adaptador de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao inicializar o proxy do cliente: não foi possível se conectar ao processo de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Esta operação não é permitida no contexto de uma execução sem depuração.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível encontrar um proxy disponível para deque.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar {0}. Certifique-se de que o dotnet esteja instalado no computador.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar o executor de teste com o URI '{0}'. Verifique se o executor de teste está instalado e oferece suporte à versão de runtime do .net {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O proxy com a ID {0} não é gerenciado pelo gerenciador de sessão atual.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum teste corresponde ao filtro de testcase `{0}` determinado no {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhuma das fontes especificadas '{0}' é válida. Corrija os erros/avisos acima e tente novamente. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível encontrar as extensões: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Você está usando uma versão mais antiga do Microsoft.NET.Test.Sdk. Mude para uma versão igual ou maior que 15.3.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O proxy com a ID {0} já está disponível e não pode ser enfileirado novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Descoberta de testes cancelada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não há nenhum teste disponível em {0}. Verifique se o detector e os executores de teste estão registrados e se as configurações de versão da estrutura da plataforma & são apropriadas e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registro em log do diagnóstico TestHost no arquivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum teste correspondeu ao filtro porque ele contém uma ou mais propriedades que não são válidas ({0}). Especifique a expressão de filtro contendo as propriedades válidas ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 1ad4bd65f9..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A Execução de Teste ativa foi anulada porque o processo do host foi encerrado inesperadamente. Inspecione a pilha de chamadas acima, caso ela esteja disponível, para obter mais informações sobre a origem da exceção.]D;]A;O teste em execução quando a falha ocorreu: ]D;]A;{0}]D;]A;Esse teste pode ser a origem da falha ou não.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A chave de parâmetro de blame especificada {0} é inválida. Ignorando esta chave.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A chave de parâmetro de blame {0} oferece suporte apenas aos valores {1}/{2}. Ignorando esta chave.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A coleta de despejo estava habilitada, mas não foi gerado nenhum arquivo de despejo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Despejando {0} – {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Despejando esta árvore de processos (da parte inferior)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O tempo de inatividade especificado de {0} {1} foi decorrido. Coletando os despejos do travamento do testhost e dos processos filho]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[minutos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A execução de todos os testes foi concluída. O arquivo de sequência não será gerado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível iniciar o processo de despejo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A variável de ambiente obrigatória PROCDUMP_PATH era nula ou estava vazia. Defina PROCDUMP_PATH para o caminho da pasta que contém o executável procdump apropriado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump foi habilitado, mas o arquivo de despejo não foi gerado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[segundos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Valor inesperado '{0}' fornecido como tempo limite. Forneça um valor neste formato: 1.5h/90m/5400s/5400000ms/5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ac06f9a565..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arquivo de resultados de teste HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro do Agente de HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os parâmetros LogFileName e LogFilePrefix não podem ser usados juntos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index dd5fa46a3c..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro não pode ser menor que 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro não pode ser nulo ou estar vazio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível obter o nome livre para {0}(1),(2),... no diretório {1}. Limpe esse diretório.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível localizar um nome de arquivo disponível para {0} usando o formato de carimbo de data/hora '{2}' em {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[item de implantação '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[item de implantação '{0}' (diretório de saída '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[As Configurações de Teste não estão especificadas.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[As Configurações de Teste ativas não definem o Diretório de Implantação de Execução.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O resultado não está associado a uma execução de teste. Use um resultado obtido de uma execução de teste em andamento ou concluída.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O nome do arquivo/diretório '{0}' especificado não é válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(nulo)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao anexar arquivos de: {0}]D;]A;Detalhes do erro: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O teste '{0}' foi ignorado na execução de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os parâmetros LogFileName e LogFilePrefix não podem ser usados juntos. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Todos os resultados carregados]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Resultados que não estão em uma lista]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anulado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Concluído]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Desconectado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Com falha]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Em andamento]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Inconclusivo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não executado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não executável]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado (execução anulada)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pendente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo limite]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aviso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arquivo de resultados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AVISO: sobrescrevendo o arquivo de resultados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 347f44680f..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro não pode ser nulo ou estar vazio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A execução de teste detectou DLLs que foram criadas para diferentes versões de estrutura e de plataforma. As DLLs a seguir não correspondem às configurações atuais, que são a estrutura {0} e a plataforma {1}.{2}Acesse {3} para obter mais detalhes sobre o gerenciamento dessas configurações.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo de configurações fornecido não está em conformidade com o formato exigido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum dos contêineres de teste fornecidos corresponde às configurações da Arquitetura da Plataforma e do .Net Framework para a execução de teste. Plataforma: {0}  .Net Framework: {1}. Acesse http://go.microsoft.com/fwlink/?LinkID=330428 para obter mais detalhes sobre como gerenciar essas configurações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} é compilado para Framework {1} e Platform {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index f85074c6d1..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O ManagedName está incompleto]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A aridade do método deve ser numérica]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Método '{0}' não encontrado no tipo '{1}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo '{0}' não encontrado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caracteres inesperados após o final de ManagedName (posição: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O espaço em branco não é válido em um ManagedName (posição: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 97e3113c4b..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro não pode ser nulo ou estar vazio.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo {0} não existe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O objeto deve ser do tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anulado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Concluído]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Desconectado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Com falha]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Em andamento]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Inconclusivo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não executado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não executável]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado (execução anulada)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pendente]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo limite]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aviso]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível localizar o TypeConverter para o tipo {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar o nó '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível ler o fluxo fornecido. Não é possível enviar dados de um fluxo, a menos que o fluxo ofereça suporte para leitura.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O nome de arquivo fornecido '{0}' contém os seguintes caracteres inválidos: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O nome de arquivo fornecido '{0}' é reservado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível registrar a propriedade '{0}' com o tipo de valor '{1}' porque ela já foi registrada como '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao Criar o HResult COM de Sessão msdia '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao carregar msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI inválido nas configurações do coletor de dados '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O nó raiz das configurações de execução deve ser nomeado como 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações inválidas '{0}'. Valor inválido '{1}' especificado para '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações inválidas '{0}'. XmlAttribute inesperado: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações inválidas '{0}'. XmlElement inesperado: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI inválido '{0}' nas configurações '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações de coletores de dados inválidas. Atributo esperado '{0}' está ausente. O coletor de dados típico de configuração se pareceria com <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyqualifiedname="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações inválidas '{0}'. Era esperado pelo menos um do XmlAttribute entre friendlyName, uri e assemblyQualifiedName.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível especificar o TestCaseFilter para a execução de testes específicos. FilterCriteria é somente para execução com fontes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A frequência de notificação deve ser um valor positivo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O tempo limite de notificação deve ser maior que zero.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(nulo)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O diretório da solução '{0}' não existe. Verifique se o diretório da solução especificado em runsettings existe e se tem permissões de leitura para o diretório.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A cadeia de caracteres de filtro '{0}' inclui sequência de escape não reconhecida]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número da coluna]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI do executor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Caminho do arquivo]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número de linha]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fonte]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Características]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Mensagem: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Com falha]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome do computador]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nome de exibição de TestResult]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Duração]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hora de término]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Número da coluna com erro]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagem de erro]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rastreamento de pilha com erro]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Resultado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hora de início]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Mensagens de teste:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não há suporte para o tipo de propriedade de teste '{0}' da propriedade '{1}'. Use um dos tipos de propriedade com suporte (tipos primitivos, URI, cadeia de caracteres, string[]5D;) e tente novamente. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f18333913f..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Várias versões da mesma extensão foram encontradas. Selecionando a versão mais alta.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível '{0}' o host para a '{1}' configuração.]D;]A;]D;]A;Você pode resolver o problema instalando o '{1}' .NET.]D;]A;]D;]A;A estrutura especificada pode ser encontrada em:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar {0}. Publique o projeto de teste e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar {0}. Certifique-se de que o projeto de teste tem uma referência nuget do pacote "Microsoft.NET.Test.Sdk".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a3c11ce537..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O XML de configurações de execução não contém o nó de "RunSettings".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configuração inválida '{0}'. Valor inválido '{1}' especificado para '{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar o nó 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar o nó 'RunSettings'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu um erro ao carregar as configurações. Erro: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Configurações da plataforma de destino '{0}' incompatíveis com a arquitetura do sistema '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Arquivo de configurações inesperado especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index bda6ca33b8..0000000000
--- a/Localize/lcl/pt-BR/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A operação Iniciar a Sessão de Teste foi anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A operação Parar a Sessão de Teste foi anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O Processamento de Anexos de Execução de Teste ativo foi anulado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A Descoberta de Testes ativa foi anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A Execução de Testes ativa foi anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha ao receber mensagem do processo vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo {0} não existe]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[processo de vstest.console encerrado de forma anormal]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index aae28066a1..0000000000
--- a/Localize/lcl/pt-BR/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Qualquer nó LegacySettings já presente em runsettings será removido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O RunSettings que não contém um testSettings incorporado não migrará.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo RunSettings migrado foi criado em: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout do nó Timeouts não têm suporte, portanto, não serão migrados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uso válido:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/pt-BR/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/pt-BR/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 553f1c521a..0000000000
--- a/Localize/lcl/pt-BR/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="pt-BR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagens de informações adicionais:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível iniciar a execução de testes de unidade para o aplicativo da Windows Store: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum teste foi encontrado nos contêineres de teste especificados. Além disso, o adaptador de teste de unidade da Microsoft Windows Store não dá suporte a arquivos .appxbundle. Crie um appx (defina a opção Gerar Pacote do Aplicativo como nunca) quando criar o Pacote do Aplicativo e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não é possível localizar o assembly em teste. Verifique se o projeto foi criado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Anexos:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os seguintes Suplementos de Descoberta de Teste estão disponíveis:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os seguintes Suplementos de Execução de Teste estão disponíveis:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os seguintes Suplementos de Agente de Teste estão disponíveis:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os seguintes Suplementos de Provedores de Configurações estão disponíveis:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /BatchSize requer o tamanho do lote. Exemplo: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A coleta de despejos de memória pela opção CollectDump para Blame não tem suporte nesta plataforma.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A coleta de despejos de trava pela opção CollectDump com TestTimeout para Blame não é tem suporte para esta plataforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro blame especificado com blame, {0} é inválido. Ignorando este parâmetro.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      O diretório que contém as saídas temporárias.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O BuildBasePath não foi encontrado, forneça um caminho válido e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumentos de RunSettings:]D;]A;      Argumentos para transmitir as configurações de runsettings através da commandline. Os argumentos podem ser especificados como um par nome-valor do formulário [name]5D;=[value]5D; após "-- ". Observe o espaço após --. ]D;]A;      Use um espaço para separar vários [name]5D;=[value]5D;.]D;]A;      Mais informações sobre o suporte para os argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não pode ser nulo ou estar vazio]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Habilita o coletor de dados para a execução de teste. Mais informações aqui: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" não é compatível se a execução de teste é configurada usando configurações de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Informações: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aviso: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      A configuração para a qual o projeto foi compilado, ou seja, Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (c) Microsoft Corporation. Todos os direitos reservados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O nome amigável '{0}' do Coletor de Dados não é válido. O Coletor de Dados será ignorado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dias]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Depurar Mensagens de Rastreamento:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo limite atingido para conectar-se ou processar a solicitação para DesignModeClient na porta: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Exemplo: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A cobertura do teste não está disponível para aplicativos da Windows Store. Análise de cobertura de código ignorada nesta execução de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A cobertura do teste não está disponível para aplicativos do Windows Phone. Análise de cobertura do teste ignorada nesta execução de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A leitura das configurações do adaptador de dados de diagnóstico emitiu uma execução '{0}'. Todos os adaptadores de dados de diagnóstico serão ignorados nessa execução.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos da Windows Store. Remova as configurações de adaptadores de dados de diagnóstico das configurações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos do Windows Phone. Remova as configurações de adaptadores de dados de diagnóstico das configurações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha na descoberta para as fontes fornecidas. Exceção: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro "{0}" deve ser fornecido apenas uma vez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Executa o teste em modo blame. Essa opção é útil para isolar o teste com problema causando falha no host de teste .]D;]A;     Ele cria um arquivo de saída no diretório atual como "Sequence.xml",]D;]A;      que captura a ordem de execução do teste antes da falha.]D;]A;      Você pode optar por coletar o processo de despejo para o host de teste.]D;]A;      Ao optar por coletar despejo, por padrão, um mini despejo será coletado em uma falha.]D;]A;     Você também pode optar por sobrescrever este comportamento padrão por alguns parâmetros opcionais:]D;]A;      CollectAlways - Para coletar despejo na saída mesmo que não haja falha (true/false) ]D;]A;      DumpType - Para especificar o tipo de despejo (mini/full).]D;]A;      Exemplo: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Habilita o coletor de dados 'CodeCoverage' para a execução de teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Habilitar os logs para a plataforma de teste.]D;]A;      Os logs são gravados no arquivo fornecido.]D;]A;]D;]A;Alterar o nível de rastreamento dos logs, como mostrado abaixo]D;]A;      Exemplo: /Diag:<Path to log file>; tracelevel=<Defaults to "verbose">]D;]A;      Valores permitidos para tracelevel: off, error, warning, info e verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do ]D;]A;      Visual Studio use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Cria um arquivo no diretório TestResults com o LogFileName determinado.]D;]A;]D;]A;      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo]D;]A;      Exemplo: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.]D;]A;]D;]A;Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo]D;]A;      Exemplo: /logger:console;prefix=<Defaults to "false">]D;]A;      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do ]D;]A;      Visual Studio use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Cria um arquivo no diretório TestResults com o LogFileName determinado.]D;]A;]D;]A;      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo]D;]A;      Exemplo: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.]D;]A;]D;]A;Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo]D;]A;      Exemplo: /logger:console;prefix=<Defaults to "false">]D;]A;      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Define o valor de uma variável de ambiente. Cria a variável caso ela não exista e substitui caso exista. Isso implicará a opção /InIsolation e forçará a execução dos testes em um processo isolado.]D;]A;      ]D;]A;      Esse argumento pode ser especificado várias vezes para fornecer várias variáveis.]D;]A;]D;]A;      Exemplo: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperado com;ponto e vírgula"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A variável de ambiente '{0}' já foi definida, mas foi substituída por um argumento -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagem de erro:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Para executar testes:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Para executar testes com configurações adicionais, como coletores de dados:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ocorreu uma exceção ao criar uma instância da extensão '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo total: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Com falha]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' não encontrado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não há suporte para Framework35. Para projetos destinados ao .Net Framework 3.5, o teste será executado no "modo de compatibilidade" do CLR 4.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Versão do Framework>]D;]A;      Versão de destino do .NET Framework a ser usada para execução de teste. ]D;]A;      Os valores válidos são ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Outros valores permitidos são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /Framework requer a versão do .Net Framework de destino para a execução de teste. Exemplo: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Exibe esta mensagem de uso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Argumentos:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Descrição: executa testes dos arquivos especificados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Opções:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uso: vstest.console.exe [Argumentos]5D; [Opções]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Horas]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O sinalizador /InIsolation foi preterido. Os testes sempre são executados em um processo separado]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Executa os testes em um processo isolado. Isso diminui a probabilidade de que o processo vstest.console.exe ]D;]A;      seja interrompido em um erro nos testes, mas os testes ]D;]A;      podem ficar mais lentos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento {0} é inválido. Use a opção /help para verificar a lista de argumentos válidos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tamanho do lote inválido {0}. O tamanho do lote deve ser maior que zero. Exemplo: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento blame '{0}' não é válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[A configuração fornecida é inválida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento diag '{0}' não é válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho para o arquivo diag '{0}' não é válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento {0} não é esperado no comando 'EnableCodeCoverage'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Versão inválida do .Net Framework: {0}. Forneça o nome completo do TargetFramework(Exemplo: .NETCoreApp,Version=v2.0). Outras versões compatíveis do .Net Framework são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento {0} não é esperado no comando 'InIsolation'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /InIsolation) e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento logger '{0}' não é válido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento {0} não é esperado no comando 'Parallel'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /Parallel) e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento --ParentProcessId|/ParentProcessId requer a ID do processo que é um número inteiro. Especifique a ID do processo pai que iniciou esse processo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tipo de plataforma inválido: {0}. Os tipos de plataforma válidos {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento --Port|/Port requer o número da porta que é um número inteiro. Especifique a porta de conexão de soquete e de recebimento de mensagens de evento.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho '{0}' especificado em 'ResultsDirectory' é inválido. Erro: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho '{0}' especificado em 'TestAdapterPath' é inválido. Erro: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /TestCaseFilter não pode ser especificado com /Tests. A filtragem de casos de teste não se aplica quando os testes são especificados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento do parâmetro de execução de teste '{0}' é inválido. Use o formato abaixo.]D;]A;     Formato: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento {0} não é esperado no comando 'UseVsixExtensions'. Especifique o comando que indica se as extensões vsix devem ser usadas ou ignoradas (exemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Lista os discoverers de teste instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Lista os executores de teste instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Lista os agentes de teste instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Lista os provedores de configurações de teste instalados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Os Testes a seguir estão disponíveis:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lista todos os testes detectados no contêiner de testes especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo {0} fornecido é somente leitura]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível localizar um agente de teste com o URI ou o FriendlyName '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uma ou mais runsettings fornecidas contêm um token inválido]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ferramenta de Linha de Comando de Execução de Teste da Microsoft (R) Versão {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Minutos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum arquivo de origem de teste foi especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho '{0}' especificado em 'TestAdapterPath' não contém nenhum adaptador de teste, forneça um caminho válido e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parâmetro "{0}" não reconhecido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum argumento foi especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos da Windows Store, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo da Windows Store.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Foram descobertos {0} testes no total, mas nenhum teste corresponde ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum teste está disponível em {0}. Certifique-se de que os detectores de teste e executores, configurações de versão de estrutura da plataforma instalados sejam apropriados e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} é construído para {1}/{2}. Os assemblies de testes especificados em uma execução devem ter um destino comum de do Net. framework e da plataforma.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenhum]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não Executado]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Erro ao abrir o arquivo de resposta '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      O diretório que contém os binários a serem executados.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho de saída não foi encontrado, forneça um caminho válido e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Especifica que os testes sejam executados em paralelo. Por padrão, ]D;]A;      podem ser usados todos os núcleos disponíveis no computador.]D;]A;      O número de núcleos a serem usados pode ser configurado usando um arquivo de configurações.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      ID do Processo Pai responsável pela inicialização do processo atual.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aprovado]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Não foi possível iniciar a execução de testes para o aplicativo do Windows Phone: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos do Windows Phone, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo do Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Arquitetura da plataforma destino a ser usada na execução de teste. ]D;]A;      Os valores válidos são x86, x64 e ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /Platform requer que o tipo de plataforma de destino para a execução de teste seja fornecido. Exemplo: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Port>]D;]A;      A Porta para a conexão de soquete e o recebimento de mensagens de eventos.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de teste em andamento]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho {0} não existe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      Ler o arquivo de resposta para obter mais opções.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      O diretório de resultados de teste será criado no caminho especificado, caso ainda não exista.]D;]A;      Exemplo: /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro /ResultsDirectory exige um valor no qual os resultados de teste deverão ser salvos. Exemplo: /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Configurações a serem usadas durante a execução de testes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo de Configurações '{0}' não pôde ser encontrado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro /Settings exige que um arquivo de configurações seja fornecido.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Somente um pacote do aplicativo (arquivo .appx) pode ser especificado para a execução de testes.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Execute testes com nomes que correspondam aos valores fornecidos. Para fornecer vários]D;]A;      valores, separe-os por vírgulas.]D;]A;       Exemplos: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Execute testes por meio dos arquivos especificados ou do padrão curinga. Separe vários nomes de arquivos de teste ou padrões]D;]A;      por espaços. Defina o detalhamento do agente do console como detalhado para exibir os arquivos de teste correspondentes.]D;]A;      Exemplos: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Coletores de dados que não sejam a Cobertura de Código e o Microsoft Fakes definidos por meio de configurações de execução não são compatíveis com configurações de teste inseridas. Consulte https://aka.ms/vstest-configure-datacollector para obter mais informações. Configurações de execução: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Segundos]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorado]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Foram descobertos {0} testes no total, mas alguns testes não correspondem ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /Tests requer um ou mais nomes de teste específicos ou suas subcadeias de caracteres.]D;]A;       Exemplos: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Rastreamento de pilha:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Iniciando descoberta de teste, espere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Iniciando execução de teste, espere...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagens de erro padrão:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mensagens de saída padrão:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Além disso, o caminho para os adaptadores de teste podem ser especificados usando o comando /TestAdapterPath. Exemplo /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Tipos de arquivos com suporte:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usando o modo de isolamento para executar testes de unidade para aplicativos da Windows Store. Use o parâmetro /InIsolation para suprimir esse aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usando o modo de isolamento para executar testes conforme o exigido pelas configurações em vigor da Plataforma: {0} e do .Net Framework: {1} para execução de teste. Use o parâmetro /inIsolation para suprimir esse aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usando o modo de isolamento para executar testes de unidade para aplicativos do Windows Phone. Use o parâmetro /InIsolation para suprimir esse aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usando o modo de isolamento para executar os testes pois os adaptadores de dados de diagnóstico foram habilitados nas runsettings. Use o parâmetro /inIsolation para suprimir esse aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O caminho de pesquisa do adaptador de teste personalizado fornecido não foi encontrado, forneça um caminho válido e tente novamente.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Faz com que o processo vstest.console.exe use adaptadores de teste personalizados]D;]A;      de um arquivo fornecido (caso haja algum) na execução de teste. ]D;]A;      Exemplo:  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro /TestAdapterPath exige um valor, que é o caminho de um local contendo adaptadores de teste personalizados. Exemplo: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Executa testes que correspondem à expressão fornecida.]D;]A;      <Expression> tem o formato <property>Operator<value>[|&<Expression>]5D;]D;]A;         em que Operator é =, != ou ~ (o Operator ~ tem a semântica 'contains']D;]A;         e é aplicável a propriedades de cadeia de caracteres como DisplayName).]D;]A;         É possível usar parênteses () para agrupar subexpressões.]D;]A;      Exemplos: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O argumento /TestCaseFilter exige um valor de filtro.]D;]A;        O valor de filtro pode ser do tipo <propriedade>=<valor> .]D;]A;        Exemplos: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de Teste Anulada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de Teste Abortada com Erro {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de Teste Cancelada.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Falha na Execução de Teste.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Execução de Teste Bem-sucedida.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} – Com falha: {1}, Aprovado: {2}, Ignorado: {3}, Total: {4}, Duração: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Com falha: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Total de testes: desconhecido]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Aprovados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Ignorados: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Total de testes: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Usando a estrutura {0} para executar os testes. Especifique /Framework:{1} para suprimir esse aviso.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O arquivo de origem de teste "{0}" fornecido não foi encontrado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} arquivos de teste no total corresponderam ao padrão especificado.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tempo decorrido:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI do executor padrão: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions está sendo preterido. Em vez disso, use /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Faz o processo vstest.console.exe usar ou ignorar as extensões VSIX instaladas ]D;]A;      (caso haja alguma) na execução de teste. ]D;]A;      Exemplo  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[O parâmetro /UseVsixExtensions requer um valor. Se ele for 'true', as extensões VSIX instaladas (caso haja alguma) serão usadas na execução de teste. Se ele for false, elas serão ignoradas. Exemplo: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Registro em log do diagnóstico Vstest no arquivo: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4aeb1992a4..0000000000
--- a/Localize/lcl/ru/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Произошло исключение при сборе последних записей в журнале событий "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборщик данных из журнала событий не нашел eventLogContext по DataCollectionContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В журнале событий "{0}" произошло исключение; некоторые события могли быть потеряны. Ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Возможно, журнал событий "{0}" был очищен во время сбора данных. Некоторые события могли быть не собраны.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось прочитать журнал событий "{0}" с компьютера "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a6cbdd423a..0000000000
--- a/Localize/lcl/ru/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нет доступных данных объема протестированного кода. Определение объема протестированного кода сейчас поддерживается только на Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось создать каталог {0}, ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось инициализировать сборщик данных объема протестированного кода, ошибка: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Выполняемое событие не получено из CodeCoverage.exe. Причину сбоя см. в журналах событий.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось получить выполняемое событие из CodeCoverage.exe за {0} с. Возможно, компьютер работает медленно. Увеличьте время ожидания в переменной среды {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти CodeCoverage.exe в {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 25e457ee7b..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName является неполным.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимая escape-последовательность (сегмент: {0}, позиция: {1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Арность метода должна быть числовым значением]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Метод "{0}" не найден для типа "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В конце сегмента ожидалась закрывающая одинарная кавычка (сегмент: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тип "{0}" не найден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Неожиданные символы после окончания ManagedName (позиция: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пробел в ManagedName (позиция: {0}) не допускается.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Метод "{0}.{1}" не реализован на этой платформе.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d139226055..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборка выполнена.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборка начата, подождите...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пропуск выполнения теста для проекта {0}. Чтобы выполнить тесты с помощью теста dotnet, добавьте свойство "<IsTestProject>true</IsTestProject>" в файл проекта.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск для {0} ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Внимание. Для сбора данных об объеме протестированного кода обновите пакет Microsoft.NET.Test.Sdk по ссылке как минимум до версии 15.8.0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f54f768042..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось выполнить тестовый запуск из-за недопустимого начального состояния.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не найден подходящий поставщик среды выполнения теста для этого запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск отменяется: превышено допустимое время ожидания в {0} мс.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Операция "Ожидать завершения" запрещена, если нет активного тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d30fd9d61b..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись. Дополнительные сведения см. в сообщении об ошибке:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Операция отменяется в соответствии с запросом.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбор данных: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборщик данных "{0}" не предоставил сведения для инициализации. Ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В сборщике данных "{0}" возникло исключение во время загрузки типа, создания или инициализации: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сообщение сборщика данных "{0}": {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти сборщик данных "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборщик данных "{0}" запросил, чтобы в окружении выполнения тестов была установлена переменная окружения "{1}" со значением "{2}", но другой сборщик данных "{3}" уже запросил эту переменную окружения со значением "{4}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Повторяющийся URI расширения теста "{0}". Повторяющееся расширение пропускается.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Повторяющийся поставщик параметров с именем "{0}". Повторяющийся поставщик пропускается.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Обнаружен повторяющийся раздел параметров запуска с именем "{0}". Повторяющиеся параметры пропускаются.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: пустые круглые скобки ()]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти список установленных расширений модульных тестов. Причина: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось загрузить расширения из файла "{0}". Для получения дополнительных сведений используйте /diag.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При создании быстрого фильтра произошла ошибка.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Существует несколько конфигураций со значением "{0}" для FriendlyName сборщика данных. Повторяющиеся конфигурации будут пропущены в тестовом запуске.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Внутреннее исключение:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: недопустимое условие "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Расширение теста имеет недопустимый URI "{0}": {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: недопустимый оператор "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Возникло исключение при инициализации средства ведения журнала с {0}: "{1}". Средство ведения журнала не будет использоваться. Исключение: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти средство ведения журнала тестирования с AssemblyQualifiedName, URI или FriendlyName "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: отсутствует ")"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: отсутствует "("]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: отсутствует операнд]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Отсутствует оператор "|" или "&"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В сборщике данных возникло исключение типа "{0}": "{1}". Дополнительные сведения: {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметры запуска уже загружены.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Произошла ошибка при загрузке параметров запуска. Ошибка: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указан недопустимый узел параметров. Узел параметров должен иметь допустимое значение для свойства имени.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При инициализации поставщика параметров с именем "{0}" произошла ошибка. Ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Поставщик параметров с именем "{0}" не найден. Невозможно загрузить параметры.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Трассировка стека:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Неверный формат фильтра TestCaseFilter {0}. Задайте правильный формат и повторите попытку. Обратите внимание, что использование неверного формата может привести к тому, что ни один из тестов не будет выполнен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти datacollector с понятным именем "{0}".]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Этот параметр работает, только если в рамках Visual Studio установлена служебная программа vstest.console.exe.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нельзя использовать типы, производные от контекста сбора данных, для отправки данных и сообщений.  Используемый для отправки данных и сообщений DataCollectionContext должен происходить от одного из событий, возникших для сборщика данных.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c13d8f3a49..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Активное обнаружение тестов прервано. Причина: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Активный тестовый запуск прерван. Причина: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается подключить отладчик к узлу тестирования по умолчанию.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Существующее подключение принудительно закрыто удаленным узлом.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Процесс {0} не смог подключиться к процессу {1} по прошествии {2} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {3}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбой хост-процесса теста]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось связаться с хост-процессом теста.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Получено непредвиденное сообщение. Ожидаемый тип сообщения (MessageType): {0}, фактический тип сообщения (MessageType): {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Проверка версии протокола не пройдена. Убедитесь, что средство запуска теста и узел совместимы.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось согласовать протокол, превышено время ожидания ответа по прошествии {0} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ebd2001466..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр не может быть пустым или иметь значение null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сведения: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Предупреждение: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент не может быть пустым.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент не может быть отрицательным.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент должен иметь следующий тип: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент имеет следующее свойство, которое не может быть пустой строкой: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент имеет следующее свойство, которое не может быть отрицательным: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент имеет следующее свойство, которое не может иметь значение null: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный аргумент имеет следующее свойство: {0}. Это свойство должно относиться к следующему типу: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При обработке задания из очереди "{0}" возникло необработанное исключение: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти хост "{0}". Убедитесь, что "{0}" установлен на компьютере и доступен в переменной среды PATH.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Очередь {0} уже удалена.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нельзя удалить приостановленную очередь {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка при получении имени процесса.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 89f7997e69..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается подключить отладчик к узлу тестирования по умолчанию с идентификатором процесса {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Включена отладка datacollector. Для продолжения подключите отладчик к процессу datacollector.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Изменяется поиск адаптеров. Дополнительные сведения: https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При создании экземпляра средства обнаружения возникло исключение: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Найдено несколько адаптеров тестов с одинаковым URI "{0}". Адаптер "{1}" пропускается. Чтобы избежать этого предупреждения, удалите все конфликтующие адаптеры.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный повторяющийся источник "{0}" игнорируется.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При загрузке тестов средством обнаружения тестов "{0}" возникло исключение. Исключение: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При вызове исполнителя "{0}" возникло исключение: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр ExecutionThreadApartmentState не поддерживается для платформы: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось запустить хост для тестов с ошибкой: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти файл {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Включена отладка узла. Для продолжения подключите отладчик к процессу testhost.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Исполнитель теста, соответствующий средству обнаружения тестов {0}, пропускается, так как у средства обнаружения нет атрибута DefaultExecutorUri. Возможно, необходимо переустановить надстройку адаптера теста.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось инициализировать прокси клиента: не удалось подключиться к процессу теста.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Эта операция запрещена в контексте неотладочного запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти доступный прокси-сервер для двусторонней очереди.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти {0}. Убедитесь, что dotnet установлен на компьютере.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти исполнитель тестов с URI "{0}". Убедитесь, что исполнитель тестов установлен и поддерживает версию среды выполнения .NET {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Прокси-сервер с идентификатором {0} не управляется текущим диспетчером сеансов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нет тестов, соответствующих указанному фильтру тестовых случаев "{0}" в {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ни один из указанных источников "{0}" не является допустимым. Исправьте эти ошибки и предупреждения и повторите попытку. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти расширения: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Вы используете более старую версию Microsoft.NET.Test.Sdk. Перейдите на версию 15.3.0 или более позднюю.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Прокси-сервер с идентификатором {0} уже доступен и не может быть повторно поставлен в очередь.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Обнаружение тестов отменено.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В {0} нет доступных тестов. Убедитесь, что средства обнаружения и выполнения тестов зарегистрированы, а также проверьте правильность параметров платформы и версии платформы, после чего повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ведение журналов диагностики TestHost в файле: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Соответствующих фильтру тестов нет, так как фильтр содержит одно недопустимое свойство или несколько ({0}). Укажите выражение фильтра, содержащее допустимые свойства ({1}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index fcae7d4c03..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Активный тестовый запуск был прерван из-за непредвиденного завершения хост-процесса. Просмотрите стек вызовов выше (если он доступен), чтобы получить дополнительные сведения об источнике исключения.]D;]A;Тест, который выполнялся в момент возникновения сбоя: ]D;]A;{0}]D;]A;Этот тест может являться источником сбоя.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный ключ {0} параметра Blame недопустим. Он будет пропущен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ключ {0} параметра Blame поддерживает только значения {1}/{2}. Он будет пропущен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбор дампа включен, но файл дампа не создан.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Создание дампа {0} — {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Создание дампа для этого дерева процессов (из нижней части)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанное время неактивности {0} {1} истекло. Сбор дампов зависаний из тестового узла и его дочерних процессов.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[мин]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Все тесты завершены, файл последовательности не будет создан.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось запустить дамп процесса: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Требуемая переменная среды PROCDUMP_PATH была пустой или имела значение NULL. Задайте для PROCDUMP_PATH путь к папке, содержащей нужный исполняемый файл procdump.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр CollectDump включен, но файл дампа не был создан.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[с]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В качестве времени ожидания указано непредвиденное значение "{0}". Укажите значение в следующем формате: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f08df6f3c8..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Файл результатов теста HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка в средстве ведения журнала HTML: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметры LogFileName и LogFilePrefix не могут использоваться вместе.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index efbd829e2b..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Значение параметра не может быть меньше 0.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр не может быть пустым или иметь значение null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нельзя получить свободное имя для {0}(1),(2)... в каталоге {1}. Выполните очистку этого каталога.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти доступное имя файла в {0} с использованием формата метки времени "{2}" в {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[элемент развертывания "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[элемент развертывания "{0}" (выходной каталог "{1}")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не указаны параметры тестирования.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В активных параметрах тестирования не определен каталог развертывания тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Результат не связан с тестовым запуском. Используйте результат, полученный от выполняющегося или завершенного тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указано недопустимое имя файла или каталога "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось присоединить файлы из: {0}]D;]A;Подробные сведения об ошибке: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тест "{0}" пропущен в тестовом запуске.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметры LogFileName и LogFilePrefix недопустимо использовать вместе. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Все загруженные результаты]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Список результатов]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Прерван]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Завершен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Отключен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Выполняется]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[С неопределенным результатом]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не выполнен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не готов к запуску]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден (выполнение прервано)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ожидание]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время ожидания]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Предупреждение]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Файл результатов: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Внимание! Перезапись файла с результатами: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 24b5878d6d..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр не может быть пустым или иметь значение null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск обнаружил библиотеки DLL, которые были созданы для различных версий инфраструктуры и платформы. Следующие библиотеки DLL не соответствуют текущим параметрам (инфраструктура {0} и платформа {1}).{2}Перейдите по ссылке {3} для получения дополнительных сведений об управлении этими параметрами.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный файл параметров не соответствует требуемому формату.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ни один из предоставленных контейнеров тестов не соответствует архитектуре платформы и параметрам .NET Framework для тестового запуска. Платформа: {0} .NET Framework: {1}. Дополнительные сведения об управлении этими параметрами см. по адресу http://go.microsoft.com/fwlink/?LinkID=330428.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} создается для программной платформы {1} и аппаратной платформы {2}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index de0569314f..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName является неполным.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Арность метода должна быть числовым значением]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Метод "{0}" не найден для типа "{1}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тип "{0}" не найден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Неожиданные символы после окончания ManagedName (позиция: {0}).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пробел в ManagedName (позиция: {0}) не допускается.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 1e2754ace4..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр не может быть пустым или иметь значение null.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Файл {0} не существует.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Объект должен принадлежать типу {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Прерван]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Завершен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Отключен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Выполняется]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[С неопределенным результатом]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не выполнен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не готов к запуску]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден (выполнение прервано)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ожидание]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время ожидания]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Предупреждение]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти преобразователь TypeConverter для типа {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти узел "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается прочитать данные из указанного потока. Данные из потока не могут быть отправлены, если поток поддерживает чтение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанное имя файла "{0}" содержит следующие недопустимые символы: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанное имя файла "{0}" зарезервировано.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Невозможно зарегистрировать свойство "{0}" как тип значения "{1}", так как оно уже зарегистрировано как "{2}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось создать HResult COM сеанса msdia "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось загрузить msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимый URI в параметрах сборщика данных "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Корневой узел параметров запуска должен иметь имя RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимые параметры "{0}". Недопустимое значение "{1}", указанное для "{2}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимые параметры "{0}". Неожиданный атрибут XmlAttribute: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимые параметры "{0}". Неожиданный элемент XmlElement: "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимый URI "{0}" в параметрах "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимые параметры сборщика данных. Отсутствует ожидаемый атрибут "{0}".  Типичный параметр сборщика данных обычно выглядит следующим образом: <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимые параметры "{0}". Ожидается как минимум один атрибут XmlAttribute: friendlyName, uri или assemblyQualifiedName.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нельзя указывать фильтр TestCaseFilter для конкретного тестового запуска. Условия фильтра FilterCriteria предназначены только для выполнения с использованием источников.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Частота уведомлений должна быть положительным значением.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время ожидания уведомления должно быть больше нуля.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Каталог решения "{0}" не существует. Убедитесь, что указанный в файле параметров запуска RUNSETTINGS каталог решения существует и для него имеются разрешения на чтение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Строка фильтра "{0}" содержит нераспознанную escape-последовательность.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Номер столбца]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI исполнителя]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь к файлу]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Идентификатор]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Номер строки]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Имя]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Источник]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Признаки]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Сообщение: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Трассировка стека:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нет]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не найден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пропущен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Имя компьютера]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Отображаемое имя результатов теста]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Длительность]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время окончания]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Номер столбца ошибки]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сообщение об ошибке]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Трассировка стека ошибок]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Результат]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время начала]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Тестовые сообщения:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тип свойства теста "{0}" для свойства "{1}" не поддерживается. Используйте один из поддерживаемых типов свойств (типы-примитивы, URI, string, string[]5D;) и повторите попытку. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 9001cf435e..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Обнаружено несколько версий одного расширения. Выбрана самая поздняя версия.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти узел "{0}" для архитектуры "{1}".]D;]A;]D;]A;Чтобы устранить проблему, установите .NET "{1}".]D;]A;]D;]A;Указанную платформу можно найти по адресу:]D;]A;  https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти {0}. Опубликуйте тестовый проект и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти {0}. Убедитесь, что в тестовом проекте есть ссылка NuGet на пакет "Microsoft.NET.Test.Sdk".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 578560ca31..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[XML-файл параметров запуска не содержит узел RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимый параметр "{0}". Недопустимое значение "{1}", указанное для "{2}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти узел RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти узел RunSettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Произошла ошибка при загрузке параметров. Ошибка: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметры целевой платформы "{0}" несовместимы с архитектурой системы "{1}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный неожиданный файл параметров.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 64781337d8..0000000000
--- a/Localize/lcl/ru/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Операция запуска сеанса тестирования прервана.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Операция остановки сеанса тестирования прервана.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Обработка вложений активного тестового запуска прервана.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Активное обнаружение тестов прервано.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Активный тестовый запуск прерван.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось получить сообщение из процесса vstest.console.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Файл {0} не существует.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аварийное завершение процесса vstest.console]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b0d2cd277d..0000000000
--- a/Localize/lcl/ru/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Любые узлы LegacySettings в runsettings будут удалены.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Файл RunSettings не содержит внутри себя testSettings. Перенос выполняться не будет.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Перенесенный файл RunSettings создан в {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Атрибуты agentNotRespondingTimeout, deploymentTimeout, scriptTimeout узла Timeouts не поддерживаются и перенесены не будут.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Допустимое использование:]D;]A;SettingsMigrator.exe <полный путь к переносимому файлу TestSettings или RunSettings>]D;]A;SettingsMigrator.exe <полный путь к переносимому файлу TestSettings или RunSettings> <полный путь к создаваемому файлу RunSettings>]D;]A;Примеры:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/ru/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/ru/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 52f7c75c78..0000000000
--- a/Localize/lcl/ru/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Дополнительные информационные сообщения:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось запустить тестовый запуск для модульных тестов приложений для Магазина Windows: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В указанных контейнерах тестов тесты не найдены. Кроме того, адаптер модульных тестов для Магазина Windows (Майкрософт) не поддерживает APPXBUNDLE-файлы. Создайте APPX-файл (установите значение "Никогда" для параметра "Создать набор приложений") при создании пакета приложения и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удается найти тестируемую сборку. Убедитесь, что проект создан.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Вложения:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Доступны следующие надстройки обнаружения тестов:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Доступны следующие надстройки выполнения тестов:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Доступны следующие надстройки средства ведения журнала тестирования:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Доступны следующие надстройки поставщиков параметров:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента /BatchSize требуется указать размер пакета. Пример: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбор аварийных дампов с помощью параметра CollectDump для Blame не поддерживается для этой платформы.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбор дампов зависаний с помощью параметра CollectDump с TestTimeout для Blame не поддерживается для этой платформы.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный с Blame параметр {0} недопустим. Он будет пропущен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<базовый путь к сборке>]D;]A;      Каталог, содержащий временные выходные данные.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Базовый путь к сборке не найден, укажите допустимый путь и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргументы RunSettings:]D;]A;      Аргументы для передачи конфигураций runsettings через командную строку. Аргументы могут быть указаны как пара "имя-значение" в формате [имя]5D;=[значение]5D; после "-- ". Обратите внимание на пробел после --. ]D;]A;      Используйте пробел для разделения нескольких пар [имя]5D;=[значение]5D;.]D;]A;      Дополнительные сведения о поддержке аргументов RunSettings: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Неопределенное или отсутствующее значение недопустимо.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<понятное имя сборщика данных>]D;]A;      Включает сборщик данных для тестового запуска. Подробнее: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:"{0}" не поддерживается, если тестовый запуск настроен с использованием testsettings.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ошибка: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сведения: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Предупреждение: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<конфигурация>]D;]A;      Конфигурация, для которой создан проект, например Debug/Release]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(с) Корпорация Майкрософт (Microsoft Corporation). Все права защищены.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Понятное имя сборщика данных "{0}" недопустимо. Сборщик данных будет пропущен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Дни]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сообщения трассировок отладки:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Время ожидания установления подключения или обработки запроса для DesignModeClient на порту {0} истекло.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Пример: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Покрытие кода недоступно для приложений для Магазина Windows. Анализ покрытия кода пропущен для этого тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Покрытие кода недоступно для приложений Windows Phone. Анализ покрытия кода пропущен для этого тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При чтении параметров адаптера диагностических данных возникло выполнение "{0}". Все адаптеры диагностических данных будут пропущены в этом запуске.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений для Магазина Windows. Удалите параметры адаптеров диагностических данных из параметров.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений Windows Phone. Удалите параметры адаптеров диагностических данных из параметров.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось выполнить обнаружение для заданных источников. Исключение: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр "{0}" должен быть указан только один раз.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[значение]5D;;[DumpType]5D;=[значение]5D;]D;]A;      Выполняет тест в blame-режиме. Этот вариант помогает изолировать проблемный тест, вызывающий сбой хоста для тестов.]D;]A;      В текущем каталоге создается выходной файл "Sequence.xml",]D;]A;      который записывает порядок выполнения теста перед сбоем.]D;]A;      При необходимости вы можете выполнить сбор дампа процессов хоста для тестов.]D;]A;      В этом случае по умолчанию при сбое будет собран мини-дамп.]D;]A;      Вы также можете переопределить поведение по умолчанию с помощью дополнительных параметров:]D;]A;      CollectAlways — собирает дамп по завершении даже при отсутствии сбоев (true/false) ]D;]A;      DumpType — задает тип дампа, mini (мини-дамп) или full (полный).]D;]A;      Пример: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Включает сборщик данных "CodeCoverage" для тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<путь к файлу журнала>]D;]A;      Включение журналов для платформы тестирования.]D;]A;      Журналы записываются в предоставленный файл.]D;]A;]D;]A;      Уровень трассировки для журналов можно изменить описанным ниже способом]D;]A;      Пример: /Diag:<путь к файлу журнала>;tracelevel=<по умолчанию "verbose">]D;]A;      Разрешенные значения для tracelevel: off, error, warning, info и verbose.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/понятное_имя_средства_ведения_журнала>]D;]A;      Укажите средство ведения журнала результатов тестирования.  Например, чтобы сохранять результаты в файле]D;]A;      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=<по умолчанию уникальное имя файла>]5D;]D;]A;      Создает файл в каталоге TestResults с заданным именем LogFileName.]D;]A;]D;]A;      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом]D;]A;      Пример: /logger:console;verbosity=<по умолчанию "minimal">]D;]A;      Допустимые значения для verbosity: quiet, minimal, normal и detailed.]D;]A;]D;]A;      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом]D;]A;      Пример: /logger:console;prefix=<по умолчанию "false">]D;]A;      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<URI/понятное_имя_средства_ведения_журнала>]D;]A;      Укажите средство ведения журнала результатов тестирования.  Например, чтобы сохранять результаты в файле]D;]A;      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=<по умолчанию уникальное имя файла>]5D;]D;]A;      Создает файл в каталоге TestResults с заданным именем LogFileName.]D;]A;]D;]A;      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом]D;]A;      Пример: /logger:console;verbosity=<по умолчанию "normal">]D;]A;      Допустимые значения для verbosity: quiet, minimal, normal и detailed.]D;]A;]D;]A;      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом]D;]A;      Пример: /logger:console;prefix=<по умолчанию "false">]D;]A;      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Устанавливает значение переменной среды. Если переменной среды не существует, она создается. Если переменная среды существует, она переопределяется. Этот параметр подразумевает использование параметра /InIsolation и принудительно выполняет тесты в изолированном процессе.]D;]A;      ]D;]A;      Этот аргумент может быть указан несколько раз для нескольких переменных среды.]D;]A;]D;]A;      Пример: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Переменная среды "{0}" уже определена, но переопределена аргументом -Environment.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сообщение об ошибке:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Запуск тестов:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Запуск тестов с дополнительными параметрами, например со сборщиками данных:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[При создании экземпляра расширения "{0}" возникло исключение: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Общее время: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не пройден]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}": не найдено.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 не поддерживается. Для проектов, предназначенных для .NET Framework 3.5, тест будет выполняться в среде CLR 4.0 в "режиме совместимости".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<версия платформы>]D;]A;      Целевая версия платформы .NET Framework, используемая для выполнения тестов. ]D;]A;      Допустимые значения: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" и т. п.]D;]A;      Другие поддерживаемые значения: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент /Framework требует указать целевую версию .NET Framework для тестового запуска. Пример: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Отображение этого сообщения об использовании.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргументы:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Описание: выполняет тесты из указанных файлов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметры:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Использование: vstest.console.exe [аргументы]5D; [параметры]5D; [[--]5D; <аргументы RunSettings>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Часы]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Флаг /InIsolation использовать не рекомендуется. Тесты всегда запускаются в отдельном процессе]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Запуск тестов в изолированном процессе. Это снижает вероятность]D;]A;      остановки процесса vstest.console.exe из-за ошибки в тестах, но]D;]A;      тесты могут выполняться медленнее.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент {0} недопустим. Используйте параметр /help, чтобы просмотреть список допустимых аргументов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимый размер пакета {0}. Размер пакета должен быть больше нуля. Пример: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент Blame "{0}" недопустим.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Данная конфигурация недопустима.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент диагностики "{0}" недопустим.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь к файлу диагностики "{0}" недопустим.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент {0} не ожидается в команде EnableCodeCoverage. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /EnableCodeCoverage) и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимая версия .NET Framework: {0}. Укажите полное имя целевой платформы (например: .NETCoreApp,Version=v2.0). Другие поддерживаемые версии .NET Framework: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент {0} не ожидается в команде InIsolation. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /InIsolation) и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент средства ведения журнала "{0}" недопустим.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент {0} не ожидается в команде Parallel. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /Parallel) и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента --ParentProcessId|/ParentProcessId требуется указать ИД процесса, который должен быть целым числом. Укажите идентификатор родительского процесса, ответственного за запуск текущего процесса.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Неверный тип платформы: {0}. Допустимые типы платформ: {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента --Port|/Port требуется указать номер порта, который должен быть целым числом. Укажите порт для подключения через сокет и получения событий сообщений.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь "{0}", указанный в "ResultsDirectory", недопустим. Ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь {0}, заданный в параметре TestAdapterPath, недопустим. Ошибка: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент /TestCaseFilter нельзя указывать при использовании аргумента /Tests. Если указываются тесты, фильтрация тестовых случаев не применяется.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Недопустимый аргумент "{0}" для параметра тестового запуска. Используйте указанный ниже формат.]D;]A;     Формат: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргумент {0} не ожидается в команде UseVsixExtensions. Укажите команду, определяющую, требуется ли использовать или игнорировать расширения VSIX (например, vstest.console.exe myTests.dll /UseVsixExtensions:true), и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Список установленных средств обнаружения тестов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Список установленных исполнителей тестов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Список установленных средств ведения журналов тестирования.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Список установленных поставщиков параметров тестирования.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Доступны следующие тесты:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<имя_файла>]D;]A;      Перечисление всех обнаруженных тестов из указанного контейнера тестов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный файл {0} доступен только для чтения.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Понятное имя: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти средство ведения журнала тестирования с URI или понятным именем "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Один или несколько файлов RUNSETTINGS включают в себя недопустимый токен]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Программа Microsoft (R) Test Execution Command Line Tool версии {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Минуты]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Исходные файлы тестов не указаны.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь "{0}", заданный в параметре TestAdapterPath, не содержит адаптеров тестов. Укажите допустимый путь и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нераспознанный параметр "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Аргументы не указаны.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений для Магазина Windows создайте пакет приложения с помощью проекта библиотеки модульных тестов приложений для Магазина Windows.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Всего обнаружено тестов: {0}, но тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[В {0} нет доступных тестов. Проверьте правильность параметров установленного средства обнаружения и выполнения тестов, а также платформы и версии платформы, и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборка {0} выполняется для {1}/{2}. Заданные в запуске тестовые сборки должны иметь одинаковые значения целевой среды .NET Framework и платформы.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Нет]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не выполнен]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Произошла ошибка при открытии файла ответа "{0}"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<вывод>]D;]A;      Каталог, содержащий двоичные файлы для запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Выходной путь не найден, укажите допустимый путь и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Указывает, что тесты должны выполняться параллельно. По умолчанию]D;]A;      можно использовать любое имеющееся число ядер на компьютере.]D;]A;      Число используемых ядер можно настроить с помощью файла параметров.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ИД_родительского_процесса>]D;]A;      Идентификатор родительского процесса, отвечающего за запуск текущего процесса.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пройден]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось запустить тестовый запуск для тестов приложений Windows Phone: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений Windows Phone создайте пакет приложения с помощью проекта приложения модульного тестирования Windows Phone.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<тип_платформы>]D;]A;      Архитектура целевой платформы, в которой будут выполняться тесты. ]D;]A;      Допустимые значения: x86, x64 и ARM.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента /Platform требуется указать тип целевой платформы для тестового запуска. Пример: /Platform:x 86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<порт>]D;]A;      Порт для подключения через сокет и получения сообщений о событиях.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Выполняется тестовый запуск]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Путь {0} не существует.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<файл>]D;]A;      Считывание файла ответов с дополнительными параметрами.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      По указанному пути будет создан каталог результатов тестов, если он еще не существует.]D;]A;      Пример: /ResultsDirectory:<путь_к_каталогу_результатов>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для параметра /ResultsDirectory требуется значение, в котором сохраняются результаты тестирования. Пример:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<файл параметров>]D;]A;       Параметры, используемые при запуске тестов.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Не удалось найти файл параметров "{0}".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для параметра /Settings требуется указать файл параметров.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для выполнения тестов можно указать только один пакет приложения (APPX-файл).]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<имена_тестов>]D;]A;      Запуск тестов с именами, соответствующими указанным значениям.]D;]A;      Несколько значений разделяются запятыми.]D;]A;      Примеры: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Выполняйте тесты из указанных файлов или шаблона с подстановочными знаками. Разделяйте несколько шаблонов или имен тестовых файлов]D;]A;      пробелами. Задайте высокий уровень детализации для средства ведения журнала консоли, чтобы просмотреть соответствующие тестовые файлы.]D;]A;      Примеры: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сборщики данных, настроенные в параметрах запуска, кроме покрытия кода и Microsoft Fakes, не поддерживаются со встроенными параметрами тестирования. Дополнительные сведения: https://aka.ms/vstest-configure-datacollector. Параметры запуска: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Секунды]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Имя параметра: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Пропущен]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Всего обнаружено тестов: {0}, но некоторые тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента /Tests требуется указать один или несколько конкретных имен тестов или их подстрок.]D;]A;       Примеры: /Tests:TestsMethod1, /Tests:TestMethod1, method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Трассировка стека:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Запуск обнаружения тестов; подождите...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Запуск выполнения тестов; подождите...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Стандартные сообщения об ошибке:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Стандартные выходные сообщения:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Кроме того, путь к адаптерам тестов можно указать с помощью команды /TestAdapterPath. Пример:  /TestAdapterPath:<путь_к_настраиваемым_адаптерам>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Поддерживаемые типы файлов:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Использование режима изоляции для запуска модульных тестов приложений для Магазина Windows. Используйте параметр /InIsolation, чтобы отключить это предупреждение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для запуска тестов используется изолированный режим в соответствии с параметрами Platform:{0} и .Net Framework:{1} для тестового запуска. Используйте параметр /InIsolation, чтобы отключить это предупреждение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Использование режима изоляции для запуска модульных тестов приложений Windows Phone. Используйте параметр /InIsolation, чтобы отключить это предупреждение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Используется режим изоляции для запуска тестов, так как в файле параметров запуска RUNSETTINGS включены адаптеры диагностических данных. Используйте параметр /InIsolation, чтобы отключить это предупреждение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный путь поиска пользовательского адаптера теста не найден. Укажите допустимый путь и повторите попытку.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Процесс vstest.console.exe будет использовать пользовательские адаптеры тестов]D;]A;      по заданному пути (при наличии) в тестовом запуске. ]D;]A;      Пример: /TestAdapterPath:<путь_к_пользовательским_адаптерам_тестов>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для параметра /TestAdapterPath требуется значение, представляющее собой путь к расположению с пользовательскими адаптерами тестов. Пример: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<выражение>]D;]A;      Запуск тестов, соответствующих заданному выражению.]D;]A;      <выражение> имеет формат <свойство>оператор<значение>[|&<выражение>]5D;]D;]A;         где в качестве оператора может использоваться =, != или ~  (оператор ~ имеет семантику]D;]A;         "содержит" и применим к строковым свойствам, таким как DisplayName).]D;]A;         Вложенные выражения можно группировать с помощью скобок ().]D;]A;      Примеры: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для аргумента /TestCaseFilter необходимо указать значение фильтра.]D;]A;        Значение фильтра можно задать в формате <свойство>=<значение>.]D;]A;        Пример: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск прерван.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск прерван с ошибкой {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск отменен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Сбой тестового запуска.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Тестовый запуск выполнен.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}: не пройдено {1}, пройдено {2}, пропущено {3}, всего {4}, длительность {5}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Не пройдено: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Всего тестов: неизвестно]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Пройдено: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Пропущено: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Всего тестов: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Использование платформы {0} для запуска тестов. Укажите /Framework:{1}, чтобы отключить это предупреждение.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Указанный исходный файл теста "{0}" не найден.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Общее количество тестовых файлов ({0}), соответствующих указанному шаблону.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Прошло времени:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI исполнителя по умолчанию: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Параметр /UseVsixExtensions устарел. Используйте /TestAdapterPath.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Определяет использование или пропуск процессом vstest.console.exe]D;]A;      установленных расширений VSIX (при наличии) в тестовом запуске. ]D;]A;      Пример: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Для параметра /UseVsixExtensions требуется значение. Если задано значение true, установленные расширения VSIX (при наличии) будут использоваться в тестовом запуске. Если задано значение false, то они будут игнорироваться. Пример: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ведение журналов диагностики Vstest в файле: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 2814f70c93..0000000000
--- a/Localize/lcl/tr/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' olay günlüğündeki son girdiler toplanırken bir özel durum oluştu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Event Log DataCollector, şu DataCollectionContext için eventLogContext bulamadı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' olay günlüğü bir özel durumla karşılaştı. Bazı olaylar kaybolabilir. Hata : {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' olay günlüğü toplama sırasında temizlenmiş olabilir. Bazı olaylar toplanmamış olabilir]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' bilgisayarından olay günlüğü '{0}' okunamıyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 5708a05126..0000000000
--- a/Localize/lcl/tr/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kod kapsamı verisi yok. Kod kapsamı şu anda yalnızca Windows’da destekleniyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} dizini şu hatayla oluşturulamadı:{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kod kapsamı veri toplayıcısı şu hata nedeniyle başlatılamadı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırılan olay CodeCoverage.exe kaynağından alınamadı. İşlemin başarısız olmasının nedenini öğrenmek için eventlogs verilerini inceleyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırılan olay CodeCoverage.exe kaynağından {0} saniye içinde alınamadı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir. Zaman aşımı süresini artırmak için lütfen ortam değişkenini {1} olarak ayarlayın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CodeCoverage.exe şu konumda bulunamıyor: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index aa214545dd..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName tamamlanmadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kaçış dizisi geçersiz! (segment: {0}, pos: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Method sayısı sayısal bir değer olmalıdır]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' türünde '{0}' metodu bulunamadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Segmentin sonunda bir kapanış tek tırnak işareti bekleniyordu! (segment: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} türü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName'den sonra beklenmeyen karakterler var (konum: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName'de boşluk geçersiz (konum: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' bu platformda uygulanmıyor!]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 13140653f9..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Derleme tamamlandı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Derleme başlatıldı. Lütfen bekleyin...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} projesi için test çalıştırma atlanıyor. Testleri dotnet test ile çalıştırmak için proje dosyasına "<IsTestProject>true</IsTestProject>" özelliğini ekleyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} ({1}) için test çalıştırması]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uyarı: Kod kapsamını toplamak için Microsoft.NET.Test.Sdk paketinin başvurusunu 15.8.0 veya üzeri bir sürüme güncelleştirin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f148de8725..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İlk durum geçersiz olduğundan test çalıştırması yürütülemedi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bu çalıştırma için uygun bir test çalışma zamanı sağlayıcısı yok.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test çalıştırması durduruluyor: Test çalıştırması için {0} milisaniyelik zaman aşımına ulaşıldı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin bir test çalıştırması olmadığında tamamlanmasını bekleme işlemine izin verilmez. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ee86c3ba86..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için: Lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın. Daha fazla bilgi için lütfen hata iletisine bakın:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İşlem istek üzerine iptal ediliyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Veri toplama: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcısı başlatma bilgilerini sağlayamadı. Hata: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcısı tür yükleme, oluşturma veya başlatma sırasında bir özel durum oluşturdu: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcısı iletisi: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcısı bulunamadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcısı, test yürütme ortamında değeri '{2}' olan '{1}' ortam değişkeninin ayarlanması için istekte bulundu, ancak başka bir veri toplayıcısı ('{3}') zaten farklı bir değerle ('{4}') aynı ortam değişkeni için istekte bulunmuştu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yinelenen test uzantısı URI’si '{0}'. Yinelenen uzantı yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' adlı yinelenen ayar sağlayıcısı. Yinelenen sağlayıcı yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' adlı yinelenen çalıştırma ayarları bölümü bulundu. Yinelenen ayarlar yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: Boş ayraç ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yüklenen birim testi uzantılarının listesi bulunamadı. Neden: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uzantılar '{0}' dosyasından yüklenemedi. Daha fazla bilgi için lütfen /diag kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hızlı filtre oluşturulurken bir hata oluştu.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Veri toplayıcısı FriendlyName değeri '{0}' olan birden çok yapılandırma var. Yinelenen yapılandırmalar test çalıştırmasında yoksayılacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Özel iç durum:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: Geçersiz Koşul '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Uzantısı geçersiz bir '{0}' URI’sine sahip: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: Geçersiz işleç '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Günlükçü, '{0}' ile başlatılırken özel durum oluştu: '{1}'.  Günlükçü kullanılmayacak. Özel durum: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[AssemblyQualifiedName, URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: ')' eksik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: '(' eksik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: İşlenen eksik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['|' veya '&' işleci eksik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Veri toplayıcısı '{0}' türünde bir özel durum yakaladı: '{1}'. Diğer ayrıntılar:'{2}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırma Ayarları zaten yüklendi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırma ayarları yüklenirken bir hata oluştu. Hata: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen ayar düğümü geçersiz. Ayar düğümünün ad özelliği boş olmamalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' adlı ayar sağlayıcısı başlatılırken bir hata oluştu. Hata: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' adlı Ayar Sağlayıcısı bulunamadı. Ayarlar yüklenemiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yığın izleme:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter {0} için yanlış biçim. Doğru biçimi belirtin ve yeniden deneyin. Yanlış biçim hiçbir testin yürütülmemesine neden olabilir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' kolay adına sahip bir datacollector bulunamadı.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bu seçenek yalnızca Visual Studio’nun bir parçası olarak yüklenen vstest.console.exe ile birlikte çalışır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Veri koleksiyonu bağlamından türetilen türler, veri ve ileti göndermek için kullanılamaz. Veri ve ileti göndermek için kullanılan DataCollectionContext veri toplayıcısı yükseltilmiş olayların birinden gelmelidir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ba8d7c4dc1..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin test bulma iptal edildi. Nedeni: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin test çalıştırması iptal edildi. Nedeni: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata ayıklayıcı, varsayılan test ana bilgisayarına eklenemiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Mevcut bir bağlantı uzak konak tarafından zorla kapatıldı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} işlemi, {2} saniye sonra {1} işlemine bağlanamadı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {3} olarak ayarlayın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test ana işlemi kilitlendi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test ana bilgisayarı işlemi ile iletişim kurulamıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Beklenmeyen ileti alındı. Beklenen MessageType: {0} Gerçek MessageType: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Protokol sürümü denetlenemedi. Test çalıştırıcısı ve ana bilgisayarının uyumlu olduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Protokol üzerinde anlaşmaya varılamadı, yanıt bekleme süresi {0} saniyenin ardından zaman aşımına uğradı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {1} olarak ayarlayın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4c0121c405..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametre null veya boş olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bilgi: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uyarı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken boş olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken negatif olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken şu türde olmalıdır: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken, boş dize olamayacak olan şu özelliğe sahiptir: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken, negatif olamayacak olan şu özelliğe sahiptir: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken, null olamayacak olan şu özelliğe sahiptir: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen bağımsız değişken şu özelliğe sahiptir: {0}. Bu özellik şu türde olmalıdır: {1}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' kuyruğundan bir iş işlenirken, işlenmeyen özel durum oluştu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' konağı bulunamadı. '{0}' konağının makinede yüklü olduğundan ve PATH ortam değişkeninde bulunduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} kuyruğu zaten atıldı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} kuyruğu duraklatılmış durumdayken atılamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İşlem adı alınırken hata oluştu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f0fdff65ab..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata ayıklayıcı, {0} işlem kimliğine sahip varsayılan test ana bilgisayarına eklenemiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını datacollector işlemine ekleyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bağdaştırıcı arama değiştiriliyor. Ayrıntılar için lütfen https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap sayfasını takip edin.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bulucu örneği oluşturulurken özel durum oluştu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aynı '{0}' URI’sine sahip birden fazla test bağdaştırıcısı bulundu. '{1}' bağdaştırıcısı yoksayılıyor. Bu uyarıyı önlemek için lütfen çakışan bağdaştırıcıları kaldırın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen '{0}' yinelenen kaynağı yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' test bulucusu testleri yüklerken bir özel durum oluştu. Özel durum: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' yürütücüsü çağrılırken bir özel durum oluştu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ExecutionThreadApartmentState seçeneği {0} çerçevesi için desteklenmiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost başlatılamadı. Şu hata alındı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} dosyası bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Konak hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını testhost işlemine ekleyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bulucu DefaultExecutorUri özniteliğine sahip olmadığından {0} test bulucusuna karşılık gelen test yürütücüsü yoksayılıyor. Test bağdaştırıcısı eklentisini yeniden yüklemeniz gerekebilir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İstemci ara sunucusu başlatılamadı: Test işlemine bağlanılamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bu işlem hata ayıklama dışındaki bir çalıştırmanın bağlamında yapılamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İki uçtan erişimli kuyruğa yönelik kullanılabilir ara sunucu bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bulunamadı. Makinede dotnet’in yüklü olduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI’si '{0}' olan test yürütücüsü bulunamadı. Test yürütücüsünün yüklendiğinden ve .NET çalışma zamanı {1} sürümünü desteklediğinden emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} kimliğine sahip ara sunucu, geçerli oturum yöneticisi tarafından yönetilmiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1} içinde sunulan test çalışması filtresi `{0}` ile eşleşen test yok]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen '{0}' kaynaklarının hiçbiri geçerli değil. Yukarıdaki hataları/uyarıları düzeltin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dosya uzantıları bulunamadı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Eski bir Microsoft.NET.Test.Sdk sürümü kullanıyorsunuz. Lütfen 15.3.0 veya daha yeni bir sürüme geçin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} kimliğine sahip ara sunucu zaten var ve yeniden kuyruğa alınamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test bulma iptal edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} içinde hiç test yok. Test bulucuları ile yürütücülerinin kayıtlı olduğundan ve platform ile çerçeve sürümü ayarlarının uygun olduğundan emin olun ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestHost Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçerli olmayan bir veya daha fazla özellik içerdiğinden filtre ile eşleşen test yok ({0}). Geçerli değerleri ({1}) içeren bir filtre ifadesi belirtin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d2efd6eb44..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Konak işleminden beklenmedik şekilde çıkış yapıldığından etkin Test Çalıştırması durduruldu. Özel durumun kaynağı hakkında daha fazla bilgi almak için varsa yukarıdan çağrı yığınını inceleyin.]D;]A;Kilitlenme oluştuğunda çalışan test: ]D;]A;{0}]D;]A;Bu test, kilitlenmenin kaynağı olmayabilir veya olmayabilir.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen blame parametresi anahtarı {0} geçerli değil. Bu anahtar yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen blame parametresi anahtarı {0} yalnızca {1}/{2} değerlerini destekleyebilir. Bu anahtar yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Döküm toplama etkindi, ancak hiçbir döküm dosyası oluşturulmamıştı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - {1} dökümü oluşturuluyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bu işlem ağacının dökümü alınıyor (alttan)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen {0} {1} etkinlik dışı kalma süresi geçti. Testhost ve alt işlemlerinden askı dökümleri toplanıyor]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[dakika]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tüm testlerin çalışması tamamlandı. Dizi dosyası oluşturulmayacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İşlem dökümü başlatılamadı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gerekli ortam değişkeni PROCDUMP_PATH null veya boştu. PROCDUMP_PATH değişkenini uygun yürütülebilir procdump içeren klasörün yoluna ayarlayın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump etkindi, ancak döküm dosyası oluşturulmamıştı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[saniye]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zaman aşımı olarak beklenmeyen '{0}' değeri sağlandı. Lütfen şu biçimde bir değer girin: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a805927024..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML test sonuçları dosyası: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML Günlükçü Hatası: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[LogFileName ve LogFilePrefix parametreleri birlikte kullanılamaz. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 8596d82685..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametre 0’dan küçük olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametre null veya boş olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1} dizininde {0}(1),(2),... için boş bir ad alınamıyor. Lütfen bu dizini temizleyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{1} konumundaki '{2}' zaman damgası biçimi kullanılarak {0} için kullanılabilir bir dosya adı alınamıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[dağıtım öğesi '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[dağıtım öğesi '{0}' (çıktı dizini '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Ayarları belirtilmedi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin Test Ayarları içinde Çalıştırma Dağıtım Dizini tanımlanmıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sonuç bir test çalıştırmasıyla ilişkili değil. Devam eden veya tamamlanmış bir test çalıştırmasından alınmış bir sonucu kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen '{0}' dosya/dizin adı geçerli değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dosyalar şuradan eklenemedi: {0}]D;]A;Hata Ayrıntıları: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test çalıştırmasında '{0}' testi atlandı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[LogFileName ve LogFilePrefix parametreleri birlikte kullanılamaz. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yüklenen Tüm Sonuçlar]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bir Listede Olmayan Sonuçlar]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İptal edildi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tamamlandı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bağlantı kesildi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarısız]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sürüyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sonuçsuz]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yürütülmedi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırılamıyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı (çalıştırma iptal edildi)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bekliyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zaman aşımı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uyarı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sonuç Dosyası: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[UYARI: Sonuç dosyasının üzerine yazılıyor: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 91cdda7def..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametre null veya boş olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test çalıştırması, farklı çerçeve ve platform sürümleri için oluşturulmuş DLL'ler buldu. Aşağıdaki DLL'ler, {0} çerçevesi ve {1} platformu olan geçerli ayarlarla eşleşmiyor. {2}Bu ayarları yönetme hakkında daha fazla ayrıntı için {3} bölümüne gidin.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen ayarlar dosyası, gerekli biçime uymuyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen test kapsayıcılarının hiçbiri test çalıştırmasına ait Platform Mimarisi ve .NET Framework ayarlarıyla eşleşmiyor. Platform: {0} .NET Framework: {1}. Bu ayarları yönetmeye ilişkin ayrıntılar için bkz. http://go.microsoft.com/fwlink/?LinkID=330428.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}, {1} Çerçevesi ve {2} Platformu için derlenmiştir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 9c8c6154d8..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName tamamlanmadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Method sayısı sayısal bir değer olmalıdır]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' türünde '{0}' metodu bulunamadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} türü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName'den sonra beklenmeyen karakterler var (konum: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName'de boşluk geçersiz (konum: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index aa2fd3a1f7..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Parametre null veya boş olamaz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} dosyası yok.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nesne {0} türünde olmalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[İptal edildi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tamamlandı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bağlantı kesildi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarısız]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sürüyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sonuçsuz]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yürütülmedi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırılamıyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı (çalıştırma iptal edildi)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bekliyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zaman aşımı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uyarı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} türü için TypeConverter bulunamıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' düğümü bulunamadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen akıştan okunamadı. Bir akış okumayı desteklemiyorsa, akıştaki veriler gönderilemez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen '{0}' dosya adı şu geçersiz karakterleri içeriyor: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen '{0}' dosya adı ayrılmış.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' özelliği daha önce '{2}' olarak kaydedildiğinden '{1}' değer türü olarak kaydedilemiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Msdia Oturumu COM HResult '{0}' oluşturulamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Msdia yüklenemedi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' veri toplayıcı ayarlarında geçersiz URI.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırma ayarlarının kök düğümü 'RunSettings' olarak adlandırılmalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ayarları geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ayarları geçersiz. Beklenmeyen XmlAttribute: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ayarları geçersiz. Beklenmeyen XmlElement: '{1}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' ayarlarında geçersiz URI '{0}'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçersiz veri toplayıcı ayarları. Beklenen '{0}' özniteliği eksik. Normal bir veri toplayıcı ayarı şöyle görünmelidir: <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçersiz ayarlar '{0}'. FriendlyName, URI veya AssemblyQualifiedName değişkenlerinden en az biri bekleniyordu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirli bir test çalıştırması için TestCaseFilter belirtilemiyor. FilterCriteria yalnızca kaynakları olan bir çalıştırma içindir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bildirim sıklığı pozitif bir değer olmalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bildirim zaman aşımı sıfırdan büyük olmalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' çözüm dizini yok. Lütfen runsettings içinde belirtilen çözüm dizininin mevcut olduğundan ve dizin için okuma izinlerine sahip olduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' filtre dizesi tanınmayan atlatma sırası içeriyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sütun Numarası]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yürütücü URI’si]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dosya Yolu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kimlik]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Satır Numarası]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ad]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kaynak]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nitelikler]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  İleti: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarısız]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yok]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Atlandı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bilgisayar Adı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult Görünen Adı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Süre]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bitiş Saati]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata Sütun Numarası]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata İletisi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata Yığın İzlemesi]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sonuç]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başlangıç Saati]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Test İletileri:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' özelliğinin '{0}' test özelliği türü desteklenmiyor. Desteklenen özellik türlerinden birini (temel türler, uri, string, string[]5D;) seçin ve yeniden deneyin. ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index fbeebd454a..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aynı uzantının birden çok sürümü bulundu. En yüksek sürüm seçiliyor.]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{1}' mimarisi için '{0}' ana bilgisayarı bulunamadı.]D;]A;]D;]A;‘{1}’ .NET'i yükleyerek sorunu çözebilirsiniz.]D;]A;]D;]A;Belirtilen çerçeve şu konumda bulunamadı:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bulunamıyor. Lütfen test projenizi yayımlayın ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bulunamıyor. Test projesinin "Microsoft.NET.Test.Sdk" paketinde nuget başvurusu olduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 616b9ecae9..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırma ayarları XML dosyası "RunSettings" düğümünü içermiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ayarı geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' düğümü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['RunSettings' düğümü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ayarlar yüklenirken bir hata oluştu. Hata: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' hedef platform ayarları, '{1}' sistem mimarisiyle uyumlu değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Beklenmeyen ayarlar dosyası belirtildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index d09e531d2f..0000000000
--- a/Localize/lcl/tr/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Oturumunu Başlatma işlemi iptal edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Oturumunu Durdurma işlemi iptal edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin Test Çalıştırması Ekleri İşlemi durduruldu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin Test Bulma iptal edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Etkin Test Çalıştırması iptal edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console işleminden ileti alınamadı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} dosyası yok]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console işlemi anormal şekilde çıkış yaptı]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index acf7862eed..0000000000
--- a/Localize/lcl/tr/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Runsettings içinde zaten mevcut olan tüm Any LegacySettings düğümleri kaldırılacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings, ekli bir testSettings içermiyor ve geçirilmiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçirilen RunSettings dosyası şu konumda oluşturuldu: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zaman aşımları düğümünün agentNotRespondingTimeout, deploymentTimeout, scriptTimeout öznitelikleri desteklenmediğinden bunlar geçirilmeyecek.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçerli kullanım:]D;]A;SettingsMigrator.exe <Geçirilecek olan testsettings veya runsettings dosyasının tam yolu>]D;]A;SettingsMigrator.exe <Geçirilecek olan testsettings veya runsettings dosyasının tam yolu> <Oluşturulacak olan runsettings dosyasının tam yolu>]D;]A;Örnekler:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/tr/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/tr/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 374e2a3248..0000000000
--- a/Localize/lcl/tr/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="tr-TR" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ek Bilgi İletileri:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Mağazası uygulamalarına yönelik birim testleri için test çalıştırması başlatılamadı: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen test kapsayıcılarında test bulunamadı. Ayrıca, Microsoft Windows Mağazası Birim testi bağdaştırıcısı .appxbundle dosyalarını desteklemiyor. Uygulama Paketi oluştururken bir appx oluşturun (Uygulama paketi grubu oluştur seçeneğini Hiçbir Zaman olarak ayarlayın) ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test kapsamındaki bütünleştirilmiş kod bulunamıyor. Lütfen projenin oluşturulduğundan emin olun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ekler:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu Test Bulma Eklentileri kullanılabilir:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu Test Yürütmesi eklentileri kullanılabilir:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu Test Günlükçüsü Eklentileri kullanılabilir:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu Ayar Sağlayıcısı Eklentileri kullanılabilir:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/BatchSize bağımsız değişkeni toplu iş boyutunu gerektirir. Örnek: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame için CollectDump seçeneğine göre kilitlenme bilgi dökümlerinin toplanması bu platform için desteklenmiyor.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame için TestTimeout ile CollectDump seçeneğine göre asılı kalma bilgi dökümlerinin toplanması bu platform için desteklenmiyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame ile belirtilen blame parametresi {0} geçerli değil. Bu parametre yoksayılıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      Geçici çıkışları içeren dizin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[BuildBasePath bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings bağımsız değişkenleri:]D;]A;      Komut satırı aracılığıyla runsettings yapılandırmalarını geçirmek için kullanılan bağımsız değişkenler. Bağımsız değişkenler "-- " karakterlerinden sonra [ad]5D;=[değer]5D; biçiminde ad-değer çifti olarak belirtilebilir. -- karakterlerinden sonra boşluk olduğuna dikkat edin. ]D;]A;      Birden fazla [ad]5D;=[değer]5D; çiftini ayırmak için bir boşluk kullanın.]D;]A;      RunSettings bağımsız değişkenleri desteği hakkında daha fazla bilgi: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Null veya boş olamaz]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Test çalıştırması için veri toplayıcıyı etkinleştirir. Daha fazla bilgi: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect: Test çalıştırmasını yapılandırmak için test ayarları kullanıldığında "{0}" desteklenmez.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[, {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bilgi: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uyarı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      Projenin derleme nedeni olan yapılandırma (Debug/Release)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Telif Hakkı (c) Microsoft Corporation. Tüm hakları saklıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Veri Toplayıcı kolay adı '{0}' geçerli değil. Veri Toplayıcı yoksayılacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Gün]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata Ayıklama İzleme İletileri:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu bağlantı noktası üzerinde DesignModeClient için bağlantı veya işleme isteği zaman aşımı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Örnek: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kod kapsamı Windows Mağazası uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kod kapsamı Windows Phone uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Tanılama veri bağdaştırıcısı ayarlarının okunması çalışan bir '{0}' oluşturdu. Tüm tanılama veri bağdaştırıcıları bu çalıştırmada atlanacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Mağazası uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen kaynaklar için bulma başarısız oldu. Özel durum: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" parametresi yalnızca bir kez belirtilmelidir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Testi blame modunda çalıştırır. Bu seçenek, test ana bilgisayarının kilitlenmesine neden olan sorunlu testin ayrı tutulmasını sağlar.]D;]A;      Geçerli dizinde, kilitlenmeden önce testin yürütülme düzenini yakalayan,]D;]A;      “Sequence.xml” adlı bir çıkış dosyası oluşturur. ]D;]A;      İsteğe bağlı olarak test ana bilgisayarının işlem dökümünü çıkarmayı seçebilirsiniz.]D;]A;      Dökümü çıkarmayı seçtiğinizde, kilitlenme durumunda varsayılan olarak bir mini döküm çıkarılır.]D;]A;      Dilerseniz bazı isteğe bağlı parametrelerle bu varsayılan davranışı geçersiz kılabilirsiniz:]D;]A;      CollectAlways - Kilitlenme olmasa da her çıkışta döküm çıkarma (true/false) ]D;]A;      DumpType - Döküm türünü belirtme (mini/full).]D;]A;      Örnek: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      Test çalıştırması için 'CodeCoverage' veri toplayıcısını etkinleştirir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Günlük dosyası yolu>]D;]A;      Test platformu için günlükleri sağlayın.]D;]A;      Günlükler sağlanan dosyaya yazılır.]D;]A;]D;]A;Günlükler için izleme düzeyini aşağıda gösterildiği gibi değiştirin]D;]A;      Örnek: /Diag:<Günlük dosyası yolu>; tracelevel=<Varsayılan olarak "ayrıntılı" değerini alır>]D;]A;      tracelevel için izin verilen değerler: kapalı, hata, uyarı, bilgiler ve ayrıntılı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Günlükçü URI/FriendlyName>]D;]A;      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir ]D;]A;      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=<Varsayılan olarak benzersiz dosya adını alır>]5D;]D;]A;      İlgili LogFileName ile TestResults dizininde dosya oluşturur.]D;]A;]D;]A;      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin]D;]A;      Örnek: /logger:console;verbosity=<Varsayılan olarak "minimal" değerini alır>]D;]A;      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.]D;]A;]D;]A;      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin]D;]A;      Örnek: /logger:console;prefix=<Varsayılan olarak "false" değerini alır>]D;]A;      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Günlükçü URI/FriendlyName>]D;]A;      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir ]D;]A;      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=<Varsayılan olarak benzersiz dosya adını alır>]5D;]D;]A;      İlgili LogFileName ile TestResults dizininde dosya oluşturur.]D;]A;]D;]A;      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin]D;]A;      Örnek: /logger:console;verbosity=<Varsayılan olarak "normal" değerini alır>]D;]A;      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.]D;]A;]D;]A;      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin]D;]A;      Örnek: /logger:console;prefix=<Varsayılan olarak "false" değerini alır>]D;]A;      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Bir ortam değişkeninin değerini ayarlar. Değişken mevcut değilse oluşturur, varsa geçersiz kılar. Bu, /InIsolation anahtarını kapsar ve testleri yalıtılmış bir işlemde çalıştırılmaya zorlar.]D;]A;      ]D;]A;      Birden çok değişken sağlamak için bu bağımsız değişken birden çok kez belirtilebilir.]D;]A;]D;]A;      Örnek: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' ortam değişkeni zaten tanımlandı, ancak -Environment bağımsız değişkeni tarafından geçersiz kılındı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hata İletisi:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  Testleri çalıştırmak için:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  Testleri veri toplayıcılar gibi ek ayarlarla çalıştırmak için:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' uzantısının örneği oluşturulurken özel durum oluştu: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Toplam süre: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarısız]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Framework35 desteklenmiyor. İçin hedefleme .net Framework 3.5, test CLR 4.0 "uyumluluk moduna" çalışacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Framework Sürümü>]D;]A;      Test yürütme için kullanılacak hedef .Net Framework sürümü. ]D;]A;      Geçerli değerler: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" vb.]D;]A;      Diğer desteklenen değerler: Framework40, Framework45, FrameworkCore10 ve FrameworkUap10.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Framework bağımsız değişkeni test çalıştırması için hedef .NET Framework sürümünü gerektirir. Örnek: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Bu kullanım iletisini görüntüler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bağımsız değişkenler:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Açıklama: Belirtilen dosyalardan testleri çalıştırır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Seçenekler:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kullanım: vstest.console.exe [Bağımsız Değişkenler]5D; [Seçenekler]5D; [[--]5D; <RunSettings bağımsız değişkenleri>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Saat]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation bayrağı kullanım dışı bırakıldı. Testler her zaman ayrı bir işlem içinde çalıştırılır]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Testleri yalıtılmış bir işlemde çalıştırır. Bu, vstest.console.exe ]D;]A;      işleminin testlerdeki bir hata nedeniyle durdurulması olasılığını azaltır, ]D;]A;      ancak testler daha yavaş çalışabilir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bağımsız değişkeni geçersiz. Lütfen geçerli bağımsız değişkenlerin listesini denetlemek için /help seçeneğini kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} toplu iş boyutu geçersiz. Toplu iş boyutu sıfırdan büyük olmalıdır. Örnek: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame bağımsız değişkeni '{0}' geçerli değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen yapılandırma geçersiz.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag bağımsız değişkeni '{0}' geçerli değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Diag dosya yolu '{0}' geçerli değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bağımsız değişkeni 'EnableCodeCoverage' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /EnableCodeCoverage) ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçersiz .NET Framework sürümü:{0}. Lütfen TargetFramework tam adını (Örnek: .NETCoreApp,Sürüm=v2.0) belirtin. Desteklenen diğer .NET Framework sürümleri Framework40, Framework45, FrameworkCore10 and FrameworkUap10’dur.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bağımsız değişkeni 'InIsolation' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /InIsolation) ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Logger bağımsız değişkeni '{0}' geçerli değil.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bağımsız değişkeni 'Parallel' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /Parallel) ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId bağımsız değişkeni, işlem kimliğinin tamsayı olmasını gerektirir. Bu işlemi başlatan üst işlemin işlem kimliğini belirtin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçersiz platform türü: {0}. Geçerli platform türleri şunlardır: {1}.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port bağımsız değişkeni tamsayı olan bir bağlantı noktası numarası gerektirir. Yuva bağlantısına ve olay iletilerini almaya yönelik bağlantı noktasını belirtin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['ResultsDirectory' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter bağımsız değişkeni /Tests ile belirtilemez. Testler belirtildiğinde test örneklerinin filtrelemesi geçerli değildir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' test çalıştırması parametre bağımsız değişkeni geçersiz. Lütfen aşağıdaki biçimi kullanın.]D;]A;     Biçim: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} bağımsız değişkeni 'UseVsixExtensions' komutunda beklenmiyor. Komutta vsix uzantılarının kullanılacağını veya atlanacağını belirtin (Örnek: vstest.console.exe myTests.dll /UseVsixExtensions:true) ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      Yüklü test bulucuları listeler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      Yüklü test yürütücülerini listeler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      Yüklü test günlükçülerini listeler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      Yüklü test ayarları sağlayıcılarını listeler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Şu Testler kullanılabilir:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<Dosya Adı>]D;]A;      Verilen test kapsayıcısında bulunan tüm testleri listeler.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen {0} dosyası salt okunur]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Sağlanan bir veya daha fazla runsettings geçersiz belirteç içeriyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Test Yürütmesi Komut Satırı Aracı Sürüm {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dakika]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test kaynak dosyası belirtilmedi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' içinde belirtilen '{0}' yolu hiçbir test bağdaştırıcısı içermiyor; geçerli bir yol belirtin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" parametresi tanınmıyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bağımsız değişken belirtilmedi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Mağazası uygulamalarına yönelik birim testlerini çalıştırmak için Windows Mağazası uygulaması Birim Testi Kitaplığı projesini kullanarak uygulama paketini oluşturun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toplam {0} test bulundu, ancak belirtilen ölçütlerle eşleşen test yok({1}). Doğru değerleri kullanın ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} içinde hiç test yok. Yüklü test bulucuları ve yükleyicileri, platform ve çerçeve sürümü ayarlarının uygun olmasına dikkat edin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}, {1}/{2} için derlendi. Bir çalıştırmada belirtilen test bütünleştirilmiş kodu ortak bir hedef .NET framework ve platforma sahip olmalıdır.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hiçbiri]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırılmadı]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' yanıt dosyası açılırken hata oluştu]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Çıkış>]D;]A;      Çalıştırılacak ikili dosyaları içeren dizin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çıkış yolu bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      Testlerin paralel olarak yürütülmesini belirtir. Varsayılan olarak]D;]A;      makine üzerindeki tüm mevcut çekirdekler kullanılabilir.]D;]A;      Kullanılacak çekirdek sayısı bir ayarlar dosyası kullanılarak yapılandırılabilir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Geçerli işlemi başlatmadan sorumlu Üst İşlemin işlem kimliği.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Başarılı]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone uygulamasına yönelik testler için test çalıştırması başlatılamadı: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Phone uygulamalarına yönelik birim testlerini çalıştırmak için Windows Phone Birim Testi Uygulaması projesini kullanarak uygulama paketini oluşturun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Platform türü>]D;]A;      Test yürütmesi için kullanılacak hedef platform mimarisi. ]D;]A;      Geçerli değerler x86, x64 ve ARM'dir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Platform bağımsız değişkeni, test çalıştırması için hedef platform türünün belirtilmesini gerektirir. Örnek: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Bağlantı Noktası>]D;]A;      Yuva bağlantısı ve olay iletilerini almaya yönelik Bağlantı Noktası.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test çalıştırması devam ediyor]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} Yolu yok.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<dosya>]D;]A;      Daha fazla seçenek için yanıt dosyasını okuyun.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Mevcut değilse test sonuçları dizini belirtilen yolda oluşturulacak.]D;]A;      Örnek /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ResultsDirectory parametresi test sonuçlarının kaydedileceği bir değer gerektirir. Örnek:  /ResultsDirectory:c:\TestSonuçlarıDizinim]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Ayarlar Dosyası>]D;]A;      Testleri çalıştırırken kullanılacak ayarlar.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' Ayarlar dosyası bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Settings parametresi bir ayarlar dosyasının belirtilmesini gerektirir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testleri çalıştırmak için yalnızca bir uygulama paketi (.appx dosyası) belirtilebilir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Test Adları>]D;]A;      Sağlanan değerlerle eşleşen adlara sahip testleri çalıştırır. Birden çok]D;]A;      değer sağlamak için, değerleri virgülle ayırın.]D;]A;      Örnekler: /Tests:TestYöntemi1]D;]A;                /Tests:TestYöntemi1,testYöntemi2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Belirtilen dosyalardaki veya joker karakter desenindeki testleri çalıştırın. Birden çok test dosyası adını veya desenini]D;]A;      boşluklarla ayırın. Eşleşen test dosyalarını görüntülemek için konsol günlükçüsü ayrıntı düzeyini ayrıntılı olarak ayarlayın.]D;]A;      Örnekler: testprojem.dll]D;]A;                testprojem.dll diğertestprojem.exe]D;]A;                testprojem*.dll diğer*projem.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çalıştırma ayarları aracılığıyla yapılandırılan Kod Kapsamı ve Microsoft Fakes dışındaki veri toplayıcılar, ekli test ayarlarında desteklenmiyor. Daha fazla bilgi için bkz. https://aka.ms/vstest-configure-datacollector. Çalıştırma ayarları: {0}.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[,]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Saniye]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Atlandı]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toplam {0} test bulundu, ancak bazı testler belirtilen ölçütlerle eşleşmiyor({1}). Doğru değerleri kullanın ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Tests bağımsız değişkeni, alt dizelerinde bir veya daha fazla belirli test adının olmasını gerektirir.]D;]A;       Örnekler: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Yığın İzleme:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test bulma başlatılıyor, lütfen bekleyin...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test yürütmesi başlatılıyor, lütfen bekleyin...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standart Hata İletileri:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Standart Çıkış İletileri:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Buna ek olarak, test bağdaştırıcıları yolu /TestAdapterPath komutu kullanılarak belirtilebilir. Örnek /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Desteklenen Dosya Türleri:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0},]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Mağazası uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testleri test çalıştırması için etkili Platformun:{0} ve .NET Framework:{1} ayarlarının gerektirdiği şekilde çalıştırmak için Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[runsettings içinde tanılama veri bağdaştırıcıları etkinleştirildiğinden testleri çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen özel test bağdaştırıcısı arama yolu bulunamadı; geçerli bir yol belirtin ve yeniden deneyin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      Bu, vstest.console.exe işleminin test çalıştırmasında verilen yoldan]D;]A;      (varsa) özel test bağdaştırıcılarını kullanmasını sağlar. ]D;]A;      Örnek  /TestAdapterPath:<özelBağdaştırıcılarınYolu>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestAdapterPath parametresi, özel test bağdaştırıcıları içeren bir konumun yolu olan değeri gerektirir. Örnek:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<İfade>]D;]A;      Verilen ifadeyle eşleşen testleri çalıştırır.]D;]A;      <İfade>, <özellik>İşleç<değer>[|&<İfade>]5D; biçimindedir;]D;]A;         burada İşleç =, != veya ~ simgelerinden biridir (~ İşleci 'içerir']D;]A;         anlamına gelir ve DisplayName gibi dize özelliklerine uygulanabilir).]D;]A;         Alt ifadeleri gruplandırmak için ayraç () kullanılabilir.]D;]A;      Örnekler: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(TamAd~Gece]D;]A;                                  |Name=TestYöntemim)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter bağımsız değişkeni filtre değeri gerektirir.]D;]A;        Filtre değeri <özellik>=<değer> türünde olabilir.]D;]A;        Örnekler: "Priority=1", "TestCategory=Gece"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Çalıştırması Durduruldu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Çalıştırması {0} hatasıyla durduruldu.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Çalıştırması İptal Edildi.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Çalıştırması Başarısız.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Test Çalıştırması Başarılı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - Başarısız: {1}, Başarılı: {2}, Atlanan: {3}, Toplam: {4}, Süre: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Başarısız: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toplam test sayısı: Bilinmiyor]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     Geçti: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    Atlandı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toplam test sayısı: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testleri çalıştırmak için {0} çerçevesi kullanılıyor. Bu uyarıyı kapatmak için /Framework:{1} değerini belirtin.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Belirtilen "{0}" test kaynak dosyası bulunamadı.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Toplam {0} test dosyası belirtilen desenle eşleşti.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Geçen süre:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        Varsayılan Yürütücü URI’si: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions kullanımdan kaldırılıyor. Lütfen bunun yerine /TestAdapterPath kullanın.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      Bu işlem vstest.console.exe işleminin test çalıştırmasında yüklü VSIX ]D;]A;      uzantılarını (varsa) kullanmasını veya atlamasını sağlar. ]D;]A;      Örnek /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions parametresi bir değer gerektiriyor. Değer 'true' ise test çalıştırmasında yüklü VSIX uzantıları (varsa) kullanılır. Değer false ise uzantılar yoksayılır. Örnek: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Vstest Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 5aca68b1b1..0000000000
--- a/Localize/lcl/zh-Hans/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[从事件日志“{0}”中收集最后的条目时出现异常: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[事件日志数据收集器找不到数据收集上下文的事件日志上下文: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[事件日志“{0}”出现异常，某些事件可能已丢失。错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[“{0}”事件日志可能在收集期间已被清除；某些事件可能还未被收集]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法从计算机“{1}”中读取事件日志“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index cf76b01fee..0000000000
--- a/Localize/lcl/zh-Hans/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[没有可用的代码覆盖率数据。代码覆盖率目前仅在 Windows 上受支持。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[目录 {0} 创建失败，出现错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法初始化代码覆盖率 datacollector，出现错误: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未收到来自 CodeCoverage.exe 的运行事件。请查看事件日志，了解失败原因。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能在 {0} 秒内接收到来自 CodeCoverage.exe 的运行事件，出现此问题可能是因为计算机性能较低，请设置环境变量 {1}，增加超时时间值。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法在 {0} 中找到 CodeCoverage.exe]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 7feb9fab29..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 不完整]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无效转义序列! (段: {0}，位置: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[方法参数数量必须是数值]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[类型“{1}”上找不到方法“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[该段末尾应使用右单引号! (段: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到类型“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 末尾后面有不需要的字符(位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 中空白无效(位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未在此平台上实现 "{0}.{1}"!]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 95d3258ad3..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[完成的生成。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已开始生成，请等待...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在跳过项目 {0} 的运行测试。若要使用 dotnet test 运行 dotnet 测试，请向项目文件添加 "<IsTestProject>true</IsTestProject>" 属性。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} ({1})的测试运行]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: 将 Microsoft.NET.Test.Sdk 包引用更新为版本 15.8.0 或更高版本，以便收集代码覆盖率。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 31afea6d7d..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[由于初始状态无效，无法执行测试运行。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[对于此运行，未找到适合的测试运行时提供程序。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[中止测试运行: 测试运行超时时间超出 {0} 毫秒。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[没有活动的测试运行时不允许等待完成操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 4ac31bd1ae..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。有关详细信息，请查看错误消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[按要求取消该操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器“{0}”未能提供初始化信息。错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在类型加载、构造或初始化期间，数据收集器“{0}”引发了异常: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器“{0}”消息: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到数据收集器“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器“{0}”已请求具有将在测试执行环境中设置的值“{2}”的环境变量“{1}”，但另一个数据收集器“{3}”已请求具有其他值“{4}”的同一环境变量。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试扩展 URI“{0}”重复。忽略重复的扩展。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名为“{0}”的设置提供程序重复。忽略重复的提供程序。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名为“{0}”的运行设置部分重复。请忽略重复的设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 空括号 ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到已安装的单元测试扩展列表。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能从文件 "{0}" 加载扩展。有关详细信息，请使用 /diag。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[创建“快”筛选器时遇到错误。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[有多个配置的数据收集器 FriendlyName 为“{0}”。测试运行中将忽略重复的配置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[内部异常:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 无效条件“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试扩展具有无效的 URI“{0}”: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 运算符“{0}”无效]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[初始化带有 {0} 的记录器时发生异常: "{1}"。将不会使用该记录器。异常: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 AssemblyQualifiedName、URI 或 FriendlyName 为 "{0}" 的测试记录器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试记录器 URI“{0}”无效。将忽略该测试记录器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 缺少 ")"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 缺少 "("]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: 缺少操作数]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[缺少运算符 '|' 或 '&']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器已捕获类型为“{0}”的异常:“{1}”。更多详细信息: {2}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已加载运行设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[加载运行设置时出错。错误: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定了无效的设置节点。设置节点的名称属性必须为非空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[初始化名为“{0}”的设置提供程序时出错。错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到名为“{0}”的设置提供程序。无法加载设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[堆栈跟踪:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter {0} 的格式不正确。请指定正确的格式并重试。请注意，格式不正确会导致不执行任何测试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到友好名称为“{0}”的 datacollector。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此选项仅适用于作为 Visual Studio 一部分安装的 vstest.console.exe。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[从数据收集上下文派生的类型不能用于发送数据和消息。 用于发送数据和消息的 DataCollectionContext 必须来自向数据收集器引发的某个事件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e88a2dc32a..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试发现已中止。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试运行已中止。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法将调试程序附加到默认测试主机。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[现有连接被远程主机强制关闭。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 进程未能在 {2} 秒后连接到 {1} 进程。出现此问题可能是因为计算机性能较低，请设置环境变量 {3}，增加超时时间值。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试主机进程崩溃]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法与测试宿主进程通信。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[收到意外消息。意外 MessageType: {0} 实际 MessageType: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[协议版本检查失败。请确保测试运行程序和主机兼容。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能协商协议，等待响应在 {0} 秒后超时。出现此问题可能是因为计算机性能较低，请设置环境变量 {1}，增加超时时间值。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 08667df9ec..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数不能为 NULL 或为空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[信息: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数不能为空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数不能为负。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数都必须具有以下类型: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数具有以下属性: {0}，且不能为空字符串。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数具有以下属性: {0}，且不能为负。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数具有以下属性: {0}，且不能为 null。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的参数具有以下属性: {0}。此属性必须具有以下类型: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[处理“{0}”队列中的作业时发生未处理的异常: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到“{0}”主机。请确保计算机上已安装“{0}”且位于 PATH 环境变量中。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已处置 {0} 队列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[暂停时无法处置 {0} 队列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[获取进程名称时出错。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index e1e1bc40a1..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法将调试程序附加到进程 ID 为“{0}”的默认测试主机。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[启用 DataCollector 调试。请将调试器附加到 datacollector 进程以继续。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[适配器查找正在发生更改，请转到 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap 以了解详细信息。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[实例化发现器时发生异常: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到了多个具有同一 URI“{0}”的测试适配器。忽略适配器“{1}”。请卸载冲突的适配器以避免此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[忽略指定的重复源“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试发现器“{0}”加载测试时发生异常。异常: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[调用的执行器“{0}”时发生异常: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[框架 {0} 不支持 ExecutionThreadApartmentState 选项。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能启动测试主机，错误为 {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到文件 {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[启用主机调试。请将调试器附加到 testhost 进程以继续。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[忽略与测试发现器 {0} 对应的测试执行器，因为该发现器不具有 DefaultExecutorUri 特性。可能需要重新安装测试适配器外接程序。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能初始化客户端代理: 无法连接到测试过程。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[非调试运行的上下文中不允许此操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到用于取消排队的可用代理。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 {0}。请确保计算机上安装了 dotnet。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 URI 为“{0}”的测试执行器。请确保安装了测试执行器且该执行器支持.net 运行时版本 {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID 为 {0} 的代理不受当前会话管理器管理。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[没有测试匹配 {1} 中的给定用例测试筛选器“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无有效的指定源“{0}”。请修复以上错误/警告，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到扩展名: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[你使用的是旧版 Microsoft.NET.Test.Sdk。请迁移到 15.3.0 及更高版本。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID 为 {0} 的代理已可用，无法重新排队。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已取消测试发现。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 中没有可用测试。请确保已注册测试发现器和执行器且平台和框架版本设置合理，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在文件 {0} 中记录 TestHost 诊断]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[没有与筛选器匹配的测试，因为该筛选器包含一个或多个无效属性 ({0})。请指定包含有效属性 ({1}) 的筛选器表达式。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index db66f9a5f1..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试运行已中止，因为主机进程意外退出。请检查上面的调用堆栈(如果有)，以获取有关异常来源的详细信息。]D;]A;发生崩溃时运行的测试: ]D;]A;{0}]D;]A;此测试可能是(也可能不是)崩溃的来源。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的追责参数键 {0} 无效。忽略此键。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[追责参数键 {0} 只支持值 {1}/{2}。忽略此键。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[收集转储已启用，但是未生成转储文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在转储 {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在转储此进程树(从底部)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的非活动时间({0} {1})已过。正在从测试主机及其子进程中收集挂起的转储]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分钟]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所有测试都已运行完毕，将不生成序列文件]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[All tests finished running, Sequence file will not be generated.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法启动进程转储: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所需环境变量 PROCDUMP_PATH 为空。请将 PROCDUMP_PATH 设为包含适当的可执行进程转储的文件夹路径。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump 已启用，但是未生成转储文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供了意外的值“{0}”作为超时。请按以下格式提供值: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 150c853549..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML 测试结果文件: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[HTML 记录器错误: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 LogFileName 和 LogFilePrefix 不能一起使用。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 4c5605c158..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数不能小于 0。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数不能为 NULL 或为空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法为目录 {1} 中的 {0}(1),(2),... 获取可用名称。请清理此目录。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法在 {1} 处为 {0} 找到使用时间戳格式“{2}”的可用文件名。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[部署项“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[部署项“{0}”(输出目录“{1}”)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定测试设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试设置未定义运行部署目录。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[结果与测试运行不关联。请使用获取自正在进行或已完成的测试运行的结果。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的文件/目录名称“{0}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能从以下位置附加文件: {0}]D;]A;错误详细信息: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在测试运行中跳过测试“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 LogFileName 和 LogFilePrefix 不能一起使用。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所有已加载的结果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[列表中未列出的结果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[完成]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已断开连接]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失败]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在进行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无结论]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未执行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不可运行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过(运行已中止)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[待定]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[超时]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[结果文件: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: 正在覆盖结果文件: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 81d40cdc07..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数不能为 NULL 或为空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行检测到为不同框架和平台版本构建的 DLL。后面的 DLL 与当前设置(即 {0} 框架和 {1} 平台)不匹配。{2}如需了解如何管理这些设置，请转到 {3}。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的设置文件不符合格式要求。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的所有测试容器均与用于测试运行的平台体系结构和 .Net Framework 设置不匹配。平台: {0}。.Net Framework: {1}。有关管理这些设置的详细信息，请转到http://go.microsoft.com/fwlink/?LinkID=330428。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 适用于 {1} 框架和 {2} 平台。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index dd5343271e..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 不完整]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[方法参数数量必须是数值]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[类型“{1}”上找不到方法“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到类型“{0}”]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 末尾后面有不需要的字符(位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 中空白无效(位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 88282d38dc..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数不能为 NULL 或为空。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[文件 {0} 不存在。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[对象必须为类型 {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[完成]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已断开连接]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失败]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在进行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无结论]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未执行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不可运行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过(运行已中止)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[待定]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[超时]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到类型 {0} 的 TypeConverter。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到“{0}”节点]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法从所提供的流读取。无法发送流中的数据，除非该流支持读取。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的文件名“{0}”包含以下无效字符:“{1}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所提供的文件名“{0}”是保留文件名。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法将属性“{0}”注册为值类型“{1}”，因为已将它注册为“{2}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能创建 msdia 会话 COM HResult“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能加载 msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器设置“{0}”中的 URI 无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[必须将运行设置的根节点命名为 "RunSettings"。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[设置“{0}”无效。为“{2}”指定的值“{1}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[设置“{0}”无效。意外的 XmlAttribute:“{1}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[设置“{0}”无效。意外的 XmlElement:“{1}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[设置 "{1}" 中的 URI "{0}" 无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器设置无效。缺少所需的特性“{0}”。典型数据收集器设置将类似于 <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无效设置 "{0}"。按照预期，在 friendlyName、URI 和 assemblyQualifiedName 中至少存在一个 XmlAttribute。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不能为特定测试运行指定 TestCaseFilter。FilterCriteria 仅用于与源一起运行。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知频率需为正值。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知超时值必须大于零。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[解决方案目录“{0}”不存在。请确保在 runsettings 中指定的解决方案目录存在并且具有对该目录的读取权限。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[筛选器字符串“{0}”包含无法识别的转义序列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[列号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[执行器 URI]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[文件路径]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ID]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[行号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名称]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[源]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[特征]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  消息: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失败]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已跳过]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[计算机名]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult 显示名称]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[持续时间]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[结束时间]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误列号]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误消息]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误堆栈跟踪]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[结果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[开始时间]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  测试消息:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不支持属性“{1}”的测试属性类型“{0}”。使用一种支持的属性类型(基元类型、URI、字符串和 string[]5D;)，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index ea969cdf0b..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到多个具有相同扩展的版本。请选择最高版本。]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到“{1}”体系结构的“{0}”主机。]D;]A;]D;]A;你可以通过安装“{1}”.NET 来解决该问题。]D;]A;]D;]A;可以在以下位置找到指定的框架:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法找到 {0}。请发布测试项目并重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法找到 {0}。确保测试项目具有包 "Microsoft.NET.Test.Sdk" 的 nuget 引用。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 88f2796e35..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[运行设置 XML 不包含 "RunSettings" 节点。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[设置“{0}”无效。为“{2}”指定的值“{1}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 "RunSettings" 节点。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 "RunSettings" 节点。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[加载设置时出错。错误: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[目标平台设置“{0}”与系统体系结构“{1}”不兼容。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定了意外的设置文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3ecdf00473..0000000000
--- a/Localize/lcl/zh-Hans/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止启动测试会话操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止停止测试会话操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止正在进行的测试运行附件处理操作。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试发现已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[活动的测试运行已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未能从 vstest.console 进程接收消息]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[文件 {0} 不存在]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console 进程异常退出]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 32fbfe0a8a..0000000000
--- a/Localize/lcl/zh-Hans/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已经存在于 runsettings 中的任何 LegacySettings 节点都将被删除。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 不包含嵌入的 testSettings，不会迁移。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已迁移的 RunSettings 文件已在 {0} 中创建]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Timeouts 节点的属性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 不受支持，因此不会迁移它们。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[有效用法:]D;]A;SettingsMigrator.exe<Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hans/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hans/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0a2810f968..0000000000
--- a/Localize/lcl/zh-Hans/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-CN" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[其他信息性消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法启动针对 Windows 应用商店应用的单元测试的测试运行: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在指定测试容器中找不到任何测试。此外，Microsoft Windows 应用商店单元测试适配器不支持 .appxbundle 文件。在创建应用包时创建一个 appx (将“生成应用程序包”选项设置为“从不”)并重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试下找不到程序集。请确保已生成该项目。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[附件:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以下测试发现外接程序可用:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以下测试执行外接程序可用:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以下测试记录器加载项可用:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以下设置提供程序外接程序可用:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/BatchSize 参数要求批的大小。示例: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此平台不支持通过 CollectDump for Blame 选项收集故障转储。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此平台不支持通过 CollectDump with TestTimeout for Blame 选项收集挂起转储。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[追责时指定的追责参数 {0} 无效。忽略此参数。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      包含临时输出的目录。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 BuildBasePath，请提供有效的路径，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 参数:]D;]A;      通过命令行传递 runsettings 配置的参数。参数可以指定为名称-值对，其形式为“-- ”后跟 [名称]5D;=[值]5D;。请注意 -- 后的空格。]D;]A;      使用空格分隔多个 [名称]5D;=[值]5D;.]D;]A;      有关 RunSettings 参数支持的详细信息，请访问: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不能为 NULL 或为空]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      启用数据收集器以运行测试。可在此处获取详细信息: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/如果使用测试设置配置了测试运行，则不支持收集:“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[、{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[信息: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      项目为调试/发布等生成的配置]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[版权所有 (C) Microsoft Corporation。保留所有权利。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[数据收集器友好名称“{0}”无效。将忽略数据收集器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[天]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[调试跟踪消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[连接或处理端口 {0} 上 DesignModeClient 的请求超时]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     示例: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[代码覆盖率不适用于 Windows 应用商店应用。已对此测试运行跳过代码覆盖率分析。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[代码覆盖率不适用于 Windows Phone 应用。已为此测试运行跳过代码覆盖率分析。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[读取诊断数据适配器设置引发了“{0}”的运行。将在此运行中跳过所有诊断数据适配器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[为 Windows 应用商店应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[为 Windows Phone 应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[针对给定源的发现失败。异常: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[应只提供一次参数“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      在追责模式下运行测试。此选项有助于隔离导致测试主机崩溃的问题测试。]D;]A;      它会在当前目录中创建一个输出文件 "Sequence.xml"，]D;]A;      用于在崩溃之前捕获测试的执行顺序。]D;]A;      可以根据需要选择收集测试主机的进程转储。]D;]A;      选择收集转储时，默认情况下，将在崩溃时收集小型转储。]D;]A;      还可选择通过一些可选参数覆盖此默认行为:]D;]A;      CollectAlways - 若无崩溃则在退出时收集转储(true/false)]D;]A;      DumpType - 指定转储类型(小型/完整)。]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      启动数据收集器“CodeCoverage”以运行测试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      启用测试平台的日志。]D;]A;      日志将写入所提供的文件。]D;]A;]D;]A;      更改日志的跟踪级别，如下所示]D;]A;      示例: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      允许的 tracelevel 的值: off、error、 warning、info 和 verbose。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      为测试结果指定一个记录器。例如，若要将结果记录到]D;]A;      Visual Studio 测试结果文件(TRX)中，请使用 /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      使用给定的  LogFileName 在 TestResults 目录中创建文件。]D;]A;]D;]A;     更改控制台记录器的日志消息中的详细程度，如下所示]D;]A;      示例: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      允许的详细程度的值: quiet、minimal、normal 和 detailed。]D;]A;]D;]A;      更改控制台记录器的诊断级别前缀，如下所示]D;]A;      示例: /logger:console;prefix=<Defaults to "false">]D;]A;      此处为控制台记录器的详细信息: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      为测试结果指定一个记录器。例如，若要将结果记录到 ]D;]A;       Visual Studio 测试结果文件(TRX)中，请使用/logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      使用给定的  LogFileName 在 TestResults 目录中创建文件。]D;]A;]D;]A;     更改控制台记录器的日志消息中的详细程度，如下所示]D;]A;      示例: /logger:console;verbosity<Defaults to "normal">]D;]A;      允许的详细程度的值: quiet、minimal、normal 和 detailed。]D;]A;]D;]A;      更改控制台记录器的诊断级别前缀，如下所示]D;]A;      示例: /logger:console;prefix=<Defaults to "false">]D;]A;      此处为控制台记录器的详细信息: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/环境:<NAME>=<VALUE>]D;]A;      设置环境变量的值。如果该变量不存在，则创建它；如果它已存在，则替代它。这将表示 /InIsolation 开关并强制在隔离的进程中运行测试。]D;]A;      ]D;]A;      可多次指定此参数来提供多个变量。]D;]A;]D;]A;      示例: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[环境变量“{0}”已定义，但它被 -Environment 参数替代。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[错误消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ 运行测试:]D;]A;  >vstest.console.exe tests.dll ]D;]A; 使用其他设置(如数据收集器)运行测试:]D;]A;  >vstest.console.exe tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[实例化扩展“{0}”时出现异常: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[总时间: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失败]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未找到“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不支持 Framework35。对于面向 .Net Framework 3.5 的项目，将在 CLR 4.0“兼容性模式”中运行测试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      用于执行测试的目标 .Net Framework 版本。]D;]A;      有效值为 ".NETFramework,Version=v4.5.1".NETCoreApp,Version=v1.0" 等。]D;]A;      其他支持的值为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Framework 参数要求用于测试运行的目标 .Net Framework 版本。示例: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      显示此用法信息。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[说明: 从指定的文件运行测试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[选项:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[用法: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[小时]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation 标志已弃用。测试始终在单独的进程中运行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      在独立进程中运行测试。虽然这可使 vstest.console.exe ]D;]A;      进程在测试出现错误时停止的可能性较小，但是测试的]D;]A;      运行速度会较慢。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 {0} 无效。请使用 /help 选项检查有效参数的列表。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[批大小 {0} 无效。批大小应大于零。示例: /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[追责参数“{0}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[给定的配置无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[诊断参数“{0}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[诊断文件路径“{0}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 {0} 不应出现在 "EnableCodeCoverage" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /EnableCodeCoverage)，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无效的 .Net Framework 版本: {0}。请提供 TargetFramework 的全名(示例: .NETCoreApp,Version=v2.0)。其他支持的 .Net Framework 版本为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 {0} 不应出现在 "InIsolation" 命令中。指定不带该参数的命令(示例: vstest.console.exe myTests.dll /InIsolation)，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[记录器参数“{0}”无效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 {0} 不应出现在 "Parallel" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /Parallel)，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId 参数要求整数形式的进程 ID。指定启动此进程的父进程的进程 ID。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无效的平台类型: {0}。有效的平台类型为 {1}。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port 参数需要为整数的端口号。指定用于套接字连接以及接收事件消息的端口。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[“ResultsDirectory”中指定的路径“{0}”无效。错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["TestAdapterPath" 中指定的路径“{0}”无效。错误: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不能使用 /Tests 指定 /TestCaseFilter 参数。指定测试时无法筛选测试用例。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行参数自变量“{0}”无效。请使用以下格式。]D;]A;     格式: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[参数 {0} 不应出现在 "UseVsixExtensions" 命令中.指定指示是否应使用或跳过 vsix 扩展的命令(示例:vstest.console.exe myTests.dll /UseVsixExtensions:true),然后重试.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListDiscoverers]D;]A;      列出已安装的测试发现器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListExecutors]D;]A;      列出已安装的测试执行器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListLoggers]D;]A;      列出已安装的测试记录器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ ListSettingsProviders]D;]A;      列出已安装的测试设置提供程序。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以下测试可用:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      从给定测试容器中列出所有已发现的测试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的文件 {0} 是只读文件]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 URI 或 FriendlyName 为“{0}”的测试记录器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试记录器 URI“{0}”无效。将忽略该测试记录器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所提供的一个或多个 runsettings 包含无效令牌]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) 测试执行命令行工具版本 {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分钟]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定测试源文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["TestAdapterPath" 中指定的路径“{0}”不包含任何测试适配器，请提供有效路径，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法识别的参数“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定参数。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[应用包“{0}”没有测试执行器入口点。为对 Windows 应用商店应用运行单元测试，使用 Windows 应用商店应用单元测试库项目创建应用包。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[共发现 {0} 个测试，但没有与指定选择条件 ({1}) 匹配的测试。使用正确的值，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 中没有可用测试。请确保安装了适当的测试发现器和执行器且平台和框架版本设置合适，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 为 {1}/{2} 而生成。运行中指定的测试程序集应具有共有的目标.Net Framework 和平台。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未运行]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[打开响应文件“{0}”时出错]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      包含要运行的二进制文件的目录。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 Output 路径，请提供有效的路径，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      指定并行执行测试。默认情况下，最多]D;]A;      可能会使用计算机上所有可用的内核。]D;]A;      可使用设置文件配置要使用的内核数。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      父进程的进程 ID 负责启动当前进程。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通过]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[无法启动针对 Windows Phone 应用的测试的测试运行: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[应用包“{0}”没有测试执行器入口点。为对 Windows Phone 应用运行单元测试，使用 Windows Phone 应用单元测试应用项目创建应用包。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      用于执行测试的目标平台体系结构。]D;]A;   有效值为 x86、x64 和 ARM。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Platform 参数要求提供用于测试运行的目标平台类型。示例: /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<Port>]D;]A;      套接字连接和接收事件消息的端口。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在运行测试]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[路径 {0} 不存在。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<file>]D;]A;      有关更多选项，请阅读响应文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-ResultsDirectory | / ResultsDirectory]D;]A;      如果不存在测试结果目录，则将在指定路径中创建。]D;]A;      示例 /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ResultsDirectory 参数需要一个值，应在其中保存测试结果。例如: /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;   运行测试时要使用的设置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到设置文件“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Settings 参数要求提供设置文件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[只能为运行测试指定一个应用包(.appx 文件)。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      运行其名称与所提供值相匹配的测试。若要提供多个]D;]A;   值，请用逗号将这些值分隔开。]D;]A;   示例: /Tests:TestMethod1]D;]A;        /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      从指定的文件或通配符模式运行测试。通过空格将多个测试文件或模式分隔开来。]D;]A;      将控制台记录器详细程度设置为“详细”以查看匹配的测试文件。]D;]A;      示例: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[除通过运行设置配置的代码覆盖率和 Microsoft Fakes 之外，嵌入测试设置不支持其他数据收集器。请参阅 https://aka.ms/vstest-configure-datacollector 了解详细信息。运行测试: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已跳过]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[共发现 {0} 个测试，但一些测试与指定选择条件 ({1}) 不匹配。使用正确的值，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Tests 参数要求一个或多个特定测试名称或其子字符串。]D;]A;       示例: /Tests:TestsMethod1、/Tests:TestMethod1、method2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[堆栈跟踪:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在启动测试发现，请稍候...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在启动测试执行，请稍候...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[标准错误消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[标准输出消息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此外，还可以使用 /TestAdapterPath 命令指定测试适配器的路径。示例 /TestAdapterPath:<pathToCustomAdapters>。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        支持的文件类型:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔离模式为 Windows 应用商店应用运行单元测试。使用 /InIsolation 参数取消此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[按照针对测试运行有效的 Platform:{0} 和 .Net Framework:{1} 设置要求，使用隔离模式运行测试。使用 /inIsolation 参数取消此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔离模式为 Windows Phone 应用运行单元测试。使用 /InIsolation 参数取消此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔离模式运行测试，因为已在 runsettings 中启用了诊断数据适配器。使用 /inIsolation 参数取消此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到提供的自定义测试适配器搜索路径，请提供一个有效路径，然后重试。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      这将使 vstest.console.exe 进程在测试运行中使用]D;]A;   给定路径(如果有)中的自定义测试适配器。]D;]A;   示例 /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestAdapterPath 参数需要一个值，该值是自定义测试适配器所在位置的路径。示例: /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;   运行与给定表达式匹配的测试。]D;]A;   <Expression> 的格式为 <property>Operator<value>[|&<Expression>]5D;]D;]A;     其中，Operator 是 =、!= 或 ~ (Operator ~ 具有 "contains"]D;]A;     语义且适用于诸如 DisplayName 之类的字符串属性)。]D;]A;     括号()可用于对子表达式进行分组。]D;]A;   示例: /TestCaseFilter:"Priority=1"]D;]A;         /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                 |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 参数需要筛选器值。]D;]A;    筛选器值可以是“<属性>=<值>”类型。]D;]A;    示例: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行已中止，出现错误 {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行已取消。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行失败。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试运行成功。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - 失败: {1}，通过: {2}，已跳过: {3}，总计: {4}，持续时间: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     失败数: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试总数: 未知]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     通过数: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    跳过数: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[测试总数: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用框架 {0} 运行测试。指定 /Framework:{1} 取消此警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到提供的测试源文件“{0}”。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[总共 {0} 个测试文件与指定模式相匹配。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已用时间:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        默认执行器 URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions 即将被弃用。请改为使用 /TestAdapterPath。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ UseVsixExtensions]D;]A;      这可使 vstest.console.exe 进程在测试运行中使用或者跳过]D;]A;      安装的 VSIX 扩展(如果有)。]D;]A;      示例  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions 参数需要一个值。如果值为 "true"，则安装的 VSIX 扩展(如果有)将用在测试运行中。如果值为 "false"，则将其忽略。示例: /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在文件 {0} 中记录 Vstest 诊断]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 508850eecf..0000000000
--- a/Localize/lcl/zh-Hant/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CleanupException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while collecting final entries from the event log '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[從事件記錄檔 '{0}' 收集最終項目時發生例外狀況: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ContextNotFoundException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[事件記錄檔 DataCollector 找不到 DataCollectionContext 的 eventLogContext: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log has encountered an exception, some events might get lost. Error : {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 事件記錄檔發生例外狀況，某些事件可能會遺失。錯誤: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EventsLostWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The '{0}' event log may have been cleared during collection; some events may not have been collected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' 事件記錄檔可能已在收集期間清除; 某些事件可能未收集到]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReadError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read event log '{0}' from computer '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法從電腦 '{1}' 讀取事件記錄檔 '{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 014fde6e58..0000000000
--- a/Localize/lcl/zh-Hant/src/DataCollectors/TraceDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CodeCoverageOnlySupportsWindows" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No code coverage data available. Code coverage is currently supported only on Windows.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無任何程式碼涵蓋範圍可用。目前只有在 Windows 上才支援程式碼涵蓋範圍。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDirectory" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to create directory: {0} with error:{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法建立目錄: {0}，出現錯誤:{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToInitializeCodeCoverageDataCollector" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize code coverage datacollector with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法初始化程式碼涵蓋範圍資料收集器，錯誤為: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunningEventFromVanguard" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Running event not received from CodeCoverage.exe. Check eventlogs for failure reason.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在執行並非從 CodeCoverage.exe 接收的事件。請查看事件記錄檔，以了解失敗原因。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardConnectionTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive running event from CodeCoverage.exe in {0} seconds, This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未在 {0} 秒內從 CodeCoverage.exe 收到執行中的事件。可能是因為電腦太慢，請設定環境變數 {1}，加長逾時。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VanguardNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find CodeCoverage.exe at {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在 {0} 找不到 CodeCoverage.exe]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 30efcbc24d..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="C:\A\1\24\s\src\Microsoft.TestPlatform.AdapterUtilities\Resources\xlf\Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 不完整]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorInvalidSequenceAt" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid escape sequence! (segment: {0}, pos: {1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[逸出序列無效! (區段: {0}，位置: {1})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[方法 arity 必須為數值]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在類型 '{1}' 上找不到方法 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorNoClosingQuote" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A closing single quote was expected at the end of the segment! (segment: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[區段結尾必須有右單引號! (區段: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到類型 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 的結尾後出現非預期的字元 (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[空白字元在 ManagedName 中無效 (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MethodNotImplementedOnPlatform" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}.{1}' is not implemented on this platform!]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}.{1}' 未在此平台上實作!]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 8cc963db48..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BuildCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build completed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[建置完成。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildStarted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Build started, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已開始建置，請稍候...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoIsTestProjectProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipping running test for project {0}. To run tests with dotnet test add "<IsTestProject>true</IsTestProject>" property to project file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[跳過專案 {0} 目前正在執行中的測試。若要執行有 dotnet 測試的測試項目，請對專案檔新增 "<IsTestProject>true</IsTestProject>" 屬性。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunningSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run for {0} ({1})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 的測試回合 ({1})]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run for {0}({1})]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UpdateTestSdkForCollectingCodeCoverage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: 將 Microsoft.NET.Test.Sdk 套件參考更新至版本 15.8.0 或更新版本，才可收集程式碼涵蓋範圍。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 66bb7b5c89..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidStateForExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run could not be executed because the initial state was invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[因為初始狀態無效，所以無法執行測試回合。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestHostProviderFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No suitable test runtime provider found for this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到適用於此回合的測試執行階段提供者。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSessionTimeoutMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborting test run: test run timeout of {0} milliseconds exceeded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在中止測試回合: 超過了測試回合逾時 ({0} 毫秒)。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Wait for completion operation is not allowed when there is no active test run. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[沒有使用中的測試回合時，不允許等候完成作業。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index b79a79933c..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。如需詳細資訊，請參閱錯誤訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CancellationRequested" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cancelling the operation as requested.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在應要求取消作業。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collection : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorErrorOnGetVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' failed to provide initialization information. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器 '{0}' 無法提供初始化資訊。錯誤: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[載入、建構或初始化類型期間，資料收集器 '{0}'擲回例外狀況: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector '{0}' message: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器 '{0}' 的訊息: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find data collector '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到資料收集器 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorRequestedDuplicateEnvironmentVariable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器 '{0}' 要求要在測試執行環境中將環境變數 '{1}' 的值設為 '{2}'，但另一個資料收集器 '{3}' 已要求了同一個環境變數，但具有不同的值 '{4}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateExtensionUri" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[重複的測試延伸模組 URI '{0}'。忽略重複的延伸模組。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名為 '{0}' 的重複的設定提供者。忽略重複的提供者。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSettingsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到名為 '{0}' 的重複執行設定區段。忽略重複的設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EmptyParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Empty parenthesis ( )]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 空的括弧 ( )]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToFindInstalledUnitTestExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to find the list of installed unit test extensions. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法找到已安裝之單元測試延伸模組的清單。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadAdapaterFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load extensions from file '{0}'. Please use /diag for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法從檔案 '{0}' 載入延伸模組。如需詳細資訊，請使用 /diag。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FastFilterException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while creating Fast filter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[建立快速篩選時發生錯誤。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[An error occured while creating Fast filter.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoredDuplicateConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[有多個組態的資料收集器 FriendlyName 為 '{0}'。在測試回合中，重複的組態將予忽略。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InnerException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inner exception:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[內部例外狀況:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidCondition" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid Condition '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 條件 '{0}' 無效]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Extension has an invalid URI '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試延伸模組的 URI '{0}' 無效: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Invalid operator '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 運算子 '{0}' 無效]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[初始化具有 '{0}' 的記錄器時，發生例外狀況: '{1}'。將不會使用此記錄器。例外狀況: {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到具有 AssemblyQualifiedName、URI 或 FriendlyName '{0}' 的測試記錄器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試記錄器 URI '{0}' 無效。將忽略測試記錄器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingCloseParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing ')']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 遺漏 ')']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOpenParenthesis" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing '(']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 遺漏 '(']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: Missing operand]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: 遺漏運算元]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingOperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Missing Operator '|' or '&']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[遺漏運算子 '|' 或 '&']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ReportDataCollectorException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collector caught an exception of type '{0}': '{1}'. More details: {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器攔截到類型為 '{0}' 的例外狀況: '{1}'。更多詳細資料: {2}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsAlreadyLoaded" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Run Settings have already been loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已載入 [回合設定]5D;。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the run settings.  Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[載入回合設定時發生錯誤。錯誤: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsNodeInvalidName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings node specified. The name property of the settings node must be non-empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的設定節點無效。設定節點的名稱屬性必須為非空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderInitializationError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while initializing the settings provider named '{0}'. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[將名為 '{0}' 的設定提供者初始化時發生錯誤。錯誤: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingsProviderNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings Provider named '{0}' was not found.  The settings can not be loaded.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到名為 '{0}' 的設定提供者。無法載入設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StackTrace" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[堆疊追蹤:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterFormatException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestCaseFilter {0} 的格式不正確。請指定正確的格式後再試一次。請注意，格式不正確可能會導致無法執行測試。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFetchUriString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find a datacollector with friendly name '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到易記名稱為 '{0}' 的 datacollector。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unable to find a datacollector with friendly name '[0}'.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VSInstallationNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This option works only with vstest.console.exe installed as part of Visual Studio.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此選項僅適用於隨 Visual Studio 安裝的 vstest.console.exe。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";WrongDataCollectionContextType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[衍生自資料收集內容的類型無法用於傳送資料和訊息。用於傳送資料和訊息的 DataCollectionContext 必須來自其中一個引發資料收集器的事件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index c168551e14..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test discovery was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用中的測試探索已中止。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active test run was aborted. Reason: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用中的測試回合已中止。原因: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法將偵錯工具連結到預設測試主機。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionClosed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An existing connection was forcibly closed by the remote host.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[遠端主機已強制關閉現有連線。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConnectionTimeoutErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在 {2} 秒後，{0} 處理序無法連線到 {1} 處理序。原因可能是電腦太慢，請設定環境變數 {3}，加長逾時。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostProcessCrashed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test host process crashed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試主機處理序當機]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToCommunicateToTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to communicate with test host process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法與測試主機處理序通訊。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[收到未預期的訊息。需要的訊息類型: {0}，實際的訊息類型: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Protocol version check failed. Make sure test runner and host are compatible.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通訊協定版本檢查失敗。請確定測試執行器與主機相容。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VersionCheckTimedout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法交涉通訊協定，等待回應在 {0} 秒後已逾時。原因可能是電腦太慢，請設定環境變數 {1}，加長逾時。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index a4e2766352..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數不可為 null 或空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資訊: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數不可為空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument cannot be negative.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數不可為負數。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument must have the following type: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數必須具備下列類型: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be an empty string: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數具有下列屬性，且不可為空字串: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNegative" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be negative: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數具有下列屬性，且不可為負數: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyIsNull" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property, which cannot be null: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數具有下列屬性，且不可為 null: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Error_ArgumentPropertyNotTypeOf" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified argument has the following property: {0}. This property must have the following type: {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的引數具有下列屬性: {0}。此屬性必須具有下列類型: {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromJobProcessor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unhandled exception occurred while processing a job from the '{0}' queue: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[從 '{0}' 佇列處理工作時，發生未處理的例外狀況: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 '{0}' 主機。請確認 '{0}' 已安裝在機器上，而且可在 PATH 環境變數中使用。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueueAlreadyDisposed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue has already been disposed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已處置 {0} 佇列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";QueuePausedDisposeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The {0} queue cannot be disposed while paused.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[暫停時無法處置 {0} 佇列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Utility_ProcessNameWhenCannotGetIt" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error getting process name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[取得處理序名稱時發生錯誤。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index f2df266e11..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AccessDenied" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 當嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachDebuggerToDefaultTestHostFailure" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot attach the debugger to the default test host with process ID: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法將偵錯工具連結到處理序識別碼為 {0} 的預設測試主機。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorDebuggerWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[DataCollector 已啟用。若要繼續，請將偵錯工具連結到 datacollector 處理序。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DeprecatedAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[目前正在變更配接器查閱，請遵循 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap，以取得詳細資料。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/master/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscovererInstantiationException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred while instantiating discoverer : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[將探索程式具現化時發生例外狀況: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateAdaptersFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到多個具有相同 URI '{0}' 的測試配接器。忽略配接器 '{1}'。請將衝突的配接器解除安裝，以避免這項警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the specified duplicate source '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[忽略指定的重複來源 '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromLoadTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試探索程式 '{0}' 載入測試時發生例外狀況。例外狀況: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromRunTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An exception occurred while invoking executor '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[叫用執行程式 '{0}' 時發生例外狀況: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionThreadApartmentStateNotSupportedForFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ExecutionThreadApartmentState option not supported for framework: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[架構 {0} 不支援 ExecutionThreadApartmentState 選項。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLaunchTestHost" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to launch testhost with error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法啟動測試主機。錯誤: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find file {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到檔案 {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HostDebuggerWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Host debugging is enabled. Please attach debugger to testhost process to continue.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已啟用主機偵錯。請將偵錯工具附加到 testhost 處理序以繼續進行。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";IgnoringExecutorAsNoDefaultExecutorUriAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[忽略對應到測試探索程式 {0} 的測試執行程式，因為探索程式沒有 DefaultExecutorUri 屬性。您可能必須重新安裝測試配接器增益集。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InitializationFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to initialize client proxy: could not connect to test process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法將用戶端 Proxy 初始化: 無法連接到測試處理序]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LaunchDebugProcessNotAllowedForANonDebugRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[This operation is not allowed in the context of a non-debug run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[這項作業不能用於非偵錯回合的內容中。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAvailableProxyForDeque" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find an available proxy to deque.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到任何要排除於佇列外的 Proxy。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetExeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find {0}. Make sure that the dotnet is installed on the machine.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 {0}。請確定電腦上安裝了 .NET。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingExecutor" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到具有 URI '{0}' 的測試執行程式。請確定已安裝測試執行程式，且其支援 .NET 執行階段版本 {1}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoSuchProxyId" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is not managed by the current session manager.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[識別碼為 {0} 的 Proxy 並非由目前的工作階段管理員所管理。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableForGivenTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test matches the given testcase filter `{0}` in {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[沒有任何測試符合 {1} 中的指定 testcase 篩選 `{0}`]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoValidSourceFoundForDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的來源 '{0}' 皆無效。請修正上述錯誤/警告，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonExistingExtensions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find extensions: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到延伸模組: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OldTestHostIsGettingUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[您正使用較舊版的 Microsoft.NET.Test.Sdk。請移到等於或大於 15.3.0 的版本。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProxyIsAlreadyAvailable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Proxy with id {0} is already available and cannot be re-enqueued.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[識別碼為 {0} 的 Proxy 已可供使用，但無法重新加入佇列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringSeperator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestDiscoveryCancelled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery of tests cancelled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已取消測試的探索。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestHostExitedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Testhost process exited with error: {0}. Please check the diagnostic logs for more information.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Testhost process exited with error: {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 中未提供任何測試。請確定已登錄了測試探索程式與執行程式，且平台與 Framework 版本設定皆正確，然後再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TesthostDiagLogOutputFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging TestHost Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在檔案 {0} 中記錄 TestHost 診斷]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedPropertiesInTestCaseFilter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[因為篩選包含一或多個無效的屬性 ({0})，所以沒有符合篩選的測試。請指定包含有效屬性 ({1}) 的篩選運算式。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 0ae106a1ec..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedTestRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.]D;]A;The test running when the crash occurred: ]D;]A;{0}]D;]A;This test may, or may not be the source of the crash.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[因為主機處理序在未預期的狀況下結束，所以已中止使用中的測試回合。請檢查上方的呼叫堆疊 (若有的話)，以取得例外狀況來源的詳細資訊。]D;]A;發生損毀時正在執行的測試: ]D;]A;{0}]D;]A;此測試可能是或不是損毀的來源。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The active Test Run was aborted because the host process exited unexpectedly while executing following test(s):]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterKeyIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key specified {0} is not valid. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的 blame 參數索引鍵 {0} 無效。即將忽略此索引鍵。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameParameterValueIncorrect" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[blame 參數索引鍵 {0} 僅支援值 {1}/{2}。即將忽略此索引鍵。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpFileNotGeneratedErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collect dump was enabled but no dump file was generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已啟用了收集傾印，但未產生任何傾印檔。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Dumping" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping {0} - {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在傾印 {0} - {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DumpingTree" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Dumping this process tree (from bottom)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在傾印此處理序樹狀結構 (從底部)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InactivityTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的非使用狀態時間已經過 {0} {1}。正在從 testhost 及其子處理序收集停止回應的傾印]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[The specified inactivity time of {0} minute/s has elapsed. Collecting a dump and killing the test host process.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分鐘]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotGeneratingSequenceFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All tests finished running, Sequence file will not be generated]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所有測試皆已執行完成，將不會產生 Sequence 檔案]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpCouldNotStart" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start process dump: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法啟動處理序傾印: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpEnvVarEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[必要的環境變數 PROCDUMP_PATH 為 null 或是空的。請將 PROCDUMP_PATH 設定為包含適當之 procdump 可執行檔之資料夾的路徑。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProcDumpNotGenerated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[CollectDump was enabled but dump file was not generated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[CollectDump 已啟用，但未產生傾印檔案。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedValueForInactivityTimespanValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供了非預期的值 '{0}' 作為逾時。請提供以下格式的值: 1.5h / 90m / 5400s / 5400000ms / 5400000]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 79b158a897..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";HtmlFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html test results file : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Html 測試結果檔案: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HtmlLoggerError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Html Logger Error : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Html 記錄器錯誤: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be given together.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不能同時指定參數 LogFileName 和 LogFilePrefix。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
deleted file mode 100644
index 128ab9c210..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf.lcl
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="TrxResource.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";Common_CannotBeLessThanZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be less than 0.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數不可少於 0。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數不可為 null 或空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextIterationName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法在目錄 {1} 中為 {0} 取得可用的名稱 (1)、(2)...。請清除這個目錄。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotGetNextTimestampFileName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法在 {1} 中使用時間戳記格式 '{2}' 找到 {0} 的可用檔案名。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItem" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[部署項目 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_DeploymentItemWithOutputDirectory" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[deployment item '{0}' (output directory '{1}')]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[部署項目 '{0}' (輸出目錄 '{1}')]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunConfigInRun" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Settings are not specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定測試設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunDeploymentRootInRunConfig" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Settings do not define the Run Deployment Directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用中的測試設定未定義回合部署目錄。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_MissingRunInResult" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此結果未與測試回合相關聯。請使用從進行中或已完成的測試回合所取得的結果。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NothingLeftAfterReplaciingBadCharsInName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The specified file/directory name '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定的檔案/目錄名稱 '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_NullInMessages" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestRunName" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0}@{1} {2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0}@{1} {2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailureToAttach" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to attach files from: {0}]D;]A;Error Details: {1}:{2}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法附加來自下列位置的檔案: {0}]D;]A;錯誤詳細資料: {1}:{2}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MessageForSkippedTests" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test '{0}' was skipped in the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已略過測試回合中的測試 '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PrefixAndNameProvidedError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameters LogFileName and LogFilePrefix cannot be used together. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不能同時使用參數 LogFileName 和 LogFilePrefix。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_AllResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[All Loaded Results]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所有載入的結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TS_UncategorizedResults" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results Not in a List]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不在清單中的結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeCompleted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已完成]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeDisconnected" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中斷連線]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeError" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInProgress" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[進行中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeInconclusive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果不明]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotExecuted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未執行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotRunnable" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法執行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功 (執行已中止)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePending" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[暫止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeTimeout" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[逾時]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeWarning" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFile" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Results File: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果檔案: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TrxLoggerResultsFileOverwriteWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[WARNING: Overwriting results file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: 將要覆寫結果檔案: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
deleted file mode 100644
index 59787f7b46..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf.lcl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="CommonResources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數不可為 null 或空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisplayChosenSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合偵測到為不同架構和平台版本所建置的 DLL。下列 DLL 與目前的設定不相符，亦即 {0} 架構及 {1} 平台。{2}如需管理這些設定的詳細資料，請前往 {3}。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) do not match framework/platform settings.{2}Go to {3} for more details on managing these settings.]D;]A;]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Settings file provided does not conform to required format.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的設定檔案不符合所需的格式。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoMatchingSourcesFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的測試容器全都不符合測試回合的平台架構與 .Net Framework 設定。平台: {0}  .Net Framework: {1}。如需如何管理這些設定的詳細資料，請前往 http://go.microsoft.com/fwlink/?LinkID=330428。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SourceIncompatible" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for Framework {1} and Platform {2}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 專為架構 {1} 及平台 {2} 建置。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
deleted file mode 100644
index 843015ad61..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/ManagedNameMessages.xlf.lcl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="ManagedNameMessages.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";ErrorIncompleteManagedName" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ManagedName is incomplete]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 不完整]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodArityMustBeNumeric" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method arity must be numeric]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[方法 arity 必須為數值]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMethodNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Method '{0}' not found on type '{1}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在類型 '{1}' 上找不到方法 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorTypeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Type '{0}' not found]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到類型 '{0}']]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorUnexpectedCharactersAtEnd" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected characters after the end of the ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ManagedName 的結尾後出現非預期的字元 (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorWhitespaceNotValid" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Whitespace is not valid in a ManagedName (pos: {0})]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[空白字元在 ManagedName 中無效 (位置: {0})]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index cf5e5992d9..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";BasicTestResultFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0,-10}  {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0,-10}  {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter cannot be null or empty.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數不可為 null 或空白。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_FileNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[檔案 {0} 不存在。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_ObjectMustBeOfType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Object must be of type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[物件必須為 {0} 類型。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Aborted]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeCompleted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Completed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已完成]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeDisconnected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Disconnected]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中斷連線]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInProgress" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[In Progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[進行中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeInconclusive" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Inconclusive]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果不明]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotExecuted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Executed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未執行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeNotRunnable" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Runnable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法執行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePassedButRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed (run aborted)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功 (執行已中止)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomePending" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Pending]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[暫止]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeTimeout" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[逾時]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Common_TestOutcomeWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConverterNotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot find TypeConverter for type {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到類型 {0} 的 TypeConverter。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CouldNotFindXmlNode" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' node]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 '{0}' 節點]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_CanNotReadStream" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法讀取提供的資料流。除非資料流支援讀取，否則無法傳送來自資料流的資料。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_InvalidFileNameCharacters" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' contains the following invalid characters: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的檔案名稱 '{0}' 含有下列無效的字元: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectionSink_ReservedFilenameUsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The provided file name '{0}' is reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已保留提供的檔案名稱 '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Exception_RegisteredTestPropertyHasDifferentValueType" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法將屬性 '{0}' 登錄為值類型 '{1}'，因為它已登錄為 '{2}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToCreateDiaSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to Create msdia Session COM HResult '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法建立 msdia 工作階段 COM HResult '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToLoadMsDia" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to load msdia]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法載入 msdia]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDataCollectorUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI in data collector settings '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器設定 '{0}' 中的 URI 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidRunSettingsRootNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The root node of the run settings must be named 'RunSettings'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[回合設定的根節點必須命名為 'RunSettings'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlAttribute" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' 無效。未預期的 XmlAttribute: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsXmlElement" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Unexpected XmlElement: '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' 無效。未預期的 XmlElement: '{1}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUriInSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid URI '{0}' in settings '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{1}' 中的 URI '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingDataCollectorAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無效的資料收集器設定。預期的屬性 '{0}' 遺失。一般的資料收集器設定看起來像 <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingLoggerAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' 無效。在 friendlyName、URI assemblyQualifiedName 之間，至少要有一個 XmlAttribute。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestCaseFilterForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法為特定測試回合指定 TestCaseFilter。FilterCriteria 只適用於以來源執行的狀況。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationFrequencyIsNotPositive" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification frequency need to be a positive value.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知頻率必須為正值。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotificationTimeoutIsZero" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Notification timeout must be greater than zero.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[通知逾時必須大於零。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NullString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[(null)]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[(null)]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SolutionDirectoryNotExists" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[解決方案目錄 '{0}' 不存在。請確認 runsettings 中指定的解決方案目錄存在，並且具有目錄的讀取權限。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterEscapeException" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Filter string '{0}' includes unrecognized escape sequence.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[篩選字串 '{0}' 包含無法辨識的逸出序列。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[欄號]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyExecutorUriLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Executor Uri]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[執行程式 URI]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFilePathLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File Path]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[檔案路徑]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyFullyQualifiedNameLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[FullyQualifiedName]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[FullyQualifiedName]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyIdLabel" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Id]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[識別碼]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyLineNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Line Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[行號]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[名稱]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertySourceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Source]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[來源]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCasePropertyTraitsLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Traits]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[特性]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Message: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  訊息: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestFailureStackTraceFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  StackTrace:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeFailed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNone" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeNotFound" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[NotFound]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[NotFound]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomePassed" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[成功]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestOutcomeSkipped" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[略過]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultMessageFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}:]D;]A;{1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyComputerNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Computer Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[電腦名稱]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDisplayNameLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[TestResult Display Name]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[TestResult 顯示名稱]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyDurationLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Duration]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[持續時間]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyEndTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[End Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結束時間]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorColumnNumberLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Column Number]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤欄號]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorMessageLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤訊息]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyErrorStackTraceLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Stack Trace]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤堆疊追蹤]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyOutcomeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Outcome]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[結果]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultPropertyStartTimeLabel" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Start Time]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[開始時間]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestResultTextMessagesFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  Test Messages:]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  測試訊息:]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnexpectedTypeOfProperty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]5D;) and try again. ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不支援屬性 '{1}' 的測試屬性類型 '{0}'。請使用其中一個支援的屬性類型 (基本類型、uri、string、string[]5D;)，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 53b6b37a76..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";MultipleFileVersions" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Multiple versions of same extension found. Selecting the highest version.]D;]A;{0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到相同延伸模組的多個版本。系統會選取最高版本。]D;]A;{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoDotnetMuxerFoundForArchitecture" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find '{0}' host for the '{1}' architecture.]D;]A;]D;]A;You can resolve the problem by installing the '{1}' .NET.]D;]A;]D;]A;The specified framework can be found at:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 '{1}' 架構的 '{0}' 主機。]D;]A;]D;]A;您可以安裝 '{1}' .NET 來解決問題。]D;]A;]D;]A;指定的架構可在下列位置找到:]D;]A;  - https://aka.ms/dotnet-download]D;]A;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestPublishTestProject" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Please publish your test project and retry.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 {0}。請發佈您的測試專案並重試。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnableToFindDepsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 {0}。請確認測試專案有 "Microsoft.NET.Test.Sdk "套件的 nuget 參考。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index cc78db55f7..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";InvalidRunSettingsXml" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Run settings XML does not contain "RunSettings" node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[回合設定 XML 不包含 " RunSettings" 節點。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidSettingsIncorrectValue" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingRunSettingsNode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 'RunSettings' 節點。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoRunSettingsNodeFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find 'RunSettings' node.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 'RunSettings' 節點。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsParseError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[An error occurred while loading the settings.  Error: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[載入設定時發生錯誤。錯誤: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SystemArchitectureIncompatibleWithTargetPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Incompatible Target platform settings '{0}' with system architecture '{1}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[目標平台設定 '{0}' 與系統架構 '{1}' 不相容。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnExpectedSettingsFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unexpected settings file specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[指定了非預期的設定檔案。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index aaddb56725..0000000000
--- a/Localize/lcl/zh-Hant/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AbortedStartTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Start Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[開始測試工作階段作業已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedStopTestSession" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Stop Test Session operation was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[停止測試工作階段作業已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestRunAttachmentsProcessing" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Test Run Attachments Processing was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[執行中的測試回合附件處理已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Discovery was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止使用中的測試探索。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AbortedTestsRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The active Tests Run was aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已中止使用中的測試回合。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedToReceiveMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed to receive message from vstest.console process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法接收來自 vstest.console 處理序的訊息]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[File {0} does not exists]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[檔案 {0} 不存在]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VsTestProcessExitedAbnormally" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[vstest.console process exited abnormally]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[vstest.console 處理序異常結束]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 3e60d5fb72..0000000000
--- a/Localize/lcl/zh-Hant/src/SettingsMigrator/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";IgnoringLegacySettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Any LegacySettings node already present in the runsettings will be removed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[所有出現在 runsettings 中的 LegacySettings 節點，都將移除。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoEmbeddedSettings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings does not contain an embedded testSettings, not migrating.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 並不包含內嵌的 testSettings，所以未移轉。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsCreated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The migrated RunSettings file has been created at: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[移轉的 RunSettings 檔案已於 {0} 建立]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UnsupportedAttributes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不支援 Timeouts 節點的屬性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout，所以這些將不會移轉。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ValidUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Valid usage:]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated>]D;]A;SettingsMigrator.exe <Full path to testsettings file or runsettings file to be migrated> <Full path to runsettings file to be created>]D;]A;Examples:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[有效的用法:]D;]A;SettingsMigrator.exe <testsettings 檔案或要移轉的 runsettings 檔案的完整路徑>]D;]A;SettingsMigrator.exe <testsettings 檔案或要移轉的 runsettings 檔案的完整路徑> <要建立的 runsettings 檔案的完整路徑>]D;]A;範例:]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings]D;]A;SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/Localize/lcl/zh-Hant/src/vstest.console/Resources/xlf/Resources.xlf.lcl b/Localize/lcl/zh-Hant/src/vstest.console/Resources/xlf/Resources.xlf.lcl
deleted file mode 100644
index 004b119789..0000000000
--- a/Localize/lcl/zh-Hant/src/vstest.console/Resources/xlf/Resources.xlf.lcl
+++ /dev/null
@@ -1,1638 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="Resources.xlf" PsrId="308" FileType="1" SrcCul="en-US" TgtCul="zh-TW" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Settings Name="@vsLocTools@\default.lss" Type="Lss" />
-  <Item ItemId=";Xliff file" ItemType="0" PsrId="308" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Xliff Resources" ItemType="0" PsrId="308" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-      <Item ItemId=";AddnlInfoMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additional Information Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[其他資訊訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for unit tests for Windows Store app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法針對 Windows 市集應用程式的單元測試啟動測試回合: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AppxBundleSourceWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在指定的測試容器中找不到測試。此外，Microsoft Windows 市集單元測試配接器不支援 .appxbundle 檔案。請在建立應用程式套件時建立 appx (將 [產生應用程式套件組合]5D; 選項設定為 [永不]5D;)，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AssemblyPathInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unable to find the assembly under test. Please make sure that the project is built.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到正在進行測試的組件。請確定已建置專案。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentOutputFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AttachmentsBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Attachments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[附件:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableDiscoverersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Discovery Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[可使用下列測試探索增益集:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExecutorsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Execution Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[可使用下列測試執行增益集:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableExtensionsMetadataFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        {0}: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        {0}: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableLoggersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Test Logger Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[可使用下列測試記錄器增益集:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableSettingsProvidersHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Settings Providers Add-Ins are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[可使用下列設定提供者增益集:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";AvailableTestsFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text" UsrLk="true">
-          <Val><![CDATA[    {0}]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BatchSizeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/BatchSize 引數必須有批次的大小。範例:  /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting crash dumps by option CollectDump for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此平台不支援使用 CollectDump for Blame 選項收集損毀傾印。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[CollectDump option for Blame is not supported for this platform.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameCollectDumpTestTimeoutNotSupportedForPlatform" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此平台不支援使用 Blame 的 CollectDump 及 TestTimeout 選項收集懸置傾印。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BlameIncorrectOption" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[以 blame 指定的 blame 參數 {0} 無效，即將忽略此參數。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--BuildBasePath|/BuildBasePath:<BuildBasePath>]D;]A;      The directory containing the temporary outputs.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--BuildBasePath|/BuildBasePath:<建置基底路徑>]D;]A;      包含暫存輸出的目錄。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";BuildBasePathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The BuildBasePath was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 BuildBasePath。請提供有效的路徑，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CLIRunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[RunSettings arguments:]D;]A;      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]5D;=[value]5D; after "-- ". Note the space after --. ]D;]A;      Use a space to separate multiple [name]5D;=[value]5D;.]D;]A;      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[RunSettings 引數:]D;]A;      透過命令列傳遞 runsettings 組態的引數。引數可以接在 "-- " 之後，以 [名稱]5D;=[值]5D; 的格式指定名稱/值配對。請注意 -- 之後的空格。]D;]A;      使用空格以隔開多個 [名稱]5D;=[值]5D;。]D;]A;      RunSettings 引數支援的詳細資訊: https://aka.ms/vstest-runsettings-arguments]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CannotBeNullOrEmpty" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot be null or empty]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不可為 null 或空白]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:<DataCollector FriendlyName>]D;]A;      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Collect|/Collect:<資料收集器易記名稱>]D;]A;      為測試回合啟用資料收集器。此處有詳細資訊: https://aka.ms/vstest-collect]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CollectWithTestSettingErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[若使用測試設定來設定測試回合，則不支援 --Collect|/Collect:"{0}"。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommaSeparatedFormat" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[, {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[，{0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineInformational" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Information: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資訊: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CommandLineWarning" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Warning: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[警告: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ConfigurationArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-c|--Configuration|/c|/Configuration:<Configuration>]D;]A;      The configuration the project is built for i.e. Debug/Release]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-c|--Configuration|/c|/Configuration:<組態>]D;]A;      建置專案標的組態，例如，偵錯/發行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";CopyrightCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Copyright (c) Microsoft Corporation.  All rights reserved.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Copyright (C) Microsoft Corporation. 著作權所有，並保留一切權利。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DataCollectorFriendlyNameInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[資料收集器的易記名稱 '{0}' 無效。該資料收集器將予忽略。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Days" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Days]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[日]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DbgTrcMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Debug Traces Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[偵錯追蹤訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DesignModeClientTimeoutError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Timeout to connect or process request for DesignModeClient on port: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[連線或處理連接埠 {0} 上對於 DesignModeClient 之要求的逾時時間:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisableAutoFakesUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     Example: /DisableAutoFakes:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--DisableAutoFakes|/DisableAutoFakes:<true/false>]D;]A;     範例: /DisableAutoFakes:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows 市集應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingCodeCoverageInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Windows Phone 應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDCOnExceptionWhileParsingDCInfo" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[讀取診斷資料配接器設定時擲回執行中的 '{0}'。這個回合中將略過所有診斷資料配接器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[執行 Windows 市集應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DisablingDataCollectionInPhoneAppContainerTestExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[執行 Windows Phone 應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DiscoveryFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Discovery failed for given sources. Exception : {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[給定來源的探索失敗。例外狀況: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";DuplicateArgumentError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The parameter "{0}" should be provided only once.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[參數 " {0}" 應該僅提供一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableBlameUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.]D;]A;      It creates an output file in the current directory as "Sequence.xml",]D;]A;      that captures the order of execution of test before the crash.]D;]A;      You may optionally choose to collect process dump for the test host.]D;]A;      When you choose to collect dump, by default, a mini dump will be collected on a crash.]D;]A;      You may also choose to override this default behaviour by some optional parameters:]D;]A;      CollectAlways - To collect dump on exit even if there is no crash (true/false) ]D;]A;      DumpType - To specify dump type (mini/full).]D;]A;      Example: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Blame|/Blame:[CollectDump]5D;;[CollectAlways]5D;=[Value]5D;;[DumpType]5D;=[Value]5D;]D;]A;      以 blame 模式執行測試。此選項在隔離造成測試主機當機的問題測試時相當實用。]D;]A;      它會在目前的目錄建立輸出檔案 "Sequence.xml"，]D;]A;      該檔案會擷取當機前的測試執行順序。]D;]A;      您也可以選擇收集測試主機的處理序傾印。]D;]A;      當您選擇收集傾印時，預設會在當機時收集迷你傾印／]D;]A;      您也可以選擇使用一些選用參數來覆寫此預設行為:]D;]A;      CollectAlways - 即使沒有當機，也在離開時收集傾印 (true/false) ]D;]A;      DumpType - 指定傾印類型 (mini/full)。]D;]A;      範例: /Blame]D;]A;               /Blame:CollectDump]D;]A;               /Blame:CollectDump;CollectAlways=true;DumpType=full]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableCodeCoverageArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/EnableCodeCoverage]D;]A;      Enables data collector 'CodeCoverage' for the test run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/EnableCodeCoverage]D;]A;      為測試回合啟用資料收集器 'CodeCoverage'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableDiagUsage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Diag|/Diag:<Path to log file>]D;]A;      Enable logs for test platform.]D;]A;      Logs are written to the provided file.]D;]A;]D;]A;      Change the trace level for logs as shown below]D;]A;      Example: /Diag:<Path to log file>;tracelevel=<Defaults to "verbose">]D;]A;      Allowed values for tracelevel: off, error, warning, info and verbose.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Diag|/Diag:<日誌檔路徑>]D;]A;      啟用測試平台的記錄檔。]D;]A;      記錄會寫入提供的檔案。]D;]A;]D;]A;      變更記錄檔的追蹤層級，如下所示]D;]A;      範例: /Diag:<日誌檔路徑>;tracelevel=<預設為 [詳細資訊]5D;>]D;]A;      允許的 tracelevel 值為: 關閉、錯誤、警告、資訊與詳細資訊。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggerArgumentsInNetCore" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "minimal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<記錄器 URI/易記名稱>]D;]A;      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=<預設為唯一的檔案名稱>]5D;，]D;]A;      將結果記錄至 Visual Studio 測試結果檔案 (TRX)]D;]A;      以指定的 LogFileName，在 TestResults 目錄中建立檔案。]D;]A;]D;]A;      變更主控台記錄器的記錄訊息詳細程度等級，如下所示]D;]A;      範例: /logger:console;verbosity=<預設為 "minimal">]D;]A;      詳細程度的允許值: quiet、minimal、normal 以及 detailed。]D;]A;]D;]A;      變更主控台記錄器的診斷等級前置詞，如下所示]D;]A;      範例: /logger:console;prefix=<預設為 "false">]D;]A;      主控台記錄器詳細資訊於此: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnableLoggersArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--logger|/logger:<Logger Uri/FriendlyName>]D;]A;      Specify a logger for test results. For example, to log results into a ]D;]A;      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]5D;]D;]A;      Creates file in TestResults directory with given LogFileName.]D;]A;]D;]A;      Change the verbosity level in log messages for console logger as shown below]D;]A;      Example: /logger:console;verbosity=<Defaults to "normal">]D;]A;      Allowed values for verbosity: quiet, minimal, normal and detailed.]D;]A;]D;]A;      Change the diagnostic level prefix for console logger as shown below]D;]A;      Example: /logger:console;prefix=<Defaults to "false">]D;]A;      More info on Console Logger here : https://aka.ms/console-logger]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--logger|/logger:<記錄器 URI/易記名稱>]D;]A;      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=<預設為唯一的檔案名稱>]5D;，]D;]A;      將結果記錄至 Visual Studio 測試結果檔案 (TRX)]D;]A;      以指定的 LogFileName，在 TestResults 目錄中建立檔案。]D;]A;]D;]A;      變更主控台記錄器的記錄訊息詳細程度等級，如下所示]D;]A;      範例: /logger:console;verbosity=<預設為 "normal">]D;]A;      詳細程度的允許值: quiet、minimal、normal 以及 detailed。]D;]A;]D;]A;      變更主控台記錄器的診斷等級前置詞，如下所示]D;]A;      範例: /logger:console;prefix=<預設為 "false">]D;]A;      主控台記錄器詳細資訊於此: https://aka.ms/console-logger]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-e|--Environment|/e|/Environment:<NAME>=<VALUE>]D;]A;      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.]D;]A;      ]D;]A;      This argument can be specified multiple times to provide multiple variables.]D;]A;]D;]A;      Example: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-e|--Environment|/e|/Environment: <NAME>=<VALUE>]D;]A;      設定環境變數的值。若變數不存在，則加以建立；若有則予以覆寫。這表示 /InIsolation 會在隔離流程中將測試切換並強制執行。]D;]A;      ]D;]A;      此引數可供多次指定，以提供多項變數。]D;]A;]D;]A;      範例: -e:VARIABLE1=VALUE1]D;]A;               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"]D;]A;               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";EnvironmentVariableXIsOverriden" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Environment variable '{0}' was already defined, but it's overridden by -Environment argument.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已定義環境變數 '{0}'，但其已由 -Environment 引數覆寫。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ErrorMessageBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error Message:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[錯誤訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Examples" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[  To run tests:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  To run tests with additional settings such as  data collectors:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[  執行測試:]D;]A;    >vstest.console.exe tests.dll ]D;]A;  執行測試，同時附上像是資料收集器等其他設定:]D;]A;    >vstest.console.exe  tests.dll /Settings:Local.RunSettings]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExceptionFromExtension" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Exception occurred when instantiating extension '{0}': {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[產生延伸模組時發生例外狀況 '{0}': {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExecutionTimeFormatString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ Total time: {0:0.0000} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ 時間總計: {0:0.0000} {1}]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Test execution time: {0:0.0000} {1}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ExtensionUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FailedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Failed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[失敗]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Failed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Framework35NotSupported" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[不支援 Framework35。若是目標為 .Net Framework 3.5 的專案，就會在 CLR 4.0「相容模式」中執行測試。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Framework|/Framework:<Framework Version>]D;]A;      Target .Net Framework version to be used for test execution. ]D;]A;      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.]D;]A;      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Framework|/Framework:<Framework 版本>]D;]A;      用於測試執行的目標.Net Framework 版本。 ]D;]A;      有效的值為 ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" 等等。]D;]A;      其他支援的值為 Framework40、Framework45、FrameworkCore10 與 FrameworkUap10。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";FrameworkVersionRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Framework 引數需要測試回合的目標 .NET Framework 版本。   範例: /Framework:".NETFramework,Version=v4.5.1"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      Display this usage message.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-?|--Help|/?|/Help]D;]A;      顯示此使用方式訊息。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpArgumentsText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Arguments:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[引數:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpDescriptionText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Description: Runs tests from the specified files.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[描述: 從指定的檔案執行測試。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpOptionsText" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Options:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[選項:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";HelpUsageText" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Usage: vstest.console.exe [Arguments]5D; [Options]5D; [[--]5D; <RunSettings arguments>...]5D;]5D;]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[用法: vstest.console.exe [引數]5D; [選項]5D; [[--]5D; <RunSettings 引數>...]5D;]5D;]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Hours" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Hours]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[小時]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationDeprecated" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /InIsolation flag is deprecated. The tests are always run in a separate process]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/InIsolation 旗標已標示即將淘汰。測試一律會在個別的處理序中執行]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InIsolationHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      Runs the tests in an isolated process. This makes vstest.console.exe ]D;]A;      process less likely to be stopped on an error in the tests, but tests ]D;]A;      may run slower.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--InIsolation|/InIsolation]D;]A;      在隔離的處理序中執行測試。這樣會降低 vstest.console.exe ]D;]A;      處理序在測試中發生錯誤而停止的可能性，但是測試 ]D;]A;      可能會執行得較慢。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The argument {0} is invalid. Please use the /help option to check the list of valid arguments.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 的引數無效。請使用 /help 選項查看有效引數的清單。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBatchSize" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[批次大小無效 {0}。批次大小應該大於零。範例:  /BatchSize:10]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidBlameArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Blame argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Blame 引數 '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidConfiguration" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The given configuration is invalid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[給定的組態無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[診斷引數 '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidDiagFilePath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Diag file path '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[診斷檔案路徑 '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidEnableCodeCoverageCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['EnableCodeCoverage' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /EnableCodeCoverage)，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidFrameworkVersion" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[.Net Framework 版本無效:{0}。請提供 TargetFramework 的全名 (例如: .NETCoreApp,Version=v2.0)。其他支援的 .Net Framework 版本為 Framework40、Framework45、FrameworkCore10 以及 FrameworkUap10。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidInIsolationCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['InIsolation' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /InIsolation)，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidLoggerArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logger argument '{0}' is not valid.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[記錄器引數 '{0}' 無效。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParallelCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['Parallel' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /Parallel)，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidParentProcessIdArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId 引數需要整數的處理序識別碼。請為已啟動這個處理序的父處理序指定處理序識別碼。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPlatformType" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Invalid platform type: {0}. Valid platform types are {1}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[平台類型無效: {0}。有效的平台類型為{1}。]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidPortArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port 引數需要整數的連接埠號碼。指定用於通訊端連線以及接收事件訊息的連接埠。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidResultsDirectoryPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['ResultsDirectory' 中指定的路徑 '{0}' 無效。錯誤: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestAdapterPathCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' 中指定的路徑 '{0}' 無效。錯誤: {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestCaseFilterValueForSpecificTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 引數無法與 /Tests 一起指定。若已指定測試，則篩選測試案例不適用。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidTestRunParameterArgument" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test run parameter argument '{0}' is invalid. Please use the format below.]D;]A;     Format: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合參數的引數 '{0}' 無效。請使用下面的格式。]D;]A;     格式: TestRunParameters.Parameter(name=\"<name>\", value=\"<value>\")]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";InvalidUseVsixExtensionsCommand" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['UseVsixExtensions' 命令中不應該使用引數 {0}。請指定命令指出應該使用或略過 VSIX 延伸模組 (範例: vstest.console.exe myTests.dll /UseVsixExtensions:true) 並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListDiscoverersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListDiscoverers]D;]A;      Lists installed test discoverers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListDiscoverers]D;]A;      列出已安裝的測試探索程式。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListExecutorsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListExecutors]D;]A;      Lists installed test executors.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListExecutors]D;]A;      列出已安裝的測試執行程式。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListLoggersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListLoggers]D;]A;      Lists installed test loggers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListLoggers]D;]A;      列出已安裝的測試記錄器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListSettingsProvidersHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/ListSettingsProviders]D;]A;      Lists installed test settings providers.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ListSettingsProviders]D;]A;      列出已安裝的測試設定提供者。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHeaderMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The following Tests are available:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[可使用下列測試:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ListTestsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<File Name>]D;]A;      Lists all discovered tests from the given test container.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-lt|--ListTests|/lt|/ListTests:<檔案名稱>]D;]A;      列出所有從指定測試容器探索到的測試。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFileIsReadOnly" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} provided is read only]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的檔案 {0} 為唯讀]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerFriendlyNameFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        FriendlyName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not find a test logger with URI or FriendlyName '{0}'.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到具有 URI 或 FriendlyName '{0}' 的測試記錄器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";LoggerUriInvalid" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試記錄器 URI '{0}' 無效。將忽略測試記錄器。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MalformedRunSettingsKey" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[One or more runsettings provided contain invalid token]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[提供的一或多個 runsettings 包含無效的語彙基元]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MicrosoftCommandLineTitle" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool Version {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Microsoft (R) Test Execution Command Line Tool {0} 版]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Minutes" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Minutes]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[分鐘]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";MissingTestSourceFile" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test source files were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定測試來源檔案。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoAdaptersFoundInTestAdapterPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['TestAdapterPath' 中指定的路徑 '{0}' 不包含任何測試配接器。請提供有效的路徑，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentProcessorFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Unrecognized parameter "{0}".]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法辨識的參數 "{0}"。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoArgumentsProvided" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No arguments were specified.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未指定引數。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows 市集應用程式的單元測試，請使用 Windows 市集應用程式單元測試程式庫專案建立應用程式套件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已探索到總計 {0} 個測試，但沒有測試符合指定的選取準則 ({1})。請使用正確的值，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NoTestsAvailableInSources" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 中沒有可供使用的測試。請確定已安裝適當的測試探索程式及執行程式、平台與 Framework 版本設定，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NonDefaultFrameworkAndOrArchDetected" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} 為針對 {1}/{2} 所建置。回合中指定的測試組件應該具有共同的目標 .Net Framework 和平台。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";None" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[None]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";NotRunTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Not Run]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[未執行]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Not Run  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OpenResponseFileError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Error opening response file '{0}']]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[開啟回應檔案 '{0}' 時發生錯誤]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[-o|--Output|/o|/Output:<Output>]D;]A;      The directory containing the binaries to run.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[-o|--Output|/o|/Output:<輸出>]D;]A;      包含要執行的二進位檔案的目錄。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";OutputPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Output path was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到輸出路徑。請提供有效的路徑，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParallelArgumentProcessorHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Parallel|/Parallel]D;]A;      Specifies that the tests be executed in parallel. By default up]D;]A;      to all available cores on the machine may be used.]D;]A;      The number of cores to use may be configured using a settings file.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Parallel|/Parallel]D;]A;      指定平行執行測試。根據預設，最多會使用]D;]A;      機器上所有的可用核心。可使用設定檔設定]D;]A;      要使用的核心數。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ParentProcessIdArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ParentProcessId|/ParentProcessId:<ParentProcessId>]D;]A;      Process Id of the Parent Process responsible for launching current process.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ParentProcessId|/ParentProcessId:<父處理序識別碼>]D;]A;      負責啟動目前處理序的父處理序之處理序識別碼。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PassedTestIndicator" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Passed]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已通過]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Passed   {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneAppContainerTestPrerequisiteFail" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Could not start test run for the tests for Windows Phone app: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[無法為 Windows Phone 應用程式的測試啟動測試回合: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PhoneNoTestEntryPoint" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows Phone 應用程式的單元測試，請使用 Windows Phone 單元測試應用程式專案建立應用程式套件。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Platform|/Platform:<Platform type>]D;]A;      Target platform architecture to be used for test execution. ]D;]A;      Valid values are x86, x64 and ARM.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Platform|/Platform:<平台類型>]D;]A;      用於測試執行的目標平台架構。]D;]A;      有效值為 x86、x64 和 ARM。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PlatformTypeRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Platform 引數需要提供測試回合的目標平台類型。範例:  /Platform:x86]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";PortArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Port|/Port:<Port>]D;]A;      The Port for socket connection and receiving the event messages.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Port|/Port:<連接埠>]D;]A;      通訊端連線以及接收事件訊息的連接埠。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProgressIndicatorString" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test run in progress]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合正在進行中]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ProjectPathNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Path {0} does not exist.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[路徑 {0} 不存在。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResponseFileArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[@<file>]D;]A;      Read response file for more options.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[@<檔案>]D;]A;      讀取回應檔以取得更多選項。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      Test results directory will be created in specified path if not exists.]D;]A;      Example  /ResultsDirectory:<pathToResultsDirectory>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--ResultsDirectory|/ResultsDirectory]D;]A;      若不存在，將會於指定路徑中建立測試結果目錄。]D;]A;      範例  /ResultsDirectory:<結果目錄路徑>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";ResultsDirectoryValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/ResultsDirectory 參數需要值，亦即測試結果的儲存位置。範例:  /ResultsDirectory:c:\MyTestResultsDirectory]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Settings|/Settings:<Settings File>]D;]A;      Settings to use when running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Settings|/Settings:<設定檔>]D;]A;      執行測試時要使用的設定。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The Settings file '{0}' could not be found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到設定檔 '{0}'。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSettingsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Settings parameter requires a settings file to be provided.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Settings 參數要求必須提供設定檔。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSingleAppContainerSource" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Only one app package (.appx file) can be specified for running tests.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[您只能為執行測試指定一個應用程式套件 (.appx 檔)。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunSpecificTestsHelp" ItemType="0" PsrId="308" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--Tests|/Tests:<Test Names>]D;]A;      Run tests with names that match the provided values. To provide multiple]D;]A;      values, separate them by commas.]D;]A;      Examples: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--Tests|/Tests:<測試名稱>]D;]A;      對名稱符合所提供值的項目執行測試。]D;]A;      若要提供多個值，請使用逗號將其分隔。]D;]A;      範例: /Tests:TestMethod1]D;]A;                /Tests:TestMethod1,testMethod2]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunTestsArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern]D;]A;      by spaces. Set console logger verbosity to detailed to view matched test files.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      從指定的檔案或萬用字元模式執行測試。分隔多個測試檔名稱或模式]D;]A;      由空格分隔。將主控台記錄器詳細程度設定為詳細來檢視符合的測試檔案。]D;]A;      範例: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]D;]A;                testproject*.dll my*project.dll]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[[TestFileNames]5D;]D;]A;      Run tests from the specified files. Separate multiple test file names]D;]A;      by spaces.]D;]A;      Examples: mytestproject.dll]D;]A;                mytestproject.dll myothertestproject.exe]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";RunsettingsWithDCErrorMessage" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[除了程式碼涵蓋範圍與 Microsoft Fakes 以外，內嵌測試設定不支援透過回合設定來設定的資料收集器。如需詳細資訊，請參閱 https://aka.ms/vstest-configure-datacollector。回合設定: {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SearchStringDelimiter" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[,]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Seconds" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Seconds]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[秒]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SettingFormat" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        SettingName: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        SettingName: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SkippedTestIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Skipped]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已跳過]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Skipped  {0}]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SomeTestsUnavailableAfterFiltering" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已探索到總計 {0} 個測試，但有些測試不符合指定的選取準則 ({1})。請使用正確的值並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SpecificTestsRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /Tests argument requires one or more specific test names or their substrings.]D;]A;       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/Tests 引數必須有一或多個特定的測試名稱或它們的子字串。]D;]A;       範例: /Tests:TestsMethod1, /Tests:TestMethod1,method2 ]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StacktraceBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Stack Trace:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[堆疊追蹤:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingDiscovery" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test discovery, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在啟動測試探索，請稍候...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StartingExecution" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Starting test execution, please wait...]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[正在啟動測試執行，請稍候...]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdErrMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Error Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[標準錯誤訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StdOutMessagesBanner" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Standard Output Messages:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[標準輸出訊息:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";StringFormatToJoinTwoStrings" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SuggestTestAdapterPathIfNoTestsIsFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[此外，可使用 /TestAdapterPath 命令，指定要測試配接器的路徑。範例為 /TestAdapterPath:<自訂配接器的路徑>。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileTypesIndicator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Supported File Types:]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        支援的檔案類型:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0},]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}，]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SupportedFileWithoutSeparator" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔離模式執行 Windows 市集應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInMultiTargetingMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[依照測試回合的有效平台 {0} 和 .Net Framework {1} 設定的要求，使用隔離模式執行測試。使用 /inIsolation 參數可隱藏這個警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToIsolationInPhoneAppContainerMode" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔離模式執行 Windows Phone 應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SwitchToNoIsolation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用隔離模式執行測試，因為在 runsettings 中已啟用診斷資料配接器。使用 /inIsolation 參數可隱藏這個警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathDoesNotExist" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The custom test adapter search path provided was not found, provide a valid path and try again.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到提供的自訂測試配接器搜尋路徑。請提供有效的路徑，並再試一次。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      This makes vstest.console.exe process use custom test adapters]D;]A;      from a given path (if any) in the test run. ]D;]A;      Example  /TestAdapterPath:<pathToCustomAdapters>]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestAdapterPath|/TestAdapterPath]D;]A;      這可讓 vstest.console.exe 處理序在測試回合中，]D;]A;      使用指定路徑 (如有指定) 中的自訂測試配接器。]D;]A;      範例 /TestAdapterPath:<自訂配接器的路徑>]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestAdapterPathValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestAdapterPath 參數需要一個值，這個值是包含自訂測試配接器之位置的路徑。範例:  /TestAdapterPath:c:\MyCustomAdapters]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterArgumentHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      Run tests that match the given expression.]D;]A;      <Expression> is of the format <property>Operator<value>[|&<Expression>]5D;]D;]A;         where Operator is one of =, != or ~  (Operator ~ has 'contains']D;]A;         semantics and is applicable for string properties like DisplayName).]D;]A;         Parenthesis () can be used to group sub-expressions.]D;]A;      Examples: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[--TestCaseFilter|/TestCaseFilter:<Expression>]D;]A;      執行符合指定運算式的測試。]D;]A;      <Expression> 的格式為 <property>Operator<value>[|&<Expression>]5D;]D;]A;         其中 Operator 是 =、!= 或 ~ 的其中之一 (運算子 ~ 具有 'contains']D;]A;         語意，且適用於 DisplayName 之類的字串屬性)。]D;]A;         您可以使用括號 () 來分組子運算式。]D;]A;      範例: /TestCaseFilter:"Priority=1"]D;]A;                /TestCaseFilter:"(FullyQualifiedName~Nightly]D;]A;                                  |Name=MyTestMethod)"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestCaseFilterValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /TestCaseFilter argument requires the filter value.]D;]A;        Filter value can be <property>=<value> type.]D;]A;        Examples: "Priority=1", "TestCategory=Nightly"]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/TestCaseFilter 引數需要篩選值。]D;]A;        篩選值可以是 <property>=<value> 類型。]D;]A;        範例: "Priority=1", "TestCategory=Nightly"]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAborted" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合已中止。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunAbortedWithError" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Aborted with error {0}.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試執行已中止，錯誤 {0}。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunCanceled" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Canceled.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合已取消。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunFailed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Failed.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合失敗。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSuccessful" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Test Run Successful.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試回合成功。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummary" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} - 失敗: {1}，通過: {2}，略過: {3}，總計: {4}，持續時間: {5}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryAssemblyAndFramework" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[ - {0} {1}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ - {0} {1}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryFailedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Failed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     失敗: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryForCanceledOrAbortedRun" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: Unknown]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試數總計: 未知]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryPassedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[     Passed: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[     通過: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummarySkippedTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[    Skipped: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[    跳過: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestRunSummaryTotalTests" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Total tests: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[測試數總計: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSettingsFrameworkMismatch" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[使用架構 {0} 執行測試。指定 /Framework:{1} 可隱藏這個警告。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourceFileNotFound" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The test source file "{0}" provided was not found.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到提供的測試來源檔案 "{0}"。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TestSourcesDiscovered" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[A total of {0} test files matched the specified pattern.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[總共有 {0} 個測試檔案與指定的模式相符。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";TimeElapsed" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Time elapsed :]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[經過時間:]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UriOfDefaultExecutor" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[        Default Executor Uri: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[        預設執行程式 URI: {0}]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsDeprecation" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions 即將淘汰。請改用 /TestAdapterPath。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsHelp" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[/UseVsixExtensions]D;]A;      This makes vstest.console.exe process use or skip the VSIX extensions ]D;]A;      installed(if any) in the test run. ]D;]A;      Example  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions]D;]A;      這可讓 vstest.console.exe 處理序使用或略過測試回合中 ]D;]A;      已安裝的 VSIX 延伸模組 (如果有的話)。]D;]A;      範例  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";UseVsixExtensionsValueRequired" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[/UseVsixExtensions 參數需要一個值。如果為 'true'，已安裝的 VSIX 延伸模組 (如果有的話) 將用於測試回合。如果為 false，則會加以忽略。範例:  /UseVsixExtensions:true]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";VstestDiagLogOutputPath" ItemType="0" PsrId="308" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Logging Vstest Diagnostics in file: {0}]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在檔案 {0} 中記錄 Vstest 診斷]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
index 78723fa09a..3ae04ca9d3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,28 +5,29 @@
   </packageRestore>
   <packageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from vs-code-coverage -->
-    <!--  End: Package sources from vs-code-coverage -->
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <!-- When building TestAssets we read the keys from here and provide them directly to dotnet restore together with path to artifacts/packages/<configuration>/Shipping,
+    because the path to packages contains configuration and we don't want to modify a checked-in file in our repo to be able to build. -->
+    <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+    <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
+    <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
-    <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
-    <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
-    <add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
-    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
-    <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+    <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <!-- When building isolated test projects we copy this file into temp, and insert localy-built-packages source here, that points to artifacts/packages/<configuration>/Shipping. -->
   </packageSources>
   <fallbackPackageFolders>
     <clear />
   </fallbackPackageFolders>
   <config>
-    <!-- This path is relative as a workaround to https://github.com/NuGet/Home/issues/2831 -->
-    <add key="globalPackagesFolder" value="packages" />
+    <!-- Location of .packages is forced by Arcade in their scripts, but we also want this to be respected by VS, so we want to keep this setting here. -->
+    <!-- When building isolated test projects we copy this file into temp and replace ".packages" with full path to that folder. -->
+    <add key="globalPackagesFolder" value=".packages" />
   </config>
   <disabledPackageSources />
 </configuration>
diff --git a/README.md b/README.md
index 74b6ab2b98..4fe1745bd9 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,80 @@
-### VSTest
-The Visual Studio Test Platform is an open and extensible test platform that enables running tests, collect diagnostics data and report results. The Test Platform supports running tests written in various test frameworks, and using a pluggable adapter model. Based on user-choice, the desired test framework and its corresponding adapter can be acquired as a vsix or as NuGet package as the case may be. Adapters can be written in terms of a public API exposed by the Test Platform.
+# VSTest
+
+The Visual Studio Test Platform is an open and extensible test platform that runs tests, collects diagnostics data, and reports results. The Test Platform supports running tests written in various test frameworks, and using a pluggable adapter model. Based on user-choice, the desired test framework and its corresponding adapter can be acquired as a vsix or as NuGet package as the case may be. Adapters can be written in terms of a public API exposed by the Test Platform.
 
 The Test Platform currently ships as part Visual Studio 2019, and in the .NET Core Tools Preview 3.
 
-### Build status
+## Build status
+
 [![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/vstest/microsoft.vstest.ci?branchName=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=935&branchName=main)
 
-### Contributing
+## Contributing
+
+**IMPORTANT: We only accept PRs for which exists a previously discussed and approved issue.**
+
 There are many ways to contribute to VSTest
+
 - [Submit issues](https://github.com/Microsoft/vstest/issues) and help verify fixes as they are checked in.
-- Review the [source code changes](https://github.com/Microsoft/vstest/pulls).
-- [Contribute features and fixes](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md).
-- Contribute to the [documentation](https://github.com/Microsoft/vstest-docs).
-
-### Documentation
-- [Test Platform Architecture](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0001-Test-Platform-Architecture.md)
-- [Test Discovery Protocol](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0002-Test-Discovery-Protocol.md)
-- [Test Execution Protocol](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0003-Test-Execution-Protocol.md)
-- [Adapter Extensibility](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0004-Adapter-Extensibility.md)
-- [Test Platform SDK](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0005-Test-Platform-SDK.md)
-- [Editors API Specification](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0007-Editors-API-Specification.md)
-- [Data collection Protocol](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0006-DataCollection-Protocol.md)
-- [Translation Layer](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0008-TranslationLayer.md)
-- [Editors API Revision Update](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0009-Editors-API-RevisionUpdate.md)
-- [TranslationLayer](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0008-TranslationLayer.md)
-- [Source Information For Discovered Tests](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0010-Source-Information-For-Discovered-Tests.md)
-- [Test Session Timeout](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0011-Test-Session-Timeout.md)
-- [Test Adapter Lookup](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0013-Test-Adapter-Lookup.md)
-- [Packaging](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0014-Packaging.md)
-- [Telemetry](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0015-Telemetry.md)
-- [Loggers Information From RunSettings](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0016-Loggers-Information-From-RunSettings.md)
-- [Properties for TestCases in Managed Code](https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md)
-- [Skip Default Adapters](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0018-Skip-Default-Adapters.md)
-- [Disable Appdomain While Running Tests](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0019-Disable-Appdomain-While-Running-Tests.md)
-- [Improving Logic To Pass Sources To Adapters](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0020-Improving-Logic-To-Pass-Sources-To-Adapters.md)
-- [Code Coverage for .Net Core](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0021-CodeCoverageForNetCore.md)
-- [User Specified TestAdapter Lookup](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md)
-- [TestSettings Deprecation](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0023-TestSettings-Deprecation.md)
-- [Blame Collector Options](https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0024-Blame-Collector-Options.md)
-
-### Building
+- Review the [open PRs](https://github.com/Microsoft/vstest/pulls).
+- [Contribute features and fixes](./docs/contribute.md).
+- Contribute to the documentation.
+
+NOTE: When adding a new public API, always add it directly to the `PublicAPI.Shipped.txt` file. This helps us ensure we are always considering potential breaking changes (even between successive commits of un-released version) and avoids the burden of the unshipped to shipped commit.
+
+## Documentation
+
+### Features
+
+- [Test Platform Architecture](./docs/RFCs/0001-Test-Platform-Architecture.md)
+- [Test Discovery Protocol](./docs/RFCs/0002-Test-Discovery-Protocol.md)
+- [Test Execution Protocol](./docs/RFCs/0003-Test-Execution-Protocol.md)
+- [Adapter Extensibility](./docs/RFCs/0004-Adapter-Extensibility.md)
+- [Test Platform SDK](./docs/RFCs/0005-Test-Platform-SDK.md)
+- [Editors API Specification](./docs/RFCs/0007-Editors-API-Specification.md)
+- [Data collection Protocol](./docs/RFCs/0006-DataCollection-Protocol.md)
+- [Translation Layer](./docs/RFCs/0008-TranslationLayer.md)
+- [Editors API Revision Update](./docs/RFCs/0009-Editors-API-RevisionUpdate.md)
+- [TranslationLayer](./docs/RFCs/0008-TranslationLayer.md)
+- [Source Information For Discovered Tests](./docs/RFCs/0010-Source-Information-For-Discovered-Tests.md)
+- [Test Session Timeout](./docs/RFCs/0011-Test-Session-Timeout.md)
+- [Test Adapter Lookup](./docs/RFCs/0013-Test-Adapter-Lookup.md)
+- [Packaging](./docs/RFCs/0014-Packaging.md)
+- [Telemetry](./docs/RFCs/0015-Telemetry.md)
+- [Loggers Information From RunSettings](./docs/RFCs/0016-Loggers-Information-From-RunSettings.md)
+- [Properties for TestCases in Managed Code](./docs/RFCs/0017-Managed-TestCase-Properties.md)
+- [Skip Default Adapters](./docs/RFCs/0018-Skip-Default-Adapters.md)
+- [Disable Appdomain While Running Tests](./docs/RFCs/0019-Disable-Appdomain-While-Running-Tests.md)
+- [Improving Logic To Pass Sources To Adapters](./docs/RFCs/0020-Improving-Logic-To-Pass-Sources-To-Adapters.md)
+- [Code Coverage for .Net Core](./docs/RFCs/0021-CodeCoverageForNetCore.md)
+- [User Specified TestAdapter Lookup](./docs/RFCs/0022-User-Specified-TestAdapter-Lookup.md)
+- [TestSettings Deprecation](./docs/RFCs/0023-TestSettings-Deprecation.md)
+- [Blame Collector Options](./docs/RFCs/0024-Blame-Collector-Options.md)
+
+### Other
+
+- [Environment Variables](./docs/environment-variables.md)
+- [Roadmap](./docs/releases.md)
+- [Troubleshooting guide](./docs/troubleshooting.md)
+
+## Building
+
 VSTest can be built from within Visual Studio or from the CLI.
-- [Building with Visual Studio](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md#building-with-visual-studio)
-- [Building with CLI, CI, Editors](https://github.com/Microsoft/vstest-docs/blob/main/docs/contribute.md#building-with-cli-ci-editors)
 
-### Microsoft Open Source Code of Conduct
+- [Building with Visual Studio](./docs/contribute.md#building-with-visual-studio)
+- [Building with CLI, CI, Editors](./docs/contribute.md#building-with-cli-ci-editors)
+
+## Microsoft Open Source Code of Conduct
+
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
-### License
-VSTest platform is licensed under the [MIT license](https://github.com/Microsoft/vstest/blob/main/LICENSE)
+## License
+
+VSTest platform is licensed under the [MIT license](./LICENSE)
+
+## Issue Tracking
 
-### Issue Tracking
-Please see [issue tracking](https://github.com/Microsoft/vstest-docs/blob/main/issuetracking.md) for a description of the workflow we use to process issues.
+Please see [issue tracking](./issuetracking.md) for a description of the workflow we use to process issues.
 
-### Roadmap
-For more information on shipped and upcoming features/enhancements please refer to our [Releases](https://github.com/Microsoft/vstest-docs/blob/main/docs/releases.md) and [Quarterly Checkin reports](https://github.com/Microsoft/vstest-docs/tree/main/Quarterly%20Checkins)
+## Roadmap
 
+For more information on shipped and upcoming features/enhancements please refer to our [Releases](./docs/releases.md).
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..869fdfe2b2
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/THIRD-PARTY-NOTICES.txt b/THIRD-PARTY-NOTICES.txt
new file mode 100644
index 0000000000..b7c3258db7
--- /dev/null
+++ b/THIRD-PARTY-NOTICES.txt
@@ -0,0 +1,51 @@
+VSTest uses third-party libraries or other resources that may be
+distributed under licenses different than the VSTest software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention by posting an issue.
+
+The attached notices are provided for information only.
+
+License notice for SimpleJSON
+-------------------------------------
+https://github.com/Bunny83/SimpleJSON
+
+The MIT License (MIT)
+
+Copyright (c) 2012-2017 Markus Göbel (Bunny83)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+License notice for NuGet.Client (NuGet.Frameworks)
+--------------------------------------------------
+Copyright (c) .NET Foundation and Contributors.
+
+All rights reserved.
+
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+these files except in compliance with the License. You may obtain a copy of the
+License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/TestPlatform.sln b/TestPlatform.sln
index fde613978a..6398540d95 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -8,6 +8,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CoreUtilities", "src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj", "{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}"
+	ProjectSection(SolutionItems) = preProject
+		test\.editorconfig = test\.editorconfig
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CoreUtilities.UnitTests", "test\Microsoft.TestPlatform.CoreUtilities.UnitTests\Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj", "{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}"
 EndProject
@@ -43,8 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{020E15EA-731F-4667-95AF-226671E0C3AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{595BE9C1-E10F-4E50-938A-E6C248D3F950}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Client.UnitTests", "test\Microsoft.TestPlatform.Client.UnitTests\Microsoft.TestPlatform.Client.UnitTests.csproj", "{0D59BA81-6279-4650-AEBB-4EA735C28A1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common.UnitTests", "test\Microsoft.TestPlatform.Common.UnitTests\Microsoft.TestPlatform.Common.UnitTests.csproj", "{DE730F17-7D5C-4D9D-B479-025024BF4F1D}"
@@ -71,43 +72,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{0D4DF78D-7
 		scripts\perf\perfconfig.csv = scripts\perf\perfconfig.csv
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props
-		scripts\build\TestPlatform.Localization.targets = scripts\build\TestPlatform.Localization.targets
-		scripts\build\TestPlatform.Settings.targets = scripts\build\TestPlatform.Settings.targets
-		scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}"
 	ProjectSection(SolutionItems) = preProject
-		scripts\build.ps1 = scripts\build.ps1
-		scripts\build.sh = scripts\build.sh
-		scripts\PortableToFullPdb.ps1 = scripts\PortableToFullPdb.ps1
-		scripts\stylecop.json = scripts\stylecop.json
-		scripts\stylecop.ruleset = scripts\stylecop.ruleset
-		scripts\stylecop.test.ruleset = scripts\stylecop.test.ruleset
 		scripts\test.ps1 = scripts\test.ps1
 		scripts\test.sh = scripts\test.sh
-		scripts\verify-nupkgs.ps1 = scripts\verify-nupkgs.ps1
-		scripts\verify-sign.ps1 = scripts\verify-sign.ps1
-		scripts\vsts-prebuild.ps1 = scripts\vsts-prebuild.ps1
 		scripts\write-release-notes.ps1 = scripts\write-release-notes.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		azure-pipelines.yml = azure-pipelines.yml
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		global.json = global.json
 		Nuget.config = Nuget.config
+		THIRD-PARTY-NOTICES.txt = THIRD-PARTY-NOTICES.txt
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.csproj", "{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.SmokeTests", "test\Microsoft.TestPlatform.SmokeTests\Microsoft.TestPlatform.SmokeTests.csproj", "{156F8811-28BB-4EC7-87D9-434F10FB7DBE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.PerformanceTests", "test\Microsoft.TestPlatform.PerformanceTests\Microsoft.TestPlatform.PerformanceTests.csproj", "{A5B167ED-873A-4762-9326-5F43B8D3AFF6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.ObjectModel.PlatformTests", "test\Microsoft.TestPlatform.ObjectModel.PlatformTests\Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj", "{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{D27E1CB4-C641-4C6C-A140-EF5F6215AE29}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Build.UnitTests", "test\Microsoft.TestPlatform.Build.UnitTests\Microsoft.TestPlatform.Build.UnitTests.csproj", "{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}"
@@ -120,12 +102,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.PlatformTests
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package\package.csproj", "{E141A226-CC0A-4F26-BD17-4AE427D81C3B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{376C19DE-31E2-4FF6-88FC-0D0D6233C999}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CommunicationUtilities.PlatformTests", "test\Microsoft.TestPlatform.CommunicationUtilities.PlatformTests\Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj", "{3E698655-0701-482E-9AA7-F956F6337FC7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranslationLayer.UnitTests", "test\TranslationLayer.UnitTests\TranslationLayer.UnitTests.csproj", "{7B48115A-B766-4B55-93A8-C08A42C37710}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHostProvider.UnitTests", "test\Microsoft.TestPlatform.TestHostProvider.UnitTests\Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj", "{FBF74C8F-695C-4967-84AC-358EEFB1376D}"
@@ -144,10 +122,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataCollectors", "DataColle
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests", "test\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj", "{21DB138B-85B7-479E-91FE-01E0F972EC56}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.PlatformTests", "test\vstest.console.PlatformTests\vstest.console.PlatformTests.csproj", "{8C068694-23A2-47A2-A0DD-DB82D0AF0142}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common.PlatformTests", "test\Microsoft.TestPlatform.Common.PlatformTests\Microsoft.TestPlatform.Common.PlatformTests.csproj", "{24C7683D-2607-4901-B8EB-83A57E49E93D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator", "src\SettingsMigrator\SettingsMigrator.csproj", "{69F5FF81-5615-4F06-B83C-FCF979BB84CA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator.UnitTests", "test\SettingsMigrator.UnitTests\SettingsMigrator.UnitTests.csproj", "{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}"
@@ -170,671 +144,332 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpMinitool.x86", "src\Dat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AttachVS", "src\AttachVS\AttachVS.csproj", "{8238A052-D626-49EB-A011-51DC6D0DBA30}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playground", "playground", "{6CE2F530-582B-4695-A209-41065E103426}"
+	ProjectSection(SolutionItems) = preProject
+		playground\README.md = playground\README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlatform.Playground", "playground\TestPlatform.Playground\TestPlatform.Playground.csproj", "{545A88D3-1AE2-4D39-9B7C-C691768AD17F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.ProgrammerTests", "test\vstest.ProgrammerTests\vstest.ProgrammerTests.csproj", "{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent", "test\Intent\Intent.csproj", "{BFBB35C9-6437-480A-8DCC-AE3700110E7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Primitives", "test\Intent.Primitives\Intent.Primitives.csproj", "{29270853-90DC-4C39-9621-F47AE40A79B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.arm64", "src\testhost.arm64\testhost.arm64.csproj", "{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpMinitool.arm64", "src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj", "{62E9D32B-B989-43CF-81A2-B38B3367FCA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest1", "playground\MSTest1\MSTest1.csproj", "{4DA57968-F547-4019-8381-03A218B6C385}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest2", "playground\MSTest2\MSTest2.csproj", "{874841C0-DCB9-4678-A952-5E06286CA2B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.arm64", "src\datacollector.arm64\datacollector.arm64.csproj", "{D27C951E-1935-4D76-A0E5-A00D7829C654}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.arm64", "src\vstest.console.arm64\vstest.console.arm64.csproj", "{AD0EB901-E227-42E0-B7AE-28C3150B9A8B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeCoverage", "src\package\Microsoft.CodeCoverage\Microsoft.CodeCoverage.csproj", "{AE13C83A-C01A-4C25-9A29-A440E014F998}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Test.Sdk", "src\package\Microsoft.NET.Test.Sdk\Microsoft.NET.Test.Sdk.csproj", "{B9340314-6A79-496C-8BF9-88F1F6E3F096}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CLI", "src\package\Microsoft.TestPlatform.CLI\Microsoft.TestPlatform.CLI.csproj", "{75054BFF-DC0F-4094-8F05-62776663DF0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Internal.Uwp", "src\package\Microsoft.TestPlatform.Internal.Uwp\Microsoft.TestPlatform.Internal.Uwp.csproj", "{D7B948FC-C4E7-41A9-84A7-8F1A725458E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Portable", "src\package\Microsoft.TestPlatform.Portable\Microsoft.TestPlatform.Portable.csproj", "{3162D387-7424-481A-9A1E-8193BF7FABE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHost", "src\package\Microsoft.TestPlatform.TestHost\Microsoft.TestPlatform.TestHost.csproj", "{9297D1FA-F9C0-42D2-84FA-06DA323357C9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{DCCF71EC-14DB-4FB8-8F9E-2DFAB69D9F15}"
+	ProjectSection(SolutionItems) = preProject
+		eng\AfterSolutionBuild.targets = eng\AfterSolutionBuild.targets
+		eng\Analyzers.props = eng\Analyzers.props
+		eng\Publishing.props = eng\Publishing.props
+		eng\Signing.props = eng\Signing.props
+		eng\SourceBuild.props = eng\SourceBuild.props
+		eng\verify-nupkgs.ps1 = eng\verify-nupkgs.ps1
+		eng\Versions.props = eng\Versions.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI", "src\package\Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI\Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj", "{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform", "src\package\Microsoft.TestPlatform\Microsoft.TestPlatform.csproj", "{4454139C-174A-4DD8-8E76-657D9F03BA09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Acceptance.IntegrationTests", "test\Microsoft.TestPlatform.Acceptance.IntegrationTests\Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj", "{450D5371-32A1-4667-987E-40D75F035233}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests", "test\Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests\Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj", "{E602AB2B-048F-4317-8A6B-A225C00173FA}"
+EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{10b6ade1-f808-4612-801d-4452f5b52242}*SharedItemsImports = 5
-		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{27dfbd04-64b2-4f1b-82b2-006620cca6f8}*SharedItemsImports = 5
-		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{2c7ce1f8-e73e-4987-8023-b5a0ebac86e8}*SharedItemsImports = 5
-		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{71cb42ff-e750-4a3b-9c3a-ac938853cc89}*SharedItemsImports = 5
-		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{7f26eda3-c8c4-4b7f-a9b6-d278c2f40a13}*SharedItemsImports = 13
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.Build.0 = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.Build.0 = Debug|Any CPU
 		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.ActiveCfg = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.Build.0 = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.ActiveCfg = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.Build.0 = Release|Any CPU
 		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x64.Build.0 = Debug|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x86.Build.0 = Debug|Any CPU
 		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x64.ActiveCfg = Release|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x64.Build.0 = Release|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x86.ActiveCfg = Release|Any CPU
-		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x86.Build.0 = Release|Any CPU
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.Build.0 = Debug|Any CPU
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.Build.0 = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.Build.0 = Release|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.Build.0 = Debug|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.Build.0 = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.Build.0 = Release|Any CPU
 		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.Build.0 = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.Build.0 = Debug|Any CPU
 		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.ActiveCfg = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.Build.0 = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.ActiveCfg = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.Build.0 = Release|Any CPU
 		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.Build.0 = Debug|Any CPU
 		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.Build.0 = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.ActiveCfg = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.Build.0 = Release|Any CPU
 		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.Build.0 = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.Build.0 = Debug|Any CPU
 		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.ActiveCfg = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.Build.0 = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.ActiveCfg = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.Build.0 = Release|Any CPU
 		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.Build.0 = Debug|Any CPU
 		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.Build.0 = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.ActiveCfg = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.Build.0 = Release|Any CPU
 		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.Build.0 = Debug|Any CPU
 		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.Build.0 = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.Build.0 = Release|Any CPU
 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.Build.0 = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.Build.0 = Debug|Any CPU
 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.ActiveCfg = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.Build.0 = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.ActiveCfg = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.Build.0 = Release|Any CPU
 		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.Build.0 = Debug|Any CPU
 		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.Build.0 = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.Build.0 = Release|Any CPU
 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.Build.0 = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.Build.0 = Debug|Any CPU
 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.ActiveCfg = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.Build.0 = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.ActiveCfg = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.Build.0 = Release|Any CPU
 		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.Build.0 = Debug|Any CPU
 		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.Build.0 = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.Build.0 = Release|Any CPU
 		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.Build.0 = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.Build.0 = Debug|Any CPU
 		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.ActiveCfg = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.Build.0 = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.ActiveCfg = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.Build.0 = Release|Any CPU
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.Build.0 = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.Build.0 = Debug|Any CPU
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.ActiveCfg = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.Build.0 = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.ActiveCfg = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.Build.0 = Release|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.Build.0 = Debug|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x86.Build.0 = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x64.ActiveCfg = Release|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x64.Build.0 = Release|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x86.ActiveCfg = Release|Any CPU
-		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x86.Build.0 = Release|Any CPU
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x86.Build.0 = Debug|Any CPU
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x64.ActiveCfg = Release|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x64.Build.0 = Release|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x86.Build.0 = Release|Any CPU
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x64.Build.0 = Debug|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x86.Build.0 = Debug|Any CPU
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x64.ActiveCfg = Release|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x64.Build.0 = Release|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x86.ActiveCfg = Release|Any CPU
-		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x86.Build.0 = Release|Any CPU
 		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x64.Build.0 = Debug|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x86.Build.0 = Debug|Any CPU
 		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x64.ActiveCfg = Release|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x64.Build.0 = Release|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x86.ActiveCfg = Release|Any CPU
-		{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x86.Build.0 = Release|Any CPU
 		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|x64.Build.0 = Debug|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Debug|x86.Build.0 = Debug|Any CPU
 		{376A7588-50DF-46CD-955B-0309F491D830}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{376A7588-50DF-46CD-955B-0309F491D830}.Release|Any CPU.Build.0 = Release|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Release|x64.ActiveCfg = Release|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Release|x64.Build.0 = Release|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Release|x86.ActiveCfg = Release|Any CPU
-		{376A7588-50DF-46CD-955B-0309F491D830}.Release|x86.Build.0 = Release|Any CPU
 		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x64.Build.0 = Debug|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x86.Build.0 = Debug|Any CPU
 		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x64.ActiveCfg = Release|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x64.Build.0 = Release|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x86.Build.0 = Release|Any CPU
 		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x64.Build.0 = Debug|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x86.Build.0 = Debug|Any CPU
 		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x64.Build.0 = Release|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.ActiveCfg = Release|Any CPU
-		{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.Build.0 = Release|Any CPU
 		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x64.Build.0 = Debug|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x86.Build.0 = Debug|Any CPU
 		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x64.ActiveCfg = Release|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x64.Build.0 = Release|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x86.Build.0 = Release|Any CPU
 		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x86.Build.0 = Debug|Any CPU
 		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x64.Build.0 = Release|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x86.Build.0 = Release|Any CPU
 		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x64.Build.0 = Debug|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x86.Build.0 = Debug|Any CPU
 		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x64.ActiveCfg = Release|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x64.Build.0 = Release|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x86.ActiveCfg = Release|Any CPU
-		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x86.Build.0 = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x64.Build.0 = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x86.Build.0 = Debug|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x64.ActiveCfg = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x64.Build.0 = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x86.ActiveCfg = Release|Any CPU
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x86.Build.0 = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x64.Build.0 = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x86.Build.0 = Debug|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x64.ActiveCfg = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x64.Build.0 = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x86.ActiveCfg = Release|Any CPU
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x86.Build.0 = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x64.Build.0 = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x86.Build.0 = Debug|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x64.ActiveCfg = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x64.Build.0 = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x86.ActiveCfg = Release|Any CPU
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x86.Build.0 = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x64.Build.0 = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x86.Build.0 = Debug|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x64.ActiveCfg = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x64.Build.0 = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.ActiveCfg = Release|Any CPU
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.Build.0 = Release|Any CPU
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|x64.Build.0 = Debug|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Debug|x86.Build.0 = Debug|Any CPU
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|x64.ActiveCfg = Release|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|x64.Build.0 = Release|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|x86.ActiveCfg = Release|Any CPU
-		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}.Release|x86.Build.0 = Release|Any CPU
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x86.Build.0 = Debug|Any CPU
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x64.Build.0 = Release|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.Build.0 = Release|Any CPU
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.Build.0 = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.Build.0 = Debug|Any CPU
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.ActiveCfg = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.Build.0 = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.ActiveCfg = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.Build.0 = Release|Any CPU
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|x64.Build.0 = Debug|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Debug|x86.Build.0 = Debug|Any CPU
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x64.ActiveCfg = Release|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x64.Build.0 = Release|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x86.ActiveCfg = Release|Any CPU
-		{FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x86.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x86.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x64.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x64.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.Build.0 = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|x64.Build.0 = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Debug|x86.Build.0 = Debug|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x64.ActiveCfg = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x64.Build.0 = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x86.ActiveCfg = Release|Any CPU
-		{3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x86.Build.0 = Release|Any CPU
 		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x64.Build.0 = Debug|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x86.Build.0 = Debug|Any CPU
 		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x64.ActiveCfg = Release|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x64.Build.0 = Release|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x86.ActiveCfg = Release|Any CPU
-		{7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x86.Build.0 = Release|Any CPU
 		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|x64.Build.0 = Debug|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|x86.Build.0 = Debug|Any CPU
 		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x64.ActiveCfg = Release|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x64.Build.0 = Release|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x86.ActiveCfg = Release|Any CPU
-		{FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x86.Build.0 = Release|Any CPU
 		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.Build.0 = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.Build.0 = Debug|Any CPU
 		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.Build.0 = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.Build.0 = Release|Any CPU
 		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x64.Build.0 = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x86.Build.0 = Debug|Any CPU
 		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x64.ActiveCfg = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x64.Build.0 = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.Build.0 = Release|Any CPU
 		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|x64.Build.0 = Debug|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Debug|x86.Build.0 = Debug|Any CPU
 		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x64.ActiveCfg = Release|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x64.Build.0 = Release|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x86.Build.0 = Release|Any CPU
 		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x64.Build.0 = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x86.Build.0 = Debug|Any CPU
 		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x64.ActiveCfg = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x64.Build.0 = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x86.ActiveCfg = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x86.Build.0 = Release|Any CPU
 		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|x64.Build.0 = Debug|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Debug|x86.Build.0 = Debug|Any CPU
 		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|x64.ActiveCfg = Release|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|x64.Build.0 = Release|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|x86.ActiveCfg = Release|Any CPU
-		{21DB138B-85B7-479E-91FE-01E0F972EC56}.Release|x86.Build.0 = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Debug|x86.Build.0 = Debug|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x64.Build.0 = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142}.Release|x86.Build.0 = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x64.Build.0 = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Debug|x86.Build.0 = Debug|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x64.ActiveCfg = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x64.Build.0 = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x86.ActiveCfg = Release|Any CPU
-		{24C7683D-2607-4901-B8EB-83A57E49E93D}.Release|x86.Build.0 = Release|Any CPU
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.Build.0 = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.Build.0 = Debug|Any CPU
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.ActiveCfg = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.Build.0 = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.Build.0 = Release|Any CPU
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x64.Build.0 = Debug|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Debug|x86.Build.0 = Debug|Any CPU
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.ActiveCfg = Release|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x64.Build.0 = Release|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E}.Release|x86.Build.0 = Release|Any CPU
 		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.Build.0 = Debug|Any CPU
 		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.Build.0 = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.Build.0 = Release|Any CPU
 		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x64.Build.0 = Debug|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Debug|x86.Build.0 = Debug|Any CPU
 		{41248B96-6E15-4E5E-A78F-859897676814}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41248B96-6E15-4E5E-A78F-859897676814}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x64.ActiveCfg = Release|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x64.Build.0 = Release|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x86.ActiveCfg = Release|Any CPU
-		{41248B96-6E15-4E5E-A78F-859897676814}.Release|x86.Build.0 = Release|Any CPU
 		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|x64.Build.0 = Debug|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Debug|x86.Build.0 = Debug|Any CPU
 		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|Any CPU.Build.0 = Release|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|x64.ActiveCfg = Release|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|x64.Build.0 = Release|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|x86.ActiveCfg = Release|Any CPU
-		{074F5BD6-DC05-460B-B78F-044D125FD787}.Release|x86.Build.0 = Release|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|x64.Build.0 = Debug|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Debug|x86.Build.0 = Debug|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x64.ActiveCfg = Release|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x64.Build.0 = Release|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x86.ActiveCfg = Release|Any CPU
-		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x86.Build.0 = Release|Any CPU
 		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.Build.0 = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.Build.0 = Debug|Any CPU
 		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.ActiveCfg = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.Build.0 = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.Build.0 = Release|Any CPU
 		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|x64.Build.0 = Debug|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Debug|x86.Build.0 = Debug|Any CPU
 		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|x64.ActiveCfg = Release|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|x64.Build.0 = Release|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|x86.ActiveCfg = Release|Any CPU
-		{33A20B85-7024-4112-B1E7-00CD0E4A9F96}.Release|x86.Build.0 = Release|Any CPU
 		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Debug|x86.Build.0 = Debug|Any CPU
 		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|x64.Build.0 = Release|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C88C923-3D7A-4492-9241-7A489750CAB7}.Release|x86.Build.0 = Release|Any CPU
 		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|x64.Build.0 = Debug|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Debug|x86.Build.0 = Debug|Any CPU
 		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|x64.ActiveCfg = Release|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|x64.Build.0 = Release|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|x86.ActiveCfg = Release|Any CPU
-		{8238A052-D626-49EB-A011-51DC6D0DBA30}.Release|x86.Build.0 = Release|Any CPU
+		{545A88D3-1AE2-4D39-9B7C-C691768AD17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{545A88D3-1AE2-4D39-9B7C-C691768AD17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{545A88D3-1AE2-4D39-9B7C-C691768AD17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{545A88D3-1AE2-4D39-9B7C-C691768AD17F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFBB35C9-6437-480A-8DCC-AE3700110E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFBB35C9-6437-480A-8DCC-AE3700110E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFBB35C9-6437-480A-8DCC-AE3700110E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFBB35C9-6437-480A-8DCC-AE3700110E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29270853-90DC-4C39-9621-F47AE40A79B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29270853-90DC-4C39-9621-F47AE40A79B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29270853-90DC-4C39-9621-F47AE40A79B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29270853-90DC-4C39-9621-F47AE40A79B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.Build.0 = Release|Any CPU
+		{874841C0-DCB9-4678-A952-5E06286CA2B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{874841C0-DCB9-4678-A952-5E06286CA2B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{874841C0-DCB9-4678-A952-5E06286CA2B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{874841C0-DCB9-4678-A952-5E06286CA2B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D27C951E-1935-4D76-A0E5-A00D7829C654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D27C951E-1935-4D76-A0E5-A00D7829C654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D27C951E-1935-4D76-A0E5-A00D7829C654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D27C951E-1935-4D76-A0E5-A00D7829C654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD0EB901-E227-42E0-B7AE-28C3150B9A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD0EB901-E227-42E0-B7AE-28C3150B9A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD0EB901-E227-42E0-B7AE-28C3150B9A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD0EB901-E227-42E0-B7AE-28C3150B9A8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE13C83A-C01A-4C25-9A29-A440E014F998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE13C83A-C01A-4C25-9A29-A440E014F998}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE13C83A-C01A-4C25-9A29-A440E014F998}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE13C83A-C01A-4C25-9A29-A440E014F998}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9340314-6A79-496C-8BF9-88F1F6E3F096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9340314-6A79-496C-8BF9-88F1F6E3F096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9340314-6A79-496C-8BF9-88F1F6E3F096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9340314-6A79-496C-8BF9-88F1F6E3F096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75054BFF-DC0F-4094-8F05-62776663DF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75054BFF-DC0F-4094-8F05-62776663DF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75054BFF-DC0F-4094-8F05-62776663DF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75054BFF-DC0F-4094-8F05-62776663DF0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7B948FC-C4E7-41A9-84A7-8F1A725458E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7B948FC-C4E7-41A9-84A7-8F1A725458E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7B948FC-C4E7-41A9-84A7-8F1A725458E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7B948FC-C4E7-41A9-84A7-8F1A725458E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3162D387-7424-481A-9A1E-8193BF7FABE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3162D387-7424-481A-9A1E-8193BF7FABE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3162D387-7424-481A-9A1E-8193BF7FABE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3162D387-7424-481A-9A1E-8193BF7FABE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9297D1FA-F9C0-42D2-84FA-06DA323357C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9297D1FA-F9C0-42D2-84FA-06DA323357C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9297D1FA-F9C0-42D2-84FA-06DA323357C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9297D1FA-F9C0-42D2-84FA-06DA323357C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4454139C-174A-4DD8-8E76-657D9F03BA09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4454139C-174A-4DD8-8E76-657D9F03BA09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4454139C-174A-4DD8-8E76-657D9F03BA09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4454139C-174A-4DD8-8E76-657D9F03BA09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{450D5371-32A1-4667-987E-40D75F035233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{450D5371-32A1-4667-987E-40D75F035233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{450D5371-32A1-4667-987E-40D75F035233}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{450D5371-32A1-4667-987E-40D75F035233}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E602AB2B-048F-4317-8A6B-A225C00173FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E602AB2B-048F-4317-8A6B-A225C00173FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E602AB2B-048F-4317-8A6B-A225C00173FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E602AB2B-048F-4317-8A6B-A225C00173FA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -858,7 +493,6 @@ Global
 		{10B6ADE1-F808-4612-801D-4452F5B52242} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{46250E12-4CF1-4051-B4A7-80C8C06E0068} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{020E15EA-731F-4667-95AF-226671E0C3AE} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
-		{595BE9C1-E10F-4E50-938A-E6C248D3F950} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
@@ -870,21 +504,13 @@ Global
 		{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03} = {020E15EA-731F-4667-95AF-226671E0C3AE}
 		{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{DED1590A-ED25-413B-8590-006A4DD5B2FD} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{DD9382B5-5EC4-4B3D-BEB7-95423731AE29} = {46250E12-4CF1-4051-B4A7-80C8C06E0068}
-		{156F8811-28BB-4EC7-87D9-434F10FB7DBE} = {46250E12-4CF1-4051-B4A7-80C8C06E0068}
-		{A5B167ED-873A-4762-9326-5F43B8D3AFF6} = {595BE9C1-E10F-4E50-938A-E6C248D3F950}
-		{107F28E1-6E91-4A06-8943-E5E5A7E4CA66} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 		{D27E1CB4-C641-4C6C-A140-EF5F6215AE29} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
 		{376C19DE-31E2-4FF6-88FC-0D0D6233C999} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
-		{3E698655-0701-482E-9AA7-F956F6337FC7} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 		{7B48115A-B766-4B55-93A8-C08A42C37710} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{FBF74C8F-695C-4967-84AC-358EEFB1376D} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{11ECCB8B-6958-42A7-BD58-88C09CB149B2} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
@@ -894,8 +520,6 @@ Global
 		{65A25D6E-C9CC-4F45-8925-04087AC82634} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
 		{D9A30E32-D466-4EC5-B4F2-62E17562279B} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{21DB138B-85B7-479E-91FE-01E0F972EC56} = {D9A30E32-D466-4EC5-B4F2-62E17562279B}
-		{8C068694-23A2-47A2-A0DD-DB82D0AF0142} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
-		{24C7683D-2607-4901-B8EB-83A57E49E93D} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 		{69F5FF81-5615-4F06-B83C-FCF979BB84CA} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{E7D4921C-F12D-4E1C-85AC-8B7F91C59B0E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{236A71E3-01DA-4679-9DFF-16A8E079ACFF} = {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}
@@ -907,8 +531,40 @@ Global
 		{33A20B85-7024-4112-B1E7-00CD0E4A9F96} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
 		{2C88C923-3D7A-4492-9241-7A489750CAB7} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
 		{8238A052-D626-49EB-A011-51DC6D0DBA30} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{545A88D3-1AE2-4D39-9B7C-C691768AD17F} = {6CE2F530-582B-4695-A209-41065E103426}
+		{B1F84FD8-6150-4ECA-9AD7-C316E04E17D8} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
+		{BFBB35C9-6437-480A-8DCC-AE3700110E7D} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
+		{29270853-90DC-4C39-9621-F47AE40A79B6} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
+		{186069FE-E1E8-4DE1-BEA4-0FF1484D22D1} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{62E9D32B-B989-43CF-81A2-B38B3367FCA3} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
+		{4DA57968-F547-4019-8381-03A218B6C385} = {6CE2F530-582B-4695-A209-41065E103426}
+		{874841C0-DCB9-4678-A952-5E06286CA2B0} = {6CE2F530-582B-4695-A209-41065E103426}
+		{D27C951E-1935-4D76-A0E5-A00D7829C654} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{AD0EB901-E227-42E0-B7AE-28C3150B9A8B} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{AE13C83A-C01A-4C25-9A29-A440E014F998} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
+		{B9340314-6A79-496C-8BF9-88F1F6E3F096} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{75054BFF-DC0F-4094-8F05-62776663DF0D} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{D7B948FC-C4E7-41A9-84A7-8F1A725458E3} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{3162D387-7424-481A-9A1E-8193BF7FABE5} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{9297D1FA-F9C0-42D2-84FA-06DA323357C9} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{DCCF71EC-14DB-4FB8-8F9E-2DFAB69D9F15} = {E344E0A2-7715-4C7F-BAF7-D64EA94CB19B}
+		{A9470366-2CEB-4743-9B5D-1DD3C2C4D9EF} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{4454139C-174A-4DD8-8E76-657D9F03BA09} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
+		{450D5371-32A1-4667-987E-40D75F035233} = {46250E12-4CF1-4051-B4A7-80C8C06E0068}
+		{E602AB2B-048F-4317-8A6B-A225C00173FA} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{10b6ade1-f808-4612-801d-4452f5b52242}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{186069fe-e1e8-4de1-bea4-0ff1484d22d1}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{27dfbd04-64b2-4f1b-82b2-006620cca6f8}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{2c7ce1f8-e73e-4987-8023-b5a0ebac86e8}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{71cb42ff-e750-4a3b-9c3a-ac938853cc89}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{76d4bb7e-d981-42d5-be96-6fad8def9a4a}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{7f26eda3-c8c4-4b7f-a9b6-d278c2f40a13}*SharedItemsImports = 13
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{ad0eb901-e227-42e0-b7ae-28c3150b9a8b}*SharedItemsImports = 5
+		src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems*{d27c951e-1935-4d76-a0e5-a00d7829c654}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/TestPlatform_BuildFromSource.sln b/TestPlatform_BuildFromSource.sln
deleted file mode 100644
index 119f72a337..0000000000
--- a/TestPlatform_BuildFromSource.sln
+++ /dev/null
@@ -1,407 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31314.256
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CoreUtilities", "src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj", "{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector", "src\datacollector\datacollector.csproj", "{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Build", "src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.csproj", "{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Client", "src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj", "{E19B5128-3469-492E-82E1-725631C4A68C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common", "src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj", "{68ADC720-316E-4895-9F8E-C3CCADD262BE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CommunicationUtilities", "src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj", "{1621415E-7723-4F46-A589-4C4620C0751A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CrossPlatEngine", "src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj", "{987898D9-724E-4324-BF91-77B1A6DBE8F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.ObjectModel", "src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj", "{FD63F778-3938-45D2-900B-51EC770F70E5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Utilities", "src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj", "{61F7F446-9EF3-4768-B33A-4D75F60E1059}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.TrxLogger", "src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj", "{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer", "src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj", "{790B8030-00C2-4121-B125-EDC4CE329BA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost", "src\testhost\testhost.csproj", "{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.x86", "src\testhost.x86\testhost.x86.csproj", "{71CB42FF-E750-4A3B-9C3A-AC938853CC89}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console", "src\vstest.console\vstest.console.csproj", "{10B6ADE1-F808-4612-801D-4452F5B52242}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\perf\perf.ps1 = scripts\perf\perf.ps1
-		scripts\perf\perfconfig.csv = scripts\perf\perfconfig.csv
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props
-		scripts\build\TestPlatform.Localization.targets = scripts\build\TestPlatform.Localization.targets
-		scripts\build\TestPlatform.Settings.targets = scripts\build\TestPlatform.Settings.targets
-		scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\build.ps1 = scripts\build.ps1
-		scripts\build.sh = scripts\build.sh
-		scripts\PortableToFullPdb.ps1 = scripts\PortableToFullPdb.ps1
-		scripts\stylecop.json = scripts\stylecop.json
-		scripts\stylecop.ruleset = scripts\stylecop.ruleset
-		scripts\stylecop.test.ruleset = scripts\stylecop.test.ruleset
-		scripts\test.ps1 = scripts\test.ps1
-		scripts\test.sh = scripts\test.sh
-		scripts\verify-nupkgs.ps1 = scripts\verify-nupkgs.ps1
-		scripts\verify-sign.ps1 = scripts\verify-sign.ps1
-		scripts\vsts-prebuild.ps1 = scripts\vsts-prebuild.ps1
-		scripts\write-release-notes.ps1 = scripts\write-release-notes.ps1
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B}"
-	ProjectSection(SolutionItems) = preProject
-		Nuget.config = Nuget.config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{D27E1CB4-C641-4C6C-A140-EF5F6215AE29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.PlatformAbstractions", "src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj", "{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package\package.csproj", "{E141A226-CC0A-4F26-BD17-4AE427D81C3B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHostProvider", "src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj", "{11ECCB8B-6958-42A7-BD58-88C09CB149B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.BlameDataCollector", "src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj", "{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataCollectors", "DataCollectors", "{B705537C-B82C-4A30-AFA5-6244D9A7DAEB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.EventLogCollector", "src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj", "{65A25D6E-C9CC-4F45-8925-04087AC82634}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsMigrator", "src\SettingsMigrator\SettingsMigrator.csproj", "{69F5FF81-5615-4F06-B83C-FCF979BB84CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.HtmlLogger", "src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj", "{236A71E3-01DA-4679-9DFF-16A8E079ACFF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.AdapterUtilities", "src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj", "{2DE99835-A3A3-4922-82AD-6D10D284816D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.Build.0 = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.Build.0 = Debug|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.ActiveCfg = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.Build.0 = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.ActiveCfg = Release|Any CPU
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.Build.0 = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.Build.0 = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.Build.0 = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.Build.0 = Debug|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.Build.0 = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.Build.0 = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.Build.0 = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.Build.0 = Debug|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.ActiveCfg = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.Build.0 = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.ActiveCfg = Release|Any CPU
-		{E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.Build.0 = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.Build.0 = Debug|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.Build.0 = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.ActiveCfg = Release|Any CPU
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.Build.0 = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.Build.0 = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.Build.0 = Debug|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.ActiveCfg = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.Build.0 = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.ActiveCfg = Release|Any CPU
-		{1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.Build.0 = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.Build.0 = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.Build.0 = Debug|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.ActiveCfg = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.Build.0 = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.ActiveCfg = Release|Any CPU
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.Build.0 = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.Build.0 = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.Build.0 = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.Build.0 = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.Build.0 = Debug|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.ActiveCfg = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.Build.0 = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.ActiveCfg = Release|Any CPU
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.Build.0 = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.Build.0 = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.Build.0 = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.Build.0 = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.Build.0 = Debug|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.ActiveCfg = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.Build.0 = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.ActiveCfg = Release|Any CPU
-		{790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.Build.0 = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.Build.0 = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.Build.0 = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.Build.0 = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.Build.0 = Debug|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.ActiveCfg = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.Build.0 = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.ActiveCfg = Release|Any CPU
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.Build.0 = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.Build.0 = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.Build.0 = Debug|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.ActiveCfg = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.Build.0 = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.ActiveCfg = Release|Any CPU
-		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.Build.0 = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x64.Build.0 = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Debug|x86.Build.0 = Debug|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.ActiveCfg = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x64.Build.0 = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.ActiveCfg = Release|Any CPU
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E}.Release|x86.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x86.Build.0 = Debug|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x64.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x64.Build.0 = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.ActiveCfg = Release|Any CPU
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Release|x86.Build.0 = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.Build.0 = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.Build.0 = Debug|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.Build.0 = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.Build.0 = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x64.Build.0 = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Debug|x86.Build.0 = Debug|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x64.ActiveCfg = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x64.Build.0 = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A}.Release|x86.Build.0 = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x64.Build.0 = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Debug|x86.Build.0 = Debug|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x64.ActiveCfg = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x64.Build.0 = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x86.ActiveCfg = Release|Any CPU
-		{65A25D6E-C9CC-4F45-8925-04087AC82634}.Release|x86.Build.0 = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x64.Build.0 = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Debug|x86.Build.0 = Debug|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.ActiveCfg = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x64.Build.0 = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA}.Release|x86.Build.0 = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Debug|x86.Build.0 = Debug|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x64.Build.0 = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF}.Release|x86.Build.0 = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.Build.0 = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.Build.0 = Debug|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.ActiveCfg = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.Build.0 = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{E19B5128-3469-492E-82E1-725631C4A68C} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{68ADC720-316E-4895-9F8E-C3CCADD262BE} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{1621415E-7723-4F46-A589-4C4620C0751A} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{987898D9-724E-4324-BF91-77B1A6DBE8F1} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{FD63F778-3938-45D2-900B-51EC770F70E5} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{61F7F446-9EF3-4768-B33A-4D75F60E1059} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{D5296435-3A3F-4B1A-81D1-434EC9E97DEF} = {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}
-		{790B8030-00C2-4121-B125-EDC4CE329BA3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{71CB42FF-E750-4A3B-9C3A-AC938853CC89} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{10B6ADE1-F808-4612-801D-4452F5B52242} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{DED1590A-ED25-413B-8590-006A4DD5B2FD} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
-		{D27E1CB4-C641-4C6C-A140-EF5F6215AE29} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{E141A226-CC0A-4F26-BD17-4AE427D81C3B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29}
-		{11ECCB8B-6958-42A7-BD58-88C09CB149B2} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
-		{B705537C-B82C-4A30-AFA5-6244D9A7DAEB} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{65A25D6E-C9CC-4F45-8925-04087AC82634} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB}
-		{69F5FF81-5615-4F06-B83C-FCF979BB84CA} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{236A71E3-01DA-4679-9DFF-16A8E079ACFF} = {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}
-		{2DE99835-A3A3-4922-82AD-6D10D284816D} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}
-	EndGlobalSection
-EndGlobal
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
new file mode 100644
index 0000000000..442ad55ab2
--- /dev/null
+++ b/azure-pipelines-official.yml
@@ -0,0 +1,326 @@
+# Branches that trigger a build on commit
+trigger:
+  branches:
+    include:
+    - main
+    - rel/*
+    exclude:
+    - rel/15.*
+    - rel/16.*
+    - rel/17.0
+    - rel/17.1
+    - rel/17.2
+    - rel/17.3
+    - rel/17.4
+    - rel/17.5
+    - rel/17.6
+
+# Branch(es) that trigger(s) build(s) on PR
+pr:
+  branches:
+    include:
+    - main
+    - rel/*
+  paths:
+    exclude:
+      - .github/*
+      - .devcontainer/*
+      - docs/*
+      - .markdownlint.json
+      - .markdownlintignore
+      - CODE_OF_CONDUCT.md
+      - CONTRIBUTING.md
+      - README.md
+      - SECURITY.md
+
+parameters:
+- name: isRTM
+  displayName: "Produce RTM version?"
+  type: boolean
+  default: False
+- name: SDLEnabled
+  displayName: "Run SDL validation"
+  type: boolean
+  default: False
+# This option should be used with caution. This is useful for unblocking circular deps issue with testanywhere
+- name: SkipTests
+  displayName: "Skip tests"
+  type: boolean
+  default: False
+
+- name: otherOsPools
+  type: object
+  default:
+  - name: $(DncEngInternalBuildPool)
+    image: 1es-ubuntu-2204
+    os: linux
+  - name: Azure Pipelines
+    image: macos-14
+    os: macOS
+
+variables:
+  - template: /eng/common/templates-official/variables/pool-providers.yml@self
+  # Cannot use key:value syntax in root defined variables
+  - name: _TeamName
+    value: TestPlatformTeam
+  - name: Codeql.Enabled
+    value: true
+  - name: _RunAsInternal
+    value: True
+  - name: _RunAsPublic
+    value: False
+  - name: _ReleaseVersionKind
+    value: ''
+  # Arcade is using global cache of nugets in non-windows build
+  # under some circumstances, but we don't respect that in our code and try to find them
+  # in .packages. Force the location of packages to that folder.
+  - name: NUGET_PACKAGES
+    value: '$(Build.SourcesDirectory)/.packages/'
+  # Publish Logs seems to depend on this name of variable, so we define it
+  # even when we don't use matrix.
+  - name: _BuildConfig
+    value: Release
+
+  - ${{ if eq(parameters.isRTM, True) }}:
+    - name: _ReleaseVersionKind
+      value: release
+
+  # Group gives access to $microsoft-symbol-server-pat and $symweb-symbol-server-pat
+  - group: DotNet-Symbol-Server-Pats
+  # Group gives access to $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw
+  - group: DotNet-VSTS-Infra-Access
+  - name: _DevDivDropAccessToken
+    value: $(dn-bot-devdiv-drop-rw-code-rw)
+  - name: _SignType
+    value: real
+  - name: _SignArgs
+    value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:Sign=$(_Sign)
+  - name: _Sign
+    value: True
+  - name: VisualStudioDropName
+    value: Products/$(System.TeamProject)/$(Build.DefinitionName)/$(Build.SourceBranchName)/$(Build.BuildNumber)
+  - name: _InternalBuildArgs
+    value: /p:DotNetSignType=$(_SignType)
+      /p:TeamName=$(_TeamName)
+      /p:DotNetFinalVersionKind=$(_ReleaseVersionKind)
+      /p:DotNetPublishUsingPipelines=true
+      /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
+      /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
+      /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+      /p:VisualStudioDropName=$(VisualStudioDropName)
+      /p:GenerateSbom=true
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    sdl:
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: windows.vs2022preview.amd64
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+
+      - template: /eng/common/templates-official/jobs/jobs.yml@self
+        parameters:
+          enableMicrobuild: true
+          enablePublishBuildArtifacts: true
+          enablePublishBuildAssets: true
+          enablePublishUsingPipelines: true
+          enablePublishTestResults: true
+          testResultsFormat: 'vstest'
+          enableTelemetry: true
+          enableSourceBuild: true
+          jobs:
+          - job: Windows
+            timeoutInMinutes: 120
+            pool:
+              name: $(DncEngInternalBuildPool)
+              image: windows.vs2022preview.amd64
+              os: windows
+            steps:
+            # This steps help to understand versions of .NET runtime installed on the machine,
+            # which is useful to diagnose some governance issues.
+            - task: DotNetCoreCLI@2
+              displayName: 'dotnet --info'
+              inputs:
+                command: custom
+                custom: '--info'
+
+            # Restore internal tools required for SBOM generation
+            - template: /eng/restore-internal-tools.yml
+
+            - powershell: eng\common\CIBuild.cmd
+                -configuration Release
+                -prepareMachine
+                $(_InternalBuildArgs)
+                /p:Test=false
+                /p:SourceBranchName=$(Build.SourceBranchName)
+              name: Build
+              displayName: Build
+
+            - ${{ if eq(parameters.SkipTests, False) }}:
+              # -ci is allowing to import some environment variables and some required configurations
+              # -nobl avoid overwriting binlog of the main Build
+              - script: Test.cmd
+                  -configuration Release
+                  -ci
+                  -nobl
+                  -integrationTest
+                  -performanceTest
+                name: Test
+                displayName: Test
+
+              # This step is only helpful for diagnosing some issues with vstest/test host that would not appear
+              # through the console or trx
+              - task: 1ES.PublishBuildArtifacts@1
+                displayName: 'Publish Test Results folders'
+                inputs:
+                  PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults/Release'
+                  ArtifactName: TestResults
+                condition: failed()
+
+            - task: 1ES.PublishBuildArtifacts@1
+              displayName: 'Publish VSSetup'
+              inputs:
+                PathtoPublish: '$(Build.SourcesDirectory)/artifacts/VSSetup/Release'
+                ArtifactName: VSSetupArtifacts
+
+          - ${{ each pool in parameters.otherOsPools }}:
+            - job: ${{ pool.os }}
+              dependsOn: Windows
+              workspace:
+                clean: all
+              pool:
+                name: ${{ pool.name }}
+                demands: ImageOverride -equals ${{ pool.image }}
+                os: ${{ pool.os }}
+                image: ${{ pool.image }}
+              steps:
+              - checkout: self
+                fetchDepth: 1
+                clean: true
+
+              # Build but don't pack, packing does not work on non-windows and we want to test what we built on Windows
+              # anyway. Because that is what we will publish.
+              - script: ./build.sh
+                  --configuration Release
+                  --ci
+                name: Build
+                displayName: Build
+
+              # Download the built packages into local package source, as if we built them on this machine.
+              - task: DownloadPipelineArtifact@2
+                displayName: Download Package Artifacts
+                inputs:
+                  artifactName: PackageArtifacts
+                  targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/Shipping'
+
+              - ${{ if eq(parameters.SkipTests, False) }}:
+                - script: ./test.sh
+                    --configuration Release
+                    --ci
+                    --integrationTest
+                    --performanceTest
+                  name: Test
+                  displayName: Test
+
+                # This step is only helpful for diagnosing some issues with vstest/test host that would not appear
+                # through the console or trx
+                - task: 1ES.PublishBuildArtifacts@1
+                  displayName: 'Publish Test Results folders'
+                  inputs:
+                    PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults/Release'
+                    ArtifactName: TestResults
+                  condition: failed()
+
+          - job: Publish
+            dependsOn:
+              - ${{ each pool in parameters.otherOsPools }}:
+                - ${{ pool.os }}
+            pool:
+                name: $(DncEngInternalBuildPool)
+                image: windows.vs2022preview.amd64
+                os: windows
+            steps:
+              # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for
+              # the whole stage, which is not what we want to do. So we write an empty file instead.
+              - pwsh: 'New-Item -Type file -Force "$(Build.SourcesDirectory)/artifacts/log/Release/empty.log"'
+                name: 'Add_empty_logfile'
+              # Download the built packages into local package source, as if we built them on this machine.
+              - task: DownloadPipelineArtifact@2
+                displayName: Download Package Artifacts
+                inputs:
+                  artifactName: PackageArtifacts
+                  targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/Shipping'
+
+              - task: DownloadPipelineArtifact@2
+                displayName: Download VSSetup Artifacts
+                inputs:
+                  artifactName: VSSetupArtifacts
+                  targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/Release'
+
+              - task: NuGetAuthenticate@1
+                displayName: 'NuGet Authenticate to dotnet-tools and test-tools feeds'
+
+              - task:  1ES.PublishNuget@1
+                displayName: 'Publish NuGet packages to dotnet-tools feed'
+                inputs:
+                  packageParentPath: '$(Build.SourcesDirectory)/artifacts/packages/Release'
+                  packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.symbols.nupkg'
+                  publishVstsFeed: 'public/dotnet-tools'
+
+              - task:  1ES.PublishNuget@1
+                displayName: 'Publish NuGet packages to test-tools feed'
+                inputs:
+                  packageParentPath: '$(Build.SourcesDirectory)/artifacts/packages/Release'
+                  packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.symbols.nupkg'
+                  publishVstsFeed: 'public/test-tools'
+
+              # Publishes setup VSIXes to a drop.
+              # Note: The insertion tool looks for the display name of this task in the logs.
+              - task: 1ES.MicroBuildVstsDrop@1
+                displayName: Upload VSTS Drop
+                inputs:
+                  dropName: $(VisualStudioDropName)
+                  dropFolder: 'artifacts\VSSetup\Release\Insertion'
+                  accessToken: $(_DevDivDropAccessToken)
+                condition: succeeded()
+
+              - task: 1ES.PublishBuildArtifacts@1
+                displayName: Publish Artifact VSSetup
+                inputs:
+                  PathtoPublish: 'artifacts\VSSetup\Release'
+                  ArtifactName: 'VSSetup'
+                condition: succeeded()
+
+      - ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
+        - template: /eng/common/templates-official/job/onelocbuild.yml@self
+          parameters:
+            GitHubOrg: microsoft
+            MirrorRepo: vstest
+            LclSource: lclFilesfromPackage
+            LclPackageId: 'LCL-JUNO-PROD-VSTEST'
+
+    - template: eng\common\templates-official\post-build\post-build.yml@self
+      parameters:
+        publishingInfraVersion: 3
+        SDLValidationParameters:
+          enable: false
+          continueOnError: false
+          params: ' -SourceToolsList @("policheck","credscan")'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 20c1387af2..541b35ce34 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,181 +1,201 @@
-# Pipeline YAML for PR
-
-jobs:
-- job: Windows
-  timeoutInMinutes: 120
-  pool:
-    vmImage: 'windows-latest'
-  variables:
-    buildConfiguration: 'Release'
-  steps:
-  - task: BatchScript@1
-    displayName: 'Run script build.cmd'
-    inputs:
-      filename: build.cmd
-      arguments: '-verbose -configuration $(buildConfiguration) -steps "InstallDotnet, Restore, UpdateLocalization, Build, Publish"'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: CmdLine@1
-    displayName: 'Delete stale pdb files'
-    inputs:
-      filename: del
-      arguments: '/S /F *.pdb'
-      workingFolder: '$(SystemRoot)'
-    continueOnError: true
-    condition: always()
-
-  - task: BatchScript@1
-    displayName: 'Run Unit Tests'
-    inputs:
-      filename: test.cmd
-      arguments: '-verbose -configuration $(buildConfiguration)'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **\*.trx'
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**\*.trx'
-    condition: succeededOrFailed()
-
-  - task: PublishPipelineArtifact@1
-    inputs:
-      targetPath: '$(Build.SourcesDirectory)\artifacts'
-      artifact: 'testArtifacts'
-      publishLocation: 'pipeline'
-
-- job: WindowsAcceptance
-  dependsOn: Windows
-  timeoutInMinutes: 120
-  pool:
-    vmImage: 'windows-latest'
-  variables:
-    buildConfiguration: 'Release'
-  steps:
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      buildType: 'current'
-      artifactName: 'testArtifacts'
-      targetPath: '$(Build.SourcesDirectory)\artifacts'
-
-  - task: PowerShell@2
-    inputs:
-      targetType: 'inline'
-      script: 'ls "$(Build.SourcesDirectory)\artifacts\" -Recurse -Dir'
-
-  - task: BatchScript@1
-    displayName: 'Run script build.cmd'
-    inputs:
-      filename: build.cmd
-      # build should not be needed in the end, we are copying the build task from the build folder, but we should get 
-      # it either from artifacts, if present, or from extracted package file
-      # Adding it at the moment to avoid this error: #[error]Copy-Item : Cannot find path 'D:\a\1\s\src\Microsoft.TestPlatform.Build\bin\Release\netstandard2.0' because it does  not exist.
-      arguments: '-verbose -configuration $(buildConfiguration) -steps "InstallDotnet, Restore, Build, PrepareAcceptanceTests"'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: PowerShell@2
-    inputs:
-      targetType: 'inline'
-      script: 'ls "$(Build.SourcesDirectory)\artifacts\Release\packages"'
-
-  - task: PowerShell@2
-    displayName: 'Disable Strong Name Validation'
-    inputs:
-      targetType: 'inline'
-      script: |
-        Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\.NETFramework" -Name "AllowStrongNameBypass" -Value 1 -Force
-        Set-ItemProperty -Path "HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NETFramework" -Name "AllowStrongNameBypass" -Value 1 -Force
-        reg DELETE "HKLM\Software\Microsoft\StrongName\Verification" /f
-        reg DELETE "HKLM\Software\Wow6432Node\Microsoft\StrongName\Verification" /f
-        reg ADD "HKLM\Software\Microsoft\StrongName\Verification\*,*" /f
-        reg ADD "HKLM\Software\Wow6432Node\Microsoft\StrongName\Verification\*,*" /f
-
-  - task: BatchScript@1
-    displayName: 'Run Acceptance Tests'
-    inputs:
-      filename: test.cmd
-      arguments: '-verbose -configuration $(buildConfiguration) -p AcceptanceTests -f net451'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: BatchScript@1
-    displayName: 'Run Platform Tests'
-    inputs:
-      filename: test.cmd
-      arguments: '-verbose -configuration $(buildConfiguration) -p platformtests'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: BatchScript@1
-    displayName: 'Run Smoke Tests'
-    inputs:
-      filename: test.cmd
-      arguments: '-verbose -configuration $(buildConfiguration) -p smoke'
-      modifyEnvironment: false
-      failOnStandardError: true
-
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **\*.trx'
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**\*.trx'
-    condition: succeededOrFailed()
-
-- job: OtherOSes
-  dependsOn: Windows
-  workspace:
-    clean: all
-  strategy:
-    matrix:
-      Ubuntu_18_04:
-        vmImage: ubuntu-18.04
-        pwsh: true
-      macOS_10_15_Catalina:
-        vmImage: macOS-10.15
-        pwsh: true
-  pool:
-    vmImage: $[ variables['vmImage'] ]
-  variables:
-      buildConfiguration: 'Release'
-      VSTestRTMBuild: 'false'
-  steps:
-  - script: chmod +x ./scripts/vsts-prebuild.sh 
-    displayName: 'Preparing for set version'
-
-  - script: ./scripts/vsts-prebuild.sh -build "preview-$(Build.BuildNumber)" -rtm "$(VSTestRTMBuild)" -branch "$(Build.SourceBranch)"
-    displayName: 'Set Version'
-
-  - script: ./build.sh -c $(buildConfiguration) -v "$(BuildVersionPrefix)" -vs "$(BuildVersionSuffix)" -ci true -verbose
-    displayName: 'Build'
-
-  - script: ./test.sh -c $(buildConfiguration) -p Unit
-    displayName: 'Unit tests'  
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      buildType: 'current'
-      artifactName: 'testArtifacts'
-      targetPath: '$(Build.SourcesDirectory)/artifacts'
-
-  - script: ./tools/dotnet-linux/dotnet build -c $(buildConfiguration) ./test/TestAssets/TestAssets.sln
-    displayName: 'Build test assets'
-
-  - script: ./test.sh -c $(buildConfiguration) -p Acceptance
-    displayName: 'Acceptance tests'
-
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/*.trx'
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**/*.trx'
-    condition: succeededOrFailed()
-
-- template: /eng/common/templates/job/source-build.yml
-  parameters:
-    platform:
-      name: Managed
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
-      buildScript: eng/common/build.sh
+# Branches that trigger a build on commit
+trigger:
+  branches:
+    include:
+    - main
+    - rel/*
+    exclude:
+    - rel/15.*
+    - rel/16.*
+    - rel/17.0
+    - rel/17.1
+    - rel/17.2
+    - rel/17.3
+    - rel/17.4
+    - rel/17.5
+    - rel/17.6
+
+# Branch(es) that trigger(s) build(s) on PR
+pr:
+  branches:
+    include:
+    - main
+    - rel/*
+  paths:
+    exclude:
+      - .github/*
+      - .devcontainer/*
+      - docs/*
+      - .markdownlint.json
+      - .markdownlintignore
+      - CODE_OF_CONDUCT.md
+      - CONTRIBUTING.md
+      - README.md
+      - SECURITY.md
+
+variables:
+  # Cannot use key:value syntax in root defined variables
+  - name: _TeamName
+    value: TestPlatformTeam
+  - name: Codeql.Enabled
+    value: true
+  - name: _RunAsInternal
+    value: False
+  - name: _RunAsPublic
+    value: True
+  # Set default value for variables of PR and Public builds
+  - name: _SignType
+    value: test
+  - name: _SignArgs
+    value: ''
+  - name: _Sign
+    value: False
+  - name: _InternalBuildArgs
+    value: ' '
+  - name: _ReleaseVersionKind
+    value: ''
+  # Arcade is using global cache of nugets in non-windows build
+  # under some circumstances, but we don't respect that in our code and try to find them
+  # in .packages. Force the location of packages to that folder.
+  - name: NUGET_PACKAGES
+    value: '$(Build.SourcesDirectory)/.packages/'
+
+stages:
+
+- stage: build
+  displayName: Build
+  jobs:
+
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishBuildArtifacts: true
+      enablePublishBuildAssets: true
+      enablePublishUsingPipelines: true
+      enablePublishTestResults: true
+      testResultsFormat: 'vstest'
+      enableTelemetry: true
+      enableSourceBuild: true
+      jobs:
+      - job: Windows
+        timeoutInMinutes: 120
+        pool:
+          name: NetCore-Public
+          demands: ImageOverride -equals windows.vs2022preview.amd64.open
+        strategy:
+          matrix:
+            Release:
+              _BuildConfig: Release
+        steps:
+        # This steps help to understand versions of .NET runtime installed on the machine,
+        # which is useful to diagnose some governance issues.
+        - task: DotNetCoreCLI@2
+          displayName: 'dotnet --info'
+          inputs:
+            command: custom
+            custom: '--info'
+
+        - powershell: eng\common\CIBuild.cmd
+            -configuration $(_BuildConfig)
+            -prepareMachine
+            $(_InternalBuildArgs)
+            /p:Test=false
+            /p:SourceBranchName=$(Build.SourceBranchName)
+          name: Build
+          displayName: Build
+
+        # -ci is allowing to import some environment variables and some required configurations
+        # -nobl avoid overwriting binlog of the main Build
+        - script: Test.cmd
+            -configuration $(_BuildConfig)
+            -ci
+            -nobl
+            -integrationTest
+            -performanceTest
+            /bl:$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Test.binlog
+          name: Test
+          displayName: Test
+
+        # This step is only helpful for diagnosing some issues with vstest/test host that would not appear
+        # through the console or trx
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish Test Results folders'
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+            ArtifactName: TestResults
+          condition: failed()
+
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish Shipping Packages'
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
+            ArtifactName: PackageArtifacts
+
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish NonShippping Packages'
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping'
+            ArtifactName: PackageArtifacts
+
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish VSSetup'
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
+            ArtifactName: VSSetupArtifacts
+
+      - job: OtherOSes
+        dependsOn: Windows
+        workspace:
+          clean: all
+        variables:
+          # Publish Logs seems to depend on this name of variable, so we define it
+          # even when we don't use matrix.
+          - name: _BuildConfig
+            value: Release
+        strategy:
+          matrix:
+            Ubuntu_22_04:
+              vmImage: ubuntu-22.04
+              pwsh: true
+            macOS_12:
+              vmImage: macos-14
+              pwsh: true
+        pool:
+          vmImage: $[ variables['vmImage'] ]
+        steps:
+        - checkout: self
+          fetchDepth: 1
+          clean: true
+
+        # Build but don't pack, packing does not work on non-windows and we want to test what we built on Windows
+        # anyway. Because that is what we will publish.
+        - script: ./build.sh
+            --configuration $(_BuildConfig)
+            --ci
+          name: Build
+          displayName: Build
+
+        # Download the built packages into local package source, as if we built them on this machine.
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Package Artifacts
+          inputs:
+            artifactName: PackageArtifacts
+            targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
+
+        - script: ./test.sh
+            --configuration $(_BuildConfig)
+            --ci
+            --integrationTest
+            --performanceTest
+          name: Test
+          displayName: Test
+
+        # This step is only helpful for diagnosing some issues with vstest/test host that would not appear
+        # through the console or trx
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish Test Results folders'
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+            ArtifactName: TestResults
+          condition: failed()
+
diff --git a/build.cmd b/build.cmd
index f2a9a38318..4afad04714 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,6 +1,3 @@
 @echo off
-
-REM Copyright (c) Microsoft. All rights reserved.
-
-powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "%~dp0scripts\build.ps1 %*; exit $LastExitCode;" 
-if %errorlevel% neq 0 exit /b %errorlevel% 
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
+exit /b %ErrorLevel%
diff --git a/build.sh b/build.sh
index a118d5c3ff..8477d5af88 100755
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
-# Copyright (c) Microsoft. All rights reserved.
-# Build script for test platform.
 
-set -e
+source="${BASH_SOURCE[0]}"
 
-source "scripts/build.sh" "$@"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
 
-if [[ $? -ne 0 ]]; then
-    exit 1
-fi
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+"$scriptroot/eng/common/build.sh" --build --restore $@
diff --git a/docs/Overview.md b/docs/Overview.md
new file mode 100644
index 0000000000..411f0bb4b4
--- /dev/null
+++ b/docs/Overview.md
@@ -0,0 +1,1726 @@
+# Test Platform messaging
+
+- [Test Platform messaging](#test-platform-messaging)
+  - [What is TestPlatform?](#what-is-testplatform)
+  - [How it works?](#how-it-works)
+  - [Workflows](#workflows)
+  - [Specification](#specification)
+    - [Base Protocol](#base-protocol)
+      - [Header Part](#header-part)
+      - [Content Part](#content-part)
+      - [Base Types](#base-types)
+      - [Request Message](#request-message)
+      - [Response Message](#response-message)
+      - [Notification Message](#notification-message)
+      - [Cancellation Support](#cancellation-support)
+      - [Progress Support](#progress-support)
+    - [Test Platform Protocol](#test-platform-protocol)
+      - [Capabilities](#capabilities)
+      - [Request, Notification and Response Ordering](#request-notification-and-response-ordering)
+      - [Message documentation](#message-documentation)
+    - [Basic structures](#basic-structures)
+      - [URI](#uri)
+      - [String type aliases](#string-type-aliases)
+      - [Regular expressions](#regular-expressions)
+      - [Enumerations](#enumerations)
+      - [TestCase](#testcase)
+      - [TestResult](#testresult)
+      - [Message](#message)
+    - [Lifecycle Messages](#lifecycle-messages)
+      - [ProtocolVersion request](#protocolversion-request)
+      - [TestSession.Message notification (Runner) (Testhost)](#testsessionmessage-notification-runner-testhost)
+    - [Session](#session)
+      - [Start Runner process request (Runner)](#start-runner-process-request-runner)
+      - [TestSession.Terminate request (Runner)](#testsessionterminate-request-runner)
+      - [Start Testhost process request (Runner)](#start-testhost-process-request-runner)
+      - [Terminate testhost request (Testhost)](#terminate-testhost-request-testhost)
+    - [Discovery](#discovery)
+      - [Extensions.Initialize request (Runner)](#extensionsinitialize-request-runner)
+      - [TestDiscovery.Start request (Runner)](#testdiscoverystart-request-runner)
+      - [TestDiscovery.Initialize request (Testhost)](#testdiscoveryinitialize-request-testhost)
+      - [TestDiscovery.Start request (Testhost)](#testdiscoverystart-request-testhost)
+      - [TestDiscovery.TestFound notification (Testhost)](#testdiscoverytestfound-notification-testhost)
+      - [TestDiscovery.TestFound notification (Runner)](#testdiscoverytestfound-notification-runner)
+    - [Run](#run)
+      - [TestExecution.GetTestRunnerProcessStartInfoForRunSelected request (Client)](#testexecutiongettestrunnerprocessstartinfoforrunselected-request-client)
+      - [TestExecution.Initialize request (Runner)](#testexecutioninitialize-request-runner)
+      - [TestExecution.StartWithTests (Runner)](#testexecutionstartwithtests-runner)
+      - [TestExecution.StartWithSources](#testexecutionstartwithsources)
+      - [TestExecution.StatsChange notification (Runner)](#testexecutionstatschange-notification-runner)
+      - [TestExecution.StatsChange notification (Client)](#testexecutionstatschange-notification-client)
+    - [Datacollection](#datacollection)
+    - [.NET Implementation](#net-implementation)
+      - [Architecture](#architecture)
+      - [Extension points](#extension-points)
+
+## What is TestPlatform?
+
+TestPlatform is a collection of libraries and tools that provide test running for Visual Studio Test Explorer, `dotnet test`, Azure DevOps, Omnisharp, Stryker and other tools.
+
+TestPlatform is mainly focused on running C# tests, but it is an extensible platform, that allows additional providers and extensions to be used.
+
+TestPlatform is also known as vstest, or by the names of the tools that use it: Test Explorer, and `dotnet test`.
+
+## How it works?
+
+TestPlatform consists of multiple processes that communicate over sockets, by sending JSON serialized messages. There are 4 processes that usually work together run tests:
+
+- Client
+- Runner
+- Testhost
+- Datacollector
+
+The client is your IDE, or your command line. It determines what test needs to run, e.g. the one that the user clicked on in TestExplorer.
+
+The runner receives the request from the client, and starts an appropriate testhost for the test.
+
+Testhost receives the request to run tests, and runs them via an appropriate test framework. The most often used .NET test frameworks are XUnit, MSTest and NUnit.
+
+Datacollector observes the testhost to collect additional information about the run.
+
+While the tests execute, the results are reported back to the runner, aggregated, and forwarded to the client.
+
+The client processes the results and shows them in their UI, for example as TestExplorer does it here:
+
+<TODO gif>
+
+A simplified flow describing the whole process is as follows:
+
+```mermaid
+sequenceDiagram
+%% autonumber
+participant c as Client<br>(Visual Studio)
+participant r as Runner<br>(vstest.console.exe)
+participant t as Testhost<br>(testhost.exe)
+participant d as Datacollector<br>(datacollector.exe)
+c->>+r:  Run test A
+r->>d:   Process start
+r->>t:   Process start
+r->>+t:  Run test A
+t-->>+d:  Test A started
+t->>t:   TestFramework<br>run test A
+t-->>+d:  Test A finished
+t-->>r:  Test A finished
+r-->>c:  Test A finished
+t->>-r:  Test run completed
+t-->>r:  Process exit
+d-->>r:  Process exit
+r->>-c:  Test run completed
+```
+
+This example represents the basic workflow of a test run. With each component having its own set of responsibilities:
+
+- *Client* such as Visual Studio, is responsible for interfacing with the user, and presenting the results in user friendly way. A graphical Client is not part of TestPlatform.
+
+- *Runner* is responsible for orchestrating one or more testhost processes to execute the given set of tests. The tests are not required to come from a single library, or to be targeting a single language.
+
+- *Testhost* testhost is responsible for running tests from a single library (or source), and reporting the results. Testhost for .NET and .NET Framework comes with TestPlatform, but additional testhosts for other languages can be provided externally.
+
+- *Datacollector* runs in additional process, and can host user extensions that observe testhost and manage its lifetime.
+
+## Workflows
+
+The Run workflow described above is very common in command line tools, and probably the first thing everyone thinks about when it comes to tests. There are additional workflows that TestPlatform provides:
+
+- *Discovery* - discovers tests in given test sources, most commonly .NET dlls.
+- *Run* - runs tests from given libraries (test sources) or from a given list of pre-discovered tests.
+- *Session* - starts the runner and waits for requests.
+- *TestSession* - starts a set of testhosts for given test sources, to make the ready to run.
+- *AttachmentProcessing* - processes a given set of attachments that were produced during a previous test run, e.g. merges code coverage files.
+
+## Specification
+
+### Base Protocol
+
+TODO: fill in more details.
+
+Data are passed as JSON serialized strings over TCP. The messages are serialized using binary format that delimits messages by a length prefix. The size prefix is written as 7 bit encoded int. (The basics of encoding that number are summarized here: <https://stackoverflow.com/a/49780224/3065397>).
+
+In .NET the data are written using BinaryWriter and BinaryReader which do all the needed conversions automatically when writing and reading the string (<https://learn.microsoft.com/en-us/dotnet/api/system.io.binarywriter.write?view=net-6.0#system-io-binarywriter-write(system-string>)).
+
+The message on the wire is prefixed by the header, and read until the size of the message is reached. The 10 first bytes of a 1024 letter message looks like this:
+
+```bash
+128
+08
+72 - H
+101 - e
+108 - l
+108 - l
+111 - o
+32
+102 - f
+114 - r
+```
+
+You can play with it using this code:
+
+```cs
+namespace ConsoleApp45
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            var mem = new MemoryStream();
+            var w = new BinaryWriter(mem);
+            var message = "Hello from TestPlatform!" + new string('*', 1000);
+
+            Console.WriteLine($"Written length: {message.Length}");
+            w.Write(message);
+            w.Flush();
+
+            var r = new BinaryReader(mem);
+            mem.Position = 0;
+            var length = r.Read7BitEncodedInt();
+            Console.WriteLine($"Read length: {message.Length}");
+            
+            mem.Position = 0;
+            var size = 10;
+            var bytes = r.ReadBytes(size);
+            Console.WriteLine($"Data (first {size} bytes):");
+            Console.WriteLine(string.Join("\n", bytes.Select(ToText).ToArray()));
+        }
+
+        public static string ToText(byte b)
+        {
+            if (char.IsLetterOrDigit((char)b))
+            {
+                return $"{b:d2} - {(char)b}";
+            }
+
+            return $"{b:d2}";
+        }
+    }
+}
+```
+
+The messages are then transported over TCP. In .NET the standard TCP client and TCP server is used. A single *dynamic* port is used for a single pair of client and server. (Unlike in a more typical web scenario where server has a determined port, and a client connects to that port.)
+
+The role of client and server are not fully set, and based on parameters either the runner, or the testhost can serve the role of a server. Typically the runner is the server (setups a dynamic port, and starts testhost, passing the port to connect to). But in remote scenarios it is beneficial to make the remote side (testhost), the server, and open the port on the remote device which is more likely to be for-testing-only, and deprovisioned after the test run. In this case the server (testhost) needs to use a predetermined port which it sets up, and the client (runner) will connect to it.
+
+#### Header Part
+
+There is no header in the message itself. There is header only in the binary message.
+
+#### Content Part
+
+#### Base Types
+
+#### Request Message
+
+#### Response Message
+
+#### Notification Message
+
+#### Cancellation Support
+
+#### Progress Support
+
+### Test Platform Protocol
+
+TestPlatform protocol defines a set of JSON request, response and notification messages, that are exchanged using the above base protocol. This section starts by describing the basic JSON structures used in the protocol. The description uses C# classes, and types, with nullability enabled. Meaning that every type is non-nullable by default, and nullability is denoted by `?` following the type name.
+
+<TODO example?>
+
+The protocol assumes that one server serves one tool. There is no support in the protocol to share one server between different tools.
+
+#### Capabilities
+
+The client, runner + datacollector, and testhost are shipped separately. Each of those components can have a different version and hence a different set of functionality they support. A single number (protocol version) is used to represent the whole set of capabilities that a given component supports. Each newer version includes complete functionality of the previous version. There are no granular capabilities.
+
+Components are expected to handshake a version of the protocol to use, and use the highest version that is common to both sides.
+
+> For example client announces that is supports version 7, runner supports 9, version 7 is used.
+
+Once a version is agreed upon, a higher version should not be used by the lower level components.
+
+> The above runner should announce 7 to testhost, rather than 9. If testhost announces 10, 7 is used.
+
+The version is negotiated between the components at the beginning of every workflow using [ProtocolVersion](#protocolversion-request) request.
+
+#### Request, Notification and Response Ordering
+
+The server supports processing only a single request at a time. Unless the request is [Cancel](#cancel) or [Abort](#abort) request.
+
+All notifications are sent before as response is sent.
+
+#### Message documentation
+
+TestPlatformProtocol is defined by a set of requests, responses and notifications. Each of those are described using the following format:
+
+- a header describing the request
+- a request section describing the format of the
+
+<TODO>
+
+### Basic structures
+
+#### URI
+
+#### String type aliases
+
+#### Regular expressions
+
+#### Enumerations
+
+#### TestCase
+
+#### TestResult
+
+#### Message
+
+### Lifecycle Messages
+
+The current protocol specification defines that the lifecycle of a server is managed by the client (e.g. VisualStudio). It is up to the client to decide when to start (process-wise) and when to shutdown a server.
+
+#### ProtocolVersion request
+
+Version request is sent as the first request from the client to runner, and from runner to testhost. This request is used to negotiate the version of protocol to be used.
+
+Each protocol version is allowed to only add new features and never remove old features. Each component is also required to support all versions of protocol from version 0 up to the latest version.
+
+The handshake is one sided. The left side sends the request, and the right side (client-**runner**, or runner-**testhost**) responds with the determined version.
+
+The version is determined by choosing the highest common supported version. When client sends 6, and runner supports maximum version 7, then 6 will be used.
+
+The receiving side should remember the agreed value, and use it as the highest supported version for any downstream component. In the case above runner should send 6 to testhost, even though the runner supports versions up to 7.
+
+The request was introduced in TestPlatform version `16.0.0`. Runners before this version are not allowed. Testhosts before this version are allowed, the version of testhost if figured out by scanning the assembly, and the request is not sent to them. Version 0 is used for communication.
+
+Versions:
+
+- 0: The original base protocol with no explicit versioning in the message. It is used during negotiation.
+- 1: Added Version field to the base protocol.
+- 2: Changed serialization from a generic bag that described each property and its type, to explicit properties that are serialized without additional type info.
+- 3: Added AttachDebugger message.
+- 4: Added because version 3 did not update the serialization to use, and it will use v1 serialization (bag) rather than explicit properties. Right side should avoid negotiating 3 and downgrade to 2.
+- 5: Unknown. (TODO)
+- 6: Added Abort and Cancel with handlers that report the status.
+- 7: Added SkippedDiscoveredSources.
+
+*Request:*
+
+```csharp
+// Version from 0 to 7.
+int version
+```
+
+```json
+{
+    "MessageType":"ProtocolVersion",
+    "Payload":7
+}
+```
+
+*Response:*
+
+```csharp
+// Version from 0 to 7.
+int version
+```
+
+```json
+{
+    "MessageType":"ProtocolVersion",
+    "Payload":7
+}
+```
+
+#### TestSession.Message notification (Runner) (Testhost)
+
+Downstream components can send messages to upstream components, with a given severity. This is mostly used to send additional information from extensions. Upstream component can decide what to do with the information, if it will process it and forward it, or batch it and then send it as one unified message.
+
+The upstream component should not parse the message content, or use it for flow control.
+
+```csharp
+// Message to send back to an upstream component to report
+// a message with a given severity.
+public class TestMessagePayload
+{
+    public TestMessageLevel MessageLevel { get; set; }
+
+    public string? Message { get; set; }
+}
+
+public enum TestMessageLevel
+{
+    // Information only, can be safely ignored, 
+    // usually on the sender side to avoid overhead 
+    // of sending it.
+    Informational = 0,
+ 
+    Warning = 1,
+
+    Error = 2
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestSession.Message",
+    "Payload": {
+        "MessageLevel": 0,
+        "Message": "Logging TestHost Diagnostics in file: C:\\logs\\log.host.txt"
+    }
+}
+```
+
+### Session
+
+Session starts the runner process, and connects to it. This is used in two ways. First as a way to pre-start Runner before there is any work for it, this is done for example by Visual Studio to have the runner ready to receive work. Or the flow is run just before other requests (e.g. Discovery).
+
+> ⚠️ Do not confuse this with TestSession workflow that pre-starts testhosts.
+
+#### Start Runner process request (Runner)
+
+Runner process starts and sends response to the port that it connected to.
+
+```mermaid
+sequenceDiagram
+participant c as Client<br>(Visual Studio)
+participant r as Runner<br>(vstest.console.exe)
+c->>r:   Run vstest.console -port X
+r->>r:   Connect to port Y
+r->>c:   TestSession.Connected
+```
+
+*Request:*
+
+The runner process starts.
+
+*Response:*
+
+```csharp
+null
+```
+
+```json
+{
+    "MessageType": "TestSession.Connected",
+    "Payload": null
+}
+```
+
+#### TestSession.Terminate request (Runner)
+
+Runner process is asked to terminate.
+
+```mermaid
+sequenceDiagram
+participant c as Client<br>(Visual Studio)
+participant r as Runner<br>(vstest.console.exe)
+c->>r:   TestSession.Terminate
+r-->>c:  Process exited 
+```
+
+*Request:*
+
+```csharp
+null
+```
+
+```json
+{
+    "MessageType": "TestSession.Terminate",
+    "Payload": null
+}
+```
+
+*Response:*
+
+The runner process terminates. Termination is detected by observing the process. ([Exited](https://learn.microsoft.com/dotnet/api/system.diagnostics.process.exited) event in .NET.)
+
+#### Start Testhost process request (Runner)
+
+Testhost process starts, and runner detects that it connected. There is no additional request response exchange.
+
+Same applies to datacollector.
+
+#### Terminate testhost request (Testhost)
+
+Testhost process is asked to terminate.
+
+```mermaid
+sequenceDiagram
+participant r as Runner<br>(vstest.console.exe)
+participant t as Testhost<br>(testhost.exe)
+r->>t:   TestSession.Terminate
+t-->>r:  Process exited 
+```
+
+*Request:*
+
+```csharp
+null
+```
+
+```json
+{
+    "MessageType": "TestSession.Terminate",
+    "Payload": null
+}
+```
+
+*Response:*
+
+The testhost process terminates. Termination is detected by observing the process. ([Exited](https://learn.microsoft.com/dotnet/api/system.diagnostics.process.exited) event in .NET.)
+
+Same applies to datacollector.
+
+### Discovery
+
+Discovery workflow is used to find tests in the provided test sources. Discovery happens in testhost and can run in parallel. Datacollectors are not used during discovery.
+
+> ℹ️ The real work is often offloaded to a test framework such as NUnit, which runs inside of the testhost process. This is not shown in the workflow below.
+
+```mermaid
+%% ./RFCs/0001-Test-Platform-Architecture.md#discovery
+sequenceDiagram
+participant c as Client<br>(Visual Studio)
+participant r as Runner<br>(vstest.console.exe)
+participant t as Testhost<br>(testhost.exe)
+Note over c,r: Start session and negotiate version
+c->>r:   (optional) Extensions.Initialize
+c->>+r:  TestDiscovery.Start
+r->>t:   Run testhost -port Y
+t->>t:   Connect to port Y
+t-->r:   Runner detects connection
+r->>t:   ProtocolVersion
+t->>r:   ProtocolVersion
+r->>t:   (optional) TestDiscovery.Initialize
+r->>+t:  TestDiscovery.Start
+t-->>r:  TestDiscovery.TestFound
+r-->>c:  TestDiscovery.TestFound
+t-->>r:  TestDiscovery.TestFound
+t->>-r:   TestDiscovery.Completed
+r->>t:   TestSession.Terminate
+t-->>r:  Process exited
+r->>-c:   TestDiscovery.Completed
+```
+
+#### Extensions.Initialize request (Runner)
+
+List of extensions to initialize in runner. Runner should forward appropriate extensions to testhost or datacollector if they are appropriate. For example when then list contains test adapters. This request is optional.
+
+*Request:*
+
+```cs
+// Full path to zero or more extensions to initialize.
+// Most often those are .NET .dll files, but can also be VSIX extensions.
+IEnumerable<string> extensions
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "Extensions.Initialize",
+    "Payload": [
+        "C:\\PROGRAM FILES\\MICROSOFT VISUAL STUDIO\\2022\\INTPREVIEW\\COMMON7\\IDE\\COMMONEXTENSIONS\\MICROSOFT\\EBF\\TESTEXPLORER\\Microsoft.VisualStudio.Workspace.ExternalBuildFramework.TestProvider.dll",
+        "C:\\Users\\me\\.nuget\\packages\\mstest.testadapter\\2.2.8\\build\\_common\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll"
+    ]
+}
+```
+
+*Response:*
+
+None.
+
+#### TestDiscovery.Start request (Runner)
+
+Contains full paths to one or more test sources, and settings to use for the discovery. Runner can split the request into multiple additional pieces. For example when the sources are incompatible and each need a different type of testhost. Or when it is asked to discover the sources in parallel.
+
+*Request:*
+
+```csharp
+public class DiscoveryRequestPayload
+{
+    // Full paths to sources to be discovered.
+    public IEnumerable<string>? Sources { get; set; }
+
+    // Settings used for this discovery request.
+    [DataMember]
+    public string? RunSettings { get; set; }
+
+    // TestPlatformOptions to use for this request.
+    public TestPlatformOptions? TestPlatformOptions
+    {
+        get;
+        set;
+    }
+
+    // A set of pre-started testhosts that this request should use.
+    public TestSessionInfo? TestSessionInfo { get; set; }
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.Start",
+    "Payload": {
+        "Sources": [
+            "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll"
+        ],
+        "RunSettings": "<RunSettings></RunSettings>",
+        "TestPlatformOptions": {
+            "TestCaseFilter": null,
+            "FilterOptions": null,
+            "CollectMetrics": true,
+            "SkipDefaultAdapters": false
+        },
+        "TestSessionInfo": null
+    }
+}
+```
+
+*Response:*
+
+```cs
+public class DiscoveryCompletePayload
+{
+    //  Total number of tests discovered in this request. Set to -1 when aborted.
+    public long TotalTests { get; set; }
+
+    // The last set of tests that were not reported yet by TestFound message.
+    public IEnumerable<TestCase>? LastDiscoveredTests { get; set; }
+
+    // Specifies if discovery has been aborted (meaning that testhost crashed or was killed). 
+    // If true TotalCount is also set to -1.
+    public bool IsAborted { get; set; }
+
+    // Metrics.
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    // Sources which were fully discovered.
+    public IList<string>? FullyDiscoveredSources { get; set; } = new List<string>();
+
+    // Sources which were partially discovered (e.g. started discovering tests, but then discovery aborted).
+    // Since protocol 6.
+    public IList<string>? PartiallyDiscoveredSources { get; set; } = new List<string>();
+
+    // Sources that were skipped during discovery.
+    // Since protocol 7.
+    public IList<string>? SkippedDiscoverySources { get; set; } = new List<string>();
+
+    // Sources which were not discovered at all.
+    // Since protocol 6.
+    public IList<string>? NotDiscoveredSources { get; set; } = new List<string>();
+
+    // Gets or sets the collection of discovered extensions.
+    // TODO: since?
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; } = new();
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.Completed",
+    "Payload": {
+        "TotalTests": 3,
+        "LastDiscoveredTests": null,
+        "IsAborted": false,
+        "Metrics": {
+            "VS.TestDiscovery.TimeTakenAdapter.executor://mstestadapter/v2": 0.38184969999999996,
+            "VS.TestDiscovery.TimeTakenInSecByAllAdapters": 0.38184969999999996,
+            "VS.TestDiscovery.TotalTestsDiscovered.executor://mstestadapter/v2": 3.0,
+            "VS.TestDiscovery.TotalTests": 3.0,
+            "VS.TestDiscovery.TimeTakenToLoadAdaptersInSec": 0.0030006,
+            "VS.TestDiscovery.AdaptersDiscoveredCount": 1,
+            "VS.TestDiscovery.AdaptersUsedCount": 1,
+            "VS.TestRun.TargetFramework": ".NETFramework,Version=v4.7.2",
+            "VS.TestRun.TargetPlatform": "X64",
+            "VS.TestRun.MaxCPUcount": 1,
+            "VS.TestRun.TargetDevice": "Local Machine",
+            "VS.TestRun.TestPlatformVersion": "17.5.0-dev",
+            "VS.TestRun.TargetOS": "Microsoft Windows NT 10.0.22623.0",
+            "VS.TestRun.DisableAppDomain": false,
+            "VS.TestRun.CommandLineSwitches": "",
+            "VS.TestRun.LoggersUsed": "",
+            "VS.TestDiscovery.ParallelEnabled": "False",
+            "VS.TestSession.Id": "",
+            "VS.TestDiscovery.NumberOfSources": 1,
+            "VS.TestDiscovery.DiscoveryState": "Completed",
+            "VS.TestDiscovery.TotalTimeTakenInSec": 4.4026146,
+            "VS.TestPlatform.DiscoveredExtensions": "{\"TestDiscoverers\":[\"Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.MSTestDiscoverer, Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"],\"TestHosts\":[\"HostProvider://DefaultTestHost\",\"HostProvider://DotnetTestHost\"]}"
+        },
+        "FullyDiscoveredSources": [
+            "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll"
+        ],
+        "PartiallyDiscoveredSources": [],
+        "NotDiscoveredSources": [],
+        "SkippedDiscoverySources": [],
+        "DiscoveredExtensions": {
+            "TestDiscoverers": [
+                "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.MSTestDiscoverer, Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            ],
+            "TestHosts": [
+                "HostProvider://DefaultTestHost",
+                "HostProvider://DotnetTestHost"
+            ]
+        }
+    }
+}
+```
+
+#### TestDiscovery.Initialize request (Testhost)
+
+List of extensions to initialize in the testhost. This request is optional.
+
+*Request:*
+
+```cs
+// Full path to zero or more extensions to initialize.
+// Most often those are .NET .dll files, but can also be VSIX extensions.
+IEnumerable<string> extensions
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.Initialize",
+    "Payload": [
+        "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll"
+    ]
+}
+```
+
+*Response:*
+
+None.
+
+#### TestDiscovery.Start request (Testhost)
+
+Contains full paths to one or more test sources, and settings to use for the discovery. Runner can split the request into multiple additional pieces. For example when the sources are incompatible and each need a different type of testhost. Or when it is asked to discover the sources in parallel.
+
+*Request:*
+
+```csharp
+public class DiscoveryCriteria
+{
+    // Gets the test Containers (e.g. .appx, .appxrecipie) TODO what???
+    public string? Package { get; set; }
+
+    
+    // Test adapter mapped to the sources it should process. "_none_" is used when there 
+    // is no adapter determined.
+    public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
+
+    
+    // Discovered test event will be raised after discovering at minimum this number of tests, 
+    // or when DiscoveredTestEventTimeout is passed.
+    public long FrequencyOfDiscoveredTestsEvent { get; private set; }
+
+    // Discovered test event will be raised after this much time since last test
+    // when FrequencyOfDiscoveredTestsEvent is passed.
+    public TimeSpan DiscoveredTestEventTimeout { get; private set; }
+
+    // Run settings for the discovery.
+    public string? RunSettings { get; private set; }
+
+    // Filters out tests that don't meet this filter. Filter is test framework
+    // dependent.
+    public string? TestCaseFilter { get; set; }
+
+    // TestSession (pre-started testhosts) on which this discovery should happen.
+    public TestSessionInfo? TestSessionInfo { get; set; }
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.Start",
+    "Payload": {
+        "Package": null,
+        "AdapterSourceMap": {
+            "_none_": [
+                "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll"
+            ]
+        },
+        "FrequencyOfDiscoveredTestsEvent": 10,
+        "DiscoveredTestEventTimeout": "00:00:01.5000000",
+        "RunSettings": "<RunSettings></RunSettings>",
+        "TestCaseFilter": null,
+        "TestSessionInfo": null
+    }
+}
+```
+
+*Response:*
+
+```cs
+public class DiscoveryCompletePayload
+{
+    //  Total number of tests discovered in this request. Set to -1 when aborted.
+    public long TotalTests { get; set; }
+
+    // The last set of tests that were not reported yet by TestFound message.
+    public IEnumerable<TestCase>? LastDiscoveredTests { get; set; }
+
+    // Specifies if discovery has been aborted (meaning that testhost crashed or was killed). 
+    // If true TotalCount is also set to -1.
+    public bool IsAborted { get; set; }
+
+    // Metrics.
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    // Sources which were fully discovered.
+    public IList<string>? FullyDiscoveredSources { get; set; } = new List<string>();
+
+    // Sources which were partially discovered (e.g. started discovering tests, but then discovery aborted).
+    // Since protocol 6.
+    public IList<string>? PartiallyDiscoveredSources { get; set; } = new List<string>();
+
+    // Sources that were skipped during discovery.
+    // Since protocol 7.
+    public IList<string>? SkippedDiscoverySources { get; set; } = new List<string>();
+
+    // Sources which were not discovered at all.
+    // Since protocol 6.
+    public IList<string>? NotDiscoveredSources { get; set; } = new List<string>();
+
+    // Gets or sets the collection of discovered extensions.
+    // TODO: since?
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; } = new();
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.Completed",
+    "Payload": {
+        "TotalTests": 2,
+        "LastDiscoveredTests": [],
+        "IsAborted": false,
+        "Metrics": {
+            "VS.TestDiscovery.TimeTakenToLoadAdaptersInSec": 0.0045024999999999996,
+            "VS.TestDiscovery.AdaptersDiscoveredCount": 1,
+            "VS.TestDiscovery.TotalTestsDiscovered.executor://mstestadapter/v2": 2,
+            "VS.TestDiscovery.TimeTakenAdapter.executor://mstestadapter/v2": 0.2842144,
+            "VS.TestDiscovery.TimeTakenInSecByAllAdapters": 0.2842144,
+            "VS.TestDiscovery.AdaptersUsedCount": 1.0,
+            "VS.TestDiscovery.DiscoveryState": "Completed",
+            "VS.TestDiscovery.TotalTests": 2
+        },
+        "FullyDiscoveredSources": [
+            "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll"
+        ],
+        "PartiallyDiscoveredSources": [],
+        "NotDiscoveredSources": [],
+        "SkippedDiscoverySources": [],
+        "DiscoveredExtensions": {
+            "TestDiscoverers": [
+                "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.MSTestDiscoverer, Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            ],
+            "TestSettingsProviders": []
+        }
+    }
+}
+```
+
+#### TestDiscovery.TestFound notification (Testhost)
+
+Contains a batch of tests that were found. Runner should aggregate the results, and hold onto them if it needs. The final response does not contain all the partial updates.
+
+```cs
+IEnumerable<TestCase> testCases
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.TestFound",
+    "Payload": [
+        {
+            "Id": "cfa76bee-59fb-2133-3c23-9693a1078027",
+            "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod1",
+            "DisplayName": "TestMethod1",
+            "ExecutorUri": "executor://MSTestAdapter/v2",
+            "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+            "CodeFilePath": null,
+            "LineNumber": -1,
+            "Properties": [
+                {
+                    "Key": {
+                        "Id": "MSTestDiscoverer.TestClassName",
+                        "Label": "ClassName",
+                        "Category": "",
+                        "Description": "",
+                        "Attributes": 1,
+                        "ValueType": "System.String"
+                    },
+                    "Value": "MSTest1.UnitTest1"
+                },
+                {
+                    "Key": {
+                        "Id": "TestObject.Traits",
+                        "Label": "Traits",
+                        "Category": "",
+                        "Description": "",
+                        "Attributes": 5,
+                        "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                    },
+                    "Value": []
+                }
+            ]
+        }
+    ]
+}
+```
+
+#### TestDiscovery.TestFound notification (Runner)
+
+Contains a batch of tests that were found. Client should aggregate the results, and hold onto them if it needs. The final response does not contain all the partial updates.
+
+```cs
+IEnumerable<TestCase> testCases
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestDiscovery.TestFound",
+    "Payload": [
+        {
+            "Id": "cfa76bee-59fb-2133-3c23-9693a1078027",
+            "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod1",
+            "DisplayName": "TestMethod1",
+            "ExecutorUri": "executor://MSTestAdapter/v2",
+            "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+            "CodeFilePath": null,
+            "LineNumber": -1,
+            "Properties": [
+                {
+                    "Key": {
+                        "Id": "MSTestDiscoverer.TestClassName",
+                        "Label": "ClassName",
+                        "Category": "",
+                        "Description": "",
+                        "Attributes": 1,
+                        "ValueType": "System.String"
+                    },
+                    "Value": "MSTest1.UnitTest1"
+                },
+                {
+                    "Key": {
+                        "Id": "TestObject.Traits",
+                        "Label": "Traits",
+                        "Category": "",
+                        "Description": "",
+                        "Attributes": 5,
+                        "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                    },
+                    "Value": []
+                }
+            ]
+        }
+    ]
+}
+```
+
+### Run
+
+The Run workflow runs the provided tests. It has has four modes, determined by combination of two properties. Running with sources, or set of discovered tests. And running with a default testhost launcher, or with a custom testhost launcher. Running with custom testhost launcher is most commonly used when debugging, and it adds the debugger related messages into the workflow.
+
+There are four distinct messages, one for each mode, which all use the same payload:
+
+- TestExecution.RunAllWithDefaultHost (sources, default testhost)
+- TestExecution.RunSelectedWithDefaultHost (tests, default testhost)
+- TestExecution.GetTestRunnerProcessStartInfoForRunAll (sources, custom testhost)
+- TestExecution.GetTestRunnerProcessStartInfoForRunSelected (tests, custom testhost)
+
+Below, only the most complex workflow is shown:
+
+```mermaid
+%% ./RFCs/0001-Test-Platform-Architecture.md#discovery
+sequenceDiagram
+participant c as Client<br>(Visual Studio)
+participant r as Runner<br>(vstest.console.exe)
+participant t as Testhost<br>(testhost.exe)
+Note over c,r: Start session and negotiate version
+c->>r:   (optional) Extensions.Initialize
+c->>+r:  TestExecution.GetTestRunnerProcessStartInfoForRunSelected
+r->>t:   Run testhost -port Y
+t->>t:   Connect to port Y
+t-->r:   Runner detects connection
+r->>t:   ProtocolVersion
+t->>r:   ProtocolVersion
+r->>t:   (optional) TestExecution.Initialize
+r->>+t:  TestExecution.StartWithTests
+t->>r:   TestExecution.AttachDebugger
+r->>c:   TestExecution.AttachDebugger
+r->>c:   TestExecution.EditorAttachDebugger2
+c->>r:   TestExecution.EditorAttachDebuggerCallback
+r->>t:   TestExecution.AttachDebuggerCallback
+t-->>r:  TestExecution.StatsChange
+r-->>c:  TestExecution.StatsChange
+t-->>r:  TestExecution.StatsChange
+t->>-r:  TestExecution.Completed
+r->>t:   TestSession.Terminate
+t-->>r:  Process exited
+r-->>c:  TestExecution.StatsChange
+r->>-c:  TestExecution.Completed
+
+```
+
+#### TestExecution.GetTestRunnerProcessStartInfoForRunSelected request (Client)
+
+This applies to all these four requests:
+
+- TestExecution.RunAllWithDefaultHost (sources, default testhost)
+- TestExecution.RunSelectedWithDefaultHost (tests, default testhost)
+- TestExecution.GetTestRunnerProcessStartInfoForRunAll (sources, custom testhost)
+- TestExecution.GetTestRunnerProcessStartInfoForRunSelected (tests, custom testhost)
+
+*Request:*
+
+```cs
+public class TestRunRequestPayload
+{
+    // Full paths of to the test sources containing the tests to run.
+    // It should not be used together with TestCases.
+    public List<string>? Sources { get; set; }
+
+    // List of TestCases that were previously discovered.
+    // It should not be used together with Sources.
+    public List<TestCase>? TestCases { get; set; }
+
+    // RunSettings for the current run.
+    public string? RunSettings { get; set; }
+
+    // True if the runner should stay alive after the run is completed.
+    public bool KeepAlive { get; set; }
+
+    // True when requests to attach debugger to testhost should be send back to client.
+    public bool DebuggingEnabled { get; set; }
+
+    // Test platform options.
+    public TestPlatformOptions? TestPlatformOptions { get; set; }
+
+    // The set of pre-started testhosts on which this run should try to run.
+    public TestSessionInfo? TestSessionInfo { get; set; }
+}
+```
+
+```json
+{
+   "Version": 7,
+   "MessageType": "TestExecution.GetTestRunnerProcessStartInfoForRunSelected",
+   "Payload": {
+      "Sources": null,
+      "TestCases": [
+         {
+            "Id": "cfa76bee-59fb-2133-3c23-9693a1078027",
+            "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod1",
+            "DisplayName": "TestMethod1",
+            "ExecutorUri": "executor://MSTestAdapter/v2",
+            "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+            "CodeFilePath": null,
+            "LineNumber": -1,
+            "Properties": [
+               {
+                  "Key": {
+                     "Id": "MSTestDiscoverer.TestClassName",
+                     "Label": "ClassName",
+                     "Category": "",
+                     "Description": "",
+                     "Attributes": 1,
+                     "ValueType": "System.String"
+                  },
+                  "Value": "MSTest1.UnitTest1"
+               },
+               {
+                  "Key": {
+                     "Id": "TestObject.Traits",
+                     "Label": "Traits",
+                     "Category": "",
+                     "Description": "",
+                     "Attributes": 5,
+                     "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                  },
+                  "Value": []
+               }
+            ]
+         }
+      ],
+      "RunSettings": "<RunSettings></RunSettings>",
+      "KeepAlive": false,
+      "DebuggingEnabled": true,
+      "TestPlatformOptions": {
+         "TestCaseFilter": null,
+         "FilterOptions": null,
+         "CollectMetrics": true,
+         "SkipDefaultAdapters": false
+      },
+      "TestSessionInfo": null
+   }
+}
+```
+
+*Response:*
+
+```cs
+public class TestRunCompletePayload
+{
+    // The completion information defined below.
+    public TestRunCompleteEventArgs? TestRunCompleteArgs { get; set; }
+
+    // The last batch of tests that were executed, empty when they were sent 
+    // via stats update message.
+    public TestRunChangedEventArgs? LastRunTests { get; set; }
+
+    // Gets or sets the run attachments, such as TRX reports or other files.
+    public ICollection<AttachmentSet>? RunAttachments { get; set; }
+
+    // Gets or sets the executor uris that were used to run the tests.
+    public ICollection<string>? ExecutorUris { get; set; }
+}
+
+public class TestRunCompleteEventArgs
+{
+    // Gets the statistics on the state of the test run. Including how many tests 
+    // were there for each outcome.
+    public ITestRunStatistics? TestRunStatistics { get; private set; }
+
+    // True when the run was cancelled. E.g. by user clicking cancel in a client
+    // or starting a new RunTests operation.
+    public bool IsCanceled { get; private set; }
+
+    // Gets a value indicating whether the test run is aborted. Meaning that the testhost
+    // crashed and runner sends this result on its behalf.
+    public bool IsAborted { get; private set; }
+
+    // Error encountered in the run that is not linked to any test.
+    public Exception? Error { get; private set; }
+
+    // Gets the attachment sets associated with the test run.
+    // TODO: HOW is this different from RunAttachments above?
+    public Collection<AttachmentSet> AttachmentSets { get; private set; }
+
+    // Gets the invoked data collectors for the test session.
+    public Collection<InvokedDataCollector> InvokedDataCollectors { get; private set; }
+
+    // Gets the time elapsed in just running the tests.
+    // Value is set to TimeSpan.Zero in case of any error.
+    public TimeSpan ElapsedTimeInRunningTests { get; private set; }
+
+    // Metrics.
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    // Extensions that were discovered in this run.
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; }
+}
+```
+
+```json
+{
+   "Version": 7,
+   "MessageType": "TestExecution.Completed",
+   "Payload": {
+      "TestRunCompleteArgs": {
+         "TestRunStatistics": {
+            "ExecutedTests": 3,
+            "Stats": {
+               "Passed": 3
+            }
+         },
+         "IsCanceled": false,
+         "IsAborted": false,
+         "Error": null,
+         "AttachmentSets": [],
+         "InvokedDataCollectors": [],
+         "ElapsedTimeInRunningTests": "00:00:00.5860000",
+         "Metrics": {
+            "VS.TestRun.TotalTestsRun.executor://mstestadapter/v2": 3.0,
+            "VS.TestRun.AdaptersUsedCount": 1,
+            "VS.TestRun.TimeTakenByAllAdapters": 0.5498061,
+            "VS.TestRun.AdaptersDiscoveredCount": 1,
+            "VS.TestRun.TotalTests": 3.0,
+            "VS.TestRun.TimeTakenToRun.executor://mstestadapter/v2": 0.5498061,
+            "VS.TestRun.TargetFramework": ".NETFramework,Version=v4.7.2",
+            "VS.TestRun.TargetPlatform": "X64",
+            "VS.TestRun.MaxCPUcount": 1,
+            "VS.TestRun.TargetDevice": "Local Machine",
+            "VS.TestRun.TestPlatformVersion": "17.5.0-dev",
+            "VS.TestRun.TargetOS": "Microsoft Windows NT 10.0.22623.0",
+            "VS.TestRun.DisableAppDomain": false,
+            "VS.TestRun.CommandLineSwitches": "",
+            "VS.TestRun.IsTestSettingsUsed": false,
+            "VS.TestRun.LoggersUsed": "",
+            "VS.TestRun.ParallelEnabled": "False",
+            "VS.TestSession.Id": "",
+            "VS.TestRun.NumberOfSources": 0,
+            "VS.TestRun.RunState": "Completed",
+            "VS.TestRun.TimeTakenInSec": 2.8273251,
+            "VS.TestPlatform.DiscoveredExtensions": "{\"TestExecutors\":[\"executor://MSTestAdapter/v2\"],\"TestHosts\":[\"HostProvider://DefaultTestHost\",\"HostProvider://DotnetTestHost\"]}"
+         },
+         "DiscoveredExtensions": {
+            "TestExecutors": [
+               "executor://MSTestAdapter/v2"
+            ],
+            "TestHosts": [
+               "HostProvider://DefaultTestHost",
+               "HostProvider://DotnetTestHost"
+            ]
+         }
+      },
+      "LastRunTests": null,
+      "RunAttachments": [],
+      "ExecutorUris": [
+         "executor://mstestadapter/v2"
+      ]
+   }
+}
+```
+
+#### TestExecution.Initialize request (Runner)
+
+Optional list of additional extensions to initialize in the testhost.
+
+*Request:*
+
+```cs
+IEnumerable<string> extensions
+```
+
+```json
+{
+   "Version": 7,
+   "MessageType": "TestExecution.Initialize",
+   "Payload": [
+      "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll"
+   ]
+}
+```
+
+*Response:*
+
+None.
+
+#### TestExecution.StartWithTests (Runner)
+
+The runner starts the testhost and sends it a request to run tests. It comes in two flavors, depending on whether we run with sources, or with given set of testcases (see below).
+
+*Request:*
+
+```cs
+public class TestRunCriteriaWithTests
+{
+    // The tests that were previously discovered and that should run.
+    public IEnumerable<TestCase> Tests { get; private set; }
+
+    // Settings for the current run.
+    public string? RunSettings { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the test execution context.
+    /// </summary>
+    public TestExecutionContext TestExecutionContext { get; set; }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. .appx, .appxrecipie)
+    /// </summary>
+    public string? Package { get; private set; }
+}
+
+public class TestExecutionContext
+{
+    // Gets or sets the frequency of run stats event.
+    public long FrequencyOfRunStatsChangeEvent { get; set; }
+
+    // Gets or sets the timeout that triggers sending results regardless of cache size.
+    public TimeSpan RunStatsChangeEventTimeout { get; set; }
+
+    // Gets or sets a value indicating whether execution is out of process.
+    public bool InIsolation { get; set; }
+
+    // Gets or sets a value indicating whether testhost process should be kept running after test run completion.
+    public bool KeepAlive { get; set; }
+
+    // Gets or sets a value indicating whether test case level events need to be sent or not.
+    public bool AreTestCaseLevelEventsRequired { get; set; }
+
+    // Gets or sets a value indicating whether execution is in debug mode.
+    public bool IsDebug { get; set; }
+
+    // Gets or sets the filter criteria for run with sources to filter test cases.
+    public string? TestCaseFilter { get; set; }
+
+    // Gets or sets additional options for filtering.
+    public FilterOptions? FilterOptions { get; set; }
+}
+```
+
+```json
+{
+   "Version": 7,
+   "MessageType": "TestExecution.StartWithTests",
+   "Payload": {
+      "Tests": [
+         {
+            "Id": "cfa76bee-59fb-2133-3c23-9693a1078027",
+            "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod1",
+            "DisplayName": "TestMethod1",
+            "ExecutorUri": "executor://MSTestAdapter/v2",
+            "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+            "CodeFilePath": null,
+            "LineNumber": -1,
+            "Properties": [
+               {
+                  "Key": {
+                     "Id": "MSTestDiscoverer.TestClassName",
+                     "Label": "ClassName",
+                     "Category": "",
+                     "Description": "",
+                     "Attributes": 1,
+                     "ValueType": "System.String"
+                  },
+                  "Value": "MSTest1.UnitTest1"
+               },
+               {
+                  "Key": {
+                     "Id": "TestObject.Traits",
+                     "Label": "Traits",
+                     "Category": "",
+                     "Description": "",
+                     "Attributes": 5,
+                     "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                  },
+                  "Value": []
+               }
+            ]
+         }
+      ],
+      "RunSettings": "<RunSettings></RunSettings>",
+      "TestExecutionContext": {
+         "FrequencyOfRunStatsChangeEvent": 2,
+         "RunStatsChangeEventTimeout": "00:00:01.5000000",
+         "InIsolation": false,
+         "KeepAlive": false,
+         "AreTestCaseLevelEventsRequired": false,
+         "IsDebug": true,
+         "TestCaseFilter": null,
+         "FilterOptions": null
+      },
+      "Package": null
+   }
+}
+```
+
+*Response:*
+
+```cs
+public class TestRunCompletePayload
+{
+    // The completion information defined below.
+    public TestRunCompleteEventArgs? TestRunCompleteArgs { get; set; }
+
+    // The last batch of tests that were executed, empty when they were sent 
+    // via stats update message.
+    public TestRunChangedEventArgs? LastRunTests { get; set; }
+
+    // Gets or sets the run attachments, such as TRX reports or other files.
+    public ICollection<AttachmentSet>? RunAttachments { get; set; }
+
+    // Gets or sets the executor uris that were used to run the tests.
+    public ICollection<string>? ExecutorUris { get; set; }
+}
+
+public class TestRunCompleteEventArgs
+{
+    // Gets the statistics on the state of the test run. Including how many tests 
+    // were there for each outcome.
+    public ITestRunStatistics? TestRunStatistics { get; private set; }
+
+    // True when the run was cancelled. E.g. by user clicking cancel in a client
+    // or starting a new RunTests operation.
+    public bool IsCanceled { get; private set; }
+
+    // Gets a value indicating whether the test run is aborted. Meaning that the testhost
+    // crashed and runner sends this result on its behalf.
+    public bool IsAborted { get; private set; }
+
+    // Error encountered in the run that is not linked to any test.
+    public Exception? Error { get; private set; }
+
+    // Gets the attachment sets associated with the test run.
+    // TODO: HOW is this different from RunAttachments above?
+    public Collection<AttachmentSet> AttachmentSets { get; private set; }
+
+    // Gets the invoked data collectors for the test session.
+    public Collection<InvokedDataCollector> InvokedDataCollectors { get; private set; }
+
+    // Gets the time elapsed in just running the tests.
+    // Value is set to TimeSpan.Zero in case of any error.
+    public TimeSpan ElapsedTimeInRunningTests { get; private set; }
+
+    // Metrics.
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    // Extensions that were discovered in this run.
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; }
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestExecution.Completed",
+    "Payload": {
+        "TestRunCompleteArgs": {
+            "TestRunStatistics": {
+                "ExecutedTests": 3,
+                "Stats": {
+                    "Passed": 3
+                }
+            },
+            "IsCanceled": false,
+            "IsAborted": false,
+            "Error": null,
+            "AttachmentSets": [],
+            "InvokedDataCollectors": [],
+            "ElapsedTimeInRunningTests": "00:00:00.6764685",
+            "Metrics": {
+                "VS.TestRun.AdaptersDiscoveredCount": 1,
+                "VS.TestRun.TotalTestsRun.executor://mstestadapter/v2": 3,
+                "VS.TestRun.TimeTakenToRun.executor://mstestadapter/v2": 0.6460834,
+                "VS.TestRun.TimeTakenByAllAdapters": 0.6460834,
+                "VS.TestRun.TotalTests": 3,
+                "VS.TestRun.RunState": "Completed",
+                "VS.TestRun.AdaptersUsedCount": 1
+            },
+            "DiscoveredExtensions": {
+                "TestDiscoverers": [
+                    "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.MSTestDiscoverer, Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                ],
+                "TestExecutors": [
+                    "executor://MSTestAdapter/v2"
+                ],
+                "TestExecutors2": [],
+                "TestSettingsProviders": []
+            }
+        },
+        "LastRunTests": {
+            "NewTestResults": [
+                {
+                    "TestCase": {
+                        "Id": "ef7f4646-afa1-4482-25a2-1aabbbdbb9bc",
+                        "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod3",
+                        "DisplayName": "TestMethod3",
+                        "ExecutorUri": "executor://MSTestAdapter/v2",
+                        "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+                        "CodeFilePath": null,
+                        "LineNumber": -1,
+                        "Properties": [
+                            {
+                                "Key": {
+                                    "Id": "MSTestDiscoverer.TestClassName",
+                                    "Label": "ClassName",
+                                    "Category": "",
+                                    "Description": "",
+                                    "Attributes": 1,
+                                    "ValueType": "System.String"
+                                },
+                                "Value": "MSTest1.UnitTest1"
+                            },
+                            {
+                                "Key": {
+                                    "Id": "TestObject.Traits",
+                                    "Label": "Traits",
+                                    "Category": "",
+                                    "Description": "",
+                                    "Attributes": 5,
+                                    "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                                },
+                                "Value": []
+                            }
+                        ]
+                    },
+                    "Attachments": [],
+                    "Outcome": 1,
+                    "ErrorMessage": null,
+                    "ErrorStackTrace": null,
+                    "DisplayName": null,
+                    "Messages": [],
+                    "ComputerName": null,
+                    "Duration": "00:00:00.0101784",
+                    "StartTime": "2022-10-20T07:22:58.0889799+02:00",
+                    "EndTime": "2022-10-20T07:22:58.099497+02:00",
+                    "Properties": [
+                        {
+                            "Key": {
+                                "Id": "ExecutionId",
+                                "Label": "ExecutionId",
+                                "Category": "",
+                                "Description": "",
+                                "Attributes": 1,
+                                "ValueType": "System.Guid"
+                            },
+                            "Value": "00000000-0000-0000-0000-000000000000"
+                        },
+                        {
+                            "Key": {
+                                "Id": "ParentExecId",
+                                "Label": "ParentExecId",
+                                "Category": "",
+                                "Description": "",
+                                "Attributes": 1,
+                                "ValueType": "System.Guid"
+                            },
+                            "Value": "00000000-0000-0000-0000-000000000000"
+                        },
+                        {
+                            "Key": {
+                                "Id": "InnerResultsCount",
+                                "Label": "InnerResultsCount",
+                                "Category": "",
+                                "Description": "",
+                                "Attributes": 1,
+                                "ValueType": "System.Int32"
+                            },
+                            "Value": 0
+                        }
+                    ]
+                }
+            ],
+            "TestRunStatistics": {
+                "ExecutedTests": 3,
+                "Stats": {
+                    "Passed": 3
+                }
+            },
+            "ActiveTests": []
+        },
+        "RunAttachments": [],
+        "ExecutorUris": [
+            "executor://mstestadapter/v2"
+        ]
+    }
+}
+```
+
+#### TestExecution.StartWithSources
+
+The runner starts the testhost and sends it a request to run tests. It comes in two flavors, depending on whether we run with sources (see above), or with given set of testcases.
+
+```cs
+public class TestRunCriteriaWithSources
+{
+    /// <summary>
+    /// Gets the adapter source map.
+    /// </summary>
+    public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
+
+    /// <summary>
+    /// Gets the run settings.
+    /// </summary>
+    public string? RunSettings { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the test execution context.
+    /// </summary>
+    public TestExecutionContext TestExecutionContext { get; set; }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. .appx, .appxrecipie)
+    /// </summary>
+    public string? Package { get; private set; }
+}
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestExecution.StartWithSources",
+    "Payload": {
+        "AdapterSourceMap": {
+            "_none_": [
+                "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll"
+            ]
+        },
+        "RunSettings": "<RunSettings>\r\n  <RunConfiguration>\r\n    <BatchSize>2</BatchSize>\r\n    <CollectSourceInformation>False</CollectSourceInformation>\r\n    <DesignMode>True</DesignMode>\r\n    <TargetFrameworkVersion>.NETFramework,Version=v4.7.2</TargetFrameworkVersion>\r\n  </RunConfiguration>\r\n  <BoostTestInternalSettings xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n    <VSProcessId>999999</VSProcessId>\r\n  </BoostTestInternalSettings>\r\n  <GoogleTestAdapterSettings xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n    <SolutionSettings>\r\n      <Settings />\r\n    </SolutionSettings>\r\n    <ProjectSettings />\r\n  </GoogleTestAdapterSettings>\r\n</RunSettings>",
+        "TestExecutionContext": {
+            "FrequencyOfRunStatsChangeEvent": 2,
+            "RunStatsChangeEventTimeout": "00:00:01.5000000",
+            "InIsolation": false,
+            "KeepAlive": false,
+            "AreTestCaseLevelEventsRequired": false,
+            "IsDebug": true,
+            "TestCaseFilter": null,
+            "FilterOptions": null
+        },
+        "Package": null
+    }
+}
+```
+
+*Response:*
+
+See [TestExecution.StartWithTests (Runner)](#testexecutionstartwithtests-runner).
+
+#### TestExecution.StatsChange notification (Runner)
+
+```cs
+public class TestRunChangedEventArgs : EventArgs
+{
+    // New test results.
+    public IEnumerable<TestResult>? NewTestResults { get; private set; }
+
+    // Test run statistics, e.g. how many tests passed or failed so far.
+    public ITestRunStatistics? TestRunStatistics { get; private set; }
+
+    // Currently running tests.
+    public IEnumerable<TestCase>? ActiveTests { get; private set; }
+}
+
+```
+
+```json
+{
+    "Version": 7,
+    "MessageType": "TestExecution.StatsChange",
+    "Payload": {
+        "NewTestResults": [
+            {
+                "TestCase": {
+                    "Id": "66367201-6976-c7c2-37ef-ac9e96858025",
+                    "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod2",
+                    "DisplayName": "TestMethod2",
+                    "ExecutorUri": "executor://MSTestAdapter/v2",
+                    "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+                    "CodeFilePath": null,
+                    "LineNumber": -1,
+                    "Properties": [
+                        {
+                            "Key": {
+                                "Id": "MSTestDiscoverer.TestClassName",
+                                "Label": "ClassName",
+                                "Category": "",
+                                "Description": "",
+                                "Attributes": 1,
+                                "ValueType": "System.String"
+                            },
+                            "Value": "MSTest1.UnitTest1"
+                        },
+                        {
+                            "Key": {
+                                "Id": "TestObject.Traits",
+                                "Label": "Traits",
+                                "Category": "",
+                                "Description": "",
+                                "Attributes": 5,
+                                "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                            },
+                            "Value": []
+                        }
+                    ]
+                },
+                "Attachments": [],
+                "Outcome": 1,
+                "ErrorMessage": null,
+                "ErrorStackTrace": null,
+                "DisplayName": null,
+                "Messages": [],
+                "ComputerName": null,
+                "Duration": "00:00:00.0000401",
+                "StartTime": "2022-10-20T07:22:58.0857669+02:00",
+                "EndTime": "2022-10-20T07:22:58.0857669+02:00",
+                "Properties": [
+                    {
+                        "Key": {
+                            "Id": "ExecutionId",
+                            "Label": "ExecutionId",
+                            "Category": "",
+                            "Description": "",
+                            "Attributes": 1,
+                            "ValueType": "System.Guid"
+                        },
+                        "Value": "00000000-0000-0000-0000-000000000000"
+                    },
+                    {
+                        "Key": {
+                            "Id": "ParentExecId",
+                            "Label": "ParentExecId",
+                            "Category": "",
+                            "Description": "",
+                            "Attributes": 1,
+                            "ValueType": "System.Guid"
+                        },
+                        "Value": "00000000-0000-0000-0000-000000000000"
+                    },
+                    {
+                        "Key": {
+                            "Id": "InnerResultsCount",
+                            "Label": "InnerResultsCount",
+                            "Category": "",
+                            "Description": "",
+                            "Attributes": 1,
+                            "ValueType": "System.Int32"
+                        },
+                        "Value": 0
+                    }
+                ]
+            }
+        ],
+        "TestRunStatistics": {
+            "ExecutedTests": 2,
+            "Stats": {
+                "Passed": 2
+            }
+        },
+        "ActiveTests": [
+            {
+                "Id": "ef7f4646-afa1-4482-25a2-1aabbbdbb9bc",
+                "FullyQualifiedName": "MSTest1.UnitTest1.TestMethod3",
+                "DisplayName": "TestMethod3",
+                "ExecutorUri": "executor://MSTestAdapter/v2",
+                "Source": "S:\\p\\vstest\\playground\\MSTest1\\bin\\Debug\\net472\\MSTest1.dll",
+                "CodeFilePath": null,
+                "LineNumber": -1,
+                "Properties": [
+                    {
+                        "Key": {
+                            "Id": "MSTestDiscoverer.TestClassName",
+                            "Label": "ClassName",
+                            "Category": "",
+                            "Description": "",
+                            "Attributes": 1,
+                            "ValueType": "System.String"
+                        },
+                        "Value": "MSTest1.UnitTest1"
+                    },
+                    {
+                        "Key": {
+                            "Id": "TestObject.Traits",
+                            "Label": "Traits",
+                            "Category": "",
+                            "Description": "",
+                            "Attributes": 5,
+                            "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                        },
+                        "Value": []
+                    }
+                ]
+            }
+        ]
+    }
+}
+```
+
+#### TestExecution.StatsChange notification (Client)
+
+Same as above [TestExecution.StatsChange notification (Runner)](#testexecutionstatschange-notification-runner).
+
+### Datacollection
+
+TODO
+
+### .NET Implementation
+
+#### Architecture
+
+#### Extension points
diff --git a/docs/Problems.md b/docs/Problems.md
new file mode 100644
index 0000000000..877d78c1a7
--- /dev/null
+++ b/docs/Problems.md
@@ -0,0 +1,11 @@
+# Problems and inconsistencies
+
+Client connection to runner, does not detect that we are connected in the same way as runner to testhost.
+
+Client to runner needs a message sent back (testsession.connected), while testhost does not need any message because the underlying tcp client will detect that testhost connected and will send it work right away. What is the unified way to do this?
+
+There are some requests that need no response, like extensions initialize.
+
+Translation layer uses 4 different messages for run, but sends the same payload in all of them with mixed info that is not necessary for some of the messages (testcases / sources, isDebug). When running with sources and default testhost launcher, we send (from translation layer) incorrectly the same message as when running with testcases.
+
+The messages between runner and testhost have the same names, and sometimes different payloads.
diff --git a/docs/RFCs/0001-Test-Platform-Architecture.md b/docs/RFCs/0001-Test-Platform-Architecture.md
new file mode 100644
index 0000000000..8f6f6179f8
--- /dev/null
+++ b/docs/RFCs/0001-Test-Platform-Architecture.md
@@ -0,0 +1,270 @@
+# 0001 Test Platform Architecture
+
+## Summary
+This document outlines the architecture of the Visual Studio Test Platform. It
+covers the core components and the runner.
+
+## Motivation
+The test platform should help the developer through out [testing life
+cycle][testplatform-concept-blog]. In terms of **acquisition**, the test
+platform may provide a test runner which is available in key operating systems
+and devices.
+
+Based on test strategy of a product, tests are grouped into various categories
+as per semantics (the product area they validate), or the phase they run
+(Developer Machine, Continuous Integration or Continuous Deployment). Test
+platform should allow **selection** of tests. Various aspects of test execution
+may need to be **configurable** and shared across a team. During test execution,
+diagnostics from the product should be available as **reporting**. The reporting
+and collection of diagnostics data may be extensible to support coverage,
+loggers, analytics and so on.
+
+The platform should provide an extensibility model for test frameworks (and
+language runtimes). A developer acquainted with the aspects of test platform can
+use the same set of operations (test filtering, test execution, reporting)
+irrespective of the test framework (or language runtime) of the test.
+
+[testplatform-concept-blog]: https://blogs.msdn.microsoft.com/visualstudioalm/2016/07/25/evolving-the-visual-studio-test-platform-part-1
+
+## Detailed Design
+
+The overall architecture of the test platform is detailed in the block diagram
+below with all the extensibility points colored in green. 
+
+[![vstest.console overall architecture](Images/vstest.console-overall-architecture.png)](Images/vstest.console-overall-architecture.png)
+
+This architecture has four major components:
+
+1. **Test Runner** is the command line entrypoint to test platform
+   (`vstest.console`).
+2. **Test Execution Host** is an architecture and framework specific process
+   that actually loads the test container and executes tests.
+3. **Data Collector Host** process hosts various test execution data
+   listeners.
+4. **IDE/Editor** process is used by developer for Edit/Build the application
+   and trigger test runs.
+
+We will describe each component in the following sections.
+
+### Test Runner
+Test runner is the primary entry point to the test platform. It takes a test
+container with a set of configuration settings as input. The language runtime,
+architecture, framework for test execution are inferred from the settings. Based
+on these parameters, it spawns a **Test Execution Host** process.
+
+Test platform separates the test execution from the test runner for the
+following reasons:
+
+* Tests can target any language runtime. E.g. .NET, Javascript, Python etc.
+* Tests can target a specific version of the runtime. E.g. .NET 4.6 or .NET
+  Standard 1.4
+* Tests can target a specific platform architecture. E.g. x64 or x86
+* Tests can target a different device
+* Test runner (or the loggers) need to capture details even in case test
+  execution host terminates abnormally
+* Test execution can be ported to newer devices/platforms/runtimes without any
+  impact on test runner
+
+An example: `vstest.console` can be `net46` but run tests targeting
+`netcoreapp1.0`. The tests are loaded in a different process (`dotnet.exe`)
+which hosts the `netcoreapp1.0` CLR runtime. If user upgrades their test project
+to `netcoreapp2.0`, the tests will continue to run.
+
+**Host extensibility** allows developers to author custom test execution hosts.
+One of the primary use case for this is running tests on a device. E.g. in case
+of running tests against a Universal Windows device, the test host is launched
+on a Windows Phone device. The test case and run settings are passed on to the
+test host using a JSON over Sockets protocol.
+
+Using the **Logger extensibility** feature, an extension can listen to the *Test
+Result* for each test case. It can also recieve a set of *Test Attachments*
+generated during the test execution. E.g. Trx logger generates an xml report of
+test results, elapsed time for the run etc. using this mechanism.
+
+If data collectors are specified in the run settings, the **Data Collector
+Host** is spawned. We will cover it in more details in another section below.
+
+The test runner component loads host extensions and logger extensions in it's
+process. Data collectors are not loaded in this process. The tests are also not
+loaded here, it is completely agnostic to test runtime/platform.
+
+### Test Execution Host
+The test host connects to the test runner, and waits for commands to discover
+and execute tests. Details of the protocol are available in [test discovery
+protocol][] and [test execution protocol][] documents.
+
+A test host is specific to the language runtime, version and platform architecture
+of the test containers. E.g. `testhost.x86.exe` is the test host for a test
+container (assembly) targeting .NET Framework 4.6, x86 architecture; where as
+`testhost.exe` is spawned for .NET Framework 4.6, x64 architecture. The test
+host for .NET Core is platform agnostic and is launched on the required
+`dotnet.exe` (x86 or x64).
+
+However the test host is agnostic of test framework. It has no knowledge of
+*what* a Test Case or Test Suite is. It delegates the responsibility of
+discovering and executing the tests to **Test Adapters**. An adapter understands
+the intricacies of test framework. E.g. the NUnit adapter understands tests
+authored in NUnit framework, it can discover and execute them.
+
+**Adapter Extensibility** provides an extensible way for developers to plug in
+an adapter for the test framework of their choice. An adapter needs to implement
+a specific interface that is understood by the test host. [Test Adapter
+Extensibility][test adapter extensibility] document covers this in more detail.
+
+A Data Collector monitors the test execution and collects diagnostic,
+performance, and other data for the code under test. If a data collector needs
+to collect intrusive data, it may use the **In-Proc Data Collection
+Extensibility** API for this. In-proc data collectors, as the name suggests, are
+loaded within the test execution host. They can subscribe the test run and test
+case level events.
+
+We will discuss out of process data collectors in the next section.
+
+[test discovery protocol]: 0002-Test-Discovery-Protocol.md
+[test execution protocol]: 0003-Test-Execution-Protocol.md
+[test adapter extensibility]: 0004-Adapter-Extensibility.md
+
+### Data Collector Host
+Out of process data collectors are hosted in the data collector host process.
+Similar to in-proc data collector, these data collectors also receive test run
+and test case level start/stop events. Usually the data collector starts/stops
+monitoring in these event handlers. Further a data collector can generate
+attachments which are available in the test results. E.g. a video data
+collector can record a browser session while the test case is executing, it may
+attach the recorded video to the test result (if the test case failed) for
+further analysis by the user.
+
+Data collectors are hosted in a separate process for several reasons:
+
+1. Data collector may not be intrusive, it should not impact the test execution
+   itself. E.g. a performance data collector may not be accurate if it runs
+   within the execution process
+2. The test host process can be of a totally different architecture, framework.
+   However data collectors are usually generic. E.g. the video data collector
+   should record videos for JS or .NET tests alike.
+
+Data collector host process is spawned only if data collection is configured in
+the test run settings.
+
+Detailed design of a data collector is available in the [Data Collector
+Protocol][data collector protocol] document.
+
+[data collector protocol]: 0006-DataCollection-Protocol.md
+
+### IDE/Editor
+An IDE/Editor can connect to `vstest.console` over a JSON protocol. It invokes
+the runner with a specific port to connect. Once connected, the runner can
+receive commands to discover or execute tests. The Editor needs to specify a
+test container for the run, and any `runsettings` as specified by user. The
+runner returns list of discovered `TestCase` for discovery command. For test
+execution it returns a list of `TestResult` objects.
+
+The separation of `vstest.console` as a different process allows non .NET based
+Editors to use test platform capabilities. Secondly, the runner process loads
+several extensions (loggers, host extensions) at runtime; process isolation
+allows flexibility for Editor to not load these extensions in-proc.
+
+This protocol is documented in [Editor API Specification][editor protocol]
+document.
+
+[editor protocol]: 0007-Editors-API-Specification.md
+
+### Flow: Test Runner - Test Host
+
+1. A user would spawn an instance of the runner with a set of test containers
+   and settings for the test session. 
+2. The runner would then process those settings to figure out key decision
+   parameters for the run some of which are:
+	* The architecture the tests should run on.(x86/x64)
+	* The framework that the tests are on.(Desktop Fx/Core Fx)
+	* Data collectors if enabled.
+	* Path to user specified extension assemblies.
+3. It uses the architecture and framework specified to spawn an instance of a
+   test host process that satisfies these settings.
+4. The runner also starts an instance of a TCP server to communicate with the
+   test host process. 
+5. After the test host launches it sets up a client connection with the runner. 
+6. The runner would then send through the test containers with the user
+   specified settings to the test host process.
+7. The test host process performs the requested operation - either
+   discovery/execution - and returns back the results in batches to the runner.
+8. The test host signals an operation end to the runner which then notifies the
+   loggers and bails out.
+
+The protocol between the runner and the test host for discovery and execution is
+detailed below. The interaction between the runner, test host and data collector
+is detailed in a different document.
+
+#### Discovery:	
+
+![Discovery Protocol](Images/vstest.console-discovery.png)
+
+1. After launching the test host process as detailed above, the runner sends a
+   TestDiscovery.Initialize message with the full path to extension assemblies
+   as an `IEnumerable<string>`. The test host then uses this to load the
+   extensions before hand. This is an optional step and will not be sent if
+   there are no additional extensions but the default.
+2. The runner then sends a TestDiscovery.Start message with a
+   [DiscoveryPayload][] which contains the test containers and the session level
+   settings.
+3. The TestPlatform.Engine component in test host process invokes the loaded
+   adapters with these containers to discover tests.
+4. When the adapter finds a test it notifies the TestPlatform.Engine which
+   caches these test cases.
+5. When the maximum cache size is hit or on a cache timeout the engine passes on
+   a list of test cases in a `TestDiscovery.TestsFound` message as a
+   `List<TestCase>`
+6. The adapter can also notify the TestPlatform.Engine of any errors/warnings
+   during discovery via a message. This messages are then sent to the runner as
+   a TestSession.Message with a [TestMessagePayload][] This is an optional
+   message.
+7. On discovery completion the adapter notifies the TestPlatform.Engine which
+   then sends a TestDiscovery.Completed message to the runner with a
+   [DiscoveryCompletePayload][]
+8. On receiving a discovery complete from the test host the runner then ends the
+   communication with a TestSession.Terminate.
+9. On receiving a terminate message the test host process cleanly exits.
+	
+[DiscoveryPayload]: ./src/Microsoft.TestPlatform.ObjectModel/Client/DiscoveryCriteria.cs
+[TestMessagePayload]: ./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs
+[DiscoveryCompletePayload]: ./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs
+
+#### Execution:
+
+![Execution Protocol](Images/vstest.console-execution.png)
+
+1. After launching the test host process as detailed above the runner sends a
+   TestExecution.Initialize message with the full path to extension assemblies
+   as an `IEnumerable<string>`. The test host then uses this to load the
+   extensions needed for execution before hand. This is an optional step and
+   will not be sent if there are no additional extensions but the default.
+2. The runner then sends a TestExecution.StartWithSources message with a
+   [TestRunCriteriaWithSources][] which contains the test containers and the
+   session level settings.
+3. The TestPlatform.Engine component in test host process invokes the loaded
+   adapters with these containers to execute tests.
+4. The adapter notifies the TestPlatform.Engine of a test case start, test
+   result and a test case end. It maintains the test results received in a
+   cache.
+5. When the maximum cache size is hit or on a cache timeout the
+   TestPlatform.Engine passes on a list of test results in a
+   TestExecution.TestResults message as a [TestRunStatsPayload][]
+6. The adapter can also notify the TestPlatform.Engine of any errors/warnings
+   during execution via a message. This messages are then sent to the runner as
+   a TestSession.Message with a [TestMessagePayload][]. This is an optional
+   message.
+7. On execution completion the adapter notifies the engine which then sends a
+   TestExecution.Completed message to the runner with a [TestRunCompletePayload][].
+8. On receiving a execution complete from the test host the runner then ends the
+   communication with a TestSession.Terminate.
+9. On receiving a terminate message the test host process cleanly exits.
+
+[TestRunCriteriaWithSources]: ./src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithSources.cs
+[TestRunStatsPayload]: ./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs
+[TestMessagePayload]: ./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs
+[TestRunCompletePayload]: ./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs
+
+<!--The exact set of switches the vstest.console runner supports is listed here([Todo] add link here.))--> 
+
+#### Note:
+All IPC within the test platform is via sockets and json. 
diff --git a/docs/RFCs/0002-Test-Discovery-Protocol.md b/docs/RFCs/0002-Test-Discovery-Protocol.md
new file mode 100644
index 0000000000..f3a045af52
--- /dev/null
+++ b/docs/RFCs/0002-Test-Discovery-Protocol.md
@@ -0,0 +1,51 @@
+# 0002 Test Discovery Protocol
+
+## Summary
+This note details the protocol improvements in the new dotnet-test integration with IDE's. The focus will be more on the delta with the older protocol and the breaking changes.
+
+## Motivation
+These protocol changes provide the following improvements to dotnet-test:
+* Ability to accept multiple containers
+* Consistent experience with the capabilities that vstest.console provides - Rocksteady adapter and Logger extensibility.
+
+## Detailed Design
+
+### Terminology
+* **IDE adapter (existing dotnet-test)** : Component that listens to messages from dotnet-test and populates the IDE with tests discovered or test results. For VS IDE this is the projectK Adapter.
+* **TestRunner**: The test framework specific runner that discovers/executes tests in a container for that framework. This is dotnet-test-mstest / dotnet-test-xunit / dotnet-test-nunit.
+* **Dotnet-test/vstest.console(Runner)**: Orchestrator of discovery or execution operations with one or more test host processes which then communicates back to the adapter the test cases or test results received from the test host process. This component also hosts the logger functionality which logs the test results in a file or posts them to a server.
+* **Test host process**: The host process that loads the rocksteady engine which then calls into the Rocksteady adapters to discover/execute tests. This component communicates back to the client (dotnet-test or vstest.console.exe) with the set of tests discovered or test results.
+* **Rocksteady adapter**: The framework specific adapter that discovers or executes tests of that framework. These adapters are invoked in-proc by the rocksteady engine via the ITestDiscoverer and ITestExecutor interfaces.
+* **TPV2**: The new cross-plat test platform which encompasses the Runner, test host and the adapters. This is the framework that enables users to run tests.
+
+### Protocol
+This is the existing dotnet-test integration with IDEs:
+![dotnet-test v1 protocol](https://github.com/dotnet/cli/raw/rel/1.0.0/Documentation/images/DotnetTestDiscoverTests.png)
+
+Reference: https://github.com/dotnet/cli/blob/rel/1.0.0/Documentation/dotnet-test-protocol.md
+
+Here is what the changed wire protocol looks like after TPV2 integrates with dotnet-test:
+![dotnet-test v2 protocol](Images/dotnet-test-protocol-v2-discovery.png)
+
+### Breaking changes for Adapter(IDE)
+1. The object model used via the wire protocol will change from using [Microsoft.Extensions.Testing.Abstractions.Test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) to [Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase](./src/Microsoft.TestPlatform.ObjectModel/TestCase.cs). 
+2. The IDE adapter would now be sending the test Containers along with test platform settings to dotnet-test.
+3. The IDE adapter would now receive test cases in a batch as opposed to a single test case earlier to improve performance.
+4. The IDE adapter would now receive a [DiscoveryCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs) message with the TestDiscovery.Completed message. This would have the run stats and the last set of test cases found.
+
+### Breaking Changes for Frameworks
+1. TestRunner would cease to exist. Framework writers would have to port their Rocksteady adapters to Core CLR to support all .NET Core scenarios.
+
+### New Flow
+1. After the optional version check, the IDE adapter can choose to optionally send paths to extensions it wants to initialize the test platform with.
+2. It then sends a TestDiscovery.Start message with a [DiscoveryRequestPayload](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Payloads/DiscoveryRequestPayload.cs) which contains the sources and settings. Dotnet-test will start the test host process and pass on the containers and settings to it.
+3. The testhost then invokes the rocksteady adapter with the containers to discover tests. It uses the ITestDiscoverer.DiscoverTests as its entry point to the Rocksteady Adapter.
+4. The Rocksteady adapter then sends each test case discovered to the test host which caches this information.
+5. The test host passes on the cached test cases to dotnet-test in batches when a cache size is hit which then forwards it over to the IDE adapter.
+6. Optionally the IDE adapter may also receive a TestSession.Message with a [TestMessagePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs) notifying of any issues during discovery.
+7. After all tests are discovered, the test host sends a TestDiscovery.Completed message with a [DiscoveryCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs), which has the stats and the last set of test cases found, to dotnet-test. 
+8. dotnet-test then sends a TestDiscovery.Completed with the [DiscoveryCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs) to the IDE adapter.
+9. Once the IDE adapter is done, it sends dotnet-test a TestSession.Terminate which will cause dotnet test to shutdown.
+
+### Notes
+1. Since TPV2 supports discovery on multiple containers with a bunch of settings, the IDE adapter can now pass in the containers as a List<string> to dotnet-test. Dotnet-test would then orchestrate among (multiple) test host processes and update the Adapter with the tests found.
diff --git a/docs/RFCs/0003-Test-Execution-Protocol.md b/docs/RFCs/0003-Test-Execution-Protocol.md
new file mode 100644
index 0000000000..add7b7bcb9
--- /dev/null
+++ b/docs/RFCs/0003-Test-Execution-Protocol.md
@@ -0,0 +1,68 @@
+# 0003 Test Execution Protocol
+
+## Summary
+This note details the protocol improvements in the new dotnet-test integration with IDE's. The focus will be more on the delta with the older protocol and the breaking changes.
+
+## Motivation
+These protocol changes provides the following improvements to dotnet-test:
+* Ability to accept multiple containers
+* Container level parallelization
+* Consistent experience with the capabilities that vstest.console provides - Rocksteady adapter and Logger extensibility.
+
+## Detailed Design
+
+### Terminology
+* **IDE adapter (existing dotnet-test)** : Component that listens to messages from dotnet-test and populates the IDE with tests discovered or test results. For VS IDE this is the projectK Adapter.
+* **TestRunner**: The test framework specific runner that discovers/executes tests in a container for that framework. This is dotnet-test-mstest / dotnet-test-xunit / dotnet-test-nunit.
+* **Dotnet-test/vstest.console(Runner)**: Orchestrator of discovery or execution operations with one or more test host processes which then communicates back to the adapter the test cases or test results received from the test host process. This component also hosts the logger functionality which logs the test results in a file or posts them to a server.
+* **Test host process**: The host process that loads the rocksteady engine which then calls into the Rocksteady adapters to discover/execute tests. This component communicates back to the client (dotnet-test or vstest.console.exe) with the set of tests discovered or test results.
+* **Rocksteady adapter**: The framework specific adapter that discovers or executes tests of that framework. These adapters are invoked in-proc by the rocksteady engine via the ITestDiscoverer and ITestExecutor interfaces.
+* **TPV2**: The new cross-plat test platform which encompasses the Runner, test host and the adapters. This is the framework that enables users to run tests.
+
+### Protocol
+This is the existing dotnet-test integration with IDEs:
+![dotnet-test v1 protocol](https://github.com/dotnet/cli/raw/rel/1.0.0/Documentation/images/DotnetTestExecuteTests.png)
+
+Reference: https://github.com/dotnet/cli/blob/rel/1.0.0/Documentation/dotnet-test-protocol.md#test-execution
+
+Here is what the changed wire protocol looks like after TPV2 integrates with dotnet-test:
+![dotnet-test v2 protocol](Images/dotnet-test-protocol-v2-execution.png)
+
+And this protocol helps one launch a custom host or perform debugging:
+![dotnet-test v2 protocol for custom host](Images/dotnet-test-protocol-v2-execution-customhost.png)
+
+### Breaking changes for Adapter(IDE)
+1. The object model used via the wire protocol will change from using [Microsoft.Extensions.Testing.Abstractions.Test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) and [Microsoft.Extensions.Testing.Abstractions.TestResult](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/TestResult.cs) to [Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase](./src/Microsoft.TestPlatform.ObjectModel/TestCase.cs) and [Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult](./src/Microsoft.TestPlatform.ObjectModel/TestCase.cs) appropriately.
+2. The IDE adapter would now be sending the test Containers along with test platform settings to dotnet-test.
+3. The IDE adapter would now receive test results in a batch in the [TestRunStatsPayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs) as opposed to a test start, test result and a test end earlier. The TestRunStatsPayload will also have the statistics of passed/failed/skipped tests so far along with list of tests currently being run.
+4. The IDE Adapter would now receive a [TestRunCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs) with TestExecution.Completed which would have the run statistics along with the results for last set of tests run.
+
+### Breaking Changes for Frameworks
+1. TestRunner would cease to exist. Framework writers would have to port their Rocksteady adapters to Core CLR to support all .NET Core scenarios.
+
+### New Flow for Run Tests:
+1. After the optional version check,  the IDE adapter can choose to optionally send paths to extensions it wants to initialize the test platform with.
+2. The IDE adapter then sends either a TestExecution.RunTestsWithContainersOnDefaultHost (or) TestExecution.RunTestsWithTestsOnDefaultHost with a [TestRunRequestPayload](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Payloads/TestRunRequestPayload.cs) that contains containers (or) tests respectively.
+3. dotnet-test would then spawn an instance of the default test host process for the configuration specified. 
+4. dotnet-test then sends across the extensions if the IDE adapter has specified any, followed by the containers/test cases to run tests on. 
+5. The test host then invokes the Rocksteady adapter with the containers/tests to run via the ITestExeuctor.RunTests entry point. 
+6. The Rocksteady adapter runs each test and calls back to the test host when a test starts, when a test result is received and when a test ends.
+7. The test host process maintains a cache of the test results received above.
+8. When the cache size is met the test host process sends a TestExecution.TestResults with a [TestRunStatsPayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs), which contains the cached results in a batch, to dotnet-test which then forwards it to the IDE adapater.
+9. Optionally the IDE adapter may also receive a TestSession.Message with a [TestMessagePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs) notifying of any issues during execution.
+10. When execution is complete, the test host process sends a TestExecution.Completed message to dotnet-test with a [TestRunCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs) which contains the run statistics along with the results for the last set of tests run.
+11. dotnet-test then forwards this message to the IDE adapter.
+12. Once the IDE adapter is done, it sends dotnet-test a TestSession.Terminate which will cause dotnet-test to shutdown.
+
+### New Flow for Debug Tests/Custom test host process:
+This flow would have the same protocol to bootstrap the test platform which is essentially #1 in the default flow above. Here is the sequence of steps after the initialization phase:
+
+1. The IDE adapter sends a TestExecution.GetProcessStartInfo with a [TestRunRequestPayload](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Payloads/TestRunRequestPayload.cs) that contains the container/tests it wants to execute.
+2. dotnet-test then reverts back to the IDE adapter with a TestExecution.CustomTestHostLaunch with a [ProcessStartInfo](./src/Microsoft.TestPlatform.ObjectModel/TestProcessStartInfo.cs) payload which has the process start info of the default test host. As part of the arguments, we send a port that the test host should connect to communicate with dotnet-test.
+3. At this point, the adapter can launch the test host process (and attach to it for debugging if it chooses to).
+4. Once the test host starts, it sends dotnet-test a handshake TestHost.Connected message that indicates it is ready to receive commands.
+
+After these set of actions the protocol is the same as the default flow above, which is essentially from Step #4 above.
+	
+### Notes:
+1. Since TPV2 supports execution on multiple containers with a bunch of settings the Adapter can now pass in the containers as a List<string> to dotnet-test. Dotnet-test would then orchestrate among (multiple) test host processes and update the Adapter with the test results.
diff --git a/docs/RFCs/0004-Adapter-Extensibility.md b/docs/RFCs/0004-Adapter-Extensibility.md
new file mode 100644
index 0000000000..7ab9ef7c8c
--- /dev/null
+++ b/docs/RFCs/0004-Adapter-Extensibility.md
@@ -0,0 +1,306 @@
+# 0004 Adapter Extensibility
+
+## Summary
+Allow the test platform to discover/run tests based on a 3rd party test framework. This would be done via an adapter for the corresponding framework that understands how tests are defined in that framework and can run them providing back the test platform with results.
+
+## Motivation
+Users are free to write tests based on a test framework of their choice (be it xunit/nunit/mstest etc.). The test platform should be able to run any kind of tests, provided there is a corresponding adapter that understands the framework and can discover/run tests. This provides the users a choice of test framework in unison with the other features of the test platform - Logging, data collection etc.
+
+## Detailed Design
+
+This design will be detailed through the following sections:
+
+1. Specifying an adapter 
+2. Test Platform - Adapter interaction
+3. Writing an adapter
+4. Adapter specific settings
+
+### Specifying an Adapter
+Adapters can be provided to the test platform in one of the following ways:
+
+1. "/testadapterpath:<PathToTheAdapter>" This is a switch to vstest.console.exe that feeds in the location of the adapter to the test platform. The PathToAdapter is either the full path to the adapter directory or the relative path to the current directory. For instance:                 
+
+    ```
+    /testadapterpath:"C:\Adapters\"
+    ```
+
+    This picks up files which have ***.TestAdapter.dll**  in their name from C:\Adapters\ and loads them in as adapters to the test platform. This is done to optimize the number of assemblies the test platform considers as adapters.  
+
+    ```
+    C:\Projects\UnitTestProject\bin\debug> vstest.console.exe /testadapterpath:"Adapters"
+    ```
+
+    This picks up all files which have ***.TestAdapter.dll** in their name from C:\Projects\UnitTestProject\bin\debug\Adapters and loads them in as adapters to the test platform.
+
+2. Runsettings via "TestAdaptersPaths" node in the RunConfiguration section. Here is a sample on how this can be specified:
+
+    ```xml
+    <RunSettings>
+      <!-- Configurations that affect the Test Framework -->
+      <RunConfiguration>
+        <TestAdaptersPaths>C:\Adapters;Adapters;%temp%\Adapters</TestAdaptersPaths>
+      </RunConfiguration>
+    </RunSettings>
+    ```
+
+    One can provide multiple paths that are ';' separated. Paths can be absolute like "C:\Adapters" or relative to the current directory like "Adapters" or can use environment variables like "%temp%\Adapters". Similar to /testadapterpath only files with ***.TestAdapter.dll** in their name from the above locations are fed in as adapters to the test platform. This specification will also work in non-commandline scenarios like VS IDE which can also take in a runsettings.
+
+3. VSIX based adapters. Any vsix extension that has an Asset in the vsixmanifest file with type "UnitTestExtension" is a candidate adapter. This is picked up automatically as an adapter in VS IDE. In vstest.console.exe these adapters are picked up when the '/usevsixextensions' switch is provided like below:
+
+    ```
+    vstest.console.exe unittestproject.dll /usevsixextensions:true
+    ```
+
+4. Nuget based Adapters in VS IDE. For seamless integration with adapters shipping as nuget packages, in VS IDE we automatically pick up referenced nuget packages that have files which satisfy ***.TestAdapter.dll** in their name and provide these files as adapters to the test platform.
+
+5. Default Adapters in Extensions folder. All the default adapters required by the test platform are packaged along with it in a folder that always gets probed. This folder lies where vstest.console.exe lies and is called the "Extensions" folder. One can get to the location of vstest.console by putting in a "where vstest.console" in a developer command prompt for VS. Any assembly placed in this folder is a candidate adapter. This is however not always recommended since this is specific to a system and involves changing contents in a VS installation folder.
+
+### Test Platform - Adapter interaction
+After the adapters are provided to the test platform via one or more of the entry points above, it then loads these adapters in the host process that runs the tests and calls into the adapter via one of the entry points defined in the interfaces detailed in the following sections.
+
+#### Discovery
+
+```csharp
+Interface ITestDiscoverer
+{
+  /// <summary>
+  /// Discovers the tests available from the provided container.
+  /// </summary>
+  /// <param name="containers">Collection of test containers.</param>
+  /// <param name="discoveryContext">Context in which discovery is being performed.</param>
+  /// <param name="logger">Logger used to log messages.</param>
+  /// <param name="discoverySink">Used to send testcases and discovery related events back to Discoverer manager.</param>
+  DiscoverTests(IEnumerable<string> containers, IDiscoveryContext discoveryContext,
+    IMessageLogger logger, ITestCaseDiscoverySink discoverySink)}
+}
+```
+The test platform iterates through all the loaded adapters and probes each one with the set of containers to get all the test cases defined in them. To optimize this process each adapter can have:
+1. FileExtension attribute that informs the test platform what file extension types each adapter is interested in. The following section details this with an example.
+2. [Category attribute](0020-Improving-Logic-To-Pass-Sources-To-Adapters.md) that informs the test platform whether adapter supports native or managed assemblies (applicable only when adapters support assemblies i.e. .dll and .exe file extensions).
+
+For a single adapter the test platform calls ITestDiscoverer.DiscoverTests() during Discovery where the test platform provides the containers to discover tests from. The adapter uses the discoverySink instance to report back on test cases that it finds to the test platform. The adapter can also log any status/ warnings via the logger instance passed in and can use the discoveryContext to figure out the settings used for the current session. More on this follows in a later section.  If the adapter finds a test case it understands in a container, it creates a TestCase object and stamps an executor URI on the object. The URI notifies the test platform of the ITestExecutor that can run that test case. This avoids another probing operation during execution.
+
+#### Execution
+```csharp
+Interface ITestExecutor
+{
+  /// <summary>
+  /// Runs only the tests specified by parameter 'tests'. 
+  /// </summary>
+  /// <param name="tests">Tests to be run.</param>
+  /// <param name="runContext">Context to use when executing the tests.</param>
+  /// <param param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
+  void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle);
+ 
+  /// <summary>
+  /// Runs 'all' the tests present in the specified 'containers'. 
+  /// </summary>
+  /// <param name="containers">Path to test container files to look for tests in.</param>
+  /// <param name="runContext">Context to use when executing the tests.</param>
+  /// <param param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
+  void RunTests(IEnumerable<string> containers, IRunContext runContext, IFrameworkHandle frameworkHandle);
+ 
+  /// <summary>
+  /// Cancel the execution of the tests.
+  /// </summary>
+  void Cancel();
+}
+```
+The test platform can call into the adapters with a set of 
+
+1. Containers or 
+2. Test cases to execute tests. 
+
+ITestExecutor.RunTests with a set of test cases gets called in mostly VS IDE scenarios("Run Selected tests" scenarios) where a discovery operation has already been performed. This would already have the information as to what ITestExecutor can run the test case via a URI property. The platform would then just call into that specific executor to run the test cases.
+
+ITestExecutor.RunTests with a set of containers gets called when the platform does not already have a set of test cases to work with. This is the case for CLI scenarios like vstest.console.exe where the containers are just specified via an argument. This would also be the case for "Run All" scenarios from VS IDE. The adapter would then usually perform a discovery of all the test cases it understands in the container and run them reporting back the results of the run to the platform via the frameworkHandle instance. Unlike in the ITestExecutor.RunTests with a list of test cases, here the test platform is not aware of the exact executor that would run all the tests in the containers provided. So, it probes through all the adapters to run tests similar to the discovery phase.
+
+The adapter can use the following API's exposed via the IFrameworkHandle interface to report back the status of the test run to the test platform:
+```csharp
+/// <summary>
+/// Notify the platform about the test result.
+/// </summary>
+/// <param name="testResult">Test Result to be sent to the adapter.</param>
+void RecordResult(TestResult testResult);
+
+/// <summary>
+/// Notify the platform about starting of the test case. 
+/// The platform sends this event to data collectors enabled in the run. 
+/// If no data collector is enabled, then the event is ignored. 
+/// </summary>
+/// <param name="testCase">testcase which will be started.</param>
+void RecordStart(TestCase testCase);
+
+/// <summary>
+/// Notify the platform about completion of the test case. 
+/// The platform sends this event to data collectors enabled in the run. 
+/// If no data collector is enabled, then the event is ignored. 
+/// </summary>
+/// <param name="testCase">testcase which has completed.</param>
+/// <param name="outcome">outcome of the test case.</param>
+void RecordEnd(TestCase testCase, TestOutcome outcome);
+
+/// <summary>
+/// Notify the platform about run level attachments.
+/// </summary>
+/// <param name="attachmentSets">attachments produced in this run.</param>
+void RecordAttachments(IList<AttachmentSet> attachmentSets);
+```
+
+An attachment here, could be any file that the adapter generates during the run / a file that the test writer would want attached to a run. This is surfaced to VS IDE as part of the output for a test case. More details on this follows in the "Writing an Adapter" section below.
+
+#### Data Driven tests
+Data driven test cases can have multiple test results, one against each data value. In that case adapters would post a RecordStart, RecordEnd and RecordResult for each data value. If the TestResult objects posted for all the data values are associated with the same TestCase object, then the VS IDE client would create a single entry in the Test Explorer with the aggregated outcome along with a summary for each test case in a separate view. If the TestResult objects posted for all the data values are associated with their own TestCase objects with different ID's, then each test result would be different entries in the VS IDE Test Explorer.
+
+#### Filtering
+The user might optionally also pass in a test case filter to run a subset of tests. In such cases along with invoking the adapters with the container set, the test platform also provides a callback in the run context instance in the form of [GetTestCaseFilter](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs#L38) that enables adapters to filter a [TestCase](./src/Microsoft.TestPlatform.ObjectModel/TestCase.cs) object. The adapters can query this API with the set of properties it supports filtering on, along with a provider of TestProperty instances  for each property. From the filter expression returned by this API, the adapter would then just have to perform a [ITestCaseFilterExpression.MatchTestCase](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseFilterExpression.cs#L20) on each test case which returns false if the test case has been filtered out. Below is sample code that demonstrates filtering:
+
+```csharp
+static readonly TestProperty PriorityProperty = TestProperty.Register(
+  "CustomDiscoverer.Priority", "Priority", typeof(int), TestPropertyAttributes.Hidden, typeof(TestCase));
+
+// Test properties supported for filtering 
+Dictionary<string, TestProperty> supportedProperties =
+  new Dictionary<string, TestProperty>(StringComparer.OrdinalIgnoreCase);
+
+// In the Adapter initialization phase
+supportedProperties[PriorityProperty.Label] = PriorityProperty.
+
+// Inside the execute tests method.
+var filterExpression = runContext.GetTestCaseFilter(supportedProperties, (propertyName) =>
+{
+    TestProperty testProperty = null;
+    supportedProperties.TryGetValue(propertyName, out testProperty);
+    return testProperty;
+});
+
+// The adapter can then query if the test case has been filtered out using the following snippet.
+if (filterExpression != null &&
+    filterExpression.MatchTestCase(currentTest, (propertyName) =>
+    {
+        var testProperty = supportedProperties.TryGetValue(propertyName, out testProperty);
+        return currentTest.GetPropertyValue(testProperty);
+    }) == false)
+{
+    // ...
+}
+```
+
+#### TestCase Extensibility
+Adapters can choose to fill in custom data into the [TestCase](./src/Microsoft.TestPlatform.ObjectModel/TestCase.cs) object through its [Property](./src/Microsoft.TestPlatform.ObjectModel/TestObject.cs#L112) bag. This data can be:
+
+1. If the test case is adorned by a "Do Not Run"  attribute.
+2. If the test case is data driven, the values of the data to drive it with.
+
+and so on. During test execution the ITestExecutor can re-use this data to run the test. For instance, it may choose not to run the test in the first example above or feed in the stored data to data drive the test in the second example.
+
+#### Alternate Solutions
+
+1. Adapter extensibility can also be at a process level as opposed to using reflection to load the adapters. As long as the adapter understands the protocol with the client this could be a viable option. However there are two issues with this approach:
+    * The adapter would need to maintain multiple processes one for each architecture and framework.
+    * The test platform has other extensibility points in the host process that cannot be exposed if the adapter controls the host process unless each adapter initializes these extensions on its own.
+
+### Writing an Adapter
+
+If one needs to write a new adapter, it just needs to implement the two interfaces defined above along with a shipping mechanism so that it can be plugged into one of the entry points to the platform specified earlier. The adapter would have the following:
+
+```csharp
+[FileExtension(".xml")]
+[DefaultExecutorUri("executor://XmlTestExecutor")]
+class TestDiscoverer : ITestDiscoverer
+{
+    void DiscoverTests(IEnumerable<string> containers, IDiscoveryContext discoveryContext,
+      IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+    {
+        // Logic to get the tests from the containers passed in.
+
+        //Notify the test platform of the list of test cases found.
+        foreach (TestCase test in testsFound)
+        {
+            discoverySink.SendTestCase(test);
+        }
+    }
+}
+
+[ExtensionUri("executor://XmlTestExecutor")]
+class TestExecutor : ITestExecutor
+{
+    void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
+    {
+        // Logic to run xml based test cases and report back results.
+    }
+
+    void RunTests(IEnumerable<string> containers, IRunContext runContext, IFrameworkHandle frameworkHandle)
+    {
+        // Logic to discover and run xml based tests and report back results.
+    }
+
+    void Cancel()
+    {
+        // Logic to cancel the current test run.
+    }
+}
+```
+
+As detailed in the earlier section the TestDiscoverer.DiscoverTests gets called by the test platform during discovery which stamps an executor URI on each test case that it reports back, which in the above case is "executor://XmlTestExecutor". The test discoverer can also inform the engine what file types it is interested in via the FileExtension attribute. The platform would then call into the adapter only if the container's extension type falls in the list of supported extension types advertised by the adapter. In the above case the TestDiscoverer only gets called if the container is an xml file. This ensures that the right discoverer is picked up quickly. If a discoverer does not have a FileExtension attribute then it gets probed by the platform for all file extension types.
+
+The TestExecutor above is adorned by a ExtensionUri attribute which advertises the executor URI of this executor. The test platform uses this information to allocate test cases discovered and stamped by a URI in the discovery phase above  to the right executor. Execution, being a long running operation can be cancelled by the test platform via ITestExecutor.Cancel(). The adapter is then expected to stop execution and clean up resources. Any test result that the adapter tries to send back to the test platform after a cancel has been notified would result in a TestCanceledException.
+
+The adapters are also provided with the runsettings xml used for the run via the IDiscoveryContext.RunSettings for discovery and IRunContext.RunSettings for execution. 
+
+### Adapter Specific Settings
+The adapters can also incorporate user provided settings via the runsettings XML by adding what is called as a Settings Provider. A settings provider would implement an ISettingsProvider interface and would be called before a discovery/ execution operation with the settings defined for that adapter in the runsettings XML(if any). 
+
+```csharp
+interface ISettingsProvider
+{
+  /// <summary>
+  /// Load the settings from the reader.
+  /// </summary>
+  /// <param name="reader">Reader to load the settings from.</param>
+  void Load(XmlReader reader);
+}
+```
+A sample settings provider would look like below:
+
+```csharp
+[SettingsName("XmlAdapter")
+public class XmlAdapterSettingsProvider : ISettingsProvider
+{
+  public void Load(XmlReader reader)
+  {
+    // Read the setting nodes from the XmlReader and save it for a succeeding discovery/execution operation.
+  }
+}
+```
+
+The settings provider will first need to advertise to the test platform that it is interested in only "XmlAdapter" specific settings. It does that via the SettingsName attribute. So whenever the test platform finds a node labelled "XmlAdapter" in the runsettings it first finds a provider that understands that setting and calls into the `Load()` with that xml sub-section.  So if the runsettings is of the following format:
+
+```xml
+<RunSettings>
+  <RunConfiguration>
+    <TargetPlatform>x86</TargetPlatform>
+  </RunConfiguration>
+  <XmlAdapter>
+    <TraceLevel>4</TraceLevel>
+    <ShouldPublishDataToFile>true</ShouldPublishDataToFile>
+  </XmlAdapter>
+</RunSettings>
+```
+
+the Load function would be called with the following sub-tree which only contains the settings for XmlAdapter
+
+```xml
+<XmlAdapter>
+  <TraceLevel>4</TraceLevel>
+  <ShouldPublishDataToFile>true</ShouldPublishDataToFile>
+</XmlAdapter>
+```
+
+## Open questions
+
+1. Should the user need to specify a test adapter path for an adapter to be picked up. Can we automatically figure out adapters that are dropped along with the test assembly? 
+
+2. Currently there is no way to specify to the test platform that it should pick only one specific adapter and ignore the rest. This would save the time taken to probe each adapter to figure out if it can run the tests and make this purely a user driven scenario. Do we want to have this ability?
+
+3. Currently there is a different host process that gets launched for discovery and execution. This does not allow adapters to easily re-use data created/read during discovery in the Run tests phase. The host process cannot be kept alive currently because Core Fx does not have a concept of app domains to load the test dll's in and unload them so that they are not locked. The only way adapters can re-use data across discovery and execution currently is by adding it in a property bag that the TestCase object exposes. Should this be the only way? Can we do something different here?
diff --git a/docs/RFCs/0005-Test-Platform-SDK.md b/docs/RFCs/0005-Test-Platform-SDK.md
new file mode 100644
index 0000000000..d947ecaf15
--- /dev/null
+++ b/docs/RFCs/0005-Test-Platform-SDK.md
@@ -0,0 +1,76 @@
+# 0005 Test Platform SDK
+## Summary
+This document outlines various components of test platform sdk and the usage scenarios for each of them. It will also cover versioning and compatibility.
+
+## Motivation
+Test platform exposes various extensibility points in the architecture. These allow a developer to customize the test framework, test host, logger and so on. In addition, an editor can use test platform to list and execute test runs.
+
+It is necessary to establish clear contract in several aspects:
+* Packages: which package a developer can use for each scenario.
+* Versioning: how are the packages versioned?
+* Compatibility: what is the compatibility provided by packages (in terms of previous versions of test platform)?
+
+The contract (in case of extensions), and protocol (in case of editors) are outlined in previous specification documents. This document will pivot around scenarios and will cover above aspects for each.
+
+## Scenarios
+### Authoring an extension
+Test platform allows a developer to author an extension to customize the behavior of test platform. At the time of writing, following extensibility points are available:
+
+| Extension type    | Purpose                                  |
+|-------------------|------------------------------------------|
+| Adapter           | Customize test framework                 |
+| Data collector    | Monitor and collect data during test run |
+| Logger            | Customize test execution logging         |
+| Test host         | Control process/runtime for a test run   |
+
+#### SDK requirements
+Extensions are `.NET` assemblies. They require to implement a set of APIs provided in the [Microsoft.TestPlatform.ObjectModel][ObjectModelNuget] package.
+
+Following is the `.NET` libraries supported by the ObjectModel package:
+
+| Version   | .NET runtime                      |
+|-----------|-----------------------------------|
+| 11.0.0    | net35, netstandard1.0             |
+| 15.0.0    | netstandard1.5                    |
+
+[ObjectModelNuget]: http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/
+
+#### Compatibility
+
+| Version   | Compatibility                      |
+|-----------|------------------------------------|
+| 11.0.0    | Supports VS 2012 - present         |
+| 15.0.0    | Supports VS 2017 - present         |
+
+The `15.0.0` version of `Microsoft.TestPlatform.ObjectModel` introduces several additional capabilities:
+* In process data collection
+* Test host extensibility
+* Better serialization (to support JSON wire protocol)
+
+Newer versions of test platform will be able to load extensions authored with `11.0.0` version of ObjectModel. However to use newer functionality, extension authors may consider providing multiple versions of the extension targeting VS 2015 or older and the newer VS respectively.
+
+### Editor integration
+Test platform allows integration with an editor using a JSON wire protocol. The editor can launch the test platform to list, execute tests and report statistics for a run.
+
+#### SDK requirements
+There is no strict requirement for a authoring an editor integration in a particular language since the communication can be driven with JSON over the wire. At the moment, a `.NET` implementation is available. It is used by Visual Studio to drive test execution from the Test Explorer.
+
+Developers can use `Microsoft.TestPlatform.TranslationLayer` nuget package. It is a *redistributable* package. It is available from vstest myget feed: [https://dotnet.myget.org/F/vstest/api/v3/index.json](https://dotnet.myget.org/F/vstest/api/v3/index.json). Sample application is [here](https://github.com/Microsoft/vstest/tree/main/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest)
+
+| Version   | .NET runtime                      |
+|-----------|-----------------------------------|
+| 15.0.0    | netstandard1.5                    |
+
+Protocol specification is available [here](0007-Editors-API-Specification.md).
+
+> Both the protocol and the sdk are under active development. Your feedback is most welcome. Please create an issue on the vstest repository.
+
+#### Compatibility
+Editor integration is available from Test Platform `15.0.0` onwards.
+
+| Version   | Compatibility                           |
+|-----------|-----------------------------------------|
+| 15.0.0    | Supports Test Platform 15.0.0 - present |
+
+## Open questions
+None.
diff --git a/docs/RFCs/0006-DataCollection-Protocol.md b/docs/RFCs/0006-DataCollection-Protocol.md
new file mode 100644
index 0000000000..b9421d0b6c
--- /dev/null
+++ b/docs/RFCs/0006-DataCollection-Protocol.md
@@ -0,0 +1,51 @@
+# 006 DataCollection Protocol
+
+## Summary
+This note details the protocol for out of process data collection. 
+
+## Motivation
+This note provides the following : 
+* Protocol details for interaction between data collector host process and test execution host process.
+* Data collection extensibility.
+
+## Detailed Design
+
+### Terminology
+* **IDE adapter**: Component that listens to messages from dotnet-test and populates the IDE with tests discovered or test results.
+* **Dotnet-test/vstest.console(Runner)**: Orchestrator of discovery or execution operations with one or more test host processes which then communicates back to the adapter the test cases or test results received from the test host process. This component also hosts the logger functionality which logs the test results in a file or posts them to a server.
+* **Test host process**: The host process that loads the rocksteady engine which then calls into the Rocksteady adapters to discover/execute tests. This component communicates back to the client (dotnet-test or vstest.console.exe) with set of tests discovered or test results.
+* **Rocksteady adapter**: The framework specific adapter that discovers or executes tests of that framework. These adapters are invoked in-proc by the rocksteady engine via the ITestDiscoverer and ITestExecutor interfaces.
+* **TP V2**: The new cross-plat test platform which encompasses the Runner, test host and the adapters. This is the framework that enables users to run tests.
+* **DataCollector host proces**: The host process that loads the data collector(s), when specified in test run settings, coordinates with test execution host process to get the test execution events, sends the events to loaded data collectors and finally, send the results to dotnet-test after test execution is completed.
+
+### Protocol
+Here is how the wire protocol for TP v2 looks like :
+![dotnet-test data collector protocol](Images/datacollection.png)
+
+And this is how the wire protocol looks like with custom host:
+![dotnet-test data collector protocol with custom host](Images/datacollection-custom.png)
+
+## Flow for datacollection for Run Tests:
+1. After the Adapter initiates test execution, dotnet-test checks whether data collectors are configured in test run settings. If yes, it spawns of datacollector host process.
+2. Datacollector host process then loads and initializes all the data collectors.
+3. Datacollector host process also opens another port B to be used for communicating with test execution host process.
+4. Datacollector host process then returns environment variables, if any, as specified by datacollectors and port B back to dotnet-test process.
+5. dotnet-test spawns of test execution host process with environment variables and passes port B.
+6. Test execution host process then connects to port B.
+7. Test execution host process send events : TestCaseStart and TestCaseEnd, on receiving them from Rocksteady adapter for every testcase.
+8. On receiving TestCaseStart, datacollector host process responds by sending acknowledgement for TestCaseStart event.
+8. On receiving TestCaseEnd, datacollector host process responds by sending attachments, if any, as generated by datacollectors.
+9. On completion of test execution, test-host sends DataCollection.AfterTestRunEnd.
+10. Datacollector host process returns the attachments, if any, as generated by datacollectors. 
+11. dotnet-test sends DataCollection.Terminate message to datacollector host process.
+12. Attachments returned by data collector host process is shared by loggers.
+
+## Flow for datacollection for Debug Tests/Custom test host process:
+1. After the Adapter initiates TestExecution.GetProcessStartInfo, dotnet-test checks whether datacollectors are configured in test run settings. If yes, it spawns of datacollector host process.
+2. Datacollector host process then loads and initializes all the data collectors.
+3. Datacollector host process also opens another port B for communicating with test execution host process.
+4. Datacolector host process then returns environment variables (if any, as requested by datacollectors) and port B (if testcase events are subscribed) back to dotnet-test process.
+5. Envionment variables and port B info is passed back to Adapter along with ProcessStartInfo of custom test host process.
+6. At this point, the adapter can launch the test host process (and attach to it for debugging if it chooses to).
+
+After the test host process is spawned, the protocol is the same as the default flow above, which is essentially from Step #6 above.
diff --git a/docs/RFCs/0007-Editors-API-Specification.md b/docs/RFCs/0007-Editors-API-Specification.md
new file mode 100644
index 0000000000..bdf5adf27d
--- /dev/null
+++ b/docs/RFCs/0007-Editors-API-Specification.md
@@ -0,0 +1,1590 @@
+# 0007 Editors API Specification
+
+## Summary
+This note outlines the JSON protcol between an Editor/IDE and the test platform.
+It is an addendum to [Discovery Protocol][discovery] and [Execution
+Protocol][execution] documents.
+
+## Terminology
+* **Editor** is an application which wants to discover, run tests from a test
+  assembly. It has intimate knowledge of the test project.
+* **Test Platform** is the runner and engine which knows how to discover/run
+  tests.
+* **Request** is a message from the Editor to Test Platform.
+* **Response** is a message from the Test Platform to Editor.
+
+## SDK Implementations
+`Microsoft.TestPlatform.TranslationLayer` provides a .net implementation of this
+API. TODO: Link to sdk doc.
+
+## Overview
+### Bootstrap
+Editor should launch the test platform with its process id and a port that test
+platform can connect to. It will start console runner as follows:
+
+```
+> dotnet vstest --ParentProcessId <pid> --Port <port>
+```
+
+The windows only console runner `vstest.console.exe` also supports the same
+parameters. The test platform tries to connect to `<port>` and sends a
+`connection` message.
+
+### Message
+All the communication messages between an Editor and Test Platform have
+following structure:
+
+#### API Payload
+| Key         | Type   | Description                                            |
+|-------------|--------|--------------------------------------------------------|
+| MessageType | string | Type of message                                        |
+| Payload     | object | Payload for an operation input or output. Can be null. |
+
+#### Example
+```json
+{
+    "MessageType": "TestSession.Connected",
+    "Payload": null
+}
+```
+
+The `Payload` provides data specific to an request or response. It may be null
+for `connection` and `version` messsages.
+
+### Connection (Response)
+The test platform sends a connection message after launch.
+
+#### API Payload
+| Key         | Type   | Description           |
+|-------------|--------|-----------------------|
+| MessageType | string | TestSession.Connected |
+| Payload     | object | null                  |
+
+#### Example
+```json
+{
+    "MessageType": "TestSession.Connected",
+    "Payload": null
+}
+```
+
+### Version Operation
+An Editor can use the version operation to check the protocol version supported
+by the available test platform. It may modify the protocol for further
+communication if needed.
+
+#### Version (Request)
+A version request from Editor to Test Platform has following structure.
+
+##### API Payload
+| Key         | Type   | Description     |
+|-------------|--------|-----------------|
+| MessageType | string | ProtocolVersion |
+| Payload     | object | null            |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolVersion",
+    "Payload": null
+}
+```
+
+#### Version (Response)
+A version response from Test Platform has following structure.
+
+##### API Payload
+| Key         | Type   | Description     |
+|-------------|--------|-----------------|
+| MessageType | string | ProtocolVersion |
+| Payload     | object | 1               |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolVersion",
+    "Payload": null
+}
+```
+
+At this point the initial handshake between Editor and Test Platform is
+complete. Above operation is required only once per launch of test platform.
+Subsequent discovery, execution operation don't require an initialization.
+
+### Initialize Extensions (Request)
+This request ensures that all the extensions that are required for discovery or execution
+get loaded before the actual operation request.
+While running test targeting .net4x framework, this is required for initializing the test adapters.
+
+#### API Payload
+| Key         | Type   | Description                 |
+|-------------|--------|-----------------------------|
+| MessageType | string | Extensions.Initialize       |
+| Payload     | array  | List of paths of extensions |
+
+#### Example
+```json
+{
+  "MessageType": "Extensions.Initialize",
+  "Payload": [
+    "E:\\UnitTest1\\UnitTest1\\bin\\Debug\\net452\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll"
+  ]
+}
+```
+
+## Discover Tests
+A discovery operation requests the test platform to load the test container, use
+the appropriate test adapter and list all tests available within the container.
+
+Various `Message` types supported during discovery operation are:
+* TestDiscovery.Start
+* TestDiscovery.TestFound
+* TestDiscovery.Completed
+
+### Start Discovery (Request)
+An Editor triggers the discovery operation with a `TestDiscovery.Start` message.
+
+#### API Payload
+| Key         | Type   | Description         |
+|-------------|--------|---------------------|
+| MessageType | string | TestDiscovery.Start |
+| Payload     | object | See below           |
+
+##### Message Payload
+| Key         | Type   | Description                    |
+|-------------|--------|--------------------------------|
+| Sources     | array  | Array of test container paths. |
+| RunSettings | string | Run settings xml               |
+
+#### Example
+```json
+{
+  "MessageType": "TestDiscovery.Start",
+  "Payload": {
+    "Sources": [
+      ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "RunSettings": null
+  }
+}
+```
+
+Refer [msdn](https://msdn.microsoft.com/en-us/library/jj635153.aspx#Anchor_1) for run settings sample.
+
+### Tests Found (Response)
+The test platform sends tests found messages for the tests discovered. There can
+be one or many such messages. Editor is expected to listen to such messages
+until a `TestDiscovery.Completed` message is received.
+
+#### API Payload
+| Key         | Type   | Description                       |
+|-------------|--------|-----------------------------------|
+| MessageType | string | TestDiscovery.TestFound           |
+| Payload     | array  | See below for details of Property |
+
+For `TestDiscovery.TestFound` message, the Payload is an array of `TestCase`
+objects. See [appendix](#DataStructure.TestCase) for details.
+
+#### Example
+```json
+{
+  "MessageType": "TestDiscovery.TestFound",
+  "Payload": [
+    {
+      "Properties": [
+        {
+          "Key": {
+            "Id": "TestCase.FullyQualifiedName",
+            "Label": "FullyQualifiedName",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.String"
+          },
+          "Value": "UnitTestProject.UnitTest.PassingTest"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.ExecutorUri",
+            "Label": "Executor Uri",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Uri"
+          },
+          "Value": "executor://MSTestAdapter/v2"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.Source",
+            "Label": "Source",
+            "Category": "",
+            "Description": "",
+            "Attributes": 0,
+            "ValueType": "System.String"
+          },
+          "Value": ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.DisplayName",
+            "Label": "Name",
+            "Category": "",
+            "Description": "",
+            "Attributes": 0,
+            "ValueType": "System.String"
+          },
+          "Value": "PassingTest"
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.IsEnabled",
+            "Label": "IsEnabled",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Boolean"
+          },
+          "Value": true
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.TestClassName",
+            "Label": "ClassName",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.String"
+          },
+          "Value": "UnitTestProject.UnitTest"
+        },
+        {
+          "Key": {
+            "Id": "TestObject.Traits",
+            "Label": "Traits",
+            "Category": "",
+            "Description": "",
+            "Attributes": 5,
+            "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+          },
+          "Value": []
+        }
+      ]
+    },
+    {
+      "Properties": [
+        {
+          "Key": {
+            "Id": "TestCase.FullyQualifiedName",
+            "Label": "FullyQualifiedName",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.String"
+          },
+          "Value": "UnitTestProject.UnitTest.TestWithPriority"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.ExecutorUri",
+            "Label": "Executor Uri",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Uri"
+          },
+          "Value": "executor://MSTestAdapter/v2"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.Source",
+            "Label": "Source",
+            "Category": "",
+            "Description": "",
+            "Attributes": 0,
+            "ValueType": "System.String"
+          },
+          "Value": ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+        },
+        {
+          "Key": {
+            "Id": "TestCase.DisplayName",
+            "Label": "Name",
+            "Category": "",
+            "Description": "",
+            "Attributes": 0,
+            "ValueType": "System.String"
+          },
+          "Value": "TestWithPriority"
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.IsEnabled",
+            "Label": "IsEnabled",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Boolean"
+          },
+          "Value": true
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.TestClassName",
+            "Label": "ClassName",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.String"
+          },
+          "Value": "UnitTestProject.UnitTest"
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.Priority",
+            "Label": "Priority",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Int32"
+          },
+          "Value": 0
+        },
+        {
+          "Key": {
+            "Id": "TestObject.Traits",
+            "Label": "Traits",
+            "Category": "",
+            "Description": "",
+            "Attributes": 5,
+            "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+          },
+          "Value": [
+            {
+              "Key": "Priority",
+              "Value": "0"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+```
+
+### Discovery Complete (Response)
+A discovery complete message from Test Platform marks the end of discovery process.
+
+#### API Payload
+| Key         | Type   | Description             |
+|-------------|--------|-------------------------|
+| MessageType | string | TestDiscovery.Completed |
+| Payload     | object | See below for details   |
+
+**Payload** for `TestDiscovery.Completed` has following structure.
+
+| Key                 | Type    | Description                                     |
+|---------------------|---------|-------------------------------------------------|
+| TotalTests          | number  | Number of tests discovered                      |
+| LastDiscoveredTests | array   | Set of `TestCase` objects in the final chunk    |
+| IsAborted           | boolean | `true` indicates an aborted discovery operation |
+
+#### Example
+```json
+{
+  "MessageType": "TestDiscovery.Completed",
+  "Payload": {
+    "TotalTests": 7,
+    "LastDiscoveredTests": null,
+    "IsAborted": false
+  }
+}
+```
+
+## Run Tests
+### Run Tests (Request)
+A run tests request will trigger test execution for a given test container.
+
+#### API Payload
+| Key         | Type   | Description                         |
+|-------------|--------|-------------------------------------|
+| MessageType | string | TestExecution.RunAllWithDefaultHost |
+| Payload     | object | See below for details               |
+
+**Payload** for `TestExecution.RunAllWithDefaultHost` has following structure.
+
+| Key              | Type    | Description                                |
+|------------------|---------|--------------------------------------------|
+| Sources          | array   | Set of test containers                     |
+| TestCases        | array   | Set of `TestCase` objects                  |
+| RunSettings      | string  | Run settings for the test run              |
+| KeepAlive        | boolean | Reserved for future                        |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.RunAllWithDefaultHost",
+  "Payload": {
+    "Sources": [
+      ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": false
+  }
+}
+```
+
+TargetFramework for the tests can be set using the runsettings.
+See [appendix](#RunSettings.TargetFramework) for details.
+
+### Test Run Statistics (Response)
+Test results are provided by test platform in batches. An editor should continue
+to listen to `TestExecution.StatsChange` messages until a
+`TestExecution.Completed` message is received.
+
+#### API Payload
+| Key         | Type   | Description               |
+|-------------|--------|---------------------------|
+| MessageType | string | TestExecution.StatsChange |
+| Payload     | object | See details below         |
+
+**Payload** object has following structure.
+
+| Key               | Type   | Description                                      |
+|-------------------|--------|--------------------------------------------------|
+| NewTestResults    | array  | Set of `TestResult` objects                      |
+| TestRunStatistics | object | See details below                                |
+| ActiveTests       | array  | Set of active or inprogress `TestCase` objects   |
+
+**TestRunStatistics** object has following structure
+
+| Key             | Type   | Description                             |
+|-----------------|--------|-----------------------------------------|
+| ExecutedTests   | number | Total number test executed              |
+| Stats           | object | Map for count of tests for each outcome |
+
+Details of a `TestResult` object is available in
+[appendix](#4-testresult).
+
+Details of a `TestCase` object is available in
+[appendix](#3-testcase).
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.StatsChange",
+  "Payload": {
+    "NewTestResults": [
+      {
+        "TestCase": {
+          "Properties": [
+            {
+              "Key": {
+                "Id": "TestCase.FullyQualifiedName",
+                "Label": "FullyQualifiedName",
+                "Category": "",
+                "Description": "",
+                "Attributes": 1,
+                "ValueType": "System.String"
+              },
+              "Value": "UnitTestProject.UnitTest.FailingTest"
+            },
+            {
+              "Key": {
+                "Id": "TestCase.ExecutorUri",
+                "Label": "Executor Uri",
+                "Category": "",
+                "Description": "",
+                "Attributes": 1,
+                "ValueType": "System.Uri"
+              },
+              "Value": "executor://MSTestAdapter/v2"
+            },
+            {
+              "Key": {
+                "Id": "TestCase.Source",
+                "Label": "Source",
+                "Category": "",
+                "Description": "",
+                "Attributes": 0,
+                "ValueType": "System.String"
+              },
+              "Value": "UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+            },
+            {
+              "Key": {
+                "Id": "TestCase.DisplayName",
+                "Label": "Name",
+                "Category": "",
+                "Description": "",
+                "Attributes": 0,
+                "ValueType": "System.String"
+              },
+              "Value": "FailingTest"
+            },
+            {
+              "Key": {
+                "Id": "MSTestDiscovererv2.IsEnabled",
+                "Label": "IsEnabled",
+                "Category": "",
+                "Description": "",
+                "Attributes": 1,
+                "ValueType": "System.Boolean"
+              },
+              "Value": true
+            },
+            {
+              "Key": {
+                "Id": "MSTestDiscovererv2.TestClassName",
+                "Label": "ClassName",
+                "Category": "",
+                "Description": "",
+                "Attributes": 1,
+                "ValueType": "System.String"
+              },
+              "Value": "UnitTestProject.UnitTest"
+            },
+            {
+              "Key": {
+                "Id": "TestObject.Traits",
+                "Label": "Traits",
+                "Category": "",
+                "Description": "",
+                "Attributes": 5,
+                "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+              },
+              "Value": []
+            },
+            {
+              "Key": {
+                "Id": "TestCase.LineNumber",
+                "Label": "Line Number",
+                "Category": "",
+                "Description": "",
+                "Attributes": 1,
+                "ValueType": "System.Int32"
+              },
+              "Value": 25
+            },
+            {
+              "Key": {
+                "Id": "TestCase.CodeFilePath",
+                "Label": "File Path",
+                "Category": "",
+                "Description": "",
+                "Attributes": 0,
+                "ValueType": "System.String"
+              },
+              "Value": "UnitTestProject\\UnitTest.cs"
+            }
+          ]
+        },
+        "Attachments": [],
+        "Messages": [],
+        "Properties": [
+          {
+            "Key": {
+              "Id": "TestResult.DisplayName",
+              "Label": "TestResult Display Name",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": null
+          },
+          {
+            "Key": {
+              "Id": "TestResult.Duration",
+              "Label": "Duration",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.TimeSpan"
+            },
+            "Value": "00:00:10.0941957"
+          },
+          {
+            "Key": {
+              "Id": "TestResult.ErrorMessage",
+              "Label": "Error Message",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "Assert.AreEqual failed. Expected:<2>. Actual:<3>. "
+          },
+          {
+            "Key": {
+              "Id": "TestResult.ErrorStackTrace",
+              "Label": "Error Stack Trace",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "   at UnitTestProject.UnitTest.FailingTest() in UnitTestProject\\UnitTest.cs:line 27\r\n"
+          },
+          {
+            "Key": {
+              "Id": "TestResult.Outcome",
+              "Label": "Outcome",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            },
+            "Value": 2
+          },
+          {
+            "Key": {
+              "Id": "TestResult.StartTime",
+              "Label": "Start Time",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.DateTimeOffset"
+            },
+            "Value": "2017-01-25T16:22:42.0912112+05:30"
+          },
+          {
+            "Key": {
+              "Id": "TestResult.EndTime",
+              "Label": "End Time",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.DateTimeOffset"
+            },
+            "Value": "2017-01-25T16:22:52.1862902+05:30"
+          }
+        ]
+      }
+    ],
+    "TestRunStatistics": {
+      "ExecutedTests": 2,
+      "Stats": {
+        "Passed": 1,
+        "Failed": 1
+      }
+    },
+    "ActiveTests": [
+      {
+        "Properties": [
+          {
+            "Key": {
+              "Id": "TestCase.FullyQualifiedName",
+              "Label": "FullyQualifiedName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest.SkippingTest"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.ExecutorUri",
+              "Label": "Executor Uri",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Uri"
+            },
+            "Value": "executor://MSTestAdapter/v2"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.Source",
+              "Label": "Source",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.DisplayName",
+              "Label": "Name",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "SkippingTest"
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.IsEnabled",
+              "Label": "IsEnabled",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Boolean"
+            },
+            "Value": false
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.TestClassName",
+              "Label": "ClassName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest"
+          },
+          {
+            "Key": {
+              "Id": "TestObject.Traits",
+              "Label": "Traits",
+              "Category": "",
+              "Description": "",
+              "Attributes": 5,
+              "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+            },
+            "Value": []
+          },
+          {
+            "Key": {
+              "Id": "TestCase.LineNumber",
+              "Label": "Line Number",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Int32"
+            },
+            "Value": 36
+          },
+          {
+            "Key": {
+              "Id": "TestCase.CodeFilePath",
+              "Label": "File Path",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject\\UnitTest.cs"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+### Test Run Complete (Response)
+A `TestExecution.Completed` message indicates completion of a test run.
+
+#### API Payload
+| Key         | Type   | Description             |
+|-------------|--------|-------------------------|
+| MessageType | string | TestExecution.Completed |
+| Payload     | object | See details below       |
+
+**Payload** object has following structure.
+
+| Key                 | Type   | Description                                                   |
+|---------------------|--------|---------------------------------------------------------------|
+| TestRunCompleteArgs | object | Summary of test run. See below                                |
+| LastRunTests        | array  | Set of `TestResult` for the last results batch                |
+| RunAttachments      | array  | Test attachments for the run                                  |
+| ExecutorUris        | array  | Set of executor uri for adapters that participated in the run |
+
+**TestRunCompleteArgs** object has following structure.
+
+| Key                                   | Type    | Description                     |
+|---------------------------------------|---------|---------------------------------|
+| TestRunStatistics["ExecutedTests"]    | number  | Total tests executed            |
+| TestRunStatistics["Stats"]["Passed"]  | number  | Passed tests count              |
+| TestRunStatistics["Stats"]["Failed"]  | number  | Failed tests count              |
+| TestRunStatistics["Stats"]["Skipped"] | number  | Skipped tests count             |
+| IsCanceled                            | boolean | `true` indicates a canceled run |
+| IsAborted                             | boolean | `true` indicates aborted run    |
+| Error                                 | string  | Error during the run            |
+| AttachmentSets                        | array   | Array of run attachments        |
+| ElapsedTimeInRunningTests             | string  | Duration for test run           |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.Completed",
+  "Payload": {
+    "TestRunCompleteArgs": {
+      "TestRunStatistics": {
+        "ExecutedTests": 7,
+        "Stats": {
+          "Passed": 4,
+          "Failed": 2,
+          "Skipped": 1
+        }
+      },
+      "IsCanceled": false,
+      "IsAborted": false,
+      "Error": null,
+      "AttachmentSets": [],
+      "ElapsedTimeInRunningTests": "00:00:00.1820000"
+    },
+    "LastRunTests": null,
+    "RunAttachments": [],
+    "ExecutorUris": [
+      "executor://mstestadapter/v2"
+    ]
+  }
+}
+```
+
+## Run Selected Tests
+Run selected tests operation differs from Run All tests in the request. The
+responses from test platform are same as above.
+
+### Test Run With Filter (Request)
+#### API Payload
+
+| Key         | Type   | Description                         |
+|-------------|--------|-------------------------------------|
+| MessageType | string | TestExecution.RunSelectedWithDefaultHost |
+| Payload     | object | See below for details               |
+
+**Payload** for `TestExecution.RunSelectedWithDefaultHost` has following structure.
+
+| Key              | Type    | Description                                |
+|------------------|---------|--------------------------------------------|
+| Sources          | array   | Set of test containers. Null in this case  |
+| TestCases        | array   | Set of `TestCase` objects. *Required*.     |
+| RunSettings      | string  | Run settings for the test run              |
+| KeepAlive        | boolean | Reserved for future                        |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger |
+
+Note that **TestCases** must be a valid set of `TestCase` objects, these should
+represent user's test selection.
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.RunAllWithDefaultHost",
+  "Payload": {
+    "Sources": null,
+    "TestCases": [
+      {
+        "Properties": [
+          {
+            "Key": {
+              "Id": "TestCase.FullyQualifiedName",
+              "Label": "FullyQualifiedName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest.PassingTest"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.ExecutorUri",
+              "Label": "Executor Uri",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Uri"
+            },
+            "Value": "executor://MSTestAdapter/v2"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.Source",
+              "Label": "Source",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.DisplayName",
+              "Label": "Name",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "PassingTest"
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.IsEnabled",
+              "Label": "IsEnabled",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Boolean"
+            },
+            "Value": true
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.TestClassName",
+              "Label": "ClassName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest"
+          },
+          {
+            "Key": {
+              "Id": "TestObject.Traits",
+              "Label": "Traits",
+              "Category": "",
+              "Description": "",
+              "Attributes": 5,
+              "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+            },
+            "Value": []
+          }
+        ]
+      }
+    ],
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": false
+  }
+}
+```
+### Cancel Test Run (Request)
+This request will cancel the current test run request.
+
+#### API Payload
+| Key         | Type   | Description           |
+|-------------|--------|-----------------------|
+| MessageType | string | TestExecution.Cancel  |
+| Payload     | object | null                  |
+
+#### Example
+```json
+{
+    "MessageType": "TestExecution.Cancel",
+    "Payload": null
+}
+```
+
+### Abort Test Run (Request)
+This request will abort the current test run request.
+
+#### API Payload
+| Key         | Type   | Description           |
+|-------------|--------|-----------------------|
+| MessageType | string | TestExecution.Abort   |
+| Payload     | object | null                  |
+
+#### Example
+```json
+{
+    "MessageType": "TestExecution.Abort",
+    "Payload": null
+}
+```
+
+## Debug All/Selected Tests
+Debug all or selected test operations follow this sequence:
+
+1. Request for the process to be launched under debugger (along with start parameters). `TestSession.GetTestRunnerProcessStartInfoForRunAll` and `TestSession.GetTestRunnerProcessStartInfoForRunSelected` messages need to be sent for DebugAll and DebugSelected operation respectively.
+2. Runner responds with a `TestSession.CustomTestHostLaunch` message. It has the executable which needs to be launched with debugger attached.
+3. After starting the host process, send `TestSession.CustomTestHostLaunchCallback` as an acknowledgment to the runner.
+
+After this, runner sends TestRunStatsChange and TestExecutionComplete events similar to a RunAll operation.
+
+### Get Process StartInfo For Debug All (Request)
+The request to get the Process StartInfo for the Test host.
+
+#### API Payload
+| Key         | Type   | Description                                         |
+|-------------|--------|-----------------------------------------------------|
+| MessageType | string | TestSession.GetTestRunnerProcessStartInfoForRunAll  |
+| Payload     | object | See details below                                   |
+
+**Payload** object is has following structure.
+
+| Key              | Type    | Description                                   |
+|------------------|---------|-----------------------------------------------|
+| Sources          | array   | Set of test containers. *Required*            |
+| TestCases        | array   | Set of `TestCase` objects. Null in this case. |
+| RunSettings      | string  | Run settings for the test run                 |
+| KeepAlive        | boolean | Reserved for future                           |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger    |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.GetTestRunnerProcessStartInfoForRunAll",
+  "Payload": {
+    "Sources": [
+      "E:\\git\\singh\\vstest\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": true
+  }
+}
+```
+
+### Get Process StartInfo For Debug Selected (Request)
+The request to get the Process StartInfo for the Test host.
+
+#### API Payload
+| Key         | Type   | Description                                              |
+|-------------|--------|----------------------------------------------------------|
+| MessageType | string | TestSession.GetTestRunnerProcessStartInfoForRunSelected  |
+| Payload     | object | See details below                                        |
+
+**Payload** object is has following structure.
+
+| Key              | Type    | Description                                   |
+|------------------|---------|-----------------------------------------------|
+| Sources          | array   | Set of test containers. Null in this case.    |
+| TestCases        | array   | Set of `TestCase` objects. *Required*         |
+| RunSettings      | string  | Run settings for the test run                 |
+| KeepAlive        | boolean | Reserved for future                           |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger    |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.GetTestRunnerProcessStartInfoForRunSelected",
+  "Payload": {
+    "Sources": null,
+    "TestCases": [
+      {
+        "Properties": [
+          {
+            "Key": {
+              "Id": "TestCase.FullyQualifiedName",
+              "Label": "FullyQualifiedName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest.PassingTest"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.ExecutorUri",
+              "Label": "Executor Uri",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Uri"
+            },
+            "Value": "executor://MSTestAdapter/v2"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.Source",
+              "Label": "Source",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "E:\\git\\singh\\vstest\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+          },
+          {
+            "Key": {
+              "Id": "TestCase.DisplayName",
+              "Label": "Name",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "PassingTest"
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.IsEnabled",
+              "Label": "IsEnabled",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Boolean"
+            },
+            "Value": true
+          },
+          {
+            "Key": {
+              "Id": "MSTestDiscovererv2.TestClassName",
+              "Label": "ClassName",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.String"
+            },
+            "Value": "UnitTestProject.UnitTest"
+          },
+          {
+            "Key": {
+              "Id": "TestObject.Traits",
+              "Label": "Traits",
+              "Category": "",
+              "Description": "",
+              "Attributes": 5,
+              "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+            },
+            "Value": []
+          },
+          {
+            "Key": {
+              "Id": "TestCase.LineNumber",
+              "Label": "Line Number",
+              "Category": "",
+              "Description": "",
+              "Attributes": 1,
+              "ValueType": "System.Int32"
+            },
+            "Value": 16
+          },
+          {
+            "Key": {
+              "Id": "TestCase.CodeFilePath",
+              "Label": "File Path",
+              "Category": "",
+              "Description": "",
+              "Attributes": 0,
+              "ValueType": "System.String"
+            },
+            "Value": "E:\\git\\singh\\vstest\\samples\\UnitTestProject\\UnitTest.cs"
+          }
+        ]
+      }
+    ],
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": true
+  }
+}
+```
+
+### Custom TestHost Launch (Response)
+CustomTestHostLaunch is the response to GetTestRunnerProcessStartInfoRunAll/GetTestRunnerProcessStartInfoRunSelected request. This message contains the StartInfo for the testhost process.
+
+#### API Payload
+| Key         | Type   | Description                          |
+|-------------|--------|--------------------------------------|
+| MessageType | string | TestSession.CustomTestHostLaunch     |
+| Payload     | object | See details below                    |
+
+**Payload** object is has following structure.
+
+| Key                  | Type    | Description                                                |
+|----------------------|---------|------------------------------------------------------------|
+| FileName             | string  | Name of the host process                                   |
+| Arguments            | string  | Arguments to be passed to the host process                 |
+| WorkingDirectory     | string  | Working directory for the host process                     |
+| EnvironmentVariables | array   | Environment variables associated with host process         |
+| CustomProperties     | array   | Any custom properties that need to set                     |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.CustomTestHostLaunch",
+  "Payload": {
+    "FileName": "C:\\Program Files\\dotnet\\dotnet.exe",
+    "Arguments": "exec --runtimeconfig \"UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.runtimeconfig.json\" --depsfile \"E:\\git\\singh\\vstest\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.deps.json\" \"E:\\git\\packages\\microsoft.testplatform.testhost/15.0.0-preview-20170106-08\\lib/netstandard1.5/testhost.dll\" --port 64531 --parentprocessid 12292",
+    "WorkingDirectory": "vstest\\samples\\Microsoft.TestPlatform.Protocol",
+    "EnvironmentVariables": {},
+    "CustomProperties": null
+  }
+}
+```
+
+### Custom TestHost LaunchCallback (Acknowledgement)
+CustomTestHostLaunchCallback is the acknowledgement sent to the runner after starting the host process.
+
+#### API Payload
+| Key         | Type   | Description                                  |
+|-------------|--------|----------------------------------------------|
+| MessageType | string | TestSession.CustomTestHostLaunchCallback     |
+| Payload     | object | See details below                            |
+
+**Payload** object is has following structure.
+
+| Key                 | Type    | Description                                                |
+|---------------------|---------|------------------------------------------------------------|
+| HostProcessId       | number  | Process Id of the host process                             |
+| ErrorMessage        | string  | Error message in case host process does not start          |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.CustomTestHostLaunchCallback",
+  "Payload": {
+    "HostProcessId": 53572,
+    "ErrorMessage": null
+  }
+}
+```
+
+## Test Session Messages (Response)
+The log messages are sent as `TestSession.Message`. Error messages are also reported via this message response.
+
+#### API Payload
+| Key         | Type   | Description             |
+|-------------|--------|-------------------------|
+| MessageType | string | TestSession.Message     |
+| Payload     | object | See details below       |
+
+**Payload** object is has following structure.
+
+| Key                 | Type    | Description                                                   |
+|---------------------|---------|---------------------------------------------------------------|
+| MessageLevel        | number  | Represent the TestMessageLevel. See details below             |
+| Message             | string  | The actual message reported by the runner.                    |
+
+**MessageLevel** provides an integer specifying the type of log message.
+Possible values are:
+  * `0x0`: Informational
+  * `0x1`: Warning
+  * `0x2`: Error
+
+**Example**
+```json
+{
+    "MessageType": "TestSession.Message",
+    "Payload": {
+      "MessageLevel" : 1,
+      "Message" : "The test run was aborted."
+    }
+}
+```
+
+### Test Session End (Request)
+This request is used to the end the current test session.
+
+#### API Payload
+| Key         | Type   | Description           |
+|-------------|--------|-----------------------|
+| MessageType | string | TestSession.Terminate |
+| Payload     | object | null                  |
+
+#### Example
+```json
+{
+    "MessageType": "TestSession.Terminate",
+    "Payload": null
+}
+```
+
+## Appendix
+### Key Data Structures
+#### 1. Message<a name="DataStructure.Message"></a>
+A `Message` is basic data unit for the Editor and Test Platform communication
+protocol.
+
+**Structure**
+
+| Key         | Type   | Description                                            |
+|-------------|--------|--------------------------------------------------------|
+| MessageType | string | Type of message                                        |
+| Payload     | object | Payload for an operation input or output. Can be null. |
+
+**Example**
+```json
+{
+    "MessageType": "TestSession.Connected",
+    "Payload": null
+}
+```
+
+#### 2. Property<a name="DataStructure.Property"></a>
+Each `Property` is a <Key, Value> pair as shown below.
+
+| Key   | Type   | Description                          |
+|-------|--------|--------------------------------------|
+| Key   | object | Definition of a Property. See below. |
+| Value | string | Value of the Property                |
+
+The `Key` identifies the property and `Value` is the data. Further a `Key` is
+defined as follows:
+
+| Key         | Type   | Description                                     |
+|-------------|--------|-------------------------------------------------|
+| Id          | object | Definition of a Property                        |
+| Label       | string | Value of the Property                           |
+| Category    | string | Type of a Property. Reserved for future.        |
+| Description | string | Description of a Property.                      |
+| Attributes  | number | Various attributes of this Property. See below. |
+| ValueType   | string | A .net type that represents the Value           |
+
+`Attributes` are a bitwise `OR` of following values:
+  * `0x0`: None (default)
+  * `0x1`: Hidden. Should be set for hidden properties.
+  * `0x2`: Immutable. Should be set of properties that are readonly.
+  * `0x4`: Trait (Deprecated). Should be set if a Property is a Trait.
+
+#### 3. TestCase<a name="DataStructure.TestCase"></a>
+A `TestCase` is a set of `Property` elements. Every testcase object must have following properties:
+
+- **TestCase.FullyQualifiedName** represents the unique name for a test case.
+```json
+{
+  "Key": {
+    "Id": "TestCase.FullyQualifiedName",
+    "Label": "FullyQualifiedName",
+    "Category": "",
+    "Description": "",
+    "Attributes": 1,
+    "ValueType": "System.String"
+  },
+  "Value": "UnitTestProject.UnitTest.TestWithPriority"
+}
+```
+
+- **TestCase.ExecutorUri** represents the Adapter which owns this test case.
+```json
+{
+  "Key": {
+    "Id": "TestCase.ExecutorUri",
+    "Label": "Executor Uri",
+    "Category": "",
+    "Description": "",
+    "Attributes": 1,
+    "ValueType": "System.Uri"
+  },
+  "Value": "executor://MSTestAdapter/v2"
+}
+```
+
+- **TestCase.Source** is the path to the test container which contains the
+   source of this test case.
+```json
+{
+  "Key": {
+    "Id": "TestCase.Source",
+    "Label": "Source",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.String"
+  },
+  "Value": ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+}
+```
+
+- **TestCase.DisplayName** represents a user friendly notation for the test
+   case. An editor or a runner can choose to show this to user.
+```json
+{
+  "Key": {
+    "Id": "TestCase.DisplayName",
+    "Label": "Name",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.String"
+  },
+  "Value": "TestWithPriority"
+}
+```
+
+- **TestCase.Traits** are a set of <Key, Value> pair of additional data related
+   to a test case. User can use these values to filter tests. An editor or
+   runner may show this to user.
+```json
+{
+  "Key": {
+    "Id": "TestObject.Traits",
+    "Label": "Traits",
+    "Category": "",
+    "Description": "",
+    "Attributes": 5,
+    "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+  },
+  "Value": [
+    {
+      "Key": "Priority",
+      "Value": "0"
+    }
+  ]
+}
+```
+
+Apart from these properties, a `TestCase` object may have adapter specific
+properties.
+
+#### 4. TestResult<a name="DataStructure.TestResult"></a>
+A `TestResult` object represents the result of a test case execution. It has the
+following structure.
+
+| Key         | Type   | Description                                     |
+|-------------|--------|-------------------------------------------------|
+| TestCase    | object | `TestCase` that executed                        |
+| Attachments | array  | Paths to test attachments                       |
+| Messages    | array  | Set of messages generated during test execution |
+| Properties  | array  | Set of `Property` for this result               |
+
+##### 4.1 Properties
+These are the mandatory properties available in every `TestResult` object.
+
+- **TestResult.DisplayName** provides a friendly name for the test result.
+```json
+{
+  "Key": {
+    "Id": "TestResult.DisplayName",
+    "Label": "TestResult Display Name",
+    "Category": "",
+    "Description": "",
+    "Attributes": 1,
+    "ValueType": "System.String"
+  },
+  "Value": ""
+}
+```
+
+- **TestResult.Duration** provides the entire duration of this test case
+   execution.
+```json
+{
+  "Key": {
+    "Id": "TestResult.Duration",
+    "Label": "Duration",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.TimeSpan"
+  },
+  "Value": "00:00:00.0306600"
+}
+```
+
+- **TestResult.ErrorMessage** provides an error message if the test failed.
+```json
+{
+  "Key": {
+    "Id": "TestResult.ErrorMessage",
+    "Label": "Error Message",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.String"
+  },
+  "Value": "Assert.AreEqual failed. Expected:<2>. Actual:<3>. "
+}
+```
+
+- **TestResult.ErrorStackTrace** provides the stack trace for the error.
+```json
+{
+  "Key": {
+    "Id": "TestResult.ErrorStackTrace",
+    "Label": "Error Stack Trace",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.String"
+  },
+  "Value": "   at UnitTestProject.UnitTest.FailingTest() in D:\\dd\\gh\\Microsoft\\vstest\\samples\\UnitTestProject\\UnitTest.cs:line 26\r\n"
+}
+```
+
+- **TestResult.Outcome** provides an integer specifying the result of a test
+   case execution.
+Possible outcomes are:
+  * `0x0`: None. Test case doesn't have an outcome.
+  * `0x1`: Passed
+  * `0x2`: Failed
+  * `0x3`: Skipped
+  * `0x4`: Not found. Test case was not found during execution.
+
+```json
+{
+  "Key": {
+    "Id": "TestResult.Outcome",
+    "Label": "Outcome",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+  },
+  "Value": 2
+}
+```
+
+- **TestResult.StartTime** provides the start time of the test case execution.
+```json
+{
+  "Key": {
+    "Id": "TestResult.StartTime",
+    "Label": "Start Time",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.DateTimeOffset"
+  },
+  "Value": "2017-01-06T10:15:39.9907073+05:30"
+}
+```
+
+- **TestResult.EndTime** provides the end time of test case execution.
+```json
+{
+  "Key": {
+    "Id": "TestResult.EndTime",
+    "Label": "End Time",
+    "Category": "",
+    "Description": "",
+    "Attributes": 0,
+    "ValueType": "System.DateTimeOffset"
+  },
+  "Value": "2017-01-06T10:15:40.021772+05:30"
+}
+```
+
+#### 5. TargetFramework<a name="RunSettings.TargetFramework"></a>
+The test runner needs the target framework for running the tests using the appropriate
+hosting environment. It can be set using TargetFrameworkVersion node in the RunSettings
+passed as part of discovery/execution request. TargetFrameworkVersion value is the fullname
+of the target framework. For example, ".NETFramework,Version=v4.5.2". Other supported
+.Net Framework version shortcuts are Framework35, Framework40 and Framework45.
+
+##### Example
+```
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<RunSettings>
+  <RunConfiguration>
+    <TargetFrameworkVersion>.NETFramework,Version=v4.5.2</TargetFrameworkVersion>
+  </RunConfiguration>
+</RunSettings>
+```
+
+##### Example for Test Execution Request
+```
+{
+  "MessageType": "TestExecution.RunAllWithDefaultHost",
+  "Payload": {
+    "Sources": [
+      "E:\\UnitTest1\\UnitTest1\\bin\\Debug\\net452\\UnitTest1.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<RunSettings>\r\n<RunConfiguration>\r\n<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>\r\n</RunConfiguration>\r\n</RunSettings>",
+    "KeepAlive": false,
+    "DebuggingEnabled": false
+  }
+}
+```
+
+[discovery]: 0002-Test-Discovery-Protocol.md
+[execution]: 0003-Test-Execution-Protocol.md
+[sample]: https://github.com/Microsoft/vstest/tree/main/samples/Microsoft.TestPlatform.Protocol
diff --git a/docs/RFCs/0008-TranslationLayer.md b/docs/RFCs/0008-TranslationLayer.md
new file mode 100644
index 0000000000..2e0930d79b
--- /dev/null
+++ b/docs/RFCs/0008-TranslationLayer.md
@@ -0,0 +1,138 @@
+# 0008 Translation Layer for TestPlatform Clients
+
+## Summary
+This note gives the details of the APIs for the client library which is an abstraction over TestPlatformV2.
+These APIs enable all the test related operations i.e. discovery, execution and debugging.
+TranslationLayer takes care of launching the TestPlatform runner, maintaining the connection and communication, sending and bringing back the results.
+
+## Motivation
+TranslationLayer is a wrapper over the new TestPlatform V2. TranslationLayer abstracts out all the internal details especially the communication protocol and serialization.
+TranslationLayer provides simple APIs that can be invoked to get the desired result.
+
+* Makes it easier for TestPlatform client writers.
+* Low maintainence for clients, minimal changes required during releases for TestPlatform.
+
+## Sample
+There is a sample project available for reference. Please find the relevant links below.
+* Sample project : [https://github.com/Microsoft/vstest/tree/main/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest](https://github.com/Microsoft/vstest/tree/main/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest)
+* Nuget package : [https://www.nuget.org/packages/Microsoft.TestPlatform.TranslationLayer](https://www.nuget.org/packages/Microsoft.TestPlatform.TranslationLayer)
+
+## Details
+TranslationLayer provides a IVsTestConsoleWrapper interface that contains main APIs for the required operations.
+VsTestConsoleWrapper provides the implementation for this interface. Please find following the details on the APIs and usage.
+
+### Constructing VsTestConsoleWrapper
+Client needs to create a new instance of the VsTestConsoleWrapper class. 
+The full path of the vstest.console.exe needs to passed as the parameter for the Constructor.
+
+```
+public VsTestConsoleWrapper(string vstestConsolePath)
+```
+
+### Prerequites 
+After creating the instance of VsTestConsoleWrapper, we need to call the following APIs as prerequites to the actual operations.
+
+#### Start Session
+This call starts the test runner process, creates the communication channel and readies it for handling requests.
+
+```
+IVsTestConsoleWrapper :: StartSession()
+```
+
+#### Initialize extensions
+This call initializes the TestPlatform with paths to extensions like adapters, loggers and any other extensions.
+
+```
+IVsTestConsoleWrapper :: void IntializeExtensions(IEnumerable<string> pathtoAdditonalExtensions)
+```
+
+### Handlers
+There are handlers that are passed via discovery/execution operation calls and are responsible for handling the discovery and execution events.
+These handlers are defined under Microsoft.VisualStudio.TestPlatform.ObjectModel.Client namespace in Microsoft.VisualStudio.TestPlatform.ObjectModel assembly.
+
+#### ITestDiscoveryEventsHandler
+Interface contract for handling discovery events during test discovery operation.
+
+#### Microsoft.VisualStudio.TestPlatform.ObjectModel.Client :: ITestRunEventHandler
+Interface contract for handling run events during test run operation
+
+### Discover Tests
+
+#### IVsTestConsoleWrapper :: DiscoverTests
+This api starts the discovery for the given sources and settings. 
+
+#### API
+```
+void DiscoverTests(IEnumerable<string> sources, string discoverySettings, ITestDiscoveryEventsHandler discoveryEventsHandler);
+```            
+
+#### Parameter Details
+
+| Parameters            | Type                        | Description                             |
+|-----------------------|-----------------------------|-----------------------------------------|
+| sources               | IEnumerable<string>         | Enumerable of paths to testcontainers   |
+| discoverySettings     | string                      | Path to the settings file               |
+| discoveryEventHandler | ITestDiscoveryEventsHandler | Contract for handling discovery events  |
+
+#### Cancel Discovery
+TODO : Place holder for now, not supported yet.
+
+### Run All Tests 
+
+#### IVsTestConsoleWrapper :: RunTests
+This api starts the execution for the given sources and settings. 
+
+#### API
+```
+void RunTests(IEnumerable<string> sources, string runSettings, ITestRunEventsHandler testRunEventsHandler)
+```
+
+#### Parameter Details
+| Parameters            | Type                        | Description                             |
+|-----------------------|-----------------------------|-----------------------------------------|
+| sources               | IEnumerable<string>         | Enumerable of paths to testcontainers   |
+| runSettings           | string                      | Path to the settings file               |
+| testRunEventsHandler  | ITestRunEventsHandler       | Contract for handling execution events  |
+
+### Run Selected Tests
+
+#### IVsTestConsoleWrapper :: RunTests
+This api starts the execution for the given sources and settings. 
+
+#### API
+```
+void RunTests(IEnumerable<TestCase> testCases, string runSettings, ITestRunEventsHandler testRunEventsHandler)
+```
+
+#### Parameter Details
+| Parameters            | Type                        | Description                             |
+|-----------------------|-----------------------------|-----------------------------------------|
+| testCases             | IEnumerable<TestCase>       | Enumerable of testcases                 |
+| runSettings           | string                      | Path to the settings file               |
+| testRunEventsHandler  | ITestRunEventsHandler       | Contract for handling execution events  |
+
+**TestCase** is defined in Microsoft.VisualStudio.TestPlatform.ObjectModel.
+
+#### Cancel Run Test
+This call will cancel the last test run request
+
+```
+IVsTestConsoleWrapper :: CancelTestRun()
+```
+
+#### Abort Run Test
+This call will abort the last test run request
+
+```
+IVsTestConsoleWrapper :: AbortTestRun()
+```
+
+### Cleanup 
+After all the operations are done, these are the calls that should be made at the end as part of cleanup.
+
+#### EndSession
+This call ends the test session and stops processing requests.
+
+```
+IVsTestConsoleWrapper :: EndSession()
+```
diff --git a/docs/RFCs/0009-Editors-API-RevisionUpdate.md b/docs/RFCs/0009-Editors-API-RevisionUpdate.md
new file mode 100644
index 0000000000..26720292de
--- /dev/null
+++ b/docs/RFCs/0009-Editors-API-RevisionUpdate.md
@@ -0,0 +1,391 @@
+# 0009 Editors API Revision Update
+
+## Summary
+This note outlines the proposed changes for the JSON protocol between an Editor/IDE
+and the test platform.
+
+
+Here is the link to v1 specs: [Editors-API-Specification](./RFCs/0007-Editors-API-Specification.md)
+
+## Motivation
+Here are the key factors:
+* Reducing size of the payload of message responses to improve performance. Refer to [https://github.com/Microsoft/vstest/issues/396](https://github.com/Microsoft/vstest/issues/396)
+* Improvements to versioning and ability to handle future breaking changes.
+
+## Overview of changes
+* New data structure for communication for v2 and above.
+* Negotiation for protocol version: Editor and Test Runner, Test Runner and Test Host.
+* Json optimization and changes to payloads.
+
+### Messages for communication
+Protocol related communication messages between Editor and Test Platform can have either of the following structures.
+
+#### Message
+This is existing Message structure used for communication in v1.
+
+##### API Payload
+| Key         | Type   | Description                                            |
+|-------------|--------|--------------------------------------------------------|
+| MessageType | string | Type of message                                        |
+| Payload     | object | Payload for an operation. Can be null.                 |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolVersion",
+    "Payload": 1
+}
+```
+
+#### Versioned Message
+This is the new data structure for Message introduced in v2. 
+It has an additional version field.
+
+##### API Payload
+| Key         | Type   | Description                                            |
+|-------------|--------|--------------------------------------------------------|
+| MessageType | string | Type of message                                        |
+| Version     | int    | Version based on which message should be deserialized  |
+| Payload     | object | Payload for an operation input or output. Can be null. |
+
+##### Example
+```json
+{
+  "MessageType": "Extensions.Initialize",
+  "Version": 2,
+  "Payload": [
+    "E:\\UnitTest1\\UnitTest1\\bin\\Debug\\net452\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll"
+  ]
+}
+```
+
+#### Need for Versioned Message
+A solution can contain projects that depend on different versions of Test Host. The tests from these projects can
+be run in parallel, which means Editor will be receiving test cases/results from both the Test Hosts.
+Editor will be able to deserialize both the messages, based on the version stamped on the responses.
+
+#### Using Correct Message Structures
+Message(v1) is used for protocol version negotiation in the beginning.
+For rest of the communication, the structure for messages is decided based on negotiated version.
+
+* If negotiated version = 1, Message (v1) structure will be used.
+* If negotiated version >= 2, Versioned Message (v2) will be used.
+
+Since now we have two kind of messages, implementation should be capable of deserializing both kind of messages.
+For Versioned Messages, the embedded version will be used to choose the implementation for serializing and deserializing the payloads.
+
+### Version Negotiations
+Editor uses the version operation to negotiate for the highest common version supported
+by the available Test platform.
+Similarly, Test Runner uses version operation to negotiate for the highest common version
+supported by the available Test host.
+All the components will have a range of versions they support.
+
+#### Negotiation Between IDE and Test Runner
+Editor sends version request with highest version.
+Test Runner then sends back the highest common version.
+
+For Example:
+* Editor with range (1-3) sends Version(Request) with version = 3, and Test Runner with range (1-2) will send back version as 2.
+* Editor with range (1-2) sends version(Request) with version = 2, and Test Runner with range (1-3) will send back version as 2.
+
+If Test Runner does not support the Editor, it will send ProtocolError message as discussed in the section below.
+
+At this point the initial handshake between Editor and Test Runner is
+complete. Version operation is required only once per launch of test runner.
+Editor stamps the highest common version on the subsequent requests.
+
+Note: For v1 though, since structure Message(v1) will be used, version is implicit.
+
+#### Negotiation Between Test Runner and Test Host
+Similarly, when the Test Runner receives run/discovery request, it launches and negotiates version
+with Test Host.
+
+Example:
+Let us say, Editor supports range (1-3) and Test Platform Runner supports range (1-3),
+so the version stamped on the run/discovery request will be 3.
+
+* Test Host which supports range (1-2), will send back version as 2.
+* Test Host which supports range (1-3), will send back version as 3.
+
+If the TestHost does not support the version, it will send ProtocolError message to Editor via Runner.
+Hence the version stamped on the response from Test Host will be the highest common
+version for all the three components.
+
+#### Version (Request)
+Editor will send this protocol version request with the highest version that it supports.
+
+##### API Payload
+| Key         | Type   | Description                |
+|-------------|--------|----------------------------|
+| MessageType | string | ProtocolVersion            |
+| Payload     | int    | Highest supported version  |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolVersion",
+    "Payload": 1
+}
+```
+
+#### Version (Response)
+Test Runner sends back the highest common version as a response.
+
+##### API Payload
+| Key         | Type   | Description               |
+|-------------|--------|---------------------------|
+| MessageType | string | ProtocolVersion           |
+| Payload     | int    | Highest common version    |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolVersion",
+    "Payload": 2
+}
+```
+
+#### Version Error (Response)
+If there is a mismatch, Test Runner or Test Host can send ProtocolError message.
+
+##### API Payload
+| Key         | Type   | Description                                  |
+|-------------|--------|----------------------------------------------|
+| MessageType | string | ProtocolError                                |
+| Payload     | object | String containing the supported range        |
+
+##### Example
+```json
+{
+    "MessageType": "ProtocolError",
+    "Payload": null
+}
+```
+Note : The Payload should contain the following information
+* Component that reported the mismatch
+* The version range supported by the component
+
+## Json optimization
+There are two objects that largely contribute to the size of the payload in the responses.
+* TestCase object
+* TestResult object
+
+Both these objects contain properties that are well-known and few others that are added by the
+adapters. For the well-known properties, we have reduced the verbosity and made them
+self-describing. Please checkout the following requests and responses for details and examples.
+
+### Discover Tests
+#### Start Discovery (Request)
+For v2, TestDiscovery.Start request will have the negotiated version (i.e. 2 currently) as part of the message.
+
+##### API Payload
+| Key         | Type   | Description            |
+|-------------|--------|------------------------|
+| MessageType | string | TestDiscovery.Start    |
+| Version     | int    | Version of the message |
+| Payload     | object | See below              |
+
+##### Message Payload
+| Key         | Type   | Description                    |
+|-------------|--------|--------------------------------|
+| Sources     | array  | Array of test container paths. |
+| RunSettings | string | Run settings xml               |
+
+##### Example
+```json
+{
+  "MessageType": "TestDiscovery.Start",
+  "Version" : 2,
+  "Payload": {
+    "Sources": [
+      ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "RunSettings": null
+  }
+}
+```
+
+#### Tests Found (Response)
+TestFound response will also have the version based on which Editor will be able to deserialize the message.
+Verbosity for the json of TestCase object inside the TestFound payload has been reduced significantly.
+
+##### API Payload
+| Key         | Type   | Description                       |
+|-------------|--------|-----------------------------------|
+| MessageType | string | TestDiscovery.TestFound           |
+| Version     | string | Version of the message            |
+| Payload     | array  | List of TestCases                 |
+
+##### Example
+```json
+{
+  "MessageType": "TestDiscovery.TestFound",
+  "Version": 2,
+  "Payload": [
+    {
+      "Id": "850ad69f-0dc9-fb92-8500-8d2f8d8dfe2a",
+      "FullyQualifiedName": "_20TestProject.UnitTest1.Test1",
+      "DisplayName": "Test1",
+      "ExecutorUri": "executor://MSTestAdapter/v2",
+      "Source": ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll",
+      "CodeFilePath": null,
+      "LineNumber": 0,
+      "Properties": [
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.IsEnabled",
+            "Label": "IsEnabled",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.Boolean"
+          },
+          "Value": true
+        },
+        {
+          "Key": {
+            "Id": "MSTestDiscovererv2.TestClassName",
+            "Label": "ClassName",
+            "Category": "",
+            "Description": "",
+            "Attributes": 1,
+            "ValueType": "System.String"
+          },
+          "Value": "TestProject.UnitTest1"
+        },
+        {
+          "Key": {
+            "Id": "TestObject.Traits",
+            "Label": "Traits",
+            "Category": "",
+            "Description": "",
+            "Attributes": 5,
+            "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+          },
+          "Value": []
+        }
+      ]
+    }
+  ]
+}
+```
+
+Similarly, DiscoveryComplete result will also have the version stamping.
+
+### Run Tests
+Similar to discovery requests, run tests request will also have the version as part of the message. Here are the examples.
+
+#### Run Tests (Request) Example
+```json
+{
+  "MessageType": "TestExecution.RunAllWithDefaultHost",
+  "Version": 2,
+  "Payload": {
+    "Sources": [
+      ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": false
+  }
+}
+```
+
+#### Test Run Statistics (Response) Example
+```json
+{
+  "MessageType": "TestExecution.Completed",
+  "Version": 2,
+  "Payload": {
+    "TestRunCompleteArgs": {
+      "TestRunStatistics": {
+        "ExecutedTests": 1,
+        "Stats": {
+          "Passed": 1
+        }
+      },
+      "IsCanceled": false,
+      "IsAborted": false,
+      "Error": null,
+      "AttachmentSets": [],
+      "ElapsedTimeInRunningTests": "00:00:00.8677523"
+    },
+    "LastRunTests": {
+      "NewTestResults": [
+        {
+          "TestCase": {
+            "Id": "850ad69f-0dc9-fb92-8500-8d2f8d8dfe2a",
+            "FullyQualifiedName": "_20TestProject.UnitTest1.Test1",
+            "DisplayName": "Test1",
+            "ExecutorUri": "executor://MSTestAdapter/v2",
+            "Source": "C:\\\\Users\\\\sasin\\\\Documents\\\\Visual Studio 2017\\\\Projects\\\\20TestProject\\\\20TestProject\\\\bin\\\\Debug\\\\net452\\\\20TestProject.dll",
+            "CodeFilePath": null,
+            "LineNumber": 0,
+            "Properties": [
+              {
+                "Key": {
+                  "Id": "MSTestDiscovererv2.IsEnabled",
+                  "Label": "IsEnabled",
+                  "Category": "",
+                  "Description": "",
+                  "Attributes": 1,
+                  "ValueType": "System.Boolean"
+                },
+                "Value": true
+              },
+              {
+                "Key": {
+                  "Id": "MSTestDiscovererv2.TestClassName",
+                  "Label": "ClassName",
+                  "Category": "",
+                  "Description": "",
+                  "Attributes": 1,
+                  "ValueType": "System.String"
+                },
+                "Value": "_20TestProject.UnitTest1"
+              },
+              {
+                "Key": {
+                  "Id": "TestObject.Traits",
+                  "Label": "Traits",
+                  "Category": "",
+                  "Description": "",
+                  "Attributes": 5,
+                  "ValueType": "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]"
+                },
+                "Value": []
+              }
+            ]
+          },
+          "Attachments": [],
+          "Outcome": 1,
+          "ErrorMessage": null,
+          "ErrorStackTrace": null,
+          "DisplayName": null,
+          "Messages": [],
+          "ComputerName": null,
+          "Duration": "00:00:00.0072901",
+          "StartTime": "2017-03-20T19:57:18.2262042+05:30",
+          "EndTime": "2017-03-20T19:57:18.2921987+05:30",
+          "Properties": []
+        }
+      ],
+      "TestRunStatistics": {
+        "ExecutedTests": 1,
+        "Stats": {
+          "Passed": 1
+        }
+      },
+      "ActiveTests": []
+    },
+    "RunAttachments": [],
+    "ExecutorUris": [
+      "executor://mstestadapter/v2"
+    ]
+  }
+}
+```
+
+All the other messages like Cancel, Abort or debugging related messages will follow the same pattern.
diff --git a/docs/RFCs/0010-Source-Information-For-Discovered-Tests.md b/docs/RFCs/0010-Source-Information-For-Discovered-Tests.md
new file mode 100644
index 0000000000..56d47801e2
--- /dev/null
+++ b/docs/RFCs/0010-Source-Information-For-Discovered-Tests.md
@@ -0,0 +1,69 @@
+# 0010 Source Information for discovered tests
+
+## Summary
+This note outlines the proposed change in behavior of source information collection for test methods discovered by test adapters.
+This change is applicable for test discovery from:
+1. Visual Studio Test Explorer (IDE) for managed test projects which are supported by .NET Compiler Platform (Roslyn)
+2. Vstest.console.exe runner (CLI) 
+
+## Motivation
+a. Performance improvement in IDE scenario because of two factors:
+* Use of better performant Roslyn APIs instead of reflection based approach on PDBs
+* Reduced test method payload transfer from adapter to Test Explorer
+
+b. Performance improvement in CLI scenario:
+* Source information is not required in CLI scenario and can be skipped entirely
+
+## Overview of changes
+Visual Studio Test Explorer needs source information for discovered tests to power following 3 scenarios:
+1. Navigation to test method
+2. Test method execution from code editor context menu
+3. Code lens markers
+
+At present, for managed (C# and VB) test projects, this information is obtained from PDBs using reflection based APIs. While this approach works, it has perf impact.
+Performance can be improved by using Roslyn APIs which gather this information during compile time.
+
+During discovery, Visual Studio Test Explorer groups the test containers on basis of their target framework (E.g.: NET46, NetCore etc.). 
+For each group a separate discovery request is sent to the adapters. 
+If all test containers in a group are supported by Roslyn, then for that discovery request, Visual Studio Test Explorer sets **'CollectSourceInformation'** flag in 
+runsettings with value 'false' and passes it to the test adapters, else it is set to 'true'.
+Test adapters can rely on this flag and skip source information collection for discovered tests, if the flag is set to 'false'. In such cases, Visual Studio Test Explorer
+will determine source information for the discovered tests.
+
+In case of CLI, source information is not required. Hence this flag is set to 'false' in the runsettings.
+
+### A sample runsettings file with this flag:
+```xml
+<RunSettings>
+    <RunConfiguration>
+      <CollectSourceInformation>False</CollectSourceInformation>
+    </RunConfiguration>
+</RunSettings>
+```
+
+Following are the perf numbers obtained for this flag in IDE scenario for MSTest and XUnit test adapters on TPv2 for a test project having 25K tests:
+
+| Adapter         | Without Changes = A (Sec) | With Changes = B (Sec) | Improvement, C = A - B (Sec) | Improvement (%) = C * 100 / A |
+|-----------------|---------------------------|------------------------|------------------------------|-------------------------------|
+| MSTest V2       |  27.28                    |  26.09                 |  1.19                        |  4.36                         |
+| XUnit           | 129.97                    |  79.32                 | 50.65                        | 38.97                         |
+
+
+## How to test this change
+While the changes for CLI will be available in a future release, changes for IDE are already available in Visual Studio 2017 Update 3 Preview 3 and newer builds but is hidden behind a feature flag.
+Steps to turn ON the feature flag:
+1. Close all instances of Visual Studio
+2. Locate Microsoft.VisualStudio.FeatureFlags.pkgdef file in Visual Studio installation folder. This file generally gets installed at:
+C:\Program Files (x86)\Microsoft Visual Studio\Preview\Enterprise\Common7\IDE\CommonExtensions\Platform\Shell
+3. Take a backup of this file
+4. Open the file in a text editor and location following key:
+[$RootKey$\FeatureFlags\TestingTools\UnitTesting\UseSipToFetchSourceInformation]
+5. Update its dword value from 00000000 to 00000001
+6. Save the file and update it in the Visual Studio location mentioned in (2)
+7. Open Developer Command prompt in administrator mode and run following command:
+   devenv /UpdateConfiguration
+8. Launch Visual Studio and do test discovery for a managed (C# or VB) test project
+
+To disable the feature, restore backup file in the Visual Studio location mentioned in (2) and run step (7)
+
+Note that for perf improvement to show up, the test adapter needs to be updated to honor 'CollectSourceInformation' flag. In MSTest adapter this functionality has been added in v1.2.0-beta.
\ No newline at end of file
diff --git a/docs/RFCs/0011-Test-Session-Timeout.md b/docs/RFCs/0011-Test-Session-Timeout.md
new file mode 100644
index 0000000000..70f2cad111
--- /dev/null
+++ b/docs/RFCs/0011-Test-Session-Timeout.md
@@ -0,0 +1,51 @@
+# 0011 Test Session Timeout
+
+## Summary
+Allow user to specify timeout which will terminate a test session when it exceeds a given timeout.
+
+## Motivation
+The test platform should have the ability for users to specify a test run level timeout which allows users to terminate a test session when it exceeds a given timeout. This ensures that resources are well consumed and test sessions are constrained to a set time.
+
+## Detailed Design
+
+User would specify timeout using runsetting or through commandline.
+
+### User can specify timeout using runsettings as follows:
+```xml
+<RunSettings>
+  <RunConfiguration>
+     <!-- Specify timeout in milliseconds. A valid value should be greater than 0 -->
+     <TestSessionTimeout>10000</TestSessionTimeout>
+  </RunConfiguration>
+</RunSettings>
+```
+
+### User can specify timeout using commandline as follows:
+```
+vstest.console <testContainersList> -- RunConfiguration.TestSessionTimeout=10000
+```
+
+### Overview of changes
+Testplatform will cancel the current test run if it has exceeded given `TestSessionTimeout`. It will also make sure that testhost is getting test cancel request. Finally it will conclude the run with whatever test run till that point.
+
+### Exit Code of vstest.console
+It will be a failed test and exit code will be 1
+
+### Console output
+```
+Starting test execution, please wait...
+Passed   TestNameSpace.UnitTestClass.TestMethod1
+Passed   TestNameSpace.UnitTestClass.TestMethod2
+Passed   TestNameSpace.UnitTestClass.TestMethod3
+Passed   TestNameSpace.UnitTestClass.TestMethod4
+Passed   TestNameSpace.UnitTestClass.TestMethod5
+Canceling test run: test run timeout of 10000 milliseconds exceeded.
+Passed   TestNameSpace.UnitTestClass.TestMethod6
+Passed   TestNameSpace.UnitTestClass.TestMethod6
+
+Total tests: 7. Passed: 7. Failed: 0. Skipped: 0.
+Test Run Canceled.
+Test execution time: 18.2893 Seconds
+```
+
+
diff --git a/docs/RFCs/0012-Editors-API-RevisionUpdate-15.4.md b/docs/RFCs/0012-Editors-API-RevisionUpdate-15.4.md
new file mode 100644
index 0000000000..75164ba8e0
--- /dev/null
+++ b/docs/RFCs/0012-Editors-API-RevisionUpdate-15.4.md
@@ -0,0 +1,97 @@
+# 0012 Editors API Revision Update - 15.4
+
+## Summary
+This details the change in the JSON protocol between an Editor/IDE
+and the test platform to support test case filtering.
+
+## Motivation
+The console runner has an ability to run a specific set of tests via the `/testcasefilter` argument. Editors require this functionality as well to run a subset of tests which have not yet been discovered. This document builds on top of the v2 protocol between the Editor/IDE and the test platform.
+
+Here is the link to v1 specs: [Editors-API-Specification](./RFCs/0007-Editors-API-Specification.md)
+and here is the link to the v2 specs: [Editors-API-Specification-V2](./RFCs/0009-Editors-API-RevisionUpdate.md)
+
+## Design
+Filtering in the test platform is only supported when a test run request with sources is requested. This is unsupported when a run request with a set of TestCases is passed in. To that effect the following messages would change to accommodate filtering.
+
+### Run All Tests
+The default run tests request will now have a TestCaseFilter passed in.
+
+#### API Payload
+| Key         | Type   | Description                         |
+|-------------|--------|-------------------------------------|
+| MessageType | string | TestExecution.RunAllWithDefaultHost |
+| Payload     | object | See below for details               |
+
+**Payload** for `TestExecution.RunAllWithDefaultHost` has following structure.
+
+| Key              | Type    | Description                                |
+|------------------|---------|--------------------------------------------|
+| Sources          | array   | Set of test containers                     |
+| TestCases        | array   | Set of `TestCase` objects                  |
+| RunSettings      | string  | Run settings for the test run              |
+| KeepAlive        | boolean | Reserved for future                        |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger |
+| **TestCaseFilter**| **string**| **the test case filter string**         |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.RunAllWithDefaultHost",
+  "Version": 2,
+  "Payload": {
+    "Sources": [
+      ".\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": false,
+    "TestCaseFilter": "FullyQualifiedName~UnitTestClass1&TestCategory=CategoryA"
+  }
+}
+```
+The responses to this request do not change.
+
+### Debug All Tests
+The request to get the Process StartInfo for the Test host will now have a `TestCaseFilter`.
+
+#### API Payload
+| Key         | Type   | Description                                         |
+|-------------|--------|-----------------------------------------------------|
+| MessageType | string | TestSession.GetTestRunnerProcessStartInfoForRunAll  |
+| Payload     | object | See details below                                   |
+
+**Payload** object has following structure.
+
+| Key              | Type    | Description                                   |
+|------------------|---------|-----------------------------------------------|
+| Sources          | array   | Set of test containers. *Required*            |
+| TestCases        | array   | Set of `TestCase` objects. Null in this case. |
+| RunSettings      | string  | Run settings for the test run                 |
+| KeepAlive        | boolean | Reserved for future                           |
+| DebuggingEnabled | boolean | `true` indicates a test run under debugger    |
+| **TestCaseFilter**| **string**| **the test case filter string**            |
+
+#### Example
+```json
+{
+  "MessageType": "TestExecution.GetTestRunnerProcessStartInfoForRunAll",
+  "Version": 2,
+  "Payload": {
+    "Sources": [
+      "E:\\git\\singh\\vstest\\samples\\UnitTestProject\\bin\\Debug\\netcoreapp1.0\\UnitTestProject.dll"
+    ],
+    "TestCases": null,
+    "RunSettings": null,
+    "KeepAlive": false,
+    "DebuggingEnabled": true,
+    "TestCaseFilter": "FullyQualifiedName~UnitTestClass1&TestCategory=CategoryA"
+  }
+}
+```
+
+The responses to this request do not change.
+
+## Note
+1. This new parameter is purely optional and does not require any changes in editors based on earlier protocols. **This isn't a breaking change.**
+2. This change is only available in the v2 version of the protocol.
diff --git a/docs/RFCs/0013-Test-Adapter-Lookup.md b/docs/RFCs/0013-Test-Adapter-Lookup.md
new file mode 100644
index 0000000000..d01e51df51
--- /dev/null
+++ b/docs/RFCs/0013-Test-Adapter-Lookup.md
@@ -0,0 +1,81 @@
+# 0013 Test Adapter Lookup
+
+## Summary
+This note outlines the proposed changes for lookup and initialization of the test adapters.
+
+## Motivation
+Following is a list of issues with current design
+* Test discovery fails for a solution containing projects referring to multiple versions of the same adapter.
+* Upgrade of test adapter is not honored as the adapters get cached in the host process.
+* Diagnostic information related to which adapter was used for which source and what adapters are loaded in not available.
+
+## Principles
+1. The adapter referenced in the project should be used for test execution
+2. Performance should not degrade.
+3. Adapter lookup logic is consistent across runs.
+4. Adapter lookup logic should be clear and consistent for both IDE/Editor and CLI runs.
+
+## Proposed Changes
+Here are the proposed changes based on the sources available for lookup of the adapters.
+
+### Adapter Sources
+Here is the list of sources TestPlatform looks up for test adapters.
+
+| Source                   | Remarks                                                                        |
+|--------------------------|--------------------------------------------------------------------------------|
+| TestAdapterPath          | Adapter is specified by user in the runsettings file or via cli arguments      |
+| Nuget                    | Adapter ships as a nuget package, doesn't copy to output directory             |
+| Project output directory | Adapter ships as a nuget package, copies to output directory                   |
+| Extensions directory     | Adapters packaged with VS, available in the Extensions directory               |
+| VSIX                     | Adapter ships as a vsix.                                                       |
+
+### Mulitple verions of Adapter
+In case there are multiple versions of the same adapter found during the lookup, TestPlatform will choose the one with the highest version.
+TestPlatform will notify the user about the conflict and which version was selected for that run.
+
+### Details for lookup
+
+#### Nuget
+This lookup is based on the nuget package references. This works only for IDE and not for CLI, as this information is only available in IDE.
+IDE invokes all the test adapters with all the test projects in the solution.
+If multiple versions of same adapter, or multiple adapters with same URI found, TestPlatform will throw a warning.
+
+* Recommendation : Use one version of the given adapter in the solution.
+
+* Best Practice : Define a constant for nuget package version of an adapter in one file and use it across all the projects.
+This also helps make the upgrade experience to a newer version of adapter seamless.
+For example, open source projects like
+[Roslyn](https://github.com/dotnet/roslyn) and
+[VSTest](https://github.com/microsoft/vstest) use *props file to define the version of the nuget packages.
+
+#### TestAdapterpath
+TestAdapterPath can be given via runsettings or as an argument in case of cli.
+All the test sources will be run against all the test adapters found in the test adapter path.
+If multiple versions of same adapter, or multiple adapters with same URI found, TestPlatform will throw a warning.
+
+* Recommendation : Have one version of an adapter in the test adapter path.
+
+#### Project Output Directory
+Some adapters packaged as nuget get copied to the output directory of the project.
+
+Since IDE picks up the adapters from the nuget package location, there is no need to look for adapters in the project output directory.
+Hence, this project output directory will be probed only in case of cli. Further, cli will probe only when testAdapterPath is not specified.
+
+* Recommendation : Use /testadapterpath option with cli.
+
+#### Extensions directory
+All the adapters in the extensions directory get loaded by default and all the test sources based on the file extensions are passed to these adapters. Test runner will provide the diagnostics information about adapters used for the test projects.
+
+#### VSIX
+In case of IDE, all vsix based adapters get initialized by default.
+In case of CLI, /UseVsixExtensions argument will be available. But user will start getting a recommendation to use /TestAdapterpath instead.
+
+* Recommendation for adapter authors : Move to nuget based acquisition for the test adapters.
+* Note : TestPlatform needs to keep supporting this lookup until all adapters can be moved to nuget packages.
+
+### Additional diagnostics changes proposed
+Here are a few changes for improving diagnosibilty of Test Platform
+
+1. Diagnostics information should include the information for all the loaded adapters along with their URIs.
+2. Information regarding which source was given to which adapter gets surfaced.
+3. TestPlatform will give a warning in case an attempt is made to load multiple versions of same adapter.
diff --git a/docs/RFCs/0014-Packaging.md b/docs/RFCs/0014-Packaging.md
new file mode 100644
index 0000000000..e44d73756e
--- /dev/null
+++ b/docs/RFCs/0014-Packaging.md
@@ -0,0 +1,29 @@
+# 0014 - Packaging
+## Motivation
+As mentioned in the roadmap, vstest is looking to broaden its reach to all scenarios across Visual Studio and Visual Studio Team Services (VSTS) and Team Foundation Server (TFS) – i.e. extending it to .NET Framework, the VSTest task in VSTS and in TFS. We aspire to ship a standalone package that can be potentially used in other CI systems even.
+Appropriate packaging is essential for such broad reach.
+The following document describes how the Visual Studio Test Platform will be packaged.
+
+## Packaging
+Conceptually, the capabilities fall into these two categories:
+1. a subset of the capabilities that allows you to run tests and that is cross-plat, and that we have ported to Windows/Mac/Linux.
+2. the full set of capabilities that have always shipped in-box with Visual Studio, and that are mostly Windows only (for e.g. some of the adapters  are supported only on Windows, and shipped in-box with Visual Studio).
+
+Accordingly, we will create the following NuGet packages:
+### Microsoft.TestPlatform.Portable
+Contents:
+- Runner: vstest.console.exe, vstest.console.dll)
+- In-box adapters: None
+- In-box data collectors: Blame datacollector (and any other data collectors which are supported crossplat)
+- In-box loggers: trx
+- Supports legacy test execution via TMI: No
+
+### Microsoft.TestPlatform
+Contents:
+ - Microsoft.TestPlatform.Portable +
+ - In-box adapters: MSTest V1, Ordered Test, Generic Test, Web test adapters
+ - In-box data collectors: CodeCoverage, Fakes, TIA, video, SysInfo
+ - Supports legacy test execution via TMI: Yes
+ 
+## Versioning
+The NuGet packages will continue to follow VS versioning. For e.g. 15.5.0-preview-2017MMDD-XY (XY are # of build of that day). 
diff --git a/docs/RFCs/0015-Telemetry.md b/docs/RFCs/0015-Telemetry.md
new file mode 100644
index 0000000000..76b0ffd50e
--- /dev/null
+++ b/docs/RFCs/0015-Telemetry.md
@@ -0,0 +1,144 @@
+# 0015 Telemetry
+
+## Summary
+This document outlines the telemetry data points to be collected by vstest platform along with the expectations from any vstest consuming platform, wanting to use these telemetry data points for their own needs.
+
+## Overview
+Going forward vstest platform will enable collection of rich telemetry data points to helps us and any vstest consuming platform in making the right choices to improve end user experience. The telemetry data points we plan to collect in vstest, doesn't contain any information that can be used to identify an individual e.g. name, email, username etc. More details on telemetry data points below.
+
+## Data Points
+Following telemetry data points will be collected by vstest and also enabled for collection by any vstest consuming platform:
+* Size of tests (e.g. numberOfTestsSources, numberOfTestsRun, duration etc.)
+* Configuration of tests (e.g. parallelExecution, dataCollectorUsed, adapterVersion etc.)
+* Composition of tests (e.g. targetOS, targetPlatform, targetFramework etc.)
+* Features used (e.g. codeCoverage, settings etc.)
+* Time (time of operation)
+* Source of invocation (vstest consuming platform)
+For more details please refer to the **Detailed List of Data Points** section at the end
+
+## Conceptual Flow
+![alt text](./RFCs/Images/vstest.telemetry.png) 
+
+## Scope
+* vstest and vstest.console.exe will emit telemetry data points that any vstest consuming platform can listen to
+* vstest consuming platform needs to provide the following information to the vstest
+  * indicator of user consent
+  * source of invocation
+* Consuming platform needs to create a listener that can collect the data points and route it to their respective telemetry backend
+* No PII or EUII data will be collected by vstest
+* vstest will respect the user consent flowing in from the consuming platform
+
+## User Consent [Opt-In, Opt-Out]
+Any vstest consuming platform can collect the telemetry events and redirect to the backend of their choice, however it is the responsibility of the consuming platform to
+* Enable opt-in | opt-out experience for their users
+* Ensure compliance (data, security, privacy etc.)
+
+## License
+The Microsoft distribution of vstest is licensed with the [Link](https://www.visualstudio.com/microsoft-visual-studio-test-platform/). This license includes the "DATA" section to enable telemetry (shown below).
+* **DATA COLLECTION.** The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services.  You may opt-out of many of these scenarios, but not all, as described in the product documentation.  There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft’s privacy statement. Our privacy statement is located at http://go.microsoft.com/fwlink/?LinkID=528096. You can learn more about data collection and use in the help documentation and the privacy statement. Your use of the software operates as your consent to these practices.
+
+* **Processing of Personal Data.** To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at http://go.microsoft.com/?linkid=9840733. 
+
+## Detailed List of Data Points
+| Group          | Attributes      |
+|----------------|-----------------|
+| Size           | numberOfTestsSources |
+|                | numberOfTestsRun |
+|                | duration |
+|                | discoveryState |
+|                | totalTests (Discovered) |
+|                | totalTimeTakenInSeconds (Discovered) |
+|                | duration |
+|                | totalTests (Executed) |
+|                | totalTimeTakenInSeconds (Executed) |
+| Composition    | adapterVersion |
+|                | targetFramework |
+|                | targetPlatform |
+|                | targetDevice (UWP or Not) |
+|                | testPlatformVersion |
+|                | targetOS |
+| Configuration  | loggerUsed |
+|                | dataCollectorUsed |
+|                | parallelExecution |
+|                | maxCpuCount |
+|                | adapterUsedCount (Discovered) |
+|                | adapterUsedCount (Executed) |
+|                | platform (commandLineSwitches) |
+|                | framework (commandLineSwitches) |
+| Features       | setting (commandLineSwitches) |
+|                | parallel (commandLineSwitches) |
+|                | enableCodeCoverage (commandLineSwitches) |
+|                | inIsolation (commandLineSwitches)|
+|                | useVSIXExtensions (commandLineSwitches) |
+|                | logger (commandLineSwitches) |
+| Time           | dateTime |
+| Source         | consumingPlatform |
+
+## Sending Consent for collecting Telemetry Metrics in Test Platform in Design Mode
+**Collection in Test Platform will only happen if TestPlatform receives consent from the consumers.**
+
+The "CollectMetrics" field has been added in [TestPlatformOptions](./src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs) to send consent from Design Mode Scenarios(VS, VSCode etc) to TestPlatform. The users have to set "CollectMetrics" to "true" so that TestPlatform can collect Metrics and send it back to the client.
+
+The [IVsTestConsoleWrapper](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs) and [IVsTestConsoleWrapperAsync](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs) contains API's that support TestPlatformOptions. Users must use these API's to send consent to the TestPlatform for collecting Metrics.
+
+**For Instance**
+For Discovery : Users have to use this API to pass TestPlatform Options.
+
+        /// <summary>
+        /// Start Discover Tests for the given sources and discovery settings.
+        /// </summary>
+        /// <param name="sources">List of source assemblies, files to discover tests</param>
+        /// <param name="discoverySettings">Settings XML for test discovery</param>
+        /// <param name="options">Options to be passed into the platform.</param>
+        /// <param name="discoveryEventsHandler">EventHandler to receive discovery events</param>
+        void DiscoverTests(IEnumerable<string> sources, string discoverySettings, TestPlatformOptions options, ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+        
+For Execution using sources: Users have to use this API to pass TestPlatform Options.
+
+        /// <summary>
+        /// Starts a test run given a list of sources.
+        /// </summary>
+        /// <param name="sources">Sources to Run tests on</param>
+        /// <param name="runSettings">RunSettings XML to run the tests</param>
+        /// <param name="options">Options to be passed into the platform.</param>
+        /// <param name="testRunEventsHandler">EventHandler to receive test run events</param>
+        void RunTests(IEnumerable<string> sources, string runSettings, TestPlatformOptions options, ITestRunEventsHandler testRunEventsHandler);
+
+Similarly, while running tests using TestCases, there are API's available to send TestPlatformOptions along with them.
+
+## Consuming Metrics in Design Mode Scenarios from Test Platform
+The whole aggregated metrics will be appended in vstest.console process in the final Execution/Disocvery Complete message and it will be send back to the consumers. When users use API's that are available in [IVSTestConsoleWrapper](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs), they have to pass the event handler which will contain metrics from TestPlatform.
+
+In Case of Execution, users will pass [ITestRunEventsHandler](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler.cs), which contains [TestRunCompleteEventArgs](./src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs) which will have Metrics in it which users can consume.
+
+In Case of Discovery, users have to pass new interface [ITestDiscoveryEventsHandler2](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler2.cs) which contains [DiscoveryCompleteEventArgs](./src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs) which will have metrics in it which users can consume.
+
+## Telemetry Design
+### Collecting Data
+* Collect Telemetry Data Points in various process(testhost,datacollector etc) and send it to vstest.console process where it will be uploaded or send back to users in design mode. 
+
+**For eg:**
+* In Test Host Process:
+We have to collect how much time does each executor took to run test, Time taken to load adapters etc.
+
+* In Vstest.console:
+We have to collect Total Discovery Time taken, Total Tests Run in case of parallel scenarios.
+
+#### Aggregating data points in Test Host process
+
+* It may happen that TestHost is on a newer version whereas vstest.console is on older version. So, TestHost process should not collect Metrics by default. So, it should only collect Metrics when users give consent to collect Metrics.
+So, for sending consent from Vstest.console process to Test Host, Command line argument i.e. boolean **TelemetryOptedIn** is sent to TestHost Process from Vstest.console process.
+
+The interface [IRequestData](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequestData.cs) has been has been exposed to TestHost process which contains [IMetricCollection](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMetricsCollection.cs) which will collect the Metrics in a dictionary.
+
+#### Sending Metrics from TestHost process to vstest.console process
+Currently, At the end of Discovery Complete, we are sending **TestDiscovery.Complete** message event along with DiscoveryCompletePayload, so we will add our collected Metrics along with [DiscoveryCompletePayload](./src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs). Similar will be done at end of **TestExecution.Complete** event where we will add the Metrics in [TestRunCompleteEventArgs](./src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs). This helps us in sending whole metrics in one go and helps us to decrease performance overhead of sending messages from test host process to vstest.console process.
+
+In VsTestConsole process, the metrics which will be received from TestHost process will be aggregated with the VsTestConsole own metrics.
+
+### Publishing Data
+
+For Publishing data, there are two scenarios:
+* Design Mode: We aggregate all the data in vstest.console and send to various IDE's(VS, VSCode etc) giving the IDE's options to add this telemetry data along with thier own Telemetry.
+
+* Non-Design Mode: We will be extending support for it soon.
diff --git a/docs/RFCs/0016-Loggers-Information-From-RunSettings.md b/docs/RFCs/0016-Loggers-Information-From-RunSettings.md
new file mode 100644
index 0000000000..f2fc97a27a
--- /dev/null
+++ b/docs/RFCs/0016-Loggers-Information-From-RunSettings.md
@@ -0,0 +1,99 @@
+# 0016 Loggers information from RunSettings
+
+## Summary
+This note outlines the proposed changes for:
+1. Enabling logger support in test platform for protocol and C# library based clients.
+2. Allowing users to provide loggers from the runsettings.
+
+## Motivation
+1. Enabling logger support for protocol and C# library based clients will allow clients to use logger extensibility feature.
+
+2. Allowing users to provide loggers from the runsettings enables:
+  * Protocol and C# library based clients to provide loggers to the test platform.
+  * Configuring loggers as code. Users can commit a runsettings with required loggers and it doesn't need to be specified at each invocation.
+
+## Specifying a logger
+Loggers can be provided to the test platform in one of the following ways:
+
+1.  `/Logger:"UriOrFriendlyName";Key1=Value1;Key2=Value2` This is a switch to vstest.console.exe that feeds logger information to the test platform. For instance:
+
+    ```
+    /Logger:"logger://Microsoft/TestPlatform/TrxLogger/v1"
+    ```
+
+    This loads and initializes logger with "logger://Microsoft/TestPlatform/TrxLogger/v1" as uri.
+
+    ```
+    /Logger:sampleLogger;Key1=Value1;Key1=Value2
+    ```
+
+    This loads and initializes logger with `sampleLogger` as friendly name. `Key1=Value1` and `Key2=Value2` are passed as dictionary parameters to the logger while initialization.
+
+2. Runsettings via `Logger` node in the `LoggerRunSettings` section. Here is a sample on how this can be specified:
+
+    ```xml
+    <RunSettings>
+        <LoggerRunSettings>
+            <Loggers>
+                <Logger friendlyName="sampleLoggerwithParameters">
+                    <Configuration>
+                        <Key1>Value1</Key1>
+                        <Key2>Value2</Key2>
+                    </Configuration>
+                </Logger>
+                <Logger uri="logger://sample/sampleLoggerWithoutParameters1"
+                        friendlyName="sampleLoggerWithoutParameters1" />
+                <Logger uri="logger://sample/sampleLoggerWithoutParameters2"
+                        assemblyQualifiedName="Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx"
+                        friendlyName="sampleLoggerWithoutParameters2" />
+            </Loggers>
+        </LoggerRunSettings>
+    </RunSettings>
+    ```
+
+    This loads and initializes:
+    * Logger with `friendlyName="sampleLoggerwithParameters"`. `Key1=Value1` and `Key2=Value2` are passed as dictionary parameters to the logger while initialization. i.e. `SampleLoggerWithParameters.Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)` is invoked with `parameters = {{"Key1", "Value1"}, {"Key2", "Value2"}}`
+    * Logger with `uri="logger://sample/sampleLoggerWithoutParameters1"`. FriendlyName is ignored in this case as uri takes more precedence.
+    * Logger with `assemblyQualifiedName="Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx"`. Uri and friendlyName are ignored in this case as assemblyQualifiedName takes more precedence.
+
+Test platform loads custom logger assemblies from test adapter paths and source directory. Check [adapter extensibility] (0004-Adapter-Extensibility.md) to know about how to provide test adapter paths to test platform.
+
+## Specification
+1. If same logger is specified both in command line arguments and run settings, command line takes precedence.
+2. User can override existing logger value in runsettings from command line. For example `vstest.console foo.dll -- LoggerRunSettings.Loggers="<Logger friendlyName=\"sampleLoggerwithParameters\" />"`.
+3. Multiple Loggers can be added in runsettings by adding `Logger` node in `LoggerRunSettings.Loggers` section.
+4. Configuration is optional in `Logger` node.
+5. Atleast one attribute among `uri`, `friendlyName`, `assemblyQualifiedName` should be present in `Logger` node.
+6. If more than one attributes among `uri`, `friendlyName`, `assemblyQualifiedName` are present, then precedence order is `assemblyQualifiedName > uri > friendlyName`. Attributes other than precedent attribute are ignored.
+7. Logger can be enabled or disabled using `enabled` attribute in `Logger` node. For example to disable a logger: `<Logger friendlyName="sampleLogger" enabled="false" />`.
+
+## Error and Warning scenarios:
+Exception scenarios: 
+In case of exception, test run is aborted. Following are the exception scenarios:
+1. `LoggerRunSettings` or `Loggers` node has attributes.
+2. `LoggerRunSettings` has any node other than `Loggers`.
+3. `Loggers` has any node other than `Logger`.
+4. `Logger` has any node other than `Configuration`.
+5. `Logger` node has any attribute other than `uri`, `assemblyQualifiedName`, `friendlyName`, or `enabled`.
+6. Invalid format `uri` is given.
+7. Unable to find logger using precedent attribute.
+8. If none of the attributes `uri`, `assemblyQualifiedName`, `friendlyName` is given.
+
+Warning scenarios:
+1. Key value pair has empty or whitespace value. Example: `<Key1></Key1>`.
+
+Ignored scenarios:
+1. Duplicate keys in `Configuration` node is ignored and verbose is added for it.
+
+## Design
+Following are the proposed design changes for enabling logger support for protocol and C# library based clients:
+1. TestLoggerManager will manage all the loggers. TestLoggerManager will be responsible for:
+  * Initializing loggers from the run settings.
+  * Enabling and triggering logger events.
+  * Disposing logger events.
+
+2. TestEngine API will have GetLoggerManager method which will return new TestLoggerManager instance on every call.
+3. TestPlatform will get instance from TestEngine and initialize TestLoggerManager and will pass this TestLoggerManager instance to TestRunRequest and DiscoveryRequest.
+4. TestRunRequest and DiscoveryRequest will hold the TestLoggerManager instance. On receiving any run/discovery events, respective methods of TestLoggerManager will be invoked. i.e. TestLoggerManager will no longer register logger events with run or discovery events.
+5. On test run/discovery completion, TestLoggerManager will be disposed by TestRunRequest and DiscoveryRequest.
+6. Limitation with this approach is that if TestRunRequest users like TestRequestManager tries to call `TestRunRequest.ExecuteAsync()` second time, then logger events will not be invoked as TestLoggerManager will already be disposed in first run.
diff --git a/docs/RFCs/0017-Managed-TestCase-Properties.md b/docs/RFCs/0017-Managed-TestCase-Properties.md
new file mode 100644
index 0000000000..e6953c038f
--- /dev/null
+++ b/docs/RFCs/0017-Managed-TestCase-Properties.md
@@ -0,0 +1,166 @@
+
+
+# 0017 Properties for TestCases in Managed Code
+
+## Summary
+This document standardizes additional properties on TestCase to support test cases written in managed languages.
+
+## Overview
+There are a broad variety of choices that current test adapter implementers have made when setting the `FullyQualifiedName` on TestCase objects created during test discovery. `FullyQualifiedName` typically identifies the type and method that implements a test case in managed code, but because there has been no standardization, VS cannot rely on the format of the `FullyQualifiedName`. We've considered standardizing the format of `FullyQualifiedName`, but this presents migration & compatibility costs that outweigh the benefits. Instead, we are adding two new properties to TestCase that represent the type (`ManagedType`) and method (`ManagedMethod`) for each test case. These additional properties are only applicable to unit tests written in managed languages (e.g. C# & VB, et al.).
+
+## Specification
+
+TestCases for managed code must include a string-valued property named `ManagedType` property and a string-valued property named `ManagedMethod`. The specification below outlines the requirements for the contents of these two properties.
+
+### `ManagedType` Property
+
+The `ManagedType` test case property represents the fully specified type name in metadata format:
+
+    NamespaceA.NamespaceB.ClassName`1+InnerClass`2
+
+* The type name must be fully qualified (in the CLR sense), including its namespace. Any generic classes must also include an arity value using backtick notation (`# where # is the number of type arguments that the class requires).
+* Nested classes are appended with a '+' and must also include an arity if generic.
+* `ManagedType` name must be escaped if it doesn't conform to identifier naming rules.
+
+### `ManagedMethod` Property
+
+The `ManagedMethod` test case property is the fully specified method including the method name and a list of its parameter types inside parentheses separated by commas.
+
+    MethodName`2(ParamTypeA,ParamTypeB,…)
+
+* If the method accepts no parameters, then the parentheses should be omitted.
+* If the method is generic, then an arity must be specified (in the same way as the type property).
+* The list of parameter types must be encoded using the type specification below.
+* Return types are not encoded.
+* `ManagedMethod` must be escaped if it doesn't conform to identifier naming rules.
+
+### Parameter Type Encoding
+
+Parameters are encoded as a comma-separated list of strings in parentheses at the end of the `ManagedMethod` property. Each parameter is encoded using the rules below.
+
+* Basic Types - Types should be written using their namespace and type name with no extra whitespace. For example (`NamespaceA.NamespaceB.Class`). Native types should be written using their CLR type names (`System.Int32`,`System.String`).
+* Array Types - Arrays should be encoded as the element type followed by square brackets (`[]`). Multidimensional arrays are indicated with commas inside the square brackets. There should be one less comma than the number of dimensions (i.e. 2 dimensional array is encoded as `[,]`, 3 dimensional array as `[,,]` ).
+* Generic Types - Generic types should be encoded as the type name, followed by comma-separated type arguments in angle brackets (`<>`).
+* Generic Parameters - Parameters that are typed by a generic argument on the containing type are encoded with an exclamation point (`!`) followed by the ordinal index of the parameter in the generic argument list.
+* Generic Method Parameters - Parameters that are typed by a generic argument on the method are encoded with a double exclamation point (`!!`) followed by the ordinal index of the parameter in the method's generic argument list.
+* Pointer Types - Pointer types should be encoded as the type name, followed by an asterisk (`*`).
+* Dynamic Types - Dynamic types should be represented as System.Object.
+
+#### Examples
+
+```csharp
+// Custom Types
+Method(NamespaceA.NamespaceB.Class)
+'𝐌𝐲 𝗮𝘄𝗲𝘀𝗼𝗺𝗲 method w\\𝘢𝘯 𝒊𝒏𝒂𝒄𝒄𝒆𝒔𝒔𝒊𝒃𝒍𝒆 𝙣𝙖𝙢𝙚 🤦‍♂️'(NamespaceA.NamespaceB.Class)
+
+// Native Types
+Method(System.String,System.Int32)
+
+// Array Types
+Method(System.String[])
+
+// Generic Types
+Method(System.Collections.Generic.List`1<System.String>)
+'Method Name'(System.Collections.Generic.List`1<System.String>) // Method name contains a space
+
+// Generic Type Parameters
+Method(!0)
+
+// Generic Method Parameters
+Method(!!0)
+
+// Generic Type with a Generic Type Parameter
+Method(System.Collections.Generic.List`1<!0>)
+```
+
+### Special Methods
+
+The CLR has some features that are implemented by way of special methods. While these methods are unlikely to be used to represent tests, the list below indicates how they should be encoded, if necessary.
+
+* Explicit Interface Implementation - methods that explicitly implement an interface should be prefixed with the interface typename. For example the method name for the explicit implementation of IEnumerable<T>.GetEnumerator would look like this; `System.Collections.Generic.IEnumerable<T>.GetEnumerator`. Note that this is only the `ManagedMethod` property. The `ManagedType` property would still include the namespace of the class on which this method is declared.
+* Constructors - constructors should be referenced using the method name `.ctor`
+* Operators - operators are a language specific feature, and are translated into methods using compiler-specific rules. Use the underlying compiler-generated method name to reference the operator. For instance, in C#, `operator+` would be represented by a method named `op_Addition`.
+* Finalizers - finalizers should be referenced using the name `Finalize`
+
+### Nested Generic Type Parameter Numbering
+
+If a generic type is nested in another generic type, then the generic arguments of the containing type are also reflected in the nested type, even if it's not reflected in the language syntax. This means that the numbering of generic parameters take into account the generic parameters of the containing type as if they are declared on the local type.
+
+```csharp
+// type A has arity 1, and one generic argument T
+// ManagedType = "A`1"
+public class A<T>
+{
+    // type B has arity 1, but two generic arguments T and X
+    // ManagedType = "A`1+B`1"
+    public class B<X> {
+
+        // ManagedMethod = "Method(!0, !1)"
+        public void Method(T t, X x) {}
+
+        // ManagedMethod = "Method(!1)"
+        public void Method(X x) {}
+
+        // ManagedMethod = "Method(!0, !1, !!0)"
+        public void Method<U>(T t, X x, U u) {}
+    }
+}
+```
+
+## Syntactic vs Semantic Test Location
+
+We are defining syntactic location as the location in the code/syntax where the method is defined that implements the test. On the other hand, semantic location is the location in the type hierarchy at which point the method becomes recognized as a valid test.
+
+There can be a situation where a test is declared on an abstract base type (syntactic), but the test is only discovered in a derived class (semantic). The question is which type should the `ManagedType` property point to? The base type, where the test code is located? Or the derived type, where the test is discovered? We will use the semantic location for the type because that is where the test adapter will find the test and it is where the test class would be instantiated. Also, there is a one to many relationship between the two. There can be many semantic test locations that each are implemented by the same base class method. If we were to standardize on using the syntactic location, we would risk having name collisions or fail to find the correct test case since there are multiple possible candidates.
+
+## Managed Tests that are Not Type/Method Based
+
+It is possible to create unit tests in managed code where tests are not necessarily based on types & methods. While this is somewhat uncommon, we need to be able to handle this situation gracefully. If a test adapter cannot provide a mapping between a testcase and a managed type and method, then it should not provide those properties. When `ManagedType` and `ManagedMethod` properties are not provided, the end-user may lose access to some features in the Test Explorer such as fast test execution by name, or source linking.
+
+## Tests Returning Multiple Results
+
+There are some situations where the number of test cases cannot be determined at discovery time. In these cases, when the tests are executed multiple results are returned for a single discovered test case.
+
+## Uniqueness
+
+The combination of `ManagedType` and `ManagedMethod` will be unique to a particular method within an assembly, but are not unique to a test case. This is due to the fact that when tests are data-driven, there can be many test cases that are executed by the same method. The test case ID is expected to be unique for every test case within an assembly. The test case ID should also be deterministic with respect to the method and its arguments. In other words, the test ID should not change given a particular method and a set of argument values (if any).
+
+## Identifier Naming Rules
+1. The first character cannot be a number (A number is a `char` belong  to Unicode category `Nd`). 
+2. It can contain letters or digits. (Unicode categories: `Lu`, `Ll`, `Lt`, `Lm`, `Lo`, `Nl` and `Nd`.)
+3. It can contain formatting characters. (Unicode categories: `Mn`, `Mc`, `Pc`, and `Cf`.)
+
+## Escaping
+If an identifier does not conform to identifier naming rules, it gets escaped. An escaped identifier always start and end with a `'`. 
+```console
+         Type: CleanNamespaceName.SecondLevel.𝐌𝐲 𝘤𝘭𝘢𝘴𝘴 with 𝘢𝘯 𝒊𝒏𝒂𝒄𝒄𝒆𝒔𝒔𝒊𝒃𝒍𝒆 𝙣𝙖𝙢𝙚 🤷‍♀️
+       Method: int Sum(int x, int y)
+  Parsed Type: CleanNamespaceName.SecondLevel.'𝐌𝐲 𝘤𝘭𝘢𝘴𝘴 with 𝘢𝘯 𝒊𝒏𝒂𝒄𝒄𝒆𝒔𝒔𝒊𝒃𝒍𝒆 𝙣𝙖𝙢𝙚 🤷‍♀️'
+Parsed Method: Sum(System.Int32,System.Int32)
+
+         Type: CleanNamespaceName.SecondLevel.Deeply wrong .namespace name.NamespaceA.Class1
+       Method: int Method with . in it(int x, int y)
+  Parsed Type: CleanNamespaceName.SecondLevel.'Deeply wrong '.'namespace name'.NamespaceA.Class1
+Parsed Method: 'Method with . in it'(System.Int32,System.Int32)
+```
+
+If a character is `'` or `\` it gets escaped to `\'` or `\\` consecutively.
+```console
+         Type: CleanNamespaceName.ClassName\Continues
+       Method: void MethodName(int x, int y)
+  Parsed Type: CleanNamespaceName.'ClassName\\Continues'
+Parsed Method: MethodName(System.Int32,System.Int32)
+```
+
+If an identifier is ending with arity, but that arity is not correct it will be escaped.
+```console
+         Type: CleanNamespaceName.ClassName
+       Method: void MethodName`1(int x, int y)
+  Parsed Type: CleanNamespaceName.ClassName
+Parsed Method: 'MethodName`1'(System.Int32,System.Int32)
+
+         Type: CleanNamespaceName.ClassName
+       Method: void MethodName<T>(int x, int y)
+  Parsed Type: CleanNamespaceName.ClassName
+Parsed Method: MethodName`1(System.Int32,System.Int32)
+```
diff --git a/docs/RFCs/0018-Skip-Default-Adapters.md b/docs/RFCs/0018-Skip-Default-Adapters.md
new file mode 100644
index 0000000000..6e198eea15
--- /dev/null
+++ b/docs/RFCs/0018-Skip-Default-Adapters.md
@@ -0,0 +1,50 @@
+# 0018 Skip Default Adapters
+
+## Summary
+This note outlines the proposed changes for skipping default adapters so that they don't take part in test discovery and execution.
+
+## Motivation
+In addition to test adapters provided via TestAdaptersPaths, test platform loads default adapters present in Extensions folder. This folder is present alongside vstest.console.exe. Even for test sources which can't be discovered/executed by default adapters, we pass those test sources to default adapters. This causes following problems:
+1. Adapters initialization cost increases.
+2. Discovery/Execution time taken by adapters increases as test source is passed to default adapters as well for discovery/execution.
+
+Example: Default adapters can't run/discover XUnit tests, still testplatform initializes default adapters and pass XUnit test assemblies to them to discover/execute.
+
+Proposed changes are focused on improving performance of test discovery/execution by allowing option to skip initialization of default adapters.
+
+## Proposed Changes
+1. Translation layer clients can skip default adapters by setting TestPlatformOptions.SkipDefaultAdapters as true.
+2. TestRequestManager passes SkipDefaultAdapters flag to TestPlatform via CreateDiscoveryRequest/CreateTestRunRequest.
+3. TestPlatform passes SkipDefaultAdapters flag to ProxyDiscoveryManager/ProxyExecutionManager via initialize method.
+4. ProxyDiscoveryManager/ProxyExecutionManager stores this value and uses it to skip default adapters to be passed to test host whenever test host extensions are initialized.
+
+## API Changes
+1. Adding of field SkipDefaultAdapters in TestPlatformOptions.
+2. TestPlatform's CreateDiscoveryRequest/CreateTestRunRequest will accept TestPlatformOptions as additional argument.
+3. **Making TestPlatform internal as it is not meant to be exposed. TestPlatform supports entry point only via command line and translation layer.**
+4. IProxyDiscoveryManager and IProxyExecutionManager's Initialize method will accept SkipDefaultAdapters as additional argument.
+
+## Performance Improvement Analysis
+Following are the performance improvements which are achieved when default adapters are skipped.
+
+**Sample**: XUnit test project
+
+| Discovery Request      | Before Changes | After Changes | Improvement |
+|------------------------|----------------|---------------|-------------|
+| Adapter Initialization | 620 ms         | 131 ms        | 489 ms      |
+| Test Discovery         | 892 ms         | 678 ms        | 214 ms      |
+
+| Execution Request      | Before Changes | After Changes | Improvement |
+|------------------------|----------------|---------------|-------------|
+| Adapter Initialization | 608 ms         | 126 ms        | 482 ms      |
+
+Test Execution is not affected by these changes as while test execution, test source is passed to the matching adapter executor URI only.
+
+## Alternatives
+**Alternative 1**: Passing SkipDefaultAdapters via runsettings
+Issues:
+SkipDefaultAdapters is something which is neither understood by test user nor by test adapter. So, it should not be part of runsettings.
+
+**Alternative 2**: Instead of passing TestPlatformOptions to CreateDiscoveryRequest/CreateTestRunRequest, pass only SkipDefaultAdapters as we don't need TestPlatformOptions in TestPlatform.cs for anything other than SkipDefaultAdapters.
+Issue:
+If in future similar field needs to be added, we need to change API of TestPlatform again to add the field.
diff --git a/docs/RFCs/0019-Disable-Appdomain-While-Running-Tests.md b/docs/RFCs/0019-Disable-Appdomain-While-Running-Tests.md
new file mode 100644
index 0000000000..a6d3dc862f
--- /dev/null
+++ b/docs/RFCs/0019-Disable-Appdomain-While-Running-Tests.md
@@ -0,0 +1,41 @@
+# 0019 Disable Appdomain while Running Tests
+
+## Summary
+The RFC outlines why
+
+1. Test adapters should honour disable app domain setting
+
+2. Running of tests with disable appdomain is important for resiliency 
+
+## Motivation
+In past we have seen customer hitting issue with AppDomain.Unload. There are two main issues with AppDomain.Unload call
+
+1. Hang in AppDomain.Unload (Tracking issue https://github.com/Microsoft/testfx/issues/225)
+
+2. AppDomain.Unload call can crash the process even if you have an exception handler in code (check next section for details)
+
+
+## Details of one such crash during Appdomain.Unload
+
+Below is one of the analysis done for one of the crash dump while calling AppDomain.Unload
+
+1.	An HWND (call it X) has a WndProc that is implemented in managed code.
+2.	The app domain that owns the WndProc code shuts down.
+3.	The OS delivers a message to window X.
+4.	The CLR tries to run the WndProc, but throws AppDomainUnloadedException when it sees that the WndProc is in a dead app domain.
+5.	The AppDomainUnloadedException propagates back into the OS window message dispatcher.
+6.	The OS window message dispatcher immediately reports the exception as unhandled (ignoring all exception handlers that might exist "further back" on the stack), which generally has the same effect as a failfast and tears down the process.
+
+
+## Proposed changes
+
+Proposed guidelines are for customers and test adapters who wants to avoid these issues.
+
+**Adapters**
+1. Test Adapter should honour ```<DisableAppDomain>``` setting inside RunConfiguration node of runsettings. Check ./docs/configure.md for information on this setting. This will ensure that adapters dont create AppDomain at all to run tests
+
+**Test platform**
+
+1. Change in test platform to merge the app.config for a test assembly when ```<DisableAppDomain>``` is set. This is to ensure test's app.config is honoured while running tests
+
+2. Make sure when ```<DisableAppDomain>``` is set, each test source have isolation. This is done by spawning testhost process for each test source.
diff --git a/docs/RFCs/0020-Improving-Logic-To-Pass-Sources-To-Adapters.md b/docs/RFCs/0020-Improving-Logic-To-Pass-Sources-To-Adapters.md
new file mode 100644
index 0000000000..85fbeaf5f9
--- /dev/null
+++ b/docs/RFCs/0020-Improving-Logic-To-Pass-Sources-To-Adapters.md
@@ -0,0 +1,53 @@
+# 0020 Improving Logic To Pass Sources To Adapters
+
+## Summary
+This note outlines the proposed solution for improving logic to pass test sources to adapter by adding assembly type filter (in addition to existing file extensions based filter).
+
+## Motivation
+Every adapter specifies file extensions supported by it. Test sources are passed to adapters based on their supported file extensions.
+
+In case when extension is an assembly (.dll or .exe), we require additional filter based on which we can pass test source to an adapter. The reason is, an assembly can be either `native` or `managed`. Its possible that an adapter supports only native or only managed or both types of assemblies.
+
+Currently even though an adapter supports one type of assembly, there is no way for it to specify the same and thus we end up giving all type of assemblies to that adapter, which might cause overhead in test discovery time.
+
+Proposed solution allows adapters to specify which assembly type is supported, and thus in result:
+1. Native assemblies will not be passed to adapters which don't support native assemblies.
+2. Managed assemblies will not be passed to adapters which don't support managed assemblies.
+
+## Proposed Solution
+1. System.ComponentModel.CategoryAttribute will be used for passing native and managed support. Adapter can specify native assemblies support by adding `[Category("native")]` in their discoverer. Similarly for managed support, `[Category("managed")]` can be specified.
+2. `[Category("native")]` and `[Category("managed")]` will be ignored if adapter doesn't support assemblies i.e. none of `[FileExtension(".dll")]` or `[FileExtension(".exe")]` is present in adapter discoverer.
+3. `Category` value other than `[Category("native")]` and `[Category("managed")]` will be ignored.
+
+## Changes required by adapters
+Adapter can use `CategoryAttribute` to specify native or managed assemblies support.
+1. For managed assemblies support, `[Category("managed")]` should be specified.
+2. For native assemblies support, `[Category("native")]` should be specified.
+3. For both native and managed assemblies support, `Category` attribute is not required.
+
+Proposed changes are optional for adapters. In case `Category` attribute is not added by adapter which supports assemblies, both native and managed assemblies are passed to it.
+
+**Example 1**: If adapter supports native .dll and .appx, then adapter discoverer has following attributes:
+```
+    [DefaultExecutorUri(<ExecutorUriValue>)]
+    [FileExtension(".dll")]
+    [FileExtension(".appx")]
+    [Category("native")]
+```
+
+**Example 2**: If adapter supports managed .dll, managed .exe and .xap, then adapter discoverer has following attributes:
+```
+    [DefaultExecutorUri(<ExecutorUriValue>)]
+    [FileExtension(".dll")]
+    [FileExtension(".exe")]
+    [FileExtension(".xap")]
+    [Category("managed")]
+```
+
+**Example 3**: If adapter supports native .dll, managed .dll, .js and .xap, then adapter has following attributes:
+```
+    [DefaultExecutorUri(<ExecutorUriValue>)]
+    [FileExtension(".dll")]
+    [FileExtension(".js")]
+    [FileExtension(".xap")]
+```
diff --git a/docs/RFCs/0021-CodeCoverageForNetCore.md b/docs/RFCs/0021-CodeCoverageForNetCore.md
new file mode 100644
index 0000000000..3d65de9715
--- /dev/null
+++ b/docs/RFCs/0021-CodeCoverageForNetCore.md
@@ -0,0 +1,92 @@
+# 0021 - Code Coverage for .NET Core
+## Summary
+This note provides an overview of the support for Code Coverage in .NET Core.
+
+## Motivation
+The asks for Code Coverage support for .NET Core are the most commented issue on vstest repo:
+- [https://github.com/Microsoft/vstest/issues/981](https://github.com/Microsoft/vstest/issues/981)
+- [https://github.com/Microsoft/vstest/issues/1312](https://github.com/Microsoft/vstest/issues/1312)
+
+NOTE:
+1. We are starting by enabling code coverage on .NET Core for Windows.
+2. The functionality will enable support for .portable/embedded PDBs.
+3. The coverage information will still be emitted as a .coverage file. Support for alternate forms of rendering will be considered separately in a subsequent effort.
+4. Support for Linux and Mac will be considered separately in a subsequent effort.
+
+## Scenarios to support
+Code coverage collection will continue to be enabled with a dedicated gesture. The following table summarizes the support that needs to be added:
+
+| Entry point | How will code coverage be enabled? | Syntax                                                               |
+|-------------|------------------------------------|----------------------------------------------------------------------|
+|dotnet test CLI              | Through a switch to condition data collection | `dotnet test --collect:"Code Coverage"`   |
+|dotnet vstest CLI            | Through a switch to condition data collection | `dotnet vstest --collect:"Code Coverage"` |
+|VS IDE                       | Through menu commands                         | `"Analyze Code Coverage for Selected Test"` context menu in the VS Test Explorer, and via `"Test/Analyze Code Coverage"` menu item. |
+|VSTS CI                      | through vstest.console (see below)            |                                           |
+|vstest.console.exe CLI       | Through a switch to condition data collection | `vstest.console.exe /Collect:"Code Coverage"` (if vstest is invoked programmatically then this conditioning will be via vstest's translation layer API). |
+
+NOTE:
+These gestures explicitly do not need the user to specify the path of the code coverage data collector. There is spike planned to ascertain feasibility. If it turns out to be infeasible the user will need to provide a path to the code coverage datacollector using `/TestAdapterPath`.
+
+## Support Matrix
+The support matrix is in terms of the following:
+- __Core Runner__ aka `dotnet test`/`dotnet vstest`/`dotnet vstest.console.dll`, built for .NET Core
+- __Desktop runner__ aka `vstest.console.exe`, and built for .NET Framework.
+
+Here is how these runners can be installed:
+- dotnet SDK installation
+- Visual Studio installation
+
+| Installation  | Runner         | Test target framework | Will code coverage be supported? |
+|---------------|----------------|-----------------------|----------------------------------|
+| dotnet SDK    | Core runner    | .NET Core             | Yes                              |
+| dotnet SDK    | Core runner    | .NET Framework        | Yes                              |
+| Visual Studio | Desktop runner | .NET Core             | Yes                              |
+| Visual Studio | Desktop runner | .NET Framework        | Yes                              |
+
+## Acquisition
+### Potential acquisition approaches
+#### Option 1: bundle code coverage binaries into the dotnet SDK.
+__Pros:__ Simple user experience. No additional installation required by the user. As long as the user has the latest .NET Core SDK, code coverage lights up.
+
+__Cons:__ dotnet SDK is cross-plat and, as mentioned, the current code coverage effort focuses on .NET Core (Windows) only. Thus code coverage binaries will get restored even on non-Windows machines, where it will not work (yet).
+
+#### Option 2: bundle code coverage binaries as a separate NuGet package, and make the test platform SDK depend on it.
+- Ship the code coverage binaries as a separate NuGet package. Repurpose the [Microsoft.CodeCoverage package](https://www.nuget.org/packages/Microsoft.CodeCoverage/) that we already ship on NuGet.
+- Make that a dependency for our [test platform SDK](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/).
+- Now during a NuGet restore that happens in any context (CI, IDE, CLI), the required code coverage binaries will get automatically installed.
+
+__Pros:__ Simple user experience. No additional installation required by the user. As long as the user's project is using the latest test platform SDK, code coverage lights up.
+
+__Cons:__ The test platform SDK is cross-plat, and as mentioned the current code coverage effort will focus on .NET Core (Windows) only. Thus code coverage binaries will get restored even on non-Windows machines, where it will not work (yet).
+
+#### Option 3: ship code coverage binaries as a separate NuGet package, that the user has to explicitly reference.
+- Ship the code coverage binaries as a separate NuGet package. Repurpose the [Microsoft.CodeCoverage package](https://www.nuget.org/packages/Microsoft.CodeCoverage/) that we already ship on NuGet, and version it at say 15.8.
+- Rename the Shims package
+	- Ship the shim functionality that we currently ship in [Microsoft.CodeCoverage package](https://www.nuget.org/packages/Microsoft.CodeCoverage/) in a new Microsoft.CodeCoverage.Shim1.0 package.
+	- Make that new shim package a dependency for our test platform SDK ([Microsoft.NET.Test.SDK](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/)) for v15.8.
+	- Now during a NuGet restore that happens in any context (CI, IDE, CLI), the required shim package will get automatically installed.
+
+__Pros:__ The test platform SDK does not need to be carry the code coverage binaries. However, even if the test platform SDK did carry the code coverage binaries, the bloat will be fairly low: ~5 MB.
+
+__Cons:__ Poor user experience. User has to explicitly add the code coverage NuGet package reference to every test project for which for which they want to collect coverage.
+
+### Chosen option
+To provide a good user experience, we will go with __Option 2__.
+
+## Work involved
+- [x] CLI support to condition code coverage collection via a switch [this is already in place]
+- [x] Spike to validate early drops of portable PDB support.
+- [x] Publish as an RFC on GitHub.
+- [x] Port the TraceDataCollector to .NET Standard.
+- [x] Spike for automatic discovery of TraceDataCollector (for the case where dotnet test is used to run tests targeting .NET Framework)
+- [x] The code coverage profiler (covrun32.dll/covrun64.dll) to support portable PDB [this will use MSDIA]
+- [x] The code coverage profiler (covrun32.dll/covrun64.dll) to support embedded PDB [this will use MSDIA]
+- [x] The code coverage Logger(CodeCoverage.exe) and code coverage profiler to be appropriately packaged so they are available to the .NET Core user
+- [x] "preview" to NuGet
+- [x] Beta to NuGet
+- [x] Blog on DevOps blog
+- [x] MSDN doc updated
+- [x] RTW to NuGet
+
+## Ship date
+Microsoft.NET.Test.Sdk v15.8 (Q3 2018).
diff --git a/docs/RFCs/0022-User-Specified-TestAdapter-Lookup.md b/docs/RFCs/0022-User-Specified-TestAdapter-Lookup.md
new file mode 100644
index 0000000000..6baba0972b
--- /dev/null
+++ b/docs/RFCs/0022-User-Specified-TestAdapter-Lookup.md
@@ -0,0 +1,61 @@
+# 0022 User Specified Test Adapter Lookup
+
+## Summary
+This note outlines the proposed changes for lookup and initialization of the test adapters, based on User input.
+
+### Current Adapter Lookup
+
+In the current model, when ever a Run/Discovery call is made from IDE to TestPlatform, the test adapter initialization happens in multiple phases, listed below
+
+* InitializeExtensions(): In this call, the IDE passes list of all adapters it finds in current session, these include adapters referenced via nuget in entire solution, & adpaters acquired via Vsix(e.g. GoogleTestAdapter, BoostAdapters, etc..)
+* TestAdapterPath: After InitializeExtensions call, TestPlatform then looks into adapters present in TestAdapterPath mentioned in RunSettings, & adds adapters to existing list.
+* TestPlatform then adds default Adapters from **Extensions** directory to current list.
+* Finally platform looks in adapters present in test source directory, & adds them to adapter list.
+
+Once adapters are gathered from all the possible locations, this list is passed to testhost process, which then loads all these adapters, & passes test source(s) to all the adapters.
+
+Following the above adapter look up logic, we pass down test sources to adapters which have no business running them, for e.g. passing a managed test source to a native adapter(GoogleTestAdapter, BoostAdapters, etc.), & vice-versa.
+
+## Motivation
+
+Select the correct adapter for the run. Most managed adapters are available in the test source directory, hence can be picked up from later for the test run.
+
+In .NetCore scenario, we only pick adapters from test Source location, this helps
+* Testplatform, as it doesn't need to probe various locations for adapters.
+* Test Framework/Adapter writers, they know where to drop adapters so they are consumed by platform.
+* Users as they don't have to specify any additional location for adapters, also they know exactly what adapter is used for the run.
+
+We want to move to the same model for FullCLR projects as well.
+
+
+## Principles
+1. The adapter referenced in the project should be used for test execution
+2. Performance should not degrade.
+3. Adapter lookup logic is consistent across runs.
+4. Adapter lookup logic should be clear and consistent for both IDE/Editor and CLI runs.
+
+
+## RoadMap
+
+1. Introduce an option(**UseSpecifedAdapterLocations**) to pick adapter from test source location & TestAdapterPath, this option would be present under Tool->Option->Test.
+2. Deprecate **Extensions** directory: From VS 15.8 platform will show a warning message to users in both CLI/IDE, for whom adapters from Extensions directory were used to discovery/run tests. We will stop picking adapters from Extensions directory from next Major VS release.
+
+### Details for lookup
+
+* Option "UseSpecifedAdapterLocations" is checked: Adapters only from source, & TestAdapterPaths would be picked.
+* Option "UseSpecifedAdapterLocations" is unchecked: Adapters will be picked from Vsix & Extensions directory as well.
+
+### Perf Improvements
+Restricting adapters via above logic also results in perf improvements, as it filters out unnecessary adapters which should be not used for a given test source, primarily for a managed test source, it filters our native adapters, as they are acquired only via Vsix, or from default **Extensions** folder.
+
+The improvement is however seen when a few tests are run, for e.g. when running two tests via RunSelected options from IDE, we see the time reduced from **0:00:01.4782809** to **0:00:01.1312048** in IDE Test Output pane
+
+## Implementation Details:
+Option "UseSpecifedAdapterLocations" is enabled:
+
+1. IDE would send “InitializeExtensions” call with empty list: This would allow platform to clear the existing cache it would have created if the option was not enabled.
+2. While sending a discovery/run request, IDE should set [SkipDefaultAdapters](https://github.com/Microsoft/vstest/blob/e48fde2ccd5c029ffe346fcf20533a556d6f2583/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs#L42) to true while sending this request, this specifies to platform to not use adapters from **Extensions** folder.
+
+Option "UseSpecifedAdapterLocations" is disabled:
+1. IDE will send “InitializeExtensions” call with list of adapters acquired from Vsix locations.
+2. IDE will send discovery/run request with [SkipDefaultAdapters](https://github.com/Microsoft/vstest/blob/e48fde2ccd5c029ffe346fcf20533a556d6f2583/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs#L42) as false.
diff --git a/docs/RFCs/0023-TestSettings-Deprecation.md b/docs/RFCs/0023-TestSettings-Deprecation.md
new file mode 100644
index 0000000000..c96810d60b
--- /dev/null
+++ b/docs/RFCs/0023-TestSettings-Deprecation.md
@@ -0,0 +1,48 @@
+# 0023 TestSettings deprecation for automated unit and functional testing scenarios.
+
+## Summary
+
+This note outlines the proposed changes to deprecate support for using .testsettings in automated unit and functional testing scenarios.
+
+## Motivation
+
+Today there are two types of files to configure test runs: *.testsettings and *.runsettings. To simplify the experience, we are planning to deprecate support for *.testsettings in automated unit and functional testing scenarios.  
+Please note that *.testsettings will continue to be supported for load test scenarios.
+
+## RoadMap
+
+The recommendation for those who are using testsettings in automated unit and functional testing scenarios, is to move to runsettings. [Here](http://aka.ms/runsettings) is a documentation of how to use runsettings to configure test runs.
+
+If you are not able to achieve all your existing configurations in testsettings via runsettings, you may try to achieve the same using the below legacy nodes that will be newly introduced in runsettings.  
+RunSettings will start supporting these features previously supported only via TestSettings. The following table specifies the new nodes and attributes, that will be introduced and how they are mapped from the existing nodes in testsettings.
+
+| TestSettings Node                                                   | RunSettings Node                                                           |
+|---------------------------------------------------------------------|----------------------------------------------------------------------------|
+|/TestSettings/Deployment                                             |/RunSettings/LegacySettings/Deployment                                      |
+|/TestSettings/Scripts                                                |/RunSettings/LegacySettings/Scripts                                         |
+|/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig           |/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig    |
+|/TestSettings/Execution/Timeouts: testTimeout                        |/RunSettings/LegacySettings/Execution/Timeouts: testTimeout                 |
+|/TestSettings/Execution/Timeouts: runTimeout                         |/RunSettings/RunConfiguration/TestSessionTimeout                            |
+|/TestSettings/Execution: parallelTestCount                           |/RunSettings/LegacySettings/Execution: parallelTestCount                    |
+|/TestSettings/Execution: hostProcessPlatform                         |/RunSettings/LegacySettings/Execution: hostProcessPlatform                  |
+|/TestSettings/Execution/Hosts                                        |/RunSettings/LegacySettings/Execution/Hosts                                 |
+|/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration     |/RunSettings/WebTestRunConfiguration                                        |
+
+## Migration
+
+A tool named SettingsMigrator will be introduced with test platform, which can be used to migrate your existing testsettings files to runsettings as follows:
+
+SettingsMigrator.exe {Full path to testsettings file or runsettings file to be migrated}  
+SettingsMigrator.exe {Full path to testsettings file or runsettings file to be migrated} {Full path to runsettings file to be created}  
+
+Examples:  
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings  
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings  
+
+The exe can usually be found in C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe depending on your Visual Studio install location.
+
+## Expected Ship Date
+
+Support for the new legacy settings in runsettings is expected to come in the next release. The deprecation of testsettings for automated unit and functional testing scenarios is expected to be in effect from the next major VS release.
diff --git a/docs/RFCs/0024-Blame-Collector-Options.md b/docs/RFCs/0024-Blame-Collector-Options.md
new file mode 100644
index 0000000000..60f7ad67f4
--- /dev/null
+++ b/docs/RFCs/0024-Blame-Collector-Options.md
@@ -0,0 +1,68 @@
+# 0024 Blame collector options
+
+## Summary
+This note outlines the proposed changes for enhancing test blame data collector options.
+
+## Motivation
+To enable a first-class option to support troubleshooting scenarios, including unattended execution in the pipeline, we need some additional options to be added to the existing test blame data collector.
+
+## Proposed Changes
+Here are the proposed changes for the test blame data collector.
+
+Test blame data collector has an optional parameter called "CollectDump" which will collect a mini dump of the test host on an unexpected exit of the process.
+Optionally one may choose to specify key value pairs to override this:
+
+CollectAlways: If you choose to collect dump even when there is no process crash. It takes values false/true. By default, a dump will be created only on crash.
+DumpType: If you choose to collect a full process dump. It takes values mini/full. By default, a mini dump will be created.
+
+### Help text
+
+Here is how the new command line help text will look like:
+
+--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false).
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full
+
+These may also be specified in the runsettings as below:
+
+```xml
+<RunSettings>
+  <LoggerRunSettings>
+    <Loggers>
+      <Logger friendlyName="blame" enabled="True" />
+    </Loggers>
+  </LoggerRunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="blame" enabled="True">
+        <Configuration>
+          <ResultsDirectory>C:\TestResults</ResultsDirectory>
+          <CollectDump CollectAlways="true" DumpType="mini" />
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
+```
+
+### Errors and warnings
+If the format of the specified options is wrong, the run will stop and throw an error:
+The options specified with /blame is incorrect, please correct it and retry.
+
+If an incorrect parameter is used with blame, it will be ignored with a warning such as:
+The blame parameter specified, 'Parameter1' is not valid. Ignoring this parameter.
+
+If an incorrect key is used with blame, it will be ignored with a warning such as:
+The blame parameter key specified 'Key1' is not valid. Ignoring this key.
+
+If an incorrect value is specified for a key, it will be ignored with a warning such as:
+The blame parameter key 'Key1' can only support values Value1/Value2. Ignoring this key.
diff --git a/docs/RFCs/0025-Test-Host-Runtime-Provider.md b/docs/RFCs/0025-Test-Host-Runtime-Provider.md
new file mode 100644
index 0000000000..6ae96400d9
--- /dev/null
+++ b/docs/RFCs/0025-Test-Host-Runtime-Provider.md
@@ -0,0 +1,35 @@
+Test Host Runtime Extensibility
+
+## Summary
+Allow the test platform to discover/launch test host provided by 3rd party. This would be done via a custom host provider, which understands the deployment and launching of test host for a specified runtime.
+
+## Motivation
+As the platforms are evolving, the test platform cannot provide the ability to deploy test on every platform. The test platform should be able to run tests on any platform, provided there is a corresponding test host that understands the platform and can provide environment for the tests to discover/run. This provides an extensibility point where the test platform discovers available tests host and based on the test run criteria delegates the responsibility to execute test to appropriate Test Host provider.
+
+## Detailed Design
+
+This design will be detailed through the following sections:
+
+	1. RunTime Provider Contract
+	2. Discovering available TestHost (Acquisition)
+	3. Choosing appropriate TestHost
+
+### RunTime Provider Contract
+A Test RunTime provider will implement [ITestRunTimeProvider](./src/Microsoft.TestPlatform.ObjectModel/Host/ITestRunTimeProvider.cs#L18)
+
+ITestRunTimeProvider provides set of API's needed for any Test RunTime provider to be able to deploy, & launch the Test RunTime.
+
+Interface [ITestHostLauncher](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs) provides an Extension point for IDE's to start TestHost process themselves. For example, in case of debugging/profiling test, the VS IDE would need to launch the TestHost itself.
+The interfaces would be part of Object Model.
+
+### Discovering TestHost
+
+Default Test Host required by the test platform are packaged along with it in a directory that always gets probed. This directory called "Extensions" resides next to vstest.console.exe. An assembly with name ending with *RuntimeProvider.dll* placed in this directory is a candidate Test Runtime provider.
+
+### Choosing the right TestHost
+
+The test platform enumerates over the host providers, providing them with current RunConfiguration. The host providers then return if they are can Launch a TestHost based on RunConfiguration. This is achieved via following implementation
+
+```
+  ITestRunTimeProvider.CanExecuteCurrentRunConfiguration():
+```
diff --git a/docs/RFCs/0026-Passing-TestPlatform-Properties-to-DataCollector.md b/docs/RFCs/0026-Passing-TestPlatform-Properties-to-DataCollector.md
new file mode 100644
index 0000000000..e354009ab0
--- /dev/null
+++ b/docs/RFCs/0026-Passing-TestPlatform-Properties-to-DataCollector.md
@@ -0,0 +1,51 @@
+# 0026 DataCollector Extensibility - Passing TestPlatform properties to DataCollector extensions 
+
+## Summary
+Passing TestPlatform properties as part of property bag to datacollectors. These properties can be used by the datacollectors for processing before test run start.
+
+## Motivation
+Data collector might need test platform properties. Example: Static code coverage data collector needs to instrument the test sources before test run start thus need list of test sources during initialization.
+
+## Design
+`SessionStartEventArgs` will contain `Properties` which are passed to the data collector in `SessionStart` event.
+Currently test platform passes following properties to the datacollector extensions :
+
+**"TestSources"** : `IEnumerable<string>`<br/>
+TestSources is an enumerable of string of all test sources that is used by the test run.
+
+The public APIs exposed in `SessionStartEventArgs` would be as given below.
+```csharp
+/// <summary>
+/// Gets session start properties enumerator
+/// </summary>
+public IEnumerator<KeyValuePair<string, object>> GetProperties()
+
+/// <summary>
+/// Gets property value
+/// </summary>
+/// <param name="property"> Property name </param>
+public T GetPropertyValue<T>(string property)
+
+/// <summary>
+/// Gets property value
+/// </summary>
+/// <param name="property"> Property name </param>
+public object GetPropertyValue(string property)
+
+```
+
+## Usage
+In the datacollector, the user can get test sources as given below.
+```csharp
+IEnumerable sources = args.GetPropertyValue<IEnumerable>("TestSources");
+```
+
+Also, all properties can be accessed via the `GetProperties` API as given.
+```csharp
+var properties = args.GetProperties();
+while (Properties.MoveNext())
+{
+    Console.WriteLine(properties.Current.Key);
+    Console.WriteLine(properties.Current.Value);
+}
+```
diff --git a/docs/RFCs/0027-Merge-Dotnet-Test-And-VsTest-Verbs.md b/docs/RFCs/0027-Merge-Dotnet-Test-And-VsTest-Verbs.md
new file mode 100644
index 0000000000..ef1fa4a6b6
--- /dev/null
+++ b/docs/RFCs/0027-Merge-Dotnet-Test-And-VsTest-Verbs.md
@@ -0,0 +1,46 @@
+# 0027 Merge dotnet test and dotnet vstest verb
+
+## Motivation
+Customer ask to merge the two dotnet verbs "test" and "vstest".
+Associated github issue: https://github.com/Microsoft/vstest/issues/1453
+
+## Goal
+User should be able to run unit and integration tests with ability to pass in the filename of either a .csproj or a .dll without having to change any other syntax of the dotnet test command.
+
+## Success criteria (as per user ask)
+1. The "dotnet test" command can be used in place of the "dotnet vstest" command.
+2. The "dotnet test" command can accept a list of dlls
+3. Using "dotnet test" and targeting a list of dlls, there is an argument for "--parallel" which will run the tests from the dlls in parallel.
+4. Using "dotnet test" and targeting a dll, the inclusion or exclusion of the "--no-build" argument will have no impact on the behavior of execution.
+
+## Issues with merging the two verbs
+
+### Irrelevant Arguments
+The arguments that are acceptable for the dotnet test for project/solution will not be applicable to the dotnet test when invoked for dlls.
+Here are possible ways to handle this:
+
+1. Ignore the arguments that are not valid.
+2. Throw a warning to the user, and continue with the execution.
+3. Throw an error, giving user an actionable message and stop the execution.
+
+Note:
+1. For option (1), ignoring the arguments seems incorrect. If the user gives certain arguments, the expectation is that the arguments get honored. Ignoring the arguments without notify the user would be incorrect. If an argument like "--no-build" is not relevant 
+
+### Same arguments but different acceptable values
+There are arguments that are accepted by both dotnet test and dotnet vstest today. We will have make sure there is parity with respect to these arguments before merge.
+One such argument is "--framework". The values accepted by the dotnet test today are different from the ones accepted by dotnet vstest. Test platform today does not understand aliases. For example, ".NETCoreApp,Version=v1.0" is valid framework while netcoreapp1.0 is not valid framework for test platform.
+
+We will have to make sure all such arguments accept the super set of these values now. We might have to add another layer to convert the values into appropriate values that the platform understands.
+
+### Different arguments but similar relevance
+There are arguments like "--runtime-identifier" which to some extent map to the "/platform" in the test platform world. 
+
+Should there be added intelligence to convert this argument ? or should this fall in invalid arguments ?
+
+## Possible Solution
+Parse the arguments given to "dotnet test" to detect dll/exe present in the arguments. If detected, call dotnet vstest.console.dll with the rest of the arguments.
+
+The above mentioned issues will need to be handled.
+
+Open questions:
+- What is the expected behavior if user gives both dlls and csproj ?
diff --git a/docs/RFCs/0028-BlameCollector-Hang-Detection.md b/docs/RFCs/0028-BlameCollector-Hang-Detection.md
new file mode 100644
index 0000000000..28bd713d7c
--- /dev/null
+++ b/docs/RFCs/0028-BlameCollector-Hang-Detection.md
@@ -0,0 +1,106 @@
+# 0028 Blame collector hang detection
+
+## Summary
+
+Blame data collector now supports a new mode meant to help detect and fix hangs in test code. This mode does not introduce any perf hit on the test run as the proc dump process is only started after the specified timeout interval has elapsed.
+
+## Motivation
+
+Whenever running tests in CI systems if a hang occurred it would generally lead to a timeout and abrupt cancelling of the CI pipeline without giving an oppurturnity for the test platform or other scripts to attach the necessary logs/dumps required to analyse the hang.
+
+## Pre-Requisites
+
+This was introduced in testplatform version 16.4.0-preview-20191007-01 (This or a higher version is required)
+
+## Working
+
+If the testhost does not send any messages to the datacollector for the specified duration then it is inferred as a hang and a dump is collected and the testhost process is killed to ensure any available attachments and logs are gracefully attached to the trx file and propagated up to the chain in case of a CI system for further analysis of the hang.
+
+## Steps to configure
+
+Set the `PROCDUMP_PATH` environment variable to the full path to the directory containing
+the `procdump.exe` and `procdump64.exe` tools.
+This path may be `%ProgramData%\chocolatey\bin\` if you use `choco install procdump` to acquire these tools.
+
+Add the required settings as shown below in the .runsettings file sample below:
+
+```xml
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="blame" enabled="True">
+        <Configuration>
+          <CollectDumpOnTestSessionHang TestTimeout="300000" DumpType="mini" />
+          <ResultsDirectory>%AGENT_TEMPDIRECTORY%</ResultsDirectory>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
+```
+
+Note: This works along with (but can also be used independent of) the existing collect dump option introduced in [RFC 0024](0024-Blame-Collector-Options.md).
+
+## Supported options
+
+|Option|Description|
+|--|--|
+`DumpType`|If you choose to collect a full process dump. It takes values `mini`/`full`. By default, a mini dump will be created.
+`TestTimeout`|Duration of inactivity in milliseconds (no test events from the test host) after which the data collector assumes a hang has occurred and proceeds to collect a dump and kill the test host process.
+`ResultsDirectory`|The path must exist, but files will not be permanently stored there. Test results ultimately go to a `TestResults` folder under the test project directory by default, or where the `--results-directory` parameter specifies.
+
+## Invoking the tests
+
+Add the `--settings path-to\test.runsettings` parameter to `dotnet test` or `vstest.console.exe`.
+Dump collection with Blame data collector is only supported on Windows for now. For non-Windows agents, omit the .runsettings file or use one that does not activate the Blame collector.
+
+Use the `--results-directory` to control where the `Sequence_<guid>.xml` and `.dmp` files are placed.
+
+## Outputs
+
+The `Sequence_guid.xml` and .dmp files will be placed under the test project source directory in a `TestResults\<guid>\` folder.
+
+Note that the test runner may report a failure to produce the dump file, such as the one shown below:
+
+```
+Data collector 'Blame' message: System.IO.FileNotFoundException: Collect dump was enabled but no dump file was generated.
+   at Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcessDumpUtility.GetDumpFile()
+   at Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector.SessionEndedHandler(Object sender, SessionEndEventArgs args).
+```
+
+But when it is followed by an attachments list that includes the dmp file such as the one shown below, the error above is incorrect and can be disregarded:
+
+```
+Attachments:
+  D:\a\_temp\7d047b47-621b-493e-9a11-ccff70000ce8\testhost.x86_7100_6e0907f276fd4b2ba0d80f1fb5332e89_hangdump.dmp
+  D:\a\_temp\7d047b47-621b-493e-9a11-ccff70000ce8\Sequence_6e0907f276fd4b2ba0d80f1fb5332e89.xml
+```
+
+## Azure Pipeline considerations
+
+The test runner can be invoked from your pipeline directly by invoking the command line runner. When using one of the Microsoft-owned tasks however, special considerations apply, as described below.
+
+### `VsTest` task usage
+
+As of now this can be used in the vstest task by making the above changes to runsettings and also enabling "advanced diagnostics" with collect dump set to "never" in the task UI if you just want hang dumps. (If both crash and hang detection needs to be enabled then set collect dump to "on abort only").
+
+### `DotNetCoreCLI` task usage
+
+The `DotNetCoreCLI` task will try to upload these files as attachments, but any dump file exceeding 75MB will fail (and full dumps are almost surely going to exceed this limit).
+
+To ensure that dmp files are collected so you can analyze them in the event of a hang/crash, you will need to author the script to capture these `TestResults` directories as artifacts.
+This will allow you to collect dumps that exceed 75MB.
+
+The `DotNetCoreCli` task adds a `--results-directory $(Agent.TempDirectory)` switch to the `dotnet test` command, so your artifact uploading script will need to search that directory for your test outputs including .dmp files.
+It actually drops *two copies* of the outputs under this directory, so upload just one copy by selecting the files directly under a `$(Agent.TempDirectory)\guid` pattern. Using Powershell this can be done like this:
+
+```ps1
+$guidRegex = '^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$'
+$filesToCapture = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse })
+```
+
+The `dotnet test` CLI will fail if two `--results-directory` switches are specified, so it is not possible to override the results directory specified by the `DotNetCoreCli` task.
+
+## Sample
+
+Review [a sample of a pull request](https://github.com/AArnott/Library.Template/pull/43) to a repo that activates crash and hang dump collection using the `DotNetCoreCLI` task.
diff --git a/docs/RFCs/0029-Debugging-External-Test-Processes.md b/docs/RFCs/0029-Debugging-External-Test-Processes.md
new file mode 100644
index 0000000000..b30f02b5d0
--- /dev/null
+++ b/docs/RFCs/0029-Debugging-External-Test-Processes.md
@@ -0,0 +1,113 @@
+# 0029 Debugging External Test Processes
+
+# Summary
+Introduce APIs to improve debugging support in Visual Studio for tests that run in an external process other than `testhost*.exe`.
+
+# Motivation
+Some test frameworks (examples include [TAEF](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) and [Python](https://docs.microsoft.com/en-us/visualstudio/python/unit-testing-python-in-visual-studio)) need to execute tests in a external process other than `testhost*.exe`. When it comes to debugging such tests in Visual Studio today, there are a couple of problems. 
+
+1. A test adapter can request to launch a child process with debugger attached by calling  [`IFrameworkHandle.LaunchProcessWithDebuggerAttached()`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs#L29) within adapter's implementation of [`ITestExecutor.RunTests()`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs#L23) (after checking that [`IRunContext.IsBeingDebugged`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs#L32) is `true`). However, there is no supported way for a test adapter to request that debugger should be attached to an **already running process**.
+
+2. Even though a test adapter can launch a child process with debugger attached as described above, today the debugger is always attached to the `testhost*.exe` process as well. This means that **Visual Studio ends up debugging two processes** instead of just the single process where tests are running.
+
+Debugging of Python tests is supported in VS today. However, the Python adapter works around the above limitations by talking to the Python extension inside VS whenever `ITestExecutor.RunTests()` is invoked (and `IRunContext.IsBeingDebugged` is `true`). The Python extension in VS then attaches VS debugger to the Python test process independently and also detaches the `testhost*.exe` process to achieve the desired behavior.
+
+While this works for Python, not all test frameworks that need to support debugging of tests running in external processes would want their users to also install a VS extension. For this reason, debugging of TAEF tests is currently not supported in VS.
+
+# Proposed Changes
+1. Introduce a new `IFrameworkHandle2` interface that inherits [`IFrameworkHandle`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs#L12) and adds the following `AttachDebuggerToProcess()` API that an adapter can invoke from within [`ITestExecutor.RunTests()`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs#L23) to attach debugger to an already running process. 
+
+```
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+{
+    /// <summary>
+    /// Handle to the framework which is passed to the test executors.
+    /// </summary>
+    public interface IFrameworkHandle2 : IFrameworkHandle
+    {
+        /// <summary>
+        /// Attach debugger to an already running process.
+        /// </summary>
+        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
+        /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+        bool AttachDebuggerToProcess(int pid);
+    }
+}
+```
+
+```
+// Adapter's implementation of ITestExecutor.RunTests()
+void ITestExecutor.RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
+{
+    ...
+
+    if (runContext.IsBeingDebugged && frameworkHandle is IFrameworkHandle2 frameworkHandle2)
+    {
+        frameworkHandle2.AttachDebuggerToProcess(testProcessId);
+    }
+
+    ...
+}
+```
+
+2. Introduce a new `ITestExecutor2` interface that inherits [`ITestExecutor`](./src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs#L15) and adds the following `ShouldAttachToTestHost()` API. Newer adapters can choose to implement `ITestExecutor2` instead of `ITestExecutor`. If implemented, `ITestExecutor.ShouldAttachToTestHost()` will be invoked before `ITestExecutor.RunTests()` is invoked for any test execution. `ITestExecutor2.ShouldAttachToTestHost()` will also be supplied the same set of inputs as `ITestExecutor.RunTests()`. This would allow adapters to control whether or not the debugger should be attached to `testhost*.exe` for the subsequent invocation of `ITestExecutor.RunTests()`.
+
+```
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+{
+    /// <summary>
+    /// Defines the test executor which provides capability to run tests.  
+    /// 
+    /// A class that implements this interface will be available for use if its containing 
+    //  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type 
+    //  in the vsix package.
+    /// </summary>
+    public interface ITestExecutor2 : ITestExecutor
+    {
+        /// <summary>
+        /// Indicates whether or not the default test host process should be attached to.
+        /// </summary>
+        /// <param name="sources">Path to test container files to look for tests in.</param>
+        /// <param name="runContext">Context to use when executing the tests.</param>
+        /// <returns><see langword="true"/> if the default test host process should be attached to, <see langword="false"/> otherwise.</returns>
+        bool ShouldAttachToTestHost(IEnumerable<string> sources, IRunContext runContext);
+
+        /// <summary>
+        /// Indicates whether or not the default test host process should be attached to.
+        /// </summary>
+        /// <param name="tests">Tests to be run.</param>
+        /// <param name="runContext">Context to use when executing the tests.</param>
+        /// <returns><see langword="true"/> if the default test host process should be attached to, <see langword="false"/> otherwise.</returns>
+        bool ShouldAttachToTestHost(IEnumerable<TestCase> tests, IRunContext runContext);
+    }
+}
+```
+
+3. Introduce a new `ITestHostLauncher2` interface that inherits [`ITestHostLauncher`](./src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs#L11) and adds the following `AttachToProcess()` API. Visual Studio's Test Explorer will supply an implementation of this interface via [`IVsTestConsoleWrapper.RunTestsWithCustomTestHost()`](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs#L120) and `ITestHostLauncher2.AttachToProcess()` will be called when  `IFrameworkHandle2.AttachDebuggerToProcess()` is called within an adapter.
+
+```
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces
+{
+    /// <summary>
+    /// Interface defining contract for custom test host implementations.
+    /// </summary>
+    public interface ITestHostLauncher2 : ITestHostLauncher
+    {
+        /// <summary>
+        /// Attach to already running custom test host process.
+        /// </summary>
+        /// <param name="pid">Process ID of the process to attach.</param>
+        /// <returns><see langword="true"/> if the attach was successful, <see langword="false"/> otherwise.</returns>
+        bool AttachToProcess(int pid);
+
+        /// <summary>
+        /// Attach to already running custom test host process.
+        /// </summary>
+        /// <param name="pid">Process ID of the process to attach.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns><see langword="true"/> if the attach was successful, <see langword="false"/> otherwise.</returns>
+        bool AttachToProcess(int pid, CancellationToken cancellationToken);
+    }
+}
+
+```
diff --git a/docs/RFCs/0029-Dotnet-Test-MultiTarget-Project-Trx-Logger.md b/docs/RFCs/0029-Dotnet-Test-MultiTarget-Project-Trx-Logger.md
new file mode 100644
index 0000000000..96b159b173
--- /dev/null
+++ b/docs/RFCs/0029-Dotnet-Test-MultiTarget-Project-Trx-Logger.md
@@ -0,0 +1,84 @@
+# 0029 Dotnet test on multi target project logging on multiple targets
+
+## Summary
+Dotnet test on a multi-target projects logs only the last target. In multi target project, the log file name provided is being overwritten and ending up in data loss. Issue: [https://github.com/microsoft/vstest/issues/1603](https://github.com/microsoft/vstest/issues/1603)
+
+Example: `dotnet test "--logger:trx;LogFileName=results.trx"` on a multi-target project (e.g. `<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>` in the .csproj) causes the logger to only log on the last target.
+
+## Design
+
+### Option 1: Separate folders for separate targets
+
+There are 2 ways to specify the LogFileName.  
+&nbsp;&nbsp;&nbsp;&nbsp;a. Relative filename: `dotnet test "--logger:trx;LogFileName=results.trx"`  
+&nbsp;&nbsp;&nbsp;&nbsp;b. Absolute path: `dotnet test "--logger:trx;LogFileName=d:/results.trx"`  
+
+In case of (a), the trx is generated in the test results directory of the multi target project.
+
+Solution: Generate different target trx files in separate folders inside the test results directory.  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/net45/results.trx  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/netcoreapp2.0/results.trx  
+
+For case (b), the trx file will still be overwritten with a warning.
+
+### Option 2: Specify LogFilePrefix Parameter with timestamp appended
+
+Introduce a LogFilePrefix parameter in trx logger. Example : `dotnet test "--logger:trx;LogFilePrefix=results"`  
+With this, if we want all trx files in a multi target project, instead of specifying a logFileName, we provide a LogFilePrefix.  
+The trx file name prefix is appended with time stamp to generate multi target trx files.  
+
+For example : `dotnet test "--logger:trx;LogFilePrefix=results"` will generate  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_2018-12-24_14-01-07-176.trx  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_2018-12-24_14-01-08-111.trx  
+
+The behavior of  `dotnet test "--logger:trx;LogFileName=results.trx"` will remain same with overwriting being done, and warning to switch to LogFilePrefix.
+
+### Option 3: Specify LogFilePrefix Parameter with target framework appended
+
+Introduce a LogFilePrefix parameter in trx logger. Example : `dotnet test "--logger:trx;LogFilePrefix=results"`  
+With this, if we want all trx files in a multi target project, instead of specifying a logFileName, we provide a LogFilePrefix.  
+The trx file name prefix is appended with target framework to generate multi target trx files.  
+
+For example : `dotnet test "--logger:trx;LogFilePrefix=results"` will generate  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_net451.trx  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_netcoreapp20.trx  
+
+The behavior of  `dotnet test "--logger:trx;LogFileName=results.trx"` will remain same with overwriting being done, and warning to switch to LogFilePrefix.  
+
+When ResultsDirectory is specified, and the solution contains multiple projects with same target,  
+For example,  `dotnet test "--logger:trx;LogFilePrefix=results"`  
+ResultsDirectory: C:\temp, and the solution contains   
+&nbsp;&nbsp;&nbsp;&nbsp; P1 (target net451)   
+&nbsp;&nbsp;&nbsp;&nbsp; P2 (target net451)   
+
+This case will overrride different project results as trx filename will be `C:\temp\results_net451.trx` in both cases.  
+
+### Option 4: Specify LogFilePrefix Parameter with target framework and timestamp appended
+
+Introduce a LogFilePrefix parameter in trx logger. Example : `dotnet test "--logger:trx;LogFilePrefix=results"`  
+With this, if we want all trx files in a multi target project, instead of specifying a logFileName, we provide a LogFilePrefix.  
+The trx file name prefix is appended with target framework to generate multi target trx files.  
+
+For example : `dotnet test "--logger:trx;LogFilePrefix=results"` will generate  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_net451_2018_12-24_14-01-07-176.trx  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_netcoreapp20_2018-12-24_14-01-08-111.trx  
+
+When ResultsDirectory is specified, and the solution contains multiple projects with same target,  
+For example,  `dotnet test "--logger:trx;LogFilePrefix=results"`  
+ResultsDirectory: C:\temp, and the solution contains
+&nbsp;&nbsp;&nbsp;&nbsp; P1 (target net451)  
+&nbsp;&nbsp;&nbsp;&nbsp; P2 (target net451)  
+
+This case will not override results as along with framework, we will append the timestamp.  
+&nbsp;&nbsp;&nbsp;&nbsp; C:\temp\results_net451_2018_12-24_14-01-07-176.trx  
+&nbsp;&nbsp;&nbsp;&nbsp; C:\temp\results_net451_2018-12-24_14-01-08-111.trx  
+
+## Approach Taken
+
+Option 4 : This generates unique test results for different frameworks and different projects. 
+Introduced a LogFilePrefix parameter in trx logger. 
+Example : `dotnet test "--logger:trx;LogFilePrefix=results"`. 
+ 
+For example : `dotnet test "--logger:trx;LogFilePrefix=results"` will generate  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_net451_2018_12-24_14-01-07-176.trx  
+&nbsp;&nbsp;&nbsp;&nbsp;UnitTestProject/TestResults/results_netcoreapp20_2018-12-24_14-01-08-111.trx 
diff --git a/docs/RFCs/0029-Passing-TestRunParameters-via-CLI.md b/docs/RFCs/0029-Passing-TestRunParameters-via-CLI.md
new file mode 100644
index 0000000000..c175d84c74
--- /dev/null
+++ b/docs/RFCs/0029-Passing-TestRunParameters-via-CLI.md
@@ -0,0 +1,47 @@
+# Passing test run parameters via cli
+
+## Summary
+Test run parameters given via cli are passed to runsettings.
+
+## Motivation
+Every time editing or creating one test run parameter in run settings at a time is a tedious task. So passing test run parameters via cli 
+removes burden of editing run settings every time.
+
+## Syntax
+
+`vstest.console.exe  abc.dll -- TestRunParameters.Parameter(name=\"YourParameterName\",value=\"YourParameterValue\")`
+
+### Argument description 
+` -- TestRunParameters.Parameter(name=\"YourParamterName\",value=\"YourParameterValue\")` <br>
+
+The above argument reflects the following change in runsettings. 
+
+```xml
+<RunSettings>
+    <RunConfiguration>
+        <TestRunParameters>
+          <Parameter name="YourParameterName",value="YourParameterValue"/>
+        </TestRunParameters>
+    </RunConfiguration>
+</RunSettings>
+```
+
+<ul>
+<li>TestRunParameters as Node</li>
+<li>Parameter as child element of TestRunParamter node</li>
+<li>YourParamterName as Attribute name </li>
+<li>YourParameterValue as Attribute value </li>
+</ul>
+
+## Design
+The arguments are parsed and `attribute name` and `attribute value` are fetched from the `TestRunParameter` argument. Then, an xml element is overrode if exists with `attribute name` or created with `'Parameter'` as it's name and with attributes that are obtained by the above step. Finally, we get `TestRunParameter` node if exists or created and append the newly created xml element to list of child nodes.
+
+## Allowed Characters
+|  Attributes | Vaild Characters |
+| -------------- | -------------------- |
+| name         | <ul><li>Alphabets</li><li>Digits</li><li>_</li> |
+| value    | <ul><li>Alphabets</li><li>Digits</li><li>Special Charcters</li></ul> |
+
+### Note
+Some special characters like &,<,> are converted to their escaped form and stored in runsettings. <br>
+For more info on escaped strings refer [this](https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/rwlp_xml_escape.html).
diff --git a/docs/RFCs/0030-Specify-Environment-Variables-In-Runsettings.md b/docs/RFCs/0030-Specify-Environment-Variables-In-Runsettings.md
new file mode 100644
index 0000000000..d47604da83
--- /dev/null
+++ b/docs/RFCs/0030-Specify-Environment-Variables-In-Runsettings.md
@@ -0,0 +1,32 @@
+# 0030 Specifying Environment Variables In RunSettings File
+
+## Summary
+Specifying environment variables in the runsettings file. The environment variables can be set which can directly interact with the test host.
+
+## Motivation
+Specifying environment variables in the runsettings file is necessary to support non-trivial projects that require settings env vars like DOTNET_ROOT. These variables are set while spawning the test host process, thus will be available in the host.
+
+## Usage
+The runsettings contains a "EnvironmentVariables" node in the RunConfiguration section.
+The different environment variables can be specified as element name and it's value.
+Below is a sample runsettings for passing environment variables.
+
+```csharp
+
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File name extension must be .runsettings -->
+<RunSettings>
+  <RunConfiguration>
+    <EnvironmentVariables>
+      <!-- List of environment variables we want to set-->
+      <DOTNET_ROOT>C:\ProgramFiles\dotnet</DOTNET_ROOT>
+      <SDK_PATH>C:\Codebase\Sdk</SDK_PATH>
+    </EnvironmentVariables>
+  </RunConfiguration>
+</RunSettings>
+
+
+```
+Since these environment variables should always be set when the test host is started, the tests should always run in a separate process.
+For this, the `/InIsolation` flag will be set when there are environment variables so that the test host is always invoked.
+
diff --git a/docs/RFCs/0031-Test-Run-Attachments-Processing.md b/docs/RFCs/0031-Test-Run-Attachments-Processing.md
new file mode 100644
index 0000000000..e8ea9637c3
--- /dev/null
+++ b/docs/RFCs/0031-Test-Run-Attachments-Processing.md
@@ -0,0 +1,265 @@
+# 0031 Test Run Attachments Processing
+
+# Summary
+This document details a data collector extensibility point to reprocess (combine/merge) attachments obtained across test executions in both design mode and commandline scenarios.
+
+# Motivation
+Today when Test Platform executes tests in parallel only code coverage reports are merged (data collector attachments with uri: `datacollector://microsoft/CodeCoverage/2.0`). For other data collector attachments reprocessing is skipped and all of them are returned by Test Platform.
+
+The [dotnet test](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test) command is used to execute unit tests in a given solution. The `dotnet test` command builds the solution and runs a test host application for each test project in the solution. However, currently there is no way to reprocess(combine/merge) data collector attachments associated with each project execution. Code coverage reports are not merged.
+
+When `Run All Tests` is performed in VS, tests for projects can be executed separately based on target platform/target framework amongst other criteria. In this case also combining/merging of data collector attachments is not performed (e.g. code overage reports are not merged). `Analyze Code Coverage for All Tests` is showing coverage report for only some test projects in the run.
+
+# Proposed Changes
+
+Introduce a new `IDataCollectorAttachmentProcessor` interface which can be implemented by Test Platform extensions and provide custom logic to reprocess(combine/merge) data collector attachments. Test Platform will invoke `ProcessAttachmentSetsAsync` only if at least 1 data collector attachment related to processor (through `GetExtensionUris`) is created by test execution.
+
+```cs
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+{
+    /// <summary>
+    /// Interface for data collectors add-ins that choose to reprocess generated attachments
+    /// </summary>
+    public interface IDataCollectorAttachmentProcessor
+    {
+        /// <summary>
+        /// Gets the attachments Uris, which are handled by attachment processor
+        /// </summary>
+        IEnumerable<Uri> GetExtensionUris();
+
+        /// <summary>
+        /// Indicates whether attachment processor is supporting incremental processing of attachments
+        /// </summary>
+        bool SupportsIncrementalProcessing   { get; }
+
+        /// <summary>
+        /// Reprocess attachments generated by independent test executions
+        /// </summary>
+        /// <param name="configurationElement">Configuration of the attachment processor. Will be the same as the data collector that registers it.</param>
+        /// <param name="attachments">Attachments to be processed</param>
+        /// <param name="progressReporter">Progress reporter. Accepts integers from 0 to 100</param>
+        /// <param name="logger">Message logger</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Attachments after reprocessing</returns>
+        Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken);
+    }
+}
+```
+
+Method `GetExtensionUris` should provide all Uris for data collector attachments which are handled by current attachment processor. Test platform will provide to attachment processor only data collector attachments with such Uris. Result of method `ProcessAttachmentSetsAsync` should contain only data collector attachments with such Uris.
+
+`SupportsIncrementalProcessing` should indicate if attachment processor is supporting incremental processing of attachments. It means that `ProcessAttachmentSetsAsync` should be [associative](https://en.wikipedia.org/wiki/Associative_property).
+
+If `SupportsIncrementalProcessing` is `True` Test Platform may try to speed up whole process by reprocessing data collector attachments as soon as possible when any two test executions are done. For example let's assume we have 5 test executions which are generating 5 data collector attachments: `a1`, `a2`, `a3`, `a4` and `a5`. Test platform could perform invocations:
+* `var result1 = await ProcessAttachmentSetsAsync([a1, a2, a3], ...);` when first 3 executions are done
+* `var result2 = await ProcessAttachmentSetsAsync(result1.Concat([a4]), ...);` when 4th execution is done
+* `var finalResult = await ProcessAttachmentSetsAsync(result2.Concat([a5]), ...);` when last test execution is done
+
+If `SupportsIncrementalProcessing` is `False` then Test Platform will wait for all test executions to finish and call `ProcessAttachmentSetsAsync` only once:
+* `var finalResult = await ProcessAttachmentSetsAsync([a1, a2, a3, a4, a5], ...);`
+
+**Current implementation doesn't support non incremental processing so `SupportsIncrementalProcessing` should be `True`.**
+
+
+
+2. Introduce a new `ProcessTestRunAttachmentsAsync` method in [IVsTestConsoleWrapper](./src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs) interface:
+
+```cs
+/// <summary>
+/// Gets back all attachments to test platform for additional processing (for example merging).
+/// </summary>
+/// 
+/// <param name="attachments">Collection of attachments.</param>
+/// <param name="invokedDataCollectors">Collection of invoked data collectors.</param>
+/// <param name="processingSettings">XML processing settings.</param>
+/// <param name="isLastBatch">
+/// Indicates that all test executions are done and all data is provided.
+/// </param>
+/// <param name="collectMetrics">Enables metrics collection (used for telemetry).</param>
+/// <param name="eventsHandler">Event handler to receive session complete event.</param>
+/// <param name="cancellationToken">Cancellation token.</param>
+Task ProcessTestRunAttachmentsAsync(
+    IEnumerable<AttachmentSet> attachments,
+    IEnumerable<InvokedDataCollector> invokedDataCollectors,
+    string processingSettings,
+    bool isLastBatch,
+    bool collectMetrics,
+    ITestRunAttachmentsProcessingEventsHandler eventsHandler,
+    CancellationToken cancellationToken);
+```
+
+Method can be used to start a new test run attachments processing, which is reprocessing all data collector attachments passed as first argument using all available attachment processors. When `collectMetrics` is set to `true` Test Platform will provide information about initial number of attachments, final number of attachments, time taken in seconds to process all data collector attachments.
+
+3. Introduce a new `ITestRunAttachmentsProcessingEventsHandler` interface:
+```cs
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+{
+    /// <summary>
+    /// Interface contract for handling test run attachments processing events
+    /// </summary>
+    public interface ITestRunAttachmentsProcessingEventsHandler : ITestMessageEventHandler
+    {
+        /// <summary>
+        /// Dispatch TestRunAttachmentsProcessingComplete event to listeners.
+        /// </summary>
+        /// <param name="attachmentsProcessingCompleteEventArgs">AttachmentsProcessing Complete event args.</param>
+        /// <param name="attachments">Last set of processed attachment sets.</param>
+        void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk);
+
+        /// <summary>
+        /// Dispatch ProcessedAttachmentsChunk event to listeners.
+        /// </summary>
+        /// <param name="attachments">Processed attachment sets.</param>
+        void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments);
+
+        /// <summary>
+        /// Dispatch TestRunAttachmentsProcessingProgress event to listeners.
+        /// </summary>
+        /// <param name="AttachmentsProcessingProgressEventArgs">AttachmentsProcessing Progress event args.</param>
+        void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs);
+    }
+}
+```
+Interface provides callbacks from test run attachments processing. For every such process `HandleTestRunAttachmentsProcessingComplete` will be called once and will provide last chunk or all data collector attachments. During attachments processing `HandleProcessedAttachmentsChunk` can be invoked several times providing data collector attachments that are already processed. Method `HandleTestRunAttachmentsProcessingProgress` will be invoked every time when `progressReporter` is used by attachment processor and will provide information about current attachment processor: progress, uris and index of it. Additionally event will contain also number of attachment processors.
+
+
+4. Use above logic to reprocess data collector attachments for parallel test executions and VS scenarios (e.g. `Run All Tests`, `Analyze Code Coverage for All Tests`). In case of `Analyze Code Coverage for All Tests` VS will use `vstest.console` in a variation of design mode and merge all code coverage reports. VS will show full code coverage report for all test projects.
+
+5. When [dotnet test](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test) command is used to execute unit tests in a given solution, attachments will also be reprocessed. Details regarding this process will be provided in separate RFC.
+
+# Additional classes
+
+1. `TestRunAttachmentsProcessingCompleteEventArgs` used by ITestRunAttachmentsProcessingEventsHandler:
+
+```cs
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+{
+    [DataContract]
+    public class TestRunAttachmentsProcessingCompleteEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="isCanceled">Specifies whether the attachments processing is canceled.</param>
+        /// <param name="error">Specifies the error encountered during the execution of the attachments processing.</param>
+        public TestRunAttachmentsProcessingCompleteEventArgs(bool isCanceled, Exception error)
+        {
+            this.IsCanceled = isCanceled;
+            this.Error = error;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the attachments processing is canceled or not.
+        /// </summary>
+        [DataMember]
+        public bool IsCanceled { get; private set; }
+
+        /// <summary>
+        /// Gets the error encountered during the attachments processing of the test runs. Null if there is no error.
+        /// </summary>
+        [DataMember]
+        public Exception Error { get; private set; }
+
+        /// <summary>
+        /// Get or Sets the Metrics (used for telemetry)
+        /// </summary>
+        [DataMember]
+        public IDictionary<string, object> Metrics { get; set; }
+    }
+}
+```
+
+2. `TestRunAttachmentsProcessingProgressEventArgs` used by ITestRunAttachmentsProcessingEventsHandler:
+
+```cs
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+{
+    [DataContract]
+    public class TestRunAttachmentsProcessingProgressEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="currentAttachmentProcessorIndex">Specifies current attachment processor index.</param>
+        /// <param name="currentAttachmentProcessorUris">Specifies current processor Uris.</param>
+        /// <param name="currentAttachmentProcessorProgress">Specifies current processor progress.</param>
+        /// <param name="attachmentProcessorsCount">Specifies the overall number of processors.</param>
+        public TestRunAttachmentsProcessingProgressEventArgs(long currentAttachmentProcessorIndex, ICollection<Uri> currentAttachmentProcessorUris, long currentAttachmentProcessorProgress, long attachmentProcessorsCount)
+        {
+            CurrentAttachmentProcessorIndex = currentAttachmentProcessorIndex;
+            CurrentAttachmentProcessorUris = currentAttachmentProcessorUris;
+            CurrentAttachmentProcessorProgress = currentAttachmentProcessorProgress;
+            AttachmentProcessorsCount = attachmentProcessorsCount;
+        }
+
+        /// <summary>
+        /// Gets a current attachment processor index.
+        /// </summary>
+        [DataMember]
+        public long CurrentAttachmentProcessorIndex { get; private set; }
+
+        /// <summary>
+        /// Gets a current attachment processor URI.
+        /// </summary>
+        [DataMember]
+        public ICollection<Uri> CurrentAttachmentProcessorUris { get; private set; }
+
+        /// <summary>
+        /// Gets a current attachment processor progress.
+        /// </summary>
+        [DataMember]
+        public long CurrentAttachmentProcessorProgress { get; private set; }
+
+        /// <summary>
+        /// Gets the overall number of attachment processors.
+        /// </summary>
+        [DataMember]
+        public long AttachmentProcessorsCount { get; private set; }
+    }
+}
+```   
+
+# How to register an `IDataCollectorAttachmentProcessor`
+Test platform needs to know where to find the attachment processor for a specific data collector.
+For this purpose a new attribute is provided:
+```cs
+/// <summary>
+/// Registers an attachment processor for a data collector.
+/// </summary>
+public class DataCollectorAttachmentProcessorAttribute : Attribute
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectorAttachmentProcessorAttribute"/> class.
+    /// </summary>
+    /// <param name="type">
+    /// The type of the attachement data processor.
+    /// </param>
+    public DataCollectorAttachmentProcessorAttribute(Type type)
+    {
+        Type = type;
+    }
+
+    /// <summary>
+    /// Gets the data collector type uri.
+    /// </summary>
+    public Type Type { get; private set; }
+}
+```
+The usage of this attribute is the same as the default attribute used to register a data collector to the platform:
+```cs
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+...
+[DataCollectorTypeUri("datacollector://Microsoft/MyDataCollector/1.0")]
+[DataCollectorFriendlyName("MyDataCollector")]
+[DataCollectorAttachmentProcessor(typeof(MyDataCollectorArtifactPostProcessor))]
+public class MyDataCollector : DataCollector
+{
+    ...
+}
+public class MyDataCollectorArtifactPostProcessor : IDataCollectorAttachmentProcessor
+{
+    ...
+}    
+```
+At runtime if the `Type` registered as attachment processor doesn't implement the `IDataCollectorAttachmentProcessor` will be silently ignored(check the logs to verify the reason).
diff --git a/docs/RFCs/0032- Extensions versioning attribute.md b/docs/RFCs/0032- Extensions versioning attribute.md
new file mode 100644
index 0000000000..7d4b15d867
--- /dev/null
+++ b/docs/RFCs/0032- Extensions versioning attribute.md	
@@ -0,0 +1,101 @@
+# 0032 Extensions versioning attribute
+
+# Summary
+This document explain how to use the `TestExtensionTypesAttribute` and `TestExtensionTypesV2Attribute` to handle the versioning for every platform extension.
+
+# Motivation
+The test platform offers many extensions points like custom test adapters, test execution providers, data collectors, etc...   
+The main problem with the extensions is that the platform is in continuous evolution. Therefore, we need to keep the back-compatibility; we want to load new extensions in the old test platform implementation and vice versa.
+
+The logic used to load the extensions if inside the [TestPluginDiscoverer.cs](./src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs) file.  
+
+# How to use `TestExtensionTypesAttribute` and `TestExtensionTypesV2Attribute`
+
+By design, the `TestPluginDiscoverer` receives a list of all files to search for some specific extensions(for instance, search for a class that implements a particular interface). However, the list of files is out of the scope of this document and depends on the running context(VS, SDK, stand-alone, etc...) and some user-defined settings. 
+
+The discovery algorithm is:  
+1) `TestPluginDiscoverer` loads the assemblies using the `Assembly.Load(new AssemblyName(assemblyName));` where the `assemblyName` is the file name without extension `Path.GetFileNameWithoutExtension(file);`.
+
+2) As the next step, the `TestPluginDiscoverer` loads every `Type` inside the assembly and tries to find out if it's compatible with the extension requested using the `Type.IsAssignableFrom(Type)` api.
+
+3) The final step of `TestPluginDiscoverer` is to check if the extension is already loaded. It checks if the plugin `IdentifierData` is already present in the already loaded extension list.
+
+Due to the design explained above, the `TestPluginDiscoverer` suffers from some defects:
+
+1) The order of files **matters**; use the file name and load with `Assembly.Load(new AssemblyName(assemblyName));` means that if we have more than one file with the exact implementation but different versions, only the first one will be loaded; all other loads will be silently skipped because, for the runtime, the "same" `Assembly` is already loaded.
+
+2) The order of types inside the assembly **matters** because we're using the `assembly.GetTypes().Where(type => type.GetTypeInfo().IsClass && !type.GetTypeInfo().IsAbstract)` api. So if we have 2 types that are implementing the same extension only the first one will be loaded.  
+
+3) If we have a lot of types inside the loaded assembly, the perf is not so great because we're checking all types.  
+
+4) If we ship new public types used by the extensions, we'll fail to load these in the old shipped test platform because that type doesn't exist, and the runtime will raise a `TypeLoadException.`
+
+An attempt was made to fix the 2nd and 3rd defects above, introducing an attribute that allows the user to "register" every extension shipped inside the assembly.   
+***To avoid compatibility issues, we don't ship the attribute type as a public type, but we search for a "specific" attribute type implementation signature/shape.***
+
+The attribute signature/shape is:
+```cs
+[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+internal sealed class TestExtensionTypesAttribute : Attribute
+{
+    public TestExtensionTypesAttribute(params Type[] types)
+    {
+        this.Types = types;
+    }
+
+    public Type[] Types { get; }
+}
+```
+Suppose to have an extension called `MyExtension` and you want to avoid the two issues above you can register your type in this way:
+```cs
+[assembly: TestExtensionTypes(typeof(MyExtension))]
+```
+
+Anyway, this first attempt doesn't solve the 1st and 4th issues.  
+To fix the ***versioning*** issue, we decided to ship another attribute that can be used with the first one compatible with old test platform versions. 
+The new attribute address some more issue:
+1) **versioning**: we can specify the extension version. At runtime, the `TestPluginDiscoverer` will load the extensions using the version number(a simple int), **from the higher to the lower in desc order.**  
+2) **avoid the `TypeLoadException`**: `TestPluginDiscoverer` will try to load every registered extension using the `MetadataReader` type, once it find an extension it tries to load the type using `Assembly.GetType(string)` api. In case of an issue with the loading, it will skip the extension.   
+The attribute signature/shape is:
+```cs
+[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = true)]
+internal sealed class TestExtensionTypesV2Attribute : Attribute
+{
+    public string ExtensionType { get; }
+    public string ExtensionIdentifier { get; }
+    public Type ExtensionImplementation { get; }
+    public int Version { get; }
+
+    public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation, int version)
+    {
+        ExtensionType = extensionType;
+        ExtensionIdentifier = extensionIdentifier;
+        ExtensionImplementation = extensionImplementation;
+        Version = version;
+    }
+}
+```
+Suppose to have a data collector extension called `MyDataCollectorV1` using some shipped extension. 
+After some time, you want to ship a newer version that will use a new type shipped only in the newer test platform object model. So you cannot use the current version of your extension because it won't work in the old test platform(it will silently fail with a `TypeLoadException`).  
+In this case, you can register your time specifying the new version of your extension:
+```cs
+[assembly: TestExtensionTypes(typeof(MyDataCollectorV1))]
+[assembly: TestExtensionTypesV2("MyDataCollector", "datacollector://Microsoft/MyLocalTest/1.0", typeof(MyDataCollectorV1), 1)]
+[assembly: TestExtensionTypesV2("MyDataCollector", "datacollector://Microsoft/MyLocalTest/1.0", typeof(MyDataCollectorV2), 2)]
+```
+With the configuration above, the `TestPluginDiscoverer` will try to load using this order:   
+1) Search for every attribute with the expected shape of `TestExtensionTypesV2`. `TestExtensionTypesV2` will use **the binary of the extension file** and won't use the `Assembly.Load(new AssemblyName(assemblyName));` api. It means that we can search for same extension in different files.
+2) Put them in order by `Version` (first `MyDataCollectorV2`, second `MyDataCollectorV1`)
+3) Try to create the type(first `MyDataCollectorV2`, second `MyDataCollectorV1`) and put these in the candidate extension types list.
+4) Search for every attribute with the expected shape of `TestExtensionTypes` using the default order `assembly.GetCustomAttributes` and put these in the candidate extension types list.
+
+If we suppose to be able to load all types at the end of the discovery, we'll have a candidate extension types list like:
+
+`MyDataCollectorV2`   
+`MyDataCollectorV1`  
+`MyDataCollectorV1`  
+
+Now the `TestPluginDiscoverer` will go on with the usual `Type.IsAssignableFrom(Type)` check. It will load `MyDataCollectorV2`, skipping all the other extensions because we already loaded the plugin with the same `IdentifierData.`
+
+If we try to load the same extension in an old test platform, we will be able to load only using the `TestExtensionTypes` the `MyDataCollectorV1` version. 
+
diff --git a/docs/RFCs/0033-Hierarchy-TestCase-Property.md b/docs/RFCs/0033-Hierarchy-TestCase-Property.md
new file mode 100644
index 0000000000..6921a361ca
--- /dev/null
+++ b/docs/RFCs/0033-Hierarchy-TestCase-Property.md
@@ -0,0 +1,33 @@
+# 0033 Hierarchy TestCase Property
+
+## Summary
+This document standardizes an additional `Hierarchy` property on TestCase to support more flexible visual display of tests in the Visual Studio Test Explorer.
+
+## Overview
+The `ManagedType` and `ManagedMethod` properties [have been defined](0017-Managed-TestCase-Properties.md) as a way of deterministically identifying the type and method to which a test case belongs (in managed code). However, the legacy `FullyQualifiedName` property is still required to deduce a `Namespace`, `Classname` and `TestGroup` for display in the Test Explorer hierarchy. When the Test Explorer added a hierarchy for easier grouping and navigation of tests, there was no specified way for a TestCase to provide those values so they were heuristically derived from `FullyQualifiedName`. 
+
+This document specifies a way for the TestCase to provide these display values directly to the test explorer, granting flexibility and control back to the test adapter.
+
+## Helper Library
+
+[Microsoft.TestPlatform.AdapterUtilities](https://www.nuget.org/packages/Microsoft.TestPlatform.AdapterUtilities) is a helper library created to make it easy to create values for `ManagedType` and `ManagedMethod` that meet this spec. Use `ManagedNameHelper.GetManagedName()` to create a `ManagedType`/`ManagedMethod` pair from a reflected type. Also `ManagedNameParser.ParseManagedTypeName` and `ManagedNameParser.ParseManagedMethodName` can parse and validate an existing `ManagedType` or `ManagedMethod`
+
+## Specification
+
+TestCases for managed code may include a string array (string[]) valued property named `Hierarchy`. The specification below outlines the requirements for the contents of the property.
+
+### `Hierarchy` Property
+
+The `Hierarchy` test case property represents the text strings used to display the test in the Visual Studio Test Explorer window. 
+
+* The property must be an array of strings with 4 elements. If the property is null, missing or doesn't have 4 elements then it is is ignored as invalid.
+* The element values are arranged as `[Container, Namespace, Class, TestGroup]`, Each TestCase is coalesced into a tree using the following order from the root. `Container`, `Namespace`, `Class`, `TestGroup`, `DisplayName`. 
+* `Container` usually represents the project name or the assembly name. For C# tests, if this property is set as a `null` or empty string ("") then the project name will be used by VS.
+* `Namespace` represents the namespace containing the test suite (or a suitable semantic equivalent). If there aren't any equivalent, or the class doesn't belong to a namespace this can be `null` or empty string ("").
+* `Class` normally represents the display name of the test suite. For example, in C# this is typically the name of class containing the tests.
+* `TestGroup` typically represents the method that implements a particular test or set of tests (if data-driven). If a test is not data-driven, then the TestGroup could be the same as the `DisplayName`. By data-driven, we mean tests that are run repeatedly with different sets of data (i.e. Theory tests in XUnit/NUnit). A test case should be generated for each test/data combination, where the `TestGroup` is set to the name of the test method (or similar) and the `DisplayName` includes a representation of the data used to execute the test in order to distinguish them in the test explorer UI.
+   * `TestGroup` can be `null`, or empty string (""). 
+   * If `TestGroup` is the same for all tests under a particular `Class` or empty, then the `TestGroup` level is omitted from the hierarchy. 
+* `DisplayName` is the name of a particular single test case. For data-driven tests, the `DisplayName` should include a representation of the parameters in order to distinguish the unique test case to the end user. If the test case is not data-driven, then there is no need to include the parameters as the method name would likely be sufficient.
+   * If the display name for a test is not unique under a given hierarchy, tests will not be executed or discovered correctly, and depending on the test framework test discovery could fail. For the purposes of uniqueness `Namespace` and `TestGroup` elements with `null` and empty string ("") values are considered equal.
+* In some cases `ClassName`, `TestGroup` and `Method` could represent generic methods or types (for instance, tests written in C# or C++). In that case, if possible, the text should reflect the "closed" or instantiated typename. For example when displaying the generic type `List<>`, the closed form (e.g. `List<String>, List<MyType>`) should be used. The generic type `List<>` is referenced in metadata as ``List`1`` and in the code as `List<T>`; both of these are "open" forms of the type because they do not specify the type of `T` and could cause confusion.
diff --git a/docs/RFCs/Images/TestPlatform.vsdx b/docs/RFCs/Images/TestPlatform.vsdx
new file mode 100644
index 0000000000..5a9cc65b1f
Binary files /dev/null and b/docs/RFCs/Images/TestPlatform.vsdx differ
diff --git a/docs/RFCs/Images/datacollection-custom.png b/docs/RFCs/Images/datacollection-custom.png
new file mode 100644
index 0000000000..2c423b2708
Binary files /dev/null and b/docs/RFCs/Images/datacollection-custom.png differ
diff --git a/docs/RFCs/Images/datacollection-custom.vsdx b/docs/RFCs/Images/datacollection-custom.vsdx
new file mode 100644
index 0000000000..78e4c9ad72
Binary files /dev/null and b/docs/RFCs/Images/datacollection-custom.vsdx differ
diff --git a/docs/RFCs/Images/datacollection.png b/docs/RFCs/Images/datacollection.png
new file mode 100644
index 0000000000..7fa1cfb1ac
Binary files /dev/null and b/docs/RFCs/Images/datacollection.png differ
diff --git a/docs/RFCs/Images/datacollection.vsdx b/docs/RFCs/Images/datacollection.vsdx
new file mode 100644
index 0000000000..f85a8ab7d6
Binary files /dev/null and b/docs/RFCs/Images/datacollection.vsdx differ
diff --git a/docs/RFCs/Images/dotnet-test-protocol-v2-discovery.png b/docs/RFCs/Images/dotnet-test-protocol-v2-discovery.png
new file mode 100644
index 0000000000..33ce7ca04b
Binary files /dev/null and b/docs/RFCs/Images/dotnet-test-protocol-v2-discovery.png differ
diff --git a/docs/RFCs/Images/dotnet-test-protocol-v2-execution-customhost.png b/docs/RFCs/Images/dotnet-test-protocol-v2-execution-customhost.png
new file mode 100644
index 0000000000..863e0f58e0
Binary files /dev/null and b/docs/RFCs/Images/dotnet-test-protocol-v2-execution-customhost.png differ
diff --git a/docs/RFCs/Images/dotnet-test-protocol-v2-execution.png b/docs/RFCs/Images/dotnet-test-protocol-v2-execution.png
new file mode 100644
index 0000000000..f9330663af
Binary files /dev/null and b/docs/RFCs/Images/dotnet-test-protocol-v2-execution.png differ
diff --git a/docs/RFCs/Images/vstest.console-discovery.png b/docs/RFCs/Images/vstest.console-discovery.png
new file mode 100644
index 0000000000..c18eb20098
Binary files /dev/null and b/docs/RFCs/Images/vstest.console-discovery.png differ
diff --git a/docs/RFCs/Images/vstest.console-execution.png b/docs/RFCs/Images/vstest.console-execution.png
new file mode 100644
index 0000000000..30d4c1f1f0
Binary files /dev/null and b/docs/RFCs/Images/vstest.console-execution.png differ
diff --git a/docs/RFCs/Images/vstest.console-overall-architecture.png b/docs/RFCs/Images/vstest.console-overall-architecture.png
new file mode 100644
index 0000000000..4829312613
Binary files /dev/null and b/docs/RFCs/Images/vstest.console-overall-architecture.png differ
diff --git a/docs/RFCs/Images/vstest.telemetry.png b/docs/RFCs/Images/vstest.telemetry.png
new file mode 100644
index 0000000000..c46cce03e9
Binary files /dev/null and b/docs/RFCs/Images/vstest.telemetry.png differ
diff --git a/docs/RFCs/toc.yml b/docs/RFCs/toc.yml
new file mode 100644
index 0000000000..a0aed78f5b
--- /dev/null
+++ b/docs/RFCs/toc.yml
@@ -0,0 +1,17 @@
+- name: 0001 - Test Platform Architecture
+  href: 0001-Test-Platform-Architecture.md
+- name: 0002 - Test discovery protocol
+  href: 0002-Test-Discovery-Protocol.md
+- name: 0003 - Test execution protocol
+  href: 0003-Test-Execution-Protocol.md
+- name: 0004 - Adapter extensibility
+  href: 0004-Adapter-Extensibility.md
+- name: 0005 - Test platform SDK
+  href: 0005-Test-Platform-SDK.md
+- name: 0006 - Datacollection protocol
+  href: 0006-DataCollection-Protocol.md
+- name: 0010 - Source Information For Discovered Tests
+  href: 0010-Source-Information-For-Discovered-Tests.md
+- name: 0014-Guidelines for TestCase FullyQualifiedName
+  href: 0017-TestCase-FullyQualifiedName.md
+  
diff --git a/docs/RunSettingsArguments.md b/docs/RunSettingsArguments.md
new file mode 100644
index 0000000000..2ee4c09e73
--- /dev/null
+++ b/docs/RunSettingsArguments.md
@@ -0,0 +1,65 @@
+# Passing runsettings arguments through commandline
+
+You are here because you are looking for syntax and details to pass runsettings configurations to either `vstest.console.exe` or `dotnet test` through commandline.
+
+`RunSettings arguments` are used to add/update specific `runsettings configurations`. The updated `runsettings configurations` will be available to `TestPlatform` and `test extensions` (E.g. test adapter, etc.) through runsettings.
+
+## Syntax
+
+* `RunSettings arguments` are specified as name-value pair of the form `[name]=[value]` after `--`. Note the space after --.
+* Use a space to separate multiple `[name]=[value]`.
+* All the arguments after `--` will be treated as `RunSettings arguments`, means `RunSettings arguments` should be at the end of the command line.
+
+## Example
+
+Passing argument `-- MSTest.MapInconclusiveToFailed=True` in (1) below is equivalent to passing argument
+`--settings additionalargs.runsettings` in (2) below.
+
+```shell
+1) dotnet test  -- MSTest.MapInconclusiveToFailed=True MSTest.DeploymentEnabled=False
+```
+
+```shell
+2) dotnet test --settings additionalargs.runsettings
+```
+
+where `additionalargs.runsettings` is:
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>  
+  <!-- MSTest adapter -->  
+  <MSTest>  
+    <MapInconclusiveToFailed>True</MapInconclusiveToFailed>
+    <DeploymentEnabled>False</DeploymentEnabled>
+  </MSTest>   
+</RunSettings> 
+```
+
+The syntax in (1) is another way of passing runsettings configuration and you need not author a runsetting file while using `Runsettings arguments`. More details about runsettings can be found [here](https://msdn.microsoft.com/library/jj635153.aspx).
+
+`Runsettings arguments` takes precedence over `runsettings`.
+
+For example, in below command the final value for `MapInconclusiveToFailed` will be `False` and value for `DeploymentEnabled` will be unchanged, that is `False`.
+
+```shell
+dotnet test --settings additionalargs.runsettings -- MSTest.MapInconclusiveToFailed=False
+```
+
+Starting from .NET SDK 5.0 you can also set `TestRunParameters` using command line option:
+
+```cmd
+# cmd
+dotnet test  -- TestRunParameters.Parameter(name=\"myParam\", value=\"value\")
+
+# powershell (prior 7.3, or with $PSNativeCommandArgumentPassing = "legacy")
+dotnet test --%  -- TestRunParameters.Parameter(name=\"myParam\", value=\"value\")
+
+# powershell (7.3+)
+dotnet test --%  -- TestRunParameters.Parameter(name="myParam", value="value") 
+
+# bash
+dotnet test -- TestRunParameters.Parameter\(name=\"myParam\",\ value=\"value\"\) 
+```
+
+In this example, `\"myParam\"` corresponds to the name of you parameter and `\"value\"` - the value of your parameter. Note, that `\` are escaping characters and they should stay as shown above, unless you are in PowerShell 7.3+. For more examples in PowerShell, such as using variables for the data, please [refer here](https://github.com/microsoft/vstest/issues/4637).
diff --git a/docs/TODO.md b/docs/TODO.md
new file mode 100644
index 0000000000..d172c42e8a
--- /dev/null
+++ b/docs/TODO.md
@@ -0,0 +1,20 @@
+Structures: 
+
+  // Test adapter and array of sources map:
+    // { 
+    //   C:\temp\testAdapter1.dll : [ source1.dll, source2.dll ], 
+    //   C:\temp\testadapter2.dll : [ source3.dll, source2.dll ]
+    // }
+    public Dictionary<string, IEnumerable<string>> AdapterSourceMap 
+
+
+    TimeSpan
+
+    string? RunSettings 
+
+
+    string? TestCaseFilter 
+
+    TestSessionInfo? TestSessionInfo 
+
+    TestPlatformOptions
\ No newline at end of file
diff --git a/docs/analyze.md b/docs/analyze.md
new file mode 100644
index 0000000000..0536da424f
--- /dev/null
+++ b/docs/analyze.md
@@ -0,0 +1,266 @@
+# Monitor and analyze test run
+
+This document will walk you through enabling data collection for a test run covering:
+
+1. A brief overview of DataCollectors.
+1. Configuring DataCollectors in TPv2.
+1. Key differences for using DataCollectors in TPv2 v/s TPv1.
+1. Instructions for using [code coverage][coverage].
+
+> **Version note:**
+>
+> DataCollection support is added in test platform `15.3.0` onwards. It is part of
+> VS 2017 15.3 and dotnet-cli 2.0.0 builds.
+
+[coverage]: #coverage
+
+## DataCollector
+
+A DataCollector is a test platform extension to monitor test run. It can be extended to perform tasks on specific test execution events. Currently, four events are exposed to DataCollector:
+
+1. Session Start event.
+2. Test Case Start event
+3. Test Case End event.
+4. Session End event.
+
+You can author a DataCollector to collect code coverage data for a test run, to collect logs when a test case or test run fails, etc. These additional files are called Attachments and they can be attached to test result report(trx).
+
+Please refer [here](./extensions/datacollector.md) for instructions on creating a DataCollector and [here](./RFCs/0006-DataCollection-Protocol.md)
+if you're interested in the architecture of data collection.
+
+## Configure DataCollectors
+
+DataCollectors can be configured for monitoring test execution through runSettings, testSettings or vstest.console args.
+
+### Using RunSettings<a name="Using-RunSettings"></a>
+
+Below is the sample runsettings for a custom DataCollector
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>
+   <RunConfiguration>      
+    <!-- Path to Test Adapters -->  
+    <TestAdaptersPaths>PathToAdapters;PathToDataCollectors</TestAdaptersPaths>  
+  </RunConfiguration>  
+
+  <!-- Configurations for DataCollectors -->  
+  <DataCollectionRunSettings>  
+    <DataCollectors>  
+      <DataCollector friendlyName="MyDataCollector" uri="datacollector://MyCompany/MyDataCollector/1.0">  
+        <Configuration>
+                    <LogFileName>DataCollectorLogs.txt</LogFileName>
+        </Configuration>  
+      </DataCollector>
+    </DataCollectors>  
+  </DataCollectionRunSettings>  
+</RunSettings>
+```
+
+Below is the sample command for enabling DataCollectors using runsettings
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /settings:datacollection.runsettings
+```
+
+### Using vstest.console args<a name="Using-vstest.console-args"></a>
+
+DataCollectors can be configured and used through first class command line arguments `/collect` and `/testadapterpath`. Hence, for common DataCollection scenarios, separate runsettings file may not be required.
+
+Below is the sample command to configure and use DataCollectors through vstest.console command line.
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /collect:"Code Coverage"
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /collect:"MyDataCollector" /testadapterpath:<Path to MyDataCollector assembly>
+```
+
+Please note that `testadapterpath` is not required for DataCollectors shipped along with TPv2.
+
+### Using TestSettings
+
+While the recommended way is to use [runsettings](#Using-RunSettings) or [vstest.console args](#Using-vstest.console-args), there are few DataCollectors which only worked with testsettings.
+E.g.: `System Information` DataCollector. Below is the sample testsettings for using `System Information` DataCollector.
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="TestSettings1" id="2d572055-54c0-4cac-8a55-9d7ffb48ac17" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Deployment enabled="false" />
+  <Execution>
+    <AgentRule name="LocalMachineDefaultRole">
+      <DataCollectors>
+        <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information">
+        </DataCollector>
+      </DataCollectors>
+    </AgentRule>
+  </Execution>
+  <Properties />
+</TestSettings>
+```
+
+Below is the sample command for enabling DataCollectors using testsettings
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /settings:datacollection.testsettings
+```
+
+### Enable/Disable a DataCollector
+
+All DataCollectors configured in the .runsettings files are loaded automatically and are enabled to participate for run, unless explicitly disabled using boolean valued attribute named `enabled`.
+
+For example, only `MyDataCollector1` DataCollector will be enabled for a test run with
+below runsettings:
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>
+   <RunConfiguration>      
+    <!-- Path to Test Adapters -->  
+    <TestAdaptersPaths>PathToAdapters;PathToDataCollectors</TestAdaptersPaths>  
+  </RunConfiguration>  
+
+  <!-- Configurations for DataCollectors -->  
+  <DataCollectionRunSettings> 
+    <DataCollectors> 
+      <DataCollector friendlyName="MyDataCollector1" uri="datacollector://MyCompany/MyDataCollector1/1.0">
+    </DataCollector> 
+  
+    <DataCollector friendlyName="MyDataCollector2" uri="datacollector://MyCompany/MyDataCollector2/1.0" enabled="false">
+      </DataCollector> 
+    </DataCollectors> 
+  </DataCollectionRunSettings>
+</RunSettings>
+```
+
+A specific DataCollector can be explicitely enabled using the `/collect:<friendly name>` command line switch.
+
+For example, below command line will enable a DataCollector named `MyDataCollector1`
+(and disable other DataCollectors mentioned in .runsettings):
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /collect:MyDataCollector1 /settings:<Path to runSettings>
+```
+
+More than one DataCollectors can also be enabled using `/collect` command line switch
+
+For example, below command will enable DataCollectors named `MyDataCollector1` and `MyDataCollector2`:
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /collect:MyDataCollector1 /collect:MyDataCollector2 /settings:<Path to runSettings>
+```
+
+## Key differences for using DataCollectors in TPv2 v/s TPv1
+
+1. In TPv1, DataCollectors are loaded from `<<VisualStudio Installation Directory>>\Common7\IDE\PrivateAssemblies\DataCollectors`.
+In TPv2, DataCollectors are loaded from `TestAdaptersPaths` specified in runSettings or `/testadapterpath` argument of `vstest.console.exe`. DataCollector assemblies must follow the naming convention *collector.dll.
+
+2. Previous DataCollector settings will continue to work, but additional `TestAdaptersPaths` must be specified in runsettings if DataCollector is not shipped along with TPv2. `TestAdapterPath` can also be specified through [vstest.console args](#Using-vstest.console-args) from command line.
+
+3. There are breaking changes in latest DataCollector interface. Hence, older DataCollectors need to be rebuilt against latest APIs to work with TPv2. For details, refer [here(todo)]();
+
+## Working with Code Coverage<a name="coverage"></a>
+
+> **Requirements:**
+> Code Coverage requires the machine to have Visual Studio 2017 Enterprise ([15.3.0](https://www.visualstudio.com/vs) or later installed and a Windows operating system.
+
+### Setup a project
+
+Here's a sample project file, please note the xml entity marked as `Required`. Previously, the `Microsoft.VisualStudio.CodeCoverage` was required, but is now shipped with the SDK.
+
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    
+    <!-- Required in both test/product projects. This is a temporary workaround for https://github.com/Microsoft/vstest/issues/800 -->
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.1.17" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.1.17" />
+  </ItemGroup>
+
+</Project>
+```
+
+
+### Analyze coverage with Visual Studio
+
+> **Version note:**
+>
+> Try this feature with [Visual Studio 2017 15.3.0](https://www.visualstudio.com/vs) or later.
+
+Use the `Analyze Code Coverage` context menu available in `Test Explorer` tool window to start a coverage run.
+
+After the coverage run is complete, a detailed report will be available in the `Code Coverage Results` tool window.
+
+Please refer the documentation for additional details: <https://docs.microsoft.com/en-us/visualstudio/test/using-code-coverage-to-determine-how-much-code-is-being-tested>
+
+### Collect coverage with command line runner
+
+Use the following command line to collect coverage data for tests:
+
+```shell
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" --collect:"Code Coverage" --framework:".NETCoreApp,Version=v1.1" d:\testproject\bin\Debug\netcoreapp1.1\testproject.dll
+```
+
+This will generate a `*.coverage` file in the `<Current working directory>\TestResults` directory.
+
+### Event Log Data Collector
+
+This document introduces Event Log DataCollector. We will start with a brief overview of Event Log DataCollector, use cases where it will be useful followed by steps to enable it.
+
+#### Introduction
+
+Event Log DataCollector is a Windows only DataCollector that is used to get event logs logged into Windows Event Viewer during test execution. Event logs are saved in a file `Event Log.xml` and this file is available as Attachment as part of test result report (trx).
+When enabled, Event Log DataCollector generates one `Event Log.xml` file for entire test session. `Event Log.xml` files are also generated corresponding to all test cases as well, to provide a granular view of events logged while executing a test case.
+
+More info on Event Viewer [here](https://technet.microsoft.com/en-us/library/cc938674.aspx)
+
+#### Use cases for Event Log DataCollector
+
+Event Log DataCollector is used to get event logs as Attachment and is particularly useful for remote scenarios where logging into the machine and viewing the Event Viewer is not possible.
+
+#### Enabling Event Log DataCollector
+
+There are two ways of enabling Event Log DataCollector for a test run:
+
+##### 1. Using vstest.console argument
+
+Use the following command to enable Event Log DataCollector with default configuration:
+
+> "%vsinstalldir%\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" test_project.dll /testadapterpath:<<Path to test adapter>> /collect:"Event Log"
+
+##### 2. Using runsettings
+
+Below runsettings can be used to enable Event Log DataCollector.
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>
+  <!-- Configurations for DataCollectors -->  
+  <DataCollectionRunSettings> 
+    <DataCollectors> 
+      <DataCollector friendlyName="Event Log" uri="datacollector://Microsoft/EventLog/2.0">
+        <Configuration>
+            <Setting name="EventLogs" value="System,Application" />
+            <Setting name="EntryTypes" value="Error,Warning" />
+            <Setting name="EventSources" value="CustomEventSource" />
+            <Setting name="MaxEventLogEntriesToCollect" value="5" />
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
+```
+
+The above runsettings will collect event logs from `System` and `Application` event logs which are logged as `Error` or `Warning` and event source is specified as `CustomEventSource`. `MaxEventLogEntriesToCollect` specifies the upper limit on the events that are logged in `Event Log.xml` file corresponding to test cases. There is no upper limit on number of events logged in `Event Log.xml` file for test session.
+
+In default configuration (through vstest.console.exe args or when <Configuration> section is empty in runsettings), `System`, `Application` and `Security` logs with entry types `Error`, `Warning` or `FailureAudit` and with any event source are collected. Default value of `MaxEventLogEntriesToCollect` is 50000. There is no upper limit on number of events logged in `Event Log.xml` file for test session.
+
+> **A note on `Security` Event Log**
+>
+>Please note that `Security` event logs can only be collected if the account under with tests are run has admin privileges.
diff --git a/docs/configure.md b/docs/configure.md
new file mode 100644
index 0000000000..5af8f0696e
--- /dev/null
+++ b/docs/configure.md
@@ -0,0 +1,504 @@
+# Configure a test run
+
+This document covers configuration of a test run in the test platform.
+
+## Overview
+
+There are three different ways to configure various aspects of a test run.
+
+1. **Using command line arguments**
+Various configuration options can be provided to the `vstest.console` or `dotnet
+test` command line. For example, `--framework` can specify the runtime framework
+version, or `--platform` can specify the architecture of test run (`x86` or
+`x64`).
+
+1. **Using a runsettings file**
+User can specify a `runsettings` file to configure test run. For example:
+
+* `> vstest.console.exe --settings:test.runsettings test.dll`
+* `> dotnet test -s test.runsettings`
+
+1. **Using command line runsettings parameters**
+Various elements of a `runsettings` file can also specified as command line
+parameters directly. For example, consider following `runsettings`:
+
+```xml
+<RunSettings>
+    <RunConfiguration>
+        <DisableAppDomain>False</DisableAppDomain>
+    </RunConfiguration>
+</RunSettings>
+```
+
+The `DisableAppDomain` settings can be changed in the following way:
+`> vstest.console --settings:test.runsettings -- RunConfiguration.DisableAppDomain=true`
+
+Or, `> dotnet test -s test.runsettings -- RunConfiguration.DisableAppDomain=true` if
+you're using dotnet test to execute tests.
+
+Order of priority (in case of conflicting settings) is as follows:
+
+1. If a command line switch is available, it takes priority. E.g. `/platform`
+   wins over `<TargetPlatform>` specified in the `runsettings` file.
+1. If a command line runsettings is available, it takes priority over the
+   content of `runsettings` file. E.g. in case of `dotnet test -s
+   test.runsettings -- RunConfiguration.TargetPlatform=x86`, platform is set to
+   `x86` even if `test.runsettings` specifies `x64` as platform.
+1. If a `runsettings` file is provided, it is used for the test run.
+
+## Run settings
+
+A `*.runsettings` file is used to configure various aspects of a test discovery
+and execution with `vstest.console.exe` or the `Test Explorer` in VS. An editor
+using the test platform, can specify a `runsettings` as an `xml` in the `Test
+Discovery` or `Test Run` requests (details are in Editor API Specification).
+
+The `runsettings` file is a xml file with following sections:
+
+1. Run Configuration
+1. Data Collection
+1. Runtime Parameters
+1. Adapter Configuration
+1. Legacy Settings
+
+We will cover these sections in detail later in the document. Let's discuss few
+core principles for runsettings.
+
+### Principles
+
+1. Any runner (CLI, IDE, Editor) can use run settings to configure the test run
+1. These runners need to take care of merging user provided runsettings with
+   their own configuration parameters. E.g. an IDE may provide `TargetPlatform`
+   as an UI configuration, at the same time an user can also provide the setting
+   in a `runsettings` file. It is the IDE's responsibility to disambiguate.
+1. Run settings are always created at the start of a test run. They are
+   immutable for rest of the run.
+1. Every test platform extension should get the _effective_ runsettings for a
+   test run via the test platform APIs. It may use it to read its own settings
+   or take decisions (e.g. an adapter needs to disable appdomains if
+   `DisableAppDomain` setting is provided via run settings).
+
+### Sample
+
+Given below is a complete `runsettings` file with all available options. Each
+option is briefly annotated, details are available in a later section of this
+document.
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>  
+  <!-- Configurations that affect the Test Framework -->  
+  <RunConfiguration>  
+    <!-- 1. Test related settings -->
+    <!-- [x86] | x64: architecture of test host -->  
+    <TargetPlatform>x86</TargetPlatform>
+  
+    <!-- Framework35 | [Framework40] | Framework45 -->  
+    <TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
+  
+    <!-- Path to Test Adapters -->  
+    <TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>
+
+    <!-- Path relative to solution directory -->  
+    <ResultsDirectory>.\TestResults</ResultsDirectory>
+    <SolutionDirectory>.\TestResults</SolutionDirectory>
+    
+    <!-- CPU cores to use for parallel runs -->
+    <MaxCpuCount>2</MaxCpuCount>
+    
+    <!-- Specify timeout in milliseconds. A valid value should be >= 0. If 0, timeout will be infinity-->
+    <TestSessionTimeout>10000</TestSessionTimeout>
+
+    <!-- STA | MTA  default is STA for .NET Full and MTA for .NET Core-->
+    <ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>
+
+    <!-- 2. Hints to adapters to behave in a specific way -->
+    <DesignMode>false</DesignMode>
+    <DisableParallelization>false</DisableParallelization>
+    <DisableAppDomain>false</DisableAppDomain>
+    <CollectSourceInformation>true</CollectSourceInformation>
+
+    <!-- 3. Runner related configuration -->
+    <BatchSize>10</BatchSize>
+    
+  </RunConfiguration>  
+  
+  <!-- Configurations for data collectors -->  
+  <DataCollectionRunSettings>  
+    <DataCollectors>  
+      <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0">
+        <Configuration>  
+          <CodeCoverage>  
+            <ModulePaths>  
+              <Exclude>  
+                <ModulePath>.*CPPUnitTestFramework.*</ModulePath>  
+              </Exclude>  
+            </ModulePaths>  
+  
+            <!-- We recommend you do not change the following values: -->  
+            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>  
+            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>  
+            <CollectFromChildProcesses>True</CollectFromChildProcesses>  
+            <CollectAspDotNet>False</CollectAspDotNet>  
+          </CodeCoverage>  
+        </Configuration>  
+      </DataCollector>  
+  
+    </DataCollectors>  
+  </DataCollectionRunSettings>  
+  
+  <!-- Configurations for in-proc data collectors -->  
+  <InProcDataCollectionRunSettings>  
+    <InProcDataCollectors>
+      <InProcDataCollector friendlyName="InProcDataCollectionExample" uri="InProcDataCollector://Vstest.Datacollectors/InProcDataCollectionExample/1.0" codebase="C:\Users\samadala\src\vstest.datacollectors\Examples\bin\Debug\net46\ExamplesDataCollector.dll" assemblyQualifiedName="Vstest.Datacollectors.Examples.InProcDataCollectionExample, ExamplesDataCollector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" >
+      <Configuration>
+          <Port>4312</Port>
+        </Configuration>
+      </InProcDataCollector>
+    </InProcDataCollectors>
+  </InProcDataCollectionRunSettings>
+
+  <!-- Adapter Configuration -->
+  <MSTest>
+    <!-- Enable legacy mode, legacy setting are honored only when this flag is set to true -->
+    <ForcedLegacyMode>true</ForcedLegacyMode>
+  </MSTest>
+
+  <!-- Settings used for Ordered tests and MSTest v1 based tests when running in legacy mode -->
+  <!-- Note: These settings do not apply to MSTest v2 tests -->
+  <LegacySettings>
+    <Deployment>
+      <DeploymentItem filename=""C:\DeploymentDir\DeploymentFile"" />
+    </Deployment>
+
+    <!-- Set up scripts for setup and clean up-->
+    <Scripts setupScript=""C:\SetupScript.bat"" cleanupScript=""C:\CleanupScript.bat"" />
+  </LegacySettings>
+
+  <!-- Parameters used by tests at runtime -->  
+  <TestRunParameters>  
+    <Parameter name="webAppUrl" value="http://localhost" /> 
+    <Parameter name="webAppUserName" value="Admin" />
+    <Parameter name="webAppPassword" value="Password" />
+  </TestRunParameters>  
+</RunSettings>  
+```
+
+### Section 1: Run Configuration
+
+```xml
+<RunSettings>  
+  <RunConfiguration>  
+    <!-- Run Configuration section -->
+  </RunConfiguration>  
+</RunSettings>
+```
+
+This is the core part of a `runsettings` file. It must be present in every
+runsettings. This section is filled in by the test runner (CLI, IDE or Editor)
+with various parameters of the test projects and user provided settings.
+
+Available elements are:
+
+1. **Test settings**
+
+_Example_
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>  
+  <RunConfiguration>  
+    <TargetPlatform>x86</TargetPlatform>  
+    <TargetFrameworkVersion>.NET Framework, Version=v4.6</TargetFrameworkVersion>  
+    <TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>  
+    <ResultsDirectory>.\TestResults</ResultsDirectory>  
+    <SolutionDirectory>.\TestResults</SolutionDirectory>  
+    <MaxCpuCount>2</MaxCpuCount>
+    <TestSessionTimeout>10000</TestSessionTimeout>
+    <ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>
+  </RunConfiguration>  
+</RunSettings>
+```
+
+_Description_
+
+| Settings Element  | Type   | Function                                                                                        |
+|-------------------|--------|-------------------------------------------------------------------------------------------------|
+| TargetPlatform    | string | Configures the architecture of test host. Possible values: (x86,  x64)                          |
+| TargetFrameworkVersion   | string | Configures the target runtime for a test run. Possible values: any valid [FrameworkName][]      |
+| TestAdaptersPaths | string | Semi-colon separated directories which contain test adapters                                    |
+| ResultsDirectory  | string | Directory for test run reports. E.g. trx, coverage etc.                                         |
+| SolutionDirectory | string | Working directory for test invocation. Results directory can be relative to this. Used by IDEs. |
+| MaxCpuCount       | int    | Degree of parallelization, spawns `n` test hosts to run tests. Default: 1. Max: Number of cpu cores. |
+| TestSessionTimeout | int   | Testplatform will cancel the test run after it exceeded given TestSessionTimeout in milliseconds and will show the results of tests which ran till that point. **Required Version: 15.5+.** |
+| ExecutionThreadApartmentState       | string    | Apartment state of thread which calls adapter's RunTests and Cancel APIs. Possible values: (MTA, STA). default is STA for .NET Full and MTA for .NET Core.  STA supported only for .NET Full **Required Version: 15.5+.** [More details.](#execution-thread-apartment-state) |
+
+Examples of valid `TargetFrameworkVersion`:
+
+* .NETCoreApp, Version=v1.0
+* .NETCoreApp, Version=v1.1
+* .NETFramework, Version=v4.5
+
+[FrameworkName]: https://msdn.microsoft.com/en-us/library/dd414023(v=vs.110).aspx
+
+2. **Adapter settings**
+These settings are a hint to adapters to behave in a particular way. These are
+determined by runners based on user configuration. It is also possible for an
+user to provide these settings, if they want to tweak a run.
+
+_Example_
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>  
+  <RunConfiguration>  
+    <DesignMode>false</DesignMode>
+    <DisableParallelization>false</DisableParallelization>
+    <DisableAppDomain>false</DisableAppDomain>
+    <CollectSourceInformation>true</CollectSourceInformation>
+  </RunConfiguration>  
+</RunSettings>
+```
+
+_Description_
+
+| Settings Element         | Type | Function                                                                           |
+|--------------------------|------|------------------------------------------------------------------------------------|
+| DesignMode               | bool | True if test run is triggered in an IDE/Editor context.                            |
+| DisableParallelization   | bool | If true, an adapter should disable any test case parallelization                   |
+| DisableAppDomain         | bool | If true, an adapter shouldn't create appdomains to run tests                       |
+| CollectSourceInformation | bool | If false, an adapter need not parse symbols to provide test case file, line number |
+
+3. **Runner settings**
+An IDE/Editor can set these settings to change the behavior of test platform.
+They are not actionable for an adapter.
+
+_Example_
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>  
+<RunSettings>  
+  <RunConfiguration>  
+    <BatchSize>10</BatchSize>
+  </RunConfiguration>  
+</RunSettings>
+```
+
+_Description_
+
+| Settings Element | Type | Function                                                                                                    |
+|------------------|------|-------------------------------------------------------------------------------------------------------------|
+| BatchSize        | int  | Configures the frequency of run statistics. Discovered/Test results are send once `n` tests are accumulated |
+
+### Section 2: Data Collection
+
+```xml
+<RunSettings>  
+  <!-- Configurations for out-of-process data collectors -->  
+  <DataCollectionRunSettings>  
+    <DataCollectors>  
+      <!-- Data collectors configuration goes here -->
+    </DataCollectors>  
+  </DataCollectionRunSettings>  
+  
+  <!-- Configurations for in-process data collectors -->  
+  <InProcDataCollectionRunSettings>  
+    <DataCollectors>  
+      <!-- Data collectors configuration goes here -->
+    </DataCollectors>
+  </InProcDataCollectionRunSettings>
+</RunSettings>
+```
+
+This section lists all [data collectors][] configured for a test run. The test
+runner creates this section based on arguments provided in the command line.
+E.g. if `--collect:"Code Coverage"` is provided, a `Code Coverage` entry is
+created out of process data collectors.
+
+[data collectors]: ./analyze.md
+
+In-process data collectors should be configured by the user.
+
+Data collector extension authors may use the content within the specific
+`<DataCollector friendlyName=mycollector>` node to provide configuration options
+for their data collector. For example, the code coverage data collector uses
+following section.
+
+_Example_
+
+```xml
+<RunSettings>  
+  <!-- Configurations for data collectors -->  
+  <DataCollectionRunSettings>  
+    <DataCollectors>  
+      <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0">
+        <!-- Code Coverage Settings Start -->
+        <Configuration>  
+          <CodeCoverage>  
+            <ModulePaths>  
+              <Exclude>  
+                <ModulePath>.*CPPUnitTestFramework.*</ModulePath>  
+              </Exclude>  
+            </ModulePaths>  
+  
+            <!-- We recommend you do not change the following values: -->  
+            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>  
+            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>  
+            <CollectFromChildProcesses>True</CollectFromChildProcesses>  
+            <CollectAspDotNet>False</CollectAspDotNet>  
+          </CodeCoverage>  
+        </Configuration>  
+        <!-- Code Coverage Settings End -->
+      </DataCollector>  
+    </DataCollectors>  
+  </DataCollectionRunSettings>  
+</RunSettings>  
+```
+
+_Description_
+
+| Settings Element | Type   | Function                                                                  |
+|------------------|--------|---------------------------------------------------------------------------|
+| DataCollector    | string | Provides a data collector information. See below for required attributes. |
+
+Required attributes:
+
+1. `friendlyName` provides a common name for the data collector. It is declared
+   by a data collector implementation.
+2. `enabled` is used to enable/disable a data collector. If `true` the data
+   collector participates in test run.
+3. `uri` is the identity of a data collector. It is declared by the data
+   collector implementation.
+
+Test platform uses above attributes to instantiate the appropriate datacollector for
+a test run.
+
+> Note: it is possible for users to provide the runsettings with a
+> `DataCollectionRunSettings` node with any configuration for the data
+> collectors.
+
+### Other Sections
+
+#### Legacy Settings
+
+This section allows users to configure settings that were earlier required to be
+set using *testsettings file.
+These settings can be used for Ordered tests and MSTest v1 based tests when running in legacy mode.
+
+Users can now migrate testsettings to runsettings using [SettingsMigrator](./RFCs/0023-TestSettings-Deprecation.md#migration)
+
+Here is an example:
+
+```xml
+<Runsettings>
+  <MSTest>
+    <!-- Enable legacy mode, legacy setting are honored only when this flag is set to true -->
+    <ForcedLegacyMode>true</ForcedLegacyMode>
+  </MSTest>
+
+  <!-- Settings used for Ordered tests and MSTest v1 based tests when running in legacy mode -->
+  <!-- Note: These settings do not apply to MSTest v2 tests -->
+  <LegacySettings>
+    <Deployment>
+      <DeploymentItem filename=""C:\DeploymentDir\DeploymentFile"" />
+    </Deployment>
+
+    <!-- Set up scripts for setup and clean up-->
+    <Scripts setupScript=""C:\SetupScript.bat"" cleanupScript=""C:\CleanupScript.bat"" />
+
+    <Execution parallelTestCount=""5"" hostProcessPlatform=""MSIL"">
+      <!-- Configure test timeout, use TestSessionTimeout in Runconfiguration to configure session timeout -->
+      <Timeouts testTimeout=""6000"" />
+
+      <!-- Configure the Hosts-->
+      <Hosts skipUnhostableTests=""false"">
+        <AspNet name=""ASP.NET"" executionType=""Iis"" urlToTest=""http://localhost"" />
+      </Hosts>
+
+      <!-- Add assembly resolution -->
+      <TestTypeSpecific>
+        <UnitTestRunConfig testTypeId=""13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b"">
+          <AssemblyResolution applicationBaseDirectory=""E:\AppBaseDir"">
+            <TestDirectory useLoadContext=""false"" />
+            <RuntimeResolution>
+              <Directory path=""E:\RuntimeResolutionDir"" includeSubDirectories=""false"" />
+            </RuntimeResolution>
+            <DiscoveryResolution>
+              <Directory path=""E:\DiscoveryResolutionDir"" includeSubDirectories=""true"" />
+            </DiscoveryResolution>
+          </AssemblyResolution>
+        </UnitTestRunConfig>
+      </TestTypeSpecific>
+    </Execution>
+  </LegacySettings>
+</Runsettings>
+  ```
+
+#### Run Parameters
+
+```xml
+  <!-- Parameters used by tests at runtime -->  
+  <TestRunParameters>  
+    <Parameter name="webAppUrl" value="http://localhost" />  
+    <Parameter name="webAppUserName" value="Admin" />  
+    <Parameter name="webAppPassword" value="Password" />  
+  </TestRunParameters>  
+```
+
+This section provides ability for user to specify a `key-value` pair dictionary
+available to tests during runtime.
+
+> Note that it is the responsibility of an adapter to ensure this section is
+> available to tests at runtime.
+> E.g. the mstest framework makes these settings available as part of the
+> `TestContext` API.
+
+#### Adapter Configuration
+
+An adapter may provide a section in runsettings for users. See [mstest config][]
+and [nunit config][] for more details.
+
+[mstest config]: TODO
+[nunit config]: TODO
+
+# Execution thread apartment state
+
+This section explains usage of ExecutionThreadApartmentState element in runsettings and testplatform behavior for same.
+
+### Usage
+
+#### using runsettings file
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <RunConfiguration>
+     <ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>
+  </RunConfiguration>
+</RunSettings>
+```
+
+#### using command line
+
+vstest.console.exe a.dll -- RunConfiguration.ExecutionThreadApartmentState=STA
+
+dotnet test -f net46 -- RunConfiguration.ExecutionThreadApartmentState=STA
+
+### History
+
+In Test Platform V1 ExecutionThreadApartmentState property can be set from vstest.executionengine*.exe.config file. Default value is `STA`.
+
+### Behavior
+
+In Test platform V2 ExecutionThreadApartmentState property default value is `MTA` for .NET Core and `STA` for .NET Full. `STA` value is only supported for .NET Framework.
+Warning should be shown on trying to set value `STA` for .NET Core and UAP10.0 frameworks tests.
+
+* To support adapters which depends on thread test platform creates may need STA apartment state to run UI tests. `ExecutionThreadApartmentState` option can be used to set apartment state. Example: MSTest v1, MSTest v2 and MSCPPTest adapters.
+
+* The recommended way to make the tests run in STA thread is using custom attributes that adapter provides.
+
+| Adapter | Attribute|
+|-----------|-----------|
+| MSTest v2 | STATestMethod/STATestClass
+| NUnit | Apartment |
+| Xunit | STAFact
diff --git a/docs/contribute.md b/docs/contribute.md
new file mode 100644
index 0000000000..05ba93c560
--- /dev/null
+++ b/docs/contribute.md
@@ -0,0 +1,224 @@
+# Contribution Guide
+
+This article will help you build, test and try out local builds of the VS test
+platform.
+
+## Prerequisites
+
+Please ensure you have a `.net 4.6.2` or higher installed on the machine.
+
+Clone the repository to a local directory. Rest of this article assumes
+`/src/vstest` as the location of source enlistment.
+
+```shell
+> git clone https://github.com/Microsoft/vstest.git
+```
+
+If you're planning to use **Visual Studio** as development environment, please
+install `VS 2022` with .NET Desktop development workload, and install individual component `.NET Portable Library targeting pack`.
+
+If you're _not_ planning to use **Visual Studio** and only use CLI. You will need to install [.Net 46 targeting pack](https://www.microsoft.com/download/details.aspx?id=48136). The download link has two msis. Both needs to be installed. Otherwise build will fail asking to install net 46.
+
+### Unix requirements
+
+Install common tools
+
+```shell
+sudo apt install libcurl4-openssl-dev
+```
+
+Follow the instructions on [Mono Installation][mono-linux] page to install latest bits.
+
+[mono-linux]: http://www.mono-project.com/download/#download-lin
+
+Rest of the article will provide steps for VS and CLI/Editors development.
+
+## Build
+
+### Building with Visual Studio
+
+Open `/src/vstest/TestPlatform.sln` in VS.
+
+Use `Build Solution` to build the source code.
+
+Binaries for each assembly are produced in the
+`artifacts/src/<Assembly>/bin/Debug` directory.
+
+### Building with CLI, CI, Editors
+
+To build the repository, run the following command:
+
+```shell
+> cd /src/vstest
+> build.cmd
+```
+
+This command will fetch the latest `dotnet-cli` into `/src/vstest/tools/dotnet`
+directory. It will use the `dotnet` executable present there to build the source
+code. All the nuget required for build will be downloaded to
+`/src/vstest/.packages` directory.
+
+Build will produce following assets:
+
+* A portable `vstest.console` for desktop (net46 target) and xplat (netcoreapp)
+  target
+* A visual studio extension `Microsoft.TestPlatform.vsix` with the test platform
+  components required in VS test explorer
+* Test platform SDK packages for ObjectModel and TranslationLayer
+
+We will discuss more on each assets are in the [Deployment](#Deployment) section below.
+
+Binaries for each assembly is produced along side the source. E.g. ObjectModel
+assemblies can be found at
+`/src/vstest/src/Microsoft.TestPlatform.ObjectModel/bin/Debug/net46/*.dll`.
+
+To build a particular configuration, use the `-c` option. E.g. to trigger a
+release build use
+
+```shell
+> build.cmd -c Release
+```
+
+For other options, check `/src/vstest/scripts/build.ps1`.
+
+## Test
+
+There are following sets of tests:
+
+* Unit tests
+  * Very fast tests primarily validating individual units
+  * Named as `<UnitUnderTest>.UnitTests` where UnitUnderTest is any product
+        assembly
+* Smoke tests
+  * Slower end to end tests. Typically these cover P0 scenarios (99% of users
+        will use these, if these are broken, PR will not be merged)
+  * Driven by a real `vstest.console` executable
+  * Named as `Microsoft.TestPlatform.SmokeTests`
+* End to end tests
+  * Slower end to end tests for extensive coverage
+  * Driven by a real `vstest.console` executable
+  * Named as `Microsoft.TestPlatform.AcceptanceTests`
+
+As a principle, most of tests are unit tests (~70-80%), few smoke tests
+(~20-15%), fewer acceptance tests (~10-5%).
+
+Unit tests and smoke/acceptance tests are run with the `vstest.console` built by
+the `build` step above.
+
+### Running tests (Visual Studio)
+
+Currently tests are run in VS 2017 RC using the test platform bits. You need to
+install the testplatform.vsix generated by build if you're using an older version
+of VS (< RC.3). See [Deployment](#visual-studio) for installation steps.
+
+Run the tests in Test Explorer. Use a search filter like `project:"Unit"` to
+run only unit tests. For running smoke tests, use the `project:"Smoke"` filter.
+
+### Running tests (CLI, CI, Editors)
+
+To execute tests, run the following command:
+
+```shell
+> cd /src/vstest
+> test.cmd
+```
+
+By default, only unit tests are run. To run the smoke tests, provide the `-p`
+option to `test.cmd` to set test assembly pattern:
+
+```shell
+> test.cmd -p smoke
+```
+
+The `-p` option can be used to run tests for any assembly as well. E.g.
+following command will run tests for _datacollector_:
+
+```shell
+> test.cmd -p datacollector
+```
+
+Tests for a particular configuration can be run with following command. By
+default, `Debug` configuration is run.
+
+```shell
+> test.cmd -c release
+```
+
+If you want to run a particular test. Eg: Test Name that contains Blame in Acceptance test
+
+```shell
+> .\test.cmd -bl -c release /p:TestRunnerAdditionalArguments="'--filter Blame'" -Integration
+```
+
+## Deployment
+
+This section will discuss the steps to use the `vstest.console` we've built
+using previous instructions.
+
+### Visual Studio
+
+Visual Studio 2017 RC ships with the test platform `vsix` generated by build.cmd. To use the locally
+built version, use the following steps in a developer command prompt.
+
+```shell
+> vsixinstaller /src/vstest/artifacts/Debug/TestPlatform.vsix
+# (replace Debug with Release as appropriate)
+```
+
+### Command line (XPlat)
+
+A `netcoreapp` target of vstest.console is dropped at
+`/src/vstest/artifacts/<Configuration>/netcoreapp1.0/vstest.console.dll`. It can be
+executed with any dotnet executable. You may choose to use the dotnet-cli we
+have in `/src/vstest/tools/dotnet/dotnet` as well :)
+
+```shell
+> /src/vstest/tools/dotnet/dotnet /src/vstest/artifacts/Debug/netcoreapp1.0/vstest.console.dll /?
+```
+
+### Command line (Windows desktop)
+
+A `net46` target of vstest.console is dropped at
+`src/vstest/artifacts/<Configuration>/net46/win7-x64`. It can be run directly as
+follows:
+
+```shell
+> /src/vstest/artifacts/Debug/net46/win7-x64/vstest.console.exe /?
+```
+
+## Diagnostics
+
+Try to isolate the failure scenario. In the best case it's just a command line
+that can demonstrate a bug. For example, a bug in discovery of tests can show up
+in following command line:
+
+```shell
+> /src/vstest/artifacts/Debug/net46/win7-x64/vstest.console.exe mytest.dll /listTests /tests:*&&*#Ed
+```
+
+Next step is to enable [verbose logging](diagnose.md) to understand details.
+
+Another add a `Debugger.Launch` at the process launch points. E.g.
+`testhost.exe` or `vstest.console.exe`. Select the appropriate debugger (choose
+CoreCLR for netcoreapp scenario) and step through the code.
+
+## Running Tests with TPv2 using Test Explorer
+
+Test Platform (TPv2) is packaged as a `vsix` with VS 2017 RC releases and lights up the .NET core and Live Unit Testing scenarios.  It currently does not support UWP & data collector scenarios (code coverage & fakes). It is placed @ `"%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\TestPlatform"`.
+
+Desktop, UWP & Native unit testing continues to use the test platform (TPv1) located @ `"%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow"`.
+
+To use TPv2 for desktop - place `testplatform.config` @ `"%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\TestPlatform"` with the contents below.
+
+````xml
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="feature.net35" value="true" />
+    <add key="feature.net40" value="true" />
+    <add key="feature.datacollector" value="true"/>
+  </appSettings>
+</configuration>
+````
+
+If `feature.net35` and `feature.net40` are set to `true`, VS Test Explorer will use TPv2 for desktop flow for tests targeting net35 and net40 frameworks respectively. If `feature.datacollector` is set to `true`, VS Test Explorer will use TPv2 when data collectors are enabled.
diff --git a/docs/diagnose.md b/docs/diagnose.md
new file mode 100644
index 0000000000..2ec2a57bc5
--- /dev/null
+++ b/docs/diagnose.md
@@ -0,0 +1,163 @@
+# Test platform diagnostics
+
+This document outlines troubleshooting and diagnosis instructions for test platform.
+
+## Collect traces using command line
+
+The console test runner (`vstest.console`) provides a `diag` switch to collect
+traces to a log file. Invoke the runner using below command line:
+
+```shell
+> vstest.console testApp.dll --diag:log.txt
+```
+
+Trace information will be available in the `log.txt` file. The testhost
+execution logs will be in a `log.host.*.txt` file. Testhost logs will be most
+interesting since that process actually loads the adapters and runs the tests. It
+is also possible provide a path `/tmp/dir/log.txt`. `/tmp/dir` will be created if
+it doesn't exist.
+
+Trace level can be changed using below command line:
+
+```shell
+> vstest.console testApp.dll --diag:log.txt;tracelevel=verbose
+```
+
+Allowed values for tracelevel are: off, error, warning, info and verbose. The default value is verbose.
+
+### Collect traces using VSTEST_DIAG
+
+Since v17.2.0, environment variable `VSTEST_DIAG` can be used to specify the path to the log file. 
+
+### Dotnet test
+
+The `--diag` and `VSTEST_DIAG` option is supported on the `dotnet test` command as well. This will also produce same
+set of log files: `log.txt` and `log.*.txt`.
+
+```shell
+> dotnet test --diag:log.txt
+```
+
+To get traces for VSTest build task, enable the following environment variable:
+
+```shell
+> set VSTEST_BUILD_TRACE=1
+or
+> $env:VSTEST_BUILD_TRACE=1    # powershell
+> dotnet test
+```
+
+## Collect trace using config file
+
+Tracing can also be enabled via a configuration file. Create
+a `vstest.console.exe.config` configuration file in the same directory as
+`vstest.console`. Similar configuration is also possible for `testhost.exe` or `testhost.x86.exe`.
+
+This technique is useful to capture logs for IDE/Editor scenarios.
+
+```shell
+> where vstest.console
+d:\tmp\vstest.console.exe
+
+> notepad d:\tmp\vstest.console.exe.config
+```
+
+Add the following content to the config file (`vstest.console.exe.config` or `testhost.exe.config`).
+
+```shell
+<configuration>
+  <system.diagnostics>
+    <sources>
+      <source name="TpTrace" 
+        switchName="sourceSwitch" 
+        switchType="System.Diagnostics.SourceSwitch">
+        <listeners>
+          <!-- This will spew out all traces to stdout. Add as appropriate -->
+          <!-- <add name="console" 
+            type="System.Diagnostics.ConsoleTraceListener">
+            <filter type="System.Diagnostics.EventTypeFilter" 
+              initializeData="Warning"/>
+          </add> -->
+
+          <add name="logfile"/>
+
+          <remove name="Default"/>
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="sourceSwitch" value="All"/>
+    </switches>
+    <sharedListeners>
+      <!-- This will add all verbose logs to d:\tmp\log.txt -->
+      <add name="logfile" 
+        type="System.Diagnostics.TextWriterTraceListener" 
+        initializeData="d:\tmp\log.txt">
+        <filter type="System.Diagnostics.EventTypeFilter" 
+          initializeData="Verbose"/>
+      </add>
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
+```
+
+## Collect trace in Azure DevOps CI (VSTest Task)
+
+Add a variable to the build definition named `System.Debug` with value `True`. This can
+be done while a new build is queued.
+
+![image](https://github.com/user-attachments/assets/893eee2d-0e20-4b1f-999b-a1a4f8862d12)
+
+This variable will ensure:
+
+* Exact command line of `vstest.console.exe` is reported. It can be used to isolate if there
+are errors in translating user inputs in the task to command line options of vstest.console.exe.
+* The task invokes `vstest.console.exe` with `/diag` option. The log files can be uploaded
+as artifacts for diagnosing errors.
+
+Logs can be downloaded by clicking the right hand `...` menu: 
+
+![image](https://github.com/user-attachments/assets/e8369817-f06a-41c1-b4ae-b042cdc4eaf9)
+
+## Debug test platform components
+
+The runner and test host processes support waiting for debugger attach. You can
+enable the following environment variable to keep `vstest.console.exe` waiting for
+debugger attach:
+
+```shell
+> set VSTEST_RUNNER_DEBUG=1
+> vstest.console testApp.dll
+Waiting for debugger attach...
+Process Id: 51928, Name: vstest.console
+```
+
+For test host process (`testhost.exe`, or `dotnet exec testhost.dll` depending on
+target framework) use the following environment variable.
+Execution will halt until debugger is attached.
+
+```shell
+> set VSTEST_HOST_DEBUG=1
+> vstest.console testApp.dll
+Microsoft (R) Test Execution Command Line Tool Version 15.0.0.0
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+Starting test execution, please wait...
+Host debugging is enabled. Please attach debugger to testhost process to continue.
+```
+
+## In Visual Studio
+
+Set test logging to trace: 
+
+![image](https://github.com/user-attachments/assets/0ee53d10-4f95-469a-91bd-8577d79b99bc)
+
+Run your tests. 
+
+Go to Output > Tests window: 
+
+Please provide all files from the listed folder, and complete content of the Tests window.
+
+![image](https://github.com/user-attachments/assets/c942642d-e10a-4bf3-9920-8ddd22d99ba8)
+
+
diff --git a/docs/dotnetcoretests.md b/docs/dotnetcoretests.md
new file mode 100644
index 0000000000..8e938642ee
--- /dev/null
+++ b/docs/dotnetcoretests.md
@@ -0,0 +1,17 @@
+For dotnet core test projects, the test platform is acquired as a nuget package (Microsoft.NET.Test.Sdk) and the runtime (testhost.dll similar to testhost.exe) is also part of the nuget package. 
+
+When dotnet build runs, the above mentioned packages are restored to the users' global nuget cache in the absence of any overridden config. When vstest.console.exe runs <UnitTestProject>.runtimeconfig.dev.json is looked into to determine the folders to look for the testhost.dll (something like the below) in addition to the folder where the test dll is present (https://github.com/Microsoft/vstest/blob/c7472a479966a218fb0ac508ed799418eb4bfc00/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs#L374)
+
+{
+  "runtimeOptions": {
+    "additionalProbingPaths": [
+      "C:\\Users\\shivash\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\shivash\\.nuget\\packages",
+      "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+    ]
+  }
+}
+
+In the case of the customer, the nuget packages aren't being restored to the paths defined in the <UnitTestProject>.runtimeconfig.dev.json resulting in the testhost.dll not being determined. The locations used for the nuget packages can be determined using the below : https://docs.microsoft.com/en-us/nuget/consume-packages/managing-the-global-packages-and-cache-folders#viewing-folder-locations
+
+To mitigate the issue and as a general recommendation for running dot net core tests with vstest task please ask the customer to publish the test project and point to the publish location for running tests. Publish ensures all needed dependencies are present for the tests to be executed alongside the test dll in case of dot net core tests.
diff --git a/docs/environment-variables.md b/docs/environment-variables.md
new file mode 100644
index 0000000000..6c066bb6d1
--- /dev/null
+++ b/docs/environment-variables.md
@@ -0,0 +1,309 @@
+# VSTest Environment Variables
+
+This document lists all environment variables that are understood and handled by the Visual Studio Test Platform (VSTest). These variables can be used to configure various aspects of test execution, debugging, diagnostics, and feature behavior.
+
+## Connection and Timeout Variables
+
+### VSTEST_CONNECTION_TIMEOUT
+- **Description**: Sets the timeout in seconds for establishing connections between various test platform components (vstest.console, testhost, datacollector).
+- **Default**: 90 seconds
+- **Example**: `VSTEST_CONNECTION_TIMEOUT=120`
+- **Usage**: Useful on slow machines or when network latency causes connection timeouts.
+
+### VSTEST_TESTHOST_SHUTDOWN_TIMEOUT
+- **Description**: Sets the timeout in milliseconds to wait for testhost to safely shut down.
+- **Default**: 100 milliseconds
+- **Example**: `VSTEST_TESTHOST_SHUTDOWN_TIMEOUT=500`
+- **Usage**: Allows testhost more time to clean up resources before forceful termination.
+
+## Diagnostics and Logging Variables
+
+### VSTEST_DIAG
+- **Description**: Enables diagnostic logging and specifies the path to the log file.
+- **Format**: Path to log directory and log file (e.g., "logs\log.txt")
+- **Example**: `VSTEST_DIAG=C:\temp\logs\vstest.log`
+- **Usage**: Equivalent to the `--diag` command line parameter.
+
+### VSTEST_DIAG_VERBOSITY
+- **Description**: Sets the verbosity level for diagnostic logging when VSTEST_DIAG is enabled.
+- **Valid Values**: `Verbose`, `Info`, `Warning`, `Error`
+- **Default**: `Verbose`
+- **Example**: `VSTEST_DIAG_VERBOSITY=Info`
+
+### VSTEST_LOGFOLDER
+- **Description**: Specifies the folder where test logs should be written.
+- **Example**: `VSTEST_LOGFOLDER=C:\TestLogs`
+
+## Debug Variables
+
+### VSTEST_HOST_DEBUG
+- **Description**: Enables debugging of the testhost process.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_HOST_DEBUG=1`
+
+### VSTEST_HOST_DEBUG_ATTACHVS
+- **Description**: Enables debugging of the testhost process and attempts to attach Visual Studio debugger. Requires AttachVS tool (that can be built in this repo) on PATH.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_HOST_DEBUG_ATTACHVS=1`
+
+### VSTEST_HOST_NATIVE_DEBUG
+- **Description**: Enables native debugging of the testhost process.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_HOST_NATIVE_DEBUG=1`
+
+### VSTEST_RUNNER_DEBUG
+- **Description**: Enables debugging of the test runner (vstest.console).
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_RUNNER_DEBUG=1`
+
+### VSTEST_RUNNER_DEBUG_ATTACHVS
+- **Description**: Enables debugging of the test runner and attempts to attach Visual Studio debugger. Requires AttachVS tool (that can be built in this repo) on PATH.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_RUNNER_DEBUG_ATTACHVS=1`
+
+### VSTEST_RUNNER_NATIVE_DEBUG
+- **Description**: Enables native debugging of the test runner.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_RUNNER_NATIVE_DEBUG=1`
+
+### VSTEST_DATACOLLECTOR_DEBUG
+- **Description**: Enables debugging of data collector processes.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_DATACOLLECTOR_DEBUG=1`
+
+### VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS
+- **Description**: Enables debugging of data collector processes and attempts to attach Visual Studio debugger.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS=1`
+
+### VSTEST_BLAMEDATACOLLECTOR_DEBUG
+- **Description**: Enables debugging of the blame data collector.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_BLAMEDATACOLLECTOR_DEBUG=1`
+
+### VSTEST_DUMPTOOL_DEBUG
+- **Description**: Enables debugging of dump collection tools.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_DUMPTOOL_DEBUG=1`
+
+### VSTEST_DEBUG_ATTACHVS_PATH
+- **Description**: Specifies the path for AttachVS tool, when not found on PATH. AttachVS tool can be built from this repo.
+- **Example**: `VSTEST_DEBUG_ATTACHVS_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe`
+
+### VSTEST_DEBUG_NOBP
+- **Description**: Disables breakpoints on executable entry points, to for more seemless debugging when using AttachVS.
+- **Values**: Set to "1" to disable breakpoints
+- **Example**: `VSTEST_DEBUG_NOBP=1`
+
+## Crash Dump and Blame Collection Variables
+
+### VSTEST_DUMP_PATH
+- **Description**: Overrides the default directory where crash dumps are stored. This disables automatic dump upload via attachments.
+- **Example**: `VSTEST_DUMP_PATH=C:\CrashDumps`
+
+### VSTEST_DUMP_TEMP_PATH
+- **Description**: Specifies the temporary directory for dump collection operations.
+- **Fallback**: Falls back to AGENT_TEMPDIRECTORY, then system temp directory
+- **Example**: `VSTEST_DUMP_TEMP_PATH=C:\temp\dumps`
+
+### VSTEST_DUMP_FORCEPROCDUMP
+- **Description**: Forces the use of ProcDump for crash dump collection.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_DUMP_FORCEPROCDUMP=1`
+
+### VSTEST_DUMP_FORCENETDUMP
+- **Description**: Forces the use of dotnet-dump for crash dump collection.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_DUMP_FORCENETDUMP=1`
+
+### VSTEST_DUMP_PROCDUMPARGUMENTS
+- **Description**: Specifies custom arguments for ProcDump when collecting crash dumps.
+- **Example**: `VSTEST_DUMP_PROCDUMPARGUMENTS=-e 1 -g -t -ma`
+
+### VSTEST_DUMP_PROCDUMPADDITIONALARGUMENTS
+- **Description**: Specifies additional arguments to append to ProcDump command line.
+- **Example**: `VSTEST_DUMP_PROCDUMPADDITIONALARGUMENTS=-r`
+
+## Feature Control Variables (Disable Features)
+
+### VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING
+- **Description**: Disables artifact post-processing functionality.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING=1`
+- **Added**: Version 17.2-preview, 7.0-preview
+
+### VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX
+- **Description**: Disables new SDK UX for artifact post-processing, showing old output format.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX=1`
+- **Usage**: Useful when parsing console output and need to maintain compatibility
+- **Added**: Version 17.2-preview, 7.0-preview
+
+### VSTEST_DISABLE_FASTER_JSON_SERIALIZATION
+- **Description**: Disables the faster JSON serialization mechanism and falls back to standard serialization.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_FASTER_JSON_SERIALIZATION=1`
+
+### VSTEST_DISABLE_MULTI_TFM_RUN
+- **Description**: Forces vstest.console to run all sources using the same target framework (TFM) and architecture instead of allowing multiple different TFMs and architectures to run simultaneously.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_MULTI_TFM_RUN=1`
+
+### VSTEST_DISABLE_SERIALTESTRUN_DECORATOR
+- **Description**: Disables the SerialTestRun decorator.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_SERIALTESTRUN_DECORATOR=1`
+
+### VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST
+- **Description**: Disables sharing of .NET Framework testhosts, returning to the behavior of sharing testhosts when they are running .NET Framework DLLs and are not disabling appdomains or running in parallel.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST=1`
+
+### VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING
+- **Description**: Disables capturing standard output from testhost processes.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING=1`
+
+### VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING
+- **Description**: Disables forwarding standard output from testhost processes.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING=1`
+
+### VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE
+- **Description**: Disables setting a higher value for ThreadPool.SetMinThreads. The higher value allows testhost to connect back faster by avoiding waits for ThreadPool to start more threads.
+- **Values**: Set to any non-zero value to disable
+- **Example**: `VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE=1`
+
+### VSTEST_DISABLE_UTF8_CONSOLE_ENCODING
+- **Description**: Disables setting UTF-8 encoding in console output.
+- **Values**: Set to "1" to disable
+- **Example**: `VSTEST_DISABLE_UTF8_CONSOLE_ENCODING=1`
+
+## Build and MSBuild Integration Variables
+
+### VSTEST_BUILD_DEBUG
+- **Description**: Enables debug output for VSTest build tasks.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_BUILD_DEBUG=1`
+
+### VSTEST_BUILD_TRACE
+- **Description**: Enables trace output for VSTest build tasks.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_BUILD_TRACE=1`
+
+### VSTEST_MSBUILD_NOLOGO
+- **Description**: Suppresses the display of the copyright banner when running tests via MSBuild.
+- **Values**: Set to "1" to suppress logo
+- **Example**: `VSTEST_MSBUILD_NOLOGO=1`
+
+## Telemetry Variables
+
+### VSTEST_TELEMETRY_OPTEDIN
+- **Description**: Controls whether telemetry data is collected and sent.
+- **Values**: Set to "1" to opt in, any other value opts out
+- **Example**: `VSTEST_TELEMETRY_OPTEDIN=1`
+
+### VSTEST_LOGTELEMETRY
+- **Description**: Enables logging of telemetry data to files.
+- **Values**: Set to any non-empty value to enable
+- **Example**: `VSTEST_LOGTELEMETRY=1`
+
+### VSTEST_LOGTELEMETRY_PATH
+- **Description**: Specifies the directory where telemetry log files should be written.
+- **Example**: `VSTEST_LOGTELEMETRY_PATH=C:\TelemetryLogs`
+
+## Performance and Parallelization Variables
+
+### VSTEST_HOSTPRESTART_COUNT
+- **Description**: Sets the number of testhosts to pre-start for improved performance in parallel test execution.
+- **Format**: Integer value
+- **Example**: `VSTEST_HOSTPRESTART_COUNT=4`
+
+## Configuration and Path Variables
+
+### VSTEST_CONSOLE_PATH
+- **Description**: Specifies the path to the vstest.console executable.
+- **Example**: `VSTEST_CONSOLE_PATH=C:\Tools\VSTest\vstest.console.exe`
+
+### VSTEST_IGNORE_DOTNET_ROOT
+- **Description**: When set to a non-zero value, ignores the DOTNET_ROOT environment variable during testhost selection.
+- **Values**: Set to any non-zero value to ignore DOTNET_ROOT
+- **Default**: "0" (respects DOTNET_ROOT)
+- **Example**: `VSTEST_IGNORE_DOTNET_ROOT=1`
+
+### VSTEST_SKIP_FAKES_CONFIGURATION
+- **Description**: Skips Microsoft Fakes configuration during test execution.
+- **Values**: Set to "1" to skip
+- **Example**: `VSTEST_SKIP_FAKES_CONFIGURATION=1`
+
+## UWP (Universal Windows Platform) Variables
+
+### VSTEST_UWP_DEPLOY_LOCAL_PATH
+- **Description**: Overrides the local path for UWP application deployment.
+- **Example**: `VSTEST_UWP_DEPLOY_LOCAL_PATH=C:\UWPApps\LocalDeploy`
+
+### VSTEST_UWP_DEPLOY_REMOTE_PATH
+- **Description**: Overrides the remote path for UWP application deployment.
+- **Example**: `VSTEST_UWP_DEPLOY_REMOTE_PATH=\\RemoteDevice\Deploy`
+
+## Windows App Host Variables
+
+### VSTEST_WINAPPHOST_*
+- **Description**: Various environment variables related to Windows App Host configuration.
+- **Pattern**: Variables following the pattern `VSTEST_WINAPPHOST_{VARIABLE_NAME}`
+- **Usage**: Used internally for Windows App Host test execution scenarios
+
+## Legacy/Experimental Variables
+
+### VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE
+- **Description**: (Deprecated) Previously used to enable output forwarding feature.
+- **Status**: Replaced by VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING and VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING
+- **Note**: This variable is no longer used as the feature is now enabled by default
+
+### VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE
+- **Description**: Disables automatic downgrade to protocol version 3 for compatibility.
+- **Values**: Set to any non-empty value to disable downgrade
+- **Example**: `VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE=1`
+
+## Usage Examples
+
+### Debugging a Test Run
+```bash
+# Enable testhost debugging and increase connection timeout
+set VSTEST_HOST_DEBUG=1
+set VSTEST_CONNECTION_TIMEOUT=300
+dotnet test MyTests.dll
+```
+
+### Collecting Diagnostics
+```bash
+# Enable detailed diagnostic logging
+set VSTEST_DIAG=C:\temp\vstest.log
+set VSTEST_DIAG_VERBOSITY=Verbose
+dotnet test MyTests.dll
+```
+
+### Performance Optimization
+```bash
+# Pre-start testhosts for better parallel performance
+set VSTEST_HOSTPRESTART_COUNT=4
+dotnet test MyTests.dll --parallel
+```
+
+### Crash Dump Collection
+```bash
+# Configure crash dump collection
+set VSTEST_DUMP_PATH=C:\CrashDumps
+set VSTEST_DUMP_FORCEPROCDUMP=1
+dotnet test MyTests.dll --collect:"blame;collectdump=true"
+```
+
+## Notes
+
+- Most debug variables require only being set to any non-empty value to be enabled.
+- Feature disable variables typically use "1" or any non-zero value to disable the feature.
+- Connection timeout values are in seconds unless otherwise specified.
+- Paths should use the appropriate path separator for your operating system.
+- Some variables are only effective in specific scenarios (e.g., UWP variables only apply to UWP test projects).
+
+For more information about VSTest and its features, see the [VSTest documentation](https://github.com/Microsoft/vstest/tree/main/docs).
\ No newline at end of file
diff --git a/docs/extensions/JSTestAdapter.md b/docs/extensions/JSTestAdapter.md
new file mode 100644
index 0000000000..96266174f3
--- /dev/null
+++ b/docs/extensions/JSTestAdapter.md
@@ -0,0 +1,143 @@
+## Seamlessly running JavaScript tests with VSTest
+VSTest provides tremendous extensibility for running tests from many different frameworks. A single test runner to rule them all. To name just a few - NUnit, xUnit, MSTest. Be it running in Visual Studio, CLI or using VSTest task in Azure Pipelines, this extensibility allows you to run any test and get a consistent experience. 
+
+With services becoming more common and UX evolving consistently for fluid and rich experiences, there is a need for JavaScript testing. JavaScript has a plethora of test frameworks, each with it's own runner. Not all of them plug-in seamlessly across the IDE, CLI and a CI pipeline, the way VSTest does. 
+VSTest does have a JavaScript test adapter called Chutzpah, which leverages the extensibility for a consistent experience. However,  Chutzpah limits the available runtime to PhantomJS. PhantomJS is no longer being actively maintained and also limits you to using ECMAScript 5.
+
+#### JSTest to the rescue  
+JSTestAdapter is an open source test adapter extension for VSTest for running, well you guessed it, any kind of JavaScript tests. The adapter has been built with extensibility in mind to allow plugging in a variety of JavaScript test frameworks and environments.
+
+The adapter currently supports nodejs as its runtime environment and three most popular test runners - mocha, jasmine and jest. 
+The JSTestAdapter allows you to leverage the VSTest capabilities for a seamless test execution experience across the VS IDE, CLI and the VSTest task in Azure Pipelines.
+
+JSTest's deep integration with VSTest and Azure Pipelines enables us to leverage the distribution capability for all three of the runners. It also provides the *MSTest style* capability to upload attachments from tests with [jstestcontext](https://github.com/karanjitsingh/jstestcontext) extension. This is especially helpful for UI test failures, by simply uploading the screenshot of the UI we can figure out what went wrong in the Pipelines itself.
+
+####  Running JavaScript tests using the vstest.console.exe CLI
+
+Let's take an example of a basic calculator test.
+
+```javascript
+// Calculator.js
+function add(a, b) {
+    return a + b;
+}
+
+module.exports = {
+    add
+}
+```
+
+```javascript
+// CalculatorTest.js
+const assert = require("assert");
+const calculator = require("./calculator.js")
+
+describe("Calculator tests", () => {
+    
+    it("This test will fail", () => {
+        assert.equal(calculator.add(1, 2), 2);
+    });
+
+    it("This test will pass", () => {
+        assert.equal(calculator.add(1, 2), 3);
+    });
+
+});
+```
+
+And now to setup `jasmine` and `jstestadapter` npm packages.
+
+```powershell
+> npm install jasmine
+> npm install jstestadapter
+```
+
+Running this test is as simple as passing the path to the node module and the path to the test file as arguments.
+
+```powershell
+> vstest.console.exe --TestAdapterPath:.\node_modules\jstestadapter .\calculatortest.js
+```
+
+![Imgur](https://i.imgur.com/bwrEbDJ.png)
+
+Since the default test framework for JSTest is Jasmine, let's try to run the tests with Mocha. 
+
+```powershell
+> vstest.console.exe --TestAdapterPath:.\node_modules\jstestadapter .\calculatortest.js -- JSTest.TestFramework=mocha
+```
+
+`... -- JSTest.TestFramework=mocha` is how run-settings are provided to VSTest. Run setting configurations can also be defined in an xml and passed as a CLI argument to vstest.console.exe, `--Settings:runsettings.xml`. Run settings can also contain configurations specific to the test framework/runner in question. Now let's try this with Jest, since Jest uses file patterns to check for test files, package.json is used as the test file container for running tests through Jest.
+
+```powershell
+vstest.console.exe --Settings:RunSettings.xml --TestAdapterPath:.\node_modules\jstestadapter .\package.json
+```
+
+With RunSettings.xml:
+```xml
+<RunSettings>
+    <JSTest>
+        <TestFramework>jest</TestFramework>
+        <TestFrameworkConfigJson>{
+            "collectCoverage": true,
+            "verbose": true
+        }</TestFrameworkConfigJson>
+    </JSTest>
+</RunSettings>
+```
+
+You can find more options for Jest at https://jestjs.io/docs/en/configuration.html
+
+#### Running JavaScript tests in Azure Pipelines with VSTest task
+
+We can use the VSTest task in Azure Pipelines to run JavaScript tests with VSTest and JSTest. 
+
+1. First, let's go ahead and create a pipeline and add VSTest task to it.
+
+    ![Imgur](https://i.imgur.com/wVinSKh.png)
+
+2. Now that we've added the task let's set it up to run JavaScript tests with `jstestadapter`, we fill in the test pattern for the test files and make sure to exclude js files from node_modules.
+
+   ![Imgur](https://i.imgur.com/ONBBy1r.png)
+
+3. Finally, we configure the task with `RunSettings.xml` and a path to the `jstestadapter` node module as the path to the tests adapter path
+
+   ![Imgur](https://i.imgur.com/cKoZIJl.png)
+
+Here's the yaml for the same:
+
+```yml
+- task: VSTest@2
+  displayName: 'VsTest - testAssemblies'
+  inputs:
+    testAssemblyVer2: |
+     **\*Tests.js
+     !**\node_modules\**\*.js
+    runSettingsFile: RunSettings.xml
+    pathtoCustomTestAdapters: '$(System.DefaultWorkingDirectory)\node_modules\jstestadapter'
+```
+
+#### Distributing JavaScript tests in Azure Pipelines with VSTest task
+
+To run these tests with distribution across multiple agents:
+
+1. First we need to configure the job for multi-agent parallelism.
+
+   ![Imgur](https://i.imgur.com/B63yBoF.png)
+
+2. Next, we go ahead and configure distribution in the task. In this particular scenario, default values for distribution remains same. So as long as we've enabled multi-agent parallelism in the pipeline we do not need to change any property for Advanced Execution in VSTest. Hence the yaml for the task remains the same.
+
+   ![Imgur](https://i.imgur.com/Uv1IBRC.png)
+
+*Since multi-configuration and multi-agent job options are not exported to YAML. They can be configured by following this guide, https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml.*
+
+#### Limitations
+
+While the adapter was designed to be cross-platform there are still a few issues with JSTest when trying to run it with .NET core build for VSTest. Along with not smoothly being able to run on Linux (there are a few workarounds to get it to work), even though the architecture is designed to be runtime and test framework abstracted but currently there is no public API to leverage that extensible design.
+
+#### Conclusion
+
+JSTest provides a fantastic way of running any kinds of tests through node in a pipeline setting like Azure Devops Pipeline. With support for the latest trend in JavaScript, Jest, testing and node runtime, it makes it possible to run about any kind of tests.
+
+The JavaScript tests for the adapter itself are run through the adapter, checkout the [_testception_](https://dev.azure.com/karanjitsingh/JSTestAdapter/_build?definitionId=4) in action for yourself.
+
+###### Source: [JSTestAdapter Repo](https://github.com/karanjitsingh/JSTestAdapter/)
diff --git a/docs/extensions/blame-datacollector.md b/docs/extensions/blame-datacollector.md
new file mode 100644
index 0000000000..91ad538ed1
--- /dev/null
+++ b/docs/extensions/blame-datacollector.md
@@ -0,0 +1,20 @@
+# Motivation
+Certain execution sequences can crash the testhost process spawned by the vstest runner. However there is no easy way to diagnose such an aborted test run since there is no way to know what specific test case was running at the time. The "blame" mode in vstest tracks the tests as they are executing and, in the case of the testhost process crashing, emits the tests names in their sequence of execution up to and including the specific test that was running at the time of the crash. This makes it easier to isolate the offending test and diagnose further.
+
+# Syntax
+```vstest.console.exe /blame``` or ```dotnet test --blame```
+
+# Output
+If the testhost process had crashed, then the fully qualified names of the tests in their sequence of execution up to and including the specific test that was running at the time of the crash, is emitted into a sequence.xml file created under the TestResults folder.
+
+## Example
+Here is an example of the emitted xml file.
+
+```xml
+<?xml version="1.0"?>
+<TestSequence>
+  <Test Name="TestProject.UnitTest1.TestMethodBBB" Source="D:\repos\TestProject\TestProject\bin\Debug\TestProject.dll" />
+  <Test Name="TestProject.UnitTest1.TestMethodAAA" Source="D:\repos\TestProject\TestProject\bin\Debug\TestProject.dll" />
+</TestSequence>
+```
+In this case, the <Test Name> listed last is the test that was running at the time of the crash.  
diff --git a/docs/extensions/datacollector-migration.md b/docs/extensions/datacollector-migration.md
new file mode 100644
index 0000000000..4ff2ab527b
--- /dev/null
+++ b/docs/extensions/datacollector-migration.md
@@ -0,0 +1,46 @@
+# DataCollector Migration 
+TestPlatform has introduced differences and enhancements to the data collection infrastructure. If you already have written data collectors for previous versions of TestPlatform, then you will need to migrate them.
+This document will walk you through the changes that are required to migrate your TMI/MSTest.exe based DataCollector to work with TestPlatform.
+
+## Referencing DataCollector Framework
+Previously, `DataCollector` abstract class was present in `Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll` under namespace `Microsoft.VisualStudio.TestTools.Execution`.
+
+Now, `DataCollector`abstract class is present in Object Model. Add reference to [`Microsoft.TestPlatform.ObjectModel`](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20170810-02)  (preview) nuget package. DataCollector APIs are present under namespace `Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection`.
+It is recommended to target your DataCollector to netstandard, so that it can also run cross-platform, i.e. on non-Windows operating systems.
+For more info, refer to this [guide](./docs/extensions/datacollector.md).
+
+## Deprecated Attributes
+Currently `DataCollectorFriendlyNameAttribute` and `DataCollectorTypeUriAttribute` are the only attributes that are supported. 
+Following attributes have been deprecated and should be removed if already being used.
+* `DataCollectorEnabledByDefaultAttribute`
+* `DataCollectorDescriptionAttribute`
+* `DataCollectorConfigurationEditorTypeUriAttribute`
+* `DataCollectorSupportsTailoredApplicationsAttribute`
+* `DataCollectorVersionObsoleteAttribute` 
+* `DataCollectorConfigurationEditorAttribute`
+
+These attributes don't serve any purpose in TestPlatform and therefore, have been removed.
+
+## Deprecated Events
+Currently, four events are exposed to DataCollectors through `DataCollectionEvents`:
+* Session Start.
+* Test Case Start.
+* Test Case End.
+* Session End.
+
+Following ten events that were exposed to DataCollectors through `DataCollectionEvents` have been deprecated and should be removed if already being used:
+* Session Pause.
+* Session Resume.
+* Test Case Pause.
+* Test Case Resume.
+* Test Case Reset.
+* Test Case Failed.
+* Test Step Start.
+* Test Step End.
+* Data Request.
+* Custom Notification.
+
+These events are no longer supported in TestPlatform and hence, these have been removed from DataCollection infrastructure as well.
+
+## DataCollector RunSettings
+DataCollector RunSettings are highly compatible in all the versions of TestPlatform and old settings should continue to work with TestPlatform. For more info on runsettings, refer to [Configure DataCollectors](./docs/analyze.md#configure-datacollectors).
diff --git a/docs/extensions/datacollector.md b/docs/extensions/datacollector.md
new file mode 100644
index 0000000000..67aeabfddf
--- /dev/null
+++ b/docs/extensions/datacollector.md
@@ -0,0 +1,178 @@
+# Your first datacollector
+DataCollectors are used to monitor test execution. Getting CPU or memory usage info, taking screenshot, recording screen activity, measuring code coverage, etc. while executing tests are a few common scenarios that can be realised through DataCollectors. You can write your own data collectors to meet your specific requirements and use it while executing tests.
+
+In this walkthrough, you will learn how to create your first `DataCollector` and how to plug it in while executing test cases. 
+
+## Extend DataCollector
+The very first thing you will need to create is a Class Library project and add reference to `Microsoft.TestPlatform.ObjectModel` nuget package.
+Class Library project can target Desktop clr or dotnet core clr or both frameworks.
+
+> **DataCollector Assembly Naming Convention**
+>
+> When test platform is looking for a DataCollector it will likely need to examine many
+> assemblies. As an optimization, test platform will only look at distinctly named
+> assemblies, specifically, a DataCollector must follow the naming convention
+> `*collector.dll`. By enforcing such a naming convention, test platform can speed up
+> locating a DataCollector assembly. Once located, test platform will load the data
+> collector for the entire run.
+
+A new data collector can be implemented by extending the abstract `DataCollector` class. 
+
+```csharp
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+[DataCollectorFriendlyName("NewDataCollector")]
+[DataCollectorTypeUri("my://new/datacollector")]
+public class NewDataCollector : DataCollector
+{
+    private string logFileName;
+    private DataCollectionEnvironmentContext context;
+
+    public override void Initialize(
+            System.Xml.XmlElement configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext environmentContext)
+    {
+        events.SessionStart += this.SessionStarted_Handler;
+        events.TestCaseStart += this.Events_TestCaseStart;
+        logFileName = configurationElement["LogFileName"];
+    }
+    
+    private void SessionStarted_Handler(object sender, SessionStartEventArgs args)
+    {
+        var filename = Path.Combine(AppContext.BaseDirectory, logFileName);
+        File.WriteAllText(filename, "SessionStarted");
+        this.dataCollectionSink.SendFileAsync(this.context.SessionDataCollectionContext, filename, true);
+        this.logger.LogWarning(this.context.SessionDataCollectionContext, "SessionStarted");
+    }
+
+
+    private void Events_TestCaseStart(object sender, TestCaseStartEventArgs e)
+    {
+        this.logger.LogWarning(this.context.SessionDataCollectionContext, "TestCaseStarted " + e.TestCaseName);
+    }
+}
+```
+TestPlatform uniquely identifies each of the DataCollector by `DataCollectorFriendlyName` and `DataCollectorTypeUri`.
+
+Here is a brief description of each of the argument that is passed in constructor.
+
+### Configuration Element
+At times, there is a need to pass configuration settings for initializing data collectors that could vary between test runs. 
+E.g. module names to exclude from code coverage.
+For supporting those scenarios, configuration xml can be passed to DataCollectors using runsettings.
+```xml
+<RunSettings>
+    <DataCollectionRunSettings>
+        <DataCollectors>
+            <DataCollector friendlyName="NewDataCollector">
+                <Configuration>
+                    <LogFileName>DataCollectorLogs.txt</LogFileName>
+                </Configuration>
+            </DataCollector>
+        </DataCollectors>
+    </DataCollectionRunSettings>
+</RunSettings>
+```
+```csharp
+XmlElement logFileElement = configurationElement[LogFileName];
+string logFile = logFileElement != null ? logFileElement.InnerText : string.Empty;
+if (!File.Exists(logFile))
+{
+    // Create a file to write to.
+    string createText = "Hello and Welcome" + Environment.NewLine;
+    File.WriteAllText(path, createText);
+}
+```
+
+### DataCollectionEvents
+DataCollectors can choose to subscribe to the following events exposed by `DataCollectionEvents` 
+1. TestSessionStart : Raised when test execution session starts.
+2. TestSessionEnd : Raised when test execution session ends.
+3. TestCaseStart : Raised when test case execution starts.
+4. TestCaseEnd : Raised when test case execution ends.
+5. TestHostLaunched : Raised when test host process has been initialized. **Note: This will be available from 15.7**
+
+```csharp
+events.SessionStart += this.SessionStarted_Handler;
+events.SessionEnd += this.SessionEnded_Handler;
+events.TestCaseStart += this.Events_TestCaseStart;
+events.TestCaseEnd += this.Events_TestCaseEnd;
+events.TestHostLaunched += this.TestHostLaunched_Handler
+```
+```csharp
+private void Events_TestCaseStart(object sender, TestCaseStartEventArgs e)
+{
+}
+```
+### DataCollectionSink
+DataCollectors can create files while handling events and send these files to test runner using `DataCollectionSink`.
+
+```csharp
+dataSink.SendFileAsync(context, filename, true);
+```
+
+Files sent using above api get associated with session level attachments or test case level attachments based on the context passed.
+
+### DataCollectionEnvironmentContext
+DataCollector framework maintains a session level context for test exectuion session and test level contexts for each test that gets executed.
+`DataCollectionEnvironmentContext` passed as argument in constructor has session level context that can be accessed through property `SessionDataCollectionContext`.
+Test case level context can be accessed through `TestCaseStartEventArgs.Context` or `TestCaseEndEventArgs.Context`.
+
+```csharp
+private void Events_TestCaseStart(object sender, TestCaseStartEventArgs e)
+{
+    // Session level attachment
+    this.dataCollectionSink.SendFileAsync(this.context.SessionDataCollectionContext, filename, true);
+    // TestCase level attachment
+    this.dataCollectionSink.SendFileAsync(e.Context, filename, true);
+}
+```
+
+### DataCollectionLogger
+DataCollectors can also log errors or warnings using `DataCollectionLogger`.
+```csharp
+logger.LogError(this.context.SessionDataCollectionContext, new Exception("my exception"));
+logger.LogWarning(this.context.SessionDataCollectionContext, "my warning");
+```
+
+### DataCollection Environment Variables
+DataCollectors can choose to specify information about how the test execution environment should be set up by implementing `ITestExecutionEnvironmentSpecifier`.
+E.g. setting up the Environment Variables required by profiler engine for code coverage.
+
+```csharp
+[DataCollectorFriendlyName("NewDataCollector")]
+[DataCollectorTypeUri("my://new/datacollector")]
+class NewDataCollector : DataCollector, ITestExecutionEnvironmentSpecifier
+{
+    public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
+    {
+    }
+}
+```
+Environment variables returned by the above method are set in the test execution process while bootstraping.
+
+## Using DataCollector
+Once the DataCollector is compiled, it can be used to monitor test execution. There are two ways by which datacollectors can be plugged in:
+1. Using /collect switch :
+`vstest.console.exe <TestLibrary> /collect:<DataCollector FriendlyName> /testadapterpath:<Path to test adapter> /testadapterpath:<Path to DataCollector>`
+
+2. Using runsettings :
+`vstest.console.exe <TestLibrary> /settings:<Path to runsettings file>
+```xml
+<RunSettings>
+    <DataCollectionRunSettings>
+        <DataCollectors>
+            <DataCollector friendlyName="NewDataCollector" />
+        </DataCollectors>
+    </DataCollectionRunSettings>
+</RunSettings>
+```
+## Results
+Attachments sent by DataCollectors will be part of Test Results and can also be viewed in .trx report, if specified.
+Logs sent by DataCollectors will be displayed in console logger and can also be viewed in .trx report, if specified.
+
+## Samples
+1. We have implemented a sample data collector [here](https://github.com/Microsoft/vstest/tree/main/test/TestAssets/OutOfProcDataCollector).
diff --git a/docs/filter.md b/docs/filter.md
new file mode 100644
index 0000000000..9cd974f300
--- /dev/null
+++ b/docs/filter.md
@@ -0,0 +1,194 @@
+# TestCase filter
+
+This document will help you to selectively execute tests based on filtering conditions through `--filter` for `dotnet test` and `--testcasefilter` for `vstest.console.exe`.
+
+### Syntax
+
+   `dotnet test --filter <Expression>` or
+   `vstest.console.exe --testcasefilter:<Expression>`
+
+**Expression** is in the format __\<property>\<operator>\<value>[|&\<Expression>]__. Expressions can be
+enclosed in paranthesis. e.g. `(Name~MyClass) | (Name~MyClass2)`.
+
+> `vstest 15.1+`: An expression without any **operator** is automatically considered as a `contains` on `FullyQualifiedName` property.
+E.g. `dotnet test --filter xyz` is same as `dotnet test --filter FullyQualifiedName~xyz`.
+
+**Property** is an attribute of the `Test Case`. For example, the following are the properties
+supported by popular unit test frameworks.
+
+| Test Framework | Supported properties |
+| -------------- | -------------------- |
+| MSTest         | <ul><li>FullyQualifiedName</li><li>Name</li><li>ClassName</li><li>Priority</li><li>TestCategory</li></ul> |
+| Xunit          | <ul><li>FullyQualifiedName</li><li>DisplayName</li><li>Traits</li></ul> |
+| NUnit          | <ul><li>FullyQualifiedName</li><li>Name</li><li>Priority</li><li>TestCategory</li><li>Category</li><li>Property</li></ul>|
+
+Allowed **operators**:
+
+* `=` implies an exact match
+* `!=` implies an exact not match
+* `~` implies a contains lookup
+* `!~` implies a not contains lookup
+
+**Value** is a string. All the lookups are case insensitive.
+
+**Escape Sequences** must be used to represent characters in the value that have special meanings in the filter, i.e. filter operators.
+
+| Escape Sequence | Represents |
+| -------------- | -------------------- |
+| \\\\            |  \\                   |
+| \\(             |  (                   |
+| \\)             |  )                   |
+| \\&             |  &                   |
+| \\\|             |  \|                   |
+| \\=             |  =                   |
+| \\!             |  !                   |
+| \\~             |  ~                   |
+
+A helper method `Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.Escape`
+is also available by referencing the `Microsoft.VisualStudio.TestPlatform.ObjectModel` NuGet package, which can be used to escape strings programatically.
+
+Expressions can be joined with boolean operators. The following boolean operators are supported:
+
+* `|` implies a boolean `OR`
+* `&` implies a boolean `AND`
+
+## Examples
+
+The following examples use `dotnet test`, if you're using `vstest.console.exe` replace `--filter` with `--testcasefilter:`.
+
+### MSTest
+
+```CSharp
+namespace MSTestNamespace
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class UnitTestClass1
+    {
+        [Priority(2)]
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+
+        [TestCategory("CategoryA")]
+        [Priority(3)]
+        [TestMethod]
+        public void TestMethod2()
+        {
+        }
+    }
+}
+```
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter Method` | Runs tests whose `FullyQualifiedName` contains `Method`. Available in `vstest 15.1+`. |
+| `dotnet test --filter Name~TestMethod1` | Runs tests whose name contains `TestMethod1`. |
+| `dotnet test --filter ClassName=MSTestNamespace.UnitTestClass1` | Runs tests which are in the class  `MSTestNamespace.UnitTestClass1`. <br/>**Note:** The ClassName value should have a namespace, ClassName=UnitTestClass1 won't work. |
+| `dotnet test --filter FullyQualifiedName!=MSTestNamespace.UnitTestClass1.TestMethod1` | Runs all tests except `MSTestNamespace.UnitTestClass1.TestMethod1`. |
+| `dotnet test --filter TestCategory=CategoryA` | Runs tests which are annotated with `[TestCategory("CategoryA")]` |
+| `dotnet test --filter Priority=3` | Runs tests which are annotated with `[Priority(3)]`.**Note:** `Priority~3` is invalid as Priority is an int not a string. |
+
+#### Using Logical operators `| and &`
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter "FullyQualifiedName~UnitTestClass1\|TestCategory=CategoryA"` | Runs tests which have `UnitTestClass1` in FullyQualifiedName **or** TestCategory is CategoryA. |
+| `dotnet test --filter "FullyQualifiedName~UnitTestClass1&TestCategory=CategoryA"` | Runs tests which have `UnitTestClass1` in FullyQualifiedName **and** TestCategory is CategoryA. |
+| `dotnet test --filter "(FullyQualifiedName~UnitTestClass1&TestCategory=CategoryA)\|Priority=1"` | Runs tests which have either FullyQualifiedName contains `UnitTestClass1` and TestCategory is CategoryA or Priority is 1. |
+
+### xUnit
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter DisplayName=XUnitNamespace.TestClass1.Test1` | Runs only one test `XUnitNamespace.TestClass1.Test1`. |
+| `dotnet test --filter FullyQualifiedName!=XUnitNamespace.TestClass1.Test1` | Runs all tests except `XUnitNamespace.TestClass1.Test1` |
+| `dotnet test --filter DisplayName~TestClass1` | Runs tests whose display name contains `TestClass1`. |
+
+#### Using traits for filter
+
+```CSharp
+namespace XUnitNamespace
+{
+    public class TestClass1
+    {
+        [Trait("Category", "bvt")]
+        [Trait("Priority", "1")]
+        [Fact]
+        public void foo()
+        {
+        }
+
+        [Trait("Category", "Nightly")]
+        [Trait("Priority", "2")]
+        [Fact]
+        public void bar()
+        {
+        }
+    }
+}
+
+```
+
+In above code we defined traits with keys `Category` and `Priority` which can be used for filtering.
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter XUnit` | Runs tests whose `FullyQualifiedName` contains `XUnit`.  Available in `vstest 15.1+`. |
+| `dotnet test --filter Category=bvt` | Runs tests which have `[Trait("Category", "bvt")]`. |
+
+#### Using Logical operators `| and &`
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter "FullyQualifiedName~TestClass1\|Category=Nightly"` | Runs tests which have `TestClass1` in FullyQualifiedName **or** Category is Nightly. |
+| `dotnet test --filter "FullyQualifiedName~TestClass1&Category=Nightly"` | Runs tests which have `TestClass1` in FullyQualifiedName **and** Category is Nightly. |
+| `dotnet test --filter "(FullyQualifiedName~TestClass1&Category=Nightly)\|Priority=1"` | Runs tests which have either FullyQualifiedName contains `TestClass1` and Category is CategoryA or Priority is 1. |
+
+### NUnit
+
+```csharp
+namespace NUnitTestNamespace;
+
+public class TestClass
+{
+    [Property("Priority","1")]
+    [Test]
+    public void Test1()
+    {
+        Assert.Pass();
+    }
+
+    [Property("Whatever", "SomeValue")]
+    [Test]
+    public void Test2()
+    {
+        Assert.Pass();
+    }
+
+    [Category("SomeCategory")]
+    [Test]
+    public void Test3()
+    {
+        Assert.Pass();
+    }
+}
+```
+
+#### Usage of the filters
+
+| Expression | What it does? |
+| ---------- | ------------- |
+| `dotnet test --filter FullyQualifiedName=NUnitTestNamespace.TestClass.Test1` | Runs only the given test |
+| `dotnet test --filter Name=Test1` | Runs all tests whose test name (method) equals `Test1`. |
+| `dotnet test --filter Name=TestClass` | Runs tests within all classes named `TestClass`. |
+| `dotnet test --filter Name=NUnitTestNamespace` | Runs all tests within the namespace `NUnitTestNamespace`. |
+| `dotnet test --filter Priority=1` | Runs tests with property named Priority and value = 1`. |
+| `dotnet test --filter Whatever=TestClass` | Runs tests with property named `Whatever` and value = `SomeValue`. |
+| `dotnet test --filter Category=SomeCategory` | Runs tests with category set to `SomeCategory`.  Note: You can also use TestCategory in the filter. |
+
+Logical operators works the same as for the other frameworks.
+
+
diff --git a/docs/issuetracking.md b/docs/issuetracking.md
new file mode 100644
index 0000000000..d82e97c55c
--- /dev/null
+++ b/docs/issuetracking.md
@@ -0,0 +1,71 @@
+# Issue tracking
+
+The vstest project tracks issues and feature requests using the [issue template](../.github/ISSUE_TEMPLATE.md) for the vstest repository.
+
+## Submitting an Issue
+
+First, please do a search in [issues](https://github.com/Microsoft/vstest/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/vstest/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc) to search for the most popular feature requests.
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
+
+- 👍 - upvote
+- 👎 - downvote
+
+If you cannot find an existing issue that describes your issue, submit it using the [issue template](../.github/ISSUE_TEMPLATE.md). Remember to follow the instruction mentioned therein carefully.
+
+## Issue triage
+
+Please follow the guidelines in the issue template when filing an issue or a pull request.
+New issues or pull requests submitted by the community are triaged by a team member using the inbox query below.
+
+## Inbox query
+
+The [inbox query](https://github.com/Microsoft/vstest/issues?utf8=%E2%9C%93&q=is%3Aopen%20no%3Aassignee%20-label%3Abacklog%20-label%3Aenhancement) will return the following:
+
+- Open issues or pull requests that are not enhancements and that have no owner assigned.
+
+## Initial triage - Issue tagging
+
+Issues will then be tagged as follows:
+
+- Is the issue ***invalid***? It will be closed, and the reason will be provided.
+- Is the issue a ***general question***, like *are data collector events synchronous*? It will be tagged as a ***question***.
+- Is the issue a feature request or an enhancement. It will be tagged as an ***enhancement***.
+- Else, the issue will be tagged as a ***bug***.
+
+## Secondary triage – assignment and follow through
+
+As and when an issue get assigned to a team member, the following secondary triage will happen
+
+- When a team member picks up an issue, they will first assign it to themselves.
+- Ensure that the issue has an appropriate tag (***question***, ***enhancement***, ***bug***).
+- If an issue needs a repro, tag it with ***need-repro*** and ask for a repro in a comment.
+
+## Ongoing issue management
+
+- Issues tagged ***need-repro*** info will be closed if no additional information is provided for 7 days.
+
+Team members will strive to resolve every bug within a stipulated period of time – we would like that to be a period of 14 days from the date the issue was filed.
+
+# Community contributions - up-for-grabs
+
+We strongly encourage the community to contribute enhancements and bug-fixes. Therefore, team members will look to add as much information in the issues as required so that you can make an effective contribution. Such issues will be tagged ***up-for-grabs***.
+
+# Planning
+
+## Triage
+
+Bugs and enhancements will be assigned a milestone, and within a milestone they will be assigned a priority. The priority dictates the order in which issues should be addressed. A important bug (something that we think is critical for the milestone) is to be addressed before the other bugs.
+
+To find out when a bug fix will be available in an update, then please check the milestone that is assigned to the issue.
+Please see Issue Tracking for a description of the different workflows we are using.
+
+## Milestone planning
+
+We typically plan for a quarter and establish a set of themes we want to work towards, and prioritize enhancements and bug-fixes accordingly.
+During the planning process we prioritize items as follows:
+
+- Important ***bugs*** - crashes, regressions, and issues that do not have a reasonable workaround.
+- ***Enhancements*** that have many reactions.
+
+Accordingly, we publish the backlog and update the roadmap.
+We will work on the items in sprintly (3 week) iterations. At the end of each iteration, we want to have a version of vstest that can be used by the community.
diff --git a/docs/quickstart.md b/docs/quickstart.md
new file mode 100644
index 0000000000..47bf600165
--- /dev/null
+++ b/docs/quickstart.md
@@ -0,0 +1 @@
+# Quickstart Guide
diff --git a/docs/releases.md b/docs/releases.md
new file mode 100644
index 0000000000..4dff5241d5
--- /dev/null
+++ b/docs/releases.md
@@ -0,0 +1,2485 @@
+# Release Notes
+
+## 17.6.1 and newer
+
+Please see release notes directly in the release page: https://github.com/microsoft/vstest/releases
+
+## 17.6.0
+
+### Issues Fixed
+
+* Add legacy feeds
+* [rel/17.6] Fix Newtonsoft versions in testhost.deps.json [#4372](https://github.com/microsoft/vstest/pull/4372)
+* Revert "Revert "Fix signature verification" (#4333" [#4345](https://github.com/microsoft/vstest/pull/4345)
+* Revert "Fix signature verification" [#4333](https://github.com/microsoft/vstest/pull/4333)
+* Fix signature verification [#4331](https://github.com/microsoft/vstest/pull/4331)
+* Pre-start testhosts [#3666](https://github.com/microsoft/vstest/pull/3666)
+* Add `dotnet vstest` deprecation message [#4297](https://github.com/microsoft/vstest/pull/4297)
+* Catch unhandled exception and avoid crash on test host exit [#4291](https://github.com/microsoft/vstest/pull/4291)
+* Remove chutzpah [#4249](https://github.com/microsoft/vstest/pull/4249)
+* Fix string conversion of `Microsoft.TestPlatform.Extensions.TrxLogger.ObjectMode.TestOutcome` [#4243](https://github.com/microsoft/vstest/pull/4243)
+* Fix potential trx logger NRE [#4240](https://github.com/microsoft/vstest/pull/4240)
+* handle object disposed exception [#4221](https://github.com/microsoft/vstest/pull/4221)
+* Added support for checking testhost compatibility with test sessions [#4199](https://github.com/microsoft/vstest/pull/4199)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.5.0...v17.6.0)
+
+### Artifacts
+
+* TestPlatform vsix: [17.6.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.6/20230515-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.6.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.6.0)
+
+## 17.3.3
+
+### Issues Fixed
+* [rel/17.3] Update Newtonsoft.Json to 13.0.1 [#4299](https://github.com/microsoft/vstest/pull/4299)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.2...v17.3.3)
+
+### Drops
+
+* TestPlatform vsix: [17.3.3](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.3/20230324-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.3](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.3)
+
+## 17.2.1
+
+### Issues Fixed
+
+* [rel/17.2] Update Newtonsoft.Json to 13.0.1 [#4310](https://github.com/microsoft/vstest/pull/4310)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0...v17.2.1)
+
+### Drops
+
+* TestPlatform vsix: [17.2.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.2/20230324-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.1)
+
+## 17.0.2
+
+### Issues Fixed
+
+* [rel/17.0] Update Newtonsoft.Json to 13.0.1 [#4309](https://github.com/microsoft/vstest/pull/4309)
+* [rel/17.0] Update dependencies from devdiv/DevDiv/vs-code-coverage [#3159](https://github.com/microsoft/vstest/pull/3159)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.0.0...v17.0.2)
+
+### Drops
+
+* TestPlatform vsix: [17.0.2](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.0/20230324-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.0.2](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.0.2)
+
+## 17.6.0-preview-20230223-05
+
+### Issues Fixed
+
+* Pre-start testhosts [#3666](https://github.com/microsoft/vstest/pull/3666)
+* Add `dotnet vstest` deprecation message [#4297](https://github.com/microsoft/vstest/pull/4297)
+* Catch unhandled exception and avoid crash on test host exit [#4291](https://github.com/microsoft/vstest/pull/4291)
+* Remove chutzpah [#4249](https://github.com/microsoft/vstest/pull/4249)
+* Fix string conversion of `Microsoft.TestPlatform.Extensions.TrxLogger.ObjectMode.TestOutcome` [#4243](https://github.com/microsoft/vstest/pull/4243)
+* Fix potential trx logger NRE [#4240](https://github.com/microsoft/vstest/pull/4240)
+* handle object disposed exception [#4221](https://github.com/microsoft/vstest/pull/4221)
+* Added support for checking testhost compatibility with test sessions [#4199](https://github.com/microsoft/vstest/pull/4199)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.5.0-preview-20221221-03...v17.6.0-preview-20230223-05)
+
+### Artifacts
+
+* TestPlatform vsix: [17.6.0-preview-20230223-05](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20230223-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.6.0-preview-20230223-05](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.6.0-preview-20230223-05)
+
+## 17.5.0
+
+### Issues Fixed
+
+* Fix SDK issue [#4278](https://github.com/microsoft/vstest/pull/4278)
+* Add test run serialization feature [#4126](https://github.com/microsoft/vstest/pull/4126)
+* Ensure that the OnAbort message is sent if the testhost aborts early [#3993](https://github.com/microsoft/vstest/pull/3993)
+* Add custom satellite assemblies resolution [#4133](https://github.com/microsoft/vstest/pull/4133)
+* Fixed muxer resolution strategy enum [#4134](https://github.com/microsoft/vstest/pull/4134)
+* Fixed dotnet resolution for in-process vstest.console scenarios [#4122](https://github.com/microsoft/vstest/pull/4122)
+* Ensure to not produce and ship exe for netcore [#4124](https://github.com/microsoft/vstest/pull/4124)
+* Fixed testhost crash for net7 [#4112](https://github.com/microsoft/vstest/pull/4112)
+* Revert "Run tests with Server GC enabled & concurrent GC disabled. (#3661)" [#4108](https://github.com/microsoft/vstest/pull/4108)
+* Revert making Microsoft.NET.Test.Sdk package transitive [#4104](https://github.com/microsoft/vstest/pull/4104)
+* Fix recursive resource lookup [#4095](https://github.com/microsoft/vstest/pull/4095)
+* Fixed CC for in-process console scenarios [#4084](https://github.com/microsoft/vstest/pull/4084)
+* Fixed test session issues [#4075](https://github.com/microsoft/vstest/pull/4075)
+* Fix Invalid target architecture 'S390x' error [#4066](https://github.com/microsoft/vstest/pull/4066)
+* Add Mono.Cecil.Rocks [#4071](https://github.com/microsoft/vstest/pull/4071)
+* Revert "Revert "Re-enable arm64 ngen (#3931)" (#3948)" [#3951](https://github.com/microsoft/vstest/pull/3951)
+* Update docker to the latest tagging schema [#4041](https://github.com/microsoft/vstest/pull/4041)
+* Update resources [#4063](https://github.com/microsoft/vstest/pull/4063)
+* Use environment variables for AeDebugger mode [#4049](https://github.com/microsoft/vstest/pull/4049)
+* Add postmortem blame mode [#4032](https://github.com/microsoft/vstest/pull/4032)
+* Add VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE feature flag [#4046](https://github.com/microsoft/vstest/pull/4046)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.4.1...v17.5.0)
+
+### Artifacts
+
+* TestPlatform vsix: [17.5.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.5/20230221-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [17.5.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.5.0)
+
+## 17.5.0-preview-20221221-03
+
+### Issues Fixed
+
+* Add test run serialization feature [#4126](https://github.com/microsoft/vstest/pull/4126)
+* Ensure that the OnAbort message is sent if the testhost aborts early [#3993](https://github.com/microsoft/vstest/pull/3993)
+* Add custom satellite assemblies resolution [#4133](https://github.com/microsoft/vstest/pull/4133)
+* Fixed muxer resolution strategy enum [#4134](https://github.com/microsoft/vstest/pull/4134)
+* Fixed dotnet resolution for in-process vstest.console scenarios [#4122](https://github.com/microsoft/vstest/pull/4122)
+* Ensure to not produce and ship exe for netcore [#4124](https://github.com/microsoft/vstest/pull/4124)
+* Fixed testhost crash for net7 [#4112](https://github.com/microsoft/vstest/pull/4112)
+* Revert "Run tests with Server GC enabled & concurrent GC disabled. (#3661)" [#4108](https://github.com/microsoft/vstest/pull/4108)
+* Revert making Microsoft.NET.Test.Sdk package transitive [#4104](https://github.com/microsoft/vstest/pull/4104)
+* Fix recursive resource lookup [#4095](https://github.com/microsoft/vstest/pull/4095)
+* Fixed CC for in-process console scenarios [#4084](https://github.com/microsoft/vstest/pull/4084)
+* Fixed test session issues [#4075](https://github.com/microsoft/vstest/pull/4075)
+* Fix Invalid target architecture 'S390x' error [#4066](https://github.com/microsoft/vstest/pull/4066)
+* Add Mono.Cecil.Rocks [#4071](https://github.com/microsoft/vstest/pull/4071)
+* Revert "Revert "Re-enable arm64 ngen (#3931)" (#3948)" [#3951](https://github.com/microsoft/vstest/pull/3951)
+* Update docker to the latest tagging schema [#4041](https://github.com/microsoft/vstest/pull/4041)
+* Update resources [#4063](https://github.com/microsoft/vstest/pull/4063)
+* Use environment variables for AeDebugger mode [#4049](https://github.com/microsoft/vstest/pull/4049)
+* Add postmortem blame mode [#4032](https://github.com/microsoft/vstest/pull/4032)
+* Add VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE feature flag [#4046](https://github.com/microsoft/vstest/pull/4046)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.5.0-preview-20221003-04...v17.5.0-preview-20221221-03)
+
+### Artifacts
+
+* TestPlatform vsix: [17.5.0-preview-20221221-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.5/20221221-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.5.0-preview-20221221-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.5.0-preview-20221221-03)
+
+## 17.4.1
+
+### Issues Fixed
+
+* Fix satellite resolution for Microsoft.TestPlatform.Common [#4147](https://github.com/microsoft/vstest/pull/4147)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.4.0...v17.4.1)
+
+### Drops
+
+* TestPlatform vsix: [17.4.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.4/20221215-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.4.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.1)
+
+## 17.4.0
+
+### Issues Fixed
+
+* Revert "Run tests with Server GC enabled & concurrent GC disabled. (#3661)" (#4108) [#4109](https://github.com/microsoft/vstest/pull/4109)
+* Revert making Microsoft.NET.Test.Sdk package transitive [#4105](https://github.com/microsoft/vstest/pull/4105)
+* [rel/17.4] Fix Invalid target architecture 'S390x' error [#4079](https://github.com/microsoft/vstest/pull/4079)
+* Fix release note and prebuild scripts
+* [rel/17.4] Remove portable CPP adapter and dbghelp [#4020](https://github.com/microsoft/vstest/pull/4020)
+* Mirror test commit.
+* Fix ManagedNameHelper to support namespaceless methods. [#4003](https://github.com/microsoft/vstest/pull/4003)
+* Remove netstandard telemetry dependencies [#4007](https://github.com/microsoft/vstest/pull/4007)
+* Playground project file refactored. [#4002](https://github.com/microsoft/vstest/pull/4002)
+* Fixed wording for Github issue template [#3998](https://github.com/microsoft/vstest/pull/3998)
+* Add more // to the console mode comment in playground to make it easier to uncomment. [#3999](https://github.com/microsoft/vstest/pull/3999)
+* Fixed Selenium test run hang after stopping the debugger [#3995](https://github.com/microsoft/vstest/pull/3995)
+* Enable usage of datacollectors in playground. [#3981](https://github.com/microsoft/vstest/pull/3981)
+* Update azure-pipelines.yml
+* Fixed common.lib.ps1 use correct dotnet on ARM64 devices. [#3986](https://github.com/microsoft/vstest/pull/3986)
+* Fix pipeline build triggers. [#3988](https://github.com/microsoft/vstest/pull/3988)
+* Fix variable name in common.lib.ps1 [#3985](https://github.com/microsoft/vstest/pull/3985)
+* Add some polyfill to simplify code across compilations [#3974](https://github.com/microsoft/vstest/pull/3974)
+* Update versions of diagnostics dependencies [#3976](https://github.com/microsoft/vstest/pull/3976)
+* Refactor supported TFMs names [#3973](https://github.com/microsoft/vstest/pull/3973)
+* Updated deprecated build VMs. [#3972](https://github.com/microsoft/vstest/pull/3972)
+* Signing fixed. [#3971](https://github.com/microsoft/vstest/pull/3971)
+* Fix signing verification script
+* Updated build scripts to always install the latest dotnet patch. [#3968](https://github.com/microsoft/vstest/pull/3968)
+* Localized file check-in by OneLocBuild Task: Build definition ID 2923: Build ID 6606255 [#3970](https://github.com/microsoft/vstest/pull/3970)
+* Remove TargetLatestRuntimePatch properties [#3969](https://github.com/microsoft/vstest/pull/3969)
+* Updated dotnet runtime versions.
+* Add missing signing [#3964](https://github.com/microsoft/vstest/pull/3964)
+* Added net7 support. [#3944](https://github.com/microsoft/vstest/pull/3944)
+* Declare Newtonsoft.Json dependency for netstandard2.0 in Microsoft.Te… [#3962](https://github.com/microsoft/vstest/pull/3962)
+* Make TraitCollection serializable in all supported TFMs [#3963](https://github.com/microsoft/vstest/pull/3963)
+* Replace netstandard1.0 and netstandard1.3 with netstandard2.0 [#3921](https://github.com/microsoft/vstest/pull/3921)
+* Fix stack overflow in FilterExpression.ValidForProperties [#3946](https://github.com/microsoft/vstest/pull/3946)
+* Add process id to  VSTEST_DUMP_PROCDUMPARGUMENTS usage for for BlameDataCollector [#3957](https://github.com/microsoft/vstest/pull/3957)
+* Console logger splits path using directory and alt directory separators [#3923](https://github.com/microsoft/vstest/pull/3923)
+* Do not match .NET Standard to Dotnet testhost runner [#3949](https://github.com/microsoft/vstest/pull/3949)
+* Remove AllowMultiple on DirectoryBasedTestDiscovererAttribute. [#3953](https://github.com/microsoft/vstest/pull/3953)
+* Revert "Re-enable arm64 ngen (#3931)" [#3948](https://github.com/microsoft/vstest/pull/3948)
+* Re-enable arm64 ngen [#3931](https://github.com/microsoft/vstest/pull/3931)
+* Support test discovery in sources that are directories [#3932](https://github.com/microsoft/vstest/pull/3932)
+* Allow DotNetHostPath to contain env vars [#3858](https://github.com/microsoft/vstest/pull/3858)
+* update fakes package version to include fix that prevents testhost from crashing [#3928](https://github.com/microsoft/vstest/pull/3928)
+* Run tests with Server GC enabled & concurrent GC disabled. [#3661](https://github.com/microsoft/vstest/pull/3661)
+* VS: move Solution Items folder out of scripts [#3919](https://github.com/microsoft/vstest/pull/3919)
+* Set discovery batch size to 1000 [#3896](https://github.com/microsoft/vstest/pull/3896)
+* Update Fakes packages [#3912](https://github.com/microsoft/vstest/pull/3912)
+* Fix warnings on main (IDE only) [#3914](https://github.com/microsoft/vstest/pull/3914)
+* Fix name of testhost folder in playground [#3917](https://github.com/microsoft/vstest/pull/3917)
+* fixed paths duplicates [#3907](https://github.com/microsoft/vstest/pull/3907)
+* Add some tests for AssemblyHelper [#3911](https://github.com/microsoft/vstest/pull/3911)
+* Fix broken behaviour for AssemblyHelper [#3909](https://github.com/microsoft/vstest/pull/3909)
+* Fix verification of signing [#3904](https://github.com/microsoft/vstest/pull/3904)
+* Migrate FabricBot Tasks to Config-as-Code [#3823](https://github.com/microsoft/vstest/pull/3823)
+* Removed unnecessary signing instruction. [#3903](https://github.com/microsoft/vstest/pull/3903)
+* Fix some vulnerability [#3897](https://github.com/microsoft/vstest/pull/3897)
+* Signing: Fix path to TestHost folders [#3902](https://github.com/microsoft/vstest/pull/3902)
+* Move codebase to netcoreapp3.1 [#3861](https://github.com/microsoft/vstest/pull/3861)
+* Update dotnet runtimes [#3901](https://github.com/microsoft/vstest/pull/3901)
+* CC package update [#3881](https://github.com/microsoft/vstest/pull/3881)
+* Use runtime 3.1.27 [#3900](https://github.com/microsoft/vstest/pull/3900)
+* Added inproc wrapper friend [#3898](https://github.com/microsoft/vstest/pull/3898)
+* Remove un-needed entries from sln [#3887](https://github.com/microsoft/vstest/pull/3887)
+* Move MSTest1 back to Playground folder [#3885](https://github.com/microsoft/vstest/pull/3885)
+* Build compatibility matrix tests faster [#3884](https://github.com/microsoft/vstest/pull/3884)
+* Fixed review comments for PR #3728 [#3882](https://github.com/microsoft/vstest/pull/3882)
+* Make Microsoft.NET.Test.Sdk package transitive [#3879](https://github.com/microsoft/vstest/pull/3879)
+* Enable some design rules that could be interesting [#3875](https://github.com/microsoft/vstest/pull/3875)
+* In-process vstest.console [#3728](https://github.com/microsoft/vstest/pull/3728)
+* Globally exclude IDE1006 for vstest.ProgrammerTests namespace [#3872](https://github.com/microsoft/vstest/pull/3872)
+* Fix warnings on main [#3870](https://github.com/microsoft/vstest/pull/3870)
+* CA1051: Do not declare visible instance fields [#3859](https://github.com/microsoft/vstest/pull/3859)
+* Fixed bugs in ManagedMethod parsing, and updated hierarchies. [#3704](https://github.com/microsoft/vstest/pull/3704)
+* CA1001: Types that own disposable fields should be disposable [#3860](https://github.com/microsoft/vstest/pull/3860)
+* CA1018: Mark attributes with AttributeUsageAttribute [#3865](https://github.com/microsoft/vstest/pull/3865)
+* Disable IDE1006 on vstest namespace [#3866](https://github.com/microsoft/vstest/pull/3866)
+* Fix concurrency access causing flakyness in the test [#3867](https://github.com/microsoft/vstest/pull/3867)
+* Don't parallelize default platform tests [#3849](https://github.com/microsoft/vstest/pull/3849)
+* Remove default architecture env variable [#3863](https://github.com/microsoft/vstest/pull/3863)
+* Fix signing [#3864](https://github.com/microsoft/vstest/pull/3864)
+* Cleanups post move to net462 [#3856](https://github.com/microsoft/vstest/pull/3856)
+* IDE0060: Remove unused parameter [#3854](https://github.com/microsoft/vstest/pull/3854)
+* Enforce use of correct dispose pattern [#3852](https://github.com/microsoft/vstest/pull/3852)
+* Follow .NET lifecycle: update codebase to net462 [#3646](https://github.com/microsoft/vstest/pull/3646)
+* CA1822: Mark members as static [#3853](https://github.com/microsoft/vstest/pull/3853)
+* Fixed some security vulnerabilities. [#3851](https://github.com/microsoft/vstest/pull/3851)
+* Increase ThreadPool.MinThreads limit [#3845](https://github.com/microsoft/vstest/pull/3845)
+* Enable culture analyzer and fix issues [#3678](https://github.com/microsoft/vstest/pull/3678)
+* Revert #3715 [#3843](https://github.com/microsoft/vstest/pull/3843)
+* Enable more rules on test projects [#3832](https://github.com/microsoft/vstest/pull/3832)
+* Ignore CancelTestDiscovery test as it is flaky [#3839](https://github.com/microsoft/vstest/pull/3839)
+* Fix Newtonsoft.Json.dll 13.0.1 signature verification [#3835](https://github.com/microsoft/vstest/pull/3835)
+* Bump to 17.4.0 [#3831](https://github.com/microsoft/vstest/pull/3831)
+* Upgrade to Newtonsoft.Json 13.0.1 [#3815](https://github.com/microsoft/vstest/pull/3815)
+* Enable CA1824 - Mark assemblies with NeutralResourcesLanguageAttribute [#3833](https://github.com/microsoft/vstest/pull/3833)
+* Make test functions static when possible [#3830](https://github.com/microsoft/vstest/pull/3830)
+* Fix unused using warning [#3828](https://github.com/microsoft/vstest/pull/3828)
+* Remove unused msdia140typelib_clr0200.dll [#3822](https://github.com/microsoft/vstest/pull/3822)
+* Enable nullables on all public API files [#3808](https://github.com/microsoft/vstest/pull/3808)
+* Fix missing signature [#3796](https://github.com/microsoft/vstest/pull/3796)
+* Version bumped to 17.4 [#3818](https://github.com/microsoft/vstest/pull/3818)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.2...v17.4.0)
+
+### Drops
+
+* TestPlatform vsix: [17.4.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20221107-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.4.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.0)
+
+## 17.5.0-preview-20221003-04
+
+### Issues Fixed
+
+* Fix release note and prebuild scripts [#4039](https://github.com/microsoft/vstest/pull/4039)
+* Update Fakes binaries [#4033](https://github.com/microsoft/vstest/pull/4033)
+* Add support for ppc64le processor architecture [#4028](https://github.com/microsoft/vstest/pull/4028)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.4.0-preview-20220726-02...v17.5.0-preview-20221003-04)
+
+### Drops
+
+* TestPlatform vsix: [17.5.0-preview-20221003-04](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20221003-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.5.0-preview-20221003-04](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.5.0-preview-20221003-04)
+
+## 17.4.0-preview-20221003-03
+
+### Issues Fixed
+
+* Fix release note and prebuild scripts
+* [rel/17.4] Remove portable CPP adapter and dbghelp [#4020](https://github.com/microsoft/vstest/pull/4020)
+* Fix ManagedNameHelper to support namespaceless methods. [#4003](https://github.com/microsoft/vstest/pull/4003)
+* Remove netstandard telemetry dependencies [#4007](https://github.com/microsoft/vstest/pull/4007)
+* Playground project file refactored. [#4002](https://github.com/microsoft/vstest/pull/4002)
+* Fixed wording for Github issue template [#3998](https://github.com/microsoft/vstest/pull/3998)
+* Add more // to the console mode comment in playground to make it easier to uncomment. [#3999](https://github.com/microsoft/vstest/pull/3999)
+* Fixed Selenium test run hang after stopping the debugger [#3995](https://github.com/microsoft/vstest/pull/3995)
+* Enable usage of datacollectors in playground. [#3981](https://github.com/microsoft/vstest/pull/3981)
+* Update azure-pipelines.yml
+* Fixed common.lib.ps1 use correct dotnet on ARM64 devices. [#3986](https://github.com/microsoft/vstest/pull/3986)
+* Fix pipeline build triggers. [#3988](https://github.com/microsoft/vstest/pull/3988)
+* Fix variable name in common.lib.ps1 [#3985](https://github.com/microsoft/vstest/pull/3985)
+* Add some polyfill to simplify code across compilations [#3974](https://github.com/microsoft/vstest/pull/3974)
+* Update versions of diagnostics dependencies [#3976](https://github.com/microsoft/vstest/pull/3976)
+* Refactor supported TFMs names [#3973](https://github.com/microsoft/vstest/pull/3973)
+* Updated deprecated build VMs. [#3972](https://github.com/microsoft/vstest/pull/3972)
+* Signing fixed. [#3971](https://github.com/microsoft/vstest/pull/3971)
+* Fix signing verification script
+* Updated build scripts to always install the latest dotnet patch. [#3968](https://github.com/microsoft/vstest/pull/3968)
+* Remove TargetLatestRuntimePatch properties [#3969](https://github.com/microsoft/vstest/pull/3969)
+* Updated dotnet runtime versions.
+* Add missing signing [#3964](https://github.com/microsoft/vstest/pull/3964)
+* Added net7 support. [#3944](https://github.com/microsoft/vstest/pull/3944)
+* Declare Newtonsoft.Json dependency for netstandard2.0 in Microsoft.Te… [#3962](https://github.com/microsoft/vstest/pull/3962)
+* Make TraitCollection serializable in all supported TFMs [#3963](https://github.com/microsoft/vstest/pull/3963)
+* Replace netstandard1.0 and netstandard1.3 with netstandard2.0 [#3921](https://github.com/microsoft/vstest/pull/3921)
+* Fix stack overflow in FilterExpression.ValidForProperties [#3946](https://github.com/microsoft/vstest/pull/3946)
+* Add process id to  VSTEST_DUMP_PROCDUMPARGUMENTS usage for for BlameDataCollector [#3957](https://github.com/microsoft/vstest/pull/3957)
+* Console logger splits path using directory and alt directory separators [#3923](https://github.com/microsoft/vstest/pull/3923)
+* Localized file check-in by OneLocBuild Task: Build definition ID 2923: Build ID 6589224 [#3954](https://github.com/microsoft/vstest/pull/3954)
+* Do not match .NET Standard to Dotnet testhost runner [#3949](https://github.com/microsoft/vstest/pull/3949)
+* Remove AllowMultiple on DirectoryBasedTestDiscovererAttribute. [#3953](https://github.com/microsoft/vstest/pull/3953)
+* Revert "Re-enable arm64 ngen (#3931)" [#3948](https://github.com/microsoft/vstest/pull/3948)
+* Re-enable arm64 ngen [#3931](https://github.com/microsoft/vstest/pull/3931)
+* Support test discovery in sources that are directories [#3932](https://github.com/microsoft/vstest/pull/3932)
+* Allow DotNetHostPath to contain env vars [#3858](https://github.com/microsoft/vstest/pull/3858)
+* update fakes package version to include fix that prevents testhost from crashing [#3928](https://github.com/microsoft/vstest/pull/3928)
+* Run tests with Server GC enabled & concurrent GC disabled. [#3661](https://github.com/microsoft/vstest/pull/3661)
+* VS: move Solution Items folder out of scripts [#3919](https://github.com/microsoft/vstest/pull/3919)
+* Set discovery batch size to 1000 [#3896](https://github.com/microsoft/vstest/pull/3896)
+* Update Fakes packages [#3912](https://github.com/microsoft/vstest/pull/3912)
+* Fix warnings on main (IDE only) [#3914](https://github.com/microsoft/vstest/pull/3914)
+* Fix name of testhost folder in playground [#3917](https://github.com/microsoft/vstest/pull/3917)
+* fixed paths duplicates [#3907](https://github.com/microsoft/vstest/pull/3907)
+* Add some tests for AssemblyHelper [#3911](https://github.com/microsoft/vstest/pull/3911)
+* Fix broken behaviour for AssemblyHelper [#3909](https://github.com/microsoft/vstest/pull/3909)
+* Fix verification of signing [#3904](https://github.com/microsoft/vstest/pull/3904)
+* Migrate FabricBot Tasks to Config-as-Code [#3823](https://github.com/microsoft/vstest/pull/3823)
+* Removed unnecessary signing instruction. [#3903](https://github.com/microsoft/vstest/pull/3903)
+* Fix some vulnerability [#3897](https://github.com/microsoft/vstest/pull/3897)
+* Signing: Fix path to TestHost folders [#3902](https://github.com/microsoft/vstest/pull/3902)
+* Move codebase to netcoreapp3.1 [#3861](https://github.com/microsoft/vstest/pull/3861)
+* Update dotnet runtimes [#3901](https://github.com/microsoft/vstest/pull/3901)
+* CC package update [#3881](https://github.com/microsoft/vstest/pull/3881)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.4.0-preview-20220726-02...v17.4.0-preview-20221003-03)
+
+### Drops
+
+* TestPlatform vsix: [17.4.0-preview-20221003-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.4/20221003-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.4.0-preview-20221003-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.0-preview-20221003-03)
+
+## 17.3.2
+
+### Issue Fixed
+
+* Fixed Selenium test run hang after stopping the debugger [#4013](https://github.com/microsoft/vstest/pull/4013)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.1...v17.3.2)
+
+### Drops
+
+* TestPlatform vsix: [17.3.2](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.3/20220919-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.2](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.2)
+
+## 17.3.1
+
+### Issues Fixed
+
+* Do not match .NET Standard to Dotnet testhost runner [#3958](https://github.com/microsoft/vstest/pull/3958)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.0...v17.3.1)
+
+### Drops
+
+* TestPlatform vsix: [17.3.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.3/20220829-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.1)
+
+## 17.3.0
+
+### Issue Fixed
+
+* Reverts change that breaks DOTNET_ROOT [#3844](https://github.com/microsoft/vstest/pull/3844)
+* Add runtime location to host log [#3806](https://github.com/microsoft/vstest/pull/3806)
+* Fix reading/setting culture env variables [#3802](https://github.com/microsoft/vstest/pull/3802)
+* Enable nullable on missed files [#3801](https://github.com/microsoft/vstest/pull/3801)
+* Enable nullable on ObjectModel [#3793](https://github.com/microsoft/vstest/pull/3793)
+* Add missing nullable [#3795](https://github.com/microsoft/vstest/pull/3795)
+* Improve how to retrieve process ID [#3794](https://github.com/microsoft/vstest/pull/3794)
+* Enable nullables on common [#3790](https://github.com/microsoft/vstest/pull/3790)
+* Fix race condition issues on stream access on LengthPrefixCommunicati… [#3789](https://github.com/microsoft/vstest/pull/3789)
+* Enable nullables on CrossPlatEngine [#3779](https://github.com/microsoft/vstest/pull/3779)
+* Enable nullable on VS Translation layer [#3781](https://github.com/microsoft/vstest/pull/3781)
+* Enable missed nullables on already handled projects [#3773](https://github.com/microsoft/vstest/pull/3773)
+* Add background option for testhosts [#3772](https://github.com/microsoft/vstest/pull/3772)
+* Pass sources, to fix native debug [#3777](https://github.com/microsoft/vstest/pull/3777)
+* Temporary disable ngen for arm64 binaries [#3765](https://github.com/microsoft/vstest/pull/3765)
+* Add default platform option to runsettings [#3770](https://github.com/microsoft/vstest/pull/3770)
+* Support arm64 native CppUnitTestFramework with `dotnet test` [#3768](https://github.com/microsoft/vstest/pull/3768)
+* Reduce usage of bang + reduce usage of throw/catch [#3771](https://github.com/microsoft/vstest/pull/3771)
+* Fix warnings and failed assertions [#3767](https://github.com/microsoft/vstest/pull/3767)
+* Enable nullable on Communication utilities [#3758](https://github.com/microsoft/vstest/pull/3758)
+* Add default VS settings to playground [#3756](https://github.com/microsoft/vstest/pull/3756)
+* Skip sources when runtime provider is not found [#3760](https://github.com/microsoft/vstest/pull/3760)
+* Fix loop on TPDebug.Assert [#3764](https://github.com/microsoft/vstest/pull/3764)
+* Remove backup project that should not have been checked in [#3763](https://github.com/microsoft/vstest/pull/3763)
+* Enable nullables on acceptance tests [#3757](https://github.com/microsoft/vstest/pull/3757)
+* Enable nullables on TRX logger [#3754](https://github.com/microsoft/vstest/pull/3754)
+* Enable nullables on CoreUtilities [#3751](https://github.com/microsoft/vstest/pull/3751)
+* Fix failing assertions on tests [#3761](https://github.com/microsoft/vstest/pull/3761)
+* Get PlatformAbstractions from ObjectModel [#3722](https://github.com/microsoft/vstest/pull/3722)
+* Fix nullable conflict [#3753](https://github.com/microsoft/vstest/pull/3753)
+* Remove missed #nullable disable [#3741](https://github.com/microsoft/vstest/pull/3741)
+* Fix which value is used in platform warning [#3752](https://github.com/microsoft/vstest/pull/3752)
+* Experimental feature: enable negative values of MaxCpuCount to match a percentage of number of cores [#3748](https://github.com/microsoft/vstest/pull/3748)
+* Enable nullables on SettingsMigrator [#3744](https://github.com/microsoft/vstest/pull/3744)
+* Enable nullables on TestHostProvider [#3738](https://github.com/microsoft/vstest/pull/3738)
+* Update MSTest and VSTest versions [#3663](https://github.com/microsoft/vstest/pull/3663)
+* Fix DOTNET_ROOT env var for .NET 6.0+ [#3715](https://github.com/microsoft/vstest/pull/3715)
+* Enable nullables on TestPlatform.Client [#3745](https://github.com/microsoft/vstest/pull/3745)
+* Add env var to control host priority [#3740](https://github.com/microsoft/vstest/pull/3740)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.0-preview-20220612-01...v17.3.0)
+
+### Drops
+
+* TestPlatform vsix: [17.3.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.3/20220809-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.0)
+
+## 17.4.0-preview-20220726-02
+
+### Issue Fixed
+
+* Use runtime 3.1.27 [#3900](https://github.com/microsoft/vstest/pull/3900)
+* Remove un-needed entries from sln [#3887](https://github.com/microsoft/vstest/pull/3887)
+* Build compatibility matrix tests faster [#3884](https://github.com/microsoft/vstest/pull/3884)
+* Make Microsoft.NET.Test.Sdk package transitive [#3879](https://github.com/microsoft/vstest/pull/3879)
+* In-process vstest.console [#3728](https://github.com/microsoft/vstest/pull/3728)
+* Fix warnings on main [#3870](https://github.com/microsoft/vstest/pull/3870)
+* Fixed bugs in ManagedMethod parsing, and updated hierarchies. [#3704](https://github.com/microsoft/vstest/pull/3704)
+* Remove default architecture env variable [#3863](https://github.com/microsoft/vstest/pull/3863)
+* Enforce use of correct dispose pattern [#3852](https://github.com/microsoft/vstest/pull/3852)
+* Follow .NET lifecycle: update codebase to net462 [#3646](https://github.com/microsoft/vstest/pull/3646)
+* Fixed some security vulnerabilities. [#3851](https://github.com/microsoft/vstest/pull/3851)
+* Increase ThreadPool.MinThreads limit [#3845](https://github.com/microsoft/vstest/pull/3845)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.4.0-preview-20220707-01...v17.4.0-preview-20220726-02)
+
+### Drops
+
+* TestPlatform vsix: [17.4.0-preview-20220726-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220726-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.4.0-preview-20220726-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.0-preview-20220726-02)
+
+## 17.4.0-preview-20220707-01
+
+### Issue Fixed
+
+* Revert #3715 [#3843](https://github.com/microsoft/vstest/pull/3843)
+* Enable more rules on test projects [#3832](https://github.com/microsoft/vstest/pull/3832)
+* Ignore CancelTestDiscovery test as it is flaky [#3839](https://github.com/microsoft/vstest/pull/3839)
+* Fix Newtonsoft.Json.dll 13.0.1 signature verification [#3835](https://github.com/microsoft/vstest/pull/3835)
+* Bump to 17.4.0 [#3831](https://github.com/microsoft/vstest/pull/3831)
+* Upgrade to Newtonsoft.Json 13.0.1 [#3815](https://github.com/microsoft/vstest/pull/3815)
+* Enable CA1824 - Mark assemblies with NeutralResourcesLanguageAttribute [#3833](https://github.com/microsoft/vstest/pull/3833)
+* Make test functions static when possible [#3830](https://github.com/microsoft/vstest/pull/3830)
+* Fix unused using warning [#3828](https://github.com/microsoft/vstest/pull/3828)
+* Remove unused msdia140typelib_clr0200.dll [#3822](https://github.com/microsoft/vstest/pull/3822)
+* Enable nullables on all public API files [#3808](https://github.com/microsoft/vstest/pull/3808)
+* Fix missing signature [#3796](https://github.com/microsoft/vstest/pull/3796)
+* Version bumped to 17.4 [#3818](https://github.com/microsoft/vstest/pull/3818)
+* Add runtime location to host log [#3806](https://github.com/microsoft/vstest/pull/3806)
+* Fix reading/setting culture env variables [#3802](https://github.com/microsoft/vstest/pull/3802)
+* Enable nullable on missed files [#3801](https://github.com/microsoft/vstest/pull/3801)
+* Enable nullable on ObjectModel [#3793](https://github.com/microsoft/vstest/pull/3793)
+* Add missing nullable [#3795](https://github.com/microsoft/vstest/pull/3795)
+* Improve how to retrieve process ID [#3794](https://github.com/microsoft/vstest/pull/3794)
+* Enable nullables on common [#3790](https://github.com/microsoft/vstest/pull/3790)
+* Fix race condition issues on stream access on LengthPrefixCommunicati??? [#3789](https://github.com/microsoft/vstest/pull/3789)
+* Enable nullables on CrossPlatEngine [#3779](https://github.com/microsoft/vstest/pull/3779)
+* Enable nullable on VS Translation layer [#3781](https://github.com/microsoft/vstest/pull/3781)
+* Enable missed nullables on already handled projects [#3773](https://github.com/microsoft/vstest/pull/3773)
+* Add background option for testhosts [#3772](https://github.com/microsoft/vstest/pull/3772)
+* Pass sources, to fix native debug [#3777](https://github.com/microsoft/vstest/pull/3777)
+* Temporary disable ngen for arm64 binaries [#3765](https://github.com/microsoft/vstest/pull/3765)
+* Add default platform option to runsettings [#3770](https://github.com/microsoft/vstest/pull/3770)
+* Support arm64 native CppUnitTestFramework with `dotnet test` [#3768](https://github.com/microsoft/vstest/pull/3768)
+* Reduce usage of bang + reduce usage of throw/catch [#3771](https://github.com/microsoft/vstest/pull/3771)
+* Fix warnings and failed assertions [#3767](https://github.com/microsoft/vstest/pull/3767)
+* Enable nullable on Communication utilities [#3758](https://github.com/microsoft/vstest/pull/3758)
+* Add default VS settings to playground [#3756](https://github.com/microsoft/vstest/pull/3756)
+* Skip sources when runtime provider is not found [#3760](https://github.com/microsoft/vstest/pull/3760)
+* Fix loop on TPDebug.Assert [#3764](https://github.com/microsoft/vstest/pull/3764)
+* Remove backup project that should not have been checked in [#3763](https://github.com/microsoft/vstest/pull/3763)
+* Enable nullables on acceptance tests [#3757](https://github.com/microsoft/vstest/pull/3757)
+* Enable nullables on TRX logger [#3754](https://github.com/microsoft/vstest/pull/3754)
+* Enable nullables on CoreUtilities [#3751](https://github.com/microsoft/vstest/pull/3751)
+* Fix failing assertions on tests [#3761](https://github.com/microsoft/vstest/pull/3761)
+* Get PlatformAbstractions from ObjectModel [#3722](https://github.com/microsoft/vstest/pull/3722)
+* Fix nullable conflict [#3753](https://github.com/microsoft/vstest/pull/3753)
+* Remove missed #nullable disable [#3741](https://github.com/microsoft/vstest/pull/3741)
+* Fix which value is used in platform warning [#3752](https://github.com/microsoft/vstest/pull/3752)
+* Experimental feature: enable negative values of MaxCpuCount to match a percentage of number of cores [#3748](https://github.com/microsoft/vstest/pull/3748)
+* Enable nullables on SettingsMigrator [#3744](https://github.com/microsoft/vstest/pull/3744)
+* Enable nullables on TestHostProvider [#3738](https://github.com/microsoft/vstest/pull/3738)
+* Update MSTest and VSTest versions [#3663](https://github.com/microsoft/vstest/pull/3663)
+* Fix DOTNET_ROOT env var for .NET 6.0+ [#3715](https://github.com/microsoft/vstest/pull/3715)
+* Enable nullables on TestPlatform.Client [#3745](https://github.com/microsoft/vstest/pull/3745)
+* Add env var to control host priority [#3740](https://github.com/microsoft/vstest/pull/3740)
+
+See full log [here](https://github.com/microsoft/vstest/compare/f6b89cfcace13f8ac0e994af9dbe7f9a7438e958...v17.4.0-preview-20220707-01)
+
+### Drops
+
+* TestPlatform vsix: [17.4.0-preview-20220707-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220707-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.4.0-preview-20220707-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.0-preview-20220707-01)
+
+## 17.3.0-preview-20220612-01
+
+### Issue Fixed
+
+* Fix logging setup when running in remote [#3643](https://github.com/microsoft/vstest/pull/3643)
+* Fix get process architecture [#3726](https://github.com/microsoft/vstest/pull/3726)
+* Enable nullables on Abstraction project [#3723](https://github.com/microsoft/vstest/pull/3723)
+* Enable nullables on TP Build project [#3719](https://github.com/microsoft/vstest/pull/3719)
+* Add target framework information to the AttachDebugger callback [#3701](https://github.com/microsoft/vstest/pull/3701)
+* Enable nullable on BlameDataCollector [#3713](https://github.com/microsoft/vstest/pull/3713)
+* Enable nullable on HtmlLogger [#3712](https://github.com/microsoft/vstest/pull/3712)
+* Update framework detection logic to not rely on throwing/catching NRE [#3714](https://github.com/microsoft/vstest/pull/3714)
+* Enable nullable on TP utilities [#3700](https://github.com/microsoft/vstest/pull/3700)
+* Enable nullable on vstest.console [#3694](https://github.com/microsoft/vstest/pull/3694)
+* Minor optimizations [#3687](https://github.com/microsoft/vstest/pull/3687)
+* Using "\." instead of "." as it is not a valid regex [#3708](https://github.com/microsoft/vstest/pull/3708)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.0-preview-20220530-08...v17.3.0-preview-20220612-01)
+
+### Drops
+
+* TestPlatform vsix: [17.3.0-preview-20220612-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220612-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.0-preview-20220612-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.0-preview-20220612-01)
+
+## 17.3.0-preview-20220530-08
+
+### Issue Fixed
+
+* Fix CppUnitTestFramework package layout [#3695](https://github.com/microsoft/vstest/pull/3695)
+* Share files instead of duplicating them [#3692](https://github.com/microsoft/vstest/pull/3692)
+* Enable nullable on adapter utilities [#3688](https://github.com/microsoft/vstest/pull/3688)
+* Allow sharing testhosts for non-paralell runs on a Shared testhost [#3682](https://github.com/microsoft/vstest/pull/3682)
+* Fix same file access exception in htmlLogger [#3373](https://github.com/microsoft/vstest/pull/3373)
+* Perform file roll only occasionally when file is locked [#3684](https://github.com/microsoft/vstest/pull/3684)
+* Enable nullable for EventLogCollector [#3674](https://github.com/microsoft/vstest/pull/3674)
+* Fixed telemetry data sharing exception [#3676](https://github.com/microsoft/vstest/pull/3676)
+* Enable nullable on AttachVS [#3671](https://github.com/microsoft/vstest/pull/3671)
+* Enable nullable for datacollector [#3670](https://github.com/microsoft/vstest/pull/3670)
+* Fix CUIT test [#3673](https://github.com/microsoft/vstest/pull/3673)
+* Fix NRE when coverage merge tool is not found [#3665](https://github.com/microsoft/vstest/pull/3665)
+* Run multiple target frameworks and architectures in single vstest.console [#3412](https://github.com/microsoft/vstest/pull/3412)
+* Fix NgenArchitecture [#3651](https://github.com/microsoft/vstest/pull/3651)
+* Fix missing attachement processor [#3644](https://github.com/microsoft/vstest/pull/3644)
+* Added null checks for GetCachedExtensions call [#3639](https://github.com/microsoft/vstest/pull/3639)
+* Fix more issues with parallel discovery and cancellation [#3605](https://github.com/microsoft/vstest/pull/3605)
+* Better deserialization and serialization performance [#3608](https://github.com/microsoft/vstest/pull/3608)
+* Refined runsettings matching criteria for test sessions [#3610](https://github.com/microsoft/vstest/pull/3610)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.3.0-preview-20220426-02...v17.3.0-preview-20220530-08)
+
+### Drops
+
+* TestPlatform vsix: [17.3.0-preview-20220530-08](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220530-08;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.0-preview-20220530-08](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.0-preview-20220530-08)
+
+## 17.3.0-preview-20220426-02
+
+### Issue Fixed
+
+* Collect artifacts in case of test abort/cancelled [#3606](https://github.com/microsoft/vstest/pull/3606)
+* Use most recent stable version of Microsoft.CodeCoverage for unit tests [#3601](https://github.com/microsoft/vstest/pull/3601)
+* Patched CVE-2017-11770 and CVE-2019-0981 [#3578](https://github.com/microsoft/vstest/pull/3578)
+* Fixed assembly loading in Explicit mode. [#3570](https://github.com/microsoft/vstest/pull/3570)
+* Make vstest.console, and datacollector upgrade across major .NET version [#3561](https://github.com/microsoft/vstest/pull/3561)
+* Fix parallel discovery [#3437](https://github.com/microsoft/vstest/pull/3437)
+* Remove CC from vsix [#3546](https://github.com/microsoft/vstest/pull/3546)
+* Bundle arm64 managed code coverage support [#3547](https://github.com/microsoft/vstest/pull/3547)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0-preview-20220401-08...v17.3.0-preview-20220426-02)
+
+### Drops
+
+* TestPlatform vsix: [17.3.0-preview-20220426-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220426-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.3.0-preview-20220426-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.3.0-preview-20220426-02)
+
+## 17.2.0
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0-preview-20220401-07...v17.2.0)
+
+### Drops
+
+* TestPlatform vsix: [17.2.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.2/20220510-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.0)
+
+## 17.2.0-preview-20220401-08
+
+### Issue Fixed
+
+* Add packing to PR build [#3540](https://github.com/microsoft/vstest/pull/3540)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0-preview-20220401-08...v17.2.0-preview-20220401-07)
+
+### Drops
+
+* TestPlatform vsix: [17.2.0-preview-20220401-08](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220401-08;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.0-preview-20220401-08](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.0-preview-20220401-08)
+
+## v17.2.0-preview-20220401-07
+
+### Issue Fixed
+
+* Added telemetry data point for extensions loaded during test discovery/run [#3511](https://github.com/microsoft/vstest/pull/3511)
+* Catch all exceptions when exiting process [#3530](https://github.com/microsoft/vstest/pull/3530)
+* Test matrix [#3459](https://github.com/microsoft/vstest/pull/3459)
+* Make Cancel Discovery faster and more reliable [#3527](https://github.com/microsoft/vstest/pull/3527)
+* Fix remote testhost [#3492](https://github.com/microsoft/vstest/pull/3492)
+* Fix feature flag name [#3483](https://github.com/microsoft/vstest/pull/3483)
+* Add parity for AnyCPU containers between .NET Core and .NET FX, add banner with architecture and warning if running emulated(all on win arm64) [#3481](https://github.com/microsoft/vstest/pull/3481)
+* Update feature flag logic to disable only semantics [#3479](https://github.com/microsoft/vstest/pull/3479)
+* Allows to override shutdown timeout [#3466](https://github.com/microsoft/vstest/pull/3466)
+* Support reading embedded pdbs [#3454](https://github.com/microsoft/vstest/pull/3454)
+* Update nuspec project target frameworks for source-build [#3285](https://github.com/microsoft/vstest/pull/3285)
+* Run DataCollectorAttachmentsProcessors inside custom AppDomain [#3434](https://github.com/microsoft/vstest/pull/3434)
+* Newer approach to reference assemblies on MacOS and Linux [#3448](https://github.com/microsoft/vstest/pull/3448)
+* CA1840: Use 'Environment.CurrentManagedThreadId' [#3440](https://github.com/microsoft/vstest/pull/3440)
+* Patched CVE-2019-0657. [#3436](https://github.com/microsoft/vstest/pull/3436)
+* Made telemetry data constants true constants [#3416](https://github.com/microsoft/vstest/pull/3416)
+* Add a zero-width space after test name in HTML results [#3423](https://github.com/microsoft/vstest/pull/3423)
+* Temporary disable full post processing in design mode [#3429](https://github.com/microsoft/vstest/pull/3429)
+* Build vstest.console.arm64.exe and fix process architecture retrieval [#3422](https://github.com/microsoft/vstest/pull/3422)
+* Fix multi tfm project tests [#3425](https://github.com/microsoft/vstest/pull/3425)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0-preview-20220401-07...v17.2.0-preview-20220301-01)
+
+### Drops
+
+* TestPlatform vsix: [17.2.0-preview-20220401-07](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220401-07;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.0-preview-20220401-07](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.0-preview-20220401-07)
+
+## 17.2.0-preview-20220301-01
+
+### Issue Fixed
+
+* Handle correctly waiting for process exit on Unix systems [#3410](https://github.com/microsoft/vstest/pull/3410)
+* Move usings outside namespace [#3398](https://github.com/microsoft/vstest/pull/3398)
+* Prefer string alias over String type [#3408](https://github.com/microsoft/vstest/pull/3408)
+* Use null-coalesce assignment [#3405](https://github.com/microsoft/vstest/pull/3405)
+* Added telemetry codeowners [#3403](https://github.com/microsoft/vstest/pull/3403)
+* Map incoming and outgoing requests [#3314](https://github.com/microsoft/vstest/pull/3314)
+* Use fakes to surround vstest core and test it [#3347](https://github.com/microsoft/vstest/pull/3347)
+* Fix more IDE warnings [#3388](https://github.com/microsoft/vstest/pull/3388)
+* Remember to keep in sync SDK feature flags [#3393](https://github.com/microsoft/vstest/pull/3393)
+* Fix FeatureFlag singleton implementation [#3389](https://github.com/microsoft/vstest/pull/3389)
+* Localized file check-in by OneLocBuild Task: Build definition ID 2923: Build ID 5773266 [#3386](https://github.com/microsoft/vstest/pull/3386)
+* Test adapter loading strategy [#3380](https://github.com/microsoft/vstest/pull/3380)
+* Enable parallel discovery [#3349](https://github.com/microsoft/vstest/pull/3349)
+* Enable post processing [#3384](https://github.com/microsoft/vstest/pull/3384)
+* add post processing intergration test [#3377](https://github.com/microsoft/vstest/pull/3377)
+* Add ARM64 .NET Framework testhost [#3370](https://github.com/microsoft/vstest/pull/3370)
+* Remove architecture validation [#3371](https://github.com/microsoft/vstest/pull/3371)
+* Add ci switch for Windows and Windows-Acceptance [#3372](https://github.com/microsoft/vstest/pull/3372)
+* Revert part of "Remove regions (#3366)" [#3369](https://github.com/microsoft/vstest/pull/3369)
+* Remove regions [#3366](https://github.com/microsoft/vstest/pull/3366)
+* Add unit tests for the artifact post processing [#3352](https://github.com/microsoft/vstest/pull/3352)
+* Update version of VS sdk build tools [#3344](https://github.com/microsoft/vstest/pull/3344)
+* Use !! null check [#3341](https://github.com/microsoft/vstest/pull/3341)
+* Enable nullable on new files for all projects [#3359](https://github.com/microsoft/vstest/pull/3359)
+* Enable more rules [#3345](https://github.com/microsoft/vstest/pull/3345)
+* Enable pattern code style [#3358](https://github.com/microsoft/vstest/pull/3358)
+* Enable even more rules [#3356](https://github.com/microsoft/vstest/pull/3356)
+* Fixed conditional expression [#3355](https://github.com/microsoft/vstest/pull/3355)
+* Telemetry improvements [#3340](https://github.com/microsoft/vstest/pull/3340)
+* Simplify calls to EqtTrace logger [#3351](https://github.com/microsoft/vstest/pull/3351)
+* Implement the post processing extension feature [#3324](https://github.com/microsoft/vstest/pull/3324)
+* Add ionide exclusions to gitignore [#3336](https://github.com/microsoft/vstest/pull/3336)
+* Enable TreatWarningsAsErrors only on CI [#3335](https://github.com/microsoft/vstest/pull/3335)
+* Fix failfast [#3327](https://github.com/microsoft/vstest/pull/3327)
+* Fix red [#3325](https://github.com/microsoft/vstest/pull/3325)
+* Update git blame [#3326](https://github.com/microsoft/vstest/pull/3326)
+* Run dotnet format whitespace [#3307](https://github.com/microsoft/vstest/pull/3307)
+* Suppress assembly architecture, assembly conflict and restore warnings [#3323](https://github.com/microsoft/vstest/pull/3323)
+* Make property readonly when possible [#3320](https://github.com/microsoft/vstest/pull/3320)
+* Log callbacks to delegates better [#3283](https://github.com/microsoft/vstest/pull/3283)
+* Fix OperationCanceledException handling for the TestRunAttachmentsProcessingManager [#3319](https://github.com/microsoft/vstest/pull/3319)
+* Fix serialization issue with TestRunSettings [#3317](https://github.com/microsoft/vstest/pull/3317)
+* Fallback to loaded assembly if load file fails during the extension discovery v2 [#3315](https://github.com/microsoft/vstest/pull/3315)
+* Stabilize unit test  [#3311](https://github.com/microsoft/vstest/pull/3311)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.2.0-preview-20220301-01...v17.2.0-preview-20220131-20)
+
+### Drops
+
+* TestPlatform vsix: [17.2.0-preview-20220301-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220301-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.0-preview-20220301-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.0-preview-20220301-01)
+
+## 17.1.0
+
+### Issues Fixed
+
+* Added support for TestAdapterLoadingStrategy. [#3374](https://github.com/microsoft/vstest/pull/3374)
+* Fix architecture retrival [#3251](https://github.com/microsoft/vstest/pull/3251)
+* External dependencies updated [#3204](https://github.com/microsoft/vstest/pull/3204)
+* Fixing .net frmw parallel issue [#3192](https://github.com/microsoft/vstest/pull/3192)
+* Testhost sharing between discovery & execution [#2687](https://github.com/microsoft/vstest/pull/2687)
+* Cleanup tmp code for the --arch feature [#3174](https://github.com/microsoft/vstest/pull/3174)
+* Make older uwp work [#3166](https://github.com/microsoft/vstest/pull/3166)
+* Enable code coverage when "Code Coverage;arg1=val1;arg2=val2" is provided in cli [#3172](https://github.com/microsoft/vstest/pull/3172)
+* Remove TargetPlatform before start test host [#3170](https://github.com/microsoft/vstest/pull/3170)
+* Adding elements to code coverage config passed via commandline, [#3162](https://github.com/microsoft/vstest/pull/3162)* Aggregate api files [#3165](https://github.com/microsoft/vstest/pull/3165)
+* Fix GenerateProgramFile [#3163](https://github.com/microsoft/vstest/pull/3163)
+* Move new enum into public api [#3157](https://github.com/microsoft/vstest/pull/3157)
+* Included UAP10.0 version of Microsoft.VisualStudio.TestPlatform.ObjectModel.dll for signing. [#3160](https://github.com/microsoft/vstest/pull/3160)
+* Add package with UWP dependencies for UWP runner [#3133](https://github.com/microsoft/vstest/pull/3133)
+* Honor `--arch` switch for arm64 on Windows and Mac [#3100](https://github.com/microsoft/vstest/pull/3100)
+* Don't publish for win runtime identifier in source-build [#3096](https://github.com/microsoft/vstest/pull/3096)
+* CPP runner under .NET (Core) [#3003](https://github.com/microsoft/vstest/pull/3003)
+* Updating SDK versions [#3083](https://github.com/microsoft/vstest/pull/3083)
+* Upgrade nuget packages to fix security issues [#3072](https://github.com/microsoft/vstest/pull/3072)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.0.0...v17.1.0)
+
+### Drops
+
+* TestPlatform vsix: [17.1.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.1/20220216-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.1.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.1.0)
+
+## 17.2.0-preview-20220131-20
+
+### Issues Fixed
+
+* Removed system-wide PDB purge to make build faster [#3310](https://github.com/microsoft/vstest/pull/3310)
+* Test stabilization, increase waiting time for report events [#3309](https://github.com/microsoft/vstest/pull/3309)
+* Use longer timeout for playground project [#3301](https://github.com/microsoft/vstest/pull/3301)
+* Remove stylecop files [#3308](https://github.com/microsoft/vstest/pull/3308)
+* Enable some rules with no impact on public API [#3299](https://github.com/microsoft/vstest/pull/3299)
+* Fix race condition inside DataCollectionAttachmentManager [#3296](https://github.com/microsoft/vstest/pull/3296)
+* Remove unused properties and solution files [#3295](https://github.com/microsoft/vstest/pull/3295)
+* Ignore project and build script re-format in blame [#3297](https://github.com/microsoft/vstest/pull/3297)
+* Reformat projects and script files [#3290](https://github.com/microsoft/vstest/pull/3290)
+* Recognize AnyCPU in case of fallback to PEReader [#3287](https://github.com/microsoft/vstest/pull/3287)
+* Add Architecture.S390x [#3289](https://github.com/microsoft/vstest/pull/3289)
+* Migrating to 1ES Hosted Pools [#3278](https://github.com/microsoft/vstest/pull/3278)
+* Remove formatting changes from git blame [#3288](https://github.com/microsoft/vstest/pull/3288)
+* Medium and low level vulnerabilities patched [#3286](https://github.com/microsoft/vstest/pull/3286)
+* Apply modern code styles [#3264](https://github.com/microsoft/vstest/pull/3264)
+* Add diag log env variable [#3275](https://github.com/microsoft/vstest/pull/3275)
+* Fix encoding when writing updated dependencies in build [#3277](https://github.com/microsoft/vstest/pull/3277)
+* Enable parallelization of acceptance tests [#3268](https://github.com/microsoft/vstest/pull/3268)
+* Fix some typos in codebase [#3262](https://github.com/microsoft/vstest/pull/3262)
+* Logs improvement [#3271](https://github.com/microsoft/vstest/pull/3271)
+* Skip attachment processor if doesn't support incremental processing [#3270](https://github.com/microsoft/vstest/pull/3270)
+* Fix change done in commit a223146b8c3d5dbbf7bae49149aed762560434c4 [#3258](https://github.com/microsoft/vstest/pull/3258)
+* Improve logging for the architecture switch feature [#3265](https://github.com/microsoft/vstest/pull/3265)
+* Improve the cache of the extension framework [#3261](https://github.com/microsoft/vstest/pull/3261)
+* Improve error logging for VS output [#3260](https://github.com/microsoft/vstest/pull/3260)
+* Ensure the Public API analyzer gets installed only for src projects [#3256](https://github.com/microsoft/vstest/pull/3256)
+* Architecture test improvement [#3254](https://github.com/microsoft/vstest/pull/3254)
+* Update system.net.http to 4.3.2 for uap10 [#3249](https://github.com/microsoft/vstest/pull/3249)
+* Add tests for architecture switch feature [#3253](https://github.com/microsoft/vstest/pull/3253)
+* Fixed manifest publishing [#3246](https://github.com/microsoft/vstest/pull/3246)
+* Fix architecture retrival [#3250](https://github.com/microsoft/vstest/pull/3250)
+* Complete the attachment processors extension [#3161](https://github.com/microsoft/vstest/pull/3161)
+* Use the ToString format specifier rather than the Replace method [#3242](https://github.com/microsoft/vstest/pull/3242)
+* Fixed manifest publishing
+* Use stable channel for dotnet 6 installation [#3243](https://github.com/microsoft/vstest/pull/3243)
+* Check exitcodes in build script [#3236](https://github.com/microsoft/vstest/pull/3236)
+* improve attachvs output [#3230](https://github.com/microsoft/vstest/pull/3230)
+* Add playground project [#3200](https://github.com/microsoft/vstest/pull/3200)
+* Bump private dotnet version [#3228](https://github.com/microsoft/vstest/pull/3228)
+* Bumped TP version to 17.2 [#3214](https://github.com/microsoft/vstest/pull/3214)
+* Add marco as code owner for public api [#3217](https://github.com/microsoft/vstest/pull/3217)
+* Add PublicAPI analyzer to all public projects [#3205](https://github.com/microsoft/vstest/pull/3205)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.1.0-preview-20211130-02...v17.2.0-preview-20220131-20)
+
+### Drops
+
+* TestPlatform vsix: [17.2.0-preview-20220131-20](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220131-20;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.2.0-preview-20220131-20](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.2.0-preview-20220131-20)
+
+## 17.1.0-release-20220113-05
+
+### Issue Fixed
+
+* Fix architecture retrival [#3251](https://github.com/microsoft/vstest/pull/3251)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.1.0-preview-20211130-02...v17.1.0-release-20220113-05)
+
+### Drops
+
+* TestPlatform vsix: [17.1.0-release-20220113-05](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20220113-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.1.0-release-20220113-05](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.1.0-release-20220113-05)
+
+## 17.1.0-preview-20211130-02
+
+### Issue Fixed
+
+* AttachVS PR comments fixed [#3201](https://github.com/microsoft/vstest/pull/3201)
+* Attach to VS automatically [#3197](https://github.com/microsoft/vstest/pull/3197)
+* Fixing .net frmw parallel issue [#3192](https://github.com/microsoft/vstest/pull/3192)
+* Testhost sharing between discovery & execution [#2687](https://github.com/microsoft/vstest/pull/2687)
+* Make older uwp work [#3166](https://github.com/microsoft/vstest/pull/3166)
+* Enable code coverage when "Code Coverage;arg1=val1;arg2=val2" is provided in cli [#3172](https://github.com/microsoft/vstest/pull/3172)
+* Remove TargetPlatform before start test host [#3170](https://github.com/microsoft/vstest/pull/3170)
+* Adding elements to code coverage config passed via commandline, [#3162](https://github.com/microsoft/vstest/pull/3162)
+* Aggregate api files [#3165](https://github.com/microsoft/vstest/pull/3165)
+* Fix GenerateProgramFile [#3163](https://github.com/microsoft/vstest/pull/3163)
+* Move new enum into public api [#3157](https://github.com/microsoft/vstest/pull/3157)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.1.0-preview-20211109-03...v17.1.0-preview-20211130-02)
+
+### Drops
+
+* TestPlatform vsix: [17.1.0-preview-20211130-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20211130-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.1.0-preview-20211130-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.1.0-preview-20211130-02)
+
+## 17.1.0-preview-20211109-03
+
+### Issues Fixed
+
+* Honor `--arch` switch for arm64 on Windows and Mac [#3100](https://github.com/microsoft/vstest/pull/3100)
+* CPP runner under .NET (Core) [#3003](https://github.com/microsoft/vstest/pull/3003)
+* Log messages from RequestSender [#3057](https://github.com/microsoft/vstest/pull/3057)
+* Fixed CVE-2018-8292 & CVE-2021-26701 [#3054](https://github.com/microsoft/vstest/pull/3054)
+* --diag should take files with no extension [#3048](https://github.com/microsoft/vstest/pull/3048)
+* Blame fix 32 bit hang dump [#3043](https://github.com/microsoft/vstest/pull/3043)
+* Add public api analyzers for ObjectModel and dependencies [#3042](https://github.com/microsoft/vstest/pull/3042)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.0.0...v17.1.0-preview-20211109-03)
+
+### Drops
+
+* TestPlatform vsix: [17.1.0-preview-20211109-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/main/20211109-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.1.0-preview-20211109-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.1.0-preview-20211109-03)
+
+## 17.0.0
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)
+
+### Drops
+
+* TestPlatform vsix: [17.0.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.0/20211022-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.0.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.0.0)
+
+## 16.11.0
+
+### Issues Fixed
+
+* 16.11 External Packages Insertion [#2996](https://github.com/microsoft/vstest/pull/2996)
+* Update externals to 16.11 [#2932](https://github.com/microsoft/vstest/pull/2932)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)
+
+### Drops
+
+* TestPlatform vsix: [16.11.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.11/20210812-04;Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsman)
+* Microsoft.TestPlatform.ObjectModel : [16.11.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.11.0)
+
+## 16.10.0-release-20210429-01
+
+### Issues Fixed
+
+* Adding mono.cecil libs to packages, (#2878) [#2878](https://github.com/microsoft/vstest/pull/2878)
+* Upgrade CC components to 16.10.0-beta.21227.2 (#2877) [#2877](https://github.com/microsoft/vstest/pull/2877)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.10.0-release-20210330-02...v16.10.0-release-20210422-02)
+
+### Drops
+
+* TestPlatform vsix: [16.10.0-release-20210429-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.10/20210429-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [16.10.0-release-20210429-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.10.0-release-20210429-01)
+
+## 16.10.0-release-20210422-02
+
+### Issues Fixed
+
+* Mark early testhost startup APIs as internal for TP 16.10 (#2768) [#2864](https://github.com/microsoft/vstest/pull/2864)
+* Added some capabilities to package utilities (#2854) [#2862](https://github.com/microsoft/vstest/pull/2862)
+* Fixed #2814 and #2853.
+* Added support for WinUI3 appxrecipe. [#2849](https://github.com/microsoft/vstest/pull/2849)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.10.0-release-20210330-02...v16.10.0-release-20210422-02)
+
+### Drops
+
+* TestPlatform vsix: [16.10.0-release-20210422-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.10/20210422-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [16.10.0-release-20210422-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.10.0-release-20210422-02)
+
+## 16.9.4
+
+### Issue Fixed
+
+* Loadind corelib.net dynamically (<https://github.com/microsoft/vstest/pull/2762>)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)
+
+### Drops
+
+* TestPlatform vsix: [16.9.4](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.9/20210401-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [16.9.4](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.4)
+
+## 16.10.0-release-20210330-02
+
+### Issue Fixed
+
+* Updating code coverage version [#2836](https://github.com/microsoft/vstest/pull/2836)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.10.0-release-20210329-03...v16.10.0-release-20210330-02)
+
+### Drops
+
+* TestPlatform vsix: [16.10.0-release-20210330-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.10/20210330-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [16.10.0-release-20210330-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.10.0-release-20210330-02)
+
+## 16.10.0-release-20210329-03
+
+### Issues Fixed
+
+* Add basic mstestv1 telemetry [#2781](https://github.com/microsoft/vstest/pull/2781)
+* Update TP externals [#2809](https://github.com/microsoft/vstest/pull/2809)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.10.0-preview-20210219-03...v16.10.0-release-20210329-03)
+
+### Drops
+
+* TestPlatform vsix: [16.10.0-release-20210329-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.10/20210329-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.10.0-release-20210329-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.10.0-release-20210329-03)
+
+## 16.10.0-preview-20210219-03
+
+### Issues Fixed
+
+* Dynamic corelib.net loading [#2762](https://github.com/microsoft/vstest/pull/2762)
+* Add failed logic for trx logger when TreatNoTestAsError is set to true [#2758](https://github.com/microsoft/vstest/pull/2758)
+* Adding resources for corelib.net in portable package, [#2759](https://github.com/microsoft/vstest/pull/2759)
+* Prefer agent temp directory if available. [#2752](https://github.com/microsoft/vstest/pull/2752)
+* Generating cc attachments with correct uri [#2750](https://github.com/microsoft/vstest/pull/2750)
+* Added support for spaces and other special characters in method names into the ManagedNameUtilities [#2738](https://github.com/microsoft/vstest/pull/2738)
+* Don't swallow stacktrace from adapter exception when running in thread [#2746](https://github.com/microsoft/vstest/pull/2746)
+* Fix duration in console logger for parallel tests [#2739](https://github.com/microsoft/vstest/pull/2739)
+* Marked `InvalidManagedNameException` as serializable [#2732](https://github.com/microsoft/vstest/pull/2732)
+* Print stack trace from executor [#2730](https://github.com/microsoft/vstest/pull/2730)
+* Added constants for hierarchical naming. [#2724](https://github.com/microsoft/vstest/pull/2724)
+* Fix divide by zero in HTML logger [#2723](https://github.com/microsoft/vstest/pull/2723)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.0-preview-20210127-04...v16.10.0-preview-20210219-03)
+
+### Drops
+
+* TestPlatform vsix: [16.10.0-preview-20210219-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.10/20210219-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.10.0-preview-20210219-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.10.0-preview-20210219-03)
+
+## 16.9.1
+
+### Issues Fixed
+
+* Implemented Workitem support in TRX logger (#2666)
+* Stopped merging code coverage logs (#2671)
+* Early testhost startup performance improved (#2584)
+* Removed TypesToLoadAttribute from ObjectModel, and moved the functionallity into adapters (#2674)
+* Fixed assembly names of TestHost executables (#2682)
+* Add metrics for datacollector.exe - provides information about profilers (#2705)
+* Added `Microsoft.TestPlatform.AdapterUtilities`. (#2714)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.0-preview-20210127-04...v16.9.1)
+
+### Drops
+
+* TestPlatform vsix: [16.9.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/rel/16.9/20210223-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.9.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.1)
+
+## 16.9.0-preview-20210127-04
+
+### Issue Fixed
+
+* Move FQN related code into a separate NuGet package [#2714](https://github.com/microsoft/vstest/pull/2714)
+* vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) [#2606](https://github.com/microsoft/vstest/pull/2606)
+* Add metrics for datacollector.exe - provides information about profilers [#2705](https://github.com/microsoft/vstest/pull/2705)
+* Loc Update [#2685](https://github.com/microsoft/vstest/pull/2685)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.0-preview-20210106-01...v16.9.0-preview-20210127-04)
+
+### Drops
+
+* TestPlatform vsix: [16.9.0-preview-20210127-04](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20210127-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.9.0-preview-20210127-04](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.0-preview-20210127-04)
+
+## 16.9.0-preview-20210106-01
+
+### Issues Fixed
+
+* Upgrade CC to 16.9.0-beta.20630.1 [#2684](https://github.com/microsoft/vstest/pull/2684)
+* Upgrade fakes version [#2683](https://github.com/microsoft/vstest/pull/2683)
+* Fixed assembly names of TestHost executables [#2682](https://github.com/microsoft/vstest/pull/2682)
+* Upgrade CC and CLR IE versions [#2681](https://github.com/microsoft/vstest/pull/2681)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20201221.2 [#2680](https://github.com/microsoft/vstest/pull/2680)
+* Adding environment variable used during build process, [#2679](https://github.com/microsoft/vstest/pull/2679)
+* Getting TraceDataCollector from nuget [#2678](https://github.com/microsoft/vstest/pull/2678)
+* Attribute refactoring [#2676](https://github.com/microsoft/vstest/pull/2676)
+* Removed TypesToLoadAttribute from ObjectModel. [#2674](https://github.com/microsoft/vstest/pull/2674)
+* Early testhost startup performance work [#2584](https://github.com/microsoft/vstest/pull/2584)
+* Do not merge logs from code coverage [#2671](https://github.com/microsoft/vstest/pull/2671)
+* Implement Workitem support in TRX logger [#2666](https://github.com/microsoft/vstest/pull/2666)
+* Bumping Fakes TestRunnerHarness version [#2661](https://github.com/microsoft/vstest/pull/2661)
+* Fixed "issue" pluralization in write-release-notes.ps1 [#2665](https://github.com/microsoft/vstest/pull/2665)
+* Updating Microsoft.VisualStudio.TraceDataCollector source [#2663](https://github.com/microsoft/vstest/pull/2663)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20201130.3 [#2659](https://github.com/microsoft/vstest/pull/2659)
+* Cross platform acceptance tests [#2653](https://github.com/microsoft/vstest/pull/2653)
+* Upgrade externals - remove interop [#2650](https://github.com/microsoft/vstest/pull/2650)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.0-preview-20201123-03...v16.9.0-preview-20210106-01)
+
+### Drops
+
+* TestPlatform vsix: [16.9.0-preview-20210106-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20210106-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.9.0-preview-20210106-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.0-preview-20210106-01)
+
+## 16.9.0-preview-20201123-03
+
+### Issues Fixed
+
+* Added support for new CC merging library for netstandard2.0 [#2598](https://github.com/microsoft/vstest/pull/2598)
+* [master] Fix collect dump always  [#2645](https://github.com/microsoft/vstest/pull/2645)
+* Managed TestCase Properties implemented [#2611](https://github.com/microsoft/vstest/pull/2611)
+* Use jsonSerializer2 for protocol version 3 [#2630](https://github.com/microsoft/vstest/pull/2630)
+* Fixed assembly loading issue for netcoreapp on linux [#2636](https://github.com/microsoft/vstest/pull/2636)
+* Fixed assembly loading issue for netcoreapp. [#2631](https://github.com/microsoft/vstest/pull/2631)
+* Generation of CodeCoverage.deps.json file [#2627](https://github.com/microsoft/vstest/pull/2627)
+* TP trace data collector changes to support CLR IE [#2618](https://github.com/microsoft/vstest/pull/2618)
+* Enable linux build [#2617](https://github.com/microsoft/vstest/pull/2617)
+* Implemented functionality to return non-zero value when no tests available. [#2610](https://github.com/microsoft/vstest/pull/2610)
+* Ensure that a supplied vstest.console path is escape sequenced [#2600](https://github.com/microsoft/vstest/pull/2600)
+* Temporary code to enable correct Fakes and Code Coverage integration [#2604](https://github.com/microsoft/vstest/pull/2604)
+* netstandard1.0 and uap10.0 support [#2596](https://github.com/microsoft/vstest/pull/2596)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.9.0-preview-20201020-06...v16.9.0-preview-20201123-03)
+
+### Drops
+
+* TestPlatform vsix: [16.9.0-preview-20201123-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20201123-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.9.0-preview-20201123-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.0-preview-20201123-03)
+
+## 16.8.3
+
+### Issues Fixed
+
+* Fixed PackageReferences on ObjectModel nupkg [#2660](https://github.com/microsoft/vstest/pull/2660)
+* [16.8] Fix collect dump always [#2641](https://github.com/microsoft/vstest/pull/2641)
+* Assembly load fixes [#2644](https://github.com/microsoft/vstest/pull/2644)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)
+
+### Drops
+
+* TestPlatform vsix: [16.8.3](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.8/20201202-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.8.3](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.8.3)
+
+## 16.8.0
+
+### Issues Fixed
+
+* Cherry-picked signing fixes from `master` [#2619](https://github.com/microsoft/vstest/pull/2619)
+* Signing instructions for Newtonsoft.Json.dll added (#2601) [#2603](https://github.com/microsoft/vstest/pull/2603)
+* Fix the initial assets location of VSTest assets [#2589](https://github.com/microsoft/vstest/pull/2589)
+* Generate release notes in pipeline
+* Forward merge fixes from master to rc2 [#2581](https://github.com/microsoft/vstest/pull/2581)
+* Fix blame parameter, warning, and add all testhosts to be ngend [#2579](https://github.com/microsoft/vstest/pull/2579)
+* Merge branch 'master' of <https://github.com/microsoft/vstest> into rel/16.8
+* Blame upload on crash even if hang dump started [#2553](https://github.com/microsoft/vstest/pull/2553)
+* Fix errors reported by StyleCop Analyzers [#2555](https://github.com/microsoft/vstest/pull/2555)
+* Improve blame [#2552](https://github.com/microsoft/vstest/pull/2552)
+* Remove sleeps and extra process dumps from blame
+* Changes to allow special characters in parameter names [#2481](https://github.com/microsoft/vstest/pull/2481)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200827.6 [#2547](https://github.com/microsoft/vstest/pull/2547)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200827.2 [#2546](https://github.com/microsoft/vstest/pull/2546)
+* Merge branch 'rel/16.8' of <https://github.com/microsoft/vstest> into rel/16.8
+* Remove env variables
+* Add binaries to enable running Fakes in Net Core [#2529](https://github.com/microsoft/vstest/pull/2529)
+* Trigger dumps asynchronously [#2542](https://github.com/microsoft/vstest/pull/2542)
+* Revert "Trigger dumps asynchronously (#2533)" [#2541](https://github.com/microsoft/vstest/pull/2541)
+* Trigger dumps asynchronously [#2533](https://github.com/microsoft/vstest/pull/2533)
+* Print version of the product in log [#2535](https://github.com/microsoft/vstest/pull/2535)
+* Merge rel16.7 into master [#2534](https://github.com/microsoft/vstest/pull/2534)
+* Print version of the product in log [#2536](https://github.com/microsoft/vstest/pull/2536)
+* Print only whole version on release branch.
+* Optionally force procdump [#2531](https://github.com/microsoft/vstest/pull/2531)
+* Forward merge master
+* Crash dumps via net client [#2532](https://github.com/microsoft/vstest/pull/2532)
+* Added a command-line argument to vstest.console.exe for setting environment variables [#2528](https://github.com/microsoft/vstest/pull/2528)
+* Fixed code coverage compatibility issue [#2527](https://github.com/microsoft/vstest/pull/2527)
+* Custom dump path for helix [#2525](https://github.com/microsoft/vstest/pull/2525)
+* Take non-completed tests instead of last [#2526](https://github.com/microsoft/vstest/pull/2526)
+* Forgot to regenerate resources before commit, as always [#2524](https://github.com/microsoft/vstest/pull/2524)
+* Fixing the reminder of crash dumps [#2520](https://github.com/microsoft/vstest/pull/2520)
+* Dumping child processes [#2518](https://github.com/microsoft/vstest/pull/2518)
+* Replace NET451 compiler directives with NETFRAMEWORK [#2516](https://github.com/microsoft/vstest/pull/2516)
+* [master] Update dependencies from dotnet/arcade [#2509](https://github.com/microsoft/vstest/pull/2509)
+* Updated TP external dependencies [#2515](https://github.com/microsoft/vstest/pull/2515)
+* Add environment variables to enable MacOS dump
+* Fixed code coverage compatibility issue [#2514](https://github.com/microsoft/vstest/pull/2514)
+* Fixed TRX file overwrite in certain circumstances [#2508](https://github.com/microsoft/vstest/pull/2508)
+* Use OS bitness to figure out .NETCore runner architecture [#2507](https://github.com/microsoft/vstest/pull/2507)
+* Updated TP external dependencies [#2503](https://github.com/microsoft/vstest/pull/2503)
+* Add missing space before parens in message [#2504](https://github.com/microsoft/vstest/pull/2504)
+* CI failure fix [#2500](https://github.com/microsoft/vstest/pull/2500)
+* Fix signing [#2497](https://github.com/microsoft/vstest/pull/2497)
+* Add the new MacOs env variable to allow dumps to be created. [#2496](https://github.com/microsoft/vstest/pull/2496)
+* Macos dumps [#2495](https://github.com/microsoft/vstest/pull/2495)
+* Multitarget testhost [#2493](https://github.com/microsoft/vstest/pull/2493)
+* Revert detecting default architecture, to allow dotnet to default to 64-bit [#2492](https://github.com/microsoft/vstest/pull/2492)
+* Nuget.Frameworks renamed netcoreapp5.0 to net5.0 [#2491](https://github.com/microsoft/vstest/pull/2491)
+* Console output for minimal and quiet [#2191](https://github.com/microsoft/vstest/pull/2191)
+* Update License
+* Linux build [#2477](https://github.com/microsoft/vstest/pull/2477)
+* Windows 32 bit issue [#2482](https://github.com/microsoft/vstest/pull/2482)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200715.6 [#2485](https://github.com/microsoft/vstest/pull/2485)
+* Create test results directory [#2483](https://github.com/microsoft/vstest/pull/2483)
+* Use testhost.exe only on Windows x86 and x64, and enable hang dumps on ARM and ARM64 [#2479](https://github.com/microsoft/vstest/pull/2479)
+* Localization HB. [#2478](https://github.com/microsoft/vstest/pull/2478)
+* Introduced acceptance tests for default exclusion merging [#2454](https://github.com/microsoft/vstest/pull/2454)
+* Change indicators to words [#2475](https://github.com/microsoft/vstest/pull/2475)
+* Adding test run attachments processing [#2463](https://github.com/microsoft/vstest/pull/2463)
+* Adding test run attachments processing [#2463](https://github.com/microsoft/vstest/pull/2463)
+* Localization check-in 07-01-2020 [#2471](https://github.com/microsoft/vstest/pull/2471)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200626.2 [#2470](https://github.com/microsoft/vstest/pull/2470)
+* Added new exception handling [#2461](https://github.com/microsoft/vstest/pull/2461)
+* Update branding to 16.8.0 [#2460](https://github.com/microsoft/vstest/pull/2460)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.7.0...v16.8.0)
+
+### Drops
+
+* TestPlatform vsix: [16.8.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/v16.8.0;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.8.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.8.0)
+
+## 16.9.0-preview-20201020-06
+
+### Issues Fixed
+
+* Enable Fakes Datacollector settings to be added in design mode [#2586](https://github.com/microsoft/vstest/pull/2586)
+* Fix blame parameter, warning, and add all testhosts to be ngend [#2579](https://github.com/microsoft/vstest/pull/2579)
+* Add netcoreapp1.0 support to `Microsoft.TestPlatform.TestHost` NuGet [#2569](https://github.com/microsoft/vstest/pull/2569)
+* Use bitness from process or OS [#2571](https://github.com/microsoft/vstest/pull/2571)
+* Restore netcoreapp1.0 support for testhost [#2554](https://github.com/microsoft/vstest/pull/2554)
+* Get symbols of DiaSymReader from externals [#2560](https://github.com/microsoft/vstest/pull/2560)
+* Do not force .NET4.5 in case legacy test settings are provided [#2545](https://github.com/microsoft/vstest/pull/2545)
+* Simplify package references [#2559](https://github.com/microsoft/vstest/pull/2559)
+* Enable default compile items for Microsoft.TestPlatform.PlatformAbstractions [#2556](https://github.com/microsoft/vstest/pull/2556)
+* Avoid logging >Task returned false but did not log an error.< [#2557](https://github.com/microsoft/vstest/pull/2557)
+* Fixed code coverage compatibility issue [#2527](https://github.com/microsoft/vstest/pull/2527)
+* Add environment variables to enable MacOS dump
+* Adding test run attachments processing [#2463](https://github.com/microsoft/vstest/pull/2463)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.8.0-release-20200921-02...v16.9.0-preview-20201020-06)
+
+### Drops
+
+* TestPlatform vsix: [16.9.0-preview-20201020-06](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20201020-06;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.9.0-preview-20201020-06](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.9.0-preview-20201020-06)
+
+## 16.8.0-preview-20200921-01
+
+### Issues Fixed
+
+* Fix blame parameter, warning, and add all testhosts to be ngend [#2579](https://github.com/microsoft/vstest/pull/2579)
+* Trigger dumps asynchronously [#2533](https://github.com/microsoft/vstest/pull/2533)
+* Print version of the product in log [#2535](https://github.com/microsoft/vstest/pull/2535)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.8.0-preview-20200812-03...v16.8.0-preview-20200921-01)
+
+### Drops
+
+* TestPlatform vsix: [16.8.0-preview-20200921-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200921-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.8.0-preview-20200921-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.8.0-preview-20200921-01)
+
+## 16.7.1
+
+### Issues Fixed
+
+* Fixed code coverage compatibility issue [#2527](https://github.com/microsoft/vstest/pull/2527)
+* Adding test run attachments processing [#2463](https://github.com/microsoft/vstest/pull/2463)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)
+
+### Drops
+
+* TestPlatform vsix: [16.7.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.7/20200819-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.7.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.7.1)
+
+## 16.8.0-preview-20200812-03
+
+### Issues Fixed
+
+* Replace NET451 compiler directives with NETFRAMEWORK [#2516](https://github.com/Microsoft/vstest/pull/2516)
+* [master] Update dependencies from dotnet/arcade [#2509](https://github.com/Microsoft/vstest/pull/2509)
+* Updated TP external dependencies [#2515](https://github.com/Microsoft/vstest/pull/2515)
+* Fixed code coverage compatibility issue [#2514](https://github.com/Microsoft/vstest/pull/2514)
+* Fixed TRX file overwrite in certain circumstances [#2508](https://github.com/Microsoft/vstest/pull/2508)
+
+See full log [here](https://github.com/Microsoft/vstest/compare/v16.8.0-preview-20200806-02...v16.8.0-preview-20200812-03)
+
+### Drops
+
+* TestPlatform vsix: [16.8.0-preview-20200812-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200812-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.8.0-preview-20200812-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.8.0-preview-20200812-03)
+
+## 16.8.0-preview-20200806-02
+
+### Issues Fixed
+
+* Use OS bitness to figure out .NETCore runner architecture [#2507](https://github.com/microsoft/vstest/pull/2507)
+* Updated TP external dependencies [#2503](https://github.com/microsoft/vstest/pull/2503)
+* Add missing space before parens in message [#2504](https://github.com/microsoft/vstest/pull/2504)
+* CI failure fix [#2500](https://github.com/microsoft/vstest/pull/2500)
+* Fix signing [#2497](https://github.com/microsoft/vstest/pull/2497)
+* Add the new MacOs env variable to allow dumps to be created. [#2496](https://github.com/microsoft/vstest/pull/2496)
+* Macos dumps [#2495](https://github.com/microsoft/vstest/pull/2495)
+* Multitarget testhost [#2493](https://github.com/microsoft/vstest/pull/2493)
+* Revert detecting default architecture, to allow dotnet to default to 64-bit [#2492](https://github.com/microsoft/vstest/pull/2492)
+* Nuget.Frameworks renamed netcoreapp5.0 to net5.0 [#2491](https://github.com/microsoft/vstest/pull/2491)
+* Console output for minimal and quiet [#2191](https://github.com/microsoft/vstest/pull/2191)
+* Update License
+* Linux build [#2477](https://github.com/microsoft/vstest/pull/2477)
+* Windows 32 bit issue [#2482](https://github.com/microsoft/vstest/pull/2482)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200715.6 [#2485](https://github.com/microsoft/vstest/pull/2485)
+* Create test results directory [#2483](https://github.com/microsoft/vstest/pull/2483)
+* Use testhost.exe only on Windows x86 and x64, and enable hang dumps on ARM and ARM64 [#2479](https://github.com/microsoft/vstest/pull/2479)
+* Localization HB. [#2478](https://github.com/microsoft/vstest/pull/2478)
+* Introduced acceptance tests for default exclusion merging [#2454](https://github.com/microsoft/vstest/pull/2454)
+* Change indicators to words [#2475](https://github.com/microsoft/vstest/pull/2475)
+* Adding test run attachments processing [#2463](https://github.com/microsoft/vstest/pull/2463)
+* Localization check-in 07-01-2020 [#2471](https://github.com/microsoft/vstest/pull/2471)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200626.2 [#2470](https://github.com/microsoft/vstest/pull/2470)
+* Added new exception handling [#2461](https://github.com/microsoft/vstest/pull/2461)
+* Update branding to 16.8.0 [#2460](https://github.com/microsoft/vstest/pull/2460)
+* Update dependencies from <https://github.com/dotnet/arcade> build 20200602.3 [#2455](https://github.com/microsoft/vstest/pull/2455)
+* Added exception handling while creating "TestResults" folder [#2450](https://github.com/microsoft/vstest/pull/2450)
+* Added support for default exclusion merging for code coverage [#2431](https://github.com/microsoft/vstest/pull/2431)
+* LOC CHECKIN | microsoft/vstest master | 20200526 [#2445](https://github.com/microsoft/vstest/pull/2445)
+* Generate xlf for blame [#2442](https://github.com/microsoft/vstest/pull/2442)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.7.0-preview-20200519-01...v16.8.0-preview-20200806-02)
+
+### Drops
+
+* TestPlatform vsix: [16.8.0-preview-20200806-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200806-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.8.0-preview-20200806-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.8.0-preview-20200806-02)
+
+## 16.7.0
+
+### Issues Fixed
+
+* Added new exception handling [#2461](https://github.com/microsoft/vstest/pull/2461)
+* Added exception handling while creating "TestResults" folder [#2450](https://github.com/microsoft/vstest/pull/2450)
+* Added support for default exclusion merging for code coverage [#2431](https://github.com/microsoft/vstest/pull/2431)
+* LOC CHECKIN | microsoft/vstest master | 20200526 [#2445](https://github.com/microsoft/vstest/pull/2445)
+* Generate xlf for blame [#2442](https://github.com/microsoft/vstest/pull/2442)
+* Upgrade TestPlatform external dependencies [#2440](https://github.com/microsoft/vstest/pull/2440)
+* Added support for debugging external test processes [#2325](https://github.com/microsoft/vstest/pull/2325)
+* Add the parameters to VSTestTask to allow dotnet test to work [#2438](https://github.com/microsoft/vstest/pull/2438)
+* Add hangdump and crash dump capabilities and options [#2434](https://github.com/microsoft/vstest/pull/2434)
+* Update arcade tooling to latest [#2436](https://github.com/microsoft/vstest/pull/2436)
+* More verbose info in datacollector log [#2430](https://github.com/microsoft/vstest/pull/2430)
+* Support /TestCaseFilter and /Tests arguments at the same time [#2371](https://github.com/microsoft/vstest/pull/2371)
+* Wrap error message/stack trace content in `<pre>` [#2419](https://github.com/microsoft/vstest/pull/2419)
+* Update telemetry to latest [#2421](https://github.com/microsoft/vstest/pull/2421)
+* Merge test run parameters that have spaces [#2409](https://github.com/microsoft/vstest/pull/2409)
+* update externals [#2406](https://github.com/microsoft/vstest/pull/2406)
+* VS Depencencies from 16.7.0 signed build [#2382](https://github.com/microsoft/vstest/pull/2382)
+* Changed new configurator method name (#2397) [#2403](https://github.com/microsoft/vstest/pull/2403)
+* Fix null reference [#2401](https://github.com/microsoft/vstest/pull/2401)
+* Changed new configurator method name [#2398](https://github.com/microsoft/vstest/pull/2398)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.0...v16.7.0)
+
+### Drops
+
+* TestPlatform vsix: [16.7.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/v16.7.0;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.7.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.7.0)
+
+## 16.7.0-preview-20200519-01
+
+### Issues Fixed
+
+* Upgrade TestPlatform external dependencies [#2440](https://github.com/microsoft/vstest/pull/2440)
+* Added support for debugging external test processes [#2325](https://github.com/microsoft/vstest/pull/2325)
+* Add the parameters to VSTestTask to allow dotnet test to work [#2438](https://github.com/microsoft/vstest/pull/2438)
+* Add hangdump and crash dump capabilities and options [#2434](https://github.com/microsoft/vstest/pull/2434)
+* Update arcade tooling to latest [#2436](https://github.com/microsoft/vstest/pull/2436)
+* More verbose info in datacollector log [#2430](https://github.com/microsoft/vstest/pull/2430)
+* Support /TestCaseFilter and /Tests arguments at the same time [#2371](https://github.com/microsoft/vstest/pull/2371)
+* Wrap error message/stack trace content in `<pre>` [#2419](https://github.com/microsoft/vstest/pull/2419)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.7.0-preview-20200428-01...v16.7.0-preview-20200519-01)
+
+### Drops
+
+* TestPlatform vsix: [16.7.0-preview-20200519-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200519-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.7.0-preview-20200519-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.7.0-preview-20200519-01)
+
+## 16.7.0-preview-20200428-01
+
+### Issues Fixed
+
+* Update telemetry to latest [#2421](https://github.com/microsoft/vstest/pull/2421)
+* Merge test run parameters that have spaces [#2409](https://github.com/microsoft/vstest/pull/2409)
+* updated package version [#2412](https://github.com/microsoft/vstest/pull/2412)
+* update externals [#2406](https://github.com/microsoft/vstest/pull/2406)
+* VS Depencencies from 16.7.0 signed build [#2382](https://github.com/microsoft/vstest/pull/2382)
+* Changed new configurator method name (#2397) [#2403](https://github.com/microsoft/vstest/pull/2403)
+* Fix null reference [#2401](https://github.com/microsoft/vstest/pull/2401)
+* Changed new configurator method name [#2398](https://github.com/microsoft/vstest/pull/2398)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0-preview-20200428-01)
+
+### Drops
+
+* TestPlatform vsix: [16.7.0-preview-20200428-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200428-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.7.0-preview-20200428-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.7.0-preview-20200428-01)
+
+## 16.6.1
+
+### Issues Fixed
+
+* Fix fakes version [#2412](https://github.com/microsoft/vstest/pull/2412)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.0...v16.6.1)
+
+### Drops
+
+* TestPlatform vsix: [16.6.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.6/20200423-06;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.1)
+
+## 16.6.0
+
+### Issues Fixed
+
+* Fix null reference in Fakes [#2400](https://github.com/microsoft/vstest/pull/2400)
+* Changed new configurator method name [#2397](https://github.com/microsoft/vstest/pull/2397)
+* Fixes Test Platform. [#2393](https://github.com/microsoft/vstest/pull/2393)
+* Fixing a typo for the method arguments for the Fakes utility method. [#2385](https://github.com/microsoft/vstest/pull/2385)
+* Ignore flaky test [#2386](https://github.com/microsoft/vstest/pull/2386)
+* LOC CHECKIN | Microsoft/vstest master | 20200403 [#2383](https://github.com/microsoft/vstest/pull/2383)
+* Upgrade CppUnitTestFramework to newest version [#2381](https://github.com/microsoft/vstest/pull/2381)
+* Added method to look for new api in fakes datacollector [#2339](https://github.com/microsoft/vstest/pull/2339)
+* Take TestCaseFilter from runsettings [#2356](https://github.com/microsoft/vstest/pull/2356)
+* Pin dotnet [#2373](https://github.com/microsoft/vstest/pull/2373)
+* Fix writing to trx when error has no message [#2364](https://github.com/microsoft/vstest/pull/2364)
+* Fix symbols [#2363](https://github.com/microsoft/vstest/pull/2363)
+* Report informational messages when platform logs are enabled [#2361](https://github.com/microsoft/vstest/pull/2361)
+* Add option to specify custom test host [#2359](https://github.com/microsoft/vstest/pull/2359)
+* Fix running self-contained apps on Windows [#2358](https://github.com/microsoft/vstest/pull/2358)
+* Remove unused usings. [#2350](https://github.com/microsoft/vstest/pull/2350)
+* Better error when discoverer defaultExecutorUri is not set. [#2354](https://github.com/microsoft/vstest/pull/2354)
+* Add coverlet smoke test [#2348](https://github.com/microsoft/vstest/pull/2348)
+* Fix splitting of test name from fully qualified name [#2355](https://github.com/microsoft/vstest/pull/2355)
+* Spelling / conventions and grammar fixes [#2338](https://github.com/microsoft/vstest/pull/2338)
+* Small build fixes [#2345](https://github.com/microsoft/vstest/pull/2345)
+* Fix race condition on testhost exit before we connect [#2344](https://github.com/microsoft/vstest/pull/2344)
+* Move test publish to the bottom [#2342](https://github.com/microsoft/vstest/pull/2342)
+* Do not crash on Debug.Assert [#2335](https://github.com/microsoft/vstest/pull/2335)
+* Switch arguments for expected and actual in Assert.AreEquals in multiple tests [#2329](https://github.com/microsoft/vstest/pull/2329)
+* Run acceptance tests against the locally built sources [#2340](https://github.com/microsoft/vstest/pull/2340)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.0)
+
+### Drops
+
+* TestPlatform vsix: [16.6.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/16.6/20200414-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.0)
+
+## 16.6.0-preview-20200318-01
+
+### Issues Fixed
+
+* Fix writing to trx when error has no message [#2364](https://github.com/microsoft/vstest/pull/2364)
+* Fix symbols [#2363](https://github.com/microsoft/vstest/pull/2363)
+* Report informational messages when platform logs are enabled [#2361](https://github.com/microsoft/vstest/pull/2361)
+* Add option to specify custom test host [#2359](https://github.com/microsoft/vstest/pull/2359)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.0-preview-20200310-03...v16.6.0-preview-20200318-01)
+
+### Drops
+
+* TestPlatform vsix: [16.6.0-preview-20200318-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200318-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.0-preview-20200318-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.0-preview-20200318-01)
+
+## 16.6.0-preview-20200310-03
+
+### Issues Fixed
+
+* Fix running self-contained apps on Windows [#2358](https://github.com/microsoft/vstest/pull/2358)
+* Remove unused usings. [#2350](https://github.com/microsoft/vstest/pull/2350)
+* Better error when discoverer defaultExecutorUri is not set. [#2354](https://github.com/microsoft/vstest/pull/2354)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.0-preview-20200309-01...v16.6.0-preview-20200310-03)
+
+### Drops
+
+* TestPlatform vsix: [16.6.0-preview-20200310-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200310-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.0-preview-20200310-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.0-preview-20200310-03)
+
+## 16.6.0-preview-20200309-01
+
+### Issues Fixed
+
+* Add coverlet smoke test [#2348](https://github.com/microsoft/vstest/pull/2348)
+* Fix splitting of test name from fully qualified name [#2355](https://github.com/microsoft/vstest/pull/2355)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.6.0-preview-20200226-03...v16.6.0-preview-20200309-01)
+
+### Drops
+
+* TestPlatform vsix: [16.6.0-preview-20200309-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200309-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.0-preview-20200309-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.0-preview-20200309-01)
+
+## 16.6.0-preview-20200226-03
+
+### Issues Fixed
+
+* Spelling / conventions and grammar fixes [#2338](https://github.com/microsoft/vstest/pull/2338)
+* Small build fixes [#2345](https://github.com/microsoft/vstest/pull/2345)
+* Fix race condition on testhost exit before we connect [#2344](https://github.com/microsoft/vstest/pull/2344)
+* Move test publish to the bottom [#2342](https://github.com/microsoft/vstest/pull/2342)
+* Do not crash on Debug.Assert [#2335](https://github.com/microsoft/vstest/pull/2335)
+* Switch arguments for expected and actual in Assert.AreEquals in multiple tests [#2329](https://github.com/microsoft/vstest/pull/2329)
+* Run acceptance tests against the locally built sources [#2340](https://github.com/microsoft/vstest/pull/2340)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.5.0-preview-20200203-01...v16.6.0-preview-20200226-03)
+
+### Drops
+
+* TestPlatform vsix: [16.6.0-preview-20200226-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200226-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.6.0-preview-20200226-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.6.0-preview-20200226-03)
+
+## 16.5.0
+
+### Issues fixed (since 16.4.0)
+
+* Use version of external package with fixes [#2315](https://github.com/microsoft/vstest/pull/2315)
+* Use latest version of VS that is available [#2314](https://github.com/microsoft/vstest/pull/2314)
+* Pass coverlet codebase in runsettings for inproc data collector initialization [#2288](https://github.com/microsoft/vstest/pull/2288)
+* Make --verbosity case insensitive [#2300](https://github.com/microsoft/vstest/pull/2300)
+* Revert "Use patched version of TestPlatform.Extensions (#2283)" [#2307](https://github.com/microsoft/vstest/pull/2307)
+* Update arcade [#2302](https://github.com/microsoft/vstest/pull/2302)
+* Fix SocketCommunicationManager [#2290](https://github.com/microsoft/vstest/pull/2290)
+* Use patched version of TestPlatform.Extensions [#2283](https://github.com/microsoft/vstest/pull/2283)
+* Cap version of VS to <16.0 [#2285](https://github.com/microsoft/vstest/pull/2285)
+* Remove duplicate counting of test results in Consolelogger [#2267](https://github.com/microsoft/vstest/pull/2267)
+* Test run parameter added as part of CLI runsettings args [#2251](https://github.com/microsoft/vstest/pull/2251)
+* Initialize only coverlet data collector [#2274](https://github.com/microsoft/vstest/pull/2274)
+* Use RunSettingsFilePath from when using dotnet test [#2272](https://github.com/microsoft/vstest/pull/2272)
+* Eqt trace error was thrown if extension uri is not given [#2264](https://github.com/microsoft/vstest/pull/2264)
+* Fix for discovery not working on Mac machines [#2266](https://github.com/microsoft/vstest/pull/2266)
+* Disable reusing nodes when building localization [#2268](https://github.com/microsoft/vstest/pull/2268)
+* Trx changes for fqdn mapping in test method name [#2259](https://github.com/microsoft/vstest/pull/2259)
+* Expand environment variables in codeBase before loading extension [#1871](https://github.com/microsoft/vstest/pull/1871)
+* Coverlet in-process collector is not loaded for version > 1.0.0 [#2221](https://github.com/microsoft/vstest/pull/2221)
+* fix path in ngen [#2246](https://github.com/microsoft/vstest/pull/2246)
+* LOC CHECKIN | Microsoft/vstest master | 20191104 [#2241](https://github.com/microsoft/vstest/pull/2241)
+* Move Tp version to 16.5 [#2243](https://github.com/microsoft/vstest/pull/2243)
+* Add support for an arg to enable progress indicator, disabled by default. [#2234](https://github.com/microsoft/vstest/pull/2234)
+* Correct name and link for RFC 17 [#2232](https://github.com/microsoft/vstest/pull/2232)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)
+See changes since the last preview [here](https://github.com/microsoft/vstest/compare/16.5.0-preview-20200203-01...v16.5.0)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200205-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0)
+
+## 16.5.0-preview-20200203-01
+
+### Issues Fixed
+
+* Use version of external package with fixes [#2315](https://github.com/microsoft/vstest/pull/2315)
+* Use latest version of VS that is available [#2314](https://github.com/microsoft/vstest/pull/2314)
+* Pass coverlet codebase in runsettings for inproc data collector initialization [#2288](https://github.com/microsoft/vstest/pull/2288)
+* Make --verbosity case insensitive [#2300](https://github.com/microsoft/vstest/pull/2300)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v16.5.0-preview-20200116-01...v16.5.0-preview-20200203-01)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20200203-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200203-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20200203-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20200203-01)  
+
+## 16.5.0-preview-20200116-01
+
+### Issues Fixed
+
+* Revert "Use patched version of TestPlatform.Extensions (#2283)" [#2307](https://github.com/microsoft/vstest/pull/2307)
+* Update arcade [#2302](https://github.com/microsoft/vstest/pull/2302)
+* Fix SocketCommunicationManager [#2290](https://github.com/microsoft/vstest/pull/2290)
+
+See full log [here](https://github.com/Microsoft/vstest/compare/v16.5.0-preview-20200110-02...v16.5.0-preview-20200116-01)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20200116-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200116-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20200116-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20200116-01)
+
+## 16.5.0-preview-20200110-02
+
+### Issues Fixed
+
+* Remove duplicate counting of test results in Consolelogger [#2267](https://github.com/microsoft/vstest/pull/2267)
+* Cap version of VS to <16.0 [#2285](https://github.com/microsoft/vstest/pull/2285)
+* Use patched version of TestPlatform.Extensions [#2283](https://github.com/microsoft/vstest/pull/2283)
+
+See full log [here](https://github.com/Microsoft/vstest/compare/v16.5.0-preview-20200102-01...v16.5.0-preview-20200110-02)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20200110-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200110-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20200110-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20200110-02)
+
+## 16.5.0-preview-20200102-01
+
+### Issues Fixed
+
+* Test run parameter added as part of CLI runsettings args [#2251](https://github.com/microsoft/vstest/pull/2251)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20200102-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20200102-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20200102-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20200102-01)
+
+## 16.5.0-preview-20191216-02
+
+### Issues Fixed
+
+* Trx changes for fqdn mapping in test method name [#2259](https://github.com/microsoft/vstest/pull/2259)
+* Fix for test discovery not working on mac machines [#2266](https://github.com/microsoft/vstest/pull/2266)
+* Use RunSettingsFilePath from project file when using dotnet test [#2272](https://github.com/microsoft/vstest/pull/2272)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20191216-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20191216-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20191216-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20191216-02)
+
+## 16.5.0-preview-20191115-01
+
+### Issues Fixed
+
+* Fixed Coverlet in-process collector not loaded for version > 1.0.0 [#2204](https://github.com/microsoft/vstest/pull/2221)
+
+### Drops
+
+* TestPlatform vsix: [16.5.0-preview-20191115-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20191115-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.5.0-preview-20191115-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.5.0-preview-20191115-01)
+
+## 16.4.0
+
+### Issues Fixed
+
+* Adding log prefixkey to html logger [#2204](https://github.com/microsoft/vstest/pull/2204)
+* AnyCPU tests to choose default architecture based on process [#2206](https://github.com/microsoft/vstest/pull/2206)
+* Only send Coverlet in proc datacollector dll to testhost [#2226](https://github.com/microsoft/vstest/pull/2226)
+* Missing Cancel Implementation [#2227](https://github.com/microsoft/vstest/pull/2227)
+
+### Drops
+
+* TestPlatform vsix: [16.4.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20191025-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.4.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.4.0)
+
+## 16.4.0-preview-20191007-01
+
+### Issues Fixed / Features Added
+
+* Redirect procdump process output to diag files [#2181](https://github.com/microsoft/vstest/pull/2181)
+* Implemented cancellation of individual source files discovery [#2134](https://github.com/microsoft/vstest/pull/2134)
+* Enabling native code debugging of test host [#2190](https://github.com/microsoft/vstest/pull/2190)
+* Logging Adapter Load issues to console [#2156](https://github.com/microsoft/vstest/pull/2156)
+* Fixed DataCollector to load with only uri (and not friendly name) specified in Runsettings [#2177](https://github.com/microsoft/vstest/pull/2177)
+* Added env var support to blame test results directory path and fixed blame aborting without killing the test host process on hang timeout when there is an error with dump collection/attachment [#2216](https://github.com/microsoft/vstest/pull/2216)
+
+## 16.3.0
+
+### Issues Fixed
+
+* Html logger [#2103](https://github.com/microsoft/vstest/pull/2103)
+* Add LogFilePrefix Parameter for supporting trx for multi-targetted projects [#2140](https://github.com/microsoft/vstest/pull/2140)
+* Support x86 platform targeting for .NET core tests [#2161](https://github.com/microsoft/vstest/pull/2161)
+* Add logging for Translation layer [#2166](https://github.com/microsoft/vstest/pull/2166)
+
+### Drops
+
+* TestPlatform vsix: [16.3.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20190919-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.3.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.3.0)
+
+## 16.3.0-preview-20190828-03
+
+### Issues Fixed
+
+* Add noprogress parameter to disable progress indicator [#2117](https://github.com/microsoft/vstest/pull/2117)
+* Accept short names for framewwork [#2116](https://github.com/microsoft/vstest/pull/2116)
+* Specifying environment variables in RunSettings file [#2128](https://github.com/microsoft/vstest/pull/2128)
+* VsTestConsoleWrapper endsession should shut down vstest console process [#2145](https://github.com/microsoft/vstest/pull/2145)
+
+### Drops
+
+* TestPlatform vsix: [16.3.0-preview-20190828-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20190828-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.3.0-preview-20190828-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.3.0-preview-20190828-03)
+
+## 16.3.0-preview-20190715-02
+
+### Issues Fixed
+
+* TestPlatform targeting netstandard2.0. [#2076](https://github.com/microsoft/vstest/pull/2076)
+* Implemented the cancellation of discovery request [#2076](https://github.com/microsoft/vstest/pull/2076)
+* Generating manifest for publishing to BAR. [#2069](https://github.com/microsoft/vstest/pull/2069)
+
+### Drops
+
+* TestPlatform vsix: [16.3.0-preview-20190715-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20190715-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.3.0-preview-20190715-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.3.0-preview-20190715-02)
+
+## 16.2.0
+
+### Issues Fixed
+
+* Updated TestPlatform.ObjectModel.nuspec. [#2055](https://github.com/microsoft/vstest/pull/2055)
+* Fixed incorrect timeout message when test host crashes [#2056](https://github.com/microsoft/vstest/pull/2056)
+* Incompatible framework message fix. [#2044](https://github.com/microsoft/vstest/pull/2044)
+* Cleaned up remaining set of dependencies for source build. [#2058](https://github.com/microsoft/vstest/pull/2058)
+
+### Drops
+
+* TestPlatform vsix: [16.2.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/master/20190626-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.2.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.2.0)
+
+## 16.2.0-preview-20190606-02
+
+### Issues Fixed
+
+* Spurious vstest.console process spin up fixed. [#2035](https://github.com/microsoft/vstest/pull/2035)
+* Test host locking pdb fixed [#2029](https://github.com/microsoft/vstest/pull/2029)
+* Encoding change from UCS-2 to UTF-8. [#2044](https://github.com/microsoft/vstest/pull/2044)
+* Unable to find Microsoft.VisualStudio.ArchitectureTools.PEReader fixed. [#2008](https://github.com/microsoft/vstest/pull/2008)
+
+### Drops
+
+* TestPlatform vsix: [16.2.0-preview-20190606-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190606-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.2.0-preview-20190606-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.2.0-preview-20190606-02)
+
+## 16.1.1
+
+### Issues Fixed
+
+* Prevent unnecessary progress indicator refresh to improve test run time. [#2024](https://github.com/microsoft/vstest/pull/2024)
+* Changes to allow clients to provide environment variable while initializing VsTestConsoleWrapper [#2023](https://github.com/microsoft/vstest/pull/2023)
+* Fix for the trx classname being wrongly stamped when testname and fullyqualifiedname are same. [#2014](https://github.com/microsoft/vstest/pull/2014)
+* Search datacollectors in output directory as well. [#2015](https://github.com/microsoft/vstest/pull/2015)
+* Changes to avoid restoring of packages that are not required for the BuildFromSource scenario. [#2017](https://github.com/microsoft/vstest/pull/2017)
+
+### Drops
+
+* TestPlatform vsix: [16.1.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190529-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.1.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.1.1)
+
+## 16.0.2-Preview-20190502-01
+
+### Issues Fixed
+
+* Improve the cli experience for dotnet test. [#1964](https://github.com/Microsoft/vstest/pull/1964)
+* Improve readability of dotnet test [#1960](https://github.com/Microsoft/vstest/pull/1960)
+* Make testhost.x86 large address aware [#1986](https://github.com/Microsoft/vstest/pull/1986)
+* Vstest.console Should not message to Testhost process if it has exited [#1994](https://github.com/Microsoft/vstest/pull/1994)
+* [Revert] Fix for dotnet test on a multi-target projects logs only the last target [#1996](https://github.com/Microsoft/vstest/pull/1996)
+* [Trxlogger] Fixing the code to preserve newline for adapter logs to stdout [#1999](https://github.com/Microsoft/vstest/pull/1999)
+
+### Drops
+
+* TestPlatform vsix: [16.0.2-preview-20190502-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190502-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.2-preview-20190502-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.2-preview-20190502-01)
+
+## 16.0.1
+
+### Issues Fixed
+
+* Reverted aborting test run when source and target frameworks/architectures are incompatible. [#1935](https://github.com/Microsoft/vstest/pull/1935)
+
+### Drops
+
+* TestPlatform vsix: [16.0.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190304-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.1)
+
+## 16.0.0
+
+### Issues Fixed
+
+* Added missing Utilities dependency to netstandard1.5 [#1913](https://github.com/Microsoft/vstest/pull/1913)
+* Add support for xplat vstest console in translationlayer [#1893](https://github.com/Microsoft/vstest/pull/1893)
+* Aborting test run when source and target frameworks/architectures are incompatible. [#1789](https://github.com/Microsoft/vstest/pull/1789)
+
+### Drops
+
+* TestPlatform vsix: [16.0.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190228-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.0)
+
+## 16.0.0-preview-20190201-03
+
+### Issues Fixed
+
+* Running NETFramework 3.5 tests in compat mode [#1906](https://github.com/Microsoft/vstest/pull/1906)
+* Make timeouts for translation layer timeout configurable. [#1909](https://github.com/Microsoft/vstest/pull/1909)
+
+### Drops
+
+* TestPlatform vsix: [16.0.0-preview-20190201-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190201-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.0-preview-20190201-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.0-preview-20190201-03)
+
+## 16.0.0-preview-20190124-02
+
+### Issues Fixed
+
+* Downgrade Test.Sdk to net40 [#1860](https://github.com/Microsoft/vstest/pull/1860)
+* Fix xml exception when we are dealing with special chars [#1872](https://github.com/Microsoft/vstest/pull/1872)
+* Fix - dotnet test on a multi-target projects logs only the last target [#1877](https://github.com/Microsoft/vstest/pull/1877)
+* Avoid usage of JsonConvert in test host process [#1881](https://github.com/Microsoft/vstest/pull/1881)
+* Fixing logging error in event sources [#1897](https://github.com/Microsoft/vstest/pull/1897)
+
+### Drops
+
+* TestPlatform vsix: [16.0.0-preview-20190124-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20190124-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.0-preview-20190124-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.0-preview-20190124-02)
+
+## 16.0.0-preview-20181205-02
+
+### Issues Fixed
+
+* Stop trying to connect if the test host exits unexpectedly [#1853](https://github.com/Microsoft/vstest/pull/1853)
+* Move warning into a target to fix msbuild error [#1856](https://github.com/Microsoft/vstest/pull/1856)
+* Adding the missing assemblyInfo files and updating the copyrights [#1859](https://github.com/Microsoft/vstest/pull/1859)
+
+### Drops
+
+* TestPlatform vsix: [16.0.0-preview-20181205-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20181205-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.0-preview-20181205-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.0-preview-20181205-02)
+
+## 16.0.0-preview-20181128-01
+
+### Issues Fixed
+
+* Allow external use of the TRX Logger [#1792](https://github.com/Microsoft/vstest/pull/1792)
+* Add "!~" operator to test filter [#1803](https://github.com/Microsoft/vstest/pull/1803)
+* Simplify SDK languages support [#1804](https://github.com/Microsoft/vstest/pull/1804)
+* Make Translation Layer connection timeout configurable [#1843](https://github.com/Microsoft/vstest/pull/1843)
+* Fixed issue where proc dump was not getting terminated on no crash [#1849](https://github.com/Microsoft/vstest/pull/1849)
+
+### Drops
+
+* TestPlatform vsix: [16.0.0-preview-20181128-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20181128-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [16.0.0-preview-20181128-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/16.0.0-preview-20181128-01)
+
+## 15.9.0
+
+### Issues Fixed
+
+* Unstable testId for nunit tests [#1785](https://github.com/Microsoft/vstest/pull/1785)
+* Run tests only for test projects [#1745](https://github.com/Microsoft/vstest/pull/1745)
+* Add info log if try to run tests with no IsTestProject prop [#1778](https://github.com/Microsoft/vstest/pull/1778)
+
+### Drops
+
+* TestPlatform vsix: [15.9.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.9/20181008-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.9.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.9.0)
+
+## 15.9.0-preview-20180924-03
+
+### Issues Fixed
+
+* Fix Video Datacollector errors [#1719](https://github.com/Microsoft/vstest/pull/1719)
+* Show error message on Framework35 [#1723](https://github.com/Microsoft/vstest/pull/1723)
+* Suggest publish for running on an isolated machine[#1726](https://github.com/Microsoft/vstest/pull/1726)
+* Fix UWP tests app socket exception [#1728](https://github.com/Microsoft/vstest/pull/1728)
+* Run tests only for test projects in "dotnet test my.sln" scenario [#1745](https://github.com/Microsoft/vstest/pull/1745)
+
+### Drops
+
+* TestPlatform vsix: [15.9.0-preview-20180924-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180924-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.9.0-preview-20180924-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.9.0-preview-20180924-03)
+
+## 15.9.0-preview-20180807-05
+ 
+### Issues Fixed
+
+* Fix for VSTest to honor /nologo user input from dotnet cli [#1717](https://github.com/Microsoft/vstest/pull/1717)
+* Fixed ISettingsProvider in TestAdapter assembly [#1704](https://github.com/Microsoft/vstest/pull/1704)
+* Added `.NETCoreApp,Version=v2.0` example in error message [#1714](https://github.com/Microsoft/vstest/pull/1714)
+* Print start of testhost standard error stacktrace [#1708](https://github.com/Microsoft/vstest/pull/1708)
+* Use of culture specified by user in case it differs with that of OS [#1712](https://github.com/Microsoft/vstest/pull/1712)
+* Added attributes for sequence file generated by blame [#1716](https://github.com/Microsoft/vstest/pull/1716)
+* Trx Logger class name fix for Nunit Data Driven tests [#1677](https://github.com/Microsoft/vstest/pull/1677)
+* Trx Logger Fixed to generate trx file when test run aborts [#1710](https://github.com/Microsoft/vstest/pull/1710)
+* Added trace level for diag argument [#1681](https://github.com/Microsoft/vstest/pull/1681)
+ 
+### New Features introduced
+
+* Enhancing Blame data collector options to include DumpType and AlwaysCollectDump [#1682](https://github.com/Microsoft/vstest/pull/1682)
+* Procdump arguments enhanced to handle crash scenarios [#1700](https://github.com/Microsoft/vstest/pull/1700)
+ 
+### Drops
+
+* TestPlatform vsix: [15.9.0-preview-20180807-05](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180807-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.9.0-preview-20180807-05](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.9.0-preview-20180807-05)
+
+## 15.8.0
+
+### Issues Fixed
+
+* Fix vstest.console.exe grabs exclusive read access to its test container [#1660](https://github.com/Microsoft/vstest/pull/1660)
+* Registring correct property attributes during deserialization [#1644](https://github.com/Microsoft/vstest/pull/1644)
+* Fixed test platform messages on cancellation request [#1667](https://github.com/Microsoft/vstest/pull/1667)
+* Fixed warning messages for scenario when no tests are found matching TestCaseFilter [#1656](https://github.com/Microsoft/vstest/pull/1656)
+* Fixed UWP VC++ unit tests not executing [#1649](https://github.com/Microsoft/vstest/pull/1649)
+* Handling null value deserialization in TestCategory [#1640](https://github.com/Microsoft/vstest/pull/1640)
+
+### New Features introduced
+
+* Auto-generate F# program file. [#1664](https://github.com/Microsoft/vstest/pull/1664)
+* Added support for dotnet test --collect:"Code Coverage" (windows only) [#981](https://github.com/Microsoft/vstest/issues/981)
+
+### Drops
+
+* TestPlatform vsix: [15.8.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180710-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.8.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.8.0)
+
+## 15.8.0-preview-20180610-02
+
+### New Features introduced
+
+* Collect Code coverage with dotnet core sdk on windows. [#981](https://github.com/Microsoft/vstest/issues/981)
+
+### Drops
+
+* TestPlatform vsix: [15.8.0-preview-20180610-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180610-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.8.0-preview-20180610-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.8.0-preview-20180610-02)
+
+## 15.8.0-preview-20180605-02
+
+### Issues Fixed
+
+* Fix Exception thrown while creating framework based on default enums. [#1598](https://github.com/Microsoft/vstest/pull/1598)
+* Deprecate Testplatform\Extensions path for Adapters [#1602](https://github.com/Microsoft/vstest/pull/1602)
+* Update Test Source with Package for Inprogress Tests [#1605](https://github.com/Microsoft/vstest/pull/1605)
+* Use DateTime.UtcNow instead of DateTime.Now for consistency across test reporting data [#1612](https://github.com/Microsoft/vstest/pull/1612)
+* Fixed RecordResult to SendTestCaseEnd if not already for datacollectors to end and get attachments correctly [#1615](https://github.com/Microsoft/vstest/pull/1615)
+* Fix attachment uri in trx if same attachment filename is same [#1625](https://github.com/Microsoft/vstest/pull/1625)
+* Add support to escape/unescape testcase filter strings [#1627](https://github.com/Microsoft/vstest/pull/1627)
+
+### New Features introduced
+
+* Add a tool to migrate testsettings to runsettings [#1600](https://github.com/Microsoft/vstest/pull/1600)
+
+### Drops
+
+* TestPlatform vsix: [15.8.0-preview-20180605-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180605-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.8.0-preview-20180605-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.8.0-preview-20180605-02)
+
+## 15.8.0-preview-20180510-03
+
+### Issues Fixed
+
+* Extend FastFilter to support multiple properties. [#1523](https://github.com/Microsoft/vstest/pull/1523)
+* Make all communication timeouts configurable. [#1538](https://github.com/Microsoft/vstest/pull/1538)
+* Honoring cancel and abort request in test platform. [#1543](https://github.com/Microsoft/vstest/pull/1543)
+* FilterOptions serialization issue when running .NET core tests. [#1551](https://github.com/Microsoft/vstest/pull/1551)
+* Telemetry points for legacy settings. [#1564](https://github.com/Microsoft/vstest/pull/1564)
+* Flushing test results even if RecordEnd is not called. [#1573](https://github.com/Microsoft/vstest/pull/1573)
+* Searching adapters in Test Source directory in all scenarios. [#1574](https://github.com/Microsoft/vstest/pull/1574)
+* Filtering non existent adapter paths. [#1578](https://github.com/Microsoft/vstest/pull/1578)
+
+### New Features introduced
+
+* Introduced category attribtue for adapter to specify supported assembly type.[#1528](https://github.com/Microsoft/vstest/pull/1528), [#1529](https://github.com/Microsoft/vstest/pull/1529), [#1537](https://github.com/Microsoft/vstest/pull/1537)
+
+### Drops
+
+* TestPlatform vsix: [15.8.0-preview-20180510-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180510-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.8.0-preview-20180510-03](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.8.0-preview-20180510-03)
+
+## 15.7.2
+
+### Issues Fixed
+
+* Code coverage fix for async functions. [242314](https://developercommunity.visualstudio.com/content/problem/242314/code-coverage-doesnt-show-async-methods.html)
+
+### Drops
+
+* TestPlatform vsix: [15.7.2]( https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.7/20180514-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.7.2](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.7.2)
+
+## 15.7.0
+
+### Issues Fixed
+
+* Code coverage fix for runsettings. [#1510](https://github.com/Microsoft/vstest/pull/1510)
+* Logging fix for UWP.[#1508](https://github.com/Microsoft/vstest/pull/1508)
+* Perf improvements for LUT [#1517](https://github.com/Microsoft/vstest/pull/1517)
+* Fix for preserving CR LF line endings in TRX file. [#1521](https://github.com/Microsoft/vstest/pull/1521)
+* Fix socket exception on datacollection in parallel. [#1514](https://github.com/Microsoft/vstest/pull/1514)
+
+### New Features introduced
+
+* Introduced running UWP test using ".appx" file as input, for CLI.
+
+### Drops
+
+* TestPlatform vsix: [15.7.0]( https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.7/20180403-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.7.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.7.0)
+
+## 15.7.0-preview-20180320-02
+
+### Issues Fixed
+
+* Fixing the tests for string comparison issue. [#1462](https://github.com/Microsoft/vstest/pull/1462)
+* Sync for binarywriter writes.[#1470](https://github.com/Microsoft/vstest/pull/1470)
+* Usability Fixes [#1478](https://github.com/Microsoft/vstest/pull/1478)
+* Fix for Design mode clients hang for errors [1451](https://github.com/Microsoft/vstest/pull/1451)
+* Fix datacollectors temporary files cleanup [1483](https://github.com/Microsoft/vstest/pull/1483)
+
+### Drops
+
+* TestPlatform vsix: [15.7.0-preview-20180320-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180320-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.7.0-preview-20180320-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.7.0-preview-20180320-02)
+
+## 15.7.0-preview-20180307-01
+
+### Issues Fixed
+
+* Fix CUIT tests fail to run on no VS installed machine.  [#1450](https://github.com/Microsoft/vstest/pull/1450)
+
+### Drops
+
+* TestPlatform vsix: [15.7.0-preview-20180307-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180307-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.7.0-preview-20180307-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.7.0-preview-20180307-01)
+
+## 15.7.0-preview-20180221-13
+
+### Issues Fixed
+
+* Adding Category to Test Category mapping for ListFullyQualifiedTests. [#1369](https://github.com/Microsoft/vstest/pull/1369)
+* Support escaping "," in Test filter. [#1374](https://github.com/Microsoft/vstest/pull/1374)
+* Generate proper default settings for EnableCodeCoverage. [#1390](https://github.com/Microsoft/vstest/pull/1390)
+* Test run directory fix for loggers. [#1399](https://github.com/Microsoft/vstest/pull/1399)
+* Fixed the normal verbosity level to not log the full information for non-failed tests. [#1396](https://github.com/Microsoft/vstest/pull/1396)
+* Ignore case for targetframework input. [#1420](https://github.com/Microsoft/vstest/pull/1420)
+* Fixed logger to have additonal lines after std output. [#1421](https://github.com/Microsoft/vstest/pull/1421)
+* Fixed the error message. [#1422](https://github.com/Microsoft/vstest/pull/1422)
+* Fix: Logger attachments not coming in vsts test run. [#1431](https://github.com/Microsoft/vstest/pull/1431)
+* Fixed help test to mention default value of verbosity in console logger. [#1433](https://github.com/Microsoft/vstest/pull/1433)
+* Exceptions flow to Translation layer [#1434](https://github.com/Microsoft/vstest/pull/1434)
+
+### New Features introduced
+
+* Logger support in run settings.[#1382](https://github.com/Microsoft/vstest/pull/1382)
+* Added CUIT package in vstest xcopy package. [#1394](https://github.com/Microsoft/vstest/pull/1394)
+* Making Trx Logger Hierarchical for ordered test and data driven tests. [#1330](https://github.com/Microsoft/vstest/pull/1330)
+
+### Drops
+
+* TestPlatform vsix: [15.7.0-preview-20180221-13](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180221-13;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.7.0-preview-20180221-13](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.7.0-preview-20180221-13)
+
+## 15.6.2
+
+### Issues Fixed
+
+* Fix socket exception on datacollection in parallel  [#1505](https://github.com/Microsoft/vstest/pull/1505)
+* Fix datacollectors temporary files cleanup [#1506](https://github.com/Microsoft/vstest/pull/1506)
+
+### Drops
+
+* TestPlatform vsix: [15.6.2](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.6/20180326-08;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [v15.6.2](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.2)
+
+## 15.6.1
+
+### Issues Fixed
+
+* Synchronize concurrent writes to communication channel  [#1457](https://github.com/Microsoft/vstest/pull/1457)
+
+### Drops
+
+* TestPlatform vsix: [15.6.1](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.6/20180307-08;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [v15.6.1](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.1)
+
+## 15.6.0
+
+### Issues Fixed
+
+* Fix for Communication b/w testhost, & datacollector fails causing tests processes to hang. [#1406](https://github.com/Microsoft/vstest/pull/1406)
+* Fix for Cancellation hanging TestExplorer with the unclickable cancelling. [#1398](https://github.com/Microsoft/vstest/pull/1398)
+
+### Drops
+
+* TestPlatform vsix: [15.6.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.6/20180215-04;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [v15.6.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.0)
+
+## 15.6.0-preview-20180207-05
+
+### Issues Fixed
+
+* Enabling diagnostics for UWP causes app to hang. [#1387](https://github.com/Microsoft/vstest/pull/1387)
+
+### Drops
+
+* Microsoft.TestPlatform.ObjectModel: [v15.6.0-preview-20180207-05](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.0-preview-20180207-05)
+
+## 15.6.0-preview-20180109-01
+
+### Issues Fixed
+
+* Make latest ObjectModel API compatible with ObjectModel 11.0.0. [#1251](https://github.com/Microsoft/vstest/pull/1251/)
+* Fix no error message in case of invalid runsettings. [#1344](https://github.com/Microsoft/vstest/pull/1344)
+* Fix CodedUI debug broken. [#1352](https://github.com/Microsoft/vstest/pull/1352)
+* Fix debug stop causing 10s or indefinite wait in test explorer.  [#1358](https://github.com/Microsoft/vstest/pull/1358)
+* Fix video datacollector assemblies first changes exception while running tests .  [#1362](https://github.com/Microsoft/vstest/pull/1362)
+* Fix datacollector initialization failure on slow machines. [#1355](https://github.com/Microsoft/vstest/pull/1355)
+* Fix running fakes and code coverage with embedded testsettings in runsettings. [#1364](https://github.com/Microsoft/vstest/pull/1364)
+
+### New Features introduced
+
+* Support reflection based discovery for UWP C++ Unit tests projects.[#1336](https://github.com/Microsoft/vstest/pull/1336)
+* Add testhost external dependencies for UWP to Microsoft.NET.Test.Sdk. [#1351](https://github.com/Microsoft/vstest/pull/1351)
+
+### Drops
+
+* TestPlatform vsix: [15.6.0-preview-20180109-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20180109-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.6.0-preview-20180109-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.0-preview-20180109-01)
+
+## 15.6.0-preview-20171211-02
+
+### Issues Fixed
+
+* Removed warning for AnyCPU assemblies
+* Fix updating runsettings in dotnet core.
+* Fix exception in Event Log DataCollector. [#1288](https://github.com/Microsoft/vstest/pull/1288)
+* Fix support for multiple paths is TestAdapterPath Argument. [#1320](https://github.com/Microsoft/vstest/pull/1320)
+* Perf: Using Event based communication over sockets using LengthPrefix communication channel. [1294](https://github.com/Microsoft/vstest/pull/1294)
+
+### Drops
+
+* TestPlatform vsix: [15.6.0-preview-20171211-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20171211-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.6.0-preview-20171211-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.6.0-preview-20171211-02)
+
+## 15.5.0
+
+### Issues Fixed
+
+* Removed compile time dependency on castle.core.dll. [#1246](https://github.com/Microsoft/vstest/pull/1246)
+* Fix test run for x64 c++ tests. [#1269](https://github.com/Microsoft/vstest/pull/1269)
+* Localization fixes for error scenarios. [#1266](https://github.com/Microsoft/vstest/pull/1266)
+* Fix for FastFilter issue with TestCaseFilter. [#1252](https://github.com/Microsoft/vstest/pull/1252)
+* Updating codecoverage analysis dll's in external package. [#1282](https://github.com/Microsoft/vstest/pull/1282)
+
+### Drops
+
+* TestPlatform vsix: [15.5.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.5/20171108-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.5.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0)
+
+## 15.5.0-preview-20171031-01
+
+### Issues Fixed
+
+* Add LocalExtensionData property to TestCase Class.
+* Do not crash data collector if extension fails to initialize or set environment variables.
+* Use TPv2 as default for .NET 3.5 test projects.
+* Loading native dll's correctly for UWP release mode.
+* Insertion PR: <https://github.com/Microsoft/vstest/pull/1250>
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20171031-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.5/20171031-01;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20171031-01](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20171031-01)
+
+## 15.5.0-preview-20171012-09
+
+### Issues Fixed
+
+* Fixed Data Collector Attachment issues for legacy TMI test execution workflow.
+* Added error message and help when vstest.console is invoked without arguments.
+* Fixed failure in loading extensions without Identifier Data.
+* Handled Test Host close.
+* TestCase Display Name is displayed instead of FullyQualifiedName.
+* Fixed issues with Static Cover Coverage, Ordered tests through TMI.
+
+### New Features introduced
+
+* Added Telemetry Infra for Design Mode.
+* Supported running .Net Framework v35 in compat mode.
+* Localization changes.
+* Automatically find Platform and Framework if not specified explicitly.
+* Adding object model changes and Telemetry optin status.
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.5.0-preview-20170923-02...v15.5.0-preview-20171012-09).
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20171012-09](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20171012-09;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20171012-09](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20171012-09)
+
+## 15.5.0-preview-20170923-02
+
+### Issues Fixed
+
+* Feature flag for executing net35 tests through TPv2 in compat mode.
+* Removed unnecessary binding redirects from app.configs. [More info here](https://github.com/Microsoft/vstest/pull/1117)
+* Put quotes around TestHost path so in case of spaces in name it starts correctly. [More info here](https://github.com/Microsoft/vstest/pull/1108)
+* Performance Automation Infra.
+
+### New Features introduced
+
+* Added filter support on test case discovery.
+* Added Telemetry Collection Infrastructure.
+* Added support for listing fully qualified test cases.
+* Exposed discovery events to loggers.
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/f8020e56e418f3a14637d401928fd154a061c9c4...v15.5.0-preview-20170923-02).
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20170923-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170923-02;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20170923-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20170923-02)
+
+## 15.5.0-preview-20170914-09
+
+### Issues Fixed
+
+* <https://github.com/Microsoft/vstest/issues/979>
+* <https://github.com/Microsoft/vstest/pull/992>
+* Made TestPlatform.ObjectModel CLS-compliant
+* Made Microsoft.CodeCoverage as nuget package dependency for Microsoft.NET.Test.Sdk nuget package. [More info here](https://github.com/Microsoft/vstest/issues/852)
+* Perf improvements. [More info here](https://github.com/Microsoft/vstest/pull/1041)
+* Fixed issue related to /EnableCodeCoverage. [More info here](https://github.com/Microsoft/vstest/pull/1072)
+* <https://github.com/Microsoft/vstest/issues/902>
+* Highest version filtering for extensions. [More info here](https://github.com/Microsoft/vstest/pull/1051)
+* <https://github.com/Microsoft/vstest/pull/1060>
+
+### New Features introduced
+
+* InProc execution of tests inside vstest.console process. [More info here](https://github.com/Microsoft/vstest/pull/1009)
+* Added Verbosity Level as prefix for loggers. [More info here](https://github.com/Microsoft/vstest/pull/967)
+* Event Log Data Collector. [More info here](https://github.com/Microsoft/vstest/blob/master/docs/analyze.md#event-log-data-collector)
+* Introduced /UseVsixExtensions argument in CLI.
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.5.0-preview-20170810-02...f8020e56e418f3a14637d401928fd154a061c9c4).
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20170914-09](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170914-09;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20170914-09](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20170914-09)
+
+## 15.5.0-preview-20170810-02
+
+### Issues Fixed
+
+* <https://github.com/Microsoft/vstest/issues/861>
+* <https://github.com/Microsoft/vstest/issues/916>
+* Made latest testhost compat with older vstest.console and vice versa.
+* Some performance improvement
+
+### New Features introduced
+
+* Added blame data collector support in `dotnet test`.
+* Add ExecutionThreadApartmentState property in runsettings. [More info here](https://github.com/Microsoft/vstest/blob/master/docs/configure.md#execution-thread-apartment-state)
+* Added async APIs support in translationLayer.
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/73f4a07adfa802257e3ebe11c197016010f2e080...v15.5.0-preview-20170727-01).
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20170810-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170810-02;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20170810-02](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20170810-02)
+
+## 15.5.0-preview-20170727-01
+
+### Issues Fixed
+
+* Support for devices: build up the TestHostRuntime APIs
+* Console test runs will not collect File/LineNumber information
+* Several performance improvements
+* Reliability improvements to parallel runs
+* Engineering fixes to build/test
+
+### New Features introduced
+
+* Blame for vstest. Reports the test which crashes a run
+* Response file support for vstest
+* `TestSessionTimeout` cancels a test run if it exceeds a timeout
+* Mono support for vstest
+* VSTest now runs on .NET 4.5.1 runtime
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/73f4a07adfa802257e3ebe11c197016010f2e080...v15.5.0-preview-20170727-01).
+
+### Drops
+
+* TestPlatform vsix: [15.5.0-preview-20170727-01](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170727-01;/TestPlatform.vsix)
+
+* Microsoft.TestPlatform.ObjectModel: [15.5.0-preview-20170727-01](http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.5.0-preview-20170727-01)
+
+## 15.3.0
+
+### Issues Fixed
+
+* Clean testhost before sending discoveryComplete/ExecutionCompltete.
+* Closing VS should also close vstest.console process.
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.3.0-preview-20170618-03...rel/15.3-rtm).
+
+### Drops
+
+* TestPlatform vsix: [15.3.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.3-rtm/20170807-05;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.3.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.3.0)
+
+## 15.3.0-preview-20170618-03
+
+### Issues Fixed
+
+* <https://github.com/Microsoft/vstest/issues/632>
+* <https://github.com/Microsoft/vstest/issues/844>
+* <https://github.com/Microsoft/vstest/issues/847>
+* <https://github.com/Microsoft/vstest/issues/840>
+* <https://github.com/Microsoft/vstest/issues/843>
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.3.0-preview-20170601-03...v15.3.0-preview-20170618-03).
+
+### Drops
+
+* TestPlatform vsix: [15.3.0-preview-20170618-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/15.3-rtm/20170618-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.3.0-preview-20170618-03](http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.3.0-preview-20170618-03)
+
+## 15.3.0-preview-20170601-03
+
+* Monitor data Collector Launch and Exit events, log error in case data collector crashes.
+* Fixed for issue where using environment variables in test results directory path in run settings throws error.
+* Added support to handle `CollectSourceInformation` flag in runsettings
+* Fixed scenario where testhost crash info is not coming to Testwindow
+* In case of parallel if test host is aborted, add a new one in place of that
+
+### Issues Fixed
+
+* <https://github.com/Microsoft/vstest/issues/823>
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.3.0-preview-20170517-02...v15.3.0-preview-20170601-03).
+
+### Drops
+
+* TestPlatform vsix: [15.3.0-preview-20170601-03](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170601-03;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.3.0-preview-20170601-03](http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.3.0-preview-20170601-03)
+
+## 15.3.0-preview-20170517-02
+
+* Fakes support.
+* Wait for testhost stderr to be available if connection is broken between vstest.console and testhost.
+* Data collector log message improvements.
+* Extracedt socket implementation to allow experimentation with multiple data interchange formats and ipc. Added concept of framing for messages passed between various processes. TestRequestSender2 uses these concepts and is a replacement for the earlier TestRequestSender.
+* Localized new added string.
+* Code cleanup
+
+### Issues Fixed
+
+* <https://github.com/Microsoft/vstest/issues/646>
+* <https://github.com/Microsoft/vstest/issues/706>
+* <https://github.com/Microsoft/vstest/issues/618>
+* <https://github.com/Microsoft/vstest/issues/801>
+* <https://github.com/Microsoft/vstest/issues/799>
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.3.0-preview-20170427-09...v15.3.0-preview-20170517-02).
+
+### Drops
+
+* TestPlatform vsix: [15.3.0-preview-20170517-02](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170517-02;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.3.0-preview-20170517-02](http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.3.0-preview-20170517-02)
+
+## 15.3.0-preview-20170425-07
+
+* Data collector support enabled
+* Test Host Extensibility enabled
+* ResultsDirectory argument and Runsettings priority order [#322](https://github.com/Microsoft/vstest/pull/322)
+* Supporting Multiple TestProperty with the same key value [#328](https://github.com/Microsoft/vstest/pull/328)
+* Allow VSTestConsole path to be specified [#325](https://github.com/Microsoft/vstest/pull/325)
+* Adding /InIsolation flag for backward compatibility [#414](https://github.com/Microsoft/vstest/pull/414)
+* Fixed reading test adapter paths from runsettings [#455](https://github.com/Microsoft/vstest/pull/455)
+* Honor cache timeout for discovery. [#470](https://github.com/Microsoft/vstest/pull/470)
+* Read asynchronously from test host process [#529](https://github.com/Microsoft/vstest/pull/529)
+* Fixing nunit inconclusive tests reported as failure [#533](https://github.com/Microsoft/vstest/pull/533)
+* BatchSize Runsettings [#550](https://github.com/Microsoft/vstest/pull/550)
+* Make default testcase filter property name FullyQualifiedName [#555](https://github.com/Microsoft/vstest/pull/555)
+* Logger extensibility [#557](https://github.com/Microsoft/vstest/pull/557)
+* Update Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj [#581](https://github.com/Microsoft/vstest/pull/581)
+* Add Microsoft.NET.Test.Sdk.props to buildMultiTargeting [#580](https://github.com/Microsoft/vstest/pull/580)
+* Moving to Netcoreapp 2.0 [#603](https://github.com/Microsoft/vstest/pull/603)
+* Create config file for test project targeting .NET Framework [#642](https://github.com/Microsoft/vstest/pull/642)
+* Create new RuntimeProvider to be associated with each ProxyOperationManager [#653](https://github.com/Microsoft/vstest/pull/653)
+* Inject entry point only for project targeting netcoreapp [#665](https://github.com/Microsoft/vstest/pull/665)
+* Dotnet test output coloring [#641](https://github.com/Microsoft/vstest/pull/641)
+* Remove binding redirect of Newtonsoft.Json from testhost config file [#663](https://github.com/Microsoft/vstest/pull/663)
+* Resolve testhost from source directory if we couldnt resolve it via nuget cache [#690](https://github.com/Microsoft/vstest/pull/690)
+* Improve testplatform message [#691](https://github.com/Microsoft/vstest/pull/691)
+* Protocol v2 improvements [#672](https://github.com/Microsoft/vstest/pull/672), [#698](https://github.com/Microsoft/vstest/pull/698)
+* Use "dotnet test --verbosity" arg for console verbosity [#735](https://github.com/Microsoft/vstest/pull/735)
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0...v15.3.0-preview-20170425-07).
+
+### Drops
+
+* TestPlatform vsix: [15.3.0-preview-20170425-07](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/Microsoft/vstest/master/20170425-07;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel: [15.3.0-preview-20170425-07](http://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/15.3.0-preview-20170425-07)
+
+## 15.0.0-preview-20170125-04
+
+* Localization for following nuget packages:
+
+ 1) Microsoft.TestPlatform.CLI
+ 2) Microsoft.TestPlatform
+ 3) Microsoft.TestPlatform.ObjectModel
+ 4) Microsoft.TestPlatform.TestHost
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20170123-02...15.0.0-preview-20170125-04).
+
+### Drops
+
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20170125-04](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20170125-04)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20170125-04](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20170125-04)
+
+## 15.0.0-preview-20170123.02
+
+* Allow multiple test properties with same key [#239](https://github.com/Microsoft/vstest/issues/239), [#358](https://github.com/Microsoft/vstest/issues/358)
+* Localization for testplatform vsix package [#146](https://github.com/Microsoft/vstest/issues/146)
+* Working directory should be set to test source parent directory [#311](https://github.com/Microsoft/vstest/issues/311)
+* Allow relative source paths to vstest.console [#331](https://github.com/Microsoft/vstest/issues/331)
+* Stacktrace and error message should be in context of failed test [#285](https://github.com/Microsoft/vstest/issues/285)
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/RC.3...15.0-rtm).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20170123-02](https://devdiv.visualstudio.com/DevDiv/_build/index?buildId=533598&_a=summary)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20170123-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20170123-02)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20170123-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20170123-02)
+
+## 15.0.0-preview-20170106.08
+
+* First Draft for the Protocol tool. [#306](https://github.com/Microsoft/vstest/pull/306)
+* Fixed DiaSession issue which showed async methods to be `external` [#307](https://github.com/Microsoft/vstest/pull/307)
+* Localized vstest [#308](https://github.com/Microsoft/vstest/pull/308)
+* Added OutputType to Microsoft.NET.Test.Sdk.target [#310](https://github.com/Microsoft/vstest/pull/310)
+* Enclosed run settings arguments to handle whitespace [#312](https://github.com/Microsoft/vstest/pull/312)
+* Converted TestPlatform.vsix from V2 to V3 format [#316](https://github.com/Microsoft/vstest/pull/316)
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20161227-02...v15.0.0-preview-20170106-08).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20170106-08](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=505945&_a=summary&tab=artifacts)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20170106-08](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20170106-08)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20170106-08](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20170106-08)
+
+## 15.0.0-preview-20161227.02
+
+* Add enhancement: trx logger can take logfile parameter [#282](https://github.com/Microsoft/vstest/pull/282).
+* Allow TranslationLayer to specify Diag parameters [#296](https://github.com/Microsoft/vstest/pull/296).
+* Passing runsettings as command line arguments [#297](https://github.com/Microsoft/vstest/pull/297).
+* Localization work [#302](https://github.com/Microsoft/vstest/pull/302).
+* Testhost Diag log file name format change [#303](https://github.com/Microsoft/vstest/pull/303).
+* Fix for issue where xlftool.exe is not able to update neutral xlf file if we update any existing resource string [#305](https://github.com/Microsoft/vstest/pull/305).
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20161216-01...v15.0.0-preview-20161227-02).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20161227-02](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=490545&_a=summary&tab=artifacts)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20161227-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20161227-02)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20161227-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20161227-02)
+
+## 15.0.0-preview-20161216.01
+
+* Migrate to csproj from xproj [#217](https://github.com/Microsoft/vstest/pull/217).
+* Translationlayer timeout for CustomHost Launch changed to indefinate [#265](https://github.com/Microsoft/vstest/pull/265)
+* Added net46 folder in lib of Microsoft.TestPlatform Nuget Package [#247](https://github.com/Microsoft/vstest/pull/247).
+* Added license link.
+* Added third party notice to nuget packages [#249](https://github.com/Microsoft/vstest/pull/249).
+* Change assembly signing to public [#256](https://github.com/Microsoft/vstest/pull/256).
+* Make testhost a project dependency instead of content [#264](https://github.com/Microsoft/vstest/pull/264).
+* Several changes to build infrastructure for csproj migration [#262](https://github.com/Microsoft/vstest/pull/262) [#268](https://github.com/Microsoft/vstest/pull/268/files).
+* Include microbuild.core as a dependency for signing [#267](https://github.com/Microsoft/vstest/pull/267).
+* Make External packages are restored with a separate csproj [#273](https://github.com/Microsoft/vstest/pull/273).
+* Add Acceptance tests for netcore1.0 target [#259](https://github.com/Microsoft/vstest/pull/259).
+* Add Acceptance tests for netcore1.1 target [#270](https://github.com/Microsoft/vstest/pull/270).
+* Added E2E test for RunTestsWithCustomTestHostLauncher.
+* Change testcase gereration id algorithm to SHA1 to be in compat with Associate-WorkItem scenarios [#279](https://github.com/Microsoft/vstest/pull/279).
+* Bug fix: Default logger output path should be cmd-line friendly [#244](https://github.com/Microsoft/vstest/issues/244).
+* Bug fix: TRX logger Started Time incorrect [#253](https://github.com/Microsoft/vstest/pull/253).
+* Update README.md [#263](https://github.com/Microsoft/vstest/pull/263).
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20161123-03...v15.0.0-preview-20161216-01).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20161216-01](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=474910&_a=summary&tab=summary)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20161216-01](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20161216-01)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20161216-01](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20161216-01)
+
+## 15.0.0-preview-20161123.03
+
+* Support for debugging .net core project.
+* Support for parallel discovery and execution.
+* Support to discover and run test from a solution having .net core and desktop project.
+* Support of arguments(output, configuration, framework and noBuild) in dotnet test.
+* Support to run test from project targeting multiple TargetFrameworkMoniker using dotnet test.
+* Support for trx logger in non-windows machine.
+* Added diag argument to enable logging in vstest.console.
+* Acceptance test for test platform.
+* Bug fix: display a message on console when dotnet is not installed on the machine.
+* Bug fix: dotnet test should return a non-0 exit code when any test fails [here](https://github.com/Microsoft/vstest/issues/241).
+* Bug fix: dotnet test fails due to missing quotes in the path of vstest.console [here](https://github.com/Microsoft/vstest/issues/231).
+* Bug fix: terminate vstest.console if no testhost found [here](https://github.com/Microsoft/vstest/issues/144).
+* Bug fix: testCaseFilter argument doesn't filter tests in .net core [here](https://github.com/Microsoft/vstest/issues/201).
+* Bug fix: cannot add Microsoft.Net.Test.Sdk as a dependency of net451 projects [here](https://github.com/Microsoft/vstest/issues/190).
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20160923-03...v15.0.0-preview-20161123-03).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20161123-03](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=442970&_a=summary)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20161123-03](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20161123-03)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20161123-03](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20161123-03)
+
+## 15.0.0-preview-20160923-03
+
+* New configuration `DisableParallelization` in runsettings. This setting may be used by adapters to disable parallel run in certain scenarios, e.g. test profiling or instrumented runs.
+* Support for non-shared test hosts. A non shared test host is exclusive per test source. E.g. .net core tests use a non-shared host.
+* New nuget package: Microsoft.TestPlaform.TestHost. All .net core test apps will refer to this package.
+* Sample performance tests for test platform
+* Bug fix: support for reg free COM in Dia
+* Bug fix: display a message in VS on test host crash
+* Bug fix: in .net core, user may provide relative path to run tests
+
+A list of all changes since last release are available [here](https://github.com/Microsoft/vstest/compare/v15.0.0-preview-20160914-02...v15.0.0-preview-20160923-03).
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20160923-03](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=343725&_a=summary)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20160923-03](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20160923-03)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20160923-03](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20160923-03)
+
+## 15.0.0-preview-20160914-02
+
+* Support for .net core framework
+* New nuget package `Microsoft.Testplatform.CLI` for dotnet-cli
+* Performance instrumentation of runner, discovery and execution
+* Bug fix: Handle crash of test host
+* Bug fix: Handle paths and arguments on Unix
+* Bug fix: Sign core binaries
+
+### Drops
+
+* TestPlatform vsix: [TestPlatform.CI.Real-20160914-02](https://devdiv.visualstudio.com/DevDiv/VS.in%20Agile%20Testing%20IDE/_build/index?buildId=329464&_a=summary)
+* Microsoft.TestPlatform.ObjectModel: [15.0.0-preview-20160914-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.ObjectModel/15.0.0-preview-20160914-02)
+* Microsoft.TestPlatform.TranslationLayer: [15.0.0-preview-20160914-02](https://dotnet.myget.org/feed/vstest/package/nuget/Microsoft.TestPlatform.TranslationLayer/15.0.0-preview-20160914-02)
diff --git a/docs/report.md b/docs/report.md
new file mode 100644
index 0000000000..0dee97d6bf
--- /dev/null
+++ b/docs/report.md
@@ -0,0 +1,231 @@
+# Reporting test results
+
+Test discovery, execution results in a test run can be controlled with test
+loggers. This document will cover details on installation, usage and authoring
+of test loggers.
+
+## Test loggers
+
+A test logger is a test platform extension to control reporting of test results.
+It can perform tasks when a test run message, individual test
+results or the test run completion events are reported by the test platform.
+
+You can author a test logger to print messages on the console, generate result
+files of a specific reporting format, or even report results to various CI/CD
+services. Default inputs to a test logger can be provided in the command line.
+
+ Please refer to [this section](./report.md#create-a-test-logger) for instructions on creating a test logger and [todo]()
+if you're interested in the architecture of a test logger.
+
+### Available test loggers
+
+| Scenario | NuGet Package | Source Repository |
+| -------- | ------------- | ----------------- |
+| Local, CI, CD | Inbuilt | [Trx Logger][] |
+| Local, CI, CD | Inbuilt | [Console Logger][] |
+| Local, CI, CD | Inbuilt | [Html Logger][] |
+| Local, CI, CD | [XunitXml.TestLogger][xunit.nuget] | [Xunit Logger][] |
+| Local, CI, CD | [NunitXml.TestLogger][nunit.nuget] | [Nunit Logger][] |
+| Local, CI, CD | [JunitXml.TestLogger][junit.nuget] | [Junit Logger][] |
+| AppVeyor | [AppVeyor.TestLogger][appveyor.nuget] | [AppVeyor Logger][] |
+| Azure Pipelines | [AzurePipelines.TestLogger][azurepipelines.nuget] | [Azure Pipelines Logger][] |
+| GitHub Actions | [GitHubActionsTestLogger][githubactions.nuget] | [GitHub Actions Test Logger][] |
+| TeamCity | [TeamCity.VSTest.TestAdapter][teamcity.nuget] | [TeamCity Logger][] |
+
+[Trx Logger]: https://github.com/Microsoft/vstest/tree/main/src/Microsoft.TestPlatform.Extensions.TrxLogger
+[Html Logger]: https://github.com/Microsoft/vstest/tree/main/src/Microsoft.TestPlatform.Extensions.HtmlLogger
+[Console Logger]: ./src/vstest.console/Internal/ConsoleLogger.cs
+[Xunit Logger]: https://github.com/spekt/xunit.testlogger
+[Nunit Logger]: https://github.com/spekt/nunit.testlogger
+[Junit Logger]: https://github.com/spekt/junit.testlogger
+[AppVeyor Logger]: https://github.com/spekt/appveyor.testlogger
+[Azure Pipelines Logger]: https://github.com/daveaglick/AzurePipelines.TestLogger
+[GitHub Actions Test Logger]: https://github.com/Tyrrrz/GitHubActionsTestLogger
+[TeamCity Logger]: https://github.com/JetBrains/TeamCity.VSTest.TestAdapter
+
+[xunit.nuget]: https://www.nuget.org/packages/XunitXml.TestLogger
+[nunit.nuget]: https://www.nuget.org/packages/NUnitXml.TestLogger/
+[junit.nuget]: https://www.nuget.org/packages/JUnitXml.TestLogger/
+[appveyor.nuget]: https://www.nuget.org/packages/AppVeyor.TestLogger
+[azurepipelines.nuget]: https://www.nuget.org/packages/AzurePipelines.TestLogger
+[githubactions.nuget]: https://www.nuget.org/packages/GitHubActionsTestLogger
+[teamcity.nuget]: https://www.nuget.org/packages/TeamCity.VSTest.TestAdapter
+
+ Want to add your logger? Please send a PR with changes in this doc.
+
+## Acquisition
+
+A test logger should be made available as a NuGet package (preferred), or as
+a zip file (for e.g. loggers for C++ etc.).
+
+If it's a NuGet package, the test logger assemblies should get copied to the
+build output directory. When looking for a test logger, vstest will look for
+them in the same directory as the test assemblies. In most cases this means that
+test projects reference either the project (same codebase) or NuGet package 
+with the logger.
+
+If the test logger is made available as a zip file, it should be extracted
+to one of the following locations:
+
+1. the `Extensions` folder along side `vstest.console.exe`. E.g. in case of
+dotnet-cli, the path could be `/sdk/<version>/Extensions` directory.
+2. any well known location on the filesystem
+
+> [!NOTE]
+> **New in 15.1**
+>
+> In case of #2, user can specify the full path to the location using `/TestAdapterPath:<path>`
+> command line switch. Test platform will locate extensions from the provided
+> directory.
+
+## Naming
+
+Test platform will look for assemblies named `*.testlogger.dll` when it's trying
+to load test loggers.
+
+> [!NOTE]
+> For the 15.0 version, the test loggers are also discovered from `*.testadapter.dll`
+
+## Create a test logger
+
+Go through the following steps to create your own logger
+
+1) Add a nuget reference of package `Microsoft.TestPlatform.ObjectModel`.
+2) Implement `ITestLoggerWithParameters` (or `ITestLogger`, if your logger is not expecting any parameters). [Logger Example](https://github.com/spekt/xunit.testlogger/blob/49d2416f24acb30225adc6e65753cc829010bec9/src/Xunit.Xml.TestLogger/XunitXmlTestLogger.cs#L19)
+3) Name your logger assembly `*.testlogger.dll`. [Detailed](./report.md#naming)
+
+## Enable a test logger
+
+A test logger must be explicitly enabled using the command line. E.g.
+
+```shell
+ vstest.console test_project.dll /logger:mylogger
+```
+
+Where `mylogger` is the `LoggerUri` or `FriendlyName` of the logger.
+
+## Configure reporting
+
+Additional arguments to a logger can also be passed in the command line. E.g.
+
+```shell
+ vstest.console test_project.dll /logger:mylogger;Setting=Value
+```
+
+Where `mylogger` is the `LoggerUri` or `FriendlyName` of the logger.
+`Setting` is the name of the additional argument and `Value` is its value.
+
+It is up to the logger implementation to support additional arguments.
+
+## Syntax of default loggers
+
+### 1) Console logger
+
+Console logger is the default logger and it is used to output the test results to a terminal.
+
+#### Syntax
+
+For dotnet test or dotnet vstest:
+
+```shell
+--logger:console[;verbosity=<Defaults to "minimal">]
+```
+
+For vstest.console.exe:
+
+```shell
+/logger:console[;verbosity=<Defaults to "normal">]
+```
+ 
+Argument `verbosity` defines the verbosity level of the console logger. Allowed values for verbosity are `quiet`, `minimal`, `normal` and `detailed`.
+
+#### Example
+
+```shell
+vstest.console.exe Tests.dll /logger:"console;verbosity=normal"
+```
+
+If you are using `dotnet test`, then use the following command:
+
+```shell
+dotnet test Tests.csproj --logger:"console;verbosity=normal"
+```
+
+or you can also use argument `-v | --verbosity` of `dotnet test`:
+
+```shell
+dotnet test Tests.csproj -v normal
+```
+
+### 2) Trx logger
+
+Trx logger is used to log test results into a Visual Studio Test Results File (TRX).
+
+#### Syntax
+
+```shell
+/logger:trx [;LogFileName=<Defaults to unique file name>]
+```
+
+Where `LogFileName` can be absolute or relative path. If the path is relative, it will be relative to the `TestResults` directory, created under current working directory.
+
+
+#### Examples
+
+Suppose the current working directory is `c:\tempDirectory`.
+
+```shell
+vstest.console.exe Tests.dll /logger:trx
+```
+
+trx file will get generated in location `c:\tempDirectory\TestResults`.
+
+```shell
+vstest.console.exe Tests.dll /logger:"trx;LogFileName=relativeDir\logFile.txt"
+
+trx file will be `c:\tempDirectory\TestResults\relativeDir\logFile.txt`.
+
+```shell
+vstest.console.exe Tests.dll /logger:"trx;LogFileName=c:\temp\logFile.txt"
+```
+
+trx file will be `c:\temp\logFile.txt`.
+
+### 3) Html logger
+
+Html logger is used to log test results into a HTML file.
+
+#### Syntax
+
+```shell
+/logger:html [;LogFileName=<Defaults to unique file name>]
+
+Where "LogFileName" can be absolute or relative path. If path is relative, it will be relative to "TestResults" directory, created under current working directory.
+
+```
+
+#### Examples
+
+Suppose the current working directory is `c:\tempDirectory`.
+
+```shell
+vstest.console.exe Tests.dll /logger:html
+```
+
+HTML file will get generated in location `c:\tempDirectory\TestResults`.
+
+```shell
+vstest.console.exe Tests.dll /logger:"html;LogFileName=relativeDir\logFile.html"
+```
+
+HTML file will be `c:\tempDirectory\TestResults\relativeDir\logFile.html`.
+
+```shell
+vstest.console.exe Tests.dll /logger:"html;LogFileName=c:\temp\logFile.html"
+```
+
+HTML file will be `c:\temp\logFile.html`.
+
+## Related links
+
+TODO: link to author a test logger
diff --git a/docs/roadmap.md b/docs/roadmap.md
new file mode 100644
index 0000000000..001a8cf70e
--- /dev/null
+++ b/docs/roadmap.md
@@ -0,0 +1,31 @@
+# Test Platform Roadmap
+
+This repo is the modern, OSS, cross-plat testing engine that has been powering testing on .NET Core via the "test" verb in dotnet test, and Live Unit Testing scenario (LUT) in Visual Studio. Internally we call this repo "TPV2" (Test Platform V2)
+
+We aim to continuously deliver improvements that will ship with Visual Studio and with the .NET Tools SDK. These improvements are directly informed by your feedback filed as [issues](https://github.com/Microsoft/vstest/issues). If you do not see your issue addressed already, we will get to it soon! If you would like to help out, let us know!
+
+Over the past several quarters, we have made many enhancements - from introducing support for Mono, to refactoring the platform to make it ready to support device testing, to performance improvements, to enabling robust C++ support, to improved documentation, and more. For a complete list see here: [Release Notes](./releases.md)
+
+## Roadmap
+
+We typically plan for a quarter, and establish a set of themes we want to work towards. Here are the themes we will work on this quarter.
+
+### Reach: Enable leveraging your vstest experience across all supported platforms
+
+Over the course of the next phase of execution we will make TPV2 the "default" for all scenarios across Visual Studio and Visual Studio Team Services (VSTS) – i.e. extending it to .NET Framework, UWP, and the VSTest task in VSTS. We will ship a standalone package that can be potentially used in other CI systems even. This is a big switch. We will strive to maintain backwards compat, and publish migration guides for the few features that require to be migrated, and help you in the migration.
+
+### Performance: At scale
+
+Performance has been an area where we have received feedback, and made strong progress as well. It will continue to remain a focus. We will look to make improvements across the pipeline from the Test Explorer to the framework adapters, to enhance the overall end to end performance.
+
+### UWP, Win10 IoT Core Support
+
+UWP is the application platform for Windows 10, to reach all Windows 10 devices – PC, tablet, phone, Xbox, HoloLens, Surface Hub and more. The vstest engine is architected so that it can be extended to support new application platforms. Such extensions will come from teams who understand their platforms the best, and integrated with vstest. To drive home this point, vstest will be extended to support testing UWP applications. In particular we will light up support for Win10 IoT Core.
+
+### Code Coverage for .NET Core
+
+This has been a clear ask from the community, and we are working towards enabling this support. The code coverage infrastructure consumes information from PDB files. Specifically with regard to .NET Core, it now needs to understand the new portable PDB format. We are working cross-team to introduce this support in order to light up code coverage support for .NET Core.
+
+## Summary
+
+These are examples of the work we will be focusing on this quarter. We will provide details through individual issues. Follow along, and let us know what you think. We look forward to working with you!
diff --git a/docs/testplatform-migration-known-issues.md b/docs/testplatform-migration-known-issues.md
new file mode 100644
index 0000000000..ab794db1f5
--- /dev/null
+++ b/docs/testplatform-migration-known-issues.md
@@ -0,0 +1,13 @@
+# Test Platform Migration Known issues
+
+Here are the current known issues you may face when running tests, along with available workarounds.
+
+## Change in Thread.CurrentPrincipal value
+
+- **Issue:** Tests that depend on `Thread.CurrentPrincipal` may fail. This is due to change in inter process communication in Test Platform.
+- **Workaround:** Use an alternative like `System.Security.Principal.WindowsIdentity.GetCurrent()`
+
+## Change in test execution processes name
+
+- **Issue:** Tests that depend on the name of the currnet running process may fail.
+- **Workaround:** Tests run in one of following process ```vstest.console.exe```, ```testhost.exe```, ```testhost.x86.exe``` or ```dotnet.exe``` based on run configuration (```/Platform``` and ```/Framework```). If the tests depend on the process name, then update the tests accordingly.
diff --git a/docs/toc.yml b/docs/toc.yml
new file mode 100644
index 0000000000..351e968fd3
--- /dev/null
+++ b/docs/toc.yml
@@ -0,0 +1,12 @@
+#- name: Getting Started
+  #items:
+  #- name: Quickstart
+    #href: quickstart.md
+  #- name: Concepts
+    #href: concepts.md
+- name: Environment Variables
+  href: environment-variables.md
+- name: Contribute
+  href: contribute.md
+- name: Release Notes
+  href: releases.md
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
new file mode 100644
index 0000000000..7fa4bf56a9
--- /dev/null
+++ b/docs/troubleshooting.md
@@ -0,0 +1,322 @@
+# Troubleshooting guide
+
+The goal of this document is to help the test platform users to collect useful information for troubleshooting issues.
+
+## Dotnet CLI
+
+### Collect logs and crash dump
+
+```shell
+ dotnet test --diag:log.txt --blame-crash --blame-crash-dump-type full
+```
+
+At the end of the execution you'll find the list of artifacts generated with the link to the file dump:
+
+```shell
+Starting test execution, please wait...
+Logging Vstest Diagnostics in file: C:\git\issue\bug\log.txt
+A total of 1 test files matched the specified pattern.
+...
+   --- End of inner exception stack trace ---.
+...
+Attachments:
+  C:\git\issues\bug\TestResults\620c075b-e035-41d2-b950-159f57abc604\Sequence_bfcc4d8558654413a3fb2f5164695bf6.xml
+  C:\git\issues\bug\TestResults\620c075b-e035-41d2-b950-159f57abc604\dotnet.exe_11876_1660721586_crashdump.dmp
+```
+
+You'll find 3 files for logs(runner, datacollector, host), datacollector one can be missing.
+
+```shell
+-a----         8/17/2022   9:33 AM          30001 log.datacollector.22-08-17_09-32-54_50516_1.txt
+-a----         8/17/2022   9:33 AM          37222 log.host.22-08-17_09-32-55_24965_7.txt
+-a----         8/17/2022   9:33 AM         200345 log.txt
+```
+## vstest.console.exe  
+
+### Collect logs with `/Diag:`
+
+```shell
+vstest.console.exe ...\TestProject1.dll /Collect:"Code Coverage" /Diag:log.txt
+```
+At the end of the execution you'll find the list of logs generated:
+```shell
+dir *.txt
+ Volume in drive C has no label.
+ Volume Serial Number is FA60-B142
+
+ Directory of ...\net7.0
+
+12/08/2022  12:00 PM           173,002 log.datacollector.22-12-08_12-00-14_68705_1.txt
+12/08/2022  12:01 PM           173,000 log.datacollector.22-12-08_12-01-12_19459_1.txt
+12/08/2022  12:00 PM            56,017 log.host.22-12-08_12-00-15_88174_7.txt
+12/08/2022  12:01 PM            55,986 log.host.22-12-08_12-01-12_94082_7.txt
+12/08/2022  12:01 PM           292,548 log.txt
+               5 File(s)        750,553 bytes
+               0 Dir(s)  263,236,558,848 bytes free
+```
+
+## Azure DevOps
+
+### @VSTest2 task
+
+#### Collect diagnostic logs
+
+##### Using `otherConsoleOptions: /Diag:vstestlog.txt`
+
+```yaml
+  - task: VSTest@2
+    inputs:
+      displayName: "VsTest - testAssemblies"
+      inputs:
+      testAssemblyVer2: |
+        ...
+      otherConsoleOptions: '/Diag:vstestlog.diag'
+
+  - task: CopyFiles@2
+    displayName: Copy vstestlog logs to staging
+    inputs:
+      contents: '**/*vstestlog*.diag'
+      targetFolder: $(Build.ArtifactStagingDirectory)/vstestlog
+    condition: always()
+
+  - task: PublishPipelineArtifact@1
+    displayName: Publish vstestlog log
+    inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)/vstestlog
+      artifactName: vstestlog      
+    condition: always()
+```
+
+You can now zip/download all logs from the published artifacts view under the `vstestlog` folder.  
+
+##### Using `System.Debug` environment variable
+
+For some scenarios, it is not possible use the `otherConsoleOptions` (e.g., parallel execution).
+
+```yaml
+jobs:
+- job: ...
+
+  variables:
+    - name: System.Debug
+      value: true
+
+  steps:
+  ...
+  - task: VSTest@2
+    inputs:
+      displayName: "VsTest - testAssemblies"
+      inputs:
+      testAssemblyVer2: |
+        ...
+  
+  - task: CopyFiles@2
+    displayName: Copy vstestlog logs to staging
+    inputs:
+      sourceFolder: $(Agent.TempDirectory)
+      contents: '**/*.diag'
+      targetFolder: $(Build.ArtifactStagingDirectory)/vstestlog
+    condition: always()
+
+  - task: PublishPipelineArtifact@1
+    displayName: Publish vstestlog log
+    inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)/vstestlog
+      artifactName: vstestlog
+    condition: always()
+```
+
+You can now zip/download all logs from the published artifacts view under the `vstestlog` folder.  
+
+#### Collect logs and crash dump/hang
+
+##### Using `otherConsoleOptions: /Blame`  
+
+```yaml
+jobs:
+- job: ...
+
+  variables:
+    - name: System.Debug
+      value: true
+
+  steps:
+  ...
+  - task: VSTest@2
+    inputs:
+      displayName: "VsTest - testAssemblies"
+      inputs:
+      testAssemblyVer2: |
+        ...
+
+      otherConsoleOptions: otherConsoleOptions: '/Blame:"CollectDump;DumpType=Full;CollectHangDump;TestTimeout=30min;HangDumpType=Full"'
+    condition: always()
+    continueOnError: true
+
+  - task: CopyFiles@2
+    displayName: Copy test logs to staging
+    inputs:
+      sourceFolder: $(Agent.TempDirectory)
+      contents: '**/*.diag'
+      targetFolder: $(Build.ArtifactStagingDirectory)/vstestlog
+    continueOnError: true
+    condition: always()
+
+  - task: PublishPipelineArtifact@1
+    displayName: Publish vstestlog log
+    inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)/vstestlog
+      artifactName: vstestlog
+    condition: always()
+    continueOnError: true
+```
+
+You can now zip/download all logs from the published artifacts view under the `vstestlog` folder and you can find the dump using the `Attachments` tab under `Tests` selecting the parent (first) test node.  
+
+##### Using *.runsettings file
+
+ For some scenarios, it is not possible use the `otherConsoleOptions` (e.g., parallel execution).
+
+```yaml
+jobs:
+- job: ...
+
+  variables:
+    - name: System.Debug
+      value: true
+
+  steps:
+  ...
+  - task: VSTest@2
+    inputs:
+      displayName: "VsTest - testAssemblies"
+      inputs:
+      testAssemblyVer2: |
+        ...
+      runSettingsFile: ./config.runsettings
+    continueOnError: true
+
+  - task: CopyFiles@2
+    displayName: Copy test logs to staging
+    inputs:
+      sourceFolder: $(Agent.TempDirectory)
+      contents: '**/*.diag'
+      targetFolder: $(Build.ArtifactStagingDirectory)/vstestlog
+    condition: always()
+    continueOnError: true
+
+  - task: PublishPipelineArtifact@1
+    displayName: Publish vstestlog log
+    inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)/vstestlog
+      artifactName: vstestlog
+    condition: always()
+    continueOnError: true
+```
+
+`config.runsettings` file
+
+```xml
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="blame" enabled="True">
+        <Configuration>
+          <CollectDump DumpType="Full" />
+          <CollectDumpOnTestSessionHang TestTimeout="30min" HangDumpType="Full" />
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
+```
+
+### DotNetCoreCLI@2 task  
+
+#### Collect process dump using Procdump on Windows (i.e. OutOfMemory)
+
+```yaml
+  variables:
+    - name: System.Debug
+      value: true
+    - name: PROCDUMP_PATH
+      value: $(Agent.ToolsDirectory)\Procdump
+    - name: VSTEST_DUMP_FORCEPROCDUMP
+      value: 1
+...
+  - task: PowerShell@2
+    displayName: 'Download ProcDump'
+    inputs:
+      targetType: inline
+      script: |
+        Invoke-WebRequest -Uri "https://download.sysinternals.com/files/Procdump.zip" -OutFile $(Agent.TempDirectory)\Procdump.zip
+        Expand-Archive -LiteralPath $(Agent.TempDirectory)\Procdump.zip -DestinationPath $(Agent.ToolsDirectory)\Procdump -Force
+...
+  - task: DotNetCoreCLI@2
+    displayName: Test project
+    inputs:
+      command: test
+      arguments: --blame-crash --blame-crash-collect-always true --diag:log.txt
+```
+
+## Visual Studio
+
+### Enable Diagnostic logs
+
+* Go to Visual Studio options page (`Tools/Options`)
+* Select `Test` and then `General`
+* Under `Logging`, change `Logging level` to `Trace (Includes Platform logs)`
+* Close the `Options` window
+* Open the `Output` window and select `Tests` output
+* Locate the entry similar to `C:\Users\<YOUR_USER>\AppData\Local\Temp\TestPlatformLogs\<DATE_TIME>` (e.g. `C:\Users\johndoe\AppData\Local\Temp\TestPlatformLogs\2022_07_14_15_24_06_19400`) and open the folder
+* Run your tests
+* Create a zip with all files available
+
+Note: these logs could contain sensitive information (paths, project name...). Make sure to clean them or use the Visual Studio `Send Feedback` button. Don't put anything you want to keep private in the title or content of the initial report, which is public. Instead, say that you'll send details privately in a separate comment. Once the problem report is created, it's now possible to specify who can see your replies and attachments.
+
+## Use procdump on Windows
+
+Sometimes it's not possible to take the dump using test platform tool because the crash happen before we're able to attach to the process to take the dump self. In that situation we need a way to register for dump at process startup level.  
+To achieve it we can use [procdump](https://docs.microsoft.com/sysinternals/downloads/procdump) that will install machine wide Just-in-time (AeDebug) debugger.
+
+```shell
+PS C:\tools\Procdump> .\procdump.exe -i C:\tools\Procdump\dumps
+
+ProcDump v10.11 - Sysinternals process dump utility
+Copyright (C) 2009-2021 Mark Russinovich and Andrew Richards
+Sysinternals - www.sysinternals.com
+
+Set to:
+  HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug
+    (REG_SZ) Auto     = 1
+    (REG_SZ) Debugger = "C:\tools\Procdump\procdump.exe" -accepteula -j "C:\tools\Procdump\dumps" %ld %ld %p
+
+Set to:
+  HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug
+    (REG_SZ) Auto     = 1
+    (REG_SZ) Debugger = "C:\tools\Procdump\procdump.exe" -accepteula -j "C:\tools\Procdump\dumps" %ld %ld %p
+
+ProcDump is now set as the Just-in-time (AeDebug) debugger.
+```
+
+After you can run your application and in case of crash a dump will be automatically taken inside the `C:\tools\Procdump\dumps` directory.
+
+```
+PS C:\tools\Procdump> ls C:\tools\Procdump\dumps
+
+
+    Directory: C:\tools\Procdump\dumps
+
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+-a----         8/17/2022   9:42 AM        6161605 dotnet.exe_220817_094234.dmp
+```
+
+You can unistall the automatic generation running at the end of the collection phase
+
+```shell
+.\procdump.exe -u
+```
+
+Keep in mind that this mode will collect machine wide crash so every process in the machine that will crash will collect a dump in the folder.
diff --git a/dotnet.config b/dotnet.config
new file mode 100644
index 0000000000..da0410e32d
--- /dev/null
+++ b/dotnet.config
@@ -0,0 +1,2 @@
+[dotnet.test.runner]
+name = "Microsoft.Testing.Platform"
diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
new file mode 100644
index 0000000000..c7ca696b2a
--- /dev/null
+++ b/eng/AfterSolutionBuild.targets
@@ -0,0 +1,20 @@
+<Project>
+
+  <PropertyGroup>
+    <SourceBranchName Condition=" '$(SourceBranchName)' == '' ">dev</SourceBranchName>
+  </PropertyGroup>
+
+  <Target Name="_VerifyNuGetPackages" AfterTargets="Pack" Condition=" '$(OS)' == 'Windows_NT' ">
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(RepositoryEngineeringDir)\verify-nupkgs.ps1 -configuration $(Configuration) -versionPrefix $(versionPrefix) -currentBranch $(SourceBranchName)" />
+  </Target>
+
+  <!--
+    This is tricky. When you run tests in part of Build, this target won't run after you've run your tests,
+    if you run as separate step you have no way of saying that you will run tests later. If you'd move this into
+    Directory.Build.targets you would run it for every single integration tests project. So running it after
+    pack is probably the best. Don't invoke in .NET product build mode.
+  -->
+  <Target Name="_InstallAdditionalDotnetSdk" AfterTargets="Pack" Condition="'$(OS)' == 'Windows_NT' and '$(DotNetBuild)' != 'true'">
+    <Exec Command="powershell -NoProfile -NoLogo -ExecutionPolicy Bypass $(RepositoryEngineeringDir)\install-additional-dotnet-sdks.ps1 -dotnetInstallDir $(DOTNET_INSTALL_DIR) -RepoRoot $(RepoRoot)" />
+  </Target>
+</Project>
diff --git a/eng/Analyzers.props b/eng/Analyzers.props
new file mode 100644
index 0000000000..f86467ccd7
--- /dev/null
+++ b/eng/Analyzers.props
@@ -0,0 +1,20 @@
+<Project>
+  <!--
+    Include PublicApi analyzers into all projects that are in our src directory.
+    Use relative path between the project and the root to avoid including the analyzer if the path above the root contains 'src' (e.g. C:\src\vstest).
+  -->
+  <ItemGroup Condition=" '$(IsSourceFile)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Add BannedApiAnalyzer if opt-in -->
+  <ItemGroup Condition=" '$(UseBannedApiAnalyzers)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/eng/BuildTask.targets b/eng/BuildTask.targets
deleted file mode 100644
index 4be94f8fbe..0000000000
--- a/eng/BuildTask.targets
+++ /dev/null
@@ -1,81 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IsPackable>true</IsPackable>
-    <!-- Build Tasks should not include any dependencies -->
-    <SuppressDependenciesWhenPacking Condition="'$(SuppressDependenciesWhenPacking)' == ''">true</SuppressDependenciesWhenPacking>
-  </PropertyGroup>
-
-  <!--
-    Default to including all *.props and *.targets files
-    from the project directory into the NuGet package root
-  -->
-  <ItemGroup Condition="'$(EnableDefaultItems)' != 'false'">
-    <None Condition="'$(EnableDefaultNoneItems)' != 'false'"
-          Include="**/*.props;**/*.targets" Pack="true">
-      <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true"/>
-    <None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--
-      Update all PackageReference and ProjectReference Items to have
-      PrivateAssets="All" and default Publish to true.
-      This removes the dependency nodes from the generated nuspec and
-      forces the publish output to contain the dlls.
-     -->
-    <PackageReference Update="@(PackageReference)">
-      <PrivateAssets>All</PrivateAssets>
-      <Publish Condition="'%(PackageReference.Publish)' == ''">true</Publish>
-      <ExcludeAssets Condition="'%(PackageReference.Publish)' == 'false'">runtime</ExcludeAssets>
-    </PackageReference>
-    <ProjectReference Update="@(ProjectReference)">
-      <PrivateAssets>All</PrivateAssets>
-      <Publish Condition="'%(ProjectReference.Publish)' == ''">true</Publish>
-    </ProjectReference>
-
-    <!--
-      Update all Reference items to have Pack="false"
-      This removes the frameworkDependency nodes from the generated nuspec
-    -->
-    <Reference Update="@(Reference)">
-      <Pack>false</Pack>
-    </Reference>
-
-    <!-- 
-      Do not include assemblies that MSBuild ships with in the package.
-    -->
-    <PackageReference Update="Microsoft.Build" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="Microsoft.Build.Framework" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="Microsoft.Build.Tasks.Core" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="Microsoft.Build.Utilities.Core" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="System.Collections.Immutable" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="System.IO.Compression" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-    <PackageReference Update="System.Threading.Tasks.Dataflow" PrivateAssets="All" Publish="false" ExcludeAssets="runtime" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackageCore;_AddBuildOutputToPackageDesktop</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
-  
-  <Target Name="_AddBuildOutputToPackageCore" DependsOnTargets="Publish" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <ItemGroup>
-      <!-- Publish .NET Core assets and include them in the package under tools directory. -->
-      <TfmSpecificPackageFile Include="$(PublishDir)**" 
-                              PackagePath="tools/$(TargetFramework)/%(RecursiveDir)%(FileName)%(Extension)"/>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_AddBuildOutputToPackageDesktop" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <ItemGroup>
-      <!-- Include .NET Framework build outputs in the package under tools directory. -->
-      <TfmSpecificPackageFile Include="$(OutputPath)**" PackagePath="tools/$(TargetFramework)/%(RecursiveDir)%(FileName)%(Extension)"/>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/eng/GoalTimePerDefinition.json b/eng/GoalTimePerDefinition.json
deleted file mode 100644
index ff5d6ad428..0000000000
--- a/eng/GoalTimePerDefinition.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ 
-    "goal_times":[ 
-       { 
-          "definition_Id":6,
-          "total_minutes":50
-       }
-    ]
-}
diff --git a/eng/Publishing.props b/eng/Publishing.props
new file mode 100644
index 0000000000..5f9650d32d
--- /dev/null
+++ b/eng/Publishing.props
@@ -0,0 +1,9 @@
+<Project>
+
+  <!-- Update Artifacts with Kind=Package to have additional metadata item Category="ToolingPackage".
+       Depending on channel configuration, this means that these assets could be pushed to a different feed. -->
+  <ItemGroup>
+    <Artifact Update="@(Artifact->WithMetadataValue('Kind', 'Package'))" Category="ToolingPackage" />
+  </ItemGroup>
+
+</Project>
diff --git a/eng/RestoreInternal.cmd b/eng/RestoreInternal.cmd
new file mode 100644
index 0000000000..7025eccf87
--- /dev/null
+++ b/eng/RestoreInternal.cmd
@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0\common\build.ps1""" -build -restore %*"
diff --git a/eng/Signing.props b/eng/Signing.props
index 36b08f812f..da92da673b 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -27,5 +27,7 @@
     <FileSignInfo Include="Microsoft.Deployment.Resources.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Microsoft.Deployment.WindowsInstaller.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Microsoft.Deployment.WindowsInstaller.Package.dll" CertificateName="3PartySHA2" />
+
+    <FileExtensionSignInfo Include=".cab" CertificateName="None" />
   </ItemGroup>
 </Project>
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
deleted file mode 100644
index 68f8259274..0000000000
--- a/eng/SourceBuild.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <GitHubRepositoryName>vstest</GitHubRepositoryName>
-    <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <BaseInnerSourceBuildCommand>./build.sh</BaseInnerSourceBuildCommand>
-
-    <InnerBuildArgs>-DotNetBuildFromSource</InnerBuildArgs>
-    <InnerBuildArgs>$(InnerBuildArgs) -v "$(BuildVersionPrefix)"</InnerBuildArgs>
-    <InnerBuildArgs>$(InnerBuildArgs) -vs "$(BuildVersionSuffix)"</InnerBuildArgs>
-    <InnerBuildArgs>$(InnerBuildArgs) -DotNetCoreSdkDir $(DotNetRoot)</InnerBuildArgs>
-    <InnerBuildArgs>$(InnerBuildArgs) -c $(Configuration)</InnerBuildArgs>
-  </PropertyGroup>
-
-  <!-- TODO: Remove once all patches have been removed. -->
-  <Target Name="ApplySourceBuildPatchFiles"
-          AfterTargets="PrepareInnerSourceBuildRepoRoot"
-          BeforeTargets="RunInnerSourceBuildCommand">
-    <ItemGroup>
-      <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
-    </ItemGroup>
-
-    <Exec
-      Command="git --work-tree=$(InnerSourceBuildRepoRoot) apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)"
-      Condition="'@(SourceBuildPatchFile)' != ''" />
-  </Target>
-
-</Project>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
deleted file mode 100644
index c1b6dfbf05..0000000000
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<UsageData>
-  <IgnorePatterns>
-    <UsagePattern IdentityGlob="*/*" />
-  </IgnorePatterns>
-</UsageData>
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
new file mode 100644
index 0000000000..ed42872e16
--- /dev/null
+++ b/eng/Version.Details.props
@@ -0,0 +1,40 @@
+<!--
+This file is auto-generated by the Maestro dependency flow system.
+Do not edit it manually, as it will get overwritten by automation.
+This file should be imported by eng/Versions.props
+-->
+<Project>
+  <PropertyGroup>
+    <!-- _git/vs-code-coverage dependencies -->
+    <MicrosoftInternalCodeCoveragePackageVersion>18.0.6</MicrosoftInternalCodeCoveragePackageVersion>
+    <!-- dotnet/dotnet dependencies -->
+    <MicrosoftDiagnosticsNETCoreClientPackageVersion>0.2.0-preview.25476.104</MicrosoftDiagnosticsNETCoreClientPackageVersion>
+    <!-- dotnet/runtime dependencies -->
+    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
+    <SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
+    <!-- dotnet/core-setup dependencies -->
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <!-- dotnet/arcade dependencies -->
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25408.3</MicrosoftDotNetArcadeSdkPackageVersion>
+    <!-- dotnet/symreader-converter dependencies -->
+    <MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
+    <MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>
+  </PropertyGroup>
+  <!--Property group for alternate package version names-->
+  <PropertyGroup>
+    <!-- _git/vs-code-coverage dependencies -->
+    <MicrosoftInternalCodeCoverageVersion>$(MicrosoftInternalCodeCoveragePackageVersion)</MicrosoftInternalCodeCoverageVersion>
+    <!-- dotnet/dotnet dependencies -->
+    <MicrosoftDiagnosticsNETCoreClientVersion>$(MicrosoftDiagnosticsNETCoreClientPackageVersion)</MicrosoftDiagnosticsNETCoreClientVersion>
+    <!-- dotnet/runtime dependencies -->
+    <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
+    <SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionPackageVersion)</SystemComponentModelCompositionVersion>
+    <!-- dotnet/core-setup dependencies -->
+    <MicrosoftExtensionsFileSystemGlobbingVersion>$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <!-- dotnet/arcade dependencies -->
+    <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
+    <!-- dotnet/symreader-converter dependencies -->
+    <MicrosoftDiaSymReaderConverterVersion>$(MicrosoftDiaSymReaderConverterPackageVersion)</MicrosoftDiaSymReaderConverterVersion>
+    <MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbPackageVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
+  </PropertyGroup>
+</Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2073ba3a3e..356337cc87 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,53 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="vstest" Sha="e1eaf1bbd9702e9b6ee9b10dbc94105732e07896" BarId="284895" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.1.2-beta.21579.1">
+    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="18.0.0-preview.25469.1">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>251eb05b1b66a9b5c7c20f65722a10dad06cef27</Sha>
+      <Sha>957aa737e42290c129a620df7129f03189743dd1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.21508.1">
-      <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>d9290918615eff2f0711818558d8d4f653a28898</Sha>
+    <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.25476.104">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>e1eaf1bbd9702e9b6ee9b10dbc94105732e07896</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="5.0.0-preview.21508.1">
-      <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>d9290918615eff2f0711818558d8d4f653a28898</Sha>
-      <SourceBuild RepoName="diagnostics" ManagedOnly="true" />
+    <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
+    <Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
     </Dependency>
-  </ProductDependencies>
-  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
-      <SourceBuild RepoName="arcade" ManagedOnly="true" />
-    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21576.4">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21576.4">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+    <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.2">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
+    <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="2.0.0">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21576.4">
+  </ProductDependencies>
+  <ToolsetDependencies>
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25408.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
-      <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>cd705029f2675970b42f9273ae359d0926c5e815</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-1.21507.14">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>4b309dc5400e39a2eea09d82077737c1df5f347a</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19554-01">
-      <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>afa9aa7032f810ad91d84857b95ad1d071192afa</Sha>
+      <Sha>d27184f7cb92b4abb4b20e91ecb5c43bc43de65b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
       <Uri>https://github.com/dotnet/symreader-converter</Uri>
@@ -57,9 +39,5 @@
       <Uri>https://github.com/dotnet/symreader-converter</Uri>
       <Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
     </Dependency>
-    <Dependency Name="XliffTasks" Version="1.0.0-beta.21272.1">
-      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>f5321d0c7b3f5e6103440fc017253bcdb50a0a26</Sha>
-    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index da5aef1c13..ca2e4678cc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,87 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <PropertyGroup>
+  <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
+  <PropertyGroup Label="Version settings">
     <!-- This repo version -->
-    <VersionPrefix>17.1.0</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <!-- Opt-out repo features -->
-    <UsingToolXliff>false</UsingToolXliff>
-    <UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies>
-    <!-- Libs -->
-    <CommandLineParserVersion>2.2.1</CommandLineParserVersion>
-    <CredentialManagementVersion>1.0.2</CredentialManagementVersion>
-    <MicrosoftCciVersion>4.0.0-rc3-24214-00</MicrosoftCciVersion>
-    <HandlebarsNetVersion>1.9.5</HandlebarsNetVersion>
-    <LibGit2SharpVersion>0.25.2</LibGit2SharpVersion>
-    <log4netVersion>2.0.8</log4netVersion>
-    <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
-    <MicrosoftAzureStorageBlobVersion>10.0.2</MicrosoftAzureStorageBlobVersion>
-    <MicrosoftAzureKeyVaultVersion>3.0.0</MicrosoftAzureKeyVaultVersion>
-    <MicrosoftAzureServicesAppAuthenticationVersion>1.3.1</MicrosoftAzureServicesAppAuthenticationVersion>
-    <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
-    <MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>15.7.179</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftCodeAnalysisAnalyzersVersion>2.6.3</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>2.9.0</MicrosoftCodeAnalysisCSharpVersion>
-    <MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>2.1.0</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftDotNetPlatformAbstractionsVersion>2.1.0</MicrosoftDotNetPlatformAbstractionsVersion>
-    <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
-    <MicrosoftRestClientRuntimeVersion>2.3.13</MicrosoftRestClientRuntimeVersion>
-    <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
-    <MicrosoftNetCompilersToolsetVersion>4.1.0-1.21507.14</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftNetTestSdkVersion>15.7.2</MicrosoftNetTestSdkVersion>
-    <MoqVersion>4.8.3</MoqVersion>
-    <MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
-    <McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils>
-    <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
-    <MicrosoftBclJsonSourcesVersion>4.6.0-preview4.19202.2</MicrosoftBclJsonSourcesVersion>
-    <NuGetVersioningVersion>4.4.0</NuGetVersioningVersion>
-    <NuGetVersion>5.3.0</NuGetVersion>
-    <OctokitVersion>0.32.0</OctokitVersion>
-    <DotNetSleetLibVersion>2.2.143</DotNetSleetLibVersion>
-    <SwashbuckleAspNetCoreSwaggerVersion>3.0.0</SwashbuckleAspNetCoreSwaggerVersion>
-    <SystemBuffersVersion>4.5.0</SystemBuffersVersion>
-    <SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
-    <SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion>
-    <SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion>
-    <SystemIOPackagingVersion>4.5.0</SystemIOPackagingVersion>
-    <SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
-    <SystemMemoryVersion>4.5.1</SystemMemoryVersion>
-    <SystemNumericsVectorsVersion>4.4.0</SystemNumericsVectorsVersion>
-    <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>4.5.0</SystemRuntimeCompilerServicesUnsafeVersion>
-    <SystemTextEncodingsWebVersion>4.5.1</SystemTextEncodingsWebVersion>
-    <SystemThreadingTasksExtensionVersion>4.5.1</SystemThreadingTasksExtensionVersion>
-    <SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
-    <WindowsAzureStorageVersion>8.5.0</WindowsAzureStorageVersion>
-    <XUnitVersion>2.4.1</XUnitVersion>
-    <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.21576.4</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetSignToolVersion>7.0.0-beta.21576.4</MicrosoftDotNetSignToolVersion>
-    <MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
-    <MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
-    <MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
-    <MicrosoftDotNetGitHubIssueLabelerAssetsVersion>1.5.0</MicrosoftDotNetGitHubIssueLabelerAssetsVersion>
-    <MicrosoftMLVersion>1.0.0</MicrosoftMLVersion>
-    <MicrosoftVisualStudioWebCodeGenerationDesignVersion>2.0.4</MicrosoftVisualStudioWebCodeGenerationDesignVersion>
-    <MicrosoftDiaSymReaderConverterVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterVersion>
-    <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
-    <MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
-    <MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroClientVersion>
-    <MicrosoftSourceLinkVersion>1.0.0-beta2-19554-01</MicrosoftSourceLinkVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.21576.4</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
-    <XliffTasksVersion>1.0.0-beta.21272.1</XliffTasksVersion>
-    <!-- Roslyn -->
-    <!-- WARNING: Depending on Roslyn in code that also supports unmanaged scenarios (e.g. C++,
-         JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads
-         where Rolsyn is not installed. -->
-    <MicrosoftCodeAnalysisVersion>3.8.0-3.20427.2</MicrosoftCodeAnalysisVersion>
-    <MicrosoftInternalCodeCoverageVersion>17.1.2-beta.21579.1</MicrosoftInternalCodeCoverageVersion>
-    <MicrosoftDiagnosticsNETCoreClientVersion>0.2.0-preview.21508.1</MicrosoftDiagnosticsNETCoreClientVersion>
-    <MicrosoftSourceBuildIntermediatediagnosticsVersion>5.0.0-preview.21508.1</MicrosoftSourceBuildIntermediatediagnosticsVersion>
+    <!--
+        Workaround for https://github.com/microsoft/vstest/issues/4544
+        Use semantic versioning V1 because V2 will produce version like 17.7.0-preview.23280.1+94103c3f and DTAExecutionHost
+        is trying to parse that version and will consider any version with more than 4 `.` in it as invalid.
+    -->
+    <SemanticVersioningV1>true</SemanticVersioningV1>
+    <!--
+      IncludeSourceRevisionInInformationalVersion prevents ProductVersion (on file), and AssemblyInformationalVersion
+      from appending +<commitId>, which breaks DTAAgent.
+    -->
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    <VersionPrefix>18.0.1</VersionPrefix>
+    <PreReleaseVersionLabel>release</PreReleaseVersionLabel>
+  </PropertyGroup>
+  <PropertyGroup Label="Arcade settings">
+    <!-- Ensure we use xliff task tool - true is the default but we make it explicit here -->
+    <UsingToolXliff>true</UsingToolXliff>
+    <!-- Opt-in to Arcade tools for building VSIX projects. -->
+    <UsingToolVSSDK>true</UsingToolVSSDK>
+    <!-- Don't allow netstandard1.x dependencies when building from source in this repository. -->
+    <FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
+  </PropertyGroup>
+  <PropertyGroup Label="VSTest dependencies">
+    <CoverletCoverageVersion>1.2.0</CoverletCoverageVersion>
+    <!--
+        When updating the version of Microsoft.Build.Utilities.Core, go check on nuget.org which TFMs it targets.
+        Because you will need to update Microsoft.TestPlatform.Build.UnitTests to build using that concrete .NET TFM, e.g. net8.0 for 17.8.43.
+        Otherwise it will restore the netstandard2.0 *reference* library into test project bin, and the test project will fail
+        with File not found error.
+
+        Could not load file or assembly 'Microsoft.Build.Utilities.Core...
+    -->
+    <!--
+      Lot of these versions are not the latest present on nuget.org, we need to use versions that are present in SourceBuild to
+      avoid introducing pre-builts. https://github.com/dotnet/source-build-reference-packages/tree/main/src/referencePackages/src
+    -->
+    <MicrosoftBuildFrameworkPackageVersion>17.8.43</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildPackageVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildFrameworkReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkReferenceOnly>
+    <MicrosoftBuildReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildReferenceOnly>
+    <MicrosoftBuildUtilitiesCoreReferenceOnly>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildUtilitiesCoreReferenceOnly>
+    <MicrosoftCodeAnalysisVersion>4.11.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeCoverageIOVersion>17.7.0</MicrosoftCodeCoverageIOVersion>
+    <MicrosoftFakesVersion>18.0.0-beta.25430.1</MicrosoftFakesVersion>
+    <!--
+      Make sure you are taking a version from a release branch (rel/d*) in VS. Otherwise there won't be symbols for the dlls in package,
+      a and it will create a symcheck bug on re-insertion into VS.
+    -->
+    <MicrosoftVisualStudioDiagnosticsUtilitiesVersion>18.0.0-preview-1-10830-229</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
+    <MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
+    <MicrosoftVisualStudioInteropVersion>17.13.39960</MicrosoftVisualStudioInteropVersion>
+    <MicrosoftVSTelemetryVersion>17.13.24</MicrosoftVSTelemetryVersion>
+    <MicrosoftVSUtilitiesInternalVersion>16.3.90</MicrosoftVSUtilitiesInternalVersion>
+    <MicrosoftVSSDKBuildToolsVersion>17.14.2119</MicrosoftVSSDKBuildToolsVersion>
+    <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
+    <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
+    <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
+    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
+    <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
+    <TestPlatformExternalsVersion>18.0.0-preview-1-10911-061</TestPlatformExternalsVersion>
+    <MicrosoftInternalTestPlatformExtensions>18.0.0-preview-1-10911-061</MicrosoftInternalTestPlatformExtensions>
+    <TestPlatformMSDiaVersion>18.0.11024.295</TestPlatformMSDiaVersion>
+    <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="VSTest test settings">
+    <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
+    <AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
+    <MicrosoftTestingPlatformVersion>1.7.2</MicrosoftTestingPlatformVersion>
+    <MoqVersion>4.16.1</MoqVersion>
+    <!-- For coverage use our own package on latest stable -->
+    <MicrosoftCodeCoverageVersion>17.9.0</MicrosoftCodeCoverageVersion>
+    <!-- These versions are used for running unit tests, and running acceptance tests. They are also used as the default version for projects
+    in TestAssets.sln to allow running and debugging tests in that solution directly in VS without having to run them via AcceptanceTests. -->
+    <MSTestTestFrameworkVersion>3.9.3</MSTestTestFrameworkVersion>
+    <MSTestTestAdapterVersion>3.9.3</MSTestTestAdapterVersion>
+    <XUnitFrameworkVersion>2.4.2</XUnitFrameworkVersion>
+    <XUnitAdapterVersion>2.4.5</XUnitAdapterVersion>
+    <XUnitConsoleRunnerVersion>2.4.2</XUnitConsoleRunnerVersion>
+    <NUnit3FrameworkVersion>3.14.0</NUnit3FrameworkVersion>
+    <NUnit3AdapterVersion>3.17.0</NUnit3AdapterVersion>
+    <NUnitConsoleRunnerVersion>3.16.3</NUnitConsoleRunnerVersion>
+    <!--
+      Versions that are used when building projects from TestAssets.sln for compatibility tests. See Invoke-TestAssetsBuild in scripts/build.ps1.
+      Exact versions are used to avoid Nuget substituting them by closest match, if we make a typo.
+      These versions need to be "statically" readable because we read this file as xml in our build and tests.
+    -->
+    <!-- <MSTestFrameworkLatestVersion></MSTestFrameworkLatestVersion> is not here, because we don't build MSTest locally, so we don't have access to the latest version. -->
+    <MSTestFrameworkLatestPreviewVersion>[3.9.3]</MSTestFrameworkLatestPreviewVersion>
+    <MSTestFrameworkLatestStableVersion>[3.9.3]</MSTestFrameworkLatestStableVersion>
+    <MSTestFrameworkRecentStableVersion>[3.3.1]</MSTestFrameworkRecentStableVersion>
+    <MSTestFrameworkMostDownloadedVersion>[2.2.10]</MSTestFrameworkMostDownloadedVersion>
+    <MSTestFrameworkPreviousStableVersion>[2.2.10]</MSTestFrameworkPreviousStableVersion>
+    <MSTestFrameworkLegacyStableVersion>[1.4.0]</MSTestFrameworkLegacyStableVersion>
+    <!-- Versions that are used to restore previous versions of console, translation layer, and test.sdk for compatibility tests.
+    See Invoke-TestAssetsBuild in scripts/build.ps1. Exact versions are used to avoid Nuget substituting them by closest match, if we make a typo.
+    These versions need to be "statically" readable because we read this file as xml in our build and tests. -->
+    <!-- <VSTestConsoleLatestVersion></VSTestConsoleLatestVersion> is not here, NETTestSdkVersion is used instead, because that is the version of the locally built latest package.  -->
+    <VSTestConsoleLatestPreviewVersion>[17.10.0]</VSTestConsoleLatestPreviewVersion>
+    <VSTestConsoleLatestStableVersion>[17.10.0]</VSTestConsoleLatestStableVersion>
+    <VSTestConsoleRecentStableVersion>[17.9.0]</VSTestConsoleRecentStableVersion>
+    <VSTestConsoleMostDownloadedVersion>[17.6.2]</VSTestConsoleMostDownloadedVersion>
+    <VSTestConsolePreviousStableVersion>[16.11.0]</VSTestConsolePreviousStableVersion>
+    <VSTestConsoleLegacyStableVersion>[15.9.2]</VSTestConsoleLegacyStableVersion>
+    <ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/common-variables.yml b/eng/common-variables.yml
deleted file mode 100644
index 3b95400578..0000000000
--- a/eng/common-variables.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-variables:
-  # Cannot use key:value syntax in root defined variables
-  - name: _TeamName
-    value: DotNetCore
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: _DotNetValidationArtifactsCategory
-    value: .NETCoreValidation
-  - name: HelixApiAccessToken
-    value: ''
-  - name: _RunAsPublic
-    value: True
-  - name: _RunAsInternal
-    value: False
-  - name: _InternalBuildArgs
-    value: ''
-
-  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - name: _RunAsPublic
-      value: False
-    - name: _RunAsInternal
-      value: True
-    - name: _SignType
-      value: real
-    # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
-    # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-    # DotNet-HelixApi-Access provides: HelixApiAccessToken
-    - group: DotNet-Blob-Feed
-    - group: Publish-Build-Assets
-    - group: DotNet-HelixApi-Access
-    - group: SDL_Settings
-    - name: _InternalBuildArgs
-      value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
-        /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
-        /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-        /p:DotNetPublishToBlobFeed=true
-        /p:DotNetPublishUsingPipelines=true
-        /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
-        /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
diff --git a/eng/common/BuildConfiguration/build-configuration.json b/eng/common/BuildConfiguration/build-configuration.json
new file mode 100644
index 0000000000..3d1cc89894
--- /dev/null
+++ b/eng/common/BuildConfiguration/build-configuration.json
@@ -0,0 +1,4 @@
+{
+  "RetryCountLimit": 1,
+  "RetryByAnyError": false
+}
diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd
index 56c2f25ac2..ac1f72bf94 100644
--- a/eng/common/CIBuild.cmd
+++ b/eng/common/CIBuild.cmd
@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
\ No newline at end of file
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index 18823840b1..5db4ad71ee 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -1,17 +1,10 @@
-# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
-# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
+# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
+# disabled internal Maestro (darc-int*) feeds.
 #
-# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
-# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential 
-# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
+# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
 #
-# This script needs to be called in every job that will restore packages and which the base repo has
-# private AzDO feeds in the NuGet.config.
-#
-# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
-# from the AzureDevOps-Artifact-Feeds-Pats variable group.
-#
-# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
+# See example call for this script below.
 #
 #  - task: PowerShell@2
 #    displayName: Setup Private Feeds Credentials
@@ -21,11 +14,18 @@
 #      arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
 #    env:
 #      Token: $(dn-bot-dnceng-artifact-feeds-rw)
+#
+# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
+# This ensures that:
+# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
+# - The credential provider is installed.
+#
+# This logic is also abstracted into enable-internal-sources.yml.
 
 [CmdletBinding()]
 param (
     [Parameter(Mandatory = $true)][string]$ConfigFile,
-    [Parameter(Mandatory = $true)][string]$Password
+    $Password
 )
 
 $ErrorActionPreference = "Stop"
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
 . $PSScriptRoot\tools.ps1
 
 # Add source entry to PackageSources
-function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
+function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
     $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
     
     if ($packageSource -eq $null)
@@ -48,12 +48,17 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
     else {
         Write-Host "Package source $SourceName already present."
     }
-    
-    AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
+
+    AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
 }
 
 # Add a credential node for the specified source
-function AddCredential($creds, $source, $username, $password) {
+function AddCredential($creds, $source, $username, $pwd) {
+    # If no cred supplied, don't do anything.
+    if (!$pwd) {
+        return;
+    }
+
     # Looks for credential configuration for the given SourceName. Create it if none is found.
     $sourceElement = $creds.SelectSingleNode($Source)
     if ($sourceElement -eq $null)
@@ -82,17 +87,18 @@ function AddCredential($creds, $source, $username, $password) {
         $passwordElement.SetAttribute("key", "ClearTextPassword")
         $sourceElement.AppendChild($passwordElement) | Out-Null
     }
-    $passwordElement.SetAttribute("value", $Password)
+    
+    $passwordElement.SetAttribute("value", $pwd)
 }
 
-function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
+function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
     $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
 
     Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
     
     ForEach ($PackageSource in $maestroPrivateSources) {
         Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
-        AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
+        AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
     }
 }
 
@@ -110,11 +116,6 @@ if (!(Test-Path $ConfigFile -PathType Leaf)) {
   ExitWithExitCode 1
 }
 
-if (!$Password) {
-    Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT'
-    ExitWithExitCode 1
-}
-
 # Load NuGet.config
 $doc = New-Object System.Xml.XmlDocument
 $filename = (Get-Item $ConfigFile).FullName
@@ -127,11 +128,14 @@ if ($sources -eq $null) {
     $doc.DocumentElement.AppendChild($sources) | Out-Null
 }
 
-# Looks for a <PackageSourceCredentials> node. Create it if none is found.
-$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
-if ($creds -eq $null) {
-    $creds = $doc.CreateElement("packageSourceCredentials")
-    $doc.DocumentElement.AppendChild($creds) | Out-Null
+$creds = $null
+if ($Password) {
+    # Looks for a <PackageSourceCredentials> node. Create it if none is found.
+    $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
+    if ($creds -eq $null) {
+        $creds = $doc.CreateElement("packageSourceCredentials")
+        $doc.DocumentElement.AppendChild($creds) | Out-Null
+    }
 }
 
 # Check for disabledPackageSources; we'll enable any darc-int ones we find there
@@ -144,24 +148,24 @@ if ($disabledSources -ne $null) {
 $userName = "dn-bot"
 
 # Insert credential nodes for Maestro's private feeds
-InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
+InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
 
+# 3.1 uses a different feed url format so it's handled differently here
 $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
 if ($dotnet31Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
 }
 
-$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
-if ($dotnet5Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
-}
+$dotnetVersions = @('5','6','7','8','9')
 
-$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
-if ($dotnet6Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+foreach ($dotnetVersion in $dotnetVersions) {
+    $feedPrefix = "dotnet" + $dotnetVersion;
+    $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
+    if ($dotnetSource -ne $null) {
+        AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
+        AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
+    }
 }
 
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index ad3fb74fd2..4604b61b03 100644
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -1,28 +1,27 @@
 #!/usr/bin/env bash
 
-# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
-# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
+# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
+# disabled internal Maestro (darc-int*) feeds.
+# 
+# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
 #
-# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
-# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential 
-# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
-#
-# This script needs to be called in every job that will restore packages and which the base repo has
-# private AzDO feeds in the NuGet.config.
-#
-# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
-# from the AzureDevOps-Artifact-Feeds-Pats variable group.
-#
-# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing.
+# See example call for this script below.
 #
 #  - task: Bash@3
-#    displayName: Setup Private Feeds Credentials
+#    displayName: Setup Internal Feeds
 #    inputs:
 #      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-#      arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+#      arguments: $(Build.SourcesDirectory)/NuGet.config
 #    condition: ne(variables['Agent.OS'], 'Windows_NT')
-#    env:
-#      Token: $(dn-bot-dnceng-artifact-feeds-rw)
+#  - task: NuGetAuthenticate@1
+#
+# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
+# This ensures that:
+# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
+# - The credential provider is installed.
+#
+# This logic is also abstracted into enable-internal-sources.yml.
 
 ConfigFile=$1
 CredToken=$2
@@ -48,11 +47,6 @@ if [ ! -f "$ConfigFile" ]; then
     ExitWithExitCode 1
 fi
 
-if [ -z "$CredToken" ]; then
-    Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT"
-    ExitWithExitCode 1
-fi
-
 if [[ `uname -s` == "Darwin" ]]; then
     NL=$'\\\n'
     TB=''
@@ -105,53 +99,33 @@ if [ "$?" == "0" ]; then
     PackageSources+=('dotnet3.1-internal-transport')
 fi
 
-# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
-grep -i "<add key=\"dotnet5\"" $ConfigFile
-if [ "$?" == "0" ]; then
-    grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
-    if [ "$?" != "0" ]; then
-        echo "Adding dotnet5-internal to the packageSources."
-        PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
-
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-    fi
-    PackageSources+=('dotnet5-internal')
-
-    grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
-    if [ "$?" != "0" ]; then
-        echo "Adding dotnet5-internal-transport to the packageSources."
-        PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
+DotNetVersions=('5' '6' '7' '8' '9')
 
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-    fi
-    PackageSources+=('dotnet5-internal-transport')
-fi
+for DotNetVersion in ${DotNetVersions[@]} ; do
+    FeedPrefix="dotnet${DotNetVersion}";
+    grep -i "<add key=\"$FeedPrefix\"" $ConfigFile
+    if [ "$?" == "0" ]; then
+        grep -i "<add key=\"$FeedPrefix-internal\"" $ConfigFile
+        if [ "$?" != "0" ]; then
+            echo "Adding $FeedPrefix-internal to the packageSources."
+            PackageSourcesNodeFooter="</packageSources>"
+            PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/v2\" />"
 
-# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
-grep -i "<add key=\"dotnet6\"" $ConfigFile
-if [ "$?" == "0" ]; then
-    grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
-    if [ "$?" != "0" ]; then
-        echo "Adding dotnet6-internal to the packageSources."
-        PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
-
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-    fi
-    PackageSources+=('dotnet6-internal')
+            sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+        fi
+        PackageSources+=("$FeedPrefix-internal")
 
-    grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
-    if [ "$?" != "0" ]; then
-        echo "Adding dotnet6-internal-transport to the packageSources."
-        PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
+        grep -i "<add key=\"$FeedPrefix-internal-transport\">" $ConfigFile
+        if [ "$?" != "0" ]; then
+            echo "Adding $FeedPrefix-internal-transport to the packageSources."
+            PackageSourcesNodeFooter="</packageSources>"
+            PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/v2\" />"
 
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+            sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+        fi
+        PackageSources+=("$FeedPrefix-internal-transport")
     fi
-    PackageSources+=('dotnet6-internal-transport')
-fi
+done
 
 # I want things split line by line
 PrevIFS=$IFS
@@ -160,18 +134,20 @@ PackageSources+="$IFS"
 PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"')
 IFS=$PrevIFS
 
-for FeedName in ${PackageSources[@]} ; do
-    # Check if there is no existing credential for this FeedName
-    grep -i "<$FeedName>" $ConfigFile 
-    if [ "$?" != "0" ]; then
-        echo "Adding credentials for $FeedName."
+if [ "$CredToken" ]; then
+    for FeedName in ${PackageSources[@]} ; do
+        # Check if there is no existing credential for this FeedName
+        grep -i "<$FeedName>" $ConfigFile 
+        if [ "$?" != "0" ]; then
+            echo "Adding credentials for $FeedName."
 
-        PackageSourceCredentialsNodeFooter="</packageSourceCredentials>"
-        NewCredential="${TB}${TB}<$FeedName>${NL}<add key=\"Username\" value=\"dn-bot\" />${NL}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}</$FeedName>"
+            PackageSourceCredentialsNodeFooter="</packageSourceCredentials>"
+            NewCredential="${TB}${TB}<$FeedName>${NL}<add key=\"Username\" value=\"dn-bot\" />${NL}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}</$FeedName>"
 
-        sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
-    fi
-done
+            sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
+        fi
+    done
+fi
 
 # Re-enable any entries in disabledPackageSources where the feed name contains darc-int
 grep -i "<disabledPackageSources>" $ConfigFile
diff --git a/eng/common/build.cmd b/eng/common/build.cmd
new file mode 100644
index 0000000000..99daf368ab
--- /dev/null
+++ b/eng/common/build.cmd
@@ -0,0 +1,3 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
+exit /b %ErrorLevel%
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 8943da242f..8cfee107e7 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -7,6 +7,7 @@ Param(
   [string] $msbuildEngine = $null,
   [bool] $warnAsError = $true,
   [bool] $nodeReuse = $true,
+  [switch] $buildCheck = $false,
   [switch][Alias('r')]$restore,
   [switch] $deployDeps,
   [switch][Alias('b')]$build,
@@ -19,6 +20,8 @@ Param(
   [switch] $pack,
   [switch] $publish,
   [switch] $clean,
+  [switch][Alias('pb')]$productBuild,
+  [switch]$fromVMR,
   [switch][Alias('bl')]$binaryLog,
   [switch][Alias('nobl')]$excludeCIBinarylog,
   [switch] $ci,
@@ -26,6 +29,7 @@ Param(
   [string] $runtimeSourceFeed = '',
   [string] $runtimeSourceFeedKey = '',
   [switch] $excludePrereleaseVS,
+  [switch] $nativeToolsOnMachine,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -57,6 +61,7 @@ function Print-Usage() {
   Write-Host "  -sign                   Sign build outputs"
   Write-Host "  -publish                Publish artifacts (e.g. symbols)"
   Write-Host "  -clean                  Clean the solution"
+  Write-Host "  -productBuild           Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
   Write-Host ""
 
   Write-Host "Advanced settings:"
@@ -67,6 +72,10 @@ function Print-Usage() {
   Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
   Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
+  Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
+  Write-Host "  -nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
+  Write-Host "  -buildCheck             Sets /check msbuild parameter"
+  Write-Host "  -fromVMR                Set when building from within the VMR"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -93,6 +102,7 @@ function Build {
 
   $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
   $platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
+  $check = if ($buildCheck) { '/check' } else { '' }
 
   if ($projects) {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -109,6 +119,7 @@ function Build {
   MSBuild $toolsetBuildProj `
     $bl `
     $platformArg `
+    $check `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
     /p:Restore=$restore `
@@ -118,10 +129,13 @@ function Build {
     /p:Deploy=$deploy `
     /p:Test=$test `
     /p:Pack=$pack `
+    /p:DotNetBuild=$productBuild `
+    /p:DotNetBuildFromVMR=$fromVMR `
     /p:IntegrationTest=$integrationTest `
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `
     /p:Publish=$publish `
+    /p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
     @properties
 }
 
@@ -146,6 +160,9 @@ try {
     $nodeReuse = $false
   }
 
+  if ($nativeToolsOnMachine) {
+    $env:NativeToolsOnMachine = $true
+  }
   if ($restore) {
     InitializeNativeTools
   }
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 55b298f16c..9767bb411a 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -19,6 +19,12 @@ usage()
   echo "Actions:"
   echo "  --restore                  Restore dependencies (short: -r)"
   echo "  --build                    Build solution (short: -b)"
+  echo "  --sourceBuild              Source-build the solution (short: -sb)"
+  echo "                             Will additionally trigger the following actions: --restore, --build, --pack"
+  echo "                             If --configuration is not set explicitly, will also set it to 'Release'"
+  echo "  --productBuild             Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
+  echo "                             Will additionally trigger the following actions: --restore, --build, --pack"
+  echo "                             If --configuration is not set explicitly, will also set it to 'Release'"
   echo "  --rebuild                  Rebuild solution"
   echo "  --test                     Run all unit tests in the solution (short: -t)"
   echo "  --integrationTest          Run all integration tests in the solution"
@@ -36,6 +42,8 @@ usage()
   echo "  --prepareMachine         Prepare machine for CI run, clean up processes after build"
   echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
+  echo "  --buildCheck <value>     Sets /check msbuild parameter"
+  echo "  --fromVMR                Set when building from within the VMR"
   echo ""
   echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
@@ -55,6 +63,9 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
 restore=false
 build=false
+source_build=false
+product_build=false
+from_vmr=false
 rebuild=false
 test=false
 integration_test=false
@@ -68,18 +79,19 @@ clean=false
 
 warn_as_error=true
 node_reuse=true
+build_check=false
 binary_log=false
 exclude_ci_binary_log=false
 pipelines_log=false
 
 projects=''
-configuration='Debug'
+configuration=''
 prepare_machine=false
 verbosity='minimal'
 runtime_source_feed=''
 runtime_source_feed_key=''
 
-properties=''
+properties=()
 while [[ $# > 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
@@ -101,7 +113,7 @@ while [[ $# > 0 ]]; do
     -binarylog|-bl)
       binary_log=true
       ;;
-    -excludeCIBinarylog|-nobl)
+    -excludecibinarylog|-nobl)
       exclude_ci_binary_log=true
       ;;
     -pipelineslog|-pl)
@@ -119,6 +131,22 @@ while [[ $# > 0 ]]; do
     -pack)
       pack=true
       ;;
+    -sourcebuild|-source-build|-sb)
+      build=true
+      source_build=true
+      product_build=true
+      restore=true
+      pack=true
+      ;;
+    -productbuild|-product-build|-pb)
+      build=true
+      product_build=true
+      restore=true
+      pack=true
+      ;;
+    -fromvmr|-from-vmr)
+      from_vmr=true
+      ;;
     -test|-t)
       test=true
       ;;
@@ -152,6 +180,9 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
+    -buildcheck)
+      build_check=true
+      ;;
     -runtimesourcefeed)
       runtime_source_feed=$2
       shift
@@ -161,13 +192,17 @@ while [[ $# > 0 ]]; do
       shift
       ;;
     *)
-      properties="$properties $1"
+      properties+=("$1")
       ;;
   esac
 
   shift
 done
 
+if [[ -z "$configuration" ]]; then
+  if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi
+fi
+
 if [[ "$ci" == true ]]; then
   pipelines_log=true
   node_reuse=false
@@ -191,7 +226,7 @@ function Build {
   InitializeCustomToolset
 
   if [[ ! -z "$projects" ]]; then
-    properties="$properties /p:Projects=$projects"
+    properties+=("/p:Projects=$projects")
   fi
 
   local bl=""
@@ -199,12 +234,21 @@ function Build {
     bl="/bl:\"$log_dir/Build.binlog\""
   fi
 
+  local check=""
+  if [[ "$build_check" == true ]]; then
+    check="/check"
+  fi
+
   MSBuild $_InitializeToolset \
     $bl \
+    $check \
     /p:Configuration=$configuration \
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
     /p:Build=$build \
+    /p:DotNetBuild=$product_build \
+    /p:DotNetBuildSourceOnly=$source_build \
+    /p:DotNetBuildFromVMR=$from_vmr \
     /p:Rebuild=$rebuild \
     /p:Test=$test \
     /p:Pack=$pack \
@@ -212,7 +256,8 @@ function Build {
     /p:PerformanceTest=$performance_test \
     /p:Sign=$sign \
     /p:Publish=$publish \
-    $properties
+    /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
+    ${properties[@]+"${properties[@]}"}
 
   ExitWithExitCode 0
 }
diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
index 1a02c0dec8..66e3b0ac61 100644
--- a/eng/common/cibuild.sh
+++ b/eng/common/cibuild.sh
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
\ No newline at end of file
+. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml
new file mode 100644
index 0000000000..d901325154
--- /dev/null
+++ b/eng/common/core-templates/job/job.yml
@@ -0,0 +1,227 @@
+parameters:
+# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  cancelTimeoutInMinutes: ''
+  condition: ''
+  container: ''
+  continueOnError: false
+  dependsOn: ''
+  displayName: ''
+  pool: ''
+  steps: []
+  strategy: ''
+  timeoutInMinutes: ''
+  variables: []
+  workspace: ''
+  templateContext: {}
+
+# Job base template specific parameters
+  # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
+  # publishing defaults
+  artifacts: ''
+  enableMicrobuild: false
+  enableMicrobuildForMacAndLinux: false
+  microbuildUseESRP: true
+  enablePublishBuildArtifacts: false
+  enablePublishBuildAssets: false
+  enablePublishTestResults: false
+  enableBuildRetry: false
+  mergeTestResults: false
+  testRunTitle: ''
+  testResultsFormat: ''
+  name: ''
+  componentGovernanceSteps: []
+  preSteps: []
+  artifactPublishSteps: []
+  runAsPublic: false
+
+# 1es specific parameters
+  is1ESPipeline: ''
+
+jobs:
+- job: ${{ parameters.name }}
+
+  ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}:
+    cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
+
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
+
+  ${{ if ne(parameters.container, '') }}:
+    container: ${{ parameters.container }}
+
+  ${{ if ne(parameters.continueOnError, '') }}:
+    continueOnError: ${{ parameters.continueOnError }}
+
+  ${{ if ne(parameters.dependsOn, '') }}:
+    dependsOn: ${{ parameters.dependsOn }}
+
+  ${{ if ne(parameters.displayName, '') }}:
+    displayName: ${{ parameters.displayName }}
+
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+
+  ${{ if ne(parameters.strategy, '') }}:
+    strategy: ${{ parameters.strategy }}
+
+  ${{ if ne(parameters.timeoutInMinutes, '') }}:
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+
+  ${{ if ne(parameters.templateContext, '') }}:
+    templateContext: ${{ parameters.templateContext }}
+
+  variables:
+  - ${{ if ne(parameters.enableTelemetry, 'false') }}:
+    - name: DOTNET_CLI_TELEMETRY_PROFILE
+      value: '$(Build.Repository.Uri)'
+  # Retry signature validation up to three times, waiting 2 seconds between attempts.
+  # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
+  - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
+    value: 3,2000
+  - ${{ each variable in parameters.variables }}:
+    # handle name-value variable syntax
+    # example:
+    # - name: [key]
+    #   value: [value]
+    - ${{ if ne(variable.name, '') }}:
+      - name: ${{ variable.name }}
+        value: ${{ variable.value }}
+
+    # handle variable groups
+    - ${{ if ne(variable.group, '') }}:
+      - group: ${{ variable.group }}
+
+    # handle template variable syntax
+    # example:
+    # - template: path/to/template.yml
+    #   parameters:
+    #     [key]: [value]
+    - ${{ if ne(variable.template, '') }}:
+      - template: ${{ variable.template }}
+        ${{ if ne(variable.parameters, '') }}:
+          parameters: ${{ variable.parameters }}
+
+    # handle key-value variable syntax.
+    # example:
+    # - [key]: [value]
+    - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}:
+      - ${{ each pair in variable }}:
+        - name: ${{ pair.key }}
+          value: ${{ pair.value }}
+
+  # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
+  - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - group: DotNet-HelixApi-Access
+
+  ${{ if ne(parameters.workspace, '') }}:
+    workspace: ${{ parameters.workspace }}
+
+  steps:
+  - ${{ if eq(parameters.is1ESPipeline, '') }}:
+    - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+  - ${{ if ne(parameters.preSteps, '') }}:
+    - ${{ each preStep in parameters.preSteps }}:
+      - ${{ preStep }}
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/common/core-templates/steps/install-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
+        microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
+        continueOnError: ${{ parameters.continueOnError }}
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
+    - task: NuGetAuthenticate@1
+
+  - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: current
+        artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }}
+        targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }}
+        itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }}
+
+  - ${{ each step in parameters.steps }}:
+    - ${{ step }}
+
+  - ${{ each step in parameters.componentGovernanceSteps }}:
+    - ${{ step }}
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/common/core-templates/steps/cleanup-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
+        continueOnError: ${{ parameters.continueOnError }}
+
+  # Publish test results
+  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
+    - task: PublishTestResults@2
+      displayName: Publish XUnit Test Results
+      inputs:
+        testResultsFormat: 'xUnit'
+        testResultsFiles: '*.xml'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+        testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
+        mergeTestResults: ${{ parameters.mergeTestResults }}
+      continueOnError: true
+      condition: always()
+  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
+    - task: PublishTestResults@2
+      displayName: Publish TRX Test Results
+      inputs:
+        testResultsFormat: 'VSTest'
+        testResultsFiles: '*.trx'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+        testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
+        mergeTestResults: ${{ parameters.mergeTestResults }}
+      continueOnError: true
+      condition: always()
+
+  # gather artifacts
+  - ${{ if ne(parameters.artifacts.publish, '') }}:
+    - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
+      - task: CopyFiles@2
+        displayName: Gather binaries for publish to artifacts
+        inputs:
+          SourceFolder: 'artifacts/bin'
+          Contents: '**'
+          TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin'
+      - task: CopyFiles@2
+        displayName: Gather packages for publish to artifacts
+        inputs:
+          SourceFolder: 'artifacts/packages'
+          Contents: '**'
+          TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages'
+    - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
+      - task: CopyFiles@2
+        displayName: Gather logs for publish to artifacts
+        inputs:
+          SourceFolder: 'artifacts/log'
+          Contents: '**'
+          TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
+        continueOnError: true
+        condition: always()
+      
+  - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
+    - task: CopyFiles@2
+      displayName: Gather logs for publish to artifacts
+      inputs:
+        SourceFolder: 'artifacts/log/$(_BuildConfig)'
+        Contents: '**'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+      continueOnError: true
+      condition: always()
+  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+    - task: CopyFiles@2
+      displayName: Gather buildconfiguration for build retry
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
+        Contents: '**'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
+      continueOnError: true
+      condition: always()
+  - ${{ each step in parameters.artifactPublishSteps }}:
+    - ${{ step }}
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
new file mode 100644
index 0000000000..8bf7d23355
--- /dev/null
+++ b/eng/common/core-templates/job/onelocbuild.yml
@@ -0,0 +1,118 @@
+parameters:
+  # Optional: dependencies of the job
+  dependsOn: ''
+
+  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
+  pool: ''
+
+  CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
+  GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
+
+  SourcesDirectory: $(Build.SourcesDirectory)
+  CreatePr: true
+  AutoCompletePr: false
+  ReusePr: true
+  UseLfLineEndings: true
+  UseCheckedInLocProjectJson: false
+  SkipLocProjectJsonGeneration: false
+  LanguageSet: VS_Main_Languages
+  LclSource: lclFilesInRepo
+  LclPackageId: ''
+  RepoType: gitHub
+  GitHubOrg: dotnet
+  MirrorRepo: ''
+  MirrorBranch: main
+  condition: ''
+  JobNameSuffix: ''
+  is1ESPipeline: ''
+jobs:
+- job: OneLocBuild${{ parameters.JobNameSuffix }}
+
+  dependsOn: ${{ parameters.dependsOn }}
+
+  displayName: OneLocBuild${{ parameters.JobNameSuffix }}
+
+  variables:
+    - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
+    - name: _GenerateLocProjectArguments
+      value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
+        -LanguageSet "${{ parameters.LanguageSet }}"
+        -CreateNeutralXlfs
+    - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
+      - name: _GenerateLocProjectArguments
+        value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
+    - template: /eng/common/core-templates/variables/pool-providers.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+      ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+        name: AzurePipelines-EO
+        image: 1ESPT-Windows2022
+        demands: Cmd
+        os: windows
+      # If it's not devdiv, it's dnceng
+      ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+
+  steps:
+    - ${{ if eq(parameters.is1ESPipeline, '') }}:
+      - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+    - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
+      - task: Powershell@2
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+          arguments: $(_GenerateLocProjectArguments)
+        displayName: Generate LocProject.json
+        condition: ${{ parameters.condition }}
+
+    - task: OneLocBuild@2
+      displayName: OneLocBuild
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      inputs:
+        locProj: eng/Localize/LocProject.json
+        outDir: $(Build.ArtifactStagingDirectory)
+        lclSource: ${{ parameters.LclSource }}
+        lclPackageId: ${{ parameters.LclPackageId }}
+        isCreatePrSelected: ${{ parameters.CreatePr }}
+        isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
+        ${{ if eq(parameters.CreatePr, true) }}:
+          isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
+          isShouldReusePrSelected: ${{ parameters.ReusePr }}
+        packageSourceAuth: patAuth
+        patVariable: ${{ parameters.CeapexPat }}
+        ${{ if eq(parameters.RepoType, 'gitHub') }}:
+          repoType: ${{ parameters.RepoType }}
+          gitHubPatVariable: "${{ parameters.GithubPat }}"
+        ${{ if ne(parameters.MirrorRepo, '') }}:
+          isMirrorRepoSelected: true
+          gitHubOrganization: ${{ parameters.GitHubOrg }}
+          mirrorRepo: ${{ parameters.MirrorRepo }}
+          mirrorBranch: ${{ parameters.MirrorBranch }}
+      condition: ${{ parameters.condition }}
+
+    # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
+    - task: CopyFiles@2
+      displayName: Copy LocProject.json
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
+        Contents: 'LocProject.json'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
+      condition: ${{ parameters.condition }}
+
+    - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+        args:
+          targetPath: '$(Build.ArtifactStagingDirectory)/loc'
+          artifactName: 'Loc'
+          displayName: 'Publish Localization Files'
+          condition: ${{ parameters.condition }}
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
new file mode 100644
index 0000000000..d5303229c9
--- /dev/null
+++ b/eng/common/core-templates/job/publish-build-assets.yml
@@ -0,0 +1,194 @@
+parameters:
+  configuration: 'Debug'
+
+  # Optional: condition for the job to run
+  condition: ''
+
+  # Optional: 'true' if future jobs should run even if this job fails
+  continueOnError: false
+
+  # Optional: dependencies of the job
+  dependsOn: ''
+
+  # Optional: Include PublishBuildArtifacts task
+  enablePublishBuildArtifacts: false
+
+  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
+  pool: {}
+
+  # Optional: should run as a public build even in the internal project
+  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
+  runAsPublic: false
+
+  # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
+  publishAssetsImmediately: false
+
+  artifactsPublishingAdditionalParameters: ''
+
+  signingValidationAdditionalParameters: ''
+
+  is1ESPipeline: ''
+
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
+  # Optional, publishing version
+  publishingVersion: 3
+
+  # Optional: A minimatch pattern for the asset manifests to publish to BAR
+  assetManifestsPattern: '*/manifests/**/*.xml'
+
+jobs:
+- job: Asset_Registry_Publish
+
+  dependsOn: ${{ parameters.dependsOn }}
+  timeoutInMinutes: 150
+
+  ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+    displayName: Publish Assets
+  ${{ else }}:
+    displayName: Publish to Build Asset Registry
+
+  variables:
+  - template: /eng/common/core-templates/variables/pool-providers.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - group: Publish-Build-Assets
+    - group: AzureDevOps-Artifact-Feeds-Pats
+    - name: runCodesignValidationInjection
+      value: false
+    # unconditional - needed for logs publishing (redactor tool version)
+    - template: /eng/common/core-templates/post-build/common-variables.yml
+
+  pool:
+    # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+    ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+      name: AzurePipelines-EO
+      image: 1ESPT-Windows2022
+      demands: Cmd
+      os: windows
+    # If it's not devdiv, it's dnceng
+    ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+      name: NetCore1ESPool-Publishing-Internal
+      image: windows.vs2019.amd64
+      os: windows
+  steps:
+  - ${{ if eq(parameters.is1ESPipeline, '') }}:
+    - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - checkout: self
+      fetchDepth: 3
+      clean: true
+
+    - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: 
+      - ${{ if eq(parameters.publishingVersion, 3) }}: 
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Asset Manifests
+          inputs:
+            artifactName: AssetManifests
+            targetPath: '$(Build.StagingDirectory)/AssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+      - ${{ if eq(parameters.publishingVersion, 4) }}:
+        - task: DownloadPipelineArtifact@2
+          displayName: Download V4 asset manifests
+          inputs:
+            itemPattern: '*/manifests/**/*.xml'
+            targetPath: '$(Build.StagingDirectory)/AllAssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+        - task: CopyFiles@2
+          displayName: Copy V4 asset manifests to AssetManifests
+          inputs:
+            SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests'
+            Contents: ${{ parameters.assetManifestsPattern }}
+            TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
+            flattenFolders: true
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+    
+    - task: NuGetAuthenticate@1
+
+    - task: AzureCLI@2
+      displayName: Publish Build Assets
+      inputs:
+        azureSubscription: "Darc: Maestro Production"
+        scriptType: ps
+        scriptLocation: scriptPath
+        scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
+        arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
+          /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
+          /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
+          /p:MaestroApiEndpoint=https://maestro.dot.net
+          /p:OfficialBuildId=$(Build.BuildNumber)
+      condition: ${{ parameters.condition }}
+      continueOnError: ${{ parameters.continueOnError }}
+    
+    - task: powershell@2
+      displayName: Create ReleaseConfigs Artifact
+      inputs:
+        targetType: inline
+        script: |
+          New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
+          $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
+          Add-Content -Path $filePath -Value $(BARBuildId)
+          Add-Content -Path $filePath -Value "$(DefaultChannels)"
+          Add-Content -Path $filePath -Value $(IsStableBuild)
+
+          $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
+          if (Test-Path -Path $symbolExclusionfile)
+          {
+            Write-Host "SymbolExclusionFile exists"
+            Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
+          }
+
+    - ${{ if eq(parameters.publishingVersion, 4) }}:
+      - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+          args:
+            targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
+            artifactName: AssetManifests
+            displayName: 'Publish Merged Manifest'
+            retryCountOnTaskFailure: 10 # for any logs being locked
+            sbomEnabled: false  # we don't need SBOM for logs
+
+    - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+        args:
+          displayName: Publish ReleaseConfigs Artifact
+          pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
+          publishLocation: Container
+          artifactName: ReleaseConfigs
+
+    - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
+      - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+        parameters:
+          BARBuildId: ${{ parameters.BARBuildId }}
+          PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+      - task: AzureCLI@2
+        displayName: Publish Using Darc
+        inputs:
+          azureSubscription: "Darc: Maestro Production"
+          scriptType: ps
+          scriptLocation: scriptPath
+          scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          arguments: >
+            -BuildId $(BARBuildId)
+            -PublishingInfraVersion 3
+            -AzdoToken '$(System.AccessToken)'
+            -WaitPublishingFinish true
+            -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+            -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+            -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
+
+    - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
+      - template: /eng/common/core-templates/steps/publish-logs.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+          JobLabel: 'Publish_Artifacts_Logs'     
diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
new file mode 100644
index 0000000000..d805d5faeb
--- /dev/null
+++ b/eng/common/core-templates/job/source-build.yml
@@ -0,0 +1,96 @@
+parameters:
+  # This template adds arcade-powered source-build to CI. The template produces a server job with a
+  # default ID 'Source_Build_Complete' to put in a dependency list if necessary.
+
+  # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed.
+  jobNamePrefix: 'Source_Build'
+
+  # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for
+  # managed-only repositories. This is an object with these properties:
+  #
+  # name: ''
+  #   The name of the job. This is included in the job ID.
+  # targetRID: ''
+  #   The name of the target RID to use, instead of the one auto-detected by Arcade.
+  # portableBuild: false
+  #   Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
+  #   linux-x64), and compiling against distro-provided packages rather than portable ones. The
+  #   default is portable mode.
+  # skipPublishValidation: false
+  #   Disables publishing validation.  By default, a check is performed to ensure no packages are
+  #   published by source-build.
+  # container: ''
+  #   A container to use. Runs in docker.
+  # pool: {}
+  #   A pool to use. Runs directly on an agent.
+  # buildScript: ''
+  #   Specifies the build script to invoke to perform the build in the repo. The default
+  #   './build.sh' should work for typical Arcade repositories, but this is customizable for
+  #   difficult situations.
+  # buildArguments: ''
+  #   Specifies additional build arguments to pass to the build script.
+  # jobProperties: {}
+  #   A list of job properties to inject at the top level, for potential extensibility beyond
+  #   container and pool.
+  platform: {}
+
+  is1ESPipeline: ''
+
+  # If set to true and running on a non-public project,
+  # Internal nuget and blob storage locations will be enabled.
+  # This is not enabled by default because many repositories do not need internal sources
+  # and do not need to have the required service connections approved in the pipeline.
+  enableInternalSources: false
+
+jobs:
+- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
+  displayName: Source-Build (${{ parameters.platform.name }})
+
+  ${{ each property in parameters.platform.jobProperties }}:
+    ${{ property.key }}: ${{ property.value }}
+
+  ${{ if ne(parameters.platform.container, '') }}:
+    container: ${{ parameters.platform.container }}
+
+  ${{ if eq(parameters.platform.pool, '') }}:
+    # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+    # source-build builds run in Docker, including the default managed platform.
+    # /eng/common/core-templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
+    ${{ if eq(parameters.is1ESPipeline, 'true') }}:
+      pool:
+        ${{ if eq(variables['System.TeamProject'], 'public') }}:
+          name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
+          demands: ImageOverride -equals build.ubuntu.2004.amd64
+        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+          name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
+          image: 1es-mariner-2
+          os: linux
+    ${{ else }}:
+      pool:
+        ${{ if eq(variables['System.TeamProject'], 'public') }}:
+          name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
+          demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+          name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
+          demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
+  ${{ if ne(parameters.platform.pool, '') }}:
+    pool: ${{ parameters.platform.pool }}
+
+  workspace:
+    clean: all
+
+  steps:
+  - ${{ if eq(parameters.is1ESPipeline, '') }}:
+    - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+  - ${{ if eq(parameters.enableInternalSources, true) }}:
+    - template: /eng/common/core-templates/steps/enable-internal-sources.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    - template: /eng/common/core-templates/steps/enable-internal-runtimes.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+  - template: /eng/common/core-templates/steps/source-build.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      platform: ${{ parameters.platform }}
diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
new file mode 100644
index 0000000000..30530359a5
--- /dev/null
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -0,0 +1,44 @@
+parameters:
+  runAsPublic: false
+  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
+  preSteps: []
+  binlogPath: artifacts/log/Debug/Build.binlog
+  condition: ''
+  dependsOn: ''
+  pool: ''
+  is1ESPipeline: ''
+
+jobs:
+- job: SourceIndexStage1
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+  variables:
+  - name: BinlogPath
+    value: ${{ parameters.binlogPath }}
+  - template: /eng/common/core-templates/variables/pool-providers.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+  ${{ if ne(parameters.pool, '') }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.pool, '') }}:
+    pool:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: $(DncEngPublicBuildPool)
+        image: windows.vs2022.amd64.open
+      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        name: $(DncEngInternalBuildPool)
+        image: windows.vs2022.amd64
+
+  steps:
+  - ${{ if eq(parameters.is1ESPipeline, '') }}:
+    - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+  - ${{ each preStep in parameters.preSteps }}:
+    - ${{ preStep }}
+  - script: ${{ parameters.sourceIndexBuildCommand }}
+    displayName: Build Repository
+
+  - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+    parameters:
+      binLogPath: ${{ parameters.binLogPath }}
\ No newline at end of file
diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml
new file mode 100644
index 0000000000..693b00b370
--- /dev/null
+++ b/eng/common/core-templates/jobs/codeql-build.yml
@@ -0,0 +1,32 @@
+parameters:
+  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+  continueOnError: false
+  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  jobs: []
+  # Optional: if specified, restore and use this version of Guardian instead of the default.
+  overrideGuardianVersion: ''
+  is1ESPipeline: ''
+
+jobs:
+- template: /eng/common/core-templates/jobs/jobs.yml
+  parameters:
+    is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    enableMicrobuild: false
+    enablePublishBuildArtifacts: false
+    enablePublishTestResults: false
+    enablePublishBuildAssets: false
+    enableTelemetry: true
+
+    variables:
+      - group: Publish-Build-Assets
+      # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+      # sync with the packages.config file.
+      - name: DefaultGuardianVersion
+        value: 0.109.0
+      - name: GuardianPackagesConfigFile
+        value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+      - name: GuardianVersion
+        value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
+  
+    jobs: ${{ parameters.jobs }}
+        
diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml
new file mode 100644
index 0000000000..2f992b2c6e
--- /dev/null
+++ b/eng/common/core-templates/jobs/jobs.yml
@@ -0,0 +1,116 @@
+parameters:
+  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
+  continueOnError: false
+
+  # Optional: Include PublishBuildArtifacts task
+  enablePublishBuildArtifacts: false
+
+  # Optional: Enable running the source-build jobs to build repo from source
+  enableSourceBuild: false
+
+  # Optional: Parameters for source-build template.
+  #           See /eng/common/core-templates/jobs/source-build.yml for options
+  sourceBuildParameters: []
+
+  graphFileGeneration:
+    # Optional: Enable generating the graph files at the end of the build
+    enabled: false
+    # Optional: Include toolset dependencies in the generated graph files
+    includeToolset: false
+    
+  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
+  jobs: []
+
+  # Optional: Override automatically derived dependsOn value for "publish build assets" job
+  publishBuildAssetsDependsOn: ''
+
+  # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
+  publishAssetsImmediately: false
+
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
+  # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
+  artifactsPublishingAdditionalParameters: ''
+  signingValidationAdditionalParameters: ''
+
+  # Optional: should run as a public build even in the internal project
+  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
+  runAsPublic: false
+
+  enableSourceIndex: false
+  sourceIndexParams: {}
+
+  artifacts: {}
+  is1ESPipeline: ''
+
+# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
+# and some (Microbuild) should only be applied to non-PR cases for internal builds.
+
+jobs:
+- ${{ each job in parameters.jobs }}:
+  - ${{ if eq(parameters.is1ESPipeline, 'true') }}:
+    - template: /eng/common/templates-official/job/job.yml
+      parameters: 
+        # pass along parameters
+        ${{ each parameter in parameters }}:
+          ${{ if ne(parameter.key, 'jobs') }}:
+            ${{ parameter.key }}: ${{ parameter.value }}
+
+        # pass along job properties
+        ${{ each property in job }}:
+          ${{ if ne(property.key, 'job') }}:
+            ${{ property.key }}: ${{ property.value }}
+
+        name: ${{ job.job }}
+
+  - ${{ else }}:
+    - template: /eng/common/templates/job/job.yml
+      parameters: 
+        # pass along parameters
+        ${{ each parameter in parameters }}:
+          ${{ if ne(parameter.key, 'jobs') }}:
+            ${{ parameter.key }}: ${{ parameter.value }}
+
+        # pass along job properties
+        ${{ each property in job }}:
+          ${{ if ne(property.key, 'job') }}:
+            ${{ property.key }}: ${{ property.value }}
+
+        name: ${{ job.job }}
+
+- ${{ if eq(parameters.enableSourceBuild, true) }}:
+  - template: /eng/common/core-templates/jobs/source-build.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      ${{ each parameter in parameters.sourceBuildParameters }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
+
+- ${{ if eq(parameters.enableSourceIndex, 'true') }}:
+  - template: ../job/source-index-stage1.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      runAsPublic: ${{ parameters.runAsPublic }}
+      ${{ each parameter in parameters.sourceIndexParams }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
+
+- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
+    - template: ../job/publish-build-assets.yml
+      parameters:
+        is1ESPipeline: ${{ parameters.is1ESPipeline }}
+        continueOnError: ${{ parameters.continueOnError }}
+        dependsOn:
+        - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
+          - ${{ each job in parameters.publishBuildAssetsDependsOn }}:
+            - ${{ job.job }}
+        - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
+          - ${{ each job in parameters.jobs }}:
+            - ${{ job.job }}
+
+        runAsPublic: ${{ parameters.runAsPublic }}
+        publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
+        isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
+        enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
+        artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+        signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml
new file mode 100644
index 0000000000..d92860cba2
--- /dev/null
+++ b/eng/common/core-templates/jobs/source-build.yml
@@ -0,0 +1,42 @@
+parameters:
+  # This template adds arcade-powered source-build to CI. A job is created for each platform, as
+  # well as an optional server job that completes when all platform jobs complete.
+
+  # See /eng/common/core-templates/job/source-build.yml
+  jobNamePrefix: 'Source_Build'
+
+  # This is the default platform provided by Arcade, intended for use by a managed-only repo.
+  defaultManagedPlatform:
+    name: 'Managed'
+    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
+
+  # Defines the platforms on which to run build jobs. One job is created for each platform, and the
+  # object in this array is sent to the job template as 'platform'. If no platforms are specified,
+  # one job runs on 'defaultManagedPlatform'.
+  platforms: []
+
+  is1ESPipeline: ''
+
+  # If set to true and running on a non-public project,
+  # Internal nuget and blob storage locations will be enabled.
+  # This is not enabled by default because many repositories do not need internal sources
+  # and do not need to have the required service connections approved in the pipeline.
+  enableInternalSources: false
+
+jobs:
+
+- ${{ each platform in parameters.platforms }}:
+  - template: /eng/common/core-templates/job/source-build.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      jobNamePrefix: ${{ parameters.jobNamePrefix }}
+      platform: ${{ platform }}
+      enableInternalSources: ${{ parameters.enableInternalSources }}
+
+- ${{ if eq(length(parameters.platforms), 0) }}:
+  - template: /eng/common/core-templates/job/source-build.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      jobNamePrefix: ${{ parameters.jobNamePrefix }}
+      platform: ${{ parameters.defaultManagedPlatform }}
+      enableInternalSources: ${{ parameters.enableInternalSources }}
diff --git a/eng/common/core-templates/post-build/common-variables.yml b/eng/common/core-templates/post-build/common-variables.yml
new file mode 100644
index 0000000000..d5627a994a
--- /dev/null
+++ b/eng/common/core-templates/post-build/common-variables.yml
@@ -0,0 +1,22 @@
+variables:
+  - group: Publish-Build-Assets
+
+  # Whether the build is internal or not
+  - name: IsInternalBuild
+    value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }}
+
+  # Default Maestro++ API Endpoint and API Version
+  - name: MaestroApiEndPoint
+    value: "https://maestro.dot.net"
+  - name: MaestroApiVersion
+    value: "2020-02-20"
+
+  - name: SourceLinkCLIVersion
+    value: 3.0.0
+  - name: SymbolToolVersion
+    value: 1.0.1
+  - name: BinlogToolVersion
+    value: 1.0.11
+
+  - name: runCodesignValidationInjection
+    value: false
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
new file mode 100644
index 0000000000..a151fd811e
--- /dev/null
+++ b/eng/common/core-templates/post-build/post-build.yml
@@ -0,0 +1,325 @@
+parameters:
+  # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
+  # Publishing V1 is no longer supported
+  # Publishing V2 is no longer supported
+  # Publishing V3 is the default
+  - name: publishingInfraVersion
+    displayName: Which version of publishing should be used to promote the build definition?
+    type: number
+    default: 3
+    values:
+    - 3
+
+  - name: BARBuildId
+    displayName: BAR Build Id
+    type: number
+    default: 0
+
+  - name: PromoteToChannelIds
+    displayName: Channel to promote BARBuildId to
+    type: string
+    default: ''
+
+  - name: enableSourceLinkValidation
+    displayName: Enable SourceLink validation
+    type: boolean
+    default: false
+
+  - name: enableSigningValidation
+    displayName: Enable signing validation
+    type: boolean
+    default: true
+
+  - name: enableSymbolValidation
+    displayName: Enable symbol validation
+    type: boolean
+    default: false
+
+  - name: enableNugetValidation
+    displayName: Enable NuGet validation
+    type: boolean
+    default: true
+    
+  - name: publishInstallersAndChecksums
+    displayName: Publish installers and checksums
+    type: boolean
+    default: true
+    
+  - name: requireDefaultChannels
+    displayName: Fail the build if there are no default channel(s) registrations for the current build
+    type: boolean
+    default: false
+
+  - name: SDLValidationParameters
+    type: object
+    default:
+      enable: false
+      publishGdn: false
+      continueOnError: false
+      params: ''
+      artifactNames: ''
+      downloadArtifacts: true
+
+  - name: isAssetlessBuild
+    type: boolean
+    displayName: Is Assetless Build
+    default: false
+
+  # These parameters let the user customize the call to sdk-task.ps1 for publishing
+  # symbols & general artifacts as well as for signing validation
+  - name: symbolPublishingAdditionalParameters
+    displayName: Symbol publishing additional parameters
+    type: string
+    default: ''
+
+  - name: artifactsPublishingAdditionalParameters
+    displayName: Artifact publishing additional parameters
+    type: string
+    default: ''
+
+  - name: signingValidationAdditionalParameters
+    displayName: Signing validation additional parameters
+    type: string
+    default: ''
+
+  # Which stages should finish execution before post-build stages start
+  - name: validateDependsOn
+    type: object
+    default:
+    - build
+
+  - name: publishDependsOn
+    type: object
+    default:
+    - Validate
+
+  # Optional: Call asset publishing rather than running in a separate stage
+  - name: publishAssetsImmediately
+    type: boolean
+    default: false
+
+  - name: is1ESPipeline
+    type: boolean
+    default: false
+
+stages:
+- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+  - stage: Validate
+    dependsOn: ${{ parameters.validateDependsOn }}
+    displayName: Validate Build Assets
+    variables:
+      - template: /eng/common/core-templates/post-build/common-variables.yml
+      - template: /eng/common/core-templates/variables/pool-providers.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    jobs:
+    - job:
+      displayName: NuGet Validation
+      condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true'))
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: AzurePipelines-EO
+          image: 1ESPT-Windows2022
+          demands: Cmd
+          os: windows
+        # If it's not devdiv, it's dnceng
+        ${{ else }}:
+          ${{ if eq(parameters.is1ESPipeline, true) }}:
+            name: $(DncEngInternalBuildPool)
+            image: windows.vs2022.amd64
+            os: windows
+          ${{ else }}:
+            name: $(DncEngInternalBuildPool)
+            demands: ImageOverride -equals windows.vs2022.amd64
+
+      steps:
+        - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+            is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+        - task: DownloadBuildArtifacts@0
+          displayName: Download Package Artifacts
+          inputs:
+            buildType: specific
+            buildVersionToDownload: specific
+            project: $(AzDOProjectName)
+            pipeline: $(AzDOPipelineId)
+            buildId: $(AzDOBuildId)
+            artifactName: PackageArtifacts
+            checkDownloadedFiles: true
+
+        - task: PowerShell@2
+          displayName: Validate
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
+            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
+
+    - job:
+      displayName: Signing Validation
+      condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: AzurePipelines-EO
+          image: 1ESPT-Windows2022
+          demands: Cmd
+          os: windows
+        # If it's not devdiv, it's dnceng
+        ${{ else }}:
+          ${{ if eq(parameters.is1ESPipeline, true) }}:        
+            name: $(DncEngInternalBuildPool)
+            image: 1es-windows-2022
+            os: windows
+          ${{ else }}:
+            name: $(DncEngInternalBuildPool)
+            demands: ImageOverride -equals windows.vs2022.amd64          
+      steps:
+        - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+            is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+        - task: DownloadBuildArtifacts@0
+          displayName: Download Package Artifacts
+          inputs:
+            buildType: specific
+            buildVersionToDownload: specific
+            project: $(AzDOProjectName)
+            pipeline: $(AzDOPipelineId)
+            buildId: $(AzDOBuildId)
+            artifactName: PackageArtifacts
+            checkDownloadedFiles: true
+
+        # This is necessary whenever we want to publish/restore to an AzDO private feed
+        # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
+        # otherwise it'll complain about accessing a private feed.
+        - task: NuGetAuthenticate@1
+          displayName: 'Authenticate to AzDO Feeds'
+
+        # Signing validation will optionally work with the buildmanifest file which is downloaded from
+        # Azure DevOps above.
+        - task: PowerShell@2
+          displayName: Validate
+          inputs:
+            filePath: eng\common\sdk-task.ps1
+            arguments: -task SigningValidation -restore -msbuildEngine vs
+              /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
+              /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
+              ${{ parameters.signingValidationAdditionalParameters }}
+
+        - template: /eng/common/core-templates/steps/publish-logs.yml
+          parameters:
+            is1ESPipeline: ${{ parameters.is1ESPipeline }}
+            StageLabel: 'Validation'
+            JobLabel: 'Signing'
+            BinlogToolVersion: $(BinlogToolVersion)
+
+    - job:
+      displayName: SourceLink Validation
+      condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: AzurePipelines-EO
+          image: 1ESPT-Windows2022
+          demands: Cmd
+          os: windows
+        # If it's not devdiv, it's dnceng
+        ${{ else }}:
+          ${{ if eq(parameters.is1ESPipeline, true) }}:          
+            name: $(DncEngInternalBuildPool)
+            image: 1es-windows-2022
+            os: windows
+          ${{ else }}:
+            name: $(DncEngInternalBuildPool)
+            demands: ImageOverride -equals windows.vs2022.amd64          
+      steps:
+        - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+            is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+        - task: DownloadBuildArtifacts@0
+          displayName: Download Blob Artifacts
+          inputs:
+            buildType: specific
+            buildVersionToDownload: specific
+            project: $(AzDOProjectName)
+            pipeline: $(AzDOPipelineId)
+            buildId: $(AzDOBuildId)
+            artifactName: BlobArtifacts
+            checkDownloadedFiles: true
+
+        - task: PowerShell@2
+          displayName: Validate
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
+            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
+              -ExtractPath $(Agent.BuildDirectory)/Extract/ 
+              -GHRepoName $(Build.Repository.Name) 
+              -GHCommit $(Build.SourceVersion)
+              -SourcelinkCliVersion $(SourceLinkCLIVersion)
+          continueOnError: true
+
+- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}:
+  - stage: publish_using_darc
+    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
+      dependsOn: ${{ parameters.publishDependsOn }}
+    ${{ else }}:
+      dependsOn: ${{ parameters.validateDependsOn }}
+    displayName: Publish using Darc
+    variables:
+      - template: /eng/common/core-templates/post-build/common-variables.yml
+      - template: /eng/common/core-templates/variables/pool-providers.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    jobs:
+    - job:
+      displayName: Publish Using Darc
+      timeoutInMinutes: 120
+      pool:
+        # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+        ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+          name: AzurePipelines-EO
+          image: 1ESPT-Windows2022
+          demands: Cmd
+          os: windows
+        # If it's not devdiv, it's dnceng
+        ${{ else }}:
+          ${{ if eq(parameters.is1ESPipeline, true) }}:          
+            name: NetCore1ESPool-Publishing-Internal
+            image: windows.vs2019.amd64
+            os: windows
+          ${{ else }}:
+            name: NetCore1ESPool-Publishing-Internal
+            demands: ImageOverride -equals windows.vs2019.amd64          
+      steps:
+        - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+          parameters:
+            BARBuildId: ${{ parameters.BARBuildId }}
+            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+            is1ESPipeline: ${{ parameters.is1ESPipeline }}
+
+        - task: NuGetAuthenticate@1
+
+        - task: AzureCLI@2
+          displayName: Publish Using Darc
+          inputs:
+            azureSubscription: "Darc: Maestro Production"
+            scriptType: ps
+            scriptLocation: scriptPath
+            scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+            arguments: >
+              -BuildId $(BARBuildId)
+              -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
+              -AzdoToken '$(System.AccessToken)'
+              -WaitPublishingFinish true
+              -RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
+              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
+              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml
new file mode 100644
index 0000000000..f7602980db
--- /dev/null
+++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -0,0 +1,74 @@
+parameters:
+  BARBuildId: ''
+  PromoteToChannelIds: ''
+  is1ESPipeline: ''
+
+steps:
+  - ${{ if eq(parameters.is1ESPipeline, '') }}:
+    - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
+
+  - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Release Configs
+      inputs:
+        buildType: current
+        artifactName: ReleaseConfigs
+        checkDownloadedFiles: true
+
+  - task: AzureCLI@2
+    name: setReleaseVars
+    displayName: Set Release Configs Vars
+    inputs:
+      azureSubscription: "Darc: Maestro Production"
+      scriptType: pscore
+      scriptLocation: inlineScript
+      inlineScript: |
+        try {
+          if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
+            $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
+
+            $BarId = $Content | Select -Index 0
+            $Channels = $Content | Select -Index 1
+            $IsStableBuild = $Content | Select -Index 2
+
+            $AzureDevOpsProject = $Env:System_TeamProject
+            $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
+            $AzureDevOpsBuildId = $Env:Build_BuildId
+          }
+          else {
+            . $(Build.SourcesDirectory)\eng\common\tools.ps1
+            $darc = Get-Darc
+            $buildInfo = & $darc get-build `
+              --id ${{ parameters.BARBuildId }} `
+              --extended `
+              --output-format json `
+              --ci `
+              | convertFrom-Json
+
+            $BarId = ${{ parameters.BARBuildId }}
+            $Channels = $Env:PromoteToMaestroChannels -split ","
+            $Channels = $Channels -join "]["
+            $Channels = "[$Channels]"
+
+            $IsStableBuild = $buildInfo.stable
+            $AzureDevOpsProject = $buildInfo.azureDevOpsProject
+            $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
+            $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
+          }
+
+          Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId"
+          Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels"
+          Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild"
+
+          Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject"
+          Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId"
+          Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId"
+        }
+        catch {
+          Write-Host $_
+          Write-Host $_.Exception
+          Write-Host $_.ScriptStackTrace
+          exit 1
+        }
+    env:
+      PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
diff --git a/eng/common/core-templates/steps/cleanup-microbuild.yml b/eng/common/core-templates/steps/cleanup-microbuild.yml
new file mode 100644
index 0000000000..c0fdcd3379
--- /dev/null
+++ b/eng/common/core-templates/steps/cleanup-microbuild.yml
@@ -0,0 +1,28 @@
+parameters:
+  # Enable cleanup tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable cleanup tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    - task: MicroBuildCleanup@1
+      displayName: Execute Microbuild cleanup tasks
+      condition: and(
+        always(),
+        or(
+          and(
+            eq(variables['Agent.Os'], 'Windows_NT'),
+            in(variables['_SignType'], 'real', 'test')
+          ),
+          and(
+            ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
+            ne(variables['Agent.Os'], 'Windows_NT'),
+            eq(variables['_SignType'], 'real')
+          )
+        ))
+      continueOnError: ${{ parameters.continueOnError }}
+      env:
+        TeamName: $(_TeamName)
diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml
new file mode 100644
index 0000000000..cf0649aa95
--- /dev/null
+++ b/eng/common/core-templates/steps/component-governance.yml
@@ -0,0 +1,16 @@
+parameters:
+  disableComponentGovernance: false
+  componentGovernanceIgnoreDirectories: ''
+  is1ESPipeline: false
+  displayName: 'Component Detection'
+
+steps:
+- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
+  - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+    displayName: Set skipComponentGovernanceDetection variable
+- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
+  - task: ComponentGovernanceComponentDetection@0
+    continueOnError: true
+    displayName: ${{ parameters.displayName }}
+    inputs:
+      ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
diff --git a/eng/common/core-templates/steps/enable-internal-runtimes.yml b/eng/common/core-templates/steps/enable-internal-runtimes.yml
new file mode 100644
index 0000000000..6bdbf62ac5
--- /dev/null
+++ b/eng/common/core-templates/steps/enable-internal-runtimes.yml
@@ -0,0 +1,32 @@
+# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
+# variable with the base64-encoded SAS token, by default
+
+parameters:
+- name: federatedServiceConnection
+  type: string
+  default: 'dotnetbuilds-internal-read'
+- name: outputVariableName
+  type: string
+  default: 'dotnetbuilds-internal-container-read-token-base64'
+- name: expiryInHours
+  type: number
+  default: 1
+- name: base64Encode
+  type: boolean
+  default: true
+- name: is1ESPipeline
+  type: boolean
+  default: false
+
+steps:
+- ${{ if ne(variables['System.TeamProject'], 'public') }}:
+  - template: /eng/common/core-templates/steps/get-delegation-sas.yml
+    parameters:
+      federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
+      outputVariableName: ${{ parameters.outputVariableName }}
+      expiryInHours: ${{ parameters.expiryInHours }}
+      base64Encode: ${{ parameters.base64Encode }}
+      storageAccount: dotnetbuilds
+      container: internal
+      permissions: rl
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
\ No newline at end of file
diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml
new file mode 100644
index 0000000000..64f881bffc
--- /dev/null
+++ b/eng/common/core-templates/steps/enable-internal-sources.yml
@@ -0,0 +1,47 @@
+parameters:
+# This is the Azure federated service connection that we log into to get an access token.
+- name: nugetFederatedServiceConnection
+  type: string
+  default: 'dnceng-artifacts-feeds-read'
+- name: is1ESPipeline
+  type: boolean
+  default: false
+# Legacy parameters to allow for PAT usage
+- name: legacyCredential
+  type: string
+  default: ''
+
+steps:
+- ${{ if ne(variables['System.TeamProject'], 'public') }}:
+  - ${{ if ne(parameters.legacyCredential, '') }}:
+    - task: PowerShell@2
+      displayName: Setup Internal Feeds
+      inputs:
+        filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+        arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+      env:
+        Token: ${{ parameters.legacyCredential }}
+  # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate.
+  # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that
+  # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token.
+  - ${{ else }}:
+    - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+      - task: PowerShell@2
+        displayName: Setup Internal Feeds
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+          arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config
+    - ${{ else }}:
+      - template: /eng/common/templates/steps/get-federated-access-token.yml
+        parameters:
+          federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }}
+          outputVariableName: 'dnceng-artifacts-feeds-read-access-token'
+      - task: PowerShell@2
+        displayName: Setup Internal Feeds
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+          arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token)
+  # This is required in certain scenarios to install the ADO credential provider.
+  # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others
+  # (e.g. dotnet msbuild).
+  - task: NuGetAuthenticate@1
diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml
new file mode 100644
index 0000000000..44a9636cdf
--- /dev/null
+++ b/eng/common/core-templates/steps/generate-sbom.yml
@@ -0,0 +1,54 @@
+# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
+# PackageName - The name of the package this SBOM represents.
+# PackageVersion - The version of the package this SBOM represents. 
+# ManifestDirPath - The path of the directory where the generated manifest files will be placed
+# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
+
+parameters:
+  PackageVersion: 10.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  PackageName: '.NET'
+  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
+  IgnoreDirectories: ''
+  sbomContinueOnError: true
+  is1ESPipeline: false
+  # disable publishArtifacts if some other step is publishing the artifacts (like job.yml).
+  publishArtifacts: true
+
+steps:
+- task: PowerShell@2 
+  displayName: Prep for SBOM generation in (Non-linux)
+  condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
+  inputs: 
+    filePath: ./eng/common/generate-sbom-prep.ps1
+    arguments: ${{parameters.manifestDirPath}}
+
+# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
+- script: |
+    chmod +x ./eng/common/generate-sbom-prep.sh
+    ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
+  displayName: Prep for SBOM generation in (Linux)
+  condition: eq(variables['Agent.Os'], 'Linux')
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+
+- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+  displayName: 'Generate SBOM manifest'
+  continueOnError: ${{ parameters.sbomContinueOnError }}
+  inputs:
+      PackageName: ${{ parameters.packageName }}
+      BuildDropPath: ${{ parameters.buildDropPath }}
+      PackageVersion: ${{ parameters.packageVersion }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
+      ${{ if ne(parameters.IgnoreDirectories, '') }}:
+        AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
+
+- ${{ if eq(parameters.publishArtifacts, 'true')}}:
+  - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      args:
+        displayName: Publish SBOM manifest
+        continueOnError: ${{parameters.sbomContinueOnError}}
+        targetPath: '${{ parameters.manifestDirPath }}'
+        artifactName: $(ARTIFACT_NAME)
+
diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml
new file mode 100644
index 0000000000..d2901470a7
--- /dev/null
+++ b/eng/common/core-templates/steps/get-delegation-sas.yml
@@ -0,0 +1,46 @@
+parameters:
+- name: federatedServiceConnection
+  type: string
+- name: outputVariableName
+  type: string
+- name: expiryInHours
+  type: number
+  default: 1
+- name: base64Encode
+  type: boolean
+  default: false
+- name: storageAccount
+  type: string
+- name: container
+  type: string
+- name: permissions
+  type: string
+  default: 'rl'
+- name: is1ESPipeline
+  type: boolean
+  default: false
+
+steps:
+- task: AzureCLI@2
+  displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}'
+  inputs:
+    azureSubscription: ${{ parameters.federatedServiceConnection }}
+    scriptType: 'pscore'
+    scriptLocation: 'inlineScript'
+    inlineScript: |
+      # Calculate the expiration of the SAS token and convert to UTC
+      $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+
+      $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+
+      if ($LASTEXITCODE -ne 0) {
+        Write-Error "Failed to generate SAS token."
+        exit 1
+      }
+
+      if ('${{ parameters.base64Encode }}' -eq 'true') {
+        $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))
+      }
+
+      Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
+      Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas"
diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml
new file mode 100644
index 0000000000..3a4d4410c4
--- /dev/null
+++ b/eng/common/core-templates/steps/get-federated-access-token.yml
@@ -0,0 +1,42 @@
+parameters:
+- name: federatedServiceConnection
+  type: string
+- name: outputVariableName
+  type: string
+- name: is1ESPipeline
+  type: boolean
+- name: stepName
+  type: string
+  default: 'getFederatedAccessToken'
+- name: condition
+  type: string
+  default: ''
+# Resource to get a token for. Common values include:
+# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps
+# - 'https://storage.azure.com/' for storage
+# Defaults to Azure DevOps
+- name: resource
+  type: string
+  default: '499b84ac-1321-427f-aa17-267ca6975798'
+- name: isStepOutputVariable
+  type: boolean
+  default: false
+
+steps:
+- task: AzureCLI@2
+  displayName: 'Getting federated access token for feeds'
+  name: ${{ parameters.stepName }}
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
+  inputs:
+    azureSubscription: ${{ parameters.federatedServiceConnection }}
+    scriptType: 'pscore'
+    scriptLocation: 'inlineScript'
+    inlineScript: |
+      $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv
+      if ($LASTEXITCODE -ne 0) {
+        Write-Error "Failed to get access token for resource '${{ parameters.resource }}'"
+        exit 1
+      }
+      Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
+      Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
\ No newline at end of file
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
new file mode 100644
index 0000000000..da30e67bc3
--- /dev/null
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -0,0 +1,80 @@
+parameters:
+  # Enable install tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable install tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  # Determines whether the ESRP service connection information should be passed to the signing plugin.
+  # This overlaps with _SignType to some degree. We only need the service connection for real signing.
+  # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
+  # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
+  # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
+  # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
+  microbuildUseESRP: true
+  # Location of the MicroBuild output folder
+  microBuildOutputFolder: '$(Build.SourcesDirectory)'
+
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
+      # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
+      - task: UseDotNet@2
+        displayName: Install .NET 8.0 SDK for MicroBuild Plugin
+        inputs:
+          packageType: sdk
+          version: 8.0.x
+          installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
+          workingDirectory: ${{ parameters.microBuildOutputFolder }}
+        condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+
+    - script: |
+        REM Check if ESRP is disabled while SignType is real
+        if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
+          echo Error: ESRP must be enabled when SignType is real.
+          exit /b 1
+        )
+      displayName: 'Validate ESRP usage (Windows)'
+      condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
+    - script: |
+        # Check if ESRP is disabled while SignType is real
+        if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
+          echo "Error: ESRP must be enabled when SignType is real."
+          exit 1
+        fi
+      displayName: 'Validate ESRP usage (Non-Windows)'
+      condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+
+    - task: MicroBuildSigningPlugin@4
+      displayName: Install MicroBuild plugin
+      inputs:
+        signType: $(_SignType)
+        zipSources: false
+        feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+        ${{ if eq(parameters.microbuildUseESRP, true) }}:
+          ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
+            azureSubscription: 'MicroBuild Signing Task (DevDiv)'
+            useEsrpCli: true
+          ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
+            ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+          ${{ else }}:
+            ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
+      env:
+        TeamName: $(_TeamName)
+        MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      continueOnError: ${{ parameters.continueOnError }}
+      condition: and(
+        succeeded(),
+        or(
+          and(
+            eq(variables['Agent.Os'], 'Windows_NT'),
+            in(variables['_SignType'], 'real', 'test')
+          ),
+          and(
+            ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
+            ne(variables['Agent.Os'], 'Windows_NT'),
+            eq(variables['_SignType'], 'real')
+          )
+        ))
diff --git a/eng/common/core-templates/steps/publish-build-artifacts.yml b/eng/common/core-templates/steps/publish-build-artifacts.yml
new file mode 100644
index 0000000000..f24ce34668
--- /dev/null
+++ b/eng/common/core-templates/steps/publish-build-artifacts.yml
@@ -0,0 +1,20 @@
+parameters:
+- name: is1ESPipeline
+  type: boolean
+  default: false
+- name: args
+  type: object
+  default: {}
+steps:
+- ${{ if ne(parameters.is1ESPipeline, true) }}:
+  - template: /eng/common/templates/steps/publish-build-artifacts.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      ${{ each parameter in parameters.args }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
+- ${{ else }}:
+  - template: /eng/common/templates-official/steps/publish-build-artifacts.yml
+    parameters:
+      is1ESPipeline: ${{ parameters.is1ESPipeline }}
+      ${{ each parameter in parameters.args }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml
new file mode 100644
index 0000000000..de24d0087c
--- /dev/null
+++ b/eng/common/core-templates/steps/publish-logs.yml
@@ -0,0 +1,61 @@
+parameters:
+  StageLabel: ''
+  JobLabel: ''
+  CustomSensitiveDataList: ''
+  # A default - in case value from eng/common/core-templates/post-build/common-variables.yml is not passed
+  BinlogToolVersion: '1.0.11'
+  is1ESPipeline: false
+
+steps:
+- task: Powershell@2
+  displayName: Prepare Binlogs to Upload
+  inputs:
+    targetType: inline
+    script: |
+      New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
+      Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
+  continueOnError: true
+  condition: always()
+    
+- task: PowerShell@2
+  displayName: Redact Logs
+  inputs:
+    filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
+    # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
+    # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
+    #  If the file exists - sensitive data for redaction will be sourced from it
+    #  (single entry per line, lines starting with '# ' are considered comments and skipped)
+    arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' 
+      -BinlogToolVersion ${{parameters.BinlogToolVersion}}
+      -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
+      '$(publishing-dnceng-devdiv-code-r-build-re)'
+      '$(MaestroAccessToken)'
+      '$(dn-bot-all-orgs-artifact-feeds-rw)'
+      '$(akams-client-id)'
+      '$(microsoft-symbol-server-pat)'
+      '$(symweb-symbol-server-pat)'
+      '$(dnceng-symbol-server-pat)'
+      '$(dn-bot-all-orgs-build-rw-code-rw)'
+      '$(System.AccessToken)'
+      ${{parameters.CustomSensitiveDataList}}
+  continueOnError: true
+  condition: always()
+
+- task: CopyFiles@2
+  displayName: Gather post build logs
+  inputs:
+    SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs'
+    Contents: '**'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs'
+  condition: always()
+
+- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+  parameters:
+    is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    args:
+      displayName: Publish Logs
+      pathToPublish: '$(Build.ArtifactStagingDirectory)/PostBuildLogs'
+      publishLocation: Container
+      artifactName: PostBuildLogs
+      continueOnError: true
+      condition: always()
diff --git a/eng/common/core-templates/steps/publish-pipeline-artifacts.yml b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml
new file mode 100644
index 0000000000..2efec04dc2
--- /dev/null
+++ b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml
@@ -0,0 +1,20 @@
+parameters:
+- name: is1ESPipeline
+  type: boolean
+  default: false
+
+- name: args
+  type: object
+  default: {}  
+
+steps:
+- ${{ if ne(parameters.is1ESPipeline, true) }}:
+  - template: /eng/common/templates/steps/publish-pipeline-artifacts.yml
+    parameters:
+      ${{ each parameter in parameters }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
+- ${{ else }}:
+  - template: /eng/common/templates-official/steps/publish-pipeline-artifacts.yml
+    parameters:
+      ${{ each parameter in parameters }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/core-templates/steps/retain-build.yml b/eng/common/core-templates/steps/retain-build.yml
new file mode 100644
index 0000000000..83d97a26a0
--- /dev/null
+++ b/eng/common/core-templates/steps/retain-build.yml
@@ -0,0 +1,28 @@
+parameters:
+  # Optional azure devops PAT with build execute permissions for the build's organization,
+  # only needed if the build that should be retained ran on a different organization than 
+  # the pipeline where this template is executing from
+  Token: ''
+  # Optional BuildId to retain, defaults to the current running build
+  BuildId: ''
+  # Azure devops Organization URI for the build in the https://dev.azure.com/<organization> format.
+  # Defaults to the organization the current pipeline is running on
+  AzdoOrgUri: '$(System.CollectionUri)'
+  # Azure devops project for the build. Defaults to the project the current pipeline is running on
+  AzdoProject: '$(System.TeamProject)'
+
+steps:
+  - task: powershell@2
+    inputs:
+      targetType: 'filePath'
+      filePath: eng/common/retain-build.ps1
+      pwsh: true
+      arguments: >
+        -AzdoOrgUri: ${{parameters.AzdoOrgUri}}
+        -AzdoProject ${{parameters.AzdoProject}}
+        -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }}
+        -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}}
+    displayName: Enable permanent build retention
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      BUILD_ID: $(Build.BuildId)
\ No newline at end of file
diff --git a/eng/common/core-templates/steps/send-to-helix.yml b/eng/common/core-templates/steps/send-to-helix.yml
new file mode 100644
index 0000000000..68fa739c4a
--- /dev/null
+++ b/eng/common/core-templates/steps/send-to-helix.yml
@@ -0,0 +1,93 @@
+# Please remember to update the documentation if you make changes to these parameters!
+parameters:
+  HelixSource: 'pr/default'              # required -- sources must start with pr/, official/, prodcon/, or agent/
+  HelixType: 'tests/default/'            # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
+  HelixBuild: $(Build.BuildNumber)       # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
+  HelixTargetQueues: ''                  # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
+  HelixAccessToken: ''                   # required -- access token to make Helix API requests; should be provided by the appropriate variable group
+  HelixProjectPath: 'eng/common/helixpublish.proj'  # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY
+  HelixProjectArguments: ''              # optional -- arguments passed to the build command
+  HelixConfiguration: ''                 # optional -- additional property attached to a job
+  HelixPreCommands: ''                   # optional -- commands to run before Helix work item execution
+  HelixPostCommands: ''                  # optional -- commands to run after Helix work item execution
+  WorkItemDirectory: ''                  # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
+  WorkItemCommand: ''                    # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
+  WorkItemTimeout: ''                    # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
+  CorrelationPayloadDirectory: ''        # optional -- a directory to zip up and send to Helix as a correlation payload
+  XUnitProjects: ''                      # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
+  XUnitWorkItemTimeout: ''               # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects
+  XUnitPublishTargetFramework: ''        # optional -- framework to use to publish your xUnit projects
+  XUnitRuntimeTargetFramework: ''        # optional -- framework to use for the xUnit console runner
+  XUnitRunnerVersion: ''                 # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
+  IncludeDotNetCli: false                # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
+  DotNetCliPackageType: ''               # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
+  DotNetCliVersion: ''                   # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
+  WaitForWorkItemCompletion: true        # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
+  IsExternal: false                      # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
+  HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
+  Creator: ''                            # optional -- if the build is external, use this to specify who is sending the job
+  DisplayNamePrefix: 'Run Tests'         # optional -- rename the beginning of the displayName of the steps in AzDO 
+  condition: succeeded()                 # optional -- condition for step to execute; defaults to succeeded()
+  continueOnError: false                 # optional -- determines whether to continue the build if the step errors; defaults to false
+
+steps:
+  - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
+    displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
+    env:
+      BuildConfig: $(_BuildConfig)
+      HelixSource: ${{ parameters.HelixSource }}
+      HelixType: ${{ parameters.HelixType }}
+      HelixBuild: ${{ parameters.HelixBuild }}
+      HelixConfiguration:  ${{ parameters.HelixConfiguration }}
+      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
+      HelixAccessToken: ${{ parameters.HelixAccessToken }}
+      HelixPreCommands: ${{ parameters.HelixPreCommands }}
+      HelixPostCommands: ${{ parameters.HelixPostCommands }}
+      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
+      WorkItemCommand: ${{ parameters.WorkItemCommand }}
+      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
+      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
+      XUnitProjects: ${{ parameters.XUnitProjects }}
+      XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }}
+      XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
+      XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }}
+      XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
+      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
+      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
+      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
+      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
+      HelixBaseUri: ${{ parameters.HelixBaseUri }}
+      Creator: ${{ parameters.Creator }}
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
+    continueOnError: ${{ parameters.continueOnError }}
+  - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
+    displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
+    env:
+      BuildConfig: $(_BuildConfig)
+      HelixSource: ${{ parameters.HelixSource }}
+      HelixType: ${{ parameters.HelixType }}
+      HelixBuild: ${{ parameters.HelixBuild }}
+      HelixConfiguration:  ${{ parameters.HelixConfiguration }}
+      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
+      HelixAccessToken: ${{ parameters.HelixAccessToken }}
+      HelixPreCommands: ${{ parameters.HelixPreCommands }}
+      HelixPostCommands: ${{ parameters.HelixPostCommands }}
+      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
+      WorkItemCommand: ${{ parameters.WorkItemCommand }}
+      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
+      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
+      XUnitProjects: ${{ parameters.XUnitProjects }}
+      XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }}
+      XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
+      XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }}
+      XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
+      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
+      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
+      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
+      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
+      HelixBaseUri: ${{ parameters.HelixBaseUri }}
+      Creator: ${{ parameters.Creator }}
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT'))
+    continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
new file mode 100644
index 0000000000..acf16ed349
--- /dev/null
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -0,0 +1,65 @@
+parameters:
+  # This template adds arcade-powered source-build to CI.
+
+  # This is a 'steps' template, and is intended for advanced scenarios where the existing build
+  # infra has a careful build methodology that must be followed. For example, a repo
+  # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline
+  # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to
+  # GitHub. Using this steps template leaves room for that infra to be included.
+
+  # Defines the platform on which to run the steps. See 'eng/common/core-templates/job/source-build.yml'
+  # for details. The entire object is described in the 'job' template for simplicity, even though
+  # the usage of the properties on this object is split between the 'job' and 'steps' templates.
+  platform: {}
+  is1ESPipeline: false
+
+steps:
+# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
+- script: |
+    set -x
+    df -h
+
+    # If building on the internal project, the internal storage variable may be available (usually only if needed)
+    # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
+    # in the default public locations.
+    internalRuntimeDownloadArgs=
+    if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
+      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
+    fi
+
+    buildConfig=Release
+    # Check if AzDO substitutes in a build config from a variable, and use it if so.
+    if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then
+      buildConfig='$(_BuildConfig)'
+    fi
+
+    targetRidArgs=
+    if [ '${{ parameters.platform.targetRID }}' != '' ]; then
+      targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
+    fi
+
+    portableBuildArgs=
+    if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
+      portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
+    fi
+
+    ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
+      --configuration $buildConfig \
+      --restore --build --pack -bl \
+      --source-build \
+      ${{ parameters.platform.buildArguments }} \
+      $internalRuntimeDownloadArgs \
+      $targetRidArgs \
+      $portableBuildArgs \
+  displayName: Build
+
+- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+  parameters:
+    is1ESPipeline: ${{ parameters.is1ESPipeline }}
+    args:
+      displayName: Publish BuildLogs
+      targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
+      artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
+      continueOnError: true
+      condition: succeededOrFailed()
+      sbomEnabled: false  # we don't need SBOM for logs
diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
new file mode 100644
index 0000000000..c2917c1efc
--- /dev/null
+++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -0,0 +1,35 @@
+parameters:
+  sourceIndexUploadPackageVersion: 2.0.0-20250425.2
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
+  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
+  binlogPath: artifacts/log/Debug/Build.binlog
+
+steps:
+- task: UseDotNet@2
+  displayName: "Source Index: Use .NET 9 SDK"
+  inputs:
+    packageType: sdk
+    version: 9.0.x
+    installationPath: $(Agent.TempDirectory)/dotnet
+    workingDirectory: $(Agent.TempDirectory)
+
+- script: |
+    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+  displayName: "Source Index: Download netsourceindex Tools"
+  # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
+  workingDirectory: $(Agent.TempDirectory)
+
+- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
+  displayName: "Source Index: Process Binlog into indexable sln"
+
+- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - task: AzureCLI@2
+    displayName: "Source Index: Upload Source Index stage1 artifacts to Azure"
+    inputs:
+      azureSubscription: 'SourceDotNet Stage1 Publish'
+      addSpnToEnvironment: true
+      scriptType: 'ps'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
diff --git a/eng/common/core-templates/variables/pool-providers.yml b/eng/common/core-templates/variables/pool-providers.yml
new file mode 100644
index 0000000000..41053d382a
--- /dev/null
+++ b/eng/common/core-templates/variables/pool-providers.yml
@@ -0,0 +1,8 @@
+parameters:
+  is1ESPipeline: false
+
+variables:
+  - ${{ if eq(parameters.is1ESPipeline, 'true') }}:
+    - template: /eng/common/templates-official/variables/pool-providers.yml
+  - ${{ else }}:
+    - template: /eng/common/templates/variables/pool-providers.yml
\ No newline at end of file
diff --git a/eng/common/cross/arm/sources.list.bionic b/eng/common/cross/arm/sources.list.bionic
deleted file mode 100644
index 2109557409..0000000000
--- a/eng/common/cross/arm/sources.list.bionic
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
diff --git a/eng/common/cross/arm/sources.list.jessie b/eng/common/cross/arm/sources.list.jessie
deleted file mode 100644
index 4d142ac9b1..0000000000
--- a/eng/common/cross/arm/sources.list.jessie
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debian (sid)   # UNSTABLE
-deb http://ftp.debian.org/debian/ sid main contrib non-free
-deb-src http://ftp.debian.org/debian/ sid main contrib non-free
diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial
deleted file mode 100644
index eacd86b7df..0000000000
--- a/eng/common/cross/arm/sources.list.xenial
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm/sources.list.zesty b/eng/common/cross/arm/sources.list.zesty
deleted file mode 100644
index ea2c14a787..0000000000
--- a/eng/common/cross/arm/sources.list.zesty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch
new file mode 100644
index 0000000000..fb12ade725
--- /dev/null
+++ b/eng/common/cross/arm/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf32-littlearm)
+-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-armhf.so.3 ) )
diff --git a/eng/common/cross/arm64/sources.list.bionic b/eng/common/cross/arm64/sources.list.bionic
deleted file mode 100644
index 2109557409..0000000000
--- a/eng/common/cross/arm64/sources.list.bionic
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
diff --git a/eng/common/cross/arm64/sources.list.buster b/eng/common/cross/arm64/sources.list.buster
deleted file mode 100644
index 7194ac64a9..0000000000
--- a/eng/common/cross/arm64/sources.list.buster
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian buster main
-deb-src http://deb.debian.org/debian buster main
-
-deb http://deb.debian.org/debian-security/ buster/updates main
-deb-src http://deb.debian.org/debian-security/ buster/updates main
-
-deb http://deb.debian.org/debian buster-updates main
-deb-src http://deb.debian.org/debian buster-updates main
-
-deb http://deb.debian.org/debian buster-backports main contrib non-free
-deb-src http://deb.debian.org/debian buster-backports main contrib non-free
diff --git a/eng/common/cross/arm64/sources.list.stretch b/eng/common/cross/arm64/sources.list.stretch
deleted file mode 100644
index 0e12157743..0000000000
--- a/eng/common/cross/arm64/sources.list.stretch
+++ /dev/null
@@ -1,12 +0,0 @@
-deb http://deb.debian.org/debian stretch main
-deb-src http://deb.debian.org/debian stretch main
-
-deb http://deb.debian.org/debian-security/ stretch/updates main
-deb-src http://deb.debian.org/debian-security/ stretch/updates main
-
-deb http://deb.debian.org/debian stretch-updates main
-deb-src http://deb.debian.org/debian stretch-updates main
-
-deb http://deb.debian.org/debian stretch-backports main contrib non-free
-deb-src http://deb.debian.org/debian stretch-backports main contrib non-free
-
diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial
deleted file mode 100644
index eacd86b7df..0000000000
--- a/eng/common/cross/arm64/sources.list.xenial
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
\ No newline at end of file
diff --git a/eng/common/cross/arm64/sources.list.zesty b/eng/common/cross/arm64/sources.list.zesty
deleted file mode 100644
index ea2c14a787..0000000000
--- a/eng/common/cross/arm64/sources.list.zesty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
diff --git a/eng/common/cross/arm64/tizen-build-rootfs.sh b/eng/common/cross/arm64/tizen-build-rootfs.sh
deleted file mode 100644
index 13bfddb5e2..0000000000
--- a/eng/common/cross/arm64/tizen-build-rootfs.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-__TIZEN_CROSSDIR="$__CrossDir/tizen"
-
-if [[ -z "$ROOTFS_DIR" ]]; then
-    echo "ROOTFS_DIR is not defined."
-    exit 1;
-fi
-
-TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
-mkdir -p $TIZEN_TMP_DIR
-
-# Download files
-echo ">>Start downloading files"
-VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
-echo "<<Finish downloading files"
-
-echo ">>Start constructing Tizen rootfs"
-TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
-cd $ROOTFS_DIR
-for f in $TIZEN_RPM_FILES; do
-    rpm2cpio $f  | cpio -idm --quiet
-done
-echo "<<Finish constructing Tizen rootfs"
-
-# Cleanup tmp
-rm -rf $TIZEN_TMP_DIR
-
-# Configure Tizen rootfs
-echo ">>Start configuring Tizen rootfs"
-ln -sfn asm-arm64 ./usr/include/asm
-patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
-echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/arm64/tizen-fetch.sh b/eng/common/cross/arm64/tizen-fetch.sh
deleted file mode 100644
index 16d1301f21..0000000000
--- a/eng/common/cross/arm64/tizen-fetch.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
-	VERBOSE=0
-fi
-
-Log()
-{
-	if [ $VERBOSE -ge $1 ]; then
-		echo ${@:2}
-	fi
-}
-
-Inform()
-{
-	Log 1 -e "\x1B[0;34m$@\x1B[m"
-}
-
-Debug()
-{
-	Log 2 -e "\x1B[0;32m$@\x1B[m"
-}
-
-Error()
-{
-	>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
-}
-
-Fetch()
-{
-	URL=$1
-	FILE=$2
-	PROGRESS=$3
-	if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
-		CURL_OPT="--progress-bar"
-	else
-		CURL_OPT="--silent"
-	fi
-	curl $CURL_OPT $URL > $FILE
-}
-
-hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
-hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
-hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
-
-TMPDIR=$1
-if [ ! -d $TMPDIR ]; then
-	TMPDIR=./tizen_tmp
-	Debug "Create temporary directory : $TMPDIR"
-	mkdir -p $TMPDIR
-fi
-
-TIZEN_URL=http://download.tizen.org/snapshots/tizen/
-BUILD_XML=build.xml
-REPOMD_XML=repomd.xml
-PRIMARY_XML=primary.xml
-TARGET_URL="http://__not_initialized"
-
-Xpath_get()
-{
-	XPATH_RESULT=''
-	XPATH=$1
-	XML_FILE=$2
-	RESULT=$(xmllint --xpath $XPATH $XML_FILE)
-	if [[ -z ${RESULT// } ]]; then
-		Error "Can not find target from $XML_FILE"
-		Debug "Xpath = $XPATH"
-		exit 1
-	fi
-	XPATH_RESULT=$RESULT
-}
-
-fetch_tizen_pkgs_init()
-{
-	TARGET=$1
-	PROFILE=$2
-	Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
-
-	TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
-	if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
-	mkdir -p $TMP_PKG_DIR
-
-	PKG_URL=$TIZEN_URL/$PROFILE/latest
-
-	BUILD_XML_URL=$PKG_URL/$BUILD_XML
-	TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
-	TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
-	TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
-	TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
-
-	Fetch $BUILD_XML_URL $TMP_BUILD
-
-	Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
-
-	TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
-	Xpath_get $TARGET_XPATH $TMP_BUILD
-	TARGET_PATH=$XPATH_RESULT
-	TARGET_URL=$PKG_URL/$TARGET_PATH
-
-	REPOMD_URL=$TARGET_URL/repodata/repomd.xml
-	PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
-
-	Fetch $REPOMD_URL $TMP_REPOMD
-
-	Debug "fetch $REPOMD_URL to $TMP_REPOMD"
-
-	Xpath_get $PRIMARY_XPATH $TMP_REPOMD
-	PRIMARY_XML_PATH=$XPATH_RESULT
-	PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
-
-	Fetch $PRIMARY_URL $TMP_PRIMARYGZ
-
-	Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
-
-	gunzip $TMP_PRIMARYGZ
-
-	Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
-}
-
-fetch_tizen_pkgs()
-{
-	ARCH=$1
-	PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
-
-	PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
-
-	for pkg in ${@:2}
-	do
-		Inform "Fetching... $pkg"
-		XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
-		XPATH=${XPATH/_ARCH_/$ARCH}
-		Xpath_get $XPATH $TMP_PRIMARY
-		PKG_PATH=$XPATH_RESULT
-
-		XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
-		XPATH=${XPATH/_ARCH_/$ARCH}
-		Xpath_get $XPATH $TMP_PRIMARY
-		CHECKSUM=$XPATH_RESULT
-
-		PKG_URL=$TARGET_URL/$PKG_PATH
-		PKG_FILE=$(basename $PKG_PATH)
-		PKG_PATH=$TMPDIR/$PKG_FILE
-
-		Debug "Download $PKG_URL to $PKG_PATH"
-		Fetch $PKG_URL $PKG_PATH true
-
-		echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
-		if [ $? -ne 0 ]; then
-			Error "Fail to fetch $PKG_URL to $PKG_PATH"
-			Debug "Checksum = $CHECKSUM"
-			exit 1
-		fi
-	done
-}
-
-Inform "Initialize arm base"
-fetch_tizen_pkgs_init standard base
-Inform "fetch common packages"
-fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
-Inform "fetch coreclr packages"
-fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
-Inform "fetch corefx packages"
-fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
-
-Inform "Initialize standard unified"
-fetch_tizen_pkgs_init standard unified
-Inform "fetch corefx packages"
-fetch_tizen_pkgs aarch64 gssdp gssdp-devel tizen-release
-
diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch
index af7c8be059..2cebc54738 100644
--- a/eng/common/cross/arm64/tizen/tizen.patch
+++ b/eng/common/cross/arm64/tizen/tizen.patch
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
     Use the shared library, but some functions are only in
     the static library, so try that secondarily.  */
  OUTPUT_FORMAT(elf64-littleaarch64)
--GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
 +GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-aarch64.so.1 ) )
diff --git a/eng/common/cross/armel/armel.jessie.patch b/eng/common/cross/armel/armel.jessie.patch
deleted file mode 100644
index 2d26156193..0000000000
--- a/eng/common/cross/armel/armel.jessie.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
---- a/usr/include/urcu/uatomic/generic.h	2014-10-22 15:00:58.000000000 -0700
-+++ b/usr/include/urcu/uatomic/generic.h	2020-10-30 21:38:28.550000000 -0700
-@@ -69,10 +69,10 @@
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_val_compare_and_swap_2(addr, old, _new);
-+		return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new);
- #endif
- 	case 4:
--		return __sync_val_compare_and_swap_4(addr, old, _new);
-+		return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
- 		return __sync_val_compare_and_swap_8(addr, old, _new);
-@@ -109,7 +109,7 @@
- 		return;
- #endif
- 	case 4:
--		__sync_and_and_fetch_4(addr, val);
-+		__sync_and_and_fetch_4((uint32_t*) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
-@@ -148,7 +148,7 @@
- 		return;
- #endif
- 	case 4:
--		__sync_or_and_fetch_4(addr, val);
-+		__sync_or_and_fetch_4((uint32_t*) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
-@@ -187,7 +187,7 @@
- 		return __sync_add_and_fetch_2(addr, val);
- #endif
- 	case 4:
--		return __sync_add_and_fetch_4(addr, val);
-+		return __sync_add_and_fetch_4((uint32_t*) addr, val);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
- 		return __sync_add_and_fetch_8(addr, val);
diff --git a/eng/common/cross/armel/sources.list.jessie b/eng/common/cross/armel/sources.list.jessie
deleted file mode 100644
index 3d9c3059d8..0000000000
--- a/eng/common/cross/armel/sources.list.jessie
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debian (jessie)   # Stable
-deb http://ftp.debian.org/debian/ jessie main contrib non-free
-deb-src http://ftp.debian.org/debian/ jessie main contrib non-free
diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh
deleted file mode 100644
index 9a4438af61..0000000000
--- a/eng/common/cross/armel/tizen-build-rootfs.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-__ARM_SOFTFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-__TIZEN_CROSSDIR="$__ARM_SOFTFP_CrossDir/tizen"
-
-if [[ -z "$ROOTFS_DIR" ]]; then
-    echo "ROOTFS_DIR is not defined."
-    exit 1;
-fi
-
-TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
-mkdir -p $TIZEN_TMP_DIR
-
-# Download files
-echo ">>Start downloading files"
-VERBOSE=1 $__ARM_SOFTFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
-echo "<<Finish downloading files"
-
-echo ">>Start constructing Tizen rootfs"
-TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
-cd $ROOTFS_DIR
-for f in $TIZEN_RPM_FILES; do
-    rpm2cpio $f  | cpio -idm --quiet
-done
-echo "<<Finish constructing Tizen rootfs"
-
-# Cleanup tmp
-rm -rf $TIZEN_TMP_DIR
-
-# Configure Tizen rootfs
-echo ">>Start configuring Tizen rootfs"
-ln -sfn asm-arm ./usr/include/asm
-patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
-echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh
deleted file mode 100644
index 64f0187e5a..0000000000
--- a/eng/common/cross/armel/tizen-fetch.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
-	VERBOSE=0
-fi
-
-Log()
-{
-	if [ $VERBOSE -ge $1 ]; then
-		echo ${@:2}
-	fi
-}
-
-Inform()
-{
-	Log 1 -e "\x1B[0;34m$@\x1B[m"
-}
-
-Debug()
-{
-	Log 2 -e "\x1B[0;32m$@\x1B[m"
-}
-
-Error()
-{
-	>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
-}
-
-Fetch()
-{
-	URL=$1
-	FILE=$2
-	PROGRESS=$3
-	if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
-		CURL_OPT="--progress-bar"
-	else
-		CURL_OPT="--silent"
-	fi
-	curl $CURL_OPT $URL > $FILE
-}
-
-hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
-hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
-hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
-
-TMPDIR=$1
-if [ ! -d $TMPDIR ]; then
-	TMPDIR=./tizen_tmp
-	Debug "Create temporary directory : $TMPDIR"
-	mkdir -p $TMPDIR 
-fi
-
-TIZEN_URL=http://download.tizen.org/snapshots/tizen
-BUILD_XML=build.xml
-REPOMD_XML=repomd.xml
-PRIMARY_XML=primary.xml
-TARGET_URL="http://__not_initialized"
-
-Xpath_get()
-{
-	XPATH_RESULT=''
-	XPATH=$1
-	XML_FILE=$2
-	RESULT=$(xmllint --xpath $XPATH $XML_FILE)
-	if [[ -z ${RESULT// } ]]; then
-		Error "Can not find target from $XML_FILE"
-		Debug "Xpath = $XPATH"
-		exit 1
-	fi
-	XPATH_RESULT=$RESULT
-}
-
-fetch_tizen_pkgs_init()
-{
-	TARGET=$1
-	PROFILE=$2
-	Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
-
-	TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
-	if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
-	mkdir -p $TMP_PKG_DIR
-
-	PKG_URL=$TIZEN_URL/$PROFILE/latest
-
-	BUILD_XML_URL=$PKG_URL/$BUILD_XML
-	TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
-	TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
-	TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
-	TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
-
-	Fetch $BUILD_XML_URL $TMP_BUILD
-
-	Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
-
-	TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
-	Xpath_get $TARGET_XPATH $TMP_BUILD
-	TARGET_PATH=$XPATH_RESULT
-	TARGET_URL=$PKG_URL/$TARGET_PATH
-
-	REPOMD_URL=$TARGET_URL/repodata/repomd.xml
-	PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
-
-	Fetch $REPOMD_URL $TMP_REPOMD
-
-	Debug "fetch $REPOMD_URL to $TMP_REPOMD"
-
-	Xpath_get $PRIMARY_XPATH $TMP_REPOMD
-	PRIMARY_XML_PATH=$XPATH_RESULT
-	PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
-
-	Fetch $PRIMARY_URL $TMP_PRIMARYGZ
-
-	Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
-
-	gunzip $TMP_PRIMARYGZ 
-
-	Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" 
-}
-
-fetch_tizen_pkgs()
-{
-	ARCH=$1
-	PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
-
-	PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
-
-	for pkg in ${@:2}
-	do
-		Inform "Fetching... $pkg"
-		XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
-		XPATH=${XPATH/_ARCH_/$ARCH}
-		Xpath_get $XPATH $TMP_PRIMARY
-		PKG_PATH=$XPATH_RESULT
-
-		XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
-		XPATH=${XPATH/_ARCH_/$ARCH}
-		Xpath_get $XPATH $TMP_PRIMARY
-		CHECKSUM=$XPATH_RESULT
-
-		PKG_URL=$TARGET_URL/$PKG_PATH
-		PKG_FILE=$(basename $PKG_PATH)
-		PKG_PATH=$TMPDIR/$PKG_FILE
-
-		Debug "Download $PKG_URL to $PKG_PATH"
-		Fetch $PKG_URL $PKG_PATH true
-
-		echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
-		if [ $? -ne 0 ]; then
-			Error "Fail to fetch $PKG_URL to $PKG_PATH"
-			Debug "Checksum = $CHECKSUM"
-			exit 1
-		fi
-	done
-}
-
-Inform "Initialize arm base"
-fetch_tizen_pkgs_init standard base
-Inform "fetch common packages"
-fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
-Inform "fetch coreclr packages"
-fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
-Inform "fetch corefx packages"
-fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
-
-Inform "Initialize standard unified"
-fetch_tizen_pkgs_init standard unified
-Inform "fetch corefx packages"
-fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release
-
diff --git a/eng/common/cross/armel/tizen/tizen-dotnet.ks b/eng/common/cross/armel/tizen/tizen-dotnet.ks
deleted file mode 100644
index 506d455bd4..0000000000
--- a/eng/common/cross/armel/tizen/tizen-dotnet.ks
+++ /dev/null
@@ -1,50 +0,0 @@
-lang en_US.UTF-8
-keyboard us
-timezone --utc Asia/Seoul
-
-part / --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label rootfs --fsoptions=defaults,noatime
-
-rootpw tizen
-desktop --autologinuser=root
-user --name root  --groups audio,video --password 'tizen'
-
-repo --name=standard  --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ --ssl_verify=no
-repo --name=base      --baseurl=http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --ssl_verify=no
-
-%packages
-tar
-gzip
-
-sed
-grep
-gawk
-perl
-
-binutils
-findutils
-util-linux
-lttng-ust
-userspace-rcu
-procps-ng
-tzdata
-ca-certificates
-
-
-### Core FX
-libicu
-libunwind
-iputils
-zlib
-krb5
-libcurl
-libopenssl
-
-%end
-
-%post
-
-### Update /tmp privilege
-chmod 777 /tmp
-####################################
-
-%end
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
index 42516bbeeb..fbd8d80848 100644
--- a/eng/common/cross/build-android-rootfs.sh
+++ b/eng/common/cross/build-android-rootfs.sh
@@ -5,15 +5,16 @@ __NDK_Version=r21
 usage()
 {
     echo "Creates a toolchain and sysroot used for cross-compiling for Android."
-    echo.
-    echo "Usage: $0 [BuildArch] [ApiLevel]"
-    echo.
+    echo
+    echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]"
+    echo
     echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
     echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
-    echo.
+    echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history"
+    echo
     echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
     echo "by setting the TOOLCHAIN_DIR environment variable"
-    echo.
+    echo
     echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation,"
     echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK."
     echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android."
@@ -25,10 +26,15 @@ __BuildArch=arm64
 __AndroidArch=aarch64
 __AndroidToolchain=aarch64-linux-android
 
-for i in "$@"
-    do
-        lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
-        case $lowerI in
+while :; do
+    if [[ "$#" -le 0 ]]; then
+        break
+    fi
+
+    i=$1
+
+    lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
+    case $lowerI in
         -?|-h|--help)
             usage
             exit 1
@@ -43,6 +49,10 @@ for i in "$@"
             __AndroidArch=arm
             __AndroidToolchain=arm-linux-androideabi
             ;;
+        --ndk)
+            shift
+            __NDK_Version=$1
+            ;;
         *[0-9])
             __ApiLevel=$i
             ;;
@@ -50,8 +60,17 @@ for i in "$@"
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
             ;;
     esac
+    shift
 done
 
+if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then
+    __NDK_File_Arch_Spec=-x86_64
+    __SysRoot=sysroot
+else
+    __NDK_File_Arch_Spec=
+    __SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot
+fi
+
 # Obtain the location of the bash script to figure out where the root of the repo is.
 __ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -78,6 +97,7 @@ fi
 
 echo "Target API level: $__ApiLevel"
 echo "Target architecture: $__BuildArch"
+echo "NDK version: $__NDK_Version"
 echo "NDK location: $__NDK_Dir"
 echo "Target Toolchain location: $__ToolchainDir"
 
@@ -85,8 +105,8 @@ echo "Target Toolchain location: $__ToolchainDir"
 if [ ! -d $__NDK_Dir ]; then
     echo Downloading the NDK into $__NDK_Dir
     mkdir -p $__NDK_Dir
-    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip
-    unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir
+    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip
+    unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir
 fi
 
 if [ ! -d $__lldb_Dir ]; then
@@ -107,25 +127,20 @@ __AndroidPackages+=" liblzma"
 __AndroidPackages+=" krb5"
 __AndroidPackages+=" openssl"
 
-for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\
+for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/main/binary-$__AndroidArch/Packages |\
     grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do
 
     if [[ "$path" != "Filename:" ]]; then
         echo "Working on: $path"
-        wget -qO- http://termux.net/$path | dpkg -x - "$__TmpDir"
+        wget -qO- https://packages.termux.dev/termux-main-21/$path | dpkg -x - "$__TmpDir"
     fi
 done
 
-cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/"
+cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/"
 
 # Generate platform file for build.sh script to assign to __DistroRid
 echo "Generating platform file..."
-echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform
-
-echo "Now to build coreclr, libraries and installers; run:"
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory coreclr
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory libraries
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory installer
+echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform
+
+echo "Now to build coreclr, libraries and host; run:"
+echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 6fa2c8aa55..8abfb71f72 100644
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -4,25 +4,35 @@ set -e
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
-    echo "BuildArch can be: arm(default), armel, arm64, x86"
-    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
-    echo "                              for FreeBSD can be: freebsd11, freebsd12, freebsd13"
-    echo "                              for illumos can be: illumos."
+    echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
+    echo "BuildArch can be: arm(default), arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64, x86"
+    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
+    echo "                               for alpine can be specified with version: alpineX.YY or alpineedge"
+    echo "                               for FreeBSD can be: freebsd13, freebsd14"
+    echo "                               for illumos can be: illumos"
+    echo "                               for Haiku can be: haiku."
     echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
+    echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
+    echo "--skipsigcheck - optional, will skip package signature checks (allowing untrusted packages)."
+    echo "--skipemulation - optional, will skip qemu and debootstrap requirement when building environment for debian based systems."
     echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
+    echo "--jobs N - optional, restrict to N jobs."
     exit 1
 }
 
 __CodeName=xenial
 __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-__InitialDir=$PWD
 __BuildArch=arm
 __AlpineArch=armv7
+__FreeBSDArch=arm
+__FreeBSDMachineArch=armv7
+__IllumosArch=arm7
+__HaikuArch=arm
 __QEMUArch=arm
 __UbuntuArch=armhf
-__UbuntuRepo="http://ports.ubuntu.com/"
+__UbuntuRepo=
+__UbuntuSuites="updates security backports"
 __LLDB_Package="liblldb-3.9-dev"
 __SkipUnmount=0
 
@@ -39,7 +49,7 @@ __AlpinePackages+=" libedit"
 # symlinks fixer
 __UbuntuPackages+=" symlinks"
 
-# CoreCLR and CoreFX dependencies
+# runtime dependencies
 __UbuntuPackages+=" libicu-dev"
 __UbuntuPackages+=" liblttng-ust-dev"
 __UbuntuPackages+=" libunwind8-dev"
@@ -48,50 +58,94 @@ __AlpinePackages+=" gettext-dev"
 __AlpinePackages+=" icu-dev"
 __AlpinePackages+=" libunwind-dev"
 __AlpinePackages+=" lttng-ust-dev"
+__AlpinePackages+=" compiler-rt"
 
-# CoreFX dependencies
+# runtime libraries' dependencies
 __UbuntuPackages+=" libcurl4-openssl-dev"
 __UbuntuPackages+=" libkrb5-dev"
 __UbuntuPackages+=" libssl-dev"
 __UbuntuPackages+=" zlib1g-dev"
+__UbuntuPackages+=" libbrotli-dev"
 
 __AlpinePackages+=" curl-dev"
 __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
 
-__FreeBSDBase="12.2-RELEASE"
-__FreeBSDPkg="1.12.0"
-__FreeBSDABI="12"
+__FreeBSDBase="13.4-RELEASE"
+__FreeBSDPkg="1.21.3"
+__FreeBSDABI="13"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
 __FreeBSDPackages+=" libinotify"
-__FreeBSDPackages+=" lttng-ust"
+__FreeBSDPackages+=" openssl"
 __FreeBSDPackages+=" krb5"
 __FreeBSDPackages+=" terminfo-db"
 
-__IllumosPackages="icu-64.2nb2"
-__IllumosPackages+=" mit-krb5-1.16.2nb4"
-__IllumosPackages+=" openssl-1.1.1e"
-__IllumosPackages+=" zlib-1.2.11"
+__IllumosPackages="icu"
+__IllumosPackages+=" mit-krb5"
+__IllumosPackages+=" openssl"
+__IllumosPackages+=" zlib"
+
+__HaikuPackages="gcc_syslibs"
+__HaikuPackages+=" gcc_syslibs_devel"
+__HaikuPackages+=" gmp"
+__HaikuPackages+=" gmp_devel"
+__HaikuPackages+=" icu[0-9]+"
+__HaikuPackages+=" icu[0-9]*_devel"
+__HaikuPackages+=" krb5"
+__HaikuPackages+=" krb5_devel"
+__HaikuPackages+=" libiconv"
+__HaikuPackages+=" libiconv_devel"
+__HaikuPackages+=" llvm[0-9]*_libunwind"
+__HaikuPackages+=" llvm[0-9]*_libunwind_devel"
+__HaikuPackages+=" mpfr"
+__HaikuPackages+=" mpfr_devel"
+__HaikuPackages+=" openssl3"
+__HaikuPackages+=" openssl3_devel"
+__HaikuPackages+=" zlib"
+__HaikuPackages+=" zlib_devel"
 
 # ML.NET dependencies
 __UbuntuPackages+=" libomp5"
 __UbuntuPackages+=" libomp-dev"
 
+# Taken from https://github.com/alpinelinux/alpine-chroot-install/blob/6d08f12a8a70dd9b9dc7d997c88aa7789cc03c42/alpine-chroot-install#L85-L133
+__AlpineKeys='
+4a6a0840:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe\nqxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O\nQ0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA\njixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R\nL5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo\nGuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B\nywIDAQAB
+5243ef4b:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+\nmTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy\nDO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K\naA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G\nmnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0\nsS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg\ncQIDAQAB
+524d27bb:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr8s1q88XpuJWLCZALdKj\nlN8wg2ePB2T9aIcaxryYE/Jkmtu+ZQ5zKq6BT3y/udt5jAsMrhHTwroOjIsF9DeG\ne8Y3vjz+Hh4L8a7hZDaw8jy3CPag47L7nsZFwQOIo2Cl1SnzUc6/owoyjRU7ab0p\niWG5HK8IfiybRbZxnEbNAfT4R53hyI6z5FhyXGS2Ld8zCoU/R4E1P0CUuXKEN4p0\n64dyeUoOLXEWHjgKiU1mElIQj3k/IF02W89gDj285YgwqA49deLUM7QOd53QLnx+\nxrIrPv3A+eyXMFgexNwCKQU9ZdmWa00MjjHlegSGK8Y2NPnRoXhzqSP9T9i2HiXL\nVQIDAQAB
+5261cecb:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0\ncGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX\nyHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j\ng01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB\nCa1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY\nsWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw\nwwIDAQAB
+58199dcc:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3v8/ye/V/t5xf4JiXLXa\nhWFRozsnmn3hobON20GdmkrzKzO/eUqPOKTpg2GtvBhK30fu5oY5uN2ORiv2Y2ht\neLiZ9HVz3XP8Fm9frha60B7KNu66FO5P2o3i+E+DWTPqqPcCG6t4Znk2BypILcit\nwiPKTsgbBQR2qo/cO01eLLdt6oOzAaF94NH0656kvRewdo6HG4urbO46tCAizvCR\nCA7KGFMyad8WdKkTjxh8YLDLoOCtoZmXmQAiwfRe9pKXRH/XXGop8SYptLqyVVQ+\ntegOD9wRs2tOlgcLx4F/uMzHN7uoho6okBPiifRX+Pf38Vx+ozXh056tjmdZkCaV\naQIDAQAB
+58cbb476:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoSPnuAGKtRIS5fEgYPXD\n8pSGvKAmIv3A08LBViDUe+YwhilSHbYXUEAcSH1KZvOo1WT1x2FNEPBEFEFU1Eyc\n+qGzbA03UFgBNvArurHQ5Z/GngGqE7IarSQFSoqewYRtFSfp+TL9CUNBvM0rT7vz\n2eMu3/wWG+CBmb92lkmyWwC1WSWFKO3x8w+Br2IFWvAZqHRt8oiG5QtYvcZL6jym\nY8T6sgdDlj+Y+wWaLHs9Fc+7vBuyK9C4O1ORdMPW15qVSl4Lc2Wu1QVwRiKnmA+c\nDsH/m7kDNRHM7TjWnuj+nrBOKAHzYquiu5iB3Qmx+0gwnrSVf27Arc3ozUmmJbLj\nzQIDAQAB
+58e4f17d:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBxJN9ErBgdRcPr5g4hV\nqyUSGZEKuvQliq2Z9SRHLh2J43+EdB6A+yzVvLnzcHVpBJ+BZ9RV30EM9guck9sh\nr+bryZcRHyjG2wiIEoduxF2a8KeWeQH7QlpwGhuobo1+gA8L0AGImiA6UP3LOirl\nI0G2+iaKZowME8/tydww4jx5vG132JCOScMjTalRsYZYJcjFbebQQolpqRaGB4iG\nWqhytWQGWuKiB1A22wjmIYf3t96l1Mp+FmM2URPxD1gk/BIBnX7ew+2gWppXOK9j\n1BJpo0/HaX5XoZ/uMqISAAtgHZAqq+g3IUPouxTphgYQRTRYpz2COw3NF43VYQrR\nbQIDAQAB
+60ac2099:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR4uJVtJOnOFGchnMW5Y\nj5/waBdG1u5BTMlH+iQMcV5+VgWhmpZHJCBz3ocD+0IGk2I68S5TDOHec/GSC0lv\n6R9o6F7h429GmgPgVKQsc8mPTPtbjJMuLLs4xKc+viCplXc0Nc0ZoHmCH4da6fCV\ntdpHQjVe6F9zjdquZ4RjV6R6JTiN9v924dGMAkbW/xXmamtz51FzondKC52Gh8Mo\n/oA0/T0KsCMCi7tb4QNQUYrf+Xcha9uus4ww1kWNZyfXJB87a2kORLiWMfs2IBBJ\nTmZ2Fnk0JnHDb8Oknxd9PvJPT0mvyT8DA+KIAPqNvOjUXP4bnjEHJcoCP9S5HkGC\nIQIDAQAB
+6165ee59:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54\nALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+\ntFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK\ntlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc\n3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5\nHd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj\nv7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD\nhQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4\nLxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl\nk9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI\nisbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck\nhtBqojBnThmjJQFgZXocHG8CAwEAAQ==
+61666e3f:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4\nnZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC\nIXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z\nqCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9\nI4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq\nqfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB\nHYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z\nbhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n\nfpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b\n6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF\nSkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F\nrO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ==
+616a9724:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnC+bR4bHf/L6QdU4puhQ\ngl1MHePszRC38bzvVFDUJsmCaMCL2suCs2A2yxAgGb9pu9AJYLAmxQC4mM3jNqhg\n/E7yuaBbek3O02zN/ctvflJ250wZCy+z0ZGIp1ak6pu1j14IwHokl9j36zNfGtfv\nADVOcdpWITFFlPqwq1qt/H3UsKVmtiF3BNWWTeUEQwKvlU8ymxgS99yn0+4OPyNT\nL3EUeS+NQJtDS01unau0t7LnjUXn+XIneWny8bIYOQCuVR6s/gpIGuhBaUqwaJOw\n7jkJZYF2Ij7uPb4b5/R3vX2FfxxqEHqssFSg8FFUNTZz3qNZs0CRVyfA972g9WkJ\nhPfn31pQYil4QGRibCMIeU27YAEjXoqfJKEPh4UWMQsQLrEfdGfb8VgwrPbniGfU\nL3jKJR3VAafL9330iawzVQDlIlwGl6u77gEXMl9K0pfazunYhAp+BMP+9ot5ckK+\nosmrqj11qMESsAj083GeFdfV3pXEIwUytaB0AKEht9DbqUfiE/oeZ/LAXgySMtVC\nsbC4ESmgVeY2xSBIJdDyUap7FR49GGrw0W49NUv9gRgQtGGaNVQQO9oGL2PBC41P\niWF9GLoX30HIz1P8PF/cZvicSSPkQf2Z6TV+t0ebdGNS5DjapdnCrq8m9Z0pyKsQ\nuxAL2a7zX8l5i1CZh1ycUGsCAwEAAQ==
+616abc23:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0MfCDrhODRCIxR9Dep1s\neXafh5CE5BrF4WbCgCsevyPIdvTeyIaW4vmO3bbG4VzhogDZju+R3IQYFuhoXP5v\nY+zYJGnwrgz3r5wYAvPnLEs1+dtDKYOgJXQj+wLJBW1mzRDL8FoRXOe5iRmn1EFS\nwZ1DoUvyu7/J5r0itKicZp3QKED6YoilXed+1vnS4Sk0mzN4smuMR9eO1mMCqNp9\n9KTfRDHTbakIHwasECCXCp50uXdoW6ig/xUAFanpm9LtK6jctNDbXDhQmgvAaLXZ\nLvFqoaYJ/CvWkyYCgL6qxvMvVmPoRv7OPcyni4xR/WgWa0MSaEWjgPx3+yj9fiMA\n1S02pFWFDOr5OUF/O4YhFJvUCOtVsUPPfA/Lj6faL0h5QI9mQhy5Zb9TTaS9jB6p\nLw7u0dJlrjFedk8KTJdFCcaGYHP6kNPnOxMylcB/5WcztXZVQD5WpCicGNBxCGMm\nW64SgrV7M07gQfL/32QLsdqPUf0i8hoVD8wfQ3EpbQzv6Fk1Cn90bZqZafg8XWGY\nwddhkXk7egrr23Djv37V2okjzdqoyLBYBxMz63qQzFoAVv5VoY2NDTbXYUYytOvG\nGJ1afYDRVWrExCech1mX5ZVUB1br6WM+psFLJFoBFl6mDmiYt0vMYBddKISsvwLl\nIJQkzDwtXzT2cSjoj3T5QekCAwEAAQ==
+616ac3bc:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvaaoSLab+IluixwKV5Od\n0gib2YurjPatGIbn5Ov2DLUFYiebj2oJINXJSwUOO+4WcuHFEqiL/1rya+k5hLZt\nhnPL1tn6QD4rESznvGSasRCQNT2vS/oyZbTYJRyAtFkEYLlq0t3S3xBxxHWuvIf0\nqVxVNYpQWyM3N9RIeYBR/euXKJXileSHk/uq1I5wTC0XBIHWcthczGN0m9wBEiWS\n0m3cnPk4q0Ea8mUJ91Rqob19qETz6VbSPYYpZk3qOycjKosuwcuzoMpwU8KRiMFd\n5LHtX0Hx85ghGsWDVtS0c0+aJa4lOMGvJCAOvDfqvODv7gKlCXUpgumGpLdTmaZ8\n1RwqspAe3IqBcdKTqRD4m2mSg23nVx2FAY3cjFvZQtfooT7q1ItRV5RgH6FhQSl7\n+6YIMJ1Bf8AAlLdRLpg+doOUGcEn+pkDiHFgI8ylH1LKyFKw+eXaAml/7DaWZk1d\ndqggwhXOhc/UUZFQuQQ8A8zpA13PcbC05XxN2hyP93tCEtyynMLVPtrRwDnHxFKa\nqKzs3rMDXPSXRn3ZZTdKH3069ApkEjQdpcwUh+EmJ1Ve/5cdtzT6kKWCjKBFZP/s\n91MlRrX2BTRdHaU5QJkUheUtakwxuHrdah2F94lRmsnQlpPr2YseJu6sIE+Dnx4M\nCfhdVbQL2w54R645nlnohu8CAwEAAQ==
+616adfeb:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU\npNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X\n0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6\nADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ\nraQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy\nKLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj\n/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H\nKuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs\nmFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1\n/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq\nXIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4\nVORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ==
+616ae350:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0\nXkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ\npiM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46\nxLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP\nODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM\nEyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr\nDzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+\nf53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF\nHwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk\nOk9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6\n9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT\nJZDr++FjKrnnijbyNF8b98UCAwEAAQ==
+616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ==
+66ba20fe:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfB12w4ZgqsXWZDfUAV/\n6Y4aHUKIu3q4SXrNZ7CXF9nXoAVYrS7NAxJdAodsY3vPCN0g5O8DFXR+390LdOuQ\n+HsGKCc1k5tX5ZXld37EZNTNSbR0k+NKhd9h6X3u6wqPOx7SIKxwAQR8qeeFq4pP\nrt9GAGlxtuYgzIIcKJPwE0dZlcBCg+GnptCUZXp/38BP1eYC+xTXSL6Muq1etYfg\nodXdb7Yl+2h1IHuOwo5rjgY5kpY7GcAs8AjGk3lDD/av60OTYccknH0NCVSmPoXK\nvrxDBOn0LQRNBLcAfnTKgHrzy0Q5h4TNkkyTgxkoQw5ObDk9nnabTxql732yy9BY\ns+hM9+dSFO1HKeVXreYSA2n1ndF18YAvAumzgyqzB7I4pMHXq1kC/8bONMJxwSkS\nYm6CoXKyavp7RqGMyeVpRC7tV+blkrrUml0BwNkxE+XnwDRB3xDV6hqgWe0XrifD\nYTfvd9ScZQP83ip0r4IKlq4GMv/R5shcCRJSkSZ6QSGshH40JYSoiwJf5FHbj9ND\n7do0UAqebWo4yNx63j/wb2ULorW3AClv0BCFSdPsIrCStiGdpgJDBR2P2NZOCob3\nG9uMj+wJD6JJg2nWqNJxkANXX37Qf8plgzssrhrgOvB0fjjS7GYhfkfmZTJ0wPOw\nA8+KzFseBh4UFGgue78KwgkCAwEAAQ==
+'
+__Keyring=
+__KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
+__SkipSigCheck=0
+__SkipEmulation=0
 __UseMirror=0
 
 __UnprocessedBuildArgs=
 while :; do
-    if [ $# -le 0 ]; then
+    if [[ "$#" -le 0 ]]; then
         break
     fi
 
-    lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
+    lowerI="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
     case $lowerI in
-        -?|-h|--help)
+        -\?|-h|--help)
             usage
-            exit 1
             ;;
         arm)
             __BuildArch=arm
@@ -104,130 +158,263 @@ while :; do
             __UbuntuArch=arm64
             __AlpineArch=aarch64
             __QEMUArch=aarch64
+            __FreeBSDArch=arm64
+            __FreeBSDMachineArch=aarch64
             ;;
         armel)
             __BuildArch=armel
             __UbuntuArch=armel
-            __UbuntuRepo="http://ftp.debian.org/debian/"
-            __CodeName=jessie
+            __UbuntuRepo="http://archive.debian.org/debian/"
+            __CodeName=buster
+            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+            __LLDB_Package="liblldb-6.0-dev"
+            __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp5/}"
+            __UbuntuSuites=
+            ;;
+        armv6)
+            __BuildArch=armv6
+            __UbuntuArch=armhf
+            __QEMUArch=arm
+            __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
+            __CodeName=buster
+            __KeyringFile="/usr/share/keyrings/raspbian-archive-keyring.gpg"
+            __LLDB_Package="liblldb-6.0-dev"
+            __UbuntuSuites=
+
+            if [[ -e "$__KeyringFile" ]]; then
+                __Keyring="--keyring $__KeyringFile"
+            fi
+            ;;
+        loongarch64)
+            __BuildArch=loongarch64
+            __AlpineArch=loongarch64
+            __QEMUArch=loongarch64
+            __UbuntuArch=loong64
+            __UbuntuSuites=unreleased
+            __LLDB_Package="liblldb-19-dev"
+
+            if [[ "$__CodeName" == "sid" ]]; then
+                __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/"
+            fi
+            ;;
+        riscv64)
+            __BuildArch=riscv64
+            __AlpineArch=riscv64
+            __AlpinePackages="${__AlpinePackages// lldb-dev/}"
+            __QEMUArch=riscv64
+            __UbuntuArch=riscv64
+            __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
+            unset __LLDB_Package
+            ;;
+        ppc64le)
+            __BuildArch=ppc64le
+            __AlpineArch=ppc64le
+            __QEMUArch=ppc64le
+            __UbuntuArch=ppc64el
+            __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
+            __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp5/}"
+            unset __LLDB_Package
             ;;
         s390x)
             __BuildArch=s390x
+            __AlpineArch=s390x
+            __QEMUArch=s390x
             __UbuntuArch=s390x
             __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
-            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
-            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
-            __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
+            __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp5/}"
             unset __LLDB_Package
             ;;
+        x64)
+            __BuildArch=x64
+            __AlpineArch=x86_64
+            __UbuntuArch=amd64
+            __FreeBSDArch=amd64
+            __FreeBSDMachineArch=amd64
+            __illumosArch=x86_64
+            __HaikuArch=x86_64
+            __UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
+            ;;
         x86)
             __BuildArch=x86
             __UbuntuArch=i386
+            __AlpineArch=x86
             __UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
             ;;
-        lldb3.6)
-            __LLDB_Package="lldb-3.6-dev"
-            ;;
-        lldb3.8)
-            __LLDB_Package="lldb-3.8-dev"
-            ;;
-        lldb3.9)
-            __LLDB_Package="liblldb-3.9-dev"
-            ;;
-        lldb4.0)
-            __LLDB_Package="liblldb-4.0-dev"
-            ;;
-        lldb5.0)
-            __LLDB_Package="liblldb-5.0-dev"
-            ;;
-        lldb6.0)
-            __LLDB_Package="liblldb-6.0-dev"
+        lldb*)
+            version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
+            majorVersion="${version%%.*}"
+
+            [ -z "${version##*.*}" ] && minorVersion="${version#*.}"
+            if [ -z "$minorVersion" ]; then
+                minorVersion=0
+            fi
+
+            # for versions > 6.0, lldb has dropped the minor version
+            if [ "$majorVersion" -le 6 ]; then
+                version="$majorVersion.$minorVersion"
+            else
+                version="$majorVersion"
+            fi
+
+            __LLDB_Package="liblldb-${version}-dev"
             ;;
         no-lldb)
             unset __LLDB_Package
             ;;
-        xenial) # Ubuntu 16.04
-            if [ "$__CodeName" != "jessie" ]; then
-                __CodeName=xenial
+        llvm*)
+            version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
+            __LLVM_MajorVersion="${version%%.*}"
+
+            [ -z "${version##*.*}" ] && __LLVM_MinorVersion="${version#*.}"
+            if [ -z "$__LLVM_MinorVersion" ]; then
+                __LLVM_MinorVersion=0
             fi
-            ;;
-        zesty) # Ubuntu 17.04
-            if [ "$__CodeName" != "jessie" ]; then
-                __CodeName=zesty
+
+            # for versions > 6.0, lldb has dropped the minor version
+            if [ "$__LLVM_MajorVersion" -gt 6 ]; then
+                __LLVM_MinorVersion=
             fi
+
+            ;;
+        xenial) # Ubuntu 16.04
+            __CodeName=xenial
             ;;
         bionic) # Ubuntu 18.04
-            if [ "$__CodeName" != "jessie" ]; then
-                __CodeName=bionic
-            fi
+            __CodeName=bionic
+            ;;
+        focal) # Ubuntu 20.04
+            __CodeName=focal
             ;;
-        jessie) # Debian 8
-            __CodeName=jessie
-            __UbuntuRepo="http://ftp.debian.org/debian/"
+        jammy) # Ubuntu 22.04
+            __CodeName=jammy
+            ;;
+        noble) # Ubuntu 24.04
+            __CodeName=noble
+            if [[ -z "$__LLDB_Package" ]]; then
+                __LLDB_Package="liblldb-19-dev"
+            fi
             ;;
         stretch) # Debian 9
             __CodeName=stretch
-            __UbuntuRepo="http://ftp.debian.org/debian/"
             __LLDB_Package="liblldb-6.0-dev"
+            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+            if [[ -z "$__UbuntuRepo" ]]; then
+                __UbuntuRepo="http://ftp.debian.org/debian/"
+            fi
             ;;
         buster) # Debian 10
             __CodeName=buster
-            __UbuntuRepo="http://ftp.debian.org/debian/"
             __LLDB_Package="liblldb-6.0-dev"
+            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+            if [[ -z "$__UbuntuRepo" ]]; then
+                __UbuntuRepo="http://archive.debian.org/debian/"
+            fi
             ;;
-        tizen)
-            if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
-                echo "Tizen is available only for armel and arm64."
-                usage;
-                exit 1;
+        bullseye) # Debian 11
+            __CodeName=bullseye
+            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+            if [[ -z "$__UbuntuRepo" ]]; then
+                __UbuntuRepo="http://ftp.debian.org/debian/"
+            fi
+            ;;
+        bookworm) # Debian 12
+            __CodeName=bookworm
+            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+            if [[ -z "$__UbuntuRepo" ]]; then
+                __UbuntuRepo="http://ftp.debian.org/debian/"
+            fi
+            ;;
+        sid) # Debian sid
+            __CodeName=sid
+            __UbuntuSuites=
+
+            # Debian-Ports architectures need different values
+            case "$__UbuntuArch" in
+            amd64|arm64|armel|armhf|i386|mips64el|ppc64el|riscv64|s390x)
+                __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+                if [[ -z "$__UbuntuRepo" ]]; then
+                    __UbuntuRepo="http://ftp.debian.org/debian/"
+                fi
+                ;;
+            *)
+                __KeyringFile="/usr/share/keyrings/debian-ports-archive-keyring.gpg"
+
+                if [[ -z "$__UbuntuRepo" ]]; then
+                    __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/"
+                fi
+                ;;
+            esac
+
+            if [[ -e "$__KeyringFile" ]]; then
+                __Keyring="--keyring $__KeyringFile"
             fi
+            ;;
+        tizen)
             __CodeName=
             __UbuntuRepo=
             __Tizen=tizen
             ;;
-        alpine|alpine3.13)
+        alpine*)
             __CodeName=alpine
             __UbuntuRepo=
-            __AlpineVersion=3.13
-            __AlpinePackages+=" llvm10-libs"
+
+            if [[ "$lowerI" == "alpineedge" ]]; then
+                __AlpineVersion=edge
+            else
+                version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
+                __AlpineMajorVersion="${version%%.*}"
+                __AlpineMinorVersion="${version#*.}"
+                __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion"
+            fi
             ;;
-        alpine3.14)
-            __CodeName=alpine
-            __UbuntuRepo=
-            __AlpineVersion=3.14
-            __AlpinePackages+=" llvm11-libs"
-            ;;
-        freebsd11)
-            __FreeBSDBase="11.3-RELEASE"
-            __FreeBSDABI="11"
-            ;&
-        freebsd12)
+        freebsd13)
             __CodeName=freebsd
-            __BuildArch=x64
             __SkipUnmount=1
             ;;
-        freebsd13)
+        freebsd14)
             __CodeName=freebsd
-            __FreeBSDBase="13.0-RELEASE"
-            __FreeBSDABI="13"
-            __BuildArch=x64
+            __FreeBSDBase="14.2-RELEASE"
+            __FreeBSDABI="14"
             __SkipUnmount=1
             ;;
         illumos)
             __CodeName=illumos
-            __BuildArch=x64
+            __SkipUnmount=1
+            ;;
+        haiku)
+            __CodeName=haiku
             __SkipUnmount=1
             ;;
         --skipunmount)
             __SkipUnmount=1
             ;;
+        --skipsigcheck)
+            __SkipSigCheck=1
+            ;;
+        --skipemulation)
+            __SkipEmulation=1
+            ;;
         --rootfsdir|-rootfsdir)
             shift
-            __RootfsDir=$1
+            __RootfsDir="$1"
             ;;
         --use-mirror)
             __UseMirror=1
             ;;
+        --use-jobs)
+            shift
+            MAXJOBS=$1
+            ;;
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
             ;;
@@ -236,128 +423,413 @@ while :; do
     shift
 done
 
-if [ "$__BuildArch" == "armel" ]; then
-    __LLDB_Package="lldb-3.5-dev"
+case "$__AlpineVersion" in
+    3.14) __AlpinePackages+=" llvm11-libs" ;;
+    3.15) __AlpinePackages+=" llvm12-libs" ;;
+    3.16) __AlpinePackages+=" llvm13-libs" ;;
+    3.17) __AlpinePackages+=" llvm15-libs" ;;
+    edge) __AlpineLlvmLibsLookup=1 ;;
+    *)
+        if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
+            __AlpineVersion=3.15 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm12-libs"
+        elif [[ "$__AlpineArch" == "x86" ]]; then
+            __AlpineVersion=3.17 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm15-libs"
+        elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then
+            __AlpineVersion=3.21 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm19-libs"
+        elif [[ -n "$__AlpineMajorVersion" ]]; then
+            # use whichever alpine version is provided and select the latest toolchain libs
+            __AlpineLlvmLibsLookup=1
+        else
+            __AlpineVersion=3.13 # 3.13 to maximize compatibility
+            __AlpinePackages+=" llvm10-libs"
+        fi
+esac
+
+if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
+    # compiler-rt--static was merged in compiler-rt package in alpine 3.16
+    # for older versions, we need compiler-rt--static, so replace the name
+    __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
 fi
+
 __UbuntuPackages+=" ${__LLDB_Package:-}"
 
-if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
-    __RootfsDir=$ROOTFS_DIR
+if [[ -z "$__UbuntuRepo" ]]; then
+    __UbuntuRepo="http://ports.ubuntu.com/"
+fi
+
+if [[ -n "$__LLVM_MajorVersion" ]]; then
+    __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev"
 fi
 
-if [ -z "$__RootfsDir" ]; then
+if [[ -z "$__RootfsDir" && -n "$ROOTFS_DIR" ]]; then
+    __RootfsDir="$ROOTFS_DIR"
+fi
+
+if [[ -z "$__RootfsDir" ]]; then
     __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch"
 fi
 
-if [ -d "$__RootfsDir" ]; then
-    if [ $__SkipUnmount == 0 ]; then
-        umount $__RootfsDir/* || true
+if [[ -d "$__RootfsDir" ]]; then
+    if [[ "$__SkipUnmount" == "0" ]]; then
+        umount "$__RootfsDir"/* || true
     fi
-    rm -rf $__RootfsDir
+    rm -rf "$__RootfsDir"
 fi
 
-mkdir -p $__RootfsDir
+mkdir -p "$__RootfsDir"
 __RootfsDir="$( cd "$__RootfsDir" && pwd )"
 
+__hasWget=
+ensureDownloadTool()
+{
+    if command -v wget &> /dev/null; then
+        __hasWget=1
+    elif command -v curl &> /dev/null; then
+        __hasWget=0
+    else
+        >&2 echo "ERROR: either wget or curl is required by this script."
+        exit 1
+    fi
+}
+
 if [[ "$__CodeName" == "alpine" ]]; then
-    __ApkToolsVersion=2.9.1
-    __ApkToolsDir=$(mktemp -d)
-    wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir
-    tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
-    mkdir -p $__RootfsDir/usr/bin
-    cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin
-
-    $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-      -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
-      -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
-      -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
-      add $__AlpinePackages
-
-    rm -r $__ApkToolsDir
+    __ApkToolsVersion=2.12.11
+    __ApkToolsDir="$(mktemp -d)"
+    __ApkKeysDir="$(mktemp -d)"
+    arch="$(uname -m)"
+
+    ensureDownloadTool
+
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
+    else
+        curl -SLO --create-dirs --output-dir "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
+    fi
+    if [[ "$arch" == "x86_64" ]]; then
+      __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33"
+    elif [[ "$arch" == "aarch64" ]]; then
+      __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0"
+    else
+      echo "WARNING: add missing hash for your host architecture. To find the value, use: 'find /tmp -name apk.static -exec sha512sum {} \;'"
+    fi
+    echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
+    chmod +x "$__ApkToolsDir/apk.static"
+
+    if [[ "$__AlpineVersion" == "edge" ]]; then
+        version=edge
+    else
+        version="v$__AlpineVersion"
+    fi
+
+    for line in $__AlpineKeys; do
+        id="${line%%:*}"
+        content="${line#*:}"
+
+        echo -e "-----BEGIN PUBLIC KEY-----\n$content\n-----END PUBLIC KEY-----" > "$__ApkKeysDir/alpine-devel@lists.alpinelinux.org-$id.rsa.pub"
+    done
+
+    if [[ "$__SkipSigCheck" == "1" ]]; then
+        __ApkSignatureArg="--allow-untrusted"
+    else
+        __ApkSignatureArg="--keys-dir $__ApkKeysDir"
+    fi
+
+    if [[ "$__SkipEmulation" == "1" ]]; then
+        __NoEmulationArg="--no-scripts"
+    fi
+
+    # initialize DB
+    # shellcheck disable=SC2086
+    "$__ApkToolsDir/apk.static" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
+        -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add
+
+    if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then
+        # shellcheck disable=SC2086
+        __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \
+            -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
+            -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
+            -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
+            search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
+    fi
+
+    # install all packages in one go
+    # shellcheck disable=SC2086
+    "$__ApkToolsDir/apk.static" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
+        -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" $__NoEmulationArg \
+        add $__AlpinePackages
+
+    rm -r "$__ApkToolsDir"
 elif [[ "$__CodeName" == "freebsd" ]]; then
-    mkdir -p $__RootfsDir/usr/local/etc
-    JOBS="$(getconf _NPROCESSORS_ONLN)"
-    wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
-    echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
-    echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
-    mkdir -p $__RootfsDir/tmp
+    mkdir -p "$__RootfsDir"/usr/local/etc
+    JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
+
+    ensureDownloadTool
+
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O- "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
+    else
+        curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
+    fi
+    echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
+    echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
+    mkdir -p "$__RootfsDir"/tmp
     # get and build package manager
-    wget -O -  https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz  |  tar -C $__RootfsDir/tmp -zxf -
-    cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O- "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf -
+    else
+        curl -SL "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf -
+    fi
+    cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
     # needed for install to succeed
-    mkdir -p $__RootfsDir/host/etc
-    ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install
-    rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
+    mkdir -p "$__RootfsDir"/host/etc
+    ./autogen.sh && ./configure --prefix="$__RootfsDir"/host && make -j "$JOBS" && make install
+    rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
     # install packages we need.
-    INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
-    INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
+    INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
+    # shellcheck disable=SC2086
+    INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
 elif [[ "$__CodeName" == "illumos" ]]; then
     mkdir "$__RootfsDir/tmp"
     pushd "$__RootfsDir/tmp"
-    JOBS="$(getconf _NPROCESSORS_ONLN)"
+    JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
+
+    ensureDownloadTool
+
     echo "Downloading sysroot."
-    wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf -
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O- https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf -
+    else
+        curl -SL https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf -
+    fi
     echo "Building binutils. Please wait.."
-    wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
+    else
+        curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
+    fi
     mkdir build-binutils && cd build-binutils
-    ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir"
+    ../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
     make -j "$JOBS" && make install && cd ..
     echo "Building gcc. Please wait.."
-    wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
+    else
+        curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
+    fi
     CFLAGS="-fPIC"
     CXXFLAGS="-fPIC"
     CXXFLAGS_FOR_TARGET="-fPIC"
     CFLAGS_FOR_TARGET="-fPIC"
     export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
     mkdir build-gcc && cd build-gcc
-    ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as       \
+    ../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as       \
         --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
         --disable-libquadmath-support --disable-shared --enable-tls
     make -j "$JOBS" && make install && cd ..
-    BaseUrl=https://pkgsrc.joyent.com
+    BaseUrl=https://pkgsrc.smartos.org
     if [[ "$__UseMirror" == 1 ]]; then
-        BaseUrl=http://pkgsrc.smartos.skylime.net
+        BaseUrl=https://pkgsrc.smartos.skylime.net
+    fi
+    BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All"
+    echo "Downloading manifest"
+    if [[ "$__hasWget" == 1 ]]; then
+        wget "$BaseUrl"
+    else
+        curl -SLO "$BaseUrl"
     fi
-    BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All
     echo "Downloading dependencies."
     read -ra array <<<"$__IllumosPackages"
     for package in "${array[@]}"; do
-       echo "Installing $package..."
-        wget "$BaseUrl"/"$package".tgz
+        echo "Installing '$package'"
+        # find last occurrence of package in listing and extract its name
+        package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)"
+        echo "Resolved name '$package'"
+        if [[ "$__hasWget" == 1 ]]; then
+            wget "$BaseUrl"/"$package".tgz
+        else
+            curl -SLO "$BaseUrl"/"$package".tgz
+        fi
         ar -x "$package".tgz
-        tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
+        tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
     done
     echo "Cleaning up temporary files."
     popd
     rm -rf "$__RootfsDir"/{tmp,+*}
     mkdir -p "$__RootfsDir"/usr/include/net
     mkdir -p "$__RootfsDir"/usr/include/netpacket
-    wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h
-    wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
-    wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
-    wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
-elif [[ -n $__CodeName ]]; then
-    qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
-    cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
-    chroot $__RootfsDir apt-get update
-    chroot $__RootfsDir apt-get -f -y install
-    chroot $__RootfsDir apt-get -y install $__UbuntuPackages
-    chroot $__RootfsDir symlinks -cr /usr
-    chroot $__RootfsDir apt-get clean
-
-    if [ $__SkipUnmount == 0 ]; then
-        umount $__RootfsDir/* || true
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h
+        wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
+        wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
+        wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
+    else
+        curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h
+        curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
+        curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
+        curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
+    fi
+elif [[ "$__CodeName" == "haiku" ]]; then
+    JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
+
+    echo "Building Haiku sysroot for $__HaikuArch"
+    mkdir -p "$__RootfsDir/tmp"
+    pushd "$__RootfsDir/tmp"
+
+    mkdir "$__RootfsDir/tmp/download"
+
+    ensureDownloadTool
+
+    echo "Downloading Haiku package tools"
+    git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script"
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
+    else
+        curl -SLo "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
+    fi
+
+    unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
+
+    HaikuBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
+    HaikuPortsBaseUrl="https://eu.hpkg.haiku-os.org/haikuports/master/$__HaikuArch/current"
+
+    echo "Downloading HaikuPorts package repository index..."
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -P "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
+    else
+        curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
+    fi
+
+    echo "Downloading Haiku packages"
+    read -ra array <<<"$__HaikuPackages"
+    for package in "${array[@]}"; do
+        echo "Downloading $package..."
+        hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" |
+            grep -E "${package}-" | sort -V | tail -n 1 | xargs)"
+        if [ -z "$hpkgFilename" ]; then
+            >&2 echo "ERROR: package $package missing."
+            exit 1
+        fi
+        echo "Resolved filename: $hpkgFilename..."
+        hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename"
+        if [[ "$__hasWget" == 1 ]]; then
+            wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
+        else
+            curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
+        fi
+    done
+    for package in haiku haiku_devel; do
+        echo "Downloading $package..."
+        if [[ "$__hasWget" == 1 ]]; then
+            hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
+            wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
+        else
+            hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
+            curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
+        fi
+    done
+
+    # Set up the sysroot
+    echo "Setting up sysroot and extracting required packages"
+    mkdir -p "$__RootfsDir/boot/system"
+    for file in "$__RootfsDir/tmp/download/"*.hpkg; do
+        echo "Extracting $file..."
+        LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package" extract -C "$__RootfsDir/boot/system" "$file"
+    done
+
+    # Download buildtools
+    echo "Downloading Haiku buildtools"
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)"
+    else
+        curl -SLo "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)"
+    fi
+    unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir"
+
+    # Cleaning up temporary files
+    echo "Cleaning up temporary files"
+    popd
+    rm -rf "$__RootfsDir/tmp"
+elif [[ -n "$__CodeName" ]]; then
+    __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"
+
+    if [[ "$__SkipEmulation" == "1" ]]; then
+        if [[ -z "$AR" ]]; then
+            if command -v ar &>/dev/null; then
+                AR="$(command -v ar)"
+            elif command -v llvm-ar &>/dev/null; then
+                AR="$(command -v llvm-ar)"
+            else
+                echo "Unable to find ar or llvm-ar on PATH, add them to PATH or set AR environment variable pointing to the available AR tool"
+                exit 1
+            fi
+        fi
+
+        PYTHON=${PYTHON_EXECUTABLE:-python3}
+
+        # shellcheck disable=SC2086,SC2046
+        echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
+            $__UbuntuPackages
+
+        # shellcheck disable=SC2086,SC2046
+        "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
+            $__UbuntuPackages
+
+        exit 0
     fi
 
-    if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
-        pushd $__RootfsDir
-        patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
-        popd
+    __UpdateOptions=
+    if [[ "$__SkipSigCheck" == "0" ]]; then
+        __Keyring="$__Keyring --force-check-gpg"
+    else
+        __Keyring=
+        __UpdateOptions="--allow-unauthenticated --allow-insecure-repositories"
+    fi
+
+    # shellcheck disable=SC2086
+    echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
+
+    # shellcheck disable=SC2086
+    if ! debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"; then
+        echo "debootstrap failed! dumping debootstrap.log"
+        cat "$__RootfsDir/debootstrap/debootstrap.log"
+        exit 1
+    fi
+
+    rm -rf "$__RootfsDir"/etc/apt/*.{sources,list} "$__RootfsDir"/etc/apt/sources.list.d
+    mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
+
+    # shellcheck disable=SC2086
+    cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
+Types: deb
+URIs: $__UbuntuRepo
+Suites: $__Suites
+Components: main universe
+Signed-By: $__KeyringFile
+EOF
+
+    # shellcheck disable=SC2086
+    chroot "$__RootfsDir" apt-get update $__UpdateOptions
+    chroot "$__RootfsDir" apt-get -f -y install
+    # shellcheck disable=SC2086
+    chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages
+    chroot "$__RootfsDir" symlinks -cr /usr
+    chroot "$__RootfsDir" apt-get clean
+
+    if [[ "$__SkipUnmount" == "0" ]]; then
+        umount "$__RootfsDir"/* || true
     fi
 elif [[ "$__Tizen" == "tizen" ]]; then
-    ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
+    ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
 else
     echo "Unsupported target platform."
-    usage;
-    exit 1
+    usage
 fi
diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py
new file mode 100644
index 0000000000..c81eb37e52
--- /dev/null
+++ b/eng/common/cross/install-debs.py
@@ -0,0 +1,334 @@
+#!/usr/bin/env python3
+
+import argparse
+import asyncio
+import aiohttp
+import gzip
+import os
+import re
+import shutil
+import subprocess
+import sys
+import tarfile
+import tempfile
+import zstandard
+
+from collections import deque
+from functools import cmp_to_key
+
+async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, timeout=60):
+    """Asynchronous file download with retries."""
+    attempt = 0
+    while attempt < max_retries:
+        try:
+            async with session.get(url, timeout=aiohttp.ClientTimeout(total=timeout)) as response:
+                if response.status == 200:
+                    with open(dest_path, "wb") as f:
+                        content = await response.read()
+                        f.write(content)
+                    print(f"Downloaded {url} at {dest_path}")
+                    return
+                else:
+                    print(f"Failed to download {url}, Status Code: {response.status}")
+                    break
+        except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e:
+            print(f"Error downloading {url}: {type(e).__name__} - {e}. Retrying...")
+
+        attempt += 1
+        await asyncio.sleep(retry_delay)
+
+    print(f"Failed to download {url} after {max_retries} attempts.")
+
+async def download_deb_files_parallel(mirror, packages, tmp_dir):
+    """Download .deb files in parallel."""
+    os.makedirs(tmp_dir, exist_ok=True)
+
+    tasks = []
+    timeout = aiohttp.ClientTimeout(total=60)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        for pkg, info in packages.items():
+            filename = info.get("Filename")
+            if filename:
+                url = f"{mirror}/{filename}"
+                dest_path = os.path.join(tmp_dir, os.path.basename(filename))
+                tasks.append(asyncio.create_task(download_file(session, url, dest_path)))
+
+        await asyncio.gather(*tasks)
+
+async def download_package_index_parallel(mirror, arch, suites):
+    """Download package index files for specified suites and components entirely in memory."""
+    tasks = []
+    timeout = aiohttp.ClientTimeout(total=60)
+
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        for suite in suites:
+            for component in ["main", "universe"]:
+                url = f"{mirror}/dists/{suite}/{component}/binary-{arch}/Packages.gz"
+                tasks.append(fetch_and_decompress(session, url))
+
+        results = await asyncio.gather(*tasks, return_exceptions=True)
+
+    merged_content = ""
+    for result in results:
+        if isinstance(result, str):
+            if merged_content:
+                merged_content += "\n\n"
+            merged_content += result
+
+    return merged_content
+
+async def fetch_and_decompress(session, url):
+    """Fetch and decompress the Packages.gz file."""
+    try:
+        async with session.get(url) as response:
+            if response.status == 200:
+                compressed_data = await response.read()
+                decompressed_data = gzip.decompress(compressed_data).decode('utf-8')
+                print(f"Downloaded index: {url}")
+                return decompressed_data
+            else:
+                print(f"Skipped index: {url} (doesn't exist)")
+                return None
+    except Exception as e:
+        print(f"Error fetching {url}: {e}")
+
+def parse_debian_version(version):
+    """Parse a Debian package version into epoch, upstream version, and revision."""
+    match = re.match(r'^(?:(\d+):)?([^-]+)(?:-(.+))?$', version)
+    if not match:
+        raise ValueError(f"Invalid Debian version format: {version}")
+    epoch, upstream, revision = match.groups()
+    return int(epoch) if epoch else 0, upstream, revision or ""
+
+def compare_upstream_version(v1, v2):
+    """Compare upstream or revision parts using Debian rules."""
+    def tokenize(version):
+        tokens = re.split(r'([0-9]+|[A-Za-z]+)', version)
+        return [int(x) if x.isdigit() else x for x in tokens if x]
+
+    tokens1 = tokenize(v1)
+    tokens2 = tokenize(v2)
+
+    for token1, token2 in zip(tokens1, tokens2):
+        if type(token1) == type(token2):
+            if token1 != token2:
+                return (token1 > token2) - (token1 < token2)
+        else:
+            return -1 if isinstance(token1, str) else 1
+
+    return len(tokens1) - len(tokens2)
+
+def compare_debian_versions(version1, version2):
+    """Compare two Debian package versions."""
+    epoch1, upstream1, revision1 = parse_debian_version(version1)
+    epoch2, upstream2, revision2 = parse_debian_version(version2)
+
+    if epoch1 != epoch2:
+        return epoch1 - epoch2
+
+    result = compare_upstream_version(upstream1, upstream2)
+    if result != 0:
+        return result
+
+    return compare_upstream_version(revision1, revision2)
+
+def resolve_dependencies(packages, aliases, desired_packages):
+    """Recursively resolves dependencies for the desired packages."""
+    resolved = []
+    to_process = deque(desired_packages)
+
+    while to_process:
+        current = to_process.popleft()
+        resolved_package = current if current in packages else aliases.get(current, [None])[0]
+
+        if not resolved_package:
+            print(f"Error: Package '{current}' was not found in the available packages.")
+            sys.exit(1)
+
+        if resolved_package not in resolved:
+            resolved.append(resolved_package)
+
+            deps = packages.get(resolved_package, {}).get("Depends", "")
+            if deps:
+                deps = [dep.split(' ')[0] for dep in deps.split(', ') if dep]
+                for dep in deps:
+                    if dep not in resolved and dep not in to_process and dep in packages:
+                        to_process.append(dep)
+
+    return resolved
+
+def parse_package_index(content):
+    """Parses the Packages.gz file and returns package information."""
+    packages = {}
+    aliases = {}
+    entries = re.split(r'\n\n+', content)
+
+    for entry in entries:
+        fields = dict(re.findall(r'^(\S+): (.+)$', entry, re.MULTILINE))
+        if "Package" in fields:
+            package_name = fields["Package"]
+            version = fields.get("Version")
+            filename = fields.get("Filename")
+            depends = fields.get("Depends")
+            provides = fields.get("Provides", None)
+
+            # Only update if package_name is not in packages or if the new version is higher
+            if package_name not in packages or compare_debian_versions(version, packages[package_name]["Version"]) > 0:
+                packages[package_name] = {
+                    "Version": version,
+                    "Filename": filename,
+                    "Depends": depends
+                }
+
+                # Update aliases if package provides any alternatives
+                if provides:
+                    provides_list = [x.strip() for x in provides.split(",")]
+                    for alias in provides_list:
+                        # Strip version specifiers
+                        alias_name = re.sub(r'\s*\(=.*\)', '', alias)
+                        if alias_name not in aliases:
+                            aliases[alias_name] = []
+                        if package_name not in aliases[alias_name]:
+                            aliases[alias_name].append(package_name)
+
+    return packages, aliases
+
+def install_packages(mirror, packages_info, aliases, tmp_dir, extract_dir, ar_tool, desired_packages):
+    """Downloads .deb files and extracts them."""
+    resolved_packages = resolve_dependencies(packages_info, aliases, desired_packages)
+    print(f"Resolved packages (including dependencies): {resolved_packages}")
+
+    packages_to_download = {}
+
+    for pkg in resolved_packages:
+        if pkg in packages_info:
+            packages_to_download[pkg] = packages_info[pkg]
+
+        if pkg in aliases:
+            for alias in aliases[pkg]:
+                if alias in packages_info:
+                    packages_to_download[alias] = packages_info[alias]
+
+    asyncio.run(download_deb_files_parallel(mirror, packages_to_download, tmp_dir))
+
+    package_to_deb_file_map = {}
+    for pkg in resolved_packages:
+        pkg_info = packages_info.get(pkg)
+        if pkg_info:
+            deb_filename = pkg_info.get("Filename")
+            if deb_filename:
+                deb_file_path = os.path.join(tmp_dir, os.path.basename(deb_filename))
+                package_to_deb_file_map[pkg] = deb_file_path
+
+    for pkg in reversed(resolved_packages):
+        deb_file = package_to_deb_file_map.get(pkg)
+        if deb_file and os.path.exists(deb_file):
+            extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool)
+
+    print("All done!")
+
+def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool):
+    """Extract .deb file contents"""
+
+    os.makedirs(extract_dir, exist_ok=True)
+
+    with tempfile.TemporaryDirectory(dir=tmp_dir) as tmp_subdir:
+        result = subprocess.run(f"{ar_tool} t {os.path.abspath(deb_file)}", cwd=tmp_subdir, check=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        tar_filename = None
+        for line in result.stdout.decode().splitlines():
+            if line.startswith("data.tar"):
+                tar_filename = line.strip()
+                break
+
+        if not tar_filename:
+            raise FileNotFoundError(f"Could not find 'data.tar.*' in {deb_file}.")
+
+        tar_file_path = os.path.join(tmp_subdir, tar_filename)
+        print(f"Extracting {tar_filename} from {deb_file}..")
+
+        subprocess.run(f"{ar_tool} p {os.path.abspath(deb_file)} {tar_filename} > {tar_file_path}", check=True, shell=True)
+
+        file_extension = os.path.splitext(tar_file_path)[1].lower()
+
+        if file_extension == ".xz":
+            mode = "r:xz"
+        elif file_extension == ".gz":
+            mode = "r:gz"
+        elif file_extension == ".zst":
+            # zstd is not supported by standard library yet
+            decompressed_tar_path = tar_file_path.replace(".zst", "")
+            with open(tar_file_path, "rb") as zst_file, open(decompressed_tar_path, "wb") as decompressed_file:
+                dctx = zstandard.ZstdDecompressor()
+                dctx.copy_stream(zst_file, decompressed_file)
+
+            tar_file_path = decompressed_tar_path
+            mode = "r"
+        else:
+            raise ValueError(f"Unsupported compression format: {file_extension}")
+
+        with tarfile.open(tar_file_path, mode) as tar:
+            tar.extractall(path=extract_dir, filter='fully_trusted')
+
+def finalize_setup(rootfsdir):
+    lib_dir = os.path.join(rootfsdir, 'lib')
+    usr_lib_dir = os.path.join(rootfsdir, 'usr', 'lib')
+
+    if os.path.exists(lib_dir):
+        if os.path.islink(lib_dir):
+            os.remove(lib_dir)
+        else:
+            os.makedirs(usr_lib_dir, exist_ok=True)
+
+            for item in os.listdir(lib_dir):
+                src = os.path.join(lib_dir, item)
+                dest = os.path.join(usr_lib_dir, item)
+
+                if os.path.isdir(src):
+                    shutil.copytree(src, dest, dirs_exist_ok=True)
+                else:
+                    shutil.copy2(src, dest)
+
+            shutil.rmtree(lib_dir)
+
+    os.symlink(usr_lib_dir, lib_dir)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Generate rootfs for .NET runtime on Debian-like OS")
+    parser.add_argument("--distro", required=False, help="Distro name (e.g., debian, ubuntu, etc.)")
+    parser.add_argument("--arch", required=True, help="Architecture (e.g., amd64, loong64, etc.)")
+    parser.add_argument("--rootfsdir", required=True, help="Destination directory.")
+    parser.add_argument('--suite', required=True, action='append', help='Specify one or more repository suites to collect index data.')
+    parser.add_argument("--mirror", required=False, help="Mirror (e.g., http://ftp.debian.org/debian-ports etc.)")
+    parser.add_argument("--artool", required=False, default="ar", help="ar tool to extract debs (e.g., ar, llvm-ar etc.)")
+    parser.add_argument("packages", nargs="+", help="List of package names to be installed.")
+
+    args = parser.parse_args()
+
+    if args.mirror is None:
+        if args.distro == "ubuntu":
+            args.mirror = "http://archive.ubuntu.com/ubuntu" if args.arch in ["amd64", "i386"] else "http://ports.ubuntu.com/ubuntu-ports"
+        elif args.distro == "debian":
+            args.mirror = "http://ftp.debian.org/debian-ports"
+        else:
+            raise Exception("Unsupported distro")
+
+    DESIRED_PACKAGES = args.packages + [ # base packages
+        "dpkg",
+        "busybox",
+        "libc-bin",
+        "base-files",
+        "base-passwd",
+        "debianutils"
+    ]
+
+    print(f"Creating rootfs. rootfsdir: {args.rootfsdir}, distro: {args.distro}, arch: {args.arch}, suites: {args.suite}, mirror: {args.mirror}")
+
+    package_index_content = asyncio.run(download_package_index_parallel(args.mirror, args.arch, args.suite))
+
+    packages_info, aliases = parse_package_index(package_index_content)
+
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        install_packages(args.mirror, packages_info, aliases, tmp_dir, args.rootfsdir, args.artool, DESIRED_PACKAGES)
+
+    finalize_setup(args.rootfsdir)
diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch
new file mode 100644
index 0000000000..eb6d1c0747
--- /dev/null
+++ b/eng/common/cross/riscv64/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib64/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib64/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf64-littleriscv)
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )
diff --git a/eng/common/cross/s390x/sources.list.bionic b/eng/common/cross/s390x/sources.list.bionic
deleted file mode 100644
index 2109557409..0000000000
--- a/eng/common/cross/s390x/sources.list.bionic
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh
new file mode 100644
index 0000000000..ba31c93285
--- /dev/null
+++ b/eng/common/cross/tizen-build-rootfs.sh
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+set -e
+
+ARCH=$1
+LINK_ARCH=$ARCH
+
+case "$ARCH" in
+    arm)
+        TIZEN_ARCH="armv7hl"
+        ;;
+    armel)
+        TIZEN_ARCH="armv7l"
+        LINK_ARCH="arm"
+        ;;
+    arm64)
+        TIZEN_ARCH="aarch64"
+        ;;
+    x86)
+        TIZEN_ARCH="i686"
+        ;;
+    x64)
+        TIZEN_ARCH="x86_64"
+        LINK_ARCH="x86"
+        ;;
+    riscv64)
+        TIZEN_ARCH="riscv64"
+        LINK_ARCH="riscv"
+        ;;
+    *)
+        echo "Unsupported architecture for tizen: $ARCH"
+        exit 1
+esac
+
+__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+__TIZEN_CROSSDIR="$__CrossDir/${ARCH}/tizen"
+
+if [[ -z "$ROOTFS_DIR" ]]; then
+    echo "ROOTFS_DIR is not defined."
+    exit 1;
+fi
+
+TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
+mkdir -p $TIZEN_TMP_DIR
+
+# Download files
+echo ">>Start downloading files"
+VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR $TIZEN_ARCH
+echo "<<Finish downloading files"
+
+echo ">>Start constructing Tizen rootfs"
+TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
+cd $ROOTFS_DIR
+for f in $TIZEN_RPM_FILES; do
+    rpm2cpio $f  | cpio -idm --quiet
+done
+echo "<<Finish constructing Tizen rootfs"
+
+# Cleanup tmp
+rm -rf $TIZEN_TMP_DIR
+
+# Configure Tizen rootfs
+echo ">>Start configuring Tizen rootfs"
+ln -sfn asm-${LINK_ARCH} ./usr/include/asm
+patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
+    echo "Fixing broken symlinks in $PWD"
+    rm ./usr/lib64/libresolv.so
+    ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
+    rm ./usr/lib64/libpthread.so
+    ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
+    rm ./usr/lib64/libdl.so
+    ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
+    rm ./usr/lib64/libutil.so
+    ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
+    rm ./usr/lib64/libm.so
+    ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
+    rm ./usr/lib64/librt.so
+    ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
+    rm ./lib/ld-linux-riscv64-lp64d.so.1
+    ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
+fi
+echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh
new file mode 100644
index 0000000000..37c3a61f1d
--- /dev/null
+++ b/eng/common/cross/tizen-fetch.sh
@@ -0,0 +1,178 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
+    VERBOSE=0
+fi
+
+Log()
+{
+    if [ $VERBOSE -ge 1 ]; then
+        echo ${@:2}
+    fi
+}
+
+Inform()
+{
+    Log 1 -e "\x1B[0;34m$@\x1B[m"
+}
+
+Debug()
+{
+    Log 2 -e "\x1B[0;32m$@\x1B[m"
+}
+
+Error()
+{
+    >&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
+}
+
+Fetch()
+{
+    URL=$1
+    FILE=$2
+    PROGRESS=$3
+    if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
+        CURL_OPT="--progress-bar"
+    else
+        CURL_OPT="--silent"
+    fi
+    curl $CURL_OPT $URL > $FILE
+}
+
+hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
+hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
+hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
+
+TMPDIR=$1
+if [ ! -d $TMPDIR ]; then
+    TMPDIR=./tizen_tmp
+    Debug "Create temporary directory : $TMPDIR"
+    mkdir -p $TMPDIR
+fi
+
+TIZEN_ARCH=$2
+
+TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
+BUILD_XML=build.xml
+REPOMD_XML=repomd.xml
+PRIMARY_XML=primary.xml
+TARGET_URL="http://__not_initialized"
+
+Xpath_get()
+{
+    XPATH_RESULT=''
+    XPATH=$1
+    XML_FILE=$2
+    RESULT=$(xmllint --xpath $XPATH $XML_FILE)
+    if [[ -z ${RESULT// } ]]; then
+        Error "Can not find target from $XML_FILE"
+        Debug "Xpath = $XPATH"
+        exit 1
+    fi
+    XPATH_RESULT=$RESULT
+}
+
+fetch_tizen_pkgs_init()
+{
+    TARGET=$1
+    PROFILE=$2
+    Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
+
+    TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
+    if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
+    mkdir -p $TMP_PKG_DIR
+
+    PKG_URL=$TIZEN_URL/$PROFILE/latest
+
+    BUILD_XML_URL=$PKG_URL/$BUILD_XML
+    TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
+    TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
+    TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
+    TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
+
+    Fetch $BUILD_XML_URL $TMP_BUILD
+
+    Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
+
+    TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
+    Xpath_get $TARGET_XPATH $TMP_BUILD
+    TARGET_PATH=$XPATH_RESULT
+    TARGET_URL=$PKG_URL/$TARGET_PATH
+
+    REPOMD_URL=$TARGET_URL/repodata/repomd.xml
+    PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
+
+    Fetch $REPOMD_URL $TMP_REPOMD
+
+    Debug "fetch $REPOMD_URL to $TMP_REPOMD"
+
+    Xpath_get $PRIMARY_XPATH $TMP_REPOMD
+    PRIMARY_XML_PATH=$XPATH_RESULT
+    PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
+
+    Fetch $PRIMARY_URL $TMP_PRIMARYGZ
+
+    Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
+
+    gunzip $TMP_PRIMARYGZ
+
+    Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
+}
+
+fetch_tizen_pkgs()
+{
+    ARCH=$1
+    PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
+
+    PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
+
+    for pkg in ${@:2}
+    do
+        Inform "Fetching... $pkg"
+        XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
+        XPATH=${XPATH/_ARCH_/$ARCH}
+        Xpath_get $XPATH $TMP_PRIMARY
+        PKG_PATH=$XPATH_RESULT
+
+        XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
+        XPATH=${XPATH/_ARCH_/$ARCH}
+        Xpath_get $XPATH $TMP_PRIMARY
+        CHECKSUM=$XPATH_RESULT
+
+        PKG_URL=$TARGET_URL/$PKG_PATH
+        PKG_FILE=$(basename $PKG_PATH)
+        PKG_PATH=$TMPDIR/$PKG_FILE
+
+        Debug "Download $PKG_URL to $PKG_PATH"
+        Fetch $PKG_URL $PKG_PATH true
+
+        echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
+        if [ $? -ne 0 ]; then
+            Error "Fail to fetch $PKG_URL to $PKG_PATH"
+            Debug "Checksum = $CHECKSUM"
+            exit 1
+        fi
+    done
+}
+
+BASE="Tizen-Base"
+UNIFIED="Tizen-Unified"
+
+Inform "Initialize ${TIZEN_ARCH} base"
+fetch_tizen_pkgs_init standard $BASE
+Inform "fetch common packages"
+fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
+Inform "fetch coreclr packages"
+fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+if [ "$TIZEN_ARCH" != "riscv64" ]; then
+    fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
+fi
+Inform "fetch corefx packages"
+fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
+
+Inform "Initialize standard unified"
+fetch_tizen_pkgs_init standard $UNIFIED
+Inform "fetch corefx packages"
+fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
+
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 6501c3a955..0ff85cf036 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -1,23 +1,36 @@
 set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
 
+# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
+unset(LINUX)
+unset(FREEBSD)
+unset(ILLUMOS)
+unset(ANDROID)
+unset(TIZEN)
+unset(HAIKU)
+
 set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
 if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
   set(CMAKE_SYSTEM_NAME FreeBSD)
+  set(FREEBSD 1)
 elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
   set(CMAKE_SYSTEM_NAME SunOS)
   set(ILLUMOS 1)
+elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h)
+  set(CMAKE_SYSTEM_NAME Haiku)
+  set(HAIKU 1)
 else()
   set(CMAKE_SYSTEM_NAME Linux)
+  set(LINUX 1)
 endif()
 set(CMAKE_SYSTEM_VERSION 1)
 
-if(TARGET_ARCH_NAME STREQUAL "armel")
-  set(CMAKE_SYSTEM_PROCESSOR armv7l)
-  set(TOOLCHAIN "arm-linux-gnueabi")
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
-  endif()
-elseif(TARGET_ARCH_NAME STREQUAL "arm")
+if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
+  set(TIZEN 1)
+elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
+  set(ANDROID 1)
+endif()
+
+if(TARGET_ARCH_NAME STREQUAL "arm")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
     set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
@@ -26,30 +39,93 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
+  if(TIZEN)
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
     set(TOOLCHAIN "aarch64-alpine-linux-musl")
-  else()
+  elseif(LINUX)
     set(TOOLCHAIN "aarch64-linux-gnu")
+    if(TIZEN)
+      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
+    endif()
+  elseif(FREEBSD)
+    set(triple "aarch64-unknown-freebsd12")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "armel")
+  set(CMAKE_SYSTEM_PROCESSOR armv7l)
+  set(TOOLCHAIN "arm-linux-gnueabi")
+  if(TIZEN)
+    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "armv6")
+  set(CMAKE_SYSTEM_PROCESSOR armv6l)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
+    set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
+  else()
+    set(TOOLCHAIN "arm-linux-gnueabihf")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "loongarch64")
+  set(CMAKE_SYSTEM_PROCESSOR "loongarch64")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl)
+    set(TOOLCHAIN "loongarch64-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "loongarch64-linux-gnu")
   endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
-    set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
+  set(CMAKE_SYSTEM_PROCESSOR ppc64le)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
+    set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "powerpc64le-linux-gnu")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
+  set(CMAKE_SYSTEM_PROCESSOR riscv64)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
+    set(TOOLCHAIN "riscv64-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "riscv64-linux-gnu")
+    if(TIZEN)
+      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu")
+    endif()
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   set(CMAKE_SYSTEM_PROCESSOR s390x)
-  set(TOOLCHAIN "s390x-linux-gnu")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl)
+    set(TOOLCHAIN "s390x-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "s390x-linux-gnu")
+  endif()
+elseif(TARGET_ARCH_NAME STREQUAL "x64")
+  set(CMAKE_SYSTEM_PROCESSOR x86_64)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
+    set(TOOLCHAIN "x86_64-alpine-linux-musl")
+  elseif(LINUX)
+    set(TOOLCHAIN "x86_64-linux-gnu")
+    if(TIZEN)
+      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
+    endif()
+  elseif(FREEBSD)
+    set(triple "x86_64-unknown-freebsd12")
+  elseif(ILLUMOS)
+    set(TOOLCHAIN "x86_64-illumos")
+  elseif(HAIKU)
+    set(TOOLCHAIN "x86_64-unknown-haiku")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   set(CMAKE_SYSTEM_PROCESSOR i686)
-  set(TOOLCHAIN "i686-linux-gnu")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-  set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-  set(triple "x86_64-unknown-freebsd12")
-elseif (ILLUMOS)
-  set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-  set(TOOLCHAIN "x86_64-illumos")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
+    set(TOOLCHAIN "i586-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "i686-linux-gnu")
+  endif()
+  if(TIZEN)
+    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
+  endif()
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -57,18 +133,48 @@ if(DEFINED ENV{TOOLCHAIN})
 endif()
 
 # Specify include paths
-if(DEFINED TIZEN_TOOLCHAIN)
-  if(TARGET_ARCH_NAME STREQUAL "armel")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "arm64")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
+if(TIZEN)
+  function(find_toolchain_dir prefix)
+    # Dynamically find the version subdirectory
+    file(GLOB DIRECTORIES "${prefix}/*")
+    list(GET DIRECTORIES 0 FIRST_MATCH)
+    get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
+
+    set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
+  endfunction()
+
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
+    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+  else()
+    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
   endif()
+
+  message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
+
+  include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
+  include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
 endif()
 
-if("$ENV{__DistroRid}" MATCHES "android.*")
+function(locate_toolchain_exec exec var)
+    set(TOOLSET_PREFIX ${TOOLCHAIN}-)
+    string(TOUPPER ${exec} EXEC_UPPERCASE)
+    if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
+        set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
+        return()
+    endif()
+
+    find_program(EXEC_LOCATION_${exec}
+        NAMES
+        "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
+        "${TOOLSET_PREFIX}${exec}")
+
+    if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
+        message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
+    endif()
+    set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
+endfunction()
+
+if(ANDROID)
     if(TARGET_ARCH_NAME STREQUAL "arm")
         set(ANDROID_ABI armeabi-v7a)
     elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@@ -76,7 +182,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
     endif()
 
     # extract platform number required by the NDK's toolchain
-    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
+    file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS)
+    string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}")
+    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}")
 
     set(ANDROID_TOOLCHAIN clang)
     set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
@@ -85,7 +193,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
 
     # include official NDK toolchain script
     include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif(FREEBSD)
     # we cross-compile by instructing clang
     set(CMAKE_C_COMPILER_TARGET ${triple})
     set(CMAKE_CXX_COMPILER_TARGET ${triple})
@@ -96,35 +204,26 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
 elseif(ILLUMOS)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
+    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
+    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 
     include_directories(SYSTEM ${CROSS_ROOTFS}/include)
 
-    set(TOOLSET_PREFIX ${TOOLCHAIN}-)
-    function(locate_toolchain_exec exec var)
-        string(TOUPPER ${exec} EXEC_UPPERCASE)
-        if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
-            set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
-            return()
-        endif()
-
-        find_program(EXEC_LOCATION_${exec}
-            NAMES
-            "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
-            "${TOOLSET_PREFIX}${exec}")
-
-        if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
-            message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
-        endif()
-        set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
-    endfunction()
-
+    locate_toolchain_exec(gcc CMAKE_C_COMPILER)
+    locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
+elseif(HAIKU)
+    set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
     set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
+    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
+    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 
     locate_toolchain_exec(gcc CMAKE_C_COMPILER)
     locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 
-    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
-    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
+    # let CMake set up the correct search paths
+    include(Platform/Haiku)
 else()
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 
@@ -145,39 +244,54 @@ function(add_toolchain_linker_flag Flag)
   set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(LINUX)
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "armel")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
-    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
+  if(TIZEN)
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
   endif()
-elseif(TARGET_ARCH_NAME STREQUAL "arm64")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
-    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
+  if(TIZEN)
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
 
     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
-    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "s390x")
+  add_toolchain_linker_flag("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
+    add_toolchain_linker_flag("--target=${TOOLCHAIN}")
+    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
+  endif()
   add_toolchain_linker_flag(-m32)
+  if(TIZEN)
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
+  endif()
 elseif(ILLUMOS)
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
+elseif(HAIKU)
+  add_toolchain_linker_flag("-lnetwork")
+  add_toolchain_linker_flag("-lroot")
 endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -196,16 +310,24 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
 
   add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
 
+  # persist variables across multiple try_compile passes
+  list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CLR_ARM_FPU_TYPE CLR_ARM_FPU_CAPABILITY)
+
   if(TARGET_ARCH_NAME STREQUAL "armel")
     add_compile_options(-mfloat-abi=softfp)
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "s390x")
+  add_compile_options("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
+    add_compile_options(--target=${TOOLCHAIN})
+  endif()
   add_compile_options(-m32)
   add_compile_options(-Wno-error=unused-command-line-argument)
 endif()
 
-if(DEFINED TIZEN_TOOLCHAIN)
-  if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
+if(TIZEN)
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
   endif()
@@ -239,6 +361,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
   endif()
 endif()
 
+# Set C++ standard library options if specified
+set(CLR_CMAKE_CXX_STANDARD_LIBRARY "" CACHE STRING "Standard library flavor to link against. Only supported with the Clang compiler.")
+if (CLR_CMAKE_CXX_STANDARD_LIBRARY)
+  add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
+  add_link_options($<$<LINK_LANG_AND_ID:CXX,Clang>:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>)
+endif()
+
+option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF)
+if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC)
+  add_link_options($<$<LINK_LANGUAGE:CXX>:-static-libstdc++>)
+endif()
+
+set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.")
+if (CLR_CMAKE_CXX_ABI_LIBRARY)
+  # The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library.
+  string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY})
+  # We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++.
+  add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}")
+endif()
+
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/eng/common/cross/x64/tizen/tizen.patch b/eng/common/cross/x64/tizen/tizen.patch
new file mode 100644
index 0000000000..56fbc88109
--- /dev/null
+++ b/eng/common/cross/x64/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so
+--- a/usr/lib64/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib64/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf64-x86-64)
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-x86-64.so.2 ) )
diff --git a/eng/common/cross/x86/sources.list.bionic b/eng/common/cross/x86/sources.list.bionic
deleted file mode 100644
index a71ccadcff..0000000000
--- a/eng/common/cross/x86/sources.list.bionic
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
diff --git a/eng/common/cross/x86/sources.list.xenial b/eng/common/cross/x86/sources.list.xenial
deleted file mode 100644
index ad9c5a0144..0000000000
--- a/eng/common/cross/x86/sources.list.xenial
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
-deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
-
-deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
-
-deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
diff --git a/eng/common/cross/x86/tizen/tizen.patch b/eng/common/cross/x86/tizen/tizen.patch
new file mode 100644
index 0000000000..f4fe8838ad
--- /dev/null
+++ b/eng/common/cross/x86/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf32-i386)
+-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux.so.2 ) )
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 435e764134..e337431056 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -1,6 +1,6 @@
 param (
     $darcVersion = $null,
-    $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
+    $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20',
     $verbosity = 'minimal',
     $toolpath = $null
 )
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index 84c1d0cc2e..e889f439b8 100644
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -2,7 +2,7 @@
 
 source="${BASH_SOURCE[0]}"
 darcVersion=''
-versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
+versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20'
 verbosity='minimal'
 
 while [[ $# > 0 ]]; do
@@ -68,7 +68,7 @@ function InstallDarcCli {
     fi
   fi
 
-  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
+  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 
   echo "Installing Darc CLI version $darcVersion..."
   echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
old mode 100644
new mode 100755
index fdfeea66e7..7b9d97e3bd
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -52,8 +52,15 @@ done
 # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
 cpuname=$(uname -m)
 case $cpuname in
-  aarch64)
+  arm64|aarch64)
     buildarch=arm64
+    if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+        # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+        buildarch=arm
+    fi
+    ;;
+  loongarch64)
+    buildarch=loongarch64
     ;;
   amd64|x86_64)
     buildarch=x64
@@ -61,9 +68,12 @@ case $cpuname in
   armv*l)
     buildarch=arm
     ;;
-  i686)
+  i[3-6]86)
     buildarch=x86
     ;;
+  riscv64)
+    buildarch=riscv64
+    ;;
   *)
     echo "Unknown CPU $cpuname detected, treating it as x64"
     buildarch=x64
@@ -75,7 +85,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
   dotnetRoot="$dotnetRoot/$architecture"
 fi
 
-InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
+InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
   local exit_code=$?
   Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
   ExitWithExitCode $exit_code
diff --git a/eng/common/dotnet.cmd b/eng/common/dotnet.cmd
new file mode 100644
index 0000000000..527fa4bb38
--- /dev/null
+++ b/eng/common/dotnet.cmd
@@ -0,0 +1,7 @@
+@echo off
+
+:: This script is used to install the .NET SDK.
+:: It will also invoke the SDK with any provided arguments.
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
+exit /b %ErrorLevel%
diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1
new file mode 100644
index 0000000000..45e5676c9e
--- /dev/null
+++ b/eng/common/dotnet.ps1
@@ -0,0 +1,11 @@
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+. $PSScriptRoot\tools.ps1
+$dotnetRoot = InitializeDotNetCli -install:$true
+
+# Invoke acquired SDK with args if they are provided
+if ($args.count -gt 0) {
+  $env:DOTNET_NOLOGO=1
+  & "$dotnetRoot\dotnet.exe" $args
+}
diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh
new file mode 100644
index 0000000000..2ef6823567
--- /dev/null
+++ b/eng/common/dotnet.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+source="${BASH_SOURCE[0]}"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+source $scriptroot/tools.sh
+InitializeDotNetCli true # install
+
+# Invoke acquired SDK with args if they are provided
+if [[ $# > 0 ]]; then
+  __dotnetDir=${_InitializeDotNetCli}
+  dotnetPath=${__dotnetDir}/dotnet
+  ${dotnetPath} "$@"
+fi
diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1
deleted file mode 100644
index 0728b1a8b5..0000000000
--- a/eng/common/generate-graph-files.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-Param(
-  [Parameter(Mandatory=$true)][string] $barToken,       # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens
-  [Parameter(Mandatory=$true)][string] $gitHubPat,      # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
-  [Parameter(Mandatory=$true)][string] $azdoPat,        # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
-  [Parameter(Mandatory=$true)][string] $outputFolder,   # Where the graphviz.txt file will be created
-  [string] $darcVersion,                                # darc's version
-  [string] $graphvizVersion = '2.38',                   # GraphViz version
-  [switch] $includeToolset                              # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
-                                                        # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
-)
-
-function CheckExitCode ([string]$stage)
-{
-  $exitCode = $LASTEXITCODE
-  if ($exitCode  -ne 0) {
-    Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..."
-    ExitWithExitCode $exitCode
-  }
-}
-
-try {
-  $ErrorActionPreference = 'Stop'
-  . $PSScriptRoot\tools.ps1
-  
-  Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
-
-  Push-Location $PSScriptRoot
-
-  Write-Host 'Installing darc...'
-  . .\darc-init.ps1 -darcVersion $darcVersion
-  CheckExitCode 'Running darc-init'
-
-  $engCommonBaseDir = Join-Path $PSScriptRoot 'native\'
-  $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory
-  $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external'
-  $installBin = Join-Path $graphvizInstallDir 'bin'
-
-  Write-Host 'Installing dot...'
-  .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose
-
-  $darcExe = "$env:USERPROFILE\.dotnet\tools"
-  $darcExe = Resolve-Path "$darcExe\darc.exe"
-
-  Create-Directory $outputFolder
-
-  # Generate 3 graph descriptions:
-  # 1. Flat with coherency information
-  # 2. Graphviz (dot) file
-  # 3. Standard dependency graph
-  $graphVizFilePath = "$outputFolder\graphviz.txt"
-  $graphVizImageFilePath = "$outputFolder\graph.png"
-  $normalGraphFilePath = "$outputFolder\graph-full.txt"
-  $flatGraphFilePath = "$outputFolder\graph-flat.txt"
-  $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" )
-
-  if ($includeToolset) {
-    Write-Host 'Toolsets will be included in the graph...'
-    $baseOptions += @( '--include-toolset' )
-  }
-
-  Write-Host 'Generating standard dependency graph...'
-  & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath
-  CheckExitCode 'Generating normal dependency graph'
-
-  Write-Host 'Generating flat dependency graph and graphviz file...'
-  & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath
-  CheckExitCode 'Generating flat and graphviz dependency graph'
-
-  Write-Host "Generating graph image $graphVizFilePath"
-  $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe"
-  & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath"
-  CheckExitCode 'Generating graphviz image'
-
-  Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!"
-}
-catch {
-  if (!$includeToolset) {
-    Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow
-    Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow
-  }
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category 'Arcade' -Message $_
-  ExitWithExitCode 1
-} finally {
-  Pop-Location
-}
\ No newline at end of file
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 25e97ac007..524aaa57f2 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -10,9 +10,7 @@ Param(
 
 Set-StrictMode -Version 2.0
 $ErrorActionPreference = "Stop"
-. $PSScriptRoot\tools.ps1
-
-Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
+. $PSScriptRoot\pipeline-logging-functions.ps1
 
 $exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
 $exclusions = @{ Exclusions = @() }
@@ -28,13 +26,34 @@ $jsonFiles = @()
 $jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern
 $jsonTemplateFiles | ForEach-Object {
     $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
-    
+
     $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json"
     $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 
 $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
 
+$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
+if (-not $wxlFiles) {
+    $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } #  pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
+    if ($wxlEnFiles) {
+      $wxlFiles = @()
+      $wxlEnFiles | ForEach-Object {
+        $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
+        $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+      }
+    }
+}
+
+$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files
+$macosHtmlFiles = @()
+if ($macosHtmlEnFiles) {
+    $macosHtmlEnFiles | ForEach-Object {
+        $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
+        $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
+    }
+}
+
 $xlfFiles = @()
 
 $allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
@@ -46,7 +65,7 @@ if ($allXlfFiles) {
 }
 $langXlfFiles | ForEach-Object {
     $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
-    
+
     $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
     $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
@@ -59,10 +78,10 @@ $locJson = @{
             LanguageSet = $LanguageSet
             LocItems = @(
                 $locFiles | ForEach-Object {
-                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
+                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
                     $continue = $true
                     foreach ($exclusion in $exclusions.Exclusions) {
-                        if ($outputPath.Contains($exclusion))
+                        if ($_.FullName.Contains($exclusion))
                         {
                             $continue = $false
                         }
@@ -79,8 +98,7 @@ $locJson = @{
                                 CopyOption = "LangIDOnPath"
                                 OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
                             }
-                        }
-                        else {
+                        } else {
                             return @{
                                 SourceFile = $sourceFile
                                 CopyOption = "LangIDOnName"
@@ -90,6 +108,60 @@ $locJson = @{
                     }
                 }
             )
+        },
+        @{
+            LanguageSet = $LanguageSet
+            CloneLanguageSet = "WiX_CloneLanguages"
+            LssFiles = @( "wxl_loc.lss" )
+            LocItems = @(
+                $wxlFiles | ForEach-Object {
+                    $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
+                    $continue = $true
+                    foreach ($exclusion in $exclusions.Exclusions) {
+                        if ($_.FullName.Contains($exclusion)) {
+                            $continue = $false
+                        }
+                    }
+                    $sourceFile = ($_.FullName | Resolve-Path -Relative)
+                    if ($continue)
+                    {
+                        return @{
+                            SourceFile = $sourceFile
+                            CopyOption = "LangIDOnPath"
+                            OutputPath = $outputPath
+                        }
+                    }
+                }
+            )
+        },
+        @{
+            LanguageSet = $LanguageSet
+            CloneLanguageSet = "VS_macOS_CloneLanguages"
+            LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
+            LocItems = @(
+                $macosHtmlFiles | ForEach-Object {
+                    $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
+                    $continue = $true
+                    foreach ($exclusion in $exclusions.Exclusions) {
+                        if ($_.FullName.Contains($exclusion)) {
+                            $continue = $false
+                        }
+                    }
+                    $sourceFile = ($_.FullName | Resolve-Path -Relative)
+                    $lciFile = $sourceFile + ".lci"
+                    if ($continue) {
+                        $result = @{
+                            SourceFile = $sourceFile
+                            CopyOption = "LangIDOnPath"
+                            OutputPath = $outputPath
+                        }
+                        if (Test-Path $lciFile -PathType Leaf) {
+                            $result["LciFile"] = $lciFile
+                        }
+                        return $result
+                    }
+                }
+            )
         }
     )
 }
@@ -108,10 +180,10 @@ else {
 
     if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
         Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
-        
+
         exit 1
     }
     else {
         Write-Host "Generated LocProject.json and current LocProject.json are identical."
     }
-}
\ No newline at end of file
+}
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
new file mode 100644
index 0000000000..a0c7d792a7
--- /dev/null
+++ b/eng/common/generate-sbom-prep.ps1
@@ -0,0 +1,29 @@
+Param(
+    [Parameter(Mandatory=$true)][string] $ManifestDirPath    # Manifest directory where sbom will be placed
+)
+
+. $PSScriptRoot\pipeline-logging-functions.ps1
+
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
+Write-Host "Creating dir $ManifestDirPath"
+
+# create directory for sbom manifest to be placed
+if (!(Test-Path -path $SbomGenerationDir))
+{
+  New-Item -ItemType Directory -path $SbomGenerationDir
+  Write-Host "Successfully created directory $SbomGenerationDir"
+}
+else{
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+}
+
+Write-Host "Updating artifact name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
new file mode 100644
index 0000000000..b8ecca72bb
--- /dev/null
+++ b/eng/common/generate-sbom-prep.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+. $scriptroot/pipeline-logging-functions.sh
+
+
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+manifest_dir=$1
+
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+  mkdir -p "$sbom_generation_dir"
+  echo "Sbom directory created." $sbom_generation_dir
+else
+  Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
+fi
+
+echo "Artifact name before : "$artifact_name
+echo "Artifact name after : "$safe_artifact_name
+export ARTIFACT_NAME=$safe_artifact_name
+echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
+
+exit 0
diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj
index d7f185856e..c1323bf412 100644
--- a/eng/common/helixpublish.proj
+++ b/eng/common/helixpublish.proj
@@ -1,3 +1,4 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
 
   <PropertyGroup>
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index db830c00a6..27ccdb9ecc 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -31,6 +31,10 @@ Wait time between retry attempts in seconds
 .PARAMETER GlobalJsonFile
 File path to global.json file
 
+.PARAMETER PathPromotion
+Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines)
+or break the build if a native tool is not found on the path (on a local dev machine)
+
 .NOTES
 #>
 [CmdletBinding(PositionalBinding=$false)]
@@ -41,7 +45,8 @@ Param (
   [switch] $Force = $False,
   [int] $DownloadRetries = 5,
   [int] $RetryWaitTimeInSeconds = 30,
-  [string] $GlobalJsonFile
+  [string] $GlobalJsonFile,
+  [switch] $PathPromotion
 )
 
 if (!$GlobalJsonFile) {
@@ -77,53 +82,99 @@ try {
                     ConvertFrom-Json |
                     Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue
   if ($NativeTools) {
-    $NativeTools.PSObject.Properties | ForEach-Object {
-      $ToolName = $_.Name
-      $ToolVersion = $_.Value
-      $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
-      $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
-      $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
-      $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
-      $LocalInstallerArguments += @{ Version = "$ToolVersion" }
-
-      if ($Verbose) {
-        $LocalInstallerArguments += @{ Verbose = $True }
-      }
-      if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
-        if($Force) {
-          $LocalInstallerArguments += @{ Force = $True }
-        }
-      }
-      if ($Clean) {
-        $LocalInstallerArguments += @{ Clean = $True }
-      }
-
-      Write-Verbose "Installing $ToolName version $ToolVersion"
-      Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
-      & $InstallerPath @LocalInstallerArguments
-      if ($LASTEXITCODE -Ne "0") {
-        $errMsg = "$ToolName installation failed"
-        if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
-            $showNativeToolsWarning = $true
-            if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
-                $showNativeToolsWarning = $false
+    if ($PathPromotion -eq $True) {
+      $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools"
+      if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+          $InstalledTools = @{}
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            if ($ToolVersion -eq "latest") {
+              $ToolVersion = ""
+            }
+            $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
+            if ($ToolDirectories -eq $null) {
+              Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
+              exit 1
             }
-            if ($showNativeToolsWarning) {
-                Write-Warning $errMsg
+            $ToolDirectory = $ToolDirectories[0]
+            $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
+            if (-not (Test-Path -Path "$BinPathFile")) {
+              Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
+              exit 1
             }
-            $toolInstallationFailure = $true
-        } else {
-            # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
-            Write-Host $errMsg
-            exit 1
+            $BinPath = Get-Content "$BinPathFile"
+            $ToolPath = Convert-Path -Path $BinPath
+            Write-Host "Adding $ToolName to the path ($ToolPath)..."
+            Write-Host "##vso[task.prependpath]$ToolPath"
+            $env:PATH = "$ToolPath;$env:PATH"
+            $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
+          }
         }
+        return $InstalledTools
+      } else {
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
+            Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image."
+          }
+        }
+        exit 0
+      }
+    } else {
+      $NativeTools.PSObject.Properties | ForEach-Object {
+        $ToolName = $_.Name
+        $ToolVersion = $_.Value
+        $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
+        $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
+        $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
+        $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
+        $LocalInstallerArguments += @{ Version = "$ToolVersion" }
+  
+        if ($Verbose) {
+          $LocalInstallerArguments += @{ Verbose = $True }
+        }
+        if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
+          if($Force) {
+            $LocalInstallerArguments += @{ Force = $True }
+          }
+        }
+        if ($Clean) {
+          $LocalInstallerArguments += @{ Clean = $True }
+        }
+  
+        Write-Verbose "Installing $ToolName version $ToolVersion"
+        Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
+        & $InstallerPath @LocalInstallerArguments
+        if ($LASTEXITCODE -Ne "0") {
+          $errMsg = "$ToolName installation failed"
+          if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
+              $showNativeToolsWarning = $true
+              if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+                  $showNativeToolsWarning = $false
+              }
+              if ($showNativeToolsWarning) {
+                  Write-Warning $errMsg
+              }
+              $toolInstallationFailure = $true
+          } else {
+              # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
+              Write-Host $errMsg
+              exit 1
+          }
+        }
+      }
+  
+      if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
+          # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
+          Write-Host 'Native tools bootstrap failed'
+          exit 1
       }
-    }
-
-    if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
-        # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482
-        Write-Host 'Native tools bootstrap failed'
-        exit 1
     }
   }
   else {
@@ -139,7 +190,7 @@ try {
     Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
     return $InstallBin
   }
-  else {
+  elseif (-not ($PathPromotion)) {
     Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
     exit 1
   }
diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props
index dbf99d82a5..f1d041c33d 100644
--- a/eng/common/internal/Directory.Build.props
+++ b/eng/common/internal/Directory.Build.props
@@ -1,4 +1,11 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
+
+  <PropertyGroup>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
+  </PropertyGroup>
+
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
 </Project>
diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
new file mode 100644
index 0000000000..f70261ed68
--- /dev/null
+++ b/eng/common/internal/NuGet.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <clear />
+  </packageSourceMapping>
+</configuration>
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index beb9c4648e..feaa6d2081 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -1,27 +1,22 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
     <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
+    <BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
   </PropertyGroup>
   <ItemGroup>
     <!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
     <PackageReference Remove="@(PackageReference)"/>
+    <PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
     <PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
     <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
   </ItemGroup>
-  <PropertyGroup>
-    <RestoreSources></RestoreSources>
-    <RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
-      https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
-      $(RestoreSources);
-      https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
 
   <!-- Repository extensibility point -->
   <Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
+
 </Project>
diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
new file mode 100644
index 0000000000..5d892d6193
--- /dev/null
+++ b/eng/common/loc/P22DotNetHtmlLocalization.lss
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<LS_SETTINGS_FILE>
+  <LS_SETTINGS_DESCRIPTION>
+    <![CDATA[]]>
+  </LS_SETTINGS_DESCRIPTION>
+  <optionSet id="LSOptions">
+    <optionSet id="Defaults" displayName="Options Defaults">
+      <optionSet id="Espresso" displayName="Espresso"/>
+      <optionSet id="Parsers" displayName="Parsers"/>
+    </optionSet>
+    <optionSet id="User" displayName="User Overrides">
+      <optionSet id="Espresso" displayName="Espresso"/>
+      <optionSet id="Parsers" displayName="Parsers"/>
+    </optionSet>
+    <optionSet id="Project" displayName="Project Overrides">
+      <optionSet id="Espresso" displayName="Espresso"/>
+      <optionSet id="Parsers" displayName="Parsers">
+        <optionSet id="Parser 22" displayName="POMHTML Parser options" helpText="POMHTML Parser options for Localization Studio.">
+          <option id="SetCharsetInfo" displayName="Set or add Charset information when Generating" helpText="Add Charset information to the Generated file. This is in the format &lt;META HTTP-EQUIV=&quot;Content-Type&quot; CONTENT=&quot;text/html; charset=windows-1252&quot;&gt;. This is based on the Project Target Langauge. If the dir attribute value in the HTML tag i.e. &lt;HTML dir=&quot;ltr&quot;&gt; is not localizable or is missing, its value will be set automatically on Generate if the reading order of the target language is different from the source language.">
+            <boolean defaultValue="1" currentValue="0"/>
+          </option>
+          <option id="IncTermNoResId" displayName="Include Terms which have no Resource Identifier" helpText="Include Terms which have no Resource Identifier. Terms without Resource Identifiers cannot be Updated or Uploaded if they change.">
+            <boolean defaultValue="0" currentValue="1"/>
+          </option>
+        </optionSet>
+      </optionSet>
+    </optionSet>
+  </optionSet>
+</LS_SETTINGS_FILE>
\ No newline at end of file
diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1
index adf707c8fe..f71f6af6cd 100644
--- a/eng/common/native/CommonLibrary.psm1
+++ b/eng/common/native/CommonLibrary.psm1
@@ -276,7 +276,9 @@ function Get-MachineArchitecture {
   }
   if (($ProcessorArchitecture -Eq "AMD64") -Or
       ($ProcessorArchitecture -Eq "IA64") -Or
-      ($ProcessorArchitecture -Eq "ARM64")) {
+      ($ProcessorArchitecture -Eq "ARM64") -Or
+      ($ProcessorArchitecture -Eq "LOONGARCH64") -Or
+      ($ProcessorArchitecture -Eq "RISCV64")) {
     return "x64"
   }
   return "x86"
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index e361e03fab..9a0e1f2b45 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -1,124 +1,146 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
-# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! 
+# NOTE: some scripts source this file and rely on stdout being empty, make sure
+# to not output *anything* here, unless it is an error message that fails the
+# build.
 
-if [[ "$#" -lt 3 ]]; then
+if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
   echo "Usage..."
-  echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
-  echo "Specify the script directory."
+  echo "build_arch=<ARCH> compiler=<NAME> init-compiler.sh"
   echo "Specify the target architecture."
   echo "Specify the name of compiler (clang or gcc)."
-  echo "Specify the major version of compiler."
-  echo "Specify the minor version of compiler."
   exit 1
 fi
 
-nativescriptroot="$1"
-build_arch="$2"
-compiler="$3"
-cxxCompiler="$compiler++"
-majorVersion="$4"
-minorVersion="$5"
+case "$compiler" in
+    clang*|-clang*|--clang*)
+        # clangx.y or clang-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        majorVersion="${version%%.*}"
+
+        # LLVM based on v18 released in early 2024, with two releases per year
+        maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))"
+        compiler=clang
+        ;;
+
+    gcc*|-gcc*|--gcc*)
+        # gccx.y or gcc-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        majorVersion="${version%%.*}"
+
+        # GCC based on v14 released in early 2024, with one release per year
+        maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))"
+        compiler=gcc
+        ;;
+esac
 
-. "$nativescriptroot"/../pipeline-logging-functions.sh
+cxxCompiler="$compiler++"
 
 # clear the existing CC and CXX from environment
 CC=
 CXX=
 LDFLAGS=
 
-if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi
+if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi
 
 check_version_exists() {
     desired_version=-1
 
     # Set up the environment to be used for building with the desired compiler.
-    if command -v "$compiler-$1.$2" > /dev/null; then
-        desired_version="-$1.$2"
-    elif command -v "$compiler$1$2" > /dev/null; then
-        desired_version="$1$2"
-    elif command -v "$compiler-$1$2" > /dev/null; then
-        desired_version="-$1$2"
+    if command -v "$compiler-$1" > /dev/null; then
+        desired_version="-$1"
+    elif command -v "$compiler$1" > /dev/null; then
+        desired_version="$1"
     fi
 
     echo "$desired_version"
 }
 
-if [[ -z "$CLR_CC" ]]; then
+__baseOS="$(uname)"
+set_compiler_version_from_CC() {
+    if [ "$__baseOS" = "Darwin" ]; then
+        # On Darwin, the versions from -version/-dumpversion refer to Xcode
+        # versions, not llvm versions, so we can't rely on them.
+        return
+    fi
+
+    version="$("$CC" -dumpversion)"
+    if [ -z "$version" ]; then
+        echo "Error: $CC -dumpversion didn't provide a version"
+        exit 1
+    fi
+
+    # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
+    IFS=. read -r majorVersion _ <<EOF
+$version
+EOF
+}
+
+if [ -z "$CLR_CC" ]; then
 
     # Set default versions
-    if [[ -z "$majorVersion" ]]; then
-        # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-        elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
-
-        for version in "${versions[@]}"; do
-            parts=(${version//./ })
-            desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
-            if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi
+    if [ -z "$majorVersion" ]; then
+        minVersion=8
+        maxVersion="$((maxVersion + 1))" # +1 for headspace
+        i="$maxVersion"
+        while [ "$i" -ge $minVersion ]; do
+            desired_version="$(check_version_exists "$i")"
+            if [ "$desired_version" != "-1" ]; then majorVersion="$i"; break; fi
+            i=$((i - 1))
         done
 
-        if [[ -z "$majorVersion" ]]; then
-            if command -v "$compiler" > /dev/null; then
-                if [[ "$(uname)" != "Darwin" ]]; then
-                    Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
-                fi
-                CC="$(command -v "$compiler")"
-                CXX="$(command -v "$cxxCompiler")"
-            else
-                Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
+        if [ -z "$majorVersion" ]; then
+            if ! command -v "$compiler" > /dev/null; then
+                echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables."
                 exit 1
             fi
-        else
-            if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
-                if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
-                    if command -v "$compiler" > /dev/null; then
-                        Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
-                        CC="$(command -v "$compiler")"
-                        CXX="$(command -v "$cxxCompiler")"
-                    else
-                        Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
-                        exit 1
-                    fi
-                fi
-            fi
+
+            CC="$(command -v "$compiler" 2> /dev/null)"
+            CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
+            set_compiler_version_from_CC
         fi
     else
-        desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
-        if [[ "$desired_version" == "-1" ]]; then
-            Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
+        desired_version="$(check_version_exists "$majorVersion")"
+        if [ "$desired_version" = "-1" ]; then
+            echo "Error: Could not find specific version of $compiler: $majorVersion."
             exit 1
         fi
     fi
 
-    if [[ -z "$CC" ]]; then
-        CC="$(command -v "$compiler$desired_version")"
-        CXX="$(command -v "$cxxCompiler$desired_version")"
-        if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi
+    if [ -z "$CC" ]; then
+        CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
+        CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
+        if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
+        set_compiler_version_from_CC
     fi
 else
-    if [[ ! -f "$CLR_CC" ]]; then
-        Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
+    if [ ! -f "$CLR_CC" ]; then
+        echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
         exit 1
     fi
     CC="$CLR_CC"
     CXX="$CLR_CXX"
+    set_compiler_version_from_CC
 fi
 
-if [[ -z "$CC" ]]; then
-    Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
+if [ -z "$CC" ]; then
+    echo "Error: Unable to find $compiler."
     exit 1
 fi
 
-# Only lld version >= 9 can be considered stable
-if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
-    if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
-        LDFLAGS="-fuse-ld=lld"
+if [ "$__baseOS" != "Darwin" ]; then
+    # On Darwin, we always want to use the Apple linker.
+
+    # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
+    if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
+        if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
+            LDFLAGS="-fuse-ld=lld"
+        fi
     fi
 fi
 
-SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
+SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"
 
 export CC CXX LDFLAGS SCAN_BUILD_COMMAND
diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh
new file mode 100644
index 0000000000..83ea7aab0e
--- /dev/null
+++ b/eng/common/native/init-distro-rid.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# getNonPortableDistroRid
+#
+# Input:
+#   targetOs: (str)
+#   targetArch: (str)
+#   rootfsDir: (str)
+#
+# Return:
+#   non-portable rid
+getNonPortableDistroRid()
+{
+    targetOs="$1"
+    targetArch="$2"
+    rootfsDir="$3"
+    nonPortableRid=""
+
+    if [ "$targetOs" = "linux" ]; then
+        # shellcheck disable=SC1091
+        if [ -e "${rootfsDir}/etc/os-release" ]; then
+            . "${rootfsDir}/etc/os-release"
+            if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
+                nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
+            else
+                # Rolling release distros either do not set VERSION_ID, set it as blank or
+                # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
+                # so omit it here to be consistent with everything else.
+                nonPortableRid="${ID}-${targetArch}"
+            fi
+        elif [ -e "${rootfsDir}/android_platform" ]; then
+            # shellcheck disable=SC1091
+            . "${rootfsDir}/android_platform"
+            nonPortableRid="$RID"
+        fi
+    fi
+
+    if [ "$targetOs" = "freebsd" ]; then
+        # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
+        __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
+        nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
+    elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
+        __android_sdk_version=$(getprop ro.build.version.sdk)
+        nonPortableRid="android.$__android_sdk_version-${targetArch}"
+    elif [ "$targetOs" = "illumos" ]; then
+        __uname_version=$(uname -v)
+        nonPortableRid="illumos-${targetArch}"
+    elif [ "$targetOs" = "solaris" ]; then
+        __uname_version=$(uname -v)
+        __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
+        nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
+    elif [ "$targetOs" = "haiku" ]; then
+        __uname_release="$(uname -r)"
+        nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
+    fi
+
+    echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
+}
+
+# initDistroRidGlobal
+#
+# Input:
+#   os: (str)
+#   arch: (str)
+#   rootfsDir?: (nullable:string)
+#
+# Return:
+#   None
+#
+# Notes:
+#   It is important to note that the function does not return anything, but it
+#   exports the following variables on success:
+#     __DistroRid   : Non-portable rid of the target platform.
+#     __PortableTargetOS  : OS-part of the portable rid that corresponds to the target platform.
+initDistroRidGlobal()
+{
+    targetOs="$1"
+    targetArch="$2"
+    rootfsDir=""
+    if [ $# -ge 3 ]; then
+        rootfsDir="$3"
+    fi
+
+    if [ -n "${rootfsDir}" ]; then
+        # We may have a cross build. Check for the existence of the rootfsDir
+        if [ ! -e "${rootfsDir}" ]; then
+            echo "Error: rootfsDir has been passed, but the location is not valid."
+            exit 1
+        fi
+    fi
+
+    __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}")
+
+    if [ -z "${__PortableTargetOS:-}" ]; then
+        __PortableTargetOS="$targetOs"
+
+        STRINGS="$(command -v strings || true)"
+        if [ -z "$STRINGS" ]; then
+            STRINGS="$(command -v llvm-strings || true)"
+        fi
+
+        # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
+        if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
+                ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
+            __PortableTargetOS="linux-musl"
+        fi
+    fi
+
+    export __DistroRid __PortableTargetOS
+}
diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh
new file mode 100644
index 0000000000..38921d4338
--- /dev/null
+++ b/eng/common/native/init-os-and-arch.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Use uname to determine what the OS is.
+OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
+    OSName="android"
+fi
+
+case "$OSName" in
+freebsd|linux|netbsd|openbsd|sunos|android|haiku)
+    os="$OSName" ;;
+darwin)
+    os=osx ;;
+*)
+    echo "Unsupported OS $OSName detected!"
+    exit 1 ;;
+esac
+
+# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html
+# and `uname -p` returns processor type (e.g. i386 on amd64).
+# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html.
+if [ "$os" = "sunos" ]; then
+    if uname -o 2>&1 | grep -q illumos; then
+        os="illumos"
+    else
+        os="solaris"
+    fi
+    CPUName=$(isainfo -n)
+else
+    # For the rest of the operating systems, use uname(1) to determine what the CPU is.
+    CPUName=$(uname -m)
+fi
+
+case "$CPUName" in
+    arm64|aarch64)
+        arch=arm64
+        if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+            # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+            arch=arm
+        fi
+        ;;
+
+    loongarch64)
+        arch=loongarch64
+        ;;
+
+    riscv64)
+        arch=riscv64
+        ;;
+
+    amd64|x86_64)
+        arch=x64
+        ;;
+
+    armv7l|armv8l)
+        # shellcheck disable=SC1091
+        if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
+            arch=armel
+        else
+            arch=arm
+        fi
+        ;;
+
+    armv6l)
+        arch=armv6
+        ;;
+
+    i[3-6]86)
+        echo "Unsupported CPU $CPUName detected, build might not succeed!"
+        arch=x86
+        ;;
+
+    s390x)
+        arch=s390x
+        ;;
+
+    ppc64le)
+        arch=ppc64le
+        ;;
+    *)
+        echo "Unknown CPU $CPUName detected!"
+        exit 1
+        ;;
+esac
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
new file mode 100644
index 0000000000..477a44f335
--- /dev/null
+++ b/eng/common/native/install-dependencies.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+# This is a simple script primarily used for CI to install necessary dependencies
+#
+# Usage:
+#
+# ./install-dependencies.sh <OS>
+
+os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+
+if [ -z "$os" ]; then
+    . "$(dirname "$0")"/init-os-and-arch.sh
+fi
+
+case "$os" in
+    linux)
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+        fi
+
+        if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
+            apt update
+
+            apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
+                libssl-dev libkrb5-dev pigz cpio
+
+            localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+        elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
+            pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
+            $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
+        elif [ "$ID" = "alpine" ]; then
+            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
+        else
+            echo "Unsupported distro. distro: $ID"
+            exit 1
+        fi
+        ;;
+
+    osx|maccatalyst|ios|iossimulator|tvos|tvossimulator)
+        echo "Installed xcode version: $(xcode-select -p)"
+
+        export HOMEBREW_NO_INSTALL_CLEANUP=1
+        export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+        # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
+        # brew update --preinstall
+        brew bundle --no-upgrade --file=- <<EOF
+brew "cmake"
+brew "icu4c"
+brew "openssl@3"
+brew "pkgconf"
+brew "python3"
+brew "pigz"
+EOF
+        ;;
+
+    *)
+        echo "Unsupported platform. OS: $os"
+        exit 1
+        ;;
+esac
diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1
deleted file mode 100644
index de2d957922..0000000000
--- a/eng/common/post-build/add-build-to-channel.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-param(
-  [Parameter(Mandatory=$true)][int] $BuildId,
-  [Parameter(Mandatory=$true)][int] $ChannelId,
-  [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
-  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
-  [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
-)
-
-try {
-  . $PSScriptRoot\post-build-utils.ps1
-
-  # Check that the channel we are going to promote the build to exist
-  $channelInfo = Get-MaestroChannel -ChannelId $ChannelId
-
-  if (!$channelInfo) {
-    Write-PipelineTelemetryCategory -Category 'PromoteBuild' -Message "Channel with BAR ID $ChannelId was not found in BAR!"
-    ExitWithExitCode 1
-  }
-
-  # Get info about which channel(s) the build has already been promoted to
-  $buildInfo = Get-MaestroBuild -BuildId $BuildId
-  
-  if (!$buildInfo) {
-    Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "Build with BAR ID $BuildId was not found in BAR!"
-    ExitWithExitCode 1
-  }
-
-  # Find whether the build is already assigned to the channel or not
-  if ($buildInfo.channels) {
-    foreach ($channel in $buildInfo.channels) {
-      if ($channel.Id -eq $ChannelId) {
-        Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!"
-        ExitWithExitCode 0
-      }
-    }
-  }
-
-  Write-Host "Promoting build '$BuildId' to channel '$ChannelId'."
-
-  Assign-BuildToChannel -BuildId $BuildId -ChannelId $ChannelId
-
-  Write-Host 'done.'
-} 
-catch {
-  Write-Host $_
-  Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'"
-  ExitWithExitCode 1
-}
diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1
index 63f3464c98..61208d2d13 100644
--- a/eng/common/post-build/check-channel-consistency.ps1
+++ b/eng/common/post-build/check-channel-consistency.ps1
@@ -4,10 +4,18 @@ param(
 )
 
 try {
-  . $PSScriptRoot\post-build-utils.ps1
+  $ErrorActionPreference = 'Stop'
+  Set-StrictMode -Version 2.0
+
+  # `tools.ps1` checks $ci to perform some actions. Since the post-build
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  $disableConfigureToolsetImport = $true
+  . $PSScriptRoot\..\tools.ps1
 
   if ($PromoteToChannels -eq "") {
-    Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
+    Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
     ExitWithExitCode 0
   }
 
diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1
index dab3534ab5..e5de00c898 100644
--- a/eng/common/post-build/nuget-validation.ps1
+++ b/eng/common/post-build/nuget-validation.ps1
@@ -2,20 +2,18 @@
 # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage
 
 param(
-  [Parameter(Mandatory=$true)][string] $PackagesPath,           # Path to where the packages to be validated are
-  [Parameter(Mandatory=$true)][string] $ToolDestinationPath     # Where the validation tool should be downloaded to
+  [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
 )
 
-try {
-  . $PSScriptRoot\post-build-utils.ps1
-
-  $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
-
-  New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
+# `tools.ps1` checks $ci to perform some actions. Since the post-build
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+$disableConfigureToolsetImport = $true
+. $PSScriptRoot\..\tools.ps1
 
-  Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 
-
-  & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
+try {
+  & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
 } 
 catch {
   Write-Host $_.ScriptStackTrace
diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1
new file mode 100644
index 0000000000..a365194a93
--- /dev/null
+++ b/eng/common/post-build/nuget-verification.ps1
@@ -0,0 +1,121 @@
+<#
+.SYNOPSIS
+    Verifies that Microsoft NuGet packages have proper metadata.
+.DESCRIPTION
+    Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an
+    error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not
+    match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script.
+.PARAMETER NuGetExePath
+    The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath
+    directory.
+.PARAMETER PackageSource
+    The package source to use to download the verification tool. If not provided, nuget.org will be used.
+.PARAMETER DownloadPath
+    The directory path to download the verification tool and nuget.exe to. If not provided,
+    %TEMP%\NuGet.VerifyNuGetPackage will be used.
+.PARAMETER args
+    Arguments that will be passed to the verification tool.
+.EXAMPLE
+    PS> .\verify.ps1 *.nupkg
+    Verifies the metadata of all .nupkg files in the currect working directory.
+.EXAMPLE
+    PS> .\verify.ps1 --help
+    Displays the help text of the downloaded verifiction tool.
+.LINK
+    https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md
+#>
+
+# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1
+
+[CmdletBinding(PositionalBinding = $false)]
+param(
+   [string]$NuGetExePath,
+   [string]$PackageSource = "https://api.nuget.org/v3/index.json",
+   [string]$DownloadPath,
+   [Parameter(ValueFromRemainingArguments = $true)]
+   [string[]]$args
+)
+
+# The URL to download nuget.exe.
+$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe"
+
+# The package ID of the verification tool.
+$packageId = "NuGet.VerifyMicrosoftPackage"
+
+# The location that nuget.exe and the verification tool will be downloaded to.
+if (!$DownloadPath) {
+    $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage")
+}
+
+$fence = New-Object -TypeName string -ArgumentList '=', 80
+
+# Create the download directory, if it doesn't already exist.
+if (!(Test-Path $DownloadPath)) {
+    New-Item -ItemType Directory $DownloadPath | Out-Null
+}
+Write-Host "Using download path: $DownloadPath"
+
+if ($NuGetExePath) {
+    $nuget = $NuGetExePath
+} else {
+    $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe"
+    
+    # Download nuget.exe, if it doesn't already exist.
+    if (!(Test-Path $downloadedNuGetExe)) {
+        Write-Host "Downloading nuget.exe from $nugetExeUrl..."
+        $ProgressPreference = 'SilentlyContinue'
+        try {
+            Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
+            $ProgressPreference = 'Continue'
+        } catch {
+            $ProgressPreference = 'Continue'
+            Write-Error $_
+            Write-Error "nuget.exe failed to download."
+            exit
+        }
+    }
+
+    $nuget = $downloadedNuGetExe
+}
+
+Write-Host "Using nuget.exe path: $nuget"
+Write-Host " "
+
+# Download the latest version of the verification tool.
+Write-Host "Downloading the latest version of $packageId from $packageSource..."
+Write-Host $fence
+& $nuget install $packageId `
+    -Prerelease `
+    -OutputDirectory $DownloadPath `
+    -Source $PackageSource
+Write-Host $fence
+Write-Host " "
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "nuget.exe failed to fetch the verify tool."
+    exit
+}
+
+# Find the most recently downloaded tool
+Write-Host "Finding the most recently downloaded verification tool."
+$verifyProbePath = Join-Path $DownloadPath "$packageId.*"
+$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory `
+    | Sort-Object -Property LastWriteTime -Descending `
+    | Select-Object -First 1
+$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe"
+Write-Host "Using verification tool: $verify"
+Write-Host " "
+
+# Execute the verification tool.
+Write-Host "Executing the verify tool..."
+Write-Host $fence
+& $verify $args
+Write-Host $fence
+Write-Host " "
+
+# Respond to the exit code.
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "The verify tool found some problems."
+} else {
+    Write-Output "The verify tool succeeded."
+}
diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1
deleted file mode 100644
index 534f6988d5..0000000000
--- a/eng/common/post-build/post-build-utils.ps1
+++ /dev/null
@@ -1,91 +0,0 @@
-# Most of the functions in this file require the variables `MaestroApiEndPoint`, 
-# `MaestroApiVersion` and `MaestroApiAccessToken` to be globally available.
-
-$ErrorActionPreference = 'Stop'
-Set-StrictMode -Version 2.0
-
-# `tools.ps1` checks $ci to perform some actions. Since the post-build
-# scripts don't necessarily execute in the same agent that run the
-# build.ps1/sh script this variable isn't automatically set.
-$ci = $true
-$disableConfigureToolsetImport = $true
-. $PSScriptRoot\..\tools.ps1
-
-function Create-MaestroApiRequestHeaders([string]$ContentType = 'application/json') {
-  Validate-MaestroVars
-
-  $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-  $headers.Add('Accept', $ContentType)
-  $headers.Add('Authorization',"Bearer $MaestroApiAccessToken")
-  return $headers
-}
-
-function Get-MaestroChannel([int]$ChannelId) {
-  Validate-MaestroVars
-
-  $apiHeaders = Create-MaestroApiRequestHeaders
-  $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion"
-  
-  $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-  return $result
-}
-
-function Get-MaestroBuild([int]$BuildId) {
-  Validate-MaestroVars
-
-  $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
-  $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion"
-
-  $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-  return $result
-}
-
-function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) {
-  Validate-MaestroVars
-
-  $SourceRepository = [System.Web.HttpUtility]::UrlEncode($SourceRepository) 
-  $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
-  $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion"
-
-  $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-  return $result
-}
-
-function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) {
-  Validate-MaestroVars
-
-  $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
-  $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion"
-  Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null
-}
-
-function Trigger-Subscription([string]$SubscriptionId) {
-  Validate-MaestroVars
-
-  $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken
-  $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion"
-  Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null
-}
-
-function Validate-MaestroVars {
-  try {
-    Get-Variable MaestroApiEndPoint | Out-Null
-    Get-Variable MaestroApiVersion | Out-Null
-    Get-Variable MaestroApiAccessToken | Out-Null
-
-    if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) {
-      Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'"
-      ExitWithExitCode 1  
-    }
-
-    if (!($MaestroApiVersion -Match '^[0-9]{4}-[0-9]{2}-[0-9]{2}$')) {
-      Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiVersion does not match a version string in the format yyyy-MM-DD. '$MaestroApiVersion'"
-      ExitWithExitCode 1
-    }
-  }
-  catch {
-    Write-PipelineTelemetryError -Category 'MaestroVars' -Message 'Error: Variables `MaestroApiEndPoint`, `MaestroApiVersion` and `MaestroApiAccessToken` are required while using this script.'
-    Write-Host $_
-    ExitWithExitCode 1
-  }
-}
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 2427ca6b6a..1eda208a3b 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -2,22 +2,23 @@ param(
   [Parameter(Mandatory=$true)][int] $BuildId,
   [Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
   [Parameter(Mandatory=$true)][string] $AzdoToken,
-  [Parameter(Mandatory=$true)][string] $MaestroToken,
-  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
+  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
-  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
-  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
-  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
-  [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
+  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
+  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
 )
 
 try {
-  . $PSScriptRoot\post-build-utils.ps1
+  # `tools.ps1` checks $ci to perform some actions. Since the post-build
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  $disableConfigureToolsetImport = $true
+  . $PSScriptRoot\..\tools.ps1
 
-  $darc = Get-Darc 
+  $darc = Get-Darc
 
   $optionalParams = [System.Collections.ArrayList]::new()
 
@@ -34,36 +35,24 @@ try {
   if ("false" -eq $WaitPublishingFinish) {
     $optionalParams.Add("--no-wait") | Out-Null
   }
-
-  if ("false" -ne $PublishInstallersAndChecksums) {
-    $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableNugetValidation) {
-    $optionalParams.Add("--validate-nuget") | Out-Null
+  
+  if ("true" -eq $RequireDefaultChannels) {
+    $optionalParams.Add("--default-channels-required") | Out-Null
   }
 
-  if ("true" -eq $EnableSourceLinkValidation) {
-    $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
-  }
-
-  if ("true" -eq $EnableSigningValidation) {
-    $optionalParams.Add("--validate-signingchecksums") | Out-Null
-
-    if ("" -ne $SigningValidationAdditionalParameters) {
-      $optionalParams.Add("--signing-validation-parameters") | Out-Null
-      $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
-    }
+  if ("true" -eq $SkipAssetsPublishing) {
+    $optionalParams.Add("--skip-assets-publishing") | Out-Null
   }
 
   & $darc add-build-to-channel `
-  --id $buildId `
-  --publishing-infra-version $PublishingInfraVersion `
-  --default-channels `
-  --source-branch main `
-  --azdev-pat $AzdoToken `
-  --bar-uri $MaestroApiEndPoint `
-  --password $MaestroToken `
+    --id $buildId `
+    --publishing-infra-version $PublishingInfraVersion `
+    --default-channels `
+    --source-branch main `
+    --azdev-pat "$AzdoToken" `
+    --bar-uri "$MaestroApiEndPoint" `
+    --ci `
+    --verbose `
 	@optionalParams
 
   if ($LastExitCode -ne 0) {
@@ -72,7 +61,7 @@ try {
   }
 
   Write-Host 'done.'
-} 
+}
 catch {
   Write-Host $_
   Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1
new file mode 100644
index 0000000000..b7fc195915
--- /dev/null
+++ b/eng/common/post-build/redact-logs.ps1
@@ -0,0 +1,89 @@
+[CmdletBinding(PositionalBinding=$False)]
+param(
+  [Parameter(Mandatory=$true, Position=0)][string] $InputPath,
+  [Parameter(Mandatory=$true)][string] $BinlogToolVersion,
+  [Parameter(Mandatory=$false)][string] $DotnetPath,
+  [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json',
+  # File with strings to redact - separated by newlines.
+  #  For comments start the line with '# ' - such lines are ignored 
+  [Parameter(Mandatory=$false)][string] $TokensFilePath,
+  [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
+)
+
+try {
+  $ErrorActionPreference = 'Stop'
+  Set-StrictMode -Version 2.0
+
+  # `tools.ps1` checks $ci to perform some actions. Since the post-build
+  # scripts don't necessarily execute in the same agent that run the
+  # build.ps1/sh script this variable isn't automatically set.
+  $ci = $true
+  $disableConfigureToolsetImport = $true
+  . $PSScriptRoot\..\tools.ps1
+
+  $packageName = 'binlogtool'
+
+  $dotnet = $DotnetPath
+
+  if (!$dotnet) {
+    $dotnetRoot = InitializeDotNetCli -install:$true
+    $dotnet = "$dotnetRoot\dotnet.exe"
+  }
+  
+  $toolList = & "$dotnet" tool list -g
+
+  if ($toolList -like "*$packageName*") {
+    & "$dotnet" tool uninstall $packageName -g
+  }
+
+  $toolPath  = "$PSScriptRoot\..\..\..\.tools"
+  $verbosity = 'minimal'
+  
+  New-Item -ItemType Directory -Force -Path $toolPath
+  
+  Push-Location -Path $toolPath
+
+  try {
+    Write-Host "Installing Binlog redactor CLI..."
+    Write-Host "'$dotnet' new tool-manifest"
+    & "$dotnet" new tool-manifest
+    Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
+    & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
+
+    if (Test-Path $TokensFilePath) {
+        Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath
+        $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " }
+    }
+
+    $optionalParams = [System.Collections.ArrayList]::new()
+  
+    Foreach ($p in $TokensToRedact)
+    {
+      if($p -match '^\$\(.*\)$')
+      {
+        Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable"  -f $p)
+      }          
+      elseif($p)
+      {
+        $optionalParams.Add("-p:" + $p) | Out-Null
+      }
+    }
+
+    & $dotnet binlogtool redact --input:$InputPath --recurse --in-place `
+      @optionalParams
+
+    if ($LastExitCode -ne 0) {
+      Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now."
+    }
+  }
+  finally {
+    Pop-Location
+  }
+
+  Write-Host 'done.'
+} 
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_"
+  ExitWithExitCode 1
+}
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 4011d324e7..1976ef70fb 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -6,7 +6,15 @@ param(
   [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion    # Version of SourceLink CLI to use
 )
 
-. $PSScriptRoot\post-build-utils.ps1
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+# `tools.ps1` checks $ci to perform some actions. Since the post-build
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+$disableConfigureToolsetImport = $true
+. $PSScriptRoot\..\tools.ps1
 
 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist 
 # in the repository at a specific commit point. This is populated by inserting
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index cd2181bafa..7146e593ff 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -322,8 +322,6 @@ function InstallDotnetSymbol {
 }
 
 try {
-  . $PSScriptRoot\post-build-utils.ps1
-  
   InstallDotnetSymbol
 
   foreach ($Job in @(Get-Job)) {
diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1
deleted file mode 100644
index 55dea518ac..0000000000
--- a/eng/common/post-build/trigger-subscriptions.ps1
+++ /dev/null
@@ -1,64 +0,0 @@
-param(
-  [Parameter(Mandatory=$true)][string] $SourceRepo,
-  [Parameter(Mandatory=$true)][int] $ChannelId,
-  [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
-  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
-  [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
-)
-
-try {
-  . $PSScriptRoot\post-build-utils.ps1
-
-  # Get all the $SourceRepo subscriptions
-  $normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '')
-  $subscriptions = Get-MaestroSubscriptions -SourceRepository $normalizedSourceRepo -ChannelId $ChannelId
-
-  if (!$subscriptions) {
-    Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'"
-    ExitWithExitCode 0
-  }
-
-  $subscriptionsToTrigger = New-Object System.Collections.Generic.List[string]
-  $failedTriggeredSubscription = $false
-
-  # Get all enabled subscriptions that need dependency flow on 'everyBuild'
-  foreach ($subscription in $subscriptions) {
-    if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) {
-      Write-Host "Should trigger this subscription: ${$subscription.id}"
-      [void]$subscriptionsToTrigger.Add($subscription.id)
-    }
-  }
-
-  foreach ($subscriptionToTrigger in $subscriptionsToTrigger) {
-    try {
-      Write-Host "Triggering subscription '$subscriptionToTrigger'."
-
-      Trigger-Subscription -SubscriptionId $subscriptionToTrigger
-    
-      Write-Host 'done.'
-    } 
-    catch
-    {
-      Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'"
-      Write-Host $_
-      Write-Host $_.ScriptStackTrace
-      $failedTriggeredSubscription = $true
-    }
-  }
-
-  if ($subscriptionsToTrigger.Count -eq 0) {
-    Write-Host "No subscription matched source repo '$normalizedSourceRepo' and channel ID '$ChannelId'."
-  }
-  elseif ($failedTriggeredSubscription) {
-    Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message 'At least one subscription failed to be triggered...'
-    ExitWithExitCode 1
-  }
-  else {
-    Write-Host 'All subscriptions were triggered successfully!'
-  }
-}
-catch {
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message $_
-  ExitWithExitCode 1
-}
diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1
new file mode 100644
index 0000000000..e7ba975ade
--- /dev/null
+++ b/eng/common/retain-build.ps1
@@ -0,0 +1,45 @@
+
+Param(
+[Parameter(Mandatory=$true)][int] $buildId,
+[Parameter(Mandatory=$true)][string] $azdoOrgUri, 
+[Parameter(Mandatory=$true)][string] $azdoProject,
+[Parameter(Mandatory=$true)][string] $token
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+function Get-AzDOHeaders(
+    [string] $token)
+{
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}"))
+    $headers = @{"Authorization"="Basic $base64AuthInfo"}
+    return $headers
+}
+
+function Update-BuildRetention(
+    [string] $azdoOrgUri,
+    [string] $azdoProject,
+    [int] $buildId,
+    [string] $token)
+{
+    $headers = Get-AzDOHeaders -token $token
+    $requestBody = "{
+        `"keepForever`": `"true`"
+    }"
+
+    $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0"
+    write-Host "Attempting to retain build using the following URI: ${requestUri} ..."
+
+    try {
+        Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json"
+        Write-Host "Updated retention settings for build ${buildId}."
+    }
+    catch {
+        Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
+        exit 1
+    }
+}
+
+Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
+exit 0
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index b1bca63ab1..a9d2a2d269 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -6,12 +6,13 @@ Param(
   [string] $msbuildEngine = $null,
   [switch] $restore,
   [switch] $prepareMachine,
+  [switch][Alias('nobl')]$excludeCIBinaryLog,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
 $ci = $true
-$binaryLog = $true
+$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
 $warnAsError = $true
 
 . $PSScriptRoot\tools.ps1
@@ -27,6 +28,7 @@ function Print-Usage() {
   Write-Host "Advanced settings:"
   Write-Host "  -prepareMachine         Prepare machine for CI run"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+  Write-Host "  -excludeCIBinaryLog     When running on CI, allow no binary log (short: -nobl)"
   Write-Host ""
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
 }
@@ -34,10 +36,11 @@ function Print-Usage() {
 function Build([string]$target) {
   $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
   $log = Join-Path $LogDir "$task$logSuffix.binlog"
+  $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
   $outputPath = Join-Path $ToolsetDir "$task\"
 
   MSBuild $taskProject `
-    /bl:$log `
+    $binaryLogArg `
     /t:$target `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
@@ -64,7 +67,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
new file mode 100644
index 0000000000..2f83adc026
--- /dev/null
+++ b/eng/common/sdk-task.sh
@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+
+show_usage() {
+    echo "Common settings:"
+    echo "  --task <value>           Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
+    echo "  --restore                Restore dependencies"
+    echo "  --verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
+    echo "  --help                   Print help and exit"
+    echo ""
+
+    echo "Advanced settings:"
+    echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
+    echo ""
+    echo "Command line arguments not listed above are passed thru to msbuild."
+}
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $source until the file is no longer a symlink
+while [[ -h "$source" ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+Build() {
+    local target=$1
+    local log_suffix=""
+    [[ "$target" != "Execute" ]] && log_suffix=".$target"
+    local log="$log_dir/$task$log_suffix.binlog"
+    local binaryLogArg=""
+    [[ $binary_log == true ]] && binaryLogArg="/bl:$log"
+    local output_path="$toolset_dir/$task/"
+
+    MSBuild "$taskProject" \
+        $binaryLogArg \
+        /t:"$target" \
+        /p:Configuration="$configuration" \
+        /p:RepoRoot="$repo_root" \
+        /p:BaseIntermediateOutputPath="$output_path" \
+        /v:"$verbosity" \
+        $properties
+}
+
+binary_log=true
+configuration="Debug"
+verbosity="minimal"
+exclude_ci_binary_log=false
+restore=false
+help=false
+properties=''
+
+while (($# > 0)); do
+  lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
+  case $lowerI in
+    --task)
+      task=$2
+      shift 2
+      ;;
+    --restore)
+      restore=true
+      shift 1
+      ;;
+    --verbosity)
+      verbosity=$2
+      shift 2
+      ;;
+    --excludecibinarylog|--nobl)
+      binary_log=false
+      exclude_ci_binary_log=true
+      shift 1
+      ;;
+    --help)
+      help=true
+      shift 1
+      ;;
+    *)
+      properties="$properties $1"
+      shift 1
+      ;;
+  esac
+done
+
+ci=true
+warnAsError=true
+
+if $help; then
+  show_usage
+  exit 0
+fi
+
+. "$scriptroot/tools.sh"
+InitializeToolset
+
+if [[ -z "$task" ]]; then
+    Write-PipelineTelemetryError -Category 'Task' -Name 'MissingTask' -Message "Missing required parameter '-task <value>'"
+    ExitWithExitCode 1
+fi
+
+taskProject=$(GetSdkTaskProject "$task")
+if [[ ! -e "$taskProject" ]]; then
+    Write-PipelineTelemetryError -Category 'Task' -Name 'UnknownTask' -Message "Unknown task: $task"
+    ExitWithExitCode 1
+fi
+
+if $restore; then
+    Build "Restore"
+fi
+
+Build "Execute"
+
+
+ExitWithExitCode 0
diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config
index 0c5451c114..3849bdb3cf 100644
--- a/eng/common/sdl/NuGet.config
+++ b/eng/common/sdl/NuGet.config
@@ -7,6 +7,11 @@
     <clear />
     <add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="guardian">
+      <package pattern="microsoft.guardian.cli" />
+    </packageSource>
+  </packageSourceMapping>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1
index 8a68fc24b1..27f5a4115f 100644
--- a/eng/common/sdl/configure-sdl-tool.ps1
+++ b/eng/common/sdl/configure-sdl-tool.ps1
@@ -15,7 +15,11 @@ Param(
   # Optional: Additional params to add to any tool using CredScan.
   [string[]] $CrScanAdditionalRunConfigParams,
   # Optional: Additional params to add to any tool using PoliCheck.
-  [string[]] $PoliCheckAdditionalRunConfigParams
+  [string[]] $PoliCheckAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using CodeQL/Semmle.
+  [string[]] $CodeQLAdditionalRunConfigParams,
+  # Optional: Additional params to add to any tool using Binskim.
+  [string[]] $BinskimAdditionalRunConfigParams
 )
 
 $ErrorActionPreference = 'Stop'
@@ -67,17 +71,34 @@ try {
     $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
 
     # For some tools, add default and automatic args.
-    if ($tool.Name -eq 'credscan') {
-      if ($targetDirectory) {
-        $tool.Args += "`"TargetDirectory < $TargetDirectory`""
+    switch -Exact ($tool.Name) {
+      'credscan' {
+        if ($targetDirectory) {
+          $tool.Args += "`"TargetDirectory < $TargetDirectory`""
+        }
+        $tool.Args += "`"OutputType < pre`""
+        $tool.Args += $CrScanAdditionalRunConfigParams
       }
-      $tool.Args += "`"OutputType < pre`""
-      $tool.Args += $CrScanAdditionalRunConfigParams
-    } elseif ($tool.Name -eq 'policheck') {
-      if ($targetDirectory) {
-        $tool.Args += "`"Target < $TargetDirectory`""
+      'policheck' {
+        if ($targetDirectory) {
+          $tool.Args += "`"Target < $TargetDirectory`""
+        }
+        $tool.Args += $PoliCheckAdditionalRunConfigParams
+      }
+      {$_ -in 'semmle', 'codeql'} {
+        if ($targetDirectory) {
+          $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
+        }
+        $tool.Args += $CodeQLAdditionalRunConfigParams
+      }
+      'binskim' {
+        if ($targetDirectory) {
+          # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924.
+          # We are excluding all `_.pdb` files from the scan.
+          $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`""
+        }
+        $tool.Args += $BinskimAdditionalRunConfigParams
       }
-      $tool.Args += $PoliCheckAdditionalRunConfigParams
     }
 
     # Create variable pointing to the args array directly so we can use splat syntax later.
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index e5bef8ebd3..4715d75e97 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -34,6 +34,8 @@ Param(
   [string] $GuardianLoggerLevel='Standard',                                                      # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
   [string[]] $CrScanAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
   [string[]] $PoliCheckAdditionalRunConfigParams,                                                # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
+  [string[]] $CodeQLAdditionalRunConfigParams,                                                   # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
+  [string[]] $BinskimAdditionalRunConfigParams,                                                  # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1")
   [bool] $BreakOnFailure=$False                                                                  # Optional: Fail the build if there were errors during the run
 )
 
@@ -105,7 +107,9 @@ try {
           -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
           -GuardianLoggerLevel $GuardianLoggerLevel `
           -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
-          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
+          -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
+          -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams `
+          -BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams
         if ($BreakOnFailure) {
           Exit-IfNZEC "Sdl"
         }
diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1
index 7f28d9c59e..f031ed5b25 100644
--- a/eng/common/sdl/extract-artifact-packages.ps1
+++ b/eng/common/sdl/extract-artifact-packages.ps1
@@ -35,31 +35,33 @@ try {
     param( 
       [string] $PackagePath                                 # Full path to a NuGet package
     )
-    
+
     if (!(Test-Path $PackagePath)) {
       Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath"
       ExitWithExitCode 1
     }
-    
+
     $RelevantExtensions = @('.dll', '.exe', '.pdb')
     Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...'
-  
+
     $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
     $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
-  
+
     Add-Type -AssemblyName System.IO.Compression.FileSystem
-  
+
     [System.IO.Directory]::CreateDirectory($ExtractPath);
-  
+
     try {
       $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
   
       $zip.Entries | 
       Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} |
         ForEach-Object {
-            $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name
-  
-            [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
+            $TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName)
+            [System.IO.Directory]::CreateDirectory($TargetPath);
+
+            $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName
+            [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile)
           }
     }
     catch {
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3bd8b29ebd..e5f543ea68 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
+  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
 </packages>
diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1
new file mode 100644
index 0000000000..648c5068d7
--- /dev/null
+++ b/eng/common/sdl/sdl.ps1
@@ -0,0 +1,38 @@
+
+function Install-Gdn {
+    param(
+        [Parameter(Mandatory=$true)]
+        [string]$Path,
+
+        # If omitted, install the latest version of Guardian, otherwise install that specific version.
+        [string]$Version
+    )
+
+    $ErrorActionPreference = 'Stop'
+    Set-StrictMode -Version 2.0
+    $disableConfigureToolsetImport = $true
+    $global:LASTEXITCODE = 0
+
+    # `tools.ps1` checks $ci to perform some actions. Since the SDL
+    # scripts don't necessarily execute in the same agent that run the
+    # build.ps1/sh script this variable isn't automatically set.
+    $ci = $true
+    . $PSScriptRoot\..\tools.ps1
+
+    $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
+
+    if ($Version) {
+        $argumentList += "-Version $Version"
+    }
+    
+    Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
+
+    $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path
+
+    if (!$gdnCliPath)
+    {
+        Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian'
+    }
+
+    return $gdnCliPath.FullName
+}
\ No newline at end of file
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
new file mode 100644
index 0000000000..0daa2a9e94
--- /dev/null
+++ b/eng/common/sdl/trim-assets-version.ps1
@@ -0,0 +1,75 @@
+<#
+.SYNOPSIS
+Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.
+
+.PARAMETER InputPath
+Full path to directory where artifact packages are stored
+
+.PARAMETER Recursive
+Search for NuGet packages recursively
+
+#>
+
+Param(
+  [string] $InputPath,
+  [bool] $Recursive = $true
+)
+
+$CliToolName = "Microsoft.DotNet.VersionTools.Cli"
+
+function Install-VersionTools-Cli {
+  param(
+      [Parameter(Mandatory=$true)][string]$Version
+  )
+
+  Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
+  $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
+
+  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
+  Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
+}
+
+# -------------------------------------------------------------------
+
+if (!(Test-Path $InputPath)) {
+  Write-Host "Input Path '$InputPath' does not exist"
+  ExitWithExitCode 1
+}
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+$disableConfigureToolsetImport = $true
+$global:LASTEXITCODE = 0
+
+# `tools.ps1` checks $ci to perform some actions. Since the SDL
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
+. $PSScriptRoot\..\tools.ps1
+
+try {
+  $dotnetRoot = InitializeDotNetCli -install:$true
+  $dotnet = "$dotnetRoot\dotnet.exe"
+
+  $toolsetVersion = Read-ArcadeSdkVersion
+  Install-VersionTools-Cli -Version $toolsetVersion
+
+  $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
+  if ($null -eq $cliToolFound) {
+    Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
+    ExitWithExitCode 1
+  }
+
+  Exec-BlockVerbosely {
+    & "$dotnet" $CliToolName trim-assets-version `
+      --assets-path $InputPath `
+      --recursive $Recursive
+    Exit-IfNZEC "Sdl"
+  }
+}
+catch {
+  Write-Host $_
+  Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
+  ExitWithExitCode 1
+}
diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md
new file mode 100644
index 0000000000..98bbc1ded0
--- /dev/null
+++ b/eng/common/template-guidance.md
@@ -0,0 +1,133 @@
+# Overview
+
+Arcade provides templates for public (`/templates`) and 1ES pipeline templates (`/templates-official`) scenarios.  Pipelines which are required to be managed by 1ES pipeline templates should reference `/templates-offical`, all other pipelines may reference `/templates`.
+
+## How to use
+
+Basic guidance is:
+
+- 1ES Pipeline Template or 1ES Microbuild template runs should reference `eng/common/templates-official`. Any internal production-graded pipeline should use these templates.
+
+- All other runs should reference `eng/common/templates`.
+
+See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples.
+
+#### The `templateIs1ESManaged` parameter
+
+The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter.
+
+- For templates under `job/`, `jobs/`, `steps`, or `post-build/`, this parameter must be explicitly set.
+
+## Multiple outputs
+
+1ES pipeline templates impose a policy where every publish artifact execution results in additional security scans being injected into your pipeline.  When using `templates-official/jobs/jobs.yml`, Arcade reduces the number of additional security injections by gathering all publishing outputs into the [Build.ArtifactStagingDirectory](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services), and utilizing the [outputParentDirectory](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs#multiple-outputs) feature of 1ES pipeline templates.  When implementing your pipeline, if you ensure publish artifacts are located in the `$(Build.ArtifactStagingDirectory)`, and utilize the 1ES provided template context, then you can reduce the number of security scans for your pipeline.
+
+Example:
+``` yaml
+# azure-pipelines.yml
+extends:
+  template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  parameters:
+    stages:
+    - stage: build
+      jobs:
+      - template: /eng/common/templates-official/jobs/jobs.yml@self
+        parameters:
+          # 1ES makes use of outputs to reduce security task injection overhead
+          templateContext:
+            outputs:
+            - output: pipelineArtifact
+              displayName: 'Publish logs from source'
+              continueOnError: true
+              condition: always()
+              targetPath: $(Build.ArtifactStagingDirectory)/artifacts/log
+              artifactName: Logs
+          jobs:
+          - job: Windows
+            steps:
+            - script: echo "friendly neighborhood" > artifacts/marvel/spiderman.txt
+          # copy build outputs to artifact staging directory for publishing
+          - task: CopyFiles@2
+              displayName: Gather build output
+              inputs:
+                SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel'
+                Contents: '**'
+                TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel'
+```
+
+Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
+
+## Development notes
+
+**Folder / file structure**
+
+``` text
+eng\common\
+    [templates || templates-official]\
+        job\
+            job.yml                          (shim + artifact publishing logic)
+            onelocbuild.yml                  (shim)
+            publish-build-assets.yml         (shim)
+            source-build.yml                 (shim)
+            source-index-stage1.yml          (shim)
+        jobs\
+            codeql-build.yml                 (shim)
+            jobs.yml                         (shim)
+            source-build.yml                 (shim)
+        post-build\
+            post-build.yml                   (shim)
+            common-variabls.yml              (shim)
+            setup-maestro-vars.yml           (shim)
+        steps\
+            publish-build-artifacts.yml      (logic)
+            publish-pipeline-artifacts.yml   (logic)
+            component-governance.yml         (shim)
+            generate-sbom.yml                (shim)
+            publish-logs.yml                 (shim)
+            retain-build.yml                 (shim)
+            send-to-helix.yml                (shim)
+            source-build.yml                 (shim)
+        variables\
+            pool-providers.yml               (logic + redirect) # templates/variables/pool-providers.yml will redirect to templates-official/variables/pool-providers.yml if you are running in the internal project
+            sdl-variables.yml                (logic)
+    core-templates\
+        job\
+            job.yml                          (logic)
+            onelocbuild.yml                  (logic)
+            publish-build-assets.yml         (logic)
+            source-build.yml                 (logic)
+            source-index-stage1.yml          (logic)
+        jobs\
+            codeql-build.yml                 (logic)
+            jobs.yml                         (logic)
+            source-build.yml                 (logic)
+        post-build\
+            common-variabls.yml              (logic)
+            post-build.yml                   (logic)
+            setup-maestro-vars.yml           (logic)
+        steps\
+            component-governance.yml         (logic)
+            generate-sbom.yml                (logic)
+            publish-build-artifacts.yml      (redirect)
+            publish-logs.yml                 (logic)
+            publish-pipeline-artifacts.yml   (redirect)
+            retain-build.yml                 (logic)
+            send-to-helix.yml                (logic)
+            source-build.yml                 (logic)
+        variables\
+            pool-providers.yml               (redirect)
+```
+
+In the table above, a file is designated as "shim", "logic", or "redirect".
+
+- shim - represents a yaml file which is an intermediate step between pipeline logic and .Net Core Engineering's templates (`core-templates`) and defines the `is1ESPipeline` parameter value.
+
+- logic - represents actual base template logic.
+
+- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`.
+
+Logic for Arcade's templates live **primarily** in the `core-templates` folder.  The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates.  `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter.  If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`.  If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`.
+
+Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims.  Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario.
+
+Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used.  In those places, we redirect back to the respective logic file in `templates` or `templates-official`.
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
new file mode 100644
index 0000000000..a8a9432874
--- /dev/null
+++ b/eng/common/templates-official/job/job.yml
@@ -0,0 +1,83 @@
+parameters:
+# Sbom related params
+  enableSbom: true
+  runAsPublic: false
+  PackageVersion: 9.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+
+jobs:
+- template: /eng/common/core-templates/job/job.yml
+  parameters:
+    is1ESPipeline: true
+
+    componentGovernanceSteps:
+    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+      - template: /eng/common/templates/steps/generate-sbom.yml
+        parameters:
+          PackageVersion: ${{ parameters.packageVersion }}
+          BuildDropPath: ${{ parameters.buildDropPath }}
+          ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
+          publishArtifacts: false
+
+    # publish artifacts
+    # for 1ES managed templates, use the templateContext.output to handle multiple outputs.
+    templateContext:
+      outputParentDirectory: $(Build.ArtifactStagingDirectory)
+      outputs:
+      - ${{ if ne(parameters.artifacts.publish, '') }}:
+        - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
+          - output: buildArtifacts
+            displayName: Publish pipeline artifacts
+            PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+            ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
+            condition: always()
+            retryCountOnTaskFailure: 10 # for any logs being locked
+            continueOnError: true
+        - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
+          - output: pipelineArtifact
+            targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
+            artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }}
+            displayName: 'Publish logs'
+            continueOnError: true
+            condition: always()
+            retryCountOnTaskFailure: 10 # for any logs being locked
+            sbomEnabled: false  # we don't need SBOM for logs
+
+      - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
+        - output: buildArtifacts
+          displayName: Publish Logs
+          PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+          publishLocation: Container
+          ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
+          continueOnError: true
+          condition: always()
+          sbomEnabled: false  # we don't need SBOM for logs
+
+      - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+        - output: pipelineArtifact
+          targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
+          artifactName: 'BuildConfiguration'
+          displayName: 'Publish build retry configuration'
+          continueOnError: true
+          sbomEnabled: false  # we don't need SBOM for BuildConfiguration
+
+      - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
+        - output: pipelineArtifact
+          displayName: Publish SBOM manifest
+          continueOnError: true
+          targetPath: $(Build.ArtifactStagingDirectory)/sbom
+          artifactName: $(ARTIFACT_NAME)
+
+      # add any outputs provided via root yaml
+      - ${{ if ne(parameters.templateContext.outputs, '') }}:
+        - ${{ each output in parameters.templateContext.outputs }}:
+          - ${{ output }}
+      
+      # add any remaining templateContext properties
+      ${{ each context in parameters.templateContext }}:
+        ${{ if and(ne(context.key, 'outputParentDirectory'), ne(context.key, 'outputs')) }}:
+          ${{ context.key }}: ${{ context.value }}
+
+    ${{ each parameter in parameters }}:
+      ${{ if and(ne(parameter.key, 'templateContext'), ne(parameter.key, 'is1ESPipeline')) }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml
new file mode 100644
index 0000000000..0f0c514b91
--- /dev/null
+++ b/eng/common/templates-official/job/onelocbuild.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/job/onelocbuild.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml
new file mode 100644
index 0000000000..d667a70e8d
--- /dev/null
+++ b/eng/common/templates-official/job/publish-build-assets.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/job/publish-build-assets.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml
new file mode 100644
index 0000000000..1a480034b6
--- /dev/null
+++ b/eng/common/templates-official/job/source-build.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/job/source-build.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
new file mode 100644
index 0000000000..6d5ead316f
--- /dev/null
+++ b/eng/common/templates-official/job/source-index-stage1.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/job/source-index-stage1.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml
new file mode 100644
index 0000000000..a726322ecf
--- /dev/null
+++ b/eng/common/templates-official/jobs/codeql-build.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/jobs/codeql-build.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml
new file mode 100644
index 0000000000..007deddaea
--- /dev/null
+++ b/eng/common/templates-official/jobs/jobs.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/jobs/jobs.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml
new file mode 100644
index 0000000000..483e7b611f
--- /dev/null
+++ b/eng/common/templates-official/jobs/source-build.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/jobs/source-build.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml
new file mode 100644
index 0000000000..c32fc49233
--- /dev/null
+++ b/eng/common/templates-official/post-build/common-variables.yml
@@ -0,0 +1,8 @@
+variables:
+- template: /eng/common/core-templates/post-build/common-variables.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml
new file mode 100644
index 0000000000..2364c0fd4a
--- /dev/null
+++ b/eng/common/templates-official/post-build/post-build.yml
@@ -0,0 +1,8 @@
+stages:
+- template: /eng/common/core-templates/post-build/post-build.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml
new file mode 100644
index 0000000000..024397d878
--- /dev/null
+++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml
@@ -0,0 +1,8 @@
+steps:
+- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml
new file mode 100644
index 0000000000..30bb3985ca
--- /dev/null
+++ b/eng/common/templates-official/steps/component-governance.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/component-governance.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml
new file mode 100644
index 0000000000..f9dd238c6c
--- /dev/null
+++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml
@@ -0,0 +1,9 @@
+# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
+# variable with the base64-encoded SAS token, by default
+steps:
+- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/enable-internal-sources.yml b/eng/common/templates-official/steps/enable-internal-sources.yml
new file mode 100644
index 0000000000..e6d5718228
--- /dev/null
+++ b/eng/common/templates-official/steps/enable-internal-sources.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/enable-internal-sources.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml
new file mode 100644
index 0000000000..9a89a4706d
--- /dev/null
+++ b/eng/common/templates-official/steps/generate-sbom.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/generate-sbom.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml
new file mode 100644
index 0000000000..c5a9c1f827
--- /dev/null
+++ b/eng/common/templates-official/steps/get-delegation-sas.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/get-delegation-sas.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml
new file mode 100644
index 0000000000..c8dcf6b813
--- /dev/null
+++ b/eng/common/templates-official/steps/get-federated-access-token.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/get-federated-access-token.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml
new file mode 100644
index 0000000000..fcf6637b2e
--- /dev/null
+++ b/eng/common/templates-official/steps/publish-build-artifacts.yml
@@ -0,0 +1,46 @@
+parameters:
+- name: displayName
+  type: string
+  default: 'Publish to Build Artifact'
+
+- name: condition
+  type: string
+  default: succeeded()
+
+- name: artifactName
+  type: string
+
+- name: pathToPublish
+  type: string
+
+- name: continueOnError
+  type: boolean
+  default: false
+
+- name: publishLocation
+  type: string
+  default: 'Container'
+
+- name: is1ESPipeline
+  type: boolean
+  default: true
+
+- name: retryCountOnTaskFailure
+  type: string
+  default: 10
+  
+steps:
+- ${{ if ne(parameters.is1ESPipeline, true) }}:
+  - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error
+- task: 1ES.PublishBuildArtifacts@1
+  displayName: ${{ parameters.displayName }}
+  condition: ${{ parameters.condition }}
+  ${{ if parameters.continueOnError }}:
+    continueOnError: ${{ parameters.continueOnError }}
+  inputs:
+    PublishLocation: ${{ parameters.publishLocation }}
+    PathtoPublish: ${{ parameters.pathToPublish }}
+    ${{ if parameters.artifactName }}:
+      ArtifactName: ${{ parameters.artifactName }}
+    ${{ if parameters.retryCountOnTaskFailure }}:
+      retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml
new file mode 100644
index 0000000000..579fd531e9
--- /dev/null
+++ b/eng/common/templates-official/steps/publish-logs.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/publish-logs.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml
new file mode 100644
index 0000000000..172f9f0fdc
--- /dev/null
+++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml
@@ -0,0 +1,28 @@
+parameters:
+- name: is1ESPipeline
+  type: boolean
+  default: true
+
+- name: args
+  type: object
+  default: {}
+
+steps:
+- ${{ if ne(parameters.is1ESPipeline, true) }}:
+  - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error
+- task: 1ES.PublishPipelineArtifact@1
+  displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }}
+  ${{ if parameters.args.condition }}:
+    condition: ${{ parameters.args.condition }}
+  ${{ else }}:
+    condition: succeeded()
+  ${{ if parameters.args.continueOnError }}:
+    continueOnError: ${{ parameters.args.continueOnError }}
+  inputs:
+    targetPath: ${{ parameters.args.targetPath }}
+    ${{ if parameters.args.artifactName }}:
+      artifactName: ${{ parameters.args.artifactName }}
+    ${{ if parameters.args.properties }}:
+      properties: ${{ parameters.args.properties }}
+    ${{ if parameters.args.sbomEnabled }}:
+      sbomEnabled: ${{ parameters.args.sbomEnabled }}
diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml
new file mode 100644
index 0000000000..5594551508
--- /dev/null
+++ b/eng/common/templates-official/steps/retain-build.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/retain-build.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml
new file mode 100644
index 0000000000..6500f21bf8
--- /dev/null
+++ b/eng/common/templates-official/steps/send-to-helix.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/send-to-helix.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml
new file mode 100644
index 0000000000..8f92c49e7b
--- /dev/null
+++ b/eng/common/templates-official/steps/source-build.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/source-build.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/steps/source-index-stage1-publish.yml b/eng/common/templates-official/steps/source-index-stage1-publish.yml
new file mode 100644
index 0000000000..9b8b80942b
--- /dev/null
+++ b/eng/common/templates-official/steps/source-index-stage1-publish.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml
new file mode 100644
index 0000000000..1f308b24ef
--- /dev/null
+++ b/eng/common/templates-official/variables/pool-providers.yml
@@ -0,0 +1,45 @@
+# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, 
+# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
+
+# Motivation: 
+#   Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
+#   (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
+#   (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
+#   Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services 
+#   team needs to move resources around and create new and potentially differently-named pools. Using this template 
+#   file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
+
+# How to use: 
+#  This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
+#  If we find alternate naming conventions in broad usage it can be added to the condition below.
+#
+#  First, import the template in an arcade-ified repo to pick up the variables, e.g.:
+#
+#  variables:
+#  - template: /eng/common/templates-official/variables/pool-providers.yml
+#
+#  ... then anywhere specifying the pool provider use the runtime variables,
+#      $(DncEngInternalBuildPool)
+#
+#        pool:
+#           name: $(DncEngInternalBuildPool)
+#           image: 1es-windows-2022
+
+variables:
+  # Coalesce the target and source branches so we know when a PR targets a release branch
+  # If these variables are somehow missing, fall back to main (tends to have more capacity)
+
+  # Any new -Svc alternative pools should have variables added here to allow for splitting work
+
+  - name: DncEngInternalBuildPool
+    value: $[
+        replace(
+          replace(
+            eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
+            True,
+            'NetCore1ESPool-Svc-Internal'
+          ),
+          False,
+          'NetCore1ESPool-Internal'
+        )
+      ]
\ No newline at end of file
diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml
new file mode 100644
index 0000000000..dbdd66d4a4
--- /dev/null
+++ b/eng/common/templates-official/variables/sdl-variables.yml
@@ -0,0 +1,7 @@
+variables:
+# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
+# sync with the packages.config file.
+- name: DefaultGuardianVersion
+  value: 0.109.0
+- name: GuardianPackagesConfigFile
+  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
deleted file mode 100644
index 3aafc82e41..0000000000
--- a/eng/common/templates/job/execute-sdl.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-parameters:
-  enable: 'false'                                             # Whether the SDL validation job should execute or not
-  overrideParameters: ''                                       # Optional: to override values for parameters.
-  additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
-  # Optional: if specified, restore and use this version of Guardian instead of the default.
-  overrideGuardianVersion: ''
-  # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth
-  # diagnosis of problems with specific tool configurations.
-  publishGuardianDirectoryToPipeline: false
-  # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL
-  # parameters rather than relying on YAML. It may be better to use a local script, because you can
-  # reproduce results locally without piecing together a command based on the YAML.
-  executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1'
-  # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
-  # 'continueOnError', the parameter value is not correctly picked up.
-  # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
-  sdlContinueOnError: false                                    # optional: determines whether to continue the build if the step errors;
-  # optional: determines if build artifacts should be downloaded.
-  downloadArtifacts: true
-  # optional: determines if this job should search the directory of downloaded artifacts for
-  # 'tar.gz' and 'zip' archive files and extract them before running SDL validation tasks.
-  extractArchiveArtifacts: false
-  dependsOn: ''                                                # Optional: dependencies of the job
-  artifactNames: ''                                            # Optional: patterns supplied to DownloadBuildArtifacts
-                                                               # Usage:
-                                                               #  artifactNames:
-                                                               #    - 'BlobArtifacts'
-                                                               #    - 'Artifacts_Windows_NT_Release'
-  # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
-  # not pipeline artifacts, so doesn't affect the use of this parameter.
-  pipelineArtifactNames: []
-  # Optional: location and ID of the AzDO build that the build/pipeline artifacts should be
-  # downloaded from. By default, uses runtime expressions to decide based on the variables set by
-  # the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are
-  # running without Maestro++/BAR involved, or to download artifacts from a specific existing build
-  # to iterate quickly on SDL changes.
-  AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-  AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-  AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-
-jobs:
-- job: Run_SDL
-  dependsOn: ${{ parameters.dependsOn }}
-  displayName: Run SDL tool
-  condition: eq( ${{ parameters.enable }}, 'true')
-  variables:
-    - group: DotNet-VSTS-Bot
-    - name: AzDOProjectName
-      value: ${{ parameters.AzDOProjectName }}
-    - name: AzDOPipelineId
-      value: ${{ parameters.AzDOPipelineId }}
-    - name: AzDOBuildId
-      value: ${{ parameters.AzDOBuildId }}
-    # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
-    # sync with the packages.config file.
-    - name: DefaultGuardianVersion
-      value: 0.53.3
-    - name: GuardianVersion
-      value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
-    - name: GuardianPackagesConfigFile
-      value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-  pool:
-    vmImage: windows-2019
-  steps:
-  - checkout: self
-    clean: true
-
-  - ${{ if ne(parameters.downloadArtifacts, 'false')}}:
-    - ${{ if ne(parameters.artifactNames, '') }}:
-      - ${{ each artifactName in parameters.artifactNames }}:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download Build Artifacts
-          inputs:
-            buildType: specific
-            buildVersionToDownload: specific
-            project: $(AzDOProjectName)
-            pipeline: $(AzDOPipelineId)
-            buildId: $(AzDOBuildId)
-            artifactName: ${{ artifactName }}
-            downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
-            checkDownloadedFiles: true
-    - ${{ if eq(parameters.artifactNames, '') }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Artifacts
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: specific files
-          itemPattern: "**"
-          downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
-          checkDownloadedFiles: true
-
-  - ${{ each artifactName in parameters.pipelineArtifactNames }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download Pipeline Artifacts
-      inputs:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: $(AzDOProjectName)
-        pipeline: $(AzDOPipelineId)
-        buildId: $(AzDOBuildId)
-        artifactName: ${{ artifactName }}
-        downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
-        checkDownloadedFiles: true
-
-  - powershell: eng/common/sdl/extract-artifact-packages.ps1
-      -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
-      -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
-    displayName: Extract Blob Artifacts
-    continueOnError: ${{ parameters.sdlContinueOnError }}
-
-  - powershell: eng/common/sdl/extract-artifact-packages.ps1
-      -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
-      -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts
-    displayName: Extract Package Artifacts
-    continueOnError: ${{ parameters.sdlContinueOnError }}
-
-  - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
-    - powershell: eng/common/sdl/extract-artifact-archives.ps1
-        -InputPath $(Build.ArtifactStagingDirectory)\artifacts
-        -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts
-      displayName: Extract Archive Artifacts
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  
-  - ${{ if ne(parameters.overrideGuardianVersion, '') }}:
-    - powershell: |
-        $content = Get-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content was:`n$content"
-
-        $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
-        $content | Set-Content $(GuardianPackagesConfigFile)
-
-        Write-Host "packages.config content updated to:`n$content"
-      displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
-
-  - task: NuGetToolInstaller@1
-    displayName: 'Install NuGet.exe'
-  - task: NuGetCommand@2
-    displayName: 'Install Guardian'
-    inputs:
-      restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
-      feedsToUse: config
-      nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
-      externalFeedCredentials: GuardianConnect
-      restoreDirectory: $(Build.SourcesDirectory)\.packages
-
-  - ${{ if ne(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-  - ${{ if eq(parameters.overrideParameters, '') }}:
-    - powershell: ${{ parameters.executeAllSdlToolsScript }}
-        -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
-        -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-        -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
-        ${{ parameters.additionalParameters }}
-      displayName: Execute SDL
-      continueOnError: ${{ parameters.sdlContinueOnError }}
-
-  - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
-    # We want to publish the Guardian results and configuration for easy diagnosis. However, the
-    # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
-    # tooling files. Some of these files are large and aren't useful during an investigation, so
-    # exclude them by simply deleting them before publishing. (As of writing, there is no documented
-    # way to selectively exclude a dir from the pipeline artifact publish task.)
-    - task: DeleteFiles@1
-      displayName: Delete Guardian dependencies to avoid uploading
-      inputs:
-        SourceFolder: $(Agent.BuildDirectory)/.gdn
-        Contents: |
-          c
-          i
-      condition: succeededOrFailed()
-    - publish: $(Agent.BuildDirectory)/.gdn
-      artifact: GuardianConfiguration
-      displayName: Publish GuardianConfiguration
-      condition: succeededOrFailed()
diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml
deleted file mode 100644
index e54ce956f9..0000000000
--- a/eng/common/templates/job/generate-graph-files.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool: {}
-
-  # Optional: Include toolset dependencies in the generated graph files
-  includeToolset: false
-  
-jobs:
-- job: Generate_Graph_Files
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: Generate Graph Files
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-    # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-    # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat
-    - group: Publish-Build-Assets
-    - group: DotNet-AllOrgs-Darc-Pats
-    - name: _GraphArguments
-      value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) 
-        -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) 
-        -barToken $(MaestroAccessToken) 
-        -outputFolder '$(Build.StagingDirectory)/GraphFiles/'
-    - ${{ if ne(parameters.includeToolset, 'false') }}:
-      - name: _GraphArguments
-        value: ${{ variables._GraphArguments }} -includeToolset
-
-  steps:
-    - task: PowerShell@2
-      displayName: Generate Graph Files
-      inputs:
-        filePath: eng\common\generate-graph-files.ps1 
-        arguments: $(_GraphArguments)
-      continueOnError: true
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Graph to Artifacts
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/GraphFiles'
-        PublishLocation: Container
-        ArtifactName: GraphFiles
-      continueOnError: true
-      condition: always()      
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 7678b94ce7..7cbf668c22 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -1,245 +1,84 @@
-# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
-# and some (Microbuild) should only be applied to non-PR cases for internal builds.
-
-parameters:
-# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
-  cancelTimeoutInMinutes: ''
-  condition: ''
-  container: ''
-  continueOnError: false
-  dependsOn: ''
-  displayName: ''
-  pool: ''
-  steps: []
-  strategy: ''
-  timeoutInMinutes: ''
-  variables: []
-  workspace: ''
-
-# Job base template specific parameters
-  # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
-  artifacts: ''
-  enableMicrobuild: false
+parameters: 
   enablePublishBuildArtifacts: false
-  enablePublishBuildAssets: false
-  enablePublishTestResults: false
-  enablePublishUsingPipelines: false
-  mergeTestResults: false
-  testRunTitle: ''
-  testResultsFormat: ''
-  name: ''
-  preSteps: []
+  disableComponentGovernance: ''
+  componentGovernanceIgnoreDirectories: ''
+# Sbom related params
+  enableSbom: true
   runAsPublic: false
+  PackageVersion: 9.0.0
+  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 
 jobs:
-- job: ${{ parameters.name }}
-
-  ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}:
-    cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
-
-  ${{ if ne(parameters.condition, '') }}:
-    condition: ${{ parameters.condition }}
-
-  ${{ if ne(parameters.container, '') }}:
-    container: ${{ parameters.container }}
-
-  ${{ if ne(parameters.continueOnError, '') }}:
-    continueOnError: ${{ parameters.continueOnError }}
-
-  ${{ if ne(parameters.dependsOn, '') }}:
-    dependsOn: ${{ parameters.dependsOn }}
-
-  ${{ if ne(parameters.displayName, '') }}:
-    displayName: ${{ parameters.displayName }}
-
-  ${{ if ne(parameters.pool, '') }}:
-    pool: ${{ parameters.pool }}
-
-  ${{ if ne(parameters.strategy, '') }}:
-    strategy: ${{ parameters.strategy }}
-
-  ${{ if ne(parameters.timeoutInMinutes, '') }}:
-    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-
-  variables:
-  - ${{ if ne(parameters.enableTelemetry, 'false') }}:
-    - name: DOTNET_CLI_TELEMETRY_PROFILE
-      value: '$(Build.Repository.Uri)'
-  - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
-    - name: EnableRichCodeNavigation
-      value: 'true'
-  - ${{ each variable in parameters.variables }}:
-    # handle name-value variable syntax
-    # example:
-    # - name: [key]
-    #   value: [value]
-    - ${{ if ne(variable.name, '') }}:
-      - name: ${{ variable.name }}
-        value: ${{ variable.value }}
-    
-    # handle variable groups
-    - ${{ if ne(variable.group, '') }}:
-      - group: ${{ variable.group }}
-
-    # handle key-value variable syntax.
-    # example:
-    # - [key]: [value]
-    - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}:
-      - ${{ each pair in variable }}:
-        - name: ${{ pair.key }}
-          value: ${{ pair.value }}
-
-  # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
-  - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - group: DotNet-HelixApi-Access
-
-  ${{ if ne(parameters.workspace, '') }}:
-    workspace: ${{ parameters.workspace }}
-
-  steps:
-  - ${{ if ne(parameters.preSteps, '') }}:
-    - ${{ each preStep in parameters.preSteps }}:
-      - ${{ preStep }}
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@3
-        displayName: Install MicroBuild plugin
-        inputs:
-          signType: $(_SignType)
-          zipSources: false
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-        env:
-          TeamName: $(_TeamName)
-        continueOnError: ${{ parameters.continueOnError }}
-        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
-    - task: NuGetAuthenticate@0
-
-  - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        buildType: current
-        artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }}
-        targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }}
-        itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }}
-
-  - ${{ each step in parameters.steps }}:
-    - ${{ step }}
-
-  - ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
-    - task: RichCodeNavIndexer@0
-      displayName: RichCodeNav Upload
-      inputs:
-        languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
-        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
-        richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
-      continueOnError: true
-
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks  
-        condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
-        continueOnError: ${{ parameters.continueOnError }}
-        env:
-          TeamName: $(_TeamName)
-
-  - ${{ if ne(parameters.artifacts.publish, '') }}:
-    - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}:
-      - task: CopyFiles@2
-        displayName: Gather binaries for publish to artifacts
-        inputs:
-          SourceFolder: 'artifacts/bin'
-          Contents: '**'
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin'
-      - task: CopyFiles@2
-        displayName: Gather packages for publish to artifacts
-        inputs:
-          SourceFolder: 'artifacts/packages'
-          Contents: '**'
-          TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages'
-      - task: PublishBuildArtifacts@1
-        displayName: Publish pipeline artifacts
-        inputs:
-          PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
-          PublishLocation: Container
-          ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
-        continueOnError: true
-        condition: always()
-    - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}:
-      - publish: artifacts/log
-        artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
-        displayName: Publish logs
-        continueOnError: true
-        condition: always()
-    - ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
-      - ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:    
-        - task: CopyFiles@2
-          displayName: Gather Asset Manifests
-          inputs:
-            SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
-            TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests'
-          continueOnError: ${{ parameters.continueOnError }}
-          condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-
-        - task: PublishBuildArtifacts@1
-          displayName: Push Asset Manifests
-          inputs:
-            PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests'
-            PublishLocation: Container
-            ArtifactName: AssetManifests
-          continueOnError: ${{ parameters.continueOnError }}
-          condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-
-  - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Logs
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
-        PublishLocation: Container
-        ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
-      continueOnError: true
-      condition: always()
-
-  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
-    - task: PublishTestResults@2
-      displayName: Publish XUnit Test Results
-      inputs:
-        testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml' 
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
-        testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
-        mergeTestResults: ${{ parameters.mergeTestResults }}
-      continueOnError: true
-      condition: always()
-  - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
-    - task: PublishTestResults@2
-      displayName: Publish TRX Test Results
-      inputs:
-        testResultsFormat: 'VSTest'
-        testResultsFiles: '*.trx' 
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
-        testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
-        mergeTestResults: ${{ parameters.mergeTestResults }}
-      continueOnError: true
-      condition: always()
-    
-  - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - task: CopyFiles@2
-      displayName: Gather Asset Manifests
-      inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
-        TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
-      continueOnError: ${{ parameters.continueOnError }}
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
-
-    - task: PublishBuildArtifacts@1
-      displayName: Push Asset Manifests
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
-        PublishLocation: Container
-        ArtifactName: AssetManifests
-      continueOnError: ${{ parameters.continueOnError }}
-      condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
+- template: /eng/common/core-templates/job/job.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ if and(ne(parameter.key, 'steps'), ne(parameter.key, 'is1ESPipeline')) }}:
+        ${{ parameter.key }}: ${{ parameter.value }}
+
+    steps:
+    - ${{ each step in parameters.steps }}:
+      - ${{ step }}
+
+    componentGovernanceSteps:
+    - template: /eng/common/templates/steps/component-governance.yml
+      parameters:
+        ${{ if eq(parameters.disableComponentGovernance, '') }}:
+          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
+            disableComponentGovernance: false
+          ${{ else }}:
+            disableComponentGovernance: true
+        ${{ else }}:
+          disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
+        componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
+
+    artifactPublishSteps:
+    - ${{ if ne(parameters.artifacts.publish, '') }}:
+      - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
+        - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+          parameters:
+            is1ESPipeline: false
+            args:
+              displayName: Publish pipeline artifacts
+              pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+              publishLocation: Container
+              artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
+              continueOnError: true
+              condition: always()
+              retryCountOnTaskFailure: 10 # for any logs being locked
+      - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
+        - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+          parameters:
+            is1ESPipeline: false
+            args:
+              targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
+              artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
+              displayName: 'Publish logs'
+              continueOnError: true
+              condition: always()
+              retryCountOnTaskFailure: 10 # for any logs being locked
+              sbomEnabled: false  # we don't need SBOM for logs
+
+    - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
+      - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+        parameters:
+          is1ESPipeline: false
+          args:
+            displayName: Publish Logs
+            pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+            publishLocation: Container
+            artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
+            continueOnError: true
+            condition: always()
+
+    - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
+      - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+        parameters:
+          is1ESPipeline: false
+          args:
+            targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
+            artifactName: 'BuildConfiguration'
+            displayName: 'Publish build retry configuration'
+            continueOnError: true
+            sbomEnabled: false  # we don't need SBOM for BuildConfiguration
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index c4fc18b3ee..ff829dc4c7 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -1,96 +1,7 @@
-parameters:
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool:
-    vmImage: 'windows-2019'
-
-  CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
-  GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
-
-  SourcesDirectory: $(Build.SourcesDirectory)
-  CreatePr: true
-  AutoCompletePr: false
-  ReusePr: true
-  UseLfLineEndings: true
-  UseCheckedInLocProjectJson: false
-  LanguageSet: VS_Main_Languages
-  LclSource: lclFilesInRepo
-  LclPackageId: ''
-  RepoType: gitHub
-  GitHubOrg: dotnet
-  MirrorRepo: ''
-  MirrorBranch: main
-  condition: ''
-
 jobs:
-- job: OneLocBuild
-  
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: OneLocBuild
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-    - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
-    - name: _GenerateLocProjectArguments
-      value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
-        -LanguageSet "${{ parameters.LanguageSet }}"
-        -CreateNeutralXlfs
-    - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
-      - name: _GenerateLocProjectArguments
-        value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
-      
-
-  steps:
-    - task: Powershell@2
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
-        arguments: $(_GenerateLocProjectArguments)
-      displayName: Generate LocProject.json
-      condition: ${{ parameters.condition }}
-
-    - task: OneLocBuild@2
-      displayName: OneLocBuild
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        locProj: eng/Localize/LocProject.json
-        outDir: $(Build.ArtifactStagingDirectory)
-        lclSource: ${{ parameters.LclSource }}
-        lclPackageId: ${{ parameters.LclPackageId }}
-        isCreatePrSelected: ${{ parameters.CreatePr }}
-        ${{ if eq(parameters.CreatePr, true) }}:
-          isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
-          isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
-          ${{ if eq(parameters.RepoType, 'gitHub') }}:
-            isShouldReusePrSelected: ${{ parameters.ReusePr }}
-        packageSourceAuth: patAuth
-        patVariable: ${{ parameters.CeapexPat }}
-        ${{ if eq(parameters.RepoType, 'gitHub') }}:
-          repoType: ${{ parameters.RepoType }}
-          gitHubPatVariable: "${{ parameters.GithubPat }}"
-        ${{ if ne(parameters.MirrorRepo, '') }}:
-          isMirrorRepoSelected: true
-          gitHubOrganization: ${{ parameters.GitHubOrg }}
-          mirrorRepo: ${{ parameters.MirrorRepo }}
-          mirrorBranch: ${{ parameters.MirrorBranch }}
-      condition: ${{ parameters.condition }}
-
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Localization Files
-      inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
-        PublishLocation: Container
-        ArtifactName: Loc
-      condition: ${{ parameters.condition }}
+- template: /eng/common/core-templates/job/onelocbuild.yml
+  parameters:
+    is1ESPipeline: false
 
-    - task: PublishBuildArtifacts@1
-      displayName: Publish LocProject.json
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
-        PublishLocation: Container
-        ArtifactName: Loc
-      condition: ${{ parameters.condition }}
\ No newline at end of file
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index fe9dfdf720..ab2edec2ad 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -1,125 +1,7 @@
-parameters:
-  configuration: 'Debug'
-
-  # Optional: condition for the job to run
-  condition: ''
-
-  # Optional: 'true' if future jobs should run even if this job fails
-  continueOnError: false
-
-  # Optional: dependencies of the job
-  dependsOn: ''
-
-  # Optional: Include PublishBuildArtifacts task
-  enablePublishBuildArtifacts: false
-
-  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
-  pool: {}
-
-  # Optional: should run as a public build even in the internal project
-  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
-  runAsPublic: false
-
-  # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
-  publishUsingPipelines: false
-
 jobs:
-- job: Asset_Registry_Publish
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  displayName: Publish to Build Asset Registry
-
-  pool: ${{ parameters.pool }}
-
-  variables:
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - name: _BuildConfig
-      value: ${{ parameters.configuration }}
-    - group: Publish-Build-Assets
-    - group: AzureDevOps-Artifact-Feeds-Pats
-    # Skip component governance and codesign validation for SDL. These jobs
-    # create no content.
-    - name: skipComponentGovernanceDetection
-      value: true
-    - name: runCodesignValidationInjection
-      value: false
-
-  steps:
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - task: DownloadBuildArtifacts@0
-      displayName: Download artifact
-      inputs:
-        artifactName: AssetManifests
-        downloadPath: '$(Build.StagingDirectory)/Download'
-        checkDownloadedFiles: true
-      condition: ${{ parameters.condition }}
-      continueOnError: ${{ parameters.continueOnError }}
-    
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: NuGetAuthenticate@0
-
-      - task: PowerShell@2 
-        displayName: Enable cross-org NuGet feed authentication 
-        inputs: 
-          filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 
-          arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) 
-
-    - task: PowerShell@2
-      displayName: Publish Build Assets
-      inputs:
-        filePath: eng\common\sdk-task.ps1
-        arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
-          /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
-          /p:BuildAssetRegistryToken=$(MaestroAccessToken)
-          /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
-          /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
-          /p:Configuration=$(_BuildConfig)
-          /p:OfficialBuildId=$(Build.BuildNumber)
-      condition: ${{ parameters.condition }}
-      continueOnError: ${{ parameters.continueOnError }}
-    
-    - task: powershell@2
-      displayName: Create ReleaseConfigs Artifact
-      inputs:
-        targetType: inline
-        script: |
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
-          Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
-    
-    - task: PublishBuildArtifacts@1
-      displayName: Publish ReleaseConfigs Artifact
-      inputs:
-        PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
-        PublishLocation: Container
-        ArtifactName: ReleaseConfigs
-
-    - task: powershell@2
-      displayName: Check if SymbolPublishingExclusionsFile.txt exists
-      inputs:
-        targetType: inline
-        script: |
-          $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
-          if(Test-Path -Path $symbolExclusionfile)
-          {
-            Write-Host "SymbolExclusionFile exists"
-            Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
-          }
-          else{
-           Write-Host "Symbols Exclusion file does not exists"
-           Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
-          }
+- template: /eng/common/core-templates/job/publish-build-assets.yml
+  parameters:
+    is1ESPipeline: false
 
-    - task: PublishBuildArtifacts@1
-      displayName: Publish SymbolPublishingExclusionsFile Artifact
-      condition: eq(variables['SymbolExclusionFile'], 'true') 
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-        PublishLocation: Container
-        ArtifactName: ReleaseConfigs
-        
-    - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
-      - template: /eng/common/templates/steps/publish-logs.yml
-        parameters:
-          JobLabel: 'Publish_Artifacts_Logs'     
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index 5cd5325d7b..e44d47b1d7 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -1,63 +1,7 @@
-parameters:
-  # This template adds arcade-powered source-build to CI. The template produces a server job with a
-  # default ID 'Source_Build_Complete' to put in a dependency list if necessary.
-
-  # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed.
-  jobNamePrefix: 'Source_Build'
-
-  # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for
-  # managed-only repositories. This is an object with these properties:
-  #
-  # name: ''
-  #   The name of the job. This is included in the job ID.
-  # targetRID: ''
-  #   The name of the target RID to use, instead of the one auto-detected by Arcade.
-  # nonPortable: false
-  #   Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
-  #   linux-x64), and compiling against distro-provided packages rather than portable ones.
-  # skipPublishValidation: false
-  #   Disables publishing validation.  By default, a check is performed to ensure no packages are
-  #   published by source-build.
-  # container: ''
-  #   A container to use. Runs in docker.
-  # pool: {}
-  #   A pool to use. Runs directly on an agent.
-  # buildScript: ''
-  #   Specifies the build script to invoke to perform the build in the repo. The default
-  #   './build.sh' should work for typical Arcade repositories, but this is customizable for
-  #   difficult situations.
-  # jobProperties: {}
-  #   A list of job properties to inject at the top level, for potential extensibility beyond
-  #   container and pool.
-  platform: {}
-
 jobs:
-- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
-  displayName: Source-Build (${{ parameters.platform.name }})
-
-  ${{ each property in parameters.platform.jobProperties }}:
-    ${{ property.key }}: ${{ property.value }}
-
-  ${{ if ne(parameters.platform.container, '') }}:
-    container: ${{ parameters.platform.container }}
-
-  ${{ if eq(parameters.platform.pool, '') }}:
-    # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
-    # source-build builds run in Docker, including the default managed platform.
-    pool:
-      ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        name: NetCore1ESPool-Public
-        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
-      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        name: NetCore1ESPool-Internal
-        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
-  ${{ if ne(parameters.platform.pool, '') }}:
-    pool: ${{ parameters.platform.pool }}
-
-  workspace:
-    clean: all
+- template: /eng/common/core-templates/job/source-build.yml
+  parameters:
+    is1ESPipeline: false
 
-  steps:
-  - template: /eng/common/templates/steps/source-build.yml
-    parameters:
-      platform: ${{ parameters.platform }}
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 4af724eb1a..89f3291593 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,61 +1,7 @@
-parameters:
-  runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20210614.1
-  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
-  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
-  preSteps: []
-  binlogPath: artifacts/log/Debug/Build.binlog
-  condition: ''
-  dependsOn: ''
-
 jobs:
-- job: SourceIndexStage1
-  dependsOn: ${{ parameters.dependsOn }}
-  condition: ${{ parameters.condition }}
-  variables:
-  - name: SourceIndexPackageVersion
-    value: ${{ parameters.sourceIndexPackageVersion }}
-  - name: SourceIndexPackageSource
-    value: ${{ parameters.sourceIndexPackageSource }}
-  - name: BinlogPath
-    value: ${{ parameters.binlogPath }}
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - group: source-dot-net stage1 variables
-
-  pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: NetCore1ESPool-Public
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
-    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-      name: NetCore1ESPool-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
-  steps:
-  - ${{ each preStep in parameters.preSteps }}:
-    - ${{ preStep }}
-
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk 3.1
-    inputs:
-      packageType: sdk
-      version: 3.1.x
-      installationPath: $(Agent.TempDirectory)/dotnet
-      workingDirectory: $(Agent.TempDirectory)
-
-  - script: |
-      $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
-      $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
-    displayName: Download Tools
-    # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
-    workingDirectory: $(Agent.TempDirectory)
-
-  - script: ${{ parameters.sourceIndexBuildCommand }}
-    displayName: Build Repository
-
-  - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
-    displayName: Process Binlog into indexable sln
+- template: /eng/common/core-templates/job/source-index-stage1.yml
+  parameters:
+    is1ESPipeline: false
 
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
-      displayName: Upload stage1 artifacts to source index
-      env:
-        BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml
new file mode 100644
index 0000000000..517f24d6a5
--- /dev/null
+++ b/eng/common/templates/jobs/codeql-build.yml
@@ -0,0 +1,7 @@
+jobs:
+- template: /eng/common/core-templates/jobs/codeql-build.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 8dd1fdbd14..388e9037b3 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -1,99 +1,7 @@
-parameters:
-  # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
-  continueOnError: false
-
-  # Optional: Include PublishBuildArtifacts task
-  enablePublishBuildArtifacts: false
-
-  # Optional: Enable publishing using release pipelines
-  enablePublishUsingPipelines: false
-
-  # Optional: Enable running the source-build jobs to build repo from source
-  enableSourceBuild: false
-
-  # Optional: Parameters for source-build template.
-  #           See /eng/common/templates/jobs/source-build.yml for options
-  sourceBuildParameters: []
-
-  graphFileGeneration:
-    # Optional: Enable generating the graph files at the end of the build
-    enabled: false
-    # Optional: Include toolset dependencies in the generated graph files
-    includeToolset: false
-    
-  # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
-  jobs: []
-
-  # Optional: Override automatically derived dependsOn value for "publish build assets" job
-  publishBuildAssetsDependsOn: ''
-
-  # Optional: should run as a public build even in the internal project
-  #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
-  runAsPublic: false
-
-  enableSourceIndex: false
-  sourceIndexParams: {}
-
-# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
-# and some (Microbuild) should only be applied to non-PR cases for internal builds.
-
 jobs:
-- ${{ each job in parameters.jobs }}:
-  - template: ../job/job.yml
-    parameters: 
-      # pass along parameters
-      ${{ each parameter in parameters }}:
-        ${{ if ne(parameter.key, 'jobs') }}:
-          ${{ parameter.key }}: ${{ parameter.value }}
-
-      # pass along job properties
-      ${{ each property in job }}:
-        ${{ if ne(property.key, 'job') }}:
-          ${{ property.key }}: ${{ property.value }}
-
-      name: ${{ job.job }}
-
-- ${{ if eq(parameters.enableSourceBuild, true) }}:
-  - template: /eng/common/templates/jobs/source-build.yml
-    parameters:
-      allCompletedJobId: Source_Build_Complete
-      ${{ each parameter in parameters.sourceBuildParameters }}:
-        ${{ parameter.key }}: ${{ parameter.value }}
-
-- ${{ if eq(parameters.enableSourceIndex, 'true') }}:
-  - template: ../job/source-index-stage1.yml
-    parameters:
-      runAsPublic: ${{ parameters.runAsPublic }}
-      ${{ each parameter in parameters.sourceIndexParams }}:
-        ${{ parameter.key }}: ${{ parameter.value }}
-
-- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-  
-  - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
-    - template: ../job/publish-build-assets.yml
-      parameters:
-        continueOnError: ${{ parameters.continueOnError }}
-        dependsOn:
-        - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
-          - ${{ each job in parameters.publishBuildAssetsDependsOn }}:
-            - ${{ job.job }}
-        - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
-          - ${{ each job in parameters.jobs }}:
-            - ${{ job.job }}
-        - ${{ if eq(parameters.enableSourceBuild, true) }}:
-          - Source_Build_Complete
-        pool:
-          vmImage: 'windows-2019'
-        runAsPublic: ${{ parameters.runAsPublic }}
-        publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
-        enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
+- template: /eng/common/core-templates/jobs/jobs.yml
+  parameters:
+    is1ESPipeline: false
 
-  - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}:
-    - template: ../job/generate-graph-files.yml
-      parameters:
-        continueOnError: ${{ parameters.continueOnError }}
-        includeToolset: ${{ parameters.graphFileGeneration.includeToolset }}
-        dependsOn:
-          - Asset_Registry_Publish
-        pool:
-          vmImage: 'windows-2019'
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml
index 00aa98eb3b..818d4c326d 100644
--- a/eng/common/templates/jobs/source-build.yml
+++ b/eng/common/templates/jobs/source-build.yml
@@ -1,46 +1,7 @@
-parameters:
-  # This template adds arcade-powered source-build to CI. A job is created for each platform, as
-  # well as an optional server job that completes when all platform jobs complete.
-
-  # The name of the "join" job for all source-build platforms. If set to empty string, the job is
-  # not included. Existing repo pipelines can use this job depend on all source-build jobs
-  # completing without maintaining a separate list of every single job ID: just depend on this one
-  # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'.
-  allCompletedJobId: ''
-
-  # See /eng/common/templates/job/source-build.yml
-  jobNamePrefix: 'Source_Build'
-
-  # This is the default platform provided by Arcade, intended for use by a managed-only repo.
-  defaultManagedPlatform:
-    name: 'Managed'
-    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
-
-  # Defines the platforms on which to run build jobs. One job is created for each platform, and the
-  # object in this array is sent to the job template as 'platform'. If no platforms are specified,
-  # one job runs on 'defaultManagedPlatform'.
-  platforms: []
-
 jobs:
+- template: /eng/common/core-templates/jobs/source-build.yml
+  parameters:
+    is1ESPipeline: false
 
-- ${{ if ne(parameters.allCompletedJobId, '') }}:
-  - job: ${{ parameters.allCompletedJobId }}
-    displayName: Source-Build Complete
-    pool: server
-    dependsOn:
-    - ${{ each platform in parameters.platforms }}:
-      - ${{ parameters.jobNamePrefix }}_${{ platform.name }}
-    - ${{ if eq(length(parameters.platforms), 0) }}:
-      - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
-
-- ${{ each platform in parameters.platforms }}:
-  - template: /eng/common/templates/job/source-build.yml
-    parameters:
-      jobNamePrefix: ${{ parameters.jobNamePrefix }}
-      platform: ${{ platform }}
-
-- ${{ if eq(length(parameters.platforms), 0) }}:
-  - template: /eng/common/templates/job/source-build.yml
-    parameters:
-      jobNamePrefix: ${{ parameters.jobNamePrefix }}
-      platform: ${{ parameters.defaultManagedPlatform }}
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
deleted file mode 100644
index 8990dfc8c8..0000000000
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            /p:PublishToMSDL=false
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
-            /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:PublishToMSDL=false
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
deleted file mode 100644
index 3220c6a4f9..0000000000
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-  artifactsPublishingAdditionalParameters: ''
-  dependsOn:
-  - Validate
-  publishInstallersAndChecksums: true
-  symbolPublishingAdditionalParameters: ''
-  stageName: ''
-  channelName: ''
-  channelId: ''
-  transportFeed: ''
-  shippingFeed: ''
-  symbolsFeed: ''
-  # If the channel name is empty, no links will be generated
-  akaMSChannelName: ''
-
-stages:
-- stage: ${{ parameters.stageName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    - template: ../common-variables.yml
-  displayName: ${{ parameters.channelName }} Publishing
-  jobs:
-  - template: ../setup-maestro-vars.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-  - job: publish_symbols
-    displayName: Symbol Publishing
-    dependsOn: setupMaestroVars
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    variables:
-      - group: DotNet-Symbol-Server-Pats
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PdbArtifacts/**
-            BlobArtifacts/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-      # otherwise it'll complain about accessing a private feed.
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
-            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
-            /p:Configuration=Release
-            ${{ parameters.symbolPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'SymbolPublishing'
-
-  - job: publish_assets
-    displayName: Publish Assets
-    dependsOn: setupMaestroVars
-    timeoutInMinutes: 120
-    variables:
-      - name: BARBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      - name: IsStableBuild
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
-      - name: AzDOProjectName
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-      - name: AzDOPipelineId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-      - name: AzDOBuildId
-        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      - name: ArtifactsCategory
-        value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
-    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} ))
-    pool:
-      vmImage: 'windows-2019'
-    steps:
-      - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
-        displayName: Warn about v2 Arcade Publishing Usage
-
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Build Assets
-        continueOnError: true
-        inputs:
-          buildType: specific
-          buildVersionToDownload: specific
-          project: $(AzDOProjectName)
-          pipeline: $(AzDOPipelineId)
-          buildId: $(AzDOBuildId)
-          downloadType: 'specific'
-          itemPattern: |
-            PackageArtifacts/**
-            BlobArtifacts/**
-            AssetManifests/**
-          downloadPath: '$(Build.ArtifactStagingDirectory)'
-          checkDownloadedFiles: true
-
-      - task: NuGetToolInstaller@1
-        displayName: 'Install NuGet.exe'
-
-      # This is necessary whenever we want to publish/restore to an AzDO private feed
-      - task: NuGetAuthenticate@0
-        displayName: 'Authenticate to AzDO Feeds'
-
-      - task: PowerShell@2
-        displayName: Enable cross-org publishing
-        inputs:
-          filePath: eng\common\enable-cross-org-publishing.ps1
-          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-      - task: PowerShell@2
-        displayName: Publish Assets
-        inputs:
-          filePath: eng\common\sdk-task.ps1
-          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
-            /p:PublishingInfraVersion=2
-            /p:ArtifactsCategory=$(ArtifactsCategory)
-            /p:IsStableBuild=$(IsStableBuild)
-            /p:IsInternalBuild=$(IsInternalBuild)
-            /p:RepositoryName=$(Build.Repository.Name)
-            /p:CommitSha=$(Build.SourceVersion)
-            /p:NugetPath=$(NuGetExeToolPath)
-            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
-            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
-            /p:BARBuildId=$(BARBuildId)
-            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
-            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
-            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
-            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
-            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
-            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
-            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
-            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
-            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
-            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
-            /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
-            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
-            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
-            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}'
-            /p:AkaMSClientId=$(akams-client-id)
-            /p:AkaMSClientSecret=$(akams-client-secret)
-            ${{ parameters.artifactsPublishingAdditionalParameters }}
-
-      - template: ../../steps/publish-logs.yml
-        parameters:
-          StageLabel: '${{ parameters.stageName }}'
-          JobLabel: 'AssetsPublishing'
-
-      - template: ../../steps/add-build-to-channel.yml
-        parameters:
-          ChannelId: ${{ parameters.channelId }}
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c99fd75037..7fa1058755 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -1,99 +1,8 @@
 variables:
-  - group: AzureDevOps-Artifact-Feeds-Pats
-  - group: DotNet-Blob-Feed
-  - group: DotNet-DotNetCli-Storage
-  - group: DotNet-MSRC-Storage
-  - group: Publish-Build-Assets
-    
-  # .NET Core 3.1 Dev
-  - name: PublicDevRelease_31_Channel_Id
-    value: 128
+- template: /eng/common/core-templates/post-build/common-variables.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: false
 
-  # .NET 5 Dev
-  - name: Net_5_Dev_Channel_Id
-    value: 131
-
-  # .NET Eng - Validation
-  - name: Net_Eng_Validation_Channel_Id
-    value: 9
-
-  # .NET Eng - Latest
-  - name: Net_Eng_Latest_Channel_Id
-    value: 2
-
-  # .NET 3 Eng - Validation
-  - name: NET_3_Eng_Validation_Channel_Id
-    value: 390
-
-  # .NET 3 Eng
-  - name: NetCore_3_Tools_Channel_Id
-    value: 344
-
-  # .NET Core 3.0 Internal Servicing
-  - name: InternalServicing_30_Channel_Id
-    value: 184
-
-  # .NET Core 3.0 Release
-  - name: PublicRelease_30_Channel_Id
-    value: 19
-
-  # .NET Core 3.1 Release
-  - name: PublicRelease_31_Channel_Id
-    value: 129
-
-  # General Testing
-  - name: GeneralTesting_Channel_Id
-    value: 529
-
-  # .NET Core 3.1 Blazor Features
-  - name: NetCore_31_Blazor_Features_Channel_Id
-    value: 531
-
-  # .NET Core Experimental
-  - name: NetCore_Experimental_Channel_Id
-    value: 562
-
-  # Whether the build is internal or not
-  - name: IsInternalBuild
-    value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }}
-
-  # Default Maestro++ API Endpoint and API Version
-  - name: MaestroApiEndPoint
-    value: "https://maestro-prod.westus2.cloudapp.azure.com"
-  - name: MaestroApiAccessToken
-    value: $(MaestroAccessToken)
-  - name: MaestroApiVersion
-    value: "2020-02-20"
-
-  - name: SourceLinkCLIVersion
-    value: 3.0.0
-  - name: SymbolToolVersion
-    value: 1.0.1
-
-  # Feed Configurations
-  # These should include the suffix "/index.json"
-
-  # Default locations for Installers and checksums
-  # Public Locations
-  - name: ChecksumsBlobFeedUrl
-    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
-  - name: InstallersBlobFeedUrl
-    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
-
-  # Private Locations
-  - name: InternalChecksumsBlobFeedUrl
-    value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalChecksumsBlobFeedKey
-    value: $(dotnetclichecksumsmsrc-storage-key)
-
-  - name: InternalInstallersBlobFeedUrl
-    value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
-  - name: InternalInstallersBlobFeedKey
-    value: $(dotnetclimsrc-access-key)
-
-  # Skip component governance and codesign validation for SDL. These jobs
-  # create no content.
-  - name: skipComponentGovernanceDetection
-    value: true
-  - name: runCodesignValidationInjection
-    value: false
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 4f79cf0f33..53ede714bd 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,589 +1,8 @@
-parameters:
- # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST.
-  # Publishing V2 accepts optionally outlining the publishing stages - default is inline.
-  # Publishing V3 DOES NOT accept inlining the publishing stages.
-  publishingInfraVersion: 2
-  # When set to true the publishing templates from the repo will be used
-  # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline
-  inline: true
-
-  # Only used if inline==false. When set to true will stall the current build until
-  # the Promotion Pipeline build finishes. Otherwise, the current build will continue 
-  # execution concurrently with the promotion build.
-  waitPublishingFinish: true
-
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-  enableSourceLinkValidation: false
-  enableSigningValidation: true
-  enableSymbolValidation: false
-  enableNugetValidation: true
-  publishInstallersAndChecksums: true
-  SDLValidationParameters:
-    enable: false
-    continueOnError: false
-    params: ''
-    artifactNames: ''
-    downloadArtifacts: true
-
-  # These parameters let the user customize the call to sdk-task.ps1 for publishing
-  # symbols & general artifacts as well as for signing validation
-  symbolPublishingAdditionalParameters: ''
-  artifactsPublishingAdditionalParameters: ''
-  signingValidationAdditionalParameters: ''
-
-  # Which stages should finish execution before post-build stages start
-  validateDependsOn:
-  - build
-  publishDependsOn: 
-  - Validate
-
-  # Channel ID's instantiated in this file.
-  # When adding a new channel implementation the call to `check-channel-consistency.ps1` 
-  # needs to be updated with the new channel ID
-  NetEngLatestChannelId: 2
-  NetEngValidationChannelId: 9
-  NetDev5ChannelId: 131
-  NetDev6ChannelId: 1296
-  GeneralTestingChannelId: 529
-  NETCoreToolingDevChannelId: 548
-  NETCoreToolingReleaseChannelId: 549
-  NETInternalToolingChannelId: 551
-  NETCoreExperimentalChannelId: 562
-  NetEngServicesIntChannelId: 678
-  NetEngServicesProdChannelId: 679
-  NetCoreSDK313xxChannelId: 759
-  NetCoreSDK313xxInternalChannelId: 760
-  NetCoreSDK314xxChannelId: 921
-  NetCoreSDK314xxInternalChannelId: 922
-  VS166ChannelId: 1010
-  VS167ChannelId: 1011
-  VS168ChannelId: 1154
-  VSMasterChannelId: 1012
-  VS169ChannelId: 1473
-  VS1610ChannelId: 1692
-
 stages:
-- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-  - stage: Validate
-    dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Validate Build Assets
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-      - job:
-        displayName: Post-build Checks
-        dependsOn: setupMaestroVars
-        variables:
-          - name: TargetChannels
-            value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ]
-        pool:
-          vmImage: 'windows-2019'
-        steps:
-          - task: PowerShell@2
-            displayName: Maestro Channels Consistency
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
-              arguments: -PromoteToChannels "$(TargetChannels)"
-                -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
-
-    - job:
-      displayName: NuGet Validation
-      dependsOn: setupMaestroVars
-      condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
-      pool:
-        vmImage: 'windows-2019'
-      variables:
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      steps:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download Package Artifacts
-          inputs:
-            buildType: specific
-            buildVersionToDownload: specific
-            project: $(AzDOProjectName)
-            pipeline: $(AzDOPipelineId)
-            buildId: $(AzDOBuildId)
-            artifactName: PackageArtifacts
-            checkDownloadedFiles: true
-
-        - task: PowerShell@2
-          displayName: Validate
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
-            arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ 
-              -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ 
-
-    - job:
-      displayName: Signing Validation
-      dependsOn: setupMaestroVars
-      condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download Package Artifacts
-          inputs:
-            buildType: specific
-            buildVersionToDownload: specific
-            project: $(AzDOProjectName)
-            pipeline: $(AzDOPipelineId)
-            buildId: $(AzDOBuildId)
-            artifactName: PackageArtifacts
-            checkDownloadedFiles: true
-            itemPattern: |
-              **
-              !**/Microsoft.SourceBuild.Intermediate.*.nupkg
-
-        # This is necessary whenever we want to publish/restore to an AzDO private feed
-        # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
-        # otherwise it'll complain about accessing a private feed.
-        - task: NuGetAuthenticate@0
-          displayName: 'Authenticate to AzDO Feeds'
-
-        - task: PowerShell@2
-          displayName: Enable cross-org publishing
-          inputs:
-            filePath: eng\common\enable-cross-org-publishing.ps1
-            arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
-
-        # Signing validation will optionally work with the buildmanifest file which is downloaded from
-        # Azure DevOps above.
-        - task: PowerShell@2
-          displayName: Validate
-          inputs:
-            filePath: eng\common\sdk-task.ps1
-            arguments: -task SigningValidation -restore -msbuildEngine vs
-              /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
-              /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
-              ${{ parameters.signingValidationAdditionalParameters }}
-
-        - template: ../steps/publish-logs.yml
-          parameters:
-            StageLabel: 'Validation'
-            JobLabel: 'Signing'
-
-    - job:
-      displayName: SourceLink Validation
-      dependsOn: setupMaestroVars
-      condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
-      variables:
-        - template: common-variables.yml
-        - name: AzDOProjectName
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
-        - name: AzDOPipelineId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
-        - name: AzDOBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: DownloadBuildArtifacts@0
-          displayName: Download Blob Artifacts
-          inputs:
-            buildType: specific
-            buildVersionToDownload: specific
-            project: $(AzDOProjectName)
-            pipeline: $(AzDOPipelineId)
-            buildId: $(AzDOBuildId)
-            artifactName: BlobArtifacts
-            checkDownloadedFiles: true
-
-        - task: PowerShell@2
-          displayName: Validate
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
-            arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
-              -ExtractPath $(Agent.BuildDirectory)/Extract/ 
-              -GHRepoName $(Build.Repository.Name) 
-              -GHCommit $(Build.SourceVersion)
-              -SourcelinkCliVersion $(SourceLinkCLIVersion)
-          continueOnError: true
-
-    - template: /eng/common/templates/job/execute-sdl.yml
-      parameters:
-        enable: ${{ parameters.SDLValidationParameters.enable }}
-        dependsOn: setupMaestroVars
-        additionalParameters: ${{ parameters.SDLValidationParameters.params }}
-        continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
-        artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
-        downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }}
-
-- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}:
-  - stage: publish_using_darc
-    ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.publishDependsOn }}
-    ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}:
-      dependsOn: ${{ parameters.validateDependsOn }}
-    displayName: Publish using Darc
-    variables:
-      - template: common-variables.yml
-    jobs:
-    - template: setup-maestro-vars.yml
-      parameters:
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-
-    - job:
-      displayName: Publish Using Darc
-      dependsOn: setupMaestroVars
-      timeoutInMinutes: 120
-      variables:
-        - name: BARBuildId
-          value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
-      pool:
-        vmImage: 'windows-2019'
-      steps:
-        - task: PowerShell@2
-          displayName: Publish Using Darc
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
-            arguments: -BuildId $(BARBuildId) 
-              -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }}
-              -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-              -MaestroToken '$(MaestroApiAccessToken)'
-              -WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
-              -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
-              -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-              -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-
-- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev5_Publish'
-      channelName: '.NET 5 Dev'
-      akaMSChannelName: 'net5/dev'
-      channelId: ${{ parameters.NetDev5ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NetCore_Dev6_Publish'
-      channelName: '.NET 6 Dev'
-      akaMSChannelName: 'net6/dev'
-      channelId: ${{ parameters.NetDev6ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Latest_Publish'
-      channelName: '.NET Eng - Latest'
-      akaMSChannelName: 'eng/daily'
-      channelId: ${{ parameters.NetEngLatestChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Validation_Publish'
-      channelName: '.NET Eng - Validation'
-      akaMSChannelName: 'eng/validation'
-      channelId: ${{ parameters.NetEngValidationChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'General_Testing_Publish'
-      channelName: 'General Testing'
-      akaMSChannelName: 'generaltesting'
-      channelId: ${{ parameters.GeneralTestingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Dev_Publishing'
-      channelName: '.NET Core Tooling Dev'
-      channelId: ${{ parameters.NETCoreToolingDevChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Tooling_Release_Publishing'
-      channelName: '.NET Core Tooling Release'
-      channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NET_Internal_Tooling_Publishing'
-      channelName: '.NET Internal Tooling'
-      channelId: ${{ parameters.NETInternalToolingChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_Experimental_Publishing'
-      channelName: '.NET Core Experimental'
-      channelId: ${{ parameters.NETCoreExperimentalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Int_Publish'
-      channelName: '.NET Eng Services - Int'
-      channelId: ${{ parameters.NetEngServicesIntChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net_Eng_Services_Prod_Publish'
-      channelName: '.NET Eng Services - Prod'
-      channelId: ${{ parameters.NetEngServicesProdChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx'
-      channelId: ${{ parameters.NetCoreSDK314xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_314xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.4xx Internal'
-      channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx'
-      channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'NETCore_SDK_313xx_Internal_Publishing'
-      channelName: '.NET Core SDK 3.1.3xx Internal'
-      channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' 
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_6_Publishing'
-      channelName: 'VS 16.6'
-      channelId: ${{ parameters.VS166ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_7_Publishing'
-      channelName: 'VS 16.7'
-      channelId: ${{ parameters.VS167ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-      
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS16_8_Publishing'
-      channelName: 'VS 16.8'
-      channelId: ${{ parameters.VS168ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_Master_Publishing'
-      channelName: 'VS Master'
-      channelId: ${{ parameters.VSMasterChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_9_Publishing'
-      channelName: 'VS 16.9'
-      channelId: ${{ parameters.VS169ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+- template: /eng/common/core-templates/post-build/post-build.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: false
 
-  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
-    parameters:
-      BARBuildId: ${{ parameters.BARBuildId }}
-      PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}    
-      artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
-      dependsOn: ${{ parameters.publishDependsOn }}
-      publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
-      symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'VS_16_10_Publishing'
-      channelName: 'VS 16.10'
-      channelId: ${{ parameters.VS1610ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 4a22b2e6f6..a79fab5b44 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -1,78 +1,8 @@
-parameters:
-  BARBuildId: ''
-  PromoteToChannelIds: ''
-
-jobs:
-- job: setupMaestroVars
-  displayName: Setup Maestro Vars
-  variables:
-    - template: common-variables.yml
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-    - checkout: none
-
-    - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
-      - task: DownloadBuildArtifacts@0
-        displayName: Download Release Configs
-        inputs:
-          buildType: current
-          artifactName: ReleaseConfigs
-          checkDownloadedFiles: true
-
-    - task: PowerShell@2
-      name: setReleaseVars
-      displayName: Set Release Configs Vars
-      inputs:
-        targetType: inline
-        script: |
-          try {
-            if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
-              $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
-
-              $BarId = $Content | Select -Index 0
-              $Channels = $Content | Select -Index 1             
-              $IsStableBuild = $Content | Select -Index 2
-
-              $AzureDevOpsProject = $Env:System_TeamProject
-              $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId
-              $AzureDevOpsBuildId = $Env:Build_BuildId
-            }
-            else {
-              $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}"
-
-              $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
-              $apiHeaders.Add('Accept', 'application/json')
-              $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
-
-              $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" }
-             
-              $BarId = $Env:BARBuildId
-              $Channels = $Env:PromoteToMaestroChannels -split ","
-              $Channels = $Channels -join "]["
-              $Channels = "[$Channels]"
-
-              $IsStableBuild = $buildInfo.stable
-              $AzureDevOpsProject = $buildInfo.azureDevOpsProject
-              $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId
-              $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId
-            }
-
-            Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId"
-            Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels"
-            Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
-
-            Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject"
-            Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId"
-            Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId"
-          }
-          catch {
-            Write-Host $_
-            Write-Host $_.Exception
-            Write-Host $_.ScriptStackTrace
-            exit 1
-          }
-      env:
-        MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
-        BARBuildId: ${{ parameters.BARBuildId }}
-        PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }}
+steps:
+- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
+  parameters:
+    # Specifies whether to use 1ES
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml
deleted file mode 100644
index da669030da..0000000000
--- a/eng/common/templates/post-build/trigger-subscription.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  ChannelId: 0
-
-steps:
-- task: PowerShell@2
-  displayName: Triggering subscriptions
-  inputs:
-    filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1
-    arguments: -SourceRepo $(Build.Repository.Uri)
-      -ChannelId ${{ parameters.ChannelId }}
-      -MaestroApiAccessToken $(MaestroAccessToken)
-      -MaestroApiEndPoint $(MaestroApiEndPoint)
-      -MaestroApiVersion $(MaestroApiVersion)
diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml
deleted file mode 100644
index f67a210d62..0000000000
--- a/eng/common/templates/steps/add-build-to-channel.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  ChannelId: 0
-
-steps:
-- task: PowerShell@2
-  displayName: Add Build to Channel
-  inputs:
-    filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1
-    arguments: -BuildId $(BARBuildId) 
-      -ChannelId ${{ parameters.ChannelId }}
-      -MaestroApiAccessToken $(MaestroApiAccessToken)
-      -MaestroApiEndPoint $(MaestroApiEndPoint)
-      -MaestroApiVersion $(MaestroApiVersion) 
diff --git a/eng/common/templates/steps/build-reason.yml b/eng/common/templates/steps/build-reason.yml
deleted file mode 100644
index eba58109b5..0000000000
--- a/eng/common/templates/steps/build-reason.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# build-reason.yml
-# Description: runs steps if build.reason condition is valid.  conditions is a string of valid build reasons 
-# to include steps (',' separated).
-parameters:
-  conditions: ''
-  steps: []
-
-steps:
-  - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}:
-    - ${{ parameters.steps }}
-  - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}:
-    - ${{ parameters.steps }}
diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
new file mode 100644
index 0000000000..c12a5f8d21
--- /dev/null
+++ b/eng/common/templates/steps/component-governance.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/component-governance.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml
new file mode 100644
index 0000000000..b21a8038cc
--- /dev/null
+++ b/eng/common/templates/steps/enable-internal-runtimes.yml
@@ -0,0 +1,10 @@
+# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
+# variable with the base64-encoded SAS token, by default
+
+steps:
+- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/enable-internal-sources.yml b/eng/common/templates/steps/enable-internal-sources.yml
new file mode 100644
index 0000000000..5f87e9abb8
--- /dev/null
+++ b/eng/common/templates/steps/enable-internal-sources.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/enable-internal-sources.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml
new file mode 100644
index 0000000000..26dc00a2e0
--- /dev/null
+++ b/eng/common/templates/steps/generate-sbom.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/generate-sbom.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml
new file mode 100644
index 0000000000..83760c9798
--- /dev/null
+++ b/eng/common/templates/steps/get-delegation-sas.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/get-delegation-sas.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml
new file mode 100644
index 0000000000..31e151d9d9
--- /dev/null
+++ b/eng/common/templates/steps/get-federated-access-token.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/get-federated-access-token.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml
new file mode 100644
index 0000000000..605e602e94
--- /dev/null
+++ b/eng/common/templates/steps/publish-build-artifacts.yml
@@ -0,0 +1,46 @@
+parameters:
+- name: is1ESPipeline
+  type: boolean
+  default: false
+
+- name: displayName
+  type: string
+  default: 'Publish to Build Artifact'
+
+- name: condition
+  type: string
+  default: succeeded()
+
+- name: artifactName
+  type: string
+
+- name: pathToPublish
+  type: string
+
+- name: continueOnError
+  type: boolean
+  default: false
+
+- name: publishLocation
+  type: string
+  default: 'Container'
+
+- name: retryCountOnTaskFailure
+  type: string
+  default: 10
+
+steps:
+- ${{ if eq(parameters.is1ESPipeline, true) }}:
+  - 'eng/common/templates cannot be referenced from a 1ES managed template': error
+- task: PublishBuildArtifacts@1
+  displayName: ${{ parameters.displayName }}
+  condition: ${{ parameters.condition }}
+  ${{ if parameters.continueOnError }}:
+    continueOnError: ${{ parameters.continueOnError }}
+  inputs:
+    PublishLocation: ${{ parameters.publishLocation }}  
+    PathtoPublish: ${{ parameters.pathToPublish }}
+    ${{ if parameters.artifactName }}:
+      ArtifactName: ${{ parameters.artifactName }}
+    ${{ if parameters.retryCountOnTaskFailure }}:
+      retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index 88f238f36b..4ea86bd882 100644
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@@ -1,23 +1,7 @@
-parameters:
-  StageLabel: ''
-  JobLabel: ''
-
 steps:
-- task: Powershell@2
-  displayName: Prepare Binlogs to Upload
-  inputs:
-    targetType: inline
-    script: |
-      New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
-      Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
-  continueOnError: true
-  condition: always()
+- template: /eng/common/core-templates/steps/publish-logs.yml
+  parameters:
+    is1ESPipeline: false
 
-- task: PublishBuildArtifacts@1
-  displayName: Publish Logs
-  inputs:
-    PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs'
-    PublishLocation: Container
-    ArtifactName: PostBuildLogs
-  continueOnError: true
-  condition: always()
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml
new file mode 100644
index 0000000000..5dd698b212
--- /dev/null
+++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml
@@ -0,0 +1,34 @@
+parameters:
+- name: is1ESPipeline
+  type: boolean
+  default: false
+
+- name: args
+  type: object
+  default: {}
+
+steps:
+- ${{ if eq(parameters.is1ESPipeline, true) }}:
+  - 'eng/common/templates cannot be referenced from a 1ES managed template': error
+- task: PublishPipelineArtifact@1
+  displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }}
+  ${{ if parameters.args.condition }}:
+    condition: ${{ parameters.args.condition }}
+  ${{ else }}:
+    condition: succeeded()
+  ${{ if parameters.args.continueOnError }}:
+    continueOnError: ${{ parameters.args.continueOnError }}
+  inputs:
+    targetPath: ${{ parameters.args.targetPath }}
+    ${{ if parameters.args.artifactName }}:
+      artifactName: ${{ parameters.args.artifactName }}
+    ${{ if parameters.args.publishLocation }}:
+      publishLocation: ${{ parameters.args.publishLocation }}
+    ${{ if parameters.args.fileSharePath }}:
+      fileSharePath: ${{ parameters.args.fileSharePath }}
+    ${{ if parameters.args.Parallel }}:
+      parallel: ${{ parameters.args.Parallel }}
+    ${{ if parameters.args.parallelCount }}:
+      parallelCount: ${{ parameters.args.parallelCount }}
+    ${{ if parameters.args.properties }}:
+      properties: ${{ parameters.args.properties }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml
new file mode 100644
index 0000000000..8e841ace3d
--- /dev/null
+++ b/eng/common/templates/steps/retain-build.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/retain-build.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/run-on-unix.yml b/eng/common/templates/steps/run-on-unix.yml
deleted file mode 100644
index e1733814f6..0000000000
--- a/eng/common/templates/steps/run-on-unix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
-  agentOs: ''
-  steps: []
-
-steps:
-- ${{ if ne(parameters.agentOs, 'Windows_NT') }}:
-  - ${{ parameters.steps }}
diff --git a/eng/common/templates/steps/run-on-windows.yml b/eng/common/templates/steps/run-on-windows.yml
deleted file mode 100644
index 73e7e9c275..0000000000
--- a/eng/common/templates/steps/run-on-windows.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
-  agentOs: ''
-  steps: []
-
-steps:
-- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-  - ${{ parameters.steps }}
diff --git a/eng/common/templates/steps/run-script-ifequalelse.yml b/eng/common/templates/steps/run-script-ifequalelse.yml
deleted file mode 100644
index 3d1242f558..0000000000
--- a/eng/common/templates/steps/run-script-ifequalelse.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-parameters:
-  # if parameter1 equals parameter 2, run 'ifScript' command, else run 'elsescript' command
-  parameter1: ''
-  parameter2: ''
-  ifScript: ''
-  elseScript: ''
-
-  # name of script step
-  name: Script
-
-  # display name of script step
-  displayName: If-Equal-Else Script
-
-  # environment
-  env: {}
-
-  # conditional expression for step execution
-  condition: ''
-
-steps:
-- ${{ if and(ne(parameters.ifScript, ''), eq(parameters.parameter1, parameters.parameter2)) }}:
-  - script: ${{ parameters.ifScript }}
-    name: ${{ parameters.name }}
-    displayName: ${{ parameters.displayName }}
-    env: ${{ parameters.env }}
-    condition: ${{ parameters.condition }}
-
-- ${{ if and(ne(parameters.elseScript, ''), ne(parameters.parameter1, parameters.parameter2)) }}:
-  - script: ${{ parameters.elseScript }}
-    name: ${{ parameters.name }}
-    displayName: ${{ parameters.displayName }}
-    env: ${{ parameters.env }}
-    condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index 09a223989f..39f99fc276 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/eng/common/templates/steps/send-to-helix.yml
@@ -1,91 +1,7 @@
-# Please remember to update the documentation if you make changes to these parameters!
-parameters:
-  HelixSource: 'pr/default'              # required -- sources must start with pr/, official/, prodcon/, or agent/
-  HelixType: 'tests/default/'            # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
-  HelixBuild: $(Build.BuildNumber)       # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
-  HelixTargetQueues: ''                  # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
-  HelixAccessToken: ''                   # required -- access token to make Helix API requests; should be provided by the appropriate variable group
-  HelixConfiguration: ''                 # optional -- additional property attached to a job
-  HelixPreCommands: ''                   # optional -- commands to run before Helix work item execution
-  HelixPostCommands: ''                  # optional -- commands to run after Helix work item execution
-  WorkItemDirectory: ''                  # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
-  WorkItemCommand: ''                    # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
-  WorkItemTimeout: ''                    # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
-  CorrelationPayloadDirectory: ''        # optional -- a directory to zip up and send to Helix as a correlation payload
-  XUnitProjects: ''                      # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
-  XUnitWorkItemTimeout: ''               # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects
-  XUnitPublishTargetFramework: ''        # optional -- framework to use to publish your xUnit projects
-  XUnitRuntimeTargetFramework: ''        # optional -- framework to use for the xUnit console runner
-  XUnitRunnerVersion: ''                 # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
-  IncludeDotNetCli: false                # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
-  DotNetCliPackageType: ''               # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
-  DotNetCliVersion: ''                   # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
-  WaitForWorkItemCompletion: true        # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
-  IsExternal: false                      # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
-  HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
-  Creator: ''                            # optional -- if the build is external, use this to specify who is sending the job
-  DisplayNamePrefix: 'Run Tests'         # optional -- rename the beginning of the displayName of the steps in AzDO 
-  condition: succeeded()                 # optional -- condition for step to execute; defaults to succeeded()
-  continueOnError: false                 # optional -- determines whether to continue the build if the step errors; defaults to false
-
 steps:
-  - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
-    displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
-    env:
-      BuildConfig: $(_BuildConfig)
-      HelixSource: ${{ parameters.HelixSource }}
-      HelixType: ${{ parameters.HelixType }}
-      HelixBuild: ${{ parameters.HelixBuild }}
-      HelixConfiguration:  ${{ parameters.HelixConfiguration }}
-      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
-      HelixAccessToken: ${{ parameters.HelixAccessToken }}
-      HelixPreCommands: ${{ parameters.HelixPreCommands }}
-      HelixPostCommands: ${{ parameters.HelixPostCommands }}
-      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
-      WorkItemCommand: ${{ parameters.WorkItemCommand }}
-      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
-      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
-      XUnitProjects: ${{ parameters.XUnitProjects }}
-      XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }}
-      XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
-      XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }}
-      XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
-      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
-      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
-      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
-      HelixBaseUri: ${{ parameters.HelixBaseUri }}
-      Creator: ${{ parameters.Creator }}
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
-    continueOnError: ${{ parameters.continueOnError }}
-  - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
-    displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
-    env:
-      BuildConfig: $(_BuildConfig)
-      HelixSource: ${{ parameters.HelixSource }}
-      HelixType: ${{ parameters.HelixType }}
-      HelixBuild: ${{ parameters.HelixBuild }}
-      HelixConfiguration:  ${{ parameters.HelixConfiguration }}
-      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
-      HelixAccessToken: ${{ parameters.HelixAccessToken }}
-      HelixPreCommands: ${{ parameters.HelixPreCommands }}
-      HelixPostCommands: ${{ parameters.HelixPostCommands }}
-      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
-      WorkItemCommand: ${{ parameters.WorkItemCommand }}
-      WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
-      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
-      XUnitProjects: ${{ parameters.XUnitProjects }}
-      XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }}
-      XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
-      XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }}
-      XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
-      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
-      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
-      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
-      HelixBaseUri: ${{ parameters.HelixBaseUri }}
-      Creator: ${{ parameters.Creator }}
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT'))
-    continueOnError: ${{ parameters.continueOnError }}
+- template: /eng/common/core-templates/steps/send-to-helix.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index ba40dc82f1..23c1d6f4e9 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -1,102 +1,7 @@
-parameters:
-  # This template adds arcade-powered source-build to CI.
-
-  # This is a 'steps' template, and is intended for advanced scenarios where the existing build
-  # infra has a careful build methodology that must be followed. For example, a repo
-  # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline
-  # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to
-  # GitHub. Using this steps template leaves room for that infra to be included.
-
-  # Defines the platform on which to run the steps. See 'eng/common/templates/job/source-build.yml'
-  # for details. The entire object is described in the 'job' template for simplicity, even though
-  # the usage of the properties on this object is split between the 'job' and 'steps' templates.
-  platform: {}
-
 steps:
-# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
-- script: |
-    set -x
-    df -h
-
-    # If building on the internal project, the artifact feeds variable may be available (usually only if needed)
-    # In that case, call the feed setup script to add internal feeds corresponding to public ones.
-    # In addition, add an msbuild argument to copy the WIP from the repo to the target build location.
-    # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those
-    # changes.
-    $internalRestoreArgs=
-    if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then
-      # Temporarily work around https://github.com/dotnet/arcade/issues/7709
-      chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-      $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw)
-      internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
-
-      # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
-      # This only works if there is a username/email configured, which won't be the case in most CI runs.
-      git config --get user.email
-      if [ $? -ne 0 ]; then
-        git config user.email dn-bot@microsoft.com
-        git config user.name dn-bot
-      fi
-    fi
-
-    # If building on the internal project, the internal storage variable may be available (usually only if needed)
-    # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
-    # in the default public locations.
-    internalRuntimeDownloadArgs=
-    if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
-      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
-    fi
-
-    buildConfig=Release
-    # Check if AzDO substitutes in a build config from a variable, and use it if so.
-    if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then
-      buildConfig='$(_BuildConfig)'
-    fi
-
-    officialBuildArgs=
-    if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
-      officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
-    fi
-
-    targetRidArgs=
-    if [ '${{ parameters.platform.targetRID }}' != '' ]; then
-      targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
-    fi
-
-    publishArgs=
-    if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
-      publishArgs='--publish'
-    fi
-
-    ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
-      --configuration $buildConfig \
-      --restore --build --pack $publishArgs -bl \
-      $officialBuildArgs \
-      $internalRuntimeDownloadArgs \
-      $internalRestoreArgs \
-      $targetRidArgs \
-      /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
-      /p:ArcadeBuildFromSource=true
-  displayName: Build
-
-# Upload build logs for diagnosis.
-- task: CopyFiles@2
-  displayName: Prepare BuildLogs staging directory
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)'
-    Contents: |
-      **/*.log
-      **/*.binlog
-      artifacts/source-build/self/prebuilt-report/**
-    TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
-    CleanTargetFolder: true
-  continueOnError: true
-  condition: succeededOrFailed()
+- template: /eng/common/core-templates/steps/source-build.yml
+  parameters:
+    is1ESPipeline: false
 
-- task: PublishPipelineArtifact@1
-  displayName: Publish BuildLogs
-  inputs:
-    targetPath: '$(Build.StagingDirectory)/BuildLogs'
-    artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
-  continueOnError: true
-  condition: succeededOrFailed()
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/source-index-stage1-publish.yml b/eng/common/templates/steps/source-index-stage1-publish.yml
new file mode 100644
index 0000000000..182cec33a7
--- /dev/null
+++ b/eng/common/templates/steps/source-index-stage1-publish.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/telemetry-end.yml b/eng/common/templates/steps/telemetry-end.yml
deleted file mode 100644
index fadc04ca1b..0000000000
--- a/eng/common/templates/steps/telemetry-end.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-parameters:
-  maxRetries: 5
-  retryDelay: 10 # in seconds
-
-steps:
-- bash: |
-    if [ "$AGENT_JOBSTATUS" = "Succeeded" ] || [ "$AGENT_JOBSTATUS" = "PartiallySucceeded" ]; then
-      errorCount=0
-    else
-      errorCount=1
-    fi
-    warningCount=0
-
-    curlStatus=1
-    retryCount=0
-    # retry loop to harden against spotty telemetry connections
-    # we don't retry successes and 4xx client errors
-    until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]]
-    do
-      if [ $retryCount -gt 0 ]; then
-        echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..."
-        sleep $RetryDelay
-      fi
-
-      # create a temporary file for curl output
-      res=`mktemp`
-
-      curlResult=`
-        curl --verbose --output $res --write-out "%{http_code}"\
-        -H 'Content-Type: application/json' \
-        -H "X-Helix-Job-Token: $Helix_JobToken" \
-        -H 'Content-Length: 0' \
-        -X POST -G "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$Helix_WorkItemId/finish" \
-        --data-urlencode "errorCount=$errorCount" \
-        --data-urlencode "warningCount=$warningCount"`
-      curlStatus=$?
-
-      if [ $curlStatus -eq 0 ]; then
-        if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then
-          curlStatus=$curlResult
-        fi
-      fi
-
-      let retryCount++
-    done
-
-    if [ $curlStatus -ne 0 ]; then
-      echo "Failed to Send Build Finish information after $retryCount retries"
-      vstsLogOutput="vso[task.logissue type=error;sourcepath=templates/steps/telemetry-end.yml;code=1;]Failed to Send Build Finish information: $curlStatus"
-      echo "##$vstsLogOutput"
-      exit 1
-    fi
-  displayName: Send Unix Build End Telemetry
-  env:
-    # defined via VSTS variables in start-job.sh
-    Helix_JobToken: $(Helix_JobToken)
-    Helix_WorkItemId: $(Helix_WorkItemId)
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT'))
-- powershell: |
-    if (($env:Agent_JobStatus -eq 'Succeeded') -or ($env:Agent_JobStatus -eq 'PartiallySucceeded')) {
-      $ErrorCount = 0
-    } else {
-      $ErrorCount = 1
-    }
-    $WarningCount = 0
-
-    # Basic retry loop to harden against server flakiness
-    $retryCount = 0
-    while ($retryCount -lt $env:MaxRetries) {
-      try {
-        Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$env:Helix_WorkItemId/finish?errorCount=$ErrorCount&warningCount=$WarningCount" -Method Post -ContentType "application/json" -Body "" `
-          -Headers @{ 'X-Helix-Job-Token'=$env:Helix_JobToken }
-        break
-      }
-      catch {
-        $statusCode = $_.Exception.Response.StatusCode.value__
-        if ($statusCode -ge 400 -and $statusCode -le 499) {
-          Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)"
-          Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message
-          exit 1
-        }
-        Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..."
-        $retryCount++
-        sleep $env:RetryDelay
-        continue
-      }
-    }
-
-    if ($retryCount -ge $env:MaxRetries) {
-      Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries."
-      exit 1
-    }
-  displayName: Send Windows Build End Telemetry
-  env:
-    # defined via VSTS variables in start-job.ps1
-    Helix_JobToken: $(Helix_JobToken)
-    Helix_WorkItemId: $(Helix_WorkItemId)
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(),eq(variables['Agent.Os'], 'Windows_NT'))
diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml
deleted file mode 100644
index 32c01ef0b5..0000000000
--- a/eng/common/templates/steps/telemetry-start.yml
+++ /dev/null
@@ -1,241 +0,0 @@
-parameters:
-  helixSource: 'undefined_defaulted_in_telemetry.yml'
-  helixType: 'undefined_defaulted_in_telemetry.yml'
-  buildConfig: ''
-  runAsPublic: false
-  maxRetries: 5
-  retryDelay: 10 # in seconds
-
-steps:
-- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}:
-  - task: AzureKeyVault@1
-    inputs:
-      azureSubscription: 'HelixProd_KeyVault'
-      KeyVaultName: HelixProdKV
-      SecretsFilter: 'HelixApiAccessToken'
-    condition: always()
-- bash: |
-    # create a temporary file
-    jobInfo=`mktemp`
-
-    # write job info content to temporary file
-    cat > $jobInfo <<JobListStuff
-    {
-      "QueueId": "$QueueId",
-      "Source": "$Source",
-      "Type": "$Type",
-      "Build": "$Build",
-      "Attempt": "$Attempt",
-      "Properties": {
-        "operatingSystem": "$OperatingSystem",
-        "configuration": "$Configuration"
-      }
-    }
-    JobListStuff
-
-    cat $jobInfo
-
-    # create a temporary file for curl output
-    res=`mktemp`
-
-    accessTokenParameter="?access_token=$HelixApiAccessToken"
-
-    curlStatus=1
-    retryCount=0
-    # retry loop to harden against spotty telemetry connections
-    # we don't retry successes and 4xx client errors
-    until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]]
-    do
-      if [ $retryCount -gt 0 ]; then
-        echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..."
-        sleep $RetryDelay
-      fi
-
-      curlResult=`
-        cat $jobInfo |\
-        curl --trace - --verbose --output $res --write-out "%{http_code}" \
-        -H 'Content-Type: application/json' \
-        -X POST "https://helix.dot.net/api/2018-03-14/telemetry/job$accessTokenParameter" -d @-`
-      curlStatus=$?
-
-      if [ $curlStatus -eq 0 ]; then
-        if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then
-          curlStatus=$curlResult
-        fi
-      fi
-
-      let retryCount++
-    done
-
-    curlResult=`cat $res`
-
-    # validate status of curl command
-    if [ $curlStatus -ne 0 ]; then
-      echo "Failed To Send Job Start information after $retryCount retries"
-      # We have to append the ## vso prefix or vso will pick up the command when it dumps the inline script into the shell
-      vstsLogOutput="vso[task.logissue type=error;sourcepath=telemetry/start-job.sh;code=1;]Failed to Send Job Start information: $curlStatus"
-      echo "##$vstsLogOutput"
-      exit 1
-    fi
-
-    # Set the Helix_JobToken variable
-    export Helix_JobToken=`echo $curlResult | xargs echo` # Strip Quotes
-    echo "##vso[task.setvariable variable=Helix_JobToken;issecret=true;]$Helix_JobToken"
-  displayName: Send Unix Job Start Telemetry
-  env:
-    HelixApiAccessToken: $(HelixApiAccessToken)
-    Source: ${{ parameters.helixSource }}
-    Type: ${{ parameters.helixType }}
-    Build: $(Build.BuildNumber)
-    QueueId: $(Agent.Os)
-    Attempt: 1
-    OperatingSystem: $(Agent.Os)
-    Configuration: ${{ parameters.buildConfig }}
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT'))
-- bash: |
-    curlStatus=1
-    retryCount=0
-    # retry loop to harden against spotty telemetry connections
-    # we don't retry successes and 4xx client errors
-    until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]]
-    do
-      if [ $retryCount -gt 0 ]; then
-        echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..."
-        sleep $RetryDelay
-      fi
-
-      res=`mktemp`
-      curlResult=`
-        curl --verbose --output $res --write-out "%{http_code}"\
-        -H 'Content-Type: application/json' \
-        -H "X-Helix-Job-Token: $Helix_JobToken" \
-        -H 'Content-Length: 0' \
-        -X POST -G "https://helix.dot.net/api/2018-03-14/telemetry/job/build" \
-        --data-urlencode "buildUri=$BuildUri"`
-      curlStatus=$?
-
-      if [ $curlStatus -eq 0 ]; then
-        if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then
-          curlStatus=$curlResult
-        fi
-      fi
-
-      curlResult=`cat $res`
-      let retryCount++
-    done
-
-    # validate status of curl command
-    if [ $curlStatus -ne 0 ]; then
-      echo "Failed to Send Build Start information after $retryCount retries"
-      vstsLogOutput="vso[task.logissue type=error;sourcepath=telemetry/build/start.sh;code=1;]Failed to Send Build Start information: $curlStatus"
-      echo "##$vstsLogOutput"
-      exit 1
-    fi
-
-    export Helix_WorkItemId=`echo $curlResult | xargs echo` # Strip Quotes
-    echo "##vso[task.setvariable variable=Helix_WorkItemId]$Helix_WorkItemId"
-  displayName: Send Unix Build Start Telemetry
-  env:
-    BuildUri: $(System.TaskDefinitionsUri)$(System.TeamProject)/_build/index?buildId=$(Build.BuildId)&_a=summary
-    Helix_JobToken: $(Helix_JobToken)
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT'))
-
-- powershell: |
-    $jobInfo = [pscustomobject]@{
-      QueueId=$env:QueueId;
-      Source=$env:Source;
-      Type=$env:Type;
-      Build=$env:Build;
-      Attempt=$env:Attempt;
-      Properties=[pscustomobject]@{ operatingSystem=$env:OperatingSystem; configuration=$env:Configuration };
-    }
-
-    $jobInfoJson = $jobInfo | ConvertTo-Json
-
-    if ($env:HelixApiAccessToken) {
-      $accessTokenParameter="?access_token=$($env:HelixApiAccessToken)"
-    }
-    Write-Host "Job Info: $jobInfoJson"
-
-    # Basic retry loop to harden against server flakiness
-    $retryCount = 0
-    while ($retryCount -lt $env:MaxRetries) {
-      try {
-        $jobToken = Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job$($accessTokenParameter)" -Method Post -ContentType "application/json" -Body $jobInfoJson
-        break
-      }
-      catch {
-        $statusCode = $_.Exception.Response.StatusCode.value__
-        if ($statusCode -ge 400 -and $statusCode -le 499) {
-          Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)"
-          Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message
-          exit 1
-        }
-        Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..."
-        $retryCount++
-        sleep $env:RetryDelay
-        continue
-      }
-    }
-
-    if ($retryCount -ge $env:MaxRetries) {
-      Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries."
-      exit 1
-    }
-
-    $env:Helix_JobToken = $jobToken
-    Write-Host "##vso[task.setvariable variable=Helix_JobToken;issecret=true;]$env:Helix_JobToken"
-  env:
-    HelixApiAccessToken: $(HelixApiAccessToken)
-    Source: ${{ parameters.helixSource }}
-    Type: ${{ parameters.helixType }}
-    Build: $(Build.BuildNumber)
-    QueueId: $(Agent.Os)
-    Attempt: 1
-    OperatingSystem: $(Agent.Os)
-    Configuration: ${{ parameters.buildConfig }}
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(), eq(variables['Agent.Os'], 'Windows_NT'))
-  displayName: Send Windows Job Start Telemetry
-- powershell: |
-    # Basic retry loop to harden against server flakiness
-    $retryCount = 0
-    while ($retryCount -lt $env:MaxRetries) {
-      try {
-        $workItemId = Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job/build?buildUri=$([Net.WebUtility]::UrlEncode($env:BuildUri))" -Method Post -ContentType "application/json" -Body "" `
-          -Headers @{ 'X-Helix-Job-Token'=$env:Helix_JobToken }
-        break
-      }
-      catch {
-        $statusCode = $_.Exception.Response.StatusCode.value__
-        if ($statusCode -ge 400 -and $statusCode -le 499) {
-          Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)"
-          Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message
-          exit 1
-        }
-        Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..."
-        $retryCount++
-        sleep $env:RetryDelay
-        continue
-      }
-    }
-
-    if ($retryCount -ge $env:MaxRetries) {
-      Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries."
-      exit 1
-    }
-
-    $env:Helix_WorkItemId = $workItemId
-    Write-Host "##vso[task.setvariable variable=Helix_WorkItemId]$env:Helix_WorkItemId"
-  displayName: Send Windows Build Start Telemetry
-  env:
-    BuildUri: $(System.TaskDefinitionsUri)$(System.TeamProject)/_build/index?buildId=$(Build.BuildId)&_a=summary
-    Helix_JobToken: $(Helix_JobToken)
-    MaxRetries: ${{ parameters.maxRetries }}
-    RetryDelay: ${{ parameters.retryDelay }}
-  condition: and(always(), eq(variables['Agent.Os'], 'Windows_NT'))
diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml
new file mode 100644
index 0000000000..599afb6186
--- /dev/null
+++ b/eng/common/templates/steps/vmr-sync.yml
@@ -0,0 +1,207 @@
+### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet).
+### They initialize the darc CLI and pull the new updates.
+### Changes are applied locally onto the already cloned VMR (located in $vmrPath).
+
+parameters:
+- name: targetRef
+  displayName: Target revision in dotnet/<repo> to synchronize
+  type: string
+  default: $(Build.SourceVersion)
+
+- name: vmrPath
+  displayName: Path where the dotnet/dotnet is checked out to
+  type: string
+  default: $(Agent.BuildDirectory)/vmr
+
+- name: additionalSyncs
+  displayName: Optional list of package names whose repo's source will also be synchronized in the local VMR, e.g. NuGet.Protocol
+  type: object
+  default: []
+
+steps:
+- checkout: vmr
+  displayName: Clone dotnet/dotnet
+  path: vmr
+  clean: true
+
+- checkout: self
+  displayName: Clone $(Build.Repository.Name)
+  path: repo
+  fetchDepth: 0
+
+# This step is needed so that when we get a detached HEAD / shallow clone,
+# we still pull the commit into the temporary repo clone to use it during the sync.
+# Also unshallow the clone so that forwardflow command would work.
+- script: |
+    git branch repo-head
+    git rev-parse HEAD
+  displayName: Label PR commit
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml)
+    echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
+  displayName: Obtain the vmr sha from Version.Details.xml (Unix)
+  condition: ne(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- powershell: |
+    [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml
+    $vmr_sha = $xml.SelectSingleNode("//Source").Sha
+    Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
+  displayName: Obtain the vmr sha from Version.Details.xml (Windows)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    git fetch --all
+    git checkout $(vmr_sha)
+  displayName: Checkout VMR at correct sha for repo flow
+  workingDirectory: ${{ parameters.vmrPath }}
+
+- script: |
+    git config --global user.name "dotnet-maestro[bot]"
+    git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com"
+  displayName: Set git author to dotnet-maestro[bot]
+  workingDirectory: ${{ parameters.vmrPath }}
+
+- script: |
+    ./eng/common/vmr-sync.sh                         \
+      --vmr ${{ parameters.vmrPath }}         \
+      --tmp $(Agent.TempDirectory)            \
+      --azdev-pat '$(dn-bot-all-orgs-code-r)' \
+      --ci                                    \
+      --debug
+
+    if [ "$?" -ne 0 ]; then
+      echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+      exit 1
+    fi
+  displayName: Sync repo into VMR (Unix)
+  condition: ne(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    git config --global diff.astextplain.textconv echo
+    git config --system core.longpaths true
+  displayName: Configure Windows git (longpaths, astextplain)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+
+- powershell: |
+    ./eng/common/vmr-sync.ps1                      `
+      -vmr ${{ parameters.vmrPath }}        `
+      -tmp $(Agent.TempDirectory)           `
+      -azdevPat '$(dn-bot-all-orgs-code-r)' `
+      -ci                                   `
+      -debugOutput
+
+    if ($LASTEXITCODE -ne 0) {
+      echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+      exit 1
+    }
+  displayName: Sync repo into VMR (Windows)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - task: CopyFiles@2
+    displayName: Collect failed patches
+    condition: failed()
+    inputs:
+      SourceFolder: '$(Agent.TempDirectory)'
+      Contents: '*.patch'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/FailedPatches'
+
+  - publish: '$(Build.ArtifactStagingDirectory)/FailedPatches'
+    artifact: $(System.JobDisplayName)_FailedPatches
+    displayName: Upload failed patches
+    condition: failed()
+
+- ${{ each assetName in parameters.additionalSyncs }}:
+  # The vmr-sync script ends up staging files in the local VMR so we have to commit those
+  - script:
+      git commit --allow-empty -am "Forward-flow $(Build.Repository.Name)"
+    displayName: Commit local VMR changes
+    workingDirectory: ${{ parameters.vmrPath }}
+
+  - script: |
+      set -ex
+
+      echo "Searching for details of asset ${{ assetName }}..."
+
+      # Use darc to get dependencies information
+      dependencies=$(./.dotnet/dotnet darc get-dependencies --name '${{ assetName }}' --ci)
+
+      # Extract repository URL and commit hash
+      repository=$(echo "$dependencies" | grep 'Repo:' | sed 's/Repo:[[:space:]]*//' | head -1)
+
+      if [ -z "$repository" ]; then
+        echo "##vso[task.logissue type=error]Asset ${{ assetName }} not found in the dependency list"
+        exit 1
+      fi
+
+      commit=$(echo "$dependencies" | grep 'Commit:' | sed 's/Commit:[[:space:]]*//' | head -1)
+
+      echo "Updating the VMR from $repository / $commit..."
+      cd ..
+      git clone $repository ${{ assetName }}
+      cd ${{ assetName }}
+      git checkout $commit
+      git branch "sync/$commit"
+
+      ./eng/common/vmr-sync.sh                         \
+        --vmr ${{ parameters.vmrPath }}         \
+        --tmp $(Agent.TempDirectory)            \
+        --azdev-pat '$(dn-bot-all-orgs-code-r)' \
+        --ci                                    \
+        --debug
+
+      if [ "$?" -ne 0 ]; then
+        echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+        exit 1
+      fi
+    displayName: Sync ${{ assetName }} into (Unix)
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
+    workingDirectory: $(Agent.BuildDirectory)/repo
+
+  - powershell: |
+      $ErrorActionPreference = 'Stop'
+
+      Write-Host "Searching for details of asset ${{ assetName }}..."
+
+      $dependencies = .\.dotnet\dotnet darc get-dependencies --name '${{ assetName }}' --ci
+
+      $repository = $dependencies | Select-String -Pattern 'Repo:\s+([^\s]+)' | Select-Object -First 1
+      $repository -match 'Repo:\s+([^\s]+)' | Out-Null
+      $repository = $matches[1]
+
+      if ($repository -eq $null) {
+          Write-Error "Asset ${{ assetName }} not found in the dependency list"
+          exit 1
+      }
+
+      $commit = $dependencies | Select-String -Pattern 'Commit:\s+([^\s]+)' | Select-Object -First 1
+      $commit -match 'Commit:\s+([^\s]+)' | Out-Null
+      $commit = $matches[1]
+
+      Write-Host "Updating the VMR from $repository / $commit..."
+      cd ..
+      git clone $repository ${{ assetName }}
+      cd ${{ assetName }}
+      git checkout $commit
+      git branch "sync/$commit"
+
+      .\eng\common\vmr-sync.ps1 `
+        -vmr ${{ parameters.vmrPath }}             `
+        -tmp $(Agent.TempDirectory)                `
+        -azdevPat '$(dn-bot-all-orgs-code-r)'      `
+        -ci                                        `
+        -debugOutput
+
+      if ($LASTEXITCODE -ne 0) {
+        echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+        exit 1
+      }
+    displayName: Sync ${{ assetName }} into (Windows)
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
+    workingDirectory: $(Agent.BuildDirectory)/repo
diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml
new file mode 100644
index 0000000000..e0b19c14a0
--- /dev/null
+++ b/eng/common/templates/variables/pool-providers.yml
@@ -0,0 +1,59 @@
+# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
+# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
+
+# Motivation:
+#   Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
+#   (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
+#   (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
+#   Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
+#   team needs to move resources around and create new and potentially differently-named pools. Using this template
+#   file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
+
+# How to use:
+#  This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
+#  If we find alternate naming conventions in broad usage it can be added to the condition below.
+#
+#  First, import the template in an arcade-ified repo to pick up the variables, e.g.:
+#
+#  variables:
+#  - template: /eng/common/templates/variables/pool-providers.yml
+#
+#  ... then anywhere specifying the pool provider use the runtime variables,
+#      $(DncEngInternalBuildPool) and $  (DncEngPublicBuildPool), e.g.:
+#
+#        pool:
+#           name: $(DncEngInternalBuildPool)
+#           demands: ImageOverride -equals windows.vs2019.amd64
+variables:
+  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    - template: /eng/common/templates-official/variables/pool-providers.yml
+  - ${{ else }}:
+    # Coalesce the target and source branches so we know when a PR targets a release branch
+    # If these variables are somehow missing, fall back to main (tends to have more capacity)
+
+    # Any new -Svc alternative pools should have variables added here to allow for splitting work
+    - name: DncEngPublicBuildPool
+      value: $[
+          replace(
+            replace(
+              eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
+              True,
+              'NetCore-Svc-Public'
+            ),
+            False,
+            'NetCore-Public'
+          )
+        ]
+
+    - name: DncEngInternalBuildPool
+      value: $[
+          replace(
+            replace(
+              eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
+              True,
+              'NetCore1ESPool-Svc-Internal'
+            ),
+            False,
+            'NetCore1ESPool-Internal'
+          )
+        ]
diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml
new file mode 100644
index 0000000000..ce3c29a62f
--- /dev/null
+++ b/eng/common/templates/vmr-build-pr.yml
@@ -0,0 +1,42 @@
+# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
+#
+# It will run a full set of verification jobs defined in:
+# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
+#
+# For repos that do not need to run the full set, you would do the following:
+#
+# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
+#
+# 2. Add `verifications` parameter to VMR template reference
+#
+#    Examples:
+#    - For source-build stage 1 verification, add the following:
+#        verifications: [ "source-build-stage1" ]
+#
+#    - For Windows only verifications, add the following:
+#        verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
+
+trigger: none
+pr: none
+
+variables:
+- template: /eng/common/templates/variables/pool-providers.yml@self
+
+- name: skipComponentGovernanceDetection  # we run CG on internal builds only
+  value: true
+
+- name: Codeql.Enabled  # we run CodeQL on internal builds only
+  value: false
+
+resources:
+  repositories:
+  - repository: vmr
+    type: github
+    name: dotnet/dotnet
+    endpoint: dotnet
+
+stages:
+- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr
+  parameters:
+    isBuiltFromVmr: false
+    scope: lite
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index f1e1cb5395..d4cfd9ccd8 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,7 +42,7 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -65,6 +65,9 @@ $ErrorActionPreference = 'Stop'
 # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed
 [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null }
 
+# True when the build is running within the VMR.
+[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false }
+
 function Create-Directory ([string[]] $path) {
     New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
 }
@@ -158,18 +161,13 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   $env:DOTNET_MULTILEVEL_LOOKUP=0
 
   # Disable first run since we do not need all ASP.NET packages restored.
-  $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+  $env:DOTNET_NOLOGO=1
 
   # Disable telemetry on CI.
   if ($ci) {
     $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
   }
 
-  # Source Build uses DotNetCoreSdkDir variable
-  if ($env:DotNetCoreSdkDir -ne $null) {
-    $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir
-  }
-
   # Find the first path on %PATH% that contains the dotnet.exe
   if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
     $dotnetExecutable = GetExecutableFileName 'dotnet'
@@ -228,7 +226,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   Write-PipelinePrependPath -Path $dotnetRoot
 
   Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
-  Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
+  Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
 
   return $global:_DotNetInstallDir = $dotnetRoot
 }
@@ -254,16 +252,28 @@ function Retry($downloadBlock, $maxRetries = 5) {
       Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
       break
     }
-
   }
 }
 
 function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
+  $shouldDownload = $false
+  
   if (!(Test-Path $installScript)) {
+    $shouldDownload = $true
+  } else {
+    # Check if the script is older than 30 days
+    $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
+    if ($fileAge.Days -gt 30) {
+      Write-Host "Existing install script is too old, re-downloading..."
+      $shouldDownload = $true
+    }
+  }
+  
+  if ($shouldDownload) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+    $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
     Retry({
       Write-Host "GET $uri"
@@ -287,6 +297,25 @@ function InstallDotNet([string] $dotnetRoot,
   [string] $runtimeSourceFeedKey = '',
   [switch] $noPath) {
 
+  $dotnetVersionLabel = "'sdk v$version'"
+
+  if ($runtime -ne '' -and $runtime -ne 'sdk') {
+    $runtimePath = $dotnetRoot
+    $runtimePath = $runtimePath + "\shared"
+    if ($runtime -eq "dotnet") { $runtimePath = $runtimePath + "\Microsoft.NETCore.App" }
+    if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
+    if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
+    $runtimePath = $runtimePath + "\" + $version
+  
+    $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
+
+    if (Test-Path $runtimePath) {
+      Write-Host "  Runtime toolset '$runtime/$architecture v$version' already installed."
+      $installSuccess = $true
+      Exit
+    }
+  }
+
   $installScript = GetDotNetInstallScript $dotnetRoot
   $installParameters = @{
     Version = $version
@@ -302,7 +331,7 @@ function InstallDotNet([string] $dotnetRoot,
   $variations += @($installParameters)
 
   $dotnetBuilds = $installParameters.Clone()
-  $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
+  $dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
   $variations += @($dotnetBuilds)
 
   if ($runtimeSourceFeed) {
@@ -323,18 +352,18 @@ function InstallDotNet([string] $dotnetRoot,
     } else {
       $location = "public location";
     }
-    Write-Host "Attempting to install dotnet from $location."
+    Write-Host "  Attempting to install $dotnetVersionLabel from $location."
     try {
       & $installScript @variation
       $installSuccess = $true
       break
     }
     catch {
-      Write-Host "Failed to install dotnet from $location."
+      Write-Host "  Failed to install $dotnetVersionLabel from $location."
     }
   }
   if (-not $installSuccess) {
-    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
+    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install $dotnetVersionLabel from any of the specified locations."
     ExitWithExitCode 1
   }
 }
@@ -360,15 +389,22 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   # Minimum VS version to require.
-  $vsMinVersionReqdStr = '16.8'
+  $vsMinVersionReqdStr = '17.7'
   $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview
-  $defaultXCopyMSBuildVersion = '16.10.0-preview2'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
+  $defaultXCopyMSBuildVersion = '17.13.0'
 
-  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+  if (!$vsRequirements) {
+    if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
+      $vsRequirements = $GlobalJson.tools.vs
+    }
+    else {
+      $vsRequirements = New-Object PSObject -Property @{ version = $vsMinVersionReqdStr }
+    }
+  }
   $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
   $vsMinVersion = [Version]::new($vsMinVersionStr)
 
@@ -391,13 +427,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # Locate Visual Studio installation or download x-copy msbuild.
   $vsInfo = LocateVisualStudio $vsRequirements
-  if ($vsInfo -ne $null) {
-    $vsInstallDir = $vsInfo.installationPath
+  if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
+    # Ensure vsInstallDir has a trailing slash
+    $vsInstallDir = Join-Path $vsInfo.installationPath "\"
     $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
 
     InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion
   } else {
-
     if (Get-Member -InputObject $GlobalJson.tools -Name 'xcopy-msbuild') {
       $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild'
       $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
@@ -406,6 +442,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
       if($vsMinVersion -lt $vsMinVersionReqd){
         Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible"
         $xcopyMSBuildVersion = $defaultXCopyMSBuildVersion
+        $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
       }
       else{
         # If the VS version IS compatible, look for an xcopy msbuild package
@@ -422,7 +459,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
     if ($xcopyMSBuildVersion.Trim() -ine "none") {
         $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
         if ($vsInstallDir -eq $null) {
-            throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'."
+            throw "Could not xcopy msbuild. Please check that package 'Microsoft.DotNet.Arcade.MSBuild.Xcopy @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'."
         }
     }
     if ($vsInstallDir -eq $null) {
@@ -459,7 +496,7 @@ function InstallXCopyMSBuild([string]$packageVersion) {
 }
 
 function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
-  $packageName = 'RoslynTools.MSBuild'
+  $packageName = 'Microsoft.DotNet.Arcade.MSBuild.Xcopy'
   $packageDir = Join-Path $ToolsDir "msbuild\$packageVersion"
   $packagePath = Join-Path $packageDir "$packageName.$packageVersion.nupkg"
 
@@ -476,6 +513,10 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
       Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
     })
 
+    if (!(Test-Path $packagePath)) {
+      Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild"
+      throw
+    }
     Unzip $packagePath $packageDir
   }
 
@@ -573,7 +614,8 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
     $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
+
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' }
   } elseif ($msbuildEngine -eq "vs") {
     try {
       $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -582,7 +624,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
 
-    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
+    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS }
   } else {
     Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
     ExitWithExitCode 1
@@ -615,7 +657,6 @@ function GetNuGetPackageCachePath() {
       $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
     } else {
       $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
-      $env:RESTORENOCACHE = $true
     }
   }
 
@@ -635,24 +676,38 @@ function InitializeNativeTools() {
         InstallDirectory = "$ToolsDir"
       }
     }
+    if ($env:NativeToolsOnMachine) {
+      Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
+      $nativeArgs += @{ PathPromotion = $true }
+    }
     & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs
   }
 }
 
+function Read-ArcadeSdkVersion() {
+  return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+}
+
 function InitializeToolset() {
-  if (Test-Path variable:global:_ToolsetBuildProj) {
-    return $global:_ToolsetBuildProj
+  # For Unified Build/Source-build support, check whether the environment variable is
+  # set. If it is, then use this as the toolset build project.
+  if ($env:_InitializeToolset -ne $null) {
+    return $global:_InitializeToolset = $env:_InitializeToolset
+  }
+
+  if (Test-Path variable:global:_InitializeToolset) {
+    return $global:_InitializeToolset
   }
 
   $nugetCache = GetNuGetPackageCachePath
 
-  $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
+  $toolsetVersion = Read-ArcadeSdkVersion
   $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
 
   if (Test-Path $toolsetLocationFile) {
     $path = Get-Content $toolsetLocationFile -TotalCount 1
     if (Test-Path $path) {
-      return $global:_ToolsetBuildProj = $path
+      return $global:_InitializeToolset = $path
     }
   }
 
@@ -675,7 +730,7 @@ function InitializeToolset() {
     throw "Invalid toolset path: $path"
   }
 
-  return $global:_ToolsetBuildProj = $path
+  return $global:_InitializeToolset = $path
 }
 
 function ExitWithExitCode([int] $exitCode) {
@@ -723,26 +778,13 @@ function MSBuild() {
 
     $toolsetBuildProject = InitializeToolset
     $basePath = Split-Path -parent $toolsetBuildProject
-    $possiblePaths = @(
-      # new scripts need to work with old packages, so we need to look for the old names/versions
-      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
-      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
-    )
-    $selectedPath = $null
-    foreach ($path in $possiblePaths) {
-      if (Test-Path $path -PathType Leaf) {
-        $selectedPath = $path
-        break
-      }
-    }
+    $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
+
     if (-not $selectedPath) {
-      Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
+      Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     }
+
     $args += "/logger:$selectedPath"
   }
 
@@ -789,7 +831,8 @@ function MSBuild-Core() {
     }
   }
 
-  $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs"
+  # Be sure quote the path in case there are spaces in the dotnet installation location.
+  $env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs"
 
   $exitCode = Exec-Process $buildTool.Path $cmdArgs
 
@@ -803,7 +846,9 @@ function MSBuild-Core() {
       Write-Host "See log: $buildLog" -ForegroundColor DarkGray
     }
 
-    if ($ci) {
+    # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+    # Skip this when the build is a child of the VMR build.
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) {
       Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
       # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
       # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
@@ -845,7 +890,7 @@ function IsWindowsPlatform() {
 }
 
 function Get-Darc($version) {
-  $darcPath  = "$TempDir\darc\$(New-Guid)"
+  $darcPath  = "$TempDir\darc\$([guid]::NewGuid())"
   if ($version -ne $null) {
     & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
   } else {
@@ -898,11 +943,13 @@ if (!$disableConfigureToolsetImport) {
 function Enable-Nuget-EnhancedRetry() {
     if ($ci) {
       Write-Host "Setting NUGET enhanced retry environment variables"
-      $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
-      $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
-      $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
-      Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
-      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
-      Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
+      $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = 'true'
+      $env:NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT = 6
+      $env:NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
+      $env:NUGET_RETRY_HTTP_429 = 'true'
+      Write-PipelineSetVariable -Name 'NUGET_ENABLE_ENHANCED_HTTP_RETRY' -Value 'true'
+      Write-PipelineSetVariable -Name 'NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT' -Value '6'
+      Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
+      Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true'
     }
 }
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index e555c34269..c1841c9dfd 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -5,6 +5,9 @@
 # CI mode - set to true on CI server for PR validation build or official build.
 ci=${ci:-false}
 
+# Build mode
+source_build=${source_build:-false}
+
 # Set to true to use the pipelines logger which will enable Azure logging output.
 # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
 # This flag is meant as a temporary opt-opt for the feature while validate it across
@@ -54,11 +57,12 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
-if [[ "$ci" == true ]]; then
+# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
+if [[ "$ci" == true || "$source_build" == true ]]; then
   use_global_nuget_cache=${use_global_nuget_cache:-false}
 else
   use_global_nuget_cache=${use_global_nuget_cache:-true}
@@ -68,6 +72,9 @@ fi
 runtime_source_feed=${runtime_source_feed:-''}
 runtime_source_feed_key=${runtime_source_feed_key:-''}
 
+# True when the build is running within the VMR.
+from_vmr=${from_vmr:-false}
+
 # Resolve any symlinks in the given path.
 function ResolvePath {
   local path=$1
@@ -112,7 +119,7 @@ function InitializeDotNetCli {
   export DOTNET_MULTILEVEL_LOOKUP=0
 
   # Disable first run since we want to control all package sources
-  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+  export DOTNET_NOLOGO=1
 
   # Disable telemetry on CI
   if [[ $ci == true ]]; then
@@ -123,11 +130,6 @@ function InitializeDotNetCli {
   # so it doesn't output warnings to the console.
   export LTTNG_HOME="$HOME"
 
-  # Source Build uses DotNetCoreSdkDir variable
-  if [[ -n "${DotNetCoreSdkDir:-}" ]]; then
-    export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
-  fi
-
   # Find the first path on $PATH that contains the dotnet.exe
   if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
     local dotnet_path=`command -v dotnet`
@@ -146,7 +148,7 @@ function InitializeDotNetCli {
   if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
     dotnet_root="$DOTNET_INSTALL_DIR"
   else
-    dotnet_root="$repo_root/.dotnet"
+    dotnet_root="${repo_root}.dotnet"
 
     export DOTNET_INSTALL_DIR="$dotnet_root"
 
@@ -165,7 +167,7 @@ function InitializeDotNetCli {
   Write-PipelinePrependPath -path "$dotnet_root"
 
   Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
-  Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
+  Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
 
   # return value
   _InitializeDotNetCli="$dotnet_root"
@@ -178,12 +180,41 @@ function InstallDotNetSdk {
   if [[ $# -ge 3 ]]; then
     architecture=$3
   fi
-  InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
+  InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
 }
 
 function InstallDotNet {
   local root=$1
   local version=$2
+  local runtime=$4
+
+  local dotnetVersionLabel="'$runtime v$version'"
+  if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
+    runtimePath="$root"
+    runtimePath="$runtimePath/shared"
+    case "$runtime" in
+      dotnet)
+        runtimePath="$runtimePath/Microsoft.NETCore.App"
+        ;;
+      aspnetcore)
+        runtimePath="$runtimePath/Microsoft.AspNetCore.App"
+        ;;
+      windowsdesktop)
+        runtimePath="$runtimePath/Microsoft.WindowsDesktop.App"
+        ;;
+      *)
+        ;;
+    esac
+    runtimePath="$runtimePath/$version"
+
+    dotnetVersionLabel="runtime toolset '$runtime/$architecture v$version'"
+
+    if [ -d "$runtimePath" ]; then
+      echo "  Runtime toolset '$runtime/$architecture v$version' already installed."
+      local installSuccess=1
+      return
+    fi
+  fi
 
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
@@ -205,7 +236,7 @@ function InstallDotNet {
   local public_location=("${installParameters[@]}")
   variations+=(public_location)
 
-  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
+  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
   variations+=(dotnetbuilds)
 
   if [[ -n "${6:-}" ]]; then
@@ -228,17 +259,17 @@ function InstallDotNet {
   for variationName in "${variations[@]}"; do
     local name="$variationName[@]"
     local variation=("${!name}")
-    echo "Attempting to install dotnet from $variationName."
+    echo "  Attempting to install $dotnetVersionLabel from $variationName."
     bash "$install_script" "${variation[@]}" && installSuccess=1
     if [[ "$installSuccess" -eq 1 ]]; then
       break
     fi
 
-    echo "Failed to install dotnet from $variationName."
+    echo "  Failed to install $dotnetVersionLabel from $variationName."
   done
 
   if [[ "$installSuccess" -eq 0 ]]; then
-    Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
+    Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install $dotnetVersionLabel from any of the specified locations."
     ExitWithExitCode 1
   fi
 }
@@ -268,9 +299,30 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local timestamp_file="$root/.dotnet-install.timestamp"
+  local should_download=false
 
   if [[ ! -a "$install_script" ]]; then
+    should_download=true
+  elif [[ -f "$timestamp_file" ]]; then
+    # Check if the script is older than 30 days using timestamp file
+    local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
+    local current_time=$(date +%s)
+    local age_seconds=$((current_time - download_time))
+    
+    # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
+    if [[ $age_seconds -gt 2592000 ]]; then
+      echo "Existing install script is too old, re-downloading..."
+      should_download=true
+    fi
+  else
+    # No timestamp file exists, assume script is old and re-download
+    echo "No timestamp found for existing install script, re-downloading..."
+    should_download=true
+  fi
+
+  if [[ "$should_download" == true ]]; then
     mkdir -p "$root"
 
     echo "Downloading '$install_script_url'"
@@ -281,7 +333,7 @@ function GetDotNetInstallScript {
       curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
         if command -v openssl &> /dev/null; then
           echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
-          echo | openssl s_client -showcerts -servername dotnet.microsoft.com  -connect dotnet.microsoft.com:443
+          echo | openssl s_client -showcerts -servername dotnet.microsoft.com  -connect dotnet.microsoft.com:443 || true
         fi
         echo "Will now retry the same URL with verbose logging."
         with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
@@ -297,6 +349,9 @@ function GetDotNetInstallScript {
         ExitWithExitCode $exit_code
       }
     fi
+    
+    # Create timestamp file to track download time in seconds from epoch
+    date +%s > "$timestamp_file"
   fi
   # return value
   _GetDotNetInstallScript="$install_script"
@@ -312,17 +367,14 @@ function InitializeBuildTool {
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
-  _InitializeBuildToolFramework="netcoreapp3.1"
 }
 
-# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
 function GetNuGetPackageCachePath {
   if [[ -z ${NUGET_PACKAGES:-} ]]; then
     if [[ "$use_global_nuget_cache" == true ]]; then
-      export NUGET_PACKAGES="$HOME/.nuget/packages"
+      export NUGET_PACKAGES="$HOME/.nuget/packages/"
     else
-      export NUGET_PACKAGES="$repo_root/.packages"
-      export RESTORENOCACHE=true
+      export NUGET_PACKAGES="$repo_root/.packages/"
     fi
   fi
 
@@ -406,7 +458,7 @@ function StopProcesses {
 }
 
 function MSBuild {
-  local args=$@
+  local args=( "$@" )
   if [[ "$pipelines_log" == true ]]; then
     InitializeBuildTool
     InitializeToolset
@@ -416,39 +468,20 @@ function MSBuild {
       export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
       Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
       Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
-
-      export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
-      export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
-      export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
-      Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
-      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
-      Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
     fi
 
     local toolset_dir="${_InitializeToolset%/*}"
-    # new scripts need to work with old packages, so we need to look for the old names/versions
-    local selectedPath=
-    local possiblePaths=()
-    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
-    for path in "${possiblePaths[@]}"; do
-      if [[ -f $path ]]; then
-        selectedPath=$path
-        break
-      fi
-    done
+    local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
+
     if [[ -z "$selectedPath" ]]; then
-      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly."
+      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     fi
+
     args+=( "-logger:$selectedPath" )
   fi
 
-  MSBuild-Core ${args[@]}
+  MSBuild-Core "${args[@]}"
 }
 
 function MSBuild-Core {
@@ -479,7 +512,10 @@ function MSBuild-Core {
       # We should not Write-PipelineTaskError here because that message shows up in the build summary
       # The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
       echo "Build failed with exit code $exit_code. Check errors above."
-      if [[ "$ci" == "true" ]]; then
+
+      # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+      # Skip this when the build is a child of the VMR build.
+      if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then
         Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
         # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
         # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
@@ -493,6 +529,24 @@ function MSBuild-Core {
   RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
 }
 
+function GetDarc {
+    darc_path="$temp_dir/darc"
+    version="$1"
+
+    if [[ -n "$version" ]]; then
+      version="--darcversion $version"
+    fi
+
+    "$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
+    darc_tool="$darc_path/darc"
+}
+
+# Returns a full path to an Arcade SDK task project file.
+function GetSdkTaskProject {
+  taskName=$1
+  echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj"
+}
+
 ResolvePath "${BASH_SOURCE[0]}"
 _script_dir=`dirname "$_ResolvePath"`
 
@@ -511,7 +565,7 @@ global_json_file="${repo_root}global.json"
 # determine if global.json contains a "runtimes" entry
 global_json_has_runtimes=false
 if command -v jq &> /dev/null; then
-  if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then
+  if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then
     global_json_has_runtimes=true
   fi
 elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then
diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1
new file mode 100644
index 0000000000..97302f3205
--- /dev/null
+++ b/eng/common/vmr-sync.ps1
@@ -0,0 +1,138 @@
+<#
+.SYNOPSIS
+
+This script is used for synchronizing the current repository into a local VMR.
+It pulls the current repository's code into the specified VMR directory for local testing or
+Source-Build validation.
+
+.DESCRIPTION
+
+The tooling used for synchronization will clone the VMR repository into a temporary folder if
+it does not already exist. These clones can be reused in future synchronizations, so it is
+recommended to dedicate a folder for this to speed up re-runs.
+
+.EXAMPLE
+  Synchronize current repository into a local VMR:
+    ./vmr-sync.ps1 -vmrDir "$HOME/repos/dotnet" -tmpDir "$HOME/repos/tmp"
+
+.PARAMETER tmpDir
+Required. Path to the temporary folder where repositories will be cloned
+
+.PARAMETER vmrBranch
+Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
+
+.PARAMETER azdevPat
+Optional. Azure DevOps PAT to use for cloning private repositories.
+
+.PARAMETER vmrDir
+Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
+
+.PARAMETER debugOutput
+Optional. Enables debug logging in the darc vmr command.
+
+.PARAMETER ci
+Optional. Denotes that the script is running in a CI environment.
+#>
+param (
+  [Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")]
+  [string][Alias('t', 'tmp')]$tmpDir,
+  [string][Alias('b', 'branch')]$vmrBranch,
+  [string]$remote,
+  [string]$azdevPat,
+  [string][Alias('v', 'vmr')]$vmrDir,
+  [switch]$ci,
+  [switch]$debugOutput
+)
+
+function Fail {
+  Write-Host "> $($args[0])" -ForegroundColor 'Red'
+}
+
+function Highlight {
+  Write-Host "> $($args[0])" -ForegroundColor 'Cyan'
+}
+
+$verbosity = 'verbose'
+if ($debugOutput) {
+  $verbosity = 'debug'
+}
+# Validation
+
+if (-not $tmpDir) {
+  Fail "Missing -tmpDir argument. Please specify the path to the temporary folder where the repositories will be cloned"
+  exit 1
+}
+
+# Sanitize the input
+
+if (-not $vmrDir) {
+  $vmrDir = Join-Path $tmpDir 'dotnet'
+}
+
+if (-not (Test-Path -Path $tmpDir -PathType Container)) {
+  New-Item -ItemType Directory -Path $tmpDir | Out-Null
+}
+
+# Prepare the VMR
+
+if (-not (Test-Path -Path $vmrDir -PathType Container)) {
+  Highlight "Cloning 'dotnet/dotnet' into $vmrDir.."
+  git clone https://github.com/dotnet/dotnet $vmrDir
+
+  if ($vmrBranch) {
+    git -C $vmrDir switch -c $vmrBranch
+  }
+}
+else {
+  if ((git -C $vmrDir diff --quiet) -eq $false) {
+    Fail "There are changes in the working tree of $vmrDir. Please commit or stash your changes"
+    exit 1
+  }
+
+  if ($vmrBranch) {
+    Highlight "Preparing $vmrDir"
+    git -C $vmrDir checkout $vmrBranch
+    git -C $vmrDir pull
+  }
+}
+
+Set-StrictMode -Version Latest
+
+# Prepare darc
+
+Highlight 'Installing .NET, preparing the tooling..'
+. .\eng\common\tools.ps1
+$dotnetRoot = InitializeDotNetCli -install:$true
+$darc = Get-Darc
+$dotnet = "$dotnetRoot\dotnet.exe"
+
+Highlight "Starting the synchronization of VMR.."
+
+# Synchronize the VMR
+$darcArgs = (
+  "vmr", "forwardflow",
+  "--tmp", $tmpDir,
+  "--$verbosity",
+  $vmrDir
+)
+
+if ($ci) {
+  $darcArgs += ("--ci")
+}
+
+if ($azdevPat) {
+  $darcArgs += ("--azdev-pat", $azdevPat)
+}
+
+& "$darc" $darcArgs
+
+if ($LASTEXITCODE -eq 0) {
+  Highlight "Synchronization succeeded"
+}
+else {
+  Fail "Synchronization of repo to VMR failed!"
+  Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)."
+  Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)."
+  Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+  exit 1
+}
diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh
new file mode 100644
index 0000000000..44239e331c
--- /dev/null
+++ b/eng/common/vmr-sync.sh
@@ -0,0 +1,207 @@
+#!/bin/bash
+
+### This script is used for synchronizing the current repository into a local VMR.
+### It pulls the current repository's code into the specified VMR directory for local testing or
+### Source-Build validation.
+###
+### The tooling used for synchronization will clone the VMR repository into a temporary folder if
+### it does not already exist. These clones can be reused in future synchronizations, so it is
+### recommended to dedicate a folder for this to speed up re-runs.
+###
+### USAGE:
+###   Synchronize current repository into a local VMR:
+###     ./vmr-sync.sh --tmp "$HOME/repos/tmp" "$HOME/repos/dotnet"
+###
+### Options:
+###   -t, --tmp, --tmp-dir PATH
+###       Required. Path to the temporary folder where repositories will be cloned
+###
+###   -b, --branch, --vmr-branch BRANCH_NAME
+###       Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
+###
+###   --debug
+###       Optional. Turns on the most verbose logging for the VMR tooling
+###
+###   --remote name:URI
+###       Optional. Additional remote to use during the synchronization
+###       This can be used to synchronize to a commit from a fork of the repository
+###       Example: 'runtime:https://github.com/yourfork/runtime'
+###
+###   --azdev-pat
+###       Optional. Azure DevOps PAT to use for cloning private repositories.
+###
+###   -v, --vmr, --vmr-dir PATH
+###       Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $source until the file is no longer a symlink
+while [[ -h "$source" ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+function print_help () {
+    sed -n '/^### /,/^$/p' "$source" | cut -b 5-
+}
+
+COLOR_RED=$(tput setaf 1 2>/dev/null || true)
+COLOR_CYAN=$(tput setaf 6 2>/dev/null || true)
+COLOR_CLEAR=$(tput sgr0 2>/dev/null || true)
+COLOR_RESET=uniquesearchablestring
+FAILURE_PREFIX='> '
+
+function fail () {
+  echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2
+}
+
+function highlight () {
+  echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}"
+}
+
+tmp_dir=''
+vmr_dir=''
+vmr_branch=''
+additional_remotes=''
+verbosity=verbose
+azdev_pat=''
+ci=false
+
+while [[ $# -gt 0 ]]; do
+  opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+  case "$opt" in
+    -t|--tmp|--tmp-dir)
+      tmp_dir=$2
+      shift
+      ;;
+    -v|--vmr|--vmr-dir)
+      vmr_dir=$2
+      shift
+      ;;
+    -b|--branch|--vmr-branch)
+      vmr_branch=$2
+      shift
+      ;;
+    --remote)
+      additional_remotes="$additional_remotes $2"
+      shift
+      ;;
+    --azdev-pat)
+      azdev_pat=$2
+      shift
+      ;;
+    --ci)
+      ci=true
+      ;;
+    -d|--debug)
+      verbosity=debug
+      ;;
+    -h|--help)
+      print_help
+      exit 0
+      ;;
+    *)
+      fail "Invalid argument: $1"
+      print_help
+      exit 1
+      ;;
+  esac
+
+  shift
+done
+
+# Validation
+
+if [[ -z "$tmp_dir" ]]; then
+  fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned"
+  exit 1
+fi
+
+# Sanitize the input
+
+if [[ -z "$vmr_dir" ]]; then
+  vmr_dir="$tmp_dir/dotnet"
+fi
+
+if [[ ! -d "$tmp_dir" ]]; then
+  mkdir -p "$tmp_dir"
+fi
+
+if [[ "$verbosity" == "debug" ]]; then
+  set -x
+fi
+
+# Prepare the VMR
+
+if [[ ! -d "$vmr_dir" ]]; then
+  highlight "Cloning 'dotnet/dotnet' into $vmr_dir.."
+  git clone https://github.com/dotnet/dotnet "$vmr_dir"
+
+  if [[ -n "$vmr_branch" ]]; then
+    git -C "$vmr_dir" switch -c "$vmr_branch"
+  fi
+else
+  if ! git -C "$vmr_dir" diff --quiet; then
+    fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes"
+    exit 1
+  fi
+
+  if [[ -n "$vmr_branch" ]]; then
+    highlight "Preparing $vmr_dir"
+    git -C "$vmr_dir" checkout "$vmr_branch"
+    git -C "$vmr_dir" pull
+  fi
+fi
+
+set -e
+
+# Prepare darc
+
+highlight 'Installing .NET, preparing the tooling..'
+source "./eng/common/tools.sh"
+InitializeDotNetCli true
+GetDarc
+dotnetDir=$( cd ./.dotnet/; pwd -P )
+dotnet=$dotnetDir/dotnet
+
+highlight "Starting the synchronization of VMR.."
+set +e
+
+if [[ -n "$additional_remotes" ]]; then
+  additional_remotes="--additional-remotes $additional_remotes"
+fi
+
+if [[ -n "$azdev_pat" ]]; then
+  azdev_pat="--azdev-pat $azdev_pat"
+fi
+
+ci_arg=''
+if [[ "$ci" == "true" ]]; then
+  ci_arg="--ci"
+fi
+
+# Synchronize the VMR
+
+export DOTNET_ROOT="$dotnetDir"
+
+"$darc_tool" vmr forwardflow \
+  --tmp "$tmp_dir"             \
+  $azdev_pat                   \
+  --$verbosity                 \
+  $ci_arg                      \
+  $additional_remotes          \
+  "$vmr_dir"
+
+if [[ $? == 0 ]]; then
+  highlight "Synchronization succeeded"
+else
+  fail "Synchronization of repo to VMR failed!"
+  fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)."
+  fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)."
+  fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+  exit 1
+fi
diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1
deleted file mode 100644
index 95a43488f0..0000000000
--- a/eng/configure-toolset.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-. $PSScriptRoot\common\pipeline-logging-functions.ps1
-function Test-FilesUseTelemetryOutput {
-    $requireTelemetryExcludeFiles = @(
-        "enable-cross-org-publishing.ps1",
-        "performance-setup.ps1" )
-
-    $filesMissingTelemetry = Get-ChildItem -File -Recurse -Path "$PSScriptRoot\common" -Include "*.ps1" -Exclude $requireTelemetryExcludeFiles |
-        Where-Object { -Not( $_ | Select-String -Pattern "Write-PipelineTelemetryError" )}
-
-    If($filesMissingTelemetry) {
-        Write-PipelineTelemetryError -category 'Build' 'One or more eng/common scripts do not use telemetry categorization.'
-        Write-Host "See https://github.com/dotnet/arcade/blob/main/Documentation/Projects/DevOps/CI/Telemetry-Guidance.md"
-        Write-Host "The following ps1 files do not include telemetry categorization output:"
-        ForEach($file In $filesMissingTelemetry) {
-            Write-Host $file
-        }
-
-        return 1
-    }
-}
-
-$failOnConfigureToolsetError = $true
-$exitCode = Test-FilesUseTelemetryOutput
-exit $exitCode
\ No newline at end of file
diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh
deleted file mode 100644
index a5a321f05a..0000000000
--- a/eng/configure-toolset.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-function Test-FilesUseTelemetryOutput {
-    _files_use_telemetry_result=0
-    declare -a require_telmetry_exclude_files
-    require_telmetry_exclude_files=(
-        'eng/common/build.sh'
-        'eng/common/cibuild.sh'
-        'eng/common/cross/armel/tizen-build-rootfs.sh'
-        'eng/common/cross/armel/tizen-fetch.sh'
-        'eng/common/cross/arm64/tizen-fetch.sh'
-        'eng/common/cross/arm64/tizen-build-rootfs.sh'
-        'eng/common/cross/build-android-rootfs.sh'
-        'eng/common/cross/build-rootfs.sh'
-        'eng/common/darc-init.sh'
-        'eng/common/msbuild.sh'
-        'eng/common/performance/performance-setup.sh'
-        'eng/common/init-tools-native.sh'
-        'eng/common/internal-feed-operations.sh'
-        'eng/common/dotnet-install.sh'
-        'eng/common/native/install-cmake-test.sh'
-        'eng/common/native/common-library.sh'
-        'eng/common/native/install-cmake.sh'
-    )
-
-    local file_list=`grep --files-without-match --dereference-recursive --include=*.sh "Write-PipelineTelemetryError" $scriptroot`
-    for file in $file_list; do
-        for remove_file in ${require_telmetry_exclude_files[@]}; do
-            if [[ $file =~ .*"$remove_file" ]]; then
-            file_list=( "${file_list[@]/$file}" )
-            fi
-        done
-    done
-
-    if [[ -n "${file_list//[[:space:]]/}" ]]; then 
-        Write-PipelineTelemetryError -force -category 'Build' 'One or more eng/common scripts do not use telemetry categorization.'
-        echo "https://github.com/dotnet/arcade/blob/main/Documentation/Projects/DevOps/CI/Telemetry-Guidance.md"
-        echo "The following bash files do not include telemetry categorization output:"
-        for file in $file_list
-            do echo "'$file'"
-        done
-
-        _files_use_telemetry_result=1
-        return
-    fi
-}
-
-ResolvePath "${BASH_SOURCE[0]}"
-scriptroot=`dirname "$_ResolvePath"`
-
-Test-FilesUseTelemetryOutput
-
-if [[ $_files_use_telemetry_result != 0 ]]; then
-  exit $_files_use_telemetry_result
-fi
diff --git a/eng/install-additional-dotnet-sdks.ps1 b/eng/install-additional-dotnet-sdks.ps1
new file mode 100644
index 0000000000..9587d75d1e
--- /dev/null
+++ b/eng/install-additional-dotnet-sdks.ps1
@@ -0,0 +1,29 @@
+param ( 
+    [Parameter(Mandatory)]
+    [string] $DotnetInstallDir,
+    [Parameter(Mandatory)]
+    [string] $RepoRoot
+)
+
+Write-Host "Installing additional dotnet SDKs for integration tests."
+
+$eng = $PSScriptRoot
+. $eng/common/tools.ps1
+
+$globalJson = Get-Content $RepoRoot/global.json | ConvertFrom-Json
+$sdkVersions = @("x86")
+
+foreach ($architecture in $sdkVersions) { 
+    $version = $globalJson.sdk.version
+    $dotnetRoot = "$DotnetInstallDir/dotnet-sdk-$architecture"
+
+    InstallDotNetSdk -dotnetRoot $dotnetRoot -version $version -architecture $architecture -noPath
+
+    $runtimeVersions = @($globalJson.tools.runtimes."dotnet/$($architecture)")
+    foreach ($runtimeVersion in $runtimeVersions) { 
+        if ($runtimeVersion -like "8.*") { 
+            $stop= $true
+        }
+        InstallDotNet -runtime "dotnet" -dotnetRoot $dotnetRoot -version $runtimeVersion -architecture $architecture -noPath
+    }
+}
\ No newline at end of file
diff --git a/eng/restore-internal-tools.yml b/eng/restore-internal-tools.yml
new file mode 100644
index 0000000000..01cd835c5b
--- /dev/null
+++ b/eng/restore-internal-tools.yml
@@ -0,0 +1,13 @@
+steps:
+  - task: NuGetAuthenticate@1
+    inputs:
+      nuGetServiceConnections: 'devdiv/dotnet-core-internal-tooling'
+      forceReinstallCredentialProvider: true
+
+  - script: $(Build.SourcesDirectory)\eng\RestoreInternal.cmd
+            -ci
+            -projects $(Build.SourcesDirectory)/eng/common/internal/Tools.csproj
+            /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/RestoreInternal.binlog
+            /v:normal
+    displayName: Restore internal tools
+    condition: and(succeeded(), ne(variables['_skipRestoreInternalTools'], 'true'))
diff --git a/eng/source-build-patches/0001-Build-for-NET-6.patch b/eng/source-build-patches/0001-Build-for-NET-6.patch
deleted file mode 100644
index 16993215da..0000000000
--- a/eng/source-build-patches/0001-Build-for-NET-6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cc24a98b1886861269afa3dae243f5eee63c70eb Mon Sep 17 00:00:00 2001
-From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
-Date: Thu, 17 Jun 2021 02:35:04 +0200
-Subject: [PATCH] Build for NET 6
-
----
- src/package/nuspec/TestPlatform.Build.nuspec                | 6 +++---
- src/package/nuspec/TestPlatform.CLI.nuspec                  | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/package/nuspec/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec
-index 3808b296..e70511ae 100644
---- a/src/package/nuspec/TestPlatform.Build.nuspec
-+++ b/src/package/nuspec/TestPlatform.Build.nuspec
-@@ -20,16 +20,16 @@
-                 commit="$CommitId$" />
-                 
-     <dependencies>
--      <group targetFramework="netstandard2.0"></group>
-+      <group targetFramework="net6.0"></group>
-     </dependencies>
-   </metadata>
-   <files>
-     <file src="Icon.png" target="" />
-     <file src="licenses\LICENSE_NET.txt" target="" />
--    <file src="Microsoft.TestPlatform.Build\netstandard2.0\Microsoft.TestPlatform.targets" target="runtimes\any\native" />
-+    <file src="Microsoft.TestPlatform.Build\net6.0\Microsoft.TestPlatform.targets" target="runtimes\any\native" />
- 
-     <!-- Add localized resources -->
--    <file src="Microsoft.TestPlatform.Build\netstandard2.0\**\*.dll" target="lib\netstandard2.0" />
-+    <file src="Microsoft.TestPlatform.Build\net6.0\**\*.dll" target="lib\net6.0" />
- 
-   </files>
- </package>
-diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec
-index 0e72bf58..01b624c0 100644
---- a/src/package/nuspec/TestPlatform.CLI.nuspec
-+++ b/src/package/nuspec/TestPlatform.CLI.nuspec
-@@ -29,6 +29,6 @@
-     <!-- Add a third party notice file -->
-     <file src="ThirdPartyNotices.txt" target="" />
-     
--    <file src="netcoreapp2.1\**\*.*" exclude="**\*.pdb" target="contentFiles\any\netcoreapp2.1" />
-+    <file src="net6.0\**\*.*" exclude="**\*.pdb" target="contentFiles\any\net6.0" />
-   </files>
- </package>
-2.31.1.windows.1
-
diff --git a/eng/try-ci-build.ps1 b/eng/try-ci-build.ps1
new file mode 100644
index 0000000000..819146927c
--- /dev/null
+++ b/eng/try-ci-build.ps1
@@ -0,0 +1,70 @@
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+  [string][Alias('c')]$configuration = "Debug",
+  [string]$platform = $null,
+  [string] $projects,
+  [string][Alias('v')]$verbosity = "minimal",
+  [string] $msbuildEngine = $null,
+  [bool] $warnAsError = $true,
+  [bool] $nodeReuse = $true,
+  [switch][Alias('r')]$restore,
+  [switch] $deployDeps,
+  [switch][Alias('b')]$build,
+  [switch] $rebuild,
+  [switch] $deploy,
+  [switch][Alias('t')]$test,
+  [switch] $integrationTest,
+  [switch] $performanceTest,
+  [switch] $sign,
+  [switch] $pack,
+  [switch] $publish,
+  [switch] $clean,
+  [switch][Alias('bl')]$binaryLog,
+  [switch][Alias('nobl')]$excludeCIBinarylog,
+  [switch] $ci,
+  [switch] $prepareMachine,
+  [string] $runtimeSourceFeed = '',
+  [string] $runtimeSourceFeedKey = '',
+  [switch] $excludePrereleaseVS,
+  [switch] $nativeToolsOnMachine,
+  [switch] $help,
+  [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
+)
+
+$count = 0
+$err = $null
+$path = "$PSScriptRoot/common/build.ps1"
+# CIBuild.cmd script specifies restore -build -test -sign -pack -publish -ci $args
+$PSBoundParameters["restore"] = $true
+$PSBoundParameters["build"] = $true
+$PSBoundParameters["test"] = $true
+$PSBoundParameters["sign"] = $true
+$PSBoundParameters["pack"] = $true
+$PSBoundParameters["publish"] = $true
+$PSBoundParameters["ci"] = $true
+
+$cmd = "$path $(foreach($pair in $PSBoundParameters.GetEnumerator()) { "-$($pair.Key)=$($pair.Value)"})"
+while (3 -gt $count) { 
+    $err = $null
+    $count++
+    try {
+        & $path @PSBoundParameters
+        if (0 -ne $LASTEXITCODE) {
+            Write-Host ">>> Try ${count}: Command '$cmd' failed, with exit code $LASTEXITCODE."
+            continue
+        }
+    }
+    catch {
+        $err = $_
+        Write-Host ">>> Try ${count}: Command '$cmd' failed, with $_."
+        continue
+    }
+
+    Write-Host ">>> Try ${count}: Command '$cmd' succeeded."
+    break
+}
+
+if ($null -ne $err) { 
+    throw $err
+}
+
diff --git a/eng/update-packagesource.cmd b/eng/update-packagesource.cmd
deleted file mode 100644
index c12187983f..0000000000
--- a/eng/update-packagesource.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0update-packagesource.ps1""" %*"
diff --git a/eng/update-packagesource.ps1 b/eng/update-packagesource.ps1
deleted file mode 100644
index c76c36ee2d..0000000000
--- a/eng/update-packagesource.ps1
+++ /dev/null
@@ -1,82 +0,0 @@
-Param(
-  [string] $barToken,
-  [string] $gitHubPat,
-  [string] $packagesSource
-)
-
-$ErrorActionPreference = "Stop"
-. $PSScriptRoot\common\tools.ps1
-
-# Batch and executable files exit and define $LASTEXITCODE.  Powershell commands exit and define $?
-function CheckExitCode ([string]$stage, [bool]$commandExitCode = $True)
-{
-  $exitCode = 0
-  if($commandExitCode -eq -$False) {
-      $exitCode = 1
-  }
-  else {
-    if ( Test-Path "LASTEXITCODE" -ErrorAction SilentlyContinue)
-    {
-      $exitCode = $LASTEXITCODE
-    }
-  }
-
-  if ($exitCode -ne 0) {
-    Write-PipelineTelemetryError -Category "UpdatePackageSource" -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now with exit code $exitCode..."
-    ExitWithExitCode $exitCode
-  }
-}
-
-function StopDotnetIfRunning
-{
-    $dotnet = Get-Process "dotnet" -ErrorAction SilentlyContinue
-    if ($dotnet) {
-        stop-process $dotnet
-    }
-}
-
-function AddSourceToNugetConfig([string]$nugetConfigPath, [string]$source) 
-{
-    Write-Host "Adding '$source' to '$nugetConfigPath'..."
-    $nugetConfig = New-Object XML
-    $nugetConfig.PreserveWhitespace = $true
-    $nugetConfig.Load($nugetConfigPath)
-    $packageSources = $nugetConfig.SelectSingleNode("//packageSources")
-    $keyAttribute = $nugetConfig.CreateAttribute("key")
-    $keyAttribute.Value = "arcade-local"
-    $valueAttribute = $nugetConfig.CreateAttribute("value")
-    $valueAttribute.Value = $source
-    $newSource = $nugetConfig.CreateElement("add")
-    $newSource.Attributes.Append($keyAttribute) | Out-Null
-    $newSource.Attributes.Append($valueAttribute) | Out-Null
-    $packageSources.AppendChild($newSource) | Out-Null
-    $nugetConfig.Save($nugetConfigPath)
-}
-
-try {
-  Push-Location $PSScriptRoot
-  $nugetConfigPath = Join-Path $RepoRoot "NuGet.config"
-
-  Write-Host "Adding local source to NuGet.config"
-  AddSourceToNugetConfig $nugetConfigPath $packagesSource
-  CheckExitCode "Adding source to NuGet.config" $?
-
-  Write-Host "Updating dependencies using Darc..."
-  . .\common\darc-init.ps1
-  CheckExitCode "Running darc-init"
-  $DarcExe = "$env:USERPROFILE\.dotnet\tools"
-  $DarcExe = Resolve-Path $DarcExe
-  & $DarcExe\darc.exe update-dependencies --packages-folder $packagesSource --password $barToken --github-pat $gitHubPat --channel ".NET Tools - Latest"
-  CheckExitCode "Updating dependencies"
-}
-catch {
-  Write-Host $_.ScriptStackTrace
-  Write-PipelineTelemetryError -Category "UpdatePackageSource" -Message $_
-  ExitWithExitCode 1
-}
-finally {
-  Write-Host "Cleaning up workspace..."
-  StopDotnetIfRunning
-  Pop-Location
-}
-ExitWithExitCode 0
\ No newline at end of file
diff --git a/eng/validate-sdk.yml b/eng/validate-sdk.yml
deleted file mode 100644
index cdf69b581b..0000000000
--- a/eng/validate-sdk.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-parameters:
-  buildArgs: ''
-  validateBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core-test/index.json
-  buildConfig: Release
-
-jobs:
-- template: /eng/common/templates/job/job.yml
-  parameters:
-    name: ValidateArcadeSDK
-    displayName: Validate Arcade SDK
-    enableMicrobuild: true
-    artifacts:
-      download:
-        path: build_stage_artifacts
-      publish:
-        artifacts:
-          name: Artifacts_ValidateSdk_Windows_NT_Release
-        logs:
-          name: Logs_ValidateSdk_Windows_NT_Release
-    timeoutInMinutes: 90
-    pool:
-      name: NetCoreInternal-Pool
-      queue: BuildPool.Windows.10.Amd64.VS2017
-    variables:
-    - group: DotNet-Blob-Feed
-    - group: Publish-Build-Assets
-    - _BuildConfig: ${{ parameters.buildConfig }}
-    - _BuildArgs: ${{ parameters.buildArgs }}
-    - _ValidateBlobFeedUrl: ${{ parameters.validateBlobFeedUrl }}
-    preSteps:
-    - checkout: self
-      clean: true
-    steps:
-    - script: eng\update-packagesource.cmd 
-        -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT)
-        -barToken $(MaestroAccessToken)
-        -packagesSource $(Build.SourcesDirectory)/build_stage_artifacts
-      displayName: Update package source
-    - script: eng\common\cibuild.cmd
-        $(_BuildArgs)
-        /p:DotNetPublishBlobFeedUrl=$(_ValidateBlobFeedUrl)
-      displayName: Build / Validate
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
new file mode 100644
index 0000000000..7ab1963a02
--- /dev/null
+++ b/eng/verify-nupkgs.ps1
@@ -0,0 +1,306 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory)]
+    [ValidateSet("Debug", "Release")]
+    [string] $configuration,
+
+    [Parameter(Mandatory)]
+    [string] $versionPrefix,
+
+    [Parameter(Mandatory)]
+    [string] $currentBranch
+)
+
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+function Verify-Nuget-Packages {
+    Write-Host "Starting Verify-Nuget-Packages."
+    $expectedNumOfFiles = @{
+        "Microsoft.CodeCoverage"                      = 75
+        "Microsoft.NET.Test.Sdk"                      = 25
+        "Microsoft.TestPlatform"                      = 538
+        "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI" = 380
+        "Microsoft.TestPlatform.Build"                = 20
+        "Microsoft.TestPlatform.CLI"                  = 481
+        "Microsoft.TestPlatform.Extensions.TrxLogger" = 34
+        "Microsoft.TestPlatform.ObjectModel"          = 92
+        "Microsoft.TestPlatform.AdapterUtilities"     = 61
+        "Microsoft.TestPlatform.Portable"             = 608
+        "Microsoft.TestPlatform.TestHost"             = 63
+        "Microsoft.TestPlatform.TranslationLayer"     = 122
+        "Microsoft.TestPlatform.Internal.Uwp"         = 38
+    }
+
+    $packageDirectory = Resolve-Path "$PSScriptRoot/../artifacts/packages/$configuration"
+    $tmpDirectory = Resolve-Path "$PSScriptRoot/../artifacts/tmp/$configuration"
+
+    $pattern = "*.$versionPrefix*.nupkg"
+    $nugetPackages = @(Get-ChildItem $packageDirectory -Filter $pattern -Recurse -File | Where-Object { $_.Name -notLike "*.symbols.nupkg"})
+
+    if (0 -eq $nugetPackages.Length) {
+        throw "No nuget packages matching $pattern were found in '$packageDirectory'."
+    }
+
+    $suffixes = @($nugetPackages -replace ".*?$([regex]::Escape($versionPrefix))(.*)\.nupkg", '$1' | Sort-Object -Unique)
+    if (1 -lt $suffixes.Length) {
+        Write-Host "There are two different suffixes matching the same version prefix: '$($suffixes -join "', '")'".
+
+        $latestNuget = $nugetPackages |
+            Where-Object { $_.Name -like "Microsoft.TestPlatform.ObjectModel.*" } |
+            Sort-Object -Property LastWriteTime -Descending |
+            Select-Object -First 1
+
+        $suffix = $suffixes | Where { $latestNuget.Name.Contains("$versionPrefix$_.nupkg") }
+        $version = "$versionPrefix$suffix"
+        Write-Host "The most recently written Microsoft.TestPlatform.ObjectModel.* nuget, is $($latestNuget.Name), which has '$suffix' suffix. Selecting only packages with that suffix."
+
+        $nugetPackages = $nugetPackages | Where-Object { $_.Name -like "*$version.nupkg" }
+    }
+    else {
+        $suffix = $suffixes[0]
+        $version = "$versionPrefix$suffix"
+    }
+
+
+    Write-Host "Found $(@($nugetPackages).Count) nuget packages:`n    $($nugetPackages.FullName -join "`n    ")"
+    
+    # In source build we don't build this.
+    $vsix = Get-Item "$PSScriptRoot/../artifacts/VSSetup/$configuration/Insertion/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsix" -ErrorAction Ignore
+    if ($vsix) {
+        $nugetPackages += $vsix
+    }
+
+    Write-Host "Unzipping NuGet packages to '$tmpDirectory'."
+    $unzipNugetPackageDirs = @()
+    foreach ($nugetPackage in $nugetPackages) {
+        $unzipNugetPackageDir = Join-Path $tmpDirectory $nugetPackage.BaseName
+        $unzipNugetPackageDirs += $unzipNugetPackageDir
+
+        if (Test-Path -Path $unzipNugetPackageDir) {
+            Remove-Item -Force -Recurse $unzipNugetPackageDir
+        }
+
+        Unzip $nugetPackage.FullName $unzipNugetPackageDir
+    }
+
+    Write-Host "Verify NuGet packages files."
+    $errors = @()
+    foreach ($unzipNugetPackageDir in $unzipNugetPackageDirs) {
+        try {
+            $packageBaseName = (Get-Item $unzipNugetPackageDir).BaseName
+            $packageKey = $packageBaseName.Replace([string]".$version", [string]"")
+            Write-Host "Verifying package '$packageBaseName'."
+
+            $actualNumOfFiles = (Get-ChildItem -Recurse -File -Path $unzipNugetPackageDir | Where-Object { $_.Name -ne '.signature.p7s' }).Count
+            if (-not $expectedNumOfFiles.ContainsKey($packageKey)) {
+                $errors += "Package '$packageKey' is not present in file expectedNumOfFiles table. Is that package known?"
+                continue
+            }
+            if ($expectedNumOfFiles[$packageKey] -ne $actualNumOfFiles) {
+                $errors += "Number of files are not equal for '$packageBaseName', expected: $($expectedNumOfFiles[$packageKey]) actual: $actualNumOfFiles"
+            }
+
+            if ($packageKey -eq "Microsoft.TestPlatform") {
+                Verify-Version -nugetDir $unzipNugetPackageDir -errors $errors
+            }
+        }
+        finally {
+            # if ($null -ne $unzipNugetPackageDir -and (Test-Path $unzipNugetPackageDir)) {
+            #     Remove-Item -Force -Recurse $unzipNugetPackageDir | Out-Null
+            # }
+        }
+    }
+
+    if ($errors) {
+        Write-Error "There are $($errors.Count) errors:`n$($errors -join "`n")"
+    }
+
+    Write-Host "Completed Verify-Nuget-Packages."
+    $unzipNugetPackageDirs
+}
+
+function Unzip {
+    param([string]$zipfile, [string]$outpath)
+
+    Write-Verbose "Unzipping '$zipfile' to '$outpath'."
+
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
+}
+
+function Match-VersionAgainstBranch {
+    param ([string]$vsTestVersion, [string]$branchName,  [string[]]$errors)
+
+    # Output useful info.
+    Write-Host "VSTest Product Version: `"$vsTestVersion`""
+    Write-Host "Current Branch: `"$branchName`""
+
+    $versionIsRTM = $vsTestVersion -match "^\d+\.\d+\.\d+$"
+    $versionIsRelease = $vsTestVersion -match "^\d+\.\d+\.\d+\-release\-\d{8}\-\d{2}$"
+    $versionIsPreview = $vsTestVersion -match "^\d+\.\d+\.\d+\-preview\-\d{8}\-\d{2}$"
+
+    $isReleaseBranch = $branchName -like "rel/*"
+    $isPreviewBranch = $branchName -like "main"
+
+    if (!$isReleaseBranch -and !$isPreviewBranch) {
+        Write-Host "Skipping check since branch is neither `"release`" nor `"preview`""
+        return
+    }
+
+    Write-Host "Matching branch against product version ... "
+    if ($isReleaseBranch -and !$versionIsRTM -and !$versionIsRelease) {
+        $errors += "Release version `"$vsTestVersion`" should either be RTM, or contain a `"release`" suffix."
+    }
+    if ($isPreviewBranch -and !$versionIsPreview) {
+        $errors += "Preview version `"$vsTestVersion`" should contain a `"preview`" suffix."
+    }
+}
+
+function Verify-Version {
+    param ([string]$nugetDir, [string[]] $errors)
+
+    $vsTestExe = "$nugetDir/tools/net462/Common7/IDE/Extensions/TestPlatform/vstest.console.exe"
+    $vsTestProductVersion = (Get-Item $vsTestExe).VersionInfo.ProductVersion
+
+    Match-VersionAgainstBranch -vsTestVersion $vsTestProductVersion -branchName $currentBranch -errors $errors
+}
+
+function Verify-NugetPackageExe {
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet("Debug", "Release")]
+        [string] $configuration,
+        $UnzipNugetPackages
+    )
+
+
+    $exclusions = @{
+        "CodeCoverage\CodeCoverage.exe"                = "x86"
+        "Dynamic Code Coverage Tools\CodeCoverage.exe" = "x86"
+        "amd64\CodeCoverage.exe"                       = "x64"
+
+        "IntelliTrace.exe"                             = "x86"
+        "ProcessSnapshotCleanup.exe"                   = "x86-64"
+        "TDEnvCleanup.exe"                             = "x86"
+
+        "TestPlatform\SettingsMigrator.exe"            = "x86"
+
+        "dump\DumpMinitool.exe"                        = "x86-64"
+    }
+
+    $errs = @()
+    $exes = $UnzipNugetPackages | Get-ChildItem -Filter *.exe -Recurse -Force
+    if (0 -eq @($exes).Length) {
+        throw "No exe files were found."
+    }
+
+    # use wow programfiles because they always point to x64 programfiles where VS is installed
+    $dumpBin =  Get-ChildItem -Recurse -Force -Filter dumpbin.exe -path "$env:ProgramW6432\Microsoft Visual Studio\2022\Enterprise" | Select-Object -First 1
+    if (-not $dumpBin) {
+        throw "Did not find dumpbin.exe in '$env:ProgramW6432\Microsoft Visual Studio\2022\Enterprise'."
+    }
+
+    $corFlags = Get-ChildItem -Recurse -Force -Filter CorFlags.exe -path "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows" | Select-Object -First 1
+    if (-not $corFlags) {
+        throw "Did not find CorFlags.exe in '${env:ProgramFiles(x86)}\Microsoft SDKs\Windows'."
+    }
+
+    $exes | ForEach-Object {
+        $m = & $dumpBin /headers $_.FullName | Select-String "machine \((.*)\)"
+        if (-not $m.Matches.Success) {
+            $err = "Did not find the platform of the exe $fullName)."
+        }
+
+        $platform = $m.Matches.Groups[1].Value
+        $fullName = $_.FullName
+        $name = $_.Name
+
+        if ("x86" -eq $platform) {
+            $corFlagsOutput = & $corFlags $fullName
+            # this is an native x86 exe or a .net x86 that requires of prefers 32bit
+            $platform = if ($corFlagsOutput -like "*does not have a valid managed header*" -or $corFlagsOutput -like "*32BITREQ  : 1*" -or $corFlagsOutput -like "*32BITPREF : 1*") {
+                # this is an native x86 exe or a .net x86 that requires of prefers 32bit
+                "x86" } else {
+                # this is a x86 executable that is built as AnyCpu and does not prefer 32-bit so it will run as x64 on 64-bit system.
+                "x86-64" }
+        }
+
+        if (($pair = $exclusions.GetEnumerator() | Where-Object { $fullName -like "*$($_.Name)" })) {
+            if (1 -lt $($pair).Count) {
+                $err = "Too many paths matched the query, only one match is allowed. Matches: $($pair.Name)"
+                $errs += $err
+                Write-Host -ForegroundColor Red Error: $err
+            }
+
+            if ($platform -ne $pair.Value) {
+                $err = "$fullName must have architecture $($pair.Value), but it was $platform."
+                $errs += $err
+                Write-Host -ForegroundColor Red Error: $err
+            }
+        }
+        elseif ("x86" -eq $platform) {
+            if ($name -notlike "*x86*") {
+                $err = "$fullName has architecture $platform, and must contain x86 in the name of the executable."
+                $errs += $err
+                Write-Host -ForegroundColor Red Error: $err
+            }
+        }
+        elseif ($platform -in  "x64", "x86-64") {
+            if ($name -like "*x86*" -or $name -like "*arm64*") {
+                $err = "$fullName has architecture $platform, and must NOT contain x86 or arm64 in the name of the executable."
+                $errs += $err
+                Write-Host -ForegroundColor Red Error: $err
+            }
+        }
+        elseif ("arm64" -eq $platform) {
+            if ($name -notlike "*arm64*") {
+                $err = "$fullName has architecture $platform, and must contain arm64 in the name of the executable."
+                $errs += $err
+                Write-Host -ForegroundColor Red Error: $err
+            }
+        }
+        else {
+            $err = "$fullName has unknown architecture $platform."
+            $errs += $err
+            Write-Host -ForegroundColor Red $err
+        }
+
+        "Success: $name is $platform - $fullName"
+    }
+
+    if ($errs) {
+        throw "Fail!:`n$($errs -join "`n")"
+    }
+}
+
+function Verify-NugetPackageVersion {
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet("Debug", "Release")]
+        [string] $configuration,
+        $UnzipNugetPackages
+    )
+
+    # look for vstest.console.dll because unified build for .NET does not produce vstest.console.exe
+    $exes = $UnzipNugetPackages | Get-ChildItem -Filter vstest.console.dll -Recurse -Force
+    if (0 -eq @($exes).Length) {
+        throw "No vstest.console.dll files were found."
+    }
+
+    $exes | ForEach-Object {
+        if ($_.VersionInfo.ProductVersion.Contains("+")) {
+            throw "$_ contains '+' in the ProductVersion $($_.VersionInfo.ProductVersion), this breaks DTAAgent in AzDO."
+        }
+        else {
+            "$_ version $($_.VersionInfo.ProductVersion) is ok."
+        }
+    }
+
+}
+
+
+$unzipNugetPackages = Verify-Nuget-Packages
+Start-sleep -Seconds 10
+# skipped, it is hard to find the right dumpbin.exe and corflags tools on server
+# Verify-NugetPackageExe -configuration $configuration -UnzipNugetPackages $unzipNugetPackages
+Verify-NugetPackageVersion -configuration $configuration -UnzipNugetPackages $unzipNugetPackages
diff --git a/es-metadata.yml b/es-metadata.yml
new file mode 100644
index 0000000000..11af1e321e
--- /dev/null
+++ b/es-metadata.yml
@@ -0,0 +1,8 @@
+schemaVersion: 0.0.1
+isProduction: true
+accountableOwners:
+  service: 88877424-b87d-45a2-8ab8-48321d99a5d2
+routing:
+  defaultAreaPath:
+    org: devdiv
+    path: DevDiv\Testing Platforms
diff --git a/global.json b/global.json
index bcc787324c..5ebef2be03 100644
--- a/global.json
+++ b/global.json
@@ -1,15 +1,42 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "10.0.100-preview.7.25372.107",
+    "paths": [
+      ".dotnet",
+      "$host$"
+    ],
+    "errorMessage": "The .NET SDK could not be found, please run ./build.cmd on Windows or ./build.sh on Linux and macOS.",
     "rollForward": "minor",
     "allowPrerelease": false,
     "architecture": "x64"
   },
   "tools": {
-    "dotnet": "6.0.100"
+    "runtimes": {
+      "dotnet/x64": [
+        "2.1.30",
+        "3.1.32",
+        "5.0.17",
+        "6.0.32",
+        "7.0.20",
+        "8.0.7",
+        "9.0.5"
+      ],
+      "dotnet/x86": [
+        "2.1.30",
+        "3.1.32",
+        "5.0.17",
+        "6.0.32",
+        "7.0.20",
+        "8.0.7",
+        "9.0.5"
+      ]
+    },
+    "vs": {
+      "version": "17.8.0"
+    },
+    "dotnet": "10.0.100-preview.7.25372.107"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25408.3"
   }
 }
diff --git a/playground/AdapterUtilitiesPlayground/AdapterUtilitiesPlayground.csproj b/playground/AdapterUtilitiesPlayground/AdapterUtilitiesPlayground.csproj
new file mode 100644
index 0000000000..c349ddd70e
--- /dev/null
+++ b/playground/AdapterUtilitiesPlayground/AdapterUtilitiesPlayground.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="TestClasses.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/playground/AdapterUtilitiesPlayground/FindMethodExtensions.cs b/playground/AdapterUtilitiesPlayground/FindMethodExtensions.cs
new file mode 100644
index 0000000000..ca61906545
--- /dev/null
+++ b/playground/AdapterUtilitiesPlayground/FindMethodExtensions.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
+
+[DebuggerStepThrough]
+internal static class FindMethodExtensions
+{
+    private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+
+    internal static MethodInfo? FindMethod(this Type type, string signature)
+        => type.FindMembers(MemberTypes.Method, PrivateBindingFlags,
+            (mbr, sig) => mbr.ToString() == (string?)sig, signature).FirstOrDefault() as MethodInfo;
+
+    internal static IMethodSymbol FindMethod(
+        this INamedTypeSymbol type,
+        string methodName,
+        int methodGenericArity = -1,
+        params ITypeSymbol[] methodParameterTypes)
+    {
+        var candidates = GetCandidateMethods(type, methodName);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
+
+        if (methodGenericArity != -1)
+        {
+            candidates = candidates.Where(m => m.Arity == methodGenericArity);
+            if (candidates.Any() && !candidates.Skip(1).Any())
+            {
+                return candidates.Single();
+            }
+        }
+
+        if (methodParameterTypes != null && methodParameterTypes.Length >= 0)
+        {
+            candidates = candidates.Where(m => m.Parameters.Length == methodParameterTypes.Length);
+            if (candidates.Any() && !candidates.Skip(1).Any())
+            {
+                return candidates.Single();
+            }
+
+            candidates = candidates.Where(m => m.Parameters.Select(p => p.Type).SequenceEqual(methodParameterTypes));
+        }
+
+        Debug.Assert(candidates.Any() && !candidates.Skip(1).Any());
+        return candidates.Single();
+    }
+
+    internal static IMethodSymbol FindMethod(
+        this INamedTypeSymbol type,
+        string methodName,
+        int methodGenericArity,
+        int methodParameterCount,
+        Func<IMethodSymbol, bool> selector)
+    {
+        var candidates = GetCandidateMethods(type, methodName);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
+
+        candidates = candidates.Where(m => m.Arity == methodGenericArity);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
+
+        candidates = candidates.Where(m => m.Parameters.Length == methodParameterCount);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
+
+        candidates = candidates.Where(selector);
+
+        Debug.Assert(candidates.Any() && !candidates.Skip(1).Any());
+        return candidates.Single();
+    }
+
+    private static IEnumerable<IMethodSymbol> GetCandidateMethods(INamedTypeSymbol type, string methodName)
+    {
+        var candidates = type.GetMembers(methodName).OfType<IMethodSymbol>();
+
+        if (type.BaseType != null && type.BaseType.SpecialType != SpecialType.System_Object)
+        {
+            candidates = candidates.Union(GetCandidateMethods(type.BaseType, methodName));
+        }
+
+        return candidates;
+    }
+}
diff --git a/playground/AdapterUtilitiesPlayground/Program.cs b/playground/AdapterUtilitiesPlayground/Program.cs
new file mode 100644
index 0000000000..325e62a4d0
--- /dev/null
+++ b/playground/AdapterUtilitiesPlayground/Program.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
+using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
+
+namespace AdapterUtilitiesPlayground;
+
+internal class Program
+{
+    private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+    private static readonly Compilation _compilation = CSharpCompilation.Create(
+            "Test.dll",
+            new[] { CSharpSyntaxTree.ParseText(File.ReadAllText("TestClasses.cs")) },
+            new[] { MetadataReference.CreateFromFile(typeof(object).Assembly.Location) });
+
+    static void Main(string[] args)
+    {
+        var derivedClass = typeof(TestClasses.DerivedClass);
+        var baseClass = typeof(TestClasses.BaseClass);
+
+        var derivedMethods = derivedClass.GetMethods(PrivateBindingFlags).ToArray();
+        var baseMethods = baseClass.GetMethods(PrivateBindingFlags).ToArray();
+        var derivedMethod0 = derivedMethods.Single(i => i.Name == "Method0" && i.DeclaringType == derivedClass);
+        var derivedbaseMethod0 = derivedMethods.Single(i => i.Name == "Method0" && i.DeclaringType == baseClass);
+        var baseMethod0 = baseMethods.Single(i => i.Name == "Method0" && i.DeclaringType == baseClass);
+
+        // {
+        //     ManagedNameHelper.GetManagedName(derivedMethod0, out var managedType, out var managedMethod, out var hierarchies);
+        //     var methodBase = ManagedNameHelper.GetMethod(derivedClass.Assembly, managedType, managedMethod);
+        // }
+        // 
+        // {
+        //     ManagedNameHelper.GetManagedName(derivedbaseMethod0, out var managedType, out var managedMethod, out var hierarchies);
+        //     var methodBase = ManagedNameHelper.GetMethod(derivedClass.Assembly, managedType, managedMethod);
+        // }
+
+        //{
+        //    ManagedNameHelper.GetManagedName(baseMethod0, out var managedType, out var managedMethod, out var hierarchies);
+        //    var methodBase = ManagedNameHelper.GetMethod(derivedClass.Assembly, managedType, managedMethod);
+        //}
+
+        {
+            var method = typeof(TestClasses.IImplementation<string>).GetMethods(PrivateBindingFlags).SingleOrDefault(i => i.Name == "ImplMethod2")!;
+            method = method.MakeGenericMethod(typeof(int));
+
+            ManagedNameHelper.GetManagedName(method, out var managedType, out var managedMethod, out var hierarchies);
+            var methodBase = ManagedNameHelper.GetMethod(derivedClass.Assembly, managedType, managedMethod);
+        }
+    }
+}
diff --git a/playground/AdapterUtilitiesPlayground/TestClasses.cs b/playground/AdapterUtilitiesPlayground/TestClasses.cs
new file mode 100644
index 0000000000..0e320efe49
--- /dev/null
+++ b/playground/AdapterUtilitiesPlayground/TestClasses.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace TestClasses;
+
+#pragma warning disable IDE0060 // Remove unused parameter
+#pragma warning disable CA1822 // Mark members as static
+
+internal class DerivedClass : BaseClass
+{
+    public new void Method0(int i) { }
+}
+
+internal class BaseClass
+{
+    public void Method0(int i) { }
+    public void Method1(int i) { }
+}
+
+internal class Outer
+{
+    public void Method0() { }
+    public void Method1(int i) { }
+    public void Method2(List<string> ls) { }
+    public void Method3(string p, int l) { }
+    internal class Inner
+    {
+        public void Method0() { }
+        public void Method1(int i) { }
+        public void Method2<U>(int i) { }
+        public void Method3<U, T>(int i) { }
+    }
+}
+
+internal class OuterPrime : Outer { }
+
+internal class Outer<T>
+{
+    public void Method0() { }
+    public void Method1(T t) { }
+    public void Method2<U>(U[] u) { }
+    public void Method3<U>(T t, U u) { }
+
+    internal class Inner<V>
+    {
+        public void Method0() { }
+        public void Method1(T t) { }
+        public void Method2(V v) { }
+        public void Method3<U>(T t, U u, V v) { }
+        public void Method4<U, X>(X x, U u) { }
+        public void Method5<U, X>(List<X> x, U u) { }
+
+        internal class MoreInner<I>
+        {
+            public void Method0<U>(T t, V v, I i, U u) { }
+        }
+    }
+}
+
+internal class OuterPrime<Z> : Outer<Z> { }
+
+internal class OuterPrime<Y, Z> : Outer<Z> { }
+
+internal class OuterString : Outer<string> { }
+
+internal interface IImplementation
+{
+    void ImplMethod0();
+    void ImplMethod1(int i);
+}
+
+internal class Impl : IImplementation
+{
+    void IImplementation.ImplMethod0() { }
+    void IImplementation.ImplMethod1(int i) { }
+}
+
+internal interface IImplementation<T>
+{
+    void ImplMethod0();
+    void ImplMethod1(T t);
+    void ImplMethod2<U>(T t, U u, string s);
+}
+
+internal class Impl<T> : IImplementation<T>
+{
+    void IImplementation<T>.ImplMethod0() { }
+    void IImplementation<T>.ImplMethod1(T t) { }
+    void IImplementation<T>.ImplMethod2<U>(T t, U u, string s) { }
+}
+
+internal class Overloads
+{
+    public void Overload0() { }
+    public void Overload0(int i) { }
+    public void Overload0(int i, Overloads c) { }
+    public unsafe void Overload0(int* p) { }
+    public void Overload0(dynamic d) { }
+    public void Overload0<U>(U u) { }
+    public void Overload0<U>() { }
+    public void Overload0<U, T>() { }
+    public void Overload0<U>(U[] u) { }
+    public void Overload0<U>(U[][] u) { }
+    public void Overload0<U>(U[,] u) { }
+    public void Overload0<U>(U[,,] u) { }
+    public void Overload0<U>(List<int> l) { }
+    public void Overload0<U>(List<U> l) { }
+    public void Overload0<U, V>(Tuple<U, V> t0, Tuple<V, U> t1) { }
+    public void Overload0(Tuple<Tuple<string[,], int>> t0) { }
+    public void Overload0(Tuple<Tuple<string>, Tuple<int>> t) { }
+    public void Overload0<U>(Tuple<Tuple<Outer<U>.Inner<U>>> t) { }
+}
+#pragma warning restore IDE0060 // Remove unused parameter
+#pragma warning restore CA1822 // Mark members as static
diff --git a/playground/Directory.Build.props b/playground/Directory.Build.props
new file mode 100644
index 0000000000..6f5b8d7bf3
--- /dev/null
+++ b/playground/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="../Directory.Build.props" />
+
+  <PropertyGroup>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+  </PropertyGroup>
+</Project>
diff --git a/playground/MSTest1/MSTest1.csproj b/playground/MSTest1/MSTest1.csproj
new file mode 100644
index 0000000000..302cbc6a14
--- /dev/null
+++ b/playground/MSTest1/MSTest1.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(TargetFrameworks);net48;net9.0;net8.0</TargetFrameworks>
+    <Prefer32Bit>false</Prefer32Bit>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
+    <Reference Include="System" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
diff --git a/playground/MSTest1/UnitTest1.cs b/playground/MSTest1/UnitTest1.cs
new file mode 100644
index 0000000000..433521e1d9
--- /dev/null
+++ b/playground/MSTest1/UnitTest1.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MSTest1;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod2()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod3()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod4()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod5()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod6()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod7()
+    {
+        // Thread.Sleep(1000);
+    }
+}
diff --git a/playground/MSTest2/MSTest2.csproj b/playground/MSTest2/MSTest2.csproj
new file mode 100644
index 0000000000..302cbc6a14
--- /dev/null
+++ b/playground/MSTest2/MSTest2.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(TargetFrameworks);net48;net9.0;net8.0</TargetFrameworks>
+    <Prefer32Bit>false</Prefer32Bit>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
+    <Reference Include="System" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
diff --git a/playground/MSTest2/UnitTest1.cs b/playground/MSTest2/UnitTest1.cs
new file mode 100644
index 0000000000..66de7d1f66
--- /dev/null
+++ b/playground/MSTest2/UnitTest1.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MSTest2;
+
+[TestClass]
+public class UnitTest2
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod2()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod3()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod4()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod5()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod6()
+    {
+        // Thread.Sleep(1000);
+    }
+
+    [TestMethod]
+    public void TestMethod7()
+    {
+        // Thread.Sleep(1000);
+    }
+}
diff --git a/playground/README.md b/playground/README.md
new file mode 100644
index 0000000000..c774287f37
--- /dev/null
+++ b/playground/README.md
@@ -0,0 +1,17 @@
+# Playground
+
+This Plaground directory contains projects to aid interactive debugging of test platform. TestPlatform is normally built
+as a set of distinct pieces and then assembled in the artifacts folder. This forces rebuilding using build.cmd to try out 
+changes. The TestPlatform.Playground project builds a simpler version of TestPlatform to avoid always rebuilding via
+build.cmd, offering a tighther development loop.
+
+The project references TranslationLayer, vstest.console, TestHostProvider, testhost and MSTest1 projects, to make sure
+we build all the dependencies of that are used to run tests via VSTestConsoleWrapper. It then copies the components from
+their original build locations, to $(TargetDir)\vstest.console directory, and it's subfolders to create an executable
+copy of TestPlatform that is similar to what we ship.
+
+The copying might trigger only on re-build, if you see outdated dependencies, Rebuild this project instead of just Build.
+ 
+Use this as playground for your debugging of end-to-end scenarios, it will automatically attach vstest.console and teshost
+sub-processes. It won't stop at entry-point automatically, don't forget to set your breakpoints, or remove VSTEST_DEBUG_NOBP
+from the environment variables of this project.
\ No newline at end of file
diff --git a/playground/TestPlatform.Playground/Environment.cs b/playground/TestPlatform.Playground/Environment.cs
new file mode 100644
index 0000000000..d7ba86c869
--- /dev/null
+++ b/playground/TestPlatform.Playground/Environment.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace TestPlatform.Playground;
+
+internal class EnvironmentVariables
+{
+    public static readonly Dictionary<string, string?> Variables = new()
+    {
+        ["VSTEST_CONNECTION_TIMEOUT"] = "999",
+        ["VSTEST_DEBUG_NOBP"] = "1",
+        ["VSTEST_RUNNER_DEBUG_ATTACHVS"] = "0",
+        ["VSTEST_HOST_DEBUG_ATTACHVS"] = "0",
+        ["VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"] = "0",
+    };
+
+}
diff --git a/playground/TestPlatform.Playground/Program.cs b/playground/TestPlatform.Playground/Program.cs
new file mode 100644
index 0000000000..81a3d588e4
--- /dev/null
+++ b/playground/TestPlatform.Playground/Program.cs
@@ -0,0 +1,340 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace TestPlatform.Playground;
+
+internal class Program
+{
+    static void Main()
+    {
+        // This project references TranslationLayer, vstest.console, TestHostProvider, testhost and MSTest1 projects, to make sure
+        // we build all the dependencies of that are used to run tests via VSTestConsoleWrapper. It then copies the components from
+        // their original build locations, to $(TargetDir)\netfx\vstest.console directory, and its subfolders to create an executable
+        // copy of TestPlatform that is similar to what we ship.
+        //
+        // The copying might trigger only on re-build, if you see outdated dependencies, Rebuild this project instead of just Build.
+        //
+        // Use this as playground for your debugging of end-to-end scenarios, it will automatically attach vstest.console and teshost
+        // sub-processes. It won't stop at entry-point automatically, don't forget to set your breakpoints, or remove VSTEST_DEBUG_NOBP
+        // from the environment variables of this project.
+
+        var thisAssemblyPath = Assembly.GetEntryAssembly()!.Location;
+        var here = Path.GetDirectoryName(thisAssemblyPath)!;
+        var playground = Path.GetFullPath(Path.Combine(here, "..", "..", "..", ".."));
+
+        var console = Path.Combine(here, "vstest.console", "netfx", "vstest.console.exe");
+
+        var sourceSettings = $$$"""
+            <RunSettings>
+                <RunConfiguration>
+
+                    <!-- <MaxCpuCount>1</MaxCpuCount> -->
+                    <!-- <DisableParallelization>True<DisableParallelization> -->
+                    <!-- <TargetPlatform>x86</TargetPlatform> -->
+                    <!-- <TargetFrameworkVersion>net472</TargetFrameworkVersion> -->
+
+                    <!-- Per test coverage support -->
+                    <!--
+                    <MaxCpuCount>0</MaxCpuCount>
+                    <ForceOneTestAtTimePerTestHost>True</ForceOneTestAtTimePerTestHost>
+                    <TargetFrameworkTestHostDemultiplexer>4</TargetFrameworkTestHostDemultiplexer>
+                    -->
+
+                    <!-- The settings below are what VS sends by default. -->
+                    <CollectSourceInformation>true</CollectSourceInformation>
+                    <DesignMode>True</DesignMode>
+                </RunConfiguration>
+                <BoostTestInternalSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                    <VSProcessId>999999</VSProcessId>
+                </BoostTestInternalSettings>
+                <GoogleTestAdapterSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <SolutionSettings>
+                  <Settings />
+                </SolutionSettings>
+                <ProjectSettings />
+                </GoogleTestAdapterSettings>
+
+                <!-- Blame hang -->
+                <!-- <LoggerRunSettings>
+                  <Loggers>
+                    <Logger friendlyName="blame" enabled="True" />
+                  </Loggers>
+                </LoggerRunSettings>
+                <DataCollectionRunSettings>
+                  <DataCollectors>
+                    <DataCollector friendlyName="blame" enabled="True">
+                      <Configuration>
+                        <CollectDumpOnTestSessionHang TestTimeout="10s" HangDumpType="Full" />
+                      </Configuration>
+                    </DataCollector>
+                  </DataCollectors>
+                </DataCollectionRunSettings> -->
+            </RunSettings>
+            """;
+
+        var sources = new[] {
+            Path.Combine(playground, "bin", "MSTest1", "Debug", "net48", "MSTest1.dll"),
+            Path.Combine(playground, "bin", "MSTest2", "Debug", "net48", "MSTest2.dll"),
+            // The built in .NET projects don't now work right now in Playground, there is some conflict with Arcade.
+            // But if you create one outside of Playground it will work. 
+            //Path.Combine(playground, "bin", "MSTest1", "Debug", "net7.0", "MSTest1.dll"),
+        };
+
+        //// Console mode
+        //// Uncomment if providing command line parameters is easier for you
+        //// than converting them to settings, or when you debug command line scenario specifically.
+        //var settingsFile = Path.GetTempFileName();
+        //try
+        //{
+        //    File.WriteAllText(settingsFile, sourceSettings);
+        //    var processStartInfo = new ProcessStartInfo
+        //    {
+        //        FileName = console,
+        //        Arguments = $"{string.Join(" ", sources)} --settings:{settingsFile} --logger:trx;LogFileName=my.trx;WarnOnFileOverwrite=false",
+        //        UseShellExecute = false,
+        //    };
+        //    EnvironmentVariables.Variables.ToList().ForEach(processStartInfo.Environment.Add);
+        //    var process = Process.Start(processStartInfo);
+        //    process.WaitForExit();
+        //    if (process.ExitCode != 0)
+        //    {
+        //        throw new Exception($"Process failed with {process.ExitCode}");
+        //    }
+        //}
+        //finally
+        //{
+        //    try { File.Delete(settingsFile); } catch { }
+        //}
+
+        // design mode
+        var detailedOutput = true;
+        var consoleOptions = new ConsoleParameters
+        {
+            EnvironmentVariables = EnvironmentVariables.Variables,
+            LogFilePath = Path.Combine(here, "logs", "log.txt"),
+            TraceLevel = TraceLevel.Verbose,
+        };
+        var options = new TestPlatformOptions
+        {
+            CollectMetrics = true,
+        };
+        var r = new VsTestConsoleWrapper(console, consoleOptions);
+        var sessionHandler = new TestSessionHandler();
+#pragma warning disable CS0618 // Type or member is obsolete
+        //// TestSessions
+        // r.StartTestSession(sources, sourceSettings, sessionHandler);
+#pragma warning restore CS0618 // Type or member is obsolete
+        var discoveryHandler = new PlaygroundTestDiscoveryHandler(detailedOutput);
+        var sw = Stopwatch.StartNew();
+        // Discovery
+        r.DiscoverTests(sources, sourceSettings, options, sessionHandler.TestSessionInfo, discoveryHandler);
+        var discoveryDuration = sw.ElapsedMilliseconds;
+        Console.WriteLine($"Discovery done in {discoveryDuration} ms");
+        sw.Restart();
+        // Run with test cases and custom testhost launcher
+        //r.RunTestsWithCustomTestHost(discoveryHandler.TestCases, sourceSettings, options, sessionHandler.TestSessionInfo, new TestRunHandler(detailedOutput), new DebuggerTestHostLauncher());
+        //// Run with test cases and without custom testhost launcher
+        r.RunTests(discoveryHandler.TestCases, sourceSettings, options, sessionHandler.TestSessionInfo, new TestRunHandler(detailedOutput));
+        //// Run with sources and custom testhost launcher and debugging
+        //r.RunTestsWithCustomTestHost(sources, sourceSettings, options, sessionHandler.TestSessionInfo, new TestRunHandler(detailedOutput), new DebuggerTestHostLauncher());
+        //// Run with sources
+        //r.RunTests(sources, sourceSettings, options, sessionHandler.TestSessionInfo, new TestRunHandler(detailedOutput));
+        var rd = sw.ElapsedMilliseconds;
+        Console.WriteLine($"Discovery: {discoveryDuration} ms, Run: {rd} ms, Total: {discoveryDuration + rd} ms");
+        // Console.WriteLine($"Settings:\n{sourceSettings}");
+    }
+
+    public class PlaygroundTestDiscoveryHandler : ITestDiscoveryEventsHandler, ITestDiscoveryEventsHandler2
+    {
+        private int _testCasesCount;
+        private readonly bool _detailedOutput;
+
+        public PlaygroundTestDiscoveryHandler(bool detailedOutput)
+        {
+            _detailedOutput = detailedOutput;
+        }
+
+        public List<TestCase> TestCases { get; internal set; } = new List<TestCase>();
+
+        public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+        {
+            if (_detailedOutput)
+            {
+                Console.WriteLine($"[DISCOVERY.PROGRESS]");
+                Console.WriteLine(WriteTests(discoveredTestCases));
+            }
+            _testCasesCount += discoveredTestCases!.Count();
+            if (discoveredTestCases != null) { TestCases.AddRange(discoveredTestCases); }
+        }
+
+        public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase>? lastChunk, bool isAborted)
+        {
+            Console.WriteLine($"[DISCOVERY.COMPLETE] aborted? {isAborted}, tests count: {totalTests}");
+            if (_detailedOutput)
+            {
+                Console.WriteLine("Last chunk:");
+                Console.WriteLine(WriteTests(lastChunk));
+            }
+            if (lastChunk != null) { TestCases.AddRange(lastChunk); }
+        }
+
+        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+        {
+            Console.WriteLine($"[DISCOVERY.COMPLETE] aborted? {discoveryCompleteEventArgs.IsAborted}, tests count: {discoveryCompleteEventArgs.TotalCount}, discovered count: {_testCasesCount}");
+            if (_detailedOutput)
+            {
+                Console.WriteLine("Last chunk:");
+                Console.WriteLine(WriteTests(lastChunk));
+            }
+            Console.WriteLine("Fully discovered:");
+            Console.WriteLine(WriteSources(discoveryCompleteEventArgs.FullyDiscoveredSources));
+            Console.WriteLine("Partially discovered:");
+            Console.WriteLine(WriteSources(discoveryCompleteEventArgs.PartiallyDiscoveredSources));
+            Console.WriteLine("Skipped discovery:");
+            Console.WriteLine(WriteSources(discoveryCompleteEventArgs.SkippedDiscoveredSources));
+            Console.WriteLine("Not discovered:");
+            Console.WriteLine(WriteSources(discoveryCompleteEventArgs.NotDiscoveredSources));
+            if (lastChunk != null) { TestCases.AddRange(lastChunk); }
+        }
+
+        public void HandleLogMessage(TestMessageLevel level, string? message)
+        {
+            Console.WriteLine($"[DISCOVERY.{level.ToString().ToUpper(CultureInfo.InvariantCulture)}] {message}");
+        }
+
+        public void HandleRawMessage(string rawMessage)
+        {
+            Console.WriteLine($"[DISCOVERY.MESSAGE] {rawMessage}");
+        }
+
+        private static string WriteTests(IEnumerable<TestCase>? testCases)
+            => testCases?.Any() == true
+                ? "\t" + string.Join("\n\t", testCases!.Select(r => r.Source + " " + r.DisplayName))
+                : "\t<empty>";
+
+        private static string WriteSources(IEnumerable<string>? sources)
+            => sources?.Any() == true
+                ? "\t" + string.Join("\n\t", sources)
+                : "\t<empty>";
+    }
+
+    public class TestRunHandler : ITestRunEventsHandler
+    {
+        private readonly bool _detailedOutput;
+
+        public TestRunHandler(bool detailedOutput)
+        {
+            _detailedOutput = detailedOutput;
+        }
+
+        public void HandleLogMessage(TestMessageLevel level, string? message)
+        {
+            Console.WriteLine($"[{level.ToString().ToUpper(CultureInfo.InvariantCulture)}]: {message}");
+        }
+
+        public void HandleRawMessage(string rawMessage)
+        {
+            if (_detailedOutput)
+            {
+                Console.WriteLine($"[RUN.MESSAGE]: {rawMessage}");
+            }
+        }
+
+        public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris)
+        {
+            Console.WriteLine($"[RUN.COMPLETE]: err: {testRunCompleteArgs.Error}, lastChunk:");
+            if (_detailedOutput)
+            {
+                Console.WriteLine(WriteTests(lastChunkArgs?.NewTestResults));
+            }
+        }
+
+        public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+        {
+            if (_detailedOutput)
+            {
+                Console.WriteLine($"[RUN.PROGRESS]");
+                Console.WriteLine(WriteTests(testRunChangedArgs?.NewTestResults));
+            }
+        }
+
+        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        private static string WriteTests(IEnumerable<TestResult>? testResults)
+            => WriteTests(testResults?.Select(t => t.TestCase));
+
+        private static string WriteTests(IEnumerable<TestCase>? testCases)
+            => testCases?.Any() == true
+                ? "\t" + string.Join("\n\t", testCases.Select(r => r.DisplayName))
+                : "\t<empty>";
+    }
+
+    internal class DebuggerTestHostLauncher : ITestHostLauncher2
+    {
+        public bool IsDebug => true;
+
+        public bool AttachDebuggerToProcess(int pid)
+        {
+            return true;
+        }
+
+        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+        {
+            return true;
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+        {
+            return 1;
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
+        {
+            return 1;
+        }
+    }
+}
+
+internal class TestSessionHandler : ITestSessionEventsHandler
+{
+    public TestSessionHandler() { }
+    public TestSessionInfo? TestSessionInfo { get; private set; }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+
+    }
+
+    public void HandleStartTestSessionComplete(StartTestSessionCompleteEventArgs? eventArgs)
+    {
+        TestSessionInfo = eventArgs?.TestSessionInfo;
+    }
+
+    public void HandleStopTestSessionComplete(StopTestSessionCompleteEventArgs? eventArgs)
+    {
+
+    }
+}
diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
new file mode 100644
index 0000000000..7259dc0728
--- /dev/null
+++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
@@ -0,0 +1,123 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
+
+    <EnableMSTestRunner>false</EnableMSTestRunner>
+    <!--
+      Arcade uses UseMSTestRunner instead of EnableMSTestRunner
+      https://github.com/dotnet/arcade/blob/c9ed073c0a2a828aed8f5c6ecb0a544b0f0fd3f8/src/Microsoft.DotNet.Arcade.Sdk/tools/MSTest/MSTest.targets#L29
+      https://github.com/dotnet/arcade/issues/15875      
+    -->
+    <UseMSTestRunner>false</UseMSTestRunner>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter" Version="3.9.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.9.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+
+    <!-- Event log collector only works on .NET Framework, and so we build it only for that. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"  SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"  />
+
+    <ProjectReference Include="$(RepoRoot)src\datacollector\datacollector.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\testhost\testhost.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\vstest.console\vstest.console.csproj" />
+    <ProjectReference Include="$(RepoRoot)playground\MSTest1\MSTest1.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\AttachVS\AttachVS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
+    <Reference Include="System" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <PropertyGroup>
+      <SourcePath>$(RepoRoot)artifacts\</SourcePath>
+      <DestinationPath>$(TargetDir)vstest.console\</DestinationPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- .NET Framework console -->
+      <FileToCopy Include="$(SourcePath)bin\vstest.console\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\win7-x64\**\*.*" SubFolder="netfx" />
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.TestHostProvider\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\**\*.*" SubFolder="netfx\Extensions\" />
+
+      <!-- copy net462, net47, net471, net472, net48 and net481 testhosts -->
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net47\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net47\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net471\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net471\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net472\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net48\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net48\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net481\win-x86\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net481\win7-x64\**\*.*" SubFolder="netfx\TestHostNetFramework\" />
+
+      <!-- copy datacollectors -->
+      <FileToCopy Include="$(SourcePath)bin\datacollector\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="netfx\" />
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.BlameDataCollector\$(Configuration)\net472\**\*.*" SubFolder="netfx\Extensions\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="netfx\Extensions\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="netfx\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetFrameworkMinimum)\win-x86\**\*.*" SubFolder="netfx\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.arm64\$(Configuration)\$(NetFrameworkMinimum)\win10-arm64\**\*.*" SubFolder="netfx\Extensions\blame\" />
+
+      <!-- copy loggers -->
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.HtmlLogger\$(Configuration)\$(NetFrameworkMinimum)\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger*" SubFolder="netfx\Extensions\" />
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.TrxLogger\$(Configuration)\$(NetFrameworkMinimum)\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger*" SubFolder="netfx\Extensions\" />
+
+      <!-- .NET console -->
+      <FileToCopy Include="$(SourcePath)bin\vstest.console\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net" />
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.TestHostProvider\$(Configuration)\netstandard2.0\**\*.*" SubFolder="net\Extensions\" />
+
+      <!-- copy testhost -->
+      <FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net" />
+
+      <!-- copy datacollectors --><!--
+      <FileToCopy Include="$(SourcePath)bin\datacollector\$(Configuration)\net472\**\*.*" SubFolder="net\" />
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.BlameDataCollector\$(Configuration)\net472\**\*.*" SubFolder="net\Extensions\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net\Extensions\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool\$(Configuration)\$(NetCoreAppMinimum)\**\*.*" SubFolder="net\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetCoreAppMinimum)\win-x86\**\*.*" SubFolder="net\Extensions\blame\" />
+      <FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.arm64\$(Configuration)\$(NetCoreAppMinimum)\win10-arm64\**\*.*" SubFolder="net\Extensions\blame\" />-->
+
+      <!-- copy loggers --><!--
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.HtmlLogger\$(Configuration)\$(NetCoreAppMinimum)\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger*" SubFolder="net\Extensions\" />-->
+
+      <!-- copy test target -->
+      <FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Build\$(Configuration)\netstandard2.0\*" SubFolder="net\" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(FileToCopy)" DestinationFiles="@(FileToCopy -> '$(DestinationPath)\%(SubFolder)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" Retries="3" RetryDelayMilliseconds="500" UseHardlinksIfPossible="False" UseSymboliclinksIfPossible="False" ErrorIfLinkFails="False" Condition="@(FileToCopy-&gt;Count()) &gt; 0">
+
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+  </Target>
+</Project>
diff --git a/restore.cmd b/restore.cmd
new file mode 100644
index 0000000000..77649cdb4d
--- /dev/null
+++ b/restore.cmd
@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
diff --git a/restore.sh b/restore.sh
new file mode 100755
index 0000000000..02531e1d71
--- /dev/null
+++ b/restore.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+"$scriptroot/eng/common/build.sh" --restore $@
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
new file mode 100644
index 0000000000..6f5b8d7bf3
--- /dev/null
+++ b/samples/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="../Directory.Build.props" />
+
+  <PropertyGroup>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+  </PropertyGroup>
+</Project>
diff --git a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
index 0152be5498..a9da2059ca 100644
--- a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
+++ b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-      <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">../../</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Dependencies.props" />
+
+  <Import Project="$(RepoRoot)scripts/build/TestPlatform.Dependencies.props" />
   <PropertyGroup>
     <VersionPrefix>15.0.0</VersionPrefix>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <AssemblyName>Microsoft.TestPlatform.E2ETest</AssemblyName>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
@@ -19,7 +17,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
index 98f259f429..aa9cc75108 100644
--- a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
+++ b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppMinimum)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
+    <!-- CVE-2017-11770 -->
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.1.2" />
+    <!-- / CVE-2017-11770 -->
+
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
-    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="" />
   </ItemGroup>
 </Project>
diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj
index 356b39a61c..279e0d3a75 100644
--- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj
+++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <AssemblyName>Microsoft.TestPlatform.TranslationLayer.E2ETest</AssemblyName>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
@@ -14,7 +14,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" />
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json
index 228592a185..09dce23302 100644
--- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json
+++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Microsoft.TestPlatform.TranslationLayer.E2ETest": {
       "commandName": "Project",
-      "commandLineArgs": "--runner:\"bin\\Debug\\net451\\win7-x64\\vstest.console.exe\" --testadapterpath:\"bin\\Debug\\net451\\win7-x64\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll\" --testassembly:\"bin\\Debug\\net451\\win7-x64\\UnitTestProject.dll\""
+      "commandLineArgs": "--runner:\"bin\\Debug\\net462\\win7-x64\\vstest.console.exe\" --testadapterpath:\"bin\\Debug\\net462\\win7-x64\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll\" --testassembly:\"bin\\Debug\\net462\\win7-x64\\UnitTestProject.dll\""
     }
   }
-}
\ No newline at end of file
+}
diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj
index fc06eb77ff..523277f73d 100644
--- a/samples/UnitTestProject/UnitTestProject.csproj
+++ b/samples/UnitTestProject/UnitTestProject.csproj
@@ -2,9 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\scripts\build\TestPlatform.Dependencies.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" '$(TargetFramework)' != 'net451' ">Exe</OutputType>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum);net7.0;net6.0;</TargetFrameworks>
+    <OutputType Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' ">Exe</OutputType>
     <AssemblyName>UnitTestProject</AssemblyName>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -16,11 +15,11 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1
deleted file mode 100644
index f81a89cd83..0000000000
--- a/scripts/PortableToFullPdb.ps1
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-# Portable to Full PDB conversion script for Test Platform.
-
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$false)]
-    [ValidateSet("Debug", "Release")]
-    [System.String] $Configuration = "Release"
-)
-
-#
-# Variables
-#
-Write-Verbose "Setup environment variables."
-$TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
-$TP_PACKAGES_DIR = Join-Path $TP_ROOT_DIR "packages"
-$TP_OUT_DIR = Join-Path $TP_ROOT_DIR "artifacts"
-
-$PdbConverterToolVersion = "1.1.0-beta2-21075-01"
-
-function Locate-PdbConverterTool
-{
-    $pdbConverter = Join-Path -path $TP_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb\$PdbConverterToolVersion\tools\Pdb2Pdb.exe"
-
-    if (!(Test-Path -path $pdbConverter)) {
-       throw "Unable to locate Pdb2Pdb converter exe in path '$pdbConverter'."
-   }
-
-    Write-Verbose "Pdb2Pdb converter path is : $pdbConverter"
-    return $pdbConverter
-
-}
-
-function ConvertPortablePdbToWindowsPdb
-{	
-    $allPdbs = Get-ChildItem -path $TP_OUT_DIR\$Configuration *.pdb -Recurse | % {$_.FullName}
-    $portablePdbs = New-Object System.Collections.Generic.List[System.Object]
-	
-    foreach($pdb in $allPdbs)
-    {
-	# First four bytes should be 'BSJB' for portable pdb
-	$bytes = [char[]](Get-Content $pdb -Encoding byte -TotalCount 4) -join ''
-	
-	if( $bytes -eq "BSJB")
-	{
-		$portablePdbs.Add($pdb)
-	}
-    }
-	
-    $pdbConverter = Locate-PdbConverterTool
-    
-    foreach($portablePdb in $portablePdbs)
-    {
-	# First check if corresponding dll exists
-        $dllOrExePath = $portablePdb -replace ".pdb",".dll"
-		
-		if(!(Test-Path -path $dllOrExePath))
-		{
-			# If no corresponding dll found, check if exe exists
-			$dllOrExePath = $portablePdb -replace ".pdb",".exe"
-			
-			if(!(Test-Path -path $dllOrExePath))
-            		{
-			    throw "Unable to locate dll/exe corresponding to $portablePdb"
-            		}
-		}
-		
-        $fullpdb = $portablePdb -replace ".pdb",".pdbfull"
-
-        Write-Verbose "$pdbConverter $dll /pdb $portablePdb /out $fullpdb"
-        & $pdbConverter $dllOrExePath /pdb $portablePdb /out $fullpdb
-
-        Remove-Item -Path $portablePdb 
-    }
-}
-
-Write-Verbose "Converting Portable pdbs to Windows(Full) Pdbs..."
-ConvertPortablePdbToWindowsPdb
-
diff --git a/scripts/build.ps1 b/scripts/build.ps1
deleted file mode 100644
index d3e527a5b4..0000000000
--- a/scripts/build.ps1
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-# Build script for Test Platform.
-
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$false)]
-    [ValidateSet("Debug", "Release")]
-    [Alias("c")]
-    [System.String] $Configuration = "Debug",
-
-    [Parameter(Mandatory=$false)]
-    [Alias("r")]
-    [System.String] $TargetRuntime = "win7-x64",
-
-    # Versioning scheme = Major(15).Minor(RTW, Updates).SubUpdates(preview4, preview5, RC etc)
-    # E.g. VS 2017 Update 1 Preview will have version 15.1.1
-    [Parameter(Mandatory=$false)]
-    [Alias("v")]
-    [System.String] $Version, # Will set this later by reading TestPlatform.Settings.targets file.
-
-    [Parameter(Mandatory=$false)]
-    [Alias("vs")]
-    [System.String] $VersionSuffix = "dev",
-
-    [Parameter(Mandatory=$false)]
-    [Alias("bn")]
-    [System.String] $BuildNumber = "20991231-99",
-
-    [Parameter(Mandatory=$false)]
-    [Alias("ff")]
-    [System.Boolean] $FailFast = $true,
-
-    [Parameter(Mandatory=$false)]
-    [Alias("noloc")]
-    [Switch] $DisableLocalizedBuild,
-
-    [Parameter(Mandatory=$false)]
-    [Alias("ci")]
-    [Switch] $CIBuild,
-
-    [Parameter(Mandatory=$false)]
-    [Alias("pt")]
-    [Switch] $PublishTestArtifacts,
-
-    # Build specific projects
-    [Parameter(Mandatory=$false)]
-    [Alias("p")]
-    [System.String[]] $ProjectNamePatterns = @(),
-
-    [Alias("f")]
-    [Switch] $Force, 
-
-    [Alias("s")]
-    [String[]] $Steps = @("InstallDotnet", "Restore", "UpdateLocalization", "Build", "Publish", "PrepareAcceptanceTests")
-)
-
-. $PSScriptRoot\common.lib.ps1
-
-# Set Version from scripts/build/TestPlatform.Settings.targets, when we are running locally and not providing the version as the parameter 
-# or when the build is done directly in VS
-if([string]::IsNullOrWhiteSpace($Version))
-{
-    $Version = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Settings.targets)).Project.PropertyGroup[0].TPVersionPrefix | 
-        ForEach-Object { $_.Trim() } |
-        Select-Object -First 1 
-
-    Write-Verbose "Version was not provided using version '$Version' from TestPlatform.Settings.targets"    
-}
-
-
-#
-# Build configuration
-#
-Write-Verbose "Setup build configuration."
-$TPB_Solution = "TestPlatform.sln"
-$TPB_TestAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\"
-$TPB_TestAssets_Solution = Join-Path $TPB_TestAssets "TestAssets.sln"
-$TPB_TestAssets_CILAssets = Join-Path $TPB_TestAssets "CILProject\CILProject.proj"
-$TPB_TargetFramework45 = "net45"
-$TPB_TargetFramework451 = "net451"
-$TPB_TargetFramework472 = "net472"
-$TPB_TargetFrameworkCore10 = "netcoreapp1.0"
-$TPB_TargetFrameworkCore20 = "netcoreapp2.1"
-$TPB_TargetFrameworkUap100 = "uap10.0"
-$TPB_TargetFrameworkNS10 = "netstandard1.0"
-$TPB_TargetFrameworkNS13 = "netstandard1.3"
-$TPB_TargetFrameworkNS20 = "netstandard2.0"
-$TPB_Configuration = $Configuration
-$TPB_TargetRuntime = $TargetRuntime
-$TPB_X64_Runtime = "win7-x64"
-$TPB_X86_Runtime = "win7-x86"
-
-# Version suffix is empty for RTM release
-$TPB_Version = if ($VersionSuffix -ne '') { $Version + "-" + $VersionSuffix } else { $Version }
-$TPB_CIBuild = $CIBuild
-$TPB_PublishTests = $PublishTestArtifacts
-$TPB_LocalizedBuild = !$DisableLocalizedBuild
-$TPB_PackageOutDir = Join-Path $env:TP_OUT_DIR $TPB_Configuration\packages
-$TPB_SourceBuildPackageOutDir = Join-Path $TPB_PackageOutDir "source-build"
-
-$language = @("cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-BR", "ru", "tr", "zh-Hans", "zh-Hant")
-
-# Capture error state in any step globally to modify return code
-$Script:ScriptFailed = $false
-
-. "$($CurrentScriptDir.FullName)\verify-nupkgs.ps1"
-
-# Update the version in the dependencies props to be the TPB_version version, this is not ideal but because changing how this is resolved would 
-# mean that we need to change the whole build process this is a solution with the least amount of impact, that does not require us to keep track of 
-# the version in multiple places
-$dependenciesPath = "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props"
-$dependencies = Get-Content -Raw -Encoding UTF8 $dependenciesPath
-$updatedDependencies = $dependencies -replace "<NETTestSdkVersion>.*?</NETTestSdkVersion>", "<NETTestSdkVersion>$TPB_Version</NETTestSdkVersion>"
-$updatedDependencies | Set-Content -Encoding UTF8 $dependenciesPath -NoNewline
-
-$attachVsPath = "$env:TP_ROOT_DIR\src\AttachVS\bin\Debug\net472"
-
-if ($env:PATH -notlike "*$attachVsPath") { 
-    Write-Log "Adding AttachVS to PATH"
-    $env:PATH = "$attachVsPath;$env:PATH"
-}
-
-function Invoke-Build
-{
-    $timer = Start-Timer
-    Write-Log "Invoke-Build: Start build."
-    $dotnetExe = Get-DotNetPath
-
-    Write-Log ".. .. Build: Source: $TPB_Solution"
-    Write-Verbose "$dotnetExe build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild"
-    & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:TestPlatform.binlog
-    Write-Log ".. .. Build: Complete."
-
-    Write-Log ".. .. Build: Source: $TPB_TestAssets_CILAssets"
-    Write-Verbose "$dotnetExe build $TPB_TestAssets_CILAssets --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild"
-    & $dotnetExe build $TPB_TestAssets_CILAssets --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:"$($env:TP_ROOT_DIR)\CILAssets.binlog"
-    Write-Log ".. .. Build: Complete."
-
-    Set-ScriptFailedOnError
-
-    Write-Log "Invoke-Build: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Invoke-TestAssetsBuild
-{
-    $timer = Start-Timer
-    Write-Log "Invoke-TestAssetsBuild: Start test assets build."
-    $dotnetExe = Get-DotNetPath
-    $nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe"
-    $nugetConfig = Join-Path $TPB_TestAssets "NuGet.config"
-
-    Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution"
-    Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- add NuGet source"
-    & $nugetExe sources add -Name "locally-built-testplatform-packages" -Source "$env:TP_TESTARTIFACTS\packages\" -ConfigFile "$nugetConfig"
-    Write-Verbose "$dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild"
-    & $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:"$($env:TP_ROOT_DIR)\TestAssets.binlog"
-    Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- remove NuGet source"
-    & $nugetExe sources remove -Name "locally-built-testplatform-packages" -ConfigFile "$nugetConfig"
-    Write-Log ".. .. Build: Complete."
-
-    Set-ScriptFailedOnError
-
-    Write-Log "Invoke-TestAssetsBuild: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Copy-PackageIntoStaticDirectory { 
-    # packages are published into folder based on configuration, but 
-    # nuget does not understand that, and does not support wildcards in paths 
-    # in order to be able to use the produced packages for acceptance tests we
-    # need to put them in folder that is not changing it's name based on config
-    $tpPackagesPath = "$env:TP_OUT_DIR\$TPB_Configuration\packages\"
-    $tpPackagesDestination = "$env:TP_TESTARTIFACTS"
-    New-Item -ItemType Directory -Force $tpPackagesDestination | Out-Null
-    Copy-Item $tpPackagesPath $tpPackagesDestination -Force -Filter *.nupkg -Verbose -Recurse
-}
-
-function Publish-PatchedDotnet { 
-    Write-Log "Publish-PatchedDotnet: Copy local dotnet installation to testArtifacts"
-    $dotnetPath = "$env:TP_TOOLS_DIR\dotnet\"
-
-    $dotnetTestArtifactsPath = "$env:TP_TESTARTIFACTS\dotnet\" 
-    
-    if (Test-Path $dotnetTestArtifactsPath) { 
-        Remove-Item -Force -Recurse $dotnetTestArtifactsPath
-    }
-
-    $dotnetTestArtifactsSdkPath = "$env:TP_TESTARTIFACTS\dotnet\sdk\$env:DOTNET_CLI_VERSION\"
-    Copy-Item $dotnetPath $dotnetTestArtifactsPath -Force -Recurse
-
-    Write-Log "Publish-PatchedDotnet: Copy VSTest task artifacts to local dotnet installation to allow `dotnet test` to run with it"
-    $buildArtifactsPath = "$env:TP_ROOT_DIR\src\Microsoft.TestPlatform.Build\bin\$TPB_Configuration\$TPB_TargetFrameworkNS20\*"
-    Copy-Item $buildArtifactsPath $dotnetTestArtifactsSdkPath -Force
-}
-
-function Publish-Package
-{
-    $timer = Start-Timer
-    Write-Log "Publish-Package: Started."
-    $dotnetExe = Get-DotNetPath
-    $fullCLRPackage451Dir = Get-FullCLRPackageDirectory
-    $fullCLRPackage45Dir = Get-FullCLRPackageDirectory45
-    $uap100PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkUap100");
-    $net45PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\net45");
-    $netstandard10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS10");
-    $netstandard13PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS13");
-    $netstandard20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS20");
-    $coreCLR20PackageDir = Get-CoreCLR20PackageDirectory
-    $coreCLR10PackageDir = Get-CoreCLR10PackageDirectory
-    $coreCLR20TestHostPackageDir = Get-CoreCLR20TestHostPackageDirectory
-    $packageProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "package\package.csproj"
-    $testHostProject = Join-Path $env:TP_ROOT_DIR "src\testhost\testhost.csproj"
-    $testHostx86Project = Join-Path $env:TP_ROOT_DIR "src\testhost.x86\testhost.x86.csproj"
-
-    $testhostFullPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFramework451\$TPB_TargetRuntime")
-    $testhostCore20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20")
-    $testhostCore20PackageX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X64_Runtime")
-    $testhostCore20PackageX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X86_Runtime")
-    $testhostCore20PackageTempX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X64_Runtime")
-    $testhostCore20PackageTempX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X86_Runtime")
-    
-    $testhostCore10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10")
-    $testhostCore10PackageX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X64_Runtime")
-    $testhostCore10PackageX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X86_Runtime")
-    $testhostCore10PackageTempX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X64_Runtime")
-    $testhostCore10PackageTempX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X86_Runtime")
-    
-    $testhostUapPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkUap100")
-    $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj"
-    $settingsMigratorProject = Join-Path $env:TP_ROOT_DIR "src\SettingsMigrator\SettingsMigrator.csproj"
-    $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj"
-
-    Write-Log "Package: Publish src\package\package\package.csproj"
-    Publish-PackageInternal $packageProject $TPB_TargetFramework451 $fullCLRPackage451Dir
-    Publish-PackageInternal $packageProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir
-
-    
-    ################################################################################
-    # Publish vstest.console and datacollector exclusively because *.config/*.deps.json file is not getting publish when we are publishing aforementioned project through dependency.
-    Write-Log "Package: Publish src\vstest.console\vstest.console.csproj"
-    Publish-PackageInternal $vstestConsoleProject $TPB_TargetFramework451 $fullCLRPackage451Dir
-    Publish-PackageInternal $vstestConsoleProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir
-    
-    Write-Log "Package: Publish src\SettingsMigrator\SettingsMigrator.csproj"
-    Publish-PackageInternal $settingsMigratorProject $TPB_TargetFramework451 $fullCLRPackage451Dir
-
-    Write-Log "Package: Publish src\datacollector\datacollector.csproj"
-    Publish-PackageInternal $dataCollectorProject $TPB_TargetFramework472 $fullCLRPackage451Dir
-    Publish-PackageInternal $dataCollectorProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir
-
-    ################################################################################
-    # Publish testhost
-    Write-Log "Package: Publish testhost\testhost.csproj"
-    Publish-PackageInternal $testHostProject $TPB_TargetFramework451 $testhostFullPackageDir
-    Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore20 $testhostCore20PackageDir
-    Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore10 $testhostCore10PackageDir
-    Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore20 $testhostUapPackageDir
-    Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore20 $TPB_X64_Runtime false $testhostCore20PackageTempX64Dir
-    Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore10 $TPB_X64_Runtime true $testhostCore10PackageTempX64Dir
-    
-    Write-Log "Package: Publish testhost.x86\testhost.x86.csproj"
-    Publish-PackageInternal $testHostx86Project $TPB_TargetFramework451 $testhostFullPackageDir
-    Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore20 $TPB_X86_Runtime false $testhostCore20PackageTempX86Dir
-    Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore10 $TPB_X86_Runtime true $testhostCore10PackageTempX86Dir
-    
-    # Copy the .NET multitarget testhost exes to destination folder (except for net451 which is the default)
-    foreach ($tfm in "net452;net46;net461;net462;net47;net471;net472;net48" -split ";") {
-        Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe" $testhostFullPackageDir\testhost.$tfm.exe -Force 
-        Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.pdb" $testhostFullPackageDir\testhost.$tfm.pdb -Force 
-        Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe.config" $testhostFullPackageDir\testhost.$tfm.exe.config -Force 
-    }
-
-    # Copy the .NET multitarget testhost.x86 exes to destination folder (except for net451 which is the default)
-    foreach ($tfm in "net452;net46;net461;net462;net47;net471;net472;net48" -split ";") {
-        Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe" $testhostFullPackageDir\testhost.$tfm.x86.exe -Force 
-        Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.pdb" $testhostFullPackageDir\testhost.$tfm.x86.pdb -Force 
-        Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe.config" $testhostFullPackageDir\testhost.$tfm.x86.exe.config -Force 
-    }
-
-    # Copy the .NET core x86 and x64 testhost exes from tempPublish to required folder
-    New-Item -ItemType directory -Path $testhostCore20PackageX64Dir -Force | Out-Null
-    Copy-Item $testhostCore20PackageTempX64Dir\testhost* $testhostCore20PackageX64Dir -Force -Recurse
-    Copy-Item $testhostCore20PackageTempX64Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore20PackageX64Dir -Force
-    
-    New-Item -ItemType directory -Path $testhostCore20PackageX86Dir -Force | Out-Null
-    Copy-Item $testhostCore20PackageTempX86Dir\testhost.x86* $testhostCore20PackageX86Dir -Force -Recurse
-    Copy-Item $testhostCore20PackageTempX86Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore20PackageX86Dir -Force
- 
-    New-Item -ItemType directory -Path $testhostCore10PackageX64Dir -Force | Out-Null
-    Copy-Item $testhostCore10PackageTempX64Dir\testhost* $testhostCore10PackageX64Dir -Force -Recurse
-    Copy-Item $testhostCore20PackageTempX64Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore10PackageX64Dir -Force
-
-    New-Item -ItemType directory -Path $testhostCore10PackageX86Dir -Force | Out-Null
-    Copy-Item $testhostCore10PackageTempX86Dir\testhost.x86* $testhostCore10PackageX86Dir -Force -Recurse
-    Copy-Item $testhostCore10PackageTempX86Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore10PackageX86Dir -Force
-    
-    # Copy over the Full CLR built testhost package assemblies to the Core CLR and Full CLR package folder.
-    $coreCLRFull_Dir = "TestHost"
-    $fullDestDir = Join-Path $coreCLR20PackageDir $coreCLRFull_Dir
-    New-Item -ItemType directory -Path $fullDestDir -Force | Out-Null
-    Copy-Item $testhostFullPackageDir\* $fullDestDir -Force -Recurse
-
-    Set-ScriptFailedOnError
-
-    # Copy over the Full CLR built datacollector package assemblies to the Core CLR package folder along with testhost
-    Publish-PackageInternal $dataCollectorProject $TPB_TargetFramework472 $fullDestDir
-    
-    New-Item -ItemType directory -Path $fullCLRPackage451Dir -Force | Out-Null
-    Copy-Item $testhostFullPackageDir\* $fullCLRPackage451Dir -Force -Recurse
-
-    Set-ScriptFailedOnError
-    
-    ################################################################################
-    # Publish Microsoft.TestPlatform.ObjectModel
-
-    # Copy this first because for ObjectModel it puts platform abstractions NS1.3 version
-    # into the output folder (for some reason), and we overwrite it with actual uap10.0 version below
-
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFramework45      = $fullCLRPackage45Dir           # net45
-                $TPB_TargetFramework451     = $fullCLRPackage451Dir          # net451
-                $TPB_TargetFrameworkCore10  = $coreCLR10PackageDir           # netcoreapp1.0
-                $TPB_TargetFrameworkCore20  = $coreCLR20PackageDir           # netcoreapp2.1
-                $TPB_TargetFrameworkNS10    = $netstandard10PackageDir       # netstandard1_0
-                $TPB_TargetFrameworkNS13    = $netstandard13PackageDir       # netstandard1_3
-                $TPB_TargetFrameworkNS20    = $netstandard20PackageDir       # netstandard2_0
-                $TPB_TargetFrameworkUap100  = $uap100PackageDir              # uap10.0
-              }
-    
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFrameworkUap100  = $testhostUapPackageDir         # uap10.0 - testhost
-              }
-
-    ################################################################################
-    # Publish Microsoft.TestPlatform.PlatformAbstractions
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFramework45     = $fullCLRPackage45Dir          # net45
-                $TPB_TargetFramework451    = $fullCLRPackage451Dir         # net451
-                $TPB_TargetFrameworkCore20 = $coreCLR20PackageDir          # netcoreapp2.1
-                $TPB_TargetFrameworkNS10   = $netstandard10PackageDir      # netstandard1_0
-                $TPB_TargetFrameworkNS13   = $netstandard13PackageDir      # netstandard1_3
-                $TPB_TargetFrameworkNS20   = $netstandard20PackageDir      # netstandard2_0
-                $TPB_TargetFrameworkUap100 = $uap100PackageDir             # uap10.0
-              }
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFrameworkUap100 = $testhostUapPackageDir        # uap10.0 - testhost
-              }
-
-    ################################################################################
-    # Publish Microsoft.TestPlatform.CoreUtilities
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CoreUtilities\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFramework45      = $fullCLRPackage45Dir           # net45
-                $TPB_TargetFramework451     = $fullCLRPackage451Dir          # net451
-                $TPB_TargetFrameworkNS10    = $netstandard10PackageDir       # netstandard1_0
-                $TPB_TargetFrameworkNS13    = $netstandard13PackageDir       # netstandard1_3
-                $TPB_TargetFrameworkNS20    = $netstandard20PackageDir       # netstandard2_0
-                $TPB_TargetFrameworkUap100  = $uap100PackageDir              # uap10.0
-              }
-
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CoreUtilities\bin\$TPB_Configuration") `
-              -files @{
-                $TPB_TargetFrameworkUap100  = $testhostUapPackageDir         # uap10.0 - testhost
-              }
-
-    ################################################################################
-    # Publish Microsoft.TestPlatform.AdapterUtilities
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.AdapterUtilities\bin\$TPB_Configuration") `
-            -files @{
-              # "net20"                     = $net20PackageDir               # net20
-                "net45/any"                 = $net45PackageDir               # $net4
-                $TPB_TargetFrameworkNS10    = $netstandard10PackageDir       # netstandard1_0
-                $TPB_TargetFrameworkNS20    = $netstandard20PackageDir       # netstandard2_0
-                $TPB_TargetFrameworkUap100  = $uap100PackageDir              # uap10.0
-            }
-
-    ################################################################################
-    # Publish Microsoft.TestPlatform.CrossPlatEngine
-    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CrossPlatEngine\bin\$TPB_Configuration") `
-            -files @{
-                $TPB_TargetFrameworkNS13    = $netstandard13PackageDir       # netstandard1_3
-            }
-
-    ################################################################################
-    # Publish msdia
-    $testPlatformMsDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
-    $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
-    Copy-Item -Recurse $comComponentsDirectory\* $testhostCore20PackageDir -Force
-    Copy-Item -Recurse $comComponentsDirectory\* $testhostCore10PackageDir -Force
-    Copy-Item -Recurse $comComponentsDirectory\* $testhostFullPackageDir -Force
-    Copy-Item -Recurse $comComponentsDirectory\* $testhostUapPackageDir -Force
-    Copy-Item -Recurse $comComponentsDirectory\* $coreCLR20TestHostPackageDir -Force
-
-    $microsoftInternalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMsDiaVersion\tools\net451"
-    Copy-Item -Recurse $microsoftInternalDiaInterop\* $coreCLR20TestHostPackageDir -Force
-
-    # Copy over the logger assemblies to the Extensions folder.
-    $extensions_Dir = "Extensions"
-    $fullCLRExtensionsDir = Join-Path $fullCLRPackage451Dir $extensions_Dir
-    $coreCLRExtensionsDir = Join-Path $coreCLR20PackageDir $extensions_Dir
-
-    # Create an extensions directory.
-    New-Item -ItemType directory -Path $fullCLRExtensionsDir -Force | Out-Null
-    New-Item -ItemType directory -Path $coreCLRExtensionsDir -Force | Out-Null
-
-    # If there are some dependencies for the logger assemblies, those need to be moved too.
-    # Ideally we should just be publishing the loggers to the Extensions folder.
-    $loggers = @(
-        "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb", 
-        "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb"
-    )
-
-    foreach($file in $loggers) {
-        Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force"
-        Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force
-        
-        Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force"
-        Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force
-    }
-
-    # Move logger resource dlls
-    if($TPB_LocalizedBuild) {
-        Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
-        Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"
-        Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"
-        Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"
-    }
-
-    # Copy Blame Datacollector to Extensions folder.
-    $TPB_TargetFrameworkStandard = "netstandard2.0"
-    $blameDataCollector = Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.Extensions.BlameDataCollector\bin\$TPB_Configuration"
-    $blameDataCollectorNetFull = Join-Path $blameDataCollector $TPB_TargetFramework472
-    $blameDataCollectorNetStandard = Join-Path $blameDataCollector $TPB_TargetFrameworkStandard
-    Copy-Item $blameDataCollectorNetFull\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\Microsoft.TestPlatform.Extensions.BlameDataCollector.pdb $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.exe $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.pdb $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.exe.config $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.x86.exe $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.x86.pdb $fullCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetFull\DumpMinitool.x86.exe.config $fullCLRExtensionsDir -Force
-
-    Copy-Item $blameDataCollectorNetStandard\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\Microsoft.TestPlatform.Extensions.BlameDataCollector.pdb $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.exe $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.pdb $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.exe.config $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.x86.exe $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.x86.pdb $coreCLRExtensionsDir -Force
-    Copy-Item $blameDataCollectorNetStandard\DumpMinitool.x86.exe.config $coreCLRExtensionsDir -Force
-    # we use this to dump processes on netcore
-    Copy-Item $blameDataCollectorNetStandard\Microsoft.Diagnostics.NETCore.Client.dll $coreCLRExtensionsDir -Force
-
-    # $null = New-Item -Force "$fullCLRExtensionsDir\procdump" -ItemType Directory
-    # $null = New-Item -Force "$coreCLRExtensionsDir\procdump" -ItemType Directory
-    # Copy-Item $blameDataCollectorNetFull\procdump.exe $fullCLRExtensionsDir\procdump -Force
-    # Copy-Item $blameDataCollectorNetFull\procdump64.exe $fullCLRExtensionsDir\procdump -Force
-    # Copy-Item $blameDataCollectorNetStandard\procdump.exe $coreCLRExtensionsDir\procdump -Force
-    # Copy-Item $blameDataCollectorNetStandard\procdump64.exe $coreCLRExtensionsDir\procdump -Force
-    # Copy-Item $blameDataCollectorNetStandard\procdump $coreCLRExtensionsDir\procdump -Force
-
-    # Copy blame data collector resource dlls
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $blameDataCollectorNetFull $fullCLRExtensionsDir "Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"
-        Copy-Loc-Files $blameDataCollectorNetStandard $coreCLRExtensionsDir "Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"
-    }
-
-    # Copy Event Log Datacollector to Extensions folder.
-    $eventLogDataCollector = Join-Path $env:TP_ROOT_DIR "src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\bin\$TPB_Configuration"
-    $eventLogDataCollectorNetFull = Join-Path $eventLogDataCollector $TPB_TargetFramework451
-    Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.dll $fullCLRExtensionsDir -Force
-    Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.pdb $fullCLRExtensionsDir -Force
-    Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.dll $coreCLRExtensionsDir -Force
-    Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.pdb $coreCLRExtensionsDir -Force
-
-    # Copy EventLogCollector resource dlls
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $eventLogDataCollectorNetFull $fullCLRExtensionsDir "Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"
-        Copy-Loc-Files $eventLogDataCollectorNetFull $coreCLRExtensionsDir "Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"
-    }
-
-    # Copy Microsoft.VisualStudio.Coverage.IO dlls 
-    $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion
-    $codeCoverageIOPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.io\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkStandard"
-    Copy-Item $codeCoverageIOPackagesDir\Microsoft.VisualStudio.Coverage.IO.dll $coreCLR20PackageDir -Force
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $codeCoverageIOPackagesDir $coreCLR20PackageDir "Microsoft.VisualStudio.Coverage.IO.resources.dll"
-    }
-
-    # If there are some dependencies for the TestHostRuntimeProvider assemblies, those need to be moved too.
-    $runtimeproviders = @("Microsoft.TestPlatform.TestHostRuntimeProvider.dll", "Microsoft.TestPlatform.TestHostRuntimeProvider.pdb")
-    foreach($file in $runtimeproviders) {
-        Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force"
-        Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force
-        
-        Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force"
-        Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force
-    }
-
-    # Move TestHostRuntimeProvider resource dlls
-    if ($TPB_LocalizedBuild) {
-        Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"
-        Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"
-    }
-
-    # Copy dependency of Microsoft.TestPlatform.TestHostRuntimeProvider
-    $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll"
-    Write-Verbose "Copy-Item $newtonsoft $fullCLRPackage451Dir -Force"
-    Copy-Item $newtonsoft $fullCLRPackage451Dir -Force
-
-    $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll"
-    Write-Verbose "Copy-Item $newtonsoft $coreCLR20PackageDir -Force"
-    Copy-Item $newtonsoft $coreCLR20PackageDir -Force
-
-    # Copy .NET Standard CPP Test adapter
-    New-Item "$fullCLRPackage451Dir\TestHost" -ItemType Directory -Force | Out-Null 
-    $fullCLRTestHostDir = "$fullCLRPackage451Dir\TestHost"
-
-    $testPlatformRemoteExternalsVersion = ([xml](Get-Content "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props")).Project.PropertyGroup.TestPlatformRemoteExternalsVersion
-    $testPlatformRemoteExternalsSourceDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Remote\$testPlatformRemoteExternalsVersion\tools\netstandard\Extensions\*"
-    Copy-Item $testPlatformRemoteExternalsSourceDirectory $coreCLR20PackageDir -Force -Recurse
-    Copy-Item $testPlatformRemoteExternalsSourceDirectory $fullCLRTestHostDir -Force -Recurse
-
-    # Copy standalone testhost
-    $standaloneTesthost = Join-Path $env:TP_ROOT_DIR "temp\testhost\*"
-    Copy-Item $standaloneTesthost $coreCLR20PackageDir -Force
-    Copy-Item $testhostCore20PackageDir\testhost.dll $coreCLR20PackageDir -Force
-    Copy-Item $testhostCore20PackageDir\testhost.pdb $coreCLR20PackageDir -Force
-
-    Get-Item "$testhostCore20PackageDir\*" | 
-        Where-Object { $_.Name -notin ("x64", "x86", "win7-x64", "win7-x86", "testhost.deps.json", "testhost.runtimeconfig.json")} | 
-        Copy-Item -Recurse -Destination $fullCLRTestHostDir -Force
-    Copy-Item $standaloneTesthost $fullCLRTestHostDir -Force
-
-    # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently.
-    Copy-PackageItems "Microsoft.TestPlatform.Build"
-
-    # Copy IntelliTrace components.
-    $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
-    $intellitraceSourceDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Intellitrace\$testPlatformExternalsVersion\tools\net451"
-    $intellitraceTargetDirectory = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Intellitrace"
-
-    if (-not (Test-Path $intellitraceTargetDirectory)) {
-        New-Item $intellitraceTargetDirectory -Type Directory -Force | Out-Null
-    }
-
-    Copy-Item -Recurse $intellitraceSourceDirectory\* $intellitraceTargetDirectory -Force
-
-    # Copy IntelliTrace Extensions components.
-    $intellitraceExtensionsSourceDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Intellitrace.Extensions\$testPlatformExternalsVersion\tools\net451"
-
-    if (-not (Test-Path $intellitraceExtensionsSourceDirectory)) {
-        New-Item $intellitraceExtensionsSourceDirectory -Type Directory -Force | Out-Null
-    }
-
-    Copy-Item -Recurse $intellitraceExtensionsSourceDirectory\* $intellitraceTargetDirectory -Force
-
-    # Copy Microsoft.VisualStudio.Telemetry APIs
-    $testPlatformDirectory = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Intellitrace\Common7\IDE\Extensions\TestPlatform"
-    
-    if (-not (Test-Path $testPlatformDirectory)) {
-        New-Item $testPlatformDirectory -Type Directory -Force | Out-Null
-    }
-
-    $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\16.3.58\lib\net45"
-    $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\16.3.23\lib\net45"
-    $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\16.3.23\lib\net45"
-
-    Copy-Item "$visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll" $testPlatformDirectory -Force
-    Copy-Item "$visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll" $testPlatformDirectory -Force
-    Copy-Item "$visualStudioUtilitiesDirectory\Microsoft.VisualStudio.Utilities.Internal.dll" $testPlatformDirectory -Force
-
-    Copy-CodeCoverage-Package-Artifacts
-
-    Write-Log "Publish-Package: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Publish-Tests
-{
-    if($TPB_PublishTests)	
-    {
-        $dotnetExe = Get-DotNetPath
-        Write-Log "Publish-Tests: Started."
-
-        # Adding only Perf project for now
-        $fullCLRTestDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework451"
-        $fullCLRPerfTestAssetDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework451\TestAssets\PerfAssets"
-    
-        $mstest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "MSTestAdapterPerfTestProject"
-        $mstest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\MSTestAdapterPerfTestProject"
-        Publish-PackageInternal $mstest10kPerfProject $TPB_TargetFramework451 $mstest10kPerfProjectDir
-
-        $nunittest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "NUnitAdapterPerfTestProject"
-        $nunittest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\NUnitAdapterPerfTestProject"
-        Publish-PackageInternal $nunittest10kPerfProject $TPB_TargetFramework451 $nunittest10kPerfProjectDir
-
-        $xunittest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "XUnitAdapterPerfTestProject"
-        $xunittest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\XUnitAdapterPerfTestProject"
-        Publish-PackageInternal $xunittest10kPerfProject $TPB_TargetFramework451 $xunittest10kPerfProjectDir
-
-        $testPerfProject = Join-Path $env:TP_ROOT_DIR "test\Microsoft.TestPlatform.PerformanceTests"
-        Publish-PackageInternal $testPerfProject $TPB_TargetFramework451 $fullCLRTestDir
-    }
-}
-
-function Publish-PackageInternal($packagename, $framework, $output)
-{
-    Write-Verbose "$dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild"
-    & $dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
-
-    Set-ScriptFailedOnError
-}
-
-function Publish-PackageWithRuntimeInternal($packagename, $framework, $runtime, $selfcontained, $output)
-{
-    Write-Verbose "$dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --runtime $runtime --output $output -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild"
-    & $dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --runtime $runtime --self-contained $selfcontained --output $output -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
-
-    Set-ScriptFailedOnError
-}
-
-function Copy-Loc-Files($sourceDir, $destinationDir, $dllName)
-{
-    foreach($lang in $language) {
-        $dllToCopy = Join-Path $sourceDir\$lang $dllName
-        $destinationFolder = Join-Path $destinationDir $lang
-        if (-not (Test-Path $destinationFolder)) {
-            New-Item $destinationFolder -Type Directory -Force | Out-Null
-        }
-        Copy-Item $dllToCopy $destinationFolder -Force
-    }
-}
-
-function Move-Loc-Files($sourceDir, $destinationDir, $dllName)
-{
-    foreach($lang in $language) {
-        $dllToCopy = Join-Path $sourceDir\$lang $dllName
-        $destinationFolder = Join-Path $destinationDir $lang
-        if (-not (Test-Path $destinationFolder)) {
-            New-Item $destinationFolder -Type Directory -Force | Out-Null
-        }
-        Move-Item $dllToCopy $destinationFolder -Force
-    }
-}
-
-function Create-VsixPackage
-{
-    Write-Log "Create-VsixPackage: Started."
-    $timer = Start-Timer
-
-    $vsixSourceDir = Join-Path $env:TP_ROOT_DIR "src\package\VSIXProject"
-    $vsixProjectDir = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\VSIX"
-    $packageDir = Get-FullCLRPackageDirectory
-    $extensionsPackageDir = Join-Path $packageDir "Extensions"
-    $testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact"
-    $legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact"
-
-    $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
-    $testPlatformMsDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
-    $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion
-    $interopExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.InteropExternalsVersion
-
-    # Copy Microsoft.VisualStudio.TraceDataCollector to Extensions
-    $traceDataCollectorPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472"
-    Copy-Item $traceDataCollectorPackageDirectory\Microsoft.VisualStudio.TraceDataCollector.dll $extensionsPackageDir -Force
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $traceDataCollectorPackageDirectory $extensionsPackageDir "Microsoft.VisualStudio.TraceDataCollector.resources.dll"
-    }
-	
-	# Copy Microsoft.VisualStudio.Core to Extensions
-    $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    Copy-Item $codeCoverageCorePackagesDir\Microsoft.VisualStudio.Coverage.Core.dll $extensionsPackageDir -Force
-
-    # Copy Microsoft.VisualStudio.Interprocess to Extensions
-    $codeCoverageInterprocessPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.Interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    Copy-Item $codeCoverageInterprocessPackageDirectory\Microsoft.VisualStudio.Coverage.Interprocess.dll $extensionsPackageDir -Force
-
-    # Copy Microsoft.VisualStudio.Instrumentation to Extensions
-    $codeCoverageInstrumentationPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.Instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    Copy-Item $codeCoverageInstrumentationPackageDirectory\Microsoft.VisualStudio.Coverage.Instrumentation.dll $extensionsPackageDir -Force
-    Copy-Item $codeCoverageInstrumentationPackageDirectory\Mono.Cecil.dll $extensionsPackageDir -Force
-    Copy-Item $codeCoverageInstrumentationPackageDirectory\Mono.Cecil.Pdb.dll $extensionsPackageDir -Force
-
-    # Copy Microsoft.VisualStudio.IO to root
-    $codeCoverageIOPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.IO\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework451"
-    Copy-Item $codeCoverageIOPackageDirectory\Microsoft.VisualStudio.Coverage.IO.dll $packageDir -Force
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $codeCoverageIOPackageDirectory $packageDir "Microsoft.VisualStudio.Coverage.IO.resources.dll"
-    }
-
-    # Copy legacy dependencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\tools\net451"
-    Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-    # Copy Microsoft.VisualStudio.ArchitectureTools.PEReader to Extensions
-    Copy-Item $legacyDir\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll $extensionsPackageDir -Force
-
-    # Copy QtAgent Related depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\$testPlatformExternalsVersion\tools\net451"
-    Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-    # Copy Legacy data collectors Related depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools.DataCollectors\$testPlatformExternalsVersion\tools\net451"
-    Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-    # Copy CUIT Related depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.CUIT\$testPlatformExternalsVersion\tools\net451"
-    Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-    # Copy Interop depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Interop\$interopExternalsVersion\lib\net45"
-    Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-    # Copy COM Components and their manifests over
-    $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
-    Copy-Item -Recurse $comComponentsDirectory\* $packageDir -Force
-
-    # Copy Microsoft.Internal.Dia.Interop
-    $internalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMsDiaVersion\tools\net451"
-    Copy-Item -Recurse $internalDiaInterop\* $packageDir -Force
-
-    # Copy COM Components and their manifests over to Extensions Test Impact directory
-    $comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
-    if (-not (Test-Path $testImpactComComponentsDir)) {
-        New-Item $testImpactComComponentsDir -Type Directory -Force | Out-Null
-    }
-    Copy-Item -Recurse $comComponentsDirectoryTIA\* $testImpactComComponentsDir -Force
-
-    if (-not (Test-Path $legacyTestImpactComComponentsDir)) {
-        New-Item $legacyTestImpactComComponentsDir -Type Directory -Force | Out-Null
-    }
-    Copy-Item -Recurse $comComponentsDirectoryTIA\* $legacyTestImpactComComponentsDir -Force
-    
-    Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt") $packageDir -Force
-
-    Write-Verbose "Locating MSBuild install path..."
-    $msbuildPath = Locate-MSBuildPath
-    
-    # Create vsix only when msbuild is installed.
-    if(![string]::IsNullOrEmpty($msbuildPath))
-    {
-        # Copy the vsix project to artifacts directory to modify manifest
-        New-Item $vsixProjectDir -Type Directory -Force
-        Copy-Item -Recurse $vsixSourceDir\* $vsixProjectDir -Force
-
-        # Update version of VSIX
-        Update-VsixVersion $vsixProjectDir
-
-        # Build vsix project to get TestPlatform.vsix
-        Write-Verbose "$msbuildPath $vsixProjectDir\TestPlatform.csproj -p:Configuration=$Configuration"
-        & $msbuildPath "$vsixProjectDir\TestPlatform.csproj" -p:Configuration=$Configuration
-    }
-    else
-    { 
-        throw ".. Create-VsixPackage: Cannot generate vsix as msbuild.exe not found at '$msbuildPath'."
-    }
-
-    Write-Log "Create-VsixPackage: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Create-NugetPackages
-{
-    $timer = Start-Timer
-
-    Write-Log "Create-NugetPackages: Started."
-    $stagingDir = Join-Path $env:TP_OUT_DIR $TPB_Configuration
-    $packageOutputDir = $TPB_PackageOutDir
-    
-    Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "Icon.png") $stagingDir -Force
-
-
-    if (-not (Test-Path $packageOutputDir)) {
-        New-Item $packageOutputDir -type directory -Force
-    }
-
-    $tpNuspecDir = Join-Path $env:TP_PACKAGE_PROJ_DIR "nuspec"
-
-    # Copy over the nuspecs to the staging directory
-    $nuspecFiles = @(
-        "Microsoft.CodeCoverage.nuspec",
-        "Microsoft.NET.Test.Sdk.nuspec",
-        "Microsoft.TestPlatform.AdapterUtilities.nuspec",
-        "Microsoft.TestPlatform.nuspec",
-        "Microsoft.TestPlatform.Portable.nuspec",
-        "TestPlatform.Build.nuspec",
-        "TestPlatform.CLI.nuspec",
-        "TestPlatform.Extensions.TrxLogger.nuspec",
-        "TestPlatform.ObjectModel.nuspec",
-        "TestPlatform.TestHost.nuspec",
-        "TestPlatform.TranslationLayer.nuspec"
-        "TestPlatform.Internal.Uwp.nuspec"
-    )
-
-    $targetFiles = @("Microsoft.CodeCoverage.targets")
-    $propFiles = @("Microsoft.NET.Test.Sdk.props", "Microsoft.CodeCoverage.props")
-    $contentDirs = @("netcoreapp", "netfx")
-
-    # Nuget pack analysis emits warnings if binaries are packaged as content. It is intentional for the below packages.
-    $skipAnalysis = @("TestPlatform.CLI.nuspec")
-    foreach ($item in $nuspecFiles + $targetFiles + $propFiles + $contentDirs) {
-        Copy-Item $tpNuspecDir\$item $stagingDir -Force -Recurse
-    }
-
-    # Copy empty and third patry notice file
-    Copy-Item $tpNuspecDir\"_._" $stagingDir -Force
-    Copy-Item $tpNuspecDir\..\"ThirdPartyNotices.txt" $stagingDir -Force
-    Copy-Item $tpNuspecDir\..\"ThirdPartyNoticesCodeCoverage.txt" $stagingDir -Force
-
-    # Copy licenses folder
-    Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "licenses") $stagingDir -Force -Recurse
-
-    # Copy Uap target, & props
-    $testhostUapPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkUap100")
-    Copy-Item $tpNuspecDir\uap\"Microsoft.TestPlatform.TestHost.Uap.props" $testhostUapPackageDir\Microsoft.TestPlatform.TestHost.props -Force
-    Copy-Item $tpNuspecDir\uap\"Microsoft.TestPlatform.TestHost.Uap.targets" $testhostUapPackageDir\Microsoft.TestPlatform.TestHost.targets -Force
-    
-    $testhostCore20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20")
-    Copy-Item $tpNuspecDir\"Microsoft.TestPlatform.TestHost.NetCore.props" $testhostCore20PackageDir\Microsoft.TestPlatform.TestHost.props -Force
-    
-    $testhostCore10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10")
-    Copy-Item $tpNuspecDir\"Microsoft.TestPlatform.TestHost.NetCore.props" $testhostCore10PackageDir\Microsoft.TestPlatform.TestHost.props -Force
-        
-    # Call nuget pack on these components.
-    $nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe"
-
-    # Pass Newtonsoft.Json version to nuget pack to keep the version consistent across all nuget packages.
-    $JsonNetVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.JsonNetVersion
-
-    # Additional external dependency folders
-    $microsoftFakesVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.MicrosoftFakesVersion
-    $FakesPackageDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\$microsoftFakesVersion\contentFiles"
-
-    $uap100PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkUap100");
-
-    # package them from stagingDir
-    foreach ($file in $nuspecFiles) {
-        $additionalArgs = ""
-        if ($skipAnalysis -contains $file) {
-            $additionalArgs = "-NoPackageAnalysis"
-        }
-
-        if ($file -eq "TestPlatform.Internal.Uwp.nuspec") {
-            # this directory is mostly the same as the testhost10 dir, but has less libraries
-            # and does not have netstandard2.0 versions, so I don't copy them by mistake
-            $uap10Nuget = $uap100PackageDir
-        }
-        else { 
-            $uap10Nuget = $testhostUapPackageDir
-        }
-
-        Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version $additionalArgs"
-        & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20`;FakesPackageDir=$FakesPackageDir`;NetStandard10Framework=$TPB_TargetFrameworkNS10`;NetStandard13Framework=$TPB_TargetFrameworkNS13`;NetStandard20Framework=$TPB_TargetFrameworkNS20`;Uap10Framework=$uap10Nuget`;BranchName=$TPB_BRANCH`;CommitId=$TPB_COMMIT $additionalArgs
-
-        Set-ScriptFailedOnError
-    }
-
-    # Verifies that expected number of files gets shipped in nuget packages.
-    # Few nuspec uses wildcard characters.
-    Verify-Nuget-Packages $packageOutputDir $TPB_Version
-
-    Write-Log "Create-NugetPackages: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Copy-CodeCoverage-Package-Artifacts
-{
-    # Copy TraceDataCollector to Microsoft.CodeCoverage folder.
-    $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion
-    $traceDataCollectorPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.tracedatacollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\"
-    $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    $codeCoverageInterprocessPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    $codeCoverageInstrumentationPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
-    $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu"
-    $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine"
-
-    $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\")
-
-    New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir -Force | Out-Null
-
-    Copy-Item $traceDataCollectorPackagesDir\Microsoft.VisualStudio.TraceDataCollector.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $traceDataCollectorPackagesDir\Microsoft.VisualStudio.TraceDataCollector.pdb $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $codeCoverageCorePackagesDir\Microsoft.VisualStudio.Coverage.Core.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $codeCoverageInterprocessPackagesDir\Microsoft.VisualStudio.Coverage.Interprocess.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $codeCoverageInstrumentationPackagesDir\Microsoft.VisualStudio.Coverage.Instrumentation.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.Pdb.dll $microsoftCodeCoveragePackageDir -Force
-    Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse
-    Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse
-    Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse
-
-    New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\ubuntu\ -Force | Out-Null
-    Copy-Item $codeCoverageImUbuntuPackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\ubuntu\ -Force -Recurse
-    New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\alpine\ -Force | Out-Null
-    Copy-Item $codeCoverageImAlpinePackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\alpine\ -Force -Recurse
-
-    # Copy TraceDataCollector resource dlls
-    if($TPB_LocalizedBuild) {
-        Copy-Loc-Files $traceDataCollectorPackagesDir $microsoftCodeCoveragePackageDir "Microsoft.VisualStudio.TraceDataCollector.resources.dll"
-    }
-}
-
-function Copy-PackageItems($packageName)
-{
-    # Packages published separately are copied into their own artifacts directory
-    # E.g. src\Microsoft.TestPlatform.ObjectModel\bin\Debug\net451\* is copied
-    # to artifacts\Debug\Microsoft.TestPlatform.ObjectModel\net451
-    $binariesDirectory = [System.IO.Path]::Combine($env:TP_ROOT_DIR, "src", "$packageName", "bin", "$TPB_Configuration")
-    $binariesDirectory = $(Join-Path $binariesDirectory "*")
-    $publishDirectory = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$packageName")
-    Write-Log "Copy-PackageItems: Package: $packageName"
-    Write-Verbose "Create $publishDirectory"
-    New-Item -ItemType directory -Path $publishDirectory -Force | Out-Null
-
-    Write-Log "Copy binaries for package '$packageName' from '$binariesDirectory' to '$publishDirectory'"
-    Copy-Item -Path $binariesDirectory -Destination $publishDirectory -Recurse -Force
-}
-
-function Update-LocalizedResources
-{
-    $timer = Start-Timer
-    $dotnetExe = Get-DotNetPath
-
-    Write-Log ".. Update-LocalizedResources: Started: $TPB_Solution"
-    if (!$TPB_LocalizedBuild) {
-        Write-Log ".. Update-LocalizedResources: Skipped based on user setting."
-        return
-    }
-
-    $localizationProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "Localize\Localize.proj"
-    Write-Verbose "& $dotnetExe msbuild $localizationProject -m -nologo -v:minimal -t:Localize -p:LocalizeResources=true -nodeReuse:False"
-    & $dotnetExe msbuild $localizationProject -m -nologo -v:minimal -t:Localize -p:LocalizeResources=true -nodeReuse:False
-
-    Set-ScriptFailedOnError
-
-    Write-Log ".. Update-LocalizedResources: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-#
-# Helper functions
-#
-function Get-DotNetPath
-{
-    $dotnetPath = Join-Path $env:TP_TOOLS_DIR "dotnet\dotnet.exe"
-    if (-not (Test-Path $dotnetPath)) {
-        Write-Error "Dotnet.exe not found at $dotnetPath. Did the dotnet cli installation succeed?"
-    }
-
-    return $dotnetPath
-}
-
-function Get-FullCLRPackageDirectory
-{
-    return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFramework451\$TPB_TargetRuntime")
-}
-
-function Get-FullCLRPackageDirectory45
-{
-    return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFramework45\$TPB_TargetRuntime")
-}
-
-function Get-CoreCLR20PackageDirectory
-{
-    return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20")
-}
-
-function Get-CoreCLR10PackageDirectory
-{
-    return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore10")
-}
-
-function Get-CoreCLR20TestHostPackageDirectory
-{
-    return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20\TestHost")
-}
-
-function Locate-MSBuildPath 
-{
-    $vsInstallPath = Locate-VsInstallPath
-    $msbuildPath = Get-ChildItem (Join-Path -path $vsInstallPath -childPath "MSBuild\*\Bin\MSBuild.exe")
-
-    Write-Verbose "found msbuild : '$($msbuildPath -join "','")'"
-    $msBuild = $msBuildPath | Select-Object -First 1
-    Write-Verbose "msbuildPath is : '$($msbuildPath -join "','")'"
-    if ($null -eq $msBuild -or 0 -eq $msBuild.Count) { 
-        throw "MSBuild not found."
-    }
-
-    return $msBuild.FullName
-}
-
-function Locate-VsInstallPath
-{
-   $vswhere = Join-Path -path $env:TP_PACKAGES_DIR -ChildPath "vswhere\$env:VSWHERE_VERSION\tools\vswhere.exe"
-   if (!(Test-Path -path $vswhere)) {
-       throw "Unable to locate vswhere in path '$vswhere'."
-   }
-
-   Write-Verbose "Using '$vswhere' to locate VS installation path."
-
-   $requiredPackageIds = @("Microsoft.Component.MSBuild", "Microsoft.Net.Component.4.6.TargetingPack", "Microsoft.VisualStudio.Component.VSSDK")
-   Write-Verbose "VSInstallation requirements : $requiredPackageIds"
-
-   Try
-   {
-       if ($TPB_CIBuild) {
-           Write-Verbose "VSWhere command line: $vswhere -version '(15.0' -products * -requires $requiredPackageIds -property installationPath"
-           $vsInstallPath = & $vswhere -version '(15.0' -products * -requires $requiredPackageIds -property installationPath
-       }
-       else {
-           # Allow using pre release versions of VS for dev builds
-           Write-Verbose "VSWhere command line: $vswhere -version '(15.0' -prerelease -products * -requires $requiredPackageIds -property installationPath"
-           $vsInstallPath = & $vswhere -version '(15.0' -prerelease -products * -requires $requiredPackageIds -property installationPath
-       }
-   }
-   Catch [System.Management.Automation.MethodInvocationException]
-   {
-       throw "Failed to find VS installation with requirements: $requiredPackageIds"
-   }
-
-   if ($null -eq $vsInstallPath -or 0 -eq @($vsInstallPath).Count) {
-        throw "Failed to find VS installation with requirements: $requiredPackageIds"
-   }
-   else { 
-        Write-Verbose "Found VS installation with requirements '$($requiredPackageIds -join "','")'  : '$($vsInstallPath -join "','")'."
-   }
-
-   $vsPath = $vsInstallPath | Select-Object -First 1
-   Write-Verbose "VSInstallPath is : $vsPath"
-   return $vsPath
-}
-
-function Update-VsixVersion($vsixProjectDir)
-{
-    Write-Log "Update-VsixVersion: Started."
-
-    $packageDir = Get-FullCLRPackageDirectory
-    $vsixVersion = $Version
-
-    # Build number comes in the form 20170111-01(yyyymmdd-buildNoOfThatDay)
-    # So Version of the vsix will be 15.1.0.2017011101
-    $vsixVersionSuffix = $BuildNumber.Split("-");
-    if($vsixVersionSuffix.Length -ige 2) {
-        $vsixVersion = "$vsixVersion.$($vsixVersionSuffix[0])$($vsixVersionSuffix[1])"
-    }
-
-    $manifestContentWithVersion = Get-Content "$vsixProjectDir\source.extension.vsixmanifest" -raw | % {$_.ToString().Replace("`$version`$", "$vsixVersion") } 
-    Set-Content -path "$vsixProjectDir\source.extension.vsixmanifest" -value $manifestContentWithVersion
-
-    Write-Log "Update-VsixVersion: Completed."
-}
-
-function Generate-Manifest ($PackageFolder)
-{
-    $packagesFolderName =  [System.IO.Path]::GetFileName($PackageFolder)
-    Write-Log "Generate-Manifest ($packagesFolderName): Started."
-
-    $generateManifestPath = Join-Path $env:TP_ROOT_DIR "scripts\build\GenerateManifest.proj"
-    $msbuildPath = Locate-MSBuildPath
-
-    & $msbuildPath $generateManifestPath /t:PublishToBuildAssetRegistry /p:PackagesToPublishPattern=$PackageFolder\*.nupkg `
-                   /p:BUILD_BUILDNUMBER=$BuildNumber `
-                   /p:PackagesPath="$PackageFolder\" `
-                   /p:Configuration=$TPB_Configuration `
-                   /bl:"$env:TP_OUT_DIR\log\$Configuration\manifest-generation-$packagesFolderName.binlog"
-
-    Write-Log "Generate-Manifest ($packagesFolderName): Completed."
-}
-
-function Build-SpecificProjects
-{
-    Write-Log "Build-SpecificProjects: Started for pattern: $ProjectNamePatterns"
-    # FrameworksAndOutDirs format ("<target_framework>", "<output_dir>").
-    $FrameworksAndOutDirs = ( 
-        ("net451", "net451\win7-x64"), 
-        ("netstandard1.0", "netstandard1.0"), 
-        ("netstandard1.3", "netstandard1.3"), 
-        ("netstandard2.0", "netcoreapp2.1"), 
-        ("netcoreapp2.1", "netcoreapp2.1")
-    )
-    
-    $dotnetPath = Get-DotNetPath
-
-    # Get projects to build.
-    Get-ChildItem -Recurse -Path $env:TP_ROOT_DIR -Include *.csproj | ForEach-Object {
-        foreach ($ProjectNamePattern in $ProjectNamePatterns) {
-            if($_.FullName -match  $ProjectNamePattern) {
-                $ProjectsToBuild += ,"$_"
-            }
-        }
-    }
-
-    if( $ProjectsToBuild -eq $null){
-        Write-Error "No csproj name match for given pattern: $ProjectNamePatterns"
-    }
-
-    # Build Projects.
-    foreach($ProjectToBuild in $ProjectsToBuild) {
-        Write-Log "Building Project $ProjectToBuild"
-        # Restore and Build
-        $output = & $dotnetPath restore $ProjectToBuild
-        PrintAndExit-OnError $output
-        $output = & $dotnetPath build $ProjectToBuild
-        PrintAndExit-OnError $output
-
-        if (-Not ($ProjectToBuild.FullName -contains "$($env:TP_ROOT_DIR)$([IO.Path]::DirectorySeparatorChar)src")) {
-            # Don't copy artifacts for non src folders.
-            continue;
-        }
-
-        # Copy artifacts
-        $ProjectDir = [System.IO.Path]::GetDirectoryName($ProjectToBuild)
-        foreach($FrameworkAndOutDir in $FrameworksAndOutDirs) {
-            $fromDir = $([System.IO.Path]::Combine($ProjectDir, "bin", $TPB_Configuration, $FrameworkAndOutDir[0]))
-            $toDir = $([System.IO.Path]::Combine($env:TP_OUT_DIR, $TPB_Configuration, $FrameworkAndOutDir[1]))
-            if ( Test-Path $fromDir){
-                Write-Log "Copying artifacts from $fromDir to $toDir"
-                Get-ChildItem $fromDir | ForEach-Object {
-                    if(-not ($_.PSIsContainer)) {
-                        copy $_.FullName $toDir
-                    }
-                }
-            }
-        }
-    }
-}
-
-if ($ProjectNamePatterns.Count -ne 0)
-{
-    # Build Specific projects.
-    Build-SpecificProjects
-    Exit
-}
-
-# Execute build
-$timer = Start-Timer
-Write-Log "Build started: args = '$args'"
-Write-Log "Test platform environment variables: "
-Get-ChildItem env: | Where-Object -FilterScript { $_.Name.StartsWith("TP_") } | Format-Table
-Write-Log "Test platform build variables: "
-Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPB_") } | Format-Table
-
-if ($Force -or $Steps -contains "InstallDotnet") {
-    Install-DotNetCli
-}
-
-if ($Force -or $Steps -contains "Restore") {
-    Clear-Package
-    Restore-Package    
-}
-
-if ($Force -or $Steps -contains "UpdateLocalization") {
-    Update-LocalizedResources
-}
-
-if ($Force -or $Steps -contains "Build") {
-    Invoke-Build
-}
-
-if ($Force -or $Steps -contains "Publish") {
-    Publish-Package
-    Create-VsixPackage
-    Create-NugetPackages
-}
-
-if ($Force -or $Steps -contains "Publish" -or $Steps -contains "Manifest") {
-    Generate-Manifest -PackageFolder $TPB_PackageOutDir
-    if (Test-Path $TPB_SourceBuildPackageOutDir) 
-    {
-        Generate-Manifest -PackageFolder $TPB_SourceBuildPackageOutDir
-    }
-
-    Copy-PackageIntoStaticDirectory
-}
-
-if ($Force -or $Steps -contains "PrepareAcceptanceTests") {
-    Publish-PatchedDotnet
-    Invoke-TestAssetsBuild
-    Publish-Tests
-}
- 
-Write-Log "Build complete. {$(Get-ElapsedTime($timer))}"
-if ($Script:ScriptFailed) { Exit 1 } else { Exit 0 }
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 2cc0cf4c09..0000000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,555 +0,0 @@
-#!/usr/bin/env/ bash
-# Copyright (c) Microsoft. All rights reserved.
-# Build script for Test Platform.
-
-set -o nounset  # Fail on uninitialized variables.
-set -e          # Fail on non-zero exit code.
-
-# ANSI color codes
-GREEN='\033[0;32m'
-RED='\033[0;31m'
-YELLOW='\033[0;33m'
-NOCOLOR='\033[0m'
-
-#
-# Parse options
-#
-CONFIGURATION="Debug"
-TARGET_RUNTIME="ubuntu.18.04-x64"
-VERSION="" # Will set this later by reading TestPlatform.Settings.targets file.
-VERSION_SUFFIX="dev"
-FAIL_FAST=false
-DISABLE_LOCALIZED_BUILD=false
-CI_BUILD=false
-VERBOSE=false
-PROJECT_NAME_PATTERNS=
-
-#
-# Source build repo api
-# See https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md
-#
-DOTNET_BUILD_FROM_SOURCE=0
-DOTNET_CORE_SDK_DIR=
-DOTNET_BUILD_TOOLS_DIR=
-
-while [ $# -gt 0 ]; do
-    lowerI="$(echo ${1:-} | awk '{print tolower($0)}')"
-    case $lowerI in
-        -h | --help)
-            usage
-            exit
-            ;;
-        -c)
-            CONFIGURATION=$2
-            shift
-            ;;
-        -r)
-            TARGET_RUNTIME=$2
-            shift
-            ;;
-        -v)
-            VERSION=$2
-            shift
-            ;;
-        -vs)
-            VERSION_SUFFIX=$2
-            shift
-            ;;
-        -noloc)
-            DISABLE_LOCALIZED_BUILD=$2
-            shift
-            ;;
-        -ci)
-            CI_BUILD=$2
-            shift
-            ;;
-        -p)
-            PROJECT_NAME_PATTERNS=$2
-            shift
-            ;;
-        -dotnetbuildfromsource)
-            DOTNET_BUILD_FROM_SOURCE=1
-            ;;
-        -dotnetcoresdkdir)
-            DOTNET_CORE_SDK_DIR=$2
-            shift
-            ;;
-        -dotnetbuildtoolsdir)
-            DOTNET_BUILD_TOOLS_DIR=$2
-            shift
-            ;;
-        -verbose)
-            VERBOSE=true
-            ;;
-        *)
-            break
-            ;;
-   esac
-   shift
-done
-
-#
-# Variables
-#
-TP_ROOT_DIR=$(cd "$(dirname "$0")"; pwd -P)
-TP_TOOLS_DIR="$TP_ROOT_DIR/tools"
-TP_DOTNET_DIR="${DOTNET_CORE_SDK_DIR:-${TP_TOOLS_DIR}/dotnet-linux}"
-TP_PACKAGES_DIR="${NUGET_PACKAGES:-${TP_ROOT_DIR}/packages}"
-TP_OUT_DIR="$TP_ROOT_DIR/artifacts"
-TP_PACKAGE_PROJ_DIR="$TP_ROOT_DIR/src/package/package"
-TP_PACKAGE_NUSPEC_DIR="$TP_ROOT_DIR/src/package/nuspec"
-TP_SRC_DIR="$TP_ROOT_DIR/src"
-TP_USE_REPO_API=$DOTNET_BUILD_FROM_SOURCE
-
-global_json_file="$TP_ROOT_DIR/global.json"
-
-
-# Set VERSION from scripts/build/TestPlatform.Settings.targets
-VERSION=$(test -z $VERSION && grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/TestPlatform.Settings.targets | head -1 | cut -d'>' -f2 | cut -d'<' -f1 || echo $VERSION)
-
-function ReadGlobalVersion {
-  local key=$1
-
-  if command -v jq &> /dev/null; then
-    _ReadGlobalVersion="$(jq -r ".[] | select(has(\"$key\")) | .\"$key\"" "$global_json_file")"
-  elif [[ "$(cat "$global_json_file")" =~ \"$key\"[[:space:]\:]*\"([^\"]+) ]]; then
-    _ReadGlobalVersion=${BASH_REMATCH[1]}
-  fi
-
-  if [[ -z "$_ReadGlobalVersion" ]]; then
-    Write-PipelineTelemetryError -category 'Build' "Error: Cannot find \"$key\" in $global_json_file"
-    ExitWithExitCode 1
-  fi
-}
-
-#
-# Dotnet configuration
-#
-# Disable first run since we want to control all package sources 
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-# Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
-export NUGET_PACKAGES=$TP_PACKAGES_DIR
-
-ReadGlobalVersion "dotnet"
-DOTNET_CLI_VERSION=$_ReadGlobalVersion
-
-#DOTNET_RUNTIME_VERSION="LATEST"
-
-#
-# Build configuration
-#
-TPB_Solution="TestPlatform.sln"
-TPB_Build_From_Source_Solution="TestPlatform_BuildFromSource.sln"
-TPB_TargetFramework="net451"
-TPB_TargetFrameworkCore="netcoreapp2.1"
-TPB_Configuration=$CONFIGURATION
-TPB_TargetRuntime=$TARGET_RUNTIME
-TPB_Version=$(test -z $VERSION_SUFFIX && echo $VERSION || echo $VERSION-$VERSION_SUFFIX)
-TPB_CIBuild=$CI_BUILD
-TPB_LocalizedBuild=$DISABLE_LOCALIZED_BUILD
-TPB_Verbose=$VERBOSE
-TPB_EXTERNALS_VERSION=$(grep TestPlatformExternalsVersion $TP_ROOT_DIR/scripts/build/TestPlatform.Dependencies.props | head -1 | cut -d'>' -f2 | cut -d'<' -f1 || echo $VERSION)
-TPB_CC_EXTERNALS_VERSION=$(grep MicrosoftInternalCodeCoverageVersion $TP_ROOT_DIR/eng/Versions.props | head -1 | cut -d'>' -f2 | cut -d'<' -f1 || echo $VERSION)
-
-if [[ $TP_USE_REPO_API = 1 ]]; then
-    TPB_TargetFrameworkCore="net6.0"
-fi
-
-#
-# Logging
-#
-log()
-{
-    printf "${GREEN}... $@${NOCOLOR}\n"
-}
-
-verbose()
-{
-    if [ ${TPB_Verbose-false} ]
-    then
-        printf "${YELLOW}... $@${NOCOLOR}\n" >&2
-    fi
-}
-
-error()
-{
-    printf "${RED}... $@${NOCOLOR}\n" >&2
-}
-
-function usage()
-{
-    log " Usage: ./build.sh [Options]"
-    log ""
-    log " -c <CONFIGURATION>                Build the specified Configuration (Debug or Release, default: Debug)"
-    log " -r <TARGET_RUNTIME>               Build for the specified runtime moniker (ubuntu.14.04-x64)"
-    log " -v <VERSION>                      Version number for the package generated (15.0.0)"
-    log " -vs <VERSION_SUFFIX>              Version suffix for package generated (dev)"
-    log " -noloc <DISABLE_LOCALIZED_BUILD>  Disable Localized builds (true,false)"
-    log " -ci <CI_BUILD>                    Declares if this is a CI_BUILD or not"
-    log " -p <PROJECT_NAME_PATTERNS>        Pattern to build specific projects"
-    log " -verbose <VERBOSE>                Enable verbose logging (true, false)"
-}
-
-#
-# Build steps
-#
-function install_cli()
-{
-    if [[ $TP_USE_REPO_API = 0 ]]; then
-        # Skip download of dotnet toolset if REPO API is enabled
-        local failed=false
-        local install_script="$TP_TOOLS_DIR/dotnet-install.sh"
-        local remote_path="https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh"
-
-        log "Installing dotnet cli..."
-        local start=$SECONDS
-
-        # Install the latest version of dotnet-cli
-        curl --retry 10 -sSL --create-dirs -o $install_script $remote_path || failed=true
-        if [ "$failed" = true ]; then
-            error "Failed to download dotnet-install.sh script."
-            return 1
-        fi
-        chmod u+x $install_script
-        # Get netcoreapp1.1 shared components
-        $install_script  --runtime dotnet --version "2.1.0" --channel "release/2.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64
-        $install_script  --runtime dotnet --version "3.1.0" --channel "release/3.1.0" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64
-        $install_script  --runtime dotnet --version "5.0.1" --channel "release/5.0.1" --install-dir "$TP_DOTNET_DIR" --no-path --architecture x64
-
-        log "install_cli: Get the latest dotnet cli toolset..."
-        $install_script --install-dir "$TP_DOTNET_DIR" --no-path --channel "main" --version $DOTNET_CLI_VERSION
-
-
-        log " ---- dotnet x64"
-        "$TP_DOTNET_DIR/dotnet" --info
-    fi
-
-    local dotnet_path=$(_get_dotnet_path)
-    if [[ ! -e $dotnet_path ]]; then
-        log "dotnet not found at $dotnet_path. Did the dotnet cli installation succeed?"
-        return 1
-    fi
-
-    log "install_cli: Complete. Elapsed $(( SECONDS - start ))s."
-    return 0
-}
-
-function restore_package()
-{
-    local failed=false
-    local dotnet=$(_get_dotnet_path)
-
-    log "restore_package: Start restoring packages to $TP_PACKAGES_DIR."
-    local start=$SECONDS
-
-    if [[ $TP_USE_REPO_API = 0 ]]; then
-        log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external.csproj"
-        $dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version || failed=true
-    else
-        log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external_BuildFromSource.csproj"
-        $dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj /bl:restore_external.binlog --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version -p:DotNetBuildFromSource=true || failed=true
-    fi
-
-    if [ "$failed" = true ]; then
-        error "Failed to restore packages."
-        return 2
-    fi
-
-    log "restore_package: Complete. Elapsed $(( SECONDS - start ))s."
-}
-
-function invoke_build()
-{
-    local failed=false
-    local dotnet=$(_get_dotnet_path)
-
-    log "invoke_build: Start build."
-    local start=$SECONDS
-    log ".. .. Build: Source: $TPB_Solution"
-    
-    # Workaround for https://github.com/dotnet/sdk/issues/335
-    export FrameworkPathOverride=$TP_PACKAGES_DIR/microsoft.targetingpack.netframework.v4.7.2/1.0.0/lib/net472/
-    if [ -z "$PROJECT_NAME_PATTERNS" ]
-    then
-        if [[ $TP_USE_REPO_API = 0 ]]; then
-            $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:TestPlatform.binlog || failed=true
-        else
-            $dotnet build $TPB_Build_From_Source_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true -bl:TestPlatform.binlog || failed=true
-       fi
-    else
-        find . -name "$PROJECT_NAME_PATTERNS" | xargs -L 1 $dotnet build --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
-    fi
-
-    log ".. .. Build: Complete."
-    if [ "$failed" = true ]; then
-        error "Failed to build solution."
-        return 2
-    fi
-
-    log "invoke_build: Complete. Elapsed $(( SECONDS - start ))s."
-}
-
-function publish_package()
-{
-    local failed=false
-    local dotnet=$(_get_dotnet_path)
-
-    log "publish_package: Started."
-    local start=$SECONDS
-    
-    local packageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFramework/$TPB_TargetRuntime
-    local coreCLRPackageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFrameworkCore
-    local frameworkPackageDirMap=( \
-        $TPB_TargetFrameworkCore:$coreCLRPackageDir
-    )
-
-    if [[ $TP_USE_REPO_API = 0 ]]; then
-       frameworkPackageDirMap+=( \
-           $TPB_TargetFramework:$packageDir
-       )
-    fi
-
-    for fxpkg in "${frameworkPackageDirMap[@]}" ;
-    do
-        local framework="${fxpkg%%:*}"
-        local packageDir="${fxpkg##*:}"
-        local projects=( \
-            $TP_ROOT_DIR/src/package/package/package.csproj \
-            $TP_ROOT_DIR/src/vstest.console/vstest.console.csproj \
-            $TP_ROOT_DIR/src/datacollector/datacollector.csproj \
-            $TP_ROOT_DIR/src/testhost/testhost.csproj \
-            $TP_ROOT_DIR/src/testhost.x86/testhost.x86.csproj
-        )
-
-        log "Package: Publish projects for $framework"
-        for project in "${projects[@]}" ;
-        do
-            if [[ $TP_USE_REPO_API = 0 ]]; then
-                log ".. Package: Publish $project"
-                $dotnet publish $project /bl:publish_$project.binlog --configuration $TPB_Configuration --framework $framework --output $packageDir -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
-            else
-                log ".. Package: Publish $project (Source Build)"
-                $dotnet publish $project /bl:publish_$project.binlog --configuration $TPB_Configuration --framework $framework --output $packageDir -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true
-            fi
-        done
-
-        # Copy TestHost for desktop targets
-        local testhost=$packageDir/TestHost
-        mkdir -p $testhost
-
-        if [[ $TP_USE_REPO_API = 0 ]]; then
-            cp -r src/testhost/bin/$TPB_Configuration/net451/win7-x64/* $testhost
-            cp -r src/testhost.x86/bin/$TPB_Configuration/net451/win7-x86/* $testhost
-        else
-            cp -r src/testhost/bin/$TPB_Configuration/net6.0/* $testhost
-            cp -r src/testhost.x86/bin/$TPB_Configuration/net6.0/* $testhost
-        fi
-
-        # Copy over the logger assemblies to the Extensions folder.
-        local extensionsDir="$packageDir/Extensions"
-
-        if [[ $TP_USE_REPO_API = 1 ]]; then
-            log ".. Package: mv (Source Build)"
-            local current_tfn="net6.0"
-        else
-            log ".. Package: mv"
-            local current_tfn="netstandard2.0"
-        fi
-
-        # Create an extensions directory.
-        mkdir -p $extensionsDir
-
-        #*************************************************************************************************************#
-        # Note Note: If there are some dependencies for the logger assemblies, those need to be moved too. 
-        # Ideally we should just be publishing the loggers to the Extensions folder.
-        loggers=( \
-            "Microsoft.TestPlatform.Extensions.TrxLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" \
-            "Microsoft.TestPlatform.Extensions.TrxLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb" \
-            "Microsoft.TestPlatform.Extensions.HtmlLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" \
-            "Microsoft.TestPlatform.Extensions.HtmlLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb" 
-        )
-
-        for i in ${loggers[@]}; do
-            if [[ $TP_USE_REPO_API = 1 ]]; then
-                log ".. Package: ${i} (Source Build)"
-            else
-                log ".. Package: ${i}"
-            fi
-            mv "$TP_ROOT_DIR/src/${i}" $extensionsDir
-        done
-        # TODO: move loc files too
-        #*************************************************************************************************************#
-
-        #*************************************************************************************************************#
-        #
-        blame=( \
-            "Microsoft.TestPlatform.Extensions.BlameDataCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" \
-            "Microsoft.TestPlatform.Extensions.BlameDataCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.BlameDataCollector.pdb" \
-            "DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.EventLogCollector.dll" \
-            "DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.EventLogCollector.pdb"
-        )
-        
-        for i in ${blame[@]}; do
-            if [[ $TP_USE_REPO_API = 1 ]]; then
-                log ".. Package: ${i} (Source Build)"
-            else
-                log ".. Package: ${i}"
-            fi
-            mv "$TP_ROOT_DIR/src/${i}" $extensionsDir
-        done
-        # TODO: move loc files too
-        #*************************************************************************************************************#
-        
-        #*************************************************************************************************************#
-        # Note Note: If there are some dependencies for the TestHostRuntimeProvider assemblies, those need to be moved too.
-        runtimeproviders=( \
-            "Microsoft.TestPlatform.TestHostProvider/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.TestHostRuntimeProvider.dll" \
-            "Microsoft.TestPlatform.TestHostProvider/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.TestHostRuntimeProvider.pdb"
-        )
-        
-        for i in ${runtimeproviders[@]}; do
-            if [[ $TP_USE_REPO_API = 1 ]]; then
-                log ".. Package: ${i} (Source Build)"
-            else
-                log ".. Package: ${i}"
-            fi
-            mv "$TP_ROOT_DIR/src/${i}" $extensionsDir
-        done
-        # TODO: move loc files too
-        #*************************************************************************************************************#
-
-        #*************************************************************************************************************#
-        externals=( \
-            # "microsoft.internal.dia/$TPB_EXTERNALS_VERSION/tools/net451"         \ # no linux support (cp to $testhost)
-            # "microsoft.internal.dia.interop/$TPB_EXTERNALS_VERSION/tools/net451" \ # no linux support (cp to $testhost)
-            "microsoft.visualstudio.coverage.io/$TPB_CC_EXTERNALS_VERSION/lib/netstandard2.0/"
-        )
-        
-        for i in ${externals[@]}; do
-            if [[ $TP_USE_REPO_API = 1 ]]; then
-                log ".. Package: ${i} (Source Build)"
-            else
-                log ".. Package: ${i}"
-            fi
-            cp -r "${TP_PACKAGES_DIR}${i}"** "$packageDir"
-        done
-        #*************************************************************************************************************#
-
-        newtonsoft=$TP_PACKAGES_DIR/newtonsoft.json/9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll
-        cp $newtonsoft $packageDir
-    done
-
-    # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently.
-    packageName="Microsoft.TestPlatform.Build"
-    binariesDirectory="src/$packageName/bin/$TPB_Configuration/**"
-    publishDirectory="$TP_OUT_DIR/$TPB_Configuration/$packageName"
-    mkdir -p $publishDirectory
-    cp -r $binariesDirectory $publishDirectory
-
-    #*************************************************************************************************************#
-    #
-    assemblies=( \
-        "Microsoft.TestPlatform.PlatformAbstractions/bin/$TPB_Configuration/$current_tfn" \
-        "Microsoft.TestPlatform.ObjectModel/bin/$TPB_Configuration/$current_tfn" 
-    )
-    
-    for i in ${assemblies[@]}; do
-        if [[ $TP_USE_REPO_API = 1 ]]; then
-            log ".. Package: ${i} (Source Build)"
-        else
-            log ".. Package: ${i}"
-        fi
-        cp -r "$TP_ROOT_DIR/src/${i}" $TP_OUT_DIR/$TPB_Configuration
-    done
-    # TODO: move loc files too
-    #*************************************************************************************************************#
-    
-    log "publish_package: Complete. Elapsed $(( SECONDS - start ))s."
-}
-
-function create_package()
-{
-    local failed=false
-    local dotnet=$(_get_dotnet_path)
-
-    local start=$SECONDS
-    log "Create-NugetPackages: Started."
-    stagingDir="$TP_OUT_DIR/$TPB_Configuration"
-
-    if [[ $TP_USE_REPO_API = 0 ]]; then
-        packageOutputDir="$TP_OUT_DIR/$TPB_Configuration/packages"
-    else
-        packageOutputDir="$TP_OUT_DIR/packages/$TPB_Configuration"
-    fi
-
-    mkdir -p $packageOutputDir
-
-    nuspecFiles=("TestPlatform.TranslationLayer.nuspec" "TestPlatform.ObjectModel.nuspec" "TestPlatform.ObjectModel.nuspec" "TestPlatform.TestHost.nuspec"\
-        "Microsoft.TestPlatform.nuspec" "Microsoft.TestPlatform.Portable.nuspec" "TestPlatform.CLI.nuspec" "TestPlatform.Build.nuspec" "Microsoft.NET.Test.Sdk.nuspec"\
-        "Microsoft.CodeCoverage.nuspec" "Microsoft.TestPlatform.AdapterUtilities.nuspec" "TestPlatform.Extensions.TrxLogger.nuspec")
-    projectFiles=("Microsoft.TestPlatform.CLI.csproj" "Microsoft.TestPlatform.Build.csproj")
-    binDir="$TP_ROOT_DIR/bin/packages"
-
-    for i in ${nuspecFiles[@]}; do
-        cp $TP_PACKAGE_NUSPEC_DIR/${i} $stagingDir
-    done
-    for i in ${projectFiles[@]}; do
-        cp $TP_PACKAGE_NUSPEC_DIR/${i} $stagingDir
-    done
-
-    # Copy and rename props file.
-    cp "$TP_PACKAGE_NUSPEC_DIR/Microsoft.NET.Test.Sdk.props" $stagingDir
-
-    # Copy over empty and third patry notice file
-    cp "$TP_PACKAGE_NUSPEC_DIR/_._" $stagingDir
-    cp "$TP_PACKAGE_NUSPEC_DIR/../ThirdPartyNotices.txt" $stagingDir
-    cp "$TP_PACKAGE_NUSPEC_DIR/../Icon.png" $stagingDir
-    cp -r "$TP_PACKAGE_NUSPEC_DIR/../licenses" $stagingDir
-
-    for i in ${projectFiles[@]}; do
-        if [[ $TP_USE_REPO_API = 0 ]]; then
-            log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version"
-
-            $dotnet restore $stagingDir/${i} \
-                && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog
-        else
-            log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version (Source Build)"
-
-            $dotnet restore $stagingDir/${i} \
-                && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog -p:DotNetBuildFromSource=true
-        fi
-    done
-
-    log "Create-NugetPackages: Elapsed $(( SECONDS - start ))s."
-}
-
-#
-# Privates
-#
-_get_dotnet_path()
-{
-    echo "$TP_DOTNET_DIR/dotnet"
-}
-
-# Execute build
-start=$SECONDS
-log "Build started"
-log "Test platform environment variables: "
-(set | grep ^TP_)
-
-log "Test platform build variables: "
-(set | grep ^TPB_)
-
-if [ -z "$PROJECT_NAME_PATTERNS" ]
-then
-    install_cli && restore_package && invoke_build && publish_package && create_package
-else
-    invoke_build
-fi
-
-if [[ $? -ne 0 ]]; then
-    log "Build failed. Elapsed $(( SECONDS - start ))s."
-    exit 1
-fi
-
-log "Build complete. Elapsed $(( SECONDS - start ))s."
diff --git a/scripts/build/ExternalAssemblyVersions.cs b/scripts/build/ExternalAssemblyVersions.cs
deleted file mode 100644
index cfaa81efa9..0000000000
--- a/scripts/build/ExternalAssemblyVersions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Microsoft.VisualStudio.TestPlatform
-{
-    internal class ExternalAssemblyVersions
-    {
-        /// <summary>
-        /// Refers to the versions of the assemblies retrieved from the 
-        /// Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness package.
-        /// The Package version can be found in "scripts\build\TestPlatform.Dependencies.props"
-        /// </summary>
-        internal const string MicrosoftFakesAssemblyVersion = "17.0.0.0";
-    }
-}
\ No newline at end of file
diff --git a/scripts/build/GenerateManifest.proj b/scripts/build/GenerateManifest.proj
deleted file mode 100644
index 047b8c5ed4..0000000000
--- a/scripts/build/GenerateManifest.proj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project>
-    <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-    <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <MicrosoftDotNetBuildTasksFeedFilePath Condition=" '$(MicrosoftDotNetBuildTasksFeedFilePath)' == '' ">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed/$(MicrosoftDotNetBuildTasksFeedVersion)/</MicrosoftDotNetBuildTasksFeedFilePath>
-        <MicrosoftDotNetBuildTasksFeedTaskDir>$(MicrosoftDotNetBuildTasksFeedFilePath)tools/net472/</MicrosoftDotNetBuildTasksFeedTaskDir>
-        <MicrosoftDotNetBuildTasksFeedTaskDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetBuildTasksFeedFilePath)tools/netcoreapp3.1/</MicrosoftDotNetBuildTasksFeedTaskDir>
-
-        <PackagesPath Condition=" '$(PackagesPath)' == '' ">$(ArtifactsDir)\$(Configuration)\packages\</PackagesPath>
-        <AssetManifestFilePath Condition=" '$(AssetManifestFilePath)' == '' ">$(PackagesPath)manifest\manifest.xml</AssetManifestFilePath>
-        <PackagesToPublishPattern Condition=" '$(PackagesToPublishPattern)' == '' ">$(PackagesPath)*.nupkg</PackagesToPublishPattern>
-        <FeedUrl Condition=" '$(FeedUrl)' == '' ">https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json</FeedUrl>
-    </PropertyGroup>
-    
-    <ItemGroup Condition="'$(PackagesToPublishPattern)' != ''">
-        <ItemsToPush Remove="@(ItemsToPush)" />
-        <ItemsToPush Include="$(PackagesToPublishPattern)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ManifestBuildData Include="Location=$(FeedUrl)" />
-    </ItemGroup>
-
-    <UsingTask TaskName="GenerateBuildManifest" AssemblyFile="$(MicrosoftDotNetBuildTasksFeedTaskDir)Microsoft.DotNet.Build.Tasks.Feed.dll" />
-
-    <Target Name="PublishToBuildAssetRegistry">
-        <GenerateBuildManifest Artifacts="@(ItemsToPush)"
-            ItemsToSign="@(ItemsToSignPostBuild)"
-            StrongNameSignInfo="@(StrongNameSignInfo)"
-            FileSignInfo="@(FileSignInfo)"
-            FileExtensionSignInfo="@(FileExtensionSignInfo)"
-            OutputPath="$(AssetManifestFilePath)"
-            BuildId="$(BUILD_BUILDNUMBER)"
-            BuildData="@(ManifestBuildData)"
-            RepoUri="$(BUILD_REPOSITORY_URI)"
-            RepoBranch="$(BUILD_SOURCEBRANCH)"
-            RepoCommit="$(BUILD_SOURCEVERSION)" />
-    </Target>
-</Project>
\ No newline at end of file
diff --git a/scripts/build/TestAssets.props b/scripts/build/TestAssets.props
deleted file mode 100644
index c442c962d6..0000000000
--- a/scripts/build/TestAssets.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <!-- Not able to add TargetFrameworks here due to: https://github.com/dotnet/sdk/issues/1110 -->
-        <NetCoreAppTargetFramework Condition="'$(TargetFramework)' != '' AND $(TargetFramework.StartsWith('netcoreapp'))">true</NetCoreAppTargetFramework>
-        <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)TestPlatform.Dependencies.props" Condition=" '$(DependencyVersionsImported)' != 'true' "/>
-</Project>
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
deleted file mode 100644
index d129719d39..0000000000
--- a/scripts/build/TestPlatform.Dependencies.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VSSdkBuildToolsVersion>15.8.3247</VSSdkBuildToolsVersion>
-
-    <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
-
-    <!-- this version needs to be the same as in TestPlatform.Settings.targets, we might want to unify this into 
-    a single .props file, but the other version is used by multiple build scripts, so I just query it and validate that  
-    they are both the same during build -->
-    <!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version 
-    and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version 
-    from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync --> 
-    <NETTestSdkVersion>17.1.0-dev</NETTestSdkVersion>
-
-    <MSTestFrameworkVersion>2.1.0</MSTestFrameworkVersion>
-    <MSTestAdapterVersion>2.1.0</MSTestAdapterVersion>
-    <MSTestAssertExtensionVersion>1.0.3-preview</MSTestAssertExtensionVersion>
-
-    <XUnitFrameworkVersion>2.3.1</XUnitFrameworkVersion>
-    <XUnitAdapterVersion>2.3.1</XUnitAdapterVersion>
-    <XUnitConsoleRunnerVersion>2.3.1</XUnitConsoleRunnerVersion>
-
-    <NUnit3FrameworkVersion>3.10.1</NUnit3FrameworkVersion>
-    <NUnit3AdapterVersion>3.10.0</NUnit3AdapterVersion>
-    <NUnitConsoleRunnerVersion>3.8.0</NUnitConsoleRunnerVersion>
-
-    <ChutzpahAdapterVersion>4.4.12</ChutzpahAdapterVersion>
-
-    <!-- This version also needs to be updated in src\package\nuspec\TestPlatform.ObjectModel.nuspec -->
-    <NuGetFrameworksVersion>5.11.0</NuGetFrameworksVersion>
-    <ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
-    <JsonNetVersion>9.0.1</JsonNetVersion>
-    <MoqVersion>4.8.3</MoqVersion>
-
-    <TestPlatformExternalsVersion>17.1.0-preview-2-31925-026</TestPlatformExternalsVersion>
-    <!-- <TestPlatformMSDiaVersion>$(TestPlatformExternalsVersion)</TestPlatformMSDiaVersion> -->
-    <TestPlatformMSDiaVersion>17.1.0-preview-2-31925-026</TestPlatformMSDiaVersion>
-    <!-- Portable CPP test runner -->
-    <TestPlatformRemoteExternalsVersion>17.1.0-preview-2-31925-026</TestPlatformRemoteExternalsVersion>
-    
-    <InteropExternalsVersion>17.1.0-preview-2-31925-026</InteropExternalsVersion>
-    <MicrosoftFakesVersion>17.0.0-beta.21179.1</MicrosoftFakesVersion>
-
-    <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
-    
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview4-27615-11</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>1.1.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-
-    <CoverletCoverageVersion>1.2.0</CoverletCoverageVersion>
-    <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
-
-    <DependencyVersionsImported>true</DependencyVersionsImported>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\eng\Versions.props" />
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
-
-</Project>
diff --git a/scripts/build/TestPlatform.Localization.targets b/scripts/build/TestPlatform.Localization.targets
deleted file mode 100644
index 084c042101..0000000000
--- a/scripts/build/TestPlatform.Localization.targets
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">$(MSBuildThisFileDirectory)..\..\</TestPlatformRoot>
-    <TestPlatformPackageDir>$(TestPlatformRoot)packages\</TestPlatformPackageDir>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ResourceDirectory>$(ProjectDir)Resources</ResourceDirectory>
-    <ProductProject Condition="'$(TestProject)' == '' and '$(TestProject)' != 'true'">true</ProductProject>
-
-    <!-- LocalizeResources is set only when xlf files are synced or resx are generated -->
-    <LocalizeResources Condition="'$(LocalizeResources)' == ''">false</LocalizeResources>
-
-    <!-- LocalizedBuild is set when non english resources are included in build process -->
-    <LocalizedBuild Condition="'$(LocalizedBuild)' == ''">false</LocalizedBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ResxLang Include="cs;de;es;fr;it;ja;ko;pl;pt-BR;ru;tr;zh-Hans;zh-Hant" />
-  </ItemGroup>
-
-  <!-- In case of LocalizedBuild, EmbeddedResource contains just english resources to allow sync and
-       generation. Otherwise, let EmbeddedResource contain all resx files (regular build) -->
-  <ItemGroup Condition="'$(ProductProject)' == 'true' and '$(LocalizedBuild)' == 'true'">
-    <!-- Union of already specified EmbeddedResource and Resources\*resx (localized resx) -->
-    <_CopyOfResources Include="@(EmbeddedResource)" />
-    <EmbeddedResource Include="$(ResourceDirectory)\*.resx" Exclude="@(_CopyOfResources)" />
-  </ItemGroup>
-
-  <Target Name="Localize" Condition="'$(ProductProject)' == 'true' and @(EmbeddedResource) != ''" DependsOnTargets="_CreateLocalizeXLF;_CreateLocalizeResx" />
-    <!--<Message Importance="High" Text="resources are @(EmbeddedResource)" />
-  </Target>-->
-
-  <Target Name="_CreateLocalizeXLF">
-    <Message Importance="High" Text="Create localized xlf for '$(AssemblyName)'" />
-    <CreateItem Include="@(EmbeddedResource)" AdditionalMetadata="Language=%(ResxLang.Identity)">
-      <Output ItemName="LocResourceFile" TaskParameter="Include"/>
-    </CreateItem>
-
-    <!-- Create language based xlf files -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig' and %(LocResourceFile.Filename) != 'html'"/>
-
-    <!-- Create neutral xlf -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(EmbeddedResource.Identity) -Xlf $(ResourceDirectory)\xlf\%(EmbeddedResource.Filename).xlf" Condition="%(EmbeddedResource.Filename) != 'DefaultCodeCoverageConfig' and %(EmbeddedResource.Filename) != 'html'"/>
-  </Target>
-
-  <Target Name="_CreateLocalizeResx">
-    <Message Importance="High" Text="Create localized resx for '$(AssemblyName)'" />
-    <CreateItem Include="@(EmbeddedResource)" AdditionalMetadata="Language=%(ResxLang.Identity)">
-      <Output ItemName="LocResourceFile" TaskParameter="Include"/>
-    </CreateItem>
-
-    <!-- Convert language specific xlf files to resx -->
-    <Exec Command="$(TestPlatformPackageDir)fmdev.xlftool\0.1.3\tools\xlftool.exe  writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" Condition="%(LocResourceFile.Filename) != 'DefaultCodeCoverageConfig' and %(LocResourceFile.Filename) != 'html'"/>
-    <ItemGroup>
-      <EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
deleted file mode 100644
index 062c7a5211..0000000000
--- a/scripts/build/TestPlatform.Settings.targets
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot>$(MSBuildThisFileDirectory)..\..\</TestPlatformRoot>
-    <!-- This version is read by vsts-prebuild.ps1 and is a base for the current version, this should be updated
-    at the start of new iteration to the goal number. This is also used to version the local packages. This version needs to be statically
-    readable when we read the file as xml, don't move it to a .props file, unless you change the build server process -->
-    <TPVersionPrefix>17.1.0</TPVersionPrefix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- Versioning is defined from the build script. Use a default dev build if it's not defined.
-         Sets the AssemblyVersion, AssemblyFileVersion and AssemblyInformationalVersion -->
-    <Version Condition="'$(Version)' == ''">$(TPVersionPrefix)-dev</Version>
-
-    <!-- Override the AssemblyVersion as 15.0.0 since protocol depends on this version for
-         serialization. This is also defined in build script. -->
-    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">15.0.0</AssemblyVersion>
-
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <PublicSign Condition="'$(CIBuild)' == '' or '$(CIBuild)' == 'false'">true</PublicSign>
-    <DelaySign Condition="'$(CIBuild)' == 'true'">true</DelaySign>
-    <!--<GenerateDocumentationFile>true</GenerateDocumentationFile>-->
-    <AssemblyOriginatorKeyFile>$(TestPlatformRoot)scripts/key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-
-    <!-- Disable default inclusion of .resx file. We generate files in the Resources directory only
-         if localization is enabled, default inclusion ends up including the generated files by default. -->
-    <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>$(DefineConstants);CODE_ANALYSIS</DefineConstants>
-  </PropertyGroup> 
-
-  <!-- Package dependency versions -->
-  <Import Project="$(MSBuildThisFileDirectory)TestPlatform.Dependencies.props" Condition=" '$(DependencyVersionsImported)' != 'true' "/>
-
-  <!-- Common dependencies for all projects -->
-  <ItemGroup>
-    <AdditionalFiles Include="$(TestPlatformRoot)scripts\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
-  </ItemGroup>
-
-  <!-- Test project settings -->
-  <Choose>
-    <When Condition="$(TestProject) == 'true'"> 
-      <PropertyGroup>
-        <GenerateDocumentationFile>false</GenerateDocumentationFile>
-      </PropertyGroup>
-
-      <!-- Test projects are not discovered in test window without test container capability -->
-      <ItemGroup>
-        <ProjectCapability Include="TestContainer" />
-      </ItemGroup>
-
-      <!-- Test project references -->
-      <ItemGroup>
-        <!-- Test projects take a direct dependency on TestHost. Indirect dependencies must be included.
-             This is required to enable selfhost the latest testhost bits.
-
-             We don't want these references to be passed onto compiler. They are just required at runtime.
-             Mark them as content and copy to output directory.
-        -->
-        <ProjectReference Include="$(TestPlatformRoot)src/testhost/testhost.csproj">
-          <FromP2P>true</FromP2P>
-        </ProjectReference>
-        <ProjectReference Include="$(TestPlatformRoot)src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj">
-          <FromP2P>true</FromP2P>
-        </ProjectReference>
-        <ProjectReference Include="$(TestPlatformRoot)src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj">
-          <FromP2P>true</FromP2P>
-        </ProjectReference>
-        <ProjectReference Include="$(TestPlatformRoot)src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj">
-          <FromP2P>true</FromP2P>
-        </ProjectReference>
-        <ProjectReference Include="$(TestPlatformRoot)src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj">
-          <FromP2P>true</FromP2P>
-        </ProjectReference>
-
-        <PackageReference Include="MSTest.TestFramework">
-          <Version>$(MSTestFrameworkVersion)</Version>
-        </PackageReference>
-        <PackageReference Include="MSTest.TestAdapter">
-          <Version>$(MSTestAdapterVersion)</Version>
-        </PackageReference>
-        <PackageReference Include="Moq">
-          <Version>$(MoqVersion)</Version>
-        </PackageReference>
-        <PackageReference Include="MSTest.Assert.Extensions">
-          <Version>$(MSTestAssertExtensionVersion)</Version>
-        </PackageReference>
-        <PackageReference Include="Microsoft.CodeCoverage">
-          <Version>1.0.3</Version>
-        </PackageReference>
-      </ItemGroup>
-    </When>
-  </Choose>
-
-  <!-- Code analysis settings -->
-  <PropertyGroup>
-    <!-- Disable code analysis by default. Ignore SA0001 until we've xml documentation enabled for
-         all projects -->
-    <EnableCodeAnalysis>false</EnableCodeAnalysis>
-    <NoWarn>$(NoWarn);SA0001</NoWarn>
-
-    <CodeAnalysisRuleSet>$(TestPlatformRoot)scripts/stylecop.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="$(TestProject) == 'true'">$(TestPlatformRoot)scripts/stylecop.test.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-</Project>
diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets
deleted file mode 100644
index 3d5fb960c2..0000000000
--- a/scripts/build/TestPlatform.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot>$(MSBuildThisFileDirectory)..\..\</TestPlatformRoot>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
-  </PropertyGroup>
-
-  <!-- Static analysis dependencies -->
-  <ItemGroup Condition="$(EnableCodeAnalysis) == 'true' AND '$(DotNetBuildFromSource)' != 'true'" >
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.0.1</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)TestPlatform.Localization.targets" /> 
-</Project>
diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
deleted file mode 100644
index 0aaeba92a6..0000000000
--- a/scripts/common.lib.ps1
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-
-$ErrorActionPreference = "Stop"
-
-#
-# Git Branch
-#
-$TPB_BRANCH = "LOCALBRANCH"
-$TPB_COMMIT = "LOCALBUILD"
-
-try {
-    $TPB_BRANCH = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/"  
-    if ([string]::IsNullOrWhiteSpace($TPB_BRANCH)) { 
-        $TPB_BRANCH = git -C "." rev-parse --abbrev-ref HEAD
-    }
-}
-catch { }
-
-try {
-    $TPB_COMMIT = $env:BUILD_SOURCEVERSION
-    if ([string]::IsNullOrWhiteSpace($TPB_COMMIT)) { 
-        $TPB_COMMIT = git -C "." rev-parse HEAD
-    }
-}
-catch { }
-
-#
-# Variables
-#
-Write-Verbose "Setup environment variables."
-$CurrentScriptDir = (Get-Item (Split-Path $MyInvocation.MyCommand.Path))
-$env:TP_ROOT_DIR = $CurrentScriptDir.Parent.FullName
-$env:TP_TOOLS_DIR = Join-Path $env:TP_ROOT_DIR "tools"
-$env:TP_PACKAGES_DIR = Join-Path $env:TP_ROOT_DIR "packages"
-$env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
-$env:TP_TESTARTIFACTS = Join-Path $env:TP_OUT_DIR "testArtifacts"
-$env:TP_PACKAGE_PROJ_DIR = Join-Path $env:TP_ROOT_DIR "src\package"
-$GlobalJson = Get-Content -Raw -Path (Join-Path $env:TP_ROOT_DIR 'global.json') | ConvertFrom-Json
-
-#
-# Dotnet configuration
-#
-# Disable first run since we want to control all package sources 
-Write-Verbose "Setup dotnet configuration."
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 
-# Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712
-$env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
-$env:NUGET_EXE_Version = "5.8.1"
-$env:DOTNET_CLI_VERSION = $GlobalJson.tools.dotnet
-# $env:DOTNET_RUNTIME_VERSION = "LATEST"
-$env:VSWHERE_VERSION = "2.0.2"
-$env:MSBUILD_VERSION = "15.0"
-
-function Write-Log ([string] $message)
-{
-    $currentColor = $Host.UI.RawUI.ForegroundColor
-    $Host.UI.RawUI.ForegroundColor = "Green"
-    if ($message)
-    {
-        Write-Output "... $message"
-    }
-    $Host.UI.RawUI.ForegroundColor = $currentColor
-}
-
-function Write-VerboseLog([string] $message)
-{
-    Write-Verbose $message
-}
-
-function Remove-Tools
-{
-}
-
-function Install-DotNetCli
-{
-    $timer = Start-Timer
-    Write-Log "Install-DotNetCli: Get dotnet-install.ps1 script..."
-    $dotnetInstallRemoteScript = "https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.ps1"
-    $dotnetInstallScript = Join-Path $env:TP_TOOLS_DIR "dotnet-install.ps1"
-    if (-not (Test-Path $env:TP_TOOLS_DIR)) {
-        New-Item $env:TP_TOOLS_DIR -Type Directory | Out-Null
-    }
-
-    $dotnet_dir= Join-Path $env:TP_TOOLS_DIR "dotnet"
-
-    if (-not (Test-Path $dotnet_dir)) {
-        New-Item $dotnet_dir -Type Directory | Out-Null
-    }
-
-    (New-Object System.Net.WebClient).DownloadFile($dotnetInstallRemoteScript, $dotnetInstallScript)
-
-    if (-not (Test-Path $dotnetInstallScript)) {
-        Write-Error "Failed to download dotnet install script."
-    }
-
-    Unblock-File $dotnetInstallScript
-
-    Write-Log "Install-DotNetCli: Get the latest dotnet cli toolset..."
-    $dotnetInstallPath = Join-Path $env:TP_TOOLS_DIR "dotnet"
-    New-Item -ItemType directory -Path $dotnetInstallPath -Force | Out-Null
-    & $dotnetInstallScript -Channel 6.0 -Quality Preview -InstallDir $dotnetInstallPath -Version $env:DOTNET_CLI_VERSION
-    
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '2.1.30' -Channel '2.1' -Architecture x64 -NoPath
-    $env:DOTNET_ROOT= $dotnetInstallPath
-
-    & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '2.1.30' -Channel '2.1' -Architecture x86 -NoPath
-    ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"
-    
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '3.1.19' -Channel '3.1' -Architecture x64 -NoPath
-    $env:DOTNET_ROOT= $dotnetInstallPath
-
-    & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '3.1.19' -Channel '3.1' -Architecture x86 -NoPath
-    ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"
-
-    & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '5.0.10' -Channel '5.0' -Architecture x64 -NoPath
-    $env:DOTNET_ROOT= $dotnetInstallPath
-
-    & $dotnetInstallScript -InstallDir "${dotnetInstallPath}_x86" -Runtime 'dotnet' -Version '5.0.10' -Channel '5.0' -Architecture x86 -NoPath
-    ${env:DOTNET_ROOT(x86)} = "${dotnetInstallPath}_x86"
-
-    $env:DOTNET_MULTILEVEL_LOOKUP=0
-
-    "---- dotnet environment variables"
-    Get-ChildItem "Env:\dotnet_*"
-    
-    "`n`n---- x64 dotnet"
-    & "$env:DOTNET_ROOT\dotnet.exe" --info
-
-    "`n`n---- x86 dotnet"
-    # avoid erroring out because we don't have the sdk for x86 that global.json requires
-    try {
-        & "${env:DOTNET_ROOT(x86)}\dotnet.exe" --info 2> $null
-    } catch {}
-    Write-Log "Install-DotNetCli: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Clear-Package {
-    # find all microsoft packages that have the same version as we specified
-    # this is cache-busting the nuget packages, so we don't reuse them from cache 
-    # after we built new ones
-    if (Test-Path $env:TP_PACKAGES_DIR) {
-        $devPackages = Get-ChildItem $env:TP_PACKAGES_DIR/microsoft.*/$TPB_Version | Select-Object -ExpandProperty FullName 
-        $devPackages | Remove-Item -Force -Recurse -Confirm:$false
-    }
-}
-
-function Restore-Package
-{
-    $timer = Start-Timer
-    Write-Log "Restore-Package: Start restoring packages to $env:TP_PACKAGES_DIR."
-    $dotnetExe = Get-DotNetPath
-
-    Write-Log ".. .. Restore-Package: Source: $env:TP_ROOT_DIR\src\package\external\external.csproj"
-    & $dotnetExe restore $env:TP_ROOT_DIR\src\package\external\external.csproj --packages $env:TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version -bl:"$env:TP_OUT_DIR\log\$Configuration\external.binlog"
-    Write-Log ".. .. Restore-Package: Complete."
-
-    Set-ScriptFailedOnError
-
-    Write-Log "Restore-Package: Complete. {$(Get-ElapsedTime($timer))}"
-}
-
-function Copy-Bulk {
-    param (
-        [string]$root,
-        [hashtable]$files
-    )
-    
-    $files.GetEnumerator() | ForEach-Object {
-        $from = Join-Path $root $_.Name
-        $to = $_.Value
-          
-        New-Item -ItemType directory -Path "$to\" -Force | Out-Null
-        Copy-Item "$from\*" $to -Force -Recurse
-    }
-}
-function Start-Timer
-{
-    return [System.Diagnostics.Stopwatch]::StartNew()
-}
-
-function Get-ElapsedTime([System.Diagnostics.Stopwatch] $timer)
-{
-    $timer.Stop()
-    return $timer.Elapsed
-}
-
-function Set-ScriptFailedOnError
-{
-    if ($lastExitCode -eq 0) {
-        return
-    }
-
-    if ($FailFast -eq $true) {
-        Write-Error "Build failed. Stopping as fail fast is set."
-    }
-
-    $Script:ScriptFailed = $true
-}
-
-function PrintAndExit-OnError([System.String] $output)
-{
-    if ($? -eq $false){
-        Write-Error $output
-        Exit 1
-    }
-}
\ No newline at end of file
diff --git a/scripts/key.snk b/scripts/key.snk
deleted file mode 100644
index 110b59c7b0..0000000000
Binary files a/scripts/key.snk and /dev/null differ
diff --git a/scripts/perf/perf.ps1 b/scripts/perf/perf.ps1
index feead07303..a4daca2484 100644
--- a/scripts/perf/perf.ps1
+++ b/scripts/perf/perf.ps1
@@ -6,12 +6,12 @@ Param(
     [System.String] $Configuration = "Release",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("win7-x64", "win7-x86")]
+    [ValidateSet("win7-x64", "win-x86")]
     [Alias("r")]
     [System.String] $TargetRuntime = "win7-x64",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("netcoreapp2.1", "net451", "net452")]
+    [ValidateSet("net9.0", "net462")]
     [Alias("f")]
     [System.String] $TargetFramework,
 
@@ -39,12 +39,12 @@ $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
 #
 # Test configuration
 #
-$TPT_TargetFrameworkFullCLR = "net451"
-$TPT_TargetFramework20Core = "netcoreapp2.1"
+$TPT_TargetFrameworkFullCLR = "net462"
+$TPT_TargetFramework6Core = "net6.0"
 Write-Verbose "Setup build configuration."
 $Script:TPT_Configuration = $Configuration
 $Script:TPT_SourceFolders =  @(Join-Path $env:TP_ROOT_DIR "test\TestAssets")
-$Script:TPT_TargetFrameworks =@($TPT_TargetFramework20Core, $TPT_TargetFrameworkFullCLR, "net452")
+$Script:TPT_TargetFrameworks =@($TPT_TargetFramework6Core, $TPT_TargetFrameworkFullCLR)
 $Script:TPT_TargetFramework = $TargetFramework
 $Script:TPT_TargetRuntime = $TargetRuntime
 $Script:TPT_Pattern = $Pattern
@@ -55,7 +55,7 @@ $Script:TPT_ErrorMsgColor = "Red"
 $Script:TPT_PayLoads=New-Object System.Collections.ArrayList
 $Script:TPT_PerfIterations = 10
 $Script:TPT_Results = New-Object System.Collections.ArrayList
-$Script:TPT_DependencyProps = [xml] (Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)
+$Script:TPT_DependencyProps = [xml] (Get-Content $env:TP_ROOT_DIR\eng\Versions.props)
 
 $ResultObject = New-Object PSObject
 Add-Member -InputObject $ResultObject -MemberType NoteProperty -Name Runner -Value ""
@@ -119,7 +119,7 @@ function Get-TestAdapterPath($testadapter)
 {
     if($testadapter -eq "MsTest")
     {
-        return "$env:TP_PACKAGES_DIR\mstest.testadapter\$($Script:TPT_DependencyProps.Project.PropertyGroup.MSTestAdapterVersion)\build\_common"
+        return "$env:TP_PACKAGES_DIR\mstest.testadapter\$($Script:TPT_DependencyProps.Project.PropertyGroup.MSTestTestAdapterVersion)\build\_common"
     }
     if($testadapter -eq "xUnit")
     {
@@ -135,7 +135,7 @@ function Get-AdapterVersion($testadapter)
 {
     if($testadapter -eq "MsTest")
     {
-        return "$($Script:TPT_DependencyProps.Project.PropertyGroup.MSTestAdapterVersion)"
+        return "$($Script:TPT_DependencyProps.Project.PropertyGroup.MSTestTestAdapterVersion)"
     }
     if($testadapter -eq "xUnit")
     {
@@ -151,11 +151,11 @@ function Get-ConsoleRunnerPath($runner, $targetFrameWork)
 {
     if($runner -eq "vstest.console")
     {
-        if($targetFrameWork -eq $TPT_TargetFramework20Core)
+        if($targetFrameWork -eq $TPT_TargetFramework6Core)
         {
             $vstestConsoleFileName = "vstest.console.dll"
             $targetRunTime = ""
-            $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFramework20Core $targetRuntime) $vstestConsoleFileName
+            $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFramework6Core $targetRuntime) $vstestConsoleFileName
         } else {
             $vstestConsoleFileName = "vstest.console.exe"
             $targetRunTime = $Script:TPT_TargetRuntime
@@ -175,13 +175,10 @@ function Get-ConsoleRunnerPath($runner, $targetFrameWork)
 
 function Write-Log ([string] $message, $messageColor = "Green")
 {
-    $currentColor = $Host.UI.RawUI.ForegroundColor
-    $Host.UI.RawUI.ForegroundColor = $messageColor
     if ($message)
     {
-        Write-Output "... $message"
+        Write-Host "... $message" -ForegroundColor $messageColor
     }
-    $Host.UI.RawUI.ForegroundColor = $currentColor
 }
 
 function Get-ProductVersion($filePath)
@@ -273,14 +270,14 @@ function Invoke-PerformanceTests
                         $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll"
                          foreach($fx in $Script:TPT_TargetFrameworks)
                         {
-                            if ($Script:TPT_TargetFramework -ne "" -and $fx -ne $Script:TPT_TargetFramework) 
+                            if ($Script:TPT_TargetFramework -ne "" -and $fx -ne $Script:TPT_TargetFramework)
                             {
                                 # Write-Log "Skipped framework $fx based on user setting."
                                 continue;
                             }
-    
+
                             $testContainer = [System.String]::Format($testContainerPath, $fx)
-    
+
                             if (Test-Path $testContainer)
                             {
                                 $adapter = $payload.adapter
@@ -302,12 +299,12 @@ function Invoke-PerformanceTests
                                             $payload | Add-Member currentRunner $runner -Force
                                             $payload | Add-Member currentAdapter $null -Force
                                             $payload | Add-Member currentAdapterVersion $null -Force
-    
+
                                             if($runner -eq "vstest.console")
                                             {
                                                 $payload | Add-Member currentRunnerVersion (Get-ProductVersion($runnerPath)) -Force
                                                 $payload.currentAdapter = $adapter
-    
+
                                                 Measure-DiscoveryTime {&$runnerPath $testContainer --listtests --testadapterpath:$testAdapterPath} $payload
                                                 Measure-ExecutionTime {&$runnerPath $testContainer --testadapterpath:$testAdapterPath} $payload
                                             }
@@ -328,7 +325,7 @@ function Invoke-PerformanceTests
                                             Write-Log "Specified runner $runner doesn't exist at $runnerPath"
                                         }
                                     }
-    
+
                                 }
                                 else
                                 {
@@ -352,25 +349,28 @@ function Invoke-PerformanceTests
 #
 function Invoke-DisplayResults
 {
-    $currentColor = $Host.UI.RawUI.ForegroundColor
-    $Host.UI.RawUI.ForegroundColor = "Green"
-    $osDetails = Get-SystemInfo
-    "`n"
-    "Machine Configuration"
-    $osDetails | Format-List 'MachineName', 'OSName', 'OSVersion', 'MachineType' , 'Processor', 'LogicalCores', 'RAMSize'
-    
-    if($DefaultAction -eq "Both" -or $DefaultAction -eq "Discovery")
-    {
-        $Script:TPT_Results | Where-Object {$_.Action -like "Discovery"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
+    try {
+        $currentColor = $Host.UI.RawUI.ForegroundColor
+        $Host.UI.RawUI.ForegroundColor = "Green"
+        $osDetails = Get-SystemInfo
+        "`n"
+        "Machine Configuration"
+        $osDetails | Format-List 'MachineName', 'OSName', 'OSVersion', 'MachineType' , 'Processor', 'LogicalCores', 'RAMSize'
+
+        if($DefaultAction -eq "Both" -or $DefaultAction -eq "Discovery")
+        {
+            $Script:TPT_Results | Where-Object {$_.Action -like "Discovery"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
+        }
+
+        if($DefaultAction -eq "Both" -or $DefaultAction -eq "Execution")
+        {
+            $Script:TPT_Results | Where-Object {$_.Action -like "Execution"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
+        }
     }
-    
-    if($DefaultAction -eq "Both" -or $DefaultAction -eq "Execution")
-    {
-        $Script:TPT_Results | Where-Object {$_.Action -like "Execution"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
+    finally {
+        $Host.UI.RawUI.ForegroundColor = $currentColor
     }
-    
-    $Host.UI.RawUI.ForegroundColor = $currentColor
-    
+
     if($ExportResults -ne $null -and $ExportResults -eq "csv")
     {
         $Script:TPT_Results | Export-Csv -Path "PerformanceResults.csv" -Force -NoTypeInformation
@@ -389,4 +389,4 @@ else
 }
 
 Invoke-PerformanceTests
-Invoke-DisplayResults
\ No newline at end of file
+Invoke-DisplayResults
diff --git a/scripts/perf/perfconfig.csv b/scripts/perf/perfconfig.csv
index 36a34a36ac..f80137c4c8 100644
--- a/scripts/perf/perfconfig.csv
+++ b/scripts/perf/perfconfig.csv
@@ -1,4 +1,4 @@
 payload;adapter;runners;discoverygoal;executiongoal
-"MSTestAdapterPerfTestProject"; "MsTest"; ("vstest.console"); (3500); (9500)
-"NUnitAdapterPerfTestProject"; "nUnit"; ("vstest.console","nunit.consolerunner"); (6500, 3500); (45000,40000)
-"XUnitAdapterPerfTestProject"; "xUnit"; ("vstest.console","xunit.runner.console"); (6500, 0); (50000, 38000)
+"MSTest10kPassing"; "MsTest"; ("vstest.console"); (3500); (9500)
+"NUnit10kPassing"; "nUnit"; ("vstest.console","nunit.consolerunner"); (6500, 3500); (45000,40000)
+"XUnit10kPassing"; "xUnit"; ("vstest.console","xunit.runner.console"); (6500, 0); (50000, 38000)
diff --git a/scripts/stylecop.json b/scripts/stylecop.json
deleted file mode 100644
index cc6de90511..0000000000
--- a/scripts/stylecop.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "$schema":
-    "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
-  "settings": {
-    "documentationRules": {
-      "companyName": "Microsoft Corporation",
-      "copyrightText":
-        "Copyright (c) {companyName}. All rights reserved.\nLicensed under the MIT license. See LICENSE file in the project root for full license information.",
-      "xmlHeader": false,
-      "fileNamingConvention": "metadata"
-    },
-  }
-}
\ No newline at end of file
diff --git a/scripts/stylecop.ruleset b/scripts/stylecop.ruleset
deleted file mode 100644
index a398f6883b..0000000000
--- a/scripts/stylecop.ruleset
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for test platform tests" Description="Code analysis rules for test projects." ToolsVersion="14.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <!-- XML documentation checks are temporarily disabled (until we've rest of code base clean) -->
-    <Rule Id="SA1652" Action="None" />
-
-    <!-- Allow use of regions -->
-    <Rule Id="SA1124" Action="None" />
-
-    <!-- Don't force a trailing comma in multiline object initializers -->
-    <Rule Id="SA1413" Action="None" />
-
-    <!-- Copyright headers check is skipped (see https://github.com/dotnet/sdk/issues/989). -->
-    <Rule Id="SA1636" Action="None" />
-  </Rules>
-</RuleSet>
-
diff --git a/scripts/stylecop.test.ruleset b/scripts/stylecop.test.ruleset
deleted file mode 100644
index 0b9956c2f0..0000000000
--- a/scripts/stylecop.test.ruleset
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for test platform tests" Description="Code analysis rules for test projects." ToolsVersion="14.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <!-- XML documentation checks are not required for test projects -->
-    <Rule Id="SA1652" Action="None" />
-
-    <!-- Allow use of regions -->
-    <Rule Id="SA1124" Action="None" />
-
-    <!-- Don't force a trailing comma in multiline object initializers -->
-    <Rule Id="SA1413" Action="None" />
-
-    <!-- Documentation is not required for test projects -->
-    <Rule Id="SA1600" Action="None" />
-
-    <!-- Copyright headers check is skipped (see https://github.com/dotnet/sdk/issues/989). -->
-    <Rule Id="SA1636" Action="None" />
-  </Rules>
-</RuleSet>
diff --git a/scripts/test.ps1 b/scripts/test.ps1
index 62dd097e33..d777fbd3dd 100644
--- a/scripts/test.ps1
+++ b/scripts/test.ps1
@@ -9,18 +9,18 @@ Param(
     [System.String] $Configuration = "Debug",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("win7-x64", "win7-x86")]
+    [ValidateSet("win7-x64", "win-x86")]
     [Alias("r")]
     [System.String] $TargetRuntime = "win7-x64",
 
     [Parameter(Mandatory=$false)]
-    [ValidateSet("net451", "netcoreapp2.1")]
+    [ValidateSet("net48", "net9.0")]
     [Alias("f")]
     [System.String] $TargetFramework,
 
     # Only test sources matching the pattern are run.
-    # Use End2End to run E2E tests. Or to run any one assembly tests, use the 
-    # assembly name. E.g. test -p Microsoft.TestPlatform.CoreUtilities.UnitTests 
+    # Use End2End to run E2E tests. Or to run any one assembly tests, use the
+    # assembly name. E.g. test -p Microsoft.TestPlatform.CoreUtilities.UnitTests
     [Parameter(Mandatory=$false)]
     [Alias("p")]
     [System.String] $Pattern = "Unit",
@@ -71,8 +71,8 @@ ${env:DOTNET_ROOT(x86)} = "${env:DOTNET_ROOT}_x86"
 # disable looking up other dotnets in programfiles
 $env:DOTNET_MULTILEVEL_LOOKUP = 0
 
-# Disable first run since we want to control all package sources 
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 
+# Disable first run since we want to control all package sources
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 
 # list what we have set and what is available
 "---- dotnet environment variables"
@@ -94,12 +94,14 @@ $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
 #
 # Test configuration
 #
-$TPT_TargetFrameworkFullCLR = "net451"
-$TPT_TargetFrameworkCore20 = "netcoreapp2.1"
+$TPT_TargetFrameworkNet462 = "net462"
+$TPT_TargetFrameworkNet48 = "net48"
+$TPT_TargetFrameworkNet80 = "net8.0"
+$TPT_TargetFrameworkNet90 = "net9.0"
 Write-Verbose "Setup build configuration."
 $Script:TPT_Configuration = $Configuration
 $Script:TPT_SourceFolders =  @("test")
-$Script:TPT_TargetFrameworks =@($TPT_TargetFrameworkFullCLR, $TPT_TargetFrameworkCore20)
+$Script:TPT_TargetFrameworks =@($TPT_TargetFrameworkNet48, $TPT_TargetFrameworkNet90)
 $Script:TPT_TargetFramework = $TargetFramework
 $Script:TPT_TargetRuntime = $TargetRuntime
 $Script:TPT_SkipProjects = @("_none_");
@@ -119,13 +121,10 @@ $Script:ScriptFailed = $false
 
 function Write-Log ([string] $message, $messageColor = "Green")
 {
-    $currentColor = $Host.UI.RawUI.ForegroundColor
-    $Host.UI.RawUI.ForegroundColor = $messageColor
     if ($message)
     {
-        Write-Output "... $message"
+        Write-Host "... $message" -ForegroundColor $messageColor
     }
-    $Host.UI.RawUI.ForegroundColor = $currentColor
 }
 
 function Write-VerboseLog([string] $message)
@@ -185,7 +184,7 @@ function Invoke-Test
             $testContainerName = $_.BaseName
             $testOutputPath = Join-Path $_.Directory.FullName "bin/$($Script:TPT_Configuration)/{0}"
             $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll"
-            
+
             $skip = "False"
 
             foreach ($project in $Script:TPT_SkipProjects)
@@ -207,7 +206,7 @@ function Invoke-Test
             }
             else
             {
-                Write-Log ".. . $testContainerName test container found. ($testOutputPath)"
+                Write-Log ".. . $testContainerName test container found. ($testContainerPath)"
                 $testContainers += ,"$testContainerPath"
             }
         }
@@ -228,17 +227,17 @@ function Invoke-Test
                 $testFilter = "/testCaseFilter:`"$TPT_TestFilter`""
             }
 
-            if($fx -eq $TPT_TargetFrameworkCore20)
+            if($fx -eq $TPT_TargetFrameworkNet90)
             {
                 $vstestConsoleFileName = "vstest.console.dll"
                 $targetRunTime = ""
-                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkCore20 $targetRuntime) $vstestConsoleFileName
+                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkNet80 $targetRuntime) $vstestConsoleFileName
             }
             else
             {
                 $vstestConsoleFileName = "vstest.console.exe"
                 $targetRunTime = $Script:TPT_TargetRuntime
-                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkFullCLR $targetRuntime) $vstestConsoleFileName
+                $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkNet462 $targetRuntime) $vstestConsoleFileName
             }
 
             if (!(Test-Path $vstestConsolePath))
@@ -265,9 +264,9 @@ function Invoke-Test
                 {
                     Remove-Item $fullTrxFilePath
                 }
-					
+
                 Set-TestEnvironment
-                if($fx -eq $TPT_TargetFrameworkFullCLR)
+                if($fx -eq $TPT_TargetFrameworkNet48)
                 {
 
                     Write-Verbose "$vstestConsolePath $testContainerSet /parallel /logger:`"trx;LogFileName=$trxLogFileName`" $testFilter $ConsoleLogger"
@@ -308,7 +307,7 @@ function Invoke-Test
 
                     Set-TestEnvironment
 
-                    if($fx -eq $TPT_TargetFrameworkFullCLR)
+                    if($fx -eq $TPT_TargetFrameworkNet48)
                     {
 
                         Write-Verbose "$vstestConsolePath $testContainer /logger:`"trx;LogFileName=$trxLogFileName`" $ConsoleLogger $testFilter"
diff --git a/scripts/test.sh b/scripts/test.sh
index 31ee9d3fee..e9d11c24d7 100644
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -57,7 +57,7 @@ done
 #
 # Variables
 #
-PROJECT_NAME_PATTERNS=**$PROJECT_NAME_PATTERNS*bin*$CONFIGURATION*netcoreapp2.1*${PROJECT_NAME_PATTERNS}Tests*dll
+PROJECT_NAME_PATTERNS=**$PROJECT_NAME_PATTERNS*bin*$CONFIGURATION*net9.0*$PROJECT_NAME_PATTERNS*Tests*dll
 TP_ROOT_DIR=$(cd "$(dirname "$0")"; pwd -P)
 TP_TOOLS_DIR="$TP_ROOT_DIR/tools"
 TP_PACKAGES_DIR="$TP_ROOT_DIR/packages"
@@ -66,7 +66,7 @@ TP_OUT_DIR="$TP_ROOT_DIR/artifacts"
 #
 # Dotnet configuration
 #
-# Disable first run since we want to control all package sources 
+# Disable first run since we want to control all package sources
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
 export NUGET_PACKAGES=$TP_PACKAGES_DIR
@@ -76,7 +76,7 @@ DOTNET_CLI_VERSION="latest"
 # Build configuration
 #
 TPB_Solution="TestPlatform.sln"
-TPB_TargetFrameworkCore="netcoreapp2.1"
+TPB_TargetFrameworkCore="net8.0"
 TPB_Configuration=$CONFIGURATION
 TPB_TargetRuntime=$TARGET_RUNTIME
 TPB_Verbose=$VERBOSE
@@ -120,7 +120,7 @@ function invoke_test()
     local dotnet=$(_get_dotnet_path)
     local vstest=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFrameworkCore/vstest.console.dll
 
-    find ./test -path $PROJECT_NAME_PATTERNS | xargs $dotnet $vstest --parallel --testcasefilter:"TestCategory!=Windows&TestCategory!=Windows-Review" --logger:"trx"
+    find ./test -ipath $PROJECT_NAME_PATTERNS | xargs $dotnet $vstest --parallel --testcasefilter:"TestCategory!=Windows&TestCategory!=Windows-Review" --logger:"trx"
 }
 
 #
diff --git a/scripts/update-nuget-frameworks.ps1 b/scripts/update-nuget-frameworks.ps1
new file mode 100644
index 0000000000..6d6894b50e
--- /dev/null
+++ b/scripts/update-nuget-frameworks.ps1
@@ -0,0 +1,117 @@
+param (
+    [String] $VersionTag = "6.8.0.117"
+)
+
+$root = Resolve-Path "$PSScriptRoot/.."
+
+$source = "$root/artifacts/tmp/NuGet.Client"
+
+if (Test-Path $source) { 
+    Remove-Item -Recurse -Force $source
+}
+
+git clone --depth 1 --branch $VersionTag https://github.com/NuGet/NuGet.Client.git $source
+if (0 -ne $LASTEXITCODE) {
+    throw "Cloning failed."
+}
+
+$commit = git -C $source log -1 --pretty=format:"%h"
+if (0 -ne $LASTEXITCODE) {
+    throw "Getting commit failed."
+}
+
+$destination = "$root/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/"
+
+$frameworksPath = "$source/src/NuGet.Core/NuGet.Frameworks"
+$frameworkItems = @(
+    "DefaultFrameworkMappings.cs"
+    "DefaultFrameworkNameProvider.cs"
+    "DefaultPortableFrameworkMappings.cs"
+    "DefaultCompatibilityProvider.cs"
+    "CompatibilityProvider.cs"
+    "FrameworkConstants.cs"
+    "FrameworkException.cs"
+    "FrameworkNameProvider.cs"
+    "FrameworkRange.cs"
+    "FrameworkReducer.cs"
+    "FrameworkNameHelpers.cs",
+    "FrameworkSpecificMapping.cs"
+    "FallbackFramework.cs"
+    "FrameworkExpander.cs"
+    "CompatibilityCacheKey.cs"
+    "def/IFrameworkCompatibilityListProvider.cs"
+    "def/IFrameworkCompatibilityProvider.cs"
+    "def/IFrameworkMappings.cs"
+    "def/IFrameworkNameProvider.cs"
+    "def/IFrameworkSpecific.cs"
+    "def/IPortableFrameworkMappings.cs"
+    "NuGetFramework.cs"
+    "NuGetFrameworkFactory.cs"
+    "comparers/NuGetFrameworkFullComparer.cs"
+    "comparers/NuGetFrameworkNameComparer.cs"
+    "comparers/CompatibilityMappingComparer.cs"
+    "comparers/FrameworkRangeComparer.cs"
+    "comparers/NuGetFrameworkSorter.cs"
+    "comparers/FrameworkPrecedenceSorter.cs"
+    "NuGetFrameworkUtility.cs"
+    "OneWayCompatibilityMappingEntry.cs"
+) | ForEach-Object { "$frameworksPath/$_" }
+
+$extraItems = @(
+    ".editorconfig"
+    "build/Shared/HashCodeCombiner.cs"
+    "build/Shared/NoAllocEnumerateExtensions.cs"
+    "build/Shared/StringBuilderPool.cs"
+    "build/Shared/SimplePool.cs"
+) | ForEach-Object { "$source/$_" }
+
+if ((Test-Path $destination)) { 
+    Remove-Item $destination -Force -Recurse
+}
+
+New-Item -ItemType Directory $destination -ErrorAction Ignore | Out-Null
+foreach ($item in $frameworkItems + $extraItems) {
+    if (-not (Test-Path $item)) { 
+        throw "File not found $item"
+    }
+    $content = Get-Content $item
+    $name = (Get-Item $item).Name
+
+    $path = "$destination/$name"
+
+    # some types are directly in Nuget namespace, and if we would suffix
+    # .Clone, then Nuget.Frameworks.Clone is no longer autometicaly using
+    # Nuget.Clone, and we would have to add more usings into the files.
+    $finalContent = $content `
+        -replace 'public(.*)(class|interface)', 'internal$1$2' `
+        -replace 'namespace NuGet', 'namespace NuGetClone' `
+        -replace 'using NuGet', 'using NuGetClone' `
+        -replace 'NuGet.Frameworks.NuGetFramework', 'NuGetClone.Frameworks.NuGetFramework'
+
+    if ($name -eq ".editorconfig") {
+        $finalContent += @"
+
+[*.{cs,vb}]
+dotnet_diagnostic.IDE0001.severity = none
+dotnet_diagnostic.IDE0005.severity = none
+dotnet_diagnostic.IDE1006.severity = none
+"@
+    }
+    $finalContent | Set-Content -Path $path -Encoding utf8NoBOM
+}
+
+
+@"
+This directory contains code that is copied from https://github.com/NuGet/NuGet.Client/tree/dev/src/NuGet.Core/NuGet.Frameworks, with the namespaces changed
+and class visibility changed. This is done to ensure we are providing the same functionality as Nuget.Frameworks, without depending on the package explicitly.
+
+The files in this folder are coming from tag $VersionTag, on commit $commit.
+
+To update this code, run the script in: $($PSCommandPath -replace [regex]::Escape($root)) , with -VersionTag <theDesiredVersion>.
+
+"@ | Set-Content "$destination/README.md"
+
+$tpnPath = "$root/src/package/ThirdPartyNotices.txt"
+$tpn = Get-Content $tpnPath -Raw
+$tpn = $tpn -replace "Nuget.Client version.*\(", "Nuget.Client version $versionTag \("
+$tpn | Set-Content -Path $tpnPath -Encoding utf8NoBOM -NoNewline
\ No newline at end of file
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
deleted file mode 100644
index ab04abc63b..0000000000
--- a/scripts/verify-nupkgs.ps1
+++ /dev/null
@@ -1,63 +0,0 @@
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-function Unzip
-{
-    param([string]$zipfile, [string]$outpath)
-
-    Write-VerboseLog "Unzip $zipfile to $outpath."
-
-    [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
-}
-
-function Verify-Nuget-Packages($packageDirectory, $version)
-{
-    Write-Log "Starting Verify-Nuget-Packages."
-    $expectedNumOfFiles = @{
-        "Microsoft.CodeCoverage" = 59;
-        "Microsoft.NET.Test.Sdk" = 27;
-        "Microsoft.TestPlatform" = 599;
-        "Microsoft.TestPlatform.Build" = 21;
-        "Microsoft.TestPlatform.CLI" = 404;
-        "Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
-        "Microsoft.TestPlatform.ObjectModel" = 238;
-        "Microsoft.TestPlatform.AdapterUtilities" = 62;
-        "Microsoft.TestPlatform.Portable" = 604;
-        "Microsoft.TestPlatform.TestHost" = 214;
-        "Microsoft.TestPlatform.TranslationLayer" = 123;
-        "Microsoft.TestPlatform.Internal.Uwp" = 86;
-    }
-
-    $nugetPackages = Get-ChildItem -Filter "*$version*.nupkg" $packageDirectory | % { $_.FullName }
-
-    Write-VerboseLog "Unzip NuGet packages."
-    $unzipNugetPackageDirs =  New-Object System.Collections.Generic.List[System.Object]
-    foreach($nugetPackage in $nugetPackages)
-    {
-        $unzipNugetPackageDir = $(Join-Path $packageDirectory $(Get-Item $nugetPackage).BaseName)
-        $unzipNugetPackageDirs.Add($unzipNugetPackageDir)
-
-        if(Test-Path -Path $unzipNugetPackageDir)
-        {
-            Remove-Item -Force -Recurse $unzipNugetPackageDir
-        }
-
-        Unzip $nugetPackage $unzipNugetPackageDir
-    }
-
-    Write-VerboseLog "Verify NuGet packages files."
-    foreach($unzipNugetPackageDir in $unzipNugetPackageDirs)
-    {
-        $actualNumOfFiles = (Get-ChildItem -Recurse -File -Path $unzipNugetPackageDir).Count
-        $versionLen = $version.Length + 1  # +1 for dot
-        $packageKey = (Get-Item $unzipNugetPackageDir).BaseName -replace ".{$versionLen}$"
-        Write-VerboseLog "verifying package $packageKey."
-
-        if($expectedNumOfFiles[$packageKey] -ne $actualNumOfFiles)
-        {
-            Write-Error "Number of files are not equal $unzipNugetPackageDir, expected: $($expectedNumOfFiles[$packageKey]) actual: $actualNumOfFiles"
-        }
-
-        Remove-Item -Force -Recurse $unzipNugetPackageDir | Out-Null
-    }
-
-    Write-Log "Completed Verify-Nuget-Packages."
-}
\ No newline at end of file
diff --git a/scripts/verify-sign.ps1 b/scripts/verify-sign.ps1
deleted file mode 100644
index a0f6acdafb..0000000000
--- a/scripts/verify-sign.ps1
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-# Build script for Test Platform.
-
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$false)]
-    [ValidateSet("Debug", "Release")]
-    [Alias("c")]
-    [System.String] $Configuration = "Debug",
-
-    [Parameter(Mandatory=$true)]
-    [Alias("cert")]
-    [System.String] $Certificate
-)
-
-$ErrorActionPreference = "Continue"
-
-#
-# Variables
-#
-Write-Verbose "Setup environment variables."
-$env:TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
-$env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
-$env:TP_TOOLS_DIR = Join-Path $env:TP_ROOT_DIR "tools" 
-$script:ErrorCount = 0
-
-#
-# Signing configuration
-#
-# Authenticode signature details
-Write-Verbose "Setup build configuration."
-$TPB_SignCertificate = $Certificate
-$TPB_Configuration = $Configuration
-$TPB_AssembliesPattern = @(
-    "*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe", 
-    "QTAgent*.exe", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll", 
-    "Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll", 
-    "covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe", 
-    "CodeCoverage.exe", "Microsoft.ShDocVw.dll", "UIAComwrapper.dll", "Interop.UIAutomationClient.dll", "SettingsMigrator.exe", 
-    "Newtonsoft.Json.dll", "DumpMinitool*.exe"
-)
-
-function Verify-Assemblies
-{
-    Write-Debug "Verify-Assemblies: Start"
-    $artifactsDirectory = Join-Path $env:TP_OUT_DIR $TPB_Configuration
-    foreach ($pattern in $TPB_AssembliesPattern) {
-        Write-Debug "Pattern: $pattern"
-        Get-ChildItem -Recurse -Include $pattern $artifactsDirectory | Where-Object { (!$_.PSIsContainer) -and !($($_.FullName).Contains('VSIX\obj')) -and !($($_.FullName).Contains('publishTemp')) -and !($($_.FullName).Contains('sign_temp'))} | % {
-            $Path = $_.FullName
-            $signature = Get-AuthenticodeSignature -FilePath $Path
-
-            if ($signature.Status -eq "Valid") {
-                if ($signature.SignerCertificate.Subject -eq "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US") {
-                    Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path"
-                }
-                elseif ($signature.SignerCertificate.Subject -eq "CN=Microsoft 3rd Party Application Component, O=Microsoft Corporation, L=Redmond, S=Washington, C=US") {
-                    Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [3rd Party]"
-                }
-                else {
-                    # For legacy components, sign certificate is always "prod" signature. Skip such binaries.
-                    if ($signature.SignerCertificate.Thumbprint -eq "98ED99A67886D020C564923B7DF25E9AC019DF26") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # For some dlls e.g. "Microsoft.DiaSymReader.dll", sign certificate is different signature. Skip such binaries.
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "5EAD300DC7E4D637948ECB0ED829A072BD152E17") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # For some dlls e.g. "Interop.UIAutomationClient.dll", sign certificate is different signature. Skip such binaries.
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "67B1757863E3EFF760EA9EBB02849AF07D3A8080") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # For some dlls e.g. "Microsoft.VisualStudio.ArchitectureTools.PEReader.dll", sign certificate is different signature. Skip such binaries.
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "9DC17888B5CFAD98B3CB35C1994E96227F061675") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # For some dlls sign certificate is different signature. Skip such binaries.
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "62009AAABDAE749FD47D19150958329BF6FF4B34") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # Microsoft 3rd Party Authenticode Signature
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "899FA016DEE8E665FF2A315A1151C43FB96C430B") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # Microsoft 3rd Party Application Component
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "709133ECC53CBF386F4A5ECB782AEEF499F0F8CA") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [3rd Party Signed]"
-                    }
-                    # Microsoft 3rd Party Application Component
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "912357a68d29b8fe17168ef8c44d6830d1d42801") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    # For some dlls sign certificate is different signature, which already come as signed from nuget packages. Skip such binaries.
-                    elseif ($signature.SignerCertificate.Thumbprint -eq "81C25099511180D15B858DC2B7EC4C057B1CE4BF") {
-                        Write-Debug "Valid ($($signature.SignerCertificate.Thumbprint)): $Path [Prod Signed]"
-                    }
-                    else {
-                        Write-FailLog "Invalid ($($signature.SignerCertificate.Thumbprint)). File: $Path. [$($signature.SignerCertificate.Subject)]"
-                    }
-                }
-            }
-            else {
-                Write-FailLog "Not signed. File: $Path."
-            }
-        }
-    }
-    
-    Write-Debug "Verify-Assemblies: Complete"
-}
-
-function Verify-NugetPackages
-{
-    Write-Debug "Verify-NugetPackages: Start"
-
-    # Move acquiring nuget.exe to external dependencies once Nuget.Commandline for 4.6.1 is available.
-    $nugetInstallDir = Join-Path $env:TP_TOOLS_DIR "nuget"
-    $nugetInstallPath = Join-Path $nugetInstallDir "nuget.exe"
-
-    if(![System.IO.File]::Exists($nugetInstallPath)) 
-    {
-        # Create the directory for nuget.exe if it does not exist
-        New-Item -ItemType Directory -Force -Path $nugetInstallDir
-        Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v4.6.1/nuget.exe -OutFile $nugetInstallPath
-    }
-    
-    Write-Debug "Using nuget.exe installed at $nugetInstallPath"
-
-    $artifactsDirectory = Join-Path $env:TP_OUT_DIR $TPB_Configuration
-    $packagesDirectory = Join-Path $artifactsDirectory "packages"
-    
-    Get-ChildItem -Filter *.nupkg  $packagesDirectory | % {
-        & $nugetInstallPath verify -signature -CertificateFingerprint "3F9001EA83C560D712C24CF213C3D312CB3BFF51EE89435D3430BD06B5D0EECE;AA12DA22A49BCE7D5C1AE64CC1F3D892F150DA76140F210ABD2CBFFCA2C18A27;" $_.FullName
-        if($LASTEXITCODE -eq 1) {
-            $script:ErrorCount = $script:ErrorCount + 1
-        }
-    }
-    
-    Write-Debug "Verify-NugetPackages: Complete"
-}
-
-function Write-FailLog ([string] $message)
-{
-    $script:ErrorCount = $script:ErrorCount + 1
-    Write-ToCI -message $message -type "error"
-}
-
-function Write-Debug ([string] $message)
-{
-    Write-ToCI -message $message -type "debug"
-}
-
-function Write-ToCI ([string] $message, [string]$type, [switch]$vso)
-{
-    $currentColor = $Host.UI.RawUI.ForegroundColor
-
-    if($type -eq "error") {
-        $Host.UI.RawUI.ForegroundColor = "Red"
-    }
-
-    if ($message -or $vso -or $type)
-    {
-        $prefix = ""
-        if ($vso) {
-            $prefix = "vso"
-        }
-
-        Write-Output "##$prefix[$type]$message"
-    }
-    $Host.UI.RawUI.ForegroundColor = $currentColor
-}
-
-Write-Debug "Variables used: "
-Get-ChildItem variable:TPB_*
-Write-Output ""
-Write-Output ""
-
-Verify-Assemblies
-Verify-NugetPackages
-
-if ($script:ErrorCount -gt 0) {
-    Write-ToCI -message "Verification failed, $($script:ErrorCount) errors found!" -type "task.logissue" -vso
-}
\ No newline at end of file
diff --git a/scripts/vstest-codecoverage.runsettings b/scripts/vstest-codecoverage.runsettings
index 3dd1b4a929..804c999381 100644
--- a/scripts/vstest-codecoverage.runsettings
+++ b/scripts/vstest-codecoverage.runsettings
@@ -35,4 +35,4 @@
       </DataCollector>
     </DataCollectors>
   </DataCollectionRunSettings>
-</RunSettings>
\ No newline at end of file
+</RunSettings>
diff --git a/scripts/vstest-codecoverage2.runsettings b/scripts/vstest-codecoverage2.runsettings
index 3e54931353..cdcd7e287d 100644
--- a/scripts/vstest-codecoverage2.runsettings
+++ b/scripts/vstest-codecoverage2.runsettings
@@ -29,4 +29,4 @@
       </DataCollector>
     </DataCollectors>
   </DataCollectionRunSettings>
-</RunSettings>
\ No newline at end of file
+</RunSettings>
diff --git a/scripts/vsts-prebuild.ps1 b/scripts/vsts-prebuild.ps1
deleted file mode 100644
index 9fe4025d54..0000000000
--- a/scripts/vsts-prebuild.ps1
+++ /dev/null
@@ -1,45 +0,0 @@
-# Sets variables which are used across the build tasks.
-
-param ( 
-  [Parameter(Mandatory)] 
-  [string] $BuildSuffix,
-  [Parameter(Mandatory)] 
-  [string] $IsRtmBuild,
-  [Parameter(Mandatory)] 
-  $Branch
-)
-
-$TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
-
-# Set Version from scripts/build/TestPlatform.Settings.targets
-$TpVersion = [string](([xml](Get-Content $TP_ROOT_DIR\scripts\build\TestPlatform.Settings.targets)).Project.PropertyGroup.TPVersionPrefix)
-$buildPrefix = $TpVersion.Trim()
-
-if ($IsRtmBuild.ToLower() -eq "false") 
-{ 
-  if ($null -ne $Branch -and $Branch -like "refs/heads/rel/*")
-  { 
-    $BuildSuffix = $BuildSuffix -replace "preview", "release"
-  }
-
-  $packageVersion = $buildPrefix+"-"+$buildSuffix
-} 
-else
-{
-  $packageVersion = $buildPrefix
-  $buildSuffix = [string]::Empty
-}
-
-Write-Host "##vso[task.setvariable variable=BuildVersionPrefix;]$buildPrefix"
-Write-Host "##vso[task.setvariable variable=BuildVersionSuffix;]$buildSuffix"
-Write-Host "##vso[task.setvariable variable=PackageVersion;]$packageVersion"
-
-# Set Newtonsoft.Json version to consume in  CI build "Package: TestPlatform SDK" task.
-# "Nuget.exe pack" required JsonNetVersion property for creating nuget package.
-
-$JsonNetVersion = ([xml](Get-Content $TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.JsonNetVersion
-Write-Host "##vso[task.setvariable variable=JsonNetVersion;]$JsonNetVersion"
-
-$microsoftFakesVersion = ([xml](Get-Content $TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.MicrosoftFakesVersion
-$FakesPackageDir = Join-Path $TP_ROOT_DIR "packages\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\$microsoftFakesVersion\contentFiles"
-Write-Host "##vso[task.setvariable variable=FakesPackageDir;]$FakesPackageDir"
diff --git a/scripts/vsts-prebuild.sh b/scripts/vsts-prebuild.sh
deleted file mode 100644
index fd80684ad5..0000000000
--- a/scripts/vsts-prebuild.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Microsoft. All rights reserved.
-
-set -o nounset  # Fail on uninitialized variables.
-set -e          # Fail on non-zero exit code.
-
-# Parameter
-TP_BUILD_SUFFIX="dev" 
-BRANCH=
-IS_RTM=false
-
-while [ $# -gt 0 ]; do
-    lowerI="$(echo ${1:-} | awk '{print tolower($0)}')"
-    case $lowerI in
-        -build)
-            TP_BUILD_SUFFIX=$2
-            shift
-            ;;
-        -branch)
-            BRANCH=$2
-            shift
-            ;;
-        -rtm)
-            IS_RTM=$2
-            shift
-            ;;
-        *)
-            break
-            ;;
-   esac
-   shift
-done
-
-TP_ROOT_DIR=$(cd "$(dirname "$0")/.."; pwd -P)
-TP_BUILD_PREFIX=$(grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/TestPlatform.Settings.targets | head -1 | cut -d'>' -f2 | cut -d'<' -f1 || echo $TP_BUILD_PREFIX)
-PACKAGE_VERSION="$TP_BUILD_PREFIX-$TP_BUILD_SUFFIX"
-
-# Script
-if [ $IS_RTM == true ]; then
-    PACKAGE_VERSION="$TP_BUILD_PREFIX"
-    TP_BUILD_SUFFIX=
-else
-    if [ ! -z "$BRANCH" ] && [[ $BRANCH =~ ^refs\/heads\/rel\/.*$ ]]; then 
-        TP_BUILD_SUFFIX="${TP_BUILD_SUFFIX/preview/release}"
-    fi    
-
-    PACKAGE_VERSION="$TP_BUILD_PREFIX-$TP_BUILD_SUFFIX"
-fi
-
-echo "##vso[task.setvariable variable=BuildVersionPrefix;]$TP_BUILD_PREFIX"
-echo "##vso[task.setvariable variable=BuildVersionSuffix;]$TP_BUILD_SUFFIX"
-echo "##vso[task.setvariable variable=PackageVersion;]$PACKAGE_VERSION"
\ No newline at end of file
diff --git a/scripts/write-release-notes.ps1 b/scripts/write-release-notes.ps1
index ea5463dd51..b0484f6fc7 100644
--- a/scripts/write-release-notes.ps1
+++ b/scripts/write-release-notes.ps1
@@ -1,117 +1,121 @@
+<#
+.SYNOPSIS
+    Create release notes for current project using either last commit to last tag or between last 2 tags.
+
+.EXAMPLE
+    Assuming you are on branch rel/17.4 and you want to create the release notes, run
+    .\write-release-notes -PackageVersion 17.4.0
+    it will create release notes between last commit of current branch and last release
+
+    If you want to generate the release notes between 2 tags, use simply
+    .\write-release-notes
+#>
+
 [CmdletBinding()]
 param
-( 
-   [string] $Path = ".",
-   # if this is a pre-release or stable version
-   [switch] $Stable,
-   # externally provide the version number we will use
-   [string] $PackageVersion,
-   # in CI we don't know the end tag, so we diff till the current commit
-   [switch] $EndWithLatestCommit
+(
+    [string] $Path = ".",
+    [ValidatePattern("^\d+\.\d+\.\d+(-(preview|release)-\d{8}-\d{2})?$")][string] $PackageVersion
 )
 
-if ($EndWithLatestCommit -and [string]::IsNullOrWhiteSpace($PackageVersion)) { 
-    throw "EndWithLatestCommit was enabled, provide PackageVersion in this format 16.8.0-preview-20200924-01, or this format 16.8.0."
-}
-
 $repoUrl = $(if ((git -C $Path remote -v) -match "upstream") {
         git -C $Path remote get-url --push upstream
     }
-    else {  
+    else {
         git -C $Path remote get-url --push origin
-    })-replace "\.git$" 
+    }) -replace "\.git$"
 
-# list all tags on this branch ordered by creator date to get the latest, stable or pre-release tag. 
+# list all tags on this branch ordered by creator date to get the latest, stable or pre-release tag.
 # For stable release we choose only tags without any dash, for pre-release we choose all tags.
-$tags = git -C $Path tag -l --sort=creatordate | Where-Object { $_ -match "v\d+\.\d+\.\d+.*" -and (-not $Stable -or $_ -notlike '*-*') }
+$tags = git -C $Path tag -l --sort=refname | Where-Object { $_ -match "v\d+\.\d+\.\d+.*" -and (-not $Stable -or $_ -notlike '*-*') }
 
-if ($EndWithLatestCommit) { 
+if ([string]::IsNullOrWhiteSpace($PackageVersion)) {
+    # normally we show changes between the latest two tags
+    $start, $end = $tags | Select-Object -Last 2
+    Write-Host "$start -- $end"
+    $tag = $end
+}
+else {
     # in CI we don't have the tag yet, so we show changes between the most recent tag, and this commit
     # we figure out the tag from the package version that is set by vsts-prebuild
     $start = $tags | Select-Object -Last 1
     $end = git -C $Path rev-parse HEAD
     $tag = "v$PackageVersion"
 }
-else { 
-    # normally we show changes between the latest two tags
-    $start, $end = $tags | Select-Object -Last 2
-    $tag = $end
-}
 
 # # override the tags to use if you need
 # $start = "v16.8.0-preview-20200812-03"
 # $end = $tag = "v16.8.0-preview-20200921-01"
 
-
-Write-Host "Generating release notes for $start..$end$(if ($EndWithLatestCommit) { " (expected tag: $tag)" })"
+Write-Host "Generating release notes for $start..$end$(if ($HasPackageVersion) { " (expected tag: $tag)" })"
 
 $sourceBranch = $branch = git -C $Path rev-parse --abbrev-ref HEAD
-if ($sourceBranch -eq "HEAD") { 
+if ($sourceBranch -eq "HEAD") {
     # when CI checks out just the single commit, https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml
-    $sourceBranch = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/"  
+    $sourceBranch = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/"
 }
 
-if ([string]::IsNullOrWhiteSpace($branch)) { 
+if ([string]::IsNullOrWhiteSpace($branch)) {
     throw "Branch is null or empty!"
 }
 
-if ([string]::IsNullOrWhiteSpace($sourceBranch)) { 
+if ([string]::IsNullOrWhiteSpace($sourceBranch)) {
     throw "SourceBranch is null or empty!"
 }
 
 Write-Host "Branch is $branch"
 Write-Host "SourceBranch is $sourceBranch"
-$branchesWithStartTag = git -C $Path branch --contains tags/$start
 
-if (-not $branchesWithStartTag -or -not ($branchesWithStartTag -match $branch)) { 
-    Write-Host "This branch $branch$(if($branch -ne $sourceBranch){" ($sourceBranch)"}), does not contain the starting tag $start. Skipping generating release notes."
-    if ($branchesWithStartTag) {
-        Write-Host "The tag is present on branches:`n$($branchesWithStartTag)."
-    }
-    return 
-}
-else { 
-    Write-Host "Branch $branch$(if($branch -ne $sourceBranch){" ($sourceBranch)"}) has tag $start, getting log since that."
-}
+$discard = @(
+    "^Update dependencies from https:\/\/",
+    "^\[.+\] Update dependencies from",
+    "^LEGO: Pull request from lego",
+    "^Localized file check-in by OneLocBuild Task:",
+    "^Juno: check in to lego"
+) -join "|"
 
 $prUrl = "$repoUrl/pull/"
-$v = $tag -replace '^v'
-$b = if ($Stable) { $v } else { $tag -replace '.*?(\d+-\d+)$', '$1' }
+$tagVersionNumber = $tag -replace '^v'
+$b = if ($HasPackageVersion) { $tagVersionNumber } else { $tag -replace '.*?(\d+-\d+)$', '$1' }
 # using .. because I want to know the changes that are on this branch, but don't care about the changes that I don't have https://stackoverflow.com/a/24186641/3065397
 $log = (git -C $Path log "$start..$end" --oneline --pretty="format:%s" --first-parent)
 $issues = $log | ForEach-Object {
-    if ($_ -match '^(?<message>.+)\s\(#(?<pr>\d+)\)?$') {
-        $message = "* $($matches.message)"
-        if ($matches.pr) {
-            $pr = $matches.pr
-            $message += " [#$pr]($prUrl$pr)"
+    if ($_ -notmatch $discard) {
+        if ($_ -match '^(?<message>.+)\s\(#(?<pr>\d+)\)?$') {
+            $message = "* $($matches.message)"
+            if ($matches.pr) {
+                $pr = $matches.pr
+                $message += " [#$pr]($prUrl$pr)"
+            }
+
+            $message
+        }
+        else {
+            "* $_"
         }
-
-        $message
-    }
-    else
-    {
-        "* $_"
     }
 }
 
+$tagVersionNumbersixDropBranch = $sourceBranch -replace "rel/", ""
+
 $output = @"
 
-See the release notes [here](https://github.com/microsoft/vstest-docs/blob/main/docs/releases.md#$($v -replace '\.')).
+See the release notes [here](https://github.com/microsoft/vstest/blob/main/docs/releases.md#$($tagVersionNumber -replace '\.')).
 
 -------------------------------
 
-## $v
+## $tagVersionNumber
 
 ### $(if ($issues.Length -eq 1) { 'Issue' } else { 'Issues' }) Fixed
+
 $($issues -join "`n")
 
 See full log [here]($repoUrl/compare/$start...$tag)
 
-### Drops
+### Artifacts
 
-* TestPlatform vsix: [$v](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/$sourceBranch/$b;/TestPlatform.vsix)
-* Microsoft.TestPlatform.ObjectModel : [$v](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/$v)
+* TestPlatform vsix: [$tagVersionNumber](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/$tagVersionNumbersixDropBranch/$b;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [$tagVersionNumber](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/$tagVersionNumber)
 "@
 
 
diff --git a/shared/NullableAttributes.cs b/shared/NullableAttributes.cs
new file mode 100644
index 0000000000..845ee9bdfa
--- /dev/null
+++ b/shared/NullableAttributes.cs
@@ -0,0 +1,148 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// This was copied from https://github.com/dotnet/coreclr/blob/60f1e6265bd1039f023a82e0643b524d6aaf7845/src/System.Private.CoreLib/shared/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
+// and updated to have the scope of the attributes be internal.
+namespace System.Diagnostics.CodeAnalysis;
+
+#if NETFRAMEWORK || NETSTANDARD && !NETSTANDARD2_1 || NETCOREAPP && !NETCOREAPP3_0_OR_GREATER
+
+/// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+internal sealed class AllowNullAttribute : Attribute { }
+
+/// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+internal sealed class DisallowNullAttribute : Attribute { }
+
+/// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+internal sealed class MaybeNullAttribute : Attribute { }
+
+/// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+internal sealed class NotNullAttribute : Attribute { }
+
+/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class MaybeNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter may be null.
+    /// </param>
+    public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+}
+
+/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class NotNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+}
+
+/// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
+internal sealed class NotNullIfNotNullAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the associated parameter name.</summary>
+    /// <param name="parameterName">
+    /// The associated parameter name.  The output will be non-null if the argument to the parameter specified is non-null.
+    /// </param>
+    public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
+
+    /// <summary>Gets the associated parameter name.</summary>
+    public string ParameterName { get; }
+}
+
+/// <summary>Applied to a method that will never return under any circumstance.</summary>
+[AttributeUsage(AttributeTargets.Method, Inherited = false)]
+internal sealed class DoesNotReturnAttribute : Attribute { }
+
+/// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class DoesNotReturnIfAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified parameter value.</summary>
+    /// <param name="parameterValue">
+    /// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
+    /// the associated parameter matches this value.
+    /// </param>
+    public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
+
+    /// <summary>Gets the condition parameter value.</summary>
+    public bool ParameterValue { get; }
+}
+
+#endif
+
+#if NETFRAMEWORK || NETSTANDARD && !NETSTANDARD2_1 || NETCOREAPP && !NET5_0_OR_GREATER
+
+/// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values.</summary>
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with a field or property member.</summary>
+    /// <param name="member">
+    /// The field or property member that is promised to be not-null.
+    /// </param>
+    public MemberNotNullAttribute(string member) => Members = [member];
+
+    /// <summary>Initializes the attribute with the list of field and property members.</summary>
+    /// <param name="members">
+    /// The list of field and property members that are promised to be not-null.
+    /// </param>
+    public MemberNotNullAttribute(params string[] members) => Members = members;
+
+    /// <summary>Gets field or property member names.</summary>
+    public string[] Members { get; }
+}
+
+/// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values when returning with the specified return value condition.</summary>
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition and a field or property member.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    /// <param name="member">
+    /// The field or property member that is promised to be not-null.
+    /// </param>
+    public MemberNotNullWhenAttribute(bool returnValue, string member)
+    {
+        ReturnValue = returnValue;
+        Members = [member];
+    }
+
+    /// <summary>Initializes the attribute with the specified return value condition and list of field and property members.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    /// <param name="members">
+    /// The list of field and property members that are promised to be not-null.
+    /// </param>
+    public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
+    {
+        ReturnValue = returnValue;
+        Members = members;
+    }
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+
+    /// <summary>Gets field or property member names.</summary>
+    public string[] Members { get; }
+}
+
+#endif
diff --git a/src/AttachVS/AttachVS.csproj b/src/AttachVS/AttachVS.csproj
index f91c8e4f78..9e6fbc3166 100644
--- a/src/AttachVS/AttachVS.csproj
+++ b/src/AttachVS/AttachVS.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-	<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-	<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-	
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472</TargetFrameworks>
-    <LangVersion>preview</LangVersion>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks)</TargetFrameworks>
     <AssemblyName>AttachVS</AssemblyName>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
-
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
 </Project>
diff --git a/src/AttachVS/AttachVs.cs b/src/AttachVS/AttachVs.cs
index 8c2235f22e..f67634b74c 100644
--- a/src/AttachVS/AttachVs.cs
+++ b/src/AttachVS/AttachVs.cs
@@ -1,5 +1,10 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -7,233 +12,261 @@
 using System.Runtime.InteropServices.ComTypes;
 using System.Threading;
 
-namespace Microsoft.TestPlatform.AttachVS
+namespace Microsoft.TestPlatform.AttachVS;
+
+internal class DebuggerUtility
 {
-    internal class DebuggerUtility
+    internal static bool AttachVSToProcess(int? pid, int? vsPid)
     {
-        internal static bool AttachVSToProcess(int? pid, int? vsPid)
+        try
         {
-            try
+            if (pid == null)
             {
-                Trace($"Starting with pid '{pid}', and vsPid '{vsPid}'");
-                if (pid == null)
-                {
-                    Trace($"FAIL: Pid is null.");
-                    return false;
-                }
-                var process = Process.GetProcessById(pid.Value);
-                Trace($"Using pid: {pid} to get parent VS.");
-                var vs = GetVsFromPid(Process.GetProcessById(vsPid ?? process.Id));
+                Trace($"FAIL: Pid is null.");
+                return false;
+            }
 
-                if (vs != null)
-                {
-                    Trace($"Parent VS is {vs.ProcessName} ({vs.Id}).");
-                    AttachTo(process, vs);
-                }
-                else
-                {
-                    Trace($"Parent VS not found, finding the first VS that started.");
-                    var processes = Process.GetProcesses().Where(p => p.ProcessName == "devenv").Select(p =>
-                    {
-                        try
-                        {
-                            return new { Process = p, StartTime = p.StartTime, HasExited = p.HasExited };
-                        }
-                        catch
-                        {
-                            return null;
-                        }
-                    }).Where(p => p != null && !p.HasExited).OrderBy(p => p.StartTime).ToList();
+            var process = Process.GetProcessById(pid.Value);
+            Trace($"Starting with pid '{pid}({process.ProcessName})', and vsPid '{vsPid}'");
+            Trace($"Using pid: {pid} to get parent VS.");
+            var vs = GetVsFromPid(Process.GetProcessById(vsPid ?? process.Id));
 
-                    var firstVs = processes.FirstOrDefault();
-                    Trace($"Found VS {firstVs.Process.Id}");
-                    AttachTo(process, firstVs.Process);
-                }
+            if (vs != null)
+            {
+                Trace($"Parent VS is {vs.ProcessName} ({vs.Id}).");
+                AttachTo(process, vs);
                 return true;
             }
-            catch (Exception ex)
+
+            Trace($"Parent VS not found, finding the first VS that started.");
+            var firstVs = Process.GetProcesses()
+                .Where(p => p.ProcessName == "devenv")
+                .Select(p =>
+                {
+                    try
+                    {
+                        return new { Process = p, p.StartTime, p.HasExited };
+                    }
+                    catch
+                    {
+                        return null;
+                    }
+                })
+                .Where(p => p != null && !p.HasExited)
+                .OrderBy(p => p!.StartTime)
+                .FirstOrDefault();
+
+            if (firstVs != null)
             {
-                Trace($"ERROR: {ex}, {ex.StackTrace}");
-                return false;
+                Trace($"Found VS {firstVs.Process.Id}");
+                AttachTo(process, firstVs.Process);
+                return true;
             }
+
+            Trace("Could not find any started VS.");
+        }
+        catch (Exception ex)
+        {
+            Trace($"ERROR: {ex}, {ex.StackTrace}");
         }
 
-        private static void AttachTo(Process process, Process vs)
+        return false;
+    }
+
+    private static void AttachTo(Process process, Process vs)
+    {
+        var attached = AttachVs(vs, process.Id);
+        if (attached)
+        {
+            // You won't see this in DebugView++ because at this point VS is already attached and all the output goes into Debug window in VS.
+            Trace($"SUCCESS: Attached process: {process.ProcessName} ({process.Id})");
+        }
+        else
         {
-            var attached = AttachVs(vs, process.Id);
-            if (attached)
+            Trace($"FAIL: Could not attach process: {process.ProcessName} ({process.Id})");
+        }
+    }
+
+    private static bool AttachVs(Process vs, int pid)
+    {
+        IBindCtx? bindCtx = null;
+        IRunningObjectTable? runningObjectTable = null;
+        IEnumMoniker? enumMoniker = null;
+        try
+        {
+            var r = CreateBindCtx(0, out bindCtx);
+            Marshal.ThrowExceptionForHR(r);
+            if (bindCtx == null)
             {
-                // You won't see this in DebugView++ because at this point VS is already attached and all the output goes into Debug window in VS.
-                Trace($"SUCCESS: Attached process: {process.ProcessName} ({process.Id})");
+                Trace($"BindCtx is null. Cannot attach VS.");
+                return false;
             }
-            else
+            bindCtx.GetRunningObjectTable(out runningObjectTable);
+            if (runningObjectTable == null)
             {
-                Trace($"FAIL: Could not attach process: {process.ProcessName} ({process.Id})");
+                Trace($"RunningObjectTable is null. Cannot attach VS.");
+                return false;
             }
-        }
 
-        private static bool AttachVs(Process vs, int pid)
-        {
-            IBindCtx bindCtx = null;
-            IRunningObjectTable runninObjectTable = null;
-            IEnumMoniker enumMoniker = null;
-            try
+            runningObjectTable.EnumRunning(out enumMoniker);
+            if (enumMoniker == null)
             {
-                var r = CreateBindCtx(0, out bindCtx);
-                Marshal.ThrowExceptionForHR(r);
-                if (bindCtx == null)
-                {
-                    Trace($"BindCtx is null. Cannot attach VS.");
-                    return false;
-                }
-                bindCtx.GetRunningObjectTable(out runninObjectTable);
-                if (runninObjectTable == null)
-                {
-                    Trace($"RunningObjectTable is null. Cannot attach VS.");
-                    return false;
-                }
+                Trace($"EnumMoniker is null. Cannot attach VS.");
+                return false;
+            }
 
-                runninObjectTable.EnumRunning(out enumMoniker);
-                if (enumMoniker == null)
-                {
-                    Trace($"EnumMoniker is null. Cannot attach VS.");
-                    return false;
-                }
+            var dteSuffix = ":" + vs.Id;
 
-                var dteSuffix = ":" + vs.Id;
+            var moniker = new IMoniker[1];
+            while (enumMoniker.Next(1, moniker, IntPtr.Zero) == 0 && moniker[0] != null)
+            {
 
-                var moniker = new IMoniker[1];
-                while (enumMoniker.Next(1, moniker, IntPtr.Zero) == 0 && moniker[0] != null)
-                {
-                    string dn;
+                moniker[0].GetDisplayName(bindCtx, null, out string dn);
 
-                    moniker[0].GetDisplayName(bindCtx, null, out dn);
+                if (dn.StartsWith("!VisualStudio.DTE.") && dn.EndsWith(dteSuffix))
+                {
+                    object dbg, lps;
+                    runningObjectTable.GetObject(moniker[0], out object dte);
 
-                    if (dn.StartsWith("!VisualStudio.DTE.") && dn.EndsWith(dteSuffix))
+                    // The COM object can be busy, we retry few times, hoping that it won't be busy next time.
+                    for (var i = 0; i < 10; i++)
                     {
-                        object dte, dbg, lps;
-                        runninObjectTable.GetObject(moniker[0], out dte);
-
-                        // The COM object can be busy, we retry few times, hoping that it won't be busy next time.
-                        for (var i = 0; i < 10; i++)
+                        try
                         {
-                            try
+                            dbg = dte.GetType().InvokeMember("Debugger", BindingFlags.GetProperty, null, dte, null, CultureInfo.InvariantCulture)!;
+                            lps = dbg.GetType().InvokeMember("LocalProcesses", BindingFlags.GetProperty, null, dbg, null, CultureInfo.InvariantCulture)!;
+                            var lpn = (System.Collections.IEnumerator)lps.GetType().InvokeMember("GetEnumerator", BindingFlags.InvokeMethod, null, lps, null, CultureInfo.InvariantCulture)!;
+
+                            while (lpn.MoveNext())
                             {
-                                dbg = dte.GetType().InvokeMember("Debugger", BindingFlags.GetProperty, null, dte, null);
-                                lps = dbg.GetType().InvokeMember("LocalProcesses", BindingFlags.GetProperty, null, dbg, null);
-                                var lpn = (System.Collections.IEnumerator)lps.GetType().InvokeMember("GetEnumerator", BindingFlags.InvokeMethod, null, lps, null);
+                                var pn = Convert.ToInt32(lpn.Current.GetType().InvokeMember("ProcessID", BindingFlags.GetProperty, null, lpn.Current, null, CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
 
-                                while (lpn.MoveNext())
+                                if (pn == pid)
                                 {
-                                    var pn = Convert.ToInt32(lpn.Current.GetType().InvokeMember("ProcessID", BindingFlags.GetProperty, null, lpn.Current, null));
-
-                                    if (pn == pid)
-                                    {
-                                        lpn.Current.GetType().InvokeMember("Attach", BindingFlags.InvokeMethod, null, lpn.Current, null);
-                                        return true;
-                                    }
+                                    lpn.Current.GetType().InvokeMember("Attach", BindingFlags.InvokeMethod, null, lpn.Current, null, CultureInfo.InvariantCulture);
+                                    return true;
                                 }
                             }
-                            catch (COMException ex)
-                            {
-                                Trace($"ComException: Retrying in 250ms.\n{ex}");
-                                Thread.Sleep(250);
-                            }
                         }
-                        Marshal.ReleaseComObject(moniker[0]);
-
-                        break;
+                        // Catch the exception if it is COMException coming directly, or coming from methodInvocation, otherwise just let it be.
+                        catch (Exception ex) when (ex is COMException || (ex is TargetInvocationException tie && tie.InnerException is COMException))
+                        {
+                            Trace($"ComException: Retrying in 250ms.\n{ex}");
+                            Thread.Sleep(250);
+                        }
                     }
-
                     Marshal.ReleaseComObject(moniker[0]);
+
+                    break;
                 }
-                return false;
+
+                Marshal.ReleaseComObject(moniker[0]);
             }
-            finally
+            return false;
+        }
+        finally
+        {
+            if (enumMoniker != null)
             {
-                if (enumMoniker != null)
+                try
                 {
-                    try
-                    {
-                        Marshal.ReleaseComObject(enumMoniker);
-                    }
-                    catch { }
+                    Marshal.ReleaseComObject(enumMoniker);
                 }
-                if (runninObjectTable != null)
+                catch { }
+            }
+            if (runningObjectTable != null)
+            {
+                try
                 {
-                    try
-                    {
-                        Marshal.ReleaseComObject(runninObjectTable);
-                    }
-                    catch { }
+                    Marshal.ReleaseComObject(runningObjectTable);
                 }
-                if (bindCtx != null)
+                catch { }
+            }
+            if (bindCtx != null)
+            {
+                try
                 {
-                    try
-                    {
-                        Marshal.ReleaseComObject(bindCtx);
-                    }
-                    catch { }
+                    Marshal.ReleaseComObject(bindCtx);
                 }
+                catch { }
             }
         }
+    }
 
-        private static Process GetVsFromPid(Process process)
+    private static Process? GetVsFromPid(Process process)
+    {
+        var parent = process;
+        while (!IsVsOrNull(parent))
         {
-            var parent = process;
-            while (!IsVsOrNull(parent))
-            {
-                parent = GetParentProcess(parent);
-            }
+            parent = GetParentProcess(parent);
+        }
 
-            return parent;
+        return parent;
+    }
+
+    private static bool IsVsOrNull([NotNullWhen(false)] Process? process)
+    {
+        if (process == null)
+        {
+            Trace("Parent process is null..");
+            return true;
         }
 
-        private static bool IsVsOrNull(Process process)
+        var isVs = process.ProcessName.Equals("devenv", StringComparison.InvariantCultureIgnoreCase);
+        if (isVs)
         {
-            if (process == null)
-            {
-                Trace("Parent process is null..");
-                return true;
-            }
+            Trace($"Process {process.ProcessName} ({process.Id}) is VS.");
+        }
+        else
+        {
+            Trace($"Process {process.ProcessName} ({process.Id}) is not VS.");
+        }
 
-            var isVs = process.ProcessName.Equals("devenv", StringComparison.InvariantCultureIgnoreCase);
-            if (isVs)
-            {
-                Trace($"Process {process.ProcessName} ({process.Id}) is VS.");
-            }
-            else
+        return isVs;
+    }
+
+    private static bool IsCorrectParent(Process currentProcess, Process parent)
+    {
+        try
+        {
+            // Parent needs to start before the child, otherwise it might be a different process
+            // that is just reusing the same PID.
+            if (parent.StartTime <= currentProcess.StartTime)
             {
-                Trace($"Process {process.ProcessName} ({process.Id}) is not VS.");
+                return true;
             }
 
-            return isVs;
+            Trace($"Process {parent.ProcessName} ({parent.Id}) is not a valid parent because it started after the current process.");
         }
+        catch
+        {
+            // Access denied or process exited while we were holding the Process object.
+        }
+
+        return false;
+    }
 
-        private static bool IsCorrectParent(Process currentProcess, Process parent)
+    private static Process? GetParentProcess(Process process)
+    {
+        int id = GetParentProcessId(process);
+        if (id != -1)
         {
             try
             {
-                // Parent needs to start before the child, otherwise it might be a different process 
-                // that is just reusing the same PID.
-                if (parent.StartTime <= currentProcess.StartTime)
-                {
-                    return true;
-                }
-
-                Trace($"Process {parent.ProcessName} ({parent.Id}) is not a valid parent because it started after the current process.");
-                return false;
+                var parent = Process.GetProcessById(id);
+                if (IsCorrectParent(process, parent))
+                    return parent;
             }
             catch
             {
-                // Access denied or process exited while we were holding the Process object.
-                return false;
+                // throws when parent no longer runs
             }
         }
 
-        private static Process GetParentProcess(Process process)
+        return null;
+
+        static int GetParentProcessId(Process process)
         {
-            var id = -1;
             try
             {
                 var handle = process.Handle;
@@ -241,57 +274,39 @@ private static Process GetParentProcess(Process process)
 
                 var p = res != 0 ? -1 : pbi.InheritedFromUniqueProcessId.ToInt32();
 
-                id = p;
+                return p;
             }
             catch
             {
-                id = -1;
+                return -1;
             }
-
-            Process parent = null;
-            if (id != -1)
-            {
-                try
-                {
-                    parent = Process.GetProcessById(id);
-                }
-                catch
-                {
-                    // throws when parent no longer runs
-                }
-            }
-
-            return IsCorrectParent(process, parent) ? parent : null;
-        }
-
-        private static void Trace(string message, [CallerMemberName] string methodName = null)
-        {
-            System.Diagnostics.Trace.WriteLine($"{methodName}: {message}");
         }
+    }
 
-        [StructLayout(LayoutKind.Sequential)]
-        private struct PROCESS_BASIC_INFORMATION
-        {
-            public IntPtr ExitStatus;
-            public IntPtr PebBaseAddress;
-            public IntPtr AffinityMask;
-            public IntPtr BasePriority;
-            public IntPtr UniqueProcessId;
-            public IntPtr InheritedFromUniqueProcessId;
-        }
+    private static void Trace(string message, [CallerMemberName] string? methodName = null)
+    {
+        System.Diagnostics.Trace.WriteLine($"[AttachVS]{methodName}: {message}");
+    }
 
-        [DllImport("ntdll.dll", SetLastError = true)]
-        private static extern int NtQueryInformationProcess(
-                IntPtr processHandle,
-                int processInformationClass,
-                out PROCESS_BASIC_INFORMATION processInformation,
-                int processInformationLength,
-                out int returnLength);
+    [StructLayout(LayoutKind.Sequential)]
+    private struct PROCESS_BASIC_INFORMATION
+    {
+        public readonly IntPtr ExitStatus;
+        public readonly IntPtr PebBaseAddress;
+        public readonly IntPtr AffinityMask;
+        public readonly IntPtr BasePriority;
+        public readonly IntPtr UniqueProcessId;
+        public IntPtr InheritedFromUniqueProcessId;
+    }
 
-        [DllImport("Kernel32")]
-        private static extern uint GetTickCount();
+    [DllImport("ntdll.dll", SetLastError = true)]
+    private static extern int NtQueryInformationProcess(
+        IntPtr processHandle,
+        int processInformationClass,
+        out PROCESS_BASIC_INFORMATION processInformation,
+        int processInformationLength,
+        out int returnLength);
 
-        [DllImport("ole32.dll")]
-        private static extern int CreateBindCtx(uint reserved, out IBindCtx ppbc);
-    }
+    [DllImport("ole32.dll")]
+    private static extern int CreateBindCtx(uint reserved, out IBindCtx ppbc);
 }
diff --git a/src/AttachVS/Program.cs b/src/AttachVS/Program.cs
index dc57adea49..3dbf3113ee 100644
--- a/src/AttachVS/Program.cs
+++ b/src/AttachVS/Program.cs
@@ -1,28 +1,35 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
 using System.Linq;
 
-namespace Microsoft.TestPlatform.AttachVS
+namespace Microsoft.TestPlatform.AttachVS;
+
+internal class Program
 {
-    internal class Program
+    static void Main(string[] args)
     {
-        static void Main(string[] args)
-        {
-            int? pid = ParsePid(args, position: 0);
-            int? vsPid = ParsePid(args, position: 1);
+        _ = args ?? throw new ArgumentNullException(nameof(args));
+
+        Trace.Listeners.Add(new ConsoleTraceListener());
 
-            var exitCode = DebuggerUtility.AttachVSToProcess(pid, vsPid) ? 0 : 1;
-            Environment.Exit(exitCode);
-        }
+        int? pid = ParsePid(args, position: 0);
+        int? vsPid = ParsePid(args, position: 1);
 
-        private static int? ParsePid(string[] args, int position)
-        {
-            var id = args.Skip(position).Take(1).SingleOrDefault();
-            int? pid = id == null
-                ? null
-                : int.TryParse(id, out var i)
-                    ? i
-                    : null;
-            return pid;
-        }
+        var exitCode = DebuggerUtility.AttachVSToProcess(pid, vsPid) ? 0 : 1;
+        Environment.Exit(exitCode);
+    }
+
+    private static int? ParsePid(string[] args, int position)
+    {
+        var id = args.Skip(position).Take(1).SingleOrDefault();
+        int? pid = id == null
+            ? null
+            : int.TryParse(id, out var i)
+                ? i
+                : null;
+        return pid;
     }
 }
diff --git a/src/AttachVS/PublicAPI/PublicAPI.Shipped.txt b/src/AttachVS/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/AttachVS/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/AttachVS/PublicAPI/PublicAPI.Unshipped.txt b/src/AttachVS/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/AttachVS/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
new file mode 100644
index 0000000000..9e59a211fa
--- /dev/null
+++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <Prefer32Bit>false</Prefer32Bit>
+    <OutputType>Exe</OutputType>
+    <IsTestProject>false</IsTestProject>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win10-arm64</RuntimeIdentifier>
+    <!-- Setting both RuntimeIdentifier and PlatformTarget ends up building as AnyCPU and selecting the default x86 architecture, irregardless of RuntimeIdentifier,
+    so order here matters. -->
+    <PlatformTarget Condition=" '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <!--
+      NETSDK1201: For projects targeting .NET 8.0 and higher, specifying a RuntimeIdentifier will no longer produce a
+      self contained app by default. To continue building self-contained apps, set the SelfContained property to true
+      or use the -\-self-contained argument.
+      -->
+    <MSBuildWarningsAsMessages>NETSDK1201</MSBuildWarningsAsMessages>
+    <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\DumpMinitool.x86\Program.cs" Link="Program.cs" />
+    <Compile Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\MiniDumpWriteDump.cs" Link="MiniDumpWriteDump.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\DumpMinitool.x86\PublicAPI\PublicAPI.Shipped.txt" Link="PublicAPI\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\DumpMinitool.x86\PublicAPI\PublicAPI.Unshipped.txt" Link="PublicAPI\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
index 2108e3fb13..e1613e1b01 100644
--- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
+++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
@@ -1,25 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">true</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
-    <RuntimeIdentifier Condition=" '$(DotNetBuildFromSource)' != 'true' ">win7-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x86</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <!--
+      NETSDK1201: For projects targeting .NET 8.0 and higher, specifying a RuntimeIdentifier will no longer produce a
+      self contained app by default. To continue building self-contained apps, set the SelfContained property to true
+      or use the -\-self-contained argument.
+      -->
+    <MSBuildWarningsAsMessages>NETSDK1201</MSBuildWarningsAsMessages>
+    <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
   </PropertyGroup>
 
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\DumpMinitool\Program.cs" Link="Program.cs" />
+    <Compile Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\MiniDumpWriteDump.cs" Link="MiniDumpWriteDump.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/DataCollectors/DumpMinitool.x86/Program.cs b/src/DataCollectors/DumpMinitool.x86/Program.cs
new file mode 100644
index 0000000000..81373b6b99
--- /dev/null
+++ b/src/DataCollectors/DumpMinitool.x86/Program.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading;
+
+using Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+namespace DumpMinitool;
+
+internal class Program
+{
+    static int Main(string[] args)
+    {
+        DebuggerBreakpoint.WaitForDebugger("VSTEST_DUMPTOOL_DEBUG");
+        Console.WriteLine($"Dump minitool: Started with arguments {string.Join(" ", args)}");
+        if (args?.Length != 6)
+        {
+            Console.WriteLine($"There were {args?.Length ?? 0} arguments. Provide exactly 6 arguments: --file <fullyResolvedPath> --processId <processId> --dumpType <dumpType>");
+            return 2;
+        }
+
+        var outputFile = args[1];
+        var processId = int.Parse(args[3], CultureInfo.InvariantCulture);
+        var dumpType = (MiniDumpTypeOption)Enum.Parse(typeof(MiniDumpTypeOption), args[5]);
+
+        Console.WriteLine($"Output file: '{outputFile}'");
+        Console.WriteLine($"Process id: {processId}");
+        Console.WriteLine($"Dump type: {dumpType}");
+
+        // Dump the process!
+        try
+        {
+            MiniDumpWriteDump.CollectDumpUsingMiniDumpWriteDump(Process.GetProcessById(processId), outputFile, dumpType);
+            Console.WriteLine("Dumped process.");
+            return 0;
+        }
+        catch (Exception err)
+        {
+            Console.WriteLine($"Error dumping process {err}");
+
+            return 1;
+        }
+    }
+}
+
+internal static class DebuggerBreakpoint
+{
+    internal static void WaitForDebugger(string environmentVariable)
+    {
+        if (string.IsNullOrWhiteSpace(environmentVariable))
+        {
+            throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
+        }
+
+        var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
+        if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal))
+        {
+            Console.WriteLine("Waiting for debugger attach...");
+
+            var currentProcess = Process.GetCurrentProcess();
+            Console.WriteLine("Process Id: {0}, Name: {1}", currentProcess.Id, currentProcess.ProcessName);
+
+            while (!Debugger.IsAttached)
+            {
+                Thread.Sleep(1000);
+            }
+
+            Debugger.Break();
+        }
+    }
+}
diff --git a/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Shipped.txt b/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Unshipped.txt b/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/DumpMinitool.x86/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
index a9ce1ae2e1..a3038987b1 100644
--- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
+++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
@@ -1,21 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--
+      This is targetting .NET Framework only on purpose. We want the exe, and we want it to run as different architecture.
+      Using .NET Framework for this makes it much easier, than .NET because we don't have to lookup the correct arch of the runtime.
+      Alternative to this would be using .NET AOT, but it makes it harder to just build, since you need to publish to get the exe.
+    -->
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
-    <RuntimeIdentifier Condition=" '$(DotNetBuildFromSource)' != 'true' ">win7-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x64</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <!--
+      NETSDK1201: For projects targeting .NET 8.0 and higher, specifying a RuntimeIdentifier will no longer produce a
+      self contained app by default. To continue building self-contained apps, set the SelfContained property to true
+      or use the -\-self-contained argument.
+      -->
+    <MSBuildWarningsAsMessages>NETSDK1201</MSBuildWarningsAsMessages>
+    <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
   </PropertyGroup>
-  
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <Compile Include="..\DumpMinitool.x86\Program.cs" Link="Program.cs" />
+    <Compile Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\MiniDumpWriteDump.cs" Link="MiniDumpWriteDump.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\DumpMinitool.x86\PublicAPI\PublicAPI.Shipped.txt" Link="PublicAPI\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\DumpMinitool.x86\PublicAPI\PublicAPI.Unshipped.txt" Link="PublicAPI\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/DataCollectors/DumpMinitool/Program.cs b/src/DataCollectors/DumpMinitool/Program.cs
deleted file mode 100644
index 815cf6bfa9..0000000000
--- a/src/DataCollectors/DumpMinitool/Program.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace DumpMinitool
-{
-    internal class Program
-    {
-        static int Main(string[] args)
-        {
-            DebuggerBreakpoint.WaitForDebugger("VSTEST_DUMPTOOL_DEBUG");
-            Console.WriteLine($"Dump minitool: Started with arguments {string.Join(" ", args)}");
-            if (args?.Length != 6)
-            {
-                Console.WriteLine($"There were { args?.Length ?? 0 } parameters. Provide exactly 6 parameters: --file <fullyResolvedPath> --processId <processId> --dumpType <dumpType>");
-                return 2;
-            }
-
-            var outputFile = args[1];
-            var processId = int.Parse(args[3]);
-            var type = Enum.Parse(typeof(DumpTypeOption), args[5]);
-
-            Console.WriteLine($"Output file: '{outputFile}'");
-            Console.WriteLine($"Process id: {processId}");
-            Console.WriteLine($"Dump type: {type}");
-
-            var process = Process.GetProcessById(processId);
-
-            using (var stream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None))
-            {
-                NativeMethods.MINIDUMP_EXCEPTION_INFORMATION exceptionInfo = default;
-
-                NativeMethods.MINIDUMP_TYPE dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpNormal;
-                switch (type)
-                {
-                    case DumpTypeOption.Full:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemory |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithDataSegs |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithHandleData |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithUnloadedModules |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemoryInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithTokenInformation;
-                        break;
-                    case DumpTypeOption.WithHeap:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithPrivateReadWriteMemory |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithDataSegs |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithHandleData |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithUnloadedModules |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemoryInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithTokenInformation;
-                        break;
-                    case DumpTypeOption.Mini:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo;
-                        break;
-                }
-
-                // Retry the write dump on ERROR_PARTIAL_COPY
-                for (int i = 0; i < 5; i++)
-                {
-                    // Dump the process!
-                    if (NativeMethods.MiniDumpWriteDump(process.Handle, (uint)process.Id, stream.SafeFileHandle, dumpType, ref exceptionInfo, IntPtr.Zero, IntPtr.Zero))
-                    {
-                        Console.WriteLine("Dumped process.");
-                        return 0;
-                    }
-                    else
-                    {
-                        int err = Marshal.GetHRForLastWin32Error();
-                        if (err != NativeMethods.ERROR_PARTIAL_COPY)
-                        {
-                            Console.WriteLine($"Error dumping process {err}");
-                            Marshal.ThrowExceptionForHR(err);
-                        }
-                        else
-                        {
-                            Console.WriteLine($"Error dumping process, was ERROR_PARTIAL_COPY, retrying.");
-                        }
-                    }
-                }
-
-                Console.WriteLine($"Error dumping process after 5 retries.");
-                return 1;
-            }
-        }
-
-        private static class NativeMethods
-        {
-            public const int ERROR_PARTIAL_COPY = unchecked((int)0x8007012b);
-
-            [DllImport("Dbghelp.dll", SetLastError = true)]
-            public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint ProcessId, SafeFileHandle hFile, MINIDUMP_TYPE DumpType, ref MINIDUMP_EXCEPTION_INFORMATION ExceptionParam, IntPtr UserStreamParam, IntPtr CallbackParam);
-
-            [StructLayout(LayoutKind.Sequential, Pack = 4)]
-            public struct MINIDUMP_EXCEPTION_INFORMATION
-            {
-                public uint ThreadId;
-                public IntPtr ExceptionPointers;
-                public int ClientPointers;
-            }
-
-            [Flags]
-#pragma warning disable SA1201 // Elements must appear in the correct order
-            public enum MINIDUMP_TYPE : uint
-#pragma warning restore SA1201 // Elements must appear in the correct order
-            {
-                MiniDumpNormal = 0,
-                MiniDumpWithDataSegs = 1 << 0,
-                MiniDumpWithFullMemory = 1 << 1,
-                MiniDumpWithHandleData = 1 << 2,
-                MiniDumpFilterMemory = 1 << 3,
-                MiniDumpScanMemory = 1 << 4,
-                MiniDumpWithUnloadedModules = 1 << 5,
-                MiniDumpWithIndirectlyReferencedMemory = 1 << 6,
-                MiniDumpFilterModulePaths = 1 << 7,
-                MiniDumpWithProcessThreadData = 1 << 8,
-                MiniDumpWithPrivateReadWriteMemory = 1 << 9,
-                MiniDumpWithoutOptionalData = 1 << 10,
-                MiniDumpWithFullMemoryInfo = 1 << 11,
-                MiniDumpWithThreadInfo = 1 << 12,
-                MiniDumpWithCodeSegs = 1 << 13,
-                MiniDumpWithoutAuxiliaryState = 1 << 14,
-                MiniDumpWithFullAuxiliaryState = 1 << 15,
-                MiniDumpWithPrivateWriteCopyMemory = 1 << 16,
-                MiniDumpIgnoreInaccessibleMemory = 1 << 17,
-                MiniDumpWithTokenInformation = 1 << 18,
-                MiniDumpWithModuleHeaders = 1 << 19,
-                MiniDumpFilterTriage = 1 << 20,
-                MiniDumpWithAvxXStateContext = 1 << 21,
-                MiniDumpWithIptTrace = 1 << 22,
-                MiniDumpValidTypeFlags = (-1) ^ ((~1) << 22)
-            }
-        }
-    }
-
-    internal enum DumpTypeOption
-    {
-        Full,
-        WithHeap,
-        Mini,
-    }
-
-    internal static class DebuggerBreakpoint
-    {
-        internal static void WaitForDebugger(string environmentVariable)
-        {
-            if (string.IsNullOrWhiteSpace(environmentVariable))
-            {
-                throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
-            }
-
-            var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
-            if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal))
-            {
-                Console.WriteLine("Waiting for debugger attach...");
-
-                var currentProcess = Process.GetCurrentProcess();
-                Console.WriteLine("Process Id: {0}, Name: {1}", currentProcess.Id, currentProcess.ProcessName);
-
-                while (!Debugger.IsAttached)
-                {
-                    Thread.Sleep(1000);
-                }
-
-                Debugger.Break();
-            }
-        }
-    }
-}
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/BannedSymbols.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/CollectorNameValueConfigurationManager.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/CollectorNameValueConfigurationManager.cs
index c4a9020f58..03628e3afd 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/CollectorNameValueConfigurationManager.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/CollectorNameValueConfigurationManager.cs
@@ -1,129 +1,102 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
-{
-    using System.Collections.Generic;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System.Collections.Generic;
+using System.Xml;
 
-    /// <summary>
-    /// Utility class that collectors can use to read name/value configuration information from
-    /// the XML element sent to them
-    /// </summary>
-    internal class CollectorNameValueConfigurationManager
-    {
-        #region Private constants
-        // Configuration XML constants
-        private const string SettingNameAttributeName = "name";
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        private const string SettingValueAttributeName = "value";
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
 
-        #endregion
-
-        #region Private fields
+/// <summary>
+/// Utility class that collectors can use to read name/value configuration information from
+/// the XML element sent to them
+/// </summary>
+internal class CollectorNameValueConfigurationManager
+{
+    // Configuration XML constants
+    private const string SettingNameAttributeName = "name";
 
-        /// <summary>
-        /// The name/value pairs loaded from the configuration XML element
-        /// </summary>
-        private IDictionary<string, string> nameValuePairs = new Dictionary<string, string>();
+    private const string SettingValueAttributeName = "value";
 
-        #endregion
+    /// <summary>
+    /// The name/value pairs loaded from the configuration XML element
+    /// </summary>
 
-        #region Constructor
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CollectorNameValueConfigurationManager"/> class.
+    /// Loads the configuration name/value information from the provided XML element into a dictionary
+    /// </summary>
+    /// <param name="configurationElement">
+    /// XML element containing the configuration
+    /// </param>
+    public CollectorNameValueConfigurationManager(XmlElement? configurationElement)
+    {
+        if (configurationElement == null)
+        {
+            // There is no configuration
+            return;
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectorNameValueConfigurationManager"/> class.
-        /// Loads the configuration name/value information from the provided XML element into a dictionary
-        /// </summary>
-        /// <param name="configurationElement">
-        /// XML element containing the configuration
-        /// </param>
-        public CollectorNameValueConfigurationManager(XmlElement configurationElement)
+        // Iterate through top-level XML elements within the configuration element and store
+        // name/value information for elements that have name/value attributes.
+        foreach (XmlNode settingNode in configurationElement.ChildNodes)
         {
-            if (configurationElement == null)
+            // Skip all non-elements
+            if (settingNode is not XmlElement settingElement)
             {
-                // There is no configuration
-                return;
+                continue;
             }
 
-            // Iterate through top-level XML elements within the configuration element and store
-            // name/value information for elements that have name/value attributes.
-            foreach (XmlNode settingNode in configurationElement.ChildNodes)
+            // Get the setting name
+            string settingName = settingElement.GetAttribute(SettingNameAttributeName);
+            if (settingName.IsNullOrWhiteSpace())
             {
-                // Skip all non-elements
-                var settingElement = settingNode as XmlElement;
-                if (settingElement == null)
-                {
-                    continue;
-                }
-
-                // Get the setting name
-                string settingName = settingElement.GetAttribute(SettingNameAttributeName);
-                if (string.IsNullOrWhiteSpace(settingName))
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("Skipping configuration setting due to missing setting name");
-                    }
-
-                    continue;
-                }
-
-                // Get the setting value
-                string settingValue = settingElement.GetAttribute(SettingValueAttributeName);
-                if (string.IsNullOrWhiteSpace(settingValue))
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("Skipping configuration setting '{0}' due to missing value", settingName);
-                    }
-
-                    continue;
-                }
-
-                // Save the name/value pair in the dictionary. Note that duplicate settings are
-                // overwritten with the last occurrence's value.
-                if (this.nameValuePairs.ContainsKey(settingName))
-                {
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose(
-                            "Duplicate configuration setting found for '{0}'. Using the last setting.",
-                            settingName);
-                    }
-                }
-
-                this.nameValuePairs[settingName] = settingValue;
+                EqtTrace.Warning("Skipping configuration setting due to missing setting name");
+                continue;
             }
-        }
 
-        #endregion
+            // Get the setting value
+            string settingValue = settingElement.GetAttribute(SettingValueAttributeName);
+            if (settingValue.IsNullOrWhiteSpace())
+            {
+                EqtTrace.Warning("Skipping configuration setting '{0}' due to missing value", settingName);
+                continue;
+            }
 
-        #region Public properties
+            // Save the name/value pair in the dictionary. Note that duplicate settings are
+            // overwritten with the last occurrence's value.
+            if (NameValuePairs.ContainsKey(settingName))
+            {
+                EqtTrace.Verbose(
+                    "Duplicate configuration setting found for '{0}'. Using the last setting.",
+                    settingName);
+            }
 
-        internal IDictionary<string, string> NameValuePairs => this.nameValuePairs;
+            NameValuePairs[settingName] = settingValue;
+        }
+    }
 
-        /// <summary>
-        /// Gets the value of the setting specified by name, or null if it was not found
-        /// </summary>
-        /// <param name="name">The setting name</param>
-        /// <returns>The setting value, or null if the setting was not found</returns>
-        public string this[string name]
+    internal IDictionary<string, string?> NameValuePairs { get; } = new Dictionary<string, string?>();
+
+    /// <summary>
+    /// Gets the value of the setting specified by name, or null if it was not found
+    /// </summary>
+    /// <param name="name">The setting name</param>
+    /// <returns>The setting value, or null if the setting was not found</returns>
+    public string? this[string name]
+    {
+        get
         {
-            get
+            if (name == null)
             {
-                if (name == null)
-                {
-                    return null;
-                }
-
-                this.nameValuePairs.TryGetValue(name, out var settingValue);
-                return settingValue;
+                return null;
             }
 
-            set => this.nameValuePairs[name] = value;
+            NameValuePairs.TryGetValue(name, out var settingValue);
+            return settingValue;
         }
-        #endregion
+
+        set => NameValuePairs[name] = value;
     }
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogCollectorException.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogCollectorException.cs
index 169a7a3442..f6f706f979 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogCollectorException.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogCollectorException.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
 
+/// <summary>
+/// Private Exception class used for event log exceptions
+/// </summary>
+internal class EventLogCollectorException : Exception
+{
     /// <summary>
-    /// Private Exception class used for event log exceptions
+    /// Initializes a new instance of the <see cref="EventLogCollectorException"/> class.
     /// </summary>
-    internal class EventLogCollectorException : Exception
+    /// <param name="localizedMessage">the localized exception message</param>
+    /// <param name="innerException">the inner exception</param>
+    public EventLogCollectorException(string? localizedMessage, Exception? innerException)
+        : base(localizedMessage, innerException)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventLogCollectorException"/> class.
-        /// </summary>
-        /// <param name="localizedMessage">the localized exception message</param>
-        /// <param name="innerException">the inner exception</param>
-        public EventLogCollectorException(string localizedMessage, Exception innerException)
-            : base(localizedMessage, innerException)
-        {
-        }
     }
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogConstants.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogConstants.cs
index 1f74f8c00c..02fba1296f 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogConstants.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogConstants.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
+
+/// <summary>
+/// Constants used by Event Log Data Collector.
+/// </summary>
+internal static class EventLogConstants
 {
-    /// <summary>
-    /// Constants used by Event Log Data Collector.
-    /// </summary>
-    internal static class EventLogConstants
-    {
-        // Supported configuration setting names
-        public const string SettingEventLogs = "EventLogs";
-        public const string SettingEventSources = "EventSources";
-        public const string SettingEntryTypes = "EntryTypes";
-        public const string SettingMaxEntries = "MaxEventLogEntriesToCollect";
+    // Supported configuration setting names
+    public const string SettingEventLogs = "EventLogs";
+    public const string SettingEventSources = "EventSources";
+    public const string SettingEntryTypes = "EntryTypes";
+    public const string SettingMaxEntries = "MaxEventLogEntriesToCollect";
 
-        // default values
-        public const int DefaultMaxEntries = 50000;
+    // default values
+    public const int DefaultMaxEntries = 50000;
 
-        public const int TypeColumnMaxLength = 64;
-        public const int SourceColumnMaxLength = 212;
-    }
-}
\ No newline at end of file
+    public const int TypeColumnMaxLength = 64;
+    public const int SourceColumnMaxLength = 212;
+}
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogContainer.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogContainer.cs
index b8a98bc493..28894e918c 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogContainer.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogContainer.cs
@@ -1,271 +1,234 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-
-    using Resource = Microsoft.TestPlatform.Extensions.EventLogCollector.Resources.Resources;
-
-    /// <summary>
-    /// The event log container.
-    /// </summary>
-    internal class EventLogContainer : IEventLogContainer
-    {
-        private ISet<string> eventSources;
-
-        private ISet<EventLogEntryType> entryTypes;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
 
-        private EventLog eventLog;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-        private int nextEntryIndexToCollect;
+using Resource = Microsoft.TestPlatform.Extensions.EventLogCollector.Resources.Resources;
 
-        private int maxLogEntries;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
 
-        private DataCollectionLogger dataCollectionLogger;
+/// <summary>
+/// The event log container.
+/// </summary>
+internal class EventLogContainer : IEventLogContainer
+{
+    private readonly ISet<string>? _eventSources;
 
-        private DataCollectionContext dataCollectionContext;
+    private readonly ISet<EventLogEntryType> _entryTypes;
+    private readonly int _maxLogEntries;
 
-        private bool limitReached;
+    private readonly DataCollectionLogger _dataCollectionLogger;
+    private readonly DataCollectionContext _dataCollectionContext;
 
-        private List<EventLogEntry> eventLogEntries;
+    /// <summary>
+    /// Keeps track of if we are disposed.
+    /// </summary>
+    private bool _isDisposed;
 
-        /// <summary>
-        /// Keeps track of if we are disposed.
-        /// </summary>
-        private bool isDisposed;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventLogContainer"/> class.
+    /// </summary>
+    /// <param name="eventLogName">
+    /// Event Log Name for which logs has to be collected.
+    /// </param>
+    /// <param name="eventSources">
+    /// The event Sources.
+    /// </param>
+    /// <param name="entryTypes">
+    /// The entry Types.
+    /// </param>
+    /// <param name="maxLogEntries">
+    /// Max entries to store
+    /// </param>
+    /// <param name="dataCollectionLogger">
+    /// Data Collection Logger
+    /// </param>
+    /// <param name="dataCollectionContext">
+    /// Data Collection Context
+    /// </param>
+    public EventLogContainer(string eventLogName, ISet<string>? eventSources, ISet<EventLogEntryType> entryTypes, int maxLogEntries, DataCollectionLogger dataCollectionLogger, DataCollectionContext dataCollectionContext)
+    {
+        EventLog = new EventLog(eventLogName);
+        EventLog.EnableRaisingEvents = true;
+        EventLog.EntryWritten += OnEventLogEntryWritten;
+        int currentCount = EventLog.Entries.Count;
+        NextEntryIndexToCollect = currentCount == 0 ? 0 : EventLog.Entries[currentCount - 1].Index + 1;
+        _eventSources = eventSources;
+        _entryTypes = entryTypes;
+        _maxLogEntries = maxLogEntries;
+        _dataCollectionLogger = dataCollectionLogger;
+        _dataCollectionContext = dataCollectionContext;
+
+        EventLogEntries = new List<EventLogEntry>();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventLogContainer"/> class.
-        /// </summary>
-        /// <param name="eventLogName">
-        /// Event Log Name for which logs has to be collected.
-        /// </param>
-        /// <param name="eventSources">
-        /// The event Sources.
-        /// </param>
-        /// <param name="entryTypes">
-        /// The entry Types.
-        /// </param>
-        /// <param name="maxLogEntries">
-        /// Max entries to store
-        /// </param>
-        /// <param name="dataCollectionLogger">
-        /// Data Collection Logger
-        /// </param>
-        /// <param name="dataCollectionContext">
-        /// Data Collection Context
-        /// </param>
-        public EventLogContainer(string eventLogName, ISet<string> eventSources, ISet<EventLogEntryType> entryTypes, int maxLogEntries, DataCollectionLogger dataCollectionLogger, DataCollectionContext dataCollectionContext)
-        {
-            this.CreateEventLog(eventLogName);
-            this.eventSources = eventSources;
-            this.entryTypes = entryTypes;
-            this.maxLogEntries = maxLogEntries;
-            this.dataCollectionLogger = dataCollectionLogger;
-            this.dataCollectionContext = dataCollectionContext;
+    /// <inheritdoc />
+    public List<EventLogEntry> EventLogEntries { get; }
 
-            this.eventLogEntries = new List<EventLogEntry>();
-        }
+    /// <inheritdoc />
+    public EventLog EventLog { get; }
 
-        /// <inheritdoc />
-        public List<EventLogEntry> EventLogEntries => this.eventLogEntries;
+    internal int NextEntryIndexToCollect { get; set; }
 
-        /// <inheritdoc />
-        public EventLog EventLog => this.eventLog;
+    /// <summary>
+    /// Gets or sets a value indicating whether limit reached.
+    /// </summary>
+    internal bool LimitReached { get; set; }
 
-        internal int NextEntryIndexToCollect
-        {
-            get => this.nextEntryIndexToCollect;
+    public void Dispose()
+    {
+        Dispose(true);
 
-            set => this.nextEntryIndexToCollect = value;
-        }
+        // Use SupressFinalize in case a subclass
+        // of this type implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether limit reached.
-        /// </summary>
-        internal bool LimitReached
+    /// <summary>
+    /// This is the event handler for the EntryWritten event of the System.Diagnostics.EventLog class.
+    /// Note that the documentation for the EntryWritten event includes these remarks:
+    ///     "The system responds to WriteEntry only if the last write event occurred at least five seconds previously.
+    ///      This implies you will only receive one EntryWritten event notification within a five-second interval, even if more
+    ///      than one event log change occurs. If you insert a sufficiently long sleep interval (around 10 seconds) between calls
+    ///      to WriteEntry, no events will be lost. However, if write events occur more frequently, the most recent write events
+    ///      could be lost."
+    /// This complicates this data collector because we don't want to sleep to wait for all events or lose the most recent events.
+    /// To workaround, the implementation does several things:
+    /// 1. We get the EventLog entries to collect from the EventLog.Entries collection and ignore the EntryWrittenEventArgs.
+    /// 2. When event log collection ends for a data collection context, this method is called explicitly by the EventLogDataCollector
+    ///    passing null for EntryWrittenEventArgs (which is fine since the argument is ignored.
+    /// 3. We keep track of which EventLogEntry object in the EventLog.Entries we still need to collect.  We do this by inspecting
+    ///    the value of the EventLogEntry.Index property.  The value of this property is an integer that is incremented for each entry
+    ///    that is written to the event log, but is reset to 0 if the entire event log is cleared.
+    /// Another behavior of event logs that we need to account for is that if the event log reaches a size limit, older events are
+    /// automatically deleted.  In this case the collection EventLog.Entries contains only the entries remaining in the log,
+    /// and the value of the EventLog.Entries[0].Index will not be 0; it will be the index of the oldest entry still in the log.
+    /// For example, if the first 1000 entries written to an event log (since it was last completely cleared) are deleted because
+    /// of the size limitation, then EventLog.Entries[0].Index would have a value of 1000 (this value is saved in the local variable
+    /// "firstIndexInLog" in the method implementation.  Similarly "mostRecentIndexInLog" is the index of the last entry written
+    /// to the log at the time we examine it.
+    /// </summary>
+    /// <param name="source">Source</param>
+    /// <param name="e">The System.Diagnostics.EntryWrittenEventArgs object describing the entry that was written.</param>
+    public void OnEventLogEntryWritten(object? source, EntryWrittenEventArgs? e)
+    {
+        while (!LimitReached)
         {
-            get => this.limitReached;
+            try
+            {
+                lock (EventLogEntries)
+                {
+                    int currentCount = EventLog.Entries.Count;
+                    if (currentCount == 0)
+                    {
+                        break;
+                    }
 
-            set => this.limitReached = value;
-        }
+                    int firstIndexInLog = EventLog.Entries[0].Index;
+                    int mostRecentIndexInLog = EventLog.Entries[currentCount - 1].Index;
 
-        public void Dispose()
-        {
-            this.Dispose(true);
+                    if (mostRecentIndexInLog == NextEntryIndexToCollect - 1)
+                    {
+                        // We've already collected the most recent entry in the log
+                        break;
+                    }
 
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
+                    if (mostRecentIndexInLog < NextEntryIndexToCollect - 1)
+                    {
+                        EqtTrace.Warning(
+                            "EventLogDataContainer: OnEventLogEntryWritten: Handling clearing of log (mostRecentIndexInLog < eventLogContainer.NextEntryIndex): firstIndexInLog: {0}:, mostRecentIndexInLog: {1}, NextEntryIndex: {2}",
+                            firstIndexInLog,
+                            mostRecentIndexInLog,
+                            NextEntryIndexToCollect);
+
+                        // Send warning; event log must have been cleared.
+                        _dataCollectionLogger.LogWarning(
+                            _dataCollectionContext,
+                            string.Format(
+                                CultureInfo.CurrentCulture,
+                                Resource.EventsLostWarning,
+                                EventLog.Log));
+
+                        NextEntryIndexToCollect = 0;
+                        firstIndexInLog = 0;
+                    }
 
-        /// <summary>
-        /// This is the event handler for the EntryWritten event of the System.Diagnostics.EventLog class.
-        /// Note that the documentation for the EntryWritten event includes these remarks:
-        ///     "The system responds to WriteEntry only if the last write event occurred at least five seconds previously.
-        ///      This implies you will only receive one EntryWritten event notification within a five-second interval, even if more
-        ///      than one event log change occurs. If you insert a sufficiently long sleep interval (around 10 seconds) between calls
-        ///      to WriteEntry, no events will be lost. However, if write events occur more frequently, the most recent write events
-        ///      could be lost."
-        /// This complicates this data collector because we don't want to sleep to wait for all events or lose the most recent events.
-        /// To workaround, the implementation does several things:
-        /// 1. We get the EventLog entries to collect from the EventLog.Entries collection and ignore the EntryWrittenEventArgs.
-        /// 2. When event log collection ends for a data collection context, this method is called explicitly by the EventLogDataCollector
-        ///    passing null for EntryWrittenEventArgs (which is fine since the argument is ignored.
-        /// 3. We keep track of which EventLogEntry object in the EventLog.Entries we still need to collect.  We do this by inspecting
-        ///    the value of the EventLogEntry.Index property.  The value of this property is an integer that is incremented for each entry
-        ///    that is written to the event log, but is reset to 0 if the entire event log is cleared.
-        /// Another behavior of event logs that we need to account for is that if the event log reaches a size limit, older events are
-        /// automatically deleted.  In this case the collection EventLog.Entries contains only the entries remaining in the log,
-        /// and the value of the EventLog.Entries[0].Index will not be 0; it will be the index of the oldest entry still in the log.
-        /// For example, if the first 1000 entries written to an event log (since it was last completely cleared) are deleted because
-        /// of the size limitation, then EventLog.Entries[0].Index would have a value of 1000 (this value is saved in the local variable
-        /// "firstIndexInLog" in the method implementation.  Similarly "mostRecentIndexInLog" is the index of the last entry written
-        /// to the log at the time we examine it.
-        /// </summary>
-        /// <param name="source">Source</param>
-        /// <param name="e">The System.Diagnostics.EntryWrittenEventArgs object describing the entry that was written.</param>
-        public void OnEventLogEntryWritten(object source, EntryWrittenEventArgs e)
-        {
-            while (!this.limitReached)
-            {
-                try
-                {
-                    lock (this.eventLogEntries)
+                    for (;
+                         NextEntryIndexToCollect <= mostRecentIndexInLog;
+                         NextEntryIndexToCollect++)
                     {
-                        int currentCount = this.eventLog.Entries.Count;
-                        if (currentCount == 0)
+                        int nextEntryIndexInCurrentLog = NextEntryIndexToCollect - firstIndexInLog;
+                        EventLogEntry nextEntry = EventLog.Entries[nextEntryIndexInCurrentLog];
+
+                        // If an explicit list of event sources was provided, only report log entries from those sources
+                        if (_eventSources != null && _eventSources.Count > 0)
                         {
-                            break;
+                            if (!_eventSources.Contains(nextEntry.Source))
+                            {
+                                continue;
+                            }
                         }
 
-                        int firstIndexInLog = this.eventLog.Entries[0].Index;
-                        int mostRecentIndexInLog = this.eventLog.Entries[currentCount - 1].Index;
-
-                        if (mostRecentIndexInLog == this.nextEntryIndexToCollect - 1)
+                        if (!_entryTypes.Contains(nextEntry.EntryType))
                         {
-                            // We've already collected the most recent entry in the log
-                            break;
+                            continue;
                         }
 
-                        if (mostRecentIndexInLog < this.nextEntryIndexToCollect - 1)
+                        if (EventLogEntries.Count < _maxLogEntries)
                         {
-                            if (EqtTrace.IsWarningEnabled)
-                            {
-                                EqtTrace.Warning(
-                                    string.Format(
-                                        CultureInfo.InvariantCulture,
-                                        "EventLogDataContainer: OnEventLogEntryWritten: Handling clearing of log (mostRecentIndexInLog < eventLogContainer.NextEntryIndex): firstIndexInLog: {0}:, mostRecentIndexInLog: {1}, NextEntryIndex: {2}",
-                                        firstIndexInLog,
-                                        mostRecentIndexInLog,
-                                        this.nextEntryIndexToCollect));
-                            }
+                            EventLogEntries.Add(nextEntry);
 
-                            // Send warning; event log must have been cleared.
-                            this.dataCollectionLogger.LogWarning(
-                                this.dataCollectionContext,
-                                string.Format(
-                                    CultureInfo.InvariantCulture,
-                                    Resource.EventsLostWarning,
-                                    this.eventLog.Log));
-
-                            this.nextEntryIndexToCollect = 0;
-                            firstIndexInLog = 0;
+                            EqtTrace.Verbose(
+                                "EventLogDataContainer.OnEventLogEntryWritten() add event with Id {0} from position {1} in the current {2} log",
+                                nextEntry.Index,
+                                nextEntryIndexInCurrentLog,
+                                EventLog.Log);
                         }
-
-                        for (;
-                            this.nextEntryIndexToCollect <= mostRecentIndexInLog;
-                            this.nextEntryIndexToCollect++)
+                        else
                         {
-                            int nextEntryIndexInCurrentLog = this.nextEntryIndexToCollect - firstIndexInLog;
-                            EventLogEntry nextEntry = this.eventLog.Entries[nextEntryIndexInCurrentLog];
-
-                            // If an explicit list of event sources was provided, only report log entries from those sources
-                            if (this.eventSources != null && this.eventSources.Count > 0)
-                            {
-                                if (!this.eventSources.Contains(nextEntry.Source))
-                                {
-                                    continue;
-                                }
-                            }
-
-                            if (!this.entryTypes.Contains(nextEntry.EntryType))
-                            {
-                                continue;
-                            }
-
-                            if (this.eventLogEntries.Count < this.maxLogEntries)
-                            {
-                                this.eventLogEntries.Add(nextEntry);
-
-                                if (EqtTrace.IsVerboseEnabled)
-                                {
-                                    EqtTrace.Verbose(
-                                        string.Format(
-                                            CultureInfo.InvariantCulture,
-                                            "EventLogDataContainer.OnEventLogEntryWritten() add event with Id {0} from position {1} in the current {2} log",
-                                            nextEntry.Index,
-                                            nextEntryIndexInCurrentLog,
-                                            this.eventLog.Log));
-                                }
-                            }
-                            else
-                            {
-                                this.LimitReached = true;
-                                break;
-                            }
+                            LimitReached = true;
+                            break;
                         }
                     }
                 }
-                catch (Exception exception)
-                {
-                    this.dataCollectionLogger.LogError(
-                        this.dataCollectionContext,
-                        string.Format(
-                            CultureInfo.InvariantCulture,
-                            Resource.EventsLostError,
-                            this.eventLog.Log,
-                            exception), exception);
-                }
+            }
+            catch (Exception exception)
+            {
+                _dataCollectionLogger.LogError(
+                    _dataCollectionContext,
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resource.EventsLostError,
+                        EventLog.Log,
+                        exception), exception);
             }
         }
+    }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        /// <param name="disposing">
-        /// The disposing.
-        /// </param>
-        protected virtual void Dispose(bool disposing)
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    /// <param name="disposing">
+    /// The disposing.
+    /// </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_isDisposed)
         {
-            if (!this.isDisposed)
+            if (disposing)
             {
-                if (disposing)
-                {
-                    this.eventLog.EnableRaisingEvents = false;
-                    this.eventLog.EntryWritten -= this.OnEventLogEntryWritten;
-                    this.eventLog.Dispose();
-                }
-
-                this.isDisposed = true;
+                EventLog.EnableRaisingEvents = false;
+                EventLog.EntryWritten -= OnEventLogEntryWritten;
+                EventLog.Dispose();
             }
-        }
 
-        private void CreateEventLog(string eventLogName)
-        {
-            this.eventLog = new EventLog(eventLogName);
-            this.eventLog.EnableRaisingEvents = true;
-            this.eventLog.EntryWritten += this.OnEventLogEntryWritten;
-            int currentCount = this.eventLog.Entries.Count;
-            this.nextEntryIndexToCollect =
-                (currentCount == 0) ? 0 : this.eventLog.Entries[currentCount - 1].Index + 1;
+            _isDisposed = true;
         }
     }
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs
index 3b5639ea54..9296983499 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs
@@ -1,681 +1,586 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using Resource = Microsoft.TestPlatform.Extensions.EventLogCollector.Resources.Resources;
+
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
+
+/// <summary>
+/// A data collector that collects event log data
+/// </summary>
+[DataCollectorTypeUri(DefaultUri)]
+[DataCollectorFriendlyName("Event Log")]
+public class EventLogDataCollector : DataCollector
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
+    /// <summary>
+    /// The event log file name.
+    /// </summary>
+    private const string EventLogFileName = "Event Log";
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    /// <summary>
+    /// DataCollector URI.
+    /// </summary>
+    private const string DefaultUri = @"datacollector://Microsoft/EventLog/2.0";
 
-    using Resource = Resources.Resources;
+    /// <summary>
+    /// Event handler delegate for the SessionStart event
+    /// </summary>
+    private readonly EventHandler<SessionStartEventArgs> _sessionStartEventHandler;
 
     /// <summary>
-    /// A data collector that collects event log data
+    /// Event handler delegate for the SessionEnd event
     /// </summary>
-    [DataCollectorTypeUri(DefaultUri)]
-    [DataCollectorFriendlyName("Event Log")]
-    public class EventLogDataCollector : DataCollector
-    {
-        #region Constants
-
-        /// <summary>
-        /// The event log file name.
-        /// </summary>
-        private const string EventLogFileName = "Event Log";
-
-        /// <summary>
-        /// DataCollector URI.
-        /// </summary>
-        private const string DefaultUri = @"datacollector://Microsoft/EventLog/2.0";
-
-        #endregion
-
-        #region Private fields
-
-        /// <summary>
-        /// Event handler delegate for the SessionStart event
-        /// </summary>
-        private readonly EventHandler<SessionStartEventArgs> sessionStartEventHandler;
-
-        /// <summary>
-        /// Event handler delegate for the SessionEnd event
-        /// </summary>
-        private readonly EventHandler<SessionEndEventArgs> sessionEndEventHandler;
-
-        /// <summary>
-        /// Event handler delegate for the TestCaseStart event
-        /// </summary>
-        private readonly EventHandler<TestCaseStartEventArgs> testCaseStartEventHandler;
-
-        /// <summary>
-        /// Event handler delegate for the TestCaseEnd event
-        /// </summary>
-        private readonly EventHandler<TestCaseEndEventArgs> testCaseEndEventHandler;
-
-        /// <summary>
-        /// The event log directories.
-        /// </summary>
-        private readonly List<string> eventLogDirectories;
-
-        /// <summary>
-        /// Object containing the execution events the data collector registers for
-        /// </summary>
-        private DataCollectionEvents events;
-
-        /// <summary>
-        /// The sink used by the data collector to send its data
-        /// </summary>
-        private DataCollectionSink dataSink;
-
-        /// <summary>
-        /// The data collector context.
-        /// </summary>
-        private DataCollectionContext dataCollectorContext;
-
-        /// <summary>
-        /// Used by the data collector to send warnings, errors, or other messages
-        /// </summary>
-        private DataCollectionLogger logger;
-
-        /// <summary>
-        /// The event log names.
-        /// </summary>
-        private ISet<string> eventLogNames;
-
-        /// <summary>
-        /// The event sources.
-        /// </summary>
-        private ISet<string> eventSources;
-
-        /// <summary>
-        /// The entry types.
-        /// </summary>
-        private ISet<EventLogEntryType> entryTypes;
-
-        /// <summary>
-        /// The max entries.
-        /// </summary>
-        private int maxEntries;
-
-        /// <summary>
-        /// The file helper.
-        /// </summary>
-        private IFileHelper fileHelper;
-
-        /// <summary>
-        /// The event log map.
-        /// </summary>
-        private IDictionary<string, IEventLogContainer> eventLogContainerMap = new Dictionary<string, IEventLogContainer>();
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventLogDataCollector"/> class.
-        /// </summary>
-        public EventLogDataCollector()
-            : this(new FileHelper())
-        {
-        }
+    private readonly EventHandler<SessionEndEventArgs> _sessionEndEventHandler;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventLogDataCollector"/> class.
-        /// </summary>
-        /// <param name="fileHelper">
-        /// File Helper.
-        /// </param>
-        internal EventLogDataCollector(IFileHelper fileHelper)
-        {
-            this.sessionStartEventHandler = this.OnSessionStart;
-            this.sessionEndEventHandler = this.OnSessionEnd;
-            this.testCaseStartEventHandler = this.OnTestCaseStart;
-            this.testCaseEndEventHandler = this.OnTestCaseEnd;
-
-            this.eventLogDirectories = new List<string>();
-            this.ContextMap = new Dictionary<DataCollectionContext, EventLogSessionContext>();
-            this.fileHelper = fileHelper;
-        }
+    /// <summary>
+    /// Event handler delegate for the TestCaseStart event
+    /// </summary>
+    private readonly EventHandler<TestCaseStartEventArgs> _testCaseStartEventHandler;
 
-        #endregion
+    /// <summary>
+    /// Event handler delegate for the TestCaseEnd event
+    /// </summary>
+    private readonly EventHandler<TestCaseEndEventArgs> _testCaseEndEventHandler;
 
-        #region Internal Fields
+    /// <summary>
+    /// The event log directories.
+    /// </summary>
+    private readonly List<string> _eventLogDirectories;
 
-        internal int MaxEntries
-        {
-            get
-            {
-                return this.maxEntries;
-            }
-        }
+    /// <summary>
+    /// Object containing the execution events the data collector registers for
+    /// </summary>
+    private DataCollectionEvents? _events;
 
-        internal ISet<string> EventSources
-        {
-            get
-            {
-                return this.eventSources;
-            }
-        }
+    /// <summary>
+    /// The sink used by the data collector to send its data
+    /// </summary>
+    private DataCollectionSink? _dataSink;
 
-        internal ISet<EventLogEntryType> EntryTypes
-        {
-            get
-            {
-                return this.entryTypes;
-            }
-        }
+    /// <summary>
+    /// The data collector context.
+    /// </summary>
+    private DataCollectionContext? _dataCollectorContext;
 
-        internal ISet<string> EventLogNames
-        {
-            get
-            {
-                return this.eventLogNames;
-            }
-        }
+    /// <summary>
+    /// Used by the data collector to send warnings, errors, or other messages
+    /// </summary>
+    private DataCollectionLogger? _logger;
 
-        /// <summary>
-        /// Gets the context data.
-        /// </summary>
-        internal Dictionary<DataCollectionContext, EventLogSessionContext> ContextMap { get; private set; }
-
-        #endregion
-
-        #region DataCollector Members
-
-        /// <summary>
-        /// Initializes the data collector
-        /// </summary>
-        /// <param name="configurationElement">
-        /// The XML element containing configuration information for the data collector. Currently,
-        /// this data collector does not have any configuration, so we ignore this parameter.
-        /// </param>
-        /// <param name="events">
-        /// Object containing the execution events the data collector registers for
-        /// </param>
-        /// <param name="dataSink">The sink used by the data collector to send its data</param>
-        /// <param name="logger">
-        /// Used by the data collector to send warnings, errors, or other messages
-        /// </param>
-        /// <param name="dataCollectionEnvironmentContext">Provides contextual information about the agent environment</param>
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext dataCollectionEnvironmentContext)
-        {
-            ValidateArg.NotNull(events, nameof(events));
-            ValidateArg.NotNull(dataSink, nameof(dataSink));
-            ValidateArg.NotNull(logger, nameof(logger));
-
-            this.events = events;
-            this.dataSink = dataSink;
-            this.logger = logger;
-            this.dataCollectorContext = dataCollectionEnvironmentContext.SessionDataCollectionContext;
-
-            // Load the configuration
-            CollectorNameValueConfigurationManager nameValueSettings =
-                new CollectorNameValueConfigurationManager(configurationElement);
-
-            // Apply the configuration
-            this.ConfigureEventSources(nameValueSettings);
-            this.ConfigureEntryTypes(nameValueSettings);
-            this.ConfigureMaxEntries(nameValueSettings);
-            this.ConfigureEventLogNames(nameValueSettings);
-
-            // Register for events
-            events.SessionStart += this.sessionStartEventHandler;
-            events.SessionEnd += this.sessionEndEventHandler;
-            events.TestCaseStart += this.testCaseStartEventHandler;
-            events.TestCaseEnd += this.testCaseEndEventHandler;
-        }
+    /// <summary>
+    /// The file helper.
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
 
-        #endregion
-
-        #region Internal
-
-        /// <summary>
-        /// The write event logs.
-        /// </summary>
-        /// <param name="eventLogEntries">
-        /// The event log entries.
-        /// </param>
-        /// <param name="maxLogEntries">
-        /// Max Log Entries.
-        /// </param>
-        /// <param name="dataCollectionContext">
-        /// The data collection context.
-        /// </param>
-        /// <param name="requestedDuration">
-        /// The requested duration.
-        /// </param>
-        /// <param name="timeRequestReceived">
-        /// The time request received.
-        /// </param>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        internal string WriteEventLogs(List<EventLogEntry> eventLogEntries, int maxLogEntries, DataCollectionContext dataCollectionContext, TimeSpan requestedDuration, DateTime timeRequestReceived)
-        {
-            // Generate a unique but friendly Directory name in the temp directory
-            string eventLogDirName = string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}-{1}-{2:yyyy}{2:MM}{2:dd}-{2:HH}{2:mm}{2:ss}.{2:fff}",
-                "Event Log",
-                Environment.MachineName,
-                DateTime.UtcNow);
+    /// <summary>
+    /// The event log map.
+    /// </summary>
+    private readonly IDictionary<string, IEventLogContainer> _eventLogContainerMap = new Dictionary<string, IEventLogContainer>();
 
-            string eventLogDirPath = Path.Combine(Path.GetTempPath(), eventLogDirName);
+    private bool _isDisposed;
 
-            // Create the directory
-            this.fileHelper.CreateDirectory(eventLogDirPath);
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventLogDataCollector"/> class.
+    /// </summary>
+    public EventLogDataCollector()
+        : this(new FileHelper())
+    {
+    }
 
-            string eventLogBasePath = Path.Combine(eventLogDirPath, EventLogFileName);
-            bool unusedFilenameFound = false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventLogDataCollector"/> class.
+    /// </summary>
+    /// <param name="fileHelper">
+    /// File Helper.
+    /// </param>
+    internal EventLogDataCollector(IFileHelper fileHelper)
+    {
+        _sessionStartEventHandler = OnSessionStart;
+        _sessionEndEventHandler = OnSessionEnd;
+        _testCaseStartEventHandler = OnTestCaseStart;
+        _testCaseEndEventHandler = OnTestCaseEnd;
+
+        _eventLogDirectories = new List<string>();
+        ContextMap = new Dictionary<DataCollectionContext, EventLogSessionContext>();
+        _fileHelper = fileHelper;
+    }
 
-            string eventLogPath = eventLogBasePath + ".xml";
+    internal int MaxEntries { get; private set; }
 
-            if (this.fileHelper.Exists(eventLogPath))
-            {
-                for (int i = 1; !unusedFilenameFound; i++)
-                {
-                    eventLogPath = eventLogBasePath + "-" + i.ToString(CultureInfo.InvariantCulture) + ".xml";
+    internal ISet<string>? EventSources { get; private set; }
 
-                    if (!this.fileHelper.Exists(eventLogPath))
-                    {
-                        unusedFilenameFound = true;
-                    }
-                }
-            }
+    internal ISet<EventLogEntryType>? EntryTypes { get; private set; }
+
+    internal ISet<string>? EventLogNames { get; private set; }
+
+    /// <summary>
+    /// Gets the context data.
+    /// </summary>
+    internal Dictionary<DataCollectionContext, EventLogSessionContext> ContextMap { get; }
+
+    #region DataCollector Members
+
+    /// <summary>
+    /// Initializes the data collector
+    /// </summary>
+    /// <param name="configurationElement">
+    /// The XML element containing configuration information for the data collector. Currently,
+    /// this data collector does not have any configuration, so we ignore this parameter.
+    /// </param>
+    /// <param name="events">
+    /// Object containing the execution events the data collector registers for
+    /// </param>
+    /// <param name="dataSink">The sink used by the data collector to send its data</param>
+    /// <param name="logger">
+    /// Used by the data collector to send warnings, errors, or other messages
+    /// </param>
+    /// <param name="dataCollectionEnvironmentContext">Provides contextual information about the agent environment</param>
+    [MemberNotNull(nameof(_events), nameof(_dataSink), nameof(_logger), nameof(_dataCollectorContext))]
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? dataCollectionEnvironmentContext)
+    {
+        ValidateArg.NotNull(events, nameof(events));
+        ValidateArg.NotNull(dataSink, nameof(dataSink));
+        ValidateArg.NotNull(logger, nameof(logger));
+        ValidateArg.NotNull(dataCollectionEnvironmentContext, nameof(dataCollectionEnvironmentContext));
+
+        _events = events;
+        _dataSink = dataSink;
+        _logger = logger;
+        _dataCollectorContext = dataCollectionEnvironmentContext!.SessionDataCollectionContext;
+
+        // Load the configuration
+        CollectorNameValueConfigurationManager nameValueSettings =
+            new(configurationElement);
+
+        // Apply the configuration
+        ConfigureEventSources(nameValueSettings);
+        ConfigureEntryTypes(nameValueSettings);
+        ConfigureMaxEntries(nameValueSettings);
+        ConfigureEventLogNames(nameValueSettings, _dataCollectorContext);
+
+        // Register for events
+        events.SessionStart += _sessionStartEventHandler;
+        events.SessionEnd += _sessionEndEventHandler;
+        events.TestCaseStart += _testCaseStartEventHandler;
+        events.TestCaseEnd += _testCaseEndEventHandler;
+    }
+
+    #endregion
+
+    /// <summary>
+    /// The write event logs.
+    /// </summary>
+    /// <param name="eventLogEntries">
+    /// The event log entries.
+    /// </param>
+    /// <param name="maxLogEntries">
+    /// Max Log Entries.
+    /// </param>
+    /// <param name="dataCollectionContext">
+    /// The data collection context.
+    /// </param>
+    /// <param name="requestedDuration">
+    /// The requested duration.
+    /// </param>
+    /// <param name="timeRequestReceived">
+    /// The time request received.
+    /// </param>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    internal string WriteEventLogs(List<EventLogEntry> eventLogEntries, int maxLogEntries, DataCollectionContext dataCollectionContext, TimeSpan requestedDuration, DateTime timeRequestReceived)
+    {
+        // Generate a unique but friendly Directory name in the temp directory
+        string eventLogDirName = string.Format(
+            CultureInfo.InvariantCulture,
+            "{0}-{1}-{2:yyyy}{2:MM}{2:dd}-{2:HH}{2:mm}{2:ss}.{2:fff}",
+            "Event Log",
+            Environment.MachineName,
+            DateTime.UtcNow);
+
+        string eventLogDirPath = Path.Combine(Path.GetTempPath(), eventLogDirName);
+
+        // Create the directory
+        _fileHelper.CreateDirectory(eventLogDirPath);
+
+        string eventLogBasePath = Path.Combine(eventLogDirPath, EventLogFileName);
+        bool unusedFilenameFound = false;
 
-            DateTime minDate = DateTime.MinValue;
+        string eventLogPath = eventLogBasePath + ".xml";
 
-            // Limit entries to a certain time range if requested
-            if (requestedDuration < TimeSpan.MaxValue)
+        if (_fileHelper.Exists(eventLogPath))
+        {
+            for (int i = 1; !unusedFilenameFound; i++)
             {
-                try
-                {
-                    minDate = timeRequestReceived - requestedDuration;
-                }
-                catch (ArgumentOutOfRangeException)
+                eventLogPath = $"{eventLogBasePath}-{i.ToString(CultureInfo.InvariantCulture)}.xml";
+
+                if (!_fileHelper.Exists(eventLogPath))
                 {
-                    minDate = DateTime.MinValue;
+                    unusedFilenameFound = true;
                 }
             }
+        }
 
-            Stopwatch stopwatch = new Stopwatch();
-            stopwatch.Start();
-            EventLogXmlWriter.WriteEventLogEntriesToXmlFile(
-                eventLogPath,
-                eventLogEntries.Where(
-                    entry => entry.TimeGenerated > minDate && entry.TimeGenerated < DateTime.MaxValue).OrderBy(x => x.TimeGenerated).Take(maxLogEntries).ToList(),
-                this.fileHelper);
-
-            stopwatch.Stop();
+        DateTime minDate = DateTime.MinValue;
 
-            if (EqtTrace.IsVerboseEnabled)
+        // Limit entries to a certain time range if requested
+        if (requestedDuration < TimeSpan.MaxValue)
+        {
+            try
             {
-                EqtTrace.Verbose(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        "EventLogDataContainer: Wrote {0} event log entries to file '{1}' in {2} seconds",
-                        eventLogEntries.Count,
-                        eventLogPath,
-                        stopwatch.Elapsed.TotalSeconds.ToString(CultureInfo.InvariantCulture)));
+                minDate = timeRequestReceived - requestedDuration;
             }
-
-            // Write the event log file
-            FileTransferInformation fileTransferInformation =
-                new FileTransferInformation(dataCollectionContext, eventLogPath, true, this.fileHelper);
-            this.dataSink.SendFileAsync(fileTransferInformation);
-
-            if (EqtTrace.IsVerboseEnabled)
+            catch (ArgumentOutOfRangeException)
             {
-                EqtTrace.Verbose(
-                    "EventLogDataContainer: Event log successfully sent for data collection context '{0}'.",
-                    dataCollectionContext.ToString());
+                minDate = DateTime.MinValue;
             }
-
-            return eventLogPath;
         }
-        #endregion
 
-        #region IDisposable Members
+        Stopwatch stopwatch = new();
+        stopwatch.Start();
+        EventLogXmlWriter.WriteEventLogEntriesToXmlFile(
+            eventLogPath,
+            eventLogEntries.Where(
+                entry => entry.TimeGenerated > minDate && entry.TimeGenerated < DateTime.MaxValue).OrderBy(x => x.TimeGenerated).Take(maxLogEntries).ToList(),
+            _fileHelper);
+
+        stopwatch.Stop();
+
+        EqtTrace.Verbose(
+            "EventLogDataContainer: Wrote {0} event log entries to file '{1}' in {2} seconds",
+            eventLogEntries.Count,
+            eventLogPath,
+            stopwatch.Elapsed.TotalSeconds.ToString(CultureInfo.InvariantCulture));
+
+        // Write the event log file
+        FileTransferInformation fileTransferInformation =
+            new(dataCollectionContext, eventLogPath, true, _fileHelper);
+        TPDebug.Assert(_dataSink != null, "Initialize should have been called.");
+        _dataSink.SendFileAsync(fileTransferInformation);
+
+        EqtTrace.Verbose(
+            "EventLogDataContainer: Event log successfully sent for data collection context '{0}'.",
+            dataCollectionContext.ToString());
+
+        return eventLogPath;
+    }
 
-        /// <summary>
-        /// Cleans up resources allocated by the data collector
-        /// </summary>
-        /// <param name="disposing">Not used since this class does not have a finalizer.</param>
-        protected override void Dispose(bool disposing)
+    #region IDisposable Members
+
+    /// <summary>
+    /// Cleans up resources allocated by the data collector
+    /// </summary>
+    /// <param name="disposing">Not used since this class does not have a finalizer.</param>
+    protected override void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+            return;
+
+        base.Dispose(disposing);
+
+        if (disposing)
         {
             // Unregister events
-            this.events.SessionStart -= this.sessionStartEventHandler;
-            this.events.SessionEnd -= this.sessionEndEventHandler;
-            this.events.TestCaseStart -= this.testCaseStartEventHandler;
-            this.events.TestCaseEnd -= this.testCaseEndEventHandler;
+            if (_events != null)
+            {
+                _events.SessionStart -= _sessionStartEventHandler;
+                _events.SessionEnd -= _sessionEndEventHandler;
+                _events.TestCaseStart -= _testCaseStartEventHandler;
+                _events.TestCaseEnd -= _testCaseEndEventHandler;
+            }
 
             // Unregister EventLogEntry Written.
-            foreach (var eventLogContainer in this.eventLogContainerMap.Values)
+            foreach (var eventLogContainer in _eventLogContainerMap.Values)
             {
                 eventLogContainer.Dispose();
             }
 
             // Delete all the temp event log directories
-            this.RemoveTempEventLogDirs(this.eventLogDirectories);
+            RemoveTempEventLogDirs(_eventLogDirectories);
         }
 
-        #endregion
-
-        private static ISet<string> ParseCommaSeparatedList(string commaSeparatedList)
-        {
-            ISet<string> strings = new HashSet<string>();
-            string[] items = commaSeparatedList.Split(new char[] { ',' });
-            foreach (string item in items)
-            {
-                strings.Add(item.Trim());
-            }
-
-            return strings;
-        }
+        _isDisposed = true;
+    }
 
-        #region Event Handlers
+    #endregion
 
-        private void OnSessionStart(object sender, SessionStartEventArgs e)
+    private static ISet<string> ParseCommaSeparatedList(string commaSeparatedList)
+    {
+        ISet<string> strings = new HashSet<string>();
+        string[] items = commaSeparatedList.Split([',']);
+        foreach (string item in items)
         {
-            ValidateArg.NotNull(e, "SessionStartEventArgs");
-            ValidateArg.NotNull(e.Context, "SessionStartEventArgs.Context");
-
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("EventLogDataCollector: SessionStart received");
-            }
-
-            this.StartCollectionForContext(e.Context, true);
+            strings.Add(item.Trim());
         }
 
-        private void OnSessionEnd(object sender, SessionEndEventArgs e)
-        {
-            ValidateArg.NotNull(e, "SessionEndEventArgs");
-            ValidateArg.NotNull(e.Context, "SessionEndEventArgs.Context");
+        return strings;
+    }
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("EventLogDataCollector: SessionEnd received");
-            }
+    private void OnSessionStart(object? sender, SessionStartEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        ValidateArg.NotNull(e.Context, "SessionStartEventArgs.Context");
 
-            this.WriteCollectedEventLogEntries(e.Context, true, TimeSpan.MaxValue, DateTime.UtcNow);
-        }
+        EqtTrace.Verbose("EventLogDataCollector: SessionStart received");
 
-        private void OnTestCaseStart(object sender, TestCaseStartEventArgs e)
-        {
-            ValidateArg.NotNull(e, "TestCaseStartEventArgs");
-            ValidateArg.NotNull(e.Context, "TestCaseStartEventArgs.Context");
+        StartCollectionForContext(e.Context);
+    }
 
-            if (!e.Context.HasTestCase)
-            {
-                Debug.Fail("Context is not for a test case");
-                throw new ArgumentNullException("TestCaseStartEventArgs.Context.HasTestCase");
-            }
+    private void OnSessionEnd(object? sender, SessionEndEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        ValidateArg.NotNull(e.Context, "SessionEndEventArgs.Context");
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("EventLogDataCollector: TestCaseStart received for test '{0}'.", e.TestCaseName);
-            }
+        EqtTrace.Verbose("EventLogDataCollector: SessionEnd received");
 
-            this.StartCollectionForContext(e.Context, false);
-        }
+        WriteCollectedEventLogEntries(e.Context, true, TimeSpan.MaxValue, DateTime.UtcNow);
+    }
 
-        private void OnTestCaseEnd(object sender, TestCaseEndEventArgs e)
+    private void OnTestCaseStart(object? sender, TestCaseStartEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        ValidateArg.NotNull(e.Context, "TestCaseStartEventArgs.Context");
+
+        if (!e.Context.HasTestCase)
         {
-            ValidateArg.NotNull(e, "TestCaseEndEventArgs");
+            Debug.Fail("Context is not for a test case");
+            ValidateArg.NotNull(e.Context.TestExecId, "TestCaseStartEventArgs.Context.HasTestCase");
+        }
 
-            Debug.Assert(e.Context != null, "Context is null");
-            Debug.Assert(e.Context.HasTestCase, "Context is not for a test case");
+        EqtTrace.Verbose("EventLogDataCollector: TestCaseStart received for test '{0}'.", e.TestCaseName);
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose(
-                    "EventLogDataCollector: TestCaseEnd received for test '{0}' with Test Outcome: {1}.",
-                    e.TestCaseName,
-                    e.TestOutcome);
-            }
+        StartCollectionForContext(e.Context);
+    }
 
-            this.WriteCollectedEventLogEntries(e.Context, false, TimeSpan.MaxValue, DateTime.UtcNow);
-        }
+    private void OnTestCaseEnd(object? sender, TestCaseEndEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(e.Context != null, "Context is null");
+        TPDebug.Assert(e.Context.HasTestCase, "Context is not for a test case");
 
-        #endregion
+        EqtTrace.Verbose(
+            "EventLogDataCollector: TestCaseEnd received for test '{0}' with Test Outcome: {1}.",
+            e.TestCaseName,
+            e.TestOutcome);
 
-        #region Private methods
+        WriteCollectedEventLogEntries(e.Context, false, TimeSpan.MaxValue, DateTime.UtcNow);
+    }
 
-        private void RemoveTempEventLogDirs(List<string> tempDirs)
+    private void RemoveTempEventLogDirs(List<string> tempDirs)
+    {
+        if (tempDirs != null)
         {
-            if (tempDirs != null)
+            foreach (string dir in tempDirs)
             {
-                foreach (string dir in tempDirs)
-                {
-                    // Delete only if the directory is empty
-                    this.fileHelper.DeleteEmptyDirectroy(dir);
-                }
+                // Delete only if the directory is empty
+                _fileHelper.DeleteEmptyDirectroy(dir);
             }
         }
+    }
 
-        private void StartCollectionForContext(DataCollectionContext dataCollectionContext, bool isSessionContext)
+    private void StartCollectionForContext(DataCollectionContext dataCollectionContext)
+    {
+        lock (ContextMap)
         {
-            EventLogSessionContext eventLogSessionContext = null;
-            lock (this.ContextMap)
-            {
-                eventLogSessionContext =
-                    new EventLogSessionContext(this.eventLogContainerMap);
-                this.ContextMap.Add(dataCollectionContext, eventLogSessionContext);
-            }
+            var eventLogSessionContext = new EventLogSessionContext(_eventLogContainerMap);
+            ContextMap.Add(dataCollectionContext, eventLogSessionContext);
         }
+    }
 
-        private void WriteCollectedEventLogEntries(
-            DataCollectionContext dataCollectionContext,
-            bool isSessionEnd,
-            TimeSpan requestedDuration,
-            DateTime timeRequestReceived)
-        {
-            var context = this.GetEventLogSessionContext(dataCollectionContext);
-            context.CreateEventLogContainerEndIndexMap();
+    private void WriteCollectedEventLogEntries(
+        DataCollectionContext dataCollectionContext,
+        bool isSessionEnd,
+        TimeSpan requestedDuration,
+        DateTime timeRequestReceived)
+    {
+        var context = GetEventLogSessionContext(dataCollectionContext);
+        context.CreateEventLogContainerEndIndexMap();
 
-            List<EventLogEntry> eventLogEntries = new List<EventLogEntry>();
-            foreach (KeyValuePair<string, IEventLogContainer> kvp in this.eventLogContainerMap)
+        List<EventLogEntry> eventLogEntries = new();
+        foreach (KeyValuePair<string, IEventLogContainer> kvp in _eventLogContainerMap)
+        {
+            try
             {
-                try
+                if (isSessionEnd)
                 {
-                    if (isSessionEnd)
-                    {
-                        kvp.Value.EventLog.EnableRaisingEvents = false;
-                    }
-
-                    for (int i = context.EventLogContainerStartIndexMap[kvp.Key]; i <= context.EventLogContainerEndIndexMap[kvp.Key]; i++)
-                    {
-                        eventLogEntries.Add(kvp.Value.EventLogEntries[i]);
-                    }
+                    kvp.Value.EventLog.EnableRaisingEvents = false;
                 }
-                catch (Exception e)
+
+                for (int i = context.EventLogContainerStartIndexMap[kvp.Key]; i <= context.EventLogContainerEndIndexMap[kvp.Key]; i++)
                 {
-                    this.logger.LogWarning(
-                        dataCollectionContext,
-                        string.Format(
-                            CultureInfo.InvariantCulture,
-                            Resource.CleanupException,
-                            kvp.Value.EventLog,
-                            e.ToString()));
+                    eventLogEntries.Add(kvp.Value.EventLogEntries[i]);
                 }
             }
+            catch (Exception e)
+            {
+                TPDebug.Assert(_logger != null, "Initialize should have been called.");
+                _logger.LogWarning(
+                    dataCollectionContext,
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        Resource.CleanupException,
+                        kvp.Value.EventLog,
+                        e.ToString()));
+            }
+        }
 
-            var fileName = this.WriteEventLogs(eventLogEntries, isSessionEnd ? int.MaxValue : this.maxEntries, dataCollectionContext, requestedDuration, timeRequestReceived);
+        var fileName = WriteEventLogs(eventLogEntries, isSessionEnd ? int.MaxValue : MaxEntries, dataCollectionContext, requestedDuration, timeRequestReceived);
 
-            // Add the directory to the list
-            this.eventLogDirectories.Add(Path.GetDirectoryName(fileName));
+        // Add the directory to the list
+        _eventLogDirectories.Add(Path.GetDirectoryName(fileName)!);
 
-            lock (this.ContextMap)
-            {
-                this.ContextMap.Remove(dataCollectionContext);
-            }
+        lock (ContextMap)
+        {
+            ContextMap.Remove(dataCollectionContext);
         }
+    }
 
-        private void ConfigureEventLogNames(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    [MemberNotNull(nameof(EventLogNames))]
+    private void ConfigureEventLogNames(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager, DataCollectionContext dataCollectorContext)
+    {
+        EventLogNames = new HashSet<string>();
+        string? eventLogs = collectorNameValueConfigurationManager[EventLogConstants.SettingEventLogs];
+        if (eventLogs != null)
+        {
+            EventLogNames = ParseCommaSeparatedList(eventLogs);
+            EqtTrace.Verbose(
+                $"EventLogDataCollector configuration: {EventLogConstants.SettingEventLogs}={eventLogs}");
+        }
+        else
         {
-            this.eventLogNames = new HashSet<string>();
-            string eventLogs = collectorNameValueConfigurationManager[EventLogConstants.SettingEventLogs];
-            if (eventLogs != null)
+            // Default to collecting these standard logs
+            EventLogNames.Add("System");
+            EventLogNames.Add("Application");
+        }
+
+        TPDebug.Assert(_logger != null && EntryTypes != null, "Initialize should have been called.");
+
+        foreach (string eventLogName in EventLogNames)
+        {
+            try
             {
-                this.eventLogNames = ParseCommaSeparatedList(eventLogs);
-                if (EqtTrace.IsVerboseEnabled)
+                // Create an EventLog object and add it to the eventLogContext if one does not already exist
+                if (!_eventLogContainerMap.ContainsKey(eventLogName))
                 {
-                    EqtTrace.Verbose(
-                        "EventLogDataCollector configuration: " + EventLogConstants.SettingEventLogs + "=" + eventLogs);
+                    IEventLogContainer eventLogContainer = new EventLogContainer(
+                        eventLogName,
+                        EventSources,
+                        EntryTypes,
+                        int.MaxValue,
+                        _logger,
+                        dataCollectorContext);
+                    _eventLogContainerMap.Add(eventLogName, eventLogContainer);
                 }
-            }
-            else
-            {
-                // Default to collecting these standard logs
-                this.eventLogNames.Add("System");
-                this.eventLogNames.Add("Application");
-            }
 
-            foreach (string eventLogName in this.eventLogNames)
+                EqtTrace.Verbose("EventLogDataCollector: Created EventSource '{0}'", eventLogName);
+            }
+            catch (Exception ex)
             {
-                try
-                {
-                    // Create an EventLog object and add it to the eventLogContext if one does not already exist
-                    if (!this.eventLogContainerMap.ContainsKey(eventLogName))
-                    {
-                        IEventLogContainer eventLogContainer = new EventLogContainer(
-                            eventLogName,
-                            this.eventSources,
-                            this.entryTypes,
-                            int.MaxValue,
-                            this.logger,
-                            this.dataCollectorContext);
-                        this.eventLogContainerMap.Add(eventLogName, eventLogContainer);
-                    }
-
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose(string.Format(
-                            CultureInfo.InvariantCulture,
-                            "EventLogDataCollector: Created EventSource '{0}'",
-                            eventLogName));
-                    }
-                }
-                catch (Exception ex)
-                {
-                    this.logger.LogError(
-                        this.dataCollectorContext,
-                        new EventLogCollectorException(string.Format(CultureInfo.InvariantCulture, Resource.ReadError, eventLogName, Environment.MachineName), ex));
-                }
+                _logger.LogError(
+                    dataCollectorContext,
+                    new EventLogCollectorException(string.Format(CultureInfo.CurrentCulture, Resource.ReadError, eventLogName, Environment.MachineName), ex));
             }
         }
+    }
 
-        private void ConfigureEventSources(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    private void ConfigureEventSources(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    {
+        string? eventSourcesStr = collectorNameValueConfigurationManager[EventLogConstants.SettingEventSources];
+        if (!eventSourcesStr.IsNullOrEmpty())
         {
-            string eventSourcesStr = collectorNameValueConfigurationManager[EventLogConstants.SettingEventSources];
-            if (!string.IsNullOrEmpty(eventSourcesStr))
-            {
-                this.eventSources = ParseCommaSeparatedList(eventSourcesStr);
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose(
-                        "EventLogDataCollector configuration: " + EventLogConstants.SettingEventSources + "="
-                        + this.eventSources);
-                }
-            }
+            EventSources = ParseCommaSeparatedList(eventSourcesStr);
+            EqtTrace.Verbose(
+                $"EventLogDataCollector configuration: {EventLogConstants.SettingEventSources}={EventSources}");
         }
+    }
 
-        private void ConfigureEntryTypes(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    [MemberNotNull(nameof(EntryTypes))]
+    private void ConfigureEntryTypes(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    {
+        EntryTypes = new HashSet<EventLogEntryType>();
+        string? entryTypesStr = collectorNameValueConfigurationManager[EventLogConstants.SettingEntryTypes];
+        if (entryTypesStr != null)
         {
-            this.entryTypes = new HashSet<EventLogEntryType>();
-            string entryTypesStr = collectorNameValueConfigurationManager[EventLogConstants.SettingEntryTypes];
-            if (entryTypesStr != null)
+            foreach (string entryTypestring in ParseCommaSeparatedList(entryTypesStr))
             {
-                foreach (string entryTypestring in ParseCommaSeparatedList(entryTypesStr))
-                {
-                    this.entryTypes.Add(
-                        (EventLogEntryType)Enum.Parse(typeof(EventLogEntryType), entryTypestring, true));
-                }
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose(
-                        "EventLogDataCollector configuration: " + EventLogConstants.SettingEntryTypes + "="
-                        + this.entryTypes);
-                }
-            }
-            else
-            {
-                this.entryTypes.Add(EventLogEntryType.Error);
-                this.entryTypes.Add(EventLogEntryType.Warning);
-                this.entryTypes.Add(EventLogEntryType.FailureAudit);
+                EntryTypes.Add(
+                    (EventLogEntryType)Enum.Parse(typeof(EventLogEntryType), entryTypestring, true));
             }
+
+            EqtTrace.Verbose(
+                $"EventLogDataCollector configuration: {EventLogConstants.SettingEntryTypes}={EntryTypes}");
         }
+        else
+        {
+            EntryTypes.Add(EventLogEntryType.Error);
+            EntryTypes.Add(EventLogEntryType.Warning);
+            EntryTypes.Add(EventLogEntryType.FailureAudit);
+        }
+    }
 
-        private void ConfigureMaxEntries(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    private void ConfigureMaxEntries(CollectorNameValueConfigurationManager collectorNameValueConfigurationManager)
+    {
+        string? maxEntriesstring = collectorNameValueConfigurationManager[EventLogConstants.SettingMaxEntries];
+        if (maxEntriesstring != null)
         {
-            string maxEntriesstring = collectorNameValueConfigurationManager[EventLogConstants.SettingMaxEntries];
-            if (maxEntriesstring != null)
+            try
             {
-                try
-                {
-                    this.maxEntries = int.Parse(maxEntriesstring, CultureInfo.InvariantCulture);
+                MaxEntries = int.Parse(maxEntriesstring, CultureInfo.InvariantCulture);
 
-                    // A negative or 0 value means no maximum
-                    if (this.maxEntries <= 0)
-                    {
-                        this.maxEntries = int.MaxValue;
-                    }
-                }
-                catch (FormatException)
+                // A negative or 0 value means no maximum
+                if (MaxEntries <= 0)
                 {
-                    this.maxEntries = EventLogConstants.DefaultMaxEntries;
-                }
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose(
-                        "EventLogDataCollector configuration: " + EventLogConstants.SettingMaxEntries + "="
-                        + this.maxEntries);
+                    MaxEntries = int.MaxValue;
                 }
             }
-            else
+            catch (FormatException)
             {
-                this.maxEntries = EventLogConstants.DefaultMaxEntries;
+                MaxEntries = EventLogConstants.DefaultMaxEntries;
             }
-        }
 
-        private EventLogSessionContext GetEventLogSessionContext(DataCollectionContext dataCollectionContext)
+            EqtTrace.Verbose(
+                $"EventLogDataCollector configuration: {EventLogConstants.SettingMaxEntries}={MaxEntries}");
+        }
+        else
         {
-            EventLogSessionContext eventLogSessionContext;
-            bool eventLogContainerFound;
-            lock (this.ContextMap)
-            {
-                eventLogContainerFound = this.ContextMap.TryGetValue(dataCollectionContext, out eventLogSessionContext);
-            }
+            MaxEntries = EventLogConstants.DefaultMaxEntries;
+        }
+    }
 
-            if (!eventLogContainerFound)
+    private EventLogSessionContext GetEventLogSessionContext(DataCollectionContext dataCollectionContext)
+    {
+        lock (ContextMap)
+        {
+            if (ContextMap.TryGetValue(dataCollectionContext, out var eventLogSessionContext))
             {
-                string msg = string.Format(
-                    CultureInfo.InvariantCulture,
-                    Resource.ContextNotFoundException,
-                    dataCollectionContext.ToString());
-                throw new EventLogCollectorException(msg, null);
+                return eventLogSessionContext;
             }
-
-            return eventLogSessionContext;
         }
 
-        #endregion
+        string msg = string.Format(
+                CultureInfo.CurrentCulture,
+                Resource.ContextNotFoundException,
+                dataCollectionContext.ToString());
+        throw new EventLogCollectorException(msg, null);
     }
+
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogSessionContext.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogSessionContext.cs
index 059975eea7..9b396ea3f7 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogSessionContext.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogSessionContext.cs
@@ -1,65 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
+
+/// <summary>
+/// Stores the start and end index for EventLogEntries corresponding to a data collection session.
+/// </summary>
+internal class EventLogSessionContext
 {
-    using System.Collections.Generic;
+    private readonly IDictionary<string, IEventLogContainer> _eventLogContainerMap;
 
     /// <summary>
-    /// Stores the start and end index for EventLogEntries corresponding to a data collection session.
+    /// Initializes a new instance of the <see cref="EventLogSessionContext"/> class.
     /// </summary>
-    internal class EventLogSessionContext
+    /// <param name="eventLogContainerMap">
+    /// Event Log container map.
+    /// </param>
+    public EventLogSessionContext(IDictionary<string, IEventLogContainer> eventLogContainerMap)
     {
-        private IDictionary<string, IEventLogContainer> eventLogContainerMap;
+        _eventLogContainerMap = eventLogContainerMap;
+        CreateEventLogContainerStartIndexMap();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventLogSessionContext"/> class.
-        /// </summary>
-        /// <param name="eventLogContainerMap">
-        /// Event Log container map.
-        /// </param>
-        public EventLogSessionContext(IDictionary<string, IEventLogContainer> eventLogContainerMap)
-        {
-            this.eventLogContainerMap = eventLogContainerMap;
-            this.CreateEventLogContainerStartIndexMap();
-        }
+    /// <summary>
+    /// Gets the start index for EventLogs Entries.
+    /// </summary>
+    internal Dictionary<string, int> EventLogContainerStartIndexMap { get; private set; }
 
-        /// <summary>
-        /// Gets the start index for EventLogs Entries.
-        /// </summary>
-        internal Dictionary<string, int> EventLogContainerStartIndexMap { get; private set; }
+    /// <summary>
+    /// Gets the end index for EventLogs Entries
+    /// </summary>
+    internal Dictionary<string, int>? EventLogContainerEndIndexMap { get; private set; }
 
-        /// <summary>
-        /// Gets the end index for EventLogs Entries
-        /// </summary>
-        internal Dictionary<string, int> EventLogContainerEndIndexMap { get; private set; }
+    /// <summary>
+    /// Creates the end index map for EventLogs Entries
+    /// </summary>
+    [MemberNotNull(nameof(EventLogContainerEndIndexMap))]
+    public void CreateEventLogContainerEndIndexMap()
+    {
+        EventLogContainerEndIndexMap = new Dictionary<string, int>(_eventLogContainerMap.Count);
 
-        /// <summary>
-        /// Creates the end index map for EventLogs Entries
-        /// </summary>
-        public void CreateEventLogContainerEndIndexMap()
+        foreach (KeyValuePair<string, IEventLogContainer> kvp in _eventLogContainerMap)
         {
-            this.EventLogContainerEndIndexMap = new Dictionary<string, int>(this.eventLogContainerMap.Count);
-
-            foreach (KeyValuePair<string, IEventLogContainer> kvp in this.eventLogContainerMap)
-            {
-                kvp.Value.OnEventLogEntryWritten(kvp.Value.EventLog, null);
+            kvp.Value.OnEventLogEntryWritten(kvp.Value.EventLog, null);
 
-                this.EventLogContainerEndIndexMap.Add(kvp.Key, kvp.Value.EventLogEntries.Count - 1);
-            }
+            EventLogContainerEndIndexMap.Add(kvp.Key, kvp.Value.EventLogEntries.Count - 1);
         }
+    }
 
-        /// <summary>
-        /// Creates the start index map for EventLogs Entries
-        /// </summary>
-        public void CreateEventLogContainerStartIndexMap()
-        {
-            this.EventLogContainerStartIndexMap = new Dictionary<string, int>(this.eventLogContainerMap.Count);
+    /// <summary>
+    /// Creates the start index map for EventLogs Entries
+    /// </summary>
+    [MemberNotNull(nameof(EventLogContainerStartIndexMap))]
+    public void CreateEventLogContainerStartIndexMap()
+    {
+        EventLogContainerStartIndexMap = new Dictionary<string, int>(_eventLogContainerMap.Count);
 
-            foreach (KeyValuePair<string, IEventLogContainer> kvp in this.eventLogContainerMap)
-            {
-                this.EventLogContainerStartIndexMap.Add(kvp.Key, kvp.Value.EventLogEntries.Count);
-            }
+        foreach (KeyValuePair<string, IEventLogContainer> kvp in _eventLogContainerMap)
+        {
+            EventLogContainerStartIndexMap.Add(kvp.Key, kvp.Value.EventLogEntries.Count);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogXmlWriter.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogXmlWriter.cs
index 1446d31295..29e8279d44 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogXmlWriter.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogXmlWriter.cs
@@ -1,89 +1,81 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Data;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
 
+/// <summary>
+/// This class writes event log entries to an XML file in a format that can be retrieved into a DataSet
+/// </summary>
+internal static class EventLogXmlWriter
+{
     /// <summary>
-    /// This class writes event log entries to an XML file in a format that can be retrieved into a DataSet
+    /// The write event log entries to xml file.
     /// </summary>
-    internal static class EventLogXmlWriter
+    /// <param name="xmlFilePath">
+    /// The xml file path.
+    /// </param>
+    /// <param name="eventLogEntries">
+    /// The event log entries.
+    /// </param>
+    /// <param name="fileHelper">
+    /// The file Helper.
+    /// </param>
+    public static void WriteEventLogEntriesToXmlFile(string xmlFilePath, List<EventLogEntry> eventLogEntries, IFileHelper fileHelper)
     {
-        #region Public methods
-
-        /// <summary>
-        /// The write event log entries to xml file.
-        /// </summary>
-        /// <param name="xmlFilePath">
-        /// The xml file path.
-        /// </param>
-        /// <param name="eventLogEntries">
-        /// The event log entries.
-        /// </param>
-        /// <param name="fileHelper">
-        /// The file Helper.
-        /// </param>
-        public static void WriteEventLogEntriesToXmlFile(string xmlFilePath, List<EventLogEntry> eventLogEntries, IFileHelper fileHelper)
-        {
-            using (DataTable dataTable = new DataTable())
-            {
-                dataTable.Locale = CultureInfo.InvariantCulture;
+        using DataTable dataTable = new();
+        dataTable.Locale = CultureInfo.InvariantCulture;
 
-                // The MaxLength of the Type and Source columns must be set to allow indices to be created on them
-                DataColumn typeColumn = new DataColumn("Type", typeof(string));
-                typeColumn.MaxLength = EventLogConstants.TypeColumnMaxLength;
-                dataTable.Columns.Add(typeColumn);
+        // The MaxLength of the Type and Source columns must be set to allow indices to be created on them
+        DataColumn typeColumn = new("Type", typeof(string));
+        typeColumn.MaxLength = EventLogConstants.TypeColumnMaxLength;
+        dataTable.Columns.Add(typeColumn);
 
-                dataTable.Columns.Add(new DataColumn("DateTime", typeof(DateTime)));
+        dataTable.Columns.Add(new DataColumn("DateTime", typeof(DateTime)));
 
-                DataColumn sourceColumn = new DataColumn("Source", typeof(string));
-                sourceColumn.MaxLength = EventLogConstants.SourceColumnMaxLength;
-                dataTable.Columns.Add(sourceColumn);
+        DataColumn sourceColumn = new("Source", typeof(string));
+        sourceColumn.MaxLength = EventLogConstants.SourceColumnMaxLength;
+        dataTable.Columns.Add(sourceColumn);
 
-                dataTable.Columns.Add(new DataColumn("Category", typeof(string)));
-                dataTable.Columns.Add(new DataColumn("EventID", typeof(long)));
-                dataTable.Columns.Add(new DataColumn("Description", typeof(string)));
-                dataTable.Columns.Add(new DataColumn("User", typeof(string)));
-                dataTable.Columns.Add(new DataColumn("Computer", typeof(string)));
-                dataTable.ExtendedProperties.Add("TimestampColumnName", "DateTime");
-                dataTable.ExtendedProperties.Add("IndexColumnNames", "Source,Type");
+        dataTable.Columns.Add(new DataColumn("Category", typeof(string)));
+        dataTable.Columns.Add(new DataColumn("EventID", typeof(long)));
+        dataTable.Columns.Add(new DataColumn("Description", typeof(string)));
+        dataTable.Columns.Add(new DataColumn("User", typeof(string)));
+        dataTable.Columns.Add(new DataColumn("Computer", typeof(string)));
+        dataTable.ExtendedProperties.Add("TimestampColumnName", "DateTime");
+        dataTable.ExtendedProperties.Add("IndexColumnNames", "Source,Type");
 
-                foreach (EventLogEntry entry in eventLogEntries)
-                {
-                    DataRow row = dataTable.NewRow();
-                    row["Type"] = entry.EntryType.ToString();
-                    row["DateTime"] = entry.TimeGenerated;
-                    row["Source"] = entry.Source;
-                    row["Category"] = entry.Category;
-                    row["EventID"] = entry.InstanceId;
-                    row["Description"] = entry.Message;
-                    row["User"] = entry.UserName;
-                    row["Computer"] = entry.MachineName;
-                    dataTable.Rows.Add(row);
-                }
+        foreach (EventLogEntry entry in eventLogEntries)
+        {
+            DataRow row = dataTable.NewRow();
+            row["Type"] = entry.EntryType.ToString();
+            row["DateTime"] = entry.TimeGenerated;
+            row["Source"] = entry.Source;
+            row["Category"] = entry.Category;
+            row["EventID"] = entry.InstanceId;
+            row["Description"] = entry.Message;
+            row["User"] = entry.UserName;
+            row["Computer"] = entry.MachineName;
+            dataTable.Rows.Add(row);
+        }
 
-                DataSet dataSet = new DataSet();
-                dataSet.Locale = CultureInfo.InvariantCulture;
-                dataSet.Tables.Add(dataTable);
+        DataSet dataSet = new();
+        dataSet.Locale = CultureInfo.InvariantCulture;
+        dataSet.Tables.Add(dataTable);
 
-                // Use UTF-16 encoding
-                StringBuilder stringBuilder = new StringBuilder();
-                using (StringWriter stringWriter = new StringWriter(stringBuilder))
-                {
-                    dataSet.WriteXml(stringWriter, XmlWriteMode.WriteSchema);
-                    fileHelper.WriteAllTextToFile(xmlFilePath, stringBuilder.ToString());
-                }
-            }
-        }
+        // Use UTF-16 encoding
+        StringBuilder stringBuilder = new();
+        using StringWriter stringWriter = new(stringBuilder);
+        dataSet.WriteXml(stringWriter, XmlWriteMode.WriteSchema);
+        fileHelper.WriteAllTextToFile(xmlFilePath, stringBuilder.ToString());
     }
-    #endregion
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Friends.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Friends.cs
index 7d2cb6d64f..be8966e10f 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Friends.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Friends.cs
@@ -7,4 +7,4 @@
 
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
-#endregion
\ No newline at end of file
+#endregion
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/IEventLogContainer.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/IEventLogContainer.cs
index 71166a0576..20ad2a6647 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/IEventLogContainer.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/IEventLogContainer.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
 
+/// <summary>
+/// Event log container interface
+/// </summary>
+internal interface IEventLogContainer : IDisposable
+{
     /// <summary>
-    /// Event log container interface
+    /// Gets the event log.
     /// </summary>
-    internal interface IEventLogContainer : IDisposable
-    {
-        /// <summary>
-        /// Gets the event log.
-        /// </summary>
-        EventLog EventLog { get; }
+    EventLog EventLog { get; }
 
-        /// <summary>
-        /// Gets the event log entries.
-        /// </summary>
-        List<EventLogEntry> EventLogEntries { get; }
+    /// <summary>
+    /// Gets the event log entries.
+    /// </summary>
+    List<EventLogEntry> EventLogEntries { get; }
 
-        /// <summary>
-        /// Event Handler for handling log entries.
-        /// </summary>
-        /// <param name="source">
-        /// The source object that raised EventLog entry event.
-        /// </param>
-        /// <param name="e">
-        /// Contains data related to EventLog entry.
-        /// </param>
-        void OnEventLogEntryWritten(object source, EntryWrittenEventArgs e);
-    }
+    /// <summary>
+    /// Event Handler for handling log entries.
+    /// </summary>
+    /// <param name="source">
+    /// The source object that raised EventLog entry event.
+    /// </param>
+    /// <param name="e">
+    /// Contains data related to EventLog entry.
+    /// </param>
+    void OnEventLogEntryWritten(object? source, EntryWrittenEventArgs? e);
 }
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj
index 36bad1520b..f7c86f1bae 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj
@@ -1,35 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />  
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Extensions.EventLogCollector</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+    <TargetFrameworks>$(NetCoreMinimum);$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' != '$(NetFrameworkMinimum)' ">
     <PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
+    <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
+    <Compile Include="$(RepoRoot)shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Resources\Resources.resx">
@@ -38,6 +25,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -45,10 +37,25 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
     <None Update="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
 </Project>
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.cs
new file mode 100644
index 0000000000..1a572ebb0d
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.tt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Properties/AssemblyInfo.cs b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Properties/AssemblyInfo.cs
index 8f118204fd..ad4404d0a7 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Properties/AssemblyInfo.cs
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Properties/AssemblyInfo.cs
@@ -1,27 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 using Microsoft.TestPlatform.Extensions.EventLogCollector;
 using Microsoft.VisualStudio.TestPlatform;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Extensions.EventLogCollector")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4c1f0d81-67a9-4bf3-a006-615ab4a7fcd6")]
-
-[assembly: TestExtensionTypes(typeof(EventLogDataCollector))]
\ No newline at end of file
+[assembly: TestExtensionTypes(typeof(EventLogDataCollector))]
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d60cc5e95a
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,5 @@
+#nullable enable
+Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector
+Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector.EventLogDataCollector() -> void
+override Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector.Dispose(bool disposing) -> void
+override Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector.Initialize(System.Xml.XmlElement? configurationElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents! events, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink! dataSink, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger! logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext? dataCollectionEnvironmentContext) -> void
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.cs.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.cs.xlf
index 85d86292da..c7b59b6f48 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.cs.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.cs.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Došlo k výjimce při shromažďování finálních položek z protokolu událostí {0}: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">DataCollector pro protokol událostí nenašel eventLogContext pro DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Protokol událostí {0} byl pravděpodobně při shromažďování vyčištěn. Některé události nemusely být shromážděny.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Nepodařilo se přečíst protokol událostí {0} z počítače {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">U protokolu událostí {0} došlo k výjimce. Některé události se mohly ztratit. Chyba: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Došlo k výjimce při shromažďování finálních položek z protokolu událostí {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">DataCollector pro protokol událostí nenašel eventLogContext pro DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Protokol událostí {0} byl pravděpodobně při shromažďování vyčištěn. Některé události nemusely být shromážděny.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Nepodařilo se přečíst protokol událostí {0} z počítače {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">U protokolu událostí {0} došlo k výjimce. Některé události se mohly ztratit. Chyba: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.de.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.de.xlf
index 7cc9470fcb..5a52c00e09 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.de.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.de.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Ausnahme beim Erfassen von abschließenden Einträgen aus dem Ereignisprotokoll "{0}": {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">Der DataCollector des Ereignisprotokolls hat den eventLogContext für DataCollectionContext nicht gefunden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Das Ereignisprotokoll "{0}" wurde während der Sammlung möglicherweise gelöscht. Einige Ereignisse wurden eventuell nicht erfasst.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Das Ereignisprotokoll "{0}" konnte vom Computer "{1}" nicht gelesen werden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">Beim Ereignisprotokoll "{0}" ist eine Ausnahme aufgetreten. Einige Ereignisse gehen möglicherweise verloren. Fehler: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Ausnahme beim Erfassen von abschließenden Einträgen aus dem Ereignisprotokoll "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">Der DataCollector des Ereignisprotokolls hat den eventLogContext für DataCollectionContext nicht gefunden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Das Ereignisprotokoll "{0}" wurde während der Sammlung möglicherweise gelöscht. Einige Ereignisse wurden eventuell nicht erfasst.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Das Ereignisprotokoll "{0}" konnte vom Computer "{1}" nicht gelesen werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">Beim Ereignisprotokoll "{0}" ist eine Ausnahme aufgetreten. Einige Ereignisse gehen möglicherweise verloren. Fehler: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.es.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.es.xlf
index 24b4c70ce0..859a024da4 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.es.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.es.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Excepción al recopilar las entradas finales del registro de eventos "{0}": {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">La propiedad DataCollector del registro de eventos no encontró eventLogContext para el contexto de DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Es posible que el registro de eventos "{0}" se haya borrado durante la recopilación; algunos eventos pueden no haberse recopilado</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">No se puede leer el registro de eventos "{0}" desde el equipo "{1}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">El registro de eventos "{0}" ha encontrado una excepción; algunos eventos pueden haberse perdido. Error: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Excepción al recopilar las entradas finales del registro de eventos "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">La propiedad DataCollector del registro de eventos no encontró eventLogContext para el contexto de DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Es posible que el registro de eventos "{0}" se haya borrado durante la recopilación; algunos eventos pueden no haberse recopilado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">No se puede leer el registro de eventos "{0}" desde el equipo "{1}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">El registro de eventos "{0}" ha encontrado una excepción; algunos eventos pueden haberse perdido. Error: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.fr.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.fr.xlf
index 20b8c11b59..bae1194c90 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.fr.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.fr.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Une exception s'est produite durant la collecte des entrées finales dans le journal des événements '{0}' : {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">Le DataCollector du journal des événements n'a pas trouvé eventLogContext pour DataCollectionContext : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Le journal des événements '{0}' a peut-être été effacé durant la collecte. Il est possible que certains événements n'aient pas été collectés</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Impossible de lire le journal des événements '{0}' de l'ordinateur '{1}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">Le journal des événements '{0}' a rencontré une exception, certains événements risquent d'être perdus. Erreur : {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Une exception s'est produite durant la collecte des entrées finales dans le journal des événements '{0}' : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">Le DataCollector du journal des événements n'a pas trouvé eventLogContext pour DataCollectionContext : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Le journal des événements '{0}' a peut-être été effacé durant la collecte. Il est possible que certains événements n'aient pas été collectés</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Impossible de lire le journal des événements '{0}' de l'ordinateur '{1}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">Le journal des événements '{0}' a rencontré une exception, certains événements risquent d'être perdus. Erreur : {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.it.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.it.xlf
index 2df0527f2e..8499d73bde 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.it.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.it.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Si è verificata un'eccezione durante la raccolta delle voci finali del log eventi '{0}': {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">L'agente di raccolta dati del log eventi non ha trovato l'elemento eventLogContext per DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">È possibile che il log eventi '{0}' sia stato cancellato durante la raccolta. Alcuni eventi non sono stati raccolti</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Non è possibile leggere il log eventi '{0}' dal computer '{1}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">Il log eventi '{0}' ha rilevato un'eccezione. È possibile che alcuni eventi siano stati persi. Errore: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Si è verificata un'eccezione durante la raccolta delle voci finali del log eventi '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">L'agente di raccolta dati del log eventi non ha trovato l'elemento eventLogContext per DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">È possibile che il log eventi '{0}' sia stato cancellato durante la raccolta. Alcuni eventi non sono stati raccolti</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Non è possibile leggere il log eventi '{0}' dal computer '{1}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">Il log eventi '{0}' ha rilevato un'eccezione. È possibile che alcuni eventi siano stati persi. Errore: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ja.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ja.xlf
index 59bc0b3c93..9cd84da41b 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ja.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ja.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">イベント ログ '{0}' からの最後のエントリの収集中に例外が発生しました: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">イベント ログ DataCollector では、DataCollectionContext の eventLogContext が見つかりませんでした: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">収集中に '{0}' イベント ログがクリアされた可能性があるため、一部のイベントが収集されていない可能性があります。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">イベント ログ '{0}' をコンピューター '{1}' から読み取れません</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">'{0}' イベント ログで例外が発生しました。一部のイベントが失われる可能性があります。エラー: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">イベント ログ '{0}' からの最後のエントリの収集中に例外が発生しました: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">イベント ログ DataCollector では、DataCollectionContext の eventLogContext が見つかりませんでした: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">収集中に '{0}' イベント ログがクリアされた可能性があるため、一部のイベントが収集されていない可能性があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">イベント ログ '{0}' をコンピューター '{1}' から読み取れません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">'{0}' イベント ログで例外が発生しました。一部のイベントが失われる可能性があります。エラー: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ko.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ko.xlf
index f7e74176d3..e0eaf643c3 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ko.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ko.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">이벤트 로그 ‘{0}’에서 최종 항목을 수집하는 동안 예외가 발생했습니다. {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">이벤트 로그 DataCollector에서 DataCollectionContext에 대한 eventLogContext를 찾지 못했습니다. {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">수집 중 ‘{0}’ 이벤트 로그가 지워졌을 수 있습니다. 일부 이벤트는 수집되지 않았을 수 있습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">‘{1}’ 컴퓨터에서 이벤트 로그 ‘{0}’을(를) 읽을 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">‘{0}’ 이벤트 로그에서 예외가 발생했습니다. 일부 이벤트가 손실되었을 수 있습니다. 오류: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">이벤트 로그 ‘{0}’에서 최종 항목을 수집하는 동안 예외가 발생했습니다. {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">이벤트 로그 DataCollector에서 DataCollectionContext에 대한 eventLogContext를 찾지 못했습니다. {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">수집 중 ‘{0}’ 이벤트 로그가 지워졌을 수 있습니다. 일부 이벤트는 수집되지 않았을 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">‘{1}’ 컴퓨터에서 이벤트 로그 ‘{0}’을(를) 읽을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">‘{0}’ 이벤트 로그에서 예외가 발생했습니다. 일부 이벤트가 손실되었을 수 있습니다. 오류: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pl.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pl.xlf
index cb78412304..b0e29af077 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pl.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pl.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Wystąpił wyjątek podczas zbierania końcowych wpisów z dziennika zdarzeń „{0}”: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">Element DataCollector dziennika zdarzeń nie znalazł elementu eventLogContext dla elementu DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Dziennik zdarzeń „{0}” mógł zostać wyczyszczony podczas zbierania; niektóre zdarzenia mogły nie zostać zebrane</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Nie można odczytać dziennika zdarzeń „{0}” z komputera „{1}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">Dziennik zdarzeń „{0}” napotkał wyjątek, niektóre zdarzenia mogły zostać utracone. Błąd: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Wystąpił wyjątek podczas zbierania końcowych wpisów z dziennika zdarzeń „{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">Element DataCollector dziennika zdarzeń nie znalazł elementu eventLogContext dla elementu DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Dziennik zdarzeń „{0}” mógł zostać wyczyszczony podczas zbierania; niektóre zdarzenia mogły nie zostać zebrane</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Nie można odczytać dziennika zdarzeń „{0}” z komputera „{1}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">Dziennik zdarzeń „{0}” napotkał wyjątek, niektóre zdarzenia mogły zostać utracone. Błąd: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pt-BR.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pt-BR.xlf
index c944d9ced2..ed06f80387 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.pt-BR.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Ocorreu uma exceção ao coletar entradas finais do log de eventos '{0}': {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">O DataCollector de Log de Eventos não encontrou o eventLogContext para DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">O log de evento '{0}' pode ter sido limpo durante a coleção; alguns eventos podem não ter sido coletados</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Não é possível ler o log de eventos '{0}' do computador '{1}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">O log de eventos '{0}' encontrou uma exceção, alguns eventos podem ser perdidos. Erro: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Ocorreu uma exceção ao coletar entradas finais do log de eventos '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">O DataCollector de Log de Eventos não encontrou o eventLogContext para DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">O log de evento '{0}' pode ter sido limpo durante a coleção; alguns eventos podem não ter sido coletados</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Não é possível ler o log de eventos '{0}' do computador '{1}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">O log de eventos '{0}' encontrou uma exceção, alguns eventos podem ser perdidos. Erro: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ru.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ru.xlf
index a3c70394a1..1a586f9ba6 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ru.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.ru.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">Произошло исключение при сборе последних записей в журнале событий "{0}": {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">Сборщик данных из журнала событий не нашел eventLogContext по DataCollectionContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">Возможно, журнал событий "{0}" был очищен во время сбора данных. Некоторые события могли быть не собраны.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">Не удалось прочитать журнал событий "{0}" с компьютера "{1}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">В журнале событий "{0}" произошло исключение; некоторые события могли быть потеряны. Ошибка: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">Произошло исключение при сборе последних записей в журнале событий "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">Сборщик данных из журнала событий не нашел eventLogContext по DataCollectionContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">Возможно, журнал событий "{0}" был очищен во время сбора данных. Некоторые события могли быть не собраны.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">Не удалось прочитать журнал событий "{0}" с компьютера "{1}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">В журнале событий "{0}" произошло исключение; некоторые события могли быть потеряны. Ошибка: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.tr.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.tr.xlf
index cf2efc3fbf..4502f92da2 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.tr.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.tr.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">'{0}' olay günlüğündeki son girdiler toplanırken bir özel durum oluştu: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">Event Log DataCollector, şu DataCollectionContext için eventLogContext bulamadı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">'{0}' olay günlüğü toplama sırasında temizlenmiş olabilir. Bazı olaylar toplanmamış olabilir</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">'{1}' bilgisayarından olay günlüğü '{0}' okunamıyor</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">'{0}' olay günlüğü bir özel durumla karşılaştı. Bazı olaylar kaybolabilir. Hata : {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">'{0}' olay günlüğündeki son girdiler toplanırken bir özel durum oluştu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">Event Log DataCollector, şu DataCollectionContext için eventLogContext bulamadı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">'{0}' olay günlüğü toplama sırasında temizlenmiş olabilir. Bazı olaylar toplanmamış olabilir</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">'{1}' bilgisayarından olay günlüğü '{0}' okunamıyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">'{0}' olay günlüğü bir özel durumla karşılaştı. Bazı olaylar kaybolabilir. Hata : {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf
index ac059f0b09..980a006087 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.xlf
@@ -5,28 +5,28 @@
       <trans-unit id="CleanupException">
         <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
         <target state="new">An exception occurred while collecting final entries from the event log '{0}': {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ContextNotFoundException">
         <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
         <target state="new">Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EventsLostWarning">
         <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
         <target state="new">The '{0}' event log may have been cleared during collection; some events may not have been collected</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ReadError">
         <source>Unable to read event log '{0}' from computer '{1}'</source>
         <target state="new">Unable to read event log '{0}' from computer '{1}'</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EventsLostError">
         <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
         <target state="new">The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hans.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hans.xlf
index e858659144..baaa472c9a 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">从事件日志“{0}”中收集最后的条目时出现异常: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">事件日志数据收集器找不到数据收集上下文的事件日志上下文: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">“{0}”事件日志可能在收集期间已被清除；某些事件可能还未被收集</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">无法从计算机“{1}”中读取事件日志“{0}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">事件日志“{0}”出现异常，某些事件可能已丢失。错误: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">从事件日志“{0}”中收集最后的条目时出现异常: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">事件日志数据收集器找不到数据收集上下文的事件日志上下文: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">“{0}”事件日志可能在收集期间已被清除；某些事件可能还未被收集</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">无法从计算机“{1}”中读取事件日志“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">事件日志“{0}”出现异常，某些事件可能已丢失。错误: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hant.xlf b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hant.xlf
index 6fbe5ea1ac..d434c66922 100644
--- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="CleanupException">
-        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
-        <target state="translated">從事件記錄檔 '{0}' 收集最終項目時發生例外狀況: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ContextNotFoundException">
-        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
-        <target state="translated">事件記錄檔 DataCollector 找不到 DataCollectionContext 的 eventLogContext: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostWarning">
-        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
-        <target state="translated">'{0}' 事件記錄檔可能已在收集期間清除; 某些事件可能未收集到</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReadError">
-        <source>Unable to read event log '{0}' from computer '{1}'</source>
-        <target state="translated">無法從電腦 '{1}' 讀取事件記錄檔 '{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EventsLostError">
-        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
-        <target state="translated">'{0}' 事件記錄檔發生例外狀況，某些事件可能會遺失。錯誤: {1}</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="CleanupException">
+        <source>An exception occurred while collecting final entries from the event log '{0}': {1}</source>
+        <target state="translated">從事件記錄檔 '{0}' 收集最終項目時發生例外狀況: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ContextNotFoundException">
+        <source>Event Log DataCollector did not find eventLogContext for DataCollectionContext: {0}</source>
+        <target state="translated">事件記錄檔 DataCollector 找不到 DataCollectionContext 的 eventLogContext: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostWarning">
+        <source>The '{0}' event log may have been cleared during collection; some events may not have been collected</source>
+        <target state="translated">'{0}' 事件記錄檔可能已在收集期間清除; 某些事件可能未收集到</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReadError">
+        <source>Unable to read event log '{0}' from computer '{1}'</source>
+        <target state="translated">無法從電腦 '{1}' 讀取事件記錄檔 '{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EventsLostError">
+        <source>The '{0}' event log has encountered an exception, some events might get lost. Error : {1}</source>
+        <target state="translated">'{0}' 事件記錄檔發生例外狀況，某些事件可能會遺失。錯誤: {1}</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Friends.cs b/src/Microsoft.TestPlatform.AdapterUtilities/Friends.cs
index 17825fd742..8511196751 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Friends.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Friends.cs
@@ -3,4 +3,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.TestPlatform.AdapterUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.AdapterUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.MethodBase.cs b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.MethodBase.cs
index 0eaad1f4ed..8a65ff0c20 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.MethodBase.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.MethodBase.cs
@@ -1,56 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
-{
-    using System;
-    using System.Reflection;
-
-    internal static partial class ReflectionHelpers
-    {
-#if NETSTANDARD1_0 || NETSTANDARD1_3 || WINDOWS_UWP
-        private static readonly Type methodBase = typeof(MethodBase);
-
-        private const string MemberTypePropertyName = "MemberType";
-        private const string ReflectedTypePropertyName = "ReflectedType";
-        private const string MethodHandlePropertyName = "MethodHandle";
-
-        private static readonly PropertyInfo memberTypeProperty = methodBase.GetRuntimeProperty(MemberTypePropertyName);
-        private static readonly PropertyInfo reflectedTypeProperty = methodBase.GetRuntimeProperty(ReflectedTypePropertyName);
-        private static readonly PropertyInfo methodHandleProperty = methodBase.GetRuntimeProperty(MethodHandlePropertyName);
-#endif
-
-        internal static bool IsMethod(MethodBase method)
-        {
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            return method.MemberType == MemberTypes.Method;
-#else
-            AssertSupport(memberTypeProperty, MemberTypePropertyName, methodBase.FullName);
-
-            return (int)memberTypeProperty.GetValue(method) == 8;
-#endif
-        }
+using System;
+using System.Reflection;
 
-        internal static Type GetReflectedType(MethodBase method)
-        {
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            return method.ReflectedType;
-#else
-            AssertSupport(memberTypeProperty, ReflectedTypePropertyName, methodBase.FullName);
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers;
 
-            return reflectedTypeProperty.GetValue(method) as Type;
-#endif
-        }
+internal static partial class ReflectionHelpers
+{
+    internal static bool IsMethod(MethodBase method)
+    {
+        return method.MemberType == MemberTypes.Method;
+    }
 
-        internal static RuntimeMethodHandle GetMethodHandle(MethodBase method)
-        {
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            return method.MethodHandle;
-#else
-            AssertSupport(memberTypeProperty, MethodHandlePropertyName, methodBase.FullName);
+    internal static Type? GetReflectedType(MethodBase method)
+    {
+        return method.ReflectedType;
+    }
 
-            return (RuntimeMethodHandle)methodHandleProperty.GetValue(method);
-#endif
-        }
+    internal static RuntimeMethodHandle GetMethodHandle(MethodBase method)
+    {
+        return method.MethodHandle;
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.Type.cs b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.Type.cs
index d8e8d23b5c..2faf43ccb2 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.Type.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.Type.cs
@@ -1,29 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
-{
-    using System;
-    using System.Reflection;
+using System;
+using System.Reflection;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers;
 
-    internal static partial class ReflectionHelpers
+internal static partial class ReflectionHelpers
+{
+    internal static bool IsGenericType(Type type)
     {
-        internal static bool IsGenericType(Type type)
-        {
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            return type.IsGenericType;
-#else
-            return type.GetTypeInfo().IsGenericType;
-#endif
-        }
+        return type.IsGenericType;
+    }
 
-        internal static MethodBase GetDeclaringMethod(Type type)
-        {
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            return type.DeclaringMethod;
-#else
-            return type.GetTypeInfo().DeclaringMethod;
-#endif
-        }
+    internal static MethodBase? GetDeclaringMethod(Type type)
+    {
+        return type.DeclaringMethod;
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.cs b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.cs
index f3585d2617..c4cd5c4fb1 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Helpers/ReflectionHelpers.cs
@@ -1,97 +1,95 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
-{
-    using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
-    using Microsoft.TestPlatform.AdapterUtilities.Resources;
+using System;
+using System.Globalization;
+using System.Text;
+
+using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
 
-    using System;
-    using System.Globalization;
-    using System.Text;
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers;
 
-    internal static partial class ReflectionHelpers
+internal static partial class ReflectionHelpers
+{
+    private static void AssertSupport<T>(T obj, string methodName, string className)
+        where T : class
     {
-        private static void AssertSupport<T>(T obj, string methodName, string className)
-            where T : class
+        if (obj == null)
         {
-            if (obj == null)
-            {
-                throw new NotImplementedException(string.Format(Resources.MethodNotImplementedOnPlatform, className, methodName));
-            }
+            throw new NotImplementedException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.MethodNotImplementedOnPlatform, className, methodName));
         }
+    }
 
-        internal static string ParseEscapedString(string escapedString)
+    internal static string ParseEscapedString(string escapedString)
+    {
+        var stringBuilder = new StringBuilder();
+        var end = 0;
+        for (int i = 0; i < escapedString.Length; i++)
         {
-            var stringBuilder = new StringBuilder();
-            var end = 0;
-            for (int i = 0; i < escapedString.Length; i++)
+            if (escapedString[i] == '\'')
             {
-                if (escapedString[i] == '\'')
-                {
-                    stringBuilder.Append(escapedString, end, i - end);
-                    end = i = ParseEscapedStringSegment(escapedString, i + 1, stringBuilder);
-                }
-            }
-
-            if (stringBuilder.Length == 0)
-            {
-                return escapedString;
+                stringBuilder.Append(escapedString, end, i - end);
+                end = i = ParseEscapedStringSegment(escapedString, i + 1, stringBuilder);
             }
+        }
 
-            if (end != 0 && end < escapedString.Length)
-            {
-                stringBuilder.Append(escapedString, end, escapedString.Length - end);
-            }
+        if (stringBuilder.Length == 0)
+        {
+            return escapedString;
+        }
 
-            return stringBuilder.ToString();
+        if (end != 0 && end < escapedString.Length)
+        {
+            stringBuilder.Append(escapedString, end, escapedString.Length - end);
         }
 
-        // Unescapes a C# style escaped string.
-        private static int ParseEscapedStringSegment(string escapedStringSegment, int pos, StringBuilder stringBuilder)
+        return stringBuilder.ToString();
+    }
+
+    // Unescapes a C# style escaped string.
+    private static int ParseEscapedStringSegment(string escapedStringSegment, int pos, StringBuilder stringBuilder)
+    {
+        for (int i = pos; i < escapedStringSegment.Length; i++)
         {
-            for (int i = pos; i < escapedStringSegment.Length; i++)
+            switch (escapedStringSegment[i])
             {
-                switch (escapedStringSegment[i])
-                {
-                    case '\\':
-                        if (escapedStringSegment[i + 1] == 'u')
-                        {
-                            char c;
-
-                            try
-                            {
-                                var code = escapedStringSegment.Substring(i + 2, 4);
-                                c = (char)Convert.ToInt32(code, 16);
-                            }
-                            catch
-                            {
-                                throw new InvalidManagedNameException(
-                                    string.Format(CultureInfo.CurrentCulture, Resources.ErrorInvalidSequenceAt, escapedStringSegment, i)
-                                );
-                            }
+                case '\\':
+                    if (escapedStringSegment[i + 1] == 'u')
+                    {
+                        char c;
 
-                            stringBuilder.Append(c);
-                            i += 5;
+                        try
+                        {
+                            var code = escapedStringSegment.Substring(i + 2, 4);
+                            c = (char)Convert.ToInt32(code, 16);
                         }
-                        else
+                        catch
                         {
-                            stringBuilder.Append(escapedStringSegment[++i]);
+                            throw new InvalidManagedNameException(
+                                string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorInvalidSequenceAt, escapedStringSegment, i)
+                            );
                         }
 
-                        break;
+                        stringBuilder.Append(c);
+                        i += 5;
+                    }
+                    else
+                    {
+                        stringBuilder.Append(escapedStringSegment[++i]);
+                    }
 
-                    case '\'':
-                        return i + 1;
+                    break;
 
-                    default:
-                        stringBuilder.Append(escapedStringSegment[i]);
-                        break;
-                }
-            }
+                case '\'':
+                    return i + 1;
 
-            string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorNoClosingQuote, escapedStringSegment);
-            throw new InvalidManagedNameException(message);
+                default:
+                    stringBuilder.Append(escapedStringSegment[i]);
+                    break;
+            }
         }
+
+        string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorNoClosingQuote, escapedStringSegment);
+        throw new InvalidManagedNameException(message);
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/HierarchyConstants.cs b/src/Microsoft.TestPlatform.AdapterUtilities/HierarchyConstants.cs
index 1546637c7c..970ceb06c6 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/HierarchyConstants.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/HierarchyConstants.cs
@@ -1,42 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities
+namespace Microsoft.TestPlatform.AdapterUtilities;
+
+/// <summary>
+/// Constants to help declare Hierarchy test property.
+/// </summary>
+public static class HierarchyConstants
 {
     /// <summary>
-    /// Constants to help declare Hierarchy test property.
+    /// Label to use on Hierarchy test property.
+    /// </summary>
+    public const string HierarchyLabel = "Hierarchy";
+
+    /// <summary>
+    /// Property id to use on Hierarchy test property.
+    /// </summary>
+    public const string HierarchyPropertyId = "TestCase." + HierarchyLabel;
+
+    /// <summary>
+    /// Meanings of the indices in the Hierarchy array.
     /// </summary>
-    public static class HierarchyConstants
+    public static class Levels
     {
         /// <summary>
-        /// Label to use on Hierarchy test property.
+        /// Total length of Hierarchy array.
+        /// </summary>
+        /// <remarks>
+        /// Currently the order for this is usually:
+        /// <c>Assembly Display Name</c>, <c>Namespace</c>, <c>ClassName</c>, <c>Managed Method Name</c>.
+        /// </remarks>
+        public const int TotalLevelCount = 4;
+
+        /// <summary>
+        /// Index of the test container element of the array.
+        /// </summary>
+        /// <remarks>
+        /// This is usually test asssembly display name.
+        /// </remarks>
+        public const int ContainerIndex = 0;
+
+        /// <summary>
+        /// Index of the namespace element of the array.
         /// </summary>
-        public const string HierarchyLabel = "Hierarchy";
+        /// <remarks>
+        /// This is usually test namespace without class name.
+        /// </remarks>
+        public const int NamespaceIndex = 1;
 
         /// <summary>
-        /// Property id to use on Hierarchy test property.
+        /// Index of the class element of the array.
         /// </summary>
-        public const string HierarchyPropertyId = "TestCase." + HierarchyLabel;
+        /// <remarks>
+        /// This is usually test class name without namespace.
+        /// </remarks>
+        public const int ClassIndex = 2;
 
         /// <summary>
-        /// Meanings of the indices in the Hierarchy array.
+        /// Index of the test group element of the array.
         /// </summary>
-        public static class Levels
-        {
-            /// <summary>
-            /// Total length of Hierarchy array.
-            /// </summary>
-            public const int TotalLevelCount = 2;
-
-            /// <summary>
-            /// Index of the namespace element of the array.
-            /// </summary>
-            public const int NamespaceIndex = 0;
-
-            /// <summary>
-            /// Index of the class element of the array.
-            /// </summary>
-            public const int ClassIndex = 1;
-        }
+        /// <remarks>
+        /// This is usually test method name.
+        /// </remarks>
+        public const int TestGroupIndex = 3;
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameConstants.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameConstants.cs
index caca513122..fbe1c8ea56 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameConstants.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameConstants.cs
@@ -1,31 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities
+namespace Microsoft.TestPlatform.AdapterUtilities;
+
+/// <summary>
+/// Contants to help declare ManagedType and ManagedMethod test properties.
+/// </summary>
+public static class ManagedNameConstants
 {
     /// <summary>
-    /// Contants to help declare ManagedType and ManagedMethod test properties.
+    /// Label to use on ManagedType test property.
     /// </summary>
-    public static class ManagedNameConstants
-    {
-        /// <summary>
-        /// Label to use on ManagedType test property.
-        /// </summary>
-        public const string ManagedTypeLabel = "ManagedType";
+    public const string ManagedTypeLabel = "ManagedType";
 
-        /// <summary>
-        /// Label to use on ManagedMethod test property.
-        /// </summary>
-        public const string ManagedMethodLabel = "ManagedMethod";
+    /// <summary>
+    /// Label to use on ManagedMethod test property.
+    /// </summary>
+    public const string ManagedMethodLabel = "ManagedMethod";
 
-        /// <summary>
-        /// Property id to use on ManagedType test property.
-        /// </summary>
-        public const string ManagedTypePropertyId = "TestCase." + ManagedTypeLabel;
+    /// <summary>
+    /// Property id to use on ManagedType test property.
+    /// </summary>
+    public const string ManagedTypePropertyId = "TestCase." + ManagedTypeLabel;
 
-        /// <summary>
-        /// Property id to use on ManagedMethod test property.
-        /// </summary>
-        public const string ManagedMethodPropertyId = "TestCase." + ManagedMethodLabel;
-    }
+    /// <summary>
+    /// Property id to use on ManagedMethod test property.
+    /// </summary>
+    public const string ManagedMethodPropertyId = "TestCase." + ManagedMethodLabel;
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/InvalidManagedNameException.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/InvalidManagedNameException.cs
index 3cbbaf86f5..c0bdef2cbb 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/InvalidManagedNameException.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/InvalidManagedNameException.cs
@@ -1,27 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities
-{
-    using System;
+using System;
+using System.Runtime.Serialization;
 
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
-    using System.Runtime.Serialization;
-#endif
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
 
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
-    [Serializable]
-#endif
-    public class InvalidManagedNameException :
-        Exception
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
-        , ISerializable
-#endif
-    {
-        public InvalidManagedNameException(string message) : base(message) { }
+[Serializable]
+public class InvalidManagedNameException : Exception, ISerializable
+{
+    public InvalidManagedNameException(string? message) : base(message) { }
 
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
-        protected InvalidManagedNameException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+#if NET8_0_OR_GREATER
+    [Obsolete("Serialization constructors are deprecated in .NET8+", DiagnosticId = "SYSLIB0051")]
 #endif
-    }
-}
\ No newline at end of file
+    protected InvalidManagedNameException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+}
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs
index 5d37a39f80..a1eb37da9c 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs
@@ -1,574 +1,624 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities
-{
-    using Microsoft.TestPlatform.AdapterUtilities.Resources;
-    using Microsoft.TestPlatform.AdapterUtilities.Helpers;
+using Microsoft.TestPlatform.AdapterUtilities.Helpers;
 
-    using System;
-    using System.Globalization;
-    using System.Reflection;
-    using System.Text;
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
 
-#if !NET20
-    using System.Linq;
-#endif
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
 
-    public static partial class ManagedNameHelper
+public static partial class ManagedNameHelper
+{
+    private readonly struct AssemblyNameCache
     {
-        /// <summary>
-        /// Gets fully qualified managed type and method name from given <see href="MethodBase" /> instance.
-        /// </summary>
-        /// <param name="method">
-        /// A <see cref="MethodBase" /> instance to get fully qualified managed type and method name.
-        /// </param>
-        /// <param name="managedTypeName">
-        /// When this method returns, contains the fully qualified managed type name of the <paramref name="method"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
-        /// </param>
-        /// <param name="managedMethodName">
-        /// When this method returns, contains the fully qualified managed method name of the <paramref name="method"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
-        /// </param>
-        /// <exception cref="ArgumentNullException">
-        /// <paramref name="method"/> is null.
-        /// </exception>
-        /// <exception cref="NotSupportedException">
-        /// <paramref name="method"/> must describe a method.
-        /// </exception>
-        /// <exception cref="NotImplementedException">
-        /// Required functionality on <paramref name="method"/> is missing on the current platform.
-        /// </exception>
-        /// <remarks>
-        /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
-        /// <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
-        /// </remarks>
-        public static void GetManagedName(MethodBase method, out string managedTypeName, out string managedMethodName)
-            => GetManagedName(method, out managedTypeName, out managedMethodName, out _);
-
-        /// <summary>
-        /// Gets fully qualified managed type and method name from given <see href="MethodBase" /> instance.
-        /// </summary>
-        /// <param name="method">
-        /// A <see cref="MethodBase" /> instance to get fully qualified managed type and method name.
-        /// </param>
-        /// <param name="managedTypeName">
-        /// When this method returns, contains the fully qualified managed type name of the <paramref name="method"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
-        /// </param>
-        /// <param name="managedMethodName">
-        /// When this method returns, contains the fully qualified managed method name of the <paramref name="method"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
-        /// </param>
-        /// <param name="hierarchyValues">
-        /// When this method returns, contains the default test hierarchy values of the <paramref name="method"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        /// <exception cref="ArgumentNullException">
-        /// <paramref name="method"/> is null.
-        /// </exception>
-        /// <exception cref="NotSupportedException">
-        /// <paramref name="method"/> must describe a method.
-        /// </exception>
-        /// <exception cref="NotImplementedException">
-        /// Required functionality on <paramref name="method"/> is missing on the current platform.
-        /// </exception>
-        /// <remarks>
-        /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
-        /// <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
-        /// </remarks>
-        public static void GetManagedName(MethodBase method, out string managedTypeName, out string managedMethodName, out string[] hierarchyValues)
-        {
-            if (method == null)
-            {
-                throw new ArgumentNullException(nameof(method));
-            }
+        public AssemblyNameCache(Assembly? assembly, string simpleName)
+        {
+            Assembly = assembly;
+            SimpleName = simpleName;
+        }
 
-            if (!ReflectionHelpers.IsMethod(method))
-            {
-                throw new NotSupportedException(nameof(method));
-            }
+        public Assembly? Assembly { get; }
+        public string SimpleName { get; }
+    }
 
-            var semanticType = ReflectionHelpers.GetReflectedType(method);
-            if (ReflectionHelpers.IsGenericType(semanticType))
-            {
-                // The type might have some of its generic parameters specified, so make
-                // sure we are working with the open form of the generic type.
-                semanticType = semanticType.GetGenericTypeDefinition();
-
-                // The method might have some of its parameters specified by the original closed type
-                // declaration. Here we use the method handle (basically metadata token) to create
-                // a new method reference using the open form of the reflected type. The intent is
-                // to strip all generic type parameters.
-                var methodHandle = ReflectionHelpers.GetMethodHandle(method);
-                method = MethodBase.GetMethodFromHandle(methodHandle, semanticType.TypeHandle);
-            }
+    private static AssemblyNameCache? s_lastAssemblyNameCache;
+
+    /// <summary>
+    /// Gets fully qualified managed type and method name from given <see href="MethodBase" /> instance.
+    /// </summary>
+    /// <param name="method">
+    /// A <see cref="MethodBase" /> instance to get fully qualified managed type and method name.
+    /// </param>
+    /// <param name="managedTypeName">
+    /// When this method returns, contains the fully qualified managed type name of the <paramref name="method"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
+    /// </param>
+    /// <param name="managedMethodName">
+    /// When this method returns, contains the fully qualified managed method name of the <paramref name="method"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
+    /// </param>
+    /// <exception cref="ArgumentNullException">
+    /// <paramref name="method"/> is null.
+    /// </exception>
+    /// <exception cref="NotSupportedException">
+    /// <paramref name="method"/> must describe a method.
+    /// </exception>
+    /// <exception cref="NotImplementedException">
+    /// Required functionality on <paramref name="method"/> is missing on the current platform.
+    /// </exception>
+    /// <remarks>
+    /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
+    /// <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
+    /// </remarks>
+    public static void GetManagedName(MethodBase method, out string managedTypeName, out string managedMethodName)
+     => GetManagedNameAndHierarchy(method, false, out managedTypeName, out managedMethodName, out _);
+
+    /// <summary>
+    /// Gets fully qualified managed type and method name from given <see href="MethodBase" /> instance.
+    /// </summary>
+    /// <param name="method">
+    /// A <see cref="MethodBase" /> instance to get fully qualified managed type and method name.
+    /// </param>
+    /// <param name="managedTypeName">
+    /// When this method returns, contains the fully qualified managed type name of the <paramref name="method"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
+    /// </param>
+    /// <param name="managedMethodName">
+    /// When this method returns, contains the fully qualified managed method name of the <paramref name="method"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
+    /// </param>
+    /// <param name="hierarchyValues">
+    /// When this method returns, contains the default test hierarchy values of the <paramref name="method"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    /// <exception cref="ArgumentNullException">
+    /// <paramref name="method"/> is null.
+    /// </exception>
+    /// <exception cref="NotSupportedException">
+    /// <paramref name="method"/> must describe a method.
+    /// </exception>
+    /// <exception cref="NotImplementedException">
+    /// Required functionality on <paramref name="method"/> is missing on the current platform.
+    /// </exception>
+    /// <remarks>
+    /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
+    /// <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
+    /// </remarks>
+    public static void GetManagedName(MethodBase method, out string managedTypeName, out string managedMethodName, out string?[] hierarchyValues)
+    {
+        if (!method.IsGenericMethod && ReflectionHelpers.GetReflectedType(method) is { } semanticType && !ReflectionHelpers.IsGenericType(semanticType))
+        {
+            // We are dealing with non-generic method in non-generic type.
+            // So, it doesn't matter what we pass as "useClosedTypes".
+            // Instead of calling GetManagedNameAndHierarchy that does repeated work, we call it only once.
+            GetManagedNameAndHierarchy(method, false, out managedTypeName, out managedMethodName, out hierarchyValues);
+        }
+        else
+        {
+            GetManagedNameAndHierarchy(method, false, out managedTypeName, out managedMethodName, out _);
+            GetManagedNameAndHierarchy(method, true, out _, out _, out hierarchyValues);
+        }
+    }
 
-            if (method.IsGenericMethod)
-            {
-                // If this method is generic, then convert to the generic method definition
-                // so that we get the open generic type definitions for parameters.
-                method = ((MethodInfo)method).GetGenericMethodDefinition();
-            }
+    /// <summary>
+    /// Gets default hierarchy values for a given <paramref name="method"/>.
+    /// </summary>
+    /// <param name="method">
+    /// A <see cref="MethodBase" /> instance to get default hierarchy values.
+    /// </param>
+    /// <exception cref="ArgumentNullException">
+    /// <paramref name="method"/> is null.
+    /// </exception>
+    /// <exception cref="NotSupportedException">
+    /// <paramref name="method"/> must describe a method.
+    /// </exception>
+    /// <exception cref="NotImplementedException">
+    /// Required functionality on <paramref name="method"/> is missing on the current platform.
+    /// </exception>
+    /// <returns>
+    /// The hierarchy values.
+    /// </returns>
+    public static string?[] GetManagedHierarchy(MethodBase method)
+    {
+        GetManagedNameAndHierarchy(method, true, out _, out _, out var hierarchyValues);
 
-            var typeBuilder = new StringBuilder();
-            var methodBuilder = new StringBuilder();
+        return hierarchyValues;
+    }
 
-            // Namespace and Type Name (with arity designation)
-            var hierarchyPos = AppendTypeString(typeBuilder, semanticType, closedType: false);
+    private static void GetManagedNameAndHierarchy(MethodBase method, bool useClosedTypes, out string managedTypeName, out string managedMethodName, out string?[] hierarchyValues)
+    {
+        _ = method ?? throw new ArgumentNullException(nameof(method));
 
-            // Method Name with method arity
-            var arity = method.GetGenericArguments().Length;
-            AppendMethodString(methodBuilder, method.Name, arity);
-            if (arity > 0)
-            {
-                methodBuilder.Append('`');
-                methodBuilder.Append(arity);
-            }
+        if (!ReflectionHelpers.IsMethod(method))
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorMethodExpectedAsAnArgument, nameof(method)));
+        }
 
-            // Type Parameters
-            var paramList = method.GetParameters();
-            if (paramList.Length != 0)
-            {
-                methodBuilder.Append('(');
-                foreach (var p in paramList)
-                {
-                    AppendTypeString(methodBuilder, p.ParameterType, closedType: true);
-                    methodBuilder.Append(',');
-                }
-                // Replace the last ',' with ')'
-                methodBuilder[methodBuilder.Length - 1] = ')';
-            }
+        var semanticType = ReflectionHelpers.GetReflectedType(method)
+            // TODO: @Haplois, exception expects a message and not a param name.
+            ?? throw new NotSupportedException(nameof(method));
 
-            managedTypeName = typeBuilder.ToString();
-            managedMethodName = methodBuilder.ToString();
-            hierarchyValues = new[] {
-                managedTypeName.Substring(hierarchyPos[0], hierarchyPos[1] - hierarchyPos[0]),
-                managedTypeName.Substring(hierarchyPos[1] + 1, hierarchyPos[2] - hierarchyPos[1] - 1),
-            };
-        }
-
-        /// <summary>
-        /// Gets the <see cref="MethodBase"/> object with the specified <paramref name="managedTypeName"/>
-        /// and <paramref name="managedMethodName"/> in the <paramref name="assembly"/> instance.
-        /// </summary>
-        /// <param name="assembly">
-        /// An <see cref="Assembly" /> instance to search in.
-        /// </param>
-        /// <param name="managedTypeName">
-        /// The fully qualified managed name of the type.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
-        /// </param>
-        /// <param name="managedMethodName">
-        /// The fully qualified managed name of the method.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
-        /// </param>
-        /// <returns>
-        /// A <see cref="MethodBase" /> object that represents specified parameters, throws if null.
-        /// </returns>
-        /// <exception cref="InvalidManagedNameException">
-        /// Values specified with <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/>
-        /// does not correspond to a method in the <paramref name="assembly"/> instance, or malformed.
-        /// </exception>
-        /// <remarks>
-        /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
-        /// <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
-        /// </remarks>
-        public static MethodBase GetMethod(Assembly assembly, string managedTypeName, string managedMethodName)
-        {
-            Type type;
-
-            var parsedManagedTypeName = ReflectionHelpers.ParseEscapedString(managedTypeName);
-
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            type = assembly.GetType(parsedManagedTypeName, throwOnError: false, ignoreCase: false);
-#else
-            try
-            {
-                type = assembly.GetType(parsedManagedTypeName);
-            }
-            catch
-            {
-                type = null;
-            }
-#endif
+        if (ReflectionHelpers.IsGenericType(semanticType) && !useClosedTypes)
+        {
+            // The type might have some of its generic parameters specified, so make
+            // sure we are working with the open form of the generic type.
+            semanticType = semanticType.GetGenericTypeDefinition();
+
+            // The method might have some of its parameters specified by the original closed type
+            // declaration. Here we use the method handle (basically metadata token) to create
+            // a new method reference using the open form of the reflected type. The intent is
+            // to strip all generic type parameters.
+            var methodHandle = ReflectionHelpers.GetMethodHandle(method);
+            method = MethodBase.GetMethodFromHandle(methodHandle, semanticType.TypeHandle)!;
+        }
 
-            if (type == null)
-            {
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorTypeNotFound, parsedManagedTypeName);
-                throw new InvalidManagedNameException(message);
-            }
+        if (method.IsGenericMethod && !useClosedTypes)
+        {
+            // If this method is generic, then convert to the generic method definition
+            // so that we get the open generic type definitions for parameters.
+            method = ((MethodInfo)method).GetGenericMethodDefinition();
+        }
 
-            MethodInfo method = null;
-            ManagedNameParser.ParseManagedMethodName(managedMethodName, out var methodName, out var methodArity, out var parameterTypes);
+        var typeBuilder = new StringBuilder();
+        var methodBuilder = new StringBuilder();
 
-#if NET20 || NET35
-            if (!IsNullOrWhiteSpace(methodName))
-#else
-            if (!string.IsNullOrWhiteSpace(methodName))
-#endif
+        // Namespace and Type Name (with arity designation)
+        // hierarchyPos contains [startIndexOfNamespace, endIndexOfNameSpace, endIndexOfTypeName]
+        var hierarchyPos = AppendTypeString(typeBuilder, semanticType, closedType: useClosedTypes);
+        if (hierarchyPos is null || hierarchyPos.Length != 3)
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorMethodExpectedAsAnArgument, nameof(method)));
+        }
+
+        // Method Name with method arity
+        var arity = method.GetGenericArguments().Length;
+        AppendMethodString(methodBuilder, method.Name, arity);
+        if (arity > 0)
+        {
+            if (useClosedTypes)
             {
-                method = FindMethod(type, methodName, methodArity, parameterTypes);
+                AppendGenericMethodParameters(methodBuilder, method);
             }
-
-            if (method == null)
+            else
             {
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorMethodNotFound, methodName, managedTypeName);
-                throw new InvalidManagedNameException(message);
+                methodBuilder.Append('`');
+                methodBuilder.Append(arity);
             }
-
-            return method;
         }
 
-        private static MethodInfo FindMethod(Type type, string methodName, int methodArity, string[] parameterTypes)
+        // Type Parameters
+        var paramList = method.GetParameters();
+        if (paramList.Length != 0)
         {
-            bool filter(MemberInfo mbr, object param)
+            methodBuilder.Append('(');
+            foreach (var p in paramList)
             {
-                var method = mbr as MethodInfo;
-                if (method.Name != methodName || method.GetGenericArguments().Length != methodArity)
-                {
-                    return false;
-                }
+                // closedType is always true here by RFC
+                AppendTypeString(methodBuilder, p.ParameterType, closedType: true);
+                methodBuilder.Append(',');
+            }
+            // Replace the last ',' with ')'
+            methodBuilder[methodBuilder.Length - 1] = ')';
+        }
+        var methodNameEndIndex = methodBuilder.Length;
 
-                var paramList = method.GetParameters();
-                if (paramList.Length == 0 && parameterTypes == null)
-                {
-                    return true;
-                }
-                else if (parameterTypes == null || paramList.Length != parameterTypes.Length)
-                {
-                    return false;
-                }
+        managedTypeName = typeBuilder.ToString();
+        managedMethodName = methodBuilder.ToString();
 
-                for (int i = 0; i < paramList.Length; i++)
-                {
-                    if (GetTypeString(paramList[i].ParameterType, closedType: true) != parameterTypes[i])
-                    {
-                        return false;
-                    }
-                }
+        hierarchyValues = new string[HierarchyConstants.Levels.TotalLevelCount];
+        hierarchyValues[HierarchyConstants.Levels.TestGroupIndex] = managedMethodName.Substring(0, methodNameEndIndex);
+        if (hierarchyPos[1] == hierarchyPos[0]) // No namespace
+        {
+            hierarchyValues[HierarchyConstants.Levels.ClassIndex] = managedTypeName.Substring(0, hierarchyPos[2]);
+            hierarchyValues[HierarchyConstants.Levels.NamespaceIndex] = null;
+        }
+        else
+        {
+            hierarchyValues[HierarchyConstants.Levels.ClassIndex] = managedTypeName.Substring(hierarchyPos[1] + 1, hierarchyPos[2] - hierarchyPos[1] - 1);
+            hierarchyValues[HierarchyConstants.Levels.NamespaceIndex] = managedTypeName.Substring(hierarchyPos[0], hierarchyPos[1] - hierarchyPos[0]);
+        }
 
-                return true;
-            }
+        var assembly = method.DeclaringType?.Assembly;
+        if (s_lastAssemblyNameCache is { } cache &&
+            cache.Assembly == assembly)
+        {
+            hierarchyValues[HierarchyConstants.Levels.ContainerIndex] = cache.SimpleName;
+        }
+        else
+        {
+            var assemblyName = assembly?.GetName()?.Name ?? string.Empty;
+            hierarchyValues[HierarchyConstants.Levels.ContainerIndex] = assemblyName;
+            s_lastAssemblyNameCache = new AssemblyNameCache(assembly, assemblyName);
+        }
+    }
 
-            MemberInfo[] methods;
+    /// <summary>
+    /// Gets the <see cref="MethodBase"/> object with the specified <paramref name="managedTypeName"/>
+    /// and <paramref name="managedMethodName"/> in the <paramref name="assembly"/> instance.
+    /// </summary>
+    /// <param name="assembly">
+    /// An <see cref="Assembly" /> instance to search in.
+    /// </param>
+    /// <param name="managedTypeName">
+    /// The fully qualified managed name of the type.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
+    /// </param>
+    /// <param name="managedMethodName">
+    /// The fully qualified managed name of the method.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
+    /// </param>
+    /// <returns>
+    /// A <see cref="MethodBase" /> object that represents specified parameters, throws if null.
+    /// </returns>
+    /// <exception cref="InvalidManagedNameException">
+    /// Values specified with <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/>
+    /// does not correspond to a method in the <paramref name="assembly"/> instance, or malformed.
+    /// </exception>
+    /// <remarks>
+    /// More information about <paramref name="managedTypeName"/> and <paramref name="managedMethodName"/> can be found in
+    /// <see href="https://github.com/microsoft/vstest/blob/main/docs/RFCs/0017-Managed-TestCase-Properties.md">the RFC</see>.
+    /// </remarks>
+    public static MethodBase GetMethod(Assembly assembly, string managedTypeName, string managedMethodName)
+    {
+        var parsedManagedTypeName = ReflectionHelpers.ParseEscapedString(managedTypeName);
+        var type = assembly.GetType(parsedManagedTypeName, throwOnError: false, ignoreCase: false);
 
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            var bindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static;
-            methods = type.FindMembers(MemberTypes.Method, bindingFlags, filter, null);
-#else
-            methods = type.GetRuntimeMethods().Where(m => filter(m, null)).ToArray();
-#endif
+        if (type == null)
+        {
+            string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorTypeNotFound, parsedManagedTypeName);
+            throw new InvalidManagedNameException(message);
+        }
 
-#if NET20
-            return (MethodInfo)SingleOrDefault(methods);
-#else
-            return (MethodInfo)methods.SingleOrDefault();
-#endif
+        MethodInfo? method = null;
+        ManagedNameParser.ParseManagedMethodName(managedMethodName, out var methodName, out var methodArity, out var parameterTypes);
+
+        if (!string.IsNullOrWhiteSpace(methodName))
+        {
+            method = FindMethod(type, methodName, methodArity, parameterTypes);
         }
 
-        private static int[] AppendTypeString(StringBuilder b, Type type, bool closedType)
+        if (method == null)
         {
-            int[] hierarchies = null;
+            string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorMethodNotFound, methodName, managedTypeName);
+            throw new InvalidManagedNameException(message);
+        }
 
-            if (type.IsArray)
+        return method;
+    }
+
+    private static MethodInfo? FindMethod(Type type, string methodName, int methodArity, string[]? parameterTypes)
+    {
+        bool Filter(MemberInfo mbr, object? param)
+        {
+            if (mbr is not MethodInfo method || method.Name != methodName || method.GetGenericArguments().Length != methodArity)
             {
-                hierarchies = AppendTypeString(b, type.GetElementType(), closedType);
-                b.Append('[');
-                for (int i = 0; i < type.GetArrayRank() - 1; i++)
-                {
-                    b.Append(',');
-                }
-                b.Append(']');
+                return false;
             }
-            else if (type.IsGenericParameter)
+
+            var paramList = method.GetParameters();
+            if (paramList.Length == 0 && parameterTypes == null)
             {
-                if (ReflectionHelpers.GetDeclaringMethod(type) != null)
-                {
-                    b.Append('!');
-                }
-                b.Append('!');
-                b.Append(type.GenericParameterPosition);
+                return true;
             }
-            else
+            else if (parameterTypes == null || paramList.Length != parameterTypes.Length)
             {
-                hierarchies = new int[3];
-                hierarchies[0] = b.Length;
-
-                AppendNamespace(b, type.Namespace);
-                hierarchies[1] = b.Length;
-
-                b.Append('.');
+                return false;
+            }
 
-                AppendNestedTypeName(b, type);
-                if (closedType)
+            for (int i = 0; i < paramList.Length; i++)
+            {
+                var parameterType = GetTypeString(paramList[i].ParameterType, closedType: true);
+                if (parameterType != parameterTypes[i])
                 {
-                    AppendGenericTypeParameters(b, type);
+                    return false;
                 }
-                hierarchies[2] = b.Length;
             }
 
-            return hierarchies;
+            return true;
         }
 
-        private static void AppendNamespace(StringBuilder b, string namespaceString)
-        {
-            int start = 0;
-            bool shouldEscape = false;
+        var bindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static;
+        var methods = type.FindMembers(MemberTypes.Method, bindingFlags, Filter, null);
 
-            for (int i = 0; i <= namespaceString.Length; i++)
-            {
-                if (i == namespaceString.Length || namespaceString[i] == '.')
-                {
-                    if (start != 0)
-                    {
-                        b.Append('.');
-                    }
-
-                    var part = namespaceString.Substring(start, i - start);
-                    if (shouldEscape)
-                    {
-                        NormalizeAndAppendString(b, part);
-                        shouldEscape = false;
-                    }
-                    else
-                    {
-                        b.Append(part);
-                    }
+        return (MethodInfo?)(methods.Length switch
+        {
+            1 => methods[0],
+            > 1 => methods.SingleOrDefault(i => i.DeclaringType == type),
+            _ => null
+        });
+    }
 
-                    start = i + 1;
-                    continue;
-                }
+    private static int[]? AppendTypeString(StringBuilder b, Type? type, bool closedType)
+    {
+        if (type is null)
+        {
+            return null;
+        }
 
-                shouldEscape = shouldEscape || NeedsEscaping(namespaceString[i], i - start);
+        int[]? hierarchies = null;
+        if (type.IsArray)
+        {
+            hierarchies = AppendTypeString(b, type.GetElementType(), closedType);
+            b.Append('[');
+            for (int i = 0; i < type.GetArrayRank() - 1; i++)
+            {
+                b.Append(',');
             }
+            b.Append(']');
         }
-
-        private static void AppendMethodString(StringBuilder methodBuilder, string name, int methodArity)
+        else if (type.IsGenericParameter)
         {
-            var arityStart = name.LastIndexOf('`');
-            var arity = 0;
-            if (arityStart > 0)
+            if (ReflectionHelpers.GetDeclaringMethod(type) != null)
             {
-                arityStart++;
-                var arityString = name.Substring(arityStart, name.Length - arityStart);
-                if (int.TryParse(arityString, out arity))
-                {
-                    if (arity == methodArity)
-                    {
-                        name = name.Substring(0, arityStart - 1);
-                    }
-                }
+                b.Append('!');
             }
+            b.Append('!');
+            b.Append(type.GenericParameterPosition);
+        }
+        else
+        {
+            hierarchies = new int[3];
+            hierarchies[0] = b.Length;
 
-            if (IsNormalized(name))
+            if (type.Namespace != null)
             {
-                methodBuilder.Append(name);
+                AppendNamespace(b, type.Namespace);
+                hierarchies[1] = b.Length;
+
+                b.Append('.');
             }
             else
             {
-                NormalizeAndAppendString(methodBuilder, name);
+                hierarchies[1] = hierarchies[0];
             }
 
-            if (arity > 0 && methodArity == arity)
+            AppendNestedTypeName(b, type);
+            if (closedType)
             {
-                methodBuilder.Append($"`{arity}");
+                AppendGenericTypeParameters(b, type);
             }
+
+            hierarchies[2] = b.Length;
         }
 
-        private static void NormalizeAndAppendString(StringBuilder b, string name)
+        return hierarchies;
+    }
+
+    private static void AppendNamespace(StringBuilder b, string? namespaceString)
+    {
+        if (namespaceString is null)
         {
-            b.Append('\'');
-            for (int i = 0; i < name.Length; i++)
+            return;
+        }
+
+        int start = 0;
+        bool shouldEscape = false;
+
+        for (int i = 0; i <= namespaceString.Length; i++)
+        {
+            if (i == namespaceString.Length || namespaceString[i] == '.')
             {
-                char c = name[i];
-                if (NeedsEscaping(c, i))
+                if (start != 0)
                 {
-                    if (c == '\\' || c == '\'')
-                    {
-                        // var encoded = Convert.ToString(((uint)c), 16);
-                        // b.Append("\\u");
-                        // b.Append('0', 4 - encoded.Length);
-                        // b.Append(encoded);
+                    b.Append('.');
+                }
 
-                        b.Append('\\');
-                        b.Append(c);
-                        continue;
-                    }
+                var part = namespaceString.Substring(start, i - start);
+                if (shouldEscape)
+                {
+                    NormalizeAndAppendString(b, part);
+                    shouldEscape = false;
+                }
+                else
+                {
+                    b.Append(part);
                 }
 
-                b.Append(c);
+                start = i + 1;
+                continue;
             }
-            b.Append('\'');
+
+            shouldEscape = shouldEscape || NeedsEscaping(namespaceString[i], i - start);
         }
+    }
 
-        private static int AppendNestedTypeName(StringBuilder b, Type type)
+    private static void AppendMethodString(StringBuilder methodBuilder, string name, int methodArity)
+    {
+        var arityStart = name.LastIndexOf('`');
+        var arity = 0;
+        if (arityStart > 0)
         {
-            var outerArity = 0;
-            if (type.IsNested)
-            {
-                outerArity = AppendNestedTypeName(b, type.DeclaringType);
-                b.Append('+');
-            }
-
-            var typeName = type.Name;
-            var stars = 0;
-            if (type.IsPointer)
+            arityStart++;
+            var arityString = name.Substring(arityStart, name.Length - arityStart);
+            if (int.TryParse(arityString, out arity))
             {
-                for (int i = typeName.Length - 1; i > 0; i--)
+                if (arity == methodArity)
                 {
-                    if (typeName[i] != '*')
-                    {
-                        stars = typeName.Length - i - 1;
-                        typeName = typeName.Substring(0, i + 1);
-                        break;
-                    }
+                    name = name.Substring(0, arityStart - 1);
                 }
             }
-
-            var info = type.GetTypeInfo();
-            var arity = !info.IsGenericType
-                      ? 0
-                      : info.GenericTypeParameters.Length > 0
-                        ? info.GenericTypeParameters.Length
-                        : info.GenericTypeArguments.Length;
-
-            AppendMethodString(b, typeName, arity - outerArity);
-            b.Append('*', stars);
-            return arity;
         }
 
-        private static void AppendGenericTypeParameters(StringBuilder b, Type type)
+        if (IsNormalized(name))
+        {
+            methodBuilder.Append(name);
+        }
+        else
         {
-            Type[] genargs;
+            NormalizeAndAppendString(methodBuilder, name);
+        }
 
-#if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
-            genargs = type.GetGenericArguments();
-#else
-            genargs = type.GetTypeInfo().GenericTypeArguments;
+        if (arity > 0 && methodArity == arity)
+        {
+            methodBuilder.Append(
+#if NET6_0_OR_GREATER
+                System.Globalization.CultureInfo.InvariantCulture,
 #endif
-
-            if (genargs.Length != 0)
-            {
-                b.Append('<');
-                foreach (var argType in genargs)
-                {
-                    AppendTypeString(b, argType, closedType: true);
-                    b.Append(',');
-                }
-                // Replace the last ',' with '>'
-                b[b.Length - 1] = '>';
-            }
+                $"`{arity}");
         }
+    }
 
-        private static bool IsNormalized(string s)
+    private static void NormalizeAndAppendString(StringBuilder b, string name)
+    {
+        b.Append('\'');
+        for (int i = 0; i < name.Length; i++)
         {
-            for (int i = 0; i < s.Length; i++)
+            char c = name[i];
+            if (NeedsEscaping(c, i))
             {
-                if (NeedsEscaping(s[i], i) && s[i] != '.')
+                if (c is '\\' or '\'')
                 {
-                    return false;
+                    // var encoded = Convert.ToString(((uint)c), 16);
+                    // b.Append("\\u");
+                    // b.Append('0', 4 - encoded.Length);
+                    // b.Append(encoded);
+
+                    b.Append('\\');
+                    b.Append(c);
+                    continue;
                 }
             }
 
-            return true;
+            b.Append(c);
         }
+        b.Append('\'');
+    }
 
-        private static bool NeedsEscaping(char c, int pos)
+    private static int AppendNestedTypeName(StringBuilder b, Type? type)
+    {
+        if (type is null)
         {
-            if (pos == 0 && char.IsDigit(c))
-            {
-                return true;
-            }
+            return 0;
+        }
 
-            if (c == '_'
-              || char.IsLetterOrDigit(c) // Lu, Ll, Lt, Lm, Lo, or Nl
-              )
-            {
-                return false;
-            }
+        var outerArity = 0;
+        if (type.IsNested)
+        {
+            outerArity = AppendNestedTypeName(b, type.DeclaringType);
+            b.Append('+');
+        }
 
-            var category = CharUnicodeInfo.GetUnicodeCategory(c);
-            if (category == UnicodeCategory.NonSpacingMark        // Mn
-             || category == UnicodeCategory.SpacingCombiningMark  // Mc
-             || category == UnicodeCategory.ConnectorPunctuation  // Pc
-             || category == UnicodeCategory.Format)               // Cf
+        var typeName = type.Name;
+        var stars = 0;
+        if (type.IsPointer)
+        {
+            for (int i = typeName.Length - 1; i > 0; i--)
             {
-                return false;
+                if (typeName[i] != '*')
+                {
+                    stars = typeName.Length - i - 1;
+                    typeName = typeName.Substring(0, i + 1);
+                    break;
+                }
             }
-
-            return true;
         }
 
-        private static string GetTypeString(Type type, bool closedType)
-        {
-            var builder = new StringBuilder();
-            AppendTypeString(builder, type, closedType);
-            return builder.ToString();
-        }
+        var info = type.GetTypeInfo();
+        var arity = !info.IsGenericType
+                  ? 0
+                  : info.GenericTypeParameters.Length > 0
+                    ? info.GenericTypeParameters.Length
+                    : info.GenericTypeArguments.Length;
 
-#if NET20
+        AppendMethodString(b, typeName, arity - outerArity);
+        b.Append('*', stars);
+        return arity;
+    }
 
-        // the method is mostly copied from
-        // https://github.com/dotnet/runtime/blob/c0840723b382bcfa67b35839af8572fcd38f1d13/src/libraries/System.Linq/src/System/Linq/Single.cs#L86
-        public static TSource SingleOrDefault<TSource>(System.Collections.Generic.IEnumerable<TSource> source)
+    private static void AppendGenericMethodParameters(StringBuilder methodBuilder, MethodBase method)
+    {
+        Type[] genericArguments = method.GetGenericArguments();
+        AppendGenericArguments(methodBuilder, genericArguments);
+    }
+
+    private static void AppendGenericTypeParameters(StringBuilder b, Type type)
+    {
+        Type[] genericArguments = type.GetGenericArguments();
+        AppendGenericArguments(b, genericArguments);
+    }
+
+    private static void AppendGenericArguments(StringBuilder b, Type[] genericArguments)
+    {
+        if (genericArguments.Length != 0)
         {
-            if (source == null)
+            b.Append('<');
+            foreach (var argType in genericArguments)
             {
-                throw new ArgumentNullException(nameof(source));
+                AppendTypeString(b, argType, closedType: true);
+                b.Append(',');
             }
+            // Replace the last ',' with '>'
+            b[b.Length - 1] = '>';
+        }
+    }
 
-            if (source is System.Collections.Generic.IList<TSource> list)
-            {
-                switch (list.Count)
-                {
-                    case 0:
-                        return default;
-                    case 1:
-                        return list[0];
-                }
-            }
-            else
+    private static bool IsNormalized(string s)
+    {
+        var brackets = 0;
+
+        for (int i = 0; i < s.Length; i++)
+        {
+            var c = s[i];
+            if (NeedsEscaping(c, i) && c != '.')
             {
-                using (System.Collections.Generic.IEnumerator<TSource> e = source.GetEnumerator())
+                if (i != 0)
                 {
-                    if (!e.MoveNext())
+                    if (c == '<')
                     {
-                        return default;
+                        brackets++;
+                        continue;
                     }
 
-                    TSource result = e.Current;
-                    if (!e.MoveNext())
+                    if (c == '>' && s[i - 1] != '<' && brackets > 0)
                     {
-                        return result;
+                        brackets--;
+                        continue;
                     }
                 }
+
+                return false;
             }
+        }
+
+        return brackets == 0;
+    }
 
-            throw new InvalidOperationException("MoreThanOneElement");
+    private static bool NeedsEscaping(char c, int pos)
+    {
+        if (pos == 0 && char.IsDigit(c))
+        {
+            return true;
         }
-#endif
 
-#if NET20 || NET35
-        public static bool IsNullOrWhiteSpace(string value)
+        if (c == '_'
+            // 'Digit' does not include letter numbers, which are valid identifiers as per docs https://learn.microsoft.com/dotnet/csharp/fundamentals/coding-style/identifier-names'.
+            || char.IsLetterOrDigit(c) // Lu, Ll, Lt, Lm, Lo, or Nd
+            )
         {
-            if (value is null) return true;
+            return false;
+        }
 
-            for (int i = 0; i < value.Length; i++)
-            {
-                if (!char.IsWhiteSpace(value[i]))
-                {
-                    return false;
-                }
-            }
+        var category = CharUnicodeInfo.GetUnicodeCategory(c);
+        return category
+            is not UnicodeCategory.LetterNumber           // Nl
+            and not UnicodeCategory.NonSpacingMark        // Mn
+            and not UnicodeCategory.SpacingCombiningMark  // Mc
+            and not UnicodeCategory.ConnectorPunctuation  // Pc
+            and not UnicodeCategory.Format;               // Cf
+    }
 
-            return true;
-        }
-#endif
+    private static string GetTypeString(Type type, bool closedType)
+    {
+        var builder = new StringBuilder();
+        AppendTypeString(builder, type, closedType);
+        return builder.ToString();
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameParser.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameParser.cs
index 96226f732e..c8c1797d4c 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameParser.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameParser.cs
@@ -1,267 +1,268 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.TestPlatform.AdapterUtilities.Helpers;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
+
+public class ManagedNameParser
 {
-    using Microsoft.TestPlatform.AdapterUtilities.Helpers;
-    using Microsoft.TestPlatform.AdapterUtilities.Resources;
+    /// <summary>
+    /// Parses a given fully qualified managed type name into its namespace and type name.
+    /// </summary>
+    /// <param name="managedTypeName">
+    /// The fully qualified managed type name to parse.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
+    /// </param>
+    /// <param name="namespaceName">
+    /// When this method returns, contains the parsed namespace name of the <paramref name="managedTypeName"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    /// <param name="typeName">
+    /// When this method returns, contains the parsed type name of the <paramref name="managedTypeName"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    public static void ParseManagedTypeName(string managedTypeName, out string namespaceName, out string typeName)
+    {
+        int pos = managedTypeName.LastIndexOf('.');
+        if (pos == -1)
+        {
+            namespaceName = string.Empty;
+            typeName = managedTypeName;
+        }
+        else
+        {
+            namespaceName = managedTypeName.Substring(0, pos);
+            typeName = managedTypeName.Substring(pos + 1);
+        }
+    }
+
+    /// <summary>
+    /// Parses a given fully qualified managed method name into its name, arity and parameter types.
+    /// </summary>
+    /// <param name="managedMethodName">
+    /// The fully qualified managed method name to parse.
+    /// The format is defined in <see href="https://github.com/microsoft/vstest/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
+    /// </param>
+    /// <param name="methodName">
+    /// When this method returns, contains the parsed method name of the <paramref name="managedMethodName"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    /// <param name="arity">
+    /// When this method returns, contains the parsed arity of the <paramref name="managedMethodName"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    /// <param name="parameterTypes">
+    /// When this method returns, contains the parsed parameter types of the <paramref name="managedMethodName"/>.
+    /// If there are no parameter types in <paramref name="managedMethodName"/>, <paramref name="parameterTypes"/> is set to <see langword="null"/>.
+    /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
+    /// </param>
+    /// <exception cref="InvalidManagedNameException">
+    /// Thrown if <paramref name="managedMethodName"/> contains spaces, incomplete, or the arity isn't numeric.
+    /// </exception>
+    public static void ParseManagedMethodName(string managedMethodName, out string methodName, out int arity, out string[]? parameterTypes)
+    {
+        int pos = ParseMethodName(managedMethodName, 0, out var escapedMethodName, out arity);
+        methodName = ReflectionHelpers.ParseEscapedString(escapedMethodName);
+        pos = ParseParameterTypeList(managedMethodName, pos, out parameterTypes);
+        if (pos != managedMethodName.Length)
+        {
+            string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorUnexpectedCharactersAtEnd, pos);
+            throw new InvalidManagedNameException(message);
+        }
+    }
 
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
+    private static string Capture(string managedMethodName, int start, int end)
+        => managedMethodName.Substring(start, end - start);
 
-    public class ManagedNameParser
+    private static int ParseMethodName(string managedMethodName, int start, out string methodName, out int arity)
     {
-        /// <summary>
-        /// Parses a given fully qualified managed type name into its namespace and type name.
-        /// </summary>
-        /// <param name="managedTypeName">
-        /// The fully qualified managed type name to parse.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedtype-property">the RFC</see>.
-        /// </param>
-        /// <param name="namespaceName">
-        /// When this method returns, contains the parsed namespace name of the <paramref name="managedTypeName"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        /// <param name="typeName">
-        /// When this method returns, contains the parsed type name of the <paramref name="managedTypeName"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        public static void ParseManagedTypeName(string managedTypeName, out string namespaceName, out string typeName)
+        var i = start;
+        var quoted = false;
+        char? previousChar = null;
+        // Consume all characters that are in single quotes as is. Because F# methods wrapped in `` can have any text, like ``method name``.
+        // and will be emitted into CIL  as 'method name'.
+        // Make sure you ignore \', because that is how F# will escape ' if it appears in the method name.
+        for (; i < managedMethodName.Length; i++)
         {
-            int pos = managedTypeName.LastIndexOf('.');
-            if (pos == -1)
+            if ((i - 1) > 0)
             {
-                namespaceName = string.Empty;
-                typeName = managedTypeName;
+                previousChar = managedMethodName[i - 1];
             }
-            else
+
+            var c = managedMethodName[i];
+            if ((c == '\'' && previousChar != '\\') || quoted)
             {
-                namespaceName = managedTypeName.Substring(0, pos);
-                typeName = managedTypeName.Substring(pos + 1);
+                quoted = (c == '\'' && previousChar != '\\') ? !quoted : quoted;
+                continue;
             }
-        }
 
-        /// <summary>
-        /// Parses a given fully qualified managed method name into its name, arity and parameter types.
-        /// </summary>
-        /// <param name="managedMethodName">
-        /// The fully qualified managed method name to parse.
-        /// The format is defined in <see href="https://github.com/microsoft/vstest-docs/blob/main/RFCs/0017-Managed-TestCase-Properties.md#managedmethod-property">the RFC</see>.
-        /// </param>
-        /// <param name="methodName">
-        /// When this method returns, contains the parsed method name of the <paramref name="managedMethodName"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        /// <param name="arity">
-        /// When this method returns, contains the parsed arity of the <paramref name="managedMethodName"/>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        /// <param name="parameterTypes">
-        /// When this method returns, contains the parsed parameter types of the <paramref name="managedMethodName"/>. 
-        /// If there are no parameter types in <paramref name="managedMethodName"/>, <paramref name="parameterTypes"/> is set to <c>null</c>.
-        /// This parameter is passed uninitialized; any value originally supplied in result will be overwritten.
-        /// </param>
-        /// <exception cref="InvalidManagedNameException">
-        /// Thrown if <paramref name="managedMethodName"/> contains spaces, incomplete, or the arity isn't numeric.
-        /// </exception>
-        public static void ParseManagedMethodName(string managedMethodName, out string methodName, out int arity, out string[] parameterTypes)
-        {
-            int pos = ParseMethodName(managedMethodName, 0, out var escapedMethodName, out arity);
-            methodName = ReflectionHelpers.ParseEscapedString(escapedMethodName);
-            pos = ParseParameterTypeList(managedMethodName, pos, out parameterTypes);
-            if (pos != managedMethodName.Length)
+            switch (c)
             {
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorUnexpectedCharactersAtEnd, pos);
-                throw new InvalidManagedNameException(message);
+                case var w when char.IsWhiteSpace(w):
+                    string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorWhitespaceNotValid, i);
+                    throw new InvalidManagedNameException(message);
+
+                case '`':
+                    methodName = Capture(managedMethodName, start, i);
+                    return ParseArity(managedMethodName, i, out arity);
+
+                case '(':
+                    methodName = Capture(managedMethodName, start, i);
+                    arity = 0;
+                    return i;
             }
         }
+        methodName = Capture(managedMethodName, start, i);
+        arity = 0;
+        return i;
+    }
 
-        private static string Capture(string managedMethodName, int start, int end)
-            => managedMethodName.Substring(start, end - start);
+    // parse arity in the form `nn where nn is an integer value.
+    private static int ParseArity(string managedMethodName, int start, out int arity)
+    {
+        TPDebug.Assert(managedMethodName[start] == '`');
 
-        private static int ParseMethodName(string managedMethodName, int start, out string methodName, out int arity)
+        int i = start + 1; // skip initial '`' char
+        for (; i < managedMethodName.Length; i++)
         {
-            var i = start;
-            var quoted = false;
-            for (; i < managedMethodName.Length; i++)
-            {
-                var c = managedMethodName[i];
-                if (c == '\'' || quoted)
-                {
-                    quoted = c == '\'' ? !quoted : quoted;
-                    continue;
-                }
-
-                switch (c)
-                {
-                    case var w when char.IsWhiteSpace(w):
-                        string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorWhitespaceNotValid, i);
-                        throw new InvalidManagedNameException(message);
-
-                    case '`':
-                        methodName = Capture(managedMethodName, start, i);
-                        return ParseArity(managedMethodName, i, out arity);
-
-                    case '(':
-                        methodName = Capture(managedMethodName, start, i);
-                        arity = 0;
-                        return i;
-                }
-            }
-            methodName = Capture(managedMethodName, start, i);
-            arity = 0;
-            return i;
+            if (managedMethodName[i] == '(') break;
+        }
+        if (!int.TryParse(Capture(managedMethodName, start + 1, i), out arity))
+        {
+            throw new InvalidManagedNameException(Resources.Resources.ErrorMethodArityMustBeNumeric);
         }
+        return i;
+    }
 
-        // parse arity in the form `nn where nn is an integer value.
-        private static int ParseArity(string managedMethodName, int start, out int arity)
+    private static int ParseParameterTypeList(string managedMethodName, int start, out string[]? parameterTypes)
+    {
+        parameterTypes = null;
+        if (start == managedMethodName.Length)
         {
-            arity = 0;
-            Debug.Assert(managedMethodName[start] == '`');
+            return start;
+        }
+        TPDebug.Assert(managedMethodName[start] == '(');
 
-            int i = start + 1; // skip initial '`' char
-            for (; i < managedMethodName.Length; i++)
-            {
-                if (managedMethodName[i] == '(') break;
-            }
-            if (!int.TryParse(Capture(managedMethodName, start + 1, i), out arity))
+        var types = new List<string>();
+
+        int i = start + 1; // skip initial '(' char
+        for (; i < managedMethodName.Length; i++)
+        {
+            switch (managedMethodName[i])
             {
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorMethodArityMustBeNumeric);
-                throw new InvalidManagedNameException(message);
+                case ')':
+                    if (types.Count != 0)
+                    {
+                        parameterTypes = types.ToArray();
+                    }
+                    return i + 1; // consume right parens
+
+                case ',':
+                    break;
+
+                default:
+                    i = ParseParameterType(managedMethodName, i, out var parameterType);
+                    types.Add(parameterType);
+                    break;
             }
-            return i;
         }
 
-        private static int ParseParameterTypeList(string managedMethodName, int start, out string[] parameterTypes)
+        throw new InvalidManagedNameException(Resources.Resources.ErrorIncompleteManagedName);
+    }
+
+    private static int ParseParameterType(string managedMethodName, int start, out string parameterType)
+    {
+        parameterType = string.Empty;
+        var quoted = false;
+
+        int i;
+        for (i = start; i < managedMethodName.Length; i++)
         {
-            parameterTypes = null;
-            if (start == managedMethodName.Length)
+            if (managedMethodName[i] == '\'' || quoted)
             {
-                return start;
+                quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
+                continue;
             }
-            Debug.Assert(managedMethodName[start] == '(');
 
-            var types = new List<string>();
-
-            int i = start + 1; // skip initial '(' char
-            for (; i < managedMethodName.Length; i++)
+            switch (managedMethodName[i])
             {
-                switch (managedMethodName[i])
-                {
-                    case ')':
-                        if (types.Count != 0)
-                        {
-                            parameterTypes = types.ToArray();
-                        }
-                        return i + 1; // consume right parens
-
-                    case ',':
-                        break;
-
-                    default:
-                        i = ParseParameterType(managedMethodName, i, out var parameterType);
-                        types.Add(parameterType);
-                        break;
-                }
+                case '<':
+                    i = ParseGenericBrackets(managedMethodName, i + 1);
+                    break;
+
+                case '[':
+                    i = ParseArrayBrackets(managedMethodName, i + 1);
+                    break;
+
+                case ',':
+                case ')':
+                    parameterType = Capture(managedMethodName, start, i);
+                    return i - 1;
+
+                case var w when char.IsWhiteSpace(w):
+                    string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorWhitespaceNotValid, i);
+                    throw new InvalidManagedNameException(message);
             }
-
-            string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorIncompleteManagedName);
-            throw new InvalidManagedNameException(message);
         }
+        return i;
+    }
 
-        private static int ParseParameterType(string managedMethodName, int start, out string parameterType)
+    private static int ParseArrayBrackets(string managedMethodName, int start)
+    {
+        var quoted = false;
+
+        for (int i = start; i < managedMethodName.Length; i++)
         {
-            parameterType = string.Empty;
-            var quoted = false;
+            if (managedMethodName[i] == '\'' || quoted)
+            {
+                quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
+                continue;
+            }
 
-            int i = start;
-            for (i = start; i < managedMethodName.Length; i++)
+            switch (managedMethodName[i])
             {
-                if (managedMethodName[i] == '\'' || quoted)
-                {
-                    quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
-                    continue;
-                }
-
-                switch (managedMethodName[i])
-                {
-                    case '<':
-                        i = ParseGenericBrackets(managedMethodName, i + 1);
-                        break;
-
-                    case '[':
-                        i = ParseArrayBrackets(managedMethodName, i + 1);
-                        break;
-
-                    case ',':
-                    case ')':
-                        parameterType = Capture(managedMethodName, start, i);
-                        return i - 1;
-
-                    case var w when char.IsWhiteSpace(w):
-                        string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorWhitespaceNotValid, i);
-                        throw new InvalidManagedNameException(message);
-                }
+                case ']':
+                    return i;
+                case var w when char.IsWhiteSpace(w):
+                    string msg = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorWhitespaceNotValid, i);
+                    throw new InvalidManagedNameException(msg);
             }
-            return i;
         }
 
-        private static int ParseArrayBrackets(string managedMethodName, int start)
-        {
-            var quoted = false;
+        throw new InvalidManagedNameException(Resources.Resources.ErrorIncompleteManagedName);
+    }
 
-            for (int i = start; i < managedMethodName.Length; i++)
+    private static int ParseGenericBrackets(string managedMethodName, int start)
+    {
+        var quoted = false;
+
+        for (int i = start; i < managedMethodName.Length; i++)
+        {
+            if (managedMethodName[i] == '\'' || quoted)
             {
-                if (managedMethodName[i] == '\'' || quoted)
-                {
-                    quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
-                    continue;
-                }
-
-                switch (managedMethodName[i])
-                {
-                    case ']':
-                        return i;
-                    case var w when char.IsWhiteSpace(w):
-                        string msg = string.Format(CultureInfo.CurrentCulture, Resources.ErrorWhitespaceNotValid, i);
-                        throw new InvalidManagedNameException(msg);
-                }
+                quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
+                continue;
             }
 
-            string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorIncompleteManagedName);
-            throw new InvalidManagedNameException(message);
-        }
+            switch (managedMethodName[i])
+            {
+                case '<':
+                    i = ParseGenericBrackets(managedMethodName, i + 1);
+                    break;
 
-        private static int ParseGenericBrackets(string managedMethodName, int start)
-        {
-            var quoted = false;
+                case '>':
+                    return i;
 
-            for (int i = start; i < managedMethodName.Length; i++)
-            {
-                if (managedMethodName[i] == '\'' || quoted)
-                {
-                    quoted = managedMethodName[i] == '\'' ? !quoted : quoted;
-                    continue;
-                }
-
-                switch (managedMethodName[i])
-                {
-                    case '<':
-                        i = ParseGenericBrackets(managedMethodName, i + 1);
-                        break;
-
-                    case '>':
-                        return i;
-
-                    case var w when char.IsWhiteSpace(w):
-                        string msg = string.Format(CultureInfo.CurrentCulture, Resources.ErrorWhitespaceNotValid, i);
-                        throw new InvalidManagedNameException(msg);
-                }
+                case var w when char.IsWhiteSpace(w):
+                    string msg = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ErrorWhitespaceNotValid, i);
+                    throw new InvalidManagedNameException(msg);
             }
-
-            string message = string.Format(CultureInfo.CurrentCulture, Resources.ErrorIncompleteManagedName);
-            throw new InvalidManagedNameException(message);
         }
+
+        throw new InvalidManagedNameException(Resources.Resources.ErrorIncompleteManagedName);
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
index 6d984e1e02..5d34ff1083 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj
@@ -1,47 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--
+      This library is consumed by test frameworks and will run in testhosts, ship as that, and netstandard so everyone can use it.
+
+      Adding newer tfms for .NET here is okay if we need to use features that are specific to them.
+      17.11.0 started supporting net9 and net8 explicitly so we can condition serialization attributes.
+    -->
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks);net9.0</TargetFrameworks>
     <AssemblyName>Microsoft.TestPlatform.AdapterUtilities</AssemblyName>
     <RootNamespace>Microsoft.TestPlatform.AdapterUtilities</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-
-    <!-- On non windows environment, make UAP behave like desktop .NET framework -->
-    <TargetFrameworkIdentifier Condition="'$(OS)' != 'Windows_NT'">.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion Condition="'$(OS)' != 'Windows_NT'">v4.5.1</TargetFrameworkVersion>
-    <IsTestProject>false</IsTestProject>
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.AdapterUtilities.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.AdapterUtilities</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      Includes helpers for the Test Platform's modern functionality such as standardized fully qualified names and hierarchical test case names.
+    </PackageDescription>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <RuntimeIdentifier>any</RuntimeIdentifier>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.1.0" />
-    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-    <!-- Disabled auto code generation to support net20
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -51,8 +37,35 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    -->
   </ItemGroup>
 
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
new file mode 100644
index 0000000000..1b93aed8de
--- /dev/null
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="netstandard2.0" />
+      <group targetFramework="net462" />
+      <group targetFramework="net8.0" />
+      <group targetFramework="net9.0" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\netstandard2.0" />
+    <file src="net462\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net462" />
+    <file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net8.0" />
+    <file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net9.0" />
+
+    <file src="net462\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net8.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net9.0\zh-Hant" />
+
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.cs b/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.cs
new file mode 100644
index 0000000000..6e7df36a1f
--- /dev/null
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.AdapterUtilities;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.tt b/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..6defd02fc2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,33 @@
+#nullable enable
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.HierarchyLabel = "Hierarchy" -> string!
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.HierarchyPropertyId = "TestCase.Hierarchy" -> string!
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels.ContainerIndex = 0 -> int
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels.NamespaceIndex = 1 -> int
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels.ClassIndex = 2 -> int
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels.TestGroupIndex = 3 -> int
+const Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels.TotalLevelCount = 4 -> int
+const Microsoft.TestPlatform.AdapterUtilities.ManagedNameConstants.ManagedMethodLabel = "ManagedMethod" -> string!
+const Microsoft.TestPlatform.AdapterUtilities.ManagedNameConstants.ManagedMethodPropertyId = "TestCase.ManagedMethod" -> string!
+const Microsoft.TestPlatform.AdapterUtilities.ManagedNameConstants.ManagedTypeLabel = "ManagedType" -> string!
+const Microsoft.TestPlatform.AdapterUtilities.ManagedNameConstants.ManagedTypePropertyId = "TestCase.ManagedType" -> string!
+Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants
+Microsoft.TestPlatform.AdapterUtilities.HierarchyConstants.Levels
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameConstants
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.InvalidManagedNameException
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.InvalidManagedNameException.InvalidManagedNameException(string? message) -> void
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.InvalidManagedNameException.InvalidManagedNameException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameHelper
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameParser
+Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameParser.ManagedNameParser() -> void
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider.AppendString(string! str) -> void
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider.AppendBytes(byte[]! bytes) -> void
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider.GetHash() -> byte[]!
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider.GetId() -> System.Guid
+Microsoft.TestPlatform.AdapterUtilities.TestIdProvider.TestIdProvider() -> void
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameHelper.GetManagedName(System.Reflection.MethodBase! method, out string! managedTypeName, out string! managedMethodName) -> void
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameHelper.GetManagedName(System.Reflection.MethodBase! method, out string! managedTypeName, out string! managedMethodName, out string?[]! hierarchyValues) -> void
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameHelper.GetManagedHierarchy(System.Reflection.MethodBase! method) -> string?[]!
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameHelper.GetMethod(System.Reflection.Assembly! assembly, string! managedTypeName, string! managedMethodName) -> System.Reflection.MethodBase!
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameParser.ParseManagedMethodName(string! managedMethodName, out string! methodName, out int arity, out string![]? parameterTypes) -> void
+static Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.ManagedNameParser.ParseManagedTypeName(string! managedTypeName, out string! namespaceName, out string! typeName) -> void
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.Designer.cs
index 0239a66dd2..02775b05ab 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.Designer.cs
@@ -1,157 +1,163 @@
-namespace Microsoft.TestPlatform.AdapterUtilities.Resources
-{
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.TestPlatform.AdapterUtilities.Resources {
+    using System;
     using System.Reflection;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    internal class Resources
-    {
-
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
-        internal Resources()
-        {
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if (object.ReferenceEquals(resourceMan, null))
-                {
-#if NET20 || NET35 || NET40
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.AdapterUtilities.Resources.Resources", typeof(Resources).Assembly);
-#else
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.AdapterUtilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly);
-#endif
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
-
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot append to a TestIdProvider, after GetId or GetHash method is called..
+        /// </summary>
+        internal static string ErrorCannotAppendAfterHashCalculation {
+            get {
+                return ResourceManager.GetString("ErrorCannotAppendAfterHashCalculation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ManagedName is incomplete.
         /// </summary>
-        internal static string ErrorIncompleteManagedName
-        {
-            get
-            {
+        internal static string ErrorIncompleteManagedName {
+            get {
                 return ResourceManager.GetString("ErrorIncompleteManagedName", resourceCulture);
             }
         }
-
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid escape sequence! (segment: {0}, pos: {1}).
+        /// </summary>
+        internal static string ErrorInvalidSequenceAt {
+            get {
+                return ResourceManager.GetString("ErrorInvalidSequenceAt", resourceCulture);
+            }
+        }
+        
         /// <summary>
-        ///   Looks up a localized string similar to Method arity must be numeric.
+        ///   Looks up a localized string similar to Method arity must be numeric..
         /// </summary>
-        internal static string ErrorMethodArityMustBeNumeric
-        {
-            get
-            {
+        internal static string ErrorMethodArityMustBeNumeric {
+            get {
                 return ResourceManager.GetString("ErrorMethodArityMustBeNumeric", resourceCulture);
             }
         }
-
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Argument must be a method. (Argument name: {0}).
+        /// </summary>
+        internal static string ErrorMethodExpectedAsAnArgument {
+            get {
+                return ResourceManager.GetString("ErrorMethodExpectedAsAnArgument", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Method &apos;{0}&apos; not found on type &apos;{1}&apos;.
         /// </summary>
-        internal static string ErrorMethodNotFound
-        {
-            get
-            {
+        internal static string ErrorMethodNotFound {
+            get {
                 return ResourceManager.GetString("ErrorMethodNotFound", resourceCulture);
             }
         }
-
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A closing single quote was expected at the end of the segment! (segment: {0}).
+        /// </summary>
+        internal static string ErrorNoClosingQuote {
+            get {
+                return ResourceManager.GetString("ErrorNoClosingQuote", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Type &apos;{0}&apos; not found.
         /// </summary>
-        internal static string ErrorTypeNotFound
-        {
-            get
-            {
+        internal static string ErrorTypeNotFound {
+            get {
                 return ResourceManager.GetString("ErrorTypeNotFound", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to Unexpected characters after the end of the ManagedName (pos: {0}).
         /// </summary>
-        internal static string ErrorUnexpectedCharactersAtEnd
-        {
-            get
-            {
+        internal static string ErrorUnexpectedCharactersAtEnd {
+            get {
                 return ResourceManager.GetString("ErrorUnexpectedCharactersAtEnd", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to Whitespace is not valid in a ManagedName (pos: {0}).
         /// </summary>
-        internal static string ErrorWhitespaceNotValid
-        {
-            get
-            {
+        internal static string ErrorWhitespaceNotValid {
+            get {
                 return ResourceManager.GetString("ErrorWhitespaceNotValid", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to &apos;{0}.{1}&apos; is not implemented on this platform!.
         /// </summary>
-        internal static string MethodNotImplementedOnPlatform
-        {
-            get
-            {
+        internal static string MethodNotImplementedOnPlatform {
+            get {
                 return ResourceManager.GetString("MethodNotImplementedOnPlatform", resourceCulture);
             }
         }
-
-        /// <summary>
-        ///   Looks up a localized string similar to A closing single quote was expected at the end of the segment! (segment: {0}).
-        /// </summary>
-        internal static string ErrorNoClosingQuote
-        {
-            get
-            {
-                return ResourceManager.GetString("ErrorNoClosingQuote", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid escape sequence! (segment: {0}, pos: {1})
-        /// </summary>
-        internal static string ErrorInvalidSequenceAt
-        {
-            get
-            {
-                return ResourceManager.GetString("ErrorInvalidSequenceAt", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.resx b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.resx
index 52fe4e0b37..04375544a3 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/Resources.resx
@@ -117,15 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ErrorCannotAppendAfterHashCalculation" xml:space="preserve">
+    <value>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</value>
+  </data>
   <data name="ErrorIncompleteManagedName" xml:space="preserve">
     <value>ManagedName is incomplete</value>
   </data>
   <data name="ErrorInvalidSequenceAt" xml:space="preserve">
     <value>Invalid escape sequence! (segment: {0}, pos: {1})</value>
-    <comment>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</comment>
+    <comment>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</comment>
   </data>
   <data name="ErrorMethodArityMustBeNumeric" xml:space="preserve">
-    <value>Method arity must be numeric</value>
+    <value>Method arity must be numeric.</value>
+  </data>
+  <data name="ErrorMethodExpectedAsAnArgument" xml:space="preserve">
+    <value>Argument must be a method. (Argument name: {0})</value>
   </data>
   <data name="ErrorMethodNotFound" xml:space="preserve">
     <value>Method '{0}' not found on type '{1}'</value>
@@ -133,7 +139,7 @@
   </data>
   <data name="ErrorNoClosingQuote" xml:space="preserve">
     <value>A closing single quote was expected at the end of the segment! (segment: {0})</value>
-    <comment>An error thrown when the type name ended but opened single qoute was not matched.</comment>
+    <comment>An error thrown when the type name ended but opened single quote was not matched.</comment>
   </data>
   <data name="ErrorTypeNotFound" xml:space="preserve">
     <value>Type '{0}' not found</value>
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.cs.xlf
index 80dc9c33e1..8e2910e5ef 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.cs.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">Název ManagedName není úplný.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Arita metody musí být číselná.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Metoda {0} nebyla nalezena u typu {1}.</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Typ {0} nebyl nalezen.</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Neočekávané znaky na konci položky ManagedName (pozice: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">V ManagedName se nepovoluje mezera (pozice: {0}).</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">Metoda {0}.{1} není na této platformě implementována.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="new">Invalid escape sequence! (segment: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="new">A closing single quote was expected at the end of the segment! (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">Název ManagedName není úplný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Arita metody musí být číselná.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Metoda {0} nebyla nalezena u typu {1}.</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Typ {0} nebyl nalezen.</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Neočekávané znaky na konci položky ManagedName (pozice: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">V ManagedName se nepovoluje mezera (pozice: {0}).</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">Metoda {0}.{1} není na této platformě implementována.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Neplatná řídicí sekvence. (Segment: {0}, pozice: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Na konci segmentu se očekávala ukončovací jednoduchá uvozovka. (Segment: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">Argument musí být metoda. (Název argumentu: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Po volání metody GetId nebo GetHash není možné připojit k zprostředkovateli TestIdProvider.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.de.xlf
index 9a550fdc62..468af1bf0f 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.de.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName unvollständig</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Die Stelligkeit der Methode muss numerisch sein.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Die Methode "{0}" wurde für den Typ "{1}" nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Der Typ "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Unerwartetes Zeichen nach dem Ende von ManagedName (Position: {0}).</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">Leerzeichen sind in einem ManagedName unzulässig (Position: {0}).</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">"{0}.{1}" ist auf dieser Plattform nicht implementiert!</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">Ungültige Escapesequenz (Segment: {0}, Position: {1}).</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">Am Ende des Segments wurde ein schließendes einfaches Anführungszeichen erwartet (Segment: {0}).</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName unvollständig</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Die Stelligkeit der Methode muss numerisch sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Die Methode "{0}" wurde für den Typ "{1}" nicht gefunden.</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Der Typ "{0}" wurde nicht gefunden.</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Unerwartetes Zeichen nach dem Ende von ManagedName (Position: {0}).</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">Leerzeichen sind in einem ManagedName unzulässig (Position: {0}).</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">"{0}.{1}" ist auf dieser Plattform nicht implementiert!</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Ungültige Escapesequenz (Segment: {0}, Position: {1}).</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Am Ende des Segments wurde ein schließendes einfaches Anführungszeichen erwartet (Segment: {0}).</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">Das Argument muss eine Methode sein. (Argumentname: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Kann nicht an einen TestIdProvider angefügt werden, nachdem die GetId- oder GetHash-Methode aufgerufen wurde.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.es.xlf
index 647a3f06ea..6d93fe7b57 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.es.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName está incompleto.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">La aridad del método debe ser numérica</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Método "{0}" no encontrado en el tipo "{1}"</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Tipo "{0}" no encontrado</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Caracteres inesperados después del final de ManagedName (posición: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">El espacio en blanco no es válido en un elemento ManagedName (posición: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">"{0}.{1}" no se ha implementado en esta plataforma.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="new">Invalid escape sequence! (segment: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="new">A closing single quote was expected at the end of the segment! (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName está incompleto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">La aridad del método debe ser numérica.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Método "{0}" no encontrado en el tipo "{1}"</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Tipo "{0}" no encontrado</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Caracteres inesperados después del final de ManagedName (posición: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">El espacio en blanco no es válido en un elemento ManagedName (posición: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">"{0}.{1}" no se ha implementado en esta plataforma.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Secuencia de escape no válida. (Segmento: {0}. Posición: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Se esperaba una comilla simple de cierre al final del segmento. (Segmento: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">El argumento debe ser un método. (Nombre del argumento: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">No se puede anexar a un TestIdProvider después de llamar al método GetId o GetHash.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.fr.xlf
index 56830bb0da..1d368f958f 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.fr.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName est incomplet</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">L'arité de la méthode doit être numérique</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Méthode '{0}' introuvable sur le type '{1}'</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Type '{0}' introuvable</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Caractères inattendus après la fin de ManagedName (pos. : {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">Les espaces blancs ne sont pas valides dans un ManagedName (pos. : {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' n'est pas implémenté sur cette plateforme !</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">Séquence d'échappement non valide ! (segment : {0}, position : {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">Un guillemet simple fermant était attendu à la fin du segment ! (segment : {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName est incomplet</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">L'arité de la méthode doit être numérique.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Méthode '{0}' introuvable sur le type '{1}'</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Type '{0}' introuvable</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Caractères inattendus après la fin de ManagedName (pos. : {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">Les espaces blancs ne sont pas valides dans un ManagedName (pos. : {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' n'est pas implémenté sur cette plateforme !</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Séquence d'échappement non valide ! (segment : {0}, position : {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Un guillemet simple fermant était attendu à la fin du segment ! (segment : {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">L’argument doit être une méthode. (Nom de l’argument : {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Impossible d’ajouter à un TestIdProvider, après l’appel de la méthode GetId ou GetHash.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.it.xlf
index f53420cb64..5612c49ce1 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.it.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">L'elemento ManagedName è incompleto</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Il grado del metodo deve essere numerico</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Il metodo '{0}' non è stato trovato nel tipo '{1}'</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Il tipo '{0}' non è stato trovato</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Caratteri imprevisti dopo la fine dell'elemento ManagedName (pos.: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">Gli spazi vuoti non sono validi in un elemento ManagedName (pos.: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' non è implementato in questa piattaforma.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">La sequenza di escape non è valida. Segmento: {0}. Posizione: {1}</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">Alla fine del segmento era prevista una virgoletta singola di chiusura. Segmento: {0}</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">L'elemento ManagedName è incompleto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Il grado del metodo deve essere numerico.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Il metodo '{0}' non è stato trovato nel tipo '{1}'</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Il tipo '{0}' non è stato trovato</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Caratteri imprevisti dopo la fine dell'elemento ManagedName (pos.: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">Gli spazi vuoti non sono validi in un elemento ManagedName (pos.: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' non è implementato in questa piattaforma.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">La sequenza di escape non è valida. Segmento: {0}. Posizione: {1}</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Alla fine del segmento era prevista una virgoletta singola di chiusura. Segmento: {0}</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">L'argomento deve essere un metodo. (Nome argomento: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Non è possibile accodare a TestIdProvider dopo la chiamata del metodo GetId o GetHash.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ja.xlf
index d6fecb8447..56c3aac7e3 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ja.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName が不完全です</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">メソッドのアリティは、数値でなければなりません。</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">メソッド '{0}' が型 '{1}' に見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">型 '{0}' が見つかりません。</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">ManagedName の末尾の後ろに予期しない文字があります (位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">ManagedName では空白は無効です (位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' はこのプラットフォームに実装されていません。</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">無効なエスケープ シーケンスです。(セグメント: {0}、位置: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">セグメントの最後に対応する一重引用符を指定する必要があります。(セグメント: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName が不完全です</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">メソッドのアリティは数値である必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">メソッド '{0}' が型 '{1}' に見つかりませんでした。</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">型 '{0}' が見つかりません。</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName の末尾の後ろに予期しない文字があります (位置: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName では空白は無効です (位置: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' はこのプラットフォームに実装されていません。</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">無効なエスケープ シーケンスです。(セグメント: {0}、位置: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">セグメントの最後に対応する一重引用符を指定する必要があります。(セグメント: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">引数はメソッドである必要があります。(引数名: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">GetId メソッドまたは GetHash メソッドが呼び出された後は、TestIdProvider に追加できません。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ko.xlf
index 21a63d7630..d061d56352 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ko.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName이 불완전함</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">메서드 인자 수는 숫자여야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">'{0}' 메서드를 '{1}' 형식에서 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">'{0}' 형식을 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">ManagedName의 끝 다음에 예기치 않은 문자가 있습니다(pos: {0}).</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">ManagedName에서 공백은 유효하지 않습니다(pos: {0}).</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}'이(가)이 플랫폼에서 구현되지 않았습니다.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">이스케이프 시퀀스가 잘못되었습니다. (세그먼트: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">세그먼트 끝에 닫는 작은따옴표가 있어야 합니다. (세그먼트: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName이 불완전함</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">메서드 인수 개수는 숫자여야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">'{0}' 메서드를 '{1}' 형식에서 찾을 수 없습니다.</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">'{0}' 형식을 찾을 수 없습니다.</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName의 끝 다음에 예기치 않은 문자가 있습니다(pos: {0}).</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName에서 공백은 유효하지 않습니다(pos: {0}).</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}'이(가)이 플랫폼에서 구현되지 않았습니다.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">이스케이프 시퀀스가 잘못되었습니다. (세그먼트: {0}, pos: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">세그먼트 끝에 닫는 작은따옴표가 있어야 합니다. (세그먼트: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">인수는 메서드여야 합니다. (인수 이름: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">GetId 또는 GetHash 메서드가 호출된 후에는 TestIdProvider에 추가할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pl.xlf
index bfe721026f..8a39e98765 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pl.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">Wartość ManagedName jest niekompletna</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Liczba argumentów metody musi być liczbą</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Nie znaleziono metody „{0}” w typie „{1}”</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Nie znaleziono typu „{0}”</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Nieoczekiwane znaki po zakończeniu wartości ManagedName (pozycja: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">Biały znak jest niedozwolony w wartości ManagedName (pozycja: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">Element „{0}.{1}” nie jest zaimplementowany na tej platformie.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">Nieprawidłowa sekwencja ucieczki (segment: {0}, pozycja: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">Oczekiwano zamykającego cudzysłowu pojedynczego na końcu segmentu. (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">Wartość ManagedName jest niekompletna</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Liczba argumentów metody musi mieść wartość liczbową.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Nie znaleziono metody „{0}” w typie „{1}”</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Nie znaleziono typu „{0}”</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Nieoczekiwane znaki po zakończeniu wartości ManagedName (pozycja: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">Biały znak jest niedozwolony w wartości ManagedName (pozycja: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">Element „{0}.{1}” nie jest zaimplementowany na tej platformie.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Nieprawidłowa sekwencja ucieczki (segment: {0}, pozycja: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Oczekiwano zamykającego cudzysłowu pojedynczego na końcu segmentu. (segment: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">Argument musi być metodą. (Nazwa argumentu: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Nie można dołączyć do elementu TestIdProvider po wywołaniu metody GetId lub GetHash.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pt-BR.xlf
index 7c40167117..b01c848a0c 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.pt-BR.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">O ManagedName está incompleto</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">A aridade do método deve ser numérica</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Método '{0}' não encontrado no tipo '{1}'</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Tipo '{0}' não encontrado</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Caracteres inesperados após o final de ManagedName (posição: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">O espaço em branco não é válido em um ManagedName (posição: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' não está implementado nesta plataforma.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="new">Invalid escape sequence! (segment: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="new">A closing single quote was expected at the end of the segment! (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">O ManagedName está incompleto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">A aridade do método deve ser numérica.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Método '{0}' não encontrado no tipo '{1}'</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Tipo '{0}' não encontrado</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Caracteres inesperados após o final de ManagedName (posição: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">O espaço em branco não é válido em um ManagedName (posição: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' não está implementado nesta plataforma.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Sequência de escape inválida. (segmento: {0}, posição: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Uma aspa simples de fechamento era esperada no final do segmento. (segmento: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">O argumento deve ser um método. (Nome do argumento: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Não é possível anexar a um TestIdProvider depois que o método GetId ou GetHash é chamado.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ru.xlf
index 75c5e73fb6..a926405638 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.ru.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName является неполным.</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Арность метода должна быть числовым значением</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">Метод "{0}" не найден для типа "{1}"</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">Тип "{0}" не найден</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">Неожиданные символы после окончания ManagedName (позиция: {0}).</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">Пробел в ManagedName (позиция: {0}) не допускается.</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">Метод "{0}.{1}" не реализован на этой платформе.</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">Недопустимая escape-последовательность (сегмент: {0}, позиция: {1}).</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">В конце сегмента ожидалась закрывающая одинарная кавычка (сегмент: {0}).</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName является неполным.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Арность метода должна быть числовым значением</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">Метод "{0}" не найден для типа "{1}"</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">Тип "{0}" не найден</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">Неожиданные символы после окончания ManagedName (позиция: {0}).</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">Пробел в ManagedName (позиция: {0}) не допускается.</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">Метод "{0}.{1}" не реализован на этой платформе.</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Недопустимая escape-последовательность (сегмент: {0}, позиция: {1}).</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">В конце сегмента ожидалась закрывающая одинарная кавычка (сегмент: {0}).</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">Аргумент должен быть методом. (Имя аргумента: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">Невозможно добавить к TestIdProvider после вызова метода GetId или GetHash.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.tr.xlf
index a3e3097636..d67a10b6c9 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.tr.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName tamamlanmadı</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">Method sayısı sayısal bir değer olmalıdır</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">'{1}' türünde '{0}' metodu bulunamadı</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">{0} türü bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">ManagedName'den sonra beklenmeyen karakterler var (konum: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">ManagedName'de boşluk geçersiz (konum: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' bu platformda uygulanmıyor!</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">Kaçış dizisi geçersiz! (segment: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">Segmentin sonunda bir kapanış tek tırnak işareti bekleniyordu! (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName tamamlanmadı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">Yöntem parametre sayısı, sayısal bir değer olmalıdır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">'{1}' türünde '{0}' metodu bulunamadı</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">{0} türü bulunamadı.</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName'den sonra beklenmeyen karakterler var (konum: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName'de boşluk geçersiz (konum: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' bu platformda uygulanmıyor!</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">Kaçış dizisi geçersiz! (segment: {0}, pos: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">Segmentin sonunda bir kapanış tek tırnak işareti bekleniyordu! (segment: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">Bağımsız değişken bir yöntem olmalıdır. (Bağımsız değişken adı: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">GetId veya GetHash yöntemi çağrıldıktan sonra bir TestIdProvider sağlayıcısına eklenemiyor.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf
index cb8d1c6ab6..70480f318a 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.xlf
@@ -7,7 +7,7 @@
         <note />
       </trans-unit>
       <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
+        <source>Method arity must be numeric.</source>
         <note />
       </trans-unit>
       <trans-unit id="ErrorMethodNotFound">
@@ -36,13 +36,23 @@ Example: 'System.Reflection.MethodBase' is not implemented on this platform!</no
       <trans-unit id="ErrorInvalidSequenceAt">
         <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
         <target state="new">Invalid escape sequence! (segment: {0}, pos: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
       </trans-unit>
       <trans-unit id="ErrorNoClosingQuote">
         <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
         <target state="new">A closing single quote was expected at the end of the segment! (segment: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="new">Argument must be a method.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="new">Cannot append to a TestIdProvider, after GetId or GetHash method is called.</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hans.xlf
index d705b8520a..773e38d4c3 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName 不完整</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">方法参数数量必须是数值</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">类型“{1}”上找不到方法“{0}”</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">找不到类型“{0}”</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">ManagedName 末尾后面有不需要的字符(位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">ManagedName 中空白无效(位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">未在此平台上实现 "{0}.{1}"!</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">无效转义序列! (段: {0}，位置: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">该段末尾应使用右单引号! (段: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName 不完整</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">方法参数数量必须是数值。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">类型“{1}”上找不到方法“{0}”</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">找不到类型“{0}”</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName 末尾后面有不需要的字符(位置: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName 中空白无效(位置: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">未在此平台上实现 "{0}.{1}"!</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">无效转义序列! (段: {0}，位置: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">该段末尾应使用右单引号! (段: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">参数必须是方法。(参数名称: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">调用 GetId 或 GetHash 方法后，无法追加到 TestIdProvider。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hant.xlf
index cc62f5c6da..e45a020643 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,54 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="ErrorIncompleteManagedName">
-        <source>ManagedName is incomplete</source>
-        <note />
-        <target state="translated">ManagedName 不完整</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodArityMustBeNumeric">
-        <source>Method arity must be numeric</source>
-        <note />
-        <target state="translated">方法 arity 必須為數值</target>
-      </trans-unit>
-      <trans-unit id="ErrorMethodNotFound">
-        <source>Method '{0}' not found on type '{1}'</source>
-        <note>{0} is the method name, {1} is the full type name.</note>
-        <target state="translated">在類型 '{1}' 上找不到方法 '{0}'</target>
-      </trans-unit>
-      <trans-unit id="ErrorTypeNotFound">
-        <source>Type '{0}' not found</source>
-        <note>{0} is the full type name.</note>
-        <target state="translated">找不到類型 '{0}'</target>
-      </trans-unit>
-      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
-        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
-        <note>{0} is the position of unexpected characters</note>
-        <target state="translated">ManagedName 的結尾後出現非預期的字元 (位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="ErrorWhitespaceNotValid">
-        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
-        <note>{0} is the position of invalid whitespace</note>
-        <target state="translated">空白字元在 ManagedName 中無效 (位置: {0})</target>
-      </trans-unit>
-      <trans-unit id="MethodNotImplementedOnPlatform">
-        <source>'{0}.{1}' is not implemented on this platform!</source>
-        <target state="translated">'{0}.{1}' 未在此平台上實作!</target>
-        <note>'{className}.{methodName}' is not implemented on this platform!
-
-Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
-      </trans-unit>
-      <trans-unit id="ErrorInvalidSequenceAt">
-        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
-        <target state="translated">逸出序列無效! (區段: {0}，位置: {1})</target>
-        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting postion of invalid sequence.</note>
-      </trans-unit>
-      <trans-unit id="ErrorNoClosingQuote">
-        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
-        <target state="translated">區段結尾必須有右單引號! (區段: {0})</target>
-        <note>An error thrown when the type name ended but opened single qoute was not matched.</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="ErrorIncompleteManagedName">
+        <source>ManagedName is incomplete</source>
+        <target state="translated">ManagedName 不完整</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodArityMustBeNumeric">
+        <source>Method arity must be numeric.</source>
+        <target state="translated">方法 arity 必須為數值。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMethodNotFound">
+        <source>Method '{0}' not found on type '{1}'</source>
+        <target state="translated">在類型 '{1}' 上找不到方法 '{0}'</target>
+        <note>{0} is the method name, {1} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorTypeNotFound">
+        <source>Type '{0}' not found</source>
+        <target state="translated">找不到類型 '{0}'</target>
+        <note>{0} is the full type name.</note>
+      </trans-unit>
+      <trans-unit id="ErrorUnexpectedCharactersAtEnd">
+        <source>Unexpected characters after the end of the ManagedName (pos: {0})</source>
+        <target state="translated">ManagedName 的結尾後出現非預期的字元 (位置: {0})</target>
+        <note>{0} is the position of unexpected characters</note>
+      </trans-unit>
+      <trans-unit id="ErrorWhitespaceNotValid">
+        <source>Whitespace is not valid in a ManagedName (pos: {0})</source>
+        <target state="translated">空白字元在 ManagedName 中無效 (位置: {0})</target>
+        <note>{0} is the position of invalid whitespace</note>
+      </trans-unit>
+      <trans-unit id="MethodNotImplementedOnPlatform">
+        <source>'{0}.{1}' is not implemented on this platform!</source>
+        <target state="translated">'{0}.{1}' 未在此平台上實作!</target>
+        <note>'{className}.{methodName}' is not implemented on this platform!
+
+Example: 'System.Reflection.MethodBase' is not implemented on this platform!</note>
+      </trans-unit>
+      <trans-unit id="ErrorInvalidSequenceAt">
+        <source>Invalid escape sequence! (segment: {0}, pos: {1})</source>
+        <target state="translated">逸出序列無效! (區段: {0}，位置: {1})</target>
+        <note>An escape sequence started with '\', but it wasn't legal. {0}: Invalid string, {1}: starting position of invalid sequence.</note>
+      </trans-unit>
+      <trans-unit id="ErrorNoClosingQuote">
+        <source>A closing single quote was expected at the end of the segment! (segment: {0})</source>
+        <target state="translated">區段結尾必須有右單引號! (區段: {0})</target>
+        <note>An error thrown when the type name ended but opened single quote was not matched.</note>
+      </trans-unit>
+      <trans-unit id="ErrorMethodExpectedAsAnArgument">
+        <source>Argument must be a method. (Argument name: {0})</source>
+        <target state="translated">引數必須是方法。(引數名稱: {0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorCannotAppendAfterHashCalculation">
+        <source>Cannot append to a TestIdProvider, after GetId or GetHash method is called.</source>
+        <target state="translated">在呼叫 GetId 或 GetHash 方法之，無法附加到 TestIdProvider。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/TestIdProvider.cs b/src/Microsoft.TestPlatform.AdapterUtilities/TestIdProvider.cs
index 5decc3eaf0..fbefb86473 100644
--- a/src/Microsoft.TestPlatform.AdapterUtilities/TestIdProvider.cs
+++ b/src/Microsoft.TestPlatform.AdapterUtilities/TestIdProvider.cs
@@ -1,382 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities
-{
-    using System;
-    using System.Text;
+using System;
+using System.Security.Cryptography;
+using System.Text;
 
-    public class TestIdProvider
-    {
-        internal const int BlockBits = 512;
-        internal const int DigestBits = 160;
-        internal const int BlockBytes = BlockBits / 8;
-        internal const int DigestBytes = DigestBits / 8;
+namespace Microsoft.TestPlatform.AdapterUtilities;
 
-        private Guid id = Guid.Empty;
-        private byte[] hash = null;
-        private byte[] lastBlock = new byte[BlockBytes];
-        private int position = 0;
+/// <summary>
+/// Used to generate id for tests.
+/// </summary>
+public class TestIdProvider
+{
+    private Guid _id = Guid.Empty;
+    private byte[]? _hash;
 
-        private readonly Sha1Implementation hasher;
+    private readonly SHA1 _sha;
 
-        public TestIdProvider()
-        {
-            hasher = new Sha1Implementation();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestIdProvider"/> class.
+    /// </summary>
+    public TestIdProvider()
+    {
+        _sha = SHA1.Create();
+    }
 
-        public void AppendString(string str)
+    /// <summary>
+    /// Appends a string to id generation seed.
+    /// </summary>
+    /// <param name="str">String to append to the id seed.</param>
+    /// <exception cref="InvalidOperationException">Thrown if <see cref="GetHash"/> or <see cref="GetId"/> is called already.</exception>
+    /// <exception cref="ArgumentNullException">Thrown when <paramref name="str"/> is <see langword="null"/>.</exception>
+    public void AppendString(string str)
+    {
+        if (_hash != null)
         {
-            if (hash != null)
-            {
-                throw new InvalidOperationException();
-            }
-
-            var bytes = Encoding.Unicode.GetBytes(str);
-            var end = Math.Min(BlockBytes - position, bytes.Length);
-
-            Buffer.BlockCopy(bytes, 0, lastBlock, position, end);
-
-            // Block length is not reached yet.
-            if (end + position < BlockBytes)
-            {
-                position += end;
-                return;
-            }
-
-            hasher.ProcessBlock(lastBlock, 0, lastBlock.Length);
-            position = 0;
-
-            // We proccessed the entire string already
-            if (end == bytes.Length)
-            {
-                return;
-            }
-
-            int start = 0;
-            while (end < bytes.Length)
-            {
-                start = end;
-                end += BlockBytes;
-                if (end > bytes.Length)
-                {
-                    break;
-                }
-
-                hasher.ProcessBlock(bytes, start, end - start);
-            }
-
-            if (end > bytes.Length)
-            {
-                position = bytes.Length - start;
-                Buffer.BlockCopy(bytes, start, lastBlock, 0, position);
-            }
+            throw new InvalidOperationException(Resources.Resources.ErrorCannotAppendAfterHashCalculation);
         }
+        _ = str ?? throw new ArgumentNullException(nameof(str));
 
-        public byte[] GetHash()
-        {
-            if (hash != null)
-            {
-                return hash;
-            }
-
-            if (position != 0)
-            {
-                hasher.PadMessage(ref lastBlock, position);
-                hasher.ProcessBlock(lastBlock, 0, lastBlock.Length);
-            }
+        var bytes = Encoding.Unicode.GetBytes(str);
 
-            hash = hasher.ProcessFinalBlock();
-
-            return hash;
-        }
+        _sha.TransformBlock(bytes, 0, bytes.Length, null, 0);
+    }
 
-        public Guid GetId()
+    /// <summary>
+    /// Appends an array of bytes to id generation seed.
+    /// </summary>
+    /// <param name="bytes">Array to append to the id seed.</param>
+    /// <exception cref="InvalidOperationException">Thrown if <see cref="GetHash"/> or <see cref="GetId"/> is called already.</exception>
+    /// <exception cref="ArgumentNullException">Thrown when <paramref name="bytes"/> is <see langword="null"/>.</exception>
+    public void AppendBytes(byte[] bytes)
+    {
+        if (_hash != null)
         {
-            if (id != Guid.Empty)
-            {
-                return id;
-            }
-
-            var toGuid = new byte[16];
-            Array.Copy(GetHash(), toGuid, 16);
-            id = new Guid(toGuid);
-
-            return id;
+            throw new InvalidOperationException(Resources.Resources.ErrorCannotAppendAfterHashCalculation);
         }
+        _ = bytes ?? throw new ArgumentNullException(nameof(bytes));
 
-        /// <summary>
-        /// SHA-1 Implementation as in https://tools.ietf.org/html/rfc3174
-        /// </summary>
-        /// <remarks>
-        /// This implementation only works with messages with a length 
-        /// that is a multiple of the size of 8-bits.
-        /// </remarks>
-        internal class Sha1Implementation
+        if (bytes.Length == 0)
         {
-            /* 
-             * Many of the variable, function and parameter names in this code 
-             * were used because those were the names used in the publication.
-             * 
-             * For more information please refer to https://tools.ietf.org/html/rfc3174.
-             */
-
-            private int streamSize = 0;
-            private bool messagePadded = false;
-
-            public Sha1Implementation()
-            {
-                Reset();
-            }
-
-            /// <summary>
-            /// A sequence of logical functions to be used in SHA-1. 
-            /// Each f(t), 0 <= t <= 79, operates on three 32-bit words B, C, D and produces a 32-bit word as output.  
-            /// </summary>
-            /// <param name="t">Function index. 0 <= t <= 79</param>
-            /// <param name="B">Word B</param>
-            /// <param name="C">Word C</param>
-            /// <param name="D">Word D</param>
-            /// <returns>
-            /// f(t;B,C,D) = (B AND C) OR ((NOT B) AND D)         ( 0 <= t <= 19)
-            /// f(t;B,C,D) = B XOR C XOR D                        (20 <= t <= 39)
-            /// f(t;B,C,D) = (B AND C) OR (B AND D) OR (C AND D)  (40 <= t <= 59)
-            /// f(t;B,C,D) = B XOR C XOR D                        (60 <= t <= 79)
-            /// </returns>
-            private static uint F(int t, uint B, uint C, uint D)
-            {
-                if (t >= 0 && t <= 19)
-                {
-                    return (B & C) | (~B & D);
-                }
-                else if ((t >= 20 && t <= 39) || (t >= 60 && t <= 79))
-                {
-                    return B ^ C ^ D;
-                }
-                else if (t >= 40 && t <= 59)
-                {
-                    return (B & C) | (B & D) | (C & D);
-                }
-                else
-                {
-                    throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t));
-                }
-            }
-
-            /// <summary>
-            /// Returns a constant word K(t) which is used in the SHA-1.
-            /// </summary>
-            /// <param name="t">Word index.</param>
-            /// <returns>
-            /// K(t) = 0x5A827999 ( 0 <= t <= 19)
-            /// K(t) = 0x6ED9EBA1 (20 <= t <= 39)
-            /// K(t) = 0x8F1BBCDC (40 <= t <= 59)
-            /// K(t) = 0xCA62C1D6 (60 <= t <= 79)
-            /// </returns>
-            private static uint K(int t)
-            {
-                if (t >= 0 && t <= 19)
-                {
-                    return 0x5A827999u;
-                }
-                else if (t >= 20 && t <= 39)
-                {
-                    return 0x6ED9EBA1u;
-                }
-                else if (t >= 40 && t <= 59)
-                {
-                    return 0x8F1BBCDCu;
-                }
-                else if (t >= 60 && t <= 79)
-                {
-                    return 0xCA62C1D6u;
-                }
-                else
-                {
-                    throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t));
-                }
-            }
-
-            /// <summary>
-            /// The circular left shift operation.
-            /// </summary>
-            /// <param name="x">An uint word.</param>
-            /// <param name="n">0 <= n < 32</param>
-            /// <returns>S^n(X)  =  (X << n) OR (X >> 32-n)</returns>
-            private static uint S(uint X, byte n)
-            {
-                if (n > 32)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(n));
-                }
-
-                return (X << n) | (X >> (32 - n));
-            }
-
-            /// <summary>
-            /// Ensures that given bytes are in big endian notation.
-            /// </summary>
-            /// <param name="array">An array of bytes</param>
-            private static void EnsureBigEndian(ref byte[] array)
-            {
-                if (BitConverter.IsLittleEndian)
-                {
-                    Array.Reverse(array);
-                }
-            }
-
-            private readonly uint[] H = new uint[5];
-
-            private void Reset()
-            {
-                streamSize = 0;
-                messagePadded = false;
-
-                // as defined in https://tools.ietf.org/html/rfc3174#section-6.1
-                H[0] = 0x67452301u;
-                H[1] = 0xEFCDAB89u;
-                H[2] = 0x98BADCFEu;
-                H[3] = 0x10325476u;
-                H[4] = 0xC3D2E1F0u;
-            }
-
-            public byte[] ComputeHash(byte[] message)
-            {
-                Reset();
-                streamSize = 0;
-                PadMessage(ref message);
-
-                ProcessBlock(message, 0, message.Length);
-
-                return ProcessFinalBlock();
-            }
-
-            private void ProcessMultipleBlocks(byte[] message)
-            {
-                var messageCount = message.Length / BlockBytes;
-                for (var i = 0; i < messageCount; i += 1)
-                {
-                    ProcessBlock(message, i * BlockBytes, BlockBytes);
-                }
-            }
-
-            public byte[] ProcessFinalBlock()
-            {
-                if (!messagePadded)
-                {
-                    var pad = new byte[0];
-                    PadMessage(ref pad, 0);
-                    ProcessBlock(pad, 0, pad.Length);
-                }
-
-                var digest = new byte[DigestBytes];
-                for (int t = 0; t < H.Length; t++)
-                {
-                    var hi = BitConverter.GetBytes(H[t]);
-                    EnsureBigEndian(ref hi);
-
-                    Buffer.BlockCopy(hi, 0, digest, t * hi.Length, hi.Length);
-                }
-
-                return digest;
-            }
-
-            public void PadMessage(ref byte[] message, int length = 0)
-            {
-                if (messagePadded)
-                {
-                    throw new InvalidOperationException();
-                }
-
-                if (length == 0)
-                {
-                    length = message.Length;
-                }
-                else
-                {
-                    Array.Resize(ref message, length);
-                }
-
-                streamSize += length;
-
-                var paddingBytes = BlockBytes - (length % BlockBytes);
-
-                // 64bit uint message size will be appended to end of the padding, making sure we have space for it.
-                if (paddingBytes <= 8)
-                    paddingBytes += BlockBytes;
-
-                var padding = new byte[paddingBytes];
-                padding[0] = 0b10000000;
-
-                var messageBits = (ulong)streamSize << 3;
-                var messageSize = BitConverter.GetBytes(messageBits);
-                EnsureBigEndian(ref messageSize);
-
-                Buffer.BlockCopy(messageSize, 0, padding, padding.Length - messageSize.Length, messageSize.Length);
-
-                Array.Resize(ref message, message.Length + padding.Length);
-                Buffer.BlockCopy(padding, 0, message, length, padding.Length);
-
-                messagePadded = true;
-            }
-
-            public void ProcessBlock(byte[] message, int start, int length)
-            {
-                if (start + length > message.Length)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(length));
-                }
-                if (length % BlockBytes != 0)
-                {
-                    throw new ArgumentException($"Invalid block size. Actual: {length}, Expected: Multiples of {BlockBytes}", nameof(length));
-                }
-                if (length != BlockBytes)
-                {
-                    ProcessMultipleBlocks(message);
-                    return;
-                }
-
-                streamSize += BlockBytes;
-                var W = new uint[80];
-
-                // Get W(0) .. W(15)
-                for (int t = 0; t <= 15; t++)
-                {
-                    var wordBytes = new byte[sizeof(uint)];
-                    Buffer.BlockCopy(message, start + (t * sizeof(uint)), wordBytes, 0, sizeof(uint));
-                    EnsureBigEndian(ref wordBytes);
+            return;
+        }
 
-                    W[t] = BitConverter.ToUInt32(wordBytes, 0);
-                }
+        _sha.TransformBlock(bytes, 0, bytes.Length, null, 0);
+    }
 
-                // Calculate W(16) .. W(79)
-                for (int t = 16; t <= 79; t++)
-                {
-                    W[t] = S(W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16], 1);
-                }
+    /// <summary>
+    /// Calculates the Id seed.
+    /// </summary>
+    /// <returns>An array containing the seed.</returns>
+    /// <remarks>
+    /// <see cref="AppendBytes(byte[])"/> and <see cref="AppendString(string)"/> cannot be called
+    /// on instance after this method is called.
+    /// </remarks>
+    public byte[] GetHash()
+    {
+        if (_hash != null)
+        {
+            return _hash;
+        }
 
-                uint A = H[0],
-                     B = H[1],
-                     C = H[2],
-                     D = H[3],
-                     E = H[4];
+        // Finalize the hash. We don't have any more data so we provide empty.
+        _sha.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
+        _hash = _sha.Hash;
 
-                for (int t = 0; t < 80; t++)
-                {
-                    var temp = S(A, 5) + F(t, B, C, D) + E + W[t] + K(t);
-                    E = D;
-                    D = C;
-                    C = S(B, 30);
-                    B = A;
-                    A = temp;
-                }
+        return _hash!;
+    }
 
-                H[0] += A;
-                H[1] += B;
-                H[2] += C;
-                H[3] += D;
-                H[4] += E;
-            }
+    /// <summary>
+    /// Calculates the Id from the seed.
+    /// </summary>
+    /// <returns>Id</returns>
+    /// <remarks>
+    /// <see cref="AppendBytes(byte[])"/> and <see cref="AppendString(string)"/> cannot be called
+    /// on instance after this method is called.
+    /// </remarks>
+    public Guid GetId()
+    {
+        if (_id != Guid.Empty)
+        {
+            return _id;
         }
+
+#if NET6_0_OR_GREATER
+        var hashSlice = GetHash().AsSpan().Slice(0, 16);
+        _id = new Guid(hashSlice);
+#else
+        // create from span?
+        var toGuid = new byte[16];
+        Array.Copy(GetHash(), toGuid, 16);
+        _id = new Guid(toGuid);
+#endif
+
+        return _id;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs b/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs
deleted file mode 100644
index 86178efb95..0000000000
--- a/src/Microsoft.TestPlatform.Build/ArgumentEscaper.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Text;
-
-namespace Microsoft.TestPlatform.Build.Utils
-{
-    public static class ArgumentEscaper
-    {
-        /// <summary>
-        /// Undo the processing which took place to create string[] args in Main,
-        /// so that the next process will receive the same string[] args
-        ///
-        /// See here for more info:
-        /// http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx
-        /// </summary>
-        /// <param name="arg"></param>
-        /// <returns>Return original string passed by client</returns>
-        public static string HandleEscapeSequenceInArgForProcessStart(string arg)
-        {
-            var sb = new StringBuilder();
-
-            var needsQuotes = ShouldSurroundWithQuotes(arg);
-            var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
-
-            if (needsQuotes)
-            {
-                sb.Append('\"');
-            }
-
-            for (int i = 0; i < arg.Length; ++i)
-            {
-                var backslashCount = 0;
-
-                // Consume All Backslashes
-                while (i < arg.Length && arg[i] == '\\')
-                {
-                    backslashCount++;
-                    i++;
-                }
-
-                // Escape any backslashes at the end of the arg
-                // when the argument is also quoted.
-                // This ensures the outside quote is interpreted as
-                // an argument delimiter
-                if (i == arg.Length && isQuoted)
-                {
-                    sb.Append('\\', 2 * backslashCount);
-                }
-
-                // At then end of the arg, which isn't quoted,
-                // just add the backslashes, no need to escape
-                else if (i == arg.Length)
-                {
-                    sb.Append('\\', backslashCount);
-                }
-
-                // Escape any preceding backslashes and the quote
-                else if (arg[i] == '"')
-                {
-                    sb.Append('\\', (2 * backslashCount) + 1);
-                    sb.Append('"');
-                }
-
-                // Output any consumed backslashes and the character
-                else
-                {
-                    sb.Append('\\', backslashCount);
-                    sb.Append(arg[i]);
-                }
-            }
-
-            if (needsQuotes)
-            {
-                sb.Append('\"');
-            }
-
-            return sb.ToString();
-        }
-
-        internal static bool ShouldSurroundWithQuotes(string argument)
-        {
-            // Don't quote already quoted strings
-            if (IsSurroundedWithQuotes(argument))
-            {
-                return false;
-            }
-
-            // Only quote if whitespace exists in the string
-            return ArgumentContainsWhitespace(argument);
-        }
-
-        internal static bool IsSurroundedWithQuotes(string argument)
-        {
-            return argument.StartsWith("\"", StringComparison.Ordinal) &&
-                   argument.EndsWith("\"", StringComparison.Ordinal);
-        }
-
-        internal static bool ArgumentContainsWhitespace(string argument)
-        {
-            return argument.Contains(" ") || argument.Contains("\t") || argument.Contains("\n");
-        }
-    }
-}
diff --git a/src/Microsoft.TestPlatform.Build/BannedSymbols.txt b/src/Microsoft.TestPlatform.Build/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
index 559c8c9fc3..c5a74f4cc6 100644
--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
@@ -1,42 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
     <AssemblyName>Microsoft.TestPlatform.Build</AssemblyName>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--
+      All extensions for MSBuild should target netstandard2.0, unless they multitarget.
+      https://learn.microsoft.com/en-us/visualstudio/msbuild/tutorial-custom-task-code-generation?view=vs-2022#optional-support-multitargeting
+      We also ship this as nuget, so we don't know who is using it where.
+    -->
+    <TargetFrameworks>$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- This package is included even in source build -->
+    <IsPackable>true</IsPackable>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' != 'true'">Microsoft.TestPlatform.Build.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' != 'true'">Microsoft.TestPlatform.Build.sourcebuild.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">Microsoft.TestPlatform.Build.sourcebuild.product.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.Build</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <RepositoryUrl>https://github.com/microsoft/vstest</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/microsoft/vstest</PackageProjectUrl>
+    <PackageDescription>
+      Build tasks and targets for running tests with Test Platform
+    </PackageDescription>
   </PropertyGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="SourceBuildTfmPrevious=$(NetPrevious)" />
+    <NuspecProperty Include="SourceBuildTfmCurrent=$(NetCurrent)" />
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="Microsoft.TestPlatform.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
   <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
-  
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec
new file mode 100644
index 0000000000..c529c32611
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="netstandard2.0" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="netstandard2.0/Microsoft.TestPlatform.targets" target="runtimes/any/native" />
+    <file src="netstandard2.0/Microsoft.TestPlatform.Build.dll" target="lib/netstandard2.0" />
+
+    <!-- Add localized resources -->
+    <file src="netstandard2.0/cs/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/cs" />
+    <file src="netstandard2.0/de/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/de" />
+    <file src="netstandard2.0/es/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/es" />
+    <file src="netstandard2.0/fr/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/fr" />
+    <file src="netstandard2.0/it/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/it" />
+    <file src="netstandard2.0/ja/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/ja" />
+    <file src="netstandard2.0/ko/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/ko" />
+    <file src="netstandard2.0/pl/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/pl" />
+    <file src="netstandard2.0/pt-BR/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/pt-BR" />
+    <file src="netstandard2.0/ru/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/ru" />
+    <file src="netstandard2.0/tr/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/tr" />
+    <file src="netstandard2.0/zh-Hans/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/zh-Hans" />
+    <file src="netstandard2.0/zh-Hant/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/zh-Hant" />
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.nuspec
new file mode 100644
index 0000000000..cfafc21c32
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="$SourceBuildTfmPrevious$" />
+      <group targetFramework="$SourceBuildTfmCurrent$" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="$SourceBuildTfmPrevious$/Microsoft.TestPlatform.targets" target="runtimes/any/native" />
+    <file src="$SourceBuildTfmPrevious$/Microsoft.TestPlatform.Build.dll" target="lib/$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$/Microsoft.TestPlatform.Build.dll" target="lib/$SourceBuildTfmCurrent$" />
+
+    <!-- Add localized resources -->
+    <file src="$SourceBuildTfmPrevious$/**/Microsoft.TestPlatform.Build.resources.dll" target="lib/$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$/**/Microsoft.TestPlatform.Build.resources.dll" target="lib/$SourceBuildTfmCurrent$" />
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.product.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.product.nuspec
new file mode 100644
index 0000000000..e71fe4aefc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.sourcebuild.product.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="$SourceBuildTfmCurrent$" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="$SourceBuildTfmCurrent$/Microsoft.TestPlatform.targets" target="runtimes/any/native" />
+    <file src="$SourceBuildTfmCurrent$/Microsoft.TestPlatform.Build.dll" target="lib/$SourceBuildTfmCurrent$" />
+
+    <!-- Add localized resources -->
+    <file src="$SourceBuildTfmCurrent$/**/Microsoft.TestPlatform.Build.resources.dll" target="lib/$SourceBuildTfmCurrent$" />
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets
index 8f9d5c4c20..531c23b520 100644
--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.targets
@@ -14,9 +14,12 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <VSTestTaskAssemblyFile Condition="$(VSTestTaskAssemblyFile) == ''">Microsoft.TestPlatform.Build.dll</VSTestTaskAssemblyFile>
     <VSTestConsolePath Condition="$(VSTestConsolePath) == ''">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory),"vstest.console.dll"))</VSTestConsolePath>
+    <VSTestNoBuild Condition="'$(VSTestNoBuild)' == ''">False</VSTestNoBuild>
+    <VsTestUseMSBuildOutput Condition="'$(VsTestUseMSBuildOutput)' == ''">False</VsTestUseMSBuildOutput>
   </PropertyGroup>
   <UsingTask TaskName="Microsoft.TestPlatform.Build.Tasks.VSTestTask" AssemblyFile="$(VSTestTaskAssemblyFile)" />
   <UsingTask TaskName="Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask" AssemblyFile="$(VSTestTaskAssemblyFile)" />
+  <UsingTask TaskName="Microsoft.TestPlatform.Build.Tasks.VSTestTask2" AssemblyFile="$(VSTestTaskAssemblyFile)" />
 
   <!--
     ============================================================
@@ -25,11 +28,61 @@ Copyright (c) .NET Foundation. All rights reserved.
     ============================================================
   -->
   <Target Name="VSTest" DependsOnTargets="ShowInfoMessageIfProjectHasNoIsTestProjectProperty">
+    <!-- Unloggable colorized output (cf. https://github.com/microsoft/vstest/issues/680) -->
+    <!-- Fallback to this old view when terminal logger is not enabled (_MSBUILDTLENABLED==0) , or when user explicitly opts out (VsTestUseMSBuildOutput != true) -->
+    <CallTarget Targets="_VSTestConsole" Condition="$(_MSBUILDTLENABLED) == '0' OR !$(VsTestUseMSBuildOutput) OR $(MSBUILDENSURESTDOUTFORTASKPROCESSES) == '1'" />
+    <!-- Proper MSBuild integration, but no custom colorization -->
+    <!-- Use the new view whe terminal logger is enabled (_MSBUILDTLENABLED==0), and user did not opt out (VsTestUseMSBuildOutput == true) -->
+    <CallTarget Targets="_VSTestMSBuild" Condition="$(_MSBUILDTLENABLED) == '1' AND $(VsTestUseMSBuildOutput)" />
+  </Target>
+
+  <!--
+    Used when called from dotnet msbuild command line: uses MSBuild logs but does not allow for console colorization.
+    We call to empty target _TestRunStart to mark start of the actual test running, in case we need to do build before
+    the test running. This is used in MSBuild Terminal Logger to detect that the current project will run some tests.
+  -->
+  <Target Name="_VSTestMSBuild" Condition="'$(IsTestProject)' == 'true'">
+    <CallTarget Condition="!$(VSTestNoBuild)" Targets="BuildProject" />
+    <CallTarget Targets="_TestRunStart" />
+
+    <VSTestTask2
+      TestFileFullPath="$(TargetPath)"
+      VSTestSetting="$([MSBuild]::ValueOrDefault($(VSTestSetting), '$(RunSettingsFilePath)'))"
+      VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
+      VSTestFramework="$(TargetFrameworkMoniker)"
+      VSTestPlatform="$(PlatformTarget)"
+      VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
+      VSTestLogger="$(VSTestLogger)"
+      VSTestListTests="$(VSTestListTests)"
+      VSTestDiag="$(VSTestDiag)"
+      VSTestCLIRunSettings="$(VSTestCLIRunSettings)"
+      VSTestConsolePath="$(VSTestConsolePath)"
+      VSTestResultsDirectory="$(VSTestResultsDirectory)"
+      VSTestVerbosity="$(VSTestVerbosity)"
+      VSTestCollect="$(VSTestCollect)"
+      VSTestBlame="$(VSTestBlame)"
+      VSTestBlameCrash="$(VSTestBlameCrash)"
+      VSTestBlameCrashDumpType="$(VSTestBlameCrashDumpType)"
+      VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
+      VSTestBlameHang="$(VSTestBlameHang)"
+      VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
+      VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
+      VSTestTraceDataCollectorDirectoryPath="$(TraceDataCollectorDirectoryPath)"
+      VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
+      VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)"
+      VSTestNoLogo="$(VSTestNoLogo)"
+    />
+  </Target>
+
+  <Target Name="_TestRunStart" />
+
+  <!-- Used when called from dotnet test command line: does not use MSBuild logs to allow for console colorization -->
+  <Target Name="_VSTestConsole">
     <CallTarget Condition="'$(VSTestNoBuild)' != 'true' AND '$(IsTestProject)' == 'true'" Targets="BuildProject" />
     
     <CallTarget Targets="ShowCallOfVSTestTaskWithParameter" />
 
-    <Microsoft.TestPlatform.Build.Tasks.VSTestTask
+    <VSTestTask
       TestFileFullPath="$(TargetPath)"
       VSTestSetting="$([MSBuild]::ValueOrDefault($(VSTestSetting), '$(RunSettingsFilePath)'))"
       VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
@@ -52,53 +105,55 @@ Copyright (c) .NET Foundation. All rights reserved.
       VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
       VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
       VSTestTraceDataCollectorDirectoryPath="$(TraceDataCollectorDirectoryPath)"
+      VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
+      VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)"
       VSTestNoLogo="$(VSTestNoLogo)"
       Condition="'$(IsTestProject)' == 'true'"
     />
   </Target>
 
   <Target Name="ShowInfoMessageIfProjectHasNoIsTestProjectProperty" Condition="'$(IsTestProject)' == ''">
-    <Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask LogType="NoIsTestProjectProperty" ProjectFilePath="$(MSBuildProjectFullPath)" />
+    <VSTestLogsTask LogType="NoIsTestProjectProperty" ProjectFilePath="$(MSBuildProjectFullPath)" />
   </Target>
 
   <Target Name="BuildProject">
     <CallTarget Targets="ShowMsbuildWithParameter" />
 
-    <Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask LogType="BuildStarted" />
+    <VSTestLogsTask LogType="BuildStarted" />
     <MSBuild Projects ="$(MSBuildProjectFullPath)" />
-    <Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask LogType="BuildCompleted" />
+    <VSTestLogsTask LogType="BuildCompleted" />
 
-    <Message Text="Done Building project $(MSBuildProjectFullPath) for TargetFramework=$(TargetFramework)" Importance="low" />
+    <Message Importance="Low" Text="Done Building project $(MSBuildProjectFullPath) for TargetFramework=$(TargetFramework)" />
   </Target>
   
   <Target Name="ShowMsbuildWithParameter">
-    <Message Text="Building project $(MSBuildProjectFullPath) for TargetFramework=$(TargetFramework)" Importance="low"/>
-    <Message Text="Value passed to msbuild are..." Importance="low" />
-    <Message Text="Configuration = $(Configuration)" Importance="low" />
-    <Message Text="TargetFramework = $(TargetFramework)" Importance="low" />
-    <Message Text="Platform = $(PlatformTarget)" Importance="low" />
-    <Message Text="OutputPath = $(OutputPath)" Importance="low" />
+    <Message Importance="Low" Text="Building project $(MSBuildProjectFullPath) for TargetFramework=$(TargetFramework)" />
+    <Message Importance="Low" Text="Value passed to msbuild are..." />
+    <Message Importance="Low" Text="Configuration = $(Configuration)" />
+    <Message Importance="Low" Text="TargetFramework = $(TargetFramework)" />
+    <Message Importance="Low" Text="Platform = $(PlatformTarget)" />
+    <Message Importance="Low" Text="OutputPath = $(OutputPath)" />
   </Target>
   
   <Target Name="ShowCallOfVSTestTaskWithParameter">
-    <Message Text="Calling task Microsoft.TestPlatform.Build.Tasks.VSTestTask with following parameter..." Importance="low" />
-    <Message Text="TestFileFullPath = $(TargetPath)" Importance="low" />
-    <Message Text="VSTestSetting = $(VSTestSetting)" Importance="low" />
-    <Message Text="VSTestTestAdapterPath = $(VSTestTestAdapterPath)" Importance="low" />
-    <Message Text="VSTestFramework = $(TargetFrameworkMoniker)" Importance="low" />
-    <Message Text="VSTestPlatform = $(PlatformTarget)" Importance="low" />
-    <Message Text="VSTestTestCaseFilter = $(VSTestTestCaseFilter)" Importance="low" />
-    <Message Text="VSTestLogger = $(VSTestLogger)" Importance="low" />
-    <Message Text="VSTestListTests = $(VSTestListTests)" Importance="low" />
-    <Message Text="VSTestDiag = $(VSTestDiag)" Importance="low" />
-    <Message Text="VSTestCLIRunSettings = $(VSTestCLIRunSettings)" Importance="low" />
-    <Message Text="VSTestResultsDirectory = $(VSTestResultsDirectory)" Importance="low" />
-    <Message Text="VSTestConsolePath = $(VSTestConsolePath)" Importance="low" />
-    <Message Text="VSTestVerbosity = $(VSTestVerbosity)" Importance="low" />
-    <Message Text="VSTestCollect = $(VSTestCollect)" Importance="low" />
-    <Message Text="VSTestBlame = $(VSTestBlame)" Importance="low" />
-    <Message Text="VSTestTraceDataCollectorDirectoryPath = $(TraceDataCollectorDirectoryPath)" Importance="low" />
-    <Message Text="VSTestNoLogo = $(VSTestNoLogo)" Importance="low" />
+    <Message Importance="Low" Text="Calling task Microsoft.TestPlatform.Build.Tasks.VSTestTask with following parameter..." />
+    <Message Importance="Low" Text="TestFileFullPath = $(TargetPath)" />
+    <Message Importance="Low" Text="VSTestSetting = $(VSTestSetting)" />
+    <Message Importance="Low" Text="VSTestTestAdapterPath = $(VSTestTestAdapterPath)" />
+    <Message Importance="Low" Text="VSTestFramework = $(TargetFrameworkMoniker)" />
+    <Message Importance="Low" Text="VSTestPlatform = $(PlatformTarget)" />
+    <Message Importance="Low" Text="VSTestTestCaseFilter = $(VSTestTestCaseFilter)" />
+    <Message Importance="Low" Text="VSTestLogger = $(VSTestLogger)" />
+    <Message Importance="Low" Text="VSTestListTests = $(VSTestListTests)" />
+    <Message Importance="Low" Text="VSTestDiag = $(VSTestDiag)" />
+    <Message Importance="Low" Text="VSTestCLIRunSettings = $(VSTestCLIRunSettings)" />
+    <Message Importance="Low" Text="VSTestResultsDirectory = $(VSTestResultsDirectory)" />
+    <Message Importance="Low" Text="VSTestConsolePath = $(VSTestConsolePath)" />
+    <Message Importance="Low" Text="VSTestVerbosity = $(VSTestVerbosity)" />
+    <Message Importance="Low" Text="VSTestCollect = $(VSTestCollect)" />
+    <Message Importance="Low" Text="VSTestBlame = $(VSTestBlame)" />
+    <Message Importance="Low" Text="VSTestTraceDataCollectorDirectoryPath = $(TraceDataCollectorDirectoryPath)" />
+    <Message Importance="Low" Text="VSTestNoLogo = $(VSTestNoLogo)" />
   </Target>
 
 </Project>
diff --git a/src/Microsoft.TestPlatform.Build/NullableHelpers.cs b/src/Microsoft.TestPlatform.Build/NullableHelpers.cs
new file mode 100644
index 0000000000..02a0c8e266
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.Build;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Build/NullableHelpers.tt b/src/Microsoft.TestPlatform.Build/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Build/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Build/Properties/AssemblyInfo.cs
deleted file mode 100644
index 77e283a24a..0000000000
--- a/src/Microsoft.TestPlatform.Build/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Build")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("03fc3baa-417b-460b-b9ef-ab9a4d2a974a")]
diff --git a/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..e9d7c65cd9
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,123 @@
+#nullable enable
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.LogType.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.LogType.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.ProjectFilePath.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.ProjectFilePath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.VSTestLogsTask() -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.Cancel() -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.TestFileFullPath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.TestFileFullPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestArtifactsProcessingMode.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestArtifactsProcessingMode.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlame.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlame.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrash.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrash.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrashCollectAlways.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrashCollectAlways.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrashDumpType.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameCrashDumpType.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHang.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHang.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHangDumpType.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHangDumpType.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHangTimeout.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestBlameHangTimeout.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestCLIRunSettings.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestCLIRunSettings.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestCollect.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestCollect.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestConsolePath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestConsolePath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestDiag.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestDiag.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestFramework.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestFramework.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestListTests.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestListTests.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestLogger.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestLogger.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestNoLogo.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestNoLogo.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestPlatform.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestPlatform.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestResultsDirectory.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestResultsDirectory.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestSessionCorrelationId.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestSessionCorrelationId.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestSetting.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestSetting.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTask() -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTestAdapterPath.get -> Microsoft.Build.Framework.ITaskItem![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTestAdapterPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTestCaseFilter.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTestCaseFilter.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTraceDataCollectorDirectoryPath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestTraceDataCollectorDirectoryPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestVerbosity.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask.VSTestVerbosity.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.TestFileFullPath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.TestFileFullPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestArtifactsProcessingMode.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestArtifactsProcessingMode.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlame.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlame.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrash.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrash.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrashCollectAlways.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrashCollectAlways.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrashDumpType.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameCrashDumpType.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHang.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHang.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHangDumpType.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHangDumpType.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHangTimeout.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestBlameHangTimeout.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestCLIRunSettings.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestCLIRunSettings.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestCollect.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestCollect.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestConsolePath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestConsolePath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestDiag.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestDiag.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestFramework.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestFramework.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestListTests.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestListTests.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestLogger.get -> string![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestLogger.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestNoLogo.get -> bool
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestNoLogo.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestPlatform.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestPlatform.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestResultsDirectory.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestResultsDirectory.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestSessionCorrelationId.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestSessionCorrelationId.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestSetting.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestSetting.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTask2() -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTestAdapterPath.get -> Microsoft.Build.Framework.ITaskItem![]?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTestAdapterPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTestCaseFilter.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTestCaseFilter.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTraceDataCollectorDirectoryPath.get -> Microsoft.Build.Framework.ITaskItem?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestTraceDataCollectorDirectoryPath.set -> void
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestVerbosity.get -> string?
+Microsoft.TestPlatform.Build.Tasks.VSTestTask2.VSTestVerbosity.set -> void
+Microsoft.TestPlatform.Build.Trace.Tracing
+override Microsoft.TestPlatform.Build.Tasks.VSTestLogsTask.Execute() -> bool
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask.Execute() -> bool
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.GenerateCommandLineCommands() -> string?
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.GenerateFullPathToTool() -> string?
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.LogEventsFromTextOutput(string! singleLine, Microsoft.Build.Framework.MessageImportance messageImportance) -> void
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.StandardErrorEncoding.get -> System.Text.Encoding!
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.StandardOutputEncoding.get -> System.Text.Encoding!
+override Microsoft.TestPlatform.Build.Tasks.VSTestTask2.ToolName.get -> string?
+static Microsoft.TestPlatform.Build.Trace.Tracing.Trace(string! message) -> void
+static Microsoft.TestPlatform.Build.Trace.Tracing.traceEnabled -> bool
diff --git a/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs
index 689e046619..6800dc697a 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Build/Resources/Resources.Designer.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.TestPlatform.Build.Resources {
     using System;
-    using System.Reflection;
     
     
     /// <summary>
@@ -20,7 +19,7 @@ namespace Microsoft.TestPlatform.Build.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -40,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Build.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Build.Resources.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -89,7 +88,16 @@ internal static string NoIsTestProjectProperty {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Test run for {0}({1}).
+        ///   Looks up a localized string similar to Test file path cannot be empty or null..
+        /// </summary>
+        internal static string TestFilePathCannotBeEmptyOrNull {
+            get {
+                return ResourceManager.GetString("TestFilePathCannotBeEmptyOrNull", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Test run for {0} ({1}).
         /// </summary>
         internal static string TestRunningSummary {
             get {
diff --git a/src/Microsoft.TestPlatform.Build/Resources/Resources.resx b/src/Microsoft.TestPlatform.Build/Resources/Resources.resx
index e3277bc036..ff08e2a3bf 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Build/Resources/Resources.resx
@@ -126,6 +126,9 @@
   <data name="NoIsTestProjectProperty" xml:space="preserve">
     <value>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</value>
   </data>
+  <data name="TestFilePathCannotBeEmptyOrNull" xml:space="preserve">
+    <value>Test file path cannot be empty or null.</value>
+  </data>
   <data name="TestRunningSummary" xml:space="preserve">
     <value>Test run for {0} ({1})</value>
   </data>
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf
index ca211fbee3..c7bb29095a 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.cs.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Sestavení bylo dokončeno.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Začalo sestavování. Počkejte prosím...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Testovací běh pro {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Upozornění: Aktualizujte odkaz na balíček Microsoft.NET.Test.Sdk na verzi 15.8.0 nebo novější, aby se získalo pokrytí kódu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Přeskakuje se spuštění testu pro projekt {0}. Pokud chcete spustit testy pomocí příkazu dotnet test, přidejte do souboru projektu vlastnost &lt;IsTestProject&gt;true&lt;/IsTestProject&gt;.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Sestavení bylo dokončeno.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Začalo sestavování. Počkejte prosím...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Cesta k souboru testu nemůže být prázdná nebo null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Testovací běh pro {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Upozornění: Aktualizujte odkaz na balíček Microsoft.NET.Test.Sdk na verzi 15.8.0 nebo novější, aby se získalo pokrytí kódu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Přeskakuje se spuštění testu pro projekt {0}. Pokud chcete spustit testy pomocí příkazu dotnet test, přidejte do souboru projektu vlastnost &lt;IsTestProject&gt;true&lt;/IsTestProject&gt;.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf
index 169344be83..58a02a7502 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.de.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Buildvorgang abgeschlossen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Buildvorgang gestartet, bitte warten...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Testlauf für "{0}" ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Warnung: Aktualisieren Sie die Microsoft.NET.Test.Sdk-Paketreferenz auf Version 15.8.0 oder höher, um von Code Coverage zu profitieren.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Die Ausführung des Tests für das Projekt "{0}" wird übersprungen. Um Tests mit "dotnet test" auszuführen, fügen Sie der Projektdatei die Eigenschaft &lt;IsTestProject&gt;true&lt;/IsTestProject&gt; hinzu.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Buildvorgang abgeschlossen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Buildvorgang gestartet, bitte warten...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Der Testdateipfad darf nicht leer oder NULL sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Testlauf für "{0}" ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Warnung: Aktualisieren Sie die Microsoft.NET.Test.Sdk-Paketreferenz auf Version 15.8.0 oder höher, um von Code Coverage zu profitieren.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Die Ausführung des Tests für das Projekt "{0}" wird übersprungen. Um Tests mit "dotnet test" auszuführen, fügen Sie der Projektdatei die Eigenschaft &lt;IsTestProject&gt;true&lt;/IsTestProject&gt; hinzu.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf
index bfbbb265a6..ed65833ee7 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.es.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Se completó la compilación.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Compilación iniciada, espere...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Serie de pruebas para {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Advertencia: Actualice la referencia del paquete Microsoft.NET.Test.Sdk a la versión 15.8.0 o posterior para recopilar la cobertura de código.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Omitiendo la ejecución de la prueba para el proyecto {0}. Para ejecutar pruebas con dotnet test, agregue la propiedad "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" al archivo del proyecto.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Se completó la compilación.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Compilación iniciada, espere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">La ruta de acceso del archivo de prueba no puede estar vacía ni ser nula.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Serie de pruebas para {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Advertencia: Actualice la referencia del paquete Microsoft.NET.Test.Sdk a la versión 15.8.0 o posterior para recopilar la cobertura de código.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Omitiendo la ejecución de la prueba para el proyecto {0}. Para ejecutar pruebas con dotnet test, agregue la propiedad "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" al archivo del proyecto.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf
index cac849faa0..7e8ad6f1cb 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.fr.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Fin de la build.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">La build a démarré. Patientez…</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Série de tests pour {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Avertissement : mettez à jour la référence de package Microsoft.NET.Test.Sdk vers la version 15.8.0 ou ultérieure pour collecter la couverture du code.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Le test en cours d'exécution est ignoré pour le projet {0}. Pour exécuter des tests avec dotnet test, ajoutez la propriété "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" au fichier projet.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Fin de la build.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">La build a démarré. Patientez…</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Le chemin d’accès du fichier de test ne peut pas être vide ou null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Série de tests pour {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Avertissement : mettez à jour la référence de package Microsoft.NET.Test.Sdk vers la version 15.8.0 ou ultérieure pour collecter la couverture du code.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Le test en cours d'exécution est ignoré pour le projet {0}. Pour exécuter des tests avec dotnet test, ajoutez la propriété "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" au fichier projet.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf
index 04056ad6ca..5a30e45d0b 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.it.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Compilazione completata.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Compilazione avviata. Attendere...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Esecuzione dei test per {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Avviso: per raccogliere i dati di code coverage, aggiornare il riferimento al pacchetto Microsoft.NET.Test.Sdk alla versione 15.8.0 o successiva.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">L'esecuzione del test per il progetto {0} verrà ignorata. Per eseguire test con dotnet test, aggiungere la proprietà "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" al file di progetto.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Compilazione completata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Compilazione avviata. Attendere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Il percorso del file di test non può essere vuoto o Null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Esecuzione dei test per {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Avviso: per raccogliere i dati di code coverage, aggiornare il riferimento al pacchetto Microsoft.NET.Test.Sdk alla versione 15.8.0 o successiva.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">L'esecuzione del test per il progetto {0} verrà ignorata. Per eseguire test con dotnet test, aggiungere la proprietà "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" al file di progetto.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf
index cd7c252457..21cc938589 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ja.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">ビルドが完了しました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">ビルドが開始されました。しばらくお待ちください...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">{0} ({1}) のテスト実行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">警告: コード カバレッジを収集するには、Microsoft.NET.Test.Sdk パッケージ参照をバージョン 15.8.0 以降に更新してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">プロジェクト {0} へのテストの実行をスキップしています。dotnet テストでテストを実行するには、"&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" プロパティをプロジェクト ファイルに追加します。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">ビルドが完了しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">ビルドが開始されました。しばらくお待ちください...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">テスト ファイルのパスを空または null にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">{0} ({1}) のテスト実行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">警告: コード カバレッジを収集するには、Microsoft.NET.Test.Sdk パッケージ参照をバージョン 15.8.0 以降に更新してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">プロジェクト {0} へのテストの実行をスキップしています。dotnet テストでテストを実行するには、"&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" プロパティをプロジェクト ファイルに追加します。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf
index 3f09767df9..7e5d17977f 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ko.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">빌드가 완료되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">빌드가 시작되었습니다. 잠시 기다려 주세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">{0}({1})에 대한 테스트 실행</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">경고: 코드 검사를 수집하려면 Microsoft.NET.Test.Sdk 패키지 참조를 버전 15.8.0 이상으로 업데이트하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">프로젝트 {0}에 대한 테스트 실행을 건너뜁니다. dotnet 테스트와 함께 테스트를 실행하려면 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 속성을 프로젝트 파일에 추가합니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">빌드가 완료되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">빌드가 시작되었습니다. 잠시 기다려 주세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">테스트 파일 경로는 비어 있거나 null일 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">{0}({1})에 대한 테스트 실행</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">경고: 코드 검사를 수집하려면 Microsoft.NET.Test.Sdk 패키지 참조를 버전 15.8.0 이상으로 업데이트하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">프로젝트 {0}에 대한 테스트 실행을 건너뜁니다. dotnet 테스트와 함께 테스트를 실행하려면 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 속성을 프로젝트 파일에 추가합니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf
index 889879bdd8..cf1c702809 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pl.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Kompilacja zakończona.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Kompilacja została rozpoczęta, czekaj...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Przebieg testu dla: {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Ostrzeżenie: zaktualizuj odwołanie do pakietu Microsoft.NET.Test.Sdk do wersji 15.8.0 lub nowszej w celu zbierania danych dotyczących pokrycia kodu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Pomijanie uruchamiania testu dla projektu {0}. Aby uruchomić testy za pomocą polecenia dotnet test, dodaj właściwość „&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;” do pliku projektu.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Kompilacja zakończona.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Kompilacja została rozpoczęta, czekaj...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Ścieżka pliku testowego nie może być pusta ani nie może mieć wartości null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Przebieg testu dla: {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Ostrzeżenie: zaktualizuj odwołanie do pakietu Microsoft.NET.Test.Sdk do wersji 15.8.0 lub nowszej w celu zbierania danych dotyczących pokrycia kodu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Pomijanie uruchamiania testu dla projektu {0}. Aby uruchomić testy za pomocą polecenia dotnet test, dodaj właściwość „&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;” do pliku projektu.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf
index 1c529a940b..fe61b74f95 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.pt-BR.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Build concluído.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Build iniciada, aguarde...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Execução de teste para {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Aviso: Atualize a referência do pacote Microsoft.NET.Test.Sdk para a versão 15.8.0 ou posterior para coletar a cobertura do código.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Ignorando a execução de teste do projeto {0}. Para executar testes com dotnet test, adicione a propriedade "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" ao arquivo de projeto.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Build concluído.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Build iniciada, aguarde...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">O caminho do arquivo de teste não pode ser vazio ou nulo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Execução de teste para {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Aviso: Atualize a referência do pacote Microsoft.NET.Test.Sdk para a versão 15.8.0 ou posterior para coletar a cobertura do código.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Ignorando a execução de teste do projeto {0}. Para executar testes com dotnet test, adicione a propriedade "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" ao arquivo de projeto.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf
index e4cda322f1..588b1c6d58 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.ru.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Сборка выполнена.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Сборка начата, подождите...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">Тестовый запуск для {0} ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Внимание. Для сбора данных об объеме протестированного кода обновите пакет Microsoft.NET.Test.Sdk по ссылке как минимум до версии 15.8.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">Пропуск выполнения теста для проекта {0}. Чтобы выполнить тесты с помощью теста dotnet, добавьте свойство "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" в файл проекта.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Сборка выполнена.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Сборка начата, подождите...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Путь к тестовому файлу не может быть пустым или иметь значение NULL.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">Тестовый запуск для {0} ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Внимание. Для сбора данных об объеме протестированного кода обновите пакет Microsoft.NET.Test.Sdk по ссылке как минимум до версии 15.8.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">Пропуск выполнения теста для проекта {0}. Чтобы выполнить тесты с помощью теста dotnet, добавьте свойство "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" в файл проекта.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf
index afc5584429..ef29a5a986 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.tr.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">Derleme tamamlandı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">Derleme başlatıldı. Lütfen bekleyin...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">{0} ({1}) için test çalıştırması</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">Uyarı: Kod kapsamını toplamak için Microsoft.NET.Test.Sdk paketinin başvurusunu 15.8.0 veya üzeri bir sürüme güncelleştirin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">{0} projesi için test çalıştırma atlanıyor. Testleri dotnet test ile çalıştırmak için proje dosyasına "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" özelliğini ekleyin.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">Derleme tamamlandı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">Derleme başlatıldı. Lütfen bekleyin...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">Test dosyası yolu boş veya null olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">{0} ({1}) için test çalıştırması</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">Uyarı: Kod kapsamını toplamak için Microsoft.NET.Test.Sdk paketinin başvurusunu 15.8.0 veya üzeri bir sürüme güncelleştirin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">{0} projesi için test çalıştırma atlanıyor. Testleri dotnet test ile çalıştırmak için proje dosyasına "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" özelliğini ekleyin.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf
index 4740531abf..b047196388 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.xlf
@@ -5,28 +5,28 @@
       <trans-unit id="BuildCompleted">
         <source>Build completed.</source>
         <target state="new">Build completed.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BuildStarted">
         <source>Build started, please wait...</source>
         <target state="new">Build started, please wait...</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunningSummary">
         <source>Test run for {0} ({1})</source>
         <target state="new">Test run for {0}({1})</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
         <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
         <target state="new">To collect code coverage update Microsoft.NET.Test.Sdk package version to latest.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoIsTestProjectProperty">
         <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
         <target state="new">Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf
index 505a7221ab..e8360f68e2 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">完成的生成。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">已开始生成，请等待...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">{0} ({1})的测试运行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">警告: 将 Microsoft.NET.Test.Sdk 包引用更新为版本 15.8.0 或更高版本，以便收集代码覆盖率。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">正在跳过项目 {0} 的运行测试。若要使用 dotnet test 运行 dotnet 测试，请向项目文件添加 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 属性。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">完成的生成。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">已开始生成，请等待...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">测试文件路径不能为空或为 null。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">{0} ({1})的测试运行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">警告: 将 Microsoft.NET.Test.Sdk 包引用更新为版本 15.8.0 或更高版本，以便收集代码覆盖率。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">正在跳过项目 {0} 的运行测试。若要使用 dotnet test 运行 dotnet 测试，请向项目文件添加 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 属性。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf
index 24dc701c99..380fe45b01 100644
--- a/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Build/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="BuildCompleted">
-        <source>Build completed.</source>
-        <target state="translated">建置完成。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BuildStarted">
-        <source>Build started, please wait...</source>
-        <target state="translated">已開始建置，請稍候...</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunningSummary">
-        <source>Test run for {0} ({1})</source>
-        <target state="translated">{0} 的測試回合 ({1})</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
-        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
-        <target state="translated">警告: 將 Microsoft.NET.Test.Sdk 套件參考更新至版本 15.8.0 或更新版本，才可收集程式碼涵蓋範圍。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoIsTestProjectProperty">
-        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
-        <target state="translated">跳過專案 {0} 目前正在執行中的測試。若要執行有 dotnet 測試的測試項目，請對專案檔新增 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 屬性。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="BuildCompleted">
+        <source>Build completed.</source>
+        <target state="translated">建置完成。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildStarted">
+        <source>Build started, please wait...</source>
+        <target state="translated">已開始建置，請稍候...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFilePathCannotBeEmptyOrNull">
+        <source>Test file path cannot be empty or null.</source>
+        <target state="translated">測試檔案路徑不可為空白或 null。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunningSummary">
+        <source>Test run for {0} ({1})</source>
+        <target state="translated">{0} 的測試回合 ({1})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UpdateTestSdkForCollectingCodeCoverage">
+        <source>Warning: Update the Microsoft.NET.Test.Sdk package reference to version 15.8.0 or later to collect code coverage.</source>
+        <target state="translated">警告: 將 Microsoft.NET.Test.Sdk 套件參考更新至版本 15.8.0 或更新版本，才可收集程式碼涵蓋範圍。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoIsTestProjectProperty">
+        <source>Skipping running test for project {0}. To run tests with dotnet test add "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" property to project file.</source>
+        <target state="translated">跳過專案 {0} 目前正在執行中的測試。若要執行有 dotnet 測試的測試項目，請對專案檔新增 "&lt;IsTestProject&gt;true&lt;/IsTestProject&gt;" 屬性。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/ITestTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/ITestTask.cs
new file mode 100644
index 0000000000..ecd6ec5848
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Tasks/ITestTask.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.TestPlatform.Build.Tasks;
+
+internal interface ITestTask : ITask, ICancelableTask
+{
+    ITaskItem? TestFileFullPath { get; set; }
+    string? VSTestSetting { get; set; }
+    ITaskItem[]? VSTestTestAdapterPath { get; set; }
+    string? VSTestFramework { get; set; }
+    string? VSTestPlatform { get; set; }
+    string? VSTestTestCaseFilter { get; set; }
+    string[]? VSTestLogger { get; set; }
+    bool VSTestListTests { get; set; }
+    string? VSTestDiag { get; set; }
+    string[]? VSTestCLIRunSettings { get; set; }
+    ITaskItem? VSTestConsolePath { get; set; }
+    ITaskItem? VSTestResultsDirectory { get; set; }
+    string? VSTestVerbosity { get; set; }
+    string[]? VSTestCollect { get; set; }
+    bool VSTestBlame { get; set; }
+    bool VSTestBlameCrash { get; set; }
+    string? VSTestBlameCrashDumpType { get; set; }
+    bool VSTestBlameCrashCollectAlways { get; set; }
+    bool VSTestBlameHang { get; set; }
+    string? VSTestBlameHangDumpType { get; set; }
+    string? VSTestBlameHangTimeout { get; set; }
+    ITaskItem? VSTestTraceDataCollectorDirectoryPath { get; set; }
+    bool VSTestNoLogo { get; set; }
+    string? VSTestArtifactsProcessingMode { get; set; }
+    string? VSTestSessionCorrelationId { get; set; }
+
+    TaskLoggingHelper Log { get; }
+}
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/TestTaskUtils.cs b/src/Microsoft.TestPlatform.Build/Tasks/TestTaskUtils.cs
new file mode 100644
index 0000000000..d81a03b48e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Tasks/TestTaskUtils.cs
@@ -0,0 +1,240 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.TestPlatform.Build.Tasks;
+
+internal static class TestTaskUtils
+{
+    public static string CreateCommandLineArguments(ITestTask task)
+    {
+        const string codeCoverageString = "Code Coverage";
+        const string vsTestAppName = "vstest.console.dll";
+
+        // We have 2 tasks:
+        // VSTestTask that writes directly to console output and does not write via msbuild
+        // and VSTestTask2 that uses msbuild tools task to capture standard output and translates
+        // all output to Error to msbuild errors.
+        //
+        // Here we are choosing a vstest.console logger to use. Those loggers both write to standard output
+        // and error output in vstest.console process, but MSBuild task is not focusing on writing with nice colors
+        // but instead on writing cohesive messages in one go, so MSBuild can capture them as single message, and not
+        // as 20 different messages for 20 lines.
+        var loggerToUse = task is VSTestTask ? "Console" : "Microsoft.TestPlatform.MSBuildLogger";
+        // User is free to override the logging using the standard vstest.parameters
+        // otherwise we just add the appropriate logger and use the msbuild verbosity
+        // to forward it to the vstest.console logger.
+        var isLoggerSpecifiedByUser = false;
+        var isCollectCodeCoverageEnabled = false;
+        var isRunSettingsEnabled = false;
+
+        var builder = new CommandLineBuilder();
+        builder.AppendSwitch("exec");
+        if (task.VSTestConsolePath != null && !task.VSTestConsolePath.ItemSpec.IsNullOrEmpty())
+        {
+            builder.AppendFileNameIfNotNull(task.VSTestConsolePath);
+        }
+        else
+        {
+            builder.AppendFileNameIfNotNull(vsTestAppName);
+        }
+
+        // TODO log arguments in task
+        if (!task.VSTestSetting.IsNullOrEmpty())
+        {
+            isRunSettingsEnabled = true;
+            builder.AppendSwitchIfNotNull("--settings:", task.VSTestSetting);
+        }
+
+        if (task.VSTestTestAdapterPath != null)
+        {
+            foreach (var arg in task.VSTestTestAdapterPath)
+            {
+                builder.AppendSwitchIfNotNull("--testAdapterPath:", arg);
+            }
+        }
+
+        builder.AppendSwitchIfNotNull("--framework:", task.VSTestFramework);
+
+        // vstest.console only support x86 and x64 for argument platform
+        if (!task.VSTestPlatform.IsNullOrEmpty() && !task.VSTestPlatform.Contains("AnyCPU"))
+        {
+            builder.AppendSwitchIfNotNull("--platform:", task.VSTestPlatform);
+        }
+
+        builder.AppendSwitchIfNotNull("--testCaseFilter:", task.VSTestTestCaseFilter);
+
+        if (task.VSTestLogger != null)
+        {
+            foreach (var arg in task.VSTestLogger)
+            {
+                builder.AppendSwitchIfNotNull("--logger:", arg);
+
+                if (arg != null && arg.StartsWith(loggerToUse, StringComparison.OrdinalIgnoreCase))
+                {
+                    System.Diagnostics.Trace.WriteLine($">>>> : User specified logger: {arg}");
+                    isLoggerSpecifiedByUser = true;
+                }
+            }
+        }
+
+        builder.AppendSwitchIfNotNull("--resultsDirectory:", task.VSTestResultsDirectory);
+
+        if (task.VSTestListTests)
+        {
+            builder.AppendSwitch("--listTests");
+        }
+
+        builder.AppendSwitchIfNotNull("--diag:", task.VSTestDiag);
+
+        if (task.TestFileFullPath == null || task.TestFileFullPath.ItemSpec.IsNullOrEmpty())
+        {
+            task.Log.LogError(Resources.Resources.TestFilePathCannotBeEmptyOrNull);
+        }
+        else
+        {
+            builder.AppendFileNameIfNotNull(task.TestFileFullPath);
+        }
+
+        // The logger to use (console or msbuild) logger was not specified by user,
+        // add the logger and verbosity, so we know what to use in vstest.console.
+        if (!isLoggerSpecifiedByUser)
+        {
+            string vsTestVerbosity = "minimal";
+            if (!task.VSTestVerbosity.IsNullOrWhiteSpace())
+            {
+                var normalTestLogging = new List<string>() { "n", "normal", "d", "detailed", "diag", "diagnostic" };
+                var quietTestLogging = new List<string>() { "q", "quiet" };
+
+                string taskVsTestVerbosity = task.VSTestVerbosity.ToLowerInvariant();
+                if (normalTestLogging.Contains(taskVsTestVerbosity))
+                {
+                    vsTestVerbosity = "normal";
+                }
+                else if (quietTestLogging.Contains(taskVsTestVerbosity))
+                {
+                    vsTestVerbosity = "quiet";
+                }
+            }
+
+            builder.AppendSwitchUnquotedIfNotNull("--logger:", $"{loggerToUse};Verbosity={vsTestVerbosity}");
+        }
+
+        if (task.VSTestBlame || task.VSTestBlameCrash || task.VSTestBlameHang)
+        {
+            var dumpArgs = new List<string>();
+            if (task.VSTestBlameCrash || task.VSTestBlameHang)
+            {
+                if (task.VSTestBlameCrash)
+                {
+                    dumpArgs.Add("CollectDump");
+                    if (task.VSTestBlameCrashCollectAlways)
+                    {
+                        dumpArgs.Add($"CollectAlways={task.VSTestBlameCrashCollectAlways}");
+                    }
+
+                    if (!task.VSTestBlameCrashDumpType.IsNullOrEmpty())
+                    {
+                        dumpArgs.Add($"DumpType={task.VSTestBlameCrashDumpType}");
+                    }
+                }
+
+                if (task.VSTestBlameHang)
+                {
+                    dumpArgs.Add("CollectHangDump");
+
+                    if (!task.VSTestBlameHangDumpType.IsNullOrEmpty())
+                    {
+                        dumpArgs.Add($"HangDumpType={task.VSTestBlameHangDumpType}");
+                    }
+
+                    if (!task.VSTestBlameHangTimeout.IsNullOrEmpty())
+                    {
+                        dumpArgs.Add($"TestTimeout={task.VSTestBlameHangTimeout}");
+                    }
+                }
+            }
+
+            if (dumpArgs.Count != 0)
+            {
+                builder.AppendSwitchIfNotNull("--Blame:", string.Join(";", dumpArgs));
+            }
+            else
+            {
+                builder.AppendSwitch("--Blame");
+            }
+        }
+
+        if (task.VSTestCollect != null)
+        {
+            foreach (var arg in task.VSTestCollect)
+            {
+                if (arg == null)
+                {
+                    continue;
+                }
+
+                // For collecting code coverage, argument value can be either "Code Coverage" or "Code Coverage;a=b;c=d".
+                // Split the argument with ';' and compare first token value.
+                var tokens = arg.Split(';');
+                if (arg.Equals(codeCoverageString, StringComparison.OrdinalIgnoreCase) ||
+                    tokens[0].Equals(codeCoverageString, StringComparison.OrdinalIgnoreCase))
+                {
+                    isCollectCodeCoverageEnabled = true;
+                }
+
+                builder.AppendSwitchIfNotNull("--collect:", arg);
+            }
+        }
+
+        if (isCollectCodeCoverageEnabled || isRunSettingsEnabled)
+        {
+            // Pass TraceDataCollector path to vstest.console as TestAdapterPath if --collect "Code Coverage"
+            // or --settings (User can enable code coverage from runsettings) option given.
+            // Not parsing the runsettings for two reason:
+            //    1. To keep no knowledge of runsettings structure in VSTestTask.
+            //    2. Impact of adding adapter path always is minimal. (worst case: loads additional data collector assembly in datacollector process.)
+            // This is required due to currently trace datacollector not ships with dotnet sdk, can be remove once we have
+            // go code coverage x-plat.
+            if (task.VSTestTraceDataCollectorDirectoryPath != null && !task.VSTestTraceDataCollectorDirectoryPath.ItemSpec.IsNullOrEmpty())
+            {
+                builder.AppendSwitchIfNotNull("--testAdapterPath:", task.VSTestTraceDataCollectorDirectoryPath);
+            }
+            else if (isCollectCodeCoverageEnabled)
+            {
+                // Not showing message in runsettings scenario, because we are not sure that code coverage is enabled.
+                // User might be using older Microsoft.NET.Test.Sdk which don't have CodeCoverage infra.
+                task.Log.LogWarning(Resources.Resources.UpdateTestSdkForCollectingCodeCoverage);
+            }
+        }
+
+        if (task.VSTestNoLogo)
+        {
+            builder.AppendSwitch("--nologo");
+            Environment.SetEnvironmentVariable("VSTEST_MSBUILD_NOLOGO", "1");
+        }
+
+        if (string.Equals(task.VSTestArtifactsProcessingMode, "collect", StringComparison.OrdinalIgnoreCase))
+        {
+            builder.AppendSwitch("--artifactsProcessingMode-collect");
+        }
+
+        builder.AppendSwitchIfNotNull("--testSessionCorrelationId:", task.VSTestSessionCorrelationId);
+
+        // VSTestCLIRunSettings should be last argument as vstest.console ignore options after "--" (CLIRunSettings option).
+        if (task.VSTestCLIRunSettings != null)
+        {
+            builder.AppendSwitch("--");
+            foreach (var arg in task.VSTestCLIRunSettings)
+            {
+                builder.AppendSwitchIfNotNull(string.Empty, arg);
+            }
+        }
+
+        return builder.ToString();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs
deleted file mode 100644
index 0131b222d5..0000000000
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.Build.Tasks
-{
-    using Microsoft.TestPlatform.Build.Utils;
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using Trace;
-
-    public class VSTestForwardingApp
-    {
-        private const string hostExe = "dotnet";
-        private readonly List<string> allArgs = new List<string>();
-        private int activeProcessId;
-
-        public VSTestForwardingApp(string vsTestExePath, IEnumerable<string> argsToForward)
-        {
-            this.allArgs.Add("exec");
-
-            // Ensure that path to vstest.console is whitespace friendly. User may install
-            // dotnet-cli to any folder containing whitespace (e.g. VS installs to program files).
-            // Arguments are already whitespace friendly.
-            this.allArgs.Add(ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(vsTestExePath));
-            this.allArgs.AddRange(argsToForward);
-        }
-
-        public int Execute()
-        {
-            var processInfo = new ProcessStartInfo
-                                  {
-                                      FileName = hostExe,
-                                      Arguments = string.Join(" ", this.allArgs),
-                                      UseShellExecute = false,
-                                  };
-
-            Tracing.Trace("VSTest: Starting vstest.console...");
-            Tracing.Trace("VSTest: Arguments: " + processInfo.FileName + " " + processInfo.Arguments);
-
-            using (var activeProcess = new Process { StartInfo = processInfo })
-            {
-                activeProcess.Start();
-                this.activeProcessId = activeProcess.Id;
-
-                activeProcess.WaitForExit();
-                Tracing.Trace("VSTest: Exit code: " + activeProcess.ExitCode);
-                return activeProcess.ExitCode;
-            }
-        }
-
-        public void Cancel()
-        {
-            try
-            {
-                Process.GetProcessById(activeProcessId).Kill();
-            }
-            catch(ArgumentException ex)
-            {
-                Tracing.Trace(string.Format("VSTest: Killing process throws ArgumentException with the following message {0}. It may be that process is not running", ex));
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
index e50edf4b3e..7e1a0dd8b1 100644
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
+++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
@@ -1,47 +1,38 @@
-// Copyright(c) Microsoft Corporation.All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Build.Tasks
+using System;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.TestPlatform.Build.Tasks;
+
+public class VSTestLogsTask : Task
 {
-    using System;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using Microsoft.TestPlatform.Build.Resources;
+    public string? LogType { get; set; }
 
-    public class VSTestLogsTask : Task
+    public string? ProjectFilePath { get; set; }
+
+    public override bool Execute()
     {
-        public string LogType
+        if (string.Equals(LogType, "BuildStarted", StringComparison.OrdinalIgnoreCase))
         {
-            get;
-            set;
+            Log.LogMessage(MessageImportance.Normal, Resources.Resources.BuildStarted);
         }
-
-        public string ProjectFilePath
+        else if (string.Equals(LogType, "BuildCompleted", StringComparison.OrdinalIgnoreCase))
         {
-            get;
-            set;
+            Log.LogMessage(MessageImportance.Normal, Resources.Resources.BuildCompleted + Environment.NewLine);
         }
-
-        public override bool Execute()
+        else if (string.Equals(LogType, "NoIsTestProjectProperty", StringComparison.OrdinalIgnoreCase))
         {
-            if (string.Equals(LogType, "BuildStarted", StringComparison.OrdinalIgnoreCase))
-            {
-                Log.LogMessage(MessageImportance.Normal, Resources.BuildStarted);
-            }
-            else if (string.Equals(LogType, "BuildCompleted", StringComparison.OrdinalIgnoreCase))
-            {
-                Log.LogMessage(MessageImportance.Normal, Resources.BuildCompleted + Environment.NewLine);
-            }
-            else if (string.Equals(LogType, "NoIsTestProjectProperty", StringComparison.OrdinalIgnoreCase))
-            {
-                Log.LogMessage(MessageImportance.Low, Resources.NoIsTestProjectProperty);
-            }
-            else
-            {
-                return false;
-            }
-
-            return true;
+            Log.LogMessage(MessageImportance.Low, Resources.Resources.NoIsTestProjectProperty);
         }
+        else
+        {
+            return false;
+        }
+
+        return true;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs
index 2ded9cc953..413e58acad 100644
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs
+++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask.cs
@@ -1,420 +1,110 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Build.Tasks
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Threading;
-    using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
-    using Microsoft.TestPlatform.Build.Resources;
-    using Microsoft.TestPlatform.Build.Utils;
-    using Trace;
-
-    public class VSTestTask : Task, ICancelableTask
-    {
-        // The process which is invoking vstest.console
-        private VSTestForwardingApp vsTestForwardingApp;
-
-        private const string vsTestAppName = "vstest.console.dll";
-        private const string CodeCovergaeString = "Code Coverage";
-
-        public string TestFileFullPath
-        {
-            get;
-            set;
-        }
-
-        public string VSTestSetting
-        {
-            get;
-            set;
-        }
-
-        public string[] VSTestTestAdapterPath
-        {
-            get;
-            set;
-        }
-
-        public string VSTestFramework
-        {
-            get;
-            set;
-        }
-
-        public string VSTestPlatform
-        {
-            get;
-            set;
-        }
-
-        public string VSTestTestCaseFilter
-        {
-            get;
-            set;
-        }
-        public string[] VSTestLogger
-        {
-            get;
-            set;
-        }
-
-        public string VSTestListTests
-        {
-            get;
-            set;
-        }
-
-        public string VSTestDiag
-        {
-            get;
-            set;
-        }
-
-        public string[] VSTestCLIRunSettings
-        {
-            get;
-            set;
-        }
-
-        [Required]
-        public string VSTestConsolePath
-        {
-            get;
-            set;
-        }
+using System;
+using System.Diagnostics;
+using System.Threading;
 
-        public string VSTestResultsDirectory
-        {
-            get;
-            set;
-        }
-
-        public string VSTestVerbosity
-        {
-            get;
-            set;
-        }
-
-        public string[] VSTestCollect
-        {
-            get;
-            set;
-        }
-
-        public string VSTestBlame
-        {
-            get;
-            set;
-        }
-
-        public string VSTestBlameCrash
-        {
-            get;
-            set;
-        }
-
-        public string VSTestBlameCrashDumpType
-        {
-            get;
-            set;
-        }
-
-        public string VSTestBlameCrashCollectAlways
-        {
-            get;
-            set;
-        }
-
-        public string VSTestBlameHang
-        {
-            get;
-            set;
-        }
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Microsoft.TestPlatform.Build.Trace;
 
-        public string VSTestBlameHangDumpType
-        {
-            get;
-            set;
-        }
-        public string VSTestBlameHangTimeout
-        {
-            get;
-            set;
-        }
+namespace Microsoft.TestPlatform.Build.Tasks;
 
-        public string VSTestTraceDataCollectorDirectoryPath
-        {
-            get;
-            set;
-        }
+public class VSTestTask : Task, ITestTask
+{
+    private int _activeProcessId;
+
+    private const string DotnetExe = "dotnet";
+
+    [Required]
+    public ITaskItem? TestFileFullPath { get; set; }
+    public string? VSTestSetting { get; set; }
+    public ITaskItem[]? VSTestTestAdapterPath { get; set; }
+    public string? VSTestFramework { get; set; }
+    public string? VSTestPlatform { get; set; }
+    public string? VSTestTestCaseFilter { get; set; }
+    public string[]? VSTestLogger { get; set; }
+    public bool VSTestListTests { get; set; }
+    public string? VSTestDiag { get; set; }
+    public string[]? VSTestCLIRunSettings { get; set; }
+    [Required]
+    public ITaskItem? VSTestConsolePath { get; set; }
+    public ITaskItem? VSTestResultsDirectory { get; set; }
+    public string? VSTestVerbosity { get; set; }
+    public string[]? VSTestCollect { get; set; }
+    public bool VSTestBlame { get; set; }
+    public bool VSTestBlameCrash { get; set; }
+    public string? VSTestBlameCrashDumpType { get; set; }
+    public bool VSTestBlameCrashCollectAlways { get; set; }
+    public bool VSTestBlameHang { get; set; }
+    public string? VSTestBlameHangDumpType { get; set; }
+    public string? VSTestBlameHangTimeout { get; set; }
+    public ITaskItem? VSTestTraceDataCollectorDirectoryPath { get; set; }
+    public bool VSTestNoLogo { get; set; }
+    public string? VSTestArtifactsProcessingMode { get; set; }
+    public string? VSTestSessionCorrelationId { get; set; }
+
+    public override bool Execute()
+    {
+        var traceEnabledValue = Environment.GetEnvironmentVariable("VSTEST_BUILD_TRACE");
+        Tracing.traceEnabled = string.Equals(traceEnabledValue, "1", StringComparison.OrdinalIgnoreCase);
 
-        public string VSTestNoLogo
+        var debugEnabled = Environment.GetEnvironmentVariable("VSTEST_BUILD_DEBUG");
+        if (string.Equals(debugEnabled, "1", StringComparison.Ordinal))
         {
-            get;
-            set;
-        }
+            Console.WriteLine("Waiting for debugger attach...");
 
-        public override bool Execute()
-        {
-            var traceEnabledValue = Environment.GetEnvironmentVariable("VSTEST_BUILD_TRACE");
-            Tracing.traceEnabled = !string.IsNullOrEmpty(traceEnabledValue) && traceEnabledValue.Equals("1", StringComparison.OrdinalIgnoreCase);
+            var currentProcess = Process.GetCurrentProcess();
+            Console.WriteLine($"Process Id: {currentProcess.Id}, Name: {currentProcess.ProcessName}");
 
-            var debugEnabled = Environment.GetEnvironmentVariable("VSTEST_BUILD_DEBUG");
-            if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal))
+            while (!Debugger.IsAttached)
             {
-                Console.WriteLine("Waiting for debugger attach...");
-
-                var currentProcess = Process.GetCurrentProcess();
-                Console.WriteLine(string.Format("Process Id: {0}, Name: {1}", currentProcess.Id, currentProcess.ProcessName));
-
-                while (!Debugger.IsAttached)
-                {
-                    Thread.Sleep(1000);
-                }
-
-                Debugger.Break();
+                Thread.Sleep(1000);
             }
 
-            // Avoid logging "Task returned false but did not log an error." on test failure, because we don't
-            // write MSBuild error. https://github.com/dotnet/msbuild/blob/51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491/src/Framework/IBuildEngine7.cs#L12
-            var allowfailureWithoutError = BuildEngine.GetType().GetProperty("AllowFailureWithoutError");
-            allowfailureWithoutError?.SetValue(BuildEngine, true);
+            Debugger.Break();
+        }
 
-            vsTestForwardingApp = new VSTestForwardingApp(this.VSTestConsolePath, this.CreateArgument());
-            if (!string.IsNullOrEmpty(this.VSTestFramework))
-            {
-                Console.WriteLine(Resources.TestRunningSummary, this.TestFileFullPath, this.VSTestFramework);
-            }
+        // Avoid logging "Task returned false but did not log an error." on test failure, because we don't
+        // write MSBuild error. https://github.com/dotnet/msbuild/blob/51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491/src/Framework/IBuildEngine7.cs#L12
+        var allowFailureWithoutError = BuildEngine.GetType().GetProperty("AllowFailureWithoutError");
+        allowFailureWithoutError?.SetValue(BuildEngine, true);
 
-            return vsTestForwardingApp.Execute() == 0;
-        }
+        var processInfo = new ProcessStartInfo
+        {
+            FileName = DotnetExe,
+            Arguments = TestTaskUtils.CreateCommandLineArguments(this),
+            UseShellExecute = false,
+        };
 
-        public void Cancel()
+        if (!VSTestFramework.IsNullOrEmpty())
         {
-            Tracing.Trace("VSTest: Killing the process...");
-            vsTestForwardingApp.Cancel();
+            Console.WriteLine(Resources.Resources.TestRunningSummary, TestFileFullPath, VSTestFramework);
         }
 
-        internal IEnumerable<string> CreateArgument()
-        {
-            var allArgs = this.AddArgs();
+        Tracing.Trace("VSTest: Starting vstest.console...");
+        Tracing.Trace($"VSTest: Arguments: {processInfo.FileName} {processInfo.Arguments}");
 
-            // VSTestCLIRunSettings should be last argument in allArgs as vstest.console ignore options after "--"(CLIRunSettings option).
-            this.AddCLIRunSettingsArgs(allArgs);
+        using var activeProcess = new Process { StartInfo = processInfo };
+        activeProcess.Start();
+        _activeProcessId = activeProcess.Id;
 
-            return allArgs;
-        }
+        activeProcess.WaitForExit();
+        Tracing.Trace($"VSTest: Exit code: {activeProcess.ExitCode}");
+        return activeProcess.ExitCode == 0;
+    }
 
-        private void AddCLIRunSettingsArgs(List<string> allArgs)
+    public void Cancel()
+    {
+        Tracing.Trace("VSTest: Killing the process...");
+        try
         {
-            if (this.VSTestCLIRunSettings != null && this.VSTestCLIRunSettings.Length > 0)
-            {
-                allArgs.Add("--");
-                foreach (var arg in this.VSTestCLIRunSettings)
-                {
-                    allArgs.Add(ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(arg));
-                }
-            }
+            Process.GetProcessById(_activeProcessId).Kill();
         }
-
-        private List<string> AddArgs()
+        catch (ArgumentException ex)
         {
-            var isConsoleLoggerSpecifiedByUser = false;
-            var isCollectCodeCoverageEnabled = false;
-            var isRunSettingsEnabled = false;
-            var allArgs = new List<string>();
-
-            // TODO log arguments in task
-            if (!string.IsNullOrEmpty(this.VSTestSetting))
-            {
-                isRunSettingsEnabled = true;
-                allArgs.Add("--settings:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestSetting));
-            }
-
-            if (this.VSTestTestAdapterPath != null && this.VSTestTestAdapterPath.Length > 0)
-            {
-                foreach (var arg in this.VSTestTestAdapterPath)
-                {
-                    allArgs.Add("--testAdapterPath:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(arg));
-                }
-            }
-
-            if (!string.IsNullOrEmpty(this.VSTestFramework))
-            {
-                allArgs.Add("--framework:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestFramework));
-            }
-
-            // vstest.console only support x86 and x64 for argument platform
-            if (!string.IsNullOrEmpty(this.VSTestPlatform) && !this.VSTestPlatform.Contains("AnyCPU"))
-            {
-                allArgs.Add("--platform:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestPlatform));
-            }
-
-            if (!string.IsNullOrEmpty(this.VSTestTestCaseFilter))
-            {
-                allArgs.Add("--testCaseFilter:" +
-                            ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestTestCaseFilter));
-            }
-
-            if (this.VSTestLogger != null && this.VSTestLogger.Length > 0)
-            {
-                foreach (var arg in this.VSTestLogger)
-                {
-                    allArgs.Add("--logger:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(arg));
-
-                    if (arg.StartsWith("console", StringComparison.OrdinalIgnoreCase))
-                    {
-                        isConsoleLoggerSpecifiedByUser = true;
-                    }
-                }
-            }
-
-            if (!string.IsNullOrEmpty(this.VSTestResultsDirectory))
-            {
-                allArgs.Add("--resultsDirectory:" +
-                            ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestResultsDirectory));
-            }
-
-            if (!string.IsNullOrEmpty(this.VSTestListTests))
-            {
-                allArgs.Add("--listTests");
-            }
-
-            if (!string.IsNullOrEmpty(this.VSTestDiag))
-            {
-                allArgs.Add("--Diag:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.VSTestDiag));
-            }
-
-            if (string.IsNullOrEmpty(this.TestFileFullPath))
-            {
-                this.Log.LogError("Test file path cannot be empty or null.");
-            }
-            else
-            {
-                allArgs.Add(ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this.TestFileFullPath));
-            }
-
-            // Console logger was not specified by user, but verbosity was, hence add default console logger with verbosity as specified
-            if (!string.IsNullOrWhiteSpace(this.VSTestVerbosity) && !isConsoleLoggerSpecifiedByUser)
-            {
-                var normalTestLogging = new List<string>() { "n", "normal", "d", "detailed", "diag", "diagnostic" };
-                var quietTestLogging = new List<string>() { "q", "quiet" };
-
-                string vsTestVerbosity = "minimal";
-                if (normalTestLogging.Contains(this.VSTestVerbosity.ToLowerInvariant()))
-                {
-                    vsTestVerbosity = "normal";
-                }
-                else if (quietTestLogging.Contains(this.VSTestVerbosity.ToLowerInvariant()))
-                {
-                    vsTestVerbosity = "quiet";
-                }
-
-                allArgs.Add("--logger:Console;Verbosity=" + vsTestVerbosity);
-            }
-
-            var blameCrash = !string.IsNullOrEmpty(this.VSTestBlameCrash);
-            var blameHang = !string.IsNullOrEmpty(this.VSTestBlameHang);
-            if (!string.IsNullOrEmpty(this.VSTestBlame) || blameCrash || blameHang)
-            {
-                var blameArgs = "--Blame";
-
-                var dumpArgs = new List<string>();
-                if (blameCrash || blameHang)
-                {
-                    if (blameCrash)
-                    {
-                        dumpArgs.Add("CollectDump");
-                        if (!string.IsNullOrEmpty(this.VSTestBlameCrashCollectAlways))
-                        {
-                            dumpArgs.Add($"CollectAlways={this.VSTestBlameCrashCollectAlways}");
-                        }
-
-                        if (!string.IsNullOrEmpty(this.VSTestBlameCrashDumpType))
-                        {
-                            dumpArgs.Add($"DumpType={this.VSTestBlameCrashDumpType}");
-                        }
-                    }
-
-                    if (blameHang)
-                    {
-                        dumpArgs.Add("CollectHangDump");
-
-                        if (!string.IsNullOrEmpty(this.VSTestBlameHangDumpType))
-                        {
-                            dumpArgs.Add($"HangDumpType={this.VSTestBlameHangDumpType}");
-                        }
-
-                        if (!string.IsNullOrEmpty(this.VSTestBlameHangTimeout))
-                        {
-                            dumpArgs.Add($"TestTimeout={this.VSTestBlameHangTimeout}");
-                        }
-                    }
-
-                    if (dumpArgs.Any())
-                    {
-                        blameArgs += $":\"{string.Join(";", dumpArgs)}\"";
-                    }
-                }
-
-                allArgs.Add(blameArgs);
-            }
-
-            if (this.VSTestCollect != null && this.VSTestCollect.Length > 0)
-            {
-                foreach (var arg in this.VSTestCollect)
-                {
-                    // For collecting code coverage, argument value can be either "Code Coverage" or "Code Coverage;a=b;c=d".
-                    // Split the argument with ';' and compare first token value.
-                    var tokens = arg.Split(';');
-
-                    if (arg.Equals(CodeCovergaeString, StringComparison.OrdinalIgnoreCase) ||
-                        tokens[0].Equals(CodeCovergaeString, StringComparison.OrdinalIgnoreCase))
-                    {
-                        isCollectCodeCoverageEnabled = true;
-                    }
-
-                    allArgs.Add("--collect:" + ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(arg));
-                }
-            }
-
-            if (isCollectCodeCoverageEnabled || isRunSettingsEnabled)
-            {
-                // Pass TraceDataCollector path to vstest.console as TestAdapterPath if --collect "Code Coverage"
-                // or --settings (User can enable code coverage from runsettings) option given.
-                // Not parsing the runsettings for two reason:
-                //    1. To keep no knowledge of runsettings structure in VSTestTask.
-                //    2. Impact of adding adapter path always is minimal. (worst case: loads additional data collector assembly in datacollector process.)
-                // This is required due to currently trace datacollector not ships with dotnet sdk, can be remove once we have
-                // go code coverage x-plat.
-                if (!string.IsNullOrEmpty(this.VSTestTraceDataCollectorDirectoryPath))
-                {
-                    allArgs.Add("--testAdapterPath:" +
-                                ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(this
-                                    .VSTestTraceDataCollectorDirectoryPath));
-                }
-                else
-                {
-                    if (isCollectCodeCoverageEnabled)
-                    {
-                        // Not showing message in runsettings scenario, because we are not sure that code coverage is enabled.
-                        // User might be using older Microsoft.NET.Test.Sdk which don't have CodeCoverage infra.
-                        Console.WriteLine(Resources.UpdateTestSdkForCollectingCodeCoverage);
-                    }
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(this.VSTestNoLogo))
-            {
-                allArgs.Add("--nologo");
-            }
-
-            return allArgs;
+            Tracing.Trace($"VSTest: Killing process throws ArgumentException with the following message {ex}. It may be that process is not running");
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs
new file mode 100644
index 0000000000..cbc866d928
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestTask2.cs
@@ -0,0 +1,363 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.TestPlatform.Build.Tasks;
+
+public class VSTestTask2 : ToolTask, ITestTask
+{
+    [Required]
+    public ITaskItem? TestFileFullPath { get; set; }
+    public string? VSTestSetting { get; set; }
+    public ITaskItem[]? VSTestTestAdapterPath { get; set; }
+    public string? VSTestFramework { get; set; }
+    public string? VSTestPlatform { get; set; }
+    public string? VSTestTestCaseFilter { get; set; }
+    public string[]? VSTestLogger { get; set; }
+    public bool VSTestListTests { get; set; }
+    public string? VSTestDiag { get; set; }
+    public string[]? VSTestCLIRunSettings { get; set; }
+    [Required]
+    public ITaskItem? VSTestConsolePath { get; set; }
+    public ITaskItem? VSTestResultsDirectory { get; set; }
+    public string? VSTestVerbosity { get; set; }
+    public string[]? VSTestCollect { get; set; }
+    public bool VSTestBlame { get; set; }
+    public bool VSTestBlameCrash { get; set; }
+    public string? VSTestBlameCrashDumpType { get; set; }
+    public bool VSTestBlameCrashCollectAlways { get; set; }
+    public bool VSTestBlameHang { get; set; }
+    public string? VSTestBlameHangDumpType { get; set; }
+    public string? VSTestBlameHangTimeout { get; set; }
+    public ITaskItem? VSTestTraceDataCollectorDirectoryPath { get; set; }
+    public bool VSTestNoLogo { get; set; } = true;
+    public string? VSTestArtifactsProcessingMode { get; set; }
+    public string? VSTestSessionCorrelationId { get; set; }
+
+    protected override Encoding StandardErrorEncoding => _disableUtf8ConsoleEncoding ? base.StandardErrorEncoding : Encoding.UTF8;
+    protected override Encoding StandardOutputEncoding => _disableUtf8ConsoleEncoding ? base.StandardOutputEncoding : Encoding.UTF8;
+
+    private readonly string _messageSplitter = "||||";
+    private readonly string[] _messageSplitterArray = ["||||"];
+    private readonly string _ansiReset = "\x1b[39;49m";
+
+    private readonly bool _disableUtf8ConsoleEncoding;
+    private readonly bool _canBePrependedWithAnsi;
+
+    protected override string? ToolName => RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dotnet.exe" : "dotnet";
+
+    public VSTestTask2()
+    {
+        // Unless user opted out, use UTF encoding, which we force in vstest.console.
+        _disableUtf8ConsoleEncoding = Environment.GetEnvironmentVariable("VSTEST_DISABLE_UTF8_CONSOLE_ENCODING") == "1";
+        var isPrependedWithAnsi = Environment.GetEnvironmentVariable("DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION");
+        // On macOS and Linux the messages are prepended with ANSI reset sequence.
+        _canBePrependedWithAnsi = isPrependedWithAnsi?.ToLowerInvariant() == "true" || isPrependedWithAnsi == "1";
+        LogStandardErrorAsError = false;
+        StandardOutputImportance = "High";
+    }
+
+    protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance)
+    {
+        var useTerminalLogger = true;
+        Debug.WriteLine($"VSTESTTASK2: Received output {singleLine}, importance {messageImportance}");
+        bool wasPrependedWithAnsi = false;
+
+        if (_canBePrependedWithAnsi)
+        {
+            while (singleLine.StartsWith(_ansiReset))
+            {
+                wasPrependedWithAnsi = true;
+                singleLine = singleLine.Substring(_ansiReset.Length);
+            }
+        }
+
+        if (TryGetMessage(singleLine, out string name, out string?[] data))
+        {
+            // See MSBuildLogger.cs for the messages produced.
+            switch (name)
+            {
+                // Forward the output we receive as messages.
+                case "output-info":
+                    if (data[0] != null)
+                    {
+                        // This is console output was prepended with ANSI reset, add it back.
+                        string info = wasPrependedWithAnsi ? _ansiReset + data[0]! : data[0]!;
+                        LogMSBuildOutputMessage(info);
+                    }
+                    break;
+                case "output-warning":
+                    Log.LogWarning(data[0]);
+                    break;
+                case "output-error":
+                    {
+                        // Downgrade errors to info messages, xUnit outputs every assertion failure and it confuses users who see doubled error count.
+                        // Libraries write to error output, and don't expect tests to fail.
+                        // Logs are often written to error stream as well.
+                        var error = data[0];
+                        LogMSBuildOutputMessage(error);
+
+                        break;
+                    }
+
+                case "run-cancel":
+                    // There is other overload that takes just message, and params, specifying the name of the first parameter explicitly so I don't
+                    // accidentally use it, because that will throw error when message is null, which it always is (We provide that null as first parameter).
+                    Log.LogError(subcategory: null, "TESTRUNCANCEL", null, TestFileFullPath?.ItemSpec ?? string.Empty, 0, 0, 0, 0, data[0]);
+                    break;
+                case "run-abort":
+                    // There is other overload that takes just message, and params, specifying the name of the first parameter explicitly so I don't
+                    // accidentally use it, because that will throw error when message is null, which it always is (We provide that null as first parameter).
+                    Log.LogError(subcategory: null, "TESTRUNABORT", null, TestFileFullPath?.ItemSpec ?? string.Empty, 0, 0, 0, 0, data[0]);
+                    break;
+                case "run-finish":
+                    // 0 - Localized summary
+                    // 1 - total tests
+                    // 2 - passed tests
+                    // 3 - skipped tests
+                    // 4 - failed tests
+                    // 5 - duration
+                    var summary = data[0];
+                    if (useTerminalLogger)
+                    {
+                        var message = new ExtendedBuildMessageEventArgs("TLTESTFINISH", summary, null, null, MessageImportance.High)
+                        {
+                            ExtendedMetadata = new Dictionary<string, string?>
+                            {
+                                ["total"] = data[1],
+                                ["passed"] = data[2],
+                                ["skipped"] = data[3],
+                                ["failed"] = data[4],
+                                ["duration"] = data[5],
+                            }
+                        };
+
+                        BuildEngine.LogMessageEvent(message);
+                    }
+                    else
+                    {
+                        Log.LogMessage(MessageImportance.Low, summary);
+                    }
+                    break;
+                case "test-passed":
+                    {
+                        // 0 - localized result indicator
+                        // 1 - display name
+                        // 2 - duration
+                        // 3 - outputs
+                        var indicator = data[0];
+                        var displayName = data[1];
+                        var duration = data[2];
+                        var outputs = data[3];
+
+                        double durationNumber = 0;
+                        _ = duration != null && double.TryParse(duration, out durationNumber);
+
+                        string? formattedDuration = GetFormattedDurationString(TimeSpan.FromMilliseconds(durationNumber));
+                        var testResultWithTime = !formattedDuration.IsNullOrEmpty() ? $"{indicator} {displayName} [{formattedDuration}]" : $"{indicator} {displayName}";
+                        var n = Environment.NewLine;
+
+                        var testPassed = StringUtils.IsNullOrWhiteSpace(outputs)
+                            ? testResultWithTime
+                            : $"{testResultWithTime}{n}Outputs:{n}{outputs}";
+
+                        if (useTerminalLogger)
+                        {
+                            var message = new ExtendedBuildMessageEventArgs("TLTESTPASSED", testPassed, null, null, MessageImportance.High)
+                            {
+                                ExtendedMetadata = new Dictionary<string, string?>
+                                {
+                                    ["localizedResult"] = data[0],
+                                    ["displayName"] = data[1],
+                                }
+                            };
+                            BuildEngine.LogMessageEvent(message);
+                        }
+                        else
+                        {
+                            Log.LogMessage(MessageImportance.Low, testPassed);
+                        }
+                    }
+                    break;
+                case "test-skipped":
+                    {
+                        // 0 - localized result indicator
+                        // 1 - display name
+                        var indicator = data[0];
+                        var displayName = data[1];
+
+                        var testSkipped = $"{indicator} {displayName}";
+                        if (useTerminalLogger)
+                        {
+                            var message = new ExtendedBuildMessageEventArgs("TLTESTSKIPPED", testSkipped, null, null, MessageImportance.High)
+                            {
+                                ExtendedMetadata = new Dictionary<string, string?>
+                                {
+                                    ["localizedResult"] = data[0],
+                                    ["displayName"] = data[1],
+                                }
+                            };
+                            BuildEngine.LogMessageEvent(message);
+                        }
+                        else
+                        {
+                            Log.LogMessage(MessageImportance.Low, testSkipped);
+                        }
+                    }
+                    break;
+                case "test-failed":
+                    {
+                        // 0 - full error
+                        // 1 - file
+                        // 2 - line
+                        var fullErrorMessage = data[0];
+                        var file = data[1];
+                        var line = data[2];
+                        _ = int.TryParse(line, out int lineNumber);
+
+                        file ??= string.Empty;
+
+                        // Report error to msbuild.
+                        Log.LogError(null, "TESTERROR", null, file ?? string.Empty, lineNumber, 0, 0, 0, fullErrorMessage, null);
+                    }
+                    break;
+                default:
+                    // If we get other message, forward it to binary log. In the future we can ignore this or remove the prefix, but now I want to see it.
+                    Log.LogMessage(MessageImportance.Low, $"Unhandled message: {singleLine}");
+                    break;
+            }
+        }
+        else
+        {
+            // We will receive output, such as vstest version, forward it to msbuild log.
+
+            // DO NOT call the base, it parses out the output, and if it sees "error" in any place it will log it as error
+            // we don't want this, we only want to log errors from the text messages we receive that start error splitter.
+            // base.LogEventsFromTextOutput(singleLine, messageImportance);
+            LogMSBuildOutputMessage(singleLine);
+        }
+    }
+
+    private void LogMSBuildOutputMessage(string? singleLine)
+    {
+
+        if (singleLine == null)
+        {
+            return;
+        }
+
+        var message = new ExtendedBuildMessageEventArgs("TLTESTOUTPUT", singleLine, null, null, MessageImportance.High);
+        BuildEngine.LogMessageEvent(message);
+    }
+
+    private bool TryGetMessage(string singleLine, out string name, out string?[] data)
+    {
+        if (singleLine.StartsWith(_messageSplitter))
+        {
+            var parts = singleLine.Split(_messageSplitterArray, StringSplitOptions.None);
+            name = parts[1];
+            data = parts.Skip(2).Take(parts.Length).Select(p => p?.Replace("~~~~", "\r").Replace("!!!!", "\n")).ToArray();
+            return true;
+        }
+
+        name = string.Empty;
+        data = [];
+        return false;
+    }
+
+    protected override string? GenerateCommandLineCommands()
+    {
+        return TestTaskUtils.CreateCommandLineArguments(this);
+    }
+
+    protected override string? GenerateFullPathToTool()
+    {
+        if (!ToolPath.IsNullOrEmpty())
+        {
+            return Path.Combine(Path.GetDirectoryName(Path.GetFullPath(ToolPath))!, ToolExe);
+        }
+
+        //TODO: https://github.com/dotnet/sdk/issues/20 Need to get the dotnet path from MSBuild?
+
+        var dhp = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH");
+        if (!dhp.IsNullOrEmpty())
+        {
+            var path = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(dhp))!, ToolExe);
+            if (File.Exists(path))
+            {
+                return path;
+            }
+        }
+
+        if (File.Exists(ToolExe))
+        {
+            return Path.GetFullPath(ToolExe);
+        }
+
+        var values = Environment.GetEnvironmentVariable("PATH");
+        foreach (var p in values!.Split(Path.PathSeparator))
+        {
+            var fullPath = Path.Combine(p, ToolExe);
+            if (File.Exists(fullPath))
+                return fullPath;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Converts the time span format to readable string.
+    /// </summary>
+    /// <param name="duration"></param>
+    /// <returns></returns>
+    internal static string? GetFormattedDurationString(TimeSpan duration)
+    {
+        if (duration == default)
+        {
+            return null;
+        }
+
+        var time = new List<string>();
+        if (duration.Days > 0)
+        {
+            time.Add("> 1d");
+        }
+        else
+        {
+            if (duration.Hours > 0)
+            {
+                time.Add(duration.Hours + "h");
+            }
+
+            if (duration.Minutes > 0)
+            {
+                time.Add(duration.Minutes + "m");
+            }
+
+            if (duration.Hours == 0)
+            {
+                if (duration.Seconds > 0)
+                {
+                    time.Add(duration.Seconds + "s");
+                }
+
+                if (duration.Milliseconds > 0 && duration.Minutes == 0)
+                {
+                    time.Add(duration.Milliseconds + "ms");
+                }
+            }
+        }
+
+        return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Build/Tracing.cs b/src/Microsoft.TestPlatform.Build/Tracing.cs
index 55d024c672..1cb8b3f8e6 100644
--- a/src/Microsoft.TestPlatform.Build/Tracing.cs
+++ b/src/Microsoft.TestPlatform.Build/Tracing.cs
@@ -1,17 +1,21 @@
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System;
 
-namespace Microsoft.TestPlatform.Build.Trace
+namespace Microsoft.TestPlatform.Build.Trace;
+
+public static class Tracing
 {
-    public static class Tracing
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Part of the public API.")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "Part of the public API.")]
+    public static bool traceEnabled = false;
+
+    public static void Trace(string message)
     {
-        public static bool traceEnabled = false;
-        public static void Trace(string message)
+        if (traceEnabled)
         {
-            if (traceEnabled)
-            {
-                Console.WriteLine(message);
-            }
+            Console.WriteLine(message);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/InProcessTestRunAttachmentsProcessingEventsHandler.cs b/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/InProcessTestRunAttachmentsProcessingEventsHandler.cs
new file mode 100644
index 0000000000..9ed09aac7b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/InProcessTestRunAttachmentsProcessingEventsHandler.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client;
+
+internal class InProcessTestRunAttachmentsProcessingEventsHandler : ITestRunAttachmentsProcessingEventsHandler
+{
+    private readonly ITestRunAttachmentsProcessingEventsHandler _eventsHandler;
+
+    public InProcessTestRunAttachmentsProcessingEventsHandler(
+        ITestRunAttachmentsProcessingEventsHandler eventsHandler)
+    {
+        _eventsHandler = eventsHandler;
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _eventsHandler.HandleLogMessage(level, message);
+    }
+
+    public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
+    {
+        // Not implemented by design, keep in sync with the same named method from
+        // TestRunAttachmentsProcessingEventsHandler.cs.
+        throw new NotImplementedException();
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-op by design.
+        //
+        // For out-of-process vstest.console, raw messages are passed to the translation layer but
+        // they are never read and don't get passed to the actual events handler in TW. If they
+        // were (as it happens for in-process vstest.console since there is no more translation
+        // layer) a NotImplemented exception would be raised as per the time this of writing this
+        // note.
+        //
+        // Consider changing this logic in the future if TW changes the handling logic for raw
+        // messages.
+    }
+
+    public void HandleTestRunAttachmentsProcessingComplete(
+        TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs,
+        IEnumerable<AttachmentSet>? lastChunk)
+    {
+        _eventsHandler.HandleTestRunAttachmentsProcessingComplete(
+            attachmentsProcessingCompleteEventArgs,
+            lastChunk);
+    }
+
+    public void HandleTestRunAttachmentsProcessingProgress(
+        TestRunAttachmentsProcessingProgressEventArgs attachmentsProcessingProgressEventArgs)
+    {
+        _eventsHandler.HandleTestRunAttachmentsProcessingProgress(
+            attachmentsProcessingProgressEventArgs);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandler.cs b/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandler.cs
index 6bceff7f24..bc7b100d52 100644
--- a/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.Client/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandler.cs
@@ -1,77 +1,74 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
+
+/// <summary>
+/// The test run attachments processing events handler.
+/// </summary>
+///
+public class TestRunAttachmentsProcessingEventsHandler : ITestRunAttachmentsProcessingEventsHandler
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using System.Collections.Generic;
+    private readonly ICommunicationManager _communicationManager;
 
     /// <summary>
-    /// The test run attachments processing events handler.
+    /// Initializes a new instance of the <see cref="TestRunAttachmentsProcessingEventsHandler"/> class.
     /// </summary>
-    /// 
-    public class TestRunAttachmentsProcessingEventsHandler : ITestRunAttachmentsProcessingEventsHandler
+    /// <param name="communicationManager"> The communication manager. </param>
+    public TestRunAttachmentsProcessingEventsHandler(ICommunicationManager communicationManager)
     {
-        private readonly ICommunicationManager communicationManager;
+        _communicationManager = communicationManager;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunAttachmentsProcessingEventsHandler"/> class.
-        /// </summary>
-        /// <param name="communicationManager"> The communication manager. </param>
-        public TestRunAttachmentsProcessingEventsHandler(ICommunicationManager communicationManager)
-        {
-            this.communicationManager = communicationManager;
-        }
+    /// <inheritdoc/>
+    public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet>? lastChunk)
+    {
+        EqtTrace.Info("Test run attachments processing completed.");
 
-        /// <inheritdoc/>
-        public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk)
+        var payload = new TestRunAttachmentsProcessingCompletePayload
         {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Test run attachments processing completed.");
-            }
-
-            var payload = new TestRunAttachmentsProcessingCompletePayload()
-            {
-                AttachmentsProcessingCompleteEventArgs = attachmentsProcessingCompleteEventArgs,
-                Attachments = lastChunk
-            };
+            AttachmentsProcessingCompleteEventArgs = attachmentsProcessingCompleteEventArgs,
+            Attachments = lastChunk
+        };
 
-            this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
-        }
+        _communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
+    }
 
-        /// <inheritdoc/>
-        public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs attachmentsProcessingProgressEventArgs)
+    /// <inheritdoc/>
+    public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs attachmentsProcessingProgressEventArgs)
+    {
+        var payload = new TestRunAttachmentsProcessingProgressPayload()
         {
-            var payload = new TestRunAttachmentsProcessingProgressPayload()
-            {
-                AttachmentsProcessingProgressEventArgs = attachmentsProcessingProgressEventArgs,
-            };
+            AttachmentsProcessingProgressEventArgs = attachmentsProcessingProgressEventArgs,
+        };
 
-            this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingProgress, payload);
-        }
+        _communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingProgress, payload);
+    }
 
-        /// <inheritdoc/>
-        public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
-        {
-            throw new System.NotImplementedException();
-        }
+    /// <inheritdoc/>
+    public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
+    {
+        throw new System.NotImplementedException();
+    }
 
-        /// <inheritdoc/>
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            var testMessagePayload = new TestMessagePayload { MessageLevel = level, Message = message };
-            this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
-        }
+    /// <inheritdoc/>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        var testMessagePayload = new TestMessagePayload { MessageLevel = level, Message = message };
+        _communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
+    }
 
-        /// <inheritdoc/>
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No-Op
-        }
+    /// <inheritdoc/>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-Op
     }
 }
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
index 31812dacfa..f64f20374e 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
@@ -1,598 +1,687 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+
+/// <summary>
+/// The design mode client, which listens inside of vstest.console when we are running in server mode (e.g. under an IDE like VS), and proceses
+/// the incoming requests. See <see cref="ProcessRequests"/> for how the requests are received, and for example <see cref="StartTestRun"/>
+/// for how a single request is handled, and a result is sent back to the IDE or other consumer.
+/// </summary>
+public class DesignModeClient : IDesignModeClient
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    using CommunicationUtilitiesResources = CommunicationUtilities.Resources.Resources;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly ProtocolConfig _protocolConfig = Constants.DefaultProtocolConfig;
+    private readonly IEnvironment _platformEnvironment;
+    private readonly TestSessionMessageLogger _testSessionMessageLogger;
+    private readonly bool _forwardOutput;
+    private readonly object _lockObject = new();
+    [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Part of the public API.")]
+    [SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Part of the public API")]
+    protected Action<Message>? onCustomTestHostLaunchAckReceived;
+    [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Part of the public API.")]
+    [SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Part of the public API")]
+    protected Action<Message>? onAttachDebuggerAckRecieved;
 
     /// <summary>
-    /// The design mode client.
+    /// Initializes a new instance of the <see cref="DesignModeClient"/> class.
     /// </summary>
-    public class DesignModeClient : IDesignModeClient
+    public DesignModeClient()
+        : this(new SocketCommunicationManager(), JsonDataSerializer.Instance, new PlatformEnvironment())
     {
-        private readonly ICommunicationManager communicationManager;
-        private readonly IDataSerializer dataSerializer;
-
-        private ProtocolConfig protocolConfig = ObjectModel.Constants.DefaultProtocolConfig;
-        private IEnvironment platformEnvironment;
-        private TestSessionMessageLogger testSessionMessageLogger;
-        private object lockObject = new object();
-
-        protected Action<Message> onCustomTestHostLaunchAckReceived;
-        protected Action<Message> onAttachDebuggerAckRecieved;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignModeClient"/> class.
-        /// </summary>
-        public DesignModeClient()
-            : this(new SocketCommunicationManager(), JsonDataSerializer.Instance, new PlatformEnvironment())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignModeClient"/> class.
-        /// </summary>
-        /// <param name="communicationManager">
-        /// The communication manager.
-        /// </param>
-        /// <param name="dataSerializer">
-        /// The data Serializer.
-        /// </param>
-        /// <param name="platformEnvironment">
-        /// The platform Environment
-        /// </param>
-        internal DesignModeClient(ICommunicationManager communicationManager, IDataSerializer dataSerializer, IEnvironment platformEnvironment)
-        {
-            this.communicationManager = communicationManager;
-            this.dataSerializer = dataSerializer;
-            this.platformEnvironment = platformEnvironment;
-            this.testSessionMessageLogger = TestSessionMessageLogger.Instance;
-            this.testSessionMessageLogger.TestRunMessage += this.TestRunMessageHandler;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DesignModeClient"/> class.
+    /// </summary>
+    /// <param name="communicationManager">
+    /// The communication manager.
+    /// </param>
+    /// <param name="dataSerializer">
+    /// The data Serializer.
+    /// </param>
+    /// <param name="platformEnvironment">
+    /// The platform Environment
+    /// </param>
+    internal DesignModeClient(ICommunicationManager communicationManager, IDataSerializer dataSerializer, IEnvironment platformEnvironment)
+    {
+        _communicationManager = communicationManager;
+        _dataSerializer = dataSerializer;
+        _platformEnvironment = platformEnvironment;
+        _testSessionMessageLogger = TestSessionMessageLogger.Instance;
+        _forwardOutput = !FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING);
+        _testSessionMessageLogger.TestRunMessage += TestRunMessageHandler;
+    }
 
-        /// <summary>
-        /// Property exposing the Instance
-        /// </summary>
-        public static IDesignModeClient Instance { get; private set; }
+    /// <summary>
+    /// Property exposing the Instance
+    /// </summary>
+    public static DesignModeClient? Instance { get; private set; }
 
-        /// <summary>
-        /// Initializes DesignMode
-        /// </summary>
-        public static void Initialize()
-        {
-            Instance = new DesignModeClient();
-        }
+    /// <summary>
+    /// Gets the test request manager.
+    /// </summary>
+    public ITestRequestManager? TestRequestManager { get; internal set; }
 
-        /// <summary>
-        /// Creates a client and waits for server to accept connection asynchronously
-        /// </summary>
-        /// <param name="port">
-        /// Port number to connect
-        /// </param>
-        /// <param name="testRequestManager">
-        /// The test Request Manager.
-        /// </param>
-        public void ConnectToClientAndProcessRequests(int port, ITestRequestManager testRequestManager)
-        {
-            EqtTrace.Info("Trying to connect to server on port : {0}", port);
-            this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+    /// <summary>
+    /// Initializes DesignMode
+    /// </summary>
+    [MemberNotNull(nameof(Instance))]
+    public static void Initialize()
+    {
+        Instance = new DesignModeClient();
+    }
 
-            var connectionTimeoutInSecs = EnvironmentHelper.GetConnectionTimeout();
+    /// <summary>
+    /// Creates a client and waits for server to accept connection asynchronously
+    /// </summary>
+    /// <param name="port">
+    /// Port number to connect
+    /// </param>
+    /// <param name="testRequestManager">
+    /// The test Request Manager.
+    /// </param>
+    public void ConnectToClientAndProcessRequests(int port, ITestRequestManager testRequestManager)
+    {
+        // Used by the in-process vstest.console wrapper.
+        TestRequestManager = testRequestManager;
 
-            // Wait for the connection to the server and listen for requests.
-            if (this.communicationManager.WaitForServerConnection(connectionTimeoutInSecs * 1000))
-            {
-                this.communicationManager.SendMessage(MessageType.SessionConnected);
-                this.ProcessRequests(testRequestManager);
-            }
-            else
-            {
-                EqtTrace.Error("DesignModeClient : ConnectToClientAndProcessRequests : Client timed out while connecting to the server.");
-                this.Dispose();
-                throw new TimeoutException(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                        CoreUtilities.Constants.VstestConsoleProcessName,
-                        "translation layer",
-                        connectionTimeoutInSecs,
-                        EnvironmentHelper.VstestConnectionTimeout)
-                    );
-            }
-        }
+        EqtTrace.Info("Trying to connect to server on port : {0}", port);
+        _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+
+        var connectionTimeoutInSecs = EnvironmentHelper.GetConnectionTimeout();
 
-        public void HandleParentProcessExit()
+        // Wait for the connection to the server and listen for requests.
+        if (_communicationManager.WaitForServerConnection(connectionTimeoutInSecs * 1000))
+        {
+            _communicationManager.SendMessage(MessageType.SessionConnected);
+            ProcessRequests(testRequestManager);
+        }
+        else
         {
-            // Dispose off the communications to end the session
-            // this should end the "ProcessRequests" loop with an exception
-            this.Dispose();
+            EqtTrace.Error("DesignModeClient.ConnectToClientAndProcessRequests: Client timed out while connecting to the server.");
+            Dispose();
+            throw new TimeoutException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                    CoreUtilities.Constants.VstestConsoleProcessName,
+                    "translation layer",
+                    connectionTimeoutInSecs,
+                    EnvironmentHelper.VstestConnectionTimeout)
+            );
+        }
+    }
+
+    public void HandleParentProcessExit()
+    {
+        // Dispose off the communications to end the session
+        // this should end the "ProcessRequests" loop with an exception
+        Dispose();
 
-            EqtTrace.Info("DesignModeClient: Parent process exited, Exiting myself..");
+        EqtTrace.Info("DesignModeClient.HandleParentProcessExit: Parent process exited, Exiting myself...");
 
-            this.platformEnvironment.Exit(1);
-        }
+        _platformEnvironment.Exit(1);
+    }
 
-        /// <summary>
-        /// Process Requests from the IDE
-        /// </summary>
-        /// <param name="testRequestManager">
-        /// The test Request Manager.
-        /// </param>
-        private void ProcessRequests(ITestRequestManager testRequestManager)
-        {
-            var isSessionEnd = false;
+    /// <summary>
+    /// Process Requests from the IDE
+    /// </summary>
+    /// <param name="testRequestManager">
+    /// The test Request Manager.
+    /// </param>
+    private void ProcessRequests(ITestRequestManager testRequestManager)
+    {
+        var isSessionEnd = false;
 
-            do
+        do
+        {
+            try
             {
-                try
-                {
-                    var message = this.communicationManager.ReceiveMessage();
+                var message = _communicationManager.ReceiveMessage();
 
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Info("DesignModeClient.ProcessRequests: Processing Message: {0}", message);
-                    }
+                EqtTrace.Info("DesignModeClient.ProcessRequests: Processing Message: {0}", message);
 
-                    switch (message.MessageType)
-                    {
-                        case MessageType.VersionCheck:
-                            {
-                                var version = this.dataSerializer.DeserializePayload<int>(message);
-                                this.protocolConfig.Version = Math.Min(version, this.protocolConfig.Version);
-                                this.communicationManager.SendMessage(MessageType.VersionCheck, this.protocolConfig.Version);
-                                break;
-                            }
+                switch (message?.MessageType)
+                {
+                    case MessageType.VersionCheck:
+                        {
+                            var version = _dataSerializer.DeserializePayload<int>(message);
+                            _protocolConfig.Version = Math.Min(version, _protocolConfig.Version);
+                            _communicationManager.SendMessage(MessageType.VersionCheck, _protocolConfig.Version);
+                            break;
+                        }
 
-                        case MessageType.ExtensionsInitialize:
-                            {
-                                // Do not filter the Editor/IDE provided extensions by name
-                                var extensionPaths = this.communicationManager.DeserializePayload<IEnumerable<string>>(message);
-                                testRequestManager.InitializeExtensions(extensionPaths, skipExtensionFilters: true);
-                                break;
-                            }
+                    case MessageType.ExtensionsInitialize:
+                        {
+                            // Do not filter the Editor/IDE provided extensions by name
+                            var extensionPaths = _communicationManager.DeserializePayload<IEnumerable<string>>(message);
+                            testRequestManager.InitializeExtensions(extensionPaths, skipExtensionFilters: true);
+                            break;
+                        }
 
-                        case MessageType.StartTestSession:
-                            {
-                                var testSessionPayload = this.communicationManager.DeserializePayload<StartTestSessionPayload>(message);
-                                this.StartTestSession(testSessionPayload, testRequestManager);
-                                break;
-                            }
+                    case MessageType.StartTestSession:
+                        {
+                            var testSessionPayload = _communicationManager.DeserializePayload<StartTestSessionPayload>(message);
+                            StartTestSession(testSessionPayload, testRequestManager);
+                            break;
+                        }
 
-                        case MessageType.StopTestSession:
-                            {
-                                var testSessionInfo = this.communicationManager.DeserializePayload<TestSessionInfo>(message);
-                                this.StopTestSession(testSessionInfo);
-                                break;
-                            }
+                    case MessageType.StopTestSession:
+                        {
+                            var testSessionPayload = _communicationManager.DeserializePayload<StopTestSessionPayload>(message);
+                            StopTestSession(testSessionPayload, testRequestManager);
+                            break;
+                        }
 
-                        case MessageType.StartDiscovery:
-                            {
-                                var discoveryPayload = this.dataSerializer.DeserializePayload<DiscoveryRequestPayload>(message);
-                                this.StartDiscovery(discoveryPayload, testRequestManager);
-                                break;
-                            }
+                    case MessageType.StartDiscovery:
+                        {
+                            var discoveryPayload = _dataSerializer.DeserializePayload<DiscoveryRequestPayload>(message);
+                            StartDiscovery(discoveryPayload, testRequestManager);
+                            break;
+                        }
 
-                        case MessageType.GetTestRunnerProcessStartInfoForRunAll:
-                        case MessageType.GetTestRunnerProcessStartInfoForRunSelected:
-                            {
-                                var testRunPayload =
-                                    this.communicationManager.DeserializePayload<TestRunRequestPayload>(
-                                        message);
-                                this.StartTestRun(testRunPayload, testRequestManager, shouldLaunchTesthost: true);
-                                break;
-                            }
+                    case MessageType.GetTestRunnerProcessStartInfoForRunAll:
+                    case MessageType.GetTestRunnerProcessStartInfoForRunSelected:
+                        {
+                            var testRunPayload = _communicationManager.DeserializePayload<TestRunRequestPayload>(message);
+                            StartTestRun(testRunPayload, testRequestManager, shouldLaunchTesthost: true);
+                            break;
+                        }
 
-                        case MessageType.TestRunAllSourcesWithDefaultHost:
-                        case MessageType.TestRunSelectedTestCasesDefaultHost:
-                            {
-                                var testRunPayload =
-                                    this.communicationManager.DeserializePayload<TestRunRequestPayload>(
-                                        message);
-                                this.StartTestRun(testRunPayload, testRequestManager, shouldLaunchTesthost: false);
-                                break;
-                            }
+                    case MessageType.TestRunAllSourcesWithDefaultHost:
+                    case MessageType.TestRunSelectedTestCasesDefaultHost:
+                        {
+                            var testRunPayload = _communicationManager.DeserializePayload<TestRunRequestPayload>(message);
+                            StartTestRun(testRunPayload, testRequestManager, shouldLaunchTesthost: false);
+                            break;
+                        }
 
-                        case MessageType.TestRunAttachmentsProcessingStart:
-                            {
-                                var testRunAttachmentsProcessingPayload =
-                                    this.communicationManager.DeserializePayload<TestRunAttachmentsProcessingPayload>(message);
-                                this.StartTestRunAttachmentsProcessing(testRunAttachmentsProcessingPayload, testRequestManager);
-                                break;
-                            }
+                    case MessageType.TestRunAttachmentsProcessingStart:
+                        {
+                            var testRunAttachmentsProcessingPayload = _communicationManager.DeserializePayload<TestRunAttachmentsProcessingPayload>(message);
+                            StartTestRunAttachmentsProcessing(testRunAttachmentsProcessingPayload, testRequestManager);
+                            break;
+                        }
 
-                        case MessageType.CancelDiscovery:
-                            {
-                                testRequestManager.CancelDiscovery();
-                                break;
-                            }
+                    case MessageType.CancelDiscovery:
+                        {
+                            testRequestManager.CancelDiscovery();
+                            break;
+                        }
 
-                        case MessageType.CancelTestRun:
-                            {
-                                testRequestManager.CancelTestRun();
-                                break;
-                            }
+                    case MessageType.CancelTestRun:
+                        {
+                            testRequestManager.CancelTestRun();
+                            break;
+                        }
 
-                        case MessageType.AbortTestRun:
-                            {
-                                testRequestManager.AbortTestRun();
-                                break;
-                            }
+                    case MessageType.AbortTestRun:
+                        {
+                            testRequestManager.AbortTestRun();
+                            break;
+                        }
 
-                        case MessageType.TestRunAttachmentsProcessingCancel:
-                            {
-                                testRequestManager.CancelTestRunAttachmentsProcessing();
-                                break;
-                            }
+                    case MessageType.TestRunAttachmentsProcessingCancel:
+                        {
+                            testRequestManager.CancelTestRunAttachmentsProcessing();
+                            break;
+                        }
 
-                        case MessageType.CustomTestHostLaunchCallback:
-                            {
-                                this.onCustomTestHostLaunchAckReceived?.Invoke(message);
-                                break;
-                            }
+                    case MessageType.CustomTestHostLaunchCallback:
+                        {
+                            onCustomTestHostLaunchAckReceived?.Invoke(message);
+                            break;
+                        }
 
-                        case MessageType.EditorAttachDebuggerCallback:
-                            {
-                                this.onAttachDebuggerAckRecieved?.Invoke(message);
-                                break;
-                            }
+                    case MessageType.EditorAttachDebuggerCallback:
+                        {
+                            onAttachDebuggerAckRecieved?.Invoke(message);
+                            break;
+                        }
 
-                        case MessageType.SessionEnd:
-                            {
-                                EqtTrace.Info("DesignModeClient: Session End message received from server. Closing the connection.");
-                                isSessionEnd = true;
-                                this.Dispose();
-                                break;
-                            }
+                    case MessageType.SessionEnd:
+                        {
+                            EqtTrace.Info("DesignModeClient: Session End message received from server. Closing the connection.");
+                            isSessionEnd = true;
+                            Dispose();
+                            break;
+                        }
 
-                        default:
+                    default:
+                        {
+                            EqtTrace.Info("DesignModeClient: Invalid Message received: {0}", message);
+                            if (message is null)
                             {
-                                EqtTrace.Info("DesignModeClient: Invalid Message received: {0}", message);
-                                break;
+                                Stop();
                             }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("DesignModeClient: Error processing request: {0}", ex);
-                    isSessionEnd = true;
-                    this.Dispose();
+                            break;
+                        }
                 }
             }
-            while (!isSessionEnd);
+            catch (Exception ex)
+            {
+                EqtTrace.Error("DesignModeClient: Error processing request: {0}", ex);
+                Stop();
+            }
         }
+        while (!isSessionEnd);
 
-        /// <summary>
-        /// Send a custom host launch message to IDE
-        /// </summary>
-        /// <param name="testProcessStartInfo">
-        /// The test Process Start Info.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The cancellation token.
-        /// </param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public int LaunchCustomHost(TestProcessStartInfo testProcessStartInfo, CancellationToken cancellationToken)
+        void Stop()
         {
-            lock (this.lockObject)
+            isSessionEnd = true;
+            Dispose();
+        }
+    }
+
+    /// <summary>
+    /// Send a custom host launch message to IDE
+    /// </summary>
+    /// <param name="testProcessStartInfo">
+    /// The test Process Start Info.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// The cancellation token.
+    /// </param>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public int LaunchCustomHost(TestProcessStartInfo testProcessStartInfo, CancellationToken cancellationToken)
+    {
+        lock (_lockObject)
+        {
+            var waitHandle = new AutoResetEvent(false);
+            Message? ackMessage = null;
+            onCustomTestHostLaunchAckReceived = (ackRawMessage) =>
             {
-                var waitHandle = new AutoResetEvent(false);
-                Message ackMessage = null;
-                this.onCustomTestHostLaunchAckReceived = (ackRawMessage) =>
-                {
-                    ackMessage = ackRawMessage;
-                    waitHandle.Set();
-                };
+                ackMessage = ackRawMessage;
+                waitHandle.Set();
+            };
 
-                this.communicationManager.SendMessage(MessageType.CustomTestHostLaunch, testProcessStartInfo);
+            _communicationManager.SendMessage(MessageType.CustomTestHostLaunch, testProcessStartInfo);
 
-                // LifeCycle of the TP through DesignModeClient is maintained by the IDEs or user-facing-clients like LUTs, who call TestPlatform
-                // TP is handing over the control of launch to these IDEs and so, TP has to wait indefinite
-                // Even if TP has a timeout here, there is no way TP can abort or stop the thread/task that is hung in IDE or LUT
-                // Even if TP can abort the API somehow, TP is essentially putting IDEs or Clients in inconsistent state without having info on
-                // Since the IDEs own user-UI-experience here, TP will let the custom host launch as much time as IDEs define it for their users
-                WaitHandle.WaitAny(new WaitHandle[] { waitHandle, cancellationToken.WaitHandle });
+            // LifeCycle of the TP through DesignModeClient is maintained by the IDEs or user-facing-clients like LUTs, who call TestPlatform
+            // TP is handing over the control of launch to these IDEs and so, TP has to wait indefinite
+            // Even if TP has a timeout here, there is no way TP can abort or stop the thread/task that is hung in IDE or LUT
+            // Even if TP can abort the API somehow, TP is essentially putting IDEs or Clients in inconsistent state without having info on
+            // Since the IDEs own user-UI-experience here, TP will let the custom host launch as much time as IDEs define it for their users
+            WaitHandle.WaitAny([waitHandle, cancellationToken.WaitHandle]);
 
-                cancellationToken.ThrowTestPlatformExceptionIfCancellationRequested();
+            cancellationToken.ThrowTestPlatformExceptionIfCancellationRequested();
 
-                this.onCustomTestHostLaunchAckReceived = null;
+            onCustomTestHostLaunchAckReceived = null;
 
-                var ackPayload = this.dataSerializer.DeserializePayload<CustomHostLaunchAckPayload>(ackMessage);
+            TPDebug.Assert(ackMessage is not null, "ackMessage is null");
+            var ackPayload = _dataSerializer.DeserializePayload<CustomHostLaunchAckPayload>(ackMessage);
+            TPDebug.Assert(ackPayload is not null, "ackPayload is null");
 
-                if (ackPayload.HostProcessId > 0)
-                {
-                    return ackPayload.HostProcessId;
-                }
-                else
-                {
-                    throw new TestPlatformException(ackPayload.ErrorMessage);
-                }
-            }
+            return ackPayload.HostProcessId > 0 ? ackPayload.HostProcessId : throw new TestPlatformException(ackPayload.ErrorMessage);
+        }
+    }
+
+    /// <inheritdoc/>
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo, CancellationToken cancellationToken)
+    {
+        // If an attach request is issued but there is no support for attaching on the other
+        // side of the communication channel, we simply return and let the caller know the
+        // request failed.
+        if (_protocolConfig.Version < ObjectModel.Constants.MinimumProtocolVersionWithDebugSupport)
+        {
+            return false;
         }
 
-        /// <inheritdoc/>
-        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+        lock (_lockObject)
         {
-            // If an attach request is issued but there is no support for attaching on the other
-            // side of the communication channel, we simply return and let the caller know the
-            // request failed.
-            if (this.protocolConfig.Version < ObjectModel.Constants.MinimumProtocolVersionWithDebugSupport)
+            var waitHandle = new AutoResetEvent(false);
+            Message? ackMessage = null;
+            onAttachDebuggerAckRecieved = ackRawMessage =>
             {
-                return false;
+                ackMessage = ackRawMessage;
+                waitHandle.Set();
+            };
+
+            // TODO: formalize this so we can the deprecation version from the message data, and automatically switch
+            // to the new message, including type safety, where we determine T from the payload. And maybe give SendMessage
+            // a type of T as well to prevent some more mistakes.
+            if (_protocolConfig.Version < 7)
+            {
+                _communicationManager.SendMessage(MessageType.EditorAttachDebugger, attachDebuggerInfo.ProcessId, _protocolConfig.Version);
             }
-
-            lock (this.lockObject)
+            else
             {
-                var waitHandle = new AutoResetEvent(false);
-                Message ackMessage = null;
-                this.onAttachDebuggerAckRecieved = (ackRawMessage) =>
+                var payload = new EditorAttachDebuggerPayload
                 {
-                    ackMessage = ackRawMessage;
-                    waitHandle.Set();
+                    Sources = attachDebuggerInfo.Sources,
+                    TargetFramework = attachDebuggerInfo.TargetFramework?.ToString(),
+                    ProcessID = attachDebuggerInfo.ProcessId,
                 };
+                _communicationManager.SendMessage(MessageType.EditorAttachDebugger2, payload);
+            }
 
-                this.communicationManager.SendMessage(MessageType.EditorAttachDebugger, pid);
-
-                WaitHandle.WaitAny(new WaitHandle[] { waitHandle, cancellationToken.WaitHandle });
+            WaitHandle.WaitAny([waitHandle, cancellationToken.WaitHandle]);
 
-                cancellationToken.ThrowTestPlatformExceptionIfCancellationRequested();
-                this.onAttachDebuggerAckRecieved = null;
+            cancellationToken.ThrowTestPlatformExceptionIfCancellationRequested();
+            onAttachDebuggerAckRecieved = null;
 
-                var ackPayload = this.dataSerializer.DeserializePayload<EditorAttachDebuggerAckPayload>(ackMessage);
-                if (!ackPayload.Attached)
-                {
-                    EqtTrace.Warning(ackPayload.ErrorMessage);
-                }
-
-                return ackPayload.Attached;
+            TPDebug.Assert(ackMessage is not null, "ackMessage is null");
+            var ackPayload = _dataSerializer.DeserializePayload<EditorAttachDebuggerAckPayload>(ackMessage);
+            TPDebug.Assert(ackPayload is not null, "ackPayload is null");
+            if (!ackPayload.Attached)
+            {
+                EqtTrace.Warning($"DesignModeClient.AttachDebuggerToProcess: Attaching to process failed: {ackPayload.ErrorMessage}");
             }
-        }
 
-        /// <summary>
-        /// Send the raw messages to IDE
-        /// </summary>
-        /// <param name="rawMessage"></param>
-        public void SendRawMessage(string rawMessage)
-        {
-            this.communicationManager.SendRawMessage(rawMessage);
+            return ackPayload.Attached;
         }
+    }
+
+    /// <summary>
+    /// Send the raw messages to IDE
+    /// </summary>
+    /// <param name="rawMessage"></param>
+    public void SendRawMessage(string rawMessage)
+    {
+        _communicationManager.SendRawMessage(rawMessage);
+    }
 
-        /// <inheritdoc />
-        public void SendTestMessage(TestMessageLevel level, string message)
+    /// <inheritdoc />
+    public void SendTestMessage(TestMessageLevel level, string? message)
+    {
+        var payload = new TestMessagePayload { MessageLevel = level, Message = message };
+        _communicationManager.SendMessage(MessageType.TestMessage, payload);
+    }
+
+    /// <summary>
+    /// Sends the test session logger warning and error messages to IDE;
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void TestRunMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        // save into trace log and send the message to the IDE
+        //
+        // there is a mismatch between log levels that VS uses and that TP
+        // uses. In VS you can choose Trace level which will enable Test platform
+        // logs on Verbose level. Below we report Errors and warnings always to the
+        // IDE no matter what the level of VS logging is, but Info only when the Eqt trace
+        // info level is enabled (so only when VS enables Trace logging)
+        switch (e.Level)
         {
-            var payload = new TestMessagePayload { MessageLevel = level, Message = message };
-            this.communicationManager.SendMessage(MessageType.TestMessage, payload);
+            case TestMessageLevel.Error:
+                EqtTrace.Error(e.Message);
+                SendTestMessage(e.Level, e.Message);
+                break;
+            case TestMessageLevel.Warning:
+                EqtTrace.Warning(e.Message);
+                SendTestMessage(e.Level, e.Message);
+                break;
+
+            case TestMessageLevel.Informational:
+                EqtTrace.Info(e.Message);
+
+                // When forwarding output we need to allow Info messages that originate from this process (or more precisely from the IMessageLogger that we
+                // are observing, but we don't have an easy way to tell apart "output" and non-output info messages. So when output forwarding is enabled
+                // we forward any informational message. This is okay, because in worst case we will send few more messages forward that are not output.
+                // And that is fine, because any adapter has access to SendMessage(MessageLevel.Informational,...) which we don't filter anywhere (it is passed
+                // as a raw message and forwarded to VS), so any adapter can spam the Tests output in VS as it wants.
+                if (_forwardOutput || EqtTrace.IsInfoEnabled)
+                {
+                    SendTestMessage(e.Level, e.Message);
+                }
+                break;
+
+
+            default:
+                throw new NotSupportedException($"Test message level '{e.Level}' is not supported.");
         }
+    }
 
-        /// <summary>
-        /// Sends the test session logger warning and error messages to IDE; 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void TestRunMessageHandler(object sender, TestRunMessageEventArgs e)
+    private void StartTestRun(TestRunRequestPayload? testRunPayload, ITestRequestManager testRequestManager, bool shouldLaunchTesthost)
+    {
+        Task.Run(() =>
         {
-            // save into trace log and send the message to the IDE
-            //
-            // there is a mismatch between log levels that VS uses and that TP
-            // uses. In VS you can choose Trace level which will enable Test platform
-            // logs on Verbose level. Below we report Errors and warnings always to the 
-            // IDE no matter what the level of VS logging is, but Info only when the Eqt trace 
-            // info level is enabled (so only when VS enables Trace logging)
-            switch (e.Level)
+            try
             {
-                case TestMessageLevel.Error:
-                    EqtTrace.Error(e.Message);
-                    SendTestMessage(e.Level, e.Message);
-                    break;
-                case TestMessageLevel.Warning:
-                    EqtTrace.Warning(e.Message);
-                    SendTestMessage(e.Level, e.Message);
-                    break;
+                testRequestManager.ResetOptions();
 
-                case TestMessageLevel.Informational:
-                    EqtTrace.Info(e.Message);
+                if (testRunPayload is null)
+                {
+                    OnError(null);
+                    return;
+                }
 
-                    if (EqtTrace.IsInfoEnabled)
-                        SendTestMessage(e.Level, e.Message);
-                    break;
+                // We must avoid re-launching the test host if the test run payload already
+                // contains test session info. Test session info being present is an indicative
+                // of an already running test host spawned by a start test session call.
+                var customLauncher =
+                    shouldLaunchTesthost && testRunPayload!.TestSessionInfo == null // TODO: Avoid throwing/catching NRE
+                        ? DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(
+                            this,
+                            testRunPayload.DebuggingEnabled)
+                        : null;
 
-               
-                default:
-                    throw new NotSupportedException($"Test message level '{e.Level}' is not supported.");
+                testRequestManager.RunTests(testRunPayload!, customLauncher, new DesignModeTestEventsRegistrar(this), _protocolConfig);
             }
-        }
+            catch (Exception ex)
+            {
+                OnError(ex);
+            }
+        });
 
-        private void StartTestRun(TestRunRequestPayload testRunPayload, ITestRequestManager testRequestManager, bool shouldLaunchTesthost)
+        void OnError(Exception? ex)
         {
-            Task.Run(
-                () =>
-                {
-                    try
-                    {
-                        testRequestManager.ResetOptions();
-
-                        // We must avoid re-launching the test host if the test run payload already
-                        // contains test session info. Test session info being present is an indicative
-                        // of an already running test host spawned by a start test session call.
-                        var customLauncher =
-                            shouldLaunchTesthost && testRunPayload.TestSessionInfo == null
-                                ? DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(
-                                    this,
-                                    testRunPayload.DebuggingEnabled)
-                                : null;
-
-                        testRequestManager.RunTests(testRunPayload, customLauncher, new DesignModeTestEventsRegistrar(this), this.protocolConfig);
-                    }
-                    catch (Exception ex)
-                    {
-                        EqtTrace.Error("DesignModeClient: Exception in StartTestRun: " + ex);
-
-                        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
-                        this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
-                        var runCompletePayload = new TestRunCompletePayload()
-                        {
-                            TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, TimeSpan.MinValue),
-                            LastRunTests = null
-                        };
-
-                        // Send run complete to translation layer
-                        this.communicationManager.SendMessage(MessageType.ExecutionComplete, runCompletePayload);
-                    }
-                });
+            EqtTrace.Error("DesignModeClient.StartTestRun: " + ex ?? "payload was null");
+
+            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex?.ToString() };
+            _communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
+            var runCompletePayload = new TestRunCompletePayload()
+            {
+                TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, null, TimeSpan.MinValue),
+                LastRunTests = null
+            };
+
+            // Send run complete to translation layer
+            _communicationManager.SendMessage(MessageType.ExecutionComplete, runCompletePayload);
         }
+    }
 
-        private void StartDiscovery(DiscoveryRequestPayload discoveryRequestPayload, ITestRequestManager testRequestManager)
+    private void StartDiscovery(DiscoveryRequestPayload? discoveryRequestPayload, ITestRequestManager testRequestManager)
+    {
+        Task.Run(() =>
         {
-            Task.Run(
-                () =>
+            try
+            {
+                testRequestManager.ResetOptions();
+                if (discoveryRequestPayload is null)
                 {
-                    try
-                    {
-                        testRequestManager.ResetOptions();
-                        testRequestManager.DiscoverTests(discoveryRequestPayload, new DesignModeTestEventsRegistrar(this), this.protocolConfig);
-                    }
-                    catch (Exception ex)
-                    {
-                        EqtTrace.Error("DesignModeClient: Exception in StartDiscovery: " + ex);
-
-                        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
-                        this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
-
-                        var payload = new DiscoveryCompletePayload()
-                        {
-                            IsAborted = true,
-                            LastDiscoveredTests = null,
-                            TotalTests = -1
-                        };
-
-                        // Send run complete to translation layer
-                        this.communicationManager.SendMessage(MessageType.DiscoveryComplete, payload);
-                    }
-                });
-        }
+                    OnError(null);
+                    return;
+                }
+
+                testRequestManager.DiscoverTests(discoveryRequestPayload, new DesignModeTestEventsRegistrar(this), _protocolConfig);
+            }
+            catch (Exception ex)
+            {
+                OnError(ex);
+            }
+        });
 
-        private void StartTestRunAttachmentsProcessing(TestRunAttachmentsProcessingPayload attachmentsProcessingPayload, ITestRequestManager testRequestManager)
+        void OnError(Exception? ex)
         {
-            Task.Run(
-                () =>
-                {
-                    try
-                    {
-                        testRequestManager.ProcessTestRunAttachments(attachmentsProcessingPayload, new TestRunAttachmentsProcessingEventsHandler(this.communicationManager), this.protocolConfig);
-                    }
-                    catch (Exception ex)
-                    {
-                        EqtTrace.Error("DesignModeClient: Exception in StartTestRunAttachmentsProcessing: " + ex);
-
-                        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
-                        this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
-
-                        var payload = new TestRunAttachmentsProcessingCompletePayload()
-                        {
-                            Attachments = null
-                        };
+            EqtTrace.Error("DesignModeClient.StartDiscovery: " + ex ?? "payload is null");
+
+            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex?.ToString() };
+            _communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
+
+            var payload = new DiscoveryCompletePayload()
+            {
+                IsAborted = true,
+                LastDiscoveredTests = null,
+                TotalTests = -1
+            };
 
-                        // Send run complete to translation layer
-                        this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
-                    }
-                });
+            // Send run complete to translation layer
+            _communicationManager.SendMessage(MessageType.DiscoveryComplete, payload);
         }
+    }
 
-        private void StartTestSession(StartTestSessionPayload payload, ITestRequestManager requestManager)
+    private void StartTestRunAttachmentsProcessing(TestRunAttachmentsProcessingPayload? attachmentsProcessingPayload, ITestRequestManager testRequestManager)
+    {
+        Task.Run(() =>
         {
-            Task.Run(() =>
+            try
             {
-                var eventsHandler = new TestSessionEventsHandler(this.communicationManager);
-
-                try
+                if (attachmentsProcessingPayload is null)
                 {
-                    var customLauncher = payload.HasCustomHostLauncher
-                        ? DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(this, payload.IsDebuggingEnabled)
-                        : null;
-
-                    requestManager.ResetOptions();
-                    requestManager.StartTestSession(payload, customLauncher, eventsHandler, this.protocolConfig);
+                    OnError(null);
+                    return;
                 }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("DesignModeClient: Exception in StartTestSession: " + ex);
 
-                    eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
-                    eventsHandler.HandleStartTestSessionComplete(null);
-                }
-            });
-        }
+                testRequestManager.ProcessTestRunAttachments(attachmentsProcessingPayload, new TestRunAttachmentsProcessingEventsHandler(_communicationManager), _protocolConfig);
+            }
+            catch (Exception ex)
+            {
+                OnError(ex);
+            }
+        });
 
-        private void StopTestSession(TestSessionInfo testSessionInfo)
+        void OnError(Exception? ex)
         {
-            Task.Run(() =>
+            EqtTrace.Error("DesignModeClient.StartTestRunAttachmentsProcessing: " + ex ?? "payload is null");
+
+            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex?.ToString() };
+            _communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
+
+            var payload = new TestRunAttachmentsProcessingCompletePayload()
             {
-                var eventsHandler = new TestSessionEventsHandler(this.communicationManager);
+                Attachments = null
+            };
 
-                try
-                {
-                    var stopped = TestSessionPool.Instance.KillSession(testSessionInfo);
+            // Send run complete to translation layer
+            _communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
+        }
+    }
 
-                    eventsHandler.HandleStopTestSessionComplete(testSessionInfo, stopped);
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("DesignModeClient: Exception in StopTestSession: " + ex);
+    private void StartTestSession(StartTestSessionPayload? payload, ITestRequestManager requestManager)
+    {
+        Task.Run(() =>
+        {
+            var eventsHandler = new TestSessionEventsHandler(_communicationManager);
 
-                    eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
-                    eventsHandler.HandleStopTestSessionComplete(testSessionInfo, false);
+            try
+            {
+                if (payload is null)
+                {
+                    OnError(eventsHandler, null);
+                    return;
                 }
-            });
-        }
 
-        #region IDisposable Support
+                var customLauncher = payload.HasCustomHostLauncher
+                    ? DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(this, payload.IsDebuggingEnabled)
+                    : null;
+
+                requestManager.ResetOptions();
+                requestManager.StartTestSession(payload, customLauncher, eventsHandler, _protocolConfig);
+            }
+            catch (Exception ex)
+            {
+                OnError(eventsHandler, ex);
+            }
+        });
+
+        static void OnError(TestSessionEventsHandler eventsHandler, Exception? ex)
+        {
+            EqtTrace.Error("DesignModeClient.StartTestSession: " + ex ?? "payload is null");
 
-        private bool disposedValue = false; // To detect redundant calls
+            eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex?.ToString());
+            eventsHandler.HandleStartTestSessionComplete(new());
+        }
+    }
 
-        protected virtual void Dispose(bool disposing)
+    private void StopTestSession(StopTestSessionPayload? payload, ITestRequestManager requestManager)
+    {
+        Task.Run(() =>
         {
-            if (!disposedValue)
+            var eventsHandler = new TestSessionEventsHandler(_communicationManager);
+
+            try
             {
-                if (disposing)
+                requestManager.ResetOptions();
+                if (payload is null)
                 {
-                    this.communicationManager?.StopClient();
+                    OnError(eventsHandler, null);
+                    return;
                 }
 
-                disposedValue = true;
+                requestManager.StopTestSession(payload, eventsHandler, _protocolConfig);
+            }
+            catch (Exception ex)
+            {
+                OnError(eventsHandler, ex);
             }
+        });
+
+        void OnError(TestSessionEventsHandler eventsHandler, Exception? ex)
+        {
+            EqtTrace.Error("DesignModeClient.StopTestSession: " + ex ?? "payload is null");
+
+            eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex?.ToString());
+            eventsHandler.HandleStopTestSessionComplete(new(payload?.TestSessionInfo));
         }
+    }
 
-        // This code added to correctly implement the disposable pattern.
-        public void Dispose()
+    #region IDisposable Support
+
+    private bool _isDisposed; // To detect redundant calls
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_isDisposed)
         {
-            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
-            Dispose(true);
+            if (disposing)
+            {
+                _communicationManager.StopClient();
+            }
+
+            _isDisposed = true;
         }
-        #endregion
     }
+
+    // This code added to correctly implement the disposable pattern.
+    public void Dispose()
+    {
+        // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestEventsRegistrar.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestEventsRegistrar.cs
index be33e0b96d..3a2f773b45 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestEventsRegistrar.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestEventsRegistrar.cs
@@ -1,66 +1,66 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+
+/// <summary>
+/// Registers the discovery and test run events for design mode flow
+/// </summary>
+public class DesignModeTestEventsRegistrar : ITestDiscoveryEventsRegistrar, ITestRunEventsRegistrar
 {
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly IDesignModeClient _designModeClient;
 
-    /// <summary>
-    /// Registers the discovery and test run events for design mode flow
-    /// </summary>
-    public class DesignModeTestEventsRegistrar : ITestDiscoveryEventsRegistrar, ITestRunEventsRegistrar
+    public DesignModeTestEventsRegistrar(IDesignModeClient designModeClient)
     {
-        private IDesignModeClient designModeClient;
-
-        public DesignModeTestEventsRegistrar(IDesignModeClient designModeClient)
-        {
-            this.designModeClient = designModeClient;
-        }
+        _designModeClient = designModeClient;
+    }
 
-        #region ITestDiscoveryEventsRegistrar
+    #region ITestDiscoveryEventsRegistrar
 
-        public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-        {
-            discoveryRequest.OnRawMessageReceived += OnRawMessageReceived;
-        }
+    public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnRawMessageReceived += OnRawMessageReceived;
+    }
 
-        public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-        {
-            discoveryRequest.OnRawMessageReceived -= OnRawMessageReceived;
-        }
+    public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnRawMessageReceived -= OnRawMessageReceived;
+    }
 
-        #endregion
+    #endregion
 
-        #region ITestRunEventsRegistrar
+    #region ITestRunEventsRegistrar
 
-        public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
-        {
-            testRunRequest.OnRawMessageReceived += OnRawMessageReceived;
-        }
+    public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.OnRawMessageReceived += OnRawMessageReceived;
+    }
 
-        public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
-        {
-            testRunRequest.OnRawMessageReceived -= OnRawMessageReceived;
-        }
+    public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.OnRawMessageReceived -= OnRawMessageReceived;
+    }
 
-        #endregion
+    #endregion
 
-        /// <summary>
-        /// RawMessage received handler for getting rawmessages directly from the host
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="rawMessage">RawMessage from the testhost</param>
-        private void OnRawMessageReceived(object sender, string rawMessage)
-        {
-            // Directly send the data to translation layer instead of de-serializing it here
-            this.designModeClient.SendRawMessage(rawMessage);
-        }
+    /// <summary>
+    /// RawMessage received handler for getting rawmessages directly from the host
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="rawMessage">RawMessage from the testhost</param>
+    private void OnRawMessageReceived(object? sender, string rawMessage)
+    {
+        // Directly send the data to translation layer instead of de-serializing it here
+        _designModeClient.SendRawMessage(rawMessage);
+    }
 
-        public void LogWarning(string message)
-        {
-            this.designModeClient.SendTestMessage(TestMessageLevel.Warning, message);
-        }
+    public void LogWarning(string? message)
+    {
+        _designModeClient.SendTestMessage(TestMessageLevel.Warning, message);
     }
 }
+
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncher.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncher.cs
index 33c37b6995..73df6ca0f6 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncher.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncher.cs
@@ -1,67 +1,75 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
+using System;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+
+/// <summary>
+/// DesignMode TestHost Launcher for hosting of test process
+/// </summary>
+internal class DesignModeTestHostLauncher : ITestHostLauncher3
 {
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+    private readonly IDesignModeClient _designModeClient;
 
     /// <summary>
-    /// DesignMode TestHost Launcher for hosting of test process
+    /// Initializes a new instance of the <see cref="DesignModeTestHostLauncher"/> class.
     /// </summary>
-    internal class DesignModeTestHostLauncher : ITestHostLauncher2
+    /// <param name="designModeClient">Design mode client instance.</param>
+    public DesignModeTestHostLauncher(IDesignModeClient designModeClient)
     {
-        private readonly IDesignModeClient designModeClient;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignModeTestHostLauncher"/> class.
-        /// </summary>
-        /// <param name="designModeClient">Design mode client instance.</param>
-        public DesignModeTestHostLauncher(IDesignModeClient designModeClient)
-        {
-            this.designModeClient = designModeClient;
-        }
+        _designModeClient = designModeClient;
+    }
 
-        /// <inheritdoc/>
-        public virtual bool IsDebug => false;
+    /// <inheritdoc/>
+    public virtual bool IsDebug => false;
 
-        /// <inheritdoc/>
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            return this.designModeClient.AttachDebuggerToProcess(pid, CancellationToken.None);
-        }
+    /// <inheritdoc/>
+    [Obsolete("Don't use, internal implementations should use only the latest interface.", true)]
+    public bool AttachDebuggerToProcess(int pid)
+    {
+        throw new NotSupportedException();
+    }
 
-        /// <inheritdoc/>
-        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
-        {
-            return this.designModeClient.AttachDebuggerToProcess(pid, cancellationToken);
-        }
+    /// <inheritdoc/>
+    [Obsolete("Don't use, internal implementations should use only the latest interface.", true)]
+    public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+    {
+        throw new NotSupportedException();
+    }
 
-        /// <inheritdoc/>
-        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
-        {
-            return this.designModeClient.LaunchCustomHost(defaultTestHostStartInfo, CancellationToken.None);
-        }
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo, CancellationToken cancellationToken)
+    {
+        return _designModeClient.AttachDebuggerToProcess(attachDebuggerInfo, cancellationToken);
+    }
 
-        /// <inheritdoc/>
-        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
-        {
-            return this.designModeClient.LaunchCustomHost(defaultTestHostStartInfo, cancellationToken);
-        }
+    /// <inheritdoc/>
+    public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+    {
+        return _designModeClient.LaunchCustomHost(defaultTestHostStartInfo, CancellationToken.None);
     }
 
-    /// <summary>
-    /// DesignMode Debug Launcher to use if debugging enabled
-    /// </summary>
-    internal class DesignModeDebugTestHostLauncher : DesignModeTestHostLauncher
+    /// <inheritdoc/>
+    public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
     {
-        /// <inheritdoc/>
-        public DesignModeDebugTestHostLauncher(IDesignModeClient designModeClient) : base(designModeClient)
-        {
-        }
+        return _designModeClient.LaunchCustomHost(defaultTestHostStartInfo, cancellationToken);
+    }
+}
 
-        /// <inheritdoc/>
-        public override bool IsDebug => true;
+/// <summary>
+/// DesignMode Debug Launcher to use if debugging enabled
+/// </summary>
+internal class DesignModeDebugTestHostLauncher : DesignModeTestHostLauncher
+{
+    /// <inheritdoc/>
+    public DesignModeDebugTestHostLauncher(IDesignModeClient designModeClient) : base(designModeClient)
+    {
     }
+
+    /// <inheritdoc/>
+    public override bool IsDebug => true;
 }
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncherFactory.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncherFactory.cs
index 5b92bc54ba..67400d6b18 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncherFactory.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeTestHostLauncherFactory.cs
@@ -1,33 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-
-    /// <summary>
-    /// Factory for providing the design mode test host launchers
-    /// </summary>
-    public static class DesignModeTestHostLauncherFactory
-    {
-        private static ITestHostLauncher defaultLauncher;
-        private static ITestHostLauncher debugLauncher;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
 
-        public static ITestHostLauncher GetCustomHostLauncherForTestRun(IDesignModeClient designModeClient, bool debuggingEnabled)
-        {
-            ITestHostLauncher testHostLauncher = null;
+namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
 
-            if (!debuggingEnabled)
-            {
-                testHostLauncher = defaultLauncher = defaultLauncher ?? new DesignModeTestHostLauncher(designModeClient);
-            }
-            else
-            {
-                testHostLauncher = debugLauncher = debugLauncher ?? new DesignModeDebugTestHostLauncher(designModeClient);
-            }
+/// <summary>
+/// Factory for providing the design mode test host launchers
+/// </summary>
+public static class DesignModeTestHostLauncherFactory
+{
+    private static ITestHostLauncher3? s_defaultLauncher;
+    private static ITestHostLauncher3? s_debugLauncher;
 
-            return testHostLauncher;
-        }
+    public static ITestHostLauncher3 GetCustomHostLauncherForTestRun(IDesignModeClient designModeClient, bool debuggingEnabled)
+    {
+        ITestHostLauncher3 testHostLauncher = !debuggingEnabled
+            ? (s_defaultLauncher ??= new DesignModeTestHostLauncher(designModeClient))
+            : (s_debugLauncher ??= new DesignModeDebugTestHostLauncher(designModeClient));
+        return testHostLauncher;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/IDesignModeClient.cs b/src/Microsoft.TestPlatform.Client/DesignMode/IDesignModeClient.cs
index 1b633c0a67..a8b8c023c6 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/IDesignModeClient.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/IDesignModeClient.cs
@@ -1,57 +1,59 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
+using System;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+
+/// <summary>
+/// The interface for design mode client.
+/// </summary>
+public interface IDesignModeClient : IDisposable
 {
-    using System;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Setups client based on port
+    /// </summary>
+    /// <param name="port">port number to connect</param>
+    /// <param name="testRequestManager">test request manager</param>
+    void ConnectToClientAndProcessRequests(int port, ITestRequestManager testRequestManager);
+
+    /// <summary>
+    /// Send a custom host launch message to IDE
+    /// </summary>
+    /// <param name="defaultTestHostStartInfo">Default TestHost Start Info</param>
+    /// <param name="cancellationToken">The cancellation Token.</param>
+    /// <returns>Process id of the launched test host.</returns>
+    int LaunchCustomHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Attach debugger to an already running process.
+    /// </summary>
+    /// <param name="attachDebuggerInfo">Process Id and other information about the process that IDE should attach to.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Handles parent process exit
+    /// </summary>
+    void HandleParentProcessExit();
+
+    /// <summary>
+    /// Send the raw messages to IDE
+    /// </summary>
+    /// <param name="rawMessage"></param>
+    void SendRawMessage(string rawMessage);
 
     /// <summary>
-    /// The interface for design mode client.
+    /// Send the test session messages to IDE
     /// </summary>
-    public interface IDesignModeClient : IDisposable
-    {
-        /// <summary>
-        /// Setups client based on port
-        /// </summary>
-        /// <param name="port">port number to connect</param>
-        void ConnectToClientAndProcessRequests(int port, ITestRequestManager testRequestManager);
-
-        /// <summary>
-        /// Send a custom host launch message to IDE
-        /// </summary>
-        /// <param name="defaultTestHostStartInfo">Default TestHost Start Info</param>
-        /// <param name="cancellationToken">The cancellation Token.</param>
-        /// <returns>Process id of the launched test host.</returns>
-        int LaunchCustomHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Attach debugger to an already running process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Handles parent process exit
-        /// </summary>
-        void HandleParentProcessExit();
-
-        /// <summary>
-        /// Send the raw messages to IDE
-        /// </summary>
-        /// <param name="rawMessage"></param>
-        void SendRawMessage(string rawMessage);
-
-        /// <summary>
-        /// Send the test session messages to IDE
-        /// </summary>
-        /// <param name="level">Level for the message</param>
-        /// <param name="message">Actual message string</param>
-        void SendTestMessage(TestMessageLevel level, string message);
-    }
+    /// <param name="level">Level for the message</param>
+    /// <param name="message">Actual message string</param>
+    void SendTestMessage(TestMessageLevel level, string? message);
 }
diff --git a/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs b/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
index d63a2508e2..530a5d82f3 100644
--- a/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
+++ b/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
@@ -1,568 +1,528 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.Discovery
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.Discovery;
+
+/// <summary>
+/// The discovery request.
+/// </summary>
+public sealed class DiscoveryRequest : IDiscoveryRequest, ITestDiscoveryEventsHandler2
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    private readonly IDataSerializer _dataSerializer;
 
     /// <summary>
-    /// The discovery request.
+    /// Initializes a new instance of the <see cref="DiscoveryRequest"/> class.
     /// </summary>
-    public sealed class DiscoveryRequest : IDiscoveryRequest, ITestDiscoveryEventsHandler2
+    /// <param name="requestData">The Request Data instance providing services and data for discovery</param>
+    /// <param name="criteria">Discovery criterion.</param>
+    /// <param name="discoveryManager">Discovery manager instance.</param>
+    /// <param name="loggerManager">Logger manager instance.</param>
+    internal DiscoveryRequest(IRequestData requestData, DiscoveryCriteria criteria, IProxyDiscoveryManager discoveryManager, ITestLoggerManager loggerManager)
+        : this(requestData, criteria, discoveryManager, loggerManager, JsonDataSerializer.Instance)
     {
-        private IDataSerializer dataSerializer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryRequest"/> class.
-        /// </summary>
-        /// <param name="requestData">The Request Data instance providing services and data for discovery</param>
-        /// <param name="criteria">Discovery criterion.</param>
-        /// <param name="discoveryManager">Discovery manager instance.</param>
-        internal DiscoveryRequest(IRequestData requestData, DiscoveryCriteria criteria, IProxyDiscoveryManager discoveryManager, ITestLoggerManager loggerManager)
-            : this(requestData, criteria, discoveryManager, loggerManager, JsonDataSerializer.Instance)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryRequest"/> class.
-        /// </summary>
-        /// <param name="requestData">The Request Data instance providing services and data for discovery</param>
-        /// <param name="criteria">Discovery criterion.</param>
-        /// <param name="discoveryManager">Discovery manager instance.</param>
-        /// <param name="dataSerializer">Data Serializer</param>
-        internal DiscoveryRequest(
-            IRequestData requestData,
-            DiscoveryCriteria criteria,
-            IProxyDiscoveryManager discoveryManager,
-            ITestLoggerManager loggerManager,
-            IDataSerializer dataSerializer)
-        {
-            this.requestData = requestData;
-            this.DiscoveryCriteria = criteria;
-            this.DiscoveryManager = discoveryManager;
-            this.LoggerManager = loggerManager;
-            this.dataSerializer = dataSerializer;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryRequest"/> class.
+    /// </summary>
+    /// <param name="requestData">The Request Data instance providing services and data for discovery</param>
+    /// <param name="criteria">Discovery criterion.</param>
+    /// <param name="discoveryManager">Discovery manager instance.</param>
+    /// <param name="loggerManager">Logger manager instance.</param>
+    /// <param name="dataSerializer">Data Serializer</param>
+    internal DiscoveryRequest(
+        IRequestData requestData,
+        DiscoveryCriteria criteria,
+        IProxyDiscoveryManager discoveryManager,
+        ITestLoggerManager loggerManager,
+        IDataSerializer dataSerializer)
+    {
+        RequestData = requestData;
+        DiscoveryCriteria = criteria;
+        DiscoveryManager = discoveryManager;
+        LoggerManager = loggerManager;
+        _dataSerializer = dataSerializer;
+    }
+
+    /// <summary>
+    /// Start the discovery request
+    /// </summary>
+    public void DiscoverAsync()
+    {
+        EqtTrace.Verbose("DiscoveryRequest.DiscoverAsync: Starting.");
 
-        /// <summary>
-        /// Start the discovery request
-        /// </summary>
-        public void DiscoverAsync()
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.DiscoverAsync: Starting.");
+                throw new ObjectDisposedException(nameof(DiscoveryRequest));
             }
 
-            lock (this.syncObject)
-            {
-                if (this.disposed)
-                {
-                    throw new ObjectDisposedException("DiscoveryRequest");
-                }
-
-                // Reset the discovery completion event
-                this.discoveryCompleted.Reset();
+            // Reset the discovery completion event
+            _discoveryCompleted.Reset();
 
-                this.discoveryInProgress = true;
-                try
-                {
-                    this.discoveryStartTime = DateTime.UtcNow;
+            DiscoveryInProgress = true;
+            try
+            {
+                _discoveryStartTime = DateTime.UtcNow;
 
-                    // Collecting Data Point Number of sources sent for discovery
-                    this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfSourcesSentForDiscovery, this.DiscoveryCriteria.Sources.Count());
+                // Collecting Data Point Number of sources sent for discovery
+                RequestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfSourcesSentForDiscovery, DiscoveryCriteria.Sources.Count());
 
-                    // Invoke OnDiscoveryStart event
-                    var discoveryStartEvent = new DiscoveryStartEventArgs(this.DiscoveryCriteria);
-                    this.LoggerManager.HandleDiscoveryStart(discoveryStartEvent);
-                    this.OnDiscoveryStart.SafeInvoke(this, discoveryStartEvent, "DiscoveryRequest.DiscoveryStart");
+                // Invoke OnDiscoveryStart event
+                var discoveryStartEvent = new DiscoveryStartEventArgs(DiscoveryCriteria);
+                LoggerManager.HandleDiscoveryStart(discoveryStartEvent);
+                OnDiscoveryStart.SafeInvoke(this, discoveryStartEvent, "DiscoveryRequest.DiscoveryStart");
 
-                    this.DiscoveryManager.DiscoverTests(this.DiscoveryCriteria, this);
-                }
-                catch
-                {
-                    this.discoveryInProgress = false;
-                    throw;
-                }
+                DiscoveryManager.DiscoverTests(DiscoveryCriteria, this);
             }
-
-            if (EqtTrace.IsInfoEnabled)
+            catch
             {
-                EqtTrace.Info("DiscoveryRequest.DiscoverAsync: Started.");
+                DiscoveryInProgress = false;
+                throw;
             }
         }
 
-        /// <summary>
-        /// Aborts the test discovery.
-        /// </summary>
-        public void Abort()
+        EqtTrace.Info("DiscoveryRequest.DiscoverAsync: Started.");
+    }
+
+    /// <summary>
+    /// Aborts the test discovery.
+    /// </summary>
+    public void Abort()
+    {
+        EqtTrace.Verbose("DiscoveryRequest.Abort: Aborting.");
+
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.Abort: Aborting.");
+                throw new ObjectDisposedException(nameof(DiscoveryRequest));
             }
 
-            lock (this.syncObject)
+            if (DiscoveryInProgress)
             {
-                if (this.disposed)
+                // TODO: COMPAT: This should not check the default protocol config, that is vstest.console maximum protocol version, not the
+                // version we negotiated with testhost. Instead this should be handled by the proxy discovery manager, based on the protocol
+                // version it has.
+                // If testhost has old version, we should use old cancel logic
+                // to be consistent and not create regression issues
+                if (Constants.DefaultProtocolConfig.Version < Constants.MinimumProtocolVersionWithCancelDiscoveryEventHandlerSupport)
                 {
-                    throw new ObjectDisposedException("DiscoveryRequest");
-                }
-
-                if (this.discoveryInProgress)
-                {
-                    this.DiscoveryManager.Abort();
+                    DiscoveryManager.Abort();
                 }
                 else
                 {
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Info("DiscoveryRequest.Abort: No operation to abort.");
-                    }
-
-                    return;
+                    DiscoveryManager.Abort(this);
                 }
             }
-
-            if (EqtTrace.IsInfoEnabled)
+            else
             {
-                EqtTrace.Info("DiscoveryRequest.Abort: Aborted.");
+                EqtTrace.Info("DiscoveryRequest.Abort: No operation to abort.");
+                return;
             }
         }
 
-        /// <summary>
-        /// Wait for discovery completion
-        /// </summary>
-        /// <param name="timeout"> The timeout. </param>
-        bool IRequest.WaitForCompletion(int timeout)
+        EqtTrace.Info("DiscoveryRequest.Abort: Aborted.");
+    }
+
+    /// <summary>
+    /// Wait for discovery completion
+    /// </summary>
+    /// <param name="timeout"> The timeout. </param>
+    bool IRequest.WaitForCompletion(int timeout)
+    {
+        EqtTrace.Verbose("DiscoveryRequest.WaitForCompletion: Waiting with timeout {0}.", timeout);
+
+        if (_isDisposed)
         {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DiscoveryRequest.WaitForCompletion: Waiting with timeout {0}.", timeout);
-            }
+            throw new ObjectDisposedException("DiscoveryRequest");
+        }
 
-            if (this.disposed)
-            {
-                throw new ObjectDisposedException("DiscoveryRequest");
-            }
+        // This method is not synchronized as it can lead to dead-lock
+        // (the discoveryCompletionEvent cannot be raised unless that lock is released)
+        return _discoveryCompleted == null || _discoveryCompleted.WaitOne(timeout);
+    }
 
-            // This method is not synchronized as it can lead to dead-lock
-            // (the discoveryCompletionEvent cannot be raised unless that lock is released)
-            if (this.discoveryCompleted != null)
-            {
-                return this.discoveryCompleted.WaitOne(timeout);
-            }
+    /// <summary>
+    /// Raised when the test discovery starts.
+    /// </summary>
+    public event EventHandler<DiscoveryStartEventArgs>? OnDiscoveryStart;
 
-            return true;
-        }
+    /// <summary>
+    /// Raised when the test discovery completes.
+    /// </summary>
+    public event EventHandler<DiscoveryCompleteEventArgs>? OnDiscoveryComplete;
 
-        /// <summary>
-        /// Raised when the test discovery starts.
-        /// </summary>
-        public event EventHandler<DiscoveryStartEventArgs> OnDiscoveryStart;
-
-        /// <summary>
-        /// Raised when the test discovery completes.
-        /// </summary>
-        public event EventHandler<DiscoveryCompleteEventArgs> OnDiscoveryComplete;
-
-        /// <summary>
-        /// Raised when the message is received.
-        /// </summary>
-        /// <remarks>TestRunMessageEventArgs should be renamed to more generic</remarks>
-        public event EventHandler<TestRunMessageEventArgs> OnDiscoveryMessage;
-
-        /// <summary>
-        /// Raised when new tests are discovered in this discovery request.
-        /// </summary>
-        public event EventHandler<DiscoveredTestsEventArgs> OnDiscoveredTests;
-
-        /// <summary>
-        ///  Raised when a discovery event related message is received from host
-        ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
-        ///  All the discovery events should come as raw messages as well as proper serialized events like OnDiscoveredTests
-        /// </summary>
-        public event EventHandler<string> OnRawMessageReceived;
-
-        /// <summary>
-        /// Specifies the discovery criterion
-        /// </summary>
-        public DiscoveryCriteria DiscoveryCriteria
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Raised when the message is received.
+    /// </summary>
+    /// <remarks>TestRunMessageEventArgs should be renamed to more generic</remarks>
+    public event EventHandler<TestRunMessageEventArgs>? OnDiscoveryMessage;
 
-        /// <summary>
-        /// Get the status for the discovery
-        /// Returns true if discovery is in progress
-        /// </summary>
-        internal bool DiscoveryInProgress
-        {
-            get { return this.discoveryInProgress; }
-        }
+    /// <summary>
+    /// Raised when new tests are discovered in this discovery request.
+    /// </summary>
+    public event EventHandler<DiscoveredTestsEventArgs>? OnDiscoveredTests;
+
+    /// <summary>
+    ///  Raised when a discovery event related message is received from host
+    ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
+    ///  All the discovery events should come as raw messages as well as proper serialized events like OnDiscoveredTests
+    /// </summary>
+    public event EventHandler<string>? OnRawMessageReceived;
 
-        /// <summary>
-        /// Parent discovery manager
-        /// </summary>
-        internal IProxyDiscoveryManager DiscoveryManager { get; private set; }
+    /// <summary>
+    /// Specifies the discovery criterion
+    /// </summary>
+    public DiscoveryCriteria DiscoveryCriteria
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Logger manager.
-        /// </summary>
-        internal ITestLoggerManager LoggerManager { get; private set; }
+    /// <summary>
+    /// Get the status for the discovery
+    /// Returns true if discovery is in progress
+    /// </summary>
+    internal bool DiscoveryInProgress { get; private set; }
+
+    /// <summary>
+    /// Parent discovery manager
+    /// </summary>
+    internal IProxyDiscoveryManager DiscoveryManager { get; }
 
-        #region ITestDiscoveryEventsHandler2 Methods
+    /// <summary>
+    /// Logger manager.
+    /// </summary>
+    internal ITestLoggerManager LoggerManager { get; }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
+    #region ITestDiscoveryEventsHandler2 Methods
+
+    /// <inheritdoc/>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        EqtTrace.Verbose("DiscoveryRequest.HandleDiscoveryComplete: Begin processing discovery complete notification. Aborted: {0}, TotalTests: {1}", discoveryCompleteEventArgs.IsAborted, discoveryCompleteEventArgs.TotalCount);
+
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.DiscoveryComplete: Starting. Aborted:{0}, TotalTests:{1}", discoveryCompleteEventArgs.IsAborted, discoveryCompleteEventArgs.TotalCount);
+                EqtTrace.Warning("DiscoveryRequest.HandleDiscoveryComplete: Ignoring as the object is disposed.");
+                return;
             }
 
-            lock (this.syncObject)
+            // If discovery event is already raised, ignore current one.
+            if (_discoveryCompleted.WaitOne(0))
             {
-                if (this.disposed)
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("DiscoveryRequest.DiscoveryComplete: Ignoring as the object is disposed.");
-                    }
+                EqtTrace.Verbose("DiscoveryRequest.HandleDiscoveryComplete: Ignoring duplicate DiscoveryComplete.");
+                return;
+            }
 
-                    return;
-                }
+            // Close the discovery session and terminate any test host processes. This operation should never
+            // throw.
+            DiscoveryManager?.Close();
 
-                // If discovery event is already raised, ignore current one.
-                if (this.discoveryCompleted.WaitOne(0))
+            try
+            {
+                // Raise onDiscoveredTests event if there are some tests in the last chunk.
+                // (We don't want to send the tests in the discovery complete event so that programming on top of
+                // RS client is easier i.e. user does not have to listen on discovery complete event.)
+                if (lastChunk != null && lastChunk.Any())
                 {
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("DiscoveryRequest.DiscoveryComplete:Ignoring duplicate DiscoveryComplete. Aborted:{0}, TotalTests:{1}", discoveryCompleteEventArgs.IsAborted, discoveryCompleteEventArgs.TotalCount);
-                    }
-
-                    return;
+                    var discoveredTestsEvent = new DiscoveredTestsEventArgs(lastChunk);
+                    LoggerManager.HandleDiscoveredTests(discoveredTestsEvent);
+                    OnDiscoveredTests.SafeInvoke(this, discoveredTestsEvent, "DiscoveryRequest.HandleDiscoveryComplete");
                 }
 
-                // Close the discovery session and terminate any test host processes. This operation should never
-                // throw.
-                this.DiscoveryManager?.Close();
+                // Add extensions discovered by vstest.console.
+                //
+                // TODO(copoiena): Writing telemetry twice is less than ideal.
+                // We first write telemetry data in the _requestData variable in the ParallelRunEventsHandler
+                // and then we write again here. We should refactor this code and write only once.
+                discoveryCompleteEventArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary(
+                    discoveryCompleteEventArgs.DiscoveredExtensions,
+                    TestPluginCache.Instance.TestExtensions?.GetCachedExtensions());
 
-                try
+                if (RequestData.IsTelemetryOptedIn)
                 {
-                    // Raise onDiscoveredTests event if there are some tests in the last chunk.
-                    // (We don't want to send the tests in the discovery complete event so that programming on top of
-                    // RS client is easier i.e. user does not have to listen on discovery complete event.)
-                    if (lastChunk != null && lastChunk.Any())
-                    {
-                        var discoveredTestsEvent = new DiscoveredTestsEventArgs(lastChunk);
-                        this.LoggerManager.HandleDiscoveredTests(discoveredTestsEvent);
-                        this.OnDiscoveredTests.SafeInvoke(this, discoveredTestsEvent, "DiscoveryRequest.DiscoveryComplete");
-                    }
+                    TestExtensions.AddExtensionTelemetry(
+                        discoveryCompleteEventArgs.Metrics!,
+                        discoveryCompleteEventArgs.DiscoveredExtensions);
+                }
 
-                    this.LoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
-                    this.OnDiscoveryComplete.SafeInvoke(this, discoveryCompleteEventArgs, "DiscoveryRequest.DiscoveryComplete");
+                LoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
+                OnDiscoveryComplete.SafeInvoke(this, discoveryCompleteEventArgs, "DiscoveryRequest.HandleDiscoveryComplete");
+            }
+            finally
+            {
+                // Notify the waiting handle that discovery is complete
+                if (_discoveryCompleted != null)
+                {
+                    _discoveryCompleted.Set();
+                    EqtTrace.Verbose("DiscoveryRequest.HandleDiscoveryComplete: Notified the discovery complete event.");
                 }
-                finally
+                else
                 {
-                    // Notify the waiting handle that discovery is complete
-                    if (this.discoveryCompleted != null)
-                    {
-                        this.discoveryCompleted.Set();
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            EqtTrace.Verbose("DiscoveryRequest.DiscoveryComplete: Notified the discovery complete event.");
-                        }
-                    }
-                    else
-                    {
-                        if (EqtTrace.IsWarningEnabled)
-                        {
-                            EqtTrace.Warning("DiscoveryRequest.DiscoveryComplete: Discovery complete event was null.");
-                        }
-                    }
+                    EqtTrace.Warning("DiscoveryRequest.HandleDiscoveryComplete: Discovery request was disposed.");
+                }
 
-                    this.discoveryInProgress = false;
-                    var discoveryFinalTimeTaken = DateTime.UtcNow - this.discoveryStartTime;
+                DiscoveryInProgress = false;
+                var discoveryFinalTimeTaken = DateTime.UtcNow - _discoveryStartTime;
 
-                    // Fill in the Metrics From Test Host Process
-                    var metrics = discoveryCompleteEventArgs.Metrics;
-                    if (metrics != null && metrics.Count != 0)
+                // Fill in the Metrics From Test Host Process
+                var metrics = discoveryCompleteEventArgs.Metrics;
+                if (metrics != null && metrics.Count != 0)
+                {
+                    foreach (var metric in metrics)
                     {
-                        foreach (var metric in metrics)
-                        {
-                            this.requestData.MetricsCollection.Add(metric.Key, metric.Value);
-                        }
+                        RequestData.MetricsCollection.Add(metric.Key, metric.Value);
                     }
-
-                    // Collecting Total Time Taken
-                    this.requestData.MetricsCollection.Add(
-                        TelemetryDataConstants.TimeTakenInSecForDiscovery, discoveryFinalTimeTaken.TotalSeconds);
                 }
-            }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("DiscoveryRequest.DiscoveryComplete: Completed.");
+                // Collecting Total Time Taken
+                RequestData.MetricsCollection.Add(
+                    TelemetryDataConstants.TimeTakenInSecForDiscovery, discoveryFinalTimeTaken.TotalSeconds);
             }
         }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
+        EqtTrace.Info("DiscoveryRequest.HandleDiscoveryComplete: Finished processing discovery complete notification.");
+    }
+
+    /// <inheritdoc/>
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        EqtTrace.Verbose("DiscoveryRequest.HandleDiscoveredTests: Starting.");
+
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.SendDiscoveredTests: Starting.");
+                EqtTrace.Warning("DiscoveryRequest.HandleDiscoveredTests: Ignoring as the object is disposed.");
+                return;
             }
 
-            lock (this.syncObject)
-            {
-                if (this.disposed)
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("DiscoveryRequest.SendDiscoveredTests: Ignoring as the object is disposed.");
-                    }
-
-                    return;
-                }
+            var discoveredTestsEvent = new DiscoveredTestsEventArgs(discoveredTestCases);
+            LoggerManager.HandleDiscoveredTests(discoveredTestsEvent);
+            OnDiscoveredTests.SafeInvoke(this, discoveredTestsEvent, "DiscoveryRequest.OnDiscoveredTests");
+        }
 
-                var discoveredTestsEvent = new DiscoveredTestsEventArgs(discoveredTestCases);
-                this.LoggerManager.HandleDiscoveredTests(discoveredTestsEvent);
-                this.OnDiscoveredTests.SafeInvoke(this, discoveredTestsEvent, "DiscoveryRequest.OnDiscoveredTests");
-            }
+        EqtTrace.Info("DiscoveryRequest.HandleDiscoveredTests: Completed.");
+    }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("DiscoveryRequest.SendDiscoveredTests: Completed.");
-            }
-        }
+    /// <summary>
+    /// Dispatch TestRunMessage event to listeners.
+    /// </summary>
+    /// <param name="level">Output level of the message being sent.</param>
+    /// <param name="message">Actual contents of the message</param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        EqtTrace.Verbose("DiscoveryRequest.HandleLogMessage: Starting.");
 
-        /// <summary>
-        /// Dispatch TestRunMessage event to listeners.
-        /// </summary>
-        /// <param name="level">Output level of the message being sent.</param>
-        /// <param name="message">Actual contents of the message</param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.SendDiscoveryMessage: Starting.");
+                EqtTrace.Warning("DiscoveryRequest.HandleLogMessage: Ignoring as the object is disposed.");
+                return;
             }
 
-            lock (this.syncObject)
-            {
-                if (this.disposed)
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("DiscoveryRequest.SendDiscoveryMessage: Ignoring as the object is disposed.");
-                    }
+            var testRunMessageEvent = new TestRunMessageEventArgs(level, message!);
+            LoggerManager.HandleDiscoveryMessage(testRunMessageEvent);
+            OnDiscoveryMessage.SafeInvoke(this, testRunMessageEvent, "DiscoveryRequest.OnTestMessageRecieved");
+        }
 
-                    return;
-                }
+        EqtTrace.Info("DiscoveryRequest.HandleLogMessage: Completed.");
+    }
 
-                var testRunMessageEvent = new TestRunMessageEventArgs(level, message);
-                this.LoggerManager.HandleDiscoveryMessage(testRunMessageEvent);
-                this.OnDiscoveryMessage.SafeInvoke(this, testRunMessageEvent, "DiscoveryRequest.OnTestMessageRecieved");
-            }
+    /// <summary>
+    /// Handle Raw message directly from the host
+    /// </summary>
+    /// <param name="rawMessage">Raw message.</param>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // Note: Deserialize rawMessage only if required.
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("DiscoveryRequest.SendDiscoveryMessage: Completed.");
-            }
-        }
+        var message = LoggerManager.LoggersInitialized || RequestData.IsTelemetryOptedIn
+            ? _dataSerializer.DeserializeMessage(rawMessage)
+            : null;
 
-        /// <summary>
-        /// Handle Raw message directly from the host
-        /// </summary>
-        /// <param name="rawMessage">Raw message.</param>
-        public void HandleRawMessage(string rawMessage)
+        if (MessageType.DiscoveryComplete.Equals(message?.MessageType))
         {
-            // Note: Deserialize rawMessage only if required.
+            var discoveryCompletePayload = _dataSerializer.DeserializePayload<DiscoveryCompletePayload>(message);
+            rawMessage = UpdateRawMessageWithTelemetryInfo(discoveryCompletePayload, message) ?? rawMessage;
+            HandleLoggerManagerDiscoveryComplete(discoveryCompletePayload);
+        }
 
-            var message = this.LoggerManager.LoggersInitialized || this.requestData.IsTelemetryOptedIn 
-                          ? this.dataSerializer.DeserializeMessage(rawMessage) 
-                          : null;
+        OnRawMessageReceived?.SafeInvoke(this, rawMessage, "DiscoveryRequest.RawMessageReceived");
+    }
 
-            if (string.Equals(message?.MessageType, MessageType.DiscoveryComplete))
+    /// <summary>
+    /// Handles LoggerManager's DiscoveryComplete.
+    /// </summary>
+    /// <param name="discoveryCompletePayload">Discovery complete payload.</param>
+    private void HandleLoggerManagerDiscoveryComplete(DiscoveryCompletePayload? discoveryCompletePayload)
+    {
+        if (LoggerManager.LoggersInitialized && discoveryCompletePayload != null)
+        {
+            // Send last chunk to logger manager.
+            if (discoveryCompletePayload.LastDiscoveredTests != null)
             {
-                var discoveryCompletePayload = this.dataSerializer.DeserializePayload<DiscoveryCompletePayload>(message);
-                rawMessage = UpdateRawMessageWithTelemetryInfo(discoveryCompletePayload, message) ?? rawMessage;
-                HandleLoggerManagerDiscoveryComplete(discoveryCompletePayload);
+                var discoveredTestsEventArgs = new DiscoveredTestsEventArgs(discoveryCompletePayload.LastDiscoveredTests);
+                LoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
             }
 
-            this.OnRawMessageReceived?.Invoke(this, rawMessage);
+            // Send discovery complete to logger manager.
+            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(discoveryCompletePayload.TotalTests, discoveryCompletePayload.IsAborted);
+            discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
+            LoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
         }
+    }
 
-        /// <summary>
-        /// Handles LoggerManager's DiscoveryComplete.
-        /// </summary>
-        /// <param name="discoveryCompletePayload">Discovery complete payload.</param>
-        private void HandleLoggerManagerDiscoveryComplete(DiscoveryCompletePayload discoveryCompletePayload)
-        {
-            if (this.LoggerManager.LoggersInitialized && discoveryCompletePayload != null)
-            {
-                // Send last chunk to logger manager.
-                if (discoveryCompletePayload.LastDiscoveredTests != null)
-                {
-                    var discoveredTestsEventArgs = new DiscoveredTestsEventArgs(discoveryCompletePayload.LastDiscoveredTests);
-                    this.LoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
-                }
+    /// <summary>
+    /// Update raw message with telemetry info.
+    /// </summary>
+    /// <param name="discoveryCompletePayload">Discovery complete payload.</param>
+    /// <param name="message">Message.</param>
+    /// <returns>Updated rawMessage.</returns>
+    private string? UpdateRawMessageWithTelemetryInfo(DiscoveryCompletePayload? discoveryCompletePayload, Message? message)
+    {
+        var rawMessage = default(string);
 
-                // Send discovery complete to logger manager.
-                var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(discoveryCompletePayload.TotalTests, discoveryCompletePayload.IsAborted);
-                discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
-                this.LoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
-            }
+        if (!RequestData.IsTelemetryOptedIn)
+        {
+            return rawMessage;
         }
 
-        /// <summary>
-        /// Update raw message with telemetry info.
-        /// </summary>
-        /// <param name="discoveryCompletePayload">Discovery complete payload.</param>
-        /// <param name="message">Message.</param>
-        /// <returns>Updated rawMessage.</returns>
-        private string UpdateRawMessageWithTelemetryInfo(DiscoveryCompletePayload discoveryCompletePayload, Message message)
+        if (discoveryCompletePayload != null)
         {
-            var rawMessage = default(string);
-
-            if (this.requestData.IsTelemetryOptedIn)
+            if (discoveryCompletePayload.Metrics == null)
             {
-                if (discoveryCompletePayload != null)
+                discoveryCompletePayload.Metrics = RequestData.MetricsCollection.Metrics;
+            }
+            else
+            {
+                foreach (var kvp in RequestData.MetricsCollection.Metrics)
                 {
-                    if (discoveryCompletePayload.Metrics == null)
-                    {
-                        discoveryCompletePayload.Metrics = this.requestData.MetricsCollection.Metrics;
-                    }
-                    else
-                    {
-                        foreach (var kvp in this.requestData.MetricsCollection.Metrics)
-                        {
-                            discoveryCompletePayload.Metrics[kvp.Key] = kvp.Value;
-                        }
-                    }
-
-                    var discoveryFinalTimeTakenForDesignMode = DateTime.UtcNow - this.discoveryStartTime;
-
-                    // Collecting Total Time Taken
-                    discoveryCompletePayload.Metrics[TelemetryDataConstants.TimeTakenInSecForDiscovery] = discoveryFinalTimeTakenForDesignMode.TotalSeconds;
+                    discoveryCompletePayload.Metrics[kvp.Key] = kvp.Value;
                 }
+            }
 
-                if (message is VersionedMessage message1)
-                {
-                    var version = message1.Version;
+            var discoveryFinalTimeTakenForDesignMode = DateTime.UtcNow - _discoveryStartTime;
+
+            // Collecting Total Time Taken
+            discoveryCompletePayload.Metrics[TelemetryDataConstants.TimeTakenInSecForDiscovery] = discoveryFinalTimeTakenForDesignMode.TotalSeconds;
+
+            // Add extensions discovered by vstest.console.
+            //
+            // TODO(copoiena):
+            // Doing extension merging here is incorrect because we can end up not merging the
+            // cached extensions for the current process (i.e. vstest.console) and hence have
+            // an incomplete list of discovered extensions. This can happen because this method
+            // is called only if telemetry is opted in (see: HandleRawMessage). We should handle
+            // this merge a level above in order to be consistent, but that means we'd have to
+            // deserialize all raw messages no matter if telemetry is opted in or not and that
+            // would probably mean a performance hit.
+            discoveryCompletePayload.DiscoveredExtensions = TestExtensions.CreateMergedDictionary(
+                discoveryCompletePayload.DiscoveredExtensions,
+                TestPluginCache.Instance.TestExtensions?.GetCachedExtensions());
+
+            // Write extensions to telemetry data.
+            TestExtensions.AddExtensionTelemetry(
+                discoveryCompletePayload.Metrics,
+                discoveryCompletePayload.DiscoveredExtensions);
+        }
 
-                    rawMessage = this.dataSerializer.SerializePayload(
-                        MessageType.DiscoveryComplete,
-                        discoveryCompletePayload,
-                        version);
-                }
-                else
-                {
-                    rawMessage = this.dataSerializer.SerializePayload(
-                        MessageType.DiscoveryComplete,
-                        discoveryCompletePayload);
-                }
-            }
+        if (message is VersionedMessage message1)
+        {
+            var version = message1.Version;
 
-            return rawMessage;
+            rawMessage = _dataSerializer.SerializePayload(
+                MessageType.DiscoveryComplete,
+                discoveryCompletePayload,
+                version);
+        }
+        else
+        {
+            rawMessage = _dataSerializer.SerializePayload(
+                MessageType.DiscoveryComplete,
+                discoveryCompletePayload);
         }
 
-        #endregion
+        return rawMessage;
+    }
 
-        #region IDisposable implementation
+    #endregion
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or
-        /// resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.Dispose(true);
+    #region IDisposable implementation
 
-            GC.SuppressFinalize(this);
-        }
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or
+    /// resetting unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        EqtTrace.Verbose("DiscoveryRequest.Dispose: Starting.");
 
-        private void Dispose(bool disposing)
+        lock (_syncObject)
         {
-            if (EqtTrace.IsVerboseEnabled)
+            if (!_isDisposed)
             {
-                EqtTrace.Verbose("DiscoveryRequest.Dispose: Starting.");
-            }
-
-            lock (this.syncObject)
-            {
-                if (!this.disposed)
+                if (_discoveryCompleted != null)
                 {
-                    if (disposing)
-                    {
-                        if (this.discoveryCompleted != null)
-                        {
-                            this.discoveryCompleted.Dispose();
-                        }
-                    }
-
-                    // Indicate that object has been disposed
-                    this.discoveryCompleted = null;
-                    this.disposed = true;
+                    _discoveryCompleted.Dispose();
                 }
-            }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("DiscoveryRequest.Dispose: Completed.");
+                // Indicate that object has been disposed
+                _discoveryCompleted = null!;
+                _isDisposed = true;
             }
         }
 
-        #endregion
-
-        #region privates fields
-
-        /// <summary>
-        /// Request Data
-        /// </summary>
-        internal IRequestData requestData;
+        EqtTrace.Info("DiscoveryRequest.Dispose: Completed.");
+    }
 
-        /// <summary>
-        /// If this request has been disposed.
-        /// </summary>
-        private bool disposed = false;
+    #endregion
+    /// <summary>
+    /// Request Data
+    /// </summary>
+    internal IRequestData RequestData;
 
-        /// <summary>
-        /// It get set when current discovery request is completed.
-        /// </summary>
-        private ManualResetEvent discoveryCompleted = new ManualResetEvent(false);
+    /// <summary>
+    /// If this request has been disposed.
+    /// </summary>
+    private bool _isDisposed;
 
-        /// <summary>
-        /// Sync object for various operations
-        /// </summary>
-        private object syncObject = new Object();
+    /// <summary>
+    /// It get set when current discovery request is completed.
+    /// </summary>
+    private ManualResetEvent _discoveryCompleted = new(false);
 
-        /// <summary>
-        /// Whether or not the test discovery is in progress.
-        /// </summary>
-        private bool discoveryInProgress;
+    /// <summary>
+    /// Sync object for various operations
+    /// </summary>
+    private readonly object _syncObject = new();
 
-        /// <summary>
-        /// Discovery Start Time
-        /// </summary>
-        private DateTime discoveryStartTime;
+    /// <summary>
+    /// Discovery Start Time
+    /// </summary>
+    private DateTime _discoveryStartTime;
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs b/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs
index 4d41f304b1..b7b65dc764 100644
--- a/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs
+++ b/src/Microsoft.TestPlatform.Client/Execution/TestRunRequest.cs
@@ -1,696 +1,702 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.Execution
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using ClientResources = Microsoft.VisualStudio.TestPlatform.Client.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.Execution;
+
+public class TestRunRequest : ITestRunRequest, IInternalTestRunEventsHandler
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    using ClientResources = Microsoft.VisualStudio.TestPlatform.Client.Resources.Resources;
-    using CommunicationObjectModel = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-
-    public class TestRunRequest : ITestRunRequest, ITestRunEventsHandler2
+    /// <summary>
+    /// Specifies whether the run is disposed or not
+    /// </summary>
+    private bool _isDisposed;
+
+    /// <summary>
+    /// Sync object for various operations
+    /// </summary>
+    private readonly object _syncObject = new();
+
+    /// <summary>
+    /// Sync object for cancel operation
+    /// </summary>
+    private readonly object _cancelSyncObject = new();
+
+    /// <summary>
+    /// The run completion event which will be signaled on completion of test run.
+    /// </summary>
+    private ManualResetEvent _runCompletionEvent = new(true);
+
+    /// <summary>
+    /// Tracks the time taken by each run request
+    /// </summary>
+    private readonly Stopwatch _runRequestTimeTracker = new();
+
+    private readonly IDataSerializer _dataSerializer;
+
+    /// <summary>
+    /// Time out for run provided by client.
+    /// </summary>
+    private long _testSessionTimeout;
+
+    private Timer? _timer;
+
+    /// <summary>
+    /// Execution Start Time
+    /// </summary>
+    private DateTime _executionStartTime;
+
+    /// <summary>
+    /// Request Data
+    /// </summary>
+    private readonly IRequestData _requestData;
+
+    internal TestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, IProxyExecutionManager executionManager, ITestLoggerManager loggerManager) :
+        this(requestData, testRunCriteria, executionManager, loggerManager, JsonDataSerializer.Instance)
     {
-        /// <summary>
-        /// The criteria/config for this test run request.
-        /// </summary>
-        internal TestRunCriteria testRunCriteria;
-
-        /// <summary>
-        /// Specifies whether the run is disposed or not
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Sync object for various operations
-        /// </summary>
-        private object syncObject = new object();
-
-        /// <summary>
-        /// Sync object for cancel operation
-        /// </summary>
-        private object cancelSyncObject = new object();
-
-        /// <summary>
-        /// The run completion event which will be signaled on completion of test run.
-        /// </summary>
-        private ManualResetEvent runCompletionEvent = new ManualResetEvent(true);
-
-        /// <summary>
-        /// Tracks the time taken by each run request
-        /// </summary>
-        private Stopwatch runRequestTimeTracker;
-
-        private IDataSerializer dataSerializer;
-
-        /// <summary>
-        /// Time out for run provided by client.
-        /// </summary>
-        private long testSessionTimeout;
-
-        private Timer timer;
-
-        /// <summary>
-        /// Execution Start Time
-        /// </summary>
-        private DateTime executionStartTime;
-
-        /// <summary>
-        /// Request Data
-        /// </summary>
-        private IRequestData requestData;
-
-        internal TestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, IProxyExecutionManager executionManager, ITestLoggerManager loggerManager) :
-            this(requestData, testRunCriteria, executionManager, loggerManager, JsonDataSerializer.Instance)
-        {
-        }
+    }
 
-        internal TestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, IProxyExecutionManager executionManager, ITestLoggerManager loggerManager, IDataSerializer dataSerializer)
-        {
-            Debug.Assert(testRunCriteria != null, "Test run criteria cannot be null");
-            Debug.Assert(executionManager != null, "ExecutionManager cannot be null");
-            Debug.Assert(requestData != null, "request Data is null");
-            Debug.Assert(loggerManager != null, "LoggerManager cannot be null");
+    internal TestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, IProxyExecutionManager executionManager, ITestLoggerManager loggerManager, IDataSerializer dataSerializer)
+    {
+        TPDebug.Assert(testRunCriteria != null, "Test run criteria cannot be null");
+        TPDebug.Assert(executionManager != null, "ExecutionManager cannot be null");
+        TPDebug.Assert(requestData != null, "request Data is null");
+        TPDebug.Assert(loggerManager != null, "LoggerManager cannot be null");
+
+        EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Creating test run request.");
+
+        TestRunCriteria = testRunCriteria;
+        ExecutionManager = executionManager;
+        LoggerManager = loggerManager;
+        State = TestRunState.Pending;
+        _dataSerializer = dataSerializer;
+        _requestData = requestData;
+    }
 
-            if (EqtTrace.IsVerboseEnabled)
+    #region ITestRunRequest
+
+    /// <summary>
+    /// Execute the test run asynchronously
+    /// </summary>
+    /// <returns>The process id of test host.</returns>
+    public int ExecuteAsync()
+    {
+        EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Starting.");
+
+        lock (_syncObject)
+        {
+            if (_isDisposed)
             {
-                EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Creating test run request.");
+                throw new ObjectDisposedException("testRunRequest");
             }
 
-            this.testRunCriteria = testRunCriteria;
-            this.ExecutionManager = executionManager;
-            this.LoggerManager = loggerManager;
-            this.State = TestRunState.Pending;
-            this.dataSerializer = dataSerializer;
-            this.requestData = requestData;
-        }
+            if (State != TestRunState.Pending)
+            {
+                throw new InvalidOperationException(ClientResources.InvalidStateForExecution);
+            }
 
-        #region ITestRunRequest
+            _executionStartTime = DateTime.UtcNow;
 
-        /// <summary>
-        /// Execute the test run asynchronously
-        /// </summary>
-        /// <returns>The process id of test host.</returns>
-        public int ExecuteAsync()
-        {
-            EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Starting.");
+            // Collecting Number of sources Sent For Execution
+            var numberOfSources = (uint)(TestRunCriteria.Sources?.Count() ?? 0);
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfSourcesSentForRun, numberOfSources);
 
-            lock (this.syncObject)
-            {
-                if (this.disposed)
-                {
-                    throw new ObjectDisposedException("testRunRequest");
-                }
+            EqtTrace.Info("TestRunRequest.ExecuteAsync: Starting run with settings:{0}", TestRunCriteria);
+            // Waiting for warm up to be over.
+            EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Wait for the first run request is over.");
 
-                if (this.State != TestRunState.Pending)
-                {
-                    throw new InvalidOperationException(ClientResources.InvalidStateForExecution);
-                }
+            State = TestRunState.InProgress;
 
-                this.executionStartTime = DateTime.UtcNow;
+            // Reset the run completion event
+            // (This needs to be done before queuing the test run because if the test run finishes fast then runCompletion event can
+            // remain in non-signaled state even though run is actually complete.
+            _runCompletionEvent.Reset();
 
-                // Collecting Number of sources Sent For Execution
-                var numberOfSources = (uint)(testRunCriteria.Sources != null ? testRunCriteria.Sources.Count<string>() : 0);
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfSourcesSentForRun, numberOfSources);
+            try
+            {
+                var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(TestRunCriteria.TestRunSettings);
+                _testSessionTimeout = runConfiguration.TestSessionTimeout;
 
-                if (EqtTrace.IsInfoEnabled)
+                if (_testSessionTimeout > 0)
                 {
-                    EqtTrace.Info("TestRunRequest.ExecuteAsync: Starting run with settings:{0}", this.testRunCriteria);
-                }
+                    EqtTrace.Verbose("TestRunRequest.ExecuteAsync: TestSessionTimeout is {0} milliseconds.", _testSessionTimeout);
 
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    // Waiting for warm up to be over.
-                    EqtTrace.Verbose("TestRunRequest.ExecuteAsync: Wait for the first run request is over.");
+                    _timer = new Timer(OnTestSessionTimeout, null, TimeSpan.FromMilliseconds(_testSessionTimeout), TimeSpan.FromMilliseconds(0));
                 }
 
-                this.State = TestRunState.InProgress;
-
-                // Reset the run completion event 
-                // (This needs to be done before queuing the test run because if the test run finishes fast then runCompletion event can 
-                // remain in non-signaled state even though run is actually complete.
-                this.runCompletionEvent.Reset();
+                // Start the stop watch for calculating the test run time taken overall
+                _runRequestTimeTracker.Restart();
+                var testRunStartEvent = new TestRunStartEventArgs(TestRunCriteria);
+                LoggerManager.HandleTestRunStart(testRunStartEvent);
+                OnRunStart.SafeInvoke(this, testRunStartEvent, "TestRun.TestRunStart");
+                int processId = ExecutionManager.StartTestRun(TestRunCriteria, this);
 
-                try
-                {
-                    var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(this.TestRunCriteria.TestRunSettings);
-                    this.testSessionTimeout = runConfiguration.TestSessionTimeout;
+                EqtTrace.Info("TestRunRequest.ExecuteAsync: Started.");
 
-                    if (testSessionTimeout > 0)
-                    {
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            EqtTrace.Verbose(String.Format("TestRunRequest.ExecuteAsync: TestSessionTimeout is {0} milliseconds.", testSessionTimeout));
-                        }
+                return processId;
+            }
+            catch
+            {
+                State = TestRunState.Pending;
+                throw;
+            }
+        }
+    }
 
-                        this.timer = new Timer(this.OnTestSessionTimeout, null, TimeSpan.FromMilliseconds(testSessionTimeout), TimeSpan.FromMilliseconds(0));
-                    }
+    internal void OnTestSessionTimeout(object? obj)
+    {
+        EqtTrace.Verbose("TestRunRequest.OnTestSessionTimeout: calling cancellation as test run exceeded testSessionTimeout {0} milliseconds", _testSessionTimeout);
 
-                    this.runRequestTimeTracker = new Stopwatch();
+        string message = string.Format(CultureInfo.CurrentCulture, ClientResources.TestSessionTimeoutMessage, _testSessionTimeout);
+        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = message };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
 
-                    // Start the stop watch for calculating the test run time taken overall
-                    this.runRequestTimeTracker.Start();
-                    var testRunStartEvent = new TestRunStartEventArgs(this.testRunCriteria);
-                    this.LoggerManager.HandleTestRunStart(testRunStartEvent);
-                    this.OnRunStart.SafeInvoke(this, testRunStartEvent, "TestRun.TestRunStart");
-                    int processId = this.ExecutionManager.StartTestRun(this.testRunCriteria, this);
+        HandleLogMessage(TestMessageLevel.Error, message);
+        HandleRawMessage(rawMessage);
+        Abort();
+    }
 
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Info("TestRunRequest.ExecuteAsync: Started.");
-                    }
+    /// <summary>
+    /// Wait for the run completion
+    /// </summary>
+    public bool WaitForCompletion(int timeout)
+    {
+        EqtTrace.Verbose("TestRunRequest.WaitForCompletion: Waiting with timeout {0}.", timeout);
 
-                    return processId;
-                }
-                catch
-                {
-                    this.State = TestRunState.Pending;
-                    throw;
-                }
-            }
+        if (_isDisposed)
+        {
+            throw new ObjectDisposedException("testRunRequest");
         }
 
-        internal void OnTestSessionTimeout(object obj)
+        if (State
+            is not TestRunState.InProgress
+            and not (TestRunState.Completed or TestRunState.Canceled or TestRunState.Aborted))
         {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose(string.Format("TestRunRequest.OnTestSessionTimeout: calling cancellation as test run exceeded testSessionTimeout {0} milliseconds", testSessionTimeout));
-            }
+            // If run is already terminated, then we should not throw an exception.
+            throw new InvalidOperationException(ClientResources.WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive);
+        }
 
-            string message = string.Format(ClientResources.TestSessionTimeoutMessage, this.testSessionTimeout);
-            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = message };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
+        // This method is not synchronized as it can lead to dead-lock
+        // (the runCompletionEvent cannot be raised unless that lock is released)
 
-            this.HandleLogMessage(TestMessageLevel.Error, message);
-            this.HandleRawMessage(rawMessage);
-            this.Abort();
-        }
+        // Wait for run completion (In case m_runCompletionEvent is closed, then waitOne will throw nice error)
+        return _runCompletionEvent == null || _runCompletionEvent.WaitOne(timeout);
+    }
 
-        /// <summary>
-        /// Wait for the run completion
-        /// </summary>
-        public bool WaitForCompletion(int timeout)
-        {
-            EqtTrace.Verbose("TestRunRequest.WaitForCompletion: Waiting with timeout {0}.", timeout);
+    /// <summary>
+    /// Cancel the test run asynchronously
+    /// </summary>
+    public void CancelAsync()
+    {
+        EqtTrace.Verbose("TestRunRequest.CancelAsync: Canceling.");
 
-            if (this.disposed)
+        lock (_cancelSyncObject)
+        {
+            if (_isDisposed)
             {
-                throw new ObjectDisposedException("testRunRequest");
+                EqtTrace.Warning("Ignoring TestRunRequest.CancelAsync() as testRunRequest object has already been disposed.");
+                return;
             }
 
-            if (this.State != TestRunState.InProgress
-                        && !(this.State == TestRunState.Completed
-                        || this.State == TestRunState.Canceled
-                        || this.State == TestRunState.Aborted))
+            if (State != TestRunState.InProgress)
             {
-                // If run is already terminated, then we should not throw an exception.
-                throw new InvalidOperationException(ClientResources.WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive);
+                EqtTrace.Info("Ignoring TestRunRequest.CancelAsync(). No test run in progress.");
             }
-
-            // This method is not synchronized as it can lead to dead-lock
-            // (the runCompletionEvent cannot be raised unless that lock is released)
-
-            // Wait for run completion (In case m_runCompletionEvent is closed, then waitOne will throw nice error)
-            if (this.runCompletionEvent != null)
+            else
             {
-                return this.runCompletionEvent.WaitOne(timeout);
+                // Inform the service about run cancellation
+                ExecutionManager.Cancel(this);
             }
-
-            return true;
         }
 
-        /// <summary>
-        /// Cancel the test run asynchronously
-        /// </summary>
-        public void CancelAsync()
-        {
-            EqtTrace.Verbose("TestRunRequest.CancelAsync: Canceling.");
-
-            lock (this.cancelSyncObject)
-            {
-                if (this.disposed)
-                {
-                    EqtTrace.Warning("Ignoring TestRunRequest.CancelAsync() as testRunRequest object has already been disposed.");
-                    return;
-                }
-
-                if (this.State != TestRunState.InProgress)
-                {
-                    EqtTrace.Info("Ignoring TestRunRequest.CancelAsync(). No test run in progress.");
-                }
-                else
-                {
-                    // Inform the service about run cancellation
-                    this.ExecutionManager.Cancel(this);
-                }
-            }
+        EqtTrace.Info("TestRunRequest.CancelAsync: Canceled.");
+    }
 
-            EqtTrace.Info("TestRunRequest.CancelAsync: Canceled.");
-        }
+    /// <summary>
+    /// Aborts the test run execution process.
+    /// </summary>
+    public void Abort()
+    {
+        EqtTrace.Verbose("TestRunRequest.Abort: Aborting.");
 
-        /// <summary>
-        /// Aborts the test run execution process.
-        /// </summary>
-        public void Abort()
+        lock (_cancelSyncObject)
         {
-            EqtTrace.Verbose("TestRunRequest.Abort: Aborting.");
-
-            lock (this.cancelSyncObject)
+            if (_isDisposed)
             {
-                if (this.disposed)
-                {
-                    EqtTrace.Warning("Ignoring TestRunRequest.Abort() as testRunRequest object has already been disposed");
-                    return;
-                }
-
-                if (this.State != TestRunState.InProgress)
-                {
-                    EqtTrace.Info("Ignoring TestRunRequest.Abort(). No test run in progress.");
-                }
-                else
-                {
-                    this.ExecutionManager.Abort(this);
-                }
+                EqtTrace.Warning("Ignoring TestRunRequest.Abort() as testRunRequest object has already been disposed");
+                return;
             }
 
-            EqtTrace.Info("TestRunRequest.Abort: Aborted.");
+            if (State != TestRunState.InProgress)
+            {
+                EqtTrace.Info("Ignoring TestRunRequest.Abort(). No test run in progress.");
+            }
+            else
+            {
+                ExecutionManager.Abort(this);
+            }
         }
 
+        EqtTrace.Info("TestRunRequest.Abort: Aborted.");
+    }
 
-        /// <summary>
-        /// Specifies the test run criteria
-        /// </summary>
-        public ITestRunConfiguration TestRunConfiguration
-        {
-            get { return this.testRunCriteria; }
-        }
 
-        /// <summary>
-        /// State of the test run
-        /// </summary>
-        public TestRunState State { get; private set; }
+    /// <summary>
+    /// Specifies the test run criteria
+    /// </summary>
+    public ITestRunConfiguration TestRunConfiguration
+    {
+        get { return TestRunCriteria; }
+    }
+
+    /// <summary>
+    /// State of the test run
+    /// </summary>
+    public TestRunState State { get; private set; }
 
-        /// <summary>
-        /// Raised when the test run statistics change.
-        /// </summary>
-        public event EventHandler<TestRunChangedEventArgs> OnRunStatsChange;
+    /// <summary>
+    /// Raised when the test run statistics change.
+    /// </summary>
+    public event EventHandler<TestRunChangedEventArgs>? OnRunStatsChange;
 
-        /// <summary>
-        /// Raised when the test run starts.
-        /// </summary>
-        public event EventHandler<TestRunStartEventArgs> OnRunStart;
+    /// <summary>
+    /// Raised when the test run starts.
+    /// </summary>
+    public event EventHandler<TestRunStartEventArgs>? OnRunStart;
 
-        /// <summary>
-        /// Raised when the test message is received.
-        /// </summary>
-        public event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    /// <summary>
+    /// Raised when the test message is received.
+    /// </summary>
+    public event EventHandler<TestRunMessageEventArgs>? TestRunMessage;
 
 
-        /// <summary>
-        /// Raised when the test run completes.
-        /// </summary>
-        public event EventHandler<TestRunCompleteEventArgs> OnRunCompletion;
+    /// <summary>
+    /// Raised when the test run completes.
+    /// </summary>
+    public event EventHandler<TestRunCompleteEventArgs>? OnRunCompletion;
 
 
-        /// <summary>
-        /// Raised when data collection message is received.
-        /// </summary>
+    /// <summary>
+    /// Raised when data collection message is received.
+    /// </summary>
 #pragma warning disable 67
-        public event EventHandler<DataCollectionMessageEventArgs> DataCollectionMessage;
+    public event EventHandler<DataCollectionMessageEventArgs>? DataCollectionMessage;
 #pragma warning restore 67
 
-        /// <summary>
-        ///  Raised when a test run event raw message is received from host
-        ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
-        ///  All the run events should come as raw messages as well as proper serialized events like OnRunStatsChange
-        /// </summary>
-        public event EventHandler<string> OnRawMessageReceived;
-
-        /// <summary>
-        /// Parent execution manager
-        /// </summary>
-        internal IProxyExecutionManager ExecutionManager
-        {
-            get; private set;
-        }
+    /// <summary>
+    ///  Raised when a test run event raw message is received from host
+    ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
+    ///  All the run events should come as raw messages as well as proper serialized events like OnRunStatsChange
+    /// </summary>
+    public event EventHandler<string>? OnRawMessageReceived;
+
+    /// <summary>
+    /// Parent execution manager
+    /// </summary>
+    internal IProxyExecutionManager ExecutionManager
+    {
+        get; private set;
+    }
 
-        /// <summary>
-        /// Logger manager.
-        /// </summary>
-        internal ITestLoggerManager LoggerManager
-        {
-            get; private set;
-        }
+    /// <summary>
+    /// Logger manager.
+    /// </summary>
+    internal ITestLoggerManager LoggerManager
+    {
+        get; private set;
+    }
 
-        #endregion
+    #endregion
 
-        #region IDisposable implementation
+    #region IDisposable implementation
 
-        // Summary:
-        // Performs application-defined tasks associated with freeing, releasing, or
-        // resetting unmanaged resources.
-        public void Dispose()
-        {
-            this.Dispose(true);
+    // Summary:
+    // Performs application-defined tasks associated with freeing, releasing, or
+    // resetting unmanaged resources.
+    public void Dispose()
+    {
+        Dispose(true);
 
-            GC.SuppressFinalize(this);
-        }
+        GC.SuppressFinalize(this);
+    }
 
-        #endregion
+    #endregion
 
-        public TestRunCriteria TestRunCriteria
-        {
-            get { return this.testRunCriteria; }
-        }
+    /// <summary>
+    /// The criteria/config for this test run request.
+    /// </summary>
+    public TestRunCriteria TestRunCriteria { get; internal set; }
+
+    /// <summary>
+    /// Invoked when test run is complete
+    /// </summary>
+    public void HandleTestRunComplete(TestRunCompleteEventArgs runCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris)
+    {
+        ValidateArg.NotNull(runCompleteArgs, nameof(runCompleteArgs));
+
+        bool isAborted = runCompleteArgs.IsAborted;
+        bool isCanceled = runCompleteArgs.IsCanceled;
 
-        /// <summary>
-        /// Invoked when test run is complete
-        /// </summary>
-        public void HandleTestRunComplete(TestRunCompleteEventArgs runCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris)
+        EqtTrace.Verbose("TestRunRequest:TestRunComplete: Starting. IsAborted:{0} IsCanceled:{1}.", isAborted, isCanceled);
+
+        lock (_syncObject)
         {
-            if (runCompleteArgs == null)
+            // If this object is disposed, don't do anything
+            if (_isDisposed)
             {
-                throw new ArgumentNullException(nameof(runCompleteArgs));
+                EqtTrace.Warning("TestRunRequest.TestRunComplete: Ignoring as the object is disposed.");
+                return;
             }
 
-            bool isAborted = runCompleteArgs.IsAborted;
-            bool isCanceled = runCompleteArgs.IsCanceled;
+            if (_runCompletionEvent.WaitOne(0))
+            {
+                EqtTrace.Info("TestRunRequest:TestRunComplete:Ignoring duplicate event. IsAborted:{0} IsCanceled:{1}.", isAborted, isCanceled);
+                return;
+            }
 
-            EqtTrace.Verbose("TestRunRequest:TestRunComplete: Starting. IsAborted:{0} IsCanceled:{1}.", isAborted, isCanceled);
+            // Disposing off the resources held by the execution manager so that the test host process can shut down.
+            ExecutionManager?.Close();
 
-            lock (this.syncObject)
+            try
             {
-                // If this object is disposed, don't do anything
-                if (this.disposed)
-                {
-                    EqtTrace.Warning("TestRunRequest.TestRunComplete: Ignoring as the object is disposed.");
-                    return;
-                }
+                _runRequestTimeTracker.Stop();
 
-                if (this.runCompletionEvent.WaitOne(0))
+                if (lastChunkArgs != null)
                 {
-                    EqtTrace.Info("TestRunRequest:TestRunComplete:Ignoring duplicate event. IsAborted:{0} IsCanceled:{1}.", isAborted, isCanceled);
-                    return;
+                    // Raised the changed event also
+                    LoggerManager.HandleTestRunStatsChange(lastChunkArgs);
+                    OnRunStatsChange.SafeInvoke(this, lastChunkArgs, "TestRun.RunStatsChanged");
                 }
 
-                // Disposing off the resources held by the execution manager so that the test host process can shut down.
-                this.ExecutionManager?.Close();
-
-                try
+                TestRunCompleteEventArgs runCompletedEvent =
+                    new(
+                        runCompleteArgs.TestRunStatistics,
+                        runCompleteArgs.IsCanceled,
+                        runCompleteArgs.IsAborted,
+                        runCompleteArgs.Error,
+                        // This is required as TMI adapter is sending attachments as List which cannot be type casted to Collection.
+                        runContextAttachments != null ? new Collection<AttachmentSet>(runContextAttachments.ToList()) : null,
+                        runCompleteArgs.InvokedDataCollectors,
+                        _runRequestTimeTracker.Elapsed);
+
+                // Add extensions discovered by vstest.console.
+                //
+                // TODO(copoiena): Writing telemetry twice is less than ideal.
+                // We first write telemetry data in the _requestData variable in the ParallelRunEventsHandler
+                // and then we write again here. We should refactor this code and write only once.
+                runCompleteArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary(
+                    runCompleteArgs.DiscoveredExtensions,
+                    TestPluginCache.Instance.TestExtensions?.GetCachedExtensions());
+
+                if (_requestData.IsTelemetryOptedIn)
                 {
-                    this.runRequestTimeTracker.Stop();
-
-                    if (lastChunkArgs != null)
-                    {
-                        // Raised the changed event also
-                        this.LoggerManager.HandleTestRunStatsChange(lastChunkArgs);
-                        this.OnRunStatsChange.SafeInvoke(this, lastChunkArgs, "TestRun.RunStatsChanged");
-                    }
-
-                    TestRunCompleteEventArgs runCompletedEvent =
-                        new TestRunCompleteEventArgs(
-                            runCompleteArgs.TestRunStatistics,
-                            runCompleteArgs.IsCanceled,
-                            runCompleteArgs.IsAborted,
-                            runCompleteArgs.Error,
-                            // This is required as TMI adapter is sending attachments as List which cannot be type casted to Collection.
-                            runContextAttachments != null ? new Collection<AttachmentSet>(runContextAttachments.ToList()) : null,
-                            this.runRequestTimeTracker.Elapsed);
-
-                    // Ignore the time sent (runCompleteArgs.ElapsedTimeInRunningTests)
-                    // by either engines - as both calculate at different points
-                    // If we use them, it would be an incorrect comparison between TAEF and Rocksteady
-                    this.LoggerManager.HandleTestRunComplete(runCompletedEvent);
-                    this.OnRunCompletion.SafeInvoke(this, runCompletedEvent, "TestRun.TestRunComplete");
+                    TestExtensions.AddExtensionTelemetry(
+                        runCompleteArgs.Metrics!,
+                        runCompleteArgs.DiscoveredExtensions);
                 }
-                finally
-                {
-                    if (isCanceled)
-                    {
-                        this.State = TestRunState.Canceled;
-                    }
-                    else if (isAborted)
-                    {
-                        this.State = TestRunState.Aborted;
-                    }
-                    else
-                    {
-                        this.State = TestRunState.Completed;
-                    }
 
-                    // Notify the waiting handle that run is complete
-                    this.runCompletionEvent.Set();
+                // Ignore the time sent (runCompleteArgs.ElapsedTimeInRunningTests)
+                // by either engines - as both calculate at different points
+                // If we use them, it would be an incorrect comparison between TAEF and Rocksteady
+                LoggerManager.HandleTestRunComplete(runCompletedEvent);
+                OnRunCompletion.SafeInvoke(this, runCompletedEvent, "TestRun.TestRunComplete");
+            }
+            finally
+            {
+                State = isCanceled
+                    ? TestRunState.Canceled
+                    : isAborted
+                        ? TestRunState.Aborted
+                        : TestRunState.Completed;
 
+                // Notify the waiting handle that run is complete
+                _runCompletionEvent.Set();
 
-                    var executionTotalTimeTaken = DateTime.UtcNow - this.executionStartTime;
+                var executionTotalTimeTaken = DateTime.UtcNow - _executionStartTime;
 
-                    // Fill in the time taken to complete the run
-                    this.requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecForRun, executionTotalTimeTaken.TotalSeconds);
+                // Fill in the time taken to complete the run
+                _requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecForRun, executionTotalTimeTaken.TotalSeconds);
 
-                    // Fill in the Metrics From Test Host Process
-                    var metrics = runCompleteArgs.Metrics;
-                    if (metrics != null && metrics.Count != 0)
+                // Fill in the Metrics From Test Host Process
+                var metrics = runCompleteArgs.Metrics;
+                if (metrics != null && metrics.Count != 0)
+                {
+                    foreach (var metric in metrics)
                     {
-                        foreach (var metric in metrics)
-                        {
-                            this.requestData.MetricsCollection.Add(metric.Key, metric.Value);
-                        }
+                        _requestData.MetricsCollection.Add(metric.Key, metric.Value);
                     }
                 }
-
-                EqtTrace.Info("TestRunRequest:TestRunComplete: Completed.");
             }
+
+            EqtTrace.Info("TestRunRequest:TestRunComplete: Completed.");
+        }
+    }
+
+    /// <summary>
+    /// Invoked when test run statistics change.
+    /// </summary>
+    public virtual void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        if (testRunChangedArgs == null)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Invoked when test run statistics change.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "1", Justification = "This is not an external event")]
-        public virtual void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
+        EqtTrace.Verbose("TestRunRequest:SendTestRunStatsChange: Starting.");
+        if (testRunChangedArgs.ActiveTests != null)
         {
-            if (testRunChangedArgs != null)
+            // Do verbose check to save performance in iterating test cases
+            if (EqtTrace.IsVerboseEnabled)
             {
-                EqtTrace.Verbose("TestRunRequest:SendTestRunStatsChange: Starting.");
-                if (testRunChangedArgs.ActiveTests != null)
+                foreach (TestCase testCase in testRunChangedArgs.ActiveTests)
                 {
-                    // Do verbose check to save performance in iterating test cases
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        foreach (TestCase testCase in testRunChangedArgs.ActiveTests)
-                        {
-                            EqtTrace.Verbose("InProgress is {0}", testCase.DisplayName);
-                        }
-                    }
+                    EqtTrace.Verbose("InProgress is {0}", testCase.DisplayName);
                 }
-
-                lock (this.syncObject)
-                {
-                    // If this object is disposed, don't do anything
-                    if (this.disposed)
-                    {
-                        EqtTrace.Warning("TestRunRequest.SendTestRunStatsChange: Ignoring as the object is disposed.");
-                        return;
-                    }
-
-                    // TODO: Invoke this event in a separate thread.
-                    // For now, I am setting the ConcurrencyMode on the callback attribute to Multiple
-                    this.LoggerManager.HandleTestRunStatsChange(testRunChangedArgs);
-                    this.OnRunStatsChange.SafeInvoke(this, testRunChangedArgs, "TestRun.RunStatsChanged");
-                }
-
-                EqtTrace.Info("TestRunRequest:SendTestRunStatsChange: Completed.");
             }
         }
 
-        /// <summary>
-        /// Invoked when log messages are received
-        /// </summary>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+        lock (_syncObject)
         {
-            EqtTrace.Verbose("TestRunRequest:SendTestRunMessage: Starting.");
-
-            lock (this.syncObject)
+            // If this object is disposed, don't do anything
+            if (_isDisposed)
             {
-                // If this object is disposed, don't do anything
-                if (this.disposed)
-                {
-                    EqtTrace.Warning("TestRunRequest.SendTestRunMessage: Ignoring as the object is disposed.");
-                    return;
-                }
-
-                var testRunMessageEvent = new TestRunMessageEventArgs(level, message);
-                this.LoggerManager.HandleTestRunMessage(testRunMessageEvent);
-                this.TestRunMessage.SafeInvoke(this, testRunMessageEvent, "TestRun.LogMessages");
+                EqtTrace.Warning("TestRunRequest.SendTestRunStatsChange: Ignoring as the object is disposed.");
+                return;
             }
 
-            EqtTrace.Info("TestRunRequest:SendTestRunMessage: Completed.");
+            // TODO: Invoke this event in a separate thread.
+            // For now, I am setting the ConcurrencyMode on the callback attribute to Multiple
+            LoggerManager.HandleTestRunStatsChange(testRunChangedArgs);
+            OnRunStatsChange.SafeInvoke(this, testRunChangedArgs, "TestRun.RunStatsChanged");
         }
 
-        /// <summary>
-        /// Handle Raw message directly from the host
-        /// </summary>
-        /// <param name="rawMessage"></param>
-        public void HandleRawMessage(string rawMessage)
-        {
-            // Note: Deserialize rawMessage only if required.
+        EqtTrace.Info("TestRunRequest:SendTestRunStatsChange: Completed.");
+    }
 
-            var message = this.LoggerManager.LoggersInitialized || this.requestData.IsTelemetryOptedIn ?
-                this.dataSerializer.DeserializeMessage(rawMessage) : null;
+    /// <summary>
+    /// Invoked when log messages are received
+    /// </summary>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        EqtTrace.Verbose("TestRunRequest:SendTestRunMessage: Starting.");
 
-            if (string.Equals(message?.MessageType, MessageType.ExecutionComplete))
+        lock (_syncObject)
+        {
+            // If this object is disposed, don't do anything
+            if (_isDisposed)
             {
-                var testRunCompletePayload = this.dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
-                rawMessage = UpdateRawMessageWithTelemetryInfo(testRunCompletePayload, message) ?? rawMessage;
-                HandleLoggerManagerTestRunComplete(testRunCompletePayload);
+                EqtTrace.Warning("TestRunRequest.SendTestRunMessage: Ignoring as the object is disposed.");
+                return;
             }
 
-            this.OnRawMessageReceived?.Invoke(this, rawMessage);
+            var testRunMessageEvent = new TestRunMessageEventArgs(level, message!);
+            LoggerManager.HandleTestRunMessage(testRunMessageEvent);
+            TestRunMessage.SafeInvoke(this, testRunMessageEvent, "TestRun.LogMessages");
         }
 
-        /// <summary>
-        /// Handles LoggerManager's TestRunComplete.
-        /// </summary>
-        /// <param name="testRunCompletePayload">TestRun complete payload.</param>
-        private void HandleLoggerManagerTestRunComplete(TestRunCompletePayload testRunCompletePayload)
+        EqtTrace.Info("TestRunRequest:SendTestRunMessage: Completed.");
+    }
+
+    /// <summary>
+    /// Handle Raw message directly from the host
+    /// </summary>
+    /// <param name="rawMessage"></param>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // Note: Deserialize rawMessage only if required.
+
+        var message = LoggerManager.LoggersInitialized || _requestData.IsTelemetryOptedIn ?
+            _dataSerializer.DeserializeMessage(rawMessage) : null;
+
+        if (MessageType.ExecutionComplete.Equals(message?.MessageType))
         {
-            if (this.LoggerManager.LoggersInitialized && testRunCompletePayload != null)
-            {
-                // Send last chunk to logger manager.
-                if (testRunCompletePayload.LastRunTests != null)
-                {
-                    this.LoggerManager.HandleTestRunStatsChange(testRunCompletePayload.LastRunTests);
-                }
+            var testRunCompletePayload = _dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
+            rawMessage = UpdateRawMessageWithTelemetryInfo(testRunCompletePayload, message) ?? rawMessage;
+            HandleLoggerManagerTestRunComplete(testRunCompletePayload);
+        }
 
-                // Note: In HandleRawMessage attachments are considered from TestRunCompleteArgs, while in HandleTestRunComplete attachments are considered directly from testRunCompletePayload.
-                // Ideally we should have attachmentSets at one place only.
-                // Send test run complete to logger manager.
-                TestRunCompleteEventArgs testRunCompleteArgs =
-                    new TestRunCompleteEventArgs(
-                        testRunCompletePayload.TestRunCompleteArgs.TestRunStatistics,
-                        testRunCompletePayload.TestRunCompleteArgs.IsCanceled,
-                        testRunCompletePayload.TestRunCompleteArgs.IsAborted,
-                        testRunCompletePayload.TestRunCompleteArgs.Error,
-                        testRunCompletePayload.TestRunCompleteArgs.AttachmentSets,
-                        this.runRequestTimeTracker.Elapsed);
-                this.LoggerManager.HandleTestRunComplete(testRunCompleteArgs);
-            }
+        OnRawMessageReceived?.SafeInvoke(this, rawMessage, "TestRunRequest.RawMessageReceived");
+    }
+
+    /// <summary>
+    /// Handles LoggerManager's TestRunComplete.
+    /// </summary>
+    /// <param name="testRunCompletePayload">TestRun complete payload.</param>
+    private void HandleLoggerManagerTestRunComplete(TestRunCompletePayload? testRunCompletePayload)
+    {
+        if (!LoggerManager.LoggersInitialized || testRunCompletePayload == null)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Update raw message with telemetry info.
-        /// </summary>
-        /// <param name="testRunCompletePayload">Test run complete payload.</param>
-        /// <param name="message">Updated rawMessage.</param>
-        /// <returns></returns>
-        private string UpdateRawMessageWithTelemetryInfo(TestRunCompletePayload testRunCompletePayload, Message message)
+        // Send last chunk to logger manager.
+        if (testRunCompletePayload.LastRunTests != null)
         {
-            var rawMessage = default(string);
-            if (this.requestData.IsTelemetryOptedIn)
-            {
-                if (testRunCompletePayload?.TestRunCompleteArgs != null)
-                {
-                    if (testRunCompletePayload.TestRunCompleteArgs.Metrics == null)
-                    {
-                        testRunCompletePayload.TestRunCompleteArgs.Metrics = this.requestData.MetricsCollection.Metrics;
-                    }
-                    else
-                    {
-                        foreach (var kvp in this.requestData.MetricsCollection.Metrics)
-                        {
-                            testRunCompletePayload.TestRunCompleteArgs.Metrics[kvp.Key] = kvp.Value;
-                        }
-                    }
+            LoggerManager.HandleTestRunStatsChange(testRunCompletePayload.LastRunTests);
+        }
 
-                    // Fill in the time taken to complete the run
-                    var executionTotalTimeTakenForDesignMode = DateTime.UtcNow - this.executionStartTime;
-                    testRunCompletePayload.TestRunCompleteArgs.Metrics[TelemetryDataConstants.TimeTakenInSecForRun] = executionTotalTimeTakenForDesignMode.TotalSeconds;
-                }
+        // Note: In HandleRawMessage attachments are considered from TestRunCompleteArgs, while in HandleTestRunComplete attachments are considered directly from testRunCompletePayload.
+        // Ideally we should have attachmentSets at one place only.
+        // Send test run complete to logger manager.
+        TestRunCompleteEventArgs testRunCompleteArgs =
+            new(
+                testRunCompletePayload.TestRunCompleteArgs!.TestRunStatistics,
+                testRunCompletePayload.TestRunCompleteArgs.IsCanceled,
+                testRunCompletePayload.TestRunCompleteArgs.IsAborted,
+                testRunCompletePayload.TestRunCompleteArgs.Error,
+                testRunCompletePayload.TestRunCompleteArgs.AttachmentSets,
+                testRunCompletePayload.TestRunCompleteArgs.InvokedDataCollectors,
+                _runRequestTimeTracker!.Elapsed);
+        LoggerManager.HandleTestRunComplete(testRunCompleteArgs);
+    }
 
-                if (message is VersionedMessage message1)
-                {
-                    var version = message1.Version;
+    /// <summary>
+    /// Update raw message with telemetry info.
+    /// </summary>
+    /// <param name="testRunCompletePayload">Test run complete payload.</param>
+    /// <param name="message">Updated rawMessage.</param>
+    /// <returns></returns>
+    private string? UpdateRawMessageWithTelemetryInfo(TestRunCompletePayload? testRunCompletePayload, Message? message)
+    {
+        var rawMessage = default(string);
+        if (!_requestData.IsTelemetryOptedIn)
+        {
+            return rawMessage;
+        }
 
-                    rawMessage = this.dataSerializer.SerializePayload(
-                        MessageType.ExecutionComplete,
-                        testRunCompletePayload,
-                        version);
-                }
-                else
+        if (testRunCompletePayload?.TestRunCompleteArgs != null)
+        {
+            if (testRunCompletePayload.TestRunCompleteArgs.Metrics == null)
+            {
+                testRunCompletePayload.TestRunCompleteArgs.Metrics = _requestData.MetricsCollection.Metrics;
+            }
+            else
+            {
+                foreach (var kvp in _requestData.MetricsCollection.Metrics)
                 {
-                    rawMessage = this.dataSerializer.SerializePayload(
-                        MessageType.ExecutionComplete,
-                        testRunCompletePayload);
+                    testRunCompletePayload.TestRunCompleteArgs.Metrics[kvp.Key] = kvp.Value;
                 }
             }
 
-            return rawMessage;
+            // Fill in the time taken to complete the run
+            var executionTotalTimeTakenForDesignMode = DateTime.UtcNow - _executionStartTime;
+            testRunCompletePayload.TestRunCompleteArgs.Metrics[TelemetryDataConstants.TimeTakenInSecForRun] = executionTotalTimeTakenForDesignMode.TotalSeconds;
+
+            // Add extensions discovered by vstest.console.
+            //
+            // TODO(copoiena):
+            // Doing extension merging here is incorrect because we can end up not merging the
+            // cached extensions for the current process (i.e. vstest.console) and hence have
+            // an incomplete list of discovered extensions. This can happen because this method
+            // is called only if telemetry is opted in (see: HandleRawMessage). We should handle
+            // this merge a level above in order to be consistent, but that means we'd have to
+            // deserialize all raw messages no matter if telemetry is opted in or not and that
+            // would probably mean a performance hit.
+            testRunCompletePayload.TestRunCompleteArgs.DiscoveredExtensions = TestExtensions.CreateMergedDictionary(
+                testRunCompletePayload.TestRunCompleteArgs.DiscoveredExtensions,
+                TestPluginCache.Instance.TestExtensions?.GetCachedExtensions());
+
+            // Write extensions to telemetry data.
+            TestExtensions.AddExtensionTelemetry(
+                testRunCompletePayload.TestRunCompleteArgs.Metrics,
+                testRunCompletePayload.TestRunCompleteArgs.DiscoveredExtensions);
         }
 
-        /// <summary>
-        /// Launch process with debugger attached
-        /// </summary>
-        /// <param name="testProcessStartInfo"></param>
-        /// <returns>processid</returns>
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        if (message is VersionedMessage message1)
         {
-            int processId = -1;
+            var version = message1.Version;
 
-            // Only launch while the test run is in progress and the launcher is a debug one
-            if (this.State == TestRunState.InProgress && this.testRunCriteria.TestHostLauncher.IsDebug)
-            {
-                processId = this.testRunCriteria.TestHostLauncher.LaunchTestHost(testProcessStartInfo);
-            }
-
-            return processId;
+            rawMessage = _dataSerializer.SerializePayload(
+                MessageType.ExecutionComplete,
+                testRunCompletePayload,
+                version);
         }
+        else
+        {
+            rawMessage = _dataSerializer.SerializePayload(
+                MessageType.ExecutionComplete,
+                testRunCompletePayload);
+        }
+
+        return rawMessage;
+    }
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
+    /// <summary>
+    /// Launch process with debugger attached
+    /// </summary>
+    /// <param name="testProcessStartInfo"></param>
+    /// <returns>processid</returns>
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        int processId = -1;
+
+        TPDebug.Assert(TestRunCriteria.TestHostLauncher is not null, "TestRunCriteria.TestHostLauncher is null");
+        // Only launch while the test run is in progress and the launcher is a debug one
+        if (State == TestRunState.InProgress && TestRunCriteria.TestHostLauncher.IsDebug)
         {
-            return this.testRunCriteria.TestHostLauncher is ITestHostLauncher2 launcher
-                    && launcher.AttachDebuggerToProcess(pid);
+            processId = TestRunCriteria.TestHostLauncher.LaunchTestHost(testProcessStartInfo);
         }
 
-        /// <summary>
-        /// Dispose the run
-        /// </summary>
-        /// <param name="disposing"></param>
-        protected virtual void Dispose(bool disposing)
+        return processId;
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        return TestRunCriteria.TestHostLauncher switch
         {
-            EqtTrace.Verbose("TestRunRequest.Dispose: Starting.");
+            ITestHostLauncher3 launcher3 => launcher3.AttachDebuggerToProcess(attachDebuggerInfo, CancellationToken.None),
+            ITestHostLauncher2 launcher2 => launcher2.AttachDebuggerToProcess(attachDebuggerInfo.ProcessId),
+            _ => false
+        };
+    }
 
-            lock (this.syncObject)
+    /// <summary>
+    /// Dispose the run
+    /// </summary>
+    /// <param name="disposing"></param>
+    protected virtual void Dispose(bool disposing)
+    {
+        EqtTrace.Verbose("TestRunRequest.Dispose: Starting.");
+
+        lock (_syncObject)
+        {
+            if (!_isDisposed)
             {
-                if (!this.disposed)
+                if (disposing)
                 {
-                    if (disposing)
-                    {
-                        this.runCompletionEvent?.Dispose();
-                    }
-
-                    // Indicate that object has been disposed
-                    this.runCompletionEvent = null;
-                    this.disposed = true;
+                    _runCompletionEvent?.Dispose();
                 }
-            }
 
-            EqtTrace.Info("TestRunRequest.Dispose: Completed.");
+                // Indicate that object has been disposed
+                _runCompletionEvent = null!;
+                _isDisposed = true;
+            }
         }
+
+        EqtTrace.Info("TestRunRequest.Dispose: Completed.");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Client/Friends.cs b/src/Microsoft.TestPlatform.Client/Friends.cs
index 90a5d9db6f..e2d40a1025 100644
--- a/src/Microsoft.TestPlatform.Client/Friends.cs
+++ b/src/Microsoft.TestPlatform.Client/Friends.cs
@@ -5,10 +5,15 @@
 
 #region Product Assemblies
 
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
 #endregion
 
 #region Test Assemblies
 
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Client.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 
 #endregion
diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
index 2e464bba56..ec5cfaeae2 100644
--- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
+++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Client</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
+    <!--
+      This project is client that is used only by runners, and shipped only in runner packages.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
@@ -24,7 +20,7 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Serialization" />
@@ -46,5 +42,14 @@
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Client</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI\netstandard2.0\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.TestPlatform.Client/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Client/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7b65ce42ca..0000000000
--- a/src/Microsoft.TestPlatform.Client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.VisualStudio.TestPlatform.Client")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b0fab848-d0a2-49dd-8450-aa16bab3bbeb")]
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d2cc0363c6
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,90 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.ConnectToClientAndProcessRequests(int port, Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager! testRequestManager) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.DesignModeClient() -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.HandleParentProcessExit() -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.LaunchCustomHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo, System.Threading.CancellationToken cancellationToken) -> int
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.onAttachDebuggerAckRecieved -> System.Action<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!>?
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.onCustomTestHostLaunchAckReceived -> System.Action<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!>?
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.SendRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.SendTestMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.TestRunMessageHandler(object? sender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.DesignModeTestEventsRegistrar(Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient! designModeClient) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.LogWarning(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.RegisterDiscoveryEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest! discoveryRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.RegisterTestRunEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest! testRunRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.UnregisterDiscoveryEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest! discoveryRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestEventsRegistrar.UnregisterTestRunEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest! testRunRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestHostLauncherFactory
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.ConnectToClientAndProcessRequests(int port, Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager! testRequestManager) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.HandleParentProcessExit() -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.LaunchCustomHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! defaultTestHostStartInfo, System.Threading.CancellationToken cancellationToken) -> int
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.SendRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.SendTestMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.DiscoverAsync() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.DiscoveryCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria!
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.OnDiscoveredTests -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.OnDiscoveryComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.OnDiscoveryMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.OnDiscoveryStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Discovery.DiscoveryRequest.OnRawMessageReceived -> System.EventHandler<string!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.CancelAsync() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.DataCollectionMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.ExecuteAsync() -> int
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! runCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.OnRawMessageReceived -> System.EventHandler<string!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.OnRunCompletion -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.OnRunStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.OnRunStatsChange -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.State.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.TestRunConfiguration.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration!
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.TestRunCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria!
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.TestRunMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.WaitForCompletion(int timeout) -> bool
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.AbortTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.CancelDiscovery() -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.CancelTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.CancelTestRunAttachmentsProcessing() -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload! discoveryPayload, Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscoveryEventsRegistrar! disoveryEventsRegistrar, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig) -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.InitializeExtensions(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, bool skipExtensionFilters) -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.ProcessTestRunAttachments(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload! testRunAttachmentsProcessingPayload, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler! testRunAttachmentsProcessingEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig) -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.ResetOptions() -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestPlatformFactory
+Microsoft.VisualStudio.TestPlatform.Client.TestPlatformFactory.TestPlatformFactory() -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.HandleProcessedAttachmentsChunk(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments) -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs! attachmentsProcessingCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingProgress(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs! attachmentsProcessingProgressEventArgs) -> void
+Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing.TestRunAttachmentsProcessingEventsHandler.TestRunAttachmentsProcessingEventsHandler(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager! communicationManager) -> void
+static Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.Initialize() -> void
+static Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.Instance.get -> Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient?
+static Microsoft.VisualStudio.TestPlatform.Client.TestPlatformFactory.GetTestPlatform() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform!
+virtual Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.Dispose(bool disposing) -> void
+virtual Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload! payload, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig) -> void
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo, System.Threading.CancellationToken cancellationToken) -> bool
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo, System.Threading.CancellationToken cancellationToken) -> bool
+Microsoft.VisualStudio.TestPlatform.Client.Execution.TestRunRequest.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo) -> bool
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.RunTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload! testRunRequestPayLoad, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher3? customTestHostLauncher, Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRunEventsRegistrar! testRunEventsRegistrar, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig) -> void
+Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager.StartTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload! payload, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher3? testHostLauncher, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig) -> void
+static Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(Microsoft.VisualStudio.TestPlatform.Client.DesignMode.IDesignModeClient! designModeClient, bool debuggingEnabled) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher3!
+Microsoft.VisualStudio.TestPlatform.Client.DesignMode.DesignModeClient.TestRequestManager.get -> Microsoft.VisualStudio.TestPlatform.Client.RequestHelper.ITestRequestManager?
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs b/src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs
index 714e1df9cb..758c63a6f0 100644
--- a/src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs
+++ b/src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs
@@ -1,110 +1,122 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.RequestHelper
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+
+/// <summary>
+/// Defines the contract for running various requests.
+/// </summary>
+public interface ITestRequestManager : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+    /// <summary>
+    /// Initializes the extensions while probing additional paths.
+    /// </summary>
+    ///
+    /// <param name="pathToAdditionalExtensions">Paths to additional extensions.</param>
+    /// <param name="skipExtensionFilters">Skip extension filtering by name if true.</param>
+    void InitializeExtensions(
+        IEnumerable<string>? pathToAdditionalExtensions,
+        bool skipExtensionFilters);
 
     /// <summary>
-    /// Defines the contract for running various requests.
+    /// Resets vstest.console.exe options.
     /// </summary>
-    public interface ITestRequestManager : IDisposable
-    {
-        /// <summary>
-        /// Initializes the extensions while probing additional paths.
-        /// </summary>
-        /// 
-        /// <param name="pathToAdditionalExtensions">Paths to additional extensions.</param>
-        /// <param name="skipExtensionFilters">Skip extension filtering by name if true.</param>
-        void InitializeExtensions(
-            IEnumerable<string> pathToAdditionalExtensions,
-            bool skipExtensionFilters);
+    void ResetOptions();
 
-        /// <summary>
-        /// Resets vstest.console.exe options.
-        /// </summary>
-        void ResetOptions();
+    /// <summary>
+    /// Discovers tests given a list of sources and some run settings.
+    /// </summary>
+    ///
+    /// <param name="discoveryPayload">Discovery payload.</param>
+    /// <param name="disoveryEventsRegistrar">Discovery events registrar.</param>
+    /// <param name="protocolConfig">Protocol related information.</param>
+    void DiscoverTests(
+        DiscoveryRequestPayload discoveryPayload,
+        ITestDiscoveryEventsRegistrar disoveryEventsRegistrar,
+        ProtocolConfig protocolConfig);
 
-        /// <summary>
-        /// Discovers tests given a list of sources and some run settings.
-        /// </summary>
-        /// 
-        /// <param name="discoveryPayload">Discovery payload.</param>
-        /// <param name="disoveryEventsRegistrar">Discovery events registrar.</param>
-        /// <param name="protocolConfig">Protocol related information.</param>
-        void DiscoverTests(
-            DiscoveryRequestPayload discoveryPayload,
-            ITestDiscoveryEventsRegistrar disoveryEventsRegistrar,
-            ProtocolConfig protocolConfig);
+    /// <summary>
+    /// Runs tests given a list of sources and some run settings.
+    /// </summary>
+    ///
+    /// <param name="testRunRequestPayLoad">Test run request payload.</param>
+    /// <param name="customTestHostLauncher">Custom test host launcher for the run.</param>
+    /// <param name="testRunEventsRegistrar">Run events registrar.</param>
+    /// <param name="protocolConfig">Protocol related information.</param>
+    void RunTests(
+        TestRunRequestPayload testRunRequestPayLoad,
+        ITestHostLauncher3? customTestHostLauncher,
+        ITestRunEventsRegistrar testRunEventsRegistrar,
+        ProtocolConfig protocolConfig);
 
-        /// <summary>
-        /// Runs tests given a list of sources and some run settings.
-        /// </summary>
-        /// 
-        /// <param name="testRunRequestPayLoad">Test run request payload.</param>
-        /// <param name="customTestHostLauncher">Custom test host launcher for the run.</param>
-        /// <param name="testRunEventsRegistrar">Run events registrar.</param>
-        /// <param name="protocolConfig">Protocol related information.</param>
-        void RunTests(
-            TestRunRequestPayload testRunRequestPayLoad,
-            ITestHostLauncher customTestHostLauncher,
-            ITestRunEventsRegistrar testRunEventsRegistrar,
-            ProtocolConfig protocolConfig);
+    /// <summary>
+    /// Processes test run attachments.
+    /// </summary>
+    ///
+    /// <param name="testRunAttachmentsProcessingPayload">
+    /// Test run attachments processing payload.
+    /// </param>
+    /// <param name="testRunAttachmentsProcessingEventsHandler">
+    /// Test run attachments processing events handler.
+    /// </param>
+    /// <param name="protocolConfig">Protocol related information.</param>
+    void ProcessTestRunAttachments(
+        TestRunAttachmentsProcessingPayload testRunAttachmentsProcessingPayload,
+        ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingEventsHandler,
+        ProtocolConfig protocolConfig);
 
-        /// <summary>
-        /// Processes test run attachments.
-        /// </summary>
-        /// 
-        /// <param name="testRunAttachmentsProcessingPayload">
-        /// Test run attachments processing payload.
-        /// </param>
-        /// <param name="testRunAttachmentsProcessingEventsHandler">
-        /// Test run attachments processing events handler.
-        /// </param>
-        /// <param name="protocolConfig">Protocol related information.</param>
-        void ProcessTestRunAttachments(
-            TestRunAttachmentsProcessingPayload testRunAttachmentsProcessingPayload,
-            ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingEventsHandler,
-            ProtocolConfig protocolConfig);
+    /// <summary>
+    /// Starts a test session.
+    /// </summary>
+    ///
+    /// <param name="payload">The start test session payload.</param>
+    /// <param name="testHostLauncher">The custom test host launcher.</param>
+    /// <param name="eventsHandler">The events handler.</param>
+    /// <param name="protocolConfig">Protocol related information.</param>
+    void StartTestSession(
+        StartTestSessionPayload payload,
+        ITestHostLauncher3? testHostLauncher,
+        ITestSessionEventsHandler eventsHandler,
+        ProtocolConfig protocolConfig);
 
-        /// <summary>
-        /// Starts a test session.
-        /// </summary>
-        /// 
-        /// <param name="payload">The start test session payload.</param>
-        /// <param name="testHostLauncher">The custom test host launcher.</param>
-        /// <param name="eventsHandler">The events handler.</param>
-        /// <param name="protocolConfig">Protocol related information.</param>
-        void StartTestSession(
-            StartTestSessionPayload payload,
-            ITestHostLauncher testHostLauncher,
-            ITestSessionEventsHandler eventsHandler,
-            ProtocolConfig protocolConfig);
+    /// <summary>
+    /// Stops a test session.
+    /// </summary>
+    ///
+    /// <param name="payload">The stop test session payload.</param>
+    /// <param name="eventsHandler">The events handler.</param>
+    /// <param name="protocolConfig">Protocol related information.</param>
+    void StopTestSession(
+        StopTestSessionPayload payload,
+        ITestSessionEventsHandler eventsHandler,
+        ProtocolConfig protocolConfig);
 
-        /// <summary>
-        /// Cancel the current test run request.
-        /// </summary>
-        void CancelTestRun();
+    /// <summary>
+    /// Cancel the current test run request.
+    /// </summary>
+    void CancelTestRun();
 
-        /// <summary>
-        /// Abort the current test run.
-        /// </summary>
-        void AbortTestRun();
+    /// <summary>
+    /// Abort the current test run.
+    /// </summary>
+    void AbortTestRun();
 
-        /// <summary>
-        /// Cancels the current discovery request.
-        /// </summary>
-        void CancelDiscovery();
+    /// <summary>
+    /// Cancels the current discovery request.
+    /// </summary>
+    void CancelDiscovery();
 
-        /// <summary>
-        /// Cancels the current test run attachments processing request.
-        /// </summary>
-        void CancelTestRunAttachmentsProcessing();
-    }
+    /// <summary>
+    /// Cancels the current test run attachments processing request.
+    /// </summary>
+    void CancelTestRunAttachmentsProcessing();
 }
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.cs.xlf
index 130037af9d..b75d2bec98 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.cs.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Testovací běh nešlo spustit, protože byl neplatný počáteční stav.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">V případě, že nejsou aktivní žádné testovací běhy, se operace čekání na dokončení nepovoluje. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Testovací běh se ruší: byl překročen časový limit testovacího běhu ({0} ms).</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Pro tento běh se nenašel žádný vhodný zprostředkovatel testů v režimu runtime.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Testovací běh nešlo spustit, protože byl neplatný počáteční stav.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">V případě, že nejsou aktivní žádné testovací běhy, se operace čekání na dokončení nepovoluje. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Testovací běh se ruší: byl překročen časový limit testovacího běhu ({0} ms).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Pro tento běh se nenašel žádný vhodný zprostředkovatel testů v režimu runtime.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.de.xlf
index 696353c967..b722981722 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.de.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Der Testlauf konnte nicht ausgeführt werden, weil der Anfangszustand ungültig war.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">Das Warten auf den Fertigstellungsvorgang ist unzulässig, wenn kein aktiver Testlauf vorhanden ist. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Der Testlauf wird abgebrochen: Das Timeout von {0} Millisekunden für den Testlauf wurde überschritten.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Für diese Ausführung wurde kein geeigneter Testlaufzeitanbieter gefunden.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Der Testlauf konnte nicht ausgeführt werden, weil der Anfangszustand ungültig war.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">Das Warten auf den Fertigstellungsvorgang ist unzulässig, wenn kein aktiver Testlauf vorhanden ist. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Der Testlauf wird abgebrochen: Das Timeout von {0} Millisekunden für den Testlauf wurde überschritten.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Für diese Ausführung wurde kein geeigneter Testlaufzeitanbieter gefunden.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.es.xlf
index fa89843ebc..795f155215 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.es.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">No se pudo ejecutar la serie de pruebas porque el estado inicial no era válido.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">La operación “Esperar que termine” no se permite cuando no hay ninguna serie de pruebas activa. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Anulando la serie de pruebas: se superó el tiempo de espera de {0} milisegundos para la serie de pruebas.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">No se encontró un proveedor de tiempo de ejecución de prueba adecuado para esta ejecución.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">No se pudo ejecutar la serie de pruebas porque el estado inicial no era válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">La operación “Esperar que termine” no se permite cuando no hay ninguna serie de pruebas activa. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Anulando la serie de pruebas: se superó el tiempo de espera de {0} milisegundos para la serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">No se encontró un proveedor de tiempo de ejecución de prueba adecuado para esta ejecución.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.fr.xlf
index 4a91eaea6f..de3857c34d 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.fr.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Impossible d'exécuter la série de tests, car l'état initial est non valide.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">L'attente de la fin de l'exécution d'une opération n'est pas autorisée quand il n'existe aucune série de tests active. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Abandon de la série de tests : dépassement du délai d'expiration de la série de tests fixé à {0} millisecondes.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Aucun fournisseur d'exécution de tests approprié n'a été trouvé pour cette série.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Impossible d'exécuter la série de tests, car l'état initial est non valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">L'attente de la fin de l'exécution d'une opération n'est pas autorisée quand il n'existe aucune série de tests active. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Abandon de la série de tests : dépassement du délai d'expiration de la série de tests fixé à {0} millisecondes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Aucun fournisseur d'exécution de tests approprié n'a été trouvé pour cette série.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.it.xlf
index bd7749d7f0..5c1c78429e 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.it.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Non è stato possibile completare l'esecuzione dei test perché lo stato iniziale non era valido.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">L'operazione di attesa completamento non è consentita se non sono presenti esecuzioni dei test attive. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Interruzione dell'esecuzione dei test: è stato superato il timeout dell'esecuzione dei test, pari a {0} millisecondi.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Non è stato trovato alcun provider di runtime dei test adatto per questa esecuzione.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Non è stato possibile completare l'esecuzione dei test perché lo stato iniziale non era valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">L'operazione di attesa completamento non è consentita se non sono presenti esecuzioni dei test attive. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Interruzione dell'esecuzione dei test: è stato superato il timeout dell'esecuzione dei test, pari a {0} millisecondi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Non è stato trovato alcun provider di runtime dei test adatto per questa esecuzione.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ja.xlf
index 7ee98aebfa..8a41f55e84 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ja.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">初期状態が無効なため、テストの実行を実行できませんでした。</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">アクティブなテストの実行がない場合、完了の待機操作は許可されません。</target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">テストの実行を中止しています: テスト実行のタイムアウト {0} ミリ秒を超過しました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">この実行に対して適切なテスト ランタイム プロバイダーが見つかりませんでした。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">初期状態が無効なため、テストの実行を実行できませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">アクティブなテストの実行がない場合、完了の待機操作は許可されません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">テストの実行を中止しています: テスト実行のタイムアウト {0} ミリ秒を超過しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">この実行に対して適切なテスト ランタイム プロバイダーが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ko.xlf
index 016e6ed72d..4ab193fad0 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ko.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">초기 상태가 잘못되어 테스트 실행을 실행할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">활성 테스트 실행이 없으면 완료 작업을 대기할 수 없습니다. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">테스트 실행 중단 중: 테스트 실행 시간 제한 {0}밀리초가 초과되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">이 실행에 적합한 테스트 런타임 공급자를 찾지 못했습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">초기 상태가 잘못되어 테스트 실행을 실행할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">활성 테스트 실행이 없으면 완료 작업을 대기할 수 없습니다. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">테스트 실행 중단 중: 테스트 실행 시간 제한 {0}밀리초가 초과되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">이 실행에 적합한 테스트 런타임 공급자를 찾지 못했습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pl.xlf
index be1dd5c075..85452cc58a 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pl.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Nie można wykonać przebiegu testu, ponieważ stan początkowy jest nieprawidłowy.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">Oczekiwanie na operację zakończenia nie jest dozwolone, gdy nie ma aktywnego przebiegu testu. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Przerywanie przebiegu testu: przekroczono limit czasu dla przebiegu testu równy {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Nie znaleziono odpowiedniego dostawcy testowego środowiska uruchomieniowego dla tego uruchomienia.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Nie można wykonać przebiegu testu, ponieważ stan początkowy jest nieprawidłowy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">Oczekiwanie na operację zakończenia nie jest dozwolone, gdy nie ma aktywnego przebiegu testu. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Przerywanie przebiegu testu: przekroczono limit czasu dla przebiegu testu równy {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Nie znaleziono odpowiedniego dostawcy testowego środowiska uruchomieniowego dla tego uruchomienia.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pt-BR.xlf
index f851bd4b20..66beb85c5a 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.pt-BR.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">A execução de teste não pôde ser realizada porque o estado inicial era inválido.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">A operação esperar conclusão não é permitida quando não há nenhuma execução de teste ativa. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Anulando a execução de teste: o tempo limite da execução de teste de {0} milissegundos foi excedido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Nenhum provedor de runtime de teste encontrado para esta execução.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">A execução de teste não pôde ser realizada porque o estado inicial era inválido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">A operação esperar conclusão não é permitida quando não há nenhuma execução de teste ativa. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Anulando a execução de teste: o tempo limite da execução de teste de {0} milissegundos foi excedido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Nenhum provedor de runtime de teste encontrado para esta execução.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ru.xlf
index 4f3126a6d5..1f3f922fc0 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.ru.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">Не удалось выполнить тестовый запуск из-за недопустимого начального состояния.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">Операция "Ожидать завершения" запрещена, если нет активного тестового запуска.</target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Тестовый запуск отменяется: превышено допустимое время ожидания в {0} мс.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Не найден подходящий поставщик среды выполнения теста для этого запуска.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">Не удалось выполнить тестовый запуск из-за недопустимого начального состояния.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">Операция "Ожидать завершения" запрещена, если нет активного тестового запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Тестовый запуск отменяется: превышено допустимое время ожидания в {0} мс.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Не найден подходящий поставщик среды выполнения теста для этого запуска.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.tr.xlf
index 88325a4bb4..45f5697dfb 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.tr.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">İlk durum geçersiz olduğundan test çalıştırması yürütülemedi.</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">Etkin bir test çalıştırması olmadığında tamamlanmasını bekleme işlemine izin verilmez. </target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">Test çalıştırması durduruluyor: Test çalıştırması için {0} milisaniyelik zaman aşımına ulaşıldı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">Bu çalıştırma için uygun bir test çalışma zamanı sağlayıcısı yok.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">İlk durum geçersiz olduğundan test çalıştırması yürütülemedi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">Etkin bir test çalıştırması olmadığında tamamlanmasını bekleme işlemine izin verilmez. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">Test çalıştırması durduruluyor: Test çalıştırması için {0} milisaniyelik zaman aşımına ulaşıldı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">Bu çalıştırma için uygun bir test çalışma zamanı sağlayıcısı yok.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf
index cd65667a74..808025100a 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.xlf
@@ -4,22 +4,22 @@
     <body>
       <trans-unit id="InvalidStateForExecution">
         <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
         <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestSessionTimeoutMessage">
         <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
         <target state="new">Canceling test run as it crossed testSessionTimeout: {0} milliseconds.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestHostProviderFound">
         <source>No suitable test runtime provider found for this run.</source>
         <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hans.xlf
index 5f3ce7babc..d2e08e3ee2 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">由于初始状态无效，无法执行测试运行。</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">没有活动的测试运行时不允许等待完成操作。</target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">中止测试运行: 测试运行超时时间超出 {0} 毫秒。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">对于此运行，未找到适合的测试运行时提供程序。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">由于初始状态无效，无法执行测试运行。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">没有活动的测试运行时不允许等待完成操作。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">中止测试运行: 测试运行超时时间超出 {0} 毫秒。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">对于此运行，未找到适合的测试运行时提供程序。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hant.xlf
index 22e7d1e87b..3d4a773655 100644
--- a/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Client/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="InvalidStateForExecution">
-        <source>The test run could not be executed because the initial state was invalid.</source>
-        <note></note>
-        <target state="translated">因為初始狀態無效，所以無法執行測試回合。</target>
-      </trans-unit>
-      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
-        <source>Wait for completion operation is not allowed when there is no active test run. </source>
-        <note></note>
-        <target state="translated">沒有使用中的測試回合時，不允許等候完成作業。</target>
-      </trans-unit>
-      <trans-unit id="TestSessionTimeoutMessage">
-        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
-        <target state="translated">正在中止測試回合: 超過了測試回合逾時 ({0} 毫秒)。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="translated">找不到適用於此回合的測試執行階段提供者。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="InvalidStateForExecution">
+        <source>The test run could not be executed because the initial state was invalid.</source>
+        <target state="translated">因為初始狀態無效，所以無法執行測試回合。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive">
+        <source>Wait for completion operation is not allowed when there is no active test run. </source>
+        <target state="translated">沒有使用中的測試回合時，不允許等候完成作業。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSessionTimeoutMessage">
+        <source>Aborting test run: test run timeout of {0} milliseconds exceeded.</source>
+        <target state="translated">正在中止測試回合: 超過了測試回合逾時 ({0} 毫秒)。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider found for this run.</source>
+        <target state="translated">找不到適用於此回合的測試執行階段提供者。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Client/TestPlatform.cs b/src/Microsoft.TestPlatform.Client/TestPlatform.cs
index bb7c62320d..56a1dea9c2 100644
--- a/src/Microsoft.TestPlatform.Client/TestPlatform.cs
+++ b/src/Microsoft.TestPlatform.Client/TestPlatform.cs
@@ -1,339 +1,415 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.Discovery;
+using Microsoft.VisualStudio.TestPlatform.Client.Execution;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client;
+
+/// <summary>
+/// Implementation for TestPlatform.
+/// </summary>
+internal class TestPlatform : ITestPlatform
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.Client.Execution;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using ClientResources = Resources.Resources;
+    private readonly ITestRuntimeProviderManager _testHostProviderManager;
+
+    private readonly IFileHelper _fileHelper;
+
+    static TestPlatform()
+    {
+        // TODO: This is not the right way to force initialization of default extensions.
+        // Test runtime providers require this today. They're getting initialized even before
+        // test adapter paths are provided, which is incorrect.
+        AddExtensionAssembliesFromExtensionDirectory();
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestPlatform"/> class.
+    /// </summary>
+    public TestPlatform()
+        : this(
+            new TestEngine(),
+            new FileHelper(),
+            TestRuntimeProviderManager.Instance)
+    {
+    }
 
     /// <summary>
-    /// Implementation for TestPlatform.
+    /// Initializes a new instance of the <see cref="TestPlatform"/> class.
     /// </summary>
-    internal class TestPlatform : ITestPlatform
+    ///
+    /// <param name="testEngine">The test engine.</param>
+    /// <param name="filehelper">The file helper.</param>
+    /// <param name="testHostProviderManager">The data.</param>
+    protected internal TestPlatform(
+        ITestEngine testEngine,
+        IFileHelper filehelper,
+        ITestRuntimeProviderManager testHostProviderManager)
     {
-        private readonly TestRuntimeProviderManager testHostProviderManager;
+        _testEngine = testEngine;
+        _fileHelper = filehelper;
+        _testHostProviderManager = testHostProviderManager;
+    }
 
-        private readonly IFileHelper fileHelper;
+    private readonly ITestEngine _testEngine;
 
-        static TestPlatform()
-        {
-            // TODO: This is not the right way to force initialization of default extensions.
-            // Test runtime providers require this today. They're getting initialized even before
-            // test adapter paths are provided, which is incorrect.
-            AddExtensionAssembliesFromExtensionDirectory();
-        }
+    /// <inheritdoc/>
+    public IDiscoveryRequest CreateDiscoveryRequest(
+        IRequestData requestData,
+        DiscoveryCriteria discoveryCriteria,
+        TestPlatformOptions? options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        ValidateArg.NotNull(discoveryCriteria, nameof(discoveryCriteria));
+
+        PopulateExtensions(discoveryCriteria.RunSettings, discoveryCriteria.Sources);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPlatform"/> class.
-        /// </summary>
-        public TestPlatform()
-            : this(
-                  new TestEngine(),
-                  new FileHelper(),
-                  TestRuntimeProviderManager.Instance)
+        // Initialize loggers.
+        ITestLoggerManager loggerManager = _testEngine.GetLoggerManager(requestData);
+        loggerManager.Initialize(discoveryCriteria.RunSettings);
+
+        IProxyDiscoveryManager discoveryManager = _testEngine.GetDiscoveryManager(requestData, discoveryCriteria, sourceToSourceDetailMap, warningLogger);
+        discoveryManager.Initialize(GetSkipDefaultAdapters(options, discoveryCriteria.RunSettings));
+
+        return new DiscoveryRequest(requestData, discoveryCriteria, discoveryManager, loggerManager);
+    }
+
+    /// <inheritdoc/>
+    public ITestRunRequest CreateTestRunRequest(
+        IRequestData requestData,
+        TestRunCriteria testRunCriteria,
+        TestPlatformOptions? options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        ValidateArg.NotNull(testRunCriteria, nameof(testRunCriteria));
+
+        IEnumerable<string> sources = GetSources(testRunCriteria);
+        PopulateExtensions(testRunCriteria.TestRunSettings, sources);
+
+        // Initialize loggers.
+        ITestLoggerManager loggerManager = _testEngine.GetLoggerManager(requestData);
+        loggerManager.Initialize(testRunCriteria.TestRunSettings);
+
+        IProxyExecutionManager executionManager = _testEngine.GetExecutionManager(requestData, testRunCriteria, sourceToSourceDetailMap, warningLogger);
+        executionManager.Initialize(GetSkipDefaultAdapters(options, testRunCriteria.TestRunSettings));
+
+        return new TestRunRequest(requestData, testRunCriteria, executionManager, loggerManager);
+    }
+
+    private static bool GetSkipDefaultAdapters(TestPlatformOptions? options, string? runSettings)
+    {
+        if (options?.SkipDefaultAdapters ?? false)
         {
+            EqtTrace.Verbose($"TestPlatform.GetSkipDefaultAdapters: Skipping default adapters because of TestPlatform options SkipDefaultAdapters.");
+            return true;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPlatform"/> class.
-        /// </summary>
-        ///
-        /// <param name="testEngine">The test engine.</param>
-        /// <param name="filehelper">The file helper.</param>
-        /// <param name="testHostProviderManager">The data.</param>
-        protected TestPlatform(
-            ITestEngine testEngine,
-            IFileHelper filehelper,
-            TestRuntimeProviderManager testHostProviderManager)
+        RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+        var skipping = runConfiguration.SkipDefaultAdapters;
+        if (skipping)
         {
-            this.TestEngine = testEngine;
-            this.fileHelper = filehelper;
-            this.testHostProviderManager = testHostProviderManager;
+            EqtTrace.Verbose($"TestPlatform.GetSkipDefaultAdapters: Skipping default adapters because of RunConfiguration SkipDefaultAdapters.");
+            return true;
         }
 
-        /// <summary>
-        /// Gets or sets the test engine instance.
-        /// </summary>
-        private ITestEngine TestEngine { get; set; }
+        EqtTrace.Verbose($"TestPlatform.GetSkipDefaultAdapters: Not skipping default adapters SkipDefaultAdapters was false.");
+        return false;
+    }
 
-        /// <inheritdoc/>
-        public IDiscoveryRequest CreateDiscoveryRequest(
-            IRequestData requestData,
-            DiscoveryCriteria discoveryCriteria,
-            TestPlatformOptions options)
-        {
-            if (discoveryCriteria == null)
-            {
-                throw new ArgumentNullException(nameof(discoveryCriteria));
-            }
+    /// <inheritdoc/>
+    public bool StartTestSession(
+        IRequestData requestData,
+        StartTestSessionCriteria testSessionCriteria,
+        ITestSessionEventsHandler eventsHandler,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        ValidateArg.NotNull(testSessionCriteria, nameof(testSessionCriteria));
 
-            // Update cache with Extension folder's files.
-            this.AddExtensionAssemblies(discoveryCriteria.RunSettings);
+        RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testSessionCriteria.RunSettings);
+        TestAdapterLoadingStrategy strategy = runConfiguration.TestAdapterLoadingStrategy;
 
-            // Update extension assemblies from source when design mode is false.
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(discoveryCriteria.RunSettings);
-            if (!runConfiguration.DesignMode)
-            {
-                this.AddExtensionAssembliesFromSource(discoveryCriteria.Sources);
-            }
+        AddExtensionAssemblies(testSessionCriteria.RunSettings, strategy);
 
-            // Initialize loggers.
-            var loggerManager = this.TestEngine.GetLoggerManager(requestData);
-            loggerManager.Initialize(discoveryCriteria.RunSettings);
+        if (!runConfiguration.DesignMode)
+        {
+            return false;
+        }
 
-            var testHostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(discoveryCriteria.RunSettings);
-            ThrowExceptionIfTestHostManagerIsNull(testHostManager, discoveryCriteria.RunSettings);
+        IProxyTestSessionManager? testSessionManager = _testEngine.GetTestSessionManager(requestData, testSessionCriteria, sourceToSourceDetailMap, warningLogger);
+        if (testSessionManager == null)
+        {
+            // The test session manager is null because the combination of runsettings and
+            // sources tells us we should run in-process (i.e. in vstest.console). Because
+            // of this no session will be created because there's no testhost to be launched.
+            // Expecting a subsequent call to execute tests with the same set of parameters.
+            return false;
+        }
 
-            testHostManager.Initialize(TestSessionMessageLogger.Instance, discoveryCriteria.RunSettings);
+        return testSessionManager.StartSession(eventsHandler, requestData);
+    }
 
-            var discoveryManager = this.TestEngine.GetDiscoveryManager(requestData, testHostManager, discoveryCriteria);
-            discoveryManager.Initialize(options?.SkipDefaultAdapters ?? false);
+    private void PopulateExtensions(string? runSettings, IEnumerable<string> sources)
+    {
+        RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+        TestAdapterLoadingStrategy strategy = runConfiguration.TestAdapterLoadingStrategy;
 
-            return new DiscoveryRequest(requestData, discoveryCriteria, discoveryManager, loggerManager);
-        }
+        // Update cache with Extension folder's files.
+        AddExtensionAssemblies(runSettings, strategy);
 
-        /// <inheritdoc/>
-        public ITestRunRequest CreateTestRunRequest(
-            IRequestData requestData,
-            TestRunCriteria testRunCriteria,
-            TestPlatformOptions options)
+        // Update extension assemblies from source when design mode is false.
+        if (!runConfiguration.DesignMode)
         {
-            if (testRunCriteria == null)
-            {
-                throw new ArgumentNullException(nameof(testRunCriteria));
-            }
+            AddLoggerAssembliesFromSource(sources, strategy);
+        }
+    }
 
-            this.AddExtensionAssemblies(testRunCriteria.TestRunSettings);
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    public void Dispose()
+    {
+        throw new NotImplementedException();
+    }
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testRunCriteria.TestRunSettings);
+    /// <inheritdoc/>
+    public void UpdateExtensions(
+        IEnumerable<string>? pathToAdditionalExtensions,
+        bool skipExtensionFilters)
+    {
+        _testEngine.GetExtensionManager().UseAdditionalExtensions(pathToAdditionalExtensions, skipExtensionFilters);
+    }
 
-            // Update extension assemblies from source when design mode is false.
-            if (!runConfiguration.DesignMode)
-            {
-                this.AddExtensionAssembliesFromSource(testRunCriteria);
-            }
+    /// <inheritdoc/>
+    public void ClearExtensions()
+    {
+        _testEngine.GetExtensionManager().ClearExtensions();
+    }
 
-            // Initialize loggers.
-            var loggerManager = this.TestEngine.GetLoggerManager(requestData);
-            loggerManager.Initialize(testRunCriteria.TestRunSettings);
+    private void AddExtensionAssemblies(string? runSettings, TestAdapterLoadingStrategy adapterLoadingStrategy)
+    {
+        IEnumerable<string> customTestAdaptersPaths = RunSettingsUtilities.GetTestAdaptersPaths(runSettings);
 
-            var testHostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(testRunCriteria.TestRunSettings);
-            ThrowExceptionIfTestHostManagerIsNull(testHostManager, testRunCriteria.TestRunSettings);
+        if (customTestAdaptersPaths == null)
+        {
+            return;
+        }
 
-            testHostManager.Initialize(TestSessionMessageLogger.Instance, testRunCriteria.TestRunSettings);
+        foreach (string customTestAdaptersPath in customTestAdaptersPaths)
+        {
+            IEnumerable<string> extensionAssemblies = ExpandTestAdapterPaths(customTestAdaptersPath, _fileHelper, adapterLoadingStrategy);
 
-            // NOTE: The custom launcher should not be set when we have test session info available.
-            if (testRunCriteria.TestHostLauncher != null)
+            if (extensionAssemblies.Any())
             {
-                testHostManager.SetCustomLauncher(testRunCriteria.TestHostLauncher);
+                UpdateExtensions(extensionAssemblies, skipExtensionFilters: false);
             }
 
-            var executionManager = this.TestEngine.GetExecutionManager(requestData, testHostManager, testRunCriteria);
-            executionManager.Initialize(options?.SkipDefaultAdapters ?? false);
-
-            return new TestRunRequest(requestData, testRunCriteria, executionManager, loggerManager);
         }
+    }
 
-        /// <inheritdoc/>
-        public bool StartTestSession(
-            IRequestData requestData,
-            StartTestSessionCriteria testSessionCriteria,
-            ITestSessionEventsHandler eventsHandler)
+    /// <summary>
+    /// Updates the test logger paths from source directory.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of sources.</param>
+    /// <param name="strategy">Adapter loading strategy</param>
+    private void AddLoggerAssembliesFromSource(IEnumerable<string> sources, TestAdapterLoadingStrategy strategy)
+    {
+        // Skip discovery unless we're using the default behavior, or NextToSource is specified.
+        if (strategy != TestAdapterLoadingStrategy.Default && !strategy.HasFlag(TestAdapterLoadingStrategy.NextToSource))
         {
-            if (testSessionCriteria == null)
-            {
-                throw new ArgumentNullException(nameof(testSessionCriteria));
-            }
+            return;
+        }
 
-            this.AddExtensionAssemblies(testSessionCriteria.RunSettings);
+        // Currently we support discovering loggers only from Source directory.
+        List<string> loggersToUpdate = new();
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testSessionCriteria.RunSettings);
-            if (!runConfiguration.DesignMode)
+        foreach (string source in sources)
+        {
+            var sourceDirectory = Path.GetDirectoryName(source);
+            if (!string.IsNullOrEmpty(sourceDirectory) && _fileHelper.DirectoryExists(sourceDirectory))
             {
-                return false;
-            }
+                SearchOption searchOption = GetSearchOption(strategy, SearchOption.TopDirectoryOnly);
 
-            var testSessionManager = this.TestEngine.GetTestSessionManager(requestData, testSessionCriteria);
-            if (testSessionManager == null)
-            {
-                // The test session manager is null because the combination of runsettings and
-                // sources tells us we should run in-process (i.e. in vstest.console). Because
-                // of this no session will be created because there's no testhost to be launched.
-                // Expecting a subsequent call to execute tests with the same set of parameters.
-                eventsHandler.HandleStartTestSessionComplete(null);
-                return false;
+                loggersToUpdate.AddRange(
+                    _fileHelper.EnumerateFiles(
+                        sourceDirectory,
+                        searchOption,
+                        TestPlatformConstants.TestLoggerEndsWithPattern));
             }
-
-            return testSessionManager.StartSession(eventsHandler);
         }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        public void Dispose()
+        if (loggersToUpdate.Count > 0)
         {
-            throw new NotImplementedException();
+            UpdateExtensions(loggersToUpdate, skipExtensionFilters: false);
         }
+    }
 
-        /// <inheritdoc/>
-        public void UpdateExtensions(
-            IEnumerable<string> pathToAdditionalExtensions,
-            bool skipExtensionFilters)
+    /// <summary>
+    /// Finds all test platform extensions from the `.\Extensions` directory. This is used to
+    /// load the inbox extensions like TrxLogger and legacy test extensions like MSTest v1,
+    /// MSTest C++, etc..
+    /// </summary>
+    private static void AddExtensionAssembliesFromExtensionDirectory()
+    {
+        // This method needs to run statically before we have any adapter discovery.
+        // TestHostProviderManager get initialized just after this call and it
+        // requires DefaultExtensionPaths to be set to resolve a TestHostProvider.
+        // Since it's static, it forces us to set the adapter paths.
+        //
+        // Otherwise we will always get a "No suitable test runtime provider found for this run." error.
+        // I (@haplois) will modify this behavior later on, but we also need to consider legacy adapters
+        // and make sure they still work after modification.
+        string? runSettings = RunSettingsManager.Instance.ActiveRunSettings.SettingsXml;
+        RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+        TestAdapterLoadingStrategy strategy = runConfiguration.TestAdapterLoadingStrategy;
+
+        FileHelper fileHelper = new();
+        IEnumerable<string> defaultExtensionPaths = [];
+
+        // Explicit adapter loading
+        if (strategy.HasFlag(TestAdapterLoadingStrategy.Explicit))
         {
-            this.TestEngine.GetExtensionManager().UseAdditionalExtensions(pathToAdditionalExtensions, skipExtensionFilters);
+            defaultExtensionPaths = RunSettingsUtilities.GetTestAdaptersPaths(runSettings)
+                .SelectMany(path => ExpandTestAdapterPaths(path, fileHelper, strategy))
+                .Union(defaultExtensionPaths);
         }
 
-        /// <inheritdoc/>
-        public void ClearExtensions()
+        string extensionsFolder = Path.Combine(
+            Path.GetDirectoryName(typeof(TestPlatform).Assembly.GetAssemblyLocation())!,
+            "Extensions");
+        if (!fileHelper.DirectoryExists(extensionsFolder))
         {
-            this.TestEngine.GetExtensionManager().ClearExtensions();
+            // TODO: Since we no-longer run from <playground>\vstest.console\vstest.conosle.exe in Playground, the relative
+            // extensions folder location changed and we need to patch it. This should be a TEMPORARY solution though, we
+            // should come up with a better way of fixing this.
+            // NOTE: This is specific to Playground which references vstest.console from a location that doesn't contain
+            // the Extensions folder. Normal projects shouldn't have this issue.
+            extensionsFolder = Path.Combine(Path.GetDirectoryName(extensionsFolder)!, "vstest.console", "Extensions");
         }
 
-        private void ThrowExceptionIfTestHostManagerIsNull(
-            ITestRuntimeProvider testHostManager,
-            string settingsXml)
+        if (fileHelper.DirectoryExists(extensionsFolder))
         {
-            if (testHostManager == null)
+            // Load default runtime providers
+            if (strategy.HasFlag(TestAdapterLoadingStrategy.DefaultRuntimeProviders))
             {
-                EqtTrace.Error("TestPlatform.CreateTestRunRequest: No suitable testHostProvider found for runsettings : {0}", settingsXml);
-                throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, ClientResources.NoTestHostProviderFound));
+                defaultExtensionPaths = fileHelper
+                    .EnumerateFiles(extensionsFolder, SearchOption.TopDirectoryOnly, TestPlatformConstants.RunTimeEndsWithPattern)
+                    .Union(defaultExtensionPaths);
             }
-        }
 
-        /// <summary>
-        /// Updates the test adapter paths provided through run settings to be used by the test
-        /// service.
-        /// </summary>
-        ///
-        /// <param name="runSettings">The run settings.</param>
-        private void AddExtensionAssemblies(string runSettings)
-        {
-            IEnumerable<string> customTestAdaptersPaths = RunSettingsUtilities.GetTestAdaptersPaths(runSettings);
-
-            if (customTestAdaptersPaths != null)
+            // Default extension loader
+            if (strategy == TestAdapterLoadingStrategy.Default || strategy.HasFlag(TestAdapterLoadingStrategy.ExtensionsDirectory))
             {
-                foreach (string customTestAdaptersPath in customTestAdaptersPaths)
-                {
-                    var adapterPath = Path.GetFullPath(Environment.ExpandEnvironmentVariables(customTestAdaptersPath));
-                    if (!Directory.Exists(adapterPath))
-                    {
-                        if (EqtTrace.IsWarningEnabled)
-                        {
-                            EqtTrace.Warning(string.Format("AdapterPath Not Found:", adapterPath));
-                        }
-
-                        continue;
-                    }
-
-                    var extensionAssemblies = new List<string>(
-                        this.fileHelper.EnumerateFiles(
-                            adapterPath,
-                            SearchOption.AllDirectories,
-                            TestPlatformConstants.TestAdapterEndsWithPattern,
-                            TestPlatformConstants.TestLoggerEndsWithPattern,
-                            TestPlatformConstants.DataCollectorEndsWithPattern,
-                            TestPlatformConstants.RunTimeEndsWithPattern));
-
-                    if (extensionAssemblies.Count > 0)
-                    {
-                        this.UpdateExtensions(extensionAssemblies, skipExtensionFilters: false);
-                    }
-                }
+                defaultExtensionPaths = fileHelper
+                    .EnumerateFiles(extensionsFolder, SearchOption.TopDirectoryOnly, ".dll", ".exe")
+                    .Union(defaultExtensionPaths);
             }
         }
 
-        /// <summary>
-        /// Updates the extension assemblies from source directory.
-        /// </summary>
-        ///
-        /// <param name="testRunCriteria">The test run criteria.</param>
-        private void AddExtensionAssembliesFromSource(TestRunCriteria testRunCriteria)
+        TestPluginCache.Instance.DefaultExtensionPaths = defaultExtensionPaths.Distinct();
+    }
+
+    private static SearchOption GetSearchOption(TestAdapterLoadingStrategy strategy, SearchOption defaultStrategyOption)
+    {
+        return strategy == TestAdapterLoadingStrategy.Default
+            ? defaultStrategyOption
+            : strategy.HasFlag(TestAdapterLoadingStrategy.Recursive) ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
+    }
+
+    private static IEnumerable<string> ExpandTestAdapterPaths(string path, IFileHelper fileHelper, TestAdapterLoadingStrategy strategy)
+    {
+        string adapterPath = Path.GetFullPath(Environment.ExpandEnvironmentVariables(path));
+
+        // Default behavior is to only accept directories.
+        if (strategy == TestAdapterLoadingStrategy.Default)
         {
-            IEnumerable<string> sources = testRunCriteria.Sources;
-            if (testRunCriteria.HasSpecificTests)
-            {
-                // If the test execution is with a test filter, group them by sources.
-                sources = testRunCriteria.Tests.Select(tc => tc.Source).Distinct();
-            }
+            return ExpandAdaptersWithDefaultStrategy(adapterPath, fileHelper);
+        }
+
+        IEnumerable<string> adapters = ExpandAdaptersWithExplicitStrategy(adapterPath, fileHelper, strategy);
+
+        return adapters.Distinct();
+    }
 
-            AddExtensionAssembliesFromSource(sources);
+    private static IEnumerable<string> ExpandAdaptersWithExplicitStrategy(string path, IFileHelper fileHelper, TestAdapterLoadingStrategy strategy)
+    {
+        if (!strategy.HasFlag(TestAdapterLoadingStrategy.Explicit))
+        {
+            return [];
         }
 
-        /// <summary>
-        /// Updates the test logger paths from source directory.
-        /// </summary>
-        ///
-        /// <param name="sources">The list of sources.</param>
-        private void AddExtensionAssembliesFromSource(IEnumerable<string> sources)
+        if (fileHelper.Exists(path))
         {
-            // Currently we support discovering loggers only from Source directory.
-            var loggersToUpdate = new List<string>();
+            return new[] { path };
+        }
+        else if (fileHelper.DirectoryExists(path))
+        {
+            SearchOption searchOption = GetSearchOption(strategy, SearchOption.TopDirectoryOnly);
 
-            foreach (var source in sources)
-            {
-                var sourceDirectory = Path.GetDirectoryName(source);
-                if (!string.IsNullOrEmpty(sourceDirectory)
-                    && this.fileHelper.DirectoryExists(sourceDirectory))
-                {
-                    loggersToUpdate.AddRange(
-                        this.fileHelper.EnumerateFiles(
-                            sourceDirectory,
-                            SearchOption.TopDirectoryOnly,
-                            TestPlatformConstants.TestLoggerEndsWithPattern));
-                }
-            }
+            IEnumerable<string> adapterPaths = fileHelper.EnumerateFiles(
+                path,
+                searchOption,
+                TestPlatformConstants.TestAdapterEndsWithPattern,
+                TestPlatformConstants.TestLoggerEndsWithPattern,
+                TestPlatformConstants.DataCollectorEndsWithPattern,
+                TestPlatformConstants.RunTimeEndsWithPattern);
 
-            if (loggersToUpdate.Count > 0)
-            {
-                this.UpdateExtensions(loggersToUpdate, skipExtensionFilters: false);
-            }
+            return adapterPaths;
         }
 
-        /// <summary>
-        /// Finds all test platform extensions from the `.\Extensions` directory. This is used to
-        /// load the inbox extensions like TrxLogger and legacy test extensions like MSTest v1,
-        /// MSTest C++, etc..
-        /// </summary>
-        private static void AddExtensionAssembliesFromExtensionDirectory()
+        EqtTrace.Warning($"{nameof(TestPlatform)}.{nameof(ExpandAdaptersWithExplicitStrategy)} AdapterPath Not Found: {path}");
+        return [];
+    }
+
+    private static IEnumerable<string> ExpandAdaptersWithDefaultStrategy(string path, IFileHelper fileHelper)
+    {
+        // This is the legacy behavior, please do not modify this method unless you're sure of
+        // side effect when running tests with legacy adapters.
+        if (!fileHelper.DirectoryExists(path))
         {
-            var fileHelper = new FileHelper();
-            var extensionsFolder = Path.Combine(
-                Path.GetDirectoryName(
-                    typeof(TestPlatform).GetTypeInfo().Assembly.GetAssemblyLocation()),
-                "Extensions");
+            EqtTrace.Warning($"{nameof(TestPlatform)}.{nameof(ExpandAdaptersWithDefaultStrategy)} AdapterPath Not Found: {path}");
 
-            if (fileHelper.DirectoryExists(extensionsFolder))
-            {
-                var defaultExtensionPaths = fileHelper.EnumerateFiles(
-                    extensionsFolder,
-                    SearchOption.TopDirectoryOnly,
-                    ".dll",
-                    ".exe");
+            return [];
+        }
 
-                TestPluginCache.Instance.DefaultExtensionPaths = defaultExtensionPaths;
-            }
+        return fileHelper.EnumerateFiles(
+                path,
+                SearchOption.AllDirectories,
+                TestPlatformConstants.TestAdapterEndsWithPattern,
+                TestPlatformConstants.TestLoggerEndsWithPattern,
+                TestPlatformConstants.DataCollectorEndsWithPattern,
+                TestPlatformConstants.RunTimeEndsWithPattern);
+    }
+
+    private static IEnumerable<string> GetSources(TestRunCriteria testRunCriteria)
+    {
+        if (testRunCriteria.HasSpecificTests)
+        {
+            // If the test execution is with a test filter, filter sources too.
+            return testRunCriteria.Tests.Select(tc => tc.Source).Distinct();
         }
+
+        TPDebug.Assert(testRunCriteria.Sources is not null, "testRunCriteria.Sources is null");
+        return testRunCriteria.Sources;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Client/TestPlatformFactory.cs b/src/Microsoft.TestPlatform.Client/TestPlatformFactory.cs
index 44ffa5e33f..2e703efd4a 100644
--- a/src/Microsoft.TestPlatform.Client/TestPlatformFactory.cs
+++ b/src/Microsoft.TestPlatform.Client/TestPlatformFactory.cs
@@ -1,24 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client;
+
+/// <summary>
+/// The factory class that provides an instance of the test platform.
+/// </summary>
+public class TestPlatformFactory
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    private static ITestPlatform? s_testPlatform;
 
     /// <summary>
-    /// The factory class that provides an instance of the test platform.
+    /// Gets an instance of the test platform.
     /// </summary>
-    public class TestPlatformFactory
-    {
-        private static ITestPlatform testPlatform;
-
-        /// <summary>
-        /// Gets an instance of the test platform.
-        /// </summary>
-        /// <returns> The <see cref="ITestPlatform"/> instance. </returns>
-        public static ITestPlatform GetTestPlatform()
-        {
-            return testPlatform ?? (testPlatform = new TestPlatform());
-        }
-    }
+    /// <returns> The <see cref="ITestPlatform"/> instance. </returns>
+    public static ITestPlatform GetTestPlatform() => s_testPlatform ??= new TestPlatform();
 }
diff --git a/src/Microsoft.TestPlatform.Client/TestSession/InProcessTestSessionEventsHandler.cs b/src/Microsoft.TestPlatform.Client/TestSession/InProcessTestSessionEventsHandler.cs
new file mode 100644
index 0000000000..106a285bdd
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Client/TestSession/InProcessTestSessionEventsHandler.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client;
+
+internal class InProcessTestSessionEventsHandler : ITestSessionEventsHandler
+{
+    private readonly ITestSessionEventsHandler _testSessionEventsHandler;
+
+    public EventHandler<StartTestSessionCompleteEventArgs?>? StartTestSessionCompleteEventHandler { get; set; }
+
+    public EventHandler<StopTestSessionCompleteEventArgs?>? StopTestSessionCompleteEventHandler { get; set; }
+
+    public InProcessTestSessionEventsHandler(ITestSessionEventsHandler testSessionEventsHandler)
+    {
+        _testSessionEventsHandler = testSessionEventsHandler;
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _testSessionEventsHandler.HandleLogMessage(level, message);
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-op by design.
+        //
+        // For out-of-process vstest.console, raw messages are passed to the translation layer but
+        // they are never read and don't get passed to the actual events handler in TW. If they
+        // were (as it happens for in-process vstest.console since there is no more translation
+        // layer) a NotImplemented exception would be raised as per the time this of writing this
+        // note.
+        //
+        // Consider changing this logic in the future if TW changes the handling logic for raw
+        // messages.
+    }
+
+    public void HandleStartTestSessionComplete(StartTestSessionCompleteEventArgs? eventArgs)
+    {
+        StartTestSessionCompleteEventHandler?.Invoke(this, eventArgs);
+        _testSessionEventsHandler.HandleStartTestSessionComplete(eventArgs);
+    }
+
+    public void HandleStopTestSessionComplete(StopTestSessionCompleteEventArgs? eventArgs)
+    {
+        StopTestSessionCompleteEventHandler?.Invoke(this, eventArgs);
+        _testSessionEventsHandler.HandleStopTestSessionComplete(eventArgs);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Client/TestSession/TestSessionEventsHandler.cs b/src/Microsoft.TestPlatform.Client/TestSession/TestSessionEventsHandler.cs
index d5eaa5e6cc..232a56a26d 100644
--- a/src/Microsoft.TestPlatform.Client/TestSession/TestSessionEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.Client/TestSession/TestSessionEventsHandler.cs
@@ -1,72 +1,70 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client;
+
+/// <summary>
+/// Defines the way in which test session events should be handled.
+/// </summary>
+internal class TestSessionEventsHandler : ITestSessionEventsHandler
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly ICommunicationManager _communicationManager;
 
     /// <summary>
-    /// Defines the way in which test session events should be handled.
+    /// Creates an instance of the current class.
     /// </summary>
-    internal class TestSessionEventsHandler : ITestSessionEventsHandler
+    ///
+    /// <param name="communicationManager">
+    /// The communication manager used for passing messages around.
+    /// </param>
+    public TestSessionEventsHandler(ICommunicationManager communicationManager)
     {
-        private readonly ICommunicationManager communicationManager;
-
-        /// <summary>
-        /// Creates an instance of the current class.
-        /// </summary>
-        /// 
-        /// <param name="communicationManager">
-        /// The communication manager used for passing messages around.
-        /// </param>
-        public TestSessionEventsHandler(ICommunicationManager communicationManager)
-        {
-            this.communicationManager = communicationManager;
-        }
+        _communicationManager = communicationManager;
+    }
 
-        /// <inheritdoc />
-        public void HandleStartTestSessionComplete(TestSessionInfo testSessionInfo)
+    /// <inheritdoc />
+    public void HandleStartTestSessionComplete(StartTestSessionCompleteEventArgs? eventArgs)
+    {
+        var ackPayload = new StartTestSessionAckPayload
         {
-            var ackPayload = new StartTestSessionAckPayload()
-            {
-                TestSessionInfo = testSessionInfo
-            };
+            EventArgs = eventArgs
+        };
 
-            this.communicationManager.SendMessage(MessageType.StartTestSessionCallback, ackPayload);
-        }
+        _communicationManager.SendMessage(MessageType.StartTestSessionCallback, ackPayload);
+    }
 
-        /// <inheritdoc />
-        public void HandleStopTestSessionComplete(TestSessionInfo testSessionInfo, bool stopped)
+    /// <inheritdoc />
+    public void HandleStopTestSessionComplete(StopTestSessionCompleteEventArgs? eventArgs)
+    {
+        var ackPayload = new StopTestSessionAckPayload()
         {
-            var ackPayload = new StopTestSessionAckPayload()
-            {
-                TestSessionInfo = testSessionInfo,
-                IsStopped = stopped
-            };
+            EventArgs = eventArgs
+        };
 
-            this.communicationManager.SendMessage(MessageType.StopTestSessionCallback, ackPayload);
-        }
+        _communicationManager.SendMessage(MessageType.StopTestSessionCallback, ackPayload);
+    }
 
-        /// <inheritdoc />
-        public void HandleLogMessage(TestMessageLevel level, string message)
+    /// <inheritdoc />
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        var messagePayload = new TestMessagePayload()
         {
-            var messagePayload = new TestMessagePayload()
-            {
-                MessageLevel = level,
-                Message = message
-            };
+            MessageLevel = level,
+            Message = message
+        };
 
-            this.communicationManager.SendMessage(MessageType.TestMessage, messagePayload);
-        }
+        _communicationManager.SendMessage(MessageType.TestMessage, messagePayload);
+    }
 
-        /// <inheritdoc />
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No-op.
-        }
+    /// <inheritdoc />
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-op.
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/BannedSymbols.txt b/src/Microsoft.TestPlatform.Common/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/Microsoft.TestPlatform.Common/Constants.cs b/src/Microsoft.TestPlatform.Common/Constants.cs
index 9f86b7f26b..b063862898 100644
--- a/src/Microsoft.TestPlatform.Common/Constants.cs
+++ b/src/Microsoft.TestPlatform.Common/Constants.cs
@@ -1,67 +1,66 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common
+namespace Microsoft.VisualStudio.TestPlatform.Common;
+
+/// <summary>
+/// Defines the defaults used across different components.
+/// </summary>
+public static class TestPlatformDefaults
 {
     /// <summary>
-    /// Defines the defaults used across different components.
+    /// string in the vstest.console.exe.config that specifies the bound on no of jobs in the job queue.
     /// </summary>
-    public static class TestPlatformDefaults
-    {
-        /// <summary>
-        /// string in the vstest.console.exe.config that specifies the bound on no of jobs in the job queue.
-        /// </summary>
-        public const string MaxNumberOfEventsLoggerEventQueueCanHold = "MaxNumberOfEventsLoggerEventQueueCanHold";
+    public const string MaxNumberOfEventsLoggerEventQueueCanHold = "MaxNumberOfEventsLoggerEventQueueCanHold";
 
-        /// <summary>
-        /// Default bound on the job queue.
-        /// </summary>
-        public const int DefaultMaxNumberOfEventsLoggerEventQueueCanHold = 500;
+    /// <summary>
+    /// Default bound on the job queue.
+    /// </summary>
+    public const int DefaultMaxNumberOfEventsLoggerEventQueueCanHold = 500;
 
-        /// <summary>
-        /// string in the vstest.console.exe.config that specifies the size bound on job queue.
-        /// </summary>
-        public const string MaxBytesLoggerEventQueueCanHold = "MaxBytesLoggerEventQueueCanHold";
+    /// <summary>
+    /// string in the vstest.console.exe.config that specifies the size bound on job queue.
+    /// </summary>
+    public const string MaxBytesLoggerEventQueueCanHold = "MaxBytesLoggerEventQueueCanHold";
 
-        /// <summary>
-        /// string in the rocksteady.exe.config that specifies whether or not we should try to keep memory usage by queue bounded.
-        /// </summary>
-        public const string EnableBoundsOnLoggerEventQueue = "EnableBoundsOnLoggerEventQueue";
+    /// <summary>
+    /// string in the rocksteady.exe.config that specifies whether or not we should try to keep memory usage by queue bounded.
+    /// </summary>
+    public const string EnableBoundsOnLoggerEventQueue = "EnableBoundsOnLoggerEventQueue";
 
-        /// <summary>
-        /// Default bound on the total size of all objects in the job queue. (25MB)
-        /// </summary>
-        public const int DefaultMaxBytesLoggerEventQueueCanHold = 25000000;
+    /// <summary>
+    /// Default bound on the total size of all objects in the job queue. (25MB)
+    /// </summary>
+    public const int DefaultMaxBytesLoggerEventQueueCanHold = 25000000;
 
-        /// <summary>
-        /// Default value of the boolean that determines whether or not job queue should be bounded.
-        /// </summary>
-        public const bool DefaultEnableBoundsOnLoggerEventQueue = true;
-    }
+    /// <summary>
+    /// Default value of the boolean that determines whether or not job queue should be bounded.
+    /// </summary>
+    public const bool DefaultEnableBoundsOnLoggerEventQueue = true;
+}
 
+/// <summary>
+/// Defines the constants used across different components.
+/// </summary>
+public static class TestPlatformConstants
+{
     /// <summary>
-    /// Defines the constants used across different components.
+    /// Pattern used to find the test adapters library using String.EndWith
     /// </summary>
-    public static class TestPlatformConstants
-    {
-        /// <summary>
-        /// Pattern used to find the test adapters library using String.EndWith
-        /// </summary>
-        public const string TestAdapterEndsWithPattern = @"TestAdapter.dll";
+    public const string TestAdapterEndsWithPattern = @"TestAdapter.dll";
 
-        /// <summary>
-        /// Pattern used to find the test loggers library using String.EndWith
-        /// </summary>
-        public const string TestLoggerEndsWithPattern = @"TestLogger.dll";
+    /// <summary>
+    /// Pattern used to find the test loggers library using String.EndWith
+    /// </summary>
+    public const string TestLoggerEndsWithPattern = @"TestLogger.dll";
 
-        /// <summary>
-        /// Pattern used to find the data collectors library using String.EndWith
-        /// </summary>
-        public const string DataCollectorEndsWithPattern = @"Collector.dll";
+    /// <summary>
+    /// Pattern used to find the data collectors library using String.EndWith
+    /// </summary>
+    public const string DataCollectorEndsWithPattern = @"Collector.dll";
 
-        /// <summary>
-        /// Pattern used to find the run time providers library using String.EndWith
-        /// </summary>
-        public const string RunTimeEndsWithPattern = @"RuntimeProvider.dll";
-    }
+    /// <summary>
+    /// Pattern used to find the run time providers library using String.EndWith
+    /// </summary>
+    public const string RunTimeEndsWithPattern = @"RuntimeProvider.dll";
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs b/src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs
index 1c65bb13d6..33b70f7344 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/AfterTestRunEndResult.cs
@@ -1,38 +1,71 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollection
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+
+/// <summary>
+/// Payload object that is used to exchange data between datacollector process and runner process.
+/// </summary>
+[DataContract]
+public class AfterTestRunEndResult
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Runtime.Serialization;
+    // We have more than one ctor for backward-compatibility reason but we don't want to add dependency on Newtosoft([JsonConstructor])
+    // We want to fallback to the non-public default constructor https://www.newtonsoft.com/json/help/html/T_Newtonsoft_Json_ConstructorHandling.htm during deserialization
+    private AfterTestRunEndResult()
+    {
+        // Forcing nulls to the differnet properties as this is only serialization ctor but
+        // we can guarantee non-null for the other ctors.
+        AttachmentSets = null!;
+        InvokedDataCollectors = null!;
+        Metrics = null!;
+    }
 
     /// <summary>
-    /// Payload object that is used to exchange data between datacollector process and runner process.
+    /// Initializes a new instance of the <see cref="AfterTestRunEndResult"/> class.
     /// </summary>
-    [DataContract]
-    public class AfterTestRunEndResult
+    /// <param name="attachmentSets">
+    /// The collection of attachment sets.
+    /// </param>
+    /// <param name="metrics">
+    /// The metrics.
+    /// </param>
+    public AfterTestRunEndResult(Collection<AttachmentSet> attachmentSets, IDictionary<string, object> metrics)
+        : this(attachmentSets, new Collection<InvokedDataCollector>(), metrics)
+    { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AfterTestRunEndResult"/> class.
+    /// </summary>
+    /// <param name="attachmentSets">
+    /// The collection of attachment sets.
+    /// </param>
+    /// <param name="invokedDataCollectors">
+    /// The collection of the DataCollectors invoked during test session
+    /// </param>
+    /// <param name="metrics">
+    /// The metrics.
+    /// </param>
+    public AfterTestRunEndResult(Collection<AttachmentSet> attachmentSets,
+        Collection<InvokedDataCollector>? invokedDataCollectors,
+        IDictionary<string, object> metrics)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AfterTestRunEndResult"/> class.
-        /// </summary>
-        /// <param name="attachmentSets">
-        /// The collection of attachment sets.
-        /// </param>
-        /// <param name="metrics">
-        /// The metrics.
-        /// </param>
-        public AfterTestRunEndResult(Collection<AttachmentSet> attachmentSets, IDictionary<string, object> metrics)
-        {
-            this.AttachmentSets = attachmentSets;
-            this.Metrics = metrics;
-        }
-
-        [DataMember]
-        public Collection<AttachmentSet> AttachmentSets { get; private set; }
-
-        [DataMember]
-        public IDictionary<string, object> Metrics { get; private set; }
+        AttachmentSets = attachmentSets;
+        InvokedDataCollectors = invokedDataCollectors;
+        Metrics = metrics;
     }
-}
\ No newline at end of file
+
+    [DataMember]
+    public Collection<AttachmentSet> AttachmentSets { get; private set; }
+
+    [DataMember]
+    public Collection<InvokedDataCollector>? InvokedDataCollectors { get; private set; }
+
+    [DataMember]
+    public IDictionary<string, object> Metrics { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/BeforeTestRunStartResult.cs b/src/Microsoft.TestPlatform.Common/DataCollection/BeforeTestRunStartResult.cs
index a5b727f2fc..44b0956ba1 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/BeforeTestRunStartResult.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/BeforeTestRunStartResult.cs
@@ -1,42 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollection
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
 
+/// <summary>
+/// Payload object that is used to exchange data between datacollector process and runner process.
+/// </summary>
+[DataContract]
+public class BeforeTestRunStartResult
+{
     /// <summary>
-    /// Payload object that is used to exchange data between datacollector process and runner process.
+    /// Initializes a new instance of the <see cref="BeforeTestRunStartResult"/> class.
     /// </summary>
-    [DataContract]
-    public class BeforeTestRunStartResult
+    /// <param name="environmentVariables">
+    /// The environment variables.
+    /// </param>
+    /// <param name="dataCollectionEventsPort">
+    /// The data Collection Events Port.
+    /// </param>
+    public BeforeTestRunStartResult(IDictionary<string, string?> environmentVariables, int dataCollectionEventsPort)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeforeTestRunStartResult"/> class.
-        /// </summary>
-        /// <param name="environmentVariables">
-        /// The environment variables.
-        /// </param>
-        /// <param name="dataCollectionEventsPort">
-        /// The data Collection Events Port.
-        /// </param>
-        public BeforeTestRunStartResult(IDictionary<string, string> environmentVariables, int dataCollectionEventsPort)
-        {
-            this.EnvironmentVariables = environmentVariables;
-            this.DataCollectionEventsPort = dataCollectionEventsPort;
-        }
+        EnvironmentVariables = environmentVariables;
+        DataCollectionEventsPort = dataCollectionEventsPort;
+    }
 
-        /// <summary>
-        /// Gets the environment variable dictionary.
-        /// </summary>
-        [DataMember]
-        public IDictionary<string, string> EnvironmentVariables { get; private set; }
+    /// <summary>
+    /// Gets the environment variable dictionary.
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, string?> EnvironmentVariables { get; private set; }
 
-        /// <summary>
-        /// Gets the data collection events port.
-        /// </summary>
-        [DataMember]
-        public int DataCollectionEventsPort { get; private set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets the data collection events port.
+    /// </summary>
+    [DataMember]
+    public int DataCollectionEventsPort { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionAttachmentManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionAttachmentManager.cs
index 50eaa48b6b..0ec01aa802 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionAttachmentManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionAttachmentManager.cs
@@ -1,387 +1,373 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+
+/// <summary>
+/// Manages file transfer from data collector to test runner service.
+///
+/// Events are handled sequentially so it's not possible have parallel AddAttachment/GetAttachments for the same DataCollectionContext.
+/// DataCollectionContext can be a session context(session start/end) or a test case context(test case start/end).
+///
+/// We have two type of events that will fire a collection of files "session end" and "test case end".
+/// File are sent and copied/moved in parallel using async tasks, for these reason we need to use an async structure ConcurrentDictionary
+/// to be able to handle parallel test case start/end events(if host run tests in parallel).
+///
+/// We could avoid to use ConcurrentDictionary for the list of the attachment sets of a specific DataCollectionContext, but
+/// we don't know how the user will implement the datacollector and they could send file out of events(wrong usage, no more expected sequential access AddAttachment->GetAttachments),
+/// so we prefer protect every collection. This not means that outcome will be "always correct"(file attached in a correct way) but at least we avoid exceptions.
+/// </summary>
+internal class DataCollectionAttachmentManager : IDataCollectionAttachmentManager, IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private readonly object _attachmentTaskLock = new();
 
     /// <summary>
-    /// Manages file transfer from data collector to test runner service.
+    /// Default results directory to be used when user didn't specify.
     /// </summary>
-    internal class DataCollectionAttachmentManager : IDataCollectionAttachmentManager
-    {
-        private static object attachmentTaskLock = new object();
+    private const string DefaultOutputDirectoryName = "TestResults";
 
-        #region Fields
+    /// <summary>
+    /// Logger for data collection messages
+    /// </summary>
+    private IMessageSink? _messageSink;
 
-        /// <summary>
-        /// Default results directory to be used when user didn't specify.
-        /// </summary>
-        private const string DefaultOutputDirectoryName = "TestResults";
+    /// <summary>
+    /// Attachment transfer tasks associated with a given datacollection context.
+    /// </summary>
+    private readonly ConcurrentDictionary<DataCollectionContext, List<Task>> _attachmentTasks;
 
-        /// <summary>
-        /// Logger for data collection messages
-        /// </summary>
-        private IMessageSink messageSink;
+    /// <summary>
+    /// Use to cancel attachment transfers if test run is canceled.
+    /// </summary>
+    private readonly CancellationTokenSource _cancellationTokenSource;
 
-        /// <summary>
-        /// Attachment transfer tasks associated with a given datacollection context.
-        /// </summary>
-        private Dictionary<DataCollectionContext, List<Task>> attachmentTasks;
+    /// <summary>
+    /// File helper instance.
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
 
-        /// <summary>
-        /// Use to cancel attachment transfers if test run is canceled.
-        /// </summary>
-        private CancellationTokenSource cancellationTokenSource;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionAttachmentManager"/> class.
+    /// </summary>
+    public DataCollectionAttachmentManager()
+        : this(new TestPlatform.Utilities.Helpers.FileHelper())
+    {
+    }
 
-        /// <summary>
-        /// File helper instance.
-        /// </summary>
-        private IFileHelper fileHelper;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionAttachmentManager"/> class.
+    /// </summary>
+    /// <param name="fileHelper">File helper instance.</param>
+    protected DataCollectionAttachmentManager(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+        _cancellationTokenSource = new CancellationTokenSource();
+        _attachmentTasks = new ConcurrentDictionary<DataCollectionContext, List<Task>>();
+        AttachmentSets = new ConcurrentDictionary<DataCollectionContext, ConcurrentDictionary<Uri, AttachmentSet>>();
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the session output directory.
+    /// </summary>
+    internal string? SessionOutputDirectory { get; private set; }
 
-        #region Constructor
+    /// <summary>
+    /// Gets the attachment sets for the given datacollection context.
+    /// </summary>
+    internal ConcurrentDictionary<DataCollectionContext, ConcurrentDictionary<Uri, AttachmentSet>> AttachmentSets
+    {
+        get; private set;
+    }
+    /// <inheritdoc/>
+    public void Initialize(SessionId id, string outputDirectory, IMessageSink messageSink)
+    {
+        ValidateArg.NotNull(id, nameof(id));
+        ValidateArg.NotNull(messageSink, nameof(messageSink));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionAttachmentManager"/> class.
-        /// </summary>
-        public DataCollectionAttachmentManager()
-            : this(new TestPlatform.Utilities.Helpers.FileHelper())
-        {
-        }
+        _messageSink = messageSink;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionAttachmentManager"/> class.
-        /// </summary>
-        /// <param name="fileHelper">File helper instance.</param>
-        protected DataCollectionAttachmentManager(IFileHelper fileHelper)
+        if (outputDirectory.IsNullOrEmpty())
         {
-            this.fileHelper = fileHelper;
-            this.cancellationTokenSource = new CancellationTokenSource();
-            this.attachmentTasks = new Dictionary<DataCollectionContext, List<Task>>();
-            this.AttachmentSets = new Dictionary<DataCollectionContext, Dictionary<Uri, AttachmentSet>>();
+            SessionOutputDirectory = Path.Combine(Path.GetTempPath(), DefaultOutputDirectoryName, id.Id.ToString());
         }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the session output directory.
-        /// </summary>
-        internal string SessionOutputDirectory { get; private set; }
-
-        /// <summary>
-        /// Gets the attachment sets for the given datacollection context.
-        /// </summary>
-        internal Dictionary<DataCollectionContext, Dictionary<Uri, AttachmentSet>> AttachmentSets
+        else
         {
-            get; private set;
+            // Create a session specific directory under base output directory.
+            var expandedOutputDirectory = Environment.ExpandEnvironmentVariables(outputDirectory);
+            var absolutePath = Path.GetFullPath(expandedOutputDirectory);
+            SessionOutputDirectory = Path.Combine(absolutePath, id.Id.ToString());
         }
-        #endregion
 
-        #region public methods
-
-        /// <inheritdoc/>
-        public void Initialize(SessionId id, string outputDirectory, IMessageSink messageSink)
+        try
         {
-            ValidateArg.NotNull(id, nameof(id));
-            ValidateArg.NotNull(messageSink, nameof(messageSink));
-
-            this.messageSink = messageSink;
-
-            if (string.IsNullOrEmpty(outputDirectory))
-            {
-                this.SessionOutputDirectory = Path.Combine(Path.GetTempPath(), DefaultOutputDirectoryName, id.Id.ToString());
-            }
-            else
+            // Create the output directory if it doesn't exist.
+            if (!Directory.Exists(SessionOutputDirectory))
             {
-                // Create a session specific directory under base output directory.
-                var expandedOutputDirectory = Environment.ExpandEnvironmentVariables(outputDirectory);
-                var absolutePath = Path.GetFullPath(expandedOutputDirectory);
-                this.SessionOutputDirectory = Path.Combine(absolutePath, id.Id.ToString());
+                Directory.CreateDirectory(SessionOutputDirectory);
             }
-
-            try
-            {
-                // Create the output directory if it doesn't exist.
-                if (!Directory.Exists(this.SessionOutputDirectory))
-                {
-                    Directory.CreateDirectory(this.SessionOutputDirectory);
-                }
-            }
-            catch (UnauthorizedAccessException accessException)
-            {
-                string accessDeniedMessage = string.Format(CultureInfo.CurrentCulture, Resources.Resources.AccessDenied, accessException.Message);
-                ConsoleOutput.Instance.Error(false, accessDeniedMessage);
-                throw;
-            }
-
         }
-
-        /// <inheritdoc/>
-        public List<AttachmentSet> GetAttachments(DataCollectionContext dataCollectionContext)
+        catch (UnauthorizedAccessException accessException)
         {
-            try
-            {
-                if (this.attachmentTasks.TryGetValue(dataCollectionContext, out var tasks))
-                {
-                    Task.WhenAll(tasks.ToArray()).Wait();
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("DataCollectionAttachmentManager.GetAttachments: Fail to get attachments: {0} ", ex);
-            }
+            string accessDeniedMessage = string.Format(CultureInfo.CurrentCulture, Resources.Resources.AccessDenied, accessException.Message);
+            ConsoleOutput.Instance.Error(false, accessDeniedMessage);
+            throw;
+        }
 
-            List<AttachmentSet> attachments = new List<AttachmentSet>();
+    }
 
-            if (this.AttachmentSets.TryGetValue(dataCollectionContext, out var uriAttachmentSetMap))
+    /// <inheritdoc/>
+    public List<AttachmentSet> GetAttachments(DataCollectionContext dataCollectionContext)
+    {
+        try
+        {
+            if (_attachmentTasks.TryGetValue(dataCollectionContext, out var tasks))
             {
-                attachments = uriAttachmentSetMap.Values.ToList();
-                this.attachmentTasks.Remove(dataCollectionContext);
-                this.AttachmentSets.Remove(dataCollectionContext);
+                Task.WhenAll(tasks.ToArray()).Wait();
             }
-
-            return attachments;
         }
-
-        /// <inheritdoc/>
-        public void AddAttachment(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler sendFileCompletedCallback, Uri uri, string friendlyName)
+        catch (Exception ex)
         {
-            ValidateArg.NotNull(fileTransferInfo, nameof(fileTransferInfo));
+            EqtTrace.Error("DataCollectionAttachmentManager.GetAttachments: Fail to get attachments: {0} ", ex);
+        }
 
-            if (string.IsNullOrEmpty(this.SessionOutputDirectory))
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error(
-                        "DataCollectionAttachmentManager.AddAttachment: Initialize not invoked.");
-                }
+        List<AttachmentSet> attachments = new();
 
-                return;
-            }
+        if (AttachmentSets.TryGetValue(dataCollectionContext, out var uriAttachmentSetMap))
+        {
+            attachments = uriAttachmentSetMap.Values.ToList();
+            _attachmentTasks.TryRemove(dataCollectionContext, out _);
+            AttachmentSets.TryRemove(dataCollectionContext, out _);
+        }
 
-            if (!this.AttachmentSets.ContainsKey(fileTransferInfo.Context))
-            {
-                var uriAttachmentSetMap = new Dictionary<Uri, AttachmentSet>();
-                this.AttachmentSets.Add(fileTransferInfo.Context, uriAttachmentSetMap);
-                this.attachmentTasks.Add(fileTransferInfo.Context, new List<Task>());
-            }
+        return attachments;
+    }
 
-            if (!this.AttachmentSets[fileTransferInfo.Context].ContainsKey(uri))
-            {
-                this.AttachmentSets[fileTransferInfo.Context].Add(uri, new AttachmentSet(uri, friendlyName));
-            }
+    /// <inheritdoc/>
+    public void AddAttachment(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler? sendFileCompletedCallback, Uri uri, string friendlyName)
+    {
+        ValidateArg.NotNull(fileTransferInfo, nameof(fileTransferInfo));
 
-            this.AddNewFileTransfer(fileTransferInfo, sendFileCompletedCallback, uri, friendlyName);
+        if (SessionOutputDirectory.IsNullOrEmpty())
+        {
+            EqtTrace.Error("DataCollectionAttachmentManager.AddAttachment: Initialize not invoked.");
+            return;
         }
 
-        /// <inheritdoc/>
-        public void Cancel()
+        if (!AttachmentSets.ContainsKey(fileTransferInfo.Context))
         {
-            this.cancellationTokenSource.Cancel();
+            var uriAttachmentSetMap = new ConcurrentDictionary<Uri, AttachmentSet>();
+            AttachmentSets.TryAdd(fileTransferInfo.Context, uriAttachmentSetMap);
+            _attachmentTasks.TryAdd(fileTransferInfo.Context, new List<Task>());
         }
 
-        #endregion
+        if (!AttachmentSets[fileTransferInfo.Context].ContainsKey(uri))
+        {
+            AttachmentSets[fileTransferInfo.Context].TryAdd(uri, new AttachmentSet(uri, friendlyName));
+        }
 
-        #region private methods
+        AddNewFileTransfer(fileTransferInfo, sendFileCompletedCallback, uri, friendlyName);
+    }
 
-        /// <summary>
-        /// Sanity checks on CopyRequestData 
-        /// </summary>
-        /// <param name="fileTransferInfo">
-        /// The file Transfer Info.
-        /// </param>
-        /// <param name="localFilePath">
-        /// The local File Path.
-        /// </param>
-        private static void Validate(FileTransferInformation fileTransferInfo, string localFilePath)
+    /// <inheritdoc/>
+    public void Cancel()
+    {
+        _cancellationTokenSource.Cancel();
+    }
+
+    /// <summary>
+    /// Sanity checks on CopyRequestData
+    /// </summary>
+    /// <param name="fileTransferInfo">
+    /// The file Transfer Info.
+    /// </param>
+    /// <param name="localFilePath">
+    /// The local File Path.
+    /// </param>
+    private static void Validate(FileTransferInformation fileTransferInfo, string localFilePath)
+    {
+        if (!File.Exists(fileTransferInfo.FileName))
         {
-            if (!File.Exists(fileTransferInfo.FileName))
-            {
-                throw new FileNotFoundException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        "Could not find source file '{0}'.",
-                        fileTransferInfo.FileName));
-            }
+            throw new FileNotFoundException(
+                string.Format(
+                    CultureInfo.InvariantCulture,
+                    "Could not find source file '{0}'.",
+                    fileTransferInfo.FileName));
+        }
 
-            var directoryName = Path.GetDirectoryName(localFilePath);
+        var directoryName = Path.GetDirectoryName(localFilePath);
 
-            if (!Directory.Exists(directoryName))
-            {
-                Directory.CreateDirectory(directoryName);
-            }
-            else if (File.Exists(localFilePath))
-            {
-                File.Delete(localFilePath);
-            }
+        if (!Directory.Exists(directoryName))
+        {
+            Directory.CreateDirectory(directoryName!);
         }
-
-        /// <summary>
-        /// Add a new file transfer (either copy/move) request.
-        /// </summary>
-        /// <param name="fileTransferInfo">
-        /// The file Transfer Info.
-        /// </param>
-        /// <param name="sendFileCompletedCallback">
-        /// The send File Completed Callback.
-        /// </param>
-        /// <param name="uri">
-        /// The uri.
-        /// </param>
-        /// <param name="friendlyName">
-        /// The friendly Name.
-        /// </param>
-        private void AddNewFileTransfer(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler sendFileCompletedCallback, Uri uri, string friendlyName)
+        else if (File.Exists(localFilePath))
         {
-            var context = fileTransferInfo.Context;
-            Debug.Assert(
-                context != null,
-                "DataCollectionManager.AddNewFileTransfer: FileDataHeaderMessage with null context.");
-
-            var testCaseId = fileTransferInfo.Context.HasTestCase
-                                 ? fileTransferInfo.Context.TestExecId.Id.ToString()
-                                 : string.Empty;
-
-            var directoryPath = Path.Combine(
-                this.SessionOutputDirectory,
-                testCaseId);
-            var localFilePath = Path.Combine(directoryPath, Path.GetFileName(fileTransferInfo.FileName));
-
-            var task = Task.Factory.StartNew(
-                () =>
-                {
-                    Validate(fileTransferInfo, localFilePath);
-
-                    if (this.cancellationTokenSource.Token.IsCancellationRequested)
-                    {
-                        this.cancellationTokenSource.Token.ThrowIfCancellationRequested();
-                    }
+            File.Delete(localFilePath);
+        }
+    }
 
-                    try
-                    {
-                        if (fileTransferInfo.PerformCleanup)
-                        {
-                            if (EqtTrace.IsInfoEnabled)
-                            {
-                                EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer : Moving file {0} to {1}", fileTransferInfo.FileName, localFilePath);
-                            }
+    /// <summary>
+    /// Add a new file transfer (either copy/move) request.
+    /// </summary>
+    /// <param name="fileTransferInfo">
+    /// The file Transfer Info.
+    /// </param>
+    /// <param name="sendFileCompletedCallback">
+    /// The send File Completed Callback.
+    /// </param>
+    /// <param name="uri">
+    /// The uri.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    private void AddNewFileTransfer(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler? sendFileCompletedCallback, Uri uri, string friendlyName)
+    {
+        var context = fileTransferInfo.Context;
+        TPDebug.Assert(
+            context != null,
+            "DataCollectionManager.AddNewFileTransfer: FileDataHeaderMessage with null context.");
+
+        var testCaseId = fileTransferInfo.Context.HasTestCase
+            ? fileTransferInfo.Context.TestExecId.Id.ToString()
+            : string.Empty;
+
+        TPDebug.Assert(SessionOutputDirectory is not null, "SessionOutputDirectory is null.");
+        var directoryPath = Path.Combine(
+            SessionOutputDirectory,
+            testCaseId);
+        var localFilePath = Path.Combine(directoryPath, Path.GetFileName(fileTransferInfo.FileName));
+
+        var task = Task.Factory.StartNew(
+            () =>
+            {
+                Validate(fileTransferInfo, localFilePath);
 
-                            this.fileHelper.MoveFile(fileTransferInfo.FileName, localFilePath);
+                if (_cancellationTokenSource.Token.IsCancellationRequested)
+                {
+                    _cancellationTokenSource.Token.ThrowIfCancellationRequested();
+                }
 
-                            if (EqtTrace.IsInfoEnabled)
-                            {
-                                EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer : Moved file {0} to {1}", fileTransferInfo.FileName, localFilePath);
-                            }
-                        }
-                        else
-                        {
-                            if (EqtTrace.IsInfoEnabled)
-                            {
-                                EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer : Copying file {0} to {1}", fileTransferInfo.FileName, localFilePath);
-                            }
+                try
+                {
+                    if (fileTransferInfo.PerformCleanup)
+                    {
+                        EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer: Moving file {0} to {1}", fileTransferInfo.FileName, localFilePath);
 
-                            this.fileHelper.CopyFile(fileTransferInfo.FileName, localFilePath);
+                        _fileHelper.MoveFile(fileTransferInfo.FileName, localFilePath);
 
-                            if (EqtTrace.IsInfoEnabled)
-                            {
-                                EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer : Copied file {0} to {1}", fileTransferInfo.FileName, localFilePath);
-                            }
-                        }
+                        EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer: Moved file {0} to {1}", fileTransferInfo.FileName, localFilePath);
                     }
-                    catch (Exception ex)
+                    else
                     {
-                        this.LogError(
-                           ex.ToString(),
-                           uri,
-                           friendlyName,
-                           Guid.Parse(testCaseId));
+                        EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer: Copying file {0} to {1}", fileTransferInfo.FileName, localFilePath);
 
-                        throw;
-                    }
-                },
-                this.cancellationTokenSource.Token);
+                        _fileHelper.CopyFile(fileTransferInfo.FileName, localFilePath);
 
-            var continuationTask = task.ContinueWith(
-                (t) =>
+                        EqtTrace.Info("DataCollectionAttachmentManager.AddNewFileTransfer: Copied file {0} to {1}", fileTransferInfo.FileName, localFilePath);
+                    }
+                }
+                catch (Exception ex)
                 {
-                    try
-                    {
-                        if (t.Exception == null)
-                        {
-                            lock (attachmentTaskLock)
-                            {
-                                this.AttachmentSets[fileTransferInfo.Context][uri].Attachments.Add(UriDataAttachment.CreateFrom(localFilePath, fileTransferInfo.Description));
-                            }
-                        }
+                    LogError(
+                        ex.ToString(),
+                        uri,
+                        friendlyName,
+                        GuidPolyfill.Parse(testCaseId, CultureInfo.InvariantCulture)
+                        );
+
+                    throw;
+                }
+            },
+            _cancellationTokenSource.Token);
 
-                        sendFileCompletedCallback?.Invoke(this, new AsyncCompletedEventArgs(t.Exception, false, fileTransferInfo.UserToken));
-                    }
-                    catch (Exception e)
+        var continuationTask = task.ContinueWith(
+            (t) =>
+            {
+                try
+                {
+                    if (t.Exception == null)
                     {
-                        if (EqtTrace.IsErrorEnabled)
+                        lock (_attachmentTaskLock)
                         {
-                            EqtTrace.Error(
-                                "DataCollectionAttachmentManager.TriggerCallBack: Error occurred while raising the file transfer completed callback for {0}. Error: {1}",
-                                localFilePath,
-                                e.ToString());
+                            AttachmentSets[fileTransferInfo.Context][uri].Attachments.Add(UriDataAttachment.CreateFrom(localFilePath, fileTransferInfo.Description));
                         }
                     }
-                },
-                this.cancellationTokenSource.Token);
 
-            this.attachmentTasks[fileTransferInfo.Context].Add(continuationTask);
-        }
+                    sendFileCompletedCallback?.SafeInvoke(this, new AsyncCompletedEventArgs(t.Exception, false, fileTransferInfo.UserToken), "DataCollectionManager.AddNewFileTransfer");
+                }
+                catch (Exception e)
+                {
+                    EqtTrace.Error(
+                        "DataCollectionAttachmentManager.TriggerCallBack: Error occurred while raising the file transfer completed callback for {0}. Error: {1}",
+                        localFilePath,
+                        e.ToString());
+                }
+            },
+            _cancellationTokenSource.Token);
 
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <param name="errorMessage">
-        /// The error message.
-        /// </param>
-        /// <param name="collectorUri">
-        /// The collector uri.
-        /// </param>
-        /// <param name="collectorFriendlyName">
-        /// The collector friendly name.
-        /// </param>
-        /// <param name="testCaseId">
-        /// Id of testCase if available, null otherwise.
-        /// </param>
-        private void LogError(string errorMessage, Uri collectorUri, string collectorFriendlyName, Guid testCaseId)
-        {
-            var args = new DataCollectionMessageEventArgs(TestMessageLevel.Error, errorMessage)
-            {
-                Uri = collectorUri,
-                FriendlyName = collectorFriendlyName
-            };
+        _attachmentTasks[fileTransferInfo.Context].Add(continuationTask);
+    }
 
-            if (!testCaseId.Equals(Guid.Empty))
-            {
-                args.TestCaseId = testCaseId;
-            }
+    /// <summary>
+    /// Logs an error message.
+    /// </summary>
+    /// <param name="errorMessage">
+    /// The error message.
+    /// </param>
+    /// <param name="collectorUri">
+    /// The collector uri.
+    /// </param>
+    /// <param name="collectorFriendlyName">
+    /// The collector friendly name.
+    /// </param>
+    /// <param name="testCaseId">
+    /// Id of testCase if available, null otherwise.
+    /// </param>
+    private void LogError(string errorMessage, Uri collectorUri, string collectorFriendlyName, Guid testCaseId)
+    {
+        var args = new DataCollectionMessageEventArgs(TestMessageLevel.Error, errorMessage)
+        {
+            Uri = collectorUri,
+            FriendlyName = collectorFriendlyName
+        };
 
-            this.messageSink.SendMessage(args);
+        if (!testCaseId.Equals(Guid.Empty))
+        {
+            args.TestCaseId = testCaseId;
         }
 
-        #endregion
+        _messageSink?.SendMessage(args);
+    }
+
+    public void Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            _cancellationTokenSource.Dispose();
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionEnvironmentVariable.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionEnvironmentVariable.cs
index bec2b004ca..3d38d6401c 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionEnvironmentVariable.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionEnvironmentVariable.cs
@@ -1,107 +1,91 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
 
+/// <summary>
+/// An environment variable requested to be set in the test execution environment by a data collector, including the
+/// friendly names of data collectors that requested it.
+/// This is needed to find list of environment variables needed for test run after eliminating the duplicate name and keys.
+/// For details check DataCollectionPluginManager.AddCollectorEnvironmentVariables() method.
+/// </summary>
+internal class DataCollectionEnvironmentVariable
+{
     /// <summary>
-    /// An environment variable requested to be set in the test execution environment by a data collector, including the
-    /// friendly names of data collectors that requested it.
-    /// This is needed to find list of environment variables needed for test run after eliminating the duplicate name and keys.
-    /// For details check DataCollectionPluginManager.AddCollectorEnvironmentVariables() method.
+    /// Variable name and requested value
     /// </summary>
-    internal class DataCollectionEnvironmentVariable
-    {
-        #region Fields
-
-        /// <summary>
-        /// Variable name and requested value
-        /// </summary>
-        private readonly KeyValuePair<string, string> variable;
-
-        /// <summary>
-        /// Friendly names of data collectors that requested this environment variable
-        /// </summary>
-        private List<string> dataCollectorsThatRequested;
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionEnvironmentVariable"/> class.
-        /// </summary>
-        /// <param name="variable">
-        /// Variable name and requested value.
-        /// </param>
-        /// <param name="requestingDataCollectorFriendlyName">
-        /// Friendly name of the data collector requesting it.
-        /// </param>
-        public DataCollectionEnvironmentVariable(
-            KeyValuePair<string, string> variable,
-            string requestingDataCollectorFriendlyName)
-        {
-            ValidateArg.NotNullOrEmpty(variable.Key, nameof(variable.Key));
-            ValidateArg.NotNullOrEmpty(requestingDataCollectorFriendlyName, nameof(requestingDataCollectorFriendlyName));
+    private readonly KeyValuePair<string, string> _variable;
 
-            this.variable = variable;
-            this.dataCollectorsThatRequested = new List<string> { requestingDataCollectorFriendlyName };
-        }
-
-        #endregion
+    /// <summary>
+    /// Friendly names of data collectors that requested this environment variable
+    /// </summary>
+    private readonly List<string> _dataCollectorsThatRequested;
 
-        #region Properties
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionEnvironmentVariable"/> class.
+    /// </summary>
+    /// <param name="variable">
+    /// Variable name and requested value.
+    /// </param>
+    /// <param name="requestingDataCollectorFriendlyName">
+    /// Friendly name of the data collector requesting it.
+    /// </param>
+    public DataCollectionEnvironmentVariable(
+        KeyValuePair<string, string> variable,
+        string requestingDataCollectorFriendlyName)
+    {
+        ValidateArg.NotNullOrEmpty(variable.Key, nameof(variable.Key));
+        ValidateArg.NotNullOrEmpty(requestingDataCollectorFriendlyName, nameof(requestingDataCollectorFriendlyName));
 
-        /// <summary>
-        /// Gets variable name.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                return this.variable.Key;
-            }
-        }
+        _variable = variable;
+        _dataCollectorsThatRequested = new List<string> { requestingDataCollectorFriendlyName };
+    }
 
-        /// <summary>
-        /// Gets requested value
-        /// </summary>
-        public string Value
+    /// <summary>
+    /// Gets variable name.
+    /// </summary>
+    public string Name
+    {
+        get
         {
-            get
-            {
-                return this.variable.Value;
-            }
+            return _variable.Key;
         }
+    }
 
-        /// <summary>
-        /// Gets friendly name of the first data collector that requested this environment variable
-        /// </summary>
-        public string FirstDataCollectorThatRequested
+    /// <summary>
+    /// Gets requested value
+    /// </summary>
+    public string Value
+    {
+        get
         {
-            get
-            {
-                return this.dataCollectorsThatRequested[0];
-            }
+            return _variable.Value;
         }
+    }
 
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Adds the data collector to the list of data collectors that requested this variable. 
-        /// </summary>
-        /// <param name="requestingDataCollectorFriendlyName">Friendly name of requesting data collector.</param>
-        public void AddRequestingDataCollector(string requestingDataCollectorFriendlyName)
+    /// <summary>
+    /// Gets friendly name of the first data collector that requested this environment variable
+    /// </summary>
+    public string FirstDataCollectorThatRequested
+    {
+        get
         {
-            ValidateArg.NotNullOrEmpty(requestingDataCollectorFriendlyName, nameof(requestingDataCollectorFriendlyName));
-            this.dataCollectorsThatRequested.Add(requestingDataCollectorFriendlyName);
+            return _dataCollectorsThatRequested[0];
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Adds the data collector to the list of data collectors that requested this variable.
+    /// </summary>
+    /// <param name="requestingDataCollectorFriendlyName">Friendly name of requesting data collector.</param>
+    public void AddRequestingDataCollector(string requestingDataCollectorFriendlyName)
+    {
+        ValidateArg.NotNullOrEmpty(requestingDataCollectorFriendlyName, nameof(requestingDataCollectorFriendlyName));
+        _dataCollectorsThatRequested.Add(requestingDataCollectorFriendlyName);
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionManager.cs
index eea1662899..5fdaf63c00 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionManager.cs
@@ -1,745 +1,796 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+
+/// <summary>
+/// Manages data collection.
+/// </summary>
+internal class DataCollectionManager : IDataCollectionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+    private static readonly object SyncObject = new();
+    private const string CodeCoverageFriendlyName = "Code Coverage";
 
     /// <summary>
-    /// Manages data collection.
+    /// Value indicating whether data collection is currently enabled.
     /// </summary>
-    internal class DataCollectionManager : IDataCollectionManager
-    {
-        private static object syncObject = new object();
-        private const string CodeCoverageFriendlyName = "Code Coverage";
-
-        /// <summary>
-        /// Value indicating whether data collection is currently enabled.
-        /// </summary>
-        private bool isDataCollectionEnabled;
-
-        /// <summary>
-        /// Data collection environment context.
-        /// </summary>
-        private DataCollectionEnvironmentContext dataCollectionEnvironmentContext;
-
-        /// <summary>
-        /// Attachment manager for performing file transfers for datacollectors.
-        /// </summary>
-        private IDataCollectionAttachmentManager attachmentManager;
-
-        /// <summary>
-        /// Message sink for sending data collection messages to client..
-        /// </summary>
-        private IMessageSink messageSink;
-
-        /// <summary>
-        /// Events that can be subscribed by datacollectors.
-        /// </summary>
-        private TestPlatformDataCollectionEvents events;
-
-        /// <summary>
-        /// Specifies whether the object is disposed or not.
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Extension manager for data collectors.
-        /// </summary>
-        private DataCollectorExtensionManager dataCollectorExtensionManager;
-
-        /// <summary>
-        /// Request data
-        /// </summary>
-        private IDataCollectionTelemetryManager dataCollectionTelemetryManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="messageSink">
-        /// The message Sink.
-        /// </param>
-        internal DataCollectionManager(IMessageSink messageSink, IRequestData requestData) : this(new DataCollectionAttachmentManager(), messageSink, new DataCollectionTelemetryManager(requestData))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="datacollectionAttachmentManager">
-        /// The datacollection Attachment Manager.
-        /// </param>
-        /// <param name="messageSink">
-        /// The message Sink.
-        /// </param>
-        /// <remarks>
-        /// The constructor is not public because the factory method should be used to get instances of this class.
-        /// </remarks>
-        protected DataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink, IDataCollectionTelemetryManager dataCollectionTelemetryManager)
-        {
-            this.attachmentManager = datacollectionAttachmentManager;
-            this.messageSink = messageSink;
-            this.events = new TestPlatformDataCollectionEvents();
-            this.dataCollectorExtensionManager = null;
-            this.RunDataCollectors = new Dictionary<Type, DataCollectorInformation>();
-            this.dataCollectionTelemetryManager = dataCollectionTelemetryManager;
-        }
-
-        /// <summary>
-        /// Gets the instance of DataCollectionManager.
-        /// </summary>
-        public static DataCollectionManager Instance { get; private set; }
-
-        /// <summary>
-        /// Gets cache of data collectors associated with the run.
-        /// </summary>
-        internal Dictionary<Type, DataCollectorInformation> RunDataCollectors { get; private set; }
-
-        /// <summary>
-        /// Gets the data collector extension manager.
-        /// </summary>
-        private DataCollectorExtensionManager DataCollectorExtensionManager
-        {
-            get
-            {
-                if (this.dataCollectorExtensionManager == null)
-                {
-                    // TODO : change IMessageSink and use IMessageLogger instead.
-                    this.dataCollectorExtensionManager = DataCollectorExtensionManager.Create(TestSessionMessageLogger.Instance);
-                }
+    private bool _isDataCollectionEnabled;
 
-                return this.dataCollectorExtensionManager;
-            }
-        }
+    /// <summary>
+    /// Data collection environment context.
+    /// </summary>
+    private DataCollectionEnvironmentContext? _dataCollectionEnvironmentContext;
 
-        /// <summary>
-        /// Creates an instance of the TestLoggerExtensionManager.
-        /// </summary>
-        /// <param name="messageSink">
-        /// The message sink.
-        /// </param>
-        /// <returns>
-        /// The <see cref="DataCollectionManager"/>.
-        /// </returns>
-        public static DataCollectionManager Create(IMessageSink messageSink, IRequestData requestData)
-        {
-            if (Instance == null)
-            {
-                lock (syncObject)
-                {
-                    if (Instance == null)
-                    {
-                        Instance = new DataCollectionManager(messageSink, requestData);
-                    }
-                }
-            }
+    /// <summary>
+    /// Attachment manager for performing file transfers for datacollectors.
+    /// </summary>
+    private readonly IDataCollectionAttachmentManager _attachmentManager;
 
-            return Instance;
-        }
+    /// <summary>
+    /// Message sink for sending data collection messages to client..
+    /// </summary>
+    private readonly IMessageSink _messageSink;
 
-        /// <inheritdoc/>
-        public IDictionary<string, string> InitializeDataCollectors(string settingsXml)
-        {
-            if (string.IsNullOrEmpty(settingsXml) && EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("DataCollectionManager.InitializeDataCollectors : Runsettings is null or empty.");
-            }
+    /// <summary>
+    /// Events that can be subscribed by datacollectors.
+    /// </summary>
+    private readonly TestPlatformDataCollectionEvents _events;
+
+    /// <summary>
+    /// Telemetry reporter
+    /// </summary>
+    private readonly ITelemetryReporter _telemetryReporter;
+
+    /// <summary>
+    /// Specifies whether the object is disposed or not.
+    /// </summary>
+    private bool _isDisposed;
 
-            ValidateArg.NotNull(settingsXml, nameof(settingsXml));
+    /// <summary>
+    /// Extension manager for data collectors.
+    /// </summary>
+    private DataCollectorExtensionManager? _dataCollectorExtensionManager;
+
+    /// <summary>
+    /// Request data
+    /// </summary>
+    private readonly IDataCollectionTelemetryManager _dataCollectionTelemetryManager;
 
-            var sessionId = new SessionId(Guid.NewGuid());
-            var dataCollectionContext = new DataCollectionContext(sessionId);
-            this.dataCollectionEnvironmentContext = DataCollectionEnvironmentContext.CreateForLocalEnvironment(dataCollectionContext);
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionManager"/> class.
+    /// </summary>
+    /// <param name="messageSink">
+    /// The message Sink.
+    /// </param>
+    /// <param name="requestData">request data</param>
+    /// <param name="telemetryReporter">telemetry reporter</param>
+    internal DataCollectionManager(IMessageSink messageSink, IRequestData requestData, ITelemetryReporter telemetryReporter) : this(new DataCollectionAttachmentManager(), messageSink, new DataCollectionTelemetryManager(requestData), telemetryReporter)
+    {
+    }
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
-            var resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionManager"/> class.
+    /// </summary>
+    /// <param name="datacollectionAttachmentManager">
+    /// The datacollection Attachment Manager.
+    /// </param>
+    /// <param name="messageSink">
+    /// The message Sink.
+    /// </param>
+    /// <param name="dataCollectionTelemetryManager">telemetry manager</param>
+    /// <param name="telemetryReporter">telemetry reporter</param>
+    /// <remarks>
+    /// The constructor is not public because the factory method should be used to get instances of this class.
+    /// </remarks>
+    protected DataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink, IDataCollectionTelemetryManager dataCollectionTelemetryManager, ITelemetryReporter telemetryReporter)
+    {
+        _attachmentManager = datacollectionAttachmentManager;
+        _messageSink = messageSink;
+        _events = new TestPlatformDataCollectionEvents();
+        _dataCollectorExtensionManager = null;
+        RunDataCollectors = new Dictionary<Type, DataCollectorInformation>();
+        _dataCollectionTelemetryManager = dataCollectionTelemetryManager;
+        _telemetryReporter = telemetryReporter;
+    }
 
-            this.attachmentManager.Initialize(sessionId, resultsDirectory, this.messageSink);
+    /// <summary>
+    /// Gets the instance of DataCollectionManager.
+    /// </summary>
+    public static DataCollectionManager? Instance { get; private set; }
 
-            // Environment variables are passed to testhost process, through ProcessStartInfo.EnvironmentVariables, which handles the key in a case-insensitive manner, which is translated to lowercase.
-            // Therefore, using StringComparer.OrdinalIgnoreCase so that same keys with different cases are treated as same.
-            var executionEnvironmentVariables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+    /// <summary>
+    /// Gets cache of data collectors associated with the run.
+    /// </summary>
+    internal Dictionary<Type, DataCollectorInformation> RunDataCollectors { get; private set; }
 
-            var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settingsXml);
+    /// <summary>
+    /// Gets the data collector extension manager.
+    /// </summary>
+    private DataCollectorExtensionManager DataCollectorExtensionManager
+    {
+        get
+        {
+            // TODO : change IMessageSink and use IMessageLogger instead.
+            _dataCollectorExtensionManager ??= DataCollectorExtensionManager.Create(TestSessionMessageLogger.Instance);
 
-            this.isDataCollectionEnabled = dataCollectionRunSettings.IsCollectionEnabled;
+            return _dataCollectorExtensionManager;
+        }
+    }
 
-            // If dataCollectionRunSettings is null, that means datacollectors are not configured.
-            if (dataCollectionRunSettings == null || !dataCollectionRunSettings.IsCollectionEnabled)
+    /// <summary>
+    /// Creates an instance of the TestLoggerExtensionManager.
+    /// </summary>
+    /// <param name="messageSink">
+    /// The message sink.
+    /// </param>
+    /// <param name="requestData">request data</param>
+    /// <param name="telemetryReporter">telemetry reporter</param>
+    /// <returns>
+    /// The <see cref="DataCollectionManager"/>.
+    /// </returns>
+    public static DataCollectionManager Create(IMessageSink messageSink, IRequestData requestData, ITelemetryReporter telemetryReporter)
+    {
+        if (Instance == null)
+        {
+            lock (SyncObject)
             {
-                return executionEnvironmentVariables;
+                Instance ??= new DataCollectionManager(messageSink, requestData, telemetryReporter);
             }
+        }
 
-            // Get settings for each data collector, load and initialize the data collectors.
-            var enabledDataCollectorsSettings = this.GetDataCollectorsEnabledForRun(dataCollectionRunSettings);
-            if (enabledDataCollectorsSettings == null || enabledDataCollectorsSettings.Count == 0)
-            {
-                return executionEnvironmentVariables;
-            }
+        return Instance;
+    }
 
-            foreach (var dataCollectorSettings in enabledDataCollectorsSettings)
-            {
-                this.LoadAndInitialize(dataCollectorSettings, settingsXml);
-            }
+    /// <inheritdoc/>
+    public IDictionary<string, string?> InitializeDataCollectors(string settingsXml)
+    {
+        ValidateArg.NotNull(settingsXml, nameof(settingsXml));
+        if (settingsXml.Length == 0)
+        {
+            EqtTrace.Info("DataCollectionManager.InitializeDataCollectors: Runsettings is empty.");
+        }
 
-            // Once all data collectors have been initialized, query for environment variables
-            var dataCollectorEnvironmentVariables = this.GetEnvironmentVariables(out var unloadedAnyCollector);
+        var sessionId = new SessionId(Guid.NewGuid());
+        var dataCollectionContext = new DataCollectionContext(sessionId);
+        _dataCollectionEnvironmentContext = DataCollectionEnvironmentContext.CreateForLocalEnvironment(dataCollectionContext);
 
-            foreach (var variable in dataCollectorEnvironmentVariables.Values)
-            {
-                executionEnvironmentVariables.Add(variable.Name, variable.Value);
-            }
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+        var resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
+
+        _attachmentManager.Initialize(sessionId, resultsDirectory, _messageSink);
 
+        // Environment variables are passed to testhost process, through ProcessStartInfo.EnvironmentVariables, which handles the key in a case-insensitive manner, which is translated to lowercase.
+        // Therefore, using StringComparer.OrdinalIgnoreCase so that same keys with different cases are treated as same.
+        var executionEnvironmentVariables = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
+
+        var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settingsXml);
+
+        _isDataCollectionEnabled = dataCollectionRunSettings?.IsCollectionEnabled ?? false;
+
+        // If dataCollectionRunSettings is null, that means datacollectors are not configured.
+        if (dataCollectionRunSettings == null || !dataCollectionRunSettings.IsCollectionEnabled)
+        {
             return executionEnvironmentVariables;
         }
 
-        /// <inheritdoc/>
-        public void Dispose()
+        // Get settings for each data collector, load and initialize the data collectors.
+        var enabledDataCollectorsSettings = GetDataCollectorsEnabledForRun(dataCollectionRunSettings);
+        if (enabledDataCollectorsSettings == null || enabledDataCollectorsSettings.Count == 0)
         {
-            this.Dispose(true);
-
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
+            return executionEnvironmentVariables;
         }
 
-        /// <inheritdoc/>
-        public Collection<AttachmentSet> SessionEnded(bool isCancelled = false)
+        foreach (var dataCollectorSettings in enabledDataCollectorsSettings)
         {
-            // Return null if datacollection is not enabled.
-            if (!this.isDataCollectionEnabled)
-            {
-                return new Collection<AttachmentSet>();
-            }
+            LoadAndInitialize(dataCollectorSettings, settingsXml);
+        }
 
-            if (isCancelled)
-            {
-                this.attachmentManager.Cancel();
-                return new Collection<AttachmentSet>();
-            }
+        // Once all data collectors have been initialized, query for environment variables
+        var dataCollectorEnvironmentVariables = GetEnvironmentVariables(out _);
 
-            var endEvent = new SessionEndEventArgs(this.dataCollectionEnvironmentContext.SessionDataCollectionContext);
-            this.SendEvent(endEvent);
+        foreach (var variable in dataCollectorEnvironmentVariables.Values)
+        {
+            executionEnvironmentVariables.Add(variable.Name, variable.Value);
+        }
 
-            var result = new List<AttachmentSet>();
-            try
-            {
-                result = this.attachmentManager.GetAttachments(endEvent.Context);
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionManager.SessionEnded: Failed to get attachments : {0}", ex);
-                }
+        return executionEnvironmentVariables;
+    }
 
-                return new Collection<AttachmentSet>(result);
-            }
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        Dispose(true);
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                this.LogAttachments(result);
-            }
+        // Use SupressFinalize in case a subclass
+        // of this type implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-            return new Collection<AttachmentSet>(result);
+    /// <inheritdoc/>
+    public Collection<AttachmentSet> SessionEnded(bool isCancelled = false)
+    {
+        // Return null if datacollection is not enabled.
+        if (!_isDataCollectionEnabled)
+        {
+            return new Collection<AttachmentSet>();
         }
 
-        /// <inheritdoc/>
-        public void TestHostLaunched(int processId)
+        if (isCancelled)
         {
-            if (!this.isDataCollectionEnabled)
-            {
-                return;
-            }
+            _attachmentManager.Cancel();
+            return new Collection<AttachmentSet>();
+        }
 
-            var testHostLaunchedEventArgs = new TestHostLaunchedEventArgs(this.dataCollectionEnvironmentContext.SessionDataCollectionContext, processId);
+        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+        var endEvent = new SessionEndEventArgs(_dataCollectionEnvironmentContext.SessionDataCollectionContext);
+        SendEvent(endEvent);
 
-            this.SendEvent(testHostLaunchedEventArgs);
+        var result = new List<AttachmentSet>();
+        try
+        {
+            result = _attachmentManager.GetAttachments(endEvent.Context);
         }
-
-        /// <inheritdoc/>
-        public bool SessionStarted(SessionStartEventArgs sessionStartEventArgs)
+        catch (Exception ex)
         {
-            // If datacollectors are not configured or datacollection is not enabled, return false.
-            if (!this.isDataCollectionEnabled || this.RunDataCollectors.Count == 0)
-            {
-                return false;
-            }
-
-            sessionStartEventArgs.Context = new DataCollectionContext(this.dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId);
-            this.SendEvent(sessionStartEventArgs);
+            EqtTrace.Error("DataCollectionManager.SessionEnded: Failed to get attachments : {0}", ex);
 
-            return this.events.AreTestCaseEventsSubscribed();
+            return new Collection<AttachmentSet>(result);
         }
 
-        /// <inheritdoc/>
-        public void TestCaseStarted(TestCaseStartEventArgs testCaseStartEventArgs)
+        if (EqtTrace.IsVerboseEnabled)
         {
-            if (!this.isDataCollectionEnabled)
-            {
-                return;
-            }
+            LogAttachments(result);
+        }
 
-            var context = new DataCollectionContext(this.dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId, testCaseStartEventArgs.TestElement);
-            testCaseStartEventArgs.Context = context;
+        return new Collection<AttachmentSet>(result);
+    }
 
-            this.SendEvent(testCaseStartEventArgs);
+    /// <inheritdoc/>
+    public Collection<InvokedDataCollector> GetInvokedDataCollectors()
+    {
+        List<InvokedDataCollector> invokedDataCollector = new();
+        foreach (DataCollectorInformation dataCollectorInformation in RunDataCollectors.Values)
+        {
+            invokedDataCollector.Add(new InvokedDataCollector(dataCollectorInformation.DataCollectorConfig.TypeUri!,
+                dataCollectorInformation.DataCollectorConfig.FriendlyName,
+                dataCollectorInformation.DataCollectorConfig.DataCollectorType.AssemblyQualifiedName!,
+                dataCollectorInformation.DataCollectorConfig.FilePath!,
+                dataCollectorInformation.DataCollectorConfig.HasAttachmentsProcessor()));
         }
 
-        /// <inheritdoc/>
-        public Collection<AttachmentSet> TestCaseEnded(TestCaseEndEventArgs testCaseEndEventArgs)
+        return new Collection<InvokedDataCollector>(invokedDataCollector);
+    }
+
+    /// <inheritdoc/>
+    public void TestHostLaunched(int processId)
+    {
+        if (!_isDataCollectionEnabled)
         {
-            if (!this.isDataCollectionEnabled)
-            {
-                return new Collection<AttachmentSet>();
-            }
+            return;
+        }
 
-            var context = new DataCollectionContext(this.dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId, testCaseEndEventArgs.TestElement);
-            testCaseEndEventArgs.Context = context;
+        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+        var testHostLaunchedEventArgs = new TestHostLaunchedEventArgs(_dataCollectionEnvironmentContext.SessionDataCollectionContext, processId);
 
-            this.SendEvent(testCaseEndEventArgs);
+        SendEvent(testHostLaunchedEventArgs);
+    }
 
-            List<AttachmentSet> result = null;
-            try
-            {
-                result = this.attachmentManager.GetAttachments(testCaseEndEventArgs.Context);
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionManager.TestCaseEnded: Failed to get attachments : {0}", ex);
-                }
+    /// <inheritdoc/>
+    public bool SessionStarted(SessionStartEventArgs sessionStartEventArgs)
+    {
+        // If datacollectors are not configured or datacollection is not enabled, return false.
+        if (!_isDataCollectionEnabled || RunDataCollectors.Count == 0)
+        {
+            return false;
+        }
 
-                return new Collection<AttachmentSet>(result);
-            }
+        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+        sessionStartEventArgs.Context = new DataCollectionContext(_dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId);
+        SendEvent(sessionStartEventArgs);
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                this.LogAttachments(result);
-            }
+        return _events.AreTestCaseEventsSubscribed();
+    }
 
-            return new Collection<AttachmentSet>(result);
+    /// <inheritdoc/>
+    public void TestCaseStarted(TestCaseStartEventArgs testCaseStartEventArgs)
+    {
+        if (!_isDataCollectionEnabled)
+        {
+            return;
         }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        /// <param name="disposing">
-        /// The disposing.
-        /// </param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!this.disposed)
-            {
-                if (disposing)
-                {
-                    CleanupPlugins();
-                }
+        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+        TPDebug.Assert(testCaseStartEventArgs.TestElement is not null, "testCaseStartEventArgs.TestElement is null");
+        var context = new DataCollectionContext(_dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId, testCaseStartEventArgs.TestElement);
+        testCaseStartEventArgs.Context = context;
 
-                this.disposed = true;
-            }
-        }
+        SendEvent(testCaseStartEventArgs);
+    }
 
-        private void CleanupPlugins()
+    /// <inheritdoc/>
+    public Collection<AttachmentSet> TestCaseEnded(TestCaseEndEventArgs testCaseEndEventArgs)
+    {
+        if (!_isDataCollectionEnabled)
         {
-            EqtTrace.Info("DataCollectionManager.CleanupPlugins: CleanupPlugins called");
+            return new Collection<AttachmentSet>();
+        }
 
-            if (!this.isDataCollectionEnabled)
-            {
-                return;
-            }
+        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+        TPDebug.Assert(testCaseEndEventArgs.TestElement is not null, "testCaseEndEventArgs.TestElement is null");
+        var context = new DataCollectionContext(_dataCollectionEnvironmentContext.SessionDataCollectionContext.SessionId, testCaseEndEventArgs.TestElement);
+        testCaseEndEventArgs.Context = context;
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DataCollectionManager.CleanupPlugins: Cleaning up {0} plugins", this.RunDataCollectors.Count);
-            }
+        SendEvent(testCaseEndEventArgs);
 
-            RemoveDataCollectors(new List<DataCollectorInformation>(this.RunDataCollectors.Values));
+        List<AttachmentSet>? result = null;
+        try
+        {
+            result = _attachmentManager.GetAttachments(testCaseEndEventArgs.Context);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("DataCollectionManager.TestCaseEnded: Failed to get attachments: {0}", ex);
+            // TODO: It's possible we throw ArgumentNullException from catch, is it expected?
+            return new Collection<AttachmentSet>(result!);
+        }
 
-            EqtTrace.Info("DataCollectionManager.CleanupPlugins: CleanupPlugins finished");
+        if (EqtTrace.IsVerboseEnabled)
+        {
+            LogAttachments(result);
         }
 
-        #region Load and Initialize DataCollectors
+        return new Collection<AttachmentSet>(result);
+    }
 
-        /// <summary>
-        /// Tries to get uri of the data collector corresponding to the friendly name. If no such data collector exists return null.
-        /// </summary>
-        /// <param name="friendlyName">The friendly Name.</param>
-        /// <param name="dataCollectorUri">The data collector Uri.</param>
-        /// <returns><see cref="bool"/></returns>
-        protected virtual bool TryGetUriFromFriendlyName(string friendlyName, out string dataCollectorUri)
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    /// <param name="disposing">
+    /// The disposing.
+    /// </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_isDisposed)
         {
-            var extensionManager = this.dataCollectorExtensionManager;
-            foreach (var extension in extensionManager.TestExtensions)
+            if (disposing)
             {
-                if (string.Equals(friendlyName, extension.Metadata.FriendlyName, StringComparison.OrdinalIgnoreCase))
-                {
-                    dataCollectorUri = extension.Metadata.ExtensionUri;
-                    return true;
-                }
+                CleanupPlugins();
             }
 
-            dataCollectorUri = null;
-            return false;
+            _isDisposed = true;
+        }
+    }
+
+    private void CleanupPlugins()
+    {
+        EqtTrace.Info("DataCollectionManager.CleanupPlugins: CleanupPlugins called");
+
+        if (!_isDataCollectionEnabled)
+        {
+            return;
         }
 
-        protected virtual bool IsUriValid(string uri)
+        EqtTrace.Verbose("DataCollectionManager.CleanupPlugins: Cleaning up {0} plugins", RunDataCollectors.Count);
+
+        RemoveDataCollectors(new List<DataCollectorInformation>(RunDataCollectors.Values));
+
+        EqtTrace.Info("DataCollectionManager.CleanupPlugins: CleanupPlugins finished");
+    }
+
+    /// <summary>
+    /// Tries to get uri of the data collector corresponding to the friendly name. If no such data collector exists return null.
+    /// </summary>
+    /// <param name="friendlyName">The friendly Name.</param>
+    /// <param name="dataCollectorUri">The data collector Uri.</param>
+    /// <returns><see cref="bool"/></returns>
+    protected virtual bool TryGetUriFromFriendlyName(string? friendlyName, [NotNullWhen(true)] out string? dataCollectorUri)
+    {
+        TPDebug.Assert(_dataCollectorExtensionManager is not null, "_dataCollectorExtensionManager is null");
+        foreach (var extension in _dataCollectorExtensionManager.TestExtensions)
         {
-            if (string.IsNullOrEmpty(uri))
+            if (string.Equals(friendlyName, extension.Metadata.FriendlyName, StringComparison.OrdinalIgnoreCase))
             {
-                return false;
+                dataCollectorUri = extension.Metadata.ExtensionUri;
+                return true;
             }
+        }
+
+        dataCollectorUri = null;
+        return false;
+    }
 
-            var extensionManager = this.dataCollectorExtensionManager;
-            foreach (var extension in extensionManager.TestExtensions)
+    /// <summary>
+    /// Gets the DataCollectorConfig using uri.
+    /// </summary>
+    /// <param name="extensionUri">
+    /// The extension uri.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollectorConfig"/>.
+    /// </returns>
+    protected virtual DataCollectorConfig? TryGetDataCollectorConfig(string extensionUri)
+    {
+        TPDebug.Assert(_dataCollectorExtensionManager is not null, "_dataCollectorExtensionManager is null");
+        foreach (var extension in _dataCollectorExtensionManager.TestExtensions)
+        {
+            if (string.Equals(extension.TestPluginInfo?.IdentifierData, extensionUri, StringComparison.OrdinalIgnoreCase))
             {
-                if (string.Equals(uri, extension.Metadata.ExtensionUri, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return (DataCollectorConfig)extension.TestPluginInfo!;
             }
-            return false;
         }
 
-        /// <summary>
-        /// Gets the extension using uri.
-        /// </summary>
-        /// <param name="extensionUri">
-        /// The extension uri.
-        /// </param>
-        /// <returns>
-        /// The <see cref="DataCollector"/>.
-        /// </returns>
-        protected virtual DataCollector TryGetTestExtension(string extensionUri)
+        return null;
+    }
+
+    protected virtual bool IsUriValid(string? uri)
+    {
+        if (uri.IsNullOrEmpty())
         {
-            return this.DataCollectorExtensionManager.TryGetTestExtension(extensionUri).Value;
+            return false;
         }
 
-        /// <summary>
-        /// Loads and initializes data collector using data collector settings.
-        /// </summary>
-        /// <param name="dataCollectorSettings">
-        /// The data collector settings.
-        /// </param>
-        /// <param name="settingsXml"> runsettings Xml</param>
-        private void LoadAndInitialize(DataCollectorSettings dataCollectorSettings, string settingsXml)
+        TPDebug.Assert(_dataCollectorExtensionManager is not null, "_dataCollectorExtensionManager is null");
+        foreach (var extension in _dataCollectorExtensionManager.TestExtensions)
         {
-            DataCollectorInformation dataCollectorInfo;
-            DataCollectorConfig dataCollectorConfig;
-
-            try
+            if (string.Equals(uri, extension.Metadata.ExtensionUri, StringComparison.OrdinalIgnoreCase))
             {
-                // Look up the extension and initialize it if one is found.
-                var extensionManager = this.DataCollectorExtensionManager;
-                var dataCollectorUri = dataCollectorSettings.Uri?.ToString();
-
-                if (!IsUriValid(dataCollectorUri) && !this.TryGetUriFromFriendlyName(dataCollectorSettings.FriendlyName, out dataCollectorUri))
-                {
-                    this.LogWarning(string.Format(CultureInfo.CurrentUICulture, Resources.Resources.UnableToFetchUriString, dataCollectorSettings.FriendlyName));
-                }
+                return true;
+            }
+        }
+        return false;
+    }
 
-                DataCollector dataCollector = null;
-                if (!string.IsNullOrWhiteSpace(dataCollectorUri))
-                {
-                    dataCollector = this.TryGetTestExtension(dataCollectorUri);
-                }
+    /// <summary>
+    /// Gets the extension using uri.
+    /// </summary>
+    /// <param name="extensionUri">
+    /// The extension uri.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollector"/>.
+    /// </returns>
+    protected virtual ObjectModel.DataCollection.DataCollector TryGetTestExtension(string extensionUri)
+    {
+        var extension = DataCollectorExtensionManager.TryGetTestExtension(extensionUri);
+        TPDebug.Assert(extension is not null, "extension is null");
+        return extension.Value;
+    }
 
-                if (dataCollector == null)
-                {
-                    this.LogWarning(string.Format(CultureInfo.CurrentUICulture, Resources.Resources.DataCollectorNotFound, dataCollectorSettings.FriendlyName));
-                    return;
-                }
+    /// <summary>
+    /// Loads and initializes data collector using data collector settings.
+    /// </summary>
+    /// <param name="dataCollectorSettings">
+    /// The data collector settings.
+    /// </param>
+    /// <param name="settingsXml"> runsettings Xml</param>
+    private void LoadAndInitialize(DataCollectorSettings dataCollectorSettings, string settingsXml)
+    {
+        DataCollectorInformation dataCollectorInfo;
+        DataCollectorConfig? dataCollectorConfig;
 
-                if (this.RunDataCollectors.ContainsKey(dataCollector.GetType()))
-                {
-                    // Collector is already loaded (may be configured twice). Ignore duplicates and return.
-                    return;
-                }
+        try
+        {
+            // Look up the extension and initialize it if one is found.
+            var extensionManager = DataCollectorExtensionManager;
+            var dataCollectorUri = dataCollectorSettings.Uri?.ToString();
 
-                dataCollectorConfig = new DataCollectorConfig(dataCollector.GetType());
-
-                // Attempt to get the data collector information verifying that all of the required metadata for the collector is available.
-                dataCollectorInfo = new DataCollectorInformation(
-                                                    dataCollector,
-                                                    dataCollectorSettings.Configuration,
-                                                    dataCollectorConfig,
-                                                    this.dataCollectionEnvironmentContext,
-                                                    this.attachmentManager,
-                                                    this.events,
-                                                    this.messageSink,
-                                                    settingsXml);
+            if (!IsUriValid(dataCollectorUri) && !TryGetUriFromFriendlyName(dataCollectorSettings.FriendlyName, out dataCollectorUri))
+            {
+                LogWarning(string.Format(CultureInfo.CurrentCulture, Resources.Resources.UnableToFetchUriString, dataCollectorSettings.FriendlyName));
             }
-            catch (Exception ex)
+
+            ObjectModel.DataCollection.DataCollector? dataCollector = null;
+            if (!dataCollectorUri.IsNullOrWhiteSpace())
             {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionManager.LoadAndInitialize: exception while creating data collector {0} : {1}", dataCollectorSettings.FriendlyName, ex);
-                }
+                dataCollector = TryGetTestExtension(dataCollectorUri);
+            }
 
-                // No data collector info, so send the error with no direct association to the collector.
-                this.LogWarning(string.Format(CultureInfo.CurrentUICulture, Resources.Resources.DataCollectorInitializationError, dataCollectorSettings.FriendlyName, ex));
+            if (dataCollector == null)
+            {
+                LogWarning(string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorNotFound, dataCollectorSettings.FriendlyName));
                 return;
             }
 
-            try
+            if (RunDataCollectors.ContainsKey(dataCollector.GetType()))
             {
-                dataCollectorInfo.InitializeDataCollector();
-                lock (this.RunDataCollectors)
-                {
-                    // Add data collectors to run cache.
-                    this.RunDataCollectors[dataCollectorConfig.DataCollectorType] = dataCollectorInfo;
-                }
+                // Collector is already loaded (may be configured twice). Ignore duplicates and return.
+                return;
             }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionManager.LoadAndInitialize: exception while initializing data collector {0} : {1}", dataCollectorSettings.FriendlyName, ex);
-                }
 
-                // Log error.
-                dataCollectorInfo.Logger.LogError(this.dataCollectionEnvironmentContext.SessionDataCollectionContext, string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorInitializationError, dataCollectorConfig.FriendlyName, ex));
+            dataCollectorConfig = TryGetDataCollectorConfig(dataCollectorUri!);
+            TPDebug.Assert(dataCollectorConfig is not null, "dataCollectorConfig is null");
+            TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+
+            // Attempt to get the data collector information verifying that all of the required metadata for the collector is available.
+            dataCollectorInfo = new DataCollectorInformation(
+                dataCollector,
+                dataCollectorSettings.Configuration,
+                dataCollectorConfig,
+                _dataCollectionEnvironmentContext,
+                _attachmentManager,
+                _events,
+                _messageSink,
+                settingsXml);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("DataCollectionManager.LoadAndInitialize: exception while creating data collector {0} : {1}", dataCollectorSettings.FriendlyName, ex);
 
-                // Dispose datacollector.
-                dataCollectorInfo.DisposeDataCollector();
-            }
+            // No data collector info, so send the error with no direct association to the collector.
+            LogWarning(string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorInitializationError, dataCollectorSettings.FriendlyName, ex));
+            return;
         }
 
-        /// <summary>
-        /// Finds data collector enabled for the run in data collection settings.
-        /// </summary>
-        /// <param name="dataCollectionSettings">data collection settings</param>
-        /// <returns>List of enabled data collectors</returns>
-        private List<DataCollectorSettings> GetDataCollectorsEnabledForRun(DataCollectionRunSettings dataCollectionSettings)
+        try
         {
-            var runEnabledDataCollectors = new List<DataCollectorSettings>();
-            foreach (var settings in dataCollectionSettings.DataCollectorSettingsList)
+            dataCollectorInfo.InitializeDataCollector(_telemetryReporter);
+            TPDebug.Assert(dataCollectorConfig is not null, "dataCollectorConfig is null");
+            lock (RunDataCollectors)
             {
-                if (settings.IsEnabled)
-                {
-                    if (runEnabledDataCollectors.Any(dcSettings => string.Equals(dcSettings.FriendlyName, settings.FriendlyName, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        // If Uri or assembly qualified type name is repeated, consider data collector as duplicate and ignore it.
-                        this.LogWarning(string.Format(CultureInfo.CurrentUICulture, Resources.Resources.IgnoredDuplicateConfiguration, settings.FriendlyName));
-                        continue;
-                    }
-
-                    runEnabledDataCollectors.Add(settings);
-                }
+                // Add data collectors to run cache.
+                RunDataCollectors[dataCollectorConfig.DataCollectorType] = dataCollectorInfo;
             }
-
-            return runEnabledDataCollectors;
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("DataCollectionManager.LoadAndInitialize: exception while initializing data collector {0} : {1}", dataCollectorSettings.FriendlyName, ex);
 
-        #endregion
+            // Log error.
+            TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+            TPDebug.Assert(dataCollectorConfig is not null, "dataCollectorConfig is null");
+            dataCollectorInfo.Logger.LogError(_dataCollectionEnvironmentContext.SessionDataCollectionContext, string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorInitializationError, dataCollectorConfig.FriendlyName, ex));
 
-        /// <summary>
-        /// Sends a warning message against the session which is not associated with a data collector.
-        /// </summary>
-        /// <remarks>
-        /// This should only be used when we do not have the data collector info yet.  After we have the data
-        /// collector info we can use the data collectors logger for errors.
-        /// </remarks>
-        /// <param name="warningMessage">The message to be logged.</param>
-        private void LogWarning(string warningMessage)
-        {
-            this.messageSink.SendMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Warning, warningMessage));
+            // Dispose datacollector.
+            dataCollectorInfo.DisposeDataCollector();
         }
+    }
 
-        /// <summary>
-        /// Sends the event to all data collectors and fires a callback on the sender, letting it
-        /// know when all plugins have completed processing the event
-        /// </summary>
-        /// <param name="args">The context information for the event</param>
-        private void SendEvent(DataCollectionEventArgs args)
+    /// <summary>
+    /// Finds data collector enabled for the run in data collection settings.
+    /// </summary>
+    /// <param name="dataCollectionSettings">data collection settings</param>
+    /// <returns>List of enabled data collectors</returns>
+    private List<DataCollectorSettings> GetDataCollectorsEnabledForRun(DataCollectionRunSettings dataCollectionSettings)
+    {
+        var runEnabledDataCollectors = new List<DataCollectorSettings>();
+        foreach (var settings in dataCollectionSettings.DataCollectorSettingsList)
         {
-            ValidateArg.NotNull(args, nameof(args));
-
-            if (!this.isDataCollectionEnabled)
+            if (settings.IsEnabled)
             {
-                if (EqtTrace.IsErrorEnabled)
+                if (runEnabledDataCollectors.Any(dcSettings => string.Equals(dcSettings.FriendlyName, settings.FriendlyName, StringComparison.OrdinalIgnoreCase)))
                 {
-                    EqtTrace.Error("DataCollectionManger:SendEvent: SendEvent called when no collection is enabled.");
+                    // If Uri or assembly qualified type name is repeated, consider data collector as duplicate and ignore it.
+                    LogWarning(string.Format(CultureInfo.CurrentCulture, Resources.Resources.IgnoredDuplicateConfiguration, settings.FriendlyName));
+                    continue;
                 }
 
-                return;
+                runEnabledDataCollectors.Add(settings);
             }
+        }
+
+        return runEnabledDataCollectors;
+    }
+
+    /// <summary>
+    /// Sends a warning message against the session which is not associated with a data collector.
+    /// </summary>
+    /// <remarks>
+    /// This should only be used when we do not have the data collector info yet.  After we have the data
+    /// collector info we can use the data collectors logger for errors.
+    /// </remarks>
+    /// <param name="warningMessage">The message to be logged.</param>
+    private void LogWarning(string warningMessage)
+    {
+        _messageSink.SendMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Warning, warningMessage));
+    }
+
+    /// <summary>
+    /// Sends the event to all data collectors and fires a callback on the sender, letting it
+    /// know when all plugins have completed processing the event
+    /// </summary>
+    /// <param name="args">The context information for the event</param>
+    private void SendEvent(DataCollectionEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        if (!_isDataCollectionEnabled)
+        {
+            EqtTrace.Error("DataCollectionManger:SendEvent: SendEvent called when no collection is enabled.");
+            return;
+        }
 
-            // do not send events multiple times
-            this.events.RaiseEvent(args);
-        }
-
-        /// <summary>
-        /// The get environment variables.
-        /// </summary>
-        /// <param name="unloadedAnyCollector">
-        /// The unloaded any collector.
-        /// </param>
-        /// <returns>
-        /// Dictionary of variable name as key and collector requested environment variable as value.
-        /// </returns>
-        private Dictionary<string, DataCollectionEnvironmentVariable> GetEnvironmentVariables(out bool unloadedAnyCollector)
-        {
-            var failedCollectors = new List<DataCollectorInformation>();
-            unloadedAnyCollector = false;
-            var dataCollectorEnvironmentVariable = new Dictionary<string, DataCollectionEnvironmentVariable>(StringComparer.OrdinalIgnoreCase);
-
-            // Ordering here is temporary to enable Fakes + Code Coverage integration in scenarios when Fakes decides to instrument code using
-            // CLR Instrumentation Engine. This code will be cleaned when both Fakes and Code Coverage will fully switch to CLR Instrumentation Engine.
-            foreach (var dataCollectorInfo in this.RunDataCollectors.Values.
-                OrderBy(rdc => rdc.DataCollectorConfig.FriendlyName.Equals(CodeCoverageFriendlyName, StringComparison.OrdinalIgnoreCase) ? 1 : 0))
+        // do not send events multiple times
+        _events.RaiseEvent(args);
+    }
+
+    /// <summary>
+    /// The get environment variables.
+    /// </summary>
+    /// <param name="unloadedAnyCollector">
+    /// The unloaded any collector.
+    /// </param>
+    /// <returns>
+    /// Dictionary of variable name as key and collector requested environment variable as value.
+    /// </returns>
+    private Dictionary<string, DataCollectionEnvironmentVariable> GetEnvironmentVariables(out bool unloadedAnyCollector)
+    {
+        var failedCollectors = new List<DataCollectorInformation>();
+        unloadedAnyCollector = false;
+        var dataCollectorEnvironmentVariable = new Dictionary<string, DataCollectionEnvironmentVariable>(StringComparer.OrdinalIgnoreCase);
+
+        // Ordering here is temporary to enable Fakes + Code Coverage integration in scenarios when Fakes decides to instrument code using
+        // CLR Instrumentation Engine. This code will be cleaned when both Fakes and Code Coverage will fully switch to CLR Instrumentation Engine.
+        foreach (var dataCollectorInfo in RunDataCollectors.Values.
+                     OrderBy(rdc => rdc.DataCollectorConfig.FriendlyName.Equals(CodeCoverageFriendlyName, StringComparison.OrdinalIgnoreCase) ? 1 : 0))
+        {
+            try
             {
-                try
-                {
-                    dataCollectorInfo.SetTestExecutionEnvironmentVariables();
-                    this.AddCollectorEnvironmentVariables(dataCollectorInfo, dataCollectorEnvironmentVariable);
-                }
-                catch (Exception ex)
-                {
-                    unloadedAnyCollector = true;
+                dataCollectorInfo.SetTestExecutionEnvironmentVariables();
+                AddCollectorEnvironmentVariables(dataCollectorInfo, dataCollectorEnvironmentVariable);
+            }
+            catch (Exception ex)
+            {
+                unloadedAnyCollector = true;
 
-                    var friendlyName = dataCollectorInfo.DataCollectorConfig.FriendlyName;
-                    failedCollectors.Add(dataCollectorInfo);
-                    dataCollectorInfo.Logger.LogError(
-                        this.dataCollectionEnvironmentContext.SessionDataCollectionContext,
-                        string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorErrorOnGetVariable, friendlyName, ex));
+                var friendlyName = dataCollectorInfo.DataCollectorConfig.FriendlyName;
+                failedCollectors.Add(dataCollectorInfo);
+                TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+                dataCollectorInfo.Logger.LogError(
+                    _dataCollectionEnvironmentContext.SessionDataCollectionContext,
+                    string.Format(CultureInfo.CurrentCulture, Resources.Resources.DataCollectorErrorOnGetVariable, friendlyName, ex));
 
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("DataCollectionManager.GetEnvironmentVariables: Failed to get variable for Collector '{0}': {1}", friendlyName, ex);
-                    }
-                }
+                EqtTrace.Error("DataCollectionManager.GetEnvironmentVariables: Failed to get variable for Collector '{0}': {1}", friendlyName, ex);
             }
+        }
 
-            this.RemoveDataCollectors(failedCollectors);
-            return dataCollectorEnvironmentVariable;
-        }
-
-        /// <summary>
-        /// Collects environment variable to be set in test process by avoiding duplicates
-        /// and detecting override of variable value by multiple adapters.
-        /// </summary>
-        /// <param name="dataCollectionWrapper">
-        /// The data Collection Wrapper.
-        /// </param>
-        /// <param name="dataCollectorEnvironmentVariables">
-        /// Environment variables required for already loaded plugin.
-        /// </param>
-        private void AddCollectorEnvironmentVariables(
-            DataCollectorInformation dataCollectionWrapper,
-            Dictionary<string, DataCollectionEnvironmentVariable> dataCollectorEnvironmentVariables)
-        {
-            if (dataCollectionWrapper.TestExecutionEnvironmentVariables != null)
+        RemoveDataCollectors(failedCollectors);
+        return dataCollectorEnvironmentVariable;
+    }
+
+    /// <summary>
+    /// Collects environment variable to be set in test process by avoiding duplicates
+    /// and detecting override of variable value by multiple adapters.
+    /// </summary>
+    /// <param name="dataCollectionWrapper">
+    /// The data Collection Wrapper.
+    /// </param>
+    /// <param name="dataCollectorEnvironmentVariables">
+    /// Environment variables required for already loaded plugin.
+    /// </param>
+    private void AddCollectorEnvironmentVariables(
+        DataCollectorInformation dataCollectionWrapper,
+        Dictionary<string, DataCollectionEnvironmentVariable> dataCollectorEnvironmentVariables)
+    {
+        if (dataCollectionWrapper.TestExecutionEnvironmentVariables == null)
+        {
+            return;
+        }
+
+        var collectorFriendlyName = dataCollectionWrapper.DataCollectorConfig.FriendlyName;
+        foreach (var namevaluepair in dataCollectionWrapper.TestExecutionEnvironmentVariables)
+        {
+            if (dataCollectorEnvironmentVariables.TryGetValue(namevaluepair.Key, out var alreadyRequestedVariable))
             {
-                var collectorFriendlyName = dataCollectionWrapper.DataCollectorConfig.FriendlyName;
-                foreach (var namevaluepair in dataCollectionWrapper.TestExecutionEnvironmentVariables)
+                // Dev10 behavior is to consider environment variables values as case sensitive.
+                if (string.Equals(namevaluepair.Value, alreadyRequestedVariable.Value, StringComparison.Ordinal))
+                {
+                    alreadyRequestedVariable.AddRequestingDataCollector(collectorFriendlyName);
+                }
+                else
                 {
-                    if (dataCollectorEnvironmentVariables.TryGetValue(namevaluepair.Key, out var alreadyRequestedVariable))
+                    // Data collector is overriding an already requested variable, possibly an error.
+                    var message = string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.DataCollectorRequestedDuplicateEnvironmentVariable,
+                        collectorFriendlyName,
+                        namevaluepair.Key,
+                        namevaluepair.Value,
+                        alreadyRequestedVariable.FirstDataCollectorThatRequested,
+                        alreadyRequestedVariable.Value);
+
+                    if (collectorFriendlyName.Equals(CodeCoverageFriendlyName, StringComparison.OrdinalIgnoreCase))
                     {
-                        // Dev10 behavior is to consider environment variables values as case sensitive.
-                        if (string.Equals(namevaluepair.Value, alreadyRequestedVariable.Value, StringComparison.Ordinal))
-                        {
-                            alreadyRequestedVariable.AddRequestingDataCollector(collectorFriendlyName);
-                        }
-                        else
-                        {
-                            // Data collector is overriding an already requested variable, possibly an error.
-                            var message = string.Format(
-                                    CultureInfo.CurrentUICulture,
-                                    Resources.Resources.DataCollectorRequestedDuplicateEnvironmentVariable,
-                                    collectorFriendlyName,
-                                    namevaluepair.Key,
-                                    namevaluepair.Value,
-                                    alreadyRequestedVariable.FirstDataCollectorThatRequested,
-                                    alreadyRequestedVariable.Value);
-
-                            if (collectorFriendlyName.Equals(CodeCoverageFriendlyName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                // Do not treat this as error for Code Coverage Data Collector. This is expected in some Fakes integration scenarios
-                                EqtTrace.Info(message);
-                            }
-                            else
-                            {
-                                dataCollectionWrapper.Logger.LogError(this.dataCollectionEnvironmentContext.SessionDataCollectionContext, message);
-                            }
-                        }
-
-                        dataCollectionTelemetryManager.RecordEnvironmentVariableConflict(dataCollectionWrapper, namevaluepair.Key, namevaluepair.Value, alreadyRequestedVariable.Value);
+                        // Do not treat this as error for Code Coverage Data Collector. This is expected in some Fakes integration scenarios
+                        EqtTrace.Info(message);
                     }
                     else
                     {
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            // new variable, add to the list.
-                            EqtTrace.Verbose("DataCollectionManager.AddCollectionEnvironmentVariables: Adding Environment variable '{0}' value '{1}'", namevaluepair.Key, namevaluepair.Value);
-                        }
-
-                        dataCollectorEnvironmentVariables.Add(
-                            namevaluepair.Key,
-                            new DataCollectionEnvironmentVariable(namevaluepair, collectorFriendlyName));
-
-                        dataCollectionTelemetryManager.RecordEnvironmentVariableAddition(dataCollectionWrapper, namevaluepair.Key, namevaluepair.Value);
+                        TPDebug.Assert(_dataCollectionEnvironmentContext is not null, "_dataCollectionEnvironmentContext is null");
+                        dataCollectionWrapper.Logger.LogError(_dataCollectionEnvironmentContext.SessionDataCollectionContext, message);
                     }
                 }
+
+                _dataCollectionTelemetryManager.RecordEnvironmentVariableConflict(dataCollectionWrapper, namevaluepair.Key, namevaluepair.Value, alreadyRequestedVariable.Value);
+            }
+            else
+            {
+                // new variable, add to the list.
+                EqtTrace.Verbose("DataCollectionManager.AddCollectionEnvironmentVariables: Adding Environment variable '{0}' value '{1}'", namevaluepair.Key, namevaluepair.Value);
+
+                dataCollectorEnvironmentVariables.Add(
+                    namevaluepair.Key,
+                    new DataCollectionEnvironmentVariable(namevaluepair, collectorFriendlyName));
+
+                _dataCollectionTelemetryManager.RecordEnvironmentVariableAddition(dataCollectionWrapper, namevaluepair.Key, namevaluepair.Value);
             }
         }
+    }
 
-        /// <summary>
-        /// The remove data collectors.
-        /// </summary>
-        /// <param name="dataCollectorsToRemove">
-        /// The data collectors to remove.
-        /// </param>
-        private void RemoveDataCollectors(IReadOnlyCollection<DataCollectorInformation> dataCollectorsToRemove)
+    /// <summary>
+    /// The remove data collectors.
+    /// </summary>
+    /// <param name="dataCollectorsToRemove">
+    /// The data collectors to remove.
+    /// </param>
+    private void RemoveDataCollectors(IReadOnlyCollection<DataCollectorInformation> dataCollectorsToRemove)
+    {
+        if (dataCollectorsToRemove == null || dataCollectorsToRemove.Count == 0)
         {
-            if (dataCollectorsToRemove == null || !dataCollectorsToRemove.Any())
+            return;
+        }
+
+        lock (RunDataCollectors)
+        {
+            foreach (var dataCollectorToRemove in dataCollectorsToRemove)
             {
-                return;
+                dataCollectorToRemove.DisposeDataCollector();
+                RunDataCollectors.Remove(dataCollectorToRemove.DataCollector.GetType());
             }
 
-            lock (this.RunDataCollectors)
+            if (RunDataCollectors.Count == 0)
             {
-                foreach (var dataCollectorToRemove in dataCollectorsToRemove)
-                {
-                    dataCollectorToRemove.DisposeDataCollector();
-                    this.RunDataCollectors.Remove(dataCollectorToRemove.DataCollector.GetType());
-                }
-
-                if (this.RunDataCollectors.Count == 0)
-                {
-                    this.isDataCollectionEnabled = false;
-                }
+                _isDataCollectionEnabled = false;
             }
         }
+    }
+
+    private static void LogAttachments(List<AttachmentSet> attachmentSets)
+    {
+        if (attachmentSets is null)
+        {
+            EqtTrace.Error("DataCollectionManager.LogAttachments: Unexpected null attachmentSets.");
+            return;
+        }
 
-        private void LogAttachments(List<AttachmentSet> attachmentSets)
+        foreach (var entry in attachmentSets)
         {
-            foreach (var entry in attachmentSets)
+            if (entry is null)
             {
-                foreach (var file in entry.Attachments)
+                EqtTrace.Error("DataCollectionManager.LogAttachments: Unexpected null entry inside attachmentSets.");
+                continue;
+            }
+
+            foreach (var file in entry.Attachments)
+            {
+                if (file is null)
                 {
-                    EqtTrace.Verbose(
-                        "Test Attachment Description: Collector:'{0}'  Uri:'{1}'  Description:'{2}' Uri:'{3}' ",
-                        entry.DisplayName,
-                        entry.Uri,
-                        file.Description,
-                        file.Uri);
+                    EqtTrace.Error("DataCollectionManager.LogAttachments: Unexpected null file inside entry attachments.");
+                    continue;
                 }
+
+                EqtTrace.Verbose(
+                    "Test Attachment Description: Collector:'{0}'  Uri:'{1}'  Description:'{2}' Uri:'{3}' ",
+                    entry.DisplayName,
+                    entry.Uri,
+                    file.Description,
+                    file.Uri);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
index c7d9c49c00..54a4c945e9 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionTelemetryManager.cs
@@ -1,101 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Linq;
+
 using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-using System;
-using System.Linq;
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+
+/// <summary>
+/// Stores and provides telemetry information for data collection.
+/// </summary>
+internal class DataCollectionTelemetryManager : IDataCollectionTelemetryManager
 {
-    /// <summary>
-    /// Stores and provides telemetry information for data collection.
-    /// </summary>
-    internal class DataCollectionTelemetryManager : IDataCollectionTelemetryManager
+    private const string CorProfilerVariable = "COR_PROFILER";
+    private const string CoreClrProfilerVariable = "CORECLR_PROFILER";
+    private const string ClrIeInstrumentationMethodConfigurationPrefix32Variable = "MicrosoftInstrumentationEngine_ConfigPath32_";
+    private const string ClrIeInstrumentationMethodConfigurationPrefix64Variable = "MicrosoftInstrumentationEngine_ConfigPath64_";
+
+    private static readonly Guid ClrIeProfilerGuid = new("{324f817a-7420-4e6d-b3c1-143fbed6d855}");
+    private const string OverwrittenProfilerName = "overwritten";
+
+    private readonly IRequestData _requestData;
+
+    internal DataCollectionTelemetryManager(IRequestData requestData)
     {
-        private const string CorProfilerVariable = "COR_PROFILER";
-        private const string CoreClrProfilerVariable = "CORECLR_PROFILER";
-        private const string ClrIeInstrumentationMethodConfigurationPrefix32Variable = "MicrosoftInstrumentationEngine_ConfigPath32_";
-        private const string ClrIeInstrumentationMethodConfigurationPrefix64Variable = "MicrosoftInstrumentationEngine_ConfigPath64_";
+        _requestData = requestData;
+    }
 
-        private static readonly Guid ClrIeProfilerGuid = Guid.Parse("{324f817a-7420-4e6d-b3c1-143fbed6d855}");
-        private const string OverwrittenProfilerName = "overwritten";
+    /// <inheritdoc/>
+    public void RecordEnvironmentVariableAddition(DataCollectorInformation dataCollectorInformation, string name, string value)
+    {
+        RecordProfilerMetricForNewVariable(CorProfilerVariable, TelemetryDataConstants.DataCollectorsCorProfiler, dataCollectorInformation, name, value);
+        RecordProfilerMetricForNewVariable(CoreClrProfilerVariable, TelemetryDataConstants.DataCollectorsCoreClrProfiler, dataCollectorInformation, name, value);
+    }
 
-        private readonly IRequestData requestData;
+    /// <inheritdoc/>
+    public void RecordEnvironmentVariableConflict(DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue)
+    {
+        RecordProfilerMetricForConflictedVariable(CorProfilerVariable, TelemetryDataConstants.DataCollectorsCorProfiler, dataCollectorInformation, name, value, existingValue);
+        RecordProfilerMetricForConflictedVariable(CoreClrProfilerVariable, TelemetryDataConstants.DataCollectorsCoreClrProfiler, dataCollectorInformation, name, value, existingValue);
+    }
 
-        internal DataCollectionTelemetryManager(IRequestData requestData)
+    private void RecordProfilerMetricForNewVariable(string profilerVariable, string telemetryPrefix, DataCollectorInformation dataCollectorInformation, string name, string value)
+    {
+        if (!string.Equals(profilerVariable, name, StringComparison.Ordinal))
         {
-            this.requestData = requestData;
+            return;
         }
 
-        /// <inheritdoc/>
-        public void RecordEnvironmentVariableAddition(DataCollectorInformation dataCollectorInformation, string name, string value)
-        {
-            RecordProfilerMetricForNewVariable(CorProfilerVariable, TelemetryDataConstants.DataCollectorsCorProfiler, dataCollectorInformation, name, value);
-            RecordProfilerMetricForNewVariable(CoreClrProfilerVariable, TelemetryDataConstants.DataCollectorsCoreClrProfiler, dataCollectorInformation, name, value);
-        }
+        _requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), GetProfilerGuid(value).ToString());
+    }
 
-        /// <inheritdoc/>
-        public void RecordEnvironmentVariableConflict(DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue)
+    private void RecordProfilerMetricForConflictedVariable(string profilerVariable, string telemetryPrefix, DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue)
+    {
+        // If data collector is requesting same profiler record it same as new
+        if (string.Equals(value, existingValue, StringComparison.OrdinalIgnoreCase))
         {
-            RecordProfilerMetricForConflictedVariable(CorProfilerVariable, TelemetryDataConstants.DataCollectorsCorProfiler, dataCollectorInformation, name, value, existingValue);
-            RecordProfilerMetricForConflictedVariable(CoreClrProfilerVariable, TelemetryDataConstants.DataCollectorsCoreClrProfiler, dataCollectorInformation, name, value, existingValue);
+            RecordProfilerMetricForNewVariable(profilerVariable, telemetryPrefix, dataCollectorInformation, name, value);
+            return;
         }
 
-        private void RecordProfilerMetricForNewVariable(string profilerVariable, string telemetryPrefix, DataCollectorInformation dataCollectorInformation, string name, string value)
+        if (!string.Equals(profilerVariable, name, StringComparison.Ordinal))
         {
-            if (!string.Equals(profilerVariable, name, StringComparison.Ordinal))
-            {
-                return;
-            }
-
-            requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), GetProfilerGuid(value).ToString());
+            return;
         }
 
-        private void RecordProfilerMetricForConflictedVariable(string profilerVariable, string telemetryPrefix, DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue)
-        {
-            // If data collector is requesting same profiler record it same as new
-            if (string.Equals(value, existingValue, StringComparison.OrdinalIgnoreCase))
-            {
-                RecordProfilerMetricForNewVariable(profilerVariable, telemetryPrefix, dataCollectorInformation, name, value);
-                return;
-            }
+        var existingProfilerGuid = GetProfilerGuid(existingValue);
 
-            if (!string.Equals(profilerVariable, name, StringComparison.Ordinal))
+        if (ClrIeProfilerGuid == existingProfilerGuid)
+        {
+            if (dataCollectorInformation.TestExecutionEnvironmentVariables != null &&
+                dataCollectorInformation.TestExecutionEnvironmentVariables.Any(pair => pair.Key.StartsWith(ClrIeInstrumentationMethodConfigurationPrefix32Variable)) &&
+                dataCollectorInformation.TestExecutionEnvironmentVariables.Any(pair => pair.Key.StartsWith(ClrIeInstrumentationMethodConfigurationPrefix64Variable)))
             {
+                _requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), ClrIeProfilerGuid.ToString());
                 return;
             }
-
-            var existingProfilerGuid = GetProfilerGuid(existingValue);
-
-            if (ClrIeProfilerGuid == existingProfilerGuid)
-            {
-                if (dataCollectorInformation.TestExecutionEnvironmentVariables != null &&
-                    dataCollectorInformation.TestExecutionEnvironmentVariables.Any(pair => pair.Key.StartsWith(ClrIeInstrumentationMethodConfigurationPrefix32Variable)) &&
-                    dataCollectorInformation.TestExecutionEnvironmentVariables.Any(pair => pair.Key.StartsWith(ClrIeInstrumentationMethodConfigurationPrefix64Variable)))
-                {
-                    requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), ClrIeProfilerGuid.ToString());
-                    return;
-                }
-            }
-
-            requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), $"{existingProfilerGuid}({OverwrittenProfilerName}:{GetProfilerGuid(value)})");
         }
 
-        private static Guid GetProfilerGuid(string profilerGuid)
-        {
-            if (Guid.TryParse(profilerGuid, out var guid))
-            {
-                return guid;
-            }
+        _requestData.MetricsCollection.Add(GetTelemetryKey(telemetryPrefix, dataCollectorInformation), $"{existingProfilerGuid}({OverwrittenProfilerName}:{GetProfilerGuid(value)})");
+    }
 
-            return Guid.Empty;
-        }
+    private static Guid GetProfilerGuid(string profilerGuid)
+    {
+        return Guid.TryParse(profilerGuid, out var guid) ? guid : Guid.Empty;
+    }
 
-        private static string GetTelemetryKey(string telemetryPrefix, DataCollectorInformation dataCollectorInformation)
-        {
-            return string.Format("{0}.{1}", telemetryPrefix, dataCollectorInformation.DataCollectorConfig?.TypeUri?.ToString());
-        }
+    private static string GetTelemetryKey(string telemetryPrefix, DataCollectorInformation dataCollectorInformation)
+    {
+        return $"{telemetryPrefix}.{dataCollectorInformation.DataCollectorConfig?.TypeUri}";
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs
index de25804357..7c6019e525 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorConfig.cs
@@ -1,136 +1,159 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
 
+/// <summary>
+/// The data collector config.
+/// </summary>
+internal class DataCollectorConfig : TestExtensionPluginInformation
+{
     /// <summary>
-    /// The data collector config.
+    /// Initializes a new instance of the <see cref="DataCollectorConfig"/> class.
     /// </summary>
-    internal class DataCollectorConfig : TestExtensionPluginInformation
+    /// <param name="type">
+    /// The type.
+    /// </param>
+    public DataCollectorConfig(Type type)
+        : base(type)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectorConfig"/> class.
-        /// </summary>
-        /// <param name="type">
-        /// The type.
-        /// </param>
-        public DataCollectorConfig(Type type)
-            : base(type)
-        {
-            ValidateArg.NotNull(type, nameof(type));
+        DataCollectorType = type ?? throw new ArgumentNullException(nameof(type));
+        TypeUri = GetTypeUri(type);
+        FriendlyName = GetFriendlyName(type);
+        AttachmentsProcessorType = GetAttachmentsProcessors(type);
+    }
 
-            this.DataCollectorType = type;
-            this.TypeUri = GetTypeUri(type);
-            this.FriendlyName = GetFriendlyName(type);
-        }
+    /// <summary>
+    /// Gets the data collector type.
+    /// </summary>
+    public Type DataCollectorType { get; private set; }
 
-        /// <summary>
-        /// Gets the data collector type.
-        /// </summary>
-        public Type DataCollectorType { get; private set; }
+    /// <summary>
+    /// Gets the type uri.
+    /// </summary>
+    public Uri? TypeUri { get; private set; }
 
-        /// <summary>
-        /// Gets the type uri.
-        /// </summary>
-        public Uri TypeUri { get; private set; }
+    /// <summary>
+    /// Gets the friendly name.
+    /// </summary>
+    public string FriendlyName { get; private set; }
 
-        /// <summary>
-        /// Gets the friendly name.
-        /// </summary>
-        public string FriendlyName { get; private set; }
+    /// <inheritdoc />
+    public override string? IdentifierData
+    {
+        get
+        {
+            return TypeUri?.ToString();
+        }
+    }
 
-        /// <inheritdoc />
-        public override string IdentifierData
+    /// <inheritdoc />
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return this.TypeUri?.ToString();
-            }
+            return new object?[] { TypeUri?.ToString(), FriendlyName, AttachmentsProcessorType != null };
         }
+    }
+
+    /// <summary>
+    /// Gets attachments processor
+    /// </summary>
+    public Type? AttachmentsProcessorType { get; private set; }
 
-        /// <inheritdoc />
-        public override ICollection<object> Metadata
+    /// <summary>
+    /// Check if collector registers an attachment processor.
+    /// </summary>
+    /// <returns>True if collector registers an attachment processor.</returns>
+    public bool HasAttachmentsProcessor() => AttachmentsProcessorType != null;
+
+    /// <summary>
+    /// Gets the Type Uri for the data collector.
+    /// </summary>
+    /// <param name="dataCollectorType">The data collector to get the Type URI for.</param>
+    /// <returns>Type Uri of the data collector.</returns>
+    private static Uri? GetTypeUri(Type dataCollectorType)
+    {
+        var typeUriAttributes = GetAttributes(dataCollectorType, typeof(DataCollectorTypeUriAttribute));
+        if (typeUriAttributes.Length > 0)
         {
-            get
+            var typeUriAttribute = (DataCollectorTypeUriAttribute)typeUriAttributes[0];
+            if (!typeUriAttribute.TypeUri.IsNullOrWhiteSpace())
             {
-                return new object[] { this.TypeUri.ToString(), this.FriendlyName };
+                return new Uri(typeUriAttribute.TypeUri);
             }
         }
 
-        /// <summary>
-        /// Gets the Type Uri for the data collector.
-        /// </summary>
-        /// <param name="dataCollectorType">The data collector to get the Type URI for.</param>
-        /// <returns>Type Uri of the data collector.</returns>
-        private static Uri GetTypeUri(Type dataCollectorType)
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the attachment processor for the data collector.
+    /// </summary>
+    /// <param name="dataCollectorType">The data collector to get the attachment processor for.</param>
+    /// <returns>Type of the attachment processor.</returns>
+    private static Type? GetAttachmentsProcessors(Type dataCollectorType)
+    {
+        var attachmentsProcessor = GetAttributes(dataCollectorType, typeof(DataCollectorAttachmentProcessorAttribute));
+        if (attachmentsProcessor.Length > 0)
         {
-            Uri typeUri = null;
-            var typeUriAttributes = GetAttributes(dataCollectorType, typeof(DataCollectorTypeUriAttribute));
-            if (typeUriAttributes != null && typeUriAttributes.Length > 0)
+            var attachmenstProcessorsAttribute = (DataCollectorAttachmentProcessorAttribute)attachmentsProcessor[0];
+            if (attachmenstProcessorsAttribute.Type != null)
             {
-                var typeUriAttribute = (DataCollectorTypeUriAttribute)typeUriAttributes[0];
-                if (!string.IsNullOrWhiteSpace(typeUriAttribute.TypeUri))
-                {
-                    typeUri = new Uri(typeUriAttribute.TypeUri);
-                }
+                return attachmenstProcessorsAttribute.Type;
             }
-
-            return typeUri;
         }
 
-        /// <summary>
-        /// Gets the friendly name for the data collector.
-        /// </summary>
-        /// <param name="dataCollectorType">The data collector to get the Type URI for.</param>
-        /// <returns>Friendly name of the data collector.</returns>
-        private static string GetFriendlyName(Type dataCollectorType)
-        {
-            string friendlyName = string.Empty;
+        return null;
+    }
 
-            // Get the friendly name from the attribute.
-            var friendlyNameAttributes = GetAttributes(dataCollectorType, typeof(DataCollectorFriendlyNameAttribute));
-            if (friendlyNameAttributes != null && friendlyNameAttributes.Length > 0)
+    /// <summary>
+    /// Gets the friendly name for the data collector.
+    /// </summary>
+    /// <param name="dataCollectorType">The data collector to get the Type URI for.</param>
+    /// <returns>Friendly name of the data collector.</returns>
+    private static string GetFriendlyName(Type dataCollectorType)
+    {
+        // Get the friendly name from the attribute.
+        var friendlyNameAttributes = GetAttributes(dataCollectorType, typeof(DataCollectorFriendlyNameAttribute));
+        if (friendlyNameAttributes != null && friendlyNameAttributes.Length > 0)
+        {
+            var friendlyNameAttribute = (DataCollectorFriendlyNameAttribute)friendlyNameAttributes[0];
+            if (!friendlyNameAttribute.FriendlyName.IsNullOrEmpty())
             {
-                var friendlyNameAttribute = (DataCollectorFriendlyNameAttribute)friendlyNameAttributes[0];
-                if (!string.IsNullOrEmpty(friendlyNameAttribute.FriendlyName))
-                {
-                    friendlyName = friendlyNameAttribute.FriendlyName;
-                }
+                return friendlyNameAttribute.FriendlyName;
             }
-
-            return friendlyName;
         }
 
-        /// <summary>
-        /// Gets the attributes of the specified type from the data collector type.
-        /// </summary>
-        /// <param name="dataCollectorType">
-        /// Data collector type to get attribute from.
-        /// </param>
-        /// <param name="attributeType">
-        /// The type of attribute to look for.
-        /// </param>
-        /// <returns>
-        /// Array of attributes matching the type provided.  Will be an empty array if none were found.
-        /// </returns>
-        private static object[] GetAttributes(Type dataCollectorType, Type attributeType)
-        {
-            Debug.Assert(dataCollectorType != null, "null dataCollectorType");
-            Debug.Assert(attributeType != null, "null attributeType");
+        return string.Empty;
+    }
 
-            // If any attribute constructor on the type throws, the exception will bubble up through
-            // the "GetCustomAttributes" method.
-            return dataCollectorType.GetTypeInfo().GetCustomAttributes(attributeType, true).ToArray();
-        }
+    /// <summary>
+    /// Gets the attributes of the specified type from the data collector type.
+    /// </summary>
+    /// <param name="dataCollectorType">
+    /// Data collector type to get attribute from.
+    /// </param>
+    /// <param name="attributeType">
+    /// The type of attribute to look for.
+    /// </param>
+    /// <returns>
+    /// Array of attributes matching the type provided.  Will be an empty array if none were found.
+    /// </returns>
+    private static object[] GetAttributes(Type dataCollectorType, Type attributeType)
+    {
+        TPDebug.Assert(dataCollectorType != null, "null dataCollectorType");
+        TPDebug.Assert(attributeType != null, "null attributeType");
+
+        // If any attribute constructor on the type throws, the exception will bubble up through
+        // the "GetCustomAttributes" method.
+        return dataCollectorType.GetCustomAttributes(attributeType, true).ToArray();
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorInformation.cs b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorInformation.cs
index 5b04927b0b..f14c0e5c1e 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/DataCollectorInformation.cs
@@ -1,188 +1,185 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+
+/// <summary>
+/// Encapsulates datacollector object and other objects required to facilitate datacollection.
+/// </summary>
+internal class DataCollectorInformation
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Xml;
-    using System.IO;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectorInformation"/> class.
+    /// </summary>
+    /// <param name="dataCollector">
+    /// The data collector.
+    /// </param>
+    /// <param name="configurationElement">
+    /// The configuration element.
+    /// </param>
+    /// <param name="dataCollectorConfig">
+    /// The data collector config.
+    /// </param>
+    /// <param name="environmentContext">
+    /// The environment Context.
+    /// </param>
+    /// <param name="attachmentManager">
+    /// The attachment Manager.
+    /// </param>
+    /// <param name="events">
+    /// The events.
+    /// </param>
+    /// <param name="messageSink">
+    /// The message Sink.
+    /// </param>
+    /// <param name="settingsXml"></param>
+    internal DataCollectorInformation(ObjectModel.DataCollection.DataCollector dataCollector, XmlElement? configurationElement, DataCollectorConfig dataCollectorConfig, DataCollectionEnvironmentContext? environmentContext, IDataCollectionAttachmentManager attachmentManager, TestPlatformDataCollectionEvents events, IMessageSink messageSink, string settingsXml)
+    {
+        DataCollector = dataCollector;
+        ConfigurationElement = configurationElement;
+        DataCollectorConfig = dataCollectorConfig;
+        Events = events;
+        EnvironmentContext = environmentContext;
+        DataCollectionSink = new TestPlatformDataCollectionSink(attachmentManager, dataCollectorConfig);
+        Logger = new TestPlatformDataCollectionLogger(messageSink, dataCollectorConfig);
+        SettingsXml = settingsXml;
+    }
+
+    /// <summary>
+    /// Gets or sets the data collector.
+    /// </summary>
+    public ObjectModel.DataCollection.DataCollector DataCollector { get; set; }
+
+    /// <summary>
+    /// Gets or sets the configuration element.
+    /// </summary>
+    public XmlElement? ConfigurationElement { get; set; }
+
+    /// <summary>
+    /// Gets or sets the data collector config.
+    /// </summary>
+    public DataCollectorConfig DataCollectorConfig { get; set; }
+
+    /// <summary>
+    /// Gets the events object on which the collector registers for events
+    /// </summary>
+    public TestPlatformDataCollectionEvents Events { get; private set; }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// Gets the datacollection sink.
+    /// </summary>
+    public TestPlatformDataCollectionSink DataCollectionSink { get; private set; }
+
+    /// <summary>
+    /// Gets the data collection environment context.
+    /// </summary>
+    public DataCollectionEnvironmentContext? EnvironmentContext { get; private set; }
+
+    /// <summary>
+    /// Gets the data collection logger
+    /// </summary>
+    public TestPlatformDataCollectionLogger Logger { get; private set; }
 
     /// <summary>
-    /// Encapsulates datacollector object and other objects required to facilitate datacollection.
+    /// Gets the data collection logger
     /// </summary>
-    internal class DataCollectorInformation
+    private string SettingsXml { get; set; }
+
+    private const string DefaultConfigurationSettings = @"<Configuration />";
+
+    /// <summary>
+    /// Gets or sets environment variables supplied by the data collector.
+    /// These are available after the collector has been initialized.
+    /// </summary>
+    public IEnumerable<KeyValuePair<string, string>>? TestExecutionEnvironmentVariables
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectorInformation"/> class.
-        /// </summary>
-        /// <param name="dataCollector">
-        /// The data collector.
-        /// </param>
-        /// <param name="configurationElement">
-        /// The configuration element.
-        /// </param>
-        /// <param name="dataCollectorConfig">
-        /// The data collector config.
-        /// </param>
-        /// <param name="environmentContext">
-        /// The environment Context.
-        /// </param>
-        /// <param name="attachmentManager">
-        /// The attachment Manager.
-        /// </param>
-        /// <param name="events">
-        /// The events.
-        /// </param>
-        /// <param name="messageSink">
-        /// The message Sink.
-        /// </param>
-        /// <param name="settingsXml"></param>
-        internal DataCollectorInformation(DataCollector dataCollector, XmlElement configurationElement, DataCollectorConfig dataCollectorConfig, DataCollectionEnvironmentContext environmentContext, IDataCollectionAttachmentManager attachmentManager, TestPlatformDataCollectionEvents events, IMessageSink messageSink, string settingsXml)
-        {
-            this.DataCollector = dataCollector;
-            this.ConfigurationElement = configurationElement;
-            this.DataCollectorConfig = dataCollectorConfig;
-            this.Events = events;
-            this.EnvironmentContext = environmentContext;
-            this.DataCollectionSink = new TestPlatformDataCollectionSink(attachmentManager, dataCollectorConfig);
-            this.Logger = new TestPlatformDataCollectionLogger(messageSink, dataCollectorConfig);
-            this.SettingsXml = settingsXml;
-        }
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the data collector.
-        /// </summary>
-        public DataCollector DataCollector { get; set; }
-
-        /// <summary>
-        /// Gets or sets the configuration element.
-        /// </summary>
-        public XmlElement ConfigurationElement { get; set; }
-
-        /// <summary>
-        /// Gets or sets the data collector config.
-        /// </summary>
-        public DataCollectorConfig DataCollectorConfig { get; set; }
-
-        /// <summary>
-        /// Gets the events object on which the collector registers for events
-        /// </summary>
-        public TestPlatformDataCollectionEvents Events { get; private set; }
-
-        /// <summary>
-        /// Gets the datacollection sink.
-        /// </summary>
-        public TestPlatformDataCollectionSink DataCollectionSink { get; private set; }
-
-        /// <summary>
-        /// Gets the data collection environment context.
-        /// </summary>
-        public DataCollectionEnvironmentContext EnvironmentContext { get; private set; }
-
-        /// <summary>
-        /// Gets the data collection logger
-        /// </summary>
-        public TestPlatformDataCollectionLogger Logger { get; private set; }
-
-        /// <summary>
-        /// Gets the data collection logger
-        /// </summary>
-        private string SettingsXml { get; set; }
-
-        private const string DefaultConfigurationSettings = @"<Configuration />";
-
-        /// <summary>
-        /// Gets or sets environment variables supplied by the data collector.
-        /// These are available after the collector has been initialized.
-        /// </summary>
-        public IEnumerable<KeyValuePair<string, string>> TestExecutionEnvironmentVariables
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Initializes datacollectors.
+    /// </summary>
+    internal void InitializeDataCollector(ITelemetryReporter telemetryReporter)
+    {
+        UpdateConfigurationElement();
 
-        /// <summary>
-        /// Initializes datacollectors.
-        /// </summary>
-        internal void InitializeDataCollector()
-        {
-            UpdateConfigurationElement();
+        DataCollector.Initialize(ConfigurationElement, Events, DataCollectionSink, Logger, EnvironmentContext);
 
-            this.DataCollector.Initialize(this.ConfigurationElement, this.Events, this.DataCollectionSink, this.Logger, this.EnvironmentContext);
+        if (DataCollector is ITelemetryInitializer telemetryInitializer)
+        {
+            telemetryInitializer.Initialize(telemetryReporter);
         }
+    }
 
-        private void UpdateConfigurationElement()
-        {
-            var frameWork = XmlRunSettingsUtilities.GetRunConfigurationNode(this.SettingsXml).TargetFramework;
+    private void UpdateConfigurationElement()
+    {
+        var frameWork = XmlRunSettingsUtilities.GetRunConfigurationNode(SettingsXml).TargetFramework;
 
-            if (this.ConfigurationElement == null)
+        if (ConfigurationElement == null)
+        {
+            var doc = new XmlDocument();
+            using (
+                var xmlReader = XmlReader.Create(
+                    new StringReader(DefaultConfigurationSettings),
+                    new XmlReaderSettings { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
             {
-                var doc = new XmlDocument();
-                using (
-                    var xmlReader = XmlReader.Create(
-                        new StringReader(DefaultConfigurationSettings),
-                        new XmlReaderSettings { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
-                {
-                    doc.Load(xmlReader);
-                }
-
-                this.ConfigurationElement = doc.DocumentElement;
+                doc.Load(xmlReader);
             }
 
-            // Add Framework config, since it could be required by DataCollector, to determine whether they support this Framework or not
-            if (frameWork != null)
-            {
-                AppendChildNodeOrInnerText(this.ConfigurationElement.OwnerDocument, this.ConfigurationElement, "Framework", string.Empty, frameWork.Name);
-            }
+            ConfigurationElement = doc.DocumentElement!;
         }
 
-        private static void AppendChildNodeOrInnerText(XmlDocument doc, XmlElement owner, string elementName, string nameSpaceUri, string innerText)
+        // Add Framework config, since it could be required by DataCollector, to determine whether they support this Framework or not
+        if (frameWork != null)
         {
-            var node = owner.SelectSingleNode(elementName) ?? doc.CreateNode("element", elementName, nameSpaceUri);
-            node.InnerText = innerText;
-            owner.AppendChild(node);
+            AppendChildNodeOrInnerText(ConfigurationElement.OwnerDocument, ConfigurationElement, "Framework", string.Empty, frameWork.Name);
         }
+    }
+
+    private static void AppendChildNodeOrInnerText(XmlDocument doc, XmlElement owner, string elementName, string nameSpaceUri, string innerText)
+    {
+        var node = owner.SelectSingleNode(elementName) ?? doc.CreateNode("element", elementName, nameSpaceUri);
+        node.InnerText = innerText;
+        owner.AppendChild(node);
+    }
 
-        /// <summary>
-        /// Disposes datacollector.
-        /// </summary>
-        internal void DisposeDataCollector()
+    /// <summary>
+    /// Disposes datacollector.
+    /// </summary>
+    internal void DisposeDataCollector()
+    {
+        try
         {
-            try
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("dataCollectorInfo.DisposeDataCollector: calling Dispose() on {0}", this.DataCollector.GetType());
-                }
+            EqtTrace.Verbose("dataCollectorInfo.DisposeDataCollector: calling Dispose() on {0}", DataCollector.GetType());
 
-                this.DataCollector.Dispose();
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectorInfo.DisposeDataCollector: exception while calling Dispose() on {0}: " + ex, this.DataCollector.GetType());
-                }
-            }
+            DataCollector.Dispose();
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("DataCollectorInfo.DisposeDataCollector: exception while calling Dispose() on {0}: " + ex, DataCollector.GetType());
+        }
+    }
 
-        /// <summary>
-        /// The get test execution environment variables sync.
-        /// </summary>
-        public void SetTestExecutionEnvironmentVariables()
+    /// <summary>
+    /// The get test execution environment variables sync.
+    /// </summary>
+    public void SetTestExecutionEnvironmentVariables()
+    {
+        if (DataCollector is ITestExecutionEnvironmentSpecifier testExecutionEnvironmentSpecifier)
         {
-            var testExecutionEnvironmentSpecifier = this.DataCollector as ITestExecutionEnvironmentSpecifier;
-            if (testExecutionEnvironmentSpecifier != null)
-            {
-                // Get the environment variables the data collector wants set in the test execution environment
-                this.TestExecutionEnvironmentVariables = testExecutionEnvironmentSpecifier.GetTestExecutionEnvironmentVariables();
-            }
+            // Get the environment variables the data collector wants set in the test execution environment
+            TestExecutionEnvironmentVariables = testExecutionEnvironmentSpecifier.GetTestExecutionEnvironmentVariables();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionAttachmentManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionAttachmentManager.cs
index 2b4928c2a2..bcc92420e9 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionAttachmentManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionAttachmentManager.cs
@@ -1,65 +1,64 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
 
+/// <summary>
+/// The DataCollectionAttachmentManager Interface.
+/// </summary>
+internal interface IDataCollectionAttachmentManager
+{
     /// <summary>
-    /// The DataCollectionAttachmentManager Interface.
+    /// Initializes session, output directory and data collection log.
     /// </summary>
-    internal interface IDataCollectionAttachmentManager
-    {
-        /// <summary>
-        /// Initializes session, output directory and data collection log.
-        /// </summary>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        /// <param name="outputDirectory">
-        /// The output directory.
-        /// </param>
-        /// <param name="messageSink">
-        /// The message Sink.
-        /// </param>
-        void Initialize(SessionId id, string outputDirectory, IMessageSink messageSink);
+    /// <param name="id">
+    /// The id.
+    /// </param>
+    /// <param name="outputDirectory">
+    /// The output directory.
+    /// </param>
+    /// <param name="messageSink">
+    /// The message Sink.
+    /// </param>
+    void Initialize(SessionId id, string outputDirectory, IMessageSink messageSink);
 
-        /// <summary>
-        /// Gets attachment sets associated with given collection context.
-        /// </summary>
-        /// <param name="dataCollectionContext">
-        /// The data collection context.
-        /// </param>
-        /// <returns>
-        /// The <see cref="List"/>.
-        /// </returns>
-        List<AttachmentSet> GetAttachments(DataCollectionContext dataCollectionContext);
+    /// <summary>
+    /// Gets attachment sets associated with given collection context.
+    /// </summary>
+    /// <param name="dataCollectionContext">
+    /// The data collection context.
+    /// </param>
+    /// <returns>
+    /// The <see cref="List{T}"/>.
+    /// </returns>
+    List<AttachmentSet> GetAttachments(DataCollectionContext dataCollectionContext);
 
-        /// <summary>
-        /// Adds new attachment to current context
-        /// </summary>
-        /// <param name="fileTransferInfo">
-        /// The file Transfer Info.
-        /// </param>
-        /// <param name="sendFileCompletedCallback">
-        /// The send File Completed Callback.
-        /// </param>
-        /// <param name="dataCollectorUri">
-        /// Uri of the data collector.
-        /// </param>
-        /// <param name="friendlyName">
-        /// The friendly Name.
-        /// </param>
-        void AddAttachment(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler sendFileCompletedCallback, Uri dataCollectorUri, string friendlyName);
+    /// <summary>
+    /// Adds new attachment to current context
+    /// </summary>
+    /// <param name="fileTransferInfo">
+    /// The file Transfer Info.
+    /// </param>
+    /// <param name="sendFileCompletedCallback">
+    /// The send File Completed Callback.
+    /// </param>
+    /// <param name="dataCollectorUri">
+    /// Uri of the data collector.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    void AddAttachment(FileTransferInformation fileTransferInfo, AsyncCompletedEventHandler? sendFileCompletedCallback, Uri dataCollectorUri, string friendlyName);
 
-        /// <summary>
-        /// Stops processing further transfer requests as test run is canceled.
-        /// </summary>
-        void Cancel();
-    }
+    /// <summary>
+    /// Stops processing further transfer requests as test run is canceled.
+    /// </summary>
+    void Cancel();
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionManager.cs
index b43433c968..c89a8d6053 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionManager.cs
@@ -1,70 +1,75 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+
+/// <summary>
+/// Defines the Data Collection Manager for Data Collectors.
+/// </summary>
+internal interface IDataCollectionManager : IDisposable
+{
+    /// <summary>
+    /// Loads and initializes data collector plugins.
+    /// </summary>
+    /// <param name="settingsXml">Run Settings which has DataCollector configuration.</param>
+    /// <returns>Environment variables.</returns>
+    IDictionary<string, string?> InitializeDataCollectors(string settingsXml);
 
     /// <summary>
-    /// Defines the Data Collection Manager for Data Collectors.
+    /// Raises TestCaseStart event to all data collectors configured for run.
     /// </summary>
-    internal interface IDataCollectionManager : IDisposable
-    {
-        /// <summary>
-        /// Loads and initializes data collector plugins.
-        /// </summary>
-        /// <param name="settingsXml">Run Settings which has DataCollector configuration.</param>
-        /// <returns>Environment variables.</returns>
-        IDictionary<string, string> InitializeDataCollectors(string settingsXml);
+    /// <param name="testCaseStartEventArgs">TestCaseStart event.</param>
+    void TestCaseStarted(TestCaseStartEventArgs testCaseStartEventArgs);
 
-        /// <summary>
-        /// Raises TestCaseStart event to all data collectors configured for run.
-        /// </summary>
-        /// <param name="testCaseStartEventArgs">TestCaseStart event.</param>
-        void TestCaseStarted(TestCaseStartEventArgs testCaseStartEventArgs);
+    /// <summary>
+    /// Raises TestCaseEnd event to all data collectors configured for run.
+    /// </summary>
+    /// <param name="testCaseEndEventArgs">
+    /// The test Case End Event Args.
+    /// </param>
+    /// <returns>
+    /// Collection of  testCase attachmentSet.
+    /// </returns>
+    Collection<AttachmentSet> TestCaseEnded(TestCaseEndEventArgs testCaseEndEventArgs);
 
-        /// <summary>
-        /// Raises TestCaseEnd event to all data collectors configured for run.
-        /// </summary>
-        /// <param name="testCaseEndEventArgs">
-        /// The test Case End Event Args.
-        /// </param>
-        /// <returns>
-        /// Collection of  testCase attachmentSet.
-        /// </returns>
-        Collection<AttachmentSet> TestCaseEnded(TestCaseEndEventArgs testCaseEndEventArgs);
+    /// <summary>
+    /// Raises TestHostLaunched event to all data collectors configured for run.
+    /// </summary>
+    /// <param name="processId">
+    /// Process ID of test host.
+    /// </param>
+    void TestHostLaunched(int processId);
 
-        /// <summary>
-        /// Raises TestHostLaunched event to all data collectors configured for run.
-        /// </summary>
-        /// <param name="processId">
-        /// Process ID of test host.
-        /// </param>
-        void TestHostLaunched(int processId);
+    /// <summary>
+    /// Raises SessionStart event to all data collectors configured for run.
+    /// </summary>
+    /// <param name="sessionStartEventArgs">
+    /// The session start Event Args.
+    /// </param>
+    /// <returns>boolean value specifying whether test case events are subscribed by datacollectors. Based on this execution process will decide whether to send TestCaseStart and TestCaseEnd events to dataCollector process.</returns>
+    bool SessionStarted(SessionStartEventArgs sessionStartEventArgs);
 
-        /// <summary>
-        /// Raises SessionStart event to all data collectors configured for run.
-        /// </summary>
-        /// <param name="sessionStartEventArgs">
-        /// The session start Event Args.
-        /// </param>
-        /// <returns>boolean value specifying whether test case events are subscribed by datacollectors. Based on this execution process will decide whether to send TestCaseStart and TestCaseEnd events to dataCollector process.</returns>
-        bool SessionStarted(SessionStartEventArgs sessionStartEventArgs);
+    /// <summary>
+    /// Raises SessionEnd event to all data collectors configured for run.
+    /// </summary>
+    /// <param name="isCancelled">
+    /// Boolean to specify is the test run is canceled or not.
+    /// </param>
+    /// <returns>
+    /// Collection of session attachmentSet.
+    /// </returns>
+    Collection<AttachmentSet> SessionEnded(bool isCancelled);
 
-        /// <summary>
-        /// Raises SessionEnd event to all data collectors configured for run.
-        /// </summary>
-        /// <param name="isCancelled">
-        /// Boolean to specify is the test run is canceled or not.
-        /// </param>
-        /// <returns>
-        /// Collection of session attachmentSet.
-        /// </returns>
-        Collection<AttachmentSet> SessionEnded(bool isCancelled);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Return a collections of the invoked data collectors
+    /// </summary>
+    /// <returns>Collection of data collectors.</returns>
+    Collection<InvokedDataCollector> GetInvokedDataCollectors();
+}
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionTelemetryManager.cs b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionTelemetryManager.cs
index 9bc3550914..5741e97e6b 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionTelemetryManager.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IDataCollectionTelemetryManager.cs
@@ -1,42 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+
+/// <summary>
+/// The IDataCollectionTelemetryManager Interface.
+/// </summary>
+internal interface IDataCollectionTelemetryManager
 {
     /// <summary>
-    /// The IDataCollectionTelemetryManager Interface.
+    /// Record telemetry regarding environment variable added.
     /// </summary>
-    internal interface IDataCollectionTelemetryManager
-    {
-        /// <summary>
-        /// Record telemetry regarding environment variable added.
-        /// </summary>
-        /// <param name="dataCollectorInformation">
-        /// Data collector information which requested environment variable.
-        /// </param>
-        /// <param name="name">
-        /// Environment variable name.
-        /// </param>
-        /// <param name="value">
-        /// Environment variable value.
-        /// </param>
-        void RecordEnvironmentVariableAddition(DataCollectorInformation dataCollectorInformation, string name, string value);
+    /// <param name="dataCollectorInformation">
+    /// Data collector information which requested environment variable.
+    /// </param>
+    /// <param name="name">
+    /// Environment variable name.
+    /// </param>
+    /// <param name="value">
+    /// Environment variable value.
+    /// </param>
+    void RecordEnvironmentVariableAddition(DataCollectorInformation dataCollectorInformation, string name, string value);
 
-        /// <summary>
-        /// Record telemetry regarding environment variable is conflicting.
-        /// </summary>
-        /// <param name="dataCollectorInformation">
-        /// Data collector information which requested environment variable.
-        /// </param>
-        /// <param name="name">
-        /// Environment variable name.
-        /// </param>
-        /// <param name="value">
-        /// Environment variable value.
-        /// </param>
-        /// <param name="existingValue">
-        /// Environment variable value that was requested previously.
-        /// </param>
-        void RecordEnvironmentVariableConflict(DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue);
-    }
+    /// <summary>
+    /// Record telemetry regarding environment variable is conflicting.
+    /// </summary>
+    /// <param name="dataCollectorInformation">
+    /// Data collector information which requested environment variable.
+    /// </param>
+    /// <param name="name">
+    /// Environment variable name.
+    /// </param>
+    /// <param name="value">
+    /// Environment variable value.
+    /// </param>
+    /// <param name="existingValue">
+    /// Environment variable value that was requested previously.
+    /// </param>
+    void RecordEnvironmentVariableConflict(DataCollectorInformation dataCollectorInformation, string name, string value, string existingValue);
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IMessageSink.cs b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IMessageSink.cs
index b5b6e492a9..1835a48795 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IMessageSink.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/Interfaces/IMessageSink.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
 
+/// <summary>
+/// Expose methods to be used by data collection process to send messages to Test Platform Client.
+/// </summary>
+internal interface IMessageSink
+{
     /// <summary>
-    /// Expose methods to be used by data collection process to send messages to Test Platform Client.
+    /// Data collection message as sent by DataCollectionLogger.
     /// </summary>
-    internal interface IMessageSink
-    {
-        /// <summary>
-        /// Data collection message as sent by DataCollectionLogger.
-        /// </summary>
-        /// <param name="args">Data collection message event args.</param>
-        void SendMessage(DataCollectionMessageEventArgs args);
-    }
+    /// <param name="args">Data collection message event args.</param>
+    void SendMessage(DataCollectionMessageEventArgs args);
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionEvents.cs b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionEvents.cs
index 35585a6663..86f5ee0438 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionEvents.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionEvents.cs
@@ -1,184 +1,174 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+/// <summary>
+/// The test platform data collection events.
+/// </summary>
+internal sealed class TestPlatformDataCollectionEvents : DataCollectionEvents
+{
+    /// <summary>
+    /// Maps the type of event args to the multi cast delegate for that event
+    /// </summary>
+    private readonly Dictionary<Type, EventInvoker> _eventArgsToEventInvokerMap;
 
     /// <summary>
-    /// The test platform data collection events.
+    /// Initializes a new instance of the <see cref="TestPlatformDataCollectionEvents"/> class by mapping the types of expected event args to the multi cast
+    /// delegate that invokes the event on registered targets
     /// </summary>
-    internal sealed class TestPlatformDataCollectionEvents : DataCollectionEvents
+    internal TestPlatformDataCollectionEvents()
     {
-        /// <summary>
-        /// Maps the type of event args to the multi cast delegate for that event
-        /// </summary>
-        private Dictionary<Type, EventInvoker> eventArgsToEventInvokerMap;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPlatformDataCollectionEvents"/> class by mapping the types of expected event args to the multi cast
-        /// delegate that invokes the event on registered targets
-        /// </summary>
-        internal TestPlatformDataCollectionEvents()
+        _eventArgsToEventInvokerMap = new Dictionary<Type, EventInvoker>(4)
         {
-            this.eventArgsToEventInvokerMap = new Dictionary<Type, EventInvoker>(4);
+            [typeof(TestHostLaunchedEventArgs)] = OnTestHostLaunched,
+            [typeof(SessionStartEventArgs)] = OnSessionStart,
+            [typeof(SessionEndEventArgs)] = OnSessionEnd,
+            [typeof(TestCaseStartEventArgs)] = OnTestCaseStart,
+            [typeof(TestCaseEndEventArgs)] = OnTestCaseEnd
+        };
+    }
 
-            this.eventArgsToEventInvokerMap[typeof(TestHostLaunchedEventArgs)] = this.OnTestHostLaunched;
-            this.eventArgsToEventInvokerMap[typeof(SessionStartEventArgs)] = this.OnSessionStart;
-            this.eventArgsToEventInvokerMap[typeof(SessionEndEventArgs)] = this.OnSessionEnd;
-            this.eventArgsToEventInvokerMap[typeof(TestCaseStartEventArgs)] = this.OnTestCaseStart;
-            this.eventArgsToEventInvokerMap[typeof(TestCaseEndEventArgs)] = this.OnTestCaseEnd;
-        }
+    /// <summary>
+    /// Delegate for the event invoker methods (OnSessionStart, OnTestCaseResume, etc.)
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private delegate void EventInvoker(DataCollectionEventArgs e);
 
-        /// <summary>
-        /// Delegate for the event invoker methods (OnSessionStart, OnTestCaseResume, etc.)
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private delegate void EventInvoker(DataCollectionEventArgs e);
-
-        /// <summary>
-        /// Raised when test host process has initialized
-        /// </summary>
-        public override event EventHandler<TestHostLaunchedEventArgs> TestHostLaunched;
-
-        /// <summary>
-        /// Raised when a session is starting
-        /// </summary>
-        public override event EventHandler<SessionStartEventArgs> SessionStart;
-
-        /// <summary>
-        /// Raised when a session is ending
-        /// </summary>
-        public override event EventHandler<SessionEndEventArgs> SessionEnd;
-
-        /// <summary>
-        /// Raised when a test case is starting
-        /// </summary>
-        public override event EventHandler<TestCaseStartEventArgs> TestCaseStart;
-
-        /// <summary>
-        /// Raised when a test case is ending
-        /// </summary>
-        public override event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
-
-        /// <summary>
-        /// Raises the event corresponding to the event arguments to all registered handlers
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        internal void RaiseEvent(DataCollectionEventArgs e)
-        {
-            ValidateArg.NotNull(e, "DataCollectionEventArgs");
+    /// <summary>
+    /// Raised when test host process has initialized
+    /// </summary>
+    public override event EventHandler<TestHostLaunchedEventArgs>? TestHostLaunched;
 
+    /// <summary>
+    /// Raised when a session is starting
+    /// </summary>
+    public override event EventHandler<SessionStartEventArgs>? SessionStart;
 
-            if (this.eventArgsToEventInvokerMap.TryGetValue(e.GetType(), out var onEvent))
-            {
-                onEvent(e);
-            }
-            else
-            {
-                EqtTrace.Fail("TestPlatformDataCollectionEvents.RaiseEvent: Unrecognized data collection event of type {0}.", e.GetType().FullName);
-            }
-        }
+    /// <summary>
+    /// Raised when a session is ending
+    /// </summary>
+    public override event EventHandler<SessionEndEventArgs>? SessionEnd;
+
+    /// <summary>
+    /// Raised when a test case is starting
+    /// </summary>
+    public override event EventHandler<TestCaseStartEventArgs>? TestCaseStart;
+
+    /// <summary>
+    /// Raised when a test case is ending
+    /// </summary>
+    public override event EventHandler<TestCaseEndEventArgs>? TestCaseEnd;
 
-        /// <summary>
-        /// Checks whether any data collector has subscribed for test case events.
-        /// </summary>
-        internal bool AreTestCaseEventsSubscribed()
+    /// <summary>
+    /// Raises the event corresponding to the event arguments to all registered handlers
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    internal void RaiseEvent(DataCollectionEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+
+        if (_eventArgsToEventInvokerMap.TryGetValue(e.GetType(), out var onEvent))
         {
-            bool valueOnFailure = false;
-            return (HasEventListener(this.TestCaseStart, valueOnFailure) || HasEventListener(this.TestCaseEnd, valueOnFailure));
+            onEvent(e);
         }
+        else
+        {
+            EqtTrace.Fail("TestPlatformDataCollectionEvents.RaiseEvent: Unrecognized data collection event of type {0}.", e.GetType().FullName);
+        }
+    }
 
-        private bool HasEventListener(MulticastDelegate eventToCheck, bool valueOnFailure)
+    /// <summary>
+    /// Checks whether any data collector has subscribed for test case events.
+    /// </summary>
+    internal bool AreTestCaseEventsSubscribed()
+    {
+        bool valueOnFailure = false;
+        return (HasEventListener(TestCaseStart, valueOnFailure) || HasEventListener(TestCaseEnd, valueOnFailure));
+    }
+
+    private static bool HasEventListener(MulticastDelegate? eventToCheck, bool valueOnFailure)
+    {
+        try
         {
-            try
+            if (eventToCheck == null)
             {
-                if (eventToCheck == null)
-                {
-                    return false;
-                }
-
-                Delegate[] listeners = eventToCheck.GetInvocationList();
-                if (listeners == null || listeners.Length == 0)
-                {
-                    return false;
-                }
-
-                return true;
+                return false;
             }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("TestPlatformDataCollectionEvents.AreTestCaseLevelEventsRequired: Exception occurred while checking whether event {0} has any listeners or not. {1}", eventToCheck, ex);
-                }
 
-                return valueOnFailure;
-            }
+            Delegate[] listeners = eventToCheck.GetInvocationList();
+            return listeners != null && listeners.Length != 0;
         }
-
-        /// <summary>
-        /// Raises the TestHostLaunched event
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private void OnTestHostLaunched(DataCollectionEventArgs e)
+        catch (Exception ex)
         {
-            this.TestHostLaunched.SafeInvoke(this, e, "DataCollectionEvents.TestHostLaunched");
+            EqtTrace.Error("TestPlatformDataCollectionEvents.AreTestCaseLevelEventsRequired: Exception occurred while checking whether event {0} has any listeners or not. {1}", eventToCheck, ex);
+            return valueOnFailure;
         }
+    }
 
-        /// <summary>
-        /// Raises the SessionStart event
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private void OnSessionStart(DataCollectionEventArgs e)
-        {
-            this.SessionStart.SafeInvoke(this, e, "DataCollectionEvents.SessionStart");
-        }
+    /// <summary>
+    /// Raises the TestHostLaunched event
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private void OnTestHostLaunched(DataCollectionEventArgs e)
+    {
+        TestHostLaunched.SafeInvoke(this, e, "DataCollectionEvents.TestHostLaunched");
+    }
 
-        /// <summary>
-        /// Raises the SessionEnd event
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private void OnSessionEnd(DataCollectionEventArgs e)
-        {
-            this.SessionEnd.SafeInvoke(this, e, "DataCollectionEvents.SessionEnd");
-        }
+    /// <summary>
+    /// Raises the SessionStart event
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private void OnSessionStart(DataCollectionEventArgs e)
+    {
+        SessionStart.SafeInvoke(this, e, "DataCollectionEvents.SessionStart");
+    }
 
-        /// <summary>
-        /// Raises the TestCaseStart event
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private void OnTestCaseStart(DataCollectionEventArgs e)
-        {
-            this.TestCaseStart.SafeInvoke(this, e, "DataCollectionEvents.TestCaseStart");
-        }
+    /// <summary>
+    /// Raises the SessionEnd event
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private void OnSessionEnd(DataCollectionEventArgs e)
+    {
+        SessionEnd.SafeInvoke(this, e, "DataCollectionEvents.SessionEnd");
+    }
 
-        /// <summary>
-        /// Raises the TestCaseEnd event
-        /// </summary>
-        /// <param name="e">
-        /// Contains the event data
-        /// </param>
-        private void OnTestCaseEnd(DataCollectionEventArgs e)
-        {
-            this.TestCaseEnd.SafeInvoke(this, e, "DataCollectionEvents.TestCaseEnd");
-        }
+    /// <summary>
+    /// Raises the TestCaseStart event
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private void OnTestCaseStart(DataCollectionEventArgs e)
+    {
+        TestCaseStart.SafeInvoke(this, e, "DataCollectionEvents.TestCaseStart");
+    }
+
+    /// <summary>
+    /// Raises the TestCaseEnd event
+    /// </summary>
+    /// <param name="e">
+    /// Contains the event data
+    /// </param>
+    private void OnTestCaseEnd(DataCollectionEventArgs e)
+    {
+        TestCaseEnd.SafeInvoke(this, e, "DataCollectionEvents.TestCaseEnd");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionLogger.cs b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionLogger.cs
index 02de86b114..549aeec494 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionLogger.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionLogger.cs
@@ -1,157 +1,147 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+
+/// <summary>
+/// Class used by data collectors to send messages to the client
+/// </summary>
+internal class TestPlatformDataCollectionLogger : DataCollectionLogger
 {
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
+    /// <summary>
+    /// DataCollector's config info.
+    /// </summary>
+    private readonly DataCollectorConfig _dataCollectorConfig;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Message sink.
+    /// </summary>
+    private readonly IMessageSink _sink;
 
     /// <summary>
-    /// Class used by data collectors to send messages to the client
+    /// Initializes a new instance of the <see cref="TestPlatformDataCollectionLogger"/> class.
     /// </summary>
-    internal class TestPlatformDataCollectionLogger : DataCollectionLogger
+    /// <param name="sink">
+    /// The underlying raw IMessageSink.  Cannot be null.
+    /// </param>
+    /// <param name="dataCollectorConfig">
+    /// The data Collector Information.
+    /// </param>
+    internal TestPlatformDataCollectionLogger(IMessageSink sink, DataCollectorConfig dataCollectorConfig)
     {
-        /// <summary>
-        /// DataCollector's config info.
-        /// </summary>
-        private readonly DataCollectorConfig dataCollectorConfig;
-
-        /// <summary>
-        /// Message sink.
-        /// </summary>
-        private readonly IMessageSink sink;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPlatformDataCollectionLogger"/> class.
-        /// </summary>
-        /// <param name="sink">
-        /// The underlying raw IMessageSink.  Cannot be null.
-        /// </param>
-        /// <param name="dataCollectorConfig">
-        /// The data Collector Information.
-        /// </param>
-        internal TestPlatformDataCollectionLogger(IMessageSink sink, DataCollectorConfig dataCollectorConfig)
-        {
-            ValidateArg.NotNull(dataCollectorConfig, "dataCollectorInformation");
-            ValidateArg.NotNull(sink, nameof(sink));
-            this.dataCollectorConfig = dataCollectorConfig;
-            this.sink = sink;
-        }
+        _sink = sink ?? throw new ArgumentNullException(nameof(sink));
+        _dataCollectorConfig = dataCollectorConfig ?? throw new ArgumentNullException(nameof(dataCollectorConfig));
+    }
 
-        /// <inheritdoc/>
-        public override void LogError(DataCollectionContext context, string text)
-        {
-            ValidateArg.NotNull(context, nameof(context));
-            ValidateArg.NotNull(text, nameof(text));
-
-            if (EqtTrace.IsErrorEnabled)
-            {
-                EqtTrace.Error(
-                    "Data collector '{0}' logged the following error: {1}",
-                    this.dataCollectorConfig.TypeUri,
-                    text);
-            }
-
-            this.SendTextMessage(context, text, TestMessageLevel.Error);
-        }
+    /// <inheritdoc/>
+    public override void LogError(DataCollectionContext context, string text)
+    {
+        ValidateArg.NotNull(context, nameof(context));
+        ValidateArg.NotNull(text, nameof(text));
+
+        EqtTrace.Error(
+            "Data collector '{0}' logged the following error: {1}",
+            _dataCollectorConfig.TypeUri,
+            text);
 
-        /// <inheritdoc/>
-        public override void LogError(DataCollectionContext context, string text, Exception exception)
+        SendTextMessage(context, text, TestMessageLevel.Error);
+    }
+
+    /// <inheritdoc/>
+    public override void LogError(DataCollectionContext context, string text, Exception exception)
+    {
+        ValidateArg.NotNull(context, nameof(context));
+        ValidateArg.NotNull(text, nameof(text));
+        ValidateArg.NotNull(exception, nameof(exception));
+
+        // Make sure the data collection context is not a derived data collection context.  This
+        // is done to safeguard from 3rd parties creating their own data collection contexts.
+        if (context.GetType() != typeof(DataCollectionContext))
         {
-            ValidateArg.NotNull(context, nameof(context));
-            ValidateArg.NotNull(text, nameof(text));
-            ValidateArg.NotNull(exception, nameof(exception));
-
-            // Make sure the data collection context is not a derived data collection context.  This
-            // is done to safeguard from 3rd parties creating their own data collection contexts.
-            if (context.GetType() != typeof(DataCollectionContext))
-            {
-                throw new InvalidOperationException(Resources.Resources.WrongDataCollectionContextType);
-            }
-
-            if (EqtTrace.IsErrorEnabled)
-            {
-                EqtTrace.Error(
-                    "Data collector '{0}' logged the following error:" + Environment.NewLine +
-                        "Description:            {1}" + Environment.NewLine +
-                        "Exception type:         {2}" + Environment.NewLine + "Exception message:      {3}"
-                    + Environment.NewLine + "Exception stack trace:  {4}",
-                    this.dataCollectorConfig.TypeUri,
-                    text,
-                    exception.GetType(),
-                    exception.Message,
-                    exception.StackTrace);
-            }
-
-            // Currently there is one type of DataCollectionMessage sent across client for all message kind.
-            // If required new type can be created for different message type.
-            var message = string.Format(
-                CultureInfo.CurrentCulture,
-                Resources.Resources.ReportDataCollectorException,
-                exception.GetType(),
-                exception.Message,
-                text);
-            this.SendTextMessage(context, message, TestMessageLevel.Error);
+            throw new InvalidOperationException(Resources.Resources.WrongDataCollectionContextType);
         }
 
-        /// <inheritdoc/>
-        public override void LogWarning(DataCollectionContext context, string text)
+        EqtTrace.Error(
+            "Data collector '{0}' logged the following error:" + Environment.NewLine +
+            "Description:            {1}" + Environment.NewLine +
+            "Exception type:         {2}" + Environment.NewLine + "Exception message:      {3}"
+            + Environment.NewLine + "Exception stack trace:  {4}",
+            _dataCollectorConfig.TypeUri,
+            text,
+            exception.GetType(),
+            exception.Message,
+            exception.StackTrace);
+
+        // Currently there is one type of DataCollectionMessage sent across client for all message kind.
+        // If required new type can be created for different message type.
+        var message = string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.Resources.ReportDataCollectorException,
+            exception.GetType(),
+            exception.Message,
+            text);
+        SendTextMessage(context, message, TestMessageLevel.Error);
+    }
+
+    /// <inheritdoc/>
+    public override void LogWarning(DataCollectionContext context, string text)
+    {
+        ValidateArg.NotNull(context, nameof(context));
+        ValidateArg.NotNull(text, nameof(text));
+
+        EqtTrace.Warning(
+            "Data collector '{0}' logged the following warning: {1}",
+            _dataCollectorConfig.TypeUri,
+            text);
+
+        SendTextMessage(context, text, TestMessageLevel.Warning);
+    }
+
+    /// <summary>
+    /// Sends text to message sink.
+    /// </summary>
+    /// <param name="context">
+    /// The context.
+    /// </param>
+    /// <param name="text">
+    /// The text.
+    /// </param>
+    /// <param name="level">
+    /// The level.
+    /// </param>
+    /// <exception cref="InvalidOperationException">Throws InvalidOperationException.
+    /// </exception>
+    private void SendTextMessage(DataCollectionContext context, string text, TestMessageLevel level)
+    {
+        ValidateArg.NotNull(context, nameof(context));
+        ValidateArg.NotNull(text, nameof(text));
+        TPDebug.Assert(
+            level is >= TestMessageLevel.Informational and <= TestMessageLevel.Error,
+            "Invalid level: " + level);
+
+        // Make sure the data collection context is not a derived data collection context.  This
+        // is done to safeguard from 3rd parties creating their own data collection contexts.
+        if (context.GetType() != typeof(DataCollectionContext))
         {
-            ValidateArg.NotNull(context, nameof(context));
-            ValidateArg.NotNull(text, nameof(text));
-            EqtTrace.Warning(
-                    "Data collector '{0}' logged the following warning: {1}",
-                    this.dataCollectorConfig.TypeUri,
-                text);
-
-            this.SendTextMessage(context, text, TestMessageLevel.Warning);
+            throw new InvalidOperationException(Resources.Resources.WrongDataCollectionContextType);
         }
 
-        /// <summary>
-        /// Sends text to message sink.
-        /// </summary>
-        /// <param name="context">
-        /// The context.
-        /// </param>
-        /// <param name="text">
-        /// The text.
-        /// </param>
-        /// <param name="level">
-        /// The level.
-        /// </param>
-        /// <exception cref="InvalidOperationException">Throws InvalidOperationException.
-        /// </exception>
-        private void SendTextMessage(DataCollectionContext context, string text, TestMessageLevel level)
+        var args = new DataCollectionMessageEventArgs(level, text);
+        args.Uri = _dataCollectorConfig.TypeUri;
+        args.FriendlyName = _dataCollectorConfig.FriendlyName;
+        if (context.HasTestCase)
         {
-            ValidateArg.NotNull(context, nameof(context));
-            ValidateArg.NotNull(text, nameof(text));
-
-            Debug.Assert(
-                level >= TestMessageLevel.Informational && level <= TestMessageLevel.Error,
-                "Invalid level: " + level);
-
-            // Make sure the data collection context is not a derived data collection context.  This
-            // is done to safeguard from 3rd parties creating their own data collection contexts.
-            if (context.GetType() != typeof(DataCollectionContext))
-            {
-                throw new InvalidOperationException(Resources.Resources.WrongDataCollectionContextType);
-            }
-
-            var args = new DataCollectionMessageEventArgs(level, text);
-            args.Uri = this.dataCollectorConfig.TypeUri;
-            args.FriendlyName = this.dataCollectorConfig.FriendlyName;
-            if (context.HasTestCase)
-            {
-                args.TestCaseId = context.TestExecId.Id;
-            }
-
-            this.sink.SendMessage(args);
+            args.TestCaseId = context.TestExecId.Id;
         }
+
+        _sink.SendMessage(args);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionSink.cs b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionSink.cs
index c698d52f02..49b19cdfb8 100644
--- a/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionSink.cs
+++ b/src/Microsoft.TestPlatform.Common/DataCollection/TestPlatformDataCollectionSink.cs
@@ -1,68 +1,65 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector
-{
-    using System.ComponentModel;
+using System;
+using System.ComponentModel;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
 
+/// <summary>
+/// The test platform data collection sink.
+/// </summary>
+internal class TestPlatformDataCollectionSink : DataCollectionSink
+{
     /// <summary>
-    /// The test platform data collection sink.
+    /// Initializes a new instance of the <see cref="TestPlatformDataCollectionSink"/> class.
+    /// Creates a data collector sink for data transfer.
     /// </summary>
-    internal class TestPlatformDataCollectionSink : DataCollectionSink
+    /// <param name="attachmentManager">
+    /// The attachment Manager.
+    /// </param>
+    /// <param name="dataCollectorConfig">
+    /// Data collector info.
+    /// </param>
+    internal TestPlatformDataCollectionSink(IDataCollectionAttachmentManager attachmentManager, DataCollectorConfig dataCollectorConfig)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPlatformDataCollectionSink"/> class.
-        /// Creates a data collector sink for data transfer.
-        /// </summary>
-        /// <param name="attachmentManager">
-        /// The attachment Manager.
-        /// </param>
-        /// <param name="dataCollectorConfig">
-        /// Data collector info.
-        /// </param>
-        internal TestPlatformDataCollectionSink(IDataCollectionAttachmentManager attachmentManager, DataCollectorConfig dataCollectorConfig)
-        {
-            ValidateArg.NotNull(attachmentManager, nameof(attachmentManager));
-            ValidateArg.NotNull(dataCollectorConfig, nameof(dataCollectorConfig));
-
-            this.DataCollectorConfig = dataCollectorConfig;
-            this.AttachmentManager = attachmentManager;
-        }
-
-        /// <summary>
-        /// Event handler for handling file transfer completed event.
-        /// </summary>
-        public override event AsyncCompletedEventHandler SendFileCompleted;
+        DataCollectorConfig = dataCollectorConfig ?? throw new ArgumentNullException(nameof(dataCollectorConfig));
+        AttachmentManager = attachmentManager ?? throw new ArgumentNullException(nameof(attachmentManager));
+    }
 
-        /// <summary>
-        /// Gets or sets message sink to transfer collection message.
-        /// </summary>
-        private IDataCollectionAttachmentManager AttachmentManager
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Event handler for handling file transfer completed event.
+    /// </summary>
+    public override event AsyncCompletedEventHandler? SendFileCompleted;
 
-        /// <summary>
-        /// Gets or sets dataCollector with which this data sink is associated.
-        /// </summary>
-        private DataCollectorConfig DataCollectorConfig
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets or sets message sink to transfer collection message.
+    /// </summary>
+    private IDataCollectionAttachmentManager AttachmentManager
+    {
+        get; set;
+    }
 
-        /// <summary>
-        /// Sends a file asynchronously.
-        /// </summary>
-        /// <param name="fileTransferInformation">Information about the file being transferred.</param>
-        public override void SendFileAsync(FileTransferInformation fileTransferInformation)
-        {
-            ValidateArg.NotNull(fileTransferInformation, nameof(fileTransferInformation));
+    /// <summary>
+    /// Gets or sets dataCollector with which this data sink is associated.
+    /// </summary>
+    private DataCollectorConfig DataCollectorConfig
+    {
+        get; set;
+    }
 
-            this.AttachmentManager.AddAttachment(fileTransferInformation, this.SendFileCompleted, this.DataCollectorConfig.TypeUri, this.DataCollectorConfig.FriendlyName);
-        }
+    /// <summary>
+    /// Sends a file asynchronously.
+    /// </summary>
+    /// <param name="fileTransferInformation">Information about the file being transferred.</param>
+    public override void SendFileAsync(FileTransferInformation fileTransferInformation)
+    {
+        ValidateArg.NotNull(fileTransferInformation, nameof(fileTransferInformation));
+        TPDebug.Assert(DataCollectorConfig.TypeUri is not null, "DataCollectorConfig.TypeUri is null");
+        AttachmentManager.AddAttachment(fileTransferInformation, SendFileCompleted, DataCollectorConfig.TypeUri, DataCollectorConfig.FriendlyName);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Exceptions/InvalidLoggerException.cs b/src/Microsoft.TestPlatform.Common/Exceptions/InvalidLoggerException.cs
index 14661d60bc..2026abba6c 100644
--- a/src/Microsoft.TestPlatform.Common/Exceptions/InvalidLoggerException.cs
+++ b/src/Microsoft.TestPlatform.Common/Exceptions/InvalidLoggerException.cs
@@ -1,35 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Exceptions
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System;
+using System;
 
-    public class InvalidLoggerException : TestPlatformException
-    {
-        #region Constructors
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public InvalidLoggerException(string message)
-            : base(message)
-        {
-        }
+namespace Microsoft.VisualStudio.TestPlatform.Common.Exceptions;
 
-        /// <summary>
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public InvalidLoggerException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+public class InvalidLoggerException : TestPlatformException
+{
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public InvalidLoggerException(string? message)
+        : base(message)
+    {
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public InvalidLoggerException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
-}
 
+}
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
new file mode 100644
index 0000000000..498593b484
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+
+internal class ExtensionDecoratorFactory
+{
+    private readonly IFeatureFlag _featureFlag;
+
+    public ExtensionDecoratorFactory(IFeatureFlag featureFlag)
+    {
+        _featureFlag = featureFlag;
+    }
+
+    public ITestExecutor Decorate(ITestExecutor originalTestExecutor)
+    {
+        return _featureFlag.IsSet(FeatureFlag.VSTEST_DISABLE_SERIALTESTRUN_DECORATOR)
+            ? originalTestExecutor
+            : new SerialTestRunDecorator(originalTestExecutor);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecorator.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecorator.cs
new file mode 100644
index 0000000000..e89183d3a4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecorator.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Xml.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+
+internal class SerialTestRunDecorator : ITestExecutor, ITestExecutor2, IDisposable
+{
+    private readonly SemaphoreSlim _runSequentialEvent = new(1);
+
+    public ITestExecutor OriginalTestExecutor { get; }
+
+    public SerialTestRunDecorator(ITestExecutor originalTestExecutor)
+    {
+        OriginalTestExecutor = originalTestExecutor;
+    }
+
+    public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+    {
+        if (IsSerialTestRunEnabled(runContext))
+        {
+            EqtTrace.Info("SerializeTestRunDecorator.RunTests: Test cases will run sequentially");
+            if (tests is null)
+            {
+                return;
+            }
+
+            foreach (TestCase testToRun in tests)
+            {
+                _runSequentialEvent.Wait();
+                OriginalTestExecutor.RunTests(new List<TestCase> { testToRun }, runContext, new SerializeTestRunDecoratorFrameworkHandle(frameworkHandle!, _runSequentialEvent));
+            }
+        }
+        else
+        {
+            OriginalTestExecutor.RunTests(tests, runContext, frameworkHandle);
+        }
+    }
+
+    public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+    {
+        if (IsSerialTestRunEnabled(runContext))
+        {
+            EqtTrace.Error("<ForceOneTestAtTimePerTestHost>true</ForceOneTestAtTimePerTestHost> is not supported for sources test run.");
+            frameworkHandle?.SendMessage(TestMessageLevel.Error, Resources.Resources.SerialTestRunInvalidScenario);
+        }
+        else
+        {
+            OriginalTestExecutor.RunTests(sources, runContext, frameworkHandle);
+        }
+    }
+
+    public bool ShouldAttachToTestHost(IEnumerable<string>? sources, IRunContext runContext)
+    {
+        if (OriginalTestExecutor is ITestExecutor2 executor)
+        {
+            return executor.ShouldAttachToTestHost(sources, runContext);
+        }
+
+        // If the adapter doesn't implement the new test executor interface we should attach to
+        // the default test host by default to preserve old behavior.
+        return true;
+    }
+
+    public bool ShouldAttachToTestHost(IEnumerable<TestCase>? tests, IRunContext runContext)
+    {
+        if (OriginalTestExecutor is ITestExecutor2 executor)
+        {
+            return executor.ShouldAttachToTestHost(tests, runContext);
+        }
+
+        // If the adapter doesn't implement the new test executor interface we should attach to
+        // the default test host by default to preserve old behavior.
+        return true;
+    }
+
+    public void Cancel()
+        => OriginalTestExecutor.Cancel();
+
+    private static bool IsSerialTestRunEnabled(IRunContext? runContext)
+    {
+        if (runContext is null || runContext.RunSettings is null || runContext.RunSettings.SettingsXml is null)
+        {
+            return false;
+        }
+
+        XElement runSettings = XElement.Parse(runContext.RunSettings.SettingsXml);
+        XElement? forceOneTestAtTimePerTestHost = runSettings.Element("RunConfiguration")?.Element("ForceOneTestAtTimePerTestHost");
+        return forceOneTestAtTimePerTestHost is not null && bool.TryParse(forceOneTestAtTimePerTestHost.Value, out bool enabled) && enabled;
+    }
+
+    public void Dispose()
+        => _runSequentialEvent.Dispose();
+}
+
+internal class SerializeTestRunDecoratorFrameworkHandle : IFrameworkHandle
+{
+    private readonly IFrameworkHandle _frameworkHandle;
+    private readonly SemaphoreSlim _testEnd;
+
+    public SerializeTestRunDecoratorFrameworkHandle(IFrameworkHandle frameworkHandle, SemaphoreSlim testEnd)
+    {
+        _frameworkHandle = frameworkHandle;
+        _testEnd = testEnd;
+    }
+
+    public bool EnableShutdownAfterTestRun { get => _frameworkHandle.EnableShutdownAfterTestRun; set => _frameworkHandle.EnableShutdownAfterTestRun = value; }
+
+    public int LaunchProcessWithDebuggerAttached(string filePath, string? workingDirectory, string? arguments, IDictionary<string, string?>? environmentVariables)
+        => _frameworkHandle.LaunchProcessWithDebuggerAttached(filePath, workingDirectory, arguments, environmentVariables);
+
+    public void RecordAttachments(IList<AttachmentSet> attachmentSets)
+        => _frameworkHandle.RecordAttachments(attachmentSets);
+
+    public void RecordEnd(TestCase testCase, TestOutcome outcome)
+    {
+        _frameworkHandle.RecordEnd(testCase, outcome);
+        _testEnd.Release();
+    }
+
+    public void RecordResult(TestResult testResult)
+        => _frameworkHandle.RecordResult(testResult);
+
+    public void RecordStart(TestCase testCase)
+        => _frameworkHandle.RecordStart(testCase);
+
+    public void SendMessage(TestMessageLevel testMessageLevel, string message)
+        => _frameworkHandle.SendMessage(testMessageLevel, message);
+}
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecoratorFrameworkHandle.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecoratorFrameworkHandle.cs
new file mode 100644
index 0000000000..2fe58fea6a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/SerialTestRunDecoratorFrameworkHandle.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+
+internal class SerialTestRunDecoratorFrameworkHandle : IFrameworkHandle
+{
+    private readonly IFrameworkHandle _frameworkHandle;
+    private readonly SemaphoreSlim _testEnd;
+
+    public SerialTestRunDecoratorFrameworkHandle(IFrameworkHandle frameworkHandle, SemaphoreSlim testEnd)
+    {
+        _frameworkHandle = frameworkHandle;
+        _testEnd = testEnd;
+    }
+
+    public bool EnableShutdownAfterTestRun { get => _frameworkHandle.EnableShutdownAfterTestRun; set => _frameworkHandle.EnableShutdownAfterTestRun = value; }
+
+    public int LaunchProcessWithDebuggerAttached(string filePath, string? workingDirectory, string? arguments, IDictionary<string, string?>? environmentVariables)
+        => _frameworkHandle.LaunchProcessWithDebuggerAttached(filePath, workingDirectory, arguments, environmentVariables);
+
+    public void RecordAttachments(IList<AttachmentSet> attachmentSets)
+        => _frameworkHandle.RecordAttachments(attachmentSets);
+
+    public void RecordEnd(TestCase testCase, TestOutcome outcome)
+    {
+        _frameworkHandle.RecordEnd(testCase, outcome);
+        _testEnd.Release();
+    }
+
+    public void RecordResult(TestResult testResult)
+        => _frameworkHandle.RecordResult(testResult);
+
+    public void RecordStart(TestCase testCase)
+        => _frameworkHandle.RecordStart(testCase);
+
+    public void SendMessage(TestMessageLevel testMessageLevel, string message)
+        => _frameworkHandle.SendMessage(testMessageLevel, message);
+}
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs
index 546cc5c54b..2fa6b1f1c5 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/DataCollectionExtensionManager.cs
@@ -1,102 +1,151 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Manages loading and provides access to data collector extensions implementing the
+/// DataCollector interface.
+/// </summary>
+internal class DataCollectorExtensionManager : TestExtensionManager<ObjectModel.DataCollection.DataCollector, IDataCollectorCapabilities>
 {
-    using System.Collections.Generic;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="unfilteredTestExtensions">
+    /// The unfiltered Test Extensions.
+    /// </param>
+    /// <param name="testExtensions">
+    /// The test Extensions.
+    /// </param>
+    /// <param name="logger">
+    /// The logger.
+    /// </param>
+    /// <remarks>
+    /// The constructor is not public because the factory method should be used to get instances of this class.
+    /// </remarks>
+    protected DataCollectorExtensionManager(
+        IEnumerable<LazyExtension<ObjectModel.DataCollection.DataCollector, Dictionary<string, object>>> unfilteredTestExtensions,
+        IEnumerable<LazyExtension<ObjectModel.DataCollection.DataCollector, IDataCollectorCapabilities>> testExtensions,
+        IMessageLogger logger)
+        : base(unfilteredTestExtensions, testExtensions, logger)
+    {
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Gets an instance of the DataCollectorExtensionManager.
+    /// </summary>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    /// <returns>
+    /// The DataCollectorExtensionManager.
+    /// </returns>
+    public static DataCollectorExtensionManager Create(IMessageLogger messageLogger)
+    {
+        TestPluginManager.GetSpecificTestExtensions<DataCollectorConfig, ObjectModel.DataCollection.DataCollector, IDataCollectorCapabilities, DataCollectorMetadata>(
+            TestPlatformConstants.DataCollectorEndsWithPattern,
+            out var unfilteredTestExtensions,
+            out var filteredTestExtensions);
+
+        return new DataCollectorExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
+    }
 
     /// <summary>
-    /// Manages loading and provides access to data collector extensions implementing the
-    /// DataCollector interface.
+    /// Gets an instance of the DataCollectorExtensionManager.
     /// </summary>
-    internal class DataCollectorExtensionManager : TestExtensionManager<DataCollector, IDataCollectorCapabilities>
+    /// <param name="extensionAssemblyFilePath">
+    /// File path that contains data collectors to load.
+    /// </param>
+    /// <param name="skipCache">
+    /// Skip the extensions cache.
+    /// </param>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    /// <returns>
+    /// The DataCollectorExtensionManager.
+    /// </returns>
+    public static DataCollectorExtensionManager Create(string extensionAssemblyFilePath, bool skipCache, IMessageLogger messageLogger)
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="unfilteredTestExtensions">
-        /// The unfiltered Test Extensions.
-        /// </param>
-        /// <param name="testExtensions">
-        /// The test Extensions.
-        /// </param>
-        /// <param name="logger">
-        /// The logger.
-        /// </param>
-        /// <remarks>
-        /// The constructor is not public because the factory method should be used to get instances of this class.
-        /// </remarks>
-        protected DataCollectorExtensionManager(
-            IEnumerable<LazyExtension<DataCollector, Dictionary<string, object>>> unfilteredTestExtensions,
-            IEnumerable<LazyExtension<DataCollector, IDataCollectorCapabilities>> testExtensions,
-            IMessageLogger logger)
-            : base(unfilteredTestExtensions, testExtensions, logger)
-        {
-        }
+        TestPluginManager.GetTestExtensions<DataCollectorConfig, ObjectModel.DataCollection.DataCollector, IDataCollectorCapabilities, DataCollectorMetadata>(
+            extensionAssemblyFilePath,
+            out var unfilteredTestExtensions,
+            out var filteredTestExtensions,
+            skipCache);
 
-        /// <summary>
-        /// Gets an instance of the DataCollectorExtensionManager.
-        /// </summary>
-        /// <param name="messageLogger">
-        /// The message Logger.
-        /// </param>
-        /// <returns>
-        /// The DataCollectorExtensionManager.
-        /// </returns>
-        public static DataCollectorExtensionManager Create(IMessageLogger messageLogger)
-        {
+        return new DataCollectorExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
+    }
+}
 
-            TestPluginManager.Instance.GetSpecificTestExtensions<DataCollectorConfig, DataCollector, IDataCollectorCapabilities, DataCollectorMetadata>(
-                TestPlatformConstants.DataCollectorEndsWithPattern,
-                out var unfilteredTestExtensions,
-                out var filteredTestExtensions);
+/// <summary>
+/// Hold data about the Data Collector.
+/// </summary>
+public class DataCollectorMetadata : IDataCollectorCapabilities
+{
+    /// <summary>
+    /// Constructor for DataCollectorMetadata
+    /// </summary>
+    /// <param name="extension">
+    /// Uri identifying the data collector.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    public DataCollectorMetadata(string extension, string friendlyName)
+        : this(extension, friendlyName, false)
+    { }
 
-            return new DataCollectorExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-        }
+    /// <summary>
+    /// Constructor for DataCollectorMetadata
+    /// </summary>
+    /// <param name="extension">
+    /// Uri identifying the data collector.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    /// <param name="hasAttachmentProcessor">
+    /// Indicates if the current data collector registers an attachment processor
+    /// </param>
+    public DataCollectorMetadata(string extension, string friendlyName, bool hasAttachmentProcessor)
+    {
+        ExtensionUri = extension;
+        FriendlyName = friendlyName;
+        HasAttachmentProcessor = hasAttachmentProcessor;
     }
 
     /// <summary>
-    /// Hold data about the Data Collector.
+    /// Gets Uri identifying the data collector.
     /// </summary>
-    public class DataCollectorMetadata : IDataCollectorCapabilities
+    public string ExtensionUri
     {
-        /// <summary>
-        /// Constructor for DataCollectorMetadata
-        /// </summary>
-        /// <param name="extension">
-        /// Uri identifying the data collector.
-        /// </param>
-        /// <param name="friendlyName">
-        /// The friendly Name.
-        /// </param>
-        public DataCollectorMetadata(string extension, string friendlyName)
-        {
-            this.ExtensionUri = extension;
-            this.FriendlyName = friendlyName;
-        }
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets Uri identifying the data collector.
-        /// </summary>
-        public string ExtensionUri
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Friendly Name identifying the data collector.
+    /// </summary>
+    public string FriendlyName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets Friendly Name identifying the data collector.
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Check if the data collector has got attachment processor registered
+    /// </summary>
+    public bool HasAttachmentProcessor
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
index db0ce646dd..885b279e55 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
@@ -1,211 +1,198 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Responsible for managing the Test Discoverer extensions which are available.
+/// </summary>
+internal class TestDiscoveryExtensionManager
+{
+    private static TestDiscoveryExtensionManager? s_testDiscoveryExtensionManager;
 
     /// <summary>
-    /// Responsible for managing the Test Discoverer extensions which are available.
+    /// Default constructor.
     /// </summary>
-    internal class TestDiscoveryExtensionManager
+    /// <remarks>The factory should be used for getting instances of this type so the constructor is not public.</remarks>
+    protected TestDiscoveryExtensionManager(
+        IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> discoverers,
+        IEnumerable<LazyExtension<ITestDiscoverer, Dictionary<string, object>>> unfilteredDiscoverers)
     {
-        #region Fields
-
-        private static TestDiscoveryExtensionManager testDiscoveryExtensionManager;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <remarks>The factory should be used for getting instances of this type so the constructor is not public.</remarks>
-        protected TestDiscoveryExtensionManager(
-            IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> discoverers,
-            IEnumerable<LazyExtension<ITestDiscoverer, Dictionary<string, object>>> unfilteredDiscoverers)
-        {
-            ValidateArg.NotNull<IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>>>(discoverers, nameof(discoverers));
-            ValidateArg.NotNull<IEnumerable<LazyExtension<ITestDiscoverer, Dictionary<string, object>>>>(unfilteredDiscoverers, nameof(unfilteredDiscoverers));
-
-            this.Discoverers = discoverers;
-            this.UnfilteredDiscoverers = unfilteredDiscoverers;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the unfiltered list of test discoverers which are available.
-        /// </summary>
-        /// <remarks>
-        /// Used in the /ListDiscoverers command line argument processor to generically list out extensions.
-        /// </remarks>
-        public IEnumerable<LazyExtension<ITestDiscoverer, Dictionary<string, object>>> UnfilteredDiscoverers { get; private set; }
-
-        /// <summary>
-        /// Gets the discoverers which are available for discovering tests.
-        /// </summary>
-        public IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> Discoverers { get; private set; }
-
-        #endregion
-
-        #region Factory
-
-        /// <summary>
-        /// Gets an instance of the Test Discovery Extension Manager.
-        /// </summary>
-        /// <returns>
-        /// Instance of the Test Discovery Extension Manager
-        /// </returns>
-        /// <remarks>
-        /// This would provide a discovery extension manager where extensions in
-        /// all the extension assemblies are discovered. This is cached.
-        /// </remarks>
-        public static TestDiscoveryExtensionManager Create()
-        {
-            if (testDiscoveryExtensionManager == null)
-            {
-
-                TestPluginManager.Instance
-                    .GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                        TestPlatformConstants.TestAdapterEndsWithPattern,
-                        out var unfilteredTestExtensions,
-                        out var testExtensions);
+        Discoverers = discoverers ?? throw new ArgumentNullException(nameof(discoverers));
+        UnfilteredDiscoverers = unfilteredDiscoverers ?? throw new ArgumentNullException(nameof(unfilteredDiscoverers));
+    }
 
-                testDiscoveryExtensionManager = new TestDiscoveryExtensionManager(
-                    testExtensions,
-                    unfilteredTestExtensions);
-            }
+    /// <summary>
+    /// Gets the unfiltered list of test discoverers which are available.
+    /// </summary>
+    /// <remarks>
+    /// Used in the /ListDiscoverers command line argument processor to generically list out extensions.
+    /// </remarks>
+    public IEnumerable<LazyExtension<ITestDiscoverer, Dictionary<string, object>>> UnfilteredDiscoverers { get; private set; }
 
-            return testDiscoveryExtensionManager;
-        }
+    /// <summary>
+    /// Gets the discoverers which are available for discovering tests.
+    /// </summary>
+    public IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> Discoverers { get; private set; }
 
-        /// <summary>
-        /// Gets an instance of the Test Discovery Extension Manager for the extension.
-        /// </summary>
-        /// <param name="extensionAssembly"> The extension assembly. </param>
-        /// <returns> The <see cref="TestDiscoveryExtensionManager"/> instance. </returns>
-        /// <remarks>
-        /// This would provide a discovery extension manager where extensions in
-        /// only the extension assembly provided are discovered. This is not cached
-        /// </remarks>
-        public static TestDiscoveryExtensionManager GetDiscoveryExtensionManager(string extensionAssembly)
+    /// <summary>
+    /// Gets an instance of the Test Discovery Extension Manager.
+    /// </summary>
+    /// <returns>
+    /// Instance of the Test Discovery Extension Manager
+    /// </returns>
+    /// <remarks>
+    /// This would provide a discovery extension manager where extensions in
+    /// all the extension assemblies are discovered. This is cached.
+    /// </remarks>
+    public static TestDiscoveryExtensionManager Create()
+    {
+        if (s_testDiscoveryExtensionManager == null)
         {
-
-            TestPluginManager.Instance
-                .GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                    extensionAssembly,
+            TestPluginManager.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                    TestPlatformConstants.TestAdapterEndsWithPattern,
                     out var unfilteredTestExtensions,
                     out var testExtensions);
 
-            return new TestDiscoveryExtensionManager(
+            s_testDiscoveryExtensionManager = new TestDiscoveryExtensionManager(
                 testExtensions,
                 unfilteredTestExtensions);
         }
 
-        /// <summary>
-        /// Loads and Initializes all the extensions.
-        /// </summary>
-        /// <param name="throwOnError"> The throw On Error. </param>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        internal static void LoadAndInitializeAllExtensions(bool throwOnError)
-        {
-            try
-            {
-                var allDiscoverers = Create();
-
-                // Iterate throw the discoverers so that they are initialized
-                foreach (var discoverer in allDiscoverers.Discoverers)
-                {
-                    // discoverer.value below is what initializes the extension types and hence is not under a EqtTrace.IsVerboseEnabled check.
-                    EqtTrace.Verbose("TestDiscoveryManager: LoadExtensions: Created discoverer {0}", discoverer.Value);
-                }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("TestDiscoveryManager: LoadExtensions: Exception occurred while loading extensions {0}", ex);
-                }
-
-                if (throwOnError)
-                {
-                    throw;
-                }
-            }
-        }
+        return s_testDiscoveryExtensionManager;
+    }
 
-        /// <summary>
-        /// Destroys the cache.
-        /// </summary>
-        internal static void Destroy()
-        {
-            testDiscoveryExtensionManager = null;
-        }
+    /// <summary>
+    /// Gets an instance of the Test Discovery Extension Manager for the extension.
+    /// </summary>
+    /// <param name="extensionAssembly"> The extension assembly. </param>
+    /// <returns> The <see cref="TestDiscoveryExtensionManager"/> instance. </returns>
+    /// <remarks>
+    /// This would provide a discovery extension manager where extensions in
+    /// only the extension assembly provided are discovered. This is not cached
+    /// </remarks>
+    public static TestDiscoveryExtensionManager GetDiscoveryExtensionManager(string extensionAssembly)
+    {
+
+        TestPluginManager.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                extensionAssembly,
+                out var unfilteredTestExtensions,
+                out var testExtensions);
 
-        #endregion
+        return new TestDiscoveryExtensionManager(
+            testExtensions,
+            unfilteredTestExtensions);
     }
 
     /// <summary>
-    /// Hold data about the Test discoverer.
+    /// Loads and Initializes all the extensions.
     /// </summary>
-    internal class TestDiscovererMetadata : ITestDiscovererCapabilities
+    /// <param name="throwOnError"> The throw On Error. </param>
+    internal static void LoadAndInitializeAllExtensions(bool throwOnError)
     {
-        /// <summary>
-        /// The default constructor.
-        /// </summary>
-        /// <param name="fileExtensions"> The file Extensions. </param>
-        /// <param name="defaultExecutorUri"> The default Executor Uri. </param>
-        public TestDiscovererMetadata(IReadOnlyCollection<string> fileExtensions, string defaultExecutorUri, AssemblyType assemblyType = default)
+        try
         {
-            if (fileExtensions != null && fileExtensions.Count > 0)
+            var allDiscoverers = Create();
+
+            // Iterate throw the discoverers so that they are initialized
+            foreach (var discoverer in allDiscoverers.Discoverers)
             {
-                this.FileExtension = new List<string>(fileExtensions);
+                // discoverer.value below is what initializes the extension types and hence is not under a EqtTrace.IsVerboseEnabled check.
+                EqtTrace.Verbose("TestDiscoveryManager: LoadExtensions: Created discoverer {0}", discoverer.Value);
             }
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("TestDiscoveryManager: LoadExtensions: Exception occurred while loading extensions {0}", ex);
 
-            if (!string.IsNullOrWhiteSpace(defaultExecutorUri))
+            if (throwOnError)
             {
-                this.DefaultExecutorUri = new Uri(defaultExecutorUri);
+                throw;
             }
-
-            this.AssemblyType = assemblyType;
         }
+    }
 
-        /// <summary>
-        /// Gets file extensions supported by the discoverer.
-        /// </summary>
-        public IEnumerable<string> FileExtension
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Destroys the cache.
+    /// </summary>
+    internal static void Destroy()
+    {
+        s_testDiscoveryExtensionManager = null;
+    }
+
+}
 
-        /// <summary>
-        /// Gets the default executor Uri for this discoverer
-        /// </summary>
-        public Uri DefaultExecutorUri
+/// <summary>
+/// Hold data about the Test discoverer.
+/// </summary>
+internal class TestDiscovererMetadata : ITestDiscovererCapabilities
+{
+    /// <summary>
+    /// The default constructor.
+    /// </summary>
+    /// <param name="fileExtensions"> The file Extensions. </param>
+    /// <param name="defaultExecutorUri"> The default Executor Uri. </param>
+    /// <param name="assemblyType">Type of the assembly.</param>
+    /// <param name="isDirectoryBased">True when the discoverer is based on directories.</param>
+    public TestDiscovererMetadata(IReadOnlyCollection<string>? fileExtensions, string? defaultExecutorUri, AssemblyType assemblyType = default, bool isDirectoryBased = false)
+    {
+        if (fileExtensions != null && fileExtensions.Count > 0)
         {
-            get;
-            private set;
+            FileExtension = new List<string>(fileExtensions);
         }
 
-        /// <summary>
-        /// Gets assembly type supported by the discoverer.
-        /// </summary>
-        public AssemblyType AssemblyType
+        if (!defaultExecutorUri.IsNullOrWhiteSpace())
         {
-            get;
-            private set;
+            DefaultExecutorUri = new Uri(defaultExecutorUri);
         }
+
+        AssemblyType = assemblyType;
+        IsDirectoryBased = isDirectoryBased;
+    }
+
+    /// <summary>
+    /// Gets file extensions supported by the discoverer.
+    /// </summary>
+    public IEnumerable<string>? FileExtension
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets the default executor Uri for this discoverer
+    /// </summary>
+    public Uri? DefaultExecutorUri
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets assembly type supported by the discoverer.
+    /// </summary>
+    public AssemblyType AssemblyType
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// <see langword="true"/> if the discoverer plugin is decorated with <see cref="DirectoryBasedTestDiscovererAttribute"/>,
+    /// <see langword="false"/> otherwise.
+    /// </summary>
+    public bool IsDirectoryBased
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs
index b131657be8..1e3c228254 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs
@@ -1,267 +1,246 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Manages the Test Executor extensions.
+/// </summary>
+internal class TestExecutorExtensionManager : TestExtensionManager<ITestExecutor, ITestExecutorCapabilities>
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private static TestExecutorExtensionManager? s_testExecutorExtensionManager;
+    private static readonly object Synclock = new();
 
     /// <summary>
-    /// Manages the Test Executor extensions.
+    /// Default constructor.
     /// </summary>
-    internal class TestExecutorExtensionManager : TestExtensionManager<ITestExecutor, ITestExecutorCapabilities>
+    /// <param name="unfilteredTestExtensions"> The unfiltered Test Extensions. </param>
+    /// <param name="testExtensions"> The test Extensions. </param>
+    /// <param name="logger"> The logger. </param>
+    /// <remarks>
+    /// This constructor is not public because instances should be retrieved using the
+    /// factory method.  The constructor is protected for testing purposes.
+    /// </remarks>
+    protected TestExecutorExtensionManager(
+        IEnumerable<LazyExtension<ITestExecutor, Dictionary<string, object>>> unfilteredTestExtensions,
+        IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions,
+        IMessageLogger logger)
+        : base(unfilteredTestExtensions, testExtensions, logger)
     {
-        #region Fields
-
-        private static TestExecutorExtensionManager testExecutorExtensionManager;
-        private static object synclock = new object();
-
-        #endregion
-
-        #region Constructor
+    }
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="unfilteredTestExtensions"> The unfiltered Test Extensions. </param>
-        /// <param name="testExtensions"> The test Extensions. </param>
-        /// <param name="logger"> The logger. </param>
-        /// <remarks>
-        /// This constructor is not public because instances should be retrieved using the
-        /// factory method.  The constructor is protected for testing purposes.
-        /// </remarks>
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        protected TestExecutorExtensionManager(
-            IEnumerable<LazyExtension<ITestExecutor, Dictionary<string, object>>> unfilteredTestExtensions,
-            IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions,
-            IMessageLogger logger)
-            : base(unfilteredTestExtensions, testExtensions, logger)
+    /// <summary>
+    /// Merges two test extension lists.
+    /// </summary>
+    ///
+    /// <typeparam name="TExecutor1">Type of first test extension.</typeparam>
+    /// <typeparam name="TExecutor2">Type of second test extension.</typeparam>
+    /// <typeparam name="TValue">Type of the value used in the lazy extension expression.</typeparam>
+    ///
+    /// <param name="testExtensions1">First test extension list.</param>
+    /// <param name="testExtensions2">Second test extension list.</param>
+    ///
+    /// <returns>A merged list of test extensions.</returns>
+    private static IEnumerable<LazyExtension<TExecutor1, TValue>> MergeTestExtensionLists<TExecutor1, TExecutor2, TValue>(
+        IEnumerable<LazyExtension<TExecutor1, TValue>> testExtensions1,
+        IEnumerable<LazyExtension<TExecutor2, TValue>> testExtensions2) where TExecutor1 : ITestExecutor where TExecutor2 : TExecutor1
+    {
+        if (!testExtensions2.Any())
         {
+            return testExtensions1;
         }
 
-        #endregion
+        var mergedTestExtensions = new List<LazyExtension<TExecutor1, TValue>>();
+        var cache = new Dictionary<string, LazyExtension<TExecutor1, TValue>>();
 
-        #region Private Methods
-        /// <summary>
-        /// Merges two test extension lists.
-        /// </summary>
-        /// 
-        /// <typeparam name="TExecutor1">Type of first test extension.</typeparam>
-        /// <typeparam name="TExecutor2">Type of second test extension.</typeparam>
-        /// <typeparam name="TValue">Type of the value used in the lazy extension expression.</typeparam>
-        /// 
-        /// <param name="testExtensions1">First test extension list.</param>
-        /// <param name="testExtensions2">Second test extension list.</param>
-        /// 
-        /// <returns>A merged list of test extensions.</returns>
-        private static IEnumerable<LazyExtension<TExecutor1, TValue>> MergeTestExtensionLists<TExecutor1, TExecutor2, TValue>(
-            IEnumerable<LazyExtension<TExecutor1, TValue>> testExtensions1,
-            IEnumerable<LazyExtension<TExecutor2, TValue>> testExtensions2) where TExecutor1 : ITestExecutor where TExecutor2 : TExecutor1
+        // Create the cache used for merging by adding all extensions from the first list.
+        foreach (var testExtension in testExtensions1)
         {
-            if (!testExtensions2.Any())
-            {
-                return testExtensions1;
-            }
-
-            var mergedTestExtensions = new List<LazyExtension<TExecutor1, TValue>>();
-            var cache = new Dictionary<string, LazyExtension<TExecutor1, TValue>>();
-
-            // Create the cache used for merging by adding all extensions from the first list.
-            foreach (var testExtension in testExtensions1)
+            if (testExtension.TestPluginInfo?.IdentifierData is not null)
             {
                 cache.Add(testExtension.TestPluginInfo.IdentifierData, testExtension);
             }
+        }
 
-            // Update the cache with extensions from the second list. Should there be any conflict
-            // we prefer the second extension to the first.
-            foreach (var testExtension in testExtensions2)
-            {
-                if (cache.ContainsKey(testExtension.TestPluginInfo.IdentifierData))
-                {
-                    cache[testExtension.TestPluginInfo.IdentifierData] =
-                        new LazyExtension<TExecutor1, TValue>(
-                            (TExecutor1)testExtension.Value, testExtension.Metadata);
-                }
-            }
-
-            // Create the merged test extensions list from the cache.
-            foreach (var kvp in cache)
+        // Update the cache with extensions from the second list. Should there be any conflict
+        // we prefer the second extension to the first.
+        foreach (var testExtension in testExtensions2)
+        {
+            if (testExtension.TestPluginInfo?.IdentifierData is not null
+                && cache.ContainsKey(testExtension.TestPluginInfo.IdentifierData))
             {
-                mergedTestExtensions.Add(kvp.Value);
+                cache[testExtension.TestPluginInfo.IdentifierData] = new(testExtension.Value, testExtension.Metadata);
             }
-
-            return mergedTestExtensions;
         }
 
-        #endregion
+        // Create the merged test extensions list from the cache.
+        foreach (var kvp in cache)
+        {
+            mergedTestExtensions.Add(kvp.Value);
+        }
 
-        #region Factory Methods
+        return mergedTestExtensions;
+    }
 
-        /// <summary>
-        /// Creates the TestExecutorExtensionManager.
-        /// </summary>
-        /// <returns>Instance of the TestExecutorExtensionManager</returns>
-        internal static TestExecutorExtensionManager Create()
+    /// <summary>
+    /// Creates the TestExecutorExtensionManager.
+    /// </summary>
+    /// <returns>Instance of the TestExecutorExtensionManager</returns>
+    internal static TestExecutorExtensionManager Create()
+    {
+        if (s_testExecutorExtensionManager == null)
         {
-            if (testExecutorExtensionManager == null)
+            lock (Synclock)
             {
-                lock (synclock)
+                if (s_testExecutorExtensionManager == null)
                 {
-                    if (testExecutorExtensionManager == null)
-                    {
-
-                        // Get all extensions for ITestExecutor.
-                        TestPluginManager.Instance
-                            .GetSpecificTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
-                                TestPlatformConstants.TestAdapterEndsWithPattern,
-                                out var unfilteredTestExtensions1,
-                                out var testExtensions1);
-
-                        // Get all extensions for ITestExecutor2.
-                        TestPluginManager.Instance
-                            .GetSpecificTestExtensions<TestExecutorPluginInformation2, ITestExecutor2, ITestExecutorCapabilities, TestExecutorMetadata>(
-                                TestPlatformConstants.TestAdapterEndsWithPattern,
-                                out var unfilteredTestExtensions2,
-                                out var testExtensions2);
 
-                        // Merge the extension lists.
-                        var mergedUnfilteredTestExtensions = TestExecutorExtensionManager.MergeTestExtensionLists(
-                            unfilteredTestExtensions1,
-                            unfilteredTestExtensions2);
-
-                        var mergedTestExtensions = TestExecutorExtensionManager.MergeTestExtensionLists(
-                            testExtensions1,
-                            testExtensions2);
-
-                        // Create the TestExecutorExtensionManager using the merged extension list.
-                        testExecutorExtensionManager = new TestExecutorExtensionManager(
-                            mergedUnfilteredTestExtensions, mergedTestExtensions, TestSessionMessageLogger.Instance);
-                    }
+                    // Get all extensions for ITestExecutor.
+                    TestPluginManager.GetSpecificTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
+                            TestPlatformConstants.TestAdapterEndsWithPattern,
+                            out var unfilteredTestExtensions1,
+                            out var testExtensions1);
+
+                    // Get all extensions for ITestExecutor2.
+                    TestPluginManager.GetSpecificTestExtensions<TestExecutorPluginInformation2, ITestExecutor2, ITestExecutorCapabilities, TestExecutorMetadata>(
+                            TestPlatformConstants.TestAdapterEndsWithPattern,
+                            out var unfilteredTestExtensions2,
+                            out var testExtensions2);
+
+                    // Merge the extension lists.
+                    var mergedUnfilteredTestExtensions = MergeTestExtensionLists(
+                        unfilteredTestExtensions1,
+                        unfilteredTestExtensions2);
+
+                    var mergedTestExtensions = MergeTestExtensionLists(
+                        testExtensions1,
+                        testExtensions2);
+
+                    // Create the TestExecutorExtensionManager using the merged extension list.
+                    s_testExecutorExtensionManager = new TestExecutorExtensionManager(
+                        mergedUnfilteredTestExtensions, mergedTestExtensions, TestSessionMessageLogger.Instance);
                 }
             }
-
-            return testExecutorExtensionManager;
         }
 
-        /// <summary>
-        /// Gets an instance of the Test Execution Extension Manager for the extension.
-        /// </summary>
-        /// <param name="extensionAssembly"> The extension assembly. </param>
-        /// <returns> The <see cref="TestExecutorExtensionManager"/>. </returns>
-        /// <remarks>
-        /// This would provide an execution extension manager where extensions in
-        /// only the extension assembly provided are discovered. This is not cached.
-        /// </remarks>
-        internal static TestExecutorExtensionManager GetExecutionExtensionManager(string extensionAssembly)
-        {
-
-            // Get all extensions for ITestExecutor.
-            TestPluginManager.Instance
-                .GetTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
-                    extensionAssembly,
-                    out var unfilteredTestExtensions1,
-                    out var testExtensions1);
-
-            // Get all extensions for ITestExecutor2.
-            TestPluginManager.Instance
-                .GetTestExtensions<TestExecutorPluginInformation2, ITestExecutor2, ITestExecutorCapabilities, TestExecutorMetadata>(
-                    extensionAssembly,
-                    out var unfilteredTestExtensions2,
-                    out var testExtensions2);
+        return s_testExecutorExtensionManager;
+    }
 
-            // Merge the extension lists.
-            var mergedUnfilteredTestExtensions = TestExecutorExtensionManager.MergeTestExtensionLists(
-                    unfilteredTestExtensions1,
-                    unfilteredTestExtensions2);
+    /// <summary>
+    /// Gets an instance of the Test Execution Extension Manager for the extension.
+    /// </summary>
+    /// <param name="extensionAssembly"> The extension assembly. </param>
+    /// <returns> The <see cref="TestExecutorExtensionManager"/>. </returns>
+    /// <remarks>
+    /// This would provide an execution extension manager where extensions in
+    /// only the extension assembly provided are discovered. This is not cached.
+    /// </remarks>
+    internal static TestExecutorExtensionManager GetExecutionExtensionManager(string extensionAssembly)
+    {
 
-            var mergedTestExtensions = TestExecutorExtensionManager.MergeTestExtensionLists(
-                testExtensions1,
-                testExtensions2);
+        // Get all extensions for ITestExecutor.
+        TestPluginManager.GetTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
+                extensionAssembly,
+                out var unfilteredTestExtensions1,
+                out var testExtensions1);
+
+        // Get all extensions for ITestExecutor2.
+        TestPluginManager.GetTestExtensions<TestExecutorPluginInformation2, ITestExecutor2, ITestExecutorCapabilities, TestExecutorMetadata>(
+                extensionAssembly,
+                out var unfilteredTestExtensions2,
+                out var testExtensions2);
+
+        // Merge the extension lists.
+        var mergedUnfilteredTestExtensions = MergeTestExtensionLists(
+            unfilteredTestExtensions1,
+            unfilteredTestExtensions2);
+
+        var mergedTestExtensions = MergeTestExtensionLists(
+            testExtensions1,
+            testExtensions2);
+
+        // TODO: This can be optimized - The base class's populate map would be called repeatedly for the same extension assembly.
+        // Have a single instance of TestExecutorExtensionManager that keeps populating the map iteratively.
+        return new TestExecutorExtensionManager(
+            mergedUnfilteredTestExtensions,
+            mergedTestExtensions,
+            TestSessionMessageLogger.Instance);
+    }
 
-            // TODO: This can be optimized - The base class's populate map would be called repeatedly for the same extension assembly.
-            // Have a single instance of TestExecutorExtensionManager that keeps populating the map iteratively.
-            return new TestExecutorExtensionManager(
-                mergedUnfilteredTestExtensions,
-                mergedTestExtensions,
-                TestSessionMessageLogger.Instance);
+    /// <summary>
+    /// Destroy the TestExecutorExtensionManager.
+    /// </summary>
+    internal static void Destroy()
+    {
+        lock (Synclock)
+        {
+            s_testExecutorExtensionManager = null;
         }
+    }
 
-        /// <summary>
-        /// Destroy the TestExecutorExtensionManager.
-        /// </summary>
-        internal static void Destroy()
+    /// <summary>
+    /// Load all the executors and fail on error
+    /// </summary>
+    /// <param name="shouldThrowOnError"> Indicates whether this method should throw on error. </param>
+    internal static void LoadAndInitializeAllExtensions(bool shouldThrowOnError)
+    {
+        var executorExtensionManager = Create();
+
+        try
         {
-            lock (synclock)
+            foreach (var executor in executorExtensionManager.TestExtensions)
             {
-                testExecutorExtensionManager = null;
+                // Note: - The below Verbose call should not be under IsVerboseEnabled check as we want to
+                // call executor.Value even if logging is not enabled.
+                EqtTrace.Verbose("TestExecutorExtensionManager: Loading executor {0}", executor.Value);
             }
         }
-
-        /// <summary>
-        /// Load all the executors and fail on error
-        /// </summary>
-        /// <param name="shouldThrowOnError"> Indicates whether this method should throw on error. </param>
-        internal static void LoadAndInitializeAllExtensions(bool shouldThrowOnError)
+        catch (Exception ex)
         {
-            var executorExtensionManager = Create();
+            EqtTrace.Error(
+                "TestExecutorExtensionManager: LoadAndInitialize: Exception occurred while loading extensions {0}",
+                ex);
 
-            try
-            {
-                foreach (var executor in executorExtensionManager.TestExtensions)
-                {
-                    // Note: - The below Verbose call should not be under IsVerboseEnabled check as we want to
-                    // call executor.Value even if logging is not enabled.
-                    EqtTrace.Verbose("TestExecutorExtensionManager: Loading executor {0}", executor.Value);
-                }
-            }
-            catch (Exception ex)
+            if (shouldThrowOnError)
             {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error(
-                        "TestExecutorExtensionManager: LoadAndInitialize: Exception occurred while loading extensions {0}",
-                        ex);
-                }
-
-                if (shouldThrowOnError)
-                {
-                    throw;
-                }
+                throw;
             }
         }
-
-        #endregion
     }
 
+}
+
+/// <summary>
+/// Holds data about the Test executor.
+/// </summary>
+internal class TestExecutorMetadata : ITestExecutorCapabilities
+{
     /// <summary>
-    /// Holds data about the Test executor.
+    /// The constructor
     /// </summary>
-    internal class TestExecutorMetadata : ITestExecutorCapabilities
+    /// <param name="extensionUri">Uri identifying the executor</param>
+    public TestExecutorMetadata(string extensionUri)
     {
-        /// <summary>
-        /// The constructor
-        /// </summary>
-        /// <param name="extensionUri">Uri identifying the executor</param>
-        public TestExecutorMetadata(string extensionUri)
-        {
-            this.ExtensionUri = extensionUri;
-        }
+        ExtensionUri = extensionUri;
+    }
 
-        /// <summary>
-        /// Gets Uri identifying the executor.
-        /// </summary>
-        public string ExtensionUri
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Uri identifying the executor.
+    /// </summary>
+    public string ExtensionUri
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExtensionManager.cs
index 7bf7bb2d74..318b3c0ea8 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExtensionManager.cs
@@ -1,197 +1,176 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Generic base class for managing extensions and looking them up by their URI.
+/// </summary>
+/// <typeparam name="TExtension">The type of the extension.</typeparam>
+/// <typeparam name="TMetadata">The type of the metadata.</typeparam>
+internal abstract class TestExtensionManager<TExtension, TMetadata>
+    where TMetadata : ITestExtensionCapabilities
 {
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+    /// <summary>
+    /// Used for logging errors.
+    /// </summary>
+    private readonly IMessageLogger _logger;
 
     /// <summary>
-    /// Generic base class for managing extensions and looking them up by their URI.
+    /// Default constructor.
     /// </summary>
-    /// <typeparam name="TExtension">The type of the extension.</typeparam>
-    /// <typeparam name="TMetadata">The type of the metadata.</typeparam>
-    internal abstract class TestExtensionManager<TExtension, TMetadata>
-        where TMetadata : ITestExtensionCapabilities
+    /// <param name="unfilteredTestExtensions">
+    /// The unfiltered Test Extensions.
+    /// </param>
+    /// <param name="testExtensions">
+    /// The test Extensions.
+    /// </param>
+    /// <param name="logger">
+    /// The logger.
+    /// </param>
+    protected TestExtensionManager(
+        IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> unfilteredTestExtensions,
+        IEnumerable<LazyExtension<TExtension, TMetadata>> testExtensions,
+        IMessageLogger logger)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for logging errors.
-        /// </summary>
-        private IMessageLogger logger;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="unfilteredTestExtensions">
-        /// The unfiltered Test Extensions.
-        /// </param>
-        /// <param name="testExtensions">
-        /// The test Extensions.
-        /// </param>
-        /// <param name="logger">
-        /// The logger.
-        /// </param>
-        protected TestExtensionManager(
-            IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> unfilteredTestExtensions,
-            IEnumerable<LazyExtension<TExtension, TMetadata>> testExtensions,
-            IMessageLogger logger)
-        {
-            ValidateArg.NotNull<IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>>>(unfilteredTestExtensions, nameof(unfilteredTestExtensions));
-            ValidateArg.NotNull<IEnumerable<LazyExtension<TExtension, TMetadata>>>(testExtensions, nameof(testExtensions));
-            ValidateArg.NotNull<IMessageLogger>(logger, nameof(logger));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        TestExtensions = testExtensions ?? throw new ArgumentNullException(nameof(testExtensions));
+        UnfilteredTestExtensions = unfilteredTestExtensions ?? throw new ArgumentNullException(nameof(unfilteredTestExtensions));
 
-            this.logger = logger;
-            this.TestExtensions = testExtensions;
-            this.UnfilteredTestExtensions = unfilteredTestExtensions;
+        // Populate the map to avoid threading issues
+        PopulateMap();
+    }
 
-            // Populate the map to avoid threading issues
-            this.PopulateMap();
-        }
+    /// <summary>
+    /// Gets unfiltered list of test extensions which are available.
+    /// </summary>
+    /// <remarks>
+    /// When we populate the "TestExtensions" property it
+    /// will filter out extensions which are missing required pieces of metadata such
+    /// as the "ExtensionUri".  This field is here so we can report on extensions which
+    /// are missing metadata.
+    /// </remarks>
+    public IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> UnfilteredTestExtensions
+    {
+        get; private set;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets filtered list of test extensions which are available.
+    /// </summary>
+    /// <remarks>
+    /// When we populate the "TestExtensions" property it
+    /// will filter out extensions which are missing required pieces of metadata such
+    /// as the "ExtensionUri".  This field is here so we can report on extensions which
+    /// are missing metadata.
+    /// </remarks>
+    public IEnumerable<LazyExtension<TExtension, TMetadata>> TestExtensions
+    {
+        get;
+        private set;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Gets mapping between test extension URI and test extension.
+    /// </summary>
+    public Dictionary<Uri, LazyExtension<TExtension, TMetadata>> TestExtensionByUri
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets unfiltered list of test extensions which are available.
-        /// </summary>
-        /// <remarks>
-        /// When we populate the "TestExtensions" property it
-        /// will filter out extensions which are missing required pieces of metadata such
-        /// as the "ExtensionUri".  This field is here so we can report on extensions which
-        /// are missing metadata.
-        /// </remarks>
-        public IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> UnfilteredTestExtensions
-        {
-            get; private set;
-        }
+    /// <summary>
+    /// Looks up the test extension by its URI.
+    /// </summary>
+    /// <param name="extensionUri">The URI of the test extension to be looked up.</param>
+    /// <returns>The test extension or null if one was not found.</returns>
+    public LazyExtension<TExtension, TMetadata>? TryGetTestExtension(Uri extensionUri)
+    {
+        ValidateArg.NotNull(extensionUri, nameof(extensionUri));
+        TestExtensionByUri.TryGetValue(extensionUri, out var testExtension);
 
-        /// <summary>
-        /// Gets filtered list of test extensions which are available.
-        /// </summary>
-        /// <remarks>
-        /// When we populate the "TestExtensions" property it
-        /// will filter out extensions which are missing required pieces of metadata such
-        /// as the "ExtensionUri".  This field is here so we can report on extensions which
-        /// are missing metadata.
-        /// </remarks>
-        public IEnumerable<LazyExtension<TExtension, TMetadata>> TestExtensions
-        {
-            get;
-            private set;
-        }
+        return testExtension;
+    }
 
-        /// <summary>
-        /// Gets mapping between test extension URI and test extension.
-        /// </summary>
-        public Dictionary<Uri, LazyExtension<TExtension, TMetadata>> TestExtensionByUri
+    /// <summary>
+    /// Looks up the test extension by its URI (passed as a string).
+    /// </summary>
+    /// <param name="extensionUri">The URI of the test extension to be looked up.</param>
+    /// <returns>The test extension or null if one was not found.</returns>
+    public LazyExtension<TExtension, TMetadata>? TryGetTestExtension(string extensionUri)
+    {
+        ValidateArg.NotNull(extensionUri, nameof(extensionUri));
+        LazyExtension<TExtension, TMetadata>? testExtension = null;
+        foreach (var availableExtensionUri in TestExtensionByUri.Keys)
         {
-            get;
-            private set;
+            if (string.Equals(extensionUri, availableExtensionUri.AbsoluteUri, StringComparison.OrdinalIgnoreCase))
+            {
+                TestExtensionByUri.TryGetValue(availableExtensionUri, out testExtension);
+                break;
+            }
         }
 
-        #endregion
+        return testExtension;
+    }
 
-        #region Public Methods
+    /// <summary>
+    /// Populate the extension map.
+    /// </summary>
+    [MemberNotNull(nameof(TestExtensionByUri))]
+    private void PopulateMap()
+    {
+        TestExtensionByUri = new Dictionary<Uri, LazyExtension<TExtension, TMetadata>>();
 
-        /// <summary>
-        /// Looks up the test extension by its URI.
-        /// </summary>
-        /// <param name="extensionUri">The URI of the test extension to be looked up.</param>
-        /// <returns>The test extension or null if one was not found.</returns>
-        public LazyExtension<TExtension, TMetadata> TryGetTestExtension(Uri extensionUri)
+        if (TestExtensions == null)
         {
-            ValidateArg.NotNull<Uri>(extensionUri, nameof(extensionUri));
-
-            this.TestExtensionByUri.TryGetValue(extensionUri, out var testExtension);
-
-            return testExtension;
+            return;
         }
 
-        /// <summary>
-        /// Looks up the test extension by its URI (passed as a string).
-        /// </summary>
-        /// <param name="extensionUri">The URI of the test extension to be looked up.</param>
-        /// <returns>The test extension or null if one was not found.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1057:StringUriOverloadsCallSystemUriOverloads", Justification = "Case insensitiveness needs to be supported.")]
-        public LazyExtension<TExtension, TMetadata> TryGetTestExtension(string extensionUri)
+        foreach (var extension in TestExtensions)
         {
-            ValidateArg.NotNull<string>(extensionUri, nameof(extensionUri));
-
-            LazyExtension<TExtension, TMetadata> testExtension = null;
-            foreach (var availableExtensionUri in this.TestExtensionByUri.Keys)
+            // Convert the extension uri string to an actual uri.
+            Uri? uri = null;
+            try
+            {
+                uri = new Uri(extension.Metadata.ExtensionUri);
+            }
+            catch (FormatException e)
             {
-                if (string.Equals(extensionUri, availableExtensionUri.AbsoluteUri, StringComparison.OrdinalIgnoreCase))
+                if (_logger != null)
                 {
-                    this.TestExtensionByUri.TryGetValue(availableExtensionUri, out testExtension);
-                    break;
+                    _logger.SendMessage(
+                        TestMessageLevel.Warning,
+                        string.Format(CultureInfo.CurrentCulture, CommonResources.InvalidExtensionUriFormat, extension.Metadata.ExtensionUri, e));
                 }
             }
-            return testExtension;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Populate the extension map.
-        /// </summary>
-        private void PopulateMap()
-        {
-            this.TestExtensionByUri = new Dictionary<Uri, LazyExtension<TExtension, TMetadata>>();
 
-            if (this.TestExtensions == null)
+            if (uri == null)
             {
-                return;
+                continue;
             }
 
-            foreach (var extension in this.TestExtensions)
+            // Make sure we are not trying to add an extension with a duplicate uri.
+            if (!TestExtensionByUri.ContainsKey(uri))
             {
-                // Convert the extension uri string to an actual uri.
-                Uri uri = null;
-                try
-                {
-                    uri = new Uri(extension.Metadata.ExtensionUri);
-                }
-                catch (FormatException e)
-                {
-                    if (this.logger != null)
-                    {
-                        this.logger.SendMessage(
-                            TestMessageLevel.Warning,
-                            string.Format(CultureInfo.CurrentUICulture, CommonResources.InvalidExtensionUriFormat, extension.Metadata.ExtensionUri, e));
-                    }
-                }
-
-                if (uri != null)
-                {
-                    // Make sure we are not trying to add an extension with a duplicate uri.
-                    if (!this.TestExtensionByUri.ContainsKey(uri))
-                    {
-                        this.TestExtensionByUri.Add(uri, extension);
-                    }
-                    else
-                    {
-                        if (this.logger != null)
-                        {
-                            this.logger.SendMessage(
-                                TestMessageLevel.Warning,
-                                string.Format(CultureInfo.CurrentUICulture, CommonResources.DuplicateExtensionUri, extension.Metadata.ExtensionUri));
-                        }
-                    }
-                }
+                TestExtensionByUri.Add(uri, extension);
+            }
+            else if (_logger != null)
+            {
+                _logger.SendMessage(
+                    TestMessageLevel.Warning,
+                    string.Format(CultureInfo.CurrentCulture, CommonResources.DuplicateExtensionUri, extension.Metadata.ExtensionUri));
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestLoggerExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestLoggerExtensionManager.cs
index 56a4227332..74cbb751e1 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestLoggerExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestLoggerExtensionManager.cs
@@ -1,102 +1,100 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
 
+/// <summary>
+/// Manages loading and provides access to logging extensions implementing the
+/// ITestLogger interface.
+/// </summary>
+internal class TestLoggerExtensionManager : TestExtensionManager<ITestLogger, ITestLoggerCapabilities>
+{
     /// <summary>
-    /// Manages loading and provides access to logging extensions implementing the
-    /// ITestLogger interface.
+    /// Initializes a new instance of the <see cref="TestLoggerExtensionManager"/> class.
     /// </summary>
-    internal class TestLoggerExtensionManager : TestExtensionManager<ITestLogger, ITestLoggerCapabilities>
+    /// <param name="unfilteredTestExtensions">
+    /// The unfiltered Test Extensions.
+    /// </param>
+    /// <param name="testExtensions">
+    /// The test Extensions.
+    /// </param>
+    /// <param name="logger">
+    /// The logger.
+    /// </param>
+    /// <remarks>
+    /// The constructor is not public because the factory method should be used to get instances of this class.
+    /// </remarks>
+    protected TestLoggerExtensionManager(
+        IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions,
+        IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> testExtensions,
+        IMessageLogger logger)
+        : base(unfilteredTestExtensions, testExtensions, logger)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestLoggerExtensionManager"/> class.
-        /// </summary>
-        /// <param name="unfilteredTestExtensions">
-        /// The unfiltered Test Extensions.
-        /// </param>
-        /// <param name="testExtensions">
-        /// The test Extensions.
-        /// </param>
-        /// <param name="logger">
-        /// The logger.
-        /// </param>
-        /// <remarks>
-        /// The constructor is not public because the factory method should be used to get instances of this class.
-        /// </remarks>
-        protected TestLoggerExtensionManager(
-            IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions,
-            IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> testExtensions,
-            IMessageLogger logger)
-            : base(unfilteredTestExtensions, testExtensions, logger)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets an instance of the TestLoggerExtensionManager.
-        /// </summary>
-        /// <param name="messageLogger">
-        /// The message Logger.
-        /// </param>
-        /// <returns>
-        /// The TestLoggerExtensionManager.
-        /// </returns>
-        public static TestLoggerExtensionManager Create(IMessageLogger messageLogger)
-        {
-            IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> filteredTestExtensions;
-            IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions;
+    /// <summary>
+    /// Gets an instance of the TestLoggerExtensionManager.
+    /// </summary>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    /// <returns>
+    /// The TestLoggerExtensionManager.
+    /// </returns>
+    public static TestLoggerExtensionManager Create(IMessageLogger messageLogger)
+    {
 
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestLoggerPluginInformation, ITestLogger, ITestLoggerCapabilities, TestLoggerMetadata>(
-                TestPlatformConstants.TestLoggerEndsWithPattern,
-                out unfilteredTestExtensions,
-                out filteredTestExtensions);
+        TestPluginManager.GetSpecificTestExtensions<TestLoggerPluginInformation, ITestLogger, ITestLoggerCapabilities, TestLoggerMetadata>(
+            TestPlatformConstants.TestLoggerEndsWithPattern,
+            out IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions,
+            out IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> filteredTestExtensions);
 
-            return new TestLoggerExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-        }
+        return new TestLoggerExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
     }
+}
 
+/// <summary>
+/// Hold data about the Test logger.
+/// </summary>
+public class TestLoggerMetadata : ITestLoggerCapabilities
+{
     /// <summary>
-    /// Hold data about the Test logger.
+    /// Constructor for TestLoggerMetadata
     /// </summary>
-    public class TestLoggerMetadata : ITestLoggerCapabilities
+    /// <param name="extension">
+    /// Uri identifying the logger.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    public TestLoggerMetadata(string extension, string friendlyName)
     {
-        /// <summary>
-        /// Constructor for TestLoggerMetadata
-        /// </summary>
-        /// <param name="extension">
-        /// Uri identifying the logger.
-        /// </param>
-        /// <param name="friendlyName">
-        /// The friendly Name.
-        /// </param>
-        public TestLoggerMetadata(string extension, string friendlyName)
-        {
-            this.ExtensionUri = extension;
-            this.FriendlyName = friendlyName;
-        }
+        ExtensionUri = extension;
+        FriendlyName = friendlyName;
+    }
 
-        /// <summary>
-        /// Gets Uri identifying the logger.
-        /// </summary>
-        public string ExtensionUri
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Uri identifying the logger.
+    /// </summary>
+    public string ExtensionUri
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets Friendly Name identifying the logger.
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Friendly Name identifying the logger.
+    /// </summary>
+    public string FriendlyName
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
index 5344b257ad..b7301292e3 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
@@ -1,586 +1,565 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
-{
+
 #if NETFRAMEWORK
-    using System.Threading;
+using System.Threading;
 #endif
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// The test plugin cache.
+/// </summary>
+/// <remarks>Making this a singleton to offer better unit testing.</remarks>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class TestPluginCache
+{
+    private readonly Dictionary<string, Assembly?> _resolvedAssemblies = new();
+
+    private List<string> _filterableExtensionPaths;
+    private List<string> _unfilterableExtensionPaths;
+
+    /// <summary>
+    /// Assembly resolver used to resolve the additional extensions
+    /// </summary>
+    private AssemblyResolver? _assemblyResolver;
 
     /// <summary>
-    /// The test plugin cache.
+    /// Lock for extensions update
     /// </summary>
-    /// <remarks>Making this a singleton to offer better unit testing.</remarks>
-    public class TestPluginCache
+    private readonly object _lockForExtensionsUpdate;
+
+    private static TestPluginCache? s_instance;
+
+    private readonly List<string> _defaultExtensionPaths = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestPluginCache"/> class.
+    /// </summary>
+    protected TestPluginCache()
     {
-        #region Private Members
+        _filterableExtensionPaths = new List<string>();
+        _unfilterableExtensionPaths = new List<string>();
+        _lockForExtensionsUpdate = new object();
+        TestExtensions = null;
+    }
 
-        private readonly Dictionary<string, Assembly> resolvedAssemblies;
+    [AllowNull]
+    public static TestPluginCache Instance
+    {
+        get
+        {
+            return s_instance ??= new TestPluginCache();
+        }
 
-        private List<string> filterableExtensionPaths;
-        private List<string> unfilterableExtensionPaths;
+        internal set
+        {
+            s_instance = value;
+        }
+    }
 
-        /// <summary>
-        /// Assembly resolver used to resolve the additional extensions
-        /// </summary>
-        private AssemblyResolver assemblyResolver;
+    /// <summary>
+    /// Gets the test extensions discovered by the cache until now.
+    /// </summary>
+    /// <remarks>Returns null if discovery of extensions is not done.</remarks>
+    internal TestExtensions? TestExtensions { get; private set; }
 
-        /// <summary>
-        /// Lock for extensions update
-        /// </summary>
-        private object lockForExtensionsUpdate;
+    /// <summary>
+    /// Gets a list of all extension paths filtered by input string.
+    /// </summary>
+    /// <param name="endsWithPattern">Pattern to filter extension paths.</param>
+    /// <param name="skipDefaultExtensions">True when default extensions should be skipped.</param>
+    public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultExtensions = false)
+    {
+        var extensions = GetFilteredExtensions(_filterableExtensionPaths, endsWithPattern);
 
-        private static TestPluginCache instance;
+        EqtTrace.Verbose(
+            "TestPluginCache.GetExtensionPaths: Filtered extension paths: {0}", string.Join(Environment.NewLine, extensions));
 
-        private List<string> defaultExtensionPaths = new List<string>();
+        if (!skipDefaultExtensions)
+        {
+            extensions = extensions.Concat(_defaultExtensionPaths);
+            EqtTrace.Verbose(
+                "TestPluginCache.GetExtensionPaths: Added default extension paths: {0}", string.Join(Environment.NewLine, _defaultExtensionPaths));
+        }
 
-        #endregion
+        EqtTrace.Verbose(
+            "TestPluginCache.GetExtensionPaths: Added unfilterableExtensionPaths: {0}", string.Join(Environment.NewLine, _unfilterableExtensionPaths));
 
-        #region Constructor
+        return extensions.Concat(_unfilterableExtensionPaths).ToList();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPluginCache"/> class.
-        /// </summary>
-        protected TestPluginCache()
+    /// <summary>
+    /// Performs discovery of specific type of test extensions in files ending with the specified pattern.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// Type of Plugin info.
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of extension.
+    /// </typeparam>
+    /// <param name="endsWithPattern">
+    /// Pattern used to select files using String.EndsWith
+    /// </param>
+    /// <returns>
+    /// The <see cref="Dictionary{TKey, TValue}"/>. of test plugin info.
+    /// </returns>
+    public Dictionary<string, TPluginInfo>? DiscoverTestExtensions<TPluginInfo, TExtension>(
+        string endsWithPattern)
+        where TPluginInfo : TestPluginInformation
+    {
+        EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: finding test extensions in assemblies ends with: {0} TPluginInfo: {1} TExtension: {2}", endsWithPattern, typeof(TPluginInfo), typeof(TExtension));
+        // Return the cached value if cache is valid.
+        if (TestExtensions != null && TestExtensions.AreTestExtensionsCached<TPluginInfo>())
         {
-            this.resolvedAssemblies = new Dictionary<string, Assembly>();
-            this.filterableExtensionPaths = new List<string>();
-            this.unfilterableExtensionPaths = new List<string>();
-            this.lockForExtensionsUpdate = new object();
-            this.TestExtensions = null;
+            return TestExtensions.GetTestExtensionCache<TPluginInfo>();
         }
 
-        #endregion
+        Dictionary<string, TPluginInfo>? pluginInfos;
+        SetupAssemblyResolver(null);
 
-        #region Public Properties
+        // Some times TestPlatform.core.dll assembly fails to load in the current appdomain (from devenv.exe).
+        // Reason for failures are not known. Below handler, again calls assembly.load() in failing assembly
+        // and that succeeds.
+        // Because of this assembly failure, below domain.CreateInstanceAndUnwrap() call fails with error
+        // "Unable to cast transparent proxy to type 'Microsoft.VisualStudio.TestPlatform.Core.TestPluginsFramework.TestPluginDiscoverer"
+        var platformAssemblyResolver = new PlatformAssemblyResolver();
+        platformAssemblyResolver.AssemblyResolve += CurrentDomainAssemblyResolve;
 
-        public static TestPluginCache Instance
+        try
         {
-            get
-            {
-                return instance ?? (instance = new TestPluginCache());
-            }
+            EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Discovering the extensions using extension path.");
 
-            internal set
-            {
-                instance = value;
-            }
-        }
+            // Combine all the possible extensions - both default and additional.
+            var allExtensionPaths = GetExtensionPaths(endsWithPattern);
 
-        /// <summary>
-        /// Gets the test extensions discovered by the cache until now.
-        /// </summary>
-        /// <remarks>Returns null if discovery of extensions is not done.</remarks>
-        internal TestExtensions TestExtensions { get; private set; }
+            EqtTrace.Verbose(
+                "TestPluginCache.DiscoverTestExtensions: Discovering the extensions using allExtensionPaths: {0}", string.Join(Environment.NewLine, allExtensionPaths));
 
-        #endregion
+            // Discover the test extensions from candidate assemblies.
+            pluginInfos = GetTestExtensions<TPluginInfo, TExtension>(allExtensionPaths);
 
-        #region Public Methods
+            TestExtensions ??= new TestExtensions();
 
-        /// <summary>
-        /// Gets a list of all extension paths filtered by input string.
-        /// </summary>
-        /// <param name="endsWithPattern">Pattern to filter extension paths.</param>
-        public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultExtensions = false)
-        {
-            var extensions = this.GetFilteredExtensions(this.filterableExtensionPaths, endsWithPattern);
+            TestExtensions.AddExtension(pluginInfos);
+
+            // Set the cache bool to true.
+            TestExtensions.SetTestExtensionsCacheStatusToTrue<TPluginInfo>();
 
             if (EqtTrace.IsVerboseEnabled)
             {
+                var extensionString = _filterableExtensionPaths != null
+                    ? string.Join(",", _filterableExtensionPaths.ToArray())
+                    : null;
                 EqtTrace.Verbose(
-                    "TestPluginCache.GetExtensionPaths: Filtered extension paths: {0}", string.Join(Environment.NewLine, extensions));
+                    "TestPluginCache: Discovered the extensions using extension path '{0}'.",
+                    extensionString);
             }
 
-            if (!skipDefaultExtensions)
+            LogExtensions();
+        }
+#if NETFRAMEWORK
+        catch (ThreadAbortException)
+        {
+            // Nothing to do here, we just do not want to do an EqtTrace.Fail for this thread
+            // being aborted as it is a legitimate exception to receive.
+            EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Data extension discovery is being aborted due to a thread abort.");
+            return null;
+        }
+#endif
+        catch (Exception e)
+        {
+            EqtTrace.Error("TestPluginCache: Discovery failed! {0}", e);
+            throw;
+        }
+        finally
+        {
+            if (platformAssemblyResolver != null)
             {
-                extensions = extensions.Concat(this.defaultExtensionPaths);
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose(
-                        "TestPluginCache.GetExtensionPaths: Added default extension paths: {0}", string.Join(Environment.NewLine, this.defaultExtensionPaths));
-                }
+                platformAssemblyResolver.AssemblyResolve -= CurrentDomainAssemblyResolve;
+                platformAssemblyResolver.Dispose();
             }
 
-            if (EqtTrace.IsVerboseEnabled)
+            // clear the assemblies
+            lock (_resolvedAssemblies)
             {
-                EqtTrace.Verbose(
-                    "TestPluginCache.GetExtensionPaths: Added unfilterableExtensionPaths: {0}", string.Join(Environment.NewLine, this.unfilterableExtensionPaths));
+                _resolvedAssemblies?.Clear();
             }
-
-            return extensions.Concat(this.unfilterableExtensionPaths).ToList();
         }
 
-        /// <summary>
-        /// Performs discovery of specific type of test extensions in files ending with the specified pattern.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// Type of Plugin info.
-        /// </typeparam>
-        /// <typeparam name="TExtension">
-        /// Type of extension.
-        /// </typeparam>
-        /// <param name="endsWithPattern">
-        /// Pattern used to select files using String.EndsWith
-        /// </param>
-        /// <returns>
-        /// The <see cref="Dictionary"/>. of test plugin info.
-        /// </returns>
-        public Dictionary<string, TPluginInfo> DiscoverTestExtensions<TPluginInfo, TExtension>(string endsWithPattern)
-            where TPluginInfo : TestPluginInformation
+        return pluginInfos;
+    }
+
+    /// <summary>
+    /// Use the parameter path to extensions
+    /// </summary>
+    /// <param name="additionalExtensionsPath">List of extension paths</param>
+    /// <param name="skipExtensionFilters">Skip extension name filtering (if true)</param>
+    public void UpdateExtensions(IEnumerable<string>? additionalExtensionsPath, bool skipExtensionFilters)
+    {
+        lock (_lockForExtensionsUpdate)
         {
-            EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: finding test extensions in assemblies ends with: {0} TPluginInfo: {1} TExtension: {2}", endsWithPattern, typeof(TPluginInfo), typeof(TExtension));
-            // Return the cached value if cache is valid.
-            if (this.TestExtensions != null && this.TestExtensions.AreTestExtensionsCached<TPluginInfo>())
+            EqtTrace.Verbose("TestPluginCache: Update extensions started. Skip filter = " + skipExtensionFilters);
+
+            var extensions = additionalExtensionsPath?.ToList();
+            if (extensions == null || extensions.Count == 0)
             {
-                return this.TestExtensions.GetTestExtensionCache<TPluginInfo>();
+                return;
             }
 
-            Dictionary<string, TPluginInfo> pluginInfos = null;
-            this.SetupAssemblyResolver(null);
-
-            // Some times TestPlatform.core.dll assembly fails to load in the current appdomain (from devenv.exe).
-            // Reason for failures are not known. Below handler, again calls assembly.load() in failing assembly
-            // and that succeeds.
-            // Because of this assembly failure, below domain.CreateInstanceAndUnwrap() call fails with error
-            // "Unable to cast transparent proxy to type 'Microsoft.VisualStudio.TestPlatform.Core.TestPluginsFramework.TestPluginDiscoverer"
-            var platformAssemblyResolver = new PlatformAssemblyResolver();
-            platformAssemblyResolver.AssemblyResolve += this.CurrentDomainAssemblyResolve;
-
-            try
+            if (skipExtensionFilters)
             {
-                EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Discovering the extensions using extension path.");
-
-                // Combine all the possible extensions - both default and additional.
-                var allExtensionPaths = this.GetExtensionPaths(endsWithPattern);
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose(
-                        "TestPluginCache.DiscoverTestExtensions: Discovering the extensions using allExtensionPaths: {0}", string.Join(Environment.NewLine, allExtensionPaths));
-                }
-
-                // Discover the test extensions from candidate assemblies.
-                pluginInfos = this.GetTestExtensions<TPluginInfo, TExtension>(allExtensionPaths);
-
-                if (this.TestExtensions == null)
-                {
-                    this.TestExtensions = new TestExtensions();
-                }
-
-                this.TestExtensions.AddExtension(pluginInfos);
-
-                // Set the cache bool to true.
-                this.TestExtensions.SetTestExtensionsCacheStatusToTrue<TPluginInfo>();
-
-                if (EqtTrace.IsVerboseEnabled)
+                // Add the extensions to un-filter list. These extensions will never be filtered
+                // based on file name (e.g. *.testadapter.dll etc.).
+                if (TryMergeExtensionPaths(_unfilterableExtensionPaths, extensions,
+                        out _unfilterableExtensionPaths))
                 {
-                    var extensionString = this.filterableExtensionPaths != null
-                                              ? string.Join(",", this.filterableExtensionPaths.ToArray())
-                                              : null;
-                    EqtTrace.Verbose(
-                        "TestPluginCache: Discovered the extensions using extension path '{0}'.",
-                        extensionString);
+                    // Set the extensions discovered to false so that the next time anyone tries
+                    // to get the additional extensions, we rediscover.
+                    TestExtensions?.InvalidateCache();
                 }
-
-                this.LogExtensions();
             }
-#if NETFRAMEWORK
-            catch (ThreadAbortException)
+            else
             {
-                // Nothing to do here, we just do not want to do an EqtTrace.Fail for this thread
-                // being aborted as it is a legitimate exception to receive.
-                if (EqtTrace.IsVerboseEnabled)
+                if (TryMergeExtensionPaths(_filterableExtensionPaths, extensions,
+                        out _filterableExtensionPaths))
                 {
-                    EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Data extension discovery is being aborted due to a thread abort.");
+                    TestExtensions?.InvalidateCache();
                 }
             }
-#endif
-            catch (Exception e)
-            {
-                EqtTrace.Error("TestPluginCache: Discovery failed! {0}", e);
-                throw;
-            }
-            finally
+
+            if (EqtTrace.IsVerboseEnabled)
             {
-                if (platformAssemblyResolver != null)
-                {
-                    platformAssemblyResolver.AssemblyResolve -= this.CurrentDomainAssemblyResolve;
-                    platformAssemblyResolver.Dispose();
-                }
+                var directories = _filterableExtensionPaths.Concat(_unfilterableExtensionPaths).Select(e => Path.GetDirectoryName(Path.GetFullPath(e))).Distinct();
+                var directoryString = string.Join(",", directories);
+                EqtTrace.Verbose(
+                    "TestPluginCache: Using directories for assembly resolution '{0}'.",
+                    directoryString);
 
-                // clear the assemblies
-                lock (this.resolvedAssemblies)
-                {
-                    this.resolvedAssemblies?.Clear();
-                }
+                var extensionString = string.Join(",", _filterableExtensionPaths.Concat(_unfilterableExtensionPaths));
+                EqtTrace.Verbose("TestPluginCache: Updated the available extensions to '{0}'.", extensionString);
             }
-
-            return pluginInfos;
         }
+    }
 
-        /// <summary>
-        /// Use the parameter path to extensions
-        /// </summary>
-        /// <param name="additionalExtensionsPath">List of extension paths</param>
-        /// <param name="skipExtensionFilters">Skip extension name filtering (if true)</param>
-        public void UpdateExtensions(IEnumerable<string> additionalExtensionsPath, bool skipExtensionFilters)
-        {
-            lock (this.lockForExtensionsUpdate)
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestPluginCache: Update extensions started. Skip filter = " + skipExtensionFilters);
-                }
-
-                var extensions = additionalExtensionsPath?.ToList();
-                if (extensions == null || extensions.Count == 0)
-                {
-                    return;
-                }
+    /// <summary>
+    /// Clear the previously cached extensions
+    /// </summary>
+    public void ClearExtensions()
+    {
+        _filterableExtensionPaths?.Clear();
+        _unfilterableExtensionPaths?.Clear();
+        TestExtensions?.InvalidateCache();
+    }
 
-                if (skipExtensionFilters)
-                {
-                    // Add the extensions to un-filter list. These extensions will never be filtered
-                    // based on file name (e.g. *.testadapter.dll etc.).
-                    if (TryMergeExtensionPaths(this.unfilterableExtensionPaths, extensions,
-                        out this.unfilterableExtensionPaths))
-                    {
-                        // Set the extensions discovered to false so that the next time anyone tries
-                        // to get the additional extensions, we rediscover.
-                        this.TestExtensions?.InvalidateCache();
-                    }
-                }
-                else
-                {
-                    if (TryMergeExtensionPaths(this.filterableExtensionPaths, extensions,
-                        out this.filterableExtensionPaths))
-                    {
-                        this.TestExtensions?.InvalidateCache();
-                    }
-                }
+    /// <summary>
+    /// Add search directories to assembly resolver
+    /// </summary>
+    /// <param name="directories"></param>
+    public void AddResolverSearchDirectories(string[] directories)
+    {
+        _assemblyResolver?.AddSearchDirectories(directories);
+    }
 
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    var directories = this.filterableExtensionPaths.Concat(this.unfilterableExtensionPaths).Select(e => Path.GetDirectoryName(Path.GetFullPath(e))).Distinct();
-                    var directoryString = string.Join(",", directories);
-                    EqtTrace.Verbose(
-                        "TestPluginCache: Using directories for assembly resolution '{0}'.",
-                        directoryString);
-
-                    var extensionString = string.Join(",", this.filterableExtensionPaths.Concat(this.unfilterableExtensionPaths));
-                    EqtTrace.Verbose("TestPluginCache: Updated the available extensions to '{0}'.", extensionString);
-                }
-            }
+    internal IEnumerable<string> DefaultExtensionPaths
+    {
+        get
+        {
+            return _defaultExtensionPaths;
         }
 
-        /// <summary>
-        /// Clear the previously cached extensions
-        /// </summary>
-        public void ClearExtensions()
+        set
         {
-            this.filterableExtensionPaths?.Clear();
-            this.unfilterableExtensionPaths?.Clear();
-            this.TestExtensions?.InvalidateCache();
+            if (value != null)
+            {
+                _defaultExtensionPaths.AddRange(value);
+            }
         }
+    }
 
-        /// <summary>
-        /// Add search directories to assembly resolver
-        /// </summary>
-        /// <param name="directories"></param>
-        public void AddResolverSearchDirectories(string[] directories)
+    /// <summary>
+    /// The get test extensions.
+    /// </summary>
+    /// <param name="extensionAssembly">
+    /// The extension assembly.
+    /// </param>
+    /// <param name="skipCache">
+    /// Skip the extensions cache.
+    /// </param>
+    /// <typeparam name="TPluginInfo">
+    /// Type of Test plugin info.
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of extension.
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Dictionary{TKey, TValue>"/>.
+    /// </returns>
+    internal Dictionary<string, TPluginInfo> GetTestExtensions<TPluginInfo, TExtension>(
+        string extensionAssembly,
+        bool skipCache = false)
+        where TPluginInfo : TestPluginInformation
+    {
+        if (skipCache)
         {
-            assemblyResolver.AddSearchDirectories(directories);
+            return GetTestExtensions<TPluginInfo, TExtension>(new List<string>() { extensionAssembly });
         }
 
-        #endregion
-
-        #region Utility methods
+        // Check if extensions from this assembly have already been discovered.
+        var extensions = TestExtensions.GetExtensionsDiscoveredFromAssembly(
+            TestExtensions?.GetTestExtensionCache<TPluginInfo>(),
+            extensionAssembly);
 
-        internal IEnumerable<string> DefaultExtensionPaths
+        if (extensions?.Count > 0)
         {
-            get
-            {
-                return this.defaultExtensionPaths;
-            }
-
-            set
-            {
-                if (value != null)
-                {
-                    this.defaultExtensionPaths.AddRange(value);
-                }
-            }
+            return extensions;
         }
 
-        /// <summary>
-        /// The get test extensions.
-        /// </summary>
-        /// <param name="extensionAssembly">
-        /// The extension assembly.
-        /// </param>
-        /// <typeparam name="TPluginInfo">
-        /// Type of Test plugin info.
-        /// </typeparam>
-        /// <typeparam name="TExtension">
-        /// Type of extension.
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Dictionary"/>.
-        /// </returns>
-        internal Dictionary<string, TPluginInfo> GetTestExtensions<TPluginInfo, TExtension>(string extensionAssembly) where TPluginInfo : TestPluginInformation
-        {
-            // Check if extensions from this assembly have already been discovered.
-            var extensions = this.TestExtensions?.GetExtensionsDiscoveredFromAssembly<TPluginInfo>(
-                this.TestExtensions.GetTestExtensionCache<TPluginInfo>(),
-                extensionAssembly);
+        var pluginInfos = GetTestExtensions<TPluginInfo, TExtension>(new List<string>() { extensionAssembly });
 
-            if (extensions != null)
-            {
-                return extensions;
-            }
+        // Add extensions discovered to the cache.
+        TestExtensions ??= new TestExtensions();
 
-            var pluginInfos = this.GetTestExtensions<TPluginInfo, TExtension>(new List<string>() { extensionAssembly });
+        TestExtensions.AddExtension(pluginInfos);
 
-            // Add extensions discovered to the cache.
-            if (this.TestExtensions == null)
-            {
-                this.TestExtensions = new TestExtensions();
-            }
+        return pluginInfos;
+    }
 
-            this.TestExtensions.AddExtension<TPluginInfo>(pluginInfos);
-            return pluginInfos;
-        }
+    /// <summary>
+    /// Gets the resolution paths for the extension assembly to facilitate assembly resolution.
+    /// </summary>
+    /// <param name="extensionAssembly">The extension assembly.</param>
+    /// <returns>Resolution paths for the assembly.</returns>
+    internal static IList<string> GetResolutionPaths(string extensionAssembly)
+    {
+        var resolutionPaths = new List<string>();
+
+        var extensionDirectory = Path.GetDirectoryName(Path.GetFullPath(extensionAssembly))!;
+        resolutionPaths.Add(extensionDirectory);
 
-        /// <summary>
-        /// Gets the resolution paths for the extension assembly to facilitate assembly resolution.
-        /// </summary>
-        /// <param name="extensionAssembly">The extension assembly.</param>
-        /// <returns>Resolution paths for the assembly.</returns>
-        internal IList<string> GetResolutionPaths(string extensionAssembly)
+        var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).Assembly.GetAssemblyLocation())!;
+        if (!resolutionPaths.Contains(currentDirectory))
         {
-            var resolutionPaths = new List<string>();
+            resolutionPaths.Add(currentDirectory);
+        }
 
-            var extensionDirectory = Path.GetDirectoryName(Path.GetFullPath(extensionAssembly));
-            resolutionPaths.Add(extensionDirectory);
+        return resolutionPaths;
+    }
 
-            var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).GetTypeInfo().Assembly.GetAssemblyLocation());
-            if (!resolutionPaths.Contains(currentDirectory))
-            {
-                resolutionPaths.Add(currentDirectory);
-            }
+    /// <summary>
+    /// Gets the default set of resolution paths for the assembly resolution
+    /// </summary>
+    /// <returns>List of paths.</returns>
+    internal IList<string> GetDefaultResolutionPaths()
+    {
+        var resolutionPaths = new List<string>();
 
-            return resolutionPaths;
+        // Add the extension directories for assembly resolution
+        var extensionDirectories = GetExtensionPaths(string.Empty).Select(e => Path.GetDirectoryName(Path.GetFullPath(e))!).Distinct().ToList();
+        if (extensionDirectories.Count != 0)
+        {
+            resolutionPaths.AddRange(extensionDirectories);
         }
 
-        /// <summary>
-        /// Gets the default set of resolution paths for the assembly resolution
-        /// </summary>
-        /// <returns>List of paths.</returns>
-        internal IList<string> GetDefaultResolutionPaths()
+        // Keep current directory for resolution
+        var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).Assembly.GetAssemblyLocation())!;
+        if (!resolutionPaths.Contains(currentDirectory))
         {
-            var resolutionPaths = new List<string>();
-
-            // Add the extension directories for assembly resolution
-            var extensionDirectories = this.GetExtensionPaths(string.Empty).Select(e => Path.GetDirectoryName(Path.GetFullPath(e))).Distinct().ToList();
-            if (extensionDirectories.Any())
-            {
-                resolutionPaths.AddRange(extensionDirectories);
-            }
-
-            // Keep current directory for resolution
-            var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).GetTypeInfo().Assembly.GetAssemblyLocation());
-            if (!resolutionPaths.Contains(currentDirectory))
-            {
-                resolutionPaths.Add(currentDirectory);
-            }
-
-            // If running in Visual Studio context, add well known directories for resolution
-            var installContext = new InstallationContext(new FileHelper());
-            if (installContext.TryGetVisualStudioDirectory(out string vsInstallPath))
-            {
-                resolutionPaths.AddRange(installContext.GetVisualStudioCommonLocations(vsInstallPath));
-            }
-
-            return resolutionPaths;
+            resolutionPaths.Add(currentDirectory);
         }
 
-        /// <summary>
-        /// Get the files which match the regex pattern
-        /// </summary>
-        /// <param name="extensions">
-        /// The extensions.
-        /// </param>
-        /// <param name="endsWithPattern">
-        /// Pattern used to select files using String.EndsWith
-        /// </param>
-        /// <returns>
-        /// The list of files which match the regex pattern
-        /// </returns>
-        protected virtual IEnumerable<string> GetFilteredExtensions(List<string> extensions, string endsWithPattern)
+        // If running in Visual Studio context, add well known directories for resolution
+        var installContext = new InstallationContext(new FileHelper());
+        if (installContext.TryGetVisualStudioDirectory(out string vsInstallPath))
         {
-            if (string.IsNullOrEmpty(endsWithPattern))
-            {
-                return extensions;
-            }
-
-            return extensions.Where(ext => ext.EndsWith(endsWithPattern, StringComparison.OrdinalIgnoreCase));
+            resolutionPaths.AddRange(installContext.GetVisualStudioCommonLocations(vsInstallPath));
         }
 
-        private static bool TryMergeExtensionPaths(List<string> extensionsList, List<string> additionalExtensions, out List<string> mergedExtensionsList)
-        {
-            if (additionalExtensions.Count == extensionsList.Count && additionalExtensions.All(extensionsList.Contains))
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    var extensionString = string.Join(",", extensionsList);
-                    EqtTrace.Verbose(
-                        "TestPluginCache: Ignoring extensions merge as there is no change. Current additionalExtensions are '{0}'.",
-                        extensionString);
-                }
+        return resolutionPaths;
+    }
 
-                mergedExtensionsList = extensionsList;
-                return false;
-            }
+    /// <summary>
+    /// Get the files which match the regex pattern
+    /// </summary>
+    /// <param name="extensions">
+    /// The extensions.
+    /// </param>
+    /// <param name="endsWithPattern">
+    /// Pattern used to select files using String.EndsWith
+    /// </param>
+    /// <returns>
+    /// The list of files which match the regex pattern
+    /// </returns>
+    protected virtual IEnumerable<string> GetFilteredExtensions(List<string> extensions, string endsWithPattern)
+    {
+        return endsWithPattern.IsNullOrEmpty()
+            ? extensions
+            : extensions.Where(ext => ext.EndsWith(endsWithPattern, StringComparison.OrdinalIgnoreCase));
+    }
 
-            // Don't do a strict check for existence of the extension path. The extension paths may or may
-            // not exist on the disk. In case of .net core, the paths are relative to the nuget packages
-            // directory. The path to nuget directory is automatically setup for CLR to resolve.
-            // Test platform tries to load every extension by assembly name. If it is not resolved, we don't throw
-            // an error.
-            additionalExtensions.AddRange(extensionsList);
-            mergedExtensionsList = additionalExtensions.Select(Path.GetFullPath)
-                .Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+    private static bool TryMergeExtensionPaths(List<string> extensionsList, List<string> additionalExtensions, out List<string> mergedExtensionsList)
+    {
+        if (additionalExtensions.Count == extensionsList.Count && additionalExtensions.All(extensionsList.Contains))
+        {
+            EqtTrace.Verbose(
+                "TestPluginCache: Ignoring extensions merge as there is no change. Current additionalExtensions are '{0}'.",
+                string.Join(",", extensionsList));
 
-            return true;
+            mergedExtensionsList = extensionsList;
+            return false;
         }
 
-        /// <summary>
-        /// Gets the test extensions defined in the extension assembly list.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// Type of PluginInfo.
-        /// </typeparam>
-        /// <typeparam name="TExtension">
-        /// Type of Extension.
-        /// </typeparam>
-        /// <param name="extensionPaths">
-        /// Extension assembly paths.
-        /// </param>
-        /// <returns>
-        /// List of extensions.
-        /// </returns>
-        /// <remarks>
-        /// Added to mock out dependency from the actual test plugin discovery as such.
-        /// </remarks>
-        private Dictionary<string, TPluginInfo> GetTestExtensions<TPluginInfo, TExtension>(IEnumerable<string> extensionPaths) where TPluginInfo : TestPluginInformation
-        {
-            foreach (var extensionPath in extensionPaths)
-            {
-                this.SetupAssemblyResolver(extensionPath);
-            }
-
-            var discoverer = new TestPluginDiscoverer();
+        // Don't do a strict check for existence of the extension path. The extension paths may or may
+        // not exist on the disk. In case of .net core, the paths are relative to the nuget packages
+        // directory. The path to nuget directory is automatically setup for CLR to resolve.
+        // Test platform tries to load every extension by assembly name. If it is not resolved, we don't throw
+        // an error.
+        additionalExtensions.AddRange(extensionsList);
+        mergedExtensionsList = additionalExtensions.Select(Path.GetFullPath)
+            .Distinct(StringComparer.OrdinalIgnoreCase).ToList();
 
-            return discoverer.GetTestExtensionsInformation<TPluginInfo, TExtension>(extensionPaths);
-        }
+        return true;
+    }
 
-        protected void SetupAssemblyResolver(string extensionAssembly)
+    /// <summary>
+    /// Gets the test extensions defined in the extension assembly list.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// Type of PluginInfo.
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of Extension.
+    /// </typeparam>
+    /// <param name="extensionPaths">
+    /// Extension assembly paths.
+    /// </param>
+    /// <returns>
+    /// List of extensions.
+    /// </returns>
+    /// <remarks>
+    /// Added to mock out dependency from the actual test plugin discovery as such.
+    /// </remarks>
+    private Dictionary<string, TPluginInfo> GetTestExtensions<TPluginInfo, TExtension>(IEnumerable<string> extensionPaths) where TPluginInfo : TestPluginInformation
+    {
+        foreach (var extensionPath in extensionPaths)
         {
-            IList<string> resolutionPaths;
+            SetupAssemblyResolver(extensionPath);
+        }
 
-            if (string.IsNullOrEmpty(extensionAssembly))
-            {
-                resolutionPaths = this.GetDefaultResolutionPaths();
-            }
-            else
-            {
-                resolutionPaths = this.GetResolutionPaths(extensionAssembly);
-            }
+        return TestPluginDiscoverer.GetTestExtensionsInformation<TPluginInfo, TExtension>(extensionPaths);
+    }
 
-            // Add assembly resolver which can resolve the extensions from the specified directory.
-            if (this.assemblyResolver == null)
-            {
-                this.assemblyResolver = new AssemblyResolver(resolutionPaths);
-            }
-            else
-            {
-                this.assemblyResolver.AddSearchDirectories(resolutionPaths);
-            }
+    protected void SetupAssemblyResolver(string? extensionAssembly)
+    {
+        // If we don't load the resource for Microsoft.TestPlatform.Common before
+        // to set the assembly resolver we won't be able to use the resources.
+        // This should be the algorithm followed during the satellite assembly resolution
+        // https://learn.microsoft.com/dotnet/core/extensions/package-and-deploy-resources#net-framework-resource-fallback-process
+        // BUT for some unknown reason the point 10 is not working as explained.
+        // Satellite resolution should fallback to the NeutralResourcesLanguageAttribute
+        // that we set to en-US but don't and we fail with FileNotFoundException.
+        _ = Resources.Resources.FailedToLoadAdapaterFile;
+
+        IList<string> resolutionPaths = extensionAssembly.IsNullOrEmpty()
+            ? GetDefaultResolutionPaths()
+            : GetResolutionPaths(extensionAssembly);
+
+        // Add assembly resolver which can resolve the extensions from the specified directory.
+        if (_assemblyResolver == null)
+        {
+            _assemblyResolver = new AssemblyResolver(resolutionPaths);
         }
-
-        private Assembly CurrentDomainAssemblyResolve(object sender, AssemblyResolveEventArgs args)
+        else
         {
-            var assemblyName = new AssemblyName(args.Name);
+            _assemblyResolver.AddSearchDirectories(resolutionPaths);
+        }
+    }
+
+    private Assembly? CurrentDomainAssemblyResolve(object? sender, AssemblyResolveEventArgs? args)
+    {
+        // TODO: Avoid ArgumentNullException
+        var assemblyName = new AssemblyName(args?.Name!);
+        TPDebug.Assert(args?.Name is not null);
 
-            Assembly assembly = null;
-            lock (this.resolvedAssemblies)
+        Assembly? assembly = null;
+        lock (_resolvedAssemblies)
+        {
+            try
             {
-                try
-                {
-                    EqtTrace.Verbose("CurrentDomainAssemblyResolve: Resolving assembly '{0}'.", args.Name);
+                EqtTrace.Verbose("CurrentDomainAssemblyResolve: Resolving assembly '{0}'.", args.Name);
 
-                    if (this.resolvedAssemblies.TryGetValue(args.Name, out assembly))
-                    {
-                        return assembly;
-                    }
+                if (_resolvedAssemblies.TryGetValue(args.Name, out assembly))
+                {
+                    return assembly;
+                }
 
-                    // Put it in the resolved assembly so that if below Assembly.Load call
-                    // triggers another assembly resolution, then we don't end up in stack overflow
-                    this.resolvedAssemblies[args.Name] = null;
+                // Put it in the resolved assembly so that if below Assembly.Load call
+                // triggers another assembly resolution, then we don't end up in stack overflow
+                _resolvedAssemblies[args.Name] = null;
 
-                    assembly = Assembly.Load(assemblyName);
+                assembly = Assembly.Load(assemblyName);
 
-                    // Replace the value with the loaded assembly
-                    this.resolvedAssemblies[args.Name] = assembly;
+                // Replace the value with the loaded assembly
+                _resolvedAssemblies[args.Name] = assembly;
 
-                    return assembly;
-                }
-                finally
+                return assembly;
+            }
+            finally
+            {
+                if (assembly == null)
                 {
-                    if (assembly == null)
-                    {
-                        EqtTrace.Verbose("CurrentDomainAssemblyResolve: Failed to resolve assembly '{0}'.", args.Name);
-                    }
+                    EqtTrace.Verbose("CurrentDomainAssemblyResolve: Failed to resolve assembly '{0}'.", args.Name);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Log the extensions
-        /// </summary>
-        private void LogExtensions()
+    /// <summary>
+    /// Log the extensions
+    /// </summary>
+    private void LogExtensions()
+    {
+        if (!EqtTrace.IsVerboseEnabled)
         {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                var discoverers = this.TestExtensions.TestDiscoverers != null ? string.Join(",", this.TestExtensions.TestDiscoverers.Keys.ToArray()) : null;
-                EqtTrace.Verbose("TestPluginCache: Discoverers are '{0}'.", discoverers);
+            return;
+        }
 
-                var executors = this.TestExtensions.TestExecutors != null ? string.Join(",", this.TestExtensions.TestExecutors.Keys.ToArray()) : null;
-                EqtTrace.Verbose("TestPluginCache: Executors are '{0}'.", executors);
+        TPDebug.Assert(TestExtensions is not null, "TestExtensions is null");
 
-                var executors2 = this.TestExtensions.TestExecutors2 != null ? string.Join(",", this.TestExtensions.TestExecutors2.Keys.ToArray()) : null;
-                EqtTrace.Verbose("TestPluginCache: Executors2 are '{0}'.", executors2);
+        var discoverers = TestExtensions.TestDiscoverers != null ? string.Join(",", TestExtensions.TestDiscoverers.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: Discoverers are '{0}'.", discoverers);
 
-                var settingsProviders = this.TestExtensions.TestSettingsProviders != null ? string.Join(",", this.TestExtensions.TestSettingsProviders.Keys.ToArray()) : null;
-                EqtTrace.Verbose("TestPluginCache: Setting providers are '{0}'.", settingsProviders);
+        var executors = TestExtensions.TestExecutors != null ? string.Join(",", TestExtensions.TestExecutors.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: Executors are '{0}'.", executors);
 
-                var loggers = this.TestExtensions.TestLoggers != null ? string.Join(",", this.TestExtensions.TestLoggers.Keys.ToArray()) : null;
-                EqtTrace.Verbose("TestPluginCache: Loggers are '{0}'.", loggers);
-            }
-        }
+        var executors2 = TestExtensions.TestExecutors2 != null ? string.Join(",", TestExtensions.TestExecutors2.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: Executors2 are '{0}'.", executors2);
+
+        var settingsProviders = TestExtensions.TestSettingsProviders != null ? string.Join(",", TestExtensions.TestSettingsProviders.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: Setting providers are '{0}'.", settingsProviders);
 
-        #endregion
+        var loggers = TestExtensions.TestLoggers != null ? string.Join(",", TestExtensions.TestLoggers.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: Loggers are '{0}'.", loggers);
+
+        var testhosts = TestExtensions.TestHosts != null ? string.Join(",", TestExtensions.TestHosts.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: TestHosts are '{0}'.", testhosts);
+
+        var dataCollectors = TestExtensions.DataCollectors != null ? string.Join(",", TestExtensions.DataCollectors.Keys.ToArray()) : null;
+        EqtTrace.Verbose("TestPluginCache: DataCollectors are '{0}'.", dataCollectors);
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
index f08f565394..5c0cdf8354 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
@@ -1,251 +1,244 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Discovers test extensions in a directory.
+/// </summary>
+internal static class TestPluginDiscoverer
 {
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-  
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using CommonResources = Resources.Resources;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+    private static readonly HashSet<string> UnloadableFiles = new();
 
     /// <summary>
-    /// Discovers test extensions in a directory.
+    /// Gets information about each of the test extensions available.
     /// </summary>
-    internal class TestPluginDiscoverer
+    /// <param name="extensionPaths">
+    ///     The path to the extensions.
+    /// </param>
+    /// <returns>
+    /// A dictionary of assembly qualified name and test plugin information.
+    /// </returns>
+    public static Dictionary<string, TPluginInfo> GetTestExtensionsInformation<TPluginInfo, TExtension>(IEnumerable<string> extensionPaths) where TPluginInfo : TestPluginInformation
     {
-        private static HashSet<string> UnloadableFiles = new HashSet<string>();
+        TPDebug.Assert(extensionPaths != null);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestPluginDiscoverer"/> class.
-        /// </summary>
-        public TestPluginDiscoverer()
+        var pluginInfos = new Dictionary<string, TPluginInfo>();
+
+        // C++ UWP adapters do not follow TestAdapater naming convention, so making this exception
+        if (!extensionPaths.Any())
         {
+            AddKnownExtensions(ref extensionPaths);
         }
 
-        #region Fields
-
-#if WINDOWS_UAP
-        private static HashSet<string> platformAssemblies = new HashSet<string>(new string[] {
-            "MICROSOFT.VISUALSTUDIO.TESTPLATFORM.UNITTESTFRAMEWORK.DLL",
-            "MICROSOFT.VISUALSTUDIO.TESTPLATFORM.TESTEXECUTOR.CORE.DLL",
-            "MICROSOFT.VISUALSTUDIO.TESTPLATFORM.OBJECTMODEL.DLL",
-            "VSTEST_EXECUTIONENGINE_PLATFORMBRIDGE.DLL",
-            "VSTEST_EXECUTIONENGINE_PLATFORMBRIDGE.WINMD",
-            "VSTEST.EXECUTIONENGINE.WINDOWSPHONE.DLL",
-            "MICROSOFT.CSHARP.DLL",
-            "MICROSOFT.VISUALBASIC.DLL",
-            "CLRCOMPRESSION.DLL",
-        });
-
-        private const string SYSTEM_ASSEMBLY_PREFIX = "system.";
-#endif
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Gets information about each of the test extensions available.
-        /// </summary>
-        /// <param name="extensionPaths">
-        ///     The path to the extensions.
-        /// </param>
-        /// <returns>
-        /// A dictionary of assembly qualified name and test plugin information.
-        /// </returns>
-        public Dictionary<string, TPluginInfo> GetTestExtensionsInformation<TPluginInfo, TExtension>(IEnumerable<string> extensionPaths) where TPluginInfo : TestPluginInformation
-        {
-            Debug.Assert(extensionPaths != null);
+        GetTestExtensionsFromFiles<TPluginInfo, TExtension>(extensionPaths.ToArray(), pluginInfos);
 
-            var pluginInfos = new Dictionary<string, TPluginInfo>();
+        return pluginInfos;
+    }
 
-            // C++ UWP adapters do not follow TestAdapater naming convention, so making this exception
-            if (!extensionPaths.Any())
-            {
-                this.AddKnownExtensions(ref extensionPaths);
-            }
+    private static void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
+    {
+        // For C++ UWP adapter, & OLD C# UWP(MSTest V1) adapter
+        // In UWP .Net Native Compilation mode managed dll's are packaged differently, & File.Exists() fails.
+        // Include these two dll's if so far no adapters(extensions) were found, & let Assembly.Load() fail if they are not present.
+        extensionPaths = extensionPaths.Concat(new[] { "Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll" });
+    }
 
-            this.GetTestExtensionsFromFiles<TPluginInfo, TExtension>(extensionPaths.ToArray(), pluginInfos);
+    /// <summary>
+    /// Gets test extension information from the given collection of files.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// Type of Test Plugin Information.
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of extension.
+    /// </typeparam>
+    /// <param name="files">
+    /// List of dll's to check for test extension availability
+    /// </param>
+    /// <param name="pluginInfos">
+    /// Test plugins collection to add to.
+    /// </param>
+    private static void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(
+        string[] files,
+        Dictionary<string, TPluginInfo> pluginInfos)
+        where TPluginInfo : TestPluginInformation
+    {
+        TPDebug.Assert(files != null, "null files");
+        TPDebug.Assert(pluginInfos != null, "null pluginInfos");
 
-            return pluginInfos;
+        // Scan each of the files for data extensions.
+        foreach (var file in files)
+        {
+            if (UnloadableFiles.Contains(file))
+            {
+                continue;
+            }
+            try
+            {
+                var assemblyName = Path.GetFileNameWithoutExtension(file);
+                var assembly = Assembly.Load(new AssemblyName(assemblyName));
+                if (assembly != null)
+                {
+                    GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos, file);
+                }
+            }
+            catch (FileLoadException e)
+            {
+                EqtTrace.Warning("TestPluginDiscoverer-FileLoadException: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
+                string fileLoadErrorMessage = string.Format(CultureInfo.CurrentCulture, CommonResources.FailedToLoadAdapaterFile, file);
+                TestSessionMessageLogger.Instance.SendMessage(TestMessageLevel.Warning, fileLoadErrorMessage);
+                UnloadableFiles.Add(file);
+            }
+            catch (Exception e)
+            {
+                EqtTrace.Warning("TestPluginDiscoverer: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
+            }
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets test extensions from a given assembly.
+    /// </summary>
+    /// <param name="assembly">Assembly to check for test extension availability</param>
+    /// <param name="pluginInfos">Test extensions collection to add to.</param>
+    /// <param name="filePath">File path of the assembly.</param>
+    /// <typeparam name="TPluginInfo">
+    /// Type of Test Plugin Information.
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of Extensions.
+    /// </typeparam>
+    private static void GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(Assembly assembly, Dictionary<string, TPluginInfo> pluginInfos, string filePath)
+        where TPluginInfo : TestPluginInformation
+    {
+        TPDebug.Assert(assembly != null, "null assembly");
+        TPDebug.Assert(pluginInfos != null, "null pluginInfos");
 
-        #region Private Methods
+        List<Type> types = new();
+        Type extension = typeof(TExtension);
 
-        private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
+        try
         {
-            // For C++ UWP adapter, & OLD C# UWP(MSTest V1) adapter
-            // In UWP .Net Native Compilation mode managed dll's are packaged differently, & File.Exists() fails.
-            // Include these two dll's if so far no adapters(extensions) were found, & let Assembly.Load() fail if they are not present.
-            extensionPaths = extensionPaths.Concat(new[] { "Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll" });
+            var discoveredExtensions = MetadataReaderExtensionsHelper.DiscoverTestExtensionTypesV2Attribute(assembly, filePath);
+            if (discoveredExtensions?.Length > 0)
+            {
+                types.AddRange(discoveredExtensions);
+            }
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Warning("TestPluginDiscoverer: Failed to get types searching for 'TestPlatformExtensionVersionAttribute' from assembly '{0}'. Error: {1}", assembly.FullName, e.ToString());
         }
 
-        /// <summary>
-        /// Gets test extension information from the given collection of files.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// Type of Test Plugin Information.
-        /// </typeparam>
-        /// <typeparam name="TExtension">
-        /// Type of extension.
-        /// </typeparam>
-        /// <param name="files">
-        /// List of dll's to check for test extension availability
-        /// </param>
-        /// <param name="pluginInfos">
-        /// Test plugins collection to add to.
-        /// </param>
-        private void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(
-            string[] files,
-            Dictionary<string, TPluginInfo> pluginInfos) where TPluginInfo : TestPluginInformation
+        try
         {
-            Debug.Assert(files != null, "null files");
-            Debug.Assert(pluginInfos != null, "null pluginInfos");
+            var typesToLoad = TypesToLoadUtilities.GetTypesToLoad(assembly);
+            if (typesToLoad?.Any() == true)
+            {
+                types.AddRange(typesToLoad);
+            }
 
-            // Scan each of the files for data extensions.
-            foreach (var file in files)
+            if (types.Count == 0)
             {
-                if (UnloadableFiles.Contains(file))
-                {
-                    continue;
-                }
-                try
-                {
-                    Assembly assembly = null;
-                    var assemblyName = Path.GetFileNameWithoutExtension(file);
-                    assembly = Assembly.Load(new AssemblyName(assemblyName));
-                    if (assembly != null)
-                    {
-                        this.GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos);
-                    }
-                }
-                catch (FileLoadException e)
-                {
-                    EqtTrace.Warning("TestPluginDiscoverer-FileLoadException: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
-                    string fileLoadErrorMessage = string.Format(CultureInfo.CurrentUICulture, CommonResources.FailedToLoadAdapaterFile, file);
-                    TestSessionMessageLogger.Instance.SendMessage(TestMessageLevel.Warning, fileLoadErrorMessage);
-                    UnloadableFiles.Add(file);
-                }
-                catch (Exception e)
-                {
-                    EqtTrace.Warning("TestPluginDiscoverer: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
-                }
+                types.AddRange(assembly.GetTypes().Where(type => type.IsClass && !type.IsAbstract));
             }
         }
-
-        /// <summary>
-        /// Gets test extensions from a given assembly.
-        /// </summary>
-        /// <param name="assembly">Assembly to check for test extension availability</param>
-        /// <param name="pluginInfos">Test extensions collection to add to.</param>
-        /// <typeparam name="TPluginInfo">
-        /// Type of Test Plugin Information.
-        /// </typeparam>
-        /// <typeparam name="TExtension">
-        /// Type of Extensions.
-        /// </typeparam>
-        private void GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(Assembly assembly, Dictionary<string, TPluginInfo> pluginInfos) where TPluginInfo : TestPluginInformation
+        catch (ReflectionTypeLoadException e)
         {
-            Debug.Assert(assembly != null, "null assembly");
-            Debug.Assert(pluginInfos != null, "null pluginInfos");
-            IEnumerable<Type> types;
-            Type extension = typeof(TExtension);
+            EqtTrace.Warning("TestPluginDiscoverer: Failed to get types from assembly '{0}'. Error: {1}", assembly.FullName, e.ToString());
 
-            try
+            if (e.Types?.Length > 0)
             {
-                types = TypesToLoadUtilities.GetTypesToLoad(assembly);
-
-                if (!types.Any())
-                {
-                    types = assembly.GetTypes().Where(type => type.GetTypeInfo().IsClass && !type.GetTypeInfo().IsAbstract);
-                }
+                // Unloaded types on e.Types are null, make sure we skip them.
+                types.AddRange(e.Types.Where(type => type != null && type.IsClass && !type.IsAbstract)!);
             }
-            catch (ReflectionTypeLoadException e)
-            {
-                EqtTrace.Warning("TestPluginDiscoverer: Failed to get types from assembly '{0}'.  Skipping test extension scan for this assembly.  Error: {1}", assembly.FullName, e.ToString());
 
-                if (e.LoaderExceptions != null)
+            if (e.LoaderExceptions != null)
+            {
+                foreach (var ex in e.LoaderExceptions)
                 {
-                    foreach (var ex in e.LoaderExceptions)
-                    {
-                        EqtTrace.Warning("LoaderExceptions: {0}", ex);
-                    }
+                    EqtTrace.Warning("LoaderExceptions: {0}", ex);
                 }
-                return;
             }
+        }
 
-            if (types != null && types.Any())
+        if (types != null && types.Count != 0)
+        {
+            foreach (var type in types)
             {
-                foreach (var type in types)
-                {
-                    GetTestExtensionFromType(type, extension, pluginInfos);
-                }
+                GetTestExtensionFromType(type, extension, pluginInfos, filePath);
             }
         }
+    }
 
-        /// <summary>
-        /// Attempts to find a test extension from given type.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// Type of the test plugin information
-        /// </typeparam>
-        /// <param name="type">
-        /// Type to inspect for being test extension
-        /// </param>
-        /// <param name="extensionType">
-        /// Test extension type to look for.
-        /// </param>
-        /// <param name="extensionCollection">
-        /// Test extensions collection to add to.
-        /// </param>
-        private void GetTestExtensionFromType<TPluginInfo>(
-            Type type,
-            Type extensionType,
-            Dictionary<string, TPluginInfo> extensionCollection)
-            where TPluginInfo : TestPluginInformation
+    /// <summary>
+    /// Attempts to find a test extension from given type.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// Type of the test plugin information
+    /// </typeparam>
+    /// <param name="type">
+    /// Type to inspect for being test extension
+    /// </param>
+    /// <param name="extensionType">
+    /// Test extension type to look for.
+    /// </param>
+    /// <param name="extensionCollection">
+    /// Test extensions collection to add to.
+    /// </param>
+    /// <param name="filePath">File path of the assembly.</param>
+    private static void GetTestExtensionFromType<TPluginInfo>(
+        Type type,
+        Type extensionType,
+        Dictionary<string, TPluginInfo> extensionCollection,
+        string filePath)
+        where TPluginInfo : TestPluginInformation
+    {
+        if (!extensionType.IsAssignableFrom(type))
         {
-            if (extensionType.GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()))
-            {
-                var rawPluginInfo = Activator.CreateInstance(typeof(TPluginInfo), type);
-                var pluginInfo = (TPluginInfo)rawPluginInfo;
+            return;
+        }
 
-                if (pluginInfo == null || pluginInfo.IdentifierData == null)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error(
-                        "TryGetTestExtensionFromType: Either PluginInformation is null or PluginInformation doesn't contain IdentifierData for type {0}.", type.FullName);
-                    }
-                    return;
-                }
+        var rawPluginInfo = Activator.CreateInstance(typeof(TPluginInfo), type);
+        TPDebug.Assert(rawPluginInfo is TPluginInfo, "rawPluginInfo is not of type TPluginInfo");
+        var pluginInfo = (TPluginInfo)rawPluginInfo;
+        pluginInfo.FilePath = filePath;
 
-                if (extensionCollection.ContainsKey(pluginInfo.IdentifierData))
-                {
-                    EqtTrace.Warning(
-                    "TryGetTestExtensionFromType: Discovered multiple test extensions with identifier data '{0}'; keeping the first one.",
-                            pluginInfo.IdentifierData);
-                }
-                else
-                {
-                    extensionCollection.Add(pluginInfo.IdentifierData, pluginInfo);
-                }
-            }
+        if (pluginInfo == null || pluginInfo.IdentifierData == null)
+        {
+            EqtTrace.Error(
+                "GetTestExtensionFromType: Either PluginInformation is null or PluginInformation doesn't contain IdentifierData for type {0}.", type.FullName);
+            return;
         }
 
-        #endregion
+        if (extensionCollection.ContainsKey(pluginInfo.IdentifierData))
+        {
+            EqtTrace.Warning(
+                "GetTestExtensionFromType: Discovered multiple test extensions with identifier data '{0}' and type '{1}' inside file '{2}'; keeping the first one '{3}'.",
+                pluginInfo.IdentifierData, pluginInfo.AssemblyQualifiedName, filePath, extensionCollection[pluginInfo.IdentifierData].AssemblyQualifiedName);
+        }
+        else
+        {
+            extensionCollection.Add(pluginInfo.IdentifierData, pluginInfo);
+            EqtTrace.Info("GetTestExtensionFromType: Register extension with identifier data '{0}' and type '{1}' inside file '{2}'",
+                pluginInfo.IdentifierData, pluginInfo.AssemblyQualifiedName, filePath);
+        }
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs
index 0f11cf2067..63ca95e3e9 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs
@@ -1,250 +1,225 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Manages test plugins information.
+/// </summary>
+internal class TestPluginManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
+    private static TestPluginManager? s_instance;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    /// <summary>
+    /// Gets the singleton instance of TestPluginManager.
+    /// </summary>
+    public static TestPluginManager Instance
+        => s_instance ??= new TestPluginManager();
 
     /// <summary>
-    /// Manages test plugins information.
+    /// Gets data type of test extension with given assembly qualified name.
     /// </summary>
-    internal class TestPluginManager
+    /// <param name="extensionTypeName">Assembly qualified name of the test extension</param>
+    /// <returns>Data type of the test extension</returns>
+    public static Type? GetTestExtensionType(string extensionTypeName)
     {
-        private static TestPluginManager instance;
-
-        #region Public Static Methods
-
-        /// <summary>
-        /// Gets the singleton instance of TestPluginManager.
-        /// </summary>
-        public static TestPluginManager Instance
+        Type? extensionType;
+        try
         {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new TestPluginManager();
-                }
-
-                return instance;
-            }
+            extensionType = Type.GetType(extensionTypeName, true);
         }
-
-        /// <summary>
-        /// Gets data type of test extension with given assembly qualified name.
-        /// </summary>
-        /// <param name="extensionTypeName">Assembly qualified name of the test extension</param>
-        /// <returns>Data type of the test extension</returns>
-        public static Type GetTestExtensionType(string extensionTypeName)
+        catch (Exception ex)
         {
-            Type extensionType = null;
-            try
-            {
-                extensionType = Type.GetType(extensionTypeName, true);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "GetTestExtensionType: Failed to get type for test extension '{0}': {1}",
-                    extensionTypeName,
-                    ex);
-                throw;
-            }
-
-            return extensionType;
+            EqtTrace.Error(
+                "GetTestExtensionType: Failed to get type for test extension '{0}': {1}",
+                extensionTypeName,
+                ex);
+            throw;
         }
 
-        /// <summary>
-        /// Instantiates a given data type.
-        /// </summary>
-        /// <typeparam name="T">Return type of the test extension</typeparam>
-        /// <param name="extensionType">Data type of the extension to be instantiated</param>
-        /// <returns>Test extension instance</returns>
-        public static T CreateTestExtension<T>(Type extensionType)
-        {
-            if (extensionType == null)
-            {
-                throw new ArgumentNullException(nameof(extensionType));
-            }
+        return extensionType;
+    }
 
-            EqtTrace.Info("TestPluginManager.CreateTestExtension: Attempting to load test extension: " + extensionType);
+    /// <summary>
+    /// Instantiates a given data type.
+    /// </summary>
+    /// <typeparam name="T">Return type of the test extension</typeparam>
+    /// <param name="extensionType">Data type of the extension to be instantiated</param>
+    /// <returns>Test extension instance</returns>
+    public static T CreateTestExtension<T>(Type extensionType)
+    {
+        ValidateArg.NotNull(extensionType, nameof(extensionType));
+        EqtTrace.Info("TestPluginManager.CreateTestExtension: Attempting to load test extension: " + extensionType);
 
-            try
-            {
-                object rawPlugin = Activator.CreateInstance(extensionType);
+        try
+        {
+            object? rawPlugin = Activator.CreateInstance(extensionType);
 
-                T testExtension = (T)rawPlugin;
-                return testExtension;
-            }
-            catch (Exception ex)
+            T testExtension = (T)rawPlugin!;
+            return testExtension;
+        }
+        catch (Exception ex)
+        {
+            if (ex is TargetInvocationException)
             {
-                if (ex is TargetInvocationException)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
-                    }
-                    throw;
-                }
+                EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
+                throw;
+            }
 #if NETFRAMEWORK
-                else if (ex is SystemException)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
-                    }
-                    throw;
-                }
-#endif
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
-                }
-
+            else if (ex is SystemException)
+            {
+                EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
                 throw;
             }
-        }
+#endif
+            EqtTrace.Error("TestPluginManager.CreateTestExtension: Could not create instance of type: " + extensionType.ToString() + "  Exception: " + ex);
 
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Retrieves the test extension collections of given extension type.
-        /// </summary>
-        /// <typeparam name="IExtension">
-        /// Type of the required extensions
-        /// </typeparam>
-        /// <typeparam name="IMetadata">
-        /// Type of metadata of required extensions
-        /// </typeparam>
-        /// <typeparam name="TMetadata">
-        /// Concrete type of metadata
-        /// </typeparam>
-        /// <param name="endsWithPattern">
-        /// Pattern used to select files using String.EndsWith
-        /// </param>
-        /// <param name="unfiltered">
-        /// Receives unfiltered list of test extensions
-        /// </param>
-        /// <param name="filtered">
-        /// Receives test extensions filtered by Identifier data
-        /// </param>
-        public void GetSpecificTestExtensions<TPluginInfo, IExtension, IMetadata, TMetadata>(
-            string endsWithPattern,
-            out IEnumerable<LazyExtension<IExtension, Dictionary<string, object>>> unfiltered,
-            out IEnumerable<LazyExtension<IExtension, IMetadata>> filtered) where TMetadata : IMetadata where TPluginInfo : TestPluginInformation
-        {
-            var extensions = TestPluginCache.Instance.DiscoverTestExtensions<TPluginInfo, IExtension>(endsWithPattern);
-            this.GetExtensions<TPluginInfo, IExtension, IMetadata, TMetadata>(extensions, out unfiltered, out filtered);
+            throw;
         }
+    }
 
-        /// <summary>
-        /// Retrieves the test extension collections of given extension type for the provided extension assembly.
-        /// </summary>
-        /// <param name="extensionAssembly">
-        /// The extension assembly. 
-        /// </param>
-        /// <typeparam name="TPluginInfo">
-        /// </typeparam>
-        /// <typeparam name="IExtension">
-        /// Type of the required extensions
-        /// </typeparam>
-        /// <typeparam name="IMetadata">
-        /// Type of metadata of required extensions
-        /// </typeparam>
-        /// <typeparam name="TMetadata">
-        /// Concrete type of metadata
-        /// </typeparam>
-        /// <param name="unfiltered">
-        /// Receives unfiltered list of test extensions
-        /// </param>
-        /// <param name="filtered">
-        /// Receives test extensions filtered by Identifier data
-        /// </param>
-        public void GetTestExtensions<TPluginInfo, IExtension, IMetadata, TMetadata>(
-            string extensionAssembly,
-            out IEnumerable<LazyExtension<IExtension, Dictionary<string, object>>> unfiltered,
-            out IEnumerable<LazyExtension<IExtension, IMetadata>> filtered) where TMetadata : IMetadata where TPluginInfo : TestPluginInformation
-        {
-            var extensions = TestPluginCache.Instance.GetTestExtensions<TPluginInfo, IExtension>(extensionAssembly);
-            this.GetExtensions<TPluginInfo, IExtension, IMetadata, TMetadata>(extensions, out unfiltered, out filtered);
-        }
+    /// <summary>
+    /// Retrieves the test extension collections of given extension type.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of the required extensions
+    /// </typeparam>
+    /// <typeparam name="IMetadata">
+    /// Type of metadata of required extensions
+    /// </typeparam>
+    /// <typeparam name="TMetadata">
+    /// Concrete type of metadata
+    /// </typeparam>
+    /// <param name="endsWithPattern">
+    /// Pattern used to select files using String.EndsWith
+    /// </param>
+    /// <param name="unfiltered">
+    /// Receives unfiltered list of test extensions
+    /// </param>
+    /// <param name="filtered">
+    /// Receives test extensions filtered by Identifier data
+    /// </param>
+    public static void GetSpecificTestExtensions<TPluginInfo, TExtension, IMetadata, TMetadata>(
+        string endsWithPattern,
+        out IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> unfiltered,
+        out IEnumerable<LazyExtension<TExtension, IMetadata>> filtered) where TMetadata : IMetadata where TPluginInfo : TestPluginInformation
+    {
+        var extensions = TestPluginCache.Instance.DiscoverTestExtensions<TPluginInfo, TExtension>(endsWithPattern);
+        TPDebug.Assert(extensions is not null, "extensions is null");
+        GetExtensions<TPluginInfo, TExtension, IMetadata, TMetadata>(extensions, out unfiltered, out filtered);
+    }
 
-        #endregion
+    /// <summary>
+    /// Retrieves the test extension collections of given extension type for the provided extension assembly.
+    /// </summary>
+    /// <param name="extensionAssembly">
+    /// The extension assembly.
+    /// </param>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of the required extensions
+    /// </typeparam>
+    /// <typeparam name="IMetadata">
+    /// Type of metadata of required extensions
+    /// </typeparam>
+    /// <typeparam name="TMetadata">
+    /// Concrete type of metadata
+    /// </typeparam>
+    /// <param name="unfiltered">
+    /// Receives unfiltered list of test extensions
+    /// </param>
+    /// <param name="filtered">
+    /// Receives test extensions filtered by Identifier data
+    /// </param>
+    /// <param name="skipCache">
+    /// Skip the extensions cache.
+    /// </param>
+    public static void GetTestExtensions<TPluginInfo, TExtension, IMetadata, TMetadata>(
+        string extensionAssembly,
+        out IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> unfiltered,
+        out IEnumerable<LazyExtension<TExtension, IMetadata>> filtered,
+        bool skipCache = false) where TMetadata : IMetadata where TPluginInfo : TestPluginInformation
+    {
+        var extensions = TestPluginCache.Instance.GetTestExtensions<TPluginInfo, TExtension>(extensionAssembly, skipCache);
+        GetExtensions<TPluginInfo, TExtension, IMetadata, TMetadata>(extensions, out unfiltered, out filtered);
+    }
 
-        #region Private Methods
+    /// <summary>
+    /// Prepares a List of TestPluginInformation&gt;
+    /// </summary>
+    /// <typeparam name="T"> Type of TestPluginIInformation. </typeparam>
+    /// <param name="dictionary"> The dictionary containing plugin identifier data and its info. </param>
+    /// <returns> Collection of test plugins information </returns>
+    private static IEnumerable<TestPluginInformation> GetValuesFromDictionary<T>(Dictionary<string, T> dictionary)
+        where T : TestPluginInformation
+    {
+        var values = new List<TestPluginInformation>();
 
-        /// <summary>
-        /// Prepares a List of TestPluginInformation&gt;
-        /// </summary>
-        /// <typeparam name="T"> Type of TestPluginIInformation. </typeparam>
-        /// <param name="dictionary"> The dictionary containing plugin identifier data and its info. </param>
-        /// <returns> Collection of test plugins information </returns>
-        private IEnumerable<TestPluginInformation> GetValuesFromDictionary<T>(Dictionary<string, T> dictionary) where T : TestPluginInformation
+        foreach (var key in dictionary.Keys)
         {
-            var values = new List<TestPluginInformation>();
+            values.Add(dictionary[key]);
+        }
 
-            foreach (var key in dictionary.Keys)
-            {
-                values.Add(dictionary[key]);
-            }
+        return values;
+    }
 
-            return values;
-        }
+    /// <summary>
+    /// Gets unfiltered and filtered extensions from the provided test extension collection.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    /// <typeparam name="TExtension">
+    /// Type of the required extensions
+    /// </typeparam>
+    /// <typeparam name="IMetadata">
+    /// Type of metadata of required extensions
+    /// </typeparam>
+    /// <typeparam name="TMetadata">
+    /// Concrete type of metadata
+    /// </typeparam>
+    /// <param name="testPluginInfo">
+    /// The test extension dictionary.
+    /// </param>
+    /// <param name="unfiltered">
+    /// Receives unfiltered list of test extensions
+    /// </param>
+    /// <param name="filtered">
+    /// Receives test extensions filtered by Identifier data
+    /// </param>
+    private static void GetExtensions<TPluginInfo, TExtension, IMetadata, TMetadata>(
+        Dictionary<string, TPluginInfo> testPluginInfo,
+        out IEnumerable<LazyExtension<TExtension, Dictionary<string, object>>> unfiltered,
+        out IEnumerable<LazyExtension<TExtension, IMetadata>> filtered)
+        where TMetadata : IMetadata
+        where TPluginInfo : TestPluginInformation
+    {
+        var unfilteredExtensions = new List<LazyExtension<TExtension, Dictionary<string, object>>>();
+        var filteredExtensions = new List<LazyExtension<TExtension, IMetadata>>();
 
-        /// <summary>
-        /// Gets unfiltered and filtered extensions from the provided test extension collection.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// </typeparam>
-        /// <typeparam name="IExtension">
-        /// Type of the required extensions
-        /// </typeparam>
-        /// <typeparam name="IMetadata">
-        /// Type of metadata of required extensions
-        /// </typeparam>
-        /// <typeparam name="TMetadata">
-        /// Concrete type of metadata
-        /// </typeparam>
-        /// <param name="testPluginInfo">
-        /// The test extension dictionary.
-        /// </param>
-        /// <param name="unfiltered">
-        /// Receives unfiltered list of test extensions
-        /// </param>
-        /// <param name="filtered">
-        /// Receives test extensions filtered by Identifier data
-        /// </param>
-        private void GetExtensions<TPluginInfo, IExtension, IMetadata, TMetadata>(
-            Dictionary<string, TPluginInfo> testPluginInfo,
-            out IEnumerable<LazyExtension<IExtension, Dictionary<string, object>>> unfiltered,
-            out IEnumerable<LazyExtension<IExtension, IMetadata>> filtered) where TMetadata : IMetadata where TPluginInfo : TestPluginInformation
+        var testPlugins = GetValuesFromDictionary(testPluginInfo);
+        foreach (var plugin in testPlugins)
         {
-            var unfilteredExtensions = new List<LazyExtension<IExtension, Dictionary<string, object>>>();
-            var filteredExtensions = new List<LazyExtension<IExtension, IMetadata>>();
-
-            var testPlugins = this.GetValuesFromDictionary(testPluginInfo);
-            foreach (var plugin in testPlugins)
+            if (!plugin.IdentifierData.IsNullOrEmpty())
             {
-                if (!string.IsNullOrEmpty(plugin.IdentifierData))
-                {
-                    var testExtension = new LazyExtension<IExtension, IMetadata>(plugin, typeof(TMetadata));
-                    filteredExtensions.Add(testExtension);
-                }
-
-                unfilteredExtensions.Add(new LazyExtension<IExtension, Dictionary<string, object>>(plugin, new Dictionary<string, object>()));
+                var testExtension = new LazyExtension<TExtension, IMetadata>(plugin, typeof(TMetadata));
+                filteredExtensions.Add(testExtension);
             }
 
-            unfiltered = unfilteredExtensions;
-            filtered = filteredExtensions;
+            unfilteredExtensions.Add(new LazyExtension<TExtension, Dictionary<string, object>>(plugin, new Dictionary<string, object>()));
         }
 
-        #endregion
+        unfiltered = unfilteredExtensions;
+        filtered = filteredExtensions;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/LazyExtension.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/LazyExtension.cs
index 20025ee16e..ca757ef2c5 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/LazyExtension.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/LazyExtension.cs
@@ -1,173 +1,152 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+
+/// <summary>
+/// Class to hold a test extension type
+/// </summary>
+/// <typeparam name="TExtension">Test extension type</typeparam>
+/// <typeparam name="TMetadata">Test extension metadata</typeparam>
+public class LazyExtension<TExtension, TMetadata>
 {
-    using System;
-    using System.Linq;
+    private static readonly object Synclock = new();
+    private readonly Type? _metadataType;
+    private readonly Func<TExtension>? _extensionCreator;
+    private readonly ExtensionDecoratorFactory _extensionDecoratorFactory = new(FeatureFlag.Instance);
+    private TExtension? _extension;
+    private TMetadata? _metadata;
 
     /// <summary>
-    /// Class to hold a test extension type
+    /// The constructor.
     /// </summary>
-    /// <typeparam name="TExtension">Test extension type</typeparam>
-    /// <typeparam name="TMetadata">Test extension metadata</typeparam>
-    public class LazyExtension<TExtension, TMetadata>
+    /// <param name="instance">Test extension Instance</param>
+    /// <param name="metadata">test extension metadata</param>
+    public LazyExtension(TExtension instance, TMetadata metadata)
     {
-        #region Private Members
-
-        private static object synclock = new object();
-        private TExtension extension;
-        private TMetadata metadata;
-        private TestPluginInformation testPluginInfo;
-        private Type metadataType;
-        private bool isExtensionCreated;
-        private Func<TExtension> extensionCreator;
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// The constructor.
-        /// </summary>
-        /// <param name="instance">Test extension Instance</param>
-        /// <param name="metadata">test extension metadata</param>
-        public LazyExtension(TExtension instance, TMetadata metadata)
-        {
-            if (instance == null)
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
-
-            if (metadata == null)
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
-
-            this.extension = instance;
-            this.metadata = metadata;
-            this.isExtensionCreated = true;
-        }
-
-        /// <summary>
-        /// The constructor.
-        /// </summary>
-        /// <param name="pluginInfo">Test plugin to instantiated on demand.</param>
-        /// <param name="metadataType">Metadata type to instantiate on demand</param>
-        public LazyExtension(TestPluginInformation pluginInfo, Type metadataType)
-        {
-            this.testPluginInfo = pluginInfo ?? throw new ArgumentNullException(nameof(pluginInfo));
-            this.metadataType = metadataType ?? throw new ArgumentNullException(nameof(metadataType));
-            this.isExtensionCreated = false;
-        }
-
-        /// <summary>
-        /// The constructor.
-        /// </summary>
-        /// <param name="pluginInfo">Test plugin to instantiated on demand</param>
-        /// <param name="metadata">Test extension metadata</param>
-        public LazyExtension(TestPluginInformation pluginInfo, TMetadata metadata)
-        {
-            if (metadata == null)
-            {
-                throw new ArgumentNullException(nameof(metadata));
-            }
-
-            this.testPluginInfo = pluginInfo ?? throw new ArgumentNullException(nameof(pluginInfo));
-            this.metadata = metadata;
-            this.isExtensionCreated = false;
-        }
-
-        /// <summary>
-        /// Delegate Constructor
-        /// </summary>
-        /// <param name="creator">Test extension creator delegate</param>
-        /// <param name="metadata">test extension metadata</param>
-        public LazyExtension(Func<TExtension> creator, TMetadata metadata)
-        {
-            if (metadata == null)
-            {
-                throw new ArgumentNullException(nameof(metadata));
-            }
+        _extension = instance ?? throw new ArgumentNullException(nameof(instance));
+        _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));
+        IsExtensionCreated = true;
+    }
 
-            this.extensionCreator = creator ?? throw new ArgumentNullException(nameof(creator));
-            this.metadata = metadata;
-            this.isExtensionCreated = false;
-        }
+    /// <summary>
+    /// The constructor.
+    /// </summary>
+    /// <param name="pluginInfo">Test plugin to instantiated on demand.</param>
+    /// <param name="metadataType">Metadata type to instantiate on demand</param>
+    public LazyExtension(TestPluginInformation pluginInfo, Type metadataType)
+    {
+        TestPluginInfo = pluginInfo ?? throw new ArgumentNullException(nameof(pluginInfo));
+        _metadataType = metadataType ?? throw new ArgumentNullException(nameof(metadataType));
+        IsExtensionCreated = false;
+    }
 
-        #endregion
+    /// <summary>
+    /// The constructor.
+    /// </summary>
+    /// <param name="pluginInfo">Test plugin to instantiated on demand</param>
+    /// <param name="metadata">Test extension metadata</param>
+    public LazyExtension(TestPluginInformation pluginInfo, TMetadata metadata)
+    {
+        TestPluginInfo = pluginInfo ?? throw new ArgumentNullException(nameof(pluginInfo));
+        _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));
+        IsExtensionCreated = false;
+    }
 
-        #region Public Properties
+    /// <summary>
+    /// Delegate Constructor
+    /// </summary>
+    /// <param name="creator">Test extension creator delegate</param>
+    /// <param name="metadata">test extension metadata</param>
+    public LazyExtension(Func<TExtension> creator, TMetadata metadata)
+    {
+        _extensionCreator = creator ?? throw new ArgumentNullException(nameof(creator));
+        _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));
+        IsExtensionCreated = false;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether is extension created.
-        /// </summary>
-        internal bool IsExtensionCreated
-        {
-            get
-            {
-                return this.isExtensionCreated;
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether is extension created.
+    /// </summary>
+    internal bool IsExtensionCreated { get; private set; }
 
-        internal TestPluginInformation TestPluginInfo => this.testPluginInfo;
+    internal TestPluginInformation? TestPluginInfo { get; }
 
-        /// <summary>
-        /// Gets the test extension instance.
-        /// </summary>
-        public TExtension Value
+    /// <summary>
+    /// Gets the test extension instance.
+    /// </summary>
+    public TExtension Value
+    {
+        get
         {
-            get
+            if (!IsExtensionCreated)
             {
-                if (!this.isExtensionCreated)
+                if (_extensionCreator != null)
                 {
-                    if (this.extensionCreator != null)
-                    {
-                        this.extension = this.extensionCreator();
-                    }
-                    else if (this.extension == null)
+                    _extension = _extensionCreator();
+                }
+                else if (_extension == null)
+                {
+                    lock (Synclock)
                     {
-                        lock (synclock)
+                        if (_extension == null && TestPluginInfo != null)
                         {
-                            if (this.extension == null && this.testPluginInfo != null)
+                            TPDebug.Assert(TestPluginInfo.AssemblyQualifiedName is not null, "TestPluginInfo.AssemblyQualifiedName is null");
+                            var pluginType = TestPluginManager.GetTestExtensionType(TestPluginInfo.AssemblyQualifiedName);
+                            TPDebug.Assert(pluginType is not null, "pluginType is null");
+
+                            // If the extension is a test executor we decorate the adapter to augment the test platform capabilities.
+                            var extension = TestPluginManager.CreateTestExtension<TExtension>(pluginType);
+                            if (typeof(ITestExecutor).IsAssignableFrom(typeof(TExtension)))
                             {
-                                var pluginType = TestPluginManager.GetTestExtensionType(this.testPluginInfo.AssemblyQualifiedName);
-                                this.extension = TestPluginManager.CreateTestExtension<TExtension>(pluginType);
+                                extension = (TExtension)_extensionDecoratorFactory.Decorate((ITestExecutor)extension!);
                             }
+
+                            _extension = extension;
                         }
                     }
-
-                    this.isExtensionCreated = true;
                 }
 
-                return this.extension;
+                IsExtensionCreated = true;
             }
+
+            TPDebug.Assert(_extension is not null, "_extension is null");
+            return _extension;
         }
+    }
 
-        /// <summary>
-        /// Gets the test extension metadata
-        /// </summary>
-        public TMetadata Metadata
+    /// <summary>
+    /// Gets the test extension metadata
+    /// </summary>
+    public TMetadata Metadata
+    {
+        get
         {
-            get
+            if (_metadata == null)
             {
-                if (this.metadata == null)
+                lock (Synclock)
                 {
-                    lock (synclock)
+                    if (_metadata == null && TestPluginInfo != null)
                     {
-                        if (this.metadata == null && this.testPluginInfo != null)
-                        {
-                            var parameters = this.testPluginInfo.Metadata?.ToArray();
-                            var dataObject = Activator.CreateInstance(this.metadataType, parameters);
-                            this.metadata = (TMetadata)dataObject;
-                        }
+                        var parameters = TestPluginInfo.Metadata?.ToArray();
+                        TPDebug.Assert(_metadataType is not null, "_metadataType is null");
+                        var dataObject = Activator.CreateInstance(_metadataType, parameters);
+                        TPDebug.Assert(dataObject is not null, "dataObject is null");
+                        _metadata = (TMetadata)dataObject;
                     }
                 }
-
-                return this.metadata;
             }
-        }
 
-        #endregion
+            TPDebug.Assert(_metadata is not null, "_metadata is null");
+            return _metadata;
+        }
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
index a85a225f7d..8b947cd8e2 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
@@ -1,139 +1,159 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test discoverer plugin information.
+/// </summary>
+internal class TestDiscovererPluginInformation : TestPluginInformation
+{
     /// <summary>
-    /// The test discoverer plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestDiscovererPluginInformation : TestPluginInformation
+    /// <param name="testDiscovererType">Data type of the test discoverer</param>
+    public TestDiscovererPluginInformation(Type testDiscovererType)
+        : base(testDiscovererType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testDiscovererType">Data type of the test discoverer</param>
-        public TestDiscovererPluginInformation(Type testDiscovererType)
-            : base(testDiscovererType)
+        if (testDiscovererType != null)
         {
-            if (testDiscovererType != null)
-            {
-                this.FileExtensions = GetFileExtensions(testDiscovererType);
-                this.DefaultExecutorUri = GetDefaultExecutorUri(testDiscovererType);
-                this.AssemblyType = GetAssemblyType(testDiscovererType);
-            }
+            FileExtensions = GetFileExtensions(testDiscovererType);
+            DefaultExecutorUri = GetDefaultExecutorUri(testDiscovererType);
+            AssemblyType = GetAssemblyType(testDiscovererType);
+            IsDirectoryBased = GetIsDirectoryBased(testDiscovererType);
         }
+    }
 
-        /// <summary>
-        /// Metadata for the test plugin
-        /// </summary>
-        public override ICollection<Object> Metadata
+    /// <summary>
+    /// Metadata for the test plugin
+    /// </summary>
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return new object[] { this.FileExtensions, this.DefaultExecutorUri, this.AssemblyType };
-            }
+            return new object?[] { FileExtensions, DefaultExecutorUri, AssemblyType, IsDirectoryBased };
         }
+    }
 
-        /// <summary>
-        /// Gets collection of file extensions supported by discoverer plugin.
-        /// </summary>
-        public List<string> FileExtensions
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets collection of file extensions supported by discoverer plugin.
+    /// </summary>
+    public List<string>? FileExtensions
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets the Uri identifying the executor
-        /// </summary>
-        public string DefaultExecutorUri
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the Uri identifying the executor
+    /// </summary>
+    public string? DefaultExecutorUri
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets the assembly type supported by discoverer plugin.
-        /// </summary>
-        public AssemblyType AssemblyType
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the assembly type supported by discoverer plugin.
+    /// </summary>
+    public AssemblyType AssemblyType
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Helper to get file extensions from the FileExtensionAttribute on the discover plugin.
-        /// </summary>
-        /// <param name="testDicovererType">Data type of the test discoverer</param>
-        /// <returns>List of file extensions</returns>
-        private static List<string> GetFileExtensions(Type testDicovererType)
-        {
-            var fileExtensions = new List<string>();
+    /// <summary>
+    /// <see langword="true"/> if the discoverer plugin is decorated with <see cref="DirectoryBasedTestDiscovererAttribute"/>,
+    /// <see langword="false"/> otherwise.
+    /// </summary>
+    public bool IsDirectoryBased
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Helper to get file extensions from the <see cref="FileExtensionAttribute"/> on the discover plugin.
+    /// </summary>
+    /// <param name="testDiscovererType">Data type of the test discoverer</param>
+    /// <returns>List of file extensions</returns>
+    private static List<string> GetFileExtensions(Type testDiscovererType)
+    {
+        var fileExtensions = new List<string>();
 
-            var attributes = testDicovererType.GetTypeInfo().GetCustomAttributes(typeof(FileExtensionAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
+        var attributes = testDiscovererType.GetCustomAttributes(typeof(FileExtensionAttribute), inherit: false).ToArray();
+        if (attributes != null && attributes.Length > 0)
+        {
+            foreach (var attribute in attributes)
             {
-                foreach (var attribute in attributes)
+                var fileExtAttribute = (FileExtensionAttribute)attribute;
+                if (!fileExtAttribute.FileExtension.IsNullOrEmpty())
                 {
-                    var fileExtAttribute = (FileExtensionAttribute)attribute;
-                    if (!string.IsNullOrEmpty(fileExtAttribute.FileExtension))
-                    {
-                        fileExtensions.Add(fileExtAttribute.FileExtension);
-                    }
+                    fileExtensions.Add(fileExtAttribute.FileExtension);
                 }
             }
-
-            return fileExtensions;
         }
 
-        /// <summary>
-        /// Returns the value of default executor Uri on this type. 'Null' if not present.
-        /// </summary>
-        /// <param name="testDiscovererType"> The test discoverer Type. </param>
-        /// <returns> The default executor URI. </returns>
-        private static string GetDefaultExecutorUri(Type testDiscovererType)
+        return fileExtensions;
+    }
+
+    /// <summary>
+    /// Returns the value of default executor Uri on this type. <see langword="null"/> if not present.
+    /// </summary>
+    /// <param name="testDiscovererType"> The test discoverer Type. </param>
+    /// <returns> The default executor URI. </returns>
+    private static string GetDefaultExecutorUri(Type testDiscovererType)
+    {
+        var result = string.Empty;
+
+        var attributes = testDiscovererType.GetCustomAttributes(typeof(DefaultExecutorUriAttribute), inherit: false).ToArray();
+        if (attributes != null && attributes.Length > 0)
         {
-            string result = string.Empty;
+            DefaultExecutorUriAttribute executorUriAttribute = (DefaultExecutorUriAttribute)attributes[0];
 
-            object[] attributes = testDiscovererType.GetTypeInfo().GetCustomAttributes(typeof(DefaultExecutorUriAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
+            if (!executorUriAttribute.ExecutorUri.IsNullOrEmpty())
             {
-                DefaultExecutorUriAttribute executorUriAttribute = (DefaultExecutorUriAttribute)attributes[0];
-
-                if (!string.IsNullOrEmpty(executorUriAttribute.ExecutorUri))
-                {
-                    result = executorUriAttribute.ExecutorUri;
-                }
+                result = executorUriAttribute.ExecutorUri;
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Helper to get the supported assembly type from the CategoryAttribute on the discover plugin.
-        /// </summary>
-        /// <param name="testDiscovererType"> The test discoverer Type. </param>
-        /// <returns> Supported assembly type. </returns>
-        private AssemblyType GetAssemblyType(Type testDiscovererType)
-        {
-            var assemblyType = default(AssemblyType);
+        return result;
+    }
 
-            // Get Category
-            var attribute = testDiscovererType.GetTypeInfo().GetCustomAttribute(typeof(CategoryAttribute));
-            var category = (attribute as CategoryAttribute)?.Category;
+    /// <summary>
+    /// Helper to get the supported assembly type from the <see cref="CategoryAttribute"/> on the discover plugin.
+    /// </summary>
+    /// <param name="testDiscovererType"> The test discoverer Type. </param>
+    /// <returns> Supported assembly type. </returns>
+    private static AssemblyType GetAssemblyType(Type testDiscovererType)
+    {
 
-            // Get assembly type from category.
-            Enum.TryParse(category, true, out assemblyType);
-            return assemblyType;
-        }
+        // Get Category
+        var attribute = testDiscovererType.GetCustomAttribute(typeof(CategoryAttribute));
+        var category = (attribute as CategoryAttribute)?.Category;
+
+        // Get assembly type from category.
+        Enum.TryParse(category, true, out AssemblyType assemblyType);
+        return assemblyType;
+    }
+
+    /// <summary>
+    /// Returns <see langword="true"/> if the discoverer plugin is decorated with
+    /// <see cref="DirectoryBasedTestDiscovererAttribute"/>, <see langword="false"/> otherwise.
+    /// </summary>
+    /// <param name="testDiscovererType">Data type of the test discoverer</param>
+    private static bool GetIsDirectoryBased(Type testDiscovererType)
+    {
+        var attribute = testDiscovererType.GetCustomAttribute(typeof(DirectoryBasedTestDiscovererAttribute), inherit: false);
+        return attribute is DirectoryBasedTestDiscovererAttribute;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExecutorPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExecutorPluginInformation.cs
index b768494fb2..688bc948fa 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExecutorPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExecutorPluginInformation.cs
@@ -1,37 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test executor plugin information.
+/// </summary>
+internal class TestExecutorPluginInformation : TestExtensionPluginInformation
+{
     /// <summary>
-    /// The test executor plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestExecutorPluginInformation : TestExtensionPluginInformation
+    /// <param name="testExecutorType"> The test Executor Type. </param>
+    public TestExecutorPluginInformation(Type? testExecutorType)
+        : base(testExecutorType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testExecutorType"> The test Executor Type. </param>
-        public TestExecutorPluginInformation(Type testExecutorType)
-            : base(testExecutorType)
-        {
-        }
     }
+}
 
+/// <summary>
+/// The test executor 2 plugin information.
+/// </summary>
+internal class TestExecutorPluginInformation2 : TestExtensionPluginInformation
+{
     /// <summary>
-    /// The test executor 2 plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestExecutorPluginInformation2 : TestExtensionPluginInformation
+    /// <param name="testExecutorType"> The test Executor Type. </param>
+    public TestExecutorPluginInformation2(Type? testExecutorType)
+        : base(testExecutorType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testExecutorType"> The test Executor Type. </param>
-        public TestExecutorPluginInformation2(Type testExecutorType)
-            : base(testExecutorType)
-        {
-        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensionPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensionPluginInformation.cs
index ac3face5da..14e9eea63e 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensionPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensionPluginInformation.cs
@@ -1,90 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test extension plugin information.
+/// </summary>
+internal abstract class TestExtensionPluginInformation : TestPluginInformation
+{
     /// <summary>
-    /// The test extension plugin information.
+    /// Default constructor
     /// </summary>
-    internal abstract class TestExtensionPluginInformation : TestPluginInformation
+    /// <param name="type"> The test Logger Type. </param>
+    public TestExtensionPluginInformation(Type? type)
+        : base(type)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="type"> The test Logger Type. </param>
-        public TestExtensionPluginInformation(Type type)
-            : base(type)
+        if (type != null)
         {
-            if (type != null)
-            {
-                this.ExtensionUri = GetExtensionUri(type);
-            }
-        }
-
-        /// <summary>
-        /// Gets data value identifying the test plugin
-        /// </summary>
-        public override string IdentifierData
-        {
-            get
-            {
-                return this.ExtensionUri;
-            }
+            ExtensionUri = GetExtensionUri(type);
         }
+    }
 
-        /// <summary>
-        /// Metadata for the test plugin
-        /// </summary>
-        public override ICollection<object> Metadata
+    /// <summary>
+    /// Gets data value identifying the test plugin
+    /// </summary>
+    public override string? IdentifierData
+    {
+        get
         {
-            get
-            {
-                return new object[] { this.ExtensionUri };
-            }
+            return ExtensionUri;
         }
+    }
 
-        /// <summary>
-        /// Gets the Uri identifying the test extension.
-        /// </summary>
-        public string ExtensionUri
+    /// <summary>
+    /// Metadata for the test plugin
+    /// </summary>
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get;
-            private set;
+            return new object?[] { ExtensionUri };
         }
+    }
 
-        /// <summary>
-        /// Helper to get the Uri from the ExtensionUriAttribute on logger plugin.
-        /// </summary>
-        /// <param name="testLoggerType">Data type of the test logger</param>
-        /// <returns>Uri identifying the test logger</returns>
-        private static string GetExtensionUri(Type testLoggerType)
-        {
-            string extensionUri = string.Empty;
+    /// <summary>
+    /// Gets the Uri identifying the test extension.
+    /// </summary>
+    public string? ExtensionUri
+    {
+        get;
+        private set;
+    }
 
-            object[] attributes = testLoggerType.GetTypeInfo().GetCustomAttributes(typeof(ExtensionUriAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
-            {
-                ExtensionUriAttribute extensionUriAttribute = (ExtensionUriAttribute)attributes[0];
+    /// <summary>
+    /// Helper to get the Uri from the ExtensionUriAttribute on logger plugin.
+    /// </summary>
+    /// <param name="testLoggerType">Data type of the test logger</param>
+    /// <returns>Uri identifying the test logger</returns>
+    private static string GetExtensionUri(Type testLoggerType)
+    {
+        string extensionUri = string.Empty;
 
-                if (!string.IsNullOrEmpty(extensionUriAttribute.ExtensionUri))
-                {
-                    extensionUri = extensionUriAttribute.ExtensionUri;
-                }
-            }
+        object[] attributes = testLoggerType.GetCustomAttributes(typeof(ExtensionUriAttribute), false).ToArray();
+        if (attributes.Length > 0)
+        {
+            ExtensionUriAttribute extensionUriAttribute = (ExtensionUriAttribute)attributes[0];
 
-            if (EqtTrace.IsErrorEnabled && string.IsNullOrEmpty(extensionUri))
+            if (!extensionUriAttribute.ExtensionUri.IsNullOrEmpty())
             {
-                EqtTrace.Error("The type \"{0}\" defined in \"{1}\" does not have ExtensionUri attribute.", testLoggerType.ToString(), testLoggerType.GetTypeInfo().Module.Name);
+                extensionUri = extensionUriAttribute.ExtensionUri;
             }
+        }
 
-            return extensionUri;
+        if (extensionUri.IsNullOrEmpty())
+        {
+            EqtTrace.Error("The type \"{0}\" defined in \"{1}\" does not have ExtensionUri attribute.", testLoggerType.ToString(), testLoggerType.Module.Name);
         }
+
+        return extensionUri;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensions.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensions.cs
index ea0a52a4f5..5e5055af02 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensions.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestExtensions.cs
@@ -1,401 +1,522 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+using SimpleJSON;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+
+/// <summary>
+/// The test extension information.
+/// </summary>
+public class TestExtensions
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+    /// <summary>
+    /// Gets or sets test discoverer extensions.
+    /// </summary>
+    internal Dictionary<string, TestDiscovererPluginInformation>? TestDiscoverers { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test discoverers cached.
+    /// </summary>
+    internal bool AreTestDiscoverersCached { get; set; }
+
+    /// <summary>
+    /// Gets or sets test executor extensions.
+    /// </summary>
+    internal Dictionary<string, TestExecutorPluginInformation>? TestExecutors { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test executors cached.
+    /// </summary>
+    internal bool AreTestExecutorsCached { get; set; }
+
+    /// <summary>
+    /// Gets or sets test executor 2 extensions.
+    /// </summary>
+    internal Dictionary<string, TestExecutorPluginInformation2>? TestExecutors2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test executors 2 cached.
+    /// </summary>
+    internal bool AreTestExecutors2Cached { get; set; }
+
+    /// <summary>
+    /// Gets or sets test setting provider extensions.
+    /// </summary>
+    internal Dictionary<string, TestSettingsProviderPluginInformation>? TestSettingsProviders { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test settings providers cached.
+    /// </summary>
+    internal bool AreTestSettingsProvidersCached { get; set; }
+
+    /// <summary>
+    /// Gets or sets test logger extensions.
+    /// </summary>
+    internal Dictionary<string, TestLoggerPluginInformation>? TestLoggers { get; set; }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+    /// <summary>
+    /// Gets or sets a value indicating whether are test loggers cached.
+    /// </summary>
+    internal bool AreTestLoggersCached { get; set; }
+
+    /// <summary>
+    /// Gets or sets test logger extensions.
+    /// </summary>
+    internal Dictionary<string, TestRuntimePluginInformation>? TestHosts { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test hosts cached.
+    /// </summary>
+    internal bool AreTestHostsCached { get; set; }
 
     /// <summary>
-    /// The test extension information.
+    /// Gets or sets data collectors extensions.
     /// </summary>
-    public class TestExtensions
+    internal Dictionary<string, DataCollectorConfig>? DataCollectors { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether are test hosts cached.
+    /// </summary>
+    internal bool AreDataCollectorsCached { get; set; }
+
+    /// <summary>
+    /// Merge two extension dictionaries.
+    /// </summary>
+    ///
+    /// <param name="first">First extension dictionary.</param>
+    /// <param name="second">Second extension dictionary.</param>
+    ///
+    /// <returns>
+    /// A dictionary representing the merger between the two input dictionaries.
+    /// </returns>
+    internal static Dictionary<string, HashSet<string>> CreateMergedDictionary(
+        Dictionary<string, HashSet<string>>? first,
+        Dictionary<string, HashSet<string>>? second)
     {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets test discoverer extensions.
-        /// </summary>
-        internal Dictionary<string, TestDiscovererPluginInformation> TestDiscoverers { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test discoverers cached.
-        /// </summary>
-        internal bool AreTestDiscoverersCached { get; set; }
-
-        /// <summary>
-        /// Gets or sets test executor extensions.
-        /// </summary>
-        internal Dictionary<string, TestExecutorPluginInformation> TestExecutors { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test executors cached.
-        /// </summary>
-        internal bool AreTestExecutorsCached { get; set; }
-
-        /// <summary>
-        /// Gets or sets test executor 2 extensions.
-        /// </summary>
-        internal Dictionary<string, TestExecutorPluginInformation2> TestExecutors2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test executors 2 cached.
-        /// </summary>
-        internal bool AreTestExecutors2Cached { get; set; }
-
-        /// <summary>
-        /// Gets or sets test setting provider extensions.
-        /// </summary>
-        internal Dictionary<string, TestSettingsProviderPluginInformation> TestSettingsProviders { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test settings providers cached.
-        /// </summary>
-        internal bool AreTestSettingsProvidersCached { get; set; }
-
-        /// <summary>
-        /// Gets or sets test logger extensions.
-        /// </summary>
-        internal Dictionary<string, TestLoggerPluginInformation> TestLoggers { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test loggers cached.
-        /// </summary>
-        internal bool AreTestLoggersCached { get; set; }
-
-        /// <summary>
-        /// Gets or sets test logger extensions.
-        /// </summary>
-        internal Dictionary<string, TestRuntimePluginInformation> TestHosts { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test hosts cached.
-        /// </summary>
-        internal bool AreTestHostsCached { get; set; }
-
-        /// <summary>
-        /// Gets or sets data collectors extensions.
-        /// </summary>
-        internal Dictionary<string, DataCollectorConfig> DataCollectors { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether are test hosts cached.
-        /// </summary>
-        internal bool AreDataCollectorsCached { get; set; }
-
-        #endregion
-
-        #region Internal methods
-
-        /// <summary>
-        /// Adds the extensions specified to the current set of extensions.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// Type of plugin info.
-        /// </typeparam>
-        /// <param name="newExtensions">
-        /// The info about new extensions discovered
-        /// </param>
-        /// <returns>
-        /// The <see cref="Dictionary"/> of extensions discovered
-        /// </returns>
-        internal Dictionary<string, TPluginInfo> AddExtension<TPluginInfo>(
-            Dictionary<string, TPluginInfo> newExtensions) where TPluginInfo : TestPluginInformation
-        {
-            var existingExtensions = this.GetTestExtensionCache<TPluginInfo>();
-            if (newExtensions == null)
-            {
-                return existingExtensions;
-            }
+        var isFirstNullOrEmpty = first == null || first.Count == 0;
+        var isSecondNullOrEmpty = second == null || second.Count == 0;
+
+        // Sanity checks.
+        if (isFirstNullOrEmpty && isSecondNullOrEmpty)
+        {
+            return new Dictionary<string, HashSet<string>>();
+        }
 
-            if (existingExtensions == null)
+        if (isFirstNullOrEmpty)
+        {
+            return new Dictionary<string, HashSet<string>>(second!);
+        }
+
+        if (isSecondNullOrEmpty)
+        {
+            return new Dictionary<string, HashSet<string>>(first!);
+        }
+
+        // Copy all the keys in the first dictionary into the resulting dictionary.
+        var result = first!.Where(kvp => kvp.Value != null && kvp.Value.Count > 0)
+            .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+
+        foreach (var kvp in second!)
+        {
+            // If the "source" set is empty there's no reason to continue merging for this key.
+            if (kvp.Value == null || kvp.Value.Count == 0)
             {
-                this.SetTestExtensionCache<TPluginInfo>(newExtensions);
-                return newExtensions;
+                continue;
             }
 
-            foreach (var extension in newExtensions)
+            // If there's no key-value pair entry in the "destination" dictionary for the current
+            // key in the "source" dictionary, we copy the "source" set wholesale.
+            if (!result.ContainsKey(kvp.Key))
             {
-                if (existingExtensions.ContainsKey(extension.Key))
-                {
-                    EqtTrace.Warning(
-                        "TestExtensions.AddExtensions: Attempt to add multiple test extensions with identifier data '{0}'",
-                        extension.Key);
-                }
-                else
-                {
-                    existingExtensions.Add(extension.Key, extension.Value);
-                }
+                result.Add(kvp.Key, kvp.Value);
+                continue;
             }
 
-            return existingExtensions;
+            // Getting here means there's already an entry for the "source" key in the "destination"
+            // dictionary which means we need to copy individual set elements from the "source" set
+            // to the "destination" set.
+            result[kvp.Key] = MergeSets(result[kvp.Key], kvp.Value);
         }
 
-        /// <summary>
-        /// Gets the extensions already discovered that are defined in the specified assembly.
-        /// </summary>
-        /// <param name="extensionAssembly"> The extension assembly.</param>
-        /// <returns> The test extensions defined the extension assembly if it is already discovered. null if not.</returns>
-        internal TestExtensions GetExtensionsDiscoveredFromAssembly(string extensionAssembly)
-        {
-            var testExtensions = new TestExtensions();
-
-            testExtensions.TestDiscoverers =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestDiscoverers,
-                    extensionAssembly);
-            testExtensions.TestExecutors =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestExecutors,
-                    extensionAssembly);
-            testExtensions.TestExecutors2 =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestExecutors2,
-                    extensionAssembly);
-            testExtensions.TestSettingsProviders =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestSettingsProviders,
-                    extensionAssembly);
-            testExtensions.TestLoggers =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestLoggers,
-                    extensionAssembly);
-            testExtensions.TestHosts =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.TestHosts,
-                    extensionAssembly);
-            testExtensions.DataCollectors =
-                this.GetExtensionsDiscoveredFromAssembly(
-                    this.DataCollectors,
-                    extensionAssembly);
-
-            if (testExtensions.TestDiscoverers.Any()
-                || testExtensions.TestExecutors.Any()
-                || testExtensions.TestExecutors2.Any()
-                || testExtensions.TestSettingsProviders.Any()
-                || testExtensions.TestLoggers.Any()
-                || testExtensions.TestHosts.Any()
-                || testExtensions.DataCollectors.Any())
-            {
-                // This extension has already been discovered.
-                return testExtensions;
-            }
+        return result;
+    }
 
-            return null;
+    /// <summary>
+    /// Add extension-related telemetry.
+    /// </summary>
+    ///
+    /// <param name="metrics">A collection representing the telemetry data.</param>
+    /// <param name="extensions">The input extension collection.</param>
+    internal static void AddExtensionTelemetry(
+        IDictionary<string, object> metrics,
+        Dictionary<string, HashSet<string>> extensions)
+    {
+        metrics.Add(
+            TelemetryDataConstants.DiscoveredExtensions,
+            SerializeExtensionDictionary(extensions));
+    }
+
+    /// <summary>
+    /// Adds the extensions specified to the current set of extensions.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// Type of plugin info.
+    /// </typeparam>
+    /// <param name="newExtensions">
+    /// The info about new extensions discovered
+    /// </param>
+    /// <returns>
+    /// The <see cref="Dictionary{TKey, TValue}"/> of extensions discovered
+    /// </returns>
+    internal Dictionary<string, TPluginInfo>? AddExtension<TPluginInfo>(Dictionary<string, TPluginInfo>? newExtensions)
+        where TPluginInfo : TestPluginInformation
+    {
+        var existingExtensions = GetTestExtensionCache<TPluginInfo>();
+        if (newExtensions == null)
+        {
+            return existingExtensions;
         }
 
-        internal Dictionary<string, TPluginInfo> GetTestExtensionCache<TPluginInfo>() where TPluginInfo : TestPluginInformation
+        if (existingExtensions == null)
         {
-            Type type = typeof(TPluginInfo);
+            SetTestExtensionCache(newExtensions);
+            return newExtensions;
+        }
 
-            if (type == typeof(TestDiscovererPluginInformation))
-            {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestDiscoverers;
-            }
-            else if (type == typeof(TestExecutorPluginInformation))
-            {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestExecutors;
-            }
-            else if (type == typeof(TestExecutorPluginInformation2))
-            {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestExecutors2;
-            }
-            else if (type == typeof(TestLoggerPluginInformation))
-            {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestLoggers;
-            }
-            else if (type == typeof(TestSettingsProviderPluginInformation))
-            {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestSettingsProviders;
-            }
-            else if (type == typeof(TestRuntimePluginInformation))
+        foreach (var extension in newExtensions)
+        {
+            if (existingExtensions.ContainsKey(extension.Key))
             {
-                return (Dictionary<string, TPluginInfo>)(object)this.TestHosts;
+                EqtTrace.Warning(
+                    "TestExtensions.AddExtensions: Attempt to add multiple test extensions with identifier data '{0}'",
+                    extension.Key);
             }
-            else if (type == typeof(DataCollectorConfig))
+            else
             {
-                return (Dictionary<string, TPluginInfo>)(object)this.DataCollectors;
+                existingExtensions.Add(extension.Key, extension.Value);
             }
+        }
+
+        return existingExtensions;
+    }
 
-            return null;
+    /// <summary>
+    /// Gets the extensions already discovered that are defined in the specified assembly.
+    /// </summary>
+    /// <param name="extensionAssembly"> The extension assembly.</param>
+    /// <returns> The test extensions defined the extension assembly if it is already discovered. null if not.</returns>
+    internal TestExtensions? GetExtensionsDiscoveredFromAssembly(string? extensionAssembly)
+    {
+        var testExtensions = new TestExtensions();
+
+        testExtensions.TestDiscoverers =
+            GetExtensionsDiscoveredFromAssembly(TestDiscoverers, extensionAssembly);
+        testExtensions.TestExecutors =
+            GetExtensionsDiscoveredFromAssembly(TestExecutors, extensionAssembly);
+        testExtensions.TestExecutors2 =
+            GetExtensionsDiscoveredFromAssembly(TestExecutors2, extensionAssembly);
+        testExtensions.TestSettingsProviders =
+            GetExtensionsDiscoveredFromAssembly(TestSettingsProviders, extensionAssembly);
+        testExtensions.TestLoggers =
+            GetExtensionsDiscoveredFromAssembly(TestLoggers, extensionAssembly);
+        testExtensions.TestHosts =
+            GetExtensionsDiscoveredFromAssembly(TestHosts, extensionAssembly);
+        testExtensions.DataCollectors =
+            GetExtensionsDiscoveredFromAssembly(DataCollectors, extensionAssembly);
+
+        if (testExtensions.TestDiscoverers.Count != 0
+            || testExtensions.TestExecutors.Count != 0
+            || testExtensions.TestExecutors2.Count != 0
+            || testExtensions.TestSettingsProviders.Count != 0
+            || testExtensions.TestLoggers.Count != 0
+            || testExtensions.TestHosts.Count != 0
+            || testExtensions.DataCollectors.Count != 0)
+        {
+            // This extension has already been discovered.
+            return testExtensions;
         }
 
-        /// <summary>
-        /// The are test extensions cached.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        internal bool AreTestExtensionsCached<TPluginInfo>() where TPluginInfo : TestPluginInformation
+        return null;
+    }
+
+    internal Dictionary<string, TPluginInfo>? GetTestExtensionCache<TPluginInfo>() where TPluginInfo : TestPluginInformation
+    {
+        Type type = typeof(TPluginInfo);
+
+        if (type == typeof(TestDiscovererPluginInformation))
         {
-            Type type = typeof(TPluginInfo);
-  
-            if (type == typeof(TestDiscovererPluginInformation))
-            {
-                return this.AreTestDiscoverersCached;
-            }
-            else if (type == typeof(TestExecutorPluginInformation))
-            {
-                return this.AreTestExecutorsCached;
-            }
-            else if (type == typeof(TestExecutorPluginInformation2))
-            {
-                return this.AreTestExecutors2Cached;
-            }
-            else if (type == typeof(TestLoggerPluginInformation))
-            {
-                return this.AreTestLoggersCached;
-            }
-            else if (type == typeof(TestSettingsProviderPluginInformation))
-            {
-                return this.AreTestSettingsProvidersCached;
-            }
-            else if (type == typeof(TestRuntimePluginInformation))
-            {
-                return this.AreTestHostsCached;
-            }
-            else if (type == typeof(DataCollectorConfig))
-            {
-                return this.AreDataCollectorsCached;
-            }
+            return (Dictionary<string, TPluginInfo>?)(object?)TestDiscoverers;
+        }
+        else if (type == typeof(TestExecutorPluginInformation))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)TestExecutors;
+        }
+        else if (type == typeof(TestExecutorPluginInformation2))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)TestExecutors2;
+        }
+        else if (type == typeof(TestLoggerPluginInformation))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)TestLoggers;
+        }
+        else if (type == typeof(TestSettingsProviderPluginInformation))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)TestSettingsProviders;
+        }
+        else if (type == typeof(TestRuntimePluginInformation))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)TestHosts;
+        }
+        else if (type == typeof(DataCollectorConfig))
+        {
+            return (Dictionary<string, TPluginInfo>?)(object?)DataCollectors;
+        }
+
+        return null;
+    }
 
-            return false;
+    /// <summary>
+    /// The are test extensions cached.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    internal bool AreTestExtensionsCached<TPluginInfo>() where TPluginInfo : TestPluginInformation
+    {
+        Type type = typeof(TPluginInfo);
+
+        if (type == typeof(TestDiscovererPluginInformation))
+        {
+            return AreTestDiscoverersCached;
+        }
+        else if (type == typeof(TestExecutorPluginInformation))
+        {
+            return AreTestExecutorsCached;
         }
+        else if (type == typeof(TestExecutorPluginInformation2))
+        {
+            return AreTestExecutors2Cached;
+        }
+        else if (type == typeof(TestLoggerPluginInformation))
+        {
+            return AreTestLoggersCached;
+        }
+        else if (type == typeof(TestSettingsProviderPluginInformation))
+        {
+            return AreTestSettingsProvidersCached;
+        }
+        else if (type == typeof(TestRuntimePluginInformation))
+        {
+            return AreTestHostsCached;
+        }
+        else if (type == typeof(DataCollectorConfig))
+        {
+            return AreDataCollectorsCached;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// The set test extensions cache status.
+    /// </summary>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    internal void SetTestExtensionsCacheStatusToTrue<TPluginInfo>() where TPluginInfo : TestPluginInformation
+    {
+        Type type = typeof(TPluginInfo);
 
-        /// <summary>
-        /// The set test extensions cache status.
-        /// </summary>
-        /// <typeparam name="TPluginInfo">
-        /// </typeparam>
-        internal void SetTestExtensionsCacheStatusToTrue<TPluginInfo>() where TPluginInfo : TestPluginInformation
+        if (type == typeof(TestDiscovererPluginInformation))
         {
-            Type type = typeof(TPluginInfo);
-            
-            if (type == typeof(TestDiscovererPluginInformation))
-            {
-                this.AreTestDiscoverersCached = true;
-            }
-            else if (type == typeof(TestExecutorPluginInformation))
-            {
-                this.AreTestExecutorsCached = true;
-            }
-            else if (type == typeof(TestExecutorPluginInformation2))
-            {
-                this.AreTestExecutors2Cached = true;
-            }
-            else if (type == typeof(TestLoggerPluginInformation))
-            {
-                this.AreTestLoggersCached = true;
-            }
-            else if (type == typeof(TestSettingsProviderPluginInformation))
-            {
-                this.AreTestSettingsProvidersCached = true;
-            }
-            else if (type == typeof(TestRuntimePluginInformation))
-            {
-                this.AreTestHostsCached = true;
-            }
-            else if (type == typeof(DataCollectorConfig))
-            {
-                this.AreDataCollectorsCached = true;
-            }
+            AreTestDiscoverersCached = true;
         }
+        else if (type == typeof(TestExecutorPluginInformation))
+        {
+            AreTestExecutorsCached = true;
+        }
+        else if (type == typeof(TestExecutorPluginInformation2))
+        {
+            AreTestExecutors2Cached = true;
+        }
+        else if (type == typeof(TestLoggerPluginInformation))
+        {
+            AreTestLoggersCached = true;
+        }
+        else if (type == typeof(TestSettingsProviderPluginInformation))
+        {
+            AreTestSettingsProvidersCached = true;
+        }
+        else if (type == typeof(TestRuntimePluginInformation))
+        {
+            AreTestHostsCached = true;
+        }
+        else if (type == typeof(DataCollectorConfig))
+        {
+            AreDataCollectorsCached = true;
+        }
+    }
 
-        /// <summary>
-        /// The invalidate cache of plugin infos.
-        /// </summary>
-        internal void InvalidateCache()
-        {
-            this.AreTestDiscoverersCached = false;
-            this.AreTestExecutorsCached = false;
-            this.AreTestExecutors2Cached = false;
-            this.AreTestLoggersCached = false;
-            this.AreTestSettingsProvidersCached = false;
-            this.AreTestHostsCached = false;
-            this.AreDataCollectorsCached = false;
-        }
-
-        /// <summary>
-        /// Gets extensions discovered from assembly.
-        /// </summary>
-        /// <param name="extensionCollection">
-        /// The extension collection.
-        /// </param>
-        /// <param name="extensionAssembly">
-        /// The extension assembly.
-        /// </param>
-        /// <typeparam name="TPluginInfo">
-        /// </typeparam>
-        /// <returns>
-        /// The <see cref="Dictionary"/>. of extensions discovered in assembly
-        /// </returns>
-        internal Dictionary<string, TPluginInfo> GetExtensionsDiscoveredFromAssembly<TPluginInfo>(
-            Dictionary<string, TPluginInfo> extensionCollection,
-            string extensionAssembly)
-        {
-            var extensions = new Dictionary<string, TPluginInfo>();
-            if (extensionCollection != null)
+    /// <summary>
+    /// Gets the cached extensions for the current process.
+    /// </summary>
+    ///
+    /// <returns>A dictionary representing the cached extensions for the current process.</returns>
+    internal Dictionary<string, HashSet<string>> GetCachedExtensions()
+    {
+        var extensions = new Dictionary<string, HashSet<string>>();
+
+        // Write all "known" cached extension.
+        AddCachedExtensionToDictionary(extensions, "TestDiscoverers", TestDiscoverers?.Values);
+        AddCachedExtensionToDictionary(extensions, "TestExecutors", TestExecutors?.Values);
+        AddCachedExtensionToDictionary(extensions, "TestExecutors2", TestExecutors2?.Values);
+        AddCachedExtensionToDictionary(extensions, "TestSettingsProviders", TestSettingsProviders?.Values);
+        AddCachedExtensionToDictionary(extensions, "TestLoggers", TestLoggers?.Values);
+        AddCachedExtensionToDictionary(extensions, "TestHosts", TestHosts?.Values);
+        AddCachedExtensionToDictionary(extensions, "DataCollectors", DataCollectors?.Values);
+
+        return extensions;
+    }
+
+    /// <summary>
+    /// The invalidate cache of plugin infos.
+    /// </summary>
+    internal void InvalidateCache()
+    {
+        AreTestDiscoverersCached = false;
+        AreTestExecutorsCached = false;
+        AreTestExecutors2Cached = false;
+        AreTestLoggersCached = false;
+        AreTestSettingsProvidersCached = false;
+        AreTestHostsCached = false;
+        AreDataCollectorsCached = false;
+    }
+
+    /// <summary>
+    /// Gets extensions discovered from assembly.
+    /// </summary>
+    /// <param name="extensionCollection">
+    /// The extension collection.
+    /// </param>
+    /// <param name="extensionAssembly">
+    /// The extension assembly.
+    /// </param>
+    /// <typeparam name="TPluginInfo">
+    /// </typeparam>
+    /// <returns>
+    /// The <see cref="Dictionary{TKey, TValue}"/>. of extensions discovered in assembly
+    /// </returns>
+    internal static Dictionary<string, TPluginInfo> GetExtensionsDiscoveredFromAssembly<TPluginInfo>(
+        Dictionary<string, TPluginInfo>? extensionCollection,
+        string? extensionAssembly)
+    {
+        var extensions = new Dictionary<string, TPluginInfo>();
+        if (extensionCollection != null)
+        {
+            foreach (var extension in extensionCollection)
             {
-                foreach (var extension in extensionCollection)
+                var testPluginInformation = extension.Value as TestPluginInformation;
+                // TODO: Avoid ArgumentNullException here
+                var extensionType = Type.GetType(testPluginInformation?.AssemblyQualifiedName!);
+                if (string.Equals(extensionType?.Assembly.GetAssemblyLocation(), extensionAssembly))
                 {
-                    var testPluginInformation = extension.Value as TestPluginInformation;
-                    var extensionType = Type.GetType(testPluginInformation?.AssemblyQualifiedName);
-                    if (string.Equals(extensionType.GetTypeInfo().Assembly.GetAssemblyLocation(), extensionAssembly))
-                    {
-                        extensions.Add(extension.Key, extension.Value);
-                    }
+                    extensions.Add(extension.Key, extension.Value);
                 }
             }
-
-            return extensions;
         }
 
-        #endregion
+        return extensions;
+    }
 
-        #region Private methods
+    private void SetTestExtensionCache<TPluginInfo>(Dictionary<string, TPluginInfo> testPluginInfos) where TPluginInfo : TestPluginInformation
+    {
+        Type type = typeof(TPluginInfo);
 
-        private void SetTestExtensionCache<TPluginInfo>(Dictionary<string, TPluginInfo> testPluginInfos) where TPluginInfo : TestPluginInformation
+        if (type == typeof(TestDiscovererPluginInformation))
         {
-            Type type = typeof(TPluginInfo);
+            TestDiscoverers = (Dictionary<string, TestDiscovererPluginInformation>)(object)testPluginInfos;
+        }
+        else if (type == typeof(TestExecutorPluginInformation))
+        {
+            TestExecutors = (Dictionary<string, TestExecutorPluginInformation>)(object)testPluginInfos;
+        }
+        else if (type == typeof(TestExecutorPluginInformation2))
+        {
+            TestExecutors2 = (Dictionary<string, TestExecutorPluginInformation2>)(object)testPluginInfos;
+        }
+        else if (type == typeof(TestLoggerPluginInformation))
+        {
+            TestLoggers = (Dictionary<string, TestLoggerPluginInformation>)(object)testPluginInfos;
+        }
+        else if (type == typeof(TestSettingsProviderPluginInformation))
+        {
+            TestSettingsProviders = (Dictionary<string, TestSettingsProviderPluginInformation>)(object)testPluginInfos;
+        }
+        else if (type == typeof(TestRuntimePluginInformation))
+        {
+            TestHosts = (Dictionary<string, TestRuntimePluginInformation>)(object)testPluginInfos;
+        }
+        else if (type == typeof(DataCollectorConfig))
+        {
+            DataCollectors = (Dictionary<string, DataCollectorConfig>)(object)testPluginInfos;
+        }
+    }
 
-            if (type == typeof(TestDiscovererPluginInformation))
-            {
-                this.TestDiscoverers = (Dictionary<string, TestDiscovererPluginInformation>)(object)testPluginInfos;
-            }
-            else if (type == typeof(TestExecutorPluginInformation))
-            {
-                this.TestExecutors = (Dictionary<string, TestExecutorPluginInformation>)(object)testPluginInfos;
-            }
-            else if (type == typeof(TestExecutorPluginInformation2))
-            {
-                this.TestExecutors2 = (Dictionary<string, TestExecutorPluginInformation2>)(object)testPluginInfos;
-            }
-            else if (type == typeof(TestLoggerPluginInformation))
-            {
-                this.TestLoggers = (Dictionary<string, TestLoggerPluginInformation>)(object)testPluginInfos;
-            }
-            else if (type == typeof(TestSettingsProviderPluginInformation))
-            {
-                this.TestSettingsProviders = (Dictionary<string, TestSettingsProviderPluginInformation>)(object)testPluginInfos;
-            }
-            else if (type == typeof(TestRuntimePluginInformation))
-            {
-                this.TestHosts = (Dictionary<string, TestRuntimePluginInformation>)(object)testPluginInfos;
-            }
-            else if (type == typeof(DataCollectorConfig))
+    private static void AddCachedExtensionToDictionary<T>(
+        Dictionary<string, HashSet<string>> extensionDict,
+        string extensionType,
+        IEnumerable<T>? extensions)
+        where T : TestPluginInformation
+    {
+        if (extensions == null)
+        {
+            return;
+        }
+
+        extensionDict.Add(extensionType, new HashSet<string>(extensions.Select(e => e.IdentifierData!)));
+    }
+
+    private static string SerializeExtensionDictionary(IDictionary<string, HashSet<string>> extensions)
+    {
+        var jsonObject = new JSONObject();
+        foreach (var kvp in extensions)
+        {
+            if (kvp.Value?.Count > 0)
             {
-                this.DataCollectors = (Dictionary<string, DataCollectorConfig>)(object)testPluginInfos;
+                var jsonArray = new JSONArray();
+                foreach (var extension in kvp.Value)
+                {
+                    jsonArray.Add(new JSONString(extension));
+                }
+
+                jsonObject.Add(kvp.Key, jsonArray);
             }
         }
 
-        #endregion
+        return jsonObject.ToString();
+    }
+
+    private static HashSet<string> MergeSets(HashSet<string> firstSet, HashSet<string> secondSet)
+    {
+        var mergedSet = new HashSet<string>(firstSet);
+
+        // No need to worry about duplicates as the set implementation handles this already.
+        foreach (var key in secondSet)
+        {
+            mergedSet.Add(key);
+        }
+
+        return mergedSet;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestLoggerPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestLoggerPluginInformation.cs
index e8e8268346..14b7e06105 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestLoggerPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestLoggerPluginInformation.cs
@@ -1,71 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test logger plugin information.
+/// </summary>
+internal class TestLoggerPluginInformation : TestExtensionPluginInformation
+{
     /// <summary>
-    /// The test logger plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestLoggerPluginInformation : TestExtensionPluginInformation
+    /// <param name="testLoggerType"> The test Logger Type. </param>
+    public TestLoggerPluginInformation(Type testLoggerType)
+        : base(testLoggerType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testLoggerType"> The test Logger Type. </param>
-        public TestLoggerPluginInformation(Type testLoggerType)
-            : base(testLoggerType)
-        {
-            this.FriendlyName = GetFriendlyName(testLoggerType);
-        }
+        FriendlyName = GetFriendlyName(testLoggerType);
+    }
 
-        /// <summary>
-        /// Gets the Friendly Name identifying the logger
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the Friendly Name identifying the logger
+    /// </summary>
+    public string FriendlyName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Metadata for the test plugin
-        /// </summary>
-        public override ICollection<Object> Metadata
+    /// <summary>
+    /// Metadata for the test plugin
+    /// </summary>
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return new Object[] { this.ExtensionUri, this.FriendlyName };
-            }
+            return new object?[] { ExtensionUri, FriendlyName };
         }
+    }
+
+    /// <summary>
+    /// Helper to get the FriendlyName from the FriendlyNameAttribute on logger plugin.
+    /// </summary>
+    /// <param name="testLoggerType">Data type of the test logger</param>
+    /// <returns>FriendlyName identifying the test logger</returns>
+    private static string GetFriendlyName(Type testLoggerType)
+    {
+        string friendlyName = string.Empty;
 
-        /// <summary>
-        /// Helper to get the FriendlyName from the FriendlyNameAttribute on logger plugin.
-        /// </summary>
-        /// <param name="testLoggerType">Data type of the test logger</param>
-        /// <returns>FriendlyName identifying the test logger</returns>
-        private static string GetFriendlyName(Type testLoggerType)
+        object[] attributes = testLoggerType.GetCustomAttributes(typeof(FriendlyNameAttribute), false).ToArray();
+        if (attributes.Length > 0)
         {
-            string friendlyName = string.Empty;
+            FriendlyNameAttribute friendlyNameAttribute = (FriendlyNameAttribute)attributes[0];
 
-            object[] attributes = testLoggerType.GetTypeInfo().GetCustomAttributes(typeof(FriendlyNameAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
+            if (!friendlyNameAttribute.FriendlyName.IsNullOrEmpty())
             {
-                FriendlyNameAttribute friendlyNameAttribute = (FriendlyNameAttribute)attributes[0];
-
-                if (!string.IsNullOrEmpty(friendlyNameAttribute.FriendlyName))
-                {
-                    friendlyName = friendlyNameAttribute.FriendlyName;
-                }
+                friendlyName = friendlyNameAttribute.FriendlyName;
             }
-
-            return friendlyName;
         }
+
+        return friendlyName;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestPluginInformation.cs
index e8aaa5a794..2f25733405 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestPluginInformation.cs
@@ -1,54 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
-    public abstract class TestPluginInformation
+public abstract class TestPluginInformation
+{
+    /// <summary>
+    /// Default constructor
+    /// </summary>
+    /// <param name="testExtensionType">Data type of the test plugin</param>
+    protected TestPluginInformation(Type? testExtensionType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testExtensionType">Data type of the test plugin</param>
-        protected TestPluginInformation(Type testExtensionType)
+        if (testExtensionType != null)
         {
-            if (testExtensionType != null)
-            {
-                this.AssemblyQualifiedName = testExtensionType.AssemblyQualifiedName;
-            }
+            AssemblyQualifiedName = testExtensionType.AssemblyQualifiedName;
         }
+    }
 
-        /// <summary>
-        /// Gets data value identifying the test plugin
-        /// </summary>
-        public virtual string IdentifierData
+    /// <summary>
+    /// Gets data value identifying the test plugin
+    /// </summary>
+    public virtual string? IdentifierData
+    {
+        get
         {
-            get
-            {
-                return this.AssemblyQualifiedName;
-            }
+            return AssemblyQualifiedName;
         }
+    }
 
-        /// <summary>
-        /// Metadata for the test plugin
-        /// </summary>
-        public virtual ICollection<Object> Metadata
+    /// <summary>
+    /// Metadata for the test plugin
+    /// </summary>
+    public virtual ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return new object[] { this.AssemblyQualifiedName };
-            }
+            return new object?[] { AssemblyQualifiedName };
         }
+    }
 
-        /// <summary>
-        /// Gets the Assembly qualified name of the plugin
-        /// </summary>
-        public string AssemblyQualifiedName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the Assembly qualified name of the plugin
+    /// </summary>
+    public string? AssemblyQualifiedName
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets the file path of the plugin
+    /// </summary>
+    public string? FilePath
+    {
+        get;
+        internal set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestRunTimePluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestRunTimePluginInformation.cs
index fc529d5c26..52554b9197 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestRunTimePluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestRunTimePluginInformation.cs
@@ -1,71 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test host plugin information.
+/// </summary>
+internal class TestRuntimePluginInformation : TestExtensionPluginInformation
+{
     /// <summary>
-    /// The test host plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestRuntimePluginInformation : TestExtensionPluginInformation
+    /// <param name="testHostType"> The testhost Type. </param>
+    public TestRuntimePluginInformation(Type? testHostType)
+        : base(testHostType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testHostType"> The testhost Type. </param>
-        public TestRuntimePluginInformation(Type testHostType)
-            : base(testHostType)
-        {
-            this.FriendlyName = GetFriendlyName(testHostType);
-        }
+        FriendlyName = GetFriendlyName(testHostType);
+    }
 
-        /// <summary>
-        /// Gets the Friendly Name identifying the testhost
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the Friendly Name identifying the testhost
+    /// </summary>
+    public string FriendlyName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Metadata for the testhost plugin
-        /// </summary>
-        public override ICollection<Object> Metadata
+    /// <summary>
+    /// Metadata for the testhost plugin
+    /// </summary>
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return new Object[] { this.ExtensionUri, this.FriendlyName };
-            }
+            return new object?[] { ExtensionUri, FriendlyName };
         }
+    }
+
+    /// <summary>
+    /// Helper to get the FriendlyName from the FriendlyNameAttribute on testhost plugin.
+    /// </summary>
+    /// <param name="testHostType">Data type of the testhost</param>
+    /// <returns>FriendlyName identifying the testhost</returns>
+    private static string GetFriendlyName(Type? testHostType)
+    {
+        string friendlyName = string.Empty;
 
-        /// <summary>
-        /// Helper to get the FriendlyName from the FriendlyNameAttribute on testhost plugin.
-        /// </summary>
-        /// <param name="testHostType">Data type of the testhost</param>
-        /// <returns>FriendlyName identifying the testhost</returns>
-        private static string GetFriendlyName(Type testHostType)
+        object[]? attributes = testHostType?.GetCustomAttributes(typeof(FriendlyNameAttribute), false).ToArray();
+        if (attributes != null && attributes.Length > 0)
         {
-            string friendlyName = string.Empty;
+            FriendlyNameAttribute friendlyNameAttribute = (FriendlyNameAttribute)attributes[0];
 
-            object[] attributes = testHostType.GetTypeInfo().GetCustomAttributes(typeof(FriendlyNameAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
+            if (!friendlyNameAttribute.FriendlyName.IsNullOrEmpty())
             {
-                FriendlyNameAttribute friendlyNameAttribute = (FriendlyNameAttribute)attributes[0];
-
-                if (!string.IsNullOrEmpty(friendlyNameAttribute.FriendlyName))
-                {
-                    friendlyName = friendlyNameAttribute.FriendlyName;
-                }
+                friendlyName = friendlyNameAttribute.FriendlyName;
             }
-
-            return friendlyName;
         }
+
+        return friendlyName;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestSettingsProviderPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestSettingsProviderPluginInformation.cs
index 0946b14ab8..3066bb52c8 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestSettingsProviderPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestSettingsProviderPluginInformation.cs
@@ -1,85 +1,83 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
+/// <summary>
+/// The test settings provider plugin information.
+/// </summary>
+internal class TestSettingsProviderPluginInformation : TestPluginInformation
+{
     /// <summary>
-    /// The test settings provider plugin information.
+    /// Default constructor
     /// </summary>
-    internal class TestSettingsProviderPluginInformation : TestPluginInformation
+    /// <param name="testSettingsProviderType"> The test Settings Provider Type. </param>
+    public TestSettingsProviderPluginInformation(Type? testSettingsProviderType)
+        : base(testSettingsProviderType)
     {
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        /// <param name="testSettingsProviderType"> The test Settings Provider Type. </param>
-        public TestSettingsProviderPluginInformation(Type testSettingsProviderType)
-            : base(testSettingsProviderType)
+        if (testSettingsProviderType != null)
         {
-            if (testSettingsProviderType != null)
-            {
-                this.SettingsName = GetTestSettingsName(testSettingsProviderType);
-            }
+            SettingsName = GetTestSettingsName(testSettingsProviderType);
         }
+    }
 
-        /// <summary>
-        /// Gets data value identifying the test plugin
-        /// </summary>
-        public override string IdentifierData
+    /// <summary>
+    /// Gets data value identifying the test plugin
+    /// </summary>
+    public override string? IdentifierData
+    {
+        get
         {
-            get
-            {
-                return this.SettingsName;
-            }
+            return SettingsName;
         }
+    }
 
-        /// <summary>
-        /// Metadata for the test plugin
-        /// </summary>
-        public override ICollection<Object> Metadata
+    /// <summary>
+    /// Metadata for the test plugin
+    /// </summary>
+    public override ICollection<object?> Metadata
+    {
+        get
         {
-            get
-            {
-                return new object[] { this.SettingsName };
-            }
+            return new object?[] { SettingsName };
         }
+    }
 
-        /// <summary>
-        /// Gets name of test settings supported by plugin.
-        /// </summary>
-        public string SettingsName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets name of test settings supported by plugin.
+    /// </summary>
+    public string? SettingsName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Helper to get the test settings name from SettingsNameAttribute on test setting provider plugin.
-        /// </summary>
-        /// <param name="testSettingsProviderType">Data type of test setting provider</param>
-        /// <returns>Test settings name supported by plugin</returns>
-        private static string GetTestSettingsName(Type testSettingsProviderType)
+    /// <summary>
+    /// Helper to get the test settings name from SettingsNameAttribute on test setting provider plugin.
+    /// </summary>
+    /// <param name="testSettingsProviderType">Data type of test setting provider</param>
+    /// <returns>Test settings name supported by plugin</returns>
+    private static string GetTestSettingsName(Type testSettingsProviderType)
+    {
+        string settingName = string.Empty;
+
+        object[] attributes = testSettingsProviderType.GetCustomAttributes(typeof(SettingsNameAttribute), false).ToArray();
+        if (attributes != null && attributes.Length > 0)
         {
-            string settingName = string.Empty;
+            SettingsNameAttribute settingsNameAttribute = (SettingsNameAttribute)attributes[0];
 
-            object[] attributes = testSettingsProviderType.GetTypeInfo().GetCustomAttributes(typeof(SettingsNameAttribute), false).ToArray();
-            if (attributes != null && attributes.Length > 0)
+            if (!settingsNameAttribute.SettingsName.IsNullOrEmpty())
             {
-                SettingsNameAttribute settingsNameAttribute = (SettingsNameAttribute)attributes[0];
-
-                if (!string.IsNullOrEmpty(settingsNameAttribute.SettingsName))
-                {
-                    settingName = settingsNameAttribute.SettingsName;
-                }
+                settingName = settingsNameAttribute.SettingsName;
             }
-
-            return settingName;
         }
+
+        return settingName;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/VSExtensionManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/VSExtensionManager.cs
index 635004ea45..d4e5224d26 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/VSExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/VSExtensionManager.cs
@@ -1,215 +1,199 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+
+/// <summary>
+/// Manager for VisualStudio based extensions
+/// </summary>
+public class VSExtensionManager : IVSExtensionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Resources;
+    private const string ExtensionManagerService = "Microsoft.VisualStudio.ExtensionManager.ExtensionManagerService";
+    private const string ExtensionManagerAssemblyName = @"Microsoft.VisualStudio.ExtensionManager";
+    private const string ExtensionManagerImplAssemblyName = @"Microsoft.VisualStudio.ExtensionManager.Implementation";
 
-    /// <summary>
-    /// Manager for VisualStudio based extensions
-    /// </summary>
-    public class VSExtensionManager : IVSExtensionManager
-    {
-        private const string ExtensionManagerService = "Microsoft.VisualStudio.ExtensionManager.ExtensionManagerService";
-        private const string ExtensionManagerAssemblyName = @"Microsoft.VisualStudio.ExtensionManager";
-        private const string ExtensionManagerImplAssemblyName = @"Microsoft.VisualStudio.ExtensionManager.Implementation";
+    private const string SettingsManagerTypeName = "Microsoft.VisualStudio.Settings.ExternalSettingsManager";
+    private const string SettingsManagerAssemblyName = @"Microsoft.VisualStudio.Settings.15.0";
 
-        private const string SettingsManagerTypeName = "Microsoft.VisualStudio.Settings.ExternalSettingsManager";
-        private const string SettingsManagerAssemblyName = @"Microsoft.VisualStudio.Settings.15.0";
+    private readonly IFileHelper _fileHelper;
 
-        private readonly IFileHelper fileHelper;
+    private Assembly? _extensionManagerAssembly;
+    private Assembly? _extensionManagerImplAssembly;
+    private Type? _extensionManagerServiceType;
 
-        private Assembly extensionManagerAssembly;
-        private Assembly extensionManagerImplAssembly;
-        private Type extensionManagerServiceType;
+    private Assembly? _settingsManagerAssembly;
+    private Type? _settingsManagerType;
 
-        private Assembly settingsManagerAssembly;
-        private Type settingsManagerType;
+    /// <summary>
+    /// Default constructor for manager for Visual Studio based extensions
+    /// </summary>
+    public VSExtensionManager()
+        : this(new FileHelper())
+    {
+    }
 
-        /// <summary>
-        /// Default constructor for manager for Visual Studio based extensions
-        /// </summary>
-        public VSExtensionManager() : this(new FileHelper())
+    internal VSExtensionManager(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
+
+    /// <summary>
+    /// Get the available unit test extensions installed.
+    /// If no extensions are installed then it returns an empty list.
+    /// </summary>
+    /// <returns></returns>
+    public IEnumerable<string> GetUnitTestExtensions()
+    {
+        try
         {
+            return GetTestExtensionsInternal(Constants.UnitTestExtensionType);
         }
-
-        internal VSExtensionManager(IFileHelper fileHelper)
+        catch (Exception ex)
         {
-            this.fileHelper = fileHelper;
+            string message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.FailedToFindInstalledUnitTestExtensions, ex);
+            throw new TestPlatformException(message, ex);
         }
+    }
 
-        /// <summary>
-        /// Get the available unit test extensions installed.
-        /// If no extensions are installed then it returns an empty list.
-        /// </summary>
-        /// <returns></returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public IEnumerable<string> GetUnitTestExtensions()
+    /// <summary>
+    /// Get the unit tests extensions
+    /// </summary>
+    private IEnumerable<string> GetTestExtensionsInternal(string extensionType)
+    {
+        IEnumerable<string>? installedExtensions = new List<string>();
+
+        // Navigate up to the IDE folder
+        // In case of xcopyable vstest.console, this functionality is not supported.
+        var installContext = new InstallationContext(_fileHelper);
+        if (!installContext.TryGetVisualStudioDirectory(out string vsInstallPath))
         {
-            try
-            {
-                return GetTestExtensionsInternal(Constants.UnitTestExtensionType);
-            }
-            catch (Exception ex)
-            {
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.FailedToFindInstalledUnitTestExtensions, ex);
-                throw new TestPlatformException(message, ex);
-            }
+            throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.VSInstallationNotFound));
         }
 
-        /// <summary>
-        /// Get the unit tests extensions
-        /// </summary>
-        private IEnumerable<string> GetTestExtensionsInternal(string extensionType)
+        // Adding resolution paths for resolving dependencies.
+        var resolutionPaths = installContext.GetVisualStudioCommonLocations(vsInstallPath);
+        using (var assemblyResolver = new AssemblyResolver(resolutionPaths))
         {
-            IEnumerable<string> installedExtensions = new List<string>();
-
-            // Navigate up to the IDE folder
-            // In case of xcopyable vstest.console, this functionality is not supported.
-            var installContext = new InstallationContext(this.fileHelper);
-            if (!installContext.TryGetVisualStudioDirectory(out string vsInstallPath))
+            var settingsManager = SettingsManagerType.GetMethod("CreateForApplication", [typeof(string)])?.Invoke(null, [installContext.GetVisualStudioPath(vsInstallPath)]);
+            if (settingsManager == null)
             {
-                throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, Resources.VSInstallationNotFound));
+                EqtTrace.Warning("VSExtensionManager : Unable to create settings manager");
+                return installedExtensions;
             }
 
-            // Adding resolution paths for resolving dependencies.
-            var resolutionPaths = installContext.GetVisualStudioCommonLocations(vsInstallPath);
-            using (var assemblyResolver = new AssemblyResolver(resolutionPaths))
+            try
             {
-                object extensionManager;
-                object settingsManager;
+                // create extension manager
+                var extensionManager = Activator.CreateInstance(ExtensionManagerServiceType, settingsManager);
 
-                settingsManager = SettingsManagerType.GetMethod("CreateForApplication", new Type[] { typeof(String) }).Invoke(null, new object[] { installContext.GetVisualStudioPath(vsInstallPath) });
-                if (settingsManager != null)
+                if (extensionManager != null)
                 {
-                    try
-                    {
-                        // create extension manager
-                        extensionManager = Activator.CreateInstance(ExtensionManagerServiceType, settingsManager);
-
-                        if (extensionManager != null)
-                        {
-                            installedExtensions = ExtensionManagerServiceType.GetMethod("GetEnabledExtensionContentLocations", new Type[] { typeof(String) }).Invoke(
-                                                       extensionManager, new object[] { extensionType }) as IEnumerable<string>;
-                        }
-                        else
-                        {
-                            if (EqtTrace.IsWarningEnabled)
-                            {
-                                EqtTrace.Warning("VSExtensionManager : Unable to create extension manager");
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        // Dispose the settings manager
-                        IDisposable disposable = (settingsManager as IDisposable);
-                        if (disposable != null)
-                        {
-                            disposable.Dispose();
-                        }
-                    }
+                    installedExtensions = ExtensionManagerServiceType.GetMethod("GetEnabledExtensionContentLocations", [typeof(string)])?.Invoke(
+                        extensionManager, [extensionType]) as IEnumerable<string>;
                 }
                 else
                 {
-                    if(EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("VSExtensionManager : Unable to create settings manager");
-                    }
+                    EqtTrace.Warning("VSExtensionManager : Unable to create extension manager");
                 }
             }
-
-            return installedExtensions;
-        }
-
-        /// <summary>
-        /// Used to explicitly load Microsoft.VisualStudio.ExtensionManager.dll
-        /// </summary>
-        private Assembly ExtensionManagerDefAssembly
-        {
-            get
+            finally
             {
-                if (extensionManagerAssembly == null)
+                // Dispose the settings manager
+                if (settingsManager is IDisposable disposable)
                 {
-                    extensionManagerAssembly = Assembly.Load(new AssemblyName(ExtensionManagerAssemblyName));
+                    disposable.Dispose();
                 }
-                return extensionManagerAssembly;
             }
         }
 
-        /// <summary>
-        /// Used to explicitly load Microsoft.VisualStudio.ExtensionManager.Implementation.dll
-        /// </summary>
-        private Assembly ExtensionManagerImplAssembly
+        return installedExtensions ?? new List<string>();
+    }
+
+    /// <summary>
+    /// Used to explicitly load Microsoft.VisualStudio.ExtensionManager.dll
+    /// </summary>
+    private Assembly ExtensionManagerDefAssembly
+    {
+        get
+        {
+            _extensionManagerAssembly ??= Assembly.Load(new AssemblyName(ExtensionManagerAssemblyName));
+            return _extensionManagerAssembly;
+        }
+    }
+
+    /// <summary>
+    /// Used to explicitly load Microsoft.VisualStudio.ExtensionManager.Implementation.dll
+    /// </summary>
+    private Assembly? ExtensionManagerImplAssembly
+    {
+        get
         {
-            get
+            if (_extensionManagerImplAssembly == null)
             {
-                if (extensionManagerImplAssembly == null)
+                // Make sure ExtensionManager assembly is already loaded.
+                Assembly extensionMgrAssembly = ExtensionManagerDefAssembly;
+                if (extensionMgrAssembly != null)
                 {
-                    // Make sure ExtensionManager assembly is already loaded.
-                    Assembly extensionMgrAssembly = ExtensionManagerDefAssembly;
-                    if (extensionMgrAssembly != null)
-                    {
-                        extensionManagerImplAssembly = Assembly.Load(new AssemblyName(ExtensionManagerImplAssemblyName));
-                    }
+                    _extensionManagerImplAssembly = Assembly.Load(new AssemblyName(ExtensionManagerImplAssemblyName));
                 }
-
-                return extensionManagerImplAssembly;
             }
+
+            return _extensionManagerImplAssembly;
         }
+    }
 
-        /// <summary>
-        /// Returns the Type of ExtensionManagerService.
-        /// </summary>
-        private Type ExtensionManagerServiceType
+    /// <summary>
+    /// Returns the Type of ExtensionManagerService.
+    /// </summary>
+    private Type ExtensionManagerServiceType
+    {
+        get
         {
-            get
+            if (_extensionManagerServiceType == null)
             {
-                if (extensionManagerServiceType == null)
-                {
-                    extensionManagerServiceType = ExtensionManagerImplAssembly.GetType(ExtensionManagerService);
-                }
-                return extensionManagerServiceType;
+                TPDebug.Assert(ExtensionManagerImplAssembly is not null, "ExtensionManagerImplAssembly is null");
+                _extensionManagerServiceType = ExtensionManagerImplAssembly.GetType(ExtensionManagerService);
+                TPDebug.Assert(_extensionManagerServiceType is not null, "_extensionManagerServiceType is null");
             }
+            return _extensionManagerServiceType;
         }
+    }
 
-        /// <summary>
-        /// Used to explicitly load Microsoft.VisualStudio.Settings.15.0.dll
-        /// </summary>
-        private Assembly SettingsManagerAssembly
+    /// <summary>
+    /// Used to explicitly load Microsoft.VisualStudio.Settings.15.0.dll
+    /// </summary>
+    private Assembly SettingsManagerAssembly
+    {
+        get
         {
-            get
-            {
-                if (settingsManagerAssembly == null)
-                {
-                    settingsManagerAssembly = Assembly.Load(new AssemblyName(SettingsManagerAssemblyName));
-                }
+            _settingsManagerAssembly ??= Assembly.Load(new AssemblyName(SettingsManagerAssemblyName));
 
-                return settingsManagerAssembly;
-            }
+            return _settingsManagerAssembly;
         }
+    }
 
-        private Type SettingsManagerType
+    private Type SettingsManagerType
+    {
+        get
         {
-            get
+            if (_settingsManagerType == null)
             {
-                if (settingsManagerType == null)
-                {
-                    settingsManagerType = SettingsManagerAssembly.GetType(SettingsManagerTypeName);
-                }
-
-                return settingsManagerType;
+                _settingsManagerType = SettingsManagerAssembly.GetType(SettingsManagerTypeName);
+                TPDebug.Assert(_settingsManagerType is not null, "_settingsManagerType is null");
             }
+
+            return _settingsManagerType;
         }
     }
 }
-
diff --git a/src/Microsoft.TestPlatform.Common/ExternalAssemblyVersions.cs b/src/Microsoft.TestPlatform.Common/ExternalAssemblyVersions.cs
new file mode 100644
index 0000000000..f05cf8adc3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/ExternalAssemblyVersions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform;
+
+internal class ExternalAssemblyVersions
+{
+    /// <summary>
+    /// Refers to the versions of the assemblies retrieved from the
+    /// Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness package.
+    /// The Package version can be found in "eng\Versions.props"
+    /// </summary>
+    internal const string MicrosoftFakesAssemblyVersion = "18.0.0.0";
+}
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/Condition.cs b/src/Microsoft.TestPlatform.Common/Filtering/Condition.cs
index 1020100988..6d112c3fd3 100644
--- a/src/Microsoft.TestPlatform.Common/Filtering/Condition.cs
+++ b/src/Microsoft.TestPlatform.Common/Filtering/Condition.cs
@@ -1,395 +1,377 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+internal enum Operation
+{
+    Equal,
+    NotEqual,
+    Contains,
+    NotContains
+}
+
+/// <summary>
+/// Operator in order of precedence.
+/// Precedence(And) > Precedence(Or)
+/// Precedence of OpenBrace and CloseBrace operators is not used, instead parsing code takes care of same.
+/// </summary>
+internal enum Operator
+{
+    None,
+    Or,
+    And,
+    OpenBrace,
+    CloseBrace,
+}
+
+/// <summary>
+/// Represents a condition in filter expression.
+/// </summary>
+internal class Condition
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
-
-    internal enum Operation
+    /// <summary>
+    ///  Default property name which will be used when filter has only property value.
+    /// </summary>
+    public const string DefaultPropertyName = "FullyQualifiedName";
+
+    /// <summary>
+    ///  Default operation which will be used when filter has only property value.
+    /// </summary>
+    public const Operation DefaultOperation = Operation.Contains;
+
+    /// <summary>
+    /// Name of the property used in condition.
+    /// </summary>
+    internal string Name
     {
-        Equal,
-        NotEqual,
-        Contains,
-        NotContains
+        get;
+        private set;
     }
 
     /// <summary>
-    /// Operator in order of precedence.
-    /// Precedence(And) > Precedence(Or)
-    /// Precedence of OpenBrace and CloseBrace operators is not used, instead parsing code takes care of same.
+    /// Value for the property.
     /// </summary>
-    internal enum Operator
+    internal string Value
     {
-        None,
-        Or,
-        And,
-        OpenBrace,
-        CloseBrace,
+        get;
+        private set;
     }
 
     /// <summary>
-    /// Represents a condition in filter expression.
+    /// Operation to be performed.
     /// </summary>
-    internal class Condition
+    internal Operation Operation
     {
-        #region Fields
-
-        /// <summary>
-        ///  Default property name which will be used when filter has only property value.
-        /// </summary>
-        public const string DefaultPropertyName = "FullyQualifiedName";
-
-        /// <summary>
-        ///  Default operation which will be used when filter has only property value.
-        /// </summary>
-        public const Operation DefaultOperation = Operation.Contains;
-
-        /// <summary>
-        /// Name of the property used in condition.
-        /// </summary>
-        internal string Name
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Value for the property.
-        /// </summary>
-        internal string Value
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Operation to be performed.
-        /// </summary>
-        internal Operation Operation
-        {
-            get;
-            private set;
-        }
-        #endregion
-
-        #region Constructors
-        internal Condition(string name, Operation operation, string value)
-        {
-            this.Name = name;
-            this.Operation = operation;
-            this.Value = value;
-        }
-        #endregion
-
+        get;
+        private set;
+    }
+    internal Condition(string name, Operation operation, string value)
+    {
+        Name = name;
+        Operation = operation;
+        Value = value;
+    }
 
-        /// <summary>
-        /// Evaluate this condition for testObject.
-        /// </summary>
-        internal bool Evaluate(Func<string, object> propertyValueProvider)
+    /// <summary>
+    /// Evaluate this condition for testObject.
+    /// </summary>
+    internal bool Evaluate(Func<string, object?> propertyValueProvider)
+    {
+        ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
+        var result = false;
+        var multiValue = GetPropertyValue(propertyValueProvider);
+        switch (Operation)
         {
-            ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
-            var result = false;
-            var multiValue = this.GetPropertyValue(propertyValueProvider);
-            switch (this.Operation)
-            {
-                case Operation.Equal:
-                    // if any value in multi-valued property matches 'this.Value', for Equal to evaluate true.
-                    if (null != multiValue)
+            case Operation.Equal:
+                // if any value in multi-valued property matches 'this.Value', for Equal to evaluate true.
+                if (null != multiValue)
+                {
+                    foreach (string propertyValue in multiValue)
                     {
-                        foreach (string propertyValue in multiValue)
+                        result = result || string.Equals(propertyValue, Value, StringComparison.OrdinalIgnoreCase);
+                        if (result)
                         {
-                            result = result || string.Equals(propertyValue, Value, StringComparison.OrdinalIgnoreCase);
-                            if (result)
-                            {
-                                break;
-                            }
+                            break;
                         }
                     }
-                    break;
+                }
+                break;
 
 
-                case Operation.NotEqual:
-                    // all values in multi-valued property should not match 'this.Value' for NotEqual to evaluate true.
-                    result = true;
+            case Operation.NotEqual:
+                // all values in multi-valued property should not match 'this.Value' for NotEqual to evaluate true.
+                result = true;
 
-                    // if value is null.
-                    if (null != multiValue)
+                // if value is null.
+                if (null != multiValue)
+                {
+                    foreach (string propertyValue in multiValue)
                     {
-                        foreach (string propertyValue in multiValue)
+                        result = result && !string.Equals(propertyValue, Value, StringComparison.OrdinalIgnoreCase);
+                        if (!result)
                         {
-                            result = result && !string.Equals(propertyValue, Value, StringComparison.OrdinalIgnoreCase);
-                            if (!result)
-                            {
-                                break;
-                            }
+                            break;
                         }
                     }
-                    break;
+                }
+                break;
 
-                case Operation.Contains:
-                    // if any value in multi-valued property contains 'this.Value' for 'Contains' to be true.
-                    if (null != multiValue)
+            case Operation.Contains:
+                // if any value in multi-valued property contains 'this.Value' for 'Contains' to be true.
+                if (null != multiValue)
+                {
+                    foreach (string propertyValue in multiValue)
                     {
-                        foreach (string propertyValue in multiValue)
+                        TPDebug.Assert(null != propertyValue, "PropertyValue can not be null.");
+                        result = result || propertyValue.IndexOf(Value, StringComparison.OrdinalIgnoreCase) != -1;
+                        if (result)
                         {
-                            Debug.Assert(null != propertyValue, "PropertyValue can not be null.");
-                            result = result || propertyValue.IndexOf(Value, StringComparison.OrdinalIgnoreCase) != -1;
-                            if (result)
-                            {
-                                break;
-                            }
+                            break;
                         }
                     }
-                    break;
+                }
+                break;
 
-                case Operation.NotContains:
-                    // all values in multi-valued property should not contain 'this.Value' for NotContains to evaluate true.
-                    result = true;
+            case Operation.NotContains:
+                // all values in multi-valued property should not contain 'this.Value' for NotContains to evaluate true.
+                result = true;
 
-                    if (null != multiValue)
+                if (null != multiValue)
+                {
+                    foreach (string propertyValue in multiValue)
                     {
-                        foreach (string propertyValue in multiValue)
+                        TPDebug.Assert(null != propertyValue, "PropertyValue can not be null.");
+                        result = result && propertyValue.IndexOf(Value, StringComparison.OrdinalIgnoreCase) == -1;
+                        if (!result)
                         {
-                            Debug.Assert(null != propertyValue, "PropertyValue can not be null.");
-                            result = result && propertyValue.IndexOf(Value, StringComparison.OrdinalIgnoreCase) == -1;
-                            if (!result)
-                            {
-                                break;
-                            }
+                            break;
                         }
                     }
-                    break;
-            }
-            return result;
+                }
+                break;
         }
+        return result;
+    }
 
-        /// <summary>
-        /// Returns a condition object after parsing input string of format '<propertyName>Operation<propertyValue>'
-        /// </summary>
-        internal static Condition Parse(string conditionString)
+    /// <summary>
+    /// Returns a condition object after parsing input string of format '<propertyName>Operation</propertyName>'
+    /// </summary>
+    internal static Condition Parse(string? conditionString)
+    {
+        if (conditionString.IsNullOrWhiteSpace())
         {
-            if (string.IsNullOrWhiteSpace(conditionString))
-            {
-                ThrownFormatExceptionForInvalidCondition(conditionString);
-            }
+            ThrownFormatExceptionForInvalidCondition(conditionString);
+        }
 
-            var parts = TokenizeFilterConditionString(conditionString).ToArray();
-            if (parts.Length == 1)
-            {
-                // If only parameter values is passed, create condition with default property name,
-                // default operation and given condition string as parameter value.
-                return new Condition(Condition.DefaultPropertyName, Condition.DefaultOperation, FilterHelper.Unescape(conditionString.Trim()));
-            }
+        var parts = TokenizeFilterConditionString(conditionString).ToArray();
+        if (parts.Length == 1)
+        {
+            // If only parameter values is passed, create condition with default property name,
+            // default operation and given condition string as parameter value.
+            return new Condition(DefaultPropertyName, DefaultOperation, FilterHelper.Unescape(conditionString.Trim()));
+        }
 
-            if (parts.Length != 3)
+        if (parts.Length != 3)
+        {
+            ThrownFormatExceptionForInvalidCondition(conditionString);
+        }
+
+        for (int index = 0; index < 3; index++)
+        {
+            if (parts[index].IsNullOrWhiteSpace())
             {
                 ThrownFormatExceptionForInvalidCondition(conditionString);
             }
+            parts[index] = parts[index].Trim();
+        }
 
-            for (int index = 0; index < 3; index++)
-            {
-                if (string.IsNullOrWhiteSpace(parts[index]))
-                {
-                    ThrownFormatExceptionForInvalidCondition(conditionString);
-                }
-                parts[index] = parts[index].Trim();
-            }
+        Operation operation = GetOperator(parts[1]);
+        Condition condition = new(parts[0], operation, FilterHelper.Unescape(parts[2]));
+        return condition;
+    }
 
-            Operation operation = GetOperator(parts[1]);
-            Condition condition = new Condition(parts[0], operation, FilterHelper.Unescape(parts[2]));
-            return condition;
-        }
+    [DoesNotReturn]
+    private static void ThrownFormatExceptionForInvalidCondition(string? conditionString)
+    {
+        throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException,
+            string.Format(CultureInfo.CurrentCulture, CommonResources.InvalidCondition, conditionString)));
+    }
 
-        private static void ThrownFormatExceptionForInvalidCondition(string conditionString)
-        {
-            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException,
-                string.Format(CultureInfo.CurrentCulture, CommonResources.InvalidCondition, conditionString)));
-        }
+    /// <summary>
+    /// Check if condition validates any property in properties.
+    /// </summary>
+    internal bool ValidForProperties(IEnumerable<string> properties, Func<string, TestProperty?>? propertyProvider)
+    {
+        bool valid = false;
 
-        /// <summary>
-        /// Check if condition validates any property in properties.
-        /// </summary>
-        internal bool ValidForProperties(IEnumerable<string> properties, Func<string, TestProperty> propertyProvider)
+        if (properties.Contains(Name, StringComparer.OrdinalIgnoreCase))
         {
-            bool valid = false;
+            valid = true;
 
-            if (properties.Contains(this.Name, StringComparer.OrdinalIgnoreCase))
+            // Check if operation ~ (Contains) is on property of type string.
+            if (Operation == Operation.Contains)
             {
-                valid = true;
-
-                // Check if operation ~ (Contains) is on property of type string.
-                if (this.Operation == Operation.Contains)
-                {
-                    valid = this.ValidForContainsOperation(propertyProvider);
-                }
+                valid = ValidForContainsOperation(propertyProvider);
             }
-            return valid;
         }
+        return valid;
+    }
 
-        private bool ValidForContainsOperation(Func<string, TestProperty> propertyProvider)
-        {
-            bool valid = true;
+    private bool ValidForContainsOperation(Func<string, TestProperty?>? propertyProvider)
+    {
+        bool valid = true;
 
-            // It is OK for propertyProvider to be null, no syntax check will happen.
+        // It is OK for propertyProvider to be null, no syntax check will happen.
 
-            // Check validity of operator only if related TestProperty is non-null.
-            // if null, it might be custom validation ignore it.
-            if (null != propertyProvider)
+        // Check validity of operator only if related TestProperty is non-null.
+        // if null, it might be custom validation ignore it.
+        if (null != propertyProvider)
+        {
+            TestProperty? testProperty = propertyProvider(Name);
+            if (null != testProperty)
             {
-                TestProperty testProperty = propertyProvider(Name);
-                if (null != testProperty)
-                {
-                    Type propertyType = testProperty.GetValueType();
-                    valid = typeof(string) == propertyType ||
-                            typeof(string[]) == propertyType;
-                }
+                Type propertyType = testProperty.GetValueType();
+                valid = typeof(string) == propertyType ||
+                        typeof(string[]) == propertyType;
             }
-            return valid;
         }
+        return valid;
+    }
 
-        /// <summary>
-        /// Return Operation corresponding to the operationString
-        /// </summary>
-        private static Operation GetOperator(string operationString)
+    /// <summary>
+    /// Return Operation corresponding to the operationString
+    /// </summary>
+    private static Operation GetOperator(string operationString)
+    {
+        return operationString switch
         {
-            switch (operationString)
-            {
-                case "=":
-                    return Operation.Equal;
-
-                case "!=":
-                    return Operation.NotEqual;
-
-                case "~":
-                    return Operation.Contains;
-
-                case "!~":
-                    return Operation.NotContains;
-            }
-            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, string.Format(CultureInfo.CurrentCulture, CommonResources.InvalidOperator, operationString)));
-        }
+            "=" => Operation.Equal,
+            "!=" => Operation.NotEqual,
+            "~" => Operation.Contains,
+            "!~" => Operation.NotContains,
+            _ => throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, string.Format(CultureInfo.CurrentCulture, CommonResources.InvalidOperator, operationString))),
+        };
+    }
 
-        /// <summary>
-        /// Returns property value for Property using propertValueProvider.
-        /// </summary>
-        private string[] GetPropertyValue(Func<string, Object> propertyValueProvider)
+    /// <summary>
+    /// Returns property value for Property using propertValueProvider.
+    /// </summary>
+    private string[]? GetPropertyValue(Func<string, object?> propertyValueProvider)
+    {
+        var propertyValue = propertyValueProvider(Name);
+        if (null != propertyValue)
         {
-            var propertyValue = propertyValueProvider(this.Name);
-            if (null != propertyValue)
+            if (propertyValue is not string[] multiValue)
             {
-                var multiValue = propertyValue as string[];
-                if (null == multiValue)
-                {
-                    multiValue = new string[1];
-                    multiValue[0] = propertyValue.ToString();
-                }
-                return multiValue;
+                multiValue = new string[1];
+                multiValue[0] = propertyValue.ToString()!;
             }
-
-            return null;
+            return multiValue;
         }
 
-        internal static IEnumerable<string> TokenizeFilterConditionString(string str)
-        {
-            if (str == null)
-            {
-                throw new ArgumentNullException(nameof(str));
-            }
+        return null;
+    }
+
+    internal static IEnumerable<string> TokenizeFilterConditionString(string str)
+    {
+        return str == null ? throw new ArgumentNullException(nameof(str)) : TokenizeFilterConditionStringWorker(str);
 
-            return TokenizeFilterConditionStringWorker(str);
+        static IEnumerable<string> TokenizeFilterConditionStringWorker(string s)
+        {
+            StringBuilder tokenBuilder = new();
 
-            IEnumerable<string> TokenizeFilterConditionStringWorker(string s)
+            var last = '\0';
+            for (int i = 0; i < s.Length; ++i)
             {
-                StringBuilder tokenBuilder = new StringBuilder();
+                var current = s[i];
 
-                var last = '\0';
-                for (int i = 0; i < s.Length; ++i)
+                if (last == FilterHelper.EscapeCharacter)
                 {
-                    var current = s[i];
+                    // Don't check if `current` is one of the special characters here.
+                    // Instead, we blindly let any character follows '\' pass though and
+                    // relies on `FilterHelpers.Unescape` to report such errors.
+                    tokenBuilder.Append(current);
 
-                    if (last == FilterHelper.EscapeCharacter)
+                    if (current == FilterHelper.EscapeCharacter)
                     {
-                        // Don't check if `current` is one of the special characters here.
-                        // Instead, we blindly let any character follows '\' pass though and
-                        // relies on `FilterHelpers.Unescape` to report such errors.
-                        tokenBuilder.Append(current);
-
-                        if (current == FilterHelper.EscapeCharacter)
-                        {
-                            // We just encountered double backslash (i.e. escaped '\'), therefore set `last` to '\0'
-                            // so the second '\' (i.e. current) will not be treated as the prefix of escape sequence
-                            // in next iteration.
-                            current = '\0';
-                        }
+                        // We just encountered double backslash (i.e. escaped '\'), therefore set `last` to '\0'
+                        // so the second '\' (i.e. current) will not be treated as the prefix of escape sequence
+                        // in next iteration.
+                        current = '\0';
                     }
-                    else
+                }
+                else
+                {
+                    switch (current)
                     {
-                        switch (current)
-                        {
-                            case '=':
-                                if (tokenBuilder.Length > 0)
-                                {
-                                    yield return tokenBuilder.ToString();
-                                    tokenBuilder.Clear();
-                                }
-                                yield return "=";
-                                break;
-
-                            case '!':
-                                if (tokenBuilder.Length > 0)
-                                {
-                                    yield return tokenBuilder.ToString();
-                                    tokenBuilder.Clear();
-                                }
-                                // Determine if this is a "!=" or "!~" or just a single "!".
-                                var next = i + 1;
-                                if (next < s.Length && s[next] == '=')
-                                {
-                                    i = next;
-                                    current = '=';
-                                    yield return "!=";
-                                }
-                                else if (next < s.Length && s[next] == '~')
-                                {
-                                    i = next;
-                                    current = '~';
-                                    yield return "!~";
-                                }
-                                else
-                                {
-                                    yield return "!";
-                                }
-                                break;
-
-                            case '~':
-                                if (tokenBuilder.Length > 0)
-                                {
-                                    yield return tokenBuilder.ToString();
-                                    tokenBuilder.Clear();
-                                }
-                                yield return "~";
-                                break;
-
-                            default:
-                                tokenBuilder.Append(current);
-                                break;
-                        }
+                        case '=':
+                            if (tokenBuilder.Length > 0)
+                            {
+                                yield return tokenBuilder.ToString();
+                                tokenBuilder.Clear();
+                            }
+                            yield return "=";
+                            break;
+
+                        case '!':
+                            if (tokenBuilder.Length > 0)
+                            {
+                                yield return tokenBuilder.ToString();
+                                tokenBuilder.Clear();
+                            }
+                            // Determine if this is a "!=" or "!~" or just a single "!".
+                            var next = i + 1;
+                            if (next < s.Length && s[next] == '=')
+                            {
+                                i = next;
+                                current = '=';
+                                yield return "!=";
+                            }
+                            else if (next < s.Length && s[next] == '~')
+                            {
+                                i = next;
+                                current = '~';
+                                yield return "!~";
+                            }
+                            else
+                            {
+                                yield return "!";
+                            }
+                            break;
+
+                        case '~':
+                            if (tokenBuilder.Length > 0)
+                            {
+                                yield return tokenBuilder.ToString();
+                                tokenBuilder.Clear();
+                            }
+                            yield return "~";
+                            break;
+
+                        default:
+                            tokenBuilder.Append(current);
+                            break;
                     }
-                    last = current;
                 }
+                last = current;
+            }
 
-                if (tokenBuilder.Length > 0)
-                {
-                    yield return tokenBuilder.ToString();
-                }
+            if (tokenBuilder.Length > 0)
+            {
+                yield return tokenBuilder.ToString();
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs b/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs
index c452f2317a..856a1c1487 100644
--- a/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs
+++ b/src/Microsoft.TestPlatform.Common/Filtering/FastFilter.cs
@@ -1,225 +1,221 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+internal sealed class FastFilter
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.Immutable;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Text.RegularExpressions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    internal sealed class FastFilter
-    {
-        internal ImmutableDictionary<string, ISet<string>> FilterProperties { get; }
+    internal ImmutableDictionary<string, ISet<string>> FilterProperties { get; }
 
-        internal bool IsFilteredOutWhenMatched { get; }
+    internal bool IsFilteredOutWhenMatched { get; }
 
-        internal Regex PropertyValueRegex { get; set; }
+    internal Regex? PropertyValueRegex { get; set; }
 
-        internal string PropertyValueRegexReplacement { get; set; }
+    internal string? PropertyValueRegexReplacement { get; set; }
 
-        internal FastFilter(ImmutableDictionary<string, ISet<string>> filterProperties, Operation filterOperation, Operator filterOperator)
-        {
-            ValidateArg.NotNullOrEmpty(filterProperties, nameof(filterProperties));
+    internal FastFilter(ImmutableDictionary<string, ISet<string>> filterProperties, Operation filterOperation, Operator filterOperator)
+    {
+        ValidateArg.NotNullOrEmpty(filterProperties, nameof(filterProperties));
 
-            this.FilterProperties = filterProperties;
+        FilterProperties = filterProperties;
 
-            if (filterOperation == Operation.Equal && (filterOperator == Operator.Or || filterOperator == Operator.None))
-            {
-                IsFilteredOutWhenMatched = false;
-            }
-            else if (filterOperation == Operation.NotEqual && (filterOperator == Operator.And || filterOperator == Operator.None))
-            {
-                IsFilteredOutWhenMatched = true;
-            }
-            else
-            {
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.FastFilterException));
-            }
-        }
+        IsFilteredOutWhenMatched =
+            (filterOperation != Operation.Equal || filterOperator != Operator.Or && filterOperator != Operator.None)
+            && (filterOperation == Operation.NotEqual && (filterOperator == Operator.And || filterOperator == Operator.None)
+                ? true
+                : throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.FastFilterException)));
+    }
 
-        internal string[] ValidForProperties(IEnumerable<string> properties)
+    internal string[]? ValidForProperties(IEnumerable<string>? properties)
+    {
+        if (properties is null)
         {
-            return this.FilterProperties.Keys.All(name => properties.Contains(name))
-                ? null
-                : this.FilterProperties.Keys.Where(name => !properties.Contains(name)).ToArray();
+            return null;
         }
 
-        internal bool Evaluate(Func<string, Object> propertyValueProvider)
-        {
-            ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
-
-            bool matched = false;
-            foreach (var name in this.FilterProperties.Keys)
-            {
-                // If there is no value corresponding to given name, treat it as unmatched.
-                if (TryGetPropertyValue(name, propertyValueProvider, out var singleValue, out var multiValues))
-                {
-                    if (singleValue != null)
-                    {
-                        var value = PropertyValueRegex == null ? singleValue : ApplyRegex(singleValue);
-                        matched = value != null && this.FilterProperties[name].Contains(value);
-                    }
-                    else
-                    {
-                        matched = (PropertyValueRegex == null ? multiValues : multiValues.Select(value => ApplyRegex(value)))
-                            .Any(result => result != null && this.FilterProperties[name].Contains(result));
-                    }
-
-                    if (matched)
-                    {
-                        break;
-                    }
-                }
-            }
+        return FilterProperties.Keys.All(name => properties.Contains(name))
+            ? null
+            : FilterProperties.Keys.Where(name => !properties.Contains(name)).ToArray();
+    }
 
-            return IsFilteredOutWhenMatched ? !matched : matched;
-        }
+    internal bool Evaluate(Func<string, object?> propertyValueProvider)
+    {
+        ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
 
-        /// <summary>
-        /// Apply regex matching or replacement to given value.
-        /// </summary>
-        /// <returns>For matching, returns the result of matching, null if no match found. For replacement, returns the result of replacement.</returns>
-        private string ApplyRegex(string value)
+        bool matched = false;
+        foreach (var name in FilterProperties.Keys)
         {
-            Debug.Assert(PropertyValueRegex != null);
+            // If there is no value corresponding to given name, treat it as unmatched.
+            if (!TryGetPropertyValue(name, propertyValueProvider, out var singleValue, out var multiValues))
+            {
+                continue;
+            }
 
-            string result = null;
-            if (PropertyValueRegexReplacement == null)
+            if (singleValue != null)
             {
-                var match = PropertyValueRegex.Match(value);
-                if (match.Success)
-                {
-                    result = match.Value;
-                }
+                var value = PropertyValueRegex == null ? singleValue : ApplyRegex(singleValue);
+                matched = value != null && FilterProperties[name].Contains(value);
             }
             else
             {
-                result = PropertyValueRegex.Replace(value, PropertyValueRegexReplacement);
+                var values = PropertyValueRegex == null ? multiValues : multiValues?.Select(value => ApplyRegex(value));
+                matched = values?.Any(result => result != null && FilterProperties[name].Contains(result)) == true;
+            }
+
+            if (matched)
+            {
+                break;
             }
-            return result;
         }
 
-        /// <summary>
-        /// Returns property value for Property using propertValueProvider.
-        /// </summary>
-        private static bool TryGetPropertyValue(string name, Func<string, Object> propertyValueProvider, out string singleValue, out string[] multiValues)
+        return IsFilteredOutWhenMatched ? !matched : matched;
+    }
+
+    /// <summary>
+    /// Apply regex matching or replacement to given value.
+    /// </summary>
+    /// <returns>For matching, returns the result of matching, null if no match found. For replacement, returns the result of replacement.</returns>
+    private string? ApplyRegex(string value)
+    {
+        TPDebug.Assert(PropertyValueRegex != null);
+
+        string? result = null;
+        if (PropertyValueRegexReplacement == null)
         {
-            var propertyValue = propertyValueProvider(name);
-            if (null != propertyValue)
+            var match = PropertyValueRegex.Match(value);
+            if (match.Success)
             {
-                multiValues = propertyValue as string[];
-                singleValue = multiValues == null ? propertyValue.ToString() : null;
-                return true;
+                result = match.Value;
             }
-
-            singleValue = null;
-            multiValues = null;
-            return false;
         }
-
-        internal static Builder CreateBuilder()
+        else
         {
-            return new Builder();
+            result = PropertyValueRegex.Replace(value, PropertyValueRegexReplacement);
         }
+        return result;
+    }
 
-        internal sealed class Builder
+    /// <summary>
+    /// Returns property value for Property using propertValueProvider.
+    /// </summary>
+    private static bool TryGetPropertyValue(string name, Func<string, object?> propertyValueProvider, out string? singleValue, out string[]? multiValues)
+    {
+        var propertyValue = propertyValueProvider(name);
+        if (null != propertyValue)
         {
-            private bool operatorEncountered = false;
-            private Operator fastFilterOperator = Operator.None;
+            multiValues = propertyValue as string[];
+            singleValue = multiValues == null ? propertyValue.ToString() : null;
+            return true;
+        }
+
+        singleValue = null;
+        multiValues = null;
+        return false;
+    }
+
+    internal static Builder CreateBuilder()
+    {
+        return new Builder();
+    }
 
-            private bool conditionEncountered = false;
-            private Operation fastFilterOperation;
-            private ImmutableDictionary<string, ImmutableHashSet<string>.Builder>.Builder filterDictionaryBuilder = ImmutableDictionary.CreateBuilder<string, ImmutableHashSet<string>.Builder>(StringComparer.OrdinalIgnoreCase);
+    internal sealed class Builder
+    {
+        private bool _operatorEncountered;
+        private Operator _fastFilterOperator = Operator.None;
+
+        private bool _conditionEncountered;
+        private Operation _fastFilterOperation;
+        private readonly ImmutableDictionary<string, ImmutableHashSet<string>.Builder>.Builder _filterDictionaryBuilder = ImmutableDictionary.CreateBuilder<string, ImmutableHashSet<string>.Builder>(StringComparer.OrdinalIgnoreCase);
 
-            private bool containsValidFilter = true;
+        private bool _containsValidFilter = true;
 
-            internal bool ContainsValidFilter => containsValidFilter && conditionEncountered;
+        internal bool ContainsValidFilter => _containsValidFilter && _conditionEncountered;
 
-            internal void AddOperator(Operator @operator)
+        internal void AddOperator(Operator @operator)
+        {
+            if (_containsValidFilter && (@operator == Operator.And || @operator == Operator.Or))
             {
-                if (containsValidFilter && (@operator == Operator.And || @operator == Operator.Or))
+                if (_operatorEncountered)
                 {
-                    if (operatorEncountered)
-                    {
-                        containsValidFilter = fastFilterOperator == @operator;
-                    }
-                    else
-                    {
-                        operatorEncountered = true;
-                        fastFilterOperator = @operator;
-                        if ((fastFilterOperation == Operation.NotEqual && fastFilterOperator == Operator.Or)
-                            || (fastFilterOperation == Operation.Equal && fastFilterOperator == Operator.And))
-                        {
-                            containsValidFilter = false;
-                        }
-                    }
+                    _containsValidFilter = _fastFilterOperator == @operator;
                 }
                 else
                 {
-                    containsValidFilter = false;
+                    _operatorEncountered = true;
+                    _fastFilterOperator = @operator;
+                    if ((_fastFilterOperation == Operation.NotEqual && _fastFilterOperator == Operator.Or)
+                        || (_fastFilterOperation == Operation.Equal && _fastFilterOperator == Operator.And))
+                    {
+                        _containsValidFilter = false;
+                    }
                 }
             }
+            else
+            {
+                _containsValidFilter = false;
+            }
+        }
 
-            internal void AddCondition(Condition condition)
+        internal void AddCondition(Condition condition)
+        {
+            if (!_containsValidFilter)
             {
-                if (!containsValidFilter)
-                {
-                    return;
-                }
+                return;
+            }
 
-                if (conditionEncountered)
+            if (_conditionEncountered)
+            {
+                if (condition.Operation == _fastFilterOperation)
                 {
-                    if (condition.Operation == fastFilterOperation)
-                    {
-                        AddProperty(condition.Name, condition.Value);
-                    }
-                    else
-                    {
-                        containsValidFilter = false;
-                    }
+                    AddProperty(condition.Name, condition.Value);
                 }
                 else
                 {
-                    conditionEncountered = true;
-                    fastFilterOperation = condition.Operation;
-                    AddProperty(condition.Name, condition.Value);
-
-                    // Don't support `Contains`.
-                    if (fastFilterOperation != Operation.Equal && fastFilterOperation != Operation.NotEqual)
-                    {
-                        containsValidFilter = false;
-                    }
+                    _containsValidFilter = false;
                 }
             }
-
-            private void AddProperty(string name, string value)
+            else
             {
-                if (!filterDictionaryBuilder.TryGetValue(name, out var values))
+                _conditionEncountered = true;
+                _fastFilterOperation = condition.Operation;
+                AddProperty(condition.Name, condition.Value);
+
+                // Don't support `Contains`.
+                if (_fastFilterOperation is not Operation.Equal and not Operation.NotEqual)
                 {
-                    values = ImmutableHashSet.CreateBuilder(StringComparer.OrdinalIgnoreCase);
-                    filterDictionaryBuilder.Add(name, values);
+                    _containsValidFilter = false;
                 }
-
-                values.Add(value);
             }
+        }
 
-            internal FastFilter ToFastFilter()
+        private void AddProperty(string name, string value)
+        {
+            if (!_filterDictionaryBuilder.TryGetValue(name, out var values))
             {
-                if (ContainsValidFilter)
-                {
-                    return new FastFilter(
-                        filterDictionaryBuilder.ToImmutableDictionary(kvp => kvp.Key, kvp => (ISet<string>)filterDictionaryBuilder[kvp.Key].ToImmutable()),
-                        fastFilterOperation,
-                        fastFilterOperator);
-                }
-
-                return null;
+                values = ImmutableHashSet.CreateBuilder<string>(StringComparer.OrdinalIgnoreCase);
+                _filterDictionaryBuilder.Add(name, values);
             }
+
+            values.Add(value);
+        }
+
+        internal FastFilter? ToFastFilter()
+        {
+            return ContainsValidFilter
+                ? new FastFilter(
+                    _filterDictionaryBuilder.ToImmutableDictionary(kvp => kvp.Key, kvp => (ISet<string>)_filterDictionaryBuilder[kvp.Key].ToImmutable()),
+                    _fastFilterOperation,
+                    _fastFilterOperator)
+                : null;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs b/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs
index 52b0f74bd4..249b1b5916 100644
--- a/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs
+++ b/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs
@@ -1,369 +1,395 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+/// <summary>
+/// Represents an expression tree.
+/// Supports:
+///     Logical Operators:  &amp;, |
+///     Equality Operators: =, !=
+///     Parenthesis (, ) for grouping.
+/// </summary>
+internal class FilterExpression
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Text;
-    using System.Text.RegularExpressions;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+    /// <summary>
+    /// Condition, if expression is conditional expression.
+    /// </summary>
+    private readonly Condition? _condition;
 
     /// <summary>
-    /// Represents an expression tree.
-    /// Supports:
-    ///     Logical Operators:  &, |
-    ///     Equality Operators: =, !=
-    ///     Parenthesis (, ) for grouping.
+    /// Left operand, when expression is logical expression.
     /// </summary>
-    internal class FilterExpression
-    {
-        /// <summary>
-        /// Condition, if expression is conditional expression.
-        /// </summary>
-        private readonly Condition condition;
+    private readonly FilterExpression? _left;
 
-        /// <summary>
-        /// Left operand, when expression is logical expression.
-        /// </summary>
-        private readonly FilterExpression left;
+    /// <summary>
+    /// Right operand, when expression is logical expression.
+    /// </summary>
+    private readonly FilterExpression? _right;
 
-        /// <summary>
-        /// Right operand, when expression is logical expression.
-        /// </summary>
-        private readonly FilterExpression right;
+    /// <summary>
+    /// If logical expression is using logical And ('&amp;') operator.
+    /// </summary>
+    private readonly bool _areJoinedByAnd;
+
+    private FilterExpression(FilterExpression left, FilterExpression right, bool areJoinedByAnd)
+    {
+        _left = left ?? throw new ArgumentNullException(nameof(left));
+        _right = right ?? throw new ArgumentNullException(nameof(right));
+        _areJoinedByAnd = areJoinedByAnd;
+    }
 
-        /// <summary>
-        /// If logical expression is using logical And ('&') operator.
-        /// </summary>
-        private readonly bool areJoinedByAnd;
+    private FilterExpression(Condition condition)
+    {
+        _condition = condition ?? throw new ArgumentNullException(nameof(condition));
+    }
+    /// <summary>
+    /// Create a new filter expression 'And'ing 'this' with 'filter'.
+    /// </summary>
+    private FilterExpression And(FilterExpression filter)
+    {
+        return new FilterExpression(this, filter, true);
+    }
 
-        #region Constructors
+    /// <summary>
+    /// Create a new filter expression 'Or'ing 'this' with 'filter'.
+    /// </summary>
+    private FilterExpression Or(FilterExpression filter)
+    {
+        return new FilterExpression(this, filter, false);
+    }
 
-        private FilterExpression(FilterExpression left, FilterExpression right, bool areJoinedByAnd)
+    /// <summary>
+    /// Process the given operator from the filterStack.
+    /// Puts back the result of operation back to filterStack.
+    /// </summary>
+    private static void ProcessOperator(Stack<FilterExpression> filterStack, Operator op)
+    {
+        if (op == Operator.And)
         {
-            ValidateArg.NotNull(left, nameof(left));
-            ValidateArg.NotNull(right, nameof(right));
+            if (filterStack.Count < 2)
+            {
+                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperand));
+            }
 
-            this.left = left;
-            this.right = right;
-            this.areJoinedByAnd = areJoinedByAnd;
+            var filterRight = filterStack.Pop();
+            var filterLeft = filterStack.Pop();
+            var result = filterLeft.And(filterRight);
+            filterStack.Push(result);
         }
+        else if (op == Operator.Or)
+        {
+            if (filterStack.Count < 2)
+            {
+                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperand));
+            }
 
-        private FilterExpression(Condition condition)
+            var filterRight = filterStack.Pop();
+            var filterLeft = filterStack.Pop();
+            var result = filterLeft.Or(filterRight);
+            filterStack.Push(result);
+        }
+        else if (op == Operator.OpenBrace)
         {
-            ValidateArg.NotNull(condition, nameof(condition));
-            this.condition = condition;
+            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingCloseParenthesis));
         }
-        #endregion
-
-        /// <summary>
-        /// Create a new filter expression 'And'ing 'this' with 'filter'.
-        /// </summary>
-        private FilterExpression And(FilterExpression filter)
+        else
         {
-            return new FilterExpression(this, filter, true);
+            Debug.Fail("ProcessOperator called for Unexpected operator.");
+            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, string.Empty));
         }
+    }
 
-        /// <summary>
-        /// Create a new filter expression 'Or'ing 'this' with 'filter'.
-        /// </summary>
-        private FilterExpression Or(FilterExpression filter)
+    /// <summary>
+    /// True, if filter is valid for given set of properties.
+    /// When False, invalidProperties would contain properties making filter invalid.
+    /// </summary>
+    internal string[]? ValidForProperties(IEnumerable<string>? properties, Func<string, TestProperty?>? propertyProvider)
+    {
+        if (null == properties)
         {
-            return new FilterExpression(this, filter, false);
+            // if null, initialize to empty list so that invalid properties can be found.
+            properties = [];
         }
 
-        /// <summary>
-        /// Process the given operator from the filterStack.
-        /// Puts back the result of operation back to filterStack.
-        /// </summary>
-        private static void ProcessOperator(Stack<FilterExpression> filterStack, Operator op)
+        return IterateFilterExpression<string[]?>((current, result) =>
         {
-            if (op == Operator.And)
+            // Only the leaves have a condition value.
+            if (current._condition != null)
             {
-                if (filterStack.Count < 2)
-                {
-                    throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperand));
-                }
-
-                var filterRight = filterStack.Pop();
-                var filterLeft = filterStack.Pop();
-                var result = filterLeft.And(filterRight);
-                filterStack.Push(result);
+                var valid = current._condition.ValidForProperties(properties, propertyProvider);
+                // If it's not valid will add it to the function's return array.
+                return !valid ? [current._condition.Name] : null;
             }
-            else if (op == Operator.Or)
-            {
-                if (filterStack.Count < 2)
-                {
-                    throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperand));
-                }
 
-                var filterRight = filterStack.Pop();
-                var filterLeft = filterStack.Pop();
-                var result = filterLeft.Or(filterRight);
-                filterStack.Push(result);
-            }
-            else if (op == Operator.OpenBrace)
+            // Concatenate the children node's result to get their parent result.
+            var invalidRight = current._right != null ? result.Pop() : null;
+            var invalidProperties = current._left != null ? result.Pop() : null;
+
+            if (null == invalidProperties)
             {
-                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingCloseParenthesis));
+                invalidProperties = invalidRight;
             }
-            else
+            else if (null != invalidRight)
             {
-                Debug.Fail("ProcessOperator called for Unexpected operator.");
-                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, string.Empty));
+                invalidProperties = invalidProperties.Concat(invalidRight).ToArray();
             }
-        }
 
-        /// <summary>
-        /// True, if filter is valid for given set of properties.
-        /// When False, invalidProperties would contain properties making filter invalid.
-        /// </summary>
-        internal string[] ValidForProperties(IEnumerable<string> properties, Func<string, TestProperty> propertyProvider)
-        {
-            string[] invalidProperties = null;
+            return invalidProperties;
+        });
 
-            if (null == properties)
-            {
-                // if null, initialize to empty list so that invalid properties can be found.
-                properties = Enumerable.Empty<string>();
-            }
+    }
 
-            bool valid = false;
-            if (this.condition != null)
-            {
-                valid = this.condition.ValidForProperties(properties, propertyProvider);
-                if (!valid)
-                {
-                    invalidProperties = new string[1] { this.condition.Name };
-                }
-            }
-            else
-            {
-                invalidProperties = this.left.ValidForProperties(properties, propertyProvider);
-                var invalidRight = this.right.ValidForProperties(properties, propertyProvider);
-                if (null == invalidProperties)
-                {
-                    invalidProperties = invalidRight;
-                }
-                else if (null != invalidRight)
-                {
-                    invalidProperties = invalidProperties.Concat(invalidRight).ToArray();
-                }
-            }
-            return invalidProperties;
-        }
+    /// <summary>
+    /// Return FilterExpression after parsing the given filter expression, and a FastFilter when possible.
+    /// </summary>
+    internal static FilterExpression Parse(string filterString, out FastFilter? fastFilter)
+    {
+        ValidateArg.NotNull(filterString, nameof(filterString));
 
-        /// <summary>
-        /// Return FilterExpression after parsing the given filter expression, and a FastFilter when possible.
-        /// </summary>
-        internal static FilterExpression Parse(string filterString, out FastFilter fastFilter)
+        // Below parsing doesn't error out on pattern (), so explicitly search for that (empty parenthesis).
+        var invalidInput = Regex.Match(filterString, @"\(\s*\)");
+        if (invalidInput.Success)
         {
-            ValidateArg.NotNull(filterString, nameof(filterString));
-
-            // Below parsing doesn't error out on pattern (), so explicitly search for that (empty parethesis).
-            var invalidInput = Regex.Match(filterString, @"\(\s*\)");
-            if (invalidInput.Success)
-            {
-                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.EmptyParenthesis));
-            }
+            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.EmptyParenthesis));
+        }
 
-            var tokens = TokenizeFilterExpressionString(filterString);
-            var operatorStack = new Stack<Operator>();
-            var filterStack = new Stack<FilterExpression>();
+        var tokens = TokenizeFilterExpressionString(filterString);
+        var operatorStack = new Stack<Operator>();
+        var filterStack = new Stack<FilterExpression>();
 
-            var fastFilterBuilder = FastFilter.CreateBuilder();
+        FastFilter.Builder fastFilterBuilder = FastFilter.CreateBuilder();
 
-            // This is based on standard parsing of in order expression using two stacks (operand stack and operator stack)
-            // Precedence(And) > Precedence(Or)
-            foreach (var inputToken in tokens)
+        // This is based on standard parsing of in order expression using two stacks (operand stack and operator stack)
+        // Precedence(And) > Precedence(Or)
+        foreach (var inputToken in tokens)
+        {
+            var token = inputToken.Trim();
+            if (token.IsNullOrEmpty())
             {
-                var token = inputToken.Trim();
-                if (string.IsNullOrEmpty(token))
-                {
-                    // ignore empty tokens
-                    continue;
-                }
+                // ignore empty tokens
+                continue;
+            }
 
-                switch (token)
-                {
-                    case "&":
-                    case "|":
+            switch (token)
+            {
+                case "&":
+                case "|":
 
-                        Operator currentOperator = Operator.And;
-                        if (string.Equals("|", token))
-                        {
-                            currentOperator = Operator.Or;
-                        }
+                    Operator currentOperator = Operator.And;
+                    if (string.Equals("|", token))
+                    {
+                        currentOperator = Operator.Or;
+                    }
 
-                        fastFilterBuilder.AddOperator(currentOperator);
+                    fastFilterBuilder.AddOperator(currentOperator);
 
-                        // Always put only higher priority operator on stack.
-                        //  if lesser priority -- pop up the stack and process the operator to maintain operator precedence.
-                        //  if equal priority -- pop up the stack and process the operator to maintain operator associativity.
-                        //  OpenBrace is special condition. & or | can come on top of OpenBrace for case like ((a=b)&c=d)
-                        while (true)
+                    // Always put only higher priority operator on stack.
+                    //  if lesser priority -- pop up the stack and process the operator to maintain operator precedence.
+                    //  if equal priority -- pop up the stack and process the operator to maintain operator associativity.
+                    //  OpenBrace is special condition. & or | can come on top of OpenBrace for case like ((a=b)&c=d)
+                    while (true)
+                    {
+                        bool isEmpty = operatorStack.Count == 0;
+                        Operator stackTopOperator = isEmpty ? Operator.None : operatorStack.Peek();
+                        if (isEmpty || stackTopOperator == Operator.OpenBrace || stackTopOperator < currentOperator)
                         {
-                            bool isEmpty = operatorStack.Count == 0;
-                            Operator stackTopOperator = isEmpty ? Operator.None : operatorStack.Peek();
-                            if (isEmpty || stackTopOperator == Operator.OpenBrace || stackTopOperator < currentOperator)
-                            {
-                                operatorStack.Push(currentOperator);
-                                break;
-                            }
-                            stackTopOperator = operatorStack.Pop();
-                            ProcessOperator(filterStack, stackTopOperator);
+                            operatorStack.Push(currentOperator);
+                            break;
                         }
-                        break;
+                        stackTopOperator = operatorStack.Pop();
+                        ProcessOperator(filterStack, stackTopOperator);
+                    }
+                    break;
 
-                    case "(":
-                        operatorStack.Push(Operator.OpenBrace);
-                        break;
+                case "(":
+                    operatorStack.Push(Operator.OpenBrace);
+                    break;
 
-                    case ")":
-                        // process operators from the stack till OpenBrace is found.
-                        // If stack is empty at any time, than matching OpenBrace is missing from the expression.
+                case ")":
+                    // process operators from the stack till OpenBrace is found.
+                    // If stack is empty at any time, than matching OpenBrace is missing from the expression.
+                    if (operatorStack.Count == 0)
+                    {
+                        throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOpenParenthesis));
+                    }
+
+                    Operator temp = operatorStack.Pop();
+                    while (temp != Operator.OpenBrace)
+                    {
+                        ProcessOperator(filterStack, temp);
                         if (operatorStack.Count == 0)
                         {
                             throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOpenParenthesis));
                         }
+                        temp = operatorStack.Pop();
+                    }
 
-                        Operator temp = operatorStack.Pop();
-                        while (temp != Operator.OpenBrace)
-                        {
-                            ProcessOperator(filterStack, temp);
-                            if (operatorStack.Count == 0)
-                            {
-                                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOpenParenthesis));
-                            }
-                            temp = operatorStack.Pop();
-                        }
-
-                        break;
+                    break;
 
-                    default:
-                        // push the operand to the operand stack.
-                        Condition condition = Condition.Parse(token);
-                        FilterExpression filter = new FilterExpression(condition);
-                        filterStack.Push(filter);
+                default:
+                    // push the operand to the operand stack.
+                    Condition condition = Condition.Parse(token);
+                    FilterExpression filter = new(condition);
+                    filterStack.Push(filter);
 
-                        fastFilterBuilder.AddCondition(condition);
-                        break;
-                }
+                    fastFilterBuilder.AddCondition(condition);
+                    break;
             }
-            while (operatorStack.Count != 0)
+        }
+        while (operatorStack.Count != 0)
+        {
+            Operator temp = operatorStack.Pop();
+            ProcessOperator(filterStack, temp);
+        }
+
+        if (filterStack.Count != 1)
+        {
+            throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperator));
+        }
+
+        fastFilter = fastFilterBuilder.ToFastFilter();
+
+        return filterStack.Pop();
+    }
+    private T IterateFilterExpression<T>(Func<FilterExpression, Stack<T>, T> getNodeValue)
+    {
+        FilterExpression? current = this;
+        // Will have the nodes.
+        Stack<FilterExpression> filterStack = new();
+        // Will contain the nodes results to use them in thier parent result's calculation
+        // and at the end will have the root result.
+        Stack<T> result = new();
+
+        do
+        {
+            // Push root's right child and then root to stack then Set root as root's left child.
+            while (current != null)
             {
-                Operator temp = operatorStack.Pop();
-                ProcessOperator(filterStack, temp);
+                if (current._right != null)
+                {
+                    filterStack.Push(current._right);
+                }
+                filterStack.Push(current);
+                current = current._left;
             }
 
-            if (filterStack.Count != 1)
+            // If the popped item has a right child and the right child is at top of stack,
+            // then remove the right child from stack, push the root back and set root as root's right child.
+            current = filterStack.Pop();
+            if (filterStack.Count > 0 && current._right == filterStack.Peek())
             {
-                throw new FormatException(string.Format(CultureInfo.CurrentCulture, CommonResources.TestCaseFilterFormatException, CommonResources.MissingOperator));
+                filterStack.Pop();
+                filterStack.Push(current);
+                current = current._right;
+                continue;
             }
 
-            fastFilter = fastFilterBuilder.ToFastFilter();
+            result.Push(getNodeValue(current, result));
+            current = null;
+        } while (filterStack.Count > 0);
 
-            return filterStack.Pop();
-        }
+        TPDebug.Assert(result.Count == 1, "Result stack should have one element at the end.");
+        return result.Peek();
+    }
+    /// <summary>
+    /// Evaluate filterExpression with given propertyValueProvider.
+    /// </summary>
+    /// <param name="propertyValueProvider"> The property Value Provider.</param>
+    /// <returns> True if evaluation is successful. </returns>
+    internal bool Evaluate(Func<string, object?> propertyValueProvider)
+    {
+        ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
 
-        /// <summary>
-        /// Evaluate filterExpression with given propertyValueProvider.
-        /// </summary>
-        /// <param name="propertyValueProvider"> The property Value Provider.</param>
-        /// <returns> True if evaluation is successful. </returns>
-        internal bool Evaluate(Func<string, object> propertyValueProvider)
+        return IterateFilterExpression<bool>((current, result) =>
         {
-            ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
-
             bool filterResult = false;
-            if (null != this.condition)
+            // Only the leaves have a condition value.
+            if (null != current._condition)
             {
-                filterResult = this.condition.Evaluate(propertyValueProvider);
+                filterResult = current._condition.Evaluate(propertyValueProvider);
             }
             else
             {
                 // & or | operator
-                bool leftResult = this.left.Evaluate(propertyValueProvider);
-                bool rightResult = this.right.Evaluate(propertyValueProvider);
-                if (this.areJoinedByAnd)
-                {
-                    filterResult = leftResult && rightResult;
-                }
-                else
-                {
-                    filterResult = leftResult || rightResult;
-                }
+                bool rightResult = current._right != null ? result.Pop() : false;
+                bool leftResult = current._left != null ? result.Pop() : false;
+                // Concatenate the children node's result to get their parent result.
+                filterResult = current._areJoinedByAnd ? leftResult && rightResult : leftResult || rightResult;
             }
             return filterResult;
-        }
+        });
+    }
 
-        internal static IEnumerable<string> TokenizeFilterExpressionString(string str)
-        {
-            if (str == null)
-            {
-                throw new ArgumentNullException(nameof(str));
-            }
+    internal static IEnumerable<string> TokenizeFilterExpressionString(string str)
+    {
+        ValidateArg.NotNull(str, nameof(str));
+        return TokenizeFilterExpressionStringHelper(str);
 
-            return TokenizeFilterExpressionStringHelper(str);
+        static IEnumerable<string> TokenizeFilterExpressionStringHelper(string s)
+        {
+            StringBuilder tokenBuilder = new();
 
-            IEnumerable<string> TokenizeFilterExpressionStringHelper(string s)
+            var last = '\0';
+            for (int i = 0; i < s.Length; ++i)
             {
-                StringBuilder tokenBuilder = new StringBuilder();
+                var current = s[i];
 
-                var last = '\0';
-                for (int i = 0; i < s.Length; ++i)
+                if (last == FilterHelper.EscapeCharacter)
                 {
-                    var current = s[i];
+                    // Don't check if `current` is one of the special characters here.
+                    // Instead, we blindly let any character follows '\' pass though and
+                    // relies on `FilterHelpers.Unescape` to report such errors.
+                    tokenBuilder.Append(current);
 
-                    if (last == FilterHelper.EscapeCharacter)
+                    if (current == FilterHelper.EscapeCharacter)
                     {
-                        // Don't check if `current` is one of the special characters here.
-                        // Instead, we blindly let any character follows '\' pass though and
-                        // relies on `FilterHelpers.Unescape` to report such errors.
-                        tokenBuilder.Append(current);
-
-                        if (current == FilterHelper.EscapeCharacter)
-                        {
-                            // We just encountered "\\" (escaped '\'), this will set last to '\0'
-                            // so the next char will not be treated as a suffix of escape sequence.
-                            current = '\0';
-                        }
+                        // We just encountered "\\" (escaped '\'), this will set last to '\0'
+                        // so the next char will not be treated as a suffix of escape sequence.
+                        current = '\0';
                     }
-                    else
+                }
+                else
+                {
+                    switch (current)
                     {
-                        switch (current)
-                        {
-                            case '(':
-                            case ')':
-                            case '&':
-                            case '|':
-                                if (tokenBuilder.Length > 0)
-                                {
-                                    yield return tokenBuilder.ToString();
-                                    tokenBuilder.Clear();
-                                }
-                                yield return current.ToString();
-                                break;
-
-                            default:
-                                tokenBuilder.Append(current);
-                                break;
-                        }
-                    }
+                        case '(':
+                        case ')':
+                        case '&':
+                        case '|':
+                            if (tokenBuilder.Length > 0)
+                            {
+                                yield return tokenBuilder.ToString();
+                                tokenBuilder.Clear();
+                            }
+                            yield return current.ToString();
+                            break;
 
-                    last = current;
+                        default:
+                            tokenBuilder.Append(current);
+                            break;
+                    }
                 }
 
-                if (tokenBuilder.Length > 0)
-                {
-                    yield return tokenBuilder.ToString();
-                }
+                last = current;
+            }
+
+            if (tokenBuilder.Length > 0)
+            {
+                yield return tokenBuilder.ToString();
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/FilterExpressionWrapper.cs b/src/Microsoft.TestPlatform.Common/Filtering/FilterExpressionWrapper.cs
index fa4648e554..d01e6b45a9 100644
--- a/src/Microsoft.TestPlatform.Common/Filtering/FilterExpressionWrapper.cs
+++ b/src/Microsoft.TestPlatform.Common/Filtering/FilterExpressionWrapper.cs
@@ -1,133 +1,130 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+/// <summary>
+/// Class holds information related to filtering criteria.
+/// </summary>
+public class FilterExpressionWrapper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text.RegularExpressions;
+    /// <summary>
+    /// FilterExpression corresponding to filter criteria
+    /// </summary>
+    private readonly FilterExpression? _filterExpression;
+
+    /// <remarks>
+    /// Exposed for testing purpose.
+    /// </remarks>
+    internal readonly FastFilter? FastFilter;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using System.Diagnostics;
+    [MemberNotNullWhen(true, nameof(FastFilter))]
+    private bool UseFastFilter => FastFilter != null;
 
     /// <summary>
-    /// Class holds information related to filtering criteria.
+    /// Initializes FilterExpressionWrapper with given filterString and options.
     /// </summary>
-    public class FilterExpressionWrapper
+    public FilterExpressionWrapper(string filterString, FilterOptions? options)
     {
-        /// <summary>
-        /// FilterExpression corresponding to filter criteria
-        /// </summary>
-        private readonly FilterExpression filterExpression;
-
-        /// <remarks>
-        /// Exposed for testing purpose.
-        /// </remarks>
-        internal readonly FastFilter fastFilter;
-
-        private bool UseFastFilter => this.fastFilter != null;
-
-        /// <summary>
-        /// Initializes FilterExpressionWrapper with given filterString and options.
-        /// </summary>
-        public FilterExpressionWrapper(string filterString, FilterOptions options)
-        {
-            ValidateArg.NotNullOrEmpty(filterString, nameof(filterString));
+        ValidateArg.NotNullOrEmpty(filterString, nameof(filterString));
 
-            this.FilterString = filterString;
-            this.FilterOptions = options;
+        FilterString = filterString;
+        FilterOptions = options;
 
-            try
+        try
+        {
+            // We prefer fast filter when it's available.
+            _filterExpression = FilterExpression.Parse(filterString, out FastFilter);
+
+            if (UseFastFilter)
             {
-                // We prefer fast filter when it's available.
-                this.filterExpression = FilterExpression.Parse(filterString, out this.fastFilter);
+                _filterExpression = null;
+
+                // Property value regex is only supported for fast filter,
+                // so we ignore it if no fast filter is constructed.
 
-                if (UseFastFilter)
+                // TODO: surface an error message to suer.
+                var regexString = options?.FilterRegEx;
+                if (!regexString.IsNullOrEmpty())
                 {
-                    this.filterExpression = null;
-
-                    // Property value regex is only supported for fast filter,
-                    // so we ignore it if no fast filter is constructed.
-
-                    // TODO: surface an error message to suer.
-                    var regexString = options?.FilterRegEx;
-                    if (!string.IsNullOrEmpty(regexString))
-                    {
-                        Debug.Assert(options.FilterRegExReplacement != null ? options.FilterRegEx != null : true);
-                        this.fastFilter.PropertyValueRegex = new Regex(regexString, RegexOptions.Compiled);
-                        this.fastFilter.PropertyValueRegexReplacement = options.FilterRegExReplacement;
-                    }
+                    TPDebug.Assert(options!.FilterRegExReplacement == null || options.FilterRegEx != null);
+                    FastFilter.PropertyValueRegex = new Regex(regexString, RegexOptions.Compiled);
+                    FastFilter.PropertyValueRegexReplacement = options.FilterRegExReplacement;
                 }
-
-            }
-            catch (FormatException ex)
-            {
-                this.ParseError = ex.Message;
             }
-            catch (ArgumentException ex)
-            {
-                this.fastFilter = null;
-                this.ParseError = ex.Message;
-            }
-        }
 
-        /// <summary>
-        /// Initializes FilterExpressionWrapper with given filterString.
-        /// </summary>
-        public FilterExpressionWrapper(string filterString)
-            : this(filterString, null)
-        {
         }
-
-        /// <summary>
-        /// User specified filter criteria.
-        /// </summary>
-        public string FilterString
+        catch (FormatException ex)
         {
-            get;
-            private set;
+            ParseError = ex.Message;
         }
-
-        /// <summary>
-        /// User specified additional filter options.
-        /// </summary>
-        public FilterOptions FilterOptions
+        catch (ArgumentException ex)
         {
-            get;
-            private set;
+            FastFilter = null;
+            ParseError = ex.Message;
         }
+    }
 
-        /// <summary>
-        /// Parsing error (if any), when parsing 'FilterString' with built-in parser.
-        /// </summary>
-        public string ParseError
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Initializes FilterExpressionWrapper with given filterString.
+    /// </summary>
+    public FilterExpressionWrapper(string filterString)
+        : this(filterString, null)
+    {
+    }
 
-        /// <summary>
-        /// Validate if underlying filter expression is valid for given set of supported properties.
-        /// </summary>
-        public string[] ValidForProperties(IEnumerable<String> supportedProperties, Func<string, TestProperty> propertyProvider)
-        {
-            return UseFastFilter ? this.fastFilter.ValidForProperties(supportedProperties) : this.filterExpression?.ValidForProperties(supportedProperties, propertyProvider);
-        }
+    /// <summary>
+    /// User specified filter criteria.
+    /// </summary>
+    public string FilterString
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Evaluate filterExpression with given propertyValueProvider.
-        /// </summary>
-        public bool Evaluate(Func<string, Object> propertyValueProvider)
-        {
-            ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
+    /// <summary>
+    /// User specified additional filter options.
+    /// </summary>
+    public FilterOptions? FilterOptions
+    {
+        get;
+        private set;
+    }
 
-            if (UseFastFilter)
-            {
-                return this.fastFilter.Evaluate(propertyValueProvider);
-            }
+    /// <summary>
+    /// Parsing error (if any), when parsing 'FilterString' with built-in parser.
+    /// </summary>
+    public string? ParseError
+    {
+        get;
+        private set;
+    }
 
-            return this.filterExpression == null ? false : this.filterExpression.Evaluate(propertyValueProvider);
-        }
+    /// <summary>
+    /// Validate if underlying filter expression is valid for given set of supported properties.
+    /// </summary>
+    public string[]? ValidForProperties(IEnumerable<string>? supportedProperties, Func<string, TestProperty?>? propertyProvider)
+        => UseFastFilter
+            ? FastFilter.ValidForProperties(supportedProperties)
+            : _filterExpression?.ValidForProperties(supportedProperties, propertyProvider);
+
+    /// <summary>
+    /// Evaluate filterExpression with given propertyValueProvider.
+    /// </summary>
+    public bool Evaluate(Func<string, object?> propertyValueProvider)
+    {
+        ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
+
+        return UseFastFilter
+            ? FastFilter.Evaluate(propertyValueProvider)
+            : _filterExpression != null && _filterExpression.Evaluate(propertyValueProvider);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/TestCaseFilterExpression.cs b/src/Microsoft.TestPlatform.Common/Filtering/TestCaseFilterExpression.cs
index 54cb6bc8ce..2af8bce930 100644
--- a/src/Microsoft.TestPlatform.Common/Filtering/TestCaseFilterExpression.cs
+++ b/src/Microsoft.TestPlatform.Common/Filtering/TestCaseFilterExpression.cs
@@ -1,81 +1,81 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Filtering;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+/// <summary>
+/// Implements ITestCaseFilterExpression, providing test case filtering functionality.
+/// </summary>
+public class TestCaseFilterExpression : ITestCaseFilterExpression
+{
+    private readonly FilterExpressionWrapper _filterWrapper;
 
     /// <summary>
-    /// Implements ITestCaseFilterExpression, providing test case filtering functionality.
+    /// If filter Expression is valid for performing TestCase matching
+    /// (has only supported properties, syntax etc)
     /// </summary>
-    public class TestCaseFilterExpression : ITestCaseFilterExpression
-    {
-        private FilterExpressionWrapper filterWrapper;
+    private readonly bool _validForMatch;
 
-        /// <summary>
-        /// If filter Expression is valid for performing TestCase matching
-        /// (has only supported properties, syntax etc)
-        /// </summary>
-        private readonly bool validForMatch;
 
+    /// <summary>
+    /// Adapter specific filter expression.
+    /// </summary>
+    public TestCaseFilterExpression(FilterExpressionWrapper filterWrapper)
+    {
+        _filterWrapper = filterWrapper ?? throw new ArgumentNullException(nameof(filterWrapper));
+        _validForMatch = filterWrapper.ParseError.IsNullOrEmpty();
+    }
 
-        /// <summary>
-        /// Adapter specific filter expression.
-        /// </summary>
-        public TestCaseFilterExpression(FilterExpressionWrapper filterWrapper)
+    /// <summary>
+    /// User specified filter criteria.
+    /// </summary>
+    public string TestCaseFilterValue
+    {
+        get
         {
-            ValidateArg.NotNull(filterWrapper, nameof(filterWrapper));
-            this.filterWrapper = filterWrapper;
-            this.validForMatch = string.IsNullOrEmpty(filterWrapper.ParseError);
+            return _filterWrapper.FilterString;
         }
+    }
 
-        /// <summary>
-        /// User specified filter criteria.
-        /// </summary>
-        public string TestCaseFilterValue
+    /// <summary>
+    /// Validate if underlying filter expression is valid for given set of supported properties.
+    /// </summary>
+    public string[]? ValidForProperties(IEnumerable<string>? supportedProperties, Func<string, TestProperty?> propertyProvider)
+    {
+        string[]? invalidProperties = null;
+        if (null != _filterWrapper && _validForMatch)
         {
-            get
-            {
-                return this.filterWrapper.FilterString;
-            }
+            invalidProperties = _filterWrapper.ValidForProperties(supportedProperties, propertyProvider);
         }
+        return invalidProperties;
+    }
 
-        /// <summary>
-        /// Validate if underlying filter expression is valid for given set of supported properties.
-        /// </summary>
-        public string[] ValidForProperties(IEnumerable<String> supportedProperties, Func<string, TestProperty> propertyProvider)
+    /// <summary>
+    /// Match test case with filter criteria.
+    /// </summary>
+    public bool MatchTestCase(TestCase testCase, Func<string, object?> propertyValueProvider)
+    {
+        ValidateArg.NotNull(testCase, nameof(testCase));
+        ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
+
+        if (!_validForMatch)
         {
-            string[] invalidProperties = null;
-            if (null != this.filterWrapper && this.validForMatch)
-            {
-                invalidProperties = this.filterWrapper.ValidForProperties(supportedProperties, propertyProvider);
-            }
-            return invalidProperties;
+            return false;
         }
 
-        /// <summary>
-        /// Match test case with filter criteria.
-        /// </summary>
-        public bool MatchTestCase(TestCase testCase, Func<string, Object> propertyValueProvider)
+        if (null == _filterWrapper)
         {
-            ValidateArg.NotNull(testCase, nameof(testCase));
-            ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
-            if (!this.validForMatch)
-            {
-                return false;
-            }
-
-            if (null == this.filterWrapper)
-            {
-                // can be null when parsing error occurs. Invalid filter results in no match.
-                return false;
-            }
-            return this.filterWrapper.Evaluate(propertyValueProvider);
+            // can be null when parsing error occurs. Invalid filter results in no match.
+            return false;
         }
 
+        return _filterWrapper.Evaluate(propertyValueProvider);
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/Friends.cs b/src/Microsoft.TestPlatform.Common/Friends.cs
index fb645969e2..57bc2e8561 100644
--- a/src/Microsoft.TestPlatform.Common/Friends.cs
+++ b/src/Microsoft.TestPlatform.Common/Friends.cs
@@ -5,8 +5,10 @@
 
 #region Product Assemblies
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("vstest.console, PublicKey =002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("datacollector, PublicKey =002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Client, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
@@ -24,5 +26,8 @@
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Client.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("Microsoft.TestPlatform.AcceptanceTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-#endregion
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Acceptance.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Perf.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+#endregion
diff --git a/src/Microsoft.TestPlatform.Common/Hosting/ITestRuntimeProviderManager.cs b/src/Microsoft.TestPlatform.Common/Hosting/ITestRuntimeProviderManager.cs
new file mode 100644
index 0000000000..f57666d6f1
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Hosting/ITestRuntimeProviderManager.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+
+internal interface ITestRuntimeProviderManager
+{
+    ITestRuntimeProvider? GetTestHostManagerByRunConfiguration(string? runConfiguration, List<string> sources);
+    ITestRuntimeProvider? GetTestHostManagerByUri(string hostUri);
+}
diff --git a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeExtensionManager.cs b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeExtensionManager.cs
index c150d1f5aa..b0cb405cf9 100644
--- a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeExtensionManager.cs
@@ -1,66 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting;
 
+/// <summary>
+/// Manages loading and provides access to testhost extensions implementing the
+/// ITestRuntimeProvider interface.
+/// </summary>
+internal class TestRuntimeExtensionManager : TestExtensionManager<ITestRuntimeProvider, ITestRuntimeCapabilities>
+{
     /// <summary>
-    /// Manages loading and provides access to testhost extensions implementing the
-    /// ITestRuntimeProvider interface.
+    /// Initializes a new instance of the <see cref="TestRuntimeExtensionManager"/> class.
+    /// Default constructor.
     /// </summary>
-    internal class TestRuntimeExtensionManager : TestExtensionManager<ITestRuntimeProvider, ITestRuntimeCapabilities>
+    /// <param name="unfilteredTestExtensions">
+    /// The unfiltered Test Extensions.
+    /// </param>
+    /// <param name="testExtensions">
+    /// The test Extensions.
+    /// </param>
+    /// <param name="logger">
+    /// The logger.
+    /// </param>
+    /// <remarks>
+    /// The constructor is not public because the factory method should be used to get instances of this class.
+    /// </remarks>
+    protected TestRuntimeExtensionManager(
+        IEnumerable<LazyExtension<ITestRuntimeProvider, Dictionary<string, object>>> unfilteredTestExtensions,
+        IEnumerable<LazyExtension<ITestRuntimeProvider, ITestRuntimeCapabilities>> testExtensions,
+        IMessageLogger logger)
+        : base(unfilteredTestExtensions, testExtensions, logger)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRuntimeExtensionManager"/> class.
-        /// Default constructor.
-        /// </summary>
-        /// <param name="unfilteredTestExtensions">
-        /// The unfiltered Test Extensions.
-        /// </param>
-        /// <param name="testExtensions">
-        /// The test Extensions.
-        /// </param>
-        /// <param name="logger">
-        /// The logger.
-        /// </param>
-        /// <remarks>
-        /// The constructor is not public because the factory method should be used to get instances of this class.
-        /// </remarks>
-        protected TestRuntimeExtensionManager(
-            IEnumerable<LazyExtension<ITestRuntimeProvider, Dictionary<string, object>>> unfilteredTestExtensions,
-            IEnumerable<LazyExtension<ITestRuntimeProvider, ITestRuntimeCapabilities>> testExtensions,
-            IMessageLogger logger)
-            : base(unfilteredTestExtensions, testExtensions, logger)
-        {
-        }
-
-        /// <summary>
-        /// Gets an instance of the TestLoggerExtensionManager.
-        /// </summary>
-        /// <param name="messageLogger">
-        /// The message Logger.
-        /// </param>
-        /// <returns>
-        /// The TestLoggerExtensionManager.
-        /// </returns>
-        public static TestRuntimeExtensionManager Create(IMessageLogger messageLogger)
-        {
-            IEnumerable<LazyExtension<ITestRuntimeProvider, ITestRuntimeCapabilities>> filteredTestExtensions;
-            IEnumerable<LazyExtension<ITestRuntimeProvider, Dictionary<string, object>>> unfilteredTestExtensions;
+    }
 
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestRuntimePluginInformation, ITestRuntimeProvider, ITestRuntimeCapabilities, TestRuntimeMetadata>(
-                TestPlatformConstants.RunTimeEndsWithPattern,
-                out unfilteredTestExtensions,
-                out filteredTestExtensions);
+    /// <summary>
+    /// Gets an instance of the TestLoggerExtensionManager.
+    /// </summary>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    /// <returns>
+    /// The TestLoggerExtensionManager.
+    /// </returns>
+    public static TestRuntimeExtensionManager Create(IMessageLogger messageLogger)
+    {
+        TestPluginManager.GetSpecificTestExtensions<TestRuntimePluginInformation, ITestRuntimeProvider, ITestRuntimeCapabilities, TestRuntimeMetadata>(
+            TestPlatformConstants.RunTimeEndsWithPattern,
+            out IEnumerable<LazyExtension<ITestRuntimeProvider, Dictionary<string, object>>> unfilteredTestExtensions,
+            out IEnumerable<LazyExtension<ITestRuntimeProvider, ITestRuntimeCapabilities>> filteredTestExtensions);
 
-            return new TestRuntimeExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-        }
+        return new TestRuntimeExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeMetadata.cs b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeMetadata.cs
index 441b2e6c95..eec613bcf0 100644
--- a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeMetadata.cs
+++ b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeMetadata.cs
@@ -1,46 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting;
 
+/// <summary>
+/// Hold data about the Test Host.
+/// </summary>
+public class TestRuntimeMetadata : ITestRuntimeCapabilities
+{
     /// <summary>
-    /// Hold data about the Test Host.
+    /// Constructor for TestRuntimeMetadata
     /// </summary>
-    public class TestRuntimeMetadata : ITestRuntimeCapabilities
+    /// <param name="extension">
+    /// Uri identifying the testhost.
+    /// </param>
+    /// <param name="friendlyName">
+    /// The friendly Name.
+    /// </param>
+    public TestRuntimeMetadata(string extension, string friendlyName)
     {
-        /// <summary>
-        /// Constructor for TestRuntimeMetadata
-        /// </summary>
-        /// <param name="extension">
-        /// Uri identifying the testhost.
-        /// </param>
-        /// <param name="friendlyName">
-        /// The friendly Name.
-        /// </param>
-        public TestRuntimeMetadata(string extension, string friendlyName)
-        {
-            this.ExtensionUri = extension;
-            this.FriendlyName = friendlyName;
-        }
+        ExtensionUri = extension;
+        FriendlyName = friendlyName;
+    }
 
-        /// <summary>
-        /// Gets Uri identifying the testhost.
-        /// </summary>
-        public string ExtensionUri
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Uri identifying the testhost.
+    /// </summary>
+    public string ExtensionUri
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets Friendly Name identifying the testhost.
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets Friendly Name identifying the testhost.
+    /// </summary>
+    public string FriendlyName
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs
index da1e3b30c9..4090bdcfd6 100644
--- a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs
@@ -1,71 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+
+/// <summary>
+/// Responsible for managing TestRuntimeProviderManager extensions
+/// </summary>
+public class TestRuntimeProviderManager : ITestRuntimeProviderManager
 {
-    using System;
+    private static TestRuntimeProviderManager? s_testHostManager;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly TestRuntimeExtensionManager _testHostExtensionManager;
 
     /// <summary>
-    /// Responsible for managing TestRuntimeProviderManager extensions
+    /// Initializes a new instance of the <see cref="TestRuntimeProviderManager"/> class.
+    /// Default constructor.
     /// </summary>
-    public class TestRuntimeProviderManager
+    /// <param name="sessionLogger">
+    /// The session Logger.
+    /// </param>
+    protected TestRuntimeProviderManager(IMessageLogger sessionLogger)
     {
-        #region Fields
-
-        private static TestRuntimeProviderManager testHostManager;
-
-        private readonly TestRuntimeExtensionManager testHostExtensionManager;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRuntimeProviderManager"/> class.
-        /// Default constructor.
-        /// </summary>
-        /// <param name="sessionLogger">
-        /// The session Logger.
-        /// </param>
-        protected TestRuntimeProviderManager(IMessageLogger sessionLogger)
-        {
-            this.testHostExtensionManager = TestRuntimeExtensionManager.Create(sessionLogger);
-        }
-
-        /// <summary>
-        /// Gets the instance of TestRuntimeProviderManager
-        /// </summary>
-        public static TestRuntimeProviderManager Instance => testHostManager
-                                                             ?? (testHostManager = new TestRuntimeProviderManager(TestSessionMessageLogger.Instance));
-
-        #endregion
+        _testHostExtensionManager = TestRuntimeExtensionManager.Create(sessionLogger);
+    }
 
-        #region Public Methods
+    /// <summary>
+    /// Gets the instance of TestRuntimeProviderManager
+    /// </summary>
+    public static TestRuntimeProviderManager Instance
+        => s_testHostManager ??= new TestRuntimeProviderManager(TestSessionMessageLogger.Instance);
 
-        public ITestRuntimeProvider GetTestHostManagerByUri(string hostUri)
-        {
-            var host = this.testHostExtensionManager.TryGetTestExtension(hostUri);
-            return host?.Value;
-        }
+    public ITestRuntimeProvider? GetTestHostManagerByUri(string hostUri)
+    {
+        var host = _testHostExtensionManager.TryGetTestExtension(hostUri);
+        return host?.Value;
+    }
 
-        public virtual ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration)
+    public virtual ITestRuntimeProvider? GetTestHostManagerByRunConfiguration(string? runConfiguration, List<string>? _)
+    {
+        foreach (var testExtension in _testHostExtensionManager.TestExtensions)
         {
-            foreach (var testExtension in this.testHostExtensionManager.TestExtensions)
+            if (testExtension.Value.CanExecuteCurrentRunConfiguration(runConfiguration))
             {
-                if (testExtension.Value.CanExecuteCurrentRunConfiguration(runConfiguration))
-                {
-                    // we are creating a new Instance of ITestRuntimeProvider so that each POM gets it's own object of ITestRuntimeProvider
-                    return (ITestRuntimeProvider)Activator.CreateInstance(testExtension.Value.GetType());
-                }
+                // we are creating a new Instance of ITestRuntimeProvider so that each POM gets it's own object of ITestRuntimeProvider
+                return (ITestRuntimeProvider?)Activator.CreateInstance(testExtension.Value.GetType());
             }
-
-            return null;
         }
 
-        #endregion
+        return null;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/DiscoveryStatus.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/DiscoveryStatus.cs
new file mode 100644
index 0000000000..e5e435ce8a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/DiscoveryStatus.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Enums for indicating discovery status of source
+/// </summary>
+public enum DiscoveryStatus
+{
+    /// <summary>
+    /// Indicates the sources which were not touched during discovery.
+    /// </summary>
+    NotDiscovered,
+
+    /// <summary>
+    /// Indicates that we started discovery of the source but something happened (cancel/abort) and we stopped processing it.
+    /// </summary>
+    PartiallyDiscovered,
+
+    /// <summary>
+    /// Indicates that source was fully discovered.
+    /// </summary>
+    FullyDiscovered,
+
+    /// <summary>
+    /// Indicates that source was skipped in discovery.
+    /// </summary>
+    SkippedDiscovery
+}
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs
index 8eab8ee796..7d4354449a 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Interface defining the parallel operation manager
+/// </summary>
+public interface IParallelOperationManager
 {
     /// <summary>
-    /// Interface defining the parallel operation manager
+    /// Update the parallelism level of the manager
     /// </summary>
-    public interface IParallelOperationManager
-    {
-        /// <summary>
-        /// Update the parallelism level of the manager
-        /// </summary>
-        /// <param name="parallelLevel">Parallelism level</param>
-        void UpdateParallelLevel(int parallelLevel);
-    }
+    /// <param name="parallelLevel">Parallelism level</param>
+    void UpdateParallelLevel(int parallelLevel);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs
index 908b744543..334a8c9c1b 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs
@@ -1,28 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Interface defining the parallel discovery manager
+/// </summary>
+public interface IParallelProxyDiscoveryManager : IProxyDiscoveryManager
 {
-    using System.Collections.Generic;
+    /// <summary>
+    /// Indicates if user requested an abortion
+    /// </summary>
+    bool IsAbortRequested { get; }
 
     /// <summary>
-    /// Interface defining the parallel discovery manager
+    /// Handles Partial Discovery Complete event coming from a specific concurrent proxy discovery manager
+    /// Each concurrent proxy discovery manager will signal the parallel discovery manager when its complete
     /// </summary>
-    public interface IParallelProxyDiscoveryManager : IParallelOperationManager, IProxyDiscoveryManager
-    {
-        /// <summary>
-        /// Handles Partial Discovery Complete event coming from a specific concurrent proxy discovery manager
-        /// Each concurrent proxy discovery manager will signal the parallel discovery manager when its complete
-        /// </summary>
-        /// <param name="proxyDiscoveryManager">discovery manager instance</param>
-        /// <param name="totalTests">Total Tests discovered for the concurrent discovery</param>
-        /// <param name="lastChunk">LastChunk testcases for the concurrent discovery</param>
-        /// <param name="isAborted">True if discovery is aborted</param>
-        /// <returns>True if parallel discovery is complete</returns>
-        bool HandlePartialDiscoveryComplete(
-            IProxyDiscoveryManager proxyDiscoveryManager,
-            long totalTests,
-            IEnumerable<TestCase> lastChunk,
-            bool isAborted);
-    }
+    /// <param name="proxyDiscoveryManager">discovery manager instance</param>
+    /// <param name="totalTests">Total Tests discovered for the concurrent discovery</param>
+    /// <param name="lastChunk">LastChunk testcases for the concurrent discovery</param>
+    /// <param name="isAborted">True if discovery is aborted</param>
+    /// <returns>True if parallel discovery is complete</returns>
+    bool HandlePartialDiscoveryComplete(
+        IProxyDiscoveryManager proxyDiscoveryManager,
+        long totalTests,
+        IEnumerable<TestCase>? lastChunk,
+        bool isAborted);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs
index 3834ce414c..35dcea64ff 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs
@@ -1,32 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// Interface defining the parallel execution manager
+/// </summary>
+public interface IParallelProxyExecutionManager : IProxyExecutionManager
+{
     /// <summary>
-    /// Interface defining the parallel execution manager
+    /// Handles Partial Run Complete event coming from a specific concurrent proxy execution manager
+    /// Each concurrent proxy execution manager will signal the parallel execution manager when its complete
     /// </summary>
-    public interface IParallelProxyExecutionManager : IParallelOperationManager, IProxyExecutionManager
-    {
-        /// <summary>
-        /// Handles Partial Run Complete event coming from a specific concurrent proxy execution manager
-        /// Each concurrent proxy execution manager will signal the parallel execution manager when its complete
-        /// </summary>
-        /// <param name="proxyExecutionManager">Concurrent Execution manager that completed the run</param>
-        /// <param name="testRunCompleteArgs">RunCompleteArgs for the concurrent run</param>
-        /// <param name="lastChunkArgs">LastChunk testresults for the concurrent run</param>
-        /// <param name="runContextAttachments">RunAttachments for the concurrent run</param>
-        /// <param name="executorUris">ExecutorURIs of the adapters involved in executing the tests</param>
-        /// <returns>True if parallel run is complete</returns>
-        bool HandlePartialRunComplete(
-            IProxyExecutionManager proxyExecutionManager,
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris);
-    }
+    /// <param name="proxyExecutionManager">Concurrent Execution manager that completed the run</param>
+    /// <param name="testRunCompleteArgs">RunCompleteArgs for the concurrent run</param>
+    /// <param name="lastChunkArgs">LastChunk testresults for the concurrent run</param>
+    /// <param name="runContextAttachments">RunAttachments for the concurrent run</param>
+    /// <param name="executorUris">ExecutorURIs of the adapters involved in executing the tests</param>
+    /// <returns>True if parallel run is complete</returns>
+    bool HandlePartialRunComplete(
+        IProxyExecutionManager proxyExecutionManager,
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs
index c77c525236..ac4e79e47c 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs
@@ -1,37 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Orchestrates discovery operations for the engine communicating with the client.
+/// </summary>
+public interface IProxyDiscoveryManager
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// Initializes test discovery. Create the test host, setup channel and initialize extensions.
+    /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
+    /// </summary>
+    void Initialize(bool skipDefaultAdapters);
+
+    /// <summary>
+    /// Initializes test discovery. Create the test host, setup channel and initialize extensions.
+    /// </summary>
+    /// 
+    /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    /// <param name="skipDefaultAdapters">Skip default adapters flag</param>
+    void InitializeDiscovery(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler, bool skipDefaultAdapters);
+
+    /// <summary>
+    /// Discovers tests
+    /// </summary>
+    /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler);
+
+    /// <summary>
+    /// Aborts the test operation.
+    /// </summary>
+    void Abort();
+
+    /// <summary>
+    /// Aborts discovery operation with EventHandler.
+    /// </summary>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    void Abort(ITestDiscoveryEventsHandler2 eventHandler);
 
     /// <summary>
-    /// Orchestrates discovery operations for the engine communicating with the client.
+    /// Closes the current test operation.
+    /// Send a EndSession message to close the test host and channel gracefully.
     /// </summary>
-    public interface IProxyDiscoveryManager
-    {
-        /// <summary>
-        /// Initializes test discovery. Create the test host, setup channel and initialize extensions.
-        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
-        /// </summary>
-        void Initialize(bool skipDefaultAdapters);
-
-        /// <summary>
-        /// Discovers tests
-        /// </summary>
-        /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
-        /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
-        void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler);
-
-        /// <summary>
-        /// Aborts the test operation.
-        /// </summary>
-        void Abort();
-
-        /// <summary>
-        /// Closes the current test operation.
-        /// Send a EndSession message to close the test host and channel gracefully.
-        /// </summary>
-        void Close();
-    }
+    void Close();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs
index 1e696eef6f..903e1a27ac 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs
@@ -1,50 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Orchestrates test execution related functionality for the engine communicating with the client.
+/// </summary>
+public interface IProxyExecutionManager
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// Gets whether current Execution Manager is initialized or not
+    /// </summary>
+    bool IsInitialized { get; }
+
+    /// <summary>
+    /// Initializes test execution. Create the test host, setup channel and initialize extensions.
+    /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
+    /// </summary>
+    void Initialize(bool skipDefaultAdapters);
+
+    /// <summary>
+    /// Initializes test execution. Create the test host, setup channel and initialize extensions.
+    /// </summary>
+    /// 
+    /// <param name="testRunCriteria">The settings/options for the test run.</param>
+    /// <param name="eventHandler">EventHandler for handling execution events from Engine.</param>
+    void InitializeTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Starts the test run.
+    /// </summary>
+    /// <param name="testRunCriteria">The settings/options for the test run.</param>
+    /// <param name="eventHandler">EventHandler for handling execution events from Engine.</param>
+    /// <returns>The process id of the runner executing tests.</returns>
+    int StartTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Cancels the test run. On the test host, this will send a message to adapters.
+    /// </summary>
+    // <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    void Cancel(IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Aborts the test operation. This will forcefully terminate the test host.
+    /// </summary>
+    // <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    void Abort(IInternalTestRunEventsHandler eventHandler);
 
     /// <summary>
-    /// Orchestrates test execution related functionality for the engine communicating with the client.
+    /// Closes the current test operation by sending a end session message.
+    /// Terminates the test host.
     /// </summary>
-    public interface IProxyExecutionManager
-    {
-        /// <summary>
-        /// Gets whether current Execution Manager is initialized or not
-        /// </summary>
-        bool IsInitialized { get; }
-
-        /// <summary>
-        /// Initializes test execution. Create the test host, setup channel and initialize extensions.
-        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
-        /// </summary>
-        void Initialize(bool skipDefaultAdapters);
-
-        /// <summary>
-        /// Starts the test run.
-        /// </summary>
-        /// <param name="testRunCriteria">The settings/options for the test run.</param>
-        /// <param name="eventHandler">EventHandler for handling execution events from Engine.</param>
-        /// <returns>The process id of the runner executing tests.</returns>
-        int StartTestRun(TestRunCriteria testRunCriteria, ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Cancels the test run. On the test host, this will send a message to adapters.
-        /// </summary>
-        // <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void Cancel(ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Aborts the test operation. This will forcefully terminate the test host.
-        /// </summary>
-        // <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void Abort(ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Closes the current test operation by sending a end session message.
-        /// Terminates the test host.
-        /// </summary>
-        void Close();
-    }
-}
\ No newline at end of file
+    void Close();
+}
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyTestSessionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyTestSessionManager.cs
index f7db16f472..3a2acca8ac 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyTestSessionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyTestSessionManager.cs
@@ -1,32 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// Orchestrates test session related functionality for the engine communicating with the
+/// client.
+/// </summary>
+public interface IProxyTestSessionManager
+{
     /// <summary>
-    /// Orchestrates test session related functionality for the engine communicating with the
-    /// client.
+    /// Starts the test session based on the test session criteria.
     /// </summary>
-    public interface IProxyTestSessionManager
-    {
-        /// <summary>
-        /// Starts the test session based on the test session criteria.
-        /// </summary>
-        /// 
-        /// <param name="eventsHandler">
-        /// Event handler for handling events fired during test session management operations.
-        /// </param>
-        /// 
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        bool StartSession(ITestSessionEventsHandler eventsHandler);
+    ///
+    /// <param name="eventsHandler">
+    /// Event handler for handling events fired during test session management operations.
+    /// </param>
+    /// <param name="requestData">The request data.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    bool StartSession(ITestSessionEventsHandler eventsHandler, IRequestData requestData);
 
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        ///
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        bool StopSession();
-    }
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="requestData">The request data.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    bool StopSession(IRequestData requestData);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs
index 0f75e1616a..d249244586 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs
@@ -1,85 +1,93 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// Defines the functionality of a test engine.
+/// </summary>
+public interface ITestEngine
+{
     /// <summary>
-    /// Defines the functionality of a test engine.
+    /// Fetches the DiscoveryManager for this engine. This manager would provide all
+    /// functionality required for discovery.
     /// </summary>
-    public interface ITestEngine
-    {
-        /// <summary>
-        /// Fetches the DiscoveryManager for this engine. This manager would provide all
-        /// functionality required for discovery.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing discovery services and data.
-        /// </param>
-        /// <param name="testHostManager">Test host manager for the current test discovery.</param>
-        /// <param name="discoveryCriteria">The discovery criteria.</param>
-        /// 
-        /// <returns>An IProxyDiscoveryManager object that can do discovery.</returns>
-        IProxyDiscoveryManager GetDiscoveryManager(
-            IRequestData requestData,
-            ITestRuntimeProvider testHostManager,
-            DiscoveryCriteria discoveryCriteria);
+    ///
+    /// <param name="requestData">
+    /// The request data for providing discovery services and data.
+    /// </param>
+    /// <param name="discoveryCriteria">The discovery criteria.</param>
+    /// <param name="sourceToSourceDetailMap">Details of every source.</param>
+    /// <param name="warningLogger">Logger of warnings.</param>
+    ///
+    /// <returns>An IProxyDiscoveryManager object that can do discovery.</returns>
+    IProxyDiscoveryManager GetDiscoveryManager(
+        IRequestData requestData,
+        DiscoveryCriteria discoveryCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 
-        /// <summary>
-        /// Fetches the ExecutionManager for this engine. This manager would provide all
-        /// functionality required for execution.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing common execution services and data.
-        /// </param>
-        /// <param name="testHostManager">Test host manager for the current test run.</param>
-        /// <param name="testRunCriteria">Test run criteria of the current test run.</param>
-        /// 
-        /// <returns>An IProxyExecutionManager object that can do execution.</returns>
-        IProxyExecutionManager GetExecutionManager(
-            IRequestData requestData,
-            ITestRuntimeProvider testHostManager,
-            TestRunCriteria testRunCriteria);
+    /// <summary>
+    /// Fetches the ExecutionManager for this engine. This manager would provide all
+    /// functionality required for execution.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing common execution services and data.
+    /// </param>
+    /// <param name="sourceToSourceDetailMap">Details of every source.</param>
+    /// <param name="warningLogger">Logger of warnings.</param>
+    /// <param name="testRunCriteria">Test run criteria of the current test run.</param>
+    ///
+    /// <returns>An IProxyExecutionManager object that can do execution.</returns>
+    IProxyExecutionManager GetExecutionManager(
+        IRequestData requestData,
+        TestRunCriteria testRunCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 
-        /// <summary>
-        /// Fetches the TestSessionManager for this engine. This manager would provide all
-        /// functionality required for test session management.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing test session services and data.
-        /// </param>
-        /// <param name="testSessionCriteria">
-        /// Test session criteria of the current test session.
-        /// </param>
-        /// 
-        /// <returns>An IProxyTestSessionManager object that can manage test sessions.</returns>
-        IProxyTestSessionManager GetTestSessionManager(
-            IRequestData requestData,
-            StartTestSessionCriteria testSessionCriteria);
+    /// <summary>
+    /// Fetches the TestSessionManager for this engine. This manager would provide all
+    /// functionality required for test session management.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing test session services and data.
+    /// </param>
+    /// <param name="testSessionCriteria">
+    /// Test session criteria of the current test session.
+    /// </param>
+    /// <param name="sourceToSourceDetailMap">Details of every source.</param>
+    /// <param name="warningLogger">Logger of warnings.</param>
+    ///
+    /// <returns>An IProxyTestSessionManager object that can manage test sessions.</returns>
+    IProxyTestSessionManager? GetTestSessionManager(
+        IRequestData requestData,
+        StartTestSessionCriteria testSessionCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 
-        /// <summary>
-        /// Fetches the extension manager for this engine. This manager would provide extensibility
-        /// features that this engine supports.
-        /// </summary>
-        /// 
-        /// <returns>An ITestExtensionManager object that helps with extensibility.</returns>
-        ITestExtensionManager GetExtensionManager();
+    /// <summary>
+    /// Fetches the extension manager for this engine. This manager would provide extensibility
+    /// features that this engine supports.
+    /// </summary>
+    ///
+    /// <returns>An ITestExtensionManager object that helps with extensibility.</returns>
+    ITestExtensionManager GetExtensionManager();
 
-        /// <summary>
-        /// Fetches the logger manager for this engine. This manager will provide logger
-        /// extensibility features that this engine supports.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing common execution services and data.
-        /// </param>
-        /// 
-        /// <returns>An ITestLoggerManager object that helps with logger extensibility.</returns>
-        ITestLoggerManager GetLoggerManager(IRequestData requestData);
-    }
+    /// <summary>
+    /// Fetches the logger manager for this engine. This manager will provide logger
+    /// extensibility features that this engine supports.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing common execution services and data.
+    /// </param>
+    ///
+    /// <returns>An ITestLoggerManager object that helps with logger extensibility.</returns>
+    ITestLoggerManager GetLoggerManager(IRequestData requestData);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestExtensionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestExtensionManager.cs
index d3936240e8..c361792106 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestExtensionManager.cs
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// Orchestrates extensions for this engine.
+/// </summary>
+public interface ITestExtensionManager
+{
     /// <summary>
-    /// Orchestrates extensions for this engine.
+    /// Update the extensions data
     /// </summary>
-    public interface ITestExtensionManager
-    {
-        /// <summary>
-        /// Update the extensions data
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions">List of extension paths</param>
-        /// <param name="skipExtensionFilters">Skips filtering of extensions (if true)</param>
-        void UseAdditionalExtensions(IEnumerable<string> pathToAdditionalExtensions, bool skipExtensionFilters);
+    /// <param name="pathToAdditionalExtensions">List of extension paths</param>
+    /// <param name="skipExtensionFilters">Skips filtering of extensions (if true)</param>
+    void UseAdditionalExtensions(IEnumerable<string>? pathToAdditionalExtensions, bool skipExtensionFilters);
 
-        /// <summary>
-        /// Clear the extensions data
-        /// </summary>
-        void ClearExtensions();
-    }
+    /// <summary>
+    /// Clear the extensions data
+    /// </summary>
+    void ClearExtensions();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestLoggerManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestLoggerManager.cs
index 8a9b199bf2..5eb9d2e120 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestLoggerManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestLoggerManager.cs
@@ -1,77 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using System;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// Orchestrates logger operations for this engine.
+/// </summary>
+public interface ITestLoggerManager : IDisposable
+{
     /// <summary>
-    /// Orchestrates logger operations for this engine.
+    /// Loggers initialized flag.
     /// </summary>
-    public interface ITestLoggerManager : IDisposable
+    bool LoggersInitialized
     {
-        /// <summary>
-        /// Loggers initialized flag.
-        /// </summary>
-        bool LoggersInitialized
-        {
-            get;
-        }
+        get;
+    }
 
-        /// <summary>
-        /// Initialize loggers.
-        /// </summary>
-        void Initialize(string runSettings);
+    /// <summary>
+    /// Initialize loggers.
+    /// </summary>
+    void Initialize(string? runSettings);
 
-        /// <summary>
-        /// Handles test run message.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleTestRunMessage(TestRunMessageEventArgs e);
+    /// <summary>
+    /// Handles test run message.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleTestRunMessage(TestRunMessageEventArgs e);
 
-        /// <summary>
-        /// Handles test run start.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleTestRunStart(TestRunStartEventArgs e);
+    /// <summary>
+    /// Handles test run start.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleTestRunStart(TestRunStartEventArgs e);
 
-        /// <summary>
-        /// Handles test run stats change.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleTestRunStatsChange(TestRunChangedEventArgs e);
+    /// <summary>
+    /// Handles test run stats change.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleTestRunStatsChange(TestRunChangedEventArgs e);
 
-        /// <summary>
-        /// Handles test run complete.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleTestRunComplete(TestRunCompleteEventArgs e);
+    /// <summary>
+    /// Handles test run complete.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleTestRunComplete(TestRunCompleteEventArgs e);
 
-        /// <summary>
-        /// Handles discovery message.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleDiscoveryMessage(TestRunMessageEventArgs e);
+    /// <summary>
+    /// Handles discovery message.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleDiscoveryMessage(TestRunMessageEventArgs e);
 
-        /// <summary>
-        /// Handles discovery start.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleDiscoveryStart(DiscoveryStartEventArgs e);
+    /// <summary>
+    /// Handles discovery start.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleDiscoveryStart(DiscoveryStartEventArgs e);
 
-        /// <summary>
-        /// Handles discovered tests.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleDiscoveredTests(DiscoveredTestsEventArgs e);
+    /// <summary>
+    /// Handles discovered tests.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleDiscoveredTests(DiscoveredTestsEventArgs e);
 
-        /// <summary>
-        /// Handles discovery complete.
-        /// </summary>
-        /// <param name="e"></param>
-        void HandleDiscoveryComplete(DiscoveryCompleteEventArgs e);
-    }
+    /// <summary>
+    /// Handles discovery complete.
+    /// </summary>
+    /// <param name="e"></param>
+    void HandleDiscoveryComplete(DiscoveryCompleteEventArgs e);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/TestExecutionContext.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/TestExecutionContext.cs
index 8f0ebb0267..23147e4415 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/TestExecutionContext.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/TestExecutionContext.cs
@@ -1,185 +1,178 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol
+using System;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+
+/// <summary>
+/// Stores information about test execution context.
+/// </summary>
+[DataContract]
+public class TestExecutionContext
 {
-    using System;
-    using System.Runtime.Serialization;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestExecutionContext"/> class.
+    /// </summary>
+    /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
+    public TestExecutionContext()
+    {
+        // Default constructor for Serialization.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestExecutionContext"/> class.
+    /// </summary>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="runStatsChangeEventTimeout">Timeout that triggers sending results regardless of cache size.</param>
+    /// <param name="inIsolation">Whether execution is out of process</param>
+    /// <param name="keepAlive">Whether executor process should be kept running after test run completion</param>
+    /// <param name="isDataCollectionEnabled">Whether data collection is enabled or not.</param>
+    /// <param name="areTestCaseLevelEventsRequired">Indicates whether test case level events are required.</param>
+    /// <param name="hasTestRun">True if ExecutionContext is associated with Test run, false otherwise.</param>
+    /// <param name="isDebug">True if ExecutionContext needs debugger, false otherwise.</param>
+    /// <param name="testCaseFilter">Filter criteria string for filtering tests.</param>
+    /// <param name="filterOptions">Additional options for test case filter.</param>
+    public TestExecutionContext(
+        long frequencyOfRunStatsChangeEvent,
+        TimeSpan runStatsChangeEventTimeout,
+        bool inIsolation,
+        bool keepAlive,
+        bool isDataCollectionEnabled,
+        bool areTestCaseLevelEventsRequired,
+        bool hasTestRun,
+        bool isDebug,
+        string? testCaseFilter,
+        FilterOptions? filterOptions)
+    {
+        FrequencyOfRunStatsChangeEvent = frequencyOfRunStatsChangeEvent;
+        RunStatsChangeEventTimeout = runStatsChangeEventTimeout;
+        InIsolation = inIsolation;
+        KeepAlive = keepAlive;
+        IsDataCollectionEnabled = isDataCollectionEnabled;
+        AreTestCaseLevelEventsRequired = areTestCaseLevelEventsRequired;
+
+        IsDebug = isDebug;
+
+        HasTestRun = hasTestRun;
+        TestCaseFilter = testCaseFilter;
+        FilterOptions = filterOptions;
+    }
+
+    /// <summary>
+    /// Gets or sets the frequency of run stats event.
+    /// </summary>
+    [DataMember]
+    public long FrequencyOfRunStatsChangeEvent
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the timeout that triggers sending results regardless of cache size.
+    /// </summary>
+    [DataMember]
+    public TimeSpan RunStatsChangeEventTimeout
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether execution is out of process.
+    /// </summary>
+    [DataMember]
+    public bool InIsolation
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether executor process should be kept running after test run completion.
+    /// </summary>
+    [DataMember]
+    public bool KeepAlive
+    {
+        get;
+        set;
+    }
 
     /// <summary>
-    /// Stores information about test execution context.
+    /// Gets or sets a value indicating whether test case level events need to be sent or not
     /// </summary>
-    [DataContract]
-    public class TestExecutionContext
+    [DataMember]
+    public bool AreTestCaseLevelEventsRequired
     {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestExecutionContext"/> class.
-        /// </summary>
-        /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
-        public TestExecutionContext()
-        {
-            // Default constructor for Serialization.
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestExecutionContext"/> class.
-        /// </summary>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="runStatsChangeEventTimeout">Timeout that triggers sending results regardless of cache size.</param>
-        /// <param name="inIsolation">Whether execution is out of process</param>
-        /// <param name="keepAlive">Whether executor process should be kept running after test run completion</param>
-        /// <param name="isDataCollectionEnabled">Whether data collection is enabled or not.</param>
-        /// <param name="areTestCaseLevelEventsRequired">Indicates whether test case level events are required.</param>
-        /// <param name="hasTestRun">True if ExecutionContext is associated with Test run, false otherwise.</param>
-        /// <param name="isDebug">True if ExecutionContext needs debugger, false otherwise.</param>
-        /// <param name="testCaseFilter">Filter criteria string for filtering tests.</param>
-        /// <param name="filterOptions">Additional options for test case filter.</param>
-        public TestExecutionContext(
-            long frequencyOfRunStatsChangeEvent,
-            TimeSpan runStatsChangeEventTimeout,
-            bool inIsolation,
-            bool keepAlive,
-            bool isDataCollectionEnabled,
-            bool areTestCaseLevelEventsRequired,
-            bool hasTestRun,
-            bool isDebug,
-            string testCaseFilter,
-            FilterOptions filterOptions)
-        {
-            this.FrequencyOfRunStatsChangeEvent = frequencyOfRunStatsChangeEvent;
-            this.RunStatsChangeEventTimeout = runStatsChangeEventTimeout;
-            this.InIsolation = inIsolation;
-            this.KeepAlive = keepAlive;
-            this.IsDataCollectionEnabled = isDataCollectionEnabled;
-            this.AreTestCaseLevelEventsRequired = areTestCaseLevelEventsRequired;
-
-            this.IsDebug = isDebug;
-
-            this.HasTestRun = hasTestRun;
-            this.TestCaseFilter = testCaseFilter;
-            this.FilterOptions = filterOptions;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the frequency of run stats event.
-        /// </summary>
-        [DataMember]
-        public long FrequencyOfRunStatsChangeEvent
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the timeout that triggers sending results regardless of cache size.
-        /// </summary>
-        [DataMember]
-        public TimeSpan RunStatsChangeEventTimeout
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether execution is out of process.
-        /// </summary>
-        [DataMember]
-        public bool InIsolation
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether executor process should be kept running after test run completion.
-        /// </summary>
-        [DataMember]
-        public bool KeepAlive
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether test case level events need to be sent or not
-        /// </summary>
-        [DataMember]
-        public bool AreTestCaseLevelEventsRequired
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether execution is in debug mode.
-        /// </summary>
-        [DataMember]
-        public bool IsDebug
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the filter criteria for run with sources to filter test cases.
-        /// </summary>
-        [DataMember]
-        public string TestCaseFilter
-        {
-            get;
-            set;
-        }
-
-
-        /// <summary>
-        /// Gets or sets additional options for filtering.
-        /// </summary>
-        [DataMember]
-        public FilterOptions FilterOptions
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether data collection is enabled or not.
-        /// </summary>
-        /// <remarks>This does not need to be serialized over to the test host process.</remarks>
-        [IgnoreDataMember]
-        public bool IsDataCollectionEnabled
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether execution context is associated with a test run.
-        /// </summary>
-        [IgnoreDataMember]
-        public bool HasTestRun
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a configuration associated with this run.
-        /// </summary>
-        /// <remarks>It is not serialized over <c>wcf </c> as the information is available in the run settings</remarks>
-        [IgnoreDataMember]
-        public RunConfiguration TestRunConfiguration
-        {
-            get;
-            set;
-        }
-
-        #endregion
+        get;
+        set;
     }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether execution is in debug mode.
+    /// </summary>
+    [DataMember]
+    public bool IsDebug
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the filter criteria for run with sources to filter test cases.
+    /// </summary>
+    [DataMember]
+    public string? TestCaseFilter
+    {
+        get;
+        set;
+    }
+
+
+    /// <summary>
+    /// Gets or sets additional options for filtering.
+    /// </summary>
+    [DataMember]
+    public FilterOptions? FilterOptions
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether data collection is enabled or not.
+    /// </summary>
+    /// <remarks>This does not need to be serialized over to the test host process.</remarks>
+    [IgnoreDataMember]
+    public bool IsDataCollectionEnabled
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether execution context is associated with a test run.
+    /// </summary>
+    [IgnoreDataMember]
+    public bool HasTestRun
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a configuration associated with this run.
+    /// </summary>
+    /// <remarks>It is not serialized over <c>wcf </c> as the information is available in the run settings</remarks>
+    [IgnoreDataMember]
+    public RunConfiguration? TestRunConfiguration
+    {
+        get;
+        set;
+    }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IArtifactProcessingManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IArtifactProcessingManager.cs
new file mode 100644
index 0000000000..b9724b5dd0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IArtifactProcessingManager.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+internal interface IArtifactProcessingManager
+{
+    void CollectArtifacts(TestRunCompleteEventArgs testRunCompleteEventArgs, string runSettingsXml);
+    Task PostProcessArtifactsAsync();
+}
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs
new file mode 100644
index 0000000000..ef1b3f1228
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/IDataCollectorAttachmentsProcessorsFactory.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Creates and return a list of available attachments processor
+/// </summary>
+internal interface IDataCollectorAttachmentsProcessorsFactory
+{
+    /// <summary>
+    /// Creates and return a list of available attachments processor
+    /// </summary>
+    /// <param name="invokedDataCollectors">List of invoked data collectors</param>
+    /// <param name="logger">Message logger</param>
+    /// <returns>List of attachments processors</returns>
+    DataCollectorAttachmentProcessor[] Create(InvokedDataCollector[]? invokedDataCollectors, IMessageLogger logger);
+}
+
+/// <summary>
+/// Registered data collector attachment processor
+/// </summary>
+internal class DataCollectorAttachmentProcessor : IDisposable
+{
+    /// <summary>
+    /// Data collector FriendlyName
+    /// </summary>
+    public string FriendlyName { get; private set; }
+
+    /// <summary>
+    /// Data collector attachment processor instance
+    /// </summary>
+    public IDataCollectorAttachmentProcessor DataCollectorAttachmentProcessorInstance { get; private set; }
+
+    public DataCollectorAttachmentProcessor(string friendlyName, IDataCollectorAttachmentProcessor dataCollectorAttachmentProcessor)
+    {
+        FriendlyName = friendlyName.IsNullOrEmpty()
+            ? throw new ArgumentException($"'{nameof(friendlyName)}' cannot be null or empty.", nameof(friendlyName))
+            : friendlyName;
+        DataCollectorAttachmentProcessorInstance = dataCollectorAttachmentProcessor ?? throw new ArgumentNullException(nameof(dataCollectorAttachmentProcessor));
+    }
+
+    public void Dispose()
+    {
+        (DataCollectorAttachmentProcessorInstance as IDisposable)?.Dispose();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestCaseEventsHandler.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestCaseEventsHandler.cs
index 4cd9ef7870..a0357cced0 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestCaseEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestCaseEventsHandler.cs
@@ -1,45 +1,44 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
+/// <summary>
+/// The Test Case level events.
+/// </summary>
+public interface ITestCaseEventsHandler
+{
     /// <summary>
-    /// The Test Case level events.
+    ///  Report start of executing a test case.
     /// </summary>
-    public interface ITestCaseEventsHandler
-    {
-        /// <summary>
-        ///  Report start of executing a test case.
-        /// </summary>
-        /// <param name="testCase">Details of the test case whose execution is just started.</param>
-        void SendTestCaseStart(TestCase testCase);
+    /// <param name="testCase">Details of the test case whose execution is just started.</param>
+    void SendTestCaseStart(TestCase testCase);
 
-        /// <summary>
-        /// Report end of executing a test case.
-        /// </summary>
-        /// <param name="testCase">Details of the test case.</param>
-        /// <param name="outcome">Result of the test case executed.</param>
-        void SendTestCaseEnd(TestCase testCase, TestOutcome outcome);
+    /// <summary>
+    /// Report end of executing a test case.
+    /// </summary>
+    /// <param name="testCase">Details of the test case.</param>
+    /// <param name="outcome">Result of the test case executed.</param>
+    void SendTestCaseEnd(TestCase testCase, TestOutcome outcome);
 
-        /// <summary>
-        /// Sends the test result
-        /// </summary>
-        /// <param name="result"> The result. </param>
-        void SendTestResult(TestResult result);
+    /// <summary>
+    /// Sends the test result
+    /// </summary>
+    /// <param name="result"> The result. </param>
+    void SendTestResult(TestResult result);
 
-        /// <summary>
-        /// Send session start event.
-        /// The purpose of this is to perform any initialization before the test case level events are sent.
-        /// </summary>
-        /// <param name="properties"> The session start properties. </param>
-        void SendSessionStart(IDictionary<string, object> properties);
+    /// <summary>
+    /// Send session start event.
+    /// The purpose of this is to perform any initialization before the test case level events are sent.
+    /// </summary>
+    /// <param name="properties"> The session start properties. </param>
+    void SendSessionStart(IDictionary<string, object?> properties);
 
-        /// <summary>
-        /// Sends session end event.
-        /// The purpose of this is to perform any cleanup after the test case level events are sent.
-        /// </summary>
-        void SendSessionEnd();
-    }
+    /// <summary>
+    /// Sends session end event.
+    /// The purpose of this is to perform any cleanup after the test case level events are sent.
+    /// </summary>
+    void SendSessionEnd();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestRunAttachmentsProcessingManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestRunAttachmentsProcessingManager.cs
index d6b88d89c8..7bb7692c15 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestRunAttachmentsProcessingManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestRunAttachmentsProcessingManager.cs
@@ -1,33 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+/// <summary>
+/// Orchestrates test run attachments processing operations.
+/// </summary>
+internal interface ITestRunAttachmentsProcessingManager
 {
     /// <summary>
-    /// Orchestrates test run attachments processing operations.
+    /// Processes attachments and provides results through handler
     /// </summary>
-    internal interface ITestRunAttachmentsProcessingManager
-    {
-        /// <summary>
-        /// Processes attachments and provides results through handler
-        /// </summary>
-        /// <param name="attachments">Collection of attachments</param>
-        /// <param name="eventHandler">EventHandler for handling test run attachments processing event</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        Task ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken);
+    /// <param name="runSettingsXml">RunSettings</param>
+    /// <param name="requestData">Data in the request.</param>
+    /// <param name="attachments">Collection of attachments</param>
+    /// <param name="invokedDataCollector">Collection of invoked data collectors</param>
+    /// <param name="eventHandler">EventHandler for handling test run attachments processing event</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    Task ProcessTestRunAttachmentsAsync(string? runSettingsXml, IRequestData requestData, IEnumerable<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Processes attachments
-        /// </summary>
-        /// <param name="attachments">Collection of attachments</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <returns>Collection of attachments.</returns>
-        Task<Collection<AttachmentSet>> ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Processes attachments
+    /// </summary>
+    /// <param name="runSettingsXml">RunSettings</param>
+    /// <param name="requestData">Data in the request.</param>
+    /// <param name="attachments">Collection of attachments</param>
+    /// <param name="invokedDataCollector">Collection of invoked data collectors</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Collection of attachments.</returns>
+    Task<Collection<AttachmentSet>> ProcessTestRunAttachmentsAsync(string? runSettingsXml, IRequestData requestData, IEnumerable<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, CancellationToken cancellationToken);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs
index e60787a968..73fc09bdac 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs
@@ -1,33 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+/// <summary>
+/// Orchestrates discovery operations for the engine communicating with the test host process.
+/// </summary>
+public interface IDiscoveryManager
+{
+    /// <summary>
+    /// Initializes the discovery manager.
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
+    /// <param name="eventHandler">The discovery handler.</param>
+    void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestDiscoveryEventsHandler2? eventHandler);
 
     /// <summary>
-    /// Orchestrates discovery operations for the engine communicating with the test host process.
+    /// Discovers tests
     /// </summary>
-    public interface IDiscoveryManager
-    {
-        /// <summary>
-        /// Initializes the discovery manager.
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
-        void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestDiscoveryEventsHandler2 eventHandler);
+    /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler);
 
-        /// <summary>
-        /// Discovers tests
-        /// </summary>
-        /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
-        /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
-        void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler);
+    /// <summary>
+    /// Aborts the test discovery.
+    /// </summary>
+    void Abort();
 
-        /// <summary>
-        /// Aborts the test discovery.
-        /// </summary>
-        void Abort();
-    }
+    /// <summary>
+    /// Aborts the test discovery with eventHandler.
+    /// </summary>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    void Abort(ITestDiscoveryEventsHandler2 eventHandler);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IExecutionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IExecutionManager.cs
index d868f7ec86..37f67bab5a 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IExecutionManager.cs
@@ -1,60 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+
+/// <summary>
+/// Orchestrates test execution related functionality for the engine communicating with the test host process.
+/// </summary>
+public interface IExecutionManager
 {
-    using System.Collections.Generic;
+    /// <summary>
+    /// Initializes the execution manager.
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
+    /// <param name="testMessageEventsHandler">Handler of test messages.</param>
+    void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestMessageEventHandler? testMessageEventsHandler);
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+    /// <summary>
+    /// Starts the test run with sources.
+    /// </summary>
+    /// <param name="adapterSourceMap"> The adapter Source Map.  </param>
+    /// <param name="package"> The packages which actually contain sources. A testhost can at max execute for one package at time
+    /// Package can be null if test source, and package are same
+    /// </param>
+    /// <param name="runSettings"> The run Settings.  </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    /// <param name="testCaseEvents"> EventHandler for handling test cases level events from Engine. </param>
+    /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    void StartTestRun(Dictionary<string, IEnumerable<string>> adapterSourceMap, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEvents, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Starts the test run with tests.
+    /// </summary>
+    /// <param name="tests"> The test list. </param>
+    /// <param name="package"> The packages which actually contain sources. A testhost can at max execute for one package at time
+    /// Package can be null if test source, and package are same
+    /// </param>
+    /// <param name="runSettings"> The run Settings.  </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    /// /// <param name="testCaseEvents"> EventHandler for handling test cases level events from Engine. </param>
+    /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    void StartTestRun(IEnumerable<TestCase> tests, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEvents, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Cancel the test execution.
+    /// </summary>
+    /// <param name="testRunEventsHandler"> EventHandler for handling execution events from Engine. </param>
+    void Cancel(IInternalTestRunEventsHandler testRunEventsHandler);
 
     /// <summary>
-    /// Orchestrates test execution related functionality for the engine communicating with the test host process.
+    /// Aborts the test execution.
     /// </summary>
-    public interface IExecutionManager
-    {
-        /// <summary>
-        /// Initializes the execution manager.
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
-        void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestMessageEventHandler testMessageEventsHandler);
-
-        /// <summary>
-        /// Starts the test run with sources.
-        /// </summary>
-        /// <param name="adapterSourceMap"> The adapter Source Map.  </param>
-        /// <param name="package"> The packages which actually contain sources. A testhost can at max execute for one package at time
-        /// Package can be null if test source, and package are same
-        /// </param>
-        /// <param name="runSettings"> The run Settings.  </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        /// <param name="testCaseEvents"> EventHandler for handling test cases level events from Engine. </param>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void StartTestRun(Dictionary<string, IEnumerable<string>> adapterSourceMap, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEvents, ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Starts the test run with tests.
-        /// </summary>
-        /// <param name="tests"> The test list. </param>
-        /// <param name="package"> The packages which actually contain sources. A testhost can at max execute for one package at time
-        /// Package can be null if test source, and package are same
-        /// </param>
-        /// <param name="runSettings"> The run Settings.  </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        /// /// <param name="testCaseEvents"> EventHandler for handling test cases level events from Engine. </param>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void StartTestRun(IEnumerable<TestCase> tests, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEvents, ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Cancel the test execution.
-        /// </summary>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void Cancel(ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Aborts the test execution.
-        /// </summary>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        void Abort(ITestRunEventsHandler testRunEventsHandler);
-    }
+    /// <param name="testRunEventsHandler"> EventHandler for handling execution events from Engine. </param>
+    void Abort(IInternalTestRunEventsHandler testRunEventsHandler);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/ITestHostManagerFactory.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/ITestHostManagerFactory.cs
index acb649fdc5..5ac7dcfd65 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/ITestHostManagerFactory.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/ITestHostManagerFactory.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+
+/// <summary>
+/// The factory that provides discovery and execution managers to the test host.
+/// </summary>
+public interface ITestHostManagerFactory
 {
     /// <summary>
-    /// The factory that provides discovery and execution managers to the test host.
+    /// The discovery manager instance for any discovery related operations inside of the test host.
     /// </summary>
-    public interface ITestHostManagerFactory
-    {
-        /// <summary>
-        /// The discovery manager instance for any discovery related operations inside of the test host.
-        /// </summary>
-        /// <returns>The discovery manager.</returns>
-        IDiscoveryManager GetDiscoveryManager();
+    /// <returns>The discovery manager.</returns>
+    IDiscoveryManager GetDiscoveryManager();
 
-        /// <summary>
-        /// The execution manager instance for any discovery related operations inside of the test host.
-        /// </summary>
-        /// <returns>The execution manager.</returns>
-        IExecutionManager GetExecutionManager();
-    }
+    /// <summary>
+    /// The execution manager instance for any discovery related operations inside of the test host.
+    /// </summary>
+    /// <returns>The execution manager.</returns>
+    IExecutionManager GetExecutionManager();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IAssemblyProperties.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IAssemblyProperties.cs
index ede5a7d257..86b88cdba0 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/IAssemblyProperties.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/IAssemblyProperties.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
+/// <summary>
+/// Metadata that is available for input test source, e.g. Whether it is native or managed dll, etc..
+/// </summary>
+public interface IAssemblyProperties
+{
     /// <summary>
-    /// Metadata that is available for input test source, e.g. Whether it is native or managed dll, etc..
+    /// Determines assembly type from file.
     /// </summary>
-    public interface IAssemblyProperties
-    {
-        /// <summary>
-        /// Determines assembly type from file.
-        /// </summary>
-        AssemblyType GetAssemblyType(string filePath);
-    }
+    AssemblyType GetAssemblyType(string filePath);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IBaseTestEventsRegistrar.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IBaseTestEventsRegistrar.cs
index eec8315ee9..44b7aa72a9 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/IBaseTestEventsRegistrar.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/IBaseTestEventsRegistrar.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+public interface IBaseTestEventsRegistrar
 {
-    public interface IBaseTestEventsRegistrar
-    {
-        /// <summary>
-        /// Log warning message before request is created.
-        /// </summary>
-        /// <param name="message">message string</param>
-        void LogWarning(string message);
-    }
+    /// <summary>
+    /// Log warning message before request is created.
+    /// </summary>
+    /// <param name="message">message string</param>
+    void LogWarning(string message);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs
index f8a4628c0c..ef076542f3 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/IDataCollectorCapabilities.cs
@@ -1,16 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Metadata that is available from data collectors.
+/// </summary>
+public interface IDataCollectorCapabilities : ITestExtensionCapabilities
 {
     /// <summary>
-    /// Metadata that is available from data collectors.
+    /// Gets the friendly name corresponding to the data collector.
+    /// </summary>
+    string FriendlyName { get; }
+
+    /// <summary>
+    /// Check if the data collector has got attachment processor registered.
     /// </summary>
-    public interface IDataCollectorCapabilities : ITestExtensionCapabilities
-    {
-        /// <summary>
-        /// Gets the friendly name corresponding to the data collector.
-        /// </summary>
-        string FriendlyName { get; }
-    }
+    bool HasAttachmentProcessor { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IRunSettingsProvider.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IRunSettingsProvider.cs
index 8d0e184c57..a3c0a05535 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/IRunSettingsProvider.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/IRunSettingsProvider.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Provides access to the active run settings.
+/// </summary>
+internal interface IRunSettingsProvider
 {
     /// <summary>
-    /// Provides access to the active run settings.
+    /// The active run settings.
     /// </summary>
-    internal interface IRunSettingsProvider
-    {
-        /// <summary>
-        /// The active run settings.
-        /// </summary>
-        RunSettings ActiveRunSettings { get; }
+    RunSettings? ActiveRunSettings { get; }
 
-        /// <summary>
-        /// Set the active run settings.
-        /// </summary>
-        /// <param name="runSettings">RunSettings to make the active Run Settings.</param>
-        void SetActiveRunSettings(RunSettings runSettings);
-    }
+    /// <summary>
+    /// Set the active run settings.
+    /// </summary>
+    /// <param name="runSettings">RunSettings to make the active Run Settings.</param>
+    void SetActiveRunSettings(RunSettings runSettings);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ISettingsProviderCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ISettingsProviderCapabilities.cs
index bdd538d1f1..199c97fdfe 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ISettingsProviderCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ISettingsProviderCapabilities.cs
@@ -1,19 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using System.Diagnostics.CodeAnalysis;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
+/// <summary>
+/// Metadata that is available from Settings Providers.
+/// </summary>
+public interface ISettingsProviderCapabilities
+{
     /// <summary>
-    /// Metadata that is available from Settings Providers.
+    /// Gets the name of the settings section.
     /// </summary>
-    [SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes", Justification = "This interface is only public due to limitations in MEF which require metadata interfaces to be public.")]
-    public interface ISettingsProviderCapabilities
-    {
-        /// <summary>
-        /// Gets the name of the settings section.
-        /// </summary>
-        string SettingsName { get; }
-    }
+    string SettingsName { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscovererCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscovererCapabilities.cs
index d7f7ec2a7a..4a867e366f 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscovererCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscovererCapabilities.cs
@@ -1,31 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+/// <summary>
+/// Metadata that is available from Test Discoverers.
+/// </summary>
+public interface ITestDiscovererCapabilities
+{
+    /// <summary>
+    /// List of file extensions that the test discoverer can process tests from.
+    /// </summary>
+    IEnumerable<string>? FileExtension { get; }
 
     /// <summary>
-    /// Metadata that is available from Test Discoverers.
+    /// Default executor Uri for this discoverer
     /// </summary>
-    public interface ITestDiscovererCapabilities
-    {
-        /// <summary>
-        /// List of file extensions that the test discoverer can process tests from.
-        /// </summary>
-        IEnumerable<string> FileExtension { get; }
+    Uri? DefaultExecutorUri { get; }
 
-        /// <summary>
-        /// Default executor Uri for this discoverer
-        /// </summary>
-        Uri DefaultExecutorUri { get; }
+    /// <summary>
+    /// Assembly type that the test discoverer supports.
+    /// </summary>
+    AssemblyType AssemblyType { get; }
 
-        /// <summary>
-        /// Assembly type that the test discoverer supports.
-        /// </summary>
-        AssemblyType AssemblyType { get; }
-    }
+    /// <summary>
+    /// <see langword="true"/> if the discoverer plugin is decorated with ObjectDirectoryBasedTestDiscovererAttribute/>,
+    /// <see langword="false"/> otherwise.
+    /// </summary>
+    bool IsDirectoryBased { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscoveryEventsRegistrar.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscoveryEventsRegistrar.cs
index 984b5b582a..f0f7617202 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscoveryEventsRegistrar.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestDiscoveryEventsRegistrar.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
-    public interface ITestDiscoveryEventsRegistrar : IBaseTestEventsRegistrar
-    {
-        /// <summary>
-        /// Registers to receive discovery events from discovery request.
-        /// These events will then be broadcast to any registered loggers.
-        /// </summary>
-        /// <param name="discoveryRequest">The discovery request to register for events on.</param>
-        void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest);
+public interface ITestDiscoveryEventsRegistrar : IBaseTestEventsRegistrar
+{
+    /// <summary>
+    /// Registers to receive discovery events from discovery request.
+    /// These events will then be broadcast to any registered loggers.
+    /// </summary>
+    /// <param name="discoveryRequest">The discovery request to register for events on.</param>
+    void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest);
 
-        /// <summary>
-        /// Unregister the events from the discovery request.
-        /// </summary>
-        /// <param name="discoveryRequest">The discovery request from which events should be unregistered.</param>
-        void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest);
-    }
+    /// <summary>
+    /// Unregister the events from the discovery request.
+    /// </summary>
+    /// <param name="discoveryRequest">The discovery request from which events should be unregistered.</param>
+    void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestExecutorCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestExecutorCapabilities.cs
index c8fd2fbf57..7b1efd634d 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestExecutorCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestExecutorCapabilities.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Metadata that is available from Test Executors.
+/// </summary>
+internal interface ITestExecutorCapabilities : ITestExtensionCapabilities
 {
-    /// <summary>
-    /// Metadata that is available from Test Executors.
-    /// </summary>
-    internal interface ITestExecutorCapabilities : ITestExtensionCapabilities
-    {
-    }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestExtensionCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestExtensionCapabilities.cs
index 8f23e8e126..adec51043b 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestExtensionCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestExtensionCapabilities.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Basic metadata for extensions which are identified by a URI.
+/// </summary>
+public interface ITestExtensionCapabilities
 {
     /// <summary>
-    /// Basic metadata for extensions which are identified by a URI.
+    /// Gets the URI of the test extension.
     /// </summary>
-    public interface ITestExtensionCapabilities
-    {
-        /// <summary>
-        /// Gets the URI of the test extension.
-        /// </summary>
-        string ExtensionUri { get; }
-    }
+    string ExtensionUri { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestLoggerCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestLoggerCapabilities.cs
index 16d30d5750..e49b720c51 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestLoggerCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestLoggerCapabilities.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Metadata that is available from Test Loggers.
+/// </summary>
+public interface ITestLoggerCapabilities : ITestExtensionCapabilities
 {
-    /// <summary>
-    /// Metadata that is available from Test Loggers.
-    /// </summary>
-    public interface ITestLoggerCapabilities : ITestExtensionCapabilities
-    {
-        /// specifies the friendly name corresponding to the logger.
-        string FriendlyName { get; }
-    }
+    /// specifies the friendly name corresponding to the logger.
+    string FriendlyName { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunEventsRegistrar.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunEventsRegistrar.cs
index 23cdbc0fb8..958b84b1f8 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunEventsRegistrar.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunEventsRegistrar.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
-    public interface ITestRunEventsRegistrar : IBaseTestEventsRegistrar
-    {
-        /// <summary>
-        /// Registers to receive events from the provided test run request.
-        /// These events will then be broadcast to any registered loggers.
-        /// </summary>
-        /// <param name="testRunRequest">The run request to register for events on.</param>
-        void RegisterTestRunEvents(ITestRunRequest testRunRequest);
+public interface ITestRunEventsRegistrar : IBaseTestEventsRegistrar
+{
+    /// <summary>
+    /// Registers to receive events from the provided test run request.
+    /// These events will then be broadcast to any registered loggers.
+    /// </summary>
+    /// <param name="testRunRequest">The run request to register for events on.</param>
+    void RegisterTestRunEvents(ITestRunRequest testRunRequest);
 
-        /// <summary>
-        /// Unregisters the events from the test run request.
-        /// </summary>
-        /// <param name="testRunRequest">The run request from which events should be unregistered.</param>
-        void UnregisterTestRunEvents(ITestRunRequest testRunRequest);
-    }
+    /// <summary>
+    /// Unregisters the events from the test run request.
+    /// </summary>
+    /// <param name="testRunRequest">The run request from which events should be unregistered.</param>
+    void UnregisterTestRunEvents(ITestRunRequest testRunRequest);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunTimeCapabilities.cs b/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunTimeCapabilities.cs
index 9b1b17ab67..8b4ebedbbc 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunTimeCapabilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/ITestRunTimeCapabilities.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+/// <summary>
+/// Metadata that is available from Test Host.
+/// </summary>
+public interface ITestRuntimeCapabilities : ITestExtensionCapabilities
 {
-    /// <summary>
-    /// Metadata that is available from Test Host.
-    /// </summary>
-    public interface ITestRuntimeCapabilities : ITestExtensionCapabilities
-    {
-        /// specifies the friendly name corresponding to the TestHost.
-        string FriendlyName { get; }
-    }
+    /// specifies the friendly name corresponding to the TestHost.
+    string FriendlyName { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/IVSExtensionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/IVSExtensionManager.cs
index 977f2d34cf..5b722d5494 100644
--- a/src/Microsoft.TestPlatform.Common/Interfaces/IVSExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/Interfaces/IVSExtensionManager.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
-    public interface IVSExtensionManager
-    {
-        /// <summary>
-        /// Get the unit test extensions installed via vsix.
-        /// </summary>
-        IEnumerable<string> GetUnitTestExtensions();
-    }
+public interface IVSExtensionManager
+{
+    /// <summary>
+    /// Get the unit test extensions installed via vsix.
+    /// </summary>
+    IEnumerable<string> GetUnitTestExtensions();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs b/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs
index adac44003e..f555febb2f 100644
--- a/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs
+++ b/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs
@@ -1,467 +1,456 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Logging
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
+using System;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
 #if NETFRAMEWORK
-    using System.Configuration;
+using System.Configuration;
 #endif
 
+namespace Microsoft.VisualStudio.TestPlatform.Common.Logging;
+
+/// <summary>
+/// Exposes events that Test Loggers can register for and allows for them
+/// to be raised through the IRunMessageLogger interface.
+/// </summary>
+internal class InternalTestLoggerEvents : TestLoggerEvents, IDisposable
+{
     /// <summary>
-    /// Exposes events that Test Loggers can register for and allows for them
-    /// to be raised through the IRunMessageLogger interface.
+    /// Queue used for events which are to be sent to the loggers.
     /// </summary>
-    internal class InternalTestLoggerEvents : TestLoggerEvents, IDisposable
-    {
-        #region Fields
-
-        /// <summary>
-        /// Queue used for events which are to be sent to the loggers.
-        /// </summary>
-        /// <remarks>
-        /// Using the queue accomplishes two things.
-        /// 1. Loggers do not need to be written to be thread safe because
-        ///    we will only be raising one event to them at a time.
-        /// 2. Allows all events to go to all loggers even during initialization
-        ///    because we queue up all events sent until raising of events to the
-        ///    loggers is enabled
-        /// </remarks>
-        private JobQueue<Action> loggerEventQueue;
-
-        /// <summary>
-        /// Keeps track if we are disposed.
-        /// </summary>
-        private bool isDisposed = false;
-
-        /// <summary>
-        /// Specifies whether logger event queue is bounded or not
-        /// </summary>
-        private bool isBoundsOnLoggerEventQueueEnabled;
-
-        private TestSessionMessageLogger testSessionMessageLogger;
-#endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public InternalTestLoggerEvents(TestSessionMessageLogger testSessionMessageLogger)
-        {
-
-            // Initialize the queue and pause it.
-            // Note: The queue will be resumed when events are enabled.  This is done so all
-            //       loggers receive all messages.
-            this.isBoundsOnLoggerEventQueueEnabled = IsBoundsEnabledOnLoggerEventQueue();
-            this.loggerEventQueue = new JobQueue<Action>(
-                this.ProcessQueuedJob,
-                "Test Logger",
-                GetMaxNumberOfJobsInQueue(),
-                GetMaxBytesQueueCanHold(),
-                this.isBoundsOnLoggerEventQueueEnabled,
-                (message) => EqtTrace.Error(message));
-            this.loggerEventQueue.Pause();
-
-            // Register for events from the test run message logger so they
-            // can be raised to the loggers.
-            this.testSessionMessageLogger = testSessionMessageLogger;
-            this.testSessionMessageLogger.TestRunMessage += this.TestRunMessageHandler;
-        }
-
-#endregion
-
-        #region Events
-
-        /// <summary>
-        /// Raised when a test message is received.
-        /// </summary>
-        public override event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    /// <remarks>
+    /// Using the queue accomplishes two things.
+    /// 1. Loggers do not need to be written to be thread safe because
+    ///    we will only be raising one event to them at a time.
+    /// 2. Allows all events to go to all loggers even during initialization
+    ///    because we queue up all events sent until raising of events to the
+    ///    loggers is enabled
+    /// </remarks>
+    private readonly JobQueue<Action> _loggerEventQueue;
 
-        /// <summary>
-        /// Raised when a test run starts.
-        /// </summary>
-        public override event EventHandler<TestRunStartEventArgs> TestRunStart;
+    /// <summary>
+    /// Keeps track if we are disposed.
+    /// </summary>
+    private bool _isDisposed;
 
-        /// <summary>
-        /// Raised when a test result is received.
-        /// </summary>
-        public override event EventHandler<TestResultEventArgs> TestResult;
+    /// <summary>
+    /// Specifies whether logger event queue is bounded or not
+    /// </summary>
+    private readonly bool _isBoundsOnLoggerEventQueueEnabled;
 
-        /// <summary>
-        /// Raised when a test run is complete.
-        /// </summary>
-        public override event EventHandler<TestRunCompleteEventArgs> TestRunComplete;
+    private readonly TestSessionMessageLogger _testSessionMessageLogger;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public InternalTestLoggerEvents(TestSessionMessageLogger testSessionMessageLogger)
+    {
 
-        /// <summary>
-        /// Raised when test discovery starts.
-        /// </summary>
-        public override event EventHandler<DiscoveryStartEventArgs> DiscoveryStart;
+        // Initialize the queue and pause it.
+        // Note: The queue will be resumed when events are enabled.  This is done so all
+        //       loggers receive all messages.
+        _isBoundsOnLoggerEventQueueEnabled = IsBoundsEnabledOnLoggerEventQueue();
+        _loggerEventQueue = new JobQueue<Action>(
+            ProcessQueuedJob,
+            "Test Logger",
+            GetMaxNumberOfJobsInQueue(),
+            GetMaxBytesQueueCanHold(),
+            _isBoundsOnLoggerEventQueueEnabled,
+            (message) => EqtTrace.Error(message));
+        _loggerEventQueue.Pause();
+
+        // Register for events from the test run message logger so they
+        // can be raised to the loggers.
+        _testSessionMessageLogger = testSessionMessageLogger;
+        _testSessionMessageLogger.TestRunMessage += TestRunMessageHandler;
+    }
 
-        /// <summary>
-        /// Raised when a discovery message is received.
-        /// </summary>
-        public override event EventHandler<TestRunMessageEventArgs> DiscoveryMessage;
+    /// <summary>
+    /// Raised when a test message is received.
+    /// </summary>
+    public override event EventHandler<TestRunMessageEventArgs>? TestRunMessage;
 
-        /// <summary>
-        /// Raised when discovered tests are received
-        /// </summary>
-        public override event EventHandler<DiscoveredTestsEventArgs> DiscoveredTests;
+    /// <summary>
+    /// Raised when a test run starts.
+    /// </summary>
+    public override event EventHandler<TestRunStartEventArgs>? TestRunStart;
 
-        /// <summary>
-        /// Raised when test discovery is complete
-        /// </summary>
-        public override event EventHandler<DiscoveryCompleteEventArgs> DiscoveryComplete;
+    /// <summary>
+    /// Raised when a test result is received.
+    /// </summary>
+    public override event EventHandler<TestResultEventArgs>? TestResult;
 
-#endregion
+    /// <summary>
+    /// Raised when a test run is complete.
+    /// </summary>
+    public override event EventHandler<TestRunCompleteEventArgs>? TestRunComplete;
 
-        #region IDisposable
+    /// <summary>
+    /// Raised when test discovery starts.
+    /// </summary>
+    public override event EventHandler<DiscoveryStartEventArgs>? DiscoveryStart;
 
-        /// <summary>
-        /// Waits for all pending messages to be processed by the loggers cleans up.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-            this.isDisposed = true;
+    /// <summary>
+    /// Raised when a discovery message is received.
+    /// </summary>
+    public override event EventHandler<TestRunMessageEventArgs>? DiscoveryMessage;
 
-            // Unregister for test run messages.
-            this.testSessionMessageLogger.TestRunMessage -= this.TestRunMessageHandler;
+    /// <summary>
+    /// Raised when discovered tests are received
+    /// </summary>
+    public override event EventHandler<DiscoveredTestsEventArgs>? DiscoveredTests;
 
-            // Ensure that the queue is processed before returning.
-            this.loggerEventQueue.Resume();
-            this.loggerEventQueue.Dispose();
-        }
+    /// <summary>
+    /// Raised when test discovery is complete
+    /// </summary>
+    public override event EventHandler<DiscoveryCompleteEventArgs>? DiscoveryComplete;
 
-#endregion
 
-        #region Internal Methods
+    #region IDisposable
 
-        /// <summary>
-        /// Enables sending of events to the loggers which are registered and flushes the queue.
-        /// </summary>
-        /// <remarks>
-        /// By default events are disabled and will not be raised until this method is called.
-        /// This is done because during logger initialization, errors could be sent and we do not
-        /// want them broadcast out to the loggers until all loggers have been enabled.  Without this
-        /// all loggers would not receive the errors which were sent prior to initialization finishing.
-        /// </remarks>
-        internal void EnableEvents()
+    /// <summary>
+    /// Waits for all pending messages to be processed by the loggers cleans up.
+    /// </summary>
+    public void Dispose()
+    {
+        if (_isDisposed)
         {
-            this.CheckDisposed();
-
-            this.loggerEventQueue.Resume();
-
-            // Allow currently queued events to flush from the queue.  This is done so that information
-            // logged during initialization completes processing before we begin other tasks.  This is
-            // important for instance when errors are logged during initialization and need to be output
-            // to the console before we begin outputting other information to the console.
-            this.loggerEventQueue.Flush();
+            return;
         }
+        _isDisposed = true;
 
-        /// <summary>
-        /// Raises a test run message event to the enabled loggers.
-        /// </summary>
-        /// <param name="args">Arguments to be raised.</param>
-        internal void RaiseTestRunMessage(TestRunMessageEventArgs args)
-        {
-            if (args == null)
-            {
-                throw new ArgumentNullException(nameof(args));
-            }
+        // Unregister for test run messages.
+        _testSessionMessageLogger.TestRunMessage -= TestRunMessageHandler;
 
-            this.CheckDisposed();
+        // Ensure that the queue is processed before returning.
+        _loggerEventQueue.Resume();
+        _loggerEventQueue.Dispose();
+    }
 
-            // Sending 0 size as this event is not expected to contain any data.
-            this.SafeInvokeAsync(() => this.TestRunMessage, args, 0, "InternalTestLoggerEvents.SendTestRunMessage");
-        }
+    #endregion
 
-        internal void WaitForEventCompletion()
-        {
-            this.loggerEventQueue.Flush();
-        }
-
-        /// <summary>
-        /// Raises a test result event to the enabled loggers.
-        /// </summary>
-        /// <param name="args">Arguments to to be raised.</param>
-        internal void RaiseTestResult(TestResultEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+    /// <summary>
+    /// Enables sending of events to the loggers which are registered and flushes the queue.
+    /// </summary>
+    /// <remarks>
+    /// By default events are disabled and will not be raised until this method is called.
+    /// This is done because during logger initialization, errors could be sent and we do not
+    /// want them broadcast out to the loggers until all loggers have been enabled.  Without this
+    /// all loggers would not receive the errors which were sent prior to initialization finishing.
+    /// </remarks>
+    internal void EnableEvents()
+    {
+        CheckDisposed();
 
-            this.CheckDisposed();
+        _loggerEventQueue.Resume();
 
-            // find the approx size of test result
-            int resultSize = 0;
-            if (this.isBoundsOnLoggerEventQueueEnabled)
-            {
-                resultSize = FindTestResultSize(args) * sizeof(char);
-            }
+        // Allow currently queued events to flush from the queue.  This is done so that information
+        // logged during initialization completes processing before we begin other tasks.  This is
+        // important for instance when errors are logged during initialization and need to be output
+        // to the console before we begin outputting other information to the console.
+        _loggerEventQueue.Flush();
+    }
 
-            this.SafeInvokeAsync(() => this.TestResult, args, resultSize, "InternalTestLoggerEvents.SendTestResult");
-        }
+    /// <summary>
+    /// Raises a test run message event to the enabled loggers.
+    /// </summary>
+    /// <param name="args">Arguments to be raised.</param>
+    internal void RaiseTestRunMessage(TestRunMessageEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-        /// <summary>
-        /// Raises the test run start event to enabled loggers.
-        /// </summary>
-        /// <param name="args">Arguments to be raised.</param>
-        internal void RaiseTestRunStart(TestRunStartEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+        // Sending 0 size as this event is not expected to contain any data.
+        SafeInvokeAsync(() => TestRunMessage, args, 0, "InternalTestLoggerEvents.SendTestRunMessage");
+    }
 
-            CheckDisposed();
+    internal void WaitForEventCompletion()
+    {
+        _loggerEventQueue.Flush();
+    }
 
-            this.SafeInvokeAsync(() => this.TestRunStart, args, 0, "InternalTestLoggerEvents.SendTestRunStart");
-        }
+    /// <summary>
+    /// Raises a test result event to the enabled loggers.
+    /// </summary>
+    /// <param name="args">Arguments to be raised.</param>
+    internal void RaiseTestResult(TestResultEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-        /// <summary>
-        /// Raises a discovery start event to the enabled loggers.
-        /// </summary>
-        /// <param name="args">Arguments to be raised.</param>
-        internal void RaiseDiscoveryStart(DiscoveryStartEventArgs args)
+        // find the approx size of test result
+        int resultSize = 0;
+        if (_isBoundsOnLoggerEventQueueEnabled)
         {
-            ValidateArg.NotNull(args, nameof(args));
-
-            CheckDisposed();
-
-            SafeInvokeAsync(() => this.DiscoveryStart, args, 0, "InternalTestLoggerEvents.SendDiscoveryStart");
+            resultSize = FindTestResultSize(args) * sizeof(char);
         }
 
-        /// <summary>
-        /// Raises a discovery message event to the enabled loggers.
-        /// </summary>
-        /// <param name="args">Arguments to be raised.</param>
-        internal void RaiseDiscoveryMessage(TestRunMessageEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+        SafeInvokeAsync(() => TestResult, args, resultSize, "InternalTestLoggerEvents.SendTestResult");
+    }
 
-            this.CheckDisposed();
+    /// <summary>
+    /// Raises the test run start event to enabled loggers.
+    /// </summary>
+    /// <param name="args">Arguments to be raised.</param>
+    internal void RaiseTestRunStart(TestRunStartEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-            // Sending 0 size as this event is not expected to contain any data.
-            this.SafeInvokeAsync(() => this.DiscoveryMessage, args, 0, "InternalTestLoggerEvents.SendDiscoveryMessage");
-        }
+        SafeInvokeAsync(() => TestRunStart, args, 0, "InternalTestLoggerEvents.SendTestRunStart");
+    }
 
-        /// <summary>
-        /// Raises discovered tests event to the enabled loggers.
-        /// </summary>
-        /// <param name="args"> Arguments to be raised. </param>
-        internal void RaiseDiscoveredTests(DiscoveredTestsEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+    /// <summary>
+    /// Raises a discovery start event to the enabled loggers.
+    /// </summary>
+    /// <param name="args">Arguments to be raised.</param>
+    internal void RaiseDiscoveryStart(DiscoveryStartEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-            CheckDisposed();
+        SafeInvokeAsync(() => DiscoveryStart, args, 0, "InternalTestLoggerEvents.SendDiscoveryStart");
+    }
 
-            SafeInvokeAsync(() => this.DiscoveredTests, args, 0, "InternalTestLoggerEvents.SendDiscoveredTests");
-        }
+    /// <summary>
+    /// Raises a discovery message event to the enabled loggers.
+    /// </summary>
+    /// <param name="args">Arguments to be raised.</param>
+    internal void RaiseDiscoveryMessage(TestRunMessageEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-        /// <summary>
-        /// Raises discovery complete event to the enabled loggers.
-        /// </summary>
-        /// <param name="args"> Arguments to be raised. </param>
-        internal void RaiseDiscoveryComplete(DiscoveryCompleteEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+        // Sending 0 size as this event is not expected to contain any data.
+        SafeInvokeAsync(() => DiscoveryMessage, args, 0, "InternalTestLoggerEvents.SendDiscoveryMessage");
+    }
 
-            CheckDisposed();
+    /// <summary>
+    /// Raises discovered tests event to the enabled loggers.
+    /// </summary>
+    /// <param name="args"> Arguments to be raised. </param>
+    internal void RaiseDiscoveredTests(DiscoveredTestsEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-            // Sending 0 size as this event is not expected to contain any data.
-            SafeInvokeAsync(() => this.DiscoveryComplete, args, 0, "InternalTestLoggerEvents.SendDiscoveryComplete");
+        SafeInvokeAsync(() => DiscoveredTests, args, 0, "InternalTestLoggerEvents.SendDiscoveredTests");
+    }
 
-            // Wait for the loggers to finish processing the messages for the run.
-            this.loggerEventQueue.Flush();
-        }
+    /// <summary>
+    /// Raises discovery complete event to the enabled loggers.
+    /// </summary>
+    /// <param name="args"> Arguments to be raised. </param>
+    internal void RaiseDiscoveryComplete(DiscoveryCompleteEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-        /// <summary>
-        /// Raises test run complete to the enabled loggers
-        /// </summary>
-        /// <param name="args"> Arguments to be raised </param>
-        internal void RaiseTestRunComplete(TestRunCompleteEventArgs args)
-        {
-            ValidateArg.NotNull(args, nameof(args));
+        // Sending 0 size as this event is not expected to contain any data.
+        SafeInvokeAsync(() => DiscoveryComplete, args, 0, "InternalTestLoggerEvents.SendDiscoveryComplete");
 
-            CheckDisposed();
+        // Wait for the loggers to finish processing the messages for the run.
+        _loggerEventQueue.Flush();
+    }
 
-            // Size is being send as 0. (It is good to send the size as the job queue uses it)
-            SafeInvokeAsync(() => this.TestRunComplete, args, 0, "InternalTestLoggerEvents.SendTestRunComplete");
+    /// <summary>
+    /// Raises test run complete to the enabled loggers
+    /// </summary>
+    /// <param name="args"> Arguments to be raised </param>
+    internal void RaiseTestRunComplete(TestRunCompleteEventArgs args)
+    {
+        ValidateArg.NotNull(args, nameof(args));
+        CheckDisposed();
 
-            // Wait for the loggers to finish processing the messages for the run.
-            this.loggerEventQueue.Flush();
-        }
+        // Size is being send as 0. (It is good to send the size as the job queue uses it)
+        SafeInvokeAsync(() => TestRunComplete, args, 0, "InternalTestLoggerEvents.SendTestRunComplete");
 
-        /// <summary>
-        /// Raise the test run complete event to test loggers and waits
-        /// for the events to be processed.
-        /// </summary>
-        /// <param name="stats">Specifies the stats of the test run.</param>
-        /// <param name="isCanceled">Specifies whether the test run is canceled.</param>
-        /// <param name="isAborted">Specifies whether the test run is aborted.</param>
-        /// <param name="error">Specifies the error that occurs during the test run.</param>
-        /// <param name="attachmentSet">Run level attachment sets</param>
-        /// <param name="elapsedTime">Time elapsed in just running the tests.</param>
-        internal void CompleteTestRun(ITestRunStatistics stats, bool isCanceled, bool isAborted, Exception error, Collection<AttachmentSet> attachmentSet, TimeSpan elapsedTime)
-        {
-            this.CheckDisposed();
+        // Wait for the loggers to finish processing the messages for the run.
+        _loggerEventQueue.Flush();
+    }
 
-            var args = new TestRunCompleteEventArgs(stats, isCanceled, isAborted, error, attachmentSet, elapsedTime);
+    /// <summary>
+    /// Raise the test run complete event to test loggers and waits
+    /// for the events to be processed.
+    /// </summary>
+    /// <param name="stats">Specifies the stats of the test run.</param>
+    /// <param name="isCanceled">Specifies whether the test run is canceled.</param>
+    /// <param name="isAborted">Specifies whether the test run is aborted.</param>
+    /// <param name="error">Specifies the error that occurs during the test run.</param>
+    /// <param name="attachmentSet">Run level attachment sets</param>
+    /// <param name="invokedDataCollectors">Invoked data collectors</param>
+    /// <param name="elapsedTime">Time elapsed in just running the tests.</param>
+    internal void CompleteTestRun(ITestRunStatistics? stats, bool isCanceled, bool isAborted, Exception? error, Collection<AttachmentSet>? attachmentSet, Collection<InvokedDataCollector>? invokedDataCollectors, TimeSpan elapsedTime)
+    {
+        CheckDisposed();
 
-            // Sending 0 size as this event is not expected to contain any data.
-            this.SafeInvokeAsync(() => this.TestRunComplete, args, 0, "InternalTestLoggerEvents.SendTestRunComplete");
+        var args = new TestRunCompleteEventArgs(stats, isCanceled, isAborted, error, attachmentSet, invokedDataCollectors, elapsedTime);
 
-            // Wait for the loggers to finish processing the messages for the run.
-            this.loggerEventQueue.Flush();
-        }
+        // Sending 0 size as this event is not expected to contain any data.
+        SafeInvokeAsync(() => TestRunComplete, args, 0, "InternalTestLoggerEvents.SendTestRunComplete");
 
-#endregion
+        // Wait for the loggers to finish processing the messages for the run.
+        _loggerEventQueue.Flush();
+    }
 
-        #region Private Members
+    /// <summary>
+    /// Called when a test run message is sent through the ITestRunMessageLogger which is exported.
+    /// </summary>
+    private void TestRunMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        // Broadcast the message to the loggers.
+        SafeInvokeAsync(() => TestRunMessage, e, 0, "InternalTestLoggerEvents.SendMessage");
+    }
 
-        /// <summary>
-        /// Called when a test run message is sent through the ITestRunMessageLogger which is exported.
-        /// </summary>
-        private void TestRunMessageHandler(object sender, TestRunMessageEventArgs e)
+    /// <summary>
+    /// Invokes each of the subscribers of the event and handles exceptions which are thrown
+    /// ensuring that each handler is invoked even if one throws.
+    /// The actual calling of the subscribers is done on a background thread.
+    /// </summary>
+    private void SafeInvokeAsync(Func<MulticastDelegate?> eventHandlersFactory, EventArgs args, int size, string traceDisplayName)
+    {
+        // If you are wondering why this is taking a Func<MulticastDelegate> rather than just a MulticastDelegate it is because
+        // taking just that will capture only the subscribers that were present at the time we passed the delegate into this
+        // method. Which means that if there were no subscribers we will capture null, and later when the queue is unpaused
+        // we won't call any logger that subscribed while the queue was paused.
+
+        ValidateArg.NotNull(eventHandlersFactory, nameof(eventHandlersFactory));
+        ValidateArg.NotNull(args, nameof(args));
+
+        // When the logger event queue is paused we want to enqueue the work because maybe there are no
+        // loggers yet, and there are maybe errors that the loggers should report once they subscribe.
+        // When the queue is running, don't bother adding tasks to the queue when there are no subscribers
+        // because there is very slim chance that a new logger will be added in the few milliseconds that will
+        // pass until we process the task, and it just puts pressure on the queue. If this proves to be a problem
+        // we have a race condition, and that side should pause the queue while it adds all the loggers and then resume.
+        if (!_loggerEventQueue.IsPaused && eventHandlersFactory() == null)
         {
-            // Broadcast the message to the loggers.
-            this.SafeInvokeAsync(() => this.TestRunMessage, e, 0, "InternalTestLoggerEvents.SendMessage");
+            return;
         }
 
-        /// <summary>
-        /// Invokes each of the subscribers of the event and handles exceptions which are thrown
-        /// ensuring that each handler is invoked even if one throws.
-        /// The actual calling of the subscribers is done on a background thread.
-        /// </summary>
-        private void SafeInvokeAsync(Func<MulticastDelegate> eventHandlersFactory, EventArgs args, int size, string traceDisplayName)
-        {
-            ValidateArg.NotNull(eventHandlersFactory, nameof(eventHandlersFactory));
-            ValidateArg.NotNull(args, nameof(args));
-
-            // Invoke the handlers on a background thread.
-            this.loggerEventQueue.QueueJob(
-                () =>
-                    {
-                        var eventHandlers = eventHandlersFactory();
-                        eventHandlers?.SafeInvoke(this, args, traceDisplayName);
-                    }, size);
-        }
+        // Invoke the handlers on a background thread.
+        _loggerEventQueue.QueueJob(
+            () =>
+            {
+                var eventHandlers = eventHandlersFactory();
+                eventHandlers?.SafeInvoke(this, args, traceDisplayName);
+            }, size);
+    }
 
-        /// <summary>
-        /// Method called to process a job which is coming from the logger event queue.
-        /// </summary>
-        private void ProcessQueuedJob(Action action)
-        {
-            action();
-        }
+    /// <summary>
+    /// Method called to process a job which is coming from the logger event queue.
+    /// </summary>
+    private void ProcessQueuedJob(Action? action)
+    {
+        action?.Invoke();
+    }
 
-        /// <summary>
-        /// Throws if we are disposed.
-        /// </summary>
-        private void CheckDisposed()
+    /// <summary>
+    /// Throws if we are disposed.
+    /// </summary>
+    private void CheckDisposed()
+    {
+        if (_isDisposed)
         {
-            if (this.isDisposed)
-            {
-                throw new ObjectDisposedException(typeof(TestLoggerEvents).FullName);
-            }
+            throw new ObjectDisposedException(typeof(TestLoggerEvents).FullName);
         }
+    }
 
-        /// <summary>
-        /// The method parses the config file of vstest.console.exe to see if the Max Job Queue Length is defined.
-        /// Return the Max Queue Length so defined or a default value specified by TestPlatformDefaults.DefaultMaxLoggerEventsToCache
-        /// </summary>
-        private int GetMaxNumberOfJobsInQueue()
-        {
-            return GetSetting(TestPlatformDefaults.MaxNumberOfEventsLoggerEventQueueCanHold,
-                              TestPlatformDefaults.DefaultMaxNumberOfEventsLoggerEventQueueCanHold);
-        }
+    /// <summary>
+    /// The method parses the config file of vstest.console.exe to see if the Max Job Queue Length is defined.
+    /// Return the Max Queue Length so defined or a default value specified by TestPlatformDefaults.DefaultMaxLoggerEventsToCache
+    /// </summary>
+    private static int GetMaxNumberOfJobsInQueue()
+    {
+        return GetSetting(TestPlatformDefaults.MaxNumberOfEventsLoggerEventQueueCanHold,
+            TestPlatformDefaults.DefaultMaxNumberOfEventsLoggerEventQueueCanHold);
+    }
 
-        /// <summary>
-        /// The method parses the config file of vstest.console.exe to see if the Max Job Queue size is defined.
-        /// Return the Max Queue size so defined or a default value specified by TestPlatformDefaults.DefaultMaxJobQueueSize
-        /// </summary>
-        private int GetMaxBytesQueueCanHold()
-        {
-            return GetSetting(TestPlatformDefaults.MaxBytesLoggerEventQueueCanHold,
-                TestPlatformDefaults.DefaultMaxBytesLoggerEventQueueCanHold);
-        }
+    /// <summary>
+    /// The method parses the config file of vstest.console.exe to see if the Max Job Queue size is defined.
+    /// Return the Max Queue size so defined or a default value specified by TestPlatformDefaults.DefaultMaxJobQueueSize
+    /// </summary>
+    private static int GetMaxBytesQueueCanHold()
+    {
+        return GetSetting(TestPlatformDefaults.MaxBytesLoggerEventQueueCanHold,
+            TestPlatformDefaults.DefaultMaxBytesLoggerEventQueueCanHold);
+    }
 
-        /// <summary>
-        /// Returns whether flow control on logger events queue should be enabled or not. Default is enabled.
-        /// </summary>
-        private static bool IsBoundsEnabledOnLoggerEventQueue()
-        {
-            bool enableBounds;
+    /// <summary>
+    /// Returns whether flow control on logger events queue should be enabled or not. Default is enabled.
+    /// </summary>
+    private static bool IsBoundsEnabledOnLoggerEventQueue()
+    {
+        bool enableBounds;
+        string? enableBoundsOnEventQueueIsDefined =
 #if NETFRAMEWORK
-            string enableBoundsOnEventQueueIsDefined = ConfigurationManager.AppSettings[TestPlatformDefaults.EnableBoundsOnLoggerEventQueue];
+            ConfigurationManager.AppSettings[TestPlatformDefaults.EnableBoundsOnLoggerEventQueue];
 #else
-            string enableBoundsOnEventQueueIsDefined = null;
+            null;
 #endif
-            if (string.IsNullOrEmpty(enableBoundsOnEventQueueIsDefined))
+        if (enableBoundsOnEventQueueIsDefined.IsNullOrEmpty())
+        {
+            enableBounds = TestPlatformDefaults.DefaultEnableBoundsOnLoggerEventQueue;
+        }
+        else
+        {
+            if (!(bool.TryParse(enableBoundsOnEventQueueIsDefined, out enableBounds)))
             {
                 enableBounds = TestPlatformDefaults.DefaultEnableBoundsOnLoggerEventQueue;
             }
-            else
-            {
-                if (!(bool.TryParse(enableBoundsOnEventQueueIsDefined, out enableBounds)))
-                {
-                    enableBounds = TestPlatformDefaults.DefaultEnableBoundsOnLoggerEventQueue;
-                }
-            }
-            return enableBounds;
         }
+        return enableBounds;
+    }
 
-        /// <summary>
-        /// Returns the approximate size of a TestResult instance.
-        /// </summary>
-        private static int FindTestResultSize(TestResultEventArgs args)
-        {
-            Debug.Assert(args != null && args.Result != null);
+    /// <summary>
+    /// Returns the approximate size of a TestResult instance.
+    /// </summary>
+    private static int FindTestResultSize(TestResultEventArgs args)
+    {
+        TPDebug.Assert(args != null && args.Result != null);
 
-            int size = 0;
+        int size = 0;
 
-            if (args.Result.Messages.Count != 0)
+        if (args.Result.Messages.Count != 0)
+        {
+            foreach (TestResultMessage msg in args.Result.Messages)
             {
-                foreach (TestResultMessage msg in args.Result.Messages)
-                {
-                    if (!string.IsNullOrEmpty(msg.Text))
-                        size += msg.Text.Length;
-                }
+                if (!msg.Text.IsNullOrEmpty())
+                    size += msg.Text.Length;
             }
-            return size;
         }
+        return size;
+    }
 
-        /// <summary>
-        /// Get the appsetting value for the parameter appSettingKey. Use the parameter defaultValue if
-        /// value is not there or is invalid.
-        /// </summary>
-        private int GetSetting(string appSettingKey, int defaultValue)
-        {
-            int value;
+    /// <summary>
+    /// Get the appsetting value for the parameter appSettingKey. Use the parameter defaultValue if
+    /// value is not there or is invalid.
+    /// </summary>
+    private static int GetSetting(string appSettingKey, int defaultValue)
+    {
+        int value;
+        string? appSettingValue =
 #if NETFRAMEWORK
-            string appSettingValue = ConfigurationManager.AppSettings[appSettingKey];
+            ConfigurationManager.AppSettings[appSettingKey];
 #else
-            string appSettingValue = null;
+            null;
 #endif
-            if (string.IsNullOrEmpty(appSettingValue))
-            {
-                value = defaultValue;
-            }
-            else if (!int.TryParse(appSettingValue, out value) || value < 1)
-            {
-                EqtTrace.Warning("Unacceptable value '{0}' of {1}. Using default {2}", appSettingValue, appSettingKey, defaultValue);
-                value = defaultValue;
-            }
-
-            return value;
+        if (appSettingValue.IsNullOrEmpty())
+        {
+            value = defaultValue;
+        }
+        else if (!int.TryParse(appSettingValue, out value) || value < 1)
+        {
+            EqtTrace.Warning("Unacceptable value '{0}' of {1}. Using default {2}", appSettingValue, appSettingKey, defaultValue);
+            value = defaultValue;
         }
 
-#endregion
+        return value;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/Logging/TestSessionMessageLogger.cs b/src/Microsoft.TestPlatform.Common/Logging/TestSessionMessageLogger.cs
index 558bfb6fa2..933db98cb3 100644
--- a/src/Microsoft.TestPlatform.Common/Logging/TestSessionMessageLogger.cs
+++ b/src/Microsoft.TestPlatform.Common/Logging/TestSessionMessageLogger.cs
@@ -1,84 +1,85 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Logging
-{
-    using System;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Logging;
 
-    using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+/// <summary>
+/// The test session message logger.
+/// </summary>
+internal class TestSessionMessageLogger : IMessageLogger
+{
+    private static TestSessionMessageLogger? s_instance;
 
     /// <summary>
-    /// The test session message logger.
+    /// Initializes a new instance of the <see cref="TestSessionMessageLogger"/> class.
     /// </summary>
-    internal class TestSessionMessageLogger : IMessageLogger
+    protected TestSessionMessageLogger()
     {
-        private static TestSessionMessageLogger instance;
+        TreatTestAdapterErrorsAsWarnings = Constants.DefaultTreatTestAdapterErrorsAsWarnings;
+    }
+
+    /// <summary>
+    /// Raised when a discovery message is received.
+    /// </summary>
+    internal event EventHandler<TestRunMessageEventArgs>? TestRunMessage;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSessionMessageLogger"/> class.
-        /// </summary>
-        protected TestSessionMessageLogger()
+    /// <summary>
+    /// Gets the instance of the singleton.
+    /// </summary>
+    [AllowNull]
+    public static TestSessionMessageLogger Instance
+    {
+        get
         {
-            this.TreatTestAdapterErrorsAsWarnings = Constants.DefaultTreatTestAdapterErrorsAsWarnings;
+            return s_instance ??= new TestSessionMessageLogger();
         }
+        set
+        {
+            s_instance = value;
+        }
+    }
 
-        /// <summary>
-        /// Raised when a discovery message is received.
-        /// </summary>
-        internal event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    /// <summary>
+    /// Gets or sets a value indicating whether to treat test adapter errors as warnings.
+    /// </summary>
+    internal bool TreatTestAdapterErrorsAsWarnings
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets the instance of the singleton.
-        /// </summary>
-        public static TestSessionMessageLogger Instance
+    /// <summary>
+    /// Sends a message to all listeners.
+    /// </summary>
+    /// <param name="testMessageLevel">Level of the message.</param>
+    /// <param name="message">The message to be sent.</param>
+    public void SendMessage(TestMessageLevel testMessageLevel, string message)
+    {
+        if (message.IsNullOrWhiteSpace())
         {
-            get
-            {
-                return instance ?? (instance = new TestSessionMessageLogger());
-            }
-            set
-            {
-                instance = value;
-            }
+            throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(message));
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to treat test adapter errors as warnings.
-        /// </summary>
-        internal bool TreatTestAdapterErrorsAsWarnings
+        if (TreatTestAdapterErrorsAsWarnings
+            && testMessageLevel == TestMessageLevel.Error)
         {
-            get;
-            set;
+            // Downgrade the message severity to Warning...
+            testMessageLevel = TestMessageLevel.Warning;
         }
 
-        /// <summary>
-        /// Sends a message to all listeners.
-        /// </summary>
-        /// <param name="testMessageLevel">Level of the message.</param>
-        /// <param name="message">The message to be sent.</param>
-        public void SendMessage(TestMessageLevel testMessageLevel, string message)
+        if (TestRunMessage != null)
         {
-            if (string.IsNullOrWhiteSpace(message))
-            {
-                throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(message));
-            }
-
-            if (this.TreatTestAdapterErrorsAsWarnings
-                    && testMessageLevel == TestMessageLevel.Error)
-            {
-                // Downgrade the message severity to Warning...
-                testMessageLevel = TestMessageLevel.Warning;
-            }
-
-            if (this.TestRunMessage != null)
-            {
-                var args = new TestRunMessageEventArgs(testMessageLevel, message);
-                this.TestRunMessage.SafeInvoke(this, args, "TestRunMessageLoggerProxy.SendMessage");
-            }
+            var args = new TestRunMessageEventArgs(testMessageLevel, message);
+            TestRunMessage.SafeInvoke(this, args, "TestRunMessageLoggerProxy.SendMessage");
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
index 23bcc4fad3..d117107a34 100644
--- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
+++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
@@ -1,26 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Common</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\scripts\build\ExternalAssemblyVersions.cs" Link="ExternalAssemblyVersions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
@@ -34,6 +25,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -49,6 +45,23 @@
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Common</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
 
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/src/Microsoft.TestPlatform.Common/NullableHelpers.cs b/src/Microsoft.TestPlatform.Common/NullableHelpers.cs
new file mode 100644
index 0000000000..51f6b5601b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Common/NullableHelpers.tt b/src/Microsoft.TestPlatform.Common/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Common/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Common/Properties/AssemblyInfo.cs
deleted file mode 100644
index d506352c25..0000000000
--- a/src/Microsoft.TestPlatform.Common/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Common")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1911f8d4-f357-4a4b-a554-7f91fd144bcc")]
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..b0f38dbb28
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,267 @@
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformConstants.DataCollectorEndsWithPattern = "Collector.dll" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformConstants.RunTimeEndsWithPattern = "RuntimeProvider.dll" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformConstants.TestAdapterEndsWithPattern = "TestAdapter.dll" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformConstants.TestLoggerEndsWithPattern = "TestLogger.dll" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.DefaultEnableBoundsOnLoggerEventQueue = true -> bool
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.DefaultMaxBytesLoggerEventQueueCanHold = 25000000 -> int
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.DefaultMaxNumberOfEventsLoggerEventQueueCanHold = 500 -> int
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.EnableBoundsOnLoggerEventQueue = "EnableBoundsOnLoggerEventQueue" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.MaxBytesLoggerEventQueueCanHold = "MaxBytesLoggerEventQueueCanHold" -> string!
+const Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults.MaxNumberOfEventsLoggerEventQueueCanHold = "MaxNumberOfEventsLoggerEventQueueCanHold" -> string!
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult.AfterTestRunEndResult(System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachmentSets, System.Collections.Generic.IDictionary<string!, object!>! metrics) -> void
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult.AfterTestRunEndResult(System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachmentSets, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>? invokedDataCollectors, System.Collections.Generic.IDictionary<string!, object!>! metrics) -> void
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult.AttachmentSets.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult.InvokedDataCollectors.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>?
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>!
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.BeforeTestRunStartResult
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.BeforeTestRunStartResult.BeforeTestRunStartResult(System.Collections.Generic.IDictionary<string!, string?>! environmentVariables, int dataCollectionEventsPort) -> void
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.BeforeTestRunStartResult.DataCollectionEventsPort.get -> int
+Microsoft.VisualStudio.TestPlatform.Common.DataCollection.BeforeTestRunStartResult.EnvironmentVariables.get -> System.Collections.Generic.IDictionary<string!, string?>!
+Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException
+Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException.InvalidLoggerException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Exceptions.InvalidLoggerException.InvalidLoggerException(string? message, System.Exception? innerException) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.DataCollectorMetadata(string! extension, string! friendlyName) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.DataCollectorMetadata(string! extension, string! friendlyName, bool hasAttachmentProcessor) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.ExtensionUri.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.DataCollectorMetadata.HasAttachmentProcessor.get -> bool
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata.ExtensionUri.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestLoggerMetadata.TestLoggerMetadata(string! extension, string! friendlyName) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.AddResolverSearchDirectories(string![]! directories) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.ClearExtensions() -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.DiscoverTestExtensions<TPluginInfo, TExtension>(string! endsWithPattern) -> System.Collections.Generic.Dictionary<string!, TPluginInfo!>?
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.GetExtensionPaths(string! endsWithPattern, bool skipDefaultExtensions = false) -> System.Collections.Generic.List<string!>!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.SetupAssemblyResolver(string? extensionAssembly) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.TestPluginCache() -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.UpdateExtensions(System.Collections.Generic.IEnumerable<string!>? additionalExtensionsPath, bool skipExtensionFilters) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.LazyExtension(Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation! pluginInfo, System.Type! metadataType) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.LazyExtension(Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation! pluginInfo, TMetadata metadata) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.LazyExtension(System.Func<TExtension>! creator, TMetadata metadata) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.LazyExtension(TExtension instance, TMetadata metadata) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.Metadata.get -> TMetadata
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<TExtension, TMetadata>.Value.get -> TExtension
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestExtensions
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestExtensions.TestExtensions() -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.AssemblyQualifiedName.get -> string?
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.FilePath.get -> string?
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.TestPluginInformation(System.Type? testExtensionType) -> void
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.VSExtensionManager
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.VSExtensionManager.GetUnitTestExtensions() -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.VSExtensionManager.VSExtensionManager() -> void
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.Evaluate(System.Func<string!, object?>! propertyValueProvider) -> bool
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.FilterExpressionWrapper(string! filterString) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.FilterExpressionWrapper(string! filterString, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions? options) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions?
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.FilterString.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.ParseError.get -> string?
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper.ValidForProperties(System.Collections.Generic.IEnumerable<string!>? supportedProperties, System.Func<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty?>? propertyProvider) -> string![]?
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.TestCaseFilterExpression
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.TestCaseFilterExpression.MatchTestCase(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase, System.Func<string!, object?>! propertyValueProvider) -> bool
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.TestCaseFilterExpression.TestCaseFilterExpression(Microsoft.VisualStudio.TestPlatform.Common.Filtering.FilterExpressionWrapper! filterWrapper) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.TestCaseFilterExpression.TestCaseFilterValue.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Filtering.TestCaseFilterExpression.ValidForProperties(System.Collections.Generic.IEnumerable<string!>? supportedProperties, System.Func<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty?>! propertyProvider) -> string![]?
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeMetadata
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeMetadata.ExtensionUri.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeMetadata.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeMetadata.TestRuntimeMetadata(string! extension, string! friendlyName) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.GetTestHostManagerByUri(string! hostUri) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider?
+Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.TestRuntimeProviderManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger! sessionLogger) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IAssemblyProperties
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IAssemblyProperties.GetAssemblyType(string! filePath) -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IBaseTestEventsRegistrar
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IBaseTestEventsRegistrar.LogWarning(string! message) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IDataCollectorCapabilities.HasAttachmentProcessor.get -> bool
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities.SettingsName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscovererCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscovererCapabilities.AssemblyType.get -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscovererCapabilities.DefaultExecutorUri.get -> System.Uri?
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscovererCapabilities.FileExtension.get -> System.Collections.Generic.IEnumerable<string!>?
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscoveryEventsRegistrar
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscoveryEventsRegistrar.RegisterDiscoveryEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest! discoveryRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscoveryEventsRegistrar.UnregisterDiscoveryEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest! discoveryRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestExtensionCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestExtensionCapabilities.ExtensionUri.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestLoggerCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestLoggerCapabilities.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRunEventsRegistrar
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRunEventsRegistrar.RegisterTestRunEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest! testRunRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRunEventsRegistrar.UnregisterTestRunEvents(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest! testRunRequest) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRuntimeCapabilities
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestRuntimeCapabilities.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IVSExtensionManager
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.IVSExtensionManager.GetUnitTestExtensions() -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.Common.RequestData
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.IsTelemetryOptedIn.get -> bool
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.IsTelemetryOptedIn.set -> void
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.MetricsCollection.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection!
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.MetricsCollection.set -> void
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.ProtocolConfig.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig?
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.ProtocolConfig.set -> void
+Microsoft.VisualStudio.TestPlatform.Common.RequestData.RequestData() -> void
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings.GetSettings(string? settingsName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider?
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings.InitializeSettingsProviders(string! settings) -> void
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings.LoadSettingsXml(string! settings) -> void
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings.RunSettings() -> void
+Microsoft.VisualStudio.TestPlatform.Common.RunSettings.SettingsXml.get -> string?
+Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager
+Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.SettingsProviderExtensionManager(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider!, Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities!>!>! settingsProviders, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider!, System.Collections.Generic.Dictionary<string!, object!>!>!>! unfilteredSettingsProviders, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger! logger) -> void
+Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.SettingsProvidersMap.get -> System.Collections.Generic.Dictionary<string!, Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider!, Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ISettingsProviderCapabilities!>!>!
+Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.UnfilteredSettingsProviders.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.LazyExtension<Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider!, System.Collections.Generic.Dictionary<string!, object!>!>!>!
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.MetricsCollection
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.MetricsCollection.Add(string! metric, object! value) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.MetricsCollection.Clear() -> void
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.MetricsCollection.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>!
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.MetricsCollection.MetricsCollection() -> void
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.NoOpMetricsCollection
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.NoOpMetricsCollection.Add(string! message, object! value) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.NoOpMetricsCollection.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>!
+Microsoft.VisualStudio.TestPlatform.Common.Telemetry.NoOpMetricsCollection.NoOpMetricsCollection() -> void
+Microsoft.VisualStudio.TestPlatform.Common.TestPlatformConstants
+Microsoft.VisualStudio.TestPlatform.Common.TestPlatformDefaults
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyProperties
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyProperties.AssemblyProperties() -> void
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyProperties.AssemblyProperties(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyProperties.GetAssemblyType(string! filePath) -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType.Managed = 2 -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType.Native = 1 -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType.None = 0 -> Microsoft.VisualStudio.TestPlatform.Common.Utilities.AssemblyType
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.CancellationTokenExtensions
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.ExceptionUtilities
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.ExceptionUtilities.ExceptionUtilities() -> void
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.FakesUtilities
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.InstallationContext
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.InstallationContext.GetVisualStudioCommonLocations(string! visualStudioDirectory) -> string![]!
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.InstallationContext.GetVisualStudioPath(string! visualStudioDirectory) -> string!
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.InstallationContext.InstallationContext(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.InstallationContext.TryGetVisualStudioDirectory(out string! visualStudioDirectory) -> bool
+Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.AreTestCaseLevelEventsRequired.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.AreTestCaseLevelEventsRequired.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.FilterOptions.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.FrequencyOfRunStatsChangeEvent.get -> long
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.FrequencyOfRunStatsChangeEvent.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.HasTestRun.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.HasTestRun.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.InIsolation.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.InIsolation.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.IsDataCollectionEnabled.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.IsDataCollectionEnabled.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.IsDebug.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.IsDebug.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.KeepAlive.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.KeepAlive.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.RunStatsChangeEventTimeout.get -> System.TimeSpan
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.RunStatsChangeEventTimeout.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestCaseFilter.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestCaseFilter.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestExecutionContext() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestExecutionContext(long frequencyOfRunStatsChangeEvent, System.TimeSpan runStatsChangeEventTimeout, bool inIsolation, bool keepAlive, bool isDataCollectionEnabled, bool areTestCaseLevelEventsRequired, bool hasTestRun, bool isDebug, string? testCaseFilter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions? filterOptions) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestRunConfiguration.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext.TestRunConfiguration.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus.FullyDiscovered = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus.NotDiscovered = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus.PartiallyDiscovered = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus.SkippedDiscovery = 3 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.DiscoveryStatus
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelOperationManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelOperationManager.UpdateParallelLevel(int parallelLevel) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelProxyDiscoveryManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelProxyDiscoveryManager.HandlePartialDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager! proxyDiscoveryManager, long totalTests, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk, bool isAborted) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelProxyDiscoveryManager.IsAbortRequested.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelProxyExecutionManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IParallelProxyExecutionManager.HandlePartialRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager! proxyExecutionManager, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.Close() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.Initialize(bool skipDefaultAdapters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.Cancel(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.Close() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.Initialize(bool skipDefaultAdapters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.IsInitialized.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.StartTestRun(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyTestSessionManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyTestSessionManager.StartSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyTestSessionManager.StopSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler.SendSessionEnd() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler.SendSessionStart(System.Collections.Generic.IDictionary<string!, object?>! properties) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler.SendTestCaseEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler.SendTestCaseStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler.SendTestResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult! result) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine.GetDiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine.GetExecutionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine.GetExtensionManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestExtensionManager!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine.GetLoggerManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestEngine.GetTestSessionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria! testSessionCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyTestSessionManager?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestExtensionManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestExtensionManager.ClearExtensions() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestExtensionManager.UseAdditionalExtensions(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, bool skipExtensionFilters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleDiscoveredTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleDiscoveryMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleDiscoveryStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleTestRunMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleTestRunStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.Initialize(string? runSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager.LoggersInitialized.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager.Initialize(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2? eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager.Cancel(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager.Initialize(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler? testMessageEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager.StartTestRun(System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>! adapterSourceMap, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler? testCaseEvents, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager.StartTestRun(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler? testCaseEvents, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.ITestHostManagerFactory
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.ITestHostManagerFactory.GetDiscoveryManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.ITestHostManagerFactory.GetExecutionManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager!
+static Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.Instance.get -> Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache!
+static Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.Instance.get -> Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager!
+static Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.Create() -> Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager!
+static Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.Destroy() -> void
+static Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider.SettingsProviderExtensionManager.LoadAndInitializeAllExtensions(bool shouldThrowOnError) -> void
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.CancellationTokenExtensions.ThrowTestPlatformExceptionIfCancellationRequested(this System.Threading.CancellationToken token) -> void
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.ExceptionUtilities.GetExceptionMessage(System.Exception? exception) -> string!
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.FakesUtilities.GenerateFakesSettingsForRunConfiguration(string![]! sources, string! runSettingsXml) -> string!
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.CreateAndInitializeRunSettings(string? settingsXml) -> Microsoft.VisualStudio.TestPlatform.Common.RunSettings?
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetMaxCpuCount(Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration? runConfiguration) -> int
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetMaxCpuCount(string? settingXml) -> int
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetSolutionDirectory(Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration? runConfiguration) -> string?
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetTargetFramework(Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration? runConfiguration) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework?
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetTestAdaptersPaths(string? runSettings) -> System.Collections.Generic.IEnumerable<string!>!
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetTestResultsDirectory(Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration? runConfiguration) -> string?
+static Microsoft.VisualStudio.TestPlatform.Common.Utilities.RunSettingsUtilities.GetTreatNoTestsAsError(string? runSettings) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.TestPluginCache.GetFilteredExtensions(System.Collections.Generic.List<string!>! extensions, string! endsWithPattern) -> System.Collections.Generic.IEnumerable<string!>!
+virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.IdentifierData.get -> string?
+virtual Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities.TestPluginInformation.Metadata.get -> System.Collections.Generic.ICollection<object?>!
+virtual Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager.GetTestHostManagerByRunConfiguration(string? runConfiguration, System.Collections.Generic.List<string!>? _) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager.InitializeDiscovery(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler, bool skipDefaultAdapters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager.InitializeTestRun(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..c95ceedda6
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Common.Interfaces.ITestDiscovererCapabilities.IsDirectoryBased.get -> bool
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Common/RequestData.cs b/src/Microsoft.TestPlatform.Common/RequestData.cs
index 128bc3fc5f..86f251f55f 100644
--- a/src/Microsoft.TestPlatform.Common/RequestData.cs
+++ b/src/Microsoft.TestPlatform.Common/RequestData.cs
@@ -1,58 +1,58 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common;
+
+/// <inheritdoc />
+/// <summary>
+/// Provide common services and data for a discovery/run request.
+/// </summary>
+public class RequestData : IRequestData
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// The metrics collection.
+    /// </summary>
+    private IMetricsCollection _metricsCollection;
 
-    /// <inheritdoc />
     /// <summary>
-    /// Provide common services and data for a discovery/run request.
+    /// The protocol config.
     /// </summary>
-    public class RequestData : IRequestData
+    private ProtocolConfig? _protocolConfig;
+
+    /// <summary>
+    /// The default constructor for request data.
+    /// </summary>
+    public RequestData()
     {
-        /// <summary>
-        /// The metrics collection.
-        /// </summary>
-        private IMetricsCollection metricsCollection;
-
-        /// <summary>
-        /// The protocol config.
-        /// </summary>
-        private ProtocolConfig protocolConfig;
-
-        /// <summary>
-        /// The default constructor for request data.
-        /// </summary>
-        public RequestData()
-        {
-            this.MetricsCollection = new NoOpMetricsCollection();
-            this.IsTelemetryOptedIn = false;
-        }
-
-        /// <summary>
-        /// Gets or sets the metrics collection.
-        /// </summary>
-        public IMetricsCollection MetricsCollection
-        {
-            get => this.metricsCollection;
-            set => this.metricsCollection = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        /// <summary>
-        /// Gets or sets the protocol config.
-        /// </summary>
-        public ProtocolConfig ProtocolConfig
-        {
-            get => this.protocolConfig;
-            set => this.protocolConfig = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether is telemetry opted in.
-        /// </summary>
-        public bool IsTelemetryOptedIn { get; set; }
+        _metricsCollection = new NoOpMetricsCollection();
+        IsTelemetryOptedIn = false;
     }
+
+    /// <summary>
+    /// Gets or sets the metrics collection.
+    /// </summary>
+    public IMetricsCollection MetricsCollection
+    {
+        get => _metricsCollection;
+        set => _metricsCollection = value ?? throw new ArgumentNullException(nameof(value));
+    }
+
+    /// <summary>
+    /// Gets or sets the protocol config.
+    /// </summary>
+    public ProtocolConfig? ProtocolConfig
+    {
+        get => _protocolConfig;
+        set => _protocolConfig = value ?? throw new ArgumentNullException(nameof(value));
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether is telemetry opted in.
+    /// </summary>
+    public bool IsTelemetryOptedIn { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs
index d79a66d5ea..a6d36bf761 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs
@@ -10,9 +10,8 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Common.Resources {
     using System;
-    using System.Reflection;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -20,7 +19,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -40,7 +39,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -331,6 +330,15 @@ internal static string RunSettingsParseError {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run..
+        /// </summary>
+        internal static string SerialTestRunInvalidScenario {
+            get {
+                return ResourceManager.GetString("SerialTestRunInvalidScenario", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Invalid settings node specified. The name property of the settings node must be non-empty..
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Common/Resources/Resources.resx b/src/Microsoft.TestPlatform.Common/Resources/Resources.resx
index a1dddd4bde..0828045206 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Common/Resources/Resources.resx
@@ -207,6 +207,9 @@
   <data name="RunSettingsParseError" xml:space="preserve">
     <value>An error occurred while loading the run settings.  Error: {0}</value>
   </data>
+  <data name="SerialTestRunInvalidScenario" xml:space="preserve">
+    <value>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</value>
+  </data>
   <data name="SettingsNodeInvalidName" xml:space="preserve">
     <value>Invalid settings node specified. The name property of the settings node must be non-empty.</value>
   </data>
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf
index 6e90ce0ce6..4b59416829 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Shromažďování dat: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Zpráva kolekce dat {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">Duplicitní identifikátor URI testu rozšíření {0}. Duplicitní rozšíření se ignoruje.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Duplicitní poskytovatel nastavení s názvem {0}. Duplicitní poskytovatel se ignoruje.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Našel se duplicitní oddíl nastavení běhu s názvem {0}. Duplicitní nastavení se ignoruje.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Chyba: Prázdné závorky ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Chyba: Neplatná podmínka {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Rozšíření testu má neplatný identifikátor URI {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Chyba: Neplatný operátor {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Během inicializace protokolovače s {0}: {1} došlo k výjimce. Protokolovač se nepoužije. Výjimka: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít protokolovač testu s kvalifikovaným názvem sestavení (AssemblyQualifiedName), identifikátorem URI (uri) nebo popisným názvem (FriendlyName) {0}.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Chyba: Chybí ).</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Chyba: Chybí (.</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Chyba: Chybí operand.</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Chybějící operátor | nebo &amp;</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Parametry spouštění jsou už načtené.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Při načítání parametrů spouštění se stala chyba. Chyba: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Zadal se neplatný uzel nastavení. Vlastnost name uzlu nastavení nesmí být prázdná.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Při inicializaci poskytovatele nastavení s názvem {0} se stala chyba. Chyba: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Poskytovatel nastavení s názvem {0} se nenašel.  Nastavení nešlo načíst.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Nesprávný formát pro TestCaseFilter {0}. Zadejte správný formát a zkuste to znovu. Poznámka: Nesprávný formát může vést k tomu, že se nespustí žádný test.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">Kolekce dat {0} neposkytla informace o inicializaci. Chyba: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">Kolekce dat {0} během načítání typu, konstrukce nebo inicializace vyvolala výjimku: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Nepovedlo se najít kolekci dat {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">Kolekce dat {0} si v prostředí provedení testu vyžádala nastavení proměnné prostředí {1} na hodnotu {2}, ale jiná kolekce dat {3} si už vyžádala stejnou proměnnou prostředí s rozdílnou hodnotou {4}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Existuje více konfigurací, které mají popisný název kolekce dat {0}. Duplicitní konfigurace se budou v testovacím běhu ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">Kolekce dat zachytila výjimku typu {0}: {1}. Další podrobnosti: {2}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Typy odvozené z kontextu shromažďování dat nelze použít pro posílání zpráv a dat. DataCollectionContext použitý pro posílání dat a zpráv musí pocházet z jedné z událostí vyvolaných na kolekci dat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Nepovedlo se najít seznam nainstalovaných rozšíření testu jednotek. Důvod: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Tato možnost funguje jenom se souborem vstest.console.exe nainstalovaným jako součást sady Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Při vytváření rychlého filtru došlo k chybě.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Operace se ruší na základě žádosti.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Nepovedlo se najít datacollector s popisným názvem {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Nepovedlo se načíst rozšíření ze souboru {0}. Další informace získáte pomocí parametru /diag.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu. Další informace najdete v chybové zprávě:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Vnitřní výjimka:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Trasování zásobníku:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Shromažďování dat: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Zpráva kolekce dat {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">Duplicitní identifikátor URI testu rozšíření {0}. Duplicitní rozšíření se ignoruje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Duplicitní poskytovatel nastavení s názvem {0}. Duplicitní poskytovatel se ignoruje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Našel se duplicitní oddíl nastavení běhu s názvem {0}. Duplicitní nastavení se ignoruje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Chyba: Prázdné závorky ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Chyba: Neplatná podmínka {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">Rozšíření testu má neplatný identifikátor URI {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Chyba: Neplatný operátor {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Během inicializace protokolovače s {0}: {1} došlo k výjimce. Protokolovač se nepoužije. Výjimka: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Nepovedlo se najít protokolovač testu s kvalifikovaným názvem sestavení (AssemblyQualifiedName), identifikátorem URI (uri) nebo popisným názvem (FriendlyName) {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Chyba: Chybí ).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Chyba: Chybí (.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Chyba: Chybí operand.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Chybějící operátor | nebo &amp;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Parametry spouštění jsou už načtené.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Při načítání parametrů spouštění se stala chyba. Chyba: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Zadal se neplatný uzel nastavení. Vlastnost name uzlu nastavení nesmí být prázdná.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Při inicializaci poskytovatele nastavení s názvem {0} se stala chyba. Chyba: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Poskytovatel nastavení s názvem {0} se nenašel.  Nastavení nešlo načíst.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Nesprávný formát pro TestCaseFilter {0}. Zadejte správný formát a zkuste to znovu. Poznámka: Nesprávný formát může vést k tomu, že se nespustí žádný test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">Kolekce dat {0} neposkytla informace o inicializaci. Chyba: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">Kolekce dat {0} během načítání typu, konstrukce nebo inicializace vyvolala výjimku: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Nepovedlo se najít kolekci dat {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">Kolekce dat {0} si v prostředí provedení testu vyžádala nastavení proměnné prostředí {1} na hodnotu {2}, ale jiná kolekce dat {3} si už vyžádala stejnou proměnnou prostředí s rozdílnou hodnotou {4}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Existuje více konfigurací, které mají popisný název kolekce dat {0}. Duplicitní konfigurace se budou v testovacím běhu ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">Kolekce dat zachytila výjimku typu {0}: {1}. Další podrobnosti: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Typy odvozené z kontextu shromažďování dat nelze použít pro posílání zpráv a dat. DataCollectionContext použitý pro posílání dat a zpráv musí pocházet z jedné z událostí vyvolaných na kolekci dat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Nepovedlo se najít seznam nainstalovaných rozšíření testu jednotek. Důvod: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Tato možnost funguje jenom se souborem vstest.console.exe nainstalovaným jako součást sady Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Při vytváření rychlého filtru došlo k chybě.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Operace se ruší na základě žádosti.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Nepovedlo se najít datacollector s popisným názvem {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Nepovedlo se načíst rozšíření ze souboru {0}. Další informace získáte pomocí parametru /diag.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu. Další informace najdete v chybové zprávě:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Vnitřní výjimka:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Trasování zásobníku:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; se pro testovací běh zdrojů nepodporuje.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf
index 4ad0e12965..3b0e0ee3a5 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Datensammlung: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Datensammler "{0}" – Meldung: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">Doppelter Testerweiterungs-URI "{0}". Die doppelte Erweiterung wird ignoriert.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Doppelter Einstellungsanbieter namens "{0}". Der doppelte Anbieter wird ignoriert.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Duplizierter Abschnitt mit Ausführungseinstellungen "{0}". Die Einstellungsduplikate werden ignoriert.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Fehler: Leere Klammern ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Fehler: Ungültige Bedingung "{0}".</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Die Testerweiterung weist einen ungültigen URI "{0}" auf: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Fehler: Ungültiger Operator "{0}".</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Ausnahme beim Initialisieren der Protokollierung mit "{0}": "{1}". Die Protokollierung wird nicht verwendet. Ausnahme: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Es wurde keine Testprotokollierung mit AssemblyQualifiedName, URI oder FriendlyName "{0}" gefunden.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Fehler: Fehlende Klammer ")"</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Fehler: Fehlende Klammer "("</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Fehler: Fehlender Operand.</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Operator "|" oder "&amp;" fehlt</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Die Laufzeiteinstellungen wurden bereits geladen.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Fehler beim Laden der Laufzeiteinstellungen. Fehler: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Es wurde ein ungültiger Einstellungsknoten angegebenen. Die Eigenschaft "name" eines Einstellungsknotens darf nicht leer sein.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Fehler beim Initialisieren des Einstellungsanbieters namens "{0}". Fehler: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Der Einstellungsanbieter namens "{0}" wurde nicht gefunden. Die Einstellungen können nicht geladen werden.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Ungültiges Format für TestCaseFilter {0}. Geben Sie das richtige Format an, und versuchen Sie es erneut. Beachten Sie, dass das falsche Format dazu führen kann, dass kein Test ausgeführt wird.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">Vom Datensammler "{0}" wurden keine Initialisierungsinformationen bereitgestellt. Fehler: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">Der Datensammler "{0}" hat beim Laden, bei der Konstruktion oder bei der Initialisierung des Typs eine Ausnahme ausgelöst: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Datensammler "{0}" wurde nicht gefunden</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">Der Datensammler "{0}" hat das Festlegen der Umgebungsvariablen "{1}" mit dem Wert "{2}" in der Testausführungsumgebung angefordert, ein anderer Datensammler "{3}" hat jedoch die gleiche Umgebungsvariable mit dem anderen Wert "{4}" angefordert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Es gibt mehrere Konfigurationen mit dem Datensammler-FriendlyName "{0}". Doppelte Konfigurationen werden beim Testlauf ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">Der Datensammler hat eine Ausnahme vom Typ "{0}" aufgefangen: "{1}". Weitere Informationen: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Typen, die vom Datensammlungskontext abgeleitet werden, können nicht zum Senden von Daten und Meldungen verwendet werden. Der DataCollectionContext für das Senden von Daten und Meldungen muss aus einem der Ereignisse stammen, die für den Datensammler ausgelöst wurden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Die Liste installierter Komponententesterweiterungen wurde nicht gefunden. Ursache: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Diese Option funktioniert nur, wenn "vstest.console.exe" als Teil von Visual Studio installiert wurde.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Fehler beim Erstellen eines Schnellfilters.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Der Vorgang wird gemäß Anforderung abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">datacollector mit dem Anzeigenamen "{0}" wurde nicht gefunden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Fehler beim Laden von Erweiterungen aus der Datei "{0}". Verwenden Sie "/diag", um weitere Informationen zu erhalten.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" von einem Ordner aus ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen. Weitere Informationen finden Sie in der Fehlermeldung:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Innere Ausnahme:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Stapelüberwachung:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Datensammlung: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Datensammler "{0}" – Meldung: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">Doppelter Testerweiterungs-URI "{0}". Die doppelte Erweiterung wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Doppelter Einstellungsanbieter namens "{0}". Der doppelte Anbieter wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Duplizierter Abschnitt mit Ausführungseinstellungen "{0}". Die Einstellungsduplikate werden ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Fehler: Leere Klammern ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Fehler: Ungültige Bedingung "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">Die Testerweiterung weist einen ungültigen URI "{0}" auf: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Fehler: Ungültiger Operator "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Ausnahme beim Initialisieren der Protokollierung mit "{0}": "{1}". Die Protokollierung wird nicht verwendet. Ausnahme: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Es wurde keine Testprotokollierung mit AssemblyQualifiedName, URI oder FriendlyName "{0}" gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Fehler: Fehlende Klammer ")"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Fehler: Fehlende Klammer "("</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Fehler: Fehlender Operand.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Operator "|" oder "&amp;" fehlt</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Die Laufzeiteinstellungen wurden bereits geladen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Fehler beim Laden der Laufzeiteinstellungen. Fehler: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Es wurde ein ungültiger Einstellungsknoten angegebenen. Die Eigenschaft "name" eines Einstellungsknotens darf nicht leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Fehler beim Initialisieren des Einstellungsanbieters namens "{0}". Fehler: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Der Einstellungsanbieter namens "{0}" wurde nicht gefunden. Die Einstellungen können nicht geladen werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Ungültiges Format für TestCaseFilter {0}. Geben Sie das richtige Format an, und versuchen Sie es erneut. Beachten Sie, dass das falsche Format dazu führen kann, dass kein Test ausgeführt wird.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">Vom Datensammler "{0}" wurden keine Initialisierungsinformationen bereitgestellt. Fehler: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">Der Datensammler "{0}" hat beim Laden, bei der Konstruktion oder bei der Initialisierung des Typs eine Ausnahme ausgelöst: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Datensammler "{0}" wurde nicht gefunden</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">Der Datensammler "{0}" hat das Festlegen der Umgebungsvariablen "{1}" mit dem Wert "{2}" in der Testausführungsumgebung angefordert, ein anderer Datensammler "{3}" hat jedoch die gleiche Umgebungsvariable mit dem anderen Wert "{4}" angefordert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Es gibt mehrere Konfigurationen mit dem Datensammler-FriendlyName "{0}". Doppelte Konfigurationen werden beim Testlauf ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">Der Datensammler hat eine Ausnahme vom Typ "{0}" aufgefangen: "{1}". Weitere Informationen: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Typen, die vom Datensammlungskontext abgeleitet werden, können nicht zum Senden von Daten und Meldungen verwendet werden. Der DataCollectionContext für das Senden von Daten und Meldungen muss aus einem der Ereignisse stammen, die für den Datensammler ausgelöst wurden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Die Liste installierter Komponententesterweiterungen wurde nicht gefunden. Ursache: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Diese Option funktioniert nur, wenn "vstest.console.exe" als Teil von Visual Studio installiert wurde.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Fehler beim Erstellen eines Schnellfilters.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Der Vorgang wird gemäß Anforderung abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">datacollector mit dem Anzeigenamen "{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Fehler beim Laden von Erweiterungen aus der Datei "{0}". Verwenden Sie "/diag", um weitere Informationen zu erhalten.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" von einem Ordner aus ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen. Weitere Informationen finden Sie in der Fehlermeldung:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Innere Ausnahme:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Stapelüberwachung:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;TRUE&lt;/ForceOneTestAtTimePerTestHost&gt; wird für den Testlauf der Quellen nicht unterstützt.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf
index 672a9bfa70..c9f07356ae 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Recopilación de datos: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Mensaje del recopilador de datos "{0}": {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">URI de extensión de pruebas duplicado ({0}). Se omitirá la extensión duplicada.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Proveedor de configuración duplicado con el nombre '{0}'. Se omitirá el proveedor duplicado.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Sección de parámetros de ejecución duplicada con el nombre "{0}". Se omitirán los parámetros duplicados.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Error: Paréntesis vacío ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Error: Condición '{0}' no válida</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">La extensión de pruebas tiene un URI no válido ({0}): {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Error: Operador no válido ({0})</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción al inicializar el registrador con {0}: "{1}". No se usará el registrador. Excepción: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">No se encuentra ningún registrador de pruebas con AssemblyQualifiedName, URI o FriendlyName "{0}".</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Error: Falta ')'</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Error: Falta '('</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Error: Falta un operando</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Falta el operador "|" o "&amp;"</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Los parámetros de ejecución ya se han cargado.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Error al cargar los parámetros de ejecución. Error: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Se especificó un nodo de configuración no válido. La propiedad de nombre del nodo de configuración no debe estar vacía.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Error al inicializar el proveedor de configuración '{0}'. Error: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">No se encuentra el proveedor de configuración '{0}'. No se puede cargar la configuración.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Formato incorrecto de TestCaseFilter {0}. Especifique el formato correcto y vuelva a intentarlo. Tenga en cuenta que un formato incorrecto puede dar lugar a que no se ejecute ninguna prueba.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">El recopilador de datos "{0}" no pudo proporcionar información de inicialización. Error: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">El recopilador de datos "{0}" produjo una excepción durante la carga, creación o inicialización del tipo: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">No se pudo encontrar el recopilador de datos "{0}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">El recopilador de datos "{0}" solicitó que la variable de entorno "{1}" con el valor "{2}" se estableciera en el entorno de ejecución de pruebas, pero otro recopilador de datos "{3}" ya ha solicitado la misma variable de entorno con otro valor "{4}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Hay varias configuraciones que tienen el nombre descriptivo del recopilador de datos "{0}". Se omitirán las configuraciones duplicadas en la serie de pruebas.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">El recopilador de datos detectó una excepción de tipo "{0}": "{1}". Más detalles: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Los tipos derivados del contexto de recolección de datos no se pueden usar para enviar datos y mensajes. El elemento DataCollectionContext usado para enviar datos y mensajes debe proceder de alguno de los eventos generados para el recolector de datos.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">No se pudo encontrar la lista de extensiones de prueba unitaria instaladas. Motivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Esta opción funciona solo con vstest.console.exe instalado como parte de Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Error al crear el filtro rápido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">La operación se cancelará como se ha solicitado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">No se encuentra ningún objeto datacollector con el nombre descriptivo "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">No se pudieron cargar las extensiones del archivo "{0}". Use /diag para obtener más información.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar el problema: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura. Para obtener más información, consulte el mensaje de error:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Excepción interna:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Seguimiento de la pila:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Recopilación de datos: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Mensaje del recopilador de datos "{0}": {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">URI de extensión de pruebas duplicado ({0}). Se omitirá la extensión duplicada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Proveedor de configuración duplicado con el nombre '{0}'. Se omitirá el proveedor duplicado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Sección de parámetros de ejecución duplicada con el nombre "{0}". Se omitirán los parámetros duplicados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Error: Paréntesis vacío ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Error: Condición '{0}' no válida</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">La extensión de pruebas tiene un URI no válido ({0}): {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Error: Operador no válido ({0})</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Se produjo una excepción al inicializar el registrador con {0}: "{1}". No se usará el registrador. Excepción: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">No se encuentra ningún registrador de pruebas con AssemblyQualifiedName, URI o FriendlyName "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Error: Falta ')'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Error: Falta '('</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Error: Falta un operando</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Falta el operador "|" o "&amp;"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Los parámetros de ejecución ya se han cargado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Error al cargar los parámetros de ejecución. Error: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Se especificó un nodo de configuración no válido. La propiedad de nombre del nodo de configuración no debe estar vacía.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Error al inicializar el proveedor de configuración '{0}'. Error: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">No se encuentra el proveedor de configuración '{0}'. No se puede cargar la configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Formato incorrecto de TestCaseFilter {0}. Especifique el formato correcto y vuelva a intentarlo. Tenga en cuenta que un formato incorrecto puede dar lugar a que no se ejecute ninguna prueba.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">El recopilador de datos "{0}" no pudo proporcionar información de inicialización. Error: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">El recopilador de datos "{0}" produjo una excepción durante la carga, creación o inicialización del tipo: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">No se pudo encontrar el recopilador de datos "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">El recopilador de datos "{0}" solicitó que la variable de entorno "{1}" con el valor "{2}" se estableciera en el entorno de ejecución de pruebas, pero otro recopilador de datos "{3}" ya ha solicitado la misma variable de entorno con otro valor "{4}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Hay varias configuraciones que tienen el nombre descriptivo del recopilador de datos "{0}". Se omitirán las configuraciones duplicadas en la serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">El recopilador de datos detectó una excepción de tipo "{0}": "{1}". Más detalles: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Los tipos derivados del contexto de recolección de datos no se pueden usar para enviar datos y mensajes. El elemento DataCollectionContext usado para enviar datos y mensajes debe proceder de alguno de los eventos generados para el recolector de datos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">No se pudo encontrar la lista de extensiones de prueba unitaria instaladas. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Esta opción funciona solo con vstest.console.exe instalado como parte de Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Error al crear el filtro rápido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">La operación se cancelará como se ha solicitado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">No se encuentra ningún objeto datacollector con el nombre descriptivo "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">No se pudieron cargar las extensiones del archivo "{0}". Use /diag para obtener más información.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar el problema: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura. Para obtener más información, consulte el mensaje de error:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Excepción interna:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Seguimiento de la pila:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; no se admite para la serie de pruebas de orígenes.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf
index 8c3a5097e2..11ba039130 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Collecte de données : {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Message du collecteur de données '{0}' : {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">L'URI d'extension de test '{0}' est dupliquée. L'extension dupliquée est ignorée.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Le fournisseur de paramètres nommé '{0}' est dupliqué. Le fournisseur dupliqué est ignoré.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">La section de paramètres d'exécution nommée '{0}' est dupliquée. Les paramètres dupliqués sont ignorés.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Erreur : parenthèses vides ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Erreur : condition non valide '{0}'</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">L'URI d'extension de test est non valide '{0}' : {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Erreur : opérateur non valide '{0}'</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Une exception s'est produite durant l'initialisation de l'enregistreur d'événements avec {0} : '{1}'. L'enregistreur d'événements ne sera pas utilisé. Exception : {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Impossible de localiser un enregistreur d'événements de test ayant pour AssemblyQualifiedName, URI ou FriendlyName '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Erreur : ')' manquante</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Erreur : '(' manquante</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Erreur : opérande manquant</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Opérateur manquant '|' ou '&amp;'</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Les paramètres d'exécution ont déjà été chargés.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Une erreur s'est produite durant le chargement des paramètres d'exécution. Erreur : {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Le nœud de paramètres spécifié est non valide. La propriété name du nœud de paramètres ne doit pas être vide.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Une erreur s'est produite durant l'initialisation du fournisseur de paramètres nommé '{0}'. Erreur : {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Le fournisseur de paramètres nommé '{0}' est introuvable. Impossible de charger les paramètres.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Format incorrect pour le TestCaseFilter {0}. Spécifiez le format approprié, puis réessayez. Notez que si le format est incorrect, aucun test n'est exécuté.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">Le collecteur de données '{0}' n'a pas pu fournir les informations d'initialisation. Erreur : {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">Le collecteur de données '{0}' a levé une exception pendant le chargement, la construction ou l'initialisation du type : {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Collecteur de données '{0}' introuvable</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">Le collecteur de données '{0}' exige que la variable d'environnement '{1}' avec la valeur '{2}' soit définie dans un environnement d'exécution de test, mais un autre collecteur de données '{3}' a déjà exigé la même variable d'environnement avec une autre valeur '{4}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Plusieurs configurations ont comme FriendlyName de collecteur de données '{0}'. Les configurations dupliquées seront ignorées dans la série de tests.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">Le collecteur de données a intercepté une exception de type '{0}' : '{1}'. Plus de détails : {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Impossible d'utiliser les types qui dérivent du contexte de collecte de données pour envoyer des données et des messages. La valeur DataCollectionContext utilisée pour envoyer des données et des messages doit provenir de l'un des événements déclenchés par le collecteur de données.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">La liste des extensions de test unitaire installées est introuvable. Raison : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Cette option fonctionne uniquement si vstest.console.exe est installé dans le cadre de Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Une erreur s'est produite durant la création du filtre rapide.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Annulation de l'opération, comme demandé.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Le datacollector ayant le nom convivial '{0}' est introuvable.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Le chargement des extensions à partir du fichier '{0}' a échoué. Pour plus d'informations, utilisez /diag.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture. Pour plus d'informations, consultez le message d'erreur :</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Exception interne :</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Arborescence des appels de procédure :</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Collecte de données : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Message du collecteur de données '{0}' : {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">L'URI d'extension de test '{0}' est dupliquée. L'extension dupliquée est ignorée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Le fournisseur de paramètres nommé '{0}' est dupliqué. Le fournisseur dupliqué est ignoré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">La section de paramètres d'exécution nommée '{0}' est dupliquée. Les paramètres dupliqués sont ignorés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Erreur : parenthèses vides ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Erreur : condition non valide '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">L'URI d'extension de test est non valide '{0}' : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Erreur : opérateur non valide '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Une exception s'est produite durant l'initialisation de l'enregistreur d'événements avec {0} : '{1}'. L'enregistreur d'événements ne sera pas utilisé. Exception : {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Impossible de localiser un enregistreur d'événements de test ayant pour AssemblyQualifiedName, URI ou FriendlyName '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Erreur : ')' manquante</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Erreur : '(' manquante</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Erreur : opérande manquant</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Opérateur manquant '|' ou '&amp;'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Les paramètres d'exécution ont déjà été chargés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Une erreur s'est produite durant le chargement des paramètres d'exécution. Erreur : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Le nœud de paramètres spécifié est non valide. La propriété name du nœud de paramètres ne doit pas être vide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Une erreur s'est produite durant l'initialisation du fournisseur de paramètres nommé '{0}'. Erreur : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Le fournisseur de paramètres nommé '{0}' est introuvable. Impossible de charger les paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Format incorrect pour le TestCaseFilter {0}. Spécifiez le format approprié, puis réessayez. Notez que si le format est incorrect, aucun test n'est exécuté.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">Le collecteur de données '{0}' n'a pas pu fournir les informations d'initialisation. Erreur : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">Le collecteur de données '{0}' a levé une exception pendant le chargement, la construction ou l'initialisation du type : {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Collecteur de données '{0}' introuvable</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">Le collecteur de données '{0}' exige que la variable d'environnement '{1}' avec la valeur '{2}' soit définie dans un environnement d'exécution de test, mais un autre collecteur de données '{3}' a déjà exigé la même variable d'environnement avec une autre valeur '{4}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Plusieurs configurations ont comme FriendlyName de collecteur de données '{0}'. Les configurations dupliquées seront ignorées dans la série de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">Le collecteur de données a intercepté une exception de type '{0}' : '{1}'. Plus de détails : {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Impossible d'utiliser les types qui dérivent du contexte de collecte de données pour envoyer des données et des messages. La valeur DataCollectionContext utilisée pour envoyer des données et des messages doit provenir de l'un des événements déclenchés par le collecteur de données.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">La liste des extensions de test unitaire installées est introuvable. Raison : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Cette option fonctionne uniquement si vstest.console.exe est installé dans le cadre de Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Une erreur s'est produite durant la création du filtre rapide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Annulation de l'opération, comme demandé.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Le datacollector ayant le nom convivial '{0}' est introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Le chargement des extensions à partir du fichier '{0}' a échoué. Pour plus d'informations, utilisez /diag.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture. Pour plus d'informations, consultez le message d'erreur :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Exception interne :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Arborescence des appels de procédure :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;&lt;/ForceOneTestAtTimePerTestHost&gt; true n’est pas prise en charge pour la série de tests sources.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf
index 6ca503bad2..6aa82f4ec1 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Raccolta dei dati: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Messaggio '{0}' dell'agente di raccolta dati: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">L'URI dell'estensione di test '{0}' è duplicato. L'estensione duplicata verrà ignorata.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Il provider di impostazioni denominato '{0}' è duplicato. Il provider duplicato verrà ignorato.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">La sezione delle impostazioni esecuzione test denominata '{0}' è duplicata. Le impostazioni duplicate verranno ignorate.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Errore: parentesi vuote ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Errore: condizione non valida '{0}'</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">L'URI '{0}' dell'estensione di test non è valido: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Errore: operatore non valido '{0}'</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione durante l'inizializzazione del logger con {0}: '{1}'. Il logger non verrà usato. Eccezione: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Non è stato trovato alcun logger di test con AssemblyQualifiedName, URI o FriendlyName '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Errore: manca ')'</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Errore: manca '('</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Errore: manca l'operando</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Manca l'operatore '|' o '&amp;'</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Le impostazioni esecuzione test sono già state caricate.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Errore durante il caricamento delle impostazioni esecuzione test. Errore: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Il nodo impostazioni specificato non è valido. La proprietà del nome del nodo impostazioni non deve essere vuota.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Si è verificato un errore durante l'inizializzazione del provider di impostazioni denominato '{0}'. Errore: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Il provider di impostazioni denominato '{0}' non è stato trovato. Non è possibile caricare le impostazioni.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Il formato per TestCaseFilter {0} non è corretto. Specificare il formato corretto e riprovare. Se il formato non è corretto, potrebbe non essere eseguito alcun test.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">L'agente di raccolta dati '{0}' non ha fornito le informazioni di inizializzazione. Errore: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">L'agente di raccolta dati '{0}' ha generato un'eccezione durante la costruzione, l'inizializzazione o il caricamento dei tipi: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">L'agente di raccolta dati '{0}' non è stato trovato</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">L'agente di raccolta dati '{0}' ha richiesto che la variabile di ambiente '{1}' con valore '{2}' fosse impostata nell'ambiente di esecuzione dei test, ma un altro agente di raccolta dati '{3}' ha già richiesto la stessa variabile di ambiente con un valore diverso '{4}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Sono presenti più configurazioni in cui il nome descrittivo dell'agente di raccolta dati è '{0}'. Le configurazioni duplicate verranno ignorate nell'esecuzione dei test.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">L'agente di raccolta dati ha rilevato un'eccezione di tipo '{0}': '{1}'. Altri dettagli: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Non è possibile usare i tipi che derivano da DataCollectionContext per inviare dati e messaggi. L'elemento DataCollectionContext usato per inviare dati e messaggi deve provenire da uno degli eventi generati per l'agente di raccolta dati.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">L'elenco delle estensioni degli unit test installate non è stato trovato. Motivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Questa opzione funziona solo se vstest.console.exe è installato con Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Si è verificato un errore durante la creazione del filtro Fast.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">L'operazione verrà annullata come richiesto.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Non è possibile trovare un oggetto datacollector con nome descrittivo '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Non è stato possibile caricare le estensioni dal file '{0}'. Per altre informazioni, usare /diag.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura. Per altre informazioni, vedere il messaggio di errore:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Eccezione interna:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Analisi dello stack:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Raccolta dei dati: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Messaggio '{0}' dell'agente di raccolta dati: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">L'URI dell'estensione di test '{0}' è duplicato. L'estensione duplicata verrà ignorata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Il provider di impostazioni denominato '{0}' è duplicato. Il provider duplicato verrà ignorato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">La sezione delle impostazioni esecuzione test denominata '{0}' è duplicata. Le impostazioni duplicate verranno ignorate.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Errore: parentesi vuote ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Errore: condizione non valida '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">L'URI '{0}' dell'estensione di test non è valido: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Errore: operatore non valido '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Si è verificata un'eccezione durante l'inizializzazione del logger con {0}: '{1}'. Il logger non verrà usato. Eccezione: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Non è stato trovato alcun logger di test con AssemblyQualifiedName, URI o FriendlyName '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Errore: manca ')'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Errore: manca '('</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Errore: manca l'operando</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Manca l'operatore '|' o '&amp;'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Le impostazioni esecuzione test sono già state caricate.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Errore durante il caricamento delle impostazioni esecuzione test. Errore: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Il nodo impostazioni specificato non è valido. La proprietà del nome del nodo impostazioni non deve essere vuota.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Si è verificato un errore durante l'inizializzazione del provider di impostazioni denominato '{0}'. Errore: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Il provider di impostazioni denominato '{0}' non è stato trovato. Non è possibile caricare le impostazioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Il formato per TestCaseFilter {0} non è corretto. Specificare il formato corretto e riprovare. Se il formato non è corretto, potrebbe non essere eseguito alcun test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">L'agente di raccolta dati '{0}' non ha fornito le informazioni di inizializzazione. Errore: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">L'agente di raccolta dati '{0}' ha generato un'eccezione durante la costruzione, l'inizializzazione o il caricamento dei tipi: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">L'agente di raccolta dati '{0}' non è stato trovato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">L'agente di raccolta dati '{0}' ha richiesto che la variabile di ambiente '{1}' con valore '{2}' fosse impostata nell'ambiente di esecuzione dei test, ma un altro agente di raccolta dati '{3}' ha già richiesto la stessa variabile di ambiente con un valore diverso '{4}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Sono presenti più configurazioni in cui il nome descrittivo dell'agente di raccolta dati è '{0}'. Le configurazioni duplicate verranno ignorate nell'esecuzione dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">L'agente di raccolta dati ha rilevato un'eccezione di tipo '{0}': '{1}'. Altri dettagli: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Non è possibile usare i tipi che derivano da DataCollectionContext per inviare dati e messaggi. L'elemento DataCollectionContext usato per inviare dati e messaggi deve provenire da uno degli eventi generati per l'agente di raccolta dati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">L'elenco delle estensioni degli unit test installate non è stato trovato. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Questa opzione funziona solo se vstest.console.exe è installato con Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Si è verificato un errore durante la creazione del filtro Fast.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">L'operazione verrà annullata come richiesto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Non è possibile trovare un oggetto datacollector con nome descrittivo '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Non è stato possibile caricare le estensioni dal file '{0}'. Per altre informazioni, usare /diag.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura. Per altre informazioni, vedere il messaggio di errore:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Eccezione interna:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Analisi dello stack:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; non è supportato per l'esecuzione dei test delle origini.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf
index 74c34de4c4..3a22f8ad08 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">データ コレクション : {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">データ コレクター '{0}' メッセージ: {1}。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">テスト拡張 URI '{0}' は重複しています。重複する拡張を無視しています。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">'{0}' という名前の設定プロバイダーが重複しています。重複するプロバイダーを無視しています。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">'{0}' という名前の重複した実行設定セクションが見つかりました。重複する設定を無視しています。</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">エラー: かっこ ( ) が空です</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">エラー: 条件 '{0}' が無効です</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">テスト拡張に無効な URI '{0}' があります: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">エラー: 演算子 '{0}' が無効です</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">{0}: '{1}' でのロガーの初期化中に例外が発生しました。ロガーは使用されません。例外: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">AssemblyQualifiedName、URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">エラー: ')' がありません</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">エラー: '(' がありません</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">エラー: オペランドがありません</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">演算子 '|' または '&amp;' がありません</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">実行設定は既に読み込まれています。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">実行設定の読み込み中にエラーが発生しました。エラー: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">無効な設定ノードが指定されました。設定ノードの名前プロパティを空白にしないようにしてください。</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' という名前の設定プロバイダーを初期化中にエラーが発生しました。エラー: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">'{0}' という名前の設定プロバイダーが見つかりませんでした。設定を読み込めません。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter {0} の形式が正しくありません。正しい形式を指定してもう一度お試しください。形式が正しくないと、テストが実行されないことがあります。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">データ コレクター '{0}' で初期化情報を表示できませんでした。エラー: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">データ コレクター '{0}' が型の読み込み、作成、または初期化中に例外をスローしました: {1}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">データ コレクター '{0}' が見つかりませんでした</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">データ コレクター '{0}' が値 '{2}' の環境変数 '{1}' をテスト実行時環境で設定するように要求しましたが、別のデータ コレクター '{3}' が既に別の値 '{4}' を持つ同じ環境変数を要求しています。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">データ コレクターの FriendlyName が '{0}' の構成が複数あります。テストの実行では、重複した構成は無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">データ コレクターが型 '{0}' の例外をキャッチしました: '{1}'。詳細: {2}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">データ コレクション コンテキストから派生する型をデータおよびメッセージの送信に使用することはできません。データおよびメッセージの送信に使用される DataCollectionContext は、データ コレクターに対して発生したイベントの 1 つからのものである必要があります。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">インストール済みの単体テスト拡張の一覧が見つかりませんでした。理由: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">このオプションは Visual Studio の一部として vstest.console.exe がインストールされている場合のみ使用できます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">高速フィルターを作成中にエラーが発生しました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">操作のキャンセルが要求されたため、キャンセルしています。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">フレンドリ名が '{0}' の datacollector が見つかりません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">ファイル '{0}' から拡張機能を読み込めませんでした。詳細な情報を得るには、/diag をご使用ください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み権限のあるフォルダーから vstest.console.exe を実行してください。詳細については、次のエラー メッセージをご覧ください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">内部例外:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">スタック トレース:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">データ コレクション : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">データ コレクター '{0}' メッセージ: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">テスト拡張 URI '{0}' は重複しています。重複する拡張を無視しています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">'{0}' という名前の設定プロバイダーが重複しています。重複するプロバイダーを無視しています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">'{0}' という名前の重複した実行設定セクションが見つかりました。重複する設定を無視しています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">エラー: かっこ ( ) が空です</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">エラー: 条件 '{0}' が無効です</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">テスト拡張に無効な URI '{0}' があります: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">エラー: 演算子 '{0}' が無効です</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">{0}: '{1}' でのロガーの初期化中に例外が発生しました。ロガーは使用されません。例外: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">AssemblyQualifiedName、URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">エラー: ')' がありません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">エラー: '(' がありません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">エラー: オペランドがありません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">演算子 '|' または '&amp;' がありません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">実行設定は既に読み込まれています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">実行設定の読み込み中にエラーが発生しました。エラー: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">無効な設定ノードが指定されました。設定ノードの名前プロパティを空白にしないようにしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">'{0}' という名前の設定プロバイダーを初期化中にエラーが発生しました。エラー: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">'{0}' という名前の設定プロバイダーが見つかりませんでした。設定を読み込めません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">TestCaseFilter {0} の形式が正しくありません。正しい形式を指定してもう一度お試しください。形式が正しくないと、テストが実行されないことがあります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">データ コレクター '{0}' で初期化情報を表示できませんでした。エラー: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">データ コレクター '{0}' が型の読み込み、作成、または初期化中に例外をスローしました: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">データ コレクター '{0}' が見つかりませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">データ コレクター '{0}' が値 '{2}' の環境変数 '{1}' をテスト実行時環境で設定するように要求しましたが、別のデータ コレクター '{3}' が既に別の値 '{4}' を持つ同じ環境変数を要求しています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">データ コレクターの FriendlyName が '{0}' の構成が複数あります。テストの実行では、重複した構成は無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">データ コレクターが型 '{0}' の例外をキャッチしました: '{1}'。詳細: {2}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">データ コレクション コンテキストから派生する型をデータおよびメッセージの送信に使用することはできません。データおよびメッセージの送信に使用される DataCollectionContext は、データ コレクターに対して発生したイベントの 1 つからのものである必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">インストール済みの単体テスト拡張の一覧が見つかりませんでした。理由: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">このオプションは Visual Studio の一部として vstest.console.exe がインストールされている場合のみ使用できます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">高速フィルターを作成中にエラーが発生しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">操作のキャンセルが要求されたため、キャンセルしています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">フレンドリ名が '{0}' の datacollector が見つかりません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">ファイル '{0}' から拡張機能を読み込めませんでした。詳細な情報を得るには、/diag をご使用ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み権限のあるフォルダーから vstest.console.exe を実行してください。詳細については、次のエラー メッセージをご覧ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">内部例外:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">スタック トレース:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; は、ソース テストの実行ではサポートされていません。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf
index 7e6a2db159..37175efc69 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">데이터 수집: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">데이터 수집기 '{0}' 메시지: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">테스트 확장 URI '{0}'이(가) 중복됩니다. 중복 확장을 무시합니다.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">설정 공급자 '{0}'이(가) 중복됩니다. 중복 공급자를 무시합니다.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">중복 실행 설정 섹션 '{0}'이(가) 있습니다. 중복 설정을 무시합니다.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">오류: 빈 괄호 ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">오류: 잘못된 조건 '{0}'</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">테스트 확장의 URI '{0}'이(가) 잘못되었습니다. {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">오류: 잘못된 연산자 '{0}'</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">{0}: '{1}'인 로거를 초기화하는 동안 예외가 발생했습니다. 로거가 사용되지 않습니다. 예외: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">AssemblyQualifiedName, URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">오류: ')' 누락</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">오류: '(' 누락</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">오류: 피연산자 누락</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">'|' 또는 '&amp;' 연산자 누락</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">실행 설정이 이미 로드되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">실행 설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">잘못된 설정 노드를 지정했습니다. 설정 노드의 이름 속성이 비어 있어서는 안 됩니다.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">설정 공급자 '{0}'을(를) 초기화하는 동안 오류가 발생했습니다. 오류: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">설정 공급자 '{0}'을(를) 찾을 수 없습니다. 설정을 로드할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter {0}의 형식이 잘못되었습니다. 올바른 형식을 지정하고 다시 시도하세요. 잘못된 형식을 사용하면 테스트가 실행되지 않을 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">데이터 수집기 '{0}'에서 초기화 정보를 제공하지 못했습니다. 오류: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">형식 로드, 생성 또는 초기화 중에 데이터 수집기 '{0}'에서 예외를 throw했습니다. {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">데이터 수집기 '{0}'을(를) 찾을 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">데이터 수집기 '{0}'에서 값이 '{2}'인 환경 변수 '{1}'을(를) 테스트 실행 환경에서 설정하도록 요청했는데, 다른 데이터 수집기 '{3}'이(가) 다른 값('{4}')을 포함하는 동일 환경 변수를 이미 요청했습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">데이터 수집기 FriendlyName이 '{0}'인 여러 개의 구성이 있습니다. 중복 구성은 테스트 실행에서 무시됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">데이터 수집기에서 '{0}': '{1}' 형식의 예외를 catch했습니다. 자세한 정보: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">데이터 컬렉션 컨텍스트에서 파생된 형식을 사용하여 데이터 및 메시지를 보낼 수 없습니다.  데이터 및 메시지를 보내는 데 사용되는 DataCollectionContext는 데이터에 대해 발생한 이벤트 중 하나에서 가져와야 합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">설치된 단위 테스트 확장 목록을 찾지 못했습니다. 이유: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">이 옵션은 Visual Studio의 일부로 설치된 vstest.console.exe에서만 실행됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">빠른 필터를 만드는 중 오류가 발생했습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">요청한 대로 작업을 취소하는 중입니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">이름이 '{0}'인 datacollector를 찾을 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">'{0}' 파일에서 확장을 로드하지 못했습니다. 자세한 내용을 보려면 /diag를 사용하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요. 자세한 내용은 다음 오류 메시지를 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">내부 예외:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">스택 추적:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">데이터 수집: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">데이터 수집기 '{0}' 메시지: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">테스트 확장 URI '{0}'이(가) 중복됩니다. 중복 확장을 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">설정 공급자 '{0}'이(가) 중복됩니다. 중복 공급자를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">중복 실행 설정 섹션 '{0}'이(가) 있습니다. 중복 설정을 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">오류: 빈 괄호 ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">오류: 잘못된 조건 '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">테스트 확장의 URI '{0}'이(가) 잘못되었습니다. {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">오류: 잘못된 연산자 '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">{0}: '{1}'인 로거를 초기화하는 동안 예외가 발생했습니다. 로거가 사용되지 않습니다. 예외: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">AssemblyQualifiedName, URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">오류: ')' 누락</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">오류: '(' 누락</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">오류: 피연산자 누락</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">'|' 또는 '&amp;' 연산자 누락</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">실행 설정이 이미 로드되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">실행 설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">잘못된 설정 노드를 지정했습니다. 설정 노드의 이름 속성이 비어 있어서는 안 됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">설정 공급자 '{0}'을(를) 초기화하는 동안 오류가 발생했습니다. 오류: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">설정 공급자 '{0}'을(를) 찾을 수 없습니다. 설정을 로드할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">TestCaseFilter {0}의 형식이 잘못되었습니다. 올바른 형식을 지정하고 다시 시도하세요. 잘못된 형식을 사용하면 테스트가 실행되지 않을 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">데이터 수집기 '{0}'에서 초기화 정보를 제공하지 못했습니다. 오류: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">형식 로드, 생성 또는 초기화 중에 데이터 수집기 '{0}'에서 예외를 throw했습니다. {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">데이터 수집기 '{0}'을(를) 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">데이터 수집기 '{0}'에서 값이 '{2}'인 환경 변수 '{1}'을(를) 테스트 실행 환경에서 설정하도록 요청했는데, 다른 데이터 수집기 '{3}'이(가) 다른 값('{4}')을 포함하는 동일 환경 변수를 이미 요청했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">데이터 수집기 FriendlyName이 '{0}'인 여러 개의 구성이 있습니다. 중복 구성은 테스트 실행에서 무시됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">데이터 수집기에서 '{0}': '{1}' 형식의 예외를 catch했습니다. 자세한 정보: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">데이터 컬렉션 컨텍스트에서 파생된 형식을 사용하여 데이터 및 메시지를 보낼 수 없습니다.  데이터 및 메시지를 보내는 데 사용되는 DataCollectionContext는 데이터에 대해 발생한 이벤트 중 하나에서 가져와야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">설치된 단위 테스트 확장 목록을 찾지 못했습니다. 이유: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">이 옵션은 Visual Studio의 일부로 설치된 vstest.console.exe에서만 실행됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">빠른 필터를 만드는 중 오류가 발생했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">요청한 대로 작업을 취소하는 중입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">이름이 '{0}'인 datacollector를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">'{0}' 파일에서 확장을 로드하지 못했습니다. 자세한 내용을 보려면 /diag를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요. 자세한 내용은 다음 오류 메시지를 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">내부 예외:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">스택 추적:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt;는 원본 테스트 실행에 대해 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf
index c1ba20ccc6..10c5a716e5 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Zbieranie danych: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Komunikat modułu zbierającego dane „{0}”: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">Zduplikowany identyfikator URI rozszerzenia testu „{0}”. Zduplikowane rozszerzenie zostanie zignorowane.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Zduplikowany dostawca ustawień o nazwie „{0}”. Zduplikowany dostawca zostanie zignorowany.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Znaleziono zduplikowaną sekcję parametrów uruchomieniowych o nazwie „{0}”. Zduplikowane ustawienia zostaną zignorowane.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Błąd: puste nawiasy ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Błąd: nieprawidłowy warunek „{0}”</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Rozszerzenie testu ma nieprawidłowy identyfikator URI „{0}”: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Błąd: nieprawidłowy operator „{0}”</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Wystąpił wyjątek podczas inicjowania rejestratora o identyfikatorze {0}: „{1}”. Rejestrator nie będzie używany. Wyjątek: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć rejestratora testów z atrybutem AssemblyQualifiedName, identyfikatorem URI lub przyjazną nazwą „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Błąd: brak znaku „)”</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Błąd: brak znaku „(”</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Błąd: brak argumentu operacji</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Brak operatora „|” lub „&amp;”</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Parametry uruchomieniowe zostały już załadowane.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Wystąpił błąd podczas ładowania parametrów uruchomieniowych. Błąd: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Określono nieprawidłowy węzeł ustawień. Właściwość name węzła ustawień nie może być pusta.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Wystąpił błąd podczas inicjowania dostawcy ustawień o nazwie „{0}”. Błąd: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Nie znaleziono dostawcy ustawień o nazwie „{0}”. Nie można załadować ustawień.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Niepoprawny format elementu TestCaseFilter {0}. Określ poprawny format i spróbuj ponownie. Należy pamiętać, że niepoprawny format może spowodować, że żadne testy nie zostaną wykonane.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">Dostarczenie informacji o inicjowaniu przez moduł zbierający dane „{0}” nie powiodło się. Błąd: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">Moduł zbierający dane „{0}” zgłosił wyjątek w trakcie ładowania, konstruowania lub inicjowania typu: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Nie można znaleźć modułu zbierającego dane „{0}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">Moduł zbierający dane „{0}” zażądał ustawienia zmiennej środowiskowej „{1}” o wartości „{2}” w środowisku wykonywania testu, ale inny moduł zbierający dane „{3}” już zażądał ustawienia tej zmiennej środowiskowej na wartość „{4}”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Istnieje wiele konfiguracji, które zawierają przyjazną nazwę modułu zbierającego dane „{0}”. Zduplikowane konfiguracje będą ignorowane w przebiegu testu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">Moduł zbierający dane przechwycił wyjątek typu „{0}”: „{1}”. Więcej szczegółów: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Typy pochodzące od kontekstu kolekcji danych nie mogą być używane do wysyłania danych i komunikatów. Element DataCollectionContext służący do wysyłania danych i komunikatów musi pochodzić z jednego ze zdarzeń wywołanych dla modułu zbierającego dane.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Nie można znaleźć listy zainstalowanych rozszerzeń testów jednostkowych. Przyczyna: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Ta opcja działa wyłącznie z elementem vstest.console.exe zainstalowanym jako część programu Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Wystąpił błąd podczas tworzenia szybkiego filtru.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Anulowanie operacji zgodnie z żądaniem.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Nie można znaleźć elementu datacollector o przyjaznej nazwie „{0}”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Nie można załadować rozszerzeń z pliku „{0}”. Aby uzyskać więcej informacji, użyj opcji /diag.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu. Więcej informacji można znaleźć w komunikacie o błędzie:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Wewnętrzny wyjątek:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Ślad stosu:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Zbieranie danych: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Komunikat modułu zbierającego dane „{0}”: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">Zduplikowany identyfikator URI rozszerzenia testu „{0}”. Zduplikowane rozszerzenie zostanie zignorowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Zduplikowany dostawca ustawień o nazwie „{0}”. Zduplikowany dostawca zostanie zignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Znaleziono zduplikowaną sekcję parametrów uruchomieniowych o nazwie „{0}”. Zduplikowane ustawienia zostaną zignorowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Błąd: puste nawiasy ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Błąd: nieprawidłowy warunek „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">Rozszerzenie testu ma nieprawidłowy identyfikator URI „{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Błąd: nieprawidłowy operator „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Wystąpił wyjątek podczas inicjowania rejestratora o identyfikatorze {0}: „{1}”. Rejestrator nie będzie używany. Wyjątek: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Nie można odnaleźć rejestratora testów z atrybutem AssemblyQualifiedName, identyfikatorem URI lub przyjazną nazwą „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Błąd: brak znaku „)”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Błąd: brak znaku „(”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Błąd: brak argumentu operacji</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Brak operatora „|” lub „&amp;”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Parametry uruchomieniowe zostały już załadowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Wystąpił błąd podczas ładowania parametrów uruchomieniowych. Błąd: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Określono nieprawidłowy węzeł ustawień. Właściwość name węzła ustawień nie może być pusta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Wystąpił błąd podczas inicjowania dostawcy ustawień o nazwie „{0}”. Błąd: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Nie znaleziono dostawcy ustawień o nazwie „{0}”. Nie można załadować ustawień.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Niepoprawny format elementu TestCaseFilter {0}. Określ poprawny format i spróbuj ponownie. Należy pamiętać, że niepoprawny format może spowodować, że żadne testy nie zostaną wykonane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">Dostarczenie informacji o inicjowaniu przez moduł zbierający dane „{0}” nie powiodło się. Błąd: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">Moduł zbierający dane „{0}” zgłosił wyjątek w trakcie ładowania, konstruowania lub inicjowania typu: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Nie można znaleźć modułu zbierającego dane „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">Moduł zbierający dane „{0}” zażądał ustawienia zmiennej środowiskowej „{1}” o wartości „{2}” w środowisku wykonywania testu, ale inny moduł zbierający dane „{3}” już zażądał ustawienia tej zmiennej środowiskowej na wartość „{4}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Istnieje wiele konfiguracji, które zawierają przyjazną nazwę modułu zbierającego dane „{0}”. Zduplikowane konfiguracje będą ignorowane w przebiegu testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">Moduł zbierający dane przechwycił wyjątek typu „{0}”: „{1}”. Więcej szczegółów: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Typy pochodzące od kontekstu kolekcji danych nie mogą być używane do wysyłania danych i komunikatów. Element DataCollectionContext służący do wysyłania danych i komunikatów musi pochodzić z jednego ze zdarzeń wywołanych dla modułu zbierającego dane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Nie można znaleźć listy zainstalowanych rozszerzeń testów jednostkowych. Przyczyna: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Ta opcja działa wyłącznie z elementem vstest.console.exe zainstalowanym jako część programu Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Wystąpił błąd podczas tworzenia szybkiego filtru.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Anulowanie operacji zgodnie z żądaniem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Nie można znaleźć elementu datacollector o przyjaznej nazwie „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Nie można załadować rozszerzeń z pliku „{0}”. Aby uzyskać więcej informacji, użyj opcji /diag.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu. Więcej informacji można znaleźć w komunikacie o błędzie:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Wewnętrzny wyjątek:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Ślad stosu:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; nie jest obsługiwana w przypadku przebiegu testu źródeł.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf
index 48c5126257..5a543755e2 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Coleção de dados: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Coletor de dados '{0}' mensagem: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">URI da extensão do teste '{0}' duplicada. Ignorando a extensão duplicada.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Provedor de configurações denominado '{0}' duplicado. Ignorando o provedor duplicado.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Foi encontrada uma seção de configurações de execução denominada '{0}' duplicada. Ignorando as configurações duplicadas.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Erro: parênteses vazios ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Erro: condição inválida '{0}'</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">A Extensão do Teste tem um URI inválido '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Erro: operador inválido '{0}'</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção durante a inicialização do agente com {0}: ‘{1}’. O agente não será usado. Exceção: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Não foi possível localizar um agente de teste com o AssemblyQualifiedName, o URI ou o FriendlyName '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Erro: ')' ausente</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Erro: '(' ausente</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Erro: operando ausente</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Faltando operador '|' ou '&amp;'</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">As Configurações de Execução já foram carregadas.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Ocorreu um erro ao carregar as configurações de execução. Erro: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Nó de configurações inválido especificado. A propriedade de nome do nó de configurações não deve estar vazia.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">Ocorreu um erro ao inicializar o provedor de configurações denominado '{0}'. Erro: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">O Provedor de Configurações denominado '{0}' não foi encontrado. Não é possível carregar as configurações.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Formato incorreto para TestCaseFilter {0}. Especifique o formato correto e tente novamente. Observe que o formato incorreto pode fazer com que nenhum teste seja executado.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">O coletor de dados '{0}' falhou ao fornecer informações de inicialização. Erro: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">O coletor de dados '{0}' lançou uma exceção durante a inicialização, construção ou carregamento de tipo: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Não foi possível encontrar o coletor de dados '{0}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">O coletor de dados '{0}' solicitou a variável de ambiente '{1}' com valor '{2}' para ser definida no ambiente de execução de teste, mas outro coletor de dados '{3}' já solicitou a mesma variável de ambiente com um valor diferente '{4}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Existem várias configurações que têm o FriendlyName do coletor de dados como '{0}'. Configurações duplicadas serão ignoradas na execução de teste.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">O coletor de dados capturou uma exceção do tipo '{0}': '{1}'. Mais detalhes: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Tipos derivados de DataCollectionContext não podem ser usados para enviar dados e mensagens. Os DataCollectionContext usado para enviar dados e mensagens devem vir de um dos eventos adicionados ao coletor de dados.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Falha ao encontrar a lista de extensões de teste de unidade. Motivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Essa opção funciona somente com vstest.console.exe instalado como parte do Visual Studio.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Ocorreu um erro ao criar o filtro Rápido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Cancelando a operação conforme solicitado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Não é possível localizar um datacollector com o nome amigável '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Falha ao carregar as extensões do arquivo '{0}'. Use /diag para obter mais informações.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação. Para obter mais informações, verifique a mensagem de erro:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Exceção interna:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Rastreamento de pilha:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Coleção de dados: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Coletor de dados '{0}' mensagem: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">URI da extensão do teste '{0}' duplicada. Ignorando a extensão duplicada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Provedor de configurações denominado '{0}' duplicado. Ignorando o provedor duplicado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Foi encontrada uma seção de configurações de execução denominada '{0}' duplicada. Ignorando as configurações duplicadas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Erro: parênteses vazios ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Erro: condição inválida '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">A Extensão do Teste tem um URI inválido '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Erro: operador inválido '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Ocorreu uma exceção durante a inicialização do agente com {0}: ‘{1}’. O agente não será usado. Exceção: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Não foi possível localizar um agente de teste com o AssemblyQualifiedName, o URI ou o FriendlyName '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Erro: ')' ausente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Erro: '(' ausente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Erro: operando ausente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Faltando operador '|' ou '&amp;'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">As Configurações de Execução já foram carregadas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Ocorreu um erro ao carregar as configurações de execução. Erro: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Nó de configurações inválido especificado. A propriedade de nome do nó de configurações não deve estar vazia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">Ocorreu um erro ao inicializar o provedor de configurações denominado '{0}'. Erro: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">O Provedor de Configurações denominado '{0}' não foi encontrado. Não é possível carregar as configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Formato incorreto para TestCaseFilter {0}. Especifique o formato correto e tente novamente. Observe que o formato incorreto pode fazer com que nenhum teste seja executado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">O coletor de dados '{0}' falhou ao fornecer informações de inicialização. Erro: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">O coletor de dados '{0}' lançou uma exceção durante a inicialização, construção ou carregamento de tipo: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Não foi possível encontrar o coletor de dados '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">O coletor de dados '{0}' solicitou a variável de ambiente '{1}' com valor '{2}' para ser definida no ambiente de execução de teste, mas outro coletor de dados '{3}' já solicitou a mesma variável de ambiente com um valor diferente '{4}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Existem várias configurações que têm o FriendlyName do coletor de dados como '{0}'. Configurações duplicadas serão ignoradas na execução de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">O coletor de dados capturou uma exceção do tipo '{0}': '{1}'. Mais detalhes: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Tipos derivados de DataCollectionContext não podem ser usados para enviar dados e mensagens. Os DataCollectionContext usado para enviar dados e mensagens devem vir de um dos eventos adicionados ao coletor de dados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Falha ao encontrar a lista de extensões de teste de unidade. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Essa opção funciona somente com vstest.console.exe instalado como parte do Visual Studio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Ocorreu um erro ao criar o filtro Rápido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Cancelando a operação conforme solicitado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Não é possível localizar um datacollector com o nome amigável '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Falha ao carregar as extensões do arquivo '{0}'. Use /diag para obter mais informações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação. Para obter mais informações, verifique a mensagem de erro:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Exceção interna:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Rastreamento de pilha:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;verdadeiro&lt;/ForceOneTestAtTimePerTestHost&gt; não tem suporte para execução de teste de fontes.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf
index c8732c97b2..f569087653 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Сбор данных: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">Сообщение сборщика данных "{0}": {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">Повторяющийся URI расширения теста "{0}". Повторяющееся расширение пропускается.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">Повторяющийся поставщик параметров с именем "{0}". Повторяющийся поставщик пропускается.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">Обнаружен повторяющийся раздел параметров запуска с именем "{0}". Повторяющиеся параметры пропускаются.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Ошибка: пустые круглые скобки ()</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Ошибка: недопустимое условие "{0}"</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Расширение теста имеет недопустимый URI "{0}": {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Ошибка: недопустимый оператор "{0}"</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Возникло исключение при инициализации средства ведения журнала с {0}: "{1}". Средство ведения журнала не будет использоваться. Исключение: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Не удалось найти средство ведения журнала тестирования с AssemblyQualifiedName, URI или FriendlyName "{0}".</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Ошибка: отсутствует ")"</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Ошибка: отсутствует "("</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Ошибка: отсутствует операнд</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">Отсутствует оператор "|" или "&amp;"</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Параметры запуска уже загружены.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Произошла ошибка при загрузке параметров запуска. Ошибка: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Указан недопустимый узел параметров. Узел параметров должен иметь допустимое значение для свойства имени.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">При инициализации поставщика параметров с именем "{0}" произошла ошибка. Ошибка: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">Поставщик параметров с именем "{0}" не найден. Невозможно загрузить параметры.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">Неверный формат фильтра TestCaseFilter {0}. Задайте правильный формат и повторите попытку. Обратите внимание, что использование неверного формата может привести к тому, что ни один из тестов не будет выполнен.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">Сборщик данных "{0}" не предоставил сведения для инициализации. Ошибка: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">В сборщике данных "{0}" возникло исключение во время загрузки типа, создания или инициализации: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">Не удалось найти сборщик данных "{0}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">Сборщик данных "{0}" запросил, чтобы в окружении выполнения тестов была установлена переменная окружения "{1}" со значением "{2}", но другой сборщик данных "{3}" уже запросил эту переменную окружения со значением "{4}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Существует несколько конфигураций со значением "{0}" для FriendlyName сборщика данных. Повторяющиеся конфигурации будут пропущены в тестовом запуске.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">В сборщике данных возникло исключение типа "{0}": "{1}". Дополнительные сведения: {2}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Нельзя использовать типы, производные от контекста сбора данных, для отправки данных и сообщений.  Используемый для отправки данных и сообщений DataCollectionContext должен происходить от одного из событий, возникших для сборщика данных.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Не удалось найти список установленных расширений модульных тестов. Причина: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Этот параметр работает, только если в рамках Visual Studio установлена служебная программа vstest.console.exe.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">При создании быстрого фильтра произошла ошибка.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">Операция отменяется в соответствии с запросом.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">Не удается найти datacollector с понятным именем "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Не удалось загрузить расширения из файла "{0}". Для получения дополнительных сведений используйте /diag.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись. Дополнительные сведения см. в сообщении об ошибке:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Внутреннее исключение:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Трассировка стека:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Сбор данных: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">Сообщение сборщика данных "{0}": {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">Повторяющийся URI расширения теста "{0}". Повторяющееся расширение пропускается.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">Повторяющийся поставщик параметров с именем "{0}". Повторяющийся поставщик пропускается.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">Обнаружен повторяющийся раздел параметров запуска с именем "{0}". Повторяющиеся параметры пропускаются.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Ошибка: пустые круглые скобки ()</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Ошибка: недопустимое условие "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">Расширение теста имеет недопустимый URI "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Ошибка: недопустимый оператор "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Возникло исключение при инициализации средства ведения журнала с {0}: "{1}". Средство ведения журнала не будет использоваться. Исключение: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">Не удалось найти средство ведения журнала тестирования с AssemblyQualifiedName, URI или FriendlyName "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Ошибка: отсутствует ")"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Ошибка: отсутствует "("</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Ошибка: отсутствует операнд</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">Отсутствует оператор "|" или "&amp;"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Параметры запуска уже загружены.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Произошла ошибка при загрузке параметров запуска. Ошибка: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Указан недопустимый узел параметров. Узел параметров должен иметь допустимое значение для свойства имени.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">При инициализации поставщика параметров с именем "{0}" произошла ошибка. Ошибка: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">Поставщик параметров с именем "{0}" не найден. Невозможно загрузить параметры.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">Неверный формат фильтра TestCaseFilter {0}. Задайте правильный формат и повторите попытку. Обратите внимание, что использование неверного формата может привести к тому, что ни один из тестов не будет выполнен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">Сборщик данных "{0}" не предоставил сведения для инициализации. Ошибка: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">В сборщике данных "{0}" возникло исключение во время загрузки типа, создания или инициализации: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">Не удалось найти сборщик данных "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">Сборщик данных "{0}" запросил, чтобы в окружении выполнения тестов была установлена переменная окружения "{1}" со значением "{2}", но другой сборщик данных "{3}" уже запросил эту переменную окружения со значением "{4}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Существует несколько конфигураций со значением "{0}" для FriendlyName сборщика данных. Повторяющиеся конфигурации будут пропущены в тестовом запуске.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">В сборщике данных возникло исключение типа "{0}": "{1}". Дополнительные сведения: {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Нельзя использовать типы, производные от контекста сбора данных, для отправки данных и сообщений.  Используемый для отправки данных и сообщений DataCollectionContext должен происходить от одного из событий, возникших для сборщика данных.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Не удалось найти список установленных расширений модульных тестов. Причина: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Этот параметр работает, только если в рамках Visual Studio установлена служебная программа vstest.console.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">При создании быстрого фильтра произошла ошибка.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">Операция отменяется в соответствии с запросом.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">Не удается найти datacollector с понятным именем "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Не удалось загрузить расширения из файла "{0}". Для получения дополнительных сведений используйте /diag.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись. Дополнительные сведения см. в сообщении об ошибке:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Внутреннее исключение:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Трассировка стека:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; не поддерживается для тестового запуска источников.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf
index a030305684..6dba89fbd3 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">Veri toplama: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">'{0}' veri toplayıcısı iletisi: {1}.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">Yinelenen test uzantısı URI’si '{0}'. Yinelenen uzantı yoksayılıyor.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">'{0}' adlı yinelenen ayar sağlayıcısı. Yinelenen sağlayıcı yoksayılıyor.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">'{0}' adlı yinelenen çalıştırma ayarları bölümü bulundu. Yinelenen ayarlar yoksayılıyor.</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">Hata: Boş ayraç ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">Hata: Geçersiz Koşul '{0}'</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Test Uzantısı geçersiz bir '{0}' URI’sine sahip: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">Hata: Geçersiz işleç '{0}'</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">Günlükçü, '{0}' ile başlatılırken özel durum oluştu: '{1}'.  Günlükçü kullanılmayacak. Özel durum: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">AssemblyQualifiedName, URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">Hata: ')' eksik</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">Hata: '(' eksik</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">Hata: İşlenen eksik</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">'|' veya '&amp;' işleci eksik</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">Çalıştırma Ayarları zaten yüklendi.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">Çalıştırma ayarları yüklenirken bir hata oluştu. Hata: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">Belirtilen ayar düğümü geçersiz. Ayar düğümünün ad özelliği boş olmamalıdır.</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' adlı ayar sağlayıcısı başlatılırken bir hata oluştu. Hata: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">'{0}' adlı Ayar Sağlayıcısı bulunamadı. Ayarlar yüklenemiyor.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter {0} için yanlış biçim. Doğru biçimi belirtin ve yeniden deneyin. Yanlış biçim hiçbir testin yürütülmemesine neden olabilir.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">'{0}' veri toplayıcısı başlatma bilgilerini sağlayamadı. Hata: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">'{0}' veri toplayıcısı tür yükleme, oluşturma veya başlatma sırasında bir özel durum oluşturdu: {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">'{0}' veri toplayıcısı bulunamadı</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">'{0}' veri toplayıcısı, test yürütme ortamında değeri '{2}' olan '{1}' ortam değişkeninin ayarlanması için istekte bulundu, ancak başka bir veri toplayıcısı ('{3}') zaten farklı bir değerle ('{4}') aynı ortam değişkeni için istekte bulunmuştu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">Veri toplayıcısı FriendlyName değeri '{0}' olan birden çok yapılandırma var. Yinelenen yapılandırmalar test çalıştırmasında yoksayılacak.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">Veri toplayıcısı '{0}' türünde bir özel durum yakaladı: '{1}'. Diğer ayrıntılar:'{2}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">Veri koleksiyonu bağlamından türetilen türler, veri ve ileti göndermek için kullanılamaz. Veri ve ileti göndermek için kullanılan DataCollectionContext veri toplayıcısı yükseltilmiş olayların birinden gelmelidir.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">Yüklenen birim testi uzantılarının listesi bulunamadı. Neden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">Bu seçenek yalnızca Visual Studio’nun bir parçası olarak yüklenen vstest.console.exe ile birlikte çalışır.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">Hızlı filtre oluşturulurken bir hata oluştu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">İşlem istek üzerine iptal ediliyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">'{0}' kolay adına sahip bir datacollector bulunamadı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">Uzantılar '{0}' dosyasından yüklenemedi. Daha fazla bilgi için lütfen /diag kullanın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için: Lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın. Daha fazla bilgi için lütfen hata iletisine bakın:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">Özel iç durum:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">Yığın izleme:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">Veri toplama: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">'{0}' veri toplayıcısı iletisi: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">Yinelenen test uzantısı URI’si '{0}'. Yinelenen uzantı yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">'{0}' adlı yinelenen ayar sağlayıcısı. Yinelenen sağlayıcı yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">'{0}' adlı yinelenen çalıştırma ayarları bölümü bulundu. Yinelenen ayarlar yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">Hata: Boş ayraç ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">Hata: Geçersiz Koşul '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">Test Uzantısı geçersiz bir '{0}' URI’sine sahip: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">Hata: Geçersiz işleç '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">Günlükçü, '{0}' ile başlatılırken özel durum oluştu: '{1}'.  Günlükçü kullanılmayacak. Özel durum: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">AssemblyQualifiedName, URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">Hata: ')' eksik</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">Hata: '(' eksik</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">Hata: İşlenen eksik</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">'|' veya '&amp;' işleci eksik</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">Çalıştırma Ayarları zaten yüklendi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">Çalıştırma ayarları yüklenirken bir hata oluştu. Hata: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">Belirtilen ayar düğümü geçersiz. Ayar düğümünün ad özelliği boş olmamalıdır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">'{0}' adlı ayar sağlayıcısı başlatılırken bir hata oluştu. Hata: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">'{0}' adlı Ayar Sağlayıcısı bulunamadı. Ayarlar yüklenemiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">TestCaseFilter {0} için yanlış biçim. Doğru biçimi belirtin ve yeniden deneyin. Yanlış biçim hiçbir testin yürütülmemesine neden olabilir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">'{0}' veri toplayıcısı başlatma bilgilerini sağlayamadı. Hata: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">'{0}' veri toplayıcısı tür yükleme, oluşturma veya başlatma sırasında bir özel durum oluşturdu: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">'{0}' veri toplayıcısı bulunamadı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">'{0}' veri toplayıcısı, test yürütme ortamında değeri '{2}' olan '{1}' ortam değişkeninin ayarlanması için istekte bulundu, ancak başka bir veri toplayıcısı ('{3}') zaten farklı bir değerle ('{4}') aynı ortam değişkeni için istekte bulunmuştu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">Veri toplayıcısı FriendlyName değeri '{0}' olan birden çok yapılandırma var. Yinelenen yapılandırmalar test çalıştırmasında yoksayılacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">Veri toplayıcısı '{0}' türünde bir özel durum yakaladı: '{1}'. Diğer ayrıntılar:'{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">Veri koleksiyonu bağlamından türetilen türler, veri ve ileti göndermek için kullanılamaz. Veri ve ileti göndermek için kullanılan DataCollectionContext veri toplayıcısı yükseltilmiş olayların birinden gelmelidir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">Yüklenen birim testi uzantılarının listesi bulunamadı. Neden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">Bu seçenek yalnızca Visual Studio’nun bir parçası olarak yüklenen vstest.console.exe ile birlikte çalışır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">Hızlı filtre oluşturulurken bir hata oluştu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">İşlem istek üzerine iptal ediliyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">'{0}' kolay adına sahip bir datacollector bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">Uzantılar '{0}' dosyasından yüklenemedi. Daha fazla bilgi için lütfen /diag kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için: Lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın. Daha fazla bilgi için lütfen hata iletisine bakın:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">Özel iç durum:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">Yığın izleme:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; kaynak test çalıştırması için desteklenmiyor.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf
index 21297f7741..e1ab3266c1 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf
@@ -4,173 +4,178 @@
     <body>
       <trans-unit id="DataCollectionMessageFormat">
         <source>Data collection : {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorMessageFormat">
         <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DuplicateExtensionUri">
         <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DuplicateSettingsName">
         <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DuplicateSettingsProvided">
         <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EmptyParenthesis">
         <source>Error: Empty parenthesis ( )</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidCondition">
         <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidExtensionUriFormat">
         <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidOperator">
         <source>Error: Invalid operator '{0}'</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerInitializationError">
         <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerNotFound">
         <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingCloseParenthesis">
         <source>Error: Missing ')'</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingOpenParenthesis">
         <source>Error: Missing '('</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingOperand">
         <source>Error: Missing operand</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingOperator">
         <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsAlreadyLoaded">
         <source>The Run Settings have already been loaded.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsParseError">
         <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SettingsNodeInvalidName">
         <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SettingsProviderInitializationError">
         <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SettingsProviderNotFound">
         <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCaseFilterFormatException">
         <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorErrorOnGetVariable">
         <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
         <target state="new">Diagnostic data adapter '{0}' failed to provide intialization information. Error: {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorInitializationError">
         <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
         <target state="new">The diagnostic data adapter '{0}'  threw an exception during type loading, construction, or initialization: {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorNotFound">
         <source>Could not find data collector '{0}'</source>
         <target state="new">Could not find diagnostic data adapter of type '{0}' and Uri '{1}'</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
         <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
         <target state="new">The diagnostic data adapter '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another diagnostic data adapter '{3}' has already requested same environment variable with different value '{4}'.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="IgnoredDuplicateConfiguration">
         <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
         <target state="new">There are multiple configurations that have diagnostic data adapter  type '{0}' or Uri '{1}'. Duplicate configurations will be ignored in the test run.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ReportDataCollectorException">
         <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
         <target state="new">Diagnostic data adapter caught an exception of type '{0}': '{1}'. More details: {2}.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="WrongDataCollectionContextType">
         <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
         <target state="new">Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerUriInvalid">
         <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
         <target state="new">The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToFindInstalledUnitTestExtensions">
         <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
         <target state="new">Failed to find the list of installed unit test extensions. Reason: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="VSInstallationNotFound">
         <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
         <target state="new">Unable to find devenv under path {0}. Make sure tests are run via vstest.console.exe installed as part of Visual Studio.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FastFilterException">
         <source>An error occurred while creating Fast filter.</source>
         <target state="new">An error occurred while creating Fast filter.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CancellationRequested">
         <source>Cancelling the operation as requested.</source>
         <target state="new">Cancelling the operation as requested.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnableToFetchUriString">
         <source>Unable to find a datacollector with friendly name '{0}'.</source>
         <target state="new">Unable to find a datacollector with friendly name '[0}'.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
         <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AccessDenied">
         <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
         <target state="new">Access denied while trying to create "TestResults" folder in current location. You are getting this exception because you are running vstest.console.exe from a folder which requires administrator rights. To solve the issue : please open command line "As Administrator" or run vstest.console.exe from a folder where you have admin privileges.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InnerException">
         <source>Inner exception:</source>
         <target state="new">Inner exception:</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StackTrace">
         <source>Stack trace:</source>
         <target state="new">Stack trace:</target>
-        <note></note>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="new">&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf
index 646975d4dc..e6a274da6d 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">数据收集: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">数据收集器“{0}”消息: {1}。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">测试扩展 URI“{0}”重复。忽略重复的扩展。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">名为“{0}”的设置提供程序重复。忽略重复的提供程序。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">名为“{0}”的运行设置部分重复。请忽略重复的设置。</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">错误: 空括号 ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">错误: 无效条件“{0}”</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">测试扩展具有无效的 URI“{0}”: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">错误: 运算符“{0}”无效</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">初始化带有 {0} 的记录器时发生异常: "{1}"。将不会使用该记录器。异常: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">找不到 AssemblyQualifiedName、URI 或 FriendlyName 为 "{0}" 的测试记录器。</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">错误: 缺少 ")"</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">错误: 缺少 "("</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">错误: 缺少操作数</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">缺少运算符 '|' 或 '&amp;'</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">已加载运行设置。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">加载运行设置时出错。错误: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">指定了无效的设置节点。设置节点的名称属性必须为非空。</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">初始化名为“{0}”的设置提供程序时出错。错误: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">找不到名为“{0}”的设置提供程序。无法加载设置。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter {0} 的格式不正确。请指定正确的格式并重试。请注意，格式不正确会导致不执行任何测试。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">数据收集器“{0}”未能提供初始化信息。错误: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">在类型加载、构造或初始化期间，数据收集器“{0}”引发了异常: {1}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">找不到数据收集器“{0}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">数据收集器“{0}”已请求具有将在测试执行环境中设置的值“{2}”的环境变量“{1}”，但另一个数据收集器“{3}”已请求具有其他值“{4}”的同一环境变量。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">有多个配置的数据收集器 FriendlyName 为“{0}”。测试运行中将忽略重复的配置。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">数据收集器已捕获类型为“{0}”的异常:“{1}”。更多详细信息: {2}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">从数据收集上下文派生的类型不能用于发送数据和消息。 用于发送数据和消息的 DataCollectionContext 必须来自向数据收集器引发的某个事件。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">测试记录器 URI“{0}”无效。将忽略该测试记录器。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">找不到已安装的单元测试扩展列表。原因: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">此选项仅适用于作为 Visual Studio 一部分安装的 vstest.console.exe。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">创建“快”筛选器时遇到错误。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">按要求取消该操作。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">找不到友好名称为“{0}”的 datacollector。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">未能从文件 "{0}" 加载扩展。有关详细信息，请使用 /diag。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。有关详细信息，请查看错误消息:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">内部异常:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">堆栈跟踪:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">数据收集: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">数据收集器“{0}”消息: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">测试扩展 URI“{0}”重复。忽略重复的扩展。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">名为“{0}”的设置提供程序重复。忽略重复的提供程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">名为“{0}”的运行设置部分重复。请忽略重复的设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">错误: 空括号 ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">错误: 无效条件“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">测试扩展具有无效的 URI“{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">错误: 运算符“{0}”无效</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">初始化带有 {0} 的记录器时发生异常: "{1}"。将不会使用该记录器。异常: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">找不到 AssemblyQualifiedName、URI 或 FriendlyName 为 "{0}" 的测试记录器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">错误: 缺少 ")"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">错误: 缺少 "("</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">错误: 缺少操作数</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">缺少运算符 '|' 或 '&amp;'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">已加载运行设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">加载运行设置时出错。错误: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">指定了无效的设置节点。设置节点的名称属性必须为非空。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">初始化名为“{0}”的设置提供程序时出错。错误: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">找不到名为“{0}”的设置提供程序。无法加载设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">TestCaseFilter {0} 的格式不正确。请指定正确的格式并重试。请注意，格式不正确会导致不执行任何测试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">数据收集器“{0}”未能提供初始化信息。错误: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">在类型加载、构造或初始化期间，数据收集器“{0}”引发了异常: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">找不到数据收集器“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">数据收集器“{0}”已请求具有将在测试执行环境中设置的值“{2}”的环境变量“{1}”，但另一个数据收集器“{3}”已请求具有其他值“{4}”的同一环境变量。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">有多个配置的数据收集器 FriendlyName 为“{0}”。测试运行中将忽略重复的配置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">数据收集器已捕获类型为“{0}”的异常:“{1}”。更多详细信息: {2}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">从数据收集上下文派生的类型不能用于发送数据和消息。 用于发送数据和消息的 DataCollectionContext 必须来自向数据收集器引发的某个事件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">测试记录器 URI“{0}”无效。将忽略该测试记录器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">找不到已安装的单元测试扩展列表。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">此选项仅适用于作为 Visual Studio 一部分安装的 vstest.console.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">创建“快”筛选器时遇到错误。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">按要求取消该操作。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">找不到友好名称为“{0}”的 datacollector。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">未能从文件 "{0}" 加载扩展。有关详细信息，请使用 /diag。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。有关详细信息，请查看错误消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">内部异常:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">堆栈跟踪:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">源测试运行不支持 &lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt;。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf
index dc6339b00c..b8b68c3ba4 100644
--- a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,197 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="DataCollectionMessageFormat">
-        <source>Data collection : {0}</source>
-        <note></note>
-        <target state="translated">資料收集: {0}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorMessageFormat">
-        <source>Data collector '{0}' message: {1}.</source>
-        <note></note>
-        <target state="translated">資料收集器 '{0}' 的訊息: {1}。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateExtensionUri">
-        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
-        <note></note>
-        <target state="translated">重複的測試延伸模組 URI '{0}'。忽略重複的延伸模組。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsName">
-        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
-        <note></note>
-        <target state="translated">名為 '{0}' 的重複的設定提供者。忽略重複的提供者。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSettingsProvided">
-        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
-        <note></note>
-        <target state="translated">找到名為 '{0}' 的重複執行設定區段。忽略重複的設定。</target>
-      </trans-unit>
-      <trans-unit id="EmptyParenthesis">
-        <source>Error: Empty parenthesis ( )</source>
-        <note></note>
-        <target state="translated">錯誤: 空的括弧 ( )</target>
-      </trans-unit>
-      <trans-unit id="InvalidCondition">
-        <source>Error: Invalid Condition '{0}'</source>
-        <note></note>
-        <target state="translated">錯誤: 條件 '{0}' 無效</target>
-      </trans-unit>
-      <trans-unit id="InvalidExtensionUriFormat">
-        <source>Test Extension has an invalid URI '{0}': {1}</source>
-        <note></note>
-        <target state="translated">測試延伸模組的 URI '{0}' 無效: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidOperator">
-        <source>Error: Invalid operator '{0}'</source>
-        <note></note>
-        <target state="translated">錯誤: 運算子 '{0}' 無效</target>
-      </trans-unit>
-      <trans-unit id="LoggerInitializationError">
-        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
-        <note></note>
-        <target state="translated">初始化具有 '{0}' 的記錄器時，發生例外狀況: '{1}'。將不會使用此記錄器。例外狀況: {2}</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">找不到具有 AssemblyQualifiedName、URI 或 FriendlyName '{0}' 的測試記錄器。</target>
-      </trans-unit>
-      <trans-unit id="MissingCloseParenthesis">
-        <source>Error: Missing ')'</source>
-        <note></note>
-        <target state="translated">錯誤: 遺漏 ')'</target>
-      </trans-unit>
-      <trans-unit id="MissingOpenParenthesis">
-        <source>Error: Missing '('</source>
-        <note></note>
-        <target state="translated">錯誤: 遺漏 '('</target>
-      </trans-unit>
-      <trans-unit id="MissingOperand">
-        <source>Error: Missing operand</source>
-        <note></note>
-        <target state="translated">錯誤: 遺漏運算元</target>
-      </trans-unit>
-      <trans-unit id="MissingOperator">
-        <source>Missing Operator '|' or '&amp;'</source>
-        <note></note>
-        <target state="translated">遺漏運算子 '|' 或 '&amp;'</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsAlreadyLoaded">
-        <source>The Run Settings have already been loaded.</source>
-        <note></note>
-        <target state="translated">已載入 [回合設定]。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the run settings.  Error: {0}</source>
-        <note></note>
-        <target state="translated">載入回合設定時發生錯誤。錯誤: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingsNodeInvalidName">
-        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
-        <note></note>
-        <target state="translated">指定的設定節點無效。設定節點的名稱屬性必須為非空白。</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderInitializationError">
-        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
-        <note></note>
-        <target state="translated">將名為 '{0}' 的設定提供者初始化時發生錯誤。錯誤: {1}</target>
-      </trans-unit>
-      <trans-unit id="SettingsProviderNotFound">
-        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
-        <note></note>
-        <target state="translated">找不到名為 '{0}' 的設定提供者。無法載入設定。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterFormatException">
-        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter {0} 的格式不正確。請指定正確的格式後再試一次。請注意，格式不正確可能會導致無法執行測試。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectorErrorOnGetVariable">
-        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
-        <target state="translated">資料收集器 '{0}' 無法提供初始化資訊。錯誤: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorInitializationError">
-        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
-        <target state="translated">載入、建構或初始化類型期間，資料收集器 '{0}'擲回例外狀況: {1}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorNotFound">
-        <source>Could not find data collector '{0}'</source>
-        <target state="translated">找不到資料收集器 '{0}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
-        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
-        <target state="translated">資料收集器 '{0}' 要求要在測試執行環境中將環境變數 '{1}' 的值設為 '{2}'，但另一個資料收集器 '{3}' 已要求了同一個環境變數，但具有不同的值 '{4}'。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="IgnoredDuplicateConfiguration">
-        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
-        <target state="translated">有多個組態的資料收集器 FriendlyName 為 '{0}'。在測試回合中，重複的組態將予忽略。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ReportDataCollectorException">
-        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
-        <target state="translated">資料收集器攔截到類型為 '{0}' 的例外狀況: '{1}'。更多詳細資料: {2}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="WrongDataCollectionContextType">
-        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
-        <target state="translated">衍生自資料收集內容的類型無法用於傳送資料和訊息。用於傳送資料和訊息的 DataCollectionContext 必須來自其中一個引發資料收集器的事件。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <target state="translated">測試記錄器 URI '{0}' 無效。將忽略測試記錄器。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
-        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
-        <target state="translated">無法找到已安裝之單元測試延伸模組的清單。原因: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VSInstallationNotFound">
-        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
-        <target state="translated">此選項僅適用於隨 Visual Studio 安裝的 vstest.console.exe。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FastFilterException">
-        <source>An error occurred while creating Fast filter.</source>
-        <target state="translated">建立快速篩選時發生錯誤。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CancellationRequested">
-        <source>Cancelling the operation as requested.</source>
-        <target state="translated">正在應要求取消作業。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFetchUriString">
-        <source>Unable to find a datacollector with friendly name '{0}'.</source>
-        <target state="translated">找不到易記名稱為 '{0}' 的 datacollector。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadAdapaterFile">
-        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
-        <target state="translated">無法從檔案 '{0}' 載入延伸模組。如需詳細資訊，請使用 /diag。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
-        <target state="translated">{0} 嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。如需詳細資訊，請參閱錯誤訊息:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InnerException">
-        <source>Inner exception:</source>
-        <target state="translated">內部例外狀況:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StackTrace">
-        <source>Stack trace:</source>
-        <target state="translated">堆疊追蹤:</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="DataCollectionMessageFormat">
+        <source>Data collection : {0}</source>
+        <target state="translated">資料收集: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorMessageFormat">
+        <source>Data collector '{0}' message: {1}.</source>
+        <target state="translated">資料收集器 '{0}' 的訊息: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateExtensionUri">
+        <source>Duplicate test extension URI '{0}'.  Ignoring the duplicate extension.</source>
+        <target state="translated">重複的測試延伸模組 URI '{0}'。忽略重複的延伸模組。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsName">
+        <source>Duplicate settings provider named '{0}'.  Ignoring the duplicate provider.</source>
+        <target state="translated">名為 '{0}' 的重複的設定提供者。忽略重複的提供者。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateSettingsProvided">
+        <source>Duplicate run settings section named '{0}' found.  Ignoring the duplicate settings.</source>
+        <target state="translated">找到名為 '{0}' 的重複執行設定區段。忽略重複的設定。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmptyParenthesis">
+        <source>Error: Empty parenthesis ( )</source>
+        <target state="translated">錯誤: 空的括弧 ( )</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidCondition">
+        <source>Error: Invalid Condition '{0}'</source>
+        <target state="translated">錯誤: 條件 '{0}' 無效</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidExtensionUriFormat">
+        <source>Test Extension has an invalid URI '{0}': {1}</source>
+        <target state="translated">測試延伸模組的 URI '{0}' 無效: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidOperator">
+        <source>Error: Invalid operator '{0}'</source>
+        <target state="translated">錯誤: 運算子 '{0}' 無效</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerInitializationError">
+        <source>Exception occurred while initializing logger with {0}: '{1}'.  The logger will not be used.  Exception: {2}</source>
+        <target state="translated">初始化具有 '{0}' 的記錄器時，發生例外狀況: '{1}'。將不會使用此記錄器。例外狀況: {2}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with AssemblyQualifiedName, URI or FriendlyName '{0}'.</source>
+        <target state="translated">找不到具有 AssemblyQualifiedName、URI 或 FriendlyName '{0}' 的測試記錄器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingCloseParenthesis">
+        <source>Error: Missing ')'</source>
+        <target state="translated">錯誤: 遺漏 ')'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOpenParenthesis">
+        <source>Error: Missing '('</source>
+        <target state="translated">錯誤: 遺漏 '('</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperand">
+        <source>Error: Missing operand</source>
+        <target state="translated">錯誤: 遺漏運算元</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingOperator">
+        <source>Missing Operator '|' or '&amp;'</source>
+        <target state="translated">遺漏運算子 '|' 或 '&amp;'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsAlreadyLoaded">
+        <source>The Run Settings have already been loaded.</source>
+        <target state="translated">已載入 [回合設定]。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the run settings.  Error: {0}</source>
+        <target state="translated">載入回合設定時發生錯誤。錯誤: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsNodeInvalidName">
+        <source>Invalid settings node specified. The name property of the settings node must be non-empty.</source>
+        <target state="translated">指定的設定節點無效。設定節點的名稱屬性必須為非空白。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderInitializationError">
+        <source>An error occurred while initializing the settings provider named '{0}'. Error: {1}</source>
+        <target state="translated">將名為 '{0}' 的設定提供者初始化時發生錯誤。錯誤: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingsProviderNotFound">
+        <source>Settings Provider named '{0}' was not found.  The settings can not be loaded.</source>
+        <target state="translated">找不到名為 '{0}' 的設定提供者。無法載入設定。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterFormatException">
+        <source>Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.</source>
+        <target state="translated">TestCaseFilter {0} 的格式不正確。請指定正確的格式後再試一次。請注意，格式不正確可能會導致無法執行測試。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorErrorOnGetVariable">
+        <source>Data collector '{0}' failed to provide initialization information. Error: {1}</source>
+        <target state="translated">資料收集器 '{0}' 無法提供初始化資訊。錯誤: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorInitializationError">
+        <source>Data collector '{0}' threw an exception during type loading, construction, or initialization: {1}.</source>
+        <target state="translated">載入、建構或初始化類型期間，資料收集器 '{0}'擲回例外狀況: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorNotFound">
+        <source>Could not find data collector '{0}'</source>
+        <target state="translated">找不到資料收集器 '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorRequestedDuplicateEnvironmentVariable">
+        <source>The data collector '{0}' requested environment variable '{1}' with value '{2}' to be set in test execution environment, but another data collector '{3}' has already requested same environment variable with different value '{4}'.</source>
+        <target state="translated">資料收集器 '{0}' 要求要在測試執行環境中將環境變數 '{1}' 的值設為 '{2}'，但另一個資料收集器 '{3}' 已要求了同一個環境變數，但具有不同的值 '{4}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="IgnoredDuplicateConfiguration">
+        <source>There are multiple configurations that have data collector FriendlyName as '{0}'. Duplicate configurations will be ignored in the test run.</source>
+        <target state="translated">有多個組態的資料收集器 FriendlyName 為 '{0}'。在測試回合中，重複的組態將予忽略。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ReportDataCollectorException">
+        <source>Data collector caught an exception of type '{0}': '{1}'. More details: {2}.</source>
+        <target state="translated">資料收集器攔截到類型為 '{0}' 的例外狀況: '{1}'。更多詳細資料: {2}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="WrongDataCollectionContextType">
+        <source>Types deriving from the data collection context cannot be used for sending data and messages.  The DataCollectionContext used for sending data and messages must come from one of the events raised to the data collector.</source>
+        <target state="translated">衍生自資料收集內容的類型無法用於傳送資料和訊息。用於傳送資料和訊息的 DataCollectionContext 必須來自其中一個引發資料收集器的事件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">測試記錄器 URI '{0}' 無效。將忽略測試記錄器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToFindInstalledUnitTestExtensions">
+        <source>Failed to find the list of installed unit test extensions. Reason: {0}</source>
+        <target state="translated">無法找到已安裝之單元測試延伸模組的清單。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSInstallationNotFound">
+        <source>This option works only with vstest.console.exe installed as part of Visual Studio.</source>
+        <target state="translated">此選項僅適用於隨 Visual Studio 安裝的 vstest.console.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FastFilterException">
+        <source>An error occurred while creating Fast filter.</source>
+        <target state="translated">建立快速篩選時發生錯誤。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CancellationRequested">
+        <source>Cancelling the operation as requested.</source>
+        <target state="translated">正在應要求取消作業。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFetchUriString">
+        <source>Unable to find a datacollector with friendly name '{0}'.</source>
+        <target state="translated">找不到易記名稱為 '{0}' 的 datacollector。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadAdapaterFile">
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
+        <target state="translated">無法從檔案 '{0}' 載入延伸模組。如需詳細資訊，請使用 /diag。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</source>
+        <target state="translated">{0} 嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。如需詳細資訊，請參閱錯誤訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InnerException">
+        <source>Inner exception:</source>
+        <target state="translated">內部例外狀況:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StackTrace">
+        <source>Stack trace:</source>
+        <target state="translated">堆疊追蹤:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SerialTestRunInvalidScenario">
+        <source>&lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt; is not supported for sources test run.</source>
+        <target state="translated">來源測試回合不支援 &lt;ForceOneTestAtTimePerTestHost&gt;true&lt;/ForceOneTestAtTimePerTestHost&gt;。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Common/RunSettings.cs b/src/Microsoft.TestPlatform.Common/RunSettings.cs
index 722c642d15..42eadcd8a4 100644
--- a/src/Microsoft.TestPlatform.Common/RunSettings.cs
+++ b/src/Microsoft.TestPlatform.Common/RunSettings.cs
@@ -1,285 +1,246 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common;
+
+/// <summary>
+/// Used for loading settings for a run.
+/// </summary>
+public class RunSettings : IRunSettings
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+    /// <summary>
+    /// Map of the settings names in the file to their associated settings provider.
+    /// </summary>
+    private readonly Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> _settings;
 
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
-    using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+    /// <summary>
+    /// Used to keep track if settings have been loaded.
+    /// </summary>
+    private bool _isSettingsLoaded;
 
     /// <summary>
-    /// Used for loading settings for a run.
+    /// Initializes a new instance of the <see cref="RunSettings"/> class.
     /// </summary>
-    public class RunSettings : IRunSettings
+    public RunSettings()
     {
-        #region Fields
-
-        /// <summary>
-        /// Map of the settings names in the file to their associated settings provider.
-        /// </summary>
-        private Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settings;
-
-        /// <summary>
-        /// Used to keep track if settings have been loaded.
-        /// </summary>
-        private bool isSettingsLoaded;
+        _settings = new Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the settings in the form of Xml string.
+    /// </summary>
+    public string? SettingsXml { get; private set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RunSettings"/> class.
-        /// </summary>
-        public RunSettings()
+    /// <summary>
+    /// Get the settings for the provided settings name.
+    /// </summary>
+    /// <param name="settingsName">Name of the settings section to get.</param>
+    /// <returns>The settings provider for the settings or null if one was not found.</returns>
+    public ISettingsProvider? GetSettings(string? settingsName)
+    {
+        if (settingsName.IsNullOrWhiteSpace())
         {
-            this.settings = new Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
+            throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(settingsName));
         }
 
-        #region Properties
-
-        /// <summary>
-        /// Gets the settings in the form of Xml string.
-        /// </summary>
-        public string SettingsXml { get; private set; }
-
-        #endregion
+        // Try and lookup the settings provider.
+        _settings.TryGetValue(settingsName, out var provider);
 
-        #region Public Methods
+        // If a provider was found, return it.
+        return provider?.Value;
+    }
 
-        /// <summary>
-        /// Get the settings for the provided settings name.
-        /// </summary>
-        /// <param name="settingsName">Name of the settings section to get.</param>
-        /// <returns>The settings provider for the settings or null if one was not found.</returns>
-        public ISettingsProvider GetSettings(string settingsName)
+    /// <summary>
+    /// Load the settings from the provided xml string.
+    /// </summary>
+    /// <param name="settings">xml string</param>
+    public void LoadSettingsXml(string settings)
+    {
+        if (StringUtilities.IsNullOrWhiteSpace(settings))
         {
-            if (StringUtilities.IsNullOrWhiteSpace(settingsName))
-            {
-                throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(settingsName));
-            }
+            throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, settings);
+        }
 
-            // Try and lookup the settings provider.
-            ISettingsProvider result = null;
-            this.settings.TryGetValue(settingsName, out var provider);
+        using var stringReader = new StringReader(settings);
+        using var reader = XmlReader.Create(stringReader, XmlRunSettingsUtilities.ReaderSettings);
+        ValidateAndSaveSettings(reader);
+    }
 
-            // If a provider was found, return it.
-            if (provider != null)
-            {
-                result = provider.Value;
-            }
+    /// <summary>
+    /// Initialize settings providers with the settings xml.
+    /// </summary>
+    /// <param name="settings"> The settings xml string. </param>
+    public void InitializeSettingsProviders(string settings)
+    {
+        using var stringReader = new StringReader(settings);
+        using var reader = XmlReader.Create(stringReader, XmlRunSettingsUtilities.ReaderSettings);
+        ReadRunSettings(reader);
+    }
 
-            return result;
+    /// <summary>
+    /// Validate the runsettings checking that it is well formed.
+    /// This would throw XML exception on failure.
+    /// </summary>
+    /// <param name="reader">A xml reader instance.</param>
+    private void ValidateAndSaveSettings(XmlReader reader)
+    {
+        try
+        {
+            var dom = new XmlDocument();
+            dom.Load(reader);
+            using var writer = new StringWriter(CultureInfo.InvariantCulture);
+            dom.Save(writer);
+            SettingsXml = writer.ToString();
         }
-
-        /// <summary>
-        /// Load the settings from the provided xml string.
-        /// </summary>
-        /// <param name="settings">xml string</param>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public void LoadSettingsXml(string settings)
+        catch (Exception e)
         {
-            if (StringUtilities.IsNullOrWhiteSpace(settings))
-            {
-                throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, settings);
-            }
-
-            using (var stringReader = new StringReader(settings))
-            {
-                var reader = XmlReader.Create(stringReader, XmlRunSettingsUtilities.ReaderSettings);
-                this.ValidateAndSaveSettings(reader);
-            }
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommonResources.RunSettingsParseError,
+                    e.Message),
+                e);
         }
+    }
 
-        /// <summary>
-        /// Initialize settings providers with the settings xml.
-        /// </summary>
-        /// <param name="settings"> The settings xml string. </param>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public void InitializeSettingsProviders(string settings)
+    /// <summary>
+    /// Reads test run settings from XmlReader
+    /// </summary>
+    /// <param name="reader"></param>
+    private void ReadRunSettings(XmlReader reader)
+    {
+        // If settings have already been loaded, throw.
+        if (_isSettingsLoaded)
         {
-            using (var stringReader = new StringReader(settings))
-            {
-                var reader = XmlReader.Create(stringReader, XmlRunSettingsUtilities.ReaderSettings);
-                this.ReadRunSettings(reader);
-            }
+            throw new InvalidOperationException(CommonResources.RunSettingsAlreadyLoaded);
         }
 
-        #endregion
-
-        #region Private Methods
+        _isSettingsLoaded = true;
 
-        /// <summary>
-        /// Validate the runsettings checking that it is well formed.
-        /// This would throw XML exception on failure.
-        /// </summary>
-        /// <param name="reader">A xml reader instance.</param>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private void ValidateAndSaveSettings(XmlReader reader)
+        try
         {
-            try
-            {
-                var dom = new XmlDocument();
-                dom.Load(reader);
-                using (var writer = new StringWriter(CultureInfo.InvariantCulture))
-                {
-                    dom.Save(writer);
-                    this.SettingsXml = writer.ToString();
-                }
-            }
-            catch (Exception e)
+            // Read to the root element.
+            XmlReaderUtilities.ReadToRootNode(reader);
+
+            // Read to the first section.
+            reader.ReadToNextElement();
+
+            // Lookup the settings provider for each of the elements.
+            var settingsExtensionManager = SettingsProviderExtensionManager.Create();
+            while (!reader.EOF)
             {
-                throw new SettingsException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        CommonResources.RunSettingsParseError,
-                        e.Message),
-                    e);
+                LoadSection(reader, settingsExtensionManager);
+                reader.SkipToNextElement();
             }
         }
-
-        /// <summary>
-        /// Reads test run settings from XmlReader
-        /// </summary>
-        /// <param name="reader"></param>
-        private void ReadRunSettings(XmlReader reader)
+        catch (SettingsException)
         {
-            // If settings have already been loaded, throw.
-            if (this.isSettingsLoaded)
-            {
-                throw new InvalidOperationException(CommonResources.RunSettingsAlreadyLoaded);
-            }
+            throw;
+        }
+        catch (Exception e)
+        {
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommonResources.RunSettingsParseError,
+                    e.Message),
+                e);
+        }
+    }
+
+    /// <summary>
+    /// Loads the section for the current element of the reader.
+    /// </summary>
+    /// <param name="reader">Reader to load the section from.</param>
+    /// <param name="settingsExtensionManager">Settings extension manager to get the provider from.</param>
+    private void LoadSection(XmlReader reader, SettingsProviderExtensionManager settingsExtensionManager)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+        ValidateArg.NotNull(settingsExtensionManager, nameof(settingsExtensionManager));
 
-            this.isSettingsLoaded = true;
+        // Check for duplicate settings
+        if (_settings.ContainsKey(reader.Name))
+        {
+            TestSessionMessageLogger.Instance.SendMessage(
+                TestMessageLevel.Error,
+                string.Format(CultureInfo.CurrentCulture, CommonResources.DuplicateSettingsProvided, reader.Name));
 
-            try
-            {
-                // Read to the root element.
-                XmlReaderUtilities.ReadToRootNode(reader);
+            return;
+        }
 
-                // Read to the first section.
-                reader.ReadToNextElement();
+        // Look up the section for this node.
+        var provider = settingsExtensionManager.GetSettingsProvider(reader.Name);
 
-                // Lookup the settings provider for each of the elements.
-                var settingsExtensionManager = SettingsProviderExtensionManager.Create();
-                while (!reader.EOF)
-                {
-                    this.LoadSection(reader, settingsExtensionManager);
-                    reader.SkipToNextElement();
-                }
-            }
-            catch (SettingsException)
+        if (provider != null)
+        {
+            try
             {
-                throw;
+                // Have the provider load the settings.
+                provider.Value.Load(reader.ReadSubtree());
             }
             catch (Exception e)
             {
-                throw new SettingsException(
+                // Setup to throw the exception when the section is requested.
+                provider = CreateLazyThrower(
                     string.Format(
                         CultureInfo.CurrentCulture,
-                        CommonResources.RunSettingsParseError,
+                        CommonResources.SettingsProviderInitializationError,
+                        provider.Metadata.SettingsName,
                         e.Message),
+                    provider.Metadata,
                     e);
             }
         }
-
-        /// <summary>
-        /// Loads the section for the current element of the reader.
-        /// </summary>
-        /// <param name="reader">Reader to load the section from.</param>
-        /// <param name="settingsExtensionManager">Settings extension manager to get the provider from.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "This methods must not fail on crash in loading settings.")]
-        private void LoadSection(XmlReader reader, SettingsProviderExtensionManager settingsExtensionManager)
+        else
         {
-            ValidateArg.NotNull(reader, nameof(reader));
-            ValidateArg.NotNull(settingsExtensionManager, nameof(settingsExtensionManager));
-
-            // Check for duplicate settings
-            if (this.settings.ContainsKey(reader.Name))
-            {
-                TestSessionMessageLogger.Instance.SendMessage(
-                    TestMessageLevel.Error,
-                    string.Format(CultureInfo.CurrentCulture, CommonResources.DuplicateSettingsProvided, reader.Name));
-
-                return;
-            }
-
-            // Look up the section for this node.
-            var provider = settingsExtensionManager.GetSettingsProvider(reader.Name);
-
-            if (provider != null)
-            {
-                try
-                {
-                    // Have the provider load the settings.
-                    provider.Value.Load(reader.ReadSubtree());
-                }
-                catch (Exception e)
-                {
-                    // Setup to throw the exception when the section is requested.
-                    provider = CreateLazyThrower(
-                        string.Format(
-                            CultureInfo.CurrentCulture,
-                            CommonResources.SettingsProviderInitializationError,
-                            provider.Metadata.SettingsName,
-                            e.Message),
-                        provider.Metadata,
-                        e);
-                }
-            }
-            else
-            {
-                // Setup to throw when this section is requested.
-                var metadata = new TestSettingsProviderMetadata(reader.Name);
-
-                var message = string.Format(
-                    CultureInfo.CurrentCulture,
-                    CommonResources.SettingsProviderNotFound,
-                    metadata.SettingsName);
+            // Setup to throw when this section is requested.
+            var metadata = new TestSettingsProviderMetadata(reader.Name);
 
-                provider = CreateLazyThrower(message, metadata);
-            }
+            var message = string.Format(
+                CultureInfo.CurrentCulture,
+                CommonResources.SettingsProviderNotFound,
+                metadata.SettingsName);
 
-            // Cache the provider instance so it can be looked up later when the section is requested.
-            this.settings.Add(provider.Metadata.SettingsName, provider);
+            provider = CreateLazyThrower(message, metadata);
         }
 
-        /// <summary>
-        /// Creates a lazy instance which will throw a SettingsException when the value property is accessed.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="metadata">Metadata to use for the lazy instance.</param>
-        /// <param name="innerException">Inner exception to include in the exception which is thrown.</param>
-        /// <returns>Lazy instance setup to throw when the value property is accessed.</returns>
-        private static LazyExtension<ISettingsProvider, ISettingsProviderCapabilities> CreateLazyThrower(
-            string message,
-            ISettingsProviderCapabilities metadata,
-            Exception innerException = null)
-        {
-            return new LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>(
-                () =>
-                {
-                    throw new SettingsException(message, innerException);
-                },
-                metadata);
-        }
+        // Cache the provider instance so it can be looked up later when the section is requested.
+        _settings.Add(provider.Metadata.SettingsName, provider);
+    }
 
-        #endregion
+    /// <summary>
+    /// Creates a lazy instance which will throw a SettingsException when the value property is accessed.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="metadata">Metadata to use for the lazy instance.</param>
+    /// <param name="innerException">Inner exception to include in the exception which is thrown.</param>
+    /// <returns>Lazy instance setup to throw when the value property is accessed.</returns>
+    private static LazyExtension<ISettingsProvider, ISettingsProviderCapabilities> CreateLazyThrower(
+        string message,
+        ISettingsProviderCapabilities metadata,
+        Exception? innerException = null)
+    {
+        return new LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>(
+            () => throw new SettingsException(message, innerException),
+            metadata);
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/RunSettingsManager.cs b/src/Microsoft.TestPlatform.Common/RunSettingsManager.cs
index 41c4a58feb..f7cdcf6872 100644
--- a/src/Microsoft.TestPlatform.Common/RunSettingsManager.cs
+++ b/src/Microsoft.TestPlatform.Common/RunSettingsManager.cs
@@ -1,83 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    /// <summary>
-    /// Manages the active run settings.
-    /// </summary>
-    internal class RunSettingsManager : IRunSettingsProvider
-    {
-        #region private members
-
-        private static object lockObject = new object();
-
-        private static RunSettingsManager runSettingsManagerInstance;
+using System;
+using System.Diagnostics.CodeAnalysis;
 
-        #endregion
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
 
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        private RunSettingsManager()
-        {
-            this.ActiveRunSettings = new RunSettings();
-        }
+namespace Microsoft.VisualStudio.TestPlatform.Common;
 
+/// <summary>
+/// Manages the active run settings.
+/// </summary>
+internal class RunSettingsManager : IRunSettingsProvider
+{
+    private static readonly object LockObject = new();
 
-        #endregion
+    private static RunSettingsManager? s_runSettingsManagerInstance;
 
-        #region IRunSettingsProvider
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    private RunSettingsManager()
+    {
+        ActiveRunSettings = new RunSettings();
+    }
 
-        /// <summary>
-        /// Gets the active run settings.
-        /// </summary>
-        public RunSettings ActiveRunSettings { get; private set; }
+    #region IRunSettingsProvider
 
-        #endregion
+    /// <summary>
+    /// Gets the active run settings.
+    /// </summary>
+    public RunSettings ActiveRunSettings { get; private set; }
 
-        #region Public Methods
+    #endregion
 
-        public static RunSettingsManager Instance
+    [AllowNull]
+    public static RunSettingsManager Instance
+    {
+        get
         {
-            get
+            if (s_runSettingsManagerInstance != null)
             {
-                if (runSettingsManagerInstance != null)
-                {
-                    return runSettingsManagerInstance;
-                }
-
-                lock (lockObject)
-                {
-                    if (runSettingsManagerInstance == null)
-                    {
-                        runSettingsManagerInstance = new RunSettingsManager();
-                    }
-                }
-
-                return runSettingsManagerInstance;
+                return s_runSettingsManagerInstance;
             }
-            internal set
+
+            lock (LockObject)
             {
-                runSettingsManagerInstance = value;
+                s_runSettingsManagerInstance ??= new RunSettingsManager();
             }
-        }
 
-        /// <summary>
-        /// Set the active run settings.
-        /// </summary>
-        /// <param name="runSettings">RunSettings to make the active Run Settings.</param>
-        public void SetActiveRunSettings(RunSettings runSettings)
+            return s_runSettingsManagerInstance;
+        }
+        internal set
         {
-            ValidateArg.NotNull<RunSettings>(runSettings, nameof(runSettings));
-            this.ActiveRunSettings = runSettings;
+            s_runSettingsManagerInstance = value;
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Set the active run settings.
+    /// </summary>
+    /// <param name="runSettings">RunSettings to make the active Run Settings.</param>
+    public void SetActiveRunSettings(RunSettings runSettings)
+    {
+        ActiveRunSettings = runSettings ?? throw new ArgumentNullException(nameof(runSettings));
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs b/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs
index 0ba94175fb..4b0d58fab1 100644
--- a/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs
@@ -1,244 +1,203 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+
+/// <summary>
+/// Manages the settings provider extensions.
+/// </summary>
+/// <remarks>
+/// This is a non-shared instance because we want different settings provider instances to
+/// be used for each run settings instance.
+/// </remarks>
+public class SettingsProviderExtensionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
-    using ObjectModelCommonResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+    private static SettingsProviderExtensionManager? s_settingsProviderExtensionManager;
+    private static readonly object Synclock = new();
 
     /// <summary>
-    /// Manages the settings provider extensions.
+    /// The settings providers which are available.
+    /// </summary>
+    private readonly IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> _settingsProviders;
+
+    /// <summary>
+    /// Used for logging errors.
+    /// </summary>
+    private readonly IMessageLogger _logger;
+
+    /// <summary>
+    /// Initializes with the settings providers.
     /// </summary>
     /// <remarks>
-    /// This is a non-shared instance because we want different settings provider instances to
-    /// be used for each run settings instance.
+    /// The settings providers are imported as non-shared because we need different settings provider
+    /// instances to be used for each run settings.
     /// </remarks>
-    public class SettingsProviderExtensionManager
+    protected SettingsProviderExtensionManager(
+        IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProviders,
+        IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> unfilteredSettingsProviders,
+        IMessageLogger logger)
     {
-        #region Fields
-        private static SettingsProviderExtensionManager settingsProviderExtensionManager;
-        private static object synclock = new object();
-
-        /// <summary>
-        /// The settings providers which are available.
-        /// </summary>
-        private IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProviders;
-        private Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProvidersMap;
-
-        /// <summary>
-        /// Used for logging errors.
-        /// </summary>
-        private IMessageLogger logger;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the settings providers.
-        /// </summary>
-        /// <remarks>
-        /// The settings providers are imported as non-shared because we need different settings provider
-        /// instances to be used for each run settings.
-        /// </remarks>
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        protected SettingsProviderExtensionManager(
-            IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProviders,
-            IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> unfilteredSettingsProviders,
-            IMessageLogger logger)
-        {
-            ValidateArg.NotNull<IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>>(settingsProviders, nameof(settingsProviders));
-            ValidateArg.NotNull<IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>>>(unfilteredSettingsProviders, nameof(unfilteredSettingsProviders));
-            ValidateArg.NotNull<IMessageLogger>(logger, nameof(logger));
-
-            this.settingsProviders = settingsProviders;
-            this.UnfilteredSettingsProviders = unfilteredSettingsProviders;
-            this.logger = logger;
-
-            // Populate the map to avoid threading issues
-            this.PopulateMap();
-        }
+        _settingsProviders = settingsProviders ?? throw new ArgumentNullException(nameof(settingsProviders));
+        UnfilteredSettingsProviders = unfilteredSettingsProviders ?? throw new ArgumentNullException(nameof(unfilteredSettingsProviders));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
-        #endregion
+        // Populate the map to avoid threading issues
+        SettingsProvidersMap = new Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
 
-        #region Properties
-
-        /// <summary>
-        /// Gets the Unfiltered list of settings providers.  Used for the /ListSettingsProviders command line argument.
-        /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        public IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> UnfilteredSettingsProviders { get; private set; }
-
-        /// <summary>
-        /// Gets the map of settings name to settings provider.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        public Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> SettingsProvidersMap
+        foreach (var settingsProvider in _settingsProviders)
         {
-            get
+            var settingsName = settingsProvider.Metadata?.SettingsName;
+            if (settingsName is null)
             {
-                return this.settingsProvidersMap;
+                continue;
             }
-        }
-
-        #endregion
-
-        #region Static Methods
 
-        /// <summary>
-        /// Creates an instance of the settings provider.
-        /// </summary>
-        /// <returns>Instance of the settings provider.</returns>
-        public static SettingsProviderExtensionManager Create()
-        {
-            if (settingsProviderExtensionManager == null)
+            if (SettingsProvidersMap.ContainsKey(settingsName))
             {
-                lock (synclock)
-                {
-                    if (settingsProviderExtensionManager == null)
-                    {
-
-                        TestPluginManager.Instance
-                            .GetSpecificTestExtensions<TestSettingsProviderPluginInformation, ISettingsProvider, ISettingsProviderCapabilities, TestSettingsProviderMetadata>(
-                                TestPlatformConstants.TestAdapterEndsWithPattern,
-                                out var unfilteredTestExtensions,
-                                out var testExtensions);
-
-                        settingsProviderExtensionManager = new SettingsProviderExtensionManager(
-                            testExtensions, unfilteredTestExtensions, TestSessionMessageLogger.Instance);
-                    }
-                }
+                _logger.SendMessage(
+                    TestMessageLevel.Error,
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CommonResources.DuplicateSettingsName,
+                        settingsName));
             }
-
-            return settingsProviderExtensionManager;
-        }
-
-        /// <summary>
-        /// Destroy the extension manager.
-        /// </summary>
-        public static void Destroy()
-        {
-            lock (synclock)
+            else
             {
-                settingsProviderExtensionManager = null;
+                SettingsProvidersMap.Add(settingsName, settingsProvider);
             }
         }
+    }
 
-        /// <summary>
-        /// Load all the settings provider and fail on error
-        /// </summary>
-        /// <param name="shouldThrowOnError"> Indicates whether this method should throw on error. </param>
-        public static void LoadAndInitializeAllExtensions(bool shouldThrowOnError)
-        {
-            var extensionManager = Create();
+    /// <summary>
+    /// Gets the Unfiltered list of settings providers.  Used for the /ListSettingsProviders command line argument.
+    /// </summary>
+    public IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> UnfilteredSettingsProviders { get; }
 
-            try
-            {
-                foreach (var settingsProvider in extensionManager.SettingsProvidersMap)
-                {
-                    // Note: - The below Verbose call should not be under IsVerboseEnabled check as we want to
-                    // call executor.Value even if logging is not enabled.
-                    EqtTrace.Verbose("SettingsProviderExtensionManager: Loading settings provider {0}", settingsProvider.Value.Value);
-                }
-            }
-            catch (Exception ex)
+    /// <summary>
+    /// Gets the map of settings name to settings provider.
+    /// </summary>
+    public Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> SettingsProvidersMap { get; }
+
+    /// <summary>
+    /// Creates an instance of the settings provider.
+    /// </summary>
+    /// <returns>Instance of the settings provider.</returns>
+    public static SettingsProviderExtensionManager Create()
+    {
+        if (s_settingsProviderExtensionManager == null)
+        {
+            lock (Synclock)
             {
-                if (EqtTrace.IsErrorEnabled)
+                if (s_settingsProviderExtensionManager == null)
                 {
-                    EqtTrace.Error("SettingsProviderExtensionManager: LoadAndInitialize: Exception occurred while loading extensions {0}", ex);
-                }
 
-                if (shouldThrowOnError)
-                {
-                    throw;
+                    TestPluginManager.GetSpecificTestExtensions<TestSettingsProviderPluginInformation, ISettingsProvider, ISettingsProviderCapabilities, TestSettingsProviderMetadata>(
+                            TestPlatformConstants.TestAdapterEndsWithPattern,
+                            out var unfilteredTestExtensions,
+                            out var testExtensions);
+
+                    s_settingsProviderExtensionManager = new SettingsProviderExtensionManager(
+                        testExtensions, unfilteredTestExtensions, TestSessionMessageLogger.Instance);
                 }
             }
         }
 
-        #endregion
+        return s_settingsProviderExtensionManager;
+    }
 
-        #region Public Methods
+    /// <summary>
+    /// Destroy the extension manager.
+    /// </summary>
+    public static void Destroy()
+    {
+        lock (Synclock)
+        {
+            s_settingsProviderExtensionManager = null;
+        }
+    }
 
-        /// <summary>
-        /// Gets the settings with the provided name.
-        /// </summary>
-        /// <param name="settingsName">Name of the settings to get.</param>
-        /// <returns>Settings provider with the provided name or null if one was not found.</returns>
-        internal LazyExtension<ISettingsProvider, ISettingsProviderCapabilities> GetSettingsProvider(string settingsName)
+    /// <summary>
+    /// Load all the settings provider and fail on error
+    /// </summary>
+    /// <param name="shouldThrowOnError"> Indicates whether this method should throw on error. </param>
+    public static void LoadAndInitializeAllExtensions(bool shouldThrowOnError)
+    {
+        var extensionManager = Create();
+
+        try
         {
-            if (string.IsNullOrWhiteSpace(settingsName))
+            foreach (var settingsProvider in extensionManager.SettingsProvidersMap)
             {
-                throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(settingsName));
+                // Note: - The below Verbose call should not be under IsVerboseEnabled check as we want to
+                // call executor.Value even if logging is not enabled.
+                EqtTrace.Verbose("SettingsProviderExtensionManager: Loading settings provider {0}", settingsProvider.Value.Value);
             }
-
-            this.SettingsProvidersMap.TryGetValue(settingsName, out LazyExtension<ISettingsProvider, ISettingsProviderCapabilities> settingsProvider);
-
-            return settingsProvider;
         }
-
-        #endregion
-
-
-        /// <summary>
-        /// Populate the settings provider map
-        /// </summary>
-        private void PopulateMap()
+        catch (Exception ex)
         {
-            this.settingsProvidersMap = new Dictionary<string, LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
+            EqtTrace.Error("SettingsProviderExtensionManager: LoadAndInitialize: Exception occurred while loading extensions {0}", ex);
 
-            foreach (var settingsProvider in this.settingsProviders)
+            if (shouldThrowOnError)
             {
-                if (this.settingsProvidersMap.ContainsKey(settingsProvider.Metadata.SettingsName))
-                {
-                    this.logger.SendMessage(
-                        TestMessageLevel.Error,
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CommonResources.DuplicateSettingsName,
-                            settingsProvider.Metadata.SettingsName));
-                }
-                else
-                {
-                    this.settingsProvidersMap.Add(settingsProvider.Metadata.SettingsName, settingsProvider);
-                }
+                throw;
             }
         }
     }
 
     /// <summary>
-    /// Hold data about the Test settings provider.
+    /// Gets the settings with the provided name.
     /// </summary>
-    internal class TestSettingsProviderMetadata : ISettingsProviderCapabilities
+    /// <param name="settingsName">Name of the settings to get.</param>
+    /// <returns>Settings provider with the provided name or null if one was not found.</returns>
+    internal LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>? GetSettingsProvider(string settingsName)
     {
-        /// <summary>
-        /// The constructor
-        /// </summary>
-        /// <param name="settingsName">Test settings name</param>
-        public TestSettingsProviderMetadata(string settingsName)
+        if (settingsName.IsNullOrWhiteSpace())
         {
-            this.SettingsName = settingsName;
+            throw new ArgumentException(ObjectModelCommonResources.CannotBeNullOrEmpty, nameof(settingsName));
         }
 
-        /// <summary>
-        /// Gets test settings name.
-        /// </summary>
-        public string SettingsName
-        {
-            get;
-            private set;
-        }
+        SettingsProvidersMap.TryGetValue(settingsName, out var settingsProvider);
+
+        return settingsProvider;
+    }
+
+}
+
+/// <summary>
+/// Hold data about the Test settings provider.
+/// </summary>
+internal class TestSettingsProviderMetadata : ISettingsProviderCapabilities
+{
+    /// <summary>
+    /// The constructor
+    /// </summary>
+    /// <param name="settingsName">Test settings name</param>
+    public TestSettingsProviderMetadata(string settingsName)
+    {
+        SettingsName = settingsName;
+    }
+
+    /// <summary>
+    /// Gets test settings name.
+    /// </summary>
+    public string SettingsName
+    {
+        get;
+        private set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Telemetry/MetricsCollection.cs b/src/Microsoft.TestPlatform.Common/Telemetry/MetricsCollection.cs
index 92185d2ed4..180d228995 100644
--- a/src/Microsoft.TestPlatform.Common/Telemetry/MetricsCollection.cs
+++ b/src/Microsoft.TestPlatform.Common/Telemetry/MetricsCollection.cs
@@ -1,49 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+
+/// <inheritdoc />
+/// <summary>
+/// This Class will collect Metrics.
+/// </summary>
+public class MetricsCollection : IMetricsCollection
 {
-    using System.Collections.Generic;
+    private readonly Dictionary<string, object> _metricDictionary;
+
+    /// <summary>
+    /// The Metrics Collection
+    /// </summary>
+    public MetricsCollection()
+    {
+        _metricDictionary = new Dictionary<string, object>();
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// Add The Metrics
+    /// </summary>
+    /// <param name="metric"></param>
+    /// <param name="value"></param>
+    public void Add(string metric, object value)
+    {
+        _metricDictionary[metric] = value;
+    }
+
+    /// <summary>
+    /// Returns the Metrics
+    /// </summary>
+    public IDictionary<string, object> Metrics => _metricDictionary;
 
-    /// <inheritdoc />
     /// <summary>
-    /// This Class will collect Metrics.
+    /// Clears the Metrics
     /// </summary>
-    public class MetricsCollection : IMetricsCollection
+    public void Clear()
     {
-        private Dictionary<string, object> metricDictionary;
-
-        /// <summary>
-        /// The Metrics Collection
-        /// </summary>
-        public MetricsCollection()
-        {
-            this.metricDictionary = new Dictionary<string, object>();
-        }
-
-        /// <summary>
-        /// Add The Metrics
-        /// </summary>
-        /// <param name="metric"></param>
-        /// <param name="value"></param>
-        public void Add(string metric, object value)
-        {
-            this.metricDictionary[metric] = value;
-        }
-
-        /// <summary>
-        /// Returns the Metrics
-        /// </summary>
-        public IDictionary<string, object> Metrics => this.metricDictionary;
-
-        /// <summary>
-        /// Clears the Metrics
-        /// </summary>
-        public void Clear()
-        {
-            this.metricDictionary?.Clear();
-        }
+        _metricDictionary?.Clear();
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Telemetry/NoOpMetricsCollection.cs b/src/Microsoft.TestPlatform.Common/Telemetry/NoOpMetricsCollection.cs
index adee1f4a25..47a8848b8f 100644
--- a/src/Microsoft.TestPlatform.Common/Telemetry/NoOpMetricsCollection.cs
+++ b/src/Microsoft.TestPlatform.Common/Telemetry/NoOpMetricsCollection.cs
@@ -1,30 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
 
+/// <summary>
+/// If Telemetry is opted out, this class will be initialized and will do No operation.
+/// </summary>
+public class NoOpMetricsCollection : IMetricsCollection
+{
     /// <summary>
-    /// If Telemetry is opted out, this class will be initialized and will do No operation.
+    /// Will do NO-OP
     /// </summary>
-    public class NoOpMetricsCollection : IMetricsCollection
+    /// <param name="message"></param>
+    /// <param name="value"></param>
+    public void Add(string message, object value)
     {
-        /// <summary>
-        /// Will do NO-OP
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="value"></param>
-        public void Add(string message, object value)
-        {
-            // No operation
-        }
-
-        /// <summary>
-        /// Will return empty list
-        /// </summary>
-        public IDictionary<string, object> Metrics => new Dictionary<string, object>();
+        // No operation
     }
+
+    /// <summary>
+    /// Will return empty list
+    /// </summary>
+    public IDictionary<string, object> Metrics => new Dictionary<string, object>();
 }
diff --git a/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs b/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs
index a0ef413692..a864b79b3b 100644
--- a/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs
+++ b/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs
@@ -1,126 +1,144 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry
+namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+
+/// <summary>
+/// The Telemetry data constants.
+/// </summary>
+internal static class TelemetryDataConstants
 {
-    /// <summary>
-    /// The Telemetry data constants.
-    /// </summary>
-    public static class TelemetryDataConstants
-    {
-        // ******************** Execution ***********************
-        public static string ParallelEnabledDuringExecution = "VS.TestRun.ParallelEnabled";
+    // ******************** General ***********************
+    public static readonly string DiscoveredExtensions = "VS.TestPlatform.DiscoveredExtensions";
+
+    // ******************** Execution ***********************
+    public static readonly string ParallelEnabledDuringExecution = "VS.TestRun.ParallelEnabled";
+
+    // Total number of tests ran under one test request
+    public static readonly string TotalTestsRun = "VS.TestRun.TotalTests";
+
+    // Total time taken to complete one test run request
+    public static readonly string TimeTakenInSecForRun = "VS.TestRun.TimeTakenInSec";
+
+    public static readonly string TestSettingsUsed = "VS.TestRun.IsTestSettingsUsed";
+
+    public static readonly string DisableAppDomain = "VS.TestRun.DisableAppDomain";
+
+    // All data related to legacy settings nodes will be prefixed with this.
+    public static readonly string LegacySettingPrefix = "VS.TestRun.LegacySettings";
+
+    public static readonly string DataCollectorsEnabled = "VS.TestRun.DataCollectorsEnabled";
+
+    public static readonly string InvokedDataCollectors = "VS.TestRun.InvokedDataCollectors";
+
+    public static readonly string DataCollectorsCorProfiler = "VS.TestPlatform.DataCollector.CorProfiler";
 
-        // Total number of tests ran under one test request
-        public static string TotalTestsRun = "VS.TestRun.TotalTests";
+    public static readonly string DataCollectorsCoreClrProfiler = "VS.TestPlatform.DataCollector.CoreClrProfiler";
 
-        // Total time taken to complete one test run request
-        public static string TimeTakenInSecForRun = "VS.TestRun.TimeTakenInSec";
+    public static readonly string RunState = "VS.TestRun.RunState";
 
-        public static string TestSettingsUsed = "VS.TestRun.IsTestSettingsUsed";
+    public static readonly string NumberOfSourcesSentForRun = "VS.TestRun.NumberOfSources";
 
-        public static string DisableAppDomain = "VS.TestRun.DisableAppDomain";
+    public static readonly string TargetDevice = "VS.TestRun.TargetDevice";
 
-        // All data related to legacy settings nodes will be prefixed with this.
-        public static string LegacySettingPrefix = "VS.TestRun.LegacySettings";
+    public static readonly string TargetFramework = "VS.TestRun.TargetFramework";
 
-        public static string DataCollectorsEnabled = "VS.TestRun.DataCollectorsEnabled";
+    public static readonly string TargetPlatform = "VS.TestRun.TargetPlatform";
 
-        internal const string DataCollectorsCorProfiler = "VS.TestPlatform.DataCollector.CorProfiler";
+    public static readonly string MaxCPUcount = "VS.TestRun.MaxCPUcount";
 
-        internal const string DataCollectorsCoreClrProfiler = "VS.TestPlatform.DataCollector.CoreClrProfiler";
+    public static readonly string TestPlatformVersion = "VS.TestRun.TestPlatformVersion";
 
-        public static string RunState = "VS.TestRun.RunState";
+    public static readonly string TargetOS = "VS.TestRun.TargetOS";
 
-        public static string NumberOfSourcesSentForRun = "VS.TestRun.NumberOfSources";
+    public static readonly string LoggerUsed = "VS.TestRun.LoggersUsed";
 
-        public static string TargetDevice = "VS.TestRun.TargetDevice";
+    public static readonly string CommandLineSwitches = "VS.TestRun.CommandLineSwitches";
 
-        public static string TargetFramework = "VS.TestRun.TargetFramework";
+    // Adapter name will get appended. eg:- VS.TestRun.TotalTestsRun.executor//cppunittestexecutor/v1
+    // In case of parallel it will be sum of all tests ran by an adapter in different execution process
+    public static readonly string TotalTestsRanByAdapter = "VS.TestRun.TotalTestsRun";
 
-        public static string TargetPlatform = "VS.TestRun.TargetPlatform";
+    // Adapter name will get appended. eg:- VS.TestRun.TimeTakenToRun.executor//cppunittestexecutor/v1
+    // In case of parallel it will be sum of all time taken by an adapter to run tests in different execution process
+    public static readonly string TimeTakenToRunTestsByAnAdapter = "VS.TestRun.TimeTakenToRun";
 
-        public static string MaxCPUcount = "VS.TestRun.MaxCPUcount";
+    // Reports details for MSTestV1. Reports just the count when TPv1 is used.
+    // Reports legacy when the legacy runner TMI / TPv0 is used.
+    // Adds an extension when an extension (tips) is used.
+    // eg:- VS.TestRun.TotalTestsRunByMSTestv1 - a unit test using TPv1 and MSTestV1
+    // eg:- VS.TestRun.TotalTestsRunByMSTestv1.legacy - a unit test using TPv0 and MSTestV1
+    // eg:- VS.TestRun.TotalTestsRunByMSTestv1.legacy.extension.codedui - a coded ui test using TPv0 and MSTestV1
+    // Counts in this metric are not subtracted from the TotalTestsRanByAdapter. This metrics just
+    // provides more insight into what was actually executed.
+    public static readonly string TotalTestsRunByMSTestv1 = "VS.TestRun.TotalTestsRunByMSTestv1";
 
-        public static string TestPlatformVersion = "VS.TestRun.TestPlatformVersion";
+    // Total number of adapter discovered on the machine.
+    public static readonly string NumberOfAdapterDiscoveredDuringExecution = "VS.TestRun.AdaptersDiscoveredCount";
 
-        public static string TargetOS = "VS.TestRun.TargetOS";
+    public static readonly string NumberOfAdapterUsedToRunTests = "VS.TestRun.AdaptersUsedCount";
 
-        public static string LoggerUsed = "VS.TestRun.LoggersUsed";
+    // It will be the sum of the times taken by all adapter to run tests.
+    // In case of parallel it can be more than total time taken to complete run request.
+    public static readonly string TimeTakenByAllAdaptersInSec = "VS.TestRun.TimeTakenByAllAdapters";
 
-        public static string CommandLineSwitches = "VS.TestRun.CommandLineSwitches";
+    // *********************Discovery****************************
+    public static readonly string TotalTestsDiscovered = "VS.TestDiscovery.TotalTests";
 
-        // Adapter name will get appended. eg:- VS.TestRun.TotalTestsRun.executor//cppunittestexecutor/v1
-        // In case of parallel it will be sum of all tests ran by an adapter in different execution process
-        public static string TotalTestsRanByAdapter = "VS.TestRun.TotalTestsRun";
+    public static readonly string ParallelEnabledDuringDiscovery = "VS.TestDiscovery.ParallelEnabled";
 
-        // Adapter name will get appended. eg:- VS.TestRun.TimeTakenToRun.executor//cppunittestexecutor/v1
-        // In case of parallel it will be sum of all time taken by an adapter to run tests in different execution process
-        public static string TimeTakenToRunTestsByAnAdapter = "VS.TestRun.TimeTakenToRun";
+    // All the times are in sec
+    public static readonly string TimeTakenInSecForDiscovery = "VS.TestDiscovery.TotalTimeTakenInSec";
 
-        // Reports details for MSTestV1. Reports just the count when TPv1 is used. 
-        // Reports legacy when the legacy runner TMI / TPv0 is used.
-        // Adds an extension when an extension (tips) is used. 
-        // eg:- VS.TestRun.TotalTestsRunByMSTestv1 - a unit test using TPv1 and MSTestV1
-        // eg:- VS.TestRun.TotalTestsRunByMSTestv1.legacy - a unit test using TPv0 and MSTestV1
-        // eg:- VS.TestRun.TotalTestsRunByMSTestv1.legacy.extension.codedui - a coded ui test using TPv0 and MSTestV1 
-        // Counts in this metric are not subtracted from the TotalTestsRanByAdapter. This metrics just 
-        // provides more insight into what was actually executed.
-        public static string TotalTestsRunByMSTestv1 = "VS.TestRun.TotalTestsRunByMSTestv1";
+    public static readonly string TimeTakenToLoadAdaptersInSec = "VS.TestDiscovery.TimeTakenToLoadAdaptersInSec";
 
-        // Total number of adapter discovered on the machine.
-        public static string NumberOfAdapterDiscoveredDuringExecution = "VS.TestRun.AdaptersDiscoveredCount";
+    // It will be the sum of the times taken by all adapter to discover tests.
+    public static readonly string TimeTakenInSecByAllAdapters = "VS.TestDiscovery.TimeTakenInSecByAllAdapters";
 
-        public static string NumberOfAdapterUsedToRunTests = "VS.TestRun.AdaptersUsedCount";
+    // Adapter name will get appended. eg:- VS.TestDiscovery.TimeTakenAdapter.executor//cppunittestexecutor/v1
+    public static readonly string TimeTakenToDiscoverTestsByAnAdapter = "VS.TestDiscovery.TimeTakenAdapter";
 
-        // It will be the sum of the times taken by all adapter to run tests.
-        // In case of parallel it can be more than total time taken to complete run request.
-        public static string TimeTakenByAllAdaptersInSec = "VS.TestRun.TimeTakenByAllAdapters";
+    // Adapter name will get appended. eg:- VS.TestDiscovery.TotalTestsDiscovered.executor//cppunittestexecutor/v1
+    public static readonly string TotalTestsByAdapter = "VS.TestDiscovery.TotalTestsDiscovered";
 
-        // *********************Discovery****************************
-        public static string TotalTestsDiscovered = "VS.TestDiscovery.TotalTests";
+    public static readonly string DiscoveryState = "VS.TestDiscovery.DiscoveryState";
 
-        public static string ParallelEnabledDuringDiscovery = "VS.TestDiscovery.ParallelEnabled";
+    public static readonly string NumberOfSourcesSentForDiscovery = "VS.TestDiscovery.NumberOfSources";
 
-        public static string ParallelEnabledDuringStartTestSession = "VS.StartTestSession.ParallelEnabled";
+    public static readonly string NumberOfAdapterDiscoveredDuringDiscovery = "VS.TestDiscovery.AdaptersDiscoveredCount";
 
-        // All the times are in sec
-        public static string TimeTakenInSecForDiscovery = "VS.TestDiscovery.TotalTimeTakenInSec";
+    public static readonly string NumberOfAdapterUsedToDiscoverTests = "VS.TestDiscovery.AdaptersUsedCount";
 
-        public static string TimeTakenToLoadAdaptersInSec = "VS.TestDiscovery.TimeTakenToLoadAdaptersInSec";
+    // *********************Attachments Processing****************************
+    public static readonly string NumberOfAttachmentsSentForProcessing = "VS.AttachmentsProcessing.InitialAttachmentsCount";
 
-        // It will be the sum of the times taken by all adapter to discover tests.
-        public static string TimeTakenInSecByAllAdapters = "VS.TestDiscovery.TimeTakenInSecByAllAdapters";
+    public static readonly string NumberOfAttachmentsAfterProcessing = "VS.AttachmentsProcessing.FinalAttachmentsCount";
 
-        // Adapter name will get appended. eg:- VS.TestDiscovery.TimeTakenAdapter.executor//cppunittestexecutor/v1
-        public static string TimeTakenToDiscoverTestsByAnAdapter = "VS.TestDiscovery.TimeTakenAdapter";
+    public static readonly string TimeTakenInSecForAttachmentsProcessing = "VS.AttachmentsProcessing.TotalTimeTakenInSec";
 
-        // Adapter name will get appended. eg:- VS.TestDiscovery.TotalTestsDiscovered.executor//cppunittestexecutor/v1
-        public static string TotalTestsByAdapter = "VS.TestDiscovery.TotalTestsDiscovered";
+    public static readonly string AttachmentsProcessingState = "VS.AttachmentsProcessing.State";
 
-        public static string DiscoveryState = "VS.TestDiscovery.DiscoveryState";
+    // *********************Test Sessions****************************
+    public static readonly string ParallelEnabledDuringStartTestSession = "VS.TestSession.ParallelEnabled";
 
-        public static string NumberOfSourcesSentForDiscovery = "VS.TestDiscovery.NumberOfSources";
+    public static readonly string TestSessionId = "VS.TestSession.Id";
 
-        public static string NumberOfAdapterDiscoveredDuringDiscovery = "VS.TestDiscovery.AdaptersDiscoveredCount";
+    public static readonly string TestSessionSpawnedTesthostCount = "VS.TestSession.SpawnedTesthostCount";
 
-        public static string NumberOfAdapterUsedToDiscoverTests = "VS.TestDiscovery.AdaptersUsedCount";
+    public static readonly string TestSessionTesthostSpawnTimeInSec = "VS.TestSession.TesthostSpawnTimeInSec";
 
-        // *********************Attachments Processing****************************
-        public static string NumberOfAttachmentsSentForProcessing = "VS.AttachmentsProcessing.InitialAttachmentsCount";
+    public static readonly string TestSessionState = "VS.TestSession.State";
 
-        public static string NumberOfAttachmentsAfterProcessing = "VS.AttachmentsProcessing.FinalAttachmentsCount";
+    public static readonly string TestSessionTotalSessionTimeInSec = "VS.TestSession.TotalSessionTimeInSec";
 
-        public static string TimeTakenInSecForAttachmentsProcessing = "VS.AttachmentsProcessing.TotalTimeTakenInSec";
-        public static string AttachmentsProcessingState = "VS.AttachmentsProcessing.State";
+    // **************Events Name **********************************
+    public static readonly string TestDiscoveryCompleteEvent = "vs/testplatform/testdiscoverysession";
 
-        // **************Events Name **********************************
-        public static string TestDiscoveryCompleteEvent = "vs/testplatform/testdiscoverysession";
+    public static readonly string TestExecutionCompleteEvent = "vs/testplatform/testrunsession";
 
-        public static string TestExecutionCompleteEvent = "vs/testplatform/testrunsession";
+    public static readonly string TestAttachmentsProcessingCompleteEvent = "vs/testplatform/testattachmentsprocessingsession";
 
-        public static string TestAttachmentsProcessingCompleteEvent = "vs/testplatform/testattachmentsprocessingsession";
+    public static readonly string StartTestSessionCompleteEvent = "vs/testplatform/starttestsession";
 
-        public static string StartTestSessionCompleteEvent = "vs/testplatform/starttestsession";
-    }
+    public static readonly string StopTestSessionCompleteEvent = "vs/testplatform/stoptestsession";
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
index 504776695b..f46c3e3735 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyProperties.cs
@@ -1,73 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System;
-    using System.IO;
-    using System.Reflection.PortableExecutable;
+using System;
+using System.IO;
+using System.Reflection.PortableExecutable;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
-    public class AssemblyProperties : IAssemblyProperties
+public class AssemblyProperties : IAssemblyProperties
+{
+    private readonly IFileHelper _fileHelper;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AssemblyProperties"/> class.
+    /// </summary>
+    public AssemblyProperties() : this(new FileHelper())
     {
-        private readonly IFileHelper fileHelper;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssemblyProperties"/> class.
-        /// </summary>
-        public AssemblyProperties() : this(new FileHelper())
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AssemblyProperties"/> class.
+    /// </summary>
+    /// <param name="fileHelper">File helper.</param>
+    public AssemblyProperties(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssemblyProperties"/> class.
-        /// </summary>
-        /// <param name="fileHelper">File helper.</param>
-        public AssemblyProperties(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
+    /// <summary>
+    /// Determines assembly type from file.
+    /// </summary>
+    public AssemblyType GetAssemblyType(string filePath)
+    {
+        var assemblyType = AssemblyType.None;
 
-        /// <summary>
-        /// Determines assembly type from file.
-        /// </summary>
-        public AssemblyType GetAssemblyType(string filePath)
+        try
         {
-            var assemblyType = AssemblyType.None;
-
-            try
-            {
-                using (var fileStream = this.fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                using (var peReader = new PEReader(fileStream))
-                {
-                    // Resources for PEReader:
-                    // 1. https://msdn.microsoft.com/library/windows/desktop/ms680547(v=vs.85).aspx?id=19509
-                    // 2. https://github.com/dotnet/corefx/tree/master/src/System.Reflection.Metadata
+            using var fileStream = _fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+            using var peReader = new PEReader(fileStream);
+            // Resources for PEReader:
+            // 1. https://msdn.microsoft.com/library/windows/desktop/ms680547(v=vs.85).aspx?id=19509
+            // 2. https://github.com/dotnet/runtime/tree/master/src/libraries/System.Reflection.Metadata
 
-                    var peHeaders = peReader.PEHeaders;
-                    var corHeader = peHeaders.CorHeader;
-                    var corHeaderStartOffset = peHeaders.CorHeaderStartOffset;
+            var peHeaders = peReader.PEHeaders;
+            var corHeader = peHeaders.CorHeader;
+            var corHeaderStartOffset = peHeaders.CorHeaderStartOffset;
 
-                    assemblyType = (corHeader != null && corHeaderStartOffset >= 0) ?
-                        AssemblyType.Managed :
-                        AssemblyType.Native;
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Warning("PEReaderHelper.GetAssemblyType: failed to determine assembly type: {0} for assembly: {1}", ex, filePath);
-            }
+            assemblyType = (corHeader != null && corHeaderStartOffset >= 0) ?
+                AssemblyType.Managed :
+                AssemblyType.Native;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Warning("PEReaderHelper.GetAssemblyType: failed to determine assembly type: {0} for assembly: {1}", ex, filePath);
+        }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("PEReaderHelper.GetAssemblyType: Determined assemblyType:'{0}' for source: '{1}'", assemblyType, filePath);
-            }
+        EqtTrace.Info("PEReaderHelper.GetAssemblyType: Determined assemblyType:'{0}' for source: '{1}'", assemblyType, filePath);
 
-            return assemblyType;
-        }
+        return assemblyType;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyResolver.cs b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyResolver.cs
index 1f39c51c22..6682231730 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyResolver.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyResolver.cs
@@ -1,159 +1,164 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+internal class AssemblyResolver : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    internal class AssemblyResolver : IDisposable
+    /// <summary>
+    /// The directories to look for assemblies to resolve.
+    /// </summary>
+    private readonly HashSet<string> _searchDirectories;
+
+    /// <summary>
+    /// Dictionary of Assemblies discovered to date. Must be locked as it may
+    /// be accessed in a multi-threaded context.
+    /// </summary>
+    private readonly Dictionary<string, Assembly?> _resolvedAssemblies = new();
+
+    /// <summary>
+    /// Specifies whether the resolver is disposed or not
+    /// </summary>
+    private bool _isDisposed;
+    private Stack<string>? _currentlyResolvingResources;
+
+    /// <summary>
+    /// Assembly resolver for platform
+    /// </summary>
+    private readonly IAssemblyResolver _platformAssemblyResolver;
+
+    private readonly IAssemblyLoadContext _platformAssemblyLoadContext;
+
+    private static readonly string[] SupportedFileExtensions = [".dll", ".exe"];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AssemblyResolver"/> class.
+    /// </summary>
+    /// <param name="directories"> The search directories. </param>
+    [System.Security.SecurityCritical]
+    public AssemblyResolver(IEnumerable<string> directories)
     {
-        /// <summary>
-        /// The directories to look for assemblies to resolve.
-        /// </summary>
-        private HashSet<string> searchDirectories;
-
-        /// <summary>
-        /// Dictionary of Assemblies discovered to date. Must be locked as it may
-        /// be accessed in a multi-threaded context.
-        /// </summary>
-        private Dictionary<string, Assembly> resolvedAssemblies;
-
-        /// <summary>
-        /// Specifies whether the resolver is disposed or not
-        /// </summary>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Assembly resolver for platform
-        /// </summary>
-        private IAssemblyResolver platformAssemblyResolver;
-
-        private IAssemblyLoadContext platformAssemblyLoadContext;
-
-        private static readonly string[] SupportedFileExtensions = { ".dll", ".exe" };
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssemblyResolver"/> class.
-        /// </summary>
-        /// <param name="directories"> The search directories. </param>
-        [System.Security.SecurityCritical]
-        public AssemblyResolver(IEnumerable<string> directories)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"AssemblyResolver.ctor: Creating AssemblyResolver with searchDirectories {string.Join(",", directories)}");
-            }
+        EqtTrace.Info($"AssemblyResolver.ctor: Creating AssemblyResolver with searchDirectories {string.Join(",", directories)}");
 
-            this.resolvedAssemblies = new Dictionary<string, Assembly>();
+        _searchDirectories = directories == null || !directories.Any() ? new HashSet<string>() : new HashSet<string>(directories);
 
-            if (directories == null || !directories.Any())
-            {
-                this.searchDirectories = new HashSet<string>();
-            }
-            else
-            {
-                this.searchDirectories = new HashSet<string>(directories);
-            }
+        _platformAssemblyResolver = new PlatformAssemblyResolver();
+        _platformAssemblyLoadContext = new PlatformAssemblyLoadContext();
+
+        _platformAssemblyResolver.AssemblyResolve += OnResolve;
+    }
 
-            this.platformAssemblyResolver = new PlatformAssemblyResolver();
-            this.platformAssemblyLoadContext = new PlatformAssemblyLoadContext();
+    /// <summary>
+    /// Set the directories from which assemblies should be searched
+    /// </summary>
+    /// <param name="directories"> The search directories. </param>
+    [System.Security.SecurityCritical]
+    internal void AddSearchDirectories(IEnumerable<string> directories)
+    {
+        EqtTrace.Info($"AssemblyResolver.AddSearchDirectories: Adding more searchDirectories {string.Join(",", directories)}");
 
-            this.platformAssemblyResolver.AssemblyResolve += this.OnResolve;
+        foreach (var directory in directories)
+        {
+            _searchDirectories.Add(directory);
         }
+    }
 
-        /// <summary>
-        /// Set the directories from which assemblies should be searched
-        /// </summary>
-        /// <param name="directories"> The search directories. </param>
-        [System.Security.SecurityCritical]
-        internal void AddSearchDirectories(IEnumerable<string> directories)
+    /// <summary>
+    /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="Assembly"/>.
+    /// </returns>
+    private Assembly? OnResolve(object? sender, AssemblyResolveEventArgs? args)
+    {
+        if (StringUtils.IsNullOrEmpty(args?.Name))
         {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"AssemblyResolver.AddSearchDirectories: Adding more searchDirectories {string.Join(",", directories)}");
-            }
+            Debug.Fail("AssemblyResolver.OnResolve: args.Name is null or empty.");
+            return null;
+        }
 
-            foreach (var directory in directories)
-            {
-                this.searchDirectories.Add(directory);
-            }
+        if (_searchDirectories == null || _searchDirectories.Count == 0)
+        {
+            EqtTrace.Info("AssemblyResolver.OnResolve: {0}: There are no search directories, returning.", args.Name);
+            return null;
         }
 
-        /// <summary>
-        /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="Assembly"/>.
-        /// </returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
-        private Assembly OnResolve(object sender, AssemblyResolveEventArgs args)
+        EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Resolving assembly.", args.Name);
+
+        // args.Name is like: "Microsoft.VisualStudio.TestTools.Common, Version=[VersionMajor].0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a".
+        lock (_resolvedAssemblies)
         {
-            if (string.IsNullOrEmpty(args?.Name))
+            if (_resolvedAssemblies.TryGetValue(args.Name, out var assembly))
             {
-                Debug.Fail("AssemblyResolver.OnResolve: args.Name is null or empty.");
-                return null;
+                EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Resolved from cache.", args.Name);
+                return assembly;
             }
 
-            if (this.searchDirectories == null || this.searchDirectories.Count == 0)
+            AssemblyName? requestedName = null;
+            try
+            {
+                // Can throw ArgumentException, FileLoadException if arg is empty/wrong format, etc. Should not return null.
+                requestedName = new AssemblyName(args.Name);
+            }
+            catch (Exception ex)
             {
-                EqtTrace.Info("AssemblyResolver.OnResolve: {0}: There are no search directories, returning.", args.Name);
+                EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to create assemblyName. Reason:{1} ", args.Name, ex);
+
+                _resolvedAssemblies[args.Name] = null;
                 return null;
             }
 
-            EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Resolving assembly.", args.Name);
+            TPDebug.Assert(requestedName != null && !requestedName.Name.IsNullOrEmpty(), "AssemblyResolver.OnResolve: requested is null or name is empty!");
 
-            // args.Name is like: "Microsoft.VisualStudio.TestTools.Common, Version=[VersionMajor].0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a".
-            lock (this.resolvedAssemblies)
+            var isResource = requestedName.Name.EndsWith(".resources");
+            foreach (var dir in _searchDirectories)
             {
-                if (this.resolvedAssemblies.TryGetValue(args.Name, out var assembly))
+                if (dir.IsNullOrEmpty())
                 {
-                    EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Resolved from cache.", args.Name);
-                    return assembly;
+                    continue;
                 }
 
-                AssemblyName requestedName = null;
-                try
-                {
-                    // Can throw ArgumentException, FileLoadException if arg is empty/wrong format, etc. Should not return null.
-                    requestedName = new AssemblyName(args.Name);
-                }
-                catch (Exception ex)
-                {
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to create assemblyName. Reason:{1} ", args.Name, ex);
-                    }
+                EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Searching in: '{1}'.", args.Name, dir);
 
-                    this.resolvedAssemblies[args.Name] = null;
-                    return null;
-                }
-
-                Debug.Assert(requestedName != null && !string.IsNullOrEmpty(requestedName.Name), "AssemblyResolver.OnResolve: requested is null or name is empty!");
-
-                foreach (var dir in this.searchDirectories)
+                foreach (var extension in SupportedFileExtensions)
                 {
-                    if (string.IsNullOrEmpty(dir))
-                    {
-                        continue;
-                    }
-
-                    EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Searching in: '{1}'.", args.Name, dir);
-
-                    foreach (var extension in SupportedFileExtensions)
+                    var assemblyPath = Path.Combine(dir, requestedName.Name + extension);
+                    try
                     {
-                        var assemblyPath = Path.Combine(dir, requestedName.Name + extension);
+                        bool pushed = false;
                         try
                         {
+                            if (isResource)
+                            {
+                                // Check for recursive resource lookup.
+                                // This can happen when we are on non-english locale, and we try to load mscorlib.resources
+                                // (or potentially some other resources). This will trigger a new Resolve and call the method
+                                // we are currently in. If then some code in this Resolve method (like File.Exists) will again
+                                // try to access mscorlib.resources it will end up recursing forever.
+
+                                if (_currentlyResolvingResources != null && _currentlyResolvingResources.Count > 0 && _currentlyResolvingResources.Contains(assemblyPath))
+                                {
+                                    EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Assembly is searching for itself recursively: '{1}', returning as not found.", args.Name, assemblyPath);
+                                    _resolvedAssemblies[args.Name] = null;
+                                    return null;
+                                }
+
+                                _currentlyResolvingResources ??= new Stack<string>(4);
+                                _currentlyResolvingResources.Push(assemblyPath);
+                                pushed = true;
+                            }
+
                             if (!File.Exists(assemblyPath))
                             {
                                 EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Assembly path does not exist: '{1}', returning.", args.Name, assemblyPath);
@@ -161,116 +166,116 @@ private Assembly OnResolve(object sender, AssemblyResolveEventArgs args)
                                 continue;
                             }
 
-                            AssemblyName foundName = this.platformAssemblyLoadContext.GetAssemblyNameFromPath(assemblyPath);
+                            AssemblyName foundName = _platformAssemblyLoadContext.GetAssemblyNameFromPath(assemblyPath);
 
-                            if (!this.RequestedAssemblyNameMatchesFound(requestedName, foundName))
+                            if (!RequestedAssemblyNameMatchesFound(requestedName, foundName))
                             {
                                 EqtTrace.Info("AssemblyResolver.OnResolve: {0}: File exists but version/public key is wrong. Try next extension.", args.Name);
                                 continue;   // File exists but version/public key is wrong. Try next extension.
                             }
 
                             EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Loading assembly '{1}'.", args.Name, assemblyPath);
-                            
-                            assembly = this.platformAssemblyLoadContext.LoadAssemblyFromPath(assemblyPath);
-                            this.resolvedAssemblies[args.Name] = assembly;
+
+                            assembly = _platformAssemblyLoadContext.LoadAssemblyFromPath(assemblyPath);
+                            _resolvedAssemblies[args.Name] = assembly;
 
                             EqtTrace.Info("AssemblyResolver.OnResolve: Resolved assembly: {0}, from path: {1}", args.Name, assemblyPath);
 
                             return assembly;
                         }
-                        catch (FileLoadException ex)
+                        finally
                         {
-                            EqtTrace.Error("AssemblyResolver.OnResolve: {0}: Failed to load assembly. Reason:{1} ", args.Name, ex);
+                            if (isResource && pushed)
+                            {
+                                _currentlyResolvingResources?.Pop();
+                            }
 
-                            // Re-throw FileLoadException, because this exception means that the assembly
-                            // was found, but could not be loaded. This will allow us to report a more
-                            // specific error message to the user for things like access denied.
-                            throw;
-                        }
-                        catch (Exception ex)
-                        {
-                            // For all other exceptions, try the next extension.
-                            EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to load assembly. Reason:{1} ", args.Name, ex);
                         }
                     }
-                }
+                    catch (FileLoadException ex)
+                    {
+                        EqtTrace.Error("AssemblyResolver.OnResolve: {0}: Failed to load assembly. Reason:{1} ", args.Name, ex);
 
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to load assembly.", args.Name);
+                        // Re-throw FileLoadException, because this exception means that the assembly
+                        // was found, but could not be loaded. This will allow us to report a more
+                        // specific error message to the user for things like access denied.
+                        throw;
+                    }
+                    catch (Exception ex)
+                    {
+                        // For all other exceptions, try the next extension.
+                        EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to load assembly. Reason:{1} ", args.Name, ex);
+                    }
                 }
-
-                this.resolvedAssemblies[args.Name] = null;
-                return null;
             }
+
+            EqtTrace.Info("AssemblyResolver.OnResolve: {0}: Failed to load assembly.", args.Name);
+
+            _resolvedAssemblies[args.Name] = null;
+            return null;
         }
+    }
+
+    /// <summary>
+    /// Verifies that found assembly name matches requested to avoid security issues.
+    /// Looks only at PublicKeyToken and Version, empty matches anything.
+    /// VSWhidbey 415774.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    private static bool RequestedAssemblyNameMatchesFound(AssemblyName requestedName, AssemblyName foundName)
+    {
+        TPDebug.Assert(requestedName != null);
+        TPDebug.Assert(foundName != null);
 
-        /// <summary>
-        /// Verifies that found assembly name matches requested to avoid security issues.
-        /// Looks only at PublicKeyToken and Version, empty matches anything.
-        /// VSWhidbey 415774.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private bool RequestedAssemblyNameMatchesFound(AssemblyName requestedName, AssemblyName foundName)
+        var requestedPublicKey = requestedName.GetPublicKeyToken();
+        if (requestedPublicKey != null)
         {
-            Debug.Assert(requestedName != null);
-            Debug.Assert(foundName != null);
+            var foundPublicKey = foundName.GetPublicKeyToken();
+            if (foundPublicKey == null)
+            {
+                return false;
+            }
 
-            var requestedPublicKey = requestedName.GetPublicKeyToken();
-            if (requestedPublicKey != null)
+            for (var index = 0; index < requestedPublicKey.Length; ++index)
             {
-                var foundPublicKey = foundName.GetPublicKeyToken();
-                if (foundPublicKey == null)
+                if (requestedPublicKey[index] != foundPublicKey[index])
                 {
                     return false;
                 }
-
-                for (var index = 0; index < requestedPublicKey.Length; ++index)
-                {
-                    if (requestedPublicKey[index] != foundPublicKey[index])
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            if (requestedName.Version != null)
-            {
-                return requestedName.Version.Equals(foundName.Version);
             }
-
-            return true;
         }
 
-        ~AssemblyResolver()
-        {
-            this.Dispose(false);
-        }
+        return requestedName.Version == null || requestedName.Version.Equals(foundName.Version);
+    }
 
-        public void Dispose()
-        {
-            this.Dispose(true);
+    ~AssemblyResolver()
+    {
+        Dispose(false);
+    }
 
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
+    public void Dispose()
+    {
+        Dispose(true);
+
+        // Use SupressFinalize in case a subclass
+        // of this type implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-        [System.Security.SecurityCritical]
-        protected virtual void Dispose(bool disposing)
+    [System.Security.SecurityCritical]
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_isDisposed)
         {
-            if (!this.isDisposed)
+            if (disposing)
             {
-                if (disposing)
-                {
-                    this.platformAssemblyResolver.AssemblyResolve -= this.OnResolve;
-                    this.platformAssemblyResolver.Dispose();
-                }
-
-                this.isDisposed = true;
+                _platformAssemblyResolver.AssemblyResolve -= OnResolve;
+                _platformAssemblyResolver.Dispose();
             }
+
+            _isDisposed = true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyType.cs b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyType.cs
index 045c6177bb..75892e3aba 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/AssemblyType.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/AssemblyType.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+public enum AssemblyType
 {
-    public enum AssemblyType
-    {
-        None,
-        Native,
-        Managed
-    }
+    None,
+    Native,
+    Managed
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/CancellationTokenExtensions.cs b/src/Microsoft.TestPlatform.Common/Utilities/CancellationTokenExtensions.cs
index a09eefbdf0..5c5f1df4aa 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/CancellationTokenExtensions.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/CancellationTokenExtensions.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    public static class CancellationTokenExtensions
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+public static class CancellationTokenExtensions
+{
+    /// <summary>
+    /// Extension method used to throw TestPlatformException in case operation is canceled.
+    /// </summary>
+    /// <param name="token">CancellationToken on which cancel is requested</param>
+    public static void ThrowTestPlatformExceptionIfCancellationRequested(this CancellationToken token)
     {
-        /// <summary>
-        /// Extension method used to throw TestPlatformException in case operation is canceled.
-        /// </summary>
-        /// <param name="token">CancellationToken on which cancel is requested</param>
-        public static void ThrowTestPlatformExceptionIfCancellationRequested(this CancellationToken token)
+        if (token.IsCancellationRequested)
         {
-            if (token.IsCancellationRequested)
-            {
-                throw new TestPlatformException(Resources.Resources.CancellationRequested);
-            }
+            throw new TestPlatformException(Resources.Resources.CancellationRequested);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs
index 2fda16a13d..7ed96e95b1 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs
@@ -1,53 +1,52 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System;
-    using System.Text;
+using System;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
+/// <summary>
+/// Exception utilities.
+/// </summary>
+public class ExceptionUtilities
+{
     /// <summary>
-    /// Exception utilities.
+    /// Returns an exception message with all inner exceptions messages.
     /// </summary>
-    public class ExceptionUtilities
+    /// <param name="exception"> The exception. </param>
+    /// <returns> The formatted string message of the exception. </returns>
+    public static string GetExceptionMessage(Exception? exception)
     {
-        /// <summary>
-        /// Returns an exception message with all inner exceptions messages.
-        /// </summary>
-        /// <param name="exception"> The exception. </param>
-        /// <returns> The formatted string message of the exception. </returns>
-        public static string GetExceptionMessage(Exception exception)
+        if (exception == null)
         {
-            if (exception == null)
-            {
-                return string.Empty;
-            }
-
-            var exceptionString = new StringBuilder(exception.Message);
-            AppendStackTrace(exceptionString, exception);
+            return string.Empty;
+        }
 
-            var inner = exception.InnerException;
-            while (inner != null)
-            {
-                exceptionString
-                    .AppendLine()
-                    .Append(Resources.Resources.InnerException).Append(" ").AppendLine(inner.Message);
-                AppendStackTrace(exceptionString, inner);
-                inner = inner.InnerException;
-            }
+        var exceptionString = new StringBuilder(exception.Message);
+        AppendStackTrace(exceptionString, exception);
 
-            return exceptionString.ToString();
+        var inner = exception.InnerException;
+        while (inner != null)
+        {
+            exceptionString
+                .AppendLine()
+                .Append(Resources.Resources.InnerException).Append(' ').AppendLine(inner.Message);
+            AppendStackTrace(exceptionString, inner);
+            inner = inner.InnerException;
         }
 
-        private static void AppendStackTrace(StringBuilder stringBuilder, Exception exception)
+        return exceptionString.ToString();
+    }
+
+    private static void AppendStackTrace(StringBuilder stringBuilder, Exception exception)
+    {
+        if (!exception.StackTrace.IsNullOrEmpty())
         {
-            if (!string.IsNullOrEmpty(exception.StackTrace))
-            {
-                stringBuilder
-                    .AppendLine()
-                    .AppendLine(Resources.Resources.StackTrace)
-                    .AppendLine(exception.StackTrace);
-            }
+            stringBuilder
+                .AppendLine()
+                .AppendLine(Resources.Resources.StackTrace)
+                .AppendLine(exception.StackTrace);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs
index e909811f5f..89c9c66ab6 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs
@@ -1,337 +1,231 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+/// <summary>
+/// Provides helper to configure run settings for Fakes. Works even when Fakes are not installed on the machine.
+/// </summary>
+public static class FakesUtilities
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
-    using System.Xml;
-    using System.Xml.XPath;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+    private const string ConfiguratorAssemblyQualifiedName = "Microsoft.VisualStudio.TestPlatform.Fakes.FakesDataCollectorConfiguration";
 
-    /// <summary>
-    /// Provides helper to configure run settings for Fakes. Works even when Fakes are not installed on the machine.
-    /// </summary>
-    public static class FakesUtilities
-    {
-        private const string ConfiguratorAssemblyQualifiedName = "Microsoft.VisualStudio.TestPlatform.Fakes.FakesDataCollectorConfiguration";
+    private const string NetFrameworkConfiguratorMethodName = "GetDataCollectorSettingsOrDefault";
 
-        private const string NetFrameworkConfiguratorMethodName = "GetDataCollectorSettingsOrDefault";
+    private const string CrossPlatformConfiguratorMethodName = "GetCrossPlatformDataCollectorSettings";
 
-        private const string CrossPlatformConfiguratorMethodName = "GetCrossPlatformDataCollectorSettings";
+    // Must be kept in sync with version being generated by VSUnitTesting
+    private const string AssemblyVersion = ExternalAssemblyVersions.MicrosoftFakesAssemblyVersion;
+    private const string FakesConfiguratorAssembly = "Microsoft.VisualStudio.TestPlatform.Fakes, Version=" + AssemblyVersion + ", Culture=neutral";
 
-        // Must be kept in sync with version being generated by VSUnitTesting
-        private const string AssemblyVersion = ExternalAssemblyVersions.MicrosoftFakesAssemblyVersion;
-        private const string FakesConfiguratorAssembly = "Microsoft.VisualStudio.TestPlatform.Fakes, Version=" + AssemblyVersion + ", Culture=neutral";
+    /// <summary>
+    /// Dynamically compute the Fakes data collector settings, given a set of test assemblies
+    /// </summary>
+    /// <param name="sources">test sources</param>
+    /// <param name="runSettingsXml">runsettings</param>
+    /// <returns>updated runsettings for fakes</returns>
+    public static string GenerateFakesSettingsForRunConfiguration(string[] sources, string runSettingsXml)
+    {
+        ValidateArg.NotNull(sources, nameof(sources));
+        ValidateArg.NotNull(runSettingsXml, nameof(runSettingsXml));
 
-        /// <summary>
-        /// Dynamically compute the Fakes data collector settings, given a set of test assemblies
-        /// </summary>
-        /// <param name="sources">test sources</param>
-        /// <param name="runSettingsXml">runsettings</param>
-        /// <returns>updated runsettings for fakes</returns>
-        public static string GenerateFakesSettingsForRunConfiguration(string[] sources, string runSettingsXml)
+        var doc = new XmlDocument();
+        using (var xmlReader = XmlReader.Create(
+                   new StringReader(runSettingsXml),
+                   new XmlReaderSettings() { CloseInput = true }))
         {
-            if (sources == null)
-            {
-                throw new ArgumentNullException(nameof(sources));
-            }
-
-            if (runSettingsXml == null)
-            {
-                throw new ArgumentNullException(nameof(runSettingsXml));
-            }
-
-            var doc = new XmlDocument();
-            using (var xmlReader = XmlReader.Create(
-                new StringReader(runSettingsXml),
-                new XmlReaderSettings() { CloseInput = true }))
-            {
-                doc.Load(xmlReader);
-            }
-
-            var frameworkVersion = GetFramework(runSettingsXml);
-            if (frameworkVersion == null)
-            {
-                return runSettingsXml;
-            }
+            doc.Load(xmlReader);
+        }
 
-            return TryAddFakesDataCollectorSettings(doc, sources, (FrameworkVersion)frameworkVersion) 
+        var frameworkVersion = GetFramework(runSettingsXml);
+        return frameworkVersion == null
+            ? runSettingsXml
+            : TryAddFakesDataCollectorSettings(doc, sources, (FrameworkVersion)frameworkVersion)
                 ? doc.OuterXml
                 : runSettingsXml;
-        }
-
-        /// <summary>
-        /// returns FrameworkVersion contained in the runsettingsXML
-        /// </summary>
-        /// <param name="runSettingsXml"></param>
-        /// <returns></returns>
-        private static FrameworkVersion? GetFramework(string runSettingsXml)
-        {
-            // We assume that only .NET Core, .NET Standard, or .NET Framework projects can have fakes.
-            var targetFramework = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettingsXml)?.TargetFramework;
-
-            if (targetFramework == null)
-            {
-                return null;
-            }
+    }
 
-            // Since there are no FrameworkVersion values for .Net Core 2.0 +, we check TargetFramework instead
-            // and default to FrameworkCore10 for .Net Core 
-            if (targetFramework.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                targetFramework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                targetFramework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0)
-            {
-                return FrameworkVersion.FrameworkCore10;
-            }
+    /// <summary>
+    /// returns FrameworkVersion contained in the runsettingsXML
+    /// </summary>
+    /// <param name="runSettingsXml"></param>
+    /// <returns></returns>
+    private static FrameworkVersion? GetFramework(string runSettingsXml)
+    {
+        // We assume that only .NET Core, .NET Standard, or .NET Framework projects can have fakes.
+        var targetFramework = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettingsXml)?.TargetFramework;
 
-            // Since the Datacollector is separated on the NetFramework/NetCore line, any value of NETFramework 
-            // can be passed along to the fakes data collector configuration creator. 
-            // We default to Framework40 to preserve back compat
-            return FrameworkVersion.Framework40;
+        if (targetFramework == null)
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Tries to embed the Fakes data collector settings for the given run settings.
-        /// </summary>
-        /// <param name="runSettings">runsettings</param>
-        /// <param name="sources">test sources</param>
-        /// <returns>true if runSettings was modified; false otherwise.</returns>
-        private static bool TryAddFakesDataCollectorSettings(
-            XmlDocument runSettings,
-            IEnumerable<string> sources,
-            FrameworkVersion framework)
+        // Since there are no FrameworkVersion values for .Net Core 2.0 +, we check TargetFramework instead
+        // and default to FrameworkCore10 for .Net Core
+        if (targetFramework.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0 ||
+            targetFramework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0 ||
+            targetFramework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0)
         {
-            // A new Fakes Congigurator API makes the decision to add the right datacollector uri to the configuration
-            // There now exist two data collector URIs to support two different scenarios. The new scenario involves 
-            // using the CLRIE profiler, and the old involves using the Intellitrace profiler (which isn't supported in 
-            // .NET Core scenarios). The old API still exists for fallback measures. 
-
-            var crossPlatformConfigurator = TryGetFakesCrossPlatformDataCollectorConfigurator();
-            if (crossPlatformConfigurator != null)
-            {
-                var sourceTFMMap = CreateDictionary(sources, framework);
-                var fakesSettings = crossPlatformConfigurator(sourceTFMMap);
-
-                // if no fakes, return settings unchanged
-                if (fakesSettings == null)
-                {
-                    return false;
-                }
-
-                InsertOrReplaceFakesDataCollectorNode(runSettings, fakesSettings);
-                return true;
-            }
-
-            return AddFallbackFakesSettings(runSettings, sources, framework);
+            return FrameworkVersion.FrameworkCore10;
         }
 
-        internal static void InsertOrReplaceFakesDataCollectorNode(XmlDocument runSettings, DataCollectorSettings settings)
+        // Since the Datacollector is separated on the NetFramework/NetCore line, any value of NETFramework
+        // can be passed along to the fakes data collector configuration creator.
+        // We default to Framework40 to preserve back compat
+        return FrameworkVersion.Framework40;
+    }
+
+    /// <summary>
+    /// Tries to embed the Fakes data collector settings for the given run settings.
+    /// </summary>
+    /// <param name="runSettings">runsettings</param>
+    /// <param name="sources">test sources</param>
+    /// <param name="framework">version of the framework</param>
+    /// <returns>true if runSettings was modified; false otherwise.</returns>
+    private static bool TryAddFakesDataCollectorSettings(
+        XmlDocument runSettings,
+        IEnumerable<string> sources,
+        FrameworkVersion framework)
+    {
+        // Only cross-platform (v2) Fakes is supported. Fallback to v1 is removed.
+        var crossPlatformConfigurator = TryGetFakesCrossPlatformDataCollectorConfigurator();
+        if (crossPlatformConfigurator != null)
         {
-            // override current settings
-            var navigator = runSettings.CreateNavigator();
-            var nodes = navigator.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+            var sourceTfmMap = CreateDictionary(sources, framework);
+            var fakesSettings = crossPlatformConfigurator(sourceTfmMap);
 
-            foreach (XPathNavigator dataCollectorNavigator in nodes)
+            // if no fakes, return settings unchanged
+            if (fakesSettings == null)
             {
-                var uri = dataCollectorNavigator.GetAttribute("uri", string.Empty);
-                // We assume that only one uri can exist in a given runsettings
-                if (string.Equals(FakesMetadata.DataCollectorUriV1, uri, StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(FakesMetadata.DataCollectorUriV2, uri, StringComparison.OrdinalIgnoreCase))
-                {
-                    dataCollectorNavigator.ReplaceSelf(settings.ToXml().CreateNavigator());
-                    return;
-                }
+                return false;
             }
 
-            // insert new node
-            XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator(), settings);
+            InsertOrReplaceFakesDataCollectorNode(runSettings, fakesSettings);
+            return true;
         }
 
-        private static IDictionary<string, FrameworkVersion> CreateDictionary(IEnumerable<string> sources, FrameworkVersion framework)
-        {
-            var dict = new Dictionary<string, FrameworkVersion>();
-            foreach(var source in sources)
-            {
-                if (!dict.ContainsKey(source))
-                {
-                    dict.Add(source, framework);
-                }
-            }
+        // Fakes v1 fallback support removed.
+        return false;
+    }
 
-            return dict;
-        }
+    internal static void InsertOrReplaceFakesDataCollectorNode(XmlDocument runSettings, DataCollectorSettings settings)
+    {
+        // override current settings
+        var navigator = runSettings.CreateNavigator();
+        var nodes = navigator!.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
 
-        private static bool AddFallbackFakesSettings(
-            XmlDocument runSettings,
-            IEnumerable<string> sources,
-            FrameworkVersion framework)
+        foreach (XPathNavigator dataCollectorNavigator in nodes)
         {
-
-            // The fallback settings is for the old implementation of fakes 
-            // that only supports .Net Framework versions
-            if (framework != FrameworkVersion.Framework35 &&
-                framework != FrameworkVersion.Framework40 &&
-                framework != FrameworkVersion.Framework45)
+            var uri = dataCollectorNavigator.GetAttribute("uri", string.Empty);
+            // We assume that only one uri can exist in a given runsettings
+            if (string.Equals(FakesMetadata.DataCollectorUriV1, uri, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(FakesMetadata.DataCollectorUriV2, uri, StringComparison.OrdinalIgnoreCase))
             {
-                return false;
+                dataCollectorNavigator.ReplaceSelf(settings.ToXml().CreateNavigator()!);
+                return;
             }
+        }
 
-            Func<IEnumerable<string>, string> netFrameworkConfigurator = TryGetNetFrameworkFakesDataCollectorConfigurator();
-            if (netFrameworkConfigurator == null)
-            {
-                return false;
-            }
+        // insert new node
+        XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator()!, settings);
+    }
 
-            // if no fakes, return settings unchanged
-            var fakesConfiguration = netFrameworkConfigurator(sources);
-            if (fakesConfiguration == null)
+    private static IDictionary<string, FrameworkVersion> CreateDictionary(IEnumerable<string> sources, FrameworkVersion framework)
+    {
+        var dict = new Dictionary<string, FrameworkVersion>();
+        foreach (var source in sources)
+        {
+            if (!dict.ContainsKey(source))
             {
-                return false;
+                dict.Add(source, framework);
             }
+        }
 
-            // integrate fakes settings in configuration
-            // if the settings don't have any data collector settings, populate with empty settings
-            EnsureSettingsNode(runSettings, new DataCollectionRunSettings());
-
-            // embed fakes settings
-            var fakesSettings = CreateFakesDataCollectorSettings();
-            var doc = new XmlDocument();
-            using (var xmlReader = XmlReader.Create(
-                new StringReader(fakesConfiguration),
-                new XmlReaderSettings() { CloseInput = true }))
-            {
-                doc.Load(xmlReader);
-            }
+        return dict;
+    }
 
-            fakesSettings.Configuration = doc.DocumentElement;
-            XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator(), fakesSettings);
+    /// <summary>
+    /// Ensures that an xml element corresponding to the test run settings exists in the setting document.
+    /// </summary>
+    /// <param name="settings">settings</param>
+    /// <param name="settingsNode">settingsNode</param>
+    private static void EnsureSettingsNode(XmlDocument settings, TestRunSettings settingsNode)
+    {
+        TPDebug.Assert(settingsNode != null, "Invalid Settings Node");
+        TPDebug.Assert(settings != null, "Invalid Settings");
 
-            return true;
+        var root = settings.DocumentElement!;
+        if (root[settingsNode.Name] == null)
+        {
+            var newElement = settingsNode.ToXml();
+            XmlNode newNode = settings.ImportNode(newElement, true);
+            root.AppendChild(newNode);
         }
+    }
 
-        /// <summary>
-        /// Ensures that an xml element corresponding to the test run settings exists in the setting document.
-        /// </summary>
-        /// <param name="settings">settings</param>
-        /// <param name="settingsNode">settingsNode</param>
-        private static void EnsureSettingsNode(XmlDocument settings, TestRunSettings settingsNode)
+    private static Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings>? TryGetFakesCrossPlatformDataCollectorConfigurator()
+    {
+        try
         {
-            Debug.Assert(settingsNode != null, "Invalid Settings Node");
-            Debug.Assert(settings != null, "Invalid Settings");
-
-            var root = settings.DocumentElement;
-            if (root[settingsNode.Name] == null)
+            var assembly = LoadTestPlatformAssembly();
+            var type = assembly?.GetType(ConfiguratorAssemblyQualifiedName, false, false);
+            var method = type?.GetMethod(CrossPlatformConfiguratorMethodName, [typeof(IDictionary<string, FrameworkVersion>)]);
+            if (method != null)
             {
-                var newElement = settingsNode.ToXml();
-                XmlNode newNode = settings.ImportNode(newElement, true);
-                root.AppendChild(newNode);
+                return (Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings>)method.CreateDelegate(typeof(Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings>));
             }
         }
-
-        private static Func<IEnumerable<string>, string> TryGetNetFrameworkFakesDataCollectorConfigurator()
+        catch (Exception ex)
         {
-#if NETFRAMEWORK
-            try
-            {
-                var assembly = LoadTestPlatformAssembly();
-                var type = assembly?.GetType(ConfiguratorAssemblyQualifiedName, false);
-                var method = type?.GetMethod(NetFrameworkConfiguratorMethodName, new Type[] { typeof(IEnumerable<string>) });
-                if (method != null)
-                {
-                    return (Func<IEnumerable<string>, string>)method.CreateDelegate(typeof(Func<IEnumerable<string>, string>));
-                }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("Failed to create Fakes Configurator. Reason:{0} ", ex);
-                }
-            }
-#endif
-            return null;
+            EqtTrace.Info("Failed to create newly implemented Fakes Configurator. Reason: {0} ", ex);
         }
 
-        private static Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings> TryGetFakesCrossPlatformDataCollectorConfigurator()
-        {
-            try
-            {
-                var assembly = LoadTestPlatformAssembly();
-                var type = assembly?.GetType(ConfiguratorAssemblyQualifiedName, false, false);
-                var method = type?.GetMethod(CrossPlatformConfiguratorMethodName, new Type[] { typeof(IDictionary<string, FrameworkVersion>) });
-                if (method != null)
-                {
-                    return (Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings>)method.CreateDelegate(typeof(Func<IDictionary<string, FrameworkVersion>, DataCollectorSettings>));
-                }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("Failed to create newly implemented Fakes Configurator. Reason:{0} ", ex);
-                }
-            }
+        return null;
+    }
 
-            return null;
+    private static Assembly? LoadTestPlatformAssembly()
+    {
+        try
+        {
+            return Assembly.Load(new AssemblyName(FakesConfiguratorAssembly));
         }
-        private static Assembly LoadTestPlatformAssembly()
+        catch (Exception ex)
         {
-            try
-            {
-                return Assembly.Load(new AssemblyName(FakesConfiguratorAssembly));
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Info("Failed to load assembly {0}. Reason:{1}", FakesConfiguratorAssembly, ex);
-            }
-            return null;
+            EqtTrace.Info("Failed to load assembly {0}. Reason:{1}", FakesConfiguratorAssembly, ex);
         }
+        return null;
+    }
 
+    internal static class FakesMetadata
+    {
         /// <summary>
-        /// Adds the Fakes data collector settings in the run settings document.
+        /// Friendly name of the data collector
         /// </summary>
-        /// <returns>
-        /// The <see cref="DataCollectorSettings"/>.
-        /// </returns>
-        private static DataCollectorSettings CreateFakesDataCollectorSettings()
-        {
-            // embed the fakes run settings
-            var settings = new DataCollectorSettings
-            {
-                AssemblyQualifiedName = FakesMetadata.DataCollectorAssemblyQualifiedName,
-                FriendlyName = FakesMetadata.FriendlyName,
-                IsEnabled = true,
-                Uri = new Uri(FakesMetadata.DataCollectorUriV1)
-            };
-            return settings;
-        }
+        public const string FriendlyName = "UnitTestIsolation";
 
-        internal static class FakesMetadata
-        {
-            /// <summary>
-            /// Friendly name of the data collector
-            /// </summary>
-            public const string FriendlyName = "UnitTestIsolation";
-
-            /// <summary>
-            /// Gets the URI of the data collector
-            /// </summary>
-            public const string DataCollectorUriV1 = "datacollector://microsoft/unittestisolation/1.0";
-
-            /// <summary>
-            /// Gets the URI of the data collector
-            /// </summary>
-            public const string DataCollectorUriV2 = "datacollector://microsoft/unittestisolation/2.0";
-
-            /// <summary>
-            /// Gets the assembly qualified name of the data collector type
-            /// </summary>
-            public const string DataCollectorAssemblyQualifiedName = "Microsoft.VisualStudio.TraceCollector.UnitTestIsolationDataCollector, Microsoft.VisualStudio.TraceCollector, Version=" + AssemblyVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-        }
+        /// <summary>
+        /// Gets the URI of the data collector (V1, deprecated and removed)
+        /// </summary>
+        public const string DataCollectorUriV1 = "datacollector://microsoft/unittestisolation/1.0";
+
+        /// <summary>
+        /// Gets the URI of the data collector (V2)
+        /// </summary>
+        public const string DataCollectorUriV2 = "datacollector://microsoft/unittestisolation/2.0";
+
+        /// <summary>
+        /// Gets the assembly qualified name of the data collector type
+        /// </summary>
+        public const string DataCollectorAssemblyQualifiedName = "Microsoft.VisualStudio.TraceCollector.UnitTestIsolationDataCollector, Microsoft.VisualStudio.TraceCollector, Version=" + AssemblyVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/InstallationContext.cs b/src/Microsoft.TestPlatform.Common/Utilities/InstallationContext.cs
index 37b2cb9eeb..4783921204 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/InstallationContext.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/InstallationContext.cs
@@ -1,58 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System.IO;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 
-    public class InstallationContext
-    {
-        private const string DevenvExe = "devenv.exe";
-        private const string PrivateAssembliesDirName = "PrivateAssemblies";
-        private const string PublicAssembliesDirName = "PublicAssemblies";
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-        private readonly IFileHelper fileHelper;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
-        public InstallationContext(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
+public class InstallationContext
+{
+    private const string DevenvExe = "devenv.exe";
+    private const string PrivateAssembliesDirName = "PrivateAssemblies";
+    private const string PublicAssembliesDirName = "PublicAssemblies";
+
+    private readonly IFileHelper _fileHelper;
 
-        public bool TryGetVisualStudioDirectory(out string visualStudioDirectory)
+    public InstallationContext(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
+
+    public bool TryGetVisualStudioDirectory(out string visualStudioDirectory)
+    {
+        var vsInstallPath = new DirectoryInfo(typeof(InstallationContext).Assembly.GetAssemblyLocation()).Parent?.Parent?.Parent?.FullName;
+        if (!vsInstallPath.IsNullOrEmpty())
         {
-            var vsInstallPath = new DirectoryInfo(typeof(InstallationContext).GetTypeInfo().Assembly.GetAssemblyLocation()).Parent?.Parent?.Parent?.FullName;
-            if (!string.IsNullOrEmpty(vsInstallPath))
+            var pathToDevenv = Path.Combine(vsInstallPath, DevenvExe);
+            if (!pathToDevenv.IsNullOrEmpty() && _fileHelper.Exists(pathToDevenv))
             {
-                var pathToDevenv = Path.Combine(vsInstallPath, DevenvExe);
-                if (!string.IsNullOrEmpty(pathToDevenv) && this.fileHelper.Exists(pathToDevenv))
-                {
-                    visualStudioDirectory = vsInstallPath;
-                    return true;
-                }
+                visualStudioDirectory = vsInstallPath;
+                return true;
             }
-
-            visualStudioDirectory = string.Empty;
-            return false;
         }
 
-        public string GetVisualStudioPath(string visualStudioDirectory)
-        {
-            return Path.Combine(visualStudioDirectory, DevenvExe);
-        }
+        visualStudioDirectory = string.Empty;
+        return false;
+    }
 
-        public string[] GetVisualStudioCommonLocations(string visualStudioDirectory)
-        {
-            return new[]
-            {
-                Path.Combine(visualStudioDirectory, PrivateAssembliesDirName),
-                Path.Combine(visualStudioDirectory, PublicAssembliesDirName),
-                Path.Combine(visualStudioDirectory, "CommonExtensions", "Microsoft", "TestWindow"),
-                Path.Combine(visualStudioDirectory, "CommonExtensions", "Microsoft", "TeamFoundation", "Team Explorer"),
-                visualStudioDirectory
-            };
-        }
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public string GetVisualStudioPath(string visualStudioDirectory)
+    {
+        return Path.Combine(visualStudioDirectory, DevenvExe);
+    }
+
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public string[] GetVisualStudioCommonLocations(string visualStudioDirectory)
+    {
+        return
+        [
+            Path.Combine(visualStudioDirectory, PrivateAssembliesDirName),
+            Path.Combine(visualStudioDirectory, PublicAssembliesDirName),
+            Path.Combine(visualStudioDirectory, "CommonExtensions", "Microsoft", "TestWindow"),
+            Path.Combine(visualStudioDirectory, "CommonExtensions", "Microsoft", "TeamFoundation", "Team Explorer"),
+            visualStudioDirectory
+        ];
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/MetadataReaderHelper.cs b/src/Microsoft.TestPlatform.Common/Utilities/MetadataReaderHelper.cs
new file mode 100644
index 0000000000..a8a6887df7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Utilities/MetadataReaderHelper.cs
@@ -0,0 +1,197 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+/* Expected attribute shape
+
+    namespace Microsoft.VisualStudio.TestPlatform
+    {
+        using System;
+
+        [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = true)]
+        internal sealed class TestExtensionTypesV2Attribute : Attribute
+        {
+            public string ExtensionType { get; }
+            public string ExtensionIdentifier { get; }
+            public Type ExtensionImplementation { get; }
+            public int Version { get; }
+
+            public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation, int version)
+            {
+                ExtensionType = extensionType;
+                ExtensionIdentifier = extensionIdentifier;
+                ExtensionImplementation = extensionImplementation;
+                Version = version;
+            }
+        }
+    }
+*/
+internal static class MetadataReaderExtensionsHelper
+{
+    private const string TestExtensionTypesAttributeV2 = "Microsoft.VisualStudio.TestPlatform.TestExtensionTypesV2Attribute";
+    private static readonly ConcurrentDictionary<string, Type[]> AssemblyCache = new();
+    private static readonly Type[] EmptyTypeArray = [];
+
+    public static Type[] DiscoverTestExtensionTypesV2Attribute(Assembly loadedAssembly, string assemblyFilePath)
+        => AssemblyCache.GetOrAdd(assemblyFilePath, DiscoverTestExtensionTypesV2AttributeInternal(loadedAssembly, assemblyFilePath));
+
+    private static Type[] DiscoverTestExtensionTypesV2AttributeInternal(Assembly loadedAssembly, string assemblyFilePath)
+    {
+        EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Discovering extensions inside assembly '{loadedAssembly.FullName}' file path '{assemblyFilePath}'");
+
+        // We don't cache the load because this method is used by DiscoverTestExtensionTypesV2Attribute that caches the outcome Type[]
+        Assembly assemblyToAnalyze;
+        try
+        {
+            assemblyToAnalyze = Assembly.LoadFile(assemblyFilePath);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Failure during assembly file load '{assemblyFilePath}', fallback to the loaded assembly.\n{FormatException(ex)}");
+            assemblyToAnalyze = loadedAssembly;
+        }
+
+        List<Tuple<int, Type>>? extensions = null;
+        using (var stream = new FileStream(assemblyFilePath, FileMode.Open, FileAccess.Read))
+        using (var reader = new PEReader(stream, PEStreamOptions.Default))
+        {
+            MetadataReader metadataReader = reader.GetMetadataReader();
+
+            // Search for the custom attribute TestExtensionTypesAttributeV2 - ECMA-335 II.22.10 CustomAttribute : 0x0C
+            foreach (var customAttributeHandle in metadataReader.CustomAttributes)
+            {
+                string? attributeFullName = null;
+                try
+                {
+                    if (customAttributeHandle.IsNil)
+                    {
+                        continue;
+                    }
+
+                    // Read custom attribute metadata row
+                    var customAttribute = metadataReader.GetCustomAttribute(customAttributeHandle);
+
+                    // We expect that the attribute is defined inside current assembly by the extension owner
+                    // and so ctor should point to the MethodDefinition table - ECMA-335 II.22.26 MethodDef : 0x06
+                    // and parent scope should be the current assembly [assembly:...] - ECMA-335 II.22.2 Assembly : 0x20
+                    if (customAttribute.Constructor.Kind != HandleKind.MethodDefinition || customAttribute.Parent.Kind != HandleKind.AssemblyDefinition)
+                    {
+                        continue;
+                    }
+
+                    // Read MethodDef metadata row
+                    var methodDefinition = metadataReader.GetMethodDefinition((MethodDefinitionHandle)customAttribute.Constructor);
+
+                    // Check that name is .ctor
+                    if (metadataReader.GetString(methodDefinition.Name) != ".ctor")
+                    {
+                        continue;
+                    }
+
+                    // Get the custom attribute TypeDef handle
+                    var typeDefinitionHandle = methodDefinition.GetDeclaringType();
+
+                    // Read TypeDef metadata row
+                    var typeDef = metadataReader.GetTypeDefinition(typeDefinitionHandle);
+
+                    // Check the attribute type full name
+                    attributeFullName = $"{metadataReader.GetString(typeDef.Namespace)}.{metadataReader.GetString(typeDef.Name)}";
+                    if (attributeFullName == TestExtensionTypesAttributeV2)
+                    {
+                        // We don't do any signature verification to allow future possibility to add new parameter in a back compat way.
+                        // Get signature blob using methodDefinition.Signature index into Blob heap - ECMA-335 II.22.26 MethodDef : 0x06, 'Signature' column
+                        // BlobReader signatureReader = metadataReader.GetBlobReader(methodDefinition.Signature);
+                        // var decoder = new SignatureDecoder<string, object>(new SignatureDecoder(), metadataReader, genericContext: null);
+                        // var ctorDecodedSignature = decoder.DecodeMethodSignature(ref signatureReader);
+                        // Log the signature for analysis purpose
+                        // EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Find possible good attribute candidate '{attributeFullName}' with ctor signature: '{ctorDecodedSignature.ReturnType}" +
+                        //    $" ctor ({(ctorDecodedSignature.ParameterTypes.Length > 0 ? ctorDecodedSignature.ParameterTypes.Aggregate((a, b) => $"{a},{b}").Trim(',') : "(")})'");
+
+                        // Read the ctor signature values - ECMA-335 II.23.3 Custom attributes
+                        BlobReader valueReader = metadataReader.GetBlobReader(customAttribute.Value);
+                        // Verify the prolog
+                        if (valueReader.ReadUInt16() == 1)
+                        {
+                            // Expected ctor shape ctor(string,string,System.Type,Int32)
+                            // [assembly: TestExtensionTypesV2(ExtensionMetadata.ExtensionType, ExtensionMetadata.Uri, typeof(ExtensionImplementation), 1)]
+
+                            // If the parameter kind is string, (middle line in above diagram) then the blob contains
+                            // a SerString – a PackedLen count of bytes, followed by the UTF8 characters.If the
+                            // string is null, its PackedLen has the value 0xFF(with no following characters).If
+                            // the string is empty(“”), then PackedLen has the value 0x00(with no following
+                            // characters).
+                            string? extension = valueReader.ReadSerializedString();
+                            string? extensionIdentifier = valueReader.ReadSerializedString();
+
+                            // If the parameter kind is System.Type, (also, the middle line in above diagram) its
+                            // value is stored as a SerString(as defined in the previous paragraph), representing its
+                            // canonical name. The canonical name is its full type name, followed optionally by
+                            // the assembly where it is defined, its version, culture and public-key-token.If the
+                            // assembly name is omitted, the CLI looks first in the current assembly, and then in
+                            // the system library(mscorlib); in these two special cases, it is permitted to omit the
+                            // assembly-name, version, culture and public-key-token.
+                            string? extensionImplementation = valueReader.ReadSerializedString();
+
+                            // If the parameter kind is simple(first line in the above diagram) (bool, char, float32,
+                            // float64, int8, int16, int32, int64, unsigned int8, unsigned int16, unsigned int32 or
+                            // unsigned int64) then the 'blob' contains its binary value(Val). (A bool is a single
+                            // byte with value 0(false) or 1(true); char is a two-byte Unicode character; and the
+                            // others have their obvious meaning.) This pattern is also used if the parameter kind is
+                            // an enum -- simply store the value of the enum's underlying integer type.
+                            int version = valueReader.ReadInt32();
+                            try
+                            {
+                                TPDebug.Assert(extensionImplementation is not null, "extensionImplementation is null");
+                                var extensionType = assemblyToAnalyze.GetType(extensionImplementation);
+                                if (extensionType is null)
+                                {
+                                    EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Unable to get extension type for '{extensionImplementation}'");
+                                    continue;
+                                }
+
+                                extensions ??= new List<Tuple<int, Type>>();
+                                extensions.Add(Tuple.Create(version, extensionType));
+                                EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Valid extension found: extension type '{extension}' identifier '{extensionIdentifier}' implementation '{extensionType}' version '{version}'");
+                            }
+                            catch (Exception ex)
+                            {
+                                EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Failure during type creation, extension full name: '{extensionImplementation}'\n{FormatException(ex)}");
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    EqtTrace.Verbose($"MetadataReaderExtensionsHelper: Failure during custom attribute analysis, attribute full name: {attributeFullName}\n{FormatException(ex)}");
+                }
+            }
+        }
+
+        return extensions?.OrderByDescending(t => t.Item1).Select(t => t.Item2).ToArray() ?? EmptyTypeArray;
+    }
+
+    private static string FormatException(Exception ex)
+    {
+        StringBuilder log = new();
+        Exception? current = ex;
+        while (current != null)
+        {
+            log.AppendLine(current.ToString());
+            current = current.InnerException;
+        }
+
+        return log.ToString();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs
index 9caf3d38d1..4e87b120cc 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs
@@ -1,260 +1,246 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+
+/// <summary>
+/// Utilities to get the run settings from the provider and the command line options specified.
+/// </summary>
+internal static class RunSettingsProviderExtensions
 {
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Xml;
+    public const string EmptyRunSettings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using System.Text.RegularExpressions;
+    /// <summary>
+    /// Pattern used to find parameter node.
+    /// </summary>
+    private const string ParameterString = "Parameter";
 
     /// <summary>
-    /// Utilities to get the run settings from the provider and the command line options specified.
+    /// Pattern that indicates Attribute name.
     /// </summary>
-    internal static class RunSettingsProviderExtensions
-    {
-        public const string EmptyRunSettings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-
-        /// <summary>
-        /// Pattern used to find parameter node.
-        /// </summary>
-        private const string ParameterString = "Parameter";
-
-        /// <summary>
-        /// Pattern that indicates Attribute name.
-        /// </summary>
-        private const string AttributeNameString = "AttrName";
-
-        /// <summary>
-        /// Pattern that indicates  Attribute value.
-        /// </summary>
-        private const string AttributeValueString = "AttrValue";
-
-        /// <summary>
-        /// Attribute name key for test run parameter node
-        /// </summary>
-        private const string NameString = "name";
-
-        /// <summary>
-        /// Attribute value key for test run parameter node
-        /// </summary>
-        private const string ValueString = "value";
-
-        public static void UpdateRunSettings(this IRunSettingsProvider runSettingsProvider, string runsettingsXml)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
-            ValidateArg.NotNullOrWhiteSpace(runsettingsXml, nameof(runsettingsXml));
+    private const string AttributeNameString = "AttrName";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runsettingsXml);
-            runSettingsProvider.SetActiveRunSettings(runSettings);
-        }
+    /// <summary>
+    /// Pattern that indicates  Attribute value.
+    /// </summary>
+    private const string AttributeValueString = "AttrValue";
 
-        public static void AddDefaultRunSettings(this IRunSettingsProvider runSettingsProvider)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+    /// <summary>
+    /// Attribute name key for test run parameter node
+    /// </summary>
+    private const string NameString = "name";
 
-            var runSettingsXml = runSettingsProvider.ActiveRunSettings?.SettingsXml;
+    /// <summary>
+    /// Attribute value key for test run parameter node
+    /// </summary>
+    private const string ValueString = "value";
 
-            if (string.IsNullOrWhiteSpace(runSettingsXml))
-            {
-                runSettingsXml = EmptyRunSettings;
-            }
+    public static void UpdateRunSettings(this IRunSettingsProvider runSettingsProvider, string runsettingsXml)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        ValidateArg.NotNullOrWhiteSpace(runsettingsXml, nameof(runsettingsXml));
 
-            runSettingsXml = AddDefaultRunSettings(runSettingsXml);
-            runSettingsProvider.UpdateRunSettings(runSettingsXml);
-        }
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(runsettingsXml);
+        runSettingsProvider.SetActiveRunSettings(runSettings);
+    }
+
+    public static void AddDefaultRunSettings(this IRunSettingsProvider runSettingsProvider)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        var runSettingsXml = runSettingsProvider.ActiveRunSettings?.SettingsXml;
 
-        public static void UpdateRunSettingsXmlDocumentInnerXml(XmlDocument xmlDocument, string key, string data)
+        if (runSettingsXml.IsNullOrWhiteSpace())
         {
-            var node = GetXmlNode(xmlDocument, key) ?? CreateNode(xmlDocument, key);
-            node.InnerXml = data;
+            runSettingsXml = EmptyRunSettings;
         }
 
-        public static void UpdateRunSettingsNode(this IRunSettingsProvider runSettingsProvider, string key, string data)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
-            ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
-            ValidateArg.NotNull(data, nameof(data));
+        runSettingsXml = AddDefaultRunSettings(runSettingsXml);
+        runSettingsProvider.UpdateRunSettings(runSettingsXml);
+    }
 
-            var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
-            UpdateRunSettingsXmlDocument(xmlDocument, key, data);
-            runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
-        }
+    public static void UpdateRunSettingsXmlDocumentInnerXml(XmlDocument xmlDocument, string key, string data)
+    {
+        var node = GetXmlNode(xmlDocument, key) ?? CreateNode(xmlDocument, key);
+        TPDebug.Assert(node is not null, "node is null");
+        node.InnerXml = data;
+    }
 
-        /// <summary>
-        /// Matches with test run parameter node pattern and returns that match.
-        /// </summary>
-        /// <param name="runSettingsProvider"></param>
-        /// <param name="node"></param>
-        /// <returns></returns>
-        public static Match GetTestRunParameterNodeMatch(this IRunSettingsProvider runSettingsProvider, string node)
-        {
-            var attrName = $"(?<{AttributeNameString}>[\\w.:-]+)";
-            var attrValue = $"(?<{AttributeValueString}>.+)";
-            Regex regex = new Regex($"{Constants.TestRunParametersName}.{ParameterString}\\(name\\s*=\\s*\"{attrName}\"\\s*,\\s*value\\s*=\\s*\"{attrValue}\"\\)");
-            Match match = regex.Match(node);
-            return match;
-        }
+    public static void UpdateRunSettingsNode(this IRunSettingsProvider runSettingsProvider, string key, string data)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
+        ValidateArg.NotNull(data, nameof(data));
 
-        /// <summary>
-        /// If test run parameter exists already it will override with new value otherwise this will add new test run parameter.
-        /// </summary>
-        /// <param name="runSettingsProvider"></param>
-        /// <param name="match"></param>
-        public static void UpdateTestRunParameterSettingsNode(this IRunSettingsProvider runSettingsProvider, Match match)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
+        UpdateRunSettingsXmlDocumentInnerText(xmlDocument, key, data);
+        runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
+    }
 
-            var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
-            XmlNode testRunParameterNode = GetXmlNode(xmlDocument, Constants.TestRunParametersName) ?? xmlDocument.CreateElement(Constants.TestRunParametersName);
-            var attrName = match.Groups[AttributeNameString].Value;
-            var attrValue = match.Groups[AttributeValueString].Value;
+    /// <summary>
+    /// Matches with test run parameter node pattern and returns that match.
+    /// </summary>
+    /// <param name="_"></param>
+    /// <param name="node"></param>
+    /// <returns></returns>
+    public static Match GetTestRunParameterNodeMatch(this IRunSettingsProvider _, string node)
+    {
+        var attrName = $"(?<{AttributeNameString}>[\\w.:-]+)";
+        var attrValue = $"(?<{AttributeValueString}>.+)";
+        Regex regex = new($"{Constants.TestRunParametersName}.{ParameterString}\\(name\\s*=\\s*\"{attrName}\"\\s*,\\s*value\\s*=\\s*\"{attrValue}\"\\)");
+        Match match = regex.Match(node);
+        return match;
+    }
 
-            if (!TryOverrideAttributeValue(testRunParameterNode, attrName, attrValue))
-            {
-                XmlElement element = xmlDocument.CreateElement(ParameterString);
-                element.SetAttribute(NameString, attrName);
-                element.SetAttribute(ValueString, attrValue);
-                testRunParameterNode.AppendChild(element);
-                xmlDocument.DocumentElement.AppendChild(testRunParameterNode);
-            }
+    /// <summary>
+    /// If test run parameter exists already it will override with new value otherwise this will add new test run parameter.
+    /// </summary>
+    /// <param name="runSettingsProvider"></param>
+    /// <param name="match"></param>
+    public static void UpdateTestRunParameterSettingsNode(this IRunSettingsProvider runSettingsProvider, Match match)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
+        XmlNode testRunParameterNode = GetXmlNode(xmlDocument, Constants.TestRunParametersName) ?? xmlDocument.CreateElement(Constants.TestRunParametersName);
+        var attrName = match.Groups[AttributeNameString].Value;
+        var attrValue = match.Groups[AttributeValueString].Value;
 
-            runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
+        if (!TryOverrideAttributeValue(testRunParameterNode, attrName, attrValue))
+        {
+            XmlElement element = xmlDocument.CreateElement(ParameterString);
+            element.SetAttribute(NameString, attrName);
+            element.SetAttribute(ValueString, attrValue);
+            testRunParameterNode.AppendChild(element);
+            xmlDocument.DocumentElement!.AppendChild(testRunParameterNode);
         }
 
-        private static bool TryOverrideAttributeValue(XmlNode xmlNode, string attrName, string attrValue)
+        runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
+    }
+
+    private static bool TryOverrideAttributeValue(XmlNode xmlNode, string attrName, string attrValue)
+    {
+        foreach (XmlNode node in xmlNode.ChildNodes)
         {
-            foreach (XmlNode node in xmlNode.ChildNodes)
+            if (string.Compare(node.Attributes![NameString]!.Value, attrName) == 0)
             {
-                if (string.Compare(node.Attributes[NameString].Value, attrName) == 0)
-                {
-                    node.Attributes[ValueString].Value = attrValue;
-                    return true;
-                }
+                node.Attributes[ValueString]!.Value = attrValue;
+                return true;
             }
-
-            return false;
         }
 
-        public static void UpdateRunSettingsNodeInnerXml(this IRunSettingsProvider runSettingsProvider, string key, string xml)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
-            ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
-            ValidateArg.NotNull(xml, nameof(xml));
+        return false;
+    }
 
-            var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
-            UpdateRunSettingsXmlDocumentInnerXml(xmlDocument, key, xml);
-            runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
-        }
+    public static void UpdateRunSettingsNodeInnerXml(this IRunSettingsProvider runSettingsProvider, string key, string xml)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
+        ValidateArg.NotNull(xml, nameof(xml));
 
-        public static string QueryRunSettingsNode(this IRunSettingsProvider runSettingsProvider, string key)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
-            ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
+        var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
+        UpdateRunSettingsXmlDocumentInnerXml(xmlDocument, key, xml);
+        runSettingsProvider.UpdateRunSettings(xmlDocument.OuterXml);
+    }
 
-            var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
-            var node = GetXmlNode(xmlDocument, key);
-            return node?.InnerText;
-        }
+    public static string? QueryRunSettingsNode(this IRunSettingsProvider runSettingsProvider, string key)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        ValidateArg.NotNullOrWhiteSpace(key, nameof(key));
 
-        internal static XmlNode GetXmlNode(XmlDocument xmlDocument, string key)
-        {
-            var xPath = key.Replace('.', '/');
-            var node = xmlDocument.SelectSingleNode(string.Format("//RunSettings/{0}", xPath));
-            return node;
-        }
+        var xmlDocument = runSettingsProvider.GetRunSettingXmlDocument();
+        var node = GetXmlNode(xmlDocument, key);
+        return node?.InnerText;
+    }
 
-        internal static void UpdateRunSettingsXmlDocument(XmlDocument xmlDocument, string key, string data)
-        {
-            var node = GetXmlNode(xmlDocument, key) ?? CreateNode(xmlDocument, key);
-            node.InnerText = data;
-        }
+    internal static XmlNode? GetXmlNode(XmlDocument xmlDocument, string key)
+    {
+        var xPath = key.Replace('.', '/');
+        var node = xmlDocument.SelectSingleNode($"//RunSettings/{xPath}");
+        return node;
+    }
 
-        /// <summary>
-        /// Gets the effective run settings adding the default run settings if not already present.
-        /// </summary>
-        /// <param name="runSettings"> The run settings XML. </param>
-        /// <returns> Effective run settings. </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private static string AddDefaultRunSettings(string runSettings)
-        {
-            var architecture = Constants.DefaultPlatform;
-            var framework = Framework.DefaultFramework;
-            var defaultResultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), Constants.ResultsDirectoryName);
+    internal static void UpdateRunSettingsXmlDocumentInnerText(XmlDocument xmlDocument, string key, string data)
+    {
+        var node = GetXmlNode(xmlDocument, key) ?? CreateNode(xmlDocument, key);
+        TPDebug.Assert(node is not null, "node is null");
+        node.InnerText = data;
+    }
 
-            using (var stream = new StringReader(runSettings))
-            using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
-            {
-                var document = new XmlDocument();
-                document.Load(reader);
+    /// <summary>
+    /// Gets the effective run settings adding the default run settings if not already present.
+    /// </summary>
+    /// <param name="runSettings"> The run settings XML. </param>
+    /// <returns> Effective run settings. </returns>
+    private static string AddDefaultRunSettings(string runSettings)
+    {
+        var architecture = Constants.DefaultPlatform;
+        var framework = Framework.DefaultFramework;
+        var defaultResultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), Constants.ResultsDirectoryName);
 
-                InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(document, architecture, framework, defaultResultsDirectory);
-                return document.OuterXml;
-            }
-        }
+        using var stream = new StringReader(runSettings);
+        using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
 
-        private static XmlNode CreateNode(XmlDocument doc, string xPath)
-        {
-            var path = xPath.Split('.');
-            XmlNode node = null;
-            XmlNode parent = doc.DocumentElement;
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(document, architecture, framework, defaultResultsDirectory);
+        return document.OuterXml;
+    }
 
-            for (var i = 0; i < path.Length; i++)
-            {
-                node = parent.SelectSingleNode(path[i]) ?? parent.AppendChild(doc.CreateElement(path[i]));
-                parent = node;
-            }
+    private static XmlNode? CreateNode(XmlDocument doc, string xPath)
+    {
+        var path = xPath.Split('.');
+        XmlNode? node = null;
+        XmlNode? parent = doc.DocumentElement!;
 
-            return node;
+        for (var i = 0; i < path.Length; i++)
+        {
+            TPDebug.Assert(parent is not null, "parent is null");
+            node = parent.SelectSingleNode(path[i]) ?? parent.AppendChild(doc.CreateElement(path[i]));
+            parent = node;
         }
 
-        private static XmlDocument GetRunSettingXmlDocument(this IRunSettingsProvider runSettingsProvider)
-        {
-            ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        return node;
+    }
 
-            var doc = new XmlDocument();
+    private static XmlDocument GetRunSettingXmlDocument(this IRunSettingsProvider runSettingsProvider)
+    {
+        ValidateArg.NotNull(runSettingsProvider, nameof(runSettingsProvider));
+        var doc = new XmlDocument();
 
-            if (runSettingsProvider.ActiveRunSettings != null &&
-                !string.IsNullOrEmpty(runSettingsProvider.ActiveRunSettings.SettingsXml))
-            {
-                var settingsXml = runSettingsProvider.ActiveRunSettings.SettingsXml;
+        if (!StringUtils.IsNullOrEmpty(runSettingsProvider.ActiveRunSettings?.SettingsXml))
+        {
+            var settingsXml = runSettingsProvider.ActiveRunSettings.SettingsXml;
 
 #if NETFRAMEWORK
-                using (var reader = XmlReader.Create(new StringReader(settingsXml), new XmlReaderSettings() { XmlResolver = null, CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
-                {
+            using var reader = XmlReader.Create(new StringReader(settingsXml), new XmlReaderSettings() { XmlResolver = null, CloseInput = true, DtdProcessing = DtdProcessing.Prohibit });
 #else
-                using (
-                    var reader = XmlReader.Create(new StringReader(settingsXml),
-                        new XmlReaderSettings() { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
-                {
+            using var reader = XmlReader.Create(new StringReader(settingsXml),
+                new XmlReaderSettings() { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit });
 #endif
-                    doc.Load(reader);
-                }
-            }
-            else
-            {
+            doc.Load(reader);
+        }
+        else
+        {
 #if NETFRAMEWORK
-                doc = (XmlDocument) XmlRunSettingsUtilities.CreateDefaultRunSettings();
+            doc = (XmlDocument)XmlRunSettingsUtilities.CreateDefaultRunSettings();
 #else
-                using (
-                    var reader =
-                        XmlReader.Create(
-                            new StringReader(
-                                XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator().OuterXml),
-                            new XmlReaderSettings() { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
-                {
-                    doc.Load(reader);
-                }
+            using var reader =
+                XmlReader.Create(
+                    new StringReader(
+                        XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator()!.OuterXml),
+                    new XmlReaderSettings() { CloseInput = true, DtdProcessing = DtdProcessing.Prohibit });
+            doc.Load(reader);
 #endif
-            }
-            return doc;
         }
+        return doc;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs
index 28f037c4c9..97376c5f05 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsUtilities.cs
@@ -1,197 +1,200 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
+/// <summary>
+/// Utility methods for RunSettings.
+/// </summary>
+public static class RunSettingsUtilities
+{
     /// <summary>
-    /// Utility methods for RunSettings.
+    /// Create RunSettings object corresponding to settingsXml
     /// </summary>
-    public static class RunSettingsUtilities
+    public static RunSettings? CreateAndInitializeRunSettings(string? settingsXml)
     {
-        /// <summary>
-        /// Create RunSettings object corresponding to settingsXml
-        /// </summary>
-        public static RunSettings CreateAndInitializeRunSettings(string settingsXml)
-        {
-            RunSettings settings = null;
+        RunSettings? settings = null;
 
-            if (!StringUtilities.IsNullOrWhiteSpace(settingsXml))
-            {
-                settings = new RunSettings();
-                settings.LoadSettingsXml(settingsXml);
-                settings.InitializeSettingsProviders(settingsXml);
-            }
-            return settings;
+        if (!settingsXml.IsNullOrWhiteSpace())
+        {
+            settings = new RunSettings();
+            settings.LoadSettingsXml(settingsXml);
+            settings.InitializeSettingsProviders(settingsXml);
         }
+        return settings;
+    }
 
-        /// <summary>
-        /// Gets the test results directory from the run configuration
-        /// </summary>
-        /// <param name="runConfiguration">Test run configuration</param>
-        /// <returns>Test results directory</returns>
-        public static string GetTestResultsDirectory(RunConfiguration runConfiguration)
+    /// <summary>
+    /// Gets the test results directory from the run configuration
+    /// </summary>
+    /// <param name="runConfiguration">Test run configuration</param>
+    /// <returns>Test results directory</returns>
+    [return: NotNullIfNotNull("runConfiguration")]
+    public static string? GetTestResultsDirectory(RunConfiguration? runConfiguration)
+    {
+        if (runConfiguration != null)
         {
-            string resultsDirectory = null;
-            if (runConfiguration != null)
-            {
-                // It will try to get path from runsettings, if not found then it will return default path. 
-                resultsDirectory = Environment.ExpandEnvironmentVariables(runConfiguration.ResultsDirectory);
-            }
+            // It will try to get path from runsettings, if not found then it will return default path.
+            return Environment.ExpandEnvironmentVariables(runConfiguration.ResultsDirectory);
+        }
+
+        return null;
+    }
 
-            return resultsDirectory;
+    /// <summary>
+    /// Gets the target framework from the run configuration
+    /// </summary>
+    /// <param name="runConfiguration">Test run configuration</param>
+    /// <returns>Target Framework</returns>
+    public static Framework? GetTargetFramework(RunConfiguration? runConfiguration)
+    {
+        if (runConfiguration != null)
+        {
+            // It will get target framework from runsettings
+            return runConfiguration.TargetFramework;
         }
 
-        /// <summary>
-        /// Gets the target framework from the run configuration
-        /// </summary>
-        /// <param name="runConfiguration">Test run configuration</param>
-        /// <returns>Target Framework</returns>
-        public static Framework GetTargetFramework(RunConfiguration runConfiguration)
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the solution directory from run configuration
+    /// </summary>
+    /// <param name="runConfiguration">Test run configuration</param>
+    /// <returns>Solution directory</returns>
+    public static string? GetSolutionDirectory(RunConfiguration? runConfiguration)
+    {
+        string? solutionDirectory = null;
+        if (runConfiguration != null)
         {
-            Framework targetFramework = null;
-            if (runConfiguration != null)
+            if (!runConfiguration.SolutionDirectory.IsNullOrEmpty())
             {
-                // It will get target framework from runsettings
-                targetFramework = runConfiguration.TargetFramework;
+                // Env var is expanded in run configuration
+                solutionDirectory = runConfiguration.SolutionDirectory;
             }
-
-            return targetFramework;
         }
 
-        /// <summary>
-        /// Gets the solution directory from run configuration
-        /// </summary>
-        /// <param name="runConfiguration">Test run configuration</param>
-        /// <returns>Solution directory</returns>
-        public static string GetSolutionDirectory(RunConfiguration runConfiguration)
+        return solutionDirectory;
+    }
+
+    /// <summary>
+    /// Gets the maximum CPU count from setting xml
+    /// </summary>
+    /// <param name="settingXml">setting xml</param>
+    /// <returns>Maximum CPU Count</returns>
+    public static int GetMaxCpuCount(string? settingXml)
+    {
+        int cpuCount = Constants.DefaultCpuCount;
+
+        if (settingXml.IsNullOrEmpty())
         {
-            string solutionDirectory = null;
-            if (runConfiguration != null)
-            {
-                if (!string.IsNullOrEmpty(runConfiguration.SolutionDirectory))
-                {
-                    // Env var is expanded in run configuration
-                    solutionDirectory = runConfiguration.SolutionDirectory;
-                }
-            }
+            return cpuCount;
+        }
 
-            return solutionDirectory;
+        try
+        {
+            var configuration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingXml);
+            cpuCount = GetMaxCpuCount(configuration);
+        }
+        catch (SettingsException ex)
+        {
+            EqtTrace.Verbose("RunSettingsUtilities.GetMaxCpuCount: Unable to get maximum CPU count from Setting Xml. {0}", ex);
         }
 
-        /// <summary>
-        /// Gets the maximum CPU count from setting xml
-        /// </summary>
-        /// <param name="settingXml">setting xml</param>
-        /// <returns>Maximum CPU Count</returns>
-        public static int GetMaxCpuCount(string settingXml)
+        return cpuCount;
+    }
+
+    /// <summary>
+    /// Gets the maximum CPU count from run configuration
+    /// </summary>
+    /// <param name="runConfiguration">Test run configuration</param>
+    /// <returns>Maximum CPU Count</returns>
+    public static int GetMaxCpuCount(RunConfiguration? runConfiguration)
+    {
+        int cpuCount = Constants.DefaultCpuCount;
+
+        if (runConfiguration != null)
         {
-            int cpuCount = Constants.DefaultCpuCount;
+            cpuCount = runConfiguration.MaxCpuCount;
+        }
 
-            if (string.IsNullOrEmpty(settingXml))
-            {
-                return cpuCount;
-            }
+        return cpuCount;
+    }
+    /// <summary>
+    /// Gets the value of TreatNoTestsAsError parameter from runsettings file
+    /// </summary>
+    /// <param name="runSettings">Runsetting string value</param>
+    /// <returns>The value of TreatNoTestsAsError</returns>
+    public static bool GetTreatNoTestsAsError(string? runSettings)
+    {
+        bool treatNoTestsAsError = false;
 
+        if (runSettings != null)
+        {
             try
             {
-                var configuration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingXml);
-                cpuCount = GetMaxCpuCount(configuration);
+                RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+                treatNoTestsAsError = GetTreatNoTestsAsError(runConfiguration);
             }
-            catch (SettingsException ex)
+            catch (SettingsException se)
             {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("RunSettingsUtilities.GetMaxCpuCount: Unable to get maximum CPU count from Setting Xml. {0}", ex);
-                }
+                EqtTrace.Error("RunSettingsUtilities.GetTreatNoTestsAsError: Unable to get the value of TreatNoTestsAsError from runsettings: Error {0}", se);
             }
-
-            return cpuCount;
         }
 
-        /// <summary>
-        /// Gets the maximum CPU count from run configuration
-        /// </summary>
-        /// <param name="runConfiguration">Test run configuration</param>
-        /// <returns>Maximum CPU Count</returns>
-        public static int GetMaxCpuCount(RunConfiguration runConfiguration)
-        {
-            int cpuCount = Constants.DefaultCpuCount;
+        return treatNoTestsAsError;
+    }
 
-            if (runConfiguration != null)
-            {
-                cpuCount = runConfiguration.MaxCpuCount;
-            }
+    private static bool GetTreatNoTestsAsError(RunConfiguration? runConfiguration)
+    {
+        bool treatNoTestsAsError = false;
 
-            return cpuCount;
-        }
-        /// <summary>
-        /// Gets the value of TreatNoTestsAsError parameter from runsettings file
-        /// </summary>
-        /// <param name="runSettings">Runsetting string value</param>
-        /// <returns>The value of TreatNoTestsAsError</returns>
-        public static bool GetTreatNoTestsAsError(string runSettings)
+        if (runConfiguration != null)
         {
-            bool treatNoTestsAsError = false;
-
-            if (runSettings != null)
-            {
-                try
-                {
-                    RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
-                    treatNoTestsAsError = GetTreatNoTestsAsError(runConfiguration);
-                }
-                catch (SettingsException se)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("RunSettingsUtilities.GetTreatNoTestsAsError: Unable to get the value of TreatNoTestsAsError from runsettings: Error {0}", se);
-                    }
-                }
-            }
-
-            return treatNoTestsAsError;
+            treatNoTestsAsError = runConfiguration.TreatNoTestsAsError;
         }
 
-        private static bool GetTreatNoTestsAsError(RunConfiguration runConfiguration)
-        {
-            bool treatNoTestsAsError = false;
-
-            if (runConfiguration != null)
-            {
-                treatNoTestsAsError = runConfiguration.TreatNoTestsAsError;
-            }
+        return treatNoTestsAsError;
+    }
 
-            return treatNoTestsAsError;
-        }
 
+    /// <summary>
+    /// Gets the test adapters path from the run configuration
+    /// </summary>
+    /// <param name="runSettings">Test run settings</param>
+    /// <returns>Test adapters paths</returns>
+    public static IEnumerable<string> GetTestAdaptersPaths(string? runSettings)
+    {
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
 
-        /// <summary>
-        /// Gets the test adapters path from the run configuration
-        /// </summary>
-        /// <param name="runSettings">Test run settings</param>
-        /// <param name="returnNullIfNotSet">True to return null, if adapter paths is not set.</param>
-        /// <returns>Test adapters paths</returns>
-        public static IEnumerable<string> GetTestAdaptersPaths(string runSettings)
+        IEnumerable<string> testAdaptersPaths = [];
+        if (runConfiguration != null)
         {
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
-
-            IEnumerable<string> testAdaptersPaths = Enumerable.Empty<string>();
-            if (runConfiguration != null)
+            if (runConfiguration.TestAdaptersPathsSet)
             {
-                if (runConfiguration.TestAdaptersPathsSet)
-                {
-                    testAdaptersPaths = runConfiguration.TestAdaptersPaths.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
-                }
+                testAdaptersPaths = runConfiguration.TestAdaptersPaths.Split([';'], StringSplitOptions.RemoveEmptyEntries);
             }
-
-            return testAdaptersPaths;
         }
 
+        return testAdaptersPaths;
+    }
+
+    /// <summary>
+    /// Gets the test adapter loading strategy
+    /// </summary>
+    /// <param name="runSettings">Test run settings</param>
+    /// <returns>Test adapter loading strategy</returns>
+    internal static TestAdapterLoadingStrategy GetLoadingStrategy(string? runSettings)
+    {
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+
+        return runConfiguration.TestAdapterLoadingStrategy;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/SimpleJSON.cs b/src/Microsoft.TestPlatform.Common/Utilities/SimpleJSON.cs
new file mode 100644
index 0000000000..73a65c5b20
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Common/Utilities/SimpleJSON.cs
@@ -0,0 +1,1398 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+/* * * * *
+ * A simple JSON Parser / builder
+ * ------------------------------
+ *
+ * It mainly has been written as a simple JSON parser. It can build a JSON string
+ * from the node-tree, or generate a node tree from any valid JSON string.
+ *
+ * Written by Bunny83
+ * 2012-06-09
+ *
+ * Original link for this code: https://github.com/Bunny83/SimpleJSON
+ * Modified in order to fix analyzer errors.
+ *
+ * Changelog now external. See Changelog.txt
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2012-2019 Markus Göbel (Bunny83)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * * * * */
+#pragma warning restore IDE0073 // The file header does not match the required text
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+
+#nullable disable
+
+namespace SimpleJSON;
+
+internal enum JSONNodeType
+{
+    Array = 1,
+    Object = 2,
+    String = 3,
+    Number = 4,
+    NullValue = 5,
+    Boolean = 6,
+    None = 7,
+    Custom = 0xFF,
+}
+
+internal enum JSONTextMode
+{
+    Compact,
+    Indent
+}
+
+internal abstract partial class JSONNode
+{
+    #region Enumerators
+    public struct Enumerator
+    {
+        private enum Type { None, Array, Object }
+
+        private readonly Type _type;
+        private Dictionary<string, JSONNode>.Enumerator _object;
+        private List<JSONNode>.Enumerator _array;
+
+        public bool IsValid { get { return _type != Type.None; } }
+
+        public Enumerator(List<JSONNode>.Enumerator aArrayEnum)
+        {
+            _type = Type.Array;
+            _object = default;
+            _array = aArrayEnum;
+        }
+        public Enumerator(Dictionary<string, JSONNode>.Enumerator aDictEnum)
+        {
+            _type = Type.Object;
+            _object = aDictEnum;
+            _array = default;
+        }
+        public KeyValuePair<string, JSONNode> Current
+        {
+            get
+            {
+                if (_type == Type.Array)
+                    return new KeyValuePair<string, JSONNode>(string.Empty, _array.Current);
+                else if (_type == Type.Object)
+                    return _object.Current;
+                return new KeyValuePair<string, JSONNode>(string.Empty, null);
+            }
+        }
+        public bool MoveNext()
+        {
+            if (_type == Type.Array)
+                return _array.MoveNext();
+            else if (_type == Type.Object)
+                return _object.MoveNext();
+            return false;
+        }
+    }
+    public struct ValueEnumerator
+    {
+        private Enumerator _enumerator;
+        public ValueEnumerator(List<JSONNode>.Enumerator aArrayEnum) : this(new Enumerator(aArrayEnum)) { }
+        public ValueEnumerator(Dictionary<string, JSONNode>.Enumerator aDictEnum) : this(new Enumerator(aDictEnum)) { }
+        public ValueEnumerator(Enumerator aEnumerator) { _enumerator = aEnumerator; }
+        public JSONNode Current { get { return _enumerator.Current.Value; } }
+        public bool MoveNext() { return _enumerator.MoveNext(); }
+        public ValueEnumerator GetEnumerator() { return this; }
+    }
+    public struct KeyEnumerator
+    {
+        private Enumerator _enumerator;
+        public KeyEnumerator(List<JSONNode>.Enumerator aArrayEnum) : this(new Enumerator(aArrayEnum)) { }
+        public KeyEnumerator(Dictionary<string, JSONNode>.Enumerator aDictEnum) : this(new Enumerator(aDictEnum)) { }
+        public KeyEnumerator(Enumerator aEnumerator) { _enumerator = aEnumerator; }
+        public string Current { get { return _enumerator.Current.Key; } }
+        public bool MoveNext() { return _enumerator.MoveNext(); }
+        public KeyEnumerator GetEnumerator() { return this; }
+    }
+
+    public class LinqEnumerator : IEnumerator<KeyValuePair<string, JSONNode>>, IEnumerable<KeyValuePair<string, JSONNode>>
+    {
+        private JSONNode _node;
+        private Enumerator _enumerator;
+        internal LinqEnumerator(JSONNode aNode)
+        {
+            _node = aNode;
+            if (_node != null)
+                _enumerator = _node.GetEnumerator();
+        }
+        public KeyValuePair<string, JSONNode> Current { get { return _enumerator.Current; } }
+        object IEnumerator.Current { get { return _enumerator.Current; } }
+        public bool MoveNext() { return _enumerator.MoveNext(); }
+
+#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
+        public void Dispose()
+#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
+        {
+            _node = null;
+            _enumerator = new Enumerator();
+        }
+
+        public IEnumerator<KeyValuePair<string, JSONNode>> GetEnumerator()
+        {
+            return new LinqEnumerator(_node);
+        }
+
+        public void Reset()
+        {
+            if (_node != null)
+                _enumerator = _node.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new LinqEnumerator(_node);
+        }
+    }
+
+    #endregion Enumerators
+
+    #region common interface
+
+    public static bool ForceASCII; // Use Unicode by default
+    public static bool LongAsString; // lazy creator creates a JSONString instead of JSONNumber
+    public static bool AllowLineComments = true; // allow "//"-style comments at the end of a line
+
+    public abstract JSONNodeType Tag { get; }
+
+    public virtual JSONNode this[int aIndex] { get { return null; } set { } }
+
+    public virtual JSONNode this[string aKey] { get { return null; } set { } }
+
+    public virtual string Value { get { return ""; } set { } }
+
+    public virtual int Count { get { return 0; } }
+
+    public virtual bool IsNumber { get { return false; } }
+    public virtual bool IsString { get { return false; } }
+    public virtual bool IsBoolean { get { return false; } }
+    public virtual bool IsNull { get { return false; } }
+    public virtual bool IsArray { get { return false; } }
+    public virtual bool IsObject { get { return false; } }
+
+    public virtual bool Inline { get { return false; } set { } }
+
+    public virtual void Add(string aKey, JSONNode aItem)
+    {
+    }
+    public virtual void Add(JSONNode aItem)
+    {
+        Add("", aItem);
+    }
+
+    public virtual JSONNode Remove(string aKey)
+    {
+        return null;
+    }
+
+    public virtual JSONNode Remove(int aIndex)
+    {
+        return null;
+    }
+
+    public virtual JSONNode Remove(JSONNode aNode)
+    {
+        return aNode;
+    }
+    public virtual void Clear() { }
+
+    public virtual JSONNode Clone()
+    {
+        return null;
+    }
+
+    public virtual IEnumerable<JSONNode> Children
+    {
+        get
+        {
+            yield break;
+        }
+    }
+
+    public IEnumerable<JSONNode> DeepChildren
+    {
+        get
+        {
+            foreach (var c in Children)
+                foreach (var d in c.DeepChildren)
+                    yield return d;
+        }
+    }
+
+    public virtual bool HasKey(string aKey)
+    {
+        return false;
+    }
+
+    public virtual JSONNode GetValueOrDefault(string aKey, JSONNode aDefault)
+    {
+        return aDefault;
+    }
+
+    public override string ToString()
+    {
+        StringBuilder sb = new();
+        WriteToStringBuilder(sb, 0, 0, JSONTextMode.Compact);
+        return sb.ToString();
+    }
+
+    public virtual string ToString(int aIndent)
+    {
+        StringBuilder sb = new();
+        WriteToStringBuilder(sb, 0, aIndent, JSONTextMode.Indent);
+        return sb.ToString();
+    }
+    internal abstract void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode);
+
+    public abstract Enumerator GetEnumerator();
+    public IEnumerable<KeyValuePair<string, JSONNode>> Linq { get { return new LinqEnumerator(this); } }
+    public KeyEnumerator Keys { get { return new KeyEnumerator(GetEnumerator()); } }
+    public ValueEnumerator Values { get { return new ValueEnumerator(GetEnumerator()); } }
+
+    #endregion common interface
+
+    #region typecasting properties
+
+
+    public virtual double AsDouble
+    {
+        get
+        {
+            return double.TryParse(Value, NumberStyles.Float, CultureInfo.InvariantCulture, out double v) ? v : 0.0;
+        }
+        set
+        {
+            Value = value.ToString(CultureInfo.InvariantCulture);
+        }
+    }
+
+    public virtual int AsInt
+    {
+        get { return (int)AsDouble; }
+        set { AsDouble = value; }
+    }
+
+    public virtual float AsFloat
+    {
+        get { return (float)AsDouble; }
+        set { AsDouble = value; }
+    }
+
+    public virtual bool AsBool
+    {
+        get
+        {
+            return bool.TryParse(Value, out bool v) ? v : !Value.IsNullOrEmpty();
+        }
+        set
+        {
+            Value = (value) ? "true" : "false";
+        }
+    }
+
+    public virtual long AsLong
+    {
+        get
+        {
+            return long.TryParse(Value, out long val) ? val : 0L;
+        }
+        set
+        {
+            Value = value.ToString(CultureInfo.InvariantCulture);
+        }
+    }
+
+    public virtual ulong AsULong
+    {
+        get
+        {
+            return ulong.TryParse(Value, out ulong val) ? val : 0;
+        }
+        set
+        {
+            Value = value.ToString(CultureInfo.InvariantCulture);
+        }
+    }
+
+    public virtual JSONArray AsArray
+    {
+        get
+        {
+            return this as JSONArray;
+        }
+    }
+
+    public virtual JSONObject AsObject
+    {
+        get
+        {
+            return this as JSONObject;
+        }
+    }
+
+
+    #endregion typecasting properties
+
+    #region operators
+
+    public static implicit operator JSONNode(string s)
+    {
+        return (s == null) ? (JSONNode)JSONNull.CreateOrGet() : new JSONString(s);
+    }
+    public static implicit operator string(JSONNode d)
+    {
+        return d?.Value;
+    }
+
+    public static implicit operator JSONNode(double n)
+    {
+        return new JSONNumber(n);
+    }
+    public static implicit operator double(JSONNode d)
+    {
+        return (d == null) ? 0 : d.AsDouble;
+    }
+
+    public static implicit operator JSONNode(float n)
+    {
+        return new JSONNumber(n);
+    }
+    public static implicit operator float(JSONNode d)
+    {
+        return (d == null) ? 0 : d.AsFloat;
+    }
+
+    public static implicit operator JSONNode(int n)
+    {
+        return new JSONNumber(n);
+    }
+    public static implicit operator int(JSONNode d)
+    {
+        return (d == null) ? 0 : d.AsInt;
+    }
+
+    public static implicit operator JSONNode(long n)
+    {
+        return LongAsString ? new JSONString(n.ToString(CultureInfo.InvariantCulture)) : new JSONNumber(n);
+    }
+    public static implicit operator long(JSONNode d)
+    {
+        return (d == null) ? 0L : d.AsLong;
+    }
+
+    public static implicit operator JSONNode(ulong n)
+    {
+        return LongAsString ? new JSONString(n.ToString(CultureInfo.InvariantCulture)) : new JSONNumber(n);
+    }
+    public static implicit operator ulong(JSONNode d)
+    {
+        return (d == null) ? 0 : d.AsULong;
+    }
+
+    public static implicit operator JSONNode(bool b)
+    {
+        return new JSONBool(b);
+    }
+    public static implicit operator bool(JSONNode d)
+    {
+        return d != null && d.AsBool;
+    }
+
+    public static implicit operator JSONNode(KeyValuePair<string, JSONNode> aKeyValue)
+    {
+        return aKeyValue.Value;
+    }
+
+    public static bool operator ==(JSONNode a, object b)
+    {
+        if (ReferenceEquals(a, b))
+            return true;
+        bool aIsNull = a is JSONNull or null or JSONLazyCreator;
+        bool bIsNull = b is JSONNull or null or JSONLazyCreator;
+        return aIsNull && bIsNull || !aIsNull && a.Equals(b);
+    }
+
+    public static bool operator !=(JSONNode a, object b)
+    {
+        return !(a == b);
+    }
+
+    public override bool Equals(object obj)
+    {
+        return ReferenceEquals(this, obj);
+    }
+
+    public override int GetHashCode()
+    {
+        return base.GetHashCode();
+    }
+
+    #endregion operators
+
+    [ThreadStatic]
+    private static StringBuilder s_escapeBuilder;
+    internal static StringBuilder EscapeBuilder
+    {
+        get
+        {
+            s_escapeBuilder ??= new StringBuilder();
+            return s_escapeBuilder;
+        }
+    }
+    internal static string Escape(string aText)
+    {
+        var sb = EscapeBuilder;
+        sb.Length = 0;
+        if (sb.Capacity < aText.Length + aText.Length / 10)
+            sb.Capacity = aText.Length + aText.Length / 10;
+        foreach (char c in aText)
+        {
+            switch (c)
+            {
+                case '\\':
+                    sb.Append("\\\\");
+                    break;
+                case '\"':
+                    sb.Append("\\\"");
+                    break;
+                case '\n':
+                    sb.Append("\\n");
+                    break;
+                case '\r':
+                    sb.Append("\\r");
+                    break;
+                case '\t':
+                    sb.Append("\\t");
+                    break;
+                case '\b':
+                    sb.Append("\\b");
+                    break;
+                case '\f':
+                    sb.Append("\\f");
+                    break;
+                default:
+                    if (c < ' ' || (ForceASCII && c > 127))
+                    {
+                        ushort val = c;
+                        sb.Append("\\u").Append(val.ToString("X4", CultureInfo.InvariantCulture));
+                    }
+                    else
+                        sb.Append(c);
+                    break;
+            }
+        }
+        string result = sb.ToString();
+        sb.Length = 0;
+        return result;
+    }
+
+    private static JSONNode ParseElement(string token, bool quoted)
+    {
+        if (quoted)
+            return token;
+        if (token.Length <= 5)
+        {
+            string tmp = token.ToLower(CultureInfo.InvariantCulture);
+            if (tmp is "false" or "true")
+                return tmp == "true";
+            if (tmp == "null")
+                return JSONNull.CreateOrGet();
+        }
+        return double.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out double val) ? (JSONNode)val : (JSONNode)token;
+    }
+
+    public static JSONNode Parse(string aJSON)
+    {
+        Stack<JSONNode> stack = new();
+        JSONNode ctx = null;
+        int i = 0;
+        StringBuilder token = new();
+        string tokenName = "";
+        bool quoteMode = false;
+        bool tokenIsQuoted = false;
+        bool hasNewlineChar = false;
+        while (i < aJSON.Length)
+        {
+            switch (aJSON[i])
+            {
+                case '{':
+                    if (quoteMode)
+                    {
+                        token.Append(aJSON[i]);
+                        break;
+                    }
+                    stack.Push(new JSONObject());
+                    if (ctx != null)
+                    {
+                        ctx.Add(tokenName, stack.Peek());
+                    }
+                    tokenName = "";
+                    token.Length = 0;
+                    ctx = stack.Peek();
+                    hasNewlineChar = false;
+                    break;
+
+                case '[':
+                    if (quoteMode)
+                    {
+                        token.Append(aJSON[i]);
+                        break;
+                    }
+
+                    stack.Push(new JSONArray());
+                    if (ctx != null)
+                    {
+                        ctx.Add(tokenName, stack.Peek());
+                    }
+                    tokenName = "";
+                    token.Length = 0;
+                    ctx = stack.Peek();
+                    hasNewlineChar = false;
+                    break;
+
+                case '}':
+                case ']':
+                    if (quoteMode)
+                    {
+
+                        token.Append(aJSON[i]);
+                        break;
+                    }
+                    if (stack.Count == 0)
+                        throw new Exception("JSON Parse: Too many closing brackets");
+
+                    stack.Pop();
+                    if (token.Length > 0 || tokenIsQuoted)
+                        ctx.Add(tokenName, ParseElement(token.ToString(), tokenIsQuoted));
+                    if (ctx != null)
+                        ctx.Inline = !hasNewlineChar;
+                    tokenIsQuoted = false;
+                    tokenName = "";
+                    token.Length = 0;
+                    if (stack.Count > 0)
+                        ctx = stack.Peek();
+                    break;
+
+                case ':':
+                    if (quoteMode)
+                    {
+                        token.Append(aJSON[i]);
+                        break;
+                    }
+                    tokenName = token.ToString();
+                    token.Length = 0;
+                    tokenIsQuoted = false;
+                    break;
+
+                case '"':
+                    quoteMode ^= true;
+                    tokenIsQuoted |= quoteMode;
+                    break;
+
+                case ',':
+                    if (quoteMode)
+                    {
+                        token.Append(aJSON[i]);
+                        break;
+                    }
+                    if (token.Length > 0 || tokenIsQuoted)
+                        ctx.Add(tokenName, ParseElement(token.ToString(), tokenIsQuoted));
+#pragma warning disable IDE0059 // Unnecessary assignment of a value
+                    tokenIsQuoted = false;
+#pragma warning restore IDE0059 // Unnecessary assignment of a value
+                    tokenName = "";
+                    token.Length = 0;
+                    tokenIsQuoted = false;
+                    break;
+
+                case '\r':
+                case '\n':
+                    hasNewlineChar = true;
+                    break;
+
+                case ' ':
+                case '\t':
+                    if (quoteMode)
+                        token.Append(aJSON[i]);
+                    break;
+
+                case '\\':
+                    ++i;
+                    if (quoteMode)
+                    {
+                        char c = aJSON[i];
+                        switch (c)
+                        {
+                            case 't':
+                                token.Append('\t');
+                                break;
+                            case 'r':
+                                token.Append('\r');
+                                break;
+                            case 'n':
+                                token.Append('\n');
+                                break;
+                            case 'b':
+                                token.Append('\b');
+                                break;
+                            case 'f':
+                                token.Append('\f');
+                                break;
+                            case 'u':
+                                {
+                                    string s = aJSON.Substring(i + 1, 4);
+                                    token.Append((char)int.Parse(
+                                        s,
+                                        System.Globalization.NumberStyles.AllowHexSpecifier,
+                                        CultureInfo.InvariantCulture));
+                                    i += 4;
+                                    break;
+                                }
+                            default:
+                                token.Append(c);
+                                break;
+                        }
+                    }
+                    break;
+                case '/':
+                    if (AllowLineComments && !quoteMode && i + 1 < aJSON.Length && aJSON[i + 1] == '/')
+                    {
+                        while (++i < aJSON.Length && aJSON[i] != '\n' && aJSON[i] != '\r') ;
+                        break;
+                    }
+                    token.Append(aJSON[i]);
+                    break;
+                case '\uFEFF': // remove / ignore BOM (Byte Order Mark)
+                    break;
+
+                default:
+                    token.Append(aJSON[i]);
+                    break;
+            }
+            ++i;
+        }
+        if (quoteMode)
+        {
+            throw new Exception("JSON Parse: Quotation marks seems to be messed up.");
+        }
+        if (ctx == null)
+            return ParseElement(token.ToString(), tokenIsQuoted);
+        return ctx;
+    }
+
+}
+// End of JSONNode
+
+internal partial class JSONArray : JSONNode
+{
+    private readonly List<JSONNode> _list = new();
+    private bool _inline;
+    public override bool Inline
+    {
+        get { return _inline; }
+        set { _inline = value; }
+    }
+
+    public override JSONNodeType Tag { get { return JSONNodeType.Array; } }
+    public override bool IsArray { get { return true; } }
+    public override Enumerator GetEnumerator() { return new Enumerator(_list.GetEnumerator()); }
+
+    public override JSONNode this[int aIndex]
+    {
+        get
+        {
+            return aIndex < 0 || aIndex >= _list.Count ? new JSONLazyCreator(this) : _list[aIndex];
+        }
+        set
+        {
+            if (value == null)
+                value = JSONNull.CreateOrGet();
+            if (aIndex < 0 || aIndex >= _list.Count)
+                _list.Add(value);
+            else
+                _list[aIndex] = value;
+        }
+    }
+
+    public override JSONNode this[string aKey]
+    {
+        get { return new JSONLazyCreator(this); }
+        set
+        {
+            if (value == null)
+                value = JSONNull.CreateOrGet();
+            _list.Add(value);
+        }
+    }
+
+    public override int Count
+    {
+        get { return _list.Count; }
+    }
+
+    public override void Add(string aKey, JSONNode aItem)
+    {
+        if (aItem == null)
+            aItem = JSONNull.CreateOrGet();
+        _list.Add(aItem);
+    }
+
+    public override JSONNode Remove(int aIndex)
+    {
+        if (aIndex < 0 || aIndex >= _list.Count)
+            return null;
+        JSONNode tmp = _list[aIndex];
+        _list.RemoveAt(aIndex);
+        return tmp;
+    }
+
+    public override JSONNode Remove(JSONNode aNode)
+    {
+        _list.Remove(aNode);
+        return aNode;
+    }
+
+    public override void Clear()
+    {
+        _list.Clear();
+    }
+
+    public override JSONNode Clone()
+    {
+        var node = new JSONArray();
+        node._list.Capacity = _list.Capacity;
+        foreach (var n in _list)
+        {
+            if (n != null)
+                node.Add(n.Clone());
+            else
+                node.Add(null);
+        }
+        return node;
+    }
+
+    public override IEnumerable<JSONNode> Children
+    {
+        get
+        {
+            foreach (JSONNode n in _list)
+                yield return n;
+        }
+    }
+
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append('[');
+        int count = _list.Count;
+        if (_inline)
+            aMode = JSONTextMode.Compact;
+        for (int i = 0; i < count; i++)
+        {
+            if (i > 0)
+                aSB.Append(',');
+            if (aMode == JSONTextMode.Indent)
+                aSB.AppendLine();
+
+            if (aMode == JSONTextMode.Indent)
+                aSB.Append(' ', aIndent + aIndentInc);
+            _list[i].WriteToStringBuilder(aSB, aIndent + aIndentInc, aIndentInc, aMode);
+        }
+        if (aMode == JSONTextMode.Indent)
+            aSB.AppendLine().Append(' ', aIndent);
+        aSB.Append(']');
+    }
+}
+// End of JSONArray
+
+internal partial class JSONObject : JSONNode
+{
+    private readonly Dictionary<string, JSONNode> _dict = new();
+
+    private bool _inline;
+    public override bool Inline
+    {
+        get { return _inline; }
+        set { _inline = value; }
+    }
+
+    public override JSONNodeType Tag { get { return JSONNodeType.Object; } }
+    public override bool IsObject { get { return true; } }
+
+    public override Enumerator GetEnumerator() { return new Enumerator(_dict.GetEnumerator()); }
+
+
+    public override JSONNode this[string aKey]
+    {
+        get
+        {
+            return _dict.ContainsKey(aKey) ? _dict[aKey] : new JSONLazyCreator(this, aKey);
+        }
+        set
+        {
+            if (value == null)
+                value = JSONNull.CreateOrGet();
+            if (_dict.ContainsKey(aKey))
+                _dict[aKey] = value;
+            else
+                _dict.Add(aKey, value);
+        }
+    }
+
+    public override JSONNode this[int aIndex]
+    {
+        get
+        {
+            return aIndex < 0 || aIndex >= _dict.Count ? null : _dict.ElementAt(aIndex).Value;
+        }
+        set
+        {
+            if (value == null)
+                value = JSONNull.CreateOrGet();
+            if (aIndex < 0 || aIndex >= _dict.Count)
+                return;
+            string key = _dict.ElementAt(aIndex).Key;
+            _dict[key] = value;
+        }
+    }
+
+    public override int Count
+    {
+        get { return _dict.Count; }
+    }
+
+    public override void Add(string aKey, JSONNode aItem)
+    {
+        if (aItem == null)
+            aItem = JSONNull.CreateOrGet();
+
+        if (aKey != null)
+        {
+            if (_dict.ContainsKey(aKey))
+                _dict[aKey] = aItem;
+            else
+                _dict.Add(aKey, aItem);
+        }
+        else
+            _dict.Add(Guid.NewGuid().ToString(), aItem);
+    }
+
+    public override JSONNode Remove(string aKey)
+    {
+        if (!_dict.ContainsKey(aKey))
+            return null;
+        JSONNode tmp = _dict[aKey];
+        _dict.Remove(aKey);
+        return tmp;
+    }
+
+    public override JSONNode Remove(int aIndex)
+    {
+        if (aIndex < 0 || aIndex >= _dict.Count)
+            return null;
+        var item = _dict.ElementAt(aIndex);
+        _dict.Remove(item.Key);
+        return item.Value;
+    }
+
+    public override JSONNode Remove(JSONNode aNode)
+    {
+        try
+        {
+            var item = _dict.Where(k => k.Value == aNode).First();
+            _dict.Remove(item.Key);
+            return aNode;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public override void Clear()
+    {
+        _dict.Clear();
+    }
+
+    public override JSONNode Clone()
+    {
+        var node = new JSONObject();
+        foreach (var n in _dict)
+        {
+            node.Add(n.Key, n.Value.Clone());
+        }
+        return node;
+    }
+
+    public override bool HasKey(string aKey)
+    {
+        return _dict.ContainsKey(aKey);
+    }
+
+    public override JSONNode GetValueOrDefault(string aKey, JSONNode aDefault)
+    {
+        return _dict.TryGetValue(aKey, out JSONNode res) ? res : aDefault;
+    }
+
+    public override IEnumerable<JSONNode> Children
+    {
+        get
+        {
+            foreach (var n in _dict)
+                yield return n.Value;
+        }
+    }
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append('{');
+        bool first = true;
+        if (_inline)
+            aMode = JSONTextMode.Compact;
+        foreach (var k in _dict)
+        {
+            if (!first)
+                aSB.Append(',');
+            first = false;
+            if (aMode == JSONTextMode.Indent)
+                aSB.AppendLine();
+            if (aMode == JSONTextMode.Indent)
+                aSB.Append(' ', aIndent + aIndentInc);
+            aSB.Append('\"').Append(Escape(k.Key)).Append('\"');
+            if (aMode == JSONTextMode.Compact)
+                aSB.Append(':');
+            else
+                aSB.Append(" : ");
+            k.Value.WriteToStringBuilder(aSB, aIndent + aIndentInc, aIndentInc, aMode);
+        }
+        if (aMode == JSONTextMode.Indent)
+            aSB.AppendLine().Append(' ', aIndent);
+        aSB.Append('}');
+    }
+
+}
+// End of JSONObject
+
+internal partial class JSONString : JSONNode
+{
+    private string _data;
+
+    public override JSONNodeType Tag { get { return JSONNodeType.String; } }
+    public override bool IsString { get { return true; } }
+
+    public override Enumerator GetEnumerator() { return new Enumerator(); }
+
+
+    public override string Value
+    {
+        get { return _data; }
+        set
+        {
+            _data = value;
+        }
+    }
+
+    public JSONString(string aData)
+    {
+        _data = aData;
+    }
+    public override JSONNode Clone()
+    {
+        return new JSONString(_data);
+    }
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append('\"').Append(Escape(_data)).Append('\"');
+    }
+    public override bool Equals(object obj)
+    {
+        if (base.Equals(obj))
+            return true;
+        if (obj is string s)
+            return _data == s;
+        JSONString s2 = obj as JSONString;
+        return s2 != null && _data == s2._data;
+    }
+    public override int GetHashCode()
+    {
+        return _data.GetHashCode();
+    }
+    public override void Clear()
+    {
+        _data = "";
+    }
+}
+// End of JSONString
+
+internal partial class JSONNumber : JSONNode
+{
+    private double _data;
+
+    public override JSONNodeType Tag { get { return JSONNodeType.Number; } }
+    public override bool IsNumber { get { return true; } }
+    public override Enumerator GetEnumerator() { return new Enumerator(); }
+
+    public override string Value
+    {
+        get { return _data.ToString(CultureInfo.InvariantCulture); }
+        set
+        {
+            if (double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out double v))
+                _data = v;
+        }
+    }
+
+    public override double AsDouble
+    {
+        get { return _data; }
+        set { _data = value; }
+    }
+    public override long AsLong
+    {
+        get { return (long)_data; }
+        set { _data = value; }
+    }
+    public override ulong AsULong
+    {
+        get { return (ulong)_data; }
+        set { _data = value; }
+    }
+
+    public JSONNumber(double aData)
+    {
+        _data = aData;
+    }
+
+    public JSONNumber(string aData)
+    {
+        Value = aData;
+    }
+
+    public override JSONNode Clone()
+    {
+        return new JSONNumber(_data);
+    }
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append(Value);
+    }
+    private static bool IsNumeric(object value)
+    {
+        return value is int or uint
+            or float or double
+            or decimal
+            or long or ulong
+            or short or ushort
+            or sbyte or byte;
+    }
+    public override bool Equals(object obj)
+    {
+        if (obj == null)
+            return false;
+        if (base.Equals(obj))
+            return true;
+        JSONNumber s2 = obj as JSONNumber;
+        return s2 != null ? _data == s2._data : IsNumeric(obj) && Convert.ToDouble(obj, CultureInfo.InvariantCulture) == _data;
+    }
+    public override int GetHashCode()
+    {
+        return _data.GetHashCode();
+    }
+    public override void Clear()
+    {
+        _data = 0;
+    }
+}
+// End of JSONNumber
+
+internal partial class JSONBool : JSONNode
+{
+    private bool _data;
+
+    public override JSONNodeType Tag { get { return JSONNodeType.Boolean; } }
+    public override bool IsBoolean { get { return true; } }
+    public override Enumerator GetEnumerator() { return new Enumerator(); }
+
+    public override string Value
+    {
+        get { return _data.ToString(); }
+        set
+        {
+            if (bool.TryParse(value, out bool v))
+                _data = v;
+        }
+    }
+    public override bool AsBool
+    {
+        get { return _data; }
+        set { _data = value; }
+    }
+
+    public JSONBool(bool aData)
+    {
+        _data = aData;
+    }
+
+    public JSONBool(string aData)
+    {
+        Value = aData;
+    }
+
+    public override JSONNode Clone()
+    {
+        return new JSONBool(_data);
+    }
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append((_data) ? "true" : "false");
+    }
+    public override bool Equals(object obj)
+    {
+        return obj != null && obj is bool boolean && _data == boolean;
+    }
+    public override int GetHashCode()
+    {
+        return _data.GetHashCode();
+    }
+    public override void Clear()
+    {
+        _data = false;
+    }
+}
+// End of JSONBool
+
+internal partial class JSONNull : JSONNode
+{
+    private static readonly JSONNull StaticInstance = new();
+    public static bool ReuseSameInstance = true;
+    public static JSONNull CreateOrGet()
+    {
+        return ReuseSameInstance ? StaticInstance : new JSONNull();
+    }
+    private JSONNull() { }
+
+    public override JSONNodeType Tag { get { return JSONNodeType.NullValue; } }
+    public override bool IsNull { get { return true; } }
+    public override Enumerator GetEnumerator() { return new Enumerator(); }
+
+    public override string Value
+    {
+        get { return "null"; }
+        set { }
+    }
+    public override bool AsBool
+    {
+        get { return false; }
+        set { }
+    }
+
+    public override JSONNode Clone()
+    {
+        return CreateOrGet();
+    }
+
+    public override bool Equals(object obj)
+    {
+        return object.ReferenceEquals(this, obj) || obj is JSONNull;
+    }
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append("null");
+    }
+}
+// End of JSONNull
+
+internal partial class JSONLazyCreator : JSONNode
+{
+    private JSONNode _node;
+    private readonly string _key;
+    public override JSONNodeType Tag { get { return JSONNodeType.None; } }
+    public override Enumerator GetEnumerator() { return new Enumerator(); }
+
+    public JSONLazyCreator(JSONNode aNode)
+    {
+        _node = aNode;
+        _key = null;
+    }
+
+    public JSONLazyCreator(JSONNode aNode, string aKey)
+    {
+        _node = aNode;
+        _key = aKey;
+    }
+
+    private T Set<T>(T aVal) where T : JSONNode
+    {
+        if (_key == null)
+            _node.Add(aVal);
+        else
+            _node.Add(_key, aVal);
+        _node = null; // Be GC friendly.
+        return aVal;
+    }
+
+    public override JSONNode this[int aIndex]
+    {
+        get { return new JSONLazyCreator(this); }
+        set { Set(new JSONArray()).Add(value); }
+    }
+
+    public override JSONNode this[string aKey]
+    {
+        get { return new JSONLazyCreator(this, aKey); }
+        set { Set(new JSONObject()).Add(aKey, value); }
+    }
+
+    public override void Add(JSONNode aItem)
+    {
+        Set(new JSONArray()).Add(aItem);
+    }
+
+    public override void Add(string aKey, JSONNode aItem)
+    {
+        Set(new JSONObject()).Add(aKey, aItem);
+    }
+
+    public static bool operator ==(JSONLazyCreator a, object b)
+    {
+        return b == null || System.Object.ReferenceEquals(a, b);
+    }
+
+    public static bool operator !=(JSONLazyCreator a, object b)
+    {
+        return !(a == b);
+    }
+
+    public override bool Equals(object obj)
+    {
+        return obj == null || System.Object.ReferenceEquals(this, obj);
+    }
+
+    public override int GetHashCode()
+    {
+        return 0;
+    }
+
+    public override int AsInt
+    {
+        get { Set(new JSONNumber(0)); return 0; }
+        set { Set(new JSONNumber(value)); }
+    }
+
+    public override float AsFloat
+    {
+        get { Set(new JSONNumber(0.0f)); return 0.0f; }
+        set { Set(new JSONNumber(value)); }
+    }
+
+    public override double AsDouble
+    {
+        get { Set(new JSONNumber(0.0)); return 0.0; }
+        set { Set(new JSONNumber(value)); }
+    }
+
+    public override long AsLong
+    {
+        get
+        {
+            if (LongAsString)
+                Set(new JSONString("0"));
+            else
+                Set(new JSONNumber(0.0));
+            return 0L;
+        }
+        set
+        {
+            if (LongAsString)
+                Set(new JSONString(value.ToString(CultureInfo.InvariantCulture)));
+            else
+                Set(new JSONNumber(value));
+        }
+    }
+
+    public override ulong AsULong
+    {
+        get
+        {
+            if (LongAsString)
+                Set(new JSONString("0"));
+            else
+                Set(new JSONNumber(0.0));
+            return 0L;
+        }
+        set
+        {
+            if (LongAsString)
+                Set(new JSONString(value.ToString(CultureInfo.InvariantCulture)));
+            else
+                Set(new JSONNumber(value));
+        }
+    }
+
+    public override bool AsBool
+    {
+        get { Set(new JSONBool(false)); return false; }
+        set { Set(new JSONBool(value)); }
+    }
+
+    public override JSONArray AsArray
+    {
+        get { return Set(new JSONArray()); }
+    }
+
+    public override JSONObject AsObject
+    {
+        get { return Set(new JSONObject()); }
+    }
+    internal override void WriteToStringBuilder(StringBuilder aSB, int aIndent, int aIndentInc, JSONTextMode aMode)
+    {
+        aSB.Append("null");
+    }
+}
+// End of JSONLazyCreator
+
+internal static class JSON
+{
+    public static JSONNode Parse(string aJSON)
+    {
+        return JSONNode.Parse(aJSON);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Common/Utilities/TypesToLoadUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/TypesToLoadUtilities.cs
index 22f568f399..f4015fb91e 100644
--- a/src/Microsoft.TestPlatform.Common/Utilities/TypesToLoadUtilities.cs
+++ b/src/Microsoft.TestPlatform.Common/Utilities/TypesToLoadUtilities.cs
@@ -1,42 +1,35 @@
-// Copyright(c) Microsoft Corporation.All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 
-    internal static class TypesToLoadUtilities
-    {
-        public const string TypesToLoadAttributeFullName = "Microsoft.VisualStudio.TestPlatform.TestExtensionTypesAttribute";
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
-        internal static IEnumerable<Type> GetTypesToLoad(Assembly assembly)
-        {
-            ValidateArg.NotNull(assembly, nameof(assembly));
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
-            var typesToLoad = assembly
-                .GetCustomAttributes(TypesToLoadAttributeFullName)
-                .SelectMany(i => GetTypesToLoad(i));
+internal static class TypesToLoadUtilities
+{
+    public const string TypesToLoadAttributeFullName = "Microsoft.VisualStudio.TestPlatform.TestExtensionTypesAttribute";
 
-            return typesToLoad;
-        }
+    internal static IEnumerable<Type> GetTypesToLoad(Assembly assembly)
+    {
+        ValidateArg.NotNull(assembly, nameof(assembly));
+        var typesToLoad = assembly
+            .GetCustomAttributes(TypesToLoadAttributeFullName)
+            .SelectMany(i => GetTypesToLoad(i));
 
-        private static IEnumerable<Type> GetTypesToLoad(Attribute attribute)
-        {
-            if (attribute == null)
-                return Enumerable.Empty<Type>();
+        return typesToLoad;
+    }
 
-            var type = attribute.GetType();
-            var typesProperty = type.GetProperty("Types");
-            if(typesProperty == null)
-                return Enumerable.Empty<Type>();
+    private static IEnumerable<Type> GetTypesToLoad(Attribute attribute)
+    {
+        var type = attribute.GetType();
+        var typesProperty = type.GetProperty("Types");
 
-            return typesProperty.GetValue(attribute) as Type[];
-        }
+        return typesProperty?.GetValue(attribute) as Type[] ?? Enumerable.Empty<Type>();
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/CommunicationEndpointFactory.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/CommunicationEndpointFactory.cs
index 99b2621f38..2f9464849f 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/CommunicationEndpointFactory.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/CommunicationEndpointFactory.cs
@@ -1,30 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    /// <summary>
-    /// Implements ICommunicationEndpointFactory.
-    /// </summary>
-    public class CommunicationEndpointFactory : ICommunicationEndpointFactory
-    {
-        /// <inheritdoc />
-        public ICommunicationEndPoint Create(ConnectionRole role)
-        {
-            ICommunicationEndPoint endPoint;
-            if (role == ConnectionRole.Host)
-            {
-                endPoint = new SocketServer();
-            }
-            else
-            {
-                endPoint = new SocketClient();
-            }
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
-            return endPoint;
-        }
+/// <summary>
+/// Implements ICommunicationEndpointFactory.
+/// </summary>
+public class CommunicationEndpointFactory : ICommunicationEndpointFactory
+{
+    /// <inheritdoc />
+    public ICommunicationEndPoint Create(ConnectionRole role)
+    {
+        ICommunicationEndPoint endPoint = role == ConnectionRole.Host ? new SocketServer() : new SocketClient();
+        return endPoint;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
index 7add8c6308..5dbd569619 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
@@ -1,415 +1,414 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+
+/// <summary>
+/// Handles test session events received from vstest console process.
+/// </summary>
+internal class DataCollectionRequestHandler : IDataCollectionRequestHandler, IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+    private static readonly object SyncObject = new();
 
-    /// <summary>
-    /// Handles test session events received from vstest console process.
-    /// </summary>
-    internal class DataCollectionRequestHandler : IDataCollectionRequestHandler, IDisposable
-    {
-        private static readonly object SyncObject = new object();
-
-        private readonly ICommunicationManager communicationManager;
-
-        private IMessageSink messageSink;
-
-        private IDataCollectionManager dataCollectionManager;
-
-        private IDataCollectionTestCaseEventHandler dataCollectionTestCaseEventHandler;
-
-        private Task testCaseEventMonitorTask;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IMessageSink _messageSink;
+    private readonly IDataCollectionManager _dataCollectionManager;
+    private readonly IDataCollectionTestCaseEventHandler _dataCollectionTestCaseEventHandler;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly IFileHelper _fileHelper;
+    private readonly IRequestData _requestData;
 
-        private IDataSerializer dataSerializer;
+    private Task? _testCaseEventMonitorTask;
 
-        private IFileHelper fileHelper;
-
-        private IRequestData requestData;
-
-        /// <summary>
-        /// Use to cancel data collection test case events monitoring if test run is canceled.
-        /// </summary>
-        private CancellationTokenSource cancellationTokenSource;
+    /// <summary>
+    /// Use to cancel data collection test case events monitoring if test run is canceled.
+    /// </summary>
+    private readonly CancellationTokenSource _cancellationTokenSource;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRequestHandler"/> class.
-        /// </summary>
-        /// <param name="messageSink">
-        /// The message sink.
-        /// </param>
-        /// <param name="requestData">
-        /// The request data.
-        /// </param>
-        protected DataCollectionRequestHandler(IMessageSink messageSink, IRequestData requestData)
-            : this(
-                new SocketCommunicationManager(),
-                messageSink,
-                DataCollectionManager.Create(messageSink, requestData),
-                new DataCollectionTestCaseEventHandler(),
-                JsonDataSerializer.Instance,
-                new FileHelper(),
-                requestData)
-        {
-            this.messageSink = messageSink;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionRequestHandler"/> class.
+    /// </summary>
+    /// <param name="communicationManager">
+    /// The communication manager.
+    /// </param>
+    /// <param name="messageSink">
+    /// The message sink.
+    /// </param>
+    /// <param name="dataCollectionManager">
+    /// The data collection manager.
+    /// </param>
+    /// <param name="dataCollectionTestCaseEventHandler">
+    /// The data collection test case event handler.
+    /// </param>
+    /// <param name="dataSerializer">
+    /// Serializer for serialization and deserialization of the messages.
+    /// </param>
+    /// <param name="fileHelper">
+    /// File Helper
+    /// </param>
+    /// <param name="requestData">
+    /// Request data
+    /// </param>
+    protected DataCollectionRequestHandler(
+        ICommunicationManager communicationManager,
+        IMessageSink messageSink,
+        IDataCollectionManager dataCollectionManager,
+        IDataCollectionTestCaseEventHandler dataCollectionTestCaseEventHandler,
+        IDataSerializer dataSerializer,
+        IFileHelper fileHelper,
+        IRequestData requestData)
+    {
+        _communicationManager = communicationManager;
+        _messageSink = messageSink;
+        _dataCollectionManager = dataCollectionManager;
+        _dataSerializer = dataSerializer;
+        _dataCollectionTestCaseEventHandler = dataCollectionTestCaseEventHandler;
+        _cancellationTokenSource = new CancellationTokenSource();
+        _fileHelper = fileHelper;
+        _requestData = requestData;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRequestHandler"/> class.
-        /// </summary>
-        /// <param name="communicationManager">
-        /// The communication manager.
-        /// </param>
-        /// <param name="messageSink">
-        /// The message sink.
-        /// </param>
-        /// <param name="dataCollectionManager">
-        /// The data collection manager.
-        /// </param>
-        /// <param name="dataCollectionTestCaseEventHandler">
-        /// The data collection test case event handler.
-        /// </param>
-        /// <param name="dataSerializer">
-        /// Serializer for serialization and deserialization of the messages.
-        /// </param>
-        /// <param name="fileHelper">
-        /// File Helper
-        /// </param>
-        /// <param name="requestData">
-        /// Request data
-        /// </param>
-        protected DataCollectionRequestHandler(
-            ICommunicationManager communicationManager,
-            IMessageSink messageSink,
-            IDataCollectionManager dataCollectionManager,
-            IDataCollectionTestCaseEventHandler dataCollectionTestCaseEventHandler,
-            IDataSerializer dataSerializer,
-            IFileHelper fileHelper,
-            IRequestData requestData)
-        {
-            this.communicationManager = communicationManager;
-            this.messageSink = messageSink;
-            this.dataCollectionManager = dataCollectionManager;
-            this.dataSerializer = dataSerializer;
-            this.dataCollectionTestCaseEventHandler = dataCollectionTestCaseEventHandler;
-            this.cancellationTokenSource = new CancellationTokenSource();
-            this.fileHelper = fileHelper;
-            this.requestData = requestData;
-        }
+    /// <summary>
+    /// Gets the singleton instance of DataCollectionRequestHandler.
+    /// </summary>
+    public static DataCollectionRequestHandler? Instance { get; private set; }
 
-        /// <summary>
-        /// Gets the singleton instance of DataCollectionRequestHandler.
-        /// </summary>
-        public static DataCollectionRequestHandler Instance { get; private set; }
-
-        /// <summary>
-        /// Creates singleton instance of DataCollectionRequestHandler.
-        /// </summary>
-        /// <param name="communicationManager">
-        /// Handles socket communication.
-        /// </param>
-        /// <param name="messageSink">
-        /// Message sink for sending messages to execution process.
-        /// </param>
-        /// <returns>
-        /// The instance of <see cref="DataCollectionRequestHandler"/>.
-        /// </returns>
-        public static DataCollectionRequestHandler Create(
-            ICommunicationManager communicationManager,
-            IMessageSink messageSink)
+    /// <summary>
+    /// Creates singleton instance of DataCollectionRequestHandler.
+    /// </summary>
+    /// <param name="communicationManager">
+    /// Handles socket communication.
+    /// </param>
+    /// <param name="messageSink">
+    /// Message sink for sending messages to execution process.
+    /// </param>
+    /// <returns>
+    /// The instance of <see cref="DataCollectionRequestHandler"/>.
+    /// </returns>
+    public static DataCollectionRequestHandler Create(
+        ICommunicationManager communicationManager,
+        IMessageSink messageSink)
+    {
+        ValidateArg.NotNull(communicationManager, nameof(communicationManager));
+        ValidateArg.NotNull(messageSink, nameof(messageSink));
+
+        // TODO: The MessageSink and DataCollectionRequestHandler have circular dependency.
+        // Message sink is injected into this Create method and then into constructor
+        // and into the constructor of DataCollectionRequestHandler. Data collection manager
+        // is then assigned to .Instace (which unlike many other .Instance is not populated
+        // directly in that property, but is created here). And then MessageSink depends on
+        // the .Instance. This is a very complicated way of solving the circular dependency,
+        // and should be replaced by adding a property to Message and assigning it.
+        // .Instance can then be removed.
+        if (Instance == null)
         {
-            ValidateArg.NotNull(communicationManager, nameof(communicationManager));
-            ValidateArg.NotNull(messageSink, nameof(messageSink));
-            if (Instance == null)
+            lock (SyncObject)
             {
-                lock (SyncObject)
+                if (Instance == null)
                 {
-                    if (Instance == null)
-                    {
-                        var requestData = new RequestData();
-
-                        Instance = new DataCollectionRequestHandler(
-                            communicationManager,
-                            messageSink,
-                            DataCollectionManager.Create(messageSink, requestData),
-                            new DataCollectionTestCaseEventHandler(),
-                            JsonDataSerializer.Instance,
-                            new FileHelper(),
-                            requestData);
-                    }
+                    var requestData = new RequestData();
+                    var telemetryReporter = new TelemetryReporter(requestData, communicationManager, JsonDataSerializer.Instance);
+
+                    Instance = new DataCollectionRequestHandler(
+                        communicationManager,
+                        messageSink,
+                        DataCollectionManager.Create(messageSink, requestData, telemetryReporter),
+                        new DataCollectionTestCaseEventHandler(messageSink),
+                        JsonDataSerializer.Instance,
+                        new FileHelper(),
+                        requestData);
                 }
             }
-
-            return Instance;
         }
 
-        /// <inheritdoc />
-        public void InitializeCommunication(int port)
-        {
-            this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
-        }
+        return Instance;
+    }
 
-        /// <inheritdoc />
-        public bool WaitForRequestSenderConnection(int connectionTimeout)
-        {
-            return this.communicationManager.WaitForServerConnection(connectionTimeout);
-        }
+    /// <inheritdoc />
+    public void InitializeCommunication(int port)
+    {
+        _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+    }
 
-        /// <summary>
-        /// Process requests.
-        /// </summary>
-        public void ProcessRequests()
-        {
-            var isSessionEnded = false;
+    /// <inheritdoc />
+    public bool WaitForRequestSenderConnection(int connectionTimeout)
+    {
+        return _communicationManager.WaitForServerConnection(connectionTimeout);
+    }
 
-            do
-            {
-                var message = this.communicationManager.ReceiveMessage();
+    /// <summary>
+    /// Process requests.
+    /// </summary>
+    public void ProcessRequests()
+    {
+        var isSessionEnded = false;
 
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : Datacollector received message: {0}", message);
-                }
+        do
+        {
+            var message = _communicationManager.ReceiveMessage();
 
-                switch (message.MessageType)
-                {
-                    case MessageType.BeforeTestRunStart:
-                        this.HandleBeforeTestRunStart(message);
-                        break;
-
-                    case MessageType.AfterTestRunEnd:
-                        this.HandleAfterTestRunEnd(message);
-                        isSessionEnded = true;
-                        break;
-
-                    case MessageType.TestHostLaunched:
-                        var testHostLaunchedPayload = this.dataSerializer.DeserializePayload<TestHostLaunchedPayload>(message);
-                        this.dataCollectionManager.TestHostLaunched(testHostLaunchedPayload.ProcessId);
-                        break;
-
-                    default:
-                        EqtTrace.Error("DataCollectionRequestHandler.ProcessRequests : Invalid Message types: {0}", message.MessageType);
-                        break;
-                }
+            EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests: Datacollector received message: {0}", message);
+
+            switch (message?.MessageType)
+            {
+                case MessageType.BeforeTestRunStart:
+                    HandleBeforeTestRunStart(message);
+                    break;
+
+                case MessageType.AfterTestRunEnd:
+                    HandleAfterTestRunEnd(message);
+                    isSessionEnded = true;
+                    break;
+
+                case MessageType.TestHostLaunched:
+                    var testHostLaunchedPayload = _dataSerializer.DeserializePayload<TestHostLaunchedPayload>(message);
+                    TPDebug.Assert(testHostLaunchedPayload is not null, "testHostLaunchedPayload is null");
+                    _dataCollectionManager.TestHostLaunched(testHostLaunchedPayload.ProcessId);
+                    break;
+
+                default:
+                    EqtTrace.Error("DataCollectionRequestHandler.ProcessRequests : Invalid Message types: {0}", message?.MessageType);
+                    break;
             }
-            while (!isSessionEnded);
         }
+        while (!isSessionEnded);
+    }
 
-        /// <summary>
-        /// Sends datacollection message.
-        /// </summary>
-        /// <param name="args">
-        /// The args.
-        /// </param>
-        public void SendDataCollectionMessage(DataCollectionMessageEventArgs args)
-        {
-            this.communicationManager.SendMessage(MessageType.DataCollectionMessage, args);
-        }
+    /// <summary>
+    /// Sends datacollection message.
+    /// </summary>
+    /// <param name="args">
+    /// The args.
+    /// </param>
+    public void SendDataCollectionMessage(DataCollectionMessageEventArgs args)
+    {
+        _communicationManager.SendMessage(MessageType.DataCollectionMessage, args);
+    }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            this.communicationManager?.StopClient();
-        }
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    public void Dispose()
+    {
+        _communicationManager?.StopClient();
+    }
 
-        /// <summary>
-        /// Closes the connection
-        /// </summary>
-        public void Close()
-        {
-            this.Dispose();
-            EqtTrace.Info("Closing the connection !");
-        }
+    /// <summary>
+    /// Closes the connection
+    /// </summary>
+    public void Close()
+    {
+        Dispose();
+        EqtTrace.Info("Closing the connection !");
+    }
 
-        /// <summary>
-        /// Update the test adapter paths provided through run settings to be used by the test plugin cache.
-        /// </summary>
-        /// <param name="payload">
-        /// The before test run start payload
-        /// </param>
-        private void AddExtensionAssemblies(BeforeTestRunStartPayload payload)
+    /// <summary>
+    /// Update the test adapter paths provided through run settings to be used by the test plugin cache.
+    /// </summary>
+    /// <param name="payload">
+    /// The before test run start payload
+    /// </param>
+    private void AddExtensionAssemblies(BeforeTestRunStartPayload payload)
+    {
+        try
         {
-            try
+            TPDebug.Assert(payload is not null, "payload is null");
+
+            if (payload.Sources is null)
             {
-                var customTestAdaptersPaths = RunSettingsUtilities.GetTestAdaptersPaths(payload.SettingsXml);
+                EqtTrace.Verbose("DataCollectionRequestHandler.AddExtensionAssemblies: No sources provided");
+                return;
+            }
 
-                // In case of dotnet vstest with code coverage, data collector needs to be picked up from publish folder.
-                // Therefore, adding source dll folders to search datacollectors in these.
-                var datacollectorSearchPaths = new HashSet<string>();
-                foreach (var source in payload.Sources)
-                {
-                    datacollectorSearchPaths.Add(Path.GetDirectoryName(source));
-                }
+            // In case of dotnet vstest with code coverage, data collector needs to be picked up from publish folder.
+            // Therefore, adding source dll folders to search datacollectors in these.
+            var datacollectorSearchPaths = new HashSet<string>();
+            foreach (var source in payload.Sources)
+            {
+                datacollectorSearchPaths.Add(Path.GetDirectoryName(source)!);
+            }
 
-                if (customTestAdaptersPaths != null)
-                {
-                    datacollectorSearchPaths.UnionWith(customTestAdaptersPaths);
-                }
+            var customTestAdaptersPaths = RunSettingsUtilities.GetTestAdaptersPaths(payload.SettingsXml);
+            if (customTestAdaptersPaths != null)
+            {
+                datacollectorSearchPaths.UnionWith(customTestAdaptersPaths);
+            }
 
-                List<string> extensionAssemblies = new List<string>();
-                foreach (var datacollectorSearchPath in datacollectorSearchPaths)
+            List<string> extensionAssemblies = new();
+            foreach (var datacollectorSearchPath in datacollectorSearchPaths)
+            {
+                var adapterPath =
+                    Path.GetFullPath(Environment.ExpandEnvironmentVariables(datacollectorSearchPath));
+                if (!_fileHelper.DirectoryExists(adapterPath))
                 {
-                    var adapterPath =
-                        Path.GetFullPath(Environment.ExpandEnvironmentVariables(datacollectorSearchPath));
-                    if (!this.fileHelper.DirectoryExists(adapterPath))
-                    {
-                        EqtTrace.Warning(string.Format("AdapterPath Not Found:", adapterPath));
-                        continue;
-                    }
-
-                    extensionAssemblies.AddRange(
-                        this.fileHelper.EnumerateFiles(
-                            adapterPath,
-                            SearchOption.AllDirectories,
-                            TestPlatformConstants.DataCollectorEndsWithPattern));
+                    EqtTrace.Warning($"AdapterPath Not Found: {adapterPath}");
+                    continue;
                 }
 
-                if (extensionAssemblies.Count > 0)
-                {
-                    TestPluginCache.Instance.UpdateExtensions(extensionAssemblies, skipExtensionFilters: false);
-                }
+                extensionAssemblies.AddRange(
+                    _fileHelper.EnumerateFiles(
+                        adapterPath,
+                        SearchOption.AllDirectories,
+                        TestPlatformConstants.DataCollectorEndsWithPattern));
             }
-            catch (Exception e)
+
+            if (extensionAssemblies.Count > 0)
             {
-                // If any exception is thrown while updating additional assemblies, log the exception in eqt trace.
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionRequestHandler.AddExtensionAssemblies: Exception occurred: {0}", e);
-                }
+                TestPluginCache.Instance.UpdateExtensions(extensionAssemblies, skipExtensionFilters: false);
             }
         }
-
-        private void HandleBeforeTestRunStart(Message message)
+        catch (Exception e)
         {
-            // Initialize datacollectors and get environment variables.
-            var payload = this.dataSerializer.DeserializePayload<BeforeTestRunStartPayload>(message);
-            this.UpdateRequestData(payload.IsTelemetryOptedIn);
-            this.AddExtensionAssemblies(payload);
+            // If any exception is thrown while updating additional assemblies, log the exception in eqt trace.
+            EqtTrace.Error("DataCollectionRequestHandler.AddExtensionAssemblies: Exception occurred: {0}", e);
+        }
+    }
 
-            var envVariables = this.dataCollectionManager.InitializeDataCollectors(payload.SettingsXml);
+    private void HandleBeforeTestRunStart(Message message)
+    {
+        // Initialize datacollectors and get environment variables.
+        var payload = _dataSerializer.DeserializePayload<BeforeTestRunStartPayload>(message);
+        TPDebug.Assert(payload is not null, "payload is null");
+        UpdateRequestData(payload.IsTelemetryOptedIn);
+        AddExtensionAssemblies(payload);
 
-            var properties = new Dictionary<string, object>();
-            properties.Add(CoreUtilitiesConstants.TestSourcesKeyName, payload.Sources);
-            var eventArgs = new SessionStartEventArgs(properties);
+        TPDebug.Assert(payload.SettingsXml is not null, "payload.SettingsXml is null");
+        var envVariables = _dataCollectionManager.InitializeDataCollectors(payload.SettingsXml);
 
-            var areTestCaseLevelEventsRequired = this.dataCollectionManager.SessionStarted(eventArgs);
+        var properties = new Dictionary<string, object?>
+        {
+            { CoreUtilitiesConstants.TestSourcesKeyName, payload.Sources }
+        };
+        var eventArgs = new SessionStartEventArgs(properties);
 
-            // Open a socket communication port for test level events.
-            var testCaseEventsPort = 0;
-            if (areTestCaseLevelEventsRequired)
-            {
-                testCaseEventsPort = this.dataCollectionTestCaseEventHandler.InitializeCommunication();
+        var areTestCaseLevelEventsRequired = _dataCollectionManager.SessionStarted(eventArgs);
 
-                this.testCaseEventMonitorTask = Task.Factory.StartNew(
-                    () =>
+        // Open a socket communication port for test level events.
+        var testCaseEventsPort = 0;
+        if (areTestCaseLevelEventsRequired)
+        {
+            testCaseEventsPort = _dataCollectionTestCaseEventHandler.InitializeCommunication();
+
+            _testCaseEventMonitorTask = Task.Factory.StartNew(
+                () =>
+                {
+                    try
                     {
-                        try
-                        {
-                            var timeout = EnvironmentHelper.GetConnectionTimeout();
-                            if (this.dataCollectionTestCaseEventHandler.WaitForRequestHandlerConnection(
+                        var timeout = EnvironmentHelper.GetConnectionTimeout();
+                        if (_dataCollectionTestCaseEventHandler.WaitForRequestHandlerConnection(
                                 timeout * 1000))
-                            {
-                                this.dataCollectionTestCaseEventHandler.ProcessRequests();
-                            }
-                            else
-                            {
-                                EqtTrace.Error(
-                                    "DataCollectionRequestHandler.HandleBeforeTestRunStart: TestCaseEventHandler timed out while connecting to the Sender.");
-                                this.dataCollectionTestCaseEventHandler.Close();
-                                throw new TestPlatformException(
-                                    string.Format(
-                                        CultureInfo.CurrentUICulture,
-                                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                                        CoreUtilitiesConstants.DatacollectorProcessName,
-                                        CoreUtilitiesConstants.TesthostProcessName,
-                                        timeout,
-                                        EnvironmentHelper.VstestConnectionTimeout));
-                            }
+                        {
+                            _dataCollectionTestCaseEventHandler.ProcessRequests();
                         }
-                        catch (Exception e)
+                        else
                         {
-                            EqtTrace.Error("DataCollectionRequestHandler.HandleBeforeTestRunStart : Error occurred during initialization of TestHost : {0}", e);
+                            EqtTrace.Error(
+                                "DataCollectionRequestHandler.HandleBeforeTestRunStart: TestCaseEventHandler timed out while connecting to the Sender.");
+                            _dataCollectionTestCaseEventHandler.Close();
+                            throw new TestPlatformException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                                    CoreUtilitiesConstants.DatacollectorProcessName,
+                                    CoreUtilitiesConstants.TesthostProcessName,
+                                    timeout,
+                                    EnvironmentHelper.VstestConnectionTimeout));
                         }
-                    },
-                    this.cancellationTokenSource.Token);
-            }
+                    }
+                    catch (Exception e)
+                    {
+                        EqtTrace.Error("DataCollectionRequestHandler.HandleBeforeTestRunStart : Error occurred during test case events handling: {0}.", e);
+                    }
+                },
+                _cancellationTokenSource.Token);
+        }
+
+        _communicationManager.SendMessage(
+            MessageType.BeforeTestRunStartResult,
+            new BeforeTestRunStartResult(envVariables, testCaseEventsPort));
+
+        EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : DataCollection started.");
+    }
 
-            this.communicationManager.SendMessage(
-                MessageType.BeforeTestRunStartResult,
-                new BeforeTestRunStartResult(envVariables, testCaseEventsPort));
+    private void HandleAfterTestRunEnd(Message message)
+    {
+        var isCancelled = _dataSerializer.DeserializePayload<bool>(message);
 
-            EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : DataCollection started.");
+        if (isCancelled)
+        {
+            _cancellationTokenSource.Cancel();
         }
 
-        private void HandleAfterTestRunEnd(Message message)
+        try
         {
-            var isCancelled = this.dataSerializer.DeserializePayload<bool>(message);
+            _testCaseEventMonitorTask?.Wait(_cancellationTokenSource.Token);
+            _dataCollectionTestCaseEventHandler.Close();
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("DataCollectionRequestHandler.HandleAfterTestRunEnd : Error while processing event from testhost: {0}", ex.ToString());
+        }
 
-            if (isCancelled)
-            {
-                this.cancellationTokenSource.Cancel();
-            }
+        var attachmentsets = _dataCollectionManager.SessionEnded(isCancelled);
+        var invokedDataCollectors = _dataCollectionManager.GetInvokedDataCollectors();
 
-            try
-            {
-                this.testCaseEventMonitorTask?.Wait(this.cancellationTokenSource.Token);
-                this.dataCollectionTestCaseEventHandler.Close();
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("DataCollectionRequestHandler.HandleAfterTestRunEnd : Error while processing event from testhost: {0}", ex.ToString());
-            }
+        if (invokedDataCollectors != null && invokedDataCollectors.Count != 0)
+        {
+            // For the invoked collectors we report the same information as ProxyDataCollectionManager.cs line ~416
+            var invokedDataCollectorsForMetrics = invokedDataCollectors.Select(x => new { x.Uri, x.FriendlyName, x.HasAttachmentProcessor }.ToString());
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.InvokedDataCollectors, string.Join(",", invokedDataCollectorsForMetrics.ToArray()));
+        }
 
-            var attachmentsets = this.dataCollectionManager.SessionEnded(isCancelled);
-            var afterTestRunEndResult = new AfterTestRunEndResult(attachmentsets, this.requestData.MetricsCollection.Metrics);
+        var afterTestRunEndResult = new AfterTestRunEndResult(attachmentsets, invokedDataCollectors, _requestData.MetricsCollection.Metrics);
 
-            // Dispose all datacollectors before sending attachments to vstest.console process.
-            // As datacollector process exits itself on parent process(vstest.console) exits.
-            this.dataCollectionManager?.Dispose();
+        // Dispose all datacollectors before sending attachments to vstest.console process.
+        // As datacollector process exits itself on parent process(vstest.console) exits.
+        _dataCollectionManager?.Dispose();
 
-            this.communicationManager.SendMessage(MessageType.AfterTestRunEndResult, afterTestRunEndResult);
-            EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : Session End message received from server. Closing the connection.");
+        _communicationManager.SendMessage(MessageType.AfterTestRunEndResult, afterTestRunEndResult);
+        EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : Session End message received from server. Closing the connection.");
 
-            this.Close();
+        Close();
 
-            EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : DataCollection completed");
-        }
+        EqtTrace.Info("DataCollectionRequestHandler.ProcessRequests : DataCollection completed");
+    }
 
-        private void UpdateRequestData(bool isTelemetryOptedIn)
+    private void UpdateRequestData(bool isTelemetryOptedIn)
+    {
+        if (isTelemetryOptedIn != _requestData.IsTelemetryOptedIn)
         {
-            if (isTelemetryOptedIn != this.requestData.IsTelemetryOptedIn)
-            {
-                this.requestData.MetricsCollection = isTelemetryOptedIn ? (IMetricsCollection)new MetricsCollection() : new NoOpMetricsCollection();
-                this.requestData.IsTelemetryOptedIn = isTelemetryOptedIn;
-            }
+            _requestData.MetricsCollection = isTelemetryOptedIn ? (IMetricsCollection)new MetricsCollection() : new NoOpMetricsCollection();
+            _requestData.IsTelemetryOptedIn = isTelemetryOptedIn;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestSender.cs
index f51e3b7d5d..a804beb0a0 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestSender.cs
@@ -1,209 +1,205 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+
+/// <summary>
+/// Utility class that facilitates the IPC communication. Acts as server.
+/// </summary>
+public sealed class DataCollectionRequestSender : IDataCollectionRequestSender
 {
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Net;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataSerializer _dataSerializer;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionRequestSender"/> class.
+    /// </summary>
+    public DataCollectionRequestSender()
+        : this(new SocketCommunicationManager(), JsonDataSerializer.Instance)
+    {
+    }
 
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionRequestSender"/> class.
+    /// </summary>
+    /// <param name="communicationManager">
+    /// The communication manager.
+    /// </param>
+    /// <param name="dataSerializer">
+    /// The data serializer.
+    /// </param>
+    internal DataCollectionRequestSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
+    {
+        _communicationManager = communicationManager;
+        _dataSerializer = dataSerializer;
+    }
 
     /// <summary>
-    /// Utility class that facilitates the IPC communication. Acts as server.
+    /// Creates an endpoint and listens for client connection asynchronously
     /// </summary>
-    public sealed class DataCollectionRequestSender : IDataCollectionRequestSender
+    /// <returns>Port number</returns>
+    public int InitializeCommunication()
     {
-        private ICommunicationManager communicationManager;
-        private IDataSerializer dataSerializer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRequestSender"/> class.
-        /// </summary>
-        public DataCollectionRequestSender()
-            : this(new SocketCommunicationManager(), JsonDataSerializer.Instance)
-        {
-        }
+        EqtTrace.Verbose("DataCollectionRequestSender.InitializeCommunication : Initialize communication. ");
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRequestSender"/> class.
-        /// </summary>
-        /// <param name="communicationManager">
-        /// The communication manager.
-        /// </param>
-        /// <param name="dataSerializer">
-        /// The data serializer.
-        /// </param>
-        internal DataCollectionRequestSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
-        {
-            this.communicationManager = communicationManager;
-            this.dataSerializer = dataSerializer;
-        }
+        var endpoint = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
+        _communicationManager.AcceptClientAsync();
+        return endpoint.Port;
+    }
 
-        /// <summary>
-        /// Creates an endpoint and listens for client connection asynchronously
-        /// </summary>
-        /// <returns>Port number</returns>
-        public int InitializeCommunication()
-        {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DataCollectionRequestSender.InitializeCommunication : Initialize communication. ");
-            }
+    /// <summary>
+    /// Waits for Request Handler to be connected
+    /// </summary>
+    /// <param name="clientConnectionTimeout">Time to wait for connection</param>
+    /// <returns>True, if Handler is connected</returns>
+    public bool WaitForRequestHandlerConnection(int clientConnectionTimeout)
+    {
+        EqtTrace.Verbose("DataCollectionRequestSender.WaitForRequestHandlerConnection : Waiting for connection with timeout: {0}", clientConnectionTimeout);
 
-            var endpoint = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
-            this.communicationManager.AcceptClientAsync();
-            return endpoint.Port;
-        }
+        return _communicationManager.WaitForClientConnection(clientConnectionTimeout);
+    }
 
-        /// <summary>
-        /// Waits for Request Handler to be connected
-        /// </summary>
-        /// <param name="clientConnectionTimeout">Time to wait for connection</param>
-        /// <returns>True, if Handler is connected</returns>
-        public bool WaitForRequestHandlerConnection(int clientConnectionTimeout)
-        {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DataCollectionRequestSender.WaitForRequestHandlerConnection : Waiting for connection with timeout: {0}", clientConnectionTimeout);
-            }
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    public void Dispose()
+    {
+        _communicationManager?.StopServer();
+    }
 
-            return this.communicationManager.WaitForClientConnection(clientConnectionTimeout);
-        }
+    /// <summary>
+    /// Closes the connection
+    /// </summary>
+    public void Close()
+    {
+        EqtTrace.Info("Closing the connection");
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            this.communicationManager?.StopServer();
-        }
+        _communicationManager?.StopServer();
+    }
 
-        /// <summary>
-        /// Closes the connection
-        /// </summary>
-        public void Close()
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Closing the connection");
-            }
+    /// <inheritdoc/>
+    public void SendTestHostLaunched(TestHostLaunchedPayload testHostLaunchedPayload)
+    {
+        _communicationManager.SendMessage(MessageType.TestHostLaunched, testHostLaunchedPayload);
+    }
 
-            this.communicationManager?.StopServer();
-        }
+    /// <inheritdoc/>
+    public BeforeTestRunStartResult? SendBeforeTestRunStartAndGetResult(string? settingsXml, IEnumerable<string> sources, bool isTelemetryOptedIn, ITestMessageEventHandler? runEventsHandler)
+    {
+        var isDataCollectionStarted = false;
+        BeforeTestRunStartResult? result = null;
+
+        EqtTrace.Verbose("DataCollectionRequestSender.SendBeforeTestRunStartAndGetResult: Send BeforeTestRunStart message with settingsXml {0} and sources {1}: ", settingsXml, string.Join(" ", sources));
 
-        /// <inheritdoc/>
-        public void SendTestHostLaunched(TestHostLaunchedPayload testHostLaunchedPayload)
+        var payload = new BeforeTestRunStartPayload
         {
-            this.communicationManager.SendMessage(MessageType.TestHostLaunched, testHostLaunchedPayload);
-        }
+            SettingsXml = settingsXml,
+            Sources = sources,
+            IsTelemetryOptedIn = isTelemetryOptedIn
+        };
+
+        _communicationManager.SendMessage(MessageType.BeforeTestRunStart, payload);
 
-        /// <inheritdoc/>
-        public BeforeTestRunStartResult SendBeforeTestRunStartAndGetResult(string settingsXml, IEnumerable<string> sources, bool isTelemetryOptedIn, ITestMessageEventHandler runEventsHandler)
+        while (!isDataCollectionStarted)
         {
-            var isDataCollectionStarted = false;
-            BeforeTestRunStartResult result = null;
+            var rawMessage = _communicationManager.ReceiveRawMessage();
+            TPDebug.Assert(rawMessage is not null, "rawMessage is null");
 
-            if (EqtTrace.IsVerboseEnabled)
+            var message = !rawMessage.IsNullOrEmpty() ? _dataSerializer.DeserializeMessage(rawMessage) : null;
+            TPDebug.Assert(message is not null, "message is null");
+
+            EqtTrace.Verbose("DataCollectionRequestSender.SendBeforeTestRunStartAndGetResult: Received message: {0}", message);
+
+            if (message.MessageType == MessageType.DataCollectionMessage)
             {
-                EqtTrace.Verbose("DataCollectionRequestSender.SendBeforeTestRunStartAndGetResult : Send BeforeTestRunStart message with settingsXml {0} and sources {1}: ", settingsXml, sources.ToString());
+                var dataCollectionMessageEventArgs = _dataSerializer.DeserializePayload<DataCollectionMessageEventArgs>(message);
+                TPDebug.Assert(dataCollectionMessageEventArgs is not null, $"{nameof(dataCollectionMessageEventArgs)} is null");
+                LogDataCollectorMessage(dataCollectionMessageEventArgs, runEventsHandler);
             }
-
-            var payload = new BeforeTestRunStartPayload
+            else if (message.MessageType == MessageType.BeforeTestRunStartResult)
             {
-                SettingsXml = settingsXml,
-                Sources = sources,
-                IsTelemetryOptedIn = isTelemetryOptedIn
-            };
-
-            this.communicationManager.SendMessage(MessageType.BeforeTestRunStart, payload);
-
-            while (!isDataCollectionStarted)
+                isDataCollectionStarted = true;
+                result = _dataSerializer.DeserializePayload<BeforeTestRunStartResult>(message);
+            }
+            else if (message.MessageType == MessageType.TelemetryEventMessage)
             {
-                var message = this.communicationManager.ReceiveMessage();
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DataCollectionRequestSender.SendBeforeTestRunStartAndGetResult : Received message: {0}", message);
-                }
-
-                if (message.MessageType == MessageType.DataCollectionMessage)
-                {
-                    var dataCollectionMessageEventArgs = this.dataSerializer.DeserializePayload<DataCollectionMessageEventArgs>(message);
-                    this.LogDataCollectorMessage(dataCollectionMessageEventArgs, runEventsHandler);
-                }
-                else if (message.MessageType == MessageType.BeforeTestRunStartResult)
-                {
-                    isDataCollectionStarted = true;
-                    result = this.dataSerializer.DeserializePayload<BeforeTestRunStartResult>(message);
-                }
+                runEventsHandler?.HandleRawMessage(rawMessage);
             }
-
-            return result;
         }
 
-        /// <inheritdoc/>
-        public AfterTestRunEndResult SendAfterTestRunEndAndGetResult(ITestMessageEventHandler runEventsHandler, bool isCancelled)
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public AfterTestRunEndResult? SendAfterTestRunEndAndGetResult(ITestMessageEventHandler? runEventsHandler, bool isCancelled)
+    {
+        var isDataCollectionComplete = false;
+        AfterTestRunEndResult? result = null;
+
+        EqtTrace.Verbose("DataCollectionRequestSender.SendAfterTestRunStartAndGetResult: Send AfterTestRunEnd message with isCancelled: {0}", isCancelled);
+
+        _communicationManager.SendMessage(MessageType.AfterTestRunEnd, isCancelled);
+
+        // Cycle through the messages that the datacollector sends.
+        // Currently each of the operations are not separate tasks since they should not each take much time. This is just a notification.
+        while (!isDataCollectionComplete && !isCancelled)
         {
-            var isDataCollectionComplete = false;
-            AfterTestRunEndResult result = null;
+            var rawMessage = _communicationManager.ReceiveRawMessage();
+            TPDebug.Assert(rawMessage is not null, "rawMessage is null");
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DataCollectionRequestSender.SendAfterTestRunStartAndGetResult : Send AfterTestRunEnd message with isCancelled: {0}", isCancelled);
-            }
+            var message = !rawMessage.IsNullOrEmpty() ? _dataSerializer.DeserializeMessage(rawMessage) : null;
+            TPDebug.Assert(message is not null, "message is null");
 
-            this.communicationManager.SendMessage(MessageType.AfterTestRunEnd, isCancelled);
+            EqtTrace.Verbose("DataCollectionRequestSender.SendAfterTestRunStartAndGetResult: Received message: {0}", message);
 
-            // Cycle through the messages that the datacollector sends.
-            // Currently each of the operations are not separate tasks since they should not each take much time. This is just a notification.
-            while (!isDataCollectionComplete && !isCancelled)
+            if (message.MessageType == MessageType.DataCollectionMessage)
             {
-                var message = this.communicationManager.ReceiveMessage();
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DataCollectionRequestSender.SendAfterTestRunStartAndGetResult : Received message: {0}", message);
-                }
-
-                if (message.MessageType == MessageType.DataCollectionMessage)
-                {
-                    var dataCollectionMessageEventArgs = this.dataSerializer.DeserializePayload<DataCollectionMessageEventArgs>(message);
-                    this.LogDataCollectorMessage(dataCollectionMessageEventArgs, runEventsHandler);
-                }
-                else if (message.MessageType == MessageType.AfterTestRunEndResult)
-                {
-                    result = this.dataSerializer.DeserializePayload<AfterTestRunEndResult>(message);
-                    isDataCollectionComplete = true;
-                }
+                var dataCollectionMessageEventArgs = _dataSerializer.DeserializePayload<DataCollectionMessageEventArgs>(message);
+                TPDebug.Assert(dataCollectionMessageEventArgs is not null, $"{nameof(dataCollectionMessageEventArgs)} is null");
+                LogDataCollectorMessage(dataCollectionMessageEventArgs, runEventsHandler);
             }
-
-            return result;
-        }
-
-        private void LogDataCollectorMessage(DataCollectionMessageEventArgs dataCollectionMessageEventArgs, ITestMessageEventHandler requestHandler)
-        {
-            string logMessage;
-            if (string.IsNullOrWhiteSpace(dataCollectionMessageEventArgs.FriendlyName))
+            else if (message.MessageType == MessageType.AfterTestRunEndResult)
             {
-                // Message from data collection framework.
-                logMessage = string.Format(CultureInfo.CurrentCulture, CommonResources.DataCollectionMessageFormat, dataCollectionMessageEventArgs.Message);
+                result = _dataSerializer.DeserializePayload<AfterTestRunEndResult>(message);
+                isDataCollectionComplete = true;
             }
-            else
+            else if (message.MessageType == MessageType.TelemetryEventMessage)
             {
-                // Message from individual data collector.
-                logMessage = string.Format(CultureInfo.CurrentCulture, CommonResources.DataCollectorMessageFormat, dataCollectionMessageEventArgs.FriendlyName, dataCollectionMessageEventArgs.Message);
+                runEventsHandler?.HandleRawMessage(rawMessage);
             }
+        }
 
-            requestHandler.HandleLogMessage(dataCollectionMessageEventArgs.Level, logMessage);
+        return result;
+    }
+
+    private static void LogDataCollectorMessage(DataCollectionMessageEventArgs dataCollectionMessageEventArgs, ITestMessageEventHandler? requestHandler)
+    {
+        string logMessage;
+        if (dataCollectionMessageEventArgs.FriendlyName.IsNullOrWhiteSpace())
+        {
+            // Message from data collection framework.
+            logMessage = string.Format(CultureInfo.CurrentCulture, CommonResources.DataCollectionMessageFormat, dataCollectionMessageEventArgs.Message);
+        }
+        else
+        {
+            // Message from individual data collector.
+            logMessage = string.Format(CultureInfo.CurrentCulture, CommonResources.DataCollectorMessageFormat, dataCollectionMessageEventArgs.FriendlyName, dataCollectionMessageEventArgs.Message);
         }
+
+        requestHandler?.HandleLogMessage(dataCollectionMessageEventArgs.Level, logMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventHandler.cs
index 46438e5824..483bf64db1 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventHandler.cs
@@ -1,133 +1,152 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection
+using System;
+using System.Collections.ObjectModel;
+using System.Net;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+
+/// <summary>
+/// The test case data collection request handler.
+/// </summary>
+internal class DataCollectionTestCaseEventHandler : IDataCollectionTestCaseEventHandler
 {
-    using System.Net;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataCollectionManager? _dataCollectionManager;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly IMessageSink _messageSink;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventHandler"/> class.
+    /// </summary>
+    internal DataCollectionTestCaseEventHandler(IMessageSink messageSink)
+        : this(messageSink, new SocketCommunicationManager(), DataCollectionManager.Instance, JsonDataSerializer.Instance)
+    { }
 
     /// <summary>
-    /// The test case data collection request handler.
+    /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventHandler"/> class.
     /// </summary>
-    internal class DataCollectionTestCaseEventHandler : IDataCollectionTestCaseEventHandler
+    /// <param name="messageSink">Sink for messages</param>
+    /// <param name="communicationManager">Communication manager implementation.</param>
+    /// <param name="dataCollectionManager">Data collection manager implementation.</param>
+    /// <param name="dataSerializer">Serializer for serialization and deserialization of the messages.</param>
+    internal DataCollectionTestCaseEventHandler(IMessageSink messageSink, ICommunicationManager communicationManager, IDataCollectionManager? dataCollectionManager, IDataSerializer dataSerializer)
     {
-        private ICommunicationManager communicationManager;
-        private IDataCollectionManager dataCollectionManager;
-        private IDataSerializer dataSerializer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventHandler"/> class.
-        /// </summary>
-        internal DataCollectionTestCaseEventHandler()
-            : this(new SocketCommunicationManager(), DataCollectionManager.Instance, JsonDataSerializer.Instance)
-        {
-        }
+        _communicationManager = communicationManager;
+        _dataCollectionManager = dataCollectionManager;
+        _dataSerializer = dataSerializer;
+        _messageSink = messageSink;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventHandler"/> class.
-        /// </summary>
-        /// <param name="communicationManager">Communication manager implementation.</param>
-        /// <param name="dataCollectionManager">Data collection manager implementation.</param>
-        /// <param name="dataSerializer">Serializer for serialization and deserialization of the messages.</param>
-        internal DataCollectionTestCaseEventHandler(ICommunicationManager communicationManager, IDataCollectionManager dataCollectionManager, IDataSerializer dataSerializer)
-        {
-            this.communicationManager = communicationManager;
-            this.dataCollectionManager = dataCollectionManager;
-            this.dataSerializer = dataSerializer;
-        }
+    /// <inheritdoc />
+    public int InitializeCommunication()
+    {
+        var endpoint = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
+        _communicationManager.AcceptClientAsync();
+        return endpoint.Port;
+    }
 
-        /// <inheritdoc />
-        public int InitializeCommunication()
-        {
-            var endpoint = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
-            this.communicationManager.AcceptClientAsync();
-            return endpoint.Port;
-        }
+    /// <inheritdoc />
+    public bool WaitForRequestHandlerConnection(int connectionTimeout)
+    {
+        return _communicationManager.WaitForClientConnection(connectionTimeout);
+    }
 
-        /// <inheritdoc />
-        public bool WaitForRequestHandlerConnection(int connectionTimeout)
-        {
-            return this.communicationManager.WaitForClientConnection(connectionTimeout);
-        }
+    /// <inheritdoc />
+    public void Close()
+    {
+        _communicationManager?.StopServer();
+    }
 
-        /// <inheritdoc />
-        public void Close()
-        {
-            this.communicationManager?.StopServer();
-        }
+    /// <inheritdoc />
+    public void ProcessRequests()
+    {
+        var isSessionEnd = false;
 
-        /// <inheritdoc />
-        public void ProcessRequests()
+        do
         {
-            var isSessionEnd = false;
-
-            do
+            var message = _communicationManager.ReceiveMessage();
+            switch (message?.MessageType)
             {
-                var message = this.communicationManager.ReceiveMessage();
-                switch (message.MessageType)
-                {
-                    case MessageType.DataCollectionTestStart:
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case starting.");
-                        }
-
-                        var testCaseStartEventArgs = this.dataSerializer.DeserializePayload<TestCaseStartEventArgs>(message);
-                        this.dataCollectionManager.TestCaseStarted(testCaseStartEventArgs);
-                        this.communicationManager.SendMessage(MessageType.DataCollectionTestStartAck);
-
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case '{0} - {1}' started.", testCaseStartEventArgs.TestCaseName, testCaseStartEventArgs.TestCaseId);
-                        }
-
-                        break;
-
-                    case MessageType.DataCollectionTestEnd:
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler : Test case completing.");
-                        }
-
-                        var testCaseEndEventArgs = this.dataSerializer.DeserializePayload<TestCaseEndEventArgs>(message);
-                        var attachmentSets = this.dataCollectionManager.TestCaseEnded(testCaseEndEventArgs);
-                        this.communicationManager.SendMessage(MessageType.DataCollectionTestEndResult, attachmentSets);
-
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case '{0} - {1}' completed", testCaseEndEventArgs.TestCaseName, testCaseEndEventArgs.TestCaseId);
-                        }
-
-                        break;
-
-                    case MessageType.SessionEnd:
-                        isSessionEnd = true;
-
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler: Test session ended");
-                        }
-
-                        this.Close();
-
-                        break;
-
-                    default:
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("DataCollectionTestCaseEventHandler: Invalid Message type '{0}'", message.MessageType);
-                        }
-
-                        break;
-                }
+                case MessageType.DataCollectionTestStart:
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case starting.");
+
+                    var testCaseStartEventArgs = _dataSerializer.DeserializePayload<TestCaseStartEventArgs>(message);
+
+                    try
+                    {
+                        TPDebug.Assert(_dataCollectionManager is not null, "_dataCollectionManager is null");
+                        TPDebug.Assert(testCaseStartEventArgs is not null, "testCaseStartEventArgs is null");
+                        _dataCollectionManager.TestCaseStarted(testCaseStartEventArgs);
+                    }
+                    catch (Exception ex)
+                    {
+                        _messageSink.SendMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Error, $"Error occurred during TestCaseStarted event handling: {ex}"));
+                        EqtTrace.Error($"DataCollectionTestCaseEventHandler.ProcessRequests: Error occurred during TestCaseStarted event handling: {ex}");
+                    }
+
+                    _communicationManager.SendMessage(MessageType.DataCollectionTestStartAck);
+
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case '{0} - {1}' started.", testCaseStartEventArgs?.TestCaseName, testCaseStartEventArgs?.TestCaseId);
+
+                    break;
+
+                case MessageType.DataCollectionTestEnd:
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case completing.");
+
+                    var testCaseEndEventArgs = _dataSerializer.DeserializePayload<TestCaseEndEventArgs>(message);
+
+                    Collection<AttachmentSet> attachmentSets;
+                    try
+                    {
+                        TPDebug.Assert(_dataCollectionManager is not null, "_dataCollectionManager is null");
+                        TPDebug.Assert(testCaseEndEventArgs is not null, "testCaseEndEventArgs is null");
+                        attachmentSets = _dataCollectionManager.TestCaseEnded(testCaseEndEventArgs);
+                    }
+                    catch (Exception ex)
+                    {
+                        _messageSink.SendMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Error, $"Error occurred during DataCollectionTestEnd event handling: {ex}"));
+                        EqtTrace.Error($"DataCollectionTestCaseEventHandler.ProcessRequests: Error occurred during DataCollectionTestEnd event handling: {ex}");
+                        attachmentSets = new Collection<AttachmentSet>();
+                    }
+
+                    _communicationManager.SendMessage(MessageType.DataCollectionTestEndResult, attachmentSets);
+
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Test case '{0} - {1}' completed", testCaseEndEventArgs?.TestCaseName, testCaseEndEventArgs?.TestCaseId);
+                    break;
+
+                case MessageType.SessionEnd:
+                    isSessionEnd = true;
+
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Test session ended");
+
+                    try
+                    {
+                        Close();
+                    }
+                    catch (Exception ex)
+                    {
+                        _messageSink.SendMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Error, $"Error occurred during SessionEnd event handling: {ex}"));
+                        EqtTrace.Error($"DataCollectionTestCaseEventHandler.ProcessRequests: Error occurred during SessionEnd event handling: {ex}");
+                    }
+
+                    break;
+
+                default:
+                    EqtTrace.Info("DataCollectionTestCaseEventHandler: Invalid Message type '{0}'", message?.MessageType);
+
+                    break;
             }
-            while (!isSessionEnd);
         }
+        while (!isSessionEnd);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventSender.cs
index 6cd01bd90e..7c4b7c3985 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventSender.cs
@@ -1,125 +1,114 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
-{
-    using System.Collections.ObjectModel;
-    using System.Net;
+using System.Collections.ObjectModel;
+using System.Net;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    public class DataCollectionTestCaseEventSender : IDataCollectionTestCaseEventSender
-    {
-        private static readonly object SyncObject = new object();
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
-        private readonly ICommunicationManager communicationManager;
+public class DataCollectionTestCaseEventSender : IDataCollectionTestCaseEventSender
+{
+    private static readonly object SyncObject = new();
 
-        private IDataSerializer dataSerializer;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataSerializer _dataSerializer;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventSender"/> class.
-        /// </summary>
-        protected DataCollectionTestCaseEventSender()
-            : this(new SocketCommunicationManager(), JsonDataSerializer.Instance)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventSender"/> class.
+    /// </summary>
+    protected DataCollectionTestCaseEventSender()
+        : this(new SocketCommunicationManager(), JsonDataSerializer.Instance)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventSender"/> class.
-        /// </summary>
-        /// <param name="communicationManager">Communication manager.</param>
-        /// <param name="dataSerializer">Serializer for serialization and deserialization of the messages.</param>
-        protected DataCollectionTestCaseEventSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
-        {
-            this.communicationManager = communicationManager;
-            this.dataSerializer = dataSerializer;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionTestCaseEventSender"/> class.
+    /// </summary>
+    /// <param name="communicationManager">Communication manager.</param>
+    /// <param name="dataSerializer">Serializer for serialization and deserialization of the messages.</param>
+    protected DataCollectionTestCaseEventSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
+    {
+        _communicationManager = communicationManager;
+        _dataSerializer = dataSerializer;
+    }
 
-        /// <summary>
-        /// Gets the singleton instance of DataCollectionTestCaseEventSender.
-        /// </summary>
-        // TODO : Re-factor to pass the instance as singleton.
-        public static DataCollectionTestCaseEventSender Instance { get; private set; }
-
-        /// <summary>
-        /// Gets singleton instance of DataCollectionRequestHandler.
-        /// </summary>
-        /// <returns>A singleton instance of <see cref="DataCollectionTestCaseEventSender"/></returns>
-        public static DataCollectionTestCaseEventSender Create()
+    /// <summary>
+    /// Gets the singleton instance of DataCollectionTestCaseEventSender.
+    /// </summary>
+    // TODO : Re-factor to pass the instance as singleton.
+    public static DataCollectionTestCaseEventSender? Instance { get; private set; }
+
+    /// <summary>
+    /// Gets singleton instance of DataCollectionRequestHandler.
+    /// </summary>
+    /// <returns>A singleton instance of <see cref="DataCollectionTestCaseEventSender"/></returns>
+    public static DataCollectionTestCaseEventSender Create()
+    {
+        if (Instance == null)
         {
-            if (Instance == null)
+            lock (SyncObject)
             {
-                lock (SyncObject)
-                {
-                    if (Instance == null)
-                    {
-                        Instance = new DataCollectionTestCaseEventSender();
-                    }
-                }
+                Instance ??= new DataCollectionTestCaseEventSender();
             }
-
-            return Instance;
         }
 
-        /// <inheritdoc />
-        public void InitializeCommunication(int port)
-        {
-            this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
-        }
+        return Instance;
+    }
 
-        /// <inheritdoc />
-        public bool WaitForRequestSenderConnection(int connectionTimeout)
-        {
-            return this.communicationManager.WaitForServerConnection(connectionTimeout);
-        }
+    /// <inheritdoc />
+    public void InitializeCommunication(int port)
+    {
+        _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+    }
 
-        /// <inheritdoc />
-        public void Close()
-        {
-            this.communicationManager?.StopClient();
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Closing the connection !");
-            }
-        }
+    /// <inheritdoc />
+    public bool WaitForRequestSenderConnection(int connectionTimeout)
+    {
+        return _communicationManager.WaitForServerConnection(connectionTimeout);
+    }
 
-        /// <inheritdoc />
-        public void SendTestCaseStart(TestCaseStartEventArgs e)
-        {
-            this.communicationManager.SendMessage(MessageType.DataCollectionTestStart, e);
+    /// <inheritdoc />
+    public void Close()
+    {
+        _communicationManager?.StopClient();
+        EqtTrace.Info("Closing the connection!");
+    }
 
-            var message = this.communicationManager.ReceiveMessage();
-            if (message != null && message.MessageType != MessageType.DataCollectionTestStartAck)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("DataCollectionTestCaseEventSender.SendTestCaseStart : MessageType.DataCollectionTestStartAck not received.");
-                }
-            }
-        }
+    /// <inheritdoc />
+    public void SendTestCaseStart(TestCaseStartEventArgs e)
+    {
+        _communicationManager.SendMessage(MessageType.DataCollectionTestStart, e);
 
-        /// <inheritdoc />
-        public Collection<AttachmentSet> SendTestCaseEnd(TestCaseEndEventArgs e)
+        var message = _communicationManager.ReceiveMessage();
+        if (message != null && message.MessageType != MessageType.DataCollectionTestStartAck)
         {
-            var attachmentSets = new Collection<AttachmentSet>();
-            this.communicationManager.SendMessage(MessageType.DataCollectionTestEnd, e);
-
-            var message = this.communicationManager.ReceiveMessage();
-            if (message != null && message.MessageType == MessageType.DataCollectionTestEndResult)
-            {
-                attachmentSets = this.dataSerializer.DeserializePayload<Collection<AttachmentSet>>(message);
-            }
-
-            return attachmentSets;
+            EqtTrace.Error("DataCollectionTestCaseEventSender.SendTestCaseStart : MessageType.DataCollectionTestStartAck not received.");
         }
+    }
 
-        /// <inheritdoc />
-        public void SendTestSessionEnd(SessionEndEventArgs e)
+    /// <inheritdoc />
+    public Collection<AttachmentSet>? SendTestCaseEnd(TestCaseEndEventArgs e)
+    {
+        var attachmentSets = new Collection<AttachmentSet>();
+        _communicationManager.SendMessage(MessageType.DataCollectionTestEnd, e);
+
+        var message = _communicationManager.ReceiveMessage();
+        if (message != null && message.MessageType == MessageType.DataCollectionTestEndResult)
         {
-            this.communicationManager.SendMessage(MessageType.SessionEnd, e);
+            attachmentSets = _dataSerializer.DeserializePayload<Collection<AttachmentSet>>(message);
         }
+
+        return attachmentSets;
+    }
+
+    /// <inheritdoc />
+    public void SendTestSessionEnd(SessionEndEventArgs e)
+    {
+        _communicationManager.SendMessage(MessageType.SessionEnd, e);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestDiscoveryEventHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestDiscoveryEventHandler.cs
index bcc62695b2..540f597038 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestDiscoveryEventHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestDiscoveryEventHandler.cs
@@ -1,88 +1,85 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// The test discovery event handler.
+/// </summary>
+public class TestDiscoveryEventHandler : ITestDiscoveryEventsHandler2
 {
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using TestPlatform.ObjectModel.Client;
+    private readonly ITestRequestHandler _requestHandler;
 
     /// <summary>
-    /// The test discovery event handler.
+    /// Initializes a new instance of the <see cref="TestDiscoveryEventHandler"/> class.
     /// </summary>
-    public class TestDiscoveryEventHandler : ITestDiscoveryEventsHandler2
+    /// <param name="requestHandler"> The Request Handler. </param>
+    public TestDiscoveryEventHandler(ITestRequestHandler requestHandler)
     {
-        private ITestRequestHandler requestHandler;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestDiscoveryEventHandler"/> class.
-        /// </summary>
-        /// <param name="requestHandler"> The Request Handler. </param>
-        public TestDiscoveryEventHandler(ITestRequestHandler requestHandler)
-        {
-            this.requestHandler = requestHandler;
-        }
+        _requestHandler = requestHandler;
+    }
 
-        /// <summary>
-        /// Handles discovered tests
-        /// </summary>
-        /// <param name="discoveredTestCases">List of test cases</param>
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            EqtTrace.Info("Test Cases found ");
-            this.requestHandler.SendTestCases(discoveredTestCases);
-        }
+    /// <summary>
+    /// Handles discovered tests
+    /// </summary>
+    /// <param name="discoveredTestCases">List of test cases</param>
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        EqtTrace.Info("Test Cases found ");
+        _requestHandler.SendTestCases(discoveredTestCases);
+    }
 
-        /// <summary>
-        /// Handle discovery complete.
-        /// </summary>
-        /// <param name="discoveryCompleteEventArgs"> Discovery Complete Events Args. </param>
-        /// <param name="lastChunk"> The last chunk. </param>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info(discoveryCompleteEventArgs.IsAborted ? "Discover Aborted." : "Discover Finished.");
-            }
+    /// <summary>
+    /// Handle discovery complete.
+    /// </summary>
+    /// <param name="discoveryCompleteEventArgs"> Discovery Complete Events Args. </param>
+    /// <param name="lastChunk"> The last chunk. </param>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        EqtTrace.Info(discoveryCompleteEventArgs.IsAborted ? "Discover Aborted." : "Discover Finished.");
 
-            this.requestHandler.DiscoveryComplete(discoveryCompleteEventArgs, lastChunk);
-        }
+        _requestHandler.DiscoveryComplete(discoveryCompleteEventArgs, lastChunk);
+    }
 
-        /// <summary>
-        /// The handle discovery message.
-        /// </summary>
-        /// <param name="level"> Logging level. </param>
-        /// <param name="message"> Logging message. </param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+    /// <summary>
+    /// The handle discovery message.
+    /// </summary>
+    /// <param name="level"> Logging level. </param>
+    /// <param name="message"> Logging message. </param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        switch (level)
         {
-            switch ((TestMessageLevel)level)
-            {
-                case TestMessageLevel.Informational:
-                    EqtTrace.Info(message);
-                    break;
-
-                case TestMessageLevel.Warning:
-                    EqtTrace.Warning(message);
-                    break;
+            case TestMessageLevel.Informational:
+                EqtTrace.Info(message);
+                break;
 
-                case TestMessageLevel.Error:
-                    EqtTrace.Error(message);
-                    break;
+            case TestMessageLevel.Warning:
+                EqtTrace.Warning(message);
+                break;
 
-                default:
-                    EqtTrace.Info(message);
-                    break;
-            }
+            case TestMessageLevel.Error:
+                EqtTrace.Error(message);
+                break;
 
-            this.requestHandler.SendLog(level, message);
+            default:
+                EqtTrace.Info(message);
+                break;
         }
 
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No-Op
-            // TestHost at this point has no functionality where it requires rawmessage
-        }
+        _requestHandler.SendLog(level, message);
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-Op
+        // TestHost at this point has no functionality where it requires rawmessage
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestInitializeEventsHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestInitializeEventsHandler.cs
index 5bbde0f4a1..0ac0b0d1a1 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestInitializeEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestInitializeEventsHandler.cs
@@ -1,62 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
+
+/// <summary>
+/// The test run events handler.
+/// </summary>
+public class TestInitializeEventsHandler : ITestMessageEventHandler
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly ITestRequestHandler _requestHandler;
 
     /// <summary>
-    /// The test run events handler.
+    /// Initializes a new instance of the <see cref="TestInitializeEventsHandler"/> class.
     /// </summary>
-    public class TestInitializeEventsHandler : ITestMessageEventHandler
+    /// <param name="requestHandler">test request handler</param>
+    public TestInitializeEventsHandler(ITestRequestHandler requestHandler)
     {
-        private ITestRequestHandler requestHandler;
+        _requestHandler = requestHandler;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestInitializeEventsHandler"/> class.
-        /// </summary>
-        /// <param name="requestHandler">test request handler</param>
-        public TestInitializeEventsHandler(ITestRequestHandler requestHandler)
+    /// <summary>
+    /// Handles a test run message.
+    /// </summary>
+    /// <param name="level"> The level. </param>
+    /// <param name="message"> The message. </param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        switch (level)
         {
-            this.requestHandler = requestHandler;
-        }
+            case TestMessageLevel.Informational:
+                EqtTrace.Info(message);
+                break;
 
-        /// <summary>
-        /// Handles a test run message.
-        /// </summary>
-        /// <param name="level"> The level. </param>
-        /// <param name="message"> The message. </param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            switch ((TestMessageLevel)level)
-            {
-                case TestMessageLevel.Informational:
-                    EqtTrace.Info(message);
-                    break;
-
-                case TestMessageLevel.Warning:
-                    EqtTrace.Warning(message);
-                    break;
-
-                case TestMessageLevel.Error:
-                    EqtTrace.Error(message);
-                    break;
-
-                default:
-                    EqtTrace.Info(message);
-                    break;
-            }
-
-            this.requestHandler.SendLog(level, message);
-        }
+            case TestMessageLevel.Warning:
+                EqtTrace.Warning(message);
+                break;
 
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No-Op
-            // TestHost at this point has no functionality where it requires rawmessage
+            case TestMessageLevel.Error:
+                EqtTrace.Error(message);
+                break;
+
+            default:
+                EqtTrace.Info(message);
+                break;
         }
+
+        _requestHandler.SendLog(level, message);
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-Op
+        // TestHost at this point has no functionality where it requires rawmessage
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestRunEventsHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestRunEventsHandler.cs
index 3dc09a5140..af4a23256c 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestRunEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/TestRunEventsHandler.cs
@@ -1,106 +1,107 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
+
+/// <summary>
+/// The test run events handler.
+/// </summary>
+public class TestRunEventsHandler : IInternalTestRunEventsHandler
 {
-    using System.Collections.Generic;
+    private readonly ITestRequestHandler _requestHandler;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunEventsHandler"/> class.
+    /// </summary>
+    /// <param name="requestHandler">test request handler</param>
+    public TestRunEventsHandler(ITestRequestHandler requestHandler)
+    {
+        _requestHandler = requestHandler;
+    }
 
     /// <summary>
-    /// The test run events handler.
+    /// Handle test run stats change.
     /// </summary>
-    public class TestRunEventsHandler : ITestRunEventsHandler2
+    /// <param name="testRunChangedArgs"> The test run changed args. </param>
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
     {
-        private ITestRequestHandler requestHandler;
+        EqtTrace.Info("Sending test run statistics");
+        _requestHandler.SendTestRunStatistics(testRunChangedArgs);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunEventsHandler"/> class.
-        /// </summary>
-        /// <param name="requestHandler">test request handler</param>
-        public TestRunEventsHandler(ITestRequestHandler requestHandler)
-        {
-            this.requestHandler = requestHandler;
-        }
+    /// <summary>
+    /// Handle test run complete.
+    /// </summary>
+    /// <param name="testRunCompleteArgs"> The test run complete args. </param>
+    /// <param name="lastChunkArgs"> The last chunk args. </param>
+    /// <param name="runContextAttachments"> The run context attachments. </param>
+    /// <param name="executorUris"> The executor uris. </param>
+    public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris)
+    {
+        EqtTrace.Info("Sending test run complete");
+        _requestHandler.SendExecutionComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+    }
 
-        /// <summary>
-        /// Handle test run stats change.
-        /// </summary>
-        /// <param name="testRunChangedArgs"> The test run changed args. </param>
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
+    /// <summary>
+    /// Handles a test run message.
+    /// </summary>
+    /// <param name="level"> The level. </param>
+    /// <param name="message"> The message. </param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        switch (level)
         {
-            EqtTrace.Info("Sending test run statistics");
-            this.requestHandler.SendTestRunStatistics(testRunChangedArgs);
-        }
+            case TestMessageLevel.Informational:
+                EqtTrace.Info(message);
+                break;
 
-        /// <summary>
-        /// Handle test run complete.
-        /// </summary>
-        /// <param name="testRunCompleteArgs"> The test run complete args. </param>
-        /// <param name="lastChunkArgs"> The last chunk args. </param>
-        /// <param name="runContextAttachments"> The run context attachments. </param>
-        /// <param name="executorUris"> The executor uris. </param>
-        public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris)
-        {
-            EqtTrace.Info("Sending test run complete");
-            this.requestHandler.SendExecutionComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
-        }
+            case TestMessageLevel.Warning:
+                EqtTrace.Warning(message);
+                break;
 
-        /// <summary>
-        /// Handles a test run message.
-        /// </summary>
-        /// <param name="level"> The level. </param>
-        /// <param name="message"> The message. </param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            switch ((TestMessageLevel)level)
-            {
-                case TestMessageLevel.Informational:
-                    EqtTrace.Info(message);
-                    break;
-
-                case TestMessageLevel.Warning:
-                    EqtTrace.Warning(message);
-                    break;
-
-                case TestMessageLevel.Error:
-                    EqtTrace.Error(message);
-                    break;
-
-                default:
-                    EqtTrace.Info(message);
-                    break;
-            }
-
-            this.requestHandler.SendLog(level, message);
-        }
+            case TestMessageLevel.Error:
+                EqtTrace.Error(message);
+                break;
 
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No-Op
-            // TestHost at this point has no functionality where it requires rawmessage
+            default:
+                EqtTrace.Info(message);
+                break;
         }
 
-        /// <summary>
-        /// Launches a process with a given process info under debugger
-        /// Adapter get to call into this to launch any additional processes under debugger
-        /// </summary>
-        /// <param name="testProcessStartInfo">Process start info</param>
-        /// <returns>ProcessId of the launched process</returns>
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
-        {
-            EqtTrace.Info("Sending LaunchProcessWithDebuggerAttached on additional test process: {0}", testProcessStartInfo?.FileName);
-            return this.requestHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
-        }
+        _requestHandler.SendLog(level, message);
+    }
 
-        /// <inheritdoc/>
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            EqtTrace.Info("Sending AttachDebuggerToProcess on additional test process with pid: {0}", pid);
-            return this.requestHandler.AttachDebuggerToProcess(pid);
-        }
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No-Op
+        // TestHost at this point has no functionality where it requires rawmessage
+    }
+
+    /// <summary>
+    /// Launches a process with a given process info under debugger
+    /// Adapter get to call into this to launch any additional processes under debugger
+    /// </summary>
+    /// <param name="testProcessStartInfo">Process start info</param>
+    /// <returns>ProcessId of the launched process</returns>
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo? testProcessStartInfo)
+    {
+        EqtTrace.Info("Sending LaunchProcessWithDebuggerAttached on additional test process: {0}", testProcessStartInfo?.FileName);
+        return _requestHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    }
+
+    /// <inheritdoc/>
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        EqtTrace.Info("Sending AttachDebuggerToProcess on additional test process with pid: {0}", attachDebuggerInfo.ProcessId);
+        return _requestHandler.AttachDebuggerToProcess(attachDebuggerInfo);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs
index bdd70c6c18..56c8685b54 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs
@@ -3,13 +3,14 @@
 
 using System.Runtime.CompilerServices;
 
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.VsTestConsole.TranslationLayer, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities.PlatformTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector.PlatformTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/CommunicationException.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/CommunicationException.cs
index 4dcfebff5d..bf08a4f30f 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/CommunicationException.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/CommunicationException.cs
@@ -1,41 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
+/// <summary>
+/// Exception thrown when communication on a channel fails.
+/// </summary>
+public class CommunicationException : Exception
+{
     /// <summary>
-    /// Exception thrown when communication on a channel fails.
+    /// Initializes a new instance of the <see cref="CommunicationException" /> class.
     /// </summary>
-    public class CommunicationException : Exception
+    public CommunicationException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommunicationException" /> class.
-        /// </summary>
-        public CommunicationException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommunicationException" /> class with provided
-        /// message.
-        /// </summary>
-        /// <param name="message">Message describing the error.</param>
-        public CommunicationException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommunicationException" /> class with provided
+    /// message.
+    /// </summary>
+    /// <param name="message">Message describing the error.</param>
+    public CommunicationException(string? message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommunicationException" /> class with provided
-        /// message and inner exception.
-        /// </summary>
-        /// <param name="message">Message describing the error.</param>
-        /// <param name="inner">Inner exception.</param>
-        public CommunicationException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommunicationException" /> class with provided
+    /// message and inner exception.
+    /// </summary>
+    /// <param name="message">Message describing the error.</param>
+    /// <param name="inner">Inner exception.</param>
+    public CommunicationException(string? message, Exception? inner)
+        : base(message, inner)
+    {
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ConnectedEventArgs.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ConnectedEventArgs.cs
index ae248cca92..12c2de0dcc 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ConnectedEventArgs.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ConnectedEventArgs.cs
@@ -1,51 +1,54 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// Provides properties for the connected communication channel.
+/// </summary>
+public class ConnectedEventArgs : EventArgs
 {
-    using System;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConnectedEventArgs"/> class.
+    /// </summary>
+    // TODO: Do we need this constructor?
+    public ConnectedEventArgs()
+    {
+    }
 
     /// <summary>
-    /// Provides properties for the connected communication channel.
+    /// Initializes a new instance of the <see cref="ConnectedEventArgs"/> class.
     /// </summary>
-    public class ConnectedEventArgs : EventArgs
+    /// <param name="channel">Communication channel for this connection.</param>
+    public ConnectedEventArgs(ICommunicationChannel channel)
+    {
+        Channel = channel;
+        Connected = true;
+    }
+
+    public ConnectedEventArgs(Exception? faultException)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectedEventArgs"/> class.
-        /// </summary>
-        public ConnectedEventArgs()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectedEventArgs"/> class.
-        /// </summary>
-        /// <param name="channel">Communication channel for this connection.</param>
-        public ConnectedEventArgs(ICommunicationChannel channel)
-        {
-            this.Channel = channel;
-            this.Connected = true;
-        }
-
-        public ConnectedEventArgs(Exception faultException)
-        {
-            this.Connected = false;
-            this.Fault = faultException;
-        }
-
-        /// <summary>
-        /// Gets the communication channel based on this connection.
-        /// </summary>
-        public ICommunicationChannel Channel { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether channel is connected or not, true if it's connected.
-        /// </summary>
-        public bool Connected { get; private set; }
-
-        /// <summary>
-        /// Gets the exception if it's not connected.
-        /// </summary>
-        public Exception Fault { get; private set; }
+        Connected = false;
+        Fault = faultException;
     }
+
+    /// <summary>
+    /// Gets the communication channel based on this connection.
+    /// </summary>
+    public ICommunicationChannel? Channel { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether channel is connected or not, true if it's connected.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(Channel))]
+    [MemberNotNullWhen(false, nameof(Fault))]
+    public bool Connected { get; private set; }
+
+    /// <summary>
+    /// Gets the exception if it's not connected.
+    /// </summary>
+    public Exception? Fault { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/DisconnectedEventArgs.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/DisconnectedEventArgs.cs
index d79bc5ea91..f3e5f1aec1 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/DisconnectedEventArgs.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/DisconnectedEventArgs.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
+/// <summary>
+/// Provides information on disconnection of a communication channel.
+/// </summary>
+public class DisconnectedEventArgs : EventArgs
+{
     /// <summary>
-    /// Provides information on disconnection of a communication channel.
+    /// Gets or sets if there's an error on disconnection.
     /// </summary>
-    public class DisconnectedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets if there's an error on disconnection.
-        /// </summary>
-        public Exception Error { get; set; }
-    }
+    public Exception? Error { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
index f518e9fd45..dc8330ffe3 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
@@ -1,29 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+public interface ICommunicationChannel : IDisposable
 {
-    using System;
-    using System.Threading.Tasks;
+    /// <summary>
+    /// Event raised when data is received on the communication channel.
+    /// </summary>
+    TrackableEvent<MessageReceivedEventArgs> MessageReceived { get; }
+
+    /// <summary>
+    /// Frames and sends the provided data over communication channel.
+    /// </summary>
+    /// <param name="data">Data to send over the channel.</param>
+    /// <returns>A <see cref="Task"/> implying async nature of the function.</returns>
+    Task Send(string data);
+
+    /// <summary>
+    /// Notification from server/client that data is available.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> implying async nature of the function.</returns>
+    Task NotifyDataAvailable(CancellationToken cancellationToken);
+}
+
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
+public class TrackableEvent<T>
+#pragma warning restore CA1001 // Types that own disposable fields should be disposable
+{
+    private readonly ManualResetEventSlim _slim;
+
+    internal event EventHandler<T>? Event;
+
+    public TrackableEvent()
+    {
+        _slim = new ManualResetEventSlim(Event != null);
+    }
+
+    public virtual void Notify(object sender, T eventArgs, string traceDisplayName)
+    {
+        var e = Event;
+        if (e != null)
+        {
+            e.SafeInvoke(sender, eventArgs!, traceDisplayName);
+        }
+    }
+
+    public virtual bool WaitForSubscriber(int timeoutMilliseconds, CancellationToken cancellationToken)
+    {
+        return _slim.Wait(timeoutMilliseconds, cancellationToken);
+    }
+
+    public virtual void Subscribe(EventHandler<T>? eventHandler)
+    {
+        Event += eventHandler;
+        if (Event != null)
+        {
+            _slim.Set();
+        }
+    }
 
-    public interface ICommunicationChannel : IDisposable
+    public virtual void Unsubscribe(EventHandler<T>? eventHandler)
     {
-        /// <summary>
-        /// Event raised when data is received on the communication channel.
-        /// </summary>
-        event EventHandler<MessageReceivedEventArgs> MessageReceived;
-
-        /// <summary>
-        /// Frames and sends the provided data over communication channel.
-        /// </summary>
-        /// <param name="data">Data to send over the channel.</param>
-        /// <returns>A <see cref="Task"/> implying async nature of the function.</returns>
-        Task Send(string data);
-
-        /// <summary>
-        /// Notification from server/client that data is available.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> implying async nature of the function.</returns>
-        Task NotifyDataAvailable();
+        Event -= eventHandler;
+        if (Event == null)
+        {
+            _slim.Reset();
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/MessageReceivedEventArgs.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/MessageReceivedEventArgs.cs
index f7c17f5a3b..f23bd9ed71 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/MessageReceivedEventArgs.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/MessageReceivedEventArgs.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
+/// <summary>
+/// Provides a framed data and related properties.
+/// </summary>
+public class MessageReceivedEventArgs : EventArgs
+{
     /// <summary>
-    /// Provides a framed data and related properties.
+    /// Gets or sets the data contained in message frame.
     /// </summary>
-    public class MessageReceivedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the data contained in message frame.
-        /// </summary>
-        public string Data { get; set; }
-    }
+    public string? Data { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpoint.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpoint.cs
index e44e3e49a9..a00b084d7d 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpoint.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpoint.cs
@@ -1,32 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
-    public interface ICommunicationEndPoint
-    {
-        /// <summary>
-        /// Event raised when an endPoint is connected.
-        /// </summary>
-        event EventHandler<ConnectedEventArgs> Connected;
+public interface ICommunicationEndPoint
+{
+    /// <summary>
+    /// Event raised when an endPoint is connected.
+    /// </summary>
+    event EventHandler<ConnectedEventArgs> Connected;
 
-        /// <summary>
-        /// Event raised when an endPoint is disconnected.
-        /// </summary>
-        event EventHandler<DisconnectedEventArgs> Disconnected;
+    /// <summary>
+    /// Event raised when an endPoint is disconnected on failure. It should not be notified when we are just closing the connection after success.
+    /// </summary>
+    event EventHandler<DisconnectedEventArgs> Disconnected;
 
-        /// <summary>
-        /// Starts the endPoint and channel.
-        /// </summary>
-        /// <param name="endPoint">Address to connect</param>
-        /// <returns>Address of the connected endPoint</returns>
-        string Start(string endPoint);
+    /// <summary>
+    /// Starts the endPoint and channel.
+    /// </summary>
+    /// <param name="endPoint">Address to connect</param>
+    /// <returns>Address of the connected endPoint</returns>
+    string? Start(string endPoint);
 
-        /// <summary>
-        /// Stops the endPoint and closes the underlying communication channel.
-        /// </summary>
-        void Stop();
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Stops the endPoint and closes the underlying communication channel.
+    /// </summary>
+    void Stop();
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpointFactory.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpointFactory.cs
index 4fc2630b12..3abd70df5a 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpointFactory.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationEndpointFactory.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
-    public interface ICommunicationEndpointFactory
-    {
-        /// <summary>
-        /// Create communication endpoint.
-        /// </summary>
-        /// <param name="role" cref="ConnectionRole">Endpoint role.</param>
-        /// <returns cref="ICommunicationEndPoint">Return communication endpoint object.</returns>
-        ICommunicationEndPoint Create(ConnectionRole role);
-    }
-}
\ No newline at end of file
+public interface ICommunicationEndpointFactory
+{
+    /// <summary>
+    /// Create communication endpoint.
+    /// </summary>
+    /// <param name="role" cref="ConnectionRole">Endpoint role.</param>
+    /// <returns cref="ICommunicationEndPoint">Return communication endpoint object.</returns>
+    ICommunicationEndPoint Create(ConnectionRole role);
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationManager.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationManager.cs
index 61f7a31826..44a0a1e5da 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationManager.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ICommunicationManager.cs
@@ -1,132 +1,131 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// The Communication Manager interface.
+/// </summary>
+public interface ICommunicationManager
 {
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// The Communication Manager interface.
-    /// </summary>
-    public interface ICommunicationManager
-    {
-        /// <summary>
-        /// Host a server and listens on endpoint for requests
-        /// </summary>
-        /// <param name="endpoint">End point where server is hosted</param>
-        /// <returns>Port number of the listening endpoint</returns>
-        IPEndPoint HostServer(IPEndPoint endpoint);
-
-        /// <summary>
-        /// Accepts client connection asynchronously
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task AcceptClientAsync();
-
-        /// <summary>
-        /// Waits for client to be connected to this server
-        /// Whoever hosting the server should use this method to
-        /// wait for a client to connect
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for the connection</param>
-        /// <returns>True, if Server got a connection from client</returns>
-        bool WaitForClientConnection(int connectionTimeout);
-
-        /// <summary>
-        /// Waits for server to be connected
-        /// Whoever creating the client and trying to connect to a server
-        /// should use this method to wait for connection to be established with server
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for the connection</param>
-        /// <returns>True, if Server got a connection from client</returns>
-        bool WaitForServerConnection(int connectionTimeout);
-
-        /// <summary>
-        /// Stops any hosted server
-        /// </summary>
-        void StopServer();
-
-        /// <summary>
-        /// Creates a Client Channel and connects to server on given port number
-        /// </summary>
-        /// <param name="endpoint">End point for client to connect to</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task SetupClientAsync(IPEndPoint endpoint);
-
-        /// <summary>
-        /// Stops any client connected to server
-        /// </summary>
-        void StopClient();
-
-        /// <summary>
-        /// Writes message to the binary writer.
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        void SendMessage(string messageType);
-
-        /// <summary>
-        /// Reads message from the binary reader
-        /// </summary>
-        /// <returns>Returns message read from the binary reader</returns>
-        Message ReceiveMessage();
-
-        /// <summary>
-        /// Reads message from the binary reader
-        /// </summary>
-        /// <returns> Raw message string </returns>
-        string ReceiveRawMessage();
-
-        /// <summary>
-        /// Reads message from the binary reader using read timeout
-        /// </summary>
-        /// <param name="cancellationToken">
-        /// The cancellation Token.
-        /// </param>
-        /// <returns>
-        /// Returns message read from the binary reader
-        /// </returns>
-        Task<Message> ReceiveMessageAsync(CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Reads message from the binary reader using read timeout
-        /// </summary>
-        /// <param name="cancellationToken">
-        /// The cancellation Token.
-        /// </param>
-        /// <returns>
-        /// Raw message string
-        /// </returns>
-        Task<string> ReceiveRawMessageAsync(CancellationToken cancellationToken);
-
-        /// <summary>
-        ///  Writes message to the binary writer with payload
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        /// <param name="payload">payload to be sent</param>
-        void SendMessage(string messageType, object payload);
-
-        /// <summary>
-        ///  Writes message to the binary writer with payload
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        /// <param name="payload">payload to be sent</param>
-        /// <param name="version">version to be sent</param>
-        void SendMessage(string messageType, object payload, int version);
-
-        /// <summary>
-        /// Send serialized raw message
-        /// </summary>
-        /// <param name="rawMessage">serialized message</param>
-        void SendRawMessage(string rawMessage);
-
-        /// <summary>
-        /// Deserializes the Message into actual TestPlatform objects
-        /// </summary>
-        /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
-        /// <param name="message"> Message object </param>
-        /// <returns> TestPlatform object </returns>
-        T DeserializePayload<T>(Message message);
-    }
+    /// <summary>
+    /// Host a server and listens on endpoint for requests
+    /// </summary>
+    /// <param name="endpoint">End point where server is hosted</param>
+    /// <returns>Port number of the listening endpoint</returns>
+    IPEndPoint HostServer(IPEndPoint endpoint);
+
+    /// <summary>
+    /// Accepts client connection asynchronously
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    Task AcceptClientAsync();
+
+    /// <summary>
+    /// Waits for client to be connected to this server
+    /// Whoever hosting the server should use this method to
+    /// wait for a client to connect
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for the connection</param>
+    /// <returns>True, if Server got a connection from client</returns>
+    bool WaitForClientConnection(int connectionTimeout);
+
+    /// <summary>
+    /// Waits for server to be connected
+    /// Whoever creating the client and trying to connect to a server
+    /// should use this method to wait for connection to be established with server
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for the connection</param>
+    /// <returns>True, if Server got a connection from client</returns>
+    bool WaitForServerConnection(int connectionTimeout);
+
+    /// <summary>
+    /// Stops any hosted server
+    /// </summary>
+    void StopServer();
+
+    /// <summary>
+    /// Creates a Client Channel and connects to server on given port number
+    /// </summary>
+    /// <param name="endpoint">End point for client to connect to</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    Task SetupClientAsync(IPEndPoint endpoint);
+
+    /// <summary>
+    /// Stops any client connected to server
+    /// </summary>
+    void StopClient();
+
+    /// <summary>
+    /// Writes message to the binary writer.
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    void SendMessage(string messageType);
+
+    /// <summary>
+    /// Reads message from the binary reader
+    /// </summary>
+    /// <returns>Returns message read from the binary reader</returns>
+    Message? ReceiveMessage();
+
+    /// <summary>
+    /// Reads message from the binary reader
+    /// </summary>
+    /// <returns> Raw message string </returns>
+    string? ReceiveRawMessage();
+
+    /// <summary>
+    /// Reads message from the binary reader using read timeout
+    /// </summary>
+    /// <param name="cancellationToken">
+    /// The cancellation Token.
+    /// </param>
+    /// <returns>
+    /// Returns message read from the binary reader
+    /// </returns>
+    Task<Message?> ReceiveMessageAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Reads message from the binary reader using read timeout
+    /// </summary>
+    /// <param name="cancellationToken">
+    /// The cancellation Token.
+    /// </param>
+    /// <returns>
+    /// Raw message string
+    /// </returns>
+    Task<string?> ReceiveRawMessageAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    ///  Writes message to the binary writer with payload
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    /// <param name="payload">payload to be sent</param>
+    void SendMessage(string messageType, object payload);
+
+    /// <summary>
+    ///  Writes message to the binary writer with payload
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    /// <param name="payload">payload to be sent</param>
+    /// <param name="version">version to be sent</param>
+    void SendMessage(string messageType, object payload, int version);
+
+    /// <summary>
+    /// Send serialized raw message
+    /// </summary>
+    /// <param name="rawMessage">serialized message</param>
+    void SendRawMessage(string rawMessage);
+
+    /// <summary>
+    /// Deserializes the Message into actual TestPlatform objects
+    /// </summary>
+    /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
+    /// <param name="message"> Message object </param>
+    /// <returns> TestPlatform object </returns>
+    T? DeserializePayload<T>(Message message);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestHandler.cs
index 7eda77da92..6d26592429 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestHandler.cs
@@ -1,34 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+
+/// <summary>
+/// The DataCollectionRequestHandler interface.
+/// </summary>
+internal interface IDataCollectionRequestHandler
 {
     /// <summary>
-    /// The DataCollectionRequestHandler interface.
+    /// Setups client based on port
     /// </summary>
-    internal interface IDataCollectionRequestHandler
-    {
-        /// <summary>
-        /// Setups client based on port
-        /// </summary>
-        /// <param name="port">port number to connect</param>
-        void InitializeCommunication(int port);
+    /// <param name="port">port number to connect</param>
+    void InitializeCommunication(int port);
 
-        /// <summary>
-        /// Waits for Request Handler to connect to Request Sender
-        /// </summary>
-        /// <param name="connectionTimeout">Timeout for establishing connection</param>
-        /// <returns>True if connected, false if timed-out</returns>
-        bool WaitForRequestSenderConnection(int connectionTimeout);
+    /// <summary>
+    /// Waits for Request Handler to connect to Request Sender
+    /// </summary>
+    /// <param name="connectionTimeout">Timeout for establishing connection</param>
+    /// <returns>True if connected, false if timed-out</returns>
+    bool WaitForRequestSenderConnection(int connectionTimeout);
 
-        /// <summary>
-        /// Listens to the commands from server
-        /// </summary>
-        void ProcessRequests();
+    /// <summary>
+    /// Listens to the commands from server
+    /// </summary>
+    void ProcessRequests();
 
-        /// <summary>
-        /// Closes the connection
-        /// </summary>
-        void Close();
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Closes the connection
+    /// </summary>
+    void Close();
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestSender.cs
index 5dd36660b1..f8e8869f94 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionRequestSender.cs
@@ -1,77 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
 
+/// <summary>
+/// Defines contract to send test platform requests to test host
+/// </summary>
+internal interface IDataCollectionRequestSender
+{
     /// <summary>
-    /// Defines contract to send test platform requests to test host
+    /// Initializes the communication for sending requests
     /// </summary>
-    internal interface IDataCollectionRequestSender
-    {
-        /// <summary>
-        /// Initializes the communication for sending requests
-        /// </summary>
-        /// <returns>Port Number of the communication channel</returns>
-        int InitializeCommunication();
+    /// <returns>Port Number of the communication channel</returns>
+    int InitializeCommunication();
 
-        /// <summary>
-        /// Waits for Request Handler to be connected
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for connection</param>
-        /// <returns>True, if Handler is connected</returns>
-        bool WaitForRequestHandlerConnection(int connectionTimeout);
+    /// <summary>
+    /// Waits for Request Handler to be connected
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for connection</param>
+    /// <returns>True, if Handler is connected</returns>
+    bool WaitForRequestHandlerConnection(int connectionTimeout);
 
-        /// <summary>
-        /// Close the Sender
-        /// </summary>
-        void Close();
+    /// <summary>
+    /// Close the Sender
+    /// </summary>
+    void Close();
 
-        /// <summary>
-        /// Sends the TestHostLaunched event
-        /// </summary>
-        /// <param name="testHostLaunchedPayload">
-        /// Test host launched payload
-        /// </param>
-        void SendTestHostLaunched(TestHostLaunchedPayload testHostLaunchedPayload);
+    /// <summary>
+    /// Sends the TestHostLaunched event
+    /// </summary>
+    /// <param name="testHostLaunchedPayload">
+    /// Test host launched payload
+    /// </param>
+    void SendTestHostLaunched(TestHostLaunchedPayload testHostLaunchedPayload);
 
-        /// <summary>
-        /// Sends the BeforeTestRunStart event and waits for result
-        /// </summary>
-        /// <param name="settingXml">
-        /// Run settings for test run.
-        /// </param>
-        /// <param name="sources">
-        /// Test run sources
-        /// </param>
-        /// <param name="isTelemetryOptedIn">
-        /// Telemetry opted in flag.
-        /// </param>
-        /// <param name="runEventsHandler">
-        /// Test message event handler for handling messages.
-        /// </param>
-        /// <returns>
-        /// BeforeTestRunStartResult containing environment variables
-        /// </returns>
-        BeforeTestRunStartResult SendBeforeTestRunStartAndGetResult(string settingXml, IEnumerable<string> sources, bool isTelemetryOptedIn, ITestMessageEventHandler runEventsHandler);
+    /// <summary>
+    /// Sends the BeforeTestRunStart event and waits for result
+    /// </summary>
+    /// <param name="settingXml">
+    /// Run settings for test run.
+    /// </param>
+    /// <param name="sources">
+    /// Test run sources
+    /// </param>
+    /// <param name="isTelemetryOptedIn">
+    /// Telemetry opted in flag.
+    /// </param>
+    /// <param name="runEventsHandler">
+    /// Test message event handler for handling messages.
+    /// </param>
+    /// <returns>
+    /// BeforeTestRunStartResult containing environment variables
+    /// </returns>
+    BeforeTestRunStartResult? SendBeforeTestRunStartAndGetResult(string? settingXml, IEnumerable<string> sources, bool isTelemetryOptedIn, ITestMessageEventHandler? runEventsHandler);
 
-        /// <summary>
-        /// Sends the AfterTestRunEnd event and waits for result
-        /// </summary>
-        /// <param name="runEventsHandler">
-        /// Test message event handler for handling messages.
-        /// </param>
-        /// <param name="isCancelled">
-        /// The value to specify whether the test run is canceled or not.
-        /// </param>
-        /// <returns>
-        /// AfterTestRunEndResult containing dataCollector attachments and metrics
-        /// </returns>
-        AfterTestRunEndResult SendAfterTestRunEndAndGetResult(ITestMessageEventHandler runEventsHandler, bool isCancelled);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Sends the AfterTestRunEnd event and waits for result
+    /// </summary>
+    /// <param name="runEventsHandler">
+    /// Test message event handler for handling messages.
+    /// </param>
+    /// <param name="isCancelled">
+    /// The value to specify whether the test run is canceled or not.
+    /// </param>
+    /// <returns>
+    /// AfterTestRunEndResult containing dataCollector attachments and metrics
+    /// </returns>
+    AfterTestRunEndResult? SendAfterTestRunEndAndGetResult(ITestMessageEventHandler? runEventsHandler, bool isCancelled);
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventHandler.cs
index 214346dbb5..50be863e85 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventHandler.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// Interface for interacting with execution process for getting test case events in data collection process.
+/// </summary>
+internal interface IDataCollectionTestCaseEventHandler
 {
+    // TODO : Similar interfaces exist, need redesign.
+
     /// <summary>
-    /// Interface for interacting with execution process for getting test case events in data collection process.
+    /// Initializes the communication for sending requests
     /// </summary>
-    internal interface IDataCollectionTestCaseEventHandler
-    {
-        // TODO : Similar interfaces exist, need redesign.
-
-        /// <summary>
-        /// Initializes the communication for sending requests
-        /// </summary>
-        /// <returns>Port Number of the communication channel</returns>
-        int InitializeCommunication();
+    /// <returns>Port Number of the communication channel</returns>
+    int InitializeCommunication();
 
-        /// <summary>
-        /// Waits for Request Handler to be connected.
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for connection</param>
-        /// <returns>True, if Handler is connected</returns>
-        bool WaitForRequestHandlerConnection(int connectionTimeout);
+    /// <summary>
+    /// Waits for Request Handler to be connected.
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for connection</param>
+    /// <returns>True, if Handler is connected</returns>
+    bool WaitForRequestHandlerConnection(int connectionTimeout);
 
-        /// <summary>
-        /// Close the handler
-        /// </summary>
-        void Close();
+    /// <summary>
+    /// Close the handler
+    /// </summary>
+    void Close();
 
-        /// <summary>
-        /// Listens to the commands from execution process
-        /// </summary>
-        void ProcessRequests();
-    }
+    /// <summary>
+    /// Listens to the commands from execution process
+    /// </summary>
+    void ProcessRequests();
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventSender.cs
index e73d69ef8e..1e650f4c21 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataCollectionTestCaseEventSender.cs
@@ -1,61 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// Interface for sending test case events from test execution process to data collection process
+/// </summary>
+public interface IDataCollectionTestCaseEventSender
 {
-    using System.Collections.ObjectModel;
+    /// <summary>
+    /// Setups client based on port
+    /// </summary>
+    /// <param name="port">port number to connect</param>
+    void InitializeCommunication(int port);
+
+    /// <summary>
+    /// Waits for Request Handler to connect to Request Sender
+    /// </summary>
+    /// <param name="connectionTimeout">Timeout for establishing connection</param>
+    /// <returns>True if connected, false if timed-out</returns>
+    bool WaitForRequestSenderConnection(int connectionTimeout);
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// Closes the connection
+    /// </summary>
+    void Close();
+
+    /// <summary>
+    /// Sends the TestCaseStart event.
+    /// </summary>
+    /// <param name="e">
+    /// The args containing info about TestCaseStart event.
+    /// </param>
+    void SendTestCaseStart(TestCaseStartEventArgs e);
+
+    /// <summary>
+    /// Sends the TestCaseCompleted event along with outcome.
+    /// </summary>
+    /// <param name="e">
+    /// The args containing info about TestResult event.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Collection{T}"/>Collection of TestCase attachments.
+    /// </returns>
+    Collection<AttachmentSet>? SendTestCaseEnd(TestCaseEndEventArgs e);
 
     /// <summary>
-    /// Interface for sending test case events from test execution process to data collection process
+    /// Sends the SessionEnd event. This is used to as a trigger to close communication channel between datacollector process and testhost process.
     /// </summary>
-    public interface IDataCollectionTestCaseEventSender
-    {
-        /// <summary>
-        /// Setups client based on port
-        /// </summary>
-        /// <param name="port">port number to connect</param>
-        void InitializeCommunication(int port);
-
-        /// <summary>
-        /// Waits for Request Handler to connect to Request Sender
-        /// </summary>
-        /// <param name="connectionTimeout">Timeout for establishing connection</param>
-        /// <returns>True if connected, false if timed-out</returns>
-        bool WaitForRequestSenderConnection(int connectionTimeout);
-
-        /// <summary>
-        /// Closes the connection
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Sends the TestCaseStart event.
-        /// </summary>
-        /// <param name="e">
-        /// The args containing info about TestCaseStart event.
-        /// </param>
-        void SendTestCaseStart(TestCaseStartEventArgs e);
-
-        /// <summary>
-        /// Sends the TestCaseCompleted event along with outcome.
-        /// </summary>
-        /// <param name="e">
-        /// The args containing info about TestResult event.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Collection"/>Collection of TestCase attachments.
-        /// </returns>
-        Collection<AttachmentSet> SendTestCaseEnd(TestCaseEndEventArgs e);
-
-        /// <summary>
-        /// Sends the SessionEnd event. This is used to as a trigger to close communication channel between datacollector process and testhost process.
-        /// </summary>
-        /// <param name="e">
-        /// The args containing info about SessionEnd event.
-        /// </param>
-        void SendTestSessionEnd(SessionEndEventArgs e);
-    }
+    /// <param name="e">
+    /// The args containing info about SessionEnd event.
+    /// </param>
+    void SendTestSessionEnd(SessionEndEventArgs e);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataSerializer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataSerializer.cs
index 97f52c5ca2..468cf07a4c 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataSerializer.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/IDataSerializer.cs
@@ -1,58 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// IDataSerializer interface for serializing data
+/// </summary>
+public interface IDataSerializer
 {
     /// <summary>
-    /// IDataSerializer interface for serializing data
+    /// Deserializes the raw message into Message
     /// </summary>
-    public interface IDataSerializer
-    {
-        /// <summary>
-        /// Deserializes the raw message into Message
-        /// </summary>
-        /// <param name="rawMessage">Raw message off the IPC channel</param>
-        /// <returns>Message object</returns>
-        Message DeserializeMessage(string rawMessage);
+    /// <param name="rawMessage">Raw message off the IPC channel</param>
+    /// <returns>Message object</returns>
+    Message DeserializeMessage(string rawMessage);
 
-        /// <summary>
-        /// Deserializes the Message into actual TestPlatform objects
-        /// </summary>
-        /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
-        /// <param name="message"> Message object </param>
-        /// <returns> TestPlatform object </returns>
-        T DeserializePayload<T>(Message message);
+    /// <summary>
+    /// Deserializes the Message into actual TestPlatform objects
+    /// </summary>
+    /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
+    /// <param name="message"> Message object </param>
+    /// <returns> TestPlatform object </returns>
+    T? DeserializePayload<T>(Message? message);
 
-        /// <summary>
-        /// Serializes and creates a raw message given a message type
-        /// </summary>
-        /// <param name="messageType">Message Type</param>
-        /// <returns>Raw Serialized message</returns>
-        string SerializeMessage(string messageType);
+    /// <summary>
+    /// Serializes and creates a raw message given a message type
+    /// </summary>
+    /// <param name="messageType">Message Type</param>
+    /// <returns>Raw Serialized message</returns>
+    string SerializeMessage(string? messageType);
 
-        /// <summary>
-        /// Serializes and creates a raw message given a message type and the object payload
-        /// </summary>
-        /// <param name="messageType">Message Type</param>
-        /// <param name="payload">Payload of the message</param>
-        /// <returns>Raw Serialized message</returns>
-        string SerializePayload(string messageType, object payload);
+    /// <summary>
+    /// Serializes and creates a raw message given a message type and the object payload
+    /// </summary>
+    /// <param name="messageType">Message Type</param>
+    /// <param name="payload">Payload of the message</param>
+    /// <returns>Raw Serialized message</returns>
+    string SerializePayload(string? messageType, object? payload);
 
-        /// <summary>
-        /// Serializes and creates a raw message given a message type and the object payload
-        /// </summary>
-        /// <param name="messageType">Message Type</param>
-        /// <param name="payload">Payload of the message</param>
-        /// <param name="version">version to be sent</param>
-        /// <returns>Raw Serialized message</returns>
-        string SerializePayload(string messageType, object payload, int version);
+    /// <summary>
+    /// Serializes and creates a raw message given a message type and the object payload
+    /// </summary>
+    /// <param name="messageType">Message Type</param>
+    /// <param name="payload">Payload of the message</param>
+    /// <param name="version">version to be sent</param>
+    /// <returns>Raw Serialized message</returns>
+    string SerializePayload(string? messageType, object? payload, int version);
 
-        /// <summary>
-        /// Creates cloned object for given object.
-        /// </summary>
-        /// <typeparam name="T"> The type of object to be cloned. </typeparam>
-        /// <param name="obj">Object to be cloned.</param>
-        /// <returns>Newly cloned object.</returns>
-        T Clone<T>(T obj);
-    }
+    /// <summary>
+    /// Creates cloned object for given object.
+    /// </summary>
+    /// <typeparam name="T"> The type of object to be cloned. </typeparam>
+    /// <param name="obj">Object to be cloned.</param>
+    /// <returns>Newly cloned object.</returns>
+    T? Clone<T>(T? obj);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
index 8908a72fc7..f7f5ec0994 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
@@ -1,97 +1,97 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
+/// <summary>
+/// Defines the contract for handling test platform requests
+/// </summary>
+public interface ITestRequestHandler : IDisposable
+{
     /// <summary>
-    /// Defines the contract for handling test platform requests
+    /// Gets or sets connection info for to start server/client.
     /// </summary>
-    public interface ITestRequestHandler : IDisposable
-    {
-        /// <summary>
-        /// Gets or sets connection info for to start server/client.
-        /// </summary>
-        TestHostConnectionInfo ConnectionInfo { get; set; }
+    TestHostConnectionInfo ConnectionInfo { get; set; }
 
-        /// <summary>
-        /// Setups client based on port
-        /// </summary>
-        void InitializeCommunication();
+    /// <summary>
+    /// Setups client based on port
+    /// </summary>
+    void InitializeCommunication();
 
-        /// <summary>
-        /// Waits for Request Handler to connect to Request Sender
-        /// </summary>
-        /// <param name="connectionTimeout">Timeout for establishing connection</param>
-        /// <returns>True if connected, false if timed-out</returns>
-        bool WaitForRequestSenderConnection(int connectionTimeout);
+    /// <summary>
+    /// Waits for Request Handler to connect to Request Sender
+    /// </summary>
+    /// <param name="connectionTimeout">Timeout for establishing connection</param>
+    /// <returns>True if connected, false if timed-out</returns>
+    bool WaitForRequestSenderConnection(int connectionTimeout);
 
-        /// <summary>
-        /// Listens to the commands from server
-        /// </summary>
-        /// <param name="testHostManagerFactory">the test host manager.</param>
-        void ProcessRequests(ITestHostManagerFactory testHostManagerFactory);
+    /// <summary>
+    /// Listens to the commands from server
+    /// </summary>
+    /// <param name="testHostManagerFactory">the test host manager.</param>
+    void ProcessRequests(ITestHostManagerFactory testHostManagerFactory);
 
-        /// <summary>
-        /// Closes the connection
-        /// </summary>
-        void Close();
+    /// <summary>
+    /// Closes the connection
+    /// </summary>
+    void Close();
 
-        /// <summary>
-        /// The send test cases.
-        /// </summary>
-        /// <param name="discoveredTestCases"> The discovered test cases. </param>
-        void SendTestCases(IEnumerable<TestCase> discoveredTestCases);
+    /// <summary>
+    /// The send test cases.
+    /// </summary>
+    /// <param name="discoveredTestCases"> The discovered test cases. </param>
+    void SendTestCases(IEnumerable<TestCase>? discoveredTestCases);
 
-        /// <summary>
-        /// The send test run statistics.
-        /// </summary>
-        /// <param name="testRunChangedArgs"> The test run changed args. </param>
-        void SendTestRunStatistics(TestRunChangedEventArgs testRunChangedArgs);
+    /// <summary>
+    /// The send test run statistics.
+    /// </summary>
+    /// <param name="testRunChangedArgs"> The test run changed args. </param>
+    void SendTestRunStatistics(TestRunChangedEventArgs? testRunChangedArgs);
 
-        /// <summary>
-        /// Sends the logs back to the server.
-        /// </summary>
-        /// <param name="messageLevel"> The message level. </param>
-        /// <param name="message"> The message. </param>
-        void SendLog(TestMessageLevel messageLevel, string message);
+    /// <summary>
+    /// Sends the logs back to the server.
+    /// </summary>
+    /// <param name="messageLevel"> The message level. </param>
+    /// <param name="message"> The message. </param>
+    void SendLog(TestMessageLevel messageLevel, string? message);
 
-        /// <summary>
-        /// The send execution complete.
-        /// </summary>
-        /// <param name="testRunCompleteArgs"> The test run complete args. </param>
-        /// <param name="lastChunkArgs"> The last chunk args. </param>
-        /// <param name="runContextAttachments"> The run context attachments. </param>
-        /// <param name="executorUris"> The executor uris. </param>
-        void SendExecutionComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris);
+    /// <summary>
+    /// The send execution complete.
+    /// </summary>
+    /// <param name="testRunCompleteArgs"> The test run complete args. </param>
+    /// <param name="lastChunkArgs"> The last chunk args. </param>
+    /// <param name="runContextAttachments"> The run context attachments. </param>
+    /// <param name="executorUris"> The executor uris. </param>
+    void SendExecutionComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris);
 
-        /// <summary>
-        /// The discovery complete handler
-        /// </summary>
-        /// <param name="discoveryCompleteEventArgs">Discovery Complete Event Args</param>
-        /// <param name="lastChunk"> The last Chunk. </param>
-        void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk);
+    /// <summary>
+    /// The discovery complete handler
+    /// </summary>
+    /// <param name="discoveryCompleteEventArgs">Discovery Complete Event Args</param>
+    /// <param name="lastChunk"> The last Chunk. </param>
+    void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk);
 
-        /// <summary>
-        /// Launches a process with a given process info under debugger
-        /// Adapter get to call into this to launch any additional processes under debugger
-        /// </summary>
-        /// <param name="testProcessStartInfo">Process start info</param>
-        /// <returns>ProcessId of the launched process</returns>
-        int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo);
+    /// <summary>
+    /// Launches a process with a given process info under debugger
+    /// Adapter get to call into this to launch any additional processes under debugger
+    /// </summary>
+    /// <param name="testProcessStartInfo">Process start info</param>
+    /// <returns>ProcessId of the launched process</returns>
+    int LaunchProcessWithDebuggerAttached(TestProcessStartInfo? testProcessStartInfo);
 
-        /// <summary>
-        /// Attach debugger to an already running process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid);
-    }
+    /// <summary>
+    /// Attach debugger to an already running process.
+    /// </summary>
+    /// <param name="attachDebuggerInfo">Process ID and tfm of the process to which the debugger should be attached.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs
index d65aa7bb0f..51f6d4f2c5 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs
@@ -1,96 +1,100 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+/// <summary>
+/// Defines contract to send test platform requests to test host
+/// </summary>
+public interface ITestRequestSender : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
+    /// <summary>
+    /// Initializes the communication for sending requests
+    /// </summary>
+    /// <returns>Port Number of the communication channel</returns>
+    int InitializeCommunication();
+
+    /// <summary>
+    /// Used for protocol version check with TestHost
+    /// </summary>
+    void CheckVersionWithTestHost();
+
+    /// <summary>
+    /// Waits for Request Handler to be connected
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for connection</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>True, if Handler is connected</returns>
+    bool WaitForRequestHandlerConnection(int connectionTimeout, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Close the Sender
+    /// </summary>
+    void Close();
+
+    /// <summary>
+    /// Initializes the Discovery
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions</param>
+    void InitializeDiscovery(IEnumerable<string> pathToAdditionalExtensions);
+
+    /// <summary>
+    /// Initializes the Execution
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions</param>
+    void InitializeExecution(IEnumerable<string> pathToAdditionalExtensions);
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    /// <summary>
+    /// Discovers the tests
+    /// </summary>
+    /// <param name="discoveryCriteria">DiscoveryCriteria for discovery</param>
+    /// <param name="discoveryEventsHandler">EventHandler for discovery events</param>
+    void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts the TestRun with given sources and criteria
+    /// </summary>
+    /// <param name="runCriteria">RunCriteria for test run</param>
+    /// <param name="eventHandler">EventHandler for test run events</param>
+    void StartTestRun(TestRunCriteriaWithSources runCriteria, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Starts the TestRun with given test cases and criteria
+    /// </summary>
+    /// <param name="runCriteria">RunCriteria for test run</param>
+    /// <param name="eventHandler">EventHandler for test run events</param>
+    void StartTestRun(TestRunCriteriaWithTests runCriteria, IInternalTestRunEventsHandler eventHandler);
+
+    /// <summary>
+    /// Ends the Session
+    /// </summary>
+    void EndSession();
+
+    /// <summary>
+    /// Send the request to cancel the test run
+    /// </summary>
+    void SendTestRunCancel();
+
+    /// <summary>
+    /// Send the request to abort the test run
+    /// </summary>
+    void SendTestRunAbort();
+
+    /// <summary>
+    /// Sends the request to abort the discovery.
+    /// </summary>
+    void SendDiscoveryAbort();
 
     /// <summary>
-    /// Defines contract to send test platform requests to test host
+    /// Handle client process exit
     /// </summary>
-    public interface ITestRequestSender : IDisposable
-    {
-        /// <summary>
-        /// Initializes the communication for sending requests
-        /// </summary>
-        /// <returns>Port Number of the communication channel</returns>
-        int InitializeCommunication();
-
-        /// <summary>
-        /// Used for protocol version check with TestHost
-        /// </summary>
-        void CheckVersionWithTestHost();
-
-        /// <summary>
-        /// Waits for Request Handler to be connected
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for connection</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <returns>True, if Handler is connected</returns>
-        bool WaitForRequestHandlerConnection(int connectionTimeout, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Close the Sender
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Initializes the Discovery
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions</param>
-        void InitializeDiscovery(IEnumerable<string> pathToAdditionalExtensions);
-
-        /// <summary>
-        /// Initializes the Execution
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions</param>
-        void InitializeExecution(IEnumerable<string> pathToAdditionalExtensions);
-
-        /// <summary>
-        /// Discovers the tests
-        /// </summary>
-        /// <param name="discoveryCriteria">DiscoveryCriteria for discovery</param>
-        /// <param name="discoveryEventsHandler">EventHandler for discovery events</param>
-        void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts the TestRun with given sources and criteria
-        /// </summary>
-        /// <param name="runCriteria">RunCriteria for test run</param>
-        /// <param name="eventHandler">EventHandler for test run events</param>
-        void StartTestRun(TestRunCriteriaWithSources runCriteria, ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Starts the TestRun with given test cases and criteria
-        /// </summary>
-        /// <param name="runCriteria">RunCriteria for test run</param>
-        /// <param name="eventHandler">EventHandler for test run events</param>
-        void StartTestRun(TestRunCriteriaWithTests runCriteria, ITestRunEventsHandler eventHandler);
-
-        /// <summary>
-        /// Ends the Session
-        /// </summary>
-        void EndSession();
-
-        /// <summary>
-        /// Send the request to cancel the test run
-        /// </summary>
-        void SendTestRunCancel();
-
-        /// <summary>
-        /// Send the request to abort the test run
-        /// </summary>
-        void SendTestRunAbort();
-
-        /// <summary>
-        /// Handle client process exit
-        /// </summary>
-        /// <param name="stdError">Standard error output</param>
-        void OnClientProcessExit(string stdError);
-    }
+    /// <param name="stdError">Standard error output</param>
+    void OnClientProcessExit(string stdError);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITransport.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITransport.cs
index d32c15a182..b79b24c479 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITransport.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITransport.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces
-{
-    using System;
-    using System.Net;
+using System;
+using System.Net;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
+/// <summary>
+/// The transport Layer Interface
+/// </summary>
+public interface ITransport : IDisposable
+{
     /// <summary>
-    /// The transport Layer Interface
+    /// Initializes Transport Layer
     /// </summary>
-    public interface ITransport : IDisposable
-    {
-        /// <summary>
-        /// Initializes Transport Layer
-        /// </summary>
-        /// <returns>Endpoint</returns>
-        IPEndPoint Initialize();
+    /// <returns>Endpoint</returns>
+    IPEndPoint Initialize();
 
-        /// <summary>
-        /// Waits for the connection over transport layer to established
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for connection</param>
-        /// <returns>True if connection is established</returns>
-        bool WaitForConnection(int connectionTimeout);
-    }
+    /// <summary>
+    /// Waits for the connection over transport layer to established
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for connection</param>
+    /// <returns>True if connection is established</returns>
+    bool WaitForConnection(int connectionTimeout);
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs
index 72c44d1e6c..ce3fe4ba58 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs
@@ -1,240 +1,537 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// JsonDataSerializes serializes and deserializes data using Json format
+/// </summary>
+public class JsonDataSerializer : IDataSerializer
 {
-    using System;
-    using System.IO;
+    private static JsonDataSerializer? s_instance;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+    private static readonly bool DisableFastJson = FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_FASTER_JSON_SERIALIZATION);
 
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
+    private static readonly JsonSerializer PayloadSerializerV1; // payload serializer for version <= 1
+    private static readonly JsonSerializer PayloadSerializerV2; // payload serializer for version >= 2
+    private static readonly JsonSerializer FastSerializer;
+    private static readonly JsonSerializerSettings FastJsonSettings; // serializer settings for faster json
+    private static readonly JsonSerializerSettings JsonSettings; // serializer settings for serializer v1, which should use to deserialize message headers
+    private static readonly JsonSerializer Serializer; // generic serializer
 
-    /// <summary>
-    /// JsonDataSerializes serializes and deserializes data using Json format
-    /// </summary>
-    public class JsonDataSerializer : IDataSerializer
+    static JsonDataSerializer()
     {
-        private static JsonDataSerializer instance;
 
-        private static JsonSerializer payloadSerializer; // payload serializer for version <= 1
-        private static JsonSerializer payloadSerializer2; // payload serializer for version >= 2
-        private static JsonSerializer serializer; // generic serializer
+        var jsonSettings = new JsonSerializerSettings
+        {
+            DateFormatHandling = DateFormatHandling.IsoDateFormat,
+            DateParseHandling = DateParseHandling.DateTimeOffset,
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            TypeNameHandling = TypeNameHandling.None,
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            MissingMemberHandling = MissingMemberHandling.Ignore,
+            NullValueHandling = NullValueHandling.Include,
+            DefaultValueHandling = DefaultValueHandling.Include,
+            ObjectCreationHandling = ObjectCreationHandling.Auto,
+            PreserveReferencesHandling = PreserveReferencesHandling.None,
+            ConstructorHandling = ConstructorHandling.Default,
+            MetadataPropertyHandling = MetadataPropertyHandling.Default,
+            Formatting = Formatting.None,
+            FloatParseHandling = FloatParseHandling.Double,
+            FloatFormatHandling = FloatFormatHandling.String,
+            StringEscapeHandling = StringEscapeHandling.Default,
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+            Culture = CultureInfo.InvariantCulture,
+            CheckAdditionalContent = false,
+            DateFormatString = @"yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK",
+            MaxDepth = 64,
+        };
 
-        /// <summary>
-        /// Prevents a default instance of the <see cref="JsonDataSerializer"/> class from being created.
-        /// </summary>
-        private JsonDataSerializer()
+        JsonSettings = jsonSettings;
+
+        Serializer = JsonSerializer.Create();
+        PayloadSerializerV1 = JsonSerializer.Create(jsonSettings);
+        PayloadSerializerV2 = JsonSerializer.Create(jsonSettings);
+
+        var contractResolver = new DefaultTestPlatformContractResolver();
+        FastJsonSettings = new JsonSerializerSettings
         {
-            var jsonSettings = new JsonSerializerSettings
-            {
-                DateFormatHandling = DateFormatHandling.IsoDateFormat,
-                DateParseHandling = DateParseHandling.DateTimeOffset,
-                DateTimeZoneHandling = DateTimeZoneHandling.Utc,
-                TypeNameHandling = TypeNameHandling.None,
-                ReferenceLoopHandling = ReferenceLoopHandling.Ignore
-            };
+            DateFormatHandling = jsonSettings.DateFormatHandling,
+            DateParseHandling = jsonSettings.DateParseHandling,
+            DateTimeZoneHandling = jsonSettings.DateTimeZoneHandling,
+            TypeNameHandling = jsonSettings.TypeNameHandling,
+            ReferenceLoopHandling = jsonSettings.ReferenceLoopHandling,
+            MissingMemberHandling = jsonSettings.MissingMemberHandling,
+            // PERF: Null value handling has very small impact on serialization and deserialization. Enabling it does not warrant the risk we run
+            // of changing how our consumers get their data. so we leave it at the default value
+            NullValueHandling = jsonSettings.NullValueHandling,
+            DefaultValueHandling = jsonSettings.DefaultValueHandling,
+            ObjectCreationHandling = jsonSettings.ObjectCreationHandling,
+            PreserveReferencesHandling = jsonSettings.PreserveReferencesHandling,
+            ConstructorHandling = jsonSettings.ConstructorHandling,
+            MetadataPropertyHandling = jsonSettings.MetadataPropertyHandling,
+            Formatting = jsonSettings.Formatting,
+            FloatParseHandling = jsonSettings.FloatParseHandling,
+            FloatFormatHandling = jsonSettings.FloatFormatHandling,
+            StringEscapeHandling = jsonSettings.StringEscapeHandling,
+            TypeNameAssemblyFormatHandling = jsonSettings.TypeNameAssemblyFormatHandling,
+            Culture = jsonSettings.Culture,
+            CheckAdditionalContent = jsonSettings.CheckAdditionalContent,
+            DateFormatString = jsonSettings.DateFormatString,
+            MaxDepth = jsonSettings.MaxDepth,
+            ContractResolver = contractResolver,
+        };
 
-            serializer = JsonSerializer.Create();
-            payloadSerializer = JsonSerializer.Create(jsonSettings);
-            payloadSerializer2 = JsonSerializer.Create(jsonSettings);
+        FastSerializer = JsonSerializer.Create(FastJsonSettings);
 
-            payloadSerializer.ContractResolver = new TestPlatformContractResolver1();
-            payloadSerializer2.ContractResolver = new DefaultTestPlatformContractResolver();
+        PayloadSerializerV1.ContractResolver = new TestPlatformContractResolver1();
+        PayloadSerializerV2.ContractResolver = contractResolver;
 
 #if TRACE_JSON_SERIALIZATION
-            // MemoryTraceWriter can help diagnose serialization issues. Enable it for
-            // debug builds only.
-            // Note that MemoryTraceWriter is not thread safe, please don't use it in parallel
-            // test runs. See https://github.com/JamesNK/Newtonsoft.Json/issues/1279
-            payloadSerializer.TraceWriter = new MemoryTraceWriter();
-            payloadSerializer2.TraceWriter = new MemoryTraceWriter();
+        // MemoryTraceWriter can help diagnose serialization issues. Enable it for
+        // debug builds only.
+        // Note that MemoryTraceWriter is not thread safe, please don't use it in parallel
+        // test runs. See https://github.com/JamesNK/Newtonsoft.Json/issues/1279
+        payloadSerializer.TraceWriter = new MemoryTraceWriter();
+        payloadSerializer2.TraceWriter = new MemoryTraceWriter();
 #endif
-        }
+    }
 
-        /// <summary>
-        /// Gets the JSON Serializer instance.
-        /// </summary>
-        public static JsonDataSerializer Instance
+
+
+    /// <summary>
+    /// Prevents a default instance of the <see cref="JsonDataSerializer"/> class from being created.
+    /// </summary>
+    private JsonDataSerializer() { }
+
+    /// <summary>
+    /// Gets the JSON Serializer instance.
+    /// </summary>
+    public static JsonDataSerializer Instance => s_instance ??= new JsonDataSerializer();
+
+    /// <summary>
+    /// Deserialize a <see cref="Message"/> from raw JSON text.
+    /// </summary>
+    /// <param name="rawMessage">JSON string.</param>
+    /// <returns>A <see cref="Message"/> instance.</returns>
+    public Message DeserializeMessage(string rawMessage)
+    {
+        if (DisableFastJson)
         {
-            get
-            {
-                return instance ?? (instance = new JsonDataSerializer());
-            }
+            // PERF: This is slow, we deserialize the message, and the payload into JToken just to get the header. We then
+            // deserialize the data from the JToken, but that is twice as expensive as deserializing the whole object directly into the final object type.
+            // We need this for backward compatibility though.
+            return Deserialize<VersionedMessage>(rawMessage)!;
         }
 
-        /// <summary>
-        /// Deserialize a <see cref="Message"/> from raw JSON text.
-        /// </summary>
-        /// <param name="rawMessage">JSON string.</param>
-        /// <returns>A <see cref="Message"/> instance.</returns>
-        public Message DeserializeMessage(string rawMessage)
+        // PERF: Try grabbing the version and message type from the string directly, we are pretty certain how the message is serialized
+        // when the format does not match all we do is that we check if 6th character in the message is 'V'
+        if (!FastHeaderParse(rawMessage, out int version, out string? messageType))
         {
-            return this.Deserialize<VersionedMessage>(serializer, rawMessage);
+            // PERF: If the fast path fails, deserialize into header object that does not have any Payload. When the message type info
+            // is at the start of the message, this is also pretty fast. Again, this won't touch the payload.
+            MessageHeader header = DeserializeObjectFast<MessageHeader>(rawMessage)!;
+            version = header.Version;
+            messageType = header.MessageType;
         }
 
-        /// <summary>
-        /// Deserialize the <see cref="Message.Payload"/> for a message.
-        /// </summary>
-        /// <param name="message">A <see cref="Message"/> object.</param>
-        /// <typeparam name="T">Payload type.</typeparam>
-        /// <returns>The deserialized payload.</returns>
-        public T DeserializePayload<T>(Message message)
-        {
-            var versionedMessage = message as VersionedMessage;
-            var payloadSerializer = this.GetPayloadSerializer(versionedMessage?.Version);
-            return this.Deserialize<T>(payloadSerializer, message.Payload);
+        var message = new VersionedMessageWithRawMessage
+        {
+            Version = version,
+            MessageType = messageType,
+            RawMessage = rawMessage,
+        };
+
+        return message;
+    }
+
+    /// <summary>
+    /// Deserialize the <see cref="Message.Payload"/> for a message.
+    /// </summary>
+    /// <param name="message">A <see cref="Message"/> object.</param>
+    /// <typeparam name="T">Payload type.</typeparam>
+    /// <returns>The deserialized payload.</returns>
+    public T? DeserializePayload<T>(Message? message)
+    {
+        if (message is null)
+        {
+            return default;
         }
 
-        /// <summary>
-        /// Deserialize raw JSON to an object using the default serializer.
-        /// </summary>
-        /// <param name="json">JSON string.</param>
-        /// <param name="version">Version of serializer to be used.</param>
-        /// <typeparam name="T">Target type to deserialize.</typeparam>
-        /// <returns>An instance of <see cref="T"/>.</returns>
-        public T Deserialize<T>(string json, int version = 1)
-        {
-            var payloadSerializer = this.GetPayloadSerializer(version);
-            return this.Deserialize<T>(payloadSerializer, json);
+        if (message.GetType() == typeof(Message))
+        {
+            // Message is specifically a Message, and not any of it's child types like VersionedMessage.
+            // Get the default serializer and deserialize. This would be used for any message from very old test host.
+            //
+            // Unit tests also provide a Message in places where using the deserializer would actually
+            // produce a VersionedMessage or VersionedMessageWithRawMessage.
+            var serializerV1 = GetPayloadSerializer(null);
+            TPDebug.Assert(message.Payload is not null, "Payload should not be null");
+            return Deserialize<T>(serializerV1, message.Payload);
         }
 
-        /// <summary>
-        /// Serialize an empty message.
-        /// </summary>
-        /// <param name="messageType">Type of the message.</param>
-        /// <returns>Serialized message.</returns>
-        public string SerializeMessage(string messageType)
+        var versionedMessage = (VersionedMessage)message;
+        var payloadSerializer = GetPayloadSerializer(versionedMessage.Version);
+
+        if (DisableFastJson)
         {
-            return this.Serialize(serializer, new Message { MessageType = messageType });
+            // When fast json is disabled, then the message is a VersionedMessage
+            // with JToken payload.
+            TPDebug.Assert(message.Payload is not null, "Payload should not be null");
+            return Deserialize<T>(payloadSerializer, message.Payload);
         }
 
-        /// <summary>
-        /// Serialize a message with payload.
-        /// </summary>
-        /// <param name="messageType">Type of the message.</param>
-        /// <param name="payload">Payload for the message.</param>
-        /// <returns>Serialized message.</returns>
-        public string SerializePayload(string messageType, object payload)
+        // When fast json is enabled then the message is also a subtype of VersionedMessage, but
+        // the Payload is not populated, and instead the rawMessage string it passed as is.
+        var messageWithRawMessage = (VersionedMessageWithRawMessage)message;
+        var rawMessage = messageWithRawMessage.RawMessage;
+
+        if (rawMessage == null)
         {
-            return this.SerializePayload(messageType, payload, 1);
+            return default;
         }
 
-        /// <summary>
-        /// Serialize a message with payload.
-        /// </summary>
-        /// <param name="messageType">Type of the message.</param>
-        /// <param name="payload">Payload for the message.</param>
-        /// <param name="version">Version for the message.</param>
-        /// <returns>Serialized message.</returns>
-        public string SerializePayload(string messageType, object payload, int version)
+        // The deserialized message can still have a version (0 or 1), that should use the old deserializer
+        if (payloadSerializer == PayloadSerializerV2)
         {
-            var payloadSerializer = this.GetPayloadSerializer(version);
-            var serializedPayload = JToken.FromObject(payload, payloadSerializer);
+            // PERF: Fast path is compatibile only with protocol versions that use serializer_2,
+            // and this is faster than deserializing via deserializer_2.
+            var messageWithPayload = DeserializeObjectFast<PayloadedMessage<T>>(rawMessage);
 
-            return version > 1 ?
-                this.Serialize(serializer, new VersionedMessage { MessageType = messageType, Version = version, Payload = serializedPayload }) :
-                this.Serialize(serializer, new Message { MessageType = messageType, Payload = serializedPayload });
+            return messageWithPayload == null ? default : messageWithPayload.Payload;
         }
-
-        /// <summary>
-        /// Serialize an object to JSON using default serialization settings.
-        /// </summary>
-        /// <typeparam name="T">Type of object to serialize.</typeparam>
-        /// <param name="data">Instance of the object to serialize.</param>
-        /// <param name="version">Version to be stamped.</param>
-        /// <returns>JSON string.</returns>
-        public string Serialize<T>(T data, int version = 1)
-        {
-            var payloadSerializer = this.GetPayloadSerializer(version);
-            return this.Serialize(payloadSerializer, data);
+        else
+        {
+            // PERF: When payloadSerializer1 was resolved we need to deserialize JToken, and then deserialize that.
+            // This is still better than deserializing the JToken in DeserializeMessage because here we know that the payload
+            // will actually be used.
+            TPDebug.Assert(rawMessage is not null, "rawMessage should not be null");
+            var rawMessagePayload = Deserialize<Message>(rawMessage)?.Payload;
+            TPDebug.Assert(rawMessagePayload is not null, "rawMessagePayload should not be null");
+            return Deserialize<T>(payloadSerializer, rawMessagePayload);
         }
+    }
+
+    private static T? DeserializeObjectFast<T>(string value)
+    {
+        using JsonTextReader reader = new(new StringReader(value));
+        return (T?)FastSerializer.Deserialize(reader, typeof(T));
+    }
 
-        /// <inheritdoc/>
-        public T Clone<T>(T obj)
+    private static bool FastHeaderParse(string rawMessage, out int version, out string? messageType)
+    {
+        // PERF: This can be also done slightly better using ReadOnlySpan<char> but we don't have that available by default in .NET Framework
+        // and the speed improvement does not warrant additional dependency. This is already taking just few ms for 10k messages.
+        version = 0;
+        messageType = null;
+
+        try
         {
-            if (obj == null)
+            // The incoming messages look like this, or like this:
+            // {"Version":6,"MessageType":"TestExecution.GetTestRunnerProcessStartInfoForRunAll","Payload":{
+            // {"MessageType":"TestExecution.GetTestRunnerProcessStartInfoForRunAll","Payload":{
+            if (rawMessage.Length < 31)
             {
-                return default;
+                // {"MessageType":"T","Payload":1} with length 31 is the smallest valid message we should be able to parse..
+                return false;
             }
 
-            var stringObj = this.Serialize<T>(obj, 2);
-            return this.Deserialize<T>(stringObj, 2);
-        }
+            // If the message is not versioned then the start quote of the message type string is at index 15 {"MessageType":"
+            int messageTypeStartQuoteIndex = 15;
+            int versionInt = 0;
+            if (rawMessage[2] == 'V')
+            {
+                // This is a potential versioned message that looks like this:
+                // {"Version":6,"MessageType":"TestExecution.GetTestRunnerProcessStartInfoForRunAll","Payload":{
 
-        /// <summary>
-        /// Serialize data.
-        /// </summary>
-        /// <typeparam name="T">Type of data.</typeparam>
-        /// <param name="serializer">Serializer.</param>
-        /// <param name="data">Data to be serialized.</param>
-        /// <returns>Serialized data.</returns>
-        private string Serialize<T>(JsonSerializer serializer, T data)
-        {
-            using (var stringWriter = new StringWriter())
-            using (var jsonWriter = new JsonTextWriter(stringWriter))
+                // Version ':' is on index 10, the number starts at the next index. Find wher the next ',' is and grab that as number.
+                var versionColonIndex = 10;
+                if (rawMessage[versionColonIndex] != ':')
+                {
+                    return false;
+                }
+
+                var firstVersionNumberIndex = 11;
+                // The message is versioned, get the version and update the position of first quote that contains message type.
+                if (!TryGetSubstringUntilDelimiter(rawMessage, firstVersionNumberIndex, ',', maxSearchLength: 4, out string? versionString, out int versionCommaIndex))
+                {
+                    return false;
+                }
+
+                // Message type delmiter is at at versionCommaIndex + the length of '"MessageType":"' which is 15 chars
+                messageTypeStartQuoteIndex = versionCommaIndex + 15;
+
+                if (!int.TryParse(versionString, out versionInt))
+                {
+                    return false;
+                }
+            }
+            else if (rawMessage[2] != 'M' || rawMessage[12] != 'e')
             {
-                serializer.Serialize(jsonWriter, data);
-                return stringWriter.ToString();
+                // Message is not versioned message, and it is also not message that starts with MessageType
+                return false;
             }
-        }
 
-        /// <summary>
-        /// Deserialize data.
-        /// </summary>
-        /// <typeparam name="T">Type of data.</typeparam>
-        /// <param name="serializer">Serializer.</param>
-        /// <param name="data">Data to be deserialized.</param>
-        /// <returns>Deserialized data.</returns>
-        private T Deserialize<T>(JsonSerializer serializer, string data)
-        {
-            using (var stringReader = new StringReader(data))
-            using (var jsonReader = new JsonTextReader(stringReader))
+            if (rawMessage[messageTypeStartQuoteIndex] != '"')
             {
-                return serializer.Deserialize<T>(jsonReader);
+                return false;
             }
-        }
 
-        /// <summary>
-        /// Deserialize JToken object to T object.
-        /// </summary>
-        /// <typeparam name="T">Type of data.</typeparam>
-        /// <param name="serializer">Serializer.</param>
-        /// <param name="jToken">JToken to be deserialized.</param>
-        /// <returns>Deserialized data.</returns>
-        private T Deserialize<T>(JsonSerializer serializer, JToken jToken)
+            int messageTypeStartIndex = messageTypeStartQuoteIndex + 1;
+            // "TestExecution.LaunchAdapterProcessWithDebuggerAttachedCallback" is the longest message type we currently have with 62 chars
+            if (!TryGetSubstringUntilDelimiter(rawMessage, messageTypeStartIndex, '"', maxSearchLength: 100, out string? messageTypeString, out _))
+            {
+                return false;
+            }
+
+            version = versionInt;
+            messageType = messageTypeString;
+            return true;
+        }
+        catch
         {
-            return jToken.ToObject<T>(serializer);
+            return false;
         }
+    }
 
-        private JsonSerializer GetPayloadSerializer(int? version)
+    /// <summary>
+    ///  Try getting substring until a given delimiter, but don't search more characters than maxSearchLength.
+    /// </summary>
+    private static bool TryGetSubstringUntilDelimiter(string rawMessage, int start, char character, int maxSearchLength, out string? substring, out int delimiterIndex)
+    {
+        var length = rawMessage.Length;
+        var searchEnd = start + maxSearchLength;
+        for (int i = start; i < length && i <= searchEnd; i++)
         {
-            if (version == null)
+            if (rawMessage[i] == character)
             {
-                version = 1;
+                delimiterIndex = i;
+                substring = rawMessage.Substring(start, i - start);
+                return true;
             }
+        }
 
-            switch (version)
-            {
-                // 0 is used during negotiation
-                case 0:
-                case 1:
-                // Protocol version 3 was accidentally used with serializer v1 and not
-                // serializer v2, we downgrade to protocol 2 when 3 would be negotiated
-                // unless this is disabled by VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE
-                // env variable.
-                case 3:
-                    return payloadSerializer;
-                case 2:
-                case 4:
-                case 5:
-                    return payloadSerializer2;
-                default:
-                    throw new NotSupportedException($"Protocol version {version} is not supported. " +
-                        "Ensure it is compatible with the latest serializer or add a new one.");
-            }
+        delimiterIndex = -1;
+        substring = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Deserialize raw JSON to an object using the default serializer.
+    /// </summary>
+    /// <param name="json">JSON string.</param>
+    /// <param name="version">Version of serializer to be used.</param>
+    /// <typeparam name="T">Target type to deserialize.</typeparam>
+    /// <returns>An instance of <typeparamref name="T"/>.</returns>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public T? Deserialize<T>(string json, int version = 1)
+    {
+        var payloadSerializer = GetPayloadSerializer(version);
+        return Deserialize<T>(payloadSerializer, json);
+    }
+
+    /// <summary>
+    /// Serialize an empty message.
+    /// </summary>
+    /// <param name="messageType">Type of the message.</param>
+    /// <returns>Serialized message.</returns>
+    public string SerializeMessage(string? messageType)
+    {
+        return Serialize(Serializer, new Message { MessageType = messageType });
+    }
+
+    /// <summary>
+    /// Serialize a message with payload.
+    /// </summary>
+    /// <param name="messageType">Type of the message.</param>
+    /// <param name="payload">Payload for the message.</param>
+    /// <returns>Serialized message.</returns>
+    public string SerializePayload(string? messageType, object? payload)
+    {
+        return SerializePayload(messageType, payload, 1);
+    }
+
+    /// <summary>
+    /// Serialize a message with payload.
+    /// </summary>
+    /// <param name="messageType">Type of the message.</param>
+    /// <param name="payload">Payload for the message.</param>
+    /// <param name="version">Version for the message.</param>
+    /// <returns>Serialized message.</returns>
+    public string SerializePayload(string? messageType, object? payload, int version)
+    {
+        var payloadSerializer = GetPayloadSerializer(version);
+        // Fast json is only equivalent to the serialization that is used for protocol version 2 and upwards (or more precisely for the paths that use PayloadSerializerV2)
+        // so when we resolved the old serializer we should use non-fast path.
+        if (DisableFastJson || payloadSerializer == PayloadSerializerV1)
+        {
+            if (payload == null)
+                return string.Empty;
+
+            var serializedPayload = JToken.FromObject(payload, payloadSerializer);
+
+            return version > 1 ?
+                Serialize(Serializer, new VersionedMessage { MessageType = messageType, Version = version, Payload = serializedPayload }) :
+                Serialize(Serializer, new Message { MessageType = messageType, Payload = serializedPayload });
+        }
+        else
+        {
+            return Serialize(FastSerializer, new VersionedMessageForSerialization { MessageType = messageType, Version = version, Payload = payload });
+        }
+    }
+
+    /// <summary>
+    /// Serialize an object to JSON using default serialization settings.
+    /// </summary>
+    /// <typeparam name="T">Type of object to serialize.</typeparam>
+    /// <param name="data">Instance of the object to serialize.</param>
+    /// <param name="version">Version to be stamped.</param>
+    /// <returns>JSON string.</returns>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public string Serialize<T>(T data, int version = 1)
+    {
+        var payloadSerializer = GetPayloadSerializer(version);
+        return Serialize(payloadSerializer, data);
+    }
+
+    /// <inheritdoc/>
+    [return: NotNullIfNotNull("obj")]
+    public T? Clone<T>(T? obj)
+    {
+        if (obj == null)
+        {
+            return default;
         }
+
+        var stringObj = Serialize(obj, 2);
+        return Deserialize<T>(stringObj, 2)!;
+    }
+
+    /// <summary>
+    /// Serialize data.
+    /// </summary>
+    /// <typeparam name="T">Type of data.</typeparam>
+    /// <param name="serializer">Serializer.</param>
+    /// <param name="data">Data to be serialized.</param>
+    /// <returns>Serialized data.</returns>
+    private static string Serialize<T>(JsonSerializer serializer, T data)
+    {
+        using var stringWriter = new StringWriter();
+        using var jsonWriter = new JsonTextWriter(stringWriter);
+        serializer.Serialize(jsonWriter, data);
+        return stringWriter.ToString();
+    }
+
+    /// <summary>
+    /// Deserialize data.
+    /// </summary>
+    /// <typeparam name="T">Type of data.</typeparam>
+    /// <param name="serializer">Serializer.</param>
+    /// <param name="data">Data to be deserialized.</param>
+    /// <returns>Deserialized data.</returns>
+    private static T? Deserialize<T>(JsonSerializer serializer, string data)
+    {
+        using var stringReader = new StringReader(data);
+        using var jsonReader = new JsonTextReader(stringReader);
+        return serializer.Deserialize<T>(jsonReader);
+    }
+
+    /// <summary>
+    /// Deserialize JToken object to T object.
+    /// </summary>
+    /// <typeparam name="T">Type of data.</typeparam>
+    /// <param name="serializer">Serializer.</param>
+    /// <param name="jToken">JToken to be deserialized.</param>
+    /// <returns>Deserialized data.</returns>
+    private static T Deserialize<T>(JsonSerializer serializer, JToken jToken)
+    {
+        return jToken.ToObject<T>(serializer)!;
+    }
+
+    private static JsonSerializer GetPayloadSerializer(int? version)
+    {
+        version ??= 1;
+
+        return version switch
+        {
+            // 0 is used during negotiation.
+            // Protocol version 3 was accidentally used with serializer v1 and not
+            // serializer v2, we downgrade to protocol 2 when 3 would be negotiated
+            // unless this is disabled by VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE
+            // env variable.
+            0 or 1 or 3 => PayloadSerializerV1,
+            2 or 4 or 5 or 6 or 7 => PayloadSerializerV2,
+
+            _ => throw new NotSupportedException($"Protocol version {version} is not supported. "
+                + "Ensure it is compatible with the latest serializer or add a new one."),
+        };
+    }
+
+    /// <summary>
+    /// Just the header from versioned messages, to avoid touching the Payload when we deserialize message.
+    /// </summary>
+    private class MessageHeader
+    {
+        public int Version { get; set; }
+        public string? MessageType { get; set; }
+    }
+
+    /// <summary>
+    /// Container for the rawMessage string, to avoid changing how messages are passed.
+    /// This allows us to pass MessageWithRawMessage the same way that Message is passed for protocol version 1.
+    /// And VersionedMessage is passed for later protocol versions, but without touching the payload string when we just
+    /// need to know the header.
+    /// !! This message does not populate the Payload property even though it is still present because that comes from Message.
+    /// </summary>
+    private class VersionedMessageWithRawMessage : VersionedMessage
+    {
+        public string? RawMessage { get; set; }
+
+        public override string ToString()
+        {
+            return $"({MessageType}) -> {RawMessage}";
+        }
+    }
+
+    /// <summary>
+    /// This grabs payload from the message, we already know version and message type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    private class PayloadedMessage<T>
+    {
+        public T? Payload { get; set; }
+    }
+
+    /// <summary>
+    /// For serialization directly into string, without first converting to JToken, and then from JToken to string.
+    /// </summary>
+    private class VersionedMessageForSerialization
+    {
+        /// <summary>
+        /// Gets or sets the version of the message
+        /// </summary>
+        public int Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the message type.
+        /// </summary>
+        public string? MessageType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the payload.
+        /// </summary>
+        public object? Payload { get; set; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
index 63785782a1..9e53f03560 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
@@ -1,87 +1,123 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// A communication channel using a length prefix packet frame for communication.
+/// </summary>
+public class LengthPrefixCommunicationChannel : ICommunicationChannel
 {
-    using System;
-    using System.IO;
-    using System.Text;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    private readonly BinaryReader _reader;
+
+    private readonly BinaryWriter _writer;
 
     /// <summary>
-    /// A communication channel using a length prefix packet frame for communication.
+    /// Sync object for sending messages
+    /// Write for binarywriter is NOT thread-safe
     /// </summary>
-    public class LengthPrefixCommunicationChannel : ICommunicationChannel
-    {
-        private readonly BinaryReader reader;
-
-        private readonly BinaryWriter writer;
+    private readonly object _writeSyncObject = new();
 
-        /// <summary>
-        /// Sync object for sending messages
-        /// Write for binarywriter is NOT thread-safe
-        /// </summary>
-        private object writeSyncObject = new object();
-
-        public LengthPrefixCommunicationChannel(Stream stream)
-        {
-            this.reader = new BinaryReader(stream, Encoding.UTF8, true);
+    public LengthPrefixCommunicationChannel(Stream stream)
+    {
+        _reader = new BinaryReader(stream, Encoding.UTF8, true);
 
-            // Using the Buffered stream while writing, improves the write performance. By reducing the number of writes.
-            this.writer = new BinaryWriter(new PlatformStream().CreateBufferedStream(stream, SocketConstants.BufferSize), Encoding.UTF8, true);
-        }
+        // Using the Buffered stream while writing, improves the write performance. By reducing the number of writes.
+        _writer = new BinaryWriter(new PlatformStream().CreateBufferedStream(stream, SocketConstants.BufferSize), Encoding.UTF8, true);
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<MessageReceivedEventArgs> MessageReceived;
+    /// <inheritdoc />
+    public TrackableEvent<MessageReceivedEventArgs> MessageReceived { get; } = new TrackableEvent<MessageReceivedEventArgs>();
 
-        /// <inheritdoc />
-        public Task Send(string data)
+    /// <inheritdoc />
+    public Task Send(string data)
+    {
+        try
         {
-            try
+            // Writing Message on binarywriter is not Thread-Safe
+            // Need to sync one by one to avoid buffer corruption
+            lock (_writeSyncObject)
             {
-                // Writing Message on binarywriter is not Thread-Safe
-                // Need to sync one by one to avoid buffer corruption
-                lock (this.writeSyncObject)
-                {
-                    this.writer.Write(data);
-                    this.writer.Flush();
-                }
+                _writer.Write(data);
+                _writer.Flush();
             }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("LengthPrefixCommunicationChannel.Send: Error sending data: {0}.", ex);
-                throw new CommunicationException("Unable to send data over channel.", ex);
-            }
-
-            return Task.FromResult(0);
         }
+        catch (NotSupportedException ex) when (!_writer.BaseStream.CanWrite)
+        {
+            // As we are simply creating streams around some stream passed as ctor argument, we
+            // end up in some unsynchronized behavior where it's possible that the outside stream
+            // was disposed and we are still trying to write something. In such case we would fail
+            // with "System.NotSupportedException: Stream does not support writing.".
+            // To avoid being too generic in that catch, I am checking if the stream is not writable.
+            EqtTrace.Verbose("LengthPrefixCommunicationChannel.Send: BaseStream is not writable (most likely it was dispose). {0}", ex);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("LengthPrefixCommunicationChannel.Send: Error sending data: {0}.", ex);
+            throw new CommunicationException("Unable to send data over channel.", ex);
+        }
+
+        return Task.FromResult(0);
+    }
 
-        /// <inheritdoc />
-        public Task NotifyDataAvailable()
+    /// <inheritdoc />
+    public Task NotifyDataAvailable(CancellationToken cancellationToken)
+    {
+        try
         {
+            // TODO: Review the comment below, because it says something different than what is
+            // actually happening, and doing what it suggests would potentially lose messages.
+            // For example in the case where we start testhost process, send it version, and
+            // it responds, we then replace the handler with a new one, and there is quite a long time
+            // (tens of milliseconds) when there is no handler present, which would pump the message
+            // and dump it.
+            //
             // Try read data even if no one is listening to the data stream. Some server
             // implementations (like Sockets) depend on the read operation to determine if a
             // connection is closed.
-            if (this.MessageReceived != null)
+            if (MessageReceived.WaitForSubscriber(1000, cancellationToken))
             {
-                var data = this.reader.ReadString();
-                this.MessageReceived.SafeInvoke(this, new MessageReceivedEventArgs { Data = data }, "LengthPrefixCommunicationChannel: MessageReceived");
+                var data = _reader.ReadString();
+                MessageReceived.Notify(this, new MessageReceivedEventArgs { Data = data }, "LengthPrefixCommunicationChannel: MessageReceived");
             }
-
-            return Task.FromResult(0);
         }
+        catch (ObjectDisposedException ex) when (!_reader.BaseStream.CanRead)
+        {
+            // As we are simply creating streams around some stream passed as ctor argument, we
+            // end up in some unsynchronized behavior where it's possible that the outside stream
+            // was disposed and we are still trying to write something. In such case we would fail
+            // with "System.ObjectDisposedException: Cannot access a closed Stream.".
+            // To avoid being too generic in that catch, I am checking if the stream is not readable.
+            EqtTrace.Verbose("LengthPrefixCommunicationChannel.Send: BaseStream was disposed. {0}", ex);
+        }
+
+        return Task.FromResult(0);
+    }
 
-        /// <inheritdoc />
-        public void Dispose()
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        try
         {
             EqtTrace.Verbose("LengthPrefixCommunicationChannel.Dispose: Dispose reader and writer.");
-            this.reader.Dispose();
-            this.writer.Dispose();
-            GC.SuppressFinalize(this);
+            _reader.Dispose();
+            _writer.Dispose();
         }
+        catch (ObjectDisposedException)
+        {
+            // We don't own the underlying stream lifecycle so it's possible that it's already disposed.
+        }
+
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/BeforeTestRunStartPayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/BeforeTestRunStartPayload.cs
index a8872140fe..6e3e9adc29 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/BeforeTestRunStartPayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/BeforeTestRunStartPayload.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The before test run start payload
+/// </summary>
+public class BeforeTestRunStartPayload
+{
     /// <summary>
-    /// The before test run start payload
+    /// Gets or sets run settings xml.
     /// </summary>
-    public class BeforeTestRunStartPayload
-    {
-        /// <summary>
-        /// Gets or sets run settings xml.
-        /// </summary>
-        public string SettingsXml { get; set; }
+    public string? SettingsXml { get; set; }
 
-        /// <summary>
-        /// Gets or sets list of test sources.
-        /// </summary>
-        public IEnumerable<string> Sources { get; set; }
+    /// <summary>
+    /// Gets or sets list of test sources.
+    /// </summary>
+    public IEnumerable<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether telemetry is enabled.
-        /// </summary>
-        public bool IsTelemetryOptedIn { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets a value indicating whether telemetry is enabled.
+    /// </summary>
+    public bool IsTelemetryOptedIn { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs
index 1abacd4f4e..2096c6b37a 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs
@@ -1,34 +1,59 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+
+/// <summary>
+/// The discovery complete payload.
+/// </summary>
+public class DiscoveryCompletePayload
 {
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    /// <summary>
-    /// The discovery complete payload.
-    /// </summary>
-    public class DiscoveryCompletePayload
-    {
-        /// <summary>
-        /// Gets or sets the total number of tests discovered.
-        /// </summary>
-        public long TotalTests { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last chunk of discovered tests.
-        /// </summary>
-        public IEnumerable<TestCase> LastDiscoveredTests { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether discovery was aborted.
-        /// </summary>
-        public bool IsAborted { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Metrics
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the total number of tests discovered.
+    /// </summary>
+    public long TotalTests { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last chunk of discovered tests.
+    /// </summary>
+    public IEnumerable<TestCase>? LastDiscoveredTests { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether discovery was aborted.
+    /// </summary>
+    public bool IsAborted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Metrics
+    /// </summary>
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    /// <summary>
+    /// Gets or sets list of sources which were fully discovered.
+    /// </summary>
+    public IList<string>? FullyDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets list of sources which were partially discovered (started discover tests, but then discovery aborted).
+    /// </summary>
+    public IList<string>? PartiallyDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets list of sources which were not discovered at all.
+    /// </summary>
+    public IList<string>? NotDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets list of sources which skipped in discovery on purpose, e.g. because they are known dlls that have no tests, or there is no runtime provider to run them.
+    /// </summary>
+    public IList<string>? SkippedDiscoverySources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets the collection of discovered extensions.
+    /// </summary>
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; } = new();
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/Message.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/Message.cs
index 2ea60f3454..e5037c5a9f 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/Message.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/Message.cs
@@ -1,33 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
-{
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
+/// <summary>
+/// Construct used for communication
+/// </summary>
+public class Message
+{
     /// <summary>
-    /// Construct used for communication
+    /// Gets or sets the message type.
     /// </summary>
-    public class Message
-    {
-        /// <summary>
-        /// Gets or sets the message type.
-        /// </summary>
-        public string MessageType { get; set; }
+    public string? MessageType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the payload.
-        /// </summary>
-        public JToken Payload { get; set; }
+    /// <summary>
+    /// Gets or sets the payload.
+    /// </summary>
+    // TODO: Our public contract says that we should be able to communicate over JSON, but we should not be stopping ourselves from
+    // negotiating a different protocol. Or using a different serialization library than NewtonsoftJson. Check why this is published as JToken
+    // and not as a string.
+    public JToken? Payload { get; set; }
 
-        /// <summary>
-        /// To string implementation.
-        /// </summary>
-        /// <returns> The <see cref="string"/>. </returns>
-        public override string ToString()
-        {
-            return "(" + this.MessageType + ") -> " + (this.Payload == null ? "null" : this.Payload.ToString(Formatting.Indented));
-        }
+    /// <summary>
+    /// To string implementation.
+    /// </summary>
+    /// <returns> The <see cref="string"/>. </returns>
+    public override string ToString()
+    {
+        // TODO: Review where this is used, we should avoid extensive serialization and deserialization,
+        // and this might be happening in multiple places that are not the edge of our process.
+        return $"({MessageType}) -> {(Payload == null ? "null" : Payload.ToString(Formatting.Indented))}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs
index 0a92bbc38b..29381d0f07 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs
@@ -1,265 +1,288 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+using static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ProtocolVersioning;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+
+/// <summary>
+/// The message type.
+/// </summary>
+public static class MessageType
 {
     /// <summary>
-    /// The message type.
-    /// </summary>
-    public static class MessageType
-    {
-        /// <summary>
-        /// The session start.
-        /// </summary>
-        public const string SessionStart = "TestSession.Start";
-
-        /// <summary>
-        /// The session end.
-        /// </summary>
-        public const string SessionEnd = "TestSession.Terminate";
-
-        /// <summary>
-        /// The is aborted.
-        /// </summary>
-        public const string SessionAbort = "TestSession.Abort";
-
-        /// <summary>
-        /// The session connected.
-        /// </summary>
-        public const string SessionConnected = "TestSession.Connected";
-
-        /// <summary>
-        /// Test Message
-        /// </summary>
-        public const string TestMessage = "TestSession.Message";
-
-        /// <summary>
-        /// Protocol Version
-        /// </summary>
-        public const string VersionCheck = "ProtocolVersion";
-
-        /// <summary>
-        /// Protocol Error
-        /// </summary>
-        public const string ProtocolError = "ProtocolError";
-
-        /// <summary>
-        /// The session start.
-        /// </summary>
-        public const string DiscoveryInitialize = "TestDiscovery.Initialize";
-
-        /// <summary>
-        /// The discovery started.
-        /// </summary>
-        public const string StartDiscovery = "TestDiscovery.Start";
-
-        /// <summary>
-        /// The test cases found.
-        /// </summary>
-        public const string TestCasesFound = "TestDiscovery.TestFound";
-
-        /// <summary>
-        /// The discovery complete.
-        /// </summary>
-        public const string DiscoveryComplete = "TestDiscovery.Completed";
-
-        /// <summary>
-        /// Cancel Test Discovery
-        /// </summary>
-        public const string CancelDiscovery = "TestDiscovery.Cancel";
-
-        /// <summary>
-        /// The session start.
-        /// </summary>
-        public const string ExecutionInitialize = "TestExecution.Initialize";
-
-        /// <summary>
-        /// Cancel the current test run
-        /// </summary>
-        public const string CancelTestRun = "TestExecution.Cancel";
-
-        /// <summary>
-        /// Cancel the current test run
-        /// </summary>
-        public const string AbortTestRun = "TestExecution.Abort";
-
-        /// <summary>
-        /// Start test execution.
-        /// </summary>
-        public const string StartTestExecutionWithSources = "TestExecution.StartWithSources";
-
-        /// <summary>
-        /// Start test execution.
-        /// </summary>
-        public const string StartTestExecutionWithTests = "TestExecution.StartWithTests";
-
-        /// <summary>
-        /// The test run stats change.
-        /// </summary>
-        public const string TestRunStatsChange = "TestExecution.StatsChange";
-
-        /// <summary>
-        /// The execution complete.
-        /// </summary>
-        public const string ExecutionComplete = "TestExecution.Completed";
-
-        /// <summary>
-        /// The message to get runner process startInfo for run all tests in given sources
-        /// </summary>
-        public const string GetTestRunnerProcessStartInfoForRunAll = "TestExecution.GetTestRunnerProcessStartInfoForRunAll";
-
-        /// <summary>
-        /// The message to get runner process startInfo for run selected tests
-        /// </summary>
-        public const string GetTestRunnerProcessStartInfoForRunSelected = "TestExecution.GetTestRunnerProcessStartInfoForRunSelected";
-
-        /// <summary>
-        /// CustomTestHostLaunch
-        /// </summary>
-        public const string CustomTestHostLaunch = "TestExecution.CustomTestHostLaunch";
-
-        /// <summary>
-        /// Custom Test Host launch callback
-        /// </summary>
-        public const string CustomTestHostLaunchCallback = "TestExecution.CustomTestHostLaunchCallback";
-
-        /// <summary>
-        /// Test run attachments processing
-        /// </summary>
-        public const string TestRunAttachmentsProcessingStart = "TestRunAttachmentsProcessing.Start";
-
-        /// <summary>
-        /// Test run attachments processing callback
-        /// </summary>
-        public const string TestRunAttachmentsProcessingComplete = "TestRunAttachmentsProcessing.Complete";
-
-        /// <summary>
-        /// Test run attachments processing progress
-        /// </summary>
-        public const string TestRunAttachmentsProcessingProgress = "TestRunAttachmentsProcessing.Progress";
-
-        /// <summary>
-        /// Cancel test run attachments processing
-        /// </summary>
-        public const string TestRunAttachmentsProcessingCancel = "TestRunAttachmentsProcessing.Cancel";
-
-        /// <summary>
-        /// Extensions Initialization
-        /// </summary>
-        public const string ExtensionsInitialize = "Extensions.Initialize";
-
-        /// <summary>
-        /// Start Test Run All Sources
-        /// </summary>
-        public const string TestRunAllSourcesWithDefaultHost = "TestExecution.RunAllWithDefaultHost";
-
-        /// <summary>
-        ///  Start Test Run - Testcases
-        /// </summary>
-        public const string TestRunSelectedTestCasesDefaultHost = "TestExecution.RunSelectedWithDefaultHost";
-
-        /// <summary>
-        /// Launch Adapter Process With DebuggerAttached
-        /// </summary>
-        public const string LaunchAdapterProcessWithDebuggerAttached = "TestExecution.LaunchAdapterProcessWithDebuggerAttached";
-
-        /// <summary>
-        /// Launch Adapter Process With DebuggerAttached
-        /// </summary>
-        public const string LaunchAdapterProcessWithDebuggerAttachedCallback = "TestExecution.LaunchAdapterProcessWithDebuggerAttachedCallback";
-
-        /// <summary>
-        /// Attach debugger to process.
-        /// </summary>
-        public const string AttachDebugger = "TestExecution.AttachDebugger";
-
-        /// <summary>
-        /// Attach debugger to process callback.
-        /// </summary>
-        public const string AttachDebuggerCallback = "TestExecution.AttachDebuggerCallback";
-
-        /// <summary>
-        /// Attach debugger to process.
-        /// </summary>
-        public const string EditorAttachDebugger = "TestExecution.EditorAttachDebugger";
-
-        /// <summary>
-        /// Attach debugger to process callback.
-        /// </summary>
-        public const string EditorAttachDebuggerCallback = "TestExecution.EditorAttachDebuggerCallback";
-
-        /// <summary>
-        /// Data Collection Message
-        /// </summary>
-        public const string DataCollectionMessage = "DataCollection.SendMessage";
-
-        /// <summary>
-        /// StartTestSession message.
-        /// </summary>
-        public const string StartTestSession = "TestSession.StartTestSession";
-
-        /// <summary>
-        /// StartTestSession callback message.
-        /// </summary>
-        public const string StartTestSessionCallback = "TestSession.StartTestSessionCallback";
-
-        /// <summary>
-        /// StopTestSession message.
-        /// </summary>
-        public const string StopTestSession = "TestSession.StopTestSession";
-
-        /// <summary>
-        /// StopTestSession callback message.
-        /// </summary>
-        public const string StopTestSessionCallback = "TestSession.StopTestSessionCallback";
-
-        #region DataCollector messages
-
-        /// <summary>
-        /// Event message type sent to datacollector process right after test host process has started.
-        /// </summary>
-        public const string TestHostLaunched = "DataCollection.TestHostLaunched";
-
-        /// <summary>
-        /// Event message type send to datacollector process before test run starts.
-        /// </summary>
-        public const string BeforeTestRunStart = "DataCollection.BeforeTestRunStart";
-
-        /// <summary>
-        /// Event message type used by datacollector to send results  after receiving test run start event.
-        /// </summary>
-        public const string BeforeTestRunStartResult = "DataCollection.BeforeTestRunStartResult";
-
-        /// <summary>
-        /// Event message type send to datacollector process after test run ends.
-        /// </summary>
-        public const string AfterTestRunEnd = "DataCollection.AfterTestRunEnd";
-
-        /// <summary>
-        /// Event message type used by datacollector to send result on receiving test run end event.
-        /// </summary>
-        public const string AfterTestRunEndResult = "DataCollection.AfterTestRunEndResult";
-
-        /// <summary>
-        /// Event message type send to datacollector process before test case execution starts.
-        /// </summary>
-        public const string DataCollectionTestStart = "DataCollection.TestStart";
-
-        /// <summary>
-        /// Event message type used to signal datacollector process that test case execution has ended.
-        /// </summary>
-        public const string DataCollectionTestEnd = "DataCollection.TestEnd";
-
-        /// <summary>
-        /// Event message type used by datacollector to send result on receiving TestEnd.
-        /// </summary>
-        public const string DataCollectionTestEndResult = "DataCollection.TestEndResult";
-
-        /// <summary>
-        /// Ack Event message type send to datacollector process before test case execution starts.
-        /// </summary>
-        public const string DataCollectionTestStartAck = "DataCollection.TestStartAck";
-
-        #endregion
-    }
+    /// The session start.
+    /// </summary>
+    [ProtocolVersion(Version0, typeof(void), Description = "Not used.")]
+    public const string SessionStart = "TestSession.Start";
+
+    /// <summary>
+    /// The session end.
+    /// </summary>
+    [ProtocolVersion(Version0, typeof(void))]
+    public const string SessionEnd = "TestSession.Terminate";
+
+    /// <summary>
+    /// The is aborted.
+    /// </summary>
+    [ProtocolVersion(Version0, typeof(void), Description = "Is sent to testhost, and then ignored.")]
+    public const string SessionAbort = "TestSession.Abort";
+
+    /// <summary>
+    /// The session connected.
+    /// </summary>
+    [ProtocolVersion(Version0, typeof(void), Description = "Is sent from DesignMode client (vstest.console) back to IDE, to signal that we are ready to recieve requests.")]
+    public const string SessionConnected = "TestSession.Connected";
+
+    /// <summary>
+    /// Test Message
+    /// </summary>
+    [ProtocolVersion(Version0, typeof(TestMessagePayload), Description = "A log message or similar message sent back from console or testhost.")]
+    public const string TestMessage = "TestSession.Message";
+
+    /// <summary>
+    /// Protocol Version
+    /// </summary>
+    [ProtocolVersion(Version1, typeof(int), Description = @"Used for version handshake from IDE to vstest.console and from vstest.console to testhost,
+        the highest common version is used. Version that is negotiated with vstest.console, is used for testhost handshake to ensure that testhost
+        does not use a protocol that is newer than what we negotiated with IDE.")]
+    public const string VersionCheck = "ProtocolVersion";
+
+    /// <summary>
+    /// Protocol Error
+    /// </summary>
+    public const string ProtocolError = "ProtocolError";
+
+    /// <summary>
+    /// The session start.
+    /// </summary>
+    public const string DiscoveryInitialize = "TestDiscovery.Initialize";
+
+    /// <summary>
+    /// The discovery started.
+    /// </summary>
+    public const string StartDiscovery = "TestDiscovery.Start";
+
+    /// <summary>
+    /// The test cases found.
+    /// </summary>
+    public const string TestCasesFound = "TestDiscovery.TestFound";
+
+    /// <summary>
+    /// The discovery complete.
+    /// </summary>
+    public const string DiscoveryComplete = "TestDiscovery.Completed";
+
+    /// <summary>
+    /// Cancel Test Discovery
+    /// </summary>
+    public const string CancelDiscovery = "TestDiscovery.Cancel";
+
+    /// <summary>
+    /// The session start.
+    /// </summary>
+    public const string ExecutionInitialize = "TestExecution.Initialize";
+
+    /// <summary>
+    /// Cancel the current test run
+    /// </summary>
+    public const string CancelTestRun = "TestExecution.Cancel";
+
+    /// <summary>
+    /// Cancel the current test run
+    /// </summary>
+    public const string AbortTestRun = "TestExecution.Abort";
+
+    /// <summary>
+    /// Start test execution.
+    /// </summary>
+    public const string StartTestExecutionWithSources = "TestExecution.StartWithSources";
+
+    /// <summary>
+    /// Start test execution.
+    /// </summary>
+    public const string StartTestExecutionWithTests = "TestExecution.StartWithTests";
+
+    /// <summary>
+    /// The test run stats change.
+    /// </summary>
+    public const string TestRunStatsChange = "TestExecution.StatsChange";
+
+    /// <summary>
+    /// The execution complete.
+    /// </summary>
+    public const string ExecutionComplete = "TestExecution.Completed";
+
+    /// <summary>
+    /// The message to get runner process startInfo for run all tests in given sources
+    /// </summary>
+    public const string GetTestRunnerProcessStartInfoForRunAll = "TestExecution.GetTestRunnerProcessStartInfoForRunAll";
+
+    /// <summary>
+    /// The message to get runner process startInfo for run selected tests
+    /// </summary>
+    public const string GetTestRunnerProcessStartInfoForRunSelected = "TestExecution.GetTestRunnerProcessStartInfoForRunSelected";
+
+    /// <summary>
+    /// CustomTestHostLaunch
+    /// </summary>
+    public const string CustomTestHostLaunch = "TestExecution.CustomTestHostLaunch";
+
+    /// <summary>
+    /// Custom Test Host launch callback
+    /// </summary>
+    public const string CustomTestHostLaunchCallback = "TestExecution.CustomTestHostLaunchCallback";
+
+    /// <summary>
+    /// Test run attachments processing
+    /// </summary>
+    public const string TestRunAttachmentsProcessingStart = "TestRunAttachmentsProcessing.Start";
+
+    /// <summary>
+    /// Test run attachments processing callback
+    /// </summary>
+    public const string TestRunAttachmentsProcessingComplete = "TestRunAttachmentsProcessing.Complete";
+
+    /// <summary>
+    /// Test run attachments processing progress
+    /// </summary>
+    public const string TestRunAttachmentsProcessingProgress = "TestRunAttachmentsProcessing.Progress";
+
+    /// <summary>
+    /// Cancel test run attachments processing
+    /// </summary>
+    public const string TestRunAttachmentsProcessingCancel = "TestRunAttachmentsProcessing.Cancel";
+
+    /// <summary>
+    /// Extensions Initialization
+    /// </summary>
+    public const string ExtensionsInitialize = "Extensions.Initialize";
+
+    /// <summary>
+    /// Start Test Run All Sources
+    /// </summary>
+    public const string TestRunAllSourcesWithDefaultHost = "TestExecution.RunAllWithDefaultHost";
+
+    /// <summary>
+    ///  Start Test Run - Testcases
+    /// </summary>
+    public const string TestRunSelectedTestCasesDefaultHost = "TestExecution.RunSelectedWithDefaultHost";
+
+    /// <summary>
+    /// Launch Adapter Process With DebuggerAttached
+    /// </summary>
+    public const string LaunchAdapterProcessWithDebuggerAttached = "TestExecution.LaunchAdapterProcessWithDebuggerAttached";
+
+    /// <summary>
+    /// Launch Adapter Process With DebuggerAttached
+    /// </summary>
+    public const string LaunchAdapterProcessWithDebuggerAttachedCallback = "TestExecution.LaunchAdapterProcessWithDebuggerAttachedCallback";
+
+    /// <summary>
+    /// Attach debugger to process.
+    /// </summary>
+    [ProtocolVersion(Version3, typeof(TestProcessAttachDebuggerPayload))]
+    public const string AttachDebugger = "TestExecution.AttachDebugger";
+
+    /// <summary>
+    /// Attach debugger to process callback.
+    /// </summary>
+    [ProtocolVersion(Version3, typeof(bool))]
+    public const string AttachDebuggerCallback = "TestExecution.AttachDebuggerCallback";
+
+    /// <summary>
+    /// Attach debugger to process.
+    /// </summary>
+    [ProtocolVersion(Version3, typeof(int), Deprecated = Version7, Description = "Carries the process id the IDE should attach to. DEPRECATED, use EditorAttachDebugger2 instead.")]
+    public const string EditorAttachDebugger = "TestExecution.EditorAttachDebugger";
+
+    /// <summary>
+    /// Attach debugger to process callback.
+    /// </summary>
+    [ProtocolVersion(Version3, typeof(EditorAttachDebuggerAckPayload))]
+    public const string EditorAttachDebuggerCallback = "TestExecution.EditorAttachDebuggerCallback";
+
+    /// <summary>
+    /// Data Collection Message
+    /// </summary>
+    public const string DataCollectionMessage = "DataCollection.SendMessage";
+
+    /// <summary>
+    /// StartTestSession message.
+    /// </summary>
+    public const string StartTestSession = "TestSession.StartTestSession";
+
+    /// <summary>
+    /// StartTestSession callback message.
+    /// </summary>
+    public const string StartTestSessionCallback = "TestSession.StartTestSessionCallback";
+
+    /// <summary>
+    /// StopTestSession message.
+    /// </summary>
+    public const string StopTestSession = "TestSession.StopTestSession";
+
+    /// <summary>
+    /// StopTestSession callback message.
+    /// </summary>
+    public const string StopTestSessionCallback = "TestSession.StopTestSessionCallback";
+
+    /// <summary>
+    /// Event message type sent to datacollector process right after test host process has started.
+    /// </summary>
+    public const string TestHostLaunched = "DataCollection.TestHostLaunched";
+
+    /// <summary>
+    /// Event message type send to datacollector process before test run starts.
+    /// </summary>
+    public const string BeforeTestRunStart = "DataCollection.BeforeTestRunStart";
+
+    /// <summary>
+    /// Event message type used by datacollector to send results  after receiving test run start event.
+    /// </summary>
+    public const string BeforeTestRunStartResult = "DataCollection.BeforeTestRunStartResult";
+
+    /// <summary>
+    /// Event message type send to datacollector process after test run ends.
+    /// </summary>
+    public const string AfterTestRunEnd = "DataCollection.AfterTestRunEnd";
+
+    /// <summary>
+    /// Event message type used by datacollector to send result on receiving test run end event.
+    /// </summary>
+    public const string AfterTestRunEndResult = "DataCollection.AfterTestRunEndResult";
+
+    /// <summary>
+    /// Event message type send to datacollector process before test case execution starts.
+    /// </summary>
+    public const string DataCollectionTestStart = "DataCollection.TestStart";
+
+    /// <summary>
+    /// Event message type used to signal datacollector process that test case execution has ended.
+    /// </summary>
+    public const string DataCollectionTestEnd = "DataCollection.TestEnd";
+
+    /// <summary>
+    /// Event message type used by datacollector to send result on receiving TestEnd.
+    /// </summary>
+    public const string DataCollectionTestEndResult = "DataCollection.TestEndResult";
+
+    /// <summary>
+    /// Ack Event message type send to datacollector process before test case execution starts.
+    /// </summary>
+    public const string DataCollectionTestStartAck = "DataCollection.TestStartAck";
+
+    /// <summary>
+    /// Attach debugger to process.
+    /// </summary>
+    [ProtocolVersion(Version7, typeof(EditorAttachDebuggerPayload))]
+    public const string EditorAttachDebugger2 = "TestExecution.EditorAttachDebugger2";
+
+    /// <summary>
+    /// Telemetry event.
+    /// </summary>
+    public const string TelemetryEventMessage = "TestPlatform.TelemetryEvent";
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/ProtocolVersionAttribute.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/ProtocolVersionAttribute.cs
new file mode 100644
index 0000000000..662ef22dbc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/ProtocolVersionAttribute.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+
+[Conditional("DEBUG")]
+[AttributeUsage(AttributeTargets.Field)]
+internal class ProtocolVersionAttribute : Attribute
+{
+    public ProtocolVersionAttribute(int added, Type payloadType)
+    {
+        Added = added;
+        PayloadType = payloadType;
+    }
+
+    public int Added { get; }
+    public Type PayloadType { get; }
+    public int Deprecated { get; set; }
+    public string? Description { get; set; }
+    public bool IsUsed { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestHostLaunchedPayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestHostLaunchedPayload.cs
index 203bbb0ea6..d68f2786a4 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestHostLaunchedPayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestHostLaunchedPayload.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
-    public class TestHostLaunchedPayload
-    {
-        /// <summary>
-        /// Gets or sets the test run process id of test host.
-        /// </summary>
-        [DataMember]
-        public int ProcessId { get; set; }
-    }
+public class TestHostLaunchedPayload
+{
+    /// <summary>
+    /// Gets or sets the test run process id of test host.
+    /// </summary>
+    [DataMember]
+    public int ProcessId { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs
index b5c4e610ed..f5d715df07 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestMessagePayload.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The test message payload.
+/// </summary>
+public class TestMessagePayload
+{
     /// <summary>
-    /// The test message payload.
+    /// Gets or sets the message level.
     /// </summary>
-    public class TestMessagePayload
-    {
-        /// <summary>
-        /// Gets or sets the message level.
-        /// </summary>
-        public TestMessageLevel MessageLevel { get; set; }
+    public TestMessageLevel MessageLevel { get; set; }
 
-        /// <summary>
-        /// Gets or sets the message.
-        /// </summary>
-        public string Message { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the message.
+    /// </summary>
+    public string? Message { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingCompletePayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingCompletePayload.cs
index 40ac9c4c8b..5ca9d1d3bf 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingCompletePayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingCompletePayload.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// Test run attachments processing complete payload.
+/// </summary>
+public class TestRunAttachmentsProcessingCompletePayload
+{
     /// <summary>
-    /// Test run attachments processing complete payload.
+    /// Gets or sets the test run attachments processing complete args.
     /// </summary>
-    public class TestRunAttachmentsProcessingCompletePayload
-    {
-        /// <summary>
-        /// Gets or sets the test run attachments processing complete args.
-        /// </summary>
-        public TestRunAttachmentsProcessingCompleteEventArgs AttachmentsProcessingCompleteEventArgs { get; set; }
+    public TestRunAttachmentsProcessingCompleteEventArgs? AttachmentsProcessingCompleteEventArgs { get; set; }
 
-        /// <summary>
-        /// Gets or sets the attachments.
-        /// </summary>
-        public IEnumerable<AttachmentSet> Attachments { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the attachments.
+    /// </summary>
+    public IEnumerable<AttachmentSet>? Attachments { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingProgressPayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingProgressPayload.cs
index 80082ae30d..2ec6d1af4f 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingProgressPayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingProgressPayload.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// Test run attachments processing complete payload.
+/// </summary>
+public class TestRunAttachmentsProcessingProgressPayload
+{
     /// <summary>
-    /// Test run attachments processing complete payload.
+    /// Gets or sets the test run attachments processing complete args.
     /// </summary>
-    public class TestRunAttachmentsProcessingProgressPayload
-    {
-        /// <summary>
-        /// Gets or sets the test run attachments processing complete args.
-        /// </summary>
-        public TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs { get; set; }
-    }
+    public TestRunAttachmentsProcessingProgressEventArgs? AttachmentsProcessingProgressEventArgs { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs
index 4f708327ae..4953041d51 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunCompletePayload.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The test run complete payload.
+/// </summary>
+public class TestRunCompletePayload
+{
     /// <summary>
-    /// The test run complete payload.
+    /// Gets or sets the test run complete args.
     /// </summary>
-    public class TestRunCompletePayload
-    {
-        /// <summary>
-        /// Gets or sets the test run complete args.
-        /// </summary>
-        public TestRunCompleteEventArgs TestRunCompleteArgs { get; set; }
+    public TestRunCompleteEventArgs? TestRunCompleteArgs { get; set; }
 
-        /// <summary>
-        /// Gets or sets the last run tests.
-        /// </summary>
-        public TestRunChangedEventArgs LastRunTests { get; set; }
+    /// <summary>
+    /// Gets or sets the last run tests.
+    /// </summary>
+    public TestRunChangedEventArgs? LastRunTests { get; set; }
 
-        /// <summary>
-        /// Gets or sets the run attachments.
-        /// </summary>
-        public ICollection<AttachmentSet> RunAttachments { get; set; }
+    /// <summary>
+    /// Gets or sets the run attachments.
+    /// </summary>
+    public ICollection<AttachmentSet>? RunAttachments { get; set; }
 
-        /// <summary>
-        /// Gets or sets the executor uris that were used to run the tests.
-        /// </summary>
-        public ICollection<string> ExecutorUris { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the executor uris that were used to run the tests.
+    /// </summary>
+    public ICollection<string>? ExecutorUris { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs
index 655c067407..159e8a1f6d 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunStatsPayload.cs
@@ -1,25 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The test run stats payload.
+/// </summary>
+public class TestRunStatsPayload
+{
     /// <summary>
-    /// The test run stats payload.
+    /// Gets or sets the test run changed event args.
     /// </summary>
-    public class TestRunStatsPayload
-    {
-        /// <summary>
-        /// Gets or sets the test run changed event args.
-        /// </summary>
-        public TestRunChangedEventArgs TestRunChangedArgs { get; set; }
+    public TestRunChangedEventArgs? TestRunChangedArgs { get; set; }
 
-        /// <summary>
-        /// Gets or sets the in progress test cases.
-        /// </summary>
-        public IEnumerable<TestCase> InProgressTestCases { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the in progress test cases.
+    /// </summary>
+    public IEnumerable<TestCase>? InProgressTestCases { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/VersionedMessage.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/VersionedMessage.cs
index a48e59cdae..a79a9eaceb 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/VersionedMessage.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/VersionedMessage.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Construct with version used for communication
+/// Introduced in 15.1.0 version and default message protocol v2 onwards.
+/// </summary>
+public class VersionedMessage : Message
 {
     /// <summary>
-    /// Construct with version used for communication
-    /// Introduced in 15.1.0 version and default message protocol v2 onwards.
+    /// Gets or sets the version of the message
     /// </summary>
-    public class VersionedMessage : Message
-    {
-        /// <summary>
-        /// Gets or sets the version of the message
-        /// </summary>
-        public int Version { get; set; }
-    }
-}
\ No newline at end of file
+    public int Version { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
index f3d0faf79e..ba1a60a643 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
@@ -1,32 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
-
     <PackageReference Include="Newtonsoft.Json">
-      <Version>$(JsonNetVersion)</Version>
+      <Version>$(NewtonsoftJsonVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
+    <Reference Include="System.Runtime" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -40,6 +36,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
     <None Update="Resources\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -51,5 +51,16 @@
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommunicationUtilities</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.cs
new file mode 100644
index 0000000000..3054557f08
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.tt b/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithSources.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithSources.cs
index 96cc0f8bc7..2af05c6121 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithSources.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithSources.cs
@@ -1,55 +1,54 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Newtonsoft.Json;
 
-    using Newtonsoft.Json;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The test run criteria with sources.
+/// </summary>
+public class TestRunCriteriaWithSources
+{
     /// <summary>
-    /// The test run criteria with sources.
+    /// Initializes a new instance of the <see cref="TestRunCriteriaWithSources"/> class.
     /// </summary>
-    public class TestRunCriteriaWithSources
+    /// <param name="adapterSourceMap"> The adapter source map.  </param>
+    /// <param name="package"> The package which actually contain sources. A testhost can at max execute for one package at time
+    /// Package can be null if test source, and package are same
+    /// </param>
+    /// <param name="runSettings"> The run settings.  </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    [JsonConstructor]
+    public TestRunCriteriaWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string? package, string? runSettings, TestExecutionContext testExecutionContext)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteriaWithSources"/> class.
-        /// </summary>
-        /// <param name="adapterSourceMap"> The adapter source map.  </param>
-        /// <param name="package"> The package which actually contain sources. A testhost can at max execute for one package at time
-        /// Package can be null if test source, and package are same
-        /// </param>
-        /// <param name="runSettings"> The run settings.  </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        [JsonConstructor]
-        public TestRunCriteriaWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string package, string runSettings, TestExecutionContext testExecutionContext)
-        {
-            this.AdapterSourceMap = adapterSourceMap;
-            this.Package = package;
-            this.RunSettings = runSettings;
-            this.TestExecutionContext = testExecutionContext;
-        }
-
-        /// <summary>
-        /// Gets the adapter source map.
-        /// </summary>
-        public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
-
-        /// <summary>
-        /// Gets the run settings.
-        /// </summary>
-        public string RunSettings { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the test execution context.
-        /// </summary>
-        public TestExecutionContext TestExecutionContext { get; set; }
-
-        /// <summary>
-        /// Gets the test Containers (e.g. .appx, .appxrecipie)
-        /// </summary>
-        public string Package { get; private set; }
+        AdapterSourceMap = adapterSourceMap;
+        Package = package;
+        RunSettings = runSettings;
+        TestExecutionContext = testExecutionContext;
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Gets the adapter source map.
+    /// </summary>
+    public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
+
+    /// <summary>
+    /// Gets the run settings.
+    /// </summary>
+    public string? RunSettings { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the test execution context.
+    /// </summary>
+    public TestExecutionContext TestExecutionContext { get; set; }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. .appx, .appxrecipie)
+    /// </summary>
+    public string? Package { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithTests.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithTests.cs
index fe5337f87b..0dcd9c35ba 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithTests.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ObjectModel/TestRunCriteriaWithTests.cs
@@ -1,57 +1,56 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Newtonsoft.Json;
 
-    using Newtonsoft.Json;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 
+/// <summary>
+/// The test run criteria with tests.
+/// </summary>
+public class TestRunCriteriaWithTests
+{
     /// <summary>
-    /// The test run criteria with tests.
+    /// Initializes a new instance of the <see cref="TestRunCriteriaWithTests"/> class.
+    /// Ensure that names of constructor parameters match the public property names of the same for JSON serialization
     /// </summary>
-    public class TestRunCriteriaWithTests
+    /// <param name="tests"> The tests. </param>
+    /// <param name="package"> The package which actually contain sources. A testhost can at max execute for one package at time
+    /// Package can be null if test source, and package are same
+    /// </param>
+    /// <param name="runSettings"> The test run settings. </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    [JsonConstructor]
+    public TestRunCriteriaWithTests(IEnumerable<TestCase> tests, string? package, string? runSettings, TestExecutionContext testExecutionContext)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteriaWithTests"/> class.
-        /// Ensure that names of constructor parameters match the public property names of the same for JSON serialization
-        /// </summary>
-        /// <param name="tests"> The tests. </param>
-        /// <param name="package"> The package which actually contain sources. A testhost can at max execute for one package at time
-        /// Package can be null if test source, and package are same
-        /// </param>
-        /// <param name="runSettings"> The test run settings. </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        [JsonConstructor]
-        public TestRunCriteriaWithTests(IEnumerable<TestCase> tests, string package, string runSettings, TestExecutionContext testExecutionContext)
-        {
-            this.Tests = tests;
-            this.Package = package;
-            this.RunSettings = runSettings;
-            this.TestExecutionContext = testExecutionContext;
-        }
-
-        /// <summary>
-        /// Gets the tests.
-        /// </summary>
-        public IEnumerable<TestCase> Tests { get; private set; }
-
-        /// <summary>
-        /// Gets the test run settings.
-        /// </summary>
-        public string RunSettings { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the test execution context.
-        /// </summary>
-        public TestExecutionContext TestExecutionContext { get; set; }
-
-        /// <summary>
-        /// Gets the test Containers (e.g. .appx, .appxrecipie)
-        /// </summary>
-        public string Package { get; private set; }
+        Tests = tests;
+        Package = package;
+        RunSettings = runSettings;
+        TestExecutionContext = testExecutionContext;
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Gets the tests.
+    /// </summary>
+    public IEnumerable<TestCase> Tests { get; private set; }
+
+    /// <summary>
+    /// Gets the test run settings.
+    /// </summary>
+    public string? RunSettings { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the test execution context.
+    /// </summary>
+    public TestExecutionContext TestExecutionContext { get; set; }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. .appx, .appxrecipie)
+    /// </summary>
+    public string? Package { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7c1921d728..0000000000
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.VisualStudio.TestPlatform.CommunicationUtilities")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e6c539e9-d7c1-44fc-a49e-d2d52ec2c902")]
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
new file mode 100644
index 0000000000..577c849a00
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal static class ProtocolVersioning
+{
+    public const int HighestSupportedVersion = Version7;
+    public const int LowestSupportedVersion = Version0;
+
+    // 0: the original protocol with no versioning (Message). It is used during negotiation.
+    // 1: new protocol with versioning (VersionedMessage).
+    // 2: changed serialization because the serialization of properties in bag was too verbose,
+    //    so common properties are considered built-in and serialized without type info.
+    // 3: introduced because of changes to allow attaching debugger to external process.
+    // 4: introduced because 3 did not update this table and ended up using the serializer for protocol v1,
+    //    which is extremely slow. We negotiate 2 or 4, but never 3 unless the flag above is set.
+    // 5: ???
+    // 6: accepts abort and cancel with handlers that report the status.
+    /// <summary>
+    /// The original protocol with no versioning. It sends and receives a Message that carries just data
+    /// and has no Version field. It is used during negotiation to ensure that we communicate at the
+    /// lowest available version the other side can be.
+    /// </summary>
+    public const int Version0 = 0;
+
+    /// <summary>
+    /// Adds versioning to the protocol by introducing VersionedMessage.
+    /// </summary>
+    public const int Version1 = 1;
+
+    /// <summary>
+    /// Changed serialization because the serialization of properties in bag was too verbose,
+    /// so common properties are considered built-in and serialized without type info.
+    /// </summary>
+    public const int Version2 = 2;
+
+    /// <summary>
+    /// Added attach debugger messages to allow attaching to external process.
+    /// /!\ This protocol version should not be used. It incorrectly serializes using the old
+    /// version 1 serializer that is very slow.
+    /// Added messages:
+    /// <see cref="MessageType.AttachDebugger"/>
+    /// <see cref="MessageType.AttachDebuggerCallback"/>
+    /// <see cref="MessageType.EditorAttachDebugger"/>
+    /// <see cref="MessageType.EditorAttachDebuggerCallback"/>
+    /// </summary>
+    public const int Version3 = 3;
+
+    // 4: introduced because 3 did not update this table and ended up using the serializer for protocol v1,
+    //    which is extremely slow. We negotiate 2 or 4, but never 3 unless the flag above is set.
+    public const int Version4 = 4;
+    public const int Version5 = 5;
+    public const int Version6 = 6;
+    public const int Version7 = 7;
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d9ce642e6c
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,400 @@
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.AbortTestRun = "TestExecution.Abort" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.AfterTestRunEnd = "DataCollection.AfterTestRunEnd" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.AfterTestRunEndResult = "DataCollection.AfterTestRunEndResult" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.AttachDebugger = "TestExecution.AttachDebugger" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.AttachDebuggerCallback = "TestExecution.AttachDebuggerCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.BeforeTestRunStart = "DataCollection.BeforeTestRunStart" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.BeforeTestRunStartResult = "DataCollection.BeforeTestRunStartResult" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.CancelDiscovery = "TestDiscovery.Cancel" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.CancelTestRun = "TestExecution.Cancel" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.CustomTestHostLaunch = "TestExecution.CustomTestHostLaunch" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.CustomTestHostLaunchCallback = "TestExecution.CustomTestHostLaunchCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DataCollectionMessage = "DataCollection.SendMessage" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DataCollectionTestEnd = "DataCollection.TestEnd" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DataCollectionTestEndResult = "DataCollection.TestEndResult" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DataCollectionTestStart = "DataCollection.TestStart" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DataCollectionTestStartAck = "DataCollection.TestStartAck" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DiscoveryComplete = "TestDiscovery.Completed" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.DiscoveryInitialize = "TestDiscovery.Initialize" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.EditorAttachDebugger = "TestExecution.EditorAttachDebugger" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.EditorAttachDebugger2 = "TestExecution.EditorAttachDebugger2" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.EditorAttachDebuggerCallback = "TestExecution.EditorAttachDebuggerCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.ExecutionComplete = "TestExecution.Completed" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.ExecutionInitialize = "TestExecution.Initialize" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.ExtensionsInitialize = "Extensions.Initialize" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.GetTestRunnerProcessStartInfoForRunAll = "TestExecution.GetTestRunnerProcessStartInfoForRunAll" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.GetTestRunnerProcessStartInfoForRunSelected = "TestExecution.GetTestRunnerProcessStartInfoForRunSelected" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.LaunchAdapterProcessWithDebuggerAttached = "TestExecution.LaunchAdapterProcessWithDebuggerAttached" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback = "TestExecution.LaunchAdapterProcessWithDebuggerAttachedCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.ProtocolError = "ProtocolError" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.SessionAbort = "TestSession.Abort" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.SessionConnected = "TestSession.Connected" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.SessionEnd = "TestSession.Terminate" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.SessionStart = "TestSession.Start" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StartDiscovery = "TestDiscovery.Start" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StartTestExecutionWithSources = "TestExecution.StartWithSources" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StartTestExecutionWithTests = "TestExecution.StartWithTests" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StartTestSession = "TestSession.StartTestSession" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StartTestSessionCallback = "TestSession.StartTestSessionCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StopTestSession = "TestSession.StopTestSession" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.StopTestSessionCallback = "TestSession.StopTestSessionCallback" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestCasesFound = "TestDiscovery.TestFound" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestHostLaunched = "DataCollection.TestHostLaunched" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestMessage = "TestSession.Message" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunAllSourcesWithDefaultHost = "TestExecution.RunAllWithDefaultHost" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunAttachmentsProcessingCancel = "TestRunAttachmentsProcessing.Cancel" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunAttachmentsProcessingComplete = "TestRunAttachmentsProcessing.Complete" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunAttachmentsProcessingProgress = "TestRunAttachmentsProcessing.Progress" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunAttachmentsProcessingStart = "TestRunAttachmentsProcessing.Start" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunSelectedTestCasesDefaultHost = "TestExecution.RunSelectedWithDefaultHost" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TestRunStatsChange = "TestExecution.StatsChange" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.VersionCheck = "ProtocolVersion" -> string!
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketConstants.BufferSize = 16384 -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.CommunicationEndpointFactory
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.CommunicationEndpointFactory.CommunicationEndpointFactory() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.CommunicationEndpointFactory.Create(Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole role) -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.DataCollectionRequestSender() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.InitializeCommunication() -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.SendAfterTestRunEndAndGetResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler? runEventsHandler, bool isCancelled) -> Microsoft.VisualStudio.TestPlatform.Common.DataCollection.AfterTestRunEndResult?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.SendBeforeTestRunStartAndGetResult(string? settingsXml, System.Collections.Generic.IEnumerable<string!>! sources, bool isTelemetryOptedIn, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler? runEventsHandler) -> Microsoft.VisualStudio.TestPlatform.Common.DataCollection.BeforeTestRunStartResult?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.SendTestHostLaunched(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestHostLaunchedPayload! testHostLaunchedPayload) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.DataCollectionRequestSender.WaitForRequestHandlerConnection(int clientConnectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.DataCollectionTestCaseEventSender() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.DataCollectionTestCaseEventSender(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager! communicationManager, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer! dataSerializer) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.InitializeCommunication(int port) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.SendTestCaseEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs! e) -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.SendTestCaseStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.SendTestSessionEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.WaitForRequestSenderConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestInitializeEventsHandler
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestInitializeEventsHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestInitializeEventsHandler.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestInitializeEventsHandler.TestInitializeEventsHandler(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler! requestHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo? testProcessStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers.TestRunEventsHandler.TestRunEventsHandler(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler! requestHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.CommunicationException
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.CommunicationException.CommunicationException() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.CommunicationException.CommunicationException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.CommunicationException.CommunicationException(string? message, System.Exception? inner) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.Channel.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.Connected.get -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.ConnectedEventArgs() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.ConnectedEventArgs(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel! channel) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.ConnectedEventArgs(System.Exception? faultException) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs.Fault.get -> System.Exception?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs.DisconnectedEventArgs() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs.Error.get -> System.Exception?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs.Error.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.Send(string! data) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint.Connected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint.Disconnected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint.Start(string! endPoint) -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint.Stop() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndpointFactory
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndpointFactory.Create(Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole role) -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.AcceptClientAsync() -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.DeserializePayload<T>(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message! message) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.HostServer(System.Net.IPEndPoint! endpoint) -> System.Net.IPEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.ReceiveMessage() -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.ReceiveMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message?>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.ReceiveRawMessage() -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.ReceiveRawMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<string?>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.SendMessage(string! messageType) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.SendMessage(string! messageType, object! payload) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.SendMessage(string! messageType, object! payload, int version) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.SendRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.SetupClientAsync(System.Net.IPEndPoint! endpoint) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.StopClient() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.StopServer() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.WaitForClientConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager.WaitForServerConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.InitializeCommunication(int port) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.SendTestCaseEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs! e) -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.SendTestCaseStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.SendTestSessionEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataCollectionTestCaseEventSender.WaitForRequestSenderConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.Clone<T>(T? obj) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.DeserializeMessage(string! rawMessage) -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.DeserializePayload<T>(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message? message) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.SerializeMessage(string? messageType) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.SerializePayload(string? messageType, object? payload) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer.SerializePayload(string? messageType, object? payload, int version) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.ConnectionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.ConnectionInfo.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.DiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.InitializeCommunication() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo? testProcessStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.ProcessRequests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.ITestHostManagerFactory! testHostManagerFactory) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.SendExecutionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.SendLog(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel messageLevel, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.SendTestCases(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.SendTestRunStatistics(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler.WaitForRequestSenderConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.CheckVersionWithTestHost() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.EndSession() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.InitializeCommunication() -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.InitializeDiscovery(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.InitializeExecution(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.OnClientProcessExit(string! stdError) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.SendDiscoveryAbort() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.SendTestRunAbort() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.SendTestRunCancel() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.StartTestRun(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources! runCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.StartTestRun(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests! runCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender.WaitForRequestHandlerConnection(int connectionTimeout, System.Threading.CancellationToken cancellationToken) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITransport
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITransport.Initialize() -> System.Net.IPEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITransport.WaitForConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs.Data.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs.Data.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs.MessageReceivedEventArgs() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.Clone<T>(T? obj) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.Deserialize<T>(string! json, int version = 1) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.DeserializeMessage(string! rawMessage) -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.DeserializePayload<T>(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message? message) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.Serialize<T>(T data, int version = 1) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.SerializeMessage(string? messageType) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.SerializePayload(string? messageType, object? payload) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.SerializePayload(string? messageType, object? payload, int version) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.LengthPrefixCommunicationChannel(System.IO.Stream! stream) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.Send(string! data) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.Message() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.MessageType.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.MessageType.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.Payload.get -> Newtonsoft.Json.Linq.JToken?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.Payload.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.BeforeTestRunStartPayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.IsTelemetryOptedIn.get -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.IsTelemetryOptedIn.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.SettingsXml.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.SettingsXml.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.Sources.get -> System.Collections.Generic.IEnumerable<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.BeforeTestRunStartPayload.Sources.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.DiscoveredExtensions.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.DiscoveredExtensions.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.DiscoveryCompletePayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.FullyDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.FullyDiscoveredSources.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.IsAborted.get -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.IsAborted.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.LastDiscoveredTests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.LastDiscoveredTests.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.Metrics.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.NotDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.NotDiscoveredSources.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.PartiallyDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.PartiallyDiscoveredSources.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.SkippedDiscoverySources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.SkippedDiscoverySources.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.TotalTests.get -> long
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.TotalTests.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestHostLaunchedPayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestHostLaunchedPayload.ProcessId.get -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestHostLaunchedPayload.ProcessId.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestHostLaunchedPayload.TestHostLaunchedPayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload.Message.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload.Message.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload.MessageLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload.MessageLevel.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestMessagePayload.TestMessagePayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload.Attachments.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload.Attachments.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload.AttachmentsProcessingCompleteEventArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload.AttachmentsProcessingCompleteEventArgs.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingCompletePayload.TestRunAttachmentsProcessingCompletePayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingProgressPayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingProgressPayload.AttachmentsProcessingProgressEventArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingProgressPayload.AttachmentsProcessingProgressEventArgs.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunAttachmentsProcessingProgressPayload.TestRunAttachmentsProcessingProgressPayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.ExecutorUris.get -> System.Collections.Generic.ICollection<string!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.ExecutorUris.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.LastRunTests.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.LastRunTests.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.RunAttachments.get -> System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.RunAttachments.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.TestRunCompleteArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.TestRunCompleteArgs.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCompletePayload.TestRunCompletePayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.AdapterSourceMap.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.Package.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.RunSettings.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.TestExecutionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.TestExecutionContext.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources.TestRunCriteriaWithSources(System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>! adapterSourceMap, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.Package.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.RunSettings.get -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.TestExecutionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.TestExecutionContext.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.TestRunCriteriaWithTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests.Tests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload.InProgressTestCases.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload.InProgressTestCases.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload.TestRunChangedArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload.TestRunChangedArgs.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunStatsPayload.TestRunStatsPayload() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.DefaultTestPlatformContractResolver
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.DefaultTestPlatformContractResolver.DefaultTestPlatformContractResolver() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestCaseConverter
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestCaseConverter.TestCaseConverter() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.TestObjectConverter() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestPlatformContractResolver1
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestPlatformContractResolver1.TestPlatformContractResolver1() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestResultConverter
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestResultConverter.TestResultConverter() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestRunStatisticsConverter
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestRunStatisticsConverter.TestRunStatisticsConverter() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.Connected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.Disconnected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.SocketClient() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.SocketClient(System.Func<System.IO.Stream!, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel!>! channelFactory) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.Start(string! endPoint) -> string!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketClient.Stop() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.AcceptClientAsync() -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.DeserializePayload<T>(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message! message) -> T?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.HostServer(System.Net.IPEndPoint! endpoint) -> System.Net.IPEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.ReceiveMessage() -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.ReceiveMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message?>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.ReceiveRawMessage() -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.ReceiveRawMessageAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<string?>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SendMessage(string! messageType) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SendMessage(string! messageType, object! payload) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SendMessage(string! messageType, object! payload, int version) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SendRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SetupClientAsync(System.Net.IPEndPoint! endpoint) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.SocketCommunicationManager() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.StopClient() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.StopServer() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.WaitForClientConnection(int clientConnectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketCommunicationManager.WaitForServerConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketConstants
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketConstants.SocketConstants() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.Connected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.Disconnected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.SocketServer() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.SocketServer(System.Func<System.IO.Stream!, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel!>! channelFactory) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.Start(string! endPoint) -> string?
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketServer.Stop() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketTransport
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketTransport.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketTransport.Initialize() -> System.Net.IPEndPoint!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketTransport.SocketTransport(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationManager! communicationManager, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo connectionInfo) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.SocketTransport.WaitForConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestDiscoveryEventHandler.TestDiscoveryEventHandler(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestHandler! requestHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.CheckVersionWithTestHost() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.CloseConnectionOnOperationComplete.get -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.CloseConnectionOnOperationComplete.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.Dispose() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.EndSession() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.InitializeCommunication() -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.InitializeDiscovery(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.InitializeExecution(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.OnClientProcessExit(string! stdError) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.SendDiscoveryAbort() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.SendTestRunAbort() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.SendTestRunCancel() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.StartTestRun(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithSources! runCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.StartTestRun(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.TestRunCriteriaWithTests! runCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.TestRequestSender(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig! protocolConfig, Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider! runtimeProvider) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.WaitForRequestHandlerConnection(int connectionTimeout, System.Threading.CancellationToken cancellationToken) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.VersionedMessage
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.VersionedMessage.Version.get -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.VersionedMessage.Version.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.VersionedMessage.VersionedMessage() -> void
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.DefaultTestPlatformContractResolver.CreateContract(System.Type! objectType) -> Newtonsoft.Json.Serialization.JsonContract!
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestCaseConverter.CanConvert(System.Type! objectType) -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestCaseConverter.ReadJson(Newtonsoft.Json.JsonReader! reader, System.Type! objectType, object? existingValue, Newtonsoft.Json.JsonSerializer! serializer) -> object?
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestCaseConverter.WriteJson(Newtonsoft.Json.JsonWriter! writer, object? value, Newtonsoft.Json.JsonSerializer! serializer) -> void
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.CanConvert(System.Type! objectType) -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.CanRead.get -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.CanWrite.get -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.ReadJson(Newtonsoft.Json.JsonReader! reader, System.Type! objectType, object? existingValue, Newtonsoft.Json.JsonSerializer! serializer) -> object!
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestObjectConverter.WriteJson(Newtonsoft.Json.JsonWriter! writer, object? value, Newtonsoft.Json.JsonSerializer! serializer) -> void
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestPlatformContractResolver1.CreateContract(System.Type! objectType) -> Newtonsoft.Json.Serialization.JsonContract!
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestResultConverter.CanConvert(System.Type! objectType) -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestResultConverter.ReadJson(Newtonsoft.Json.JsonReader! reader, System.Type! objectType, object? existingValue, Newtonsoft.Json.JsonSerializer! serializer) -> object!
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestResultConverter.WriteJson(Newtonsoft.Json.JsonWriter! writer, object? value, Newtonsoft.Json.JsonSerializer! serializer) -> void
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestRunStatisticsConverter.CanConvert(System.Type! objectType) -> bool
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestRunStatisticsConverter.ReadJson(Newtonsoft.Json.JsonReader! reader, System.Type! objectType, object? existingValue, Newtonsoft.Json.JsonSerializer! serializer) -> object?
+override Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization.TestRunStatisticsConverter.WriteJson(Newtonsoft.Json.JsonWriter! writer, object? value, Newtonsoft.Json.JsonSerializer! serializer) -> void
+static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.Create() -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender!
+static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender.Instance.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollectionTestCaseEventSender?
+static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.Instance.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer!
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.AbortedTestDiscovery.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.AbortedTestDiscoveryWithReason.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.AbortedTestRun.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.AttachDebuggerToDefaultTestHostFailure.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.ConnectionClosed.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.ConnectionTimeoutErrorMessage.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.Culture.get -> System.Globalization.CultureInfo
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.Culture.set -> void
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.ResourceManager.get -> System.Resources.ResourceManager
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.TestHostProcessCrashed.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.UnableToCommunicateToTestHost.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.UnexpectedMessage.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.VersionCheckFailed.get -> string
+~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.VersionCheckTimedout.get -> string
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.TrackableEvent() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Unsubscribe(System.EventHandler<T>? eventHandler) -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.WaitForSubscriber(int timeoutMilliseconds, System.Threading.CancellationToken cancellationToken) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Notify(object! sender, T eventArgs, string! traceDisplayName) -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Subscribe(System.EventHandler<T>? eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.MessageReceived.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.MessageReceived.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.NotifyDataAvailable(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.NotifyDataAvailable(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..6505a7e4c2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.MessageType.TelemetryEventMessage = "TestPlatform.TelemetryEvent" -> string!
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs
index 0a50b20672..7ed3cd840b 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs
@@ -62,7 +62,7 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The active test discovery was aborted. Reason: {0}.
+        ///   Looks up a localized string similar to The active test discovery was aborted..
         /// </summary>
         public static string AbortedTestDiscovery {
             get {
@@ -70,6 +70,15 @@ public static string AbortedTestDiscovery {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The active test discovery was aborted. Reason: {0}.
+        /// </summary>
+        public static string AbortedTestDiscoveryWithReason {
+            get {
+                return ResourceManager.GetString("AbortedTestDiscoveryWithReason", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The active test run was aborted. Reason: {0}.
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx
index b98ce64332..a1fc8083ac 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="AbortedTestDiscovery" xml:space="preserve">
-    <value>The active test discovery was aborted. Reason: {0}</value>
+    <value>The active test discovery was aborted.</value>
   </data>
   <data name="AbortedTestRun" xml:space="preserve">
     <value>The active test run was aborted. Reason: {0}</value>
@@ -147,4 +147,7 @@
   <data name="AttachDebuggerToDefaultTestHostFailure" xml:space="preserve">
     <value>Cannot attach the debugger to the default test host.</value>
   </data>
+  <data name="AbortedTestDiscoveryWithReason" xml:space="preserve">
+    <value>The active test discovery was aborted. Reason: {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf
index 95ef147464..8573e3d270 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Aktivní testovací běh se přerušil. Důvod: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Vzdálený hostitel vynutil ukončení existujícího připojení.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Aktivní zjišťování testu se přerušilo. Důvod: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se navázat komunikaci s procesem hostitele testu.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Byla přijata neočekávaná zpráva. Očekávaný typ zprávy: {0} Skutečný typ zprávy: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Kontrola verze protokolu selhala. Ověřte, jestli je spouštěč testů kompatibilní s hostitelem.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Nepodařilo se vyjednat protokol. Po {0} s vypršel časový limit čekání na odezvu. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {1} prosím časový limit prodlužte.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Procesu {0} se nepovedlo připojit k procesu {1} ani po {2} s. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {3} prosím časový limit prodlužte.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Proces testovacího hostitele se chybově ukončil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Ladicí program se nedá připojit k výchozímu hostiteli testů.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Aktivní testovací běh se přerušil. Důvod: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Vzdálený hostitel vynutil ukončení existujícího připojení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Aktivní zjišťování testů se přerušilo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Aktivní zjišťování testu se přerušilo. Důvod: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Nepovedlo se navázat komunikaci s procesem hostitele testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Byla přijata neočekávaná zpráva. Očekávaný typ zprávy: {0} Skutečný typ zprávy: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Kontrola verze protokolu selhala. Ověřte, jestli je spouštěč testů kompatibilní s hostitelem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Nepodařilo se vyjednat protokol. Po {0} s vypršel časový limit čekání na odezvu. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {1} prosím časový limit prodlužte.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Procesu {0} se nepovedlo připojit k procesu {1} ani po {2} s. Důvodem může být pomalý počítač. Nastavením proměnné prostředí {3} prosím časový limit prodlužte.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Proces testovacího hostitele se chybově ukončil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Ladicí program se nedá připojit k výchozímu hostiteli testů.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf
index b101f56dea..f94cf5c424 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Der aktive Testlauf wurde abgebrochen. Grund: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Das Schließen einer vorhandenen Verbindung wurde vom Remotehost erzwungen.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Die aktive Testermittlung wurde abgebrochen. Grund: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Die Kommunikation mit dem Testhostprozess ist nicht möglich.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Unerwartete Meldung empfangen. Erwarteter MessageType: {0}. Tatsächlicher MessageType: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Fehler beim Überprüfen der Protokollversion. Der Test Runner und der Host müssen kompatibel sein.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Fehler beim Verhandeln des Protokolls. Timeout beim Warten auf Antwort nach {0} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{1}" fest, um den Timeoutwert zu erhöhen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Fehler beim Herstellen einer Verbindung des Prozesses "{0}" mit dem Prozess "{1}" nach {2} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{3}" fest, um den Timeoutwert zu erhöhen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Der Testhostprozess ist abgestürzt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Der Debugger kann nicht an den Standardtesthost angefügt werden.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Der aktive Testlauf wurde abgebrochen. Grund: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Das Schließen einer vorhandenen Verbindung wurde vom Remotehost erzwungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Die aktive Testerkennung wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Die aktive Testermittlung wurde abgebrochen. Grund: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Die Kommunikation mit dem Testhostprozess ist nicht möglich.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Unerwartete Meldung empfangen. Erwarteter MessageType: {0}. Tatsächlicher MessageType: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Fehler beim Überprüfen der Protokollversion. Der Test Runner und der Host müssen kompatibel sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Fehler beim Verhandeln des Protokolls. Timeout beim Warten auf Antwort nach {0} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{1}" fest, um den Timeoutwert zu erhöhen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Fehler beim Herstellen einer Verbindung des Prozesses "{0}" mit dem Prozess "{1}" nach {2} Sekunden. Möglicherweise ist der Computer langsam. Legen Sie die Umgebungsvariable "{3}" fest, um den Timeoutwert zu erhöhen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Der Testhostprozess ist abgestürzt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Der Debugger kann nicht an den Standardtesthost angefügt werden.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf
index 56268124be..2143343451 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Se ha anulado la serie de pruebas activa. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">El host remoto forzó el cierre de una conexión.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Se ha anulado la detección de pruebas activa. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">No se puede establecer comunicación con el proceso del host de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Se ha recibido un mensaje inesperado. Tipo de mensaje esperado: {0} Tipo de mensaje real: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Error en la comprobación de la versión del protocolo. Asegúrese de que el ejecutor de pruebas y el host son compatibles.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">No se pudo negociar el protocolo, se agotó el tiempo de espera para la respuesta después de {0} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {1} para aumentar el tiempo de espera.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">El proceso {0} no pudo conectar con el proceso {1} después de {2} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {3} para aumentar el tiempo de espera.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Proceso de host de pruebas bloqueado</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">No se puede asociar el depurador al host de prueba predeterminado.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Se ha anulado la serie de pruebas activa. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">El host remoto forzó el cierre de una conexión.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Se ha anulado la detección de pruebas activa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Se ha anulado la detección de pruebas activa. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">No se puede establecer comunicación con el proceso del host de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Se ha recibido un mensaje inesperado. Tipo de mensaje esperado: {0} Tipo de mensaje real: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Error en la comprobación de la versión del protocolo. Asegúrese de que el ejecutor de pruebas y el host son compatibles.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">No se pudo negociar el protocolo, se agotó el tiempo de espera para la respuesta después de {0} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {1} para aumentar el tiempo de espera.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">El proceso {0} no pudo conectar con el proceso {1} después de {2} segundos. Esto puede deberse a la lentitud de la máquina, configure la variable de entorno {3} para aumentar el tiempo de espera.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Proceso de host de pruebas bloqueado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">No se puede asociar el depurador al host de prueba predeterminado.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf
index fd10885589..6c7715e2d7 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">La série de tests active a été abandonnée. Raison : {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Une connexion existante a été fermée de force par l'hôte distant.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">La découverte de tests active a été abandonnée. Raison : {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Impossible de communiquer avec le processus hôte du test.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Message inattendu reçu. MessageType attendu : {0} MessageType réel : {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Échec de la vérification de la version du protocole. Vérifiez que Test Runner et l'hôte sont compatibles.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Échec de négociation du protocole, en attente d’une réponse dont le délai expire après {0} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {1} de sorte à augmenter le délai d’expiration.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Le processus {0} n’a pas réussi à se connecter au processus {1} après {2} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {3} de sorte à augmenter le délai d’expiration.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Plantage du processus hôte de test</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Impossible d'attacher le débogueur à l'hôte de test par défaut.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">La série de tests active a été abandonnée. Raison : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Une connexion existante a été fermée de force par l'hôte distant.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">La découverte de tests active a été abandonnée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">La découverte de tests active a été abandonnée. Raison : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Impossible de communiquer avec le processus hôte du test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Message inattendu reçu. MessageType attendu : {0} MessageType réel : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Échec de la vérification de la version du protocole. Vérifiez que Test Runner et l'hôte sont compatibles.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Échec de négociation du protocole, en attente d’une réponse dont le délai expire après {0} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {1} de sorte à augmenter le délai d’expiration.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Le processus {0} n’a pas réussi à se connecter au processus {1} après {2} secondes. Cette situation peut se produire à cause de la lenteur de la machine. Définissez la variable d’environnement {3} de sorte à augmenter le délai d’expiration.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Plantage du processus hôte de test</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Impossible d'attacher le débogueur à l'hôte de test par défaut.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf
index c859fd81f8..553b51cb16 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">L'esecuzione dei test attivi è stata interrotta. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Una connessione esistente è stata chiusa forzatamente dall'host remoto.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">L'individuazione dei test attivi è stata interrotta. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Non è possibile comunicare con il processo host dei test.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">È stato ricevuto un messaggio imprevisto. Tipo di messaggio previsto: {0}. Tipo di messaggio effettivo: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Il controllo della versione del protocollo non è riuscito. Assicurarsi che runner e host dei test siano compatibili.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Non è stato possibile negoziare il protocollo: in attesa del timeout della risposta dopo {0} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {1} in modo da incrementare il timeout.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Il processo {0} non è riuscito a connettersi al processo {1} dopo {2} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {3} in modo da incrementare il timeout.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Arresto anomalo del processo host di test</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Non è possibile collegare il debugger all'host di test predefinito.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">L'esecuzione dei test attivi è stata interrotta. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Una connessione esistente è stata chiusa forzatamente dall'host remoto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">L'individuazione dei test attivi è stata interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">L'individuazione dei test attivi è stata interrotta. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Non è possibile comunicare con il processo host dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">È stato ricevuto un messaggio imprevisto. Tipo di messaggio previsto: {0}. Tipo di messaggio effettivo: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Il controllo della versione del protocollo non è riuscito. Assicurarsi che runner e host dei test siano compatibili.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Non è stato possibile negoziare il protocollo: in attesa del timeout della risposta dopo {0} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {1} in modo da incrementare il timeout.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Il processo {0} non è riuscito a connettersi al processo {1} dopo {2} secondi. Questo problema può verificarsi a causa della lentezza del computer. Impostare la variabile di ambiente {3} in modo da incrementare il timeout.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Arresto anomalo del processo host di test</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Non è possibile collegare il debugger all'host di test predefinito.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf
index cd1e2f66ab..bce2062c64 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">アクティブなテストの実行が中止されました。理由: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">既存の接続はリモート ホストに強制的に切断されました。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">アクティブなテスト探索が中止されました。理由: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">テスト ホスト プロセスと通信できません。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">予期しないメッセージを受信しました。予想されたメッセージの種類: {0} 実際のメッセージの種類: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">プロトコルのバージョンを確認できませんでした。テスト ランナーとホストに互換性があることをご確認ください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">プロトコルをネゴシエートできませんでした。応答への待機が {0} 秒後にタイムアウトしました。これはマシンの遅さが原因で発生する可能性があるため、環境変数 {1} を設定してタイムアウト時間を増やしてください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">{0} プロセスでは、{2} 秒後に {1} プロセスへ接続できませんでした。これは、マシンの遅さが原因で発生する可能性があるため、環境変数 {3} を設定してタイムアウト時間を増やしてください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">テストのホスト プロセスがクラッシュしました</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">デバッガーを既定のテスト ホストにアタッチできません。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">アクティブなテストの実行が中止されました。理由: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">既存の接続はリモート ホストに強制的に切断されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">アクティブなテスト探索が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">アクティブなテスト探索が中止されました。理由: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">テスト ホスト プロセスと通信できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">予期しないメッセージを受信しました。予想されたメッセージの種類: {0} 実際のメッセージの種類: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">プロトコルのバージョンを確認できませんでした。テスト ランナーとホストに互換性があることをご確認ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">プロトコルをネゴシエートできませんでした。応答への待機が {0} 秒後にタイムアウトしました。これはマシンの遅さが原因で発生する可能性があるため、環境変数 {1} を設定してタイムアウト時間を増やしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">{0} プロセスでは、{2} 秒後に {1} プロセスへ接続できませんでした。これは、マシンの遅さが原因で発生する可能性があるため、環境変数 {3} を設定してタイムアウト時間を増やしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">テストのホスト プロセスがクラッシュしました</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">デバッガーを既定のテスト ホストにアタッチできません。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf
index 0c880cec04..52423f5968 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">활성 테스트 실행이 중단되었습니다. 이유: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">원격 호스트에 의해 기존 연결이 강제로 종료되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">활성 테스트 검색이 중단되었습니다. 이유: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">테스트 호스트 프로세스와 통신할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">예기치 않은 메시지를 수신했습니다. 필요한 MessageType: {0} 실제 MessageType: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">프로토콜 버전을 확인하지 못했습니다. Test Runner와 호스트가 호환되는지 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">프로토콜을 협상하지 못했습니다. {0}초 후 응답 시간이 초과될 때까지 기다리는 중입니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {1}을(를) 설정하여 시간 제한을 늘리세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">{0} 프로세스가 {2}초 후 {1} 프로세스에 연결하지 못했습니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {3}을(를) 설정하여 시간 제한을 늘리세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">테스트 호스트 프로세스 작동이 중단됨</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">기본 테스트 호스트에 디버거를 연결할 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">활성 테스트 실행이 중단되었습니다. 이유: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">원격 호스트에 의해 기존 연결이 강제로 종료되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">활성 테스트 검색이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">활성 테스트 검색이 중단되었습니다. 이유: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">테스트 호스트 프로세스와 통신할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">예기치 않은 메시지를 수신했습니다. 필요한 MessageType: {0} 실제 MessageType: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">프로토콜 버전을 확인하지 못했습니다. Test Runner와 호스트가 호환되는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">프로토콜을 협상하지 못했습니다. {0}초 후 응답 시간이 초과될 때까지 기다리는 중입니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {1}을(를) 설정하여 시간 제한을 늘리세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">{0} 프로세스가 {2}초 후 {1} 프로세스에 연결하지 못했습니다. 이런 오류는 컴퓨터가 느려서 발생할 수 있습니다. 환경 변수 {3}을(를) 설정하여 시간 제한을 늘리세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">테스트 호스트 프로세스 작동이 중단됨</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">기본 테스트 호스트에 디버거를 연결할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf
index 777913c9a6..32f9e407ec 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Aktywny przebieg testu został przerwany. Przyczyna: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Zamknięcie istniejącego połączenia zostało wymuszone przez host zdalny.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Aktywny proces wykrywania testu został przerwany. Przyczyna: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Nie można nawiązać komunikacji z procesem hosta.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Otrzymano nieoczekiwany komunikat. Oczekiwany typ komunikatu: {0}, otrzymany typ komunikatu: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Sprawdzanie wersji protokołu nie powiodło się. Upewnij się, że moduł uruchamiający testy i host są zgodne.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Negocjowanie protokołu nie powiodło się, po upływie {0} sekund został przekroczony limit czasu oczekiwania na odpowiedź. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Proces {0} nie mógł połączyć się z procesem {1} w ciągu {2} sekund. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {3}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Wystąpiła awaria procesu hosta testu</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Nie można dołączyć debugera do domyślnego hosta testowego.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Aktywny przebieg testu został przerwany. Przyczyna: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Zamknięcie istniejącego połączenia zostało wymuszone przez host zdalny.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Aktywny proces wykrywania testu został przerwany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Aktywny proces wykrywania testu został przerwany. Przyczyna: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Nie można nawiązać komunikacji z procesem hosta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Otrzymano nieoczekiwany komunikat. Oczekiwany typ komunikatu: {0}, otrzymany typ komunikatu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Sprawdzanie wersji protokołu nie powiodło się. Upewnij się, że moduł uruchamiający testy i host są zgodne.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Negocjowanie protokołu nie powiodło się, po upływie {0} sekund został przekroczony limit czasu oczekiwania na odpowiedź. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Proces {0} nie mógł połączyć się z procesem {1} w ciągu {2} sekund. Przyczyną może być wolne działanie maszyny. Zwiększ limit czasu, ustawiając zmienną środowiskową {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Wystąpiła awaria procesu hosta testu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Nie można dołączyć debugera do domyślnego hosta testowego.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf
index e7b6bd3768..848b7773d4 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">A execução de teste ativa foi anulada. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Uma conexão existente foi fechada à força pelo host remoto.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">A descoberta de teste ativa foi anulada. Motivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Não é possível se comunicar com o processo de host de teste.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Mensagem inesperada recebida. MessageType esperada: {0} MessageType real: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Falha na verificação da versão do protocolo. Verifique se o executor de testes e o host são compatíveis.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Falha ao negociar o protocolo, aguardando pelo tempo limite de resposta após {0} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {1} para aumentar o tempo limite.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">O processo {0} falha ao se conectar ao processo {1} após {2} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {3} para aumentar o tempo limite.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Falha no processo do host de teste</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Não é possível anexar o depurador ao host de teste padrão.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">A execução de teste ativa foi anulada. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Uma conexão existente foi fechada à força pelo host remoto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">A detecção de testes ativa foi anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">A descoberta de teste ativa foi anulada. Motivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Não é possível se comunicar com o processo de host de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Mensagem inesperada recebida. MessageType esperada: {0} MessageType real: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Falha na verificação da versão do protocolo. Verifique se o executor de testes e o host são compatíveis.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Falha ao negociar o protocolo, aguardando pelo tempo limite de resposta após {0} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {1} para aumentar o tempo limite.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">O processo {0} falha ao se conectar ao processo {1} após {2} segundos. Isso pode ocorrer devido à lentidão do computador. Defina a variável de ambiente {3} para aumentar o tempo limite.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Falha no processo do host de teste</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Não é possível anexar o depurador ao host de teste padrão.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf
index beb0b4325b..ba06838750 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Активный тестовый запуск прерван. Причина: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Существующее подключение принудительно закрыто удаленным узлом.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Активное обнаружение тестов прервано. Причина: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Не удалось связаться с хост-процессом теста.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Получено непредвиденное сообщение. Ожидаемый тип сообщения (MessageType): {0}, фактический тип сообщения (MessageType): {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Проверка версии протокола не пройдена. Убедитесь, что средство запуска теста и узел совместимы.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Не удалось согласовать протокол, превышено время ожидания ответа по прошествии {0} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {1}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">Процесс {0} не смог подключиться к процессу {1} по прошествии {2} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {3}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Сбой хост-процесса теста</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Не удается подключить отладчик к узлу тестирования по умолчанию.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Активный тестовый запуск прерван. Причина: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Существующее подключение принудительно закрыто удаленным узлом.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Активное обнаружение тестов прервано.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Активное обнаружение тестов прервано. Причина: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Не удалось связаться с хост-процессом теста.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Получено непредвиденное сообщение. Ожидаемый тип сообщения (MessageType): {0}, фактический тип сообщения (MessageType): {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Проверка версии протокола не пройдена. Убедитесь, что средство запуска теста и узел совместимы.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Не удалось согласовать протокол, превышено время ожидания ответа по прошествии {0} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">Процесс {0} не смог подключиться к процессу {1} по прошествии {2} с. Это может происходить из-за медленной работы компьютера. Увеличьте время ожидания в переменной среды {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Сбой хост-процесса теста</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Не удается подключить отладчик к узлу тестирования по умолчанию.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf
index ef2baae23d..d653842622 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Etkin test çalıştırması iptal edildi. Nedeni: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">Mevcut bir bağlantı uzak konak tarafından zorla kapatıldı.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">Etkin test bulma iptal edildi. Nedeni: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">Test ana bilgisayarı işlemi ile iletişim kurulamıyor.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">Beklenmeyen ileti alındı. Beklenen MessageType: {0} Gerçek MessageType: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">Protokol sürümü denetlenemedi. Test çalıştırıcısı ve ana bilgisayarının uyumlu olduğundan emin olun.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">Protokol üzerinde anlaşmaya varılamadı, yanıt bekleme süresi {0} saniyenin ardından zaman aşımına uğradı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {1} olarak ayarlayın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">{0} işlemi, {2} saniye sonra {1} işlemine bağlanamadı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {3} olarak ayarlayın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">Test ana işlemi kilitlendi</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">Hata ayıklayıcı, varsayılan test ana bilgisayarına eklenemiyor.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">Etkin test çalıştırması iptal edildi. Nedeni: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">Mevcut bir bağlantı uzak konak tarafından zorla kapatıldı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">Etkin test bulma durduruldu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">Etkin test bulma iptal edildi. Nedeni: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">Test ana bilgisayarı işlemi ile iletişim kurulamıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">Beklenmeyen ileti alındı. Beklenen MessageType: {0} Gerçek MessageType: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">Protokol sürümü denetlenemedi. Test çalıştırıcısı ve ana bilgisayarının uyumlu olduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">Protokol üzerinde anlaşmaya varılamadı, yanıt bekleme süresi {0} saniyenin ardından zaman aşımına uğradı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {1} olarak ayarlayın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">{0} işlemi, {2} saniye sonra {1} işlemine bağlanamadı. Bu durum makinenin yavaşlığından kaynaklanıyor olabilir, zaman aşımı süresini artırmak için lütfen ortam değişkenini {3} olarak ayarlayın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">Test ana işlemi kilitlendi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">Hata ayıklayıcı, varsayılan test ana bilgisayarına eklenemiyor.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf
index cfa1b10ad0..074b7f5a26 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf
@@ -4,50 +4,54 @@
     <body>
       <trans-unit id="AbortedTestRun">
         <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ConnectionClosed">
         <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
         <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnableToCommunicateToTestHost">
         <source>Unable to communicate with test host process.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnexpectedMessage">
         <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
         <target state="new">Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="VersionCheckFailed">
         <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
         <target state="new">Protocol version check failed. Make sure test runner and host are compatible.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
         <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
         <target state="new">Failed to negotiate protocol. Wait for response timed out.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ConnectionTimeoutErrorMessage">
         <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
         <target state="new">{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestHostProcessCrashed">
         <source>Test host process crashed</source>
         <target state="new">Test host process crashed</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
         <source>Cannot attach the debugger to the default test host.</source>
         <target state="new">Cannot attach the debugger to the default test host.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf
index 9003ea3047..be99a9bc47 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">活动的测试运行已中止。原因: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">现有连接被远程主机强制关闭。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">活动的测试发现已中止。原因: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">无法与测试宿主进程通信。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">收到意外消息。意外 MessageType: {0} 实际 MessageType: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">协议版本检查失败。请确保测试运行程序和主机兼容。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">未能协商协议，等待响应在 {0} 秒后超时。出现此问题可能是因为计算机性能较低，请设置环境变量 {1}，增加超时时间值。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">{0} 进程未能在 {2} 秒后连接到 {1} 进程。出现此问题可能是因为计算机性能较低，请设置环境变量 {3}，增加超时时间值。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">测试主机进程崩溃</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">无法将调试程序附加到默认测试主机。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">活动的测试运行已中止。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">现有连接被远程主机强制关闭。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">活动的测试发现已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">活动的测试发现已中止。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">无法与测试宿主进程通信。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">收到意外消息。意外 MessageType: {0} 实际 MessageType: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">协议版本检查失败。请确保测试运行程序和主机兼容。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">未能协商协议，等待响应在 {0} 秒后超时。出现此问题可能是因为计算机性能较低，请设置环境变量 {1}，增加超时时间值。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">{0} 进程未能在 {2} 秒后连接到 {1} 进程。出现此问题可能是因为计算机性能较低，请设置环境变量 {3}，增加超时时间值。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">测试主机进程崩溃</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">无法将调试程序附加到默认测试主机。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf
index dbd7dec68b..9e0062726f 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,57 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active test run was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">使用中的測試回合已中止。原因: {0}</target>
-      </trans-unit>
-      <trans-unit id="ConnectionClosed">
-        <source>An existing connection was forcibly closed by the remote host.</source>
-        <note></note>
-        <target state="translated">遠端主機已強制關閉現有連線。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestDiscovery">
-        <source>The active test discovery was aborted. Reason: {0}</source>
-        <note></note>
-        <target state="translated">使用中的測試探索已中止。原因: {0}</target>
-      </trans-unit>
-      <trans-unit id="UnableToCommunicateToTestHost">
-        <source>Unable to communicate with test host process.</source>
-        <note></note>
-        <target state="translated">無法與測試主機處理序通訊。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedMessage">
-        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
-        <target state="translated">收到未預期的訊息。需要的訊息類型: {0}，實際的訊息類型: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckFailed">
-        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
-        <target state="translated">通訊協定版本檢查失敗。請確定測試執行器與主機相容。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
-        <target state="translated">無法交涉通訊協定，等待回應在 {0} 秒後已逾時。原因可能是電腦太慢，請設定環境變數 {1}，加長逾時。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ConnectionTimeoutErrorMessage">
-        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
-        <target state="translated">在 {2} 秒後，{0} 處理序無法連線到 {1} 處理序。原因可能是電腦太慢，請設定環境變數 {3}，加長逾時。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostProcessCrashed">
-        <source>Test host process crashed</source>
-        <target state="translated">測試主機處理序當機</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host.</source>
-        <target state="translated">無法將偵錯工具連結到預設測試主機。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active test run was aborted. Reason: {0}</source>
+        <target state="translated">使用中的測試回合已中止。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionClosed">
+        <source>An existing connection was forcibly closed by the remote host.</source>
+        <target state="translated">遠端主機已強制關閉現有連線。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscovery">
+        <source>The active test discovery was aborted.</source>
+        <target state="translated">使用中的測試探索已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestDiscoveryWithReason">
+        <source>The active test discovery was aborted. Reason: {0}</source>
+        <target state="translated">使用中的測試探索已中止。原因: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToCommunicateToTestHost">
+        <source>Unable to communicate with test host process.</source>
+        <target state="translated">無法與測試主機處理序通訊。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessage">
+        <source>Unexpected message received. Expected MessageType : {0} Actual MessageType: {1}</source>
+        <target state="translated">收到未預期的訊息。需要的訊息類型: {0}，實際的訊息類型: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckFailed">
+        <source>Protocol version check failed. Make sure test runner and host are compatible.</source>
+        <target state="translated">通訊協定版本檢查失敗。請確定測試執行器與主機相容。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VersionCheckTimedout">
+        <source>Failed to negotiate protocol, waiting for response timed out after {0} seconds. This may occur due to machine slowness, please set environment variable {1} to increase timeout.</source>
+        <target state="translated">無法交涉通訊協定，等待回應在 {0} 秒後已逾時。原因可能是電腦太慢，請設定環境變數 {1}，加長逾時。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConnectionTimeoutErrorMessage">
+        <source>{0} process failed to connect to {1} process after {2} seconds. This may occur due to machine slowness, please set environment variable {3} to increase timeout.</source>
+        <target state="translated">在 {2} 秒後，{0} 處理序無法連線到 {1} 處理序。原因可能是電腦太慢，請設定環境變數 {3}，加長逾時。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostProcessCrashed">
+        <source>Test host process crashed</source>
+        <target state="translated">測試主機處理序當機</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host.</source>
+        <target state="translated">無法將偵錯工具連結到預設測試主機。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/DefaultTestPlatformContractResolver.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/DefaultTestPlatformContractResolver.cs
index 3b8e3c526f..354ad4d793 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/DefaultTestPlatformContractResolver.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/DefaultTestPlatformContractResolver.cs
@@ -1,46 +1,83 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+using Newtonsoft.Json.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// JSON contract resolver for mapping test platform types.
+/// </summary>
+public class DefaultTestPlatformContractResolver : DefaultContractResolver
 {
-    using System;
-    using System.Collections.Generic;
+    /// <inheritdoc/>
+    protected override JsonContract CreateContract(Type objectType)
+    {
+        var contract = base.CreateContract(objectType);
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+        if (typeof(List<KeyValuePair<TestProperty, object>>) == objectType)
+        {
+            // ObjectModel.TestObject provides a custom TestProperty based data store for all
+            // inherited objects. This converter helps with serialization of TestProperty and values
+            // over the wire.
+            // Each object inherited from TestObject handles it's own serialization. Most of them use
+            // this TestProperty data store for members as well. In such cases, we just ignore those
+            // properties. E.g. TestCase object's CodeFilePath is ignored for serialization since the
+            // actual data is already getting serialized by this converter.
+            // OTOH, TestResult has members that are not based off this store.
+            contract.Converter = new TestObjectConverter();
+        }
+        else if (objectType == typeof(ITestRunStatistics))
+        {
+            // This converter is required to hint json.net to use a concrete class for serialization
+            // of ITestRunStatistics. We can't remove ITestRunStatistics since it is a breaking change.
+            contract.Converter = new TestRunStatisticsConverter();
+        }
 
-    using Newtonsoft.Json.Serialization;
+        return contract;
+    }
+}
 
-    /// <summary>
-    /// JSON contract resolver for mapping test platform types.
-    /// </summary>
-    public class DefaultTestPlatformContractResolver : DefaultContractResolver
+/// TODO: This is not used now, but I was experimenting with this quite a bit for performance, leaving it here in case I was wrong
+/// and the serializer settings actually have signigicant impact on the speed.
+/// <summary>
+/// JSON contract resolver for mapping test platform types.
+/// </summary>
+internal class DefaultTestPlatformContractResolver7 : DefaultContractResolver
+{
+    public DefaultTestPlatformContractResolver7()
+    {
+    }
+    /// <inheritdoc/>
+    protected override JsonContract CreateContract(Type objectType)
     {
-        /// <inheritdoc/>
-        protected override JsonContract CreateContract(Type objectType)
+        var contract = base.CreateContract(objectType);
+
+        if (typeof(List<KeyValuePair<TestProperty, object>>) == objectType)
+        {
+            // ObjectModel.TestObject provides a custom TestProperty based data store for all
+            // inherited objects. This converter helps with serialization of TestProperty and values
+            // over the wire.
+            // Each object inherited from TestObject handles it's own serialization. Most of them use
+            // this TestProperty data store for members as well. In such cases, we just ignore those
+            // properties. E.g. TestCase object's CodeFilePath is ignored for serialization since the
+            // actual data is already getting serialized by this converter.
+            // OTOH, TestResult has members that are not based off this store.
+            contract.Converter = new TestObjectConverter7();
+        }
+        else if (objectType == typeof(ITestRunStatistics))
         {
-            var contract = base.CreateContract(objectType);
-
-            if (typeof(List<KeyValuePair<TestProperty, object>>) == objectType)
-            {
-                // ObjectModel.TestObject provides a custom TestProperty based data store for all
-                // inherited objects. This converter helps with serialization of TestProperty and values
-                // over the wire.
-                // Each object inherited from TestObject handles it's own serialization. Most of them use
-                // this TestProperty data store for members as well. In such cases, we just ignore those
-                // properties. E.g. TestCase object's CodeFilePath is ignored for serialization since the
-                // actual data is already getting serialized by this converter.
-                // OTOH, TestResult has members that are not based off this store.
-                contract.Converter = new TestObjectConverter();
-            }
-            else if (objectType == typeof(ITestRunStatistics))
-            {
-                // This converter is required to hint json.net to use a concrete class for serialization
-                // of ITestRunStatistics. We can't remove ITestRunStatistics since it is a breaking change.
-                contract.Converter = new TestRunStatisticsConverter();
-            }
-
-            return contract;
+            // This converter is required to hint json.net to use a concrete class for serialization
+            // of ITestRunStatistics. We can't remove ITestRunStatistics since it is a breaking change.
+            contract.Converter = new TestRunStatisticsConverter();
         }
+
+        return contract;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs
index 433154b323..4841312bd1 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestCaseConverter.cs
@@ -1,156 +1,177 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// Converter used by v1 protocol serializer to serialize TestCase object to and from v1 json
+/// </summary>
+public class TestCaseConverter : JsonConverter
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
-
-    /// <summary>
-    /// Converter used by v1 protocol serializer to serialize TestCase object to and from v1 json
-    /// </summary>
-    public class TestCaseConverter : JsonConverter
+    /// <inheritdoc/>
+    public override bool CanConvert(Type objectType)
     {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType)
+        return typeof(TestCase) == objectType;
+    }
+
+    /// <inheritdoc/>
+    public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        var testCase = new TestCase();
+
+        var data = JObject.Load(reader);
+        var properties = data["Properties"];
+
+        if (properties == null || !properties.HasValues)
         {
-            return typeof(TestCase) == objectType;
+            return testCase;
         }
 
-        /// <inheritdoc/>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        // Every class that inherits from TestObject uses a properties store for <Property, Object>
+        // key value pairs.
+        foreach (var property in properties.Values<JToken>())
         {
-            var testCase = new TestCase();
+            var testProperty = property?["Key"]?.ToObject<TestProperty>(serializer);
+
+            if (testProperty == null)
+            {
+                return null;
+            }
+
+            // Let the null values be passed in as null data
+            var token = property?["Value"];
+            string? propertyData = null;
 
-            var data = JObject.Load(reader);
-            var properties = data["Properties"];
+            if (token == null)
+            {
+                return null;
+            }
 
-            if (properties != null && properties.HasValues)
+            if (token.Type != JTokenType.Null)
             {
-                // Every class that inherits from TestObject uses a properties store for <Property, Object>
-                // key value pairs.
-                foreach (var property in properties.Values<JToken>())
+                // If the property is already a string. No need to convert again.
+                if (token.Type == JTokenType.String)
                 {
-                    var testProperty = property["Key"].ToObject<TestProperty>(serializer);
-
-                    // Let the null values be passed in as null data
-                    var token = property["Value"];
-                    string propertyData = null;
-                    if (token.Type != JTokenType.Null)
-                    {
-                        // If the property is already a string. No need to convert again.
-                        if (token.Type == JTokenType.String)
-                        {
-                            propertyData = token.ToObject<string>(serializer);
-                        }
-                        else
-                        {
-                            // On deserialization, the value for each TestProperty is always a string. It is up
-                            // to the consumer to deserialize it further as appropriate.
-                            propertyData = token.ToString(Formatting.None).Trim('"');
-                        }
-                    }
-
-                    switch (testProperty.Id)
-                    {
-                        case "TestCase.Id":
-                            testCase.Id = Guid.Parse(propertyData); break;
-                        case "TestCase.ExecutorUri":
-                            testCase.ExecutorUri = new Uri(propertyData); break;
-                        case "TestCase.FullyQualifiedName":
-                            testCase.FullyQualifiedName = propertyData; break;
-                        case "TestCase.DisplayName":
-                            testCase.DisplayName = propertyData; break;
-                        case "TestCase.Source":
-                            testCase.Source = propertyData; break;
-                        case "TestCase.CodeFilePath":
-                            testCase.CodeFilePath = propertyData; break;
-                        case "TestCase.LineNumber":
-                            testCase.LineNumber = int.Parse(propertyData); break;
-                        default:
-                            // No need to register member properties as they get registered as part of TestCaseProperties class.
-                            testProperty = TestProperty.Register(testProperty.Id, testProperty.Label, testProperty.GetValueType(), testProperty.Attributes, typeof(TestObject));
-                            testCase.SetPropertyValue(testProperty, propertyData);
-                            break;
-                    }
+                    propertyData = token.ToObject<string>(serializer);
+                }
+                else
+                {
+                    // On deserialization, the value for each TestProperty is always a string. It is up
+                    // to the consumer to deserialize it further as appropriate.
+                    propertyData = token.ToString(Formatting.None).Trim('"');
                 }
             }
 
-            return testCase;
-        }
-
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            // P2 to P1
-            var testCase = value as TestCase;
-
-            writer.WriteStartObject();
-            writer.WritePropertyName("Properties");
-            writer.WriteStartArray();
-
-            // Version Note: In 15.0.0, if some properties in TestCase were not set, they were not serialized.
-            // Starting 15.1.0, test platform sends in default values for properties that were not set. This is not
-            // a breaking change.
-
-            // TestCase.FullyQualifiedName
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.FullyQualifiedName, serializer);
-            writer.WriteValue(testCase.FullyQualifiedName);
-            writer.WriteEndObject();
-
-            // TestCase.ExecutorUri
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.ExecutorUri, serializer);
-            writer.WriteValue(testCase.ExecutorUri.OriginalString);
-            writer.WriteEndObject();
-
-            // TestCase.Source
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.Source, serializer);
-            writer.WriteValue(testCase.Source);
-            writer.WriteEndObject();
-
-            // TestCase.CodeFilePath
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.CodeFilePath, serializer);
-            writer.WriteValue(testCase.CodeFilePath);
-            writer.WriteEndObject();
-
-            // TestCase.DisplayName
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.DisplayName, serializer);
-            writer.WriteValue(testCase.DisplayName);
-            writer.WriteEndObject();
-
-            // TestCase.Id
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.Id, serializer);
-            writer.WriteValue(testCase.Id);
-            writer.WriteEndObject();
-
-            // TestCase.LineNumber
-            writer.WriteStartObject();
-            AddProperty(writer, TestCaseProperties.LineNumber, serializer);
-            writer.WriteValue(testCase.LineNumber);
-            writer.WriteEndObject();
-
-            foreach (var property in testCase.GetProperties())
+            switch (testProperty.Id)
             {
-                serializer.Serialize(writer, property);
+                case "TestCase.Id":
+                    testCase.Id = GuidPolyfill.Parse(propertyData!, CultureInfo.InvariantCulture);
+                    break;
+                case "TestCase.ExecutorUri":
+                    testCase.ExecutorUri = new Uri(propertyData!); break;
+                case "TestCase.FullyQualifiedName":
+                    testCase.FullyQualifiedName = propertyData!; break;
+                case "TestCase.DisplayName":
+                    testCase.DisplayName = propertyData!; break;
+                case "TestCase.Source":
+                    testCase.Source = propertyData!; break;
+                case "TestCase.CodeFilePath":
+                    testCase.CodeFilePath = propertyData; break;
+                case "TestCase.LineNumber":
+                    testCase.LineNumber = int.Parse(propertyData!, CultureInfo.CurrentCulture); break;
+                default:
+                    // No need to register member properties as they get registered as part of TestCaseProperties class.
+                    testProperty = TestProperty.Register(testProperty.Id, testProperty.Label, testProperty.GetValueType(), testProperty.Attributes, typeof(TestObject));
+                    testCase.SetPropertyValue(testProperty, propertyData);
+                    break;
             }
+        }
 
-            writer.WriteEndArray();
-            writer.WriteEndObject();
+        return testCase;
+    }
+
+    /// <inheritdoc/>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        if (value == null)
+        {
+            return;
         }
 
-        private static void AddProperty(JsonWriter writer, TestProperty property, JsonSerializer serializer)
+        // P2 to P1
+        var testCase = (TestCase)value;
+
+        writer.WriteStartObject();
+        writer.WritePropertyName("Properties");
+        writer.WriteStartArray();
+
+        // Version Note: In 15.0.0, if some properties in TestCase were not set, they were not serialized.
+        // Starting 15.1.0, test platform sends in default values for properties that were not set. This is not
+        // a breaking change.
+
+        // TestCase.FullyQualifiedName
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.FullyQualifiedName, serializer);
+        writer.WriteValue(testCase.FullyQualifiedName);
+        writer.WriteEndObject();
+
+        // TestCase.ExecutorUri
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.ExecutorUri, serializer);
+        writer.WriteValue(testCase.ExecutorUri.OriginalString);
+        writer.WriteEndObject();
+
+        // TestCase.Source
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.Source, serializer);
+        writer.WriteValue(testCase.Source);
+        writer.WriteEndObject();
+
+        // TestCase.CodeFilePath
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.CodeFilePath, serializer);
+        writer.WriteValue(testCase.CodeFilePath);
+        writer.WriteEndObject();
+
+        // TestCase.DisplayName
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.DisplayName, serializer);
+        writer.WriteValue(testCase.DisplayName);
+        writer.WriteEndObject();
+
+        // TestCase.Id
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.Id, serializer);
+        writer.WriteValue(testCase.Id);
+        writer.WriteEndObject();
+
+        // TestCase.LineNumber
+        writer.WriteStartObject();
+        AddProperty(writer, TestCaseProperties.LineNumber, serializer);
+        writer.WriteValue(testCase.LineNumber);
+        writer.WriteEndObject();
+
+        foreach (var property in testCase.GetProperties())
         {
-            writer.WritePropertyName("Key");
             serializer.Serialize(writer, property);
-            writer.WritePropertyName("Value");
         }
+
+        writer.WriteEndArray();
+        writer.WriteEndObject();
+    }
+
+    private static void AddProperty(JsonWriter writer, TestProperty property, JsonSerializer serializer)
+    {
+        writer.WritePropertyName("Key");
+        serializer.Serialize(writer, property);
+        writer.WritePropertyName("Value");
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestObjectConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestObjectConverter.cs
index b12b1f5a16..fdc615a411 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestObjectConverter.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestObjectConverter.cs
@@ -1,85 +1,197 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// JSON converter for the <see cref="TestObject"/> and derived entities.
+/// </summary>
+public class TestObjectConverter : JsonConverter
 {
-    using System;
-    using System.Collections.Generic;
+    /// <inheritdoc/>
+    public override bool CanRead => true;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    /// <inheritdoc/>
+    public override bool CanWrite => false;
 
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
+    /// <inheritdoc/>
+    public override bool CanConvert(Type objectType)
+    {
+        throw new NotImplementedException();
+    }
 
-    /// <summary>
-    /// JSON converter for the <see cref="TestObject"/> and derived entities.
-    /// </summary>
-    public class TestObjectConverter : JsonConverter
+    /// <inheritdoc/>
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
     {
-        /// <inheritdoc/>
-        public override bool CanRead => true;
+        if (objectType != typeof(List<KeyValuePair<TestProperty, object>>))
+        {
+            // Support only deserialization of KeyValuePair list
+            throw new ArgumentException("the objectType was not a KeyValuePair list", nameof(objectType));
+        }
 
-        /// <inheritdoc/>
-        public override bool CanWrite => false;
+        var propertyList = new List<KeyValuePair<TestProperty, object?>>();
 
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType)
+        if (reader.TokenType != JsonToken.StartArray)
         {
-            throw new NotImplementedException();
+            return propertyList;
         }
 
-        /// <inheritdoc/>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        var properties = JArray.Load(reader);
+        if (properties == null || !properties.HasValues)
         {
-            if (objectType != typeof(List<KeyValuePair<TestProperty, object>>))
+            return propertyList;
+        }
+
+        // Every class that inherits from TestObject uses a properties store for <Property, Object>
+        // key value pairs.
+        foreach (var property in properties)
+        {
+            var testProperty = property?["Key"]?.ToObject<TestProperty>(serializer);
+
+            if (testProperty == null)
             {
-                // Support only deserialization of KeyValuePair list
-                throw new ArgumentException("the objectType was not a KeyValuePair list", nameof(objectType));
+                continue;
             }
 
-            var propertyList = new List<KeyValuePair<TestProperty, object>>();
-
-            if (reader.TokenType == JsonToken.StartArray)
+            // Let the null values be passed in as null data
+            var token = property?["Value"];
+            object? propertyData = null;
+            if (token != null && token.Type != JTokenType.Null)
             {
-                var properties = JArray.Load(reader);
-                if (properties != null && properties.HasValues)
+                // If the property is already a string. No need to convert again.
+                if (token.Type == JTokenType.String)
                 {
-                    // Every class that inherits from TestObject uses a properties store for <Property, Object>
-                    // key value pairs.
-                    foreach (var property in properties)
-                    {
-                        var testProperty = property["Key"].ToObject<TestProperty>(serializer);
-
-                        // Let the null values be passed in as null data
-                        var token = property["Value"];
-                        object propertyData = null;
-                        if (token.Type != JTokenType.Null)
-                        {
-                            // If the property is already a string. No need to convert again.
-                            if (token.Type == JTokenType.String)
-                            {
-                                propertyData = token.ToObject(typeof(string), serializer);
-                            }
-                            else
-                            {
-                                // On deserialization, the value for each TestProperty is always a string. It is up
-                                // to the consumer to deserialize it further as appropriate.
-                                propertyData = token.ToString(Formatting.None).Trim('"');
-                            }
-                        }
-
-                        propertyList.Add(new KeyValuePair<TestProperty, object>(testProperty, propertyData));
-                    }
+                    propertyData = token.ToObject(typeof(string), serializer);
+                }
+                else
+                {
+                    // On deserialization, the value for each TestProperty is always a string. It is up
+                    // to the consumer to deserialize it further as appropriate.
+                    propertyData = token.ToString(Formatting.None).Trim('"');
                 }
             }
 
-            return propertyList;
+            propertyList.Add(new KeyValuePair<TestProperty, object?>(testProperty, propertyData));
         }
 
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        return propertyList;
+    }
+
+    /// <inheritdoc/>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        // Create an array of <Property, Value> dictionary
+    }
+}
+
+/// TODO: This is not used now, but I was experimenting with this quite a bit for performance, leaving it here in case I was wrong
+/// and the serializer settings actually have signigicant impact on the speed.
+/// <summary>
+/// JSON converter for the <see cref="TestObject"/> and derived entities.
+/// </summary>
+internal class TestObjectConverter7 : JsonConverter
+{
+    // Empty is not present everywhere
+#pragma warning disable CA1825 // Avoid zero-length array allocations
+    private static readonly object[] EmptyObjectArray = [];
+#pragma warning restore CA1825 // Avoid zero-length array allocations
+
+    public TestObjectConverter7()
+    {
+        TestPropertyCtor = typeof(TestProperty).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, [], null);
+    }
+
+    /// <inheritdoc/>
+    public override bool CanRead => true;
+
+    /// <inheritdoc/>
+    public override bool CanWrite => false;
+
+    public ConstructorInfo? TestPropertyCtor { get; }
+
+    /// <inheritdoc/>
+    public override bool CanConvert(Type objectType)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        if (objectType != typeof(List<KeyValuePair<TestProperty, object>>))
         {
-            // Create an array of <Property, Value> dictionary
+            // Support only deserialization of KeyValuePair list
+            throw new ArgumentException("the objectType was not a KeyValuePair list", nameof(objectType));
         }
+
+        if (reader.TokenType != JsonToken.StartArray)
+        {
+            return new List<KeyValuePair<TestProperty, object>>();
+        }
+
+        var deserializedProperties = serializer.Deserialize<List<KeyValuePair<TestPropertyTemplate, JToken>>>(reader)!;
+        // Initialize the list capacity to be the number of properties we might add.
+        var propertyList = new List<KeyValuePair<TestProperty, object?>>(deserializedProperties.Count);
+
+        // Every class that inherits from TestObject uses a properties store for <Property, Object>
+        // key value pairs.
+        foreach (var property in deserializedProperties)
+        {
+            // This call will fail with NRE on .NET Standard 1.3
+            var testProperty = (TestProperty)TestPropertyCtor!.Invoke(EmptyObjectArray);
+            testProperty.Id = property.Key.Id!;
+            testProperty.Label = property.Key.Label!;
+            testProperty.Category = property.Key.Category!;
+            testProperty.Description = property.Key.Description!;
+            testProperty.Attributes = (TestPropertyAttributes)property.Key.Attributes;
+            testProperty.ValueType = property.Key.ValueType!;
+
+
+            object? propertyData = null;
+            JToken token = property.Value;
+            if (token.Type != JTokenType.Null)
+            {
+                // If the property is already a string. No need to convert again.
+                if (token.Type == JTokenType.String)
+                {
+                    propertyData = token.ToObject(typeof(string), serializer);
+                }
+                else
+                {
+                    // On deserialization, the value for each TestProperty is always a string. It is up
+                    // to the consumer to deserialize it further as appropriate.
+                    propertyData = token.ToString(Formatting.None).Trim('"');
+                }
+            }
+
+            propertyList.Add(new KeyValuePair<TestProperty, object?>(testProperty, propertyData));
+        }
+
+        return propertyList;
+    }
+
+    /// <inheritdoc/>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        // Create an array of <Property, Value> dictionary
+    }
+
+    private class TestPropertyTemplate
+    {
+        public string? Id { get; set; }
+        public string? Label { get; set; }
+        public string? Category { get; set; }
+        public string? Description { get; set; }
+        public int Attributes { get; set; }
+        public string? ValueType { get; set; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestPlatformContractResolver1.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestPlatformContractResolver1.cs
index 0f50bd53f0..21d08a53fb 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestPlatformContractResolver1.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestPlatformContractResolver1.cs
@@ -1,31 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Newtonsoft.Json.Serialization;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Newtonsoft.Json.Serialization;
 
-    /// <summary>
-    /// JSON contract resolver for mapping test platform types for v1 serialization.
-    /// </summary>
-    public class TestPlatformContractResolver1 : DefaultTestPlatformContractResolver
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// JSON contract resolver for mapping test platform types for v1 serialization.
+/// </summary>
+public class TestPlatformContractResolver1 : DefaultTestPlatformContractResolver
+{
+    /// <inheritdoc/>
+    protected override JsonContract CreateContract(Type objectType)
     {
-        /// <inheritdoc/>
-        protected override JsonContract CreateContract(Type objectType)
+        var contract = base.CreateContract(objectType);
+        if (typeof(TestCase) == objectType)
         {
-            var contract = base.CreateContract(objectType);
-            if (typeof(TestCase) == objectType)
-            {
-                contract.Converter = new TestCaseConverter();
-            }
-            else if (typeof(TestResult) == objectType)
-            {
-                contract.Converter = new TestResultConverter();
-            }
-
-            return contract;
+            contract.Converter = new TestCaseConverter();
+        }
+        else if (typeof(TestResult) == objectType)
+        {
+            contract.Converter = new TestResultConverter();
         }
+
+        return contract;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs
index 1e3aad1bab..1ea61521aa 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestResultConverter.cs
@@ -1,198 +1,207 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// Converter used by v1 protocol serializer to serialize TestResult object to and from v1 json
+/// </summary>
+public class TestResultConverter : JsonConverter
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
-
-    /// <summary>
-    /// Converter used by v1 protocol serializer to serialize TestResult object to and from v1 json
-    /// </summary>
-    public class TestResultConverter : JsonConverter
+    /// <inheritdoc/>
+    public override bool CanConvert(Type objectType)
     {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType)
-        {
-            return typeof(TestResult) == objectType;
-        }
+        return typeof(TestResult) == objectType;
+    }
 
-        /// <inheritdoc/>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var data = JObject.Load(reader);
+    /// <inheritdoc/>
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        var data = JObject.Load(reader);
 
-            var testCase = data["TestCase"].ToObject<TestCase>(serializer);
-            var testResult = new TestResult(testCase);
+        var testCase = data["TestCase"]!.ToObject<TestCase>(serializer)!;
+        var testResult = new TestResult(testCase);
 
-            // Add attachments for the result
-            var attachments = data["Attachments"];
-            if (attachments != null && attachments.HasValues)
+        // Add attachments for the result
+        var attachments = data["Attachments"];
+        if (attachments != null && attachments.HasValues)
+        {
+            foreach (var attachment in attachments.Values<JToken>())
             {
-                foreach (var attachment in attachments.Values<JToken>())
+                if (attachment!.Type != JTokenType.Null)
                 {
-                    if (attachment.Type != JTokenType.Null)
-                    {
-                        testResult.Attachments.Add(attachment.ToObject<AttachmentSet>(serializer));
-                    }
+                    testResult.Attachments.Add(attachment!.ToObject<AttachmentSet>(serializer)!);
                 }
             }
+        }
 
-            // Add messages for the result
-            var messages = data["Messages"];
-            if (messages != null && messages.HasValues)
+        // Add messages for the result
+        var messages = data["Messages"];
+        if (messages != null && messages.HasValues)
+        {
+            foreach (var message in messages.Values<JToken>())
             {
-                foreach (var message in messages.Values<JToken>())
+                if (message!.Type != JTokenType.Null)
                 {
-                    if (message.Type != JTokenType.Null)
-                    {
-                        testResult.Messages.Add(message.ToObject<TestResultMessage>(serializer));
-                    }
+                    testResult.Messages.Add(message.ToObject<TestResultMessage>(serializer)!);
                 }
             }
+        }
+
+        JToken properties = data["Properties"]!;
+        if (properties == null || !properties.HasValues)
+        {
+            return testResult;
+        }
 
-            JToken properties = data["Properties"];
-            if (properties != null && properties.HasValues)
+        // Every class that inherits from TestObject uses a properties store for <Property, Object>
+        // key value pairs.
+        foreach (var property in properties.Values<JToken>())
+        {
+            var testProperty = property!["Key"]!.ToObject<TestProperty>(serializer)!;
+
+            // Let the null values be passed in as null data
+            var token = property["Value"];
+            string? propertyData = null;
+            if (token!.Type != JTokenType.Null)
             {
-                // Every class that inherits from TestObject uses a properties store for <Property, Object>
-                // key value pairs.
-                foreach (var property in properties.Values<JToken>())
+                // If the property is already a string. No need to convert again.
+                if (token.Type == JTokenType.String)
                 {
-                    var testProperty = property["Key"].ToObject<TestProperty>(serializer);
-
-                    // Let the null values be passed in as null data
-                    var token = property["Value"];
-                    string propertyData = null;
-                    if (token.Type != JTokenType.Null)
-                    {
-                        // If the property is already a string. No need to convert again.
-                        if (token.Type == JTokenType.String)
-                        {
-                            propertyData = token.ToObject<string>(serializer);
-                        }
-                        else
-                        {
-                            // On deserialization, the value for each TestProperty is always a string. It is up
-                            // to the consumer to deserialize it further as appropriate.
-                            propertyData = token.ToString(Formatting.None).Trim('"');
-                        }
-                    }
-
-                    switch (testProperty.Id)
-                    {
-                        case "TestResult.DisplayName":
-                            testResult.DisplayName = propertyData; break;
-                        case "TestResult.ComputerName":
-                            testResult.ComputerName = propertyData ?? string.Empty; break;
-                        case "TestResult.Outcome":
-                            testResult.Outcome = (TestOutcome)Enum.Parse(typeof(TestOutcome), propertyData); break;
-                        case "TestResult.Duration":
-                            testResult.Duration = TimeSpan.Parse(propertyData); break;
-                        case "TestResult.StartTime":
-                            testResult.StartTime = DateTimeOffset.Parse(propertyData); break;
-                        case "TestResult.EndTime":
-                            testResult.EndTime = DateTimeOffset.Parse(propertyData); break;
-                        case "TestResult.ErrorMessage":
-                            testResult.ErrorMessage = propertyData; break;
-                        case "TestResult.ErrorStackTrace":
-                            testResult.ErrorStackTrace = propertyData; break;
-                        default:
-                            // No need to register member properties as they get registered as part of TestResultProperties class.
-                            testProperty = TestProperty.Register(testProperty.Id, testProperty.Label, testProperty.GetValueType(), testProperty.Attributes, typeof(TestObject));
-                            testResult.SetPropertyValue(testProperty, propertyData);
-                            break;
-                    }
+                    propertyData = token.ToObject<string>(serializer);
+                }
+                else
+                {
+                    // On deserialization, the value for each TestProperty is always a string. It is up
+                    // to the consumer to deserialize it further as appropriate.
+                    propertyData = token.ToString(Formatting.None).Trim('"');
                 }
             }
 
-            return testResult;
-        }
-
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            // P2 to P1
-            var testResult = value as TestResult;
-
-            writer.WriteStartObject();
-            writer.WritePropertyName("TestCase");
-            serializer.Serialize(writer, testResult.TestCase);
-            writer.WritePropertyName("Attachments");
-            serializer.Serialize(writer, testResult.Attachments);
-            writer.WritePropertyName("Messages");
-            serializer.Serialize(writer, testResult.Messages);
-
-            writer.WritePropertyName("Properties");
-            writer.WriteStartArray();
-
-            // Version Note: In 15.0.0, if some properties in TestResult were not set, they were not serialized.
-            // Starting 15.1.0, test platform sends in default values for properties that were not set. This is not
-            // a breaking change.
-
-            // TestResult.Outcome
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.Outcome, serializer);
-            writer.WriteValue((int)testResult.Outcome);
-            writer.WriteEndObject();
-
-            // TestResult.ErrorMessage
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.ErrorMessage, serializer);
-            writer.WriteValue(testResult.ErrorMessage);
-            writer.WriteEndObject();
-
-            // TestResult.ErrorStackTrace
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.ErrorStackTrace, serializer);
-            writer.WriteValue(testResult.ErrorStackTrace);
-            writer.WriteEndObject();
-
-            // TestResult.DisplayName
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.DisplayName, serializer);
-            writer.WriteValue(testResult.DisplayName);
-            writer.WriteEndObject();
-
-            // TestResult.ComputerName
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.ComputerName, serializer);
-            writer.WriteValue(testResult.ComputerName ?? string.Empty);
-            writer.WriteEndObject();
-
-            // TestResult.Duration
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.Duration, serializer);
-            writer.WriteValue(testResult.Duration);
-            writer.WriteEndObject();
-
-            // TestResult.StartTime
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.StartTime, serializer);
-            writer.WriteValue(testResult.StartTime);
-            writer.WriteEndObject();
-
-            // TestResult.EndTime
-            writer.WriteStartObject();
-            AddProperty(writer, TestResultProperties.EndTime, serializer);
-            writer.WriteValue(testResult.EndTime);
-            writer.WriteEndObject();
-
-            foreach (var property in testResult.GetProperties())
+            switch (testProperty.Id)
             {
-                serializer.Serialize(writer, property);
+                case "TestResult.DisplayName":
+                    testResult.DisplayName = propertyData; break;
+                case "TestResult.ComputerName":
+                    testResult.ComputerName = propertyData ?? string.Empty; break;
+                case "TestResult.Outcome":
+                    testResult.Outcome = (TestOutcome)Enum.Parse(typeof(TestOutcome), propertyData!); break;
+                case "TestResult.Duration":
+                    testResult.Duration = TimeSpan.Parse(propertyData!, CultureInfo.CurrentCulture); break;
+                case "TestResult.StartTime":
+                    testResult.StartTime = DateTimeOffset.Parse(propertyData!, CultureInfo.CurrentCulture); break;
+                case "TestResult.EndTime":
+                    testResult.EndTime = DateTimeOffset.Parse(propertyData!, CultureInfo.CurrentCulture); break;
+                case "TestResult.ErrorMessage":
+                    testResult.ErrorMessage = propertyData; break;
+                case "TestResult.ErrorStackTrace":
+                    testResult.ErrorStackTrace = propertyData; break;
+                default:
+                    // No need to register member properties as they get registered as part of TestResultProperties class.
+                    testProperty = TestProperty.Register(testProperty.Id, testProperty.Label, testProperty.GetValueType(), testProperty.Attributes, typeof(TestObject));
+                    testResult.SetPropertyValue(testProperty, propertyData);
+                    break;
             }
+        }
 
-            writer.WriteEndArray();
-            writer.WriteEndObject();
+        return testResult;
+    }
+
+    /// <inheritdoc/>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        if (value == null)
+        {
+            return;
         }
 
-        private static void AddProperty(JsonWriter writer, TestProperty property, JsonSerializer serializer)
+        // P2 to P1
+        var testResult = (TestResult)value;
+
+        writer.WriteStartObject();
+        writer.WritePropertyName("TestCase");
+        serializer.Serialize(writer, testResult.TestCase);
+        writer.WritePropertyName("Attachments");
+        serializer.Serialize(writer, testResult.Attachments);
+        writer.WritePropertyName("Messages");
+        serializer.Serialize(writer, testResult.Messages);
+
+        writer.WritePropertyName("Properties");
+        writer.WriteStartArray();
+
+        // Version Note: In 15.0.0, if some properties in TestResult were not set, they were not serialized.
+        // Starting 15.1.0, test platform sends in default values for properties that were not set. This is not
+        // a breaking change.
+
+        // TestResult.Outcome
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.Outcome, serializer);
+        writer.WriteValue((int)testResult.Outcome);
+        writer.WriteEndObject();
+
+        // TestResult.ErrorMessage
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.ErrorMessage, serializer);
+        writer.WriteValue(testResult.ErrorMessage);
+        writer.WriteEndObject();
+
+        // TestResult.ErrorStackTrace
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.ErrorStackTrace, serializer);
+        writer.WriteValue(testResult.ErrorStackTrace);
+        writer.WriteEndObject();
+
+        // TestResult.DisplayName
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.DisplayName, serializer);
+        writer.WriteValue(testResult.DisplayName);
+        writer.WriteEndObject();
+
+        // TestResult.ComputerName
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.ComputerName, serializer);
+        writer.WriteValue(testResult.ComputerName ?? string.Empty);
+        writer.WriteEndObject();
+
+        // TestResult.Duration
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.Duration, serializer);
+        writer.WriteValue(testResult.Duration);
+        writer.WriteEndObject();
+
+        // TestResult.StartTime
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.StartTime, serializer);
+        writer.WriteValue(testResult.StartTime);
+        writer.WriteEndObject();
+
+        // TestResult.EndTime
+        writer.WriteStartObject();
+        AddProperty(writer, TestResultProperties.EndTime, serializer);
+        writer.WriteValue(testResult.EndTime);
+        writer.WriteEndObject();
+
+        foreach (var property in testResult.GetProperties())
         {
-            writer.WritePropertyName("Key");
             serializer.Serialize(writer, property);
-            writer.WritePropertyName("Value");
         }
+
+        writer.WriteEndArray();
+        writer.WriteEndObject();
+    }
+
+    private static void AddProperty(JsonWriter writer, TestProperty property, JsonSerializer serializer)
+    {
+        writer.WritePropertyName("Key");
+        serializer.Serialize(writer, property);
+        writer.WritePropertyName("Value");
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestRunStatisticsConverter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestRunStatisticsConverter.cs
index 84ab32da58..c9fba0eb44 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestRunStatisticsConverter.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Serialization/TestRunStatisticsConverter.cs
@@ -1,33 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Newtonsoft.Json;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+using Newtonsoft.Json;
 
-    /// <summary>
-    /// JSON converter for converting ITestRunStatistics to TestRunStatistics
-    /// </summary>
-    public class TestRunStatisticsConverter : JsonConverter
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
+
+/// <summary>
+/// JSON converter for converting ITestRunStatistics to TestRunStatistics
+/// </summary>
+public class TestRunStatisticsConverter : JsonConverter
+{
+    /// <inheritdoc/>
+    public override bool CanConvert(Type objectType)
     {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType.Equals(typeof(TestRunStatistics));
-        }
+        return objectType.Equals(typeof(TestRunStatistics));
+    }
 
-        /// <inheritdoc/>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return serializer.Deserialize<TestRunStatistics>(reader);
-        }
+    /// <inheritdoc/>
+    public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        return serializer.Deserialize<TestRunStatistics>(reader);
+    }
 
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            serializer.Serialize(writer, value);
-        }
+    /// <inheritdoc/>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        serializer.Serialize(writer, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs
index 7059a538bc..df5ce1e459 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs
@@ -1,132 +1,132 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Communication client implementation over sockets.
+/// </summary>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class SocketClient : ICommunicationEndPoint
 {
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    /// <summary>
-    /// Communication client implementation over sockets.
-    /// </summary>
-    public class SocketClient : ICommunicationEndPoint
+    private readonly CancellationTokenSource _cancellation;
+    private readonly TcpClient _tcpClient;
+    private readonly Func<Stream, ICommunicationChannel> _channelFactory;
+
+    private ICommunicationChannel? _channel;
+    private bool _stopped;
+    private string? _endPoint;
+
+    public SocketClient()
+        : this(stream => new LengthPrefixCommunicationChannel(stream))
     {
-        private readonly CancellationTokenSource cancellation;
-        private readonly TcpClient tcpClient;
-        private readonly Func<Stream, ICommunicationChannel> channelFactory;
-        private ICommunicationChannel channel;
-        private bool stopped;
-        private string endPoint;
-
-        public SocketClient()
-            : this(stream => new LengthPrefixCommunicationChannel(stream))
-        {
-        }
+    }
 
-        protected SocketClient(Func<Stream, ICommunicationChannel> channelFactory)
-        {
-            // Used to cancel the message loop
-            this.cancellation = new CancellationTokenSource();
-            this.stopped = false;
+    protected SocketClient(Func<Stream, ICommunicationChannel> channelFactory)
+    {
+        // Used to cancel the message loop
+        _cancellation = new CancellationTokenSource();
+        _stopped = false;
 
-            this.tcpClient = new TcpClient { NoDelay = true };
-            this.channelFactory = channelFactory;
-        }
+        _tcpClient = new TcpClient { NoDelay = true };
+        _channelFactory = channelFactory;
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<ConnectedEventArgs> Connected;
+    /// <inheritdoc />
+    public event EventHandler<ConnectedEventArgs>? Connected;
 
-        /// <inheritdoc />
-        public event EventHandler<DisconnectedEventArgs> Disconnected;
+    /// <inheritdoc />
+    public event EventHandler<DisconnectedEventArgs>? Disconnected;
 
-        /// <inheritdoc />
-        public string Start(string endPoint)
-        {
-            this.endPoint = endPoint;
-            var ipEndPoint = endPoint.GetIPEndPoint();
+    /// <inheritdoc />
+    public string Start(string endPoint)
+    {
+        _endPoint = endPoint;
+        var ipEndPoint = endPoint.GetIpEndPoint();
 
-            EqtTrace.Info("SocketClient.Start: connecting to server endpoint: {0}", endPoint);
+        EqtTrace.Info("SocketClient.Start: connecting to server endpoint: {0}", endPoint);
 
-            // Don't start if the endPoint port is zero
-            this.tcpClient.ConnectAsync(ipEndPoint.Address, ipEndPoint.Port).ContinueWith(this.OnServerConnected);
-            return ipEndPoint.ToString();
-        }
+        // Don't start if the endPoint port is zero
+        _tcpClient.ConnectAsync(ipEndPoint.Address, ipEndPoint.Port).ContinueWith(OnServerConnected);
+        return ipEndPoint.ToString();
+    }
+
+    /// <inheritdoc />
+    public void Stop()
+    {
+        EqtTrace.Info("SocketClient.Stop: Stop communication from server endpoint: {0}", _endPoint);
 
-        /// <inheritdoc />
-        public void Stop()
+        if (!_stopped)
         {
-            EqtTrace.Info("SocketClient.Stop: Stop communication from server endpoint: {0}", this.endPoint);
+            EqtTrace.Info("SocketClient: Stop: Cancellation requested. Stopping message loop.");
 
-            if (!this.stopped)
+            try
+            {
+                _cancellation.Cancel();
+            }
+            catch (ObjectDisposedException)
             {
-                EqtTrace.Info("SocketClient: Stop: Cancellation requested. Stopping message loop.");
-                this.cancellation.Cancel();
+                // This is race condition with stop on error.
             }
         }
+    }
+
+    private void OnServerConnected(Task connectAsyncTask)
+    {
+        EqtTrace.Info("SocketClient.OnServerConnected: connected to server endpoint: {0}", _endPoint);
 
-        private void OnServerConnected(Task connectAsyncTask)
+        if (Connected == null)
         {
-            EqtTrace.Info("SocketClient.OnServerConnected: connected to server endpoint: {0}", this.endPoint);
+            return;
+        }
 
-            if (this.Connected != null)
-            {
-                if (connectAsyncTask.IsFaulted)
-                {
-                    this.Connected.SafeInvoke(this, new ConnectedEventArgs(connectAsyncTask.Exception), "SocketClient: Server Failed to Connect");
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("Unable to connect to server, Exception occurred : {0}", connectAsyncTask.Exception);
-                    }
-                }
-                else
-                {
-                    this.channel = this.channelFactory(this.tcpClient.GetStream());
-                    this.Connected.SafeInvoke(this, new ConnectedEventArgs(this.channel), "SocketClient: ServerConnected");
-
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("Connected to server, and starting MessageLoopAsync");
-                    }
-
-                    // Start the message loop
-                    Task.Run(() => this.tcpClient.MessageLoopAsync(
-                            this.channel,
-                            this.Stop,
-                            this.cancellation.Token))
-                        .ConfigureAwait(false);
-                }
-            }
+        if (connectAsyncTask.IsFaulted)
+        {
+            Connected.SafeInvoke(this, new ConnectedEventArgs(connectAsyncTask.Exception), "SocketClient: Server Failed to Connect");
+            EqtTrace.Verbose("Unable to connect to server, Exception occurred: {0}", connectAsyncTask.Exception);
+            return;
         }
 
-        private void Stop(Exception error)
+        _channel = _channelFactory(_tcpClient.GetStream());
+        Connected.SafeInvoke(this, new ConnectedEventArgs(_channel), "SocketClient: ServerConnected");
+
+        EqtTrace.Verbose("Connected to server, and starting MessageLoopAsync");
+
+        // Start the message loop
+        Task.Run(() => _tcpClient.MessageLoopAsync(
+                _channel,
+                StopOnError,
+                _cancellation.Token))
+            .ConfigureAwait(false);
+    }
+
+    private void StopOnError(Exception? error)
+    {
+        EqtTrace.Info("SocketClient.PrivateStop: Stop communication from server endpoint: {0}, error:{1}", _endPoint, error);
+        // This is here to prevent stack overflow.
+        if (!_stopped)
         {
-            EqtTrace.Info("SocketClient.PrivateStop: Stop communication from server endpoint: {0}, error:{1}", this.endPoint, error);
+            // Do not allow stop to be called multiple times.
+            _stopped = true;
 
-            if (!this.stopped)
-            {
-                // Do not allow stop to be called multiple times.
-                this.stopped = true;
-
-                // Close the client and dispose the underlying stream
-#if NETFRAMEWORK
-                // tcpClient.Close() calls tcpClient.Dispose().
-                this.tcpClient?.Close();
-#else
-                // tcpClient.Close() not available for netstandard1.5.
-                this.tcpClient?.Dispose();
-#endif
-                this.channel.Dispose();
-                this.cancellation.Dispose();
-
-                this.Disconnected?.SafeInvoke(this, new DisconnectedEventArgs(), "SocketClient: ServerDisconnected");
-            }
+            // Close the client and dispose the underlying stream
+            // tcpClient.Close() calls tcpClient.Dispose().
+            _tcpClient?.Close();
+            _channel?.Dispose();
+            _cancellation.Dispose();
+
+            Disconnected?.SafeInvoke(this, new DisconnectedEventArgs(), "SocketClient: ServerDisconnected");
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
index f9209e20f1..9194a8e525 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
@@ -1,415 +1,416 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Facilitates communication using sockets
+/// </summary>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class SocketCommunicationManager : ICommunicationManager
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+    /// <summary>
+    /// The server stream read timeout constant (in microseconds).
+    /// </summary>
+    private const int STREAMREADTIMEOUT = 1000 * 1000;
 
     /// <summary>
-    /// Facilitates communication using sockets
+    /// TCP Listener to host TCP channel and listen
     /// </summary>
-    public class SocketCommunicationManager : ICommunicationManager
-    {
-        /// <summary>
-        /// The server stream read timeout constant (in microseconds).
-        /// </summary>
-        private const int STREAMREADTIMEOUT = 1000 * 1000;
-
-        /// <summary>
-        /// TCP Listener to host TCP channel and listen
-        /// </summary>
-        private TcpListener tcpListener;
-
-        /// <summary>
-        /// TCP Client that can connect to a TCP listener
-        /// </summary>
-        private TcpClient tcpClient;
-
-        /// <summary>
-        /// Binary Writer to write to channel stream
-        /// </summary>
-        private BinaryWriter binaryWriter;
-
-        /// <summary>
-        /// Binary reader to read from channel stream
-        /// </summary>
-        private BinaryReader binaryReader;
-
-        /// <summary>
-        /// Serializer for the data objects
-        /// </summary>
-        private IDataSerializer dataSerializer;
-
-        /// <summary>
-        /// Event used to maintain client connection state
-        /// </summary>
-        private ManualResetEvent clientConnectedEvent = new ManualResetEvent(false);
-
-        /// <summary>
-        /// Event used to maintain client connection state
-        /// </summary>
-        private ManualResetEvent clientConnectionAcceptedEvent = new ManualResetEvent(false);
-
-        /// <summary>
-        /// Sync object for sending messages
-        /// SendMessage over socket channel is NOT thread-safe
-        /// </summary>
-        private object sendSyncObject = new object();
-
-        /// <summary>
-        /// Sync object for receiving messages
-        /// </summary>
-        private object receiveSyncObject = new object();
-
-        private Socket socket;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SocketCommunicationManager"/> class.
-        /// </summary>
-        public SocketCommunicationManager()
-            : this(JsonDataSerializer.Instance)
-        {
-        }
+    private TcpListener? _tcpListener;
 
-        internal SocketCommunicationManager(IDataSerializer dataSerializer)
-        {
-            this.dataSerializer = dataSerializer;
-        }
+    /// <summary>
+    /// TCP Client that can connect to a TCP listener
+    /// </summary>
+    private TcpClient? _tcpClient;
 
-        #region ServerMethods
+    /// <summary>
+    /// Binary Writer to write to channel stream
+    /// </summary>
+    private BinaryWriter? _binaryWriter;
 
-        /// <summary>
-        /// Host TCP Socket Server and start listening
-        /// </summary>
-        /// <param name="endpoint">End point where server is hosted</param>
-        /// <returns>Port of the listener</returns>
-        public IPEndPoint HostServer(IPEndPoint endpoint)
-        {
-            this.tcpListener = new TcpListener(endpoint);
-            this.tcpListener.Start();
-            EqtTrace.Info("Listening on Endpoint : {0}", (IPEndPoint)this.tcpListener.LocalEndpoint);
+    /// <summary>
+    /// Binary reader to read from channel stream
+    /// </summary>
+    private BinaryReader? _binaryReader;
 
-            return (IPEndPoint)this.tcpListener.LocalEndpoint;
-        }
+    /// <summary>
+    /// Serializer for the data objects
+    /// </summary>
+    private readonly IDataSerializer _dataSerializer;
 
-        /// <summary>
-        /// Accepts client async
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task AcceptClientAsync()
-        {
-            if (this.tcpListener != null)
-            {
-                this.clientConnectedEvent.Reset();
+    /// <summary>
+    /// Event used to maintain client connection state
+    /// </summary>
+    private readonly ManualResetEvent _clientConnectedEvent = new(false);
 
-                var client = await this.tcpListener.AcceptTcpClientAsync();
-                this.socket = client.Client;
-                this.socket.NoDelay = true;
+    /// <summary>
+    /// Event used to maintain client connection state
+    /// </summary>
+    private readonly ManualResetEvent _clientConnectionAcceptedEvent = new(false);
 
-                // Using Buffered stream only in case of write, and Network stream in case of read.
-                var bufferedStream = new PlatformStream().CreateBufferedStream(client.GetStream(), SocketConstants.BufferSize);
-                var networkStream = client.GetStream();
-                this.binaryReader = new BinaryReader(networkStream);
-                this.binaryWriter = new BinaryWriter(bufferedStream);
+    /// <summary>
+    /// Sync object for sending messages
+    /// SendMessage over socket channel is NOT thread-safe
+    /// </summary>
+    private readonly object _sendSyncObject = new();
 
-                this.clientConnectedEvent.Set();
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BufferSize);
-                    EqtTrace.Info("Accepted Client request and set the flag");
-                }
-            }
-        }
+    /// <summary>
+    /// Sync object for receiving messages
+    /// </summary>
+    private readonly object _receiveSyncObject = new();
 
-        /// <summary>
-        /// Waits for Client Connection
-        /// </summary>
-        /// <param name="clientConnectionTimeout">Time to Wait for the connection</param>
-        /// <returns>True if Client is connected, false otherwise</returns>
-        public bool WaitForClientConnection(int clientConnectionTimeout)
-        {
-            return this.clientConnectedEvent.WaitOne(clientConnectionTimeout);
-        }
+    private Socket? _socket;
 
-        /// <summary>
-        /// Stop Listener
-        /// </summary>
-        public void StopServer()
-        {
-            this.tcpListener?.Stop();
-            this.tcpListener = null;
-            this.binaryReader?.Dispose();
-            this.binaryWriter?.Dispose();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SocketCommunicationManager"/> class.
+    /// </summary>
+    public SocketCommunicationManager()
+        : this(JsonDataSerializer.Instance)
+    {
+    }
 
-        #endregion
+    internal SocketCommunicationManager(IDataSerializer dataSerializer)
+    {
+        _dataSerializer = dataSerializer;
+    }
 
-        #region ClientMethods
+    #region ServerMethods
 
-        /// <summary>
-        /// Connects to server async
-        /// </summary>
-        /// <param name="endpoint">EndPointAddress for client to connect</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task SetupClientAsync(IPEndPoint endpoint)
-        {
-            // TODO: pass cancellation token, if user cancels the operation, so we don't wait 50 secs to connect
-            // for now added a check for validation of this.tcpclient
-            this.clientConnectionAcceptedEvent.Reset();
-            EqtTrace.Info("Trying to connect to server on socket : {0} ", endpoint);
-            this.tcpClient = new TcpClient { NoDelay = true };
-            this.socket = this.tcpClient.Client;
-
-            Stopwatch watch = new Stopwatch();
-            watch.Start();
-            var connectionTimeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
-            do
-            {
-                try
-                {
-                    EqtTrace.Verbose("SocketCommunicationManager : SetupClientAsync : Attempting to connect to the server.");
-                    await this.tcpClient.ConnectAsync(endpoint.Address, endpoint.Port);
-
-                    if (this.tcpClient.Connected)
-                    {
-                        // Using Buffered stream only in case of write, and Network stream in case of read.
-                        var bufferedStream = new PlatformStream().CreateBufferedStream(this.tcpClient.GetStream(), SocketConstants.BufferSize);
-                        var networkStream = this.tcpClient.GetStream();
-                        this.binaryReader = new BinaryReader(networkStream);
-                        this.binaryWriter = new BinaryWriter(bufferedStream);
-
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info("Connected to the server successfully ");
-                            EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BufferSize);
-                        }
-
-                        this.clientConnectionAcceptedEvent.Set();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("Connection Failed with error {0}, retrying", ex.ToString());
-                }
-            }
-            while ((this.tcpClient != null) && !this.tcpClient.Connected && watch.ElapsedMilliseconds < connectionTimeout);
-        }
+    /// <summary>
+    /// Host TCP Socket Server and start listening
+    /// </summary>
+    /// <param name="endpoint">End point where server is hosted</param>
+    /// <returns>Port of the listener</returns>
+    public IPEndPoint HostServer(IPEndPoint endpoint)
+    {
+        _tcpListener = new TcpListener(endpoint);
+        _tcpListener.Start();
+        EqtTrace.Info("Listening on Endpoint : {0}", (IPEndPoint)_tcpListener.LocalEndpoint);
 
-        /// <summary>
-        /// Waits for server to be connected
-        /// Whoever creating the client and trying to connect to a server
-        /// should use this method to wait for connection to be established with server
-        /// </summary>
-        /// <param name="connectionTimeout">Time to wait for the connection</param>
-        /// <returns>True, if Server got a connection from client</returns>
-        public bool WaitForServerConnection(int connectionTimeout)
-        {
-            return this.clientConnectionAcceptedEvent.WaitOne(connectionTimeout);
-        }
+        return (IPEndPoint)_tcpListener.LocalEndpoint;
+    }
 
-        /// <summary>
-        /// Stop Listener
-        /// </summary>
-        public void StopClient()
+    /// <summary>
+    /// Accepts client async
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public async Task AcceptClientAsync()
+    {
+        if (_tcpListener == null)
         {
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netstandard1.5.
-            this.tcpClient?.Dispose();
-#endif
-            this.tcpClient = null;
-            this.binaryReader?.Dispose();
-            this.binaryWriter?.Dispose();
+            return;
         }
 
-        #endregion
+        _clientConnectedEvent.Reset();
 
-        /// <summary>
-        /// Writes message to the binary writer.
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        public void SendMessage(string messageType)
-        {
-            var serializedObject = this.dataSerializer.SerializeMessage(messageType);
-            this.WriteAndFlushToChannel(serializedObject);
-        }
+        var client = await _tcpListener.AcceptTcpClientAsync();
+        _socket = client.Client;
+        _socket.NoDelay = true;
 
-        /// <summary>
-        ///  Writes message to the binary writer with payload
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        /// <param name="payload">payload to be sent</param>
-        public void SendMessage(string messageType, object payload)
-        {
-            var rawMessage = this.dataSerializer.SerializePayload(messageType, payload);
-            this.WriteAndFlushToChannel(rawMessage);
-        }
+        // Using Buffered stream only in case of write, and Network stream in case of read.
+        var bufferedStream = new PlatformStream().CreateBufferedStream(client.GetStream(), SocketConstants.BufferSize);
+        var networkStream = client.GetStream();
+        _binaryReader = new BinaryReader(networkStream);
+        _binaryWriter = new BinaryWriter(bufferedStream);
 
-        /// <summary>
-        ///  Writes message to the binary writer with payload
-        /// </summary>
-        /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
-        /// <param name="payload">payload to be sent</param>
-        /// <param name="version">version to be sent</param>
-        public void SendMessage(string messageType, object payload, int version)
-        {
-            var rawMessage = this.dataSerializer.SerializePayload(messageType, payload, version);
-            this.WriteAndFlushToChannel(rawMessage);
-        }
+        _clientConnectedEvent.Set();
+        EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BufferSize);
+        EqtTrace.Info("Accepted Client request and set the flag");
+    }
 
-        /// <summary>
-        /// Send serialized raw message
-        /// </summary>
-        /// <param name="rawMessage">serialized message</param>
-        public void SendRawMessage(string rawMessage)
-        {
-            this.WriteAndFlushToChannel(rawMessage);
-        }
+    /// <summary>
+    /// Waits for Client Connection
+    /// </summary>
+    /// <param name="clientConnectionTimeout">Time to Wait for the connection</param>
+    /// <returns>True if Client is connected, false otherwise</returns>
+    public bool WaitForClientConnection(int clientConnectionTimeout)
+    {
+        var stopWatch = Stopwatch.StartNew();
+        var result = _clientConnectedEvent.WaitOne(clientConnectionTimeout);
+        EqtTrace.Verbose("SocketCommunicationManager.WaitForClientConnection took: {0} ms, with {1} ms timeout, and finished with {2}.", stopWatch.ElapsedMilliseconds, clientConnectionTimeout, result);
 
-        /// <summary>
-        /// Reads message from the binary reader
-        /// </summary>
-        /// <returns>Returns message read from the binary reader</returns>
-        public Message ReceiveMessage()
-        {
-            var rawMessage = this.ReceiveRawMessage();
-            if (!string.IsNullOrEmpty(rawMessage))
-            {
-                return this.dataSerializer.DeserializeMessage(rawMessage);
-            }
+        return result;
+    }
 
-            return null;
-        }
+    /// <summary>
+    /// Stop Listener
+    /// </summary>
+    public void StopServer()
+    {
+        _tcpListener?.Stop();
+        _tcpListener = null;
+        _binaryReader?.Dispose();
+        _binaryWriter?.Dispose();
+    }
 
-        /// <summary>
-        /// Reads message from the binary reader using read timeout
-        /// </summary>
-        /// <param name="cancellationToken">
-        /// The cancellation Token.
-        /// </param>
-        /// <returns>
-        /// Returns message read from the binary reader
-        /// </returns>
-        public async Task<Message> ReceiveMessageAsync(CancellationToken cancellationToken)
+    #endregion
+
+    #region ClientMethods
+
+    /// <summary>
+    /// Connects to server async
+    /// </summary>
+    /// <param name="endpoint">EndPointAddress for client to connect</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public async Task SetupClientAsync(IPEndPoint endpoint)
+    {
+        // TODO: pass cancellation token, if user cancels the operation, so we don't wait 50 secs to connect
+        // for now added a check for validation of this.tcpclient
+        _clientConnectionAcceptedEvent.Reset();
+        EqtTrace.Info("Trying to connect to server on socket : {0} ", endpoint);
+        _tcpClient = new TcpClient { NoDelay = true };
+        _socket = _tcpClient.Client;
+
+        Stopwatch watch = new();
+        watch.Start();
+        var connectionTimeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
+        do
         {
-            var rawMessage = await this.ReceiveRawMessageAsync(cancellationToken);
-            if (!string.IsNullOrEmpty(rawMessage))
+            try
             {
-                return this.dataSerializer.DeserializeMessage(rawMessage);
-            }
+                EqtTrace.Verbose("SocketCommunicationManager : SetupClientAsync : Attempting to connect to the server.");
+                await _tcpClient.ConnectAsync(endpoint.Address, endpoint.Port);
 
-            return null;
-        }
+                if (_tcpClient.Connected)
+                {
+                    // Using Buffered stream only in case of write, and Network stream in case of read.
+                    var bufferedStream = new PlatformStream().CreateBufferedStream(_tcpClient.GetStream(), SocketConstants.BufferSize);
+                    var networkStream = _tcpClient.GetStream();
+                    _binaryReader = new BinaryReader(networkStream);
+                    _binaryWriter = new BinaryWriter(bufferedStream);
 
-        /// <summary>
-        /// Reads message from the binary reader
-        /// </summary>
-        /// <returns> Raw message string </returns>
-        public string ReceiveRawMessage()
-        {
-            lock (this.receiveSyncObject)
+                    EqtTrace.Info("Connected to the server successfully ");
+                    EqtTrace.Info("Using the buffer size of {0} bytes", SocketConstants.BufferSize);
+
+                    _clientConnectionAcceptedEvent.Set();
+                }
+            }
+            catch (Exception ex)
             {
-                // Reading message on binaryreader is not thread-safe
-                return this.binaryReader?.ReadString();
+                EqtTrace.Error("Connection Failed with error {0}, retrying", ex.ToString());
             }
         }
+        while ((_tcpClient != null) && !_tcpClient.Connected && watch.ElapsedMilliseconds < connectionTimeout);
+    }
 
-        /// <summary>
-        /// Reads message from the binary reader using read timeout
-        /// </summary>
-        /// <param name="cancellationToken">
-        /// The cancellation Token.
-        /// </param>
-        /// <returns>
-        /// Raw message string
-        /// </returns>
-        public async Task<string> ReceiveRawMessageAsync(CancellationToken cancellationToken)
-        {
-            var str = await Task.Run(() => this.TryReceiveRawMessage(cancellationToken));
-            return str;
-        }
+    /// <summary>
+    /// Waits for server to be connected
+    /// Whoever creating the client and trying to connect to a server
+    /// should use this method to wait for connection to be established with server
+    /// </summary>
+    /// <param name="connectionTimeout">Time to wait for the connection</param>
+    /// <returns>True, if Server got a connection from client</returns>
+    public bool WaitForServerConnection(int connectionTimeout)
+    {
+        var stopWatch = Stopwatch.StartNew();
+        var result = _clientConnectionAcceptedEvent.WaitOne(connectionTimeout);
+        EqtTrace.Verbose("SocketCommunicationManager.WaitForServerConnection took: {0} ms, with {1} ms timeout, and finished with {2}.", stopWatch.ElapsedMilliseconds, connectionTimeout, result);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Stop Listener
+    /// </summary>
+    public void StopClient()
+    {
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        _tcpClient = null;
+        _binaryReader?.Dispose();
+        _binaryWriter?.Dispose();
+    }
+
+    #endregion
 
-        /// <summary>
-        /// Deserializes the Message into actual TestPlatform objects
-        /// </summary>
-        /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
-        /// <param name="message"> Message object </param>
-        /// <returns> TestPlatform object </returns>
-        public T DeserializePayload<T>(Message message)
+    /// <summary>
+    /// Writes message to the binary writer.
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    public void SendMessage(string messageType)
+    {
+        var serializedObject = _dataSerializer.SerializeMessage(messageType);
+        WriteAndFlushToChannel(serializedObject);
+    }
+
+    /// <summary>
+    ///  Writes message to the binary writer with payload
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    /// <param name="payload">payload to be sent</param>
+    public void SendMessage(string messageType, object payload)
+    {
+        var rawMessage = _dataSerializer.SerializePayload(messageType, payload);
+        WriteAndFlushToChannel(rawMessage);
+    }
+
+    /// <summary>
+    ///  Writes message to the binary writer with payload
+    /// </summary>
+    /// <param name="messageType">Type of Message to be sent, for instance TestSessionStart</param>
+    /// <param name="payload">payload to be sent</param>
+    /// <param name="version">version to be sent</param>
+    public void SendMessage(string messageType, object payload, int version)
+    {
+        var rawMessage = _dataSerializer.SerializePayload(messageType, payload, version);
+        WriteAndFlushToChannel(rawMessage);
+    }
+
+    /// <summary>
+    /// Send serialized raw message
+    /// </summary>
+    /// <param name="rawMessage">serialized message</param>
+    public void SendRawMessage(string rawMessage)
+    {
+        WriteAndFlushToChannel(rawMessage);
+    }
+
+    /// <summary>
+    /// Reads message from the binary reader
+    /// </summary>
+    /// <returns>Returns message read from the binary reader</returns>
+    public Message? ReceiveMessage()
+    {
+        var rawMessage = ReceiveRawMessage();
+        return !rawMessage.IsNullOrEmpty()
+            ? _dataSerializer.DeserializeMessage(rawMessage)
+            : null;
+    }
+
+    /// <summary>
+    /// Reads message from the binary reader using read timeout
+    /// </summary>
+    /// <param name="cancellationToken">
+    /// The cancellation Token.
+    /// </param>
+    /// <returns>
+    /// Returns message read from the binary reader
+    /// </returns>
+    public async Task<Message?> ReceiveMessageAsync(CancellationToken cancellationToken)
+    {
+        var rawMessage = await ReceiveRawMessageAsync(cancellationToken);
+        return !rawMessage.IsNullOrEmpty()
+            ? _dataSerializer.DeserializeMessage(rawMessage)
+            : null;
+    }
+
+    /// <summary>
+    /// Reads message from the binary reader
+    /// </summary>
+    /// <returns> Raw message string </returns>
+    public string? ReceiveRawMessage()
+    {
+        lock (_receiveSyncObject)
         {
-            return this.dataSerializer.DeserializePayload<T>(message);
+            // Reading message on binaryreader is not thread-safe
+            return _binaryReader?.ReadString();
         }
+    }
 
-        private string TryReceiveRawMessage(CancellationToken cancellationToken)
-        {
-            string str = null;
-            bool success = false;
+    /// <summary>
+    /// Reads message from the binary reader using read timeout
+    /// </summary>
+    /// <param name="cancellationToken">
+    /// The cancellation Token.
+    /// </param>
+    /// <returns>
+    /// Raw message string
+    /// </returns>
+    public async Task<string?> ReceiveRawMessageAsync(CancellationToken cancellationToken)
+    {
+        var str = await Task.Run(() => TryReceiveRawMessage(cancellationToken));
+        return str;
+    }
+
+    /// <summary>
+    /// Deserializes the Message into actual TestPlatform objects
+    /// </summary>
+    /// <typeparam name="T"> The type of object to deserialize to. </typeparam>
+    /// <param name="message"> Message object </param>
+    /// <returns> TestPlatform object </returns>
+    public T? DeserializePayload<T>(Message message)
+    {
+        return _dataSerializer.DeserializePayload<T>(message);
+    }
+
+    private string? TryReceiveRawMessage(CancellationToken cancellationToken)
+    {
+        string? str = null;
+        bool success = false;
 
-            // Set read timeout to avoid blocking receive raw message
-            while (!cancellationToken.IsCancellationRequested && !success)
+        // Set read timeout to avoid blocking receive raw message
+        while (!cancellationToken.IsCancellationRequested && !success)
+        {
+            try
             {
-                try
+                if (_socket is null)
                 {
-                    if (this.socket.Poll(STREAMREADTIMEOUT, SelectMode.SelectRead))
-                    {
-                        str = this.ReceiveRawMessage();
-                        success = true;
-                    }
+                    EqtTrace.Error("SocketCommunicationManager.TryReceiveRawMessage: Socket is null");
+                    break;
                 }
-                catch (IOException ioException)
+
+                if (_socket.Poll(STREAMREADTIMEOUT, SelectMode.SelectRead) == true)
+                {
+                    str = ReceiveRawMessage();
+                    success = true;
+                }
+            }
+            catch (IOException ioException)
+            {
+                if (ioException.InnerException is SocketException socketException
+                    && socketException.SocketErrorCode == SocketError.TimedOut)
                 {
-                    if (ioException.InnerException is SocketException socketException
-                        && socketException.SocketErrorCode == SocketError.TimedOut)
-                    {
-                        EqtTrace.Info(
-                            "SocketCommunicationManager ReceiveMessage: failed to receive message because read timeout {0}",
-                            ioException);
-                    }
-                    else
-                    {
-                        EqtTrace.Error(
-                            "SocketCommunicationManager ReceiveMessage: failed to receive message {0}",
-                            ioException);
-                        break;
-                    }
+                    EqtTrace.Info(
+                        "SocketCommunicationManager.ReceiveMessage: failed to receive message because read timeout {0}",
+                        ioException);
                 }
-                catch (Exception exception)
+                else
                 {
                     EqtTrace.Error(
-                        "SocketCommunicationManager ReceiveMessage: failed to receive message {0}",
-                        exception);
+                        "SocketCommunicationManager.ReceiveMessage: failed to receive message {0}",
+                        ioException);
                     break;
                 }
             }
-
-            return str;
+            catch (Exception exception)
+            {
+                EqtTrace.Error(
+                    "SocketCommunicationManager.ReceiveMessage: failed to receive message {0}",
+                    exception);
+                break;
+            }
         }
 
-        /// <summary>
-        /// Writes the data on socket and flushes the buffer
-        /// </summary>
-        /// <param name="rawMessage">message to write</param>
-        private void WriteAndFlushToChannel(string rawMessage)
+        return str;
+    }
+
+    /// <summary>
+    /// Writes the data on socket and flushes the buffer
+    /// </summary>
+    /// <param name="rawMessage">message to write</param>
+    private void WriteAndFlushToChannel(string rawMessage)
+    {
+        // Writing Message on binarywriter is not Thread-Safe
+        // Need to sync one by one to avoid buffer corruption
+        lock (_sendSyncObject)
         {
-            // Writing Message on binarywriter is not Thread-Safe
-            // Need to sync one by one to avoid buffer corruption
-            lock (this.sendSyncObject)
-            {
-                this.binaryWriter?.Write(rawMessage);
-                this.binaryWriter?.Flush();
-            }
+            _binaryWriter?.Write(rawMessage);
+            _binaryWriter?.Flush();
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketConstants.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketConstants.cs
index 4279445ee9..0832b30eb0 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketConstants.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketConstants.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+public class SocketConstants
 {
-    public class SocketConstants
-    {
-        // Buffer size for the buffered stream we are using.
-        public const int BufferSize = 16384;
-    }
+    // Buffer size for the buffered stream we are using.
+    public const int BufferSize = 16384;
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs
index ecfc134bec..529f2bb638 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs
@@ -1,135 +1,144 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Communication server implementation over sockets.
+/// </summary>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class SocketServer : ICommunicationEndPoint
 {
-    using System;
-    using System.IO;
-    using System.Net.Sockets;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    private readonly CancellationTokenSource _cancellation;
+    private readonly Func<Stream, ICommunicationChannel> _channelFactory;
+
+    private ICommunicationChannel? _channel;
+    private TcpListener? _tcpListener;
+    private TcpClient? _tcpClient;
+    private bool _stopped;
+    private string? _endPoint;
 
     /// <summary>
-    /// Communication server implementation over sockets.
+    /// Initializes a new instance of the <see cref="SocketServer"/> class.
     /// </summary>
-    public class SocketServer : ICommunicationEndPoint
+    public SocketServer()
+        : this(stream => new LengthPrefixCommunicationChannel(stream))
     {
-        private readonly CancellationTokenSource cancellation;
+    }
 
-        private readonly Func<Stream, ICommunicationChannel> channelFactory;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SocketServer"/> class with given channel
+    /// factory implementation.
+    /// </summary>
+    /// <param name="channelFactory">Factory to create communication channel.</param>
+    protected SocketServer(Func<Stream, ICommunicationChannel> channelFactory)
+    {
+        // Used to cancel the message loop
+        _cancellation = new CancellationTokenSource();
 
-        private ICommunicationChannel channel;
+        _channelFactory = channelFactory;
+    }
+
+    /// <inheritdoc />
+    public event EventHandler<ConnectedEventArgs>? Connected;
 
-        private TcpListener tcpListener;
+    /// <inheritdoc />
+    public event EventHandler<DisconnectedEventArgs>? Disconnected;
 
-        private TcpClient tcpClient;
+    public string? Start(string endPoint)
+    {
+        try
+        {
+            _tcpListener = new TcpListener(endPoint.GetIpEndPoint());
 
-        private bool stopped;
+            _tcpListener.Start();
 
-        private string endPoint;
+            _endPoint = _tcpListener.LocalEndpoint.ToString();
+            EqtTrace.Info("SocketServer.Start: Listening on endpoint : {0}", _endPoint);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SocketServer"/> class.
-        /// </summary>
-        public SocketServer()
-            : this(stream => new LengthPrefixCommunicationChannel(stream))
+            // Serves a single client at the moment. An error in connection, or message loop just
+            // terminates the entire server.
+            _tcpListener.AcceptTcpClientAsync().ContinueWith(t => OnClientConnected(t.Result));
+            return _endPoint;
+        }
+        catch (SocketException ex)
         {
+            EqtTrace.Error("Failed for address {0}, with: {1}", endPoint, ex);
+            throw;
         }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SocketServer"/> class with given channel
-        /// factory implementation.
-        /// </summary>
-        /// <param name="channelFactory">Factory to create communication channel.</param>
-        protected SocketServer(Func<Stream, ICommunicationChannel> channelFactory)
+    /// <inheritdoc />
+    public void Stop()
+    {
+        EqtTrace.Info("SocketServer.Stop: Stop server endPoint: {0}", _endPoint);
+        if (!_stopped)
         {
-            // Used to cancel the message loop
-            this.cancellation = new CancellationTokenSource();
-
-            this.channelFactory = channelFactory;
+            EqtTrace.Info("SocketServer.Stop: Cancellation requested. Stopping message loop.");
+            _cancellation.Cancel();
         }
+    }
 
-        /// <inheritdoc />
-        public event EventHandler<ConnectedEventArgs> Connected;
-
-        /// <inheritdoc />
-        public event EventHandler<DisconnectedEventArgs> Disconnected;
+    private void OnClientConnected(TcpClient client)
+    {
+        _tcpClient = client;
+        _tcpClient.Client.NoDelay = true;
 
-        public string Start(string endPoint)
+        if (Connected == null)
         {
-            this.tcpListener = new TcpListener(endPoint.GetIPEndPoint());
+            return;
+        }
 
-            this.tcpListener.Start();
+        _channel = _channelFactory(_tcpClient.GetStream());
+        Connected.SafeInvoke(this, new ConnectedEventArgs(_channel), "SocketServer: ClientConnected");
 
-            this.endPoint = this.tcpListener.LocalEndpoint.ToString();
-            EqtTrace.Info("SocketServer.Start: Listening on endpoint : {0}", this.endPoint);
+        EqtTrace.Verbose("SocketServer.OnClientConnected: Client connected for endPoint: {0}, starting MessageLoopAsync:", _endPoint);
 
-            // Serves a single client at the moment. An error in connection, or message loop just
-            // terminates the entire server.
-            this.tcpListener.AcceptTcpClientAsync().ContinueWith(t => this.OnClientConnected(t.Result));
-            return this.endPoint;
-        }
+        // Start the message loop
+        Task.Run(() => _tcpClient.MessageLoopAsync(_channel, error => StopOnError(error), _cancellation.Token)).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc />
-        public void Stop()
-        {
-            EqtTrace.Info("SocketServer.Stop: Stop server endPoint: {0}", this.endPoint);
-            if (!this.stopped)
-            {
-                EqtTrace.Info("SocketServer.Stop: Cancellation requested. Stopping message loop.");
-                this.cancellation.Cancel();
-            }
-        }
+    /// <summary>
+    /// Stop the connection when error was encountered. Dispose all communication, and notify subscribers of Disconnected event
+    /// that we aborted.
+    /// </summary>
+    /// <param name="error"></param>
+    private void StopOnError(Exception? error)
+    {
+        EqtTrace.Info("SocketServer.PrivateStop: Stopping server endPoint: {0} error: {1}", _endPoint, error);
 
-        private void OnClientConnected(TcpClient client)
+        if (_stopped)
         {
-            this.tcpClient = client;
-            this.tcpClient.Client.NoDelay = true;
-
-            if (this.Connected != null)
-            {
-                this.channel = this.channelFactory(this.tcpClient.GetStream());
-                this.Connected.SafeInvoke(this, new ConnectedEventArgs(this.channel), "SocketServer: ClientConnected");
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("SocketServer.OnClientConnected: Client connected for endPoint: {0}, starting MessageLoopAsync:", this.endPoint);
-                }
-
-                // Start the message loop
-                Task.Run(() => this.tcpClient.MessageLoopAsync(this.channel, error => this.Stop(error), this.cancellation.Token)).ConfigureAwait(false);
-            }
+            return;
         }
 
-        private void Stop(Exception error)
-        {
-            EqtTrace.Info("SocketServer.PrivateStop: Stopping server endPoint: {0} error: {1}", this.endPoint, error);
-
-            if (!this.stopped)
-            {
-                // Do not allow stop to be called multiple times.
-                this.stopped = true;
-
-                // Stop accepting any other connections
-                this.tcpListener.Stop();
-
-                // Close the client and dispose the underlying stream
-#if NETFRAMEWORK
-                // tcpClient.Close() calls tcpClient.Dispose().
-                this.tcpClient?.Close();
-#else
-                // tcpClient.Close() not available for netstandard1.5.
-                this.tcpClient?.Dispose();
-#endif
-                this.channel.Dispose();
-                this.cancellation.Dispose();
-
-                EqtTrace.Info("SocketServer.Stop: Raise disconnected event endPoint: {0} error: {1}", this.endPoint, error);
-                this.Disconnected?.SafeInvoke(this, new DisconnectedEventArgs { Error = error }, "SocketServer: ClientDisconnected");
-            }
-        }
+        TPDebug.Assert(_tcpListener is not null, $"{nameof(_tcpListener)} is null");
+        TPDebug.Assert(_channel is not null, $"{nameof(_channel)} is null");
+
+        // Do not allow stop to be called multiple times.
+        _stopped = true;
+
+        // Stop accepting any other connections
+        _tcpListener.Stop();
+
+        // Close the client and dispose the underlying stream
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        _channel.Dispose();
+        _cancellation.Dispose();
+
+        EqtTrace.Info("SocketServer.Stop: Raise disconnected event endPoint: {0} error: {1}", _endPoint, error);
+        Disconnected?.SafeInvoke(this, new DisconnectedEventArgs { Error = error }, "SocketServer: ClientDisconnected");
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketTransport.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketTransport.cs
index 5ac5df5e65..c31a3f7c61 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketTransport.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketTransport.cs
@@ -1,102 +1,92 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
-{
-    using System;
-    using System.Net;
+using System;
+using System.Net;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    /// <inheritdoc/>
-    public sealed class SocketTransport : ITransport
-    {
-        /// <summary>
-        /// Specifies whether the resolver is disposed or not
-        /// </summary>
-        private bool disposed;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
-        private TestHostConnectionInfo connectionInfo;
+/// <inheritdoc/>
+public sealed class SocketTransport : ITransport
+{
+    private readonly TestHostConnectionInfo _connectionInfo;
+    private readonly ICommunicationManager _communicationManager;
 
-        private ICommunicationManager communicationManager;
+    /// <summary>
+    /// Specifies whether the resolver is disposed or not
+    /// </summary>
+    private bool _disposed;
 
-        public SocketTransport(ICommunicationManager communicationManager, TestHostConnectionInfo connectionInfo)
-        {
-            this.communicationManager = communicationManager;
-            this.connectionInfo = connectionInfo;
-        }
+    public SocketTransport(ICommunicationManager communicationManager, TestHostConnectionInfo connectionInfo)
+    {
+        _communicationManager = communicationManager;
+        _connectionInfo = connectionInfo;
+    }
 
-        /// <inheritdoc/>
-        public IPEndPoint Initialize()
+    /// <inheritdoc/>
+    public IPEndPoint Initialize()
+    {
+        var endpoint = GetIpEndPoint(_connectionInfo.Endpoint);
+        TPDebug.Assert(endpoint is not null, "endpoint is null");
+        switch (_connectionInfo.Role)
         {
-            var endpoint = this.GetIPEndPoint(this.connectionInfo.Endpoint);
-            switch (this.connectionInfo.Role)
-            {
-                case ConnectionRole.Host:
-                    {
-                        // In case users passes endpoint Port as 0 HostServer will allocate endpoint at appropriate port,
-                        // So reassign endpoint to point to correct endpoint.
-                        endpoint = this.communicationManager.HostServer(endpoint);
-                        this.communicationManager.AcceptClientAsync();
-                        return endpoint;
-                    }
+            case ConnectionRole.Host:
+                {
+                    // In case users passes endpoint Port as 0 HostServer will allocate endpoint at appropriate port,
+                    // So reassign endpoint to point to correct endpoint.
+                    endpoint = _communicationManager.HostServer(endpoint);
+                    _communicationManager.AcceptClientAsync();
+                    return endpoint;
+                }
 
-                case ConnectionRole.Client:
-                    {
-                        this.communicationManager.SetupClientAsync(this.GetIPEndPoint(this.connectionInfo.Endpoint));
-                        return endpoint;
-                    }
+            case ConnectionRole.Client:
+                {
+                    _communicationManager.SetupClientAsync(endpoint);
+                    return endpoint;
+                }
 
-                default:
-                    throw new NotImplementedException("Unsupported Connection Role");
-            }
+            default:
+                throw new NotImplementedException("Unsupported Connection Role");
         }
+    }
 
-        /// <inheritdoc/>
-        public bool WaitForConnection(int connectionTimeout)
+    /// <inheritdoc/>
+    public bool WaitForConnection(int connectionTimeout)
+    {
+        return _connectionInfo.Role == ConnectionRole.Client ? _communicationManager.WaitForServerConnection(connectionTimeout) : _communicationManager.WaitForClientConnection(connectionTimeout);
+    }
+
+    public void Dispose()
+    {
+        if (_disposed)
         {
-            return this.connectionInfo.Role == ConnectionRole.Client ? this.communicationManager.WaitForServerConnection(connectionTimeout) : this.communicationManager.WaitForClientConnection(connectionTimeout);
+            return;
         }
 
-        public void Dispose()
+        if (_connectionInfo.Role == ConnectionRole.Client)
         {
-            this.Dispose(true);
+            _communicationManager.StopClient();
         }
-
-        private void Dispose(bool disposing)
+        else
         {
-            if (!this.disposed)
-            {
-                if (disposing)
-                {
-                    if (this.connectionInfo.Role == ConnectionRole.Client)
-                    {
-                        this.communicationManager?.StopClient();
-                    }
-                    else
-                    {
-                        this.communicationManager?.StopServer();
-                    }
-                }
-
-                this.disposed = true;
-            }
+            _communicationManager.StopServer();
         }
 
-        /// <summary>
-        /// Converts a given string endpoint address to valid Ipv4, Ipv6 IPEndpoint
-        /// </summary>
-        /// <param name="endpointAddress">Input endpoint address</param>
-        /// <returns>IPEndpoint from give string</returns>
-        private IPEndPoint GetIPEndPoint(string endpointAddress)
-        {
-            if (Uri.TryCreate(string.Concat("tcp://", endpointAddress), UriKind.Absolute, out Uri uri))
-            {
-                return new IPEndPoint(IPAddress.Parse(uri.Host), uri.Port < 0 ? 0 : uri.Port);
-            }
+        _disposed = true;
+    }
 
-            return null;
-        }
+    /// <summary>
+    /// Converts a given string endpoint address to valid Ipv4, Ipv6 IPEndpoint
+    /// </summary>
+    /// <param name="endpointAddress">Input endpoint address</param>
+    /// <returns>IPEndpoint from give string</returns>
+    private static IPEndPoint? GetIpEndPoint(string endpointAddress)
+    {
+        return Uri.TryCreate(string.Concat("tcp://", endpointAddress), UriKind.Absolute, out Uri? uri)
+            ? new IPEndPoint(IPAddress.Parse(uri.Host), uri.Port < 0 ? 0 : uri.Port)
+            : null;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
index 415bc587f1..c89ec6e31c 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
@@ -1,113 +1,127 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-    using System.Threading.Tasks;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
-    internal static class TcpClientExtensions
+internal static class TcpClientExtensions
+{
+    // Timeout for polling stream in micro seconds.
+    private const int Streamreadtimeout = 1000 * 1000;
+
+    internal static Task MessageLoopAsync(
+        this TcpClient client,
+        ICommunicationChannel channel,
+        Action<Exception?> errorHandler,
+        CancellationToken cancellationToken)
     {
-        // Timeout for polling stream in micro seconds.
-        private const int STREAMREADTIMEOUT = 1000 * 1000;
+        Exception? error = null;
 
-        internal static Task MessageLoopAsync(
-                this TcpClient client,
-                ICommunicationChannel channel,
-                Action<Exception> errorHandler,
-                CancellationToken cancellationToken)
+        var remoteEndPoint = string.Empty;
+        var localEndPoint = string.Empty;
+        try
         {
-            Exception error = null;
+            remoteEndPoint = client.Client.RemoteEndPoint?.ToString();
+            localEndPoint = client.Client.LocalEndPoint?.ToString();
+        }
+        catch (SocketException socketException)
+        {
+            EqtTrace.Error(
+                "TcpClientExtensions.MessageLoopAsync: Failed to access the endpoint due to socket error: {0}",
+                socketException);
+        }
 
-            var remoteEndPoint = string.Empty;
-            var localEndPoint = string.Empty;
-            try
-            {
-                remoteEndPoint = client.Client.RemoteEndPoint?.ToString();
-                localEndPoint = client.Client.LocalEndPoint?.ToString();
-            }
-            catch (SocketException socketException)
+        // PERF: check if verbose is enabled once, and re-use for all calls in the tight loop below. The check for verbose is shows in perf traces
+        // below and we are wasting resources re-checking when user does not have it open. Downside of this is that if you change the verbosity level
+        // during runtime (e.g. in VS options), you won't update here. Which is imho an okay tradeoff.
+        var isVerboseEnabled = EqtTrace.IsVerboseEnabled;
+
+        var sw = Stopwatch.StartNew();
+        // Set read timeout to avoid blocking receive raw message
+        while (channel != null && !cancellationToken.IsCancellationRequested)
+        {
+            if (isVerboseEnabled)
             {
-                EqtTrace.Error(
-                        "TcpClientExtensions.MessageLoopAsync: Failed to access the endpoint due to socket error: {0}",
-                        socketException);
+                EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: Polling on remoteEndPoint: {0} localEndPoint: {1} after {2} ms", remoteEndPoint, localEndPoint, sw.ElapsedMilliseconds);
+                sw.Restart();
             }
 
-            // Set read timeout to avoid blocking receive raw message
-            while (channel != null && !cancellationToken.IsCancellationRequested)
+            try
             {
-                EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: Polling on remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
-
-                try
+                if (client.Client.Poll(Streamreadtimeout, SelectMode.SelectRead))
                 {
-                    if (client.Client.Poll(STREAMREADTIMEOUT, SelectMode.SelectRead))
+                    if (isVerboseEnabled)
                     {
                         EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: NotifyDataAvailable remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
-                        channel.NotifyDataAvailable();
                     }
+                    channel.NotifyDataAvailable(cancellationToken);
                 }
-                catch (IOException ioException)
+            }
+            catch (IOException ioException)
+            {
+                if (ioException.InnerException is SocketException socketException
+                    && socketException.SocketErrorCode == SocketError.TimedOut)
                 {
-                    if (ioException.InnerException is SocketException socketException
-                            && socketException.SocketErrorCode == SocketError.TimedOut)
-                    {
-                        EqtTrace.Info(
-                                "Socket: Message loop: failed to receive message due to read timeout {0}, remoteEndPoint: {1} localEndPoint: {2}",
-                                ioException,
-                                remoteEndPoint,
-                                localEndPoint);
-                    }
-                    else
-                    {
-                        EqtTrace.Error(
-                                "Socket: Message loop: failed to receive message due to socket error {0}, remoteEndPoint: {1} localEndPoint: {2}",
-                                ioException,
-                                remoteEndPoint,
-                                localEndPoint);
-                        error = ioException;
-                        break;
-                    }
+                    EqtTrace.Info(
+                        "Socket: Message loop: failed to receive message due to read timeout {0}, remoteEndPoint: {1} localEndPoint: {2}",
+                        ioException,
+                        remoteEndPoint,
+                        localEndPoint);
                 }
-                catch (Exception exception)
+                else
                 {
                     EqtTrace.Error(
-                            "Socket: Message loop: failed to receive message {0}, remoteEndPoint: {1} localEndPoint: {2}",
-                            exception,
+                        "Socket: Message loop: failed to receive message due to socket error {0}, remoteEndPoint: {1} localEndPoint: {2}",
+                        ioException,
                         remoteEndPoint,
                         localEndPoint);
-                    error = exception;
+                    // Do not pass the error to the caller, the transport was torn down because testhost
+                    // disconnected, in 99% of the cases. This error ends up confusing developers
+                    // even though it just means "testhost crashed", look at testhost to see what happened.
+                    // https://github.com/microsoft/vstest/issues/4461
+                    // error = ioException;
                     break;
                 }
             }
+            catch (Exception exception)
+            {
+                EqtTrace.Error(
+                    "Socket: Message loop: failed to receive message {0}, remoteEndPoint: {1} localEndPoint: {2}",
+                    exception,
+                    remoteEndPoint,
+                    localEndPoint);
+                error = exception;
+                break;
+            }
+        }
 
-            // Try clean up and raise client disconnected events
-            errorHandler(error);
-
-            EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: exiting MessageLoopAsync remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
+        // Try clean up and raise client disconnected events
+        errorHandler(error);
 
-            return Task.FromResult(0);
-        }
+        EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: exiting MessageLoopAsync remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
 
-        /// <summary>
-        /// Converts a given string endpoint address to valid Ipv4, Ipv6 IPEndpoint
-        /// </summary>
-        /// <param name="value">Input endpoint address</param>
-        /// <returns>IPEndpoint from give string, if its not a valid string. It will create endpoint with loop back address with port 0</returns>
-        internal static IPEndPoint GetIPEndPoint(this string value)
-        {
-            if (Uri.TryCreate(string.Concat("tcp://", value), UriKind.Absolute, out Uri uri))
-            {
-                return new IPEndPoint(IPAddress.Parse(uri.Host), uri.Port < 0 ? 0 : uri.Port);
-            }
+        return Task.FromResult(0);
+    }
 
-            return new IPEndPoint(IPAddress.Loopback, 0);
-        }
+    /// <summary>
+    /// Converts a given string endpoint address to valid Ipv4, Ipv6 IPEndpoint
+    /// </summary>
+    /// <param name="value">Input endpoint address</param>
+    /// <returns>IPEndpoint from give string, if its not a valid string. It will create endpoint with loop back address with port 0</returns>
+    internal static IPEndPoint GetIpEndPoint(this string? value)
+    {
+        return Uri.TryCreate(string.Concat("tcp://", value), UriKind.Absolute, out Uri? uri)
+            ? new IPEndPoint(IPAddress.Parse(uri.Host), uri.Port < 0 ? 0 : uri.Port)
+            : new IPEndPoint(IPAddress.Loopback, 0);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/TelemetryReporter.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/TelemetryReporter.cs
new file mode 100644
index 0000000000..7c31dab285
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/TelemetryReporter.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal class TelemetryReporter : ITelemetryReporter
+{
+    private readonly IRequestData _requestData;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataSerializer _dataSerializer;
+
+    public TelemetryReporter(IRequestData requestData, ICommunicationManager communicationManager, IDataSerializer dataSerializer)
+    {
+        _requestData = requestData;
+        _communicationManager = communicationManager;
+        _dataSerializer = dataSerializer;
+    }
+
+    public void Report(TelemetryEvent telemetryEvent)
+    {
+        if (_requestData.IsTelemetryOptedIn)
+        {
+            string message = _dataSerializer.SerializePayload(MessageType.TelemetryEventMessage, telemetryEvent);
+            _communicationManager.SendRawMessage(message);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
index 16ec2d6c03..89f7369dbd 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
@@ -1,773 +1,849 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Test request sender implementation.
+/// </summary>
+public class TestRequestSender : ITestRequestSender
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Threading;
-    using CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using CommonResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+    // Time to wait for test host exit
+    private const int ClientProcessExitWaitTimeout = 10 * 1000;
+
+    private readonly IDataSerializer _dataSerializer;
+    private readonly ManualResetEventSlim _connected;
+    private readonly ManualResetEventSlim _clientExited;
+    private readonly int _clientExitedWaitTime;
+    private readonly ICommunicationEndPoint _communicationEndpoint;
+    private readonly int _highestSupportedVersion = ProtocolVersioning.HighestSupportedVersion;
+    private readonly TestHostConnectionInfo _connectionInfo;
+    private readonly ITestRuntimeProvider? _runtimeProvider;
+
+    private ICommunicationChannel? _channel;
+    private EventHandler<MessageReceivedEventArgs>? _onMessageReceived;
+    private DisconnectedEventArgs? _disconnectedInfo;
+    private Action<DisconnectedEventArgs>? _onDisconnected;
+    // Set to 1 if Discovery/Execution is complete, i.e. complete handlers have been invoked
+    private int _operationCompleted;
+    private ITestMessageEventHandler? _messageEventHandler;
+    private string? _clientExitErrorMessage;
+    // Set default to 1, if protocol version check does not happen
+    // that implies host is using version 1.
+    private int _protocolVersion = 1;
+    private bool _isDiscoveryAborted;
 
     /// <summary>
-    /// Test request sender implementation.
+    /// Initializes a new instance of the <see cref="TestRequestSender"/> class.
     /// </summary>
-    public class TestRequestSender : ITestRequestSender
+    /// <param name="protocolConfig">Protocol configuration.</param>
+    /// <param name="runtimeProvider">The runtime provider.</param>
+    public TestRequestSender(ProtocolConfig protocolConfig, ITestRuntimeProvider runtimeProvider)
+        : this(
+            runtimeProvider,
+            communicationEndPoint: null,
+            runtimeProvider.GetTestHostConnectionInfo(),
+            JsonDataSerializer.Instance,
+            protocolConfig,
+            ClientProcessExitWaitTimeout)
     {
-        // Time to wait for test host exit
-        private const int ClientProcessExitWaitTimeout = 10 * 1000;
+    }
 
-        private readonly IDataSerializer dataSerializer;
+    internal TestRequestSender(
+        ITestRuntimeProvider? runtimeProvider,
+        ICommunicationEndPoint? communicationEndPoint,
+        TestHostConnectionInfo testhostConnectionInfo,
+        IDataSerializer serializer,
+        ProtocolConfig protocolConfig,
+        int clientExitedWaitTime)
+    {
+        _dataSerializer = serializer;
+        _connected = new ManualResetEventSlim(false);
+        _clientExited = new ManualResetEventSlim(false);
+        _clientExitedWaitTime = clientExitedWaitTime;
+        _operationCompleted = 0;
+
+        _highestSupportedVersion = protocolConfig.Version;
+
+
+        _runtimeProvider = runtimeProvider;
+
+        // TODO: In various places TestRequest sender is instantiated, and we can't easily inject the factory, so this is last
+        // resort of getting the dependency into the execution flow.
+        _communicationEndpoint = communicationEndPoint
+#if DEBUG
+            ?? TestServiceLocator.Get<ICommunicationEndPoint>(testhostConnectionInfo.Endpoint)
+#endif
+            ?? SetCommunicationEndPoint(testhostConnectionInfo);
+
+        // The connectionInfo here is what is provided to testhost, but we are in runner, and so the role needs
+        // to be reversed. If testhost starts as client, then runner must be host, and in reverse.
+        _connectionInfo.Endpoint = testhostConnectionInfo.Endpoint;
+        _connectionInfo.Role = testhostConnectionInfo.Role == ConnectionRole.Host
+            ? ConnectionRole.Client
+            : ConnectionRole.Host;
+    }
 
-        private readonly ManualResetEventSlim connected;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRequestSender"/> class.
+    /// Used only for testing to inject communication endpoint.
+    /// </summary>
+    /// <param name="communicationEndPoint">Communication server implementation.</param>
+    /// <param name="connectionInfo">ConnectionInfo to set up transport layer</param>
+    /// <param name="serializer">Serializer implementation.</param>
+    /// <param name="protocolConfig">Protocol configuration.</param>
+    /// <param name="clientExitedWaitTime">Time to wait for client process exit.</param>
+    internal TestRequestSender(
+        ICommunicationEndPoint communicationEndPoint,
+        TestHostConnectionInfo connectionInfo,
+        IDataSerializer serializer,
+        ProtocolConfig protocolConfig,
+        int clientExitedWaitTime)
+        : this(
+            runtimeProvider: null,
+            communicationEndPoint,
+            connectionInfo,
+            serializer,
+            protocolConfig,
+            clientExitedWaitTime)
+    {
+    }
 
-        private readonly ManualResetEventSlim clientExited;
+    public bool CloseConnectionOnOperationComplete { get; set; } = true;
 
-        private readonly int clientExitedWaitTime;
+    /// <inheritdoc />
+    public int InitializeCommunication()
+    {
+        EqtTrace.Verbose("TestRequestSender.InitializeCommunication: initialize communication. ");
 
-        private ICommunicationEndPoint communicationEndpoint;
+        // this.clientExitCancellationSource = new CancellationTokenSource();
+        _clientExitErrorMessage = string.Empty;
+        _communicationEndpoint.Connected += (sender, args) =>
+        {
+            _channel = args.Channel;
+            // TODO: I suspect that Channel can be null only because of some unit tests,
+            // and being connected and actually not setting any channel should be error
+            // rather than silently waiting for timeout
+            // TODO: also this event is called back on connected, why are the event args holding
+            // the Connected boolean and why do we check it here. If we did not connect we should
+            // have not fired this event.
+            if (args.Connected && _channel != null)
+            {
+                _connected.Set();
+            }
+        };
 
-        private ICommunicationChannel channel;
+        _communicationEndpoint.Disconnected += (sender, args) =>
+        {
+            // Store the disconnected info, so that any further DiscoverTests,
+            // RunTests methods can immediately bail.
+            _disconnectedInfo = args;
+
+            // If there's an disconnected event handler, call it
+            InvokeDisconnectedHandler(args);
+        };
+
+        // Server start returns the listener port
+        // return int.Parse(this.communicationServer.Start());
+        var endpoint = _communicationEndpoint.Start(_connectionInfo.Endpoint);
+        // TODO: This is forcing us to use IP address and port for communication
+        return endpoint.GetIpEndPoint().Port;
+    }
 
-        private EventHandler<MessageReceivedEventArgs> onMessageReceived;
 
-        private Action<DisconnectedEventArgs> onDisconnected;
+    private bool TrySetupMessageReceiver(
+        EventHandler<MessageReceivedEventArgs> onMessageReceived,
+        Action<DisconnectedEventArgs> onDisconnected)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
 
-        // Set to 1 if Discovery/Execution is complete, i.e. complete handlers have been invoked
-        private int operationCompleted;
+        // Note: Attempts to setup a message receiver.
+        // It's possible that the testhost was already disconnected and in that case we should
+        // immediately call the disconnected callback.
 
-        private ITestMessageEventHandler messageEventHandler;
+        // Design: The current method is needed because the request sender sets up
+        //         the disconnect handler late. If the first thing that is done by the class
+        //         is to setup the disconnect handler, then we'd only need to fire the handler
+        //         when the disconnect event fires.
 
-        private string clientExitErrorMessage;
+        _onDisconnected = onDisconnected;
 
-        // Set default to 1, if protocol version check does not happen
-        // that implies host is using version 1.
-        private int protocolVersion = 1;
+        // If the testhost was already disconnected, trigger the handler immediately.
+        if (_disconnectedInfo is DisconnectedEventArgs args)
+        {
+            InvokeDisconnectedHandler(args);
+            return false;
+        }
 
-        // Must be in sync with the highest supported version in
-        // src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs file.
-        private int highestSupportedVersion = 5;
+        _onMessageReceived = onMessageReceived;
+        _channel.MessageReceived.Subscribe(_onMessageReceived);
 
-        private TestHostConnectionInfo connectionInfo;
+        return true;
+    }
 
-        private ITestRuntimeProvider runtimeProvider;
+    private void InvokeDisconnectedHandler(DisconnectedEventArgs args)
+    {
+        // Note: If the endpoint is disconnected at the same time as the
+        //       disconnected handler is setup, it's possible for this method
+        //       to be invoked twice. Ensure that the handler ever gets invoked once.
+        var handler = Interlocked.Exchange(ref _onDisconnected, null);
+        handler?.Invoke(args);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRequestSender"/> class.
-        /// </summary>
-        /// <param name="protocolConfig">Protocol configuration.</param>
-        /// <param name="runtimeProvider">The runtime provider.</param>
-        public TestRequestSender(ProtocolConfig protocolConfig, ITestRuntimeProvider runtimeProvider)
-            : this(
-                  runtimeProvider,
-                  communicationEndPoint: null,
-                  runtimeProvider.GetTestHostConnectionInfo(),
-                  JsonDataSerializer.Instance,
-                  protocolConfig,
-                  ClientProcessExitWaitTimeout)
-        {
-            this.SetCommunicationEndPoint();
-        }
+    /// <inheritdoc />
+    public bool WaitForRequestHandlerConnection(int connectionTimeout, CancellationToken cancellationToken)
+    {
+        var sw = Stopwatch.StartNew();
+        EqtTrace.Verbose("TestRequestSender.WaitForRequestHandlerConnection: waiting for connection with timeout: {0}.", connectionTimeout);
 
-        internal TestRequestSender(
-            ITestRuntimeProvider runtimeProvider,
-            ICommunicationEndPoint communicationEndPoint,
-            TestHostConnectionInfo connectionInfo,
-            IDataSerializer serializer,
-            ProtocolConfig protocolConfig,
-            int clientExitedWaitTime)
-        {
-            this.dataSerializer = serializer;
-            this.connected = new ManualResetEventSlim(false);
-            this.clientExited = new ManualResetEventSlim(false);
-            this.clientExitedWaitTime = clientExitedWaitTime;
-            this.operationCompleted = 0;
-
-            this.highestSupportedVersion = protocolConfig.Version;
-
-            // The connectionInfo here is that of RuntimeProvider, so reverse the role of runner.
-            this.runtimeProvider = runtimeProvider;
-            this.communicationEndpoint = communicationEndPoint;
-            this.connectionInfo.Endpoint = connectionInfo.Endpoint;
-            this.connectionInfo.Role = connectionInfo.Role == ConnectionRole.Host
-                ? ConnectionRole.Client
-                : ConnectionRole.Host;
-        }
+        // Wait until either connection is successful, handled by connected.WaitHandle
+        // or operation is canceled, handled by cancellationToken.WaitHandle
+        // or testhost exits unexpectedly, handled by clientExited.WaitHandle
+        var waitIndex = WaitHandle.WaitAny([_connected.WaitHandle, cancellationToken.WaitHandle, _clientExited.WaitHandle], connectionTimeout);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRequestSender"/> class.
-        /// Used only for testing to inject communication endpoint.
-        /// </summary>
-        /// <param name="communicationEndPoint">Communication server implementation.</param>
-        /// <param name="connectionInfo">ConnectionInfo to set up transport layer</param>
-        /// <param name="serializer">Serializer implementation.</param>
-        /// <param name="protocolConfig">Protocol configuration.</param>
-        /// <param name="clientExitedWaitTime">Time to wait for client process exit.</param>
-        internal TestRequestSender(
-            ICommunicationEndPoint communicationEndPoint,
-            TestHostConnectionInfo connectionInfo,
-            IDataSerializer serializer,
-            ProtocolConfig protocolConfig,
-            int clientExitedWaitTime)
-            : this(
-                  runtimeProvider: null,
-                  communicationEndPoint,
-                  connectionInfo,
-                  serializer,
-                  protocolConfig,
-                  clientExitedWaitTime)
-        {
-        }
+        EqtTrace.Verbose("TestRequestSender.WaitForRequestHandlerConnection: waiting took {0} ms, with timeout {1} ms, and result {2}, which is {3}.", sw.ElapsedMilliseconds, connectionTimeout, waitIndex, waitIndex == 0 ? "success" : "failure");
 
-        public bool CloseConnectionOnOperationComplete { get; set; } = true;
+        // Return true if connection was successful.
+        return waitIndex == 0;
+    }
 
-        /// <inheritdoc />
-        public int InitializeCommunication()
-        {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.InitializeCommunication: initialize communication. ");
-            }
+    /// <inheritdoc />
+    public void CheckVersionWithTestHost()
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
 
-            // this.clientExitCancellationSource = new CancellationTokenSource();
-            this.clientExitErrorMessage = string.Empty;
-            this.communicationEndpoint.Connected += (sender, args) =>
-            {
-                this.channel = args.Channel;
-                if (args.Connected && this.channel != null)
-                {
-                    this.connected.Set();
-                }
-            };
-
-            this.communicationEndpoint.Disconnected += (sender, args) =>
-            {
-                // If there's an disconnected event handler, call it
-                this.onDisconnected?.Invoke(args);
-            };
-
-            // Server start returns the listener port
-            // return int.Parse(this.communicationServer.Start());
-            var endpoint = this.communicationEndpoint.Start(this.connectionInfo.Endpoint);
-            return endpoint.GetIPEndPoint().Port;
-        }
+        // Negotiation follows these steps:
+        // Runner sends highest supported version to Test host
+        // Test host compares the version with the highest version it can support.
+        // Test host sends back the lower number of the two. So the highest protocol version, that both sides support is used.
+        // Error case: test host can send a protocol error if it cannot find a supported version
+        var protocolNegotiated = new ManualResetEvent(false);
 
-        /// <inheritdoc />
-        public bool WaitForRequestHandlerConnection(int connectionTimeout, CancellationToken cancellationToken)
+        EventHandler<MessageReceivedEventArgs> onMessageReceived = (sender, args) =>
         {
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.WaitForRequestHandlerConnection: waiting for connection with timeout: {0}", connectionTimeout);
-            }
+            var message = _dataSerializer.DeserializeMessage(args.Data!);
 
-            // Wait until either connection is successful, handled by connected.WaitHandle
-            // or operation is canceled, handled by cancellationToken.WaitHandle
-            // or testhost exits unexpectedly, handled by clientExited.WaitHandle
-            var waitIndex = WaitHandle.WaitAny(new WaitHandle[] { this.connected.WaitHandle, cancellationToken.WaitHandle, this.clientExited.WaitHandle }, connectionTimeout);
+            EqtTrace.Verbose("TestRequestSender.CheckVersionWithTestHost: onMessageReceived received message: {0}", message);
 
-            // Return true if connection was successful.
-            return waitIndex == 0;
-        }
+            if (message.MessageType == MessageType.VersionCheck)
+            {
+                _protocolVersion = _dataSerializer.DeserializePayload<int>(message);
+            }
 
-        /// <inheritdoc />
-        public void CheckVersionWithTestHost()
-        {
-            // Negotiation follows these steps:
-            // Runner sends highest supported version to Test host
-            // Test host sends the version it can support (must be less than highest) to runner
-            // Error case: test host can send a protocol error if it cannot find a supported version
-            var protocolNegotiated = new ManualResetEvent(false);
-            this.onMessageReceived = (sender, args) =>
+            // TRH can also send TestMessage if tracing is enabled, so log it at runner end
+            else if (message.MessageType == MessageType.TestMessage)
             {
-                var message = this.dataSerializer.DeserializeMessage(args.Data);
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender.CheckVersionWithTestHost: onMessageReceived received message: {0}", message);
-                }
-
-                if (message.MessageType == MessageType.VersionCheck)
-                {
-                    this.protocolVersion = this.dataSerializer.DeserializePayload<int>(message);
-                }
-
-                // TRH can also send TestMessage if tracing is enabled, so log it at runner end
-                else if (message.MessageType == MessageType.TestMessage)
-                {
-                    // Ignore test messages. Currently we don't have handler(which sends messages to client/console.) here.
-                    // Above we are logging it to EqtTrace.
-                }
-                else if (message.MessageType == MessageType.ProtocolError)
-                {
-                    throw new TestPlatformException(string.Format(CultureInfo.CurrentUICulture, CommonResources.VersionCheckFailed));
-                }
-                else
-                {
-                    throw new TestPlatformException(string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommonResources.UnexpectedMessage,
-                        MessageType.VersionCheck,
-                        message.MessageType));
-                }
-
-                protocolNegotiated.Set();
-            };
-            this.channel.MessageReceived += this.onMessageReceived;
-
-            try
+                // Ignore test messages. Currently we don't have handler(which sends messages to client/console.) here.
+                // Above we are logging it to EqtTrace.
+            }
+            else if (message.MessageType == MessageType.ProtocolError)
             {
-                // Send the protocol negotiation request. Note that we always serialize this data
-                // without any versioning in the message itself.
-                var data = this.dataSerializer.SerializePayload(MessageType.VersionCheck, this.highestSupportedVersion);
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender.CheckVersionWithTestHost: Sending check version message: {0}", data);
-                }
-
-                this.channel.Send(data);
-
-                // Wait for negotiation response
-                var timeout = EnvironmentHelper.GetConnectionTimeout();
-                if (!protocolNegotiated.WaitOne(timeout * 1000))
-                {
-                    throw new TestPlatformException(string.Format(CultureInfo.CurrentUICulture, CommonResources.VersionCheckTimedout, timeout, EnvironmentHelper.VstestConnectionTimeout));
-                }
+                throw new TestPlatformException(CommonResources.VersionCheckFailed);
             }
-            finally
+            else
             {
-                this.channel.MessageReceived -= this.onMessageReceived;
-                this.onMessageReceived = null;
+                throw new TestPlatformException(string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommonResources.UnexpectedMessage,
+                    MessageType.VersionCheck,
+                    message.MessageType));
             }
-        }
 
-        #region Discovery Protocol
+            protocolNegotiated.Set();
+        };
+        _channel.MessageReceived.Subscribe(onMessageReceived);
 
-        /// <inheritdoc />
-        public void InitializeDiscovery(IEnumerable<string> pathToAdditionalExtensions)
+        try
         {
-            var message = this.dataSerializer.SerializePayload(
-                MessageType.DiscoveryInitialize,
-                pathToAdditionalExtensions,
-                this.protocolVersion);
+            // Send the protocol negotiation request. Note that we always serialize this data
+            // without any versioning in the message itself.
+            var data = _dataSerializer.SerializePayload(MessageType.VersionCheck, _highestSupportedVersion);
+
+            EqtTrace.Verbose("TestRequestSender.CheckVersionWithTestHost: Sending check version message: {0}", data);
+
+            _channel.Send(data);
 
-            if (EqtTrace.IsVerboseEnabled)
+            // Wait for negotiation response
+            var timeout = EnvironmentHelper.GetConnectionTimeout();
+            if (!protocolNegotiated.WaitOne(timeout * 1000))
             {
-                EqtTrace.Verbose("TestRequestSender.InitializeDiscovery: Sending initialize discovery with message: {0}", message);
+                throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, CommonResources.VersionCheckTimedout, timeout, EnvironmentHelper.VstestConnectionTimeout));
             }
-
-            this.channel.Send(message);
         }
-
-        /// <inheritdoc/>
-        public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+        finally
         {
-            this.messageEventHandler = discoveryEventsHandler;
-            this.onDisconnected = (disconnectedEventArgs) =>
-                {
-                    this.OnDiscoveryAbort(discoveryEventsHandler, disconnectedEventArgs.Error, true);
-                };
-            this.onMessageReceived = (sender, args) => this.OnDiscoveryMessageReceived(discoveryEventsHandler, args);
+            _channel.MessageReceived.Unsubscribe(onMessageReceived);
+        }
+    }
 
-            this.channel.MessageReceived += this.onMessageReceived;
-            var message = this.dataSerializer.SerializePayload(
-                MessageType.StartDiscovery,
-                discoveryCriteria,
-                this.protocolVersion);
+    #region Discovery Protocol
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.DiscoverTests: Sending discover tests with message: {0}", message);
-            }
+    /// <inheritdoc />
+    public void InitializeDiscovery(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
+        var message = _dataSerializer.SerializePayload(
+            MessageType.DiscoveryInitialize,
+            pathToAdditionalExtensions,
+            _protocolVersion);
 
-            this.channel.Send(message);
-        }
-        #endregion
+        EqtTrace.Verbose("TestRequestSender.InitializeDiscovery: Sending initialize discovery with message: {0}", message);
 
-        #region Execution Protocol
+        _channel.Send(message);
+    }
 
-        /// <inheritdoc />
-        public void InitializeExecution(IEnumerable<string> pathToAdditionalExtensions)
+    /// <inheritdoc/>
+    public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
+        _messageEventHandler = discoveryEventsHandler;
+        // When testhost disconnects, it normally means there was an error in the testhost and it exited unexpectedly.
+        // But when it was us who aborted the run and killed the testhost, we don't want to wait for it to report error, because there won't be any.
+        if (!TrySetupMessageReceiver(
+            onMessageReceived: (_, args) => OnDiscoveryMessageReceived(discoveryEventsHandler, args),
+            onDisconnected: disconnectedEventArgs => OnDiscoveryAbort(discoveryEventsHandler, disconnectedEventArgs.Error, getClientError: !_isDiscoveryAborted)))
         {
-            var message = this.dataSerializer.SerializePayload(
-                MessageType.ExecutionInitialize,
-                pathToAdditionalExtensions,
-                this.protocolVersion);
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.InitializeExecution: Sending initialize execution with message: {0}", message);
-            }
-
-            this.channel.Send(message);
+            return;
         }
 
-        /// <inheritdoc />
-        public void StartTestRun(TestRunCriteriaWithSources runCriteria, ITestRunEventsHandler eventHandler)
+        var message = _dataSerializer.SerializePayload(
+            MessageType.StartDiscovery,
+            discoveryCriteria,
+            _protocolVersion);
+
+        EqtTrace.Verbose("TestRequestSender.DiscoverTests: Sending discover tests with message: {0}", message);
+
+        _channel.Send(message);
+    }
+
+    /// <inheritdoc/>
+    public void SendDiscoveryAbort()
+    {
+        if (IsOperationComplete())
         {
-            this.messageEventHandler = eventHandler;
-            this.onDisconnected = (disconnectedEventArgs) =>
-            {
-                this.OnTestRunAbort(eventHandler, disconnectedEventArgs.Error, true);
-            };
-
-            this.onMessageReceived = (sender, args) => this.OnExecutionMessageReceived(sender, args, eventHandler);
-            this.channel.MessageReceived += this.onMessageReceived;
-
-            // This code section is needed because we altered the old testhost launch process for
-            // the debugging workflow. Now we don't ask VS to launch and attach to the testhost
-            // process for us as we previously did, instead we launch it as a standalone process
-            // and rely on the testhost to ask VS to attach the debugger to itself.
-            //
-            // In order to avoid breaking compatibility with previous testhost versions because of
-            // those changes (older testhosts won't know to request VS to attach to themselves
-            // thinking instead VS launched and attached to them already), we request VS to attach
-            // to the testhost here before starting the test run.
-            if (runCriteria.TestExecutionContext != null
-                && runCriteria.TestExecutionContext.IsDebug
-                && this.runtimeProvider is ITestRuntimeProvider2 convertedRuntimeProvider
-                && this.protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
-            {
-                var handler = (ITestRunEventsHandler2)eventHandler;
-                if (!convertedRuntimeProvider.AttachDebuggerToTestHost())
-                {
-                    EqtTrace.Warning(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CommonResources.AttachDebuggerToDefaultTestHostFailure));
-                }
-            }
+            EqtTrace.Verbose("TestRequestSender.SendDiscoveryAbort: Operation is already complete. Skip error message.");
+            return;
+        }
 
-            var message = this.dataSerializer.SerializePayload(
-                MessageType.StartTestExecutionWithSources,
-                runCriteria,
-                this.protocolVersion);
+        _isDiscoveryAborted = true;
+        EqtTrace.Verbose("TestRequestSender.SendDiscoveryAbort: Sending discovery abort.");
+        _channel?.Send(_dataSerializer.SerializeMessage(MessageType.CancelDiscovery));
+    }
+    #endregion
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.StartTestRun: Sending test run with message: {0}", message);
-            }
+    #region Execution Protocol
 
-            this.channel.Send(message);
+    /// <inheritdoc />
+    public void InitializeExecution(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
+        var message = _dataSerializer.SerializePayload(
+            MessageType.ExecutionInitialize,
+            pathToAdditionalExtensions,
+            _protocolVersion);
+
+        EqtTrace.Verbose("TestRequestSender.InitializeExecution: Sending initialize execution with message: {0}", message);
+
+        _channel.Send(message);
+    }
+
+    /// <inheritdoc />
+    public void StartTestRun(TestRunCriteriaWithSources runCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
+        _messageEventHandler = eventHandler;
+
+        if (!TrySetupMessageReceiver(
+            onMessageReceived: (_, args) => OnExecutionMessageReceived(args, eventHandler),
+            onDisconnected: disconnectedEventArgs => OnTestRunAbort(eventHandler, disconnectedEventArgs.Error, true)))
+        {
+            return;
         }
 
-        /// <inheritdoc />
-        public void StartTestRun(TestRunCriteriaWithTests runCriteria, ITestRunEventsHandler eventHandler)
+        // This code section is needed because we altered the old testhost launch process for
+        // the debugging workflow. Now we don't ask VS to launch and attach to the testhost
+        // process for us as we previously did, instead we launch it as a standalone process
+        // and rely on the testhost to ask VS to attach the debugger to itself.
+        //
+        // In order to avoid breaking compatibility with previous testhost versions because of
+        // those changes (older testhosts won't know to request VS to attach to themselves
+        // thinking instead VS launched and attached to them already), we request VS to attach
+        // to the testhost here before starting the test run.
+        if (runCriteria.TestExecutionContext != null
+            && runCriteria.TestExecutionContext.IsDebug
+            && _runtimeProvider is ITestRuntimeProvider2 convertedRuntimeProvider
+            && _protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
         {
-            this.messageEventHandler = eventHandler;
-            this.onDisconnected = (disconnectedEventArgs) =>
-            {
-                this.OnTestRunAbort(eventHandler, disconnectedEventArgs.Error, true);
-            };
-
-            this.onMessageReceived = (sender, args) => this.OnExecutionMessageReceived(sender, args, eventHandler);
-            this.channel.MessageReceived += this.onMessageReceived;
-
-            // This code section is needed because we altered the old testhost launch process for
-            // the debugging workflow. Now we don't ask VS to launch and attach to the testhost
-            // process for us as we previously did, instead we launch it as a standalone process
-            // and rely on the testhost to ask VS to attach the debugger to itself.
-            //
-            // In order to avoid breaking compatibility with previous testhost versions because of
-            // those changes (older testhosts won't know to request VS to attach to themselves
-            // thinking instead VS launched and attached to them already), we request VS to attach
-            // to the testhost here before starting the test run.
-            if (runCriteria.TestExecutionContext != null
-                && runCriteria.TestExecutionContext.IsDebug
-                && this.runtimeProvider is ITestRuntimeProvider2 convertedRuntimeProvider
-                && this.protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
+            if (!convertedRuntimeProvider.AttachDebuggerToTestHost())
             {
-                var handler = (ITestRunEventsHandler2)eventHandler;
-                if (!convertedRuntimeProvider.AttachDebuggerToTestHost())
-                {
-                    EqtTrace.Warning(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CommonResources.AttachDebuggerToDefaultTestHostFailure));
-                }
+                EqtTrace.Warning(CommonResources.AttachDebuggerToDefaultTestHostFailure);
             }
+        }
 
-            var message = this.dataSerializer.SerializePayload(
-                MessageType.StartTestExecutionWithTests,
-                runCriteria,
-                this.protocolVersion);
+        var message = _dataSerializer.SerializePayload(
+            MessageType.StartTestExecutionWithSources,
+            runCriteria,
+            _protocolVersion);
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.StartTestRun: Sending test run with message: {0}", message);
-            }
+        EqtTrace.Verbose("TestRequestSender.StartTestRun: Sending test run with message: {0}", message);
+
+        _channel.Send(message);
+    }
 
-            this.channel.Send(message);
+    /// <inheritdoc />
+    public void StartTestRun(TestRunCriteriaWithTests runCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        TPDebug.Assert(_channel is not null, "_channel is null");
+        _messageEventHandler = eventHandler;
+
+        if (!TrySetupMessageReceiver(
+            onMessageReceived: (_, args) => OnExecutionMessageReceived(args, eventHandler),
+            onDisconnected: disconnectedEventArgs => OnTestRunAbort(eventHandler, disconnectedEventArgs.Error, true)))
+        {
+            return;
         }
 
-        /// <inheritdoc />
-        public void SendTestRunCancel()
+        // This code section is needed because we altered the old testhost launch process for
+        // the debugging workflow. Now we don't ask VS to launch and attach to the testhost
+        // process for us as we previously did, instead we launch it as a standalone process
+        // and rely on the testhost to ask VS to attach the debugger to itself.
+        //
+        // In order to avoid breaking compatibility with previous testhost versions because of
+        // those changes (older testhosts won't know to request VS to attach to themselves
+        // thinking instead VS launched and attached to them already), we request VS to attach
+        // to the testhost here before starting the test run.
+        if (runCriteria.TestExecutionContext != null
+            && runCriteria.TestExecutionContext.IsDebug
+            && _runtimeProvider is ITestRuntimeProvider2 convertedRuntimeProvider
+            && _protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
         {
-            if (this.IsOperationComplete())
+            if (!convertedRuntimeProvider.AttachDebuggerToTestHost())
             {
-                EqtTrace.Verbose("TestRequestSender: SendTestRunCancel: Operation is already complete. Skip error message.");
-                return;
+                EqtTrace.Warning(CommonResources.AttachDebuggerToDefaultTestHostFailure);
             }
+        }
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.SendTestRunCancel: Sending test run cancel.");
-            }
+        var message = _dataSerializer.SerializePayload(
+            MessageType.StartTestExecutionWithTests,
+            runCriteria,
+            _protocolVersion);
 
-            this.channel?.Send(this.dataSerializer.SerializeMessage(MessageType.CancelTestRun));
-        }
+        EqtTrace.Verbose("TestRequestSender.StartTestRun: Sending test run with message: {0}", message);
+
+        _channel.Send(message);
+    }
 
-        /// <inheritdoc />
-        public void SendTestRunAbort()
+    /// <inheritdoc />
+    public void SendTestRunCancel()
+    {
+        if (IsOperationComplete())
         {
-            if (this.IsOperationComplete())
-            {
-                EqtTrace.Verbose("TestRequestSender: SendTestRunAbort: Operation is already complete. Skip error message.");
-                return;
-            }
+            EqtTrace.Verbose("TestRequestSender: SendTestRunCancel: Operation is already complete. Skip error message.");
+            return;
+        }
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.SendTestRunAbort: Sending test run abort.");
-            }
+        EqtTrace.Verbose("TestRequestSender.SendTestRunCancel: Sending test run cancel.");
+
+        _channel?.Send(_dataSerializer.SerializeMessage(MessageType.CancelTestRun));
+    }
 
-            this.channel?.Send(this.dataSerializer.SerializeMessage(MessageType.AbortTestRun));
+    /// <inheritdoc />
+    public void SendTestRunAbort()
+    {
+        if (IsOperationComplete())
+        {
+            EqtTrace.Verbose("TestRequestSender: SendTestRunAbort: Operation is already complete. Skip error message.");
+            return;
         }
 
-        #endregion
+        EqtTrace.Verbose("TestRequestSender.SendTestRunAbort: Sending test run abort.");
 
-        /// <inheritdoc />
-        public void EndSession()
+        _channel?.Send(_dataSerializer.SerializeMessage(MessageType.AbortTestRun));
+    }
+
+    #endregion
+
+    /// <inheritdoc />
+    public void EndSession()
+    {
+        if (!IsOperationComplete())
         {
-            if (!this.IsOperationComplete())
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender.EndSession: Sending end session.");
-                }
+            EqtTrace.Verbose("TestRequestSender.EndSession: Sending end session.");
 
-                this.channel?.Send(this.dataSerializer.SerializeMessage(MessageType.SessionEnd));
-            }
+            _channel?.Send(_dataSerializer.SerializeMessage(MessageType.SessionEnd));
         }
+    }
 
-        /// <inheritdoc />
-        public void OnClientProcessExit(string stdError)
-        {
-            // This method is called on test host exit. If test host has any errors, stdError
-            // provides the crash call stack.
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"TestRequestSender.OnClientProcessExit: Test host process exited. Standard error: {stdError}");
-            }
+    /// <inheritdoc />
+    public void OnClientProcessExit(string stdError)
+    {
+        // This method is called on test host exit. If test host has any errors, stdError
+        // provides the crash call stack.
+        EqtTrace.Info($"TestRequestSender.OnClientProcessExit: Test host process exited. Standard error: {stdError}");
 
-            this.clientExitErrorMessage = stdError;
-            this.clientExited.Set();
+        _clientExitErrorMessage = stdError;
+        _clientExited.Set();
 
-            // Break communication loop. In some cases (E.g: When tests creates child processes to testhost) communication channel won't break if testhost exits.
-            this.communicationEndpoint.Stop();
-        }
+        // Break communication loop. In some cases (E.g: When tests creates child processes to testhost) communication channel won't break if testhost exits.
+        _communicationEndpoint.Stop();
+    }
+
+    /// <inheritdoc />
+    public void Close()
+    {
+        Dispose();
+        EqtTrace.Info("Closing the connection");
+    }
 
-        /// <inheritdoc />
-        public void Close()
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_channel != null && _onMessageReceived != null)
         {
-            this.Dispose();
-            EqtTrace.Info("Closing the connection");
+            _channel.MessageReceived.Unsubscribe(_onMessageReceived);
         }
 
-        /// <inheritdoc />
-        public void Dispose()
+        _communicationEndpoint.Stop();
+        GC.SuppressFinalize(this);
+    }
+
+    private void OnExecutionMessageReceived(MessageReceivedEventArgs messageReceived, IInternalTestRunEventsHandler testRunEventsHandler)
+    {
+        try
         {
-            if (this.channel != null)
-            {
-                this.channel.MessageReceived -= this.onMessageReceived;
-            }
+            var rawMessage = messageReceived.Data;
+            EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Received message: {0}", rawMessage);
+            TPDebug.Assert(rawMessage is not null, "rawMessage is null");
+            TPDebug.Assert(_channel is not null, "_channel is null");
 
-            this.communicationEndpoint.Stop();
-            GC.SuppressFinalize(this);
-        }
+            // Send raw message first to unblock handlers waiting to send message to IDEs
+            testRunEventsHandler.HandleRawMessage(rawMessage);
 
-        private void OnExecutionMessageReceived(object sender, MessageReceivedEventArgs messageReceived, ITestRunEventsHandler testRunEventsHandler)
-        {
-            try
-            {
-                var rawMessage = messageReceived.Data;
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Received message: {0}", rawMessage);
-                }
-
-                // Send raw message first to unblock handlers waiting to send message to IDEs
-                testRunEventsHandler.HandleRawMessage(rawMessage);
-
-                var message = this.dataSerializer.DeserializeMessage(rawMessage);
-                switch (message.MessageType)
-                {
-                    case MessageType.TestRunStatsChange:
-                        var testRunChangedArgs = this.dataSerializer.DeserializePayload<TestRunChangedEventArgs>(message);
-                        testRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
-                        break;
-                    case MessageType.ExecutionComplete:
-                        var testRunCompletePayload = this.dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
-
-                        testRunEventsHandler.HandleTestRunComplete(
-                            testRunCompletePayload.TestRunCompleteArgs,
-                            testRunCompletePayload.LastRunTests,
-                            testRunCompletePayload.RunAttachments,
-                            testRunCompletePayload.ExecutorUris);
-
-                        this.SetOperationComplete();
-                        break;
-                    case MessageType.TestMessage:
-                        var testMessagePayload = this.dataSerializer.DeserializePayload<TestMessagePayload>(message);
-                        testRunEventsHandler.HandleLogMessage(testMessagePayload.MessageLevel, testMessagePayload.Message);
-                        break;
-                    case MessageType.LaunchAdapterProcessWithDebuggerAttached:
-                        var testProcessStartInfo = this.dataSerializer.DeserializePayload<TestProcessStartInfo>(message);
-                        int processId = testRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
-
-                        var data =
-                            this.dataSerializer.SerializePayload(
-                                MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback,
-                                processId,
-                                this.protocolVersion);
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Sending LaunchAdapterProcessWithDebuggerAttachedCallback message: {0}", data);
-                        }
-
-                        this.channel.Send(data);
-                        break;
-
-                    case MessageType.AttachDebugger:
-                        var testProcessPid = this.dataSerializer.DeserializePayload<TestProcessAttachDebuggerPayload>(message);
-                        bool result = ((ITestRunEventsHandler2)testRunEventsHandler).AttachDebuggerToProcess(testProcessPid.ProcessID);
-
-                        var resultMessage = this.dataSerializer.SerializePayload(
-                            MessageType.AttachDebuggerCallback,
-                            result,
-                            this.protocolVersion);
-
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Sending AttachDebugger with message: {0}", message);
-                        }
-
-                        this.channel.Send(resultMessage);
-
-                        break;
-                }
-            }
-            catch (Exception exception)
-            {
-                this.OnTestRunAbort(testRunEventsHandler, exception, false);
+            // PERF: DeserializeMessage happens in HandleRawMessage above, as well as here. But with fastJson path where we just grab the routing info from
+            // the raw string, it is not a big issue, it adds a handful of ms at worst. The payload does not get deserialized twice.
+            var message = _dataSerializer.DeserializeMessage(rawMessage);
+            switch (message.MessageType)
+            {
+                case MessageType.TestRunStatsChange:
+                    var testRunChangedArgs = _dataSerializer.DeserializePayload<TestRunChangedEventArgs>(message);
+                    testRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
+                    break;
+                case MessageType.ExecutionComplete:
+                    var testRunCompletePayload = _dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
+                    TPDebug.Assert(testRunCompletePayload is not null, "testRunCompletePayload is null");
+
+                    testRunEventsHandler.HandleTestRunComplete(
+                        testRunCompletePayload.TestRunCompleteArgs!,
+                        testRunCompletePayload.LastRunTests,
+                        testRunCompletePayload.RunAttachments,
+                        testRunCompletePayload.ExecutorUris);
+
+                    SetOperationComplete();
+                    break;
+                case MessageType.TestMessage:
+                    var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    testRunEventsHandler.HandleLogMessage(testMessagePayload.MessageLevel, testMessagePayload.Message);
+                    break;
+                case MessageType.LaunchAdapterProcessWithDebuggerAttached:
+                    var testProcessStartInfo = _dataSerializer.DeserializePayload<TestProcessStartInfo>(message);
+                    int processId = testRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo!);
+
+                    var data =
+                        _dataSerializer.SerializePayload(
+                            MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback,
+                            processId,
+                            _protocolVersion);
+                    EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Sending LaunchAdapterProcessWithDebuggerAttachedCallback message: {0}", data);
+
+                    _channel.Send(data);
+                    break;
+
+                case MessageType.AttachDebugger:
+                    var testProcessAttachDebuggerPayload = _dataSerializer.DeserializePayload<TestProcessAttachDebuggerPayload>(message);
+                    TPDebug.Assert(testProcessAttachDebuggerPayload is not null, "testProcessAttachDebuggerPayload is null");
+                    AttachDebuggerInfo attachDebugerInfo = MessageConverter.ConvertToAttachDebuggerInfo(testProcessAttachDebuggerPayload, message, _protocolVersion);
+                    bool result = testRunEventsHandler.AttachDebuggerToProcess(attachDebugerInfo);
+
+                    var resultMessage = _dataSerializer.SerializePayload(
+                        MessageType.AttachDebuggerCallback,
+                        result,
+                        _protocolVersion);
+
+                    EqtTrace.Verbose("TestRequestSender.OnExecutionMessageReceived: Sending AttachDebugger with message: {0}", message);
+
+                    _channel.Send(resultMessage);
+
+                    break;
             }
         }
+        catch (Exception exception)
+        {
+            // If we failed to process the incoming message, initiate client (testhost) abort, because we can't recover, and don't wait
+            // for it to exit and write into error stream, because it did not do anything wrong, so no error is coming there
+            OnTestRunAbort(testRunEventsHandler, exception, getClientError: false);
+        }
+    }
 
-        private void OnDiscoveryMessageReceived(ITestDiscoveryEventsHandler2 discoveryEventsHandler, MessageReceivedEventArgs args)
+    private void OnDiscoveryMessageReceived(ITestDiscoveryEventsHandler2 discoveryEventsHandler, MessageReceivedEventArgs args)
+    {
+        try
         {
-            try
+            var rawMessage = args.Data;
+            TPDebug.Assert(rawMessage is not null, "rawMessage is null");
+
+            // Currently each of the operations are not separate tasks since they should not each take much time. This is just a notification.
+            EqtTrace.Verbose("TestRequestSender.OnDiscoveryMessageReceived: Received message: {0}", rawMessage);
+
+            // Send raw message first to unblock handlers waiting to send message to IDEs
+            discoveryEventsHandler.HandleRawMessage(rawMessage);
+
+            var data = _dataSerializer.DeserializeMessage(rawMessage);
+            if (data is null)
             {
-                var rawMessage = args.Data;
-
-                // Currently each of the operations are not separate tasks since they should not each take much time. This is just a notification.
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender.OnDiscoveryMessageReceived: Received message: {0}", rawMessage);
-                }
-
-                // Send raw message first to unblock handlers waiting to send message to IDEs
-                discoveryEventsHandler.HandleRawMessage(rawMessage);
-
-                var data = this.dataSerializer.DeserializeMessage(rawMessage);
-                switch (data.MessageType)
-                {
-                    case MessageType.TestCasesFound:
-                        var testCases = this.dataSerializer.DeserializePayload<IEnumerable<TestCase>>(data);
-                        discoveryEventsHandler.HandleDiscoveredTests(testCases);
-                        break;
-                    case MessageType.DiscoveryComplete:
-                        var discoveryCompletePayload =
-                            this.dataSerializer.DeserializePayload<DiscoveryCompletePayload>(data);
-                        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(discoveryCompletePayload.TotalTests, discoveryCompletePayload.IsAborted);
-                        discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
-                        discoveryEventsHandler.HandleDiscoveryComplete(
-                            discoveryCompleteEventArgs,
-                            discoveryCompletePayload.LastDiscoveredTests);
-                        this.SetOperationComplete();
-                        break;
-                    case MessageType.TestMessage:
-                        var testMessagePayload = this.dataSerializer.DeserializePayload<TestMessagePayload>(
-                            data);
-                        discoveryEventsHandler.HandleLogMessage(
-                            testMessagePayload.MessageLevel,
-                            testMessagePayload.Message);
-                        break;
-                }
+                EqtTrace.Error("TestRequestSender.OnDiscoveryMessageReceived: Deserialized message is null: {0}", rawMessage);
+                OnDiscoveryAbort(discoveryEventsHandler, null, false);
+                return;
             }
-            catch (Exception ex)
+
+            switch (data.MessageType)
             {
-                this.OnDiscoveryAbort(discoveryEventsHandler, ex, false);
+                case MessageType.TestCasesFound:
+                    var testCases = _dataSerializer.DeserializePayload<IEnumerable<TestCase>>(data);
+                    discoveryEventsHandler.HandleDiscoveredTests(testCases);
+                    break;
+                case MessageType.DiscoveryComplete:
+                    var payload = _dataSerializer.DeserializePayload<DiscoveryCompletePayload>(data);
+                    TPDebug.Assert(payload is not null, "payload is null");
+                    var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs
+                    {
+                        TotalCount = payload.TotalTests,
+                        IsAborted = payload.IsAborted,
+                        FullyDiscoveredSources = payload.FullyDiscoveredSources,
+                        PartiallyDiscoveredSources = payload.PartiallyDiscoveredSources,
+                        NotDiscoveredSources = payload.NotDiscoveredSources,
+                        DiscoveredExtensions = payload.DiscoveredExtensions,
+                        SkippedDiscoveredSources = payload.SkippedDiscoverySources,
+                    };
+
+                    discoveryCompleteEventArgs.Metrics = payload.Metrics;
+                    discoveryEventsHandler.HandleDiscoveryComplete(
+                        discoveryCompleteEventArgs,
+                        payload.LastDiscoveredTests);
+                    SetOperationComplete();
+                    break;
+                case MessageType.TestMessage:
+                    var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(
+                        data);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    discoveryEventsHandler.HandleLogMessage(
+                        testMessagePayload.MessageLevel,
+                        testMessagePayload.Message);
+                    break;
             }
         }
+        catch (Exception ex)
+        {
+            OnDiscoveryAbort(discoveryEventsHandler, ex, false);
+        }
+    }
 
-        private void OnTestRunAbort(ITestRunEventsHandler testRunEventsHandler, Exception exception, bool getClientError)
+    private void OnTestRunAbort(IInternalTestRunEventsHandler testRunEventsHandler, Exception? exception, bool getClientError)
+    {
+        if (IsOperationComplete())
         {
-            if (this.IsOperationComplete())
-            {
-                EqtTrace.Verbose("TestRequestSender: OnTestRunAbort: Operation is already complete. Skip error message.");
-                return;
-            }
+            EqtTrace.Verbose("TestRequestSender: OnTestRunAbort: Operation is already complete. Skip error message.");
+            return;
+        }
 
-            EqtTrace.Verbose("TestRequestSender: OnTestRunAbort: Set operation complete.");
-            this.SetOperationComplete();
+        EqtTrace.Verbose("TestRequestSender: OnTestRunAbort: Set operation complete.");
+        SetOperationComplete();
 
-            var reason = this.GetAbortErrorMessage(exception, getClientError);
-            EqtTrace.Error("TestRequestSender: Aborting test run because {0}", reason);
-            this.LogErrorMessage(string.Format(CommonResources.AbortedTestRun, reason));
+        var reason = GetAbortErrorMessage(exception, getClientError);
+        EqtTrace.Error("TestRequestSender: Aborting test run because {0}", reason);
+        LogErrorMessage(string.Format(CultureInfo.CurrentCulture, CommonResources.AbortedTestRun, reason));
 
-            // notify test run abort to vstest console wrapper.
-            var completeArgs = new TestRunCompleteEventArgs(null, false, true, exception, null, TimeSpan.Zero);
-            var payload = new TestRunCompletePayload { TestRunCompleteArgs = completeArgs };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.ExecutionComplete, payload);
-            testRunEventsHandler.HandleRawMessage(rawMessage);
+        // notify test run abort to vstest console wrapper.
+        var completeArgs = new TestRunCompleteEventArgs(null, false, true, exception, null, null, TimeSpan.Zero);
+        var payload = new TestRunCompletePayload { TestRunCompleteArgs = completeArgs };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.ExecutionComplete, payload);
+        testRunEventsHandler.HandleRawMessage(rawMessage);
 
-            // notify of a test run complete and bail out.
-            testRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
-        }
+        // notify of a test run complete and bail out.
+        testRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
+    }
 
-        private void OnDiscoveryAbort(ITestDiscoveryEventsHandler2 eventHandler, Exception exception, bool getClientError)
+    private void OnDiscoveryAbort(ITestDiscoveryEventsHandler2 eventHandler, Exception? exception, bool getClientError)
+    {
+        if (IsOperationComplete())
         {
-            if (this.IsOperationComplete())
-            {
-                EqtTrace.Verbose("TestRequestSender: OnDiscoveryAbort: Operation is already complete. Skip error message.");
-                return;
-            }
-
-            EqtTrace.Verbose("TestRequestSender: OnDiscoveryAbort: Set operation complete.");
-            this.SetOperationComplete();
+            EqtTrace.Verbose("TestRequestSender.OnDiscoveryAbort: Operation is already complete. Skip error message.");
+            return;
+        }
 
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true);
-            var reason = this.GetAbortErrorMessage(exception, getClientError);
-            EqtTrace.Error("TestRequestSender: Aborting test discovery because {0}", reason);
-            this.LogErrorMessage(string.Format(CommonResources.AbortedTestDiscovery, reason));
+        EqtTrace.Verbose("TestRequestSender.OnDiscoveryAbort: Set operation complete.");
+        SetOperationComplete();
 
-            // Notify discovery abort to IDE test output
-            var payload = new DiscoveryCompletePayload()
-            {
-                IsAborted = true,
-                LastDiscoveredTests = null,
-                TotalTests = -1
-            };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.DiscoveryComplete, payload);
-            eventHandler.HandleRawMessage(rawMessage);
-
-            // Complete discovery
-            eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true);
+        if (GetAbortErrorMessage(exception, getClientError) is string reason)
+        {
+            EqtTrace.Error("TestRequestSender.OnDiscoveryAbort: Aborting test discovery because {0}.", reason);
+            LogErrorMessage(string.Format(CultureInfo.CurrentCulture, CommonResources.AbortedTestDiscoveryWithReason, reason));
+        }
+        else
+        {
+            EqtTrace.Error("TestRequestSender.OnDiscoveryAbort: Aborting test discovery.");
+            LogErrorMessage(CommonResources.AbortedTestDiscovery);
         }
 
-        private string GetAbortErrorMessage(Exception exception, bool getClientError)
+        // Notify discovery abort to IDE test output
+        var payload = new DiscoveryCompletePayload()
         {
-            EqtTrace.Verbose("TestRequestSender: GetAbortErrorMessage: Exception: " + exception);
+            IsAborted = true,
+            LastDiscoveredTests = null,
+            TotalTests = -1
+        };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.DiscoveryComplete, payload);
+        eventHandler.HandleRawMessage(rawMessage);
+
+        // Complete discovery
+        eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
+    }
 
-            // It is also possible for an operation to abort even if client has not
-            // disconnected, e.g. if there's an error parsing the response from test host. We
-            // want the exception to be available in those scenarios.
-            var reason = exception?.Message;
-            if (getClientError)
+    private string? GetAbortErrorMessage(Exception? exception, bool getClientError)
+    {
+        EqtTrace.Verbose("TestRequestSender.GetAbortErrorMessage: Exception: " + exception);
+
+        // It is also possible for an operation to abort even if client has not
+        // disconnected, because we initiate client abort when there is error in processing incoming messages.
+        // in this case, we will use the exception as the failure result, if it is present. Otherwise we will
+        // try to wait for the client process to exit, and capture it's error output (we are listening to it's standard and
+        // error output in the ClientExited callback).
+        if (!getClientError)
+        {
+            return exception?.Message;
+        }
+
+        EqtTrace.Verbose("TestRequestSender.GetAbortErrorMessage: Client has disconnected. Wait for standard error.");
+
+        // Wait for test host to exit for a moment
+        // TODO: this timeout is 10 seconds, make it also configurable like the other famous timeout that is 100ms
+        if (_clientExited.Wait(_clientExitedWaitTime))
+        {
+            // Set a default message of test host process exited and additionally specify the error if we were able to get it
+            // from error output of the process
+            EqtTrace.Info("TestRequestSender.GetAbortErrorMessage: Received test host error message.");
+            var reason = CommonResources.TestHostProcessCrashed;
+            if (!string.IsNullOrWhiteSpace(_clientExitErrorMessage))
             {
-                EqtTrace.Verbose("TestRequestSender: GetAbortErrorMessage: Client has disconnected. Wait for standard error.");
-
-                // Wait for test host to exit for a moment
-                if (this.clientExited.Wait(this.clientExitedWaitTime))
-                {
-                    // Set a default message of test host process exited and additionally specify the error if present
-                    EqtTrace.Info("TestRequestSender: GetAbortErrorMessage: Received test host error message.");
-                    reason = CommonResources.TestHostProcessCrashed;
-                    if (!string.IsNullOrWhiteSpace(this.clientExitErrorMessage))
-                    {
-                        reason = $"{reason} : {this.clientExitErrorMessage}";
-                    }
-                }
-                else
-                {
-                    reason = CommonResources.UnableToCommunicateToTestHost;
-                    EqtTrace.Info("TestRequestSender: GetAbortErrorMessage: Timed out waiting for test host error message.");
-                }
+                reason = $"{reason} : {_clientExitErrorMessage}";
             }
 
             return reason;
         }
+        else
+        {
+            EqtTrace.Info("TestRequestSender.GetAbortErrorMessage: Timed out waiting for test host error message.");
+            return CommonResources.UnableToCommunicateToTestHost;
+        }
+    }
 
-        private void LogErrorMessage(string message)
+    private void LogErrorMessage(string message)
+    {
+        if (_messageEventHandler == null)
         {
-            if (this.messageEventHandler == null)
-            {
-                EqtTrace.Error("TestRequestSender.LogErrorMessage: Message event handler not set. Error: " + message);
-                return;
-            }
+            EqtTrace.Error("TestRequestSender.LogErrorMessage: Message event handler not set. Error: " + message);
+            return;
+        }
 
-            // Log to vstest console
-            this.messageEventHandler.HandleLogMessage(TestMessageLevel.Error, message);
+        // Log to vstest console
+        _messageEventHandler.HandleLogMessage(TestMessageLevel.Error, message);
 
-            // Log to vs ide test output
-            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = message };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
-            this.messageEventHandler.HandleRawMessage(rawMessage);
-        }
+        // Log to vs ide test output
+        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = message };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
+        _messageEventHandler.HandleRawMessage(rawMessage);
+    }
 
-        private bool IsOperationComplete()
+    private bool IsOperationComplete()
+    {
+        return _operationCompleted == 1;
+    }
+
+    private void SetOperationComplete()
+    {
+        // When sharing the testhost between discovery and execution we must keep the
+        // testhost alive after completing the operation it was spawned for. As such we
+        // suppress the test request sender channel close taking place here. This channel
+        // will be closed when the test session owner decides to dispose of the test session
+        // object.
+        if (!CloseConnectionOnOperationComplete)
         {
-            return this.operationCompleted == 1;
+            return;
         }
 
-        private void SetOperationComplete()
-        {
-            // When sharing the testhost between discovery and execution we must keep the
-            // testhost alive after completing the operation it was spawned for. As such we
-            // suppress the test request sender channel close taking place here. This channel
-            // will be closed when the test session owner decides to dispose of the test session
-            // object.
-            if (!this.CloseConnectionOnOperationComplete)
-            {
-                return;
-            }
+        // Complete the currently ongoing operation (Discovery/Execution)
+        EqtTrace.Verbose("TestRequestSender.SetOperationComplete: Setting operation complete.");
 
-            // Complete the currently ongoing operation (Discovery/Execution)
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("TestRequestSender.SetOperationComplete: Setting operation complete.");
-            }
+        _communicationEndpoint.Stop();
+        Interlocked.CompareExchange(ref _operationCompleted, 1, 0);
+    }
 
-            this.communicationEndpoint.Stop();
-            Interlocked.CompareExchange(ref this.operationCompleted, 1, 0);
+    private static ICommunicationEndPoint SetCommunicationEndPoint(TestHostConnectionInfo testhostConnectionInfo)
+    {
+        // TODO: Use factory to get the communication endpoint. It will abstract out the type of communication endpoint like socket, shared memory or named pipe etc.,
+        // The connectionInfo here is what is provided to testhost, but we are in runner, and so the role needs
+        // to be reversed. If testhost starts as client, then runner must be host, and in reverse.
+        if (testhostConnectionInfo.Role != ConnectionRole.Client)
+        {
+            EqtTrace.Verbose("TestRequestSender is acting as client.");
+            return new SocketClient();
         }
-
-        private void SetCommunicationEndPoint()
+        else
         {
-            // TODO: Use factory to get the communication endpoint. It will abstract out the type of communication endpoint like socket, shared memory or named pipe etc.,
-            if (this.connectionInfo.Role == ConnectionRole.Client)
-            {
-                this.communicationEndpoint = new SocketClient();
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender is acting as client");
-                }
-            }
-            else
-            {
-                this.communicationEndpoint = new SocketServer();
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TestRequestSender is acting as server");
-                }
-            }
+            EqtTrace.Verbose("TestRequestSender is acting as server.");
+            return new SocketServer();
         }
     }
 }
+
+internal class MessageConverter
+{
+#pragma warning disable IDE0060 // Remove unused parameter // TODO: Use or remove this parameter and the associated method
+    internal static AttachDebuggerInfo ConvertToAttachDebuggerInfo(TestProcessAttachDebuggerPayload attachDebuggerPayload, Message message, int protocolVersion)
+#pragma warning restore IDE0060 // Remove unused parameter
+    {
+        // There is nothing to do differently based on those versions.
+        //var sourceVersion = GetVersion(message);
+        //var targetVersion = protocolVersion;
+
+        return new AttachDebuggerInfo
+        {
+            ProcessId = attachDebuggerPayload.ProcessID,
+            TargetFramework = attachDebuggerPayload?.TargetFramework,
+        };
+    }
+
+    //private static int GetVersion(Message message)
+    //{
+    //    return (message as VersionedMessage)?.Version ?? 0;
+    //}
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Constants.cs b/src/Microsoft.TestPlatform.CoreUtilities/Constants.cs
index 31bb8f635b..83f51aca7f 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Constants.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Constants.cs
@@ -1,42 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+/// <summary>
+/// The set of constants required for across various(Communication, CrossPlatform, etc.) modules.
+/// </summary>
+public class Constants
 {
     /// <summary>
-    /// The set of constants required for across various(Communication, CrossPlatform, etc.) modules.
+    ///  Vstest.console process name, without file extension(.exe/.dll)
     /// </summary>
-    public class Constants
-    {
-        /// <summary>
-        ///  Vstest.console process name, without file extension(.exe/.dll)
-        /// </summary>
-        public const string VstestConsoleProcessName = "vstest.console";
+    public const string VstestConsoleProcessName = "vstest.console";
 
-        /// <summary>
-        /// Testhost process name, without file extension(.exe/.dll) and architecture type(x86).
-        /// </summary>
-        public const string TesthostProcessName = "testhost";
+    /// <summary>
+    /// Testhost process name, without file extension(.exe/.dll) and architecture type(x86).
+    /// </summary>
+    public const string TesthostProcessName = "testhost";
 
-        /// <summary>
-        /// Datacollector process name, without file extension(.exe/.dll)
-        /// </summary>
-        public const string DatacollectorProcessName = "datacollector";
+    /// <summary>
+    /// Datacollector process name, without file extension(.exe/.dll)
+    /// </summary>
+    public const string DatacollectorProcessName = "datacollector";
 
-        /// <summary>
-        /// Number of character should be logged on child process exited with
-        /// error message on standard error.
-        /// </summary>
-        public const int StandardErrorMaxLength = 8192; // 8 KB
+    /// <summary>
+    /// Number of character should be logged on child process exited with
+    /// error message on standard error.
+    /// </summary>
+    public const int StandardErrorMaxLength = 8192; // 8 KB
 
-        /// <summary>
-        /// Environment Variable Specified by user to setup Culture.
-        /// </summary>
-        public const string DotNetUserSpecifiedCulture = "DOTNET_CLI_UI_LANGUAGE";
+    /// <summary>
+    /// Environment Variable Specified by user to setup Culture.
+    /// </summary>
+    public const string DotNetUserSpecifiedCulture = "DOTNET_CLI_UI_LANGUAGE";
 
-        /// <summary>
-        /// Test sources key name
-        /// </summary>
-        public const string TestSourcesKeyName = "TestSources";
-    }
+    /// <summary>
+    /// Test sources key name
+    /// </summary>
+    public const string TestSourcesKeyName = "TestSources";
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/GuidPolyfill.cs b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/GuidPolyfill.cs
new file mode 100644
index 0000000000..fa2fc3690e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/GuidPolyfill.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace System;
+/// <summary>
+/// A polyfill helper for Guid.
+/// </summary>
+internal static class GuidPolyfill
+{
+    public static Guid Parse(string s, IFormatProvider? provider)
+        => Guid.Parse(s
+#if NET7_0_OR_GREATER
+            , System.Globalization.CultureInfo.InvariantCulture
+#endif
+            );
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderExtensions.cs b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderExtensions.cs
index 52e27472bf..47ae3abe32 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderExtensions.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringBuilderExtensions.cs
@@ -1,40 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions
-{
-    using System;
-    using System.Text;
+using System;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
 
-    public static class StringBuilderExtensions
+public static class StringBuilderExtensions
+{
+    /// <summary>
+    /// Append given data from to string builder with new line.
+    /// </summary>
+    /// <param name="result">string builder</param>
+    /// <param name="data">data to be appended.</param>
+    /// <returns></returns>
+    public static void AppendSafeWithNewLine(this StringBuilder result, string? data)
     {
-        /// <summary>
-        /// Append given data from to string builder with new line.
-        /// </summary>
-        /// <param name="result">string builder</param>
-        /// <param name="data">data to be appended.</param>
-        /// <returns></returns>
-        public static void AppendSafeWithNewLine(this StringBuilder result, string data)
+        if (data.IsNullOrEmpty())
         {
-            if (!string.IsNullOrEmpty(data))
-            {
-                // Don't append more data if already reached max length.
-                if (result.Length >= result.MaxCapacity)
-                {
-                    return;
-                }
+            return;
+        }
 
-                // Add newline for readability.
-                data += Environment.NewLine;
+        // Don't append more data if already reached max length.
+        if (result.Length >= result.MaxCapacity)
+        {
+            return;
+        }
 
-                // Append sub string of data if appending all the data exceeds max capacity.
-                if (result.Length + data.Length >= result.MaxCapacity)
-                {
-                    data = data.Substring(0, result.MaxCapacity - result.Length);
-                }
+        // Add newline for readability.
+        data += Environment.NewLine;
 
-                result.Append(data);
-            }
+        // Append sub string of data if appending all the data exceeds max capacity.
+        if (result.Length + data.Length >= result.MaxCapacity)
+        {
+            data = data.Substring(0, result.MaxCapacity - result.Length);
         }
+
+        result.Append(data);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringExtensions.cs b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringExtensions.cs
index 1e04c64a9b..c47ab5918c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringExtensions.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Extensions/StringExtensions.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    /// <summary>
+    /// Add double quote around string. Useful in case of path which has white space in between.
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static string AddDoubleQuote(this string value)
     {
-        /// <summary>
-        /// Add double quote around string. Useful in case of path which has white space in between.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static string AddDoubleQuote(this string value)
-        {
-            return "\"" + value + "\"";
-        }
+        return "\"" + value + "\"";
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs b/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs
new file mode 100644
index 0000000000..6479267683
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// !!!NEVER USE A FLAG TO ENABLE FUNCTIONALITY!!!
+///
+/// The reasoning is:
+///
+/// * New version will automatically ship with the feature enabled. There is no action needed to be done just before release.
+/// * Anyone interested in the new feature will get it automatically by grabbing our preview.
+/// * Anyone who needs more time before using the new feature can disable it in the released package.
+/// * If we remove the flag from our code, we will do it after the feature is the new default, or after the functionality was completely removed from our codebase.
+/// * If there is a very outdated version of an assembly that for some reason loaded with the newest version of TP and it cannot find a feature flag, because we removed that feature flag in the meantime, it will just run with all it's newest features enabled.
+///
+/// Use constants so the feature name will be compiled directly into the assembly that references this, to avoid backwards compatibility issues, when the flag is removed in newer version.
+/// </summary>
+
+// !!! SDK USED FEATURE NAMES MUST BE KEPT IN SYNC IN https://github.com/dotnet/sdk/blob/main/src/Cli/dotnet/commands/dotnet-test/VSTestFeatureFlag.cs !!!
+internal partial class FeatureFlag : IFeatureFlag
+{
+    private readonly ConcurrentDictionary<string, bool> _cache = new();
+
+    public static IFeatureFlag Instance { get; private set; } = new FeatureFlag();
+
+    private FeatureFlag() { }
+
+    // Only check the env variable once, when it is not set or is set to 0, consider it unset. When it is anything else, consider it set.
+    public bool IsSet(string featureFlag) => _cache.GetOrAdd(featureFlag, f => (Environment.GetEnvironmentVariable(f)?.Trim() ?? "0") != "0");
+
+    // Added for artifact post-processing, it enable/disable the post processing.
+    // Added in 17.2-preview 7.0-preview
+    public const string VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING = nameof(VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING);
+
+    // Added for artifact post-processing, it will show old output for dotnet sdk scenario.
+    // It can be useful if we need to restore old UX in case users are parsing the console output.
+    // Added in 17.2-preview 7.0-preview
+    public const string VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX = nameof(VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX);
+
+    // Faster JSON serialization relies on less internals of NewtonsoftJson, and on some additional caching.
+    public const string VSTEST_DISABLE_FASTER_JSON_SERIALIZATION = nameof(VSTEST_DISABLE_FASTER_JSON_SERIALIZATION);
+
+    // Forces vstest.console to run all sources using the same target framework (TFM) and architecture, instead of allowing
+    // multiple different tfms and architectures to run at the same time.
+    public const string VSTEST_DISABLE_MULTI_TFM_RUN = nameof(VSTEST_DISABLE_MULTI_TFM_RUN);
+
+    // Disables setting a higher value for SetMinThreads. Setting SetMinThreads value to higher allows testhost to connect back faster
+    // even though we are blocking additional threads because we don't have to wait for ThreadPool to start more threads.
+    public const string VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE = nameof(VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE);
+
+    // Disable the SerialTestRunDecorator
+    public const string VSTEST_DISABLE_SERIALTESTRUN_DECORATOR = nameof(VSTEST_DISABLE_SERIALTESTRUN_DECORATOR);
+
+    // Disable setting UTF8 encoding in console.
+    public const string VSTEST_DISABLE_UTF8_CONSOLE_ENCODING = nameof(VSTEST_DISABLE_UTF8_CONSOLE_ENCODING);
+
+    // VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE=1 replaced by the CAPTURING and FORWARDING flags, and was enabling
+    // the same behavior as what is now the default (both capture and forward set to TRUE).
+    // Because this is the new default we don't have to handle it in any special way. Setting it to 0 was not defined
+    // and so it also does not need any special treatment.
+    //
+    // Disable capturing standard output of testhost.
+    public const string VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING = nameof(VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING);
+
+    // Disable forwarding standard output of testhost.
+    public const string VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING = nameof(VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING);
+
+    // Disable not sharing .NET Framework testhosts. Which will return behavior to sharing testhosts when they are running .NET Framework dlls, and are not disabling appdomains or running in parallel.
+    public const string VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST = nameof(VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST);
+
+    // Disable setting DOTNET_ROOT environment variable on non-Windows platforms. We used to set it only only on Windows when we found testhost.exe, now we set it always to allow xunit v3 to run tests in child process.
+    public const string VSTEST_DISABLE_DOTNET_ROOT_ON_NONWINDOWS = nameof(VSTEST_DISABLE_DOTNET_ROOT_ON_NONWINDOWS);
+
+    // Disable turning dynamic code coverage for native code to OFF by default. Setting this to 1 will skip adding the setting.
+    public const string VSTEST_DISABLE_DYNAMICNATIVE_CODECOVERAGE_DEFAULT_SETTING = nameof(VSTEST_DISABLE_DYNAMICNATIVE_CODECOVERAGE_DEFAULT_SETTING);
+
+
+
+    [Obsolete("Only use this in tests.")]
+    internal static void Reset()
+    {
+        Instance = new FeatureFlag();
+    }
+
+    [Obsolete("Only use this in tests.")]
+    internal void SetFlag(string key, bool value)
+    {
+        _cache[key] = value;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/IFeatureFlag.cs b/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/IFeatureFlag.cs
new file mode 100644
index 0000000000..14fb2328cc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/IFeatureFlag.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+internal interface IFeatureFlag
+{
+    bool IsSet(string featureName);
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
index 302087ba93..542dbfeacc 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
@@ -3,4 +3,35 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.ObjectModel, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Client, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+[assembly: InternalsVisibleTo("datacollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Client.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs
new file mode 100644
index 0000000000..6ef4b19cd4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/GlobalSuppressions.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Reliability", "CA2022:Avoid inexact read with 'Stream.Read'", Justification = "<Pending>", Scope = "member", Target = "~M:Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.GetMuxerArchitectureByMachoOnMac(System.String)~System.Nullable{Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture}")]
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs
index e23a13d49f..c7d703b878 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs
@@ -1,92 +1,91 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
 
+/// <summary>
+/// Helper class for processing arguments passed to a process.
+/// </summary>
+public class CommandLineArgumentsHelper
+{
     /// <summary>
-    /// Helper class for processing arguments passed to a process.
+    /// Parse command line arguments to a dictionary.
     /// </summary>
-    public class CommandLineArgumentsHelper
+    /// <param name="args">Command line arguments. Ex: <c>{ "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", "C:\temp\1.dll" }</c></param>
+    /// <returns>Dictionary of arguments keys and values.</returns>
+    public static IDictionary<string, string?> GetArgumentsDictionary(string[]? args)
     {
-        /// <summary>
-        /// Parse command line arguments to a dictionary.
-        /// </summary>
-        /// <param name="args">Command line arguments. Ex: <c>{ "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", "C:\temp\1.dll" }</c></param>
-        /// <returns>Dictionary of arguments keys and values.</returns>
-        public static IDictionary<string, string> GetArgumentsDictionary(string[] args)
+        var argsDictionary = new Dictionary<string, string?>();
+        if (args == null)
         {
-            var argsDictionary = new Dictionary<string, string>();
-            if (args == null)
-            {
-                return argsDictionary;
-            }
+            return argsDictionary;
+        }
 
-            for (int i = 0; i < args.Length; i++)
+        for (int i = 0; i < args.Length; i++)
+        {
+            if (args[i].StartsWith("-"))
             {
-                if (args[i].StartsWith("-"))
+                if (i < args.Length - 1 && !args[i + 1].StartsWith("-"))
                 {
-                    if (i < args.Length - 1 && !args[i + 1].StartsWith("-"))
-                    {
-                        argsDictionary.Add(args[i], args[i + 1]);
-                        i++;
-                    }
-                    else
-                    {
-                        argsDictionary.Add(args[i], null);
-                    }
+                    argsDictionary.Add(args[i], args[i + 1]);
+                    i++;
+                }
+                else
+                {
+                    argsDictionary.Add(args[i], null);
                 }
             }
-
-            return argsDictionary;
         }
 
-        /// <summary>
-        /// Parse the value of an argument as an integer.
-        /// </summary>
-        /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
-        /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
-        /// <returns>Value of the argument.</returns>
-        /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
-        public static int GetIntArgFromDict(IDictionary<string, string> argsDictionary, string fullname)
-        {
-            var found = TryGetIntArgFromDict(argsDictionary, fullname, out var value);
-            return found ? value : 0;
-        }
+        return argsDictionary;
+    }
 
-        /// <summary>
-        /// Try get the argument and parse the value of an argument as an integer.
-        /// </summary>
-        /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
-        /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
-        /// <returns>Value of the argument.</returns>
-        /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
-        public static bool TryGetIntArgFromDict(IDictionary<string, string> argsDictionary, string fullname, out int value)
-        {
-            var found = argsDictionary.TryGetValue(fullname, out var optionValue);
-            if (!found)
-            {
-                value = default;
-                return false; 
-            }
+    /// <summary>
+    /// Parse the value of an argument as an integer.
+    /// </summary>
+    /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
+    /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
+    /// <returns>Value of the argument.</returns>
+    /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
+    public static int GetIntArgFromDict(IDictionary<string, string?> argsDictionary, string fullname)
+    {
+        var found = TryGetIntArgFromDict(argsDictionary, fullname, out var value);
+        return found ? value : 0;
+    }
 
-            value = int.Parse(optionValue);
-            return true;
+    /// <summary>
+    /// Try get the argument and parse the value of an argument as an integer.
+    /// </summary>
+    /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
+    /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
+    /// <param name="value">The output value.</param>
+    /// <returns>Value of the argument.</returns>
+    /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
+    public static bool TryGetIntArgFromDict(IDictionary<string, string?> argsDictionary, string fullname, out int value)
+    {
+        var found = argsDictionary.TryGetValue(fullname, out var optionValue);
+        if (!found)
+        {
+            value = default;
+            return false;
         }
 
+        return int.TryParse(optionValue, out value);
+    }
 
-        /// <summary>
-        /// Parse the value of an argument as a string.
-        /// </summary>
-        /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
-        /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
-        /// <returns>Value of the argument.</returns>
-        /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
-        public static string GetStringArgFromDict(IDictionary<string, string> argsDictionary, string fullname)
-        {
-            return argsDictionary.TryGetValue(fullname, out var optionValue) ? optionValue : string.Empty;
-        }
+
+    /// <summary>
+    /// Parse the value of an argument as a string.
+    /// </summary>
+    /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
+    /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
+    /// <returns>Value of the argument.</returns>
+    /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
+    public static string? GetStringArgFromDict(IDictionary<string, string?> argsDictionary, string fullname)
+    {
+        return argsDictionary.TryGetValue(fullname, out var optionValue) ? optionValue : string.Empty;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
index 6c9efbd274..d9bc7043f4 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
@@ -1,216 +1,236 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0
-
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Reflection.PortableExecutable;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.Win32;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+
+public class DotnetHostHelper : IDotnetHostHelper
 {
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.Win32;
-    using System;
-    using System.IO;
-    using System.Reflection.PortableExecutable;
-
-    public class DotnetHostHelper : IDotnetHostHelper
+    public const string MONOEXENAME = "mono";
+
+    // Mach-O magic numbers from https://en.wikipedia.org/wiki/Mach-O
+    private const uint MachOMagic32BigEndian = 0xfeedface;    // 32-bit big-endian
+    private const uint MachOMagic64BigEndian = 0xfeedfacf;    // 64-bit big-endian
+    private const uint MachOMagic32LittleEndian = 0xcefaedfe; // 32-bit little-endian
+    private const uint MachOMagic64LittleEndian = 0xcffaedfe; // 64-bit little-endian
+    private const uint MachOMagicFatBigEndian = 0xcafebabe;   // Multi-architecture big-endian
+
+    private readonly IFileHelper _fileHelper;
+    private readonly IEnvironment _environment;
+    private readonly IWindowsRegistryHelper _windowsRegistryHelper;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+    private readonly IProcessHelper _processHelper;
+    private readonly string _muxerName;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
+    /// </summary>
+    public DotnetHostHelper() : this(new FileHelper(), new PlatformEnvironment(), new WindowsRegistryHelper(), new EnvironmentVariableHelper(), new ProcessHelper())
     {
-        public const string MONOEXENAME = "mono";
-
-        private readonly IFileHelper fileHelper;
-        private readonly IEnvironment environment;
-        private readonly IWindowsRegistryHelper windowsRegistryHelper;
-        private readonly IEnvironmentVariableHelper environmentVariableHelper;
-        private readonly IProcessHelper processHelper;
-        private readonly string muxerName;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
-        /// </summary>
-        public DotnetHostHelper() : this(new FileHelper(), new PlatformEnvironment(), new WindowsRegistryHelper(), new EnvironmentVariableHelper(), new ProcessHelper())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
-        /// </summary>
-        /// <param name="fileHelper">File Helper</param>
-        /// <param name="environment">Environment Helper</param>
-        public DotnetHostHelper(IFileHelper fileHelper, IEnvironment environment) : this(fileHelper, environment, new WindowsRegistryHelper(), new EnvironmentVariableHelper(), new ProcessHelper())
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
+    /// </summary>
+    /// <param name="fileHelper">File Helper</param>
+    /// <param name="environment">Environment Helper</param>
+    public DotnetHostHelper(IFileHelper fileHelper, IEnvironment environment) : this(fileHelper, environment, new WindowsRegistryHelper(), new EnvironmentVariableHelper(), new ProcessHelper())
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
-        /// </summary>
-        /// <param name="fileHelper">File Helper</param>
-        /// <param name="environment">Environment Helper</param>
-        /// <param name="windowsRegistryHelper">WindowsRegistry Helper</param>
-        /// <param name="environmentVariableHelper">EnvironmentVariable Helper</param>
-        /// <param name="processHelper">Process Helper</param>
-        internal DotnetHostHelper(
-            IFileHelper fileHelper,
-            IEnvironment environment,
-            IWindowsRegistryHelper windowsRegistryHelper,
-            IEnvironmentVariableHelper environmentVariableHelper,
-            IProcessHelper processHelper)
-        {
-            this.fileHelper = fileHelper;
-            this.environment = environment;
-            this.windowsRegistryHelper = windowsRegistryHelper;
-            this.environmentVariableHelper = environmentVariableHelper;
-            this.processHelper = processHelper;
-            this.muxerName = environment.OperatingSystem == PlatformOperatingSystem.Windows ? "dotnet.exe" : "dotnet";
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DotnetHostHelper"/> class.
+    /// </summary>
+    /// <param name="fileHelper">File Helper</param>
+    /// <param name="environment">Environment Helper</param>
+    /// <param name="windowsRegistryHelper">WindowsRegistry Helper</param>
+    /// <param name="environmentVariableHelper">EnvironmentVariable Helper</param>
+    /// <param name="processHelper">Process Helper</param>
+    internal DotnetHostHelper(
+        IFileHelper fileHelper,
+        IEnvironment environment,
+        IWindowsRegistryHelper windowsRegistryHelper,
+        IEnvironmentVariableHelper environmentVariableHelper,
+        IProcessHelper processHelper)
+    {
+        _fileHelper = fileHelper;
+        _environment = environment;
+        _windowsRegistryHelper = windowsRegistryHelper;
+        _environmentVariableHelper = environmentVariableHelper;
+        _processHelper = processHelper;
+        _muxerName = environment.OperatingSystem == PlatformOperatingSystem.Windows ? "dotnet.exe" : "dotnet";
+    }
 
-        /// <inheritdoc />
-        public string GetDotnetPath()
+    /// <inheritdoc />
+    public string GetDotnetPath()
+    {
+        if (!TryGetExecutablePath("dotnet", out var dotnetPath))
         {
-            if (!TryGetExecutablePath("dotnet", out var dotnetPath))
-            {
-                string errorMessage = string.Format(Resources.NoDotnetExeFound, "dotnet");
-
-                EqtTrace.Error(errorMessage);
-                throw new FileNotFoundException(errorMessage);
-            }
+            string errorMessage = string.Format(CultureInfo.CurrentCulture, Resources.NoDotnetExeFound, "dotnet");
 
-            return dotnetPath;
+            EqtTrace.Error(errorMessage);
+            throw new FileNotFoundException(errorMessage);
         }
 
-        public string GetMonoPath()
+        return dotnetPath;
+    }
+
+    public string GetMonoPath()
+    {
+        if (!TryGetExecutablePath(MONOEXENAME, out var monoPath))
         {
-            if (!TryGetExecutablePath(MONOEXENAME, out var monoPath))
-            {
-                string errorMessage = string.Format(Resources.NoDotnetExeFound, MONOEXENAME);
+            string errorMessage = string.Format(CultureInfo.CurrentCulture, Resources.NoDotnetExeFound, MONOEXENAME);
 
-                EqtTrace.Error(errorMessage);
-                throw new FileNotFoundException(errorMessage);
-            }
+            EqtTrace.Error(errorMessage);
+            throw new FileNotFoundException(errorMessage);
+        }
+
+        return monoPath;
+    }
 
-            return monoPath;
+    private bool TryGetExecutablePath(string executableBaseName, [NotNullWhen(true)] out string? executablePath)
+    {
+        if (_environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows))
+        {
+            executableBaseName += ".exe";
         }
 
-        private bool TryGetExecutablePath(string executableBaseName, out string executablePath)
+        var pathString = Environment.GetEnvironmentVariable("PATH")!;
+        foreach (string path in pathString.Split(Path.PathSeparator))
         {
-            if (this.environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows))
+            string exeFullPath = Path.Combine(path.Trim(), executableBaseName);
+            if (_fileHelper.Exists(exeFullPath))
             {
-                executableBaseName += ".exe";
+                executablePath = exeFullPath;
+                return true;
             }
+        }
 
-            executablePath = string.Empty;
-            var pathString = Environment.GetEnvironmentVariable("PATH");
-            foreach (string path in pathString.Split(Path.PathSeparator))
-            {
-                string exeFullPath = Path.Combine(path.Trim(), executableBaseName);
-                if (this.fileHelper.Exists(exeFullPath))
-                {
-                    executablePath = exeFullPath;
-                    return true;
-                }
-            }
+        executablePath = null;
+        return false;
+    }
 
-            return false;
-        }
+    public bool TryGetDotnetPathByArchitecture(
+        PlatformArchitecture targetArchitecture,
+        DotnetMuxerResolutionStrategy dotnetMuxerResolutionStrategy,
+        [NotNullWhen(true)] out string? muxerPath)
+    {
+        muxerPath = null;
+        EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Using dotnet muxer resolution strategy: {dotnetMuxerResolutionStrategy}");
 
-        public bool TryGetDotnetPathByArchitecture(PlatformArchitecture targetArchitecture, out string muxerPath)
+        // If current process is the same as the target architecture we return the current process filename.
+        if (_processHelper.GetCurrentProcessArchitecture() == targetArchitecture)
         {
-            if (this.environment.Architecture == targetArchitecture)
+            string currentProcessFileName = _processHelper.GetCurrentProcessFileName()!;
+            if (Path.GetFileName(currentProcessFileName) == _muxerName)
             {
-                string currentProcessFileName = this.processHelper.GetCurrentProcessFileName();
-                if (Path.GetFileName(currentProcessFileName) != this.muxerName)
-                {
-                    EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Target architecture is the same as the current process architecture '{targetArchitecture}', but the current process is not a muxer: '{currentProcessFileName}'");
-                }
-                else
-                {
-                    muxerPath = currentProcessFileName;
-                    EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Target architecture is the same as the current process architecture '{targetArchitecture}', and the current process is a muxer, using that: '{muxerPath}'");
-                    return true;
-                }
+                muxerPath = currentProcessFileName;
+                EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Target architecture is the same as the current process architecture '{targetArchitecture}', and the current process is a muxer, using that: '{muxerPath}'");
+                return true;
             }
 
-            // We used similar approach as the runtime resolver.
-            // https://github.com/dotnet/runtime/blob/main/src/native/corehost/fxr_resolver.cpp#L55
+            EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Target architecture is the same as the current process architecture '{targetArchitecture}', but the current process is not a muxer: '{currentProcessFileName}'");
+        }
+
+        // We used similar approach as the runtime resolver.
+        // https://github.com/dotnet/runtime/blob/main/src/native/corehost/fxr_resolver.cpp#L55
 
-            bool isWinOs = environment.OperatingSystem == PlatformOperatingSystem.Windows;
-            EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Searching for muxer named '{muxerName}'");
+        bool isWinOs = _environment.OperatingSystem == PlatformOperatingSystem.Windows;
+        EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Searching for muxer named '{_muxerName}'");
 
+        string? envKey = null;
+        string? envVar = null;
+        if (dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.DotnetRootArchitecture))
+        {
             // Try to search using env vars in the order
             // DOTNET_ROOT_{arch}
             // DOTNET_ROOT(x86) if X86 on Win (here we cannot check if current process is WOW64 because this is SDK process arch and not real host arch so it's irrelevant)
             //                  "DOTNET_ROOT(x86) is used instead when running a 32-bit executable on a 64-bit OS."
             // DOTNET_ROOT
-            string envKey = $"DOTNET_ROOT_{targetArchitecture.ToString().ToUpperInvariant()}";
+            envKey = $"DOTNET_ROOT_{targetArchitecture.ToString().ToUpperInvariant()}";
 
             // Try on arch specific env var
-            string envVar = this.environmentVariableHelper.GetEnvironmentVariable(envKey);
+            envVar = _environmentVariableHelper.GetEnvironmentVariable(envKey);
+        }
 
+        if (dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess))
+        {
             // Try on non virtualized x86 var(should happen only on non-x86 architecture)
-            if ((envVar == null || !this.fileHelper.DirectoryExists(envVar)) &&
-                targetArchitecture == PlatformArchitecture.X86 && this.environment.OperatingSystem == PlatformOperatingSystem.Windows)
+            if ((envVar == null || !_fileHelper.DirectoryExists(envVar)) &&
+                targetArchitecture == PlatformArchitecture.X86 && _environment.OperatingSystem == PlatformOperatingSystem.Windows)
             {
                 envKey = $"DOTNET_ROOT(x86)";
-                envVar = this.environmentVariableHelper.GetEnvironmentVariable(envKey);
+                envVar = _environmentVariableHelper.GetEnvironmentVariable(envKey);
             }
 
             // Try on default DOTNET_ROOT
-            if (envVar == null || !this.fileHelper.DirectoryExists(envVar))
+            if (envVar == null || !_fileHelper.DirectoryExists(envVar))
             {
                 envKey = "DOTNET_ROOT";
-                envVar = this.environmentVariableHelper.GetEnvironmentVariable(envKey);
+                envVar = _environmentVariableHelper.GetEnvironmentVariable(envKey);
             }
+        }
 
-            if (envVar != null)
+        if (envVar != null)
+        {
+            // If directory specified by env vars does not exists, it's like env var doesn't exists as well.
+            if (!_fileHelper.DirectoryExists(envVar))
+            {
+                EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Folder specified by env variable does not exist: '{envVar}={envKey}'");
+            }
+            else
             {
-                // If directory specified by env vars does not exists, it's like env var doesn't exists as well.
-                if (!this.fileHelper.DirectoryExists(envVar))
+                muxerPath = Path.Combine(envVar, _muxerName);
+                if (!_fileHelper.Exists(muxerPath))
                 {
-                    EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Folder specified by env variable does not exist: '{envVar}={envKey}'");
+                    // If environment variable was specified, and the directory it points at exists, but it does not contain a muxer, or the muxer is incompatible with the target architecture
+                    // we stop the search to be compliant with the approach that apphost (compiled .NET executables) use to find the muxer.
+                    EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Folder specified by env variable does not contain any muxer: '{envVar}={envKey}'");
+                    muxerPath = null;
+                    return false;
                 }
-                else
+
+                if (!IsValidArchitectureMuxer(targetArchitecture, muxerPath))
                 {
-                    muxerPath = Path.Combine(envVar, muxerName);
-                    if (!this.fileHelper.Exists(muxerPath))
-                    {
-                        // If environment variable was specified, and the directory it points at exists, but it does not contain a muxer, or the muxer is incompatible with the target architecture
-                        // we stop the search to be compliant with the approach that apphost (compiled .NET executables) use to find the muxer.
-                        EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Folder specified by env variable does not contain any muxer: '{envVar}={envKey}'");
-                        muxerPath = null;
-                        return false;
-                    }
-
-                    if (!IsValidArchitectureMuxer(targetArchitecture, muxerPath))
-                    {
-                        EqtTrace.Verbose($"DotnetHostHelper: Invalid muxer resolved using env var key '{envKey}' in '{envVar}'");
-                        muxerPath = null;
-                        return false;
-                    }
-
-                    EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer compatible with '{targetArchitecture}' resolved from env variable '{envKey}' in '{muxerPath}'");
-                    return true;
+                    EqtTrace.Verbose($"DotnetHostHelper: Invalid muxer resolved using env var key '{envKey}' in '{envVar}'");
+                    muxerPath = null;
+                    return false;
                 }
+
+                EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer compatible with '{targetArchitecture}' resolved from env variable '{envKey}' in '{muxerPath}'");
+                return true;
             }
+        }
 
+        if (dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.DotnetRootArchitecture)
+            || dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess))
+        {
             EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer was not found using DOTNET_ROOT* env variables.");
+        }
 
+        if (dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.GlobalInstallationLocation))
+        {
             // Try to search for global registration
-            if (isWinOs)
-            {
-                muxerPath = GetMuxerFromGlobalRegistrationWin(targetArchitecture);
-            }
-            else
-            {
-                muxerPath = GetMuxerFromGlobalRegistrationOnUnix(targetArchitecture);
-            }
+            muxerPath = isWinOs ? GetMuxerFromGlobalRegistrationWin(targetArchitecture) : GetMuxerFromGlobalRegistrationOnUnix(targetArchitecture);
 
             if (muxerPath != null)
             {
-                if (!this.fileHelper.Exists(muxerPath))
+                if (!_fileHelper.Exists(muxerPath))
                 {
                     // If muxer doesn't exists or it's wrong we stop the search
                     EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer file not found for global registration '{muxerPath}'");
@@ -231,261 +251,254 @@ public bool TryGetDotnetPathByArchitecture(PlatformArchitecture targetArchitectu
             }
 
             EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer not found using global registrations");
+        }
 
+        if (dotnetMuxerResolutionStrategy.HasFlag(DotnetMuxerResolutionStrategy.DefaultInstallationLocation))
+        {
             // Try searching in default installation location if it exists
             if (isWinOs)
             {
                 // If we're on x64/arm64 SDK and target is x86 we need to search on non virtualized windows folder
-                if ((this.environment.Architecture == PlatformArchitecture.X64 || this.environment.Architecture == PlatformArchitecture.ARM64) &&
+                if ((_environment.Architecture == PlatformArchitecture.X64 || _environment.Architecture == PlatformArchitecture.ARM64) &&
                      targetArchitecture == PlatformArchitecture.X86)
                 {
-                    muxerPath = Path.Combine(this.environmentVariableHelper.GetEnvironmentVariable("ProgramFiles(x86)"), "dotnet", muxerName);
+                    muxerPath = Path.Combine(_environmentVariableHelper.GetEnvironmentVariable("ProgramFiles(x86)")!, "dotnet", _muxerName);
                 }
                 else
                 {
                     // If we're on ARM and target is x64 we expect correct installation inside x64 folder
-                    if (this.environment.Architecture == PlatformArchitecture.ARM64 && targetArchitecture == PlatformArchitecture.X64)
-                    {
-                        muxerPath = Path.Combine(this.environmentVariableHelper.GetEnvironmentVariable("ProgramFiles"), "dotnet", "x64", muxerName);
-                    }
-                    else
-                    {
-                        muxerPath = Path.Combine(this.environmentVariableHelper.GetEnvironmentVariable("ProgramFiles"), "dotnet", muxerName);
-                    }
+                    muxerPath = _environment.Architecture == PlatformArchitecture.ARM64 && targetArchitecture == PlatformArchitecture.X64
+                        ? Path.Combine(_environmentVariableHelper.GetEnvironmentVariable("ProgramFiles")!, "dotnet", "x64", _muxerName)
+                        : Path.Combine(_environmentVariableHelper.GetEnvironmentVariable("ProgramFiles")!, "dotnet", _muxerName);
                 }
             }
             else
             {
-                if (this.environment.OperatingSystem == PlatformOperatingSystem.OSX)
+                if (_environment.OperatingSystem == PlatformOperatingSystem.OSX)
                 {
                     // If we're on ARM and target is x64 we expect correct installation inside x64 folder
-                    if (this.environment.Architecture == PlatformArchitecture.ARM64 && targetArchitecture == PlatformArchitecture.X64)
-                    {
-                        muxerPath = Path.Combine("/usr/local/share/dotnet/x64", muxerName);
-                    }
-                    else
-                    {
-                        muxerPath = Path.Combine("/usr/local/share/dotnet", muxerName);
-                    }
+                    muxerPath = _environment.Architecture == PlatformArchitecture.ARM64 && targetArchitecture == PlatformArchitecture.X64
+                        ? Path.Combine("/usr/local/share/dotnet/x64", _muxerName)
+                        : Path.Combine("/usr/local/share/dotnet", _muxerName);
                 }
                 else
                 {
-                    muxerPath = Path.Combine("/usr/share/dotnet", muxerName);
+                    muxerPath = Path.Combine("/usr/share/dotnet", _muxerName);
                 }
             }
+        }
 
-            if (!this.fileHelper.Exists(muxerPath))
-            {
-                // If muxer doesn't exists we stop the search
-                EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer was not found in default installation location: '{muxerPath}'");
-                muxerPath = null;
-                return false;
-            }
-
-            if (!IsValidArchitectureMuxer(targetArchitecture, muxerPath))
-            {
-                // If muxer is wrong we stop the search
-                EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer resolved in default installation path is not compatible with the target architecture: '{muxerPath}'");
-                muxerPath = null;
-                return false;
-            }
+        if (!_fileHelper.Exists(muxerPath))
+        {
+            // If muxer doesn't exists we stop the search
+            EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer was not found in default installation location: '{muxerPath}'");
+            muxerPath = null;
+            return false;
+        }
 
-            EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer compatible with '{targetArchitecture}' resolved from default installation path: '{muxerPath}'");
-            return true;
+        if (!IsValidArchitectureMuxer(targetArchitecture, muxerPath))
+        {
+            // If muxer is wrong we stop the search
+            EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer resolved in default installation path is not compatible with the target architecture: '{muxerPath}'");
+            muxerPath = null;
+            return false;
         }
 
-        private string GetMuxerFromGlobalRegistrationWin(PlatformArchitecture targetArchitecture)
+        EqtTrace.Verbose($"DotnetHostHelper.TryGetDotnetPathByArchitecture: Muxer compatible with '{targetArchitecture}' resolved from default installation path: '{muxerPath}'");
+        return true;
+    }
+
+    private string? GetMuxerFromGlobalRegistrationWin(PlatformArchitecture targetArchitecture)
+    {
+        // Installed version are always in 32-bit view of registry
+        // https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#globally-registered-install-location-new
+        // "Note that this registry key is "redirected" that means that 32-bit processes see different copy of the key than 64bit processes.
+        // So it's important that both installers and the host access only the 32-bit view of the registry."
+        using IRegistryKey? hklm = _windowsRegistryHelper.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32);
+        if (hklm == null)
         {
-            // Installed version are always in 32-bit view of registry
-            // https://github.com/dotnet/designs/blob/main/accepted/2020/install-locations.md#globally-registered-install-location-new
-            // "Note that this registry key is "redirected" that means that 32-bit processes see different copy of the key than 64bit processes.
-            // So it's important that both installers and the host access only the 32-bit view of the registry."
-            using (IRegistryKey hklm = windowsRegistryHelper.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
-            {
-                if (hklm != null)
-                {
-                    using (IRegistryKey dotnetInstalledVersion = hklm.OpenSubKey(@"SOFTWARE\dotnet\Setup\InstalledVersions"))
-                    {
-                        if (dotnetInstalledVersion != null)
-                        {
-                            using (IRegistryKey nativeArch = dotnetInstalledVersion.OpenSubKey(targetArchitecture.ToString().ToLowerInvariant()))
-                            {
-                                string installLocation = nativeArch?.GetValue("InstallLocation")?.ToString();
-
-                                if (installLocation != null)
-                                {
-                                    string path = Path.Combine(installLocation.Trim(), this.muxerName);
-                                    EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Muxer resolved using win registry key 'SOFTWARE\dotnet\Setup\InstalledVersions\{targetArchitecture.ToString().ToLowerInvariant()}\InstallLocation' in '{path}'");
-                                    return path;
-                                }
-                                else
-                                {
-                                    EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing registry InstallLocation");
-                                }
-                            }
-                        }
-                        else
-                        {
-                            EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing RegistryHive.LocalMachine for RegistryView.Registry32");
-                        }
-                    }
-                }
-                else
-                {
-                    EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing SOFTWARE\dotnet\Setup\InstalledVersions subkey");
-                }
-            }
+            EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing SOFTWARE\dotnet\Setup\InstalledVersions subkey");
+            return null;
+        }
 
+        using IRegistryKey? dotnetInstalledVersion = hklm.OpenSubKey(@"SOFTWARE\dotnet\Setup\InstalledVersions");
+        if (dotnetInstalledVersion == null)
+        {
+            EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing RegistryHive.LocalMachine for RegistryView.Registry32");
             return null;
         }
 
-        private string GetMuxerFromGlobalRegistrationOnUnix(PlatformArchitecture targetArchitecture)
+        using IRegistryKey? nativeArch = dotnetInstalledVersion.OpenSubKey(targetArchitecture.ToString().ToLowerInvariant());
+        string? installLocation = nativeArch?.GetValue("InstallLocation")?.ToString();
+        if (installLocation == null)
         {
-            string baseInstallLocation = "/etc/dotnet/";
+            EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Missing registry InstallLocation");
+            return null;
+        }
 
-            // We search for architecture specific installation
-            string installLocation = $"{baseInstallLocation}install_location_{targetArchitecture.ToString().ToLowerInvariant()}";
+        string path = Path.Combine(installLocation.Trim(), _muxerName);
+        EqtTrace.Verbose($@"DotnetHostHelper.GetMuxerFromGlobalRegistrationWin: Muxer resolved using win registry key 'SOFTWARE\dotnet\Setup\InstalledVersions\{targetArchitecture.ToString().ToLowerInvariant()}\InstallLocation' in '{path}'");
+        return path;
+    }
 
-            // We try to load archless install location file
-            if (!this.fileHelper.Exists(installLocation))
-            {
-                installLocation = $"{baseInstallLocation}install_location";
-            }
+    private string? GetMuxerFromGlobalRegistrationOnUnix(PlatformArchitecture targetArchitecture)
+    {
+        string baseInstallLocation = "/etc/dotnet/";
 
-            if (this.fileHelper.Exists(installLocation))
-            {
-                try
-                {
-                    using (Stream stream = this.fileHelper.GetStream(installLocation, FileMode.Open, FileAccess.Read))
-                    using (StreamReader streamReader = new StreamReader(stream))
-                    {
-                        string content = streamReader.ReadToEnd().Trim();
-                        EqtTrace.Verbose($"DotnetHostHelper: '{installLocation}' content '{content}'");
-                        string path = Path.Combine(content, this.muxerName);
-                        EqtTrace.Verbose($"DotnetHostHelper: Muxer resolved using '{installLocation}' in '{path}'");
-                        return path;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error($"DotnetHostHelper.GetMuxerFromGlobalRegistrationOnUnix: Exception during '{installLocation}' muxer resolution.\n{ex}");
-                }
-            }
+        // We search for architecture specific installation
+        string installLocation = $"{baseInstallLocation}install_location_{targetArchitecture.ToString().ToLowerInvariant()}";
 
+        // We try to load archless install location file
+        if (!_fileHelper.Exists(installLocation))
+        {
+            installLocation = $"{baseInstallLocation}install_location";
+        }
+
+        if (!_fileHelper.Exists(installLocation))
+        {
             return null;
         }
 
-        private PlatformArchitecture? GetMuxerArchitectureByPEHeaderOnWin(string path)
+        try
         {
-            try
-            {
-                using (Stream stream = this.fileHelper.GetStream(path, FileMode.Open, FileAccess.Read))
-                using (PEReader peReader = new PEReader(stream))
-                {
-                    switch (peReader.PEHeaders.CoffHeader.Machine)
-                    {
-                        case Machine.Amd64:
-                            return PlatformArchitecture.X64;
-                        case Machine.IA64:
-                            return PlatformArchitecture.X64;
-                        case Machine.Arm64:
-                            return PlatformArchitecture.ARM64;
-                        case Machine.Arm:
-                            return PlatformArchitecture.ARM;
-                        case Machine.I386:
-                            return PlatformArchitecture.X86;
-                        default:
-                            break;
-                    }
-                }
-            }
-            catch (Exception ex)
+            using Stream stream = _fileHelper.GetStream(installLocation, FileMode.Open, FileAccess.Read);
+            using StreamReader streamReader = new(stream);
+            string content = streamReader.ReadToEnd().Trim();
+            EqtTrace.Verbose($"DotnetHostHelper: '{installLocation}' content '{content}'");
+            string path = Path.Combine(content, _muxerName);
+            EqtTrace.Verbose($"DotnetHostHelper: Muxer resolved using '{installLocation}' in '{path}'");
+            return path;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"DotnetHostHelper.GetMuxerFromGlobalRegistrationOnUnix: Exception during '{installLocation}' muxer resolution.\n{ex}");
+        }
+
+        return null;
+    }
+
+    private PlatformArchitecture? GetMuxerArchitectureByPEHeaderOnWin(string path)
+    {
+        try
+        {
+            using Stream stream = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read);
+            using PEReader peReader = new(stream);
+            switch (peReader.PEHeaders.CoffHeader.Machine)
             {
-                EqtTrace.Error($"DotnetHostHelper.GetMuxerArchitectureByPEHeaderOnWin: Failed to get architecture from PEHeader for '{path}'\n{ex}");
+                case Machine.Amd64:
+                    return PlatformArchitecture.X64;
+                case Machine.IA64:
+                    return PlatformArchitecture.X64;
+                case Machine.Arm64:
+                    return PlatformArchitecture.ARM64;
+                case Machine.Arm:
+                    return PlatformArchitecture.ARM;
+                case Machine.I386:
+                    return PlatformArchitecture.X86;
+                default:
+                    break;
             }
-
-            return null;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"DotnetHostHelper.GetMuxerArchitectureByPEHeaderOnWin: Failed to get architecture from PEHeader for '{path}'\n{ex}");
         }
 
-        // See https://opensource.apple.com/source/xnu/xnu-2050.18.24/EXTERNAL_HEADERS/mach-o/loader.h
-        // https://opensource.apple.com/source/xnu/xnu-4570.41.2/osfmk/mach/machine.h.auto.html
-        private PlatformArchitecture? GetMuxerArchitectureByMachoOnMac(string path)
+        return null;
+    }
+
+    // See https://opensource.apple.com/source/xnu/xnu-2050.18.24/EXTERNAL_HEADERS/mach-o/loader.h
+    // https://opensource.apple.com/source/xnu/xnu-4570.41.2/osfmk/mach/machine.h.auto.html
+    private PlatformArchitecture? GetMuxerArchitectureByMachoOnMac(string path)
+    {
+        try
         {
-            try
+            using var headerReader = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read);
+            var magicBytes = new byte[4];
+            var cpuInfoBytes = new byte[4];
+
+            ReadExactly(headerReader, magicBytes, 0, magicBytes.Length);
+            ReadExactly(headerReader, cpuInfoBytes, 0, cpuInfoBytes.Length);
+
+            var magic = BitConverter.ToUInt32(magicBytes, 0);
+
+            // Validate magic bytes to ensure this is a valid Mach-O binary
+            if (magic is not (MachOMagic32BigEndian or MachOMagic64BigEndian or MachOMagic32LittleEndian or MachOMagic64LittleEndian or MachOMagicFatBigEndian))
             {
-                PlatformArchitecture? architecture;
-                using (var headerReader = this.fileHelper.GetStream(path, FileMode.Open, FileAccess.Read))
-                {
-                    var magicBytes = new byte[4];
-                    var cpuInfoBytes = new byte[4];
-                    headerReader.Read(magicBytes, 0, magicBytes.Length);
-                    headerReader.Read(cpuInfoBytes, 0, cpuInfoBytes.Length);
-
-                    var magic = BitConverter.ToUInt32(magicBytes, 0);
-                    var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0);
-                    switch ((MacOsCpuType)cpuInfo)
-                    {
-                        case MacOsCpuType.Arm64Magic:
-                        case MacOsCpuType.Arm64Cigam:
-                            architecture = PlatformArchitecture.ARM64;
-                            break;
-                        case MacOsCpuType.X64Magic:
-                        case MacOsCpuType.X64Cigam:
-                            architecture = PlatformArchitecture.X64;
-                            break;
-                        case MacOsCpuType.X86Magic:
-                        case MacOsCpuType.X86Cigam:
-                            architecture = PlatformArchitecture.X86;
-                            break;
-                        default:
-                            architecture = null;
-                            break;
-                    }
-
-                    return architecture;
-                }
+                EqtTrace.Error($"DotnetHostHelper.GetMuxerArchitectureByMachoOnMac: Invalid Mach-O magic bytes: 0x{magic:X8}");
+                return null;
             }
-            catch (Exception ex)
+
+            var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0);
+            PlatformArchitecture? architecture = (MacOsCpuType)cpuInfo switch
             {
-                // In case of failure during header reading we must fallback to the next place(default installation path)
-                EqtTrace.Error($"DotnetHostHelper.GetMuxerArchitectureByMachoOnMac: Failed to get architecture from Mach-O for '{path}'\n{ex}");
-            }
+                MacOsCpuType.Arm64Magic or MacOsCpuType.Arm64Cigam => PlatformArchitecture.ARM64,
+                MacOsCpuType.X64Magic or MacOsCpuType.X64Cigam => PlatformArchitecture.X64,
+                MacOsCpuType.X86Magic or MacOsCpuType.X86Cigam => PlatformArchitecture.X86,
+                _ => null,
+            };
 
-            return null;
+            return architecture;
         }
-
-        internal enum MacOsCpuType : uint
+        catch (Exception ex)
         {
-            Arm64Magic = 0x0100000c,
-            Arm64Cigam = 0x0c000001,
-            X64Magic = 0x01000007,
-            X64Cigam = 0x07000001,
-            X86Magic = 0x00000007,
-            X86Cigam = 0x07000000
+            // In case of failure during header reading we must fallback to the next place(default installation path)
+            EqtTrace.Error($"DotnetHostHelper.GetMuxerArchitectureByMachoOnMac: Failed to get architecture from Mach-O for '{path}'\n{ex}");
         }
 
-        private bool IsValidArchitectureMuxer(PlatformArchitecture targetArchitecture, string path)
+        return null;
+    }
+
+#if NET
+    private static void ReadExactly(Stream stream, byte[] buffer, int offset, int count)
+    {
+        stream.ReadExactly(buffer, offset, count);
+    }
+#else
+    private static void ReadExactly(Stream stream, byte[] buffer, int offset, int count)
+    {
+        while (count > 0)
         {
-            PlatformArchitecture? muxerPlatform = null;
-            if (this.environment.OperatingSystem == PlatformOperatingSystem.Windows)
+            int read = stream.Read(buffer, offset, count);
+            if (read <= 0)
             {
-                muxerPlatform =  GetMuxerArchitectureByPEHeaderOnWin(path);
-            }
-            else if (this.environment.OperatingSystem == PlatformOperatingSystem.OSX)
-            {
-                muxerPlatform = GetMuxerArchitectureByMachoOnMac(path);
+                throw new EndOfStreamException();
             }
+            offset += read;
+            count -= read;
+        }
+    }
+#endif
 
-            if (targetArchitecture != muxerPlatform)
-            {
-                EqtTrace.Verbose($"DotnetHostHelper.IsValidArchitectureMuxer: Incompatible architecture muxer, target architecture '{targetArchitecture}', actual '{muxerPlatform}'");
-                return false;
-            }
+    internal enum MacOsCpuType : uint
+    {
+        Arm64Magic = 0x0100000c,
+        Arm64Cigam = 0x0c000001,
+        X64Magic = 0x01000007,
+        X64Cigam = 0x07000001,
+        X86Magic = 0x00000007,
+        X86Cigam = 0x07000000
+    }
 
-            EqtTrace.Verbose($"DotnetHostHelper.IsValidArchitectureMuxer: Compatible architecture muxer, target architecture '{targetArchitecture}', actual '{muxerPlatform}'");
-            return true;
+    private bool IsValidArchitectureMuxer(PlatformArchitecture targetArchitecture, string path)
+    {
+        PlatformArchitecture? muxerPlatform = null;
+        if (_environment.OperatingSystem == PlatformOperatingSystem.Windows)
+        {
+            muxerPlatform = GetMuxerArchitectureByPEHeaderOnWin(path);
+        }
+        else if (_environment.OperatingSystem == PlatformOperatingSystem.OSX)
+        {
+            muxerPlatform = GetMuxerArchitectureByMachoOnMac(path);
+        }
+
+        if (targetArchitecture != muxerPlatform)
+        {
+            EqtTrace.Verbose($"DotnetHostHelper.IsValidArchitectureMuxer: Incompatible architecture muxer, target architecture '{targetArchitecture}', actual '{muxerPlatform}'");
+            return false;
         }
+
+        EqtTrace.Verbose($"DotnetHostHelper.IsValidArchitectureMuxer: Compatible architecture muxer, target architecture '{targetArchitecture}', actual '{muxerPlatform}'");
+        return true;
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetMuxerResolutionStrategy.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetMuxerResolutionStrategy.cs
new file mode 100644
index 0000000000..aa5090b911
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetMuxerResolutionStrategy.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+
+/// <summary>
+/// An enum representing the dotnet muxer resolution.
+/// </summary>
+[Flags]
+public enum DotnetMuxerResolutionStrategy
+{
+    /// <summary>
+    /// Indicates if the muxer resolution process should take dotnet root into account.
+    /// </summary>
+    DotnetRootArchitecture = 1,
+
+    /// <summary>
+    /// Indicates if the muxer resolution process should take arch independent dotnet root into account.
+    /// </summary>
+    DotnetRootArchitectureLess = 2,
+
+    /// <summary>
+    /// Indicates if the muxer resolution process should look in the global installation location.
+    /// </summary>
+    GlobalInstallationLocation = 4,
+
+    /// <summary>
+    /// Indicates if the muxer resolution process should look in the default installation location.
+    /// </summary>
+    DefaultInstallationLocation = 8,
+
+    /// <summary>
+    /// Default muxer resolution strategy.
+    /// </summary>
+    Default = DotnetRootArchitecture | DotnetRootArchitectureLess | GlobalInstallationLocation | DefaultInstallationLocation
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentHelper.cs
index 032d9c1275..6dda345959 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentHelper.cs
@@ -1,39 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers
-{
-    using ObjectModel;
+using System;
 
-    using System;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    public class EnvironmentHelper
-    {
-        public const string VstestConnectionTimeout = "VSTEST_CONNECTION_TIMEOUT";
-        public const int DefaultConnectionTimeout = 90; // seconds
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
 
-        /// <summary>
-        /// Get timeout based on environment variable VSTEST_CONNECTION_TIMEOUT.
-        /// </summary>
-        public static int GetConnectionTimeout()
-        {
-
-#if NETSTANDARD1_0
-            var envVarValue = string.Empty;
-#else
-            var envVarValue = Environment.GetEnvironmentVariable(VstestConnectionTimeout);
-#endif
+public class EnvironmentHelper
+{
+    public const string VstestConnectionTimeout = "VSTEST_CONNECTION_TIMEOUT";
+    public const int DefaultConnectionTimeout = 90; // seconds
 
-            if (!string.IsNullOrEmpty(envVarValue) && int.TryParse(envVarValue, out int value) && value >= 0)
-            {
-                EqtTrace.Info("EnvironmentHelper.GetConnectionTimeout: {0} value set to {1}.", VstestConnectionTimeout, value);
-            }
-            else
-            {
-                value = DefaultConnectionTimeout;
-            }
+    /// <summary>
+    /// Get timeout based on environment variable VSTEST_CONNECTION_TIMEOUT.
+    /// </summary>
+    public static int GetConnectionTimeout()
+    {
+        var envVarValue = Environment.GetEnvironmentVariable(VstestConnectionTimeout);
 
-            return value;
+        if (!envVarValue.IsNullOrEmpty() && int.TryParse(envVarValue, out int value) && value >= 0)
+        {
+            EqtTrace.Info("EnvironmentHelper.GetConnectionTimeout: {0} value set to {1}.", VstestConnectionTimeout, value);
         }
+        else
+        {
+            value = DefaultConnectionTimeout;
+        }
+
+        return value;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentVariableHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentVariableHelper.cs
index db75f3d704..bc75176bd9 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentVariableHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentVariableHelper.cs
@@ -1,18 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0
-
 using System;
+using System.Collections;
+
 using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+
+internal class EnvironmentVariableHelper : IEnvironmentVariableHelper
 {
-    internal class EnvironmentVariableHelper : IEnvironmentVariableHelper
-    {
-        public string GetEnvironmentVariable(string variable)
-            => Environment.GetEnvironmentVariable(variable);
-    }
-}
+    /// <inheritdoc />
+    public string? GetEnvironmentVariable(string variable)
+        => Environment.GetEnvironmentVariable(variable);
 
-#endif
\ No newline at end of file
+    /// <inheritdoc />
+    public TEnum GetEnvironmentVariableAsEnum<TEnum>(string variable, TEnum defaultValue = default) where TEnum : struct, Enum
+        => Environment.GetEnvironmentVariable(variable) is string value && !string.IsNullOrEmpty(value)
+            ? Enum.TryParse<TEnum>(value, out var enumValue) ? enumValue : defaultValue
+            : defaultValue;
+
+    /// <inheritdoc />
+    public void SetEnvironmentVariable(string variable, string value)
+        => Environment.SetEnvironmentVariable(variable, value);
+
+    /// <inheritdoc />
+    public IDictionary GetEnvironmentVariables()
+        => Environment.GetEnvironmentVariables();
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
index 754959cebb..7179155386 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/FileHelper.cs
@@ -1,148 +1,122 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+/// <summary>
+/// The file helper.
+/// </summary>
+public class FileHelper : IFileHelper
 {
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-
-    /// <summary>
-    /// The file helper.
-    /// </summary>
-    public class FileHelper : IFileHelper
-    {
-        private static readonly Version DefaultFileVersion = new Version(0, 0);
+    private static readonly Version DefaultFileVersion = new(0, 0);
 
-        /// <inheritdoc/>
-        public DirectoryInfo CreateDirectory(string path)
-        {
-            return Directory.CreateDirectory(path);
-        }
+    /// <inheritdoc/>
+    public DirectoryInfo CreateDirectory(string path)
+        => Directory.CreateDirectory(path);
 
-        /// <inheritdoc/>
-        public string GetCurrentDirectory()
-        {
-            return Directory.GetCurrentDirectory();
-        }
+    /// <inheritdoc/>
+    public string GetCurrentDirectory()
+        => Directory.GetCurrentDirectory();
 
-        /// <inheritdoc/>
-        public bool Exists(string path)
-        {
-            return File.Exists(path);
-        }
+    /// <inheritdoc/>
+    public bool Exists(string? path)
+        => File.Exists(path);
 
-        /// <inheritdoc/>
-        public bool DirectoryExists(string path)
-        {
-            return Directory.Exists(path);
-        }
+    /// <inheritdoc/>
+    public bool DirectoryExists(string? path)
+        => Directory.Exists(path);
 
-        /// <inheritdoc/>
-#pragma warning disable RS0027 // Public API with optional parameter(s) should have the most parameters amongst its public overloads
-        public Stream GetStream(string filePath, FileMode mode, FileAccess access = FileAccess.ReadWrite)
-#pragma warning restore RS0027 // Public API with optional parameter(s) should have the most parameters amongst its public overloads
-        {
-            return new FileStream(filePath, mode, access);
-        }
+    /// <inheritdoc/>
+    public Stream GetStream(string filePath, FileMode mode, FileAccess access = FileAccess.ReadWrite)
+        => new FileStream(filePath, mode, access);
+
+    /// <inheritdoc/>
+    public Stream GetStream(string filePath, FileMode mode, FileAccess access, FileShare share)
+        => new FileStream(filePath, mode, access, share);
 
-        /// <inheritdoc/>
-        public Stream GetStream(string filePath, FileMode mode, FileAccess access, FileShare share)
+    /// <inheritdoc/>
+    public IEnumerable<string> EnumerateFiles(
+        string directory,
+        SearchOption searchOption,
+        params string[]? endsWithSearchPatterns)
+    {
+        if (endsWithSearchPatterns == null || endsWithSearchPatterns.Length == 0)
         {
-            return new FileStream(filePath, mode, access, share);
+            return [];
         }
 
+        var files = Directory.EnumerateFiles(directory, "*", searchOption);
 
-        /// <inheritdoc/>
-        public IEnumerable<string> EnumerateFiles(
-            string directory,
-            SearchOption searchOption,
-            params string[] endsWithSearchPatterns)
-        {
-            if (endsWithSearchPatterns == null || endsWithSearchPatterns.Length == 0)
-            {
-                return Enumerable.Empty<string>();
-            }
+        return files.Where(
+            file => endsWithSearchPatterns.Any(
+                pattern => file.EndsWith(pattern, StringComparison.OrdinalIgnoreCase)));
+    }
 
-            var files = Directory.EnumerateFiles(directory, "*", searchOption);
+    /// <inheritdoc/>
+    public FileAttributes GetFileAttributes(string path)
+        => new FileInfo(path).Attributes;
 
-            return files.Where(
-                file => endsWithSearchPatterns.Any(
-                    pattern => file.EndsWith(pattern, StringComparison.OrdinalIgnoreCase)));
-        }
+    /// <inheritdoc/>
+    public Version GetFileVersion(string path)
+        => Version.TryParse(FileVersionInfo.GetVersionInfo(path)?.FileVersion, out var currentVersion) ?
+            currentVersion :
+            DefaultFileVersion;
 
-        /// <inheritdoc/>
-        public FileAttributes GetFileAttributes(string path)
-        {
-            return new FileInfo(path).Attributes;
-        }
+    /// <inheritdoc/>
+    public void CopyFile(string sourcePath, string destinationPath)
+        => File.Copy(sourcePath, destinationPath);
 
-        /// <inheritdoc/>
-        public Version GetFileVersion(string path)
-        {
-            var currentFileVersion = FileVersionInfo.GetVersionInfo(path)?.FileVersion;
-            return Version.TryParse(currentFileVersion, out var currentVersion) ? currentVersion : DefaultFileVersion;
-        }
+    /// <inheritdoc/>
+    public void MoveFile(string sourcePath, string destinationPath)
+        => File.Move(sourcePath, destinationPath);
 
-        /// <inheritdoc/>
-        public void CopyFile(string sourcePath, string destinationPath)
-        {
-            File.Copy(sourcePath, destinationPath);
-        }
-
-        /// <inheritdoc/>
-        public void MoveFile(string sourcePath, string destinationPath)
-        {
-            File.Move(sourcePath, destinationPath);
-        }
-
-        /// <inheritdoc/>
-        public void WriteAllTextToFile(string filePath, string content)
-        {
-            File.WriteAllText(filePath, content);
-        }
+    /// <inheritdoc/>
+    public void WriteAllTextToFile(string filePath, string content)
+        => File.WriteAllText(filePath, content);
 
-        /// <inheritdoc/>
-        public string GetFullPath(string path)
-        {
-            return Path.GetFullPath(path);
-        }
+    /// <inheritdoc/>
+    public string GetFullPath(string path)
+        => Path.GetFullPath(path);
 
-        /// <inheritdoc/>
-        public void DeleteEmptyDirectroy(string dirPath)
+    /// <inheritdoc/>
+    public void DeleteEmptyDirectroy(string dirPath)
+    {
+        try
         {
-            try
+            if (Directory.Exists(dirPath)
+                && !Directory.EnumerateFileSystemEntries(dirPath).Any())
             {
-                if (Directory.Exists(dirPath)
-                    && !Directory.EnumerateFileSystemEntries(dirPath).Any())
-                {
-                    Directory.Delete(dirPath, true);
-                }
+                Directory.Delete(dirPath, true);
             }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        /// <inheritdoc/>
-        public string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
-        {
-            return Directory.GetFiles(path, searchPattern, searchOption);
         }
-
-        /// <inheritdoc/>
-        public void Delete(string path)
+        catch
         {
-            File.Delete(path);
+            // ignored
         }
     }
-}
 
-#endif
\ No newline at end of file
+    /// <inheritdoc/>
+    public string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
+        => Directory.GetFiles(path, searchPattern, searchOption);
+
+    /// <inheritdoc/>
+    public void Delete(string path)
+        => File.Delete(path);
+
+    public void DeleteDirectory(string directoryPath, bool recursive)
+        => Directory.Delete(directoryPath, recursive);
+
+    public string GetTempPath()
+        => Path.GetTempPath();
+
+    public long GetFileLength(string path)
+        => new FileInfo(path).Length;
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IDotnetHostHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IDotnetHostHelper.cs
index 6f166f36a6..aed6cbe815 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IDotnetHostHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IDotnetHostHelper.cs
@@ -1,35 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
 using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+
+/// <summary>
+/// Helper class for getting info about dotnet host.
+/// </summary>
+public interface IDotnetHostHelper
 {
     /// <summary>
-    /// Helper class for getting info about dotnet host.
+    /// Gets the full path for of .net core host.
     /// </summary>
-    public interface IDotnetHostHelper
-    {
-        /// <summary>
-        /// Gets the full path for of .net core host.
-        /// </summary>
-        /// <returns>Full path to <c>dotnet</c> executable</returns>
-        /// <remarks>Debuggers require the full path of executable to launch it.</remarks>
-        string GetDotnetPath();
+    /// <returns>Full path to <c>dotnet</c> executable</returns>
+    /// <remarks>Debuggers require the full path of executable to launch it.</remarks>
+    string GetDotnetPath();
 
-        /// <summary>
-        /// Gets the full path of mono host.
-        /// </summary>
-        /// <returns>Full path to <c>mono</c> executable</returns>
-        string GetMonoPath();
+    /// <summary>
+    /// Gets the full path of mono host.
+    /// </summary>
+    /// <returns>Full path to <c>mono</c> executable</returns>
+    string GetMonoPath();
 
-        /// <summary>
-        /// Try to locate muxer of specific architecture
-        /// </summary>
-        /// <param name="targetArchitecture">Specific architecture</param>
-        /// <param name="muxerPath">Path to the muxer</param>
-        /// <returns>True if native muxer is found</returns>
-        bool TryGetDotnetPathByArchitecture(PlatformArchitecture targetArchitecture, out string muxerPath);
-    }
+    /// <summary>
+    /// Try to locate muxer of specific architecture
+    /// </summary>
+    /// <param name="targetArchitecture">Specific architecture</param>
+    /// <param name="dotnetMuxerResolutionStrategy">The dotnet muxer resolution strategy.</param>
+    /// <param name="muxerPath">Path to the muxer</param>
+    /// <returns>True if native muxer is found</returns>
+    bool TryGetDotnetPathByArchitecture(
+        PlatformArchitecture targetArchitecture,
+        DotnetMuxerResolutionStrategy dotnetMuxerResolutionStrategy,
+        out string? muxerPath);
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IEnvironmentVariableHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IEnvironmentVariableHelper.cs
index 7734fa2198..abf5cca1c4 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IEnvironmentVariableHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IEnvironmentVariableHelper.cs
@@ -1,10 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces
+using System;
+using System.Collections;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+internal interface IEnvironmentVariableHelper
 {
-    internal interface IEnvironmentVariableHelper
-    {
-        string GetEnvironmentVariable(string variable);
-    }
+    /// <summary>
+    /// Retrieves the value of an environment variable from the current process.
+    /// </summary>
+    /// <param name="variable">The name of the environment variable.</param>
+    /// <returns>The value of the environment variable specified by variable, or null if the environment variable is not found.</returns>
+    string? GetEnvironmentVariable(string variable);
+
+    /// <summary>
+    /// Retrieves the value of an environment variable from the current process and converts it to the given type.
+    /// </summary>
+    /// <typeparam name="TEnum">The type used for conversion.</typeparam>
+    /// <param name="variable">The name of the environment variable.</param>
+    /// <param name="defaultValue">The default value to return if the environment variable is not found.</param>
+    /// <returns></returns>
+    TEnum GetEnvironmentVariableAsEnum<TEnum>(string variable, TEnum defaultValue = default) where TEnum : struct, Enum;
+
+    /// <summary>
+    /// Creates, modifies, or deletes an environment variable stored in the current process.
+    /// </summary>
+    /// <param name="variable">The name of an environment variable.</param>
+    /// <param name="value">A value to assign to variable.</param>
+    void SetEnvironmentVariable(string variable, string value);
+
+    /// <summary>
+    /// Retrieves all environment variable names and their values from the current process.
+    /// </summary>
+    /// <returns>A dictionary that contains all environment variable names and their values; otherwise, an empty dictionary if no environment variables are found.</returns>
+    IDictionary GetEnvironmentVariables();
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
index 68d9f4f497..fb26029518 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IFileHelper.cs
@@ -1,151 +1,163 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+/// <summary>
+/// The FileHelper interface.
+/// </summary>
+public interface IFileHelper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// The FileHelper interface.
-    /// </summary>
-    public interface IFileHelper
-    {
-#if !NETSTANDARD1_0 
-        /// <summary>
-        /// Creates a directory.
-        /// </summary>
-        /// <param name="path">Path of the directory.</param>
-        /// <returns><see cref="DirectoryInfo"/> for the created directory.</returns>
-        DirectoryInfo CreateDirectory(string path);
-
-#endif
-        /// <summary>
-        /// Gets the current directory
-        /// </summary>
-        /// <returns>Current directory</returns>
-        string GetCurrentDirectory();
-
-        /// <summary>
-        /// Exists utility to check if file exists (case sensitive).
-        /// </summary>
-        /// <param name="path"> The path of file. </param>
-        /// <returns>True if file exists <see cref="bool"/>.</returns>
-        bool Exists(string path);
-
-        /// <summary>
-        /// Exists utility to check if directory exists (case sensitive).
-        /// </summary>
-        /// <param name="path"> The path of file. </param>
-        /// <returns>True if directory exists <see cref="bool"/>.</returns>
-        bool DirectoryExists(string path);
-
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Gets a stream for the file.
-        /// </summary>
-        /// <param name="filePath">Path to the file.</param>
-        /// <param name="mode"><see cref="FileMode"/> for file operations.</param>
-        /// <param name="access"><see cref="FileAccess"/> for file operations.</param>
-        /// <returns>A <see cref="Stream"/> that supports read/write on the file.</returns>
-#pragma warning disable RS0027 // Public API with optional parameter(s) should have the most parameters amongst its public overloads
-        Stream GetStream(string filePath, FileMode mode, FileAccess access = FileAccess.ReadWrite);
-#pragma warning restore RS0027 // Public API with optional parameter(s) should have the most parameters amongst its public overloads
-
-        /// <summary>
-        /// Gets a stream for the file.
-        /// </summary>
-        /// <param name="filePath">Path to the file.</param>
-        /// <param name="mode"><see cref="FileMode"/> for file operations.</param>
-        /// <param name="access"><see cref="FileAccess"/> for file operations.</param>
-        /// <param name="share"><see cref="FileShare"/> for file operations.</param>
-        /// <returns>A <see cref="Stream"/> that supports read/write on the file.</returns>
-        Stream GetStream(string filePath, FileMode mode, FileAccess access, FileShare share);
-
-        /// <summary>
-        /// Enumerates files which match a pattern (case insensitive) in a directory.
-        /// </summary>
-        /// <param name="directory">Parent directory to search.</param>
-        /// <param name="searchOption"><see cref="SearchOption"/> for directory.</param>
-        /// <param name="endsWithSearchPatterns">Patterns used to select files using String.EndsWith</param>
-        /// <returns>List of files matching the pattern.</returns>
-        IEnumerable<string> EnumerateFiles(string directory, SearchOption searchOption, params string[] endsWithSearchPatterns);
-
-        /// <summary>
-        /// Gets attributes of a file.
-        /// </summary>
-        /// <param name="path">Full path of the file.</param>
-        /// <returns>Attributes of the file.</returns>
-        FileAttributes GetFileAttributes(string path);
-#endif
-
-        /// <summary>
-        /// Gets the version information of the file.
-        /// </summary>
-        /// <param name="path">Full path to the file.</param>
-        /// <returns>File Version information of the file.</returns>
-        Version GetFileVersion(string path);
-
-        /// <summary>
-        /// Copy a file in the file system.
-        /// </summary>
-        /// <param name="sourcePath">Full path of the file.</param>
-        /// <param name="destinationPath">Target path for the file.</param>
-        void CopyFile(string sourcePath, string destinationPath);
-
-        /// <summary>
-        /// Moves a file in the file system.
-        /// </summary>
-        /// <param name="sourcePath">Full path of the file.</param>
-        /// <param name="destinationPath">Target path for the file.</param>
-        void MoveFile(string sourcePath, string destinationPath);
-
-        /// <summary>
-        /// The write all text to file.
-        /// </summary>
-        /// <param name="filePath">
-        /// The file Path.
-        /// </param>
-        /// <param name="content">
-        /// The content.
-        /// </param>
-        void WriteAllTextToFile(string filePath, string content);
-
-        /// <summary>
-        /// Gets full path if relative path is specified.
-        /// </summary>
-        /// <param name="path">
-        /// The path.
-        /// </param>
-        /// <returns>
-        /// Full path.
-        /// </returns>
-        string GetFullPath(string path);
-
-        /// <summary>
-        /// Helper for deleting a directory. It deletes the directory only if its empty.
-        /// </summary>
-        /// <param name="directoryPath">
-        /// The directory path.
-        /// </param>
-        void DeleteEmptyDirectroy(string directoryPath);
-
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Gets all files in directory based on search pattern
-        /// </summary>
-        /// <param name="path">Directory Path</param>
-        /// <param name="searchPattern">Search pattern</param>
-        /// <param name="searchOption">Search option</param>
-        /// <returns>string[]</returns>
-        string[] GetFiles(string path, string searchPattern, SearchOption searchOption);
-#endif
-
-        /// <summary>
-        /// Deletes the specified file
-        /// </summary>
-        /// <param name="path"></param>
-        void Delete(string path);
-    }
+    /// <summary>
+    /// Creates a directory.
+    /// </summary>
+    /// <param name="path">Path of the directory.</param>
+    /// <returns><see cref="DirectoryInfo"/> for the created directory.</returns>
+    DirectoryInfo CreateDirectory(string path);
+
+    /// <summary>
+    /// Gets the current directory
+    /// </summary>
+    /// <returns>Current directory</returns>
+    string GetCurrentDirectory();
+
+    /// <summary>
+    /// Exists utility to check if file exists (case sensitive).
+    /// </summary>
+    /// <param name="path"> The path of file. </param>
+    /// <returns>True if file exists <see cref="bool"/>.</returns>
+    bool Exists([NotNullWhen(true)] string? path);
+
+    /// <summary>
+    /// Exists utility to check if directory exists (case sensitive).
+    /// </summary>
+    /// <param name="path"> The path of file. </param>
+    /// <returns>True if directory exists <see cref="bool"/>.</returns>
+    bool DirectoryExists([NotNullWhen(true)] string? path);
+
+    /// <summary>
+    /// Gets a stream for the file.
+    /// </summary>
+    /// <param name="filePath">Path to the file.</param>
+    /// <param name="mode"><see cref="FileMode"/> for file operations.</param>
+    /// <param name="access"><see cref="FileAccess"/> for file operations.</param>
+    /// <returns>A <see cref="Stream"/> that supports read/write on the file.</returns>
+    Stream GetStream(string filePath, FileMode mode, FileAccess access = FileAccess.ReadWrite);
+
+    /// <summary>
+    /// Gets a stream for the file.
+    /// </summary>
+    /// <param name="filePath">Path to the file.</param>
+    /// <param name="mode"><see cref="FileMode"/> for file operations.</param>
+    /// <param name="access"><see cref="FileAccess"/> for file operations.</param>
+    /// <param name="share"><see cref="FileShare"/> for file operations.</param>
+    /// <returns>A <see cref="Stream"/> that supports read/write on the file.</returns>
+    Stream GetStream(string filePath, FileMode mode, FileAccess access, FileShare share);
+
+    /// <summary>
+    /// Enumerates files which match a pattern (case insensitive) in a directory.
+    /// </summary>
+    /// <param name="directory">Parent directory to search.</param>
+    /// <param name="searchOption"><see cref="SearchOption"/> for directory.</param>
+    /// <param name="endsWithSearchPatterns">Patterns used to select files using String.EndsWith</param>
+    /// <returns>List of files matching the pattern.</returns>
+    IEnumerable<string> EnumerateFiles(string directory, SearchOption searchOption, params string[]? endsWithSearchPatterns);
+
+    /// <summary>
+    /// Gets attributes of a file.
+    /// </summary>
+    /// <param name="path">Full path of the file.</param>
+    /// <returns>Attributes of the file.</returns>
+    FileAttributes GetFileAttributes(string path);
+
+    /// <summary>
+    /// Gets the version information of the file.
+    /// </summary>
+    /// <param name="path">Full path to the file.</param>
+    /// <returns>File Version information of the file.</returns>
+    Version GetFileVersion(string path);
+
+    /// <summary>
+    /// Copy a file in the file system.
+    /// </summary>
+    /// <param name="sourcePath">Full path of the file.</param>
+    /// <param name="destinationPath">Target path for the file.</param>
+    void CopyFile(string sourcePath, string destinationPath);
+
+    /// <summary>
+    /// Moves a file in the file system.
+    /// </summary>
+    /// <param name="sourcePath">Full path of the file.</param>
+    /// <param name="destinationPath">Target path for the file.</param>
+    void MoveFile(string sourcePath, string destinationPath);
+
+    /// <summary>
+    /// The write all text to file.
+    /// </summary>
+    /// <param name="filePath">
+    /// The file Path.
+    /// </param>
+    /// <param name="content">
+    /// The content.
+    /// </param>
+    void WriteAllTextToFile(string filePath, string content);
+
+    /// <summary>
+    /// Gets full path if relative path is specified.
+    /// </summary>
+    /// <param name="path">
+    /// The path.
+    /// </param>
+    /// <returns>
+    /// Full path.
+    /// </returns>
+    string GetFullPath(string path);
+
+    /// <summary>
+    /// Helper for deleting a directory. It deletes the directory only if its empty.
+    /// </summary>
+    /// <param name="directoryPath">
+    /// The directory path.
+    /// </param>
+    void DeleteEmptyDirectroy(string directoryPath);
+
+    /// <summary>
+    /// Helper for deleting a directory.
+    /// </summary>
+    /// <param name="directoryPath">
+    /// The directory path.
+    /// </param>
+    /// <param name="recursive">If we should delete recursively.</param>
+    void DeleteDirectory(string directoryPath, bool recursive);
+
+    /// <summary>
+    /// Gets all files in directory based on search pattern
+    /// </summary>
+    /// <param name="path">Directory Path</param>
+    /// <param name="searchPattern">Search pattern</param>
+    /// <param name="searchOption">Search option</param>
+    /// <returns>string[]</returns>
+    string[] GetFiles(string path, string searchPattern, SearchOption searchOption);
+
+    /// <summary>
+    /// Deletes the specified file
+    /// </summary>
+    /// <param name="path"></param>
+    void Delete(string path);
+
+    /// <summary>
+    /// Get temporary file path
+    /// </summary>
+    public string GetTempPath();
+
+    /// <summary>
+    /// Get file length
+    /// </summary>
+    /// <param name="path"></param>
+    public long GetFileLength(string path);
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IRunsettingsHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IRunsettingsHelper.cs
index 21064568a2..5478faa460 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IRunsettingsHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IRunsettingsHelper.cs
@@ -1,10 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+internal interface IRunSettingsHelper
 {
-    internal interface IRunSettingsHelper
-    {
-        bool IsDefaultTargetArchitecture { get; set; }
-    }
+    bool IsDefaultTargetArchitecture { get; set; }
+
+    bool IsDesignMode { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IWindowsRegistryHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IWindowsRegistryHelper.cs
index 27328f76c4..e692007f3a 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IWindowsRegistryHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/Interfaces/IWindowsRegistryHelper.cs
@@ -1,27 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-
-#if !NETSTANDARD1_0 
-
 using System;
+
 using Microsoft.Win32;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+internal interface IWindowsRegistryHelper
 {
-    internal interface IWindowsRegistryHelper
-    {
-        IRegistryKey OpenBaseKey(RegistryHive hKey, RegistryView view);
-    }
+    IRegistryKey? OpenBaseKey(RegistryHive hKey, RegistryView view);
+}
 
-    internal interface IRegistryKey : IDisposable
-    {
-        IRegistryKey OpenSubKey(string name);
+internal interface IRegistryKey : IDisposable
+{
+    IRegistryKey? OpenSubKey(string name);
 
-        object GetValue(string name);
+    object? GetValue(string name);
 
-        string[] GetSubKeyNames();
-    }
+    string[]? GetSubKeyNames();
 }
-
-#endif
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/RunSettingsHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/RunSettingsHelper.cs
index 8b2387a845..2679c50e68 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/RunSettingsHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/RunSettingsHelper.cs
@@ -3,21 +3,28 @@
 
 using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+/// <summary>
+/// RunSettingsHelper is used to globally share additional informations about the state of runsettings.
+/// </summary>
+internal class RunSettingsHelper : IRunSettingsHelper
 {
+    private static readonly IRunSettingsHelper RunSettings = new RunSettingsHelper();
+
+    public static IRunSettingsHelper Instance = RunSettings;
+
     /// <summary>
-    /// RunSettingsHelper is used to globally share additional informations about the state of runsettings.
+    /// If false user updated the RunConfiguration.TargetPlatform using
+    /// --arch or runsettings file or -- RunConfiguration.TargetPlatform=arch
+    /// This option is needed because we otherwise don't know if user specified an architecture or if we inferred it from
+    /// the dll. When we add the capability to distinguish this in runsettings, this helper won't be needed.
     /// </summary>
-    internal class RunSettingsHelper : IRunSettingsHelper
-    {
-        private static IRunSettingsHelper runSettings = new RunSettingsHelper();
+    public bool IsDefaultTargetArchitecture { get; set; } = true;
 
-        public static IRunSettingsHelper Instance = runSettings;
-
-        /// <summary>
-        /// If false user updated the RunConfiguration.TargetPlatform using
-        /// --arch or runsettings file or -- RunConfiguration.TargetPlatform=arch
-        /// </summary>
-        public bool IsDefaultTargetArchitecture { get; set; } = true;
-    }
+    /// <summary>
+    /// True indicates the test run is started from an Editor or IDE.
+    /// Defaults to false.
+    /// </summary>
+    public bool IsDesignMode { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/WindowsRegistryHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/WindowsRegistryHelper.cs
index 82c0ed59f1..a5e8a20b50 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/WindowsRegistryHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/WindowsRegistryHelper.cs
@@ -1,50 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0 
-
 using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
 using Microsoft.Win32;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers
+namespace Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+internal class WindowsRegistryHelper : IWindowsRegistryHelper
 {
-    internal class WindowsRegistryHelper : IWindowsRegistryHelper
+    public IRegistryKey? OpenBaseKey(RegistryHive hKey, RegistryView view)
     {
-        public IRegistryKey OpenBaseKey(RegistryHive hKey, RegistryView view)
-        {
-            var keyRegistry = RegistryKey.OpenBaseKey(hKey, view);
-            return keyRegistry is null ? null : new RegistryKeyWrapper(keyRegistry);
-        }
+        var keyRegistry = RegistryKey.OpenBaseKey(hKey, view);
+        return keyRegistry is null ? null : new RegistryKeyWrapper(keyRegistry);
     }
+}
 
-    internal class RegistryKeyWrapper : IRegistryKey
+internal class RegistryKeyWrapper : IRegistryKey
+{
+    private readonly RegistryKey _registryKey;
+
+    public RegistryKeyWrapper(RegistryKey registryKey)
     {
-        private readonly RegistryKey registryKey;
-
-        public RegistryKeyWrapper(RegistryKey registryKey)
-        {
-            this.registryKey = registryKey;
-        }
-
-        public object GetValue(string name)
-        {
-            return registryKey?.GetValue(name)?.ToString();
-        }
-
-        public IRegistryKey OpenSubKey(string name)
-        {
-            var keyRegistry = this.registryKey.OpenSubKey(name);
-            return keyRegistry is null ? null : new RegistryKeyWrapper(keyRegistry);
-        }
-
-        public string[] GetSubKeyNames()
-            => this.registryKey?.GetSubKeyNames();
-
-        public void Dispose()
-        {
-            this.registryKey?.Dispose();
-        }
+        _registryKey = registryKey;
     }
-}
 
-#endif
\ No newline at end of file
+    public object? GetValue(string name)
+    {
+        return _registryKey?.GetValue(name)?.ToString();
+    }
+
+    public IRegistryKey? OpenSubKey(string name)
+    {
+        var keyRegistry = _registryKey.OpenSubKey(name);
+        return keyRegistry is null ? null : new RegistryKeyWrapper(keyRegistry);
+    }
+
+    public string[]? GetSubKeyNames()
+        => _registryKey?.GetSubKeyNames();
+
+    public void Dispose()
+    {
+        _registryKey?.Dispose();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index 86c6365b68..866225a77c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -1,38 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net451;net45</TargetFrameworks>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0;netstandard1.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-
-    <!-- On non windows environment, make UAP behave like desktop .NET framework -->
-    <TargetFrameworkIdentifier Condition="'$(OS)' != 'Windows_NT'">.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion Condition="'$(OS)' != 'Windows_NT'">v4.5.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR  '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />
 
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Configuration" />
     <Reference Include="System" />
     <Reference Include="System.IO" />
@@ -41,16 +16,17 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' AND '$(TargetFramework)' != 'net45' AND '$(TargetFramework)' != 'netstandard1.0' ">
-    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.0' ">
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -64,31 +40,39 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-  <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
-	  <!-- API that is common to all frameworks that we build for. -->
-	  <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
-	  <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
-	  <!-- API that is common to all frameworks except for .NET Standard 1.0. -->
-	  <AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Shipped.txt" />
-	  <AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
-	  <!-- Framework specific API -->
-	  <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-	  <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API net8.0+ -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Unshipped.txt" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <!-- We normally don't build against net6.0, so the public api analyzer errors would only appear in CI pipeline. -->
-    <PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4-beta1.21554.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CoreUtilities</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.cs b/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.cs
new file mode 100644
index 0000000000..38f7ec583f
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.tt b/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Output/ConsoleOutput.cs b/src/Microsoft.TestPlatform.CoreUtilities/Output/ConsoleOutput.cs
index d4b36eb43c..79493af133 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Output/ConsoleOutput.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Output/ConsoleOutput.cs
@@ -1,92 +1,84 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
+using System;
+using System.IO;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Sends output to the console.
+/// </summary>
+public class ConsoleOutput : IOutput
 {
-    using System;
-    using System.IO;
+    private static readonly object LockObject = new();
+    private static ConsoleOutput? s_consoleOutput;
+
+    private readonly TextWriter _standardOutput;
+    private readonly TextWriter _standardError;
 
     /// <summary>
-    /// Sends output to the console.
+    /// Initializes a new instance of the <see cref="ConsoleOutput"/> class.
     /// </summary>
-    public class ConsoleOutput : IOutput
+    internal ConsoleOutput()
     {
-        private static object lockObject = new object();
-        private static ConsoleOutput consoleOutput = null;
-
-        private TextWriter standardOutput = null;
-        private TextWriter standardError = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConsoleOutput"/> class.
-        /// </summary>
-        internal ConsoleOutput()
-        {
-            this.standardOutput = Console.Out;
-            this.standardError = Console.Error;
-        }
+        _standardOutput = Console.Out;
+        _standardError = Console.Error;
+    }
 
-        /// <summary>
-        /// Gets the instance of <see cref="ConsoleOutput"/>.
-        /// </summary>
-        public static ConsoleOutput Instance
+    /// <summary>
+    /// Gets the instance of <see cref="ConsoleOutput"/>.
+    /// </summary>
+    public static ConsoleOutput Instance
+    {
+        get
         {
-            get
+            if (s_consoleOutput != null)
             {
-                if (consoleOutput != null)
-                {
-                    return consoleOutput;
-                }
-
-                lock (lockObject)
-                {
-                    if (consoleOutput == null)
-                    {
-                        consoleOutput = new ConsoleOutput();
-                    }
-                }
+                return s_consoleOutput;
+            }
 
-                return consoleOutput;
+            lock (LockObject)
+            {
+                s_consoleOutput ??= new ConsoleOutput();
             }
-        }
 
-        /// <summary>
-        /// Writes the message with a new line.
-        /// </summary>
-        /// <param name="message">Message to be output.</param>
-        /// <param name="level">Level of the message.</param>
-        public void WriteLine(string message, OutputLevel level)
-        {
-            this.Write(message, level);
-            this.Write(Environment.NewLine, level);
+            return s_consoleOutput;
         }
+    }
+
+    /// <summary>
+    /// Writes the message with a new line.
+    /// </summary>
+    /// <param name="message">Message to be output.</param>
+    /// <param name="level">Level of the message.</param>
+    public void WriteLine(string? message, OutputLevel level)
+    {
+        Write(message, level);
+        Write(Environment.NewLine, level);
+    }
 
-        /// <summary>
-        /// Writes the message with no new line.
-        /// </summary>
-        /// <param name="message">Message to be output.</param>
-        /// <param name="level">Level of the message.</param>
-        public void Write(string message, OutputLevel level)
+    /// <summary>
+    /// Writes the message with no new line.
+    /// </summary>
+    /// <param name="message">Message to be output.</param>
+    /// <param name="level">Level of the message.</param>
+    public void Write(string? message, OutputLevel level)
+    {
+        switch (level)
         {
-            switch (level)
-            {
-                case OutputLevel.Information:
-                case OutputLevel.Warning:
-                    this.standardOutput.Write(message);
-                    break;
+            case OutputLevel.Information:
+            case OutputLevel.Warning:
+                _standardOutput.Write(message);
+                break;
 
-                case OutputLevel.Error:
-                    this.standardError.Write(message);
-                    break;
+            case OutputLevel.Error:
+                _standardError.Write(message);
+                break;
 
-                default:
-                    this.standardOutput.Write("ConsoleOutput.WriteLine: The output level is unrecognized: {0}", level);
-                    break;
-            }
+            default:
+                _standardOutput.Write("ConsoleOutput.WriteLine: The output level is unrecognized: {0}", level);
+                break;
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Output/IOutput.cs b/src/Microsoft.TestPlatform.CoreUtilities/Output/IOutput.cs
index 599d51fbe0..42e61f766f 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Output/IOutput.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Output/IOutput.cs
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Interface to output information under the command line.
+/// </summary>
+public interface IOutput
 {
     /// <summary>
-    /// Interface to output information under the command line.
+    /// Writes the message with a new line.
     /// </summary>
-    public interface IOutput
-    {
-        /// <summary>
-        /// Writes the message with a new line.
-        /// </summary>
-        /// <param name="message">Message to be output.</param>
-        /// <param name="level">Level of the message.</param>
-        void WriteLine(string message, OutputLevel level);
+    /// <param name="message">Message to be output.</param>
+    /// <param name="level">Level of the message.</param>
+    void WriteLine(string? message, OutputLevel level);
 
-        /// <summary>
-        /// Writes the message with no new line.
-        /// </summary>
-        /// <param name="message">Message to be output.</param>
-        /// <param name="level">Level of the message.</param>
-        void Write(string message, OutputLevel level);
-    }
+    /// <summary>
+    /// Writes the message with no new line.
+    /// </summary>
+    /// <param name="message">Message to be output.</param>
+    /// <param name="level">Level of the message.</param>
+    void Write(string? message, OutputLevel level);
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputExtensions.cs b/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputExtensions.cs
index 915b0c45d5..2a4755e8f1 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputExtensions.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputExtensions.cs
@@ -1,159 +1,139 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0 && !WINDOWS_UWP
+using System;
+using System.Globalization;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Utility Methods for sending output to IOutput.
+/// </summary>
+public static class OutputExtensions
 {
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+    private const string DefaultFormat = "{0}";
 
-    using System;
-    using System.Globalization;
+    /// <summary>
+    /// Output an error message.
+    /// </summary>
+    /// <param name="output">Output instance the method is being invoked with.</param>
+    /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
+    /// <param name="format">Format string for the error message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    public static void Error(this IOutput output, bool appendPrefix, string format, params object?[]? args)
+    {
+        SetColorForAction(ConsoleColor.Red, () => Output(output, OutputLevel.Error, appendPrefix ? Resources.CommandLineError : DefaultFormat, format, args));
+    }
 
     /// <summary>
-    /// Utility Methods for sending output to IOutput.
+    /// Output a warning message.
     /// </summary>
-    public static class OutputExtensions
+    /// <param name="output">Output instance the method is being invoked with.</param>
+    /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
+    /// <param name="format">Format string for the warning message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    public static void Warning(this IOutput output, bool appendPrefix, string format, params object?[]? args)
     {
-        private const string DefaultFormat = "{0}";
+        SetColorForAction(ConsoleColor.Yellow, () => Output(output, OutputLevel.Warning, appendPrefix ? Resources.CommandLineWarning : DefaultFormat, format, args));
+    }
 
-        /// <summary>
-        /// Output an error message.
-        /// </summary>
-        /// <param name="output">Output instance the method is being invoked with.</param>
-        /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
-        /// <param name="format">Format string for the error message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        public static void Error(this IOutput output, bool appendPrefix, string format, params object[] args)
-        {
-            SetColorForAction(ConsoleColor.Red, () =>
-            {
-                Output(output, OutputLevel.Error, appendPrefix ? Resources.CommandLineError : DefaultFormat, format, args);
-            });
-        }
+    /// <summary>
+    /// Output a informational message.
+    /// </summary>
+    /// <param name="output">Output instance the method is being invoked with.</param>
+    /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
+    /// <param name="format">Format string for the informational message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    public static void Information(this IOutput output, bool appendPrefix, string format, params object?[]? args)
+    {
+        Information(output, appendPrefix, Console.ForegroundColor, format, args);
+    }
 
-        /// <summary>
-        /// Output a warning message.
-        /// </summary>
-        /// <param name="output">Output instance the method is being invoked with.</param>
-        /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
-        /// <param name="format">Format string for the warning message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        public static void Warning(this IOutput output, bool appendPrefix, string format, params object[] args)
-        {
-            SetColorForAction(ConsoleColor.Yellow, () =>
-            {
-                Output(output, OutputLevel.Warning, appendPrefix ? Resources.CommandLineWarning : DefaultFormat, format, args);
-            });
-        }
+    /// <summary>
+    /// Output a informational message.
+    /// </summary>
+    /// <param name="output">Output instance the method is being invoked with.</param>
+    /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
+    /// <param name="foregroundColor">Color in which text prints.</param>
+    /// <param name="format">Format string for the informational message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    public static void Information(this IOutput output, bool appendPrefix, ConsoleColor foregroundColor, string format, params object?[]? args)
+    {
+        SetColorForAction(foregroundColor, () => Output(output, OutputLevel.Information, appendPrefix ? Resources.CommandLineInformational : DefaultFormat, format, args));
+    }
 
-        /// <summary>
-        /// Output a informational message.
-        /// </summary>
-        /// <param name="output">Output instance the method is being invoked with.</param>
-        /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
-        /// <param name="format">Format string for the informational message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        public static void Information(this IOutput output, bool appendPrefix, string format, params object[] args)
-        {
-            Information(output, appendPrefix, Console.ForegroundColor, format, args);
-        }
+    /// <summary>
+    /// Write string with a given console color
+    /// </summary>
+    /// <param name="output">Output instance the method is being invoked with.</param>
+    /// <param name="message">Message to be written</param>
+    /// <param name="level">OutputLevel</param>
+    /// <param name="foregroundColor">Console color for the output message</param>
+    public static void Write(this IOutput output, string message, OutputLevel level, ConsoleColor foregroundColor)
+    {
+        SetColorForAction(foregroundColor, () => output.Write(message, level));
+    }
 
-        /// <summary>
-        /// Output a informational message.
-        /// </summary>
-        /// <param name="output">Output instance the method is being invoked with.</param>
-        /// <param name="appendPrefix">Bool to decide whether Verbose level should be added as prefix or not in log messages.</param>
-        /// <param name="foregroundColor">Color in which text prints.</param>
-        /// <param name="format">Format string for the informational message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        public static void Information(this IOutput output, bool appendPrefix, ConsoleColor foregroundColor, string format, params object[] args)
+    /// <summary>
+    /// Formats the message.
+    /// </summary>
+    /// <param name="output">An output instance to write the message.</param>
+    /// <param name="level">Message level.</param>
+    /// <param name="messageTypeFormat">Format string for the message type.</param>
+    /// <param name="format">Format string for the error message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    private static void Output(IOutput output, OutputLevel level, string messageTypeFormat, string format, params object?[]? args)
+    {
+        ValidateArg.NotNull(output, nameof(output));
+        output.WriteLine(Format(messageTypeFormat, format, args), level);
+    }
+
+    /// <summary>
+    /// Formats the message.
+    /// </summary>
+    /// <param name="messageTypeFormat">Format string for the message type.</param>
+    /// <param name="format">Format string for the error message.</param>
+    /// <param name="args">Arguments to format into the format string.</param>
+    /// <returns>Formatted message.</returns>
+    private static string Format(string messageTypeFormat, string format, params object?[]? args)
+    {
+        if (format == null || string.IsNullOrEmpty(format.Trim()))
         {
-            SetColorForAction(foregroundColor, () =>
-            {
-                Output(output, OutputLevel.Information, appendPrefix ? Resources.CommandLineInformational : DefaultFormat, format, args);
-            });
+            throw new ArgumentException(Resources.CannotBeNullOrEmpty, nameof(format));
         }
 
-        /// <summary>
-        /// Write string with a given console color
-        /// </summary>
-        /// <param name="output">Output instance the method is being invoked with.</param>
-        /// <param name="message">Message to be written</param>
-        /// <param name="level">OutputLevel</param>
-        /// <param name="foregroundColor">Console color for the output message</param>
-        public static void Write(this IOutput output, string message, OutputLevel level, ConsoleColor foregroundColor)
+        string message = args != null && args.Length > 0 ? string.Format(CultureInfo.CurrentCulture, format, args) : format;
+        return string.Format(CultureInfo.CurrentCulture, messageTypeFormat, message);
+    }
+
+    private static void SetColorForAction(ConsoleColor foregroundColor, Action action)
+    {
+        if (action == null)
         {
-            SetColorForAction(foregroundColor, () =>
-            {
-                output.Write(message, level);
-            });
+            return;
         }
 
-        /// <summary>
-        /// Formats the message.
-        /// </summary>
-        /// <param name="output">An output instance to write the message.</param>
-        /// <param name="level">Message level.</param>
-        /// <param name="messageTypeFormat">Format string for the message type.</param>
-        /// <param name="format">Format string for the error message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        private static void Output(IOutput output, OutputLevel level, string messageTypeFormat, string format, params object[] args)
+#if NET5_0_OR_GREATER
+        if (OperatingSystem.IsAndroid() || OperatingSystem.IsIOS() || OperatingSystem.IsBrowser() || OperatingSystem.IsTvOS())
         {
-            if (output == null)
-            {
-                throw new ArgumentNullException(nameof(output));
-            }
-
-            output.WriteLine(Format(messageTypeFormat, format, args), level);
+            // Console color not supported on these platforms.
+            action.Invoke();
+            return;
         }
+#endif
 
-        /// <summary>
-        /// Formats the message.
-        /// </summary>
-        /// <param name="messageTypeFormat">Format string for the message type.</param>
-        /// <param name="format">Format string for the error message.</param>
-        /// <param name="args">Arguments to format into the format string.</param>
-        /// <returns>Formatted message.</returns>
-        private static string Format(string messageTypeFormat, string format, params object[] args)
+        var previousForegroundColor = Console.ForegroundColor;
+        try
         {
-            if (format == null || string.IsNullOrEmpty(format.Trim()))
-            {
-                throw new ArgumentException(Resources.CannotBeNullOrEmpty, nameof(format));
-            }
-
-            string message = null;
-            if (args != null && args.Length > 0)
-            {
-                message = string.Format(CultureInfo.CurrentCulture, format, args);
-            }
-            else
-            {
-                message = format;
-            }
-
-            return string.Format(CultureInfo.CurrentCulture, messageTypeFormat, message);
+            Console.ForegroundColor = foregroundColor;
+            action.Invoke();
         }
-
-        private static void SetColorForAction(ConsoleColor foregroundColor, Action action)
+        finally
         {
-            if (action == null)
-            {
-                return;
-            }
-
-            var previousForegroundColor = Console.ForegroundColor;
-            try
-            {
-                Console.ForegroundColor = foregroundColor;
-                action.Invoke();
-            }
-            finally
-            {
-                Console.ForegroundColor = previousForegroundColor;
-            }
+            Console.ForegroundColor = previousForegroundColor;
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputLevel.cs b/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputLevel.cs
index 87c1381805..08d4a84983 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputLevel.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Output/OutputLevel.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Defines the level of output.
+/// </summary>
+public enum OutputLevel
 {
     /// <summary>
-    /// Defines the level of output.
+    /// Informational message.
     /// </summary>
-    public enum OutputLevel
-    {
-        /// <summary>
-        /// Informational message.
-        /// </summary>
-        Information = 0,
+    Information = 0,
 
-        /// <summary>
-        /// Warning message.
-        /// </summary>
-        Warning = 1,
+    /// <summary>
+    /// Warning message.
+    /// </summary>
+    Warning = 1,
 
-        /// <summary>
-        /// Error message.
-        /// </summary>
-        Error = 2,
-    }
+    /// <summary>
+    /// Error message.
+    /// </summary>
+    Error = 2,
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.CoreUtilities/Properties/AssemblyInfo.cs
index 167c461f4c..7c61240ca3 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Properties/AssemblyInfo.cs
@@ -1,35 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Resources;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.CoreUtilities")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
 
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestHostRuntimeProvider, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CoreUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.VsTestConsole.TranslationLayer, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestHostProvider.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
-
-# if !NETSTANDARD1_0
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d472046e-ed17-4750-a2a3-29935b5215f6")]
-#endif
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.BlameDataCollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Common.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Shipped.txt
index 4854efbf2f..61e06a5910 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Shipped.txt
@@ -1,11 +1,12 @@
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.DatacollectorProcessName = "datacollector" -> string
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.DotNetUserSpecifiedCulture = "DOTNET_CLI_UI_LANGUAGE" -> string
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.DatacollectorProcessName = "datacollector" -> string!
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.DotNetUserSpecifiedCulture = "DOTNET_CLI_UI_LANGUAGE" -> string!
 const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.StandardErrorMaxLength = 8192 -> int
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.TesthostProcessName = "testhost" -> string
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.TestSourcesKeyName = "TestSources" -> string
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.VstestConsoleProcessName = "vstest.console" -> string
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.TesthostProcessName = "testhost" -> string!
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.TestSourcesKeyName = "TestSources" -> string!
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.VstestConsoleProcessName = "vstest.console" -> string!
 const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper.DefaultConnectionTimeout = 90 -> int
-const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper.VstestConnectionTimeout = "VSTEST_CONNECTION_TIMEOUT" -> string
+const Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper.VstestConnectionTimeout = "VSTEST_CONNECTION_TIMEOUT" -> string!
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.Constants() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions.StringBuilderExtensions
@@ -15,13 +16,13 @@ Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHe
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper.EnvironmentHelper() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterDiscoveryStart(string executorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterDiscoveryStart(string! executorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterDiscoveryStop(long numberOfTests) -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterExecutionStart(string executorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterExecutionStart(string! executorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterExecutionStop(long numberOfTests) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterSearchStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.AdapterSearchStop() -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.DataCollectionStart(string dataCollectorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.DataCollectionStart(string! dataCollectorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.DataCollectionStop() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.DiscoveryRequestStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.DiscoveryRequestStop() -> void
@@ -47,7 +48,7 @@ Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatfo
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TestRunAttachmentsProcessingStop(long numberOfAttachments) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerDiscoveryStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerDiscoveryStop() -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string! runSettings) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerExecutionStop() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerInitializeStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.TranslationLayerInitializeStop() -> void
@@ -60,30 +61,33 @@ Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatfo
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.VsTestConsoleStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource.VsTestConsoleStop() -> void
 Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.GetDotnetPath() -> string
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.GetMonoPath() -> string
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.TryGetDotnetPathByArchitecture(Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture targetArchitecture, out string muxerPath) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.GetDotnetPath() -> string!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.GetMonoPath() -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty
 Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.CopyFile(string sourcePath, string destinationPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.Delete(string path) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.DeleteEmptyDirectroy(string directoryPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.DirectoryExists(string path) -> bool
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.Exists(string path) -> bool
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetCurrentDirectory() -> string
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFileVersion(string path) -> System.Version
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFullPath(string path) -> string
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.MoveFile(string sourcePath, string destinationPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.WriteAllTextToFile(string filePath, string content) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.CopyFile(string! sourcePath, string! destinationPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.Delete(string! path) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.DeleteEmptyDirectroy(string! directoryPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.DeleteDirectory(string! directoryPath, bool recursive) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetTempPath() -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFileLength(string! path) -> long
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.DirectoryExists(string? path) -> bool
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.Exists(string? path) -> bool
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetCurrentDirectory() -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFileVersion(string! path) -> System.Version!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFullPath(string! path) -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.MoveFile(string! sourcePath, string! destinationPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.WriteAllTextToFile(string! filePath, string! content) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.IOutput
-Microsoft.VisualStudio.TestPlatform.Utilities.IOutput.Write(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.IOutput.WriteLine(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.IOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.IOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.Dispose() -> void
+virtual Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.Dispose(bool disposing) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.Flush() -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.JobQueue(System.Action<T> processJob, string displayName, int maxQueueLength, int maxQueueSize, bool enableBounds, System.Action<string> exceptionLogger) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.JobQueue(System.Action<T?>! processJob, string! displayName, int maxQueueLength, int maxQueueSize, bool enableBounds, System.Action<string!>! exceptionLogger) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.Pause() -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.QueueJob(T job, int jobSize) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.Resume() -> void
@@ -93,72 +97,82 @@ Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel.Error = 2 -> Microsoft
 Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel.Information = 0 -> Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel
 Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel.Warning = 1 -> Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel
 Microsoft.VisualStudio.TestPlatform.Utilities.TimeSpanParser
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions.StringBuilderExtensions.AppendSafeWithNewLine(this System.Text.StringBuilder result, string data) -> void
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions.StringExtensions.AddDoubleQuote(this string value) -> string
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetArgumentsDictionary(string[] args) -> System.Collections.Generic.IDictionary<string, string>
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetIntArgFromDict(System.Collections.Generic.IDictionary<string, string> argsDictionary, string fullname) -> int
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetStringArgFromDict(System.Collections.Generic.IDictionary<string, string> argsDictionary, string fullname) -> string
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.TryGetIntArgFromDict(System.Collections.Generic.IDictionary<string, string> argsDictionary, string fullname, out int value) -> bool
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions.StringBuilderExtensions.AppendSafeWithNewLine(this System.Text.StringBuilder! result, string? data) -> void
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions.StringExtensions.AddDoubleQuote(this string! value) -> string!
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetArgumentsDictionary(string![]? args) -> System.Collections.Generic.IDictionary<string!, string?>!
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetIntArgFromDict(System.Collections.Generic.IDictionary<string!, string?>! argsDictionary, string! fullname) -> int
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.GetStringArgFromDict(System.Collections.Generic.IDictionary<string!, string?>! argsDictionary, string! fullname) -> string?
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.CommandLineArgumentsHelper.TryGetIntArgFromDict(System.Collections.Generic.IDictionary<string!, string?>! argsDictionary, string! fullname, out int value) -> bool
 static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.EnvironmentHelper.GetConnectionTimeout() -> int
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.DoNotInitailize.get -> bool
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.DoNotInitailize.set -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(System.Exception exceptionToTrace) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorAssert(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.get -> string
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(System.Exception! exceptionToTrace) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorAssert(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.get -> string?
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.set -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeVerboseTrace(string customLogFile) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeVerboseTrace(string? customLogFile) -> bool
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsErrorEnabled.get -> bool
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsInfoEnabled.get -> bool
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsVerboseEnabled.get -> bool
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsWarningEnabled.get -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(int arg, string parameterName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(long arg, string parameterName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNull<T>(T arg, string parameterName) -> T
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty(string arg, string parameterName) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty<T>(System.Collections.Generic.IEnumerable<T> arg, string parameterName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrWhiteSpace(string arg, string parameterName) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.TypeOf<T>(object arg, string parameterName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNegative(int arg, string parameterName, string propertyName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNull(object arg, string parameterName, string propertyName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNullOrEmpty(string arg, string parameterName, string propertyName) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.TypeOf<T>(object arg, string parameterName, string propertyName) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.MulticastDelegateUtilities.SafeInvoke(this System.Delegate delegates, object sender, System.EventArgs args, string traceDisplayName) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.TimeSpanParser.Parse(string time) -> System.TimeSpan
-static Microsoft.VisualStudio.TestPlatform.Utilities.TimeSpanParser.TryParse(string time, out System.TimeSpan result) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.LogFile.get -> string?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(int arg, string! parameterName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(long arg, string! parameterName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNull<T>(T? arg, string! parameterName) -> T
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty(string? arg, string! parameterName) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty<T>(System.Collections.Generic.IEnumerable<T>? arg, string! parameterName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrWhiteSpace(string? arg, string! parameterName) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.TypeOf<T>(object? arg, string! parameterName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNegative(int arg, string! parameterName, string! propertyName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNull(object? arg, string! parameterName, string! propertyName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.NotNullOrEmpty(string? arg, string! parameterName, string! propertyName) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArgProperty.TypeOf<T>(object? arg, string! parameterName, string! propertyName) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.MulticastDelegateUtilities.SafeInvoke(this System.Delegate? delegates, object? sender, System.EventArgs! args, string! traceDisplayName) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.TimeSpanParser.Parse(string? time) -> System.TimeSpan
+static Microsoft.VisualStudio.TestPlatform.Utilities.TimeSpanParser.TryParse(string? time, out System.TimeSpan result) -> bool
 virtual Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.WaitForQueueToGetEmpty() -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.MulticastDelegateUtilities.SafeInvoke(this System.Delegate? delegates, object? sender, object! args, string! traceDisplayName) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<T>.IsPaused.get -> bool
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.Default = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DotnetRootArchitecture | Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess | Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.GlobalInstallationLocation | Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DefaultInstallationLocation -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DefaultInstallationLocation = 8 -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DotnetRootArchitecture = 1 -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess = 2 -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy.GlobalInstallationLocation = 4 -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.TryGetDotnetPathByArchitecture(Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture targetArchitecture, Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy dotnetMuxerResolutionStrategy, out string? muxerPath) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces.IDotnetHostHelper.TryGetDotnetPathByArchitecture(Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture targetArchitecture, Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers.DotnetMuxerResolutionStrategy dotnetMuxerResolutionStrategy, out string? muxerPath) -> bool
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Shipped.txt
index 9c98276d02..e24c0bb7f3 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Shipped.txt
@@ -1,12 +1,13 @@
-const Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.MONOEXENAME = "mono" -> string
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.MONOEXENAME = "mono" -> string!
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterDiscoveryStart(string executorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterDiscoveryStart(string! executorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterDiscoveryStop(long numberOfTests) -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterExecutionStart(string executorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterExecutionStart(string! executorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterExecutionStop(long numberOfTests) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterSearchStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.AdapterSearchStop() -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.DataCollectionStart(string dataCollectorUri) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.DataCollectionStart(string! dataCollectorUri) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.DataCollectionStop() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.DiscoveryRequestStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.DiscoveryRequestStop() -> void
@@ -33,7 +34,7 @@ Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSourc
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TestRunAttachmentsProcessingStop(long numberOfAttachments) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerDiscoveryStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerDiscoveryStop() -> void
-Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings) -> void
+Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string! runSettings) -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerExecutionStop() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerInitializeStart() -> void
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.TranslationLayerInitializeStop() -> void
@@ -47,32 +48,34 @@ Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSourc
 Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.VsTestConsoleStop() -> void
 Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper
 Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.DotnetHostHelper() -> void
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.DotnetHostHelper(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper fileHelper, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment environment) -> void
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.GetDotnetPath() -> string
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.GetMonoPath() -> string
-Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.TryGetDotnetPathByArchitecture(Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture targetArchitecture, out string muxerPath) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.DotnetHostHelper(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment! environment) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.GetDotnetPath() -> string!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.DotnetHostHelper.GetMonoPath() -> string!
 Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.CopyFile(string sourcePath, string destinationPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.CreateDirectory(string path) -> System.IO.DirectoryInfo
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.Delete(string path) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.DeleteEmptyDirectroy(string dirPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.DirectoryExists(string path) -> bool
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.EnumerateFiles(string directory, System.IO.SearchOption searchOption, params string[] endsWithSearchPatterns) -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.Exists(string path) -> bool
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.CopyFile(string! sourcePath, string! destinationPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.CreateDirectory(string! path) -> System.IO.DirectoryInfo!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.Delete(string! path) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.DeleteEmptyDirectroy(string! dirPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.DeleteDirectory(string! directoryPath, bool recursive) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetTempPath() -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFileLength(string! path) -> long
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.DirectoryExists(string? path) -> bool
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.EnumerateFiles(string! directory, System.IO.SearchOption searchOption, params string![]? endsWithSearchPatterns) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.Exists(string? path) -> bool
 Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.FileHelper() -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetCurrentDirectory() -> string
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFileAttributes(string path) -> System.IO.FileAttributes
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFiles(string path, string searchPattern, System.IO.SearchOption searchOption) -> string[]
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFileVersion(string path) -> System.Version
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFullPath(string path) -> string
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetStream(string filePath, System.IO.FileMode mode, System.IO.FileAccess access = System.IO.FileAccess.ReadWrite) -> System.IO.Stream
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetStream(string filePath, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share) -> System.IO.Stream
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.MoveFile(string sourcePath, string destinationPath) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.WriteAllTextToFile(string filePath, string content) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.CreateDirectory(string path) -> System.IO.DirectoryInfo
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.EnumerateFiles(string directory, System.IO.SearchOption searchOption, params string[] endsWithSearchPatterns) -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFileAttributes(string path) -> System.IO.FileAttributes
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFiles(string path, string searchPattern, System.IO.SearchOption searchOption) -> string[]
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetStream(string filePath, System.IO.FileMode mode, System.IO.FileAccess access = System.IO.FileAccess.ReadWrite) -> System.IO.Stream
-Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetStream(string filePath, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share) -> System.IO.Stream
-static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.Instance.get -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetCurrentDirectory() -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFileAttributes(string! path) -> System.IO.FileAttributes
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFiles(string! path, string! searchPattern, System.IO.SearchOption searchOption) -> string![]!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFileVersion(string! path) -> System.Version!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetFullPath(string! path) -> string!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetStream(string! filePath, System.IO.FileMode mode, System.IO.FileAccess access = System.IO.FileAccess.ReadWrite) -> System.IO.Stream!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.GetStream(string! filePath, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share) -> System.IO.Stream!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.MoveFile(string! sourcePath, string! destinationPath) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.FileHelper.WriteAllTextToFile(string! filePath, string! content) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.CreateDirectory(string! path) -> System.IO.DirectoryInfo!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.EnumerateFiles(string! directory, System.IO.SearchOption searchOption, params string![]? endsWithSearchPatterns) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFileAttributes(string! path) -> System.IO.FileAttributes
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetFiles(string! path, string! searchPattern, System.IO.SearchOption searchOption) -> string![]!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetStream(string! filePath, System.IO.FileMode mode, System.IO.FileAccess access = System.IO.FileAccess.ReadWrite) -> System.IO.Stream!
+Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper.GetStream(string! filePath, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share) -> System.IO.Stream!
+static Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.TestPlatformEventSource.Instance.get -> Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource!
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Shipped.txt
deleted file mode 100644
index 1dc971c4e1..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, System.ConsoleColor foregroundColor, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt
deleted file mode 100644
index 1dc971c4e1..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, System.ConsoleColor foregroundColor, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..32196d81df
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1,15 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..32196d81df
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Shipped.txt
@@ -0,0 +1,15 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net481/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net6.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..dc4f1b293a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1,13 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..dc4f1b293a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
@@ -0,0 +1,13 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
deleted file mode 100644
index e576b95a70..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
deleted file mode 100644
index 9d88848572..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, System.ConsoleColor foregroundColor, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
index 9d88848572..dc4f1b293a 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -1,12 +1,13 @@
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
-Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void
 Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, System.ConsoleColor foregroundColor, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, bool appendPrefix, string format, params object[] args) -> void
-static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput output, string message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput!
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Shipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Shipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.cs.xlf
index c5e146ea0a..6293abf623 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.cs.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Chyba: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informace: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Upozornění: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">Zadaný argument nemůže být prázdný.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">Zadaný argument nemůže být záporný.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">Zadaný argument musí být tohoto typu: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být prázdný řetězec: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být záporná: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být null: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">Zadaný argument má následující vlastnost: {0}. Tato vlastnost musí být tohoto typu: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Při zpracování úlohy z fronty {0} došlo k neošetřené výjimce: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">Fronta {0} se už uvolnila.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Frontu {0} nejde uvolnit, když je pozastavená.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Při získávání názvu procesu se stala chyba.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">Hostitele {0} nešlo najít. Ujistěte se, jestli je {0} nainstalovaný na počítači a dostupný v cestě určené proměnnou prostředí PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Chyba: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informace: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Upozornění: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">Zadaný argument nemůže být prázdný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">Zadaný argument nemůže být záporný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">Zadaný argument musí být tohoto typu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být prázdný řetězec: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být záporná: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">Zadaný argument má následující vlastnost, která nemůže být null: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">Zadaný argument má následující vlastnost: {0}. Tato vlastnost musí být tohoto typu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Při zpracování úlohy z fronty {0} došlo k neošetřené výjimce: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">Fronta {0} se už uvolnila.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Frontu {0} nejde uvolnit, když je pozastavená.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Při získávání názvu procesu se stala chyba.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">Hostitele {0} nešlo najít. Ujistěte se, jestli je {0} nainstalovaný na počítači a dostupný v cestě určené proměnnou prostředí PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.de.xlf
index a19990733b..62c0907a4c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.de.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Fehler: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informationen: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Warnung: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument darf nicht leer sein.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument darf nicht negativ sein.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument muss den folgenden Typ aufweisen: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die keine leere Zeichenfolge sein darf: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die nicht negativ sein darf: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die nicht NULL sein darf: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf: {0}. Diese Eigenschaft muss den folgenden Typ aufweisen: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Ausnahmefehler beim Verarbeiten eines Auftrags aus der Warteschlange "{0}": {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">Die Warteschlange {0} wurde bereits verworfen.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Die Warteschlange {0} kann nicht verworfen werden, während sie angehalten ist.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Fehler beim Abrufen des Prozessnamens.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">Der Host "{0}" wurde nicht gefunden. Stellen Sie sicher, dass "{0}" auf dem Computer installiert und in der PATH-Umgebungsvariablen verfügbar ist.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Fehler: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informationen: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Warnung: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">Das angegebene Argument darf nicht leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">Das angegebene Argument darf nicht negativ sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">Das angegebene Argument muss den folgenden Typ aufweisen: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die keine leere Zeichenfolge sein darf: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die nicht negativ sein darf: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf, die nicht NULL sein darf: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">Das angegebene Argument weist die folgende Eigenschaft auf: {0}. Diese Eigenschaft muss den folgenden Typ aufweisen: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Ausnahmefehler beim Verarbeiten eines Auftrags aus der Warteschlange "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">Die Warteschlange {0} wurde bereits verworfen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Die Warteschlange {0} kann nicht verworfen werden, während sie angehalten ist.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Fehler beim Abrufen des Prozessnamens.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">Der Host "{0}" wurde nicht gefunden. Stellen Sie sicher, dass "{0}" auf dem Computer installiert und in der PATH-Umgebungsvariablen verfügbar ist.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.es.xlf
index bffb274152..e51b82f212 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.es.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Error: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Información: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Advertencia: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">El argumento especificado no puede estar vacío.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">El argumento especificado no puede ser negativo.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">El argumento especificado debe tener el tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser una cadena vacía: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser negativa: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser nula: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">El argumento especificado tiene la siguiente propiedad: {0}. Esta propiedad debe tener el tipo {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción no controlada al procesar un trabajo de la cola '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">La cola {0} ya se ha eliminado.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">La cola {0} no se puede eliminar mientras está en pausa.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Error al obtener el nombre del proceso.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">No se pudo encontrar el host "{0}". Asegúrese de que "{0}" está instalado en el equipo y está disponible en la variable de entorno PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Error: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Información: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Advertencia: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">El argumento especificado no puede estar vacío.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">El argumento especificado no puede ser negativo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">El argumento especificado debe tener el tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser una cadena vacía: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser negativa: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">El argumento especificado tiene la siguiente propiedad, que no puede ser nula: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">El argumento especificado tiene la siguiente propiedad: {0}. Esta propiedad debe tener el tipo {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Se produjo una excepción no controlada al procesar un trabajo de la cola '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">La cola {0} ya se ha eliminado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">La cola {0} no se puede eliminar mientras está en pausa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Error al obtener el nombre del proceso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">No se pudo encontrar el host "{0}". Asegúrese de que "{0}" está instalado en el equipo y está disponible en la variable de entorno PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.fr.xlf
index 232fca3424..afe77aa864 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.fr.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Erreur : {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informations : {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Avertissement : {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié ne peut pas être vide.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié ne peut pas être négatif.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié doit être du type suivant : {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être une chaîne vide : {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être négative : {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être une valeur null : {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">L'argument spécifié a la propriété suivante : {0}. Cette propriété doit avoir le type suivant : {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Une exception non prise en charge s'est produite durant le traitement d'un travail à partir de la file d'attente '{0}' : {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">La file d'attente {0} a déjà été supprimée.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Impossible de supprimer la file d'attente {0} pendant qu'elle est en pause.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Erreur d'obtention du nom du processus.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">L'hôte '{0}' est introuvable. Vérifiez que '{0}' est installé sur la machine et qu'il est disponible dans la variable d'environnement PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Erreur : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informations : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Avertissement : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">L'argument spécifié ne peut pas être vide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">L'argument spécifié ne peut pas être négatif.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">L'argument spécifié doit être du type suivant : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être une chaîne vide : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être négative : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">L'argument spécifié a la propriété suivante, laquelle ne peut pas être une valeur null : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">L'argument spécifié a la propriété suivante : {0}. Cette propriété doit avoir le type suivant : {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Une exception non prise en charge s'est produite durant le traitement d'un travail à partir de la file d'attente '{0}' : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">La file d'attente {0} a déjà été supprimée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Impossible de supprimer la file d'attente {0} pendant qu'elle est en pause.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Erreur d'obtention du nom du processus.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">L'hôte '{0}' est introuvable. Vérifiez que '{0}' est installé sur la machine et qu'il est disponible dans la variable d'environnement PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.it.xlf
index dcf6d4cda6..3956137a02 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.it.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Il parametro non può essere vuoto o Null.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Errore: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informazioni: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Avviso: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato non può essere vuoto.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato non può essere negativo.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato deve essere del tipo seguente: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere una stringa vuota: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere negativa: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere Null: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">L'argomento specificato presenta la proprietà seguente: {0}. Tale proprietà deve essere del tipo seguente: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione non gestita durante l'elaborazione di un processo dalla coda di '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">La coda {0} è già stata eliminata.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Non è possibile eliminare la coda {0} mentre è in sospeso.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Si è verificato un errore durante il recupero del nome del processo.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">L'host '{0}' non è stato trovato. Assicurarsi che '{0}' sia installato nel computer e che sia disponibile nella variabile di ambiente PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Il parametro non può essere vuoto o Null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Errore: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informazioni: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Avviso: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">L'argomento specificato non può essere vuoto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">L'argomento specificato non può essere negativo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">L'argomento specificato deve essere del tipo seguente: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere una stringa vuota: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere negativa: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">L'argomento specificato presenta la proprietà seguente, che non può essere Null: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">L'argomento specificato presenta la proprietà seguente: {0}. Tale proprietà deve essere del tipo seguente: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Si è verificata un'eccezione non gestita durante l'elaborazione di un processo dalla coda di '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">La coda {0} è già stata eliminata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Non è possibile eliminare la coda {0} mentre è in sospeso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Si è verificato un errore durante il recupero del nome del processo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">L'host '{0}' non è stato trovato. Assicurarsi che '{0}' sia installato nel computer e che sia disponibile nella variabile di ambiente PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ja.xlf
index f67cbfed6e..8dcc27956e 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ja.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">パラメーターを null または空にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">エラー: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">情報: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">指定した引数を空にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">指定した引数を負の値にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">指定された引数は次の型でなければなりません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">指定された引数には次のプロパティがあり、これを空の文字列にすることはできません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">指定した引数には次のプロパティがあります。このプロパティを負の値にすることはできません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">指定した引数には次のプロパティがあります。このプロパティを null にすることはできません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">指定された引数には次のプロパティがあります: {0}。このプロパティは次の型でなければなりません: {1}。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' キューからジョブを処理中にハンドルされない例外が発生しました: {1}。</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">{0} キューは既に破棄されています。</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">{0} キューは一時停止中に破棄できません。</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">プロセス名の取得エラーです。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">'{0}' ホストが見つかりませんでした。'{0}' がコンピューターにインストールされており、PATH 環境変数で使用できることを確認してください。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">パラメーターを null または空にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">エラー: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">情報: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">指定した引数を空にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">指定した引数を負の値にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">指定された引数は次の型でなければなりません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">指定された引数には次のプロパティがあり、これを空の文字列にすることはできません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">指定した引数には次のプロパティがあります。このプロパティを負の値にすることはできません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">指定した引数には次のプロパティがあります。このプロパティを null にすることはできません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">指定された引数には次のプロパティがあります: {0}。このプロパティは次の型でなければなりません: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">'{0}' キューからジョブを処理中にハンドルされない例外が発生しました: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">{0} キューは既に破棄されています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">{0} キューは一時停止中に破棄できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">プロセス名の取得エラーです。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">'{0}' ホストが見つかりませんでした。'{0}' がコンピューターにインストールされており、PATH 環境変数で使用できることを確認してください。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ko.xlf
index e4aad90fa0..975dc94381 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ko.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">오류: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">정보: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">경고: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">지정한 인수는 비워 둘 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">지정한 인수는 음수일 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">지정한 인수는 {0} 형식이어야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 빈 문자열일 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 음수일 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 null일 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 {1} 형식이어야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' 큐에서 작업을 처리하는 동안 처리되지 않은 예외가 발생했습니다. {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">{0} 큐가 이미 삭제되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">일시 중지된 동안에는 {0} 큐를 삭제할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">프로세스 이름을 가져오는 동안 오류가 발생했습니다.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">‘{0}’ 호스트를 찾을 수 없습니다. ‘{0}’이(가) 컴퓨터에 설치되어 있고 PATH 환경 변수에서 사용할 수 있는지 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">오류: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">정보: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">경고: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">지정한 인수는 비워 둘 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">지정한 인수는 음수일 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">지정한 인수는 {0} 형식이어야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 빈 문자열일 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 음수일 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 null일 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">지정한 인수에 {0} 속성이 있습니다. 이 속성은 {1} 형식이어야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">'{0}' 큐에서 작업을 처리하는 동안 처리되지 않은 예외가 발생했습니다. {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">{0} 큐가 이미 삭제되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">일시 중지된 동안에는 {0} 큐를 삭제할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">프로세스 이름을 가져오는 동안 오류가 발생했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">‘{0}’ 호스트를 찾을 수 없습니다. ‘{0}’이(가) 컴퓨터에 설치되어 있고 PATH 환경 변수에서 사용할 수 있는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pl.xlf
index a33bd39544..dbddf6087c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pl.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Błąd: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informacje: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Ostrzeżenie: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">Określony argument nie może być pusty.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">Określony argument nie może być ujemny.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">Określony argument musi być następującego typu: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">Określony argument ma następującą właściwość, która nie może być pustym ciągiem: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">Określony argument ma następującą właściwość, która nie może być ujemna: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">Określony argument ma następującą właściwość, która nie może mieć wartości null: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">Określony argument ma następującą właściwość: {0}. Ta właściwość musi być następującego typu: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Wystąpił nieobsługiwany wyjątek podczas przetwarzania zadania z kolejki „{0}”: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">Kolejka {0} została już usunięta.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Nie można usunąć kolejki {0} podczas wstrzymania.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Błąd podczas pobierania nazwy procesu.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">Nie można znaleźć hosta „{0}”. Upewnij się, że element „{0}” jest zainstalowany na maszynie i jest dostępny w zmiennej środowiskowej PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Błąd: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informacje: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Ostrzeżenie: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">Określony argument nie może być pusty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">Określony argument nie może być ujemny.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">Określony argument musi być następującego typu: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">Określony argument ma następującą właściwość, która nie może być pustym ciągiem: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">Określony argument ma następującą właściwość, która nie może być ujemna: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">Określony argument ma następującą właściwość, która nie może mieć wartości null: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">Określony argument ma następującą właściwość: {0}. Ta właściwość musi być następującego typu: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Wystąpił nieobsługiwany wyjątek podczas przetwarzania zadania z kolejki „{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">Kolejka {0} została już usunięta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Nie można usunąć kolejki {0} podczas wstrzymania.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Błąd podczas pobierania nazwy procesu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">Nie można znaleźć hosta „{0}”. Upewnij się, że element „{0}” jest zainstalowany na maszynie i jest dostępny w zmiennej środowiskowej PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pt-BR.xlf
index ff67902e41..1ef2e67832 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.pt-BR.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Erro: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informações: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Aviso: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">O argumento especificado não pode estar vazio.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">O argumento especificado não pode ser negativo.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">O argumento especificado deve ter o seguinte tipo: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser uma cadeia de caracteres vazia: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser negativa: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser nula: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">O argumento especificado tem a seguinte propriedade: {0}. Esta propriedade deve ter o seguinte tipo: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção sem tratamento ao processar um trabalho da fila '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">A fila {0} já foi descartada.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">A fila {0} não pode ser descartada enquanto está em pausa.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Erro ao obter o nome do processo.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">Não foi possível encontrar o host '{0}'. Verifique se o '{0}' está instalado no computador e está disponível na variável de ambiente PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Erro: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informações: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Aviso: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">O argumento especificado não pode estar vazio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">O argumento especificado não pode ser negativo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">O argumento especificado deve ter o seguinte tipo: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser uma cadeia de caracteres vazia: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser negativa: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">O argumento especificado tem a seguinte propriedade, que não pode ser nula: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">O argumento especificado tem a seguinte propriedade: {0}. Esta propriedade deve ter o seguinte tipo: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">Ocorreu uma exceção sem tratamento ao processar um trabalho da fila '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">A fila {0} já foi descartada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">A fila {0} não pode ser descartada enquanto está em pausa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Erro ao obter o nome do processo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">Não foi possível encontrar o host '{0}'. Verifique se o '{0}' está instalado no computador e está disponível na variável de ambiente PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ru.xlf
index 10ba99d23f..3abeba195c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.ru.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Ошибка: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Сведения: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Предупреждение: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент не может быть пустым.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент не может быть отрицательным.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент должен иметь следующий тип: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может быть пустой строкой: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может быть отрицательным: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может иметь значение null: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">Указанный аргумент имеет следующее свойство: {0}. Это свойство должно относиться к следующему типу: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">При обработке задания из очереди "{0}" возникло необработанное исключение: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">Очередь {0} уже удалена.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">Нельзя удалить приостановленную очередь {0}.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">Ошибка при получении имени процесса.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">Не удалось найти хост "{0}". Убедитесь, что "{0}" установлен на компьютере и доступен в переменной среды PATH.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Ошибка: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Сведения: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Предупреждение: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">Указанный аргумент не может быть пустым.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">Указанный аргумент не может быть отрицательным.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">Указанный аргумент должен иметь следующий тип: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может быть пустой строкой: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может быть отрицательным: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">Указанный аргумент имеет следующее свойство, которое не может иметь значение null: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">Указанный аргумент имеет следующее свойство: {0}. Это свойство должно относиться к следующему типу: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">При обработке задания из очереди "{0}" возникло необработанное исключение: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">Очередь {0} уже удалена.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">Нельзя удалить приостановленную очередь {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">Ошибка при получении имени процесса.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">Не удалось найти хост "{0}". Убедитесь, что "{0}" установлен на компьютере и доступен в переменной среды PATH.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.tr.xlf
index bf7772fa77..cc12f2e210 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.tr.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametre null veya boş olamaz.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Hata: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Bilgi: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Uyarı: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken boş olamaz.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken negatif olamaz.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken şu türde olmalıdır: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken, boş dize olamayacak olan şu özelliğe sahiptir: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken, negatif olamayacak olan şu özelliğe sahiptir: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken, null olamayacak olan şu özelliğe sahiptir: {0}.</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">Belirtilen bağımsız değişken şu özelliğe sahiptir: {0}. Bu özellik şu türde olmalıdır: {1}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' kuyruğundan bir iş işlenirken, işlenmeyen özel durum oluştu: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">{0} kuyruğu zaten atıldı.</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">{0} kuyruğu duraklatılmış durumdayken atılamaz.</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">İşlem adı alınırken hata oluştu.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">'{0}' konağı bulunamadı. '{0}' konağının makinede yüklü olduğundan ve PATH ortam değişkeninde bulunduğundan emin olun.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametre null veya boş olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Hata: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Bilgi: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Uyarı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">Belirtilen bağımsız değişken boş olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">Belirtilen bağımsız değişken negatif olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">Belirtilen bağımsız değişken şu türde olmalıdır: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">Belirtilen bağımsız değişken, boş dize olamayacak olan şu özelliğe sahiptir: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">Belirtilen bağımsız değişken, negatif olamayacak olan şu özelliğe sahiptir: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">Belirtilen bağımsız değişken, null olamayacak olan şu özelliğe sahiptir: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">Belirtilen bağımsız değişken şu özelliğe sahiptir: {0}. Bu özellik şu türde olmalıdır: {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">'{0}' kuyruğundan bir iş işlenirken, işlenmeyen özel durum oluştu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">{0} kuyruğu zaten atıldı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">{0} kuyruğu duraklatılmış durumdayken atılamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">İşlem adı alınırken hata oluştu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">'{0}' konağı bulunamadı. '{0}' konağının makinede yüklü olduğundan ve PATH ortam değişkeninde bulunduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf
index 615147279b..2ab31968b9 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.xlf
@@ -4,69 +4,69 @@
     <body>
       <trans-unit id="CannotBeNullOrEmpty">
         <source>The parameter cannot be null or empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommandLineError">
         <source>Error: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommandLineInformational">
         <source>Information: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommandLineWarning">
         <source>Warning: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentIsEmpty">
         <source>The specified argument cannot be empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentIsNegative">
         <source>The specified argument cannot be negative.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentNotTypeOf">
         <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentPropertyIsEmpty">
         <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentPropertyIsNegative">
         <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentPropertyIsNull">
         <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Error_ArgumentPropertyNotTypeOf">
         <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExceptionFromJobProcessor">
         <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="QueueAlreadyDisposed">
         <source>The {0} queue has already been disposed.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="QueuePausedDisposeError">
         <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
         <source>Error getting process name.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoDotnetExeFound">
         <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
         <target state="new">Could not find {0}. Make sure that the dotnet is installed on the machine.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hans.xlf
index d592e83ec8..af18ef86be 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">参数不能为 NULL 或为空。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">错误: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">信息: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">指定的参数不能为空。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">指定的参数不能为负。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">指定的参数都必须具有以下类型: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">指定的参数具有以下属性: {0}，且不能为空字符串。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">指定的参数具有以下属性: {0}，且不能为负。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">指定的参数具有以下属性: {0}，且不能为 null。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">指定的参数具有以下属性: {0}。此属性必须具有以下类型: {1}。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">处理“{0}”队列中的作业时发生未处理的异常: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">已处置 {0} 队列。</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">暂停时无法处置 {0} 队列。</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">获取进程名称时出错。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">找不到“{0}”主机。请确保计算机上已安装“{0}”且位于 PATH 环境变量中。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">参数不能为 NULL 或为空。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">错误: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">信息: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">指定的参数不能为空。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">指定的参数不能为负。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">指定的参数都必须具有以下类型: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">指定的参数具有以下属性: {0}，且不能为空字符串。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">指定的参数具有以下属性: {0}，且不能为负。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">指定的参数具有以下属性: {0}，且不能为 null。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">指定的参数具有以下属性: {0}。此属性必须具有以下类型: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">处理“{0}”队列中的作业时发生未处理的异常: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">已处置 {0} 队列。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">暂停时无法处置 {0} 队列。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">获取进程名称时出错。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">找不到“{0}”主机。请确保计算机上已安装“{0}”且位于 PATH 环境变量中。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hant.xlf
index e75104c67f..fb461c7a25 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">參數不可為 null 或空白。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">錯誤: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">資訊: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsEmpty">
-        <source>The specified argument cannot be empty.</source>
-        <note></note>
-        <target state="translated">指定的引數不可為空白。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentIsNegative">
-        <source>The specified argument cannot be negative.</source>
-        <note></note>
-        <target state="translated">指定的引數不可為負數。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentNotTypeOf">
-        <source>The specified argument must have the following type: {0}.</source>
-        <note></note>
-        <target state="translated">指定的引數必須具備下列類型: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsEmpty">
-        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
-        <note></note>
-        <target state="translated">指定的引數具有下列屬性，且不可為空字串: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNegative">
-        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
-        <note></note>
-        <target state="translated">指定的引數具有下列屬性，且不可為負數: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyIsNull">
-        <source>The specified argument has the following property, which cannot be null: {0}.</source>
-        <note></note>
-        <target state="translated">指定的引數具有下列屬性，且不可為 null: {0}。</target>
-      </trans-unit>
-      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
-        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
-        <note></note>
-        <target state="translated">指定的引數具有下列屬性: {0}。此屬性必須具有下列類型: {1}。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromJobProcessor">
-        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
-        <note></note>
-        <target state="translated">從 '{0}' 佇列處理工作時，發生未處理的例外狀況: {1}</target>
-      </trans-unit>
-      <trans-unit id="QueueAlreadyDisposed">
-        <source>The {0} queue has already been disposed.</source>
-        <note></note>
-        <target state="translated">已處置 {0} 佇列。</target>
-      </trans-unit>
-      <trans-unit id="QueuePausedDisposeError">
-        <source>The {0} queue cannot be disposed while paused.</source>
-        <note></note>
-        <target state="translated">暫停時無法處置 {0} 佇列。</target>
-      </trans-unit>
-      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
-        <source>Error getting process name.</source>
-        <note></note>
-        <target state="translated">取得處理序名稱時發生錯誤。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
-        <target state="translated">找不到 '{0}' 主機。請確認 '{0}' 已安裝在機器上，而且可在 PATH 環境變數中使用。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">參數不可為 null 或空白。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">錯誤: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">資訊: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsEmpty">
+        <source>The specified argument cannot be empty.</source>
+        <target state="translated">指定的引數不可為空白。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentIsNegative">
+        <source>The specified argument cannot be negative.</source>
+        <target state="translated">指定的引數不可為負數。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentNotTypeOf">
+        <source>The specified argument must have the following type: {0}.</source>
+        <target state="translated">指定的引數必須具備下列類型: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsEmpty">
+        <source>The specified argument has the following property, which cannot be an empty string: {0}.</source>
+        <target state="translated">指定的引數具有下列屬性，且不可為空字串: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNegative">
+        <source>The specified argument has the following property, which cannot be negative: {0}.</source>
+        <target state="translated">指定的引數具有下列屬性，且不可為負數: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyIsNull">
+        <source>The specified argument has the following property, which cannot be null: {0}.</source>
+        <target state="translated">指定的引數具有下列屬性，且不可為 null: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Error_ArgumentPropertyNotTypeOf">
+        <source>The specified argument has the following property: {0}. This property must have the following type: {1}.</source>
+        <target state="translated">指定的引數具有下列屬性: {0}。此屬性必須具有下列類型: {1}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromJobProcessor">
+        <source>Unhandled exception occurred while processing a job from the '{0}' queue: {1}</source>
+        <target state="translated">從 '{0}' 佇列處理工作時，發生未處理的例外狀況: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueueAlreadyDisposed">
+        <source>The {0} queue has already been disposed.</source>
+        <target state="translated">已處置 {0} 佇列。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="QueuePausedDisposeError">
+        <source>The {0} queue cannot be disposed while paused.</source>
+        <target state="translated">暫停時無法處置 {0} 佇列。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Utility_ProcessNameWhenCannotGetIt">
+        <source>Error getting process name.</source>
+        <target state="translated">取得處理序名稱時發生錯誤。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find '{0}' host. Make sure that '{0}' is installed on the machine and is available in PATH environment variable.</source>
+        <target state="translated">找不到 '{0}' 主機。請確認 '{0}' 已安裝在機器上，而且可在 PATH 環境變數中使用。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
index 59b4247ae8..24ce929312 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
@@ -1,829 +1,827 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Wrapper class for tracing.
+///     - Shortcut-methods for Error, Warning, Info, Verbose.
+///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
+///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
+///     - By default tracing if OFF.
+///     - Our build environment always sets the /d:TRACE so this class is always enabled,
+///       the Debug class is enabled only in debug builds (/d:DEBUG).
+///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
+///       We log ignored exceptions to system Application log.
+///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
+/// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
+/// </summary>
+public static class EqtTrace
 {
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Text;
+    private static readonly IPlatformEqtTrace TraceImpl = new PlatformEqtTrace();
 
-    /// <summary>
-    /// Wrapper class for tracing.
-    ///     - Shortcut-methods for Error, Warning, Info, Verbose.
-    ///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
-    ///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
-    ///     - By default tracing if OFF.
-    ///     - Our build environment always sets the /d:TRACE so this class is always enabled,
-    ///       the Debug class is enabled only in debug builds (/d:DEBUG).
-    ///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
-    ///       We log ignored exceptions to system Application log.
-    ///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
-    /// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
-    /// </summary>
-    public static class EqtTrace
+#if NETFRAMEWORK
+    public static void SetupRemoteEqtTraceListeners(AppDomain? childDomain)
     {
-        private static IPlatformEqtTrace traceImpl = new PlatformEqtTrace();
+        TraceImpl.SetupRemoteEqtTraceListeners(childDomain);
+    }
 
-#if NETFRAMEWORK
-        public static void SetupRemoteEqtTraceListeners(AppDomain childDomain)
-        {
-            traceImpl.SetupRemoteEqtTraceListeners(childDomain);
-        }
+    public static void SetupListener(TraceListener? listener)
+    {
+        TraceImpl.SetupListener(listener);
+    }
 
-        public static void SetupListener(TraceListener listener)
+    public static TraceLevel TraceLevel
+    {
+        get
         {
-            traceImpl.SetupListener(listener);
+            return (TraceLevel)TraceImpl.GetTraceLevel();
         }
-
-        public static TraceLevel TraceLevel
+        set
         {
-            get
-            {
-                return (TraceLevel)traceImpl.GetTraceLevel();
-            }
-            set
-            {
-                traceImpl.SetTraceLevel((PlatformTraceLevel)value);
-            }
+            TraceImpl.SetTraceLevel((PlatformTraceLevel)value);
         }
+    }
 
 #endif
 
-#if NETSTANDARD || NET
-        public static PlatformTraceLevel TraceLevel
+#if NETSTANDARD || NET || NETCOREAPP3_1
+    public static PlatformTraceLevel TraceLevel
+    {
+        get
         {
-            get
-            {
-                return traceImpl.GetTraceLevel();
-            }
-            set
-            {
-                traceImpl.SetTraceLevel(value);
-            }
+            return TraceImpl.GetTraceLevel();
+        }
+        set
+        {
+            TraceImpl.SetTraceLevel(value);
         }
+    }
 #endif
 
-        public static string LogFile
+    public static string? LogFile
+    {
+        get
         {
-            get
-            {
-                return traceImpl.GetLogFile();
-            }
+            return TraceImpl.GetLogFile();
         }
+    }
 
-        public static bool DoNotInitailize
+    // There is a typo on this property but it's part of the public API so we cannot change it.
+    public static bool DoNotInitailize
+    {
+        get
         {
-            get
-            {
-                return traceImpl.DoNotInitialize;
-            }
-            set
-            {
-                traceImpl.DoNotInitialize = value;
-            }
+            return TraceImpl.DoNotInitialize;
         }
-
-        public static string ErrorOnInitialization
+        set
         {
-            get;
-            set;
+            TraceImpl.DoNotInitialize = value;
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether tracing error statements is enabled.
-        /// </summary>
-        public static bool IsErrorEnabled
+    public static string? ErrorOnInitialization
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether tracing error statements is enabled.
+    /// </summary>
+    public static bool IsErrorEnabled
+    {
+        get
         {
-            get
-            {
-                return traceImpl.ShouldTrace(PlatformTraceLevel.Error);
-            }
+            return TraceImpl.ShouldTrace(PlatformTraceLevel.Error);
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether tracing info statements is enabled.
-        /// </summary>
-        public static bool IsInfoEnabled
+    /// <summary>
+    /// Gets a value indicating whether tracing info statements is enabled.
+    /// </summary>
+    public static bool IsInfoEnabled
+    {
+        get
         {
-            get
-            {
-                return traceImpl.ShouldTrace(PlatformTraceLevel.Info);
-            }
+            return TraceImpl.ShouldTrace(PlatformTraceLevel.Info);
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether tracing verbose statements is enabled.
-        /// </summary>
-        public static bool IsVerboseEnabled
+    /// <summary>
+    /// Gets a value indicating whether tracing verbose statements is enabled.
+    /// </summary>
+    public static bool IsVerboseEnabled
+    {
+        get
         {
-            get
-            {
-                return traceImpl.ShouldTrace(PlatformTraceLevel.Verbose);
-            }
+            return TraceImpl.ShouldTrace(PlatformTraceLevel.Verbose);
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether tracing warning statements is enabled.
-        /// </summary>
-        public static bool IsWarningEnabled
+    /// <summary>
+    /// Gets a value indicating whether tracing warning statements is enabled.
+    /// </summary>
+    public static bool IsWarningEnabled
+    {
+        get
         {
-            get
-            {
-                return traceImpl.ShouldTrace(PlatformTraceLevel.Warning);
-            }
+            return TraceImpl.ShouldTrace(PlatformTraceLevel.Warning);
         }
+    }
 
-        /// <summary>
-        /// Initializes the verbose tracing with custom log file
-        /// And overrides if any trace is set before
-        /// </summary>
-        /// <param name="customLogFile">
-        /// A custom log file for trace messages.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public static bool InitializeVerboseTrace(string customLogFile)
+    /// <summary>
+    /// Initializes the verbose tracing with custom log file
+    /// And overrides if any trace is set before
+    /// </summary>
+    /// <param name="customLogFile">
+    /// A custom log file for trace messages.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public static bool InitializeVerboseTrace(string? customLogFile)
+    {
+        return InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+    }
+
+    /// <summary>
+    /// Initializes the tracing with custom log file and trace level.
+    /// Overrides if any trace is set before.
+    /// </summary>
+    /// <param name="customLogFile">Custom log file for trace messages.</param>
+    /// <param name="traceLevel">Trace level.</param>
+    /// <returns>Trace initialized flag.</returns>
+    public static bool InitializeTrace(string? customLogFile, PlatformTraceLevel traceLevel)
+    {
+        // Remove extra quotes if we get them passed on the parameter,
+        // System.IO.File does not ignore them when checking the file existence.
+        customLogFile = customLogFile?.Trim('"');
+        if (!TraceImpl.InitializeTrace(customLogFile, traceLevel))
         {
-            return InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+            ErrorOnInitialization = PlatformEqtTrace.ErrorOnInitialization;
+            return false;
         }
 
-        /// <summary>
-        /// Initializes the tracing with custom log file and trace level.
-        /// Overrides if any trace is set before.
-        /// </summary>
-        /// <param name="customLogFile">Custom log file for trace messages.</param>
-        /// <param name="traceLevel">Trace level.</param>
-        /// <returns>Trace initialized flag.</returns>
-        public static bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
-        {
-            if (!traceImpl.InitializeTrace(customLogFile, traceLevel))
-            {
-                ErrorOnInitialization = PlatformEqtTrace.ErrorOnInitialization;
-                return false;
-            }
+        return true;
+    }
 
-            return true;
-        }
+    /// <summary>
+    /// Prints an error message and prompts with a Debug dialog
+    /// </summary>
+    /// <param name="message">the error message</param>
+    [Conditional("TRACE")]
+    public static void Fail(string? message)
+    {
+        Error(message);
+        FailDebugger(message);
+    }
+
+    /// <summary>
+    /// Combines together <c>EqtTrace.Fail</c> and Debug.Fail:
+    /// Prints an formatted error message and prompts with a Debug dialog.
+    /// </summary>
+    /// <param name="format">The formatted error message</param>
+    /// <param name="args">Arguments to the format</param>
+    [Conditional("TRACE")]
+    public static void Fail(string format, params object?[] args)
+    {
+        string message = string.Format(CultureInfo.InvariantCulture, format, args);
+        Fail(message);
+    }
 
-        /// <summary>
-        /// Prints an error message and prompts with a Debug dialog
-        /// </summary>
-        /// <param name="message">the error message</param>
-        [Conditional("TRACE")]
-        public static void Fail(string message)
+    /// <summary>
+    /// Trace an error message.
+    /// </summary>
+    /// <param name="message">Error message.</param>
+    [Conditional("TRACE")]
+    public static void Error(string? message)
+    {
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Error))
         {
-            Fail(message, null);
+            TraceImpl.WriteLine(PlatformTraceLevel.Error, message);
         }
+    }
 
-        /// <summary>
-        /// Combines together <c>EqtTrace.Fail</c> and Debug.Fail:
-        /// Prints an formatted error message and prompts with a Debug dialog.
-        /// </summary>
-        /// <param name="format">The formatted error message</param>
-        /// <param name="args">Arguments to the format</param>
-        [Conditional("TRACE")]
-        public static void Fail(string format, params object[] args)
+    /// <summary>
+    /// Only prints the message if the condition is true
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace error message.</param>
+    [Conditional("TRACE")]
+    public static void ErrorIf(bool condition, string? message)
+    {
+        if (condition)
         {
-            string message = string.Format(CultureInfo.InvariantCulture, format, args);
-
             Error(message);
-            FailDebugger(message);
         }
+    }
 
-        /// <summary>
-        /// Trace an error message.
-        /// </summary>
-        /// <param name="message">Error message.</param>
-        [Conditional("TRACE")]
-        public static void Error(string message)
-        {
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Error))
-            {
-                traceImpl.WriteLine(PlatformTraceLevel.Error, message);
-            }
-        }
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace error message.</param>
+    [Conditional("TRACE")]
+    public static void ErrorUnless(bool condition, string? message)
+    {
+        ErrorIf(!condition, message);
+    }
 
-        /// <summary>
-        /// Only prints the message if the condition is true
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace error message.</param>
-        [Conditional("TRACE")]
-        public static void ErrorIf(bool condition, string message)
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for trace.</param>
+    /// <param name="bumpLevel">Level for trace.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void ErrorUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string? message)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Error(message);
-            }
+            WriteAtLevel(bumpLevel, message);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace error message.</param>
-        [Conditional("TRACE")]
-        public static void ErrorUnless(bool condition, string message)
+        else
         {
-            ErrorIf(!condition, message);
+            Error(message);
         }
+    }
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for trace.</param>
-        /// <param name="bumpLevel">Level for trace.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void ErrorUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string message)
-        {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, message);
-            }
-            else
-            {
-                Error(message);
-            }
-        }
+    /// <summary>
+    /// Trace an error message with formatting arguments.
+    /// </summary>
+    /// <param name="format">Format of error message.</param>
+    /// <param name="args">Parameters for the error message.</param>
+    [Conditional("TRACE")]
+    public static void Error(string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
 
-        /// <summary>
-        /// Trace an error message with formatting arguments.
-        /// </summary>
-        /// <param name="format">Format of error message.</param>
-        /// <param name="args">Parameters for the error message.</param>
-        [Conditional("TRACE")]
-        public static void Error(string format, params object[] args)
+        // Check level before doing string.Format to avoid string creation if tracing is off.
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Error))
         {
-            Debug.Assert(format != null, "format != null");
-
-            // Check level before doing string.Format to avoid string creation if tracing is off.
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Error))
-            {
-                Error(string.Format(CultureInfo.InvariantCulture, format, args));
-            }
+            Error(string.Format(CultureInfo.InvariantCulture, format, args));
         }
+    }
 
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for trace.</param>
-        /// <param name="format">Message format.</param>
-        /// <param name="args">Trace message format arguments.</param>
-        [Conditional("TRACE")]
-        public static void ErrorUnless(bool condition, string format, params object[] args)
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for trace.</param>
+    /// <param name="format">Message format.</param>
+    /// <param name="args">Trace message format arguments.</param>
+    [Conditional("TRACE")]
+    public static void ErrorUnless(bool condition, string format, params object?[] args)
+    {
+        ErrorIf(!condition, format, args);
+    }
+
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for trace.</param>
+    /// <param name="bumpLevel">Level for trace.</param>
+    /// <param name="format">Message format.</param>
+    /// <param name="args">Trace message format arguments.</param>
+    [Conditional("TRACE")]
+    public static void ErrorUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object?[] args)
+    {
+        if (condition)
         {
-            ErrorIf(!condition, format, args);
+            WriteAtLevel(bumpLevel, format, args);
         }
-
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for trace.</param>
-        /// <param name="bumpLevel">Level for trace.</param>
-        /// <param name="format">Message format.</param>
-        /// <param name="args">Trace message format arguments.</param>
-        [Conditional("TRACE")]
-        public static void ErrorUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object[] args)
+        else
         {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, format, args);
-            }
-            else
-            {
-                Error(format, args);
-            }
+            Error(format, args);
         }
+    }
 
-        /// <summary>
-        /// Only prints the formatted message if the condition is true
-        /// </summary>
-        /// <param name="condition">Condition for trace.</param>
-        /// <param name="format">Message format.</param>
-        /// <param name="args">Trace message format arguments.</param>
-        [Conditional("TRACE")]
-        public static void ErrorIf(bool condition, string format, params object[] args)
+    /// <summary>
+    /// Only prints the formatted message if the condition is true
+    /// </summary>
+    /// <param name="condition">Condition for trace.</param>
+    /// <param name="format">Message format.</param>
+    /// <param name="args">Trace message format arguments.</param>
+    [Conditional("TRACE")]
+    public static void ErrorIf(bool condition, string format, params object?[] args)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Error(format, args);
-            }
+            Error(format, args);
         }
+    }
+
+    /// <summary>
+    /// Error and Debug.Fail combined in one call.
+    /// </summary>
+    /// <param name="format">The message to send to Debug.Fail and Error.</param>
+    /// <param name="args">Arguments to string.Format.</param>
+    [Conditional("TRACE")]
+    public static void ErrorAssert(string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
+        var message = string.Format(CultureInfo.InvariantCulture, format, args);
+        Error(message);
+        FailDebugger(message);
+    }
 
-        /// <summary>
-        /// Error and Debug.Fail combined in one call.
-        /// </summary>
-        /// <param name="format">The message to send to Debug.Fail and Error.</param>
-        /// <param name="args">Arguments to string.Format.</param>
-        [Conditional("TRACE")]
-        public static void ErrorAssert(string format, params object[] args)
+    /// <summary>
+    /// Write a exception if tracing for error is enabled
+    /// </summary>
+    /// <param name="exceptionToTrace">The exception to write.</param>
+    [Conditional("TRACE")]
+    public static void Error(Exception exceptionToTrace)
+    {
+        TPDebug.Assert(exceptionToTrace != null, "exceptionToTrace != null");
+
+        // Write only if tracing for error is enabled.
+        // Done upfront to avoid performance hit.
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Error))
         {
-            Debug.Assert(format != null, "format != null");
-            var message = string.Format(CultureInfo.InvariantCulture, format, args);
-            Error(message);
-            FailDebugger(message);
+            // Write at error level
+            TraceImpl.WriteLine(PlatformTraceLevel.Error, FormatException(exceptionToTrace));
         }
+    }
 
-        /// <summary>
-        /// Write a exception if tracing for error is enabled
-        /// </summary>
-        /// <param name="exceptionToTrace">The exception to write.</param>
-        [Conditional("TRACE")]
-        public static void Error(Exception exceptionToTrace)
+    /// <summary>
+    /// Trace a warning message.
+    /// </summary>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void Warning(string? message)
+    {
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Warning))
         {
-            Debug.Assert(exceptionToTrace != null, "exceptionToTrace != null");
-
-            // Write only if tracing for error is enabled.
-            // Done upfront to avoid performance hit.
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Error))
-            {
-                // Write at error level
-                traceImpl.WriteLine(PlatformTraceLevel.Error, FormatException(exceptionToTrace));
-            }
+            TraceImpl.WriteLine(PlatformTraceLevel.Warning, message);
         }
+    }
 
-        /// <summary>
-        /// Trace a warning message.
-        /// </summary>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void Warning(string message)
+    /// <summary>
+    /// Only prints the formatted message if the condition is true
+    /// </summary>
+    /// <param name="condition">Condition to evaluate for tracing.</param>
+    /// <param name="message">Message to trace.</param>
+    [Conditional("TRACE")]
+    public static void WarningIf(bool condition, string? message)
+    {
+        if (condition)
         {
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Warning))
-            {
-                traceImpl.WriteLine(PlatformTraceLevel.Warning, message);
-            }
+            Warning(message);
         }
+    }
+
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition to evaluate for tracing.</param>
+    /// <param name="message">Message to trace.</param>
+    [Conditional("TRACE")]
+    public static void WarningUnless(bool condition, string? message)
+    {
+        WarningIf(!condition, message);
+    }
 
-        /// <summary>
-        /// Only prints the formatted message if the condition is true
-        /// </summary>
-        /// <param name="condition">Condition to evaluate for tracing.</param>
-        /// <param name="message">Message to trace.</param>
-        [Conditional("TRACE")]
-        public static void WarningIf(bool condition, string message)
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition to evaluate for tracing.</param>
+    /// <param name="bumpLevel">Trace message level.</param>
+    /// <param name="message">Message to trace.</param>
+    [Conditional("TRACE")]
+    public static void WarningUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string? message)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Warning(message);
-            }
+            WriteAtLevel(bumpLevel, message);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition to evaluate for tracing.</param>
-        /// <param name="message">Message to trace.</param>
-        [Conditional("TRACE")]
-        public static void WarningUnless(bool condition, string message)
+        else
         {
-            WarningIf(!condition, message);
+            Warning(message);
         }
+    }
+
+    /// <summary>
+    /// Trace a warning message.
+    /// </summary>
+    /// <param name="format">Format of the trace message.</param>
+    /// <param name="args">Arguments for the trace message format.</param>
+    [Conditional("TRACE")]
+    public static void Warning(string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition to evaluate for tracing.</param>
-        /// <param name="bumpLevel">Trace message level.</param>
-        /// <param name="message">Message to trace.</param>
-        [Conditional("TRACE")]
-        public static void WarningUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string message)
+        // Check level before doing string.Format to avoid string creation if tracing is off.
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Warning))
         {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, message);
-            }
-            else
-            {
-                Warning(message);
-            }
+            Warning(string.Format(CultureInfo.InvariantCulture, format, args));
         }
+    }
 
-        /// <summary>
-        /// Trace a warning message.
-        /// </summary>
-        /// <param name="format">Format of the trace message.</param>
-        /// <param name="args">Arguments for the trace message format.</param>
-        [Conditional("TRACE")]
-        public static void Warning(string format, params object[] args)
+    /// <summary>
+    /// Trace a warning message based on a condition.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Format of the trace message.</param>
+    /// <param name="args">Arguments for the trace message.</param>
+    [Conditional("TRACE")]
+    public static void WarningIf(bool condition, string format, params object?[] args)
+    {
+        if (condition)
         {
-            Debug.Assert(format != null, "format != null");
-
-            // Check level before doing string.Format to avoid string creation if tracing is off.
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Warning))
-            {
-                Warning(string.Format(CultureInfo.InvariantCulture, format, args));
-            }
+            Warning(format, args);
         }
+    }
 
-        /// <summary>
-        /// Trace a warning message based on a condition.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Format of the trace message.</param>
-        /// <param name="args">Arguments for the trace message.</param>
-        [Conditional("TRACE")]
-        public static void WarningIf(bool condition, string format, params object[] args)
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Format of trace message.</param>
+    /// <param name="args">Arguments for the trace message.</param>
+    [Conditional("TRACE")]
+    public static void WarningUnless(bool condition, string format, params object?[] args)
+    {
+        WarningIf(!condition, format, args);
+    }
+
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="bumpLevel">Level of trace message.</param>
+    /// <param name="format">Format of the trace message.</param>
+    /// <param name="args">Arguments for trace message.</param>
+    [Conditional("TRACE")]
+    public static void WarningUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object?[] args)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Warning(format, args);
-            }
+            WriteAtLevel(bumpLevel, format, args);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Format of trace message.</param>
-        /// <param name="args">Arguments for the trace message.</param>
-        [Conditional("TRACE")]
-        public static void WarningUnless(bool condition, string format, params object[] args)
+        else
         {
-            WarningIf(!condition, format, args);
+            Warning(format, args);
         }
+    }
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="bumpLevel">Level of trace message.</param>
-        /// <param name="format">Format of the trace message.</param>
-        /// <param name="args">Arguments for trace message.</param>
-        [Conditional("TRACE")]
-        public static void WarningUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object[] args)
+    /// <summary>
+    /// Trace an informational message.
+    /// </summary>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void Info(string? message)
+    {
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Info))
         {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, format, args);
-            }
-            else
-            {
-                Warning(format, args);
-            }
+            TraceImpl.WriteLine(PlatformTraceLevel.Info, message);
         }
+    }
 
-        /// <summary>
-        /// Trace an informational message.
-        /// </summary>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void Info(string message)
+    /// <summary>
+    /// Trace an informational message based on a condition.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void InfoIf(bool condition, string? message)
+    {
+        if (condition)
         {
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Info))
-            {
-                traceImpl.WriteLine(PlatformTraceLevel.Info, message);
-            }
+            Info(message);
         }
+    }
 
-        /// <summary>
-        /// Trace an informational message based on a condition.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void InfoIf(bool condition, string message)
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void InfoUnless(bool condition, string? message)
+    {
+        InfoIf(!condition, message);
+    }
+
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="bumpLevel">Trace message level.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void InfoUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string? message)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Info(message);
-            }
+            WriteAtLevel(bumpLevel, message);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void InfoUnless(bool condition, string message)
+        else
         {
-            InfoIf(!condition, message);
+            Info(message);
         }
+    }
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="bumpLevel">Trace message level.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void InfoUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string message)
+    /// <summary>
+    /// Trace an informational message based on a format.
+    /// </summary>
+    /// <param name="format">Trace message format.</param>
+    /// <param name="args">Arguments for trace format.</param>
+    [Conditional("TRACE")]
+    public static void Info(string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
+
+        // Check level before doing string.Format to avoid string creation if tracing is off.
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Info))
         {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, message);
-            }
-            else
-            {
-                Info(message);
-            }
+            Info(string.Format(CultureInfo.InvariantCulture, format, args));
         }
+    }
 
-        /// <summary>
-        /// Trace an informational message based on a format.
-        /// </summary>
-        /// <param name="format">Trace message format.</param>
-        /// <param name="args">Arguments for trace format.</param>
-        [Conditional("TRACE")]
-        public static void Info(string format, params object[] args)
+    /// <summary>
+    /// Trace an informational message based on a condition.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Format of the trace message.</param>
+    /// <param name="args">Arguments for the trace format.</param>
+    [Conditional("TRACE")]
+    public static void InfoIf(bool condition, string format, params object?[] args)
+    {
+        if (condition)
         {
-            Debug.Assert(format != null, "format != null");
-
-            // Check level before doing string.Format to avoid string creation if tracing is off.
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Info))
-            {
-                Info(string.Format(CultureInfo.InvariantCulture, format, args));
-            }
+            Info(format, args);
         }
+    }
 
-        /// <summary>
-        /// Trace an informational message based on a condition.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Format of the trace message.</param>
-        /// <param name="args">Arguments for the trace format.</param>
-        [Conditional("TRACE")]
-        public static void InfoIf(bool condition, string format, params object[] args)
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Trace message format.</param>
+    /// <param name="args">Trace message format arguments.</param>
+    [Conditional("TRACE")]
+    public static void InfoUnless(bool condition, string format, params object?[] args)
+    {
+        InfoIf(!condition, format, args);
+    }
+
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="bumpLevel">Trace message level.</param>
+    /// <param name="format">Trace message format.</param>
+    /// <param name="args">Trace message arguments.</param>
+    [Conditional("TRACE")]
+    public static void InfoUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object?[] args)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Info(format, args);
-            }
+            WriteAtLevel(bumpLevel, format, args);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Trace message format.</param>
-        /// <param name="args">Trace message format arguments.</param>
-        [Conditional("TRACE")]
-        public static void InfoUnless(bool condition, string format, params object[] args)
+        else
         {
-            InfoIf(!condition, format, args);
+            Info(format, args);
         }
+    }
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="bumpLevel">Trace message level.</param>
-        /// <param name="format">Trace message format.</param>
-        /// <param name="args">Trace message arguments.</param>
-        [Conditional("TRACE")]
-        public static void InfoUnlessAlterTrace(bool condition, PlatformTraceLevel bumpLevel, string format, params object[] args)
+    /// <summary>
+    /// Trace a verbose message.
+    /// </summary>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void Verbose(string? message)
+    {
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Verbose))
         {
-            if (condition)
-            {
-                WriteAtLevel(bumpLevel, format, args);
-            }
-            else
-            {
-                Info(format, args);
-            }
+            TraceImpl.WriteLine(PlatformTraceLevel.Verbose, message);
         }
+    }
 
-        /// <summary>
-        /// Trace a verbose message.
-        /// </summary>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void Verbose(string message)
+    /// <summary>
+    /// Trace a verbose message based on condition.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void VerboseIf(bool condition, string? message)
+    {
+        if (condition)
         {
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Verbose))
-            {
-                traceImpl.WriteLine(PlatformTraceLevel.Verbose, message);
-            }
+            Verbose(message);
         }
+    }
+
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void VerboseUnless(bool condition, string? message)
+    {
+        VerboseIf(!condition, message);
+    }
 
-        /// <summary>
-        /// Trace a verbose message based on condition.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void VerboseIf(bool condition, string message)
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="level">Trace message level.</param>
+    /// <param name="message">Trace message.</param>
+    [Conditional("TRACE")]
+    public static void VerboseUnlessAlterTrace(bool condition, PlatformTraceLevel level, string? message)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Verbose(message);
-            }
+            WriteAtLevel(level, message);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void VerboseUnless(bool condition, string message)
+        else
         {
-            VerboseIf(!condition, message);
+            Verbose(message);
         }
+    }
+
+    /// <summary>
+    /// Trace a verbose message.
+    /// </summary>
+    /// <param name="format">Format of trace message.</param>
+    /// <param name="args">Arguments for trace message.</param>
+    [Conditional("TRACE")]
+    public static void Verbose(string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="level">Trace message level.</param>
-        /// <param name="message">Trace message.</param>
-        [Conditional("TRACE")]
-        public static void VerboseUnlessAlterTrace(bool condition, PlatformTraceLevel level, string message)
+        // Check level before doing string.Format to avoid string creation if tracing is off.
+        if (TraceImpl.ShouldTrace(PlatformTraceLevel.Verbose))
         {
-            if (condition)
-            {
-                WriteAtLevel(level, message);
-            }
-            else
-            {
-                Verbose(message);
-            }
+            Verbose(string.Format(CultureInfo.InvariantCulture, format, args));
         }
+    }
 
-        /// <summary>
-        /// Trace a verbose message.
-        /// </summary>
-        /// <param name="format">Format of trace message.</param>
-        /// <param name="args">Arguments for trace message.</param>
-        [Conditional("TRACE")]
-        public static void Verbose(string format, params object[] args)
+    /// <summary>
+    /// Trace a verbose message based on a condition.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Message format.</param>
+    /// <param name="args">Arguments for trace message.</param>
+    [Conditional("TRACE")]
+    public static void VerboseIf(bool condition, string format, params object?[] args)
+    {
+        if (condition)
         {
-            Debug.Assert(format != null, "format != null");
-
-            // Check level before doing string.Format to avoid string creation if tracing is off.
-            if (traceImpl.ShouldTrace(PlatformTraceLevel.Verbose))
-            {
-                Verbose(string.Format(CultureInfo.InvariantCulture, format, args));
-            }
+            Verbose(format, args);
         }
+    }
 
-        /// <summary>
-        /// Trace a verbose message based on a condition.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Message format.</param>
-        /// <param name="args">Arguments for trace message.</param>
-        [Conditional("TRACE")]
-        public static void VerboseIf(bool condition, string format, params object[] args)
+    /// <summary>
+    /// Only prints the formatted message if the condition is false
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="format">Format for the trace message.</param>
+    /// <param name="args">Trace message arguments.</param>
+    [Conditional("TRACE")]
+    public static void VerboseUnless(bool condition, string format, params object?[] args)
+    {
+        VerboseIf(!condition, format, args);
+    }
+
+    /// <summary>
+    /// Prints the message if the condition is false. If the condition is true,
+    /// the message is instead printed at the specified trace level.
+    /// </summary>
+    /// <param name="condition">Condition for tracing.</param>
+    /// <param name="level">Trace message level.</param>
+    /// <param name="format">Format of the trace message.</param>
+    /// <param name="args">Arguments for the trace message format.</param>
+    [Conditional("TRACE")]
+    public static void VerboseUnlessAlterTrace(bool condition, PlatformTraceLevel level, string format, params object?[] args)
+    {
+        if (condition)
         {
-            if (condition)
-            {
-                Verbose(format, args);
-            }
+            WriteAtLevel(level, format, args);
         }
-
-        /// <summary>
-        /// Only prints the formatted message if the condition is false
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="format">Format for the trace message.</param>
-        /// <param name="args">Trace message arguments.</param>
-        [Conditional("TRACE")]
-        public static void VerboseUnless(bool condition, string format, params object[] args)
+        else
         {
-            VerboseIf(!condition, format, args);
+            Verbose(format, args);
         }
+    }
 
-        /// <summary>
-        /// Prints the message if the condition is false. If the condition is true,
-        /// the message is instead printed at the specified trace level.
-        /// </summary>
-        /// <param name="condition">Condition for tracing.</param>
-        /// <param name="level">Trace message level.</param>
-        /// <param name="format">Format of the trace message.</param>
-        /// <param name="args">Arguments for the trace message format.</param>
-        [Conditional("TRACE")]
-        public static void VerboseUnlessAlterTrace(bool condition, PlatformTraceLevel level, string format, params object[] args)
+    /// <summary>
+    /// Formats an exception into a nice looking message.
+    /// </summary>
+    /// <param name="exceptionToTrace">The exception to write.</param>
+    /// <returns>The formatted string.</returns>
+    private static string FormatException(Exception exceptionToTrace)
+    {
+        // Prefix for each line
+        string prefix = Environment.NewLine + '\t';
+
+        // Format this exception
+        StringBuilder message = new();
+        message.Append(
+            string.Format(
+                CultureInfo.InvariantCulture,
+                "Exception: {0}{1}Message: {2}{3}Stack Trace: {4}",
+                exceptionToTrace.GetType(),
+                prefix,
+                exceptionToTrace.Message,
+                prefix,
+                exceptionToTrace.StackTrace));
+
+        // If there is base exception, add that to message
+        if (exceptionToTrace.GetBaseException() != null)
         {
-            if (condition)
-            {
-                WriteAtLevel(level, format, args);
-            }
-            else
-            {
-                Verbose(format, args);
-            }
+            message.Append(
+                string.Format(
+                    CultureInfo.InvariantCulture,
+                    "{0}BaseExceptionMessage: {1}",
+                    prefix,
+                    exceptionToTrace.GetBaseException().Message));
         }
 
-        /// <summary>
-        /// Formats an exception into a nice looking message.
-        /// </summary>
-        /// <param name="exceptionToTrace">The exception to write.</param>
-        /// <returns>The formatted string.</returns>
-        private static string FormatException(Exception exceptionToTrace)
+        // If there is inner exception, add that to message
+        // We deliberately avoid recursive calls here.
+        if (exceptionToTrace.InnerException != null)
         {
-            // Prefix for each line
-            string prefix = Environment.NewLine + '\t';
-
-            // Format this exception
-            StringBuilder message = new StringBuilder();
+            // Format same as outer exception except
+            // "InnerException" is prefixed to each line
+            Exception inner = exceptionToTrace.InnerException;
+            prefix += "InnerException";
             message.Append(
                 string.Format(
                     CultureInfo.InvariantCulture,
-                    "Exception: {0}{1}Message: {2}{3}Stack Trace: {4}",
-                    exceptionToTrace.GetType(),
+                    "{0}: {1}{2} Message: {3}{4} Stack Trace: {5}",
                     prefix,
-                    exceptionToTrace.Message,
+                    inner.GetType(),
                     prefix,
-                    exceptionToTrace.StackTrace));
+                    inner.Message,
+                    prefix,
+                    inner.StackTrace));
 
-            // If there is base exception, add that to message
-            if (exceptionToTrace.GetBaseException() != null)
+            if (inner.GetBaseException() != null)
             {
                 message.Append(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "{0}BaseExceptionMessage: {1}",
                         prefix,
-                        exceptionToTrace.GetBaseException().Message));
-            }
-
-            // If there is inner exception, add that to message
-            // We deliberately avoid recursive calls here.
-            if (exceptionToTrace.InnerException != null)
-            {
-                // Format same as outer exception except
-                // "InnerException" is prefixed to each line
-                Exception inner = exceptionToTrace.InnerException;
-                prefix += "InnerException";
-                message.Append(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        "{0}: {1}{2} Message: {3}{4} Stack Trace: {5}",
-                        prefix,
-                        inner.GetType(),
-                        prefix,
-                        inner.Message,
-                        prefix,
-                        inner.StackTrace));
-
-                if (inner.GetBaseException() != null)
-                {
-                    message.Append(
-                        string.Format(
-                            CultureInfo.InvariantCulture,
-                            "{0}BaseExceptionMessage: {1}",
-                            prefix,
-                            inner.GetBaseException().Message));
-                }
+                        inner.GetBaseException().Message));
             }
+        }
 
-            // Append a new line
-            message.Append(Environment.NewLine);
+        // Append a new line
+        message.Append(Environment.NewLine);
 
-            return message.ToString();
-        }
+        return message.ToString();
+    }
 
-        private static void WriteAtLevel(PlatformTraceLevel level, string message)
+    private static void WriteAtLevel(PlatformTraceLevel level, string? message)
+    {
+        switch (level)
         {
-            switch (level)
-            {
-                case PlatformTraceLevel.Off:
-                    return;
-                case PlatformTraceLevel.Error:
-                    Error(message);
-                    break;
-                case PlatformTraceLevel.Warning:
-                    Warning(message);
-                    break;
-                case PlatformTraceLevel.Info:
-                    Info(message);
-                    break;
-                case PlatformTraceLevel.Verbose:
-                    Verbose(message);
-                    break;
-                default:
-                    FailDebugger("We should never get here!");
-                    break;
-            }
+            case PlatformTraceLevel.Off:
+                return;
+            case PlatformTraceLevel.Error:
+                Error(message);
+                break;
+            case PlatformTraceLevel.Warning:
+                Warning(message);
+                break;
+            case PlatformTraceLevel.Info:
+                Info(message);
+                break;
+            case PlatformTraceLevel.Verbose:
+                Verbose(message);
+                break;
+            default:
+                FailDebugger("We should never get here!");
+                break;
         }
+    }
 
-        private static void WriteAtLevel(PlatformTraceLevel level, string format, params object[] args)
-        {
-            Debug.Assert(format != null, "format != null");
-            WriteAtLevel(level, string.Format(CultureInfo.InvariantCulture, format, args));
-        }
+    private static void WriteAtLevel(PlatformTraceLevel level, string format, params object?[] args)
+    {
+        TPDebug.Assert(format != null, "format != null");
+        WriteAtLevel(level, string.Format(CultureInfo.InvariantCulture, format, args));
+    }
 
-        private static void FailDebugger(string message)
-        {
-#if DEBUG
-#if NETSTANDARD1_0
-            Debug.Assert(false, message);
-#else
-            Debug.Fail(message);
-#endif
-#endif
-        }
+    private static void FailDebugger(string? message)
+    {
+        Debug.Fail(message);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
index 767d09cf83..3953533dcf 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs
@@ -1,262 +1,261 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+
+/// <summary>
+/// TestPlatform Instrumentation events
+/// </summary>
+public interface ITestPlatformEventSource
 {
     /// <summary>
-    /// TestPlatform Instrumentation events
-    /// </summary>
-    public interface ITestPlatformEventSource
-    {
-        /// <summary>
-        /// The vs test console start.
-        /// </summary>
-        void VsTestConsoleStart();
-
-        /// <summary>
-        /// The vs test console stop.
-        /// </summary>
-        void VsTestConsoleStop();
-
-        /// <summary>
-        /// The discovery request start.
-        /// </summary>
-        void DiscoveryRequestStart();
-
-        /// <summary>
-        /// The discovery request stop.
-        /// </summary>
-        void DiscoveryRequestStop();
-
-        /// <summary>
-        /// The execution request start.
-        /// </summary>
-        void ExecutionRequestStart();
-
-        /// <summary>
-        /// The execution request stop.
-        /// </summary>
-        void ExecutionRequestStop();
-
-        /// <summary>
-        /// The test host start.
-        /// </summary>
-        void TestHostStart();
-
-        /// <summary>
-        /// The test host stop.
-        /// </summary>
-        void TestHostStop();
-
-        /// <summary>
-        /// The test host AppDomain Start.
-        /// </summary>
-        void TestHostAppDomainCreationStart();
-
-        /// <summary>
-        /// The test host AppDomain Stop.
-        /// </summary>
-        void TestHostAppDomainCreationStop();
-
-        /// <summary>
-        /// The adapter search start.
-        /// </summary>
-        void AdapterSearchStart();
-
-        /// <summary>
-        /// The adapter search stop.
-        /// </summary>
-        void AdapterSearchStop();
-
-        /// <summary>
-        /// The adapter execution start.
-        /// </summary>
-        /// <param name="executorUri">
-        /// The executor uri.
-        /// </param>
-        void AdapterExecutionStart(string executorUri);
-
-        /// <summary>
-        /// The adapter execution stop.
-        /// </summary>
-        /// <param name="numberOfTests">
-        /// The number of tests.
-        /// </param>
-        void AdapterExecutionStop(long numberOfTests);
-
-        /// <summary>
-        /// The adapter discovery start.
-        /// </summary>
-        /// <param name="executorUri">
-        /// The executor uri.
-        /// </param>
-        void AdapterDiscoveryStart(string executorUri);
-
-        /// <summary>
-        /// The adapter discovery stop.
-        /// </summary>
-        /// <param name="numberOfTests">
-        /// The number of tests.
-        /// </param>
-        void AdapterDiscoveryStop(long numberOfTests);
-
-        /// <summary>
-        /// The discovery start.
-        /// </summary>
-        void DiscoveryStart();
-
-        /// <summary>
-        /// The discovery stop.
-        /// </summary>
-        /// <param name="numberOfTests">
-        /// The number of tests.
-        /// </param>
-        void DiscoveryStop(long numberOfTests);
-
-        /// <summary>
-        /// The execution start.
-        /// </summary>
-        void ExecutionStart();
-
-        /// <summary>
-        /// The execution stop.
-        /// </summary>
-        /// <param name="numberOfTests">
-        /// The number of tests.
-        /// </param>
-        void ExecutionStop(long numberOfTests);
-
-        /// <summary>
-        /// The data collection start.
-        /// </summary>
-        /// <param name="dataCollectorUri">
-        /// The data collector uri.
-        /// </param>
-        void DataCollectionStart(string dataCollectorUri);
-
-        /// <summary>
-        /// The data collection stop.
-        /// </summary>
-        void DataCollectionStop();
-
-        /// <summary>
-        /// Mark the start of translation layer initialization.
-        /// </summary>
-        void TranslationLayerInitializeStart();
-
-        /// <summary>
-        /// Mark the completion of translation layer initialization.
-        /// </summary>
-        void TranslationLayerInitializeStop();
-
-        /// <summary>
-        /// Mark the start of translation layer discovery request.
-        /// </summary>
-        void TranslationLayerDiscoveryStart();
-
-        /// <summary>
-        /// Mark the completion of translation layer discovery request.
-        /// </summary>
-        void TranslationLayerDiscoveryStop();
-
-        /// <summary>
-        /// Mark the start of translation layer execution request.
-        /// </summary>
-        /// <param name="customTestHost">Set to 1 if custom test host is used, 0 otherwise</param>
-        /// <param name="sourcesCount"></param>
-        /// <param name="testCasesCount">Number of test cases if request has a filter</param>
-        /// <param name="runSettings"></param>
-        void TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings);
-
-        /// <summary>
-        /// Mark the completion of translation layer execution request.
-        /// </summary>
-        void TranslationLayerExecutionStop();
-
-        /// <summary>
-        /// Mark the start of Metrics Dispose.
-        /// </summary>
-        void MetricsDisposeStart();
-
-        /// <summary>
-        /// Mark the completion of Metrics Dispose.
-        /// </summary>
-        void MetricsDisposeStop();
-
-        /// <summary>
-        /// The test run attachments processing request start.
-        /// </summary>
-        void TestRunAttachmentsProcessingRequestStart();
-
-        /// <summary>
-        /// The test run attachments processing request stop.
-        /// </summary>
-        void TestRunAttachmentsProcessingRequestStop();
-
-        /// <summary>
-        /// The test run attachments processing start.
-        /// </summary>
-        /// <param name="numberOfAttachments">
-        /// The number of attachments.
-        /// </param>
-        void TestRunAttachmentsProcessingStart(long numberOfAttachments);
-
-        /// <summary>
-        /// The test run attachments processing stop.
-        /// </summary>
-        /// <param name="numberOfAttachments">
-        /// The number of attachments.
-        /// </param>
-        void TestRunAttachmentsProcessingStop(long numberOfAttachments);
-
-        /// <summary>
-        /// Mark the start of translation layer test run attachments processing request.
-        /// </summary>
-        void TranslationLayerTestRunAttachmentsProcessingStart();
-
-        /// <summary>
-        /// Mark the completion of translation layer test run attachments processing request.
-        /// </summary>
-        void TranslationLayerTestRunAttachmentsProcessingStop();
-
-        /// <summary>
-        /// The start of the test session start request.
-        /// </summary>
-        void StartTestSessionStart();
-
-        /// <summary>
-        /// The end of the test session start request.
-        /// </summary>
-        void StartTestSessionStop();
-
-        /// <summary>
-        /// Mark the start of a translation layer start test session request.
-        /// </summary>
-        void TranslationLayerStartTestSessionStart();
-
-        /// <summary>
-        /// Mark the end of a translation layer start test session request.
-        /// </summary>
-        void TranslationLayerStartTestSessionStop();
-
-        /// <summary>
-        /// The start of the test session stop request.
-        /// </summary>
-        void StopTestSessionStart();
-
-        /// <summary>
-        /// The end of the test session stop request.
-        /// </summary>
-        void StopTestSessionStop();
-
-        /// <summary>
-        /// Mark the start of a translation layer stop test session request.
-        /// </summary>
-        void TranslationLayerStopTestSessionStart();
-
-        /// <summary>
-        /// Mark the end of a translation layer stop test session request.
-        /// </summary>
-        void TranslationLayerStopTestSessionStop();
-    }
+    /// The vs test console start.
+    /// </summary>
+    void VsTestConsoleStart();
+
+    /// <summary>
+    /// The vs test console stop.
+    /// </summary>
+    void VsTestConsoleStop();
+
+    /// <summary>
+    /// The discovery request start.
+    /// </summary>
+    void DiscoveryRequestStart();
+
+    /// <summary>
+    /// The discovery request stop.
+    /// </summary>
+    void DiscoveryRequestStop();
+
+    /// <summary>
+    /// The execution request start.
+    /// </summary>
+    void ExecutionRequestStart();
+
+    /// <summary>
+    /// The execution request stop.
+    /// </summary>
+    void ExecutionRequestStop();
+
+    /// <summary>
+    /// The test host start.
+    /// </summary>
+    void TestHostStart();
+
+    /// <summary>
+    /// The test host stop.
+    /// </summary>
+    void TestHostStop();
+
+    /// <summary>
+    /// The test host AppDomain Start.
+    /// </summary>
+    void TestHostAppDomainCreationStart();
+
+    /// <summary>
+    /// The test host AppDomain Stop.
+    /// </summary>
+    void TestHostAppDomainCreationStop();
+
+    /// <summary>
+    /// The adapter search start.
+    /// </summary>
+    void AdapterSearchStart();
+
+    /// <summary>
+    /// The adapter search stop.
+    /// </summary>
+    void AdapterSearchStop();
+
+    /// <summary>
+    /// The adapter execution start.
+    /// </summary>
+    /// <param name="executorUri">
+    /// The executor uri.
+    /// </param>
+    void AdapterExecutionStart(string executorUri);
+
+    /// <summary>
+    /// The adapter execution stop.
+    /// </summary>
+    /// <param name="numberOfTests">
+    /// The number of tests.
+    /// </param>
+    void AdapterExecutionStop(long numberOfTests);
+
+    /// <summary>
+    /// The adapter discovery start.
+    /// </summary>
+    /// <param name="executorUri">
+    /// The executor uri.
+    /// </param>
+    void AdapterDiscoveryStart(string executorUri);
+
+    /// <summary>
+    /// The adapter discovery stop.
+    /// </summary>
+    /// <param name="numberOfTests">
+    /// The number of tests.
+    /// </param>
+    void AdapterDiscoveryStop(long numberOfTests);
+
+    /// <summary>
+    /// The discovery start.
+    /// </summary>
+    void DiscoveryStart();
+
+    /// <summary>
+    /// The discovery stop.
+    /// </summary>
+    /// <param name="numberOfTests">
+    /// The number of tests.
+    /// </param>
+    void DiscoveryStop(long numberOfTests);
+
+    /// <summary>
+    /// The execution start.
+    /// </summary>
+    void ExecutionStart();
+
+    /// <summary>
+    /// The execution stop.
+    /// </summary>
+    /// <param name="numberOfTests">
+    /// The number of tests.
+    /// </param>
+    void ExecutionStop(long numberOfTests);
+
+    /// <summary>
+    /// The data collection start.
+    /// </summary>
+    /// <param name="dataCollectorUri">
+    /// The data collector uri.
+    /// </param>
+    void DataCollectionStart(string dataCollectorUri);
+
+    /// <summary>
+    /// The data collection stop.
+    /// </summary>
+    void DataCollectionStop();
+
+    /// <summary>
+    /// Mark the start of translation layer initialization.
+    /// </summary>
+    void TranslationLayerInitializeStart();
+
+    /// <summary>
+    /// Mark the completion of translation layer initialization.
+    /// </summary>
+    void TranslationLayerInitializeStop();
+
+    /// <summary>
+    /// Mark the start of translation layer discovery request.
+    /// </summary>
+    void TranslationLayerDiscoveryStart();
+
+    /// <summary>
+    /// Mark the completion of translation layer discovery request.
+    /// </summary>
+    void TranslationLayerDiscoveryStop();
+
+    /// <summary>
+    /// Mark the start of translation layer execution request.
+    /// </summary>
+    /// <param name="customTestHost">Set to 1 if custom test host is used, 0 otherwise</param>
+    /// <param name="sourcesCount"></param>
+    /// <param name="testCasesCount">Number of test cases if request has a filter</param>
+    /// <param name="runSettings"></param>
+    void TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings);
+
+    /// <summary>
+    /// Mark the completion of translation layer execution request.
+    /// </summary>
+    void TranslationLayerExecutionStop();
+
+    /// <summary>
+    /// Mark the start of Metrics Dispose.
+    /// </summary>
+    void MetricsDisposeStart();
+
+    /// <summary>
+    /// Mark the completion of Metrics Dispose.
+    /// </summary>
+    void MetricsDisposeStop();
+
+    /// <summary>
+    /// The test run attachments processing request start.
+    /// </summary>
+    void TestRunAttachmentsProcessingRequestStart();
+
+    /// <summary>
+    /// The test run attachments processing request stop.
+    /// </summary>
+    void TestRunAttachmentsProcessingRequestStop();
+
+    /// <summary>
+    /// The test run attachments processing start.
+    /// </summary>
+    /// <param name="numberOfAttachments">
+    /// The number of attachments.
+    /// </param>
+    void TestRunAttachmentsProcessingStart(long numberOfAttachments);
+
+    /// <summary>
+    /// The test run attachments processing stop.
+    /// </summary>
+    /// <param name="numberOfAttachments">
+    /// The number of attachments.
+    /// </param>
+    void TestRunAttachmentsProcessingStop(long numberOfAttachments);
+
+    /// <summary>
+    /// Mark the start of translation layer test run attachments processing request.
+    /// </summary>
+    void TranslationLayerTestRunAttachmentsProcessingStart();
+
+    /// <summary>
+    /// Mark the completion of translation layer test run attachments processing request.
+    /// </summary>
+    void TranslationLayerTestRunAttachmentsProcessingStop();
+
+    /// <summary>
+    /// The start of the test session start request.
+    /// </summary>
+    void StartTestSessionStart();
+
+    /// <summary>
+    /// The end of the test session start request.
+    /// </summary>
+    void StartTestSessionStop();
+
+    /// <summary>
+    /// Mark the start of a translation layer start test session request.
+    /// </summary>
+    void TranslationLayerStartTestSessionStart();
+
+    /// <summary>
+    /// Mark the end of a translation layer start test session request.
+    /// </summary>
+    void TranslationLayerStartTestSessionStop();
+
+    /// <summary>
+    /// The start of the test session stop request.
+    /// </summary>
+    void StopTestSessionStart();
+
+    /// <summary>
+    /// The end of the test session stop request.
+    /// </summary>
+    void StopTestSessionStop();
+
+    /// <summary>
+    /// Mark the start of a translation layer stop test session request.
+    /// </summary>
+    void TranslationLayerStopTestSessionStart();
+
+    /// <summary>
+    /// Mark the end of a translation layer stop test session request.
+    /// </summary>
+    void TranslationLayerStopTestSessionStop();
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
index 3ad391be38..42f1faa74c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformEventSource.cs
@@ -1,344 +1,339 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NETSTANDARD1_0
+using System.Diagnostics.Tracing;
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing
-{
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
 
-    using System.Diagnostics.Tracing;
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
 
-    /// <inheritdoc/>
-    [EventSource(Name = "TestPlatform")]
-    public class TestPlatformEventSource : EventSource, ITestPlatformEventSource
-    {
-        private static readonly TestPlatformEventSource LocalInstance = new TestPlatformEventSource();
+/// <inheritdoc/>
+[EventSource(Name = "TestPlatform")]
+public class TestPlatformEventSource : EventSource, ITestPlatformEventSource
+{
+    private static readonly TestPlatformEventSource LocalInstance = new();
 
-        /// <summary>
-        /// Gets the instance of <see cref="TestPlatformEventSource"/>.
-        /// </summary>
-        public static ITestPlatformEventSource Instance
+    /// <summary>
+    /// Gets the instance of <see cref="TestPlatformEventSource"/>.
+    /// </summary>
+    public static ITestPlatformEventSource Instance
+    {
+        get
         {
-            get
-            {
-                return LocalInstance;
-            }
+            return LocalInstance;
         }
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.VsTestConsoleStartEventId)]
-        public void VsTestConsoleStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.VsTestConsoleStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.VsTestConsoleStartEventId)]
+    public void VsTestConsoleStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.VsTestConsoleStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.VsTestConsoleStopEventId)]
-        public void VsTestConsoleStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.VsTestConsoleStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.VsTestConsoleStopEventId)]
+    public void VsTestConsoleStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.VsTestConsoleStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DiscoveryRequestStartEventId)]
-        public void DiscoveryRequestStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DiscoveryRequestStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DiscoveryRequestStartEventId)]
+    public void DiscoveryRequestStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DiscoveryRequestStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DiscoveryRequestStopEventId)]
-        public void DiscoveryRequestStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DiscoveryRequestStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DiscoveryRequestStopEventId)]
+    public void DiscoveryRequestStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DiscoveryRequestStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.ExecutionRequestStartEventId)]
-        public void ExecutionRequestStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.ExecutionRequestStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.ExecutionRequestStartEventId)]
+    public void ExecutionRequestStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.ExecutionRequestStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.ExecutionRequestStopEventId)]
-        public void ExecutionRequestStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.ExecutionRequestStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.ExecutionRequestStopEventId)]
+    public void ExecutionRequestStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.ExecutionRequestStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestHostStartEventId)]
-        public void TestHostStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestHostStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestHostStartEventId)]
+    public void TestHostStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestHostStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestHostStopEventId)]
-        public void TestHostStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestHostStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestHostStopEventId)]
+    public void TestHostStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestHostStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStartEventId)]
-        public void TestHostAppDomainCreationStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStartEventId)]
+    public void TestHostAppDomainCreationStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStopEventId)]
-        public void TestHostAppDomainCreationStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStopEventId)]
+    public void TestHostAppDomainCreationStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestHostAppDomainCreationStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterSearchStartEventId)]
-        public void AdapterSearchStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterSearchStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterSearchStartEventId)]
+    public void AdapterSearchStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterSearchStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterSearchStopEventId)]
-        public void AdapterSearchStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterSearchStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterSearchStopEventId)]
+    public void AdapterSearchStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterSearchStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterExecutionStartEventId)]
-        public void AdapterExecutionStart(string executorUri)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterExecutionStartEventId, executorUri);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterExecutionStartEventId)]
+    public void AdapterExecutionStart(string executorUri)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterExecutionStartEventId, executorUri);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterExecutionStopEventId)]
-        public void AdapterExecutionStop(long numberOfTests)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterExecutionStopEventId, numberOfTests);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterExecutionStopEventId)]
+    public void AdapterExecutionStop(long numberOfTests)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterExecutionStopEventId, numberOfTests);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterDiscoveryStartEventId)]
-        public void AdapterDiscoveryStart(string executorUri)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterDiscoveryStartEventId, executorUri);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterDiscoveryStartEventId)]
+    public void AdapterDiscoveryStart(string executorUri)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterDiscoveryStartEventId, executorUri);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.AdapterDiscoveryStopEventId)]
-        public void AdapterDiscoveryStop(long numberOfTests)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.AdapterDiscoveryStopEventId, numberOfTests);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.AdapterDiscoveryStopEventId)]
+    public void AdapterDiscoveryStop(long numberOfTests)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.AdapterDiscoveryStopEventId, numberOfTests);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DiscoveryStartEventId)]
-        public void DiscoveryStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DiscoveryStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DiscoveryStartEventId)]
+    public void DiscoveryStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DiscoveryStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DiscoveryStopEventId)]
-        public void DiscoveryStop(long numberOfTests)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DiscoveryStopEventId, numberOfTests);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DiscoveryStopEventId)]
+    public void DiscoveryStop(long numberOfTests)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DiscoveryStopEventId, numberOfTests);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.ExecutionStartEventId)]
-        public void ExecutionStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.ExecutionStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.ExecutionStartEventId)]
+    public void ExecutionStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.ExecutionStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.ExecutionStopEventId)]
-        public void ExecutionStop(long numberOfTests)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.ExecutionStopEventId, numberOfTests);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.ExecutionStopEventId)]
+    public void ExecutionStop(long numberOfTests)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.ExecutionStopEventId, numberOfTests);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DataCollectionStartEventId)]
-        public void DataCollectionStart(string dataCollectorUri)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DataCollectionStartEventId, dataCollectorUri);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DataCollectionStartEventId)]
+    public void DataCollectionStart(string dataCollectorUri)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DataCollectionStartEventId, dataCollectorUri);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.DataCollectionStopEventId)]
-        public void DataCollectionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.DataCollectionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.DataCollectionStopEventId)]
+    public void DataCollectionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.DataCollectionStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerInitializeStartEventId)]
-        public void TranslationLayerInitializeStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerInitializeStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerInitializeStartEventId)]
+    public void TranslationLayerInitializeStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerInitializeStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerInitializeStopEventId)]
-        public void TranslationLayerInitializeStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerInitializeStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerInitializeStopEventId)]
+    public void TranslationLayerInitializeStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerInitializeStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStartEventId)]
-        public void TranslationLayerDiscoveryStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStartEventId)]
+    public void TranslationLayerDiscoveryStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStopEventId)]
-        public void TranslationLayerDiscoveryStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStopEventId)]
+    public void TranslationLayerDiscoveryStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerDiscoveryStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerExecutionStartEventId)]
-        public void TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings)
-        {
-            this.WriteEvent(
-                TestPlatformInstrumentationEvents.TranslationLayerExecutionStartEventId,
-                customTestHost,
-                sourcesCount,
-                testCasesCount,
-                runSettings);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerExecutionStartEventId)]
+    public void TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings)
+    {
+        WriteEvent(
+            TestPlatformInstrumentationEvents.TranslationLayerExecutionStartEventId,
+            customTestHost,
+            sourcesCount,
+            testCasesCount,
+            runSettings);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerExecutionStopEventId)]
-        public void TranslationLayerExecutionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerExecutionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerExecutionStopEventId)]
+    public void TranslationLayerExecutionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerExecutionStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.MetricsDisposeStartEventId)]
-        public void MetricsDisposeStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.MetricsDisposeStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.MetricsDisposeStartEventId)]
+    public void MetricsDisposeStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.MetricsDisposeStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.MetricsDisposeStopEventId)]
-        public void MetricsDisposeStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.MetricsDisposeStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.MetricsDisposeStopEventId)]
+    public void MetricsDisposeStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.MetricsDisposeStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStartEventId)]
-        public void TestRunAttachmentsProcessingRequestStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStartEventId)]
+    public void TestRunAttachmentsProcessingRequestStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStopEventId)]
-        public void TestRunAttachmentsProcessingRequestStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStopEventId)]
+    public void TestRunAttachmentsProcessingRequestStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingRequestStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStartEventId)]
-        public void TestRunAttachmentsProcessingStart(long numberOfAttachments)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStartEventId, numberOfAttachments);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStartEventId)]
+    public void TestRunAttachmentsProcessingStart(long numberOfAttachments)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStartEventId, numberOfAttachments);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStopEventId)]
-        public void TestRunAttachmentsProcessingStop(long numberOfAttachments)
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStopEventId, numberOfAttachments);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStopEventId)]
+    public void TestRunAttachmentsProcessingStop(long numberOfAttachments)
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TestRunAttachmentsProcessingStopEventId, numberOfAttachments);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStartEventId)]
-        public void TranslationLayerTestRunAttachmentsProcessingStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStartEventId)]
+    public void TranslationLayerTestRunAttachmentsProcessingStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStopEventId)]
-        public void TranslationLayerTestRunAttachmentsProcessingStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStopEventId)]
+    public void TranslationLayerTestRunAttachmentsProcessingStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerTestRunAttachmentsProcessingStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.StartTestSessionStartEventId)]
-        public void StartTestSessionStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.StartTestSessionStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.StartTestSessionStartEventId)]
+    public void StartTestSessionStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.StartTestSessionStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.StartTestSessionStopEventId)]
-        public void StartTestSessionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.StartTestSessionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.StartTestSessionStopEventId)]
+    public void StartTestSessionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.StartTestSessionStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStartEventId)]
-        public void TranslationLayerStartTestSessionStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStartEventId)]
+    public void TranslationLayerStartTestSessionStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStopEventId)]
-        public void TranslationLayerStartTestSessionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStopEventId)]
+    public void TranslationLayerStartTestSessionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStartTestSessionStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.StopTestSessionStartEventId)]
-        public void StopTestSessionStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.StopTestSessionStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.StopTestSessionStartEventId)]
+    public void StopTestSessionStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.StopTestSessionStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.StopTestSessionStopEventId)]
-        public void StopTestSessionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.StopTestSessionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.StopTestSessionStopEventId)]
+    public void StopTestSessionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.StopTestSessionStopEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStartEventId)]
-        public void TranslationLayerStopTestSessionStart()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStartEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStartEventId)]
+    public void TranslationLayerStopTestSessionStart()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStartEventId);
+    }
 
-        /// <inheritdoc/>
-        [Event(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStopEventId)]
-        public void TranslationLayerStopTestSessionStop()
-        {
-            this.WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStopEventId);
-        }
+    /// <inheritdoc/>
+    [Event(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStopEventId)]
+    public void TranslationLayerStopTestSessionStop()
+    {
+        WriteEvent(TestPlatformInstrumentationEvents.TranslationLayerStopTestSessionStopEventId);
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformInstrumentationEvents.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformInstrumentationEvents.cs
index 51e8fec9ba..13073697aa 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformInstrumentationEvents.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/TestPlatformInstrumentationEvents.cs
@@ -1,231 +1,230 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+
+/// <summary>
+/// TestPlatform Event Ids and tasks constants
+/// </summary>
+internal class TestPlatformInstrumentationEvents
 {
     /// <summary>
-    /// TestPlatform Event Ids and tasks constants
-    /// </summary>
-    internal class TestPlatformInstrumentationEvents
-    {
-        /// <summary>
-        /// The discovery start event id.
-        /// </summary>
-        public const int DiscoveryStartEventId = 0x1;
-
-        /// <summary>
-        /// The discovery stop event id.
-        /// </summary>
-        public const int DiscoveryStopEventId = 0x2;
-
-        /// <summary>
-        /// The execution start event id.
-        /// </summary>
-        public const int ExecutionStartEventId = 0x4;
-
-        /// <summary>
-        /// The execution stop event id.
-        /// </summary>
-        public const int ExecutionStopEventId = 0x5;
-
-        /// <summary>
-        /// The adapter execution start event id.
-        /// </summary>
-        public const int AdapterExecutionStartEventId = 0x7;
-
-        /// <summary>
-        /// The adapter execution stop event id.
-        /// </summary>
-        public const int AdapterExecutionStopEventId = 0x8;
-
-        /// <summary>
-        /// The console runner start event id.
-        /// </summary>
-        public const int VsTestConsoleStartEventId = 0x10;
-
-        /// <summary>
-        /// The console runner stop event id.
-        /// </summary>
-        public const int VsTestConsoleStopEventId = 0x11;
-
-        /// <summary>
-        /// The test host start event id.
-        /// </summary>
-        public const int TestHostStartEventId = 0x13;
-
-        /// <summary>
-        /// The test host stop event id.
-        /// </summary>
-        public const int TestHostStopEventId = 0x14;
-
-        /// <summary>
-        /// The adapter search start event id.
-        /// </summary>
-        public const int AdapterSearchStartEventId = 0x16;
-
-        /// <summary>
-        /// The adapter search stop event id.
-        /// </summary>
-        public const int AdapterSearchStopEventId = 0x17;
-
-        /// <summary>
-        /// The discovery request start event id.
-        /// </summary>
-        public const int DiscoveryRequestStartEventId = 0x19;
-
-        /// <summary>
-        /// The discovery request stop event id.
-        /// </summary>
-        public const int DiscoveryRequestStopEventId = 0x20;
-
-        /// <summary>
-        /// The execution request start event id.
-        /// </summary>
-        public const int ExecutionRequestStartEventId = 0x21;
-
-        /// <summary>
-        /// The execution request stop event id.
-        /// </summary>
-        public const int ExecutionRequestStopEventId = 0x22;
-
-        /// <summary>
-        /// The data collection start event id.
-        /// </summary>
-        public const int DataCollectionStartEventId = 0x25;
-
-        /// <summary>
-        /// The data collection stop event id.
-        /// </summary>
-        public const int DataCollectionStopEventId = 0x26;
-
-        /// <summary>
-        /// The adapter discovery start event id.
-        /// </summary>
-        public const int AdapterDiscoveryStartEventId = 0x27;
-
-        /// <summary>
-        /// The adapter discovery stop event id.
-        /// </summary>
-        public const int AdapterDiscoveryStopEventId = 0x28;
-
-        /// <summary>
-        /// The test host appdomain start event id.
-        /// </summary>
-        public const int TestHostAppDomainCreationStartEventId = 0x30;
-
-        /// <summary>
-        /// The test host appdomain stop event id.
-        /// </summary>
-        public const int TestHostAppDomainCreationStopEventId = 0x31;
-
-        /// <summary>
-        /// Events fired on initialization of translation layer.
-        /// </summary>
-        public const int TranslationLayerInitializeStartEventId = 0x32;
-
-        /// <summary>
-        /// Events fired on initialization complete of translation layer.
-        /// </summary>
-        public const int TranslationLayerInitializeStopEventId = 0x33;
-
-        /// <summary>
-        /// Events fired on discovery start of translation layer.
-        /// </summary>
-        public const int TranslationLayerDiscoveryStartEventId = 0x34;
-
-        /// <summary>
-        /// Events fired on discovery complete in translation layer.
-        /// </summary>
-        public const int TranslationLayerDiscoveryStopEventId = 0x35;
-
-        /// <summary>
-        /// Event fired on execution start in translation layer.
-        /// </summary>
-        public const int TranslationLayerExecutionStartEventId = 0x36;
-
-        /// <summary>
-        /// Event fired on execution complete in translation layer.
-        /// </summary>
-        public const int TranslationLayerExecutionStopEventId = 0x37;
-
-        /// <summary>
-        /// Event fired on Metrics Dispose start.
-        /// </summary>
-        public const int MetricsDisposeStartEventId = 0x38;
-
-        /// <summary>
-        /// Event fired on Metrics Dispose completes.
-        /// </summary>
-        public const int MetricsDisposeStopEventId = 0x39;
-
-        /// <summary>
-        /// The session attachments processing start event id.
-        /// </summary>
-        public const int TestRunAttachmentsProcessingStartEventId = 0x40;
-
-        /// <summary>
-        /// The session attachments processing stop event id.
-        /// </summary>
-        public const int TestRunAttachmentsProcessingStopEventId = 0x41;
-
-        /// <summary>
-        /// The session attachments processing request start event id.
-        /// </summary>
-        public const int TestRunAttachmentsProcessingRequestStartEventId = 0x42;
-
-        /// <summary>
-        /// The session attachments processing request stop event id.
-        /// </summary>
-        public const int TestRunAttachmentsProcessingRequestStopEventId = 0x43;
-
-        /// <summary>
-        /// Events fired on session attachments processing start of translation layer.
-        /// </summary>
-        public const int TranslationLayerTestRunAttachmentsProcessingStartEventId = 0x44;
-
-        /// <summary>
-        /// Events fired on session attachments processing complete in translation layer.
-        /// </summary>
-        public const int TranslationLayerTestRunAttachmentsProcessingStopEventId = 0x45;
-
-        /// <summary>
-        /// The start test session start event id.
-        /// </summary>
-        public const int StartTestSessionStartEventId = 0x46;
-
-        /// <summary>
-        /// The start test session stop event id.
-        /// </summary>
-        public const int StartTestSessionStopEventId = 0x47;
-
-        /// <summary>
-        /// The translation layer start test session start event id.
-        /// </summary>
-        public const int TranslationLayerStartTestSessionStartEventId = 0x48;
-
-        /// <summary>
-        /// The translation layer start test session stop event id.
-        /// </summary>
-        public const int TranslationLayerStartTestSessionStopEventId = 0x49;
-
-        /// <summary>
-        /// The stop test session start event id.
-        /// </summary>
-        public const int StopTestSessionStartEventId = 0x4A;
-
-        /// <summary>
-        /// The stop test session stop event id.
-        /// </summary>
-        public const int StopTestSessionStopEventId = 0x4B;
-
-        /// <summary>
-        /// The translation layer stop test session start event id.
-        /// </summary>
-        public const int TranslationLayerStopTestSessionStartEventId = 0x4C;
-
-        /// <summary>
-        /// The translation layer stop test session stop event id.
-        /// </summary>
-        public const int TranslationLayerStopTestSessionStopEventId = 0x4D;
-    }
-}
\ No newline at end of file
+    /// The discovery start event id.
+    /// </summary>
+    public const int DiscoveryStartEventId = 0x1;
+
+    /// <summary>
+    /// The discovery stop event id.
+    /// </summary>
+    public const int DiscoveryStopEventId = 0x2;
+
+    /// <summary>
+    /// The execution start event id.
+    /// </summary>
+    public const int ExecutionStartEventId = 0x4;
+
+    /// <summary>
+    /// The execution stop event id.
+    /// </summary>
+    public const int ExecutionStopEventId = 0x5;
+
+    /// <summary>
+    /// The adapter execution start event id.
+    /// </summary>
+    public const int AdapterExecutionStartEventId = 0x7;
+
+    /// <summary>
+    /// The adapter execution stop event id.
+    /// </summary>
+    public const int AdapterExecutionStopEventId = 0x8;
+
+    /// <summary>
+    /// The console runner start event id.
+    /// </summary>
+    public const int VsTestConsoleStartEventId = 0x10;
+
+    /// <summary>
+    /// The console runner stop event id.
+    /// </summary>
+    public const int VsTestConsoleStopEventId = 0x11;
+
+    /// <summary>
+    /// The test host start event id.
+    /// </summary>
+    public const int TestHostStartEventId = 0x13;
+
+    /// <summary>
+    /// The test host stop event id.
+    /// </summary>
+    public const int TestHostStopEventId = 0x14;
+
+    /// <summary>
+    /// The adapter search start event id.
+    /// </summary>
+    public const int AdapterSearchStartEventId = 0x16;
+
+    /// <summary>
+    /// The adapter search stop event id.
+    /// </summary>
+    public const int AdapterSearchStopEventId = 0x17;
+
+    /// <summary>
+    /// The discovery request start event id.
+    /// </summary>
+    public const int DiscoveryRequestStartEventId = 0x19;
+
+    /// <summary>
+    /// The discovery request stop event id.
+    /// </summary>
+    public const int DiscoveryRequestStopEventId = 0x20;
+
+    /// <summary>
+    /// The execution request start event id.
+    /// </summary>
+    public const int ExecutionRequestStartEventId = 0x21;
+
+    /// <summary>
+    /// The execution request stop event id.
+    /// </summary>
+    public const int ExecutionRequestStopEventId = 0x22;
+
+    /// <summary>
+    /// The data collection start event id.
+    /// </summary>
+    public const int DataCollectionStartEventId = 0x25;
+
+    /// <summary>
+    /// The data collection stop event id.
+    /// </summary>
+    public const int DataCollectionStopEventId = 0x26;
+
+    /// <summary>
+    /// The adapter discovery start event id.
+    /// </summary>
+    public const int AdapterDiscoveryStartEventId = 0x27;
+
+    /// <summary>
+    /// The adapter discovery stop event id.
+    /// </summary>
+    public const int AdapterDiscoveryStopEventId = 0x28;
+
+    /// <summary>
+    /// The test host appdomain start event id.
+    /// </summary>
+    public const int TestHostAppDomainCreationStartEventId = 0x30;
+
+    /// <summary>
+    /// The test host appdomain stop event id.
+    /// </summary>
+    public const int TestHostAppDomainCreationStopEventId = 0x31;
+
+    /// <summary>
+    /// Events fired on initialization of translation layer.
+    /// </summary>
+    public const int TranslationLayerInitializeStartEventId = 0x32;
+
+    /// <summary>
+    /// Events fired on initialization complete of translation layer.
+    /// </summary>
+    public const int TranslationLayerInitializeStopEventId = 0x33;
+
+    /// <summary>
+    /// Events fired on discovery start of translation layer.
+    /// </summary>
+    public const int TranslationLayerDiscoveryStartEventId = 0x34;
+
+    /// <summary>
+    /// Events fired on discovery complete in translation layer.
+    /// </summary>
+    public const int TranslationLayerDiscoveryStopEventId = 0x35;
+
+    /// <summary>
+    /// Event fired on execution start in translation layer.
+    /// </summary>
+    public const int TranslationLayerExecutionStartEventId = 0x36;
+
+    /// <summary>
+    /// Event fired on execution complete in translation layer.
+    /// </summary>
+    public const int TranslationLayerExecutionStopEventId = 0x37;
+
+    /// <summary>
+    /// Event fired on Metrics Dispose start.
+    /// </summary>
+    public const int MetricsDisposeStartEventId = 0x38;
+
+    /// <summary>
+    /// Event fired on Metrics Dispose completes.
+    /// </summary>
+    public const int MetricsDisposeStopEventId = 0x39;
+
+    /// <summary>
+    /// The session attachments processing start event id.
+    /// </summary>
+    public const int TestRunAttachmentsProcessingStartEventId = 0x40;
+
+    /// <summary>
+    /// The session attachments processing stop event id.
+    /// </summary>
+    public const int TestRunAttachmentsProcessingStopEventId = 0x41;
+
+    /// <summary>
+    /// The session attachments processing request start event id.
+    /// </summary>
+    public const int TestRunAttachmentsProcessingRequestStartEventId = 0x42;
+
+    /// <summary>
+    /// The session attachments processing request stop event id.
+    /// </summary>
+    public const int TestRunAttachmentsProcessingRequestStopEventId = 0x43;
+
+    /// <summary>
+    /// Events fired on session attachments processing start of translation layer.
+    /// </summary>
+    public const int TranslationLayerTestRunAttachmentsProcessingStartEventId = 0x44;
+
+    /// <summary>
+    /// Events fired on session attachments processing complete in translation layer.
+    /// </summary>
+    public const int TranslationLayerTestRunAttachmentsProcessingStopEventId = 0x45;
+
+    /// <summary>
+    /// The start test session start event id.
+    /// </summary>
+    public const int StartTestSessionStartEventId = 0x46;
+
+    /// <summary>
+    /// The start test session stop event id.
+    /// </summary>
+    public const int StartTestSessionStopEventId = 0x47;
+
+    /// <summary>
+    /// The translation layer start test session start event id.
+    /// </summary>
+    public const int TranslationLayerStartTestSessionStartEventId = 0x48;
+
+    /// <summary>
+    /// The translation layer start test session stop event id.
+    /// </summary>
+    public const int TranslationLayerStartTestSessionStopEventId = 0x49;
+
+    /// <summary>
+    /// The stop test session start event id.
+    /// </summary>
+    public const int StopTestSessionStartEventId = 0x4A;
+
+    /// <summary>
+    /// The stop test session stop event id.
+    /// </summary>
+    public const int StopTestSessionStopEventId = 0x4B;
+
+    /// <summary>
+    /// The translation layer stop test session start event id.
+    /// </summary>
+    public const int TranslationLayerStopTestSessionStartEventId = 0x4C;
+
+    /// <summary>
+    /// The translation layer stop test session stop event id.
+    /// </summary>
+    public const int TranslationLayerStopTestSessionStopEventId = 0x4D;
+}
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/Job.cs b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/Job.cs
index ff433b8482..4b69a6cb11 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/Job.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/Job.cs
@@ -1,101 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName. This is a generic type.
+using System.Threading;
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
-{
-    using System.Threading;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
+/// <summary>
+/// Wrapper class around a job used to send additional information to the background thread.
+/// </summary>
+/// <typeparam name="TPayload">The type of the job.</typeparam>
+internal class Job<TPayload>
+{
     /// <summary>
-    /// Wrapper class around a job used to send additional information to the background thread.
+    /// Initializes a new instance of the <see cref="Job{TPayload}"/> class.
     /// </summary>
-    /// <typeparam name="TPayload">The type of the job.</typeparam>
-    internal class Job<TPayload>
+    /// <param name="job">
+    /// Job to be processed.
+    /// </param>
+    /// <param name="size">
+    /// Size of payload.
+    /// </param>
+    public Job(TPayload job, int size)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Job{TPayload}"/> class.
-        /// </summary>
-        /// <param name="job">
-        /// Job to be processed.
-        /// </param>
-        /// <param name="size">
-        /// Size of payload.
-        /// </param>
-        public Job(TPayload job, int size)
-        {
-            this.Payload = job;
-            this.Size = size;
-        }
-
-        /// <summary>
-        /// Prevents a default instance of the <see cref="Job{TPayload}"/> class from being created.
-        /// </summary>
-        private Job()
-        {
-            this.Size = 0;
-        }
-
-        #endregion
+        Payload = job;
+        Size = size;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Prevents a default instance of the <see cref="Job{TPayload}"/> class from being created.
+    /// </summary>
+    private Job()
+    {
+        Size = 0;
+    }
 
-        /// <summary>
-        /// Gets a special job that indicates the queue should shutdown.
-        /// </summary>
-        public static Job<TPayload> ShutdownJob
+    /// <summary>
+    /// Gets a special job that indicates the queue should shutdown.
+    /// </summary>
+    public static Job<TPayload> ShutdownJob
+    {
+        get
         {
-            get
-            {
-                var shutdownJob = new Job<TPayload>();
-                shutdownJob.Shutdown = true;
+            var shutdownJob = new Job<TPayload>();
+            shutdownJob.Shutdown = true;
 
-                return shutdownJob;
-            }
+            return shutdownJob;
         }
+    }
 
-        /// <summary>
-        /// Gets the job to be processed.
-        /// </summary>
-        public TPayload Payload { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the background thread should shutdown.
-        /// </summary>
-        public bool Shutdown { get; private set; }
-
-        /// <summary>
-        /// Gets the signal that this job is being processed.
-        /// </summary>
-        public ManualResetEvent WaitManualResetEvent { get; private set; }
+    /// <summary>
+    /// Gets the job to be processed.
+    /// </summary>
+    public TPayload? Payload { get; private set; }
 
-        /// <summary>
-        /// Gets the size of this job instance. This is used to manage the total size of Job Queue.
-        /// </summary>
-        public int Size { get; private set; }
+    /// <summary>
+    /// Gets a value indicating whether the background thread should shutdown.
+    /// </summary>
+    public bool Shutdown { get; private set; }
 
-        #endregion
+    /// <summary>
+    /// Gets the signal that this job is being processed.
+    /// </summary>
+    public ManualResetEvent? WaitManualResetEvent { get; private set; }
 
-        #region Static Methods
+    /// <summary>
+    /// Gets the size of this job instance. This is used to manage the total size of Job Queue.
+    /// </summary>
+    public int Size { get; private set; }
 
-        /// <summary>
-        /// Creates a job with a manual reset event that will be set when the job is processed.
-        /// </summary>
-        /// <param name="waitEvent"> The wait Event. </param>
-        /// <returns> The wait job. </returns>
-        public static Job<TPayload> CreateWaitJob(ManualResetEvent waitEvent)
-        {
-            ValidateArg.NotNull<ManualResetEvent>(waitEvent, nameof(waitEvent));
-            var waitJob = new Job<TPayload>();
-            waitJob.WaitManualResetEvent = waitEvent;
+    /// <summary>
+    /// Creates a job with a manual reset event that will be set when the job is processed.
+    /// </summary>
+    /// <param name="waitEvent"> The wait Event. </param>
+    /// <returns> The wait job. </returns>
+    public static Job<TPayload> CreateWaitJob(ManualResetEvent waitEvent)
+    {
+        ValidateArg.NotNull(waitEvent, nameof(waitEvent));
 
-            return waitJob;
-        }
+        var waitJob = new Job<TPayload>();
+        waitJob.WaitManualResetEvent = waitEvent;
 
-        #endregion
+        return waitJob;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/JobQueue.cs b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/JobQueue.cs
index 09b3f3dbb3..797591668c 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/JobQueue.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/JobQueue.cs
@@ -1,376 +1,367 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName. This is a generic type.
-
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Generic queue for processing jobs on a background thread.
+/// </summary>
+/// <typeparam name="T">The type of the job that is being processed.</typeparam>
+public class JobQueue<T> : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    /// <summary>
+    /// Handler which processes the individual jobs.
+    /// </summary>
+    private readonly Action<T?> _processJob;
 
     /// <summary>
-    /// Generic queue for processing jobs on a background thread.
+    /// Name used when displaying information or reporting errors about this queue.
     /// </summary>
-    /// <typeparam name="T">The type of the job that is being processed.</typeparam>
-    public class JobQueue<T> : IDisposable
-    {
-        #region Fields
-
-        /// <summary>
-        /// Handler which processes the individual jobs.
-        /// </summary>
-        private Action<T> processJob;
-
-        /// <summary>
-        /// Name used when displaying information or reporting errors about this queue.
-        /// </summary>
-        private string displayName;
-
-        /// <summary>
-        /// The queue of jobs.
-        /// </summary>
-        private Queue<Job<T>> jobsQueue;
-
-        /// <summary>
-        /// Signaled when a job is added to the queue.  Used to wakeup the background thread.
-        /// </summary>
-        private ManualResetEvent jobAdded;
-
-        /// <summary>
-        /// The maximum number of jobs the job queue may hold.
-        /// </summary>
-        private int maxNumberOfJobsInQueue;
-
-        /// <summary>
-        /// The maximum total size of jobs the job queue may hold.
-        /// </summary>
-        private int maxBytesQueueCanHold;
-
-        /// <summary>
-        /// Gives the approximate total size of objects in the queue.
-        /// </summary>
-        private int currentNumberOfBytesQueueIsHolding;
-
-        /// <summary>
-        /// Tells whether the queue should be bounded on size and no of events.
-        /// </summary>
-        private bool enableBoundsOnQueue;
-
-        /// <summary>
-        /// Used to pause and resume processing of the queue.  By default the manual reset event is
-        /// set so the queue can continue processing.
-        /// </summary>
-        private ManualResetEvent queueProcessing;
-
-        /// <summary>
-        /// The background thread which is processing the jobs.  Used when disposing to wait
-        /// for the thread to complete.
-        /// </summary>
-        private Task backgroundJobProcessor;
-
-        /// <summary>
-        /// Keeps track of if we are disposed.
-        /// </summary>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Logs to this action any exception when processing jobs.
-        /// </summary>
-        private Action<string> exceptionLogger;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JobQueue{T}"/> class.
-        /// </summary>
-        /// <param name="processJob">Action to handle the processing of the job.</param>
-        /// <param name="displayName">Name to used when displaying information about this queue.</param>
-        /// <param name="maxQueueLength">The max Queue Length.</param>
-        /// <param name="maxQueueSize">The max Queue Size.</param>
-        /// <param name="enableBounds">The enable Bounds.</param>
-        /// <param name="exceptionLogger">The exception Logger.</param>
-        public JobQueue(Action<T> processJob, string displayName, int maxQueueLength, int maxQueueSize, bool enableBounds, Action<string> exceptionLogger)
-        {
-            this.processJob = processJob ?? throw new ArgumentNullException(nameof(processJob));
+    private readonly string _displayName;
 
-            if (string.IsNullOrWhiteSpace(displayName))
-            {
-                throw new ArgumentException(Resources.CannotBeNullOrEmpty, nameof(displayName));
-            }
+    /// <summary>
+    /// The queue of jobs.
+    /// </summary>
+    private readonly Queue<Job<T>> _jobsQueue;
 
-            if (maxQueueLength < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(maxQueueLength));
-            }
+    /// <summary>
+    /// Signaled when a job is added to the queue.  Used to wakeup the background thread.
+    /// </summary>
+    private readonly ManualResetEvent _jobAdded;
 
-            if (maxQueueSize < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(maxQueueSize));
-            }
+    /// <summary>
+    /// The maximum number of jobs the job queue may hold.
+    /// </summary>
+    private readonly int _maxNumberOfJobsInQueue;
 
-            this.maxNumberOfJobsInQueue = maxQueueLength;
-            this.maxBytesQueueCanHold = maxQueueSize;
-            this.enableBoundsOnQueue = enableBounds;
+    /// <summary>
+    /// The maximum total size of jobs the job queue may hold.
+    /// </summary>
+    private readonly int _maxBytesQueueCanHold;
 
-            // Initialize defaults.
-            this.jobsQueue = new Queue<Job<T>>();
-            this.jobAdded = new ManualResetEvent(false);
-            this.queueProcessing = new ManualResetEvent(true);
-            this.currentNumberOfBytesQueueIsHolding = 0;
-            this.isDisposed = false;
+    /// <summary>
+    /// Gives the approximate total size of objects in the queue.
+    /// </summary>
+    private int _currentNumberOfBytesQueueIsHolding;
 
-            // Save off the arguments.
-            this.displayName = displayName;
-            this.exceptionLogger = exceptionLogger;
+    /// <summary>
+    /// Tells whether the queue should be bounded on size and no of events.
+    /// </summary>
+    private bool _enableBoundsOnQueue;
 
-            // Setup the background thread to process the jobs.
-            this.backgroundJobProcessor = new Task(() => this.BackgroundJobProcessor(), TaskCreationOptions.LongRunning);
-            this.backgroundJobProcessor.Start();
-        }
+    /// <summary>
+    /// Used to pause and resume processing of the queue.  By default the manual reset event is
+    /// set so the queue can continue processing.
+    /// </summary>
+    private readonly ManualResetEvent _queueProcessing;
 
-        #endregion
+    /// <summary>
+    /// The background thread which is processing the jobs.  Used when disposing to wait
+    /// for the thread to complete.
+    /// </summary>
+    private readonly Task _backgroundJobProcessor;
 
-        #region Methods
+    /// <summary>
+    /// Keeps track of if we are disposed.
+    /// </summary>
+    private bool _isDisposed;
 
-        /// <summary>
-        /// Adds a job to the queue.
-        /// </summary>
-        /// <param name="job"> Job to add to the queue. </param>
-        /// <param name="jobSize"> The job Size. </param>
-        public void QueueJob(T job, int jobSize)
-        {
-            this.CheckDisposed();
+    /// <summary>
+    /// Logs to this action any exception when processing jobs.
+    /// </summary>
+    private readonly Action<string> _exceptionLogger;
 
-            Debug.Assert(jobSize >= 0, "Job size should never be negative");
+    /// <summary>
+    /// True when the job queue is paused. Don't use this for synchronization,
+    /// it is not super thread-safe. Just use it to see if the queue was started already.
+    /// </summary>
+    public bool IsPaused { get; private set; }
 
-            // Add the job and signal that a new job is available.
-            this.InternalQueueJob(new Job<T>(job, jobSize));
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JobQueue{T}"/> class.
+    /// </summary>
+    /// <param name="processJob">Action to handle the processing of the job.</param>
+    /// <param name="displayName">Name to used when displaying information about this queue.</param>
+    /// <param name="maxQueueLength">The max Queue Length.</param>
+    /// <param name="maxQueueSize">The max Queue Size.</param>
+    /// <param name="enableBounds">The enable Bounds.</param>
+    /// <param name="exceptionLogger">The exception Logger.</param>
+    public JobQueue(Action<T?> processJob, string displayName, int maxQueueLength, int maxQueueSize, bool enableBounds, Action<string> exceptionLogger)
+    {
+        _processJob = processJob ?? throw new ArgumentNullException(nameof(processJob));
 
-        /// <summary>
-        /// Pause the processing of queued jobs.
-        /// </summary>
-        public void Pause()
+        if (string.IsNullOrWhiteSpace(displayName))
         {
-            this.CheckDisposed();
-
-            // Do not allow any jobs to be processed.
-            this.queueProcessing.Reset();
+            throw new ArgumentException(Resources.CannotBeNullOrEmpty, nameof(displayName));
         }
 
-        /// <summary>
-        /// Resume the processing of queued jobs.
-        /// </summary>
-        public void Resume()
+        if (maxQueueLength < 1)
         {
-            this.CheckDisposed();
-
-            // Resume processing of jobs.
-            this.queueProcessing.Set();
+            throw new ArgumentOutOfRangeException(nameof(maxQueueLength));
         }
 
-        /// <summary>
-        /// Waits for all current jobs in the queue to be processed and then returns.
-        /// </summary>
-        public void Flush()
+        if (maxQueueSize < 1)
         {
-            this.CheckDisposed();
+            throw new ArgumentOutOfRangeException(nameof(maxQueueSize));
+        }
 
-            // Create the wait job.
-            using (var waitEvent = new ManualResetEvent(false))
-            {
-                var waitJob = Job<T>.CreateWaitJob(waitEvent);
+        _maxNumberOfJobsInQueue = maxQueueLength;
+        _maxBytesQueueCanHold = maxQueueSize;
+        _enableBoundsOnQueue = enableBounds;
 
-                // Queue the wait job and wait for it to be processed.
-                this.InternalQueueJob(waitJob);
+        // Initialize defaults.
+        _jobsQueue = new Queue<Job<T>>();
+        _jobAdded = new ManualResetEvent(false);
+        _queueProcessing = new ManualResetEvent(true);
+        _currentNumberOfBytesQueueIsHolding = 0;
+        _isDisposed = false;
 
-                waitEvent.WaitOne();
-            }
-        }
+        // Save off the arguments.
+        _displayName = displayName;
+        _exceptionLogger = exceptionLogger;
 
-        /// <summary>
-        /// Waits for all pending jobs to complete and shutdown the background thread.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
+        // Setup the background thread to process the jobs.
+        _backgroundJobProcessor = new Task(() => BackgroundJobProcessor(_displayName), TaskCreationOptions.LongRunning);
+        _backgroundJobProcessor.Start();
+    }
 
-            // If the queue is paused, then throw.
-            if (!this.queueProcessing.WaitOne(0))
-            {
-                throw new InvalidOperationException(
-                    string.Format(CultureInfo.CurrentUICulture, Resources.QueuePausedDisposeError, this.displayName));
-            }
+    /// <summary>
+    /// Adds a job to the queue.
+    /// </summary>
+    /// <param name="job"> Job to add to the queue. </param>
+    /// <param name="jobSize"> The job Size. </param>
+    public void QueueJob(T job, int jobSize)
+    {
+        CheckDisposed();
 
-            this.isDisposed = true;
+        TPDebug.Assert(jobSize >= 0, "Job size should never be negative");
 
-            // Disable bounds on the queue so that any waiting threads can proceed.
-            lock (this.jobsQueue)
-            {
-                this.enableBoundsOnQueue = false;
-                Monitor.PulseAll(this.jobsQueue);
-            }
+        // Add the job and signal that a new job is available.
+        InternalQueueJob(new Job<T>(job, jobSize));
+    }
 
-            // Flag the queue as being shutdown and wake up the background thread.
-            this.InternalQueueJob(Job<T>.ShutdownJob);
+    /// <summary>
+    /// Pause the processing of queued jobs.
+    /// </summary>
+    public void Pause()
+    {
+        CheckDisposed();
 
-            // Wait for the background thread to shutdown.
-            this.backgroundJobProcessor.Wait();
+        // Do not allow any jobs to be processed.
+        IsPaused = true;
+        _queueProcessing.Reset();
+    }
 
-            // Cleanup
-            this.jobAdded.Dispose();
-            this.queueProcessing.Dispose();
-        }
+    /// <summary>
+    /// Resume the processing of queued jobs.
+    /// </summary>
+    public void Resume()
+    {
+        CheckDisposed();
+
+        // Resume processing of jobs.
+        _queueProcessing.Set();
+        IsPaused = false;
+    }
+
+    /// <summary>
+    /// Waits for all current jobs in the queue to be processed and then returns.
+    /// </summary>
+    public void Flush()
+    {
+        CheckDisposed();
 
-        #endregion
+        // Create the wait job.
+        using var waitEvent = new ManualResetEvent(false);
+        var waitJob = Job<T>.CreateWaitJob(waitEvent);
 
-        #region Private Methods
+        // Queue the wait job and wait for it to be processed.
+        InternalQueueJob(waitJob);
 
-        /// <summary>
-        /// Block the queue call.
-        /// A separate protected virtual method had to be made so that it can be over-ridden when writing unit test to check
-        /// if bounds on the queue are applied correctly.
-        /// </summary>
-        /// <returns>True if the queue is empty.</returns>
-        protected virtual bool WaitForQueueToGetEmpty()
+        waitEvent.WaitOne();
+    }
+
+    /// <summary>
+    /// Waits for all pending jobs to complete and shutdown the background thread.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed
+            || !disposing)
         {
-            EqtTrace.Verbose("blocking on over filled queue.");
-            return Monitor.Wait(this.jobsQueue);
+            return;
         }
 
-        /// <summary>
-        /// Queue the job and signal the background thread.
-        /// </summary>
-        /// <param name="job">Job to be queued.</param>
-        private void InternalQueueJob(Job<T> job)
+        // If the queue is paused, then throw.
+        if (!_queueProcessing.WaitOne(0))
         {
-            // Add the job and signal that a new job is available.
-            lock (this.jobsQueue)
-            {
-                // If the queue is getting over filled wait till the background processor releases the thread.
-                while (this.enableBoundsOnQueue
-                        &&
-                      ((this.jobsQueue.Count >= this.maxNumberOfJobsInQueue)
-                          ||
-                       (this.currentNumberOfBytesQueueIsHolding >= this.maxBytesQueueCanHold)))
-                {
-                    this.WaitForQueueToGetEmpty();
-                }
+            throw new InvalidOperationException(
+                string.Format(CultureInfo.CurrentCulture, Resources.QueuePausedDisposeError, _displayName));
+        }
 
-                this.jobsQueue.Enqueue(job);
-                this.currentNumberOfBytesQueueIsHolding += job.Size;
-                this.jobAdded.Set();
-            }
+        _isDisposed = true;
+
+        // Disable bounds on the queue so that any waiting threads can proceed.
+        lock (_jobsQueue)
+        {
+            _enableBoundsOnQueue = false;
+            Monitor.PulseAll(_jobsQueue);
         }
 
-        /// <summary>
-        /// Throws wen the queue has been disposed.
-        /// </summary>
-        private void CheckDisposed()
+        // Flag the queue as being shutdown and wake up the background thread.
+        InternalQueueJob(Job<T>.ShutdownJob);
+
+        // Wait for the background thread to shutdown.
+        _backgroundJobProcessor.Wait();
+
+        // Cleanup
+        _jobAdded.Dispose();
+        _queueProcessing.Dispose();
+    }
+
+    /// <summary>
+    /// Block the queue call.
+    /// A separate protected virtual method had to be made so that it can be over-ridden when writing unit test to check
+    /// if bounds on the queue are applied correctly.
+    /// </summary>
+    /// <returns>True if the queue is empty.</returns>
+    protected virtual bool WaitForQueueToGetEmpty()
+    {
+        EqtTrace.Verbose("blocking on over filled queue.");
+        return Monitor.Wait(_jobsQueue);
+    }
+
+    /// <summary>
+    /// Queue the job and signal the background thread.
+    /// </summary>
+    /// <param name="job">Job to be queued.</param>
+    private void InternalQueueJob(Job<T> job)
+    {
+        // Add the job and signal that a new job is available.
+        lock (_jobsQueue)
         {
-            if (this.isDisposed)
+            // If the queue is getting over filled wait till the background processor releases the thread.
+            while (_enableBoundsOnQueue
+                   &&
+                   ((_jobsQueue.Count >= _maxNumberOfJobsInQueue)
+                    ||
+                    (_currentNumberOfBytesQueueIsHolding >= _maxBytesQueueCanHold)))
             {
-                throw new ObjectDisposedException(
-                    string.Format(CultureInfo.CurrentUICulture, Resources.QueueAlreadyDisposed, this.displayName));
+                WaitForQueueToGetEmpty();
             }
+
+            _jobsQueue.Enqueue(job);
+            _currentNumberOfBytesQueueIsHolding += job.Size;
+            _jobAdded.Set();
         }
+    }
 
-        /// <summary>
-        /// Method which processes the jobs on the background thread.
-        /// </summary>
-        private void BackgroundJobProcessor()
+    /// <summary>
+    /// Throws wen the queue has been disposed.
+    /// </summary>
+    private void CheckDisposed()
+    {
+        if (_isDisposed)
         {
-            bool shutdown = false;
-
-            do
-            {
-                this.jobAdded.WaitOne();
-
-                // Pull all of the current jobs out of the queue.
-                List<Job<T>> jobs = new List<Job<T>>();
-                lock (this.jobsQueue)
-                {
-                    while (this.jobsQueue.Count != 0)
-                    {
-                        var job = this.jobsQueue.Dequeue();
-                        this.currentNumberOfBytesQueueIsHolding -= job.Size;
+            throw new ObjectDisposedException(
+                string.Format(CultureInfo.CurrentCulture, Resources.QueueAlreadyDisposed, _displayName));
+        }
+    }
 
-                        // If this is a shutdown job, signal shutdown and stop adding jobs.
-                        if (job.Shutdown)
-                        {
-                            shutdown = true;
-                            break;
-                        }
+    /// <summary>
+    /// Method which processes the jobs on the background thread.
+    /// </summary>
+    private void BackgroundJobProcessor(string threadName)
+    {
+#if DEBUG && (NETFRAMEWORK || NET || NETSTANDARD2_0_OR_GREATER)
+        Thread.CurrentThread.Name = threadName;
+#endif
+        bool shutdown = false;
 
-                        jobs.Add(job);
-                    }
+        do
+        {
+            _jobAdded.WaitOne();
 
-                    // Reset the manual reset event so we get notified of new jobs that are added.
-                    this.jobAdded.Reset();
+            // Pull all of the current jobs out of the queue.
+            List<Job<T>> jobs = new();
+            lock (_jobsQueue)
+            {
+                while (_jobsQueue.Count != 0)
+                {
+                    var job = _jobsQueue.Dequeue();
+                    _currentNumberOfBytesQueueIsHolding -= job.Size;
 
-                    // Releases a thread waiting on the queue to get empty, to continue with the enqueuing process.
-                    if (this.enableBoundsOnQueue)
+                    // If this is a shutdown job, signal shutdown and stop adding jobs.
+                    if (job.Shutdown)
                     {
-                        Monitor.PulseAll(this.jobsQueue);
+                        shutdown = true;
+                        break;
                     }
+
+                    jobs.Add(job);
                 }
 
-                // Process the jobs
-                foreach (var job in jobs)
-                {
-                    // Wait for the queue to be open (not paused) and process the job.
-                    this.queueProcessing.WaitOne();
+                // Reset the manual reset event so we get notified of new jobs that are added.
+                _jobAdded.Reset();
 
-                    // If this is a wait job, signal the manual reset event and continue.
-                    if (job.WaitManualResetEvent != null)
-                    {
-                        job.WaitManualResetEvent.Set();
-                    }
-                    else
-                    {
-                        this.SafeProcessJob(job.Payload);
-                    }
+                // Releases a thread waiting on the queue to get empty, to continue with the enqueuing process.
+                if (_enableBoundsOnQueue)
+                {
+                    Monitor.PulseAll(_jobsQueue);
                 }
             }
-            while (!shutdown);
-        }
 
-        /// <summary>
-        /// Executes the process job handler and logs any exceptions which occur.
-        /// </summary>
-        /// <param name="job">Job to be executed.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "unknown action could throw all kinds of exceptions.")]
-        private void SafeProcessJob(T job)
-        {
-            try
-            {
-                this.processJob(job);
-            }
-            catch (Exception e)
+            // Process the jobs
+            foreach (var job in jobs)
             {
-                this.exceptionLogger(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        Resources.ExceptionFromJobProcessor,
-                        this.displayName,
-                        e));
+                // Wait for the queue to be open (not paused) and process the job.
+                _queueProcessing.WaitOne();
+
+                // If this is a wait job, signal the manual reset event and continue.
+                if (job.WaitManualResetEvent != null)
+                {
+                    job.WaitManualResetEvent.Set();
+                }
+                else
+                {
+                    SafeProcessJob(job.Payload);
+                }
             }
         }
+        while (!shutdown);
+    }
 
-        #endregion
+    /// <summary>
+    /// Executes the process job handler and logs any exceptions which occur.
+    /// </summary>
+    /// <param name="job">Job to be executed.</param>
+    private void SafeProcessJob(T? job)
+    {
+        try
+        {
+            _processJob(job);
+        }
+        catch (Exception e)
+        {
+            _exceptionLogger(string.Format(CultureInfo.CurrentCulture, Resources.ExceptionFromJobProcessor, _displayName, e));
+        }
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/MulticastDelegateUtilities.cs b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/MulticastDelegateUtilities.cs
index 5d12e4ae24..27abe48387 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/MulticastDelegateUtilities.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/MulticastDelegateUtilities.cs
@@ -1,61 +1,102 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using System;
-    using System.Reflection;
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+/// <summary>
+/// Utility methods for MulticastDelegates.
+/// </summary>
+public static class MulticastDelegateUtilities
+{
+    /// <summary>
+    /// Invokes each of the subscribers of the event and handles exceptions which are thrown
+    /// ensuring that each handler is invoked even if one throws.
+    /// </summary>
+    /// <param name="delegates">Event handler to invoke.</param>
+    /// <param name="sender">Sender to use when raising the event.</param>
+    /// <param name="args">Arguments to provide.</param>
+    /// <param name="traceDisplayName">Name to use when tracing out errors.</param>
+    // Using [CallerMemberName] for the traceDisplayName is a possibility, but in few places we call through other
+    // methods until we reach here. And it would change the public API.
+    public static void SafeInvoke(this Delegate? delegates, object? sender, EventArgs args, string traceDisplayName)
+    {
+        SafeInvoke(delegates, sender, (object)args, traceDisplayName);
+    }
 
     /// <summary>
-    /// Utility methods for MulticastDelegates.
+    /// Invokes each of the subscribers of the event and handles exceptions which are thrown
+    /// ensuring that each handler is invoked even if one throws.
     /// </summary>
-    public static class MulticastDelegateUtilities
+    /// <param name="delegates">Event handler to invoke.</param>
+    /// <param name="sender">Sender to use when raising the event.</param>
+    /// <param name="args">Arguments to provide.</param>
+    /// <param name="traceDisplayName">Name to use when tracing out errors.</param>
+    public static void SafeInvoke(this Delegate? delegates, object? sender, object args, string traceDisplayName)
     {
-        /// <summary>
-        /// Invokes each of the subscribers of the event and handles exceptions which are thrown
-        /// ensuring that each handler is invoked even if one throws.
-        /// </summary>
-        /// <param name="delegates">Event handler to invoke.</param>
-        /// <param name="sender">Sender to use when raising the event.</param>
-        /// <param name="args">Arguments to provide.</param>
-        /// <param name="traceDisplayName">Name to use when tracing out errors.</param>
-        public static void SafeInvoke(this Delegate delegates, object sender, EventArgs args, string traceDisplayName)
+        ValidateArg.NotNull(args, nameof(args));
+        ValidateArg.NotNullOrWhiteSpace(traceDisplayName, nameof(traceDisplayName));
+
+        if (delegates == null)
         {
-            if (args == null)
-            {
-                throw new ArgumentNullException(Resources.CannotBeNullOrEmpty, "args");
-            }
+            EqtTrace.Verbose("MulticastDelegateUtilities.SafeInvoke: {0}: Invoking callbacks was skipped because there are no subscribers.", traceDisplayName);
+            return;
+        }
 
-            if (string.IsNullOrWhiteSpace(traceDisplayName))
+        var invocationList = delegates.GetInvocationList();
+        var i = 0;
+        foreach (Delegate handler in invocationList)
+        {
+            var stopwatch = Stopwatch.StartNew();
+
+            try
             {
-                throw new ArgumentException(Resources.CannotBeNullOrEmpty, traceDisplayName);
+                handler.DynamicInvoke(sender, args);
+                if (EqtTrace.IsVerboseEnabled)
+                {
+                    EqtTrace.Verbose("MulticastDelegateUtilities.SafeInvoke: {0}: Invoking callback {1}/{2} for {3}.{4}, took {5} ms.",
+                            traceDisplayName,
+                            ++i,
+                            invocationList.Length,
+                            handler.GetTargetName(),
+                            handler.GetMethodName(),
+                            stopwatch.ElapsedMilliseconds);
+                }
             }
-
-            if (delegates != null)
+            catch (TargetInvocationException exception)
             {
-                foreach (Delegate handler in delegates.GetInvocationList())
+                if (EqtTrace.IsErrorEnabled)
                 {
-                    try
-                    {
-                        handler.DynamicInvoke(sender, args);
-                    }
-                    catch (TargetInvocationException e)
-                    {
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error(
-                                "{0}: Exception occurred while calling handler of type {1} for {2}: {3}",
-                                traceDisplayName,
-                                handler.Target.GetType().FullName,
-                                args.GetType().Name,
-                                e);
-                        }
-                    }
+                    EqtTrace.Error(
+                        "MulticastDelegateUtilities.SafeInvoke: {0}: Invoking callback {1}/{2} for {3}.{4}, failed after {5} ms with: {6}.",
+                        ++i,
+                        invocationList.Length,
+                        handler.GetTargetName(),
+                        handler.GetMethodName(),
+                        traceDisplayName,
+                        stopwatch.ElapsedMilliseconds,
+                        exception);
                 }
             }
         }
     }
+
+    internal static string? GetMethodName(this Delegate @delegate)
+    {
+#if NETSTANDARD2_0
+        return @delegate.Method.Name;
+#else
+        return null;
+#endif
+    }
+
+    internal static string GetTargetName(this Delegate @delegate)
+    {
+        return @delegate.Target?.ToString() ?? "static";
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/TimeSpanParser.cs b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/TimeSpanParser.cs
index a85b6d8430..d89212b535 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Utilities/TimeSpanParser.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Utilities/TimeSpanParser.cs
@@ -4,80 +4,79 @@
 using System;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+public static class TimeSpanParser
 {
-    public static class TimeSpanParser
+    static readonly Regex Pattern = new(@"(?<value>^\d+(?:\.\d+)?)\s*(?<suffix>ms|mil|m|h|d|s?[a-z]*)$", RegexOptions.IgnoreCase);
+
+    public static TimeSpan Parse(string? time)
     {
-        static readonly Regex pattern = new Regex(@"(?<value>^\d+(?:\.\d+)?)\s*(?<suffix>ms|mil|m|h|d|s?[a-z]*)$", RegexOptions.IgnoreCase);
+        return TryParse(time, out var result) ? result : throw GetFormatException(time);
+    }
 
-        public static TimeSpan Parse(string time)
+    public static bool TryParse(string? time, out TimeSpan result)
+    {
+        if (string.IsNullOrWhiteSpace(time))
         {
-            return TryParse(time, out var result) ? result : throw GetFormatException(time);
+            result = TimeSpan.Zero;
+            return true;
         }
 
-        public static bool TryParse(string time, out TimeSpan result)
+        var match = Pattern.Match(time);
+        if (!match.Success)
         {
-            if (string.IsNullOrWhiteSpace(time))
-            {
-                result = TimeSpan.Zero;
-                return true;
-            }
-
-            var match = pattern.Match(time);
-            if (!match.Success)
-            {
-                result = TimeSpan.Zero;
-                return false;
-            }
-
-            var value = match.Groups["value"].Value;
-            if (!double.TryParse(value, out var number))
-            {
-                throw GetFormatException(value);
-            }
-
-            var suffix = match.Groups["suffix"].Value;
-            var c = StringComparison.OrdinalIgnoreCase;
+            result = TimeSpan.Zero;
+            return false;
+        }
 
-            // mil to distinguish milliseconds from minutes
-            // ""  when there is just the raw milliseconds value
-            if (suffix.StartsWith("ms", c) || suffix.StartsWith("mil", c) || suffix == string.Empty)
-            {
-                result = TimeSpan.FromMilliseconds(number);
-                return true;
-            }
+        var value = match.Groups["value"].Value;
+        if (!double.TryParse(value, out var number))
+        {
+            throw GetFormatException(value);
+        }
 
-            if (suffix.StartsWith("s", c))
-            {
-                result = TimeSpan.FromSeconds(number);
-                return true;
-            }
+        var suffix = match.Groups["suffix"].Value;
+        var c = StringComparison.OrdinalIgnoreCase;
 
-            if (suffix.StartsWith("m", c))
-            {
-                result = TimeSpan.FromMinutes(number);
-                return true;
-            }
+        // mil to distinguish milliseconds from minutes
+        // ""  when there is just the raw milliseconds value
+        if (suffix.StartsWith("ms", c) || suffix.StartsWith("mil", c) || suffix == string.Empty)
+        {
+            result = TimeSpan.FromMilliseconds(number);
+            return true;
+        }
 
-            if (suffix.StartsWith("h", c))
-            {
-                result = TimeSpan.FromHours(number);
-                return true;
-            }
+        if (suffix.StartsWith("s", c))
+        {
+            result = TimeSpan.FromSeconds(number);
+            return true;
+        }
 
-            if (suffix.StartsWith("d", c))
-            {
-                result = TimeSpan.FromDays(number);
-                return true;
-            }
+        if (suffix.StartsWith("m", c))
+        {
+            result = TimeSpan.FromMinutes(number);
+            return true;
+        }
 
-            result = TimeSpan.Zero;
-            return false;
+        if (suffix.StartsWith("h", c))
+        {
+            result = TimeSpan.FromHours(number);
+            return true;
         }
 
-        static FormatException GetFormatException(string value)
+        if (suffix.StartsWith("d", c))
         {
-            return new FormatException($"The value '{value}' is not a valid time string. Use a time string in this format 5400000 / 5400000ms / 5400s / 90m / 1.5h / 0.625d.");
+            result = TimeSpan.FromDays(number);
+            return true;
         }
+
+        result = TimeSpan.Zero;
+        return false;
+    }
+
+    static FormatException GetFormatException(string? value)
+    {
+        return new FormatException($"The value '{value}' is not a valid time string. Use a time string in this format 5400000 / 5400000ms / 5400s / 90m / 1.5h / 0.625d.");
     }
 }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/ValidateArg.cs b/src/Microsoft.TestPlatform.CoreUtilities/ValidateArg.cs
index 160fb478b1..7b3cd47e13 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/ValidateArg.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/ValidateArg.cs
@@ -1,258 +1,226 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#pragma warning disable SA1402 // FileMayOnlyContainASingleClass. This is a ported class from ObjectModel.
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Helper to validate parameters.
+/// </summary>
+public static class ValidateArg
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+    /// <summary>
+    /// Throws ArgumentNullException if the argument is null, otherwise passes it through.
+    /// </summary>
+    /// <typeparam name="T">
+    /// Type to validate.
+    /// </typeparam>
+    /// <param name="arg">
+    /// The argument to check.
+    /// </param>
+    /// <param name="parameterName">
+    /// The parameter name of the argument.
+    /// </param>
+    /// <returns>
+    /// Type of argument.
+    /// </returns>
+    [DebuggerStepThrough]
+    public static T NotNull<T>([NotNull] T? arg, string parameterName)
+    {
+        return arg ?? throw new ArgumentNullException(parameterName);
+    }
 
     /// <summary>
-    /// Helper to validate parameters.
+    /// Validate a string is not null or empty.
     /// </summary>
-    public static class ValidateArg
+    /// <param name="arg">
+    /// Input string.
+    /// </param>
+    /// <param name="parameterName">
+    /// Name of the parameter to validate.
+    /// </param>
+    /// <returns>
+    /// Validated string.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">
+    /// Thrown if the input string is null or empty.
+    /// </exception>
+    [DebuggerStepThrough]
+    public static string NotNullOrEmpty([NotNull] string? arg, string parameterName)
     {
-        /// <summary>
-        /// Throws ArgumentNullException if the argument is null, otherwise passes it through.
-        /// </summary>
-        /// <typeparam name="T">
-        /// Type to validate.
-        /// </typeparam>
-        /// <param name="arg">
-        /// The argument to check.
-        /// </param>
-        /// <param name="parameterName">
-        /// The parameter name of the argument.
-        /// </param>
-        /// <returns>
-        /// Type of argument.
-        /// </returns>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static T NotNull<T>([ValidatedNotNull]T arg, string parameterName)
-            where T : class
-        {
-            if (arg == null)
-            {
-                throw new ArgumentNullException(parameterName);
-            }
+        return arg.IsNullOrEmpty() ? throw new ArgumentNullException(parameterName) : arg;
+    }
 
-            return arg;
-        }
+    /// <summary>
+    /// Validate a string is not null, empty or consists only of white-space characters.
+    /// </summary>
+    /// <param name="arg">
+    /// Input string.
+    /// </param>
+    /// <param name="parameterName">
+    /// Name of the parameter to validate.
+    /// </param>
+    /// <returns>
+    /// Validated string.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">
+    /// Thrown if the input string is null, empty or consists only of white-space characters.
+    /// </exception>
+    [DebuggerStepThrough]
+    public static string NotNullOrWhiteSpace([NotNull] string? arg, string parameterName)
+    {
+        return arg.IsNullOrWhiteSpace() ? throw new ArgumentNullException(parameterName) : arg;
+    }
 
-        /// <summary>
-        /// Validate a string is not null or empty.
-        /// </summary>
-        /// <param name="arg">
-        /// Input string.
-        /// </param>
-        /// <param name="parameterName">
-        /// Name of the parameter to validate.
-        /// </param>
-        /// <returns>
-        /// Validated string.
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// Thrown if the input string is null or empty.
-        /// </exception>
-        [DebuggerStepThrough]
-        public static string NotNullOrEmpty([ValidatedNotNull]string arg, string parameterName)
+    /// <summary>
+    /// Throws ArgumentOutOfRangeException if the argument is less than zero.
+    /// </summary>
+    /// <param name="arg">The argument to check.</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNegative(int arg, string parameterName)
+    {
+        if (arg < 0)
         {
-            if (string.IsNullOrEmpty(arg))
-            {
-                throw new ArgumentNullException(parameterName);
-            }
-
-            return arg;
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsNegative);
+            throw new ArgumentOutOfRangeException(parameterName, arg, message);
         }
+    }
 
-        /// <summary>
-        /// Validate a string is not null, empty or consists only of white-space characters.
-        /// </summary>
-        /// <param name="arg">
-        /// Input string.
-        /// </param>
-        /// <param name="parameterName">
-        /// Name of the parameter to validate.
-        /// </param>
-        /// <returns>
-        /// Validated string.
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// Thrown if the input string is null, empty or consists only of white-space characters.
-        /// </exception>
-        [DebuggerStepThrough]
-        public static string NotNullOrWhiteSpace([ValidatedNotNull]string arg, string parameterName)
+    /// <summary>
+    /// Throws ArgumentOutOfRangeException if the argument is less than zero.
+    /// </summary>
+    /// <param name="arg">The argument to check.</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNegative(long arg, string parameterName)
+    {
+        if (arg < 0)
         {
-            if (string.IsNullOrWhiteSpace(arg))
-            {
-                throw new ArgumentNullException(parameterName);
-            }
-
-            return arg;
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsNegative);
+            throw new ArgumentOutOfRangeException(parameterName, arg, message);
         }
+    }
 
-        /// <summary>
-        /// Throws ArgumentOutOfRangeException if the argument is less than zero.
-        /// </summary>
-        /// <param name="arg">The argument to check.</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        [DebuggerStepThrough]
-        public static void NotNegative(int arg, string parameterName)
-        {
-            if (arg < 0)
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsNegative);
-                throw new ArgumentOutOfRangeException(parameterName, arg, message);
-            }
-        }
+    /// <summary>
+    /// Throws ArgumentNullException if the string is null, ArgumentException if the string is empty.
+    /// </summary>
+    /// <typeparam name="T">Type of parameter to validate.</typeparam>
+    /// <param name="arg">The argument to check.</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNullOrEmpty<T>([NotNull] IEnumerable<T>? arg, string parameterName)
+    {
+        NotNull(arg, parameterName);
 
-        /// <summary>
-        /// Throws ArgumentOutOfRangeException if the argument is less than zero.
-        /// </summary>
-        /// <param name="arg">The argument to check.</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static void NotNegative(long arg, string parameterName)
+        if (!arg!.Any())
         {
-            if (arg < 0)
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsNegative);
-                throw new ArgumentOutOfRangeException(parameterName, arg, message);
-            }
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsEmpty);
+            throw new ArgumentException(message, parameterName);
         }
+    }
 
-        /// <summary>
-        /// Throws ArgumentNullException if the string is null, ArgumentException if the string is empty.
-        /// </summary>
-        /// <typeparam name="T">Type of parameter to validate.</typeparam>
-        /// <param name="arg">The argument to check.</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        [DebuggerStepThrough]
-        public static void NotNullOrEmpty<T>([ValidatedNotNull]IEnumerable<T> arg, string parameterName)
-        {
-            NotNull(arg, parameterName);
-
-            if (!arg.Any())
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentIsEmpty);
-                throw new ArgumentException(message, parameterName);
-            }
-        }
+    /// <summary>
+    /// Throws ArgumentNullException if the argument is null, ArgumentException if the argument is not the correct type.
+    /// </summary>
+    /// <param name="arg">The argument to check.</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    /// <typeparam name="T">The type of the expected argument.</typeparam>
+    [DebuggerStepThrough]
+    public static void TypeOf<T>([NotNull] object? arg, string parameterName)
+        where T : class
+    {
+        NotNull(arg, parameterName);
 
-        /// <summary>
-        /// Throws ArgumentNullException if the argument is null, ArgumentException if the argument is not the correct type.
-        /// </summary>
-        /// <param name="arg">The argument to check.</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        /// <typeparam name="T">The type of the expected argument.</typeparam>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static void TypeOf<T>([ValidatedNotNull]object arg, string parameterName)
-            where T : class
+        if (arg is not T)
         {
-            NotNull(arg, parameterName);
-
-            if (!(arg is T))
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentNotTypeOf, typeof(T).FullName);
-                throw new ArgumentException(message, parameterName);
-            }
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentNotTypeOf, typeof(T).FullName);
+            throw new ArgumentException(message, parameterName);
         }
     }
+}
 
+/// <summary>
+/// Helper to validate parameter properties.
+/// </summary>
+public static class ValidateArgProperty
+{
     /// <summary>
-    /// Helper to validate parameter properties.
+    /// Throws ArgumentException if the argument is null.
     /// </summary>
-    public static class ValidateArgProperty
+    /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    /// <param name="propertyName">The property name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNull([NotNull] object? arg, string parameterName, string propertyName)
     {
-        /// <summary>
-        /// Throws ArgumentException if the argument is null.
-        /// </summary>
-        /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        /// <param name="propertyName">The property name of the argument.</param>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static void NotNull([ValidatedNotNull]object arg, string parameterName, string propertyName)
+        if (arg == null)
         {
-            if (arg == null)
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsNull, propertyName);
-                throw new ArgumentNullException(parameterName, message);
-            }
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsNull, propertyName);
+            throw new ArgumentNullException(parameterName, message);
         }
+    }
 
-        /// <summary>
-        /// Throws ArgumentException if the argument is less than zero.
-        /// </summary>
-        /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        /// <param name="propertyName">The property name of the argument.</param>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static void NotNegative(int arg, string parameterName, string propertyName)
+    /// <summary>
+    /// Throws ArgumentException if the argument is less than zero.
+    /// </summary>
+    /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    /// <param name="propertyName">The property name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNegative(int arg, string parameterName, string propertyName)
+    {
+        if (arg < 0)
         {
-            if (arg < 0)
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsNegative, propertyName);
-                throw new ArgumentException(message, parameterName);
-            }
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsNegative, propertyName);
+            throw new ArgumentException(message, parameterName);
         }
+    }
 
-        /// <summary>
-        /// Throws ArgumentException if the argument string is null or empty.
-        /// </summary>
-        /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        /// <param name="propertyName">The property name of the argument.</param>
-        [DebuggerStepThrough]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This is shared source. This method may not be called in the current assembly.")]
-        public static void NotNullOrEmpty([ValidatedNotNull]string arg, string parameterName, string propertyName)
-        {
-            NotNull(arg, parameterName, propertyName);
-
-            if (string.IsNullOrEmpty(arg))
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsEmpty, propertyName);
-                throw new ArgumentException(message, parameterName);
-            }
-        }
+    /// <summary>
+    /// Throws ArgumentException if the argument string is null or empty.
+    /// </summary>
+    /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    /// <param name="propertyName">The property name of the argument.</param>
+    [DebuggerStepThrough]
+    public static void NotNullOrEmpty([NotNull] string? arg, string parameterName, string propertyName)
+    {
+        NotNull(arg, parameterName, propertyName);
 
-        /// <summary>
-        /// Throws ArgumentException if the argument is null or is not the correct type.
-        /// </summary>
-        /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
-        /// <param name="parameterName">The parameter name of the argument.</param>
-        /// <param name="propertyName">The property name of the argument.</param>
-        /// <typeparam name="T">The type of the expected argument.</typeparam>
-        [DebuggerStepThrough]
-        public static void TypeOf<T>([ValidatedNotNull]object arg, string parameterName, string propertyName)
-            where T : class
+        if (string.IsNullOrEmpty(arg))
         {
-            NotNull(arg, parameterName, propertyName);
-
-            if (!(arg is T))
-            {
-                var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyNotTypeOf, propertyName, typeof(T).FullName);
-                throw new ArgumentException(message, parameterName);
-            }
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyIsEmpty, propertyName);
+            throw new ArgumentException(message, parameterName);
         }
     }
 
     /// <summary>
-    /// Secret attribute that tells the CA1062 validate arguments rule that this method validates the argument is not null.
+    /// Throws ArgumentException if the argument is null or is not the correct type.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Parameter)]
-    internal sealed class ValidatedNotNullAttribute : Attribute
+    /// <param name="arg">The argument to check (e.g. <c>Param1.PropertyA</c>).</param>
+    /// <param name="parameterName">The parameter name of the argument.</param>
+    /// <param name="propertyName">The property name of the argument.</param>
+    /// <typeparam name="T">The type of the expected argument.</typeparam>
+    [DebuggerStepThrough]
+    public static void TypeOf<T>([NotNull] object? arg, string parameterName, string propertyName)
+        where T : class
     {
+        NotNull(arg, parameterName, propertyName);
+
+        if (arg is not T)
+        {
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Error_ArgumentPropertyNotTypeOf, propertyName, typeof(T).FullName);
+            throw new ArgumentException(message, parameterName);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/FrameworkHandle.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/FrameworkHandle.cs
index ca8ba14780..1770fa4e2d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/FrameworkHandle.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/FrameworkHandle.cs
@@ -1,139 +1,131 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+
+/// <summary>
+/// Handle to the framework which is passed to the test executors.
+/// </summary>
+internal class FrameworkHandle : TestExecutionRecorder, IFrameworkHandle2, IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using Execution;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+    /// <summary>
+    /// Context in which the current run is executing.
+    /// </summary>
+    private readonly TestExecutionContext _testExecutionContext;
+
+    /// <summary>
+    /// DebugLauncher for launching additional adapter processes under debugger
+    /// </summary>
+    private readonly IInternalTestRunEventsHandler _testRunEventsHandler;
 
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+    /// <summary>
+    /// Specifies whether the handle is disposed or not
+    /// </summary>
+    private bool _isDisposed;
 
     /// <summary>
-    /// Handle to the framework which is passed to the test executors.
+    /// Initializes a new instance of the <see cref="FrameworkHandle"/> class.
     /// </summary>
-    internal class FrameworkHandle : TestExecutionRecorder, IFrameworkHandle2, IDisposable
+    /// <param name="testCaseEventsHandler"> The test case level events handler. </param>
+    /// <param name="testRunCache"> The test run cache. </param>
+    /// <param name="testExecutionContext"> The test execution context. </param>
+    /// <param name="testRunEventsHandler">TestRun Events Handler</param>
+    public FrameworkHandle(ITestCaseEventsHandler? testCaseEventsHandler, ITestRunCache testRunCache,
+        TestExecutionContext testExecutionContext, IInternalTestRunEventsHandler testRunEventsHandler)
+        : base(testCaseEventsHandler, testRunCache)
     {
-        /// <summary>
-        /// boolean that gives the value of EnableShutdownAfterTestRun.
-        /// Default value is set to false in the constructor.
-        /// </summary>
-        private bool enableShutdownAfterTestRun;
-
-        /// <summary>
-        /// Context in which the current run is executing.
-        /// </summary>
-        private TestExecutionContext testExecutionContext;
-
-        /// <summary>
-        /// DebugLauncher for launching additional adapter processes under debugger
-        /// </summary>
-        private ITestRunEventsHandler testRunEventsHandler;
-
-        /// <summary>
-        /// Specifies whether the handle is disposed or not
-        /// </summary>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FrameworkHandle"/> class.
-        /// </summary>
-        /// <param name="testCaseEventsHandler"> The test case level events handler. </param>
-        /// <param name="testRunCache"> The test run cache. </param>
-        /// <param name="testExecutionContext"> The test execution context. </param>
-        /// <param name="testRunEventsHandler">TestRun Events Handler</param>
-        public FrameworkHandle(ITestCaseEventsHandler testCaseEventsHandler, ITestRunCache testRunCache,
-            TestExecutionContext testExecutionContext, ITestRunEventsHandler testRunEventsHandler)
-            : base(testCaseEventsHandler, testRunCache)
-        {
-            this.testExecutionContext = testExecutionContext;
-            this.testRunEventsHandler = testRunEventsHandler;
-        }
+        _testExecutionContext = testExecutionContext;
+        _testRunEventsHandler = testRunEventsHandler;
+    }
 
 
-        /// <summary>
-        /// Give a hint to the execution framework to enable the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true
-        /// and should be used only when absolutely required as using it degrades the performance of the subsequent run.
-        /// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.
-        /// </summary>
-        public bool EnableShutdownAfterTestRun
+    /// <summary>
+    /// Give a hint to the execution framework to enable the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true
+    /// and should be used only when absolutely required as using it degrades the performance of the subsequent run.
+    /// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.
+    /// </summary>
+    public bool EnableShutdownAfterTestRun { get; set; }
+
+    /// <summary>
+    /// Launch the specified process with the debugger attached.
+    /// </summary>
+    /// <param name="filePath">File path to the exe to launch.</param>
+    /// <param name="workingDirectory">Working directory that process should use. If null, the current directory will be used.</param>
+    /// <param name="arguments">Command line arguments the process should be launched with.</param>
+    /// <param name="environmentVariables">Environment variables to be set in target process</param>
+    /// <returns>Process ID of the started process.</returns>
+    public int LaunchProcessWithDebuggerAttached(string filePath, string? workingDirectory, string? arguments, IDictionary<string, string?>? environmentVariables)
+    {
+        // If an adapter attempts to launch a process after the run is complete (=> this object is disposed)
+        // throw an error.
+        if (_isDisposed)
         {
-            get
-            {
-                return this.enableShutdownAfterTestRun;
-            }
-
-            set
-            {
-                this.enableShutdownAfterTestRun = value;
-            }
+            throw new ObjectDisposedException("IFrameworkHandle");
         }
 
-        /// <summary>
-        /// Launch the specified process with the debugger attached.
-        /// </summary>
-        /// <param name="filePath">File path to the exe to launch.</param>
-        /// <param name="workingDirectory">Working directory that process should use.</param>
-        /// <param name="arguments">Command line arguments the process should be launched with.</param>
-        /// <param name="environmentVariables">Environment variables to be set in target process</param>
-        /// <returns>Process ID of the started process.</returns>
-        public int LaunchProcessWithDebuggerAttached(string filePath, string workingDirectory, string arguments, IDictionary<string, string> environmentVariables)
+        // If it is not a debug run, then throw an error
+        if (!_testExecutionContext.IsDebug)
         {
-            // If an adapter attempts to launch a process after the run is complete (=> this object is disposed)
-            // throw an error. 
-            if (this.isDisposed)
-            {
-                throw new ObjectDisposedException("IFrameworkHandle");
-            }
-
-            // If it is not a debug run, then throw an error
-            if (!this.testExecutionContext.IsDebug)
-            {
-                throw new InvalidOperationException(CrossPlatEngineResources.LaunchDebugProcessNotAllowedForANonDebugRun);
-            }
-
-            var processInfo = new TestProcessStartInfo()
-            {
-                Arguments = arguments,
-                EnvironmentVariables = environmentVariables,
-                FileName = filePath,
-                WorkingDirectory = workingDirectory
-            };
-
-            return this.testRunEventsHandler.LaunchProcessWithDebuggerAttached(processInfo);
+            throw new InvalidOperationException(CrossPlatEngineResources.LaunchDebugProcessNotAllowedForANonDebugRun);
         }
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
+        var processInfo = new TestProcessStartInfo
         {
-            return ((ITestRunEventsHandler2)this.testRunEventsHandler).AttachDebuggerToProcess(pid);
-        }
+            Arguments = arguments,
+            EnvironmentVariables = environmentVariables,
+            FileName = filePath,
+            WorkingDirectory = workingDirectory ?? Environment.CurrentDirectory
+        };
+
+        return _testRunEventsHandler.LaunchProcessWithDebuggerAttached(processInfo);
+    }
 
-        public void Dispose()
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(int pid)
+    {
+#if NETSTANDARD || NET
+        var fmw = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
+#else
+        var fmw = Framework.DefaultFramework.ToString();
+#endif
+
+        var attachDebuggerInfo = new AttachDebuggerInfo
         {
-            this.Dispose(true);
+            ProcessId = pid,
+            TargetFramework = fmw,
+        };
+        return _testRunEventsHandler.AttachDebuggerToProcess(attachDebuggerInfo);
+    }
 
-            // Use SupressFinalize in case a subclass
-            // of this valueType implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        protected virtual void Dispose(bool disposing)
+    protected virtual void Dispose(bool disposing)
+    {
+        // If you need thread safety, use a lock around these
+        // operations, as well as in your methods that use the resource.
+        if (!_isDisposed)
         {
-            // If you need thread safety, use a lock around these
-            // operations, as well as in your methods that use the resource.
-            if (!this.isDisposed)
-            {
-                // Indicate that the instance has been disposed.
-                this.isDisposed = true;
-            }
+            // Indicate that the instance has been disposed.
+            _isDisposed = true;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/RunContext.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/RunContext.cs
index c2233ded9b..6ea55760fc 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/RunContext.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/RunContext.cs
@@ -1,44 +1,43 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+
+/// <summary>
+/// Provides user specified runSettings and framework provided context of the run.
+/// </summary>
+public class RunContext : DiscoveryContext, IRunContext
 {
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+    /// <summary>
+    /// Gets a value indicating whether the execution process should be kept alive after the run is finished.
+    /// </summary>
+    public bool KeepAlive { get; internal set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the discovery or execution is happening in-process or out-of-process.
+    /// </summary>
+    public bool InIsolation { get; internal set; }
+
+    /// <summary>
+    /// Gets a value indicating whether data collection is enabled.
+    /// </summary>
+    public bool IsDataCollectionEnabled { get; internal set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the test is being debugged.
+    /// </summary>
+    public bool IsBeingDebugged { get; internal set; }
+
+    /// <summary>
+    /// Gets the directory which should be used for storing result files/deployment files etc.
+    /// </summary>
+    public string? TestRunDirectory { get; internal set; }
 
     /// <summary>
-    /// Provides user specified runSettings and framework provided context of the run. 
+    /// Gets the directory for Solution.
     /// </summary>
-    public class RunContext : DiscoveryContext, IRunContext
-    {
-        /// <summary>
-        /// Gets a value indicating whether the execution process should be kept alive after the run is finished.
-        /// </summary>
-        public bool KeepAlive { get; internal set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the discovery or execution is happening in-process or out-of-process.
-        /// </summary>
-        public bool InIsolation { get; internal set; }
-
-        /// <summary>
-        /// Gets a value indicating whether data collection is enabled.
-        /// </summary>
-        public bool IsDataCollectionEnabled { get; internal set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the test is being debugged. 
-        /// </summary>
-        public bool IsBeingDebugged { get; internal set; }
-
-        /// <summary>
-        /// Gets the directory which should be used for storing result files/deployment files etc.
-        /// </summary>
-        public string TestRunDirectory { get; internal set; }
-
-        /// <summary>
-        /// Gets the directory for Solution.
-        /// </summary>
-        public string SolutionDirectory { get; internal set; }
-    }
+    public string? SolutionDirectory { get; internal set; }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/TestExecutionRecorder.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/TestExecutionRecorder.cs
index b347b020a5..6ae681e5d5 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/TestExecutionRecorder.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Adapter/TestExecutionRecorder.cs
@@ -1,154 +1,153 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+
+/// <summary>
+/// The test execution recorder used for recording test results and test messages.
+/// </summary>
+internal class TestExecutionRecorder : TestSessionMessageLogger, ITestExecutionRecorder
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+    private readonly List<AttachmentSet> _attachmentSets;
+    private readonly ITestRunCache _testRunCache;
+    private readonly ITestCaseEventsHandler? _testCaseEventsHandler;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+    /// <summary>
+    /// Contains TestCase Ids for test cases that are in progress
+    /// Start has been recorded but End has not yet been recorded.
+    /// </summary>
+    private readonly HashSet<Guid> _testCaseInProgressMap;
+
+    private readonly object _testCaseInProgressSyncObject = new();
 
     /// <summary>
-    /// The test execution recorder used for recording test results and test messages.
+    /// Initializes a new instance of the <see cref="TestExecutionRecorder"/> class.
     /// </summary>
-    internal class TestExecutionRecorder : TestSessionMessageLogger, ITestExecutionRecorder
+    /// <param name="testCaseEventsHandler"> The test Case Events Handler. </param>
+    /// <param name="testRunCache"> The test run cache.  </param>
+    public TestExecutionRecorder(ITestCaseEventsHandler? testCaseEventsHandler, ITestRunCache testRunCache)
     {
-        private List<AttachmentSet> attachmentSets;
-        private ITestRunCache testRunCache;
-        private ITestCaseEventsHandler testCaseEventsHandler;
-
-        /// <summary>
-        /// Contains TestCase Ids for test cases that are in progress
-        /// Start has been recorded but End has not yet been recorded.
-        /// </summary>
-        private HashSet<Guid> testCaseInProgressMap;
-
-        private object testCaseInProgressSyncObject = new object();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestExecutionRecorder"/> class.
-        /// </summary>
-        /// <param name="testCaseEventsHandler"> The test Case Events Handler. </param>
-        /// <param name="testRunCache"> The test run cache.  </param>
-        public TestExecutionRecorder(ITestCaseEventsHandler testCaseEventsHandler, ITestRunCache testRunCache)
-        {
-            this.testRunCache = testRunCache;
-            this.testCaseEventsHandler = testCaseEventsHandler;
-            this.attachmentSets = new List<AttachmentSet>();
-
-            // As a framework guideline, we should get events in this order:
-            // 1. Test Case Start.
-            // 2. Test Case End.
-            // 3. Test Case Result.
-            // If that is not that case.
-            // If Test Adapters don't send the events in the above order, Test Case Results are cached till the Test Case End event is received.
-            this.testCaseInProgressMap = new HashSet<Guid>();
-        }
+        _testRunCache = testRunCache;
+        _testCaseEventsHandler = testCaseEventsHandler;
+        _attachmentSets = new List<AttachmentSet>();
+
+        // As a framework guideline, we should get events in this order:
+        // 1. Test Case Start.
+        // 2. Test Case End.
+        // 3. Test Case Result.
+        // If that is not that case.
+        // If Test Adapters don't send the events in the above order, Test Case Results are cached till the Test Case End event is received.
+        _testCaseInProgressMap = new HashSet<Guid>();
+    }
 
-        /// <summary>
-        /// Gets the attachments received from adapters.
-        /// </summary>
-        internal Collection<AttachmentSet> Attachments
+    /// <summary>
+    /// Gets the attachments received from adapters.
+    /// </summary>
+    internal Collection<AttachmentSet> Attachments
+    {
+        get
         {
-            get
-            {
-                return new Collection<AttachmentSet>(this.attachmentSets);
-            }
+            return new Collection<AttachmentSet>(_attachmentSets);
         }
+    }
 
-        /// <summary>
-        /// Notify the framework about starting of the test case.
-        /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
-        /// </summary>
-        /// <param name="testCase">test case which will be started.</param>
-        public void RecordStart(TestCase testCase)
-        {
-            EqtTrace.Verbose("TestExecutionRecorder.RecordStart: Starting test: {0}.", testCase?.FullyQualifiedName);
-            this.testRunCache.OnTestStarted(testCase);
+    /// <summary>
+    /// Notify the framework about starting of the test case.
+    /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
+    /// </summary>
+    /// <param name="testCase">test case which will be started.</param>
+    public void RecordStart(TestCase testCase)
+    {
+        EqtTrace.Verbose("TestExecutionRecorder.RecordStart: Starting test: {0}.", testCase.FullyQualifiedName);
+        _testRunCache.OnTestStarted(testCase);
 
-            if (this.testCaseEventsHandler != null)
+        if (_testCaseEventsHandler != null)
+        {
+            lock (_testCaseInProgressSyncObject)
             {
-                lock (this.testCaseInProgressSyncObject)
+                // Do not send TestCaseStart for a test in progress
+                if (!_testCaseInProgressMap.Contains(testCase.Id))
                 {
-                    // Do not send TestCaseStart for a test in progress
-                    if (!this.testCaseInProgressMap.Contains(testCase.Id))
-                    {
-                        this.testCaseInProgressMap.Add(testCase.Id);
-                        this.testCaseEventsHandler.SendTestCaseStart(testCase);
-                    }
+                    _testCaseInProgressMap.Add(testCase.Id);
+                    _testCaseEventsHandler.SendTestCaseStart(testCase);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Notify the framework about the test result.
-        /// </summary>
-        /// <param name="testResult">Test Result to be sent to the framework.</param>
-        /// <exception cref="TestCanceledException">Exception thrown by the framework when an executor attempts to send
-        /// test result to the framework when the test(s) is canceled. </exception>
-        public void RecordResult(TestResult testResult)
+    /// <summary>
+    /// Notify the framework about the test result.
+    /// </summary>
+    /// <param name="testResult">Test Result to be sent to the framework.</param>
+    /// <exception cref="TestCanceledException">Exception thrown by the framework when an executor attempts to send
+    /// test result to the framework when the test(s) is canceled. </exception>
+    public void RecordResult(TestResult testResult)
+    {
+        EqtTrace.Verbose("TestExecutionRecorder.RecordResult: Received result for test: {0}.", testResult.TestCase.FullyQualifiedName);
+        if (_testCaseEventsHandler != null)
         {
-            EqtTrace.Verbose("TestExecutionRecorder.RecordResult: Received result for test: {0}.", testResult?.TestCase?.FullyQualifiedName);
-            if (this.testCaseEventsHandler != null)
-            {
-                // Send TestCaseEnd in case RecordEnd was not called.
-                this.SendTestCaseEnd(testResult.TestCase, testResult.Outcome);
-                this.testCaseEventsHandler.SendTestResult(testResult);
-            }
-
-            // Test Result should always be flushed, even if datacollecter attachment is missing
-            this.testRunCache.OnNewTestResult(testResult);
+            // Send TestCaseEnd in case RecordEnd was not called.
+            SendTestCaseEnd(testResult.TestCase, testResult.Outcome);
+            _testCaseEventsHandler.SendTestResult(testResult);
         }
 
-        /// <summary>
-        /// Notify the framework about completion of the test case.
-        /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored. 
-        /// </summary>
-        /// <param name="testCase">test case which has completed.</param>
-        /// <param name="outcome">outcome of the test case.</param>
-        public void RecordEnd(TestCase testCase, TestOutcome outcome)
-        {
-            EqtTrace.Verbose("TestExecutionRecorder.RecordEnd: test: {0} execution completed.", testCase?.FullyQualifiedName);
-            this.testRunCache.OnTestCompletion(testCase);
-            this.SendTestCaseEnd(testCase, outcome);
-        }
+        // Test Result should always be flushed, even if datacollecter attachment is missing
+        _testRunCache.OnNewTestResult(testResult);
+    }
+
+    /// <summary>
+    /// Notify the framework about completion of the test case.
+    /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
+    /// </summary>
+    /// <param name="testCase">test case which has completed.</param>
+    /// <param name="outcome">outcome of the test case.</param>
+    public void RecordEnd(TestCase testCase, TestOutcome outcome)
+    {
+        EqtTrace.Verbose("TestExecutionRecorder.RecordEnd: test: {0} execution completed.", testCase.FullyQualifiedName);
+        _testRunCache.OnTestCompletion(testCase);
+        SendTestCaseEnd(testCase, outcome);
+    }
 
-        /// <summary>
-        /// Send TestCaseEnd event for given testCase if not sent already
-        /// </summary>
-        /// <param name="testCase"></param>
-        /// <param name="outcome"></param>
-        private void SendTestCaseEnd(TestCase testCase, TestOutcome outcome)
+    /// <summary>
+    /// Send TestCaseEnd event for given testCase if not sent already
+    /// </summary>
+    /// <param name="testCase"></param>
+    /// <param name="outcome"></param>
+    private void SendTestCaseEnd(TestCase testCase, TestOutcome outcome)
+    {
+        if (_testCaseEventsHandler != null)
         {
-            if (this.testCaseEventsHandler != null)
+            lock (_testCaseInProgressSyncObject)
             {
-                lock (this.testCaseInProgressSyncObject)
+                // TestCaseEnd must always be preceded by TestCaseStart for a given test case id
+                if (_testCaseInProgressMap.Contains(testCase.Id))
                 {
-                    // TestCaseEnd must always be preceded by TestCaseStart for a given test case id
-                    if (this.testCaseInProgressMap.Contains(testCase.Id))
-                    {
-                        // Send test case end event to handler.
-                        this.testCaseEventsHandler.SendTestCaseEnd(testCase, outcome);
-
-                        // Remove it from map so that we send only one TestCaseEnd for every TestCaseStart.
-                        this.testCaseInProgressMap.Remove(testCase.Id);
-                    }
+                    // Send test case end event to handler.
+                    _testCaseEventsHandler.SendTestCaseEnd(testCase, outcome);
+
+                    // Remove it from map so that we send only one TestCaseEnd for every TestCaseStart.
+                    _testCaseInProgressMap.Remove(testCase.Id);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Notify the framework about run level attachments.
-        /// </summary>
-        /// <param name="attachments"> The attachment sets. </param>
-        public void RecordAttachments(IList<AttachmentSet> attachments)
-        {
-            this.attachmentSets.AddRange(attachments);
-        }
+    /// <summary>
+    /// Notify the framework about run level attachments.
+    /// </summary>
+    /// <param name="attachments"> The attachment sets. </param>
+    public void RecordAttachments(IList<AttachmentSet> attachments)
+    {
+        _attachmentSets.AddRange(attachments);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomain.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomain.cs
new file mode 100644
index 0000000000..744b346976
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomain.cs
@@ -0,0 +1,211 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Pipes;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+
+/// <summary>
+/// This class is a proxy implementation of IDataCollectorAttachmentProcessor.
+/// We cannot load extension directly inside the runner in design mode because we're locking files
+/// and in some scenario build or publish can fail.
+///
+/// DataCollectorAttachmentProcessorAppDomain creates DataCollectorAttachmentProcessorRemoteWrapper in a
+/// custom domain.
+///
+/// IDataCollectorAttachmentProcessor needs to communicate back some information like, report percentage state
+/// of the processing, send messages through the IMessageLogger etc...so we have a full duplex communication.
+///
+/// For this reason we use an anonymous pipe to "listen" to the events from the real implementation and we forward
+/// the information to the caller.
+/// </summary>
+internal class DataCollectorAttachmentProcessorAppDomain : IDataCollectorAttachmentProcessor, IDisposable
+{
+    private readonly string _pipeShutdownMessagePrefix = Guid.NewGuid().ToString();
+    private readonly DataCollectorAttachmentProcessorRemoteWrapper _wrapper;
+    private readonly InvokedDataCollector _invokedDataCollector;
+    private readonly AppDomain _appDomain;
+    private readonly IMessageLogger? _dataCollectorAttachmentsProcessorsLogger;
+    private readonly Task _pipeServerReadTask;
+    private readonly AnonymousPipeClientStream _pipeClientStream;
+
+    public bool LoadSucceded { get; private set; }
+    public string? AssemblyQualifiedName => _wrapper.AssemblyQualifiedName;
+    public string? FriendlyName => _wrapper.FriendlyName;
+    private IMessageLogger? _processAttachmentSetsLogger;
+    private IProgress<int>? _progressReporter;
+
+    public DataCollectorAttachmentProcessorAppDomain(InvokedDataCollector invokedDataCollector, IMessageLogger? dataCollectorAttachmentsProcessorsLogger)
+    {
+        _invokedDataCollector = invokedDataCollector ?? throw new ArgumentNullException(nameof(invokedDataCollector));
+        _appDomain = AppDomain.CreateDomain(invokedDataCollector.Uri.ToString());
+        _dataCollectorAttachmentsProcessorsLogger = dataCollectorAttachmentsProcessorsLogger;
+        _wrapper = (DataCollectorAttachmentProcessorRemoteWrapper)_appDomain.CreateInstanceFromAndUnwrap(
+            typeof(DataCollectorAttachmentProcessorRemoteWrapper).Assembly.Location,
+            typeof(DataCollectorAttachmentProcessorRemoteWrapper).FullName,
+            false,
+            BindingFlags.Default,
+            null,
+            [_pipeShutdownMessagePrefix],
+            null,
+            null);
+
+        _pipeClientStream = new AnonymousPipeClientStream(PipeDirection.In, _wrapper.GetClientHandleAsString());
+        _pipeServerReadTask = Task.Run(() => PipeReaderTask());
+
+        EqtTrace.Verbose($"DataCollectorAttachmentProcessorAppDomain.ctor: AppDomain '{_appDomain.FriendlyName}' created to host assembly '{invokedDataCollector.FilePath}'");
+
+        InitExtension();
+    }
+
+    private void InitExtension()
+    {
+        try
+        {
+            LoadSucceded = _wrapper.LoadExtension(_invokedDataCollector.FilePath, _invokedDataCollector.Uri);
+            EqtTrace.Verbose($"DataCollectorAttachmentProcessorAppDomain.ctor: Extension '{_invokedDataCollector.Uri}' loaded. LoadSucceded: {LoadSucceded} AssemblyQualifiedName: '{AssemblyQualifiedName}' HasAttachmentProcessor: '{HasAttachmentProcessor}' FriendlyName: '{FriendlyName}'");
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"DataCollectorAttachmentProcessorAppDomain.InitExtension: Exception during extension initialization\n{ex}");
+        }
+    }
+
+    private void PipeReaderTask()
+    {
+        try
+        {
+            using StreamReader sr = new(_pipeClientStream, Encoding.Default, false, 1024, true);
+            while (_pipeClientStream?.IsConnected == true)
+            {
+                try
+                {
+                    string messagePayload = sr.ReadLine().Replace("\0", Environment.NewLine);
+
+                    if (messagePayload.StartsWith(_pipeShutdownMessagePrefix))
+                    {
+                        EqtTrace.Info($"DataCollectorAttachmentProcessorAppDomain.PipeReaderTask: Shutdown message received, message: {messagePayload}");
+                        return;
+                    }
+
+                    string prefix = messagePayload.Substring(0, messagePayload.IndexOf('|'));
+                    string message = messagePayload.Substring(messagePayload.IndexOf('|') + 1);
+
+                    switch (prefix)
+                    {
+                        case AppDomainPipeMessagePrefix.EqtTraceError: EqtTrace.Error(message); break;
+                        case AppDomainPipeMessagePrefix.EqtTraceInfo: EqtTrace.Info(message); break;
+                        case AppDomainPipeMessagePrefix.LoadExtensionTestMessageLevelInformational:
+                        case AppDomainPipeMessagePrefix.LoadExtensionTestMessageLevelWarning:
+                        case AppDomainPipeMessagePrefix.LoadExtensionTestMessageLevelError:
+                            _dataCollectorAttachmentsProcessorsLogger?
+                                .SendMessage((TestMessageLevel)Enum.Parse(typeof(TestMessageLevel), prefix.Substring(prefix.LastIndexOf('.') + 1), false), message);
+                            break;
+                        case AppDomainPipeMessagePrefix.ProcessAttachmentTestMessageLevelInformational:
+                        case AppDomainPipeMessagePrefix.ProcessAttachmentTestMessageLevelWarning:
+                        case AppDomainPipeMessagePrefix.ProcessAttachmentTestMessageLevelError:
+                            _processAttachmentSetsLogger?
+                                .SendMessage((TestMessageLevel)Enum.Parse(typeof(TestMessageLevel), prefix.Substring(prefix.LastIndexOf('.') + 1), false), message);
+                            break;
+                        case AppDomainPipeMessagePrefix.Report:
+                            _progressReporter?.Report(int.Parse(message, CultureInfo.CurrentCulture));
+                            break;
+                        default:
+                            EqtTrace.Error($"DataCollectorAttachmentProcessorAppDomain:PipeReaderTask: Unknown message: {message}");
+                            break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    EqtTrace.Error($"DataCollectorAttachmentProcessorAppDomain.PipeReaderTask: Exception during the pipe reading, Pipe connected: {_pipeClientStream.IsConnected}\n{ex}");
+                }
+            }
+
+            EqtTrace.Info($"DataCollectorAttachmentProcessorAppDomain.PipeReaderTask: Exiting from the pipe read loop.");
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"DataCollectorAttachmentProcessorAppDomain.PipeReaderTask: Exception on stream reader for the pipe reading\n{ex}");
+        }
+    }
+
+    public bool HasAttachmentProcessor => _wrapper.HasAttachmentProcessor;
+
+    public bool SupportsIncrementalProcessing => _wrapper.SupportsIncrementalProcessing;
+
+    public IEnumerable<Uri>? GetExtensionUris() => _wrapper?.GetExtensionUris();
+
+    public async Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+    {
+        // We register the cancellation and we call cancel inside the AppDomain
+        cancellationToken.Register(() => _wrapper.CancelProcessAttachment());
+        _processAttachmentSetsLogger = logger;
+        _progressReporter = progressReporter;
+        var result = await Task.Run(() => _wrapper.ProcessAttachment(configurationElement.OuterXml, JsonDataSerializer.Instance.Serialize(attachments.ToArray()))).ConfigureAwait(false);
+        return JsonDataSerializer.Instance.Deserialize<AttachmentSet[]>(result)!;
+    }
+
+    public void Dispose()
+    {
+        _wrapper.Dispose();
+
+        string appDomainName = _appDomain.FriendlyName;
+        AppDomain.Unload(_appDomain);
+        EqtTrace.Verbose($"DataCollectorAttachmentProcessorAppDomain.Dispose: Unloaded AppDomain '{appDomainName}'");
+
+        if (_pipeServerReadTask?.Wait(TimeSpan.FromSeconds(30)) == false)
+        {
+            EqtTrace.Error($"DataCollectorAttachmentProcessorAppDomain.Dispose: PipeReaderTask timeout expired");
+        }
+
+        // We don't need to close the pipe handle because we're communicating with an in-process pipe and the same handle is closed by AppDomain.Unload(_appDomain);
+        // Disposing here will fail for invalid handle during the release but we call it to avoid the GC cleanup inside the finalizer thread
+        // where it fails the same.
+        //
+        // We could also suppress the finalizers
+        // GC.SuppressFinalize(_pipeClientStream);
+        // GC.SuppressFinalize(_pipeClientStream.SafePipeHandle);
+        // but doing so mean relying to an implementation detail,
+        // for instance if some changes are done and some other object finalizer will be added;
+        // this will run on .NET Framework and it's unexpected but we prefer to rely on the documented semantic:
+        // "if I call dispose no finalizers will be called for unmanaged resources hold by this object".
+        try
+        {
+            _pipeClientStream?.Dispose();
+        }
+        catch
+        { }
+    }
+}
+
+internal static class AppDomainPipeMessagePrefix
+{
+    public const string EqtTraceError = "EqtTrace.Error";
+    public const string EqtTraceInfo = "EqtTrace.Info";
+    public const string Report = "Report";
+    public const string LoadExtensionTestMessageLevelInformational = "LoadExtension.TestMessageLevel.Informational";
+    public const string LoadExtensionTestMessageLevelWarning = "LoadExtension.TestMessageLevel.Warning";
+    public const string LoadExtensionTestMessageLevelError = "LoadExtension.TestMessageLevel.Error";
+    public const string ProcessAttachmentTestMessageLevelInformational = "ProcessAttachment.TestMessageLevel.Informational";
+    public const string ProcessAttachmentTestMessageLevelWarning = "ProcessAttachment.TestMessageLevel.Warning";
+    public const string ProcessAttachmentTestMessageLevelError = "ProcessAttachment.TestMessageLevel.Error";
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorWrapper.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorWrapper.cs
new file mode 100644
index 0000000000..83fcc1e992
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentProcessorWrapper.cs
@@ -0,0 +1,189 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Pipes;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+
+/// <summary>
+/// This class is the "container" for the real IDataCollectorAttachmentProcessor implementation.
+/// It tries to load the extension and it receives calls from the DataCollectorAttachmentProcessorAppDomain that
+/// acts as a proxy for the main AppDomain(the runner one).
+/// </summary>
+internal sealed class DataCollectorAttachmentProcessorRemoteWrapper : MarshalByRefObject, IDisposable
+{
+    private readonly AnonymousPipeServerStream _pipeServerStream = new(PipeDirection.Out, HandleInheritability.None);
+    private readonly object _pipeClientLock = new();
+    private readonly string _pipeShutdownMessagePrefix;
+
+    private IDataCollectorAttachmentProcessor? _dataCollectorAttachmentProcessorInstance;
+
+    private CancellationTokenSource? _processAttachmentCts;
+
+    public string? AssemblyQualifiedName { get; private set; }
+
+    public string? FriendlyName { get; private set; }
+
+    public bool LoadSucceded { get; private set; }
+
+    public bool HasAttachmentProcessor { get; private set; }
+
+    public DataCollectorAttachmentProcessorRemoteWrapper(string pipeShutdownMessagePrefix)
+    {
+        _pipeShutdownMessagePrefix = pipeShutdownMessagePrefix ?? throw new ArgumentNullException(nameof(pipeShutdownMessagePrefix));
+    }
+
+    public string GetClientHandleAsString() => _pipeServerStream.GetClientHandleAsString();
+
+    public bool SupportsIncrementalProcessing => _dataCollectorAttachmentProcessorInstance?.SupportsIncrementalProcessing == true;
+
+    public Uri[]? GetExtensionUris() => _dataCollectorAttachmentProcessorInstance?.GetExtensionUris()?.ToArray();
+
+    public string ProcessAttachment(
+        string configurationElement,
+        string attachments)
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(configurationElement);
+        AttachmentSet[] attachmentSets = JsonDataSerializer.Instance.Deserialize<AttachmentSet[]>(attachments)!;
+        SynchronousProgress progress = new(Report);
+        _processAttachmentCts = new CancellationTokenSource();
+
+        ICollection<AttachmentSet> attachmentsResult =
+            Task.Run(async () => await _dataCollectorAttachmentProcessorInstance!.ProcessAttachmentSetsAsync(
+            doc.DocumentElement,
+            attachmentSets,
+            progress,
+            new MessageLogger(this, nameof(ProcessAttachment)),
+            _processAttachmentCts.Token))
+            // We cannot marshal Task so we need to block the thread until the end of the processing
+            .ConfigureAwait(false).GetAwaiter().GetResult();
+
+        return JsonDataSerializer.Instance.Serialize(attachmentsResult.ToArray());
+    }
+
+    public void CancelProcessAttachment() => _processAttachmentCts?.Cancel();
+
+    public bool LoadExtension(string filePath, Uri dataCollectorUri)
+    {
+        var dataCollectorExtensionManager = DataCollectorExtensionManager.Create(filePath, true, new MessageLogger(this, nameof(LoadExtension)));
+        var dataCollectorExtension = dataCollectorExtensionManager.TryGetTestExtension(dataCollectorUri);
+        if (dataCollectorExtension is null || dataCollectorExtension.Metadata.HasAttachmentProcessor == false)
+        {
+            TraceInfo($"DataCollectorAttachmentsProcessorsFactory: DataCollectorExtension not found for uri '{dataCollectorUri}'");
+            return false;
+        }
+
+        TPDebug.Assert(dataCollectorExtension.TestPluginInfo is not null, "dataCollectorExtension.TestPluginInfo is null");
+        Type attachmentProcessorType = ((DataCollectorConfig)dataCollectorExtension.TestPluginInfo).AttachmentsProcessorType!;
+        try
+        {
+            _dataCollectorAttachmentProcessorInstance = TestPluginManager.CreateTestExtension<IDataCollectorAttachmentProcessor>(attachmentProcessorType);
+            AssemblyQualifiedName = attachmentProcessorType.AssemblyQualifiedName;
+            FriendlyName = dataCollectorExtension.Metadata.FriendlyName;
+            LoadSucceded = true;
+            HasAttachmentProcessor = true;
+            TraceInfo($"DataCollectorAttachmentProcessorWrapper.LoadExtension: Creation of collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}' from file '{filePath}' succeded");
+            return true;
+        }
+        catch (Exception ex)
+        {
+            TraceError($"DataCollectorAttachmentProcessorWrapper.LoadExtension: Failed during the creation of data collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}'\n{ex}");
+            SendMessage(nameof(LoadExtension), TestMessageLevel.Error, $"DataCollectorAttachmentProcessorWrapper.LoadExtension: Failed during the creation of data collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}'\n{ex}");
+        }
+
+        return false;
+    }
+
+    private void TraceError(string message) => Trace(AppDomainPipeMessagePrefix.EqtTraceError, message);
+
+    private void TraceInfo(string message) => Trace(AppDomainPipeMessagePrefix.EqtTraceInfo, message);
+
+    private void Trace(string traceType, string message)
+    {
+        lock (_pipeClientLock)
+        {
+            WriteToPipe($"{traceType}|{message}");
+        }
+    }
+
+    private void Report(int value)
+    {
+        lock (_pipeClientLock)
+        {
+            WriteToPipe($"{AppDomainPipeMessagePrefix.Report}|{value}");
+        }
+    }
+
+    private void SendMessage(string origin, TestMessageLevel messageLevel, string message)
+    {
+        lock (_pipeClientLock)
+        {
+            WriteToPipe($"{origin}.TestMessageLevel.{messageLevel}|{message}");
+        }
+    }
+
+    private void WriteToPipe(string message)
+    {
+        using StreamWriter sw = new(_pipeServerStream, Encoding.Default, 1024, true);
+        sw.AutoFlush = true;
+        // We want to keep the protocol very simple and text message oriented.
+        // On the read side we do ReadLine() to simplify the parsing and
+        // for this reason we remove the \n to null terminator and we'll aggregate on client side.
+        sw.WriteLine(message.Replace(Environment.NewLine, "\0").Replace("\n", "\0"));
+        _pipeServerStream.Flush();
+        _pipeServerStream.WaitForPipeDrain();
+    }
+
+    class MessageLogger : IMessageLogger
+    {
+        private readonly string _name;
+        private readonly DataCollectorAttachmentProcessorRemoteWrapper _wrapper;
+
+        public MessageLogger(DataCollectorAttachmentProcessorRemoteWrapper wrapper, string name)
+        {
+            _wrapper = wrapper ?? throw new ArgumentNullException(nameof(wrapper));
+            _name = name ?? throw new ArgumentNullException(nameof(name));
+        }
+
+        public void SendMessage(TestMessageLevel testMessageLevel, string message)
+            => _wrapper.SendMessage(_name, testMessageLevel, message);
+    }
+
+    class SynchronousProgress : IProgress<int>
+    {
+        private readonly Action<int> _report;
+
+        public SynchronousProgress(Action<int> report) => _report = report ?? throw new ArgumentNullException(nameof(report));
+
+        public void Report(int value) => _report(value);
+    }
+
+    public void Dispose()
+    {
+        _processAttachmentCts?.Dispose();
+        // Send shutdown message to gracefully close the client.
+        WriteToPipe($"{_pipeShutdownMessagePrefix}_{AppDomain.CurrentDomain.FriendlyName}");
+        _pipeServerStream.Dispose();
+        (_dataCollectorAttachmentProcessorInstance as IDisposable)?.Dispose();
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentsProcessorsFactory.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentsProcessorsFactory.cs
new file mode 100644
index 0000000000..335b055609
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/DataCollectorAttachmentsProcessorsFactory.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+
+internal class DataCollectorAttachmentsProcessorsFactory : IDataCollectorAttachmentsProcessorsFactory
+{
+    private const string CoverageFriendlyName = "Code Coverage";
+    private static readonly ConcurrentDictionary<string, DataCollectorExtensionManager> DataCollectorExtensionManagerCache = new();
+
+    public DataCollectorAttachmentProcessor[] Create(InvokedDataCollector[]? invokedDataCollectors, IMessageLogger? logger)
+    {
+        IDictionary<string, Tuple<string, IDataCollectorAttachmentProcessor>> datacollectorsAttachmentsProcessors = new Dictionary<string, Tuple<string, IDataCollectorAttachmentProcessor>>();
+
+        if (invokedDataCollectors?.Length > 0)
+        {
+            // We order files by filename descending so in case of the same collector from the same nuget but with different versions, we'll run the newer version.
+            // i.e. C:\Users\xxx\.nuget\packages\coverlet.collector
+            // /3.0.2
+            // /3.0.3
+            // /3.1.0
+            foreach (var invokedDataCollector in invokedDataCollectors.OrderByDescending(d => d.FilePath))
+            {
+                // We'll merge using only one AQN in case of more "same processors" in different assembly.
+                if (!invokedDataCollector.HasAttachmentProcessor)
+                {
+                    continue;
+                }
+
+                EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Analyzing data collector attachment processor Uri: {invokedDataCollector.Uri} AssemblyQualifiedName: {invokedDataCollector.AssemblyQualifiedName} FilePath: {invokedDataCollector.FilePath} HasAttachmentProcessor: {invokedDataCollector.HasAttachmentProcessor}");
+
+                var canUseAppDomains =
+#if NETFRAMEWORK
+                    true;
+#else
+                    false;
+#endif
+
+                // If we're in design mode we need to load the extension inside a different AppDomain to avoid to lock extension file containers.
+                if (canUseAppDomains && RunSettingsHelper.Instance.IsDesignMode)
+                {
+#if NETFRAMEWORK
+                    try
+                    {
+                        var wrapper = new DataCollectorAttachmentProcessorAppDomain(invokedDataCollector, logger);
+                        if (wrapper.LoadSucceded && wrapper.HasAttachmentProcessor)
+                        {
+                            if (!datacollectorsAttachmentsProcessors.ContainsKey(wrapper.AssemblyQualifiedName!))
+                            {
+                                datacollectorsAttachmentsProcessors.Add(wrapper.AssemblyQualifiedName!, new Tuple<string, IDataCollectorAttachmentProcessor>(wrapper.FriendlyName!, wrapper));
+                                EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Collector attachment processor '{wrapper.AssemblyQualifiedName}' from file '{invokedDataCollector.FilePath}' added to the 'run list'");
+                            }
+                            else
+                            {
+                                // If we already registered same IDataCollectorAttachmentProcessor we need to unload the unused AppDomain.
+                                EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Unloading unused AppDomain for '{wrapper.FriendlyName}'");
+                                wrapper.Dispose();
+                            }
+                        }
+                        else
+                        {
+                            EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: DataCollectorExtension not found for uri '{invokedDataCollector.Uri}'");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        EqtTrace.Error($"DataCollectorAttachmentsProcessorsFactory: Failed during the creation of data collector attachment processor '{invokedDataCollector.AssemblyQualifiedName}'\n{ex}");
+                        logger?.SendMessage(TestMessageLevel.Error, $"DataCollectorAttachmentsProcessorsFactory: Failed during the creation of data collector attachment processor '{invokedDataCollector.AssemblyQualifiedName}'\n{ex}");
+                    }
+#endif
+                }
+                else
+                {
+                    // We cache extension locally by file path
+                    var dataCollectorExtensionManager = DataCollectorExtensionManagerCache.GetOrAdd(invokedDataCollector.FilePath, DataCollectorExtensionManager.Create(invokedDataCollector.FilePath, true, TestSessionMessageLogger.Instance));
+                    var dataCollectorExtension = dataCollectorExtensionManager.TryGetTestExtension(invokedDataCollector.Uri);
+                    if ((dataCollectorExtension?.Metadata.HasAttachmentProcessor) != true)
+                    {
+                        EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: DataCollectorExtension not found for uri '{invokedDataCollector.Uri}'");
+                        continue;
+                    }
+
+                    TPDebug.Assert(dataCollectorExtension.TestPluginInfo is not null, "dataCollectorExtension.TestPluginInfo is null");
+                    Type attachmentProcessorType = ((DataCollectorConfig)dataCollectorExtension.TestPluginInfo!).AttachmentsProcessorType!;
+                    IDataCollectorAttachmentProcessor? dataCollectorAttachmentProcessorInstance = null;
+                    try
+                    {
+                        dataCollectorAttachmentProcessorInstance = TestPluginManager.CreateTestExtension<IDataCollectorAttachmentProcessor>(attachmentProcessorType);
+                        EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Creation of collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}' from file '{invokedDataCollector.FilePath}' succeded");
+                    }
+                    catch (Exception ex)
+                    {
+                        EqtTrace.Error($"DataCollectorAttachmentsProcessorsFactory: Failed during the creation of data collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}'\n{ex}");
+                        logger?.SendMessage(TestMessageLevel.Error, $"DataCollectorAttachmentsProcessorsFactory: Failed during the creation of data collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}'\n{ex}");
+                    }
+
+                    var attachmentQualifiedName = attachmentProcessorType.AssemblyQualifiedName;
+                    TPDebug.Assert(attachmentQualifiedName is not null, "attachmentQualifiedName is null");
+                    if (dataCollectorAttachmentProcessorInstance is not null && !datacollectorsAttachmentsProcessors.ContainsKey(attachmentQualifiedName))
+                    {
+                        datacollectorsAttachmentsProcessors.Add(attachmentQualifiedName, new Tuple<string, IDataCollectorAttachmentProcessor>(dataCollectorExtension.Metadata.FriendlyName, dataCollectorAttachmentProcessorInstance));
+                        EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Collector attachment processor '{attachmentProcessorType.AssemblyQualifiedName}' from file '{invokedDataCollector.FilePath}' added to the 'run list'");
+                    }
+                }
+            }
+        }
+
+        // We provide the implementation of CodeCoverageDataAttachmentsHandler through nuget package, but in case of absent registration or if for some reason
+        // the attachment processor from package fails we fallback to the default implementation.
+        if (!datacollectorsAttachmentsProcessors.ContainsKey(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName!))
+        {
+            datacollectorsAttachmentsProcessors.Add(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName!, new Tuple<string, IDataCollectorAttachmentProcessor>(CoverageFriendlyName, new CodeCoverageDataAttachmentsHandler()));
+            EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Collector attachment processor '{typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName}' for the data collector with friendly name '{CoverageFriendlyName}' added to the 'run list'");
+        }
+
+        var finalDatacollectorsAttachmentsProcessors = new List<DataCollectorAttachmentProcessor>();
+        foreach (var attachementProcessor in datacollectorsAttachmentsProcessors)
+        {
+            EqtTrace.Info($"DataCollectorAttachmentsProcessorsFactory: Valid data collector attachment processor found: '{attachementProcessor.Key}'");
+            finalDatacollectorsAttachmentsProcessors.Add(new DataCollectorAttachmentProcessor(attachementProcessor.Value.Item1, attachementProcessor.Value.Item2));
+        }
+
+        return finalDatacollectorsAttachmentsProcessors.ToArray();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs
index 6eff75838a..d1097ebe8e 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs
@@ -8,173 +8,240 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Xml;
+
 using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
 using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing
+/// <summary>
+/// Orchestrates test run localAttachments processing operations.
+/// </summary>
+internal class TestRunAttachmentsProcessingManager : ITestRunAttachmentsProcessingManager
 {
+    private static readonly string AttachmentsProcessingCompleted = "Completed";
+    private static readonly string AttachmentsProcessingCanceled = "Canceled";
+    private static readonly string AttachmentsProcessingFailed = "Failed";
+
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IDataCollectorAttachmentsProcessorsFactory _dataCollectorAttachmentsProcessorsFactory;
+
     /// <summary>
-    /// Orchestrates test run attachments processing operations.
+    /// Initializes a new instance of the <see cref="TestRunAttachmentsProcessingManager"/> class.
     /// </summary>
-    public class TestRunAttachmentsProcessingManager : ITestRunAttachmentsProcessingManager
+    public TestRunAttachmentsProcessingManager(ITestPlatformEventSource testPlatformEventSource, IDataCollectorAttachmentsProcessorsFactory dataCollectorAttachmentsProcessorsFactory)
     {
-        private static string AttachmentsProcessingCompleted = "Completed";
-        private static string AttachmentsProcessingCanceled = "Canceled";
-        private static string AttachmentsProcessingFailed = "Failed";
+        _testPlatformEventSource = testPlatformEventSource ?? throw new ArgumentNullException(nameof(testPlatformEventSource));
+        _dataCollectorAttachmentsProcessorsFactory = dataCollectorAttachmentsProcessorsFactory ?? throw new ArgumentNullException(nameof(dataCollectorAttachmentsProcessorsFactory));
+    }
 
-        private readonly ITestPlatformEventSource testPlatformEventSource;
-        private readonly IDataCollectorAttachmentProcessor[] dataCollectorAttachmentsProcessors;
+    /// <inheritdoc/>
+    public async Task ProcessTestRunAttachmentsAsync(string? runSettingsXml, IRequestData requestData, IEnumerable<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken)
+    {
+        await InternalProcessTestRunAttachmentsAsync(runSettingsXml, requestData, attachments, invokedDataCollector, eventHandler, cancellationToken).ConfigureAwait(false);
+    }
+    /// <inheritdoc/>
+    public Task<Collection<AttachmentSet>> ProcessTestRunAttachmentsAsync(string? runSettingsXml, IRequestData requestData, IEnumerable<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, CancellationToken cancellationToken)
+    {
+        return InternalProcessTestRunAttachmentsAsync(runSettingsXml, requestData, attachments, invokedDataCollector, null, cancellationToken);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunAttachmentsProcessingManager"/> class.
-        /// </summary>
-        public TestRunAttachmentsProcessingManager(ITestPlatformEventSource testPlatformEventSource, params IDataCollectorAttachmentProcessor[] dataCollectorAttachmentsProcessors)
-        {
-            this.testPlatformEventSource = testPlatformEventSource ?? throw new ArgumentNullException(nameof(testPlatformEventSource));
-            this.dataCollectorAttachmentsProcessors = dataCollectorAttachmentsProcessors ?? throw new ArgumentNullException(nameof(dataCollectorAttachmentsProcessors));
-        }
+    private async Task<Collection<AttachmentSet>> InternalProcessTestRunAttachmentsAsync(string? runSettingsXml, IRequestData requestData, IEnumerable<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, ITestRunAttachmentsProcessingEventsHandler? eventHandler, CancellationToken cancellationToken)
+    {
+        var stopwatch = Stopwatch.StartNew();
+        Collection<AttachmentSet> localAttachments = new(attachments.ToList());
 
-        /// <inheritdoc/>
-        public async Task ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken)
-        {
-            await InternalProcessTestRunAttachmentsAsync(requestData, new Collection<AttachmentSet>(attachments.ToList()), eventHandler, cancellationToken).ConfigureAwait(false);
-        }
-        /// <inheritdoc/>
-        public Task<Collection<AttachmentSet>> ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, CancellationToken cancellationToken)
+        try
         {
-            return InternalProcessTestRunAttachmentsAsync(requestData, new Collection<AttachmentSet>(attachments.ToList()), null, cancellationToken);
-        }
+            _testPlatformEventSource.TestRunAttachmentsProcessingStart(localAttachments.Count);
+            requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, localAttachments.Count);
 
-        private async Task<Collection<AttachmentSet>> InternalProcessTestRunAttachmentsAsync(IRequestData requestData, Collection<AttachmentSet> attachments, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken)
-        {
-            Stopwatch stopwatch = Stopwatch.StartNew();
+            cancellationToken.ThrowIfCancellationRequested();
 
-            try
+            var cancelAttachmentProcessingCompletionSource = new TaskCompletionSource<Collection<AttachmentSet>>();
+            using (cancellationToken.Register(() => cancelAttachmentProcessingCompletionSource.TrySetCanceled()))
             {
-                testPlatformEventSource.TestRunAttachmentsProcessingStart(attachments?.Count ?? 0);
-                requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, attachments?.Count ?? 0);
-                
-                cancellationToken.ThrowIfCancellationRequested();                
+                Task<Collection<AttachmentSet>> task = Task.Run(async () => await ProcessAttachmentsAsync(runSettingsXml, localAttachments, invokedDataCollector, eventHandler, cancellationToken));
 
-                var taskCompletionSource = new TaskCompletionSource<Collection<AttachmentSet>>();
-                using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
-                {
-                    Task<Collection<AttachmentSet>> task = Task.Run(async () => await ProcessAttachmentsAsync(new Collection<AttachmentSet>(attachments.ToList()), eventHandler, cancellationToken));
-
-                    var completedTask = await Task.WhenAny(task, taskCompletionSource.Task).ConfigureAwait(false);
+                var completedTask = await Task.WhenAny(task, cancelAttachmentProcessingCompletionSource.Task).ConfigureAwait(false);
 
-                    if (completedTask == task)
-                    {
-                        return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(false, null), await task, stopwatch, eventHandler);
-                    }
-                    else
-                    {
-                        eventHandler?.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled.");
-                        return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(true, null), attachments, stopwatch, eventHandler);
-                    }
+                if (completedTask == task)
+                {
+                    return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(false, null), await task, stopwatch, eventHandler);
                 }
-            }
-            catch (OperationCanceledException)
-            {
-                if (EqtTrace.IsWarningEnabled)
+                else
                 {
-                    EqtTrace.Warning("TestRunAttachmentsProcessingManager: operation was cancelled.");
+                    eventHandler?.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled.");
+                    return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(true, null), localAttachments, stopwatch, eventHandler);
                 }
-                return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(true, null), attachments, stopwatch, eventHandler);
             }
-            catch (Exception e)
+        }
+        catch (OperationCanceledException ex)
+        {
+            // If it's OperationCanceledException of our cancellationToken we log like in case of cancelAttachmentProcessingCompletionSource
+            // there's a possible exception race task vs cancelAttachmentProcessingCompletionSource.Task
+            if (ex.CancellationToken == cancellationToken)
             {
-                EqtTrace.Error("TestRunAttachmentsProcessingManager: Exception in ProcessTestRunAttachmentsAsync: " + e);
-
-                eventHandler?.HandleLogMessage(TestMessageLevel.Error, e.Message);
-                return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(false, e), attachments, stopwatch, eventHandler);
+                eventHandler?.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled.");
             }
+
+            EqtTrace.Warning("TestRunAttachmentsProcessingManager: Operation was cancelled.");
+            return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(true, null), localAttachments, stopwatch, eventHandler);
         }
+        catch (Exception e)
+        {
+            EqtTrace.Error("TestRunAttachmentsProcessingManager: Exception in ProcessTestRunAttachmentsAsync: " + e);
 
-        private async Task<Collection<AttachmentSet>> ProcessAttachmentsAsync(Collection<AttachmentSet> attachments, ITestRunAttachmentsProcessingEventsHandler eventsHandler, CancellationToken cancellationToken)
+            eventHandler?.HandleLogMessage(TestMessageLevel.Error, e.ToString());
+            return FinalizeOperation(requestData, new TestRunAttachmentsProcessingCompleteEventArgs(false, e), localAttachments, stopwatch, eventHandler);
+        }
+    }
+
+    private async Task<Collection<AttachmentSet>> ProcessAttachmentsAsync(string? runSettingsXml, Collection<AttachmentSet> attachments, IEnumerable<InvokedDataCollector>? invokedDataCollector, ITestRunAttachmentsProcessingEventsHandler? eventsHandler, CancellationToken cancellationToken)
+    {
+        if (attachments.Count == 0)
+        {
+            return attachments;
+        }
+
+        // Create a local copy of the collection to avoid modifying original one.
+        attachments = new(attachments.ToList());
+        var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(runSettingsXml);
+
+        var logger = CreateMessageLogger(eventsHandler);
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollector?.ToArray(), logger);
+        for (int i = 0; i < dataCollectorAttachmentsProcessors.Length; i++)
         {
-            if (attachments == null || !attachments.Any()) return attachments;
+            // We need to dispose the DataCollectorAttachmentProcessor to unload the AppDomain for net462
+            using DataCollectorAttachmentProcessor dataCollectorAttachmentsProcessor = dataCollectorAttachmentsProcessors[i];
 
-            var logger = CreateMessageLogger(eventsHandler);
+            int attachmentsHandlerIndex = i + 1;
 
-            for (int i = 0; i < dataCollectorAttachmentsProcessors.Length; i++)
+            if (!dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.SupportsIncrementalProcessing)
             {
-                var dataCollectorAttachmentsProcessor = dataCollectorAttachmentsProcessors[i];
-                int attachmentsHandlerIndex = i + 1;
+                EqtTrace.Error($"TestRunAttachmentsProcessingManager: Non incremental attachment processors are not supported, '{dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.GetType()}'");
+                logger.SendMessage(TestMessageLevel.Error, $"Non incremental attachment processors are not supported '{dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.GetType()}'");
+                continue;
+            }
 
-                ICollection<Uri> attachmentProcessorUris = dataCollectorAttachmentsProcessor.GetExtensionUris()?.ToList();
-                if (attachmentProcessorUris != null && attachmentProcessorUris.Any())
+            // We run processor code inside a try/catch because we want to continue with the others in case of failure.
+            Collection<AttachmentSet> attachmentsBackup = null!;
+            try
+            {
+                // We temporarily save the localAttachments to process because, in case of processor exception,
+                // we'll restore the attachmentSets to make those available to other processors.
+                // NB. localAttachments.ToList() is done on purpose we need a new ref list.
+                attachmentsBackup = new Collection<AttachmentSet>(attachments.ToList());
+
+                ICollection<Uri>? attachmentProcessorUris = dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.GetExtensionUris()?.ToList();
+                if (attachmentProcessorUris == null || attachmentProcessorUris.Count == 0)
                 {
-                    var attachmentsToBeProcessed = attachments.Where(dataCollectionAttachment => attachmentProcessorUris.Any(uri => uri.Equals(dataCollectionAttachment.Uri))).ToArray();
-                    if (attachmentsToBeProcessed.Any())
-                    {
-                        foreach (var attachment in attachmentsToBeProcessed)
-                        {
-                            attachments.Remove(attachment);
-                        }
+                    continue;
+                }
 
-                        IProgress<int> progressReporter = new Progress<int>((int progress) => 
-                            eventsHandler?.HandleTestRunAttachmentsProcessingProgress(
-                                new TestRunAttachmentsProcessingProgressEventArgs(attachmentsHandlerIndex, attachmentProcessorUris, progress, dataCollectorAttachmentsProcessors.Length)));
+                var attachmentsToBeProcessed = attachments.Where(dataCollectionAttachment => attachmentProcessorUris.Any(uri => uri.Equals(dataCollectionAttachment.Uri))).ToArray();
+                if (attachmentsToBeProcessed.Length == 0)
+                {
+                    continue;
+                }
 
-                        ICollection<AttachmentSet> processedAttachments = await dataCollectorAttachmentsProcessor.ProcessAttachmentSetsAsync(new Collection<AttachmentSet>(attachmentsToBeProcessed), progressReporter, logger, cancellationToken).ConfigureAwait(false);
+                foreach (var attachment in attachmentsToBeProcessed)
+                {
+                    attachments.Remove(attachment);
+                }
+
+                IProgress<int> progressReporter = new Progress<int>((int progress) =>
+                    eventsHandler?.HandleTestRunAttachmentsProcessingProgress(
+                        new TestRunAttachmentsProcessingProgressEventArgs(attachmentsHandlerIndex, attachmentProcessorUris, progress, dataCollectorAttachmentsProcessors.Length)));
 
-                        foreach (var attachment in processedAttachments)
-                        {
-                            attachments.Add(attachment);
-                        }
+                XmlElement? configuration = null;
+                var collectorConfiguration = dataCollectionRunSettings?.DataCollectorSettingsList.SingleOrDefault(c => c.FriendlyName == dataCollectorAttachmentsProcessor.FriendlyName);
+                if (collectorConfiguration != null && collectorConfiguration.IsEnabled)
+                {
+                    configuration = collectorConfiguration.Configuration;
+                }
+
+                EqtTrace.Info($"TestRunAttachmentsProcessingManager: Invocation of data collector attachment processor AssemblyQualifiedName: '{dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName}' FriendlyName: '{dataCollectorAttachmentsProcessor.FriendlyName}' with configuration '{(configuration == null ? "null" : configuration.OuterXml)}'");
+                ICollection<AttachmentSet> processedAttachments = await dataCollectorAttachmentsProcessor.DataCollectorAttachmentProcessorInstance.ProcessAttachmentSetsAsync(
+                    configuration!,
+                    new Collection<AttachmentSet>(attachmentsToBeProcessed),
+                    progressReporter,
+                    logger,
+                    cancellationToken).ConfigureAwait(false);
+
+                if (processedAttachments != null && processedAttachments.Count > 0)
+                {
+                    foreach (var attachment in processedAttachments)
+                    {
+                        attachments.Add(attachment);
                     }
                 }
             }
+            catch (Exception e)
+            {
+                EqtTrace.Error("TestRunAttachmentsProcessingManager: Exception in ProcessAttachmentsAsync: " + e);
 
-            return attachments;
+                // If it's OperationCanceledException of our cancellationToken we let the exception bubble up.
+                if (e is OperationCanceledException operationCanceled && operationCanceled.CancellationToken == cancellationToken)
+                {
+                    throw;
+                }
+
+                logger.SendMessage(TestMessageLevel.Error, e.ToString());
+
+                // Restore the attachment sets for the others attachment processors.
+                attachments = attachmentsBackup;
+            }
         }
 
-        private Collection<AttachmentSet> FinalizeOperation(IRequestData requestData, TestRunAttachmentsProcessingCompleteEventArgs completeArgs, Collection<AttachmentSet> attachments, Stopwatch stopwatch, ITestRunAttachmentsProcessingEventsHandler eventHandler)
-        {            
-            testPlatformEventSource.TestRunAttachmentsProcessingStop(attachments.Count);
-            requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, attachments.Count);
-            requestData.MetricsCollection.Add(TelemetryDataConstants.AttachmentsProcessingState, completeArgs.Error != null ? AttachmentsProcessingFailed : completeArgs.IsCanceled ? AttachmentsProcessingCanceled : AttachmentsProcessingCompleted);
+        return attachments;
+    }
 
-            stopwatch.Stop();
-            requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing, stopwatch.Elapsed.TotalSeconds);
+    private Collection<AttachmentSet> FinalizeOperation(IRequestData requestData, TestRunAttachmentsProcessingCompleteEventArgs completeArgs, Collection<AttachmentSet> attachments, Stopwatch stopwatch, ITestRunAttachmentsProcessingEventsHandler? eventHandler)
+    {
+        _testPlatformEventSource.TestRunAttachmentsProcessingStop(attachments.Count);
+        requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, attachments.Count);
+        requestData.MetricsCollection.Add(TelemetryDataConstants.AttachmentsProcessingState, completeArgs.Error != null ? AttachmentsProcessingFailed : completeArgs.IsCanceled ? AttachmentsProcessingCanceled : AttachmentsProcessingCompleted);
 
-            completeArgs.Metrics = requestData.MetricsCollection.Metrics;
-            eventHandler?.HandleTestRunAttachmentsProcessingComplete(completeArgs, attachments);
+        stopwatch.Stop();
+        requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing, stopwatch.Elapsed.TotalSeconds);
 
-            return attachments;
-        }
+        completeArgs.Metrics = requestData.MetricsCollection.Metrics;
+        eventHandler?.HandleTestRunAttachmentsProcessingComplete(completeArgs, attachments);
+
+        return attachments;
+    }
+
+    private static IMessageLogger CreateMessageLogger(ITestRunAttachmentsProcessingEventsHandler? eventsHandler)
+        => eventsHandler != null
+            ? new AttachmentsProcessingMessageLogger(eventsHandler)
+            : new NullMessageLogger();
+
+    private class AttachmentsProcessingMessageLogger : IMessageLogger
+    {
+        private readonly ITestRunAttachmentsProcessingEventsHandler _eventsHandler;
 
-        private IMessageLogger CreateMessageLogger(ITestRunAttachmentsProcessingEventsHandler eventsHandler)
+        public AttachmentsProcessingMessageLogger(ITestRunAttachmentsProcessingEventsHandler eventsHandler)
         {
-            return eventsHandler != null ? (IMessageLogger)new AttachmentsProcessingMessageLogger(eventsHandler) : new NullMessageLogger();
+            _eventsHandler = eventsHandler ?? throw new ArgumentNullException(nameof(eventsHandler));
         }
 
-        private class AttachmentsProcessingMessageLogger : IMessageLogger
+        public void SendMessage(TestMessageLevel testMessageLevel, string message)
         {
-            private readonly ITestRunAttachmentsProcessingEventsHandler eventsHandler;
-
-            public AttachmentsProcessingMessageLogger(ITestRunAttachmentsProcessingEventsHandler eventsHandler)
-            {
-                this.eventsHandler = eventsHandler ?? throw new ArgumentNullException(nameof(eventsHandler));
-            }
-
-            public void SendMessage(TestMessageLevel testMessageLevel, string message)
-            {
-                eventsHandler.HandleLogMessage(testMessageLevel, message);
-            }
+            _eventsHandler.HandleLogMessage(testMessageLevel, message);
         }
+    }
 
-        private class NullMessageLogger : IMessageLogger
+    private class NullMessageLogger : IMessageLogger
+    {
+        public void SendMessage(TestMessageLevel testMessageLevel, string message)
         {
-            public void SendMessage(TestMessageLevel testMessageLevel, string message)
-            {
-            }
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/DiscoveryCriteriaExtensions.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/DiscoveryCriteriaExtensions.cs
index 8691acfee0..ed91c5190d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/DiscoveryCriteriaExtensions.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/DiscoveryCriteriaExtensions.cs
@@ -1,41 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
-{
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using System.Collections.Generic;
+using System.Linq;
 
-    internal static class DiscoveryCriteriaExtensions
-    {
-        public static void UpdateDiscoveryCriteria(this DiscoveryCriteria discoveryCriteria, ITestRuntimeProvider testRuntimeProvider)
-        {
-            var actualTestSources = testRuntimeProvider.GetTestSources(discoveryCriteria.Sources);
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
 
-            // If the actual testSources, & input test sources do differ it means that the User(IDE) actually sent a package.
-            // We are limiting that only one package can be sent per session, so picking the first entry in sources
-            if (discoveryCriteria.Sources.Except(actualTestSources).Any())
-            {
-                discoveryCriteria.Package = discoveryCriteria.Sources.FirstOrDefault();
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
 
-                // Allow TestRuntimeProvider to update source map, this is required for remote scenarios.
-                // If we run for specific tests, then we expect the test case object to contain correct source path for remote scenario as well
-                UpdateTestSources(actualTestSources, discoveryCriteria.AdapterSourceMap);
-            }
-        }
+internal static class DiscoveryCriteriaExtensions
+{
+    public static void UpdateDiscoveryCriteria(this DiscoveryCriteria discoveryCriteria, ITestRuntimeProvider testRuntimeProvider)
+    {
+        var actualTestSources = testRuntimeProvider.GetTestSources(discoveryCriteria.Sources);
 
-        /// <summary>
-        /// Update the AdapterSourceMap
-        /// </summary>
-        /// <param name="sources">actual test sources</param>
-        /// <param name="adapterSourceMap">Adapter Source Map</param>
-        private static void UpdateTestSources(IEnumerable<string> sources, Dictionary<string, IEnumerable<string>> adapterSourceMap)
+        // If the actual testSources, & input test sources do differ it means that the User(IDE) actually sent a package.
+        // We are limiting that only one package can be sent per session, so picking the first entry in sources
+        if (discoveryCriteria.Sources.Except(actualTestSources).Any())
         {
-            adapterSourceMap.Clear();
-            adapterSourceMap.Add(Constants.UnspecifiedAdapterPath, sources);
+            discoveryCriteria.Package = discoveryCriteria.Sources.FirstOrDefault();
+
+            // Allow TestRuntimeProvider to update source map, this is required for remote scenarios.
+            // If we run for specific tests, then we expect the test case object to contain correct source path for remote scenario as well
+            UpdateTestSources(actualTestSources, discoveryCriteria.AdapterSourceMap);
         }
     }
+
+    /// <summary>
+    /// Update the AdapterSourceMap
+    /// </summary>
+    /// <param name="sources">actual test sources</param>
+    /// <param name="adapterSourceMap">Adapter Source Map</param>
+    private static void UpdateTestSources(IEnumerable<string> sources, Dictionary<string, IEnumerable<string>> adapterSourceMap)
+    {
+        adapterSourceMap.Clear();
+        adapterSourceMap.Add(ObjectModel.Constants.UnspecifiedAdapterPath, sources);
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs
index db1baf2d1a..093664b8c7 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs
@@ -1,111 +1,124 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+internal class InProcessProxyDiscoveryManager : IProxyDiscoveryManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    internal class InProcessProxyDiscoveryManager : IProxyDiscoveryManager
+    private readonly ITestHostManagerFactory _testHostManagerFactory;
+    private readonly IDiscoveryManager _discoveryManager;
+    private readonly ITestRuntimeProvider _testHostManager;
+
+    public bool IsInitialized { get; private set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InProcessProxyDiscoveryManager"/> class.
+    /// </summary>
+    /// <param name="testHostManager">
+    /// The test Host Manager.
+    /// </param>
+    /// <param name="testHostManagerFactory">
+    /// Manager factory
+    /// </param>
+    public InProcessProxyDiscoveryManager(ITestRuntimeProvider testHostManager, ITestHostManagerFactory testHostManagerFactory)
     {
-        private ITestHostManagerFactory testHostManagerFactory;
-        private IDiscoveryManager discoveryManager;
-        private ITestRuntimeProvider testHostManager;
-
-        public bool IsInitialized { get; private set; } = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InProcessProxyDiscoveryManager"/> class.
-        /// </summary>
-        /// <param name="testHostManager">
-        /// The test Host Manager.
-        /// </param>
-        /// <param name="testHostManagerFactory">
-        /// Manager factory
-        /// </param>
-        public InProcessProxyDiscoveryManager(ITestRuntimeProvider testHostManager, ITestHostManagerFactory testHostManagerFactory)
-        {
-            this.testHostManager = testHostManager;
-            this.testHostManagerFactory = testHostManagerFactory;
-            this.discoveryManager = this.testHostManagerFactory.GetDiscoveryManager();
-        }
+        _testHostManager = testHostManager;
+        _testHostManagerFactory = testHostManagerFactory;
+        _discoveryManager = _testHostManagerFactory.GetDiscoveryManager();
+    }
 
-        /// <summary>
-        /// Initializes test discovery.
-        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
-        /// </summary>
-        public void Initialize(bool skipDefaultAdapters)
-        {
-        }
+    /// <summary>
+    /// Initializes test discovery.
+    /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
+    /// </summary>
+    public void Initialize(bool skipDefaultAdapters)
+    {
+    }
 
-        /// <summary>
-        /// Discovers tests
-        /// </summary>
-        /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
-        /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
-        public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    /// <summary>
+    /// Discovers tests
+    /// </summary>
+    /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        Task.Run(() =>
         {
-            Task.Run(() =>
+            try
             {
-                try
-                {
-                    // Initialize extension before discovery
-                    this.InitializeExtensions(discoveryCriteria.Sources);
-                    discoveryCriteria.UpdateDiscoveryCriteria(testHostManager);
-
-                    this.discoveryManager.DiscoverTests(discoveryCriteria, eventHandler);
-                }
-                catch (Exception exception)
-                {
-                    EqtTrace.Error("InProcessProxyDiscoveryManager.DiscoverTests: Failed to discover tests: {0}", exception);
-
-                    // Send a discovery complete to caller.
-                    eventHandler.HandleLogMessage(TestMessageLevel.Error, exception.ToString());
-
-                    var discoveryCompeleteEventsArg = new DiscoveryCompleteEventArgs(-1, true);
-
-                    eventHandler.HandleDiscoveryComplete(discoveryCompeleteEventsArg, Enumerable.Empty<TestCase>());
-                }
-            });
-        }
+                // Initialize extension before discovery
+                InitializeExtensions(discoveryCriteria.Sources);
+                discoveryCriteria.UpdateDiscoveryCriteria(_testHostManager);
 
-        /// <summary>
-        /// Closes the current test operation.
-        /// This function is of no use in this context as we are not creating any testhost
-        /// </summary>
-        public void Close()
-        {
-        }
+                _discoveryManager.DiscoverTests(discoveryCriteria, eventHandler);
+            }
+            catch (Exception exception)
+            {
+                EqtTrace.Error("InProcessProxyDiscoveryManager.DiscoverTests: Failed to discover tests: {0}", exception);
 
-        /// <summary>
-        /// Aborts the test operation.
-        /// </summary>
-        public void Abort()
-        {
-            Task.Run(() => this.testHostManagerFactory.GetDiscoveryManager().Abort());
-        }
+                // Send a discovery complete to caller.
+                eventHandler.HandleLogMessage(TestMessageLevel.Error, exception.ToString());
 
-        private void InitializeExtensions(IEnumerable<string> sources)
-        {
-            var extensionsFromSource = this.testHostManager.GetTestPlatformExtensions(sources, Enumerable.Empty<string>());
-            if (extensionsFromSource.Any())
-            {
-                TestPluginCache.Instance.UpdateExtensions(extensionsFromSource, false);
+                var discoveryCompeleteEventsArg = new DiscoveryCompleteEventArgs(-1, true);
+
+                eventHandler.HandleDiscoveryComplete(discoveryCompeleteEventsArg, []);
             }
+        });
+    }
+
+    /// <summary>
+    /// Closes the current test operation.
+    /// This function is of no use in this context as we are not creating any testhost
+    /// </summary>
+    public void Close()
+    {
+    }
+
+    /// <summary>
+    /// Aborts the test operation.
+    /// </summary>
+    public void Abort()
+    {
+        Task.Run(() => _testHostManagerFactory.GetDiscoveryManager().Abort());
+    }
 
-            // We don't need to pass list of extension as we are running inside vstest.console and
-            // it will use TestPluginCache of vstest.console
-            discoveryManager.Initialize(Enumerable.Empty<string>(), null);
+    /// <inheritdoc/>
+    public void Abort(ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        Task.Run(() => _testHostManagerFactory.GetDiscoveryManager().Abort(eventHandler));
+    }
+
+    private void InitializeExtensions(IEnumerable<string> sources)
+    {
+        var extensionsFromSource = _testHostManager.GetTestPlatformExtensions(sources, []);
+        if (extensionsFromSource.Any())
+        {
+            TestPluginCache.Instance.UpdateExtensions(extensionsFromSource, false);
         }
+
+        // We don't need to pass list of extension as we are running inside vstest.console and
+        // it will use TestPluginCache of vstest.console
+        _discoveryManager.Initialize([], null);
+    }
+
+    public void InitializeDiscovery(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler, bool skipDefaultAdapters)
+    {
+        // Leaving this empty as it is not really relevant to the in-process proxy managers since
+        // there's no external testhost to be started. The idea of pre-initializing the test run
+        // makes sense only for out-of-process proxies like ProxyExecutionManager or
+        // ProxyDiscoveryManager.
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs
index 5371a5f53b..9ac60d0d1f 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs
@@ -1,150 +1,156 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+internal class InProcessProxyExecutionManager : IProxyExecutionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-
-    internal class InProcessProxyExecutionManager : IProxyExecutionManager
+    private readonly ITestHostManagerFactory _testHostManagerFactory;
+    private readonly IExecutionManager _executionManager;
+    private readonly ITestRuntimeProvider _testHostManager;
+
+    public bool IsInitialized { get; private set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InProcessProxyExecutionManager"/> class.
+    /// </summary>
+    /// <param name="testHostManager">
+    /// The test Host Manager.
+    /// </param>
+    /// <param name="testHostManagerFactory">
+    /// Manager factory
+    /// </param>
+    public InProcessProxyExecutionManager(ITestRuntimeProvider testHostManager, ITestHostManagerFactory testHostManagerFactory)
     {
-        private ITestHostManagerFactory testHostManagerFactory;
-        private IExecutionManager executionManager;
-        private ITestRuntimeProvider testHostManager;
-
-        public bool IsInitialized { get; private set; } = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InProcessProxyexecutionManager"/> class.
-        /// </summary>
-        /// <param name="testHostManager">
-        /// The test Host Manager.
-        /// </param>
-        /// <param name="testHostManagerFactory">
-        /// Manager factory
-        /// </param>
-        public InProcessProxyExecutionManager(ITestRuntimeProvider testHostManager, ITestHostManagerFactory testHostManagerFactory)
-        {
-            this.testHostManager = testHostManager;
-            this.testHostManagerFactory = testHostManagerFactory;
-            this.executionManager = this.testHostManagerFactory.GetExecutionManager();
-        }
+        _testHostManager = testHostManager;
+        _testHostManagerFactory = testHostManagerFactory;
+        _executionManager = _testHostManagerFactory.GetExecutionManager();
+    }
 
-        /// <summary>
-        /// Initialize adapters.
-        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
-        /// </summary>
-        public void Initialize(bool skipDefaultAdapters)
-        {
-        }
+    /// <summary>
+    /// Initialize adapters.
+    /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
+    /// </summary>
+    public void Initialize(bool skipDefaultAdapters)
+    {
+    }
 
-        /// <inheritdoc/>
-        public int StartTestRun(TestRunCriteria testRunCriteria, ITestRunEventsHandler eventHandler)
+    /// <inheritdoc/>
+    public int StartTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        try
         {
-            try
+            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testRunCriteria.TestRunSettings);
+            var testPackages = new List<string>(testRunCriteria.HasSpecificSources ? testRunCriteria.Sources :
+                // If the test execution is with a test filter, group them by sources
+                testRunCriteria.Tests!.GroupBy(tc => tc.Source).Select(g => g.Key));
+
+            // This code should be in sync with ProxyExecutionManager.StartTestRun executionContext
+            var executionContext = new TestExecutionContext(
+                testRunCriteria.FrequencyOfRunStatsChangeEvent,
+                testRunCriteria.RunStatsChangeEventTimeout,
+                inIsolation: runConfiguration.InIsolation,
+                keepAlive: testRunCriteria.KeepAlive,
+                isDataCollectionEnabled: false,
+                areTestCaseLevelEventsRequired: false,
+                hasTestRun: true,
+                isDebug: (testRunCriteria.TestHostLauncher != null && testRunCriteria.TestHostLauncher.IsDebug),
+                testCaseFilter: testRunCriteria.TestCaseFilter,
+                filterOptions: testRunCriteria.FilterOptions);
+
+            // Initialize extension before execution
+            InitializeExtensions(testPackages);
+
+            if (testRunCriteria.HasSpecificSources)
             {
-                var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testRunCriteria.TestRunSettings);
-                var testPackages = new List<string>(testRunCriteria.HasSpecificSources ? testRunCriteria.Sources :
-                                                    // If the test execution is with a test filter, group them by sources
-                                                    testRunCriteria.Tests.GroupBy(tc => tc.Source).Select(g => g.Key));
-
-                // This code should be in sync with ProxyExecutionManager.StartTestRun executionContext
-                var executionContext = new TestExecutionContext(
-                            testRunCriteria.FrequencyOfRunStatsChangeEvent,
-                            testRunCriteria.RunStatsChangeEventTimeout,
-                            inIsolation: runConfiguration.InIsolation,
-                            keepAlive: testRunCriteria.KeepAlive,
-                            isDataCollectionEnabled: false,
-                            areTestCaseLevelEventsRequired: false,
-                            hasTestRun: true,
-                            isDebug: (testRunCriteria.TestHostLauncher != null && testRunCriteria.TestHostLauncher.IsDebug),
-                            testCaseFilter: testRunCriteria.TestCaseFilter,
-                            filterOptions: testRunCriteria.FilterOptions);
-
-                // Initialize extension before execution
-                this.InitializeExtensions(testPackages);
-
-                if (testRunCriteria.HasSpecificSources)
-                {
-                    var runRequest = testRunCriteria.CreateTestRunCriteriaForSources(testHostManager, testRunCriteria.TestRunSettings, executionContext, testPackages);
-
-                    Task.Run(() => executionManager.StartTestRun(runRequest.AdapterSourceMap, runRequest.Package,
-                        runRequest.RunSettings, runRequest.TestExecutionContext, null, eventHandler));
-                }
-                else
-                {
-                    var runRequest = testRunCriteria.CreateTestRunCriteriaForTests(testHostManager, testRunCriteria.TestRunSettings, executionContext, testPackages);
-
-                    Task.Run(() => executionManager.StartTestRun(runRequest.Tests, runRequest.Package,
-                        runRequest.RunSettings, runRequest.TestExecutionContext, null, eventHandler));
-                }
+                var runRequest = testRunCriteria.CreateTestRunCriteriaForSources(_testHostManager, testRunCriteria.TestRunSettings, executionContext, testPackages);
+
+                Task.Run(() => _executionManager.StartTestRun(runRequest.AdapterSourceMap, runRequest.Package,
+                    runRequest.RunSettings, runRequest.TestExecutionContext, null, eventHandler));
             }
-            catch (Exception exception)
+            else
             {
-                EqtTrace.Error("InProcessProxyexecutionManager.StartTestRun: Failed to start test run: {0}", exception);
+                var runRequest = testRunCriteria.CreateTestRunCriteriaForTests(_testHostManager, testRunCriteria.TestRunSettings, executionContext, testPackages);
 
-                // Send exception message.
-                eventHandler.HandleLogMessage(TestMessageLevel.Error, exception.ToString());
-
-                // Send a run complete to caller.
-                var completeArgs = new TestRunCompleteEventArgs(null, false, true, exception, new Collection<AttachmentSet>(), TimeSpan.Zero);
-                eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
+                Task.Run(() => _executionManager.StartTestRun(runRequest.Tests, runRequest.Package,
+                    runRequest.RunSettings, runRequest.TestExecutionContext, null, eventHandler));
             }
-
-            return 0;
         }
-
-        /// <summary>
-        /// Aborts the test operation.
-        /// </summary>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        public void Abort(ITestRunEventsHandler eventHandler)
+        catch (Exception exception)
         {
-            Task.Run(() => this.testHostManagerFactory.GetExecutionManager().Abort(eventHandler));
-        }
+            EqtTrace.Error("InProcessProxyexecutionManager.StartTestRun: Failed to start test run: {0}", exception);
 
-        /// <summary>
-        /// Cancels the test run.
-        /// </summary>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        public void Cancel(ITestRunEventsHandler eventHandler)
-        {
-            Task.Run(() => this.testHostManagerFactory.GetExecutionManager().Cancel(eventHandler));
-        }
+            // Send exception message.
+            eventHandler.HandleLogMessage(TestMessageLevel.Error, exception.ToString());
 
-        /// <summary>
-        /// Closes the current test operation.
-        /// This function is of no use in this context as we are not creating any testhost
-        /// </summary>
-        public void Close()
-        {
+            // Send a run complete to caller.
+            var completeArgs = new TestRunCompleteEventArgs(null, false, true, exception, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.Zero);
+            eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
         }
 
+        return 0;
+    }
+
+    /// <summary>
+    /// Aborts the test operation.
+    /// </summary>
+    /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    public void Abort(IInternalTestRunEventsHandler eventHandler)
+    {
+        Task.Run(() => _testHostManagerFactory.GetExecutionManager().Abort(eventHandler));
+    }
 
-        private void InitializeExtensions(IEnumerable<string> sources)
-        {
-            var extensionsFromSource = this.testHostManager.GetTestPlatformExtensions(sources, Enumerable.Empty<string>());
-            if (extensionsFromSource.Any())
-            {
-                TestPluginCache.Instance.UpdateExtensions(extensionsFromSource, false);
-            }
+    /// <summary>
+    /// Cancels the test run.
+    /// </summary>
+    /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    public void Cancel(IInternalTestRunEventsHandler eventHandler)
+    {
+        Task.Run(() => _testHostManagerFactory.GetExecutionManager().Cancel(eventHandler));
+    }
 
-            // We don't need to pass list of extension as we are running inside vstest.console and
-            // it will use TestPluginCache of vstest.console
-            executionManager.Initialize(Enumerable.Empty<string>(), null);
+    /// <summary>
+    /// Closes the current test operation.
+    /// This function is of no use in this context as we are not creating any testhost
+    /// </summary>
+    public void Close()
+    {
+    }
+
+    private void InitializeExtensions(IEnumerable<string> sources)
+    {
+        var extensionsFromSource = _testHostManager.GetTestPlatformExtensions(sources, []);
+        if (extensionsFromSource.Any())
+        {
+            TestPluginCache.Instance.UpdateExtensions(extensionsFromSource, false);
         }
+
+        // We don't need to pass list of extension as we are running inside vstest.console and
+        // it will use TestPluginCache of vstest.console
+        _executionManager.Initialize([], null);
+    }
+
+    public void InitializeTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        // Leaving this empty as it is not really relevant to the in-process proxy managers since
+        // there's no external testhost to be started. The idea of pre-initializing the test run
+        // makes sense only for out-of-process proxies like ProxyExecutionManager or
+        // ProxyDiscoveryManager.
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/LoggerNameValueConfigurationManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/LoggerNameValueConfigurationManager.cs
index 305fb5a5c8..2e39bd1c7a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/LoggerNameValueConfigurationManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/LoggerNameValueConfigurationManager.cs
@@ -1,78 +1,73 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System.Collections.Generic;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Utility class that loggers can use to read name/value configuration information from the XML element sent to them
+/// </summary>
+internal class LoggerNameValueConfigurationManager
 {
-    using System.Collections.Generic;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
     /// <summary>
-    /// Utility class that loggers can use to read name/value configuration information from the XML element sent to them
+    /// Initializes a new instance of the <see cref="LoggerNameValueConfigurationManager"/> class.
+    /// Loads the configuration name/value information from the provided XML element into a dictionary
     /// </summary>
-    internal class LoggerNameValueConfigurationManager
+    /// <param name="configurationElement">
+    /// XML element containing the configuration
+    /// </param>
+    public LoggerNameValueConfigurationManager(XmlElement? configurationElement)
     {
-        /// <summary>
-        /// The name/value pairs loaded from the configuration XML element
-        /// </summary>
-        private Dictionary<string, string> nameValuePairs = new Dictionary<string, string>();
+        Initialize(configurationElement);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoggerNameValueConfigurationManager"/> class.
-        /// Loads the configuration name/value information from the provided XML element into a dictionary
-        /// </summary>
-        /// <param name="configurationElement">
-        /// XML element containing the configuration
-        /// </param>
-        public LoggerNameValueConfigurationManager(XmlElement configurationElement)
+    public Dictionary<string, string?> NameValuePairs { get; } = new();
+
+    private void Initialize(XmlElement? configurationElement)
+    {
+        if (configurationElement == null)
         {
-            Initialize(configurationElement);
+            // There is no configuration
+            return;
         }
 
-        public Dictionary<string, string> NameValuePairs => this.nameValuePairs;
-
-        private void Initialize(XmlElement configurationElement)
+        // Iterate through top-level XML elements within the configuration element and store
+        // name/value information for elements that have name/value attributes.
+        foreach (XmlNode settingNode in configurationElement.ChildNodes)
         {
-            if (configurationElement == null)
+            // Skip all non-elements
+            if (settingNode is not XmlElement settingElement)
             {
-                // There is no configuration
-                return;
+                continue;
             }
 
-            // Iterate through top-level XML elements within the configuration element and store
-            // name/value information for elements that have name/value attributes.
-            foreach (XmlNode settingNode in configurationElement.ChildNodes)
-            {
-                // Skip all non-elements
-                var settingElement = settingNode as XmlElement;
-                if (settingElement == null)
-                {
-                    continue;
-                }
-
-                // Get the setting name
-                string settingName = settingElement.Name;
+            // Get the setting name
+            string settingName = settingElement.Name;
 
-                // Get the setting value
-                string settingValue = settingElement.InnerText;
+            // Get the setting value
+            string settingValue = settingElement.InnerText;
 
-                if (string.IsNullOrWhiteSpace(settingValue))
-                {
-                    EqtTrace.Warning("Skipping configuration setting '{0}' due to missing value", settingName);
-                    continue;
-                }
-
-                // Save the name/value pair in the dictionary. Note that duplicate settings are
-                // overwritten with the last occurrence's value.
-                if (this.nameValuePairs.ContainsKey(settingName))
-                {
-                    EqtTrace.Verbose(
-                        "Duplicate configuration setting found for '{0}'. Using the last setting.",
-                        settingName);
-                }
+            if (settingValue.IsNullOrWhiteSpace())
+            {
+                EqtTrace.Warning("Skipping configuration setting '{0}' due to missing value", settingName);
+                continue;
+            }
 
-                this.NameValuePairs[settingName] = settingValue;
+            // Save the name/value pair in the dictionary. Note that duplicate settings are
+            // overwritten with the last occurrence's value.
+            if (NameValuePairs.ContainsKey(settingName))
+            {
+                EqtTrace.Verbose(
+                    "Duplicate configuration setting found for '{0}'. Using the last setting.",
+                    settingName);
             }
+
+            NameValuePairs[settingName] = settingValue;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/DiscoveryDataAggregator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/DiscoveryDataAggregator.cs
new file mode 100644
index 0000000000..a6606083e8
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/DiscoveryDataAggregator.cs
@@ -0,0 +1,274 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+
+/// <summary>
+/// DiscoveryDataAggregator aggregates discovery data from multiple sources running in parallel or in series.
+/// </summary>
+internal sealed class DiscoveryDataAggregator
+{
+    private readonly object _dataUpdateSyncObject = new();
+    private readonly ConcurrentDictionary<string, object> _metricsAggregator = new();
+    private readonly ConcurrentDictionary<string, DiscoveryStatus> _sourcesWithDiscoveryStatus = new();
+
+    /// <summary>
+    /// Atomic boolean used to detect if message was already sent.
+    /// </summary>
+    private int _isMessageSent;
+
+    /// <summary>
+    /// Set to initialized if any of the request is aborted
+    /// </summary>
+    public bool IsAborted { get; private set; }
+
+    /// <summary>
+    /// Aggregate total test count
+    /// </summary>
+    public long TotalTests { get; private set; }
+
+    /// <summary>
+    /// A collection of aggregated discovered extensions.
+    /// </summary>
+    public Dictionary<string, HashSet<string>> DiscoveredExtensions { get; private set; } = new();
+
+    /// <summary>
+    /// Returns the Aggregated Metrics.
+    /// </summary>
+    /// <returns></returns>
+    public IDictionary<string, object> GetMetrics()
+    {
+        if (_metricsAggregator == null || _metricsAggregator.IsEmpty)
+        {
+            return new ConcurrentDictionary<string, object>();
+        }
+
+        var adapterUsedCount = _metricsAggregator.Count(metrics =>
+            metrics.Key.Contains(TelemetryDataConstants.TotalTestsByAdapter));
+
+        var adaptersDiscoveredCount = _metricsAggregator.Count(metrics =>
+            metrics.Key.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter));
+
+        // Aggregating Total Adapter Used Count
+        _metricsAggregator.TryAdd(
+            TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests,
+            adapterUsedCount);
+
+        // Aggregating Total Adapters Discovered Count
+        _metricsAggregator.TryAdd(
+            TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery,
+            adaptersDiscoveredCount);
+
+        return _metricsAggregator;
+    }
+
+    public void MarkAsAborted()
+    {
+        lock (_dataUpdateSyncObject)
+        {
+            IsAborted = true;
+            TotalTests = -1;
+        }
+    }
+
+    /// <summary>
+    /// Aggregate discovery data
+    /// Must be thread-safe as this is expected to be called by parallel managers
+    /// </summary>
+    public void Aggregate(DiscoveryCompleteEventArgs discoveryCompleteEventArgs)
+    {
+        if (_isMessageSent == 1)
+        {
+            EqtTrace.Verbose("DiscoveryDataAggregator.Aggregate: Message was already sent so skipping event aggregation.");
+            return;
+        }
+
+        lock (_dataUpdateSyncObject)
+        {
+            IsAborted = IsAborted || discoveryCompleteEventArgs.IsAborted;
+
+            // Do not aggregate tests count if test discovery is aborted. It is mandated by
+            // platform that tests count is negative for discovery abort event.
+            // See `DiscoveryCompleteEventArgs`.
+            TotalTests = IsAborted ? -1 : TotalTests + discoveryCompleteEventArgs.TotalCount;
+
+            // Aggregate the discovered extensions.
+            DiscoveredExtensions = TestExtensions.CreateMergedDictionary(DiscoveredExtensions, discoveryCompleteEventArgs.DiscoveredExtensions);
+        }
+
+        AggregateMetrics(discoveryCompleteEventArgs.Metrics);
+
+        // Do not aggregate NotDiscovered, PartiallyDiscovered, FullyDiscovered sources here
+        // because this aggregator is shared with proxies so the state is already up-to-date.
+        //
+        // The reason to share the aggregator is that we only get 1 notification for completed
+        // discovery when discovery is done. Instead of 1 notification per discovery manager.
+        // And we also don't get any notification for discovery of sources that did not start
+        // discovering yet. So we need the state in the aggregator to start with all the sources
+        // that we were requested to discover in NotDiscovered state. And then as we discover them,
+        // we need to update that directly. So when any discovery is cancelled we can just take the
+        // current state in the aggregator and report it.
+    }
+
+    /// <summary>
+    /// Aggregates the metrics from Test Host Process.
+    /// </summary>
+    /// <param name="metrics"></param>
+    public void AggregateMetrics(IDictionary<string, object>? metrics)
+    {
+        if (metrics == null || metrics.Count == 0 || _metricsAggregator == null)
+        {
+            return;
+        }
+
+        foreach (var metric in metrics)
+        {
+            if (metric.Key.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter)
+                || metric.Key.Contains(TelemetryDataConstants.TimeTakenInSecByAllAdapters)
+                || metric.Key.Contains(TelemetryDataConstants.TotalTestsDiscovered)
+                || metric.Key.Contains(TelemetryDataConstants.TotalTestsByAdapter)
+                || metric.Key.Contains(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec))
+            {
+                var newValue = Convert.ToDouble(metric.Value, CultureInfo.InvariantCulture);
+
+                if (_metricsAggregator.TryGetValue(metric.Key, out object? oldValue))
+                {
+                    double oldDoubleValue = Convert.ToDouble(oldValue, CultureInfo.InvariantCulture);
+                    _metricsAggregator[metric.Key] = newValue + oldDoubleValue;
+                }
+                else
+                {
+                    _metricsAggregator.TryAdd(metric.Key, newValue);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Determines if we should send the message to the client.
+    /// </summary>
+    /// <remarks>
+    /// Handles race conditions as this aggregator is shared across various event handler for the
+    /// same discovery request but we want to notify only once.
+    /// </remarks>
+    /// <returns><see langword="true"/> if first to send the message; <see langword="false"/> otherwise.</returns>
+    public bool TryAggregateIsMessageSent()
+        => Interlocked.CompareExchange(ref _isMessageSent, 1, 0) == 0;
+
+    public List<string> GetSourcesWithStatus(DiscoveryStatus discoveryStatus)
+        => _sourcesWithDiscoveryStatus.IsEmpty
+            ? new List<string>()
+            : _sourcesWithDiscoveryStatus
+                .Where(source => source.Value == discoveryStatus)
+                .Select(source => source.Key)
+                .ToList();
+
+    public void MarkSourcesWithStatus(IEnumerable<string?>? sources, DiscoveryStatus status)
+    {
+        if (_isMessageSent == 1)
+        {
+            EqtTrace.Verbose("DiscoveryDataAggregator.MarkSourcesWithStatus: Message was already sent so skipping source update.");
+            return;
+        }
+
+        if (sources is null)
+        {
+            return;
+        }
+
+        foreach (var source in sources)
+        {
+            if (source is null)
+            {
+                continue;
+            }
+
+            _sourcesWithDiscoveryStatus.AddOrUpdate(source,
+                _ =>
+                {
+                    if (status != DiscoveryStatus.NotDiscovered)
+                    {
+                        EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Undiscovered {source} added with status: '{status}'.");
+                    }
+                    else
+                    {
+                        EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Adding {source} with status: '{status}'.");
+                    }
+
+                    return status;
+                },
+                (_, previousStatus) =>
+                {
+                    if (previousStatus == DiscoveryStatus.FullyDiscovered && status != DiscoveryStatus.FullyDiscovered
+                        || previousStatus == DiscoveryStatus.PartiallyDiscovered && (status == DiscoveryStatus.NotDiscovered || status == DiscoveryStatus.SkippedDiscovery))
+                    {
+                        EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Downgrading source {source} status from '{previousStatus}' to '{status}'.");
+                    }
+                    else if (previousStatus != status)
+                    {
+                        EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Upgrading {source} status from '{previousStatus}' to '{status}'.");
+                    }
+                    return status;
+                });
+        }
+    }
+
+    /// <summary>
+    /// Updates the discovery status of the source based on the discovered test cases.
+    /// </summary>
+    /// <param name="previousSource">The last discovered sources or null.</param>
+    /// <param name="testCases">The discovered sources.</param>
+    /// <returns>The last discovered source or null.</returns>
+    public string? MarkSourcesBasedOnDiscoveredTestCases(string? previousSource, IEnumerable<TestCase>? testCases)
+    {
+        if (_isMessageSent == 1)
+        {
+            EqtTrace.Verbose("DiscoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases: Message was already sent so skipping source update.");
+            return previousSource;
+        }
+
+        // When all testcases count in source is dividable by chunk size (e.g. 100 tests and
+        // chunk size of 10) then lastChunk is coming as empty. Otherwise, we receive the
+        // remaining test cases to process.
+        if (testCases is null)
+        {
+            return previousSource;
+        }
+
+        foreach (var testCase in testCases)
+        {
+            var currentSource = testCase.Source;
+
+            // We rely on the fact that sources are processed in a sequential way, which
+            // means that when we receive a different source than the previous, we can
+            // assume that the previous source was fully discovered.
+            if (previousSource is null || previousSource == currentSource)
+            {
+                MarkSourcesWithStatus(new[] { currentSource }, DiscoveryStatus.PartiallyDiscovered);
+            }
+            else if (currentSource != previousSource)
+            {
+                EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases: Discovered test source changed from {previousSource} to {currentSource}.");
+                MarkSourcesWithStatus(new[] { previousSource }, DiscoveryStatus.FullyDiscovered);
+                MarkSourcesWithStatus(new[] { currentSource }, DiscoveryStatus.PartiallyDiscovered);
+            }
+
+            previousSource = currentSource;
+        }
+
+        return previousSource;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs
deleted file mode 100644
index f41394d598..0000000000
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// ParallelDiscoveryDataAggregator aggregates discovery data from parallel discovery managers
-    /// </summary>
-    internal class ParallelDiscoveryDataAggregator
-    {
-        #region PrivateFields
-
-        private object dataUpdateSyncObject = new object();
-        private ConcurrentDictionary<string, object> metricsAggregator;
-
-        #endregion
-
-        public ParallelDiscoveryDataAggregator()
-        {
-            IsAborted = false;
-            TotalTests = 0;
-            this.metricsAggregator = new ConcurrentDictionary<string, object>();
-        }
-
-        #region Public Properties
-
-        /// <summary>
-        /// Set to true if any of the request is aborted
-        /// </summary>
-        public bool IsAborted { get; private set; }
-
-        /// <summary>
-        /// Aggregate total test count
-        /// </summary>
-        public long TotalTests { get; private set; }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Returns the Aggregated Metrics.
-        /// </summary>
-        /// <returns></returns>
-        public IDictionary<string, object> GetAggregatedDiscoveryDataMetrics()
-        {
-            if (this.metricsAggregator == null || this.metricsAggregator.Count == 0)
-            {
-                return new ConcurrentDictionary<string, object>();
-            }
-
-            var adapterUsedCount = this.metricsAggregator.Count(metrics =>
-                metrics.Key.Contains(TelemetryDataConstants.TotalTestsByAdapter));
-
-            var adaptersDiscoveredCount = this.metricsAggregator.Count(metrics =>
-                metrics.Key.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter));
-
-            // Aggregating Total Adapter Used Count
-            this.metricsAggregator.TryAdd(
-                TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests,
-                adapterUsedCount);
-
-            // Aggregating Total Adapters Discovered Count
-            this.metricsAggregator.TryAdd(
-                TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery,
-                adaptersDiscoveredCount);
-
-            return this.metricsAggregator;
-        }
-
-        /// <summary>
-        /// Aggregate discovery data
-        /// Must be thread-safe as this is expected to be called by parallel managers
-        /// </summary>
-        public void Aggregate(long totalTests, bool isAborted)
-        {
-            lock (dataUpdateSyncObject)
-            {
-                this.IsAborted = this.IsAborted || isAborted;
-
-                if (this.IsAborted)
-                {
-                    // Do not aggregate tests count if test discovery is aborted. It is mandated by
-                    // platform that tests count is negative for discovery abort event.
-                    // See `DiscoveryCompleteEventArgs`.
-                    this.TotalTests = -1;
-                    return;
-                }
-
-                this.TotalTests += totalTests;
-            }
-        }
-
-        /// <summary>
-        /// Aggregates the metrics from Test Host Process.
-        /// </summary>
-        /// <param name="metrics"></param>
-        public void AggregateDiscoveryDataMetrics(IDictionary<string, object> metrics)
-        {
-            if (metrics == null || metrics.Count == 0 || metricsAggregator == null)
-            {
-                return;
-            }
-
-            foreach (var metric in metrics)
-            {
-                if (metric.Key.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter) || metric.Key.Contains(TelemetryDataConstants.TimeTakenInSecByAllAdapters) || (metric.Key.Contains(TelemetryDataConstants.TotalTestsDiscovered) || metric.Key.Contains(TelemetryDataConstants.TotalTestsByAdapter) || metric.Key.Contains(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec)))
-                {
-                    var newValue = Convert.ToDouble(metric.Value);
-                    object oldValue;
-
-                    if (this.metricsAggregator.TryGetValue(metric.Key, out oldValue))
-                    {
-                        double oldDoubleValue = Convert.ToDouble(oldValue);
-                        this.metricsAggregator[metric.Key] = newValue + oldDoubleValue;
-                    }
-                    else
-                    {
-                        this.metricsAggregator.TryAdd(metric.Key, newValue);
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs
index 1552ca924c..faa65eb1e8 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs
@@ -1,164 +1,205 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
-{
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    using CommonResources = Common.Resources.Resources;
+using System.Collections.Generic;
 
-    /// <summary>
-    /// ParallelDiscoveryEventsHandler for handling the discovery events in case of parallel discovery
-    /// </summary>
-    internal class ParallelDiscoveryEventsHandler : ITestDiscoveryEventsHandler2
-    {
-        private IProxyDiscoveryManager proxyDiscoveryManager;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-        private ITestDiscoveryEventsHandler2 actualDiscoveryEventsHandler;
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
 
-        private IParallelProxyDiscoveryManager parallelProxyDiscoveryManager;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
 
-        private ParallelDiscoveryDataAggregator discoveryDataAggregator;
-
-        private IDataSerializer dataSerializer;
+/// <summary>
+/// ParallelDiscoveryEventsHandler for handling the discovery events in case of parallel discovery
+/// </summary>
+internal class ParallelDiscoveryEventsHandler : ITestDiscoveryEventsHandler2
+{
+    private readonly IProxyDiscoveryManager _proxyDiscoveryManager;
+    private readonly ITestDiscoveryEventsHandler2 _actualDiscoveryEventsHandler;
+    private readonly IParallelProxyDiscoveryManager _parallelProxyDiscoveryManager;
+    private readonly DiscoveryDataAggregator _discoveryDataAggregator;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly IRequestData _requestData;
+
+    public ParallelDiscoveryEventsHandler(IRequestData requestData,
+        IProxyDiscoveryManager proxyDiscoveryManager,
+        ITestDiscoveryEventsHandler2 actualDiscoveryEventsHandler,
+        IParallelProxyDiscoveryManager parallelProxyDiscoveryManager,
+        DiscoveryDataAggregator discoveryDataAggregator) :
+        this(requestData, proxyDiscoveryManager, actualDiscoveryEventsHandler, parallelProxyDiscoveryManager, discoveryDataAggregator, JsonDataSerializer.Instance)
+    {
+    }
 
-        private IRequestData requestData;
+    internal ParallelDiscoveryEventsHandler(IRequestData requestData,
+        IProxyDiscoveryManager proxyDiscoveryManager,
+        ITestDiscoveryEventsHandler2 actualDiscoveryEventsHandler,
+        IParallelProxyDiscoveryManager parallelProxyDiscoveryManager,
+        DiscoveryDataAggregator discoveryDataAggregator,
+        IDataSerializer dataSerializer)
+    {
+        _proxyDiscoveryManager = proxyDiscoveryManager;
+        _actualDiscoveryEventsHandler = actualDiscoveryEventsHandler;
+        _parallelProxyDiscoveryManager = parallelProxyDiscoveryManager;
+        _discoveryDataAggregator = discoveryDataAggregator;
+        _dataSerializer = dataSerializer;
+        _requestData = requestData;
+    }
 
-        public ParallelDiscoveryEventsHandler(IRequestData requestData,
-            IProxyDiscoveryManager proxyDiscoveryManager,
-            ITestDiscoveryEventsHandler2 actualDiscoveryEventsHandler,
-            IParallelProxyDiscoveryManager parallelProxyDiscoveryManager,
-            ParallelDiscoveryDataAggregator discoveryDataAggregator) :
-            this(requestData, proxyDiscoveryManager, actualDiscoveryEventsHandler, parallelProxyDiscoveryManager, discoveryDataAggregator, JsonDataSerializer.Instance)
+    /// <inheritdoc/>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        // Aggregate for final discovery complete
+        _discoveryDataAggregator.Aggregate(discoveryCompleteEventArgs);
+
+        // We get DiscoveryComplete events from each ProxyDiscoveryManager (each testhost) and
+        // they contain the last chunk of tests that were discovered in that particular testhost.
+        // We want to send them to the IDE, but we don't want to tell it that discovery finished,
+        // because other sources are still being discovered. So we translate the last chunk to a
+        // normal TestsDiscovered event and send that to the IDE. Once all sources are completed,
+        // we will send a single DiscoveryComplete.
+        if (lastChunk != null)
         {
+            ConvertToRawMessageAndSend(MessageType.TestCasesFound, lastChunk);
+            HandleDiscoveredTests(lastChunk);
         }
 
-        internal ParallelDiscoveryEventsHandler(IRequestData requestData,
-            IProxyDiscoveryManager proxyDiscoveryManager,
-            ITestDiscoveryEventsHandler2 actualDiscoveryEventsHandler,
-            IParallelProxyDiscoveryManager parallelProxyDiscoveryManager,
-            ParallelDiscoveryDataAggregator discoveryDataAggregator,
-            IDataSerializer dataSerializer)
+        // Do not send TestDiscoveryComplete to actual test discovery handler
+        // We need to see if there are still sources left - let the parallel manager decide
+        var parallelDiscoveryComplete = _parallelProxyDiscoveryManager.HandlePartialDiscoveryComplete(
+            _proxyDiscoveryManager,
+            discoveryCompleteEventArgs.TotalCount,
+            null, // Set lastChunk to null, because we already sent the data using HandleDiscoveredTests above.
+            discoveryCompleteEventArgs.IsAborted);
+
+        if (!parallelDiscoveryComplete
+            || !_discoveryDataAggregator.TryAggregateIsMessageSent())
         {
-            this.proxyDiscoveryManager = proxyDiscoveryManager;
-            this.actualDiscoveryEventsHandler = actualDiscoveryEventsHandler;
-            this.parallelProxyDiscoveryManager = parallelProxyDiscoveryManager;
-            this.discoveryDataAggregator = discoveryDataAggregator;
-            this.dataSerializer = dataSerializer;
-            this.requestData = requestData;
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            var totalTests = discoveryCompleteEventArgs.TotalCount;
-            var isAborted = discoveryCompleteEventArgs.IsAborted;
+        // Manager said we are ready to publish the test discovery completed and we haven't yet
+        // published it.
+        var fullyDiscovered = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered);
+        var partiallyDiscovered = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered);
+        var notDiscovered = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered);
+        var skippedDiscovery = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.SkippedDiscovery);
 
-            // we get discovery complete events from each host process
-            // so we cannot "complete" the actual operation until all sources are consumed
-            // We should not block last chunk results while we aggregate overall discovery data
-            if (lastChunk != null)
+        // As we immediately return results to IDE in case of aborting we need to set
+        // isAborted = true and totalTests = -1
+        if (!_discoveryDataAggregator.IsAborted)
+        {
+            if (_parallelProxyDiscoveryManager.IsAbortRequested)
             {
-                ConvertToRawMessageAndSend(MessageType.TestCasesFound, lastChunk);
-                this.HandleDiscoveredTests(lastChunk);
+                EqtTrace.Info("ParallelDiscoveryEventsHandler.HandleDiscoveryComplete: Abort requested but discovery data aggregator not updated, marking discovery as aborted.");
+                _discoveryDataAggregator.MarkAsAborted();
             }
-
-            // Aggregate for final discovery complete
-            discoveryDataAggregator.Aggregate(totalTests, isAborted);
-
-            // Aggregate Discovery Data Metrics
-            discoveryDataAggregator.AggregateDiscoveryDataMetrics(discoveryCompleteEventArgs.Metrics);
-
-            // Do not send TestDiscoveryComplete to actual test discovery handler
-            // We need to see if there are still sources left - let the parallel manager decide
-            var parallelDiscoveryComplete = this.parallelProxyDiscoveryManager.HandlePartialDiscoveryComplete(
-                    this.proxyDiscoveryManager,
-                    totalTests,
-                    null, // lastChunk should be null as we already sent this data above
-                    isAborted);
-
-            if (parallelDiscoveryComplete)
+            // If any testhost fails we will end up with some sources not fully discovered. In this
+            // case, we want to consider the discovery aborted (not user cancelled) as it indicates
+            // there was a failure during discovery.
+            else if (notDiscovered.Count > 0 || partiallyDiscovered.Count > 0)
             {
-                // In case of sequential discovery - RawMessage would have contained a 'DiscoveryCompletePayload' object
-                // To send a raw message - we need to create raw message from an aggregated payload object
-                var testDiscoveryCompletePayload = new DiscoveryCompletePayload()
-                {
-                    TotalTests = discoveryDataAggregator.TotalTests,
-                    IsAborted = discoveryDataAggregator.IsAborted,
-                    LastDiscoveredTests = null
-                };
-
-                // Collecting Final Discovery State
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.DiscoveryState, isAborted ? "Aborted" : "Completed");
-
-                // Collect Aggregated Metrics Data
-                var aggregatedDiscoveryDataMetrics = discoveryDataAggregator.GetAggregatedDiscoveryDataMetrics();
-                testDiscoveryCompletePayload.Metrics = aggregatedDiscoveryDataMetrics;
-
-                // we have to send raw messages as we block the discovery complete actual raw messages
-                this.ConvertToRawMessageAndSend(MessageType.DiscoveryComplete, testDiscoveryCompletePayload);
-
-                var finalDiscoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(this.discoveryDataAggregator.TotalTests,
-                    this.discoveryDataAggregator.IsAborted);
-                finalDiscoveryCompleteEventArgs.Metrics = aggregatedDiscoveryDataMetrics;
-
-                // send actual test discovery complete to clients
-                this.actualDiscoveryEventsHandler.HandleDiscoveryComplete(finalDiscoveryCompleteEventArgs, null);
+                EqtTrace.Info("ParallelDiscoveryEventsHandler.HandleDiscoveryComplete: Discovery completed but some sources are not fully discovered, marking discovery as aborted.");
+                _discoveryDataAggregator.MarkAsAborted();
             }
         }
-
-        /// <inheritdoc/>
-        public void HandleRawMessage(string rawMessage)
+        else
         {
-            // In case of parallel - we can send everything but handle complete
-            // DiscoveryComplete is not true-end of the overall discovery as we only get completion of one host here
-            // Always aggregate data, deserialize and raw for complete events
-            var message = this.dataSerializer.DeserializeMessage(rawMessage);
-
-            // Do not send CancellationRequested message to Output window in IDE, as it is not useful for user
-            if (string.Equals(message.MessageType, MessageType.TestMessage)
-                && rawMessage.IndexOf(CommonResources.CancellationRequested) >= 0)
-            {
-                return;
-            }
-
-            // Do not deserialize further
-            if (!string.Equals(MessageType.DiscoveryComplete, message.MessageType))
-            {
-                this.actualDiscoveryEventsHandler.HandleRawMessage(rawMessage);
-            }
+            EqtTrace.Info("ParallelDiscoveryEventsHandler.HandleDiscoveryComplete: Discovery completed.");
         }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
+        // Collecting Final Discovery State
+        _requestData.MetricsCollection.Add(
+            TelemetryDataConstants.DiscoveryState,
+            discoveryCompleteEventArgs.IsAborted ? "Aborted" : "Completed");
+
+        // Collect Aggregated Metrics Data
+        var aggregatedDiscoveryDataMetrics = _discoveryDataAggregator.GetMetrics();
+
+        // In case of sequential discovery - RawMessage would have contained a 'DiscoveryCompletePayload' object
+        // To send a raw message - we need to create raw message from an aggregated payload object
+        var testDiscoveryCompletePayload = new DiscoveryCompletePayload
         {
-            this.actualDiscoveryEventsHandler.HandleDiscoveredTests(discoveredTestCases);
-        }
+            TotalTests = _discoveryDataAggregator.TotalTests,
+            IsAborted = _discoveryDataAggregator.IsAborted,
+            LastDiscoveredTests = null,
+            FullyDiscoveredSources = fullyDiscovered,
+            PartiallyDiscoveredSources = partiallyDiscovered,
+            NotDiscoveredSources = notDiscovered,
+            SkippedDiscoverySources = skippedDiscovery,
+            DiscoveredExtensions = _discoveryDataAggregator.DiscoveredExtensions,
+            Metrics = aggregatedDiscoveryDataMetrics,
+        };
+
+        // Sending discovery complete message to IDE
+        EqtTrace.Verbose("ParallelDiscoveryEventsHandler.HandleDiscoveryComplete: Sending discovery complete message to IDE.");
+        ConvertToRawMessageAndSend(MessageType.DiscoveryComplete, testDiscoveryCompletePayload);
+
+        var finalDiscoveryCompleteEventArgs = new DiscoveryCompleteEventArgs
+        {
+            TotalCount = _discoveryDataAggregator.TotalTests,
+            IsAborted = _discoveryDataAggregator.IsAborted,
+            FullyDiscoveredSources = fullyDiscovered,
+            PartiallyDiscoveredSources = partiallyDiscovered,
+            NotDiscoveredSources = notDiscovered,
+            SkippedDiscoveredSources = skippedDiscovery,
+            DiscoveredExtensions = _discoveryDataAggregator.DiscoveredExtensions,
+            Metrics = aggregatedDiscoveryDataMetrics,
+        };
+
+        // send actual test discovery complete to clients
+        EqtTrace.Verbose("ParallelDiscoveryEventsHandler.HandleDiscoveryComplete: Sending discovery complete event to clients.");
+        _actualDiscoveryEventsHandler.HandleDiscoveryComplete(finalDiscoveryCompleteEventArgs, null);
+    }
 
-        /// <inheritdoc/>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+    /// <inheritdoc/>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // In case of parallel - we can send everything but handle complete
+        // DiscoveryComplete is not true-end of the overall discovery as we only get completion of one host here
+        // Always aggregate data, deserialize and raw for complete events
+        var message = _dataSerializer.DeserializeMessage(rawMessage);
+
+        // Do not send CancellationRequested message to Output window in IDE, as it is not useful for user
+        if (string.Equals(message.MessageType, MessageType.TestMessage)
+            && rawMessage.IndexOf(CommonResources.CancellationRequested) >= 0)
         {
-            this.actualDiscoveryEventsHandler.HandleLogMessage(level, message);
+            return;
         }
 
-        /// <summary>
-        /// To send message to IDE output window use HandleRawMessage
-        /// </summary>
-        /// <param name="messageType"></param>
-        /// <param name="payload"></param>
-        private void ConvertToRawMessageAndSend(string messageType, object payload)
+        // Do not deserialize further
+        if (!string.Equals(MessageType.DiscoveryComplete, message.MessageType))
         {
-            var rawMessage = this.dataSerializer.SerializePayload(messageType, payload);
-            this.actualDiscoveryEventsHandler.HandleRawMessage(rawMessage);
+            _actualDiscoveryEventsHandler.HandleRawMessage(rawMessage);
         }
     }
+
+    /// <inheritdoc/>
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        _actualDiscoveryEventsHandler.HandleDiscoveredTests(discoveredTestCases);
+    }
+
+    /// <inheritdoc/>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _actualDiscoveryEventsHandler.HandleLogMessage(level, message);
+    }
+
+    /// <summary>
+    /// To send message to IDE output window use HandleRawMessage
+    /// </summary>
+    /// <param name="messageType"></param>
+    /// <param name="payload"></param>
+    private void ConvertToRawMessageAndSend(string messageType, object payload)
+    {
+        var rawMessage = _dataSerializer.SerializePayload(messageType, payload, _requestData.ProtocolConfig!.Version);
+        _actualDiscoveryEventsHandler.HandleRawMessage(rawMessage);
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
index 323847a815..9003a84790 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
@@ -1,258 +1,402 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Manages work that is done on multiple managers (testhosts) in parallel such as parallel discovery or parallel run.
+/// </summary>
+internal sealed class ParallelOperationManager<TManager, TEventHandler, TWorkload> : IDisposable
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
+    private const int PreStart = 0;
+    private readonly static int VSTEST_HOSTPRESTART_COUNT =
+        int.TryParse(
+                Environment.GetEnvironmentVariable(nameof(VSTEST_HOSTPRESTART_COUNT)),
+                out int num)
+        ? num
+        : PreStart;
+    private readonly Func<TestRuntimeProviderInfo, TWorkload, TManager> _createNewManager;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+    /// <summary>
+    /// Default number of Processes
+    /// </summary>
+    private TEventHandler? _eventHandler;
+    private Func<TEventHandler, TManager, TEventHandler>? _getEventHandler;
+    private Func<TManager, TEventHandler, TWorkload, Task>? _initializeWorkload;
+    private Action<TManager, TEventHandler, TWorkload, bool, Task?>? _runWorkload;
+    private bool _acceptMoreWork;
+    private readonly List<ProviderSpecificWorkload<TWorkload>> _workloads = new();
+    private readonly List<Slot> _managerSlots = new();
+
+    private readonly object _lock = new();
+
+    public int MaxParallelLevel { get; }
+    public int OccupiedSlotCount { get; private set; }
+    public int AvailableSlotCount { get; private set; }
+    public int PreStartCount { get; private set; }
 
     /// <summary>
-    /// Abstract class having common parallel manager implementation
+    /// Creates new instance of ParallelOperationManager.
     /// </summary>
-    internal abstract class ParallelOperationManager<T, U> : IParallelOperationManager, IDisposable
+    /// <param name="createNewManager">Creates a new manager that is responsible for running a single part of the overall workload.
+    /// A manager is typically a testhost, and the part of workload is discovering or running a single test dll.</param>
+    /// <param name="parallelLevel">Determines the maximum amount of parallel managers that can be active at the same time.</param>
+    public ParallelOperationManager(Func<TestRuntimeProviderInfo, TWorkload, TManager> createNewManager, int parallelLevel)
     {
-        #region ConcurrentManagerInstanceData
-
-        protected Func<T> CreateNewConcurrentManager { get; set; }
+        _createNewManager = createNewManager;
+        MaxParallelLevel = parallelLevel;
+        // pre-start only when we don't run in parallel, if we do run in parallel,
+        // then pre-starting has no additional value because while one host is starting,
+        // another is running tests.
+        PreStartCount = MaxParallelLevel == 1 ? VSTEST_HOSTPRESTART_COUNT : 0;
+        ClearSlots(acceptMoreWork: true);
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether hosts are shared.
-        /// </summary>
-        protected bool SharedHosts { get; private set; }
+    private void ClearSlots(bool acceptMoreWork)
+    {
+        EqtTrace.Verbose($"ParallelOperationManager.ClearSlots: Clearing all slots. Slots should accept more work: {acceptMoreWork}");
 
-        private IDictionary<T, U> concurrentManagerHandlerMap;
+        lock (_lock)
+        {
+            _acceptMoreWork = acceptMoreWork;
+            _managerSlots.Clear();
+            _managerSlots.AddRange(Enumerable.Range(0, MaxParallelLevel + PreStartCount).Select(i => new Slot { Index = i }));
+            SetOccupiedSlotCount();
+        }
+    }
 
-        /// <summary>
-        /// Singleton Instance of this class
-        /// </summary>
-        protected static T instance = default(T);
+    private void SetOccupiedSlotCount()
+    {
+        AvailableSlotCount = _managerSlots.Count(s => !s.HasWork);
+        OccupiedSlotCount = _managerSlots.Count - AvailableSlotCount;
 
-        /// <summary>
-        /// Default number of Processes
-        /// </summary>
-        private int currentParallelLevel = 0;
+        if (EqtTrace.IsVerboseEnabled)
+        {
+            EqtTrace.Verbose($"ParallelOperationManager.SetOccupiedSlotCount: Setting slot counts AvailableSlotCount = {AvailableSlotCount}, OccupiedSlotCount = {OccupiedSlotCount}.");
+            EqtTrace.Verbose($"Occupied slots:\n{(string.Join("\n", _managerSlots.Where(s => s.HasWork).Select((slot) => $"{slot.Index}: {GetSourcesForSlotExpensive(slot)}").ToArray()))}");
 
-        #endregion
+        }
+    }
 
-        #region Concurrency Keeper Objects
+    public void StartWork(
+        List<ProviderSpecificWorkload<TWorkload>> workloads,
+        TEventHandler eventHandler,
+        Func<TEventHandler, TManager, TEventHandler> getEventHandler,
+        Func<TManager, TEventHandler, TWorkload, Task> initializeWorkload,
+        Action<TManager, TEventHandler, TWorkload, bool, Task?> runWorkload)
+    {
+        _ = workloads ?? throw new ArgumentNullException(nameof(workloads));
+        _eventHandler = eventHandler ?? throw new ArgumentNullException(nameof(eventHandler));
+        _getEventHandler = getEventHandler ?? throw new ArgumentNullException(nameof(getEventHandler));
+        _initializeWorkload = initializeWorkload ?? throw new ArgumentNullException(nameof(initializeWorkload));
+        _runWorkload = runWorkload ?? throw new ArgumentNullException(nameof(runWorkload));
 
-        /// <summary>
-        /// LockObject to iterate our sourceEnumerator in parallel
-        /// We can use the sourceEnumerator itself as lockObject, but since its a changing object - it's risky to use it as one
-        /// </summary>
-        protected object sourceEnumeratorLockObject = new object();
+        EqtTrace.Verbose($"ParallelOperationManager.StartWork: Starting adding {workloads.Count} workloads.");
+        _workloads.AddRange(workloads);
 
-        #endregion
+        ClearSlots(acceptMoreWork: true);
+        RunWorkInParallel();
+    }
 
-        protected ParallelOperationManager(Func<T> createNewManager, int parallelLevel, bool sharedHosts)
-        {
-            this.CreateNewConcurrentManager = createNewManager;
-            this.SharedHosts = sharedHosts;
+    // This does not do anything in parallel, all the workloads we schedule are offloaded to separate Task in the _runWorkload callback.
+    // I did not want to change that, yet but this is the correct place to do that offloading. Not each manager.
+    private bool RunWorkInParallel()
+    {
+        // TODO: Right now we don't re-use shared hosts, but if we did, this is the place
+        // where we should find a workload that fits the manager if any of them is shared.
+        // Or tear it down, and start a new one.
 
-            // Update Parallel Level
-            this.UpdateParallelLevel(parallelLevel);
-        }
+        if (_eventHandler == null)
+            throw new InvalidOperationException($"{nameof(_eventHandler)} was not provided.");
 
-        /// <summary>
-        /// Remove and dispose a manager from concurrent list of manager.
-        /// </summary>
-        /// <param name="manager">Manager to remove</param>
-        public void RemoveManager(T manager)
-        {
-            this.concurrentManagerHandlerMap.Remove(manager);
-        }
+        if (_getEventHandler == null)
+            throw new InvalidOperationException($"{nameof(_getEventHandler)} was not provided.");
 
-        /// <summary>
-        /// Add a manager in concurrent list of manager.
-        /// </summary>
-        /// <param name="manager">Manager to add</param>
-        /// <param name="handler">eventHandler of the manager</param>
-        public void AddManager(T manager, U handler)
-        {
-            this.concurrentManagerHandlerMap.Add(manager, handler);
-        }
+        if (_runWorkload == null)
+            throw new InvalidOperationException($"{nameof(_runWorkload)} was not provided.");
 
-        /// <summary>
-        /// Update event handler for the manager.
-        /// If it is a new manager, add this.
-        /// </summary>
-        /// <param name="manager">Manager to update</param>
-        /// <param name="handler">event handler to update for manager</param>
-        public void UpdateHandlerForManager(T manager, U handler)
+        // Reserve slots and assign them work under the lock so we keep the slots consistent.
+        Slot[] slots;
+        lock (_lock)
         {
-            if(this.concurrentManagerHandlerMap.ContainsKey(manager))
+            // When HandlePartialDiscovery or HandlePartialRun are in progress, and we call StopAllManagers,
+            // it is possible that we will clear all slots, and have RunWorkInParallel waiting on the lock,
+            // so when it is allowed to enter it will try to add more work, but we already cancelled,
+            // so we should not start more work.
+            if (!_acceptMoreWork)
             {
-                this.concurrentManagerHandlerMap[manager] = handler;
+                EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: We don't accept more work, returning false.");
+                return false;
             }
-            else
+
+            // We grab all empty slots.
+            var availableSlots = _managerSlots.Where(slot => !slot.HasWork).ToImmutableArray();
+            var occupiedSlots = MaxParallelLevel - (availableSlots.Length - PreStartCount);
+            // We grab all available workloads.
+            var availableWorkloads = _workloads.Where(workload => workload != null).ToImmutableArray();
+            // We take the amount of workloads to fill all the slots, or just as many workloads
+            // as there are if there are less workloads than slots.
+            var amount = Math.Min(availableSlots.Length, availableWorkloads.Length);
+            var workloadsToAdd = availableWorkloads.Take(amount).ToImmutableArray();
+
+            // We associate each workload to a slot, if we reached the max parallel
+            // level, then we will run only initialize step of the given workload.
+            for (int i = 0; i < amount; i++)
             {
-                this.AddManager(manager, handler);
+                var slot = availableSlots[i];
+                var workload = workloadsToAdd[i];
+                slot.ShouldPreStart = occupiedSlots + i + 1 > MaxParallelLevel;
+
+                var manager = _createNewManager(workload.Provider, workload.Work);
+                var eventHandler = _getEventHandler(_eventHandler, manager);
+                slot.EventHandler = eventHandler;
+                slot.Manager = manager;
+                slot.ManagerInfo = workload.Provider;
+                slot.Work = workload.Work;
+
+                _workloads.Remove(workload);
+
+                EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: Adding 1 workload to slot, remaining workloads {_workloads.Count}.");
+
+                // This must be set last, every loop below looks at this property,
+                // and they can do so from a different thread. So if we mark it as HasWork before actually assigning the work
+                // we can pick up the slot, but it has no associated work yet.
+                slot.HasWork = true;
             }
-        }
 
-        /// <summary>
-        /// Get the event handler associated with the manager.
-        /// </summary>
-        /// <param name="manager">Manager</param>
-        public U GetHandlerForGivenManager(T manager)
-        {
-            return this.concurrentManagerHandlerMap[manager];
+            slots = _managerSlots.ToArray();
+            SetOccupiedSlotCount();
         }
 
-        /// <summary>
-        /// Get total number of active concurrent manager
-        /// </summary>
-        public int GetConcurrentManagersCount()
+        // Kick of the work in parallel outside of the lock so if we have more requests to run
+        // that come in at the same time we only block them from reserving the same slot at the same time
+        // but not from starting their assigned work at the same time.
+
+        // Kick of all pre-started hosts from the ones that had the longest time to initialize.
+        //
+        // This code should be safe even outside the lock since HasWork is only changed when work is
+        // complete and only for the slot that completed work. It is not possible to complete work before
+        // starting it (which is what we are trying to do here).
+        var startedWork = 0;
+        foreach (var slot in slots.Where(s => s.HasWork && !s.IsRunning && s.IsPreStarted).OrderBy(s => s.PreStartTime))
         {
-            return this.concurrentManagerHandlerMap.Count;
-        }
+            startedWork++;
+            slot.IsRunning = true;
+            if (EqtTrace.IsVerboseEnabled)
+            {
+                EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: Running on pre-started host for work (source) {GetSourcesForSlotExpensive(slot)}: {(DateTime.Now.TimeOfDay - slot.PreStartTime).TotalMilliseconds}ms {slot.InitTask?.Status}");
+            }
+            _runWorkload(slot.Manager!, slot.EventHandler!, slot.Work!, slot.IsPreStarted, slot.InitTask);
 
-        /// <summary>
-        /// Get instances of all active concurrent manager
-        /// </summary>
-        public IEnumerable<T> GetConcurrentManagerInstances()
-        {
-            return this.concurrentManagerHandlerMap.Keys.ToList();
+            // We already started as many as we were allowed, jump out;
+            if (startedWork == MaxParallelLevel)
+            {
+                EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: We started {startedWork} work items, which is the max parallel level. Won't start more work.");
+                break;
+            }
         }
 
-
-        /// <summary>
-        /// Updates the Concurrent Executors according to new parallel setting
-        /// </summary>
-        /// <param name="newParallelLevel">Number of Parallel Executors allowed</param>
-        public void UpdateParallelLevel(int newParallelLevel)
+        // We already started as many pre-started testhosts as we are allowed by the max parallel level
+        // skip running more work.
+        if (startedWork < MaxParallelLevel)
         {
-            if (this.concurrentManagerHandlerMap == null)
-            {
-                // not initialized yet
-                // create rest of concurrent clients other than default one
-                this.concurrentManagerHandlerMap = new ConcurrentDictionary<T, U>();
-                for (int i = 0; i < newParallelLevel; i++)
-                {
-                    this.AddManager(this.CreateNewConcurrentManager(), default(U));
-                }
-            }
-            else if (this.currentParallelLevel != newParallelLevel)
+            foreach (var slot in slots)
             {
-                // If number of concurrent clients is less than the new level
-                // Create more concurrent clients and update the list
-                if (this.currentParallelLevel < newParallelLevel)
+                if (slot.HasWork && !slot.IsRunning)
                 {
-                    for (int i = 0; i < newParallelLevel - this.currentParallelLevel; i++)
+                    if (!slot.ShouldPreStart)
                     {
-                        this.AddManager(this.CreateNewConcurrentManager(), default(U));
-                    }
-                }
-                else
-                {
-                    // If number of concurrent clients is more than the new level
-                    // Dispose off the extra ones
-                    int managersCount = currentParallelLevel - newParallelLevel;
-
-                    foreach(var concurrentManager in this.GetConcurrentManagerInstances())
-                    {
-                        if (managersCount == 0)
-                        {
-                            break;
-                        }
-                        else
+                        startedWork++;
+                        slot.IsRunning = true;
+                        if (EqtTrace.IsVerboseEnabled)
                         {
-                            this.RemoveManager(concurrentManager);
-                            managersCount--;
+                            EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: Started host in slot number {slot.Index} for work (source): {GetSourcesForSlotExpensive(slot)}.");
                         }
+                        _runWorkload(slot.Manager!, slot.EventHandler!, slot.Work!, slot.IsPreStarted, slot.InitTask);
                     }
                 }
-            }
 
-            // Update current parallel setting to new one
-            this.currentParallelLevel = newParallelLevel;
+                // We already started as many as we were allowed, jump out;
+                if (startedWork == MaxParallelLevel)
+                {
+                    EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: We started {startedWork} work items, which is the max parallel level. Won't start more work.");
+                    break;
+                }
+            }
         }
 
-        public void Dispose()
+        var preStartedWork = 0;
+        foreach (var slot in slots)
         {
-            if (this.concurrentManagerHandlerMap != null)
+            if (slot.HasWork && slot.ShouldPreStart && !slot.IsPreStarted)
             {
-                foreach (var managerInstance in this.GetConcurrentManagerInstances())
+                preStartedWork++;
+                slot.PreStartTime = DateTime.Now.TimeOfDay;
+                slot.IsPreStarted = true;
+                if (EqtTrace.IsVerboseEnabled)
                 {
-                    this.RemoveManager(managerInstance);
+                    EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: Pre-starting a host for work (source): {GetSourcesForSlotExpensive(slot)}.");
                 }
+                slot.InitTask = _initializeWorkload!(slot.Manager!, slot.EventHandler!, slot.Work!);
             }
-
-            instance = default(T);
         }
 
-        protected void DoActionOnAllManagers(Action<T> action, bool doActionsInParallel = false)
+        // Return true when we started more work. Or false, when there was nothing more to do.
+        // This will propagate to handling of partial discovery or partial run.
+        var weAddedMoreWork = preStartedWork + startedWork > 0;
+        EqtTrace.Verbose($"ParallelOperationManager.RunWorkInParallel: We started {preStartedWork + startedWork} work items in here, returning {weAddedMoreWork}.");
+        return weAddedMoreWork;
+    }
+
+    public bool RunNextWork(TManager completedManager)
+    {
+        ValidateArg.NotNull(completedManager, nameof(completedManager));
+        ClearCompletedSlot(completedManager);
+        return RunWorkInParallel();
+    }
+
+    private void ClearCompletedSlot(TManager completedManager)
+    {
+        lock (_lock)
         {
-            if (this.concurrentManagerHandlerMap != null && this.concurrentManagerHandlerMap.Count > 0)
+            var completedSlot = _managerSlots.Where(s => ReferenceEquals(completedManager, s.Manager)).ToImmutableArray();
+            // When HandlePartialDiscovery or HandlePartialRun are in progress, and we call StopAllManagers,
+            // it is possible that we will clear all slots, while ClearCompletedSlot is waiting on the lock,
+            // so when it is allowed to enter it will fail to find the respective slot and fail. In this case it is
+            // okay that the slot is not found, and we do nothing, because we already stopped all work and cleared the slots.
+            if (completedSlot.Length == 0)
             {
-                int i = 0;
-                var actionTasks = new Task[this.concurrentManagerHandlerMap.Count];
-                foreach (var client in this.GetConcurrentManagerInstances())
+                if (_acceptMoreWork)
                 {
-                    // Read the array before firing the task - beware of closures
-                    if (doActionsInParallel)
-                    {
-                        actionTasks[i] = Task.Run(() => action(client));
-                        i++;
-                    }
-                    else
-                    {
-                        this.DoManagerAction(() => action(client));
-                    }
+                    throw new InvalidOperationException("The provided manager was not found in any slot.");
                 }
-
-                if (doActionsInParallel)
+                else
                 {
-                    this.DoManagerAction(() => Task.WaitAll(actionTasks));
+                    return;
                 }
             }
-        }
 
-        private void DoManagerAction(Action action)
-        {
-            try
+            if (completedSlot.Length > 1)
             {
-                action();
+                throw new InvalidOperationException("The provided manager was found in multiple slots.");
             }
-            catch (Exception ex)
+
+            if (EqtTrace.IsVerboseEnabled)
             {
-                // Exception can occur if we are trying to cancel a test run on an executor where test run is not even fired
-                // we can safely ignore that as user is just canceling the test run and we don't care about additional parallel executors
-                // as we will be disposing them off soon anyway
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("AbstractParallelOperationManager: Exception while invoking an action on Proxy Manager instance: {0}", ex);
-                }
+                EqtTrace.Verbose($"ParallelOperationManager.ClearCompletedSlot: Clearing slot number {completedSlot[0].Index} with work (source): {GetSourcesForSlotExpensive(completedSlot[0])}.");
             }
+            var slot = completedSlot[0];
+            slot.PreStartTime = TimeSpan.Zero;
+            slot.Work = default(TWorkload);
+            slot.HasWork = false;
+            slot.ShouldPreStart = false;
+            slot.IsPreStarted = false;
+            slot.InitTask = null;
+            slot.IsRunning = false;
+            slot.Manager = default(TManager);
+            slot.EventHandler = default(TEventHandler);
+
+            SetOccupiedSlotCount();
         }
+    }
 
-        /// <summary>
-        /// Fetches the next data object for the concurrent executor to work on
-        /// </summary>
-        /// <param name="source">source data to work on - source file or testCaseList</param>
-        /// <returns>True, if data exists. False otherwise</returns>
-        protected bool TryFetchNextSource<Y>(IEnumerator enumerator, out Y source)
+    private static string GetSourcesForSlotExpensive(ParallelOperationManager<TManager, TEventHandler, TWorkload>.Slot slot)
+    {
+        return string.Join(", ", (slot.Work as DiscoveryCriteria)?.Sources ?? (slot.Work as TestRunCriteria)?.Sources ?? []);
+    }
+
+    public void DoActionOnAllManagers(Action<TManager> action, bool doActionsInParallel = false)
+    {
+        EqtTrace.Verbose($"ParallelOperationManager.DoActionOnAllManagers: Calling an action on all managers.");
+        // We don't need to lock here, we just grab the current list of
+        // slots that are occupied (have managers) and run action on each one of them.
+        var managers = _managerSlots.Where(slot => slot.HasWork).Select(slot => slot.Manager).ToImmutableArray();
+        int i = 0;
+        var actionTasks = new Task[managers.Length];
+        foreach (var manager in managers)
         {
-            source = default(Y);
-            var hasNext = false;
-            lock (this.sourceEnumeratorLockObject)
+            if (manager == null)
+                continue;
+
+            // Read the array before firing the task - beware of closures
+            if (doActionsInParallel)
             {
-                if (enumerator != null && enumerator.MoveNext())
-                {
-                    source = (Y)enumerator.Current;
-                    hasNext = source != null;
-                }
+                actionTasks[i] = Task.Run(() => action(manager));
+                i++;
             }
+            else
+            {
+                DoManagerAction(() => action(manager));
+            }
+        }
 
-            return hasNext;
+        if (doActionsInParallel)
+        {
+            DoManagerAction(() => Task.WaitAll(actionTasks));
         }
     }
-}
 
+    private static void DoManagerAction(Action action)
+    {
+        try
+        {
+            action();
+        }
+        catch (Exception ex)
+        {
+            // Exception can occur if we are trying to cancel a test run on an executor where test run is not even fired
+            // we can safely ignore that as user is just canceling the test run and we don't care about additional parallel executors
+            // as we will be disposing them off soon anyway
+            EqtTrace.Warning("ParallelOperationManager.DoManagerAction: Exception while invoking an action on Proxy Manager instance: {0}", ex);
+        }
+    }
+
+    internal void StopAllManagers()
+    {
+        EqtTrace.Verbose($"ParallelOperationManager.StopAllManagers: Stopping all managers.");
+        ClearSlots(acceptMoreWork: false);
+    }
+
+    public void Dispose()
+    {
+        EqtTrace.Verbose($"ParallelOperationManager.Dispose: Disposing all managers.");
+        ClearSlots(acceptMoreWork: false);
+    }
+
+    private class Slot
+    {
+        public int Index { get; set; }
+        public bool HasWork { get; set; }
+
+        public bool ShouldPreStart { get; set; }
+
+        public Task? InitTask { get; set; }
+
+        public bool IsRunning { get; set; }
+
+        public TManager? Manager { get; set; }
+
+        public TestRuntimeProviderInfo? ManagerInfo { get; set; }
+
+        public TEventHandler? EventHandler { get; set; }
+
+        public TWorkload? Work { get; set; }
+        public bool IsPreStarted { get; internal set; }
+        public TimeSpan PreStartTime { get; internal set; }
+
+        public override string ToString()
+        {
+            return $"{Index}: HasWork: {HasWork}, ShouldPreStart: {ShouldPreStart}, IsPreStarted: {IsPreStarted},  IsRunning: {IsRunning}";
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
index c7ea14d07a..417b619585 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
@@ -1,260 +1,362 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+
+/// <summary>
+/// ParallelProxyDiscoveryManager that manages parallel discovery
+/// </summary>
+internal sealed class ParallelProxyDiscoveryManager : IParallelProxyDiscoveryManager, IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly DiscoveryDataAggregator _dataAggregator;
+    private readonly bool _isParallel;
+    private readonly ParallelOperationManager<IProxyDiscoveryManager, ITestDiscoveryEventsHandler2, DiscoveryCriteria> _parallelOperationManager;
+    private readonly Dictionary<string, TestRuntimeProviderInfo> _sourceToTestHostProviderMap;
+    private readonly IRequestData _requestData;
+
+    private int _discoveryCompletedClients;
+    private int _availableTestSources;
+    private int _availableWorkloads;
+    private bool _skipDefaultAdapters;
+    private bool _isDisposed;
+
+    public bool IsAbortRequested { get; private set; }
 
     /// <summary>
-    /// ParallelProxyDiscoveryManager that manages parallel discovery
+    /// LockObject to update discovery status in parallel
     /// </summary>
-    internal class ParallelProxyDiscoveryManager : ParallelOperationManager<IProxyDiscoveryManager, ITestDiscoveryEventsHandler2>, IParallelProxyDiscoveryManager
+    private readonly object _discoveryStatusLockObject = new();
+
+    public ParallelProxyDiscoveryManager(
+        IRequestData requestData,
+        Func<TestRuntimeProviderInfo, DiscoveryCriteria, IProxyDiscoveryManager> actualProxyManagerCreator,
+        DiscoveryDataAggregator dataAggregator,
+        int parallelLevel,
+        List<TestRuntimeProviderInfo> testHostProviders)
+        : this(requestData, actualProxyManagerCreator, dataAggregator, JsonDataSerializer.Instance, parallelLevel, testHostProviders)
     {
-        private IDataSerializer dataSerializer;
+    }
 
-        #region DiscoverySpecificData
+    internal ParallelProxyDiscoveryManager(
+        IRequestData requestData,
+        Func<TestRuntimeProviderInfo, DiscoveryCriteria, IProxyDiscoveryManager> actualProxyManagerCreator,
+        DiscoveryDataAggregator dataAggregator,
+        IDataSerializer dataSerializer,
+        int parallelLevel,
+        List<TestRuntimeProviderInfo> testHostProviders)
+    {
+        _requestData = requestData;
+        _dataSerializer = dataSerializer;
+        _dataAggregator = dataAggregator;
+        _isParallel = parallelLevel > 1;
+        _parallelOperationManager = new(actualProxyManagerCreator, parallelLevel);
+        _sourceToTestHostProviderMap = testHostProviders
+            .SelectMany(provider => provider.SourceDetails.Select(s => new KeyValuePair<string, TestRuntimeProviderInfo>(s.Source!, provider)))
+            .ToDictionary(pair => pair.Key, pair => pair.Value);
+    }
 
-        private int discoveryCompletedClients = 0;
-        private int availableTestSources = -1;
+    #region IProxyDiscoveryManager
 
-        private DiscoveryCriteria actualDiscoveryCriteria;
+    /// <inheritdoc/>
+    public void Initialize(bool skipDefaultAdapters)
+    {
+        _skipDefaultAdapters = skipDefaultAdapters;
+    }
 
-        private IEnumerator<string> sourceEnumerator;
+    /// <inheritdoc/>
+    public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        ValidateArg.NotNull(discoveryCriteria, nameof(discoveryCriteria));
+        ValidateArg.NotNull(eventHandler, nameof(eventHandler));
+
+        var workloads = SplitToWorkloads(discoveryCriteria, _sourceToTestHostProviderMap);
+        _availableTestSources = workloads.SelectMany(w => w.Work.Sources).Count();
+        var runnableWorkloads = workloads.Where(workload => workload.HasProvider).ToList();
+        _availableWorkloads = runnableWorkloads.Count;
+        var nonRunnableWorkloads = workloads.Where(workload => !workload.HasProvider).ToList();
+
+        EqtTrace.Verbose("ParallelProxyDiscoveryManager.DiscoverTests: Start discovery. Total sources: " + _availableTestSources);
+
+        // Mark all sources as NotDiscovered here because if we get an early cancellation it's
+        // possible that we didn't yet start all the proxy managers and so we didn't mark all sources
+        // as NotDiscovered.
+        // For example, let's assume we have 10 sources, a batch size of 10 but only 8 cores, we
+        // will then spawn 8 instances of this and if we now cancel, we will have 2 sources not
+        // marked as NotDiscovered.
+        _dataAggregator.MarkSourcesWithStatus(discoveryCriteria.Sources, DiscoveryStatus.NotDiscovered);
+
+        if (nonRunnableWorkloads.Count > 0)
+        {
+            // We found some sources that don't associate to any runtime provider and so they cannot run.
+            // Mark the sources as skipped.
 
-        private ITestDiscoveryEventsHandler2 currentDiscoveryEventsHandler;
+            _dataAggregator.MarkSourcesWithStatus(nonRunnableWorkloads.SelectMany(w => w.Work.Sources), DiscoveryStatus.SkippedDiscovery);
+            // TODO: in strict mode keep them as non-discovered, and mark the run as aborted.
+            // _dataAggregator.MarkAsAborted();
+        }
 
-        private ParallelDiscoveryDataAggregator currentDiscoveryDataAggregator;
+        _parallelOperationManager.StartWork(runnableWorkloads, eventHandler, GetParallelEventHandler, InitializeDiscoverTestsOnConcurrentManager, DiscoverTestsOnConcurrentManager);
+    }
 
-        private IRequestData requestData;
+    private ITestDiscoveryEventsHandler2 GetParallelEventHandler(ITestDiscoveryEventsHandler2 eventHandler, IProxyDiscoveryManager concurrentManager)
+        => new ParallelDiscoveryEventsHandler(
+            _requestData,
+            concurrentManager,
+            eventHandler,
+            this,
+            _dataAggregator);
 
-        // This field indicates if abort was requested by testplatform (user)
-        private bool discoveryAbortRequested = false;
+    /// <inheritdoc/>
+    public void Abort()
+    {
+        IsAbortRequested = true;
+        _parallelOperationManager.DoActionOnAllManagers((proxyManager) => proxyManager.Abort(), doActionsInParallel: true);
+    }
 
-        #endregion
+    /// <inheritdoc/>
+    public void Abort(ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        IsAbortRequested = true;
+        _parallelOperationManager.DoActionOnAllManagers((proxyManager) => proxyManager.Abort(eventHandler), doActionsInParallel: true);
+    }
 
-        #region Concurrency Keeper Objects
+    /// <inheritdoc/>
+    public void Close()
+    {
+        _parallelOperationManager.DoActionOnAllManagers(proxyManager => proxyManager.Close(), doActionsInParallel: true);
+    }
 
-        /// <summary>
-        /// LockObject to update discovery status in parallel
-        /// </summary>
-        private object discoveryStatusLockObject = new object();
+    #endregion
 
-        #endregion
+    #region IParallelProxyDiscoveryManager methods
 
-        public ParallelProxyDiscoveryManager(IRequestData requestData, Func<IProxyDiscoveryManager> actualProxyManagerCreator, int parallelLevel, bool sharedHosts)
-            : this(requestData, actualProxyManagerCreator, JsonDataSerializer.Instance, parallelLevel, sharedHosts)
-        {
-        }
-
-        internal ParallelProxyDiscoveryManager(IRequestData requestData, Func<IProxyDiscoveryManager> actualProxyManagerCreator, IDataSerializer dataSerializer, int parallelLevel, bool sharedHosts)
-            : base(actualProxyManagerCreator, parallelLevel, sharedHosts)
+    /// <inheritdoc/>
+    public bool HandlePartialDiscoveryComplete(IProxyDiscoveryManager proxyDiscoveryManager, long totalTests, IEnumerable<TestCase>? lastChunk, bool isAborted)
+    {
+#if DEBUG
+        // Ensures that the total count of sources remains the same between each discovery
+        // completion of the same initial discovery request.
+        var notDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count;
+        var partiallyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count;
+        var fullyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count;
+        var skippedCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.SkippedDiscovery).Count;
+        var expectedCount = _availableTestSources;
+        // When this fails, look at the _dataAggregator and look at the sources that it holds. It is possible that adapter incorrectly reports
+        // the source on the testcase object. Each distinct source that will appear on TestCase will be considered a file.
+        TPDebug.Assert(notDiscoveredCount + partiallyDiscoveredCount + fullyDiscoveredCount + skippedCount == expectedCount,
+            $"Total count of sources ({expectedCount}) should match the count of sources with status not discovered ({notDiscoveredCount}), partially discovered ({partiallyDiscoveredCount}), fully discovered ({fullyDiscoveredCount}) and skipped ({skippedCount}).");
+#endif
+
+        var allDiscoverersCompleted = false;
+        // TODO: Interlocked.Increment the count, and the condition below probably does not need to be in a lock?
+        lock (_discoveryStatusLockObject)
         {
-            this.requestData = requestData;
-            this.dataSerializer = dataSerializer;
-        }
+            // Each concurrent Executor calls this method
+            // So, we need to keep track of total discovery complete calls
+            _discoveryCompletedClients++;
 
-        #region IProxyDiscoveryManager
+            // If there are no more sources/testcases, a parallel executor is truly done with discovery
+            allDiscoverersCompleted = _discoveryCompletedClients == _availableWorkloads;
 
-        /// <inheritdoc/>
-        public void Initialize(bool skipDefaultAdapters)
-        {
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(skipDefaultAdapters), doActionsInParallel: true);
+            EqtTrace.Verbose("ParallelProxyDiscoveryManager.HandlePartialDiscoveryComplete: Total completed clients = {0}, Discovery complete = {1}, Aborted = {2}, Abort requested: {3}.", _discoveryCompletedClients, allDiscoverersCompleted, isAborted, IsAbortRequested);
         }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+        // If discovery is complete or discovery aborting was requested by testPlatfrom(user)
+        // we need to stop all ongoing discoveries, because we want to separate aborting request
+        // when testhost crashed by itself and when user requested it (e.g. through TW).
+        // Schedule the clean up for managers and handlers.
+        if (allDiscoverersCompleted || IsAbortRequested)
         {
-            this.actualDiscoveryCriteria = discoveryCriteria;
+            _parallelOperationManager.StopAllManagers();
 
-            // Set the enumerator for parallel yielding of sources
-            // Whenever a concurrent executor becomes free, it picks up the next source using this enumerator
-            this.sourceEnumerator = discoveryCriteria.Sources.GetEnumerator();
-            this.availableTestSources = discoveryCriteria.Sources.Count();
-
-            if (EqtTrace.IsVerboseEnabled)
+            if (allDiscoverersCompleted)
             {
-                EqtTrace.Verbose("ParallelProxyDiscoveryManager: Start discovery. Total sources: " + this.availableTestSources);
+                EqtTrace.Verbose("ParallelProxyDiscoveryManager.HandlePartialDiscoveryComplete: All sources were discovered.");
+            }
+            else
+            {
+                EqtTrace.Verbose($"ParallelProxyDiscoveryManager.HandlePartialDiscoveryComplete: Abort was requested.");
             }
-            this.DiscoverTestsPrivate(eventHandler);
-        }
 
-        /// <inheritdoc/>
-        public void Abort()
-        {
-            this.discoveryAbortRequested = true;
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Abort(), doActionsInParallel: true);
+            return true;
         }
 
-        /// <inheritdoc/>
-        public void Close()
-        {
-            this.DoActionOnAllManagers(proxyManager => proxyManager.Close(), doActionsInParallel: true);
-        }
+        _parallelOperationManager.RunNextWork(proxyDiscoveryManager);
 
-        #endregion
+        return false;
+    }
 
-        #region IParallelProxyDiscoveryManager methods
+    #endregion
 
-        /// <inheritdoc/>
-        public bool HandlePartialDiscoveryComplete(IProxyDiscoveryManager proxyDiscoveryManager, long totalTests, IEnumerable<TestCase> lastChunk, bool isAborted)
+    private List<ProviderSpecificWorkload<DiscoveryCriteria>> SplitToWorkloads(DiscoveryCriteria discoveryCriteria, Dictionary<string, TestRuntimeProviderInfo> sourceToTestHostProviderMap)
+    {
+        var sources = discoveryCriteria.Sources;
+        // Each source is grouped with its respective provider.
+        var providerGroups = sources
+            .Select(source => new ProviderSpecificWorkload<string>(source, sourceToTestHostProviderMap[source]))
+            .GroupBy(psw => psw.Provider);
+
+        List<ProviderSpecificWorkload<DiscoveryCriteria>> workloads = new();
+        foreach (var group in providerGroups)
         {
-            var allDiscoverersCompleted = false;
-            lock (this.discoveryStatusLockObject)
+            var testhostProviderInfo = group.Key;
+            // If the run is not parallel and the host is shared, put all testcases on single testhost.
+            // For parallel we prefer to run each source on its own host because we don't know how big the source is
+            // (how many tests there are to discover), and running 10 sources on 10 parallel testhosts is faster
+            // in almost all cases than running 10 sources on 1 testhost.
+            List<string[]> sourceBatches;
+            if (!_isParallel && testhostProviderInfo.Shared)
             {
-                // Each concurrent Executor calls this method
-                // So, we need to keep track of total discovery complete calls
-                this.discoveryCompletedClients++;
-
-                // If there are no more sources/testcases, a parallel executor is truly done with discovery
-                allDiscoverersCompleted = this.discoveryCompletedClients == this.availableTestSources;
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("ParallelProxyDiscoveryManager: HandlePartialDiscoveryComplete: Total completed clients = {0}, Discovery complete = {1}.", this.discoveryCompletedClients, allDiscoverersCompleted);
-                }
+                // Create one big source batch that will be single workload for single testhost.
+                sourceBatches = [group.Select(w => w.Work).ToArray()];
             }
-
-            /*
-             If discovery is complete or discovery aborting was requsted by testPlatfrom(user)
-             we need to stop all ongoing discoveries, because we want to separate aborting request
-             when testhost crashed by itself and when user requested it (f.e. through TW)
-             Schedule the clean up for managers and handlers.
-            */
-            if (allDiscoverersCompleted || discoveryAbortRequested)
+            else
             {
-                // Reset enumerators
-                this.sourceEnumerator = null;
-
-                this.currentDiscoveryDataAggregator = null;
-                this.currentDiscoveryEventsHandler = null;
-
-                // Dispose concurrent executors
-                this.UpdateParallelLevel(0);
-
-                return true;
+                // Create multiple source batches, each having one source, so each testhost will end up running one source.
+                sourceBatches = group.Select(w => new[] { w.Work }).ToList();
             }
 
-            /*  Discovery is not complete.
-                Now when both.net framework and.net core projects can run in parallel
-                we should clear manager and create new one for both cases.
-                Otherwise `proxyDiscoveryManager` instance is alredy closed by now and it will give exception
-                when trying to do some operation on it.
-            */
-            if (EqtTrace.IsVerboseEnabled)
+            foreach (var sourcesToDiscover in sourceBatches)
             {
-                EqtTrace.Verbose("ParallelProxyDiscoveryManager: HandlePartialDiscoveryComplete: Replace discovery manager. Shared: {0}, Aborted: {1}.", this.SharedHosts, isAborted);
+                var updatedCriteria = NewDiscoveryCriteriaFromSourceAndSettings(sourcesToDiscover, discoveryCriteria, testhostProviderInfo.RunSettings);
+                var workload = new ProviderSpecificWorkload<DiscoveryCriteria>(updatedCriteria, testhostProviderInfo);
+                workloads.Add(workload);
             }
+        }
 
-            this.RemoveManager(proxyDiscoveryManager);
+        return workloads;
 
-            proxyDiscoveryManager = this.CreateNewConcurrentManager();
-            var parallelEventsHandler = new ParallelDiscoveryEventsHandler(
-                                           this.requestData,
-                                           proxyDiscoveryManager,
-                                           this.currentDiscoveryEventsHandler,
-                                           this,
-                                           this.currentDiscoveryDataAggregator);
-            this.AddManager(proxyDiscoveryManager, parallelEventsHandler);
+        static DiscoveryCriteria NewDiscoveryCriteriaFromSourceAndSettings(IEnumerable<string> sources, DiscoveryCriteria discoveryCriteria, string? runsettingsXml)
+        {
+            var criteria = new DiscoveryCriteria(
+                sources,
+                discoveryCriteria.FrequencyOfDiscoveredTestsEvent,
+                discoveryCriteria.DiscoveredTestEventTimeout,
+                runsettingsXml,
+                discoveryCriteria.TestSessionInfo
+            );
 
-            // Second, let's attempt to trigger discovery for the next source.
-            this.DiscoverTestsOnConcurrentManager(proxyDiscoveryManager);
+            criteria.TestCaseFilter = discoveryCriteria.TestCaseFilter;
 
-            return false;
+            return criteria;
         }
+    }
 
-        #endregion
-
-        private void DiscoverTestsPrivate(ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    /// <summary>
+    /// Triggers the discovery for the next data object on the concurrent discoverer
+    /// Each concurrent discoverer calls this method, once its completed working on previous data
+    /// </summary>
+    /// <param name="proxyDiscoveryManager">Proxy discovery manager instance.</param>
+    /// <param name="eventHandler">Discovery events handler.</param>
+    /// <param name="discoveryCriteria">Discovery criteria a parameters.</param>
+    private Task InitializeDiscoverTestsOnConcurrentManager(IProxyDiscoveryManager proxyDiscoveryManager, ITestDiscoveryEventsHandler2 eventHandler, DiscoveryCriteria discoveryCriteria)
+    {
+        // Kick off another discovery task for the next source
+        return Task.Run(() =>
         {
-            this.currentDiscoveryEventsHandler = discoveryEventsHandler;
+            EqtTrace.Verbose("ProxyParallelDiscoveryManager.InitializeDiscoverTestsOnConcurrentManager: Discovery preparation started.");
 
-            // Reset the discovery complete data
-            this.discoveryCompletedClients = 0;
+            proxyDiscoveryManager.Initialize(_skipDefaultAdapters);
+            proxyDiscoveryManager.InitializeDiscovery(discoveryCriteria, eventHandler, _skipDefaultAdapters);
 
-            // One data aggregator per parallel discovery
-            this.currentDiscoveryDataAggregator = new ParallelDiscoveryDataAggregator();
+            EqtTrace.Verbose($"ProxyParallelDiscoveryManager.InitializeDiscoverTestsOnConcurrentManager: Init only: {string.Join(", ", discoveryCriteria.Sources)}");
+        });
+    }
 
-            foreach (var concurrentManager in this.GetConcurrentManagerInstances())
-            {
-                var parallelEventsHandler = new ParallelDiscoveryEventsHandler(
-                                                this.requestData,
-                                                concurrentManager,
-                                                discoveryEventsHandler,
-                                                this,
-                                                this.currentDiscoveryDataAggregator);
-
-                this.UpdateHandlerForManager(concurrentManager, parallelEventsHandler);
-                this.DiscoverTestsOnConcurrentManager(concurrentManager);
-            }
+    /// <summary>
+    /// Triggers the discovery for the next data object on the concurrent discoverer
+    /// Each concurrent discoverer calls this method, once its completed working on previous data
+    /// </summary>
+    /// <param name="proxyDiscoveryManager"></param>
+    /// <param name="eventHandler"></param>
+    /// <param name="discoveryCriteria"></param>
+    /// <param name="initialized"></param>
+    /// <param name="task"></param>
+    private void DiscoverTestsOnConcurrentManager(
+        IProxyDiscoveryManager proxyDiscoveryManager,
+        ITestDiscoveryEventsHandler2 eventHandler,
+        DiscoveryCriteria discoveryCriteria,
+        bool initialized,
+        Task? task)
+    {
+        // If we do the scheduling incorrectly this will get null. It should not happen, but it has happened before.
+        if (discoveryCriteria == null)
+        {
+            throw new ArgumentNullException(nameof(discoveryCriteria));
         }
 
-        /// <summary>
-        /// Triggers the discovery for the next data object on the concurrent discoverer
-        /// Each concurrent discoverer calls this method, once its completed working on previous data
-        /// </summary>
-        /// <param name="ProxyDiscoveryManager">Proxy discovery manager instance.</param>
-        private void DiscoverTestsOnConcurrentManager(IProxyDiscoveryManager proxyDiscoveryManager)
-        {
-            // Peek to see if we have sources to trigger a discovery
-            if (this.TryFetchNextSource(this.sourceEnumerator, out string nextSource))
+        // Kick off another discovery task for the next source
+        Task.Run(() =>
             {
-                if (EqtTrace.IsVerboseEnabled)
+                EqtTrace.Verbose("ParallelProxyDiscoveryManager: Discovery started.");
+                if (!initialized)
                 {
-                    EqtTrace.Verbose("ProxyParallelDiscoveryManager: Triggering test discovery for next source: {0}", nextSource);
+                    EqtTrace.Verbose($"ProxyParallelDiscoveryManager.DiscoverTestsOnConcurrentManager: Initialize right before run: {string.Join(", ", discoveryCriteria.Sources)}");
+                    proxyDiscoveryManager.Initialize(_skipDefaultAdapters);
+                    proxyDiscoveryManager.InitializeDiscovery(discoveryCriteria, eventHandler, _skipDefaultAdapters);
+                }
+                else
+                {
+                    task?.Wait();
                 }
 
-                // Kick off another discovery task for the next source
-                var discoveryCriteria = new DiscoveryCriteria(new[] { nextSource }, this.actualDiscoveryCriteria.FrequencyOfDiscoveredTestsEvent, this.actualDiscoveryCriteria.DiscoveredTestEventTimeout, this.actualDiscoveryCriteria.RunSettings);
-                discoveryCriteria.TestCaseFilter = this.actualDiscoveryCriteria.TestCaseFilter;
-                Task.Run(() =>
-                    {
-                        if (EqtTrace.IsVerboseEnabled)
-                        {
-                            EqtTrace.Verbose("ParallelProxyDiscoveryManager: Discovery started.");
-                        }
-
-                        proxyDiscoveryManager.DiscoverTests(discoveryCriteria, this.GetHandlerForGivenManager(proxyDiscoveryManager));
-                    })
-                    .ContinueWith(t =>
-                    {
-                        // Just in case, the actual discovery couldn't start for an instance. Ensure that
-                        // we call discovery complete since we have already fetched a source. Otherwise
-                        // discovery will not terminate
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error("ParallelProxyDiscoveryManager: Failed to trigger discovery. Exception: " + t.Exception);
-                        }
-
-                        var handler = this.GetHandlerForGivenManager(proxyDiscoveryManager);
-                        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = t.Exception.ToString() };
-                        handler.HandleRawMessage(this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
-                        handler.HandleLogMessage(TestMessageLevel.Error, t.Exception.ToString());
-
-                        // Send discovery complete. Similar logic is also used in ProxyDiscoveryManager.DiscoverTests.
-                        // Differences:
-                        // Total tests must be zero here since parallel discovery events handler adds the count
-                        // Keep `lastChunk` as null since we don't want a message back to the IDE (discovery didn't even begin)
-                        // Set `isAborted` as true since we want this instance of discovery manager to be replaced
-                        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(-1, true);
-                        handler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
-                    },
-                    TaskContinuationOptions.OnlyOnFaulted);
-            }
+                EqtTrace.Verbose($"ProxyParallelDiscoveryManager.DiscoverTestsOnConcurrentManager: Run: {string.Join(", ", discoveryCriteria.Sources)}");
+                proxyDiscoveryManager.DiscoverTests(discoveryCriteria, eventHandler);
+            }).ContinueWith(t => HandleError(eventHandler, t), TaskContinuationOptions.OnlyOnFaulted);
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("ProxyParallelDiscoveryManager: No sources available for discovery.");
-            }
+        EqtTrace.Verbose("ProxyParallelDiscoveryManager.DiscoverTestsOnConcurrentManager: No sources available for discovery.");
+    }
+
+    private void HandleError(ITestDiscoveryEventsHandler2 eventHandler, Task t)
+    {
+        // Just in case, the actual discovery couldn't start for an instance. Ensure that
+        // we call discovery complete since we have already fetched a source. Otherwise
+        // discovery will not terminate
+        EqtTrace.Error("ParallelProxyDiscoveryManager: Failed to trigger discovery. Exception: " + t.Exception);
+
+        var handler = eventHandler;
+        var exceptionString = t.Exception?.ToString();
+        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = exceptionString };
+        handler.HandleRawMessage(_dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
+        handler.HandleLogMessage(TestMessageLevel.Error, exceptionString);
+
+        // Send discovery complete. Similar logic is also used in ProxyDiscoveryManager.DiscoverTests.
+        // Differences:
+        // Total tests must be zero here since parallel discovery events handler adds the count
+        // Keep `lastChunk` as null since we don't want a message back to the IDE (discovery didn't even begin)
+        // Set `isAborted` as true since we want this instance of discovery manager to be replaced
+        // TODO: the comment above mentions 0 tests but sends -1. Make sense of this.
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(-1, true);
+        handler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
+    }
+
+    public void InitializeDiscovery(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler, bool skipDefaultAdapters)
+    {
+        // Leaving this empty as it is not really relevant to the parallel proxy managers.
+        // The idea of pre-initializing the test run makes sense only for single proxies like
+        // ProxyExecutionManager or ProxyDiscoveryManager.
+    }
+
+    public void Dispose()
+    {
+        if (!_isDisposed)
+        {
+            _parallelOperationManager.Dispose();
+            _isDisposed = true;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs
index d5cc0cecb4..c020d44d85 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs
@@ -1,360 +1,520 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+
+/// <summary>
+/// ParallelProxyExecutionManager that manages parallel execution
+/// </summary>
+internal sealed class ParallelProxyExecutionManager : IParallelProxyExecutionManager, IDisposable
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly bool _isParallel;
+    private readonly int _parallelLevel;
+    private readonly ParallelOperationManager<IProxyExecutionManager, IInternalTestRunEventsHandler, TestRunCriteria> _parallelOperationManager;
+    private readonly Dictionary<string, TestRuntimeProviderInfo> _sourceToTestHostProviderMap;
 
-    /// <summary>
-    /// ParallelProxyExecutionManager that manages parallel execution
-    /// </summary>
-    internal class ParallelProxyExecutionManager : ParallelOperationManager<IProxyExecutionManager, ITestRunEventsHandler>, IParallelProxyExecutionManager
-    {
-        private IDataSerializer dataSerializer;
+    private bool _isDisposed;
 
-        #region TestRunSpecificData
+    #region TestRunSpecificData
 
-        // This variable id to differentiate between implicit (abort requested by testPlatform) and explicit (test host aborted) abort.
-        private bool abortRequested = false;
+    // This variable id to differentiate between implicit (abort requested by testPlatform) and explicit (test host aborted) abort.
+    private bool _abortRequested;
 
-        private int runCompletedClients = 0;
-        private int runStartedClients = 0;
-        private int availableTestSources = -1;
+    private int _runCompletedClients;
+    private int _runStartedClients;
+    private int _availableWorkloads = -1;
 
-        private TestRunCriteria actualTestRunCriteria;
+    private ParallelRunDataAggregator? _currentRunDataAggregator;
 
-        private IEnumerator<string> sourceEnumerator;
+    private readonly IRequestData _requestData;
+    private bool _skipDefaultAdapters;
 
-        private IEnumerator testCaseListEnumerator;
+    /// <inheritdoc/>
+    public bool IsInitialized { get; private set; }
 
-        private bool hasSpecificTestsRun = false;
+    #endregion
 
-        private ITestRunEventsHandler currentRunEventsHandler;
+    #region Concurrency Keeper Objects
 
-        private ParallelRunDataAggregator currentRunDataAggregator;
+    /// <summary>
+    /// LockObject to update execution status in parallel
+    /// </summary>
+    private readonly object _executionStatusLockObject = new();
 
-        private IRequestData requestData;
-        private bool skipDefaultAdapters;
+    #endregion
 
-        /// <inheritdoc/>
-        public bool IsInitialized { get; private set; } = false;
+    public ParallelProxyExecutionManager(
+        IRequestData requestData,
+        Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> actualProxyManagerCreator,
+        int parallelLevel,
+         List<TestRuntimeProviderInfo> testHostProviders)
+        : this(requestData, actualProxyManagerCreator, JsonDataSerializer.Instance, parallelLevel, testHostProviders)
+    {
+    }
 
-        #endregion
+    internal ParallelProxyExecutionManager(
+        IRequestData requestData,
+        Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> actualProxyManagerCreator,
+        IDataSerializer dataSerializer,
+        int parallelLevel,
+        List<TestRuntimeProviderInfo> testHostProviders)
+    {
+        _requestData = requestData;
+        _dataSerializer = dataSerializer;
+        _isParallel = parallelLevel > 1;
+        _parallelLevel = parallelLevel;
+        _parallelOperationManager = new(actualProxyManagerCreator, parallelLevel);
+        _sourceToTestHostProviderMap = testHostProviders
+            .SelectMany(provider => provider.SourceDetails.Select(s => new KeyValuePair<string, TestRuntimeProviderInfo>(s.Source!, provider)))
+            .ToDictionary(pair => pair.Key, pair => pair.Value);
+    }
 
-        #region Concurrency Keeper Objects
+    public void Initialize(bool skipDefaultAdapters)
+    {
+        _skipDefaultAdapters = skipDefaultAdapters;
+    }
 
-        /// <summary>
-        /// LockObject to update execution status in parallel
-        /// </summary>
-        private readonly object executionStatusLockObject = new object();
+    public int StartTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        var workloads = SplitToWorkloads(testRunCriteria, _sourceToTestHostProviderMap);
+        var runnableWorkloads = workloads.Where(workload => workload.HasProvider).ToList();
+        var nonRunnableWorkloads = workloads.Where(workload => !workload.HasProvider).ToList();
 
-        #endregion
+        _availableWorkloads = runnableWorkloads.Count;
 
-        public ParallelProxyExecutionManager(IRequestData requestData, Func<IProxyExecutionManager> actualProxyManagerCreator, int parallelLevel)
-            : this(requestData, actualProxyManagerCreator, JsonDataSerializer.Instance, parallelLevel, true)
-        {
-        }
+        EqtTrace.Verbose("ParallelProxyExecutionManager: Start execution. Total sources: " + _availableWorkloads);
 
-        public ParallelProxyExecutionManager(IRequestData requestData, Func<IProxyExecutionManager> actualProxyManagerCreator, int parallelLevel, bool sharedHosts)
-            : this(requestData, actualProxyManagerCreator, JsonDataSerializer.Instance, parallelLevel, sharedHosts)
-        {
-        }
+        // Reset the run complete data
+        _runCompletedClients = 0;
 
-        internal ParallelProxyExecutionManager(IRequestData requestData, Func<IProxyExecutionManager> actualProxyManagerCreator, IDataSerializer dataSerializer, int parallelLevel, bool sharedHosts)
-            : base(actualProxyManagerCreator, parallelLevel, sharedHosts)
+        // One data aggregator per parallel run
+        TPDebug.Assert(testRunCriteria.TestRunSettings is not null, "testRunCriteria.TestRunSettings is null");
+        _currentRunDataAggregator = new ParallelRunDataAggregator(testRunCriteria.TestRunSettings);
+        if (nonRunnableWorkloads.Count > 0)
         {
-            this.requestData = requestData;
-            this.dataSerializer = dataSerializer;
+            // TODO: in strict mode fail if we find a source that we cannot run.
+            // _currentRunDataAggregator.MarkAsAborted();
         }
 
-        #region IProxyExecutionManager
+        _parallelOperationManager.StartWork(runnableWorkloads, eventHandler, GetParallelEventHandler, PrepareTestRunOnConcurrentManager, StartTestRunOnConcurrentManager);
 
-        public void Initialize(bool skipDefaultAdapters)
-        {
-            this.skipDefaultAdapters = skipDefaultAdapters;
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(skipDefaultAdapters), doActionsInParallel: true);
-            this.IsInitialized = true;
-        }
+        // Why 1? Because this is supposed to be a processId, and that is just the default that was chosen by someone before me,
+        // and maybe is checked somewhere, but I don't see it checked in our codebase.
+        return 1;
+    }
 
-        public int StartTestRun(TestRunCriteria testRunCriteria, ITestRunEventsHandler eventHandler)
-        {
-            this.hasSpecificTestsRun = testRunCriteria.HasSpecificTests;
-            this.actualTestRunCriteria = testRunCriteria;
+    public void Abort(IInternalTestRunEventsHandler runEventsHandler)
+    {
+        // Test platform initiated abort.
+        _abortRequested = true;
+        _parallelOperationManager.DoActionOnAllManagers((proxyManager) => proxyManager.Abort(runEventsHandler), doActionsInParallel: true);
+    }
 
-            if (this.hasSpecificTestsRun)
-            {
-                var testCasesBySource = new Dictionary<string, List<TestCase>>();
-                foreach (var test in testRunCriteria.Tests)
-                {
-                    if (!testCasesBySource.ContainsKey(test.Source))
-                    {
-                        testCasesBySource.Add(test.Source, new List<TestCase>());
-                    }
+    public void Cancel(IInternalTestRunEventsHandler runEventsHandler)
+    {
+        _parallelOperationManager.DoActionOnAllManagers((proxyManager) => proxyManager.Cancel(runEventsHandler), doActionsInParallel: true);
+    }
 
-                    testCasesBySource[test.Source].Add(test);
-                }
+    public void Close()
+    {
+        _parallelOperationManager.DoActionOnAllManagers(proxyManager => proxyManager.Close(), doActionsInParallel: true);
+    }
 
-                // Do not use "Dictionary.ValueCollection.Enumerator" - it becomes nondeterministic once we go out of scope of this method
-                // Use "ToArray" to copy ValueColleciton to a simple array and use it's enumerator
-                // Set the enumerator for parallel yielding of testCases
-                // Whenever a concurrent executor becomes free, it picks up the next set of testCases using this enumerator
-                var testCaseLists = testCasesBySource.Values.ToArray();
-                this.testCaseListEnumerator = testCaseLists.GetEnumerator();
-                this.availableTestSources = testCaseLists.Length;
-            }
-            else
-            {
-                // Set the enumerator for parallel yielding of sources
-                // Whenever a concurrent executor becomes free, it picks up the next source using this enumerator
-                this.sourceEnumerator = testRunCriteria.Sources.GetEnumerator();
-                this.availableTestSources = testRunCriteria.Sources.Count();
-            }
+    /// <inheritdoc/>
+    public bool HandlePartialRunComplete(
+        IProxyExecutionManager proxyExecutionManager,
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        var allRunsCompleted = false;
+        // TODO: Interlocked.Increment _runCompletedClients, and the condition on the bottom probably does not need to be under lock??
+        lock (_executionStatusLockObject)
+        {
+            // Each concurrent Executor calls this method
+            // So, we need to keep track of total run complete calls
+            _runCompletedClients++;
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("ParallelProxyExecutionManager: Start execution. Total sources: " + this.availableTestSources);
-            }
-            return this.StartTestRunPrivate(eventHandler);
+            allRunsCompleted = testRunCompleteArgs.IsCanceled || _abortRequested
+                ? _runCompletedClients == _runStartedClients
+                : _runCompletedClients == _availableWorkloads;
+
+            EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: Total workloads = {0}, Total started clients = {1} Total completed clients = {2}, Run complete = {3}, Run canceled: {4}.", _availableWorkloads, _runStartedClients, _runCompletedClients, allRunsCompleted, testRunCompleteArgs.IsCanceled);
         }
 
-        public void Abort(ITestRunEventsHandler runEventsHandler)
+        if (allRunsCompleted)
         {
-            // Test platform initiated abort.
-            abortRequested = true;
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Abort(runEventsHandler), doActionsInParallel: true);
+            EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: All runs completed stopping all managers.");
+            _parallelOperationManager.StopAllManagers();
+            return true;
         }
 
-        public void Cancel(ITestRunEventsHandler runEventsHandler)
+        // If cancel is triggered for any one run or abort is requested by test platform, there is no reason to fetch next source
+        // and queue another test run.
+        if (!testRunCompleteArgs.IsCanceled && !_abortRequested)
         {
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Cancel(runEventsHandler), doActionsInParallel: true);
+            // Do NOT return true here, there should be only one place where this method returns true,
+            // and cancellation or success or any other other combination or timing should result in only one true.
+            // This is largely achieved by returning true above when "allRunsCompleted" is true. That variable is true
+            // when we cancel all sources or when we complete all sources.
+            //
+            // But we can also start a source, and cancel right after, which will remove all managers, and RunNextWork returns
+            // false, because we had no more work to do. If we check that result here and return true, then the whole logic is
+            // broken and we end up calling RunComplete handlers twice and writing logger output to screen twice. So don't do it.
+            // var hadMoreWork = _parallelOperationManager.RunNextWork(proxyExecutionManager);
+            // if (!hadMoreWork)
+            // {
+            //     return true;
+            // }
+            EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: Not cancelled or aborted, running next work.");
+            var _ = _parallelOperationManager.RunNextWork(proxyExecutionManager);
         }
-
-        public void Close()
+        else
         {
-            this.DoActionOnAllManagers(proxyManager => proxyManager.Close(), doActionsInParallel: true);
+            EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: Cancelled or aborted, not running next work.");
         }
 
-        #endregion
-
-        #region IParallelProxyExecutionManager methods
-
-        /// <summary>
-        /// Handles Partial Run Complete event coming from a specific concurrent proxy execution manager
-        /// Each concurrent proxy execution manager will signal the parallel execution manager when its complete
-        /// </summary>
-        /// <param name="proxyExecutionManager">Concurrent Execution manager that completed the run</param>
-        /// <param name="testRunCompleteArgs">RunCompleteArgs for the concurrent run</param>
-        /// <param name="lastChunkArgs">LastChunk testresults for the concurrent run</param>
-        /// <param name="runContextAttachments">RunAttachments for the concurrent run</param>
-        /// <param name="executorUris">ExecutorURIs of the adapters involved in executing the tests</param>
-        /// <returns>True if parallel run is complete</returns>
-        public bool HandlePartialRunComplete(
-            IProxyExecutionManager proxyExecutionManager,
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
+        return false;
+    }
+
+    /// <summary>
+    ///  Split the incoming work into smaller workloads that we can run on different testhosts.
+    ///  Each workload is associated with a type of provider that can run it.
+    /// </summary>
+    /// <param name="testRunCriteria"></param>
+    /// <param name="sourceToTestHostProviderMap"></param>
+    /// <returns></returns>
+    private List<ProviderSpecificWorkload<TestRunCriteria>> SplitToWorkloads(TestRunCriteria testRunCriteria, Dictionary<string, TestRuntimeProviderInfo> sourceToTestHostProviderMap)
+    {
+        // We split the work to workloads that will run on each testhost, and add all of them
+        // to a bag of work that needs to be processed. (The workloads are just
+        // a single source, multiple sources, or all test cases for a given source.)
+        //
+        // For every workload we associated a given type of testhost that can run the work.
+        // This is important when we have shared testhosts.
+        //
+        // We then start as many instances of testhost as we are allowed by parallel level,
+        // and we start sending them work. Once any testhost is done processing a given workload,
+        // we will get notified with the completed event for the work we are doing. For example for StartTestRun
+        // we will get TestExecutionCompleted, and we will call HandlePartialTestExecutionComplete.
+        // (The "partial" here refers to possibly having more work in the work bag. It does not mean that
+        // there was an error in the testhost and we only did part of execution.).
+        //
+        // At that point we know that at least one testhost is not busy doing work anymore. It either
+        // processed the workload and waits for another one, or it crashed and we should move to
+        // another source.
+        //
+        // In the "partial" step we check if we have more workloads, and if the currently running testhost
+        // is shared we try to find a workload that is appropriate for it. If we don't find any work that the
+        // running testhost can do. Or if the testhost already exited (possibly because of crash), we start another one
+        // and give it the next workload.
+
+
+        // List all the sources (dlls) we have and group them by their provider, so we can run either multiple sources
+        // on a single instance of the appropriate testhost (for non-paralell, shared),
+        // or each source in its own instance of the provider
+        // (for non-parallel, non-shared, and both parallel shared, and parallel non-shared).
+        //
+        // We prefer running more work in parallel when we can, because doing work on 10 testhosts in
+        // parallel is faster than doing the same work on 1 testhost. Even when the sources to discover
+        // contain just a few tests.
+        List<ProviderSpecificWorkload<TestRunCriteria>> workloads = new();
+        if (testRunCriteria.HasSpecificTests)
         {
-            var allRunsCompleted = false;
-            lock (this.executionStatusLockObject)
+            // We get the expected number of hosts to use to run tests
+            int? numberOfTestHostToUse = TestEngine.GetTargetFrameworkTestHostDemultiplexer(testRunCriteria.TestRunSettings);
+
+            // We split test cases to their respective sources, and associate them with additional info about on
+            // which type of provider they can run so we can later select the correct workload for the provider
+            // if we already have a shared provider running, that can take more sources.
+            Dictionary<string, TestCase[]> sourceToTestCasesMap = testRunCriteria.Tests.GroupBy(t => t.Source).ToDictionary(k => k.Key, v => v.ToArray());
+
+            var sources = sourceToTestCasesMap.Keys;
+            // Each source is grouped with its respective provider.
+            var providerGroups = sources.Select(source => new ProviderSpecificWorkload<string>(source, sourceToTestHostProviderMap[source])).GroupBy(psw => psw.Provider);
+
+            foreach (var group in providerGroups)
             {
-                // Each concurrent Executor calls this method 
-                // So, we need to keep track of total run complete calls
-                this.runCompletedClients++;
+                var testhostProviderInfo = group.Key;
 
-                if (testRunCompleteArgs.IsCanceled || abortRequested)
+                List<TestCase[]> testCaseBatches;
+                if (!_isParallel && testhostProviderInfo.Shared)
                 {
-                    allRunsCompleted = this.runCompletedClients == this.runStartedClients;
+                    // Create one big batch of testcases that will be single workload for single testhost.
+                    testCaseBatches = [group.SelectMany(w => sourceToTestCasesMap[w.Work]).ToArray()];
                 }
                 else
                 {
-                    allRunsCompleted = this.runCompletedClients == this.availableTestSources;
+                    // Create multiple testcase batches, each having set of testcases from single source,
+                    // so each testhost will end up running one source.
+                    testCaseBatches = group.Select(w => sourceToTestCasesMap[w.Work]).ToList();
+                    if (numberOfTestHostToUse is not null)
+                    {
+                        if (numberOfTestHostToUse > _parallelLevel)
+                        {
+                            EqtTrace.Warning($"ParallelProxyExecutionManager: adjust the numberOfTestHostToUse to the max parallel level, from {numberOfTestHostToUse} to {_parallelLevel}");
+                            // Adjust to the maximum parallel level
+                            numberOfTestHostToUse = _parallelLevel;
+                        }
+
+                        // Simple round robin distribution
+                        var testCases = testCaseBatches.SelectMany(tcb => tcb).ToList();
+                        var groups = new List<List<TestCase>>();
+                        for (int i = 0; i < numberOfTestHostToUse.Value; i++)
+                        {
+                            groups.Add(new List<TestCase>());
+                        }
+
+                        for (var i = 0; i < testCases.Count; i++)
+                        {
+                            groups[i % numberOfTestHostToUse.Value].Add(testCases[i]);
+                        }
+
+                        testCaseBatches = groups.Where(g => g.Count > 0).Select(g => g.ToArray()).ToList();
+                    }
                 }
 
-                if (EqtTrace.IsVerboseEnabled)
+                foreach (var testCases in testCaseBatches)
                 {
-                    EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: Total completed clients = {0}, Run complete = {1}, Run canceled: {2}.", this.runCompletedClients, allRunsCompleted, testRunCompleteArgs.IsCanceled);
+                    var runsettings = testhostProviderInfo.RunSettings;
+                    var updatedCriteria = CreateTestRunCriteriaFromTestCasesAndSettings(testCases, testRunCriteria, runsettings);
+                    var workload = new ProviderSpecificWorkload<TestRunCriteria>(updatedCriteria, testhostProviderInfo);
+                    workloads.Add(workload);
                 }
             }
+        }
+        else
+        {
+            TPDebug.Assert(testRunCriteria.Sources is not null, "testRunCriteria.Sources is null");
+            // Each source is grouped with its respective provider.
+            var providerGroups = testRunCriteria.Sources
+                .Select(source => new ProviderSpecificWorkload<string>(source, sourceToTestHostProviderMap[source]))
+                .GroupBy(psw => psw.Provider);
 
-            // verify that all executors are done with the execution and there are no more sources/testcases to execute
-            if (allRunsCompleted)
+            foreach (var group in providerGroups)
             {
-                // Reset enumerators
-                this.sourceEnumerator = null;
-                this.testCaseListEnumerator = null;
-
-                this.currentRunDataAggregator = null;
-                this.currentRunEventsHandler = null;
-
-                // Dispose concurrent executors
-                // Do not do the cleanup task in the current thread as we will unnecessarily add to execution time
-                this.UpdateParallelLevel(0);
-
-                return true;
-            }
+                var testhostProviderInfo = group.Key;
 
+                List<string[]> sourceBatches;
+                if (!_isParallel && testhostProviderInfo.Shared)
+                {
+                    // Create one big source batch that will be single workload for single testhost.
+                    sourceBatches = [group.Select(w => w.Work).ToArray()];
+                }
+                else
+                {
+                    // Create multiple source batches, each having one source, so each testhost will end up running one source.
+                    sourceBatches = group.Select(w => new[] { w.Work }).ToList();
+                }
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("ParallelProxyExecutionManager: HandlePartialRunComplete: Replace execution manager. Shared: {0}, Aborted: {1}.", this.SharedHosts, testRunCompleteArgs.IsAborted);
+                foreach (var sourcesToRun in sourceBatches)
+                {
+                    var runsettings = testhostProviderInfo.RunSettings;
+                    var updatedCriteria = CreateTestRunCriteriaFromSourceAndSettings(sourcesToRun, testRunCriteria, runsettings);
+                    var workload = new ProviderSpecificWorkload<TestRunCriteria>(updatedCriteria, testhostProviderInfo);
+                    workloads.Add(workload);
+                }
             }
+        }
 
-            this.RemoveManager(proxyExecutionManager);
-            proxyExecutionManager = CreateNewConcurrentManager();
-            var parallelEventsHandler = this.GetEventsHandler(proxyExecutionManager);
-            this.AddManager(proxyExecutionManager, parallelEventsHandler);
+        return workloads;
 
-            // If cancel is triggered for any one run or abort is requested by test platform, there is no reason to fetch next source
-            // and queue another test run
-            if (!testRunCompleteArgs.IsCanceled && !abortRequested)
-            {
-                this.StartTestRunOnConcurrentManager(proxyExecutionManager);
-            }
+        TestRunCriteria CreateTestRunCriteriaFromTestCasesAndSettings(IEnumerable<TestCase> testCases, TestRunCriteria criteria, string? runsettingsXml)
+        {
+            return new TestRunCriteria(
+                 testCases,
+                 testRunCriteria.FrequencyOfRunStatsChangeEvent,
+                 testRunCriteria.KeepAlive,
+                 runsettingsXml,
+                 testRunCriteria.RunStatsChangeEventTimeout,
+                 testRunCriteria.TestHostLauncher,
+                 testRunCriteria.TestSessionInfo,
+                 testRunCriteria.DebugEnabledForTestSession);
+        }
 
-            return false;
+        TestRunCriteria CreateTestRunCriteriaFromSourceAndSettings(IEnumerable<string> sources, TestRunCriteria criteria, string? runsettingsXml)
+        {
+            return new TestRunCriteria(
+                 sources,
+                 testRunCriteria.FrequencyOfRunStatsChangeEvent,
+                 testRunCriteria.KeepAlive,
+                 runsettingsXml,
+                 testRunCriteria.RunStatsChangeEventTimeout,
+                 testRunCriteria.TestHostLauncher,
+                 testRunCriteria.TestCaseFilter,
+                 testRunCriteria.FilterOptions,
+                 testRunCriteria.TestSessionInfo,
+                 testRunCriteria.DebugEnabledForTestSession);
         }
+    }
 
-        #endregion
+    private ParallelRunEventsHandler GetParallelEventHandler(IInternalTestRunEventsHandler eventHandler, IProxyExecutionManager concurrentManager)
+    {
+        TPDebug.Assert(_currentRunDataAggregator is not null, "_currentRunDataAggregator is null");
 
-        private int StartTestRunPrivate(ITestRunEventsHandler runEventsHandler)
+        if (concurrentManager is ProxyExecutionManagerWithDataCollection concurrentManagerWithDataCollection)
         {
-            this.currentRunEventsHandler = runEventsHandler;
-
-            // Reset the run complete data
-            this.runCompletedClients = 0;
+            var attachmentsProcessingManager = new TestRunAttachmentsProcessingManager(TestPlatformEventSource.Instance, new DataCollectorAttachmentsProcessorsFactory());
+
+            return new ParallelDataCollectionEventsHandler(
+                _requestData,
+                concurrentManagerWithDataCollection,
+                eventHandler,
+                this,
+                _currentRunDataAggregator,
+                attachmentsProcessingManager,
+                concurrentManagerWithDataCollection.CancellationToken);
+        }
 
-            // One data aggregator per parallel run
-            this.currentRunDataAggregator = new ParallelRunDataAggregator();
+        return new ParallelRunEventsHandler(
+            _requestData,
+            concurrentManager,
+            eventHandler,
+            this,
+            _currentRunDataAggregator);
+    }
 
-            foreach (var concurrentManager in this.GetConcurrentManagerInstances())
+    private Task PrepareTestRunOnConcurrentManager(IProxyExecutionManager proxyExecutionManager, IInternalTestRunEventsHandler eventHandler, TestRunCriteria testRunCriteria)
+    {
+        return Task.Run(() =>
+        {
+            if (!proxyExecutionManager.IsInitialized)
             {
-                var parallelEventsHandler = this.GetEventsHandler(concurrentManager);
-                this.UpdateHandlerForManager(concurrentManager, parallelEventsHandler);
-                this.StartTestRunOnConcurrentManager(concurrentManager);
+                proxyExecutionManager.Initialize(_skipDefaultAdapters);
             }
 
-            return 1;
-        }
+            // NOTE: No need to increment the number of started clients on initialization since the
+            // client doesn't really count as started unless some work is done on it. Incrementing
+            // the number of clients will result in failing acceptance tests because they expect all
+            // clients to be done running their workloads when aborting/cancelling and that doesn't
+            // happen with an initialized workload that is never run.
+            //
+            // Interlocked.Increment(ref _runStartedClients); <- BUG: Is this a bug waiting to happen for pre-started hosts?
+            proxyExecutionManager.InitializeTestRun(testRunCriteria, eventHandler);
+        });
+    }
 
-        private ParallelRunEventsHandler GetEventsHandler(IProxyExecutionManager concurrentManager)
+    /// <summary>
+    /// Triggers the execution for the next data object on the concurrent executor
+    /// Each concurrent executor calls this method, once its completed working on previous data
+    /// </summary>
+    /// <returns>True, if execution triggered</returns>
+    private void StartTestRunOnConcurrentManager(
+        IProxyExecutionManager proxyExecutionManager,
+        IInternalTestRunEventsHandler eventHandler,
+        TestRunCriteria testRunCriteria,
+        bool initialized,
+        Task? initTask)
+    {
+        // If we do the scheduling incorrectly this will get null. It should not happen, but it has happened before.
+        if (testRunCriteria == null)
         {
-            if (concurrentManager is ProxyExecutionManagerWithDataCollection)
-            {
-                var concurrentManagerWithDataCollection = concurrentManager as ProxyExecutionManagerWithDataCollection;
-
-                // TODO : use TestPluginCache to iterate over all IDataCollectorAttachments
-                var attachmentsProcessingManager = new TestRunAttachmentsProcessingManager(TestPlatformEventSource.Instance, new CodeCoverageDataAttachmentsHandler());
-
-                return new ParallelDataCollectionEventsHandler(
-                            this.requestData,
-                            concurrentManagerWithDataCollection,
-                            this.currentRunEventsHandler,
-                            this,
-                            this.currentRunDataAggregator,
-                            attachmentsProcessingManager,
-                            concurrentManagerWithDataCollection.CancellationToken);
-            }
-
-            return new ParallelRunEventsHandler(
-                        this.requestData,
-                        concurrentManager,
-                        this.currentRunEventsHandler,
-                        this,
-                        this.currentRunDataAggregator);
+            throw new ArgumentNullException(nameof(testRunCriteria));
         }
 
-        /// <summary>
-        /// Triggers the execution for the next data object on the concurrent executor
-        /// Each concurrent executor calls this method, once its completed working on previous data
-        /// </summary>
-        /// <param name="proxyExecutionManager">Proxy execution manager instance.</param>
-        /// <returns>True, if execution triggered</returns>
-        private void StartTestRunOnConcurrentManager(IProxyExecutionManager proxyExecutionManager)
-        {
-            TestRunCriteria testRunCriteria = null;
-            if (!this.hasSpecificTestsRun)
-            {
-                if (this.TryFetchNextSource(this.sourceEnumerator, out string nextSource))
-                {
-                    EqtTrace.Info("ProxyParallelExecutionManager: Triggering test run for next source: {0}", nextSource);
-                    testRunCriteria = new TestRunCriteria(new[] { nextSource }, this.actualTestRunCriteria);
-                }
-            }
-            else
+        Task.Run(() =>
             {
-                if (this.TryFetchNextSource(this.testCaseListEnumerator, out List<TestCase> nextSetOfTests))
+                if (!initialized)
                 {
-                    EqtTrace.Info("ProxyParallelExecutionManager: Triggering test run for next source: {0}", nextSetOfTests?.FirstOrDefault()?.Source);
-                    testRunCriteria = new TestRunCriteria(nextSetOfTests, this.actualTestRunCriteria);
-                }
-            }
+                    if (!proxyExecutionManager.IsInitialized)
+                    {
+                        EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Initializing uninitialized client. Started clients: " + _runStartedClients);
+                        proxyExecutionManager.Initialize(_skipDefaultAdapters);
+                    }
 
-            if (testRunCriteria != null)
-            {
-                if (!proxyExecutionManager.IsInitialized)
+                    EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Initializing test run. Started clients: " + _runStartedClients);
+                    Interlocked.Increment(ref _runStartedClients);
+                    proxyExecutionManager.InitializeTestRun(testRunCriteria, eventHandler);
+                }
+                else
                 {
-                    proxyExecutionManager.Initialize(this.skipDefaultAdapters);
+                    EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Waiting for pre-initialized client to finish initialization. Started clients: " + _runStartedClients);
+                    initTask!.Wait();
+                    EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Pre-initialized client finished initialization. Started clients: " + _runStartedClients);
                 }
 
-                Task.Run(() =>
-                {
-                    Interlocked.Increment(ref this.runStartedClients);
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("ParallelProxyExecutionManager: Execution started. Started clients: " + this.runStartedClients);
-                    }
+                EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Execution starting. Started clients: " + _runStartedClients);
 
-                    proxyExecutionManager.StartTestRun(testRunCriteria, this.GetHandlerForGivenManager(proxyExecutionManager));
-                })
-                .ContinueWith(t =>
+                proxyExecutionManager.StartTestRun(testRunCriteria, eventHandler);
+                EqtTrace.Verbose("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager: Execution started. Started clients: " + _runStartedClients);
+            })
+            .ContinueWith(t =>
                 {
                     // Just in case, the actual execution couldn't start for an instance. Ensure that
                     // we call execution complete since we have already fetched a source. Otherwise
                     // execution will not terminate
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("ParallelProxyExecutionManager: Failed to trigger execution. Exception: " + t.Exception);
-                    }
+                    EqtTrace.Error("ParallelProxyExecutionManager.StartTestRunOnConcurrentManager(continuation): Failed to trigger execution. Exception: " + t.Exception);
 
-                    var handler = this.GetHandlerForGivenManager(proxyExecutionManager);
-                    var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = t.Exception.ToString() };
-                    handler.HandleRawMessage(this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
-                    handler.HandleLogMessage(TestMessageLevel.Error, t.Exception.ToString());
+                    var handler = eventHandler;
+                    var exceptionToString = t.Exception?.ToString();
+                    var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = exceptionToString };
+                    handler.HandleRawMessage(_dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
+                    handler.HandleLogMessage(TestMessageLevel.Error, exceptionToString);
 
                     // Send a run complete to caller. Similar logic is also used in ProxyExecutionManager.StartTestRun
                     // Differences:
                     // Aborted is sent to allow the current execution manager replaced with another instance
                     // Ensure that the test run aggregator in parallel run events handler doesn't add these statistics
                     // (since the test run didn't even start)
-                    var completeArgs = new TestRunCompleteEventArgs(null, false, true, null, new Collection<AttachmentSet>(), TimeSpan.Zero);
+                    var completeArgs = new TestRunCompleteEventArgs(null, false, true, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.Zero);
                     handler.HandleTestRunComplete(completeArgs, null, null, null);
                 },
                 TaskContinuationOptions.OnlyOnFaulted);
-            }
+    }
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("ProxyParallelExecutionManager: No sources available for execution.");
-            }
+    public void InitializeTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        // Leaving this empty as it is not really relevant to the parallel proxy managers.
+        // The idea of pre-initializing the test run makes sense only for single proxies like
+        // ProxyExecutionManager or ProxyDiscoveryManager.
+    }
+
+    public void Dispose()
+    {
+        if (!_isDisposed)
+        {
+            _parallelOperationManager.Dispose();
+            _isDisposed = true;
         }
     }
 }
+
+/// <summary>
+/// A workload with a specification of a provider that can run that workload. The workload is a list of sources,
+/// or a list of testcases. Provider is a testhost manager, that is capable of running this workload, so
+/// we end up running .NET sources on .NET testhost, and .NET Framework sources on .NET Framework testhost.
+/// </summary>
+internal class ProviderSpecificWorkload<T>
+{
+    public T Work { get; }
+
+    public TestRuntimeProviderInfo Provider { get; protected set; }
+
+    public bool HasProvider => Provider.Type is not null;
+
+    public ProviderSpecificWorkload(T work, TestRuntimeProviderInfo provider)
+    {
+        Provider = provider;
+        Work = work;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs
index 78185e0c5c..2073336a47 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs
@@ -1,195 +1,221 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+
+/// <summary>
+/// ParallelRunDataAggregator aggregates test run data from execution managers running in parallel
+/// </summary>
+internal class ParallelRunDataAggregator
 {
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    private readonly List<string> _executorUris;
 
-    /// <summary>
-    /// ParallelRunDataAggregator aggregates test run data from execution managers running in parallel
-    /// </summary>
-    internal class ParallelRunDataAggregator
-    {
-        #region PrivateFields
-
-        private List<string> executorUris;
-
-        private List<ITestRunStatistics> testRunStatsList;
-
-        private ConcurrentDictionary<string, object> metricsAggregator;
-
-        private object dataUpdateSyncObject = new object();
-
-        #endregion
+    private readonly List<ITestRunStatistics> _testRunStatsList;
 
-        public ParallelRunDataAggregator()
-        {
-            ElapsedTime = TimeSpan.Zero;
-            RunContextAttachments = new Collection<AttachmentSet>();
-            RunCompleteArgsAttachments = new List<AttachmentSet>();
-            Exceptions = new List<Exception>();
-            executorUris = new List<string>();
-            testRunStatsList = new List<ITestRunStatistics>();
+    private readonly ConcurrentDictionary<string, object> _metricsAggregator;
 
-            metricsAggregator = new ConcurrentDictionary<string, object>();
+    private readonly object _dataUpdateSyncObject = new();
 
-            IsAborted = false;
-            IsCanceled = false;
-        }
+    public ParallelRunDataAggregator(string runSettingsXml)
+    {
+        RunSettings = runSettingsXml ?? throw new ArgumentNullException(nameof(runSettingsXml));
+        ElapsedTime = TimeSpan.Zero;
+        RunContextAttachments = new Collection<AttachmentSet>();
+        RunCompleteArgsAttachments = new List<AttachmentSet>();
+        InvokedDataCollectors = new Collection<InvokedDataCollector>();
+        Exceptions = new List<Exception>();
+        DiscoveredExtensions = new Dictionary<string, HashSet<string>>();
+        _executorUris = new List<string>();
+        _testRunStatsList = new List<ITestRunStatistics>();
+
+        _metricsAggregator = new ConcurrentDictionary<string, object>();
+
+        IsAborted = false;
+        IsCanceled = false;
+    }
 
-        #region Public Properties
+    public TimeSpan ElapsedTime { get; set; }
 
-        public TimeSpan ElapsedTime { get; set; }
+    public Collection<AttachmentSet> RunContextAttachments { get; set; }
 
-        public Collection<AttachmentSet> RunContextAttachments { get; set; }
+    public List<AttachmentSet> RunCompleteArgsAttachments { get; }
 
-        public List<AttachmentSet> RunCompleteArgsAttachments { get; }
+    public Collection<InvokedDataCollector> InvokedDataCollectors { get; set; }
 
-        public List<Exception> Exceptions { get; }
+    public List<Exception> Exceptions { get; }
 
-        public HashSet<string> ExecutorUris => new HashSet<string>(executorUris);
+    public HashSet<string> ExecutorUris => new(_executorUris);
 
-        public bool IsAborted { get; private set; }
+    /// <summary>
+    /// A collection of aggregated discovered extensions.
+    /// </summary>
+    public Dictionary<string, HashSet<string>> DiscoveredExtensions { get; private set; }
 
-        public bool IsCanceled { get; private set; }
+    public bool IsAborted { get; private set; }
 
-        #endregion
+    public bool IsCanceled { get; private set; }
 
-        #region Public Methods
+    public string RunSettings { get; }
 
-        public ITestRunStatistics GetAggregatedRunStats()
+    public ITestRunStatistics GetAggregatedRunStats()
+    {
+        var testOutcomeMap = new Dictionary<TestOutcome, long>();
+        long totalTests = 0;
+        if (_testRunStatsList.Count > 0)
         {
-            var testOutcomeMap = new Dictionary<TestOutcome, long>();
-            long totalTests = 0;
-            if (testRunStatsList.Count > 0)
+            foreach (var runStats in _testRunStatsList)
             {
-                foreach (var runStats in testRunStatsList)
+                // TODO: we get nullref here if the stats are empty.
+                foreach (var outcome in runStats.Stats!.Keys)
                 {
-                    foreach (var outcome in runStats.Stats.Keys)
+                    if (!testOutcomeMap.ContainsKey(outcome))
                     {
-                        if (!testOutcomeMap.ContainsKey(outcome))
-                        {
-                            testOutcomeMap.Add(outcome, 0);
-                        }
-                        testOutcomeMap[outcome] += runStats.Stats[outcome];
+                        testOutcomeMap.Add(outcome, 0);
                     }
-                    totalTests += runStats.ExecutedTests;
+                    testOutcomeMap[outcome] += runStats.Stats[outcome];
                 }
+                totalTests += runStats.ExecutedTests;
             }
-
-            var overallRunStats = new TestRunStatistics(testOutcomeMap);
-            overallRunStats.ExecutedTests = totalTests;
-            return overallRunStats;
         }
 
-        /// <summary>
-        /// Returns the Aggregated Run Data Metrics
-        /// </summary>
-        /// <returns></returns>
-        public IDictionary<string, object> GetAggregatedRunDataMetrics()
-        {
-            if (this.metricsAggregator == null || this.metricsAggregator.Count == 0)
-            {
-                return new ConcurrentDictionary<string, object>();
-            }
+        var overallRunStats = new TestRunStatistics(testOutcomeMap);
+        overallRunStats.ExecutedTests = totalTests;
+        return overallRunStats;
+    }
 
-            var adapterUsedCount = this.metricsAggregator.Count(metrics =>
-                metrics.Key.Contains(TelemetryDataConstants.TotalTestsRanByAdapter));
+    /// <summary>
+    /// Returns the Aggregated Run Data Metrics
+    /// </summary>
+    /// <returns></returns>
+    public IDictionary<string, object> GetAggregatedRunDataMetrics()
+    {
+        if (_metricsAggregator == null || _metricsAggregator.IsEmpty)
+        {
+            return new ConcurrentDictionary<string, object>();
+        }
 
-            var adaptersDiscoveredCount = this.metricsAggregator.Count(metrics =>
-                metrics.Key.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter));
+        var adapterUsedCount = _metricsAggregator.Count(metrics =>
+            metrics.Key.Contains(TelemetryDataConstants.TotalTestsRanByAdapter));
 
-            // Aggregating Total Adapter Used Count
-            this.metricsAggregator.TryAdd(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, adapterUsedCount);
+        var adaptersDiscoveredCount = _metricsAggregator.Count(metrics =>
+            metrics.Key.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter));
 
-            // Aggregating Total Adapters Discovered Count
-            this.metricsAggregator.TryAdd(
-                TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution,
-                adaptersDiscoveredCount);
+        // Aggregating Total Adapter Used Count
+        _metricsAggregator.TryAdd(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, adapterUsedCount);
 
-            return this.metricsAggregator;
-        }
+        // Aggregating Total Adapters Discovered Count
+        _metricsAggregator.TryAdd(
+            TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution,
+            adaptersDiscoveredCount);
 
-        public Exception GetAggregatedException()
-        {
-            if (Exceptions == null || Exceptions.Count < 1) return null;
+        return _metricsAggregator;
+    }
 
-            return new AggregateException(Exceptions);
-        }
+    public Exception? GetAggregatedException()
+    {
+        return Exceptions == null || Exceptions.Count < 1 ? null : new AggregateException(Exceptions);
+    }
 
-        /// <summary>
-        /// Aggregate Run Data
-        /// Must be thread-safe as this is expected to be called by parallel managers
-        /// </summary>
-        public void Aggregate(
-             ITestRunStatistics testRunStats,
-             ICollection<string> executorUris,
-             Exception exception,
-             TimeSpan elapsedTime,
-             bool isAborted,
-             bool isCanceled,
-             ICollection<AttachmentSet> runContextAttachments,
-             Collection<AttachmentSet> runCompleteArgsAttachments)
+    /// <summary>
+    /// Aggregate Run Data
+    /// Must be thread-safe as this is expected to be called by parallel managers
+    /// </summary>
+    public void Aggregate(
+        ITestRunStatistics? testRunStats,
+        ICollection<string>? executorUris,
+        Exception? exception,
+        TimeSpan elapsedTime,
+        bool isAborted,
+        bool isCanceled,
+        ICollection<AttachmentSet>? runContextAttachments,
+        Collection<AttachmentSet>? runCompleteArgsAttachments,
+        Collection<InvokedDataCollector>? invokedDataCollectors,
+        Dictionary<string, HashSet<string>>? discoveredExtensions)
+    {
+        lock (_dataUpdateSyncObject)
         {
-            lock (dataUpdateSyncObject)
+            IsAborted = IsAborted || isAborted;
+            IsCanceled = IsCanceled || isCanceled;
+
+            ElapsedTime = TimeSpan.FromMilliseconds(Math.Max(ElapsedTime.TotalMilliseconds, elapsedTime.TotalMilliseconds));
+            if (runContextAttachments != null)
             {
-                this.IsAborted = this.IsAborted || isAborted;
-                this.IsCanceled = this.IsCanceled || isCanceled;
+                foreach (var attachmentSet in runContextAttachments)
+                {
+                    RunContextAttachments.Add(attachmentSet);
+                }
+            }
 
-                ElapsedTime = TimeSpan.FromMilliseconds(Math.Max(ElapsedTime.TotalMilliseconds, elapsedTime.TotalMilliseconds));
-                if (runContextAttachments != null)
+            if (runCompleteArgsAttachments != null) RunCompleteArgsAttachments.AddRange(runCompleteArgsAttachments);
+            if (exception != null) Exceptions.Add(exception);
+            if (executorUris != null) _executorUris.AddRange(executorUris);
+            if (testRunStats != null) _testRunStatsList.Add(testRunStats);
+
+            if (invokedDataCollectors?.Count > 0)
+            {
+                foreach (var invokedDataCollector in invokedDataCollectors)
                 {
-                    foreach (var attachmentSet in runContextAttachments)
+                    if (!InvokedDataCollectors.Contains(invokedDataCollector))
                     {
-                        RunContextAttachments.Add(attachmentSet);
+                        InvokedDataCollectors.Add(invokedDataCollector);
                     }
                 }
-
-                if (runCompleteArgsAttachments != null) RunCompleteArgsAttachments.AddRange(runCompleteArgsAttachments);
-                if (exception != null) Exceptions.Add(exception);
-                if (executorUris != null) this.executorUris.AddRange(executorUris);
-                if (testRunStats != null) testRunStatsList.Add(testRunStats);
             }
+
+            // Aggregate the discovered extensions.
+            DiscoveredExtensions = TestExtensions.CreateMergedDictionary(DiscoveredExtensions, discoveredExtensions);
         }
+    }
 
-        /// <summary>
-        /// Aggregates Run Data Metrics from each Test Host Process
-        /// </summary>
-        /// <param name="metrics"></param>
-        public void AggregateRunDataMetrics(IDictionary<string, object> metrics)
+    /// <summary>
+    /// Aggregates Run Data Metrics from each Test Host Process
+    /// </summary>
+    /// <param name="metrics"></param>
+    public void AggregateRunDataMetrics(IDictionary<string, object>? metrics)
+    {
+        if (metrics == null || metrics.Count == 0 || _metricsAggregator == null)
         {
-            if (metrics == null || metrics.Count == 0 || this.metricsAggregator == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            foreach (var metric in metrics)
+        foreach (var metric in metrics)
+        {
+            if (metric.Key.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter) || metric.Key.Contains(TelemetryDataConstants.TimeTakenByAllAdaptersInSec) || (metric.Key.Contains(TelemetryDataConstants.TotalTestsRun) || metric.Key.Contains(TelemetryDataConstants.TotalTestsRanByAdapter)))
             {
-                if (metric.Key.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter) || metric.Key.Contains(TelemetryDataConstants.TimeTakenByAllAdaptersInSec) || (metric.Key.Contains(TelemetryDataConstants.TotalTestsRun) || metric.Key.Contains(TelemetryDataConstants.TotalTestsRanByAdapter)))
-                {
-                    var newValue = Convert.ToDouble(metric.Value);
+                var newValue = Convert.ToDouble(metric.Value, CultureInfo.InvariantCulture);
 
-                    if (this.metricsAggregator.TryGetValue(metric.Key, out var oldValue))
-                    {
-                        var oldDoubleValue = Convert.ToDouble(oldValue);
-                        this.metricsAggregator[metric.Key] = newValue + oldDoubleValue;
-                    }
-                    else
-                    {
-                        this.metricsAggregator.TryAdd(metric.Key, newValue);
-                    }
+                if (_metricsAggregator.TryGetValue(metric.Key, out var oldValue))
+                {
+                    var oldDoubleValue = Convert.ToDouble(oldValue, CultureInfo.InvariantCulture);
+                    _metricsAggregator[metric.Key] = newValue + oldDoubleValue;
+                }
+                else
+                {
+                    _metricsAggregator.TryAdd(metric.Key, newValue);
                 }
             }
         }
+    }
+
 
-        #endregion
+    public void MarkAsAborted()
+    {
+        lock (_dataUpdateSyncObject)
+        {
+            IsAborted = true;
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunEventsHandler.cs
index dd7646d4cf..9890cf5586 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunEventsHandler.cs
@@ -1,189 +1,206 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+
+/// <summary>
+/// ParallelRunEventsHandler for handling the run events in case of parallel execution
+/// </summary>
+internal class ParallelRunEventsHandler : IInternalTestRunEventsHandler
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly IProxyExecutionManager _proxyExecutionManager;
 
-    /// <summary>
-    /// ParallelRunEventsHandler for handling the run events in case of parallel execution
-    /// </summary>
-    internal class ParallelRunEventsHandler : ITestRunEventsHandler2
-    {
-        private IProxyExecutionManager proxyExecutionManager;
+    private readonly IInternalTestRunEventsHandler _actualRunEventsHandler;
 
-        private ITestRunEventsHandler actualRunEventsHandler;
+    private readonly IParallelProxyExecutionManager _parallelProxyExecutionManager;
 
-        private IParallelProxyExecutionManager parallelProxyExecutionManager;
+    private readonly ParallelRunDataAggregator _runDataAggregator;
 
-        private ParallelRunDataAggregator runDataAggregator;
+    private readonly IDataSerializer _dataSerializer;
 
-        private IDataSerializer dataSerializer;
+    protected IRequestData _requestData;
 
-        protected IRequestData requestData;
+    public ParallelRunEventsHandler(IRequestData requestData,
+        IProxyExecutionManager proxyExecutionManager,
+        IInternalTestRunEventsHandler actualRunEventsHandler,
+        IParallelProxyExecutionManager parallelProxyExecutionManager,
+        ParallelRunDataAggregator runDataAggregator) :
+        this(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, JsonDataSerializer.Instance)
+    {
+    }
 
-        public ParallelRunEventsHandler(IRequestData requestData,
-            IProxyExecutionManager proxyExecutionManager,
-            ITestRunEventsHandler actualRunEventsHandler,
-            IParallelProxyExecutionManager parallelProxyExecutionManager,
-            ParallelRunDataAggregator runDataAggregator) :
-            this(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, JsonDataSerializer.Instance)
-        {
-        }
+    internal ParallelRunEventsHandler(IRequestData requestData,
+        IProxyExecutionManager proxyExecutionManager,
+        IInternalTestRunEventsHandler actualRunEventsHandler,
+        IParallelProxyExecutionManager parallelProxyExecutionManager,
+        ParallelRunDataAggregator runDataAggregator,
+        IDataSerializer dataSerializer)
+    {
+        _proxyExecutionManager = proxyExecutionManager;
+        _actualRunEventsHandler = actualRunEventsHandler;
+        _parallelProxyExecutionManager = parallelProxyExecutionManager;
+        _runDataAggregator = runDataAggregator;
+        _dataSerializer = dataSerializer;
+        _requestData = requestData;
+    }
 
-        internal ParallelRunEventsHandler(IRequestData requestData,
-            IProxyExecutionManager proxyExecutionManager,
-            ITestRunEventsHandler actualRunEventsHandler,
-            IParallelProxyExecutionManager parallelProxyExecutionManager,
-            ParallelRunDataAggregator runDataAggregator,
-            IDataSerializer dataSerializer)
-        {
-            this.proxyExecutionManager = proxyExecutionManager;
-            this.actualRunEventsHandler = actualRunEventsHandler;
-            this.parallelProxyExecutionManager = parallelProxyExecutionManager;
-            this.runDataAggregator = runDataAggregator;
-            this.dataSerializer = dataSerializer;
-            this.requestData = requestData;
-        }
+    /// <summary>
+    /// Handles the Run Complete event from a parallel proxy manager
+    /// </summary>
+    public virtual void HandleTestRunComplete(
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        EqtTrace.Verbose($"ParallelRunEventsHandler.HandleTestRunComplete: Handling a run completion, this can be either one part of parallel run completing, or the whole parallel run completing.");
+        var parallelRunComplete = HandleSingleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
 
-        /// <summary>
-        /// Handles the Run Complete event from a parallel proxy manager
-        /// </summary>
-        public virtual void HandleTestRunComplete(
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
+        if (parallelRunComplete)
         {
-            var parallelRunComplete = HandleSingleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
-
-            if (parallelRunComplete)
-            {
-                var completedArgs = new TestRunCompleteEventArgs(this.runDataAggregator.GetAggregatedRunStats(),
-                    this.runDataAggregator.IsCanceled,
-                    this.runDataAggregator.IsAborted,
-                    this.runDataAggregator.GetAggregatedException(),
-                    new Collection<AttachmentSet>(this.runDataAggregator.RunCompleteArgsAttachments),
-                    this.runDataAggregator.ElapsedTime);
-
-                // Collect Final RunState
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.RunState, this.runDataAggregator.IsAborted ? "Aborted" : this.runDataAggregator.IsCanceled ? "Canceled" : "Completed");
-
-                // Collect Aggregated Metrics Data
-                var aggregatedRunDataMetrics = runDataAggregator.GetAggregatedRunDataMetrics();
-
-                completedArgs.Metrics = aggregatedRunDataMetrics;
-                HandleParallelTestRunComplete(completedArgs);
-            }
+            EqtTrace.Verbose($"ParallelRunEventsHandler.HandleTestRunComplete: Whole parallel run completed.");
+            var completedArgs = new TestRunCompleteEventArgs(_runDataAggregator.GetAggregatedRunStats(),
+                _runDataAggregator.IsCanceled,
+                _runDataAggregator.IsAborted,
+                _runDataAggregator.GetAggregatedException(),
+                new Collection<AttachmentSet>(_runDataAggregator.RunCompleteArgsAttachments),
+                new Collection<InvokedDataCollector>(_runDataAggregator.InvokedDataCollectors),
+                _runDataAggregator.ElapsedTime);
+
+            // Collect Final RunState
+            _requestData.MetricsCollection.Add(
+                TelemetryDataConstants.RunState,
+                _runDataAggregator.IsAborted
+                    ? "Aborted"
+                    : _runDataAggregator.IsCanceled ? "Canceled" : "Completed");
+
+            // Add the map containing discovered extensions to the event args. This map contains
+            // only extensions discovered by the testhost processes. Current process extensions
+            // (i.e. vstest.console) are added later on.
+            completedArgs.DiscoveredExtensions = _runDataAggregator.DiscoveredExtensions;
+
+            // Collect Aggregated Metrics Data
+            var aggregatedRunDataMetrics = _runDataAggregator.GetAggregatedRunDataMetrics();
+            completedArgs.Metrics = aggregatedRunDataMetrics;
+
+            HandleParallelTestRunComplete(completedArgs);
         }
-
-        protected bool HandleSingleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
+        else
         {
-            // we get run complete events from each executor process
-            // so we cannot "complete" the actual executor operation until all sources/testcases are consumed
-            // We should not block last chunk results while we aggregate overall run data
-            if (lastChunkArgs != null)
-            {
-                ConvertToRawMessageAndSend(MessageType.TestRunStatsChange, lastChunkArgs);
-                HandleTestRunStatsChange(lastChunkArgs);
-            }
-
-            // Update run stats, executorUris, etc.
-            // we need this data when we send the final run complete
-            this.runDataAggregator.Aggregate(
-                testRunCompleteArgs.TestRunStatistics,
-                executorUris,
-                testRunCompleteArgs.Error,
-                testRunCompleteArgs.ElapsedTimeInRunningTests,
-                testRunCompleteArgs.IsAborted,
-                testRunCompleteArgs.IsCanceled,
-                runContextAttachments,
-                testRunCompleteArgs.AttachmentSets);
-
-            // Aggregate Run Data Metrics
-            this.runDataAggregator.AggregateRunDataMetrics(testRunCompleteArgs.Metrics);
-
-            return this.parallelProxyExecutionManager.HandlePartialRunComplete(
-                this.proxyExecutionManager,
-                testRunCompleteArgs,
-                null, // lastChunk should be null as we already sent this data above
-                runContextAttachments,
-                executorUris);
+            EqtTrace.Verbose($"ParallelRunEventsHandler.HandleTestRunComplete: Single part of parallel run completed, but whole run is not complete yet.");
         }
+    }
 
-        protected void HandleParallelTestRunComplete(TestRunCompleteEventArgs completedArgs)
+    protected bool HandleSingleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        // we get run complete events from each executor process
+        // so we cannot "complete" the actual executor operation until all sources/testcases are consumed
+        // We should not block last chunk results while we aggregate overall run data
+        if (lastChunkArgs != null)
         {
-            // In case of sequential execution - RawMessage would have contained a 'TestRunCompletePayload' object
-            // To send a rawmessge - we need to create rawmessage from an aggregated payload object
-            var testRunCompletePayload = new TestRunCompletePayload()
-            {
-                ExecutorUris = this.runDataAggregator.ExecutorUris,
-                LastRunTests = null,
-                RunAttachments = this.runDataAggregator.RunContextAttachments,
-                TestRunCompleteArgs = completedArgs
-            };
-
-            // we have to send rawmessages as we block the run complete actual raw messages
-            ConvertToRawMessageAndSend(MessageType.ExecutionComplete, testRunCompletePayload);
-
-            // send actual test run complete to clients
-            this.actualRunEventsHandler.HandleTestRunComplete(
-                completedArgs, null, this.runDataAggregator.RunContextAttachments, this.runDataAggregator.ExecutorUris);
+            ConvertToRawMessageAndSend(MessageType.TestRunStatsChange, lastChunkArgs);
+            HandleTestRunStatsChange(lastChunkArgs);
         }
 
-        public void HandleRawMessage(string rawMessage)
-        {
-            // In case of parallel - we can send everything but handle complete
-            // HandleComplete is not true-end of the overall execution as we only get completion of one executor here
-            // Always aggregate data, deserialize and raw for complete events
-            var message = this.dataSerializer.DeserializeMessage(rawMessage);
-
-            // Do not deserialize further - just send if not execution complete
-            if(!string.Equals(MessageType.ExecutionComplete, message.MessageType))
-            {
-                this.actualRunEventsHandler.HandleRawMessage(rawMessage);
-            }
-        }
+        // Update run stats, executorUris, etc.
+        // we need this data when we send the final run complete
+        _runDataAggregator.Aggregate(
+            testRunCompleteArgs.TestRunStatistics,
+            executorUris,
+            testRunCompleteArgs.Error,
+            testRunCompleteArgs.ElapsedTimeInRunningTests,
+            testRunCompleteArgs.IsAborted,
+            testRunCompleteArgs.IsCanceled,
+            runContextAttachments,
+            testRunCompleteArgs.AttachmentSets,
+            testRunCompleteArgs.InvokedDataCollectors,
+            testRunCompleteArgs.DiscoveredExtensions);
+
+        // Aggregate Run Data Metrics
+        _runDataAggregator.AggregateRunDataMetrics(testRunCompleteArgs.Metrics);
+
+        return _parallelProxyExecutionManager.HandlePartialRunComplete(
+            _proxyExecutionManager,
+            testRunCompleteArgs,
+            null, // lastChunk should be null as we already sent this data above
+            runContextAttachments,
+            executorUris);
+    }
 
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
+    protected void HandleParallelTestRunComplete(TestRunCompleteEventArgs completedArgs)
+    {
+        // In case of sequential execution - RawMessage would have contained a 'TestRunCompletePayload' object
+        // To send a rawmessge - we need to create rawmessage from an aggregated payload object
+        var testRunCompletePayload = new TestRunCompletePayload()
         {
-            this.actualRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
-        }
+            ExecutorUris = _runDataAggregator.ExecutorUris,
+            LastRunTests = null,
+            RunAttachments = _runDataAggregator.RunContextAttachments,
+            TestRunCompleteArgs = completedArgs
+        };
+
+        // we have to send rawmessages as we block the run complete actual raw messages
+        ConvertToRawMessageAndSend(MessageType.ExecutionComplete, testRunCompletePayload);
+
+        // send actual test run complete to clients
+        _actualRunEventsHandler.HandleTestRunComplete(
+            completedArgs, null, _runDataAggregator.RunContextAttachments, _runDataAggregator.ExecutorUris);
+    }
 
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.actualRunEventsHandler.HandleLogMessage(level, message);
-        }
+    public void HandleRawMessage(string rawMessage)
+    {
+        // In case of parallel - we can send everything but handle complete
+        // HandleComplete is not true-end of the overall execution as we only get completion of one executor here
+        // Always aggregate data, deserialize and raw for complete events
+        var message = _dataSerializer.DeserializeMessage(rawMessage);
 
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        // Do not deserialize further - just send if not execution complete
+        if (!string.Equals(MessageType.ExecutionComplete, message.MessageType))
         {
-            return this.actualRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+            _actualRunEventsHandler.HandleRawMessage(rawMessage);
         }
+    }
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            return ((ITestRunEventsHandler2)this.actualRunEventsHandler).AttachDebuggerToProcess(pid);
-        }
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        _actualRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
+    }
 
-        private void ConvertToRawMessageAndSend(string messageType, object payload)
-        {
-            var rawMessage = this.dataSerializer.SerializePayload(messageType, payload);
-            this.actualRunEventsHandler.HandleRawMessage(rawMessage);
-        }
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _actualRunEventsHandler.HandleLogMessage(level, message);
+    }
+
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        return _actualRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        return _actualRunEventsHandler.AttachDebuggerToProcess(attachDebuggerInfo);
+    }
+
+    private void ConvertToRawMessageAndSend(string messageType, object payload)
+    {
+        var rawMessage = _dataSerializer.SerializePayload(messageType, payload, _requestData.ProtocolConfig!.Version);
+        _actualRunEventsHandler.HandleRawMessage(rawMessage);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs
index c8d85fa1b8..b0c527368a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs
@@ -1,298 +1,386 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Orchestrates discovery operations for the engine communicating with the client.
+/// </summary>
+public class ProxyDiscoveryManager : IProxyDiscoveryManager, IBaseProxy, ITestDiscoveryEventsHandler2
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private readonly TestSessionInfo? _testSessionInfo;
+    private readonly Func<string, ProxyDiscoveryManager, ProxyOperationManager>? _proxyOperationManagerCreator;
+    private readonly DiscoveryDataAggregator _discoveryDataAggregator;
+    private readonly IFileHelper _fileHelper;
+    private readonly IDataSerializer _dataSerializer;
+
+    private ITestRuntimeProvider? _testHostManager;
+    private bool _isCommunicationEstablished;
+    private ProxyOperationManager? _proxyOperationManager;
+    private ITestDiscoveryEventsHandler2? _baseTestDiscoveryEventsHandler;
+    private bool _skipDefaultAdapters;
+    private string? _previousSource;
 
     /// <summary>
-    /// Orchestrates discovery operations for the engine communicating with the client.
+    /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
     /// </summary>
-    public class ProxyDiscoveryManager : IProxyDiscoveryManager, IBaseProxy, ITestDiscoveryEventsHandler2
+    ///
+    /// <param name="testSessionInfo">The test session info.</param>
+    /// <param name="proxyOperationManagerCreator">The proxy operation manager creator.</param>
+    public ProxyDiscoveryManager(
+        TestSessionInfo testSessionInfo,
+        Func<string, ProxyDiscoveryManager, ProxyOperationManager> proxyOperationManagerCreator)
+        : this(testSessionInfo, proxyOperationManagerCreator, new())
     {
-        private readonly TestSessionInfo testSessionInfo = null;
-        Func<string, ProxyDiscoveryManager, ProxyOperationManager> proxyOperationManagerCreator;
-
-        private ITestRuntimeProvider testHostManager;
-        private IRequestData requestData;
-
-        private readonly IFileHelper fileHelper;
-        private readonly IDataSerializer dataSerializer;
-        private bool isCommunicationEstablished;
-
-        private ProxyOperationManager proxyOperationManager = null;
-        private ITestDiscoveryEventsHandler2 baseTestDiscoveryEventsHandler;
-        private bool skipDefaultAdapters;
-
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info.</param>
-        /// <param name="proxyOperationManagerCreator">The proxy operation manager creator.</param>
-        public ProxyDiscoveryManager(
-            TestSessionInfo testSessionInfo,
-            Func<string, ProxyDiscoveryManager, ProxyOperationManager> proxyOperationManagerCreator)
-        {
-            // Filling in test session info and proxy information.
-            this.testSessionInfo = testSessionInfo;
-            this.proxyOperationManagerCreator = proxyOperationManagerCreator;
-
-            this.requestData = null;
-            this.testHostManager = null;
-            this.dataSerializer = JsonDataSerializer.Instance;
-            this.fileHelper = new FileHelper();
-            this.isCommunicationEstablished = false;
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing discovery services and data.
-        /// </param>
-        /// <param name="testRequestSender">Test request sender instance.</param>
-        /// <param name="testHostManager">Test host manager instance.</param>
-        public ProxyDiscoveryManager(
-            IRequestData requestData,
-            ITestRequestSender testRequestSender,
-            ITestRuntimeProvider testHostManager)
-            : this(
-                  requestData,
-                  testRequestSender,
-                  testHostManager,
-                  JsonDataSerializer.Instance,
-                  new FileHelper())
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
-        /// </summary>
-        /// 
-        /// <remarks>
-        /// Constructor with dependency injection. Used for unit testing.
-        /// </remarks>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing discovery services and data.
-        /// </param>
-        /// <param name="requestSender">The request sender.</param>
-        /// <param name="testHostManager">Test host manager instance.</param>
-        /// <param name="dataSerializer">The data serializer.</param>
-        /// <param name="fileHelper">The file helper.</param>
-        internal ProxyDiscoveryManager(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager,
-            IDataSerializer dataSerializer,
-            IFileHelper fileHelper)
-        {
-            this.requestData = requestData;
-            this.testHostManager = testHostManager;
+    internal ProxyDiscoveryManager(
+        TestSessionInfo testSessionInfo,
+        Func<string, ProxyDiscoveryManager, ProxyOperationManager> proxyOperationManagerCreator,
+        DiscoveryDataAggregator discoveryDataAggregator)
+    {
+        // Filling in test session info and proxy information.
+        _testSessionInfo = testSessionInfo;
+        _proxyOperationManagerCreator = proxyOperationManagerCreator;
+        _discoveryDataAggregator = discoveryDataAggregator;
+        _dataSerializer = JsonDataSerializer.Instance;
+        _fileHelper = new FileHelper();
+    }
 
-            this.dataSerializer = dataSerializer;
-            this.fileHelper = fileHelper;
-            this.isCommunicationEstablished = false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing discovery services and data.
+    /// </param>
+    /// <param name="testRequestSender">Test request sender instance.</param>
+    /// <param name="testHostManager">Test host manager instance.</param>
+    public ProxyDiscoveryManager(
+        IRequestData requestData,
+        ITestRequestSender testRequestSender,
+        ITestRuntimeProvider testHostManager)
+        : this(requestData, testRequestSender, testHostManager, null, null, null)
+    { }
 
-            // Create a new proxy operation manager.
-            this.proxyOperationManager = new ProxyOperationManager(requestData, requestSender, testHostManager, this);
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
+    /// </summary>
+    ///
+    /// <remarks>
+    /// Constructor with dependency injection. Used for unit testing.
+    /// </remarks>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing discovery services and data.
+    /// </param>
+    /// <param name="requestSender">The request sender.</param>
+    /// <param name="testHostManager">Test host manager instance.</param>
+    /// <param name="testhostManagerFramework">Framework of the manager.</param>
+    /// <param name="discoveryDataAggregator">Aggregator of discovery data.</param>
+    /// <param name="dataSerializer">The data serializer.</param>
+    /// <param name="fileHelper">The file helper.</param>
+    internal ProxyDiscoveryManager(
+        IRequestData requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework? testhostManagerFramework,
+        DiscoveryDataAggregator? discoveryDataAggregator = null,
+        IDataSerializer? dataSerializer = null,
+        IFileHelper? fileHelper = null)
+    {
+        _testHostManager = testHostManager;
+        _discoveryDataAggregator = discoveryDataAggregator ?? new();
+        _dataSerializer = dataSerializer ?? JsonDataSerializer.Instance;
+        _fileHelper = fileHelper ?? new FileHelper();
 
-        #endregion
+        // Create a new proxy operation manager.
+        _proxyOperationManager = new ProxyOperationManager(requestData, requestSender, testHostManager, testhostManagerFramework, this);
+    }
 
-        #region IProxyDiscoveryManager implementation.
+    #region IProxyDiscoveryManager implementation.
 
-        /// <inheritdoc/>
-        public void Initialize(bool skipDefaultAdapters)
-        {
-            this.skipDefaultAdapters = skipDefaultAdapters;
-        }
+    public void Initialize(bool skipDefaultAdapters)
+    {
+        _skipDefaultAdapters = skipDefaultAdapters;
+    }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    /// <inheritdoc/>
+    public void InitializeDiscovery(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler, bool skipDefaultAdapters)
+    {
+        // Multiple method calls will iterate over this sources collection so we want to ensure
+        // it's built once.
+        var discoverySources = discoveryCriteria.Sources.ToArray();
+
+        if (_proxyOperationManager == null)
         {
-            if (this.proxyOperationManager == null)
-            {
-                this.proxyOperationManager = this.proxyOperationManagerCreator(
-                    discoveryCriteria.Sources.First(),
-                    this);
+            TPDebug.Assert(_proxyOperationManagerCreator is not null, "_proxyOperationManagerCreator is null");
+            // Passing only first because that is how the testhost pool is keyed.
+            _proxyOperationManager = _proxyOperationManagerCreator(discoverySources[0], this);
+            _testHostManager = _proxyOperationManager.TestHostManager;
+        }
 
-                this.testHostManager = this.proxyOperationManager.TestHostManager;
-                this.requestData = this.proxyOperationManager.RequestData;
-            }
+        _baseTestDiscoveryEventsHandler = eventHandler;
 
-            this.baseTestDiscoveryEventsHandler = eventHandler;
-            try
-            {
-                this.isCommunicationEstablished = this.proxyOperationManager.SetupChannel(discoveryCriteria.Sources, discoveryCriteria.RunSettings);
+        // All sources are already marked as not discovered by ParallelProxyDiscoveryManager or
+        // DiscoveryManager but it's possible to have this manager called directly so we still need
+        // to ensure correct initial state.
+        _discoveryDataAggregator.MarkSourcesWithStatus(discoverySources, DiscoveryStatus.NotDiscovered);
 
-                if (this.isCommunicationEstablished)
-                {
-                    this.InitializeExtensions(discoveryCriteria.Sources);
-                    discoveryCriteria.UpdateDiscoveryCriteria(testHostManager);
+        try
+        {
+            _isCommunicationEstablished = _proxyOperationManager.SetupChannel(discoverySources, discoveryCriteria.RunSettings);
 
-                    this.proxyOperationManager.RequestSender.DiscoverTests(discoveryCriteria, this);
-                }
-            }
-            catch (Exception exception)
+            if (_isCommunicationEstablished)
             {
-                EqtTrace.Error("ProxyDiscoveryManager.DiscoverTests: Failed to discover tests: {0}", exception);
-
-                // Log to vs ide test output
-                var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = exception.ToString() };
-                var rawMessage = this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
-                this.HandleRawMessage(rawMessage);
-
-                // Log to vstest.console
-                // Send a discovery complete to caller. Similar logic is also used in ParallelProxyDiscoveryManager.DiscoverTestsOnConcurrentManager
-                // Aborted is `true`: in case of parallel discovery (or non shared host), an aborted message ensures another discovery manager
-                // created to replace the current one. This will help if the current discovery manager is aborted due to irreparable error
-                // and the test host is lost as well.
-                this.HandleLogMessage(TestMessageLevel.Error, exception.ToString());
-
-                var discoveryCompletePayload = new DiscoveryCompletePayload()
-                {
-                    IsAborted = true,
-                    LastDiscoveredTests = null,
-                    TotalTests = -1
-                };
-                this.HandleRawMessage(this.dataSerializer.SerializePayload(MessageType.DiscoveryComplete, discoveryCompletePayload));
-                var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(-1, true);
-
-                this.HandleDiscoveryComplete(discoveryCompleteEventsArgs, new List<ObjectModel.TestCase>());
+                InitializeExtensions(discoverySources, skipDefaultAdapters);
             }
         }
-
-        /// <inheritdoc/>
-        public void Abort()
+        catch (Exception exception)
         {
-            // Do nothing if the proxy is not initialized yet.
-            if (this.proxyOperationManager == null)
-            {
-                return;
-            }
-
-            // Cancel fast, try to stop testhost deployment/launch
-            this.proxyOperationManager.CancellationTokenSource.Cancel();
-            this.Close();
+            HandleException(exception);
         }
+    }
 
-        /// <inheritdoc/>
-        public void Close()
+    public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        // Multiple method calls will iterate over this sources collection so we want to ensure
+        // it's built once.
+        var discoverySources = discoveryCriteria.Sources.ToArray();
+
+        try
         {
-            // Do nothing if the proxy is not initialized yet.
-            if (this.proxyOperationManager == null)
+            if (!_isCommunicationEstablished)
             {
-                return;
+                InitializeDiscovery(discoveryCriteria, eventHandler, _skipDefaultAdapters);
             }
 
-            // When no test session is being used we don't share the testhost
-            // between test discovery and test run. The testhost is closed upon
-            // successfully completing the operation it was spawned for.
-            //
-            // In contrast, the new workflow (using test sessions) means we should keep
-            // the testhost alive until explicitly closed by the test session owner.
-            if (this.testSessionInfo == null)
+            TPDebug.Assert(_proxyOperationManager is not null, "ProxyOperationManager is null.");
+
+            if (_isCommunicationEstablished)
             {
-                this.proxyOperationManager.Close();
-                return;
+                discoveryCriteria.UpdateDiscoveryCriteria(_testHostManager!);
+
+                // Consider the first source as the previous source so that if we are discovering a source
+                // with no tests, we will always consider the source as fully discovered when reaching the
+                // discovery complete event.
+                _previousSource = discoverySources[0];
+
+                _proxyOperationManager.RequestSender.DiscoverTests(discoveryCriteria, this);
             }
+        }
+        catch (Exception exception)
+        {
+            HandleException(exception);
+        }
+    }
 
-            TestSessionPool.Instance.ReturnProxy(this.testSessionInfo, this.proxyOperationManager.Id);
+    private void HandleException(Exception exception)
+    {
+        // If requested abort and the code below was just sending data, we will get communication exception because we try to write the channel that is already closed.
+        // In such case don't report the exception because user cannot do anything about it.
+        if (!(_proxyOperationManager != null && _proxyOperationManager.CancellationTokenSource.IsCancellationRequested && exception is CommunicationException))
+        {
+            EqtTrace.Error("ProxyDiscoveryManager.DiscoverTests: Failed to discover tests: {0}", exception);
+
+            // Log to vs ide test output
+            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = exception.ToString() };
+            var rawMessage = _dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
+            HandleRawMessage(rawMessage);
+
+            // Log to vstest.console
+            HandleLogMessage(TestMessageLevel.Error, exception.ToString());
         }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
+        // Send a discovery complete to caller. Similar logic is also used in ParallelProxyDiscoveryManager.DiscoverTestsOnConcurrentManager
+        // Aborted is `true`: in case of parallel discovery (or non shared host), an aborted message ensures another discovery manager
+        // created to replace the current one. This will help if the current discovery manager is aborted due to irreparable error
+        // and the test host is lost as well.
+        var discoveryCompletePayload = new DiscoveryCompletePayload
+        {
+            IsAborted = true,
+            LastDiscoveredTests = null,
+            TotalTests = -1
+        };
+        HandleRawMessage(_dataSerializer.SerializePayload(MessageType.DiscoveryComplete, discoveryCompletePayload));
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(-1, true);
+
+        HandleDiscoveryComplete(discoveryCompleteEventsArgs, new List<TestCase>());
+    }
+
+    /// <inheritdoc/>
+    public void Abort()
+    {
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager == null)
         {
-            this.baseTestDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, lastChunk);
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
+        // Cancel fast, try to stop testhost deployment/launch
+        _proxyOperationManager.CancellationTokenSource.Cancel();
+        Close();
+    }
+
+    // <inheritdoc/>
+    public void Abort(ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager is null)
         {
-            this.baseTestDiscoveryEventsHandler.HandleDiscoveredTests(discoveredTestCases);
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleRawMessage(string rawMessage)
+        _baseTestDiscoveryEventsHandler ??= eventHandler;
+
+        if (_isCommunicationEstablished)
         {
-            var message = this.dataSerializer.DeserializeMessage(rawMessage);
-            if(string.Equals(message.MessageType, MessageType.DiscoveryComplete))
-            {
-                this.Close();
-            }
+            _proxyOperationManager.RequestSender.SendDiscoveryAbort();
+        }
+
+        // It is important to ensure we cancel the token and close the channel in case of an abort.
+        // If we don't then we will wait until the completion of this discovery. In case of a
+        // parallel discovery that means we will wait until the source with the less number of tests
+        // is discovered before notifying the caller with the aborted DiscoveryCompleteEventArgs.
+        Abort();
+    }
 
-            this.baseTestDiscoveryEventsHandler.HandleRawMessage(rawMessage);
+    /// <inheritdoc/>
+    public void Close()
+    {
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager == null)
+        {
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+        // When no test session is being used, we don't share the testhost
+        // between test discovery and test run. The testhost is closed upon
+        // successfully completing the operation it was spawned for.
+        //
+        // In contrast, the new workflow (using test sessions) means we should keep
+        // the testhost alive until explicitly closed by the test session owner, but
+        // only if the testhost is part of a test session (i.e. the proxy operation manager
+        // id is valid), since there is the distinct possibility of test session criteria
+        // changing between spawn and discovery/run, causing a new proxy operation manager
+        // to be spawned on demand instead of dequeuing an incompatible proxy from the pool.
+        if (_testSessionInfo == null || _proxyOperationManager.Id < 0)
         {
-            this.baseTestDiscoveryEventsHandler.HandleLogMessage(level, message);
+            _proxyOperationManager.Close();
+            return;
         }
 
-        #endregion
+        TestSessionPool.Instance.ReturnProxy(_testSessionInfo, _proxyOperationManager.Id);
+    }
 
-        #region IBaseProxy implementation.
-        /// <inheritdoc/>
-        public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    /// <inheritdoc/>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        // Currently, TestRequestSender always passes null for lastChunk in case of an aborted
+        // discovery but we are not making this assumption here to ease potential future
+        // evolution.
+        // When discovery is complete and not aborted, we can simply mark all given test cases and
+        // the latest discovered source as fully discovered. Otherwise we still want to process
+        // the last chunk as if it was a normal discovery notification.
+        if (discoveryCompleteEventArgs.IsAborted)
         {
-            // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
-            var telemetryOptedIn = this.proxyOperationManager.RequestData.IsTelemetryOptedIn ? "true" : "false";
-            testProcessStartInfo.Arguments += " --telemetryoptedin " + telemetryOptedIn;
-            return testProcessStartInfo;
+            _previousSource = _discoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases(_previousSource, lastChunk);
         }
-        #endregion
+        else
+        {
+            _discoveryDataAggregator.MarkSourcesWithStatus(lastChunk?.Select(x => x.Source), DiscoveryStatus.FullyDiscovered);
+            _discoveryDataAggregator.MarkSourcesWithStatus(new[] { _previousSource }, DiscoveryStatus.FullyDiscovered);
+            _previousSource = null;
+        }
+        _baseTestDiscoveryEventsHandler?.HandleDiscoveryComplete(discoveryCompleteEventArgs, lastChunk);
+    }
+
+    /// <inheritdoc/>
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        _previousSource = _discoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases(_previousSource, discoveredTestCases);
+        _baseTestDiscoveryEventsHandler?.HandleDiscoveredTests(discoveredTestCases);
+    }
 
-        private void InitializeExtensions(IEnumerable<string> sources)
+    /// <inheritdoc/>
+    public void HandleRawMessage(string rawMessage)
+    {
+        var message = _dataSerializer.DeserializeMessage(rawMessage);
+        if (string.Equals(message.MessageType, MessageType.DiscoveryComplete))
         {
-            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, this.skipDefaultAdapters);
+            Close();
+        }
 
-            // Filter out non existing extensions
-            var nonExistingExtensions = extensions.Where(extension => !this.fileHelper.Exists(extension));
-            if (nonExistingExtensions.Any())
-            {
-                this.LogMessage(TestMessageLevel.Warning, string.Format(Resources.Resources.NonExistingExtensions, string.Join(",", nonExistingExtensions)));
-            }
+        _baseTestDiscoveryEventsHandler?.HandleRawMessage(rawMessage);
+    }
 
-            var sourceList = sources.ToList();
-            var platformExtensions = this.testHostManager.GetTestPlatformExtensions(sourceList, extensions.Except(nonExistingExtensions));
+    /// <inheritdoc/>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _baseTestDiscoveryEventsHandler?.HandleLogMessage(level, message);
+    }
 
-            // Only send this if needed.
-            if (platformExtensions.Any())
-            {
-                this.proxyOperationManager.RequestSender.InitializeDiscovery(platformExtensions);
-            }
-        }
+    #endregion
+
+    #region IBaseProxy implementation.
+    /// <inheritdoc/>
+    public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
+        var telemetryOptedIn = _proxyOperationManager?.RequestData?.IsTelemetryOptedIn == true ? "true" : "false";
+        testProcessStartInfo.Arguments += $" --telemetryoptedin {telemetryOptedIn}";
+        return testProcessStartInfo;
+    }
+    #endregion
+
+    private void InitializeExtensions(IEnumerable<string> sources, bool skipDefaultAdapters)
+    {
+        var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, skipDefaultAdapters);
 
-        private void LogMessage(TestMessageLevel testMessageLevel, string message)
+        // Filter out non existing extensions
+        var nonExistingExtensions = extensions.Where(extension => !_fileHelper.Exists(extension));
+        if (nonExistingExtensions.Any())
         {
-            // Log to translation layer.
-            var testMessagePayload = new TestMessagePayload { MessageLevel = testMessageLevel, Message = message };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
-            this.HandleRawMessage(rawMessage);
+            LogMessage(TestMessageLevel.Warning, string.Format(CultureInfo.CurrentCulture, Resources.Resources.NonExistingExtensions, string.Join(",", nonExistingExtensions)));
+        }
+
+        var sourceList = sources.ToList();
+        var platformExtensions = _testHostManager?.GetTestPlatformExtensions(sourceList, extensions.Except(nonExistingExtensions));
 
-            // Log to vstest.console layer.
-            this.HandleLogMessage(testMessageLevel, message);
+        // Only send this if needed.
+        if (platformExtensions is not null && platformExtensions.Any())
+        {
+            _proxyOperationManager?.RequestSender.InitializeDiscovery(platformExtensions);
         }
     }
+
+    private void LogMessage(TestMessageLevel testMessageLevel, string message)
+    {
+        // Log to translation layer.
+        var testMessagePayload = new TestMessagePayload { MessageLevel = testMessageLevel, Message = message };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
+        HandleRawMessage(rawMessage);
+
+        // Log to vstest.console layer.
+        HandleLogMessage(testMessageLevel, message);
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs
index c5e90651a4..42442f0735 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs
@@ -1,447 +1,513 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Orchestrates test execution operations for the engine communicating with the client.
+/// </summary>
+internal class ProxyExecutionManager : IProxyExecutionManager, IBaseProxy, IInternalTestRunEventsHandler
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private readonly TestSessionInfo? _testSessionInfo;
+    private readonly Func<string, ProxyExecutionManager, ProxyOperationManager>? _proxyOperationManagerCreator;
+    private readonly IFileHelper _fileHelper;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly bool _debugEnabledForTestSession;
+
+    private List<string>? _testSources;
+    private ITestRuntimeProvider? _testHostManager;
+    private bool _isCommunicationEstablished;
+    private ProxyOperationManager? _proxyOperationManager;
+    private IInternalTestRunEventsHandler? _baseTestRunEventsHandler;
+    private bool _skipDefaultAdapters;
+
+    /// <inheritdoc/>
+    public bool IsInitialized { get; private set; }
 
     /// <summary>
-    /// Orchestrates test execution operations for the engine communicating with the client.
+    /// Gets or sets the cancellation token source.
     /// </summary>
-    internal class ProxyExecutionManager : IProxyExecutionManager, IBaseProxy, ITestRunEventsHandler2
+    public CancellationTokenSource CancellationTokenSource
     {
-        private readonly TestSessionInfo testSessionInfo = null;
-        Func<string, ProxyExecutionManager, ProxyOperationManager> proxyOperationManagerCreator;
-
-        private ITestRuntimeProvider testHostManager;
-        private IRequestData requestData;
-
-        private readonly IFileHelper fileHelper;
-        private readonly IDataSerializer dataSerializer;
-        private bool isCommunicationEstablished;
-
-        private ProxyOperationManager proxyOperationManager = null;
-        private ITestRunEventsHandler baseTestRunEventsHandler;
-        private bool skipDefaultAdapters;
-        private readonly bool debugEnabledForTestSession = false;
-
-        /// <inheritdoc/>
-        public bool IsInitialized { get; private set; } = false;
-
-        /// <summary>
-        /// Gets or sets the cancellation token source.
-        /// </summary>
-        public CancellationTokenSource CancellationTokenSource
+        get
         {
-            get { return this.proxyOperationManager.CancellationTokenSource; }
-            set { this.proxyOperationManager.CancellationTokenSource = value; }
+            TPDebug.Assert(_proxyOperationManager is not null, "_proxyOperationManager is null");
+            return _proxyOperationManager.CancellationTokenSource;
         }
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info.</param>
-        /// <param name="proxyOperationManagerCreator">The proxy operation manager creator.</param>
-        /// <param name="debugEnabledForTestSession">
-        /// A flag indicating if debugging should be enabled or not.
-        /// </param>
-        public ProxyExecutionManager(
-            TestSessionInfo testSessionInfo,
-            Func<string, ProxyExecutionManager, ProxyOperationManager> proxyOperationManagerCreator,
-            bool debugEnabledForTestSession)
+        set
         {
-            // Filling in test session info and proxy information.
-            this.testSessionInfo = testSessionInfo;
-            this.proxyOperationManagerCreator = proxyOperationManagerCreator;
-
-            // This should be set to enable debugging when we have test session info available.
-            this.debugEnabledForTestSession = debugEnabledForTestSession;
-
-            this.requestData = null;
-            this.testHostManager = null;
-            this.dataSerializer = JsonDataSerializer.Instance;
-            this.fileHelper = new FileHelper();
-            this.isCommunicationEstablished = false;
+            TPDebug.Assert(_proxyOperationManager is not null, "_proxyOperationManager is null");
+            _proxyOperationManager.CancellationTokenSource = value;
         }
+    }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info.</param>
+    /// <param name="proxyOperationManagerCreator">The proxy operation manager creator.</param>
+    /// <param name="debugEnabledForTestSession">
+    /// A flag indicating if debugging should be enabled or not.
+    /// </param>
+    public ProxyExecutionManager(
+        TestSessionInfo testSessionInfo,
+        Func<string, ProxyExecutionManager, ProxyOperationManager> proxyOperationManagerCreator,
+        bool debugEnabledForTestSession)
+    {
+        // Filling in test session info and proxy information.
+        _testSessionInfo = testSessionInfo;
+        _proxyOperationManagerCreator = proxyOperationManagerCreator;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// The request data for providing services and data for run.
-        /// </param>
-        /// <param name="requestSender">Test request sender instance.</param>
-        /// <param name="testHostManager">Test host manager for this proxy.</param>
-        public ProxyExecutionManager(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager) :
-            this(
-                requestData,
-                requestSender,
-                testHostManager,
-                JsonDataSerializer.Instance,
-                new FileHelper())
-        {
-        }
+        // This should be set to enable debugging when we have test session info available.
+        _debugEnabledForTestSession = debugEnabledForTestSession;
+
+        _testHostManager = null;
+        _dataSerializer = JsonDataSerializer.Instance;
+        _fileHelper = new FileHelper();
+        _isCommunicationEstablished = false;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// The request data for providing services and data for run.
+    /// </param>
+    /// <param name="requestSender">Test request sender instance.</param>
+    /// <param name="testHostManager">Test host manager for this proxy.</param>
+    /// <param name="testHostManagerFramework">Framework of testhost</param>
+    public ProxyExecutionManager(
+        IRequestData requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework testHostManagerFramework) :
+        this(
+            requestData,
+            requestSender,
+            testHostManager,
+            testHostManagerFramework,
+            JsonDataSerializer.Instance,
+            new FileHelper())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
+    /// </summary>
+    ///
+    /// <remarks>
+    /// Constructor with dependency injection. Used for unit testing.
+    /// </remarks>
+    ///
+    /// <param name="requestData">The request data for common services and data for run.</param>
+    /// <param name="requestSender">Request sender instance.</param>
+    /// <param name="testHostManager">Test host manager instance.</param>
+    /// <param name="testHostManagerFramework">Framework of testhost</param>
+    /// <param name="dataSerializer">Data serializer instance.</param>
+    /// <param name="fileHelper">File helper instance.</param>
+    internal ProxyExecutionManager(
+        IRequestData requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework testHostManagerFramework,
+        IDataSerializer dataSerializer,
+        IFileHelper fileHelper)
+    {
+        _testHostManager = testHostManager;
+        _dataSerializer = dataSerializer;
+        _isCommunicationEstablished = false;
+        _fileHelper = fileHelper;
+
+        // Create a new proxy operation manager.
+        _proxyOperationManager = new ProxyOperationManager(requestData, requestSender, testHostManager, testHostManagerFramework, this);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyExecutionManager"/> class.
-        /// </summary>
-        /// 
-        /// <remarks>
-        /// Constructor with dependency injection. Used for unit testing.
-        /// </remarks>
-        /// 
-        /// <param name="requestData">The request data for common services and data for run.</param>
-        /// <param name="requestSender">Request sender instance.</param>
-        /// <param name="testHostManager">Test host manager instance.</param>
-        /// <param name="dataSerializer">Data serializer instance.</param>
-        /// <param name="fileHelper">File helper instance.</param>
-        internal ProxyExecutionManager(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager,
-            IDataSerializer dataSerializer,
-            IFileHelper fileHelper)
-        {
-            this.testHostManager = testHostManager;
-            this.dataSerializer = dataSerializer;
-            this.isCommunicationEstablished = false;
-            this.requestData = requestData;
-            this.fileHelper = fileHelper;
-
-            // Create a new proxy operation manager.
-            this.proxyOperationManager = new ProxyOperationManager(requestData, requestSender, testHostManager, this);
-        }
 
-        #endregion
+    #region IProxyExecutionManager implementation.
 
-        #region IProxyExecutionManager implementation.
+    /// <inheritdoc/>
+    public virtual void Initialize(bool skipDefaultAdapters)
+    {
+        _skipDefaultAdapters = skipDefaultAdapters;
+        IsInitialized = true;
+    }
 
-        /// <inheritdoc/>
-        public virtual void Initialize(bool skipDefaultAdapters)
+    public virtual void InitializeTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        if (_proxyOperationManager == null)
         {
-            this.skipDefaultAdapters = skipDefaultAdapters;
-            this.IsInitialized = true;
+            // In case we have an active test session, we always prefer the already
+            // created proxies instead of the ones that need to be created on the spot.
+            var sources = testRunCriteria.HasSpecificTests
+                ? TestSourcesUtility.GetSources(testRunCriteria.Tests)
+                : testRunCriteria.Sources;
+
+            TPDebug.Assert(_proxyOperationManagerCreator is not null, "_proxyOperationManagerCreator is null");
+            TPDebug.Assert(sources is not null, "sources is null");
+            _proxyOperationManager = _proxyOperationManagerCreator(
+                sources.First(),
+                this);
+
+            _testHostManager = _proxyOperationManager.TestHostManager;
         }
 
-        /// <inheritdoc/>
-        public virtual int StartTestRun(TestRunCriteria testRunCriteria, ITestRunEventsHandler eventHandler)
+        _baseTestRunEventsHandler = eventHandler;
+        try
         {
-            if (this.proxyOperationManager == null)
-            {
-                // In case we have an active test session, we always prefer the already
-                // created proxies instead of the ones that need to be created on the spot.
-                var sources = testRunCriteria.HasSpecificTests
-                    ? TestSourcesUtility.GetSources(testRunCriteria.Tests)
-                    : testRunCriteria.Sources;
-
-                this.proxyOperationManager = this.proxyOperationManagerCreator(
-                    sources.First(),
-                    this);
-
-                this.testHostManager = this.proxyOperationManager.TestHostManager;
-                this.requestData = this.proxyOperationManager.RequestData;
-            }
+            EqtTrace.Verbose("ProxyExecutionManager: Test host is always Lazy initialize.");
 
-            this.baseTestRunEventsHandler = eventHandler;
-            try
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("ProxyExecutionManager: Test host is always Lazy initialize.");
-                }
-
-                var testSources = new List<string>(
-                    testRunCriteria.HasSpecificSources
+            _testSources = new List<string>(
+                testRunCriteria.HasSpecificSources
                     ? testRunCriteria.Sources
                     // If the test execution is with a test filter, group them by sources.
                     : testRunCriteria.Tests.GroupBy(tc => tc.Source).Select(g => g.Key));
 
-                this.isCommunicationEstablished = this.proxyOperationManager.SetupChannel(
-                    testSources,
-                    testRunCriteria.TestRunSettings);
+            _isCommunicationEstablished = _proxyOperationManager.SetupChannel(
+                _testSources,
+                testRunCriteria.TestRunSettings);
 
-                if (this.isCommunicationEstablished)
-                {
-                    this.proxyOperationManager.CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
-
-                    this.InitializeExtensions(testSources);
-
-                    // This code should be in sync with InProcessProxyExecutionManager.StartTestRun
-                    // execution context.
-                    var executionContext = new TestExecutionContext(
-                        testRunCriteria.FrequencyOfRunStatsChangeEvent,
-                        testRunCriteria.RunStatsChangeEventTimeout,
-                        inIsolation: false,
-                        keepAlive: testRunCriteria.KeepAlive,
-                        isDataCollectionEnabled: false,
-                        areTestCaseLevelEventsRequired: false,
-                        hasTestRun: true,
-                        // Debugging should happen if there's a custom test host launcher present
-                        // and is in debugging mode, or if the debugging is enabled in case the
-                        // test session info is present.
-                        isDebug:
-                            (testRunCriteria.TestHostLauncher != null && testRunCriteria.TestHostLauncher.IsDebug)
-                            || this.debugEnabledForTestSession,
-                        testCaseFilter: testRunCriteria.TestCaseFilter,
-                        filterOptions: testRunCriteria.FilterOptions);
-
-                    // This is workaround for the bug https://github.com/Microsoft/vstest/issues/970
-                    var runsettings = this.proxyOperationManager.RemoveNodesFromRunsettingsIfRequired(
-                        testRunCriteria.TestRunSettings,
-                        (testMessageLevel, message) => { this.LogMessage(testMessageLevel, message); });
-
-                    if (testRunCriteria.HasSpecificSources)
-                    {
-                        var runRequest = testRunCriteria.CreateTestRunCriteriaForSources(
-                            testHostManager,
-                            runsettings,
-                            executionContext,
-                            testSources);
-                        this.proxyOperationManager.RequestSender.StartTestRun(runRequest, this);
-                    }
-                    else
-                    {
-                        var runRequest = testRunCriteria.CreateTestRunCriteriaForTests(
-                            testHostManager,
-                            runsettings,
-                            executionContext,
-                            testSources);
-                        this.proxyOperationManager.RequestSender.StartTestRun(runRequest, this);
-                    }
-                }
-            }
-            catch (Exception exception)
+            if (_isCommunicationEstablished)
             {
-                EqtTrace.Error("ProxyExecutionManager.StartTestRun: Failed to start test run: {0}", exception);
+                _proxyOperationManager.CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
 
-                // Log error message to design mode and CLI.
-                // TestPlatformException is expected exception, log only the message.
-                // For other exceptions, log the stacktrace as well.
-                var errorMessage = exception is TestPlatformException ? exception.Message : exception.ToString();
-                var testMessagePayload = new TestMessagePayload()
-                {
-                    MessageLevel = TestMessageLevel.Error,
-                    Message = errorMessage
-                };
-                this.HandleRawMessage(this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
-                this.LogMessage(TestMessageLevel.Error, errorMessage);
-
-                // Send a run complete to caller. Similar logic is also used in
-                // ParallelProxyExecutionManager.StartTestRunOnConcurrentManager.
-                //
-                // Aborted is `true`: in case of parallel run (or non shared host), an aborted
-                // message ensures another execution manager created to replace the current one.
-                // This will help if the current execution manager is aborted due to irreparable
-                // error and the test host is lost as well.
-                var completeArgs = new TestRunCompleteEventArgs(null, false, true, null, new Collection<AttachmentSet>(), TimeSpan.Zero);
-                var testRunCompletePayload = new TestRunCompletePayload { TestRunCompleteArgs = completeArgs };
-                this.HandleRawMessage(this.dataSerializer.SerializePayload(MessageType.ExecutionComplete, testRunCompletePayload));
-                this.HandleTestRunComplete(completeArgs, null, null, null);
+                InitializeExtensions(_testSources);
             }
-
-            return 0;
         }
-
-        /// <inheritdoc/>
-        public virtual void Cancel(ITestRunEventsHandler eventHandler)
+        catch (Exception ex)
         {
-            // Just in case ExecuteAsync isn't called yet, set the eventhandler.
-            if (this.baseTestRunEventsHandler == null)
-            {
-                this.baseTestRunEventsHandler = eventHandler;
-            }
-
-            // Do nothing if the proxy is not initialized yet.
-            if (this.proxyOperationManager == null)
-            {
-                return;
-            }
-
-            // Cancel fast, try to stop testhost deployment/launch.
-            this.proxyOperationManager.CancellationTokenSource.Cancel();
-            if (this.isCommunicationEstablished)
-            {
-                this.proxyOperationManager.RequestSender.SendTestRunCancel();
-            }
+            HandleError(ex);
         }
-
-        /// <inheritdoc/>
-        public void Abort(ITestRunEventsHandler eventHandler)
+    }
+    /// <inheritdoc/>
+    public virtual int StartTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        try
         {
-            // Just in case ExecuteAsync isn't called yet, set the eventhandler.
-            if (this.baseTestRunEventsHandler == null)
+            if (!_isCommunicationEstablished)
             {
-                this.baseTestRunEventsHandler = eventHandler;
+                InitializeTestRun(testRunCriteria, eventHandler);
             }
 
-            // Do nothing if the proxy is not initialized yet.
-            if (this.proxyOperationManager == null)
+            // In certain scenarios (like the one for non-parallel dotnet runs) we may end up
+            // using the incorrect events handler which can have nasty side effects, like failing to
+            // properly terminate the communication with any data collector. The reason for this is
+            // that the initialization and the actual test run have been decoupled and are now two
+            // separate operations. In the initialization phase we already provide an events handler
+            // to be invoked when data flows back from the testhost, but the "correct" handler is
+            // only provided in the run phase which may occur later on. This was not a problem when
+            // initialization was part of the normal test run workflow. However, now that the two
+            // operations are separate and because initialization could've already taken place, the
+            // communication channel could be properly set up, which means that we don't get to
+            // overwrite the old events handler anymore.
+            // The solution to this is to make sure that we always use the most "up-to-date"
+            // handler, and that would be the handler we got as an argument when this method was
+            // called. When initialization and test run are part of the same operation the behavior
+            // is still correct, since the two events handler will be equal and there'll be no need
+            // for an overwrite.
+            if (eventHandler != _baseTestRunEventsHandler)
             {
-                return;
+                _baseTestRunEventsHandler = eventHandler;
             }
 
-            // Cancel fast, try to stop testhost deployment/launch.
-            this.proxyOperationManager.CancellationTokenSource.Cancel();
+            TPDebug.Assert(_proxyOperationManager is not null, "ProxyOperationManager is null.");
 
-            if (this.isCommunicationEstablished)
+            if (_isCommunicationEstablished)
             {
-                this.proxyOperationManager.RequestSender.SendTestRunAbort();
+                var testSources = new List<string>(
+                    testRunCriteria.HasSpecificSources
+                        ? testRunCriteria.Sources
+                        // If the test execution is with a test filter, group them by sources.
+                        : testRunCriteria.Tests.GroupBy(tc => tc.Source).Select(g => g.Key));
+
+                // This code should be in sync with InProcessProxyExecutionManager.StartTestRun
+                // execution context.
+                var executionContext = new TestExecutionContext(
+                    testRunCriteria.FrequencyOfRunStatsChangeEvent,
+                    testRunCriteria.RunStatsChangeEventTimeout,
+                    inIsolation: false,
+                    keepAlive: testRunCriteria.KeepAlive,
+                    isDataCollectionEnabled: false,
+                    areTestCaseLevelEventsRequired: false,
+                    hasTestRun: true,
+                    // Debugging should happen if there's a custom test host launcher present
+                    // and is in debugging mode, or if the debugging is enabled in case the
+                    // test session info is present.
+                    isDebug:
+                        (testRunCriteria.TestHostLauncher != null && testRunCriteria.TestHostLauncher.IsDebug)
+                        || _debugEnabledForTestSession,
+                    testCaseFilter: testRunCriteria.TestCaseFilter,
+                    filterOptions: testRunCriteria.FilterOptions);
+
+                // This is workaround for the bug https://github.com/Microsoft/vstest/issues/970
+                var runsettings = _proxyOperationManager.RemoveNodesFromRunsettingsIfRequired(
+                    testRunCriteria.TestRunSettings,
+                    LogMessage);
+
+                if (testRunCriteria.HasSpecificSources)
+                {
+                    var runRequest = testRunCriteria.CreateTestRunCriteriaForSources(
+                        _testHostManager,
+                        runsettings,
+                        executionContext,
+                        _testSources);
+                    _proxyOperationManager.RequestSender.StartTestRun(runRequest, this);
+                }
+                else
+                {
+                    var runRequest = testRunCriteria.CreateTestRunCriteriaForTests(
+                        _testHostManager,
+                        runsettings,
+                        executionContext,
+                        _testSources);
+                    _proxyOperationManager.RequestSender.StartTestRun(runRequest, this);
+                }
             }
         }
+        catch (Exception exception)
+        {
+            HandleError(exception);
+        }
+
+        return 0;
+    }
+
+    private void HandleError(Exception exception)
+    {
+        EqtTrace.Error("ProxyExecutionManager.StartTestRun: Failed to start test run: {0}", exception);
 
-        /// <inheritdoc/>
-        public void Close()
+        // Log error message to design mode and CLI.
+        // TestPlatformException is expected exception, log only the message.
+        // For other exceptions, log the stacktrace as well.
+        var errorMessage = exception is TestPlatformException ? exception.Message : exception.ToString();
+        var testMessagePayload = new TestMessagePayload
         {
-            // Do nothing if the proxy is not initialized yet.
-            if (this.proxyOperationManager == null)
-            {
-                return;
-            }
+            MessageLevel = TestMessageLevel.Error,
+            Message = errorMessage
+        };
+        HandleRawMessage(_dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload));
+        LogMessage(TestMessageLevel.Error, errorMessage);
+
+        // Send a run complete to caller. Similar logic is also used in
+        // ParallelProxyExecutionManager.StartTestRunOnConcurrentManager.
+        //
+        // Aborted is `true`: in case of parallel run (or non shared host), an aborted
+        // message ensures another execution manager created to replace the current one.
+        // This will help if the current execution manager is aborted due to irreparable
+        // error and the test host is lost as well.
+        var completeArgs = new TestRunCompleteEventArgs(null, false, true, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.Zero);
+        var testRunCompletePayload = new TestRunCompletePayload { TestRunCompleteArgs = completeArgs };
+        HandleRawMessage(_dataSerializer.SerializePayload(MessageType.ExecutionComplete, testRunCompletePayload));
+        HandleTestRunComplete(completeArgs, null, null, null);
+    }
 
-            // When no test session is being used we don't share the testhost
-            // between test discovery and test run. The testhost is closed upon
-            // successfully completing the operation it was spawned for.
-            //
-            // In contrast, the new workflow (using test sessions) means we should keep
-            // the testhost alive until explicitly closed by the test session owner.
-            if (this.testSessionInfo == null)
-            {
-                this.proxyOperationManager.Close();
-                return;
-            }
+    /// <inheritdoc/>
+    public virtual void Cancel(IInternalTestRunEventsHandler eventHandler)
+    {
+        // Just in case ExecuteAsync isn't called yet, set the eventhandler.
+        _baseTestRunEventsHandler ??= eventHandler;
 
-            TestSessionPool.Instance.ReturnProxy(this.testSessionInfo, this.proxyOperationManager.Id);
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager == null)
+        {
+            return;
         }
 
-        /// <inheritdoc/>
-        public virtual int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        // Cancel fast, try to stop testhost deployment/launch.
+        _proxyOperationManager.CancellationTokenSource.Cancel();
+        if (_isCommunicationEstablished)
         {
-            return this.baseTestRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+            _proxyOperationManager.RequestSender.SendTestRunCancel();
         }
+    }
+
+    /// <inheritdoc/>
+    public void Abort(IInternalTestRunEventsHandler eventHandler)
+    {
+        // Just in case ExecuteAsync isn't called yet, set the eventhandler.
+        _baseTestRunEventsHandler ??= eventHandler;
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager == null)
         {
-            return ((ITestRunEventsHandler2)this.baseTestRunEventsHandler).AttachDebuggerToProcess(pid);
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris)
+        // Cancel fast, try to stop testhost deployment/launch.
+        _proxyOperationManager.CancellationTokenSource.Cancel();
+
+        if (_isCommunicationEstablished)
         {
-            this.baseTestRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+            _proxyOperationManager.RequestSender.SendTestRunAbort();
         }
+    }
 
-        /// <inheritdoc/>
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
+    /// <inheritdoc/>
+    public void Close()
+    {
+        // Do nothing if the proxy is not initialized yet.
+        if (_proxyOperationManager == null)
         {
-            this.baseTestRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
+            return;
         }
 
-        /// <inheritdoc/>
-        public void HandleRawMessage(string rawMessage)
+        // When no test session is being used, we don't share the testhost
+        // between test discovery and test run. The testhost is closed upon
+        // successfully completing the operation it was spawned for.
+        //
+        // In contrast, the new workflow (using test sessions) means we should keep
+        // the testhost alive until explicitly closed by the test session owner, but
+        // only if the testhost is part of a test session (i.e. the proxy operation manager
+        // id is valid), since there is the distinct possibility of test session criteria
+        // changing between spawn and discovery/run, causing a new proxy operation manager
+        // to be spawned on demand instead of dequeuing an incompatible proxy from the pool.
+        if (_testSessionInfo == null || _proxyOperationManager.Id < 0)
         {
-            var message = this.dataSerializer.DeserializeMessage(rawMessage);
+            _proxyOperationManager.Close();
+            return;
+        }
 
-            if (string.Equals(message.MessageType, MessageType.ExecutionComplete))
-            {
-                this.Close();
-            }
+        TestSessionPool.Instance.ReturnProxy(_testSessionInfo, _proxyOperationManager.Id);
+    }
 
-            this.baseTestRunEventsHandler.HandleRawMessage(rawMessage);
-        }
+    /// <inheritdoc/>
+    public virtual int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        return _baseTestRunEventsHandler?.LaunchProcessWithDebuggerAttached(testProcessStartInfo) ?? -1;
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        // TestHost did not provide any additional TargetFramework info for the process it wants to attach to,
+        // specify the TargetFramework of the testhost, in case it is just an old testhost that is not aware
+        // of this capability.
+        attachDebuggerInfo.TargetFramework ??= _proxyOperationManager?.TestHostManagerFramework?.ToString();
 
-        /// <inheritdoc/>
-        public void HandleLogMessage(TestMessageLevel level, string message)
+        if (attachDebuggerInfo.Sources is null || attachDebuggerInfo.Sources.Count == 0)
         {
-            this.baseTestRunEventsHandler.HandleLogMessage(level, message);
+            attachDebuggerInfo.Sources = _testSources;
         }
 
-        #endregion
+        return _baseTestRunEventsHandler?.AttachDebuggerToProcess(attachDebuggerInfo) ?? false;
+    }
 
-        #region IBaseProxy implementation.
-        /// <inheritdoc/>
-        public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
-        {
-            // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
-            var telemetryOptedIn = this.proxyOperationManager.RequestData.IsTelemetryOptedIn ? "true" : "false";
-            testProcessStartInfo.Arguments += " --telemetryoptedin " + telemetryOptedIn;
-            return testProcessStartInfo;
-        }
-        #endregion
-
-        /// <summary>
-        /// Ensures that the engine is ready for test operations. Usually includes starting up the
-        /// test host process.
-        /// </summary>
-        /// 
-        /// <param name="sources">List of test sources.</param>
-        /// <param name="runSettings">Run settings to be used.</param>
-        /// 
-        /// <returns>
-        /// Returns true if the communication is established b/w runner and host, false otherwise.
-        /// </returns>
-        public virtual bool SetupChannel(IEnumerable<string> sources, string runSettings)
+    /// <inheritdoc/>
+    public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris)
+    {
+        _baseTestRunEventsHandler?.HandleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+    }
+
+    /// <inheritdoc/>
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        _baseTestRunEventsHandler?.HandleTestRunStatsChange(testRunChangedArgs);
+    }
+
+    /// <inheritdoc/>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // TODO: PERF: - why do we have to deserialize the messages here only to read that this is
+        // execution complete? Why can't we act on it somewhere else where the result of deserialization is not
+        // thrown away?
+        var message = _dataSerializer.DeserializeMessage(rawMessage);
+
+        if (string.Equals(message.MessageType, MessageType.ExecutionComplete))
         {
-            return this.proxyOperationManager.SetupChannel(sources, runSettings);
+            Close();
         }
 
-        private void LogMessage(TestMessageLevel testMessageLevel, string message)
-        {
-            // Log to vs ide test output.
-            var testMessagePayload = new TestMessagePayload { MessageLevel = testMessageLevel, Message = message };
-            var rawMessage = this.dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
-            this.HandleRawMessage(rawMessage);
+        _baseTestRunEventsHandler?.HandleRawMessage(rawMessage);
+    }
 
-            // Log to vstest.console.
-            this.HandleLogMessage(testMessageLevel, message);
-        }
+    /// <inheritdoc/>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _baseTestRunEventsHandler?.HandleLogMessage(level, message);
+    }
 
-        private void InitializeExtensions(IEnumerable<string> sources)
-        {
-            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, this.skipDefaultAdapters);
+    #endregion
 
-            // Filter out non existing extensions.
-            var nonExistingExtensions = extensions.Where(extension => !this.fileHelper.Exists(extension));
-            if (nonExistingExtensions.Any())
-            {
-                this.LogMessage(TestMessageLevel.Warning, string.Format(Resources.Resources.NonExistingExtensions, string.Join(",", nonExistingExtensions)));
-            }
+    #region IBaseProxy implementation.
+    /// <inheritdoc/>
+    public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
+        var telemetryOptedIn = _proxyOperationManager?.RequestData?.IsTelemetryOptedIn == true ? "true" : "false";
+        testProcessStartInfo.Arguments += " --telemetryoptedin " + telemetryOptedIn;
+        return testProcessStartInfo;
+    }
+    #endregion
 
-            var sourceList = sources.ToList();
-            var platformExtensions = this.testHostManager.GetTestPlatformExtensions(sourceList, extensions.Except(nonExistingExtensions));
+    /// <summary>
+    /// Ensures that the engine is ready for test operations. Usually includes starting up the
+    /// test host process.
+    /// </summary>
+    ///
+    /// <param name="sources">List of test sources.</param>
+    /// <param name="runSettings">Run settings to be used.</param>
+    ///
+    /// <returns>
+    /// Returns true if the communication is established b/w runner and host, false otherwise.
+    /// </returns>
+    public virtual bool SetupChannel(IEnumerable<string> sources, string runSettings)
+    {
+        return _proxyOperationManager?.SetupChannel(sources, runSettings) ?? false;
+    }
 
-            // Only send this if needed.
-            if (platformExtensions.Any())
-            {
-                this.proxyOperationManager.RequestSender.InitializeExecution(platformExtensions);
-            }
+    private void LogMessage(TestMessageLevel testMessageLevel, string message)
+    {
+        // Log to vs ide test output.
+        var testMessagePayload = new TestMessagePayload { MessageLevel = testMessageLevel, Message = message };
+        var rawMessage = _dataSerializer.SerializePayload(MessageType.TestMessage, testMessagePayload);
+        HandleRawMessage(rawMessage);
+
+        // Log to vstest.console.
+        HandleLogMessage(testMessageLevel, message);
+    }
+
+    private void InitializeExtensions(IEnumerable<string> sources)
+    {
+        var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, _skipDefaultAdapters);
+
+        // Filter out non existing extensions.
+        var nonExistingExtensions = extensions.Where(extension => !_fileHelper.Exists(extension));
+        if (nonExistingExtensions.Any())
+        {
+            LogMessage(TestMessageLevel.Warning, string.Format(CultureInfo.CurrentCulture, Resources.Resources.NonExistingExtensions, string.Join(",", nonExistingExtensions)));
+        }
+
+        var sourceList = sources.ToList();
+        var platformExtensions = _testHostManager?.GetTestPlatformExtensions(sourceList, extensions.Except(nonExistingExtensions));
+
+        // Only send this if needed.
+        if (platformExtensions is not null && platformExtensions.Any())
+        {
+            _proxyOperationManager?.RequestSender.InitializeExecution(platformExtensions);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs
index 8aad17856d..f6fcaa00b4 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs
@@ -1,223 +1,239 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// The proxy execution manager with data collection.
+/// </summary>
+internal class ProxyExecutionManagerWithDataCollection : ProxyExecutionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private IDictionary<string, string?>? _dataCollectionEnvironmentVariables;
+    private int _dataCollectionPort;
+    private readonly IRequestData _requestData;
 
     /// <summary>
-    /// The proxy execution manager with data collection.
+    /// Initializes a new instance of the <see cref="ProxyExecutionManagerWithDataCollection"/> class.
     /// </summary>
-    internal class ProxyExecutionManagerWithDataCollection : ProxyExecutionManager
+    /// <param name="requestSender">
+    /// Test request sender instance.
+    /// </param>
+    /// <param name="testHostManager">
+    /// Test host manager for this operation.
+    /// </param>
+    /// <param name="testHostManagerFramework">Framework of the testhost.</param>
+    /// <param name="proxyDataCollectionManager">
+    /// The proxy Data Collection Manager.
+    /// </param>
+    /// <param name="requestData">
+    /// The request data for providing execution services and data.
+    /// </param>
+    public ProxyExecutionManagerWithDataCollection(
+        IRequestData requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework testHostManagerFramework,
+        IProxyDataCollectionManager proxyDataCollectionManager)
+        : base(
+            requestData,
+            requestSender,
+            testHostManager,
+            testHostManagerFramework)
     {
-        private IDictionary<string, string> dataCollectionEnvironmentVariables;
-        private int dataCollectionPort;
-        private IRequestData requestData;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyExecutionManagerWithDataCollection"/> class.
-        /// </summary>
-        /// <param name="requestSender">
-        /// Test request sender instance.
-        /// </param>
-        /// <param name="testHostManager">
-        /// Test host manager for this operation.
-        /// </param>
-        /// <param name="proxyDataCollectionManager">
-        /// The proxy Data Collection Manager.
-        /// </param>
-        /// <param name="requestData">
-        /// The request data for providing execution services and data.
-        /// </param>
-        public ProxyExecutionManagerWithDataCollection(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager,
-            IProxyDataCollectionManager proxyDataCollectionManager)
-            : base(
-                  requestData,
-                  requestSender,
-                  testHostManager)
-        {
-            this.ProxyDataCollectionManager = proxyDataCollectionManager;
-            this.DataCollectionRunEventsHandler = new DataCollectionRunEventsHandler();
-            this.requestData = requestData;
-            this.dataCollectionEnvironmentVariables = new Dictionary<string, string>();
+        ProxyDataCollectionManager = proxyDataCollectionManager;
+        DataCollectionRunEventsHandler = new DataCollectionRunEventsHandler();
+        _requestData = requestData;
+        _dataCollectionEnvironmentVariables = new Dictionary<string, string?>();
 
-            testHostManager.HostLaunched += this.TestHostLaunchedHandler;
-        }
+        testHostManager.HostLaunched += TestHostLaunchedHandler;
+    }
 
-        private void TestHostLaunchedHandler(object sender, HostProviderEventArgs e)
-        {
-            this.ProxyDataCollectionManager.TestHostLaunched(e.ProcessId);
-        }
+    private void TestHostLaunchedHandler(object? sender, HostProviderEventArgs e)
+    {
+        ProxyDataCollectionManager.TestHostLaunched(e.ProcessId);
+    }
 
-        /// <summary>
-        /// Gets the data collection run events handler.
-        /// </summary>
-        internal DataCollectionRunEventsHandler DataCollectionRunEventsHandler
-        {
-            get; private set;
-        }
+    /// <summary>
+    /// Gets the data collection run events handler.
+    /// </summary>
+    internal DataCollectionRunEventsHandler DataCollectionRunEventsHandler
+    {
+        get; private set;
+    }
 
-        /// <summary>
-        /// Gets the proxy data collection manager.
-        /// </summary>
-        internal IProxyDataCollectionManager ProxyDataCollectionManager
-        {
-            get; private set;
-        }
+    /// <summary>
+    /// Gets the proxy data collection manager.
+    /// </summary>
+    internal IProxyDataCollectionManager ProxyDataCollectionManager
+    {
+        get; private set;
+    }
 
-        /// <summary>
-        /// Gets the cancellation token for execution.
-        /// </summary>
-        internal CancellationToken CancellationToken => CancellationTokenSource.Token;
+    /// <summary>
+    /// Gets the cancellation token for execution.
+    /// </summary>
+    internal CancellationToken CancellationToken => CancellationTokenSource.Token;
 
-        /// <summary>
-        /// Ensure that the Execution component of engine is ready for execution usually by loading extensions.
-        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
-        /// </summary>
-        public override void Initialize(bool skipDefaultAdapters)
-        {
-            this.ProxyDataCollectionManager.Initialize();
+    /// <summary>
+    /// Ensure that the Execution component of engine is ready for execution usually by loading extensions.
+    /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
+    /// </summary>
+    public override void Initialize(bool skipDefaultAdapters)
+    {
+        ProxyDataCollectionManager.Initialize();
 
-            try
-            {
-                var dataCollectionParameters = this.ProxyDataCollectionManager.BeforeTestRunStart(
-                                                   resetDataCollectors: true,
-                                                   isRunStartingNow: true,
-                                                   runEventsHandler: this.DataCollectionRunEventsHandler);
+        try
+        {
+            var dataCollectionParameters = ProxyDataCollectionManager.BeforeTestRunStart(
+                resetDataCollectors: true,
+                isRunStartingNow: true,
+                runEventsHandler: DataCollectionRunEventsHandler);
 
-                if (dataCollectionParameters != null)
-                {
-                    this.dataCollectionEnvironmentVariables = dataCollectionParameters.EnvironmentVariables;
-                    this.dataCollectionPort = dataCollectionParameters.DataCollectionEventsPort;
-                }
-            }
-            catch (Exception)
+            if (dataCollectionParameters != null)
             {
-                // On failure in calling BeforeTestRunStart, call AfterTestRunEnd to end DataCollectionProcess
-                this.ProxyDataCollectionManager.AfterTestRunEnd(isCanceled: true, runEventsHandler: this.DataCollectionRunEventsHandler);
-                throw;
+                _dataCollectionEnvironmentVariables = dataCollectionParameters.EnvironmentVariables;
+                _dataCollectionPort = dataCollectionParameters.DataCollectionEventsPort;
             }
+        }
+        catch (Exception)
+        {
+            // On failure in calling BeforeTestRunStart, call AfterTestRunEnd to end DataCollectionProcess
+            ProxyDataCollectionManager.AfterTestRunEnd(isCanceled: true, runEventsHandler: DataCollectionRunEventsHandler);
+            throw;
+        }
+
+        base.Initialize(skipDefaultAdapters);
+    }
 
-            base.Initialize(skipDefaultAdapters);
+    /// <summary>
+    /// Starts the test run
+    /// </summary>
+    /// <param name="testRunCriteria"> The settings/options for the test run. </param>
+    /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
+    /// <returns> The process id of the runner executing tests. </returns>
+    public override int StartTestRun(TestRunCriteria testRunCriteria, IInternalTestRunEventsHandler eventHandler)
+    {
+        var currentEventHandler = eventHandler;
+        if (ProxyDataCollectionManager != null)
+        {
+            currentEventHandler = new DataCollectionTestRunEventsHandler(eventHandler, ProxyDataCollectionManager, CancellationTokenSource.Token);
         }
 
-        /// <summary>
-        /// Starts the test run
-        /// </summary>
-        /// <param name="testRunCriteria"> The settings/options for the test run. </param>
-        /// <param name="eventHandler"> EventHandler for handling execution events from Engine. </param>
-        /// <returns> The process id of the runner executing tests. </returns>
-        public override int StartTestRun(TestRunCriteria testRunCriteria, ITestRunEventsHandler eventHandler)
+        // Log all the messages that are reported while initializing DataCollectionClient
+        if (DataCollectionRunEventsHandler.Messages.Count > 0)
         {
-            var currentEventHandler = eventHandler;
-            if (this.ProxyDataCollectionManager != null)
+            foreach (var message in DataCollectionRunEventsHandler.Messages)
             {
-                currentEventHandler = new DataCollectionTestRunEventsHandler(eventHandler, this.ProxyDataCollectionManager, this.CancellationTokenSource.Token);
+                currentEventHandler.HandleLogMessage(message.Item1, message.Item2);
             }
 
-            // Log all the messages that are reported while initializing DataCollectionClient
-            if (this.DataCollectionRunEventsHandler.Messages.Count > 0)
-            {
-                foreach (var message in this.DataCollectionRunEventsHandler.Messages)
-                {
-                    currentEventHandler.HandleLogMessage(message.Item1, message.Item2);
-                }
+            DataCollectionRunEventsHandler.Messages.Clear();
+        }
 
-                this.DataCollectionRunEventsHandler.Messages.Clear();
+        // Push all raw messages
+        if (DataCollectionRunEventsHandler.RawMessages.Count > 0)
+        {
+            foreach (var message in DataCollectionRunEventsHandler.RawMessages)
+            {
+                currentEventHandler.HandleRawMessage(message);
             }
 
-            return base.StartTestRun(testRunCriteria, currentEventHandler);
+            DataCollectionRunEventsHandler.RawMessages.Clear();
         }
 
-        public override int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        return base.StartTestRun(testRunCriteria, currentEventHandler);
+    }
+
+    public override int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        if (_dataCollectionEnvironmentVariables != null)
         {
-            if (this.dataCollectionEnvironmentVariables != null)
+            testProcessStartInfo.EnvironmentVariables ??= new Dictionary<string, string?>();
+
+            foreach (var envVariable in _dataCollectionEnvironmentVariables)
             {
-                if (testProcessStartInfo.EnvironmentVariables == null)
+                if (testProcessStartInfo.EnvironmentVariables.ContainsKey(envVariable.Key))
                 {
-                    testProcessStartInfo.EnvironmentVariables = new Dictionary<string, string>();
+                    testProcessStartInfo.EnvironmentVariables[envVariable.Key] = envVariable.Value;
                 }
-
-                foreach(var envVariable in this.dataCollectionEnvironmentVariables)
+                else
                 {
-                    if (testProcessStartInfo.EnvironmentVariables.ContainsKey(envVariable.Key))
-                    {
-                        testProcessStartInfo.EnvironmentVariables[envVariable.Key] = envVariable.Value;
-                    }
-                    else
-                    {
-                        testProcessStartInfo.EnvironmentVariables.Add(envVariable.Key, envVariable.Value);
-                    }
+                    testProcessStartInfo.EnvironmentVariables.Add(envVariable.Key, envVariable.Value);
                 }
             }
-
-            return base.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
         }
 
-        /// <inheritdoc />
-        public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+        return base.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    }
+
+    /// <inheritdoc />
+    public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        if (testProcessStartInfo.EnvironmentVariables == null)
         {
-            if (testProcessStartInfo.EnvironmentVariables == null)
+            testProcessStartInfo.EnvironmentVariables = _dataCollectionEnvironmentVariables;
+        }
+        else if (_dataCollectionEnvironmentVariables is not null)
+        {
+            foreach (var kvp in _dataCollectionEnvironmentVariables)
             {
-                testProcessStartInfo.EnvironmentVariables = this.dataCollectionEnvironmentVariables;
-            }
-            else
-            {
-                foreach (var kvp in this.dataCollectionEnvironmentVariables)
-                {
-                    testProcessStartInfo.EnvironmentVariables[kvp.Key] = kvp.Value;
-                }
+                testProcessStartInfo.EnvironmentVariables[kvp.Key] = kvp.Value;
             }
+        }
 
-            // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
-            var telemetryOptedIn = this.requestData.IsTelemetryOptedIn ? "true" : "false";
-            testProcessStartInfo.Arguments += " --datacollectionport " + this.dataCollectionPort
-                                              + " --telemetryoptedin " + telemetryOptedIn;
+        // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
+        var telemetryOptedIn = _requestData.IsTelemetryOptedIn ? "true" : "false";
+        testProcessStartInfo.Arguments += $" --datacollectionport {_dataCollectionPort} --telemetryoptedin {telemetryOptedIn}";
 
-            return testProcessStartInfo;
-        }
+        return testProcessStartInfo;
     }
+}
 
+/// <summary>
+/// Handles Log and raw messages and stores them in list. Messages in the list will be logged after test execution begins.
+/// </summary>
+internal class DataCollectionRunEventsHandler : ITestMessageEventHandler
+{
     /// <summary>
-    /// Handles Log events and stores them in list. Messages in the list will be logged after test execution begins.
+    /// Initializes a new instance of the <see cref="DataCollectionRunEventsHandler"/> class.
     /// </summary>
-    internal class DataCollectionRunEventsHandler : ITestMessageEventHandler
+    public DataCollectionRunEventsHandler()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRunEventsHandler"/> class.
-        /// </summary>
-        public DataCollectionRunEventsHandler()
-        {
-            this.Messages = new List<Tuple<TestMessageLevel, string>>();
-        }
+        Messages = new List<Tuple<TestMessageLevel, string?>>();
+        RawMessages = new List<string>();
+    }
 
-        /// <summary>
-        /// Gets the cached messages.
-        /// </summary>
-        public List<Tuple<TestMessageLevel, string>> Messages { get; private set; }
+    /// <summary>
+    /// Gets the cached messages.
+    /// </summary>
+    public List<Tuple<TestMessageLevel, string?>> Messages { get; private set; }
 
-        /// <inheritdoc />
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.Messages.Add(new Tuple<TestMessageLevel, string>(level, message));
-        }
+    /// <summary>
+    /// Gets the cached raw messages.
+    /// </summary>
+    public List<string> RawMessages { get; private set; }
 
-        /// <inheritdoc />
-        public void HandleRawMessage(string rawMessage)
-        {
-            throw new NotImplementedException();
-        }
+    /// <inheritdoc />
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        Messages.Add(new Tuple<TestMessageLevel, string?>(level, message));
+    }
+
+    /// <inheritdoc />
+    public void HandleRawMessage(string rawMessage)
+    {
+        RawMessages.Add(rawMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs
index 4b2ecc07e9..8c47267c76 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs
@@ -1,485 +1,554 @@
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Base class for any operations that the client needs to drive through the engine.
+/// </summary>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class ProxyOperationManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    using CoreUtilities.Helpers;
-
-    using CrossPlatEngineResources = Resources.Resources;
-    using CommunicationUtilitiesResources = CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = CoreUtilities.Constants;
+    internal const string DotnetTesthostFriendlyName = "DotnetTestHost";
+    internal const string DefaultTesthostFriendlyName = "DefaultTestHost";
+
+    private readonly string _versionCheckPropertyName = "IsVersionCheckRequired";
+    private readonly string _makeRunsettingsCompatiblePropertyName = "MakeRunsettingsCompatible";
+    private readonly ManualResetEventSlim _testHostExited = new(false);
+    private readonly IProcessHelper _processHelper;
+    private readonly IBaseProxy? _baseProxy;
+
+    private bool _versionCheckRequired = true;
+    private bool _makeRunsettingsCompatible;
+    private bool _makeRunsettingsCompatibleSet;
+    private bool _initialized;
+    private bool _testHostLaunched;
+    private int _testHostProcessId;
+    private string? _testHostProcessStdError;
 
     /// <summary>
-    /// Base class for any operations that the client needs to drive through the engine.
+    /// Initializes a new instance of the <see cref="ProxyOperationManager"/> class.
     /// </summary>
-    public class ProxyOperationManager
+    ///
+    /// <param name="requestData">Request data instance.</param>
+    /// <param name="requestSender">Request sender instance.</param>
+    /// <param name="testHostManager">Test host manager instance.</param>
+    /// <param name="testhostManagerFramework">Testhost manager framework</param>
+    public ProxyOperationManager(
+        IRequestData? requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework testhostManagerFramework)
+        : this(
+            requestData,
+            requestSender,
+            testHostManager,
+            testhostManagerFramework,
+            null)
+    { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyOperationManager"/> class.
+    /// </summary>
+    ///
+    /// <param name="requestData">Request data instance.</param>
+    /// <param name="requestSender">Request sender instance.</param>
+    /// <param name="testHostManager">Test host manager instance.</param>
+    /// <param name="testhostManagerFramework">Testhost manager framework</param>
+    /// <param name="baseProxy">The base proxy.</param>
+    public ProxyOperationManager(
+        IRequestData? requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework? testhostManagerFramework,
+        IBaseProxy? baseProxy)
     {
-        private readonly string versionCheckPropertyName = "IsVersionCheckRequired";
-        private readonly string makeRunsettingsCompatiblePropertyName = "MakeRunsettingsCompatible";
-        private readonly ManualResetEventSlim testHostExited = new ManualResetEventSlim(false);
-        private readonly IProcessHelper processHelper;
-
-        private IBaseProxy baseProxy;
-        private bool versionCheckRequired = true;
-        private bool makeRunsettingsCompatible;
-        private bool makeRunsettingsCompatibleSet;
-        private bool initialized;
-        private bool testHostLaunched;
-        private int testHostProcessId;
-        private string testHostProcessStdError;
-
-        #region Constructors
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyOperationManager"/> class.
-        /// </summary>
-        ///
-        /// <param name="requestData">Request data instance.</param>
-        /// <param name="requestSender">Request sender instance.</param>
-        /// <param name="testHostManager">Test host manager instance.</param>
-        public ProxyOperationManager(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager)
-            : this(
-                  requestData,
-                  requestSender,
-                  testHostManager,
-                  null)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyOperationManager"/> class.
-        /// </summary>
-        ///
-        /// <param name="requestData">Request data instance.</param>
-        /// <param name="requestSender">Request sender instance.</param>
-        /// <param name="testHostManager">Test host manager instance.</param>
-        /// <param name="baseProxy">The base proxy.</param>
-        public ProxyOperationManager(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager,
-            IBaseProxy baseProxy)
+        RequestData = requestData;
+        RequestSender = requestSender;
+        TestHostManager = testHostManager;
+        _baseProxy = baseProxy;
+
+        _initialized = false;
+        _testHostLaunched = false;
+        _testHostProcessId = -1;
+        _processHelper = new ProcessHelper();
+        CancellationTokenSource = new CancellationTokenSource();
+        TestHostManagerFramework = testhostManagerFramework;
+    }
+
+    /// <summary>
+    /// Gets or sets the request data.
+    /// </summary>
+    public IRequestData? RequestData { get; set; }
+
+    /// <summary>
+    /// Gets or sets the server for communication.
+    /// </summary>
+    public ITestRequestSender RequestSender { get; set; }
+
+    /// <summary>
+    /// Gets or sets the test host manager.
+    /// </summary>
+    public ITestRuntimeProvider TestHostManager { get; set; }
+
+    /// <summary>
+    /// Gets the proxy operation manager id for proxy test session manager internal organization.
+    /// </summary>
+    internal int Id { get; set; } = -1;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the current proxy operation manager is part of a
+    /// test session.
+    /// </summary>
+    internal bool IsTestSessionEnabled { get; set; }
+
+    /// <summary>
+    /// Gets or sets the cancellation token source.
+    /// </summary>
+    public CancellationTokenSource CancellationTokenSource { get; set; }
+
+    public Framework? TestHostManagerFramework { get; }
+
+    #region IProxyOperationManager implementation.
+    /// <summary>
+    /// Initializes the proxy.
+    /// </summary>
+    ///
+    /// <param name="skipDefaultAdapters">
+    /// Flag indicating if we should skip the default adapters initialization.
+    /// </param>
+    public virtual void Initialize(bool skipDefaultAdapters)
+    {
+        // No-op.
+    }
+
+    /// <summary>
+    /// Ensures that the engine is ready for test operations. Usually includes starting up the
+    /// test host process.
+    /// </summary>
+    ///
+    /// <param name="sources">List of test sources.</param>
+    /// <param name="runSettings">Run settings to be used.</param>
+    /// <param name="eventHandler">The events handler.</param>
+    ///
+    /// <returns>
+    /// Returns true if the communication is established b/w runner and host, false otherwise.
+    /// </returns>
+    public virtual bool SetupChannel(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestMessageEventHandler eventHandler)
+    {
+        // NOTE: Event handler is ignored here, but it is used in the overloaded method.
+        return SetupChannel(sources, runSettings);
+    }
+
+    /// <summary>
+    /// Ensures that the engine is ready for test operations. Usually includes starting up the
+    /// test host process.
+    /// </summary>
+    ///
+    /// <param name="sources">List of test sources.</param>
+    /// <param name="runSettings">Run settings to be used.</param>
+    ///
+    /// <returns>
+    /// Returns true if the communication is established b/w runner and host, false otherwise.
+    /// </returns>
+    public virtual bool SetupChannel(IEnumerable<string> sources, string? runSettings)
+    {
+        CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
+
+        if (_initialized)
         {
-            this.RequestData = requestData;
-            this.RequestSender = requestSender;
-            this.TestHostManager = testHostManager;
-            this.baseProxy = baseProxy;
-
-            this.initialized = false;
-            this.testHostLaunched = false;
-            this.testHostProcessId = -1;
-            this.processHelper = new ProcessHelper();
-            this.CancellationTokenSource = new CancellationTokenSource();
+            return true;
         }
 
-        #endregion
-
-        #region Properties
-        /// <summary>
-        /// Gets or sets the request data.
-        /// </summary>
-        public IRequestData RequestData { get; set; }
-
-        /// <summary>
-        /// Gets or sets the server for communication.
-        /// </summary>
-        public ITestRequestSender RequestSender { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test host manager.
-        /// </summary>
-        public ITestRuntimeProvider TestHostManager { get; set; }
-
-        /// <summary>
-        /// Gets the proxy operation manager id for proxy test session manager internal organization.
-        /// </summary>
-        public int Id { get; set; } = -1;
-
-        /// <summary>
-        /// Gets or sets the cancellation token source.
-        /// </summary>
-        public CancellationTokenSource CancellationTokenSource { get; set; }
-        #endregion
-
-        #region IProxyOperationManager implementation.
-        /// <summary>
-        /// Initializes the proxy.
-        /// </summary>
-        ///
-        /// <param name="skipDefaultAdapters">
-        /// Flag indicating if we should skip the default adapters initialization.
-        /// </param>
-        public virtual void Initialize(bool skipDefaultAdapters)
+        // Check whether test sessions are supported if the current proxy operation manager is to
+        // be part of one.
+        if (IsTestSessionEnabled && !IsTesthostCompatibleWithTestSessions())
         {
-            // No-op.
+            return false;
         }
 
-        /// <summary>
-        /// Ensures that the engine is ready for test operations. Usually includes starting up the
-        /// test host process.
-        /// </summary>
-        ///
-        /// <param name="sources">List of test sources.</param>
-        /// <param name="runSettings">Run settings to be used.</param>
-        /// <param name="eventHandler">The events handler.</param>
-        ///
-        /// <returns>
-        /// Returns true if the communication is established b/w runner and host, false otherwise.
-        /// </returns>
-        public virtual bool SetupChannel(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestMessageEventHandler eventHandler)
+        var connTimeout = EnvironmentHelper.GetConnectionTimeout();
+
+        _testHostProcessStdError = string.Empty;
+        TestHostConnectionInfo testHostConnectionInfo = TestHostManager.GetTestHostConnectionInfo();
+
+        var portNumber = 0;
+        if (testHostConnectionInfo.Role == ConnectionRole.Client)
         {
-            // NOTE: Event handler is ignored here, but it is used in the overloaded method.
-            return this.SetupChannel(sources, runSettings);
+            portNumber = RequestSender.InitializeCommunication();
+            testHostConnectionInfo.Endpoint += portNumber;
         }
 
-        /// <summary>
-        /// Ensures that the engine is ready for test operations. Usually includes starting up the
-        /// test host process.
-        /// </summary>
-        ///
-        /// <param name="sources">List of test sources.</param>
-        /// <param name="runSettings">Run settings to be used.</param>
-        ///
-        /// <returns>
-        /// Returns true if the communication is established b/w runner and host, false otherwise.
-        /// </returns>
-        public virtual bool SetupChannel(IEnumerable<string> sources, string runSettings)
+        var processId = _processHelper.GetCurrentProcessId();
+        var connectionInfo = new TestRunnerConnectionInfo()
         {
-            this.CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
+            Port = portNumber,
+            ConnectionInfo = testHostConnectionInfo,
+            RunnerProcessId = processId,
+            LogFile = GetTimestampedLogFile(EqtTrace.LogFile),
+            TraceLevel = (int)EqtTrace.TraceLevel
+        };
+
+        // Subscribe to test host events.
+        TestHostManager.HostLaunched += TestHostManagerHostLaunched;
+        TestHostManager.HostExited += TestHostManagerHostExited;
+
+        // Get environment variables from run settings.
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettings);
+
+        // Get the test process start info.
+        var testHostStartInfo = UpdateTestProcessStartInfo(
+            TestHostManager.GetTestHostProcessStartInfo(
+                sources,
+                envVars,
+                connectionInfo));
+        try
+        {
+            // Launch the test host.
+            _testHostLaunched = TestHostManager.LaunchTestHostAsync(
+                testHostStartInfo,
+                CancellationTokenSource.Token).Result;
 
-            if (this.initialized)
+            if (_testHostLaunched && testHostConnectionInfo.Role == ConnectionRole.Host)
             {
-                return true;
+                // If test runtime is service host, try to poll for connection as client.
+                RequestSender.InitializeCommunication();
             }
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("ProxyOperationManager: Failed to launch testhost :{0}", ex);
 
-            var connTimeout = EnvironmentHelper.GetConnectionTimeout();
-
-            this.testHostProcessStdError = string.Empty;
-            TestHostConnectionInfo testHostConnectionInfo = this.TestHostManager.GetTestHostConnectionInfo();
+            CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
+            throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.FailedToLaunchTestHost, ex.ToString()));
+        }
 
-            var portNumber = 0;
-            if (testHostConnectionInfo.Role == ConnectionRole.Client)
-            {
-                portNumber = this.RequestSender.InitializeCommunication();
-                testHostConnectionInfo.Endpoint += portNumber;
-            }
+        // Warn the user that execution will wait for debugger attach.
+        var hostDebugEnabled = Environment.GetEnvironmentVariable("VSTEST_HOST_DEBUG");
+        var nativeHostDebugEnabled = Environment.GetEnvironmentVariable("VSTEST_HOST_NATIVE_DEBUG");
 
-            var processId = this.processHelper.GetCurrentProcessId();
-            var connectionInfo = new TestRunnerConnectionInfo()
-            {
-                Port = portNumber,
-                ConnectionInfo = testHostConnectionInfo,
-                RunnerProcessId = processId,
-                LogFile = this.GetTimestampedLogFile(EqtTrace.LogFile),
-                TraceLevel = (int)EqtTrace.TraceLevel
-            };
-
-            // Subscribe to test host events.
-            this.TestHostManager.HostLaunched += this.TestHostManagerHostLaunched;
-            this.TestHostManager.HostExited += this.TestHostManagerHostExited;
-
-            // Get environment variables from run settings.
-            var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettings);
-
-            // Get the test process start info.
-            var testHostStartInfo = this.UpdateTestProcessStartInfo(
-                this.TestHostManager.GetTestHostProcessStartInfo(
-                    sources,
-                    envVars,
-                    connectionInfo));
-            try
-            {
-                // Launch the test host.
-                this.testHostLaunched = this.TestHostManager.LaunchTestHostAsync(
-                    testHostStartInfo,
-                    this.CancellationTokenSource.Token).Result;
+        if ((!StringUtils.IsNullOrEmpty(hostDebugEnabled)
+             && hostDebugEnabled.Equals("1", StringComparison.Ordinal))
+            || (new PlatformEnvironment().OperatingSystem.Equals(PlatformOperatingSystem.Windows)
+                && !StringUtils.IsNullOrEmpty(nativeHostDebugEnabled)
+                && nativeHostDebugEnabled.Equals("1", StringComparison.Ordinal)))
+        {
+            ConsoleOutput.Instance.WriteLine(
+                CrossPlatEngineResources.HostDebuggerWarning,
+                OutputLevel.Warning);
 
-                if (this.testHostLaunched && testHostConnectionInfo.Role == ConnectionRole.Host)
-                {
-                    // If test runtime is service host, try to poll for connection as client.
-                    this.RequestSender.InitializeCommunication();
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("ProxyOperationManager: Failed to launch testhost :{0}", ex);
+            ConsoleOutput.Instance.WriteLine(
+                string.Format(
+                    CultureInfo.InvariantCulture,
+                    "Process Id: {0}, Name: {1}",
+                    _testHostProcessId,
+                    _processHelper.GetProcessName(_testHostProcessId)),
+                OutputLevel.Information);
+
+            // Increase connection timeout when debugging is enabled.
+            connTimeout *= 5;
+        }
 
-                this.CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
-                throw new TestPlatformException(string.Format(
-                    CultureInfo.CurrentUICulture,
-                    CrossPlatEngineResources.FailedToLaunchTestHost,
-                    ex.ToString()));
-            }
+        // If test host does not launch then throw exception, otherwise wait for connection.
+        if (!_testHostLaunched
+            || !RequestSender.WaitForRequestHandlerConnection(
+                connTimeout * 1000,
+                CancellationTokenSource.Token))
+        {
+            EqtTrace.Verbose($"Test host failed to start Test host launched:{_testHostLaunched} test host exited: {_testHostExited.IsSet}");
+            // Throw a test platform exception with the appropriate message if user requested cancellation.
+            CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
 
-            // Warn the user that execution will wait for debugger attach.
-            var hostDebugEnabled = Environment.GetEnvironmentVariable("VSTEST_HOST_DEBUG");
-            var nativeHostDebugEnabled = Environment.GetEnvironmentVariable("VSTEST_HOST_NATIVE_DEBUG");
+            // Throw a test platform exception along with the error messages from the test if the test host exited unexpectedly
+            // before communication was established.
+            ThrowOnTestHostExited(sources, _testHostExited.IsSet);
 
-            if ((!string.IsNullOrEmpty(hostDebugEnabled)
-                    && hostDebugEnabled.Equals("1", StringComparison.Ordinal))
-                || (new PlatformEnvironment().OperatingSystem.Equals(PlatformOperatingSystem.Windows)
-                    && !string.IsNullOrEmpty(nativeHostDebugEnabled)
-                    && nativeHostDebugEnabled.Equals("1", StringComparison.Ordinal)))
-            {
-                ConsoleOutput.Instance.WriteLine(
-                    CrossPlatEngineResources.HostDebuggerWarning,
-                    OutputLevel.Warning);
-
-                ConsoleOutput.Instance.WriteLine(
-                    string.Format(
-                        "Process Id: {0}, Name: {1}",
-                        this.testHostProcessId,
-                        this.processHelper.GetProcessName(this.testHostProcessId)),
-                    OutputLevel.Information);
-
-                // Increase connection timeout when debugging is enabled.
-                connTimeout *= 5;
-            }
+            // Throw a test platform exception stating the connection to test could not be established even after waiting
+            // for the configure timeout period.
+            ThrowExceptionOnConnectionFailure(sources, connTimeout);
+        }
 
-            // If test host does not launch then throw exception, otherwise wait for connection.
-            if (!this.testHostLaunched
-                || !this.RequestSender.WaitForRequestHandlerConnection(
-                    connTimeout * 1000,
-                    this.CancellationTokenSource.Token))
-            {
-                EqtTrace.Verbose($"Test host failed to start Test host launched:{testHostLaunched} test host exited: {testHostExited.IsSet}");
-                // Throw a test platform exception with the appropriate message if user requested cancellation.
-                this.CancellationTokenSource.Token.ThrowTestPlatformExceptionIfCancellationRequested();
+        // Handling special case for dotnet core projects with older test hosts.
+        // Older test hosts are not aware of protocol version check, hence we should not be
+        // sending VersionCheck message to these test hosts.
+        CompatIssueWithVersionCheckAndRunsettings();
+        if (_versionCheckRequired)
+        {
+            RequestSender.CheckVersionWithTestHost();
+        }
 
-                // Throw a test platform exception along with the error messages from the test if the test host exited unexpectedly
-                // before communication was established.
-                this.ThrowOnTestHostExited(this.testHostExited.IsSet);
+        _initialized = true;
 
-                // Throw a test platform exception stating the connection to test could not be established even after waiting
-                // for the configure timeout period.
-                this.ThrowExceptionOnConnectionFailure(connTimeout);
-            }
+        return true;
+    }
 
-            // Handling special case for dotnet core projects with older test hosts.
-            // Older test hosts are not aware of protocol version check, hence we should not be
-            // sending VersionCheck message to these test hosts.
-            this.CompatIssueWithVersionCheckAndRunsettings();
-            if (this.versionCheckRequired)
+    /// <summary>
+    /// Closes the channel and terminates the test host process.
+    /// </summary>
+    public virtual void Close()
+    {
+        try
+        {
+            // Do not send message if the host did not launch.
+            if (_testHostLaunched)
             {
-                this.RequestSender.CheckVersionWithTestHost();
-            }
-
-            this.initialized = true;
+                RequestSender.EndSession();
+
+                // We want to give test host a chance to safely close.
+                // The upper bound for wait should be 100ms.
+                var timeout = int.TryParse(Environment.GetEnvironmentVariable("VSTEST_TESTHOST_SHUTDOWN_TIMEOUT"), out var time)
+                    ? time
+                    : 100;
+                EqtTrace.Verbose("ProxyOperationManager.Close: waiting for test host to exit for {0} ms", timeout);
+                if (!_testHostExited.Wait(timeout))
+                {
+                    EqtTrace.Warning("ProxyOperationManager: Timed out waiting for test host to exit. Will terminate process.");
+                }
 
-            return true;
+                // Closing the communication channel.
+                RequestSender.Close();
+            }
         }
-
-        /// <summary>
-        /// Closes the channel and terminates the test host process.
-        /// </summary>
-        public virtual void Close()
+        catch (Exception ex)
+        {
+            // Error in sending an end session is not necessarily a failure. Discovery and execution should be already
+            // complete at this time.
+            EqtTrace.Warning("ProxyOperationManager: Failed to end session: " + ex);
+        }
+        finally
         {
+            _initialized = false;
+
+            // This is calling external code, make sure we don't fail when it throws
             try
             {
-                // Do not send message if the host did not launch.
-                if (this.testHostLaunched)
-                {
-                    this.RequestSender.EndSession();
-
-                    // We want to give test host a chance to safely close.
-                    // The upper bound for wait should be 100ms.
-                    var timeout = 100;
-                    EqtTrace.Verbose("ProxyOperationManager.Close: waiting for test host to exit for {0} ms", timeout);
-                    this.testHostExited.Wait(timeout);
-
-                    // Closing the communication channel.
-                    this.RequestSender.Close();
-                }
+                // Please clean up test host.
+                TestHostManager.CleanTestHostAsync(CancellationToken.None).Wait();
             }
             catch (Exception ex)
             {
-                // Error in sending an end session is not necessarily a failure. Discovery and execution should be already
-                // complete at this time.
-                EqtTrace.Warning("ProxyOperationManager: Failed to end session: " + ex);
+                EqtTrace.Error($"ProxyOperationManager: Cleaning testhost failed: {ex}");
             }
-            finally
-            {
-                this.initialized = false;
 
-                EqtTrace.Warning("ProxyOperationManager: Timed out waiting for test host to exit. Will terminate process.");
+            TestHostManager.HostExited -= TestHostManagerHostExited;
+            TestHostManager.HostLaunched -= TestHostManagerHostLaunched;
+        }
+    }
 
-                // Please clean up test host.
-                this.TestHostManager.CleanTestHostAsync(CancellationToken.None).Wait();
+    #endregion
 
-                this.TestHostManager.HostExited -= this.TestHostManagerHostExited;
-                this.TestHostManager.HostLaunched -= this.TestHostManagerHostLaunched;
-            }
+    /// <summary>
+    /// This method is exposed to enable derived classes to modify
+    /// <see cref="TestProcessStartInfo"/>. For example, data collectors need additional
+    /// environment variables to be passed.
+    /// </summary>
+    ///
+    /// <param name="testProcessStartInfo">The test process start info.</param>
+    ///
+    /// <returns>
+    /// The <see cref="TestProcessStartInfo"/>.
+    /// </returns>
+    public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        // TODO (copoiena): If called and testhost is already running, we should restart.
+        if (_baseProxy == null)
+        {
+            // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
+            var telemetryOptedIn = RequestData?.IsTelemetryOptedIn == true ? "true" : "false";
+            testProcessStartInfo.Arguments += " --telemetryoptedin " + telemetryOptedIn;
+            return testProcessStartInfo;
         }
 
-        #endregion
-
-        /// <summary>
-        /// This method is exposed to enable derived classes to modify
-        /// <see cref="TestProcessStartInfo"/>. For example, data collectors need additional
-        /// environment variables to be passed.
-        /// </summary>
-        ///
-        /// <param name="testProcessStartInfo">The test process start info.</param>
-        ///
-        /// <returns>
-        /// The <see cref="TestProcessStartInfo"/>.
-        /// </returns>
-        public virtual TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
-        {
-            // TODO (copoiena): If called and testhost is already running, we should restart.
-            if (this.baseProxy == null)
-            {
-                // Update Telemetry Opt in status because by default in Test Host Telemetry is opted out
-                var telemetryOptedIn = this.RequestData.IsTelemetryOptedIn ? "true" : "false";
-                testProcessStartInfo.Arguments += " --telemetryoptedin " + telemetryOptedIn;
-                return testProcessStartInfo;
-            }
+        return _baseProxy.UpdateTestProcessStartInfo(testProcessStartInfo);
+    }
 
-            return this.baseProxy.UpdateTestProcessStartInfo(testProcessStartInfo);
+    /// <summary>
+    /// This function will remove the unknown run settings nodes from the run settings strings.
+    /// This is necessary because older test hosts may throw exceptions when encountering
+    /// unknown nodes.
+    /// </summary>
+    ///
+    /// <param name="runsettingsXml">Run settings string.</param>
+    /// <param name="logMessage">Message logger.</param>
+    ///
+    /// <returns>The run settings after removing non-required nodes.</returns>
+    public string? RemoveNodesFromRunsettingsIfRequired(string? runsettingsXml, Action<TestMessageLevel, string> logMessage)
+    {
+        var updatedRunSettingsXml = runsettingsXml;
+        if (!_makeRunsettingsCompatibleSet)
+        {
+            CompatIssueWithVersionCheckAndRunsettings();
         }
 
-        /// <summary>
-        /// This function will remove the unknown run settings nodes from the run settings strings.
-        /// This is necessary because older test hosts may throw exceptions when encountering
-        /// unknown nodes.
-        /// </summary>
-        ///
-        /// <param name="runsettingsXml">Run settings string.</param>
-        ///
-        /// <returns>The run settings after removing non-required nodes.</returns>
-        public string RemoveNodesFromRunsettingsIfRequired(string runsettingsXml, Action<TestMessageLevel, string> logMessage)
+        if (_makeRunsettingsCompatible)
         {
-            var updatedRunSettingsXml = runsettingsXml;
-            if (!this.makeRunsettingsCompatibleSet)
-            {
-                this.CompatIssueWithVersionCheckAndRunsettings();
-            }
+            logMessage.Invoke(TestMessageLevel.Warning, CrossPlatEngineResources.OldTestHostIsGettingUsed);
+            updatedRunSettingsXml = InferRunSettingsHelper.MakeRunsettingsCompatible(runsettingsXml);
+        }
 
-            if (this.makeRunsettingsCompatible)
-            {
-                logMessage.Invoke(TestMessageLevel.Warning, CrossPlatEngineResources.OldTestHostIsGettingUsed);
-                updatedRunSettingsXml = InferRunSettingsHelper.MakeRunsettingsCompatible(runsettingsXml);
-            }
+        // We can remove "TargetPlatform" because is not needed, process is already in a "specific" target platform after test host process start,
+        // so the default architecture is always the correct one.
+        // This allow us to support new architecture enumeration without the need to update old test sdk.
+        updatedRunSettingsXml = InferRunSettingsHelper.RemoveTargetPlatformElement(updatedRunSettingsXml);
 
-            // We can remove "TargetPlatform" because is not needed, process is already in a "specific" target platform after test host process start,
-            // so the default architecture is always the correct one.
-            // This allow us to support new architecture enumeration without the need to update old test sdk.
-            updatedRunSettingsXml = InferRunSettingsHelper.RemoveTargetPlatformElement(updatedRunSettingsXml);
+        return updatedRunSettingsXml;
+    }
 
-            return updatedRunSettingsXml;
-        }
+    internal virtual string ReadTesthostFriendlyName()
+    {
+        var friendlyNameAttribute = TestHostManager.GetType().GetCustomAttributes(
+                typeof(FriendlyNameAttribute), true)
+            .FirstOrDefault();
+
+        return (friendlyNameAttribute is not null and FriendlyNameAttribute friendlyName)
+            ? friendlyName.FriendlyName : string.Empty;
+    }
 
-        private string GetTimestampedLogFile(string logFile)
+    internal bool IsTesthostCompatibleWithTestSessions()
+    {
+        // These constants should be kept in line with the friendly names found in
+        // DotnetTestHostManager.cs, respectively DefaultTestHostManager.cs.
+        //
+        // We agreed on checking the test session compatibility this way (i.e. by reading the
+        // friendly name and making sure it's one of the testhosts we control) instead of a more
+        // generic alternative that was initially proposed (i.e. by decorating each testhost
+        // manager with a capability attribute that could tell us if the test session scenario
+        // is supported for the testhost in discussion) because of the breaking risks associated
+        // with the latter approach. Also, there is no formal specification for now of what it
+        // means to support test sessions. Should extending session functionality to 3rd party
+        // testhosts be something we want to address in the future, we should come up with such
+        // a specification first.
+        var friendlyName = ReadTesthostFriendlyName();
+        if (!friendlyName.IsNullOrEmpty())
         {
-            if (string.IsNullOrWhiteSpace(logFile))
-            {
-                return null;
-            }
+            var isSessionSupported = friendlyName is (DotnetTesthostFriendlyName or DefaultTesthostFriendlyName);
+            EqtTrace.Verbose($"ProxyOperationManager.IsTesthostCompatibleWithTestSessions: Testhost friendly name: {friendlyName}; Sessions support: {isSessionSupported};");
+
+            return isSessionSupported;
+        }
+
+        return false;
+    }
 
-            return Path.ChangeExtension(
+    [return: NotNullIfNotNull("logFile")]
+    private static string? GetTimestampedLogFile(string? logFile)
+    {
+        return logFile.IsNullOrWhiteSpace()
+            ? null
+            : Path.ChangeExtension(
                 logFile,
                 string.Format(
+                    CultureInfo.InvariantCulture,
                     "host.{0}_{1}{2}",
-                    DateTime.Now.ToString("yy-MM-dd_HH-mm-ss_fffff"),
+                    DateTime.Now.ToString("yy-MM-dd_HH-mm-ss_fffff", CultureInfo.InvariantCulture),
                     new PlatformEnvironment().GetCurrentManagedThreadId(),
                     Path.GetExtension(logFile))).AddDoubleQuote();
-        }
-
-        private void CompatIssueWithVersionCheckAndRunsettings()
-        {
-            var properties = this.TestHostManager.GetType().GetRuntimeProperties();
+    }
 
-            var versionCheckProperty = properties.FirstOrDefault(p => string.Equals(p.Name, versionCheckPropertyName, StringComparison.OrdinalIgnoreCase));
-            if (versionCheckProperty != null)
-            {
-                this.versionCheckRequired = (bool)versionCheckProperty.GetValue(this.TestHostManager);
-            }
+    private void CompatIssueWithVersionCheckAndRunsettings()
+    {
+        var properties = TestHostManager.GetType().GetRuntimeProperties();
 
-            var makeRunsettingsCompatibleProperty = properties.FirstOrDefault(p => string.Equals(p.Name, makeRunsettingsCompatiblePropertyName, StringComparison.OrdinalIgnoreCase));
-            if (makeRunsettingsCompatibleProperty != null)
-            {
-                this.makeRunsettingsCompatible = (bool)makeRunsettingsCompatibleProperty.GetValue(this.TestHostManager);
-                this.makeRunsettingsCompatibleSet = true;
-            }
+        // The field is actually defaulting to true, so this is just a complicated way to set or not set
+        // this to true (modern testhosts should have it set to true). Bad thing about this is that we are checking
+        // internal "undocumented" property. Good thing is that if you don't implement it you get the modern behavior.
+        var versionCheckProperty = properties.FirstOrDefault(p => string.Equals(p.Name, _versionCheckPropertyName, StringComparison.OrdinalIgnoreCase));
+        if (versionCheckProperty != null)
+        {
+            _versionCheckRequired = (bool)versionCheckProperty.GetValue(TestHostManager)!;
         }
 
-        private void TestHostManagerHostLaunched(object sender, HostProviderEventArgs e)
+        var makeRunsettingsCompatibleProperty = properties.FirstOrDefault(p => string.Equals(p.Name, _makeRunsettingsCompatiblePropertyName, StringComparison.OrdinalIgnoreCase));
+        if (makeRunsettingsCompatibleProperty != null)
         {
-            EqtTrace.Verbose(e.Data);
-            this.testHostProcessId = e.ProcessId;
+            _makeRunsettingsCompatible = (bool)makeRunsettingsCompatibleProperty.GetValue(TestHostManager)!;
+            _makeRunsettingsCompatibleSet = true;
         }
+    }
+
+    private void TestHostManagerHostLaunched(object? sender, HostProviderEventArgs? e)
+    {
+        EqtTrace.Verbose(e!.Data);
+        _testHostProcessId = e.ProcessId;
+    }
+
+    private void TestHostManagerHostExited(object? sender, HostProviderEventArgs? e)
+    {
+        EqtTrace.Verbose("CrossPlatEngine.TestHostManagerHostExited: calling on client process exit callback.");
+        _testHostProcessStdError = e!.Data;
+
+        // This needs to be set before we call the OnClientProcess exit because the
+        // OnClientProcess will short-circuit WaitForRequestHandlerConnection in SetupChannel
+        // that then continues to throw an exception and checks if the test host process exited.
+        // If not it reports timeout, if we don't set this before OnClientProcessExit we will
+        // report timeout even though we exited the test host before even attempting the connect.
+        _testHostExited.Set();
+        RequestSender.OnClientProcessExit(_testHostProcessStdError);
+    }
 
-        private void TestHostManagerHostExited(object sender, HostProviderEventArgs e)
+    private void ThrowOnTestHostExited(IEnumerable<string> sources, bool testHostExited)
+    {
+        if (testHostExited)
         {
-            EqtTrace.Verbose("CrossPlatEngine.TestHostManagerHostExited: calling on client process exit callback.");
-            this.testHostProcessStdError = e.Data;
-
-            // This needs to be set before we call the OnClientProcess exit because the
-            // OnClientProcess will short-circuit WaitForRequestHandlerConnection in SetupChannel
-            // that then continues to throw an exception and checks if the test host process exited.
-            // If not it reports timeout, if we don't set this before OnClientProcessExit we will
-            // report timeout even though we exited the test host before even attempting the connect.
-            this.testHostExited.Set();
-            this.RequestSender.OnClientProcessExit(this.testHostProcessStdError);
+            // We might consider passing standard output here in case standard error is not
+            // available because some errors don't end up in the standard error output.
+            throw new TestPlatformException(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, string.Join("', '", sources), _testHostProcessStdError));
         }
+    }
 
-        private void ThrowOnTestHostExited(bool testHostExited)
+    private void ThrowExceptionOnConnectionFailure(IEnumerable<string> sources, int connTimeout)
+    {
+        // Failed to launch testhost process.
+        var errorMsg = CrossPlatEngineResources.InitializationFailed;
+
+        // Testhost launched but timeout occurred due to machine slowness.
+        if (_testHostLaunched)
         {
-            if (testHostExited)
-            {
-                // We might consider passing standard output here in case standard error is not
-                // available because some errors don't end up in the standard error output.
-                throw new TestPlatformException(string.Format(CrossPlatEngineResources.TestHostExitedWithError, this.testHostProcessStdError));
-            }
+            errorMsg = string.Format(
+                CultureInfo.CurrentCulture,
+                CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                CoreUtilitiesConstants.VstestConsoleProcessName,
+                CoreUtilitiesConstants.TesthostProcessName,
+                connTimeout,
+                EnvironmentHelper.VstestConnectionTimeout);
         }
 
-        private void ThrowExceptionOnConnectionFailure(int connTimeout)
+        // After testhost process launched failed with error.
+        if (!StringUtils.IsNullOrWhiteSpace(_testHostProcessStdError))
         {
-            // Failed to launch testhost process.
-            var errorMsg = CrossPlatEngineResources.InitializationFailed;
-
-            // Testhost launched but timeout occurred due to machine slowness.
-            if (this.testHostLaunched)
-            {
-                errorMsg = string.Format(
-                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                    CoreUtilitiesConstants.VstestConsoleProcessName,
-                    CoreUtilitiesConstants.TesthostProcessName,
-                    connTimeout,
-                    EnvironmentHelper.VstestConnectionTimeout);
-            }
-
-            // After testhost process launched failed with error.
-            if (!string.IsNullOrWhiteSpace(this.testHostProcessStdError))
-            {
-                // Testhost failed with error.
-                errorMsg = string.Format(CrossPlatEngineResources.TestHostExitedWithError, this.testHostProcessStdError);
-            }
-
-            throw new TestPlatformException(string.Format(CultureInfo.CurrentUICulture, errorMsg));
+            // Testhost failed with error.
+            errorMsg = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestHostExitedWithError, string.Join("', '", sources), _testHostProcessStdError);
         }
+
+        throw new TestPlatformException(errorMsg);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManagerWithDataCollection.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManagerWithDataCollection.cs
index 67b8b07c4c..3ff84390ed 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManagerWithDataCollection.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManagerWithDataCollection.cs
@@ -1,146 +1,158 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+/// <summary>
+/// The proxy operation manager with data collection.
+/// </summary>
+public class ProxyOperationManagerWithDataCollection : ProxyOperationManager
+{
+    private IDictionary<string, string?>? _dataCollectionEnvironmentVariables;
+    private readonly IRequestData _requestData;
+    private int _dataCollectionPort;
 
     /// <summary>
-    /// The proxy operation manager with data collection.
+    /// Initializes a new instance of the <see cref="ProxyOperationManagerWithDataCollection"/>
+    /// class.
     /// </summary>
-    public class ProxyOperationManagerWithDataCollection : ProxyOperationManager
+    ///
+    /// <param name="requestData">The request data.</param>
+    /// <param name="requestSender">The request sender.</param>
+    /// <param name="testHostManager">The test host manager.</param>
+    /// <param name="testHostManagerFramework">Framework of the testhost.</param>
+    /// <param name="proxyDataCollectionManager">The data collection proxy.</param>
+    public ProxyOperationManagerWithDataCollection(
+        IRequestData requestData,
+        ITestRequestSender requestSender,
+        ITestRuntimeProvider testHostManager,
+        Framework testHostManagerFramework,
+        IProxyDataCollectionManager proxyDataCollectionManager)
+        : base(
+            requestData,
+            requestSender,
+            testHostManager,
+            testHostManagerFramework)
     {
-        private IDictionary<string, string> dataCollectionEnvironmentVariables;
-        private IRequestData requestData;
-        private int dataCollectionPort;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyOperationManagerWithDataCollection"/>
-        /// class.
-        /// </summary>
-        /// 
-        /// <param name="requestData">The request data.</param>
-        /// <param name="requestSender">The request sender.</param>
-        /// <param name="testHostManager">The test host manager.</param>
-        /// <param name="proxyDataCollectionManager">The data collection proxy.</param>
-        public ProxyOperationManagerWithDataCollection(
-            IRequestData requestData,
-            ITestRequestSender requestSender,
-            ITestRuntimeProvider testHostManager,
-            IProxyDataCollectionManager proxyDataCollectionManager)
-            : base(
-                  requestData,
-                  requestSender,
-                  testHostManager)
-        {
-            this.ProxyDataCollectionManager = proxyDataCollectionManager;
-            this.DataCollectionRunEventsHandler = new DataCollectionRunEventsHandler();
-            this.requestData = requestData;
-            this.dataCollectionEnvironmentVariables = new Dictionary<string, string>();
+        ProxyDataCollectionManager = proxyDataCollectionManager;
+        DataCollectionRunEventsHandler = new DataCollectionRunEventsHandler();
+        _requestData = requestData;
+        _dataCollectionEnvironmentVariables = new Dictionary<string, string?>();
 
-            testHostManager.HostLaunched += this.TestHostLaunchedHandler;
-        }
+        testHostManager.HostLaunched += TestHostLaunchedHandler;
+    }
+
+    /// <inheritdoc />
+    public override void Initialize(bool skipDefaultAdapters)
+    {
+        ProxyDataCollectionManager.Initialize();
 
-        /// <inheritdoc />
-        public override void Initialize(bool skipDefaultAdapters)
+        try
         {
-            this.ProxyDataCollectionManager.Initialize();
+            var dataCollectionParameters = ProxyDataCollectionManager.BeforeTestRunStart(
+                resetDataCollectors: true,
+                isRunStartingNow: true,
+                runEventsHandler: DataCollectionRunEventsHandler);
 
-            try
+            if (dataCollectionParameters != null)
             {
-                var dataCollectionParameters = this.ProxyDataCollectionManager.BeforeTestRunStart(
-                    resetDataCollectors: true,
-                    isRunStartingNow: true,
-                    runEventsHandler: this.DataCollectionRunEventsHandler);
-
-                if (dataCollectionParameters != null)
-                {
-                    this.dataCollectionEnvironmentVariables = dataCollectionParameters.EnvironmentVariables;
-                    this.dataCollectionPort = dataCollectionParameters.DataCollectionEventsPort;
-                }
+                _dataCollectionEnvironmentVariables = dataCollectionParameters.EnvironmentVariables;
+                _dataCollectionPort = dataCollectionParameters.DataCollectionEventsPort;
             }
-            catch (Exception)
-            {
-                // On failure in calling BeforeTestRunStart, call AfterTestRunEnd to end the data
-                // collection process.
-                this.ProxyDataCollectionManager.AfterTestRunEnd(
-                    isCanceled: true,
-                    runEventsHandler: this.DataCollectionRunEventsHandler);
-                throw;
-            }
-
-            base.Initialize(skipDefaultAdapters);
         }
+        catch (Exception)
+        {
+            // On failure in calling BeforeTestRunStart, call AfterTestRunEnd to end the data
+            // collection process.
+            ProxyDataCollectionManager.AfterTestRunEnd(
+                isCanceled: true,
+                runEventsHandler: DataCollectionRunEventsHandler);
+            throw;
+        }
+
+        base.Initialize(skipDefaultAdapters);
+    }
 
-        /// <inheritdoc />
-        public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    /// <inheritdoc />
+    public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        if (testProcessStartInfo.EnvironmentVariables == null)
         {
-            if (testProcessStartInfo.EnvironmentVariables == null)
-            {
-                testProcessStartInfo.EnvironmentVariables = this.dataCollectionEnvironmentVariables;
-            }
-            else
+            testProcessStartInfo.EnvironmentVariables = _dataCollectionEnvironmentVariables;
+        }
+        else if (_dataCollectionEnvironmentVariables is not null)
+        {
+            foreach (var kvp in _dataCollectionEnvironmentVariables)
             {
-                foreach (var kvp in this.dataCollectionEnvironmentVariables)
-                {
-                    testProcessStartInfo.EnvironmentVariables[kvp.Key] = kvp.Value;
-                }
+                testProcessStartInfo.EnvironmentVariables[kvp.Key] = kvp.Value;
             }
+        }
 
-            // Update telemetry opt in status because by default test host telemetry is opted out.
-            var telemetryOptedIn = this.requestData.IsTelemetryOptedIn ? "true" : "false";
-            testProcessStartInfo.Arguments += " --datacollectionport " + this.dataCollectionPort
-                                              + " --telemetryoptedin " + telemetryOptedIn;
+        // Update telemetry opt in status because by default test host telemetry is opted out.
+        var telemetryOptedIn = _requestData.IsTelemetryOptedIn ? "true" : "false";
+        testProcessStartInfo.Arguments += $" --datacollectionport {_dataCollectionPort} --telemetryoptedin {telemetryOptedIn}";
 
-            return testProcessStartInfo;
-        }
+        return testProcessStartInfo;
+    }
 
-        /// <inheritdoc />
-        public override bool SetupChannel(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestMessageEventHandler eventHandler)
+    /// <inheritdoc />
+    public override bool SetupChannel(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestMessageEventHandler eventHandler)
+    {
+        // Log all the messages that are reported while initializing the DataCollectionClient.
+        if (DataCollectionRunEventsHandler.Messages.Count > 0)
         {
-            // Log all the messages that are reported while initializing the DataCollectionClient.
-            if (this.DataCollectionRunEventsHandler.Messages.Count > 0)
+            foreach (var message in DataCollectionRunEventsHandler.Messages)
             {
-                foreach (var message in this.DataCollectionRunEventsHandler.Messages)
-                {
-                    eventHandler.HandleLogMessage(message.Item1, message.Item2);
-                }
-
-                this.DataCollectionRunEventsHandler.Messages.Clear();
+                eventHandler.HandleLogMessage(message.Item1, message.Item2);
             }
 
-            return base.SetupChannel(sources, runSettings);
+            DataCollectionRunEventsHandler.Messages.Clear();
         }
 
-        /// <summary>
-        /// Gets the data collection run events handler.
-        /// </summary>
-        internal DataCollectionRunEventsHandler DataCollectionRunEventsHandler
+        // Push all raw messages
+        if (DataCollectionRunEventsHandler.RawMessages.Count > 0)
         {
-            get; private set;
-        }
+            foreach (var message in DataCollectionRunEventsHandler.RawMessages)
+            {
+                eventHandler.HandleRawMessage(message);
+            }
 
-        /// <summary>
-        /// Gets the proxy data collection manager.
-        /// </summary>
-        internal IProxyDataCollectionManager ProxyDataCollectionManager
-        {
-            get; private set;
+            DataCollectionRunEventsHandler.RawMessages.Clear();
         }
 
-        private void TestHostLaunchedHandler(object sender, HostProviderEventArgs e)
-        {
-            this.ProxyDataCollectionManager.TestHostLaunched(e.ProcessId);
-        }
+        return base.SetupChannel(sources, runSettings);
+    }
+
+    /// <summary>
+    /// Gets the data collection run events handler.
+    /// </summary>
+    internal DataCollectionRunEventsHandler DataCollectionRunEventsHandler
+    {
+        get; private set;
+    }
+
+    /// <summary>
+    /// Gets the proxy data collection manager.
+    /// </summary>
+    internal IProxyDataCollectionManager ProxyDataCollectionManager
+    {
+        get; private set;
+    }
+
+    private void TestHostLaunchedHandler(object? sender, HostProviderEventArgs e)
+    {
+        ProxyDataCollectionManager.TestHostLaunched(e.ProcessId);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs
index ca9372c181..232a31145e 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestLoggerManager.cs
@@ -1,685 +1,656 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Exceptions;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+using CommonResources = Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+/// <summary>
+/// Responsible for managing logger extensions and broadcasting results
+/// and error/warning/informational messages to them.
+/// </summary>
+internal class TestLoggerManager : ITestLoggerManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.Common.Exceptions;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using CommonResources = Common.Resources.Resources;
-
-    /// <summary>
-    /// Responsible for managing logger extensions and broadcasting results
-    /// and error/warning/informational messages to them.
-    /// </summary>
-    internal class TestLoggerManager : ITestLoggerManager
-    {
-        #region FieldsLog
-
-        /// <summary>
-        /// Keeps track if we are disposed.
-        /// </summary>
-        private bool isDisposed = false;
-
-        /// <summary>
-        /// Used to keep track of which loggers have been initialized.
-        /// </summary>
-        private HashSet<Type> initializedLoggers = new HashSet<Type>();
-
-        /// <summary>
-        /// Test run directory.
-        /// </summary>
-        private string testRunDirectory;
-
-        /// <summary>
-        /// Target framework.
-        /// </summary>
-        private string targetFramework;
-
-        /// <summary>
-        /// TreatNoTestsAsError value;
-        /// </summary>
-        private bool treatNoTestsAsError;
-
-        /// <summary>
-        /// Test Logger Events instance which will be passed to loggers when they are initialized.
-        /// </summary>
-        private InternalTestLoggerEvents loggerEvents;
-
-        /// <summary>
-        /// Message logger.
-        /// </summary>
-        private IMessageLogger messageLogger;
-
-        /// <summary>
-        /// Request data.
-        /// </summary>
-        private IRequestData requestData;
-
-        /// <summary>
-        /// Logger extension manager.
-        /// </summary>
-        private TestLoggerExtensionManager testLoggerExtensionManager;
-
-        /// <summary>
-        /// AssemblyLoadContext for current platform
-        /// </summary>
-        private IAssemblyLoadContext assemblyLoadContext;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Test logger manager.
-        /// </summary>
-        /// <param name="requestData">Request Data for Providing Common Services/Data for Discovery and Execution.</param>
-        /// <param name="messageLogger">Message Logger.</param>
-        /// <param name="loggerEvents">Logger events.</param>
-        public TestLoggerManager(IRequestData requestData, IMessageLogger messageLogger, InternalTestLoggerEvents loggerEvents) : this(requestData, messageLogger, loggerEvents, new PlatformAssemblyLoadContext())
-        {
-        }
-
-        /// <summary>
-        /// Test logger manager.
-        /// </summary>
-        /// <param name="requestData"></param>
-        /// <param name="messageLogger"></param>
-        /// <param name="loggerEvents"></param>
-        /// <param name="assemblyLoadContext"></param>
-        internal TestLoggerManager(IRequestData requestData, IMessageLogger messageLogger,
-            InternalTestLoggerEvents loggerEvents, IAssemblyLoadContext assemblyLoadContext)
-        {
-            this.requestData = requestData;
-            this.messageLogger = messageLogger;
-            this.testLoggerExtensionManager = null;
-            this.loggerEvents = loggerEvents;
-            this.assemblyLoadContext = assemblyLoadContext;
-        }
+    /// <summary>
+    /// Keeps track if we are disposed.
+    /// </summary>
+    private bool _isDisposed;
 
-        #endregion
+    /// <summary>
+    /// Used to keep track of which loggers have been initialized.
+    /// </summary>
+    private readonly HashSet<Type> _initializedLoggers = new();
 
-        #region Properties
+    /// <summary>
+    /// Test run directory.
+    /// </summary>
+    private string? _testRunDirectory;
 
-        /// <summary>
-        /// Loggers initialized flag.
-        /// </summary>
-        public bool LoggersInitialized => this.initializedLoggers.Any();
+    /// <summary>
+    /// Target framework.
+    /// </summary>
+    private string? _targetFramework;
 
-        private TestLoggerExtensionManager TestLoggerExtensionManager
-        {
-            get
-            {
-                if (this.testLoggerExtensionManager == null)
-                {
-                    this.testLoggerExtensionManager = TestLoggerExtensionManager.Create(messageLogger);
-                }
+    /// <summary>
+    /// TreatNoTestsAsError value;
+    /// </summary>
+    private bool _treatNoTestsAsError;
 
-                return this.testLoggerExtensionManager;
-            }
-        }
+    /// <summary>
+    /// Test Logger Events instance which will be passed to loggers when they are initialized.
+    /// </summary>
+    private readonly InternalTestLoggerEvents _loggerEvents;
 
-        #endregion
+    /// <summary>
+    /// Message logger.
+    /// </summary>
+    private readonly IMessageLogger _messageLogger;
 
-        #region Public Methods
+    /// <summary>
+    /// Request data.
+    /// </summary>
+    private readonly IRequestData _requestData;
 
-        /// <summary>
-        /// Initializes all the loggers passed by user
-        /// </summary>
-        public void Initialize(string runSettings)
-        {
-            // Enable logger events
-            EnableLogging();
+    /// <summary>
+    /// Logger extension manager.
+    /// </summary>
+    private TestLoggerExtensionManager? _testLoggerExtensionManager;
 
-            // Store test run directory. This runsettings is the final runsettings merging CLI args and runsettings.
-            this.testRunDirectory = GetResultsDirectory(runSettings);
-            this.targetFramework = GetTargetFramework(runSettings)?.Name;
-            this.treatNoTestsAsError = GetTreatNoTestsAsError(runSettings);
+    /// <summary>
+    /// AssemblyLoadContext for current platform
+    /// </summary>
+    private readonly IAssemblyLoadContext _assemblyLoadContext;
 
-            var loggers = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettings);
+    /// <summary>
+    /// Test logger manager.
+    /// </summary>
+    /// <param name="requestData">Request Data for Providing Common Services/Data for Discovery and Execution.</param>
+    /// <param name="messageLogger">Message Logger.</param>
+    /// <param name="loggerEvents">Logger events.</param>
+    public TestLoggerManager(IRequestData requestData, IMessageLogger messageLogger, InternalTestLoggerEvents loggerEvents) : this(requestData, messageLogger, loggerEvents, new PlatformAssemblyLoadContext())
+    {
+    }
 
-            foreach (var logger in loggers?.LoggerSettingsList ?? Enumerable.Empty<LoggerSettings>())
-            {
-                // Don't add logger if its disabled.
-                if (!logger.IsEnabled)
-                {
-                    continue;
-                }
-
-                var parameters = GetParametersFromConfigurationElement(logger.Configuration);
-                var loggerInitialized = false;
-
-                // Try initializing logger by type.
-                if (!string.IsNullOrWhiteSpace(logger.AssemblyQualifiedName))
-                {
-                    loggerInitialized = InitializeLoggerByType(logger.AssemblyQualifiedName, logger.CodeBase, parameters);
-                }
-
-                // Try initializing logger by uri.
-                if (!loggerInitialized &&
-                    !string.IsNullOrWhiteSpace(logger.Uri?.ToString()))
-                {
-                    loggerInitialized = InitializeLoggerByUri(logger.Uri, parameters);
-                }
-
-                // Try initializing logger by friendly name.
-                if (!loggerInitialized &&
-                    TryGetUriFromFriendlyName(logger.FriendlyName, out var loggerUri) &&
-                    loggerUri != null)
-                {
-                    loggerInitialized = InitializeLoggerByUri(loggerUri, parameters);
-                }
-
-                // Output error if logger is not initialized.
-                if (!loggerInitialized)
-                {
-                    var value = !string.IsNullOrWhiteSpace(logger.AssemblyQualifiedName)
-                        ? logger.AssemblyQualifiedName
-                        : !string.IsNullOrWhiteSpace(logger.Uri?.ToString())
-                            ? logger.Uri.ToString()
-                            : logger.FriendlyName;
-
-                    throw new InvalidLoggerException(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CommonResources.LoggerNotFound,
-                            value));
-                }
-            }
+    /// <summary>
+    /// Test logger manager.
+    /// </summary>
+    /// <param name="requestData"></param>
+    /// <param name="messageLogger"></param>
+    /// <param name="loggerEvents"></param>
+    /// <param name="assemblyLoadContext"></param>
+    internal TestLoggerManager(IRequestData requestData, IMessageLogger messageLogger,
+        InternalTestLoggerEvents loggerEvents, IAssemblyLoadContext assemblyLoadContext)
+    {
+        _requestData = requestData;
+        _messageLogger = messageLogger;
+        _testLoggerExtensionManager = null;
+        _loggerEvents = loggerEvents;
+        _assemblyLoadContext = assemblyLoadContext;
+    }
 
-            requestData.MetricsCollection.Add(TelemetryDataConstants.LoggerUsed, string.Join<Type>(",", this.initializedLoggers.ToArray()));
-        }
+    /// <summary>
+    /// Loggers initialized flag.
+    /// </summary>
+    public bool LoggersInitialized => _initializedLoggers.Count != 0;
 
-        /// <summary>
-        /// Handles test run message event.
-        /// </summary>
-        /// <param name="e">TestRunMessage event args.</param>
-        public void HandleTestRunMessage(TestRunMessageEventArgs e)
+    private TestLoggerExtensionManager TestLoggerExtensionManager
+    {
+        get
         {
-            if (this.isDisposed)
-            {
-                EqtTrace.Warning("TestLoggerManager.HandleTestRunMessage: Ignoring as the object is disposed.");
-                return;
-            }
+            _testLoggerExtensionManager ??= TestLoggerExtensionManager.Create(_messageLogger);
 
-            this.loggerEvents.RaiseTestRunMessage(e);
+            return _testLoggerExtensionManager;
         }
+    }
 
-        /// <summary>
-        /// Handle test run stats change event.
-        /// </summary>
-        /// <param name="e">TestRunChanged event args.</param>
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs e)
+    /// <summary>
+    /// Initializes all the loggers passed by user
+    /// </summary>
+    public void Initialize(string? runSettings)
+    {
+        // Enable logger events
+        EnableLogging();
+
+        // Store test run directory. This runsettings is the final runsettings merging CLI args and runsettings.
+        _testRunDirectory = GetResultsDirectory(runSettings);
+        _targetFramework = GetTargetFramework(runSettings)?.Name;
+        _treatNoTestsAsError = GetTreatNoTestsAsError(runSettings);
+
+        var loggers = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettings);
+
+        foreach (var logger in loggers?.LoggerSettingsList ?? Enumerable.Empty<LoggerSettings>())
         {
-            if (this.isDisposed)
+            // Don't add logger if its disabled.
+            if (!logger.IsEnabled)
             {
-                EqtTrace.Warning("TestLoggerManager.HandleTestRunStatsChange: Ignoring as the object is disposed.");
-                return;
+                continue;
             }
 
-            foreach (TestResult result in e.NewTestResults)
+            var parameters = GetParametersFromConfigurationElement(logger.Configuration);
+            var loggerInitialized = false;
+
+            // Try initializing logger by type.
+            if (!StringUtils.IsNullOrWhiteSpace(logger.AssemblyQualifiedName))
             {
-                this.loggerEvents.RaiseTestResult(new TestResultEventArgs(result));
+                loggerInitialized = InitializeLoggerByType(logger.AssemblyQualifiedName, logger.CodeBase!, parameters);
             }
-        }
 
-        /// <summary>
-        /// Handles test run start event.
-        /// </summary>
-        /// <param name="e">TestRunStart event args.</param>
-        public void HandleTestRunStart(TestRunStartEventArgs e)
-        {
-            if (this.isDisposed)
+            // Try initializing logger by uri.
+            if (!loggerInitialized &&
+                !StringUtils.IsNullOrWhiteSpace(logger.Uri?.ToString()))
             {
-                EqtTrace.Warning("TestLoggerManager.HandleTestRunStart: Ignoring as the object is disposed.");
-                return;
+                loggerInitialized = InitializeLoggerByUri(logger.Uri, parameters);
             }
 
-            this.loggerEvents.RaiseTestRunStart(e);
-        }
-
-        /// <summary>
-        /// Handles test run complete.
-        /// </summary>
-        /// <param name="e">TestRunComplete event args.</param>
-        public void HandleTestRunComplete(TestRunCompleteEventArgs e)
-        {
-            if (!this.isDisposed)
+            // Try initializing logger by friendly name.
+            if (!loggerInitialized &&
+                TryGetUriFromFriendlyName(logger.FriendlyName, out var loggerUri) &&
+                loggerUri != null)
             {
-                try
-                {
-                    this.loggerEvents.CompleteTestRun(e.TestRunStatistics, e.IsCanceled, e.IsAborted, e.Error,
-                        e.AttachmentSets, e.ElapsedTimeInRunningTests);
-                }
-                finally
-                {
-                    this.Dispose();
-                }
+                loggerInitialized = InitializeLoggerByUri(loggerUri, parameters);
             }
-            else
+
+            // Output error if logger is not initialized.
+            if (!loggerInitialized)
             {
-                // Note: We are not raising warning in case testLoggerManager is disposed as HandleRawMessage and HandleTestRunComplete both can call HandleTestRunComplete.
-                EqtTrace.Verbose("TestLoggerManager.HandleTestRunComplete: Ignoring as the object is disposed.");
+                var value = !StringUtils.IsNullOrWhiteSpace(logger.AssemblyQualifiedName)
+                    ? logger.AssemblyQualifiedName
+                    : !StringUtils.IsNullOrWhiteSpace(logger.Uri?.ToString())
+                        ? logger.Uri.ToString()
+                        : logger.FriendlyName;
+
+                throw new InvalidLoggerException(
+                    string.Format(CultureInfo.CurrentCulture, CommonResources.LoggerNotFound, value));
             }
         }
 
-        /// <summary>
-        /// Handles discovery message event.
-        /// </summary>
-        /// <param name="e">TestRunMessage event args.</param>
-        public void HandleDiscoveryMessage(TestRunMessageEventArgs e)
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.LoggerUsed, string.Join<Type>(",", _initializedLoggers.ToArray()));
+    }
+
+    /// <summary>
+    /// Handles test run message event.
+    /// </summary>
+    /// <param name="e">TestRunMessage event args.</param>
+    public void HandleTestRunMessage(TestRunMessageEventArgs e)
+    {
+        if (_isDisposed)
         {
-            if (this.isDisposed)
-            {
-                EqtTrace.Warning("TestLoggerManager.HandleDiscoveryMessage: Ignoring as the object is disposed.");
-                return;
-            }
+            EqtTrace.Warning("TestLoggerManager.HandleTestRunMessage: Ignoring as the object is disposed.");
+            return;
+        }
+
+        _loggerEvents.RaiseTestRunMessage(e);
+    }
 
-            this.loggerEvents.RaiseDiscoveryMessage(e);
+    /// <summary>
+    /// Handle test run stats change event.
+    /// </summary>
+    /// <param name="e">TestRunChanged event args.</param>
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs e)
+    {
+        if (_isDisposed)
+        {
+            EqtTrace.Warning("TestLoggerManager.HandleTestRunStatsChange: Ignoring as the object is disposed.");
+            return;
         }
 
-        /// <summary>
-        /// Handle discovered tests.
-        /// </summary>
-        /// <param name="e">DiscoveredTests event args.</param>
-        public void HandleDiscoveredTests(DiscoveredTestsEventArgs e)
+        foreach (TestResult result in e.NewTestResults!)
         {
-            if (this.isDisposed)
-            {
-                EqtTrace.Warning("TestLoggerManager.HandleDiscoveredTests: Ignoring as the object is disposed.");
-                return;
-            }
+            _loggerEvents.RaiseTestResult(new TestResultEventArgs(result));
+        }
+    }
 
-            this.loggerEvents.RaiseDiscoveredTests(e);
+    /// <summary>
+    /// Handles test run start event.
+    /// </summary>
+    /// <param name="e">TestRunStart event args.</param>
+    public void HandleTestRunStart(TestRunStartEventArgs e)
+    {
+        if (_isDisposed)
+        {
+            EqtTrace.Warning("TestLoggerManager.HandleTestRunStart: Ignoring as the object is disposed.");
+            return;
         }
 
-        /// <summary>
-        /// Handles discovery complete event.
-        /// </summary>
-        /// <param name="e">DiscoveryComplete event args.</param>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs e)
+        _loggerEvents.RaiseTestRunStart(e);
+    }
+
+    /// <summary>
+    /// Handles test run complete.
+    /// </summary>
+    /// <param name="e">TestRunComplete event args.</param>
+    public void HandleTestRunComplete(TestRunCompleteEventArgs e)
+    {
+        if (!_isDisposed)
         {
-            if (!this.isDisposed)
+            try
             {
-                try
-                {
-                    this.loggerEvents.RaiseDiscoveryComplete(e);
-                }
-                finally
-                {
-                    this.Dispose();
-                }
+                _loggerEvents.CompleteTestRun(e.TestRunStatistics, e.IsCanceled, e.IsAborted, e.Error,
+                    e.AttachmentSets, e.InvokedDataCollectors, e.ElapsedTimeInRunningTests);
             }
-            else
+            finally
             {
-                // Note: We are not raising warning in case testLoggerManager is disposed as HandleRawMessage and HandleDiscoveryComplete both can call HandleDiscoveryComplete.
-                EqtTrace.Verbose("TestLoggerManager.HandleDiscoveryComplete: Ignoring as the object is disposed.");
+                Dispose();
             }
         }
-
-        /// <summary>
-        /// Handles discovery start event.
-        /// </summary>
-        /// <param name="e">DiscoveryStart event args.</param>
-        public void HandleDiscoveryStart(DiscoveryStartEventArgs e)
+        else
         {
-            if (this.isDisposed)
-            {
-                EqtTrace.Warning("TestLoggerManager.HandleDiscoveryStart: Ignoring as the object is disposed.");
-                return;
-            }
-
-            this.loggerEvents.RaiseDiscoveryStart(e);
+            // Note: We are not raising warning in case testLoggerManager is disposed as HandleRawMessage and HandleTestRunComplete both can call HandleTestRunComplete.
+            EqtTrace.Verbose("TestLoggerManager.HandleTestRunComplete: Ignoring as the object is disposed.");
         }
+    }
 
-        /// <summary>
-        /// Ensure that all pending messages are sent to the loggers.
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Handles discovery message event.
+    /// </summary>
+    /// <param name="e">TestRunMessage event args.</param>
+    public void HandleDiscoveryMessage(TestRunMessageEventArgs e)
+    {
+        if (_isDisposed)
         {
-            this.Dispose(true);
-
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
+            EqtTrace.Warning("TestLoggerManager.HandleDiscoveryMessage: Ignoring as the object is disposed.");
+            return;
         }
 
-        #endregion
-
-        /// <summary>
-        /// Initializes logger with the specified URI and parameters.
-        /// For ex. TfsPublisher takes parameters such as  Platform, Flavor etc.
-        /// </summary>
-        /// <param name="uri">URI of the logger to add.</param>
-        /// <param name="parameters">Logger parameters.</param>
-        /// <returns>Logger Initialized flag.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2234:PassSystemUriObjectsInsteadOfStrings", Justification = "Case insensitive needs to be supported "), SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Third party loggers could potentially throw all kinds of exceptions.")]
-        internal bool InitializeLoggerByUri(Uri uri, Dictionary<string, string> parameters)
+        _loggerEvents.RaiseDiscoveryMessage(e);
+    }
+
+    /// <summary>
+    /// Handle discovered tests.
+    /// </summary>
+    /// <param name="e">DiscoveredTests event args.</param>
+    public void HandleDiscoveredTests(DiscoveredTestsEventArgs e)
+    {
+        if (_isDisposed)
         {
-            ValidateArg.NotNull<Uri>(uri, nameof(uri));
-            this.CheckDisposed();
+            EqtTrace.Warning("TestLoggerManager.HandleDiscoveredTests: Ignoring as the object is disposed.");
+            return;
+        }
 
-            // Look up the extension and initialize it if one is found.
-            var extensionManager = this.TestLoggerExtensionManager;
-            var logger = extensionManager.TryGetTestExtension(uri.AbsoluteUri);
+        _loggerEvents.RaiseDiscoveredTests(e);
+    }
 
-            if (logger == null)
+    /// <summary>
+    /// Handles discovery complete event.
+    /// </summary>
+    /// <param name="e">DiscoveryComplete event args.</param>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs e)
+    {
+        if (!_isDisposed)
+        {
+            try
             {
-                return false;
+                _loggerEvents.RaiseDiscoveryComplete(e);
             }
-
-            // If the logger has already been initialized just return.
-            if (this.initializedLoggers.Contains(logger.Value.GetType()))
+            finally
             {
-                EqtTrace.Verbose("TestLoggerManager: Skipping duplicate logger initialization: {0}", logger.Value.GetType());
-                return true;
+                Dispose();
             }
+        }
+        else
+        {
+            // Note: We are not raising warning in case testLoggerManager is disposed as HandleRawMessage and HandleDiscoveryComplete both can call HandleDiscoveryComplete.
+            EqtTrace.Verbose("TestLoggerManager.HandleDiscoveryComplete: Ignoring as the object is disposed.");
+        }
+    }
 
-            // Initialize logger.
-            var initialized = InitializeLogger(logger.Value, logger.Metadata.ExtensionUri, parameters);
+    /// <summary>
+    /// Handles discovery start event.
+    /// </summary>
+    /// <param name="e">DiscoveryStart event args.</param>
+    public void HandleDiscoveryStart(DiscoveryStartEventArgs e)
+    {
+        if (_isDisposed)
+        {
+            EqtTrace.Warning("TestLoggerManager.HandleDiscoveryStart: Ignoring as the object is disposed.");
+            return;
+        }
 
-            // Add logger in initializedLoggers list.
-            if (initialized)
-            {
-                this.initializedLoggers.Add(logger.Value.GetType());
-            }
+        _loggerEvents.RaiseDiscoveryStart(e);
+    }
 
-            return initialized;
-        }
+    /// <summary>
+    /// Ensure that all pending messages are sent to the loggers.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
 
-        /// <summary>
-        /// Tries to get uri of the logger corresponding to the friendly name. If no such logger exists return null.
-        /// </summary>
-        /// <param name="friendlyName">The friendly Name.</param>
-        /// <param name="loggerUri">The logger Uri.</param>
-        /// <returns><see cref="bool"/></returns>
-        internal bool TryGetUriFromFriendlyName(string friendlyName, out Uri loggerUri)
-        {
-            var extensionManager = this.TestLoggerExtensionManager;
-            foreach (var extension in extensionManager.TestExtensions)
-            {
-                if (string.Equals(friendlyName, extension.Metadata.FriendlyName, StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        loggerUri = new Uri(extension.Metadata.ExtensionUri);
-                    }
-                    catch (UriFormatException)
-                    {
-                        loggerUri = null;
-
-                        throw new InvalidLoggerException(
-                            string.Format(
-                                CultureInfo.CurrentUICulture,
-                                CommonResources.LoggerUriInvalid,
-                                extension.Metadata.ExtensionUri));
-                    }
-
-                    return true;
-                }
-            }
+        // Use SupressFinalize in case a subclass
+        // of this type implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-            loggerUri = null;
+    /// <summary>
+    /// Initializes logger with the specified URI and parameters.
+    /// For ex. TfsPublisher takes parameters such as  Platform, Flavor etc.
+    /// </summary>
+    /// <param name="uri">URI of the logger to add.</param>
+    /// <param name="parameters">Logger parameters.</param>
+    /// <returns>Logger Initialized flag.</returns>
+    internal bool InitializeLoggerByUri(Uri uri, Dictionary<string, string?>? parameters)
+    {
+        ValidateArg.NotNull(uri, nameof(uri));
+        CheckDisposed();
+
+        // Look up the extension and initialize it if one is found.
+        var extensionManager = TestLoggerExtensionManager;
+        var logger = extensionManager.TryGetTestExtension(uri.AbsoluteUri);
+
+        if (logger == null)
+        {
             return false;
         }
 
-        /// <summary>
-        /// Gets the test results directory.
-        /// </summary>
-        /// <param name="runSettings">Test run settings.</param>
-        /// <returns>Test results directory</returns>
-        internal string GetResultsDirectory(string runSettings)
+        // If the logger has already been initialized just return.
+        if (_initializedLoggers.Contains(logger.Value.GetType()))
         {
-            string resultsDirectory = null;
-            if (runSettings != null)
-            {
-                try
-                {
-                    RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
-                    resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
-                }
-                catch (SettingsException se)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("TestLoggerManager.GetResultsDirectory: Unable to get the test results directory: Error {0}", se);
-                    }
-                }
-            }
+            EqtTrace.Verbose("TestLoggerManager: Skipping duplicate logger initialization: {0}", logger.Value.GetType());
+            return true;
+        }
+
+        // Initialize logger.
+        var initialized = InitializeLogger(logger.Value, logger.Metadata.ExtensionUri, parameters);
 
-            return resultsDirectory;
+        // Add logger in initializedLoggers list.
+        if (initialized)
+        {
+            _initializedLoggers.Add(logger.Value.GetType());
         }
 
-        /// <summary>
-        /// Gets the target framework of the test run.
-        /// </summary>
-        /// <param name="runSettings">Test run settings.</param>
-        /// <returns>Target framework</returns>
-        internal Framework GetTargetFramework(string runSettings)
+        return initialized;
+    }
+
+    /// <summary>
+    /// Tries to get uri of the logger corresponding to the friendly name. If no such logger exists return null.
+    /// </summary>
+    /// <param name="friendlyName">The friendly Name.</param>
+    /// <param name="loggerUri">The logger Uri.</param>
+    /// <returns><see cref="bool"/></returns>
+    internal bool TryGetUriFromFriendlyName(string? friendlyName, [NotNullWhen(true)] out Uri? loggerUri)
+    {
+        var extensionManager = TestLoggerExtensionManager;
+        foreach (var extension in extensionManager.TestExtensions)
         {
-            Framework targetFramework = null;
-            if (runSettings != null)
+            if (!string.Equals(friendlyName, extension.Metadata.FriendlyName, StringComparison.OrdinalIgnoreCase))
             {
-                try
-                {
-                    RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
-                    targetFramework = RunSettingsUtilities.GetTargetFramework(runConfiguration);
-                }
-                catch (SettingsException se)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("TestLoggerManager.GetResultsDirectory: Unable to get the target framework: Error {0}", se);
-                    }
-                }
+                continue;
             }
 
-            return targetFramework;
-        }
+            try
+            {
+                loggerUri = new Uri(extension.Metadata.ExtensionUri);
+            }
+            catch (UriFormatException)
+            {
+                loggerUri = null;
 
-        /// <summary>
-        /// Get TreatNoTestsAsError value of the test run
-        /// </summary>
-        /// <param name="runSettings"></param>
-        /// <returns></returns>
-        internal bool GetTreatNoTestsAsError(string runSettings)
-        {
-            return RunSettingsUtilities.GetTreatNoTestsAsError(runSettings);
-        }
+                throw new InvalidLoggerException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CommonResources.LoggerUriInvalid,
+                        extension.Metadata.ExtensionUri));
+            }
 
-        /// <summary>
-        /// Enables sending of events to the loggers which are registered.
-        /// </summary>
-        /// <remarks>
-        /// By default events are disabled and will not be raised until this method is called.
-        /// This is done because during logger initialization, errors could be sent and we do not
-        /// want them broadcast out to the loggers until all loggers have been enabled.  Without this
-        /// all loggers would not receive the errors which were sent prior to initialization finishing.
-        /// </remarks>
-        internal void EnableLogging()
-        {
-            this.CheckDisposed();
-            this.loggerEvents.EnableEvents();
+            return true;
         }
 
-        /// <summary>
-        /// Ensure that all pending messages are sent to the loggers.
-        /// </summary>
-        /// <param name="disposing">
-        /// The disposing.
-        /// </param>
-        internal virtual void Dispose(bool disposing)
+        loggerUri = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Gets the test results directory.
+    /// </summary>
+    /// <param name="runSettings">Test run settings.</param>
+    /// <returns>Test results directory</returns>
+    internal static string? GetResultsDirectory(string? runSettings)
+    {
+        string? resultsDirectory = null;
+        if (runSettings != null)
         {
-            if (!this.isDisposed)
+            try
             {
-                if (disposing)
-                {
-                    this.loggerEvents.Dispose();
-                }
-
-                this.isDisposed = true;
+                RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+                resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
+            }
+            catch (SettingsException se)
+            {
+                EqtTrace.Error("TestLoggerManager.GetResultsDirectory: Unable to get the test results directory: Error {0}", se);
             }
         }
 
-        /// <summary>
-        /// Get parameters from configuration element.
-        /// </summary>
-        /// <param name="configuration"></param>
-        /// <returns></returns>
-        private Dictionary<string, string> GetParametersFromConfigurationElement(XmlElement configuration)
-        {
-            var configurationManager = new LoggerNameValueConfigurationManager(configuration);
-            return configurationManager.NameValuePairs;
-        }
+        return resultsDirectory;
+    }
 
-        /// <summary>
-        /// Initialize logger with the specified type and parameters.
-        /// </summary>
-        /// <param name="assemblyQualifiedName">Assembly qualified name.</param>
-        /// <param name="codeBase">Code base.</param>
-        /// <param name="parameters">Logger parameters.</param>
-        /// <returns>Logger Initialized flag.</returns>
-        private bool InitializeLoggerByType(string assemblyQualifiedName, string codeBase, Dictionary<string, string> parameters)
+    /// <summary>
+    /// Gets the target framework of the test run.
+    /// </summary>
+    /// <param name="runSettings">Test run settings.</param>
+    /// <returns>Target framework</returns>
+    internal static Framework? GetTargetFramework(string? runSettings)
+    {
+        Framework? targetFramework = null;
+        if (runSettings != null)
         {
-            this.CheckDisposed();
             try
             {
-                // Load logger assembly.
-                Assembly assembly = this.assemblyLoadContext.LoadAssemblyFromPath(codeBase);
-                var loggerType =
-                    assembly?.GetTypes()
-                        .FirstOrDefault(x => x.AssemblyQualifiedName.Equals(assemblyQualifiedName));
-
-                // Create logger instance
-                var constructorInfo = loggerType?.GetConstructor(Type.EmptyTypes);
-                var logger = constructorInfo?.Invoke(new object[] { });
-
-                // Handle logger null scenario.
-                if (logger == null)
-                {
-                    return false;
-                }
+                RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runSettings);
+                targetFramework = RunSettingsUtilities.GetTargetFramework(runConfiguration);
+            }
+            catch (SettingsException se)
+            {
+                EqtTrace.Error("TestLoggerManager.GetResultsDirectory: Unable to get the target framework: Error {0}", se);
+            }
+        }
 
-                // If the logger has already been initialized just return.
-                if (this.initializedLoggers.Contains(logger.GetType()))
-                {
-                    EqtTrace.Verbose("TestLoggerManager: Skipping duplicate logger initialization: {0}", logger.GetType());
-                    return true;
-                }
+        return targetFramework;
+    }
 
-                // Get Logger instance and initialize.
-                var initialized = InitializeLogger(logger, null, parameters);
+    /// <summary>
+    /// Get TreatNoTestsAsError value of the test run
+    /// </summary>
+    /// <param name="runSettings"></param>
+    /// <returns></returns>
+    internal static bool GetTreatNoTestsAsError(string? runSettings)
+    {
+        return RunSettingsUtilities.GetTreatNoTestsAsError(runSettings);
+    }
 
-                // Add logger in initializedLoggers list.
-                if (initialized)
-                {
-                    this.initializedLoggers.Add(logger.GetType());
-                }
+    /// <summary>
+    /// Enables sending of events to the loggers which are registered.
+    /// </summary>
+    /// <remarks>
+    /// By default events are disabled and will not be raised until this method is called.
+    /// This is done because during logger initialization, errors could be sent and we do not
+    /// want them broadcast out to the loggers until all loggers have been enabled.  Without this
+    /// all loggers would not receive the errors which were sent prior to initialization finishing.
+    /// </remarks>
+    internal void EnableLogging()
+    {
+        CheckDisposed();
+        _loggerEvents.EnableEvents();
+    }
 
-                return initialized;
-            }
-            catch (Exception ex)
+    /// <summary>
+    /// Ensure that all pending messages are sent to the loggers.
+    /// </summary>
+    /// <param name="disposing">
+    /// The disposing.
+    /// </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!_isDisposed)
+        {
+            if (disposing)
             {
-                EqtTrace.Error(
-                    "TestLoggerManager: Error occurred while initializing the Logger assemblyQualifiedName : {0}, codeBase : {1} , Exception Details : {2}", assemblyQualifiedName, codeBase, ex);
-                return false;
+                _loggerEvents.Dispose();
             }
+
+            _isDisposed = true;
         }
+    }
 
-        private bool InitializeLogger(object logger, string extensionUri, Dictionary<string, string> parameters)
+    /// <summary>
+    /// Get parameters from configuration element.
+    /// </summary>
+    /// <param name="configuration"></param>
+    /// <returns></returns>
+    private static Dictionary<string, string?> GetParametersFromConfigurationElement(XmlElement? configuration)
+    {
+        var configurationManager = new LoggerNameValueConfigurationManager(configuration);
+        return configurationManager.NameValuePairs;
+    }
+
+    /// <summary>
+    /// Initialize logger with the specified type and parameters.
+    /// </summary>
+    /// <param name="assemblyQualifiedName">Assembly qualified name.</param>
+    /// <param name="codeBase">Code base.</param>
+    /// <param name="parameters">Logger parameters.</param>
+    /// <returns>Logger Initialized flag.</returns>
+    private bool InitializeLoggerByType(string assemblyQualifiedName, string codeBase, Dictionary<string, string?> parameters)
+    {
+        CheckDisposed();
+        try
         {
+            // Load logger assembly.
+            Assembly assembly = _assemblyLoadContext.LoadAssemblyFromPath(codeBase);
+            var loggerType =
+                assembly?.GetTypes()
+                    .FirstOrDefault(x => string.Equals(x.AssemblyQualifiedName, assemblyQualifiedName));
+
+            // Create logger instance
+            var constructorInfo = loggerType?.GetConstructor(Type.EmptyTypes);
+            var logger = constructorInfo?.Invoke([]);
+
+            // Handle logger null scenario.
             if (logger == null)
             {
                 return false;
             }
 
-            try
+            // If the logger has already been initialized just return.
+            if (_initializedLoggers.Contains(logger.GetType()))
             {
-                switch (logger)
-                {
-                    case ITestLoggerWithParameters _:
-                        ((ITestLoggerWithParameters)logger).Initialize(loggerEvents,
-                            UpdateLoggerParameters(parameters));
-                        break;
-
-                    case ITestLogger _:
-                        ((ITestLogger)logger).Initialize(loggerEvents, testRunDirectory);
-                        break;
-
-                    default:
-                        // If logger is of different type, then logger should not be initialized.
-                        EqtTrace.Error(
-                            "TestLoggerManager: Incorrect logger type: {0}", logger.GetType());
-                        return false;
-                }
+                EqtTrace.Verbose("TestLoggerManager: Skipping duplicate logger initialization: {0}", logger.GetType());
+                return true;
             }
-            catch (Exception ex)
-            {
-                var loggerUri = string.IsNullOrEmpty(extensionUri) ? logger.GetType().ToString() : extensionUri;
-                EqtTrace.Error(
-                    "TestLoggerManager: Error while initializing logger: {0}, Exception details: {1}", loggerUri, ex);
 
-                this.messageLogger.SendMessage(
-                    TestMessageLevel.Error,
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommonResources.LoggerInitializationError,
-                        string.IsNullOrEmpty(extensionUri) ? "type" : "uri",
-                        string.IsNullOrEmpty(extensionUri) ? logger.GetType().ToString() : extensionUri,
-                        ex));
+            // Get Logger instance and initialize.
+            var initialized = InitializeLogger(logger, null, parameters);
 
-                throw new InvalidLoggerException($"Error while initializing logger: {loggerUri}, Exception details: {ex.Message}");
+            // Add logger in initializedLoggers list.
+            if (initialized)
+            {
+                _initializedLoggers.Add(logger.GetType());
             }
 
-            return true;
+            return initialized;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error(
+                "TestLoggerManager: Error occurred while initializing the Logger assemblyQualifiedName : {0}, codeBase : {1} , Exception Details : {2}", assemblyQualifiedName, codeBase, ex);
+            return false;
+        }
+    }
+
+    private bool InitializeLogger(object? logger, string? extensionUri, Dictionary<string, string?>? parameters)
+    {
+        if (logger == null)
+        {
+            return false;
         }
 
-        /// <summary>
-        /// Populates user supplied and default logger parameters.
-        /// </summary>
-        private Dictionary<string, string> UpdateLoggerParameters(Dictionary<string, string> parameters)
+        try
         {
-            var loggerParams = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            if (parameters != null)
+            switch (logger)
             {
-                loggerParams = new Dictionary<string, string>(parameters, StringComparer.OrdinalIgnoreCase);
+                case ITestLoggerWithParameters _:
+                    ((ITestLoggerWithParameters)logger).Initialize(_loggerEvents, UpdateLoggerParameters(parameters));
+                    break;
+
+                case ITestLogger _:
+                    ((ITestLogger)logger).Initialize(_loggerEvents, _testRunDirectory!);
+                    break;
+
+                default:
+                    // If logger is of different type, then logger should not be initialized.
+                    EqtTrace.Error(
+                        "TestLoggerManager: Incorrect logger type: {0}", logger.GetType());
+                    return false;
             }
+        }
+        catch (Exception ex)
+        {
+            var loggerUri = extensionUri.IsNullOrEmpty() ? logger.GetType().ToString() : extensionUri;
+            EqtTrace.Error(
+                "TestLoggerManager: Error while initializing logger: {0}, Exception details: {1}", loggerUri, ex);
+
+            _messageLogger.SendMessage(
+                TestMessageLevel.Error,
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommonResources.LoggerInitializationError,
+                    extensionUri.IsNullOrEmpty() ? "type" : "uri",
+                    extensionUri.IsNullOrEmpty() ? logger.GetType().ToString() : extensionUri,
+                    ex));
+
+            throw new InvalidLoggerException($"Error while initializing logger: {loggerUri}, Exception details: {ex.Message}");
+        }
 
-            // Add default logger parameters...
-            loggerParams[DefaultLoggerParameterNames.TestRunDirectory] = testRunDirectory;
-            loggerParams[DefaultLoggerParameterNames.TargetFramework] = targetFramework;
+        return true;
+    }
 
-            // Add custom logger parameters
-            if (treatNoTestsAsError)
-            {
-                loggerParams[Constants.TreatNoTestsAsError] = treatNoTestsAsError.ToString();
-            }
+    /// <summary>
+    /// Populates user supplied and default logger parameters.
+    /// </summary>
+    private Dictionary<string, string?> UpdateLoggerParameters(Dictionary<string, string?>? parameters)
+    {
+        var loggerParams = parameters is not null
+            ? new Dictionary<string, string?>(parameters, StringComparer.OrdinalIgnoreCase)
+            : new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
 
-            return loggerParams;
+        // Add default logger parameters...
+        loggerParams[DefaultLoggerParameterNames.TestRunDirectory] = _testRunDirectory;
+        loggerParams[DefaultLoggerParameterNames.TargetFramework] = _targetFramework;
+
+        // Add custom logger parameters
+        if (_treatNoTestsAsError)
+        {
+            loggerParams[ObjectModel.Constants.TreatNoTestsAsError] = _treatNoTestsAsError.ToString();
         }
 
-        private void CheckDisposed()
+        return loggerParams;
+    }
+
+    private void CheckDisposed()
+    {
+        if (_isDisposed)
         {
-            if (this.isDisposed)
-            {
-                throw new ObjectDisposedException(typeof(TestLoggerManager).FullName);
-            }
+            throw new ObjectDisposedException(typeof(TestLoggerManager).FullName);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRunCriteriaExtensions.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRunCriteriaExtensions.cs
index 615432a468..66d2835b5b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRunCriteriaExtensions.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRunCriteriaExtensions.cs
@@ -1,75 +1,81 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
-{
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
 
-    internal static class TestRunCriteriaExtensions
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+internal static class TestRunCriteriaExtensions
+{
+    public static TestRunCriteriaWithSources CreateTestRunCriteriaForSources(this TestRunCriteria testRunCriteria, ITestRuntimeProvider? testRuntimeProvider, string? runSettings, TestExecutionContext executionContext, IEnumerable<string>? inputPackages)
     {
-        public static TestRunCriteriaWithSources CreateTestRunCriteriaForSources(this TestRunCriteria testRunCriteria, ITestRuntimeProvider testRuntimeProvider,
-            string runSettings, TestExecutionContext executionContext, IEnumerable<string> inputPackages)
+        TPDebug.Assert(testRunCriteria.AdapterSourceMap is not null, "testRunCriteria.AdapterSourceMap is null");
+        if (TryCheckTestSourceDifferFromPackage(testRuntimeProvider, inputPackages, out IEnumerable<string>? actualTestSources))
         {
-            if (TryCheckTestSourceDifferFromPackage(testRuntimeProvider, inputPackages, out IEnumerable<string> actualTestSources))
-            {
-                UpdateTestSources(actualTestSources, testRunCriteria.AdapterSourceMap);
-            }
-            else
-            {
-                inputPackages = null;
-            }
-
-            return new TestRunCriteriaWithSources(testRunCriteria.AdapterSourceMap, inputPackages?.FirstOrDefault(), runSettings, executionContext);
+            UpdateTestSources(actualTestSources, testRunCriteria.AdapterSourceMap);
+        }
+        else
+        {
+            inputPackages = null;
         }
 
-        public static TestRunCriteriaWithTests CreateTestRunCriteriaForTests(this TestRunCriteria testRunCriteria, ITestRuntimeProvider testRuntimeProvider,
-            string runSettings, TestExecutionContext executionContext, IEnumerable<string> inputPackages)
+        return new TestRunCriteriaWithSources(testRunCriteria.AdapterSourceMap, inputPackages?.FirstOrDefault(), runSettings, executionContext);
+    }
+
+    public static TestRunCriteriaWithTests CreateTestRunCriteriaForTests(this TestRunCriteria testRunCriteria, ITestRuntimeProvider? testRuntimeProvider,
+        string? runSettings, TestExecutionContext executionContext, IEnumerable<string>? inputPackages)
+    {
+        TPDebug.Assert(testRunCriteria.Tests is not null, "testRunCriteria.Tests is null");
+        if (TryCheckTestSourceDifferFromPackage(testRuntimeProvider, inputPackages, out IEnumerable<string>? actualTestSources))
         {
-            if (TryCheckTestSourceDifferFromPackage(testRuntimeProvider, inputPackages, out IEnumerable<string> actualTestSources))
+            // In UWP scenario TestCase object contains the package as source, which is not actual test source for adapters,
+            // so update test case before sending them.
+            // We are limiting that a testhost will always run for a single package, A package can contain multiple sources
+            foreach (var tc in testRunCriteria.Tests)
             {
-                // In UWP scenario TestCase object contains the package as source, which is not actual test source for adapters,
-                // so update test case before sending them.
-                // We are limiting that a testhost will always run for a single package, A package can contain multiple sources
-                foreach (var tc in testRunCriteria.Tests)
-                {
-                    tc.Source = actualTestSources.FirstOrDefault();
-                }
+                tc.Source = actualTestSources.FirstOrDefault()!;
             }
-            else
-            {
-                inputPackages = null;
-            }
-
-            return new TestRunCriteriaWithTests(testRunCriteria.Tests, inputPackages?.FirstOrDefault(), runSettings, executionContext);
         }
-
-        private static bool TryCheckTestSourceDifferFromPackage(ITestRuntimeProvider testRuntimeProvider,
-            IEnumerable<string> inputPackages, out IEnumerable<string> actualTestSources)
+        else
         {
-            actualTestSources = testRuntimeProvider.GetTestSources(inputPackages);
-
-            // For netcore/fullclr both packages and sources are same thing,
-            // For UWP the actual source(exe) differs from input source(.appxrecipe) which we call package.
-            // So in such models we check if they differ, then we pass this info to test host to update TestCase source with package info,
-            // since this is needed by IDE's to map a TestCase to project.
-            return inputPackages.Except(actualTestSources).Any();
+            inputPackages = null;
         }
 
-        /// <summary>
-        /// Update the AdapterSourceMap
-        /// </summary>
-        /// <param name="sources">actual test sources</param>
-        /// <param name="adapterSourceMap">Adapter Source Map</param>
-        private static void UpdateTestSources(IEnumerable<string> sources, Dictionary<string, IEnumerable<string>> adapterSourceMap)
+        return new TestRunCriteriaWithTests(testRunCriteria.Tests, inputPackages?.FirstOrDefault(), runSettings, executionContext);
+    }
+
+    private static bool TryCheckTestSourceDifferFromPackage(ITestRuntimeProvider? testRuntimeProvider,
+        IEnumerable<string>? inputPackages, [NotNullWhen(true)] out IEnumerable<string>? actualTestSources)
+    {
+        actualTestSources = testRuntimeProvider?.GetTestSources(inputPackages!);
+
+        if (inputPackages is null || actualTestSources is null)
         {
-            adapterSourceMap.Clear();
-            adapterSourceMap.Add(Constants.UnspecifiedAdapterPath, sources);
+            return false;
         }
+
+        // For netcore/fullclr both packages and sources are same thing,
+        // For UWP the actual source(exe) differs from input source(.appxrecipe) which we call package.
+        // So in such models we check if they differ, then we pass this info to test host to update TestCase source with package info,
+        // since this is needed by IDE's to map a TestCase to project.
+        return inputPackages.Except(actualTestSources).Any();
+    }
+
+    /// <summary>
+    /// Update the AdapterSourceMap
+    /// </summary>
+    /// <param name="sources">actual test sources</param>
+    /// <param name="adapterSourceMap">Adapter Source Map</param>
+    private static void UpdateTestSources(IEnumerable<string> sources, Dictionary<string, IEnumerable<string>> adapterSourceMap)
+    {
+        adapterSourceMap.Clear();
+        adapterSourceMap.Add(ObjectModel.Constants.UnspecifiedAdapterPath, sources);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRuntimeProviderInfo.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRuntimeProviderInfo.cs
new file mode 100644
index 0000000000..695c6eea03
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/TestRuntimeProviderInfo.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+
+public class TestRuntimeProviderInfo
+{
+    public Type? Type { get; }
+    public bool Shared { get; }
+    public string? RunSettings { get; }
+    public List<SourceDetail> SourceDetails { get; }
+
+    public TestRuntimeProviderInfo(Type? type, bool shared, string? runSettings, List<SourceDetail> sourceDetails)
+    {
+        Type = type;
+        Shared = shared;
+        RunSettings = runSettings;
+        SourceDetails = sourceDetails;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs
index 0faf5d7f3f..59a12603f2 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs
@@ -1,27 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
-{
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-    /// <summary>
-    /// The set of constants used throughout this project.
-    /// </summary>
-    public class Constants
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+/// <summary>
+/// The set of constants used throughout this project.
+/// </summary>
+public class Constants
+{
+    // Replace this collection with a list of adapters we want to allow from the "Extensions" folder in Next Major VS Release.
+    internal static readonly IList<string> DefaultAdapters = new ReadOnlyCollection<string>(new List<string>
     {
-        // Replace this collection with a list of adapters we want to allow from the "Extensions" folder in Next Major VS Release.
-        internal static readonly IList<string> DefaultAdapters = new ReadOnlyCollection<string>(new List<string>
-        {
-            "executor://CodedWebTestAdapter/v1",
-            "executor://MSTestAdapter/v1",
-            "executor://WebTestAdapter/v1",
-            "executor://CppUnitTestExecutor/v1"
-        });
+        "executor://CodedWebTestAdapter/v1",
+        "executor://MSTestAdapter/v1",
+        "executor://WebTestAdapter/v1",
+        "executor://CppUnitTestExecutor/v1"
+    });
 
-        internal static string DefaultAdapterLocation = Path.Combine(new ProcessHelper().GetCurrentProcessLocation(), "Extensions");
-    }
+    internal static string DefaultAdapterLocation = Path.Combine(new ProcessHelper().GetCurrentProcessLocation(), "Extensions");
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs
index 5496f46a51..bb5f749bd6 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs
@@ -1,98 +1,97 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Abstract DataCollection Launcher provides functionality to handle process launch and exit events.
+/// </summary>
+internal abstract class DataCollectionLauncher : IDataCollectionLauncher
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+    protected IProcessHelper _processHelper;
+
+    protected IMessageLogger _messageLogger;
+
+    protected StringBuilder _processStdError;
 
     /// <summary>
-    /// Abstract DataCollection Launcher provides functionality to handle process launch and exit events.
+    /// Initializes a new instance of the <see cref="DataCollectionLauncher"/> class.
     /// </summary>
-    internal abstract class DataCollectionLauncher : IDataCollectionLauncher
+    /// <param name="processHelper">
+    /// The process helper.
+    /// </param>
+    /// <param name="messageLogger">
+    /// The message logger.
+    /// </param>
+    public DataCollectionLauncher(IProcessHelper processHelper, IMessageLogger messageLogger)
     {
-        protected IProcessHelper processHelper;
-
-        protected IMessageLogger messageLogger;
+        _processHelper = processHelper;
+        _messageLogger = messageLogger;
+        _processStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+    }
 
-        protected StringBuilder processStdError;
+    /// <inheritdoc />
+    public int DataCollectorProcessId { get; protected set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionLauncher"/> class.
-        /// </summary>
-        /// <param name="processHelper">
-        /// The process helper.
-        /// </param>
-        /// <param name="messageLogger">
-        /// The message logger.
-        /// </param>
-        public DataCollectionLauncher(IProcessHelper processHelper, IMessageLogger messageLogger)
-        {
-            this.processHelper = processHelper;
-            this.messageLogger = messageLogger;
-            this.processStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
-        }
+    /// <summary>
+    /// Gets callback on process exit
+    /// </summary>
+    protected Action<object?> ExitCallBack => process =>
+    {
+        var processStdErrorStr = _processStdError.ToString();
 
-        /// <inheritdoc />
-        public int DataCollectorProcessId { get; protected set; }
+        _processHelper.TryGetExitCode(process, out int exitCode);
 
-        /// <summary>
-        /// Gets callback on process exit
-        /// </summary>
-        protected Action<object> ExitCallBack => (process) =>
+        if (exitCode != 0)
         {
-            var exitCode = 0;
-            var processStdErrorStr = this.processStdError.ToString();
-
-            this.processHelper.TryGetExitCode(process, out exitCode);
+            EqtTrace.Error("DataCollectionLauncher.ExitCallBack: Data collector exited with exitcode:{0} error: '{1}'", exitCode, processStdErrorStr);
 
-            if (exitCode != 0)
+            if (!StringUtils.IsNullOrWhiteSpace(processStdErrorStr))
             {
-                EqtTrace.Error("DataCollectionLauncher.ExitCallBack: Data collector exited with exitcode:{0} error: '{1}'", exitCode, processStdErrorStr);
-
-                if (!string.IsNullOrWhiteSpace(processStdErrorStr))
-                {
-                    this.messageLogger.SendMessage(TestMessageLevel.Error, processStdErrorStr);
-                }
-            }
-            else
-            {
-                EqtTrace.Info("DataCollectionLauncher.ExitCallBack: Data collector exited with exitcode: 0 error: '{0}'", processStdErrorStr);
+                _messageLogger.SendMessage(TestMessageLevel.Error, processStdErrorStr);
             }
-        };
-
-        /// <summary>
-        /// Gets callback to read from process error stream
-        /// </summary>
-        protected Action<object, string> ErrorReceivedCallback => (process, data) =>
+        }
+        else
         {
-            // Log all standard error message because on too much data we ignore starting part.
-            // This is helpful in abnormal failure of datacollector.
-            EqtTrace.Warning("DataCollectionLauncher.ErrorReceivedCallback datacollector standard error line: {0}", data);
+            EqtTrace.Info("DataCollectionLauncher.ExitCallBack: Data collector exited with exitcode: 0 error: '{0}'", processStdErrorStr);
+        }
+    };
 
-            this.processStdError.AppendSafeWithNewLine(data);
-        };
+    /// <summary>
+    /// Gets callback to read from process error stream
+    /// </summary>
+    protected Action<object?, string?> ErrorReceivedCallback => (process, data) =>
+    {
+        // Log all standard error message because on too much data we ignore starting part.
+        // This is helpful in abnormal failure of datacollector.
+        EqtTrace.Warning("DataCollectionLauncher.ErrorReceivedCallback datacollector standard error line: {0}", data);
 
-        /// <summary>
-        /// The launch data collector.
-        /// </summary>
-        /// <param name="environmentVariables">
-        /// The environment variables.
-        /// </param>
-        /// <param name="commandLineArguments">
-        /// The command line arguments.
-        /// </param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public abstract int LaunchDataCollector(
-            IDictionary<string, string> environmentVariables,
-            IList<string> commandLineArguments);
-    }
-}
\ No newline at end of file
+        _processStdError.AppendSafeWithNewLine(data);
+    };
+
+    /// <summary>
+    /// The launch data collector.
+    /// </summary>
+    /// <param name="environmentVariables">
+    /// The environment variables.
+    /// </param>
+    /// <param name="commandLineArguments">
+    /// The command line arguments.
+    /// </param>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public abstract int LaunchDataCollector(
+        IDictionary<string, string?>? environmentVariables,
+        IList<string> commandLineArguments);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncherFactory.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncherFactory.cs
index b8f96dd1ec..f905f8f2f1 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncherFactory.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncherFactory.cs
@@ -1,50 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
-{
-    using System;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
 
+/// <summary>
+/// Factory for creating DataCollectionLauncher
+/// </summary>
+internal static class DataCollectionLauncherFactory
+{
     /// <summary>
-    /// Factory for creating DataCollectionLauncher
+    /// The get data collector launcher.
     /// </summary>
-    internal static class DataCollectionLauncherFactory
+    /// <returns>
+    /// The <see cref="IDataCollectionLauncher"/>.
+    /// </returns>
+    internal static IDataCollectionLauncher GetDataCollectorLauncher(IProcessHelper processHelper, string? settingsXml)
     {
-        /// <summary>
-        /// The get data collector launcher.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IDataCollectionLauncher"/>.
-        /// </returns>
-        internal static IDataCollectionLauncher GetDataCollectorLauncher(IProcessHelper processHelper, string settingsXml)
+        // Event log datacollector is built for .NET Framework and we need to load inside .NET Framework process.
+        if (!settingsXml.IsNullOrWhiteSpace())
         {
-            // Always launch datacollector.exe if code coverage is configured.
-            if (!string.IsNullOrWhiteSpace(settingsXml))
+            var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settingsXml);
+            foreach (var dataCollectorSettings in dataCollectionRunSettings!.DataCollectorSettingsList)
             {
-                var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settingsXml);
-                foreach (var dataCollectorSettings in dataCollectionRunSettings.DataCollectorSettingsList)
+                if (string.Equals(dataCollectorSettings.FriendlyName, "event Log", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(dataCollectorSettings.Uri?.ToString(), @"datacollector://Microsoft/EventLog/2.0", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (string.Equals(dataCollectorSettings.FriendlyName, "event Log", StringComparison.OrdinalIgnoreCase) || string.Equals(dataCollectorSettings.Uri?.ToString(), @"datacollector://Microsoft/EventLog/2.0", StringComparison.OrdinalIgnoreCase))
-                    {
-                        return new DefaultDataCollectionLauncher();
-                    }
+                    return new DefaultDataCollectionLauncher();
                 }
             }
+        }
 
-            // Target Framework of DataCollection process and Runner should be same.
-            var currentProcessPath = processHelper.GetCurrentProcessFileName();
-
-            if (currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
-                 || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
-            {
-                return new DotnetDataCollectionLauncher();
-            }
+        // Target Framework of DataCollection process and Runner should be same.
+        var currentProcessPath = processHelper.GetCurrentProcessFileName();
+        TPDebug.Assert(currentProcessPath is not null, "currentProcessPath is null");
 
-            return new DefaultDataCollectionLauncher();
-        }
+        return currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
+               || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase)
+            ? new DotnetDataCollectionLauncher()
+            : new DefaultDataCollectionLauncher();
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionParameters.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionParameters.cs
index db3d47013b..15a98b317a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionParameters.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionParameters.cs
@@ -1,62 +1,61 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
 
+/// <summary>
+/// The data collection parameters.
+/// </summary>
+public class DataCollectionParameters
+{
     /// <summary>
-    /// The data collection parameters.
+    /// Initializes a new instance of the <see cref="DataCollectionParameters"/> class.
     /// </summary>
-    public class DataCollectionParameters
+    /// <param name="areTestCaseLevelEventsRequired">
+    /// The are test case level events required.
+    /// </param>
+    /// <param name="environmentVariables">
+    /// The environment variables.
+    /// </param>
+    /// <param name="dataCollectionEventsPort">
+    /// The data Collection Events Port.
+    /// </param>
+    public DataCollectionParameters(
+        bool areTestCaseLevelEventsRequired,
+        IDictionary<string, string?>? environmentVariables,
+        int dataCollectionEventsPort)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionParameters"/> class.
-        /// </summary>
-        /// <param name="areTestCaseLevelEventsRequired">
-        /// The are test case level events required.
-        /// </param>
-        /// <param name="environmentVariables">
-        /// The environment variables.
-        /// </param>
-        /// <param name="dataCollectionEventsPort">
-        /// The data Collection Events Port.
-        /// </param>
-        public DataCollectionParameters(
-            bool areTestCaseLevelEventsRequired,
-            IDictionary<string, string> environmentVariables,
-            int dataCollectionEventsPort)
-        {
-            this.AreTestCaseLevelEventsRequired = areTestCaseLevelEventsRequired;
-            this.EnvironmentVariables = environmentVariables;
-            this.DataCollectionEventsPort = dataCollectionEventsPort;
-        }
+        AreTestCaseLevelEventsRequired = areTestCaseLevelEventsRequired;
+        EnvironmentVariables = environmentVariables;
+        DataCollectionEventsPort = dataCollectionEventsPort;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether any of the enabled data collectors
-        /// registered for test case level events
-        /// </summary>
-        public bool AreTestCaseLevelEventsRequired { get; private set; }
+    /// <summary>
+    /// Gets a value indicating whether any of the enabled data collectors
+    /// registered for test case level events
+    /// </summary>
+    public bool AreTestCaseLevelEventsRequired { get; private set; }
 
-        /// <summary>
-        /// Gets BeforeTestRunStart Call on the DataCollectors can yield/return a set of environment variables
-        /// </summary>
-        public IDictionary<string, string> EnvironmentVariables { get; private set; }
+    /// <summary>
+    /// Gets BeforeTestRunStart Call on the DataCollectors can yield/return a set of environment variables
+    /// </summary>
+    public IDictionary<string, string?>? EnvironmentVariables { get; private set; }
 
-        /// <summary>
-        /// Gets the data collection events port.
-        /// </summary>
-        public int DataCollectionEventsPort { get; private set; }
+    /// <summary>
+    /// Gets the data collection events port.
+    /// </summary>
+    public int DataCollectionEventsPort { get; private set; }
 
-        /// <summary>
-        /// The create default parameter instance.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="DataCollectionParameters"/>.
-        /// </returns>
-        public static DataCollectionParameters CreateDefaultParameterInstance()
-        {
-            return new DataCollectionParameters(areTestCaseLevelEventsRequired: false, environmentVariables: null, dataCollectionEventsPort: 0);
-        }
+    /// <summary>
+    /// The create default parameter instance.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="DataCollectionParameters"/>.
+    /// </returns>
+    public static DataCollectionParameters CreateDefaultParameterInstance()
+    {
+        return new DataCollectionParameters(areTestCaseLevelEventsRequired: false, environmentVariables: null, dataCollectionEventsPort: 0);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionResult.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionResult.cs
new file mode 100644
index 0000000000..01257d67ff
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionResult.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Information returned after data collection.
+/// </summary>
+public class DataCollectionResult
+{
+    public DataCollectionResult(Collection<AttachmentSet>? attachments, Collection<InvokedDataCollector>? invokedDataCollectors)
+    {
+        Attachments = attachments;
+        InvokedDataCollectors = invokedDataCollectors;
+    }
+
+    /// <summary>
+    /// Get list of attachments
+    /// </summary>
+    public Collection<AttachmentSet>? Attachments { get; }
+
+    /// <summary>
+    /// Get the list of the invoked data collectors.
+    /// </summary>
+    public Collection<InvokedDataCollector>? InvokedDataCollectors { get; }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionTestRunEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionTestRunEventsHandler.cs
index cf661ee5ed..cc522a6f6b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionTestRunEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionTestRunEventsHandler.cs
@@ -1,210 +1,235 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Handles DataCollection attachments by calling DataCollection Process on Test Run Complete.
+/// Existing functionality of ITestRunEventsHandler is decorated with additional call to Data Collection Process.
+/// </summary>
+internal class DataCollectionTestRunEventsHandler : IInternalTestRunEventsHandler
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private readonly IProxyDataCollectionManager _proxyDataCollectionManager;
+    private readonly IInternalTestRunEventsHandler _testRunEventsHandler;
+    private readonly CancellationToken _cancellationToken;
+    private readonly IDataSerializer _dataSerializer;
+
+    private Collection<AttachmentSet>? _dataCollectionAttachmentSets;
+    private Collection<InvokedDataCollector>? _invokedDataCollectors;
 
     /// <summary>
-    /// Handles DataCollection attachments by calling DataCollection Process on Test Run Complete.
-    /// Existing functionality of ITestRunEventsHandler is decorated with additional call to Data Collection Process.
+    /// Initializes a new instance of the <see cref="DataCollectionTestRunEventsHandler"/> class.
     /// </summary>
-    internal class DataCollectionTestRunEventsHandler : ITestRunEventsHandler2
+    /// <param name="baseTestRunEventsHandler">
+    /// The base test run events handler.
+    /// </param>
+    /// <param name="proxyDataCollectionManager">
+    /// The proxy Data Collection Manager.
+    /// </param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    public DataCollectionTestRunEventsHandler(IInternalTestRunEventsHandler baseTestRunEventsHandler, IProxyDataCollectionManager proxyDataCollectionManager, CancellationToken cancellationToken)
+        : this(baseTestRunEventsHandler, proxyDataCollectionManager, JsonDataSerializer.Instance, cancellationToken)
     {
-        private IProxyDataCollectionManager proxyDataCollectionManager;
-        private ITestRunEventsHandler testRunEventsHandler;
-        private CancellationToken cancellationToken;
-        private IDataSerializer dataSerializer;
-        private Collection<AttachmentSet> dataCollectionAttachmentSets;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestRunEventsHandler"/> class.
-        /// </summary>
-        /// <param name="baseTestRunEventsHandler">
-        /// The base test run events handler.
-        /// </param>
-        /// <param name="proxyDataCollectionManager">
-        /// The proxy Data Collection Manager.
-        /// </param>
-        public DataCollectionTestRunEventsHandler(ITestRunEventsHandler baseTestRunEventsHandler, IProxyDataCollectionManager proxyDataCollectionManager, CancellationToken cancellationToken)
-            : this(baseTestRunEventsHandler, proxyDataCollectionManager, JsonDataSerializer.Instance, cancellationToken)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionTestRunEventsHandler"/> class.
-        /// </summary>
-        /// <param name="baseTestRunEventsHandler">
-        /// The base test run events handler.
-        /// </param>
-        /// <param name="proxyDataCollectionManager">
-        /// The proxy Data Collection Manager.
-        /// </param>
-        /// <param name="dataSerializer">
-        /// The data Serializer.
-        /// </param>
-        public DataCollectionTestRunEventsHandler(ITestRunEventsHandler baseTestRunEventsHandler, IProxyDataCollectionManager proxyDataCollectionManager, IDataSerializer dataSerializer, CancellationToken cancellationToken)
-        {
-            this.proxyDataCollectionManager = proxyDataCollectionManager;
-            this.testRunEventsHandler = baseTestRunEventsHandler;
-            this.cancellationToken = cancellationToken;
-            this.dataSerializer = dataSerializer;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionTestRunEventsHandler"/> class.
+    /// </summary>
+    /// <param name="baseTestRunEventsHandler">
+    /// The base test run events handler.
+    /// </param>
+    /// <param name="proxyDataCollectionManager">
+    /// The proxy Data Collection Manager.
+    /// </param>
+    /// <param name="dataSerializer">
+    /// The data Serializer.
+    /// </param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    public DataCollectionTestRunEventsHandler(IInternalTestRunEventsHandler baseTestRunEventsHandler, IProxyDataCollectionManager proxyDataCollectionManager, IDataSerializer dataSerializer, CancellationToken cancellationToken)
+    {
+        _proxyDataCollectionManager = proxyDataCollectionManager;
+        _testRunEventsHandler = baseTestRunEventsHandler;
+        _cancellationToken = cancellationToken;
+        _dataSerializer = dataSerializer;
+    }
 
-        /// <summary>
-        /// The handle log message.
-        /// </summary>
-        /// <param name="level">
-        /// The level.
-        /// </param>
-        /// <param name="message">
-        /// The message.
-        /// </param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.testRunEventsHandler.HandleLogMessage(level, message);
-        }
+    /// <summary>
+    /// The handle log message.
+    /// </summary>
+    /// <param name="level">
+    /// The level.
+    /// </param>
+    /// <param name="message">
+    /// The message.
+    /// </param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _testRunEventsHandler.HandleLogMessage(level, message);
+    }
 
-        /// <summary>
-        /// The handle raw message.
-        /// </summary>
-        /// <param name="rawMessage">
-        /// The raw message.
-        /// </param>
-        public void HandleRawMessage(string rawMessage)
+    /// <summary>
+    /// The handle raw message.
+    /// </summary>
+    /// <param name="rawMessage">
+    /// The raw message.
+    /// </param>
+    public void HandleRawMessage(string rawMessage)
+    {
+        // In case of data collection, data collection attachments should be attached to raw message for ExecutionComplete
+        var message = _dataSerializer.DeserializeMessage(rawMessage);
+
+        if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
         {
-            // In case of data collection, data collection attachments should be attached to raw message for ExecutionComplete
-            var message = this.dataSerializer.DeserializeMessage(rawMessage);
+            var dataCollectionResult = _proxyDataCollectionManager?.AfterTestRunEnd(_cancellationToken.IsCancellationRequested, this);
+            _dataCollectionAttachmentSets = dataCollectionResult?.Attachments;
 
-            if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
+            var testRunCompletePayload =
+                _dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
+
+            if (_dataCollectionAttachmentSets != null && _dataCollectionAttachmentSets.Count != 0)
             {
-                this.dataCollectionAttachmentSets = this.proxyDataCollectionManager?.AfterTestRunEnd(this.cancellationToken.IsCancellationRequested, this);
+                GetCombinedAttachmentSets(
+                    testRunCompletePayload?.TestRunCompleteArgs?.AttachmentSets,
+                    _dataCollectionAttachmentSets);
+            }
 
-                if (this.dataCollectionAttachmentSets != null && this.dataCollectionAttachmentSets.Any())
+            _invokedDataCollectors = dataCollectionResult?.InvokedDataCollectors;
+            if (_invokedDataCollectors?.Count > 0)
+            {
+                foreach (var dataCollector in _invokedDataCollectors)
                 {
-                    var testRunCompletePayload =
-                            this.dataSerializer.DeserializePayload<TestRunCompletePayload>(message);
-
-                    GetCombinedAttachmentSets(
-                        testRunCompletePayload.TestRunCompleteArgs.AttachmentSets,
-                        this.dataCollectionAttachmentSets);
-
-                    rawMessage = this.dataSerializer.SerializePayload(
-                        MessageType.ExecutionComplete,
-                        testRunCompletePayload);
+                    testRunCompletePayload?.TestRunCompleteArgs?.InvokedDataCollectors.Add(dataCollector);
                 }
             }
 
-            this.testRunEventsHandler.HandleRawMessage(rawMessage);
+            rawMessage = _dataSerializer.SerializePayload(
+                MessageType.ExecutionComplete,
+                testRunCompletePayload);
         }
 
-        /// <summary>
-        /// The handle test run complete.
-        /// </summary>
-        /// <param name="testRunCompleteArgs">
-        /// The test run complete args.
-        /// </param>
-        /// <param name="lastChunkArgs">
-        /// The last chunk args.
-        /// </param>
-        /// <param name="runContextAttachments">
-        /// The run context attachments.
-        /// </param>
-        /// <param name="executorUris">
-        /// The executor uris.
-        /// </param>
-        public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris)
-        {
-            if (this.dataCollectionAttachmentSets != null && this.dataCollectionAttachmentSets.Any())
-            {
-                runContextAttachments = GetCombinedAttachmentSets(this.dataCollectionAttachmentSets, runContextAttachments);
-            }
+        _testRunEventsHandler.HandleRawMessage(rawMessage);
+    }
 
-            this.testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+    /// <summary>
+    /// The handle test run complete.
+    /// </summary>
+    /// <param name="testRunCompleteArgs">
+    /// The test run complete args.
+    /// </param>
+    /// <param name="lastChunkArgs">
+    /// The last chunk args.
+    /// </param>
+    /// <param name="runContextAttachments">
+    /// The run context attachments.
+    /// </param>
+    /// <param name="executorUris">
+    /// The executor uris.
+    /// </param>
+    public void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris)
+    {
+        if (_dataCollectionAttachmentSets != null && _dataCollectionAttachmentSets.Count != 0)
+        {
+            runContextAttachments = GetCombinedAttachmentSets(_dataCollectionAttachmentSets, runContextAttachments);
         }
 
-        /// <summary>
-        /// The handle test run stats change.
-        /// </summary>
-        /// <param name="testRunChangedArgs">
-        /// The test run changed args.
-        /// </param>
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
+        // At the moment, we don't support running data collectors inside testhost process, so it will always be empty inside "TestRunCompleteEventArgs testRunCompleteArgs".
+        // We load invoked data collectors from data collector process inside "DataCollectionTestRunEventsHandler.HandleRawMessage" method.
+        if (_invokedDataCollectors != null && _invokedDataCollectors.Count != 0)
         {
-            this.testRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
+            foreach (var dataCollector in _invokedDataCollectors)
+            {
+                testRunCompleteArgs.InvokedDataCollectors.Add(dataCollector);
+            }
         }
 
-        /// <summary>
-        /// Launches a process with a given process info under debugger
-        /// Adapter get to call into this to launch any additional processes under debugger
-        /// </summary>
-        /// <param name="testProcessStartInfo">Process start info</param>
-        /// <returns>ProcessId of the launched process</returns>
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+        _testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+    }
+
+    /// <summary>
+    /// The handle test run stats change.
+    /// </summary>
+    /// <param name="testRunChangedArgs">
+    /// The test run changed args.
+    /// </param>
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        _testRunEventsHandler.HandleTestRunStatsChange(testRunChangedArgs);
+    }
+
+    /// <summary>
+    /// Launches a process with a given process info under debugger
+    /// Adapter get to call into this to launch any additional processes under debugger
+    /// </summary>
+    /// <param name="testProcessStartInfo">Process start info</param>
+    /// <returns>ProcessId of the launched process</returns>
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        return _testRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        return _testRunEventsHandler.AttachDebuggerToProcess(attachDebuggerInfo);
+    }
+
+    /// <summary>
+    /// The get combined attachment sets.
+    /// </summary>
+    /// <param name="originalAttachmentSets">
+    /// The run attachments.
+    /// </param>
+    /// <param name="newAttachments">
+    /// The run context attachments.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Collection{T}"/>.
+    /// </returns>
+    [return: NotNullIfNotNull("originalAttachmentSets")]
+    [return: NotNullIfNotNull("newAttachments")]
+    internal static ICollection<AttachmentSet>? GetCombinedAttachmentSets(Collection<AttachmentSet>? originalAttachmentSets, ICollection<AttachmentSet>? newAttachments)
+    {
+        if (newAttachments == null || newAttachments.Count == 0)
         {
-            return this.testRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+            return originalAttachmentSets;
         }
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
+        if (originalAttachmentSets == null)
         {
-            return ((ITestRunEventsHandler2)this.testRunEventsHandler).AttachDebuggerToProcess(pid);
+            return new Collection<AttachmentSet>(newAttachments.ToList());
         }
 
-        /// <summary>
-        /// The get combined attachment sets.
-        /// </summary>
-        /// <param name="originalAttachmentSets">
-        /// The run attachments.
-        /// </param>
-        /// <param name="newAttachments">
-        /// The run context attachments.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Collection"/>.
-        /// </returns>
-        internal static ICollection<AttachmentSet> GetCombinedAttachmentSets(Collection<AttachmentSet> originalAttachmentSets, ICollection<AttachmentSet> newAttachments)
+        foreach (var attachmentSet in newAttachments)
         {
-            if (newAttachments == null || newAttachments.Count == 0)
+            var attSet = originalAttachmentSets.FirstOrDefault(item => Equals(item.Uri, attachmentSet.Uri));
+            if (attSet == null)
             {
-                return originalAttachmentSets;
+                originalAttachmentSets.Add(attachmentSet);
             }
-
-            if (originalAttachmentSets == null)
+            else
             {
-                return new Collection<AttachmentSet>(newAttachments.ToList());
-            }
-
-            foreach (var attachmentSet in newAttachments)
-            {
-                var attSet = originalAttachmentSets.FirstOrDefault(item => Uri.Equals(item.Uri, attachmentSet.Uri));
-                if (attSet == null)
-                {
-                    originalAttachmentSets.Add(attachmentSet);
-                }
-                else
+                foreach (var attachment in attachmentSet.Attachments)
                 {
-                    foreach (var attachment in attachmentSet.Attachments)
-                    {
-                        attSet.Attachments.Add(attachment);
-                    }
+                    attSet.Attachments.Add(attachment);
                 }
             }
-
-            return originalAttachmentSets;
         }
+
+        return originalAttachmentSets;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DefaultDataCollectionLauncher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DefaultDataCollectionLauncher.cs
index 3ce2560159..721d618432 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DefaultDataCollectionLauncher.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DefaultDataCollectionLauncher.cs
@@ -1,77 +1,75 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// The datacollection launcher.
+/// This works for Desktop local scenarios
+/// </summary>
+internal class DefaultDataCollectionLauncher : DataCollectionLauncher
+{
+    private const string DataCollectorProcessName = "datacollector.exe";
+    private const string DataCollectorProcessNameArm64 = "datacollector.arm64.exe";
 
     /// <summary>
-    /// The datacollection launcher.
-    /// This works for Desktop local scenarios
+    /// The constructor.
     /// </summary>
-    internal class DefaultDataCollectionLauncher : DataCollectionLauncher
+    public DefaultDataCollectionLauncher()
+        : this(new ProcessHelper(), TestSessionMessageLogger.Instance)
     {
-        private const string DataCollectorProcessName = "datacollector.exe";
-
-        /// <summary>
-        /// The constructor.
-        /// </summary>
-        public DefaultDataCollectionLauncher()
-            : this(new ProcessHelper(), TestSessionMessageLogger.Instance)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultDataCollectionLauncher"/> class.
-        /// </summary>
-        /// <param name="processHelper">
-        /// The process helper.
-        /// </param>
-        /// <param name="messageLogger">
-        /// The message Logger.
-        /// </param>
-        internal DefaultDataCollectionLauncher(IProcessHelper processHelper, IMessageLogger messageLogger) : base(processHelper, messageLogger)
-        {
-            this.processHelper = processHelper;
-            this.DataCollectorProcessId = -1;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DefaultDataCollectionLauncher"/> class.
+    /// </summary>
+    /// <param name="processHelper">
+    /// The process helper.
+    /// </param>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    internal DefaultDataCollectionLauncher(IProcessHelper processHelper, IMessageLogger messageLogger) : base(processHelper, messageLogger)
+    {
+        _processHelper = processHelper;
+        DataCollectorProcessId = -1;
+    }
 
-        /// <summary>
-        /// Launches the test host for discovery/execution.
-        /// </summary>
-        /// <param name="environmentVariables">Environment variables for the process.</param>
-        /// <param name="commandLineArguments">The command line arguments to pass to the process.</param>
-        /// <returns>ProcessId of launched Process. 0 means not launched.</returns>
-        public override int LaunchDataCollector(IDictionary<string, string> environmentVariables, IList<string> commandLineArguments)
-        {
-            string dataCollectorProcessPath = null;
-            var dataCollectorDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).GetTypeInfo().Assembly.GetAssemblyLocation());
+    /// <summary>
+    /// Launches the test host for discovery/execution.
+    /// </summary>
+    /// <param name="environmentVariables">Environment variables for the process.</param>
+    /// <param name="commandLineArguments">The command line arguments to pass to the process.</param>
+    /// <returns>ProcessId of launched Process. 0 means not launched.</returns>
+    public override int LaunchDataCollector(IDictionary<string, string?>? environmentVariables, IList<string> commandLineArguments)
+    {
+        var dataCollectorDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).Assembly.GetAssemblyLocation());
+        TPDebug.Assert(dataCollectorDirectory is not null, "dataCollectorDirectory is not null");
 
-            var currentProcessPath = this.processHelper.GetCurrentProcessFileName();
+        var currentProcessPath = _processHelper.GetCurrentProcessFileName();
+        TPDebug.Assert(currentProcessPath is not null, "currentProcessPath is not null");
 
-            // If current process is dotnet/dotnet.exe and you are here, datacollector.exe is present in TestHost folder.
-            if (currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
-                || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
-            {
-                dataCollectorProcessPath = Path.Combine(dataCollectorDirectory, "TestHost", DataCollectorProcessName);
-            }
-            else
-            {
-                dataCollectorProcessPath = Path.Combine(dataCollectorDirectory, DataCollectorProcessName);
-            }
+        // If current process is dotnet/dotnet.exe and you are here, datacollector.exe/datacollector.arm64.exe is present in TestHost folder.
+        string dataCollectorProcessName = _processHelper.GetCurrentProcessArchitecture() == PlatformArchitecture.ARM64
+            ? DataCollectorProcessNameArm64
+            : DataCollectorProcessName;
+        string dataCollectorProcessPath = currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
+                                          || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase)
+            ? Path.Combine(dataCollectorDirectory, "TestHostNetFramework", dataCollectorProcessName)
+            : Path.Combine(dataCollectorDirectory, dataCollectorProcessName);
 
-            var argumentsString = string.Join(" ", commandLineArguments);
-            var dataCollectorProcess = this.processHelper.LaunchProcess(dataCollectorProcessPath, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null) ;
-            this.DataCollectorProcessId = this.processHelper.GetProcessId(dataCollectorProcess);
-            return this.DataCollectorProcessId;
-        }
+        var argumentsString = string.Join(" ", commandLineArguments);
+        var dataCollectorProcess = _processHelper.LaunchProcess(dataCollectorProcessPath, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, ErrorReceivedCallback, ExitCallBack, null);
+        DataCollectorProcessId = _processHelper.GetProcessId(dataCollectorProcess);
+        return DataCollectorProcessId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DotnetDataCollectionLauncher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DotnetDataCollectionLauncher.cs
index 07ea260cd8..b1d2c674eb 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DotnetDataCollectionLauncher.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DotnetDataCollectionLauncher.cs
@@ -1,125 +1,111 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// The datacollection launcher.
+/// This works for Desktop local scenarios
+/// </summary>
+internal class DotnetDataCollectionLauncher : DataCollectionLauncher
 {
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private const string DataCollectorProcessName = "datacollector.dll";
+
+    private readonly IFileHelper _fileHelper;
 
     /// <summary>
-    /// The datacollection launcher.
-    /// This works for Desktop local scenarios
+    /// Initializes a new instance of the <see cref="DotnetDataCollectionLauncher"/> class.
     /// </summary>
-    internal class DotnetDataCollectionLauncher : DataCollectionLauncher
+    public DotnetDataCollectionLauncher()
+        : this(new ProcessHelper(), new FileHelper(), TestSessionMessageLogger.Instance)
     {
-        private const string DataCollectorProcessName = "datacollector.dll";
+    }
 
-        private IFileHelper fileHelper;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DotnetDataCollectionLauncher"/> class.
+    /// </summary>
+    /// <param name="processHelper">
+    /// The process helper.
+    /// </param>
+    /// <param name="fileHelper">
+    /// The file Helper.
+    /// </param>
+    /// <param name="messageLogger">
+    /// The message Logger.
+    /// </param>
+    internal DotnetDataCollectionLauncher(IProcessHelper processHelper, IFileHelper fileHelper, IMessageLogger messageLogger) : base(processHelper, messageLogger)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        DataCollectorProcessId = -1;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetDataCollectionLauncher"/> class.
-        /// </summary>
-        public DotnetDataCollectionLauncher()
-            : this(new ProcessHelper(), new FileHelper(), TestSessionMessageLogger.Instance)
+    /// <summary>
+    /// Launches the test host for discovery/execution.
+    /// </summary>
+    /// <param name="environmentVariables">Environment variables for the process.</param>
+    /// <param name="commandLineArguments">The command line arguments to pass to the process.</param>
+    /// <returns>ProcessId of launched Process. 0 means not launched.</returns>
+    public override int LaunchDataCollector(IDictionary<string, string?>? environmentVariables, IList<string> commandLineArguments)
+    {
+        var dataCollectorDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).Assembly.GetAssemblyLocation());
+        TPDebug.Assert(dataCollectorDirectory is not null, "dataCollectorDirectory is null");
+
+        var dataCollectorAssemblyPath = Path.Combine(dataCollectorDirectory, DataCollectorProcessName);
+        string dataCollectorFileName = Path.GetFileNameWithoutExtension(dataCollectorAssemblyPath);
+
+        var args = "exec";
+
+        // Probe for runtime config and deps file for the test source
+        var runtimeConfigPath = Path.Combine(dataCollectorDirectory, string.Concat(dataCollectorFileName, ".runtimeconfig.json"));
+
+        if (_fileHelper.Exists(runtimeConfigPath))
         {
+            var argsToAdd = " --runtimeconfig " + runtimeConfigPath.AddDoubleQuote();
+            args += argsToAdd;
+            EqtTrace.Verbose("DotnetDataCollectionLauncher: Adding {0} in args", argsToAdd);
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetDataCollectionLauncher"/> class.
-        /// </summary>
-        /// <param name="processHelper">
-        /// The process helper.
-        /// </param>
-        /// <param name="fileHelper">
-        /// The file Helper.
-        /// </param>
-        /// <param name="messageLogger">
-        /// The message Logger.
-        /// </param>
-        internal DotnetDataCollectionLauncher(IProcessHelper processHelper, IFileHelper fileHelper, IMessageLogger messageLogger) : base(processHelper, messageLogger)
+        else
         {
-            this.processHelper = processHelper;
-            this.fileHelper = fileHelper;
-            this.DataCollectorProcessId = -1;
+            EqtTrace.Verbose("DotnetDataCollectionLauncher: File {0}, does not exist", runtimeConfigPath);
         }
 
-        /// <summary>
-        /// Launches the test host for discovery/execution.
-        /// </summary>
-        /// <param name="environmentVariables">Environment variables for the process.</param>
-        /// <param name="commandLineArguments">The command line arguments to pass to the process.</param>
-        /// <returns>ProcessId of launched Process. 0 means not launched.</returns>
-        public override int LaunchDataCollector(IDictionary<string, string> environmentVariables, IList<string> commandLineArguments)
+        // Use the deps.json for test source
+        var depsFilePath = Path.Combine(dataCollectorDirectory, string.Concat(dataCollectorFileName, ".deps.json"));
+        if (_fileHelper.Exists(depsFilePath))
         {
-            string dataCollectorFileName = null;
-            var dataCollectorDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).GetTypeInfo().Assembly.GetAssemblyLocation());
-            var currentProcessFileName = this.processHelper.GetCurrentProcessFileName();
-
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("DotnetDataCollectionLauncher: Full path of dotnet.exe is {0}", currentProcessFileName);
-            }
-
-            var dataCollectorAssemblyPath = Path.Combine(dataCollectorDirectory, DataCollectorProcessName);
-
-            dataCollectorFileName = Path.GetFileNameWithoutExtension(dataCollectorAssemblyPath);
-
-            var args = "exec";
-
-            // Probe for runtime config and deps file for the test source
-            var runtimeConfigPath = Path.Combine(dataCollectorDirectory, string.Concat(dataCollectorFileName, ".runtimeconfig.json"));
-
-            if (this.fileHelper.Exists(runtimeConfigPath))
-            {
-                var argsToAdd = " --runtimeconfig " + runtimeConfigPath.AddDoubleQuote();
-                args += argsToAdd;
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DotnetDataCollectionLauncher: Adding {0} in args", argsToAdd);
-                }
-            }
-            else
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DotnetDataCollectionLauncher: File {0}, does not exist", runtimeConfigPath);
-                }
-            }
-
-            // Use the deps.json for test source
-            var depsFilePath = Path.Combine(dataCollectorDirectory, string.Concat(dataCollectorFileName, ".deps.json"));
-            if (this.fileHelper.Exists(depsFilePath))
-            {
-                var argsToAdd = " --depsfile " + depsFilePath.AddDoubleQuote();
-                args += argsToAdd;
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DotnetDataCollectionLauncher: Adding {0} in args", argsToAdd);
-                }
-            }
-            else
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("DotnetDataCollectionLauncher: File {0}, does not exist", depsFilePath);
-                }
-            }
-
-            var cliArgs = string.Join(" ", commandLineArguments);
-            var argumentsString = string.Format("{0} \"{1}\" {2} ", args, dataCollectorAssemblyPath, cliArgs);
-            var dataCollectorProcess = this.processHelper.LaunchProcess(currentProcessFileName, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null);
-            this.DataCollectorProcessId = this.processHelper.GetProcessId(dataCollectorProcess);
-            return this.DataCollectorProcessId;
+            var argsToAdd = " --depsfile " + depsFilePath.AddDoubleQuote();
+            args += argsToAdd;
+            EqtTrace.Verbose("DotnetDataCollectionLauncher: Adding {0} in args", argsToAdd);
         }
+        else
+        {
+            EqtTrace.Verbose("DotnetDataCollectionLauncher: File {0}, does not exist", depsFilePath);
+        }
+
+        var currentProcessFileName = _processHelper.GetCurrentProcessFileName();
+        TPDebug.Assert(currentProcessFileName is not null, "currentProcessFileName is null");
+        EqtTrace.Verbose("DotnetDataCollectionLauncher: Full path of dotnet.exe is {0}", currentProcessFileName);
+
+        var cliArgs = string.Join(" ", commandLineArguments);
+        var argumentsString = string.Format(CultureInfo.InvariantCulture, "{0} \"{1}\" {2} ", args, dataCollectorAssemblyPath, cliArgs);
+        var dataCollectorProcess = _processHelper.LaunchProcess(currentProcessFileName, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, ErrorReceivedCallback, ExitCallBack, null);
+
+        DataCollectorProcessId = _processHelper.GetProcessId(dataCollectorProcess);
+
+        return DataCollectorProcessId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionExtensionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionExtensionManager.cs
index 7e82007df3..dcd5a59ca1 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionExtensionManager.cs
@@ -1,343 +1,345 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// The in process data collection extension manager.
+/// </summary>
+internal class InProcDataCollectionExtensionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private const string DataCollectorEndsWithPattern = @"Collector.dll";
+
+    private readonly IDataCollectionSink _inProcDataCollectionSink;
+    private readonly string? _defaultCodeBase;
+    internal /* for testing purposes */ readonly HashSet<string?> CodeBasePaths;
+    private readonly IFileHelper _fileHelper;
+
+    internal IDictionary<string, IInProcDataCollector> InProcDataCollectors;
 
     /// <summary>
-    /// The in process data collection extension manager.
+    /// Loaded in-proc datacollectors collection
     /// </summary>
-    internal class InProcDataCollectionExtensionManager
+    private IEnumerable<DataCollectorSettings>? _inProcDataCollectorSettingsCollection;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InProcDataCollectionExtensionManager"/> class.
+    /// </summary>
+    /// <param name="runSettings">
+    /// The run settings.
+    /// </param>
+    /// <param name="testEventsPublisher">
+    /// The data collection test case event manager.
+    /// </param>
+    /// <param name="defaultCodeBase">
+    /// The default code base to be used by in-proc data collector
+    /// </param>
+    /// <param name="testPluginCache">The cache of test plugins.</param>
+    public InProcDataCollectionExtensionManager(string? runSettings, ITestEventsPublisher testEventsPublisher, string? defaultCodeBase, TestPluginCache testPluginCache)
+        : this(runSettings, testEventsPublisher, defaultCodeBase, testPluginCache, new FileHelper())
+    { }
+
+    protected InProcDataCollectionExtensionManager(string? runSettings, ITestEventsPublisher testEventsPublisher, string? defaultCodeBase, TestPluginCache testPluginCache, IFileHelper fileHelper)
     {
-        internal IDictionary<string, IInProcDataCollector> InProcDataCollectors;
+        InProcDataCollectors = new Dictionary<string, IInProcDataCollector>();
+        _inProcDataCollectionSink = new InProcDataCollectionSink();
+        _defaultCodeBase = defaultCodeBase;
+        _fileHelper = fileHelper;
+        CodeBasePaths = new HashSet<string?>(StringComparer.OrdinalIgnoreCase) { _defaultCodeBase };
+
+        // Get Datacollector code base paths from test plugin cache
+        var extensionPaths = testPluginCache.GetExtensionPaths(DataCollectorEndsWithPattern);
+        foreach (var extensionPath in extensionPaths)
+        {
+            CodeBasePaths.Add(Path.GetDirectoryName(extensionPath)!);
+        }
 
-        private IDataCollectionSink inProcDataCollectionSink;
+        // Initialize InProcDataCollectors
+        InitializeInProcDataCollectors(runSettings);
 
-        private const string DataCollectorEndsWithPattern = @"Collector.dll";
+        if (IsInProcDataCollectionEnabled)
+        {
+            testEventsPublisher.TestCaseEnd += TriggerTestCaseEnd;
+            testEventsPublisher.TestCaseStart += TriggerTestCaseStart;
+            testEventsPublisher.TestResult += TriggerUpdateTestResult;
+            testEventsPublisher.SessionStart += TriggerTestSessionStart;
+            testEventsPublisher.SessionEnd += TriggerTestSessionEnd;
+        }
+    }
 
-        private string defaultCodeBase;
+    /// <summary>
+    /// Gets a value indicating whether is in-proc data collection enabled.
+    /// </summary>
+    public bool IsInProcDataCollectionEnabled { get; private set; }
 
-        private List<string> codeBasePaths;
+    /// <summary>
+    /// Creates data collector instance based on datacollector settings provided.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="IInProcDataCollector"/>.
+    /// </returns>
+    protected virtual IInProcDataCollector CreateDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration, Type interfaceType)
+    {
+        var inProcDataCollector = new InProcDataCollector(
+            codebase,
+            assemblyQualifiedName,
+            interfaceType,
+            configuration?.OuterXml);
 
-        private IFileHelper fileHelper;
+        inProcDataCollector.LoadDataCollector(_inProcDataCollectionSink);
 
-        /// <summary>
-        /// Loaded in-proc datacollectors collection
-        /// </summary>
-        private IEnumerable<DataCollectorSettings> inProcDataCollectorSettingsCollection;
+        return inProcDataCollector;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InProcDataCollectionExtensionManager"/> class.
-        /// </summary>
-        /// <param name="runSettings">
-        /// The run settings.
-        /// </param>
-        /// <param name="testEventsPublisher">
-        /// The data collection test case event manager.
-        /// </param>
-        /// <param name="defaultCodeBase">
-        /// The default code base to be used by in-proc data collector
-        /// </param>
-        public InProcDataCollectionExtensionManager(string runSettings, ITestEventsPublisher testEventsPublisher, string defaultCodeBase, TestPluginCache testPluginCache)
-            : this(runSettings, testEventsPublisher, defaultCodeBase, testPluginCache, new FileHelper())
-        {}
+    /// <summary>
+    /// The trigger test session start.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    private void TriggerTestSessionStart(object? sender, SessionStartEventArgs e)
+    {
+        TestSessionStartArgs testSessionStartArgs = new(GetSessionStartProperties(e));
+        TriggerInProcDataCollectionMethods(Constants.TestSessionStartMethodName, testSessionStartArgs);
+    }
 
-        protected InProcDataCollectionExtensionManager(string runSettings, ITestEventsPublisher testEventsPublisher, string defaultCodeBase, TestPluginCache testPluginCache, IFileHelper fileHelper)
-        {
-            this.InProcDataCollectors = new Dictionary<string, IInProcDataCollector>();
-            this.inProcDataCollectionSink = new InProcDataCollectionSink();
-            this.defaultCodeBase = defaultCodeBase;
-            this.fileHelper = fileHelper;
-            this.codeBasePaths = new List<string> { this.defaultCodeBase };
-
-            // Get Datacollector code base paths from test plugin cache
-            var extensionPaths = testPluginCache.GetExtensionPaths(DataCollectorEndsWithPattern);
-            foreach (var extensionPath in extensionPaths)
-            {
-                this.codeBasePaths.Add(Path.GetDirectoryName(extensionPath));
-            }
+    /// <summary>
+    /// The trigger session end.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    private void TriggerTestSessionEnd(object? sender, SessionEndEventArgs e)
+    {
+        var testSessionEndArgs = new TestSessionEndArgs();
+        TriggerInProcDataCollectionMethods(Constants.TestSessionEndMethodName, testSessionEndArgs);
+    }
 
-            // Initialize InProcDataCollectors
-            this.InitializeInProcDataCollectors(runSettings);
+    /// <summary>
+    /// The trigger test case start.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    private void TriggerTestCaseStart(object? sender, TestCaseStartEventArgs e)
+    {
+        var testCaseStartArgs = new TestCaseStartArgs(e.TestElement);
+        TriggerInProcDataCollectionMethods(Constants.TestCaseStartMethodName, testCaseStartArgs);
+    }
 
-            if (this.IsInProcDataCollectionEnabled)
-            {
-                testEventsPublisher.TestCaseEnd += this.TriggerTestCaseEnd;
-                testEventsPublisher.TestCaseStart += this.TriggerTestCaseStart;
-                testEventsPublisher.TestResult += this.TriggerUpdateTestResult;
-                testEventsPublisher.SessionStart += this.TriggerTestSessionStart;
-                testEventsPublisher.SessionEnd += this.TriggerTestSessionEnd;
-            }
-        }
+    /// <summary>
+    /// The trigger test case end.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    private void TriggerTestCaseEnd(object? sender, TestCaseEndEventArgs e)
+    {
+        var dataCollectionContext = new DataCollectionContext(e.TestElement);
+        var testCaseEndArgs = new TestCaseEndArgs(dataCollectionContext, e.TestOutcome);
+        TriggerInProcDataCollectionMethods(Constants.TestCaseEndMethodName, testCaseEndArgs);
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether is in-proc data collection enabled.
-        /// </summary>
-        public bool IsInProcDataCollectionEnabled { get; private set; }
-
-        /// <summary>
-        /// Creates data collector instance based on datacollector settings provided.
-        /// </summary>
-        /// <param name="dataCollectorSettings">
-        /// Settings to be used for creating DataCollector.
-        /// </param>
-        /// <param name="interfaceTypeInfo">
-        /// TypeInfo of datacollector.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IInProcDataCollector"/>.
-        /// </returns>
-        protected virtual IInProcDataCollector CreateDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration, TypeInfo interfaceTypeInfo)
+    /// <summary>
+    /// Triggers the send test result method
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The e.
+    /// </param>
+    private void TriggerUpdateTestResult(object? sender, TestResultEventArgs e)
+    {
+        // Just set the cached in-proc data if already exists
+        SetInProcDataCollectionDataInTestResult(e.TestResult);
+    }
+
+    /// <summary>
+    /// Loads all the in-proc data collector dlls
+    /// </summary>
+    /// <param name="runSettings">
+    /// The run Settings.
+    /// </param>
+    private void InitializeInProcDataCollectors(string? runSettings)
+    {
+        try
         {
-            var inProcDataCollector = new InProcDataCollector(
-                codebase,
-                assemblyQualifiedName,
-                interfaceTypeInfo,
-                configuration?.OuterXml);
+            // Check if runsettings contains in-proc datacollector element
+            var inProcDataCollectionRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(runSettings);
+            var inProcDataCollectionSettingsPresentInRunSettings = inProcDataCollectionRunSettings?.IsCollectionEnabled ?? false;
 
-            inProcDataCollector.LoadDataCollector(this.inProcDataCollectionSink);
+            // Verify if it has any valid in-proc datacollectors or just a dummy element
+            inProcDataCollectionSettingsPresentInRunSettings = inProcDataCollectionSettingsPresentInRunSettings &&
+                                                               inProcDataCollectionRunSettings!.DataCollectorSettingsList.Count != 0;
 
-            return inProcDataCollector;
-        }
+            // Initialize if we have at least one
+            if (!inProcDataCollectionSettingsPresentInRunSettings)
+            {
+                return;
+            }
 
-        /// <summary>
-        /// The trigger test session start.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void TriggerTestSessionStart(object sender, SessionStartEventArgs e)
-        {
-            TestSessionStartArgs testSessionStartArgs = new TestSessionStartArgs(this.GetSessionStartProperties(e));
-            this.TriggerInProcDataCollectionMethods(Constants.TestSessionStartMethodName, testSessionStartArgs);
-        }
+            _inProcDataCollectorSettingsCollection = inProcDataCollectionRunSettings!.DataCollectorSettingsList;
 
-        /// <summary>
-        /// The trigger session end.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void TriggerTestSessionEnd(object sender, SessionEndEventArgs e)
-        {
-            var testSessionEndArgs = new TestSessionEndArgs();
-            this.TriggerInProcDataCollectionMethods(Constants.TestSessionEndMethodName, testSessionEndArgs);
+            var interfaceTypeInfo = typeof(InProcDataCollection);
+            foreach (var inProcDc in _inProcDataCollectorSettingsCollection)
+            {
+                var codeBase = GetCodebase(inProcDc.CodeBase!);
+                var assemblyQualifiedName = inProcDc.AssemblyQualifiedName!;
+                var configuration = inProcDc.Configuration!;
+                var inProcDataCollector = CreateDataCollector(assemblyQualifiedName, codeBase, configuration, interfaceTypeInfo);
+                InProcDataCollectors[inProcDataCollector.AssemblyQualifiedName!] = inProcDataCollector;
+            }
         }
-
-        /// <summary>
-        /// The trigger test case start.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void TriggerTestCaseStart(object sender, TestCaseStartEventArgs e)
+        catch (Exception ex)
         {
-            var testCaseStartArgs = new TestCaseStartArgs(e.TestElement);
-            this.TriggerInProcDataCollectionMethods(Constants.TestCaseStartMethodName, testCaseStartArgs);
+            EqtTrace.Error("InProcDataCollectionExtensionManager: Error occurred while Initializing the datacollectors : {0}", ex);
         }
-
-        /// <summary>
-        /// The trigger test case end.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void TriggerTestCaseEnd(object sender, TestCaseEndEventArgs e)
+        finally
         {
-            var dataCollectionContext = new DataCollectionContext(e.TestElement);
-            var testCaseEndArgs = new TestCaseEndArgs(dataCollectionContext, e.TestOutcome);
-            this.TriggerInProcDataCollectionMethods(Constants.TestCaseEndMethodName, testCaseEndArgs);
+            IsInProcDataCollectionEnabled = InProcDataCollectors.Any();
         }
+    }
 
-        /// <summary>
-        /// Triggers the send test result method
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The e.
-        /// </param>
-        private void TriggerUpdateTestResult(object sender, TestResultEventArgs e)
+    /// <summary>
+    /// Gets code base for in-proc datacollector
+    /// Uses all codebasePaths to check where the datacollector exists
+    /// </summary>
+    /// <param name="codeBase">The code base.</param>
+    /// <returns> Code base </returns>
+    private string GetCodebase(string codeBase)
+    {
+        if (Path.IsPathRooted(codeBase))
         {
-            // Just set the cached in-proc data if already exists
-            this.SetInProcDataCollectionDataInTestResult(e.TestResult);
+            return codeBase;
         }
 
-        /// <summary>
-        /// Loads all the in-proc data collector dlls
-        /// </summary>
-        /// <param name="runSettings">
-        /// The run Settings.
-        /// </param>
-        private void InitializeInProcDataCollectors(string runSettings)
+        foreach (var extensionPath in CodeBasePaths)
         {
-            try
-            {
-                // Check if runsettings contains in-proc datacollector element
-                var inProcDataCollectionRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(runSettings);
-                var inProcDataCollectionSettingsPresentInRunSettings = inProcDataCollectionRunSettings?.IsCollectionEnabled ?? false;
-
-                // Verify if it has any valid in-proc datacollectors or just a dummy element
-                inProcDataCollectionSettingsPresentInRunSettings = inProcDataCollectionSettingsPresentInRunSettings &&
-                    inProcDataCollectionRunSettings.DataCollectorSettingsList.Any();
-
-                // Initialize if we have at least one
-                if (inProcDataCollectionSettingsPresentInRunSettings)
-                {
-                    this.inProcDataCollectorSettingsCollection = inProcDataCollectionRunSettings.DataCollectorSettingsList;
-
-                    var interfaceTypeInfo = typeof(InProcDataCollection).GetTypeInfo();
-                    foreach (var inProcDc in this.inProcDataCollectorSettingsCollection)
-                    {
-                        var codeBase = this.GetCodebase(inProcDc.CodeBase);
-                        var assemblyQualifiedName = inProcDc.AssemblyQualifiedName;
-                        var configuration = inProcDc.Configuration;
-                        var inProcDataCollector = this.CreateDataCollector(assemblyQualifiedName, codeBase, configuration, interfaceTypeInfo);
-                        this.InProcDataCollectors[inProcDataCollector.AssemblyQualifiedName] = inProcDataCollector;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("InProcDataCollectionExtensionManager: Error occurred while Initializing the datacollectors : {0}", ex);
-            }
-            finally
+            if (extensionPath is null)
             {
-                this.IsInProcDataCollectionEnabled = this.InProcDataCollectors.Any();
+                continue;
             }
-        }
 
-        /// <summary>
-        /// Gets code base for in-proc datacollector
-        /// Uses all codebasePaths to check where the datacollector exists
-        /// </summary>
-        /// <param name="codeBase">The code base.</param>
-        /// <returns> Code base </returns>
-        private string GetCodebase(string codeBase)
-        {
-            if (!Path.IsPathRooted(codeBase))
+            var assemblyPath = Path.Combine(extensionPath, codeBase);
+            if (_fileHelper.Exists(assemblyPath))
             {
-                foreach (var extensionPath in this.codeBasePaths)
-                {
-                    var assemblyPath = Path.Combine(extensionPath, codeBase);
-                    if (this.fileHelper.Exists(assemblyPath))
-                    {
-                        return assemblyPath;
-                    }
-                }
+                return assemblyPath;
             }
-
-            return codeBase;
         }
 
-        private IDictionary<string, object> GetSessionStartProperties(SessionStartEventArgs sessionStartEventArgs)
+        return codeBase;
+    }
+
+    private static IDictionary<string, object?> GetSessionStartProperties(SessionStartEventArgs sessionStartEventArgs)
+    {
+        var properties = new Dictionary<string, object?>
         {
-            var properties = new Dictionary<string, object>();
-            properties.Add(Constants.TestSourcesPropertyName, sessionStartEventArgs.GetPropertyValue<IEnumerable<string>>(Constants.TestSourcesPropertyName));
-            return properties;
-        }
+            { Constants.TestSourcesPropertyName, sessionStartEventArgs.GetPropertyValue<IEnumerable<string>>(Constants.TestSourcesPropertyName) }
+        };
+        return properties;
+    }
 
-        private void TriggerInProcDataCollectionMethods(string methodName, InProcDataCollectionArgs methodArg)
+    private void TriggerInProcDataCollectionMethods(string methodName, InProcDataCollectionArgs methodArg)
+    {
+        try
         {
-            try
+            foreach (var inProcDc in InProcDataCollectors.Values)
             {
-                foreach (var inProcDc in this.InProcDataCollectors.Values)
-                {
-                    inProcDc.TriggerInProcDataCollectionMethod(methodName, methodArg);
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("InProcDataCollectionExtensionManager: Error occurred while Triggering the {0} method : {1}", methodName, ex);
+                inProcDc.TriggerInProcDataCollectionMethod(methodName, methodArg);
             }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcDataCollectionExtensionManager: Error occurred while Triggering the {0} method : {1}", methodName, ex);
+        }
+    }
 
-        /// <summary>
-        /// Set the data sent via datacollection sink in the testresult property for upstream applications to read.
-        /// And removes the data from the dictionary.
-        /// </summary>
-        /// <param name="testResult">
-        /// The test Result.
-        /// </param>
-        private void SetInProcDataCollectionDataInTestResult(TestResult testResult)
+    /// <summary>
+    /// Set the data sent via datacollection sink in the testresult property for upstream applications to read.
+    /// And removes the data from the dictionary.
+    /// </summary>
+    /// <param name="testResult">
+    /// The test Result.
+    /// </param>
+    private void SetInProcDataCollectionDataInTestResult(TestResult testResult)
+    {
+        // Loops through each datacollector reads the data collection data and sets as TestResult property.
+        foreach (var entry in InProcDataCollectors)
         {
-            // Loops through each datacollector reads the data collection data and sets as TestResult property.
-            foreach (var entry in this.InProcDataCollectors)
-            {
-                var dataCollectionData = ((InProcDataCollectionSink)this.inProcDataCollectionSink).GetDataCollectionDataSetForTestCase(testResult.TestCase.Id);
+            var dataCollectionData = ((InProcDataCollectionSink)_inProcDataCollectionSink).GetDataCollectionDataSetForTestCase(testResult.TestCase.Id);
 
-                foreach (var keyValuePair in dataCollectionData)
-                {
-                    var testProperty = TestProperty.Register(id: keyValuePair.Key, label: keyValuePair.Key, category: string.Empty, description: string.Empty, valueType: typeof(string), validateValueCallback: null, attributes: TestPropertyAttributes.None, owner: typeof(TestCase));
-                    testResult.SetPropertyValue(testProperty, keyValuePair.Value);
-                }
+            foreach (var keyValuePair in dataCollectionData)
+            {
+                var testProperty = TestProperty.Register(id: keyValuePair.Key, label: keyValuePair.Key, category: string.Empty, description: string.Empty, valueType: typeof(string), validateValueCallback: null, attributes: TestPropertyAttributes.None, owner: typeof(TestCase));
+                testResult.SetPropertyValue(testProperty, keyValuePair.Value);
             }
         }
     }
+}
 
-    internal static class Constants
-    {
-        /// <summary>
-        /// The test session start method name.
-        /// </summary>
-        public const string TestSessionStartMethodName = "TestSessionStart";
-
-        /// <summary>
-        /// The test session end method name.
-        /// </summary>
-        public const string TestSessionEndMethodName = "TestSessionEnd";
-
-        /// <summary>
-        /// The test case start method name.
-        /// </summary>
-        public const string TestCaseStartMethodName = "TestCaseStart";
-
-        /// <summary>
-        /// The test case end method name.
-        /// </summary>
-        public const string TestCaseEndMethodName = "TestCaseEnd";
-
-        /// <summary>
-        /// Test sources property name
-        /// </summary>
-        public const string TestSourcesPropertyName = "TestSources";
-
-        /// <summary>
-        /// Coverlet in-proc data collector code base
-        /// </summary>
-        public const string CoverletDataCollectorCodebase = "coverlet.collector.dll";
-
-        /// <summary>
-        /// Coverlet in-proc data collector type name
-        /// </summary>
-        public const string CoverletDataCollectorTypeName = "Coverlet.Collector.DataCollection.CoverletInProcDataCollector";
-    }
+internal static class Constants
+{
+    /// <summary>
+    /// The test session start method name.
+    /// </summary>
+    public const string TestSessionStartMethodName = "TestSessionStart";
+
+    /// <summary>
+    /// The test session end method name.
+    /// </summary>
+    public const string TestSessionEndMethodName = "TestSessionEnd";
+
+    /// <summary>
+    /// The test case start method name.
+    /// </summary>
+    public const string TestCaseStartMethodName = "TestCaseStart";
+
+    /// <summary>
+    /// The test case end method name.
+    /// </summary>
+    public const string TestCaseEndMethodName = "TestCaseEnd";
+
+    /// <summary>
+    /// Test sources property name
+    /// </summary>
+    public const string TestSourcesPropertyName = "TestSources";
+
+    /// <summary>
+    /// Coverlet in-proc data collector code base
+    /// </summary>
+    public const string CoverletDataCollectorCodebase = "coverlet.collector.dll";
+
+    /// <summary>
+    /// Coverlet in-proc data collector type name
+    /// </summary>
+    public const string CoverletDataCollectorTypeName = "Coverlet.Collector.DataCollection.CoverletInProcDataCollector";
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionSink.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionSink.cs
index 079ac0587f..cd90081849 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionSink.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollectionSink.cs
@@ -1,100 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+// <inheritdoc />
+internal class InProcDataCollectionSink : IDataCollectionSink
 {
-    using System;
-    using System.Collections.Generic;
+    private readonly IDictionary<Guid, TestCaseDataCollectionData> _testCaseDataCollectionDataMap;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// In process data collection sink
+    /// </summary>
+    public InProcDataCollectionSink()
+    {
+        _testCaseDataCollectionDataMap = new Dictionary<Guid, TestCaseDataCollectionData>();
+    }
 
     // <inheritdoc />
-    internal class InProcDataCollectionSink : IDataCollectionSink
+    public void SendData(DataCollectionContext dataCollectionContext, string key, string value)
     {
-        private IDictionary<Guid, TestCaseDataCollectionData> testCaseDataCollectionDataMap;
+        ValidateArg.NotNullOrEmpty(key, nameof(key));
+        ValidateArg.NotNullOrEmpty(value, nameof(value));
+        ValidateArg.NotNullOrEmpty(dataCollectionContext?.TestCase?.Id.ToString(), "dataCollectionContext.TestCase.Id");
 
-        /// <summary>
-        /// In process data collection sink
-        /// </summary>
-        public InProcDataCollectionSink()
+        var testCaseId = dataCollectionContext!.TestCase!.Id;
+        AddKeyValuePairToDictionary(testCaseId, key, value);
+    }
+
+    /// <summary>
+    /// Gets the data collection data stored in the in process data collection sink
+    /// </summary>
+    /// <param name="testCaseId">valid test case id</param>
+    /// <returns>test data collection dictionary </returns>
+    public IDictionary<string, string> GetDataCollectionDataSetForTestCase(Guid testCaseId)
+    {
+        if (!_testCaseDataCollectionDataMap.TryGetValue(testCaseId, out TestCaseDataCollectionData? testCaseDataCollection))
         {
-            this.testCaseDataCollectionDataMap = new Dictionary<Guid, TestCaseDataCollectionData>();
+            EqtTrace.Warning("No DataCollection Data set for the test case {0}", testCaseId);
+            return new Dictionary<string, string>();
         }
-
-        // <inheritdoc />
-        public void SendData(DataCollectionContext dataCollectionContext, string key, string value)
+        else
         {
-            ValidateArg.NotNullOrEmpty(key, nameof(key));
-            ValidateArg.NotNullOrEmpty(value, nameof(value));
-            ValidateArg.NotNullOrEmpty(dataCollectionContext.TestCase.Id.ToString(), "dataCollectionContext.TestCase.Id");
-
-            var testCaseId = dataCollectionContext.TestCase.Id;
-            this.AddKeyValuePairToDictionary(testCaseId, key, value);
+            _testCaseDataCollectionDataMap.Remove(testCaseId);
+            return testCaseDataCollection.CollectionData;
         }
+    }
 
-        /// <summary>
-        /// Gets the data collection data stored in the in process data collection sink
-        /// </summary>
-        /// <param name="testCaseId">valid test case id</param>
-        /// <returns>test data collection dictionary </returns>
-        public IDictionary<string, string> GetDataCollectionDataSetForTestCase(Guid testCaseId)
+    private void AddKeyValuePairToDictionary(Guid testCaseId, string key, string value)
+    {
+        if (!_testCaseDataCollectionDataMap.ContainsKey(testCaseId))
         {
-            TestCaseDataCollectionData testCaseDataCollection = null;
-
-            if (!this.testCaseDataCollectionDataMap.TryGetValue(testCaseId, out testCaseDataCollection))
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("No DataCollection Data set for the test case {0}", testCaseId);
-                }
-
-                return new Dictionary<string, string>();
-            }
-            else
-            {
-                this.testCaseDataCollectionDataMap.Remove(testCaseId);
-                return testCaseDataCollection.CollectionData;
-            }
+            var testCaseCollectionData = new TestCaseDataCollectionData();
+            testCaseCollectionData.AddOrUpdateData(key, value);
+            _testCaseDataCollectionDataMap[testCaseId] = testCaseCollectionData;
+        }
+        else
+        {
+            _testCaseDataCollectionDataMap[testCaseId].AddOrUpdateData(key, value);
         }
+    }
 
-        private void AddKeyValuePairToDictionary(Guid testCaseId, string key, string value)
+    private class TestCaseDataCollectionData
+    {
+        public TestCaseDataCollectionData()
         {
-            if (!this.testCaseDataCollectionDataMap.ContainsKey(testCaseId))
-            {
-                var testCaseCollectionData = new TestCaseDataCollectionData();
-                testCaseCollectionData.AddOrUpdateData(key, value);
-                this.testCaseDataCollectionDataMap[testCaseId] = testCaseCollectionData;
-            }
-            else
-            {
-                this.testCaseDataCollectionDataMap[testCaseId].AddOrUpdateData(key, value);
-            }
+            CollectionData = new Dictionary<string, string>();
         }
 
-        private class TestCaseDataCollectionData
+        internal IDictionary<string, string> CollectionData { get; private set; }
+
+        internal void AddOrUpdateData(string key, string value)
         {
-            public TestCaseDataCollectionData()
+            if (!CollectionData.ContainsKey(key))
             {
-                this.CollectionData = new Dictionary<string, string>();
+                CollectionData[key] = value;
             }
-
-            internal IDictionary<string, string> CollectionData { get; private set; }
-
-            internal void AddOrUpdateData(string key, string value)
+            else
             {
-                if (!this.CollectionData.ContainsKey(key))
-                {
-                    this.CollectionData[key] = value;
-                }
-                else
-                {
-                    if (EqtTrace.IsWarningEnabled)
-                    {
-                        EqtTrace.Warning("The data for in-proc data collector with key {0} has already been set. Will be reset with new value", key);
-                    }
-                    this.CollectionData[key] = value;
-                }
+                EqtTrace.Warning("The data for in-proc data collector with key {0} has already been set. Will be reset with new value", key);
+                CollectionData[key] = value;
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollector.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollector.cs
index 3c8abb8da9..ee4dd85be0 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollector.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/InProcDataCollector.cs
@@ -1,175 +1,169 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Class representing an InProcDataCollector loaded by InProcDataCollectionExtensionManager
+/// </summary>
+internal class InProcDataCollector : IInProcDataCollector
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+    /// <summary>
+    /// DataCollector Class Type
+    /// </summary>
+    private readonly Type? _dataCollectorType;
+
+    /// <summary>
+    /// Instance of the
+    /// </summary>
+    private object? _dataCollectorObject;
+
+    /// <summary>
+    /// Config XML from the runsettings for current datacollector
+    /// </summary>
+    private readonly string? _configXml;
 
     /// <summary>
-    /// Class representing an InProcDataCollector loaded by InProcDataCollectionExtensionManager
+    /// AssemblyLoadContext for current platform
     /// </summary>
-    internal class InProcDataCollector : IInProcDataCollector
+    private readonly IAssemblyLoadContext _assemblyLoadContext;
+
+    public InProcDataCollector(
+        string codeBase,
+        string assemblyQualifiedName,
+        Type interfaceType,
+        string? configXml)
+        : this(codeBase, assemblyQualifiedName, interfaceType, configXml, new PlatformAssemblyLoadContext(), TestPluginCache.Instance)
     {
-        /// <summary>
-        /// DataCollector Class Type
-        /// </summary>
-        private Type dataCollectorType;
-
-        /// <summary>
-        /// Instance of the
-        /// </summary>
-        private object dataCollectorObject;
-
-        /// <summary>
-        /// Config XML from the runsettings for current datacollector
-        /// </summary>
-        private string configXml;
-
-        /// <summary>
-        /// AssemblyLoadContext for current platform
-        /// </summary>
-        private IAssemblyLoadContext assemblyLoadContext;
-
-        public InProcDataCollector(
-            string codeBase,
-            string assemblyQualifiedName,
-            TypeInfo interfaceTypeInfo,
-            string configXml)
-            : this(codeBase, assemblyQualifiedName, interfaceTypeInfo, configXml, new PlatformAssemblyLoadContext(), TestPluginCache.Instance)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InProcDataCollector"/> class.
-        /// </summary>
-        /// <param name="codeBase">
-        /// </param>
-        /// <param name="assemblyQualifiedName">
-        /// </param>
-        /// <param name="interfaceTypeInfo">
-        /// </param>
-        /// <param name="configXml">
-        /// </param>
-        /// <param name="assemblyLoadContext">
-        /// </param>
-        internal InProcDataCollector(string codeBase, string assemblyQualifiedName, TypeInfo interfaceTypeInfo, string configXml, IAssemblyLoadContext assemblyLoadContext, TestPluginCache testPluginCache)
-        {
-            this.configXml = configXml;
-            this.assemblyLoadContext = assemblyLoadContext;
-
-            var assembly = this.LoadInProcDataCollectorExtension(codeBase);
-
-            Func<Type, bool> filterPredicate;
-            if (Path.GetFileName(codeBase) == Constants.CoverletDataCollectorCodebase)
-            {
-                // If we're loading coverlet collector we skip to check the version of assembly
-                // to allow upgrade through nuget package
-                filterPredicate = (x) => x.FullName.Equals(Constants.CoverletDataCollectorTypeName) && interfaceTypeInfo.IsAssignableFrom(x.GetTypeInfo());
-
-                // Coverlet collector is consumed as nuget package we need to add assemblies directory to resolver to correctly load references.
-                Debug.Assert(Path.IsPathRooted(codeBase), "Absolute path expected");
-                testPluginCache.AddResolverSearchDirectories(new string[] { Path.GetDirectoryName(codeBase) });
-            }
-            else
-            {
-                filterPredicate = (x) => x.AssemblyQualifiedName.Equals(assemblyQualifiedName) && interfaceTypeInfo.IsAssignableFrom(x.GetTypeInfo());
-            }
-
-            this.dataCollectorType = assembly?.GetTypes().FirstOrDefault(filterPredicate);
-            this.AssemblyQualifiedName = this.dataCollectorType?.AssemblyQualifiedName;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InProcDataCollector"/> class.
+    /// </summary>
+    /// <param name="codeBase">
+    /// </param>
+    /// <param name="assemblyQualifiedName">
+    /// </param>
+    /// <param name="interfaceType">
+    /// </param>
+    /// <param name="configXml">
+    /// </param>
+    /// <param name="assemblyLoadContext">
+    /// </param>
+    /// <param name="testPluginCache"></param>
+    internal InProcDataCollector(string codeBase, string assemblyQualifiedName, Type interfaceType, string? configXml, IAssemblyLoadContext assemblyLoadContext, TestPluginCache testPluginCache)
+    {
+        _configXml = configXml;
+        _assemblyLoadContext = assemblyLoadContext;
 
-        /// <summary>
-        /// AssemblyQualifiedName of the datacollector type
-        /// </summary>
-        public string AssemblyQualifiedName { get; private set; }
+        var assembly = LoadInProcDataCollectorExtension(codeBase);
 
-        /// <summary>
-        /// Loads the DataCollector type
-        /// </summary>
-        /// <param name="inProcDataCollectionSink">Sink object to send data</param>
-        public void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink)
+        Func<Type, bool> filterPredicate;
+        if (Path.GetFileName(codeBase) == Constants.CoverletDataCollectorCodebase)
         {
-            this.dataCollectorObject = CreateObjectFromType(dataCollectorType);
-            InitializeDataCollector(dataCollectorObject, inProcDataCollectionSink);
-        }
+            // If we're loading coverlet collector we skip to check the version of assembly
+            // to allow upgrade through nuget package
+            filterPredicate = x => Constants.CoverletDataCollectorTypeName.Equals(x.FullName) && interfaceType.IsAssignableFrom(x);
 
-        /// <summary>
-        /// Triggers InProcDataCollection Methods
-        /// </summary>
-        /// <param name="methodName">Name of the method to trigger</param>
-        /// <param name="methodArg">Arguments for the method</param>
-        public void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg)
+            // Coverlet collector is consumed as nuget package we need to add assemblies directory to resolver to correctly load references.
+            TPDebug.Assert(Path.IsPathRooted(codeBase), "Absolute path expected");
+            testPluginCache.AddResolverSearchDirectories([Path.GetDirectoryName(codeBase)!]);
+        }
+        else
         {
-            var methodInfo = GetMethodInfoFromType(this.dataCollectorObject.GetType(), methodName, new[] { methodArg.GetType() });
-
-            if (methodName.Equals(Constants.TestSessionStartMethodName))
-            {
-                var testSessionStartArgs = (TestSessionStartArgs)methodArg;
-                testSessionStartArgs.Configuration = configXml;
-                methodInfo?.Invoke(this.dataCollectorObject, new object[] { testSessionStartArgs });
-            }
-            else
-            {
-                methodInfo?.Invoke(this.dataCollectorObject, new object[] { methodArg });
-            }
+            filterPredicate = x => string.Equals(x.AssemblyQualifiedName, assemblyQualifiedName) && interfaceType.IsAssignableFrom(x);
         }
 
-        #region Private Methods
+        _dataCollectorType = assembly?.GetTypes().FirstOrDefault(filterPredicate);
+        AssemblyQualifiedName = _dataCollectorType?.AssemblyQualifiedName;
+    }
+
+    /// <summary>
+    /// AssemblyQualifiedName of the datacollector type
+    /// </summary>
+    public string? AssemblyQualifiedName { get; private set; }
 
-        private void InitializeDataCollector(object obj, IDataCollectionSink inProcDataCollectionSink)
+    /// <summary>
+    /// Loads the DataCollector type
+    /// </summary>
+    /// <param name="inProcDataCollectionSink">Sink object to send data</param>
+    public void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink)
+    {
+        _dataCollectorObject = CreateObjectFromType(_dataCollectorType);
+        InitializeDataCollector(_dataCollectorObject, inProcDataCollectionSink);
+    }
+
+    /// <summary>
+    /// Triggers InProcDataCollection Methods
+    /// </summary>
+    /// <param name="methodName">Name of the method to trigger</param>
+    /// <param name="methodArg">Arguments for the method</param>
+    public void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg)
+    {
+        var methodInfo = GetMethodInfoFromType(_dataCollectorObject?.GetType(), methodName, [methodArg.GetType()]);
+
+        if (methodName.Equals(Constants.TestSessionStartMethodName))
         {
-            var initializeMethodInfo = GetMethodInfoFromType(obj.GetType(), "Initialize", new Type[] { typeof(IDataCollectionSink) });
-            initializeMethodInfo.Invoke(obj, new object[] { inProcDataCollectionSink });
+            var testSessionStartArgs = (TestSessionStartArgs)methodArg;
+            testSessionStartArgs.Configuration = _configXml!;
+            methodInfo?.Invoke(_dataCollectorObject, [testSessionStartArgs]);
         }
-
-        private static MethodInfo GetMethodInfoFromType(Type type, string funcName, Type[] argumentTypes)
+        else
         {
-            return type.GetMethod(funcName, argumentTypes);
+            methodInfo?.Invoke(_dataCollectorObject, [methodArg]);
         }
+    }
 
-        private static object CreateObjectFromType(Type type)
-        {
-            object obj = null;
+    private static void InitializeDataCollector(object? obj, IDataCollectionSink inProcDataCollectionSink)
+    {
+        var initializeMethodInfo = GetMethodInfoFromType(obj?.GetType(), "Initialize", [typeof(IDataCollectionSink)]);
+        initializeMethodInfo?.Invoke(obj, [inProcDataCollectionSink]);
+    }
 
-            var constructorInfo = type.GetConstructor(Type.EmptyTypes);
-            obj = constructorInfo?.Invoke(new object[] { });
+    private static MethodInfo? GetMethodInfoFromType(Type? type, string funcName, Type[] argumentTypes)
+    {
+        return type?.GetMethod(funcName, argumentTypes);
+    }
 
-            return obj;
-        }
+    private static object? CreateObjectFromType(Type? type)
+    {
+        var constructorInfo = type?.GetConstructor(Type.EmptyTypes);
+        object? obj = constructorInfo?.Invoke([]);
+        return obj;
+    }
 
-        /// <summary>
-        /// Loads the assembly into the default context based on the code base path
-        /// </summary>
-        /// <param name="codeBase"></param>
-        /// <returns></returns>
-        private Assembly LoadInProcDataCollectorExtension(string codeBase)
+    /// <summary>
+    /// Loads the assembly into the default context based on the code base path
+    /// </summary>
+    /// <param name="codeBase"></param>
+    /// <returns></returns>
+    private Assembly? LoadInProcDataCollectorExtension(string codeBase)
+    {
+        Assembly? assembly = null;
+        try
         {
-            Assembly assembly = null;
-            try
-            {
-                assembly = this.assemblyLoadContext.LoadAssemblyFromPath(Environment.ExpandEnvironmentVariables(codeBase));
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "InProcDataCollectionExtensionManager: Error occurred while loading the InProcDataCollector : {0} , Exception Details : {1}", codeBase, ex);
-            }
-
-            return assembly;
+            assembly = _assemblyLoadContext.LoadAssemblyFromPath(Environment.ExpandEnvironmentVariables(codeBase));
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error(
+                "InProcDataCollectionExtensionManager: Error occurred while loading the InProcDataCollector : {0} , Exception Details : {1}", codeBase, ex);
         }
 
-        #endregion
+        return assembly;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectionLauncher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectionLauncher.cs
index 3ecc52e14b..eefde514bb 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectionLauncher.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectionLauncher.cs
@@ -1,32 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
 
+/// <summary>
+/// The DataCollectionLauncher interface.
+/// </summary>
+internal interface IDataCollectionLauncher
+{
     /// <summary>
-    /// The DataCollectionLauncher interface.
+    /// Gets the data collector process id
     /// </summary>
-    internal interface IDataCollectionLauncher
-    {
-        /// <summary>
-        /// Gets the data collector process id
-        /// </summary>
-        int DataCollectorProcessId { get; }
+    int DataCollectorProcessId { get; }
 
-        /// <summary>
-        /// The launch data collector.
-        /// </summary>
-        /// <param name="environmentVariables">
-        /// The environment variables.
-        /// </param>
-        /// <param name="commandLineArguments">
-        /// The command line arguments.
-        /// </param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        int LaunchDataCollector(IDictionary<string, string> environmentVariables, IList<string> commandLineArguments);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// The launch data collector.
+    /// </summary>
+    /// <param name="environmentVariables">
+    /// The environment variables.
+    /// </param>
+    /// <param name="commandLineArguments">
+    /// The command line arguments.
+    /// </param>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    int LaunchDataCollector(IDictionary<string, string?>? environmentVariables, IList<string> commandLineArguments);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectorsSettingsProvider.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectorsSettingsProvider.cs
index a131b129d0..f8b5c93d2d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectorsSettingsProvider.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IDataCollectorsSettingsProvider.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
 
+/// <summary>
+/// The DataCollectorsSettingsProvider interface.
+/// </summary>
+public interface IDataCollectorsSettingsProvider : ISettingsProvider
+{
     /// <summary>
-    /// The DataCollectorsSettingsProvider interface.
+    /// Gets run specific data collection settings.
     /// </summary>
-    public interface IDataCollectorsSettingsProvider : ISettingsProvider
-    {
-        /// <summary>
-        /// Gets run specific data collection settings.
-        /// </summary>
-        DataCollectionRunSettings Settings { get; }
-    }
-}
\ No newline at end of file
+    DataCollectionRunSettings Settings { get; }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IInProcDataCollector.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IInProcDataCollector.cs
index e3e59f5982..ed34328304 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IInProcDataCollector.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IInProcDataCollector.cs
@@ -1,29 +1,28 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
 
-    internal interface IInProcDataCollector
-    {
-        /// <summary>
-        /// AssemblyQualifiedName of the datacollector type
-        /// </summary>
-        string AssemblyQualifiedName { get; }
+internal interface IInProcDataCollector
+{
+    /// <summary>
+    /// AssemblyQualifiedName of the datacollector type
+    /// </summary>
+    string? AssemblyQualifiedName { get; }
 
-        /// <summary>
-        /// Loads the DataCollector type
-        /// </summary>
-        /// <param name="inProcDataCollectionSink">Sink object to send data</param>
-        void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink);
+    /// <summary>
+    /// Loads the DataCollector type
+    /// </summary>
+    /// <param name="inProcDataCollectionSink">Sink object to send data</param>
+    void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink);
 
-        /// <summary>
-        /// Triggers InProcDataCollection Methods
-        /// </summary>
-        /// <param name="methodName">Name of the method to trigger</param>
-        /// <param name="methodArg">Arguments for the method</param>
-        void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg);
-    }
+    /// <summary>
+    /// Triggers InProcDataCollection Methods
+    /// </summary>
+    /// <param name="methodName">Name of the method to trigger</param>
+    /// <param name="methodArg">Arguments for the method</param>
+    void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg);
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IProxyDataCollectionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IProxyDataCollectionManager.cs
index 32e52ae2b8..09cf462c27 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IProxyDataCollectionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/IProxyDataCollectionManager.cs
@@ -1,75 +1,72 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
 
+/// <summary>
+/// The ProxyDataCollectionManager interface.
+/// </summary>
+public interface IProxyDataCollectionManager : IDisposable
+{
     /// <summary>
-    /// The ProxyDataCollectionManager interface.
+    /// Initializes proxy datacollection manager.
     /// </summary>
-    public interface IProxyDataCollectionManager : IDisposable
-    {
-        /// <summary>
-        /// Initializes proxy datacollection manager.
-        /// </summary>
-        void Initialize();
+    void Initialize();
 
-        /// <summary>
-        /// The settings xml
-        /// </summary>
-        string SettingsXml { get; }
+    /// <summary>
+    /// The settings xml
+    /// </summary>
+    string? SettingsXml { get; }
 
-        /// <summary>
-        /// List of test sources
-        /// </summary>
-        IEnumerable<string> Sources { get; }
+    /// <summary>
+    /// List of test sources
+    /// </summary>
+    IEnumerable<string> Sources { get; }
 
-        /// <summary>
-        /// Invoked before starting of test run
-        /// </summary>
-        /// <param name="resetDataCollectors">
-        /// Bool value to reset and reinitialize datacollectors.
-        /// </param>
-        /// <param name="isRunStartingNow">
-        /// Bool value to specify if the test execution has started or not.
-        /// </param>
-        /// <param name="runEventsHandler">
-        /// The run Events Handler.
-        /// </param>
-        /// <returns>
-        /// BeforeTestRunStartResult object
-        /// </returns>
-        DataCollectionParameters BeforeTestRunStart(
-            bool resetDataCollectors,
-            bool isRunStartingNow,
-            ITestMessageEventHandler runEventsHandler);
+    /// <summary>
+    /// Invoked before starting of test run
+    /// </summary>
+    /// <param name="resetDataCollectors">
+    /// Bool value to reset and reinitialize datacollectors.
+    /// </param>
+    /// <param name="isRunStartingNow">
+    /// Bool value to specify if the test execution has started or not.
+    /// </param>
+    /// <param name="runEventsHandler">
+    /// The run Events Handler.
+    /// </param>
+    /// <returns>
+    /// BeforeTestRunStartResult object
+    /// </returns>
+    DataCollectionParameters BeforeTestRunStart(
+        bool resetDataCollectors,
+        bool isRunStartingNow,
+        ITestMessageEventHandler runEventsHandler);
 
-        /// <summary>
-        /// Invoked after ending of test run
-        /// </summary>
-        /// <param name="isCanceled">
-        /// The is Canceled.
-        /// </param>
-        /// <param name="runEventsHandler">
-        /// The run Events Handler.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Collection"/>.
-        /// </returns>
-        Collection<AttachmentSet> AfterTestRunEnd(bool isCanceled, ITestMessageEventHandler runEventsHandler);
+    /// <summary>
+    /// Invoked after ending of test run
+    /// </summary>
+    /// <param name="isCanceled">
+    /// The is Canceled.
+    /// </param>
+    /// <param name="runEventsHandler">
+    /// The run Events Handler.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollectionResult"/>.
+    /// </returns>
+    DataCollectionResult AfterTestRunEnd(bool isCanceled, ITestMessageEventHandler runEventsHandler);
 
-        /// <summary>
-        /// Invoked after initialization of test host
-        /// </summary>
-        /// <param name="processId">
-        /// Process ID of test host
-        /// </param>
-        void TestHostLaunched(int processId);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Invoked after initialization of test host
+    /// </summary>
+    /// <param name="processId">
+    /// Process ID of test host
+    /// </param>
+    void TestHostLaunched(int processId);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/ITestEventsPublisher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/ITestEventsPublisher.cs
index 5a79eef295..f7ef97c58a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/ITestEventsPublisher.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/Interfaces/ITestEventsPublisher.cs
@@ -1,40 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+
+/// <summary>
+/// Manager for sending test case events to data collectors.
+/// </summary>
+internal interface ITestEventsPublisher
 {
-    using System;
+    /// <summary>
+    /// The session start event.
+    /// </summary>
+    event EventHandler<SessionStartEventArgs> SessionStart;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// The session end event.
+    /// </summary>
+    event EventHandler<SessionEndEventArgs> SessionEnd;
+
+    /// <summary>
+    /// The test case start event.
+    /// </summary>
+    event EventHandler<TestCaseStartEventArgs> TestCaseStart;
+
+    /// <summary>
+    /// The test case end event.
+    /// </summary>
+    event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
 
     /// <summary>
-    /// Manager for sending test case events to data collectors.
+    /// The test result event.
     /// </summary>
-    internal interface ITestEventsPublisher
-    {
-        /// <summary>
-        /// The session start event.
-        /// </summary>
-        event EventHandler<SessionStartEventArgs> SessionStart;
-
-        /// <summary>
-        /// The session end event.
-        /// </summary>
-        event EventHandler<SessionEndEventArgs> SessionEnd;
-
-        /// <summary>
-        /// The test case start event.
-        /// </summary>
-        event EventHandler<TestCaseStartEventArgs> TestCaseStart;
-
-        /// <summary>
-        /// The test case end event.
-        /// </summary>
-        event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
-
-        /// <summary>
-        /// The test result event.
-        /// </summary>
-        event EventHandler<TestResultEventArgs> TestResult;
-    }
+    event EventHandler<TestResultEventArgs> TestResult;
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ParallelDataCollectionEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ParallelDataCollectionEventsHandler.cs
index a50d5fe6ff..538e6c0ceb 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ParallelDataCollectionEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ParallelDataCollectionEventsHandler.cs
@@ -1,75 +1,78 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+internal class ParallelDataCollectionEventsHandler : ParallelRunEventsHandler
 {
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+    private readonly ParallelRunDataAggregator _runDataAggregator;
+    private readonly ITestRunAttachmentsProcessingManager? _attachmentsProcessingManager;
+    private readonly CancellationToken _cancellationToken;
 
-    internal class ParallelDataCollectionEventsHandler : ParallelRunEventsHandler
+    public ParallelDataCollectionEventsHandler(IRequestData requestData,
+        IProxyExecutionManager proxyExecutionManager,
+        IInternalTestRunEventsHandler actualRunEventsHandler,
+        IParallelProxyExecutionManager parallelProxyExecutionManager,
+        ParallelRunDataAggregator runDataAggregator,
+        ITestRunAttachmentsProcessingManager attachmentsProcessingManager,
+        CancellationToken cancellationToken)
+        : this(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, JsonDataSerializer.Instance)
     {
-        private readonly ParallelRunDataAggregator runDataAggregator;
-        private readonly ITestRunAttachmentsProcessingManager attachmentsProcessingManager;
-        private readonly CancellationToken cancellationToken;
+        _attachmentsProcessingManager = attachmentsProcessingManager;
+        _cancellationToken = cancellationToken;
+    }
 
-        public ParallelDataCollectionEventsHandler(IRequestData requestData,
-            IProxyExecutionManager proxyExecutionManager,
-            ITestRunEventsHandler actualRunEventsHandler,
-            IParallelProxyExecutionManager parallelProxyExecutionManager,
-            ParallelRunDataAggregator runDataAggregator,
-            ITestRunAttachmentsProcessingManager attachmentsProcessingManager,
-            CancellationToken cancellationToken) :
-            this(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, JsonDataSerializer.Instance)
-        {
-            this.attachmentsProcessingManager = attachmentsProcessingManager;
-            this.cancellationToken = cancellationToken;
-        }
+    internal ParallelDataCollectionEventsHandler(IRequestData requestData,
+        IProxyExecutionManager proxyExecutionManager,
+        IInternalTestRunEventsHandler actualRunEventsHandler,
+        IParallelProxyExecutionManager parallelProxyExecutionManager,
+        ParallelRunDataAggregator runDataAggregator,
+        IDataSerializer dataSerializer)
+        : base(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, dataSerializer)
+    {
+        _runDataAggregator = runDataAggregator;
+    }
 
-        internal ParallelDataCollectionEventsHandler(IRequestData requestData,
-            IProxyExecutionManager proxyExecutionManager,
-            ITestRunEventsHandler actualRunEventsHandler,
-            IParallelProxyExecutionManager parallelProxyExecutionManager,
-            ParallelRunDataAggregator runDataAggregator,
-            IDataSerializer dataSerializer) :
-            base(requestData, proxyExecutionManager, actualRunEventsHandler, parallelProxyExecutionManager, runDataAggregator, dataSerializer)
-        {
-            this.runDataAggregator = runDataAggregator;
-        }
+    /// <summary>
+    /// Handles the Run Complete event from a parallel proxy manager
+    /// </summary>
+    public override void HandleTestRunComplete(
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        var parallelRunComplete = HandleSingleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
 
-        /// <summary>
-        /// Handles the Run Complete event from a parallel proxy manager
-        /// </summary>
-        public override void HandleTestRunComplete(
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
+        if (!parallelRunComplete)
         {
-            var parallelRunComplete = HandleSingleTestRunComplete(testRunCompleteArgs, lastChunkArgs, runContextAttachments, executorUris);
+            return;
+        }
 
-            if (parallelRunComplete)
-            {
-                runDataAggregator.RunContextAttachments = attachmentsProcessingManager.ProcessTestRunAttachmentsAsync(requestData, runDataAggregator.RunContextAttachments, cancellationToken).Result ?? runDataAggregator.RunContextAttachments;
+        TPDebug.Assert(_attachmentsProcessingManager is not null, "_attachmentsProcessingManager is null");
+        _runDataAggregator.RunContextAttachments = _attachmentsProcessingManager.ProcessTestRunAttachmentsAsync(_runDataAggregator.RunSettings, _requestData, _runDataAggregator.RunContextAttachments, _runDataAggregator.InvokedDataCollectors, _cancellationToken).Result ?? _runDataAggregator.RunContextAttachments;
 
-                var completedArgs = new TestRunCompleteEventArgs(this.runDataAggregator.GetAggregatedRunStats(),
-                    this.runDataAggregator.IsCanceled,
-                    this.runDataAggregator.IsAborted,
-                    this.runDataAggregator.GetAggregatedException(),
-                    runDataAggregator.RunContextAttachments,
-                    this.runDataAggregator.ElapsedTime);
+        var completedArgs = new TestRunCompleteEventArgs(_runDataAggregator.GetAggregatedRunStats(),
+            _runDataAggregator.IsCanceled,
+            _runDataAggregator.IsAborted,
+            _runDataAggregator.GetAggregatedException(),
+            _runDataAggregator.RunContextAttachments,
+            _runDataAggregator.InvokedDataCollectors,
+            _runDataAggregator.ElapsedTime);
 
-                // Add Metrics from Test Host
-                completedArgs.Metrics = this.runDataAggregator.GetAggregatedRunDataMetrics();
+        // Add Metrics from Test Host
+        completedArgs.Metrics = _runDataAggregator.GetAggregatedRunDataMetrics();
 
-                HandleParallelTestRunComplete(completedArgs);
-            }
-        }
+        HandleParallelTestRunComplete(completedArgs);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyDataCollectionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyDataCollectionManager.cs
index ffcb29f588..216c29c155 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyDataCollectionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyDataCollectionManager.cs
@@ -1,201 +1,202 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Managed datacollector interaction from runner process.
+/// </summary>
+internal class ProxyDataCollectionManager : IProxyDataCollectionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-    using CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+    private const string PortOption = "--port";
+    private const string DiagOption = "--diag";
+    private const string ParentProcessIdOption = "--parentprocessid";
+    private const string TraceLevelOption = "--tracelevel";
+    public const string DebugEnvironmentVaribleName = "VSTEST_DATACOLLECTOR_DEBUG";
+
+    private readonly IDataCollectionRequestSender _dataCollectionRequestSender;
+    private readonly IDataCollectionLauncher _dataCollectionLauncher;
+    private readonly IProcessHelper _processHelper;
+    private readonly IRequestData _requestData;
+    private int _dataCollectionPort;
+    private int _dataCollectionProcessId;
 
     /// <summary>
-    /// Managed datacollector interaction from runner process.
+    /// The settings xml
     /// </summary>
-    internal class ProxyDataCollectionManager : IProxyDataCollectionManager
+    public string? SettingsXml { get; }
+
+    /// <summary>
+    /// List of test sources
+    /// </summary>
+    public IEnumerable<string> Sources { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
+    /// </summary>
+    /// <param name="requestData">
+    /// Request Data providing common execution/discovery services.
+    /// </param>
+    /// <param name="settingsXml">
+    ///     Runsettings that contains the datacollector related configuration.
+    /// </param>
+    /// <param name="sources">
+    ///     Test Run sources
+    /// </param>
+    public ProxyDataCollectionManager(IRequestData requestData, string? settingsXml, IEnumerable<string> sources)
+        : this(requestData, settingsXml, sources, new ProcessHelper())
     {
-        private const string PortOption = "--port";
-        private const string DiagOption = "--diag";
-        private const string ParentProcessIdOption = "--parentprocessid";
-        private const string TraceLevelOption = "--tracelevel";
-        public const string DebugEnvironmentVaribleName = "VSTEST_DATACOLLECTOR_DEBUG";
-
-        private IDataCollectionRequestSender dataCollectionRequestSender;
-        private IDataCollectionLauncher dataCollectionLauncher;
-        private IProcessHelper processHelper;
-        private IRequestData requestData;
-        private int dataCollectionPort;
-        private int dataCollectionProcessId;
-
-        /// <summary>
-        /// The settings xml
-        /// </summary>
-        public string SettingsXml { get; }
-
-        /// <summary>
-        /// List of test sources
-        /// </summary>
-        public IEnumerable<string> Sources { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="requestData">
-        /// Request Data providing common execution/discovery services.
-        /// </param>
-        /// <param name="settingsXml">
-        ///     Runsettings that contains the datacollector related configuration.
-        /// </param>
-        /// <param name="sources">
-        ///     Test Run sources
-        /// </param>
-        public ProxyDataCollectionManager(IRequestData requestData, string settingsXml, IEnumerable<string> sources)
-            : this(requestData, settingsXml, sources, new ProcessHelper())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="requestData">
-        ///     Request Data providing common execution/discovery services.
-        /// </param>
-        /// <param name="settingsXml">
-        ///     The settings xml.
-        /// </param>
-        /// <param name="sources">
-        ///     Test Run sources
-        /// </param>
-        /// <param name="processHelper">
-        ///     The process helper.
-        /// </param>
-        internal ProxyDataCollectionManager(IRequestData requestData, string settingsXml, IEnumerable<string> sources, IProcessHelper processHelper) : this(requestData, settingsXml, sources, new DataCollectionRequestSender(), processHelper, DataCollectionLauncherFactory.GetDataCollectorLauncher(processHelper, settingsXml))
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
+    /// </summary>
+    /// <param name="requestData">
+    ///     Request Data providing common execution/discovery services.
+    /// </param>
+    /// <param name="settingsXml">
+    ///     The settings xml.
+    /// </param>
+    /// <param name="sources">
+    ///     Test Run sources
+    /// </param>
+    /// <param name="processHelper">
+    ///     The process helper.
+    /// </param>
+    internal ProxyDataCollectionManager(IRequestData requestData, string? settingsXml, IEnumerable<string> sources, IProcessHelper processHelper)
+        : this(requestData, settingsXml, sources, new DataCollectionRequestSender(), processHelper, DataCollectionLauncherFactory.GetDataCollectorLauncher(processHelper, settingsXml))
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="requestData">
-        ///     Request Data providing common execution/discovery services.
-        /// </param>
-        /// <param name="settingsXml">
-        ///     Runsettings that contains the datacollector related configuration.
-        /// </param>
-        /// <param name="sources">
-        ///     Test Run sources
-        /// </param>
-        /// <param name="dataCollectionRequestSender">
-        ///     Handles communication with datacollector process.
-        /// </param>
-        /// <param name="processHelper">
-        ///     The process Helper.
-        /// </param>
-        /// <param name="dataCollectionLauncher">
-        ///     Launches datacollector process.
-        /// </param>
-        internal ProxyDataCollectionManager(IRequestData requestData, string settingsXml,
-            IEnumerable<string> sources,
-            IDataCollectionRequestSender dataCollectionRequestSender, IProcessHelper processHelper,
-            IDataCollectionLauncher dataCollectionLauncher)
-        {
-            // DataCollector process needs the information of the Extensions folder
-            // Add the Extensions folder path to runsettings.
-            this.SettingsXml = UpdateExtensionsFolderInRunSettings(settingsXml);
-            this.Sources = sources;
-            this.requestData = requestData;
-
-            this.dataCollectionRequestSender = dataCollectionRequestSender;
-            this.dataCollectionLauncher = dataCollectionLauncher;
-            this.processHelper = processHelper;
-            this.LogEnabledDataCollectors();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyDataCollectionManager"/> class.
+    /// </summary>
+    /// <param name="requestData">
+    ///     Request Data providing common execution/discovery services.
+    /// </param>
+    /// <param name="settingsXml">
+    ///     Runsettings that contains the datacollector related configuration.
+    /// </param>
+    /// <param name="sources">
+    ///     Test Run sources
+    /// </param>
+    /// <param name="dataCollectionRequestSender">
+    ///     Handles communication with datacollector process.
+    /// </param>
+    /// <param name="processHelper">
+    ///     The process Helper.
+    /// </param>
+    /// <param name="dataCollectionLauncher">
+    ///     Launches datacollector process.
+    /// </param>
+    internal ProxyDataCollectionManager(IRequestData requestData, string? settingsXml,
+        IEnumerable<string> sources,
+        IDataCollectionRequestSender dataCollectionRequestSender, IProcessHelper processHelper,
+        IDataCollectionLauncher dataCollectionLauncher)
+    {
+        // DataCollector process needs the information of the Extensions folder
+        // Add the Extensions folder path to runsettings.
+        SettingsXml = UpdateExtensionsFolderInRunSettings(settingsXml);
+        Sources = sources;
+        _requestData = requestData;
+
+        _dataCollectionRequestSender = dataCollectionRequestSender;
+        _dataCollectionLauncher = dataCollectionLauncher;
+        _processHelper = processHelper;
+        LogEnabledDataCollectors();
+    }
 
-        /// <summary>
-        /// Invoked after ending of test run
-        /// </summary>
-        /// <param name="isCanceled">
-        /// The is Canceled.
-        /// </param>
-        /// <param name="runEventsHandler">
-        /// The run Events Handler.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Collection"/>.
-        /// </returns>
-        public Collection<AttachmentSet> AfterTestRunEnd(bool isCanceled, ITestMessageEventHandler runEventsHandler)
-        {
-            AfterTestRunEndResult afterTestRunEnd = null;
-            this.InvokeDataCollectionServiceAction(
+    /// <summary>
+    /// Invoked after ending of test run
+    /// </summary>
+    /// <param name="isCanceled">
+    /// The is Canceled.
+    /// </param>
+    /// <param name="runEventsHandler">
+    /// The run Events Handler.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollectionResult"/>.
+    /// </returns>
+    public DataCollectionResult AfterTestRunEnd(bool isCanceled, ITestMessageEventHandler? runEventsHandler)
+    {
+        AfterTestRunEndResult? afterTestRunEnd = null;
+        InvokeDataCollectionServiceAction(
             () =>
             {
-                EqtTrace.Info("ProxyDataCollectionManager.AfterTestRunEnd: Get attachment set for datacollector processId: {0} port: {1}", dataCollectionProcessId, dataCollectionPort);
-                afterTestRunEnd = this.dataCollectionRequestSender.SendAfterTestRunEndAndGetResult(runEventsHandler, isCanceled);
+                EqtTrace.Info("ProxyDataCollectionManager.AfterTestRunEnd: Get attachment set and invoked data collectors processId: {0} port: {1}", _dataCollectionProcessId, _dataCollectionPort);
+                afterTestRunEnd = _dataCollectionRequestSender.SendAfterTestRunEndAndGetResult(runEventsHandler, isCanceled);
             },
             runEventsHandler);
 
-            if (requestData.IsTelemetryOptedIn && afterTestRunEnd?.Metrics != null)
+        if (_requestData.IsTelemetryOptedIn && afterTestRunEnd?.Metrics != null)
+        {
+            foreach (var metric in afterTestRunEnd.Metrics)
             {
-                foreach (var metric in afterTestRunEnd.Metrics)
-                {
-                    requestData.MetricsCollection.Add(metric.Key, metric.Value);
-                }
+                _requestData.MetricsCollection.Add(metric.Key, metric.Value);
             }
-
-            return afterTestRunEnd?.AttachmentSets;
         }
 
-        /// <summary>
-        /// Invoked before starting of test run
-        /// </summary>
-        /// <param name="resetDataCollectors">
-        /// The reset Data Collectors.
-        /// </param>
-        /// <param name="isRunStartingNow">
-        /// The is Run Starting Now.
-        /// </param>
-        /// <param name="runEventsHandler">
-        /// The run Events Handler.
-        /// </param>
-        /// <returns>
-        /// BeforeTestRunStartResult object
-        /// </returns>
-        public DataCollectionParameters BeforeTestRunStart(
-            bool resetDataCollectors,
-            bool isRunStartingNow,
-            ITestMessageEventHandler runEventsHandler)
-        {
-            var areTestCaseLevelEventsRequired = false;
-            IDictionary<string, string> environmentVariables = new Dictionary<string, string>();
+        return new DataCollectionResult(afterTestRunEnd?.AttachmentSets, afterTestRunEnd?.InvokedDataCollectors);
+    }
 
-            var dataCollectionEventsPort = 0;
-            this.InvokeDataCollectionServiceAction(
+    /// <summary>
+    /// Invoked before starting of test run
+    /// </summary>
+    /// <param name="resetDataCollectors">
+    /// The reset Data Collectors.
+    /// </param>
+    /// <param name="isRunStartingNow">
+    /// The is Run Starting Now.
+    /// </param>
+    /// <param name="runEventsHandler">
+    /// The run Events Handler.
+    /// </param>
+    /// <returns>
+    /// BeforeTestRunStartResult object
+    /// </returns>
+    public DataCollectionParameters BeforeTestRunStart(
+        bool resetDataCollectors,
+        bool isRunStartingNow,
+        ITestMessageEventHandler? runEventsHandler)
+    {
+        var areTestCaseLevelEventsRequired = false;
+        IDictionary<string, string?> environmentVariables = new Dictionary<string, string?>();
+
+        var dataCollectionEventsPort = 0;
+        InvokeDataCollectionServiceAction(
             () =>
             {
-                EqtTrace.Info("ProxyDataCollectionManager.BeforeTestRunStart: Get environment variable and port for datacollector processId: {0} port: {1}", this.dataCollectionProcessId, this.dataCollectionPort);
-                var result = this.dataCollectionRequestSender.SendBeforeTestRunStartAndGetResult(this.SettingsXml, this.Sources, this.requestData.IsTelemetryOptedIn, runEventsHandler);
+                EqtTrace.Info("ProxyDataCollectionManager.BeforeTestRunStart: Get environment variable and port for datacollector processId: {0} port: {1}", _dataCollectionProcessId, _dataCollectionPort);
+                var result = _dataCollectionRequestSender.SendBeforeTestRunStartAndGetResult(SettingsXml, Sources, _requestData.IsTelemetryOptedIn, runEventsHandler);
+                TPDebug.Assert(result is not null, "result is null");
                 environmentVariables = result.EnvironmentVariables;
                 dataCollectionEventsPort = result.DataCollectionEventsPort;
 
@@ -204,216 +205,200 @@ public DataCollectionParameters BeforeTestRunStart(
                     string.Join(";", environmentVariables),
                     dataCollectionEventsPort);
             },
-                runEventsHandler);
-            return new DataCollectionParameters(
-                            areTestCaseLevelEventsRequired,
-                            environmentVariables,
-                            dataCollectionEventsPort);
-        }
+            runEventsHandler);
+        return new DataCollectionParameters(
+            areTestCaseLevelEventsRequired,
+            environmentVariables,
+            dataCollectionEventsPort);
+    }
 
-        /// <inheritdoc />
-        public void TestHostLaunched(int processId)
-        {
-            var payload = new TestHostLaunchedPayload();
-            payload.ProcessId = processId;
+    /// <inheritdoc />
+    public void TestHostLaunched(int processId)
+    {
+        var payload = new TestHostLaunchedPayload();
+        payload.ProcessId = processId;
 
-            this.dataCollectionRequestSender.SendTestHostLaunched(payload);
-        }
+        _dataCollectionRequestSender.SendTestHostLaunched(payload);
+    }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        public void Dispose()
-        {
-            EqtTrace.Info("ProxyDataCollectionManager.Dispose: calling dispose for datacollector processId: {0} port: {1}", this.dataCollectionProcessId, this.dataCollectionPort);
-            this.dataCollectionRequestSender.Close();
-        }
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    public void Dispose()
+    {
+        EqtTrace.Info("ProxyDataCollectionManager.Dispose: calling dispose for datacollector processId: {0} port: {1}", _dataCollectionProcessId, _dataCollectionPort);
+        _dataCollectionRequestSender.Close();
+    }
 
-        /// <inheritdoc />
-        public void Initialize()
-        {
-            this.dataCollectionPort = this.dataCollectionRequestSender.InitializeCommunication();
+    /// <inheritdoc />
+    public void Initialize()
+    {
+        _dataCollectionPort = _dataCollectionRequestSender.InitializeCommunication();
 
-            // Warn the user that execution will wait for debugger attach.
-            this.dataCollectionProcessId = this.dataCollectionLauncher.LaunchDataCollector(null, this.GetCommandLineArguments(this.dataCollectionPort));
-            EqtTrace.Info("ProxyDataCollectionManager.Initialize: Launched datacollector processId: {0} port: {1}", this.dataCollectionProcessId, this.dataCollectionPort);
+        // Warn the user that execution will wait for debugger attach.
+        _dataCollectionProcessId = _dataCollectionLauncher.LaunchDataCollector(null, GetCommandLineArguments(_dataCollectionPort));
+        EqtTrace.Info("ProxyDataCollectionManager.Initialize: Launched datacollector processId: {0} port: {1}", _dataCollectionProcessId, _dataCollectionPort);
 
-            var connectionTimeout = this.GetConnectionTimeout(dataCollectionProcessId);
+        var connectionTimeout = GetConnectionTimeout(_dataCollectionProcessId);
 
-            EqtTrace.Info("ProxyDataCollectionManager.Initialize: waiting for connection with timeout: {0} seconds", connectionTimeout);
+        EqtTrace.Info("ProxyDataCollectionManager.Initialize: waiting for connection with timeout: {0} seconds", connectionTimeout);
 
-            var connected = this.dataCollectionRequestSender.WaitForRequestHandlerConnection(connectionTimeout * 1000);
-            if (connected == false)
-            {
-                EqtTrace.Error("ProxyDataCollectionManager.Initialize: failed to connect to datacollector process, processId: {0} port: {1}", this.dataCollectionProcessId, this.dataCollectionPort);
-                throw new TestPlatformException(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                        CoreUtilitiesConstants.VstestConsoleProcessName,
-                        CoreUtilitiesConstants.DatacollectorProcessName,
-                        connectionTimeout,
-                        EnvironmentHelper.VstestConnectionTimeout)
-                    );
-            }
+        var connected = _dataCollectionRequestSender.WaitForRequestHandlerConnection(connectionTimeout * 1000);
+        if (connected == false)
+        {
+            EqtTrace.Error("ProxyDataCollectionManager.Initialize: failed to connect to datacollector process, processId: {0} port: {1}", _dataCollectionProcessId, _dataCollectionPort);
+            throw new TestPlatformException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                    CoreUtilitiesConstants.VstestConsoleProcessName,
+                    CoreUtilitiesConstants.DatacollectorProcessName,
+                    connectionTimeout,
+                    EnvironmentHelper.VstestConnectionTimeout)
+            );
         }
+    }
 
-        private int GetConnectionTimeout(int processId)
+    private int GetConnectionTimeout(int processId)
+    {
+        var connectionTimeout = EnvironmentHelper.GetConnectionTimeout();
+
+        // Increase connection timeout when debugging is enabled.
+        var dataCollectorDebugEnabled = Environment.GetEnvironmentVariable(DebugEnvironmentVaribleName);
+        if (!StringUtils.IsNullOrEmpty(dataCollectorDebugEnabled) &&
+            dataCollectorDebugEnabled.Equals("1", StringComparison.Ordinal))
         {
-            var connectionTimeout = EnvironmentHelper.GetConnectionTimeout();
+            ConsoleOutput.Instance.WriteLine(CrossPlatEngineResources.DataCollectorDebuggerWarning, OutputLevel.Warning);
+            ConsoleOutput.Instance.WriteLine(
+                string.Format(CultureInfo.InvariantCulture, "Process Id: {0}, Name: {1}", processId, _processHelper.GetProcessName(processId)),
+                OutputLevel.Information);
 
             // Increase connection timeout when debugging is enabled.
-            var dataCollectorDebugEnabled = Environment.GetEnvironmentVariable(DebugEnvironmentVaribleName);
-            if (!string.IsNullOrEmpty(dataCollectorDebugEnabled) &&
-                dataCollectorDebugEnabled.Equals("1", StringComparison.Ordinal))
-            {
-                ConsoleOutput.Instance.WriteLine(CrossPlatEngineResources.DataCollectorDebuggerWarning, OutputLevel.Warning);
-                ConsoleOutput.Instance.WriteLine(
-                    string.Format("Process Id: {0}, Name: {1}", processId, this.processHelper.GetProcessName(processId)),
-                    OutputLevel.Information);
-
-                // Increase connection timeout when debugging is enabled.
-                connectionTimeout *= 5;
-            }
-
-            return connectionTimeout;
+            connectionTimeout *= 5;
         }
 
-        private void InvokeDataCollectionServiceAction(Action action, ITestMessageEventHandler runEventsHandler)
-        {
-            try
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: Starting.");
-                }
-
-                action();
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: Completed.");
-                }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: TestPlatformException = {0}.", ex);
-                }
+        return connectionTimeout;
+    }
 
-                this.HandleExceptionMessage(runEventsHandler, ex);
-            }
+    private static void InvokeDataCollectionServiceAction(Action action, ITestMessageEventHandler? runEventsHandler)
+    {
+        try
+        {
+            EqtTrace.Verbose("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: Starting.");
+            action();
+            EqtTrace.Info("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: Completed.");
         }
-
-        private void HandleExceptionMessage(ITestMessageEventHandler runEventsHandler, Exception exception)
+        catch (Exception ex)
         {
-            if (EqtTrace.IsErrorEnabled)
-            {
-                EqtTrace.Error(exception);
-            }
-
-            runEventsHandler.HandleLogMessage(ObjectModel.Logging.TestMessageLevel.Error, exception.ToString());
+            EqtTrace.Warning("ProxyDataCollectionManager.InvokeDataCollectionServiceAction: TestPlatformException = {0}.", ex);
+            HandleExceptionMessage(runEventsHandler, ex);
         }
+    }
+
+    private static void HandleExceptionMessage(ITestMessageEventHandler? runEventsHandler, Exception exception)
+    {
+        EqtTrace.Error(exception);
+        runEventsHandler?.HandleLogMessage(ObjectModel.Logging.TestMessageLevel.Error, exception.ToString());
+    }
 
-        private IList<string> GetCommandLineArguments(int portNumber)
+    private IList<string> GetCommandLineArguments(int portNumber)
+    {
+        var commandlineArguments = new List<string>
         {
-            var commandlineArguments = new List<string>();
+            PortOption,
+            portNumber.ToString(CultureInfo.CurrentCulture),
 
-            commandlineArguments.Add(PortOption);
-            commandlineArguments.Add(portNumber.ToString());
+            ParentProcessIdOption,
+            _processHelper.GetCurrentProcessId().ToString(CultureInfo.CurrentCulture)
+        };
 
-            commandlineArguments.Add(ParentProcessIdOption);
-            commandlineArguments.Add(this.processHelper.GetCurrentProcessId().ToString());
+        if (!StringUtils.IsNullOrEmpty(EqtTrace.LogFile))
+        {
+            commandlineArguments.Add(DiagOption);
+            commandlineArguments.Add(GetTimestampedLogFile(EqtTrace.LogFile));
 
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
-            {
-                commandlineArguments.Add(DiagOption);
-                commandlineArguments.Add(this.GetTimestampedLogFile(EqtTrace.LogFile));
+            commandlineArguments.Add(TraceLevelOption);
+            commandlineArguments.Add(((int)EqtTrace.TraceLevel).ToString(CultureInfo.CurrentCulture));
+        }
 
-                commandlineArguments.Add(TraceLevelOption);
-                commandlineArguments.Add(((int)EqtTrace.TraceLevel).ToString());
-            }
+        return commandlineArguments;
+    }
 
-            return commandlineArguments;
-        }
+    private static string GetTimestampedLogFile(string logFile)
+    {
+        return Path.ChangeExtension(
+            logFile,
+            string.Format(
+                CultureInfo.InvariantCulture,
+                "datacollector.{0}_{1}{2}",
+                DateTime.Now.ToString("yy-MM-dd_HH-mm-ss_fffff", CultureInfo.CurrentCulture),
+                new PlatformEnvironment().GetCurrentManagedThreadId(),
+                Path.GetExtension(logFile))).AddDoubleQuote();
+    }
 
-        private string GetTimestampedLogFile(string logFile)
+    /// <summary>
+    /// Update Extensions path folder in test adapters paths in runsettings.
+    /// </summary>
+    /// <param name="settingsXml"></param>
+    private static string? UpdateExtensionsFolderInRunSettings(string? settingsXml)
+    {
+        if (settingsXml.IsNullOrWhiteSpace())
         {
-            return Path.ChangeExtension(
-                logFile,
-                string.Format(
-                    "datacollector.{0}_{1}{2}",
-                    DateTime.Now.ToString("yy-MM-dd_HH-mm-ss_fffff"),
-                    new PlatformEnvironment().GetCurrentManagedThreadId(),
-                    Path.GetExtension(logFile))).AddDoubleQuote();
+            return settingsXml;
         }
 
-        /// <summary>
-        /// Update Extensions path folder in test adapters paths in runsettings.
-        /// </summary>
-        /// <param name="settingsXml"></param>
-        private static string UpdateExtensionsFolderInRunSettings(string settingsXml)
-        {
-            if (string.IsNullOrWhiteSpace(settingsXml))
-            {
-                return settingsXml;
-            }
-
-            var extensionsFolder = Path.Combine(Path.GetDirectoryName(typeof(ITestPlatform).GetTypeInfo().Assembly.GetAssemblyLocation()), "Extensions");
+        var extensionsFolder = Path.Combine(Path.GetDirectoryName(typeof(ITestPlatform).Assembly.GetAssemblyLocation())!, "Extensions");
 
-            using (var stream = new StringReader(settingsXml))
-            using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
-            {
-                var document = new XmlDocument();
-                document.Load(reader);
+        using var stream = new StringReader(settingsXml);
+        using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
 
-                var tapNode = RunSettingsProviderExtensions.GetXmlNode(document, "RunConfiguration.TestAdaptersPaths");
+        var tapNode = RunSettingsProviderExtensions.GetXmlNode(document, "RunConfiguration.TestAdaptersPaths");
 
-                if (tapNode != null && !string.IsNullOrWhiteSpace(tapNode.InnerText))
-                {
-                    extensionsFolder = string.Concat(tapNode.InnerText, ';', extensionsFolder);
-                }
+        if (tapNode != null && !StringUtils.IsNullOrWhiteSpace(tapNode.InnerText))
+        {
+            extensionsFolder = string.Concat(tapNode.InnerText, ';', extensionsFolder);
+        }
 
-                RunSettingsProviderExtensions.UpdateRunSettingsXmlDocument(document, "RunConfiguration.TestAdaptersPaths", extensionsFolder);
+        RunSettingsProviderExtensions.UpdateRunSettingsXmlDocumentInnerText(document, "RunConfiguration.TestAdaptersPaths", extensionsFolder);
 
-                return document.OuterXml;
-            }
-        }
+        return document.OuterXml;
+    }
 
-        /// <summary>
-        /// Log Enabled Data Collectors
-        /// </summary>
-        private void LogEnabledDataCollectors()
+    /// <summary>
+    /// Log Enabled Data Collectors
+    /// </summary>
+    private void LogEnabledDataCollectors()
+    {
+        if (!_requestData.IsTelemetryOptedIn)
         {
-            if (!this.requestData.IsTelemetryOptedIn)
-            {
-                return;
-            }
+            return;
+        }
 
-            var dataCollectionSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(this.SettingsXml);
+        var dataCollectionSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(SettingsXml);
 
-            if (dataCollectionSettings == null || !dataCollectionSettings.IsCollectionEnabled)
-            {
-                return;
-            }
+        if (dataCollectionSettings == null || !dataCollectionSettings.IsCollectionEnabled)
+        {
+            return;
+        }
 
-            var enabledDataCollectors = new List<DataCollectorSettings>();
-            foreach (var settings in dataCollectionSettings.DataCollectorSettingsList)
+        var enabledDataCollectors = new List<DataCollectorSettings>();
+        foreach (var settings in dataCollectionSettings.DataCollectorSettingsList)
+        {
+            if (settings.IsEnabled)
             {
-                if (settings.IsEnabled)
+                if (enabledDataCollectors.Any(dcSettings => string.Equals(dcSettings.FriendlyName, settings.FriendlyName, StringComparison.OrdinalIgnoreCase)))
                 {
-                    if (enabledDataCollectors.Any(dcSettings => string.Equals(dcSettings.FriendlyName, settings.FriendlyName, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        // If Uri or assembly qualified type name is repeated, consider data collector as duplicate and ignore it.
-                        continue;
-                    }
-
-                    enabledDataCollectors.Add(settings);
+                    // If Uri or assembly qualified type name is repeated, consider data collector as duplicate and ignore it.
+                    continue;
                 }
-            }
 
-            var dataCollectors = enabledDataCollectors.Select(x => new { x.FriendlyName, x.Uri }.ToString());
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.DataCollectorsEnabled, string.Join(",", dataCollectors.ToArray()));
+                enabledDataCollectors.Add(settings);
+            }
         }
+
+        var dataCollectors = enabledDataCollectors.Select(x => new { x.FriendlyName, x.Uri }.ToString());
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.DataCollectorsEnabled, string.Join(",", dataCollectors.ToArray()));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyOutOfProcDataCollectionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyOutOfProcDataCollectionManager.cs
index b10e7193fe..4596d38202 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyOutOfProcDataCollectionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyOutOfProcDataCollectionManager.cs
@@ -1,101 +1,98 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+
+/// <summary>
+/// Sends test case events to communication layer.
+/// </summary>
+internal class ProxyOutOfProcDataCollectionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+    private readonly IDataCollectionTestCaseEventSender _dataCollectionTestCaseEventSender;
+    private readonly ITestEventsPublisher _testEventsPublisher;
+    private readonly Dictionary<Guid, Collection<AttachmentSet>> _attachmentsCache;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    /// <summary>
+    /// Sync object for ensuring that only run is active at a time
+    /// </summary>
+    private readonly object _syncObject = new();
 
     /// <summary>
-    /// Sends test case events to communication layer.
+    /// Initializes a new instance of the <see cref="ProxyOutOfProcDataCollectionManager"/> class.
     /// </summary>
-    internal class ProxyOutOfProcDataCollectionManager
+    /// <param name="dataCollectionTestCaseEventSender">
+    /// The data collection test case event sender.
+    /// </param>
+    /// <param name="testEventsPublisher">
+    /// Test events publisher.
+    /// </param>
+    public ProxyOutOfProcDataCollectionManager(IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender, ITestEventsPublisher testEventsPublisher)
     {
-        private IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender;
-        private ITestEventsPublisher testEventsPublisher;
-        private Dictionary<Guid, Collection<AttachmentSet>> attachmentsCache;
-
-        /// <summary>
-        /// Sync object for ensuring that only run is active at a time
-        /// </summary>
-        private object syncObject = new object();
+        _attachmentsCache = new Dictionary<Guid, Collection<AttachmentSet>>();
+        _testEventsPublisher = testEventsPublisher;
+        _dataCollectionTestCaseEventSender = dataCollectionTestCaseEventSender;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyOutOfProcDataCollectionManager"/> class.
-        /// </summary>
-        /// <param name="dataCollectionTestCaseEventSender">
-        /// The data collection test case event sender.
-        /// </param>
-        /// <param name="dataCollectionTestCaseEventManager">
-        /// The data collection test case event manager.
-        /// </param>
-        public ProxyOutOfProcDataCollectionManager(IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender, ITestEventsPublisher testEventsPublisher)
-        {
-            this.attachmentsCache = new Dictionary<Guid, Collection<AttachmentSet>>();
-            this.testEventsPublisher = testEventsPublisher;
-            this.dataCollectionTestCaseEventSender = dataCollectionTestCaseEventSender;
+        _testEventsPublisher.TestCaseStart += TriggerTestCaseStart;
+        _testEventsPublisher.TestCaseEnd += TriggerTestCaseEnd;
+        _testEventsPublisher.TestResult += TriggerSendTestResult;
+        _testEventsPublisher.SessionEnd += TriggerTestSessionEnd;
+        _attachmentsCache = new Dictionary<Guid, Collection<AttachmentSet>>();
+    }
 
-            this.testEventsPublisher.TestCaseStart += this.TriggerTestCaseStart;
-            this.testEventsPublisher.TestCaseEnd += this.TriggerTestCaseEnd;
-            this.testEventsPublisher.TestResult += TriggerSendTestResult;
-            this.testEventsPublisher.SessionEnd += this.TriggerTestSessionEnd;
-            this.attachmentsCache = new Dictionary<Guid, Collection<AttachmentSet>>();
-        }
+    private void TriggerTestCaseStart(object? sender, TestCaseStartEventArgs e)
+    {
+        _dataCollectionTestCaseEventSender.SendTestCaseStart(e);
+    }
 
-        private void TriggerTestCaseStart(object sender, TestCaseStartEventArgs e)
-        {
-            this.dataCollectionTestCaseEventSender.SendTestCaseStart(e);
-        }
+    private void TriggerTestCaseEnd(object? sender, TestCaseEndEventArgs e)
+    {
+        var attachments = _dataCollectionTestCaseEventSender.SendTestCaseEnd(e);
 
-        private void TriggerTestCaseEnd(object sender, TestCaseEndEventArgs e)
+        if (attachments != null)
         {
-            var attachments = this.dataCollectionTestCaseEventSender.SendTestCaseEnd(e);
-
-            if (attachments != null)
+            lock (_syncObject)
             {
-                lock (syncObject)
+                if (!_attachmentsCache.TryGetValue(e.TestCaseId, out Collection<AttachmentSet>? attachmentSets))
                 {
-                    Collection<AttachmentSet> attachmentSets;
-                    if (!attachmentsCache.TryGetValue(e.TestCaseId, out attachmentSets))
-                    {
-                        attachmentSets = new Collection<AttachmentSet>();
-                        this.attachmentsCache.Add(e.TestCaseId, attachmentSets);
-                    }
+                    attachmentSets = new Collection<AttachmentSet>();
+                    _attachmentsCache.Add(e.TestCaseId, attachmentSets);
+                }
 
-                    foreach (var attachment in attachments)
-                    {
-                        attachmentSets.Add(attachment);
-                    }
+                foreach (var attachment in attachments)
+                {
+                    attachmentSets.Add(attachment);
                 }
             }
         }
+    }
 
-        private void TriggerSendTestResult(object sender, TestResultEventArgs e)
+    private void TriggerSendTestResult(object? sender, TestResultEventArgs e)
+    {
+        lock (_syncObject)
         {
-            lock (syncObject)
+            if (_attachmentsCache.TryGetValue(e.TestCaseId, out Collection<AttachmentSet>? attachmentSets))
             {
-                Collection<AttachmentSet> attachmentSets;
-                if (this.attachmentsCache.TryGetValue(e.TestCaseId, out attachmentSets))
+                foreach (var attachment in attachmentSets)
                 {
-                    foreach (var attachment in attachmentSets)
-                    {
-                        e.TestResult.Attachments.Add(attachment);
-                    }
+                    e.TestResult.Attachments.Add(attachment);
                 }
-
-                this.attachmentsCache.Remove(e.TestCaseId);
             }
-        }
 
-        private void TriggerTestSessionEnd(object sender, SessionEndEventArgs e)
-        {
-            this.dataCollectionTestCaseEventSender.SendTestSessionEnd(e);
+            _attachmentsCache.Remove(e.TestCaseId);
         }
     }
+
+    private void TriggerTestSessionEnd(object? sender, SessionEndEventArgs e)
+    {
+        _dataCollectionTestCaseEventSender.SendTestSessionEnd(e);
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs
index f85f70fa65..882e06fcbd 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs
@@ -1,339 +1,332 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+
+/// <summary>
+/// Enumerates through all the discoverers.
+/// </summary>
+internal class DiscovererEnumerator
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Utilities;
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+    private readonly DiscoveryResultCache _discoveryResultCache;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IRequestData _requestData;
+    private readonly IAssemblyProperties _assemblyProperties;
+    private readonly CancellationToken _cancellationToken;
 
     /// <summary>
-    /// Enumerates through all the discoverers.
+    /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
     /// </summary>
-    internal class DiscovererEnumerator
+    /// <param name="requestData">The request data for providing discovery services and data.</param>
+    /// <param name="discoveryResultCache"> The discovery result cache. </param>
+    /// <param name="token">Cancellation token.</param>
+    public DiscovererEnumerator(IRequestData requestData, DiscoveryResultCache discoveryResultCache, CancellationToken token)
+        : this(requestData, discoveryResultCache, TestPlatformEventSource.Instance, token)
     {
-        private readonly DiscoveryResultCache discoveryResultCache;
-        private readonly ITestPlatformEventSource testPlatformEventSource;
-        private readonly IRequestData requestData;
-        private readonly IAssemblyProperties assemblyProperties;
-        private readonly CancellationToken cancellationToken;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
-        /// </summary>
-        /// <param name="requestData">The request data for providing discovery services and data.</param>
-        /// <param name="discoveryResultCache"> The discovery result cache. </param>
-        public DiscovererEnumerator(IRequestData requestData, DiscoveryResultCache discoveryResultCache, CancellationToken token)
-            : this(requestData, discoveryResultCache, TestPlatformEventSource.Instance, token)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
-        /// </summary>
-        /// <param name="requestData">The request data for providing discovery services and data.</param>
-        /// <param name="discoveryResultCache"> The discovery result cache. </param>
-        /// <param name="testPlatformEventSource">Telemetry events receiver</param>
-        /// <param name="token">Cancellation Token to abort discovery</param>
-        public DiscovererEnumerator(IRequestData requestData,
-            DiscoveryResultCache discoveryResultCache,
-            ITestPlatformEventSource testPlatformEventSource,
-            CancellationToken token)
-            : this(requestData, discoveryResultCache, testPlatformEventSource, new AssemblyProperties(), token)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
+    /// </summary>
+    /// <param name="requestData">The request data for providing discovery services and data.</param>
+    /// <param name="discoveryResultCache"> The discovery result cache. </param>
+    /// <param name="testPlatformEventSource">Telemetry events receiver</param>
+    /// <param name="token">Cancellation Token to abort discovery</param>
+    public DiscovererEnumerator(IRequestData requestData,
+        DiscoveryResultCache discoveryResultCache,
+        ITestPlatformEventSource testPlatformEventSource,
+        CancellationToken token)
+        : this(requestData, discoveryResultCache, testPlatformEventSource, new AssemblyProperties(), token)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
-        /// </summary>
-        /// <param name="requestData">The request data for providing discovery services and data.</param>
-        /// <param name="discoveryResultCache"> The discovery result cache. </param>
-        /// <param name="testPlatformEventSource">Telemetry events receiver</param>
-        /// <param name="assemblyProperties">Information on the assemblies being discovered</param>
-        /// <param name="token">Cancellation Token to abort discovery</param>
-        public DiscovererEnumerator(IRequestData requestData,
-            DiscoveryResultCache discoveryResultCache,
-            ITestPlatformEventSource testPlatformEventSource,
-            IAssemblyProperties assemblyProperties,
-            CancellationToken token)
-        {
-            // Added this to make class testable, needed a PEHeader mocked Instance
-            this.discoveryResultCache = discoveryResultCache;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.requestData = requestData;
-            this.assemblyProperties = assemblyProperties;
-            this.cancellationToken = token;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscovererEnumerator"/> class.
+    /// </summary>
+    /// <param name="requestData">The request data for providing discovery services and data.</param>
+    /// <param name="discoveryResultCache"> The discovery result cache. </param>
+    /// <param name="testPlatformEventSource">Telemetry events receiver</param>
+    /// <param name="assemblyProperties">Information on the assemblies being discovered</param>
+    /// <param name="token">Cancellation Token to abort discovery</param>
+    public DiscovererEnumerator(IRequestData requestData,
+        DiscoveryResultCache discoveryResultCache,
+        ITestPlatformEventSource testPlatformEventSource,
+        IAssemblyProperties assemblyProperties,
+        CancellationToken token)
+    {
+        // Added this to make class testable, needed a PEHeader mocked Instance
+        _discoveryResultCache = discoveryResultCache;
+        _testPlatformEventSource = testPlatformEventSource;
+        _requestData = requestData;
+        _assemblyProperties = assemblyProperties;
+        _cancellationToken = token;
+    }
 
-        /// <summary>
-        /// Discovers tests from the sources.
-        /// </summary>
-        /// <param name="testExtensionSourceMap"> The test extension source map. </param>
-        /// <param name="settings"> The settings. </param>
-        /// <param name="testCaseFilter"> The test case filter. </param>
-        /// <param name="logger"> The logger. </param>
-        public void LoadTests(IDictionary<string, IEnumerable<string>> testExtensionSourceMap, IRunSettings settings, string testCaseFilter, IMessageLogger logger)
+    /// <summary>
+    /// Discovers tests from the sources.
+    /// </summary>
+    /// <param name="testExtensionSourceMap"> The test extension source map. </param>
+    /// <param name="settings"> The settings. </param>
+    /// <param name="testCaseFilter"> The test case filter. </param>
+    /// <param name="logger"> The logger. </param>
+    public void LoadTests(IDictionary<string, IEnumerable<string>> testExtensionSourceMap, IRunSettings? settings, string? testCaseFilter, IMessageLogger logger)
+    {
+        _testPlatformEventSource.DiscoveryStart();
+        try
         {
-            this.testPlatformEventSource.DiscoveryStart();
-            try
-            {
-                foreach (var kvp in testExtensionSourceMap)
-                {
-                    this.LoadTestsFromAnExtension(kvp.Key, kvp.Value, settings, testCaseFilter, logger);
-                }
-            }
-            finally
+            foreach (var kvp in testExtensionSourceMap)
             {
-                this.testPlatformEventSource.DiscoveryStop(this.discoveryResultCache.TotalDiscoveredTests);
+                LoadTestsFromAnExtension(kvp.Key, kvp.Value, settings, testCaseFilter, logger);
             }
         }
-
-        /// <summary>
-        /// Loads test cases from individual source.
-        /// Discovery extensions update progress through ITestCaseDiscoverySink.
-        /// Discovery extensions sends discovery messages through TestRunMessageLoggerProxy
-        /// </summary>
-        /// <param name="extensionAssembly"> The extension Assembly. </param>
-        /// <param name="sources"> The sources.   </param>
-        /// <param name="settings"> The settings.   </param>
-        /// <param name="settings"> The test case filter. </param>
-        /// <param name="logger"> The logger.  </param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes",
-            Justification = "This methods must invoke all possible discoverers and not fail or crash in any one.")]
-        private void LoadTestsFromAnExtension(string extensionAssembly, IEnumerable<string> sources, IRunSettings settings, string testCaseFilter, IMessageLogger logger)
+        finally
         {
-            // Stopwatch to collect metrics
-            var timeStart = DateTime.UtcNow;
+            _testPlatformEventSource.DiscoveryStop(_discoveryResultCache.TotalDiscoveredTests);
+        }
+    }
 
-            var discovererToSourcesMap = GetDiscovererToSourcesMap(extensionAssembly, sources, logger, this.assemblyProperties);
-            var totalAdapterLoadTIme = DateTime.UtcNow - timeStart;
+    /// <summary>
+    /// Loads test cases from individual source.
+    /// Discovery extensions update progress through ITestCaseDiscoverySink.
+    /// Discovery extensions sends discovery messages through TestRunMessageLoggerProxy
+    /// </summary>
+    /// <param name="extensionAssembly"> The extension Assembly. </param>
+    /// <param name="sources"> The sources.   </param>
+    /// <param name="settings"> The settings.   </param>
+    /// <param name="testCaseFilter"> The test case filter. </param>
+    /// <param name="logger"> The logger.  </param>
+    private void LoadTestsFromAnExtension(string extensionAssembly, IEnumerable<string> sources, IRunSettings? settings, string? testCaseFilter, IMessageLogger logger)
+    {
+        // Stopwatch to collect metrics
+        var timeStart = DateTime.UtcNow;
 
-            // Collecting Data Point for TimeTaken to Load Adapters
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, totalAdapterLoadTIme.TotalSeconds);
+        var discovererToSourcesMap = GetDiscovererToSourcesMap(extensionAssembly, sources, logger, _assemblyProperties);
+        var totalAdapterLoadTIme = DateTime.UtcNow - timeStart;
 
-            // Warning is logged for in the inner function
-            if (discovererToSourcesMap == null || !discovererToSourcesMap.Any())
-            {
-                return;
-            }
+        // Collecting Data Point for TimeTaken to Load Adapters
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, totalAdapterLoadTIme.TotalSeconds);
 
-            double totalTimeTakenByAdapters = 0;
-            double totalAdaptersUsed = 0;
-            try
-            {
-                // Collecting Total Number of Adapters Discovered in Machine
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, discovererToSourcesMap.Keys.Count);
+        // Warning is logged for in the inner function
+        if (discovererToSourcesMap == null || discovererToSourcesMap.Count == 0)
+        {
+            return;
+        }
 
-                var context = new DiscoveryContext { RunSettings = settings };
-                context.FilterExpressionWrapper = !string.IsNullOrEmpty(testCaseFilter) ? new FilterExpressionWrapper(testCaseFilter) : null;
+        double totalTimeTakenByAdapters = 0;
+        double totalAdaptersUsed = 0;
+        try
+        {
+            // Collecting Total Number of Adapters Discovered in Machine
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, discovererToSourcesMap.Keys.Count);
 
-                // Set on the logger the TreatAdapterErrorAsWarning setting from runsettings.
-                this.SetAdapterLoggingSettings(logger, settings);
+            var context = new DiscoveryContext { RunSettings = settings };
+            context.FilterExpressionWrapper = !StringUtils.IsNullOrEmpty(testCaseFilter) ? new FilterExpressionWrapper(testCaseFilter) : null;
 
-                var discoverySink = new TestCaseDiscoverySink(this.discoveryResultCache);
-                foreach (var discoverer in discovererToSourcesMap.Keys)
-                {
-                    if (this.cancellationToken.IsCancellationRequested)
-                    {
-                        EqtTrace.Info("DiscovererEnumerator.LoadTestsFromAnExtension: Cancellation Requested. Aborting the discovery");
-                        LogTestsDiscoveryCancellation(logger);
-                        return;
-                    }
-
-                    this.DiscoverTestsFromSingleDiscoverer(discoverer, discovererToSourcesMap, context, discoverySink, logger, ref totalAdaptersUsed, ref totalTimeTakenByAdapters);
-                }
+            // Set on the logger the TreatAdapterErrorAsWarning setting from runsettings.
+            SetAdapterLoggingSettings(logger, settings);
 
-                if (this.discoveryResultCache.TotalDiscoveredTests == 0)
+            var discoverySink = new TestCaseDiscoverySink(_discoveryResultCache);
+            foreach (var discoverer in discovererToSourcesMap.Keys)
+            {
+                if (_cancellationToken.IsCancellationRequested)
                 {
-                    LogWarningOnNoTestsDiscovered(sources, testCaseFilter, logger);
+                    EqtTrace.Info("DiscovererEnumerator.LoadTestsFromAnExtension: Cancellation Requested. Aborting the discovery");
+                    LogTestsDiscoveryCancellation(logger);
+                    return;
                 }
+
+                DiscoverTestsFromSingleDiscoverer(discoverer, discovererToSourcesMap, context, discoverySink, logger, ref totalAdaptersUsed, ref totalTimeTakenByAdapters);
             }
-            finally
+
+            if (_discoveryResultCache.TotalDiscoveredTests == 0)
             {
-                this.CollectTelemetryAtEnd(totalTimeTakenByAdapters, totalAdaptersUsed);
+                LogWarningOnNoTestsDiscovered(sources, testCaseFilter, logger);
             }
         }
-
-        private void LogTestsDiscoveryCancellation(IMessageLogger logger)
+        finally
         {
-            logger.SendMessage(TestMessageLevel.Warning, CrossPlatEngineResources.TestDiscoveryCancelled);
+            CollectTelemetryAtEnd(totalTimeTakenByAdapters, totalAdaptersUsed);
         }
+    }
 
-        private void CollectTelemetryAtEnd(double totalTimeTakenByAdapters, double totalAdaptersUsed)
-        {
-            // Collecting Total Time Taken by Adapters
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecByAllAdapters,
-                totalTimeTakenByAdapters);
+    private static void LogTestsDiscoveryCancellation(IMessageLogger logger)
+    {
+        logger.SendMessage(TestMessageLevel.Warning, CrossPlatEngineResources.TestDiscoveryCancelled);
+    }
+
+    private void CollectTelemetryAtEnd(double totalTimeTakenByAdapters, double totalAdaptersUsed)
+    {
+        // Collecting Total Time Taken by Adapters
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenInSecByAllAdapters,
+            totalTimeTakenByAdapters);
+
+        // Collecting Total Adapters Used to Discover tests
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests,
+            totalAdaptersUsed);
+    }
 
-            // Collecting Total Adapters Used to Discover tests
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests,
-                totalAdaptersUsed);
+    private void DiscoverTestsFromSingleDiscoverer(
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer,
+        Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>> discovererToSourcesMap,
+        DiscoveryContext context,
+        TestCaseDiscoverySink discoverySink,
+        IMessageLogger logger,
+        ref double totalAdaptersUsed,
+        ref double totalTimeTakenByAdapters)
+    {
+        if (!TryToLoadDiscoverer(discoverer, logger, out var discovererType))
+        {
+            // Fail to instantiate the discoverer type.
+            return;
         }
 
-        private void DiscoverTestsFromSingleDiscoverer(
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer,
-            Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>> discovererToSourcesMap,
-            DiscoveryContext context,
-            TestCaseDiscoverySink discoverySink,
-            IMessageLogger logger,
-            ref double totalAdaptersUsed,
-            ref double totalTimeTakenByAdapters)
+        // on instantiated successfully, get tests
+        try
         {
-            if (!DiscovererEnumerator.TryToLoadDiscoverer(discoverer, logger, out var discovererType))
-            {
-                // Fail to instantiate the discoverer type.
-                return;
-            }
+            EqtTrace.Verbose(
+                "DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: Loading tests for {0}",
+                discoverer.Value.GetType().FullName);
 
-            // on instantiated successfully, get tests
-            try
+            if (discoverer.Metadata.DefaultExecutorUri == null)
             {
-                EqtTrace.Verbose(
-                    "DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: Loading tests for {0}",
-                        discoverer.Value.GetType().FullName);
-
-                if (discoverer.Metadata.DefaultExecutorUri == null)
-                {
-                    throw new Exception($@"DefaultExecutorUri is null, did you decorate the discoverer class with [DefaultExecutorUri()] attribute? For example [DefaultExecutorUri(""executor://example.testadapter"")].");
-                }
-
-                var currentTotalTests = this.discoveryResultCache.TotalDiscoveredTests;
-                var newTimeStart = DateTime.UtcNow;
+                throw new Exception($@"DefaultExecutorUri is null, did you decorate the discoverer class with [DefaultExecutorUri()] attribute? For example [DefaultExecutorUri(""executor://example.testadapter"")].");
+            }
 
-                this.testPlatformEventSource.AdapterDiscoveryStart(discoverer.Metadata.DefaultExecutorUri.AbsoluteUri);
-                discoverer.Value.DiscoverTests(discovererToSourcesMap[discoverer], context, logger, discoverySink);
+            var currentTotalTests = _discoveryResultCache.TotalDiscoveredTests;
+            var newTimeStart = DateTime.UtcNow;
 
-                var totalAdapterRunTime = DateTime.UtcNow - newTimeStart;
+            _testPlatformEventSource.AdapterDiscoveryStart(discoverer.Metadata.DefaultExecutorUri.AbsoluteUri);
+            discoverer.Value.DiscoverTests(discovererToSourcesMap[discoverer], context, logger, discoverySink);
 
-                this.testPlatformEventSource.AdapterDiscoveryStop(this.discoveryResultCache.TotalDiscoveredTests -
-                                                                  currentTotalTests);
+            var totalAdapterRunTime = DateTime.UtcNow - newTimeStart;
 
-                // Record Total Tests Discovered By each Discoverer.
-                var totalTestsDiscoveredByCurrentDiscoverer = this.discoveryResultCache.TotalDiscoveredTests - currentTotalTests;
-                this.requestData.MetricsCollection.Add(
-                    string.Format("{0}.{1}", TelemetryDataConstants.TotalTestsByAdapter,
-                        discoverer.Metadata.DefaultExecutorUri), totalTestsDiscoveredByCurrentDiscoverer);
+            _testPlatformEventSource.AdapterDiscoveryStop(_discoveryResultCache.TotalDiscoveredTests -
+                                                         currentTotalTests);
 
-                totalAdaptersUsed++;
+            // Record Total Tests Discovered By each Discoverer.
+            var totalTestsDiscoveredByCurrentDiscoverer = _discoveryResultCache.TotalDiscoveredTests - currentTotalTests;
+            _requestData.MetricsCollection.Add(
+                $"{TelemetryDataConstants.TotalTestsByAdapter}.{discoverer.Metadata.DefaultExecutorUri}",
+                totalTestsDiscoveredByCurrentDiscoverer);
 
-                EqtTrace.Verbose("DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: Done loading tests for {0}",
-                        discoverer.Value.GetType().FullName);
+            totalAdaptersUsed++;
 
-                var discovererFromDeprecatedLocations = IsDiscovererFromDeprecatedLocations(discoverer);
-                if (discovererFromDeprecatedLocations)
-                {
-                    logger.SendMessage(TestMessageLevel.Warning,
-                        string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DeprecatedAdapterPath));
-                }
+            EqtTrace.Verbose("DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: Done loading tests for {0}",
+                discoverer.Value.GetType().FullName);
 
-                // Collecting Data Point for Time Taken to Discover Tests by each Adapter
-                this.requestData.MetricsCollection.Add(
-                    string.Format("{0}.{1}", TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter,
-                        discoverer.Metadata.DefaultExecutorUri), totalAdapterRunTime.TotalSeconds);
-                totalTimeTakenByAdapters += totalAdapterRunTime.TotalSeconds;
-            }
-            catch (Exception e)
+            var discovererFromDeprecatedLocations = IsDiscovererFromDeprecatedLocations(discoverer);
+            if (discovererFromDeprecatedLocations)
             {
-                var message = string.Format(
-                    CultureInfo.CurrentUICulture,
-                    CrossPlatEngineResources.ExceptionFromLoadTests,
-                    discovererType.Name,
-                    e.Message);
-
-                logger.SendMessage(TestMessageLevel.Error, message);
-                EqtTrace.Error("DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: {0} ", e);
+                logger.SendMessage(TestMessageLevel.Warning,
+                    string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DeprecatedAdapterPath));
             }
-        }
 
-        private static bool TryToLoadDiscoverer(LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer, IMessageLogger logger, out Type discovererType)
+            // Collecting Data Point for Time Taken to Discover Tests by each Adapter
+            _requestData.MetricsCollection.Add(
+                $"{TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter}.{discoverer.Metadata.DefaultExecutorUri}",
+                totalAdapterRunTime.TotalSeconds);
+            totalTimeTakenByAdapters += totalAdapterRunTime.TotalSeconds;
+        }
+        catch (Exception e)
         {
-            discovererType = null;
+            var message = string.Format(
+                CultureInfo.CurrentCulture,
+                CrossPlatEngineResources.ExceptionFromLoadTests,
+                discovererType.Name,
+                e.Message);
+
+            logger.SendMessage(TestMessageLevel.Error, message);
+            EqtTrace.Error("DiscovererEnumerator.DiscoverTestsFromSingleDiscoverer: {0} ", e);
+        }
+    }
 
-            // See if discoverer can be instantiated successfully else move next.
-            try
-            {
-                discovererType = discoverer.Value.GetType();
-            }
-            catch (Exception e)
-            {
-                var mesage = string.Format(
-                    CultureInfo.CurrentUICulture,
-                    CrossPlatEngineResources.DiscovererInstantiationException,
-                    e.Message);
-                logger.SendMessage(TestMessageLevel.Warning, mesage);
-                EqtTrace.Error("DiscovererEnumerator.LoadTestsFromAnExtension: {0} ", e);
-
-                return false;
-            }
+    private static bool TryToLoadDiscoverer(LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer, IMessageLogger logger, [NotNullWhen(true)] out Type? discovererType)
+    {
+        discovererType = null;
 
-            return true;
+        // See if discoverer can be instantiated successfully else move next.
+        try
+        {
+            discovererType = discoverer.Value.GetType();
         }
-
-        private static bool IsDiscovererFromDeprecatedLocations(
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer)
+        catch (Exception e)
         {
-            if (CrossPlatEngine.Constants.DefaultAdapters.Contains(discoverer.Metadata.DefaultExecutorUri.ToString(),
-                StringComparer.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-
-            var discovererLocation = discoverer.Value.GetType().GetTypeInfo().Assembly.GetAssemblyLocation();
+            var mesage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DiscovererInstantiationException, e.Message);
+            logger.SendMessage(TestMessageLevel.Warning, mesage);
+            EqtTrace.Error("DiscovererEnumerator.LoadTestsFromAnExtension: {0} ", e);
 
-            return Path.GetDirectoryName(discovererLocation)
-                .Equals(CrossPlatEngine.Constants.DefaultAdapterLocation, StringComparison.OrdinalIgnoreCase);
+            return false;
         }
 
-        private static void LogWarningOnNoTestsDiscovered(IEnumerable<string> sources, string testCaseFilter, IMessageLogger logger)
+        return true;
+    }
+
+    private static bool IsDiscovererFromDeprecatedLocations(
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> discoverer)
+    {
+        TPDebug.Assert(discoverer.Metadata.DefaultExecutorUri is not null, "discoverer.Metadata.DefaultExecutorUri is null");
+        if (Constants.DefaultAdapters.Contains(discoverer.Metadata.DefaultExecutorUri.ToString(), StringComparer.OrdinalIgnoreCase))
         {
-            var sourcesString = string.Join(" ", sources);
+            return false;
+        }
 
-            // Print warning on no tests.
-            if (!string.IsNullOrEmpty(testCaseFilter))
-            {
-                var testCaseFilterToShow = TestCaseFilterDeterminer.ShortenTestCaseFilterIfRequired(testCaseFilter);
+        var discovererLocation = discoverer.Value.GetType().Assembly.GetAssemblyLocation();
 
-                logger.SendMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(CrossPlatEngineResources.NoTestsAvailableForGivenTestCaseFilter, testCaseFilterToShow, sourcesString));
-            }
-            else
-            {
-                logger.SendMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources,
-                        sourcesString));
-            }
+        return Path.GetDirectoryName(discovererLocation)!
+            .Equals(Constants.DefaultAdapterLocation, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static void LogWarningOnNoTestsDiscovered(IEnumerable<string> sources, string? testCaseFilter, IMessageLogger logger)
+    {
+        var sourcesString = string.Join(" ", sources);
+
+        // Print warning on no tests.
+        if (!testCaseFilter.IsNullOrEmpty())
+        {
+            var testCaseFilterToShow = TestCaseFilterDeterminer.ShortenTestCaseFilterIfRequired(testCaseFilter);
+
+            logger.SendMessage(
+                TestMessageLevel.Warning,
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoTestsAvailableForGivenTestCaseFilter, testCaseFilterToShow, sourcesString));
         }
+        else
+        {
+            logger.SendMessage(
+                TestMessageLevel.Warning,
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources, sourcesString));
+        }
+    }
 
-        private void SetAdapterLoggingSettings(IMessageLogger messageLogger, IRunSettings runSettings)
+    private static void SetAdapterLoggingSettings(IMessageLogger messageLogger, IRunSettings? runSettings)
+    {
+        if (messageLogger is TestSessionMessageLogger discoveryMessageLogger && runSettings != null)
         {
-            var discoveryMessageLogger = messageLogger as TestSessionMessageLogger;
-            if (discoveryMessageLogger != null && runSettings != null)
-            {
 #if Todo
                 // TODO : Enable this when RunSettings is enabled.
                 IRunConfigurationSettingsProvider runConfigurationSettingsProvider =
@@ -345,156 +338,182 @@ private void SetAdapterLoggingSettings(IMessageLogger messageLogger, IRunSetting
                                 = runConfigurationSettingsProvider.Settings.TreatTestAdapterErrorsAsWarnings;
                 }
 #endif
-            }
         }
+    }
+
+    /// <summary>
+    /// Get the discoverers matching with the parameter sources
+    /// </summary>
+    /// <param name="extensionAssembly"> The extension assembly. </param>
+    /// <param name="sources"> The sources. </param>
+    /// <param name="logger"> The logger instance. </param>
+    /// <param name="assemblyProperties">Assembly properties</param>
+    /// <returns> The map between an extension type and a source. </returns>
+    internal static Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>>? GetDiscovererToSourcesMap(
+        string extensionAssembly,
+        IEnumerable<string> sources,
+        IMessageLogger logger,
+        IAssemblyProperties assemblyProperties)
+    {
+        var allDiscoverers = GetDiscoverers(extensionAssembly, throwOnError: true);
 
-        /// <summary>
-        /// Get the discoverers matching with the parameter sources
-        /// </summary>
-        /// <param name="extensionAssembly"> The extension assembly. </param>
-        /// <param name="sources"> The sources. </param>
-        /// <param name="logger"> The logger instance. </param>
-        /// <returns> The map between an extension type and a source. </returns>
-        internal static Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>> GetDiscovererToSourcesMap(
-            string extensionAssembly,
-            IEnumerable<string> sources,
-            IMessageLogger logger,
-            IAssemblyProperties assemblyProperties)
+        if (allDiscoverers == null || !allDiscoverers.Any())
         {
-            var allDiscoverers = GetDiscoverers(extensionAssembly, throwOnError: true);
+            var sourcesString = string.Join(" ", sources);
+            // No discoverer available, log a warning
+            logger.SendMessage(
+                TestMessageLevel.Warning,
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources, sourcesString));
 
-            if (allDiscoverers == null || !allDiscoverers.Any())
-            {
-                var sourcesString = string.Join(" ", sources);
-                // No discoverer available, log a warning
-                logger.SendMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources, sourcesString));
+            return null;
+        }
 
-                return null;
-            }
+        IDictionary<AssemblyType, IList<string>>? assemblyTypeToSoucesMap = null;
+        var result = new Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>>();
+        var sourcesForWhichNoDiscovererIsAvailable = new List<string>(sources);
 
-            IDictionary<AssemblyType, IList<string>> assemblyTypeToSoucesMap = null;
-            var result = new Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>>();
-            var sourcesForWhichNoDiscovererIsAvailable = new List<string>(sources);
+        sources = sources.Distinct().ToList();
+        IEnumerable<string> allDirectoryBasedSources = sources.Where(Directory.Exists).ToList();
+        IEnumerable<string> allFileBasedSources = sources.Except(allDirectoryBasedSources).ToList();
 
-            foreach (var discoverer in allDiscoverers)
+        foreach (var discoverer in allDiscoverers)
+        {
+            var applicableFileBasedSources = allFileBasedSources;
+            if (discoverer.Metadata.AssemblyType is AssemblyType.Native or AssemblyType.Managed)
             {
-                var sourcesToCheck = sources;
+                assemblyTypeToSoucesMap ??= GetAssemblyTypeToSoucesMap(applicableFileBasedSources, assemblyProperties);
+                applicableFileBasedSources = assemblyTypeToSoucesMap[AssemblyType.None].Concat(assemblyTypeToSoucesMap[discoverer.Metadata.AssemblyType]);
+            }
+
+            // Find the sources which this discoverer can look at.
+            var matchingSources = Enumerable.Empty<string>();
+            var discovererFileExtensions = discoverer.Metadata.FileExtension;
+            var discovererIsApplicableToFiles = discovererFileExtensions is not null;
+            var discovererIsApplicableToDirectories = discoverer.Metadata.IsDirectoryBased;
 
-                if (discoverer.Metadata.AssemblyType == AssemblyType.Native ||
-                    discoverer.Metadata.AssemblyType == AssemblyType.Managed)
+            if (!discovererIsApplicableToFiles && !discovererIsApplicableToDirectories)
+            {
+                // Discoverer is applicable for all sources (regardless of whether they are files or directories).
+                // Include all files and directories.
+                matchingSources = applicableFileBasedSources.Concat(allDirectoryBasedSources);
+            }
+            else
+            {
+                if (discovererIsApplicableToFiles)
                 {
-                    assemblyTypeToSoucesMap = assemblyTypeToSoucesMap ?? GetAssemblyTypeToSoucesMap(sources, assemblyProperties);
-                    sourcesToCheck = assemblyTypeToSoucesMap[AssemblyType.None].Concat(assemblyTypeToSoucesMap[discoverer.Metadata.AssemblyType]);
+                    // Include matching files.
+                    var matchingFileBasedSources =
+                        applicableFileBasedSources.Where(source =>
+                            discovererFileExtensions!.Contains(
+                                Path.GetExtension(source),
+                                StringComparer.OrdinalIgnoreCase));
+
+                    matchingSources = matchingSources.Concat(matchingFileBasedSources);
                 }
 
-                // Find the sources which this discoverer can look at.
-                // Based on whether it is registered for a matching file extension or no file extensions at all.
-                var matchingSources = (from source in sourcesToCheck
-                                       where
-                                           (discoverer.Metadata.FileExtension == null
-                                            || discoverer.Metadata.FileExtension.Contains(
-                                                Path.GetExtension(source),
-                                                StringComparer.OrdinalIgnoreCase))
-                                       select source).ToList(); // ToList is required to actually execute the query
-
-                // Update the source list for which no matching source is available.
-                if (matchingSources.Any())
+                if (discovererIsApplicableToDirectories)
                 {
-                    sourcesForWhichNoDiscovererIsAvailable =
-                        sourcesForWhichNoDiscovererIsAvailable.Except(matchingSources, StringComparer.OrdinalIgnoreCase)
-                            .ToList();
-                    result.Add(discoverer, matchingSources);
+                    // Include all directories.
+                    matchingSources = matchingSources.Concat(allDirectoryBasedSources);
                 }
             }
 
-            if (EqtTrace.IsWarningEnabled && sourcesForWhichNoDiscovererIsAvailable != null)
+            matchingSources = matchingSources.ToList(); // ToList is required to actually execute the query
+
+            // Update the source list for which no matching source is available.
+            if (matchingSources.Any())
             {
-                foreach (var source in sourcesForWhichNoDiscovererIsAvailable)
-                {
-                    // Log a warning to log file, not to the "default logger for discovery time messages".
-                    EqtTrace.Warning(
-                        "No test discoverer is registered to perform discovery for the type of test source '{0}'. Register a test discoverer for this source type and try again.",
-                        source);
-                }
-            }
+                sourcesForWhichNoDiscovererIsAvailable =
+                    sourcesForWhichNoDiscovererIsAvailable
+                        .Except(matchingSources, StringComparer.OrdinalIgnoreCase)
+                        .ToList();
 
-            return result;
+                result.Add(discoverer, matchingSources);
+            }
         }
 
-        /// <summary>
-        /// Get assembly type to sources map.
-        /// </summary>
-        /// <param name="sources">Sources.</param>
-        /// <param name="assemblyType">Assembly type.</param>
-        /// <returns>Sources with matching assembly type.</returns>
-        private static IDictionary<AssemblyType, IList<string>> GetAssemblyTypeToSoucesMap(IEnumerable<string> sources, IAssemblyProperties assemblyProperties)
+        if (EqtTrace.IsWarningEnabled && sourcesForWhichNoDiscovererIsAvailable != null)
         {
-            var assemblyTypeToSoucesMap = new Dictionary<AssemblyType, IList<string>>()
+            foreach (var source in sourcesForWhichNoDiscovererIsAvailable)
             {
-                { AssemblyType.Native, new List<string>()},
-                { AssemblyType.Managed, new List<string>()},
-                { AssemblyType.None, new List<string>()}
-            };
+                // Log a warning to log file, not to the "default logger for discovery time messages".
+                EqtTrace.Warning(
+                    "No test discoverer is registered to perform discovery for the type of test source '{0}'. Register a test discoverer for this source type and try again.",
+                    source);
+            }
+        }
 
-            if (sources != null && sources.Any())
+        return result;
+    }
+
+    /// <summary>
+    /// Get assembly type to sources map.
+    /// </summary>
+    /// <param name="sources">Sources.</param>
+    /// <param name="assemblyProperties">Assembly properties.</param>
+    /// <returns>Sources with matching assembly type.</returns>
+    private static IDictionary<AssemblyType, IList<string>> GetAssemblyTypeToSoucesMap(IEnumerable<string> sources, IAssemblyProperties assemblyProperties)
+    {
+        var assemblyTypeToSoucesMap = new Dictionary<AssemblyType, IList<string>>()
+        {
+            { AssemblyType.Native, new List<string>()},
+            { AssemblyType.Managed, new List<string>()},
+            { AssemblyType.None, new List<string>()}
+        };
+
+        if (sources != null && sources.Any())
+        {
+            foreach (string source in sources)
             {
-                foreach (string source in sources)
-                {
-                    var sourcesList = IsAssembly(source) ?
-                        assemblyTypeToSoucesMap[assemblyProperties.GetAssemblyType(source)] :
-                        assemblyTypeToSoucesMap[AssemblyType.None];
+                var sourcesList = IsAssembly(source) ?
+                    assemblyTypeToSoucesMap[assemblyProperties.GetAssemblyType(source)] :
+                    assemblyTypeToSoucesMap[AssemblyType.None];
 
-                    sourcesList.Add(source);
-                }
+                sourcesList.Add(source);
             }
-
-            return assemblyTypeToSoucesMap;
         }
 
-        /// <summary>
-        /// Finds if a file is an assembly or not.
-        /// </summary>
-        /// <param name="filePath">File path.</param>
-        /// <returns>True if file is an assembly.</returns>
-        private static bool IsAssembly(string filePath)
-        {
-            var fileExtension = Path.GetExtension(filePath);
+        return assemblyTypeToSoucesMap;
+    }
 
-            return ".dll".Equals(fileExtension, StringComparison.OrdinalIgnoreCase) ||
-                ".exe".Equals(fileExtension, StringComparison.OrdinalIgnoreCase);
-        }
+    /// <summary>
+    /// Finds if a file is an assembly or not.
+    /// </summary>
+    /// <param name="filePath">File path.</param>
+    /// <returns>True if file is an assembly.</returns>
+    private static bool IsAssembly(string filePath)
+    {
+        var fileExtension = Path.GetExtension(filePath);
+
+        return ".dll".Equals(fileExtension, StringComparison.OrdinalIgnoreCase) ||
+               ".exe".Equals(fileExtension, StringComparison.OrdinalIgnoreCase);
+    }
 
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        [SuppressMessage("Microsoft.Design",
-            "CA1006:DoNotNestGenericTypesInMemberSignatures")]
-        private static IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> GetDiscoverers(
-            string extensionAssembly,
-            bool throwOnError)
+    private static IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>>? GetDiscoverers(
+        string extensionAssembly,
+        bool throwOnError)
+    {
+        try
         {
-            try
+            if (StringUtils.IsNullOrEmpty(extensionAssembly) || string.Equals(extensionAssembly, ObjectModel.Constants.UnspecifiedAdapterPath))
             {
-                if (string.IsNullOrEmpty(extensionAssembly) || string.Equals(extensionAssembly, Constants.UnspecifiedAdapterPath))
-                {
-                    // full discovery.
-                    return TestDiscoveryExtensionManager.Create().Discoverers;
-                }
-                else
-                {
-                    return TestDiscoveryExtensionManager.GetDiscoveryExtensionManager(extensionAssembly).Discoverers;
-                }
+                // full discovery.
+                return TestDiscoveryExtensionManager.Create().Discoverers;
             }
-            catch (Exception ex)
+            else
             {
-                EqtTrace.Error($"TestDiscoveryManager: LoadExtensions: Exception occurred while loading extensions {ex}");
-                if (throwOnError)
-                {
-                    throw;
-                }
-
-                return null;
+                return TestDiscoveryExtensionManager.GetDiscoveryExtensionManager(extensionAssembly).Discoverers;
             }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"TestDiscoveryManager: LoadExtensions: Exception occurred while loading extensions {ex}");
+            if (throwOnError)
+            {
+                throw;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryContext.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryContext.cs
index 4f6e53d421..e15486609d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryContext.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryContext.cs
@@ -1,66 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
 
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
 
+/// <summary>
+/// Specifies the user specified RunSettings and framework provided context of the discovery.
+/// </summary>
+public class DiscoveryContext : IDiscoveryContext
+{
     /// <summary>
-    /// Specifies the user specified RunSettings and framework provided context of the discovery.
+    /// Gets the run settings specified for this request.
     /// </summary>
-    public class DiscoveryContext : IDiscoveryContext
-    {
-        /// <summary>
-        /// Gets the run settings specified for this request.
-        /// </summary>
-        public IRunSettings RunSettings { get; internal set; }
+    public IRunSettings? RunSettings { get; internal set; }
 
-        /// <summary>
-        /// Returns TestCaseFilterExpression validated for supportedProperties.
-        /// If there is a parsing error in filter expression, TestPlatformFormatException() is thrown.
-        /// </summary>
-        /// <param name="supportedProperties"> The supported Properties. </param>
-        /// <param name="propertyProvider"> The property Provider. </param>
-        /// <returns> The <see cref="ITestCaseFilterExpression"/>. </returns>
-        public ITestCaseFilterExpression GetTestCaseFilter(IEnumerable<string> supportedProperties, Func<string, TestProperty> propertyProvider)
+    /// <summary>
+    /// Returns TestCaseFilterExpression validated for supportedProperties.
+    /// If there is a parsing error in filter expression, TestPlatformFormatException() is thrown.
+    /// </summary>
+    /// <param name="supportedProperties"> The supported Properties. </param>
+    /// <param name="propertyProvider"> The property Provider. </param>
+    /// <returns> The <see cref="ITestCaseFilterExpression"/>. </returns>
+    public ITestCaseFilterExpression? GetTestCaseFilter(IEnumerable<string>? supportedProperties, Func<string, TestProperty?> propertyProvider)
+    {
+        TestCaseFilterExpression? adapterSpecificTestCaseFilter = null;
+        if (FilterExpressionWrapper == null)
         {
-            TestCaseFilterExpression adapterSpecificTestCaseFilter = null;
-            if (this.FilterExpressionWrapper != null)
-            {
-                if (!string.IsNullOrEmpty(this.FilterExpressionWrapper.ParseError))
-                {
-                    throw new TestPlatformFormatException(this.FilterExpressionWrapper.ParseError, this.FilterExpressionWrapper.FilterString);
-                }
+            return adapterSpecificTestCaseFilter;
+        }
 
-                adapterSpecificTestCaseFilter = new TestCaseFilterExpression(this.FilterExpressionWrapper);
-                var invalidProperties = adapterSpecificTestCaseFilter.ValidForProperties(supportedProperties, propertyProvider);
+        if (!StringUtils.IsNullOrEmpty(FilterExpressionWrapper.ParseError))
+        {
+            throw new TestPlatformFormatException(FilterExpressionWrapper.ParseError, FilterExpressionWrapper.FilterString);
+        }
 
-                if (invalidProperties != null)
-                {
-                    var invalidPropertiesString = string.Join(CrossPlatEngineResources.StringSeperator, invalidProperties);
-                    var validPropertiesSttring = supportedProperties == null ? string.Empty : string.Join(CrossPlatEngineResources.StringSeperator, supportedProperties.ToArray());
-                    var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.UnsupportedPropertiesInTestCaseFilter, invalidPropertiesString, validPropertiesSttring);
+        adapterSpecificTestCaseFilter = new TestCaseFilterExpression(FilterExpressionWrapper);
+        var invalidProperties = adapterSpecificTestCaseFilter.ValidForProperties(supportedProperties, propertyProvider);
 
-                    // For unsupported property don�t throw exception, just log the message. Later it is going to handle properly with TestCaseFilterExpression.MatchTestCase().
-                    EqtTrace.Info(errorMessage);
-                }
-            }
+        if (invalidProperties != null)
+        {
+            var invalidPropertiesString = string.Join(CrossPlatEngineResources.StringSeperator, invalidProperties);
+            var validPropertiesSttring = supportedProperties == null ? string.Empty : string.Join(CrossPlatEngineResources.StringSeperator, supportedProperties.ToArray());
+            var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.UnsupportedPropertiesInTestCaseFilter, invalidPropertiesString, validPropertiesSttring);
 
-            return adapterSpecificTestCaseFilter;
+            // For unsupported property don�t throw exception, just log the message. Later it is going to handle properly with TestCaseFilterExpression.MatchTestCase().
+            EqtTrace.Info(errorMessage);
         }
 
-        /// <summary>
-        /// Gets or sets the FilterExpressionWrapper instance as created from filter string.
-        /// </summary>
-        internal FilterExpressionWrapper FilterExpressionWrapper {get; set; }
+        return adapterSpecificTestCaseFilter;
     }
+
+    /// <summary>
+    /// Gets or sets the FilterExpressionWrapper instance as created from filter string.
+    /// </summary>
+    internal FilterExpressionWrapper? FilterExpressionWrapper { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs
index f2751c18e5..d572894568 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs
@@ -1,296 +1,340 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+
+/// <summary>
+/// Orchestrates discovery operations for the engine communicating with the test host process.
+/// </summary>
+[SuppressMessage("Design", "CA1001:Types that own disposable fields should be disposable", Justification = "Would cause a breaking change if users are inheriting this class and implement IDisposable")]
+public class DiscoveryManager : IDiscoveryManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+    private readonly TestSessionMessageLogger _sessionMessageLogger;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IRequestData _requestData;
+    private readonly CancellationTokenSource _cancellationTokenSource = new();
+    private readonly DiscoveryDataAggregator _discoveryDataAggregator = new();
+
+    private DiscoveryCriteria? _discoveryCriteria;
+    private ITestDiscoveryEventsHandler2? _testDiscoveryEventsHandler;
+    private string? _previousSource;
 
     /// <summary>
-    /// Orchestrates discovery operations for the engine communicating with the test host process.
+    /// Initializes a new instance of the <see cref="DiscoveryManager"/> class.
     /// </summary>
-    public class DiscoveryManager : IDiscoveryManager
+    public DiscoveryManager(IRequestData requestData)
+        : this(requestData, TestPlatformEventSource.Instance)
     {
-        private readonly TestSessionMessageLogger sessionMessageLogger;
-        private readonly ITestPlatformEventSource testPlatformEventSource;
-        private readonly IRequestData requestData;
-        private ITestDiscoveryEventsHandler2 testDiscoveryEventsHandler;
-        private DiscoveryCriteria discoveryCriteria;
-        private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryManager"/> class.
-        /// </summary>
-        public DiscoveryManager(IRequestData requestData) : this(requestData, TestPlatformEventSource.Instance)
-        {
-        }
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryManager"/> class.
+    /// </summary>
+    /// <param name="requestData">
+    /// The Request Data for providing discovery services and data.
+    /// </param>
+    /// <param name="testPlatformEventSource">
+    ///     The test platform event source.
+    /// </param>
+    protected DiscoveryManager(IRequestData requestData, ITestPlatformEventSource testPlatformEventSource)
+    {
+        _requestData = requestData ?? throw new ArgumentNullException(nameof(requestData));
+        _sessionMessageLogger = TestSessionMessageLogger.Instance;
+        _sessionMessageLogger.TestRunMessage += TestSessionMessageHandler;
+        _testPlatformEventSource = testPlatformEventSource;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryManager"/> class.
-        /// </summary>
-        /// <param name="requestData">
-        /// The Request Data for providing discovery services and data.
-        /// </param>
-        /// <param name="testPlatformEventSource">
-        ///     The test platform event source.
-        /// </param>
-        protected DiscoveryManager(IRequestData requestData, ITestPlatformEventSource testPlatformEventSource)
+    /// <summary>
+    /// Initializes the discovery manager.
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
+    /// <param name="eventHandler">Handler of discovery events.</param>
+    public void Initialize(IEnumerable<string>? pathToAdditionalExtensions, ITestDiscoveryEventsHandler2? eventHandler)
+    {
+        // Clear the request data metrics left over from a potential previous run.
+        _requestData.MetricsCollection?.Metrics?.Clear();
+
+        _testPlatformEventSource.AdapterSearchStart();
+        _testDiscoveryEventsHandler = eventHandler;
+        if (pathToAdditionalExtensions != null && pathToAdditionalExtensions.Any())
         {
-            this.sessionMessageLogger = TestSessionMessageLogger.Instance;
-            this.sessionMessageLogger.TestRunMessage += this.TestSessionMessageHandler;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.requestData = requestData;
+            // Start using these additional extensions
+            TestPluginCache.Instance.DefaultExtensionPaths = pathToAdditionalExtensions;
         }
 
-        /// <summary>
-        /// Initializes the discovery manager.
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
-        public void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestDiscoveryEventsHandler2 eventHandler)
-        {
-            this.testPlatformEventSource.AdapterSearchStart();
-            this.testDiscoveryEventsHandler = eventHandler;
-            if (pathToAdditionalExtensions != null && pathToAdditionalExtensions.Any())
-            {
-                // Start using these additional extensions
-                TestPluginCache.Instance.DefaultExtensionPaths = pathToAdditionalExtensions;
-            }
+        // Load and Initialize extensions.
+        TestDiscoveryExtensionManager.LoadAndInitializeAllExtensions(false);
+        _testPlatformEventSource.AdapterSearchStop();
+    }
 
-            // Load and Initialize extensions.
-            TestDiscoveryExtensionManager.LoadAndInitializeAllExtensions(false);
-            this.testPlatformEventSource.AdapterSearchStop();
-        }
+    /// <summary>
+    /// Discovers tests
+    /// </summary>
+    /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+    /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+    public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        var discoveryResultCache = new DiscoveryResultCache(
+            discoveryCriteria.FrequencyOfDiscoveredTestsEvent,
+            discoveryCriteria.DiscoveredTestEventTimeout,
+            OnReportTestCases);
 
-        /// <summary>
-        /// Discovers tests
-        /// </summary>
-        /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
-        /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
-        public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEventsHandler2 eventHandler)
+        try
         {
-            var discoveryResultCache = new DiscoveryResultCache(
-                discoveryCriteria.FrequencyOfDiscoveredTestsEvent,
-                discoveryCriteria.DiscoveredTestEventTimeout,
-                this.OnReportTestCases);
+            _discoveryCriteria = discoveryCriteria;
+            EqtTrace.Info("TestDiscoveryManager.DoDiscovery: Background test discovery started.");
+            _testDiscoveryEventsHandler = eventHandler;
+            var verifiedExtensionSourceMap = new Dictionary<string, IEnumerable<string>>();
 
-            try
+            // Validate the sources
+            foreach (var kvp in discoveryCriteria.AdapterSourceMap)
             {
-                this.discoveryCriteria = discoveryCriteria;
-                EqtTrace.Info("TestDiscoveryManager.DoDiscovery: Background test discovery started.");
-                this.testDiscoveryEventsHandler = eventHandler;
-                var verifiedExtensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-
-                // Validate the sources
-                foreach (var kvp in discoveryCriteria.AdapterSourceMap)
+                var verifiedSources = GetValidSources(kvp.Value, _sessionMessageLogger, discoveryCriteria.Package);
+                if (verifiedSources.Count > 0)
                 {
-                    var verifiedSources = GetValidSources(kvp.Value, this.sessionMessageLogger, discoveryCriteria.Package);
-                    if (verifiedSources.Any())
-                    {
-                        verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);
-                    }
+                    verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);
+                    // Mark all sources as NotDiscovered before actual discovery starts
+                    _discoveryDataAggregator.MarkSourcesWithStatus(verifiedSources, DiscoveryStatus.NotDiscovered);
                 }
+            }
+
+            // If there are sources to discover
+            if (verifiedExtensionSourceMap.Any())
+            {
+                var runSettings = RunSettingsUtilities.CreateAndInitializeRunSettings(discoveryCriteria.RunSettings);
+                var discovererEnumerator = new DiscovererEnumerator(_requestData, discoveryResultCache, _cancellationTokenSource.Token);
+                discovererEnumerator.LoadTests(verifiedExtensionSourceMap, runSettings, discoveryCriteria.TestCaseFilter, _sessionMessageLogger);
+            }
+        }
+        finally
+        {
+            // Discovery complete. Raise the DiscoveryCompleteEvent.
+            EqtTrace.Verbose("TestDiscoveryManager.DoDiscovery: Background Test Discovery complete.");
 
+            var totalDiscoveredTestCount = discoveryResultCache.TotalDiscoveredTests;
+            var lastChunk = discoveryResultCache.Tests;
 
-                // If there are sources to discover
-                if (verifiedExtensionSourceMap.Any())
+            EqtTrace.Verbose("TestDiscoveryManager.DiscoveryComplete: Calling DiscoveryComplete callback.");
+
+            if (eventHandler != null)
+            {
+                if (lastChunk != null)
                 {
-                    new DiscovererEnumerator(this.requestData, discoveryResultCache, cancellationTokenSource.Token).LoadTests(
-                        verifiedExtensionSourceMap,
-                        RunSettingsUtilities.CreateAndInitializeRunSettings(discoveryCriteria.RunSettings),
-                        discoveryCriteria.TestCaseFilter,
-                        this.sessionMessageLogger);
+                    UpdateTestCases(lastChunk, _discoveryCriteria?.Package);
                 }
-            }
-            finally
-            {
-                // Discovery complete. Raise the DiscoveryCompleteEvent.
-                EqtTrace.Verbose("TestDiscoveryManager.DoDiscovery: Background Test Discovery complete.");
 
-                var totalDiscoveredTestCount = discoveryResultCache.TotalDiscoveredTests;
-                var lastChunk = discoveryResultCache.Tests;
+                // Collecting Discovery State
+                _requestData.MetricsCollection.Add(TelemetryDataConstants.DiscoveryState, "Completed");
 
-                EqtTrace.Verbose("TestDiscoveryManager.DiscoveryComplete: Calling DiscoveryComplete callback.");
+                // Collecting Total Tests Discovered
+                _requestData.MetricsCollection.Add(TelemetryDataConstants.TotalTestsDiscovered, totalDiscoveredTestCount);
 
-                if (eventHandler != null)
+                var isAborted = _cancellationTokenSource.IsCancellationRequested;
+
+                // When discovery is aborted we still want to process the last chunk as if it was a
+                // normal discovery notification.
+                if (isAborted)
                 {
-                    if (lastChunk != null)
-                    {
-                        UpdateTestCases(lastChunk, this.discoveryCriteria.Package);
-                    }
-
-                    // Collecting Discovery State
-                    this.requestData.MetricsCollection.Add(TelemetryDataConstants.DiscoveryState, "Completed");
-
-                    // Collecting Total Tests Discovered
-                    this.requestData.MetricsCollection.Add(TelemetryDataConstants.TotalTestsDiscovered, totalDiscoveredTestCount);
-                    var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalDiscoveredTestCount, false)
-                    {
-                        Metrics = this.requestData.MetricsCollection.Metrics
-                    };
-
-                    eventHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, lastChunk);
+                    _previousSource = _discoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases(_previousSource, lastChunk);
+                    _discoveryDataAggregator.MarkAsAborted();
                 }
+                // When discovery is complete (i.e. not aborted) we can consider that all sources
+                // are fully discovered (including the last chunk).
                 else
                 {
-                    EqtTrace.Warning(
-                        "DiscoveryManager: Could not pass the discovery complete message as the callback is null.");
+                    _discoveryDataAggregator.MarkSourcesWithStatus(lastChunk?.Select(x => x.Source), DiscoveryStatus.FullyDiscovered);
+                    _discoveryDataAggregator.MarkSourcesWithStatus(_discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered), DiscoveryStatus.FullyDiscovered);
+                    _discoveryDataAggregator.MarkSourcesWithStatus(_discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered), DiscoveryStatus.FullyDiscovered);
+                    _previousSource = null;
                 }
 
-                EqtTrace.Verbose("TestDiscoveryManager.DiscoveryComplete: Called DiscoveryComplete callback.");
-
-                this.testDiscoveryEventsHandler = null;
+                var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(isAborted ? -1 : totalDiscoveredTestCount, isAborted)
+                {
+                    FullyDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered),
+                    PartiallyDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered),
+                    NotDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered),
+                    SkippedDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.SkippedDiscovery),
+                    DiscoveredExtensions = TestPluginCache.Instance.TestExtensions?.GetCachedExtensions(),
+                    Metrics = _requestData.MetricsCollection.Metrics,
+                };
+
+                eventHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, lastChunk);
             }
+            else
+            {
+                EqtTrace.Warning(
+                    "DiscoveryManager: Could not pass the discovery complete message as the callback is null.");
+            }
+
+            EqtTrace.Verbose("TestDiscoveryManager.DiscoveryComplete: Called DiscoveryComplete callback.");
+
+            _testDiscoveryEventsHandler = null;
         }
+    }
 
-        /// <summary>
-        /// Aborts the test discovery.
-        /// </summary>
-        public void Abort()
+    /// <summary>
+    /// Aborts the test discovery.
+    /// </summary>
+    public void Abort()
+    {
+        _cancellationTokenSource.Cancel();
+    }
+
+    /// <inheritdoc/>
+    public void Abort(ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        if (!_cancellationTokenSource.IsCancellationRequested)
         {
-            this.cancellationTokenSource.Cancel();
+            Abort();
         }
 
-        private void OnReportTestCases(IEnumerable<TestCase> testCases)
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true)
         {
-            UpdateTestCases(testCases, this.discoveryCriteria.Package);
+            FullyDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered),
+            PartiallyDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered),
+            NotDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered),
+            SkippedDiscoveredSources = _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.SkippedDiscovery),
+        };
+        eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
+    }
 
-            if (this.testDiscoveryEventsHandler != null)
-            {
-                this.testDiscoveryEventsHandler.HandleDiscoveredTests(testCases);
-            }
-            else
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("DiscoveryManager: Could not pass the test results as the callback is null.");
-                }
-            }
+    private void OnReportTestCases(ICollection<TestCase> testCases)
+    {
+        UpdateTestCases(testCases, _discoveryCriteria?.Package);
+
+        if (_testDiscoveryEventsHandler != null)
+        {
+            _testDiscoveryEventsHandler.HandleDiscoveredTests(testCases);
+            _previousSource = _discoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases(_previousSource, testCases);
         }
+        else
+        {
+            EqtTrace.Warning("DiscoveryManager: Could not pass the test results as the callback is null.");
+        }
+    }
 
-        /// <summary>
-        /// Verify/Normalize the test source files.
-        /// </summary>
-        /// <param name="sources"> Paths to source file to look for tests in.  </param>
-        /// <param name="logger">logger</param>
-        /// <param name="package">package</param>
-        /// <returns> The list of verified sources. </returns>
-        internal static IEnumerable<string> GetValidSources(IEnumerable<string> sources, IMessageLogger logger, string package)
+    /// <summary>
+    /// Verify/Normalize the test source files.
+    /// </summary>
+    /// <param name="sources"> Paths to source file (or directory) in which to look for tests. </param>
+    /// <param name="logger">logger</param>
+    /// <param name="package">package</param>
+    /// <returns> The list of verified sources. </returns>
+    internal static HashSet<string> GetValidSources(IEnumerable<string>? sources, IMessageLogger logger, string? package)
+    {
+        var verifiedSources = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        if (sources is null)
         {
-            Debug.Assert(sources != null, "sources");
-            var verifiedSources = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            return verifiedSources;
+        }
 
-            foreach (string source in sources)
-            {
-                // It is possible that runtime provider sent relative source path for remote scenario.
-                string src = !Path.IsPathRooted(source) ? Path.Combine(Directory.GetCurrentDirectory(), source) : source;
+        foreach (string source in sources)
+        {
+            // It is possible that runtime provider sent relative source path for remote scenario.
+            string src = !Path.IsPathRooted(source) ? Path.Combine(Directory.GetCurrentDirectory(), source) : source;
 
-                if (!File.Exists(src))
+            if (!File.Exists(src) && !Directory.Exists(src))
+            {
+                void SendWarning()
                 {
-                    void SendWarning()
-                    {
-                        var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.FileNotFound, src);
-                        logger.SendMessage(TestMessageLevel.Warning, errorMessage);
-                    }
-
-                    if (string.IsNullOrEmpty(package))
-                    {
-                        SendWarning();
-
-                        continue;
-                    }
-
-                    // It is also possible that this is a packaged app, so the tests might be inside the package
-                    src = !Path.IsPathRooted(source) ? Path.Combine(Path.GetDirectoryName(package), source) : source;
+                    var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.FileNotFound, src);
+                    logger.SendMessage(TestMessageLevel.Warning, errorMessage);
+                }
 
-                    if (!File.Exists(src))
-                    {
-                        SendWarning();
+                if (package.IsNullOrEmpty())
+                {
+                    SendWarning();
 
-                        continue;
-                    }
+                    continue;
                 }
 
-                if (!verifiedSources.Add(src))
+                // It is also possible that this is a packaged app, so the tests might be inside the package
+                src = !Path.IsPathRooted(source) ? Path.Combine(Path.GetDirectoryName(package)!, source) : source;
+
+                if (!File.Exists(src))
                 {
-                    var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DuplicateSource, src);
-                    logger.SendMessage(TestMessageLevel.Warning, errorMessage);
+                    SendWarning();
+
+                    continue;
                 }
             }
 
-            // No valid source is found => we cannot discover.
-            if (!verifiedSources.Any())
+            if (!verifiedSources.Add(src))
             {
-                var sourcesString = string.Join(",", sources.ToArray());
-                var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoValidSourceFoundForDiscovery, sourcesString);
+                var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DuplicateSource, src);
                 logger.SendMessage(TestMessageLevel.Warning, errorMessage);
-
-                EqtTrace.Warning("TestDiscoveryManager: None of the source {0} is valid. ", sourcesString);
-
-                return verifiedSources;
             }
+        }
 
-            // Log the sources from where tests are being discovered
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("TestDiscoveryManager: Discovering tests from sources {0}", string.Join(",", verifiedSources.ToArray()));
-            }
+        // No valid source is found => we cannot discover.
+        if (verifiedSources.Count == 0)
+        {
+            var sourcesString = string.Join(",", sources.ToArray());
+            var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoValidSourceFoundForDiscovery, sourcesString);
+            logger.SendMessage(TestMessageLevel.Warning, errorMessage);
+
+            EqtTrace.Warning("TestDiscoveryManager: None of the source {0} is valid. ", sourcesString);
 
             return verifiedSources;
         }
 
-        private void TestSessionMessageHandler(object sender, TestRunMessageEventArgs e)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info(
-                    "TestDiscoveryManager.RunMessage: calling TestRunMessage({0}, {1}) callback.",
-                    e.Level,
-                    e.Message);
-            }
+        // Log the sources from where tests are being discovered
+        EqtTrace.Info("TestDiscoveryManager: Discovering tests from sources {0}", string.Join(",", verifiedSources.ToArray()));
 
-            if (this.testDiscoveryEventsHandler != null)
-            {
-                this.testDiscoveryEventsHandler.HandleLogMessage(e.Level, e.Message);
-            }
-            else
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning(
-                        "DiscoveryManager: Could not pass the log message  '{0}' as the callback is null.",
-                        e.Message);
-                }
-            }
-        }
+        return verifiedSources;
+    }
 
+    private void TestSessionMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        EqtTrace.Info(
+            "TestDiscoveryManager.RunMessage: calling TestRunMessage({0}, {1}) callback.",
+            e.Level,
+            e.Message);
 
-        private static void UpdateTestCases(IEnumerable<TestCase> testCases, string package)
+        if (_testDiscoveryEventsHandler != null)
         {
-            // Update TestCase objects Source data to contain the actual source(package) provided by IDE(users),
-            // else these test cases are not displayed in TestWindow.
-            if (!string.IsNullOrEmpty(package))
+            _testDiscoveryEventsHandler.HandleLogMessage(e.Level, e.Message);
+        }
+        else
+        {
+            EqtTrace.Warning(
+                "DiscoveryManager: Could not pass the log message  '{0}' as the callback is null.",
+                e.Message);
+        }
+    }
+
+    private static void UpdateTestCases(IEnumerable<TestCase> testCases, string? package)
+    {
+        // Update TestCase objects Source data to contain the actual source(package) provided by IDE(users),
+        // else these test cases are not displayed in TestWindow.
+        if (!package.IsNullOrEmpty())
+        {
+            foreach (var tc in testCases)
             {
-                foreach (var tc in testCases)
-                {
-                    tc.Source = package;
-                }
+                tc.Source = package;
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryResultCache.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryResultCache.cs
index 2048fff45b..95df0cdd76 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryResultCache.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryResultCache.cs
@@ -1,138 +1,121 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+
+/// <summary>
+/// The discovery result cache.
+/// </summary>
+internal class DiscoveryResultCache
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
+    /// <summary>
+    /// Callback used when cache is full.
+    /// </summary>
+    private readonly OnReportTestCases _onReportTestCases;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    /// <summary>
+    /// Max size of the test case buffer
+    /// </summary>
+    private readonly long _cacheSize;
 
     /// <summary>
-    /// The discovery result cache.
+    /// Timeout that triggers sending test cases regardless of cache size.
     /// </summary>
-    internal class DiscoveryResultCache
+    private readonly TimeSpan _cacheTimeout;
+
+    /// <summary>
+    /// Last time test cases were sent.
+    /// </summary>
+    private DateTime _lastUpdate;
+
+    /// <summary>
+    /// Test case buffer
+    /// </summary>
+    private List<TestCase> _tests;
+
+    /// <summary>
+    /// Sync object
+    /// </summary>
+    private readonly object _syncObject = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryResultCache"/> class.
+    /// </summary>
+    /// <param name="cacheSize"> The cache size. </param>
+    /// <param name="discoveredTestEventTimeout"> The discovered test event timeout. </param>
+    /// <param name="onReportTestCases"> The on report test cases. </param>
+    public DiscoveryResultCache(long cacheSize, TimeSpan discoveredTestEventTimeout, OnReportTestCases onReportTestCases)
     {
-        #region private members
-
-        /// <summary>
-        /// Callback used when cache is full.
-        /// </summary>
-        private OnReportTestCases onReportTestCases;
-
-        /// <summary>
-        /// Total tests discovered in this request
-        /// </summary>
-        private long totalDiscoveredTests;
-
-        /// <summary>
-        /// Max size of the test case buffer
-        /// </summary>
-        private long cacheSize;
-
-        /// <summary>
-        /// Timeout that triggers sending test cases regardless of cache size.
-        /// </summary>
-        private TimeSpan cacheTimeout;
-
-        /// <summary>
-        /// Last time test cases were sent.
-        /// </summary>
-        private DateTime lastUpdate;
-
-        /// <summary>
-        /// Test case buffer
-        /// </summary>
-        private List<TestCase> tests;
-
-        /// <summary>
-        /// Sync object
-        /// </summary>
-        private object syncObject = new object();
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryResultCache"/> class.
-        /// </summary>
-        /// <param name="cacheSize"> The cache size. </param>
-        /// <param name="discoveredTestEventTimeout"> The discovered test event timeout. </param>
-        /// <param name="onReportTestCases"> The on report test cases. </param>
-        public DiscoveryResultCache(long cacheSize, TimeSpan discoveredTestEventTimeout, OnReportTestCases onReportTestCases)
-        {
-            Debug.Assert(cacheSize > 0, "Buffer size cannot be less than zero");
-            Debug.Assert(onReportTestCases != null, "Callback which listens for cache size limit cannot be null.");
-            Debug.Assert(discoveredTestEventTimeout > TimeSpan.MinValue, "The cache timeout must be greater than min value.");
+        TPDebug.Assert(cacheSize > 0, "Buffer size cannot be less than zero");
+        TPDebug.Assert(onReportTestCases != null, "Callback which listens for cache size limit cannot be null.");
+        TPDebug.Assert(discoveredTestEventTimeout > TimeSpan.MinValue, "The cache timeout must be greater than min value.");
 
-            this.cacheSize = cacheSize;
-            this.onReportTestCases = onReportTestCases;
-            this.lastUpdate = DateTime.Now;
-            this.cacheTimeout = discoveredTestEventTimeout;
+        _cacheSize = cacheSize;
+        _onReportTestCases = onReportTestCases;
+        _lastUpdate = DateTime.Now;
+        _cacheTimeout = discoveredTestEventTimeout;
 
-            this.tests = new List<TestCase>();
-            this.totalDiscoveredTests = 0;
-        }
+        _tests = new List<TestCase>();
+        TotalDiscoveredTests = 0;
+    }
 
-        /// <summary>
-        /// Called when the cache is ready to report some discovered test cases.
-        /// </summary>
-        public delegate void OnReportTestCases(ICollection<TestCase> tests);
+    /// <summary>
+    /// Called when the cache is ready to report some discovered test cases.
+    /// </summary>
+    public delegate void OnReportTestCases(ICollection<TestCase> tests);
 
-        /// <summary>
-        /// Gets the tests present in the cache currently
-        /// </summary>
-        public IList<TestCase> Tests
+    /// <summary>
+    /// Gets the tests present in the cache currently
+    /// </summary>
+    public IList<TestCase> Tests
+    {
+        get
         {
-            get
-            {
-                // This needs to new list to avoid concurrency issues.
-                return new List<TestCase>(this.tests);
-            }
+            // This needs to new list to avoid concurrency issues.
+            return new List<TestCase>(_tests);
         }
+    }
+
+    /// <summary>
+    /// Gets the total discovered tests
+    /// </summary>
+    public long TotalDiscoveredTests { get; private set; }
+
+    /// <summary>
+    /// Adds a test to the cache.
+    /// </summary>
+    /// <param name="test"> The test. </param>
+    public void AddTest(TestCase test)
+    {
+        TPDebug.Assert(test != null, "DiscoveryResultCache.AddTest called with no new test.");
 
-        /// <summary>
-        /// Gets the total discovered tests
-        /// </summary>
-        public long TotalDiscoveredTests
+        if (test == null)
         {
-            get
-            {
-                return this.totalDiscoveredTests;
-            }
+            EqtTrace.Warning("DiscoveryResultCache.AddTest: An attempt was made to add a 'null' test");
+            return;
         }
 
-        /// <summary>
-        /// Adds a test to the cache.
-        /// </summary>
-        /// <param name="test"> The test. </param>
-        public void AddTest(TestCase test)
+        lock (_syncObject)
         {
-            Debug.Assert(test != null, "DiscoveryResultCache.AddTest called with no new test.");
+            _tests.Add(test);
+            TotalDiscoveredTests++;
 
-            if (test == null)
+            // Send test cases when the specified cache size has been reached or
+            // after the specified cache timeout has been hit.
+            var timeDelta = DateTime.Now - _lastUpdate;
+            if (_tests.Count >= _cacheSize || (timeDelta > _cacheTimeout && _tests.Count > 0))
             {
-                EqtTrace.Warning("DiscoveryResultCache.AddTest: An attempt was made to add a 'null' test");
-                return;
-            }
+                // Pass on the buffer to the listener and clear the old one
+                _onReportTestCases(_tests);
+                _tests = new List<TestCase>();
+                _lastUpdate = DateTime.Now;
 
-            lock (this.syncObject)
-            {
-                this.tests.Add(test);
-                this.totalDiscoveredTests++;
-
-                // Send test cases when the specified cache size has been reached or
-                // after the specified cache timeout has been hit.
-                var timeDelta = DateTime.Now - this.lastUpdate;
-                if (this.tests.Count >= this.cacheSize || (timeDelta > this.cacheTimeout && this.tests.Count > 0))
-                {
-                    // Pass on the buffer to the listener and clear the old one
-                    this.onReportTestCases(this.tests);
-                    this.tests = new List<TestCase>();
-                    this.lastUpdate = DateTime.Now;
-
-                    EqtTrace.Verbose("DiscoveryResultCache.AddTest: Notified the onReportTestCases callback.");
-                }
+                EqtTrace.Verbose("DiscoveryResultCache.AddTest: Notified the onReportTestCases callback.");
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/TestCaseDiscoverySink.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/TestCaseDiscoverySink.cs
index a73f95a733..43d5acd7a0 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/TestCaseDiscoverySink.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/TestCaseDiscoverySink.cs
@@ -1,37 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+
+/// <summary>
+/// The test case discovery sink.
+/// </summary>
+internal class TestCaseDiscoverySink : ITestCaseDiscoverySink
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+    private readonly DiscoveryResultCache? _discoveryRequestCache;
 
     /// <summary>
-    /// The test case discovery sink.
+    /// Initializes a new instance of the <see cref="TestCaseDiscoverySink"/> class.
     /// </summary>
-    internal class TestCaseDiscoverySink : ITestCaseDiscoverySink
+    /// <param name="discoveryRequestCache"> The discovery request cache. </param>
+    internal TestCaseDiscoverySink(DiscoveryResultCache? discoveryRequestCache)
     {
-        private DiscoveryResultCache discoveryRequestCache;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseDiscoverySink"/> class.
-        /// </summary>
-        /// <param name="discoveryRequestCache"> The discovery request cache. </param>
-        internal TestCaseDiscoverySink(DiscoveryResultCache discoveryRequestCache)
-        {
-            this.discoveryRequestCache = discoveryRequestCache;
-        }
+        _discoveryRequestCache = discoveryRequestCache;
+    }
 
-        /// <summary>
-        /// Sends the test case to the discovery cache.
-        /// </summary>
-        /// <param name="discoveredTest"> The discovered test. </param>
-        public void SendTestCase(TestCase discoveredTest)
+    /// <summary>
+    /// Sends the test case to the discovery cache.
+    /// </summary>
+    /// <param name="discoveredTest"> The discovered test. </param>
+    public void SendTestCase(TestCase discoveredTest)
+    {
+        if (_discoveryRequestCache != null)
         {
-            if (this.discoveryRequestCache != null)
-            {
-                this.discoveryRequestCache.AddTest(discoveredTest);
-            }
+            _discoveryRequestCache.AddTest(discoveredTest);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IDeploymentAwareTestRequestHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IDeploymentAwareTestRequestHandler.cs
new file mode 100644
index 0000000000..9c8a8de8a0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IDeploymentAwareTestRequestHandler.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// This interface holds additional values for a request handler when rewriting paths is used.
+/// This is in case when --local-path and --remote-path parameters are provided and testhost is running
+/// in a remote deployment. This interface is used only to avoid changes to public API of TestRequestHandler.
+/// </summary>
+internal interface IDeploymentAwareTestRequestHandler
+{
+    string? LocalPath { get; set; }
+    string? RemotePath { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IPathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IPathConverter.cs
new file mode 100644
index 0000000000..d6a0e8d90d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/IPathConverter.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal interface IPathConverter
+{
+    string? UpdatePath(string? path, PathConversionDirection updateDirection);
+
+    IEnumerable<string> UpdatePaths(IEnumerable<string> paths, PathConversionDirection updateDirection);
+
+    TestCase UpdateTestCase(TestCase testCase, PathConversionDirection updateDirection);
+
+    IEnumerable<TestCase> UpdateTestCases(IEnumerable<TestCase>? testCases, PathConversionDirection updateDirection);
+
+    TestRunCompleteEventArgs UpdateTestRunCompleteEventArgs(TestRunCompleteEventArgs testRunCompleteEventArgs, PathConversionDirection updateDirection);
+
+    TestRunChangedEventArgs UpdateTestRunChangedEventArgs(TestRunChangedEventArgs? testRunChangedArgs, PathConversionDirection updateDirection);
+
+    Collection<AttachmentSet> UpdateAttachmentSets(Collection<AttachmentSet> attachmentSets, PathConversionDirection updateDirection);
+
+    ICollection<AttachmentSet> UpdateAttachmentSets(ICollection<AttachmentSet>? attachmentSets, PathConversionDirection updateDirection);
+
+    DiscoveryCriteria UpdateDiscoveryCriteria(DiscoveryCriteria discoveryCriteria, PathConversionDirection updateDirection);
+
+    TestRunCriteriaWithSources UpdateTestRunCriteriaWithSources(TestRunCriteriaWithSources testRunCriteriaWithSources, PathConversionDirection updateDirection);
+
+    TestRunCriteriaWithTests UpdateTestRunCriteriaWithTests(TestRunCriteriaWithTests testRunCriteriaWithTests, PathConversionDirection updateDirection);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
new file mode 100644
index 0000000000..3f699402ec
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal class NullPathConverter : IPathConverter
+{
+    private static readonly Lazy<NullPathConverter> LazyInstance = new(() => new NullPathConverter());
+
+    private NullPathConverter() { }
+
+    public static NullPathConverter Instance => LazyInstance.Value;
+
+    Collection<AttachmentSet> IPathConverter.UpdateAttachmentSets(Collection<AttachmentSet> attachmentSets, PathConversionDirection _) => attachmentSets;
+
+    ICollection<AttachmentSet> IPathConverter.UpdateAttachmentSets(ICollection<AttachmentSet>? attachmentSets, PathConversionDirection _) => attachmentSets!;
+
+    DiscoveryCriteria IPathConverter.UpdateDiscoveryCriteria(DiscoveryCriteria discoveryCriteria, PathConversionDirection _) => discoveryCriteria;
+
+    string? IPathConverter.UpdatePath(string? path, PathConversionDirection _) => path;
+
+    IEnumerable<string> IPathConverter.UpdatePaths(IEnumerable<string> paths, PathConversionDirection _) => paths;
+
+    TestCase IPathConverter.UpdateTestCase(TestCase testCase, PathConversionDirection _) => testCase;
+
+    IEnumerable<TestCase> IPathConverter.UpdateTestCases(IEnumerable<TestCase>? testCases, PathConversionDirection _) => testCases!;
+
+    TestRunChangedEventArgs IPathConverter.UpdateTestRunChangedEventArgs(TestRunChangedEventArgs? testRunChangedArgs, PathConversionDirection _) => testRunChangedArgs!;
+
+    TestRunCompleteEventArgs IPathConverter.UpdateTestRunCompleteEventArgs(TestRunCompleteEventArgs testRunCompleteEventArgs, PathConversionDirection _) => testRunCompleteEventArgs;
+
+    TestRunCriteriaWithSources IPathConverter.UpdateTestRunCriteriaWithSources(TestRunCriteriaWithSources testRunCriteriaWithSources, PathConversionDirection _) => testRunCriteriaWithSources;
+
+    TestRunCriteriaWithTests IPathConverter.UpdateTestRunCriteriaWithTests(TestRunCriteriaWithTests testRunCriteriaWithTests, PathConversionDirection _) => testRunCriteriaWithTests;
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConversionDirection.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConversionDirection.cs
new file mode 100644
index 0000000000..a8c6591ac6
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConversionDirection.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+internal enum PathConversionDirection
+{
+    Receive,
+    Send
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConverter.cs
new file mode 100644
index 0000000000..ead3481ded
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/PathConverter.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+/// <summary>
+/// Converts paths in received and sent objects, to make testhost seem like it run a local test,
+/// while it was in fact running a test on a remote system, in a totally different path. This is for UWP which
+/// does testhost deployment.
+/// The modifications here rely on combination of side-effects, and actually replacing the values, because
+/// we cannot modify the properties on our public objects, and add setters.
+/// </summary>
+internal class PathConverter : IPathConverter
+{
+    // The path on this computer to which we deployed the test dll and test runner
+    private readonly string _deploymentPath = "";
+    // The path on the remote system where test dll was originally placed, and from which we
+    // copied it to this system. For vstest.console, which is on the other side of this, the names
+    // are inverted, it sends us their local path, and thinks about our local path as remote.
+    private readonly string _originalPath = "";
+
+    public PathConverter(string originalPath, string deploymentPath, IFileHelper fileHelper)
+    {
+        ValidateArg.NotNull(originalPath, nameof(originalPath));
+        ValidateArg.NotNull(deploymentPath, nameof(deploymentPath));
+        ValidateArg.NotNull(fileHelper, nameof(fileHelper));
+
+        string unquotedOriginalPath = originalPath.Trim('\"');
+        string normalizedLocalPath = fileHelper.GetFullPath(unquotedOriginalPath).TrimEnd('\\').TrimEnd('/') + Path.DirectorySeparatorChar;
+        _originalPath = normalizedLocalPath;
+
+        string unquotedDeploymentPath = deploymentPath.Trim('\"');
+        string normalizedDeploymentPath = fileHelper.GetFullPath(unquotedDeploymentPath).TrimEnd('\\').TrimEnd('/') + Path.DirectorySeparatorChar;
+        _deploymentPath = normalizedDeploymentPath;
+    }
+
+    [return: NotNullIfNotNull("path")]
+    public string? UpdatePath(string? path, PathConversionDirection updateDirection)
+    {
+        if (path == null)
+            return null;
+
+        string find;
+        string replaceWith;
+        if (updateDirection == PathConversionDirection.Receive)
+        {
+            // Request is incoming, the path that is local to the sender (for us that is "remote" path)
+            // needs to be replaced with our path
+            find = _originalPath;
+            replaceWith = _deploymentPath;
+        }
+        else
+        {
+            find = _deploymentPath;
+            replaceWith = _originalPath;
+        }
+
+        var result = path.Replace(find, replaceWith);
+        return result;
+    }
+
+    public IEnumerable<string> UpdatePaths(IEnumerable<string> paths, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(paths, nameof(paths));
+        return paths.Select(p => UpdatePath(p, updateDirection)).ToList();
+    }
+
+    public TestCase UpdateTestCase(TestCase testCase, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testCase, nameof(testCase));
+        testCase.CodeFilePath = UpdatePath(testCase.CodeFilePath, updateDirection);
+        testCase.Source = UpdatePath(testCase.Source, updateDirection);
+        return testCase;
+    }
+
+    public IEnumerable<TestCase> UpdateTestCases(IEnumerable<TestCase>? testCases, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testCases, nameof(testCases));
+        testCases!.ToList().ForEach(tc => UpdateTestCase(tc, updateDirection));
+        return testCases!;
+    }
+
+    public TestRunCompleteEventArgs UpdateTestRunCompleteEventArgs(TestRunCompleteEventArgs testRunCompleteEventArgs, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testRunCompleteEventArgs, nameof(testRunCompleteEventArgs));
+        UpdateAttachmentSets(testRunCompleteEventArgs.AttachmentSets, updateDirection);
+        return testRunCompleteEventArgs;
+    }
+
+    public TestRunChangedEventArgs UpdateTestRunChangedEventArgs(TestRunChangedEventArgs? testRunChangedArgs, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testRunChangedArgs, nameof(testRunChangedArgs));
+        UpdateTestResults(testRunChangedArgs!.NewTestResults!, updateDirection);
+        UpdateTestCases(testRunChangedArgs.ActiveTests, updateDirection);
+        return testRunChangedArgs;
+    }
+
+    public Collection<AttachmentSet> UpdateAttachmentSets(Collection<AttachmentSet> attachmentSets, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(attachmentSets, nameof(attachmentSets));
+        attachmentSets.ToList().ForEach(i => UpdateAttachmentSet(i, updateDirection));
+        return attachmentSets;
+    }
+
+    public ICollection<AttachmentSet> UpdateAttachmentSets(ICollection<AttachmentSet>? attachmentSets, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(attachmentSets, nameof(attachmentSets));
+        attachmentSets!.ToList().ForEach(i => UpdateAttachmentSet(i, updateDirection));
+        return attachmentSets!;
+    }
+
+    private static AttachmentSet UpdateAttachmentSet(AttachmentSet attachmentSet, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(attachmentSet, nameof(attachmentSet));
+        attachmentSet.Attachments.ToList().ForEach(a => UpdateAttachment(a, updateDirection));
+        return attachmentSet;
+    }
+
+    private static UriDataAttachment UpdateAttachment(UriDataAttachment attachment, PathConversionDirection _)
+    {
+        ValidateArg.NotNull(attachment, nameof(attachment));
+        // todo: convert uri? https://github.com/microsoft/vstest/issues/3367
+        return attachment;
+    }
+
+    private IEnumerable<TestResult> UpdateTestResults(IEnumerable<TestResult> testResults, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testResults, nameof(testResults));
+        foreach (var tr in testResults)
+        {
+            UpdateAttachmentSets(tr.Attachments, updateDirection);
+            UpdateTestCase(tr.TestCase, updateDirection);
+        }
+        return testResults;
+    }
+
+    public DiscoveryCriteria UpdateDiscoveryCriteria(DiscoveryCriteria discoveryCriteria, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(discoveryCriteria, nameof(discoveryCriteria));
+        discoveryCriteria.Package = UpdatePath(discoveryCriteria.Package, updateDirection);
+        foreach (var adapter in discoveryCriteria.AdapterSourceMap.ToList())
+        {
+            var updatedPaths = UpdatePaths(adapter.Value, updateDirection);
+            discoveryCriteria.AdapterSourceMap[adapter.Key] = updatedPaths;
+        }
+        return discoveryCriteria;
+    }
+
+    public TestRunCriteriaWithSources UpdateTestRunCriteriaWithSources(TestRunCriteriaWithSources testRunCriteriaWithSources, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testRunCriteriaWithSources, nameof(testRunCriteriaWithSources));
+        testRunCriteriaWithSources.AdapterSourceMap.ToList().ForEach(adapter =>
+            testRunCriteriaWithSources.AdapterSourceMap[adapter.Key] = UpdatePaths(adapter.Value, updateDirection)!);
+        var package = UpdatePath(testRunCriteriaWithSources.Package, updateDirection)!;
+        return new TestRunCriteriaWithSources(testRunCriteriaWithSources.AdapterSourceMap, package, testRunCriteriaWithSources.RunSettings, testRunCriteriaWithSources.TestExecutionContext);
+    }
+
+    public TestRunCriteriaWithTests UpdateTestRunCriteriaWithTests(TestRunCriteriaWithTests testRunCriteriaWithTests, PathConversionDirection updateDirection)
+    {
+        ValidateArg.NotNull(testRunCriteriaWithTests, nameof(testRunCriteriaWithTests));
+        var tests = UpdateTestCases(testRunCriteriaWithTests.Tests, updateDirection);
+        var package = UpdatePath(testRunCriteriaWithTests.Package, updateDirection)!;
+        return new TestRunCriteriaWithTests(tests, package, testRunCriteriaWithTests.RunSettings, testRunCriteriaWithTests.TestExecutionContext);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestCaseEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestCaseEventsHandler.cs
index 9faa970901..6c55b35885 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestCaseEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestCaseEventsHandler.cs
@@ -1,66 +1,66 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.EventHandlers
-{
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+using System;
+using System.Collections.Generic;
 
-    /// <summary>
-    /// The test case events handler.
-    /// </summary>
-    internal class TestCaseEventsHandler : ITestCaseEventsHandler, ITestEventsPublisher
-    {
-        public event EventHandler<SessionStartEventArgs> SessionStart;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.EventHandlers;
 
-        public event EventHandler<SessionEndEventArgs> SessionEnd;
+/// <summary>
+/// The test case events handler.
+/// </summary>
+internal class TestCaseEventsHandler : ITestCaseEventsHandler, ITestEventsPublisher
+{
+    public event EventHandler<SessionStartEventArgs>? SessionStart;
+
+    public event EventHandler<SessionEndEventArgs>? SessionEnd;
 
-        public event EventHandler<TestCaseStartEventArgs> TestCaseStart;
+    public event EventHandler<TestCaseStartEventArgs>? TestCaseStart;
 
-        public event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
+    public event EventHandler<TestCaseEndEventArgs>? TestCaseEnd;
 
-        public event EventHandler<TestResultEventArgs> TestResult;
+    public event EventHandler<TestResultEventArgs>? TestResult;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEventsHandler"/> class.
-        /// </summary>
-        public TestCaseEventsHandler()
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEventsHandler"/> class.
+    /// </summary>
+    public TestCaseEventsHandler()
+    {
+    }
 
-        /// <inheritdoc />
-        public void SendTestCaseStart(TestCase testCase)
-        {
-            this.TestCaseStart.SafeInvoke(this, new TestCaseStartEventArgs(testCase), "TestCaseEventsHandler.RaiseTestCaseStart");
-        }
+    /// <inheritdoc />
+    public void SendTestCaseStart(TestCase testCase)
+    {
+        TestCaseStart.SafeInvoke(this, new TestCaseStartEventArgs(testCase), "TestCaseEventsHandler.RaiseTestCaseStart");
+    }
 
-        /// <inheritdoc />
-        public void SendTestCaseEnd(TestCase testCase, TestOutcome outcome)
-        {
-            this.TestCaseEnd.SafeInvoke(this, new TestCaseEndEventArgs(testCase, outcome), "TestCaseEventsHandler.RaiseTestCaseEnd");
-        }
+    /// <inheritdoc />
+    public void SendTestCaseEnd(TestCase testCase, TestOutcome outcome)
+    {
+        TestCaseEnd.SafeInvoke(this, new TestCaseEndEventArgs(testCase, outcome), "TestCaseEventsHandler.RaiseTestCaseEnd");
+    }
 
-        /// <inheritdoc />
-        public void SendTestResult(TestResult result)
-        {
-            this.TestResult.SafeInvoke(this, new TestResultEventArgs(result), "TestCaseEventsHandler.RaiseTestCaseEnd");
-        }
+    /// <inheritdoc />
+    public void SendTestResult(TestResult result)
+    {
+        TestResult.SafeInvoke(this, new TestResultEventArgs(result), "TestCaseEventsHandler.RaiseTestCaseEnd");
+    }
 
-        /// <inheritdoc />
-        public void SendSessionStart(IDictionary<string, object> properties)
-        {
-            this.SessionStart.SafeInvoke(this, new SessionStartEventArgs(properties), "TestCaseEventsHandler.RaiseSessionStart");
-        }
+    /// <inheritdoc />
+    public void SendSessionStart(IDictionary<string, object?> properties)
+    {
+        SessionStart.SafeInvoke(this, new SessionStartEventArgs(properties), "TestCaseEventsHandler.RaiseSessionStart");
+    }
 
-        /// <inheritdoc />
-        public void SendSessionEnd()
-        {
-            this.SessionEnd.SafeInvoke(this, new SessionEndEventArgs(), "TestCaseEventsHandler.RaiseSessionEnd");
-        }
+    /// <inheritdoc />
+    public void SendSessionEnd()
+    {
+        SessionEnd.SafeInvoke(this, new SessionEndEventArgs(), "TestCaseEventsHandler.RaiseSessionEnd");
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
index bbfe0ee0ca..0c9fb56ed2 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
@@ -1,545 +1,616 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.EventHandlers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CrossPlatResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+/// <summary>
+/// Listens inside of testhost for requests, that are sent from vstest.console. Requests are handled in <see cref="OnMessageReceived"/>
+/// and responses are sent back via various methods, for example <see cref="SendExecutionComplete"/>.
+/// </summary>
+public class TestRequestHandler : ITestRequestHandler, IDeploymentAwareTestRequestHandler
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.EventHandlers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CrossPlatResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
-    using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
-
-    public class TestRequestHandler : ITestRequestHandler
+    private readonly int _highestSupportedVersion = ProtocolVersioning.HighestSupportedVersion;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly ICommunicationEndpointFactory _communicationEndpointFactory;
+    private readonly JobQueue<Action> _jobQueue;
+    private readonly IFileHelper _fileHelper;
+    private readonly ManualResetEventSlim _requestSenderConnected;
+    private readonly ManualResetEventSlim _testHostManagerFactoryReady;
+    private readonly ManualResetEventSlim _sessionCompleted;
+
+    private int _protocolVersion = 1;
+    private ITestHostManagerFactory? _testHostManagerFactory;
+    private ICommunicationEndPoint? _communicationEndPoint;
+    private ICommunicationChannel? _channel;
+    private Action<Message>? _onLaunchAdapterProcessWithDebuggerAttachedAckReceived;
+    private Action<Message>? _onAttachDebuggerAckRecieved;
+    private IPathConverter _pathConverter;
+    private Exception? _messageProcessingUnrecoverableError;
+    private bool _isDisposed;
+
+    public TestHostConnectionInfo ConnectionInfo { get; set; }
+    string? IDeploymentAwareTestRequestHandler.LocalPath { get; set; }
+    string? IDeploymentAwareTestRequestHandler.RemotePath { get; set; }
+
+    public TestRequestHandler() : this(JsonDataSerializer.Instance, new CommunicationEndpointFactory())
     {
-        private int protocolVersion = 1;
-
-        // Must be in sync with the highest supported version in
-        // src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs file.
-        private int highestSupportedVersion = 5;
-
-        private readonly IDataSerializer dataSerializer;
-        private ITestHostManagerFactory testHostManagerFactory;
-        private ICommunicationEndPoint communicationEndPoint;
-        private ICommunicationEndpointFactory communicationEndpointFactory;
-        private ICommunicationChannel channel;
-
-        private JobQueue<Action> jobQueue;
-        private ManualResetEventSlim requestSenderConnected;
-        private ManualResetEventSlim testHostManagerFactoryReady;
-        private ManualResetEventSlim sessionCompleted;
-        private Action<Message> onLaunchAdapterProcessWithDebuggerAttachedAckReceived;
-        private Action<Message> onAttachDebuggerAckRecieved;
-        private Exception messageProcessingUnrecoverableError;
-
-        public TestHostConnectionInfo ConnectionInfo { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRequestHandler" />.
-        /// </summary>
-        public TestRequestHandler() : this(JsonDataSerializer.Instance, new CommunicationEndpointFactory())
-        {
-        }
+    }
 
-        protected TestRequestHandler(
-            TestHostConnectionInfo connectionInfo,
-            ICommunicationEndpointFactory communicationEndpointFactory,
-            IDataSerializer dataSerializer,
-            JobQueue<Action> jobQueue,
-            Action<Message> onLaunchAdapterProcessWithDebuggerAttachedAckReceived,
-            Action<Message> onAttachDebuggerAckRecieved)
-        {
-            this.communicationEndpointFactory = communicationEndpointFactory;
-            this.ConnectionInfo = connectionInfo;
-            this.dataSerializer = dataSerializer;
-            this.requestSenderConnected = new ManualResetEventSlim(false);
-            this.testHostManagerFactoryReady = new ManualResetEventSlim(false);
-            this.sessionCompleted = new ManualResetEventSlim(false);
-            this.onLaunchAdapterProcessWithDebuggerAttachedAckReceived = onLaunchAdapterProcessWithDebuggerAttachedAckReceived;
-            this.onAttachDebuggerAckRecieved = onAttachDebuggerAckRecieved;
-            this.jobQueue = jobQueue;
-        }
+    protected TestRequestHandler(
+        TestHostConnectionInfo connectionInfo,
+        ICommunicationEndpointFactory communicationEndpointFactory,
+        IDataSerializer dataSerializer,
+        JobQueue<Action> jobQueue,
+        Action<Message> onLaunchAdapterProcessWithDebuggerAttachedAckReceived,
+        Action<Message> onAttachDebuggerAckRecieved)
+    {
+        _communicationEndpointFactory = communicationEndpointFactory;
+        ConnectionInfo = connectionInfo;
+        _dataSerializer = dataSerializer;
+        _requestSenderConnected = new ManualResetEventSlim(false);
+        _testHostManagerFactoryReady = new ManualResetEventSlim(false);
+        _sessionCompleted = new ManualResetEventSlim(false);
+        _onLaunchAdapterProcessWithDebuggerAttachedAckReceived = onLaunchAdapterProcessWithDebuggerAttachedAckReceived;
+        _onAttachDebuggerAckRecieved = onAttachDebuggerAckRecieved;
+        _jobQueue = jobQueue;
+
+        _fileHelper = new FileHelper();
+        _pathConverter = NullPathConverter.Instance;
+    }
+
+    protected TestRequestHandler(IDataSerializer dataSerializer, ICommunicationEndpointFactory communicationEndpointFactory)
+    {
+        _dataSerializer = dataSerializer;
+        _communicationEndpointFactory = communicationEndpointFactory;
+        _requestSenderConnected = new ManualResetEventSlim(false);
+        _sessionCompleted = new ManualResetEventSlim(false);
+        _testHostManagerFactoryReady = new ManualResetEventSlim(false);
+        _onLaunchAdapterProcessWithDebuggerAttachedAckReceived = (message) => throw new NotImplementedException();
+        _onAttachDebuggerAckRecieved = (message) => throw new NotImplementedException();
+
+        _jobQueue = new JobQueue<Action>(
+            action => action?.Invoke(),
+            "TestHostOperationQueue",
+            500,
+            25000000,
+            true,
+            message => EqtTrace.Error(message));
+
+        _fileHelper = new FileHelper();
+        _pathConverter = NullPathConverter.Instance;
+    }
 
-        protected TestRequestHandler(IDataSerializer dataSerializer, ICommunicationEndpointFactory communicationEndpointFactory)
+    /// <inheritdoc />
+    public virtual void InitializeCommunication()
+    {
+        if (this is IDeploymentAwareTestRequestHandler self)
         {
-            this.dataSerializer = dataSerializer;
-            this.communicationEndpointFactory = communicationEndpointFactory;
-            this.requestSenderConnected = new ManualResetEventSlim(false);
-            this.sessionCompleted = new ManualResetEventSlim(false);
-            this.testHostManagerFactoryReady = new ManualResetEventSlim(false);
-            this.onLaunchAdapterProcessWithDebuggerAttachedAckReceived = (message) => { throw new NotImplementedException(); };
-            this.onAttachDebuggerAckRecieved = (message) => { throw new NotImplementedException(); };
-
-            this.jobQueue = new JobQueue<Action>(
-                (action) => { action(); },
-                "TestHostOperationQueue",
-                500,
-                25000000,
-                true,
-                (message) => EqtTrace.Error(message));
+            var currentProcessPath = Process.GetCurrentProcess().MainModule?.FileName;
+            var currentProcessDirectory = !currentProcessPath.IsNullOrWhiteSpace()
+                ? System.IO.Path.GetDirectoryName(currentProcessPath)
+                : null;
+            var remotePath = Environment.GetEnvironmentVariable("VSTEST_UWP_DEPLOY_REMOTE_PATH") ?? self.RemotePath ?? currentProcessDirectory;
+
+            var localPath = Environment.GetEnvironmentVariable("VSTEST_UWP_DEPLOY_LOCAL_PATH") ?? self.LocalPath;
+            if (!localPath.IsNullOrWhiteSpace()
+                && !remotePath.IsNullOrWhiteSpace())
+            {
+                _pathConverter = new PathConverter(localPath, remotePath, _fileHelper);
+            }
         }
 
-        /// <inheritdoc />
-        public virtual void InitializeCommunication()
+        _communicationEndPoint = _communicationEndpointFactory.Create(ConnectionInfo.Role);
+        _communicationEndPoint.Connected += (sender, connectedArgs) =>
         {
-            this.communicationEndPoint = this.communicationEndpointFactory.Create(this.ConnectionInfo.Role);
-            this.communicationEndPoint.Connected += (sender, connectedArgs) =>
+            if (!connectedArgs.Connected)
             {
-                if (!connectedArgs.Connected)
-                {
-                    requestSenderConnected.Set();
-                    throw connectedArgs.Fault;
-                }
-                this.channel = connectedArgs.Channel;
-                this.channel.MessageReceived += this.OnMessageReceived;
-                requestSenderConnected.Set();
-            };
+                _requestSenderConnected.Set();
+                throw connectedArgs.Fault;
+            }
+            _channel = connectedArgs.Channel;
+            _channel.MessageReceived.Subscribe(OnMessageReceived);
+            _requestSenderConnected.Set();
+        };
 
-            this.communicationEndPoint.Start(this.ConnectionInfo.Endpoint);
-        }
+        _communicationEndPoint.Start(ConnectionInfo.Endpoint);
+    }
 
-        /// <inheritdoc />
-        public bool WaitForRequestSenderConnection(int connectionTimeout)
-        {
-            return requestSenderConnected.Wait(connectionTimeout);
-        }
+    /// <inheritdoc />
+    public bool WaitForRequestSenderConnection(int connectionTimeout)
+    {
+        return _requestSenderConnected.Wait(connectionTimeout);
+    }
 
-        /// <inheritdoc />
-        public void ProcessRequests(ITestHostManagerFactory testHostManagerFactory)
-        {
-            this.testHostManagerFactory = testHostManagerFactory;
-            this.testHostManagerFactoryReady.Set();
-            this.sessionCompleted.Wait();
-        }
+    /// <inheritdoc />
+    public void ProcessRequests(ITestHostManagerFactory testHostManagerFactory)
+    {
+        _testHostManagerFactory = testHostManagerFactory;
+        _testHostManagerFactoryReady.Set();
+        _sessionCompleted.Wait();
+    }
 
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            this.communicationEndPoint.Stop();
-            this.channel?.Dispose();
-        }
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <inheritdoc />
-        public void Close()
-        {
-            this.Dispose();
-            EqtTrace.Info("Closing the connection !");
-        }
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+            return;
 
-        /// <inheritdoc />
-        public void SendTestCases(IEnumerable<TestCase> discoveredTestCases)
+        if (disposing)
         {
-            var data = this.dataSerializer.SerializePayload(MessageType.TestCasesFound, discoveredTestCases, this.protocolVersion);
-            this.SendData(data);
+            _communicationEndPoint?.Stop();
+            _channel?.Dispose();
         }
 
-        /// <inheritdoc />
-        public void SendTestRunStatistics(TestRunChangedEventArgs testRunChangedArgs)
-        {
-            var data = this.dataSerializer.SerializePayload(MessageType.TestRunStatsChange, testRunChangedArgs, this.protocolVersion);
-            this.SendData(data);
-        }
+        _isDisposed = true;
+    }
+
+    /// <inheritdoc />
+    public void Close()
+    {
+        Dispose();
+        EqtTrace.Info("Closing the connection !");
+    }
+
+    /// <inheritdoc />
+    public void SendTestCases(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        var updatedTestCases = _pathConverter.UpdateTestCases(discoveredTestCases, PathConversionDirection.Send);
+        var data = _dataSerializer.SerializePayload(MessageType.TestCasesFound, updatedTestCases, _protocolVersion);
+        SendData(data);
+    }
+
+    /// <inheritdoc />
+    public void SendTestRunStatistics(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        var updatedTestRunChangedEventArgs = _pathConverter.UpdateTestRunChangedEventArgs(testRunChangedArgs, PathConversionDirection.Send);
+        var data = _dataSerializer.SerializePayload(MessageType.TestRunStatsChange, updatedTestRunChangedEventArgs, _protocolVersion);
+        SendData(data);
+    }
 
-        /// <inheritdoc />
-        public void SendLog(TestMessageLevel messageLevel, string message)
+    /// <inheritdoc />
+    public void SendLog(TestMessageLevel messageLevel, string? message)
+    {
+        var data = _dataSerializer.SerializePayload(
+            MessageType.TestMessage,
+            new TestMessagePayload { MessageLevel = messageLevel, Message = message },
+            _protocolVersion);
+        SendData(data);
+    }
+
+    /// <inheritdoc />
+    public void SendExecutionComplete(
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        // When we abort the run we might have saved the error before we gave the handler the chance to abort
+        // if the handler does not return with any new error we report the original one.
+        if (testRunCompleteArgs.IsAborted
+            && testRunCompleteArgs.Error == null
+            && _messageProcessingUnrecoverableError != null)
         {
-            var data = this.dataSerializer.SerializePayload(
-                    MessageType.TestMessage,
-                    new TestMessagePayload { MessageLevel = messageLevel, Message = message },
-                    this.protocolVersion);
-            this.SendData(data);
+            var curentArgs = testRunCompleteArgs;
+            testRunCompleteArgs = new TestRunCompleteEventArgs(
+                curentArgs.TestRunStatistics,
+                curentArgs.IsCanceled,
+                curentArgs.IsAborted,
+                _messageProcessingUnrecoverableError,
+                _pathConverter.UpdateAttachmentSets(curentArgs.AttachmentSets, PathConversionDirection.Send), curentArgs.InvokedDataCollectors, curentArgs.ElapsedTimeInRunningTests
+            );
         }
+        var data = _dataSerializer.SerializePayload(
+            MessageType.ExecutionComplete,
+            new TestRunCompletePayload
+            {
+                TestRunCompleteArgs = _pathConverter.UpdateTestRunCompleteEventArgs(testRunCompleteArgs, PathConversionDirection.Send),
+                LastRunTests = _pathConverter.UpdateTestRunChangedEventArgs(lastChunkArgs, PathConversionDirection.Send),
+                RunAttachments = _pathConverter.UpdateAttachmentSets(runContextAttachments, PathConversionDirection.Send),
+                ExecutorUris = executorUris
+            },
+            _protocolVersion);
+        SendData(data);
+    }
 
-        /// <inheritdoc />
-        public void SendExecutionComplete(
-                TestRunCompleteEventArgs testRunCompleteArgs,
-                TestRunChangedEventArgs lastChunkArgs,
-                ICollection<AttachmentSet> runContextAttachments,
-                ICollection<string> executorUris)
-        {
-            // When we abort the run we might have saved the error before we gave the handler the chance to abort
-            // if the handler does not return with any new error we report the original one.
-            if (testRunCompleteArgs.IsAborted && testRunCompleteArgs.Error == null && this.messageProcessingUnrecoverableError != null)
+    /// <inheritdoc />
+    public void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        var data = _dataSerializer.SerializePayload(
+            MessageType.DiscoveryComplete,
+            new DiscoveryCompletePayload
             {
-                var curentArgs = testRunCompleteArgs;
-                testRunCompleteArgs = new TestRunCompleteEventArgs(
-                    curentArgs.TestRunStatistics,
-                    curentArgs.IsCanceled,
-                    curentArgs.IsAborted,
-                    this.messageProcessingUnrecoverableError,
-                    curentArgs.AttachmentSets, curentArgs.ElapsedTimeInRunningTests
-                    );
-            }
-            var data = this.dataSerializer.SerializePayload(
-                    MessageType.ExecutionComplete,
-                    new TestRunCompletePayload
-                    {
-                        TestRunCompleteArgs = testRunCompleteArgs,
-                        LastRunTests = lastChunkArgs,
-                        RunAttachments = runContextAttachments,
-                        ExecutorUris = executorUris
-                    },
-                    this.protocolVersion);
-            this.SendData(data);
-        }
+                TotalTests = discoveryCompleteEventArgs.TotalCount,
+                // TODO: avoid failing when lastChunk is null
+                LastDiscoveredTests = discoveryCompleteEventArgs.IsAborted ? null : _pathConverter.UpdateTestCases(lastChunk!, PathConversionDirection.Send),
+                IsAborted = discoveryCompleteEventArgs.IsAborted,
+                Metrics = discoveryCompleteEventArgs.Metrics,
+                FullyDiscoveredSources = discoveryCompleteEventArgs.FullyDiscoveredSources,
+                PartiallyDiscoveredSources = discoveryCompleteEventArgs.PartiallyDiscoveredSources,
+                NotDiscoveredSources = discoveryCompleteEventArgs.NotDiscoveredSources,
+                SkippedDiscoverySources = discoveryCompleteEventArgs.SkippedDiscoveredSources,
+                DiscoveredExtensions = discoveryCompleteEventArgs.DiscoveredExtensions,
+            },
+            _protocolVersion);
+        SendData(data);
+    }
 
-        /// <inheritdoc />
-        public void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
+    /// <inheritdoc />
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo? testProcessStartInfo)
+    {
+        var waitHandle = new ManualResetEventSlim(false);
+        Message? ackMessage = null;
+        _onLaunchAdapterProcessWithDebuggerAttachedAckReceived = (ackRawMessage) =>
         {
-            var data = this.dataSerializer.SerializePayload(
-                    MessageType.DiscoveryComplete,
-                    new DiscoveryCompletePayload
-                    {
-                        TotalTests = discoveryCompleteEventArgs.TotalCount,
-                        LastDiscoveredTests = discoveryCompleteEventArgs.IsAborted ? null : lastChunk,
-                        IsAborted = discoveryCompleteEventArgs.IsAborted,
-                        Metrics = discoveryCompleteEventArgs.Metrics
-                    },
-                    this.protocolVersion);
-            this.SendData(data);
-        }
+            ackMessage = ackRawMessage;
+            waitHandle.Set();
+        };
 
-        /// <inheritdoc />
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
-        {
-            var waitHandle = new ManualResetEventSlim(false);
-            Message ackMessage = null;
-            this.onLaunchAdapterProcessWithDebuggerAttachedAckReceived = (ackRawMessage) =>
-            {
-                ackMessage = ackRawMessage;
-                waitHandle.Set();
-            };
+        var data = _dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttached,
+            testProcessStartInfo, _protocolVersion);
 
-            var data = dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttached,
-                testProcessStartInfo, protocolVersion);
+        SendData(data);
 
-            this.SendData(data);
+        EqtTrace.Verbose("Waiting for LaunchAdapterProcessWithDebuggerAttached ack");
+        waitHandle.Wait();
+        _onLaunchAdapterProcessWithDebuggerAttachedAckReceived = null;
+        return _dataSerializer.DeserializePayload<int>(ackMessage);
+    }
 
-            EqtTrace.Verbose("Waiting for LaunchAdapterProcessWithDebuggerAttached ack");
-            waitHandle.Wait();
-            this.onLaunchAdapterProcessWithDebuggerAttachedAckReceived = null;
-            return this.dataSerializer.DeserializePayload<int>(ackMessage);
+    /// <inheritdoc />
+    public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo)
+    {
+        // If an attach request is issued but there is no support for attaching on the other
+        // side of the communication channel, we simply return and let the caller know the
+        // request failed.
+        if (_protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
+        {
+            return false;
         }
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            // If an attach request is issued but there is no support for attaching on the other
-            // side of the communication channel, we simply return and let the caller know the
-            // request failed.
-            if (this.protocolVersion < ObjectModelConstants.MinimumProtocolVersionWithDebugSupport)
-            {
-                return false;
-            }
+        Message? ackMessage = null;
+        var waitHandle = new ManualResetEventSlim(false);
 
-            Message ackMessage = null;
-            var waitHandle = new ManualResetEventSlim(false);
+        _onAttachDebuggerAckRecieved = (ackRawMessage) =>
+        {
+            ackMessage = ackRawMessage;
+            waitHandle.Set();
+        };
 
-            this.onAttachDebuggerAckRecieved = (ackRawMessage) =>
+        var data = _dataSerializer.SerializePayload(
+            MessageType.AttachDebugger,
+            new TestProcessAttachDebuggerPayload(attachDebuggerInfo.ProcessId)
             {
-                ackMessage = ackRawMessage;
-                waitHandle.Set();
-            };
+                TargetFramework = attachDebuggerInfo.TargetFramework?.ToString(),
+            },
+            _protocolVersion);
+        SendData(data);
 
-            var data = dataSerializer.SerializePayload(
-                MessageType.AttachDebugger,
-                new TestProcessAttachDebuggerPayload(pid),
-                protocolVersion);
-            this.SendData(data);
+        EqtTrace.Verbose("Waiting for AttachDebuggerToProcess ack ...");
+        waitHandle.Wait();
 
-            EqtTrace.Verbose("Waiting for AttachDebuggerToProcess ack ...");
-            waitHandle.Wait();
+        _onAttachDebuggerAckRecieved = null;
+        return _dataSerializer.DeserializePayload<bool>(ackMessage);
+    }
 
-            this.onAttachDebuggerAckRecieved = null;
-            return this.dataSerializer.DeserializePayload<bool>(ackMessage);
-        }
+    public void OnMessageReceived(object? sender, MessageReceivedEventArgs messageReceivedArgs)
+    {
+        var message = _dataSerializer.DeserializeMessage(messageReceivedArgs.Data!);
+        EqtTrace.Info("TestRequestHandler.OnMessageReceived: received message: {0}", message);
 
-        public void OnMessageReceived(object sender, MessageReceivedEventArgs messageReceivedArgs)
+        switch (message?.MessageType)
         {
-            var message = this.dataSerializer.DeserializeMessage(messageReceivedArgs.Data);
+            case MessageType.VersionCheck:
+                try
+                {
+                    var version = _dataSerializer.DeserializePayload<int>(message);
+                    // choose the highest version that we both support
+                    var negotiatedVersion = Math.Min(version, _highestSupportedVersion);
+                    // BUT don't choose 3, because protocol version 3 has performance problems in 16.7.1-16.8. Those problems are caused
+                    // by choosing payloadSerializer instead of payloadSerializer2 for protocol version 3.
+                    //
+                    // We cannot just update the code to choose the new serializer, because then that change would apply only to testhost.
+                    // Testhost is is delivered by Microsoft.NET.Test.SDK nuget package, and can be used with an older vstest.console.
+                    // An older vstest.console, that supports protocol version 3, would serialize its messages using payloadSerializer,
+                    // but the fixed testhost would serialize it using payloadSerializer2, resulting in incompatible messages.
+                    //
+                    // Instead we must downgrade to protocol version 2 when 3 would be negotiated. Or higher when higher version
+                    // would be negotiated.
+                    if (negotiatedVersion != 3)
+                    {
+                        _protocolVersion = negotiatedVersion;
+                    }
+                    else
+                    {
+                        var flag = Environment.GetEnvironmentVariable("VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE");
+                        var flagIsEnabled = flag is not null and not "0";
+                        var dowgradeIsDisabled = flagIsEnabled;
+                        _protocolVersion = dowgradeIsDisabled ? negotiatedVersion : 2;
+                    }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("TestRequestHandler.OnMessageReceived: received message: {0}", message);
-            }
+                    // Send the negotiated protocol to request sender
+                    TPDebug.Assert(_channel is not null, "_channel is null");
+                    _channel.Send(_dataSerializer.SerializePayload(MessageType.VersionCheck, _protocolVersion));
 
-            switch (message.MessageType)
-            {
-                case MessageType.VersionCheck:
+                    // Can only do this after InitializeCommunication because TestHost cannot "Send Log" unless communications are initialized
+                    if (!StringUtils.IsNullOrEmpty(EqtTrace.LogFile))
+                    {
+                        SendLog(TestMessageLevel.Informational, string.Format(CultureInfo.CurrentCulture, CrossPlatResources.TesthostDiagLogOutputFile, EqtTrace.LogFile));
+                    }
+                    else if (!StringUtils.IsNullOrEmpty(EqtTrace.ErrorOnInitialization))
+                    {
+                        SendLog(TestMessageLevel.Warning, EqtTrace.ErrorOnInitialization);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _messageProcessingUnrecoverableError = ex;
+                    EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
+                    EqtTrace.Error(ex);
+                    goto case MessageType.AbortTestRun;
+                }
+                break;
+
+            case MessageType.DiscoveryInitialize:
+                {
                     try
                     {
-                        var version = this.dataSerializer.DeserializePayload<int>(message);
-                        // choose the highest version that we both support
-                        var negotiatedVersion = Math.Min(version, highestSupportedVersion);
-                        // BUT don't choose 3, because protocol version 3 has performance problems in 16.7.1-16.8. Those problems are caused
-                        // by choosing payloadSerializer instead of payloadSerializer2 for protocol version 3.
-                        //
-                        // We cannot just update the code to choose the new serializer, because then that change would apply only to testhost.
-                        // Testhost is is delivered by Microsoft.NET.Test.SDK nuget package, and can be used with an older vstest.console.
-                        // An older vstest.console, that supports protocol version 3, would serialize its messages using payloadSerializer,
-                        // but the fixed testhost would serialize it using payloadSerializer2, resulting in incompatible messages.
-                        //
-                        // Instead we must downgrade to protocol version 2 when 3 would be negotiated. Or higher when higher version
-                        // would be negotiated.
-                        if (negotiatedVersion != 3)
-                        {
-                            this.protocolVersion = negotiatedVersion;
-                        }
-                        else
+                        _testHostManagerFactoryReady.Wait();
+                        var discoveryEventsHandler = new TestDiscoveryEventHandler(this);
+                        var path = _dataSerializer.DeserializePayload<IEnumerable<string>>(message);
+                        TPDebug.Assert(path is not null, "path is null");
+                        var pathToAdditionalExtensions = _pathConverter.UpdatePaths(path, PathConversionDirection.Receive);
+                        Action job = () =>
                         {
-                            var flag = Environment.GetEnvironmentVariable("VSTEST_DISABLE_PROTOCOL_3_VERSION_DOWNGRADE");
-                            var flagIsEnabled = flag != null && flag != "0";
-                            var dowgradeIsDisabled = flagIsEnabled;
-                            if (dowgradeIsDisabled)
-                            {
-                                this.protocolVersion = negotiatedVersion;
-                            }
-                            else
-                            {
-                                this.protocolVersion = 2;
-                            }
-                        }
-
-                        // Send the negotiated protocol to request sender
-                        this.channel.Send(this.dataSerializer.SerializePayload(MessageType.VersionCheck, this.protocolVersion));
-
-                        // Can only do this after InitializeCommunication because TestHost cannot "Send Log" unless communications are initialized
-                        if (!string.IsNullOrEmpty(EqtTrace.LogFile))
-                        {
-                            this.SendLog(TestMessageLevel.Informational, string.Format(CrossPlatResources.TesthostDiagLogOutputFile, EqtTrace.LogFile));
-                        }
-                        else if (!string.IsNullOrEmpty(EqtTrace.ErrorOnInitialization))
-                        {
-                            this.SendLog(TestMessageLevel.Warning, EqtTrace.ErrorOnInitialization);
-                        }
+                            EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
+                            TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                            _testHostManagerFactory.GetDiscoveryManager().Initialize(pathToAdditionalExtensions, discoveryEventsHandler);
+                        };
+                        _jobQueue.QueueJob(job, 0);
                     }
                     catch (Exception ex)
                     {
-                        this.messageProcessingUnrecoverableError = ex;
+                        _messageProcessingUnrecoverableError = ex;
                         EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
                         EqtTrace.Error(ex);
                         goto case MessageType.AbortTestRun;
                     }
                     break;
+                }
 
-                case MessageType.DiscoveryInitialize:
+            case MessageType.StartDiscovery:
+                {
+                    try
                     {
-                        try
-                        {
-                            this.testHostManagerFactoryReady.Wait();
-                            var discoveryEventsHandler = new TestDiscoveryEventHandler(this);
-                            var pathToAdditionalExtensions = this.dataSerializer.DeserializePayload<IEnumerable<string>>(message);
-                            Action job = () =>
-                            {
-                                EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
-                                testHostManagerFactory.GetDiscoveryManager().Initialize(pathToAdditionalExtensions, discoveryEventsHandler);
-                            };
-                            jobQueue.QueueJob(job, 0);
-                        }
-                        catch (Exception ex)
+                        _testHostManagerFactoryReady.Wait();
+                        var discoveryEventsHandler = new TestDiscoveryEventHandler(this);
+                        var discoveryCriteria = _dataSerializer.DeserializePayload<DiscoveryCriteria>(message);
+                        TPDebug.Assert(discoveryCriteria is not null, "discoveryCriteria is null");
+                        discoveryCriteria = _pathConverter.UpdateDiscoveryCriteria(discoveryCriteria, PathConversionDirection.Receive);
+
+                        Action job = () =>
                         {
-                            this.messageProcessingUnrecoverableError = ex;
-                            EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
-                            EqtTrace.Error(ex);
-                            goto case MessageType.AbortTestRun;
-                        }
-                        break;
-                    }
+                            EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
+                            TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                            _testHostManagerFactory.GetDiscoveryManager()
+                                .DiscoverTests(discoveryCriteria, discoveryEventsHandler);
+                        };
 
-                case MessageType.StartDiscovery:
+                        _jobQueue.QueueJob(job, 0);
+                    }
+                    catch (Exception ex)
                     {
-                        try
-                        {
-                            this.testHostManagerFactoryReady.Wait();
-                            var discoveryEventsHandler = new TestDiscoveryEventHandler(this);
-                            var discoveryCriteria = this.dataSerializer.DeserializePayload<DiscoveryCriteria>(message);
-                            Action job = () =>
-                            {
-                                EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
-                                testHostManagerFactory.GetDiscoveryManager()
-                                    .DiscoverTests(discoveryCriteria, discoveryEventsHandler);
-                            };
-
-                            jobQueue.QueueJob(job, 0);
-                        }
-                        catch (Exception ex)
-                        {
-                            this.messageProcessingUnrecoverableError = ex;
-                            EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
-                            EqtTrace.Error(ex);
-                            goto case MessageType.AbortTestRun;
-                        }
-                        break;
+                        _messageProcessingUnrecoverableError = ex;
+                        EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
+                        EqtTrace.Error(ex);
+                        goto case MessageType.AbortTestRun;
                     }
+                    break;
+                }
 
-                case MessageType.ExecutionInitialize:
+            case MessageType.ExecutionInitialize:
+                {
+                    try
                     {
-                        try
-                        {
-                            this.testHostManagerFactoryReady.Wait();
-                            var testInitializeEventsHandler = new TestInitializeEventsHandler(this);
-                            var pathToAdditionalExtensions = this.dataSerializer.DeserializePayload<IEnumerable<string>>(message);
-                            Action job = () =>
-                            {
-                                EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
-                                testHostManagerFactory.GetExecutionManager().Initialize(pathToAdditionalExtensions, testInitializeEventsHandler);
-                            };
-                            jobQueue.QueueJob(job, 0);
-                        }
-                        catch (Exception ex)
+                        _testHostManagerFactoryReady.Wait();
+                        var testInitializeEventsHandler = new TestInitializeEventsHandler(this);
+                        var pathToAdditionalExtensions = _dataSerializer.DeserializePayload<IEnumerable<string>>(message);
+                        TPDebug.Assert(pathToAdditionalExtensions is not null, "pathToAdditionalExtensions is null");
+                        pathToAdditionalExtensions = _pathConverter.UpdatePaths(pathToAdditionalExtensions, PathConversionDirection.Receive);
+                        Action job = () =>
                         {
-                            this.messageProcessingUnrecoverableError = ex;
-                            EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
-                            EqtTrace.Error(ex);
-                            goto case MessageType.AbortTestRun;
-                        }
-                        break;
+                            EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
+                            TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                            _testHostManagerFactory.GetExecutionManager().Initialize(pathToAdditionalExtensions, testInitializeEventsHandler);
+                        };
+                        _jobQueue.QueueJob(job, 0);
                     }
+                    catch (Exception ex)
+                    {
+                        _messageProcessingUnrecoverableError = ex;
+                        EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
+                        EqtTrace.Error(ex);
+                        goto case MessageType.AbortTestRun;
+                    }
+                    break;
+                }
 
-                case MessageType.StartTestExecutionWithSources:
+            case MessageType.StartTestExecutionWithSources:
+                {
+                    try
                     {
-                        try
+                        var testRunEventsHandler = new TestRunEventsHandler(this);
+                        _testHostManagerFactoryReady.Wait();
+                        var testRunCriteriaWithSources = _dataSerializer.DeserializePayload<TestRunCriteriaWithSources>(message);
+                        TPDebug.Assert(testRunCriteriaWithSources is not null, "testRunCriteriaWithSources is null");
+                        testRunCriteriaWithSources = _pathConverter.UpdateTestRunCriteriaWithSources(testRunCriteriaWithSources, PathConversionDirection.Receive);
+                        Action job = () =>
                         {
-                            var testRunEventsHandler = new TestRunEventsHandler(this);
-                            this.testHostManagerFactoryReady.Wait();
-                            var testRunCriteriaWithSources = this.dataSerializer.DeserializePayload<TestRunCriteriaWithSources>(message);
-                            Action job = () =>
-                            {
-                                EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
-                                testHostManagerFactory.GetExecutionManager()
+                            EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
+                            TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                            _testHostManagerFactory.GetExecutionManager()
                                 .StartTestRun(
                                     testRunCriteriaWithSources.AdapterSourceMap,
                                     testRunCriteriaWithSources.Package,
                                     testRunCriteriaWithSources.RunSettings,
                                     testRunCriteriaWithSources.TestExecutionContext,
-                                    this.GetTestCaseEventsHandler(testRunCriteriaWithSources.RunSettings),
+                                    GetTestCaseEventsHandler(testRunCriteriaWithSources.RunSettings),
                                     testRunEventsHandler);
-                            };
-                            jobQueue.QueueJob(job, 0);
-                        }
-                        catch (Exception ex)
-                        {
-                            this.messageProcessingUnrecoverableError = ex;
-                            EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
-                            EqtTrace.Error(ex);
-                            goto case MessageType.AbortTestRun;
-                        }
-                        break;
+                        };
+                        _jobQueue.QueueJob(job, 0);
+                    }
+                    catch (Exception ex)
+                    {
+                        _messageProcessingUnrecoverableError = ex;
+                        EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
+                        EqtTrace.Error(ex);
+                        goto case MessageType.AbortTestRun;
                     }
+                    break;
+                }
 
-                case MessageType.StartTestExecutionWithTests:
+            case MessageType.StartTestExecutionWithTests:
+                {
+                    try
                     {
-                        try
+                        var testRunEventsHandler = new TestRunEventsHandler(this);
+                        _testHostManagerFactoryReady.Wait();
+                        var testRunCriteriaWithTests = _dataSerializer.DeserializePayload<TestRunCriteriaWithTests>(message);
+                        TPDebug.Assert(testRunCriteriaWithTests is not null, "testRunCriteriaWithTests is null");
+                        testRunCriteriaWithTests = _pathConverter.UpdateTestRunCriteriaWithTests(testRunCriteriaWithTests, PathConversionDirection.Receive);
+
+                        Action job = () =>
                         {
-                            var testRunEventsHandler = new TestRunEventsHandler(this);
-                            this.testHostManagerFactoryReady.Wait();
-                            var testRunCriteriaWithTests =
-                                this.dataSerializer.DeserializePayload<TestRunCriteriaWithTests>(message);
-
-                            Action job = () =>
-                            {
-                                EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
-                                testHostManagerFactory.GetExecutionManager()
+                            EqtTrace.Info("TestRequestHandler.OnMessageReceived: Running job '{0}'.", message.MessageType);
+                            TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                            _testHostManagerFactory.GetExecutionManager()
                                 .StartTestRun(
                                     testRunCriteriaWithTests.Tests,
                                     testRunCriteriaWithTests.Package,
                                     testRunCriteriaWithTests.RunSettings,
                                     testRunCriteriaWithTests.TestExecutionContext,
-                                    this.GetTestCaseEventsHandler(testRunCriteriaWithTests.RunSettings),
+                                    GetTestCaseEventsHandler(testRunCriteriaWithTests.RunSettings),
                                     testRunEventsHandler);
-                            };
-                            jobQueue.QueueJob(job, 0);
-                        }
-                        catch (Exception ex)
-                        {
-                            this.messageProcessingUnrecoverableError = ex;
-                            EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
-                            EqtTrace.Error(ex);
-                            goto case MessageType.AbortTestRun;
-                        }
-                        break;
-                    }
-
-                case MessageType.CancelTestRun:
-                    jobQueue.Pause();
-                    this.testHostManagerFactoryReady.Wait();
-                    testHostManagerFactory.GetExecutionManager().Cancel(new TestRunEventsHandler(this));
-                    break;
-
-                case MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback:
-                    this.onLaunchAdapterProcessWithDebuggerAttachedAckReceived?.Invoke(message);
-                    break;
-
-                case MessageType.AttachDebuggerCallback:
-                    this.onAttachDebuggerAckRecieved?.Invoke(message);
-                    break;
-
-                case MessageType.AbortTestRun:
-                    try
-                    {
-                        jobQueue.Pause();
-                        this.testHostManagerFactoryReady.Wait();
-                        testHostManagerFactory.GetExecutionManager().Abort(new TestRunEventsHandler(this));
+                        };
+                        _jobQueue.QueueJob(job, 0);
                     }
                     catch (Exception ex)
                     {
-                        EqtTrace.Error("Failed processing message {0}. Stopping communication.", message.MessageType);
+                        _messageProcessingUnrecoverableError = ex;
+                        EqtTrace.Error("Failed processing message {0}, aborting test run.", message.MessageType);
                         EqtTrace.Error(ex);
-                        sessionCompleted.Set();
-                        this.Close();
+                        goto case MessageType.AbortTestRun;
                     }
                     break;
+                }
 
-                case MessageType.SessionEnd:
-                    {
-                        EqtTrace.Info("Session End message received from server. Closing the connection.");
-                        sessionCompleted.Set();
-                        this.Close();
-                        break;
-                    }
-
-                case MessageType.SessionAbort:
-                    {
-                        // Don't do anything for now.
-                        break;
-                    }
-
-                default:
-                    {
-                        EqtTrace.Info("Invalid Message types");
-                        break;
-                    }
-            }
-        }
+            case MessageType.CancelTestRun:
+                _jobQueue.Pause();
+                _testHostManagerFactoryReady.Wait();
+                TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                _testHostManagerFactory.GetExecutionManager().Cancel(new TestRunEventsHandler(this));
+                break;
+
+            case MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback:
+                _onLaunchAdapterProcessWithDebuggerAttachedAckReceived?.Invoke(message);
+                break;
+
+            case MessageType.AttachDebuggerCallback:
+                _onAttachDebuggerAckRecieved?.Invoke(message);
+                break;
+
+            case MessageType.CancelDiscovery:
+                _jobQueue.Pause();
+                _testHostManagerFactoryReady.Wait();
+                TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                _testHostManagerFactory.GetDiscoveryManager().Abort(new TestDiscoveryEventHandler(this));
+                break;
+
+            case MessageType.AbortTestRun:
+                try
+                {
+                    _jobQueue.Pause();
+                    _testHostManagerFactoryReady.Wait();
+                    TPDebug.Assert(_testHostManagerFactory is not null, "_testHostManagerFactory is null");
+                    _testHostManagerFactory.GetExecutionManager().Abort(new TestRunEventsHandler(this));
+                }
+                catch (Exception ex)
+                {
+                    EqtTrace.Error("Failed processing message {0}. Stopping communication.", message.MessageType);
+                    EqtTrace.Error(ex);
+                    _sessionCompleted.Set();
+                    Close();
+                }
+                break;
 
-        private ITestCaseEventsHandler GetTestCaseEventsHandler(string runSettings)
-        {
-            ITestCaseEventsHandler testCaseEventsHandler = null;
+            case MessageType.SessionEnd:
+                {
+                    EqtTrace.Info("Session End message received from server. Closing the connection.");
+                    _sessionCompleted.Set();
+                    Close();
+                    break;
+                }
 
-            // Listen to test case events only if data collection is enabled
-            if ((XmlRunSettingsUtilities.IsDataCollectionEnabled(runSettings) && DataCollectionTestCaseEventSender.Instance != null) || XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(runSettings))
-            {
-                testCaseEventsHandler = new TestCaseEventsHandler();
-            }
+            case MessageType.SessionAbort:
+                {
+                    // Don't do anything for now.
+                    break;
+                }
 
-            return testCaseEventsHandler;
+            default:
+                {
+                    EqtTrace.Info("Invalid Message types");
+                    break;
+                }
         }
+    }
 
-        private void SendData(string data)
+    private static ITestCaseEventsHandler? GetTestCaseEventsHandler(string? runSettings)
+    {
+        ITestCaseEventsHandler? testCaseEventsHandler = null;
+
+        // Listen to test case events only if data collection is enabled
+        if ((XmlRunSettingsUtilities.IsDataCollectionEnabled(runSettings) && DataCollectionTestCaseEventSender.Instance != null)
+            || XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(runSettings))
         {
-            EqtTrace.Verbose("TestRequestHandler.SendData:  sending data from testhost: {0}", data);
-            this.channel.Send(data);
+            testCaseEventsHandler = new TestCaseEventsHandler();
         }
+
+        return testCaseEventsHandler;
+    }
+
+    private void SendData(string data)
+    {
+        EqtTrace.Verbose("TestRequestHandler.SendData: sending data from testhost: {0}", data);
+        _channel?.Send(data);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs
index cd9ad61edf..87c19a472e 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs
@@ -1,772 +1,740 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+/// <summary>
+/// The base run tests.
+/// </summary>
+internal abstract class BaseRunTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading.Tasks;
-    using CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+    private readonly ITestCaseEventsHandler? _testCaseEventsHandler;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
 
     /// <summary>
-    /// The base run tests.
+    /// To create thread in given apartment state.
     /// </summary>
-    internal abstract class BaseRunTests
-    {
-        #region private fields
-
-        private string runSettings;
-        private TestExecutionContext testExecutionContext;
-        private ITestRunEventsHandler testRunEventsHandler;
-        private ITestEventsPublisher testEventsPublisher;
-        private ITestRunCache testRunCache;
-        private protected string package;
-        private IRequestData requestData;
-
-        /// <summary>
-        /// Specifies that the test run cancellation is requested
-        /// </summary>
-        private volatile bool isCancellationRequested;
-
-        /// <summary>
-        /// Active executor which is executing the tests currently
-        /// </summary>
-        private ITestExecutor activeExecutor;
-        private ITestCaseEventsHandler testCaseEventsHandler;
-        private RunContext runContext;
-        private FrameworkHandle frameworkHandle;
-
-        private ICollection<string> executorUrisThatRanTests;
-        private ITestPlatformEventSource testPlatformEventSource;
-
-        /// <summary>
-        /// To create thread in given apartment state.
-        /// </summary>
-        private IThread platformThread;
-
-        /// <summary>
-        /// The Run configuration. To determine framework and execution thread apartment state.
-        /// </summary>
-        private RunConfiguration runConfiguration;
-
-        /// <summary>
-        /// The Serializer to clone testcase object in case of user input test source is package. E.g UWP scenario(appx/build.appxrecipe).
-        /// </summary>
-        private IDataSerializer dataSerializer;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseRunTests"/> class.
-        /// </summary>
-        /// <param name="requestData">The request data for providing common execution services and data</param>
-        /// <param name="package">The user input test source(package) if it differs from actual test source otherwise null.</param>
-        /// <param name="runSettings">The run settings.</param>
-        /// <param name="testExecutionContext">The test execution context.</param>
-        /// <param name="testCaseEventsHandler">The test case events handler.</param>
-        /// <param name="testRunEventsHandler">The test run events handler.</param>
-        /// <param name="testPlatformEventSource">Test platform event source.</param>
-        protected BaseRunTests(
-            IRequestData requestData,
-            string package,
-            string runSettings,
-            TestExecutionContext testExecutionContext,
-            ITestCaseEventsHandler testCaseEventsHandler,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestPlatformEventSource testPlatformEventSource)
-            : this(
-                requestData,
-                package,
-                runSettings,
-                testExecutionContext,
-                testCaseEventsHandler,
-                testRunEventsHandler,
-                testPlatformEventSource,
-                testCaseEventsHandler as ITestEventsPublisher,
-                new PlatformThread(),
-                JsonDataSerializer.Instance)
-        {
-        }
+    private readonly IThread _platformThread;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseRunTests"/> class.
-        /// </summary>
-        /// <param name="requestData">Provides services and data for execution</param>
-        /// <param name="package">The user input test source(package) list if it differs from actual test source otherwise null.</param>
-        /// <param name="runSettings">The run settings.</param>
-        /// <param name="testExecutionContext">The test execution context.</param>
-        /// <param name="testCaseEventsHandler">The test case events handler.</param>
-        /// <param name="testRunEventsHandler">The test run events handler.</param>
-        /// <param name="testPlatformEventSource">Test platform event source.</param>
-        /// <param name="testEventsPublisher">Publisher for test events.</param>
-        /// <param name="platformThread">Platform Thread.</param>
-        /// <param name="dataSerializer">Data Serializer for cloning TestCase and test results object.</param>
-        protected BaseRunTests(
-            IRequestData requestData,
-            string package,
-            string runSettings,
-            TestExecutionContext testExecutionContext,
-            ITestCaseEventsHandler testCaseEventsHandler,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestPlatformEventSource testPlatformEventSource,
-            ITestEventsPublisher testEventsPublisher,
-            IThread platformThread,
-            IDataSerializer dataSerializer)
-        {
-            this.package = package;
-            this.runSettings = runSettings;
-            this.testExecutionContext = testExecutionContext;
-            this.testCaseEventsHandler = testCaseEventsHandler;
-            this.testRunEventsHandler = testRunEventsHandler;
-            this.requestData = requestData;
-
-            this.isCancellationRequested = false;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.testEventsPublisher = testEventsPublisher;
-            this.platformThread = platformThread;
-            this.dataSerializer = dataSerializer;
-            this.SetContext();
-        }
+    /// <summary>
+    /// The Run configuration. To determine framework and execution thread apartment state.
+    /// </summary>
+    private readonly RunConfiguration _runConfiguration;
 
-        #endregion
+    /// <summary>
+    /// The Serializer to clone testcase object in case of user input test source is package. E.g UWP scenario(appx/build.appxrecipe).
+    /// </summary>
+    private readonly IDataSerializer _dataSerializer;
 
-        #region Properties
+    private protected string? _package;
+    private readonly IRequestData _requestData;
 
-        /// <summary>
-        /// Gets the run settings.
-        /// </summary>
-        protected string RunSettings => this.runSettings;
+    /// <summary>
+    /// Specifies that the test run cancellation is requested
+    /// </summary>
+    private volatile bool _isCancellationRequested;
 
-        /// <summary>
-        /// Gets the test execution context.
-        /// </summary>
-        protected TestExecutionContext TestExecutionContext => this.testExecutionContext;
+    /// <summary>
+    /// Active executor which is executing the tests currently
+    /// </summary>
+    private ITestExecutor? _activeExecutor;
 
-        /// <summary>
-        /// Gets the test run events handler.
-        /// </summary>
-        protected ITestRunEventsHandler TestRunEventsHandler => this.testRunEventsHandler;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseRunTests"/> class.
+    /// </summary>
+    /// <param name="requestData">The request data for providing common execution services and data</param>
+    /// <param name="package">The user input test source(package) if it differs from actual test source otherwise null.</param>
+    /// <param name="runSettings">The run settings.</param>
+    /// <param name="testExecutionContext">The test execution context.</param>
+    /// <param name="testCaseEventsHandler">The test case events handler.</param>
+    /// <param name="testRunEventsHandler">The test run events handler.</param>
+    /// <param name="testPlatformEventSource">Test platform event source.</param>
+    protected BaseRunTests(
+        IRequestData requestData,
+        string? package,
+        string? runSettings,
+        TestExecutionContext testExecutionContext,
+        ITestCaseEventsHandler? testCaseEventsHandler,
+        IInternalTestRunEventsHandler testRunEventsHandler,
+        ITestPlatformEventSource testPlatformEventSource)
+        : this(
+            requestData,
+            package,
+            runSettings,
+            testExecutionContext,
+            testCaseEventsHandler,
+            testRunEventsHandler,
+            testPlatformEventSource,
+            testCaseEventsHandler as ITestEventsPublisher,
+            new PlatformThread(),
+            JsonDataSerializer.Instance)
+    {
+    }
 
-        /// <summary>
-        /// Gets the test run cache.
-        /// </summary>
-        protected ITestRunCache TestRunCache => this.testRunCache;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseRunTests"/> class.
+    /// </summary>
+    /// <param name="requestData">Provides services and data for execution</param>
+    /// <param name="package">The user input test source(package) list if it differs from actual test source otherwise null.</param>
+    /// <param name="runSettings">The run settings.</param>
+    /// <param name="testExecutionContext">The test execution context.</param>
+    /// <param name="testCaseEventsHandler">The test case events handler.</param>
+    /// <param name="testRunEventsHandler">The test run events handler.</param>
+    /// <param name="testPlatformEventSource">Test platform event source.</param>
+    /// <param name="testEventsPublisher">Publisher for test events.</param>
+    /// <param name="platformThread">Platform Thread.</param>
+    /// <param name="dataSerializer">Data Serializer for cloning TestCase and test results object.</param>
+    [SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Part of the public API")]
+    protected BaseRunTests(
+        IRequestData requestData,
+        string? package,
+        string? runSettings,
+        TestExecutionContext testExecutionContext,
+        ITestCaseEventsHandler? testCaseEventsHandler,
+        IInternalTestRunEventsHandler testRunEventsHandler,
+        ITestPlatformEventSource testPlatformEventSource,
+        ITestEventsPublisher? testEventsPublisher,
+        IThread platformThread,
+        IDataSerializer dataSerializer)
+    {
+        _package = package;
+        RunSettings = runSettings;
+        TestExecutionContext = testExecutionContext;
+        _testCaseEventsHandler = testCaseEventsHandler;
+        TestRunEventsHandler = testRunEventsHandler;
+        _requestData = requestData;
+
+        _isCancellationRequested = false;
+        _testPlatformEventSource = testPlatformEventSource;
+        _platformThread = platformThread;
+        _dataSerializer = dataSerializer;
+
+        TestRunCache = new TestRunCache(TestExecutionContext.FrequencyOfRunStatsChangeEvent, TestExecutionContext.RunStatsChangeEventTimeout, OnCacheHit);
+
+        RunContext = new RunContext();
+        RunContext.RunSettings = RunSettingsUtilities.CreateAndInitializeRunSettings(RunSettings);
+        RunContext.KeepAlive = TestExecutionContext.KeepAlive;
+        RunContext.InIsolation = TestExecutionContext.InIsolation;
+        RunContext.IsDataCollectionEnabled = TestExecutionContext.IsDataCollectionEnabled;
+        RunContext.IsBeingDebugged = TestExecutionContext.IsDebug;
+
+        var runConfig = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettings);
+        RunContext.TestRunDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfig);
+        RunContext.SolutionDirectory = RunSettingsUtilities.GetSolutionDirectory(runConfig);
+        _runConfiguration = runConfig;
+
+        FrameworkHandle = new FrameworkHandle(
+            _testCaseEventsHandler,
+            TestRunCache,
+            TestExecutionContext,
+            TestRunEventsHandler);
+        FrameworkHandle.TestRunMessage += OnTestRunMessage;
+
+        ExecutorUrisThatRanTests = new List<string>();
+    }
 
-        protected bool IsCancellationRequested => this.isCancellationRequested;
+    /// <summary>
+    /// Gets the run settings.
+    /// </summary>
+    protected string? RunSettings { get; }
 
-        protected RunContext RunContext => this.runContext;
+    /// <summary>
+    /// Gets the test execution context.
+    /// </summary>
+    protected TestExecutionContext TestExecutionContext { get; }
 
-        protected FrameworkHandle FrameworkHandle => this.frameworkHandle;
+    /// <summary>
+    /// Gets the test run events handler.
+    /// </summary>
+    protected IInternalTestRunEventsHandler TestRunEventsHandler { get; }
 
-        protected ICollection<string> ExecutorUrisThatRanTests => this.executorUrisThatRanTests;
+    /// <summary>
+    /// Gets the test run cache.
+    /// </summary>
+    protected ITestRunCache TestRunCache { get; }
 
-        #endregion
+    protected bool IsCancellationRequested => _isCancellationRequested;
 
-        #region Public methods
+    protected RunContext RunContext { get; }
 
-        public void RunTests()
-        {
-            using (this.testRunCache)
-            {
-                TimeSpan elapsedTime = TimeSpan.Zero;
+    protected FrameworkHandle FrameworkHandle { get; }
 
-                Exception exception = null;
-                bool isAborted = false;
-                bool shutdownAfterRun = false;
+    protected ICollection<string> ExecutorUrisThatRanTests { get; }
 
-                try
-                {
-                    // Call Session-Start event on in-proc datacollectors
-                    this.SendSessionStart();
+    public void RunTests()
+    {
+        using (TestRunCache)
+        {
+            TimeSpan? elapsedTime = null;
+            Exception? exception = null;
+            bool isAborted = false;
+            bool shutdownAfterRun = false;
 
-                    elapsedTime = this.RunTestsInternal();
+            try
+            {
+                // Call Session-Start event on in-proc datacollectors
+                SendSessionStart();
 
-                    // Check the adapter setting for shutting down this process after run
-                    shutdownAfterRun = this.frameworkHandle.EnableShutdownAfterTestRun;
+                elapsedTime = RunTestsInternal();
+                if (elapsedTime is null)
+                {
+                    EqtTrace.Error("BaseRunTests.RunTests: Failed to run the tests. Reason: GetExecutorUriExtensionMap returned null.");
+                    isAborted = true;
                 }
-                catch (Exception ex)
+                else
                 {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("BaseRunTests.RunTests: Failed to run the tests. Reason: {0}.", ex);
-                    }
+                    // Check the adapter setting for shutting down this process after run
+                    shutdownAfterRun = FrameworkHandle.EnableShutdownAfterTestRun;
+                }
+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Error("BaseRunTests.RunTests: Failed to run the tests. Reason: {0}.", ex);
 
-                    exception = new Exception(ex.Message, ex.InnerException);
+                exception = new Exception(ex.Message, ex.InnerException);
+                isAborted = true;
+            }
+            finally
+            {
+                // Trigger Session End on in-proc datacollectors
+                SendSessionEnd();
 
-                    isAborted = true;
+                try
+                {
+                    // Send the test run complete event.
+                    RaiseTestRunComplete(exception, _isCancellationRequested, isAborted, elapsedTime ?? TimeSpan.Zero);
                 }
-                finally
+                catch (Exception ex2)
                 {
-                    // Trigger Session End on in-proc datacollectors
-                    this.SendSessionEnd();
+                    EqtTrace.Error("BaseRunTests.RunTests: Failed to raise runCompletion error. Reason: {0}.", ex2);
 
-                    try
-                    {
-                        // Send the test run complete event.
-                        this.RaiseTestRunComplete(exception, this.isCancellationRequested, isAborted, shutdownAfterRun, elapsedTime);
-                    }
-                    catch (Exception ex2)
-                    {
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error("BaseRunTests.RunTests: Failed to raise runCompletion error. Reason: {0}.", ex2);
-                        }
-
-                        // TODO : this does not crash the process currently because of the job queue.
-                        // Let the process crash
-                        throw;
-                    }
+                    // TODO : this does not crash the process currently because of the job queue.
+                    // Let the process crash
+                    throw;
                 }
             }
-
-            EqtTrace.Verbose("BaseRunTests.RunTests: Run is complete.");
         }
 
-        internal void Abort()
+        EqtTrace.Verbose("BaseRunTests.RunTests: Run is complete.");
+    }
+
+    internal void Abort()
+    {
+        EqtTrace.Verbose("BaseRunTests.Abort: Calling RaiseTestRunComplete");
+        RaiseTestRunComplete(exception: null, canceled: _isCancellationRequested, aborted: true, elapsedTime: TimeSpan.Zero);
+    }
+
+    /// <summary>
+    /// Cancel the current run by setting cancellation token for active executor
+    /// </summary>
+    internal void Cancel()
+    {
+        // Note: Test host delegates the cancellation to active executor and doesn't call HandleTestRunComplete in cancel request.
+        // Its expected from active executor to respect the cancel request and thus return from RunTests quickly (canceling the tests).
+        _isCancellationRequested = true;
+
+        if (_activeExecutor == null)
         {
-            EqtTrace.Verbose("BaseRunTests.Abort: Calling RaiseTestRunComplete");
-            this.RaiseTestRunComplete(exception: null, canceled: this.isCancellationRequested, aborted: true, adapterHintToShutdownAfterRun: false, elapsedTime: TimeSpan.Zero);
+            return;
         }
 
-        /// <summary>
-        /// Cancel the current run by setting cancellation token for active executor
-        /// </summary>
-        internal void Cancel()
+        if (NotRequiredStaThread() || !TryToRunInStaThread(() => CancelTestRunInternal(_activeExecutor), false))
         {
-            // Note: Test host delegates the cancellation to active executor and doesn't call HandleTestRunComplete in cancel request.
-            // Its expected from active executor to respect the cancel request and thus return from RunTests quickly (canceling the tests).
-            this.isCancellationRequested = true;
-
-            if (this.activeExecutor == null)
-            {
-                return;
-            }
-
-            if (this.NotRequiredSTAThread() || !this.TryToRunInSTAThread(() => this.CancelTestRunInternal(this.activeExecutor), false))
-            {
-                Task.Run(() => this.CancelTestRunInternal(this.activeExecutor));
-            }
+            Task.Run(() => CancelTestRunInternal(_activeExecutor));
         }
+    }
 
-        #region Abstract methods
+    protected abstract void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests);
 
-        protected abstract void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests);
+    protected abstract IEnumerable<Tuple<Uri, string>>? GetExecutorUriExtensionMap(
+        IFrameworkHandle testExecutorFrameworkHandle,
+        RunContext runContext);
 
-        protected abstract IEnumerable<Tuple<Uri, string>> GetExecutorUriExtensionMap(
-            IFrameworkHandle testExecutorFrameworkHandle,
-            RunContext runContext);
+    protected abstract void InvokeExecutor(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUriExtensionTuple,
+        RunContext runContext,
+        IFrameworkHandle frameworkHandle);
 
-        protected abstract void InvokeExecutor(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUriExtensionTuple,
-            RunContext runContext,
-            IFrameworkHandle frameworkHandle);
+    /// <summary>
+    /// Asks the adapter about attaching the debugger to the default test host.
+    /// </summary>
+    /// <param name="executor">The executor used to run the tests.</param>
+    /// <param name="executorUriExtensionTuple">The executor URI.</param>
+    /// <param name="runContext">The run context.</param>
+    /// <returns>
+    /// <see langword="true"/> if must attach the debugger to the default test host,
+    /// <see langword="false"/> otherwise.
+    /// </returns>
+    protected abstract bool ShouldAttachDebuggerToTestHost(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUriExtensionTuple,
+        RunContext runContext);
+
+    protected abstract void SendSessionStart();
+
+    protected abstract void SendSessionEnd();
+
+    private static void CancelTestRunInternal(ITestExecutor executor)
+    {
+        try
+        {
+            executor.Cancel();
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Info("{0}.Cancel threw an exception: {1} ", executor.GetType().FullName, e);
+        }
+    }
+    private void OnTestRunMessage(object? sender, TestRunMessageEventArgs e)
+    {
+        TestRunEventsHandler.HandleLogMessage(e.Level, e.Message);
+    }
 
-        /// <summary>
-        /// Asks the adapter about attaching the debugger to the default test host.
-        /// </summary>
-        /// <param name="executor">The executor used to run the tests.</param>
-        /// <param name="executorUriExtensionTuple">The executor URI.</param>
-        /// <param name="runContext">The run context.</param>
-        /// <returns>
-        /// <see cref="true"/> if must attach the debugger to the default test host,
-        /// <see cref="false"/> otherwise.
-        /// </returns>
-        protected abstract bool ShouldAttachDebuggerToTestHost(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUriExtensionTuple,
-            RunContext runContext);
+    private TimeSpan? RunTestsInternal()
+    {
+        long totalTests = 0;
+
+        // Set on the logger the TreatAdapterErrorAsWarning setting from runsettings.
+        SetAdapterLoggingSettings();
 
-        protected abstract void SendSessionStart();
+        var executorUriExtensionMap = GetExecutorUriExtensionMap(FrameworkHandle, RunContext);
 
-        protected abstract void SendSessionEnd();
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
-        #endregion
+        _testPlatformEventSource.ExecutionStart();
 
-        private void CancelTestRunInternal(ITestExecutor executor)
+        if (executorUriExtensionMap is null)
         {
-            try
-            {
-                executor.Cancel();
-            }
-            catch (Exception e)
-            {
-                EqtTrace.Info("{0}.Cancel threw an exception: {1} ", executor.GetType().FullName, e);
-            }
+            return null;
         }
-        #endregion
 
-        #region Private methods
+        var exceptionsHitDuringRunTests = RunTestInternalWithExecutors(
+            executorUriExtensionMap,
+            totalTests);
 
-        private void SetContext()
-        {
-            this.testRunCache = new TestRunCache(this.testExecutionContext.FrequencyOfRunStatsChangeEvent, this.testExecutionContext.RunStatsChangeEventTimeout, this.OnCacheHit);
-
-            this.runContext = new RunContext();
-            this.runContext.RunSettings = RunSettingsUtilities.CreateAndInitializeRunSettings(this.runSettings);
-            this.runContext.KeepAlive = this.testExecutionContext.KeepAlive;
-            this.runContext.InIsolation = this.testExecutionContext.InIsolation;
-            this.runContext.IsDataCollectionEnabled = this.testExecutionContext.IsDataCollectionEnabled;
-            this.runContext.IsBeingDebugged = this.testExecutionContext.IsDebug;
-
-            var runConfig = XmlRunSettingsUtilities.GetRunConfigurationNode(this.runSettings);
-            this.runContext.TestRunDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfig);
-            this.runContext.SolutionDirectory = RunSettingsUtilities.GetSolutionDirectory(runConfig);
-            this.runConfiguration = runConfig;
-
-            this.frameworkHandle = new FrameworkHandle(
-                this.testCaseEventsHandler,
-                this.testRunCache,
-                this.testExecutionContext,
-                this.testRunEventsHandler);
-            this.frameworkHandle.TestRunMessage += this.OnTestRunMessage;
-
-            this.executorUrisThatRanTests = new List<string>();
-        }
+        stopwatch.Stop();
+        _testPlatformEventSource.ExecutionStop(TestRunCache.TotalExecutedTests);
+        BeforeRaisingTestRunComplete(exceptionsHitDuringRunTests);
+        return stopwatch.Elapsed;
+    }
 
-        private void OnTestRunMessage(object sender, TestRunMessageEventArgs e)
-        {
-            this.testRunEventsHandler.HandleLogMessage(e.Level, e.Message);
-        }
+    private bool RunTestInternalWithExecutors(IEnumerable<Tuple<Uri, string>> executorUriExtensionMap, long totalTests)
+    {
+        // Collecting Total Number of Adapters Discovered in Machine.
+        var executorUriExtensionMapList = executorUriExtensionMap as IList<Tuple<Uri, string>> ?? executorUriExtensionMap.ToList();
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, executorUriExtensionMapList.Count);
 
-        private TimeSpan RunTestsInternal()
+        var attachedToTestHost = false;
+        var executorCache = new Dictionary<string, LazyExtension<ITestExecutor, ITestExecutorCapabilities>>();
+        foreach (var executorUriExtensionTuple in executorUriExtensionMapList)
         {
-            long totalTests = 0;
-
-            var executorUriExtensionMap = this.GetExecutorUriExtensionMap(this.frameworkHandle, this.runContext);
+            // Avoid processing the same executor twice.
+            if (executorCache.ContainsKey(executorUriExtensionTuple.Item1.AbsoluteUri))
+            {
+                continue;
+            }
 
-            // Set on the logger the TreatAdapterErrorAsWarning setting from runsettings.
-            this.SetAdapterLoggingSettings();
+            // Get the extension manager.
+            var extensionManager = GetExecutorExtensionManager(executorUriExtensionTuple.Item2);
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-            this.testPlatformEventSource.ExecutionStart();
-            var exceptionsHitDuringRunTests = this.RunTestInternalWithExecutors(
-                executorUriExtensionMap,
-                totalTests);
+            // Look up the executor.
+            var executor = extensionManager?.TryGetTestExtension(executorUriExtensionTuple.Item1);
+            if (executor == null)
+            {
+                // Commenting this out because of a compatibility issue with Microsoft.Dotnet.ProjectModel released on nuGet.org.
+                // this.activeExecutor = null;
+                // var runtimeVersion = string.Concat(PlatformServices.Default.Runtime.RuntimeType, " ",
+                // PlatformServices.Default.Runtime.RuntimeVersion);
+                var runtimeVersion = " ";
+                TestRunEventsHandler?.HandleLogMessage(
+                    TestMessageLevel.Warning,
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatEngineResources.NoMatchingExecutor,
+                        executorUriExtensionTuple.Item1.AbsoluteUri,
+                        runtimeVersion));
 
-            stopwatch.Stop();
-            this.testPlatformEventSource.ExecutionStop(this.testRunCache.TotalExecutedTests);
-            this.BeforeRaisingTestRunComplete(exceptionsHitDuringRunTests);
-            return stopwatch.Elapsed;
-        }
+                continue;
+            }
 
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "This methods must call all possible executors and not fail on crash in any executor.")]
-        private bool RunTestInternalWithExecutors(IEnumerable<Tuple<Uri, string>> executorUriExtensionMap, long totalTests)
-        {
-            // Collecting Total Number of Adapters Discovered in Machine.
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, executorUriExtensionMap.Count());
+            // Cache the executor.
+            executorCache.Add(executorUriExtensionTuple.Item1.AbsoluteUri, executor);
 
-            var attachedToTestHost = false;
-            var executorCache = new Dictionary<string, LazyExtension<ITestExecutor, ITestExecutorCapabilities>>();
-            foreach (var executorUriExtensionTuple in executorUriExtensionMap)
+            // Check if we actually have to attach to the default test host.
+            if (!RunContext.IsBeingDebugged || attachedToTestHost)
             {
-                // Avoid processing the same executor twice.
-                if (executorCache.ContainsKey(executorUriExtensionTuple.Item1.AbsoluteUri))
-                {
-                    continue;
-                }
-
-                // Get the extension manager.
-                var extensionManager = this.GetExecutorExtensionManager(executorUriExtensionTuple.Item2);
+                // We already know we should attach to the default test host, simply continue.
+                continue;
+            }
 
-                // Look up the executor.
-                var executor = extensionManager.TryGetTestExtension(executorUriExtensionTuple.Item1);
-                if (executor == null)
+            // If there's at least one adapter in the filtered adapters list that doesn't
+            // implement the new test executor interface, we should attach to the default test
+            // host by default.
+            // Same goes if all adapters implement the new test executor interface but at
+            // least one of them needs the test platform to attach to the default test host.
+            if (executor.Value is not ITestExecutor2
+                || ShouldAttachDebuggerToTestHost(executor, executorUriExtensionTuple, RunContext))
+            {
+                EqtTrace.Verbose("Attaching to default test host.");
+
+                attachedToTestHost = true;
+#if NET5_0_OR_GREATER
+                var pid = Environment.ProcessId;
+#else
+                var pid = Process.GetCurrentProcess().Id;
+#endif
+                if (!FrameworkHandle.AttachDebuggerToProcess(pid))
                 {
-                    // Commenting this out because of a compatibility issue with Microsoft.Dotnet.ProjectModel released on nuGet.org.
-                    // this.activeExecutor = null;
-                    // var runtimeVersion = string.Concat(PlatformServices.Default.Runtime.RuntimeType, " ",	
-                    // PlatformServices.Default.Runtime.RuntimeVersion);
-                    var runtimeVersion = " ";
-                    this.TestRunEventsHandler?.HandleLogMessage(
-                        TestMessageLevel.Warning,
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatEngineResources.NoMatchingExecutor,
-                            executorUriExtensionTuple.Item1.AbsoluteUri,
-                            runtimeVersion));
-
-                    continue;
+                    EqtTrace.Warning(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.AttachDebuggerToDefaultTestHostFailure, pid));
                 }
+            }
+        }
 
-                // Cache the executor.
-                executorCache.Add(executorUriExtensionTuple.Item1.AbsoluteUri, executor);
 
-                // Check if we actually have to attach to the default test host.
-                if (!this.runContext.IsBeingDebugged || attachedToTestHost)
-                {
-                    // We already know we should attach to the default test host, simply continue.
-                    continue;
-                }
-
-                // If there's at least one adapter in the filtered adapters list that doesn't
-                // implement the new test executor interface, we should attach to the default test
-                // host by default.
-                // Same goes if all adapters implement the new test executor interface but at
-                // least one of them needs the test platform to attach to the default test host.
-                if (!(executor.Value is ITestExecutor2)
-                    || this.ShouldAttachDebuggerToTestHost(executor, executorUriExtensionTuple, this.runContext))
-                {
-                    EqtTrace.Verbose("Attaching to default test host.");
+        // Call the executor for each group of tests.
+        var exceptionsHitDuringRunTests = false;
+        var executorsFromDeprecatedLocations = false;
+        double totalTimeTakenByAdapters = 0;
 
-                    attachedToTestHost = true;
-                    var pid = Process.GetCurrentProcess().Id;
-                    if (!this.frameworkHandle.AttachDebuggerToProcess(pid))
-                    {
-                        EqtTrace.Warning(
-                            string.Format(
-                                CultureInfo.CurrentUICulture,
-                                CrossPlatEngineResources.AttachDebuggerToDefaultTestHostFailure,
-                                pid));
-                    }
-                }
+        foreach (var executorUriExtensionTuple in executorUriExtensionMapList)
+        {
+            var executorUri = executorUriExtensionTuple.Item1.AbsoluteUri;
+            // Get the executor from the cache.
+            if (!executorCache.TryGetValue(executorUri, out var executor))
+            {
+                continue;
             }
 
+            try
+            {
+                EqtTrace.Verbose(
+                    "BaseRunTests.RunTestInternalWithExecutors: Running tests for {0}",
+                    executor.Metadata.ExtensionUri);
 
-            // Call the executor for each group of tests.
-            var exceptionsHitDuringRunTests = false;
-            var executorsFromDeprecatedLocations = false;
-            double totalTimeTakenByAdapters = 0;
+                // set the active executor
+                _activeExecutor = executor.Value;
 
-            foreach (var executorUriExtensionTuple in executorUriExtensionMap)
-            {
-                var executorUri = executorUriExtensionTuple.Item1.AbsoluteUri;
-                // Get the executor from the cache.
-                if (!executorCache.TryGetValue(executorUri, out var executor))
+                // If test run cancellation is requested, skip the next executor
+                if (_isCancellationRequested)
                 {
-                    continue;
+                    break;
                 }
 
-                try
-                {
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose(
-                            "BaseRunTests.RunTestInternalWithExecutors: Running tests for {0}",
-                            executor.Metadata.ExtensionUri);
-                    }
+                var timeStartNow = DateTime.UtcNow;
 
-                    // set the active executor
-                    this.activeExecutor = executor.Value;
-
-                    // If test run cancellation is requested, skip the next executor
-                    if (this.isCancellationRequested)
-                    {
-                        break;
-                    }
+                var currentTotalTests = TestRunCache.TotalExecutedTests;
+                _testPlatformEventSource.AdapterExecutionStart(executorUri);
 
-                    var timeStartNow = DateTime.UtcNow;
+                // Run the tests.
+                if (NotRequiredStaThread() || !TryToRunInStaThread(() => InvokeExecutor(executor, executorUriExtensionTuple, RunContext, FrameworkHandle), true))
+                {
+                    InvokeExecutor(executor, executorUriExtensionTuple, RunContext, FrameworkHandle);
+                }
 
-                    var currentTotalTests = this.testRunCache.TotalExecutedTests;
-                    this.testPlatformEventSource.AdapterExecutionStart(executorUri);
+                _testPlatformEventSource.AdapterExecutionStop(TestRunCache.TotalExecutedTests - currentTotalTests);
 
-                    // Run the tests.
-                    if (this.NotRequiredSTAThread() || !this.TryToRunInSTAThread(() => this.InvokeExecutor(executor, executorUriExtensionTuple, this.runContext, this.frameworkHandle), true))
-                    {
-                        this.InvokeExecutor(executor, executorUriExtensionTuple, this.runContext, this.frameworkHandle);
-                    }
+                var totalTimeTaken = DateTime.UtcNow - timeStartNow;
 
-                    this.testPlatformEventSource.AdapterExecutionStop(this.testRunCache.TotalExecutedTests - currentTotalTests);
+                // Identify whether the executor did run any tests at all
+                if (TestRunCache.TotalExecutedTests > totalTests)
+                {
+                    ExecutorUrisThatRanTests.Add(executorUri);
 
-                    var totalTimeTaken = DateTime.UtcNow - timeStartNow;
+                    // Collecting Total Tests Ran by each Adapter
+                    var totalTestRun = TestRunCache.TotalExecutedTests - totalTests;
+                    _requestData.MetricsCollection.Add($"{TelemetryDataConstants.TotalTestsRanByAdapter}.{executorUri}", totalTestRun);
 
-                    // Identify whether the executor did run any tests at all
-                    if (this.testRunCache.TotalExecutedTests > totalTests)
+                    // Only enable this for MSTestV1 telemetry for now, this might become more generic later.
+                    if (MsTestV1TelemetryHelper.IsMsTestV1Adapter(executorUri))
                     {
-                        this.executorUrisThatRanTests.Add(executorUri);
-
-                        // Collecting Total Tests Ran by each Adapter
-                        var totalTestRun = this.testRunCache.TotalExecutedTests - totalTests;
-                        this.requestData.MetricsCollection.Add(string.Format("{0}.{1}", TelemetryDataConstants.TotalTestsRanByAdapter, executorUri), totalTestRun);
-
-                        // Only enable this for MSTestV1 telemetry for now, this might become more generic later.
-                        if (MSTestV1TelemetryHelper.IsMSTestV1Adapter(executorUri))
+                        foreach (var adapterMetrics in TestRunCache.AdapterTelemetry.Keys.Where(k => k.StartsWith(executorUri)))
                         {
-                            foreach (var adapterMetrics in this.testRunCache.AdapterTelemetry.Keys.Where(k => k.StartsWith(executorUri)))
-                            {
-                                var value = this.testRunCache.AdapterTelemetry[adapterMetrics];
+                            var value = TestRunCache.AdapterTelemetry[adapterMetrics];
 
-                                this.requestData.MetricsCollection.Add(string.Format("{0}.{1}", TelemetryDataConstants.TotalTestsRunByMSTestv1, adapterMetrics), value);
-                            }
+                            _requestData.MetricsCollection.Add($"{TelemetryDataConstants.TotalTestsRunByMSTestv1}.{adapterMetrics}", value);
                         }
-
-                        if (!CrossPlatEngine.Constants.DefaultAdapters.Contains(executor.Metadata.ExtensionUri, StringComparer.OrdinalIgnoreCase))
-                        {
-                            var executorLocation = executor.Value.GetType().GetTypeInfo().Assembly.GetAssemblyLocation();
-
-                            executorsFromDeprecatedLocations |= Path.GetDirectoryName(executorLocation).Equals(CrossPlatEngine.Constants.DefaultAdapterLocation);
-                        }
-
-                        totalTests = this.testRunCache.TotalExecutedTests;
                     }
 
-                    if (EqtTrace.IsVerboseEnabled)
+                    if (!CrossPlatEngine.Constants.DefaultAdapters.Contains(executor.Metadata.ExtensionUri, StringComparer.OrdinalIgnoreCase))
                     {
-                        EqtTrace.Verbose(
-                            "BaseRunTests.RunTestInternalWithExecutors: Completed running tests for {0}",
-                            executor.Metadata.ExtensionUri);
+                        // If real executor is wrapped by a decorator we get the real decorated type
+                        Type executorType =
+                            (executor.Value is SerialTestRunDecorator serialTestRunDecorator)
+                                ? serialTestRunDecorator.OriginalTestExecutor.GetType()
+                                : executor.Value.GetType();
+
+                        var executorLocation = executorType.Assembly.GetAssemblyLocation();
+                        executorsFromDeprecatedLocations |= Path.GetDirectoryName(executorLocation)!.Equals(CrossPlatEngine.Constants.DefaultAdapterLocation);
                     }
 
-                    // Collecting Time Taken by each executor Uri
-                    this.requestData.MetricsCollection.Add(string.Format("{0}.{1}", TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, executorUri), totalTimeTaken.TotalSeconds);
-                    totalTimeTakenByAdapters += totalTimeTaken.TotalSeconds;
+                    totalTests = TestRunCache.TotalExecutedTests;
                 }
-                catch (Exception e)
-                {
-                    string exceptionMessage = (e is UnauthorizedAccessException)
-                            ? string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.AccessDenied, e.Message)
-                            : ExceptionUtilities.GetExceptionMessage(e);
-
-                    exceptionsHitDuringRunTests = true;
 
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error(
-                            "BaseRunTests.RunTestInternalWithExecutors: An exception occurred while invoking executor {0}. {1}.",
-                            executorUriExtensionTuple.Item1,
-                            e);
-                    }
+                EqtTrace.Verbose(
+                    "BaseRunTests.RunTestInternalWithExecutors: Completed running tests for {0}",
+                    executor.Metadata.ExtensionUri);
 
-                    this.TestRunEventsHandler?.HandleLogMessage(
-                        TestMessageLevel.Error,
-                        string.Format(
-                            CultureInfo.CurrentCulture,
-                            CrossPlatEngineResources.ExceptionFromRunTests,
-                            executorUriExtensionTuple.Item1,
-                            exceptionMessage));
-                }
-                finally
-                {
-                    this.activeExecutor = null;
-                }
+                // Collecting Time Taken by each executor Uri
+                _requestData.MetricsCollection.Add($"{TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter}.{executorUri}", totalTimeTaken.TotalSeconds);
+                totalTimeTakenByAdapters += totalTimeTaken.TotalSeconds;
             }
+            catch (Exception e)
+            {
+                string exceptionMessage = (e is UnauthorizedAccessException)
+                    ? string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.AccessDenied, e.Message)
+                    : ExceptionUtilities.GetExceptionMessage(e);
 
-            // Collecting Total Time Taken by Adapters
-            this.requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, totalTimeTakenByAdapters);
+                exceptionsHitDuringRunTests = true;
 
-            if (executorsFromDeprecatedLocations)
+                EqtTrace.Error(
+                    "BaseRunTests.RunTestInternalWithExecutors: An exception occurred while invoking executor {0}. {1}.",
+                    executorUriExtensionTuple.Item1,
+                    e);
+
+                TestRunEventsHandler?.HandleLogMessage(
+                    TestMessageLevel.Error,
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatEngineResources.ExceptionFromRunTests,
+                        executorUriExtensionTuple.Item1,
+                        exceptionMessage));
+            }
+            finally
             {
-                this.TestRunEventsHandler?.HandleLogMessage(TestMessageLevel.Warning, string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DeprecatedAdapterPath));
+                _activeExecutor = null;
             }
-
-            return exceptionsHitDuringRunTests;
         }
 
-        private bool NotRequiredSTAThread()
+        // Collecting Total Time Taken by Adapters
+        _requestData.MetricsCollection.Add(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, totalTimeTakenByAdapters);
+
+        if (executorsFromDeprecatedLocations)
         {
-            return this.runConfiguration.ExecutionThreadApartmentState != PlatformApartmentState.STA;
+            TestRunEventsHandler?.HandleLogMessage(TestMessageLevel.Warning, string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DeprecatedAdapterPath));
         }
 
-        private TestExecutorExtensionManager GetExecutorExtensionManager(string extensionAssembly)
+        return exceptionsHitDuringRunTests;
+    }
+
+    private bool NotRequiredStaThread()
+    {
+        return _runConfiguration.ExecutionThreadApartmentState != PlatformApartmentState.STA;
+    }
+
+    private static TestExecutorExtensionManager? GetExecutorExtensionManager(string extensionAssembly)
+    {
+        try
         {
-            try
+            if (StringUtils.IsNullOrEmpty(extensionAssembly)
+                || string.Equals(extensionAssembly, ObjectModel.Constants.UnspecifiedAdapterPath))
             {
-                if (string.IsNullOrEmpty(extensionAssembly)
-                    || string.Equals(extensionAssembly, Constants.UnspecifiedAdapterPath))
-                {
-                    // full execution. Since the extension manager is cached this can be created multiple times without harming performance.
-                    return TestExecutorExtensionManager.Create();
-                }
-                else
-                {
-                    return TestExecutorExtensionManager.GetExecutionExtensionManager(extensionAssembly);
-                }
+                // full execution. Since the extension manager is cached this can be created multiple times without harming performance.
+                return TestExecutorExtensionManager.Create();
             }
-            catch (Exception ex)
+            else
             {
-                EqtTrace.Error(
-                    "BaseRunTests: GetExecutorExtensionManager: Exception occurred while loading extensions {0}",
-                    ex);
-
-                return null;
+                return TestExecutorExtensionManager.GetExecutionExtensionManager(extensionAssembly);
             }
         }
-
-        private void SetAdapterLoggingSettings()
+        catch (Exception ex)
         {
-            // TODO: enable the below once runsettings is in.
-            // var sessionMessageLogger = testExecutorFrameworkHandle as TestSessionMessageLogger;
-            // if (sessionMessageLogger != null
-            //        && testExecutionContext != null
-            //        && testExecutionContext.TestRunConfiguration != null)
-            // {
-            //    sessionMessageLogger.TreatTestAdapterErrorsAsWarnings
-            //        = testExecutionContext.TestRunConfiguration.TreatTestAdapterErrorsAsWarnings;
-            // }
+            EqtTrace.Error(
+                "BaseRunTests: GetExecutorExtensionManager: Exception occurred while loading extensions {0}",
+                ex);
+
+            return null;
         }
+    }
 
-        private void RaiseTestRunComplete(
-            Exception exception,
-            bool canceled,
-            bool aborted,
-            bool adapterHintToShutdownAfterRun,
-            TimeSpan elapsedTime)
-        {
-            var runStats = this.testRunCache?.TestRunStatistics ?? new TestRunStatistics(new Dictionary<TestOutcome, long>());
-            var lastChunkTestResults = this.testRunCache?.GetLastChunk() ?? new List<TestResult>();
+    private static void SetAdapterLoggingSettings()
+    {
+        // TODO: enable the below once runsettings is in.
+        // var sessionMessageLogger = testExecutorFrameworkHandle as TestSessionMessageLogger;
+        // if (sessionMessageLogger != null
+        //        && testExecutionContext != null
+        //        && testExecutionContext.TestRunConfiguration != null)
+        // {
+        //    sessionMessageLogger.TreatTestAdapterErrorsAsWarnings
+        //        = testExecutionContext.TestRunConfiguration.TreatTestAdapterErrorsAsWarnings;
+        // }
+    }
 
-            if (this.testRunEventsHandler != null)
-            {
-                // Collecting Total Tests Run
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.TotalTestsRun, runStats.ExecutedTests);
+    private void RaiseTestRunComplete(
+        Exception? exception,
+        bool canceled,
+        bool aborted,
+        TimeSpan elapsedTime)
+    {
+        var runStats = TestRunCache?.TestRunStatistics ?? new TestRunStatistics(new Dictionary<TestOutcome, long>());
+        var lastChunkTestResults = TestRunCache?.GetLastChunk() ?? new List<TestResult>();
 
-                // Collecting Test Run State
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.RunState, canceled ? "Canceled" : (aborted ? "Aborted" : "Completed"));
+        if (TestRunEventsHandler != null)
+        {
+            // Collecting Total Tests Run
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.TotalTestsRun, runStats.ExecutedTests);
 
-                // Collecting Number of Adapters Used to run tests.
-                this.requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, this.ExecutorUrisThatRanTests.Count);
+            // Collecting Test Run State
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.RunState, canceled ? "Canceled" : (aborted ? "Aborted" : "Completed"));
 
-                if (lastChunkTestResults.Any() && this.IsTestSourceIsPackage())
-                {
-                    this.UpdateTestCaseSourceToPackage(lastChunkTestResults, null, out lastChunkTestResults, out var updatedTestCases);
-                }
+            // Collecting Number of Adapters Used to run tests.
+            _requestData.MetricsCollection.Add(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, ExecutorUrisThatRanTests.Count);
 
-                var testRunChangedEventArgs = new TestRunChangedEventArgs(runStats, lastChunkTestResults, Enumerable.Empty<TestCase>());
-
-                // Adding Metrics along with Test Run Complete Event Args
-                Collection<AttachmentSet> attachments = this.frameworkHandle?.Attachments;
-                var testRunCompleteEventArgs = new TestRunCompleteEventArgs(
-                    runStats,
-                    canceled,
-                    aborted,
-                    exception,
-                    attachments,
-                    elapsedTime);
-                testRunCompleteEventArgs.Metrics = this.requestData.MetricsCollection.Metrics;
-
-                this.testRunEventsHandler.HandleTestRunComplete(
-                    testRunCompleteEventArgs,
-                    testRunChangedEventArgs,
-                    attachments,
-                    this.executorUrisThatRanTests);
-            }
-            else
+            if (lastChunkTestResults.Count != 0 && IsTestSourceIsPackage())
             {
-                EqtTrace.Warning("Could not pass run completion as the callback is null. Aborted :{0}", aborted);
+                UpdateTestCaseSourceToPackage(lastChunkTestResults, null, out lastChunkTestResults, out _);
             }
-        }
 
-        private bool IsTestSourceIsPackage()
-        {
-            return !string.IsNullOrEmpty(this.package);
+            var testRunChangedEventArgs = new TestRunChangedEventArgs(runStats, lastChunkTestResults, []);
+
+            // Adding Metrics along with Test Run Complete Event Args
+            Collection<AttachmentSet>? attachments = FrameworkHandle?.Attachments;
+            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(
+                runStats,
+                canceled,
+                aborted,
+                exception,
+                attachments,
+                // Today we don't offer an extension to run collectors for test adapters.
+                new Collection<InvokedDataCollector>(),
+                elapsedTime);
+
+            testRunCompleteEventArgs.DiscoveredExtensions = TestPluginCache.Instance.TestExtensions?.GetCachedExtensions();
+            testRunCompleteEventArgs.Metrics = _requestData.MetricsCollection.Metrics;
+
+            TestRunEventsHandler.HandleTestRunComplete(
+                testRunCompleteEventArgs,
+                testRunChangedEventArgs,
+                attachments,
+                ExecutorUrisThatRanTests);
         }
-
-        private void OnCacheHit(TestRunStatistics testRunStats, ICollection<TestResult> results, ICollection<TestCase> inProgressTestCases)
+        else
         {
-            if (this.testRunEventsHandler != null)
-            {
-                if (this.IsTestSourceIsPackage())
-                {
-                    this.UpdateTestCaseSourceToPackage(results, inProgressTestCases, out results, out inProgressTestCases);
-                }
-
-                var testRunChangedEventArgs = new TestRunChangedEventArgs(testRunStats, results, inProgressTestCases);
-                this.testRunEventsHandler.HandleTestRunStatsChange(testRunChangedEventArgs);
-            }
-            else
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("BaseRunTests.OnCacheHit: Unable to send TestRunStatsChange Event as TestRunEventsHandler is NULL");
-                }
-            }
+            EqtTrace.Warning("Could not pass run completion as the callback is null. Aborted :{0}", aborted);
         }
+    }
 
-        private bool TryToRunInSTAThread(Action action, bool waitForCompletion)
+    private bool IsTestSourceIsPackage()
+    {
+        return !StringUtils.IsNullOrEmpty(_package);
+    }
+
+    private void OnCacheHit(TestRunStatistics testRunStats, ICollection<TestResult> results, ICollection<TestCase>? inProgressTestCases)
+    {
+        if (TestRunEventsHandler != null)
         {
-            bool success = true;
-            try
+            if (IsTestSourceIsPackage())
             {
-                EqtTrace.Verbose("BaseRunTests.TryToRunInSTAThread: Using STA thread to call adapter API.");
-                this.platformThread.Run(action, PlatformApartmentState.STA, waitForCompletion);
-            }
-            catch (ThreadApartmentStateNotSupportedException ex)
-            {
-                success = false;
-                EqtTrace.Warning("BaseRunTests.TryToRunInSTAThread: Failed to run in STA thread: {0}", ex);
-                this.TestRunEventsHandler.HandleLogMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(CultureInfo.CurrentUICulture, Resources.ExecutionThreadApartmentStateNotSupportedForFramework, this.runConfiguration.TargetFramework.ToString()));
+                UpdateTestCaseSourceToPackage(results, inProgressTestCases, out results, out inProgressTestCases);
             }
 
-            return success;
+            var testRunChangedEventArgs = new TestRunChangedEventArgs(testRunStats, results, inProgressTestCases);
+            TestRunEventsHandler.HandleTestRunStatsChange(testRunChangedEventArgs);
         }
-
-        private void UpdateTestCaseSourceToPackage(
-            ICollection<TestResult> testResults,
-            ICollection<TestCase> inProgressTestCases,
-            out ICollection<TestResult> updatedTestResults,
-            out ICollection<TestCase> updatedInProgressTestCases)
+        else
         {
-            EqtTrace.Verbose("BaseRunTests.UpdateTestCaseSourceToPackage: Update source details for testResults and testCases.");
-
-            updatedTestResults = this.UpdateTestResults(testResults, this.package);
-            updatedInProgressTestCases = this.UpdateInProgressTests(inProgressTestCases, this.package);
+            EqtTrace.Error("BaseRunTests.OnCacheHit: Unable to send TestRunStatsChange Event as TestRunEventsHandler is NULL");
         }
+    }
 
-        private ICollection<TestResult> UpdateTestResults(ICollection<TestResult> testResults, string package)
+    private bool TryToRunInStaThread(Action action, bool waitForCompletion)
+    {
+        bool success = true;
+        try
+        {
+            EqtTrace.Verbose("BaseRunTests.TryToRunInSTAThread: Using STA thread to call adapter API.");
+            _platformThread.Run(action, PlatformApartmentState.STA, waitForCompletion);
+        }
+        catch (ThreadApartmentStateNotSupportedException ex)
         {
-            ICollection<TestResult> updatedTestResults = new List<TestResult>();
+            success = false;
+            EqtTrace.Warning("BaseRunTests.TryToRunInSTAThread: Failed to run in STA thread: {0}", ex);
+            TestRunEventsHandler.HandleLogMessage(
+                TestMessageLevel.Warning,
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.ExecutionThreadApartmentStateNotSupportedForFramework, _runConfiguration.TargetFramework!.ToString()));
+        }
 
-            foreach (var testResult in testResults)
-            {
-                var updatedTestResult = this.dataSerializer.Clone(testResult);
-                updatedTestResult.TestCase.Source = package;
-                updatedTestResults.Add(updatedTestResult);
-            }
+        return success;
+    }
 
-            return updatedTestResults;
-        }
+    private void UpdateTestCaseSourceToPackage(
+        ICollection<TestResult> testResults,
+        ICollection<TestCase>? inProgressTestCases,
+        out ICollection<TestResult> updatedTestResults,
+        out ICollection<TestCase>? updatedInProgressTestCases)
+    {
+        EqtTrace.Verbose("BaseRunTests.UpdateTestCaseSourceToPackage: Update source details for testResults and testCases.");
+
+        updatedTestResults = UpdateTestResults(testResults, _package);
+        updatedInProgressTestCases = UpdateInProgressTests(inProgressTestCases, _package);
+    }
 
-        private ICollection<TestCase> UpdateInProgressTests(ICollection<TestCase> inProgressTestCases, string package)
+    private ICollection<TestResult> UpdateTestResults(ICollection<TestResult> testResults, string? package)
+    {
+        ICollection<TestResult> updatedTestResults = new List<TestResult>();
+
+        foreach (var testResult in testResults)
         {
-            if (inProgressTestCases == null)
-            {
-                return null;
-            }
+            var updatedTestResult = _dataSerializer.Clone(testResult);
+            TPDebug.Assert(updatedTestResult is not null, "updatedTestResult is null");
+            updatedTestResult.TestCase.Source = package!;
+            updatedTestResults.Add(updatedTestResult);
+        }
 
-            ICollection<TestCase> updatedTestCases = new List<TestCase>();
-            foreach (var inProgressTestCase in inProgressTestCases)
-            {
-                var updatedTestCase = this.dataSerializer.Clone(inProgressTestCase);
-                updatedTestCase.Source = package;
-                updatedTestCases.Add(updatedTestCase);
-            }
+        return updatedTestResults;
+    }
 
-            return updatedTestCases;
+    private ICollection<TestCase>? UpdateInProgressTests(ICollection<TestCase>? inProgressTestCases, string? package)
+    {
+        if (inProgressTestCases == null)
+        {
+            return null;
         }
 
-        #endregion
+        ICollection<TestCase> updatedTestCases = new List<TestCase>();
+        foreach (var inProgressTestCase in inProgressTestCases)
+        {
+            var updatedTestCase = _dataSerializer.Clone(inProgressTestCase);
+            TPDebug.Assert(updatedTestCase is not null, "updatedTestCase is null");
+            updatedTestCase.Source = package!;
+            updatedTestCases.Add(updatedTestCase);
+        }
+
+        return updatedTestCases;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/ExecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/ExecutionManager.cs
index 558394bf18..04c0065d76 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/ExecutionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/ExecutionManager.cs
@@ -1,252 +1,250 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+/// <summary>
+/// Orchestrates test execution related functionality for the engine communicating with the test host process.
+/// </summary>
+public class ExecutionManager : IExecutionManager
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IRequestData _requestData;
+    private readonly TestSessionMessageLogger? _sessionMessageLogger;
+    private BaseRunTests? _activeTestRun;
+    private ITestMessageEventHandler? _testMessageEventsHandler;
 
     /// <summary>
-    /// Orchestrates test execution related functionality for the engine communicating with the test host process.
+    /// Initializes a new instance of the <see cref="ExecutionManager"/> class.
     /// </summary>
-    public class ExecutionManager : IExecutionManager
+    public ExecutionManager(IRequestData requestData)
+        : this(TestPlatformEventSource.Instance, requestData)
     {
-        private readonly ITestPlatformEventSource testPlatformEventSource;
-        private BaseRunTests activeTestRun;
-        private IRequestData requestData;
-        private readonly TestSessionMessageLogger sessionMessageLogger;
-        private ITestMessageEventHandler testMessageEventsHandler;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExecutionManager"/> class.
-        /// </summary>
-        public ExecutionManager(IRequestData requestData) : this(TestPlatformEventSource.Instance, requestData)
-        {
-            this.sessionMessageLogger = TestSessionMessageLogger.Instance;
-            this.sessionMessageLogger.TestRunMessage += this.TestSessionMessageHandler;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExecutionManager"/> class.
-        /// </summary>
-        /// <param name="testPlatformEventSource">Test platform event source.</param>
-        protected ExecutionManager(ITestPlatformEventSource testPlatformEventSource, IRequestData requestData)
-        {
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.requestData = requestData;
-        }
-
-        #region IExecutionManager Implementation
-
-        /// <summary>
-        /// Initializes the execution manager.
-        /// </summary>
-        /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
-        public void Initialize(IEnumerable<string> pathToAdditionalExtensions, ITestMessageEventHandler testMessageEventsHandler)
-        {
-            this.testMessageEventsHandler = testMessageEventsHandler;
-            this.testPlatformEventSource.AdapterSearchStart();
-
-            if (pathToAdditionalExtensions != null && pathToAdditionalExtensions.Any())
-            {
-                // Start using these additional extensions
-                TestPluginCache.Instance.DefaultExtensionPaths = pathToAdditionalExtensions;
-            }
-
-            this.LoadExtensions();
-
-            //unsubscrive session logger
-            this.sessionMessageLogger.TestRunMessage -= this.TestSessionMessageHandler;
-
-            this.testPlatformEventSource.AdapterSearchStop();
-        }
-
-        /// <summary>
-        /// Starts the test run
-        /// </summary>
-        /// <param name="adapterSourceMap"> The adapter Source Map.  </param>
-        /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
-        /// <param name="runSettings"> The run Settings.  </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        /// <param name="testCaseEventsHandler"> EventHandler for handling test cases level events from Engine. </param>
-        /// <param name="runEventsHandler"> EventHandler for handling execution events from Engine.  </param>
-        public void StartTestRun(
-            Dictionary<string, IEnumerable<string>> adapterSourceMap,
-            string package,
-            string runSettings,
-            TestExecutionContext testExecutionContext,
-            ITestCaseEventsHandler testCaseEventsHandler,
-            ITestRunEventsHandler runEventsHandler)
-        {
-            try
-            {
-                this.InitializeDataCollectors(runSettings, testCaseEventsHandler as ITestEventsPublisher, TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap));
-
-                this.activeTestRun = new RunTestsWithSources(this.requestData, adapterSourceMap, package, runSettings, testExecutionContext, testCaseEventsHandler, runEventsHandler);
-
-                this.activeTestRun.RunTests();
-            }
-            catch (Exception e)
-            {
-                runEventsHandler.HandleLogMessage(TestMessageLevel.Error, e.ToString());
-                this.Abort(runEventsHandler);
-            }
-            finally
-            {
-                this.activeTestRun = null;
-            }
-        }
-
-        /// <summary>
-        /// Starts the test run with tests.
-        /// </summary>
-        /// <param name="tests"> The test list. </param>
-        /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
-        /// <param name="runSettings"> The run Settings.  </param>
-        /// <param name="testExecutionContext"> The test Execution Context. </param>
-        /// <param name="testCaseEventsHandler"> EventHandler for handling test cases level events from Engine. </param>
-        /// <param name="runEventsHandler"> EventHandler for handling execution events from Engine. </param>
-        public void StartTestRun(
-            IEnumerable<TestCase> tests,
-            string package,
-            string runSettings,
-            TestExecutionContext testExecutionContext,
-            ITestCaseEventsHandler testCaseEventsHandler,
-            ITestRunEventsHandler runEventsHandler)
-        {
-            try
-            {
-                this.InitializeDataCollectors(runSettings, testCaseEventsHandler as ITestEventsPublisher, TestSourcesUtility.GetDefaultCodebasePath(tests));
-
-                this.activeTestRun = new RunTestsWithTests(this.requestData, tests, package, runSettings, testExecutionContext, testCaseEventsHandler, runEventsHandler);
-
-                this.activeTestRun.RunTests();
-            }
-            catch (Exception e)
-            {
-                runEventsHandler.HandleLogMessage(TestMessageLevel.Error, e.ToString());
-                this.Abort(runEventsHandler);
-            }
-            finally
-            {
-                this.activeTestRun = null;
-            }
-        }
-
-        /// <summary>
-        /// Cancel the test execution.
-        /// </summary>
-        public void Cancel(ITestRunEventsHandler testRunEventsHandler)
-        {
-            if (this.activeTestRun == null)
-            {
-                var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, true, false, null, null, TimeSpan.Zero);
-                testRunEventsHandler.HandleTestRunComplete(testRunCompleteEventArgs, null, null, null);
-            }
-            else
-            {
-                this.activeTestRun.Cancel();
-            }
-        }
-
-        /// <summary>
-        /// Aborts the test execution.
-        /// </summary>
-        public void Abort(ITestRunEventsHandler testRunEventsHandler)
-        {
-            if (this.activeTestRun == null)
-            {
-                var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero);
-                testRunEventsHandler.HandleTestRunComplete(testRunCompleteEventArgs, null, null, null);
-            }
-            else
-            {
-                this.activeTestRun.Abort();
-            }
-        }
-
-        #endregion
-
-        #region private methods
-
-        private void LoadExtensions()
-        {
-            try
-            {
-                // Load the extensions on creation so that we dont have to spend time during first execution.
-                EqtTrace.Verbose("TestExecutorService: Loading the extensions");
-
-                TestExecutorExtensionManager.LoadAndInitializeAllExtensions(false);
-
-                EqtTrace.Verbose("TestExecutorService: Loaded the executors");
-
-                SettingsProviderExtensionManager.LoadAndInitializeAllExtensions(false);
-
-                EqtTrace.Verbose("TestExecutorService: Loaded the settings providers");
-                EqtTrace.Info("TestExecutorService: Loaded the extensions");
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("TestExecutorWebService: Exception occurred while calling test connection. {0}", ex);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes out-proc and in-proc data collectors.
-        /// </summary>
-        private void InitializeDataCollectors(string runSettings, ITestEventsPublisher testEventsPublisher, string defaultCodeBase)
-        {
-            // Initialize out-proc data collectors if declared in run settings.
-            if (DataCollectionTestCaseEventSender.Instance != null && XmlRunSettingsUtilities.IsDataCollectionEnabled(runSettings))
-            {
-                var outOfProcDataCollectionManager = new ProxyOutOfProcDataCollectionManager(DataCollectionTestCaseEventSender.Instance, testEventsPublisher);
-            }
-
-            // Initialize in-proc data collectors if declared in run settings.
-            if (XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(runSettings))
-            {
-                var inProcDataCollectionExtensionManager = new InProcDataCollectionExtensionManager(runSettings, testEventsPublisher, defaultCodeBase, TestPluginCache.Instance);
-            }
-        }
-
-        private void TestSessionMessageHandler(object sender, TestRunMessageEventArgs e)
-        {
-            if (this.testMessageEventsHandler != null)
-            {
-                this.testMessageEventsHandler.HandleLogMessage(e.Level, e.Message);
-            }
-            else
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning(
-                        "ExecutionManager: Could not pass the log message  '{0}' as the callback is null.",
-                        e.Message);
-                }
-            }
-        }
-
-        #endregion
+        _sessionMessageLogger = TestSessionMessageLogger.Instance;
+        _sessionMessageLogger.TestRunMessage += TestSessionMessageHandler;
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExecutionManager"/> class.
+    /// </summary>
+    /// <param name="testPlatformEventSource">Test platform event source.</param>
+    /// <param name="requestData">Request data</param>
+    protected ExecutionManager(ITestPlatformEventSource testPlatformEventSource, IRequestData requestData)
+    {
+        _testPlatformEventSource = testPlatformEventSource;
+        _requestData = requestData ?? throw new ArgumentNullException(nameof(requestData));
+    }
+
+    #region IExecutionManager Implementation
+
+    /// <summary>
+    /// Initializes the execution manager.
+    /// </summary>
+    /// <param name="pathToAdditionalExtensions"> The path to additional extensions. </param>
+    /// <param name="testMessageEventsHandler">Handler of test messages</param>
+    public void Initialize(IEnumerable<string>? pathToAdditionalExtensions, ITestMessageEventHandler? testMessageEventsHandler)
+    {
+        // Clear the request data metrics left over from a potential previous run.
+        _requestData.MetricsCollection?.Metrics?.Clear();
+
+        _testMessageEventsHandler = testMessageEventsHandler;
+        _testPlatformEventSource.AdapterSearchStart();
+
+        if (pathToAdditionalExtensions != null && pathToAdditionalExtensions.Any())
+        {
+            // Start using these additional extensions
+            TestPluginCache.Instance.DefaultExtensionPaths = pathToAdditionalExtensions;
+        }
+
+        LoadExtensions();
+
+        //unsubscribe session logger
+        if (_sessionMessageLogger is not null)
+        {
+            _sessionMessageLogger.TestRunMessage -= TestSessionMessageHandler;
+        }
+
+        _testPlatformEventSource.AdapterSearchStop();
+    }
+
+    /// <summary>
+    /// Starts the test run
+    /// </summary>
+    /// <param name="adapterSourceMap"> The adapter Source Map.  </param>
+    /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
+    /// <param name="runSettings"> The run Settings.  </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    /// <param name="testCaseEventsHandler"> EventHandler for handling test cases level events from Engine. </param>
+    /// <param name="runEventsHandler"> EventHandler for handling execution events from Engine.  </param>
+    public void StartTestRun(
+        Dictionary<string, IEnumerable<string>> adapterSourceMap,
+        string? package,
+        string? runSettings,
+        TestExecutionContext testExecutionContext,
+        ITestCaseEventsHandler? testCaseEventsHandler,
+        IInternalTestRunEventsHandler runEventsHandler)
+    {
+        try
+        {
+            InitializeDataCollectors(runSettings, testCaseEventsHandler as ITestEventsPublisher, TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap!));
+
+            _activeTestRun = new RunTestsWithSources(_requestData, adapterSourceMap, package, runSettings, testExecutionContext, testCaseEventsHandler, runEventsHandler);
+            _activeTestRun.RunTests();
+        }
+        catch (Exception e)
+        {
+            runEventsHandler.HandleLogMessage(TestMessageLevel.Error, e.ToString());
+            Abort(runEventsHandler);
+        }
+        finally
+        {
+            _activeTestRun = null;
+        }
+    }
+
+    /// <summary>
+    /// Starts the test run with tests.
+    /// </summary>
+    /// <param name="tests"> The test list. </param>
+    /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
+    /// <param name="runSettings"> The run Settings.  </param>
+    /// <param name="testExecutionContext"> The test Execution Context. </param>
+    /// <param name="testCaseEventsHandler"> EventHandler for handling test cases level events from Engine. </param>
+    /// <param name="runEventsHandler"> EventHandler for handling execution events from Engine. </param>
+    public void StartTestRun(
+        IEnumerable<TestCase> tests,
+        string? package,
+        string? runSettings,
+        TestExecutionContext testExecutionContext,
+        ITestCaseEventsHandler? testCaseEventsHandler,
+        IInternalTestRunEventsHandler runEventsHandler)
+    {
+        try
+        {
+            InitializeDataCollectors(runSettings, testCaseEventsHandler as ITestEventsPublisher, TestSourcesUtility.GetDefaultCodebasePath(tests));
+
+            _activeTestRun = new RunTestsWithTests(_requestData, tests, package, runSettings, testExecutionContext, testCaseEventsHandler, runEventsHandler);
+            _activeTestRun.RunTests();
+        }
+        catch (Exception e)
+        {
+            runEventsHandler.HandleLogMessage(TestMessageLevel.Error, e.ToString());
+            Abort(runEventsHandler);
+        }
+        finally
+        {
+            _activeTestRun = null;
+        }
+    }
+
+    /// <summary>
+    /// Cancel the test execution.
+    /// </summary>
+    public void Cancel(IInternalTestRunEventsHandler testRunEventsHandler)
+    {
+        if (_activeTestRun == null)
+        {
+            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, true, false, null, null, null, TimeSpan.Zero);
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteEventArgs, null, null, null);
+        }
+        else
+        {
+            _activeTestRun.Cancel();
+        }
+    }
+
+    /// <summary>
+    /// Aborts the test execution.
+    /// </summary>
+    public void Abort(IInternalTestRunEventsHandler testRunEventsHandler)
+    {
+        if (_activeTestRun == null)
+        {
+            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero);
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteEventArgs, null, null, null);
+        }
+        else
+        {
+            _activeTestRun.Abort();
+        }
+    }
+
+    #endregion
+    private static void LoadExtensions()
+    {
+        try
+        {
+            // Load the extensions on creation so that we dont have to spend time during first execution.
+            EqtTrace.Verbose("TestExecutorService: Loading the extensions");
+
+            TestExecutorExtensionManager.LoadAndInitializeAllExtensions(false);
+
+            EqtTrace.Verbose("TestExecutorService: Loaded the executors");
+
+            SettingsProviderExtensionManager.LoadAndInitializeAllExtensions(false);
+
+            EqtTrace.Verbose("TestExecutorService: Loaded the settings providers");
+            EqtTrace.Info("TestExecutorService: Loaded the extensions");
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Warning("TestExecutorWebService: Exception occurred while calling test connection. {0}", ex);
+        }
+    }
+
+    /// <summary>
+    /// Initializes out-proc and in-proc data collectors.
+    /// </summary>
+    private static void InitializeDataCollectors(string? runSettings, ITestEventsPublisher? testEventsPublisher, string? defaultCodeBase)
+    {
+        // Initialize out-proc data collectors if declared in run settings.
+        if (DataCollectionTestCaseEventSender.Instance != null && XmlRunSettingsUtilities.IsDataCollectionEnabled(runSettings))
+        {
+            TPDebug.Assert(testEventsPublisher is not null, "testEventsPublisher is null");
+            _ = new ProxyOutOfProcDataCollectionManager(DataCollectionTestCaseEventSender.Instance, testEventsPublisher);
+        }
+
+        // Initialize in-proc data collectors if declared in run settings.
+        if (XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(runSettings))
+        {
+            TPDebug.Assert(testEventsPublisher is not null, "testEventsPublisher is null");
+            _ = new InProcDataCollectionExtensionManager(runSettings, testEventsPublisher, defaultCodeBase, TestPluginCache.Instance);
+        }
+    }
+
+    private void TestSessionMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        if (_testMessageEventsHandler != null)
+        {
+            _testMessageEventsHandler.HandleLogMessage(e.Level, e.Message);
+        }
+        else
+        {
+            EqtTrace.Warning(
+                "ExecutionManager: Could not pass the log message  '{0}' as the callback is null.",
+                e.Message);
+        }
+    }
+
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/MSTestV1TelemetryHelper.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/MSTestV1TelemetryHelper.cs
index 8e71c106c8..feca8330ea 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/MSTestV1TelemetryHelper.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/MSTestV1TelemetryHelper.cs
@@ -1,89 +1,79 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+internal class MsTestV1TelemetryHelper
 {
-    using System;
-    using System.Collections.Generic;
+    private static TestProperty? s_testTypeProperty;
+    private static TestProperty? s_extensionIdProperty;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    internal static bool IsMsTestV1Adapter([NotNullWhen(true)] Uri? executorUri)
+    {
+        return IsMsTestV1Adapter(executorUri?.AbsoluteUri);
+    }
 
-    internal class MSTestV1TelemetryHelper
+    internal static bool IsMsTestV1Adapter([NotNullWhen(true)] string? executorUri)
     {
-        private static TestProperty testTypeProperty;
-        private static TestProperty extensionIdProperty;
+        return string.Equals(executorUri, "executor://mstestadapter/v1", StringComparison.OrdinalIgnoreCase);
+    }
 
-        internal static bool IsMSTestV1Adapter(Uri executorUri)
+    internal static void AddTelemetry(TestResult testResult, IDictionary<string, int> adapterTelemetry)
+    {
+        var executorUri = testResult?.TestCase?.ExecutorUri;
+        // add additional info for mstestadapter/v1
+        if (IsMsTestV1Adapter(executorUri))
         {
-            return IsMSTestV1Adapter(executorUri.AbsoluteUri);
-        }
+            // this is present when the legacy runner is used, and contains a guid which
+            // is the test type.
+            // GenericTestType 982B8C01-1A8A-48F5-B98A-67EE64BC8687
+            // OrderedTestType ec4800e8-40e5-4ab3-8510-b8bf29b1904d
+            // UnitTestType 13CDC9D9-DDB5-4fa4-A97D-D965CCFC6D4B
+            // WebTestType 4e7599fa-5ecb-43e9-a887-cd63cf72d207
+            // CodedWebTestType 37e36796-fb51-4610-8d5c-e00ceaa68b9f
+            s_testTypeProperty ??= TestProperty.Register("TestType", "TestType", typeof(Guid), typeof(TestResult));
 
-        internal static bool IsMSTestV1Adapter(string executorUri) {
-            return string.Equals(executorUri, "executor://mstestadapter/v1", StringComparison.OrdinalIgnoreCase);
-        }
+            s_extensionIdProperty ??= TestProperty.Register("ExtensionId", "ExtensionId", typeof(string), typeof(TestResult));
+            // Get addional data from test result passed by MSTestv1
+            // Only legacy tests have testtype.
 
-        internal static void AddTelemetry(TestResult testResult, IDictionary<string, int> adapterTelemetry)
-        {
-            var executorUri = testResult?.TestCase?.ExecutorUri;
-            // add additional info for mstestadapter/v1
-            if (IsMSTestV1Adapter(executorUri))
+            var testType = testResult!.GetPropertyValue(s_testTypeProperty, Guid.Empty);
+            var hasTestType = testType != Guid.Empty;
+
+            string key;
+            if (hasTestType)
             {
-                if (testTypeProperty == null)
-                {
-                    // this is present when the legacy runner is used, and contains a guid which
-                    // is the test type.
-                    // GenericTestType 982B8C01-1A8A-48F5-B98A-67EE64BC8687
-                    // OrderedTestType ec4800e8-40e5-4ab3-8510-b8bf29b1904d
-                    // UnitTestType 13CDC9D9-DDB5-4fa4-A97D-D965CCFC6D4B
-                    // WebTestType 4e7599fa-5ecb-43e9-a887-cd63cf72d207
-                    // CodedWebTestType 37e36796-fb51-4610-8d5c-e00ceaa68b9f
-                    testTypeProperty = TestProperty.Register("TestType", "TestType", typeof(Guid), typeof(TestResult));
-                }
+                var testExtension = testResult.GetPropertyValue<string?>(s_extensionIdProperty, null);
+                var hasExtension = !testExtension.IsNullOrWhiteSpace();
 
-                if (extensionIdProperty == null)
+                if (hasExtension && testExtension!.StartsWith("urn:"))
                 {
-                    extensionIdProperty = TestProperty.Register("ExtensionId", "ExtensionId", typeof(string), typeof(TestResult));
+                    // remove urn: prefix
+                    testExtension = testExtension.Remove(0, 4);
                 }
-                // Get addional data from test result passed by MSTestv1
-                // Only legacy tests have testtype.
-
-                var testType = testResult.GetPropertyValue<Guid>(testTypeProperty, Guid.Empty);
-                var hasTestType = testType != Guid.Empty;
-
-                string key;
-                if (hasTestType)
-                {
-                    var testExtension = testResult.GetPropertyValue<string>(extensionIdProperty, null);
-                    var hasExtension = !string.IsNullOrWhiteSpace(testExtension);
-
-                    if (hasExtension && testExtension.StartsWith("urn:"))
-                    {
-                        // remove urn: prefix
-                        testExtension = testExtension.Remove(0, 4);
-                    }
 
-                    if (hasExtension)
-                    {
-                        key = $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.legacy.extension.{testExtension}.count";
-                    }
-                    else
-                    {
-                        key = $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.legacy.count";
-                    }
-                }
-                else
-                {
-                    key = $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.count";
-                }
+                key = hasExtension
+                    ? $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.legacy.extension.{testExtension}.count"
+                    : $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.legacy.count";
+            }
+            else
+            {
+                key = $"{testResult.TestCase.ExecutorUri.AbsoluteUri}.count";
+            }
 
-                if (adapterTelemetry.ContainsKey(key))
-                {
-                    adapterTelemetry[key]++;
-                }
-                else
-                {
-                    adapterTelemetry[key] =  1;
-                }
+            if (adapterTelemetry.ContainsKey(key))
+            {
+                adapterTelemetry[key]++;
+            }
+            else
+            {
+                adapterTelemetry[key] = 1;
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs
index d9372453fd..98fe1799f1 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithSources.cs
@@ -1,257 +1,230 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+internal class RunTestsWithSources : BaseRunTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
+    private readonly Dictionary<string, IEnumerable<string>> _adapterSourceMap;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+    private Dictionary<Tuple<Uri, string>, IEnumerable<string>>? _executorUriVsSourceList;
 
-    using ObjectModel.Client;
-    using ObjectModel.Logging;
-    using Utilities;
-    using CrossPlatEngineResources = Resources.Resources;
+    private readonly ITestCaseEventsHandler? _testCaseEventsHandler;
 
-    internal class RunTestsWithSources : BaseRunTests
+    public RunTestsWithSources(IRequestData requestData, Dictionary<string, IEnumerable<string>> adapterSourceMap, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler)
+        : this(requestData, adapterSourceMap, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, null)
     {
-        private Dictionary<string, IEnumerable<string>> adapterSourceMap;
-
-        private Dictionary<Tuple<Uri,string>, IEnumerable<string>> executorUriVsSourceList;
+    }
 
-        private ITestCaseEventsHandler testCaseEventsHandler;
+    /// <summary>
+    /// Used for unit testing only.
+    /// </summary>
+    /// <param name="requestData"></param>
+    /// <param name="adapterSourceMap"></param>
+    /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
+    /// <param name="runSettings"></param>
+    /// <param name="testExecutionContext"></param>
+    /// <param name="testCaseEventsHandler"></param>
+    /// <param name="testRunEventsHandler"></param>
+    /// <param name="executorUriVsSourceList"></param>
+    internal RunTestsWithSources(IRequestData requestData, Dictionary<string, IEnumerable<string>> adapterSourceMap, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, IEnumerable<string>>? executorUriVsSourceList)
+        : base(requestData, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, TestPlatformEventSource.Instance)
+    {
+        _adapterSourceMap = adapterSourceMap;
+        _executorUriVsSourceList = executorUriVsSourceList;
+        _testCaseEventsHandler = testCaseEventsHandler;
+    }
 
-        public RunTestsWithSources(IRequestData requestData, Dictionary<string, IEnumerable<string>> adapterSourceMap, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler)
-            : this(requestData, adapterSourceMap, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, null)
+    protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
+    {
+        // If run was with sources and no test was executed and cancellation was not requested,
+        // then raise a warning saying that no test was present in the sources.
+        // The warning is raised only if total no of tests that have been run is zero.
+        if (!exceptionsHitDuringRunTests && _executorUriVsSourceList?.Count > 0 && !IsCancellationRequested
+            && TestRunCache?.TotalExecutedTests <= 0)
         {
+            LogWarningOnNoTestsExecuted();
         }
+    }
+
+    private void LogWarningOnNoTestsExecuted()
+    {
+        IEnumerable<string> sources = new List<string>();
+        var sourcesArray = _adapterSourceMap.Values
+            .Aggregate(sources, (current, enumerable) => enumerable is not null ? current.Concat(enumerable) : current).ToArray();
+        var sourcesString = string.Join(" ", sourcesArray);
 
-        /// <summary>
-        /// Used for unit testing only.
-        /// </summary>
-        /// <param name="requestData"></param>
-        /// <param name="adapterSourceMap"></param>
-        /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
-        /// <param name="runSettings"></param>
-        /// <param name="testExecutionContext"></param>
-        /// <param name="testCaseEventsHandler"></param>
-        /// <param name="testRunEventsHandler"></param>
-        /// <param name="executorUriVsSourceList"></param>
-        /// <param name="testRunCache"></param>
-        internal RunTestsWithSources(IRequestData requestData, Dictionary<string, IEnumerable<string>> adapterSourceMap, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, IEnumerable<string>> executorUriVsSourceList)
-            : base(requestData, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, TestPlatformEventSource.Instance)
+        if (TestExecutionContext.TestCaseFilter != null)
         {
-            this.adapterSourceMap = adapterSourceMap;
-            this.executorUriVsSourceList = executorUriVsSourceList;
-            this.testCaseEventsHandler = testCaseEventsHandler;
+            var testCaseFilterToShow = TestCaseFilterDeterminer.ShortenTestCaseFilterIfRequired(TestExecutionContext.TestCaseFilter);
+            TestRunEventsHandler?.HandleLogMessage(
+                TestMessageLevel.Warning,
+                string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoTestsAvailableForGivenTestCaseFilter, testCaseFilterToShow, sourcesString));
         }
-
-        protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
+        else
         {
-            // If run was with sources and no test was executed and cancellation was not requested,
-            // then raise a warning saying that no test was present in the sources.
-            // The warning is raised only if total no of tests that have been run is zero.
-            if (!exceptionsHitDuringRunTests && this.executorUriVsSourceList?.Count > 0 && !this.IsCancellationRequested
-                && this.TestRunCache?.TotalExecutedTests <= 0)
-            {
-                this.LogWarningOnNoTestsExecuted();
-            }
+            TestRunEventsHandler?.HandleLogMessage(
+                TestMessageLevel.Warning,
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources,
+                    sourcesString));
         }
+    }
 
-        private void LogWarningOnNoTestsExecuted()
-        {
-            IEnumerable<string> sources = new List<string>();
-            var sourcesArray = this.adapterSourceMap.Values
-                .Aggregate(sources, (current, enumerable) => current.Concat(enumerable)).ToArray();
-            var sourcesString = string.Join(" ", sourcesArray);
+    protected override IEnumerable<Tuple<Uri, string>> GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
+    {
+        _executorUriVsSourceList = GetExecutorVsSourcesList(testExecutorFrameworkHandle);
+        var executorUris = _executorUriVsSourceList.Keys;
 
-            if (this.TestExecutionContext.TestCaseFilter != null)
-            {
-                var testCaseFilterToShow = TestCaseFilterDeterminer.ShortenTestCaseFilterIfRequired(this.TestExecutionContext.TestCaseFilter);
-                this.TestRunEventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(CrossPlatEngineResources.NoTestsAvailableForGivenTestCaseFilter, testCaseFilterToShow, sourcesString));
-            }
-            else
-            {
-                this.TestRunEventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Warning,
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CrossPlatEngineResources.TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources,
-                        sourcesString));
-            }
-        }
+        runContext.FilterExpressionWrapper = !TestExecutionContext.TestCaseFilter.IsNullOrEmpty()
+            ? new FilterExpressionWrapper(TestExecutionContext.TestCaseFilter, TestExecutionContext.FilterOptions)
+            : null;
 
-        protected override IEnumerable<Tuple<Uri,string>> GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
-        {
-            this.executorUriVsSourceList = this.GetExecutorVsSourcesList(testExecutorFrameworkHandle);
-            var executorUris = this.executorUriVsSourceList.Keys;
+        return executorUris;
+    }
 
-            if (!string.IsNullOrEmpty(this.TestExecutionContext.TestCaseFilter))
-            {
-                runContext.FilterExpressionWrapper = new FilterExpressionWrapper(this.TestExecutionContext.TestCaseFilter, this.TestExecutionContext.FilterOptions);
-            }
-            else
-            {
-                runContext.FilterExpressionWrapper = null;
-            }
+    protected override void InvokeExecutor(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUriExtensionTuple,
+        RunContext? runContext,
+        IFrameworkHandle? frameworkHandle)
+    {
+        executor?.Value.RunTests(_executorUriVsSourceList?[executorUriExtensionTuple], runContext, frameworkHandle);
+    }
 
-            return executorUris;
-        }
+    /// <inheritdoc />
+    protected override bool ShouldAttachDebuggerToTestHost(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUriExtensionTuple,
+        RunContext runContext)
+    {
+        // If the adapter doesn't implement the new test executor interface we should attach to
+        // the default test host by default to preserve old behavior.
+        return executor?.Value is not ITestExecutor2 convertedExecutor
+               || convertedExecutor.ShouldAttachToTestHost(
+                   _executorUriVsSourceList?[executorUriExtensionTuple],
+                   runContext);
+    }
 
-        protected override void InvokeExecutor(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUriExtensionTuple,
-            RunContext runContext,
-            IFrameworkHandle frameworkHandle)
-        {
-            executor?.Value.RunTests(this.executorUriVsSourceList[executorUriExtensionTuple], runContext, frameworkHandle);
-        }
+    /// <summary>
+    /// Returns executor Vs sources list
+    /// </summary>
+    private Dictionary<Tuple<Uri, string>, IEnumerable<string>> GetExecutorVsSourcesList(IMessageLogger logger)
+    {
+        var result = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>();
+
+        var verifiedExtensionSourceMap = new Dictionary<string, IEnumerable<string>>();
 
-        /// <inheritdoc />
-        protected override bool ShouldAttachDebuggerToTestHost(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUriExtensionTuple,
-            RunContext runContext)
+        // Validate the sources
+        foreach (var kvp in _adapterSourceMap)
         {
-            // If the adapter doesn't implement the new test executor interface we should attach to
-            // the default test host by default to preserve old behavior.
-            if (!(executor?.Value is ITestExecutor2 convertedExecutor))
+            var verifiedSources = DiscoveryManager.GetValidSources(kvp.Value, logger, _package);
+            if (verifiedSources.Any())
             {
-                return true;
+                verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);
             }
-
-            return convertedExecutor.ShouldAttachToTestHost(
-                this.executorUriVsSourceList[executorUriExtensionTuple],
-                runContext);
         }
 
-        /// <summary>
-        /// Returns executor Vs sources list
-        /// </summary>
-        private Dictionary<Tuple<Uri, string>, IEnumerable<string>> GetExecutorVsSourcesList(IMessageLogger logger)
+        // No valid source is found => no executor vs source map
+        if (!verifiedExtensionSourceMap.Any())
         {
-            var result = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>();
-
-            var verifiedExtensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-
-            // Validate the sources 
-            foreach (var kvp in this.adapterSourceMap)
-            {
-                var verifiedSources = DiscoveryManager.GetValidSources(kvp.Value, logger, package);
-                if (verifiedSources.Any())
-                {
-                    verifiedExtensionSourceMap.Add(kvp.Key, kvp.Value);
-                }
-            }
+            return result;
+        }
 
-            // No valid source is found => no executor vs source map
-            if (!verifiedExtensionSourceMap.Any())
+        foreach (var kvp in verifiedExtensionSourceMap)
+        {
+            var discovererToSourcesMap = DiscovererEnumerator.GetDiscovererToSourcesMap(
+                kvp.Key,
+                kvp.Value,
+                logger,
+                new AssemblyProperties());
+
+            // Warning is logged by the inner layer
+            if (discovererToSourcesMap == null || discovererToSourcesMap.Count == 0)
             {
-                return result;
+                continue;
             }
 
-            foreach (var kvp in verifiedExtensionSourceMap)
+            foreach (var discoverer in discovererToSourcesMap.Keys)
             {
-                Dictionary<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>, IEnumerable<string>>
-                    discovererToSourcesMap = DiscovererEnumerator.GetDiscovererToSourcesMap(
-                        kvp.Key,
-                        kvp.Value,
-                        logger,
-                        new AssemblyProperties());
-
-                // Warning is logged by the inner layer
-                if (discovererToSourcesMap == null || discovererToSourcesMap.Count == 0)
+                var executorUri = discoverer.Metadata.DefaultExecutorUri;
+                if (executorUri == null)
                 {
+                    string errorMessage = string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatEngineResources.IgnoringExecutorAsNoDefaultExecutorUriAttribute,
+                        discoverer.Value);
+                    logger.SendMessage(TestMessageLevel.Warning, errorMessage);
                     continue;
                 }
 
-                foreach (var discoverer in discovererToSourcesMap.Keys)
-                {
-                    var executorUri = discoverer.Metadata.DefaultExecutorUri;
-                    if (executorUri == null)
-                    {
-                        string errorMessage = string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatEngineResources.IgnoringExecutorAsNoDefaultExecutorUriAttribute,
-                            discoverer.Value);
-                        logger.SendMessage(TestMessageLevel.Warning, errorMessage);
-                        continue;
-                    }
-
-                    var executorUriExtensionTuple = new Tuple<Uri, string>(executorUri, kvp.Key);
+                var executorUriExtensionTuple = new Tuple<Uri, string>(executorUri, kvp.Key);
 
-                    if (!result.ContainsKey(executorUriExtensionTuple))
-                    {
-                        result.Add(executorUriExtensionTuple, discovererToSourcesMap[discoverer]);
-                    }
-                    else
-                    {
-                        string errorMessage = string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatEngineResources.DuplicateAdaptersFound,
-                            executorUri,
-                            discoverer.Value);
-                        logger.SendMessage(TestMessageLevel.Warning, errorMessage);
-                    }
+                if (!result.ContainsKey(executorUriExtensionTuple))
+                {
+                    result.Add(executorUriExtensionTuple, discovererToSourcesMap[discoverer]);
+                }
+                else
+                {
+                    string errorMessage = string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatEngineResources.DuplicateAdaptersFound,
+                        executorUri,
+                        discoverer.Value);
+                    logger.SendMessage(TestMessageLevel.Warning, errorMessage);
                 }
             }
-
-            return result;
         }
 
-        private static string TestCaseFilterToShow(string testCaseFilter)
-        {
-            var maxTestCaseFilterToShowLength = 63;
-            string testCaseFilterToShow;
-
-            if (testCaseFilter.Length > maxTestCaseFilterToShowLength)
-            {
-                testCaseFilterToShow = testCaseFilter.Substring(0, maxTestCaseFilterToShowLength - 3) + "...";
-            }
-            else
-            {
-                testCaseFilterToShow = testCaseFilter;
-            }
+        return result;
+    }
 
-            return testCaseFilterToShow;
-        }
+    /// <summary>
+    /// Sends Session-End event on in-proc datacollectors
+    /// </summary>
+    protected override void SendSessionEnd()
+    {
+        _testCaseEventsHandler?.SendSessionEnd();
+    }
 
-        /// <summary>
-        /// Sends Session-End event on in-proc datacollectors
-        /// </summary>
-        protected override void SendSessionEnd()
+    /// <summary>
+    /// Sends Session-Start event on in-proc datacollectors
+    /// </summary>
+    protected override void SendSessionStart()
+    {
+        // Send session start with test sources in property bag for session start event args.
+        if (_testCaseEventsHandler == null)
         {
-            this.testCaseEventsHandler?.SendSessionEnd();
+            return;
         }
 
-        /// <summary>
-        /// Sends Session-Start event on in-proc datacollectors
-        /// </summary>
-        protected override void SendSessionStart()
+        var properties = new Dictionary<string, object?>
         {
-            // Send session start with test sources in property bag for session start event args.
-            if (this.testCaseEventsHandler == null)
-            {
-                return;
-            }
+            { "TestSources", TestSourcesUtility.GetSources(_adapterSourceMap!)! }
+        };
 
-            var properties = new Dictionary<string, object>();
-            properties.Add("TestSources", TestSourcesUtility.GetSources(this.adapterSourceMap));
-
-            this.testCaseEventsHandler.SendSessionStart(properties);
-        }
+        _testCaseEventsHandler.SendSessionStart(properties);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithTests.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithTests.cs
index b072cac0a0..17cf101666 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithTests.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/RunTestsWithTests.cs
@@ -1,149 +1,141 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+internal class RunTestsWithTests : BaseRunTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-
-    using ObjectModel.Client;
-
-    internal class RunTestsWithTests : BaseRunTests
+    private readonly IEnumerable<TestCase> _testCases;
+    private readonly ITestCaseEventsHandler? _testCaseEventsHandler;
+
+    private Dictionary<Tuple<Uri, string>, List<TestCase>>? _executorUriVsTestList;
+
+    public RunTestsWithTests(IRequestData requestData, IEnumerable<TestCase> testCases, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler)
+        : this(requestData, testCases, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, null)
     {
-        private IEnumerable<TestCase> testCases;
+    }
 
-        private Dictionary<Tuple<Uri, string>, List<TestCase>> executorUriVsTestList;
+    /// <summary>
+    /// Used for unit testing only.
+    /// </summary>
+    /// <param name="testCases"></param>
+    /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
+    /// <param name="requestData"></param>
+    /// <param name="runSettings"></param>
+    /// <param name="testExecutionContext"></param>
+    /// <param name="testCaseEventsHandler"></param>
+    /// <param name="testRunEventsHandler"></param>
+    /// <param name="executorUriVsTestList"></param>
+    internal RunTestsWithTests(IRequestData requestData, IEnumerable<TestCase> testCases, string? package, string? runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, List<TestCase>>? executorUriVsTestList)
+        : base(requestData, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, TestPlatformEventSource.Instance)
+    {
+        _testCases = testCases;
+        _executorUriVsTestList = executorUriVsTestList;
+        _testCaseEventsHandler = testCaseEventsHandler;
+    }
 
-        private ITestCaseEventsHandler testCaseEventsHandler;
+    protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
+    {
+        // Do Nothing.
+    }
 
-        public RunTestsWithTests(IRequestData requestData, IEnumerable<TestCase> testCases, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler)
-            : this(requestData, testCases, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, null)
-        {
-        }
+    protected override IEnumerable<Tuple<Uri, string>> GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
+    {
+        _executorUriVsTestList = GetExecutorVsTestCaseList(_testCases);
 
-        /// <summary>
-        /// Used for unit testing only.
-        /// </summary>
-        /// <param name="testCases"></param>
-        /// <param name="package">The user input test source(package) if it differ from actual test source otherwise null.</param>
-        /// <param name="testRunCache"></param>
-        /// <param name="runSettings"></param>
-        /// <param name="testExecutionContext"></param>
-        /// <param name="testCaseEventsHandler"></param>
-        /// <param name="testRunEventsHandler"></param>
-        /// <param name="executorUriVsTestList"></param>
-        internal RunTestsWithTests(IRequestData requestData, IEnumerable<TestCase> testCases, string package, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, List<TestCase>> executorUriVsTestList)
-            : base(requestData, package, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, TestPlatformEventSource.Instance)
-        {
-            this.testCases = testCases;
-            this.executorUriVsTestList = executorUriVsTestList;
-            this.testCaseEventsHandler = testCaseEventsHandler;
-        }
+        TPDebug.Assert(TestExecutionContext.TestCaseFilter == null, "TestCaseFilter should be null for specific tests.");
+        runContext.FilterExpressionWrapper = null;
 
-        protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
-        {
-            // Do Nothing.
-        }
+        return _executorUriVsTestList.Keys;
+    }
 
-        protected override IEnumerable<Tuple<Uri, string>> GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
-        {
-            this.executorUriVsTestList = this.GetExecutorVsTestCaseList(this.testCases);
+    protected override void InvokeExecutor(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUri,
+        RunContext? runContext,
+        IFrameworkHandle? frameworkHandle)
+    {
+        executor?.Value.RunTests(_executorUriVsTestList?[executorUri], runContext, frameworkHandle);
+    }
 
-            Debug.Assert(this.TestExecutionContext.TestCaseFilter == null, "TestCaseFilter should be null for specific tests.");
-            runContext.FilterExpressionWrapper = null;
+    /// <inheritdoc />
+    protected override bool ShouldAttachDebuggerToTestHost(
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+        Tuple<Uri, string> executorUri,
+        RunContext runContext)
+    {
+        // If the adapter doesn't implement the new test executor interface we should attach to
+        // the default test host by default to preserve old behavior.
+        return executor?.Value is not ITestExecutor2 convertedExecutor
+               || convertedExecutor.ShouldAttachToTestHost(_executorUriVsTestList?[executorUri], runContext);
+    }
 
-            return this.executorUriVsTestList.Keys;
-        }
+    /// <summary>
+    /// Sends Session-End event on in-proc datacollectors
+    /// </summary>
+    protected override void SendSessionEnd()
+    {
+        _testCaseEventsHandler?.SendSessionEnd();
+    }
 
-        protected override void InvokeExecutor(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUri,
-            RunContext runContext,
-            IFrameworkHandle frameworkHandle)
+    /// <summary>
+    /// Sends Session-Start event on in-proc datacollectors
+    /// </summary>
+    protected override void SendSessionStart()
+    {
+        // Send session start with test sources in property bag for session start event args.
+        if (_testCaseEventsHandler == null)
         {
-            executor?.Value.RunTests(this.executorUriVsTestList[executorUri], runContext, frameworkHandle);
+            return;
         }
 
-        /// <inheritdoc />
-        protected override bool ShouldAttachDebuggerToTestHost(
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-            Tuple<Uri, string> executorUri,
-            RunContext runContext)
+        var properties = new Dictionary<string, object?>
         {
-            // If the adapter doesn't implement the new test executor interface we should attach to
-            // the default test host by default to preserve old behavior.
-            if (!(executor?.Value is ITestExecutor2 convertedExecutor))
-            {
-                return true;
-            }
+            { "TestSources", TestSourcesUtility.GetSources(_testCases)! }
+        };
 
-            return convertedExecutor.ShouldAttachToTestHost(this.executorUriVsTestList[executorUri], runContext);
-        }
+        _testCaseEventsHandler.SendSessionStart(properties);
+    }
 
-        /// <summary>
-        /// Sends Session-End event on in-proc datacollectors
-        /// </summary>
-        protected override void SendSessionEnd()
+    /// <summary>
+    /// Returns the executor Vs TestCase list
+    /// </summary>
+    private static Dictionary<Tuple<Uri, string>, List<TestCase>> GetExecutorVsTestCaseList(IEnumerable<TestCase> tests)
+    {
+        var result = new Dictionary<Tuple<Uri, string>, List<TestCase>>();
+        foreach (var test in tests)
         {
-            this.testCaseEventsHandler?.SendSessionEnd();
-        }
 
-        /// <summary>
-        /// Sends Session-Start event on in-proc datacollectors
-        /// </summary>
-        protected override void SendSessionStart()
-        {
-            // Send session start with test sources in property bag for session start event args.
-            if (this.testCaseEventsHandler == null)
+            // TODO: Fill this in with the right extension value.
+            var executorUriExtensionTuple = new Tuple<Uri, string>(
+                test.ExecutorUri,
+                ObjectModel.Constants.UnspecifiedAdapterPath);
+
+            if (result.TryGetValue(executorUriExtensionTuple, out List<TestCase>? testList))
             {
-                return;
+                testList.Add(test);
             }
-
-            var properties = new Dictionary<string, object>();
-            properties.Add("TestSources", TestSourcesUtility.GetSources(this.testCases));
-
-            this.testCaseEventsHandler.SendSessionStart(properties);
-        }
-
-        /// <summary>
-        /// Returns the executor Vs TestCase list
-        /// </summary>
-        private Dictionary<Tuple<Uri, string>, List<TestCase>> GetExecutorVsTestCaseList(IEnumerable<TestCase> tests)
-        {
-            var result = new Dictionary<Tuple<Uri, string>, List<TestCase>>();
-            foreach (var test in tests)
+            else
             {
-                List<TestCase> testList;
-
-                // TODO: Fill this in with the right extension value.
-                var executorUriExtensionTuple = new Tuple<Uri, string>(
-                    test.ExecutorUri,
-                    Constants.UnspecifiedAdapterPath);
-
-                if (result.TryGetValue(executorUriExtensionTuple, out testList))
-                {
-                    testList.Add(test);
-                }
-                else
-                {
-                    testList = new List<TestCase>();
-                    testList.Add(test);
-                    result.Add(executorUriExtensionTuple, testList);
-                }
+                testList = [test];
+                result.Add(executorUriExtensionTuple, testList);
             }
-
-            return result;
         }
+
+        return result;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/TestRunCache.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/TestRunCache.cs
index 05df170e30..dc2201a2bf 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/TestRunCache.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Execution/TestRunCache.cs
@@ -1,405 +1,374 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+
+/// <summary>
+/// Maintains a cache of last 'n' test results and maintains stats for the complete run.
+/// </summary>
+internal class TestRunCache : ITestRunCache
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Threading;
+    /// <summary>
+    /// Specifies whether the object is disposed or not.
+    /// </summary>
+    private bool _isDisposed;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using ObjectModel.Client;
+    /// <summary>
+    /// Test run stats
+    /// </summary>
+    private readonly Dictionary<TestOutcome, long> _runStats;
 
     /// <summary>
-    /// Maintains a cache of last 'n' test results and maintains stats for the complete run.
+    /// Total tests which have currently executed
     /// </summary>
-    internal class TestRunCache : ITestRunCache
-    {
-        #region Private Members
-
-        /// <summary>
-        /// Specifies whether the object is disposed or not.
-        /// </summary>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Test run stats
-        /// </summary>
-        private Dictionary<TestOutcome, long> runStats;
-
-        /// <summary>
-        /// Total tests which have currently executed
-        /// </summary>
-        private long totalExecutedTests;
-
-        /// <summary>
-        /// Callback used when cache is ready to report some test results/case.
-        /// </summary>
-        private OnCacheHit onCacheHit;
-
-        /// <summary>
-        /// Max size of the test result buffer
-        /// </summary>
-        private long cacheSize;
-
-        /// <summary>
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </summary>
-        private TimeSpan cacheTimeout;
-
-        /// <summary>
-        /// Timer for cache
-        /// </summary>
-        private Timer timer;
-
-        /// <summary>
-        /// Last time results were sent.
-        /// </summary>
-        private DateTime lastUpdate;
-
-        /// <summary>
-        /// The test case currently in progress.
-        /// </summary>
-        private ICollection<TestCase> inProgressTests;
-
-        /// <summary>
-        /// Test results buffer
-        /// </summary>
-        private ICollection<TestResult> testResults;
-
-        /// <summary>
-        /// Sync object
-        /// </summary>
-        private object syncObject;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCache"/> class.
-        /// </summary>
-        /// <param name="cacheSize"> The cache size. </param>
-        /// <param name="cacheTimeout"> The cache timeout. </param>
-        /// <param name="onCacheHit"> The on cache hit. </param>
-        internal TestRunCache(long cacheSize, TimeSpan cacheTimeout, OnCacheHit onCacheHit)
-        {
-            Debug.Assert(cacheSize > 0, "Buffer size cannot be less than zero");
-            Debug.Assert(onCacheHit != null, "Callback which listens for cache size limit cannot be null.");
-            Debug.Assert(cacheTimeout > TimeSpan.MinValue, "The cache timeout must be greater than min value.");
+    private long _totalExecutedTests;
 
-            if (cacheTimeout.TotalMilliseconds > int.MaxValue)
-            {
-                cacheTimeout = TimeSpan.FromMilliseconds(int.MaxValue / 2);
-            }
+    /// <summary>
+    /// Callback used when cache is ready to report some test results/case.
+    /// </summary>
+    private readonly OnCacheHit _onCacheHit;
 
-            this.cacheSize = cacheSize;
-            this.onCacheHit = onCacheHit;
-            this.lastUpdate = DateTime.Now;
-            this.cacheTimeout = cacheTimeout;
-            this.inProgressTests = new Collection<TestCase>();
-            this.testResults = new Collection<TestResult>();
-            this.runStats = new Dictionary<TestOutcome, long>();
-            this.syncObject = new object();
+    /// <summary>
+    /// Max size of the test result buffer
+    /// </summary>
+    private readonly long _cacheSize;
 
-            this.timer = new Timer(this.OnCacheTimeHit, this, cacheTimeout, cacheTimeout);
-        }
+    /// <summary>
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </summary>
+    private readonly TimeSpan _cacheTimeout;
+
+    /// <summary>
+    /// Timer for cache
+    /// </summary>
+    private readonly Timer _timer;
+
+    /// <summary>
+    /// Last time results were sent.
+    /// </summary>
+    private DateTime _lastUpdate;
+
+    /// <summary>
+    /// The test case currently in progress.
+    /// </summary>
+    private ICollection<TestCase> _inProgressTests;
+
+    /// <summary>
+    /// Test results buffer
+    /// </summary>
+    private ICollection<TestResult> _testResults;
+
+    /// <summary>
+    /// Sync object
+    /// </summary>
+    private readonly object _syncObject;
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCache"/> class.
+    /// </summary>
+    /// <param name="cacheSize"> The cache size. </param>
+    /// <param name="cacheTimeout"> The cache timeout. </param>
+    /// <param name="onCacheHit"> The on cache hit. </param>
+    internal TestRunCache(long cacheSize, TimeSpan cacheTimeout, OnCacheHit onCacheHit)
+    {
+        TPDebug.Assert(cacheSize > 0, "Buffer size cannot be less than zero");
+        TPDebug.Assert(onCacheHit != null, "Callback which listens for cache size limit cannot be null.");
+        TPDebug.Assert(cacheTimeout > TimeSpan.MinValue, "The cache timeout must be greater than min value.");
 
-        #region Delegates
+        if (cacheTimeout.TotalMilliseconds > int.MaxValue)
+        {
+            cacheTimeout = TimeSpan.FromMilliseconds(int.MaxValue / 2);
+        }
 
-        /// <summary>
-        /// Called when the cache is ready to report on the current status.
-        /// </summary>
-        internal delegate void OnCacheHit(TestRunStatistics testRunStats, ICollection<TestResult> results, ICollection<TestCase> inProgressTests);
+        _cacheSize = cacheSize;
+        _onCacheHit = onCacheHit;
+        _lastUpdate = DateTime.Now;
+        _cacheTimeout = cacheTimeout;
+        _inProgressTests = new Collection<TestCase>();
+        _testResults = new Collection<TestResult>();
+        _runStats = new Dictionary<TestOutcome, long>();
+        _syncObject = new object();
 
-        #endregion
+        _timer = new Timer(OnCacheTimeHit, this, cacheTimeout, cacheTimeout);
+    }
 
-        #region Properties
+    /// <summary>
+    /// Called when the cache is ready to report on the current status.
+    /// </summary>
+    internal delegate void OnCacheHit(TestRunStatistics testRunStats, ICollection<TestResult> results, ICollection<TestCase> inProgressTests);
 
-        /// <summary>
-        /// Gets the test results present in the cache currently.
-        /// </summary>
-        public ICollection<TestResult> TestResults
+    /// <summary>
+    /// Gets the test results present in the cache currently.
+    /// </summary>
+    public ICollection<TestResult> TestResults
+    {
+        get
         {
-            get
+            lock (_syncObject)
             {
-                lock (this.syncObject)
-                {
-                    return this.testResults;
-                }
+                return _testResults;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets the set of in-progress test cases present in the cache currently.
-        /// </summary>
-        public ICollection<TestCase> InProgressTests
+    /// <summary>
+    /// Gets the set of in-progress test cases present in the cache currently.
+    /// </summary>
+    public ICollection<TestCase> InProgressTests
+    {
+        get
         {
-            get
+            lock (_syncObject)
             {
-                lock (this.syncObject)
-                {
-                    return this.inProgressTests;
-                }
+                return _inProgressTests;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets the total executed tests.
-        /// </summary>
-        public long TotalExecutedTests
+    /// <summary>
+    /// Gets the total executed tests.
+    /// </summary>
+    public long TotalExecutedTests
+    {
+        get
         {
-            get
+            lock (_syncObject)
             {
-                lock (this.syncObject)
-                {
-                    return this.totalExecutedTests;
-                }
+                return _totalExecutedTests;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets the test run stats
-        /// </summary>
-        public TestRunStatistics TestRunStatistics
+    /// <summary>
+    /// Gets the test run stats
+    /// </summary>
+    public TestRunStatistics TestRunStatistics
+    {
+        get
         {
-            get
+            lock (_syncObject)
             {
-                lock (this.syncObject)
-                {
-                    var stats = new TestRunStatistics(new Dictionary<TestOutcome, long>(this.runStats));
-                    stats.ExecutedTests = this.TotalExecutedTests;
+                var stats = new TestRunStatistics(new Dictionary<TestOutcome, long>(_runStats));
+                stats.ExecutedTests = TotalExecutedTests;
 
-                    return stats;
-                }
+                return stats;
             }
         }
+    }
 
-        public IDictionary<string, int> AdapterTelemetry { get; set; } = new Dictionary<string, int>();
-        #endregion
+    public IDictionary<string, int> AdapterTelemetry { get; set; } = new Dictionary<string, int>();
+    /// <summary>
+    /// Disposes the cache
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
 
-        #region Public/internal methods
+        // Use SupressFinalize in case a subclass
+        // of this valueType implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Disposes the cache
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Notifies the cache that a test is starting.
+    /// This notification comes from the adapter to the engine which then calls into the cache.
+    /// </summary>
+    /// <param name="testCase"> The test Case. </param>
+    public void OnTestStarted(TestCase testCase)
+    {
+        lock (_syncObject)
         {
-            this.Dispose(true);
+            _inProgressTests.Add(testCase);
 
-            // Use SupressFinalize in case a subclass
-            // of this valueType implements a finalizer.
-            GC.SuppressFinalize(this);
+            CheckForCacheHit();
         }
+    }
 
-        /// <summary>
-        /// Notifies the cache that a test is starting.
-        /// This notification comes from the adapter to the engine which then calls into the cache.
-        /// </summary>
-        /// <param name="testCase"> The test Case. </param>
-        public void OnTestStarted(TestCase testCase)
+    /// <summary>
+    /// Notifies the cache of a new test result from the adapter.
+    /// </summary>
+    /// <param name="testResult"> The test result. </param>
+    public void OnNewTestResult(TestResult testResult)
+    {
+        lock (_syncObject)
         {
-            lock (this.syncObject)
-            {
-                this.inProgressTests.Add(testCase);
+            _totalExecutedTests++;
+            _testResults.Add(testResult);
+            MsTestV1TelemetryHelper.AddTelemetry(testResult, AdapterTelemetry);
 
-                this.CheckForCacheHit();
+            if (_runStats.TryGetValue(testResult.Outcome, out long count))
+            {
+                count++;
             }
-        }
-
-        /// <summary>
-        /// Notifies the cache of a new test result from the adapter.
-        /// </summary>
-        /// <param name="testResult"> The test result. </param>
-        public void OnNewTestResult(TestResult testResult)
-        {
-            lock (this.syncObject)
+            else
             {
-                this.totalExecutedTests++;
-                this.testResults.Add(testResult);
-                MSTestV1TelemetryHelper.AddTelemetry(testResult, this.AdapterTelemetry);
-
-                long count;
-                if (this.runStats.TryGetValue(testResult.Outcome, out count))
-                {
-                    count++;
-                }
-                else
-                {
-                    count = 1;
-                }
+                count = 1;
+            }
 
-                this.runStats[testResult.Outcome] = count;
+            _runStats[testResult.Outcome] = count;
 
-                this.RemoveInProgress(testResult);
+            RemoveInProgress(testResult);
 
-                this.CheckForCacheHit();
-            }
+            CheckForCacheHit();
         }
+    }
 
-        /// <summary>
-        /// Notifies the cache of a test completion.
-        /// </summary>
-        /// <param name="completedTest">
-        /// The completed Test.
-        /// </param>
-        /// <returns> True if this test has been removed from the list of in progress tests. </returns>
-        public bool OnTestCompletion(TestCase completedTest)
+    /// <summary>
+    /// Notifies the cache of a test completion.
+    /// </summary>
+    /// <param name="completedTest">
+    /// The completed Test.
+    /// </param>
+    /// <returns> True if this test has been removed from the list of in progress tests. </returns>
+    public bool OnTestCompletion(TestCase? completedTest)
+    {
+        lock (_syncObject)
         {
-            lock (this.syncObject)
+            if (completedTest == null)
             {
-                if (completedTest == null)
-                {
-                    EqtTrace.Warning("TestRunCache: completedTest is null");
-                    return false;
-                }
-
-                if (this.inProgressTests == null || this.inProgressTests.Count == 0)
-                {
-                    EqtTrace.Warning("TestRunCache: InProgressTests is null");
-                    return false;
-                }
-
-                var removed = this.inProgressTests.Remove(completedTest);
-                if (removed)
-                {
-                    return true;
-                }
-
-                // Try finding/removing a matching test corresponding to the completed test
-                var inProgressTest = this.inProgressTests.FirstOrDefault(inProgress => inProgress.Id == completedTest.Id);
-                if (inProgressTest != null)
-                {
-                    removed = this.inProgressTests.Remove(inProgressTest);
-                }
-
-                return removed;
+                EqtTrace.Warning("TestRunCache: completedTest is null");
+                return false;
             }
-        }
 
-        /// <summary>
-        /// Returns the last chunk
-        /// </summary>
-        /// <returns> The set of test results remaining in the cache. </returns>
-        public ICollection<TestResult> GetLastChunk()
-        {
-            lock (this.syncObject)
+            if (_inProgressTests == null || _inProgressTests.Count == 0)
             {
-                var lastChunk = this.testResults;
-
-                this.testResults = new Collection<TestResult>();
-
-                return lastChunk;
+                EqtTrace.Warning("TestRunCache: InProgressTests is null");
+                return false;
             }
-        }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        /// <param name="disposing"> Indicates if this needs to clean up managed resources. </param>
-        /// <remarks>
-        /// The dispose pattern is a best practice to differentiate between managed and native resources cleanup.
-        /// Even though this particular class does not have any native resources - honoring the pattern to be consistent throughout the code base.
-        /// </remarks>
-        protected virtual void Dispose(bool disposing)
-        {
-            // If you need thread safety, use a lock around these
-            // operations, as well as in your methods that use the resource.
-            if (disposing && !this.isDisposed)
+            var removed = _inProgressTests.Remove(completedTest);
+            if (removed)
             {
-                if (this.timer != null)
-                {
-                    this.timer.Dispose();
-                    this.timer = null;
-                }
-
-                // Indicate that the instance has been disposed.
-                this.isDisposed = true;
+                return true;
             }
-        }
 
-        #endregion
+            // Try finding/removing a matching test corresponding to the completed test
+            var inProgressTest = _inProgressTests.FirstOrDefault(inProgress => inProgress.Id == completedTest.Id);
+            if (inProgressTest != null)
+            {
+                removed = _inProgressTests.Remove(inProgressTest);
+            }
 
-        #region Private methods.
+            return removed;
+        }
+    }
 
-        /// <summary>
-        /// Checks if the cache timeout/size has been met.
-        /// </summary>
-        private void CheckForCacheHit()
+    /// <summary>
+    /// Returns the last chunk
+    /// </summary>
+    /// <returns> The set of test results remaining in the cache. </returns>
+    public ICollection<TestResult> GetLastChunk()
+    {
+        lock (_syncObject)
         {
-            lock (this.syncObject)
-            {
-                // Send results when the specified cache size has been reached or
-                // after the specified cache timeout has been hit.
-                var timeDelta = DateTime.Now - this.lastUpdate;
+            var lastChunk = _testResults;
 
-                var inProgressTestsCount = this.inProgressTests.Count;
+            _testResults = new Collection<TestResult>();
 
-                if ((this.testResults.Count + inProgressTestsCount) >= this.cacheSize || (timeDelta >= this.cacheTimeout && inProgressTestsCount > 0))
-                {
-                    this.SendResults();
-                }
-            }
+            return lastChunk;
         }
+    }
 
-        private void CheckForCacheHitOnTimer()
+    /// <summary>
+    /// The dispose.
+    /// </summary>
+    /// <param name="disposing"> Indicates if this needs to clean up managed resources. </param>
+    /// <remarks>
+    /// The dispose pattern is a best practice to differentiate between managed and native resources cleanup.
+    /// Even though this particular class does not have any native resources - honoring the pattern to be consistent throughout the code base.
+    /// </remarks>
+    protected virtual void Dispose(bool disposing)
+    {
+        // If you need thread safety, use a lock around these
+        // operations, as well as in your methods that use the resource.
+        if (disposing && !_isDisposed)
         {
-            lock (this.syncObject)
+            if (_timer != null)
             {
-                if (this.testResults.Count > 0 || this.inProgressTests.Count > 0)
-                {
-                    this.SendResults();
-                }
+                _timer.Dispose();
             }
+
+            // Indicate that the instance has been disposed.
+            _isDisposed = true;
         }
+    }
 
-        private void SendResults()
+    /// <summary>
+    /// Checks if the cache timeout/size has been met.
+    /// </summary>
+    private void CheckForCacheHit()
+    {
+        lock (_syncObject)
         {
-            // Pass on the buffer to the listener and clear the old one
-            this.onCacheHit(this.TestRunStatistics, this.testResults, this.inProgressTests);
-            this.testResults = new Collection<TestResult>();
-            this.inProgressTests = new Collection<TestCase>();
-            this.lastUpdate = DateTime.Now;
+            // Send results when the specified cache size has been reached or
+            // after the specified cache timeout has been hit.
+            var timeDelta = DateTime.Now - _lastUpdate;
 
-            // Reset the timer
-            this.timer.Change(this.cacheTimeout, this.cacheTimeout);
+            var inProgressTestsCount = _inProgressTests.Count;
 
-            EqtTrace.Verbose("TestRunCache: OnNewTestResult: Notified the onCacheHit callback.");
+            if ((_testResults.Count + inProgressTestsCount) >= _cacheSize || (timeDelta >= _cacheTimeout && inProgressTestsCount > 0))
+            {
+                SendResults();
+            }
         }
+    }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        private void OnCacheTimeHit(object state)
+    private void CheckForCacheHitOnTimer()
+    {
+        lock (_syncObject)
         {
-            lock (this.syncObject)
+            if (_testResults.Count > 0 || _inProgressTests.Count > 0)
             {
-                try
-                {
-                    this.CheckForCacheHitOnTimer();
-                }
-                catch (Exception ex)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("TestRunCache: OnCacheTimeHit: Exception occurred while checking for cache hit. {0}", ex);
-                    }
-                }
+                SendResults();
             }
         }
+    }
+
+    private void SendResults()
+    {
+        // Pass on the buffer to the listener and clear the old one
+        _onCacheHit(TestRunStatistics, _testResults, _inProgressTests);
+        _testResults = new Collection<TestResult>();
+        _inProgressTests = new Collection<TestCase>();
+        _lastUpdate = DateTime.Now;
 
-        private void RemoveInProgress(TestResult result)
+        // Reset the timer
+        _timer.Change(_cacheTimeout, _cacheTimeout);
+
+        EqtTrace.Verbose("TestRunCache: OnNewTestResult: Notified the onCacheHit callback.");
+    }
+
+    private void OnCacheTimeHit(object? state)
+    {
+        lock (_syncObject)
         {
-            var removed = this.OnTestCompletion(result.TestCase);
-            if (!removed)
+            try
             {
-                EqtTrace.Warning("TestRunCache: No test found corresponding to testResult '{0}' in inProgress list.", result.DisplayName);
+                CheckForCacheHitOnTimer();
+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Error("TestRunCache: OnCacheTimeHit: Exception occurred while checking for cache hit. {0}", ex);
             }
         }
+    }
 
-        #endregion
+    private void RemoveInProgress(TestResult result)
+    {
+        var removed = OnTestCompletion(result.TestCase);
+        if (!removed)
+        {
+            EqtTrace.Warning("TestRunCache: No test found corresponding to testResult '{0}' in inProgress list.", result.DisplayName);
+        }
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
index 6caae78d89..f25602a188 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
@@ -6,9 +6,29 @@
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Client.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("datacollector, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("datacollector.PlatformTests, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("testhost, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("testhost.x86, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-
+[assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.PlatformTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net48.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("testhost.net481.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Acceptance.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Interfaces/ITestRunCache.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Interfaces/ITestRunCache.cs
index c35d99e160..516fb348ec 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Interfaces/ITestRunCache.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Interfaces/ITestRunCache.cs
@@ -1,42 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution
-{
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using System;
+using System;
+using System.Collections.Generic;
 
-    /// <summary>
-    /// The cache for test execution information.
-    /// </summary>
-    internal interface ITestRunCache : IDisposable
-    {
-        #region Properties
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-        ICollection<TestResult> TestResults { get; }
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
 
-        ICollection<TestCase> InProgressTests { get; }
-        long TotalExecutedTests { get; }
-
-        TestRunStatistics TestRunStatistics { get; }
+/// <summary>
+/// The cache for test execution information.
+/// </summary>
+internal interface ITestRunCache : IDisposable
+{
+    ICollection<TestResult> TestResults { get; }
 
-        IDictionary<string, int> AdapterTelemetry { get; }
+    ICollection<TestCase> InProgressTests { get; }
+    long TotalExecutedTests { get; }
 
-        #endregion
+    TestRunStatistics TestRunStatistics { get; }
 
-        #region Methods
+    IDictionary<string, int> AdapterTelemetry { get; }
 
-        void OnTestStarted(TestCase testCase);
+    void OnTestStarted(TestCase testCase);
 
-        void OnNewTestResult(TestResult testResult);
+    void OnNewTestResult(TestResult testResult);
 
-        bool OnTestCompletion(TestCase completedTest);
+    bool OnTestCompletion(TestCase completedTest);
 
-        ICollection<TestResult> GetLastChunk();
+    ICollection<TestResult> GetLastChunk();
 
-        #endregion
-    }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
index a05965926c..c643cab47b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
@@ -1,19 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <!--<EnableCodeAnalysis>true</EnableCodeAnalysis>-->
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx">
+    <EmbeddedResource Update="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -27,16 +21,18 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Diagnostics.Process" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -44,13 +40,24 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Update="Resources\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
     </None>
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CrossPlatEngine</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.cs
new file mode 100644
index 0000000000..d8d6e09e8b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="StringUtils.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="StringUtils.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.tt b/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.tt
new file mode 100644
index 0000000000..5564c17b1e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="StringUtils.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="StringUtils.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => StringUtils.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/ArtifactProcessingManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/ArtifactProcessingManager.cs
new file mode 100644
index 0000000000..6290fce706
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/ArtifactProcessingManager.cs
@@ -0,0 +1,249 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+
+internal class ArtifactProcessingManager : IArtifactProcessingManager
+{
+    private const string RunsettingsFileName = "runsettings.xml";
+    private const string ExecutionCompleteFileName = "executionComplete.json";
+
+    private readonly string? _testSessionCorrelationId;
+    private readonly IFileHelper _fileHelper;
+    private readonly ITestRunAttachmentsProcessingManager _testRunAttachmentsProcessingManager;
+    private readonly string? _testSessionProcessArtifactFolder;
+    private readonly string? _processArtifactFolder;
+    private readonly IDataSerializer _dataSerialized;
+    private readonly ITestRunAttachmentsProcessingEventsHandler _testRunAttachmentsProcessingEventsHandler;
+    private readonly IFeatureFlag _featureFlag;
+
+    public ArtifactProcessingManager(string? testSessionCorrelationId) :
+        this(testSessionCorrelationId,
+            new FileHelper(),
+            new TestRunAttachmentsProcessingManager(TestPlatformEventSource.Instance, new DataCollectorAttachmentsProcessorsFactory()),
+            JsonDataSerializer.Instance,
+            new PostProcessingTestRunAttachmentsProcessingEventsHandler(ConsoleOutput.Instance),
+            FeatureFlag.Instance)
+    { }
+
+    public ArtifactProcessingManager(string? testSessionCorrelationId,
+        IFileHelper fileHelper,
+        ITestRunAttachmentsProcessingManager testRunAttachmentsProcessingManager,
+        IDataSerializer dataSerialized,
+        ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingEventsHandler,
+        IFeatureFlag featureFlag)
+    {
+        _fileHelper = fileHelper ?? throw new ArgumentNullException(nameof(fileHelper));
+        _testRunAttachmentsProcessingManager = testRunAttachmentsProcessingManager ?? throw new ArgumentNullException(nameof(testRunAttachmentsProcessingManager));
+        _dataSerialized = dataSerialized ?? throw new ArgumentNullException(nameof(dataSerialized));
+        _testRunAttachmentsProcessingEventsHandler = testRunAttachmentsProcessingEventsHandler ?? throw new ArgumentNullException(nameof(testRunAttachmentsProcessingEventsHandler));
+        _featureFlag = featureFlag ?? throw new ArgumentNullException(nameof(featureFlag));
+
+        // We don't validate for null, it's expected, we'll have testSessionCorrelationId only in case of .NET SDK run.
+        if (testSessionCorrelationId is not null)
+        {
+            _testSessionCorrelationId = testSessionCorrelationId;
+            _processArtifactFolder = Path.Combine(_fileHelper.GetTempPath(), _testSessionCorrelationId);
+#if NET5_0_OR_GREATER
+            var pid = Environment.ProcessId;
+#else
+            int pid;
+            using (var p = Process.GetCurrentProcess())
+                pid = p.Id;
+#endif
+            _testSessionProcessArtifactFolder = Path.Combine(_processArtifactFolder, $"{pid}_{Guid.NewGuid()}");
+        }
+    }
+
+    public void CollectArtifacts(TestRunCompleteEventArgs testRunCompleteEventArgs, string runSettingsXml)
+    {
+        ValidateArg.NotNull(testRunCompleteEventArgs, nameof(testRunCompleteEventArgs));
+        ValidateArg.NotNull(runSettingsXml, nameof(runSettingsXml));
+
+        if (_featureFlag.IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING))
+        {
+            EqtTrace.Verbose("ArtifactProcessingManager.CollectArtifacts: Feature disabled");
+            return;
+        }
+
+        if (_testSessionCorrelationId.IsNullOrEmpty())
+        {
+            EqtTrace.Verbose("ArtifactProcessingManager.CollectArtifacts: null testSessionCorrelationId");
+            return;
+        }
+
+        try
+        {
+            // We need to save in case of attachements, we'll show these at the end on console.
+            if ((testRunCompleteEventArgs?.AttachmentSets.Count) <= 0)
+            {
+                return;
+            }
+
+            EqtTrace.Verbose($"ArtifactProcessingManager.CollectArtifacts: Saving data collectors artifacts for post process into {_processArtifactFolder}");
+            Stopwatch watch = Stopwatch.StartNew();
+            TPDebug.Assert(_testSessionProcessArtifactFolder is not null, "_testSessionProcessArtifactFolder is null");
+            _fileHelper.CreateDirectory(_testSessionProcessArtifactFolder);
+            EqtTrace.Verbose($"ArtifactProcessingManager.CollectArtifacts: Persist runsettings \n{runSettingsXml}");
+            _fileHelper.WriteAllTextToFile(Path.Combine(_testSessionProcessArtifactFolder, RunsettingsFileName), runSettingsXml);
+            var serializedExecutionComplete = _dataSerialized.SerializePayload(MessageType.ExecutionComplete, testRunCompleteEventArgs);
+            EqtTrace.Verbose($"ArtifactProcessingManager.CollectArtifacts: Persist ExecutionComplete message \n{serializedExecutionComplete}");
+            _fileHelper.WriteAllTextToFile(Path.Combine(_testSessionProcessArtifactFolder, ExecutionCompleteFileName), serializedExecutionComplete);
+            EqtTrace.Verbose($"ArtifactProcessingManager.CollectArtifacts: Artifacts saved in {watch.Elapsed}");
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Error("ArtifactProcessingManager.CollectArtifacts: Exception during artifact post processing: " + e);
+        }
+    }
+
+    public async Task PostProcessArtifactsAsync()
+    {
+        if (_featureFlag.IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING))
+        {
+            EqtTrace.Verbose("ArtifactProcessingManager.PostProcessArtifacts: Feature disabled");
+            return;
+        }
+
+        // This is not expected, anyway we prefer avoid exception for post processing
+        if (_testSessionCorrelationId.IsNullOrEmpty())
+        {
+            EqtTrace.Error("ArtifactProcessingManager.PostProcessArtifacts: Unexpected null testSessionCorrelationId");
+            return;
+        }
+
+        TPDebug.Assert(_processArtifactFolder is not null, "_processArtifactFolder is null");
+        if (!_fileHelper.DirectoryExists(_processArtifactFolder))
+        {
+            EqtTrace.Verbose("ArtifactProcessingManager.PostProcessArtifacts: There are no artifacts to postprocess");
+            return;
+        }
+
+        var testArtifacts = LoadTestArtifacts();
+        if (testArtifacts?.Length > 0)
+        {
+            try
+            {
+                await DataCollectorsAttachmentsPostProcessing(testArtifacts);
+            }
+            finally
+            {
+                try
+                {
+                    _fileHelper.DeleteDirectory(_processArtifactFolder, true);
+                    EqtTrace.Verbose($"ArtifactProcessingManager.PostProcessArtifacts: Directory '{_processArtifactFolder}' removed.");
+                }
+                catch (Exception ex)
+                {
+                    EqtTrace.Error($"ArtifactProcessingManager.PostProcessArtifacts: Unable to removed directory the '{_processArtifactFolder}'.\n{ex}");
+                }
+            }
+        }
+        else
+        {
+            EqtTrace.Warning($"ArtifactProcessingManager.PostProcessArtifacts: There are no artifacts to postprocess also if the artifact directory '{_processArtifactFolder}' exits");
+        }
+    }
+
+    // We don't put everything inside a try/catch, we prefer get the exceptions because
+    // we don't want partial results, it could confuse the user, better have a "failure".
+    private async Task DataCollectorsAttachmentsPostProcessing(TestArtifacts[] testArtifacts)
+    {
+        // We take the biggest runsettings in size, it should be the one with more configuration.
+        // In future we can think to merge...but it's not easy for custom config, we could break something.
+        string? runsettingsFile = testArtifacts
+            .SelectMany(x => x.Artifacts.Where(x => x.Type == ArtifactType.Runsettings))
+            .OrderByDescending(x => _fileHelper.GetFileLength(x.FileName))
+            .FirstOrDefault()?.FileName;
+
+        string? runsettingsXml = null;
+        if (runsettingsFile is not null)
+        {
+            using var artifactStream = _fileHelper.GetStream(runsettingsFile, FileMode.Open, FileAccess.Read);
+            using var streamReader = new StreamReader(artifactStream);
+            runsettingsXml = await streamReader.ReadToEndAsync();
+            EqtTrace.Verbose($"ArtifactProcessingManager.MergeDataCollectorAttachments: Chosen runsettings \n{runsettingsXml}");
+        }
+        else
+        {
+            EqtTrace.Verbose($"ArtifactProcessingManager.MergeDataCollectorAttachments: Null runsettings");
+        }
+
+        HashSet<InvokedDataCollector> invokedDataCollectors = new();
+        List<AttachmentSet> attachments = new();
+        foreach (var artifact in testArtifacts
+            .SelectMany(x => x.Artifacts)
+            .Where(x => x.Type == ArtifactType.ExecutionComplete))
+        {
+            using var artifactStream = _fileHelper.GetStream(artifact.FileName, FileMode.Open, FileAccess.Read);
+            using var streamReader = new StreamReader(artifactStream);
+            string executionCompleteMessage = await streamReader.ReadToEndAsync();
+            EqtTrace.Verbose($"ArtifactProcessingManager.MergeDataCollectorAttachments: ExecutionComplete message \n{executionCompleteMessage}");
+            TestRunCompleteEventArgs? eventArgs = _dataSerialized.DeserializePayload<TestRunCompleteEventArgs>(_dataSerialized.DeserializeMessage(executionCompleteMessage));
+            foreach (var invokedDataCollector in eventArgs?.InvokedDataCollectors ?? Enumerable.Empty<InvokedDataCollector>())
+            {
+                invokedDataCollectors.Add(invokedDataCollector);
+            }
+            foreach (var attachmentSet in eventArgs?.AttachmentSets ?? Enumerable.Empty<AttachmentSet>())
+            {
+                attachments.Add(attachmentSet);
+            }
+        }
+
+        await _testRunAttachmentsProcessingManager.ProcessTestRunAttachmentsAsync(runsettingsXml,
+            new RequestData()
+            {
+                IsTelemetryOptedIn = IsTelemetryOptedIn(),
+                ProtocolConfig = ObjectModel.Constants.DefaultProtocolConfig
+            },
+            attachments,
+            invokedDataCollectors,
+            _testRunAttachmentsProcessingEventsHandler,
+            CancellationToken.None);
+    }
+
+    private TestArtifacts[] LoadTestArtifacts()
+    {
+        TPDebug.Assert(_processArtifactFolder is not null, "_processArtifactFolder is null");
+        return _fileHelper.GetFiles(_processArtifactFolder, "*.*", SearchOption.AllDirectories)
+            .Select(file => new { TestSessionId = Path.GetFileName(Path.GetDirectoryName(file)), Artifact = file })
+            .GroupBy(grp => grp.TestSessionId)
+            .Select(testSessionArtifact => new TestArtifacts(testSessionArtifact.Key!, testSessionArtifact.Select(x => ParseArtifact(x.Artifact)).Where(x => x is not null).ToArray()!)) // Bang because null dataflow doesn't yet backport learning from the `Where` clause
+            .ToArray();
+    }
+
+    private static Artifact? ParseArtifact(string fileName)
+    {
+        ValidateArg.NotNull(fileName, nameof(fileName));
+
+        return Path.GetFileName(fileName) switch
+        {
+            RunsettingsFileName => new Artifact(fileName, ArtifactType.Runsettings),
+            ExecutionCompleteFileName => new Artifact(fileName, ArtifactType.ExecutionComplete),
+            _ => null
+        };
+    }
+
+    private static bool IsTelemetryOptedIn() => Environment.GetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN")?.Equals("1", StringComparison.Ordinal) == true;
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/PostProcessingTestRunAttachmentsProcessingEventsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/PostProcessingTestRunAttachmentsProcessingEventsHandler.cs
new file mode 100644
index 0000000000..668f5d4cf4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/PostProcessingTestRunAttachmentsProcessingEventsHandler.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+
+internal class PostProcessingTestRunAttachmentsProcessingEventsHandler : ITestRunAttachmentsProcessingEventsHandler
+{
+    private readonly IOutput _consoleOutput;
+    private readonly ConcurrentBag<AttachmentSet> _attachmentsSet = new();
+
+    public PostProcessingTestRunAttachmentsProcessingEventsHandler(IOutput consoleOutput)
+    {
+        _consoleOutput = consoleOutput ?? throw new ArgumentNullException(nameof(consoleOutput));
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    { }
+
+    public void HandleRawMessage(string rawMessage)
+    { }
+
+    public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs attachmentsProcessingProgressEventArgs)
+    { }
+
+    public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
+    {
+        if (attachments is null)
+        {
+            EqtTrace.Warning($"PostProcessingTestRunAttachmentsProcessingEventsHandler.HandleProcessedAttachmentsChunk: Unexpected null attachments");
+            return;
+        }
+
+        foreach (var attachment in attachments)
+        {
+            _attachmentsSet.Add(attachment);
+        }
+    }
+
+    public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet>? lastChunk)
+    {
+        foreach (var attachment in lastChunk ?? [])
+        {
+            _attachmentsSet.Add(attachment);
+        }
+
+        if (!_attachmentsSet.IsEmpty)
+        {
+            // Make an empty line
+            _consoleOutput.WriteLine("", OutputLevel.Information);
+        }
+
+        _consoleOutput.Information(false, ConsoleColor.Gray, CommandLineResources.AttachmentsBanner);
+        foreach (var attachmentSet in _attachmentsSet)
+        {
+            foreach (var uriDataAttachment in attachmentSet.Attachments)
+            {
+                _consoleOutput.Information(false, ConsoleColor.Gray, CommandLineResources.AttachmentOutputFormat, uriDataAttachment.Uri.LocalPath);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/TestArtifacts.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/TestArtifacts.cs
new file mode 100644
index 0000000000..83bce736df
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PostProcessing/TestArtifacts.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+
+internal class TestArtifacts
+{
+    public TestArtifacts(string testSession, Artifact[] artifacts)
+    {
+        TestSession = testSession ?? throw new ArgumentNullException(nameof(testSession));
+        Artifacts = artifacts ?? throw new ArgumentNullException(nameof(artifacts));
+    }
+
+    public Artifact[] Artifacts { get; set; }
+
+    public string TestSession { get; }
+}
+
+internal class Artifact
+{
+    public Artifact(string fileName, ArtifactType type)
+    {
+        FileName = fileName ?? throw new ArgumentNullException(nameof(fileName));
+        Type = type;
+    }
+
+    public string FileName { get; }
+    public ArtifactType Type { get; }
+}
+
+internal enum ArtifactType
+{
+    ExecutionComplete,
+    Runsettings
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Properties/AssemblyInfo.cs
deleted file mode 100644
index e0dbc0ff3a..0000000000
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.VisualStudio.TestPlatform.CrossPlatEngine")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("dc31698e-13e9-41dd-8f32-3c4a7e4b147e")]
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..49374b7453
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,140 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo) -> bool
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.ConnectionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.ConnectionInfo.set -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.DiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.Dispose() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo? testProcessStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.OnMessageReceived(object? sender, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs! messageReceivedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.ProcessRequests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.ITestHostManagerFactory! testHostManagerFactory) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.SendExecutionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.SendLog(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel messageLevel, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.SendTestCases(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.SendTestRunStatistics(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.TestRequestHandler() -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.TestRequestHandler(Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer! dataSerializer, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndpointFactory! communicationEndpointFactory) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.TestRequestHandler(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo connectionInfo, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndpointFactory! communicationEndpointFactory, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.IDataSerializer! dataSerializer, Microsoft.VisualStudio.TestPlatform.Utilities.JobQueue<System.Action!>! jobQueue, System.Action<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!>! onLaunchAdapterProcessWithDebuggerAttachedAckReceived, System.Action<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message!>! onAttachDebuggerAckRecieved) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.WaitForRequestSenderConnection(int connectionTimeout) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.InIsolation.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.IsBeingDebugged.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.IsDataCollectionEnabled.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.KeepAlive.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.RunContext() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.SolutionDirectory.get -> string?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter.RunContext.TestRunDirectory.get -> string?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.Close() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.HandleRawMessage(string! rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.Initialize(bool skipDefaultAdapters) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.ProxyDiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender! testRequestSender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider! testHostManager) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.ProxyDiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo! testSessionInfo, System.Func<string!, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager!, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager!>! proxyOperationManagerCreator) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.CancellationTokenSource.get -> System.Threading.CancellationTokenSource!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.CancellationTokenSource.set -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.ProxyOperationManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData? requestData, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender! requestSender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider! testHostManager, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework! testhostManagerFramework) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.ProxyOperationManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData? requestData, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender! requestSender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider! testHostManager, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework? testhostManagerFramework, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IBaseProxy? baseProxy) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.RemoveNodesFromRunsettingsIfRequired(string? runsettingsXml, System.Action<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel, string!>! logMessage) -> string?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.RequestData.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.RequestData.set -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.RequestSender.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.RequestSender.set -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.TestHostManager.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.TestHostManager.set -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.TestHostManagerFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.ProxyOperationManagerWithDataCollection(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ITestRequestSender! requestSender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider! testHostManager, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework! testHostManagerFramework, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager! proxyDataCollectionManager) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo.RunSettings.get -> string?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo.Shared.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo.SourceDetails.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo.TestRuntimeProviderInfo(System.Type? type, bool shared, string? runSettings, System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceDetails) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo.Type.get -> System.Type?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Constants
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Constants.Constants() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters.AreTestCaseLevelEventsRequired.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters.DataCollectionEventsPort.get -> int
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters.DataCollectionParameters(bool areTestCaseLevelEventsRequired, System.Collections.Generic.IDictionary<string!, string?>? environmentVariables, int dataCollectionEventsPort) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters.EnvironmentVariables.get -> System.Collections.Generic.IDictionary<string!, string?>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionResult
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionResult.Attachments.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionResult.DataCollectionResult(System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? attachments, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>? invokedDataCollectors) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionResult.InvokedDataCollectors.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IDataCollectorsSettingsProvider
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IDataCollectorsSettingsProvider.Settings.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.AfterTestRunEnd(bool isCanceled, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler! runEventsHandler) -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionResult!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.BeforeTestRunStart(bool resetDataCollectors, bool isRunStartingNow, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler! runEventsHandler) -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.Initialize() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.SettingsXml.get -> string?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.Sources.get -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces.IProxyDataCollectionManager.TestHostLaunched(int processId) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryContext
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryContext.DiscoveryContext() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryContext.GetTestCaseFilter(System.Collections.Generic.IEnumerable<string!>? supportedProperties, System.Func<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty?>! propertyProvider) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryContext.RunSettings.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.Abort() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.DiscoverTests(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.DiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.DiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource! testPlatformEventSource) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery.DiscoveryManager.Initialize(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2? eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.Abort(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.Cancel(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.ExecutionManager(Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces.ITestPlatformEventSource! testPlatformEventSource, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.ExecutionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.Initialize(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler? testMessageEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.StartTestRun(System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>! adapterSourceMap, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler? testCaseEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! runEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution.ExecutionManager.StartTestRun(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, string? package, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol.TestExecutionContext! testExecutionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestCaseEventsHandler? testCaseEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler! runEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager.ProxyTestSessionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria! criteria, int maxTesthostCount, System.Func<Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo!, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager?>! proxyCreator, System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.TestRuntimeProviderInfo!>! runtimeProviders) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.GetDiscoveryManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyDiscoveryManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.GetExecutionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyExecutionManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.GetExtensionManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestExtensionManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.GetLoggerManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ITestLoggerManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.GetTestSessionManager(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria! testSessionCriteria, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.IProxyTestSessionManager?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.TestEngine() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestEngine.TestEngine(Microsoft.VisualStudio.TestPlatform.Common.Hosting.TestRuntimeProviderManager! testHostProviderManager, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper! processHelper) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestExtensionManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestExtensionManager.ClearExtensions() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestExtensionManager.TestExtensionManager() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestExtensionManager.UseAdditionalExtensions(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, bool skipExtensionFilters) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.GetDiscoveryManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IDiscoveryManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.GetExecutionManager() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol.IExecutionManager!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestHostManagerFactory.TestHostManagerFactory(bool telemetryOptedIn) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool
+override Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.Initialize(bool skipDefaultAdapters) -> void
+override Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.SetupChannel(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler! eventHandler) -> bool
+override Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManagerWithDataCollection.UpdateTestProcessStartInfo(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
+static Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters.CreateDefaultParameterInstance() -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.DataCollectionParameters!
+static Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool.Instance.get -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool!
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestHandler.InitializeCommunication() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.UpdateTestProcessStartInfo(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.Close() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.Initialize(bool skipDefaultAdapters) -> void
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.SetupChannel(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler! eventHandler) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.SetupChannel(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager.UpdateTestProcessStartInfo(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager.DequeueProxy(string! source, string? runSettings) -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager!
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager.EnqueueProxy(int proxyId) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager.StartSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager.StopSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool.AddSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo! testSessionInfo, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ProxyTestSessionManager! proxyManager) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool.KillSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo! testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool.ReturnProxy(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo! testSessionInfo, int proxyId) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestSessionPool.TryTakeProxy(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo! testSessionInfo, string! source, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData) -> Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyOperationManager?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.ProxyDiscoveryManager.InitializeDiscovery(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! eventHandler, bool skipDefaultAdapters) -> void
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs
index 9fb9692fc8..5f3bfcb978 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs
@@ -11,7 +11,8 @@
 namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources {
     using System;
     using System.Reflection;
- 
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,19 +20,19 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -45,7 +46,7 @@ internal Resources() {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -59,7 +60,7 @@ internal Resources() {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to {0} Access denied while trying to create &quot;TestResults&quot; folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges..
         /// </summary>
@@ -68,7 +69,7 @@ internal static string AccessDenied {
                 return ResourceManager.GetString("AccessDenied", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Cannot attach the debugger to the default test host with process ID: {0}..
         /// </summary>
@@ -77,7 +78,25 @@ internal static string AttachDebuggerToDefaultTestHostFailure {
                 return ResourceManager.GetString("AttachDebuggerToDefaultTestHostFailure", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to   {0}.
+        /// </summary>
+        internal static string AttachmentOutputFormat {
+            get {
+                return ResourceManager.GetString("AttachmentOutputFormat", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Attachments:.
+        /// </summary>
+        internal static string AttachmentsBanner {
+            get {
+                return ResourceManager.GetString("AttachmentsBanner", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to DataCollector debugging is enabled. Please attach debugger to datacollector process to continue..
         /// </summary>
@@ -86,16 +105,16 @@ internal static string DataCollectorDebuggerWarning {
                 return ResourceManager.GetString("DataCollectorDebuggerWarning", resourceCulture);
             }
         }
-        
+
         /// <summary>
-        ///   Looks up a localized string similar to Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details..
+        ///   Looks up a localized string similar to Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details..
         /// </summary>
         internal static string DeprecatedAdapterPath {
             get {
                 return ResourceManager.GetString("DeprecatedAdapterPath", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Exception occurred while instantiating discoverer : {0}.
         /// </summary>
@@ -104,7 +123,7 @@ internal static string DiscovererInstantiationException {
                 return ResourceManager.GetString("DiscovererInstantiationException", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Multiple test adapters with the same uri &apos;{0}&apos; were found. Ignoring adapter &apos;{1}&apos;. Please uninstall the conflicting adapter(s) to avoid this warning..
         /// </summary>
@@ -113,7 +132,7 @@ internal static string DuplicateAdaptersFound {
                 return ResourceManager.GetString("DuplicateAdaptersFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Ignoring the specified duplicate source &apos;{0}&apos;..
         /// </summary>
@@ -122,7 +141,7 @@ internal static string DuplicateSource {
                 return ResourceManager.GetString("DuplicateSource", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to An exception occurred while test discoverer &apos;{0}&apos; was loading tests. Exception: {1}.
         /// </summary>
@@ -131,7 +150,7 @@ internal static string ExceptionFromLoadTests {
                 return ResourceManager.GetString("ExceptionFromLoadTests", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to An exception occurred while invoking executor &apos;{0}&apos;: {1}.
         /// </summary>
@@ -140,7 +159,7 @@ internal static string ExceptionFromRunTests {
                 return ResourceManager.GetString("ExceptionFromRunTests", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to ExecutionThreadApartmentState option not supported for framework: {0}..
         /// </summary>
@@ -149,7 +168,7 @@ internal static string ExecutionThreadApartmentStateNotSupportedForFramework {
                 return ResourceManager.GetString("ExecutionThreadApartmentStateNotSupportedForFramework", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Failed to launch testhost with error: {0}.
         /// </summary>
@@ -158,7 +177,7 @@ internal static string FailedToLaunchTestHost {
                 return ResourceManager.GetString("FailedToLaunchTestHost", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Could not find file {0}..
         /// </summary>
@@ -167,7 +186,7 @@ internal static string FileNotFound {
                 return ResourceManager.GetString("FileNotFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Host debugging is enabled. Please attach debugger to testhost process to continue..
         /// </summary>
@@ -176,7 +195,7 @@ internal static string HostDebuggerWarning {
                 return ResourceManager.GetString("HostDebuggerWarning", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in..
         /// </summary>
@@ -185,7 +204,7 @@ internal static string IgnoringExecutorAsNoDefaultExecutorUriAttribute {
                 return ResourceManager.GetString("IgnoringExecutorAsNoDefaultExecutorUriAttribute", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Failed to initialize client proxy: could not connect to test process..
         /// </summary>
@@ -194,7 +213,7 @@ internal static string InitializationFailed {
                 return ResourceManager.GetString("InitializationFailed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to This operation is not allowed in the context of a non-debug run..
         /// </summary>
@@ -203,7 +222,7 @@ internal static string LaunchDebugProcessNotAllowedForANonDebugRun {
                 return ResourceManager.GetString("LaunchDebugProcessNotAllowedForANonDebugRun", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Could not find an available proxy to deque..
         /// </summary>
@@ -212,7 +231,7 @@ internal static string NoAvailableProxyForDeque {
                 return ResourceManager.GetString("NoAvailableProxyForDeque", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Could not find {0}. Make sure that the dotnet is installed on the machine..
         /// </summary>
@@ -221,7 +240,7 @@ internal static string NoDotnetExeFound {
                 return ResourceManager.GetString("NoDotnetExeFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Could not find test executor with URI &apos;{0}&apos;.  Make sure that the test executor is installed and supports .net runtime version {1}..
         /// </summary>
@@ -230,7 +249,7 @@ internal static string NoMatchingExecutor {
                 return ResourceManager.GetString("NoMatchingExecutor", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Could not find extensions: {0}.
         /// </summary>
@@ -239,7 +258,7 @@ internal static string NonExistingExtensions {
                 return ResourceManager.GetString("NonExistingExtensions", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to The runsettings changed between the time when the test session was established and the time of the current run/discovery request..
         /// </summary>
@@ -248,7 +267,7 @@ internal static string NoProxyMatchesDescription {
                 return ResourceManager.GetString("NoProxyMatchesDescription", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Proxy with id {0} is not managed by the current session manager..
         /// </summary>
@@ -257,16 +276,25 @@ internal static string NoSuchProxyId {
                 return ResourceManager.GetString("NoSuchProxyId", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to No suitable test runtime provider was found:.
+        /// </summary>
+        internal static string NoSuitableRuntimeProviderFound {
+            get {
+                return ResourceManager.GetString("NoSuitableRuntimeProviderFound", resourceCulture);
+            }
+        }
+
         /// <summary>
-        ///   Looks up a localized string similar to No suitable test runtime provider found for this run..
+        ///   Looks up a localized string similar to No suitable test runtime provider was found for any source in this run..
         /// </summary>
         internal static string NoTestHostProviderFound {
             get {
                 return ResourceManager.GetString("NoTestHostProviderFound", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to No test matches the given testcase filter `{0}` in {1}.
         /// </summary>
@@ -275,7 +303,7 @@ internal static string NoTestsAvailableForGivenTestCaseFilter {
                 return ResourceManager.GetString("NoTestsAvailableForGivenTestCaseFilter", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to None of the specified source(s) &apos;{0}&apos; is valid. Fix the above errors/warnings and then try again. .
         /// </summary>
@@ -284,7 +312,7 @@ internal static string NoValidSourceFoundForDiscovery {
                 return ResourceManager.GetString("NoValidSourceFoundForDiscovery", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0..
         /// </summary>
@@ -293,7 +321,7 @@ internal static string OldTestHostIsGettingUsed {
                 return ResourceManager.GetString("OldTestHostIsGettingUsed", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Proxy with id {0} is already available and cannot be re-enqueued..
         /// </summary>
@@ -302,7 +330,16 @@ internal static string ProxyIsAlreadyAvailable {
                 return ResourceManager.GetString("ProxyIsAlreadyAvailable", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Skipping source:.
+        /// </summary>
+        internal static string SkippingSource {
+            get {
+                return ResourceManager.GetString("SkippingSource", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to , .
         /// </summary>
@@ -311,7 +348,7 @@ internal static string StringSeperator {
                 return ResourceManager.GetString("StringSeperator", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Discovery of tests cancelled..
         /// </summary>
@@ -320,7 +357,7 @@ internal static string TestDiscoveryCancelled {
                 return ResourceManager.GetString("TestDiscoveryCancelled", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Logging TestHost Diagnostics in file: {0}.
         /// </summary>
@@ -329,16 +366,16 @@ internal static string TesthostDiagLogOutputFile {
                 return ResourceManager.GetString("TesthostDiagLogOutputFile", resourceCulture);
             }
         }
-        
+
         /// <summary>
-        ///   Looks up a localized string similar to Testhost process exited with error: {0}. Please check the diagnostic logs for more information..
+        ///   Looks up a localized string similar to Testhost process for source(s) &apos;{0}&apos; exited with error: {1}. Please check the diagnostic logs for more information..
         /// </summary>
         internal static string TestHostExitedWithError {
             get {
                 return ResourceManager.GetString("TestHostExitedWithError", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again..
         /// </summary>
@@ -347,7 +384,7 @@ internal static string TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheS
                 return ResourceManager.GetString("TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1})..
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx
index 74fc12636d..15d57e9d62 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -169,7 +169,8 @@
     <value>Logging TestHost Diagnostics in file: {0}</value>
   </data>
   <data name="TestHostExitedWithError" xml:space="preserve">
-    <value>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</value>
+    <value>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</value>
+    <comment>{0} a source, or very rarely list of sources, {1} the output error.</comment>
   </data>
   <data name="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources" xml:space="preserve">
     <value>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</value>
@@ -190,7 +191,7 @@
     <value>Could not find extensions: {0}</value>
   </data>
   <data name="DeprecatedAdapterPath" xml:space="preserve">
-    <value>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</value>
+    <value>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</value>
   </data>
   <data name="NoTestsAvailableForGivenTestCaseFilter" xml:space="preserve">
     <value>No test matches the given testcase filter `{0}` in {1}</value>
@@ -214,9 +215,21 @@
     <value>Proxy with id {0} is already available and cannot be re-enqueued.</value>
   </data>
   <data name="NoTestHostProviderFound" xml:space="preserve">
-    <value>No suitable test runtime provider found for this run.</value>
+    <value>No suitable test runtime provider was found for any source in this run.</value>
   </data>
   <data name="NoProxyMatchesDescription" xml:space="preserve">
     <value>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="AttachmentOutputFormat" xml:space="preserve">
+    <value>  {0}</value>
+  </data>
+  <data name="AttachmentsBanner" xml:space="preserve">
+    <value>Attachments:</value>
+  </data>
+  <data name="NoSuitableRuntimeProviderFound" xml:space="preserve">
+    <value>No suitable test runtime provider was found:</value>
+  </data>
+  <data name="SkippingSource" xml:space="preserve">
+    <value>Skipping source:</value>
+  </data>
+</root>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
index c112af0fb3..6bfe73ae1c 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.cs.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Při vytváření instance nástroje zjišťování došlo k výjimce: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Našlo se více adaptérů testů se stejným identifikátorem URI {0}. Ignoruje se adaptér {1}. Pokud se chcete tomuto upozornění vyhnout, odinstalujte prosím konfliktní adaptéry.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Ignoruje se zadaný duplicitní zdroj {0}.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">V době, kdy nástroj zjišťování testů {0} načítal testy, došlo k výjimce. Výjimka: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Při volání prováděcího modulu {0} došlo k výjimce: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít soubor {0}.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Je povolené ladění hostitele. Pokud chcete pokračovat, připojte prosím ladicí program k procesu testhost.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Ignoruje se prováděcí modul testování, který odpovídá nástroji zjišťování testů {0}, protože nástroj zjišťování nemá atribut DefaultExecutorUri. Možná bude nutné přeinstalovat doplněk adaptéru testu.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se inicializovat proxy klienta: nešlo se připojit k procesu testu.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Tato operace se v kontextu běhu bez ladění nepovoluje.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Nepovedlo se najít prováděcí modul testování s identifikátorem URI {0}. Ujistěte se, že je prováděcí modul testování nainstalovaný a že podporuje .NET runtime verze {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Žádný ze zadaných zdrojů {0} není platný. Opravte chyby/upozornění výše a zkuste to znovu. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Filtru neodpovídá žádný test, protože obsahuje nejméně jednu vlastnost, která není platná ({0}). Zadejte výraz filtru, který obsahuje platné vlastnosti ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">Nejde najít {0}. Ujistěte se, že na počítači je nainstalovaný dotnet.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Proces testhost se ukončil s chybou: {0}. Další informace najdete v diagnostických protokolech.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">Je povolené ladění kolekce dat. Pokud chcete pokračovat, připojte prosím ladicí program k procesu kolekce dat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">V {0} nejsou dostupné žádné testy. Ujistěte se, že nástroje pro zjišťování a provádění testů jsou zaregistrované a že jsou vhodně zvolená nastavení verzí platformy a architektury, a zkuste to znovu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Protokolování diagnostiky TestHost v souboru: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Nepovedlo se spustit hostitele testu kvůli této chybě: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">Možnost ExecutionThreadApartmentState se pro rozhraní nepodporuje: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Používáte starší verzi sady Microsoft.NET.Test.Sdk. Přejděte prosím na verzi 15.3.0 nebo vyšší.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Nepovedlo se najít rozšíření: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Mění se vyhledávání adaptéru. Pro další informace se podívejte sem: https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Žádný test neodpovídá danému filtru testovacích případů {0} v: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Zjišťování testů bylo zrušeno.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Ladicí program se nedá připojit k výchozímu hostiteli testů s ID procesu {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Nepovedlo se najít dostupný proxy server, který se má odebrat z fronty.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Aktuální správce relace nespravuje proxy s ID {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Proxy s ID {0} je už k dispozici a nedá se znovu zařadit do fronty.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Při vytváření instance nástroje zjišťování došlo k výjimce: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Našlo se více adaptérů testů se stejným identifikátorem URI {0}. Ignoruje se adaptér {1}. Pokud se chcete tomuto upozornění vyhnout, odinstalujte prosím konfliktní adaptéry.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Ignoruje se zadaný duplicitní zdroj {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">V době, kdy nástroj zjišťování testů {0} načítal testy, došlo k výjimce. Výjimka: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Při volání prováděcího modulu {0} došlo k výjimce: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Nepovedlo se najít soubor {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Je povolené ladění hostitele. Pokud chcete pokračovat, připojte prosím ladicí program k procesu testhost.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Ignoruje se prováděcí modul testování, který odpovídá nástroji zjišťování testů {0}, protože nástroj zjišťování nemá atribut DefaultExecutorUri. Možná bude nutné přeinstalovat doplněk adaptéru testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Nepovedlo se inicializovat proxy klienta: nešlo se připojit k procesu testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Tato operace se v kontextu běhu bez ladění nepovoluje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Nepovedlo se najít prováděcí modul testování s identifikátorem URI {0}. Ujistěte se, že je prováděcí modul testování nainstalovaný a že podporuje .NET runtime verze {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Žádný ze zadaných zdrojů {0} není platný. Opravte chyby/upozornění výše a zkuste to znovu. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Filtru neodpovídá žádný test, protože obsahuje nejméně jednu vlastnost, která není platná ({0}). Zadejte výraz filtru, který obsahuje platné vlastnosti ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">Nejde najít {0}. Ujistěte se, že na počítači je nainstalovaný dotnet.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Proces testhost pro zdroj(e) {0} se ukončil s chybou: {1}. Další informace najdete v diagnostických protokolech.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">Je povolené ladění kolekce dat. Pokud chcete pokračovat, připojte prosím ladicí program k procesu kolekce dat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">V {0} nejsou dostupné žádné testy. Ujistěte se, že nástroje pro zjišťování a provádění testů jsou zaregistrované a že jsou vhodně zvolená nastavení verzí platformy a architektury, a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Protokolování diagnostiky TestHost v souboru: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Nepovedlo se spustit hostitele testu kvůli této chybě: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">Možnost ExecutionThreadApartmentState se pro rozhraní nepodporuje: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Používáte starší verzi sady Microsoft.NET.Test.Sdk. Přejděte prosím na verzi 15.3.0 nebo vyšší.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Nepovedlo se najít rozšíření: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Mění se vyhledávání adaptéru. Pro další informace se podívejte sem: https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Žádný test neodpovídá danému filtru testovacích případů {0} v: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Zjišťování testů bylo zrušeno.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Ladicí program se nedá připojit k výchozímu hostiteli testů s ID procesu {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Při pokusu o vytvoření složky TestResults v uvedeném umístění došlo k odepření přístupu. Tato výjimka se vyvolala, protože spouštíte vstest.console.exe ze složky, která vyžaduje, abyste měli přístup pro zápis. Pokud chcete problém vyřešit, spusťte prosím vstest.console.exe ze složky, ve které máte oprávnění k zápisu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Nepovedlo se najít dostupný proxy server, který se má odebrat z fronty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Aktuální správce relace nespravuje proxy s ID {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Proxy s ID {0} je už k dispozici a nedá se znovu zařadit do fronty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">V tomto běhu se nenašel žádný vhodný zprostředkovatel testovacího modulu runtime pro žádný zdroj.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Soubor runsettings se změnil mezi časem, kdy byla relace testu vytvořena, a časem aktuálního požadavku spuštění nebo zjišťování.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Přílohy:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Nenašel se žádný vhodný zprostředkovatel testovacího modulu runtime:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Přeskočení zdroje:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
index 16b3ddca1d..a1b4810b3a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.de.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Ausnahme beim Instanziieren des Discoverers: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Mehrere Testadapter mit dem gleichen URI "{0}" wurden gefunden. Der Adapter "{1}" wird ignoriert. Deinstallieren Sie die in Konflikt stehenden Adapter, um diese Warnung zu vermeiden.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Die angegebene doppelte Quelle "{0}" wird ignoriert.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Ausnahme beim Laden von Tests durch den Testdiscoverer "{0}". Ausnahme: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Ausnahme beim Aufrufen von Executor "{0}": {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Die Datei "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Hostdebuggen ist aktiviert. Fügen Sie den Debugger an den Testhostprozess an, um den Vorgang fortzusetzen.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Der Testexecutor, der dem Testdiscoverer "{0}" entspricht, wird ignoriert, weil der Discoverer nicht das DefaultExecutorUri-Attribut aufweist. Sie müssen ggf. das Testadapter-Add-In erneut installieren.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Fehler beim Initialisieren des Clientproxys: Es konnte keine Verbindung mit dem Testprozess hergestellt werden.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Dieser Vorgang ist im Kontext einer Nichtdebugausführung unzulässig.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Der Testexecutor mit dem URI "{0}" wurde nicht gefunden. Stellen Sie sicher, dass der Testexecutor installiert ist und .NET Runtime-Version {1} unterstützt.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Keine der angegebenen Quellen "{0}" ist gültig. Beheben Sie die oben aufgeführten Fehler/Warnungen, und versuchen Sie es erneut. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Es stimmten keine Tests mit dem Filter überein, weil er mindestens eine ungültige Eigenschaft enthält ({0}). Geben Sie einen Filterausdruck mit gültigen Eigenschaften an ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0} wurde nicht gefunden. Stellen Sie sicher, dass das dotnet auf dem Computer installiert ist.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Der TestHost-Prozess wurde mit folgendem Fehler beendet: {0}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">DataCollector-Debugging ist aktiviert. Fügen Sie den Debugger an den Datensammlerprozess an, um den Vorgang fortzusetzen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die Testdiscoverer und -executors registriert und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Die TestHost-Diagnose wird in der Datei {0} protokolliert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Fehler beim Starten von Testhost: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">Die ExecutionThreadApartmentState-Option wird für das Framework nicht unterstützt: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Sie verwenden eine ältere Version von Microsoft.NET.Test.Sdk. Wechseln Sie zu Version 15.3.0 oder höher.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Erweiterungen nicht gefunden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Die Adaptersuche wird geändert. Weitere Informationen finden Sie unter https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Kein Test entspricht dem angegebenen Testfallfilter "{0}" in "{1}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Die Ermittlung von Tests wurde abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Der Debugger kann nicht an den Standardtesthost mit der Prozess-ID {0} angefügt werden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" in einem Ordner ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Es wurde kein verfügbarer Proxy für die Deque gefunden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Der Proxy mit der ID {0} wird nicht vom aktuellen Sitzungs-Manager verwaltet.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Der Proxy mit der ID {0} ist bereits verfügbar und kann nicht erneut in die Warteschlange eingereiht werden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Ausnahme beim Instanziieren des Discoverers: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Mehrere Testadapter mit dem gleichen URI "{0}" wurden gefunden. Der Adapter "{1}" wird ignoriert. Deinstallieren Sie die in Konflikt stehenden Adapter, um diese Warnung zu vermeiden.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Die angegebene doppelte Quelle "{0}" wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Ausnahme beim Laden von Tests durch den Testdiscoverer "{0}". Ausnahme: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Ausnahme beim Aufrufen von Executor "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Die Datei "{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Hostdebuggen ist aktiviert. Fügen Sie den Debugger an den Testhostprozess an, um den Vorgang fortzusetzen.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Der Testexecutor, der dem Testdiscoverer "{0}" entspricht, wird ignoriert, weil der Discoverer nicht das DefaultExecutorUri-Attribut aufweist. Sie müssen ggf. das Testadapter-Add-In erneut installieren.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Fehler beim Initialisieren des Clientproxys: Es konnte keine Verbindung mit dem Testprozess hergestellt werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Dieser Vorgang ist im Kontext einer Nichtdebugausführung unzulässig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Der Testexecutor mit dem URI "{0}" wurde nicht gefunden. Stellen Sie sicher, dass der Testexecutor installiert ist und .NET Runtime-Version {1} unterstützt.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Keine der angegebenen Quellen "{0}" ist gültig. Beheben Sie die oben aufgeführten Fehler/Warnungen, und versuchen Sie es erneut. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Es stimmten keine Tests mit dem Filter überein, weil er mindestens eine ungültige Eigenschaft enthält ({0}). Geben Sie einen Filterausdruck mit gültigen Eigenschaften an ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0} wurde nicht gefunden. Stellen Sie sicher, dass das dotnet auf dem Computer installiert ist.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Der TestHost-Prozess für die Quelle(n) {0} wurde mit folgendem Fehler beendet: {1}. Weitere Informationen finden Sie in den Diagnoseprotokollen.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">DataCollector-Debugging ist aktiviert. Fügen Sie den Debugger an den Datensammlerprozess an, um den Vorgang fortzusetzen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die Testdiscoverer und -executors registriert und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Die TestHost-Diagnose wird in der Datei {0} protokolliert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Fehler beim Starten von Testhost: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">Die ExecutionThreadApartmentState-Option wird für das Framework nicht unterstützt: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Sie verwenden eine ältere Version von Microsoft.NET.Test.Sdk. Wechseln Sie zu Version 15.3.0 oder höher.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Erweiterungen nicht gefunden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Die Adaptersuche wird geändert. Weitere Informationen finden Sie unter „https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap“.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Kein Test entspricht dem angegebenen Testfallfilter "{0}" in "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Die Ermittlung von Tests wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Der Debugger kann nicht an den Standardtesthost mit der Prozess-ID {0} angefügt werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Beim Erstellen des Ordners "TestResults" am angegebenen Speicherort wurde der Zugriff verweigert. Sie erhalten diese Ausnahme, weil Sie "vstest.console.exe" in einem Ordner ausführen, für den Schreibzugriff erforderlich ist. So beheben Sie das Problem: Führen Sie "vstest.console.exe" in einem Ordner aus, für den Sie Schreibberechtigungen besitzen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Es wurde kein verfügbarer Proxy für die Deque gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Der Proxy mit der ID {0} wird nicht vom aktuellen Sitzungs-Manager verwaltet.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Der Proxy mit der ID {0} ist bereits verfügbar und kann nicht erneut in die Warteschlange eingereiht werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Für eine Quelle in dieser Ausführung wurde kein geeigneter Testruntimeanbieter gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Die Ausführungseinstellungen wurden zwischen dem Zeitpunkt, zu dem die Testsitzung eingerichtet wurde, und dem Zeitpunkt der aktuellen Ausführungs-/Ermittlungsanforderung geändert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Anlagen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Es wurde kein geeigneter Testruntimeanbieter gefunden:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Quelle wird übersprungen:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
index 55dd60a1b5..4f88016d94 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.es.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción al crear una instancia del programa de detección: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Se han encontrado varios adaptadores de prueba con el mismo URI ({0}). Se omitirá el adaptador '{1}'. Desinstale los adaptadores que están en conflicto para evitar esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Se omitirá el origen duplicado especificado ({0}).</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción cuando el programa de detección de pruebas '{0}' estaba cargando pruebas. Excepción: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción al invocar al ejecutor '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">No se encuentra el archivo {0}.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">La depuración host está habilitada. Asocie el depurador al proceso de host de prueba para continuar.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Se omitirá el ejecutor de pruebas correspondiente al programa de detección de pruebas {0}, porque este último no tiene el atributo DefaultExecutorUri. Puede ser necesario reinstalar el complemento del adaptador de prueba.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">No se pudo inicializar el proxy de cliente: no se puede conectar al proceso de prueba.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Esta operación no se permite en el contexto de una ejecución que no sea de depuración.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">No se encuentra el ejecutor de pruebas con el URI '{0}'. Asegúrese de que el ejecutor de pruebas está instalado y admite el entorno de ejecución .NET, versión {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Ninguno de los orígenes especificados ({0}) es válido. Corrija los errores o advertencias y vuelva a intentarlo. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Ninguna prueba coincide con el filtro porque contiene una o varias propiedades no válidas ({0}). Especifique una expresión de filtro que contenga propiedades válidas ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">No se pudo encontrar {0}. Asegúrese de que dotnet esté instalado en la máquina.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">El proceso del host de prueba finalizó con el siguiente error: {0}. Consulte los registros de diagnóstico para obtener más información.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">La depuración del recopilador de datos está habilitada. Asocie el depurador al proceso del recopilador de datos para continuar.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">No hay ninguna prueba disponible en {0}. Asegúrese de que los detectores y ejecutores de pruebas están registrados y de que la configuración de versión de la plataforma y de Framework es correcta y vuelva a intentarlo.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Registrando diagnóstico de TestHost en el archivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">No se pudo iniciar el host de prueba con el error: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">Opción ExecutionThreadApartmentState de ejecución no admitida para el marco: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Está utilizando una versión anterior de Microsoft.NET.Test.Sdk. Cámbiese a una versión igual o superior a 15.3.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">No se pudieron encontrar las extensiones {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Se está cambiando la búsqueda de adaptador. Siga https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obtener más detalles.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Ninguna prueba coincide con el filtro de casos de prueba proporcionado "{0}" en {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Se ha cancelado la detección de las pruebas.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">No se puede asociar el depurador al host de prueba predeterminado con el id. de proceso: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar la incidencia: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">No se encontró ningún proxy disponible para quitar de la cola.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">El administrador de la sesión actual no administra el proxy con el identificador {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">El proxy con el identificador {0} ya está disponible y no se puede volver a poner en cola.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Se produjo una excepción al crear una instancia del programa de detección: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Se han encontrado varios adaptadores de prueba con el mismo URI ({0}). Se omitirá el adaptador '{1}'. Desinstale los adaptadores que están en conflicto para evitar esta advertencia.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Se omitirá el origen duplicado especificado ({0}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Se produjo una excepción cuando el programa de detección de pruebas '{0}' estaba cargando pruebas. Excepción: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Se produjo una excepción al invocar al ejecutor '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">No se encuentra el archivo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">La depuración host está habilitada. Asocie el depurador al proceso de host de prueba para continuar.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Se omitirá el ejecutor de pruebas correspondiente al programa de detección de pruebas {0}, porque este último no tiene el atributo DefaultExecutorUri. Puede ser necesario reinstalar el complemento del adaptador de prueba.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">No se pudo inicializar el proxy de cliente: no se puede conectar al proceso de prueba.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Esta operación no se permite en el contexto de una ejecución que no sea de depuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">No se encuentra el ejecutor de pruebas con el URI '{0}'. Asegúrese de que el ejecutor de pruebas está instalado y admite el entorno de ejecución .NET, versión {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Ninguno de los orígenes especificados ({0}) es válido. Corrija los errores o advertencias y vuelva a intentarlo. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Ninguna prueba coincide con el filtro porque contiene una o varias propiedades no válidas ({0}). Especifique una expresión de filtro que contenga propiedades válidas ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">No se pudo encontrar {0}. Asegúrese de que dotnet esté instalado en la máquina.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">El proceso del host de prueba para fuentes "{0}" finalizó con el siguiente error: {1}. Consulte los registros de diagnóstico para obtener más información.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">La depuración del recopilador de datos está habilitada. Asocie el depurador al proceso del recopilador de datos para continuar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">No hay ninguna prueba disponible en {0}. Asegúrese de que los detectores y ejecutores de pruebas están registrados y de que la configuración de versión de la plataforma y de Framework es correcta y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Registrando diagnóstico de TestHost en el archivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">No se pudo iniciar el host de prueba con el error: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">Opción ExecutionThreadApartmentState de ejecución no admitida para el marco: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Está utilizando una versión anterior de Microsoft.NET.Test.Sdk. Cámbiese a una versión igual o superior a 15.3.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">No se pudieron encontrar las extensiones {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Se está cambiando la búsqueda de adaptador. Siga https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obtener más detalles.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Ninguna prueba coincide con el filtro de casos de prueba proporcionado "{0}" en {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Se ha cancelado la detección de las pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">No se puede asociar el depurador al host de prueba predeterminado con el id. de proceso: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Se denegó el acceso al intentar crear la carpeta "TestResults" en la ubicación mencionada. Está recibiendo esta excepción porque está ejecutando vstest.console.exe desde una carpeta que requiere acceso de escritura. Para solucionar la incidencia: ejecute vstest.console.exe desde una carpeta en la que tenga privilegios de escritura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">No se encontró ningún proxy disponible para quitar de la cola.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">El administrador de la sesión actual no administra el proxy con el identificador {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">El proxy con el identificador {0} ya está disponible y no se puede volver a poner en cola.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">No se encontró ningún proveedor de tiempo de ejecución de pruebas adecuado para ningún origen en esta ejecución.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Los ajustes de ejecución cambiaron entre el momento en que se estableció la sesión de prueba y el momento de la solicitud de ejecución/detección actual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Datos adjuntos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">No se encontró ningún proveedor de tiempo de ejecución de prueba adecuado:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Omitiendo origen:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
index 5588efea19..2e6e8fd03d 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.fr.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Une exception s'est produite durant l'instanciation du découvreur : {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Plusieurs adaptateurs de tests ayant le même URI '{0}' ont été trouvés. Adaptateur '{1}' ignoré. Désinstallez les adaptateurs en conflit pour éviter cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">La source dupliquée spécifiée '{0}' est ignorée.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Une exception s'est produite durant le chargement des tests par le découvreur de tests '{0}'. Exception : {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Une exception s'est produite durant l'appel de l'exécuteur '{0}' : {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Fichier {0} introuvable.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Le débogage de l'hôte est activé. Attachez le débogueur au processus testhost pour continuer.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">L'exécuteur de tests correspondant au découvreur de tests {0} est ignoré, car le découvreur n'a pas l'attribut DefaultExecutorUri. Vous devrez peut-être réinstaller le complément d'adaptateur de test.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Échec d'initialisation du proxy client : connexion impossible au processus de test.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Cette opération n'est pas autorisée dans le contexte d'une exécution qui ne sert pas au débogage.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">L'exécuteur de tests ayant l'URI '{0}' est introuvable. Vérifiez que l'exécuteur de tests est installé et qu'il prend en charge le runtime .NET version {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Aucune des sources spécifiées '{0}' n'est valide. Corrigez les erreurs/avertissements ci-dessus, puis réessayez. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Aucun test ne correspond au filtre, car il contient une ou plusieurs propriétés non valides ({0}). Spécifiez une expression de filtre contenant des propriétés valides ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0} est introuvable. Vérifiez que le dotnet est installé sur la machine.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Le processus Testhost s'est arrêté. Erreur : {0}. Pour plus d'informations, consultez les journaux de diagnostic.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">Le débogage de collecteur de données est activé. Attachez le débogueur au processus datacollector pour continuer.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">Aucun test n'est disponible dans {0}. Vérifiez que les découvreurs et exécuteurs de tests sont inscrits. Vérifiez également que les paramètres de version de plateforme et de framework sont appropriés, puis réessayez.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Journalisation des diagnostics TestHost dans le fichier : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Échec du lancement de l'hôte de test. Erreur : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">L'option ExecutionThreadApartmentState n'est pas prise en charge pour le framework : {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Vous utilisez une ancienne version de Microsoft.NET.Test.Sdk. Passez à une version égale ou supérieure à la version 15.3.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Extensions introuvables : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">La fonctionnalité de recherche d’adaptateur fait actuellement l’objet de modifications. Pour plus d’informations, veuillez consulter https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Aucun test ne correspond au filtre testcase donné `{0}` dans {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Découverte de tests annulée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Impossible d'attacher le débogueur à l'hôte de test par défaut ayant l'ID de processus : {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Impossible de localiser un proxy disponible à dépiler.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Le proxy ayant l'ID {0} n'est pas géré par le gestionnaire de session actuel.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Le proxy ayant l'ID {0} est déjà disponible et ne peut pas être empilé à nouveau.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Une exception s'est produite durant l'instanciation du découvreur : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Plusieurs adaptateurs de tests ayant le même URI '{0}' ont été trouvés. Adaptateur '{1}' ignoré. Désinstallez les adaptateurs en conflit pour éviter cet avertissement.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">La source dupliquée spécifiée '{0}' est ignorée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Une exception s'est produite durant le chargement des tests par le découvreur de tests '{0}'. Exception : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Une exception s'est produite durant l'appel de l'exécuteur '{0}' : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Fichier {0} introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Le débogage de l'hôte est activé. Attachez le débogueur au processus testhost pour continuer.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">L'exécuteur de tests correspondant au découvreur de tests {0} est ignoré, car le découvreur n'a pas l'attribut DefaultExecutorUri. Vous devrez peut-être réinstaller le complément d'adaptateur de test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Échec d'initialisation du proxy client : connexion impossible au processus de test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Cette opération n'est pas autorisée dans le contexte d'une exécution qui ne sert pas au débogage.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">L'exécuteur de tests ayant l'URI '{0}' est introuvable. Vérifiez que l'exécuteur de tests est installé et qu'il prend en charge le runtime .NET version {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Aucune des sources spécifiées '{0}' n'est valide. Corrigez les erreurs/avertissements ci-dessus, puis réessayez. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Aucun test ne correspond au filtre, car il contient une ou plusieurs propriétés non valides ({0}). Spécifiez une expression de filtre contenant des propriétés valides ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0} est introuvable. Vérifiez que le dotnet est installé sur la machine.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Le processus Testhost pour la ou les sources '{0}' s’est arrêté. Erreur : {1}. Pour plus d’informations, consultez les journaux de diagnostic.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">Le débogage de collecteur de données est activé. Attachez le débogueur au processus datacollector pour continuer.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Aucun test n'est disponible dans {0}. Vérifiez que les découvreurs et exécuteurs de tests sont inscrits. Vérifiez également que les paramètres de version de plateforme et de framework sont appropriés, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Journalisation des diagnostics TestHost dans le fichier : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Échec du lancement de l'hôte de test. Erreur : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">L'option ExecutionThreadApartmentState n'est pas prise en charge pour le framework : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Vous utilisez une ancienne version de Microsoft.NET.Test.Sdk. Passez à une version égale ou supérieure à la version 15.3.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Extensions introuvables : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">La fonctionnalité de recherche d’adaptateur fait actuellement l’objet de modifications. Pour plus d’informations, veuillez consulter https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Aucun test ne correspond au filtre testcase donné `{0}` dans {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Découverte de tests annulée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Impossible d'attacher le débogueur à l'hôte de test par défaut ayant l'ID de processus : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Accès refusé durant la tentative de création du dossier "TestResults" à l'emplacement indiqué. Vous obtenez cette exception, car vous exécutez vstest.console.exe à partir d'un dossier qui nécessite un accès en écriture. Pour résoudre le problème, exécutez vstest.console.exe à partir d'un dossier sur lequel vous disposez de privilèges d'accès en écriture.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Impossible de localiser un proxy disponible à dépiler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Le proxy ayant l'ID {0} n'est pas géré par le gestionnaire de session actuel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Le proxy ayant l'ID {0} est déjà disponible et ne peut pas être empilé à nouveau.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Aucun fournisseur de runtime de test approprié n’a été trouvé pour n’importe quelle source dans cette exécution.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Les paramètres d'exécution ont changé entre le moment où la session de test a été établie et le moment de la demande d'exécution/découverte actuelle.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Pièces jointes :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Aucun fournisseur de runtime de test approprié n’a été trouvé :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Source ignorée :</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
index 7ed1ddcd39..c6c78eb407 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.it.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione durante la creazione dell'istanza dell'agente di individuazione: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Sono stati trovati più adattatori di test con lo stesso URI '{0}'. L'adattatore '{1}' verrà ignorato. Per evitare che venga visualizzato questo avviso, disinstallare gli adattatori in conflitto.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">L'origine duplicata specificata verrà ignorata: '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione durante il caricamento dei test da parte dell'agente di individuazione test '{0}'. Eccezione: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione durante la chiamata dell'executor '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Il file {0} non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Il debug dell'host è abilitato. Per continuare, collegare il debugger al processo testhost.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">L'executor di test corrispondente all'agente di individuazione del test {0} verrà ignorato perché manca l'attributo DefaultExecutorUri dell'agente di individuazione. Potrebbe essere necessario reinstallare il componente aggiuntivo dell'adattatore di test.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Inizializzazione del proxy client non riuscita: non è stato possibile connettersi al processo di test.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Questa operazione non è consentita nel contesto di un'esecuzione non di debug.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Non è stato trovato alcun executor di test con URI '{0}'. Verificare che l'executor di test sia installato e supporti la versione {1} di .NET Runtime.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Nessuna delle origini specificate '{0}' è valida. Correggere gli errori/avvisi precedenti e riprovare. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Nessun test corrisponde al filtro perché contiene una o più proprietà non valide ({0}). Specificare un'espressione di filtro contenente proprietà valide ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0} non è stato trovato. Assicurarsi che dotnet sia installato nel computer.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Il processo testhost è terminato con l'errore {0}. Per altre informazioni, vedere i log di diagnostica.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">Il debug dell'agente di raccolta dati è abilitato. Per continuare, collegare il debugger al processo dell'agente di raccolta dati.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">Non ci sono test disponibili in {0}. Assicurarsi che l'agente di individuazione test e gli executor di test siano registrati e che le impostazioni delle versioni di piattaforma e framework siano appropriate, quindi riprovare.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Registrazione della diagnostica di TestHost nel file: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Non è stato possibile avviare testhost. Errore: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">L'opzione ExecutionThreadApartmentState non è supportata per il framework: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">La versione di Microsoft.NET.Test.Sdk è obsoleta. Passare alla versione 15.3.0 o a una versione successiva.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Non è stato possibile trovare le estensioni: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">La ricerca degli adattatori verrà modificata a breve. Per maggiori dettagli, vedere https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Nessun test corrisponde al filtro di test case specificato `{0}` in {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Individuazione dei test annullata.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Non è possibile collegare il debugger all'host di test predefinito con ID processo {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Non è stato possibile trovare un proxy disponibile da rimuovere dalla coda.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Il proxy con ID {0} non è gestito dallo strumento di gestione sessioni corrente.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Il proxy con ID {0} è già disponibile e non può essere riaccodato.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Si è verificata un'eccezione durante la creazione dell'istanza dell'agente di individuazione: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Sono stati trovati più adattatori di test con lo stesso URI '{0}'. L'adattatore '{1}' verrà ignorato. Per evitare che venga visualizzato questo avviso, disinstallare gli adattatori in conflitto.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">L'origine duplicata specificata verrà ignorata: '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Si è verificata un'eccezione durante il caricamento dei test da parte dell'agente di individuazione test '{0}'. Eccezione: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Si è verificata un'eccezione durante la chiamata dell'executor '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Il file {0} non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Il debug dell'host è abilitato. Per continuare, collegare il debugger al processo testhost.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">L'executor di test corrispondente all'agente di individuazione del test {0} verrà ignorato perché manca l'attributo DefaultExecutorUri dell'agente di individuazione. Potrebbe essere necessario reinstallare il componente aggiuntivo dell'adattatore di test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Inizializzazione del proxy client non riuscita: non è stato possibile connettersi al processo di test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Questa operazione non è consentita nel contesto di un'esecuzione non di debug.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Non è stato trovato alcun executor di test con URI '{0}'. Verificare che l'executor di test sia installato e supporti la versione {1} di .NET Runtime.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Nessuna delle origini specificate '{0}' è valida. Correggere gli errori/avvisi precedenti e riprovare. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Nessun test corrisponde al filtro perché contiene una o più proprietà non valide ({0}). Specificare un'espressione di filtro contenente proprietà valide ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0} non è stato trovato. Assicurarsi che dotnet sia installato nel computer.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Il processo Testhost per le origini '{0}' è terminato con errore: {1}. Per altre informazioni, controllare i log di diagnostica.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">Il debug dell'agente di raccolta dati è abilitato. Per continuare, collegare il debugger al processo dell'agente di raccolta dati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Non ci sono test disponibili in {0}. Assicurarsi che l'agente di individuazione test e gli executor di test siano registrati e che le impostazioni delle versioni di piattaforma e framework siano appropriate, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Registrazione della diagnostica di TestHost nel file: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Non è stato possibile avviare testhost. Errore: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">L'opzione ExecutionThreadApartmentState non è supportata per il framework: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">La versione di Microsoft.NET.Test.Sdk è obsoleta. Passare alla versione 15.3.0 o a una versione successiva.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Non è stato possibile trovare le estensioni: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">La ricerca degli adattatori verrà modificata a breve. Per maggiori dettagli, vedere https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Nessun test corrisponde al filtro di test case specificato `{0}` in {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Individuazione dei test annullata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Non è possibile collegare il debugger all'host di test predefinito con ID processo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Accesso negato durante il tentativo di creare la cartella "TestResults" nel percorso indicato. Si riceve questa eccezione perché si esegue vstest.console.exe da una cartella per cui è necessario l'accesso in scrittura. Per risolvere il problema, eseguire vstest.console.exe da una cartella per cui si hanno privilegi di scrittura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Non è stato possibile trovare un proxy disponibile da rimuovere dalla coda.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Il proxy con ID {0} non è gestito dallo strumento di gestione sessioni corrente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Il proxy con ID {0} è già disponibile e non può essere riaccodato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Non è stato trovato alcun provider di runtime di test appropriato per qualsiasi origine in questa esecuzione.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Le impostazioni di esecuzione sono cambiate tra l'ora in cui è stata stabilita la sessione di test e l'ora della richiesta di esecuzione/individuazione corrente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Allegati:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Non è stato trovato alcun provider di runtime di test appropriato:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">L'origine verrà ignorata:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
index 9dd7eb0097..aba3c1288b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ja.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">探索プログラムのインスタンス化中に例外が発生しました: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">同じ URI '{0}' を持つ複数のテスト アダプターが見つかりました。アダプター '{1}' を無視します。この警告が表示されないようにするには、競合するアダプターをアンインストールしてください。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">指定された重複データ ソース '{0}' を無視します。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">テスト探索プログラム '{0}' がテストを読み込んでいるときに例外が発生しました。例外: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">実行プログラム '{0}' の呼び出し中に例外が発生しました: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">ファイル {0} は見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">ホスト デバッグが有効です。続行するにはデバッガーをテスト ホスト プロセスにアタッチしてください。</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">テスト探索プログラム {0} には DefaultExecutorUri 属性が含まれていないため、このテスト探索プログラムに対応するテスト実行プログラムを無視しています。テスト アダプター アドインの再インストールが必要になる場合があります。</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">クライアント プロキシを初期化できませんでした。テスト プロセスに接続できませんでした。</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">この操作は、非デバッグ実行のコンテキストでは許可されていません。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">URI が '{0}' のテスト実行プログラムが見つかりませんでした。テスト実行プログラムがインストールされ、.net ランタイム バージョン {1} をサポートしていることをご確認ください。</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">指定されたソース '{0}' がいずれも有効ではありません。上記のエラーおよび警告を修正してから、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">フィルターに一致するテストがありません。フィルターに無効なプロパティが 1 つ以上含まれています ({0})。有効なプロパティを含むフィルター式 ({1}) を指定してください。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0} が見つかりませんでした。dotnet がマシンにインストールされていることを確認してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Testhost プロセスがエラーで終了しました: {0}。詳細については、診断ログを確認してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">DataCollector のデバッグが有効です。続行するにはデバッガーを datacollector プロセスにアタッチしてください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">{0} で使用できるテストはありません。テスト探索プログラムおよび実行プログラムが登録されており、プラットフォームおよびフレームワークのバージョン設定が適切であることを確認してから、もう一度お試しください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">次のファイルで TestHost 診断をログ記録しています: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">エラーが発生したため、TestHost を起動できませんでした: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">フレームワークでの ThreadApartmentState オプションの実行はサポートされていません: {0}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Microsoft.NET.Test.Sdk の古いバージョンを使用しています。15.3.0 以降のバージョンに移行することをお勧めします。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">拡張機能が見つかりませんでした: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">アダプター検索は変更中です。詳細については、https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap をご覧ください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">指定のテストケース フィルター `{0}` に一致するテストは {1} にありません</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">テストの検出が取り消されました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">デバッガーをプロセス ID: {0} の既定のテスト ホストにアタッチできません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み特権のあるフォルダーから vstest.console.exe を実行してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">デキューするために使用できるプロキシが見つかりませんでした。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">ID が {0} のプロキシは、現在のセッション マネージャーで管理されません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">ID が {0} のプロキシは、既に使用可能になっているため、再度エンキューすることはできません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">探索プログラムのインスタンス化中に例外が発生しました: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">同じ URI '{0}' を持つ複数のテスト アダプターが見つかりました。アダプター '{1}' を無視します。この警告が表示されないようにするには、競合するアダプターをアンインストールしてください。</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">指定された重複データ ソース '{0}' を無視します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">テスト探索プログラム '{0}' がテストを読み込んでいるときに例外が発生しました。例外: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">実行プログラム '{0}' の呼び出し中に例外が発生しました: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">ファイル {0} は見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">ホスト デバッグが有効です。続行するにはデバッガーをテスト ホスト プロセスにアタッチしてください。</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">テスト探索プログラム {0} には DefaultExecutorUri 属性が含まれていないため、このテスト探索プログラムに対応するテスト実行プログラムを無視しています。テスト アダプター アドインの再インストールが必要になる場合があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">クライアント プロキシを初期化できませんでした。テスト プロセスに接続できませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">この操作は、非デバッグ実行のコンテキストでは許可されていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">URI が '{0}' のテスト実行プログラムが見つかりませんでした。テスト実行プログラムがインストールされ、.net ランタイム バージョン {1} をサポートしていることをご確認ください。</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">指定されたソース '{0}' がいずれも有効ではありません。上記のエラーおよび警告を修正してから、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">フィルターに一致するテストがありません。フィルターに無効なプロパティが 1 つ以上含まれています ({0})。有効なプロパティを含むフィルター式 ({1}) を指定してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0} が見つかりませんでした。dotnet がマシンにインストールされていることを確認してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">ソース `{0}` の Testhost プロセスがエラーで終了しました: {1}。詳細については、診断ログを確認してください。</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">DataCollector のデバッグが有効です。続行するにはデバッガーを datacollector プロセスにアタッチしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} で使用できるテストはありません。テスト探索プログラムおよび実行プログラムが登録されており、プラットフォームおよびフレームワークのバージョン設定が適切であることを確認してから、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">次のファイルで TestHost 診断をログ記録しています: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">エラーが発生したため、TestHost を起動できませんでした: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">フレームワークでの ThreadApartmentState オプションの実行はサポートされていません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Microsoft.NET.Test.Sdk の古いバージョンを使用しています。15.3.0 以降のバージョンに移行することをお勧めします。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">拡張機能が見つかりませんでした: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">アダプター検索は変更中です。詳細については、https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap をご覧ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">指定のテストケース フィルター `{0}` に一致するテストは {1} にありません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">テストの検出が取り消されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">デバッガーをプロセス ID: {0} の既定のテスト ホストにアタッチできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} 記載した場所に "TestResults" フォルダーを作成しようとしたときにアクセスが拒否されました。書き込みアクセスを必要とするフォルダーから vstest.console.exe を実行しているため、この例外が発生しています。この問題を解決するには、書き込み特権のあるフォルダーから vstest.console.exe を実行してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">デキューするために使用できるプロキシが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">ID が {0} のプロキシは、現在のセッション マネージャーで管理されません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">ID が {0} のプロキシは、既に使用可能になっているため、再度エンキューすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">この実行のどのソースにも適切なテスト ランタイム プロバイダーが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">テスト セッションが確立された時刻と現在の実行/検出要求の時刻の間で、実行設定が変更されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">添付ファイル:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">適切なテスト ランタイム プロバイダーが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">ソースをスキップしています:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
index 53ebc868b1..e8e5edff47 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ko.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">{0} Discoverer를 인스턴스화하는 중 예외가 발생했습니다.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">동일한 URI '{0}'을(를) 가진 테스트 어댑터가 여러 개 있습니다. '{1}' 어댑터를 무시합니다. 이 경고가 발생하지 않게 하려면 충돌하는 어댑터를 제거하세요.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">지정한 중복되는 '{0}' 소스를 무시합니다.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">테스트 Discoverer '{0}'에서 테스트를 로드하는 동안 예외가 발생했습니다. 예외: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">'{0}' Executor를 호출하는 동안 예외가 발생했습니다. {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">{0} 파일을 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">호스트 디버깅을 사용하도록 설정했습니다. testhost 프로세스를 계속하려면 디버거를 연결하세요.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Discoverer에 DefaultExecutorUri 특성이 없으므로 테스트 Discoverer {0}에 해당하는 테스트 Executor를 무시합니다. 테스트 어댑터 추가 기능을 다시 설치해야 할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">클라이언트 프록시를 초기화하지 못했습니다. 테스트 프로세스에 연결할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">디버그가 아닌 실행의 컨텍스트에서는 이 작업을 수행할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">URI가 '{0}'인 테스트 Executor를 찾을 수 없습니다. 테스트 Executor가 설치되어 있고 .NET 런타임 버전 {1}을(를) 지원하는지 확인하세요.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">지정한 '{0}' 소스가 올바르지 않습니다. 위의 오류/경고를 해결한 후 다시 시도하세요. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">필터에 잘못된 속성({0})이 하나 이상 포함되어 있으므로 해당 필터와 일치하는 테스트가 없습니다. 유효한 속성({1})을 포함하는 필터 식을 지정하세요.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0}을(를) 찾을 수 없습니다. 컴퓨터에 dotnet이 설치되어 있는지 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Testhost 프로세스가 종료되었습니다(오류: {0}). 자세한 내용은 진단 로그를 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">DataCollector 디버깅을 사용하도록 설정했습니다. datacollector 프로세스를 계속하려면 디버거를 연결하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">{0}에서 테스트를 사용할 수 없습니다. 테스트 Discoverer 및 Executor가 등록되고 플랫폼 및 프레임워크 버전 설정이 적절한지 확인하고 다시 시도하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">{0} 파일에 TestHost Diagnostics 로깅 중</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Testhost를 시작하지 못했습니다(오류: {0}).</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">프레임워크 {0}에 대해 ExecutionThreadApartmentState 옵션이 지원되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">이전 버전의 Microsoft.NET.Test.Sdk를 사용하고 있습니다. 15.3.0 이상 버전으로 이동하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">확장을 찾을 수 없음: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">어댑터 조회가 변경됩니다. 자세한 내용은 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap을 참조하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">{1}에 지정된 테스트 사례 필터 `{0}`과(와) 일치하는 테스트가 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">테스트 검색이 취소되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">프로세스 ID가 {0}인 기본 테스트 호스트에 디버거를 연결할 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">큐에서 제거하기 위해 사용할 수 있는 프록시를 찾을 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">ID가 {0}인 프록시가 현재 세션 관리자에서 관리되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">ID가 {0}인 프록시를 이미 사용할 수 있으며 큐에 다시 넣을 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">{0} Discoverer를 인스턴스화하는 중 예외가 발생했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">동일한 URI '{0}'을(를) 가진 테스트 어댑터가 여러 개 있습니다. '{1}' 어댑터를 무시합니다. 이 경고가 발생하지 않게 하려면 충돌하는 어댑터를 제거하세요.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">지정한 중복되는 '{0}' 소스를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">테스트 Discoverer '{0}'에서 테스트를 로드하는 동안 예외가 발생했습니다. 예외: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">'{0}' Executor를 호출하는 동안 예외가 발생했습니다. {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">{0} 파일을 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">호스트 디버깅을 사용하도록 설정했습니다. testhost 프로세스를 계속하려면 디버거를 연결하세요.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Discoverer에 DefaultExecutorUri 특성이 없으므로 테스트 Discoverer {0}에 해당하는 테스트 Executor를 무시합니다. 테스트 어댑터 추가 기능을 다시 설치해야 할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">클라이언트 프록시를 초기화하지 못했습니다. 테스트 프로세스에 연결할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">디버그가 아닌 실행의 컨텍스트에서는 이 작업을 수행할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">URI가 '{0}'인 테스트 Executor를 찾을 수 없습니다. 테스트 Executor가 설치되어 있고 .NET 런타임 버전 {1}을(를) 지원하는지 확인하세요.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">지정한 '{0}' 소스가 올바르지 않습니다. 위의 오류/경고를 해결한 후 다시 시도하세요. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">필터에 잘못된 속성({0})이 하나 이상 포함되어 있으므로 해당 필터와 일치하는 테스트가 없습니다. 유효한 속성({1})을 포함하는 필터 식을 지정하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0}을(를) 찾을 수 없습니다. 컴퓨터에 dotnet이 설치되어 있는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">원본 '{0}'에 대한 Testhost 프로세스가 오류 {1}과(와) 함께 종료되었습니다. 자세한 내용은 진단 로그를 확인하세요.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">DataCollector 디버깅을 사용하도록 설정했습니다. datacollector 프로세스를 계속하려면 디버거를 연결하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0}에서 테스트를 사용할 수 없습니다. 테스트 Discoverer 및 Executor가 등록되고 플랫폼 및 프레임워크 버전 설정이 적절한지 확인하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">{0} 파일에 TestHost Diagnostics 로깅 중</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Testhost를 시작하지 못했습니다(오류: {0}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">프레임워크 {0}에 대해 ExecutionThreadApartmentState 옵션이 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">이전 버전의 Microsoft.NET.Test.Sdk를 사용하고 있습니다. 15.3.0 이상 버전으로 이동하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">확장을 찾을 수 없음: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">어댑터 조회를 변경하는 중입니다. 자세한 내용은 https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap을 팔로우하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">{1}에 지정된 테스트 사례 필터 `{0}`과(와) 일치하는 테스트가 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">테스트 검색이 취소되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">프로세스 ID가 {0}인 기본 테스트 호스트에 디버거를 연결할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} "TestResults" 폴더를 언급된 위치에 만드는 동안 액세스가 거부되었습니다. 쓰기 권한이 필요한 폴더에서 vstest.console.exe를 실행하고 있으므로 이 예외가 발생했습니다. 이 문제를 해결하려면 쓰기 권한이 있는 폴더에서 vstest.console.exe를 실행하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">큐에서 제거하기 위해 사용할 수 있는 프록시를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">ID가 {0}인 프록시가 현재 세션 관리자에서 관리되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">ID가 {0}인 프록시를 이미 사용할 수 있으며 큐에 다시 넣을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">이 실행에서 원본에 적합한 테스트 런타임 공급자를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">테스트 세션이 설정된 시간과 현재 실행/검색 요청의 시간 사이에 runsettings가 변경되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">첨부 파일:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">적합한 테스트 런타임 공급자를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">원본을 건너뛰는 중:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
index 33bfec737d..7254f8c97e 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pl.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Wystąpił wyjątek podczas tworzenia wystąpienia wykrywacza: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Znaleziono wiele adapterów testowych z takim samym identyfikatorem URI „{0}”. Adapter „{1}” zostanie zignorowany. Aby uniknąć tego ostrzeżenia, odinstaluj adaptery powodujące konflikt.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Określone zduplikowane źródło „{0}” zostanie zignorowane.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Wystąpił wyjątek podczas ładowania testów przez wykrywacz testów „{0}”. Wyjątek: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Wystąpił wyjątek podczas wywoływania modułu wykonywania „{0}”: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć pliku {0}.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Debugowanie hosta zostało włączone. Dołącz debuger do procesu testhost, aby kontynuować.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Moduł wykonywania testów odpowiadający wykrywaczowi testów {0} zostanie zignorowany, ponieważ wykrywacz nie ma atrybutu DefaultExecutorUri. Konieczna może być ponowna instalacja dodatku adaptera testowego.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Zainicjowanie serwera proxy klienta nie powiodło się: nie można nawiązać połączenia z procesem testowania.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Ta operacja jest niedozwolona w kontekście uruchamiania bez debugowania.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Nie można odnaleźć modułu wykonywania testów o identyfikatorze URI „{0}”. Upewnij się, że moduł wykonywania testów został zainstalowany i obsługuje środowisko uruchomieniowe platformy .NET w wersji {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Wszystkie określone źródła „{0}” są nieprawidłowe. Napraw powyższe błędy/ostrzeżenia i spróbuj ponownie. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Brak testów zgodnych z filtrem, ponieważ zawiera on co najmniej jedną nieprawidłową właściwość ({0}). Określ wyrażenie filtru zawierające prawidłowe właściwości ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">Nie znaleziono elementu {0}. Upewnij się, że program dotnet jest zainstalowany na maszynie.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Zakończono proces testhost z powodu błędu: {0}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">Debugowanie modułu zbierającego dane zostało włączone. Dołącz debuger do procesu datacollector, aby kontynuować.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">W elemencie {0} nie są dostępne żadne testy. Upewnij się, że wykrywacze i moduły wykonywania testów są zarejestrowane oraz że ustawienia wersji platformy i struktury są odpowiednie, a następnie spróbuj ponownie.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Rejestrowanie diagnostyki TestHost w pliku: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Nie można uruchomić hosta testów. Błąd: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">Opcja ExecutionThreadApartmentState nie jest obsługiwana dla platformy: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Używamy starszej wersji zestawu Microsoft.NET.Test.Sdk. Przejdź na wersję 15.3.0 lub nowszą.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Nie można znaleźć rozszerzeń: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Wyszukiwanie adaptera jest zmieniane. Aby uzyskać więcej szczegółów, przejdź do strony https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Żaden test nie jest zgodny z podanym filtrem przypadku testowego „{0}” w elemencie {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Odnajdywanie testów zostało anulowane.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Nie można dołączyć debugera do domyślnego hosta testowego z identyfikatorem procesu: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Nie można było znaleźć dostępnego serwera proxy do umieszczenia w kolejce dwukierunkowej.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Serwer proxy o identyfikatorze {0} nie jest zarządzany przez bieżącego menedżera sesji.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Serwer proxy o identyfikatorze {0} jest już dostępny i nie można go ponownie umieścić w kolejce.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Wystąpił wyjątek podczas tworzenia wystąpienia wykrywacza: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Znaleziono wiele adapterów testowych z takim samym identyfikatorem URI „{0}”. Adapter „{1}” zostanie zignorowany. Aby uniknąć tego ostrzeżenia, odinstaluj adaptery powodujące konflikt.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Określone zduplikowane źródło „{0}” zostanie zignorowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Wystąpił wyjątek podczas ładowania testów przez wykrywacz testów „{0}”. Wyjątek: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Wystąpił wyjątek podczas wywoływania modułu wykonywania „{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Nie można odnaleźć pliku {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Debugowanie hosta zostało włączone. Dołącz debuger do procesu testhost, aby kontynuować.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Moduł wykonywania testów odpowiadający wykrywaczowi testów {0} zostanie zignorowany, ponieważ wykrywacz nie ma atrybutu DefaultExecutorUri. Konieczna może być ponowna instalacja dodatku adaptera testowego.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Zainicjowanie serwera proxy klienta nie powiodło się: nie można nawiązać połączenia z procesem testowania.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Ta operacja jest niedozwolona w kontekście uruchamiania bez debugowania.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Nie można odnaleźć modułu wykonywania testów o identyfikatorze URI „{0}”. Upewnij się, że moduł wykonywania testów został zainstalowany i obsługuje środowisko uruchomieniowe platformy .NET w wersji {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Wszystkie określone źródła „{0}” są nieprawidłowe. Napraw powyższe błędy/ostrzeżenia i spróbuj ponownie. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Brak testów zgodnych z filtrem, ponieważ zawiera on co najmniej jedną nieprawidłową właściwość ({0}). Określ wyrażenie filtru zawierające prawidłowe właściwości ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">Nie znaleziono elementu {0}. Upewnij się, że program dotnet jest zainstalowany na maszynie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Zakończono proces hosta testowego dla źródła „{0}” z powodu błędu: {1}. Sprawdź dzienniki diagnostyczne, aby uzyskać więcej informacji.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">Debugowanie modułu zbierającego dane zostało włączone. Dołącz debuger do procesu datacollector, aby kontynuować.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">W elemencie {0} nie są dostępne żadne testy. Upewnij się, że wykrywacze i moduły wykonywania testów są zarejestrowane oraz że ustawienia wersji platformy i struktury są odpowiednie, a następnie spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Rejestrowanie diagnostyki TestHost w pliku: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Nie można uruchomić hosta testów. Błąd: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">Opcja ExecutionThreadApartmentState nie jest obsługiwana dla platformy: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Używamy starszej wersji zestawu Microsoft.NET.Test.Sdk. Przejdź na wersję 15.3.0 lub nowszą.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Nie można znaleźć rozszerzeń: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Wyszukiwanie adaptera jest zmieniane. Aby uzyskać więcej szczegółów, przejdź do strony https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Żaden test nie jest zgodny z podanym filtrem przypadku testowego „{0}” w elemencie {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Odnajdywanie testów zostało anulowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Nie można dołączyć debugera do domyślnego hosta testowego z identyfikatorem procesu: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Odmowa dostępu podczas próby utworzenia folderu „TestResults” w określonej lokalizacji. Widzisz ten wyjątek, ponieważ program vstest.console.exe został uruchomiony z folderu wymagającego dostępu do zapisu. Aby rozwiązać ten problem: uruchom program vstest.console.exe z folderu, w którym masz uprawnienia do zapisu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Nie można było znaleźć dostępnego serwera proxy do umieszczenia w kolejce dwukierunkowej.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Serwer proxy o identyfikatorze {0} nie jest zarządzany przez bieżącego menedżera sesji.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Serwer proxy o identyfikatorze {0} jest już dostępny i nie można go ponownie umieścić w kolejce.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Nie znaleziono odpowiedniego dostawcy środowiska uruchomieniowego testu dla żadnego źródła w tym przebiegu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Ustawienia runsettings uległy zmianie między czasem ustanowienia sesji testowej a czasem bieżącego żądania uruchomienia/odnajdywania.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Załączniki:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Nie znaleziono odpowiedniego dostawcy środowiska uruchomieniowego testu:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Pomijanie źródła:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
index 898328fdee..248a5a7248 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.pt-BR.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção ao criar uma instância do discoverer: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Foram encontrados vários adaptadores de teste com o mesmo URI '{0}'. Ignorando o adaptador '{1}'. Desinstale os adaptadores conflitantes para evitar este aviso.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Ignorando a fonte duplicada especificada '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção enquanto o discoverer de testes '{0}' estava carregando testes. Exceção: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção ao chamar o executor '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Não foi possível localizar o arquivo {0}.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">O host de depuração está habilitado. Anexe o depurador ao processo de testhost para continuar.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Ignorando o executor de teste correspondente ao discoverer de teste {0} porque o discoverer não tem o atributo DefaultExecutorUri. Talvez seja necessário instalar novamente o suplemento do adaptador de teste.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Falha ao inicializar o proxy do cliente: não foi possível se conectar ao processo de teste.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Esta operação não é permitida no contexto de uma execução sem depuração.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Não foi possível localizar o executor de teste com o URI '{0}'. Verifique se o executor de teste está instalado e oferece suporte à versão de runtime do .net {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Nenhuma das fontes especificadas '{0}' é válida. Corrija os erros/avisos acima e tente novamente. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Nenhum teste correspondeu ao filtro porque ele contém uma ou mais propriedades que não são válidas ({0}). Especifique a expressão de filtro contendo as propriedades válidas ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">Não foi possível localizar {0}. Certifique-se de que o dotnet esteja instalado no computador.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">O processo do testhost foi encerrado com o erro: {0}. Verifique os logs de diagnóstico para obter mais informações.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">A depuração do DataCollector está habilitada. Anexe o depurador ao processo datacollector para continuar.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">Não há nenhum teste disponível em {0}. Verifique se o detector e os executores de teste estão registrados e se as configurações de versão da estrutura da plataforma &amp; são apropriadas e tente novamente.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Registro em log do diagnóstico TestHost no arquivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Falha ao iniciar o host de teste com o erro: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">A opção ExecutionThreadApartmentState não tem suporte para a estrutura: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Você está usando uma versão mais antiga do Microsoft.NET.Test.Sdk. Mude para uma versão igual ou maior que 15.3.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Não foi possível encontrar as extensões: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">A pesquisa do adaptador está sendo alterada, siga https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obter mais detalhes.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Nenhum teste corresponde ao filtro de testcase `{0}` determinado no {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Descoberta de testes cancelada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Não é possível anexar o depurador ao host de teste padrão com a ID de processo: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Não foi possível encontrar um proxy disponível para deque.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">O proxy com a ID {0} não é gerenciado pelo gerenciador de sessão atual.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">O proxy com a ID {0} já está disponível e não pode ser enfileirado novamente.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Ocorreu uma exceção ao criar uma instância do discoverer: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Foram encontrados vários adaptadores de teste com o mesmo URI '{0}'. Ignorando o adaptador '{1}'. Desinstale os adaptadores conflitantes para evitar este aviso.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Ignorando a fonte duplicada especificada '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">Ocorreu uma exceção enquanto o discoverer de testes '{0}' estava carregando testes. Exceção: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">Ocorreu uma exceção ao chamar o executor '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Não foi possível localizar o arquivo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">O host de depuração está habilitado. Anexe o depurador ao processo de testhost para continuar.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Ignorando o executor de teste correspondente ao discoverer de teste {0} porque o discoverer não tem o atributo DefaultExecutorUri. Talvez seja necessário instalar novamente o suplemento do adaptador de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Falha ao inicializar o proxy do cliente: não foi possível se conectar ao processo de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Esta operação não é permitida no contexto de uma execução sem depuração.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Não foi possível localizar o executor de teste com o URI '{0}'. Verifique se o executor de teste está instalado e oferece suporte à versão de runtime do .net {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Nenhuma das fontes especificadas '{0}' é válida. Corrija os erros/avisos acima e tente novamente. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Nenhum teste correspondeu ao filtro porque ele contém uma ou mais propriedades que não são válidas ({0}). Especifique a expressão de filtro contendo as propriedades válidas ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">Não foi possível localizar {0}. Certifique-se de que o dotnet esteja instalado no computador.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Processo testhost para fonte(s) '{0}' encerrado com erro: {1}. Verifique os logs de diagnóstico para mais informações.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">A depuração do DataCollector está habilitada. Anexe o depurador ao processo datacollector para continuar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Não há nenhum teste disponível em {0}. Verifique se o detector e os executores de teste estão registrados e se as configurações de versão da estrutura da plataforma &amp; são apropriadas e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Registro em log do diagnóstico TestHost no arquivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Falha ao iniciar o host de teste com o erro: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">A opção ExecutionThreadApartmentState não tem suporte para a estrutura: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Você está usando uma versão mais antiga do Microsoft.NET.Test.Sdk. Mude para uma versão igual ou maior que 15.3.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Não foi possível encontrar as extensões: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">A pesquisa do adaptador está sendo alterada, acesse https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap para obter mais detalhes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Nenhum teste corresponde ao filtro de testcase `{0}` determinado no {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Descoberta de testes cancelada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Não é possível anexar o depurador ao host de teste padrão com a ID de processo: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Acesso negado ao tentar criar a pasta "TestResults" no local mencionado. Você está recebendo esta exceção porque está executando o vstest.console.exe em uma pasta que requer acesso para gravação. Para resolver o problema: execute vstest.console.exe em uma pasta na qual você tenha privilégios de gravação.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Não foi possível encontrar um proxy disponível para deque.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">O proxy com a ID {0} não é gerenciado pelo gerenciador de sessão atual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">O proxy com a ID {0} já está disponível e não pode ser enfileirado novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Nenhum provedor de runtime de teste encontrado para esta execução.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">As runsettings foram alteradas entre a hora em que a sessão de teste foi estabelecida e a hora da solicitação de execução/descoberta atual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Anexos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Nenhum provedor de runtime de teste encontrado:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Ignorando origem:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
index 06ca8f5499..3392873c33 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.ru.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">При создании экземпляра средства обнаружения возникло исключение: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Найдено несколько адаптеров тестов с одинаковым URI "{0}". Адаптер "{1}" пропускается. Чтобы избежать этого предупреждения, удалите все конфликтующие адаптеры.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Указанный повторяющийся источник "{0}" игнорируется.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">При загрузке тестов средством обнаружения тестов "{0}" возникло исключение. Исключение: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">При вызове исполнителя "{0}" возникло исключение: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">Не удалось найти файл {0}.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Включена отладка узла. Для продолжения подключите отладчик к процессу testhost.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Исполнитель теста, соответствующий средству обнаружения тестов {0}, пропускается, так как у средства обнаружения нет атрибута DefaultExecutorUri. Возможно, необходимо переустановить надстройку адаптера теста.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">Не удалось инициализировать прокси клиента: не удалось подключиться к процессу теста.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Эта операция запрещена в контексте неотладочного запуска.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">Не удалось найти исполнитель тестов с URI "{0}". Убедитесь, что исполнитель тестов установлен и поддерживает версию среды выполнения .NET {1}.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Ни один из указанных источников "{0}" не является допустимым. Исправьте эти ошибки и предупреждения и повторите попытку. </target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Соответствующих фильтру тестов нет, так как фильтр содержит одно недопустимое свойство или несколько ({0}). Укажите выражение фильтра, содержащее допустимые свойства ({1}).</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">Не удалось найти {0}. Убедитесь, что dotnet установлен на компьютере.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Процесс testhost завершился с ошибкой: {0}. Дополнительные сведения см. в журналах диагностики.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">Включена отладка datacollector. Для продолжения подключите отладчик к процессу datacollector.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">В {0} нет доступных тестов. Убедитесь, что средства обнаружения и выполнения тестов зарегистрированы, а также проверьте правильность параметров платформы и версии платформы, после чего повторите попытку.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">Ведение журналов диагностики TestHost в файле: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Не удалось запустить хост для тестов с ошибкой: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">Параметр ExecutionThreadApartmentState не поддерживается для платформы: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Вы используете более старую версию Microsoft.NET.Test.Sdk. Перейдите на версию 15.3.0 или более позднюю.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Не удалось найти расширения: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Изменяется поиск адаптеров. Дополнительные сведения: https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">Нет тестов, соответствующих указанному фильтру тестовых случаев "{0}" в {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Обнаружение тестов отменено.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Не удается подключить отладчик к узлу тестирования по умолчанию с идентификатором процесса {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">Не удалось найти доступный прокси-сервер для двусторонней очереди.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">Прокси-сервер с идентификатором {0} не управляется текущим диспетчером сеансов.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">Прокси-сервер с идентификатором {0} уже доступен и не может быть повторно поставлен в очередь.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">При создании экземпляра средства обнаружения возникло исключение: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Найдено несколько адаптеров тестов с одинаковым URI "{0}". Адаптер "{1}" пропускается. Чтобы избежать этого предупреждения, удалите все конфликтующие адаптеры.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Указанный повторяющийся источник "{0}" игнорируется.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">При загрузке тестов средством обнаружения тестов "{0}" возникло исключение. Исключение: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">При вызове исполнителя "{0}" возникло исключение: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">Не удалось найти файл {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Включена отладка узла. Для продолжения подключите отладчик к процессу testhost.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Исполнитель теста, соответствующий средству обнаружения тестов {0}, пропускается, так как у средства обнаружения нет атрибута DefaultExecutorUri. Возможно, необходимо переустановить надстройку адаптера теста.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">Не удалось инициализировать прокси клиента: не удалось подключиться к процессу теста.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Эта операция запрещена в контексте неотладочного запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">Не удалось найти исполнитель тестов с URI "{0}". Убедитесь, что исполнитель тестов установлен и поддерживает версию среды выполнения .NET {1}.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Ни один из указанных источников "{0}" не является допустимым. Исправьте эти ошибки и предупреждения и повторите попытку. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Соответствующих фильтру тестов нет, так как фильтр содержит одно недопустимое свойство или несколько ({0}). Укажите выражение фильтра, содержащее допустимые свойства ({1}).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">Не удалось найти {0}. Убедитесь, что dotnet установлен на компьютере.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">Процесс testhost для источника (-ов) {0} завершился с ошибкой. {1}Дополнительные сведения см. в журналах диагностики.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">Включена отладка datacollector. Для продолжения подключите отладчик к процессу datacollector.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">В {0} нет доступных тестов. Убедитесь, что средства обнаружения и выполнения тестов зарегистрированы, а также проверьте правильность параметров платформы и версии платформы, после чего повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">Ведение журналов диагностики TestHost в файле: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Не удалось запустить хост для тестов с ошибкой: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">Параметр ExecutionThreadApartmentState не поддерживается для платформы: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Вы используете более старую версию Microsoft.NET.Test.Sdk. Перейдите на версию 15.3.0 или более позднюю.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Не удалось найти расширения: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Изменяется поиск адаптеров. Дополнительные сведения: https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">Нет тестов, соответствующих указанному фильтру тестовых случаев "{0}" в {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Обнаружение тестов отменено.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Не удается подключить отладчик к узлу тестирования по умолчанию с идентификатором процесса {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Отказано в доступе при попытке создания папки "TestResults" в указанном расположении. Это исключение возникло, так как вы запускаете файл vstest.console.exe из папки, для которой требуется доступ на запись. Чтобы устранить эту проблему, запустите vstest.console.exe из папки, для которой у вас есть разрешения на запись.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">Не удалось найти доступный прокси-сервер для двусторонней очереди.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">Прокси-сервер с идентификатором {0} не управляется текущим диспетчером сеансов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">Прокси-сервер с идентификатором {0} уже доступен и не может быть повторно поставлен в очередь.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Не найден подходящий поставщик среды выполнения теста для источников в этом запуске.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Параметры runsettings изменились между временем начала тестового сеанса и временем текущего запроса на запуск или обнаружение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Вложения:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Не найден подходящий поставщик среды выполнения теста:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Пропуск источника:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
index 3589b24ec2..4f05cc5c29 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.tr.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">Bulucu örneği oluşturulurken özel durum oluştu: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">Aynı '{0}' URI’sine sahip birden fazla test bağdaştırıcısı bulundu. '{1}' bağdaştırıcısı yoksayılıyor. Bu uyarıyı önlemek için lütfen çakışan bağdaştırıcıları kaldırın.</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">Belirtilen '{0}' yinelenen kaynağı yoksayılıyor.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">'{0}' test bulucusu testleri yüklerken bir özel durum oluştu. Özel durum: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">'{0}' yürütücüsü çağrılırken bir özel durum oluştu: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">{0} dosyası bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">Konak hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını testhost işlemine ekleyin.</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">Bulucu DefaultExecutorUri özniteliğine sahip olmadığından {0} test bulucusuna karşılık gelen test yürütücüsü yoksayılıyor. Test bağdaştırıcısı eklentisini yeniden yüklemeniz gerekebilir.</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">İstemci ara sunucusu başlatılamadı: Test işlemine bağlanılamadı.</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">Bu işlem hata ayıklama dışındaki bir çalıştırmanın bağlamında yapılamaz.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">URI’si '{0}' olan test yürütücüsü bulunamadı. Test yürütücüsünün yüklendiğinden ve .NET çalışma zamanı {1} sürümünü desteklediğinden emin olun.</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">Belirtilen '{0}' kaynaklarının hiçbiri geçerli değil. Yukarıdaki hataları/uyarıları düzeltin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">, </target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">Geçerli olmayan bir veya daha fazla özellik içerdiğinden filtre ile eşleşen test yok ({0}). Geçerli değerleri ({1}) içeren bir filtre ifadesi belirtin.</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">{0} bulunamadı. Makinede dotnet’in yüklü olduğundan emin olun.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Testhost işleminden şu hatayla çıkıldı: {0}. Daha fazla bilgi için lütfen tanılama günlüklerine bakın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">DataCollector hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını datacollector işlemine ekleyin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">{0} içinde hiç test yok. Test bulucuları ile yürütücülerinin kayıtlı olduğundan ve platform ile çerçeve sürümü ayarlarının uygun olduğundan emin olun ve yeniden deneyin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">TestHost Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">Testhost başlatılamadı. Şu hata alındı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">ExecutionThreadApartmentState seçeneği {0} çerçevesi için desteklenmiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">Eski bir Microsoft.NET.Test.Sdk sürümü kullanıyorsunuz. Lütfen 15.3.0 veya daha yeni bir sürüme geçin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">Dosya uzantıları bulunamadı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">Bağdaştırıcı arama değiştiriliyor. Ayrıntılar için lütfen https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap sayfasını takip edin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">{1} içinde sunulan test çalışması filtresi `{0}` ile eşleşen test yok</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">Test bulma iptal edildi.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">Hata ayıklayıcı, {0} işlem kimliğine sahip varsayılan test ana bilgisayarına eklenemiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">İki uçtan erişimli kuyruğa yönelik kullanılabilir ara sunucu bulunamadı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">{0} kimliğine sahip ara sunucu, geçerli oturum yöneticisi tarafından yönetilmiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">{0} kimliğine sahip ara sunucu zaten var ve yeniden kuyruğa alınamaz.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">Bulucu örneği oluşturulurken özel durum oluştu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">Aynı '{0}' URI’sine sahip birden fazla test bağdaştırıcısı bulundu. '{1}' bağdaştırıcısı yoksayılıyor. Bu uyarıyı önlemek için lütfen çakışan bağdaştırıcıları kaldırın.</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">Belirtilen '{0}' yinelenen kaynağı yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">'{0}' test bulucusu testleri yüklerken bir özel durum oluştu. Özel durum: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">'{0}' yürütücüsü çağrılırken bir özel durum oluştu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">{0} dosyası bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">Konak hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını testhost işlemine ekleyin.</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">Bulucu DefaultExecutorUri özniteliğine sahip olmadığından {0} test bulucusuna karşılık gelen test yürütücüsü yoksayılıyor. Test bağdaştırıcısı eklentisini yeniden yüklemeniz gerekebilir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">İstemci ara sunucusu başlatılamadı: Test işlemine bağlanılamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">Bu işlem hata ayıklama dışındaki bir çalıştırmanın bağlamında yapılamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">URI’si '{0}' olan test yürütücüsü bulunamadı. Test yürütücüsünün yüklendiğinden ve .NET çalışma zamanı {1} sürümünü desteklediğinden emin olun.</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">Belirtilen '{0}' kaynaklarının hiçbiri geçerli değil. Yukarıdaki hataları/uyarıları düzeltin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">, </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">Geçerli olmayan bir veya daha fazla özellik içerdiğinden filtre ile eşleşen test yok ({0}). Geçerli değerleri ({1}) içeren bir filtre ifadesi belirtin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">{0} bulunamadı. Makinede dotnet’in yüklü olduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">'{0}' kaynağı için testhost işleminden şu hatayla çıkıldı: {1}. Daha fazla bilgi edinmek için lütfen tanılama günlüklerini denetleyin.</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">DataCollector hata ayıklaması etkin. Devam etmek için lütfen hata ayıklayıcısını datacollector işlemine ekleyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} içinde hiç test yok. Test bulucuları ile yürütücülerinin kayıtlı olduğundan ve platform ile çerçeve sürümü ayarlarının uygun olduğundan emin olun ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">TestHost Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">Testhost başlatılamadı. Şu hata alındı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">ExecutionThreadApartmentState seçeneği {0} çerçevesi için desteklenmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">Eski bir Microsoft.NET.Test.Sdk sürümü kullanıyorsunuz. Lütfen 15.3.0 veya daha yeni bir sürüme geçin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">Dosya uzantıları bulunamadı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">Bağdaştırıcı arama değiştiriliyor. Ayrıntılar için lütfen https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap bağlantısını takip edin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">{1} içinde sunulan test çalışması filtresi `{0}` ile eşleşen test yok</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">Test bulma iptal edildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">Hata ayıklayıcı, {0} işlem kimliğine sahip varsayılan test ana bilgisayarına eklenemiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} Belirtilen konumda "TestResults" klasörü oluşturulmaya çalışılırken erişim engellendi. Yazma erişimi gerektiren bir klasörden vstest.console.exe çalıştırdığınız için bu özel durumu aldınız. Sorunu çözmek için lütfen yazma ayrıcalıklarına sahip olduğunuz bir klasörden vstest.console.exe dosyasını çalıştırın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">İki uçtan erişimli kuyruğa yönelik kullanılabilir ara sunucu bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">{0} kimliğine sahip ara sunucu, geçerli oturum yöneticisi tarafından yönetilmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">{0} kimliğine sahip ara sunucu zaten var ve yeniden kuyruğa alınamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">Bu çalıştırmadaki hiçbir kaynak için uygun bir test çalışma zamanı sağlayıcısı bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">runsettings, test oturumunun kurulduğu zamanla mevcut çalıştırma/keşif isteği zamanı arasında değişti.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Ekler:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">Uygun bir test çalışma zamanı sağlayıcısı bulunamadı:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">Kaynak atlanıyor:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf
index ad5ba9b685..58cc72e48c 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.xlf
@@ -4,7 +4,7 @@
     <body>
       <trans-unit id="DiscovererInstantiationException">
         <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DuplicateAdaptersFound">
         <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
@@ -12,19 +12,19 @@
       </trans-unit>
       <trans-unit id="DuplicateSource">
         <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExceptionFromLoadTests">
         <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExceptionFromRunTests">
         <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FileNotFound">
         <source>Could not find file {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HostDebuggerWarning">
         <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
@@ -32,15 +32,15 @@
       </trans-unit>
       <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
         <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InitializationFailed">
         <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
         <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoMatchingExecutor">
         <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
@@ -48,111 +48,131 @@
       </trans-unit>
       <trans-unit id="NoValidSourceFoundForDiscovery">
         <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StringSeperator">
         <source>, </source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
         <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoDotnetExeFound">
         <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
         <target state="new">Could not find {0}. Make sure that the dotnet is installed on the machine.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
         <target state="new">Testhost process exited with error: {0}</target>
-        <note></note>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
       </trans-unit>
       <trans-unit id="DataCollectorDebuggerWarning">
         <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
         <target state="new">DataCollector debugging is enabled. Please attach debugger to testhost process to continue.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
         <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
         <target state="new">No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TesthostDiagLogOutputFile">
         <source>Logging TestHost Diagnostics in file: {0}</source>
         <target state="new">Logging TestHost Diagnostics in file: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToLaunchTestHost">
         <source>Failed to launch testhost with error: {0}</source>
         <target state="new">Failed to launch testhost with error: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
         <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
         <target state="new">ExecutionThreadApartmentState option not supported for framework: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="OldTestHostIsGettingUsed">
         <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
         <target state="new">You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NonExistingExtensions">
         <source>Could not find extensions: {0}</source>
         <target state="new">Could not find extensions: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="new">Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</target>
-        <note></note>
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="new">Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</target>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
         <source>No test matches the given testcase filter `{0}` in {1}</source>
         <target state="new">No test is available for testcase filter `{0}` in {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestDiscoveryCancelled">
         <source>Discovery of tests cancelled.</source>
         <target state="new">Discovery of tests cancelled.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
         <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
         <target state="new">Cannot attach the debugger to the default test host with process ID: {0}.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AccessDenied">
         <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
         <target state="new">{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges. For more information, please look at the error message:</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoAvailableProxyForDeque">
         <source>Could not find an available proxy to deque.</source>
         <target state="new">Could not find an available proxy to deque.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoSuchProxyId">
         <source>Proxy with id {0} is not managed by the current session manager.</source>
         <target state="new">Proxy with id {0} is not managed by the current session manager.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ProxyIsAlreadyAvailable">
         <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
         <target state="new">Proxy with id {0} is already available and cannot be re-enqueued.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
+        <source>No suitable test runtime provider was found for any source in this run.</source>
         <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoProxyMatchesDescription">
         <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
         <target state="new">Could not find an available proxy to match the original run settings.</target>
-        <note></note>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="new">{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="new">Attachments:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="new">No suitable test runtime provider was found:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="new">Skipping source:</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
index 965fed89f2..ad3cd5c151 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">实例化发现器时发生异常: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">找到了多个具有同一 URI“{0}”的测试适配器。忽略适配器“{1}”。请卸载冲突的适配器以避免此警告。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">忽略指定的重复源“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">测试发现器“{0}”加载测试时发生异常。异常: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">调用的执行器“{0}”时发生异常: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">找不到文件 {0}。</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">启用主机调试。请将调试器附加到 testhost 进程以继续。</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">忽略与测试发现器 {0} 对应的测试执行器，因为该发现器不具有 DefaultExecutorUri 特性。可能需要重新安装测试适配器外接程序。</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">未能初始化客户端代理: 无法连接到测试过程。</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">非调试运行的上下文中不允许此操作。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">找不到 URI 为“{0}”的测试执行器。请确保安装了测试执行器且该执行器支持.net 运行时版本 {1}。</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">无有效的指定源“{0}”。请修复以上错误/警告，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">，</target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">没有与筛选器匹配的测试，因为该筛选器包含一个或多个无效属性 ({0})。请指定包含有效属性 ({1}) 的筛选器表达式。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">找不到 {0}。请确保计算机上安装了 dotnet。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Testhost 进程已退出，但出现错误: {0}。请查看诊断日志了解详细信息。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">启用 DataCollector 调试。请将调试器附加到 datacollector 进程以继续。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">{0} 中没有可用测试。请确保已注册测试发现器和执行器且平台和框架版本设置合理，然后重试。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">在文件 {0} 中记录 TestHost 诊断</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">未能启动测试主机，错误为 {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">框架 {0} 不支持 ExecutionThreadApartmentState 选项。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">你使用的是旧版 Microsoft.NET.Test.Sdk。请迁移到 15.3.0 及更高版本。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">找不到扩展名: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">适配器查找正在发生更改，请转到 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap 以了解详细信息。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">没有测试匹配 {1} 中的给定用例测试筛选器“{0}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">已取消测试发现。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">无法将调试程序附加到进程 ID 为“{0}”的默认测试主机。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">找不到用于取消排队的可用代理。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">ID 为 {0} 的代理不受当前会话管理器管理。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">ID 为 {0} 的代理已可用，无法重新排队。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">实例化发现器时发生异常: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">找到了多个具有同一 URI“{0}”的测试适配器。忽略适配器“{1}”。请卸载冲突的适配器以避免此警告。</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">忽略指定的重复源“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">测试发现器“{0}”加载测试时发生异常。异常: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">调用的执行器“{0}”时发生异常: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">找不到文件 {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">启用主机调试。请将调试器附加到 testhost 进程以继续。</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">忽略与测试发现器 {0} 对应的测试执行器，因为该发现器不具有 DefaultExecutorUri 特性。可能需要重新安装测试适配器外接程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">未能初始化客户端代理: 无法连接到测试过程。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">非调试运行的上下文中不允许此操作。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">找不到 URI 为“{0}”的测试执行器。请确保安装了测试执行器且该执行器支持.net 运行时版本 {1}。</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">无有效的指定源“{0}”。请修复以上错误/警告，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">没有与筛选器匹配的测试，因为该筛选器包含一个或多个无效属性 ({0})。请指定包含有效属性 ({1}) 的筛选器表达式。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">找不到 {0}。请确保计算机上安装了 dotnet。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">源“{0}”的 Testhost 进程已退出，但出现错误: {1}。请查看诊断日志以了解详细信息。</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">启用 DataCollector 调试。请将调试器附加到 datacollector 进程以继续。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} 中没有可用测试。请确保已注册测试发现器和执行器且平台和框架版本设置合理，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">在文件 {0} 中记录 TestHost 诊断</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">未能启动测试主机，错误为 {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">框架 {0} 不支持 ExecutionThreadApartmentState 选项。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">你使用的是旧版 Microsoft.NET.Test.Sdk。请迁移到 15.3.0 及更高版本。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">找不到扩展名: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">适配器查找正在发生更改，请转到 https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap 了解详细信息。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">没有测试匹配 {1} 中的给定用例测试筛选器“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">已取消测试发现。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">无法将调试程序附加到进程 ID 为“{0}”的默认测试主机。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} 尝试在所述位置创建 "TestResults" 文件夹时，访问被拒。你收到此异常是因为你正在从需要具有写入权限的文件夹运行 vstest.console.exe。若要解决此问题，请从你具有写入权限的文件夹运行 vstest.console.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">找不到用于取消排队的可用代理。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">ID 为 {0} 的代理不受当前会话管理器管理。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">ID 为 {0} 的代理已可用，无法重新排队。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">在此运行中，没有为任何源找到合适的测试运行时提供程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">runsettings 在建立测试会话的时间和当前运行/发现请求的时间之间发生了更改。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">附件:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">找不到合适的测试运行时提供程序:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">正在跳过源:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
index 20f976a0fa..bbc67131a0 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,172 +1,192 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="DiscovererInstantiationException">
-        <source>Exception occurred while instantiating discoverer : {0}</source>
-        <note></note>
-        <target state="translated">將探索程式具現化時發生例外狀況: {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateAdaptersFound">
-        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
-        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
-        <target state="translated">找到多個具有相同 URI '{0}' 的測試配接器。忽略配接器 '{1}'。請將衝突的配接器解除安裝，以避免這項警告。</target>
-      </trans-unit>
-      <trans-unit id="DuplicateSource">
-        <source>Ignoring the specified duplicate source '{0}'.</source>
-        <note></note>
-        <target state="translated">忽略指定的重複來源 '{0}'。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromLoadTests">
-        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
-        <note></note>
-        <target state="translated">測試探索程式 '{0}' 載入測試時發生例外狀況。例外狀況: {1}</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromRunTests">
-        <source>An exception occurred while invoking executor '{0}': {1}</source>
-        <note></note>
-        <target state="translated">叫用執行程式 '{0}' 時發生例外狀況: {1}</target>
-      </trans-unit>
-      <trans-unit id="FileNotFound">
-        <source>Could not find file {0}.</source>
-        <note></note>
-        <target state="translated">找不到檔案 {0}。</target>
-      </trans-unit>
-      <trans-unit id="HostDebuggerWarning">
-        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
-        <note>Host, testhost are key words, it should not be localized</note>
-        <target state="translated">已啟用主機偵錯。請將偵錯工具附加到 testhost 處理序以繼續進行。</target>
-      </trans-unit>
-      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
-        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
-        <note></note>
-        <target state="translated">忽略對應到測試探索程式 {0} 的測試執行程式，因為探索程式沒有 DefaultExecutorUri 屬性。您可能必須重新安裝測試配接器增益集。</target>
-      </trans-unit>
-      <trans-unit id="InitializationFailed">
-        <source>Failed to initialize client proxy: could not connect to test process.</source>
-        <note></note>
-        <target state="translated">無法將用戶端 Proxy 初始化: 無法連接到測試處理序</target>
-      </trans-unit>
-      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
-        <source>This operation is not allowed in the context of a non-debug run.</source>
-        <note></note>
-        <target state="translated">這項作業不能用於非偵錯回合的內容中。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingExecutor">
-        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
-        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
-        <target state="translated">找不到具有 URI '{0}' 的測試執行程式。請確定已安裝測試執行程式，且其支援 .NET 執行階段版本 {1}。</target>
-      </trans-unit>
-      <trans-unit id="NoValidSourceFoundForDiscovery">
-        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
-        <note></note>
-        <target state="translated">指定的來源 '{0}' 皆無效。請修正上述錯誤/警告，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="StringSeperator">
-        <source>, </source>
-        <note></note>
-        <target state="translated">，</target>
-      </trans-unit>
-      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
-        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
-        <note></note>
-        <target state="translated">因為篩選包含一或多個無效的屬性 ({0})，所以沒有符合篩選的測試。請指定包含有效屬性 ({1}) 的篩選運算式。</target>
-      </trans-unit>
-      <trans-unit id="NoDotnetExeFound">
-        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
-        <target state="translated">找不到 {0}。請確定電腦上安裝了 .NET。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestHostExitedWithError">
-        <source>Testhost process exited with error: {0}. Please check the diagnostic logs for more information.</source>
-        <target state="translated">Testhost 處理序已結束。錯誤: {0}。如需詳細資訊，請查看診斷記錄。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorDebuggerWarning">
-        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
-        <target state="translated">DataCollector 已啟用。若要繼續，請將偵錯工具連結到 datacollector 處理序。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
-        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
-        <target state="translated">{0} 中未提供任何測試。請確定已登錄了測試探索程式與執行程式，且平台與 Framework 版本設定皆正確，然後再試一次。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TesthostDiagLogOutputFile">
-        <source>Logging TestHost Diagnostics in file: {0}</source>
-        <target state="translated">在檔案 {0} 中記錄 TestHost 診斷</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLaunchTestHost">
-        <source>Failed to launch testhost with error: {0}</source>
-        <target state="translated">無法啟動測試主機。錯誤: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
-        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
-        <target state="translated">架構 {0} 不支援 ExecutionThreadApartmentState 選項。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OldTestHostIsGettingUsed">
-        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
-        <target state="translated">您正使用較舊版的 Microsoft.NET.Test.Sdk。請移到等於或大於 15.3.0 的版本。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NonExistingExtensions">
-        <source>Could not find extensions: {0}</source>
-        <target state="translated">找不到延伸模組: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DeprecatedAdapterPath">
-        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
-        <target state="translated">目前正在變更配接器查閱，請遵循 https://github.com/Microsoft/vstest-docs/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap，以取得詳細資料。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
-        <source>No test matches the given testcase filter `{0}` in {1}</source>
-        <target state="translated">沒有任何測試符合 {1} 中的指定 testcase 篩選 `{0}`</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestDiscoveryCancelled">
-        <source>Discovery of tests cancelled.</source>
-        <target state="translated">已取消測試的探索。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
-        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
-        <target state="translated">無法將偵錯工具連結到處理序識別碼為 {0} 的預設測試主機。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AccessDenied">
-        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
-        <target state="translated">{0} 當嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoAvailableProxyForDeque">
-        <source>Could not find an available proxy to deque.</source>
-        <target state="translated">找不到任何要排除於佇列外的 Proxy。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoSuchProxyId">
-        <source>Proxy with id {0} is not managed by the current session manager.</source>
-        <target state="translated">識別碼為 {0} 的 Proxy 並非由目前的工作階段管理員所管理。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProxyIsAlreadyAvailable">
-        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
-        <target state="translated">識別碼為 {0} 的 Proxy 已可供使用，但無法重新加入佇列。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoTestHostProviderFound">
-        <source>No suitable test runtime provider found for this run.</source>
-        <target state="new">No suitable test runtime provider found for this run.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoProxyMatchesDescription">
-        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
-        <target state="new">The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="DiscovererInstantiationException">
+        <source>Exception occurred while instantiating discoverer : {0}</source>
+        <target state="translated">將探索程式具現化時發生例外狀況: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DuplicateAdaptersFound">
+        <source>Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.</source>
+        <target state="translated">找到多個具有相同 URI '{0}' 的測試配接器。忽略配接器 '{1}'。請將衝突的配接器解除安裝，以避免這項警告。</target>
+        <note>{0} is the unique identifier of test adapter. {1} is the name of the test adapter that shares a unique identifier with a previously loaded adapter.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateSource">
+        <source>Ignoring the specified duplicate source '{0}'.</source>
+        <target state="translated">忽略指定的重複來源 '{0}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromLoadTests">
+        <source>An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}</source>
+        <target state="translated">測試探索程式 '{0}' 載入測試時發生例外狀況。例外狀況: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromRunTests">
+        <source>An exception occurred while invoking executor '{0}': {1}</source>
+        <target state="translated">叫用執行程式 '{0}' 時發生例外狀況: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FileNotFound">
+        <source>Could not find file {0}.</source>
+        <target state="translated">找不到檔案 {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HostDebuggerWarning">
+        <source>Host debugging is enabled. Please attach debugger to testhost process to continue.</source>
+        <target state="translated">已啟用主機偵錯。請將偵錯工具附加到 testhost 處理序以繼續進行。</target>
+        <note>Host, testhost are key words, it should not be localized</note>
+      </trans-unit>
+      <trans-unit id="IgnoringExecutorAsNoDefaultExecutorUriAttribute">
+        <source>Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.</source>
+        <target state="translated">忽略對應到測試探索程式 {0} 的測試執行程式，因為探索程式沒有 DefaultExecutorUri 屬性。您可能必須重新安裝測試配接器增益集。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InitializationFailed">
+        <source>Failed to initialize client proxy: could not connect to test process.</source>
+        <target state="translated">無法將用戶端 Proxy 初始化: 無法連接到測試處理序</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LaunchDebugProcessNotAllowedForANonDebugRun">
+        <source>This operation is not allowed in the context of a non-debug run.</source>
+        <target state="translated">這項作業不能用於非偵錯回合的內容中。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingExecutor">
+        <source>Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.</source>
+        <target state="translated">找不到具有 URI '{0}' 的測試執行程式。請確定已安裝測試執行程式，且其支援 .NET 執行階段版本 {1}。</target>
+        <note>{0} - Executor uri String {1}-  Version - .net Version Eg:-2.0.50727.00</note>
+      </trans-unit>
+      <trans-unit id="NoValidSourceFoundForDiscovery">
+        <source>None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. </source>
+        <target state="translated">指定的來源 '{0}' 皆無效。請修正上述錯誤/警告，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringSeperator">
+        <source>, </source>
+        <target state="translated">，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedPropertiesInTestCaseFilter">
+        <source>No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}).</source>
+        <target state="translated">因為篩選包含一或多個無效的屬性 ({0})，所以沒有符合篩選的測試。請指定包含有效屬性 ({1}) 的篩選運算式。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetExeFound">
+        <source>Could not find {0}. Make sure that the dotnet is installed on the machine.</source>
+        <target state="translated">找不到 {0}。請確定電腦上安裝了 .NET。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestHostExitedWithError">
+        <source>Testhost process for source(s) '{0}' exited with error: {1}. Please check the diagnostic logs for more information.</source>
+        <target state="translated">來源 '{0}' 的 Testhost 處理序已結束，發生錯誤: {1}。如需詳細資訊，請查看診斷記錄。</target>
+        <note>{0} a source, or very rarely list of sources, {1} the output error.</note>
+      </trans-unit>
+      <trans-unit id="DataCollectorDebuggerWarning">
+        <source>DataCollector debugging is enabled. Please attach debugger to datacollector process to continue.</source>
+        <target state="translated">DataCollector 已啟用。若要繼續，請將偵錯工具連結到 datacollector 處理序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed_NoDiscovererFound_NoTestsAreAvailableInTheSources">
+        <source>No test is available in {0}. Make sure that test discoverer &amp; executors are registered and platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} 中未提供任何測試。請確定已登錄了測試探索程式與執行程式，且平台與 Framework 版本設定皆正確，然後再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TesthostDiagLogOutputFile">
+        <source>Logging TestHost Diagnostics in file: {0}</source>
+        <target state="translated">在檔案 {0} 中記錄 TestHost 診斷</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLaunchTestHost">
+        <source>Failed to launch testhost with error: {0}</source>
+        <target state="translated">無法啟動測試主機。錯誤: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionThreadApartmentStateNotSupportedForFramework">
+        <source>ExecutionThreadApartmentState option not supported for framework: {0}.</source>
+        <target state="translated">架構 {0} 不支援 ExecutionThreadApartmentState 選項。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OldTestHostIsGettingUsed">
+        <source>You are using an older version of Microsoft.NET.Test.Sdk. Kindly move to a version equal or greater than 15.3.0.</source>
+        <target state="translated">您正使用較舊版的 Microsoft.NET.Test.Sdk。請移到等於或大於 15.3.0 的版本。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonExistingExtensions">
+        <source>Could not find extensions: {0}</source>
+        <target state="translated">找不到延伸模組: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DeprecatedAdapterPath">
+        <source>Adapter lookup is being changed, please follow https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap for more details.</source>
+        <target state="translated">目前正在變更配接器查閱，請遵循 https://github.com/Microsoft/vstest/blob/main/RFCs/0022-User-Specified-TestAdapter-Lookup.md#roadmap 以尋求詳細資料。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableForGivenTestCaseFilter">
+        <source>No test matches the given testcase filter `{0}` in {1}</source>
+        <target state="translated">沒有任何測試符合 {1} 中的指定 testcase 篩選 `{0}`</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestDiscoveryCancelled">
+        <source>Discovery of tests cancelled.</source>
+        <target state="translated">已取消測試的探索。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachDebuggerToDefaultTestHostFailure">
+        <source>Cannot attach the debugger to the default test host with process ID: {0}.</source>
+        <target state="translated">無法將偵錯工具連結到處理序識別碼為 {0} 的預設測試主機。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AccessDenied">
+        <source>{0} Access denied while trying to create "TestResults" folder in mentioned location. You are getting this exception because you are running vstest.console.exe from a folder which requires having write access. To solve the issue: please  run vstest.console.exe from a folder where you have write privileges.</source>
+        <target state="translated">{0} 當嘗試在提及的位置上建立 "TestResults" 資料夾時存取被拒。因為您正從需要寫入存取權的資料夾執行 vstest.console.exe，所以收到此例外狀況。若要解決此問題: 請從您有權寫入的資料夾執行 vstest.console.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAvailableProxyForDeque">
+        <source>Could not find an available proxy to deque.</source>
+        <target state="translated">找不到任何要排除於佇列外的 Proxy。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuchProxyId">
+        <source>Proxy with id {0} is not managed by the current session manager.</source>
+        <target state="translated">識別碼為 {0} 的 Proxy 並非由目前的工作階段管理員所管理。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProxyIsAlreadyAvailable">
+        <source>Proxy with id {0} is already available and cannot be re-enqueued.</source>
+        <target state="translated">識別碼為 {0} 的 Proxy 已可供使用，但無法重新加入佇列。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestHostProviderFound">
+        <source>No suitable test runtime provider was found for any source in this run.</source>
+        <target state="translated">在此回合的任何來源中，找不到適合的測試執行階段提供者。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoProxyMatchesDescription">
+        <source>The runsettings changed between the time when the test session was established and the time of the current run/discovery request.</source>
+        <target state="translated">Runsettings 在測試工作階段建立時間與目前執行/探索要求的時間之間有所變更。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">附件:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoSuitableRuntimeProviderFound">
+        <source>No suitable test runtime provider was found:</source>
+        <target state="translated">找不到適合的測試執行階段提供者:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SkippingSource">
+        <source>Skipping source:</source>
+        <target state="translated">正在略過來源:</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs
index 804e769d77..920f78fd83 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/TestEngine.cs
@@ -1,524 +1,740 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+/// <summary>
+/// Cross platform test engine entry point for the client.
+/// </summary>
+public class TestEngine : ITestEngine
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    private readonly ITestRuntimeProviderManager _testHostProviderManager;
+    private readonly IProcessHelper _processHelper;
+    private readonly IEnvironment _environment;
 
-    /// <summary>
-    /// Cross platform test engine entry point for the client.
-    /// </summary>
-    public class TestEngine : ITestEngine
+    private ITestExtensionManager? _testExtensionManager;
+
+    public TestEngine()
+        : this(TestRuntimeProviderManager.Instance, new ProcessHelper())
     {
-        #region Private Fields
+    }
 
-        private readonly TestRuntimeProviderManager testHostProviderManager;
-        private ITestExtensionManager testExtensionManager;
-        private IProcessHelper processHelper;
+    protected internal TestEngine(
+        TestRuntimeProviderManager testHostProviderManager,
+        IProcessHelper processHelper)
+        : this(testHostProviderManager, processHelper, new PlatformEnvironment())
+    {
+    }
 
-        #endregion
+    internal TestEngine(
+        ITestRuntimeProviderManager testHostProviderManager,
+        IProcessHelper processHelper,
+        IEnvironment environment)
+    {
+        _testHostProviderManager = testHostProviderManager;
+        _processHelper = processHelper;
+        _environment = environment;
+    }
 
-        public TestEngine() : this(TestRuntimeProviderManager.Instance, new ProcessHelper())
-        {
-        }
+    #region ITestEngine implementation
 
-        protected TestEngine(
-            TestRuntimeProviderManager testHostProviderManager,
-            IProcessHelper processHelper)
+    /// <inheritdoc/>
+    public IProxyDiscoveryManager GetDiscoveryManager(
+        IRequestData requestData,
+        DiscoveryCriteria discoveryCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        // Parallel level determines how many processes at most we should start at the same time. We take the number from settings, and if user
+        // has no preference or the preference is 0 then we use the number of logical processors. Or the number of sources, whatever is lower.
+        // We don't know for sure if we will start that many processes as some of the sources can run in a single testhost. This is determined by
+        // Shared on the test runtime provider. At this point we need to know only if the parallel level is more than 1, and so if we will do parallel
+        // run or not.
+        var parallelLevel = VerifyParallelSettingAndCalculateParallelLevel(
+            discoveryCriteria.Sources.Count(),
+            discoveryCriteria.RunSettings!);
+
+        var isParallelRun = parallelLevel > 1;
+
+        // Collecting IsParallel enabled.
+        requestData.MetricsCollection.Add(TelemetryDataConstants.ParallelEnabledDuringDiscovery, isParallelRun ? "True" : "False");
+        requestData.MetricsCollection.Add(TelemetryDataConstants.TestSessionId, discoveryCriteria.TestSessionInfo?.Id.ToString() ?? string.Empty);
+
+        // Get testhost managers by configuration, and either use it for in-process run. or for single source run.
+        List<TestRuntimeProviderInfo> testHostManagers = GetTestRuntimeProvidersForUniqueConfigurations(discoveryCriteria.RunSettings!, sourceToSourceDetailMap, warningLogger, out ITestRuntimeProvider? testHostManager);
+
+        // This is a big if that figures out if we can run in process. In process run is very restricted, it is non-parallel run
+        // that has the same target framework as the current process, and it also must not be running in DesignMode (server mode / under IDE)
+        // and more conditions. In all other cases we run in a separate testhost process.
+        if (ShouldRunInProcess(discoveryCriteria.RunSettings!, isParallelRun, isDataCollectorEnabled: false, testHostManagers))
         {
-            this.testHostProviderManager = testHostProviderManager;
-            this.processHelper = processHelper;
-        }
-
-        #region ITestEngine implementation
+            // We are running in process, so whatever the architecture and framework that was figured out is, it must be compatible. If we have more
+            // changes that we want to do to runsettings in the future, based on SourceDetail then it will depend on those details. But in general
+            // we will have to check that all source details are the same. Otherwise we for sure cannot run in process.
+            // E.g. if we get list of sources where one of them has different architecture we for sure cannot run in process, because the current
+            // process can handle only single runsettings.
+            if (testHostManagers.Count != 1)
+            {
+                throw new InvalidOperationException($"Exactly 1 testhost manager must be provided when running in process, but there {testHostManagers.Count} were provided.");
+            }
+            var testHostManagerInfo = testHostManagers[0];
 
-        /// <inheritdoc/>
-        public IProxyDiscoveryManager GetDiscoveryManager(
-            IRequestData requestData,
-            ITestRuntimeProvider testHostManager,
-            DiscoveryCriteria discoveryCriteria)
-        {
-            var parallelLevel = this.VerifyParallelSettingAndCalculateParallelLevel(
-                discoveryCriteria.Sources.Count(),
-                discoveryCriteria.RunSettings);
+            TPDebug.Assert(testHostManager is not null, "testHostManager is null");
+            // Don't intialize, we are taking an instance that we created already initialized in GetTestRuntimeProvidersForUniqueConfigurations
+            // testHostManager.Initialize(TestSessionMessageLogger.Instance, testHostManagerInfo.RunSettings);
 
-            // Collecting IsParallel enabled.
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.ParallelEnabledDuringDiscovery,
-                parallelLevel > 1 ? "True" : "False");
+            return new InProcessProxyDiscoveryManager(
+                testHostManager,
+                new TestHostManagerFactory(requestData.IsTelemetryOptedIn));
+        }
 
-            if (this.ShouldRunInNoIsolation(discoveryCriteria.RunSettings, parallelLevel > 1, false))
-            {
-                var isTelemetryOptedIn = requestData.IsTelemetryOptedIn;
-                var newRequestData = this.GetRequestData(isTelemetryOptedIn);
-                return new InProcessProxyDiscoveryManager(
-                    testHostManager,
-                    new TestHostManagerFactory(newRequestData));
-            }
+        // Create one data aggregator per parallel discovery and share it with all the proxy discovery managers.
+        // We need to share the aggregator because when cancelling discovery we don't want to await all managers,
+        // and so the first manager replying with the discovery complete (aborted) event arg will cause the parallel
+        // discovery manager to publish its current state. But doing so we are losing the collected state of all the
+        // other managers.
+        var discoveryDataAggregator = new DiscoveryDataAggregator();
+        Func<TestRuntimeProviderInfo, DiscoveryCriteria, IProxyDiscoveryManager> proxyDiscoveryManagerCreator = (runtimeProviderInfo, discoveryCriteria) =>
+        {
+            var sources = discoveryCriteria.Sources.ToList();
+            var hostManager = _testHostProviderManager.GetTestHostManagerByRunConfiguration(runtimeProviderInfo.RunSettings, sources);
+            hostManager?.Initialize(TestSessionMessageLogger.Instance, runtimeProviderInfo.RunSettings!);
 
-            Func<IProxyDiscoveryManager> proxyDiscoveryManagerCreator = () =>
-            {
-                var hostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(discoveryCriteria.RunSettings);
-                hostManager?.Initialize(TestSessionMessageLogger.Instance, discoveryCriteria.RunSettings);
+            ThrowExceptionIfTestHostManagerIsNull(hostManager, runtimeProviderInfo.RunSettings);
+            TPDebug.Assert(hostManager is not null, "hostManager is null");
 
-                // This function is used to either take a pre-existing proxy operation manager from
-                // the test pool or to create a new proxy operation manager on the spot.
-                Func<string, ProxyDiscoveryManager, ProxyOperationManager>
+            // This function is used to either take a pre-existing proxy operation manager from
+            // the test pool or to create a new proxy operation manager on the spot.
+            Func<string, ProxyDiscoveryManager, ProxyOperationManager>
                 proxyOperationManagerCreator = (
                     string source,
                     ProxyDiscoveryManager proxyDiscoveryManager) =>
                 {
+                    TPDebug.Assert(discoveryCriteria.TestSessionInfo is not null, "discoveryCriteria.TestSessionInfo is null");
+
                     // In case we have an active test session, we always prefer the already
                     // created proxies instead of the ones that need to be created on the spot.
                     var proxyOperationManager = TestSessionPool.Instance.TryTakeProxy(
                         discoveryCriteria.TestSessionInfo,
                         source,
-                        discoveryCriteria.RunSettings);
+                        runtimeProviderInfo.RunSettings,
+                        requestData);
 
                     if (proxyOperationManager == null)
                     {
                         // If the proxy creation process based on test session info failed, then
                         // we'll proceed with the normal creation process as if no test session
                         // info was passed in in the first place.
-                        // 
+                        //
                         // WARNING: This should not normally happen and it raises questions
                         // regarding the test session pool operation and consistency.
                         EqtTrace.Warning("ProxyDiscoveryManager creation with test session failed.");
 
                         proxyOperationManager = new ProxyOperationManager(
                             requestData,
-                            new TestRequestSender(requestData.ProtocolConfig, hostManager),
+                            new TestRequestSender(requestData.ProtocolConfig!, hostManager),
                             hostManager,
+                            // There is always at least one, and all of them have the same framework and architecture.
+                            runtimeProviderInfo.SourceDetails[0].Framework,
                             proxyDiscoveryManager);
                     }
 
                     return proxyOperationManager;
                 };
 
-                // In case we have an active test session, we always prefer the already
-                // created proxies instead of the ones that need to be created on the spot.
-                return (discoveryCriteria.TestSessionInfo != null)
-                    ? new ProxyDiscoveryManager(
-                        discoveryCriteria.TestSessionInfo,
-                        proxyOperationManagerCreator)
-                    : new ProxyDiscoveryManager(
-                        requestData,
-                        new TestRequestSender(requestData.ProtocolConfig, hostManager),
-                        hostManager);
-            };
-
-            return (parallelLevel > 1 || !testHostManager.Shared)
-                ? new ParallelProxyDiscoveryManager(
+            // In case we have an active test session, we always prefer the already
+            // created proxies instead of the ones that need to be created on the spot.
+            return (discoveryCriteria.TestSessionInfo != null)
+                ? new ProxyDiscoveryManager(
+                    discoveryCriteria.TestSessionInfo,
+                    proxyOperationManagerCreator,
+                    discoveryDataAggregator)
+                : new ProxyDiscoveryManager(
                     requestData,
-                    proxyDiscoveryManagerCreator,
-                    parallelLevel,
-                    sharedHosts: testHostManager.Shared)
-                : proxyDiscoveryManagerCreator();
-        }
+                    new TestRequestSender(requestData.ProtocolConfig!, hostManager),
+                    hostManager,
+                    // There is always at least one, and all of them have the same framework and architecture.
+                    runtimeProviderInfo.SourceDetails[0].Framework,
+                    discoveryDataAggregator);
+        };
+
+        return new ParallelProxyDiscoveryManager(requestData, proxyDiscoveryManagerCreator, discoveryDataAggregator, parallelLevel, testHostManagers);
+    }
 
-        /// <inheritdoc/>
-        public IProxyExecutionManager GetExecutionManager(
-            IRequestData requestData,
-            ITestRuntimeProvider testHostManager,
-            TestRunCriteria testRunCriteria)
-        {
-            var distinctSources = GetDistinctNumberOfSources(testRunCriteria);
-            var parallelLevel = this.VerifyParallelSettingAndCalculateParallelLevel(
-                distinctSources,
-                testRunCriteria.TestRunSettings);
+    /// <inheritdoc/>
+    public IProxyExecutionManager GetExecutionManager(
+        IRequestData requestData,
+        TestRunCriteria testRunCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        TPDebug.Assert(testRunCriteria.TestRunSettings is not null, "testRunCriteria.TestRunSettings is null");
+
+        // We use mulitple "different" runsettings here. We have runsettings that come with the testRunCriteria,
+        // and we use that to figure out the common stuff before we try to setup the run. Later we patch the settings
+        // from the additional details that were passed. Those should not affect the common properties that are used for setup.
+        // Right now the only two things that change there are the architecture and framework so we can mix them in a single run.
+        var distinctSources = GetDistinctNumberOfSources(testRunCriteria);
+        var parallelLevel = VerifyParallelSettingAndCalculateParallelLevel(distinctSources, testRunCriteria.TestRunSettings);
 
-            // Collecting IsParallel enabled.
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.ParallelEnabledDuringExecution,
-                parallelLevel > 1 ? "True" : "False");
+        // See comments in GetDiscoveryManager for more info about what is happening in this method.
+        var isParallelRun = parallelLevel > 1;
 
-            var isDataCollectorEnabled = XmlRunSettingsUtilities.IsDataCollectionEnabled(testRunCriteria.TestRunSettings);
-            var isInProcDataCollectorEnabled = XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(testRunCriteria.TestRunSettings);
+        // Collecting IsParallel enabled.
+        requestData.MetricsCollection.Add(TelemetryDataConstants.ParallelEnabledDuringExecution, isParallelRun ? "True" : "False");
+        requestData.MetricsCollection.Add(TelemetryDataConstants.TestSessionId, testRunCriteria.TestSessionInfo?.Id.ToString() ?? string.Empty);
 
-            if (this.ShouldRunInNoIsolation(
+        var isDataCollectorEnabled = XmlRunSettingsUtilities.IsDataCollectionEnabled(testRunCriteria.TestRunSettings);
+        var isInProcDataCollectorEnabled = XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(testRunCriteria.TestRunSettings);
+
+        var testHostProviders = GetTestRuntimeProvidersForUniqueConfigurations(testRunCriteria.TestRunSettings, sourceToSourceDetailMap, warningLogger, out ITestRuntimeProvider? testHostManager);
+
+        if (ShouldRunInProcess(
                 testRunCriteria.TestRunSettings,
-                parallelLevel > 1,
-                isDataCollectorEnabled || isInProcDataCollectorEnabled))
+                isParallelRun,
+                isDataCollectorEnabled || isInProcDataCollectorEnabled,
+                testHostProviders))
+        {
+            // Not updating runsettings from source detail on purpose here. We are running in process, so whatever the settings we figured out at the start. They must be compatible
+            // with the current process, otherwise we would not be able to run inside of the current process.
+            //
+            // We know that we only have a single testHostManager here, because we figure that out in ShouldRunInProcess.
+            ThrowExceptionIfTestHostManagerIsNull(testHostManager, testRunCriteria.TestRunSettings);
+            TPDebug.Assert(testHostManager is not null, "testHostManager is null");
+
+            // Don't intialize, we are taking an instance that we created already initialized in GetTestRuntimeProvidersForUniqueConfigurations
+            // testHostManager.Initialize(TestSessionMessageLogger.Instance, testRunCriteria.TestRunSettings);
+
+            // NOTE: The custom launcher should not be set when we have test session info available.
+            if (testRunCriteria.TestHostLauncher != null)
             {
-                var isTelemetryOptedIn = requestData.IsTelemetryOptedIn;
-                var newRequestData = this.GetRequestData(isTelemetryOptedIn);
-                return new InProcessProxyExecutionManager(
-                    testHostManager,
-                    new TestHostManagerFactory(newRequestData));
+                testHostManager!.SetCustomLauncher(testRunCriteria.TestHostLauncher);
             }
 
-            // SetupChannel ProxyExecutionManager with data collection if data collectors are
-            // specififed in run settings.
-            Func<IProxyExecutionManager> proxyExecutionManagerCreator = () =>
-            {
-                // Create a new host manager, to be associated with individual
-                // ProxyExecutionManager(&POM)
-                var hostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(testRunCriteria.TestRunSettings);
-                hostManager?.Initialize(TestSessionMessageLogger.Instance, testRunCriteria.TestRunSettings);
+            return new InProcessProxyExecutionManager(
+                testHostManager,
+                new TestHostManagerFactory(requestData.IsTelemetryOptedIn));
+        }
 
-                if (testRunCriteria.TestHostLauncher != null)
-                {
-                    hostManager.SetCustomLauncher(testRunCriteria.TestHostLauncher);
-                }
+        // This creates a single non-parallel execution manager, based requestData, isDataCollectorEnabled and the
+        // split testRunCriteria. The overall testRunCriteria are split to smaller pieces (e.g. each source from the overall
+        // testRunCriteria) so we can run them in parallel.
+        //
+        // The function below grabs most of the parameter via closure from the local context,
+        // but gets the runtime provider later, as well as the discovery request, because that is specific info to the source (or sources)
+        // it will be running.
+        // This creator does not get those smaller pieces of testRunCriteria, those come later when we call a method on
+        // the non-parallel execution manager we create here. E.g. StartTests(<single piece of testRunCriteria>).
+        Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> proxyExecutionManagerCreator = (runtimeProviderInfo, runCriteria) =>
+            CreateNonParallelExecutionManager(requestData, runCriteria, isDataCollectorEnabled, runtimeProviderInfo);
 
-                var requestSender = new TestRequestSender(requestData.ProtocolConfig, hostManager);
+        var executionManager = new ParallelProxyExecutionManager(requestData, proxyExecutionManagerCreator, parallelLevel, testHostProviders);
 
-                if (testRunCriteria.TestSessionInfo != null)
-                {
-                    // This function is used to either take a pre-existing proxy operation manager from
-                    // the test pool or to create a new proxy operation manager on the spot.
-                    Func<string, ProxyExecutionManager, ProxyOperationManager>
-                    proxyOperationManagerCreator = (
-                        string source,
-                        ProxyExecutionManager proxyExecutionManager) =>
-                    {
-                        var proxyOperationManager = TestSessionPool.Instance.TryTakeProxy(
-                            testRunCriteria.TestSessionInfo,
-                            source,
-                            testRunCriteria.TestRunSettings);
-
-                        if (proxyOperationManager == null)
-                        {
-                            // If the proxy creation process based on test session info failed, then
-                            // we'll proceed with the normal creation process as if no test session
-                            // info was passed in in the first place.
-                            // 
-                            // WARNING: This should not normally happen and it raises questions
-                            // regarding the test session pool operation and consistency.
-                            EqtTrace.Warning("ProxyExecutionManager creation with test session failed.");
-
-                            proxyOperationManager = new ProxyOperationManager(
-                                requestData,
-                                requestSender,
-                                hostManager,
-                                proxyExecutionManager);
-                        }
-
-                        return proxyOperationManager;
-                    };
+        EqtTrace.Verbose($"TestEngine.GetExecutionManager: Chosen execution manager '{executionManager.GetType().AssemblyQualifiedName}' ParallelLevel '{parallelLevel}'.");
+
+        return executionManager;
+    }
 
-                    // In case we have an active test session, data collection needs were
-                    // already taken care of when first creating the session. As a consequence
-                    // we always return this proxy instead of choosing between the vanilla
-                    // execution proxy and the one with data collection enabled.
-                    return new ProxyExecutionManager(
+    // This is internal so tests can use it.
+    internal IProxyExecutionManager CreateNonParallelExecutionManager(IRequestData requestData, TestRunCriteria testRunCriteria, bool isDataCollectorEnabled, TestRuntimeProviderInfo runtimeProviderInfo)
+    {
+        // SetupChannel ProxyExecutionManager with data collection if data collectors are
+        // specified in run settings.
+        // Create a new host manager, to be associated with individual
+        // ProxyExecutionManager(&POM)
+        var sources = runtimeProviderInfo.SourceDetails.Select(r => r.Source!).ToList();
+        var hostManager = _testHostProviderManager.GetTestHostManagerByRunConfiguration(runtimeProviderInfo.RunSettings, sources);
+        ThrowExceptionIfTestHostManagerIsNull(hostManager, runtimeProviderInfo.RunSettings);
+        hostManager!.Initialize(TestSessionMessageLogger.Instance, runtimeProviderInfo.RunSettings!);
+
+        if (testRunCriteria.TestHostLauncher != null)
+        {
+            hostManager.SetCustomLauncher(testRunCriteria.TestHostLauncher);
+        }
+
+        var requestSender = new TestRequestSender(requestData.ProtocolConfig!, hostManager);
+
+        if (testRunCriteria.TestSessionInfo != null)
+        {
+            // This function is used to either take a pre-existing proxy operation manager from
+            // the test pool or to create a new proxy operation manager on the spot.
+            Func<string, ProxyExecutionManager, ProxyOperationManager>
+                proxyOperationManagerCreator = (
+                    string source,
+                    ProxyExecutionManager proxyExecutionManager) =>
+                {
+                    var proxyOperationManager = TestSessionPool.Instance.TryTakeProxy(
                         testRunCriteria.TestSessionInfo,
-                        proxyOperationManagerCreator,
-                        testRunCriteria.DebugEnabledForTestSession);
-                }
+                        source,
+                        runtimeProviderInfo.RunSettings,
+                        requestData);
+
+                    if (proxyOperationManager == null)
+                    {
+                        // If the proxy creation process based on test session info failed, then
+                        // we'll proceed with the normal creation process as if no test session
+                        // info was passed in in the first place.
+                        //
+                        // WARNING: This should not normally happen and it raises questions
+                        // regarding the test session pool operation and consistency.
+                        EqtTrace.Warning("ProxyExecutionManager creation with test session failed.");
 
-                return isDataCollectorEnabled
-                    ? new ProxyExecutionManagerWithDataCollection(
-                        requestData,
-                        requestSender,
-                        hostManager,
-                        new ProxyDataCollectionManager(
+                        proxyOperationManager = new ProxyOperationManager(
                             requestData,
-                            testRunCriteria.TestRunSettings,
-                            GetSourcesFromTestRunCriteria(testRunCriteria)))
-                    : new ProxyExecutionManager(
-                        requestData,
-                        requestSender,
-                        hostManager);
-            };
+                            requestSender,
+                            hostManager,
+                            // There is always at least one, and all of them have the same framework and architecture.
+                            runtimeProviderInfo.SourceDetails[0].Framework,
+                            proxyExecutionManager);
+                    }
 
-            // parallelLevel = 1 for desktop should go via else route.
-            return (parallelLevel > 1 || !testHostManager.Shared)
-                ? new ParallelProxyExecutionManager(
-                    requestData,
-                    proxyExecutionManagerCreator,
-                    parallelLevel,
-                    sharedHosts: testHostManager.Shared)
-                : proxyExecutionManagerCreator();
+                    return proxyOperationManager;
+                };
+
+            // In case we have an active test session, data collection needs were
+            // already taken care of when first creating the session. As a consequence
+            // we always return this proxy instead of choosing between the vanilla
+            // execution proxy and the one with data collection enabled.
+            return new ProxyExecutionManager(
+                testRunCriteria.TestSessionInfo,
+                proxyOperationManagerCreator,
+                testRunCriteria.DebugEnabledForTestSession);
         }
 
-        /// <inheritdoc/>
-        public IProxyTestSessionManager GetTestSessionManager(
-            IRequestData requestData,
-            StartTestSessionCriteria testSessionCriteria)
-        {
-            var parallelLevel = this.VerifyParallelSettingAndCalculateParallelLevel(
-                testSessionCriteria.Sources.Count,
-                testSessionCriteria.RunSettings);
+        return isDataCollectorEnabled
+            ? new ProxyExecutionManagerWithDataCollection(
+                requestData,
+                requestSender,
+                hostManager,
+                // There is always at least one, and all of them have the same framework and architecture.
+                runtimeProviderInfo.SourceDetails[0].Framework!,
+                new ProxyDataCollectionManager(
+                    requestData,
+                    runtimeProviderInfo.RunSettings,
+                    sources))
+            : new ProxyExecutionManager(
+                requestData,
+                requestSender,
+                hostManager,
+                // There is always at least one, and all of them have the same framework and architecture.
+                runtimeProviderInfo.SourceDetails[0].Framework!);
+    }
+
+    /// <inheritdoc/>
+    public IProxyTestSessionManager? GetTestSessionManager(
+        IRequestData requestData,
+        StartTestSessionCriteria testSessionCriteria,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger)
+    {
+        var parallelLevel = VerifyParallelSettingAndCalculateParallelLevel(
+            testSessionCriteria.Sources!.Count,
+            testSessionCriteria.RunSettings!);
+
+        bool isParallelRun = parallelLevel > 1;
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.ParallelEnabledDuringStartTestSession,
+            isParallelRun ? "True" : "False");
 
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.ParallelEnabledDuringStartTestSession,
-                parallelLevel > 1 ? "True" : "False");
+        var isDataCollectorEnabled = XmlRunSettingsUtilities.IsDataCollectionEnabled(testSessionCriteria.RunSettings);
+        var isInProcDataCollectorEnabled = XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(testSessionCriteria.RunSettings);
 
-            var isDataCollectorEnabled = XmlRunSettingsUtilities.IsDataCollectionEnabled(testSessionCriteria.RunSettings);
-            var isInProcDataCollectorEnabled = XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(testSessionCriteria.RunSettings);
+        List<TestRuntimeProviderInfo> testRuntimeProviders = GetTestRuntimeProvidersForUniqueConfigurations(testSessionCriteria.RunSettings!, sourceToSourceDetailMap, warningLogger, out var _);
 
-            if (this.ShouldRunInNoIsolation(
-                testSessionCriteria.RunSettings,
-                parallelLevel > 1,
-                isDataCollectorEnabled || isInProcDataCollectorEnabled))
+        if (ShouldRunInProcess(
+                testSessionCriteria.RunSettings!,
+                isParallelRun,
+                isDataCollectorEnabled || isInProcDataCollectorEnabled,
+                testRuntimeProviders))
+        {
+            // In this case all tests will be run in the current process (vstest.console), so there is no
+            // testhost to pre-start. No session will be created, and the session info will be null.
+            return null;
+        }
+
+        Func<TestRuntimeProviderInfo, ProxyOperationManager?> proxyCreator = testRuntimeProviderInfo =>
+        {
+            var sources = testRuntimeProviderInfo.SourceDetails.Select(x => x.Source!).ToList();
+            var hostManager = _testHostProviderManager.GetTestHostManagerByRunConfiguration(testRuntimeProviderInfo.RunSettings, sources);
+            ThrowExceptionIfTestHostManagerIsNull(hostManager, testRuntimeProviderInfo.RunSettings);
+
+            hostManager!.Initialize(TestSessionMessageLogger.Instance, testRuntimeProviderInfo.RunSettings!);
+            if (testSessionCriteria.TestHostLauncher != null)
             {
-                // This condition is the equivalent of the in-process proxy execution manager case.
-                // In this case all tests will be run in the vstest.console process, so there's no
-                // test host to be started. As a consequence there'll be no session info.
-                return null;
+                hostManager.SetCustomLauncher(testSessionCriteria.TestHostLauncher);
             }
 
-            Func<ProxyOperationManager> proxyCreator = () =>
+            var requestSender = new TestRequestSender(requestData.ProtocolConfig!, hostManager)
             {
-                var hostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(testSessionCriteria.RunSettings);
-                if (hostManager == null)
-                {
-                    throw new TestPlatformException(
-                        string.Format(
-                            CultureInfo.CurrentCulture,
-                            Resources.Resources.NoTestHostProviderFound));
-                }
-
-                hostManager.Initialize(TestSessionMessageLogger.Instance, testSessionCriteria.RunSettings);
-                if (testSessionCriteria.TestHostLauncher != null)
-                {
-                    hostManager.SetCustomLauncher(testSessionCriteria.TestHostLauncher);
-                }
+                CloseConnectionOnOperationComplete = false
+            };
 
-                var requestSender = new TestRequestSender(requestData.ProtocolConfig, hostManager)
+            // TODO (copoiena): For now we don't support data collection alongside test
+            // sessions.
+            //
+            // The reason for this is that, in the case of Code Coverage for example, the
+            // data collector needs to pass some environment variables to the testhost process
+            // before the testhost process is started. This means that the data collector must
+            // be running when the testhost process is spawned, however the testhost process
+            // should be spawned during build, and it's problematic to have the data collector
+            // running during build because it must instrument the .dll files that don't exist
+            // yet.
+            return isDataCollectorEnabled
+                ? null
+                // ? new ProxyOperationManagerWithDataCollection(
+                //     requestData,
+                //     requestSender,
+                //     hostManager,
+                //     new ProxyDataCollectionManager(
+                //         requestData,
+                //         runsettingsXml,
+                //         testSessionCriteria.Sources))
+                //     {
+                //         CloseRequestSenderChannelOnProxyClose = true
+                //     }
+                : new ProxyOperationManager(
+                    requestData,
+                    requestSender,
+                    hostManager,
+                    // There is always at least one, and all of them have the same framework and architecture.
+                    testRuntimeProviderInfo.SourceDetails[0].Framework!)
                 {
-                    CloseConnectionOnOperationComplete = false
+                    IsTestSessionEnabled = true
                 };
+        };
 
-                // TODO (copoiena): For now we don't support data collection alongside test
-                // sessions.
-                // 
-                // The reason for this is that, in the case of Code Coverage for example, the
-                // data collector needs to pass some environment variables to the testhost process
-                // before the testhost process is started. This means that the data collector must
-                // be running when the testhost process is spawned, however the testhost process
-                // should be spawned during build, and it's problematic to have the data collector
-                // running during build because it must instrument the .dll files that don't exist
-                // yet.
-                return isDataCollectorEnabled
-                    ? null
-                    // ? new ProxyOperationManagerWithDataCollection(
-                    //     requestData,
-                    //     requestSender,
-                    //     hostManager,
-                    //     new ProxyDataCollectionManager(
-                    //         requestData,
-                    //         testSessionCriteria.RunSettings,
-                    //         testSessionCriteria.Sources))
-                    //     {
-                    //         CloseRequestSenderChannelOnProxyClose = true
-                    //     }
-                    : new ProxyOperationManager(
-                        requestData,
-                        requestSender,
-                        hostManager);
-            };
-
-            var testhostManager = this.testHostProviderManager.GetTestHostManagerByRunConfiguration(testSessionCriteria.RunSettings);
-            testhostManager.Initialize(TestSessionMessageLogger.Instance, testSessionCriteria.RunSettings);
-            var testhostCount = (parallelLevel > 1 || !testhostManager.Shared)
-                ? testSessionCriteria.Sources.Count
-                : 1;
-
-            return new ProxyTestSessionManager(testSessionCriteria, testhostCount, proxyCreator);
-        }
+        // TODO: This condition should be returning the maxParallel level to avoid pre-starting way too many testhosts, because maxParallel level,
+        // can be smaller than the number of sources to run.
+        var maxTesthostCount = isParallelRun ? testSessionCriteria.Sources.Count : 1;
 
-        /// <inheritdoc/>
-        public ITestExtensionManager GetExtensionManager()
+        return new ProxyTestSessionManager(testSessionCriteria, maxTesthostCount, proxyCreator, testRuntimeProviders)
         {
-            return this.testExtensionManager
-                ?? (this.testExtensionManager = new TestExtensionManager());
-        }
+            // Individual proxy setup failures are tolerated since SetupChannel may fail if the
+            // testhost it tries to start is not compatible with the test session feature.
+            DisposalPolicy = ProxyDisposalOnCreationFailPolicy.AllowProxySetupFailures
+        };
+    }
 
-        /// <inheritdoc/>
-        public ITestLoggerManager GetLoggerManager(IRequestData requestData)
+    private List<TestRuntimeProviderInfo> GetTestRuntimeProvidersForUniqueConfigurations(
+        string runSettings,
+        IDictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger,
+        out ITestRuntimeProvider? mostRecentlyCreatedInstance)
+    {
+        // Group source details to get unique frameworks and architectures for which we will run, so we can figure
+        // out which runtime providers would run them, and if the runtime provider is shared or not.
+        mostRecentlyCreatedInstance = null;
+        var testRuntimeProviders = new List<TestRuntimeProviderInfo>();
+        var uniqueRunConfigurations = sourceToSourceDetailMap.Values.GroupBy(k => $"{k.Framework}|{k.Architecture}");
+        foreach (var runConfiguration in uniqueRunConfigurations)
         {
-            return new TestLoggerManager(
-                requestData,
-                TestSessionMessageLogger.Instance,
-                new InternalTestLoggerEvents(TestSessionMessageLogger.Instance));
-        }
+            // It is okay to take the first (or any) source detail in the group. We are grouping to get the same source detail, so all architectures and frameworks are the same.
+            var sourceDetail = runConfiguration.First();
+            var runsettingsXml = SourceDetailHelper.UpdateRunSettingsFromSourceDetail(runSettings, sourceDetail);
+            var sources = runConfiguration.Select(c => c.Source!).ToList();
+            var testRuntimeProvider = _testHostProviderManager.GetTestHostManagerByRunConfiguration(runsettingsXml, sources);
 
-        #endregion
-
-        private static int GetDistinctNumberOfSources(TestRunCriteria testRunCriteria)
-        {
-            // No point in creating more processes if number of sources is less than what the user
-            // configured for.
-            int numSources = 1;
-            if (testRunCriteria.HasSpecificTests)
+            if (testRuntimeProvider != null)
             {
-                numSources = new HashSet<string>(
-                             testRunCriteria.Tests.Select(testCase => testCase.Source)).Count;
+                // Initialize here, because Shared is picked up from the instance, and it can be set during initalization.
+                testRuntimeProvider.Initialize(TestSessionMessageLogger.Instance, runsettingsXml);
+
+                // DO NOT move this above Initialize, the intialization can set Shared, to true, and we would not capture that.
+                testRuntimeProviders.Add(new TestRuntimeProviderInfo(testRuntimeProvider.GetType(), testRuntimeProvider.Shared,
+                   runsettingsXml, sourceDetails: runConfiguration.ToList()));
+
+                // Outputting the instance, because the code for in-process run uses it, and we don't want to resolve it one more time.
+                mostRecentlyCreatedInstance = testRuntimeProvider;
             }
             else
             {
-                numSources = testRunCriteria.Sources.Count();
+                testRuntimeProviders.Add(new TestRuntimeProviderInfo(type: null, shared: false, runsettingsXml, sourceDetails: runConfiguration.ToList()));
             }
-
-            return numSources;
         }
 
-        /// <summary>
-        /// Verifies parallel setting and returns parallel level to use based on the run criteria.
-        /// </summary>
-        /// 
-        /// <param name="sourceCount">The source count.</param>
-        /// <param name="runSettings">The run settings.</param>
-        /// 
-        /// <returns>The parallel level to use.</returns>
-        private int VerifyParallelSettingAndCalculateParallelLevel(
-            int sourceCount,
-            string runSettings)
+        WarnAboutNotFoundRuntimeProvidersOrThrowWhenNoneAreFound(testRuntimeProviders, warningLogger);
+
+        // Do NOT return just found providers here, instead return all of them. Later sources will be split to criteria
+        // and we need to have all the sources available there, and filter them down to skip the ones that don't
+        // have runtime providers there.
+        // var foundRuntimeProviders = testRuntimeProviders.Where(runtimeProvider => runtimeProvider.Type != null).ToList();
+        return testRuntimeProviders;
+    }
+
+    /// <inheritdoc/>
+    public ITestExtensionManager GetExtensionManager() => _testExtensionManager ??= new TestExtensionManager();
+
+    /// <inheritdoc/>
+    public ITestLoggerManager GetLoggerManager(IRequestData requestData)
+    {
+        return new TestLoggerManager(
+            requestData,
+            TestSessionMessageLogger.Instance,
+            new InternalTestLoggerEvents(TestSessionMessageLogger.Instance));
+    }
+
+    #endregion
+
+    private static int GetDistinctNumberOfSources(TestRunCriteria testRunCriteria)
+    {
+        // No point in creating more processes if number of sources is less than what the user
+        // configured for.
+        int numberOfSources = testRunCriteria.HasSpecificTests
+            ? new HashSet<string>(
+                testRunCriteria.Tests.Select(testCase => testCase.Source)).Count
+            : testRunCriteria.Sources.Count();
+        return numberOfSources;
+    }
+
+    /// <summary>
+    /// Verifies parallel setting and returns parallel level to use based on the run criteria.
+    /// </summary>
+    ///
+    /// <param name="sourceCount">The source count.</param>
+    /// <param name="runSettings">The run settings.</param>
+    ///
+    /// <returns>The parallel level to use.</returns>
+    private int VerifyParallelSettingAndCalculateParallelLevel(
+        int sourceCount,
+        string? runSettings)
+    {
+        // Default is 1.
+        int parallelLevelToUse;
+        try
         {
-            // Default is 1.
-            int parallelLevelToUse = 1;
-            try
+            // Check the user parallel setting.
+            int maxCpuCount = RunSettingsUtilities.GetMaxCpuCount(runSettings);
+            parallelLevelToUse = maxCpuCount == 0
+                ? _environment.ProcessorCount
+                : maxCpuCount;
+
+            EqtTrace.Verbose(
+                "TestEngine: Initializing Parallel Execution as MaxCpuCount is set to: {0}",
+                parallelLevelToUse);
+
+            var enableParallel = parallelLevelToUse > 1;
+            // Verify if the number of sources is less than user setting of parallel.
+            // We should use number of sources as the parallel level, if sources count is less
+            // than parallel level.
+            if (enableParallel)
             {
-                // Check the user parallel setting.
-                int userParallelSetting = RunSettingsUtilities.GetMaxCpuCount(runSettings);
-                parallelLevelToUse = userParallelSetting == 0
-                    ? Environment.ProcessorCount
-                    : userParallelSetting;
-                var enableParallel = parallelLevelToUse > 1;
+                // In case of a background discovery we want to reduce the number of cores utilized
+                // to leave enough power for other tasks.
+                var runSettingsEnvVariables = InferRunSettingsHelper.GetEnvironmentVariables(runSettings);
+                string? isBackgroundDiscoveryEnabled = null;
+                if (runSettingsEnvVariables is not null
+                    && runSettingsEnvVariables.TryGetValue("VSTEST_BACKGROUND_DISCOVERY", out isBackgroundDiscoveryEnabled)
+                    && isBackgroundDiscoveryEnabled == "1"
+                    && maxCpuCount == 0) // If user specifies a CPU count, respect it
+                {
+                    // Dummy logic based on some observations, might need to be tweaked/improved.
+                    parallelLevelToUse = parallelLevelToUse switch
+                    {
+                        1 => 1,
+                        < 8 => (int)Math.Round(parallelLevelToUse / 2.0, MidpointRounding.AwayFromZero),
+                        _ => (int)Math.Round(0.75 * parallelLevelToUse, MidpointRounding.AwayFromZero),
+                    };
+                }
 
-                EqtTrace.Verbose(
-                    "TestEngine: Initializing Parallel Execution as MaxCpuCount is set to: {0}",
-                    parallelLevelToUse);
+                EqtTrace.Verbose("TestEngine.VerifyParallelSettingAndCalculateParallelLevel: Parallel execution is enabled (cpu count: {0}, max cpu count is {1}, calculated cpu count is {2}, background mode is {3}, number of sources is {4})", _environment.ProcessorCount, maxCpuCount, parallelLevelToUse, isBackgroundDiscoveryEnabled == "1" ? "enabled" : "disabled", sourceCount);
 
-                // Verify if the number of sources is less than user setting of parallel.
-                // We should use number of sources as the parallel level, if sources count is less
-                // than parallel level.
-                if (enableParallel)
+                // If we're using the multi host execution we don't want to
+                // limit the number of hosts also if we're running less sources than the parallel level chosen.
+                int? numberOfTestHostToUse = GetTargetFrameworkTestHostDemultiplexer(runSettings);
+                if (numberOfTestHostToUse is null)
                 {
                     parallelLevelToUse = Math.Min(sourceCount, parallelLevelToUse);
+                }
 
-                    // If only one source, no need to use parallel service client.
-                    enableParallel = parallelLevelToUse > 1;
+                // If only one source, no need to use parallel service client.
+                enableParallel = parallelLevelToUse > 1;
 
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Verbose(
-                            "TestEngine: ParallelExecution set to '{0}' as the parallel level is adjusted to '{1}' based on number of sources",
-                            enableParallel,
-                            parallelLevelToUse);
-                    }
-                }
+                EqtTrace.Verbose(
+                    "TestEngine: ParallelExecution set to '{0}' as the parallel level is adjusted to '{1}' based on number of sources",
+                    enableParallel,
+                    parallelLevelToUse);
             }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "TestEngine: Error occurred while initializing ParallelExecution: {0}",
-                    ex);
-                EqtTrace.Warning("TestEngine: Defaulting to Sequential Execution");
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error(
+                "TestEngine: Error occurred while initializing ParallelExecution: {0}",
+                ex);
+            EqtTrace.Warning("TestEngine: Defaulting to Sequential Execution");
 
-                parallelLevelToUse = 1;
-            }
+            parallelLevelToUse = 1;
+        }
+
+        return parallelLevelToUse;
+    }
+
+    private bool ShouldRunInProcess(
+        string runsettings,
+        bool isParallelEnabled,
+        bool isDataCollectorEnabled,
+        List<TestRuntimeProviderInfo> testHostProviders)
+    {
+        if (testHostProviders.Count > 1)
+        {
+            EqtTrace.Info("TestEngine.ShouldRunInNoIsolation: This run has multiple different architectures or frameworks, running in isolation (in a separate testhost proces).");
+            return false;
+        }
+
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
+
+        if (runConfiguration.InIsolation)
+        {
+            EqtTrace.Info("TestEngine.ShouldRunInNoIsolation: running test in isolation");
+            return false;
+        }
+
+        // Run tests in isolation if run is authored using testsettings.
+        if (InferRunSettingsHelper.IsTestSettingsEnabled(runsettings))
+        {
+            return false;
+        }
+
+        var currentProcessPath = _processHelper.GetCurrentProcessFileName();
+        TPDebug.Assert(currentProcessPath != null, "currentProcessPath is null");
+
+        // If running with the dotnet executable, then don't run in in process.
+        if (currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
+            || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
+        }
 
-            return parallelLevelToUse;
+        // Return true if
+        // 1) Not running in parallel;
+        // 2) Data collector is not enabled;
+        // 3) Target platform is compatible or AnyCpu;
+        // 4) DisableAppDomain is false;
+        // 5) Not running in design mode;
+        // 6) target framework is NETFramework (Desktop test);
+        if (!isParallelEnabled &&
+            !isDataCollectorEnabled &&
+            (runConfiguration.TargetPlatform == ObjectModel.Constants.DefaultPlatform || runConfiguration.TargetPlatform == Architecture.AnyCPU) &&
+            !runConfiguration.DisableAppDomain &&
+            !runConfiguration.DesignMode &&
+            runConfiguration.TargetFramework!.Name.IndexOf("netframework", StringComparison.OrdinalIgnoreCase) >= 0)
+        {
+            EqtTrace.Info("TestEngine.ShouldRunInNoIsolation: running test in process(inside vstest.console.exe process)");
+            return true;
         }
 
-        private bool ShouldRunInNoIsolation(
-            string runsettings,
-            bool isParallelEnabled,
-            bool isDataCollectorEnabled)
+        return false;
+    }
+
+    private static void ThrowExceptionIfTestHostManagerIsNull(ITestRuntimeProvider? testHostManager, string? settingsXml)
+    {
+        if (testHostManager == null)
         {
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
+            EqtTrace.Error($"{nameof(TestEngine)}.{nameof(ThrowExceptionIfTestHostManagerIsNull)}: No suitable testHostProvider found for runsettings: {settingsXml}");
+            throw new TestPlatformException(Resources.Resources.NoTestHostProviderFound);
+        }
+    }
 
-            if (runConfiguration.InIsolation)
+    private static void WarnAboutNotFoundRuntimeProvidersOrThrowWhenNoneAreFound(List<TestRuntimeProviderInfo> testRuntimeProviders, IWarningLogger warningLogger)
+    {
+        if (testRuntimeProviders.Count == 0)
+            throw new ArgumentException(null, nameof(testRuntimeProviders));
+
+        // Throw when we did not find any runtime provider for any of the provided sources.
+        var shouldThrow = testRuntimeProviders.All(runtimeProvider => runtimeProvider.Type == null);
+
+        var missingRuntimeProviders = testRuntimeProviders.Where(p => p.Type == null);
+        if (missingRuntimeProviders.Any())
+        {
+            var stringBuilder = new StringBuilder();
+            stringBuilder.AppendLine(Resources.Resources.NoTestHostProviderFound);
+            foreach (var missingRuntimeProvider in missingRuntimeProviders)
             {
-                if (EqtTrace.IsInfoEnabled)
+                var text = $"{nameof(TestEngine)}.{nameof(WarnAboutNotFoundRuntimeProvidersOrThrowWhenNoneAreFound)}: No suitable testHostProvider found for sources {string.Join(", ", missingRuntimeProvider.SourceDetails.Select(s => s.Source))} and runsettings: {missingRuntimeProvider.RunSettings}";
+                if (shouldThrow)
                 {
-                    EqtTrace.Info("TestEngine.ShouldRunInNoIsolation: running test in isolation");
+                    EqtTrace.Error(text);
                 }
-                return false;
-            }
-
-            // Run tests in isolation if run is authored using testsettings.
-            if (InferRunSettingsHelper.IsTestSettingsEnabled(runsettings))
-            {
-                return false;
+                else
+                {
+                    EqtTrace.Warning(text);
+                }
+                missingRuntimeProvider.SourceDetails.ForEach(detail =>
+                {
+                    if (!shouldThrow)
+                    {
+                        stringBuilder.Append(Resources.Resources.SkippingSource).Append(' ');
+                    }
+                    stringBuilder.AppendLine(
+#if NET6_0_OR_GREATER
+                        System.Globalization.CultureInfo.InvariantCulture,
+#endif
+                        $"{detail.Source} ({detail.Framework}, {detail.Architecture})");
+                });
             }
 
-            var currentProcessPath = this.processHelper.GetCurrentProcessFileName();
-
-            // If running with the dotnet executable, then don't run in in process.
-            if (currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
-                || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
+            if (shouldThrow)
             {
-                return false;
+                stringBuilder.AppendLine().AppendLine(Resources.Resources.NoTestHostProviderFound);
+                throw new TestPlatformException(stringBuilder.ToString());
             }
-
-            // Return true if
-            // 1) Not running in parallel;
-            // 2) Data collector is not enabled;
-            // 3) Target framework is X64 or anyCpu;
-            // 4) DisableAppDomain is false;
-            // 5) Not running in design mode;
-            // 6) target framework is NETFramework (Desktop test);
-            if (!isParallelEnabled &&
-                !isDataCollectorEnabled &&
-                (runConfiguration.TargetPlatform == ObjectModel.Constants.DefaultPlatform || runConfiguration.TargetPlatform == Architecture.AnyCPU) &&
-                !runConfiguration.DisableAppDomain &&
-                !runConfiguration.DesignMode &&
-                runConfiguration.TargetFramework.Name.IndexOf("netframework", StringComparison.OrdinalIgnoreCase) >= 0)
+            else
             {
-                if (EqtTrace.IsInfoEnabled)
-                {
-                    EqtTrace.Info("TestEngine.ShouldRunInNoIsolation: running test in process(inside vstest.console.exe process)");
-                }
-                return true;
+                warningLogger.LogWarning(stringBuilder.ToString());
             }
+        }
+    }
 
-            return false;
+    /// <summary>
+    /// We don't add this helper to the XmlRunSettingsUtilities because the feature is in preview and not exposed yet
+    /// </summary>
+    internal static int? GetTargetFrameworkTestHostDemultiplexer(string? runsettings)
+    {
+        if (string.IsNullOrEmpty(runsettings))
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Get request data on basis of telemetry opted in or not.
-        /// </summary>
-        /// 
-        /// <param name="isTelemetryOptedIn">A flag indicating if telemetry is opted in.</param>
-        /// 
-        /// <returns>The request data.</returns>
-        private IRequestData GetRequestData(bool isTelemetryOptedIn)
+        XDocument document = XDocument.Parse(runsettings);
+        XElement? targetFrameworkTestHostDemultiplexer = document?.Element("RunSettings")?.Element("RunConfiguration")?.Element("TargetFrameworkTestHostDemultiplexer");
+
+        if (targetFrameworkTestHostDemultiplexer is null)
         {
-            return new RequestData
-                {
-                    MetricsCollection = isTelemetryOptedIn
-                        ? (IMetricsCollection)new MetricsCollection()
-                        : new NoOpMetricsCollection(),
-                    IsTelemetryOptedIn = isTelemetryOptedIn
-                };
+            return null;
         }
 
-        /// <summary>
-        /// Gets test sources from test run criteria.
-        /// </summary>
-        /// 
-        /// <returns>The test sources.</returns>
-        private IEnumerable<string> GetSourcesFromTestRunCriteria(TestRunCriteria testRunCriteria)
+        if (int.TryParse(targetFrameworkTestHostDemultiplexer.Value, out int numberOfTestHost) && numberOfTestHost > 0)
         {
-            return testRunCriteria.HasSpecificTests
-                ? TestSourcesUtility.GetSources(testRunCriteria.Tests)
-                : testRunCriteria.Sources;
+            return numberOfTestHost;
         }
+        else
+        {
+            EqtTrace.Error($"ProxyParallelExecutionManager: Invalid value for TargetFrameworkTestHostDemultiplexer, '{targetFrameworkTestHostDemultiplexer.Value}'");
+        }
+
+        return null;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestExtensionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestExtensionManager.cs
index 807aeb397a..6a3e9df5ed 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/TestExtensionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/TestExtensionManager.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
 
-    /// <summary>
-    /// Orchestrates extensions for this engine.
-    /// </summary>
-    public class TestExtensionManager : ITestExtensionManager
+/// <summary>
+/// Orchestrates extensions for this engine.
+/// </summary>
+public class TestExtensionManager : ITestExtensionManager
+{
+    /// <inheritdoc />
+    public void ClearExtensions()
     {
-        /// <inheritdoc />
-        public void ClearExtensions()
-        {
-            TestPluginCache.Instance.ClearExtensions();
-        }
+        TestPluginCache.Instance.ClearExtensions();
+    }
 
-        /// <inheritdoc />
-        public void UseAdditionalExtensions(IEnumerable<string> pathToAdditionalExtensions, bool skipExtensionFilters)
-        {
-            TestPluginCache.Instance.UpdateExtensions(pathToAdditionalExtensions, skipExtensionFilters);
-        }
+    /// <inheritdoc />
+    public void UseAdditionalExtensions(IEnumerable<string>? pathToAdditionalExtensions, bool skipExtensionFilters)
+    {
+        TestPluginCache.Instance.UpdateExtensions(pathToAdditionalExtensions, skipExtensionFilters);
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestHostManagerFactory.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestHostManagerFactory.cs
index 9f5c967e08..e76633b9cb 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/TestHostManagerFactory.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/TestHostManagerFactory.cs
@@ -1,59 +1,58 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+/// <summary>
+/// The factory that provides discovery and execution managers to the test host.
+/// </summary>
+public class TestHostManagerFactory : ITestHostManagerFactory
 {
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+    private IDiscoveryManager? _discoveryManager;
+    private IExecutionManager? _executionManager;
+    private readonly bool _telemetryOptedIn;
 
     /// <summary>
-    /// The factory that provides discovery and execution managers to the test host.
+    /// Initializes a new instance of the <see cref="TestHostManagerFactory"/> class.
     /// </summary>
-    public class TestHostManagerFactory : ITestHostManagerFactory
+    ///
+    /// <param name="telemetryOptedIn">
+    /// A value indicating if the telemetry is opted in or not.
+    /// </param>
+    public TestHostManagerFactory(bool telemetryOptedIn)
     {
-        private IDiscoveryManager discoveryManager;
-        private IExecutionManager executionManager;
-        private IRequestData requestData;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestHostManagerFactory"/> class.
-        /// </summary>
-        /// <param name="requestData">
-        /// Provide common services and data for a discovery/run request.
-        /// </param>
-        public TestHostManagerFactory(IRequestData requestData)
-        {
-            this.requestData = requestData ?? throw new System.ArgumentNullException(nameof(requestData));
-        }
+        _telemetryOptedIn = telemetryOptedIn;
+    }
 
-        /// <summary>
-        /// The discovery manager instance for any discovery related operations inside of the test host.
-        /// </summary>
-        /// <returns>The discovery manager.</returns>
-        public IDiscoveryManager GetDiscoveryManager()
-        {
-            if (this.discoveryManager == null)
-            {
-                this.discoveryManager = new DiscoveryManager(this.requestData);
-            }
+    /// <summary>
+    /// The discovery manager instance for any discovery related operations inside of the test host.
+    /// </summary>
+    /// <returns>The discovery manager.</returns>
+    public IDiscoveryManager GetDiscoveryManager()
+        => _discoveryManager ??= new DiscoveryManager(GetRequestData(_telemetryOptedIn));
 
-            return this.discoveryManager;
-        }
+    /// <summary>
+    /// The execution manager instance for any discovery related operations inside of the test host.
+    /// </summary>
+    /// <returns>The execution manager.</returns>
+    public IExecutionManager GetExecutionManager()
+        => _executionManager ??= new ExecutionManager(GetRequestData(_telemetryOptedIn));
 
-        /// <summary>
-        /// The execution manager instance for any discovery related operations inside of the test host.
-        /// </summary>
-        /// <returns>The execution manager.</returns>
-        public IExecutionManager GetExecutionManager()
+    private static RequestData GetRequestData(bool telemetryOptedIn)
+    {
+        return new RequestData
         {
-            if (this.executionManager == null)
-            {
-                this.executionManager = new ExecutionManager(this.requestData);
-            }
-
-            return this.executionManager;
-        }
+            MetricsCollection =
+                telemetryOptedIn
+                    ? new MetricsCollection()
+                    : new NoOpMetricsCollection(),
+            IsTelemetryOptedIn = telemetryOptedIn
+        };
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs
index 142400d0a2..ccb312023b 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs
@@ -1,348 +1,464 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CrossPlatResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+internal enum ProxyDisposalOnCreationFailPolicy
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Threading.Tasks;
+    DisposeAllOnFailure,
+    AllowProxySetupFailures
+}
+
+/// <summary>
+/// Orchestrates test session operations for the engine communicating with the client.
+/// </summary>
+public class ProxyTestSessionManager : IProxyTestSessionManager
+{
+    private enum TestSessionState
+    {
+        Unknown,
+        Error,
+        Active,
+        Terminated
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+    private readonly object _lockObject = new();
+    private readonly object _proxyOperationLockObject = new();
+    private volatile bool _proxySetupFailed;
+    private readonly StartTestSessionCriteria _testSessionCriteria;
+    private readonly int _maxTesthostCount;
+    private TestSessionInfo? _testSessionInfo;
+    private readonly Func<TestRuntimeProviderInfo, ProxyOperationManager?> _proxyCreator;
+    private readonly List<TestRuntimeProviderInfo> _runtimeProviders;
+    private readonly IList<ProxyOperationManagerContainer> _proxyContainerList;
+    private readonly IDictionary<string, int> _proxyMap;
+    private readonly Stopwatch _testSessionStopwatch;
+    private readonly Dictionary<string, TestRuntimeProviderInfo> _sourceToRuntimeProviderInfoMap;
+    private Dictionary<string, string?> _testSessionEnvironmentVariables = new();
+
+    internal ProxyDisposalOnCreationFailPolicy DisposalPolicy { get; set; } = ProxyDisposalOnCreationFailPolicy.DisposeAllOnFailure;
+
+    private IDictionary<string, string?> TestSessionEnvironmentVariables
+    {
+        get
+        {
+            if (_testSessionEnvironmentVariables.Count == 0)
+            {
+                _testSessionEnvironmentVariables = InferRunSettingsHelper.GetEnvironmentVariables(_testSessionCriteria.RunSettings)
+                    ?? _testSessionEnvironmentVariables;
+            }
 
-    using CrossPlatResources = Resources.Resources;
+            return _testSessionEnvironmentVariables;
+        }
+    }
 
     /// <summary>
-    /// Orchestrates test session operations for the engine communicating with the client.
+    /// Initializes a new instance of the <see cref="ProxyTestSessionManager"/> class.
     /// </summary>
-    public class ProxyTestSessionManager : IProxyTestSessionManager
+    ///
+    /// <param name="criteria">The test session criteria.</param>
+    /// <param name="maxTesthostCount">The testhost count.</param>
+    /// <param name="proxyCreator">The proxy creator.</param>
+    /// <param name="runtimeProviders">Runtime providers.</param>
+    public ProxyTestSessionManager(
+        StartTestSessionCriteria criteria,
+        int maxTesthostCount,
+        Func<TestRuntimeProviderInfo, ProxyOperationManager?> proxyCreator,
+        List<TestRuntimeProviderInfo> runtimeProviders)
     {
-        private readonly object lockObject = new object();
-        private readonly object proxyOperationLockObject = new object();
-        private volatile bool proxySetupFailed = false;
-        private StartTestSessionCriteria testSessionCriteria;
-        private int testhostCount;
-        private TestSessionInfo testSessionInfo;
-        private Func<ProxyOperationManager> proxyCreator;
-        private IList<ProxyOperationManagerContainer> proxyContainerList;
-        private IDictionary<string, int> proxyMap;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyTestSessionManager"/> class.
-        /// </summary>
-        /// 
-        /// <param name="criteria">The test session criteria.</param>
-        /// <param name="testhostCount">The testhost count.</param>
-        /// <param name="proxyCreator">The proxy creator.</param>
-        public ProxyTestSessionManager(
-            StartTestSessionCriteria criteria,
-            int testhostCount,
-            Func<ProxyOperationManager> proxyCreator)
-        {
-            this.testSessionCriteria = criteria;
-            this.testhostCount = testhostCount;
-            this.proxyCreator = proxyCreator;
+        _testSessionCriteria = criteria;
+        _maxTesthostCount = maxTesthostCount;
+        _proxyCreator = proxyCreator;
+        _runtimeProviders = runtimeProviders;
+        _proxyContainerList = new List<ProxyOperationManagerContainer>();
+        _proxyMap = new Dictionary<string, int>();
+        _testSessionStopwatch = new Stopwatch();
+
+        // Get dictionary from source -> runtimeProviderInfo, that has the type of runtime provider to create for this
+        // source, and updated runsettings.
+        _sourceToRuntimeProviderInfoMap = _runtimeProviders
+            .SelectMany(runtimeProviderInfo => runtimeProviderInfo.SourceDetails.Select(detail => new KeyValuePair<string, TestRuntimeProviderInfo>(detail.Source!, runtimeProviderInfo)))
+            .ToDictionary(pair => pair.Key, pair => pair.Value);
+    }
 
-            this.proxyContainerList = new List<ProxyOperationManagerContainer>();
-            this.proxyMap = new Dictionary<string, int>();
+    // NOTE: The method is virtual for mocking purposes.
+    /// <inheritdoc/>
+    public virtual bool StartSession(ITestSessionEventsHandler eventsHandler, IRequestData requestData)
+    {
+        lock (_lockObject)
+        {
+            if (_testSessionInfo != null)
+            {
+                return false;
+            }
+            _testSessionInfo = new TestSessionInfo();
         }
 
-        /// <inheritdoc/>
-        public virtual bool StartSession(ITestSessionEventsHandler eventsHandler)
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
+
+        // TODO: Right now we either pre-create 1 testhost if parallel is disabled, or we pre-create as many
+        // testhosts as we have sources. In the future we will have a maxParallelLevel set to the actual parallel level
+        // (which might be lower than the number of sources) and we should do some kind of thinking here to figure out how to split the sources.
+        // To follow the way parallel execution and discovery is (supposed to be) working, there should be as many testhosts
+        // as the maxParallel level pre-started, and marked with the Shared, and configuration that they can run.
+
+        // Create all the proxies in parallel, one task per proxy.
+        var taskList = new Task[_maxTesthostCount];
+        for (int i = 0; i < taskList.Length; ++i)
         {
-            lock (this.lockObject)
+            // This is similar to what we do in ProxyExecutionManager, and ProxyDiscoveryManager, we split
+            // up the payload into multiple smaller pieces. Here it is one source per proxy.
+            TPDebug.Assert(_testSessionCriteria.Sources is not null, "_testSessionCriteria.Sources is null");
+            var source = _testSessionCriteria.Sources[i];
+            var sources = new List<string>() { source };
+            var runtimeProviderInfo = _sourceToRuntimeProviderInfoMap[source];
+
+            taskList[i] = Task.Factory.StartNew(() =>
             {
-                if (this.testSessionInfo != null)
+                var proxySetupSucceeded = SetupRawProxy(sources, runtimeProviderInfo);
+                if (!proxySetupSucceeded)
                 {
-                    return false;
+                    // Set this only in the failed case, so we can check if any proxy failed to setup.
+                    _proxySetupFailed = true;
                 }
-                this.testSessionInfo = new TestSessionInfo();
-            }
+            });
+        }
 
-            // Create all the proxies in parallel, one task per proxy.
-            var taskList = new Task[this.testhostCount];
-            for (int i = 0; i < taskList.Length; ++i)
+        // Wait for proxy creation to be over.
+        Task.WaitAll(taskList);
+        stopwatch.Stop();
+
+        // Collecting session metrics.
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionId,
+            _testSessionInfo.Id);
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionSpawnedTesthostCount,
+            _proxyContainerList.Count);
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionTesthostSpawnTimeInSec,
+            stopwatch.Elapsed.TotalSeconds);
+
+        // Dispose of all proxies if even one of them failed during setup.
+        //
+        // Update: With the introduction of the proxy creation fail disposal policy, we now support
+        // the scenario of individual proxy setup failures. What this means is that we don't mark
+        // the whole session as failed if a single proxy fails, but instead we'll reuse the spinned
+        // off testhosts when possible and create on-demand testhosts for the sources that we failed
+        // to create proxies for.
+        if (_proxySetupFailed)
+        {
+            if (DisposalPolicy == ProxyDisposalOnCreationFailPolicy.DisposeAllOnFailure
+                || _proxyContainerList.Count == 0)
             {
-                // The testhost count is equal to 1 because one of the following conditions
-                // holds true:
-                //     1. we're dealing with a shared testhost (e.g.: .NET Framework testhost)
-                //        that must process multiple sources within the same testhost process;
-                //     2. we're dealing with a single testhost (shared or not, it doesn't matter)
-                //        that must process a single source;
-                // Either way, no further processing of the original test source list is needed
-                // in either of those cases.
-                //
-                // Consequentely, if the testhost count is greater than one it means that the
-                // testhost is not shared (e.g.: .NET Core testhost), in which case each test
-                // source must be processed by a dedicated testhost, which is the reason we
-                // create a list with a single element, i.e. the current source to be processed.
-                var sources = (this.testhostCount == 1)
-                    ? this.testSessionCriteria.Sources
-                    : new List<string>() { this.testSessionCriteria.Sources[i] };
-
-                taskList[i] = Task.Factory.StartNew(() =>
-                {
-                    if (!this.SetupRawProxy(
-                        sources,
-                        this.testSessionCriteria.RunSettings))
-                    {
-                        this.proxySetupFailed = true;
-                    }
-                });
+                requestData?.MetricsCollection.Add(
+                    TelemetryDataConstants.TestSessionState,
+                    TestSessionState.Error.ToString());
+                DisposeProxies();
+                return false;
             }
 
-            // Wait for proxy creation to be over.
-            Task.WaitAll(taskList);
+            EqtTrace.Info($"ProxyTestSessionManager.StartSession: At least one proxy setup failed, but failures are tolerated by policy.");
+        }
+
+        // Make the session available.
+        if (!TestSessionPool.Instance.AddSession(_testSessionInfo, this))
+        {
+            requestData?.MetricsCollection.Add(
+                TelemetryDataConstants.TestSessionState,
+                TestSessionState.Error.ToString());
+            DisposeProxies();
+            return false;
+        }
+
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionState,
+            TestSessionState.Active.ToString());
 
-            // Dispose of all proxies if even one of them failed during setup.
-            if (this.proxySetupFailed)
+        // This counts as the session start time.
+        _testSessionStopwatch.Start();
+
+        // Let the caller know the session has been created.
+        eventsHandler.HandleStartTestSessionComplete(
+            new()
             {
-                this.DisposeProxies();
-                return false;
-            }
+                TestSessionInfo = _testSessionInfo,
+                Metrics = requestData?.MetricsCollection.Metrics
+            });
+        return true;
+    }
 
-            // Make the session available.
-            if (!TestSessionPool.Instance.AddSession(this.testSessionInfo, this))
+    // NOTE: The method is virtual for mocking purposes.
+    /// <inheritdoc/>
+    public virtual bool StopSession(IRequestData requestData)
+    {
+        string testSessionId;
+        lock (_lockObject)
+        {
+            if (_testSessionInfo == null)
             {
-                this.DisposeProxies();
                 return false;
             }
 
-            // Let the caller know the session has been created.
-            eventsHandler.HandleStartTestSessionComplete(this.testSessionInfo);
-            return true;
+            testSessionId = _testSessionInfo.Id.ToString();
+            _testSessionInfo = null;
         }
 
-        /// <inheritdoc/>
-        public virtual bool StopSession()
-        {
-            lock (this.lockObject)
-            {
-                if (this.testSessionInfo == null)
-                {
-                    return false;
-                }
-                this.testSessionInfo = null;
-            }
+        // Dispose of the pooled testhosts.
+        DisposeProxies();
 
-            this.DisposeProxies();
-            return true;
-        }
+        // Compute session time.
+        _testSessionStopwatch.Stop();
 
-        /// <summary>
-        /// Dequeues a proxy to be used either by discovery or execution.
-        /// </summary>
-        /// 
-        /// <param name="source">The source to be associated to this proxy.</param>
-        /// <param name="runSettings">The run settings.</param>
-        /// 
-        /// <returns>The dequeued proxy.</returns>
-        public virtual ProxyOperationManager DequeueProxy(string source, string runSettings)
-        {
-            ProxyOperationManagerContainer proxyContainer = null;
+        // Collecting session metrics.
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionId,
+            testSessionId);
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionTotalSessionTimeInSec,
+            _testSessionStopwatch.Elapsed.TotalSeconds);
+        requestData?.MetricsCollection.Add(
+            TelemetryDataConstants.TestSessionState,
+            TestSessionState.Terminated.ToString());
 
-            lock (this.proxyOperationLockObject)
-            {
-                // No proxy available means the caller will have to create its own proxy.
-                if (!this.proxyMap.ContainsKey(source)
-                    || !this.proxyContainerList[this.proxyMap[source]].IsAvailable)
-                {
-                    throw new InvalidOperationException(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatResources.NoAvailableProxyForDeque));
-                }
+        return true;
+    }
 
-                // We must ensure the current run settings match the run settings from when the
-                // testhost was started. If not, throw an exception to force the caller to create
-                // its own proxy instead.
-                //
-                // TODO (copoiena): This run settings match is rudimentary. We should refine the
-                // match criteria in the future.
-                if (!this.testSessionCriteria.RunSettings.Equals(runSettings))
-                {
-                    throw new InvalidOperationException(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatResources.NoProxyMatchesDescription));
-                }
+    /// <summary>
+    /// Dequeues a proxy to be used either by discovery or execution.
+    /// </summary>
+    ///
+    /// <param name="source">The source to be associated to this proxy.</param>
+    /// <param name="runSettings">The run settings.</param>
+    ///
+    /// <returns>The dequeued proxy.</returns>
+    public virtual ProxyOperationManager DequeueProxy(string source, string? runSettings)
+    {
+        ProxyOperationManagerContainer? proxyContainer;
 
-                // Get the actual proxy.
-                proxyContainer = this.proxyContainerList[this.proxyMap[source]];
+        lock (_proxyOperationLockObject)
+        {
+            // No proxy available means the caller will have to create its own proxy.
+            if (!_proxyMap.ContainsKey(source)
+                || !_proxyContainerList[_proxyMap[source]].IsAvailable)
+            {
+                throw new InvalidOperationException(CrossPlatResources.NoAvailableProxyForDeque);
+            }
 
-                // Mark the proxy as unavailable.
-                proxyContainer.IsAvailable = false;
+            // We must ensure the current run settings match the run settings from when the
+            // testhost was started. If not, throw an exception to force the caller to create
+            // its own proxy instead.
+            if (!CheckRunSettingsAreCompatible(runSettings))
+            {
+                EqtTrace.Verbose($"ProxyTestSessionManager.DequeueProxy: A proxy exists, but the runsettings do not match. Skipping it. Incoming settings: {runSettings}, Settings on proxy: {_testSessionCriteria.RunSettings}");
+                throw new InvalidOperationException(CrossPlatResources.NoProxyMatchesDescription);
             }
 
-            return proxyContainer.Proxy;
+            // Get the actual proxy.
+            proxyContainer = _proxyContainerList[_proxyMap[source]];
+
+            // Mark the proxy as unavailable.
+            proxyContainer.IsAvailable = false;
         }
 
-        /// <summary>
-        /// Enqueues a proxy back once discovery or executions is done with it.
-        /// </summary>
-        /// 
-        /// <param name="proxyId">The id of the proxy to be re-enqueued.</param>
-        /// 
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        public virtual bool EnqueueProxy(int proxyId)
+        return proxyContainer.Proxy;
+    }
+
+    /// <summary>
+    /// Enqueues a proxy back once discovery or executions is done with it.
+    /// </summary>
+    ///
+    /// <param name="proxyId">The id of the proxy to be re-enqueued.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    public virtual bool EnqueueProxy(int proxyId)
+    {
+        lock (_proxyOperationLockObject)
         {
-            lock (this.proxyOperationLockObject)
+            // Check if the proxy exists.
+            if (proxyId < 0 || proxyId >= _proxyContainerList.Count)
             {
-                // Check if the proxy exists.
-                if (proxyId < 0 || proxyId >= this.proxyContainerList.Count)
-                {
-                    throw new ArgumentException(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatResources.NoSuchProxyId,
-                            proxyId));
-                }
-
-                // Get the actual proxy.
-                var proxyContainer = this.proxyContainerList[proxyId];
-                if (proxyContainer.IsAvailable)
-                {
-                    throw new InvalidOperationException(
-                        string.Format(
-                            CultureInfo.CurrentUICulture,
-                            CrossPlatResources.ProxyIsAlreadyAvailable,
-                            proxyId));
-                }
+                throw new ArgumentException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatResources.NoSuchProxyId,
+                        proxyId));
+            }
 
-                // Mark the proxy as available.
-                proxyContainer.IsAvailable = true;
+            // Get the actual proxy.
+            var proxyContainer = _proxyContainerList[proxyId];
+            if (proxyContainer.IsAvailable)
+            {
+                throw new InvalidOperationException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        CrossPlatResources.ProxyIsAlreadyAvailable,
+                        proxyId));
             }
 
-            return true;
+            // Mark the proxy as available.
+            proxyContainer.IsAvailable = true;
         }
 
-        private int EnqueueNewProxy(
-            IList<string> sources,
-            ProxyOperationManagerContainer operationManagerContainer)
-        {
-            lock (this.proxyOperationLockObject)
-            {
-                var index = this.proxyContainerList.Count;
+        return true;
+    }
 
-                // Add the proxy container to the proxy container list.
-                this.proxyContainerList.Add(operationManagerContainer);
+    private int EnqueueNewProxy(
+        IList<string> sources,
+        ProxyOperationManagerContainer operationManagerContainer)
+    {
+        lock (_proxyOperationLockObject)
+        {
+            var index = _proxyContainerList.Count;
 
-                foreach (var source in sources)
-                {
-                    // Add the proxy index to the map.
-                    this.proxyMap.Add(
-                        source,
-                        index);
-                }
+            // Add the proxy container to the proxy container list.
+            _proxyContainerList.Add(operationManagerContainer);
 
-                return index;
+            foreach (var source in sources)
+            {
+                // Add the proxy index to the map.
+                _proxyMap.Add(
+                    source,
+                    index);
             }
+
+            return index;
         }
+    }
 
-        private bool SetupRawProxy(
-            IList<string> sources,
-            string runSettings)
+    private bool SetupRawProxy(
+        IList<string> sources,
+        TestRuntimeProviderInfo runtimeProviderInfo)
+    {
+        try
         {
-            try
+            // Create and cache the proxy.
+            var operationManagerProxy = _proxyCreator(runtimeProviderInfo);
+            if (operationManagerProxy == null)
             {
-                // Create and cache the proxy.
-                var operationManagerProxy = this.proxyCreator();
-                if (operationManagerProxy == null)
-                {
-                    return false;
-                }
-
-                // Initialize the proxy.
-                operationManagerProxy.Initialize(skipDefaultAdapters: false);
-
-                // Start the test host associated to the proxy.
-                if (!operationManagerProxy.SetupChannel(sources, runSettings))
-                {
-                    return false;
-                }
+                return false;
+            }
 
-                // Associate each source in the source list with this new proxy operation
-                // container.
-                var operationManagerContainer = new ProxyOperationManagerContainer(
-                    operationManagerProxy,
-                    available: true);
+            // Initialize the proxy.
+            operationManagerProxy.Initialize(skipDefaultAdapters: false);
 
-                operationManagerContainer.Proxy.Id = this.EnqueueNewProxy(sources, operationManagerContainer);
-                return true;
-            }
-            catch (Exception ex)
+            // Start the test host associated to the proxy.
+            if (!operationManagerProxy.SetupChannel(sources, runtimeProviderInfo.RunSettings))
             {
-                // Log & silently eat up the exception. It's a valid course of action to
-                // just forfeit proxy creation. This means that anyone wishing to get a
-                // proxy operation manager would have to create their own, on the spot,
-                // instead of getting one already created, and this case is handled
-                // gracefully already.
-                EqtTrace.Error(
-                    "ProxyTestSessionManager.StartSession: Cannot create proxy. Error: {0}",
-                    ex.ToString());
+                return false;
             }
 
-            return false;
+            // Associate each source in the source list with this new proxy operation
+            // container.
+            var operationManagerContainer = new ProxyOperationManagerContainer(
+                operationManagerProxy,
+                available: true);
+
+            operationManagerContainer.Proxy.Id = EnqueueNewProxy(sources, operationManagerContainer);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            // Log & silently eat up the exception. It's a valid course of action to
+            // just forfeit proxy creation. This means that anyone wishing to get a
+            // proxy operation manager would have to create their own, on the spot,
+            // instead of getting one already created, and this case is handled
+            // gracefully already.
+            EqtTrace.Error(
+                "ProxyTestSessionManager.StartSession: Cannot create proxy. Error: {0}",
+                ex.ToString());
         }
 
-        private void DisposeProxies()
+        return false;
+    }
+
+    private void DisposeProxies()
+    {
+        lock (_proxyOperationLockObject)
         {
-            lock (this.proxyOperationLockObject)
+            if (_proxyContainerList.Count == 0)
             {
-                if (this.proxyContainerList.Count == 0)
-                {
-                    return;
-                }
+                return;
+            }
 
-                // Dispose of all the proxies in parallel, one task per proxy.
-                int i = 0;
-                var taskList = new Task[this.proxyContainerList.Count];
-                foreach (var proxyContainer in this.proxyContainerList)
-                {
-                    taskList[i++] = Task.Factory.StartNew(() =>
-                    {
-                        // Initiate the end session handshake with the underlying testhost.
-                        proxyContainer.Proxy.Close();
-                    });
-                }
+            // Dispose of all the proxies in parallel, one task per proxy.
+            int i = 0;
+            var taskList = new Task[_proxyContainerList.Count];
+            foreach (var proxyContainer in _proxyContainerList)
+            {
+                taskList[i++] = Task.Factory.StartNew(() =>
+                    // Initiate the end session handshake with the underlying testhost.
+                    proxyContainer.Proxy.Close());
+            }
 
-                // Wait for proxy disposal to be over.
-                Task.WaitAll(taskList);
+            // Wait for proxy disposal to be over.
+            Task.WaitAll(taskList);
 
-                this.proxyContainerList.Clear();
-                this.proxyMap.Clear();
-            }
+            _proxyContainerList.Clear();
+            _proxyMap.Clear();
         }
     }
 
-    /// <summary>
-    /// Defines a container encapsulating the proxy and its corresponding state info.
-    /// </summary>
-    internal class ProxyOperationManagerContainer
+    private bool CheckRunSettingsAreCompatible(string? requestRunSettings)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyOperationManagerContainer"/> class.
-        /// </summary>
-        /// 
-        /// <param name="proxy">The proxy.</param>
-        /// <param name="available">A flag indicating if the proxy is available to do work.</param>
-        public ProxyOperationManagerContainer(ProxyOperationManager proxy, bool available)
+        // Environment variable sets should be identical, otherwise it's not safe to reuse the
+        // already running testhosts.
+        var requestEnvironmentVariables = InferRunSettingsHelper.GetEnvironmentVariables(requestRunSettings);
+        if (requestEnvironmentVariables != null
+            && TestSessionEnvironmentVariables != null
+            && (requestEnvironmentVariables.Count != TestSessionEnvironmentVariables.Count
+                || requestEnvironmentVariables.Except(TestSessionEnvironmentVariables).Any()))
         {
-            this.Proxy = proxy;
-            this.IsAvailable = available;
+            return false;
         }
 
-        /// <summary>
-        /// Gets or sets the proxy.
-        /// </summary>
-        public ProxyOperationManager Proxy { get; set; }
+        // Data collection is not supported for test sessions yet.
+        return !XmlRunSettingsUtilities.IsDataCollectionEnabled(requestRunSettings);
+    }
+}
 
-        /// <summary>
-        /// Gets or sets a flag indicating if the proxy is available to do work.
-        /// </summary>
-        public bool IsAvailable { get; set; }
+/// <summary>
+/// Defines a container encapsulating the proxy and its corresponding state info.
+/// </summary>
+internal class ProxyOperationManagerContainer
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProxyOperationManagerContainer"/> class.
+    /// </summary>
+    ///
+    /// <param name="proxy">The proxy.</param>
+    /// <param name="available">A flag indicating if the proxy is available to do work.</param>
+    public ProxyOperationManagerContainer(ProxyOperationManager proxy, bool available)
+    {
+        Proxy = proxy;
+        IsAvailable = available;
     }
+
+    /// <summary>
+    /// Gets or sets the proxy.
+    /// </summary>
+    public ProxyOperationManager Proxy { get; set; }
+
+    /// <summary>
+    /// Gets or sets a flag indicating if the proxy is available to do work.
+    /// </summary>
+    public bool IsAvailable { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs
index 751a508809..7d1f1a497a 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs
@@ -1,202 +1,222 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+
+/// <summary>
+/// Represents the test session pool.
+/// </summary>
+public class TestSessionPool
 {
-    using System;
-    using System.Collections.Generic;
+    private static readonly object InstanceLockObject = new();
+    private static volatile TestSessionPool? s_instance;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+    private readonly object _lockObject = new();
+    private readonly Dictionary<TestSessionInfo, ProxyTestSessionManager> _sessionPool;
 
     /// <summary>
-    /// Represents the test session pool.
+    /// Initializes a new instance of the <see cref="TestSessionPool"/> class.
     /// </summary>
-    public class TestSessionPool
+    internal TestSessionPool()
     {
-        private static object instanceLockObject = new object();
-        private static volatile TestSessionPool instance;
-
-        private object lockObject = new object();
-        private Dictionary<TestSessionInfo, ProxyTestSessionManager> sessionPool;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSessionPool"/> class.
-        /// </summary>
-        internal TestSessionPool()
-        {
-            this.sessionPool = new Dictionary<TestSessionInfo, ProxyTestSessionManager>();
-        }
+        _sessionPool = new Dictionary<TestSessionInfo, ProxyTestSessionManager>();
+    }
 
-        /// <summary>
-        /// Gets the test session pool instance.
-        /// Sets the test session pool instance for testing purposes only.
-        /// </summary>
-        /// 
-        /// <remarks>Thread-safe singleton pattern.</remarks>
-        public static TestSessionPool Instance
+    /// <summary>
+    /// Gets the test session pool instance.
+    /// Sets the test session pool instance for testing purposes only.
+    /// </summary>
+    ///
+    /// <remarks>Thread-safe singleton pattern.</remarks>
+    [AllowNull]
+    public static TestSessionPool Instance
+    {
+        get
         {
-            get
+            if (s_instance == null)
             {
-                if (TestSessionPool.instance == null)
+                lock (InstanceLockObject)
                 {
-                    lock (TestSessionPool.instanceLockObject)
-                    {
-                        if (TestSessionPool.instance == null)
-                        {
-                            TestSessionPool.instance = new TestSessionPool();
-                        }
-                    }
+                    s_instance ??= new TestSessionPool();
                 }
-
-                return TestSessionPool.instance;
-            }
-            internal set
-            {
-                TestSessionPool.instance = value;
             }
+
+            return s_instance;
+        }
+        internal set
+        {
+            s_instance = value;
         }
+    }
 
-        /// <summary>
-        /// Adds a session to the pool.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="proxyManager">The proxy manager object.</param>
-        /// 
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        public virtual bool AddSession(
-            TestSessionInfo testSessionInfo,
-            ProxyTestSessionManager proxyManager)
+    /// <summary>
+    /// Adds a session to the pool.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="proxyManager">The proxy manager object.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    public virtual bool AddSession(
+        TestSessionInfo testSessionInfo,
+        ProxyTestSessionManager proxyManager)
+    {
+        lock (_lockObject)
         {
-            lock (this.lockObject)
+            // Check if the session info already exists.
+            if (_sessionPool.ContainsKey(testSessionInfo))
             {
-                // Check if the session info already exists.
-                if (this.sessionPool.ContainsKey(testSessionInfo))
-                {
-                    return false;
-                }
-
-                // Adds an association between session info and proxy manager to the pool.
-                this.sessionPool.Add(testSessionInfo, proxyManager);
-                return true;
+                return false;
             }
+
+            // Adds an association between session info and proxy manager to the pool.
+            _sessionPool.Add(testSessionInfo, proxyManager);
+            return true;
         }
+    }
 
-        /// <summary>
-        /// Kills and removes a session from the pool.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// 
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        public virtual bool KillSession(TestSessionInfo testSessionInfo)
-        {
-            // TODO (copoiena): What happens if some request is running for the current session ?
-            // Should we stop the request as well ? Probably yes.
-            IProxyTestSessionManager proxyManager = null;
+    /// <summary>
+    /// Kills and removes a session from the pool.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="requestData">The request data.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData requestData)
+    {
+        // TODO (copoiena): What happens if some request is running for the current session ?
+        // Should we stop the request as well ? Probably yes.
+        IProxyTestSessionManager? proxyManager;
 
-            lock (this.lockObject)
+        lock (_lockObject)
+        {
+            // Check if the session info exists.
+            if (!_sessionPool.ContainsKey(testSessionInfo))
             {
-                // Check if the session info exists.
-                if (!this.sessionPool.ContainsKey(testSessionInfo))
-                {
-                    return false;
-                }
-
-                // Remove the session from the pool.
-                proxyManager = this.sessionPool[testSessionInfo];
-                this.sessionPool.Remove(testSessionInfo);
+                return false;
             }
 
-            // Kill the session.
-            return proxyManager.StopSession();
+            // Remove the session from the pool.
+            proxyManager = _sessionPool[testSessionInfo];
+            _sessionPool.Remove(testSessionInfo);
         }
 
-        /// <summary>
-        /// Gets a reference to the proxy object from the session pool.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="source">The source to be associated to this proxy.</param>
-        /// <param name="runSettings">The run settings.</param>
-        /// 
-        /// <returns>The proxy object.</returns>
-        public virtual ProxyOperationManager TryTakeProxy(
-            TestSessionInfo testSessionInfo,
-            string source,
-            string runSettings)
-        {
-            ProxyTestSessionManager sessionManager = null;
-            lock (this.lockObject)
-            {
-                if (!this.sessionPool.ContainsKey(testSessionInfo))
-                {
-                    return null;
-                }
+        // Kill the session.
+        return proxyManager.StopSession(requestData);
+    }
 
-                // Gets the session manager reference from the pool.
-                sessionManager = this.sessionPool[testSessionInfo];
-            }
+    /// <summary>
+    /// Gets a reference to the proxy object from the session pool.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="source">The source to be associated to this proxy.</param>
+    /// <param name="runSettings">The run settings.</param>
+    /// <param name="requestData">The request data.</param>
+    ///
+    /// <returns>The proxy object.</returns>
+    public virtual ProxyOperationManager? TryTakeProxy(
+        TestSessionInfo testSessionInfo,
+        string source,
+        string? runSettings,
+        IRequestData requestData)
+    {
+        ValidateArg.NotNull(requestData, nameof(requestData));
 
-            try
-            {
-                // Deque an actual proxy to do work.
-                return sessionManager.DequeueProxy(source, runSettings);
-            }
-            catch (InvalidOperationException ex)
+        ProxyTestSessionManager? sessionManager;
+        lock (_lockObject)
+        {
+            if (!_sessionPool.ContainsKey(testSessionInfo))
             {
-                // If we are unable to dequeue the proxy we just eat up the exception here as
-                // it is safe to proceed.
-                // 
-                // WARNING: This should not normally happen and it raises questions regarding the
-                // test session pool operation and consistency.
-                EqtTrace.Warning("TestSessionPool.ReturnProxy failed: {0}", ex.ToString());
+                return null;
             }
 
-            return null;
+            // Gets the session manager reference from the pool.
+            sessionManager = _sessionPool[testSessionInfo];
         }
 
-        /// <summary>
-        /// Returns the proxy object to the session pool.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="proxyId">The proxy id to be returned.</param>
-        /// 
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        public virtual bool ReturnProxy(TestSessionInfo testSessionInfo, int proxyId)
+        try
         {
-            ProxyTestSessionManager sessionManager = null;
-            lock (this.lockObject)
-            {
-                if (!this.sessionPool.ContainsKey(testSessionInfo))
-                {
-                    return false;
-                }
+            // Deque an actual proxy to do work.
+            var proxy = sessionManager.DequeueProxy(source, runSettings);
 
-                // Gets the session manager reference from the pool.
-                sessionManager = this.sessionPool[testSessionInfo];
-            }
+            // Make sure we use the per-request request data instead of the request data used when
+            // creating the test session. Otherwise we can end up having irrelevant telemetry for
+            // the current request being fulfilled or even duplicate telemetry which may cause an
+            // exception to be thrown.
+            proxy.RequestData = requestData;
 
-            try
-            {
-                // Try re-enqueueing the specified proxy.
-                return sessionManager.EnqueueProxy(proxyId);
-            }
-            catch (InvalidOperationException ex)
+            return proxy;
+        }
+        catch (InvalidOperationException ex)
+        {
+            // If we are unable to dequeue the proxy we just eat up the exception here as
+            // it is safe to proceed.
+            //
+            // WARNING: This should not normally happen and it raises questions regarding the
+            // test session pool operation and consistency.
+            EqtTrace.Warning("TestSessionPool.ReturnProxy failed: {0}", ex.ToString());
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Returns the proxy object to the session pool.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="proxyId">The proxy id to be returned.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    public virtual bool ReturnProxy(TestSessionInfo testSessionInfo, int proxyId)
+    {
+        ProxyTestSessionManager? sessionManager;
+        lock (_lockObject)
+        {
+            if (!_sessionPool.ContainsKey(testSessionInfo))
             {
-                // If we are unable to re-enqueue the proxy we just eat up the exception here as
-                // it is safe to proceed.
-                // 
-                // WARNING: This should not normally happen and it raises questions regarding the
-                // test session pool operation and consistency.
-                EqtTrace.Warning("TestSessionPool.ReturnProxy failed: {0}", ex.ToString());
+                return false;
             }
 
-            return false;
+            // Gets the session manager reference from the pool.
+            sessionManager = _sessionPool[testSessionInfo];
+        }
+
+        try
+        {
+            // Try re-enqueueing the specified proxy.
+            return sessionManager.EnqueueProxy(proxyId);
+        }
+        catch (Exception ex)
+        {
+            // If we are unable to re-enqueue the proxy, we just eat up the exception here as
+            // it is safe to proceed. Returning a proxy is a fire-and-forget kind of operation,
+            // and failing to return it for whatever reason should no longer be considered a
+            // breaking scenario. In fact, this happens on a regular basis when two calls to
+            // ReturnProxy are issued, one when handling a raw message signaling a discovery/run
+            // complete, and one when actually processing this kind of message. As such, only the
+            // first call will ever succeed, with the second one always failing. Another failing
+            // scenario was attempting to return a "non-managed" testhost (one that can be obtained,
+            // for example, by failing to match discovery/run criteria to session criteria, and as
+            // such an on-demand testhost is spawned) to a test session. A "non-managed" testhost
+            // has -1 for the Id, and the call to EnqueueProxy will fail and an exception will be
+            // thrown. We have to make sure we catch that exception instead of relying on the caller
+            // to perform sanity checks, hence why we expanded the type of exception that we handle
+            // to generic exceptions too.
+            EqtTrace.Warning("TestSessionPool.ReturnProxy failed: {0}", ex.ToString());
         }
+
+        return false;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/SourceDetailHelper.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/SourceDetailHelper.cs
new file mode 100644
index 0000000000..4b01f23f09
--- /dev/null
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/SourceDetailHelper.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+
+internal static class SourceDetailHelper
+{
+    internal static string UpdateRunSettingsFromSourceDetail(string runSettings, SourceDetail sourceDetail)
+    {
+        using var stream = new StringReader(runSettings);
+        using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
+        var navigator = document.CreateNavigator();
+
+        InferRunSettingsHelper.UpdateTargetFramework(document, sourceDetail.Framework!.ToString(), overwrite: true);
+        InferRunSettingsHelper.UpdateTargetPlatform(document, sourceDetail.Architecture.ToString(), overwrite: true);
+
+        var updatedRunSettings = navigator!.OuterXml;
+        return updatedRunSettings;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestCaseFilterDeterminer.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestCaseFilterDeterminer.cs
index 2d563e77f4..f89d0ffdd9 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestCaseFilterDeterminer.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestCaseFilterDeterminer.cs
@@ -1,26 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities
-{
-    internal class TestCaseFilterDeterminer
-    {
-        private const int MaxLengthOfTestCaseFilterToShow = 256;
-
-        internal static string ShortenTestCaseFilterIfRequired(string testCaseFilter)
-        {
-            string shortenTestCaseFilter;
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
 
-            if (testCaseFilter.Length > MaxLengthOfTestCaseFilterToShow)
-            {
-                shortenTestCaseFilter = testCaseFilter.Substring(0, MaxLengthOfTestCaseFilterToShow) + "...";
-            }
-            else
-            {
-                shortenTestCaseFilter = testCaseFilter;
-            }
+internal class TestCaseFilterDeterminer
+{
+    private const int MaxLengthOfTestCaseFilterToShow = 256;
 
-            return shortenTestCaseFilter;
-        }
+    internal static string ShortenTestCaseFilterIfRequired(string testCaseFilter)
+    {
+        string shortenTestCaseFilter = testCaseFilter.Length > MaxLengthOfTestCaseFilterToShow
+            ? testCaseFilter.Substring(0, MaxLengthOfTestCaseFilterToShow) + "..."
+            : testCaseFilter;
+        return shortenTestCaseFilter;
     }
 }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestSourcesUtility.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestSourcesUtility.cs
index dd5ab82986..f13e422514 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestSourcesUtility.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Utilities/TestSourcesUtility.cs
@@ -1,59 +1,61 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities
-{
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+
+/// <summary>
+/// Test sources utility class
+/// </summary>
+internal class TestSourcesUtility
+{
     /// <summary>
-    /// Test sources utility class
+    /// Gets test sources from adapter source map
     /// </summary>
-    internal class TestSourcesUtility
+    /// <param name="adapterSourceMap"> The test list. </param>
+    /// <returns> List of test Sources </returns>
+    internal static IEnumerable<string>? GetSources(Dictionary<string, IEnumerable<string>?>? adapterSourceMap)
     {
-        /// <summary>
-        /// Gets test sources from adapter source map
-        /// </summary>
-        /// <param name="adapterSourceMap"> The test list. </param>
-        /// <returns> List of test Sources </returns>
-        internal static IEnumerable<string> GetSources(Dictionary<string, IEnumerable<string>> adapterSourceMap)
-        {
-            IEnumerable<string> sources = new List<string>();
-            return adapterSourceMap?.Values?.Aggregate(sources, (current, enumerable) => current.Concat(enumerable));
-        }
+        IEnumerable<string> sources = new List<string>();
+        return adapterSourceMap?.Values?.Aggregate(sources, (current, enumerable) => enumerable is not null ? current.Concat(enumerable) : current);
+    }
 
-        /// <summary>
-        /// Gets test sources from test case list
-        /// </summary>
-        /// <param name="tests"> The test list. </param>
-        /// <returns> List of test Sources </returns>
-        internal static IEnumerable<string> GetSources(IEnumerable<TestCase> tests)
-        {
-            return tests?.Select(tc => tc.Source).Distinct();
-        }
+    /// <summary>
+    /// Gets test sources from test case list
+    /// </summary>
+    /// <param name="tests"> The test list. </param>
+    /// <returns> List of test Sources </returns>
+    [return: NotNullIfNotNull("tests")]
+    internal static IEnumerable<string>? GetSources(IEnumerable<TestCase>? tests)
+    {
+        return tests?.Select(tc => tc.Source).Distinct();
+    }
 
-        /// <summary>
-        /// Gets default code base path for in-proc collector from test sources
-        /// </summary>
-        /// <param name="adapterSourceMap"> The test list. </param>
-        /// <returns> List of test Sources </returns>
-        internal static string GetDefaultCodebasePath(Dictionary<string, IEnumerable<string>> adapterSourceMap)
-        {
-            var source = GetSources(adapterSourceMap)?.FirstOrDefault();
-            return source != null ? Path.GetDirectoryName(source) : null;
-        }
+    /// <summary>
+    /// Gets default code base path for in-proc collector from test sources
+    /// </summary>
+    /// <param name="adapterSourceMap"> The test list. </param>
+    /// <returns> List of test Sources </returns>
+    internal static string? GetDefaultCodebasePath(Dictionary<string, IEnumerable<string>?> adapterSourceMap)
+    {
+        var source = GetSources(adapterSourceMap)?.FirstOrDefault();
+        return Path.GetDirectoryName(source);
+    }
 
-        /// <summary>
-        /// Gets default code base path for in-proc collector from test sources
-        /// </summary>
-        /// <param name="tests"> The test list. </param>
-        /// <returns> List of test Sources </returns>
-        internal static string GetDefaultCodebasePath(IEnumerable<TestCase> tests)
-        {
-            var source = GetSources(tests)?.FirstOrDefault();
-            return source != null ? Path.GetDirectoryName(source) : null;
-        }
+    /// <summary>
+    /// Gets default code base path for in-proc collector from test sources
+    /// </summary>
+    /// <param name="tests"> The test list. </param>
+    /// <returns> List of test Sources </returns>
+    internal static string? GetDefaultCodebasePath(IEnumerable<TestCase> tests)
+    {
+        var source = GetSources(tests)?.FirstOrDefault();
+        return Path.GetDirectoryName(source);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Execution.Shared/DebuggerBreakpoint.cs b/src/Microsoft.TestPlatform.Execution.Shared/DebuggerBreakpoint.cs
index 1f8717c4a2..1bd71eb00f 100644
--- a/src/Microsoft.TestPlatform.Execution.Shared/DebuggerBreakpoint.cs
+++ b/src/Microsoft.TestPlatform.Execution.Shared/DebuggerBreakpoint.cs
@@ -1,213 +1,223 @@
-using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-using Microsoft.VisualStudio.TestPlatform.Utilities;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if USE_EXTERN_ALIAS
+extern alias Abstraction;
+#endif
+
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.TestPlatform.Execution
+#if USE_EXTERN_ALIAS
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+#else
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+#endif
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.Execution;
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "StringUtils is not available for all TFMs of testhost")]
+internal static class DebuggerBreakpoint
 {
-    internal static class DebuggerBreakpoint
+    internal static void AttachVisualStudioDebugger(string environmentVariable)
     {
-        internal static void AttachVisualStudioDebugger(string environmentVariable)
+        if (string.IsNullOrWhiteSpace(environmentVariable))
         {
-#if NETCOREAPP1_0 || !DEBUG
+            throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
+        }
+
+        if (Debugger.IsAttached)
             return;
-#else
-            if (string.IsNullOrWhiteSpace(environmentVariable))
+
+        var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
+        if (!string.IsNullOrEmpty(debugEnabled) && !debugEnabled.Equals("0", StringComparison.Ordinal))
+        {
+            int? vsPid = null;
+            if (int.TryParse(debugEnabled, out int pid))
             {
-                throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
+                // The option is used to both enable and disable attaching (0 and 1)
+                // and providing custom vs pid (any number higher than 1)
+                vsPid = pid <= 1 ? null : (int?)pid;
             }
 
-            if (Debugger.IsAttached)
-                return;
-
-            var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
-            if (!string.IsNullOrEmpty(debugEnabled) && !debugEnabled.Equals("0", StringComparison.Ordinal))
+            if (vsPid == null)
             {
-                int? vsPid = null;
-                if (int.TryParse(debugEnabled, out int pid))
-                {
-                    // The option is used to both enable and disable attaching (0 and 1)
-                    // and providing custom vs pid (any number higher than 1)
-                    vsPid = pid <= 1 ? null : (int?)pid;
-                }
-
-                if (vsPid == null)
-                {
-                    ConsoleOutput.Instance.WriteLine("Attaching Visual Studio, either a parent or the one that was started first... To specify a VS instance to use, use the PID in the option, instead of 1. No breakpoints are automatically set.", OutputLevel.Information);
-                }
-                else
-                {
-                    ConsoleOutput.Instance.WriteLine($"Attaching Visual Studio with PID {vsPid}... No breakpoints are automatically set.", OutputLevel.Information);
-                }
-
-                AttachVS(Process.GetCurrentProcess(), vsPid);
-
-                Break();
+                ConsoleOutput.Instance.WriteLine("Attaching Visual Studio, either a parent or the one that was started first... To specify a VS instance to use, use the PID in the option, instead of 1.", OutputLevel.Information);
             }
+            else
+            {
+                var processId =
+#if NET6_0_OR_GREATER
+                    Environment.ProcessId;
+#else
+                    Process.GetCurrentProcess().Id;
 #endif
-        }
 
-        private static bool AttachVS(Process process, int? vsPid)
-        {
-#if NETCOREAPP1_0 || !DEBUG
-            return false;
-#else
-            // The way we attach VS is not compatible with .NET Core 2.1 and .NET Core 3.1, but works in .NET Framework and .NET.
-            // We could call the library code directly here for .NET, and .NET Framework, but then we would also need to package it
-            // together with testhost. So instead we always run the executable, and pass path to it using env variable.
+                ConsoleOutput.Instance.WriteLine($"Attaching Visual Studio with PID {vsPid} to the process '{Process.GetCurrentProcess().ProcessName}({processId})'...", OutputLevel.Information);
+            }
 
-            var env = "VSTEST_DEBUG_ATTACHVS_PATH";
-            var vsAttachPath = Environment.GetEnvironmentVariable(env) ?? FindAttachVs();
+            AttachVs(Process.GetCurrentProcess(), vsPid);
 
-            // Always set it so we propagate it to child processes even if it was not previously set.
-            Environment.SetEnvironmentVariable(env, vsAttachPath);
+            Break();
+        }
+    }
 
-            if (vsAttachPath == null)
-            {
-                throw new InvalidOperationException($"Cannot find AttachVS.exe tool.");
-            }
+    private static bool AttachVs(Process process, int? vsPid)
+    {
+        // The way we attach VS is not compatible with .NET Core 2.1 and .NET Core 3.1, but works in .NET Framework and .NET.
+        // We could call the library code directly here for .NET, and .NET Framework, but then we would also need to package it
+        // together with testhost. So instead we always run the executable, and pass path to it using env variable.
 
-            if (!File.Exists(vsAttachPath))
-            {
-                throw new InvalidOperationException($"Cannot start tool, path {vsAttachPath} does not exist.");
-            }
-            var attachVsProcess = Process.Start(vsAttachPath, $"{process.Id} {vsPid}");
-            attachVsProcess.WaitForExit();
+        const string env = "VSTEST_DEBUG_ATTACHVS_PATH";
+        var vsAttachPath = Environment.GetEnvironmentVariable(env) ?? FindAttachVs();
 
-            return attachVsProcess.ExitCode == 0;
-#endif
-        }
+        // Always set it so we propagate it to child processes even if it was not previously set.
+        Environment.SetEnvironmentVariable(env, vsAttachPath);
 
-        private static string FindAttachVs()
+        if (vsAttachPath == null)
         {
-# if NETCOREAPP1_0 || !DEBUG
-            return null;
-# else 
-
-            var fromPath = FindOnPath("AttachVS.exe");
-            if (fromPath != null)
-            {
-                return fromPath;
-            }
+            throw new InvalidOperationException($"Cannot find AttachVS.exe tool.");
+        }
 
-            var parent = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            while (parent != null)
-            {
-                var path = Path.Combine(parent, @"src\AttachVS\bin\Debug\net472\AttachVS.exe");
-                if (File.Exists(path))
-                {
-                    return path;
-                }
+        if (!File.Exists(vsAttachPath))
+        {
+            throw new InvalidOperationException($"Cannot start tool, path {vsAttachPath} does not exist.");
+        }
+        var attachVsProcess = Process.Start(vsAttachPath, $"{process.Id} {vsPid}");
+        attachVsProcess.WaitForExit();
 
-                parent = Path.GetDirectoryName(parent);
-            }
+        return attachVsProcess.ExitCode == 0;
+    }
 
-            return parent;
-#endif
+    private static string? FindAttachVs()
+    {
+        var fromPath = FindOnPath("AttachVS.exe");
+        if (fromPath != null)
+        {
+            return fromPath;
         }
 
-        private static string FindOnPath(string exeName)
+
+        // Don't use current process MainModule here, it resolves to dotnet if you invoke
+        // dotnet vstest.console.dll, or dotnet testhost.dll. Use the entry assembly instead.
+        var parent = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location);
+        while (parent != null)
         {
-            var paths = Environment.GetEnvironmentVariable("PATH").Split(';');
-            foreach (var p in paths)
+            var path = Path.Combine(parent, @"artifacts\bin\AttachVS\Debug\net472\AttachVS.exe");
+            Debug.WriteLine($"Looking for AttachVS in: {path}.");
+            if (File.Exists(path))
             {
-                var path = Path.Combine(p, exeName);
-                if (File.Exists(path))
-                {
-                    return path;
-                }
+                return path;
             }
 
-            return null;
+            parent = Path.GetDirectoryName(parent);
         }
 
-        internal static void WaitForDebugger(string environmentVariable)
-        {
-            if (Debugger.IsAttached)
-                return;
+        return parent;
+    }
 
-            if (string.IsNullOrWhiteSpace(environmentVariable))
+    private static string? FindOnPath(string exeName)
+    {
+        // TODO: Skip when PATH is not defined.
+        var paths = Environment.GetEnvironmentVariable("PATH")!.Split(';');
+        foreach (var p in paths)
+        {
+            var path = Path.Combine(p, exeName);
+            if (File.Exists(path))
             {
-                throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
+                return path;
             }
+        }
 
-            var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
-            if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal))
-            {
-                ConsoleOutput.Instance.WriteLine("Waiting for debugger attach...", OutputLevel.Information);
-
-                var currentProcess = Process.GetCurrentProcess();
-                ConsoleOutput.Instance.WriteLine(
-                    string.Format("Process Id: {0}, Name: {1}", currentProcess.Id, currentProcess.ProcessName),
-                    OutputLevel.Information);
+        return null;
+    }
 
-                while (!Debugger.IsAttached)
-                {
-                    Thread.Sleep(1000);
-                }
+    internal static void WaitForDebugger(string environmentVariable)
+    {
+        if (Debugger.IsAttached)
+            return;
 
-                Break();
-            }
+        if (string.IsNullOrWhiteSpace(environmentVariable))
+        {
+            throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
         }
 
-        internal static void WaitForNativeDebugger(string environmentVariable)
+        var debugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
+        if (!string.IsNullOrEmpty(debugEnabled) && debugEnabled.Equals("1", StringComparison.Ordinal))
         {
-            if (string.IsNullOrWhiteSpace(environmentVariable))
-            {
-                throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
-            }
+            ConsoleOutput.Instance.WriteLine("Waiting for debugger attach...", OutputLevel.Information);
 
-            // Check if native debugging is enabled and OS is windows.
-            var nativeDebugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
+            var currentProcess = Process.GetCurrentProcess();
+            ConsoleOutput.Instance.WriteLine(
+                $"Process Id: {currentProcess.Id}, Name: {currentProcess.ProcessName}",
+                OutputLevel.Information);
 
-            if (!string.IsNullOrEmpty(nativeDebugEnabled) && nativeDebugEnabled.Equals("1", StringComparison.Ordinal)
-                && new PlatformEnvironment().OperatingSystem.Equals(PlatformOperatingSystem.Windows))
+            while (!Debugger.IsAttached)
             {
-                while (!IsDebuggerPresent())
-                {
-                    Task.Delay(1000).Wait();
-                }
-
-                BreakNative();
+                Task.Delay(1000).GetAwaiter().GetResult();
             }
+
+            Break();
+        }
+    }
+
+    internal static void WaitForNativeDebugger(string environmentVariable)
+    {
+        if (string.IsNullOrWhiteSpace(environmentVariable))
+        {
+            throw new ArgumentException($"'{nameof(environmentVariable)}' cannot be null or whitespace.", nameof(environmentVariable));
         }
 
-        private static void Break()
+        // Check if native debugging is enabled and OS is windows.
+        var nativeDebugEnabled = Environment.GetEnvironmentVariable(environmentVariable);
+
+        if (!string.IsNullOrEmpty(nativeDebugEnabled) && nativeDebugEnabled.Equals("1", StringComparison.Ordinal)
+                                                      && new PlatformEnvironment().OperatingSystem.Equals(PlatformOperatingSystem.Windows))
         {
-            if (ShouldNotBreak())
+            while (!IsDebuggerPresent())
             {
-                return;
+                Task.Delay(1000).Wait();
             }
 
-            Debugger.Break();
+            BreakNative();
         }
+    }
 
-        private static bool ShouldNotBreak()
+    private static void Break()
+    {
+        if (ShouldNotBreak())
         {
-            return Environment.GetEnvironmentVariable("VSTEST_DEBUG_NOBP")?.Equals("1") ?? false;
+            return;
         }
 
-        private static void BreakNative()
-        {
-            if (ShouldNotBreak())
-            {
-                return;
-            }
+        Debugger.Break();
+    }
 
-            DebugBreak();
-        }
+    private static bool ShouldNotBreak()
+    {
+        return Environment.GetEnvironmentVariable("VSTEST_DEBUG_NOBP")?.Equals("1") ?? false;
+    }
 
-        // Native APIs for enabling native debugging.
-        [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IsDebuggerPresent();
+    private static void BreakNative()
+    {
+        if (ShouldNotBreak())
+        {
+            return;
+        }
 
-        [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
-        internal static extern void DebugBreak();
+        DebugBreak();
     }
+
+    // Native APIs for enabling native debugging.
+    [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IsDebuggerPresent();
+
+    [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
+    internal static extern void DebugBreak();
 }
diff --git a/src/Microsoft.TestPlatform.Execution.Shared/Microsoft.TestPlatform.Execution.Shared.projitems b/src/Microsoft.TestPlatform.Execution.Shared/Microsoft.TestPlatform.Execution.Shared.projitems
index 87265cabe2..2269ef03d4 100644
--- a/src/Microsoft.TestPlatform.Execution.Shared/Microsoft.TestPlatform.Execution.Shared.projitems
+++ b/src/Microsoft.TestPlatform.Execution.Shared/Microsoft.TestPlatform.Execution.Shared.projitems
@@ -10,6 +10,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)DebuggerBreakpoint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ProcDumpExecutableHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UILanguageOverride.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WellKnownDebugEnvironmentVariables.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Execution.Shared/ProcDumpExecutableHelper.cs b/src/Microsoft.TestPlatform.Execution.Shared/ProcDumpExecutableHelper.cs
new file mode 100644
index 0000000000..36721f39b3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Execution.Shared/ProcDumpExecutableHelper.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if USE_EXTERN_ALIAS
+extern alias Abstraction;
+#endif
+
+using System;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+#if USE_EXTERN_ALIAS
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+#else
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+#endif
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Execution;
+
+internal class ProcDumpExecutableHelper
+{
+    private const string ProcdumpUnixProcess = "procdump";
+
+    private readonly IProcessHelper _processHelper;
+    private readonly IFileHelper _fileHelper;
+    private readonly IEnvironment _environment;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+
+    public ProcDumpExecutableHelper(IProcessHelper processHelper, IFileHelper fileHelper, IEnvironment environment, IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _environment = environment;
+        _environmentVariableHelper = environmentVariableHelper;
+    }
+
+    public static string ProcDumpFileName(PlatformArchitecture architecture) =>
+        architecture switch
+        {
+            PlatformArchitecture.X86 => "procdump.exe",
+            PlatformArchitecture.ARM64 => "procdump64a.exe",
+            _ => "procdump64.exe",
+        };
+
+    public bool TryGetProcDumpExecutable(out string path)
+    {
+        // Use machine architecture
+        var targetProcessArchitecture = _environment.Architecture;
+        return TryGetProcDumpExecutable(targetProcessArchitecture, out path);
+    }
+
+    public bool TryGetProcDumpExecutable(int processId, out string path)
+    {
+        // Launch proc dump according to process architecture
+        var targetProcessArchitecture = _processHelper.GetProcessArchitecture(processId);
+        return TryGetProcDumpExecutable(targetProcessArchitecture, out path);
+    }
+
+    public bool TryGetProcDumpExecutable(PlatformArchitecture architecture, out string path)
+    {
+        var procdumpDirectory = _environmentVariableHelper.GetEnvironmentVariable("PROCDUMP_PATH");
+        var searchPath = false;
+        if (procdumpDirectory.IsNullOrWhiteSpace())
+        {
+            EqtTrace.Verbose("ProcDumpExecutableHelper.GetProcDumpExecutable: PROCDUMP_PATH env variable is empty will try to run ProcDump from PATH.");
+            searchPath = true;
+        }
+        else if (!_fileHelper.DirectoryExists(procdumpDirectory))
+        {
+            EqtTrace.Verbose($"ProcDumpExecutableHelper.GetProcDumpExecutable: PROCDUMP_PATH env variable '{procdumpDirectory}' is not a directory, or the directory does not exist. Will try to run ProcDump from PATH.");
+            searchPath = true;
+        }
+
+        string filename = _environment.OperatingSystem == PlatformOperatingSystem.Windows
+            ? ProcDumpFileName(architecture)
+            : _environment.OperatingSystem is PlatformOperatingSystem.Unix or PlatformOperatingSystem.OSX
+                ? ProcdumpUnixProcess
+                : throw new NotSupportedException($"Not supported platform {_environment.OperatingSystem}");
+
+        if (!searchPath)
+        {
+            var candidatePath = Path.Combine(procdumpDirectory!, filename);
+            if (_fileHelper.Exists(candidatePath))
+            {
+                EqtTrace.Verbose($"ProcDumpExecutableHelper.GetProcDumpExecutable: Path to ProcDump '{candidatePath}' exists, using that.");
+                path = candidatePath;
+                return true;
+            }
+
+            EqtTrace.Verbose($"ProcDumpExecutableHelper.GetProcDumpExecutable: Path '{candidatePath}' does not exist will try to run {filename} from PATH.");
+        }
+
+        if (TryGetExecutablePath(filename, out var p))
+        {
+            EqtTrace.Verbose($"ProcDumpExecutableHelper.GetProcDumpExecutable: Resolved {filename} to {p} from PATH.");
+            path = p;
+            return true;
+        }
+
+        EqtTrace.Verbose($"ProcDumpExecutableHelper.GetProcDumpExecutable: Could not find {filename} on PATH.");
+        path = filename;
+        return false;
+    }
+
+    private bool TryGetExecutablePath(string executable, out string executablePath)
+    {
+        executablePath = string.Empty;
+        var pathString = _environmentVariableHelper.GetEnvironmentVariable("PATH") ?? string.Empty;
+        foreach (string path in pathString.Split(Path.PathSeparator))
+        {
+            string exeFullPath = Path.Combine(path.Trim(), executable);
+            if (_fileHelper.Exists(exeFullPath))
+            {
+                executablePath = exeFullPath;
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Execution.Shared/UILanguageOverride.cs b/src/Microsoft.TestPlatform.Execution.Shared/UILanguageOverride.cs
index a8e37d9a76..a4244f0441 100644
--- a/src/Microsoft.TestPlatform.Execution.Shared/UILanguageOverride.cs
+++ b/src/Microsoft.TestPlatform.Execution.Shared/UILanguageOverride.cs
@@ -4,79 +4,90 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.VisualStudio.TestPlatform.Execution
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.Execution;
+
+// Borrowed from dotnet/sdk with some tweaks to allow testing
+internal class UiLanguageOverride
 {
-    internal static class UILanguageOverride
+    private const string DOTNET_CLI_UI_LANGUAGE = nameof(DOTNET_CLI_UI_LANGUAGE);
+    private const string VSLANG = nameof(VSLANG);
+    private const string PreferredUILang = nameof(PreferredUILang);
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+    private readonly Action<CultureInfo> _setDefaultThreadCurrentUICulture;
+
+    public UiLanguageOverride()
+        : this(new EnvironmentVariableHelper(), language => CultureInfo.DefaultThreadCurrentUICulture = language)
+    { }
+
+    public UiLanguageOverride(IEnvironmentVariableHelper environmentVariableHelper, Action<CultureInfo> setDefaultThreadCurrentUICulture)
     {
-        private const string DOTNET_CLI_UI_LANGUAGE = nameof(DOTNET_CLI_UI_LANGUAGE);
-        private const string VSLANG = nameof(VSLANG);
-        private const string PreferredUILang = nameof(PreferredUILang);
+        _environmentVariableHelper = environmentVariableHelper;
+        _setDefaultThreadCurrentUICulture = setDefaultThreadCurrentUICulture;
+    }
 
-        internal static void SetCultureSpecifiedByUser()
+    internal void SetCultureSpecifiedByUser()
+    {
+        var language = GetOverriddenUiLanguage(_environmentVariableHelper);
+        if (language == null)
         {
-            CultureInfo language = GetOverriddenUILanguage();
-            if (language == null)
-            {
-                return;
-            }
-
-            ApplyOverrideToCurrentProcess(language);
-            FlowOverrideToChildProcesses(language);
+            return;
         }
 
+        ApplyOverrideToCurrentProcess(language, _setDefaultThreadCurrentUICulture);
+        FlowOverrideToChildProcesses(language, _environmentVariableHelper);
+    }
 
-        private static void ApplyOverrideToCurrentProcess(CultureInfo language)
-        {
-            CultureInfo.DefaultThreadCurrentUICulture = language;
-        }
+    private static void ApplyOverrideToCurrentProcess(CultureInfo language, Action<CultureInfo> setDefaultThreadCurrentUICulture)
+    {
+        setDefaultThreadCurrentUICulture(language);
+    }
 
-        private static CultureInfo GetOverriddenUILanguage()
+    private static CultureInfo? GetOverriddenUiLanguage(IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        // DOTNET_CLI_UI_LANGUAGE=<culture name> is the main way for users to customize the CLI's UI language.
+        string? dotnetCliLanguage = environmentVariableHelper.GetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE);
+        if (dotnetCliLanguage != null)
         {
-            // DOTNET_CLI_UI_LANGUAGE=<culture name> is the main way for users to customize the CLI's UI language.
-            string dotnetCliLanguage = Environment.GetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE);
-            if (dotnetCliLanguage != null)
+            try
             {
-                try
-                {
-                    return new CultureInfo(dotnetCliLanguage);
-                }
-                catch (CultureNotFoundException) { }
+                return new CultureInfo(dotnetCliLanguage);
             }
+            catch (CultureNotFoundException) { }
+        }
 
-#if !NETCOREAPP1_0
-            // VSLANG=<lcid> is set by VS and we respect that as well so that we will respect the VS 
-            // language preference if we're invoked by VS. 
-            string vsLang = Environment.GetEnvironmentVariable(VSLANG);
-            if (vsLang != null && int.TryParse(vsLang, out int vsLcid))
+        // VSLANG=<lcid> is set by VS and we respect that as well so that we will respect the VS
+        // language preference if we're invoked by VS.
+        string? vsLang = environmentVariableHelper.GetEnvironmentVariable(VSLANG);
+        if (vsLang != null && int.TryParse(vsLang, out int vsLcid))
+        {
+            try
             {
-                try
-                {
-                    return new CultureInfo(vsLcid);
-                }
-                catch (ArgumentOutOfRangeException) { }
-                catch (CultureNotFoundException) { }
+                return new CultureInfo(vsLcid);
             }
-# endif
-            return null;
+            catch (ArgumentOutOfRangeException) { }
+            catch (CultureNotFoundException) { }
         }
 
-        private static void FlowOverrideToChildProcesses(CultureInfo language)
-        {
-            // Do not override any environment variables that are already set as we do not want to clobber a more granular setting with our global setting.
-            SetIfNotAlreadySet(DOTNET_CLI_UI_LANGUAGE, language.Name);
-#if !NETCOREAPP1_0
-            SetIfNotAlreadySet(VSLANG, language.LCID.ToString()); // for tools following VS guidelines to just work in CLI
-#endif
-            SetIfNotAlreadySet(PreferredUILang, language.Name); // for C#/VB targets that pass $(PreferredUILang) to compiler
-        }
+        return null;
+    }
 
-        private static void SetIfNotAlreadySet(string environmentVariableName, string value)
+    private static void FlowOverrideToChildProcesses(CultureInfo language, IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        // Do not override any environment variables that are already set as we do not want to clobber a more granular setting with our global setting.
+        SetIfNotAlreadySet(DOTNET_CLI_UI_LANGUAGE, language.Name, environmentVariableHelper);
+        SetIfNotAlreadySet(VSLANG, language.LCID.ToString(CultureInfo.CurrentCulture), environmentVariableHelper); // for tools following VS guidelines to just work in CLI
+        SetIfNotAlreadySet(PreferredUILang, language.Name, environmentVariableHelper); // for C#/VB targets that pass $(PreferredUILang) to compiler
+    }
+
+    private static void SetIfNotAlreadySet(string environmentVariableName, string value, IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        string? currentValue = environmentVariableHelper.GetEnvironmentVariable(environmentVariableName);
+        if (currentValue == null)
         {
-            string currentValue = Environment.GetEnvironmentVariable(environmentVariableName);
-            if (currentValue == null)
-            {
-                Environment.SetEnvironmentVariable(environmentVariableName, value);
-            }
+            environmentVariableHelper.SetEnvironmentVariable(environmentVariableName, value);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Execution.Shared/WellKnownDebugEnvironmentVariables.cs b/src/Microsoft.TestPlatform.Execution.Shared/WellKnownDebugEnvironmentVariables.cs
new file mode 100644
index 0000000000..61fe4fa054
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Execution.Shared/WellKnownDebugEnvironmentVariables.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.Execution;
+
+internal static class WellKnownDebugEnvironmentVariables
+{
+    public const string VSTEST_BLAMEDATACOLLECTOR_DEBUG = nameof(VSTEST_BLAMEDATACOLLECTOR_DEBUG);
+    public const string VSTEST_DATACOLLECTOR_DEBUG = nameof(VSTEST_DATACOLLECTOR_DEBUG);
+    public const string VSTEST_HOST_DEBUG = nameof(VSTEST_HOST_DEBUG);
+    public const string VSTEST_RUNNER_DEBUG = nameof(VSTEST_RUNNER_DEBUG);
+    public const string VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS = nameof(VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS);
+    public const string VSTEST_HOST_DEBUG_ATTACHVS = nameof(VSTEST_HOST_DEBUG_ATTACHVS);
+    public const string VSTEST_RUNNER_DEBUG_ATTACHVS = nameof(VSTEST_RUNNER_DEBUG_ATTACHVS);
+    public const string VSTEST_HOST_NATIVE_DEBUG = nameof(VSTEST_HOST_NATIVE_DEBUG);
+    public const string VSTEST_RUNNER_NATIVE_DEBUG = nameof(VSTEST_RUNNER_NATIVE_DEBUG);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BannedSymbols.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs
index 334dbb7dfe..dfdf7b1f30 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs
@@ -1,253 +1,286 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// The blame collector.
+/// </summary>
+[DataCollectorFriendlyName("Blame")]
+[DataCollectorTypeUri("datacollector://Microsoft/TestPlatform/Extensions/Blame/v1")]
+public class BlameCollector : DataCollector, ITestExecutionEnvironmentSpecifier
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private const int DefaultInactivityTimeInMinutes = 60;
+
+    private DataCollectionSink? _dataCollectionSink;
+    private DataCollectionEnvironmentContext? _context;
+    private DataCollectionEvents? _events;
+    private DataCollectionLogger? _logger;
+    private readonly IProcessDumpUtility _processDumpUtility;
+    private List<Guid>? _testSequence;
+    private Dictionary<Guid, BlameTestObject>? _testObjectDictionary;
+    private readonly IBlameReaderWriter _blameReaderWriter;
+    private readonly IFileHelper _fileHelper;
+    private readonly IProcessHelper _processHelper;
+    private XmlElement? _configurationElement;
+    private int _testStartCount;
+    private int _testEndCount;
+    private bool _collectProcessDumpOnCrash;
+    private bool _collectProcessDumpOnHang;
+    private bool _monitorPostmortemDumpFolder;
+    private bool _collectDumpAlways;
+    private string? _attachmentGuid;
+
+    private CrashDumpType _crashDumpType;
+    private HangDumpType? _hangDumpType;
+
+    private bool _inactivityTimerAlreadyFired;
+    private IInactivityTimer? _inactivityTimer;
+    private TimeSpan _inactivityTimespan = TimeSpan.FromMinutes(DefaultInactivityTimeInMinutes);
+
+    private int _testHostProcessId;
+    private string? _testHostProcessName;
+    private string? _targetFramework;
+    private readonly List<KeyValuePair<string, string>> _environmentVariables = new();
+    private bool _uploadDumpFiles;
+    private string? _tempDirectory;
+    private string? _monitorPostmortemDumpFolderPath;
 
     /// <summary>
-    /// The blame collector.
+    /// Initializes a new instance of the <see cref="BlameCollector"/> class.
+    /// Using XmlReaderWriter by default
     /// </summary>
-    [DataCollectorFriendlyName("Blame")]
-    [DataCollectorTypeUri("datacollector://Microsoft/TestPlatform/Extensions/Blame/v1")]
-    public class BlameCollector : DataCollector, ITestExecutionEnvironmentSpecifier
+    public BlameCollector()
+        : this(new XmlReaderWriter(), new ProcessDumpUtility(), null, new FileHelper(), new ProcessHelper())
     {
-        private const int DefaultInactivityTimeInMinutes = 60;
-
-        private DataCollectionSink dataCollectionSink;
-        private DataCollectionEnvironmentContext context;
-        private DataCollectionEvents events;
-        private DataCollectionLogger logger;
-        private IProcessDumpUtility processDumpUtility;
-        private List<Guid> testSequence;
-        private Dictionary<Guid, BlameTestObject> testObjectDictionary;
-        private IBlameReaderWriter blameReaderWriter;
-        private IFileHelper fileHelper;
-        private XmlElement configurationElement;
-        private int testStartCount;
-        private int testEndCount;
-        private bool collectProcessDumpOnTrigger;
-        private bool collectProcessDumpOnTestHostHang;
-        private bool collectDumpAlways;
-        private bool processFullDumpEnabled;
-        private bool inactivityTimerAlreadyFired;
-        private string attachmentGuid;
-        private IInactivityTimer inactivityTimer;
-        private TimeSpan inactivityTimespan = TimeSpan.FromMinutes(DefaultInactivityTimeInMinutes);
-        private int testHostProcessId;
-        private string targetFramework;
-        private List<KeyValuePair<string, string>> environmentVariables = new List<KeyValuePair<string, string>>();
-        private bool uploadDumpFiles;
-        private string tempDirectory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameCollector"/> class.
-        /// Using XmlReaderWriter by default
-        /// </summary>
-        public BlameCollector()
-            : this(new XmlReaderWriter(), new ProcessDumpUtility(), null, new FileHelper())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameCollector"/> class.
-        /// </summary>
-        /// <param name="blameReaderWriter">
-        /// BlameReaderWriter instance.
-        /// </param>
-        /// <param name="processDumpUtility">
-        /// IProcessDumpUtility instance.
-        /// </param>
-        /// <param name="inactivityTimer">
-        /// InactivityTimer instance.
-        /// </param>
-        /// <param name="fileHelper">
-        /// Filehelper instance.
-        /// </param>
-        internal BlameCollector(
-            IBlameReaderWriter blameReaderWriter,
-            IProcessDumpUtility processDumpUtility,
-            IInactivityTimer inactivityTimer,
-            IFileHelper fileHelper)
-        {
-            this.blameReaderWriter = blameReaderWriter;
-            this.processDumpUtility = processDumpUtility;
-            this.inactivityTimer = inactivityTimer;
-            this.fileHelper = fileHelper;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameCollector"/> class.
+    /// </summary>
+    /// <param name="blameReaderWriter">
+    /// BlameReaderWriter instance.
+    /// </param>
+    /// <param name="processDumpUtility">
+    /// IProcessDumpUtility instance.
+    /// </param>
+    /// <param name="inactivityTimer">
+    /// InactivityTimer instance.
+    /// </param>
+    /// <param name="fileHelper">
+    /// Filehelper instance.
+    /// </param>
+    /// <param name="processHelper">Process helper instance.</param>
+    internal BlameCollector(
+        IBlameReaderWriter blameReaderWriter,
+        IProcessDumpUtility processDumpUtility,
+        IInactivityTimer? inactivityTimer,
+        IFileHelper fileHelper,
+        IProcessHelper processHelper)
+    {
+        _blameReaderWriter = blameReaderWriter;
+        _processDumpUtility = processDumpUtility;
+        _inactivityTimer = inactivityTimer;
+        _fileHelper = fileHelper;
+        _processHelper = processHelper;
+    }
 
-        /// <summary>
-        /// Gets environment variables that should be set in the test execution environment
-        /// </summary>
-        /// <returns>Environment variables that should be set in the test execution environment</returns>
-        public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
-        {
-            return this.environmentVariables;
-        }
+    /// <summary>
+    /// Gets environment variables that should be set in the test execution environment
+    /// </summary>
+    /// <returns>Environment variables that should be set in the test execution environment</returns>
+    public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
+    {
+        return _environmentVariables;
+    }
 
-        /// <summary>
-        /// Initializes parameters for the new instance of the class <see cref="BlameDataCollector"/>
-        /// </summary>
-        /// <param name="configurationElement">The Xml Element to save to</param>
-        /// <param name="events">Data collection events to which methods subscribe</param>
-        /// <param name="dataSink">A data collection sink for data transfer</param>
-        /// <param name="logger">Data Collection Logger to send messages to the client </param>
-        /// <param name="environmentContext">Context of data collector environment</param>
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
+    /// <summary>
+    /// Initializes parameters for the new instance of the class <see cref="BlameDataCollector"/>
+    /// </summary>
+    /// <param name="configurationElement">The Xml Element to save to</param>
+    /// <param name="events">Data collection events to which methods subscribe</param>
+    /// <param name="dataSink">A data collection sink for data transfer</param>
+    /// <param name="logger">Data Collection Logger to send messages to the client </param>
+    /// <param name="environmentContext">Context of data collector environment</param>
+    [MemberNotNull(nameof(_events), nameof(_dataCollectionSink), nameof(_testSequence), nameof(_testObjectDictionary), nameof(_logger))]
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
+    {
+        DebuggerBreakpoint.WaitForDebugger(WellKnownDebugEnvironmentVariables.VSTEST_BLAMEDATACOLLECTOR_DEBUG);
+
+        _events = events;
+        _dataCollectionSink = dataSink;
+        _context = environmentContext;
+        _configurationElement = configurationElement;
+        _testSequence = new List<Guid>();
+        _testObjectDictionary = new Dictionary<Guid, BlameTestObject>();
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+        // Subscribing to events
+        _events.TestHostLaunched += TestHostLaunchedHandler;
+        _events.SessionEnd += SessionEndedHandler;
+        _events.TestCaseStart += EventsTestCaseStart;
+        _events.TestCaseEnd += EventsTestCaseEnd;
+
+        if (_configurationElement != null)
         {
-            ValidateArg.NotNull(logger, nameof(logger));
-
-            this.events = events;
-            this.dataCollectionSink = dataSink;
-            this.context = environmentContext;
-            this.configurationElement = configurationElement;
-            this.testSequence = new List<Guid>();
-            this.testObjectDictionary = new Dictionary<Guid, BlameTestObject>();
-            this.logger = logger;
-
-            // Subscribing to events
-            this.events.TestHostLaunched += this.TestHostLaunchedHandler;
-            this.events.SessionEnd += this.SessionEndedHandler;
-            this.events.TestCaseStart += this.EventsTestCaseStart;
-            this.events.TestCaseEnd += this.EventsTestCaseEnd;
-
-            if (this.configurationElement != null)
+            if (_configurationElement[Constants.DumpModeKey] is XmlElement collectDumpNode)
             {
-                var collectDumpNode = this.configurationElement[Constants.DumpModeKey];
-                this.collectProcessDumpOnTrigger = collectDumpNode != null;
-
-                if (this.collectProcessDumpOnTrigger)
-                {
-                    this.ValidateAndAddTriggerBasedProcessDumpParameters(collectDumpNode);
-
-                    // enabling dumps on MacOS needs to be done explicitly https://github.com/dotnet/runtime/pull/40105
-                    this.environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableElfDumpOnMacOS", "1"));
-                    this.environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableMiniDump", "1"));
-
-                    // https://github.com/dotnet/coreclr/blob/master/Documentation/botr/xplat-minidump-generation.md
-                    // 2   MiniDumpWithPrivateReadWriteMemory
-                    // 4   MiniDumpWithFullMemory
-                    this.environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgMiniDumpType", this.processFullDumpEnabled ? "4" : "2"));
-                    var dumpDirectory = this.GetDumpDirectory();
-                    var dumpPath = Path.Combine(dumpDirectory, $"%e_%p_%t_crashdump.dmp");
-                    this.environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgMiniDumpName", dumpPath));
-                }
-
-                var collectHangBasedDumpNode = this.configurationElement[Constants.CollectDumpOnTestSessionHang];
-                this.collectProcessDumpOnTestHostHang = collectHangBasedDumpNode != null;
-                if (this.collectProcessDumpOnTestHostHang)
-                {
-                    // enabling dumps on MacOS needs to be done explicitly https://github.com/dotnet/runtime/pull/40105
-                    this.environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableElfDumpOnMacOS", "1"));
+                _collectProcessDumpOnCrash = true;
+                ValidateAndAddCrashProcessDumpParameters(collectDumpNode);
+
+                // enabling dumps on MacOS needs to be done explicitly https://github.com/dotnet/runtime/pull/40105
+                _environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableElfDumpOnMacOS", "1"));
+                _environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableMiniDump", "1"));
+
+                // https://github.com/dotnet/coreclr/blob/master/Documentation/botr/xplat-minidump-generation.md
+                // 2   MiniDumpWithPrivateReadWriteMemory
+                // 4   MiniDumpWithFullMemory
+                _environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgMiniDumpType", _crashDumpType == CrashDumpType.Full ? "4" : "2"));
+                var dumpDirectory = GetDumpDirectory();
+                var dumpPath = Path.Combine(dumpDirectory, $"%e_%p_%t_crashdump.dmp");
+                _environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgMiniDumpName", dumpPath));
+            }
+            else
+            {
+                _collectProcessDumpOnCrash = false;
+            }
 
-                    this.ValidateAndAddHangBasedProcessDumpParameters(collectHangBasedDumpNode);
-                }
+            if (_configurationElement[Constants.CollectDumpOnTestSessionHang] is XmlElement collectHangBasedDumpNode)
+            {
+                _collectProcessDumpOnHang = true;
+                // enabling dumps on MacOS needs to be done explicitly https://github.com/dotnet/runtime/pull/40105
+                _environmentVariables.Add(new KeyValuePair<string, string>("COMPlus_DbgEnableElfDumpOnMacOS", "1"));
 
-                var tfm = this.configurationElement[Constants.TargetFramework]?.InnerText;
-                if (!string.IsNullOrWhiteSpace(tfm))
-                {
-                    this.targetFramework = tfm;
-                }
+                ValidateAndAddHangProcessDumpParameters(collectHangBasedDumpNode!);
+            }
+            else
+            {
+                _collectProcessDumpOnHang = false;
             }
 
-            this.attachmentGuid = Guid.NewGuid().ToString().Replace("-", string.Empty);
+            _monitorPostmortemDumpFolder = _configurationElement[Constants.MonitorPostmortemDebugger] is XmlElement monitorPostmortemNode &&
+                ValidateMonitorPostmortemDebuggerParameters(monitorPostmortemNode);
+            EqtTrace.Info($"[MonitorPostmortemDump]Monitor enabled: '{_monitorPostmortemDumpFolder}'");
 
-            if (this.collectProcessDumpOnTestHostHang)
+            var tfm = _configurationElement[Constants.TargetFramework]?.InnerText;
+            if (!tfm.IsNullOrWhiteSpace())
             {
-                this.inactivityTimer = this.inactivityTimer ?? new InactivityTimer(this.CollectDumpAndAbortTesthost);
-                this.ResetInactivityTimer();
+                _targetFramework = tfm;
             }
         }
 
-        /// <summary>
-        /// Disposes of the timer when called to prevent further calls.
-        /// Kills the other instance of proc dump if launched for collecting trigger based dumps.
-        /// Starts and waits for a new proc dump process to collect a single dump and then
-        /// kills the testhost process.
-        /// </summary>
-        private void CollectDumpAndAbortTesthost()
+        _attachmentGuid = Guid.NewGuid().ToString("N");
+
+        if (_collectProcessDumpOnHang)
         {
-            this.inactivityTimerAlreadyFired = true;
+            _inactivityTimer ??= new InactivityTimer(CollectDumpAndAbortTesthost);
+            ResetInactivityTimer();
+        }
+    }
+
+    /// <summary>
+    /// Disposes of the timer when called to prevent further calls.
+    /// Kills the other instance of proc dump if launched for collecting crash dumps.
+    /// Starts and waits for a new proc dump process to collect a single dump and then
+    /// kills the testhost process.
+    /// </summary>
+    private void CollectDumpAndAbortTesthost()
+    {
+        TPDebug.Assert(_logger != null && _context != null && _dataCollectionSink != null, "Initialize must be called before calling this method");
+        _inactivityTimerAlreadyFired = true;
 
-            string value;
-            string unit;
+        string value;
+        string unit;
 
-            if (this.inactivityTimespan.TotalSeconds <= 90)
-            {
-                value = ((int)this.inactivityTimespan.TotalSeconds).ToString();
-                unit = Resources.Resources.Seconds;
-            }
-            else
-            {
-                value = Math.Round(this.inactivityTimespan.TotalMinutes, 2).ToString();
-                unit = Resources.Resources.Minutes;
-            }
+        if (_inactivityTimespan.TotalSeconds <= 90)
+        {
+            value = ((int)_inactivityTimespan.TotalSeconds).ToString(CultureInfo.InvariantCulture);
+            unit = Resources.Resources.Seconds;
+        }
+        else
+        {
+            value = Math.Round(_inactivityTimespan.TotalMinutes, 2).ToString(CultureInfo.InvariantCulture);
+            unit = Resources.Resources.Minutes;
+        }
 
-            var message = string.Format(CultureInfo.CurrentUICulture, Resources.Resources.InactivityTimeout, value, unit);
+        var message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.InactivityTimeout, value, unit);
 
-            EqtTrace.Warning(message);
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, message);
+        EqtTrace.Warning(message);
+        _logger.LogWarning(_context.SessionDataCollectionContext, message);
 
-            try
-            {
-                EqtTrace.Verbose("Calling dispose on Inactivity timer.");
-                this.inactivityTimer.Dispose();
-            }
-            catch
-            {
-                EqtTrace.Verbose("Inactivity timer is already disposed.");
-            }
+        try
+        {
+            EqtTrace.Verbose("Calling dispose on Inactivity timer.");
+            _inactivityTimer?.Dispose();
+        }
+        catch
+        {
+            EqtTrace.Verbose("Inactivity timer is already disposed.");
+        }
 
-            if (this.collectProcessDumpOnTrigger)
-            {
-                // Detach procdump from the testhost process to prevent testhost process from crashing
-                // if/when we try to kill the existing proc dump process.
-                // And also prevent collecting dump on exit of the process.
-                this.processDumpUtility.DetachFromTargetProcess(this.testHostProcessId);
-            }
+        if (_collectProcessDumpOnCrash)
+        {
+            // Detach the dumper from the testhost process to prevent crashing testhost process. When the dumper is procdump.exe
+            // it must be detached before we try to dump the process, and simply killing it would take down the testhost process.
+            //
+            // Detaching also prevents creating an extra dump at the exit of the testhost process.
+            _processDumpUtility.DetachFromTargetProcess(_testHostProcessId);
+        }
 
-            var hangDumpSuccess = false;
+        // Skip creating the dump if the option is set to none, and just kill the process.
+        if ((_hangDumpType ?? HangDumpType.Full) != HangDumpType.None)
+        {
             try
             {
-                Action<string> logWarning = m => this.logger.LogWarning(this.context.SessionDataCollectionContext, m);
-                var dumpDirectory = this.GetDumpDirectory();
-                this.processDumpUtility.StartHangBasedProcessDump(this.testHostProcessId, dumpDirectory, this.processFullDumpEnabled, this.targetFramework, logWarning);
-                hangDumpSuccess = true;
+                Action<string> logWarning = m => _logger.LogWarning(_context.SessionDataCollectionContext, m);
+                var dumpDirectory = GetDumpDirectory();
+                _processDumpUtility.StartHangBasedProcessDump(_testHostProcessId, dumpDirectory, _hangDumpType == HangDumpType.Full, _targetFramework!, logWarning);
             }
             catch (Exception ex)
             {
-                this.logger.LogError(this.context.SessionDataCollectionContext, $"Blame: Creating hang dump failed with error.", ex);
+                _logger.LogError(_context.SessionDataCollectionContext, $"Blame: Creating hang dump failed with error.", ex);
             }
 
-            if (this.uploadDumpFiles)
+            if (_uploadDumpFiles)
             {
                 try
                 {
-                    var dumpFiles = this.processDumpUtility.GetDumpFiles(true, /* if we killed it by hang dumper, we already have our dump, otherwise it might have crashed, and we want all dumps */ !hangDumpSuccess);
+                    var dumpFiles = _processDumpUtility.GetDumpFiles(true,
+                        true /* Get all dumps that there are, if crashdump was created before we hangdumped, get it. It probably has interesting info. */);
                     foreach (var dumpFile in dumpFiles)
                     {
                         try
                         {
-                            if (!string.IsNullOrEmpty(dumpFile))
+                            if (!dumpFile.IsNullOrEmpty())
                             {
-                                var fileTransferInformation = new FileTransferInformation(this.context.SessionDataCollectionContext, dumpFile, true, this.fileHelper);
-                                this.dataCollectionSink.SendFileAsync(fileTransferInformation);
+                                var fileTransferInformation = new FileTransferInformation(_context.SessionDataCollectionContext, dumpFile, true, _fileHelper);
+                                _dataCollectionSink.SendFileAsync(fileTransferInformation);
                             }
                         }
                         catch (Exception ex)
@@ -264,370 +297,441 @@ private void CollectDumpAndAbortTesthost()
                 }
                 catch (Exception ex)
                 {
-                    this.logger.LogError(this.context.SessionDataCollectionContext, $"Blame: Collecting hang dump failed with error.", ex);
+                    _logger.LogError(_context.SessionDataCollectionContext, $"Blame: Collecting hang dump failed with error.", ex);
                 }
             }
             else
             {
                 EqtTrace.Info("BlameCollector.CollectDumpAndAbortTesthost: Custom path to dump directory was provided via VSTEST_DUMP_PATH. Skipping attachment upload, the caller is responsible for collecting and uploading the dumps themselves.");
             }
+        }
 
+        try
+        {
+            var p = Process.GetProcessById(_testHostProcessId);
             try
             {
-                var p = Process.GetProcessById(this.testHostProcessId);
-                try
-                {
-                    if (!p.HasExited)
-                    {
-                        p.Kill();
-                    }
-                }
-                catch (InvalidOperationException)
+                if (!p.HasExited)
                 {
+                    p.Kill();
                 }
             }
-            catch (Exception ex)
+            catch (InvalidOperationException)
             {
-                EqtTrace.Error(ex);
             }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error(ex);
+        }
+    }
+
+    private bool ValidateMonitorPostmortemDebuggerParameters(XmlElement collectDumpNode)
+    {
+        TPDebug.Assert(_logger != null && _context != null, "Initialize must be called before calling this method");
+        if (StringUtils.IsNullOrEmpty(_monitorPostmortemDumpFolderPath = collectDumpNode.GetAttribute("DumpDirectoryPath")))
+        {
+            _logger.LogWarning(_context.SessionDataCollectionContext, Resources.Resources.MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter);
+            return false;
+        }
+
+        if (!_fileHelper.DirectoryExists(_monitorPostmortemDumpFolderPath))
+        {
+            _logger.LogWarning(_context.SessionDataCollectionContext, Resources.Resources.MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter);
+            return false;
+        }
+
+        return true;
+    }
 
-        private void ValidateAndAddTriggerBasedProcessDumpParameters(XmlElement collectDumpNode)
+    private void ValidateAndAddCrashProcessDumpParameters(XmlElement collectDumpNode)
+    {
+        TPDebug.Assert(_logger != null && _context != null, "Initialize must be called before calling this method");
+        foreach (XmlAttribute blameAttribute in collectDumpNode.Attributes)
         {
-            foreach (XmlAttribute blameAttribute in collectDumpNode.Attributes)
+            switch (blameAttribute)
             {
-                switch (blameAttribute)
-                {
-                    case XmlAttribute attribute when string.Equals(attribute.Name, Constants.CollectDumpAlwaysKey, StringComparison.OrdinalIgnoreCase):
+                case XmlAttribute attribute when string.Equals(attribute.Name, Constants.CollectDumpAlwaysKey, StringComparison.OrdinalIgnoreCase):
 
-                        if (string.Equals(attribute.Value, Constants.TrueConfigurationValue, StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Value, Constants.FalseConfigurationValue, StringComparison.OrdinalIgnoreCase))
-                        {
-                            bool.TryParse(attribute.Value, out this.collectDumpAlways);
-                        }
-                        else
-                        {
-                            this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, Constants.TrueConfigurationValue, Constants.FalseConfigurationValue));
-                        }
+                    if ((!string.Equals(attribute.Value, Constants.TrueConfigurationValue, StringComparison.OrdinalIgnoreCase)
+                        && !string.Equals(attribute.Value, Constants.FalseConfigurationValue, StringComparison.OrdinalIgnoreCase))
+                        || !bool.TryParse(attribute.Value, out _collectDumpAlways))
+                    {
+                        _logger.LogWarning(_context.SessionDataCollectionContext, FormatBlameParameterValueIncorrectMessage(attribute, [Constants.TrueConfigurationValue, Constants.FalseConfigurationValue]));
+                    }
 
-                        break;
+                    break;
 
-                    case XmlAttribute attribute when string.Equals(attribute.Name, Constants.DumpTypeKey, StringComparison.OrdinalIgnoreCase):
+                case XmlAttribute attribute when string.Equals(attribute.Name, Constants.DumpTypeKey, StringComparison.OrdinalIgnoreCase):
 
-                        if (string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Value, Constants.MiniConfigurationValue, StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.processFullDumpEnabled = string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase);
-                        }
-                        else
-                        {
-                            this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, Constants.FullConfigurationValue, Constants.MiniConfigurationValue));
-                        }
+                    if (Enum.TryParse(attribute.Value, ignoreCase: true, out CrashDumpType value) && Enum.IsDefined(typeof(CrashDumpType), value))
+                    {
+                        _crashDumpType = value;
+                    }
+                    else
+                    {
+                        _logger.LogWarning(_context.SessionDataCollectionContext, FormatBlameParameterValueIncorrectMessage(attribute, Enum.GetNames(typeof(CrashDumpType))));
+                    }
 
-                        break;
+                    break;
 
-                    default:
+                default:
 
-                        this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterKeyIncorrect, blameAttribute.Name));
-                        break;
-                }
+                    _logger.LogWarning(_context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterKeyIncorrect, blameAttribute.Name));
+                    break;
             }
         }
+    }
+
+    internal static string FormatBlameParameterValueIncorrectMessage(XmlAttribute attribute, params string[] validValues)
+    {
+        return string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, attribute.Value, string.Join(", ", validValues));
+    }
 
-        private void ValidateAndAddHangBasedProcessDumpParameters(XmlElement collectDumpNode)
+    private void ValidateAndAddHangProcessDumpParameters(XmlElement collectDumpNode)
+    {
+        TPDebug.Assert(_logger != null && _context != null, "Initialize must be called before calling this method");
+        foreach (XmlAttribute blameAttribute in collectDumpNode.Attributes)
         {
-            foreach (XmlAttribute blameAttribute in collectDumpNode.Attributes)
+            switch (blameAttribute)
             {
-                switch (blameAttribute)
-                {
-                    case XmlAttribute attribute when string.Equals(attribute.Name, Constants.TestTimeout, StringComparison.OrdinalIgnoreCase):
-
-                        if (!string.IsNullOrWhiteSpace(attribute.Value) && TimeSpanParser.TryParse(attribute.Value, out var timeout))
-                        {
-                            this.inactivityTimespan = timeout;
-                        }
-                        else
-                        {
-                            this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.UnexpectedValueForInactivityTimespanValue, attribute.Value));
-                        }
+                case XmlAttribute attribute when string.Equals(attribute.Name, Constants.TestTimeout, StringComparison.OrdinalIgnoreCase):
 
-                        break;
+                    if (!attribute.Value.IsNullOrWhiteSpace() && TimeSpanParser.TryParse(attribute.Value, out var timeout))
+                    {
+                        _inactivityTimespan = timeout;
+                    }
+                    else
+                    {
+                        _logger.LogWarning(_context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentCulture, Resources.Resources.UnexpectedValueForInactivityTimespanValue, attribute.Value));
+                    }
 
-                    // allow HangDumpType attribute to be used on the hang dump this is the prefered way
-                    case XmlAttribute attribute when string.Equals(attribute.Name, Constants.HangDumpTypeKey, StringComparison.OrdinalIgnoreCase):
+                    break;
 
-                        if (string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Value, Constants.MiniConfigurationValue, StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.processFullDumpEnabled = string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase);
-                        }
-                        else
-                        {
-                            this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, Constants.FullConfigurationValue, Constants.MiniConfigurationValue));
-                        }
+                // allow HangDumpType attribute to be used on the hang dump this is the prefered way
+                case XmlAttribute attribute when string.Equals(attribute.Name, Constants.HangDumpTypeKey, StringComparison.OrdinalIgnoreCase):
 
-                        break;
+                    if (Enum.TryParse(attribute.Value, ignoreCase: true, out HangDumpType value) && Enum.IsDefined(typeof(HangDumpType), value))
+                    {
+                        _hangDumpType = value;
+                    }
+                    else
+                    {
+                        _logger.LogWarning(_context.SessionDataCollectionContext, FormatBlameParameterValueIncorrectMessage(attribute, Enum.GetNames(typeof(HangDumpType))));
+                    }
 
-                    // allow DumpType attribute to be used on the hang dump for backwards compatibility
-                    case XmlAttribute attribute when string.Equals(attribute.Name, Constants.DumpTypeKey, StringComparison.OrdinalIgnoreCase):
+                    break;
 
-                        if (string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Value, Constants.MiniConfigurationValue, StringComparison.OrdinalIgnoreCase))
-                        {
-                            this.processFullDumpEnabled = string.Equals(attribute.Value, Constants.FullConfigurationValue, StringComparison.OrdinalIgnoreCase);
-                        }
-                        else
-                        {
-                            this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, Constants.FullConfigurationValue, Constants.MiniConfigurationValue));
-                        }
+                // allow DumpType attribute to be used on the hang dump for backwards compatibility
+                case XmlAttribute attribute when string.Equals(attribute.Name, Constants.DumpTypeKey, StringComparison.OrdinalIgnoreCase):
+                    // DumpType and HangDumpType are both valid ways to define the dump type. In case we get HangDumpType and DumpType in the command we want HangDumpType to win.
+                    if (Enum.TryParse(attribute.Value, ignoreCase: true, out HangDumpType value2) && Enum.IsDefined(typeof(HangDumpType), value2))
+                    {
+                        _hangDumpType = value2;
+                    }
+                    else
+                    {
+                        // This error is using CrashDumpType on purpose, because the option we are providing is actually supposed to take only CrashDumpType values. We are parsing it into
+                        // HangDumpType to have easier time converting.
+                        _logger.LogWarning(_context.SessionDataCollectionContext, FormatBlameParameterValueIncorrectMessage(attribute, Enum.GetNames(typeof(CrashDumpType))));
+                    }
 
-                        break;
+                    break;
 
-                    default:
+                default:
 
-                        this.logger.LogWarning(this.context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterKeyIncorrect, blameAttribute.Name));
-                        break;
-                }
+                    _logger.LogWarning(_context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterKeyIncorrect, blameAttribute.Name));
+                    break;
             }
         }
+    }
 
-        /// <summary>
-        /// Called when Test Case Start event is invoked
-        /// </summary>
-        /// <param name="sender">Sender</param>
-        /// <param name="e">TestCaseStartEventArgs</param>
-        private void EventsTestCaseStart(object sender, TestCaseStartEventArgs e)
-        {
-            this.ResetInactivityTimer();
+    /// <summary>
+    /// Called when Test Case Start event is invoked
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">TestCaseStartEventArgs</param>
+    private void EventsTestCaseStart(object? sender, TestCaseStartEventArgs e)
+    {
+        TPDebug.Assert(_testSequence != null && _testObjectDictionary != null, "Initialize must be called before calling this method");
+        ResetInactivityTimer();
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Blame Collector : Test Case Start");
-            }
+        EqtTrace.Info("BlameCollector.EventsTestCaseStart: Test Case Start");
 
-            var blameTestObject = new BlameTestObject(e.TestElement);
+        TPDebug.Assert(e.TestElement is not null, "e.TestElement is null");
+        var blameTestObject = new BlameTestObject(e.TestElement);
 
-            // Add guid to list of test sequence to maintain the order.
-            this.testSequence.Add(blameTestObject.Id);
+        // Add guid to list of test sequence to maintain the order.
+        _testSequence.Add(blameTestObject.Id);
 
-            // Add the test object to the dictionary.
-            this.testObjectDictionary.Add(blameTestObject.Id, blameTestObject);
+        // Add the test object to the dictionary.
+        _testObjectDictionary.Add(blameTestObject.Id, blameTestObject);
 
-            // Increment test start count.
-            this.testStartCount++;
-        }
+        // Increment test start count.
+        _testStartCount++;
+    }
 
-        /// <summary>
-        /// Called when Test Case End event is invoked
-        /// </summary>
-        /// <param name="sender">Sender</param>
-        /// <param name="e">TestCaseEndEventArgs</param>
-        private void EventsTestCaseEnd(object sender, TestCaseEndEventArgs e)
-        {
-            this.ResetInactivityTimer();
+    /// <summary>
+    /// Called when Test Case End event is invoked
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">TestCaseEndEventArgs</param>
+    private void EventsTestCaseEnd(object? sender, TestCaseEndEventArgs e)
+    {
+        TPDebug.Assert(_testObjectDictionary != null, "Initialize must be called before calling this method");
+        ResetInactivityTimer();
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Blame Collector : Test Case End");
-            }
+        EqtTrace.Info("BlameCollector.EventsTestCaseEnd: Test Case End");
 
-            this.testEndCount++;
+        _testEndCount++;
 
-            // Update the test object in the dictionary as the test has completed.
-            if (this.testObjectDictionary.ContainsKey(e.TestElement.Id))
-            {
-                this.testObjectDictionary[e.TestElement.Id].IsCompleted = true;
-            }
+        // Update the test object in the dictionary as the test has completed.
+        TPDebug.Assert(e.TestElement is not null, "e.TestElement is null");
+        if (_testObjectDictionary.ContainsKey(e.TestElement.Id))
+        {
+            _testObjectDictionary[e.TestElement.Id].IsCompleted = true;
         }
+    }
 
-        /// <summary>
-        /// Called when Session End event is invoked
-        /// </summary>
-        /// <param name="sender">Sender</param>
-        /// <param name="args">SessionEndEventArgs</param>
-        private void SessionEndedHandler(object sender, SessionEndEventArgs args)
-        {
-            this.ResetInactivityTimer();
+    /// <summary>
+    /// Called when Session End event is invoked
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="args">SessionEndEventArgs</param>
+    private void SessionEndedHandler(object? sender, SessionEndEventArgs args)
+    {
+        TPDebug.Assert(_testSequence != null && _testObjectDictionary != null && _context != null && _dataCollectionSink != null && _logger != null, "Initialize must be called before calling this method");
+        ResetInactivityTimer();
 
-            if (EqtTrace.IsInfoEnabled)
+        EqtTrace.Info("Blame Collector: Session End");
+
+        try
+        {
+            // If the last test crashes, it will not invoke a test case end and therefore
+            // In case of crash testStartCount will be greater than testEndCount and we need to write the sequence
+            // And send the attachment. This won't indicate failure if there are 0 tests in the assembly, or when it fails in setup.
+            var processCrashedWhenRunningTests = _testStartCount > _testEndCount;
+            if (processCrashedWhenRunningTests)
             {
-                EqtTrace.Info("Blame Collector : Session End");
-            }
+                var filepath = Path.Combine(GetTempDirectory(), Constants.AttachmentFileName + "_" + _attachmentGuid);
 
-            try
+                filepath = _blameReaderWriter.WriteTestSequence(_testSequence, _testObjectDictionary, filepath);
+                var fti = new FileTransferInformation(_context.SessionDataCollectionContext, filepath, true);
+                _dataCollectionSink.SendFileAsync(fti);
+            }
+            else
             {
-                // If the last test crashes, it will not invoke a test case end and therefore
-                // In case of crash testStartCount will be greater than testEndCount and we need to write the sequence
-                // And send the attachment. This won't indicate failure if there are 0 tests in the assembly, or when it fails in setup.
-                var processCrashedWhenRunningTests = this.testStartCount > this.testEndCount;
-                if (processCrashedWhenRunningTests)
+                if (_collectProcessDumpOnHang)
                 {
-                    var filepath = Path.Combine(this.GetTempDirectory(), Constants.AttachmentFileName + "_" + this.attachmentGuid);
-
-                    filepath = this.blameReaderWriter.WriteTestSequence(this.testSequence, this.testObjectDictionary, filepath);
-                    var fti = new FileTransferInformation(this.context.SessionDataCollectionContext, filepath, true);
-                    this.dataCollectionSink.SendFileAsync(fti);
+                    _logger.LogWarning(_context.SessionDataCollectionContext, Resources.Resources.NotGeneratingSequenceFile);
                 }
-                else
+            }
+
+            if (_uploadDumpFiles)
+            {
+                try
                 {
-                    if (this.collectProcessDumpOnTestHostHang)
+                    var dumpFiles = _processDumpUtility.GetDumpFiles(warnOnNoDumpFiles: _collectDumpAlways, processCrashedWhenRunningTests);
+                    foreach (var dumpFile in dumpFiles)
                     {
-                        this.logger.LogWarning(this.context.SessionDataCollectionContext, Resources.Resources.NotGeneratingSequenceFile);
+                        if (!dumpFile.IsNullOrEmpty())
+                        {
+                            try
+                            {
+                                var fileTransferInformation = new FileTransferInformation(_context.SessionDataCollectionContext, dumpFile, true);
+                                _dataCollectionSink.SendFileAsync(fileTransferInformation);
+                            }
+                            catch (FileNotFoundException ex)
+                            {
+                                EqtTrace.Warning(ex.ToString());
+                                _logger.LogWarning(args.Context, ex.ToString());
+                            }
+                        }
                     }
                 }
+                catch (FileNotFoundException ex)
+                {
+                    EqtTrace.Warning(ex.ToString());
+                    _logger.LogWarning(args.Context, ex.ToString());
+                }
+            }
+            else
+            {
+                EqtTrace.Info("BlameCollector.CollectDumpAndAbortTesthost: Custom path to dump directory was provided via VSTEST_DUMP_PATH. Skipping attachment upload, the caller is responsible for collecting and uploading the dumps themselves.");
+            }
 
-                if (this.uploadDumpFiles)
+            if (_monitorPostmortemDumpFolder)
+            {
+                if (!_fileHelper.DirectoryExists(_monitorPostmortemDumpFolderPath))
+                {
+                    _logger.LogWarning(_context.SessionDataCollectionContext, Resources.Resources.MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter);
+                }
+                else
                 {
-                    try
+                    // We do ToArray() because we're moving files and we cannot move file and enumerate at the same time
+                    foreach (var dumpFileNameFullPath in _fileHelper.GetFiles(_monitorPostmortemDumpFolderPath, "*.dmp", SearchOption.TopDirectoryOnly).ToArray())
                     {
-                        var dumpFiles = this.processDumpUtility.GetDumpFiles(warnOnNoDumpFiles: this.collectDumpAlways, processCrashedWhenRunningTests);
-                        foreach (var dumpFile in dumpFiles)
+                        EqtTrace.Info($"[MonitorPostmortemDump]'{dumpFileNameFullPath}' dump file found during postmortem monitoring");
+                        // Ensure exclusive access to the dump file, it can happen if we run more test module in parallel.
+                        // We cannot ensure that we'll move only "our" dump because procdump -i produce a name that doesn't have the pid in it(because PID is reusable).
+                        // The name of the file starts with the process name, that's the only filtering we can do.
+                        // So there's one possible benign race condition when another test is dumping an host and we take lock on the name but the dump is not finished.
+                        // In that case we'll fail for file locking but it's fine. The correct or subsequent "SessionEndedHandler" will move that one.
+                        using SHA256 hashedLockName = SHA256.Create();
+                        // LPCSTR An LPCSTR is a 32-bit pointer to a constant null-terminated string of 8-bit Windows (ANSI) characters.
+                        var toGuid = new byte[16];
+                        Array.Copy(hashedLockName.ComputeHash(Encoding.UTF8.GetBytes(dumpFileNameFullPath)), toGuid, 16);
+                        Guid id = new(toGuid);
+                        string muxerName = @$"Global\{id}";
+                        using Mutex lockFile = new(true, muxerName, out bool createdNew);
+                        EqtTrace.Info($"[MonitorPostmortemDump]Acquired global muxer '{muxerName}' for {dumpFileNameFullPath}");
+                        if (createdNew)
                         {
-                            if (!string.IsNullOrEmpty(dumpFile))
+                            string dumpFileName = Path.GetFileNameWithoutExtension(dumpFileNameFullPath);
+                            TPDebug.Assert(_testHostProcessName != null, $"TestHostLaunchedHandler must run before this method and set the _testHostProcessName");
+                            // Expected format testhost.exe_221004_123127.dmp processName.exe_yyMMdd_HHmmss.dmp
+                            if (dumpFileName.StartsWith(_testHostProcessName, StringComparison.OrdinalIgnoreCase))
                             {
+                                EqtTrace.Info($"[MonitorPostmortemDump]Valid pattern start with '{_testHostProcessName}' found for {dumpFileNameFullPath}");
                                 try
                                 {
-                                    var fileTranferInformation = new FileTransferInformation(this.context.SessionDataCollectionContext, dumpFile, true);
-                                    this.dataCollectionSink.SendFileAsync(fileTranferInformation);
+                                    var fileTranferInformation = new FileTransferInformation(_context.SessionDataCollectionContext, dumpFileNameFullPath, true);
+                                    EqtTrace.Info($"[MonitorPostmortemDump]Transferring {dumpFileNameFullPath}");
+                                    _dataCollectionSink.SendFileAsync(fileTranferInformation);
                                 }
-                                catch (FileNotFoundException ex)
+                                catch (IOException ex)
                                 {
+                                    // In case of race condition explained in the comment above we simply log a warning.
                                     EqtTrace.Warning(ex.ToString());
-                                    this.logger.LogWarning(args.Context, ex.ToString());
+                                    _logger.LogWarning(args.Context, ex.ToString());
                                 }
                             }
                         }
                     }
-                    catch (FileNotFoundException ex)
-                    {
-                        EqtTrace.Warning(ex.ToString());
-                        this.logger.LogWarning(args.Context, ex.ToString());
-                    }
-                }
-                else
-                {
-                    EqtTrace.Info("BlameCollector.CollectDumpAndAbortTesthost: Custom path to dump directory was provided via VSTEST_DUMP_PATH. Skipping attachment upload, the caller is responsible for collecting and uploading the dumps themselves.");
                 }
             }
-            finally
-            {
-                // Attempt to terminate the proc dump process if proc dump was enabled
-                if (this.collectProcessDumpOnTrigger)
-                {
-                    this.processDumpUtility.DetachFromTargetProcess(this.testHostProcessId);
-                }
-
-                this.DeregisterEvents();
-            }
         }
-
-        /// <summary>
-        /// Called when Test Host Initialized is invoked
-        /// </summary>
-        /// <param name="sender">Sender</param>
-        /// <param name="args">TestHostLaunchedEventArgs</param>
-        private void TestHostLaunchedHandler(object sender, TestHostLaunchedEventArgs args)
+        finally
         {
-            this.ResetInactivityTimer();
-            this.testHostProcessId = args.TestHostProcessId;
-
-            if (!this.collectProcessDumpOnTrigger)
+            // Attempt to terminate the proc dump process if proc dump was enabled
+            if (_collectProcessDumpOnCrash)
             {
-                return;
+                _processDumpUtility.DetachFromTargetProcess(_testHostProcessId);
             }
 
-            try
-            {
-                var dumpDirectory = this.GetDumpDirectory();
-                this.processDumpUtility.StartTriggerBasedProcessDump(args.TestHostProcessId, dumpDirectory, this.processFullDumpEnabled, this.targetFramework, this.collectDumpAlways);
-            }
-            catch (TestPlatformException e)
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("BlameCollector.TestHostLaunchedHandler: Could not start process dump. {0}", e);
-                }
+            DeregisterEvents();
+        }
+    }
 
-                this.logger.LogWarning(args.Context, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.ProcDumpCouldNotStart, e.Message));
-            }
-            catch (Exception e)
-            {
-                if (EqtTrace.IsWarningEnabled)
-                {
-                    EqtTrace.Warning("BlameCollector.TestHostLaunchedHandler: Could not start process dump. {0}", e);
-                }
+    /// <summary>
+    /// Called when Test Host Initialized is invoked
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="args">TestHostLaunchedEventArgs</param>
+    private void TestHostLaunchedHandler(object? sender, TestHostLaunchedEventArgs args)
+    {
+        ResetInactivityTimer();
+        _testHostProcessId = args.TestHostProcessId;
+        _testHostProcessName = _processHelper.GetProcessName(args.TestHostProcessId);
 
-                this.logger.LogWarning(args.Context, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.ProcDumpCouldNotStart, e.ToString()));
-            }
+        if (!_collectProcessDumpOnCrash)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Resets the inactivity timer
-        /// </summary>
-        private void ResetInactivityTimer()
-        {
-            if (!this.collectProcessDumpOnTestHostHang || this.inactivityTimerAlreadyFired)
-            {
-                return;
-            }
+        TPDebug.Assert(_logger != null && _context != null, "Initialize must be called before calling this method");
 
-            EqtTrace.Verbose("Reset the inactivity timer since an event was received.");
-            try
-            {
-                this.inactivityTimer.ResetTimer(this.inactivityTimespan);
-            }
-            catch (Exception e)
-            {
-                EqtTrace.Warning($"Failed to reset the inactivity timer with error {e}");
-            }
+        try
+        {
+            var dumpDirectory = GetDumpDirectory();
+            Action<string> logWarning = m => _logger.LogWarning(_context.SessionDataCollectionContext, m);
+            _processDumpUtility.StartTriggerBasedProcessDump(args.TestHostProcessId, dumpDirectory, _crashDumpType == CrashDumpType.Full, _targetFramework!, _collectDumpAlways, logWarning);
         }
-
-        /// <summary>
-        /// Method to de-register handlers and cleanup
-        /// </summary>
-        private void DeregisterEvents()
+        catch (TestPlatformException e)
+        {
+            EqtTrace.Warning("BlameCollector.TestHostLaunchedHandler: Could not start process dump. {0}", e);
+            _logger.LogWarning(args.Context, string.Format(CultureInfo.CurrentCulture, Resources.Resources.ProcDumpCouldNotStart, e.Message));
+        }
+        catch (Exception e)
         {
-            this.events.SessionEnd -= this.SessionEndedHandler;
-            this.events.TestCaseStart -= this.EventsTestCaseStart;
-            this.events.TestCaseEnd -= this.EventsTestCaseEnd;
+            EqtTrace.Warning("BlameCollector.TestHostLaunchedHandler: Could not start process dump. {0}", e);
+            _logger.LogWarning(args.Context, string.Format(CultureInfo.CurrentCulture, Resources.Resources.ProcDumpCouldNotStart, e.ToString()));
         }
+    }
 
-        private string GetTempDirectory()
+    /// <summary>
+    /// Resets the inactivity timer
+    /// </summary>
+    private void ResetInactivityTimer()
+    {
+        if (!_collectProcessDumpOnHang || _inactivityTimerAlreadyFired)
         {
-            if (string.IsNullOrWhiteSpace(this.tempDirectory))
-            {
-                // DUMP_TEMP_PATH will be used as temporary storage location
-                // for the dumps, this won't affect the dump uploads. Just the place where
-                // we store them before moving them to the final folder.
-
-                // AGENT_TEMPDIRECTORY is AzureDevops variable, which is set to path
-                // that is cleaned up after every job. This is preferable to use over
-                // just the normal temp.
-                var temp = Environment.GetEnvironmentVariable("VSTEST_DUMP_TEMP_PATH") ?? Environment.GetEnvironmentVariable("AGENT_TEMPDIRECTORY") ?? Path.GetTempPath();
-                this.tempDirectory = Path.Combine(temp, Guid.NewGuid().ToString());
-                Directory.CreateDirectory(this.tempDirectory);
-                return this.tempDirectory;
-            }
+            return;
+        }
 
-            return this.tempDirectory;
+        EqtTrace.Verbose("Reset the inactivity timer since an event was received.");
+        try
+        {
+            _inactivityTimer?.ResetTimer(_inactivityTimespan);
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Warning($"Failed to reset the inactivity timer with error {e}");
         }
+    }
 
-        private string GetDumpDirectory()
+    /// <summary>
+    /// Method to de-register handlers and cleanup
+    /// </summary>
+    private void DeregisterEvents()
+    {
+        TPDebug.Assert(_events != null, "Initialize must be called before calling this method");
+        _events.SessionEnd -= SessionEndedHandler;
+        _events.TestCaseStart -= EventsTestCaseStart;
+        _events.TestCaseEnd -= EventsTestCaseEnd;
+    }
+
+    private string GetTempDirectory()
+    {
+        if (_tempDirectory.IsNullOrWhiteSpace())
         {
-            // Using a custom dump path for scenarios where we want to upload the
-            // dump files ourselves, such as when running in Helix.
-            // This will save into the directory specified via VSTEST_DUMP_PATH, and
-            //  skip uploading dumps via attachments.
-            var dumpDirectoryOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_PATH");
-            var dumpDirectoryOverrideHasValue = !string.IsNullOrWhiteSpace(dumpDirectoryOverride);
-            this.uploadDumpFiles = !dumpDirectoryOverrideHasValue;
-
-            var dumpDirectory = dumpDirectoryOverrideHasValue ? dumpDirectoryOverride : this.GetTempDirectory();
-            Directory.CreateDirectory(dumpDirectory);
-            var dumpPath = Path.Combine(Path.GetFullPath(dumpDirectory));
-
-            if (!this.uploadDumpFiles)
-            {
-                this.logger.LogWarning(this.context.SessionDataCollectionContext, $"VSTEST_DUMP_PATH is specified. Dump files will be saved in: {dumpPath}, and won't be added to attachments.");
-            }
+            // DUMP_TEMP_PATH will be used as temporary storage location
+            // for the dumps, this won't affect the dump uploads. Just the place where
+            // we store them before moving them to the final folder.
+
+            // AGENT_TEMPDIRECTORY is AzureDevops variable, which is set to path
+            // that is cleaned up after every job. This is preferable to use over
+            // just the normal temp.
+            var temp = Environment.GetEnvironmentVariable("VSTEST_DUMP_TEMP_PATH") ?? Environment.GetEnvironmentVariable("AGENT_TEMPDIRECTORY") ?? Path.GetTempPath();
+            _tempDirectory = Path.Combine(temp, Guid.NewGuid().ToString());
+            Directory.CreateDirectory(_tempDirectory);
+            return _tempDirectory;
+        }
 
-            return dumpPath;
+        return _tempDirectory;
+    }
+
+    private string GetDumpDirectory()
+    {
+        TPDebug.Assert(_logger != null && _context != null, "Initialize must be called before calling this method");
+
+        // Using a custom dump path for scenarios where we want to upload the
+        // dump files ourselves, such as when running in Helix.
+        // This will save into the directory specified via VSTEST_DUMP_PATH, and
+        //  skip uploading dumps via attachments.
+        var dumpDirectoryOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_PATH");
+        var dumpDirectoryOverrideHasValue = !dumpDirectoryOverride.IsNullOrWhiteSpace();
+        _uploadDumpFiles = !dumpDirectoryOverrideHasValue;
+
+        var dumpDirectory = dumpDirectoryOverrideHasValue ? dumpDirectoryOverride! : GetTempDirectory();
+        Directory.CreateDirectory(dumpDirectory);
+        var dumpPath = Path.Combine(Path.GetFullPath(dumpDirectory));
+
+        if (!_uploadDumpFiles)
+        {
+            _logger.LogWarning(_context.SessionDataCollectionContext, $"VSTEST_DUMP_PATH is specified. Dump files will be saved in: {dumpPath}, and won't be added to attachments.");
         }
+
+        return dumpPath;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs
index 80ce1c3166..f139bb90f2 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs
@@ -1,165 +1,153 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// The blame logger.
+/// </summary>
+[FriendlyName(FriendlyName)]
+[ExtensionUri(ExtensionUri)]
+public class BlameLogger : ITestLogger
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+    /// <summary>
+    /// Uri used to uniquely identify the Blame logger.
+    /// </summary>
+    public const string ExtensionUri = "logger://Microsoft/TestPlatform/Extensions/Blame/v1";
 
     /// <summary>
-    /// The blame logger.
+    /// Alternate user friendly string to uniquely identify the Blame logger.
     /// </summary>
-    [FriendlyName(BlameLogger.FriendlyName)]
-    [ExtensionUri(BlameLogger.ExtensionUri)]
-    public class BlameLogger : ITestLogger
-    {
-        #region Constants
+    public const string FriendlyName = "Blame";
 
-        /// <summary>
-        /// Uri used to uniquely identify the Blame logger.
-        /// </summary>
-        public const string ExtensionUri = "logger://Microsoft/TestPlatform/Extensions/Blame/v1";
+    /// <summary>
+    /// The blame reader writer.
+    /// </summary>
+    private readonly IBlameReaderWriter _blameReaderWriter;
 
-        /// <summary>
-        /// Alternate user friendly string to uniquely identify the Blame logger.
-        /// </summary>
-        public const string FriendlyName = "Blame";
+    /// <summary>
+    /// The output.
+    /// </summary>
+    private readonly IOutput _output;
 
-        /// <summary>
-        /// The blame reader writer.
-        /// </summary>
-        private readonly IBlameReaderWriter blameReaderWriter;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameLogger"/> class.
+    /// </summary>
+    public BlameLogger()
+        : this(ConsoleOutput.Instance, new XmlReaderWriter())
+    {
+    }
 
-        /// <summary>
-        /// The output.
-        /// </summary>
-        private readonly IOutput output;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameLogger"/> class.
+    /// Constructor added for testing purpose
+    /// </summary>
+    /// <param name="output">Output Instance</param>
+    /// <param name="blameReaderWriter">BlameReaderWriter Instance</param>
+    protected BlameLogger(IOutput output, IBlameReaderWriter blameReaderWriter)
+    {
+        _output = output;
+        _blameReaderWriter = blameReaderWriter;
+    }
 
-        #endregion
 
-        #region Constructor
+    #region ITestLogger
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameLogger"/> class.
-        /// </summary>
-        public BlameLogger()
-            : this(ConsoleOutput.Instance, new XmlReaderWriter())
-        {
-        }
+    /// <summary>
+    /// Initializes the Logger.
+    /// </summary>
+    /// <param name="events">Events that can be registered for.</param>
+    /// <param name="testRunDictionary">Test Run Directory</param>
+    public void Initialize(TestLoggerEvents events, string? testRunDictionary)
+    {
+        ValidateArg.NotNull(events, nameof(events));
+        events.TestRunComplete += TestRunCompleteHandler;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameLogger"/> class.
-        /// Constructor added for testing purpose
-        /// </summary>
-        /// <param name="output">Output Instance</param>
-        /// <param name="blameReaderWriter">BlameReaderWriter Instance</param>
-        protected BlameLogger(IOutput output, IBlameReaderWriter blameReaderWriter)
+    /// <summary>
+    /// Called when a test run is complete.
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">TestRunCompleteEventArgs</param>
+    private void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+
+        if (!e.IsAborted)
         {
-            this.output = output;
-            this.blameReaderWriter = blameReaderWriter;
+            return;
         }
 
-        #endregion
-
-        #region ITestLogger
+        _output.WriteLine(string.Empty, OutputLevel.Information);
 
-        /// <summary>
-        /// Initializes the Logger.
-        /// </summary>
-        /// <param name="events">Events that can be registered for.</param>
-        /// <param name="testRunDictionary">Test Run Directory</param>
-        public void Initialize(TestLoggerEvents events, string testRunDictionary)
+        // Gets the faulty test cases if test aborted
+        var testCaseNames = GetFaultyTestCaseNames(e);
+        if (!testCaseNames.Any())
         {
-            if (events == null)
-            {
-                throw new ArgumentNullException(nameof(events));
-            }
-
-            events.TestRunComplete += this.TestRunCompleteHandler;
+            return;
         }
 
-        /// <summary>
-        /// Called when a test run is complete.
-        /// </summary>
-        /// <param name="sender">Sender</param>
-        /// <param name="e">TestRunCompleteEventArgs</param>
-        private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
+        var sb = new StringBuilder();
+        foreach (var tcn in testCaseNames)
         {
-            if (sender == null)
-            {
-                throw new ArgumentNullException(nameof(sender));
-            }
+            sb.Append(tcn).Append(Environment.NewLine);
+        }
 
-            ValidateArg.NotNull<object>(sender, nameof(sender));
-            ValidateArg.NotNull<TestRunCompleteEventArgs>(e, nameof(e));
+        _output.Error(false, Resources.Resources.AbortedTestRun, sb.ToString());
+    }
 
-            if (!e.IsAborted)
-            {
-                return;
-            }
+    #endregion
 
-            this.output.WriteLine(string.Empty, OutputLevel.Information);
+    #region Faulty test case fetch
 
-            // Gets the faulty test cases if test aborted
-            var testCaseNames = this.GetFaultyTestCaseNames(e);
-            if (!testCaseNames.Any())
+    /// <summary>
+    /// Fetches faulty test case
+    /// </summary>
+    /// <param name="e">
+    /// The TestRunCompleteEventArgs.
+    /// </param>
+    /// <returns>
+    /// Faulty test cases name
+    /// </returns>
+    private IEnumerable<string> GetFaultyTestCaseNames(TestRunCompleteEventArgs e)
+    {
+        var faultyTestCaseNames = new List<string>();
+        foreach (var attachmentSet in e.AttachmentSets)
+        {
+            if (!attachmentSet.DisplayName.Equals(Constants.BlameDataCollectorName))
             {
-                return;
+                continue;
             }
 
-            StringBuilder sb = new StringBuilder();
-            foreach (var tcn in testCaseNames)
+            // Process only Sequence_<GUID>.xml attachments
+            var uriDataAttachment = attachmentSet.Attachments.LastOrDefault((attachment) => attachment.Uri.ToString().EndsWith(".xml"));
+
+            if (uriDataAttachment == null)
             {
-                sb.Append(tcn).Append(Environment.NewLine);
+                continue;
             }
 
-            this.output.Error(false, Resources.Resources.AbortedTestRun, sb.ToString());
-        }
-
-        #endregion
-
-        #region Faulty test case fetch
-
-        /// <summary>
-        /// Fetches faulty test case
-        /// </summary>
-        /// <param name="e">
-        /// The TestRunCompleteEventArgs.
-        /// </param>
-        /// <returns>
-        /// Faulty test cases name
-        /// </returns>
-        private IEnumerable<string> GetFaultyTestCaseNames(TestRunCompleteEventArgs e)
-        {
-            var faultyTestCaseNames = new List<string>();
-            foreach (var attachmentSet in e.AttachmentSets)
+            var filepath = uriDataAttachment.Uri.LocalPath;
+            var testCaseList = _blameReaderWriter.ReadTestSequence(filepath);
+            if (testCaseList.Count > 0)
             {
-                if (attachmentSet.DisplayName.Equals(Constants.BlameDataCollectorName))
-                {
-                    // Process only Sequence_<GUID>.xml attachments
-                    var uriDataAttachment = attachmentSet.Attachments.LastOrDefault((attachment) => attachment.Uri.ToString().EndsWith(".xml"));
-
-                    if (uriDataAttachment != null)
-                    {
-                        var filepath = uriDataAttachment.Uri.LocalPath;
-                        var testCaseList = this.blameReaderWriter.ReadTestSequence(filepath);
-                        if (testCaseList.Count > 0)
-                        {
-                            var testcases = testCaseList.Where(t => !t.IsCompleted).Select(t => t.FullyQualifiedName).ToList();
-                            faultyTestCaseNames.AddRange(testcases);
-                        }
-                    }
-                }
+                var testcases = testCaseList.Where(t => !t.IsCompleted).Select(t => t.FullyQualifiedName!).ToList();
+                faultyTestCaseNames.AddRange(testcases);
             }
-
-            return faultyTestCaseNames;
         }
 
-        #endregion
+        return faultyTestCaseNames;
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameTestObject.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameTestObject.cs
index 7295d83ae3..c250e737e3 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameTestObject.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameTestObject.cs
@@ -1,162 +1,87 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    public class BlameTestObject
-    {
-        private Guid id;
-        private string fullyQualifiedName;
-        private string source;
-        private bool isCompleted;
-        private string displayName;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
-        /// </summary>
-        public BlameTestObject()
-        {
-            // Default constructor
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
-        /// </summary>
-        /// <param name="fullyQualifiedName">
-        /// Fully qualified name of the test case.
-        /// </param>
-        /// <param name="executorUri">
-        /// The Uri of the executor to use for running this test.
-        /// </param>
-        /// <param name="source">
-        /// Test container source from which the test is discovered.
-        /// </param>
-        public BlameTestObject(string fullyQualifiedName, Uri executorUri, string source)
-        {
-            ValidateArg.NotNullOrEmpty(fullyQualifiedName, nameof(fullyQualifiedName));
-            ValidateArg.NotNull(executorUri, nameof(executorUri));
-            ValidateArg.NotNullOrEmpty(source, nameof(source));
-
-            this.Id = Guid.Empty;
-            this.FullyQualifiedName = fullyQualifiedName;
-            this.ExecutorUri = executorUri;
-            this.Source = source;
-            this.IsCompleted = false;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
-        /// </summary>
-        /// <param name="testCase">
-        /// The test case
-        /// </param>
-        public BlameTestObject(TestCase testCase)
-        {
-            this.Id = testCase.Id;
-            this.FullyQualifiedName = testCase.FullyQualifiedName;
-            this.ExecutorUri = testCase.ExecutorUri;
-            this.Source = testCase.Source;
-            this.DisplayName = testCase.DisplayName;
-            this.IsCompleted = false;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the id of the test case.
-        /// </summary>
-        public Guid Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                this.id = value;
-            }
-        }
+using System;
 
-        /// <summary>
-        /// Gets or sets the fully qualified name of the test case.
-        /// </summary>
-        public string FullyQualifiedName
-        {
-            get
-            {
-                return this.fullyQualifiedName;
-            }
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-            set
-            {
-                this.fullyQualifiedName = value;
-            }
-        }
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-        /// <summary>
-        /// Gets or sets the Uri of the Executor to use for running this test.
-        /// </summary>
-        public Uri ExecutorUri
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the test container source from which the test is discovered.
-        /// </summary>
-        public string Source
-        {
-            get
-            {
-                return this.source;
-            }
-
-            set
-            {
-                this.source = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether test case is completed or not.
-        /// </summary>
-        public bool IsCompleted
-        {
-            get
-            {
-                return this.isCompleted;
-            }
-
-            set
-            {
-                this.isCompleted = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the display name of the test case
-        /// </summary>
-        public string DisplayName
-        {
-            get
-            {
-                return this.displayName;
-            }
+public class BlameTestObject
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
+    /// </summary>
+    public BlameTestObject()
+    {
+        // Default constructor
+    }
 
-            set
-            {
-                this.displayName = value;
-            }
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
+    /// </summary>
+    /// <param name="fullyQualifiedName">
+    /// Fully qualified name of the test case.
+    /// </param>
+    /// <param name="executorUri">
+    /// The Uri of the executor to use for running this test.
+    /// </param>
+    /// <param name="source">
+    /// Test container source from which the test is discovered.
+    /// </param>
+    public BlameTestObject(string fullyQualifiedName, Uri executorUri, string source)
+    {
+        Id = Guid.Empty;
+        FullyQualifiedName = ValidateArg.NotNullOrEmpty(fullyQualifiedName, nameof(fullyQualifiedName));
+        ExecutorUri = executorUri ?? throw new ArgumentNullException(nameof(executorUri));
+        Source = ValidateArg.NotNullOrEmpty(source, nameof(source));
+        IsCompleted = false;
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameTestObject"/> class.
+    /// </summary>
+    /// <param name="testCase">
+    /// The test case
+    /// </param>
+    public BlameTestObject(TestCase testCase)
+    {
+        Id = testCase.Id;
+        FullyQualifiedName = testCase.FullyQualifiedName;
+        ExecutorUri = testCase.ExecutorUri;
+        Source = testCase.Source;
+        DisplayName = testCase.DisplayName;
+        IsCompleted = false;
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Gets or sets the id of the test case.
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the fully qualified name of the test case.
+    /// </summary>
+    public string? FullyQualifiedName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Uri of the Executor to use for running this test.
+    /// </summary>
+    public Uri? ExecutorUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the test container source from which the test is discovered.
+    /// </summary>
+    public string? Source { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether test case is completed or not.
+    /// </summary>
+    public bool IsCompleted { get; set; }
+
+    /// <summary>
+    /// Gets or sets the display name of the test case
+    /// </summary>
+    public string? DisplayName { get; set; }
+
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Constants.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Constants.cs
index 3365773fb1..68dc296e3d 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Constants.cs
@@ -1,128 +1,122 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// Class for constants used across the files.
+/// </summary>
+internal static class Constants
 {
     /// <summary>
-    /// Class for constants used across the files.
-    /// </summary>
-    internal static class Constants
-    {
-        /// <summary>
-        /// Root node name for Xml file.
-        /// </summary>
-        public const string BlameRootNode = "TestSequence";
-
-        /// <summary>
-        /// Node name for each Xml node.
-        /// </summary>
-        public const string BlameTestNode = "Test";
-
-        /// <summary>
-        /// Attachment File name.
-        /// </summary>
-        public const string AttachmentFileName = "Sequence";
-
-        /// <summary>
-        /// Test Name Attribute.
-        /// </summary>
-        public const string TestNameAttribute = "Name";
-
-        /// <summary>
-        /// Test Source Attribute.
-        /// </summary>
-        public const string TestSourceAttribute = "Source";
-
-        /// <summary>
-        /// Test Completed Attribute.
-        /// </summary>
-        public const string TestCompletedAttribute = "Completed";
-
-        /// <summary>
-        /// Test Display Name Attribute.
-        /// </summary>
-        public const string TestDisplayNameAttribute = "DisplayName";
-
-        /// <summary>
-        /// Friendly name of the data collector
-        /// </summary>
-        public const string BlameDataCollectorName = "Blame";
-
-        /// <summary>
-        /// Configuration key name for dump mode
-        /// </summary>
-        public const string DumpModeKey = "CollectDump";
-
-        /// <summary>
-        /// Configuration key name for hang dump mode
-        /// </summary>
-        public const string HangDumpModeKey = "CollectHangDump";
-
-        /// <summary>
-        /// Proc dump 32 bit version
-        /// </summary>
-        public const string ProcdumpProcess = "procdump.exe";
-
-        /// <summary>
-        /// Proc dump 64 bit version
-        /// </summary>
-        public const string Procdump64Process = "procdump64.exe";
-
-        /// <summary>
-        /// Proc dump 64 bit version
-        /// </summary>
-        public const string ProcdumpUnixProcess = "procdump";
-
-        /// <summary>
-        /// Configuration key name for collect dump always
-        /// </summary>
-        public const string CollectDumpAlwaysKey = "CollectAlways";
-
-        /// <summary>
-        /// Configuration key name for collecting dump in case of testhost hang
-        /// </summary>
-        public const string CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang";
-
-        /// <summary>
-        /// Configuration key name for specifying what the expected execution time for the longest running test is.
-        /// If no events come from the test host for this period a dump will be collected and the test host process will
-        /// be killed.
-        /// </summary>
-        public const string TestTimeout = "TestTimeout";
-
-        /// <summary>
-        /// Configuration key name for dump type
-        /// </summary>
-        public const string DumpTypeKey = "DumpType";
-
-        /// <summary>
-        /// Configuration key name for hang dump type
-        /// </summary>
-        public const string HangDumpTypeKey = "HangDumpType";
-
-        /// <summary>
-        /// Configuration value for true
-        /// </summary>
-        public const string TrueConfigurationValue = "True";
-
-        /// <summary>
-        /// Configuration value for false
-        /// </summary>
-        public const string FalseConfigurationValue = "False";
-
-        /// <summary>
-        /// Configuration value for full
-        /// </summary>
-        public const string FullConfigurationValue = "Full";
-
-        /// <summary>
-        /// Configuration value for mini
-        /// </summary>
-        public const string MiniConfigurationValue = "Mini";
-
-        /// <summary>
-        /// The target framework of test host.
-        /// </summary>
-        public const string TargetFramework = "Framework";
-    }
+    /// Root node name for Xml file.
+    /// </summary>
+    public const string BlameRootNode = "TestSequence";
+
+    /// <summary>
+    /// Node name for each Xml node.
+    /// </summary>
+    public const string BlameTestNode = "Test";
+
+    /// <summary>
+    /// Attachment File name.
+    /// </summary>
+    public const string AttachmentFileName = "Sequence";
+
+    /// <summary>
+    /// Test Name Attribute.
+    /// </summary>
+    public const string TestNameAttribute = "Name";
+
+    /// <summary>
+    /// Test Source Attribute.
+    /// </summary>
+    public const string TestSourceAttribute = "Source";
+
+    /// <summary>
+    /// Test Completed Attribute.
+    /// </summary>
+    public const string TestCompletedAttribute = "Completed";
+
+    /// <summary>
+    /// Test Display Name Attribute.
+    /// </summary>
+    public const string TestDisplayNameAttribute = "DisplayName";
+
+    /// <summary>
+    /// Friendly name of the data collector
+    /// </summary>
+    public const string BlameDataCollectorName = "Blame";
+
+    /// <summary>
+    /// Configuration key name for dump mode
+    /// </summary>
+    public const string DumpModeKey = "CollectDump";
+
+    /// <summary>
+    /// Configuration key name for hang dump mode
+    /// </summary>
+    public const string HangDumpModeKey = "CollectHangDump";
+
+    /// <summary>
+    /// Proc dump 32 bit version
+    /// </summary>
+    public const string ProcdumpProcess = "procdump.exe";
+
+    /// <summary>
+    /// Proc dump 64 bit version
+    /// </summary>
+    public const string Procdump64Process = "procdump64.exe";
+
+    /// <summary>
+    /// Proc dump 64 bit version
+    /// </summary>
+    public const string ProcdumpUnixProcess = "procdump";
+
+    /// <summary>
+    /// Configuration key name for collect dump always
+    /// </summary>
+    public const string CollectDumpAlwaysKey = "CollectAlways";
+
+    /// <summary>
+    /// Configuration key name for collecting dump in case of testhost hang
+    /// </summary>
+    public const string CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang";
+
+    /// <summary>
+    /// Configuration key name for monitoring a folder for postmortem dumps
+    /// </summary>
+    public const string MonitorPostmortemDebugger = "MonitorPostmortemDebugger";
+
+    /// <summary>
+    /// Configuration key name for specifying what the expected execution time for the longest running test is.
+    /// If no events come from the test host for this period a dump will be collected and the test host process will
+    /// be killed.
+    /// </summary>
+    public const string TestTimeout = "TestTimeout";
+
+    /// <summary>
+    /// Configuration key name for dump type
+    /// </summary>
+    public const string DumpTypeKey = "DumpType";
+
+    /// <summary>
+    /// Configuration key name for hang dump type
+    /// </summary>
+    public const string HangDumpTypeKey = "HangDumpType";
+
+    /// <summary>
+    /// Configuration value for true
+    /// </summary>
+    public const string TrueConfigurationValue = "True";
+
+    /// <summary>
+    /// Configuration value for false
+    /// </summary>
+    public const string FalseConfigurationValue = "False";
+
+    /// <summary>
+    /// The target framework of test host.
+    /// </summary>
+    public const string TargetFramework = "Framework";
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumpType.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumpType.cs
new file mode 100644
index 0000000000..e2a0edba2a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumpType.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// Specifies the command line options for CrashDumpType, the values here should be a subset of HangDumpType enum, because DumpType option on command line can also be used to specify the hang dump type.
+/// </summary>
+internal enum CrashDumpType
+{
+    Mini,
+    Full
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumperFactory.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumperFactory.cs
index 708c32973b..d6d7826980 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumperFactory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/CrashDumperFactory.cs
@@ -1,68 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using NuGet.Frameworks;
-
-    internal class CrashDumperFactory : ICrashDumperFactory
-    {
-        public ICrashDumper Create(string targetFramework)
-        {
-            if (targetFramework is null)
-            {
-                throw new ArgumentNullException(nameof(targetFramework));
-            }
+using System;
+using System.Runtime.InteropServices;
 
-            EqtTrace.Info($"CrashDumperFactory: Creating dumper for {RuntimeInformation.OSDescription} with target framework {targetFramework}.");
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
 
-            var tfm = NuGetFramework.Parse(targetFramework);
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-            if (tfm == null || tfm.IsUnsupported)
-            {
-                EqtTrace.Error($"CrashDumperFactory: Could not parse target framework {targetFramework}, to a supported framework version.");
-                throw new NotSupportedException($"Could not parse target framework {targetFramework}, to a supported framework version.");
-            }
+internal class CrashDumperFactory : ICrashDumperFactory
+{
+    public ICrashDumper Create(string targetFramework)
+    {
+        ValidateArg.NotNull(targetFramework, nameof(targetFramework));
+        EqtTrace.Info($"CrashDumperFactory: Creating dumper for {RuntimeInformation.OSDescription} with target framework {targetFramework}.");
 
-            var isNet50OrNewer = tfm.Framework == ".NETCoreApp" && tfm.Version >= Version.Parse("5.0.0.0");
+        var tfm = Framework.FromString(targetFramework);
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                if (!isNet50OrNewer)
-                {
-                    EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework} which is not net5.0 or newer, returning ProcDumpCrashDumper that uses ProcDump utility.");
-                    return new ProcDumpDumper();
-                }
+        if (tfm == null)
+        {
+            EqtTrace.Error($"CrashDumperFactory: Could not parse target framework {targetFramework}, to a supported framework version.");
+            throw new NotSupportedException($"Could not parse target framework {targetFramework}, to a supported framework version.");
+        }
 
-                // On net5.0 we don't have the capability to crash dump on exit, which is useful in rare cases
-                // like when user exits the testhost process with a random exit code, adding this evn variable
-                // to force using procdump. This relies on netclient dumper actualy doing all it's work in blame collector
-                // where it sets all the environment variables, so in effect we will have two crash dumpers active at the same time.
-                // This proven to be working okay while net5.0 could not create dumps from Task.Run, and I was using this same technique
-                // to get dump of testhost. This needs PROCDUMP_PATH set to directory with procdump.exe, or having it in path.
-                var procdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCEPROCDUMP")?.Trim();
-                var forceUsingProcdump = !string.IsNullOrWhiteSpace(procdumpOverride) && procdumpOverride != "0";
-                if (forceUsingProcdump)
-                {
-                    EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework}. Forcing the use of ProcDumpCrashDumper that uses ProcDump utility, via VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride}.");
-                    return new ProcDumpDumper();
-                }
+        var isNet50OrNewer = tfm.FrameworkName == ".NETCoreApp" && Version.Parse(tfm.Version) >= Version.Parse("5.0.0.0");
 
-                EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework}, returning the .NETClient dumper which uses env variables to collect crashdumps of testhost and any child process.");
-                return new NetClientCrashDumper(new FileHelper());
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            if (!isNet50OrNewer)
+            {
+                EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework} which is not net5.0 or newer, returning ProcDumpCrashDumper that uses ProcDump utility.");
+                return new ProcDumpDumper();
             }
 
-            if (isNet50OrNewer)
+            // On net5.0 we don't have the capability to crash dump on exit, which is useful in rare cases
+            // like when user exits the testhost process with a random exit code, adding this evn variable
+            // to force using procdump. This relies on netclient dumper actualy doing all it's work in blame collector
+            // where it sets all the environment variables, so in effect we will have two crash dumpers active at the same time.
+            // This proven to be working okay while net5.0 could not create dumps from Task.Run, and I was using this same technique
+            // to get dump of testhost. This needs PROCDUMP_PATH set to directory with procdump.exe, or having it in path.
+            var procdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCEPROCDUMP")?.Trim();
+            var forceUsingProcdump = !procdumpOverride.IsNullOrWhiteSpace() && procdumpOverride != "0";
+            if (forceUsingProcdump)
             {
-                EqtTrace.Info($"CrashDumperFactory: This is {RuntimeInformation.OSDescription} on {targetFramework} .NETClient dumper which uses env variables to collect crashdumps of testhost and any child process.");
-                return new NetClientCrashDumper(new FileHelper());
+                EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework}. Forcing the use of ProcDumpCrashDumper that uses ProcDump utility, via VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride}.");
+                return new ProcDumpDumper();
             }
 
-            throw new PlatformNotSupportedException($"Unsupported operating system: {RuntimeInformation.OSDescription}, and framework: {targetFramework}.");
+            EqtTrace.Info($"CrashDumperFactory: This is Windows on {targetFramework}, returning the .NETClient dumper which uses env variables to collect crashdumps of testhost and any child process that is .NET 5 or newer.");
+            return new NetClientCrashDumper(new FileHelper());
         }
+
+        if (isNet50OrNewer)
+        {
+            EqtTrace.Info($"CrashDumperFactory: This is {RuntimeInformation.OSDescription} on {targetFramework} .NETClient dumper which uses env variables to collect crashdumps of testhost and any child process that is .NET 5 or newer.");
+            return new NetClientCrashDumper(new FileHelper());
+        }
+
+        throw new PlatformNotSupportedException($"Unsupported operating system: {RuntimeInformation.OSDescription}, and framework: {targetFramework}.");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/DumpTypeOption.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/DumpTypeOption.cs
index 997c65955d..88bf2d98af 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/DumpTypeOption.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/DumpTypeOption.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public enum DumpTypeOption
 {
-    public enum DumpTypeOption
-    {
-        Full,
-        WithHeap,
-        Mini,
-    }
+    Full,
+    WithHeap,
+    Mini,
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumpType.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumpType.cs
new file mode 100644
index 0000000000..f1c578573d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumpType.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// Specifies the command line options for hang dump type. This should be superset of CrashDumpType, because crash and hang dumps share DumpType command line option, which can specify the type of dump to create to both.
+/// </summary>
+internal enum HangDumpType
+{
+    None,
+    Mini,
+    Full
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
index 1e5a4db51d..99d4ba1c0e 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/HangDumperFactory.cs
@@ -1,96 +1,93 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal class HangDumperFactory : IHangDumperFactory
 {
-    using System;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using NuGet.Frameworks;
+    public Action<string>? LogWarning { get; set; }
 
-    internal class HangDumperFactory : IHangDumperFactory
+    public IHangDumper Create(string targetFramework)
     {
-        public Action<string> LogWarning { get; set; }
+        ValidateArg.NotNull(targetFramework, nameof(targetFramework));
 
-        public IHangDumper Create(string targetFramework)
-        {
-            if (targetFramework is null)
-            {
-                throw new ArgumentNullException(nameof(targetFramework));
-            }
+        EqtTrace.Info($"HangDumperFactory: Creating dumper for {RuntimeInformation.OSDescription} with target framework {targetFramework}.");
+        var procdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCEPROCDUMP")?.Trim();
+        var netdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCENETDUMP")?.Trim();
+        EqtTrace.Verbose($"HangDumperFactory: Overrides for dumpers: VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride};VSTEST_DUMP_FORCENETDUMP={netdumpOverride}");
 
-            EqtTrace.Info($"HangDumperFactory: Creating dumper for {RuntimeInformation.OSDescription} with target framework {targetFramework}.");
-            var procdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCEPROCDUMP")?.Trim();
-            var netdumpOverride = Environment.GetEnvironmentVariable("VSTEST_DUMP_FORCENETDUMP")?.Trim();
-            EqtTrace.Verbose($"HangDumperFactory: Overrides for dumpers: VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride};VSTEST_DUMP_FORCENETDUMP={netdumpOverride}");
+        var tfm = Framework.FromString(targetFramework);
 
-            var tfm = NuGetFramework.Parse(targetFramework);
+        if (tfm == null)
+        {
+            EqtTrace.Error($"HangDumperFactory: Could not parse target framework {targetFramework}, to a supported framework version.");
+            throw new NotSupportedException($"Could not parse target framework {targetFramework}, to a supported framework version.");
+        }
 
-            if (tfm == null || tfm.IsUnsupported)
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            // On some system the interop dumper will thrown AccessViolationException, add an option to force procdump.
+            var forceUsingProcdump = !procdumpOverride.IsNullOrWhiteSpace() && procdumpOverride != "0";
+            if (forceUsingProcdump)
             {
-                EqtTrace.Error($"HangDumperFactory: Could not parse target framework {targetFramework}, to a supported framework version.");
-                throw new NotSupportedException($"Could not parse target framework {targetFramework}, to a supported framework version.");
+                EqtTrace.Info($"HangDumperFactory: This is Windows on  Forcing the use of ProcDumpHangDumper that uses ProcDump utility, via VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride}.");
+                return new ProcDumpDumper();
             }
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            // On some system the interop dumper will thrown AccessViolationException, add an option to force procdump.
+            var forceUsingNetdump = !netdumpOverride.IsNullOrWhiteSpace() && netdumpOverride != "0";
+            if (forceUsingNetdump)
             {
-                // On some system the interop dumper will thrown AccessViolationException, add an option to force procdump.
-                var forceUsingProcdump = !string.IsNullOrWhiteSpace(procdumpOverride) && procdumpOverride != "0";
-                if (forceUsingProcdump)
+                var isLessThan50 = tfm.FrameworkName == ".NETCoreApp" && Version.Parse(tfm.Version) < Version.Parse("5.0.0.0");
+                if (!isLessThan50)
                 {
-                    EqtTrace.Info($"HangDumperFactory: This is Windows on  Forcing the use of ProcDumpHangDumper that uses ProcDump utility, via VSTEST_DUMP_FORCEPROCDUMP={procdumpOverride}.");
-                    return new ProcDumpDumper();
+                    EqtTrace.Info($"HangDumperFactory: This is Windows on {tfm.FrameworkName} {tfm.Version}, VSTEST_DUMP_FORCENETDUMP={netdumpOverride} is active, forcing use of .NetClientHangDumper");
+                    return new NetClientHangDumper();
                 }
-
-                // On some system the interop dumper will thrown AccessViolationException, add an option to force procdump.
-                var forceUsingNetdump = !string.IsNullOrWhiteSpace(netdumpOverride) && netdumpOverride != "0";
-                if (forceUsingNetdump)
+                else
                 {
-                    var isLessThan50 = tfm.Framework == ".NETCoreApp" && tfm.Version < Version.Parse("5.0.0.0");
-                    if (!isLessThan50)
-                    {
-                        EqtTrace.Info($"HangDumperFactory: This is Windows on {tfm.Framework} {tfm.Version}, VSTEST_DUMP_FORCENETDUMP={netdumpOverride} is active, forcing use of .NetClientHangDumper");
-                        return new NetClientHangDumper();
-                    }
-                    else
-                    {
-                        EqtTrace.Info($"HangDumperFactory: This is Windows on {tfm.Framework} {tfm.Version}, VSTEST_DUMP_FORCENETDUMP={netdumpOverride} is active, but only applies to .NET 5.0 and newer. Falling back to default hang dumper.");
-                    }
+                    EqtTrace.Info($"HangDumperFactory: This is Windows on {tfm.FrameworkName} {tfm.Version}, VSTEST_DUMP_FORCENETDUMP={netdumpOverride} is active, but only applies to .NET 5.0 and newer. Falling back to default hang dumper.");
                 }
-
-                EqtTrace.Info($"HangDumperFactory: This is Windows, returning the default WindowsHangDumper that P/Invokes MiniDumpWriteDump.");
-                return new WindowsHangDumper(this.LogWarning);
             }
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                var isLessThan31 = tfm.Framework == ".NETCoreApp" && tfm.Version < Version.Parse("3.1.0.0");
-                if (isLessThan31)
-                {
-                    EqtTrace.Info($"HangDumperFactory: This is Linux on netcoreapp2.1, returning SigtrapDumper.");
+            EqtTrace.Info($"HangDumperFactory: This is Windows, returning the default WindowsHangDumper that P/Invokes MiniDumpWriteDump.");
+            return new WindowsHangDumper(new ProcessHelper(), LogWarning);
+        }
 
-                    return new SigtrapDumper();
-                }
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            var isLessThan31 = tfm.FrameworkName == ".NETCoreApp" && Version.Parse(tfm.Version) < Version.Parse("3.1.0.0");
+            if (isLessThan31)
+            {
+                EqtTrace.Info($"HangDumperFactory: This is Linux on netcoreapp2.1, returning SigtrapDumper.");
 
-                EqtTrace.Info($"HangDumperFactory: This is Linux netcoreapp3.1 or newer, returning the standard NETClient library dumper.");
-                return new NetClientHangDumper();
+                return new SigtrapDumper();
             }
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                var isLessThan50 = tfm.Framework == ".NETCoreApp" && tfm.Version < Version.Parse("5.0.0.0");
-                if (isLessThan50)
-                {
-                    EqtTrace.Info($"HangDumperFactory: This is OSX on {targetFramework}, This combination of OS and framework is not supported.");
+            EqtTrace.Info($"HangDumperFactory: This is Linux net6.0 or newer, returning the standard NETClient library dumper.");
+            return new NetClientHangDumper();
+        }
 
-                    throw new PlatformNotSupportedException($"Unsupported target framework {targetFramework} on OS {RuntimeInformation.OSDescription}");
-                }
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            var isLessThan50 = tfm.FrameworkName == ".NETCoreApp" && Version.Parse(tfm.Version) < Version.Parse("5.0.0.0");
+            if (isLessThan50)
+            {
+                EqtTrace.Info($"HangDumperFactory: This is OSX on {targetFramework}, This combination of OS and framework is not supported.");
 
-                EqtTrace.Info($"HangDumperFactory: This is OSX on net5.0 or newer, returning the standard NETClient library dumper.");
-                return new NetClientHangDumper();
+                throw new PlatformNotSupportedException($"Unsupported target framework {targetFramework} on OS {RuntimeInformation.OSDescription}");
             }
 
-            throw new PlatformNotSupportedException($"Unsupported operating system: {RuntimeInformation.OSDescription}");
+            EqtTrace.Info($"HangDumperFactory: This is OSX on net5.0 or newer, returning the standard NETClient library dumper.");
+            return new NetClientHangDumper();
         }
+
+        throw new PlatformNotSupportedException($"Unsupported operating system: {RuntimeInformation.OSDescription}");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumper.cs
index b303bfc82a..6f74ed7edc 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumper.cs
@@ -1,18 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface ICrashDumper
-    {
-        void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways);
+public interface ICrashDumper
+{
+    void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways, Action<string> logWarning);
 
-        void WaitForDumpToFinish();
+    void WaitForDumpToFinish();
 
-        void DetachFromTargetProcess(int processId);
+    void DetachFromTargetProcess(int processId);
 
-        IEnumerable<string> GetDumpFiles(bool processCrashed);
-    }
+    IEnumerable<string> GetDumpFiles(bool processCrashed);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumperFactory.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumperFactory.cs
index c992ec7e34..1da6db4fcd 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumperFactory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ICrashDumperFactory.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public interface ICrashDumperFactory
 {
-    public interface ICrashDumperFactory
-    {
-        ICrashDumper Create(string targetFramework);
-    }
+    ICrashDumper Create(string targetFramework);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumper.cs
index c13e099b3b..ba36aa2b29 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumper.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public interface IHangDumper
 {
-    public interface IHangDumper
-    {
-        void Dump(int processId, string outputDirectory, DumpTypeOption dumpType);
-    }
+    void Dump(int processId, string outputDirectory, DumpTypeOption dumpType);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumperFactory.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumperFactory.cs
index 3abc057078..fbed09813d 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumperFactory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/IHangDumperFactory.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface IHangDumperFactory
-    {
-        Action<string> LogWarning { get; set; }
+public interface IHangDumperFactory
+{
+    Action<string>? LogWarning { get; set; }
 
-        IHangDumper Create(string targetFramework);
-    }
+    IHangDumper Create(string targetFramework);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/InactivityTimer.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/InactivityTimer.cs
index 33e6d246d1..5c9e374ab2 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/InactivityTimer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/InactivityTimer.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Threading;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public class InactivityTimer : IInactivityTimer
 {
-    using System;
-    using System.Threading;
+    private readonly Timer _timer;
 
-    public class InactivityTimer : IInactivityTimer
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InactivityTimer"/> class.
+    /// Creates a new timer with infinite timeout
+    /// </summary>
+    /// <param name="timerCallback">Function to callback once the timer times out.</param>
+    public InactivityTimer(Action timerCallback)
     {
-        private Timer timer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InactivityTimer"/> class.
-        /// Creates a new timer with infinite timeout
-        /// </summary>
-        /// <param name="timerCallback">Function to callback once the timer times out.</param>
-        public InactivityTimer(Action timerCallback)
-        {
-            this.timer = new Timer((object state) => timerCallback());
-        }
+        _timer = new Timer((object? state) => timerCallback());
+    }
 
-        /// <inheritdoc />
-        public void ResetTimer(TimeSpan inactivityTimespan)
-        {
-            this.timer.Change(inactivityTimespan, TimeSpan.FromMilliseconds(-1));
-        }
+    /// <inheritdoc />
+    public void ResetTimer(TimeSpan inactivityTimespan)
+    {
+        _timer.Change(inactivityTimespan, TimeSpan.FromMilliseconds(-1));
+    }
 
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            this.timer.Dispose();
-            GC.SuppressFinalize(this);
-        }
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        _timer.Dispose();
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IBlameReaderWriter.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IBlameReaderWriter.cs
index 8f695d6e34..6b7b2099c2 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IBlameReaderWriter.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IBlameReaderWriter.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface IBlameReaderWriter
-    {
-        /// <summary>
-        /// Writes tests to document
-        /// </summary>
-        /// <param name="testSequence">List of test guid in sequence</param>
-        /// <param name="testObjectDictionary">Dictionary of test objects</param>
-        /// <param name="filePath">The path of file</param>
-        /// <returns>File Path</returns>
-        string WriteTestSequence(List<Guid> testSequence, Dictionary<Guid, BlameTestObject> testObjectDictionary, string filePath);
+public interface IBlameReaderWriter
+{
+    /// <summary>
+    /// Writes tests to document
+    /// </summary>
+    /// <param name="testSequence">List of test guid in sequence</param>
+    /// <param name="testObjectDictionary">Dictionary of test objects</param>
+    /// <param name="filePath">The path of file</param>
+    /// <returns>File Path</returns>
+    string WriteTestSequence(List<Guid> testSequence, Dictionary<Guid, BlameTestObject> testObjectDictionary, string filePath);
 
-        /// <summary>
-        /// Reads all tests from file
-        /// </summary>
-        /// <param name="filePath">The path of saved file</param>
-        /// <returns>All tests</returns>
-        List<BlameTestObject> ReadTestSequence(string filePath);
-    }
+    /// <summary>
+    /// Reads all tests from file
+    /// </summary>
+    /// <param name="filePath">The path of saved file</param>
+    /// <returns>All tests</returns>
+    List<BlameTestObject> ReadTestSequence(string filePath);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IInactivityTimer.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IInactivityTimer.cs
index 5d54fcdb65..40f2997ee6 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IInactivityTimer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IInactivityTimer.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface IInactivityTimer : IDisposable
-    {
-        /// <summary>
-        /// Resets the timer and configures it to fire after inactivityTimespan elapses
-        /// </summary>
-        /// <param name="inactivityTimespan">Duration after which the timer should fire</param>
-        void ResetTimer(TimeSpan inactivityTimespan);
-    }
+public interface IInactivityTimer : IDisposable
+{
+    /// <summary>
+    /// Resets the timer and configures it to fire after inactivityTimespan elapses
+    /// </summary>
+    /// <param name="inactivityTimespan">Duration after which the timer should fire</param>
+    void ResetTimer(TimeSpan inactivityTimespan);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/INativeMethodsHelper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/INativeMethodsHelper.cs
index eca1e128a7..ad739c9eeb 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/INativeMethodsHelper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/INativeMethodsHelper.cs
@@ -1,17 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface INativeMethodsHelper
-    {
-        /// <summary>
-        /// Returns if a process is 64 bit process
-        /// </summary>
-        /// <param name="processHandle">Process Handle</param>
-        /// <returns>Bool for Is64Bit</returns>
-        bool Is64Bit(IntPtr processHandle);
-    }
+public interface INativeMethodsHelper
+{
+    /// <summary>
+    /// Returns if a process is 64 bit process
+    /// </summary>
+    /// <param name="processHandle">Process Handle</param>
+    /// <returns>Bool for Is64Bit</returns>
+    bool Is64Bit(nint processHandle);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcDumpArgsBuilder.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcDumpArgsBuilder.cs
index 67cf836dd2..3c91a3ec30 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcDumpArgsBuilder.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcDumpArgsBuilder.cs
@@ -1,43 +1,42 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface IProcDumpArgsBuilder
-    {
-        /// <summary>
-        /// Arguments for procdump.exe
-        /// </summary>
-        /// <param name="processId">
-        /// Process Id
-        /// </param>
-        /// <param name="filename">
-        /// Filename for dump file
-        /// </param>
-        /// <param name="procDumpExceptionsList">
-        /// List of exceptions to look for
-        /// </param>
-        /// <param name="isFullDump">
-        /// Is full dump enabled
-        /// </param>
-        /// <returns>Arguments</returns>
-        string BuildTriggerBasedProcDumpArgs(int processId, string filename, IEnumerable<string> procDumpExceptionsList, bool isFullDump);
+public interface IProcDumpArgsBuilder
+{
+    /// <summary>
+    /// Arguments for procdump.exe
+    /// </summary>
+    /// <param name="processId">
+    /// Process Id
+    /// </param>
+    /// <param name="filename">
+    /// Filename for dump file
+    /// </param>
+    /// <param name="procDumpExceptionsList">
+    /// List of exceptions to look for
+    /// </param>
+    /// <param name="isFullDump">
+    /// Is full dump enabled
+    /// </param>
+    /// <returns>Arguments</returns>
+    string BuildTriggerBasedProcDumpArgs(int processId, string filename, IEnumerable<string> procDumpExceptionsList, bool isFullDump);
 
-        /// <summary>
-        /// Arguments for procdump.exe for getting a dump in case of a testhost hang
-        /// </summary>
-        /// <param name="processId">
-        /// Process Id
-        /// </param>
-        /// <param name="filename">
-        /// Filename for dump file
-        /// </param>
-        /// <param name="isFullDump">
-        /// Is full dump enabled
-        /// </param>
-        /// <returns>Arguments</returns>
-        string BuildHangBasedProcDumpArgs(int processId, string filename, bool isFullDump);
-    }
+    /// <summary>
+    /// Arguments for procdump.exe for getting a dump in case of a testhost hang
+    /// </summary>
+    /// <param name="processId">
+    /// Process Id
+    /// </param>
+    /// <param name="filename">
+    /// Filename for dump file
+    /// </param>
+    /// <param name="isFullDump">
+    /// Is full dump enabled
+    /// </param>
+    /// <returns>Arguments</returns>
+    string BuildHangBasedProcDumpArgs(int processId, string filename, bool isFullDump);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcessDumpUtility.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcessDumpUtility.cs
index ec1e14ffef..121fc0ffee 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcessDumpUtility.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Interfaces/IProcessDumpUtility.cs
@@ -1,71 +1,71 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    public interface IProcessDumpUtility
-    {
-        /// <summary>
-        /// Get generated dump files
-        /// </summary>
-        /// <param name="warnOnNoDumpFiles">Writes warning when no dump file is found.</param>
-        /// <param name="processCrashed">Process might have crashed. If true it crashed for sure. If false we don't know.</param>
-        /// <returns>
-        /// Path of dump file
-        /// </returns>
-        IEnumerable<string> GetDumpFiles(bool warnOnNoDumpFiles, bool processCrashed);
+public interface IProcessDumpUtility
+{
+    /// <summary>
+    /// Get generated dump files
+    /// </summary>
+    /// <param name="warnOnNoDumpFiles">Writes warning when no dump file is found.</param>
+    /// <param name="processCrashed">Process might have crashed. If true it crashed for sure. If false we don't know.</param>
+    /// <returns>
+    /// Path of dump file
+    /// </returns>
+    IEnumerable<string> GetDumpFiles(bool warnOnNoDumpFiles, bool processCrashed);
 
-        /// <summary>
-        /// Launch proc dump process
-        /// </summary>
-        /// <param name="processId">
-        /// Process ID of test host
-        /// </param>
-        /// <param name="testResultsDirectory">
-        /// Path to TestResults directory
-        /// </param>
-        /// <param name="isFullDump">
-        /// Is full dump enabled
-        /// </param>
-        /// <param name="targetFramework">
-        /// The target framework of the process
-        /// </param>
-        /// <param name="collectAlways">
-        /// Collect the dump on process exit even if there is no exception
-        /// </param>
-        void StartTriggerBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, bool collectAlways);
+    /// <summary>
+    /// Launch proc dump process
+    /// </summary>
+    /// <param name="processId">
+    /// Process ID of test host
+    /// </param>
+    /// <param name="testResultsDirectory">
+    /// Path to TestResults directory
+    /// </param>
+    /// <param name="isFullDump">
+    /// Is full dump enabled
+    /// </param>
+    /// <param name="targetFramework">
+    /// The target framework of the process
+    /// </param>
+    /// <param name="collectAlways">
+    /// Collect the dump on process exit even if there is no exception
+    /// </param>
+    /// <param name="logWarning">Action to log a warning.</param>
+    void StartTriggerBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, bool collectAlways, Action<string> logWarning);
 
-        /// <summary>
-        /// Launch proc dump process to capture dump in case of a testhost hang and wait for it to exit
-        /// </summary>
-        /// <param name="processId">
-        /// Process ID of test host
-        /// </param>
-        /// <param name="testResultsDirectory">
-        /// Path to TestResults directory
-        /// </param>
-        /// <param name="isFullDump">
-        /// Is full dump enabled
-        /// </param>
-        /// <param name="targetFramework">
-        /// The target framework of the process
-        /// </param>
-        /// <param name="logWarning">
-        /// Callback to datacollector logger to log warning
-        /// </param>
-        void StartHangBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, Action<string> logWarning = null);
+    /// <summary>
+    /// Launch proc dump process to capture dump in case of a testhost hang and wait for it to exit
+    /// </summary>
+    /// <param name="processId">
+    /// Process ID of test host
+    /// </param>
+    /// <param name="testResultsDirectory">
+    /// Path to TestResults directory
+    /// </param>
+    /// <param name="isFullDump">
+    /// Is full dump enabled
+    /// </param>
+    /// <param name="targetFramework">
+    /// The target framework of the process
+    /// </param>
+    /// <param name="logWarning">
+    /// Callback to datacollector logger to log warning
+    /// </param>
+    void StartHangBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, Action<string>? logWarning = null);
 
-        /// <summary>
-        /// Detaches the proc dump process from the target process
-        /// Ensure this is called before terminating the proc dump process
-        /// as it might lead to the testhost process crashing otherwise.
-        /// </summary>
-        /// <param name="targetProcessId">
-        /// Process Id of the process to detach from
-        /// </param>
-        void DetachFromTargetProcess(int targetProcessId);
-    }
+    /// <summary>
+    /// Detaches the proc dump process from the target process
+    /// Ensure this is called before terminating the proc dump process
+    /// as it might lead to the testhost process crashing otherwise.
+    /// </summary>
+    /// <param name="targetProcessId">
+    /// Process Id of the process to detach from
+    /// </param>
+    void DetachFromTargetProcess(int targetProcessId);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
index 754d82898f..414e1bba56 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj
@@ -1,45 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
+    <!-- NU1702 suppresses warning about DumpMinitool being .NET Framework reference imported to a .NET project.
+    Unfortunately this can't be suppressed at single ProjectReference. Neither completely suppressed by using NoWarn.
+    Workaround is documented here: https://github.com/NuGet/Home/issues/8093, but this syntax and placement would be preferred:
+    https://github.com/dotnet/core/issues/869
+    -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NU1702</MSBuildWarningsAsMessages>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.TestPlatform.Extensions.BlameDataCollector</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Extensions.BlameDataCollector</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <!-- to copy the netcore.client dependency to bin folder on build -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
+    <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" />
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="netstandard" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="$(MicrosoftDiagnosticsNETCoreClientVersion)" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -52,5 +67,23 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/MiniDumpWriteDump.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/MiniDumpWriteDump.cs
new file mode 100644
index 0000000000..fd22eae3e3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/MiniDumpWriteDump.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+
+using Microsoft.Win32.SafeHandles;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal enum MiniDumpTypeOption
+{
+    // This is a copy of DumpTypeOption, we need both of those types, because this
+    // dumper is included as file in both MiniDumpTool, and BlameDataCollector, and
+    // blame references MiniDumpTool, so we get the enum defined twice otherwise.
+    Full,
+    WithHeap,
+    Mini,
+}
+
+internal class MiniDumpWriteDump
+{
+    public static void CollectDumpUsingMiniDumpWriteDump(Process process, string outputFile, MiniDumpTypeOption type)
+    {
+        // Open the file for writing
+        using var stream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
+        NativeMethods.MinidumpExceptionInformation exceptionInfo = default;
+
+        var dumpType = type switch
+        {
+            MiniDumpTypeOption.Full => NativeMethods.MinidumpType.MiniDumpWithFullMemory |
+                                       NativeMethods.MinidumpType.MiniDumpWithDataSegs |
+                                       NativeMethods.MinidumpType.MiniDumpWithHandleData |
+                                       NativeMethods.MinidumpType.MiniDumpWithUnloadedModules |
+                                       NativeMethods.MinidumpType.MiniDumpWithFullMemoryInfo |
+                                       NativeMethods.MinidumpType.MiniDumpWithThreadInfo |
+                                       NativeMethods.MinidumpType.MiniDumpWithTokenInformation,
+            MiniDumpTypeOption.WithHeap => NativeMethods.MinidumpType.MiniDumpWithPrivateReadWriteMemory |
+                                           NativeMethods.MinidumpType.MiniDumpWithDataSegs |
+                                           NativeMethods.MinidumpType.MiniDumpWithHandleData |
+                                           NativeMethods.MinidumpType.MiniDumpWithUnloadedModules |
+                                           NativeMethods.MinidumpType.MiniDumpWithFullMemoryInfo |
+                                           NativeMethods.MinidumpType.MiniDumpWithThreadInfo |
+                                           NativeMethods.MinidumpType.MiniDumpWithTokenInformation,
+            MiniDumpTypeOption.Mini => NativeMethods.MinidumpType.MiniDumpWithThreadInfo,
+            _ => NativeMethods.MinidumpType.MiniDumpNormal,
+        };
+
+        // Retry the write dump on ERROR_PARTIAL_COPY
+        for (int i = 0; i < 5; i++)
+        {
+            // Dump the process!
+            if (NativeMethods.MiniDumpWriteDump(process.Handle, (uint)process.Id, stream.SafeFileHandle, dumpType, ref exceptionInfo, IntPtr.Zero, IntPtr.Zero))
+            {
+                break;
+            }
+
+            int err = Marshal.GetHRForLastWin32Error();
+            if (err != NativeMethods.ErrorPartialCopy)
+            {
+                Marshal.ThrowExceptionForHR(err);
+            }
+        }
+    }
+
+    private static class NativeMethods
+    {
+        public const int ErrorPartialCopy = unchecked((int)0x8007012b);
+
+        [DllImport("Dbghelp.dll", SetLastError = true)]
+        public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint processId, SafeFileHandle hFile, MinidumpType dumpType, ref MinidumpExceptionInformation exceptionParam, IntPtr userStreamParam, IntPtr callbackParam);
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        public struct MinidumpExceptionInformation
+        {
+            public readonly uint ThreadId;
+            public readonly IntPtr ExceptionPointers;
+            public readonly int ClientPointers;
+        }
+
+        [Flags]
+        public enum MinidumpType : uint
+        {
+            MiniDumpNormal = 0,
+            MiniDumpWithDataSegs = 1 << 0,
+            MiniDumpWithFullMemory = 1 << 1,
+            MiniDumpWithHandleData = 1 << 2,
+            MiniDumpFilterMemory = 1 << 3,
+            MiniDumpScanMemory = 1 << 4,
+            MiniDumpWithUnloadedModules = 1 << 5,
+            MiniDumpWithIndirectlyReferencedMemory = 1 << 6,
+            MiniDumpFilterModulePaths = 1 << 7,
+            MiniDumpWithProcessThreadData = 1 << 8,
+            MiniDumpWithPrivateReadWriteMemory = 1 << 9,
+            MiniDumpWithoutOptionalData = 1 << 10,
+            MiniDumpWithFullMemoryInfo = 1 << 11,
+            MiniDumpWithThreadInfo = 1 << 12,
+            MiniDumpWithCodeSegs = 1 << 13,
+            MiniDumpWithoutAuxiliaryState = 1 << 14,
+            MiniDumpWithFullAuxiliaryState = 1 << 15,
+            MiniDumpWithPrivateWriteCopyMemory = 1 << 16,
+            MiniDumpIgnoreInaccessibleMemory = 1 << 17,
+            MiniDumpWithTokenInformation = 1 << 18,
+            MiniDumpWithModuleHeaders = 1 << 19,
+            MiniDumpFilterTriage = 1 << 20,
+            MiniDumpWithAvxXStateContext = 1 << 21,
+            MiniDumpWithIptTrace = 1 << 22,
+            MiniDumpValidTypeFlags = (-1) ^ ((~1) << 22)
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NativeMethodsHelper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NativeMethodsHelper.cs
deleted file mode 100644
index 90436921f2..0000000000
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NativeMethodsHelper.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    public class NativeMethodsHelper : INativeMethodsHelper
-    {
-        /// <summary>
-        /// Returns if a process is 64 bit process
-        /// </summary>
-        /// <param name="processHandle">Process Handle</param>
-        /// <returns>Bool for Is64Bit</returns>
-        public bool Is64Bit(IntPtr processHandle)
-        {
-            // WOW64 is the x86 emulator that allows 32 bit Windows - based applications to run seamlessly on 64 bit Windows.
-
-            // If the function succeeds, the return value is a nonzero value.
-            var isWow64Process = IsWow64Process(processHandle, out var isWow64);
-            if (!isWow64Process)
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("NativeMethodsHelper: The call to IsWow64Process failed.");
-                }
-            }
-
-            var is64Bit = !isWow64;
-            EqtTrace.Verbose($"NativeMethodsHelper: is Wow64Process: {isWow64Process} is 64bit: {is64Bit}.");
-
-            return is64Bit;
-        }
-
-        // A pointer to a value that is set to TRUE if the process is running under WOW64.
-        // If the process is running under 32-bit Windows, the value is set to FALSE.
-        // If the process is a 64-bit application running under 64-bit Windows, the value is also set to FALSE.
-        [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IsWow64Process([In] IntPtr process, [Out] out bool wow64Process);
-    }
-}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientCrashDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientCrashDumper.cs
index 1952afe88e..f705eadf19 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientCrashDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientCrashDumper.cs
@@ -1,44 +1,44 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal class NetClientCrashDumper : ICrashDumper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private string? _outputDirectory;
+    private readonly IFileHelper _fileHelper;
+
+    public NetClientCrashDumper(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
+
+    public void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways, Action<string> logWarning)
+    {
+        // we don't need to do anything directly here, we setup the env variables
+        // in the dumper configuration, including the path
+        _outputDirectory = outputDirectory;
+    }
+
+    public void DetachFromTargetProcess(int processId)
+    {
+        // here we might consider renaming the files to have timestamp
+    }
+
+    public IEnumerable<string> GetDumpFiles(bool _)
+    {
+        return _fileHelper.DirectoryExists(_outputDirectory)
+            ? _fileHelper.GetFiles(_outputDirectory, "*_crashdump*.dmp", SearchOption.AllDirectories)
+            : [];
+    }
 
-    internal class NetClientCrashDumper : ICrashDumper
+    public void WaitForDumpToFinish()
     {
-        private string outputDirectory;
-        private IFileHelper fileHelper;
-
-        public NetClientCrashDumper(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
-
-        public void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways)
-        {
-            // we don't need to do anything directly here, we setup the env variables
-            // in the dumper configuration, including the path
-            this.outputDirectory = outputDirectory;
-        }
-
-        public void DetachFromTargetProcess(int processId)
-        {
-            // here we might consider renaming the files to have timestamp
-        }
-
-        public IEnumerable<string> GetDumpFiles(bool processCrashed)
-        {
-            return this.fileHelper.DirectoryExists(this.outputDirectory)
-               ? this.fileHelper.GetFiles(this.outputDirectory, "*_crashdump*.dmp", SearchOption.AllDirectories)
-               : Array.Empty<string>();
-        }
-
-        public void WaitForDumpToFinish()
-        {
-        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientHangDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientHangDumper.cs
index 3d0d52d6a6..e5b1b7acdc 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientHangDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NetClientHangDumper.cs
@@ -1,60 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Diagnostics.NETCore.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.Diagnostics.NETCore.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    internal class NetClientHangDumper : IHangDumper
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal class NetClientHangDumper : IHangDumper
+{
+    public void Dump(int processId, string outputDirectory, DumpTypeOption type)
     {
-        public void Dump(int processId, string outputDirectory, DumpTypeOption type)
-        {
-            var process = Process.GetProcessById(processId);
-            var processTree = process.GetProcessTree();
+        var process = Process.GetProcessById(processId);
+        var processTree = process.GetProcessTree();
 
-            if (EqtTrace.IsVerboseEnabled)
+        if (EqtTrace.IsVerboseEnabled)
+        {
+            if (processTree.Count > 1)
             {
-                if (processTree.Count > 1)
-                {
-                    EqtTrace.Verbose("NetClientHangDumper.Dump: Dumping this process tree (from bottom):");
-                    ConsoleOutput.Instance.Information(false, "Blame: Dumping this process tree (from bottom):");
+                EqtTrace.Verbose("NetClientHangDumper.Dump: Dumping this process tree (from bottom):");
+                ConsoleOutput.Instance.Information(false, "Blame: Dumping this process tree (from bottom):");
 
-                    foreach (var p in processTree.OrderBy(t => t.Level))
-                    {
-                        EqtTrace.Verbose($"NetClientHangDumper.Dump: {(p.Level != 0 ? " + " : " > ")}{new string('-', p.Level)} {p.Process.Id} - {p.Process.ProcessName}");
-                        ConsoleOutput.Instance.Information(false, $"Blame: {(p.Level != 0 ? " + " : " > ")}{new string('-', p.Level)} {p.Process.Id} - {p.Process.ProcessName}");
-                    }
-                }
-                else
+                foreach (var p in processTree.OrderBy(t => t.Level))
                 {
-                    EqtTrace.Verbose($"NetClientHangDumper.Dump: Dumping {process.Id} - {process.ProcessName}.");
-                    ConsoleOutput.Instance.Information(false, $"Blame: Dumping {process.Id} - {process.ProcessName}");
+                    EqtTrace.Verbose($"NetClientHangDumper.Dump: {(p.Level != 0 ? " + " : " > ")}{new string('-', p.Level)} {p.Process!.Id} - {p.Process.ProcessName}");
+                    ConsoleOutput.Instance.Information(false, $"Blame: {(p.Level != 0 ? " + " : " > ")}{new string('-', p.Level)} {p.Process.Id} - {p.Process.ProcessName}");
                 }
             }
+            else
+            {
+                EqtTrace.Verbose($"NetClientHangDumper.Dump: Dumping {process.Id} - {process.ProcessName}.");
+                ConsoleOutput.Instance.Information(false, $"Blame: Dumping {process.Id} - {process.ProcessName}");
+            }
+        }
 
-            var bottomUpTree = processTree.OrderByDescending(t => t.Level).Select(t => t.Process);
+        var bottomUpTree = processTree.OrderByDescending(t => t.Level).Select(t => t.Process);
 
-            // Do not suspend processes with NetClient dumper it stops the diagnostic thread running in
-            // them and hang dump request will get stuck forever, because the process is not co-operating.
-            // Instead we start one task per dump asynchronously, and hope that the parent process will start dumping
-            // before the child process is done dumping. This way if the parent is waiting for the children to exit,
-            // we will be dumping it before it observes the child exiting and we get a more accurate results. If we did not
-            // do this, then parent that is awaiting child might exit before we get to dumping it.
-            var tasks = new List<Task>();
-            var timeout = new CancellationTokenSource();
-            timeout.CancelAfter(TimeSpan.FromMinutes(5));
-            foreach (var p in bottomUpTree)
-            {
-                tasks.Add(Task.Run(
+        // Do not suspend processes with NetClient dumper it stops the diagnostic thread running in
+        // them and hang dump request will get stuck forever, because the process is not co-operating.
+        // Instead we start one task per dump asynchronously, and hope that the parent process will start dumping
+        // before the child process is done dumping. This way if the parent is waiting for the children to exit,
+        // we will be dumping it before it observes the child exiting and we get a more accurate results. If we did not
+        // do this, then parent that is awaiting child might exit before we get to dumping it.
+        var tasks = new List<Task>();
+        var timeout = new CancellationTokenSource();
+        timeout.CancelAfter(TimeSpan.FromMinutes(5));
+        foreach (var p in bottomUpTree)
+        {
+            TPDebug.Assert(p != null);
+            tasks.Add(Task.Run(
                 () =>
                 {
                     try
@@ -73,28 +75,28 @@ public void Dump(int processId, string outputDirectory, DumpTypeOption type)
                         EqtTrace.Error($"NetClientHangDumper.Dump: Error dumping process {p.Id} - {p.ProcessName}: {ex}.");
                     }
                 }, timeout.Token));
-            }
+        }
+
+        try
+        {
+            Task.WhenAll(tasks).GetAwaiter().GetResult();
+        }
+        catch (TaskCanceledException)
+        {
+            EqtTrace.Error($"NetClientHangDumper.Dump: Hang dump timed out.");
+        }
 
+        foreach (var p in bottomUpTree)
+        {
+            TPDebug.Assert(p != null);
             try
             {
-                Task.WhenAll(tasks).GetAwaiter().GetResult();
+                EqtTrace.Verbose($"NetClientHangDumper.Dump: Killing process {p.Id} - {p.ProcessName}.");
+                p.Kill();
             }
-            catch (TaskCanceledException)
+            catch (Exception ex)
             {
-                EqtTrace.Error($"NetClientHangDumper.Dump: Hang dump timed out.");
-            }
-
-            foreach (var p in bottomUpTree)
-            {
-                try
-                {
-                    EqtTrace.Verbose($"NetClientHangDumper.Dump: Killing process {p.Id} - {p.ProcessName}.");
-                    p.Kill();
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error($"NetClientHangDumper.Dump: Error killing process {p.Id} - {p.ProcessName}: {ex}.");
-                }
+                EqtTrace.Error($"NetClientHangDumper.Dump: Error killing process {p.Id} - {p.ProcessName}: {ex}.");
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.cs
new file mode 100644
index 0000000000..d5822e14fa
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.tt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
index 5ab8cc57d3..2893f41bc5 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs
@@ -1,72 +1,91 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+#pragma warning disable CA1305
+
+public class ProcDumpArgsBuilder : IProcDumpArgsBuilder
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+
+    public ProcDumpArgsBuilder() : this(new EnvironmentVariableHelper()) { }
+
+    internal ProcDumpArgsBuilder(IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _environmentVariableHelper = environmentVariableHelper ?? throw new ArgumentNullException(nameof(environmentVariableHelper));
+    }
 
-    public class ProcDumpArgsBuilder : IProcDumpArgsBuilder
+    /// <inheritdoc />
+    public string BuildTriggerBasedProcDumpArgs(int processId, string filename, IEnumerable<string> procDumpExceptionsList, bool isFullDump)
     {
-        /// <inheritdoc />
-        public string BuildTriggerBasedProcDumpArgs(int processId, string filename, IEnumerable<string> procDumpExceptionsList, bool isFullDump)
+        // -accepteula: Auto accept end-user license agreement
+        //
+        // -e: Write a dump when the process encounters an unhandled exception. Include the 1 to create dump on first chance exceptions.
+        // We use -e 1 to make sure we are able to catch StackOverflow and AccessViolationException exceptions.
+        // -g: Run as a native debugger in a managed process (no interop).
+        // We use -g to be able to intercept  StackOverflow and AccessViolationException.
+        // -t: Write a dump when the process terminates.
+        // Collect the dump all the time, even if CollectAlways is not enabled to produce dumps for Environment.FailFast. We will later ignore the last
+        // dump file for testhost when we know that test host did not crash.
+        // -ma: Full dump argument.
+        // -f: Filter the exceptions.
+        // Filter the first chance exceptions only to those that are most likely to kill the whole process.
+
+        // Fully override parameters to procdump
+        var procdumpArgumentsFromEnv = _environmentVariableHelper.GetEnvironmentVariable("VSTEST_DUMP_PROCDUMPARGUMENTS")?.Trim();
+
+        // Useful additional arguments are -n 100, to collect all dumps that you can, or -o to overwrite dump, or -f EXCEPTION_NAME to add exception to filter list
+        var procdumpAdditonalArgumentsFromEnv = _environmentVariableHelper.GetEnvironmentVariable("VSTEST_DUMP_PROCDUMPADDITIONALARGUMENTS")?.Trim();
+        StringBuilder procDumpArgument = new($"-accepteula -e 1 -g -t {procdumpAdditonalArgumentsFromEnv}");
+        if (isFullDump)
+        {
+            procDumpArgument.Append("-ma ");
+        }
+
+        foreach (var exceptionFilter in procDumpExceptionsList)
+        {
+            procDumpArgument.Append($"-f {exceptionFilter} ");
+        }
+
+        procDumpArgument.Append($"{processId} {filename}.dmp");
+
+        var argument = procdumpArgumentsFromEnv.IsNullOrWhiteSpace()
+            ? procDumpArgument.ToString()
+            : $"-accepteula {procdumpArgumentsFromEnv} {processId} {filename}.dmp";
+
+        if (!argument.ToUpperInvariant().Contains("-accepteula".ToUpperInvariant()))
         {
-            // -accepteula: Auto accept end-user license agreement
-            //
-            // -e: Write a dump when the process encounters an unhandled exception. Include the 1 to create dump on first chance exceptions.
-            // We use -e 1 to make sure we are able to catch StackOverflow and AccessViolationException exceptions.
-            // -g: Run as a native debugger in a managed process (no interop).
-            // We use -g to be able to intercept  StackOverflow and AccessViolationException.
-            // -t: Write a dump when the process terminates.
-            // Collect the dump all the time, even if CollectAlways is not enabled to produce dumps for Environment.FailFast. We will later ignore the last
-            // dump file for testhost when we know that test host did not crash.
-            // -ma: Full dump argument.
-            // -f: Filter the exceptions.
-            // Filter the first chance exceptions only to those that are most likely to kill the whole process.
-
-            // Fully override parameters to procdump
-            var procdumpArgumentsFromEnv = Environment.GetEnvironmentVariable("VSTEST_DUMP_PROCDUMPARGUMENTS")?.Trim();
-
-            // Useful additional arguments are -n 100, to collect all dumps that you can, or -o to overwrite dump, or -f EXCEPTION_NAME to add exception to filter list
-            var procdumpAdditonalArgumentsFromEnv = Environment.GetEnvironmentVariable("VSTEST_DUMP_PROCDUMPADDITIONALARGUMENTS")?.Trim();
-            StringBuilder procDumpArgument = new StringBuilder($"-accepteula -e 1 -g -t {procdumpAdditonalArgumentsFromEnv}");
-            if (isFullDump)
-            {
-                procDumpArgument.Append("-ma ");
-            }
-
-            foreach (var exceptionFilter in procDumpExceptionsList)
-            {
-                procDumpArgument.Append($"-f {exceptionFilter} ");
-            }
-
-            procDumpArgument.Append($"{processId} {filename}.dmp");
-            var argument = string.IsNullOrWhiteSpace(procdumpArgumentsFromEnv) ? procDumpArgument.ToString() : procdumpArgumentsFromEnv;
-            if (!argument.ToUpperInvariant().Contains("-accepteula".ToUpperInvariant()))
-            {
-                argument = $"-accepteula {argument}";
-            }
-
-            return argument;
+            argument = $"-accepteula {argument}";
         }
 
-        /// <inheritdoc />
-        public string BuildHangBasedProcDumpArgs(int processId, string filename, bool isFullDump)
+        return argument;
+    }
+
+    /// <inheritdoc />
+    public string BuildHangBasedProcDumpArgs(int processId, string filename, bool isFullDump)
+    {
+        // -accepteula: Auto accept end-user license agreement
+        // -ma: Full dump argument.
+        // -n: Number of dumps to capture.
+        StringBuilder procDumpArgument = new("-accepteula -n 1");
+        if (isFullDump)
         {
-            // -accepteula: Auto accept end-user license agreement
-            // -ma: Full dump argument.
-            // -n: Number of dumps to capture.
-            StringBuilder procDumpArgument = new StringBuilder("-accepteula -n 1");
-            if (isFullDump)
-            {
-                procDumpArgument.Append(" -ma");
-            }
-
-            procDumpArgument.Append($" {processId} {filename}.dmp");
-            var argument = procDumpArgument.ToString();
-
-            return argument;
+            procDumpArgument.Append(" -ma");
         }
+
+        procDumpArgument.Append($" {processId} {filename}.dmp");
+        var argument = procDumpArgument.ToString();
+
+        return argument;
     }
 }
+
+#pragma warning restore CA1305
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpDumper.cs
index 14d362d5c0..1c6e39a935 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpDumper.cs
@@ -1,335 +1,333 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public class ProcDumpDumper : ICrashDumper, IHangDumper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    public class ProcDumpDumper : ICrashDumper, IHangDumper
+    private static readonly IEnumerable<string> ProcDumpExceptionsList = new List<string>()
     {
-        private static readonly IEnumerable<string> ProcDumpExceptionsList = new List<string>()
-        {
-            "STACK_OVERFLOW",
-            "ACCESS_VIOLATION"
-        };
-
-        private IProcessHelper processHelper;
-        private IFileHelper fileHelper;
-        private IEnvironment environment;
-        private Process procDumpProcess;
-        private string tempDirectory;
-        private string dumpFileName;
-        private INativeMethodsHelper nativeMethodsHelper;
-        private bool collectAlways;
-        private string outputDirectory;
-        private Process process;
-        private string outputFilePrefix;
-
-        public ProcDumpDumper()
-            : this(new ProcessHelper(), new FileHelper(), new PlatformEnvironment(), new NativeMethodsHelper())
+        "STACK_OVERFLOW",
+        "ACCESS_VIOLATION"
+    };
+
+    private readonly IProcessHelper _processHelper;
+    private readonly IFileHelper _fileHelper;
+    private readonly IEnvironment _environment;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+    private string? _procDumpPath;
+    private Process? _procDumpProcess;
+    private string? _tempDirectory;
+    private string? _dumpFileName;
+    private bool _collectAlways;
+    private string? _outputDirectory;
+    private Process? _process;
+    private string? _outputFilePrefix;
+    private bool _isCrashDumpInProgress;
+    private readonly int _timeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
+    private readonly ProcDumpExecutableHelper _procDumpExecutableHelper;
+
+    public ProcDumpDumper()
+        : this(new ProcessHelper(), new FileHelper(), new PlatformEnvironment(), new EnvironmentVariableHelper())
+    {
+    }
+
+    public ProcDumpDumper(IProcessHelper processHelper, IFileHelper fileHelper, IEnvironment environment) :
+        this(processHelper, fileHelper, environment, new EnvironmentVariableHelper())
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _environment = environment;
+    }
+
+    internal ProcDumpDumper(IProcessHelper processHelper, IFileHelper fileHelper, IEnvironment environment, IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _environment = environment;
+        _environmentVariableHelper = environmentVariableHelper;
+        _procDumpExecutableHelper = new ProcDumpExecutableHelper(processHelper, fileHelper, environment, environmentVariableHelper);
+    }
+
+    protected Action<object?, string?> OutputReceivedCallback => (process, data) =>
+    {
+        EqtTrace.Info($"ProcDumpDumper.OutputReceivedCallback: Output received from procdump process: {data ?? "<null>"}");
+
+        // This is what procdump writes to the output when it is creating a crash dump. When hangdump triggers while we are writing a crash dump
+        // we probably don't want to cancel, because that crashdump probably has the more interesting info.
+        // [16:06:59] Dump 1 initiated: <path>
+        // [16:07:00] Dump 1 writing: Estimated dump file size is 11034 MB.
+        // [16:07:09] Dump 1 complete: 11034 MB written in 10.1 seconds
+        // We also want to know when we completed writing a dump (and not just set _isCrashDumpInProgress once), because dumpcount larger than 1
+        // can be provided externally and then the first dump would prevent hangdump forever from stopping the process, but the not every dump is crashing the process
+        // so we would run forever.
+        //
+        // Yes the two ifs below depend on the content being in english, and containg those words (which is the case for procdump from 2017 till 2023 at least),
+        // if we get different language it should not break us, we will just cancel more aggressively (unfortunately).
+        if (data != null && data.Contains("initiated"))
         {
+            EqtTrace.Info($"ProcDumpDumper.OutputReceivedCallback: Output received from procdump process contains 'initiated', crashdump is being written. Don't cancel procdump right now.");
+            _isCrashDumpInProgress = true;
         }
 
-        public ProcDumpDumper(IProcessHelper processHelper, IFileHelper fileHelper, IEnvironment environment, INativeMethodsHelper nativeMethodsHelper)
+        if (data != null && data.Contains("complete"))
         {
-            this.processHelper = processHelper;
-            this.fileHelper = fileHelper;
-            this.environment = environment;
-            this.nativeMethodsHelper = nativeMethodsHelper;
+            EqtTrace.Info($"ProcDumpDumper.OutputReceivedCallback: Output received from procdump process contains 'complete' dump is finished, you can cancel procdump if you need.");
+            _isCrashDumpInProgress = false;
         }
+    };
 
-        protected Action<object, string> OutputReceivedCallback => (process, data) =>
-        {
-            // useful for visibility when debugging this tool
-            // Console.ForegroundColor = ConsoleColor.Cyan;
-            // Console.WriteLine(data);
-            // Console.ForegroundColor = ConsoleColor.White;
-            // Log all standard output message of procdump in diag files.
-            // Otherwise they end up coming on console in pipleine.
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("ProcDumpDumper.OutputReceivedCallback: Output received from procdump process: " + data);
-            }
-        };
+    internal static Action<object?, string?> ErrorReceivedCallback => (process, data) =>
+        EqtTrace.Error($"ProcDumpDumper.ErrorReceivedCallback: Error received from procdump process: {data ?? "<null>"}");
 
-        /// <inheritdoc/>
-        public void WaitForDumpToFinish()
+    /// <inheritdoc/>
+    public void WaitForDumpToFinish()
+    {
+        if (_procDumpProcess == null)
         {
-            if (this.processHelper == null)
-            {
-                EqtTrace.Info($"ProcDumpDumper.WaitForDumpToFinish: ProcDump was not previously attached, this might indicate error during setup, look for ProcDumpDumper.AttachToTargetProcess.");
-            }
+            EqtTrace.Info($"ProcDumpDumper.WaitForDumpToFinish: ProcDump was not previously attached, this might indicate error during setup, look for ProcDumpDumper.AttachToTargetProcess.");
+            return;
+        }
+
+        _processHelper.WaitForProcessExit(_procDumpProcess);
+    }
 
-            this.processHelper?.WaitForProcessExit(this.procDumpProcess);
+    /// <inheritdoc/>
+    public void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways, Action<string> logWarning)
+    {
+        _collectAlways = collectAlways;
+        _outputDirectory = outputDirectory;
+        _process = Process.GetProcessById(processId);
+        _outputFilePrefix = $"{_process.ProcessName}_{_process.Id}_{DateTime.Now:yyyyMMddTHHmmss}_crashdump";
+        var outputFile = Path.Combine(outputDirectory, $"{_outputFilePrefix}.dmp");
+        EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: Attaching to process '{processId}' to dump into '{outputFile}'.");
+
+        // Procdump will append .dmp at the end of the dump file. We generate this internally so it is rather a safety check.
+        if (!outputFile.EndsWith(".dmp", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new InvalidOperationException("Procdump crash dump file must end with .dmp extension.");
         }
 
-        /// <inheritdoc/>
-        public void AttachToTargetProcess(int processId, string outputDirectory, DumpTypeOption dumpType, bool collectAlways)
+        if (!_procDumpExecutableHelper.TryGetProcDumpExecutable(processId, out var procDumpPath))
         {
-            this.collectAlways = collectAlways;
-            this.outputDirectory = outputDirectory;
-            this.process = Process.GetProcessById(processId);
-            this.outputFilePrefix = $"{this.process.ProcessName}_{this.process.Id}_{DateTime.Now:yyyyMMddTHHmmss}_crashdump";
-            var outputFile = Path.Combine(outputDirectory, $"{this.outputFilePrefix}.dmp");
-            EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: Attaching to process '{processId}' to dump into '{outputFile}'.");
-
-            // Procdump will append .dmp at the end of the dump file. We generate this internally so it is rather a safety check.
-            if (!outputFile.EndsWith(".dmp", StringComparison.OrdinalIgnoreCase))
-            {
-                throw new InvalidOperationException("Procdump crash dump file must end with .dmp extension.");
-            }
+            var procdumpNotFound = string.Format(CultureInfo.CurrentCulture, Resources.Resources.ProcDumpNotFound, procDumpPath);
+            logWarning(procdumpNotFound);
+            EqtTrace.Warning($"ProcDumpDumper.AttachToTargetProcess: {procdumpNotFound}");
+            return;
+        }
 
-            if (!this.TryGetProcDumpExecutable(processId, out var procDumpPath))
-            {
-                var err = $"{procDumpPath} could not be found, please set PROCDUMP_PATH environment variable to a directory that contains {procDumpPath} executable, or make sure that the executable is available on PATH.";
-                ConsoleOutput.Instance.Warning(false, err);
-                EqtTrace.Error($"ProcDumpDumper.AttachToTargetProcess: {err}");
-                return;
-            }
+        _tempDirectory = Path.GetDirectoryName(outputFile);
+        _dumpFileName = Path.GetFileNameWithoutExtension(outputFile);
+
+        string procDumpArgs = new ProcDumpArgsBuilder().BuildTriggerBasedProcDumpArgs(
+            processId,
+            _dumpFileName,
+            ProcDumpExceptionsList,
+            isFullDump: dumpType == DumpTypeOption.Full);
+
+        EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: Running ProcDump with arguments: '{procDumpArgs}'.");
+        _procDumpPath = procDumpPath;
+        _procDumpProcess = (Process)_processHelper.LaunchProcess(
+            procDumpPath,
+            procDumpArgs,
+            _tempDirectory,
+            null,
+            ErrorReceivedCallback,
+            null,
+            OutputReceivedCallback);
+
+        EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: ProcDump started as process with id '{_procDumpProcess.Id}'.");
+    }
 
-            this.tempDirectory = Path.GetDirectoryName(outputFile);
-            this.dumpFileName = Path.GetFileNameWithoutExtension(outputFile);
-
-            string procDumpArgs = new ProcDumpArgsBuilder().BuildTriggerBasedProcDumpArgs(
-                processId,
-                this.dumpFileName,
-                ProcDumpExceptionsList,
-                isFullDump: dumpType == DumpTypeOption.Full);
-
-            EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: Running ProcDump with arguments: '{procDumpArgs}'.");
-            this.procDumpProcess = this.processHelper.LaunchProcess(
-                                            procDumpPath,
-                                            procDumpArgs,
-                                            this.tempDirectory,
-                                            null,
-                                            null,
-                                            null,
-                                            this.OutputReceivedCallback) as Process;
-
-            EqtTrace.Info($"ProcDumpDumper.AttachToTargetProcess: ProcDump started as process with id '{this.procDumpProcess.Id}'.");
+    /// <inheritdoc/>
+    public void DetachFromTargetProcess(int targetProcessId)
+    {
+        if (_procDumpProcess == null || _procDumpPath == null)
+        {
+            EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump was not previously attached, this might indicate error during setup, look for ProcDumpDumper.AttachToTargetProcess.");
+            return;
         }
 
-        /// <inheritdoc/>
-        public void DetachFromTargetProcess(int targetProcessId)
+        if (_procDumpProcess.HasExited)
         {
-            if (this.procDumpProcess == null)
-            {
-                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump was not previously attached, this might indicate error during setup, look for ProcDumpDumper.AttachToTargetProcess.");
-                return;
-            }
+            EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump already exited, returning.");
+            return;
+        }
 
-            try
-            {
-                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump detaching from target process '{targetProcessId}'.");
-                new Win32NamedEvent($"Procdump-{targetProcessId}").Set();
-            }
-            finally
+        try
+        {
+            if (_isCrashDumpInProgress)
             {
-                try
+                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump is currently dumping process '{targetProcessId}', wait at most {_timeout} ms for it to finish so we get the crashdump.");
+                var procDumpExit = Task.Run(() => _procDumpProcess.WaitForExit(_timeout));
+                // Could do this better with completion source, but we have nothing better to do in this process anyway,
+                // than wait for the crashdump to finish.
+                while (_isCrashDumpInProgress && !procDumpExit.IsCompleted)
                 {
-                    EqtTrace.Info("ProcDumpDumper.DetachFromTargetProcess: Attempting to kill proc dump process.");
-                    this.processHelper.TerminateProcess(this.procDumpProcess);
+                    // The timeout is driven by VSTEST_CONNECTION_TIMEOUT which is specified in seconds so it cannot be less than 1000ms.
+                    // (Technically it can be 0, but that will fail way before we ever reach here.)
+                    Thread.Sleep(500);
+                    EqtTrace.Verbose($"ProcDumpDumper.DetachFromTargetProcess: Waiting for procdump to finish dumping the process.");
                 }
-                catch (Exception e)
+
+                if (procDumpExit.IsCompleted && procDumpExit.Result == false)
                 {
-                    EqtTrace.Warning($"ProcDumpDumper.DetachFromTargetProcess: Failed to kill proc dump process with exception {e}");
+                    EqtTrace.Verbose($"ProcDumpDumper.DetachFromTargetProcess: Procdump did not exit after {_timeout} ms.");
                 }
             }
-        }
 
-        public IEnumerable<string> GetDumpFiles(bool processCrashed)
-        {
-            var allDumps = this.fileHelper.DirectoryExists(this.outputDirectory)
-                ? this.fileHelper.GetFiles(this.outputDirectory, "*_crashdump*.dmp", SearchOption.AllDirectories)
-                : Array.Empty<string>();
-
-            // We are always collecting dump on exit even when collectAlways option is false, to make sure we collect
-            // dump for Environment.FailFast. So there always can be a dump if the process already exited. In most cases
-            // this was just a normal process exit that was not caused by an exception and user is not interested in getting that
-            // dump because it only pollutes their CI.
-            // The hangdumps and crash dumps actually end up in the same folder, but we can distinguish them based on the _crashdump suffix.
-            if (this.collectAlways)
+            if (_procDumpProcess.HasExited)
             {
-                return allDumps;
+                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump already exited, returning.");
+                return;
             }
 
-            if (processCrashed)
+            EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump detaching from target process '{targetProcessId}'.");
+            // Alternative to sending this event is calling Procdump -cancel <targetProcessId> (the dumped process id, not the existing Procdump.exe process id).
+            // But not all versions of procdump have that parameter (definitely not the one we are getting from the Procdump 0.0.1 nuget package), and it works reliably.
+            // What was not reliable before was that we sent the message and immediately killed procdump, that caused testhost to crash occasionally, because procdump was not detached,
+            // and killing the process when it is not detached takes the observed process with it.
+            var eventName = $"ProcDump-{targetProcessId}";
+            new Win32NamedEvent(eventName).Set();
+            EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: Cancel event '{eventName}' was sent to Procdump.");
+
+            var sw = Stopwatch.StartNew();
+            var exited = _procDumpProcess.WaitForExit(_timeout);
+            if (exited)
             {
-                return allDumps;
+                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump cancelled after {sw.ElapsedMilliseconds} ms.");
             }
-
-            // There can be more dumps in the crash folder from the child processes that were .NET5 or newer and crashed
-            // get only the ones that match the path we provide to procdump. And get the last one created.
-            var allTargetProcessDumps = allDumps
-                .Where(dump => Path.GetFileNameWithoutExtension(dump)
-                .StartsWith(this.outputFilePrefix))
-                .Select(dump => new FileInfo(dump))
-                .OrderBy(dump => dump.LastWriteTime).ThenBy(dump => dump.Name)
-                .ToList();
-
-            var dumpToRemove = allTargetProcessDumps.LastOrDefault();
-
-            if (dumpToRemove != null)
+            else
             {
-                EqtTrace.Verbose($"ProcDumpDumper.GetDumpFiles: Found {allTargetProcessDumps.Count} dumps for the target process, removing {dumpToRemove.Name} because we always collect a dump, even if there is no crash. But the process did not crash and user did not specify CollectAlways=true.");
-                try
-                {
-                    File.Delete(dumpToRemove.FullName);
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error($"ProcDumpDumper.GetDumpFiles: Removing dump failed with: {ex}");
-                    EqtTrace.Error(ex);
-                }
+                EqtTrace.Info($"ProcDumpDumper.DetachFromTargetProcess: ProcDump cancellation timed out, after {sw.ElapsedMilliseconds} ms.");
             }
-
-            return allTargetProcessDumps.Take(allTargetProcessDumps.Count - 1).Select(dump => dump.FullName).ToList();
         }
-
-        // Hang dumps the process using procdump.
-        public void Dump(int processId, string outputDirectory, DumpTypeOption dumpType)
+        finally
         {
-            var process = Process.GetProcessById(processId);
-            var outputFile = Path.Combine(outputDirectory, $"{process.ProcessName}_{processId}_{DateTime.Now:yyyyMMddTHHmmss}_hangdump.dmp");
-            EqtTrace.Info($"ProcDumpDumper.Dump: Hang dumping process '{processId}' to dump into '{outputFile}'.");
-
-            // Procdump will append .dmp at the end of the dump file. We generate this internally so it is rather a safety check.
-            if (!outputFile.EndsWith(".dmp", StringComparison.OrdinalIgnoreCase))
+            try
             {
-                throw new InvalidOperationException("Procdump crash dump file must end with .dmp extension.");
+                if (!_procDumpProcess.HasExited)
+                {
+                    EqtTrace.Info("ProcDumpDumper.DetachFromTargetProcess: Procdump process is still running after cancellation, force killing it. This will probably take down the process it is attached to as well.");
+                    _processHelper.TerminateProcess(_procDumpProcess);
+                }
             }
-
-            if (!this.TryGetProcDumpExecutable(processId, out var procDumpPath))
+            catch (Exception e)
             {
-                var err = $"{procDumpPath} could not be found, please set PROCDUMP_PATH environment variable to a directory that contains {procDumpPath} executable, or make sure that the executable is available on PATH.";
-                ConsoleOutput.Instance.Warning(false, err);
-                EqtTrace.Error($"ProcDumpDumper.Dump: {err}");
-                return;
+                EqtTrace.Warning($"ProcDumpDumper.DetachFromTargetProcess: Failed to kill procdump process with exception {e}");
             }
+        }
+    }
 
-            var tempDirectory = Path.GetDirectoryName(outputFile);
-            var dumpFileName = Path.GetFileNameWithoutExtension(outputFile);
-
-            string procDumpArgs = new ProcDumpArgsBuilder().BuildHangBasedProcDumpArgs(
-                processId,
-                dumpFileName,
-                isFullDump: dumpType == DumpTypeOption.Full);
-
-            EqtTrace.Info($"ProcDumpDumper.Dump: Running ProcDump with arguments: '{procDumpArgs}'.");
-            var procDumpProcess = this.processHelper.LaunchProcess(
-                                            procDumpPath,
-                                            procDumpArgs,
-                                            tempDirectory,
-                                            null,
-                                            null,
-                                            null,
-                                            this.OutputReceivedCallback) as Process;
+    public IEnumerable<string> GetDumpFiles(bool processCrashed)
+    {
+        var allDumps = _fileHelper.DirectoryExists(_outputDirectory)
+            ? _fileHelper.GetFiles(_outputDirectory, "*_crashdump*.dmp", SearchOption.AllDirectories)
+            : [];
+
+        // We are always collecting dump on exit even when collectAlways option is false, to make sure we collect
+        // dump for Environment.FailFast. So there always can be a dump if the process already exited. In most cases
+        // this was just a normal process exit that was not caused by an exception and user is not interested in getting that
+        // dump because it only pollutes their CI.
+        // The hangdumps and crash dumps actually end up in the same folder, but we can distinguish them based on the _crashdump suffix.
+        if (_collectAlways)
+        {
+            return allDumps;
+        }
 
-            EqtTrace.Info($"ProcDumpDumper.Dump: ProcDump started as process with id '{procDumpProcess.Id}'.");
+        if (processCrashed)
+        {
+            return allDumps;
+        }
 
-            this.processHelper?.WaitForProcessExit(procDumpProcess);
+        // There can be more dumps in the crash folder from the child processes that were .NET5 or newer and crashed
+        // get only the ones that match the path we provide to procdump. And get the last one created.
+        var allTargetProcessDumps = allDumps
+            .Where(dump => Path.GetFileNameWithoutExtension(dump).StartsWith(_outputFilePrefix ?? string.Empty))
+            .Select(dump => new FileInfo(dump))
+            .OrderBy(dump => dump.LastWriteTime).ThenBy(dump => dump.Name)
+            .ToList();
 
-            EqtTrace.Info($"ProcDumpDumper.Dump: ProcDump finished hang dumping process with id '{processId}'.");
-        }
+        var dumpToRemove = allTargetProcessDumps.LastOrDefault();
 
-        /// <summary>
-        /// Try get proc dump executable path from env variable or PATH, if it does not success the result is false, and the name of the exe we tried to find.
-        /// </summary>
-        /// <param name="processId">
-        /// Process Id to determine the bittness
-        /// </param>
-        /// <param name="path">
-        /// Path to procdump or the name of the executable we tried to resolve when we don't find it
-        /// </param>
-        /// <returns>proc dump executable path</returns>
-        private bool TryGetProcDumpExecutable(int processId, out string path)
+        if (dumpToRemove != null)
         {
-            var procdumpDirectory = Environment.GetEnvironmentVariable("PROCDUMP_PATH");
-            var searchPath = false;
-            if (string.IsNullOrWhiteSpace(procdumpDirectory))
-            {
-                EqtTrace.Verbose("ProcDumpDumper.GetProcDumpExecutable: PROCDUMP_PATH env variable is empty will try to run ProcDump from PATH.");
-                searchPath = true;
-            }
-            else if (!Directory.Exists(procdumpDirectory))
-            {
-                EqtTrace.Verbose($"ProcDumpDumper.GetProcDumpExecutable: PROCDUMP_PATH env variable '{procdumpDirectory}' is not a directory, or the directory does not exist. Will try to run ProcDump from PATH.");
-                searchPath = true;
-            }
-
-            string filename;
-            if (this.environment.OperatingSystem == PlatformOperatingSystem.Windows)
-            {
-                // Launch proc dump according to process architecture
-                if (this.environment.Architecture == PlatformArchitecture.X86)
-                {
-                    filename = Constants.ProcdumpProcess;
-                }
-                else
-                {
-                    filename = this.nativeMethodsHelper.Is64Bit(this.processHelper.GetProcessHandle(processId)) ?
-                    Constants.Procdump64Process : Constants.ProcdumpProcess;
-                }
-            }
-            else if (this.environment.OperatingSystem == PlatformOperatingSystem.Unix || this.environment.OperatingSystem == PlatformOperatingSystem.OSX)
+            EqtTrace.Verbose($"ProcDumpDumper.GetDumpFiles: Found {allTargetProcessDumps.Count} dumps for the target process, removing {dumpToRemove.Name} because we always collect a dump, even if there is no crash. But the process did not crash and user did not specify CollectAlways=true.");
+            try
             {
-                filename = Constants.ProcdumpUnixProcess;
+                File.Delete(dumpToRemove.FullName);
             }
-            else
+            catch (Exception ex)
             {
-                throw new NotSupportedException($"Not supported platform {this.environment.OperatingSystem}");
+                EqtTrace.Error($"ProcDumpDumper.GetDumpFiles: Removing dump failed with: {ex}");
+                EqtTrace.Error(ex);
             }
+        }
 
-            if (!searchPath)
-            {
-                var candidatePath = Path.Combine(procdumpDirectory, filename);
-                if (File.Exists(candidatePath))
-                {
-                    EqtTrace.Verbose($"ProcDumpDumper.GetProcDumpExecutable: Path to ProcDump '{candidatePath}' exists, using that.");
-                    path = candidatePath;
-                    return true;
-                }
-
-                EqtTrace.Verbose($"ProcDumpDumper.GetProcDumpExecutable: Path '{candidatePath}' does not exist will try to run {filename} from PATH.");
-            }
+        return allTargetProcessDumps.Take(allTargetProcessDumps.Count - 1).Select(dump => dump.FullName).ToList();
+    }
 
-            if (this.TryGetExecutablePath(filename, out var p))
-            {
-                EqtTrace.Verbose($"ProcDumpDumper.GetProcDumpExecutable: Resolved {filename} to {p} from PATH.");
-                path = p;
-                return true;
-            }
+    // Hang dumps the process using procdump.
+    public void Dump(int processId, string outputDirectory, DumpTypeOption dumpType)
+    {
+        var process = Process.GetProcessById(processId);
+        var outputFile = Path.Combine(outputDirectory, $"{process.ProcessName}_{processId}_{DateTime.Now:yyyyMMddTHHmmss}_hangdump.dmp");
+        EqtTrace.Info($"ProcDumpDumper.Dump: Hang dumping process '{processId}' to dump into '{outputFile}'.");
 
-            EqtTrace.Verbose($"ProcDumpDumper.GetProcDumpExecutable: Could not find {filename} on PATH.");
-            path = filename;
-            return false;
+        // Procdump will append .dmp at the end of the dump file. We generate this internally so it is rather a safety check.
+        if (!outputFile.EndsWith(".dmp", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new InvalidOperationException("Procdump crash dump file must end with .dmp extension.");
         }
 
-        private bool TryGetExecutablePath(string executable, out string executablePath)
+        if (!_procDumpExecutableHelper.TryGetProcDumpExecutable(processId, out var procDumpPath))
         {
-            executablePath = string.Empty;
-            var pathString = Environment.GetEnvironmentVariable("PATH");
-            foreach (string path in pathString.Split(Path.PathSeparator))
-            {
-                string exeFullPath = Path.Combine(path.Trim(), executable);
-                if (this.fileHelper.Exists(exeFullPath))
-                {
-                    executablePath = exeFullPath;
-                    return true;
-                }
-            }
-
-            return false;
+            var err = $"{procDumpPath} could not be found, please set PROCDUMP_PATH environment variable to a directory that contains {procDumpPath} executable, or make sure that the executable is available on PATH.";
+            ConsoleOutput.Instance.Warning(false, err);
+            EqtTrace.Error($"ProcDumpDumper.Dump: {err}");
+            return;
         }
+
+        var tempDirectory = Path.GetDirectoryName(outputFile);
+        var dumpFileName = Path.GetFileNameWithoutExtension(outputFile);
+
+        string procDumpArgs = new ProcDumpArgsBuilder().BuildHangBasedProcDumpArgs(
+            processId,
+            dumpFileName,
+            isFullDump: dumpType == DumpTypeOption.Full);
+
+        EqtTrace.Info($"ProcDumpDumper.Dump: Running ProcDump with arguments: '{procDumpArgs}'.");
+        var procDumpProcess = (Process)_processHelper.LaunchProcess(
+            procDumpPath,
+            procDumpArgs,
+            tempDirectory,
+            null,
+            ErrorReceivedCallback,
+            null,
+            OutputReceivedCallback);
+
+        EqtTrace.Info($"ProcDumpDumper.Dump: ProcDump started as process with id '{procDumpProcess.Id}'.");
+
+        _processHelper?.WaitForProcessExit(procDumpProcess);
+
+        EqtTrace.Info($"ProcDumpDumper.Dump: ProcDump finished hang dumping process with id '{processId}'.");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessCodeMethods.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessCodeMethods.cs
index d1c7340265..0fec13559e 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessCodeMethods.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessCodeMethods.cs
@@ -1,265 +1,221 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+/// <summary>
+/// Helper functions for process info.
+/// </summary>
+internal static class ProcessCodeMethods
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private const int InvalidProcessId = -1;
 
-    /// <summary>
-    /// Helper functions for process info.
-    /// </summary>
-    internal static class ProcessCodeMethods
+    public static void Suspend(this Process process)
     {
-        private const int InvalidProcessId = -1;
-
-        public static void Suspend(this Process process)
+        if (process.HasExited)
         {
-            if (process.HasExited)
-            {
-                EqtTrace.Verbose($"ProcessCodeMethods.Suspend: Process {process.Id} - {process.ProcessName} already exited, skipping.");
-                return;
-            }
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                SuspendWindows(process);
-            }
-            else
-            {
-                // TODO: do not suspend on Mac and Linux, this prevents the process from being dumped when we use the net client dumper, checking if we can post a different signal
-                // SuspendLinuxMacOs(process);
-            }
+            EqtTrace.Verbose($"ProcessCodeMethods.Suspend: Process {process.Id} - {process.ProcessName} already exited, skipping.");
+            return;
         }
 
-        public static List<ProcessTreeNode> GetProcessTree(this Process process)
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            var childProcesses = Process.GetProcesses()
-            .Where(p => IsChildCandidate(p, process))
-            .ToList();
-
-            var acc = new List<ProcessTreeNode>();
-            foreach (var c in childProcesses)
-            {
-                try
-                {
-                    var parentId = GetParentPid(c);
-
-                    // c.ParentId = parentId;
-                    acc.Add(new ProcessTreeNode { ParentId = parentId, Process = c });
-                }
-                catch
-                {
-                    // many things can go wrong with this
-                    // just ignore errors
-                }
-            }
-
-            var level = 1;
-            var limit = 10;
-            ResolveChildren(process, acc, level, limit);
-
-            return new List<ProcessTreeNode> { new ProcessTreeNode { Process = process, Level = 0 } }.Concat(acc.Where(a => a.Level > 0)).ToList();
+            // There is no supported or documented API to suspend a process. If there was you should call it here.
+            // SuspendWindows(process);
         }
-
-        internal static void SuspendWindows(Process process)
+        else
         {
-            EqtTrace.Verbose($"ProcessCodeMethods.Suspend: Suspending process {process.Id} - {process.ProcessName}.");
-            NtSuspendProcess(process.Handle);
+            // TODO: do not suspend on Mac and Linux, this prevents the process from being dumped when we use the net client dumper, checking if we can post a different signal
+            // SuspendLinuxMacOs(process);
         }
+    }
+
+    public static List<ProcessTreeNode> GetProcessTree(this Process process)
+    {
+        var childProcesses = Process.GetProcesses()
+            .Where(p => IsChildCandidate(p, process))
+            .ToList();
 
-        internal static void SuspendLinuxMacOs(Process process)
+        var acc = new List<ProcessTreeNode>();
+        foreach (var c in childProcesses)
         {
             try
             {
-                var output = new StringBuilder();
-                var err = new StringBuilder();
-                Process ps = new Process();
-                ps.StartInfo.FileName = "kill";
-                ps.StartInfo.Arguments = $"-STOP {process.Id}";
-                ps.StartInfo.UseShellExecute = false;
-                ps.StartInfo.RedirectStandardOutput = true;
-                ps.OutputDataReceived += (_, e) => output.Append(e.Data);
-                ps.ErrorDataReceived += (_, e) => err.Append(e.Data);
-                ps.Start();
-                ps.BeginOutputReadLine();
-                ps.WaitForExit(5_000);
+                var parentId = GetParentPid(c);
 
-                if (!string.IsNullOrWhiteSpace(err.ToString()))
-                {
-                    EqtTrace.Verbose($"ProcessCodeMethods.SuspendLinuxMacOs: Error suspending process {process.Id} - {process.ProcessName}, {err}.");
-                }
+                // c.ParentId = parentId;
+                acc.Add(new ProcessTreeNode { ParentId = parentId, Process = c });
             }
-            catch (Exception ex)
+            catch
             {
-                EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidMacOs: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
+                // many things can go wrong with this
+                // just ignore errors
             }
         }
 
-        /// <summary>
-        /// Returns the parent id of a process or -1 if it fails.
-        /// </summary>
-        /// <param name="process">The process to find parent of.</param>
-        /// <returns>The pid of the parent process.</returns>
-        internal static int GetParentPid(Process process)
-        {
-            return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? GetParentPidWindows(process)
-                : RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
-                    ? GetParentPidLinux(process)
-                    : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
-                        GetParentPidMacOs(process)
-                        : throw new PlatformNotSupportedException();
-        }
+        var level = 1;
+        var limit = 10;
+        ResolveChildren(process, acc, level, limit);
 
-        internal static int GetParentPidWindows(Process process)
+        return new List<ProcessTreeNode> { new() { Process = process, Level = 0 } }.Concat(acc.Where(a => a.Level > 0)).ToList();
+    }
+
+    /// <summary>
+    /// Returns the parent id of a process or -1 if it fails.
+    /// </summary>
+    /// <param name="process">The process to find parent of.</param>
+    /// <returns>The pid of the parent process.</returns>
+    internal static int GetParentPid(Process process)
+    {
+        return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            ? GetParentPidWindows(process)
+            : RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+                ? GetParentPidLinux(process)
+                : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+                    GetParentPidMacOs(process)
+                    : throw new PlatformNotSupportedException();
+    }
+
+    internal static int GetParentPidWindows(Process process)
+    {
+        try
         {
-            try
-            {
-                var handle = process.Handle;
-                var res = NtQueryInformationProcess(handle, 0, out var pbi, Marshal.SizeOf<PROCESS_BASIC_INFORMATION>(), out int size);
+            var handle = process.Handle;
+            var res = NtQueryInformationProcess(handle, 0, out var pbi, Marshal.SizeOf<ProcessBasicInformation>(), out int size);
 
-                var p = res != 0 ? InvalidProcessId : pbi.InheritedFromUniqueProcessId.ToInt32();
+            var p = res != 0 ? InvalidProcessId : pbi.InheritedFromUniqueProcessId.ToInt32();
 
-                return p;
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidLinux: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
-                return InvalidProcessId;
-            }
+            return p;
         }
-
-        /// <summary>Read the /proc file system for information about the parent.</summary>
-        /// <param name="process">The process to get the parent process from.</param>
-        /// <returns>The process id.</returns>
-        internal static int GetParentPidLinux(Process process)
+        catch (Exception ex)
         {
-            var pid = process.Id;
+            EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidLinux: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
+            return InvalidProcessId;
+        }
+    }
 
-            // read /proc/<pid>/stat
-            // 4th column will contain the ppid, 92 in the example below
-            // ex: 93 (bash) S 92 93 2 4294967295 ...
-            var path = $"/proc/{pid}/stat";
-            try
-            {
-                var stat = File.ReadAllText(path);
-                var parts = stat.Split(' ');
+    /// <summary>Read the /proc file system for information about the parent.</summary>
+    /// <param name="process">The process to get the parent process from.</param>
+    /// <returns>The process id.</returns>
+    internal static int GetParentPidLinux(Process process)
+    {
+        var pid = process.Id;
 
-                if (parts.Length < 5)
-                {
-                    return InvalidProcessId;
-                }
+        // read /proc/<pid>/stat
+        // 4th column will contain the ppid, 92 in the example below
+        // ex: 93 (bash) S 92 93 2 4294967295 ...
+        var path = $"/proc/{pid}/stat";
+        try
+        {
+            var stat = File.ReadAllText(path);
+            var parts = stat.Split(' ');
 
-                return int.Parse(parts[3]);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidLinux: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
-                return InvalidProcessId;
-            }
+            return parts.Length < 5 ? InvalidProcessId : int.Parse(parts[3], CultureInfo.CurrentCulture);
         }
-
-        internal static int GetParentPidMacOs(Process process)
+        catch (Exception ex)
         {
-            try
-            {
-                var output = new StringBuilder();
-                var err = new StringBuilder();
-                Process ps = new Process();
-                ps.StartInfo.FileName = "ps";
-                ps.StartInfo.Arguments = $"-o ppid= {process.Id}";
-                ps.StartInfo.UseShellExecute = false;
-                ps.StartInfo.RedirectStandardOutput = true;
-                ps.OutputDataReceived += (_, e) => output.Append(e.Data);
-                ps.ErrorDataReceived += (_, e) => err.Append(e.Data);
-                ps.Start();
-                ps.BeginOutputReadLine();
-                ps.WaitForExit(5_000);
+            EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidLinux: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
+            return InvalidProcessId;
+        }
+    }
 
-                var o = output.ToString();
-                var parent = int.TryParse(o.Trim(), out var ppid) ? ppid : InvalidProcessId;
+    internal static int GetParentPidMacOs(Process process)
+    {
+        try
+        {
+            var output = new StringBuilder();
+            var err = new StringBuilder();
+            Process ps = new();
+            ps.StartInfo.FileName = "ps";
+            ps.StartInfo.Arguments = $"-o ppid= {process.Id}";
+            ps.StartInfo.UseShellExecute = false;
+            ps.StartInfo.RedirectStandardOutput = true;
+            ps.OutputDataReceived += (_, e) => output.Append(e.Data);
+            ps.ErrorDataReceived += (_, e) => err.Append(e.Data);
+            ps.Start();
+            ps.BeginOutputReadLine();
+            ps.WaitForExit(5_000);
 
-                if (!string.IsNullOrWhiteSpace(err.ToString()))
-                {
-                    EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidMacOs: Error getting parent of process {process.Id} - {process.ProcessName}, {err}.");
-                }
+            var o = output.ToString();
+            var parent = int.TryParse(o.Trim(), out var ppid) ? ppid : InvalidProcessId;
 
-                return parent;
-            }
-            catch (Exception ex)
+            if (err.ToString() is string error && !error.IsNullOrWhiteSpace())
             {
-                EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidMacOs: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
-                return InvalidProcessId;
+                EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidMacOs: Error getting parent of process {process.Id} - {process.ProcessName}, {error}.");
             }
+
+            return parent;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Verbose($"ProcessCodeMethods.GetParentPidMacOs: Error getting parent of process {process.Id} - {process.ProcessName}, {ex}.");
+            return InvalidProcessId;
         }
+    }
 
-        private static void ResolveChildren(Process parent, List<ProcessTreeNode> acc, int level, int limit)
+    private static void ResolveChildren(Process parent, List<ProcessTreeNode> acc, int level, int limit)
+    {
+        if (limit < 0)
         {
-            if (limit < 0)
-            {
-                // hit recursion limit, just returning
-                return;
-            }
+            // hit recursion limit, just returning
+            return;
+        }
 
-            // only take children that are newer than the parent, because process ids (PIDs) get recycled
-            var children = acc.Where(p => p.ParentId == parent.Id && p.Process.StartTime > parent.StartTime).ToList();
+        // only take children that are newer than the parent, because process ids (PIDs) get recycled
+        var children = acc.Where(p => p.ParentId == parent.Id && p.Process?.StartTime > parent.StartTime).ToList();
 
-            foreach (var child in children)
-            {
-                child.Level = level;
-                ResolveChildren(child.Process, acc, level + 1, limit);
-            }
+        foreach (var child in children)
+        {
+            child.Level = level;
+            ResolveChildren(child.Process!, acc, level + 1, limit);
         }
+    }
 
-        private static bool IsChildCandidate(Process child, Process parent)
+    private static bool IsChildCandidate(Process child, Process parent)
+    {
+        // this is extremely slow under debugger, but fast without it
+        try
         {
-            // this is extremely slow under debugger, but fast without it
-            try
-            {
-                return child.StartTime > parent.StartTime && child.Id != parent.Id;
-            }
-            catch
-            {
-                /* access denied or process has exits most likely */
-                return false;
-            }
+            return child.StartTime > parent.StartTime && child.Id != parent.Id;
         }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct PROCESS_BASIC_INFORMATION
+        catch
         {
-            public IntPtr ExitStatus;
-            public IntPtr PebBaseAddress;
-            public IntPtr AffinityMask;
-            public IntPtr BasePriority;
-            public IntPtr UniqueProcessId;
-            public IntPtr InheritedFromUniqueProcessId;
+            /* access denied or process has exits most likely */
+            return false;
         }
+    }
 
-        [DllImport("ntdll.dll", SetLastError = true)]
-#pragma warning disable SA1201 // Elements must appear in the correct order
-        private static extern int NtQueryInformationProcess(
-                IntPtr processHandle,
-                int processInformationClass,
-                out PROCESS_BASIC_INFORMATION processInformation,
-                int processInformationLength,
-                out int returnLength);
-
-        [DllImport("ntdll.dll", SetLastError = true)]
-        private static extern IntPtr NtSuspendProcess(IntPtr processHandle);
-
-#pragma warning restore SA1201 // Elements must appear in the correct order
+    [StructLayout(LayoutKind.Sequential)]
+    private struct ProcessBasicInformation
+    {
+        public readonly IntPtr ExitStatus;
+        public readonly IntPtr PebBaseAddress;
+        public readonly IntPtr AffinityMask;
+        public readonly IntPtr BasePriority;
+        public readonly IntPtr UniqueProcessId;
+        public IntPtr InheritedFromUniqueProcessId;
     }
+
+    [DllImport("ntdll.dll", SetLastError = true)]
+    private static extern int NtQueryInformationProcess(
+        IntPtr processHandle,
+        int processInformationClass,
+        out ProcessBasicInformation processInformation,
+        int processInformationLength,
+        out int returnLength);
+
+    // This call is undocumented api, and should not be used.
+    //[DllImport("ntdll.dll", SetLastError = true)]
+    //private static extern IntPtr NtSuspendProcess(IntPtr processHandle);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessDumpUtility.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessDumpUtility.cs
index 9364b9f6c7..e5eb1be159 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessDumpUtility.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessDumpUtility.cs
@@ -1,149 +1,139 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal class ProcessDumpUtility : IProcessDumpUtility
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    internal class ProcessDumpUtility : IProcessDumpUtility
+    private readonly IProcessHelper _processHelper;
+    private readonly IFileHelper _fileHelper;
+    private readonly IHangDumperFactory _hangDumperFactory;
+    private readonly ICrashDumperFactory _crashDumperFactory;
+    private ICrashDumper? _crashDumper;
+    private string? _hangDumpDirectory;
+    private bool _wasHangDumped;
+
+    public ProcessDumpUtility()
+        : this(new ProcessHelper(), new FileHelper(), new HangDumperFactory(), new CrashDumperFactory())
     {
-        private readonly IProcessHelper processHelper;
-        private readonly IFileHelper fileHelper;
-        private readonly IHangDumperFactory hangDumperFactory;
-        private readonly ICrashDumperFactory crashDumperFactory;
-        private ICrashDumper crashDumper;
-        private string hangDumpDirectory;
-        private string crashDumpDirectory;
-        private bool wasHangDumped;
-
-        public ProcessDumpUtility()
-            : this(new ProcessHelper(), new FileHelper(), new HangDumperFactory(), new CrashDumperFactory())
-        {
-        }
+    }
 
-        public ProcessDumpUtility(IProcessHelper processHelper, IFileHelper fileHelper, IHangDumperFactory hangDumperFactory, ICrashDumperFactory crashDumperFactory)
-        {
-            this.processHelper = processHelper;
-            this.fileHelper = fileHelper;
-            this.hangDumperFactory = hangDumperFactory;
-            this.crashDumperFactory = crashDumperFactory;
-        }
+    public ProcessDumpUtility(IProcessHelper processHelper, IFileHelper fileHelper, IHangDumperFactory hangDumperFactory, ICrashDumperFactory crashDumperFactory)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _hangDumperFactory = hangDumperFactory;
+        _crashDumperFactory = crashDumperFactory;
+    }
 
-        protected Action<object, string> OutputReceivedCallback => (process, data) =>
-        {
-            // Log all standard output message of procdump in diag files.
-            // Otherwise they end up coming on console in pipleine.
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("ProcessDumpUtility.OutputReceivedCallback: Output received from procdump process: " + data);
-            }
-        };
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    protected Action<object?, string?> OutputReceivedCallback => (process, data) =>
+        // Log all standard output message of procdump in diag files.
+        // Otherwise they end up coming on console in pipleine.
+        EqtTrace.Info($"ProcessDumpUtility.OutputReceivedCallback: Output received from procdump process: {data ?? "<null>"}");
 
-        /// <inheritdoc/>
-        public IEnumerable<string> GetDumpFiles(bool warnOnNoDumpFiles, bool processCrashed)
+    /// <inheritdoc/>
+    public IEnumerable<string> GetDumpFiles(bool warnOnNoDumpFiles, bool processCrashed)
+    {
+        if (!_wasHangDumped)
         {
-            if (!this.wasHangDumped)
-            {
-                this.crashDumper.WaitForDumpToFinish();
-            }
+            _crashDumper?.WaitForDumpToFinish();
+        }
 
-            // If the process was hang dumped we killed it ourselves, so it crashed when executing tests,
-            // but we already have the hang dump, and should not also collect the exit dump that we got
-            // from killing the process by the hang dumper.
-            IEnumerable<string> crashDumps = this.crashDumper?.GetDumpFiles(processCrashed) ?? new List<string>();
+        // If the process was hang dumped we killed it ourselves, so it crashed when executing tests,
+        // but we already have the hang dump, and should not also collect the exit dump that we got
+        // from killing the process by the hang dumper.
+        IEnumerable<string> crashDumps = _crashDumper?.GetDumpFiles(processCrashed) ?? new List<string>();
 
-            IEnumerable<string> hangDumps = this.fileHelper.DirectoryExists(this.hangDumpDirectory)
-                ? this.fileHelper.GetFiles(this.hangDumpDirectory, "*_hangdump*.dmp", SearchOption.TopDirectoryOnly)
-                : Array.Empty<string>();
+        IEnumerable<string> hangDumps = _fileHelper.DirectoryExists(_hangDumpDirectory)
+            ? _fileHelper.GetFiles(_hangDumpDirectory, "*_hangdump*.dmp", SearchOption.TopDirectoryOnly)
+            : [];
 
-            var foundDumps = new List<string>();
-            foreach (var dumpPath in crashDumps.Concat(hangDumps))
+        var foundDumps = new List<string>();
+        foreach (var dumpPath in crashDumps.Concat(hangDumps))
+        {
+            EqtTrace.Info($"ProcessDumpUtility.GetDumpFiles: Looking for dump file '{dumpPath}'.");
+            var found = _fileHelper.Exists(dumpPath);
+            if (found)
             {
-                EqtTrace.Info($"ProcessDumpUtility.GetDumpFiles: Looking for dump file '{dumpPath}'.");
-                var found = this.fileHelper.Exists(dumpPath);
-                if (found)
-                {
-                    EqtTrace.Info($"ProcessDumpUtility.GetDumpFile: Found dump file '{dumpPath}'.");
-                    foundDumps.Add(dumpPath);
-                }
-                else
-                {
-                    EqtTrace.Warning($"ProcessDumpUtility.GetDumpFile: Dump file '{dumpPath}' was not found.");
-                }
+                EqtTrace.Info($"ProcessDumpUtility.GetDumpFile: Found dump file '{dumpPath}'.");
+                foundDumps.Add(dumpPath);
             }
-
-            if (warnOnNoDumpFiles && !foundDumps.Any())
+            else
             {
-                EqtTrace.Error($"ProcessDumpUtility.GetDumpFile: Could not find any dump file in {this.hangDumpDirectory}.");
-                throw new FileNotFoundException(Resources.Resources.DumpFileNotGeneratedErrorMessage);
+                EqtTrace.Warning($"ProcessDumpUtility.GetDumpFile: Dump file '{dumpPath}' was not found.");
             }
-
-            return foundDumps;
         }
 
-        /// <inheritdoc/>
-        public void StartHangBasedProcessDump(int processId, string tempDirectory, bool isFullDump, string targetFramework, Action<string> logWarning = null)
+        if (warnOnNoDumpFiles && foundDumps.Count == 0)
         {
-            this.HangDump(processId, tempDirectory, isFullDump ? DumpTypeOption.Full : DumpTypeOption.Mini, targetFramework, logWarning);
+            EqtTrace.Error($"ProcessDumpUtility.GetDumpFile: Could not find any dump file in {_hangDumpDirectory}.");
+            throw new FileNotFoundException(Resources.Resources.DumpFileNotGeneratedErrorMessage);
         }
 
-        /// <inheritdoc/>
-        public void StartTriggerBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, bool collectAlways)
-        {
-            this.CrashDump(processId, testResultsDirectory, isFullDump ? DumpTypeOption.Full : DumpTypeOption.Mini, targetFramework, collectAlways);
-        }
+        return foundDumps;
+    }
 
-        /// <inheritdoc/>
-        public void DetachFromTargetProcess(int targetProcessId)
-        {
-            this.crashDumper?.DetachFromTargetProcess(targetProcessId);
-        }
+    /// <inheritdoc/>
+    public void StartHangBasedProcessDump(int processId, string tempDirectory, bool isFullDump, string targetFramework, Action<string>? logWarning = null)
+    {
+        HangDump(processId, tempDirectory, isFullDump ? DumpTypeOption.Full : DumpTypeOption.Mini, targetFramework, logWarning);
+    }
 
-        private void CrashDump(int processId, string tempDirectory, DumpTypeOption dumpType, string targetFramework, bool collectAlways)
-        {
-            var processName = this.processHelper.GetProcessName(processId);
-            EqtTrace.Info($"ProcessDumpUtility.CrashDump: Creating {dumpType.ToString().ToLowerInvariant()} dump of process {processName} ({processId}) into temporary path '{tempDirectory}'.");
-            this.crashDumpDirectory = tempDirectory;
+    /// <inheritdoc/>
+    [MemberNotNull(nameof(_crashDumper))]
+    public void StartTriggerBasedProcessDump(int processId, string testResultsDirectory, bool isFullDump, string targetFramework, bool collectAlways, Action<string> logWarning)
+    {
+        var dumpType = isFullDump ? DumpTypeOption.Full : DumpTypeOption.Mini;
+        var processName = _processHelper.GetProcessName(processId);
+        EqtTrace.Info($"ProcessDumpUtility.CrashDump: Creating a crash dumper for process {processName} ({processId}). If crash happens, dumper will try to create '{dumpType}' dump and store it temporarily in path '{testResultsDirectory}'. Later dumps will become attachments and will be moved to TestResults directory.");
 
-            this.crashDumper = this.crashDumperFactory.Create(targetFramework);
-            ConsoleOutput.Instance.Information(false, $"Blame: Attaching crash dump utility to process {processName} ({processId}).");
-            this.crashDumper.AttachToTargetProcess(processId, tempDirectory, dumpType, collectAlways);
-        }
+        _crashDumper = _crashDumperFactory.Create(targetFramework);
+        ConsoleOutput.Instance.Information(false, $"Blame: Attaching crash dump utility to process {processName} ({processId}).");
+        _crashDumper.AttachToTargetProcess(processId, testResultsDirectory, dumpType, collectAlways, logWarning);
+    }
 
-        private void HangDump(int processId, string tempDirectory, DumpTypeOption dumpType, string targetFramework, Action<string> logWarning = null)
-        {
-            this.wasHangDumped = true;
+    /// <inheritdoc/>
+    public void DetachFromTargetProcess(int targetProcessId)
+    {
+        _crashDumper?.DetachFromTargetProcess(targetProcessId);
+    }
 
-            var processName = this.processHelper.GetProcessName(processId);
-            EqtTrace.Info($"ProcessDumpUtility.HangDump: Creating {dumpType.ToString().ToLowerInvariant()} dump of process {processName} ({processId}) into temporary path '{tempDirectory}'.");
+    private void HangDump(int processId, string tempDirectory, DumpTypeOption dumpType, string targetFramework, Action<string>? logWarning = null)
+    {
+        _wasHangDumped = true;
 
-            this.hangDumpDirectory = tempDirectory;
+        var processName = _processHelper.GetProcessName(processId);
+        EqtTrace.Info($"ProcessDumpUtility.HangDump: Creating {dumpType.ToString().ToLowerInvariant()} dump of process {processName} ({processId}) into temporary path '{tempDirectory}'.");
 
-            // oh how ugly this is, but the whole infra above this starts with initializing the logger in Initialize
-            // the logger needs to pass around 2 parameters, so I am just passing it around as callback instead
-            this.hangDumperFactory.LogWarning = logWarning;
-            var dumper = this.hangDumperFactory.Create(targetFramework);
+        _hangDumpDirectory = tempDirectory;
 
-            try
-            {
-                dumper.Dump(processId, tempDirectory, dumpType);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error($"Blame: Failed with error {ex}.");
-                throw;
-            }
+        // oh how ugly this is, but the whole infra above this starts with initializing the logger in Initialize
+        // the logger needs to pass around 2 parameters, so I am just passing it around as callback instead
+        _hangDumperFactory.LogWarning = logWarning;
+        var dumper = _hangDumperFactory.Create(targetFramework);
+
+        try
+        {
+            dumper.Dump(processId, tempDirectory, dumpType);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error($"Blame: Failed with error {ex}.");
+            throw;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessTreeNode.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessTreeNode.cs
index e093c0fa63..bdcbc575ff 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessTreeNode.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessTreeNode.cs
@@ -1,29 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using System.Diagnostics;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    internal class ProcessTreeNode
-    {
-        public Process Process { get; set; }
+internal class ProcessTreeNode
+{
+    public Process? Process { get; set; }
 
-        public int Level { get; set; }
+    public int Level { get; set; }
 
-        public int ParentId { get; set; }
+    public int ParentId { get; set; }
 
-        public Process ParentProcess { get; set; }
-    }
+    public Process? ParentProcess { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Properties/AssemblyInfo.cs
index dc8cee6a54..2ee4e5bbfe 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Properties/AssemblyInfo.cs
@@ -1,27 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 using Microsoft.TestPlatform.Extensions.BlameDataCollector;
 using Microsoft.VisualStudio.TestPlatform;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Extensions.BlameDataCollector")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("716373d6-9162-4ac6-9ae7-b5a3a4286808")]
-
-[assembly: TestExtensionTypes(typeof(BlameLogger), typeof(BlameCollector))]
\ No newline at end of file
+[assembly: TestExtensionTypes(typeof(BlameLogger), typeof(BlameCollector))]
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..a5ac44b058
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,83 @@
+#nullable enable
+const Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger.ExtensionUri = "logger://Microsoft/TestPlatform/Extensions/Blame/v1" -> string!
+const Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger.FriendlyName = "Blame" -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector.BlameCollector() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector.GetTestExecutionEnvironmentVariables() -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string!>>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger.BlameLogger() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger.BlameLogger(Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, Microsoft.TestPlatform.Extensions.BlameDataCollector.IBlameReaderWriter! blameReaderWriter) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, string? testRunDictionary) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.BlameTestObject() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.BlameTestObject(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.BlameTestObject(string! fullyQualifiedName, System.Uri! executorUri, string! source) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.DisplayName.get -> string?
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.DisplayName.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.ExecutorUri.get -> System.Uri?
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.ExecutorUri.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.FullyQualifiedName.get -> string?
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.FullyQualifiedName.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.Id.get -> System.Guid
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.Id.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.IsCompleted.get -> bool
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.IsCompleted.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.Source.get -> string?
+Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject.Source.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption
+Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption.Full = 0 -> Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption
+Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption.Mini = 2 -> Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption
+Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption.WithHeap = 1 -> Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IBlameReaderWriter
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IBlameReaderWriter.ReadTestSequence(string! filePath) -> System.Collections.Generic.List<Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject!>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IBlameReaderWriter.WriteTestSequence(System.Collections.Generic.List<System.Guid>! testSequence, System.Collections.Generic.Dictionary<System.Guid, Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject!>! testObjectDictionary, string! filePath) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper.AttachToTargetProcess(int processId, string! outputDirectory, Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption dumpType, bool collectAlways, System.Action<string!>! logWarning) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper.DetachFromTargetProcess(int processId) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper.GetDumpFiles(bool processCrashed) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper.WaitForDumpToFinish() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumperFactory
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumperFactory.Create(string! targetFramework) -> Microsoft.TestPlatform.Extensions.BlameDataCollector.ICrashDumper!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumper
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumper.Dump(int processId, string! outputDirectory, Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption dumpType) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumperFactory
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumperFactory.Create(string! targetFramework) -> Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumper!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumperFactory.LogWarning.get -> System.Action<string!>?
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IHangDumperFactory.LogWarning.set -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IInactivityTimer
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IInactivityTimer.ResetTimer(System.TimeSpan inactivityTimespan) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.InactivityTimer
+Microsoft.TestPlatform.Extensions.BlameDataCollector.InactivityTimer.Dispose() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.InactivityTimer.InactivityTimer(System.Action! timerCallback) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.InactivityTimer.ResetTimer(System.TimeSpan inactivityTimespan) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.INativeMethodsHelper
+Microsoft.TestPlatform.Extensions.BlameDataCollector.INativeMethodsHelper.Is64Bit(nint processHandle) -> bool
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcDumpArgsBuilder
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcDumpArgsBuilder.BuildHangBasedProcDumpArgs(int processId, string! filename, bool isFullDump) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(int processId, string! filename, System.Collections.Generic.IEnumerable<string!>! procDumpExceptionsList, bool isFullDump) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcessDumpUtility
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcessDumpUtility.DetachFromTargetProcess(int targetProcessId) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcessDumpUtility.GetDumpFiles(bool warnOnNoDumpFiles, bool processCrashed) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcessDumpUtility.StartHangBasedProcessDump(int processId, string! testResultsDirectory, bool isFullDump, string! targetFramework, System.Action<string!>? logWarning = null) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.IProcessDumpUtility.StartTriggerBasedProcessDump(int processId, string! testResultsDirectory, bool isFullDump, string! targetFramework, bool collectAlways, System.Action<string!>! logWarning) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpArgsBuilder
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpArgsBuilder.BuildHangBasedProcDumpArgs(int processId, string! filename, bool isFullDump) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(int processId, string! filename, System.Collections.Generic.IEnumerable<string!>! procDumpExceptionsList, bool isFullDump) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpArgsBuilder.ProcDumpArgsBuilder() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.AttachToTargetProcess(int processId, string! outputDirectory, Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption dumpType, bool collectAlways, System.Action<string!>! logWarning) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.DetachFromTargetProcess(int targetProcessId) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.Dump(int processId, string! outputDirectory, Microsoft.TestPlatform.Extensions.BlameDataCollector.DumpTypeOption dumpType) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.GetDumpFiles(bool processCrashed) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.OutputReceivedCallback.get -> System.Action<object?, string?>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.ProcDumpDumper() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.ProcDumpDumper(Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper! processHelper, Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment! environment) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.ProcDumpDumper.WaitForDumpToFinish() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.Win32NamedEvent
+Microsoft.TestPlatform.Extensions.BlameDataCollector.Win32NamedEvent.Set() -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.Win32NamedEvent.Win32NamedEvent(string! eventName) -> void
+Microsoft.TestPlatform.Extensions.BlameDataCollector.XmlReaderWriter
+Microsoft.TestPlatform.Extensions.BlameDataCollector.XmlReaderWriter.ReadTestSequence(string! filePath) -> System.Collections.Generic.List<Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject!>!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.XmlReaderWriter.WriteTestSequence(System.Collections.Generic.List<System.Guid>! testSequence, System.Collections.Generic.Dictionary<System.Guid, Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameTestObject!>! testObjectDictionary, string! filePath) -> string!
+Microsoft.TestPlatform.Extensions.BlameDataCollector.XmlReaderWriter.XmlReaderWriter(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
+override Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector.Initialize(System.Xml.XmlElement? configurationElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents! events, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink! dataSink, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger! logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext? environmentContext) -> void
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs
index e34c6b30ba..2c32d6d3df 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -82,7 +82,7 @@ internal static string BlameParameterKeyIncorrect {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key..
+        ///   Looks up a localized string similar to The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}.
         /// </summary>
         internal static string BlameParameterValueIncorrect {
             get {
@@ -135,6 +135,15 @@ internal static string Minutes {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid &apos;DumpDirectoryPath&apos; for postmortem debugger monitor.
+        /// </summary>
+        internal static string MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter {
+            get {
+                return ResourceManager.GetString("MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to All tests finished running, Sequence file will not be generated.
         /// </summary>
@@ -162,6 +171,15 @@ internal static string ProcDumpEnvVarEmpty {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to {0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable.
+        /// </summary>
+        internal static string ProcDumpNotFound {
+            get {
+                return ResourceManager.GetString("ProcDumpNotFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to CollectDump was enabled but dump file was not generated..
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx
index 4d5c69c20d..b1a62c3790 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/Resources.resx
@@ -128,7 +128,8 @@ This test may, or may not be the source of the crash.</value>
     <value>The blame parameter key specified {0} is not valid. Ignoring this key.</value>
   </data>
   <data name="BlameParameterValueIncorrect" xml:space="preserve">
-    <value>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</value>
+    <value>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</value>
+    <comment>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</comment>
   </data>
   <data name="DumpFileNotGeneratedErrorMessage" xml:space="preserve">
     <value>Collect dump was enabled but no dump file was generated.</value>
@@ -157,6 +158,10 @@ This test may, or may not be the source of the crash.</value>
   <data name="ProcDumpEnvVarEmpty" xml:space="preserve">
     <value>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</value>
   </data>
+  <data name="ProcDumpNotFound" xml:space="preserve">
+    <value>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</value>
+    <comment>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</comment>
+  </data>
   <data name="ProcDumpNotGenerated" xml:space="preserve">
     <value>CollectDump was enabled but dump file was not generated.</value>
   </data>
@@ -166,4 +171,7 @@ This test may, or may not be the source of the crash.</value>
   <data name="UnexpectedValueForInactivityTimespanValue" xml:space="preserve">
     <value>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter" xml:space="preserve">
+    <value>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</value>
+  </data>
+</root>
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf
index 3781d6a61c..dafafdf58d 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.cs.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">Aktivní testovací běh se přerušil, protože proces hostitele se neočekávaně ukončil. Prověřte prosím výše zásobník volání, pokud je k dispozici. Nabídne vám další informace o původu výjimky.
-Test, který běžel, když došlo k chybovému ukončení: 
-{0}
-Tento test může a nemusí být příčinou chybového ukončení.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">Vyžadovaná proměnná prostředí PROCDUMP_PATH má hodnotu Null nebo je prázdná. Nastavte pro ni cestu ke složce obsahující příslušný spustitelný soubor ProcDump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">Bylo povoleno shromáždění výpisu, ale nebyl vygenerován žádný soubor výpisu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">Zadaný klíč parametru blame {0} není platný. Tento klíč se bude ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">Klíč parametru blame {0} dokáže podporovat jen hodnoty {1}/{2}. Tento klíč se bude ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Nešlo spustit výpis procesu: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">Byla povolena funkce CollectDump, ale soubor výpisu nebyl vygenerován.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Zadaná doba nečinnosti {0} {1} vypršela. Shromažďují se výpisy při zablokování z hostitele testhost a jeho podřízených procesů.</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Jako časový limit se přidala neočekávaná hodnota {0}. Zadejte prosím hodnotu v tomto formátu: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Všechny testy se dokončily. Soubor sekvence se nevygeneruje.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Vytváří se výpis pro {0} – {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Vytváří se výpis tohoto stromu procesu (zespod)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">minuty</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">sekundy</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">Aktivní testovací běh se přerušil, protože proces hostitele se neočekávaně ukončil. Prověřte prosím výše zásobník volání, pokud je k dispozici. Nabídne vám další informace o původu výjimky.
+Test, který běžel, když došlo k chybovému ukončení: 
+{0}
+Tento test může a nemusí být příčinou chybového ukončení.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">Vyžadovaná proměnná prostředí PROCDUMP_PATH má hodnotu Null nebo je prázdná. Nastavte pro ni cestu ke složce obsahující příslušný spustitelný soubor ProcDump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">Bylo povoleno shromáždění výpisu, ale nebyl vygenerován žádný soubor výpisu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">Zadaný klíč parametru blame {0} není platný. Tento klíč se bude ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">Klíč parametru blame {0} má nesprávnou hodnotu: {1}. Podporované hodnoty jsou: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Nešlo spustit výpis procesu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">Byla povolena funkce CollectDump, ale soubor výpisu nebyl vygenerován.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Zadaná doba nečinnosti {0} {1} vypršela. Shromažďují se výpisy při zablokování z hostitele testhost a jeho podřízených procesů.</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Jako časový limit se přidala neočekávaná hodnota {0}. Zadejte prosím hodnotu v tomto formátu: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Všechny testy se dokončily. Soubor sekvence se nevygeneruje.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Vytváří se výpis pro {0} – {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Vytváří se výpis tohoto stromu procesu (zespod)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">minuty</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">sekundy</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} nelze najít. Zkontrolujte, zda je spustitelný soubor k dispozici v cestě PATH, případně nastavte proměnnou prostředí PROCDUMP_PATH na adresář, který obsahuje spustitelný soubor {0}.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Neplatná vlastnost DumpDirectoryPath pro monitorování ladicího programu postmortem</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf
index 8751849d00..5c21b44514 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.de.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">Der aktive Testlauf wurde abgebrochen, weil der Hostprozess unerwartet beendet wurde. Überprüfen Sie die oben aufgeführte Aufrufliste, falls verfügbar, um weitere Informationen zur Ursache der Ausnahme zu erhalten.
-Beim Absturz ausgeführter Test: 
-{0}
-Dieser Test kann, muss aber nicht unbedingt die Absturzursache sein.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">Die erforderliche Umgebungsvariable PROCDUMP_PATH war NULL oder leer. Legen Sie PROCDUMP_PATH auf den Pfad des Ordners fest, der die geeignete ausführbare procdump-Datei enthält.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">Die Abbilderfassung war aktiviert, aber es wurde keine Abbilddatei generiert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">Der angegebene blame-Parameterschlüssel "{0}" ist ungültig. Dieser Schlüssel wird ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">Der blame-Parameterschlüssel "{0}" kann nur die Werte "{1}"/"{2}" unterstützen. Dieser Schlüssel wird ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Prozesssicherung konnte nicht gestartet werden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump war aktiviert, aber es wurde keine Abbilddatei generiert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Die angegebene Inaktivitätszeit von {0} {1} ist abgelaufen. Vom Testhost und den untergeordneten Prozessen werden Stillstandsicherungen erfasst.</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Unerwarteter Wert "{0}" als Timeout angegeben. Geben Sie einen Wert in folgendem Format an: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Alle Tests wurden ausgeführt. Die Datei "Sequence" wird nicht generiert.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">"{1}" ({0}) wird gesichert.</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Diese Prozessstruktur wird gesichert (von unten).</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">Minuten</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">Sekunden</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">Der aktive Testlauf wurde abgebrochen, weil der Hostprozess unerwartet beendet wurde. Überprüfen Sie die oben aufgeführte Aufrufliste, falls verfügbar, um weitere Informationen zur Ursache der Ausnahme zu erhalten.
+Beim Absturz ausgeführter Test: 
+{0}
+Dieser Test kann, muss aber nicht unbedingt die Absturzursache sein.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">Die erforderliche Umgebungsvariable PROCDUMP_PATH war NULL oder leer. Legen Sie PROCDUMP_PATH auf den Pfad des Ordners fest, der die geeignete ausführbare procdump-Datei enthält.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">Die Abbilderfassung war aktiviert, aber es wurde keine Abbilddatei generiert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">Der angegebene blame-Parameterschlüssel "{0}" ist ungültig. Dieser Schlüssel wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">Der \"blame\"-Parameterschlüssel {0}, hat einen falschen Wert: {1}. Unterstützte Werte: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Prozesssicherung konnte nicht gestartet werden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump war aktiviert, aber es wurde keine Abbilddatei generiert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Die angegebene Inaktivitätszeit von {0} {1} ist abgelaufen. Vom Testhost und den untergeordneten Prozessen werden Stillstandsicherungen erfasst.</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Unerwarteter Wert "{0}" als Timeout angegeben. Geben Sie einen Wert in folgendem Format an: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Alle Tests wurden ausgeführt. Die Datei "Sequence" wird nicht generiert.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">"{1}" ({0}) wird gesichert.</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Diese Prozessstruktur wird gesichert (von unten).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">Minuten</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">Sekunden</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} wurde nicht gefunden. Stellen Sie sicher, dass die ausführbare Datei unter PATH verfügbar ist. Legen Sie alternativ die Umgebungsvariable PROCDUMP_PATH auf ein Verzeichnis fest, das {0} ausführbare Datei enthält.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Ungültiger "DumpDirectoryPath" für Postmortemdebuggermonitor</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf
index 8890c61094..de67d8af2c 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.es.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">La serie de pruebas activa se anuló porque el proceso de host se cerró de forma inesperada. Compruebe la pila de llamadas anterior, si está disponible, para obtener más información sobre el origen de la excepción.
-Prueba en ejecución cuando se produjo el bloqueo: 
-{0}
-Esta prueba puede ser el origen del bloqueo o no serlo.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">La variable de entorno PROCDUMP_PATH requerida era NULL o estaba vacía. Establezca PROCDUMP_PATH en la ruta de acceso de la carpeta que contiene el ejecutable procdump correcto.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">La opción para recopilar un volcado de memoria estaba habilitada, pero no se generó ningún archivo de volcado de memoria.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">La clave de parámetro blame especificada {0} no es válida. Se omitirá esta clave.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">La clave de parámetro blame {0} solo puede admitir valores {1}/{2}. Se omitirá esta clave.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">No se ha podido iniciar el volcado de proceso: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump estaba habilitado pero no se ha generado el archivo de volcado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">El tiempo de inactividad de {0} {1} que se ha especificado ha transcurrido. Recopilando volcados de bloqueos del host de pruebas y sus procesos secundarios</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Valor inesperado "{0}" proporcionado como tiempo de espera. Indique un valor en este formato: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Todas las pruebas han terminado de ejecutarse; no se generará el archivo Sequence.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Volcando {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Volcando este árbol de procesos (desde abajo)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">minutos</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">segundos</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">La serie de pruebas activa se anuló porque el proceso de host se cerró de forma inesperada. Compruebe la pila de llamadas anterior, si está disponible, para obtener más información sobre el origen de la excepción.
+Prueba en ejecución cuando se produjo el bloqueo: 
+{0}
+Esta prueba puede ser el origen del bloqueo o no serlo.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">La variable de entorno PROCDUMP_PATH requerida era NULL o estaba vacía. Establezca PROCDUMP_PATH en la ruta de acceso de la carpeta que contiene el ejecutable procdump correcto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">La opción para recopilar un volcado de memoria estaba habilitada, pero no se generó ningún archivo de volcado de memoria.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">La clave de parámetro blame especificada {0} no es válida. Se omitirá esta clave.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">La clave del parámetro de culpa {0} tiene un valor incorrecto: {1}. Los valores admitidos son: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">No se ha podido iniciar el volcado de proceso: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump estaba habilitado pero no se ha generado el archivo de volcado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">El tiempo de inactividad de {0} {1} que se ha especificado ha transcurrido. Recopilando volcados de bloqueos del host de pruebas y sus procesos secundarios</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Valor inesperado "{0}" proporcionado como tiempo de espera. Indique un valor en este formato: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Todas las pruebas han terminado de ejecutarse; no se generará el archivo Sequence.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Volcando {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Volcando este árbol de procesos (desde abajo)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">minutos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">segundos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">no se encontró {0}. Cerciórese de que el ejecutable está disponible en PATH o establezca variable de entorno PROCDUMP_PATH en un directorio que contenga {0} ejecutable</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">'DumpDirectoryPath' no válido para el monitor del depurador post mortem</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf
index 1bab835425..ae354a94d3 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.fr.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">La série de tests active a été abandonnée, car le processus hôte s'est arrêté de manière inattendue. Inspectez la pile des appels ci-dessus, le cas échéant, pour obtenir plus d'informations sur l'origine de l'exception.
-Test en cours d'exécution au moment du plantage : 
-{0}
-Ce test est éventuellement à l'origine du plantage.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">La variable d'environnement exigée PROCDUMP_PATH était null ou vide. Affectez à PROCDUMP_PATH le chemin du dossier contenant l'exécutable procdump approprié.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">La collecte de fichiers dump a été activée, mais aucun fichier dump n'a été généré.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">La clé de paramètre blame spécifiée {0} n'est pas valide. Cette clé est ignorée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">La clé de paramètre blame {0} peut prendre en charge uniquement les valeurs {1}/{2}. Cette clé est ignorée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Impossible de démarrer le fichier dump du processus : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump a été activé, mais le fichier dump n'a pas été généré.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Le délai d'inactivité spécifié ({0} {1}) s'est écoulé. Collecte d'images mémoire des plantages de l'hôte de test et de ses processus enfants</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Valeur inattendue '{0}' fournie en tant que délai d'expiration. Indiquez une valeur au format suivant : 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Tous les tests ont fini de s'exécuter. Le fichier de séquence ne sera pas généré</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Création d'une image mémoire {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Création d'une image mémoire de cette arborescence de processus (à partir du bas)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">minutes</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">secondes</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">La série de tests active a été abandonnée, car le processus hôte s'est arrêté de manière inattendue. Inspectez la pile des appels ci-dessus, le cas échéant, pour obtenir plus d'informations sur l'origine de l'exception.
+Test en cours d'exécution au moment du plantage : 
+{0}
+Ce test est éventuellement à l'origine du plantage.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">La variable d'environnement exigée PROCDUMP_PATH était null ou vide. Affectez à PROCDUMP_PATH le chemin du dossier contenant l'exécutable procdump approprié.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">La collecte de fichiers dump a été activée, mais aucun fichier dump n'a été généré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">La clé de paramètre blame spécifiée {0} n'est pas valide. Cette clé est ignorée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">La clé de paramètre de responsabilité {0}, a une valeur incorrecte : {1}. Les valeurs prises en charge sont les suivantes : {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Impossible de démarrer le fichier dump du processus : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump a été activé, mais le fichier dump n'a pas été généré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Le délai d'inactivité spécifié ({0} {1}) s'est écoulé. Collecte d'images mémoire des plantages de l'hôte de test et de ses processus enfants</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Valeur inattendue '{0}' fournie en tant que délai d'expiration. Indiquez une valeur au format suivant : 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Tous les tests ont fini de s'exécuter. Le fichier de séquence ne sera pas généré</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Création d'une image mémoire {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Création d'une image mémoire de cette arborescence de processus (à partir du bas)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">minutes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">secondes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} est introuvable, vérifiez que l’exécutable est disponible sur PATH. Vous pouvez également définir PROCDUMP_PATH variable d’environnement sur un répertoire qui contient l’exécutable {0}</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">'DumpDirectoryPath' non valide pour l’analyse du débogueur post-mortem</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf
index d666f1b951..6fb6917ae9 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.it.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">L'esecuzione dei test attiva è stata interrotta perché il processo host è stato terminato in modo imprevisto. Esaminare lo stack di chiamate in alto, se disponibile, per ottenere altre informazioni sull'origine dell'eccezione.
-Test in esecuzione quando si è verificato l'arresto anomalo: 
-{0}
-Il test potrebbe essere l'origine dell'arresto anomalo.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">La variabile di ambiente PROCDUMP_PATH richiesta è Null o vuota. Impostare PROCDUMP_PATH sul percorso della cartella che contiene il file eseguibile appropriato di procdump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">La raccolta del dump è stata abilitata ma non è stato generato alcun file di dump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">La chiave specificata {0} del parametro di Blame non è valida e verrà ignorata.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">La chiave {0} del parametro di Blame può supportare solo valori {1}/{2}. Questa chiave verrà ignorata.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Non è stato possibile avviare il dump del processo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump è stato abilitato ma non è stato generato alcun file di dump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Il tempo di inattività specificato di {0} {1} è scaduto. Verranno raccolti i dump in sospeso da testhost e dai relativi processi figlio</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Il valore '{0}', specificato come timeout, è imprevisto. Specificare un valore in questo formato: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">L'esecuzione di tutti i test è stata completata. Il file di sequenza non verrà generato</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Dump di {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Dump di questo albero processi (dal basso)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">minuti</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">secondi</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">L'esecuzione dei test attiva è stata interrotta perché il processo host è stato terminato in modo imprevisto. Esaminare lo stack di chiamate in alto, se disponibile, per ottenere altre informazioni sull'origine dell'eccezione.
+Test in esecuzione quando si è verificato l'arresto anomalo: 
+{0}
+Il test potrebbe essere l'origine dell'arresto anomalo.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">La variabile di ambiente PROCDUMP_PATH richiesta è Null o vuota. Impostare PROCDUMP_PATH sul percorso della cartella che contiene il file eseguibile appropriato di procdump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">La raccolta del dump è stata abilitata ma non è stato generato alcun file di dump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">La chiave specificata {0} del parametro di Blame non è valida e verrà ignorata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">La chiave del parametro di errore {0}, ha un valore non corretto: {1}. I valori supportati sono: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Non è stato possibile avviare il dump del processo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump è stato abilitato ma non è stato generato alcun file di dump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Il tempo di inattività specificato di {0} {1} è scaduto. Verranno raccolti i dump in sospeso da testhost e dai relativi processi figlio</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Il valore '{0}', specificato come timeout, è imprevisto. Specificare un valore in questo formato: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">L'esecuzione di tutti i test è stata completata. Il file di sequenza non verrà generato</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Dump di {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Dump di questo albero processi (dal basso)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">minuti</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">secondi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} non è stato trovato, verificare che il file eseguibile sia disponibile in PATH. In alternativa, impostare la variabile di ambiente PROCDUMP_PATH su una directory che contiene {0} eseguibile</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Il valore di 'DumpDirectoryPath' non è valido per il monitoraggio del debugger effettuato dopo che l'applicazione è terminata.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf
index 689a680dc8..6342208092 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ja.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">ホスト プロセスが予期せずに終了したため、アクティブなテストの実行が中止されました。(使用可能な場合) 上記の呼び出し履歴を調べて、例外の発生元に関する詳細情報を取得してください。
-クラッシュの発生時に実行中だったテスト: 
-{0}
-このテストは、必ずしもクラッシュの原因ではない場合もあります。</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">必須の環境変数 PROCDUMP_PATH は Null または空でした。PROCDUMP_PATH を、適切な procdump 実行可能ファイルを含むフォルダーのパスに設定してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">ダンプの収集は有効化されましたが、ダンプ ファイルは生成されませんでした。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">指定された blame パラメーター キー {0} は無効です。このキーは無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">blame パラメーター キー {0} は値 {1}/{2} のみをサポートします。このキーは無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">プロセス ダンプを開始できませんでした: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump は有効になりましたが、ダンプ ファイルは生成されませんでした。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">指定された非アイドル時間 {0} {1} が経過しました。testhost およびその子プロセスからのハング ダンプを収集しています</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">予期しない値 '{0}' がタイムアウトとして指定されました。次の形式で値を指定してください: 1.5h、90m、5400s、5400000ms、5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">すべてのテストの実行が完了しました。Sequence ファイルは生成されません</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">{0} - {1} をダンプしています</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">このプロセス ツリーをダンプしています (下から)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">分</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">秒</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">ホスト プロセスが予期せずに終了したため、アクティブなテストの実行が中止されました。(使用可能な場合) 上記の呼び出し履歴を調べて、例外の発生元に関する詳細情報を取得してください。
+クラッシュの発生時に実行中だったテスト: 
+{0}
+このテストは、必ずしもクラッシュの原因ではない場合もあります。</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">必須の環境変数 PROCDUMP_PATH は Null または空でした。PROCDUMP_PATH を、適切な procdump 実行可能ファイルを含むフォルダーのパスに設定してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">ダンプの収集は有効化されましたが、ダンプ ファイルは生成されませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">指定された blame パラメーター キー {0} は無効です。このキーは無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">blame パラメーター キー {0} に正しくない値が含まれています: {1}。サポートされている値: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">プロセス ダンプを開始できませんでした: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump は有効になりましたが、ダンプ ファイルは生成されませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">指定された非アイドル時間 {0} {1} が経過しました。testhost およびその子プロセスからのハング ダンプを収集しています</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">予期しない値 '{0}' がタイムアウトとして指定されました。次の形式で値を指定してください: 1.5h、90m、5400s、5400000ms、5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">すべてのテストの実行が完了しました。Sequence ファイルは生成されません</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">{0} - {1} をダンプしています</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">このプロセス ツリーをダンプしています (下から)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">分</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} が見つかりませんでした。PATH で実行可能ファイルを使用できることを確認してください。または、PROCDUMP_PATH 環境変数を、実行可能ファイル {0} が含まれるディレクトリに設定してください</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">事後デバッガー モニターの 'DumpDirectoryPath' が無効です</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf
index 87b9f0865f..17e587362a 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ko.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">호스트 프로세스가 예기치 않게 종료되어 활성 테스트 실행이 중단되었습니다. 사용 가능한 경우 예외가 발생한 위치에 대한 자세한 정보를 보려면 위의 호출 스택을 검사하세요.
-크래시가 발생했을 때 실행 중이었던 테스트: 
-{0}
-이 테스트는 크래시의 원인이거나 원인이 아닐 수 있습니다.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">필요한 환경 변수 PROCDUMP_PATH가 null이거나 비어 있습니다. 적절한 procdump 실행 파일이 포함된 폴더의 경로에 PROCDUMP_PATH를 설정하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">덤프 수집이 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">지정된 blame 매개 변수 키 {0}이(가) 잘못되었습니다. 이 키를 무시합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">blame 매개 변수 키 {0}은(는) {1}/{2} 값만 지원할 수 있습니다. 이 키를 무시합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">프로세스 덤프를 시작할 수 없음: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump가 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">지정한 비활성 시간({0}{1})이 경과되었습니다. Testhost 및 해당 자식 프로세스에서 중단 덤프를 수집하는 중</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">예기치 않은 값 '{0}'이(가) 시간 제한으로 제공되었습니다. 1.5h/90m/5400s/5400000ms/5400000 형식으로 값을 제공하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">모든 테스트 실행이 완료되었지만, 시퀀스 파일이 생성되지 않습니다.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">덤프 {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">이 프로세스 트리 덤핑(아래쪽에서)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">분</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">초</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">호스트 프로세스가 예기치 않게 종료되어 활성 테스트 실행이 중단되었습니다. 사용 가능한 경우 예외가 발생한 위치에 대한 자세한 정보를 보려면 위의 호출 스택을 검사하세요.
+크래시가 발생했을 때 실행 중이었던 테스트: 
+{0}
+이 테스트는 크래시의 원인이거나 원인이 아닐 수 있습니다.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">필요한 환경 변수 PROCDUMP_PATH가 null이거나 비어 있습니다. 적절한 procdump 실행 파일이 포함된 폴더의 경로에 PROCDUMP_PATH를 설정하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">덤프 수집이 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">지정된 blame 매개 변수 키 {0}이(가) 잘못되었습니다. 이 키를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">원인 매개 변수 키 {0}에 잘못된 값 {1}이(가) 있습니다. 지원되는 값은 {2}입니다.</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">프로세스 덤프를 시작할 수 없음: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump가 사용하도록 설정되었지만 덤프 파일이 생성되지 않았습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">지정한 비활성 시간({0}{1})이 경과되었습니다. Testhost 및 해당 자식 프로세스에서 중단 덤프를 수집하는 중</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">예기치 않은 값 '{0}'이(가) 시간 제한으로 제공되었습니다. 1.5h/90m/5400s/5400000ms/5400000 형식으로 값을 제공하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">모든 테스트 실행이 완료되었지만, 시퀀스 파일이 생성되지 않습니다.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">덤프 {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">이 프로세스 트리 덤핑(아래쪽에서)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">분</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">초</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0}을(를) 찾을 수 없습니다. 실행 파일을 PATH에서 사용할 수 있는지 확인합니다. 또는 PROCDUMP_PATH 환경 변수를 {0} 실행 파일이 포함된 디렉터리로 설정하세요.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">사후 디버거 모니터에 대한 잘못된 'DumpDirectoryPath'</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf
index b8e229978d..bc99526529 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pl.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">Aktywny przebieg testu został przerwany, ponieważ proces hosta nieoczekiwanie zakończył działanie. Sprawdź powyższy stos wywołań, jeśli jest dostępny, aby uzyskać więcej informacji na temat miejsca, z którego pochodzi wyjątek.
-Test uruchomiony w momencie wystąpienia awarii: 
-{0}
-Ten test może, ale nie musi być źródłem awarii.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">Wymagana zmienna środowiskowa PROCDUMP_PATH miała wartość null lub była pusta. Ustaw zmienną PROCDUMP_PATH na ścieżkę lub folder zawierające odpowiedni plik wykonywalny procdump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">Zbieranie zrzutów zostało włączone, ale nie wygenerowano żadnego pliku zrzutu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">Podany klucz parametru blame {0} nie jest prawidłowy. Ten klucz jest ignorowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">Klucz parametru blame {0} może obsługiwać tylko wartości {1}/{2}. Ten klucz jest ignorowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Nie można rozpocząć zrzutu procesu: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">Opcja CollectDump została włączona, ale nie wygenerowano pliku zrzutu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Upłynął czas nieaktywności {0} {1}. Zbieranie zrzutów podczas zawieszenia z procesu testhost i jego procesów podrzędnych</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Podano nieoczekiwaną wartość „{0}” jako limit czasu. Podaj wartość w następującym formacie: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Wszystkie testy zakończyły działanie, plik sekwencji nie zostanie wygenerowany</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Tworzenie zrzutu: {0} — {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Tworzenie zrzutu tego drzewa procesów (od dołu)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">min</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">s</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">Aktywny przebieg testu został przerwany, ponieważ proces hosta nieoczekiwanie zakończył działanie. Sprawdź powyższy stos wywołań, jeśli jest dostępny, aby uzyskać więcej informacji na temat miejsca, z którego pochodzi wyjątek.
+Test uruchomiony w momencie wystąpienia awarii: 
+{0}
+Ten test może, ale nie musi być źródłem awarii.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">Wymagana zmienna środowiskowa PROCDUMP_PATH miała wartość null lub była pusta. Ustaw zmienną PROCDUMP_PATH na ścieżkę lub folder zawierające odpowiedni plik wykonywalny procdump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">Zbieranie zrzutów zostało włączone, ale nie wygenerowano żadnego pliku zrzutu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">Podany klucz parametru blame {0} nie jest prawidłowy. Ten klucz jest ignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">Klucz parametru blame {0} ma niepoprawną wartość: {1}. Obsługiwane wartości to: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Nie można rozpocząć zrzutu procesu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">Opcja CollectDump została włączona, ale nie wygenerowano pliku zrzutu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Upłynął czas nieaktywności {0} {1}. Zbieranie zrzutów podczas zawieszenia z procesu testhost i jego procesów podrzędnych</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Podano nieoczekiwaną wartość „{0}” jako limit czasu. Podaj wartość w następującym formacie: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Wszystkie testy zakończyły działanie, plik sekwencji nie zostanie wygenerowany</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Tworzenie zrzutu: {0} — {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Tworzenie zrzutu tego drzewa procesów (od dołu)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">min</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">s</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">Nie można odnaleźć pliku wykonywalnego {0}. Upewnij się, że plik wykonywalny jest dostępny w ścieżce PATH. Możesz też ustawić zmienną środowiskową PROCDUMP_PATH na katalog zawierający plik wykonywalny {0}.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Nieprawidłowy element „DumpDirectoryPath” dla monitora debugera postmortem</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf
index 183db0826f..5b39153cf7 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.pt-BR.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">A Execução de Teste ativa foi anulada porque o processo do host foi encerrado inesperadamente. Inspecione a pilha de chamadas acima, caso ela esteja disponível, para obter mais informações sobre a origem da exceção.
-O teste em execução quando a falha ocorreu: 
-{0}
-Esse teste pode ser a origem da falha ou não.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">A variável de ambiente obrigatória PROCDUMP_PATH era nula ou estava vazia. Defina PROCDUMP_PATH para o caminho da pasta que contém o executável procdump apropriado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">A coleta de despejo estava habilitada, mas não foi gerado nenhum arquivo de despejo.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">A chave de parâmetro de blame especificada {0} é inválida. Ignorando esta chave.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">A chave de parâmetro de blame {0} oferece suporte apenas aos valores {1}/{2}. Ignorando esta chave.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Não foi possível iniciar o processo de despejo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump foi habilitado, mas o arquivo de despejo não foi gerado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">O tempo de inatividade especificado de {0} {1} foi decorrido. Coletando os despejos do travamento do testhost e dos processos filho</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Valor inesperado '{0}' fornecido como tempo limite. Forneça um valor neste formato: 1.5h/90m/5400s/5400000ms/5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">A execução de todos os testes foi concluída. O arquivo de sequência não será gerado.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Despejando {0} – {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Despejando esta árvore de processos (da parte inferior)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">minutos</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">segundos</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">A Execução de Teste ativa foi anulada porque o processo do host foi encerrado inesperadamente. Inspecione a pilha de chamadas acima, caso ela esteja disponível, para obter mais informações sobre a origem da exceção.
+O teste em execução quando a falha ocorreu: 
+{0}
+Esse teste pode ser a origem da falha ou não.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">A variável de ambiente obrigatória PROCDUMP_PATH era nula ou estava vazia. Defina PROCDUMP_PATH para o caminho da pasta que contém o executável procdump apropriado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">A coleta de despejo estava habilitada, mas não foi gerado nenhum arquivo de despejo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">A chave de parâmetro de blame especificada {0} é inválida. Ignorando esta chave.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">A chave de parâmetro {0}, tem um valor incorreto: {1}. Os valores com suporte são: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Não foi possível iniciar o processo de despejo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump foi habilitado, mas o arquivo de despejo não foi gerado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">O tempo de inatividade especificado de {0} {1} foi decorrido. Coletando os despejos do travamento do testhost e dos processos filho</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Valor inesperado '{0}' fornecido como tempo limite. Forneça um valor neste formato: 1.5h/90m/5400s/5400000ms/5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">A execução de todos os testes foi concluída. O arquivo de sequência não será gerado.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Despejando {0} – {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Despejando esta árvore de processos (da parte inferior)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">minutos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">segundos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} não pôde ser encontrado, verifique se o executável está disponível no CAMINHO. Alternativamente, defina a variável de ambiente PROCDUMP_PATH para um diretório que contenha o executável {0}</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">'DumpDirectoryPath' inválido para o monitor do depurador postmortem</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf
index 174393655e..fc5cb4b297 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.ru.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">Активный тестовый запуск был прерван из-за непредвиденного завершения хост-процесса. Просмотрите стек вызовов выше (если он доступен), чтобы получить дополнительные сведения об источнике исключения.
-Тест, который выполнялся в момент возникновения сбоя: 
-{0}
-Этот тест может являться источником сбоя.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">Требуемая переменная среды PROCDUMP_PATH была пустой или имела значение NULL. Задайте для PROCDUMP_PATH путь к папке, содержащей нужный исполняемый файл procdump.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">Сбор дампа включен, но файл дампа не создан.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">Указанный ключ {0} параметра Blame недопустим. Он будет пропущен.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">Ключ {0} параметра Blame поддерживает только значения {1}/{2}. Он будет пропущен.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">Не удалось запустить дамп процесса: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">Параметр CollectDump включен, но файл дампа не был создан.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Указанное время неактивности {0} {1} истекло. Сбор дампов зависаний из тестового узла и его дочерних процессов.</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">В качестве времени ожидания указано непредвиденное значение "{0}". Укажите значение в следующем формате: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Все тесты завершены, файл последовательности не будет создан.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">Создание дампа {0} — {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Создание дампа для этого дерева процессов (из нижней части)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">мин</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">с</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">Активный тестовый запуск был прерван из-за непредвиденного завершения хост-процесса. Просмотрите стек вызовов выше (если он доступен), чтобы получить дополнительные сведения об источнике исключения.
+Тест, который выполнялся в момент возникновения сбоя: 
+{0}
+Этот тест может являться источником сбоя.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">Требуемая переменная среды PROCDUMP_PATH была пустой или имела значение NULL. Задайте для PROCDUMP_PATH путь к папке, содержащей нужный исполняемый файл procdump.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">Сбор дампа включен, но файл дампа не создан.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">Указанный ключ {0} параметра Blame недопустим. Он будет пропущен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">Ключ параметра вины {0} имеет неверное значение{1}: . Поддерживаемые значения:{2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">Не удалось запустить дамп процесса: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">Параметр CollectDump включен, но файл дампа не был создан.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Указанное время неактивности {0} {1} истекло. Сбор дампов зависаний из тестового узла и его дочерних процессов.</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">В качестве времени ожидания указано непредвиденное значение "{0}". Укажите значение в следующем формате: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Все тесты завершены, файл последовательности не будет создан.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">Создание дампа {0} — {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Создание дампа для этого дерева процессов (из нижней части)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">мин</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">с</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">Не удалось найти {0}. Убедитесь, что исполняемый файл доступен в PATH. Также можно настроить переменную среды PROCDUMP_PATH, указав каталог, содержащий исполняемый файл {0}.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Недопустимый DumpDirectoryPath для монитора отладчика с разбором итогов</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf
index 96e906da89..1ef6ca4a85 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.tr.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">Konak işleminden beklenmedik şekilde çıkış yapıldığından etkin Test Çalıştırması durduruldu. Özel durumun kaynağı hakkında daha fazla bilgi almak için varsa yukarıdan çağrı yığınını inceleyin.
-Kilitlenme oluştuğunda çalışan test: 
-{0}
-Bu test, kilitlenmenin kaynağı olmayabilir veya olmayabilir.</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">Gerekli ortam değişkeni PROCDUMP_PATH null veya boştu. PROCDUMP_PATH değişkenini uygun yürütülebilir procdump içeren klasörün yoluna ayarlayın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">Döküm toplama etkindi, ancak hiçbir döküm dosyası oluşturulmamıştı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">Belirtilen blame parametresi anahtarı {0} geçerli değil. Bu anahtar yoksayılıyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">Belirtilen blame parametresi anahtarı {0} yalnızca {1}/{2} değerlerini destekleyebilir. Bu anahtar yoksayılıyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">İşlem dökümü başlatılamadı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump etkindi, ancak döküm dosyası oluşturulmamıştı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">Belirtilen {0} {1} etkinlik dışı kalma süresi geçti. Testhost ve alt işlemlerinden askı dökümleri toplanıyor</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">Zaman aşımı olarak beklenmeyen '{0}' değeri sağlandı. Lütfen şu biçimde bir değer girin: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">Tüm testlerin çalışması tamamlandı. Dizi dosyası oluşturulmayacak.</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">{0} - {1} dökümü oluşturuluyor</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">Bu işlem ağacının dökümü alınıyor (alttan)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">dakika</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">saniye</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">Konak işleminden beklenmedik şekilde çıkış yapıldığından etkin Test Çalıştırması durduruldu. Özel durumun kaynağı hakkında daha fazla bilgi almak için varsa yukarıdan çağrı yığınını inceleyin.
+Kilitlenme oluştuğunda çalışan test: 
+{0}
+Bu test, kilitlenmenin kaynağı olmayabilir veya olmayabilir.</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">Gerekli ortam değişkeni PROCDUMP_PATH null veya boştu. PROCDUMP_PATH değişkenini uygun yürütülebilir procdump içeren klasörün yoluna ayarlayın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">Döküm toplama etkindi, ancak hiçbir döküm dosyası oluşturulmamıştı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">Belirtilen blame parametresi anahtarı {0} geçerli değil. Bu anahtar yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">{0} blame parametresi anahtarı geçersiz değer içeriyor: {1}. Desteklenen değerler şunlardır: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">İşlem dökümü başlatılamadı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump etkindi, ancak döküm dosyası oluşturulmamıştı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">Belirtilen {0} {1} etkinlik dışı kalma süresi geçti. Testhost ve alt işlemlerinden askı dökümleri toplanıyor</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">Zaman aşımı olarak beklenmeyen '{0}' değeri sağlandı. Lütfen şu biçimde bir değer girin: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">Tüm testlerin çalışması tamamlandı. Dizi dosyası oluşturulmayacak.</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">{0} - {1} dökümü oluşturuluyor</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">Bu işlem ağacının dökümü alınıyor (alttan)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">dakika</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">saniye</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">{0} bulunamadı, lütfen yürütülebilir dosyanın PATH üzerinde kullanılabilir olduğundan emin olun veya PROCDUMP_PATH ortam değişkenini {0} yürütülebilir dosyasını içeren bir dizine ayarlayın.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">Postmortem hata ayıklayıcısı izleyicisi için geçersiz 'DumpDirectoryPath'</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf
index 9667764550..2a7008810c 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.xlf
@@ -4,7 +4,7 @@
     <body>
       <trans-unit id="AbortedTestRun">
         <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
+The test running when the crash occurred:
 {0}
 This test may, or may not be the source of the crash.</source>
         <target state="new">The active Test Run was aborted because the host process exited unexpectedly while executing test </target>
@@ -13,32 +13,32 @@ This test may, or may not be the source of the crash.</source>
       <trans-unit id="ProcDumpEnvVarEmpty">
         <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
         <target state="new">Required environment variable PROCDUMP_PATH was null or empty.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DumpFileNotGeneratedErrorMessage">
         <source>Collect dump was enabled but no dump file was generated.</source>
         <target state="new">Collect dump was enabled but no dump file was generated.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BlameParameterKeyIncorrect">
         <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
         <target state="new">The blame parameter key {0} is not valid. Ignoring this parameter.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
         <target state="new">The blame parameter key  {0} can only support values {1}/{2}. Ignoring this parameter.</target>
-        <note></note>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
       </trans-unit>
       <trans-unit id="ProcDumpCouldNotStart">
         <source>Could not start process dump: {0}</source>
         <target state="new">Could not start process dump: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ProcDumpNotGenerated">
         <source>CollectDump was enabled but dump file was not generated.</source>
         <target state="new">CollectDump was enabled but dump file was not generated.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InactivityTimeout">
         <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
@@ -48,7 +48,7 @@ This test may, or may not be the source of the crash.</source>
       <trans-unit id="UnexpectedValueForInactivityTimespanValue">
         <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
         <target state="new">Unexpected value {0} provided for ExpectedExecutionTimeOfLongestRunningTestInMinutes. Please provide a positive integer as input.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NotGeneratingSequenceFile">
         <source>All tests finished running, Sequence file will not be generated</source>
@@ -63,18 +63,28 @@ This test may, or may not be the source of the crash.</source>
       <trans-unit id="DumpingTree">
         <source>Dumping this process tree (from bottom)</source>
         <target state="new">Dumping this process tree (from bottom)</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Minutes">
         <source>minutes</source>
         <target state="new">minutes</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Seconds">
         <source>seconds</source>
         <target state="new">seconds</target>
-        <note></note>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="new">{0} could not be found, please make sure that the executable is available on PATH, or set PROCDUMP_PATH environment variable to a directory that contains {0} executable.</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="new">Invalid 'DumpDirectoryPath' for postmortem debugger monitor</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf
index c3ea2af6ad..38702a9594 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">活动的测试运行已中止，因为主机进程意外退出。请检查上面的调用堆栈(如果有)，以获取有关异常来源的详细信息。
-发生崩溃时运行的测试: 
-{0}
-此测试可能是(也可能不是)崩溃的来源。</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">所需环境变量 PROCDUMP_PATH 为空。请将 PROCDUMP_PATH 设为包含适当的可执行进程转储的文件夹路径。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">收集转储已启用，但是未生成转储文件。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">指定的追责参数键 {0} 无效。忽略此键。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">追责参数键 {0} 只支持值 {1}/{2}。忽略此键。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">无法启动进程转储: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump 已启用，但是未生成转储文件。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">指定的非活动时间({0} {1})已过。正在从测试主机及其子进程中收集挂起的转储</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">提供了意外的值“{0}”作为超时。请按以下格式提供值: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">所有测试都已运行完毕，将不生成序列文件</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">正在转储 {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">正在转储此进程树(从底部)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">分钟</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">秒</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">活动的测试运行已中止，因为主机进程意外退出。请检查上面的调用堆栈(如果有)，以获取有关异常来源的详细信息。
+发生崩溃时运行的测试: 
+{0}
+此测试可能是(也可能不是)崩溃的来源。</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">所需环境变量 PROCDUMP_PATH 为空。请将 PROCDUMP_PATH 设为包含适当的可执行进程转储的文件夹路径。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">收集转储已启用，但是未生成转储文件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">指定的追责参数键 {0} 无效。忽略此键。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">追责参数键 {0} 值不正确: {1}。支持的值为: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">无法启动进程转储: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump 已启用，但是未生成转储文件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">指定的非活动时间({0} {1})已过。正在从测试主机及其子进程中收集挂起的转储</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">提供了意外的值“{0}”作为超时。请按以下格式提供值: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">所有测试都已运行完毕，将不生成序列文件</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">正在转储 {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">正在转储此进程树(从底部)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">分钟</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">找不到 {0}，请确保可执行文件在路径上可用，或者将 PROCDUMP_PATH 环境变量设置为包含 {0} 可执行文件的目录。</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">事后分析调试程序监视器的 “DumpDirectoryPath” 无效</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf
index 491532f393..d28661032e 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,83 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="AbortedTestRun">
-        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
-The test running when the crash occurred: 
-{0}
-This test may, or may not be the source of the crash.</source>
-        <target state="translated">因為主機處理序在未預期的狀況下結束，所以已中止使用中的測試回合。請檢查上方的呼叫堆疊 (若有的話)，以取得例外狀況來源的詳細資訊。
-發生損毀時正在執行的測試: 
-{0}
-此測試可能是或不是損毀的來源。</target>
-        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
-      </trans-unit>
-      <trans-unit id="ProcDumpEnvVarEmpty">
-        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
-        <target state="translated">必要的環境變數 PROCDUMP_PATH 為 null 或是空的。請將 PROCDUMP_PATH 設定為包含適當之 procdump 可執行檔之資料夾的路徑。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DumpFileNotGeneratedErrorMessage">
-        <source>Collect dump was enabled but no dump file was generated.</source>
-        <target state="translated">已啟用了收集傾印，但未產生任何傾印檔。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterKeyIncorrect">
-        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
-        <target state="translated">指定的 blame 參數索引鍵 {0} 無效。即將忽略此索引鍵。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameParameterValueIncorrect">
-        <source>The blame parameter key  {0} can only support values {1}/{2}. Ignoring this key.</source>
-        <target state="translated">blame 參數索引鍵 {0} 僅支援值 {1}/{2}。即將忽略此索引鍵。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpCouldNotStart">
-        <source>Could not start process dump: {0}</source>
-        <target state="translated">無法啟動處理序傾印: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProcDumpNotGenerated">
-        <source>CollectDump was enabled but dump file was not generated.</source>
-        <target state="translated">CollectDump 已啟用，但未產生傾印檔案。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InactivityTimeout">
-        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
-        <target state="translated">指定的非使用狀態時間已經過 {0} {1}。正在從 testhost 及其子處理序收集停止回應的傾印</target>
-        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
-      </trans-unit>
-      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
-        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
-        <target state="translated">提供了非預期的值 '{0}' 作為逾時。請提供以下格式的值: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotGeneratingSequenceFile">
-        <source>All tests finished running, Sequence file will not be generated</source>
-        <target state="translated">所有測試皆已執行完成，將不會產生 Sequence 檔案</target>
-        <note>"Sequence" is the name of the file.</note>
-      </trans-unit>
-      <trans-unit id="Dumping">
-        <source>Dumping {0} - {1}</source>
-        <target state="translated">正在傾印 {0} - {1}</target>
-        <note>as in creating a process dump, {0} process id, {1} process name</note>
-      </trans-unit>
-      <trans-unit id="DumpingTree">
-        <source>Dumping this process tree (from bottom)</source>
-        <target state="translated">正在傾印此處理序樹狀結構 (從底部)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>minutes</source>
-        <target state="translated">分鐘</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>seconds</source>
-        <target state="translated">秒</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="AbortedTestRun">
+        <source>The active Test Run was aborted because the host process exited unexpectedly. Please inspect the call stack above, if available, to get more information about where the exception originated from.
+The test running when the crash occurred: 
+{0}
+This test may, or may not be the source of the crash.</source>
+        <target state="translated">因為主機處理序在未預期的狀況下結束，所以已中止使用中的測試回合。請檢查上方的呼叫堆疊 (若有的話)，以取得例外狀況來源的詳細資訊。
+發生損毀時正在執行的測試: 
+{0}
+此測試可能是或不是損毀的來源。</target>
+        <note>{0} is a single test (or in rare cases multiple tests) that were running when test host crashed.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpEnvVarEmpty">
+        <source>Required environment variable PROCDUMP_PATH was null or empty. Set PROCDUMP_PATH to path of folder containing appropriate procdump executable.</source>
+        <target state="translated">必要的環境變數 PROCDUMP_PATH 為 null 或是空的。請將 PROCDUMP_PATH 設定為包含適當之 procdump 可執行檔之資料夾的路徑。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DumpFileNotGeneratedErrorMessage">
+        <source>Collect dump was enabled but no dump file was generated.</source>
+        <target state="translated">已啟用了收集傾印，但未產生任何傾印檔。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterKeyIncorrect">
+        <source>The blame parameter key specified {0} is not valid. Ignoring this key.</source>
+        <target state="translated">指定的 blame 參數索引鍵 {0} 無效。即將忽略此索引鍵。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameParameterValueIncorrect">
+        <source>The blame parameter key {0}, has incorrect value: {1}. Supported values are: {2}</source>
+        <target state="translated">blame 參數金鑰 {0} 的值不正確: {1}。支援的值為: {2}</target>
+        <note>{0} and {1} are single values referring to parameters such as BlameHang and Full. {2} is comma separated list of valid values, e.g. Full, Mini, None.</note>
+      </trans-unit>
+      <trans-unit id="ProcDumpCouldNotStart">
+        <source>Could not start process dump: {0}</source>
+        <target state="translated">無法啟動處理序傾印: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotGenerated">
+        <source>CollectDump was enabled but dump file was not generated.</source>
+        <target state="translated">CollectDump 已啟用，但未產生傾印檔案。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InactivityTimeout">
+        <source>The specified inactivity time of {0} {1} has elapsed. Collecting hang dumps from testhost and its child processes</source>
+        <target state="translated">指定的非使用狀態時間已經過 {0} {1}。正在從 testhost 及其子處理序收集停止回應的傾印</target>
+        <note>{0} value, {1} one of the unit strings below, Minutes/Seconds</note>
+      </trans-unit>
+      <trans-unit id="UnexpectedValueForInactivityTimespanValue">
+        <source>Unexpected value '{0}' provided as timeout. Please provide a value in this format: 1.5h / 90m / 5400s / 5400000ms / 5400000</source>
+        <target state="translated">提供了非預期的值 '{0}' 作為逾時。請提供以下格式的值: 1.5h / 90m / 5400s / 5400000ms / 5400000</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotGeneratingSequenceFile">
+        <source>All tests finished running, Sequence file will not be generated</source>
+        <target state="translated">所有測試皆已執行完成，將不會產生 Sequence 檔案</target>
+        <note>"Sequence" is the name of the file. No . at the end, because this is a blame message and the . will be added automatically.</note>
+      </trans-unit>
+      <trans-unit id="Dumping">
+        <source>Dumping {0} - {1}</source>
+        <target state="translated">正在傾印 {0} - {1}</target>
+        <note>as in creating a process dump, {0} process id, {1} process name</note>
+      </trans-unit>
+      <trans-unit id="DumpingTree">
+        <source>Dumping this process tree (from bottom)</source>
+        <target state="translated">正在傾印此處理序樹狀結構 (從底部)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>minutes</source>
+        <target state="translated">分鐘</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpNotFound">
+        <source>{0} could not be found, please make sure that the executable is available on PATH. Alternatively set PROCDUMP_PATH environment variable to a directory that contains {0} executable</source>
+        <target state="translated">找不到{0}，請確定可執行檔可在 PATH 上使用。或將 PROCDUMP_PATH 環境變數設定為包含 {0} 可執行檔的目錄。</target>
+        <note>0 is procDumpPath, a name of procdump executable such as procdump64.exe, 0 is used twice on purpose. PROCDUMP_PATH and PATH are literal and should not be localized.</note>
+      </trans-unit>
+      <trans-unit id="MonitorPostmortemDebuggerInvalidDumpDirectoryPathParameter">
+        <source>Invalid 'DumpDirectoryPath' for postmortem debugger monitor</source>
+        <target state="translated">事後剖析偵錯工具監視的 'DumpDirectoryPath' 無效</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/SigtrapDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/SigtrapDumper.cs
index 2c2bbfc17c..567a8f933c 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/SigtrapDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/SigtrapDumper.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System.Diagnostics;
+using System.Diagnostics;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    internal class SigtrapDumper : IHangDumper
+internal class SigtrapDumper : IHangDumper
+{
+    public void Dump(int processId, string outputDirectory, DumpTypeOption type)
     {
-        public void Dump(int processId, string outputDirectory, DumpTypeOption type)
-        {
-            Process.Start("kill", $"-s SIGTRAP {processId}");
-        }
+        Process.Start("kill", $"-s SIGTRAP {processId}");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Win32NamedEvent.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Win32NamedEvent.cs
index 9afdd0ef08..99e8eb9146 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Win32NamedEvent.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Win32NamedEvent.cs
@@ -1,47 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+public class Win32NamedEvent
 {
-    using System;
-    using System.Runtime.InteropServices;
+    private const uint EventModifyState = 0x0002;
+
+    private readonly string _eventName;
 
-    public class Win32NamedEvent
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Win32NamedEvent"/> class.
+    /// Create a NamedEvent object with the name of the event, and assume auto reset with
+    /// an initial state of reset.
+    /// </summary>
+    /// <param name="eventName">The name of the win32 event</param>
+    public Win32NamedEvent(string eventName)
     {
-        private const uint EventModifyState = 0x0002;
-
-        private string eventName;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Win32NamedEvent"/> class.
-        /// Create a NamedEvent object with the name of the event, and assume auto reset with
-        /// an initial state of reset.
-        /// </summary>
-        /// <param name="eventName">The name of the win32 event</param>
-        public Win32NamedEvent(string eventName)
-        {
-            this.eventName = eventName;
-        }
-
-        /// <summary>
-        /// Set the named event to a signaled state. The Wait() method will not block any
-        /// thread as long as the event is in a signaled state.
-        /// </summary>
-        public void Set()
-        {
-            IntPtr handle = OpenEvent(Win32NamedEvent.EventModifyState, false, this.eventName);
-            SetEvent(handle);
-            CloseHandle(handle);
-        }
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool CloseHandle(IntPtr hObject);
-
-        [DllImport("kernel32.dll")]
-        private static extern bool SetEvent(IntPtr hEvent);
-
-        [DllImport("Kernel32.dll", SetLastError = true)]
-        private static extern IntPtr OpenEvent(uint dwDesiredAccess, bool bInheritHandle, string lpName);
+        _eventName = eventName;
     }
+
+    /// <summary>
+    /// Set the named event to a signaled state. The Wait() method will not block any
+    /// thread as long as the event is in a signaled state.
+    /// </summary>
+    public void Set()
+    {
+        IntPtr handle = OpenEvent(EventModifyState, false, _eventName);
+        SetEvent(handle);
+        CloseHandle(handle);
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool CloseHandle(IntPtr hObject);
+
+    [DllImport("kernel32.dll")]
+    private static extern bool SetEvent(IntPtr hEvent);
+
+    [DllImport("Kernel32.dll", SetLastError = true)]
+    private static extern IntPtr OpenEvent(uint dwDesiredAccess, bool bInheritHandle, string lpName);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs
index d06b1e6ed9..c5783adc54 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/WindowsHangDumper.cs
@@ -1,282 +1,178 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
+
+internal class WindowsHangDumper : IHangDumper
 {
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.Win32.SafeHandles;
+    private readonly Action<string> _logWarning;
+    private readonly IProcessHelper _processHelper;
 
-    internal class WindowsHangDumper : IHangDumper
+    public WindowsHangDumper(IProcessHelper processHelper, Action<string>? logWarning)
     {
-        private Action<string> logWarning;
+        _logWarning = logWarning ?? (_ => { });
+        _processHelper = processHelper;
+    }
 
-        public WindowsHangDumper(Action<string> logWarning)
-        {
-            this.logWarning = logWarning ?? (_ => { });
-        }
+    private static Action<object?, string?> OutputReceivedCallback => (process, data) =>
+        // useful for visibility when debugging this tool
+        // Console.ForegroundColor = ConsoleColor.Cyan;
+        // Console.WriteLine(data);
+        // Console.ForegroundColor = ConsoleColor.White;
+        // Log all standard output message of procdump in diag files.
+        // Otherwise they end up coming on console in pipleine.
+        EqtTrace.Info($"ProcDumpDumper.OutputReceivedCallback: Output received from procdump process: {data ?? "<null>"}");
 
-        private static Action<object, string> OutputReceivedCallback => (process, data) =>
-        {
-            // useful for visibility when debugging this tool
-            // Console.ForegroundColor = ConsoleColor.Cyan;
-            // Console.WriteLine(data);
-            // Console.ForegroundColor = ConsoleColor.White;
-            // Log all standard output message of procdump in diag files.
-            // Otherwise they end up coming on console in pipleine.
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("ProcDumpDumper.OutputReceivedCallback: Output received from procdump process: " + data);
-            }
-        };
+    public void Dump(int processId, string outputDirectory, DumpTypeOption type)
+    {
+        var process = Process.GetProcessById(processId);
+        var processTree = process.GetProcessTree().Where(p => p.Process?.ProcessName is not null and not "conhost" and not "WerFault").ToList();
 
-        public void Dump(int processId, string outputDirectory, DumpTypeOption type)
+        if (processTree.Count > 1)
         {
-            var process = Process.GetProcessById(processId);
-            var processTree = process.GetProcessTree().Where(p => p.Process.ProcessName != "conhost" && p.Process.ProcessName != "WerFault").ToList();
-
-            if (processTree.Count > 1)
+            var tree = processTree.OrderBy(t => t.Level);
+            EqtTrace.Verbose("WindowsHangDumper.Dump: Dumping this process tree (from bottom):");
+            foreach (var p in tree)
             {
-                var tree = processTree.OrderBy(t => t.Level);
-                EqtTrace.Verbose("WindowsHangDumper.Dump: Dumping this process tree (from bottom):");
-                foreach (var p in tree)
-                {
-                    EqtTrace.Verbose($"WindowsHangDumper.Dump: {new string(' ', p.Level)}{(p.Level != 0 ? " +" : " >-")} {p.Process.Id} - {p.Process.ProcessName}");
-                }
-
-                // logging warning separately to avoid interleving the messages in the log which make this tree unreadable
-                this.logWarning(Resources.Resources.DumpingTree);
-                foreach (var p in tree)
-                {
-                    this.logWarning($"{new string(' ', p.Level)}{(p.Level != 0 ? "+-" : ">")} {p.Process.Id} - {p.Process.ProcessName}");
-                }
-            }
-            else
-            {
-                EqtTrace.Verbose($"NetClientHangDumper.Dump: Dumping {process.Id} - {process.ProcessName}.");
-                var message = string.Format(CultureInfo.CurrentUICulture, Resources.Resources.Dumping, process.Id, process.ProcessName);
-                this.logWarning(message);
+                EqtTrace.Verbose($"WindowsHangDumper.Dump: {new string(' ', p.Level)}{(p.Level != 0 ? " +" : " >-")} {p.Process!.Id} - {p.Process.ProcessName}");
             }
 
-            var bottomUpTree = processTree.OrderByDescending(t => t.Level).Select(t => t.Process);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            // logging warning separately to avoid interleving the messages in the log which make this tree unreadable
+            _logWarning(Resources.Resources.DumpingTree);
+            foreach (var p in tree)
             {
-                foreach (var p in bottomUpTree)
-                {
-                    try
-                    {
-                        p.Suspend();
-                    }
-                    catch (Exception ex)
-                    {
-                        EqtTrace.Error($"WindowsHangDumper.Dump: Error suspending process {p.Id} - {p.ProcessName}: {ex}.");
-                    }
-                }
+                _logWarning($"{new string(' ', p.Level)}{(p.Level != 0 ? "+-" : ">")} {p.Process!.Id} - {p.Process.ProcessName}");
             }
+        }
+        else
+        {
+            EqtTrace.Verbose($"NetClientHangDumper.Dump: Dumping {process.Id} - {process.ProcessName}.");
+            var message = string.Format(CultureInfo.CurrentCulture, Resources.Resources.Dumping, process.Id, process.ProcessName);
+            _logWarning(message);
+        }
 
+        var bottomUpTree = processTree.OrderByDescending(t => t.Level).Select(t => t.Process);
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
             foreach (var p in bottomUpTree)
             {
+                TPDebug.Assert(p != null);
                 try
                 {
-                    var outputFile = Path.Combine(outputDirectory, $"{p.ProcessName}_{p.Id}_{DateTime.Now:yyyyMMddTHHmmss}_hangdump.dmp");
-                    CollectDump(p, outputFile, type);
+                    p.Suspend();
                 }
                 catch (Exception ex)
                 {
-                    EqtTrace.Error($"WindowsHangDumper.Dump: Error dumping process {p.Id} - {p.ProcessName}: {ex}.");
-                }
-
-                try
-                {
-                    EqtTrace.Verbose($"WindowsHangDumper.Dump: Killing process {p.Id} - {p.ProcessName}.");
-                    p.Kill();
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error($"WindowsHangDumper.Dump: Error killing process {p.Id} - {p.ProcessName}: {ex}.");
+                    EqtTrace.Error($"WindowsHangDumper.Dump: Error suspending process {p.Id} - {p.ProcessName}: {ex}.");
                 }
             }
         }
 
-        internal static void CollectDump(Process process, string outputFile, DumpTypeOption type)
+        foreach (var p in bottomUpTree)
         {
-            if (process.HasExited)
+            TPDebug.Assert(p != null);
+
+            try
             {
-                EqtTrace.Verbose($"WindowsHangDumper.CollectDump: {process.Id} - {process.ProcessName} already exited, skipping.");
-                return;
+                var outputFile = Path.Combine(outputDirectory, $"{p.ProcessName}_{p.Id}_{DateTime.Now:yyyyMMddTHHmmss}_hangdump.dmp");
+                CollectDump(_processHelper, p, outputFile, type);
+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Error($"WindowsHangDumper.Dump: Error dumping process {p.Id} - {p.ProcessName}: {ex}.");
             }
 
-            EqtTrace.Verbose($"WindowsHangDumper.CollectDump: Selected dump type {type}. Dumping {process.Id} - {process.ProcessName} in {outputFile}. ");
-
-            if (RuntimeInformation.OSArchitecture == System.Runtime.InteropServices.Architecture.X86)
+            try
             {
-                // This is x86 OS, the current process and the target process must be x86. (Or maybe arm64, but let's not worry about that now).
-                // Just dump it using PInvoke.
-                EqtTrace.Verbose($"WindowsHangDumper.CollectDump: We are on x86 Windows, both processes are x86, using PInvoke dumper.");
-                CollectDumpUsingMiniDumpWriteDump(process, outputFile, type);
+                EqtTrace.Verbose($"WindowsHangDumper.Dump: Killing process {p.Id} - {p.ProcessName}.");
+                p.Kill();
             }
-            else if (RuntimeInformation.OSArchitecture == System.Runtime.InteropServices.Architecture.X64)
+            catch (Exception ex)
             {
-                var targetProcessIs64Bit = new NativeMethodsHelper().Is64Bit(process.Handle);
-
-                var currentProcessIs64Bit = RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.X64;
-
-                if (targetProcessIs64Bit && currentProcessIs64Bit)
-                {
-                    // Both processes are x64 architecture, dump it using the PInvoke call.
-                    EqtTrace.Verbose($"WindowsHangDumper.CollectDump: We are on x64 Windows, and both processes are x64, using PInvoke dumper.");
-                    CollectDumpUsingMiniDumpWriteDump(process, outputFile, type);
-                }
-                else if (!targetProcessIs64Bit && !currentProcessIs64Bit)
-                {
-                    // Both processes are x86 architecture, dump it using the PInvoke call.
-                    EqtTrace.Verbose($"WindowsHangDumper.CollectDump: We are on x64 Windows, and both processes are x86, using PInvoke dumper.");
-                    CollectDumpUsingMiniDumpWriteDump(process, outputFile, type);
-                }
-                else
-                {
-                    string dumpMinitoolName;
-                    if (!currentProcessIs64Bit && targetProcessIs64Bit)
-                    {
-                        EqtTrace.Verbose($"WindowsHangDumper.CollectDump: We are on x64 Windows, datacollector is x86, and target process is x64, using 64-bit MiniDumptool.");
-                        dumpMinitoolName = "DumpMinitool.exe";
-                    }
-                    else
-                    {
-                        EqtTrace.Verbose($"WindowsHangDumper.CollectDump: We are on x64 Windows, datacollector is x64, and target process is x86, using 32-bit MiniDumptool.");
-                        dumpMinitoolName = "DumpMinitool.x86.exe";
-                    }
-
-                    var args = $"--file \"{outputFile}\" --processId {process.Id} --dumpType {type}";
-                    var dumpMinitoolPath = Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), dumpMinitoolName);
-                    if (!File.Exists(dumpMinitoolPath))
-                    {
-                        throw new FileNotFoundException("Could not find DumpMinitool", dumpMinitoolPath);
-                    }
-
-                    EqtTrace.Info($"ProcDumpDumper.CollectDump: Running DumpMinitool: '{dumpMinitoolPath} {args}'.");
-                    var dumpMiniTool = new ProcessHelper().LaunchProcess(
-                                dumpMinitoolPath,
-                                args,
-                                Path.GetDirectoryName(outputFile),
-                                null,
-                                null,
-                                null,
-                                OutputReceivedCallback) as Process;
-                    dumpMiniTool.WaitForExit();
-                    EqtTrace.Info($"ProcDumpDumper.CollectDump: {dumpMinitoolName} exited with exitcode: '{dumpMiniTool.ExitCode}'.");
-                }
+                EqtTrace.Error($"WindowsHangDumper.Dump: Error killing process {p.Id} - {p.ProcessName}: {ex}.");
             }
-
-            EqtTrace.Verbose($"WindowsHangDumper.CollectDump: Finished dumping {process.Id} - {process.ProcessName} in {outputFile}. ");
         }
+    }
 
-        private static void CollectDumpUsingMiniDumpWriteDump(Process process, string outputFile, DumpTypeOption type)
+    internal static void CollectDump(IProcessHelper processHelper, Process process, string outputFile, DumpTypeOption type)
+    {
+        if (process.HasExited)
         {
-            // Open the file for writing
-            using (var stream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None))
-            {
-                NativeMethods.MINIDUMP_EXCEPTION_INFORMATION exceptionInfo = default;
+            EqtTrace.Verbose($"WindowsHangDumper.CollectDump: {process.Id} - {process.ProcessName} already exited, skipping.");
+            return;
+        }
 
-                NativeMethods.MINIDUMP_TYPE dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpNormal;
-                switch (type)
-                {
-                    case DumpTypeOption.Full:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemory |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithDataSegs |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithHandleData |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithUnloadedModules |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemoryInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithTokenInformation;
-                        break;
-                    case DumpTypeOption.WithHeap:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithPrivateReadWriteMemory |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithDataSegs |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithHandleData |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithUnloadedModules |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemoryInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo |
-                                   NativeMethods.MINIDUMP_TYPE.MiniDumpWithTokenInformation;
-                        break;
-                    case DumpTypeOption.Mini:
-                        dumpType = NativeMethods.MINIDUMP_TYPE.MiniDumpWithThreadInfo;
-                        break;
-                }
+        EqtTrace.Verbose($"WindowsHangDumper.CollectDump: Selected dump type {type}. Dumping {process.Id} - {process.ProcessName} in {outputFile}. ");
 
-                // Retry the write dump on ERROR_PARTIAL_COPY
-                for (int i = 0; i < 5; i++)
-                {
-                    // Dump the process!
-                    if (NativeMethods.MiniDumpWriteDump(process.Handle, (uint)process.Id, stream.SafeFileHandle, dumpType, ref exceptionInfo, IntPtr.Zero, IntPtr.Zero))
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        int err = Marshal.GetHRForLastWin32Error();
-                        if (err != NativeMethods.ERROR_PARTIAL_COPY)
-                        {
-                            Marshal.ThrowExceptionForHR(err);
-                        }
-                    }
-                }
-            }
-        }
+        var currentProcessArchitecture = processHelper.GetCurrentProcessArchitecture();
+        var targetProcessArchitecture = processHelper.GetProcessArchitecture(process.Id);
 
-        private static class NativeMethods
+        if (currentProcessArchitecture == targetProcessArchitecture)
         {
-            public const int ERROR_PARTIAL_COPY = unchecked((int)0x8007012b);
-
-            [DllImport("Dbghelp.dll", SetLastError = true)]
-            public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint ProcessId, SafeFileHandle hFile, MINIDUMP_TYPE DumpType, ref MINIDUMP_EXCEPTION_INFORMATION ExceptionParam, IntPtr UserStreamParam, IntPtr CallbackParam);
+            EqtTrace.Verbose($"WindowsHangDumper.CollectDump: Both processes are {currentProcessArchitecture}, using PInvoke dumper directly.");
+            MiniDumpWriteDump.CollectDumpUsingMiniDumpWriteDump(process, outputFile, FromDumpType(type));
+        }
+        else
+        {
+            var dumpMinitoolName = targetProcessArchitecture switch
+            {
+                PlatformArchitecture.X86 => "DumpMinitool.x86.exe",
+                PlatformArchitecture.X64 => "DumpMinitool.exe",
+                PlatformArchitecture.ARM64 => "DumpMinitool.arm64.exe",
+                _ => string.Empty
+            };
 
-            [StructLayout(LayoutKind.Sequential, Pack = 4)]
-            public struct MINIDUMP_EXCEPTION_INFORMATION
+            if (dumpMinitoolName == string.Empty)
             {
-                public uint ThreadId;
-                public IntPtr ExceptionPointers;
-                public int ClientPointers;
+                EqtTrace.Verbose($"WindowsHangDumper.CollectDump: The target process architecture is {targetProcessArchitecture}, we don't have a DumpMinitool for that, falling back to using PInvoke directly.");
+                MiniDumpWriteDump.CollectDumpUsingMiniDumpWriteDump(process, outputFile, FromDumpType(type));
             }
 
-            [Flags]
-#pragma warning disable SA1201 // Elements must appear in the correct order
-            public enum MINIDUMP_TYPE : uint
-#pragma warning restore SA1201 // Elements must appear in the correct order
+            var args = $"--file \"{outputFile}\" --processId {process.Id} --dumpType {type}";
+            var dumpMinitoolPath = Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location)!, "dump", dumpMinitoolName);
+            EqtTrace.Verbose($"WindowsHangDumper.CollectDump: The target process architecture is {targetProcessArchitecture}, dumping it via {dumpMinitoolName}.");
+
+            if (!File.Exists(dumpMinitoolPath))
             {
-                MiniDumpNormal = 0,
-                MiniDumpWithDataSegs = 1 << 0,
-                MiniDumpWithFullMemory = 1 << 1,
-                MiniDumpWithHandleData = 1 << 2,
-                MiniDumpFilterMemory = 1 << 3,
-                MiniDumpScanMemory = 1 << 4,
-                MiniDumpWithUnloadedModules = 1 << 5,
-                MiniDumpWithIndirectlyReferencedMemory = 1 << 6,
-                MiniDumpFilterModulePaths = 1 << 7,
-                MiniDumpWithProcessThreadData = 1 << 8,
-                MiniDumpWithPrivateReadWriteMemory = 1 << 9,
-                MiniDumpWithoutOptionalData = 1 << 10,
-                MiniDumpWithFullMemoryInfo = 1 << 11,
-                MiniDumpWithThreadInfo = 1 << 12,
-                MiniDumpWithCodeSegs = 1 << 13,
-                MiniDumpWithoutAuxiliaryState = 1 << 14,
-                MiniDumpWithFullAuxiliaryState = 1 << 15,
-                MiniDumpWithPrivateWriteCopyMemory = 1 << 16,
-                MiniDumpIgnoreInaccessibleMemory = 1 << 17,
-                MiniDumpWithTokenInformation = 1 << 18,
-                MiniDumpWithModuleHeaders = 1 << 19,
-                MiniDumpFilterTriage = 1 << 20,
-                MiniDumpWithAvxXStateContext = 1 << 21,
-                MiniDumpWithIptTrace = 1 << 22,
-                MiniDumpValidTypeFlags = (-1) ^ ((~1) << 22)
+                throw new FileNotFoundException("Could not find DumpMinitool", dumpMinitoolPath);
             }
+
+            EqtTrace.Info($"ProcDumpDumper.CollectDump: Running DumpMinitool: '{dumpMinitoolPath} {args}'.");
+            var dumpMiniTool = (Process)new ProcessHelper().LaunchProcess(
+                dumpMinitoolPath,
+                args,
+                Path.GetDirectoryName(outputFile),
+                null,
+                null,
+                null,
+                OutputReceivedCallback);
+            dumpMiniTool.WaitForExit();
+            EqtTrace.Info($"ProcDumpDumper.CollectDump: {dumpMinitoolName} exited with exitcode: '{dumpMiniTool.ExitCode}'.");
         }
+
+        EqtTrace.Verbose($"WindowsHangDumper.CollectDump: Finished dumping {process.Id} - {process.ProcessName} in {outputFile}. ");
+    }
+
+    private static MiniDumpTypeOption FromDumpType(DumpTypeOption type)
+    {
+        return type switch
+        {
+            DumpTypeOption.Full => MiniDumpTypeOption.Full,
+            DumpTypeOption.WithHeap => MiniDumpTypeOption.WithHeap,
+            DumpTypeOption.Mini => MiniDumpTypeOption.Mini,
+            _ => throw new NotSupportedException($"Dump type {type} is not supported."),
+        };
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/XmlReaderWriter.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/XmlReaderWriter.cs
index a799ad8740..fa12724d96 100644
--- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/XmlReaderWriter.cs
+++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/XmlReaderWriter.cs
@@ -1,148 +1,153 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+/// <summary>
+/// XmlReaderWriter class for reading and writing test sequences to file
+/// </summary>
+public class XmlReaderWriter : IBlameReaderWriter
+{
+    /// <summary>
+    /// The file helper.
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
 
     /// <summary>
-    /// XmlReaderWriter class for reading and writing test sequences to file
+    /// Initializes a new instance of the <see cref="XmlReaderWriter"/> class.
     /// </summary>
-    public class XmlReaderWriter : IBlameReaderWriter
+    internal XmlReaderWriter()
+        : this(new FileHelper())
     {
-        /// <summary>
-        /// The file helper.
-        /// </summary>
-        private readonly IFileHelper fileHelper;
-
-        #region  Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlReaderWriter"/> class.
-        /// </summary>
-        internal XmlReaderWriter()
-            : this(new FileHelper())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlReaderWriter"/> class.
-        /// Protected for testing purposes
-        /// </summary>
-        /// <param name="fileHelper">
-        /// The file helper.
-        /// </param>
-        protected XmlReaderWriter(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="XmlReaderWriter"/> class.
+    /// Protected for testing purposes
+    /// </summary>
+    /// <param name="fileHelper">
+    /// The file helper.
+    /// </param>
+    protected XmlReaderWriter(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
 
-        #endregion
-
-        /// <summary>
-        /// Writes test Sequence to file.
-        /// Protected for testing purposes
-        /// </summary>
-        /// <param name="testSequence">
-        /// Sequence of Guids
-        /// </param>
-        /// <param name="testObjectDictionary">
-        /// Dictionary of test objects
-        /// </param>
-        /// <param name="filePath">
-        /// The file Path.
-        /// </param>
-        /// <returns>File path</returns>
-        public string WriteTestSequence(List<Guid> testSequence, Dictionary<Guid, BlameTestObject> testObjectDictionary, string filePath)
-        {
-            ValidateArg.NotNull(testSequence, nameof(testSequence));
-            ValidateArg.NotNull(testObjectDictionary, nameof(testObjectDictionary));
-            ValidateArg.NotNullOrEmpty(filePath, nameof(filePath));
+    /// <summary>
+    /// Writes test Sequence to file.
+    /// Protected for testing purposes
+    /// </summary>
+    /// <param name="testSequence">
+    /// Sequence of Guids
+    /// </param>
+    /// <param name="testObjectDictionary">
+    /// Dictionary of test objects
+    /// </param>
+    /// <param name="filePath">
+    /// The file Path.
+    /// </param>
+    /// <returns>File path</returns>
+    public string WriteTestSequence(List<Guid> testSequence, Dictionary<Guid, BlameTestObject> testObjectDictionary, string filePath)
+    {
+        ValidateArg.NotNull(testSequence, nameof(testSequence));
+        ValidateArg.NotNull(testObjectDictionary, nameof(testObjectDictionary));
+        ValidateArg.NotNullOrEmpty(filePath, nameof(filePath));
 
-            filePath += ".xml";
+        filePath += ".xml";
 
-            // Writing test sequence
-            var xmlDocument = new XmlDocument();
-            var xmlDeclaration = xmlDocument.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
-            var blameTestRoot = xmlDocument.CreateElement(Constants.BlameRootNode);
-            xmlDocument.AppendChild(xmlDeclaration);
+        // Writing test sequence
+        var xmlDocument = new XmlDocument();
+        var xmlDeclaration = xmlDocument.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+        var blameTestRoot = xmlDocument.CreateElement(Constants.BlameRootNode);
+        xmlDocument.AppendChild(xmlDeclaration);
 
-            foreach (var testGuid in testSequence)
+        foreach (var testGuid in testSequence)
+        {
+            if (testObjectDictionary.ContainsKey(testGuid))
             {
-                if (testObjectDictionary.ContainsKey(testGuid))
-                {
-                    var testObject = testObjectDictionary[testGuid];
+                var testObject = testObjectDictionary[testGuid];
 
-                    var testElement = xmlDocument.CreateElement(Constants.BlameTestNode);
-                    testElement.SetAttribute(Constants.TestNameAttribute, testObject.FullyQualifiedName);
-                    testElement.SetAttribute(Constants.TestDisplayNameAttribute, testObject.DisplayName);
-                    testElement.SetAttribute(Constants.TestSourceAttribute, testObject.Source);
-                    testElement.SetAttribute(Constants.TestCompletedAttribute, testObject.IsCompleted.ToString());
+                var testElement = xmlDocument.CreateElement(Constants.BlameTestNode);
+                testElement.SetAttribute(Constants.TestNameAttribute, testObject.FullyQualifiedName);
+                testElement.SetAttribute(Constants.TestDisplayNameAttribute, testObject.DisplayName);
+                testElement.SetAttribute(Constants.TestSourceAttribute, testObject.Source);
+                testElement.SetAttribute(Constants.TestCompletedAttribute, testObject.IsCompleted.ToString());
 
-                    blameTestRoot.AppendChild(testElement);
-                }
+                blameTestRoot.AppendChild(testElement);
             }
+        }
 
-            xmlDocument.AppendChild(blameTestRoot);
-            using (var stream = this.fileHelper.GetStream(filePath, FileMode.Create))
-            {
-                xmlDocument.Save(stream);
-            }
+        xmlDocument.AppendChild(blameTestRoot);
+        using (var stream = _fileHelper.GetStream(filePath, FileMode.Create))
+        {
+            xmlDocument.Save(stream);
+        }
+
+        return filePath;
+    }
+
+    /// <summary>
+    /// Reads All test case from file
+    /// </summary>
+    /// <param name="filePath">The path of test sequence file</param>
+    /// <returns>Test Case List</returns>
+    public List<BlameTestObject> ReadTestSequence(string filePath)
+    {
+        ValidateArg.NotNull(filePath, nameof(filePath));
 
-            return filePath;
+        if (!_fileHelper.Exists(filePath))
+        {
+            throw new FileNotFoundException();
         }
 
-        /// <summary>
-        /// Reads All test case from file
-        /// </summary>
-        /// <param name="filePath">The path of test sequence file</param>
-        /// <returns>Test Case List</returns>
-        public List<BlameTestObject> ReadTestSequence(string filePath)
+        var testCaseList = new List<BlameTestObject>();
+        try
         {
-            ValidateArg.NotNull(filePath, nameof(filePath));
+            // Reading test sequence
+            var xmlDocument = new XmlDocument();
+            using (var stream = _fileHelper.GetStream(filePath, FileMode.Open))
+            {
+                xmlDocument.Load(stream);
+            }
 
-            if (!this.fileHelper.Exists(filePath))
+            var root = xmlDocument.LastChild;
+            if (root == null)
             {
-                throw new FileNotFoundException();
+                return testCaseList;
             }
 
-            var testCaseList = new List<BlameTestObject>();
-            try
+            foreach (XmlNode node in root)
             {
-                // Reading test sequence
-                var xmlDocument = new XmlDocument();
-                using (var stream = this.fileHelper.GetStream(filePath, FileMode.Open))
+                if (node?.Attributes == null)
                 {
-                    xmlDocument.Load(stream);
+                    continue;
                 }
 
-                var root = xmlDocument.LastChild;
-                foreach (XmlNode node in root)
+                var testCase = new BlameTestObject
                 {
-                    var testCase = new BlameTestObject
-                    {
-                        FullyQualifiedName =
-                                               node.Attributes[Constants.TestNameAttribute].Value,
-                        Source = node.Attributes[Constants.TestSourceAttribute].Value,
-                        DisplayName = node.Attributes[Constants.TestDisplayNameAttribute].Value,
-                        IsCompleted = node.Attributes[Constants.TestCompletedAttribute].Value == "True" ? true : false
-                    };
-                    testCaseList.Add(testCase);
-                }
+                    FullyQualifiedName =
+                        node.Attributes[Constants.TestNameAttribute]?.Value,
+                    Source = node.Attributes[Constants.TestSourceAttribute]?.Value,
+                    DisplayName = node.Attributes[Constants.TestDisplayNameAttribute]?.Value,
+                    IsCompleted = node.Attributes[Constants.TestCompletedAttribute]?.Value == "True"
+                };
+                testCaseList.Add(testCase);
             }
-            catch (XmlException xmlException)
-            {
-                EqtTrace.Warning("XmlReaderWriter : Exception ", xmlException);
-            }
-
-            return testCaseList;
         }
+        catch (XmlException xmlException)
+        {
+            EqtTrace.Warning("XmlReaderWriter : Exception ", xmlException);
+        }
+
+        return testCaseList;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/BannedSymbols.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs
index 1c0ac5394e..48e789459b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Constants.cs
@@ -1,67 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+public static class Constants
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    public static class Constants
-    {
-        /// <summary>
-        /// Uri used to uniquely identify the Html logger.
-        /// </summary>
-        public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
-
-        /// <summary>
-        /// Alternate user friendly string to uniquely identify the console logger.
-        /// </summary>
-        public const string FriendlyName = "Html";
-
-        /// <summary>
-        /// The file extension of xml file
-        /// </summary>
-        public const string XmlFileExtension = "xml";
-
-        /// <summary>
-        /// The file extension of html file
-        /// </summary>
-        public const string HtmlFileExtension = "html";
-
-        ///  /// <summary>
-        /// Property Id storing the TestType.
-        /// </summary>
-        public const string TestTypePropertyIdentifier = "TestType";
-
-        /// <summary>
-        /// Ordered test type guid
-        /// </summary>
-        public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
-
-        /// <summary>
-        ///  Property Id storing the ParentExecutionId.
-        /// </summary>
-        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
-
-        /// <summary>
-        ///  Property Id storing the ExecutionId.
-        /// </summary>
-        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
-
-        /// <summary>
-        ///  Log file parameter key
-        /// </summary>
-        public const string LogFileNameKey = "LogFileName";
-
-        /// <summary>
-        ///  Log file prefix parameter key
-        /// </summary>
-        public const string LogFilePrefixKey = "LogFilePrefix";
-
-        public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
-
-        public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
-
-        public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Uri used to uniquely identify the Html logger.
+    /// </summary>
+    public const string ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1";
+
+    /// <summary>
+    /// Alternate user friendly string to uniquely identify the console logger.
+    /// </summary>
+    public const string FriendlyName = "Html";
+
+    /// <summary>
+    /// The file extension of xml file
+    /// </summary>
+    public const string XmlFileExtension = "xml";
+
+    /// <summary>
+    /// The file extension of html file
+    /// </summary>
+    public const string HtmlFileExtension = "html";
+
+    ///  /// <summary>
+    /// Property Id storing the TestType.
+    /// </summary>
+    public const string TestTypePropertyIdentifier = "TestType";
+
+    /// <summary>
+    /// Ordered test type guid
+    /// </summary>
+    public static readonly Guid OrderedTestTypeGuid = new("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
+
+    /// <summary>
+    ///  Property Id storing the ParentExecutionId.
+    /// </summary>
+    public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
+
+    /// <summary>
+    ///  Property Id storing the ExecutionId.
+    /// </summary>
+    public const string ExecutionIdPropertyIdentifier = "ExecutionId";
+
+    /// <summary>
+    ///  Log file parameter key
+    /// </summary>
+    public const string LogFileNameKey = "LogFileName";
+
+    /// <summary>
+    ///  Log file prefix parameter key
+    /// </summary>
+    public const string LogFilePrefixKey = "LogFilePrefix";
+
+    public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+
+    public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+
+    public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(TestResult));
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
index b98f2bb475..a55f69ab47 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Html.xslt
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="2.0"
     xmlns:tp="http://schemas.datacontract.org/2004/07/Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays"            
+    xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays"
     xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxs tp">
   <xsl:output method="html" indent="yes"/>
   <xsl:template match="/">
@@ -11,18 +11,7 @@
         <h1>Test run details</h1>
         <xsl:apply-templates select ="/tp:TestRunDetails"/>
       </body>
-      <script language="javascript">
-        function ToggleClass(id) {
-        var elem = document.getElementById(id);
-        if (elem.style.display == "none") {
-        elem.style.display = "block";
-        }
-        else {
-        elem.style.display = "none";
-        }
-        }
-      </script>
-      <style>
+        <style>
         body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
         h2 {
         margin-top: 15px;
@@ -109,7 +98,7 @@
     </xsl:if>
     <h2>All Results</h2><xsl:call-template name ="Results"/>
   </xsl:template>
-  
+
    <xsl:template match="tp:RunLevelMessageInformational">
     <div>
     <h2>Informational messages</h2>
@@ -118,7 +107,7 @@
       </xsl:for-each>
     </div>
   </xsl:template>
-  
+
   <xsl:template match="tp:RunLevelMessageErrorAndWarning">
     <div>
       <h2>Error and Warning messages</h2>
@@ -127,15 +116,17 @@
       </xsl:for-each>
     </div>
   </xsl:template>
-  
+
   <xsl:template name ="Results">
     <xsl:for-each select ="tp:TestResultCollection">
       <xsl:variable name="Source" select="tp:Id" />
       <xsl:if test="tp:ResultList!=''">
-        <div class ="list-row" onclick="ToggleClass('{$Source}')"><xsl:value-of select = "tp:Source" /></div>
-        <div class ="inner-row" Id="{$Source}" style="display:none;">
-          <xsl:for-each select ="tp:ResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
-        </div>
+        <details>
+          <summary><xsl:value-of select = "tp:Source" /></summary>
+          <div class ="inner-row" Id="{$Source}">
+            <xsl:for-each select ="tp:ResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
+          </div>
+        </details>
       </xsl:if>
     </xsl:for-each>
   </xsl:template>
@@ -144,28 +135,33 @@
     <xsl:for-each select ="tp:TestResultCollection">
       <xsl:variable name="Source" select="tp:Id" />
       <xsl:if test="tp:FailedResultList!=''">
-        <div class ="list-row" onclick="ToggleClass('{concat($Source,'-failedResult')}')"><xsl:value-of select = "tp:Source" /> </div>
-        <div class ="inner-row" Id="{concat($Source,'-failedResult')}" style="display:block;">
-          <xsl:for-each select ="tp:FailedResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
-        </div>
+        <details>
+            <xsl:attribute name="open"/>
+            <summary><xsl:value-of select = "tp:Source" /></summary>
+          <div class ="inner-row" Id="{concat($Source,'-failedResult')}">
+            <xsl:for-each select ="tp:FailedResultList/tp:TestResult"><xsl:call-template name ="TestResult"/></xsl:for-each>
+          </div>
+        </details>
       </xsl:if>
-    </xsl:for-each>    
-  </xsl:template>  
-  
+    </xsl:for-each>
+  </xsl:template>
+
   <xsl:template name="TestResult" match="tp:TestResult">
     <xsl:variable name="TestResultId" select="tp:TestResultId" />
-    
+
     <xsl:if test ="tp:InnerTestResults!=''">
-      <div class ="row" onclick="ToggleClass('{concat($TestResultId,'-',name(..))}')"><xsl:call-template name = "Result" /></div>
-      <a Id="{concat($TestResultId,'-',name(..))}" style="display:none;"><xsl:apply-templates select = "tp:InnerTestResults" /></a>
-    </xsl:if> 
-    
+      <details>
+        <summary><xsl:call-template name = "Result" /></summary>
+        <a Id="{concat($TestResultId,'-',name(..))}"><xsl:apply-templates select = "tp:InnerTestResults" /></a>
+      </details>
+    </xsl:if>
+
     <xsl:if test ="tp:InnerTestResults=''">
       <div class ="leaf-division"><xsl:call-template name = "Result" /></div>
-    </xsl:if>   
-    
+    </xsl:if>
+
   </xsl:template>
-  
+
   <xsl:template match="tp:InnerTestResults">
     <div class ="inner-row"><xsl:apply-templates select = "tp:TestResult" /></div>
   </xsl:template>
@@ -176,12 +172,12 @@
       <xsl:apply-templates select = "tp:DisplayName" />
       <div class="duration"><xsl:apply-templates select = "tp:Duration" /></div>
     </div>
-   <div class="error-info"> 
+   <div class="error-info">
      <xsl:if test ="tp:ErrorMessage!=''"><xsl:apply-templates select = "tp:ErrorMessage" /></xsl:if>
      <xsl:if test ="tp:ErrorStackTrace!=''"><xsl:apply-templates select = "tp:ErrorStackTrace" /></xsl:if>
    </div>
   </xsl:template>
-  
+
   <xsl:template match = "tp:ErrorMessage">
     Error: <span class="error-message"><pre><xsl:value-of select = "." /></pre></span><br />
   </xsl:template>
@@ -223,8 +219,8 @@
   <xsl:template match = "tp:Duration">
     <span><xsl:value-of select = "." /></span><br />
   </xsl:template>
-  
+
   <xsl:template match = "tp:DisplayName">
-    <span>&#160;<xsl:value-of select = "." /></span>
+    <span>&#160;<xsl:value-of select = "." />&#8203;</span>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
index b040c6194d..bf994ee5e2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlLogger.cs
@@ -1,443 +1,449 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using HtmlLoggerConstants = Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants;
+using HtmlResource = Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+/// <summary>
+/// Logger for generating Html.
+/// </summary>
+[FriendlyName(HtmlLoggerConstants.FriendlyName)]
+[ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
+public class HtmlLogger : ITestLoggerWithParameters
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.Serialization;
-
-    using ObjectModel;
-    using Utilities;
-    using Utilities.Helpers;
-    using Utilities.Helpers.Interfaces;
-
-    using HtmlResource = Resources.Resources;
-    using HtmlLoggerConstants = Constants;
-    using NuGet.Frameworks;
+    private readonly IFileHelper _fileHelper;
+    private readonly XmlObjectSerializer _xmlSerializer;
+    private readonly IHtmlTransformer _htmlTransformer;
+    private static readonly object FileCreateLockObject = new();
+    private Dictionary<string, string?>? _parametersDictionary;
+
+    public HtmlLogger()
+        : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestRunDetails)))
+    {
+    }
+
+    public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
+        XmlObjectSerializer dataContractSerializer)
+    {
+        _fileHelper = fileHelper;
+        _htmlTransformer = htmlTransformer;
+        _xmlSerializer = dataContractSerializer;
+    }
+
+    /// <summary>
+    /// Gets the directory under which default html file and test results attachments should be saved.
+    /// </summary>
+    public string? TestResultsDirPath { get; private set; }
+
+    /// <summary>
+    /// Total results are stored in sequential order
+    /// </summary>
+    /// <returns></returns>
+    public ConcurrentDictionary<Guid, ObjectModel.TestResult>? Results { get; private set; }
+
+    /// <summary>
+    ///
+    /// </summary>
+    public ConcurrentDictionary<string, TestResultCollection>? ResultCollectionDictionary { get; private set; }
+
+    /// <summary>
+    /// Test results stores all the summary and the details of every results in hierarchical order.
+    /// </summary>
+    public TestRunDetails? TestRunDetails { get; private set; }
+
+    /// <summary>
+    /// Total passed tests in the test results.
+    /// </summary>
+    public int PassedTests { get; private set; }
 
     /// <summary>
-    /// Logger for generating Html.
+    /// Total failed tests in the test results.
     /// </summary>
-    [FriendlyName(HtmlLoggerConstants.FriendlyName)]
-    [ExtensionUri(HtmlLoggerConstants.ExtensionUri)]
-    public class HtmlLogger : ITestLoggerWithParameters
+    public int FailedTests { get; private set; }
+
+    /// <summary>
+    /// Total tests in the results.
+    /// </summary>
+    public int TotalTests { get; private set; }
+
+    /// <summary>
+    /// Total skipped tests in the results.
+    /// </summary>
+    public int SkippedTests { get; private set; }
+
+    /// <summary>
+    /// Path to the xml file.
+    /// </summary>
+    public string? XmlFilePath { get; private set; }
+
+    /// <summary>
+    /// path to html file.
+    /// </summary>
+    public string? HtmlFilePath { get; private set; }
+
+    /// <inheritdoc/>
+    [MemberNotNull(nameof(TestResultsDirPath), nameof(TestRunDetails), nameof(Results), nameof(ResultCollectionDictionary))]
+    public void Initialize(TestLoggerEvents events, string testResultsDirPath)
     {
-        private readonly IFileHelper fileHelper;
-        private readonly XmlObjectSerializer xmlSerializer;
-        private readonly IHtmlTransformer htmlTransformer;
-        private Dictionary<string, string> parametersDictionary;
+        ValidateArg.NotNull(events, nameof(events));
+        ValidateArg.NotNullOrEmpty(testResultsDirPath, nameof(testResultsDirPath));
+
+        // Register for the events.
+        events.TestRunMessage += TestMessageHandler;
+        events.TestResult += TestResultHandler;
+        events.TestRunComplete += TestRunCompleteHandler;
+
+        TestResultsDirPath = testResultsDirPath;
+        TestRunDetails = new TestRunDetails();
+        Results = new ConcurrentDictionary<Guid, ObjectModel.TestResult>();
+        ResultCollectionDictionary = new ConcurrentDictionary<string, TestResultCollection>();
 
-        public HtmlLogger()
-            : this(new FileHelper(), new HtmlTransformer(), new DataContractSerializer(typeof(TestRunDetails)))
+        // Ensure test results directory exists.
+        Directory.CreateDirectory(testResultsDirPath);
+    }
+
+    /// <inheritdoc/>
+    [MemberNotNull(nameof(_parametersDictionary))]
+    public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
+    {
+        ValidateArg.NotNull(parameters, nameof(parameters));
+        if (parameters.Count == 0)
         {
+            throw new ArgumentException("No default parameters added", nameof(parameters));
         }
 
-        public HtmlLogger(IFileHelper fileHelper, IHtmlTransformer htmlTransformer,
-            XmlObjectSerializer dataContractSerializer)
+        _parametersDictionary = parameters;
+        if (parameters.TryGetValue(HtmlLoggerConstants.LogFilePrefixKey, out _) && parameters.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out _))
         {
-            this.fileHelper = fileHelper;
-            this.htmlTransformer = htmlTransformer;
-            this.xmlSerializer = dataContractSerializer;
+            var htmlParameterErrorMsg = string.Format(CultureInfo.CurrentCulture, HtmlResource.PrefixAndNameProvidedError);
+            EqtTrace.Error(htmlParameterErrorMsg);
+            throw new ArgumentException(htmlParameterErrorMsg);
         }
 
-        /// <summary>
-        /// Gets the directory under which default html file and test results attachments should be saved.
-        /// </summary>
-        public string TestResultsDirPath { get; private set; }
-
-        /// <summary>
-        /// Total results are stored in sequential order
-        /// </summary>
-        /// <returns></returns>
-        public ConcurrentDictionary<Guid, ObjectModel.TestResult> Results { get; private set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public ConcurrentDictionary<string, TestResultCollection> ResultCollectionDictionary { get; private set; }
-
-        /// <summary>
-        /// Test results stores all the summary and the details of every results in hierarchical order.
-        /// </summary>
-        public TestRunDetails TestRunDetails { get; private set; }
-
-        /// <summary>
-        /// Total passed tests in the test results.
-        /// </summary>
-        public int PassedTests { get; private set; }
-
-        /// <summary>
-        /// Total failed tests in the test results.
-        /// </summary>
-        public int FailedTests { get; private set; }
-
-        /// <summary>
-        /// Total tests in the results.
-        /// </summary>
-        public int TotalTests { get; private set; }
-
-        /// <summary>
-        /// Total skipped tests in the results.
-        /// </summary>
-        public int SkippedTests { get; private set; }
-
-        /// <summary>
-        /// Path to the xml file.
-        /// </summary>
-        public string XmlFilePath { get; private set; }
-
-        /// <summary>
-        /// path to html file.
-        /// </summary>
-        public string HtmlFilePath { get; private set; }
-
-        /// <inheritdoc/>
-        public void Initialize(TestLoggerEvents events, string testResultsDirPath)
-        {
-            if (events == null)
-            {
-                throw new ArgumentNullException(nameof(events));
-            }
+        Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]!);
+    }
 
-            if (string.IsNullOrEmpty(testResultsDirPath))
-            {
-                throw new ArgumentNullException(nameof(testResultsDirPath));
-            }
+    /// <summary>
+    /// Handles the message level information like warnings, errors etc..
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(TestRunDetails != null, "Initialize must be called before this method.");
 
-            // Register for the events.
-            events.TestRunMessage += TestMessageHandler;
-            events.TestResult += TestResultHandler;
-            events.TestRunComplete += TestRunCompleteHandler;
+        switch (e.Level)
+        {
+            case TestMessageLevel.Informational:
+                if (TestRunDetails.RunLevelMessageInformational == null)
+                {
+                    TestRunDetails.RunLevelMessageInformational = new List<string>();
+                }
 
-            TestResultsDirPath = testResultsDirPath;
-            TestRunDetails = new TestRunDetails();
-            Results = new ConcurrentDictionary<Guid, ObjectModel.TestResult>();
-            ResultCollectionDictionary = new ConcurrentDictionary<string, TestResultCollection>();
+                TestRunDetails.RunLevelMessageInformational.Add(e.Message);
+                break;
+            case TestMessageLevel.Warning:
+            case TestMessageLevel.Error:
+                if (TestRunDetails.RunLevelMessageErrorAndWarning == null)
+                {
+                    TestRunDetails.RunLevelMessageErrorAndWarning = new List<string>();
+                }
 
-            // Ensure test results directory exists.
-            Directory.CreateDirectory(testResultsDirPath);
+                TestRunDetails.RunLevelMessageErrorAndWarning.Add(e.Message);
+                break;
+            default:
+                EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}",
+                    e.Level.ToString());
+                break;
         }
+    }
 
-        /// <inheritdoc/>
-        public void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)
+    /// <summary>
+    /// Handles the result coming from vs test and store it in test results.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void TestResultHandler(object? sender, TestResultEventArgs e)
+    {
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(ResultCollectionDictionary != null && TestRunDetails != null && Results != null, "Initialize must be called before this method.");
+
+        var testResult = new ObjectModel.TestResult
+        {
+            DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName,
+            FullyQualifiedName = e.Result.TestCase.FullyQualifiedName,
+            ErrorStackTrace = e.Result.ErrorStackTrace,
+            ErrorMessage = e.Result.ErrorMessage,
+            TestResultId = e.Result.TestCase.Id,
+            Duration = GetFormattedDurationString(e.Result.Duration),
+            ResultOutcome = e.Result.Outcome
+        };
+
+        var executionId = GetExecutionId(e.Result);
+        var parentExecutionId = GetParentExecutionId(e.Result);
+
+        ResultCollectionDictionary.TryGetValue(e.Result.TestCase.Source, out var testResultCollection);
+        if (testResultCollection == null)
         {
-            if (parameters == null)
+            testResultCollection = new TestResultCollection(e.Result.TestCase.Source)
             {
-                throw new ArgumentNullException(nameof(parameters));
-            }
+                ResultList = new List<ObjectModel.TestResult>(),
+                FailedResultList = new List<ObjectModel.TestResult>(),
+            };
+            ResultCollectionDictionary.TryAdd(e.Result.TestCase.Source, testResultCollection);
+            TestRunDetails.ResultCollectionList!.Add(testResultCollection);
+        }
 
-            if (parameters.Count == 0)
-            {
-                throw new ArgumentException("No default parameters added", nameof(parameters));
-            }
+        TotalTests++;
+        switch (e.Result.Outcome)
+        {
+            case TestOutcome.Failed:
+                FailedTests++;
+                break;
+            case TestOutcome.Passed:
+                PassedTests++;
+                break;
+            case TestOutcome.Skipped:
+                SkippedTests++;
+                break;
+            default:
+                break;
+        }
 
-            parametersDictionary = parameters;
+        Results.TryAdd(executionId, testResult);
 
-            if (parameters.TryGetValue(HtmlLoggerConstants.LogFilePrefixKey, out string logFilePrefixValue) && parameters.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string logFileNameValue))
+        // Check for parent execution id to store the test results in hierarchical way
+        if (parentExecutionId == Guid.Empty)
+        {
+            if (e.Result.Outcome == TestOutcome.Failed)
             {
-                var htmlParameterErrorMsg = string.Format(CultureInfo.CurrentCulture, HtmlResource.PrefixAndNameProvidedError);
-                EqtTrace.Error(htmlParameterErrorMsg);
-                throw new ArgumentException(htmlParameterErrorMsg);
+                testResultCollection.FailedResultList!.Add(testResult);
             }
 
-            this.Initialize(events, parameters[DefaultLoggerParameterNames.TestRunDirectory]);
+            testResultCollection.ResultList!.Add(testResult);
         }
-
-        /// <summary>
-        /// Handles the message level information like warnings, errors etc..
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void TestMessageHandler(object sender, TestRunMessageEventArgs e)
+        else
         {
-            ValidateArg.NotNull(sender, nameof(sender));
-            ValidateArg.NotNull(e, nameof(e));
-
-            switch (e.Level)
-            {
-                case TestMessageLevel.Informational:
-                    if (TestRunDetails.RunLevelMessageInformational == null)
-                    {
-                        TestRunDetails.RunLevelMessageInformational = new List<string>();
-                    }
-
-                    TestRunDetails.RunLevelMessageInformational.Add(e.Message);
-                    break;
-                case TestMessageLevel.Warning:
-                case TestMessageLevel.Error:
-                    if (TestRunDetails.RunLevelMessageErrorAndWarning == null)
-                    {
-                        TestRunDetails.RunLevelMessageErrorAndWarning = new List<string>();
-                    }
-
-                    TestRunDetails.RunLevelMessageErrorAndWarning.Add(e.Message);
-                    break;
-                default:
-                    EqtTrace.Info("htmlLogger.TestMessageHandler: The test message level is unrecognized: {0}",
-                        e.Level.ToString());
-                    break;
-            }
+            AddToParentResult(parentExecutionId, testResult);
         }
+    }
+
+    private void AddToParentResult(Guid parentExecutionId, ObjectModel.TestResult testResult)
+    {
+        TPDebug.Assert(Results != null, "Initialize must be called before this method.");
 
-        /// <summary>
-        /// Handles the result coming from vs test and store it in test results.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void TestResultHandler(object sender, TestResultEventArgs e)
+        if (Results.TryGetValue(parentExecutionId, out var parentTestResult))
         {
-            ValidateArg.NotNull(sender, nameof(sender));
-            ValidateArg.NotNull(e, nameof(e));
+            parentTestResult.InnerTestResults ??= new List<ObjectModel.TestResult>();
 
-            var testResult = new ObjectModel.TestResult
-            {
-                DisplayName = e.Result.DisplayName ?? e.Result.TestCase.FullyQualifiedName,
-                FullyQualifiedName = e.Result.TestCase.FullyQualifiedName,
-                ErrorStackTrace = e.Result.ErrorStackTrace,
-                ErrorMessage = e.Result.ErrorMessage,
-                TestResultId = e.Result.TestCase.Id,
-                Duration = GetFormattedDurationString(e.Result.Duration),
-                ResultOutcome = e.Result.Outcome
-            };
+            parentTestResult.InnerTestResults.Add(testResult);
+        }
+    }
 
-            var executionId = GetExecutionId(e.Result);
-            var parentExecutionId = GetParentExecutionId(e.Result);
+    /// <summary>
+    /// Creates a summary of tests and populates the html file by transforming the xml file with help of xslt file.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        TPDebug.Assert(TestRunDetails != null && _parametersDictionary != null, "Initialize must be called before this method.");
 
-            ResultCollectionDictionary.TryGetValue(e.Result.TestCase.Source, out var testResultCollection);
-            if (testResultCollection == null)
+        TestRunDetails.Summary = new TestRunSummary
+        {
+            FailedTests = FailedTests,
+            PassedTests = PassedTests,
+            TotalTests = TotalTests,
+            SkippedTests = SkippedTests,
+            PassPercentage = TotalTests == 0 ? 0 : PassedTests * 100 / TotalTests,
+            TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests),
+        };
+        if (_parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFilePrefixKey, out string? logFilePrefixValue) && !logFilePrefixValue.IsNullOrWhiteSpace())
+        {
+            var framework = _parametersDictionary[DefaultLoggerParameterNames.TargetFramework];
+            if (framework != null)
             {
-                testResultCollection = new TestResultCollection(e.Result.TestCase.Source)
-                {
-                    ResultList = new List<ObjectModel.TestResult>(),
-                    FailedResultList = new List<ObjectModel.TestResult>(),
-                };
-                ResultCollectionDictionary.TryAdd(e.Result.TestCase.Source, testResultCollection);
-                TestRunDetails.ResultCollectionList.Add(testResultCollection);
+                framework = Framework.FromString(framework)?.ShortName ?? framework;
+                logFilePrefixValue = logFilePrefixValue + "_" + framework;
             }
 
-            TotalTests++;
-            switch (e.Result.Outcome)
+            logFilePrefixValue = logFilePrefixValue + DateTime.Now.ToString("_yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo) + $".{HtmlLoggerConstants.HtmlFileExtension}";
+            HtmlFilePath = Path.Combine(TestResultsDirPath!, logFilePrefixValue);
+        }
+        else
+        {
+            if (_parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string? logFileNameValue) && !logFileNameValue.IsNullOrWhiteSpace())
             {
-                case TestOutcome.Failed:
-                    FailedTests++;
-                    break;
-                case TestOutcome.Passed:
-                    PassedTests++;
-                    break;
-                case TestOutcome.Skipped:
-                    SkippedTests++;
-                    break;
-                default:
-                    break;
+                HtmlFilePath = Path.Combine(TestResultsDirPath!, logFileNameValue);
             }
+        }
+
+        PopulateHtmlFile();
+    }
 
-            Results.TryAdd(executionId, testResult);
+    private void PopulateHtmlFile()
+    {
+        try
+        {
+            var fileName = string.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}",
+                Environment.GetEnvironmentVariable("UserName"), Environment.MachineName,
+                FormatDateTimeForRunName(DateTime.Now));
 
-            // Check for parent execution id to store the test results in hierarchical way
-            if (parentExecutionId == Guid.Empty)
-            {
-                if (e.Result.Outcome == TestOutcome.Failed)
-                {
-                    testResultCollection.FailedResultList.Add(testResult);
-                }
+            XmlFilePath = GenerateUniqueFilePath(fileName, HtmlLoggerConstants.XmlFileExtension);
 
-                testResultCollection.ResultList.Add(testResult);
+            using (var xmlStream = _fileHelper.GetStream(XmlFilePath, FileMode.OpenOrCreate))
+            {
+                _xmlSerializer.WriteObject(xmlStream, TestRunDetails);
             }
-            else
+
+            if (HtmlFilePath.IsNullOrEmpty())
             {
-                AddToParentResult(parentExecutionId, testResult);
+                HtmlFilePath = GenerateUniqueFilePath(fileName, HtmlLoggerConstants.HtmlFileExtension);
             }
-        }
 
-        private void AddToParentResult(Guid parentExecutionId, ObjectModel.TestResult testResult)
+            _htmlTransformer.Transform(XmlFilePath, HtmlFilePath);
+        }
+        catch (Exception ex)
         {
-            if (Results.TryGetValue(parentExecutionId, out var parentTestResult))
+            EqtTrace.Error("HtmlLogger: Failed to populate html file. Exception: {0}",
+                ex.ToString());
+            ConsoleOutput.Instance.Error(false, HtmlResource.HtmlLoggerError, ex.Message);
+            return;
+        }
+        finally
+        {
+            if (XmlFilePath != null)
             {
-                if (parentTestResult.InnerTestResults == null)
-                    parentTestResult.InnerTestResults = new List<ObjectModel.TestResult>();
-
-                parentTestResult.InnerTestResults.Add(testResult);
+                _fileHelper.Delete(XmlFilePath);
             }
         }
 
-        /// <summary>
-        /// Creates a summary of tests and populates the html file by transforming the xml file with help of xslt file.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        public void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
-        {
-            TestRunDetails.Summary = new TestRunSummary
-            {
-                FailedTests = FailedTests,
-                PassedTests = PassedTests,
-                TotalTests = TotalTests,
-                SkippedTests = SkippedTests,
-                PassPercentage = TotalTests == 0 ? 0 : PassedTests * 100 / TotalTests,
-                TotalRunTime = GetFormattedDurationString(e.ElapsedTimeInRunningTests),
-            };
-            if (this.parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFilePrefixKey, out string logFilePrefixValue) && !string.IsNullOrWhiteSpace(logFilePrefixValue))
-            {
-                var framework = this.parametersDictionary[DefaultLoggerParameterNames.TargetFramework];
-                if (framework != null)
-                {
-                    framework = NuGetFramework.Parse(framework).GetShortFolderName();
-                    logFilePrefixValue = logFilePrefixValue + "_" + framework;
-                }
+        var htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
+        EqtTrace.Info(htmlFilePathMessage);
+        ConsoleOutput.Instance.Information(false, htmlFilePathMessage);
+    }
 
-                logFilePrefixValue = logFilePrefixValue + DateTime.Now.ToString("_yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo) + $".{HtmlLoggerConstants.HtmlFileExtension}";
-                this.HtmlFilePath = Path.Combine(TestResultsDirPath, logFilePrefixValue);
-            }
-            else
+    private string GenerateUniqueFilePath(string fileName, string fileExtension)
+    {
+        string fullFilePath;
+        for (short i = 0; i < short.MaxValue; i++)
+        {
+            var fileNameWithIter = i == 0 ? fileName : Path.GetFileNameWithoutExtension(fileName) + $"[{i}]";
+            fullFilePath = Path.Combine(TestResultsDirPath!, $"TestResult_{fileNameWithIter}.{fileExtension}");
+            lock (FileCreateLockObject)
             {
-                if (parametersDictionary.TryGetValue(HtmlLoggerConstants.LogFileNameKey, out string logFileNameValue) && !string.IsNullOrWhiteSpace(logFileNameValue))
+                if (!File.Exists(fullFilePath))
                 {
-                    this.HtmlFilePath = Path.Combine(TestResultsDirPath, logFileNameValue);
+                    using var _ = File.Create(fullFilePath);
+                    return fullFilePath;
                 }
             }
-
-            PopulateHtmlFile();
         }
 
-        private void PopulateHtmlFile()
-        {
-            try
-            {
-                var fileName = string.Format(CultureInfo.CurrentCulture, "{0}_{1}_{2}",
-                    Environment.GetEnvironmentVariable("UserName"), Environment.MachineName,
-                    FormatDateTimeForRunName(DateTime.Now));
-
-                XmlFilePath = GetFilePath(HtmlLoggerConstants.XmlFileExtension, fileName);
-
-                using (var xmlStream = fileHelper.GetStream(XmlFilePath, FileMode.Create))
-                {
-                    xmlSerializer.WriteObject(xmlStream, TestRunDetails);
-                }
+        throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, HtmlResource.CannotGenerateUniqueFilePath, fileName, TestResultsDirPath));
+    }
 
-                if (string.IsNullOrEmpty(HtmlFilePath))
-                {
-                    HtmlFilePath = GetFilePath(HtmlLoggerConstants.HtmlFileExtension, fileName);
-                }
+    private static string FormatDateTimeForRunName(DateTime timeStamp)
+    {
+        return timeStamp.ToString("yyyyMMdd_HHmmss", DateTimeFormatInfo.InvariantInfo);
+    }
 
-                htmlTransformer.Transform(XmlFilePath, HtmlFilePath);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("HtmlLogger : Failed to populate html file. Exception : {0}",
-                    ex.ToString());
-                ConsoleOutput.Instance.Error(false, string.Concat(HtmlResource.HtmlLoggerError), ex.Message);
-                return;
-            }
-            finally
-            {
-                if (XmlFilePath != null)
-                {
-                    this.fileHelper.Delete(XmlFilePath);
-                }
-            }
+    /// <summary>
+    /// Gives the parent execution id of a TestResult.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns></returns>
+    private static Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+    {
+        var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
+            property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
+        return parentExecutionIdProperty == null
+            ? Guid.Empty
+            : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+    }
 
-            var htmlFilePathMessage = string.Format(CultureInfo.CurrentCulture, HtmlResource.HtmlFilePath, HtmlFilePath);
-            EqtTrace.Info(htmlFilePathMessage);
-            ConsoleOutput.Instance.Information(false, htmlFilePathMessage);
-        }
+    /// <summary>
+    /// Gives the execution id of a TestResult.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns></returns>
+    private static Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+    {
+        var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
+            property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
+        var executionId = Guid.Empty;
 
-        private string GetFilePath(string fileExtension, string fileName)
+        if (executionIdProperty != null)
         {
-            var fullFileFormat = $".{fileExtension}";
-            return Path.Combine(TestResultsDirPath, string.Concat("TestResult_", fileName, fullFileFormat));
+            executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
         }
 
-        private string FormatDateTimeForRunName(DateTime timeStamp)
-        {
-            return timeStamp.ToString("yyyyMMdd_HHmmss", DateTimeFormatInfo.InvariantInfo);
-        }
+        return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+    }
 
-        /// <summary>
-        /// Gives the parent execution id of a TestResult.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns></returns>
-        private Guid GetParentExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+    /// <summary>
+    /// Converts the time span format to readable string.
+    /// </summary>
+    /// <param name="duration"></param>
+    /// <returns></returns>
+    internal static string? GetFormattedDurationString(TimeSpan duration)
+    {
+        if (duration == default)
         {
-            var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
-                property.Id.Equals(HtmlLoggerConstants.ParentExecutionIdPropertyIdentifier));
-            return parentExecutionIdProperty == null
-                ? Guid.Empty
-                : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+            return null;
         }
 
-        /// <summary>
-        /// Gives the execution id of a TestResult.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns></returns>
-        private Guid GetExecutionId(TestPlatform.ObjectModel.TestResult testResult)
+        var time = new List<string>();
+        if (duration.Days > 0)
         {
-            var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
-                property.Id.Equals(HtmlLoggerConstants.ExecutionIdPropertyIdentifier));
-            var executionId = Guid.Empty;
-
-            if (executionIdProperty != null)
-            {
-                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
-            }
-
-            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+            time.Add("> 1d");
         }
-
-        /// <summary>
-        /// Converts the time span format to readable string.
-        /// </summary>
-        /// <param name="duration"></param>
-        /// <returns></returns>
-        internal string GetFormattedDurationString(TimeSpan duration)
+        else
         {
-            if (duration == default(TimeSpan))
+            if (duration.Hours > 0)
             {
-                return null;
+                time.Add(duration.Hours + "h");
             }
 
-            var time = new List<string>();
-            if (duration.Days > 0)
+            if (duration.Minutes > 0)
             {
-                time.Add("> 1d");
+                time.Add(duration.Minutes + "m");
             }
-            else
-            {
-                if (duration.Hours > 0)
-                {
-                    time.Add(duration.Hours + "h");
-                }
 
-                if (duration.Minutes > 0)
+            if (duration.Hours == 0)
+            {
+                if (duration.Seconds > 0)
                 {
-                    time.Add(duration.Minutes + "m");
+                    time.Add(duration.Seconds + "s");
                 }
 
-                if (duration.Hours == 0)
+                if (duration.Milliseconds > 0 && duration.Minutes == 0)
                 {
-                    if (duration.Seconds > 0)
-                    {
-                        time.Add(duration.Seconds + "s");
-                    }
-
-                    if (duration.Milliseconds > 0 && duration.Minutes == 0)
-                    {
-                        time.Add(duration.Milliseconds + "ms");
-                    }
+                    time.Add(duration.Milliseconds + "ms");
                 }
             }
-
-            return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
         }
+
+        return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
index ffe5dd467e..af5313cf1b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/HtmlTransformer.cs
@@ -2,34 +2,42 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Xml;
+using System.Xml.Xsl;
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+/// <summary>
+/// Html transformer transforms the xml file to html file using xslt file.
+/// </summary>
+internal class HtmlTransformer : IHtmlTransformer
 {
-    using System.Xml;
-    using System.Xml.Xsl;
+    private readonly XslCompiledTransform _xslTransform;
 
     /// <summary>
-    /// Html transformer transforms the xml file to html file using xslt file.
+    /// The following function invokes the compiled transform and Loads the xslt file.
     /// </summary>
-    internal class HtmlTransformer : IHtmlTransformer
+    public HtmlTransformer()
     {
-        private readonly XslCompiledTransform xslTransform;
-
-        /// <summary>
-        /// The following function invokes the compiled transform and Loads the xslt file.
-        /// </summary>
-        public HtmlTransformer()
-        {
-            xslTransform = new XslCompiledTransform();
-            xslTransform.Load(XmlReader.Create(this.GetType().Assembly.GetManifestResourceStream("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Html.xslt") ?? throw new InvalidOperationException()));
-        }
-
-        /// <summary>
-        /// It transforms the xml file to html file.
-        /// </summary>
-        public void Transform(string xmlFile, string htmlFile)
-        {
-            xslTransform.Transform(xmlFile, htmlFile);
-        }
+        _xslTransform = new XslCompiledTransform();
+        using var reader = XmlReader.Create(GetType().Assembly.GetManifestResourceStream("Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Html.xslt") ?? throw new InvalidOperationException(), new XmlReaderSettings { CheckCharacters = false, CloseInput = true });
+        _xslTransform.Load(reader);
+    }
+
+    /// <summary>
+    /// It transforms the xml file to html file.
+    /// </summary>
+    public void Transform(string xmlFile, string htmlFile)
+    {
+
+        // DCS happily serializes characters into character references that are not strictly valid XML,
+        // for example &#xFFFF;. DCS will load them, but for XSL to load them here we need to pass it
+        // a reader that we've configured to be tolerant of such references.
+        using XmlReader xr = XmlReader.Create(xmlFile, new XmlReaderSettings() { CheckCharacters = false });
+
+        // Use output settings from the xslt, especially the output method, which is HTML, which avoids outputting broken <div /> tags.
+        using XmlWriter xw = XmlWriter.Create(htmlFile, _xslTransform.OutputSettings);
+
+        _xslTransform.Transform(xr, xw);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
index 225c56190d..0b615e9bda 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/IHtmlTransformer.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+public interface IHtmlTransformer
 {
-    public interface IHtmlTransformer
-    {
-        /// <summary>
-        /// It transforms the xml file to html file.
-        /// </summary>
-        /// <param name="xmlFile"></param>
-        /// <param name="htmlFile"></param>
-        void Transform(string xmlFile, string htmlFile);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// It transforms the xml file to html file.
+    /// </summary>
+    /// <param name="xmlFile"></param>
+    /// <param name="htmlFile"></param>
+    void Transform(string xmlFile, string htmlFile);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
index 564d119eb3..5e87c3b024 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj
@@ -1,48 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    </PropertyGroup>
-    <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-    <PropertyGroup>
-        <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
-        <WarningsAsErrors>true</WarningsAsErrors>
-        <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-        <IsTestProject>false</IsTestProject>
-    </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
+
+  <PropertyGroup>
+    <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger</AssemblyName>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
+    <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+  </PropertyGroup>
+  <ItemGroup>
     <EmbeddedResource Include="Html.xslt" />
   </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-        <Reference Include="System" />
-        <Reference Include="System.Runtime" />
-        <Reference Include="System.Xml" />
-        <Reference Include="Microsoft.CSharp" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-        <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Update="Resources\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Update="Resources\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
-    </ItemGroup>
-    <PropertyGroup Label="Configuration">
-        <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
-    </PropertyGroup>
-    <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.cs
new file mode 100644
index 0000000000..107ad9f4a3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.tt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
index ddb996abdd..1603585975 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/HtmlTestResult.cs
@@ -1,58 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+
+/// <summary>
+/// Test results stores the relevant information to show on html file
+/// </summary>
+[DataContract]
+public class TestResult
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Test results stores the relevant information to show on html file
-    /// </summary>
-    [DataContract]
-    public class TestResult
-    {
-        /// <summary>
-        /// Fully qualified name of the Test Result.
-        /// </summary>
-        [DataMember] public string FullyQualifiedName { get; set; }
-
-        /// <summary>
-        /// Unique identifier for test result
-        /// </summary>
-        [DataMember] public Guid TestResultId { get; set; }
-
-        /// <summary>
-        /// Display Name for the particular Test Result
-        /// </summary>
-        [DataMember] public string DisplayName { get; set; }
-
-        /// <summary>
-        /// The error stack trace of the Test Result.
-        /// </summary>
-        [DataMember] public string ErrorStackTrace { get; set; }
-
-        /// <summary>
-        /// Error message of the Test Result.
-        /// </summary>
-        [DataMember] public string ErrorMessage { get; set; }
-
-        /// <summary>
-        /// Enum that determines the outcome of the test case
-        /// </summary>
-        [DataMember] public TestOutcome ResultOutcome { get; set; }
-
-        /// <summary>
-        /// Total timespan of the TestResult
-        /// </summary>
-        [DataMember] public string Duration { get; set; }
-
-        /// <summary>
-        /// The list of TestResults that are children to the current Test Result.
-        /// </summary>
-        [DataMember] public List<TestResult> InnerTestResults { get; set; }
-    }
+    /// <summary>
+    /// Fully qualified name of the Test Result.
+    /// </summary>
+    [DataMember] public string? FullyQualifiedName { get; set; }
+
+    /// <summary>
+    /// Unique identifier for test result
+    /// </summary>
+    [DataMember] public Guid TestResultId { get; set; }
+
+    /// <summary>
+    /// Display Name for the particular Test Result
+    /// </summary>
+    [DataMember] public string? DisplayName { get; set; }
+
+    /// <summary>
+    /// The error stack trace of the Test Result.
+    /// </summary>
+    [DataMember] public string? ErrorStackTrace { get; set; }
+
+    /// <summary>
+    /// Error message of the Test Result.
+    /// </summary>
+    [DataMember] public string? ErrorMessage { get; set; }
+
+    /// <summary>
+    /// Enum that determines the outcome of the test case
+    /// </summary>
+    [DataMember] public TestOutcome ResultOutcome { get; set; }
+
+    /// <summary>
+    /// Total timespan of the TestResult
+    /// </summary>
+    [DataMember] public string? Duration { get; set; }
+
+    /// <summary>
+    /// The list of TestResults that are children to the current Test Result.
+    /// </summary>
+    [DataMember] public List<TestResult>? InnerTestResults { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
index b4b5d2ad4a..eea80fdfdb 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestResultCollection.cs
@@ -1,48 +1,49 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+
+/// <summary>
+/// Stores the list of failed results and list of all results corresponding to the source.
+/// </summary>
+[DataContract]
+public class TestResultCollection
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+    private readonly string _source;
+
+    public TestResultCollection(string source) => _source = source ?? throw new ArgumentNullException(nameof(source));
+
+    /// <summary>
+    /// Source of the test dll.
+    /// </summary>
+    [DataMember]
+    public string Source
+    {
+        get => _source;
+        private set { }
+    }
 
     /// <summary>
-    /// Stores the list of failed results and list of all results corresponding to the source.
+    /// Hash id of source.
     /// </summary>
-    [DataContract]
-    public class TestResultCollection
+    [DataMember]
+    public int Id
     {
-        private readonly string source;
-
-        public TestResultCollection(string source) => this.source = source ?? throw new ArgumentNullException(nameof(source));
-
-        /// <summary>
-        /// Source of the test dll.
-        /// </summary>
-        [DataMember] public string Source
-        {
-            get => this.source;
-            private set { }
-        }
-
-        /// <summary>
-        /// Hash id of source.
-        /// </summary>
-        [DataMember] public int Id
-        {
-            get => this.source.GetHashCode();
-            private set { }
-        }
-
-        /// <summary>
-        /// List of test results.
-        /// </summary>
-        [DataMember] public List<TestResult> ResultList { get; set; }
-
-        /// <summary>
-        /// List of failed test results.
-        /// </summary>
-        [DataMember] public List<TestResult> FailedResultList { get; set; }
+        get => _source.GetHashCode();
+        private set { }
     }
+
+    /// <summary>
+    /// List of test results.
+    /// </summary>
+    [DataMember] public List<TestResult>? ResultList { get; set; }
+
+    /// <summary>
+    /// List of failed test results.
+    /// </summary>
+    [DataMember] public List<TestResult>? FailedResultList { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
index fd724e922d..12af69e5b2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunDetails.cs
@@ -1,35 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
 
+/// <summary>
+/// It stores the all relevant information of the test run.
+/// </summary>
+[DataContract]
+[SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Part of the public API")]
+public sealed class TestRunDetails
+{
     /// <summary>
-    /// It stores the all relevant information of the test run.
+    /// Test run summary of all test results.
     /// </summary>
-    [DataContract]
-    public sealed class TestRunDetails
-    {
-        /// <summary>
-        /// Test run summary of all test results.
-        /// </summary>
-        [DataMember] public TestRunSummary Summary { get; set; }
+    [DataMember] public TestRunSummary? Summary { get; set; }
 
-        /// <summary>
-        /// List of informational run level messages.
-        /// </summary>
-        [DataMember] public List<string> RunLevelMessageInformational;
+    /// <summary>
+    /// List of informational run level messages.
+    /// </summary>
+    [DataMember] public List<string>? RunLevelMessageInformational;
 
-        /// <summary>
-        /// List of error and warning messages.
-        /// </summary>
-        [DataMember] public List<string> RunLevelMessageErrorAndWarning;
+    /// <summary>
+    /// List of error and warning messages.
+    /// </summary>
+    [DataMember] public List<string>? RunLevelMessageErrorAndWarning;
 
-        /// <summary>
-        /// List of all the results
-        /// </summary>
-        [DataMember] public List<TestResultCollection> ResultCollectionList = new List<TestResultCollection>();
-    }
+    /// <summary>
+    /// List of all the results
+    /// </summary>
+    [DataMember] public List<TestResultCollection>? ResultCollectionList = new();
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
index fdd693946f..18ce46e46a 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/ObjectModel/TestRunSummary.cs
@@ -3,42 +3,41 @@
 
 using System.Runtime.Serialization;
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+
+/// <summary>
+/// Test run summary collects the relevant summary information.
+/// </summary>
+[DataContract]
+public class TestRunSummary
 {
     /// <summary>
-    /// Test run summary collects the relevant summary information.
+    /// Indicates the pass percentage
+    /// </summary>
+    [DataMember] public int PassPercentage { get; set; }
+
+    /// <summary>
+    /// Total test run time.
+    /// </summary>
+    [DataMember] public string? TotalRunTime { get; set; }
+
+    /// <summary>
+    /// Total tests of a test run.
+    /// </summary>
+    [DataMember] public int TotalTests { get; set; }
+
+    /// <summary>
+    /// Passed tests of test run.
+    /// </summary>
+    [DataMember] public int PassedTests { get; set; }
+
+    /// <summary>
+    /// Failed Tests of test run.
+    /// </summary>
+    [DataMember] public int FailedTests { get; set; }
+
+    /// <summary>
+    /// Skipped Tests of test run.
     /// </summary>
-    [DataContract]
-    public class TestRunSummary
-    {
-        /// <summary>
-        /// Indicates the pass percentage
-        /// </summary>
-        [DataMember] public int PassPercentage { get; set; }
-
-        /// <summary>
-        /// Total test run time.
-        /// </summary>
-        [DataMember] public string TotalRunTime { get; set; }
-
-        /// <summary>
-        /// Total tests of a test run.
-        /// </summary>
-        [DataMember] public int TotalTests { get; set; }
-
-        /// <summary>
-        /// Passed tests of test run.
-        /// </summary>
-        [DataMember] public int PassedTests { get; set; }
-
-        /// <summary>
-        /// Failed Tests of test run.
-        /// </summary>
-        [DataMember] public int FailedTests { get; set; }
-
-        /// <summary>
-        /// Skipped Tests of test run.
-        /// </summary>
-        [DataMember] public int SkippedTests { get; set; }
-    }
-}
\ No newline at end of file
+    [DataMember] public int SkippedTests { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Properties/AssemblyInfo.cs
index f0e00a40c6..9273507ed7 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Properties/AssemblyInfo.cs
@@ -1,27 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 using Microsoft.VisualStudio.TestPlatform;
 using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Extensions.HtmlLogger")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM.
-[assembly: Guid("1f26e9c7-5018-4091-a22a-89280f2f98a9")]
-
-[assembly: TestExtensionTypes(typeof(HtmlLogger))]
\ No newline at end of file
+[assembly: TestExtensionTypes(typeof(HtmlLogger))]
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..99dd7c096e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,82 @@
+#nullable enable
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.ExecutionIdPropertyIdentifier = "ExecutionId" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.ExtensionUri = "logger://Microsoft/TestPlatform/HtmlLogger/v1" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.FriendlyName = "Html" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.HtmlFileExtension = "html" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.LogFileNameKey = "LogFileName" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.LogFilePrefixKey = "LogFilePrefix" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.ParentExecutionIdPropertyIdentifier = "ParentExecId" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.TestTypePropertyIdentifier = "TestType" -> string!
+const Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.XmlFileExtension = "xml" -> string!
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.FailedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.HtmlFilePath.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.HtmlLogger() -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.HtmlLogger(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper, Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.IHtmlTransformer! htmlTransformer, System.Runtime.Serialization.XmlObjectSerializer! dataContractSerializer) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, string! testResultsDirPath) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, System.Collections.Generic.Dictionary<string!, string?>! parameters) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.PassedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.ResultCollectionDictionary.get -> System.Collections.Concurrent.ConcurrentDictionary<string!, Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.Results.get -> System.Collections.Concurrent.ConcurrentDictionary<System.Guid, Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.SkippedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TestMessageHandler(object? sender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TestResultHandler(object? sender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TestResultsDirPath.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TestRunCompleteHandler(object? sender, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! e) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TestRunDetails.get -> Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.TotalTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.XmlFilePath.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.IHtmlTransformer
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.IHtmlTransformer.Transform(string! xmlFile, string! htmlFile) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.DisplayName.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.DisplayName.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.Duration.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.Duration.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ErrorMessage.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ErrorMessage.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ErrorStackTrace.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ErrorStackTrace.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.FullyQualifiedName.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.FullyQualifiedName.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.InnerTestResults.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.InnerTestResults.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ResultOutcome.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.ResultOutcome.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.TestResult() -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.TestResultId.get -> System.Guid
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult.TestResultId.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.FailedResultList.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.FailedResultList.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.Id.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.ResultList.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResult!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.ResultList.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.Source.get -> string!
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection.TestResultCollection(string! source) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.ResultCollectionList -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestResultCollection!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.RunLevelMessageErrorAndWarning -> System.Collections.Generic.List<string!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.RunLevelMessageInformational -> System.Collections.Generic.List<string!>?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.Summary.get -> Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.Summary.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunDetails.TestRunDetails() -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.FailedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.FailedTests.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.PassedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.PassedTests.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.PassPercentage.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.PassPercentage.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.SkippedTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.SkippedTests.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.TestRunSummary() -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.TotalRunTime.get -> string?
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.TotalRunTime.set -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.TotalTests.get -> int
+Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel.TestRunSummary.TotalTests.set -> void
+static readonly Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.ExecutionIdProperty -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.OrderedTestTypeGuid -> System.Guid
+static readonly Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.ParentExecIdProperty -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants.TestTypeProperty -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
index 4c39a8ad6e..0b4afa76d8 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -60,6 +60,15 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot generate a unique file name for name &apos;{0}&apos; on path &apos;{1}&apos;..
+        /// </summary>
+        internal static string CannotGenerateUniqueFilePath {
+            get {
+                return ResourceManager.GetString("CannotGenerateUniqueFilePath", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Html test results file : {0}.
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
index 8182657a80..8e0937eb71 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/Resources.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CannotGenerateUniqueFilePath" xml:space="preserve">
+    <value>Cannot generate a unique file name for name '{0}' on path '{1}'.</value>
+  </data>
   <data name="HtmlFilePath" xml:space="preserve">
     <value>Html test results file : {0}</value>
   </data>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
index 797ee003e0..77fa8a375b 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.cs.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Soubor HTML s výsledky testů: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Chyba protokolovače HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Parametry LogFileName a LogFilePrefix nelze uvést společně.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Soubor HTML s výsledky testů: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Chyba protokolovače HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Parametry LogFileName a LogFilePrefix nelze uvést společně.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Nelze vygenerovat jedinečný název souboru pro název {0} v cestě {1}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
index 0036fb22b0..429dae6d63 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.de.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">HTML-Testergebnisdatei: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">HTML-Protokollierungsfehler: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Die Parameter "LogFileName" und "LogFilePrefix" können nicht zusammen angegeben werden. </target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">HTML-Testergebnisdatei: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">HTML-Protokollierungsfehler: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Die Parameter "LogFileName" und "LogFilePrefix" können nicht zusammen angegeben werden. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Für den Namen „{0}“ im Pfad „{1}“ kann kein eindeutiger Dateiname generiert werden.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
index 8db3c86978..ce60e6fe80 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.es.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Archivo de resultados de pruebas HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Error del registrador HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Los parámetros LogFileName y LogFilePrefix no se pueden proporcionar juntos.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Archivo de resultados de pruebas HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Error del registrador HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Los parámetros LogFileName y LogFilePrefix no se pueden proporcionar juntos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">No se puede generar un nombre de archivo único para el nombre "{0}" en la ruta de acceso "{1}".</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
index 5139854891..52278263c2 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.fr.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Fichier de résultats des tests HTML : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Erreur de l'enregistreur d'événements HTML : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Les paramètres LogFileName et LogFilePrefix ne peuvent pas être donnés ensemble. </target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Fichier de résultats des tests HTML : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Erreur de l'enregistreur d'événements HTML : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Les paramètres LogFileName et LogFilePrefix ne peuvent pas être donnés ensemble. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Impossible de générer un nom de fichier unique pour le nom '{0}' sur le chemin d’accès '{1}'.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
index 56e5a0fd34..cb13dfca9a 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.it.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">File di risultati del test HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Errore del logger HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Non è possibile specificare insieme i parametri LogFileName e LogFilePrefix.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">File di risultati del test HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Errore del logger HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Non è possibile specificare insieme i parametri LogFileName e LogFilePrefix.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Impossibile generare un nome file univoco per il nome '{0}' nel percorso '{1}'.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
index 91d9b72ac7..9edbdac06d 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ja.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">HTML テスト結果ファイル: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">HTML ロガー エラー: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">パラメーター LogFileName と LogFilePrefix を同時に指定することはできません。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">HTML テスト結果ファイル: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">HTML ロガー エラー: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">パラメーター LogFileName と LogFilePrefix を同時に指定することはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">パス「{1}」上に名前「{0}」で一意のファイル名を生成できません。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
index fd2d309453..bdaef212d1 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ko.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">HTML 테스트 결과 파일: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">HTML 로거 오류: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">LogFileName 및 LogFilePrefix 매개 변수는 함께 제공할 수 없습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">HTML 테스트 결과 파일: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">HTML 로거 오류: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">LogFileName 및 LogFilePrefix 매개 변수는 함께 제공할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">‘{1}’ 경로에서 ‘{0}’ 이름에 대한 고유 파일 이름을 생성할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
index 73d37a49e0..8e3f36f3b4 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pl.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Plik wyników testu HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Błąd rejestratora HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Parametry LogFileName i LogFilePrefix nie mogą być podawane razem. </target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Plik wyników testu HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Błąd rejestratora HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Parametry LogFileName i LogFilePrefix nie mogą być podawane razem. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Nie można wygenerować unikatowej nazwy pliku dla nazwy „{0}” w ścieżce „{1}”.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
index aea6458fbc..327df6ffb7 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.pt-BR.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Arquivo de resultados de teste HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Erro do Agente de HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Os parâmetros LogFileName e LogFilePrefix não podem ser usados juntos.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Arquivo de resultados de teste HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Erro do Agente de HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Os parâmetros LogFileName e LogFilePrefix não podem ser usados juntos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Não é possível gerar um nome de arquivo exclusivo para o nome '{0}' no caminho '{1}'.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
index a436d171f3..8a036f34f9 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.ru.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Файл результатов теста HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Ошибка в средстве ведения журнала HTML: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">Параметры LogFileName и LogFilePrefix не могут использоваться вместе.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Файл результатов теста HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Ошибка в средстве ведения журнала HTML: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">Параметры LogFileName и LogFilePrefix не могут использоваться вместе.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">Не удается создать уникальное имя файла для имени ''{0}'' пути ''{1}''.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
index 864e4a78cd..1c1ab78076 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.tr.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">HTML test sonuçları dosyası: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">HTML Günlükçü Hatası: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">LogFileName ve LogFilePrefix parametreleri birlikte kullanılamaz. </target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">HTML test sonuçları dosyası: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">HTML Günlükçü Hatası: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">LogFileName ve LogFilePrefix parametreleri birlikte kullanılamaz. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">'{1}' yolunda '{0}' adı için benzersiz bir dosya adı oluşturulamıyor.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
index 7ac0207fec..7b94756f75 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.xlf
@@ -5,18 +5,23 @@
       <trans-unit id="HtmlFilePath">
         <source>Html test results file : {0}</source>
         <target state="new">Obtained Html File's Path is {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HtmlLoggerError">
         <source>Html Logger Error : {0}</source>
         <target state="new">Html Logger Error : {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
         <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together.</target>
-        <note></note>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="new">Cannot generate a unique file name for name '{0}' on path '{1}'.</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
index d1de0ea107..7ba666a953 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">HTML 测试结果文件: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">HTML 记录器错误: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">参数 LogFileName 和 LogFilePrefix 不能一起使用。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">HTML 测试结果文件: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">HTML 记录器错误: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">参数 LogFileName 和 LogFilePrefix 不能一起使用。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">无法为路径“{1}”上的名称“{0}”生成唯一的文件名。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
index e3c03e3c9b..6103295afc 100644
--- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="HtmlFilePath">
-        <source>Html test results file : {0}</source>
-        <target state="translated">Html 測試結果檔案: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="HtmlLoggerError">
-        <source>Html Logger Error : {0}</source>
-        <target state="translated">Html 記錄器錯誤: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="PrefixAndNameProvidedError">
-        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
-        <target state="translated">不能同時指定參數 LogFileName 和 LogFilePrefix。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="HtmlFilePath">
+        <source>Html test results file : {0}</source>
+        <target state="translated">Html 測試結果檔案: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HtmlLoggerError">
+        <source>Html Logger Error : {0}</source>
+        <target state="translated">Html 記錄器錯誤: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PrefixAndNameProvidedError">
+        <source>The parameters LogFileName and LogFilePrefix cannot be given together.</source>
+        <target state="translated">不能同時指定參數 LogFileName 和 LogFilePrefix。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotGenerateUniqueFilePath">
+        <source>Cannot generate a unique file name for name '{0}' on path '{1}'.</source>
+        <target state="translated">無法在路徑 '{1}' 上產生名稱 '{0}' 唯一的檔案名稱。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IDataAttachment.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IDataAttachment.cs
index cae4bcd6c8..6d904dc0ed 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IDataAttachment.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IDataAttachment.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Interface used to define a data attachment.
+/// </summary>
+internal interface IDataAttachment
 {
     /// <summary>
-    /// Interface used to define a data attachment.
+    /// Gets the description for the attachment.
     /// </summary>
-    internal interface IDataAttachment
-    {
-        /// <summary>
-        /// Gets the description for the attachment.
-        /// </summary>
-        string Description { get; }
-    }
+    string Description { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestAggregation.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestAggregation.cs
index 8a5b372067..832cfa408b 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestAggregation.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestAggregation.cs
@@ -1,13 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-    internal interface ITestAggregation : ITestElement
-    {
-        Dictionary<Guid, TestLink> TestLinks { get; }
-    }
+internal interface ITestAggregation : ITestElement
+{
+    Dictionary<Guid, TestLink> TestLinks { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestElement.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestElement.cs
index 39121ae3e0..05400534c5 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestElement.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestElement.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+internal interface ITestElement
 {
-    internal interface ITestElement
-    {
-        TestId Id { get; }
-        string Name { get; set; }
-        string Owner { get; set; }
-        string Storage { get; set; }
-        string Adapter { get; }
-        int Priority { get; set; }
-        bool IsRunnable { get; }
-        TestExecId ExecutionId { get; set; }
-        TestExecId ParentExecutionId { get; set; }
-        TestListCategoryId CategoryId { get; set; }
-        TestCategoryItemCollection TestCategories { get; }
-        WorkItemCollection WorkItems { get; set; }
-        TestType TestType { get; }
-    }
+    TestId Id { get; }
+    string Name { get; set; }
+    string Owner { get; set; }
+    string Storage { get; set; }
+    string Adapter { get; }
+    int Priority { get; set; }
+    bool IsRunnable { get; }
+    TestExecId ExecutionId { get; set; }
+    TestExecId ParentExecutionId { get; set; }
+    TestListCategoryId CategoryId { get; set; }
+    TestCategoryItemCollection TestCategories { get; }
+    WorkItemCollection WorkItems { get; set; }
+    TestType TestType { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResult.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResult.cs
index f1242fb377..7f2acd7fa3 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResult.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-    internal interface ITestResult
-    {
-        TestResultId Id { get; }
-        string ResultType { get; set; }
-        string StdOut { get; set; }
-        string StdErr { get; set; }
-        string DebugTrace { get; set; }
-        string TestResultsDirectory { get; }
-        string RelativeTestResultsDirectory { get; }
-        string ErrorMessage { get; set; }
-        string ErrorStackTrace { get; set; }
-        string ComputerName { get; }
-        string[] TextMessages { get; set; }
-        int DataRowInfo { get; set; }
-        DateTime StartTime { get; set; }
-        DateTime EndTime { get; set; }
-        TimeSpan Duration { get; set; }
-        TestOutcome Outcome { get; set; }
-    }
+internal interface ITestResult
+{
+    TestResultId Id { get; }
+    string? ResultType { get; set; }
+    string StdOut { get; set; }
+    string StdErr { get; set; }
+    string DebugTrace { get; set; }
+    string TestResultsDirectory { get; }
+    string RelativeTestResultsDirectory { get; }
+    string ErrorMessage { get; set; }
+    string ErrorStackTrace { get; set; }
+    string ComputerName { get; }
+    string[] TextMessages { get; set; }
+    int DataRowInfo { get; set; }
+    DateTime StartTime { get; set; }
+    DateTime EndTime { get; set; }
+    TimeSpan Duration { get; set; }
+    TestOutcome Outcome { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResultAggregation.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResultAggregation.cs
index 7ee85e3e4c..6746baf0ce 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResultAggregation.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/ITestResultAggregation.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-    internal interface ITestResultAggregation : ITestResult
-    {
-        List<ITestResult> InnerResults { get; }
-    }
+internal interface ITestResultAggregation : ITestResult
+{
+    List<ITestResult> InnerResults { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStore.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStore.cs
index cb020b977d..f4dd43d360 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStore.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStore.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System.Xml;
+using System.Xml;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// Implementing this interface indicates a custom persistence logic is provided.
+/// The attribute based persistence is ignored in such a case.
+/// </summary>
+internal interface IXmlTestStore
+{
     /// <summary>
-    /// Implementing this interface indicates a custom persistence logic is provided.
-    /// The attribute based persistence is ignored in such a case.
+    /// Saves the class under the XmlElement.
     /// </summary>
-    internal interface IXmlTestStore
-    {
-        /// <summary>
-        /// Saves the class under the XmlElement.
-        /// </summary>
-        /// <param name="element"> XmlElement element </param>
-        /// <param name="parameters"> XmlTestStoreParameters parameters</param>
-        void Save(XmlElement element, XmlTestStoreParameters parameters);
-    }
+    /// <param name="element"> XmlElement element </param>
+    /// <param name="parameters"> XmlTestStoreParameters parameters</param>
+    void Save(XmlElement element, XmlTestStoreParameters? parameters);
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStoreCustom.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStoreCustom.cs
index 7ff25b9fc0..262ef2ca61 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStoreCustom.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/IXmlTestStoreCustom.cs
@@ -1,24 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML
-{
-    using System.Diagnostics.CodeAnalysis;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
+/// <summary>
+/// Implementing this interface allows you to customize XmlStore persistence.
+/// </summary>
+internal interface IXmlTestStoreCustom
+{
     /// <summary>
-    /// Implementing this interface allows you to customize XmlStore persistence.
+    /// Gets the name of the tag to use to persist this object.
     /// </summary>
-    internal interface IXmlTestStoreCustom
-    {
-        /// <summary>
-        /// Gets the name of the tag to use to persist this object.
-        /// </summary>
-        string ElementName { get; }
+    string ElementName { get; }
 
-        /// <summary>
-        /// Gets the xml namespace to use when creating the element
-        /// </summary>
-        [SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings", Justification = "Reviewed. Suppression is OK here.")]
-        string NamespaceUri { get; }
-    }
+    /// <summary>
+    /// Gets the xml namespace to use when creating the element
+    /// </summary>
+    string? NamespaceUri { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/XmlTestStoreParameters.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/XmlTestStoreParameters.cs
index f89b6e93ea..7c80a209dc 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/XmlTestStoreParameters.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Interfaces/XmlTestStoreParameters.cs
@@ -1,49 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Optional parameters to the persistence process. A class implementing IPersistable can
+/// use the parameter values to alter its load/save behavior.
+/// </summary>
+/// <example>
+/// Example: a class has a summary and details fields. Details are large, so they're only
+/// saved when 'MyClass.SaveDetails' parameter is set to 'true'.
+/// </example>
+internal sealed class XmlTestStoreParameters : Dictionary<string, object>
 {
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
+    private XmlTestStoreParameters()
+    {
+    }
 
     /// <summary>
-    /// Optional parameters to the persistence process. A class implementing IPersistable can 
-    /// use the parameter values to alter its load/save behavior.
+    /// To create XmlTestStoreParameters object
     /// </summary>
-    /// <example>
-    /// Example: a class has a summary and details fields. Details are large, so they're only 
-    /// saved when 'MyClass.SaveDetails' parameter is set to 'true'.
-    /// </example>
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is ok here.")]
-    internal sealed class XmlTestStoreParameters : Dictionary<string, object>
+    /// <returns>
+    /// The <see cref="XmlTestStoreParameters"/>.
+    /// </returns>
+    public static XmlTestStoreParameters GetParameters()
     {
-        private XmlTestStoreParameters()
-        {
-        }
-
-        /// <summary>
-        /// To create XmlTestStoreParameters object
-        /// </summary>
-        /// <returns>
-        /// The <see cref="XmlTestStoreParameters"/>.
-        /// </returns>
-        public static XmlTestStoreParameters GetParameters()
-        {
-            return new XmlTestStoreParameters();
-        }
+        return new XmlTestStoreParameters();
+    }
 
-        /// <summary>
-        /// Check for the parameter
-        /// </summary>
-        /// <param name="parameter">
-        /// The parameter.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public bool Contains(string parameter)
-        {
-            return this.ContainsKey(parameter);
-        }
+    /// <summary>
+    /// Check for the parameter
+    /// </summary>
+    /// <param name="parameter">
+    /// The parameter.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public bool Contains(string parameter)
+    {
+        return ContainsKey(parameter);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
index a370d444f5..d224d7bda0 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
@@ -1,53 +1,90 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger</AssemblyName>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
+    <!--
+      Targetting netstandard2.0 and also net462, because we already had explicit packaging of net462 libraries,
+      and this article recommends to provide net462 along netstandard2.0
+      https://learn.microsoft.com/en-us/dotnet/standard/library-guidance/cross-platform-targeting#multi-targeting
+    -->
+    <TargetFrameworks>$(ExtensionTargetFrameworks);net462</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\TrxResource.resx" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
+
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.Extensions.TrxLogger.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.Extensions.TrxLogger</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
   </ItemGroup>
+
   <ItemGroup>
-      <Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
+    <Compile Include="$(RepoRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.0.0" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
+
+  <ItemGroup>
+    <!-- On .NET5 and newer this dependency moved to be shipped inbox. -->
+    <PackageReference Include="System.Security.Principal.Windows" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5')) != true" Version="$(SystemSecurityPrincipalWindowsVersion)" />
   </ItemGroup>
+
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\TrxResource.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>TrxResource.resx</DependentUpon>
     </Compile>
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Resources\TrxResource.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>TrxResource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec
new file mode 100644
index 0000000000..adfd9708bc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net462">
+        <dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
+      </group>
+    </dependencies>
+
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
+    </frameworkAssemblies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <file src="net462\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="lib\net462\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="lib\netstandard2.0\" />
+
+    <!-- Add localized resources -->
+    <file src="net462\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.cs
new file mode 100644
index 0000000000..356a902899
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="TPDebug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="TPDebug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.tt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.tt
new file mode 100644
index 0000000000..48904546ff
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="TPDebug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="TPDebug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/CollectorDataEntry.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/CollectorDataEntry.cs
index d07a0e2e03..8093315689 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/CollectorDataEntry.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/CollectorDataEntry.cs
@@ -1,240 +1,196 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Data entry from a collector along with information what this collector is and what agent it was collected on.
+/// Instances are created by Agent and sent to Controller. Then controller puts agent names in.
+/// The user is not supposed to create instances of this.
+/// </summary>
+internal class CollectorDataEntry : IXmlTestStore
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-
     /// <summary>
-    /// Data entry from a collector along with information what this collector is and what agent it was collected on.
-    /// Instances are created by Agent and sent to Controller. Then controller puts agent names in.
-    /// The user is not supposed to create instances of this.
+    /// List of data attachments. These attachments can be things such as files that the
+    /// collector wants to make available to the publishers.
     /// </summary>
-    internal class CollectorDataEntry : IXmlTestStore
-    {
-        #region Private Fields
-
-        /// <summary>
-        /// List of data attachments. These attachments can be things such as files that the
-        /// collector wants to make available to the publishers.
-        /// </summary>
-        private readonly List<IDataAttachment> attachments;
-
-        /// <summary>
-        /// Name of the agent from which we received the data
-        /// </summary>
-        private string agentName;
-
-        /// <summary>
-        /// Display name of the agent from which we received the data
-        /// </summary>
-        private string agentDisplayName;
-
-        /// <summary>
-        /// Flag indicating whether this data is coming from a remote (not hosted) agent
-        /// </summary>
-        private bool isFromRemoteAgent;
-
-        /// <summary>
-        /// URI of the collector.
-        /// </summary>
-        private Uri uri;
-
-        /// <summary>
-        /// Name of the collector that should be displayed to the user.
-        /// </summary>
-        private string collectorDisplayName;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Used by the aggregator to put collector Uri, agentName, string agentDisplayName, whether it's remote data, and
-        /// Attachments.
-        /// </summary>
-        /// <param name="uri">
-        /// The uri.
-        /// </param>
-        /// <param name="collectorDisplayName">
-        /// The collector Display Name.
-        /// </param>
-        /// <param name="agentName">
-        /// The agent Name.
-        /// </param>
-        /// <param name="agentDisplayName">
-        /// The agent Display Name.
-        /// </param>
-        /// <param name="isFromRemoteAgent">
-        /// Is From Remote Agent.
-        /// </param>
-        /// <param name="attachments">
-        /// The attachments.
-        /// </param>
-        public CollectorDataEntry(Uri uri, string collectorDisplayName, string agentName, string agentDisplayName, bool isFromRemoteAgent, IList<IDataAttachment> attachments)
-            : this()
-        {
-            this.Initialize(uri, collectorDisplayName, agentName, agentDisplayName, isFromRemoteAgent, attachments);
-        }
+    private readonly List<IDataAttachment> _attachments = new();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectorDataEntry"/> class.
-        /// </summary>
-        /// <remarks>
-        /// For XML persistence
-        /// </remarks>
-        internal CollectorDataEntry()
-        {
-            this.attachments = new List<IDataAttachment>();
-        }
+    /// <summary>
+    /// Name of the agent from which we received the data
+    /// </summary>
+    private readonly string _agentName;
 
-        /// <summary>
-        /// Copies the specified collector data entry, making the paths in the data attachments absolute or relative, with
-        /// respect to the results directory
-        /// </summary>
-        /// <param name="other">The instance to copy from</param>
-        /// <param name="resultsDirectory">The results directory to use to make paths in the data attachments relative or absolute</param>
-        /// <param name="useAbsolutePaths">True to use absolute paths in this instance, false to use relative paths</param>
-        private CollectorDataEntry(CollectorDataEntry other, string resultsDirectory, bool useAbsolutePaths)
-        {
-            Debug.Assert(other != null, "'other' is null");
-            Debug.Assert(other.attachments != null, "'other.m_attachments' is null");
-            Debug.Assert(!string.IsNullOrEmpty(resultsDirectory), "'resultsDirectory' is null or empty");
+    /// <summary>
+    /// Display name of the agent from which we received the data
+    /// </summary>
+    private readonly string _agentDisplayName;
 
-            this.attachments = new List<IDataAttachment>(other.attachments.Count);
-            this.Initialize(other.uri, other.collectorDisplayName, other.agentName, other.agentDisplayName, other.isFromRemoteAgent, null);
+    /// <summary>
+    /// Flag indicating whether this data is coming from a remote (not hosted) agent
+    /// </summary>
+    private readonly bool _isFromRemoteAgent;
 
-            // Clone the attachments
-            foreach (IDataAttachment attachment in other.attachments)
-            {
-                Debug.Assert(attachment != null, "'attachment' is null");
-
-                UriDataAttachment uriDataAttachment = attachment as UriDataAttachment;
-                if (uriDataAttachment != null)
-                {
-                    this.attachments.Add(uriDataAttachment.Clone(resultsDirectory, useAbsolutePaths));
-                }
-                else
-                {
-                    this.attachments.Add(attachment);
-                }
-            }
-        }
+    /// <summary>
+    /// URI of the collector.
+    /// </summary>
+    private readonly Uri _uri;
 
-        #endregion
+    /// <summary>
+    /// Name of the collector that should be displayed to the user.
+    /// </summary>
+    private readonly string _collectorDisplayName;
 
-        #region Public Properties
+    /// <summary>
+    /// Used by the aggregator to put collector Uri, agentName, string agentDisplayName, whether it's remote data, and
+    /// Attachments.
+    /// </summary>
+    /// <param name="uri">
+    /// The uri.
+    /// </param>
+    /// <param name="collectorDisplayName">
+    /// The collector Display Name.
+    /// </param>
+    /// <param name="agentName">
+    /// The agent Name.
+    /// </param>
+    /// <param name="agentDisplayName">
+    /// The agent Display Name.
+    /// </param>
+    /// <param name="isFromRemoteAgent">
+    /// Is From Remote Agent.
+    /// </param>
+    /// <param name="attachments">
+    /// The attachments.
+    /// </param>
+    public CollectorDataEntry(Uri uri, string collectorDisplayName, string agentName, string agentDisplayName, bool isFromRemoteAgent, IList<IDataAttachment>? attachments)
+    {
+        EqtAssert.ParameterNotNull(uri, nameof(uri));
+        EqtAssert.StringNotNullOrEmpty(collectorDisplayName, nameof(collectorDisplayName));
+        EqtAssert.StringNotNullOrEmpty(agentName, nameof(agentName));
+        EqtAssert.StringNotNullOrEmpty(agentDisplayName, nameof(agentDisplayName));
 
-        /// <summary>
-        /// Gets the read-only list of data attachments
-        /// </summary>
-        public IList<IDataAttachment> Attachments
+        if (null != attachments)
         {
-            get
+            // Copy the attachments
+            foreach (IDataAttachment attachment in attachments)
             {
-                return this.attachments.AsReadOnly();
+                AddAttachment(attachment);
             }
         }
 
-        #endregion
+        // Note that the data can be null.
+        _uri = uri;
+        _collectorDisplayName = collectorDisplayName;
+        _agentName = agentName.Trim();
+        _agentDisplayName = agentDisplayName.Trim();
+        _isFromRemoteAgent = isFromRemoteAgent;
+    }
 
-        #region IXmlTestStore Members
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CollectorDataEntry"/> class.
+    /// </summary>
+    /// <remarks>
+    /// For XML persistence
+    /// </remarks>
+    internal CollectorDataEntry()
+    {
+        _agentName = null!;
+        _agentDisplayName = null!;
+        _uri = null!;
+        _collectorDisplayName = null!;
+    }
 
-        /// <summary>
-        /// Saves the state to the XML element
-        /// </summary>
-        /// <param name="element">The XML element to save to</param>
-        /// <param name="parameters">Parameters to customize the save behavior</param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
+    /// <summary>
+    /// Gets the read-only list of data attachments
+    /// </summary>
+    public IList<IDataAttachment> Attachments
+    {
+        get
         {
-            EqtAssert.ParameterNotNull(element, nameof(element));
-
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSimpleField(element, "@agentName", this.agentName, null);
-            helper.SaveSimpleField(element, "@agentDisplayName", this.agentDisplayName, this.agentName);
-            helper.SaveSimpleField(element, "@isFromRemoteAgent", this.isFromRemoteAgent, false);
-            helper.SaveSimpleField(element, "@uri", this.uri.AbsoluteUri, null);
-            helper.SaveSimpleField(element, "@collectorDisplayName", this.collectorDisplayName, string.Empty);
+            return _attachments.AsReadOnly();
+        }
+    }
 
-            IList<UriDataAttachment> uriAttachments = new List<UriDataAttachment>();
-            foreach (IDataAttachment attachment in this.Attachments)
-            {
-                UriDataAttachment uriAtt = attachment as UriDataAttachment;
-                if (uriAtt != null)
-                {
-                    uriAttachments.Add(uriAtt);
-                }
-            }
 
-            helper.SaveIEnumerable(uriAttachments, element, "UriAttachments", "A", "UriAttachment", parameters);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the state to the XML element
+    /// </summary>
+    /// <param name="element">The XML element to save to</param>
+    /// <param name="parameters">Parameters to customize the save behavior</param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        EqtAssert.ParameterNotNull(element, nameof(element));
 
-        #region Internal Methods
+        XmlPersistence helper = new();
+        helper.SaveSimpleField(element, "@agentName", _agentName, null);
+        helper.SaveSimpleField(element, "@agentDisplayName", _agentDisplayName, _agentName);
+        helper.SaveSimpleField(element, "@isFromRemoteAgent", _isFromRemoteAgent, false);
+        helper.SaveSimpleField(element, "@uri", _uri.AbsoluteUri, null);
+        helper.SaveSimpleField(element, "@collectorDisplayName", _collectorDisplayName, string.Empty);
 
-        /// <summary>
-        /// Adds a data attachment to the list of data attachments
-        /// </summary>
-        /// <param name="attachment">The attachment to add</param>
-        internal void AddAttachment(IDataAttachment attachment)
+        IList<UriDataAttachment> uriAttachments = new List<UriDataAttachment>();
+        foreach (IDataAttachment attachment in Attachments)
         {
-            if (attachment == null)
+            if (attachment is UriDataAttachment uriAtt)
             {
-                throw new ArgumentNullException(nameof(attachment));
+                uriAttachments.Add(uriAtt);
             }
-
-            this.attachments.Add(attachment);
         }
 
-        /// <summary>
-        /// Clones the instance and attachments, with file paths in file attachments absolute or relative as specified
-        /// </summary>
-        /// <param name="resultsDirectory">The results directory to use to make paths in the data attachments relative or absolute</param>
-        /// <param name="useAbsolutePaths">True to use absolute paths in this instance, false to use relative paths</param>
-        /// <returns>A clone of the instance containing cloned attachments with file paths made absolute or relative</returns>
-        internal CollectorDataEntry Clone(string resultsDirectory, bool useAbsolutePaths)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(resultsDirectory), "'resultsDirectory' is null or empty");
-            Debug.Assert(resultsDirectory == resultsDirectory.Trim(), "'resultsDirectory' contains whitespace at the ends");
+        helper.SaveIEnumerable(uriAttachments, element, "UriAttachments", "A", "UriAttachment", parameters);
+    }
 
-            return new CollectorDataEntry(this, resultsDirectory, useAbsolutePaths);
-        }
+    #endregion
+    /// <summary>
+    /// Adds a data attachment to the list of data attachments
+    /// </summary>
+    /// <param name="attachment">The attachment to add</param>
+    internal void AddAttachment(IDataAttachment attachment)
+    {
+        ValidateArg.NotNull(attachment, nameof(attachment));
+        _attachments.Add(attachment);
+    }
 
-        #endregion
+    /// <summary>
+    /// Clones the instance and attachments, with file paths in file attachments absolute or relative as specified
+    /// </summary>
+    /// <param name="resultsDirectory">The results directory to use to make paths in the data attachments relative or absolute</param>
+    /// <param name="useAbsolutePaths">True to use absolute paths in this instance, false to use relative paths</param>
+    /// <returns>A clone of the instance containing cloned attachments with file paths made absolute or relative</returns>
+    internal CollectorDataEntry Clone(string resultsDirectory, bool useAbsolutePaths)
+    {
+        TPDebug.Assert(!resultsDirectory.IsNullOrEmpty(), "'resultsDirectory' is null or empty");
+        TPDebug.Assert(resultsDirectory == resultsDirectory.Trim(), "'resultsDirectory' contains whitespace at the ends");
 
-        #region Private Methods
+        var collector = new CollectorDataEntry(_uri, _collectorDisplayName, _agentName, _agentDisplayName, _isFromRemoteAgent, null);
 
-        private void Initialize(Uri uri, string collectorDisplayName, string agentName, string agentDisplayName, bool isFromRemoteAgent, IEnumerable<IDataAttachment> attachments)
+        // Clone the attachments
+        foreach (IDataAttachment attachment in _attachments)
         {
-            EqtAssert.ParameterNotNull(uri, nameof(uri));
-            EqtAssert.StringNotNullOrEmpty(collectorDisplayName, nameof(collectorDisplayName));
-            EqtAssert.StringNotNullOrEmpty(agentName, nameof(agentName));
-            EqtAssert.StringNotNullOrEmpty(agentDisplayName, nameof(agentDisplayName));
+            TPDebug.Assert(attachment is not null, "'attachment' is null");
 
-            if (null != attachments)
+            if (attachment is UriDataAttachment uriDataAttachment)
             {
-                // Copy the attachments
-                foreach (IDataAttachment attachment in attachments)
-                {
-                    this.AddAttachment(attachment);
-                }
+                collector._attachments.Add(uriDataAttachment.Clone(resultsDirectory, useAbsolutePaths));
+            }
+            else
+            {
+                collector._attachments.Add(attachment);
             }
-
-            // Note that the data can be null.
-            this.uri = uri;
-            this.collectorDisplayName = collectorDisplayName;
-            this.agentName = agentName.Trim();
-            this.agentDisplayName = agentDisplayName.Trim();
-            this.isFromRemoteAgent = isFromRemoteAgent;
         }
 
-        #endregion
+        return collector;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/OrderedTestElement.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/OrderedTestElement.cs
index 907b14bc6d..5046a0c619 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/OrderedTestElement.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/OrderedTestElement.cs
@@ -1,35 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Ordered test element.
+/// </summary>
+internal class OrderedTestElement : TestElementAggregation, IXmlTestStoreCustom
 {
-    using System;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    public OrderedTestElement(Guid id, string name, string adapter) : base(id, name, adapter) { }
 
-    /// <summary>
-    /// Ordered test element.
-    /// </summary>
-    internal class OrderedTestElement : TestElementAggregation, IXmlTestStoreCustom
+    string IXmlTestStoreCustom.ElementName
     {
-        public OrderedTestElement(Guid id, string name, string adapter) : base(id, name, adapter) { }
-
-        string IXmlTestStoreCustom.ElementName
-        {
-            get { return Constants.OrderedTestElementName; }
-        }
+        get { return Constants.OrderedTestElementName; }
+    }
 
-        string IXmlTestStoreCustom.NamespaceUri
-        {
-            get { return null; }
-        }
+    string? IXmlTestStoreCustom.NamespaceUri
+    {
+        get { return null; }
+    }
 
-        /// <summary>
-        /// Gets the test type.
-        /// </summary>
-        public override TestType TestType
-        {
-            get { return Constants.OrderedTestType; }
-        }
+    /// <summary>
+    /// Gets the test type.
+    /// </summary>
+    public override TestType TestType
+    {
+        get { return Constants.OrderedTestType; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/RunInfo.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/RunInfo.cs
index 8318c7a16a..4c245f3e2e 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/RunInfo.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/RunInfo.cs
@@ -1,85 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using System;
+using System.Xml;
 
-    /// <summary>
-    /// This is a record about one run-level event that happened at run execution or around it.
-    /// </summary>
-    internal sealed class RunInfo : IXmlTestStore
-    {
-        #region Fields
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-        [StoreXmlSimpleField("Text", "")]
-        private string text;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-        private Exception exception;
-
-        [StoreXmlSimpleField("@computerName", "")]
-        private string computer;
-
-        [StoreXmlSimpleField("@outcome")]
-        private TestOutcome outcome;
-
-        [StoreXmlSimpleField]
-        private DateTime timestamp;
+/// <summary>
+/// This is a record about one run-level event that happened at run execution or around it.
+/// </summary>
+internal sealed class RunInfo : IXmlTestStore
+{
+    [StoreXmlSimpleField("Text", "")]
+    private readonly string _text;
 
-        #endregion
+    private readonly Exception? _exception;
 
-        #region Constructors
+    [StoreXmlSimpleField("@computerName", "")]
+    private readonly string _computer;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RunInfo"/> class.
-        /// </summary>
-        /// <param name="textMessage">
-        /// The text message.
-        /// </param>
-        /// <param name="ex">
-        /// The exception
-        /// </param>
-        /// <param name="computer">
-        /// The computer.
-        /// </param>
-        /// <param name="outcome">
-        /// The outcome.
-        /// </param>
-        public RunInfo(string textMessage, Exception ex, string computer, TestOutcome outcome)
-        {
-            Debug.Assert(computer != null, "computer is null");
+    [StoreXmlSimpleField("@outcome")]
+    private readonly TestOutcome _outcome;
 
-            this.text = textMessage;
-            this.exception = ex;
-            this.computer = computer;
-            this.outcome = outcome;
-            this.timestamp = DateTime.UtcNow;
-        }
+    [StoreXmlSimpleField("@timestamp")]
+    private readonly DateTime _timestamp;
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RunInfo"/> class.
+    /// </summary>
+    /// <param name="textMessage">
+    /// The text message.
+    /// </param>
+    /// <param name="ex">
+    /// The exception
+    /// </param>
+    /// <param name="computer">
+    /// The computer.
+    /// </param>
+    /// <param name="outcome">
+    /// The outcome.
+    /// </param>
+    public RunInfo(string textMessage, Exception? ex, string computer, TestOutcome outcome)
+    {
+        TPDebug.Assert(computer != null, "computer is null");
 
-        #region IXmlTestStore Members
+        _text = textMessage;
+        _exception = ex;
+        _computer = computer;
+        _outcome = outcome;
+        _timestamp = DateTime.UtcNow;
+    }
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSingleFields(element, this, parameters);
-            helper.SaveSimpleField(element, "Exception", this.exception, null);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+        helper.SaveSingleFields(element, this, parameters);
+        helper.SaveSimpleField(element, "Exception", _exception, null);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs
index 8d10ecdf3c..785a804527 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs
@@ -1,268 +1,246 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Text;
+using System;
+using System.Text;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+#region TestCategoryItem
+/// <summary>
+/// Stores a string which categorizes the Test
+/// </summary>
+internal sealed class TestCategoryItem : IXmlTestStore
+{
+    [StoreXmlSimpleField(Location = "@TestCategory", DefaultValue = "")]
+    private readonly string _category = string.Empty;
 
-    #region TestCategoryItem
     /// <summary>
-    /// Stores a string which categorizes the Test
+    /// Create a new item with the category set
     /// </summary>
-    internal sealed class TestCategoryItem : IXmlTestStore
+    /// <param name="category">The category.</param>
+    public TestCategoryItem(string? category)
     {
-        #region Fields
-        [StoreXmlSimpleField(Location = "@TestCategory", DefaultValue = "")]
-        private string category = string.Empty;
+        // Treat null as empty.
+        category ??= string.Empty;
 
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Create a new item with the category set
-        /// </summary>
-        /// <param name="category">The category.</param>
-        public TestCategoryItem(string category)
-        {
-            // Treat null as empty.
-            if (category == null)
-            {
-                category = String.Empty;
-            }
 
+        _category = StripIllegalChars(category);
+    }
 
-            this.category = this.StripIllegalChars(category);
+    /// <summary>
+    /// Gets the category for this TestCategory
+    /// </summary>
+    public string TestCategory
+    {
+        get
+        {
+            return _category;
         }
+    }
 
-        #endregion
+    private static string StripIllegalChars(string category)
+    {
+        string ret = category.Trim();
+        ret = ret.Replace("&", string.Empty);
+        ret = ret.Replace("|", string.Empty);
+        ret = ret.Replace("!", string.Empty);
+        ret = ret.Replace(",", string.Empty);
+        return ret;
+    }
 
-        #region Properties/Methods
-        /// <summary>
-        /// Gets the category for this TestCategory
-        /// </summary>
-        public string TestCategory
+    /// <summary>
+    /// Compare the values of the items
+    /// </summary>
+    /// <param name="other">Value being compared to.</param>
+    /// <returns>True if the values are the same and false otherwise.</returns>
+    public override bool Equals(object? other)
+    {
+        if (other is not TestCategoryItem otherItem)
         {
-            get
-            {
-                return this.category;
-            }
+            return false;
         }
 
-        private string StripIllegalChars(string category)
-        {
-            string ret = category.Trim();
-            ret = ret.Replace("&", String.Empty);
-            ret = ret.Replace("|", String.Empty);
-            ret = ret.Replace("!", String.Empty);
-            ret = ret.Replace(",", String.Empty);
-            return ret;
-        }
+        TPDebug.Assert(_category != null, "category is null");
+        return string.Equals(_category, otherItem._category, StringComparison.OrdinalIgnoreCase);
+    }
 
-        #endregion
+    /// <summary>
+    /// Convert the category name to a hashcode
+    /// </summary>
+    /// <returns>Hashcode of the category.</returns>
+    public override int GetHashCode()
+    {
+        TPDebug.Assert(_category != null, "category is null");
+        return _category.ToUpperInvariant().GetHashCode();
+    }
 
-        #region Methods - overrides
-        /// <summary>
-        /// Compare the values of the items
-        /// </summary>
-        /// <param name="other">Value being compared to.</param>
-        /// <returns>True if the values are the same and false otherwise.</returns>
-        public override bool Equals(object other)
-        {
-            TestCategoryItem otherItem = other as TestCategoryItem;
-            if (otherItem == null)
-            {
-                return false;
-            }
-            Debug.Assert(this.category != null, "category is null");
-            return String.Equals(this.category, otherItem.category, StringComparison.OrdinalIgnoreCase);
-        }
+    /// <summary>
+    /// Convert the category name to a string
+    /// </summary>
+    /// <returns>The category.</returns>
+    public override string ToString()
+    {
+        TPDebug.Assert(_category != null, "category is null");
+        return _category;
+    }
 
-        /// <summary>
-        /// Convert the category name to a hashcode
-        /// </summary>
-        /// <returns>Hashcode of the category.</returns>
-        public override int GetHashCode()
-        {
-            Debug.Assert(this.category != null, "category is null");
-            return this.category.ToUpperInvariant().GetHashCode();
-        }
+    #region IXmlTestStore Members
 
-        /// <summary>
-        /// Convert the category name to a string
-        /// </summary>
-        /// <returns>The category.</returns>
-        public override string ToString()
-        {
-            Debug.Assert(this.category != null, "category is null");
-            return this.category;
-        }
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement.
+    /// </summary>
+    /// <param name="element"> XmlElement element </param>
+    /// <param name="parameters"> XmlTestStoreParameters parameters</param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        new XmlPersistence().SaveSingleFields(element, this, parameters);
+    }
 
-        #region IXmlTestStore Members
+    #endregion
+}
+#endregion
 
-        /// <summary>
-        /// Saves the class under the XmlElement.
-        /// </summary>
-        /// <param name="element"> XmlElement element </param>
-        /// <param name="parameters"> XmlTestStoreParameters parameters</param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
+#region TestCategoryItemCollection
+/// <summary>
+/// A collection of strings which categorize the test.
+/// </summary>
+internal sealed class TestCategoryItemCollection : EqtBaseCollection<TestCategoryItem>
+{
+    /// <summary>
+    /// Creates an empty TestCategoryItemCollection.
+    /// </summary>
+    public TestCategoryItemCollection()
+    {
+    }
+
+    /// <summary>
+    /// Create a new TestCategoryItemCollection based on the string array.
+    /// </summary>
+    /// <param name="items">Add these items to the collection.</param>
+    public TestCategoryItemCollection(string[] items)
+    {
+        EqtAssert.ParameterNotNull(items, nameof(items));
+        foreach (string s in items)
         {
-            new XmlPersistence().SaveSingleFields(element, this, parameters);
+            Add(s);
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Adds the category.
+    /// </summary>
+    /// <param name="item">Category to be added.</param>
+    public void Add(string item)
+    {
+        Add(new TestCategoryItem(item));
     }
-    #endregion
 
-    #region TestCategoryItemCollection
     /// <summary>
-    /// A collection of strings which categorize the test.
+    /// Adds the category.
     /// </summary>
-    internal sealed class TestCategoryItemCollection : EqtBaseCollection<TestCategoryItem>
+    /// <param name="item">Category to be added.</param>
+    public override void Add(TestCategoryItem item)
     {
-        #region Constructors
-        /// <summary>
-        /// Creates an empty TestCategoryItemCollection.
-        /// </summary>
-        public TestCategoryItemCollection()
+        EqtAssert.ParameterNotNull(item, nameof(item));
+
+        // Don't add empty items.
+        if (!item.TestCategory.IsNullOrEmpty())
         {
+            base.Add(item);
         }
+    }
 
-        /// <summary>
-        /// Create a new TestCategoryItemCollection based on the string array.
-        /// </summary>
-        /// <param name="items">Add these items to the collection.</param>
-        public TestCategoryItemCollection(string[] items)
+    /// <summary>
+    /// Convert the TestCategoryItemCollection to a string.
+    /// each item is surrounded by a comma (,)
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        StringBuilder returnString = new();
+        if (Count > 0)
         {
-            EqtAssert.ParameterNotNull(items, nameof(items));
-            foreach (string s in items)
+            returnString.Append(',');
+            foreach (TestCategoryItem item in this)
             {
-                this.Add(s);
+                returnString.Append(item.TestCategory);
+                returnString.Append(',');
             }
         }
 
-        #endregion
+        return returnString.ToString();
+    }
 
-        #region Methods
+    /// <summary>
+    /// Convert the TestCategoryItemCollection to an array of strings.
+    /// </summary>
+    /// <returns>Array of strings containing the test categories.</returns>
+    public string[] ToArray()
+    {
+        string[] result = new string[Count];
 
-        /// <summary>
-        /// Adds the category.
-        /// </summary>
-        /// <param name="item">Category to be added.</param>
-        public void Add(string item)
+        int i = 0;
+        foreach (TestCategoryItem item in this)
         {
-            this.Add(new TestCategoryItem(item));
+            result[i++] = item.TestCategory;
         }
 
-        /// <summary>
-        /// Adds the category.
-        /// </summary>
-        /// <param name="item">Category to be added.</param>
-        public override void Add(TestCategoryItem item)
-        {
-            EqtAssert.ParameterNotNull(item, nameof(item));
+        return result;
+    }
 
-            // Don't add empty items.
-            if (!String.IsNullOrEmpty(item.TestCategory))
-            {
-                base.Add(item);
-            }
-        }
+    /// <summary>
+    /// Compare the collection items
+    /// </summary>
+    /// <param name="obj">other collection</param>
+    /// <returns>true if the collections contain the same items</returns>
+    public override bool Equals(object? obj)
+    {
+        bool result = false;
 
-        /// <summary>
-        /// Convert the TestCategoryItemCollection to a string.
-        /// each item is surrounded by a comma (,)
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
+        if (obj is not TestCategoryItemCollection other)
         {
-            StringBuilder returnString = new StringBuilder();
-            if (this.Count > 0)
-            {
-                returnString.Append(",");
-                foreach (TestCategoryItem item in this)
-                {
-                    returnString.Append(item.TestCategory);
-                    returnString.Append(",");
-                }
-            }
-
-            return returnString.ToString();
+            // Other object is not a TestCategoryItemCollection.
+            result = false;
         }
-
-        /// <summary>
-        /// Convert the TestCategoryItemCollection to an array of strings.
-        /// </summary>
-        /// <returns>Array of strings containing the test categories.</returns>
-        public string[] ToArray()
+        else if (ReferenceEquals(this, other))
         {
-            string[] result = new string[this.Count];
-
-            int i = 0;
-            foreach (TestCategoryItem item in this)
-            {
-                result[i++] = item.TestCategory;
-            }
-
-            return result;
+            // The other object is the same object as this one.
+            result = true;
         }
-
-        /// <summary>
-        /// Compare the collection items
-        /// </summary>
-        /// <param name="obj">other collection</param>
-        /// <returns>true if the collections contain the same items</returns>
-        public override bool Equals(object obj)
+        else if (Count != other.Count)
         {
-            TestCategoryItemCollection other = obj as TestCategoryItemCollection;
-            bool result = false;
-
-            if (other == null)
-            {
-                // Other object is not a TestCategoryItemCollection.
-                result = false;
-            }
-            else if (Object.ReferenceEquals(this, other))
-            {
-                // The other object is the same object as this one.
-                result = true;
-            }
-            else if (this.Count != other.Count)
-            {
-                // The count of categories in the other object does not
-                // match this one, so they are not equal.
-                result = false;
-            }
-            else
+            // The count of categories in the other object does not
+            // match this one, so they are not equal.
+            result = false;
+        }
+        else
+        {
+            // Check each item and return on the first mismatch.
+            foreach (TestCategoryItem item in this)
             {
-                // Check each item and return on the first mismatch.
-                foreach (TestCategoryItem item in this)
+                if (!other.Contains(item))
                 {
-                    if (!other.Contains(item))
-                    {
-                        result = false;
-                        break;
-                    }
+                    result = false;
+                    break;
                 }
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Return the hash code of this collection
-        /// </summary>
-        /// <returns>The hashcode.</returns>
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-        #endregion
+        return result;
+    }
+
+    /// <summary>
+    /// Return the hash code of this collection
+    /// </summary>
+    /// <returns>The hashcode.</returns>
+    public override int GetHashCode()
+    {
+        return base.GetHashCode();
     }
-    #endregion
 }
+#endregion
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElement.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElement.cs
index df809ad642..32c9c69cf2 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElement.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElement.cs
@@ -1,269 +1,260 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+using System;
+using System.Globalization;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// Test element.
+/// </summary>
+internal abstract class TestElement : ITestElement, IXmlTestStore
+{
     /// <summary>
-    /// Test element.
+    /// Default priority for a test method that does not specify a priority
     /// </summary>
-    internal abstract class TestElement : ITestElement, IXmlTestStore
+    protected const int DefaultPriority = int.MaxValue;
+
+    protected TestId _id;
+    protected string _name;
+    protected string _owner;
+    protected string _storage;
+    protected string _adapter;
+    protected int _priority;
+    protected bool _isRunnable;
+    protected TestExecId _executionId;
+    protected TestExecId _parentExecutionId;
+    protected TestCategoryItemCollection _testCategories;
+    protected WorkItemCollection _workItems;
+    protected TestListCategoryId _catId;
+
+    public TestElement(Guid id, string name, string adapter)
     {
-        /// <summary>
-        /// Default priority for a test method that does not specify a priority
-        /// </summary>
-        protected const int DefaultPriority = int.MaxValue;
-
-        protected TestId id;
-        protected string name;
-        protected string owner;
-        protected string storage;
-        protected string adapter;
-        protected int priority;
-        protected bool isRunnable;
-        protected TestExecId executionId;
-        protected TestExecId parentExecutionId;
-        protected TestCategoryItemCollection testCategories;
-        protected WorkItemCollection workItems;
-        protected TestListCategoryId catId;
-
-        public TestElement(Guid id, string name, string adapter)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(name), "name is null");
-            Debug.Assert(!string.IsNullOrEmpty(adapter), "adapter is null");
+        TPDebug.Assert(!name.IsNullOrEmpty(), "name is null");
+        TPDebug.Assert(!adapter.IsNullOrEmpty(), "adapter is null");
+
+        _owner = string.Empty;
+        _priority = DefaultPriority;
+        _storage = string.Empty;
+        _executionId = TestExecId.Empty;
+        _parentExecutionId = TestExecId.Empty;
+        _testCategories = new TestCategoryItemCollection();
+        _workItems = new WorkItemCollection();
+        _isRunnable = true;
+        _catId = TestListCategoryId.Uncategorized;
+
+        _id = new TestId(id);
+        _name = name;
+        _adapter = adapter;
+    }
 
-            this.Initialize();
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public TestId Id
+    {
+        get { return _id; }
+    }
 
-            this.id = new TestId(id);
-            this.name = name;
-            this.adapter = adapter;
-        }
+    /// <summary>
+    /// Gets or sets the name.
+    /// </summary>
+    public string Name
+    {
+        get { return _name; }
 
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public TestId Id
+        set
         {
-            get { return this.id; }
+            EqtAssert.ParameterNotNull(value, "Name");
+            _name = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name
-        {
-            get { return this.name; }
+    /// <summary>
+    /// Gets or sets the owner.
+    /// </summary>
+    public string Owner
+    {
+        get { return _owner; }
 
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "Name");
-                this.name = value;
-            }
+        set
+        {
+            EqtAssert.ParameterNotNull(value, "Owner");
+            _owner = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the owner.
-        /// </summary>
-        public string Owner
-        {
-            get { return this.owner; }
+    /// <summary>
+    /// Gets or sets the priority.
+    /// </summary>
+    public int Priority
+    {
+        get { return _priority; }
+        set { _priority = value; }
+    }
 
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "Owner");
-                this.owner = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the storage.
+    /// </summary>
+    public string Storage
+    {
+        get { return _storage; }
 
-        /// <summary>
-        /// Gets or sets the priority.
-        /// </summary>
-        public int Priority
+        set
         {
-            get { return this.priority; }
-            set { this.priority = value; }
+            EqtAssert.StringNotNullOrEmpty(value, "Storage");
+            _storage = value.ToLowerInvariant();
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the storage.
-        /// </summary>
-        public string Storage
-        {
-            get { return this.storage; }
+    /// <summary>
+    /// Gets or sets the execution id.
+    /// </summary>
+    public TestExecId ExecutionId
+    {
+        get { return _executionId; }
+        set { _executionId = value; }
+    }
 
-            set
-            {
-                EqtAssert.StringNotNullOrEmpty(value, "Storage");
-                this.storage = value.ToLowerInvariant();
-            }
-        }
+    /// <summary>
+    /// Gets or sets the parent execution id.
+    /// </summary>
+    public TestExecId ParentExecutionId
+    {
+        get { return _parentExecutionId; }
+        set { _parentExecutionId = value; }
+    }
 
-        /// <summary>
-        /// Gets or sets the execution id.
-        /// </summary>
-        public TestExecId ExecutionId
-        {
-            get { return this.executionId; }
-            set { this.executionId = value; }
-        }
+    /// <summary>
+    /// Gets the isRunnable value.
+    /// </summary>
+    public bool IsRunnable
+    {
+        get { return _isRunnable; }
+    }
 
-        /// <summary>
-        /// Gets or sets the parent execution id.
-        /// </summary>
-        public TestExecId ParentExecutionId
-        {
-            get { return this.parentExecutionId; }
-            set { this.parentExecutionId = value; }
-        }
+    /// <summary>
+    /// Gets or sets the category id.
+    /// </summary>
+    /// <remarks>
+    /// Instead of setting to null use TestListCategoryId.Uncategorized
+    /// </remarks>
+    public TestListCategoryId CategoryId
+    {
+        get { return _catId; }
 
-        /// <summary>
-        /// Gets the isRunnable value.
-        /// </summary>
-        public bool IsRunnable
+        set
         {
-            get { return this.isRunnable; }
+            EqtAssert.ParameterNotNull(value, "CategoryId");
+            _catId = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the category id.
-        /// </summary>
-        /// <remarks>
-        /// Instead of setting to null use TestListCategoryId.Uncategorized
-        /// </remarks>
-        public TestListCategoryId CategoryId
-        {
-            get { return this.catId; }
-
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "CategoryId");
-                this.catId = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the test categories.
+    /// </summary>
+    public TestCategoryItemCollection TestCategories
+    {
+        get { return _testCategories; }
 
-        /// <summary>
-        /// Gets or sets the test categories.
-        /// </summary>
-        public TestCategoryItemCollection TestCategories
+        set
         {
-            get { return this.testCategories; }
-
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "value");
-                this.testCategories = value;
-            }
+            EqtAssert.ParameterNotNull(value, "value");
+            _testCategories = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the work items.
-        /// </summary>
-        public WorkItemCollection WorkItems
-        {
-            get { return this.workItems; }
-
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "value");
-                this.workItems = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the work items.
+    /// </summary>
+    public WorkItemCollection WorkItems
+    {
+        get { return _workItems; }
 
-        /// <summary>
-        /// Gets the adapter name.
-        /// </summary>
-        public string Adapter
+        set
         {
-            get { return adapter; }
+            EqtAssert.ParameterNotNull(value, "value");
+            _workItems = value;
         }
+    }
 
-        /// <summary>
-        /// Gets the test type.
-        /// </summary>
-        public abstract TestType TestType { get; }
+    /// <summary>
+    /// Gets the adapter name.
+    /// </summary>
+    public string Adapter
+    {
+        get { return _adapter; }
+    }
 
-        /// <summary>
-        /// Override for ToString.
-        /// </summary>
-        /// <returns>String representation of test element.</returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "'{0}' {1}",
-                this.name ?? TrxLoggerResources.Common_NullInMessages,
-                this.id != null ? this.id.ToString() : TrxLoggerResources.Common_NullInMessages);
-        }
+    /// <summary>
+    /// Gets the test type.
+    /// </summary>
+    public abstract TestType TestType { get; }
 
-        /// <summary>
-        /// Override for Equals.
-        /// </summary>
-        /// <param name="other">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object other)
-        {
-            TestElement otherTest = other as TestElement;
-            return (otherTest == null) ?
-                false :
-                this.id.Equals(otherTest.id);
-        }
+    /// <summary>
+    /// Override for ToString.
+    /// </summary>
+    /// <returns>String representation of test element.</returns>
+    public override string ToString()
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "'{0}' {1}",
+            _name ?? TrxLoggerResources.Common_NullInMessages,
+            _id != null ? _id.ToString() : TrxLoggerResources.Common_NullInMessages);
+    }
 
-        /// <summary>
-        /// Override for GetHashCode
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
+    /// <summary>
+    /// Override for Equals.
+    /// </summary>
+    /// <param name="other">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? other)
+    {
+        return other is TestElement otherTest && _id.Equals(otherTest._id);
+    }
 
-        public virtual void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence h = new XmlPersistence();
+    /// <summary>
+    /// Override for GetHashCode
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return _id.GetHashCode();
+    }
 
-            h.SaveSimpleField(element, "@name", this.name, null);
-            h.SaveSimpleField(element, "@storage", this.storage, string.Empty);
-            h.SaveSimpleField(element, "@priority", this.priority, DefaultPriority);
-            h.SaveSimpleField(element, "Owners/Owner/@name", this.owner, string.Empty);
-            h.SaveObject(this.testCategories, element, "TestCategory", parameters);
+    public virtual void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence h = new();
 
-            if (this.executionId != null)
-                h.SaveGuid(element, "Execution/@id", this.executionId.Id);
-            if (this.parentExecutionId != null)
-                h.SaveGuid(element, "Execution/@parentId", this.parentExecutionId.Id);
+        h.SaveSimpleField(element, "@name", _name, null);
+        h.SaveSimpleField(element, "@storage", _storage, string.Empty);
+        h.SaveSimpleField(element, "@priority", _priority, DefaultPriority);
+        h.SaveSimpleField(element, "Owners/Owner/@name", _owner, string.Empty);
+        h.SaveObject(_testCategories, element, "TestCategory", parameters);
 
-            h.SaveObject(this.workItems, element, "Workitems", parameters);
+        if (_executionId != null)
+            h.SaveGuid(element, "Execution/@id", _executionId.Id);
+        if (_parentExecutionId != null)
+            h.SaveGuid(element, "Execution/@parentId", _parentExecutionId.Id);
 
-            XmlTestStoreParameters testIdParameters = XmlTestStoreParameters.GetParameters();
-            testIdParameters[TestId.IdLocationKey] = "@id";
-            h.SaveObject(this.id, element, testIdParameters);
-        }
+        h.SaveObject(_workItems, element, "Workitems", parameters);
 
-        private void Initialize()
-        {
-            this.id = TestId.Empty;
-            this.name = string.Empty;
-            this.owner = string.Empty;
-            this.priority = DefaultPriority;
-            this.storage = string.Empty;
-            this.executionId = TestExecId.Empty;
-            this.parentExecutionId = TestExecId.Empty;
-            this.testCategories = new TestCategoryItemCollection();
-            this.workItems = new WorkItemCollection();
-            this.isRunnable = true;
-            this.catId = TestListCategoryId.Uncategorized;
-        }
+        XmlTestStoreParameters testIdParameters = XmlTestStoreParameters.GetParameters();
+        testIdParameters[TestId.IdLocationKey] = "@id";
+        XmlPersistence.SaveObject(_id, element, testIdParameters);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElementAggregation.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElementAggregation.cs
index d814acaee6..7ee95be907 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElementAggregation.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestElementAggregation.cs
@@ -1,38 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.Collections.Generic;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Test aggregation element.
+/// </summary>
+internal abstract class TestElementAggregation : TestElement, ITestAggregation
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    protected Dictionary<Guid, TestLink> _testLinks = new();
+
+    public TestElementAggregation(Guid id, string name, string adapter) : base(id, name, adapter) { }
 
     /// <summary>
-    /// Test aggregation element.
+    /// Test links.
     /// </summary>
-    internal abstract class TestElementAggregation : TestElement, ITestAggregation
+    public Dictionary<Guid, TestLink> TestLinks
     {
-        protected Dictionary<Guid, TestLink> testLinks = new Dictionary<Guid, TestLink>();
-
-        public TestElementAggregation(Guid id, string name, string adapter) : base(id, name, adapter) { }
+        get { return _testLinks; }
+    }
 
-        /// <summary>
-        /// Test links.
-        /// </summary>
-        public Dictionary<Guid, TestLink> TestLinks
-        {
-            get { return testLinks; }
-        }
+    public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        base.Save(element, parameters);
 
-        public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
+        XmlPersistence h = new();
+        if (_testLinks.Count > 0)
         {
-            base.Save(element, parameters);
-
-            XmlPersistence h = new XmlPersistence();
-            if (testLinks.Count > 0)
-            {
-                h.SaveIEnumerable(testLinks.Values, element, "TestLinks", ".", "TestLink", parameters);
-            }
+            h.SaveIEnumerable(_testLinks.Values, element, "TestLinks", ".", "TestLink", parameters);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestEntry.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestEntry.cs
index d693dde8fb..9ffc0a6772 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestEntry.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestEntry.cs
@@ -1,158 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.Collections.Generic;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// The test entry.
+/// </summary>
+internal sealed class TestEntry : IXmlTestStore
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    private readonly TestId _testId;
+    private readonly TestListCategoryId _categoryId;
+    private List<TestEntry>? _testEntries;
 
     /// <summary>
-    /// The test entry.
+    /// Constructor.
+    /// Note that using this constructor has different effect as setting CategoryId property.
+    /// When using this constructor, catId is used as specified, which CategoryId.set changes null to the root cat.
     /// </summary>
-    internal sealed class TestEntry : IXmlTestStore
+    /// <param name="testId">Test Id.</param>
+    /// <param name="catId">Category Id. This gets into .</param>
+    public TestEntry(TestId testId, TestListCategoryId catId)
     {
-        #region Fields
-
-        private TestId testId;
-        private Guid executionId;
-        private Guid parentExecutionId;
-        private TestListCategoryId categoryId;
-        private List<TestEntry> testEntries;
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Constructor.
-        /// Note that using this constructor has different effect as setting CategoryId property.
-        /// When using this constructor, catId is used as specified, which CategoryId.set changes null to the root cat.
-        /// </summary>
-        /// <param name="testId">Test Id.</param>
-        /// <param name="catId">Category Id. This gets into .</param>
-        public TestEntry(TestId testId, TestListCategoryId catId)
-        {
-            this.testId = testId;
-            this.categoryId = catId;
-        }
-
-        #endregion
-
-        #region Properties
+        _testId = testId;
+        _categoryId = catId;
+    }
 
-        /// <summary>
-        /// Gets or sets the exec id.
-        /// </summary>
-        public Guid ExecutionId
-        {
-            get { return this.executionId; }
+    /// <summary>
+    /// Gets or sets the exec id.
+    /// </summary>
+    public Guid ExecutionId { get; set; }
 
-            set
-            {
-                this.executionId = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the parent exec id.
+    /// </summary>
+    public Guid ParentExecutionId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the parent exec id.
-        /// </summary>
-        public Guid ParentExecutionId
+    public List<TestEntry> TestEntries
+    {
+        get
         {
-            get { return this.parentExecutionId; }
+            _testEntries ??= new List<TestEntry>();
 
-            set
-            {
-                this.parentExecutionId = value;
-            }
+            return _testEntries;
         }
+    }
 
-        public List<TestEntry> TestEntries
+    /// <summary>
+    /// Override function for Equals.
+    /// </summary>
+    /// <param name="obj">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? obj)
+    {
+        if (obj is not TestEntry e)
         {
-            get
-            {
-                if (this.testEntries == null)
-                {
-                    this.testEntries = new List<TestEntry>();
-                }
-
-                return this.testEntries;
-            }
+            return false;
         }
 
-        #endregion
-
-        #region Overrides
-
-        /// <summary>
-        /// Override function for Equals.
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1405:DebugAssertMustProvideMessageText", Justification = "Reviewed. Suppression is OK here.")]
-        public override bool Equals(object obj)
+        if (!ExecutionId.Equals(e.ExecutionId))
         {
-            TestEntry e = obj as TestEntry;
-
-            if (e == null)
-            {
-                return false;
-            }
-
-            if (!this.executionId.Equals(e.executionId))
-            {
-                return false;
-            }
-
-            Debug.Assert(object.Equals(this.testId, e.testId));
-            Debug.Assert(object.Equals(this.categoryId, e.categoryId));
-            return true;
+            return false;
         }
 
-        /// <summary>
-        /// Override function for GetHashCode.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.executionId.GetHashCode();
-        }
+        TPDebug.Assert(Equals(_testId, e._testId));
+        TPDebug.Assert(Equals(_categoryId, e._categoryId));
+        return true;
+    }
 
-        #endregion
+    /// <summary>
+    /// Override function for GetHashCode.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return ExecutionId.GetHashCode();
+    }
 
-        #region IXmlTestStore Members
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSingleFields(element, this, parameters);
-
-            helper.SaveObject(this.testId, element, null);
-            helper.SaveGuid(element, "@executionId", this.executionId);
-            if (parentExecutionId != Guid.Empty)
-                helper.SaveGuid(element, "@parentExecutionId", this.parentExecutionId);
-            helper.SaveGuid(element, "@testListId", this.categoryId.Id);
-            if (this.TestEntries.Count > 0)
-                helper.SaveIEnumerable(TestEntries, element, "TestEntries", ".", "TestEntry", parameters);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+        helper.SaveSingleFields(element, this, parameters);
+
+        XmlPersistence.SaveObject(_testId, element, null);
+        helper.SaveGuid(element, "@executionId", ExecutionId);
+        if (ParentExecutionId != Guid.Empty)
+            helper.SaveGuid(element, "@parentExecutionId", ParentExecutionId);
+        helper.SaveGuid(element, "@testListId", _categoryId.Id);
+        if (TestEntries.Count > 0)
+            helper.SaveIEnumerable(TestEntries, element, "TestEntries", ".", "TestEntry", parameters);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestExecId.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestExecId.cs
index 11ed280e86..d5aa97ef60 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestExecId.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestExecId.cs
@@ -1,98 +1,80 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Globalization;
+using System;
+using System.Globalization;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// Class identifying test execution id.
+/// Execution ID is assigned to test at run creation time and is guaranteed to be unique within that run.
+/// </summary>
+internal sealed class TestExecId
+{
     /// <summary>
-    /// Class identifying test execution id.
-    /// Execution ID is assigned to test at run creation time and is guaranteed to be unique within that run.
+    /// Initializes a new instance of the <see cref="TestExecId"/> class.
     /// </summary>
-    internal sealed class TestExecId
+    public TestExecId()
     {
-        private static TestExecId emptyId = new TestExecId(Guid.Empty);
-
-        private Guid execId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestExecId"/> class.
-        /// </summary>
-        public TestExecId()
-        {
-            this.execId = Guid.NewGuid();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestExecId"/> class.
-        /// </summary>
-        /// <param name="id">
-        /// The id.
-        /// </param>
-        public TestExecId(Guid id)
-        {
-            this.execId = id;
-        }
-
-        /// <summary>
-        /// Gets an object of <see cref="TestExecId"/> class which empty GUID
-        /// </summary>
-        public static TestExecId Empty
-        {
-            get { return emptyId; }
-        }
+        Id = Guid.NewGuid();
+    }
 
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public Guid Id
-        {
-            get { return this.execId; }
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestExecId"/> class.
+    /// </summary>
+    /// <param name="id">
+    /// The id.
+    /// </param>
+    public TestExecId(Guid id)
+    {
+        Id = id;
+    }
 
-        /// <summary>
-        /// Override function of Equals.
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            TestExecId id = obj as TestExecId;
+    /// <summary>
+    /// Gets an object of <see cref="TestExecId"/> class which empty GUID
+    /// </summary>
+    public static TestExecId Empty { get; } = new TestExecId(Guid.Empty);
 
-            if (id == null)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public Guid Id { get; }
 
-            return this.execId.Equals(id.execId);
-        }
+    /// <summary>
+    /// Override function of Equals.
+    /// </summary>
+    /// <param name="obj">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is TestExecId id && Id.Equals(id.Id);
+    }
 
-        /// <summary>
-        /// Override function of GetHashCode
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.execId.GetHashCode();
-        }
+    /// <summary>
+    /// Override function of GetHashCode
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Override function of ToString.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public override string ToString()
-        {
-            string s = this.execId.ToString("B");
-            return string.Format(CultureInfo.InvariantCulture, s);
-        }
+    /// <summary>
+    /// Override function of ToString.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    public override string ToString()
+    {
+        string s = Id.ToString("B");
+        return string.Format(CultureInfo.InvariantCulture, s);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestId.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestId.cs
index e4e55f62d6..92a4680d92 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestId.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestId.cs
@@ -1,275 +1,236 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Xml;
+using System;
+using System.Globalization;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-    #region TestId
+#region TestId
+/// <summary>
+/// Class that uniquely identifies a test.
+/// </summary>
+internal sealed class TestId : IEquatable<TestId>, IComparable<TestId>, IComparable, IXmlTestStore
+{
     /// <summary>
-    /// Class that uniquely identifies a test.
+    /// Key in <see cref="XmlTestStoreParameters"/> for specifying the location where the test ID is stored, under an XML element
     /// </summary>
-    internal sealed class TestId : IEquatable<TestId>, IComparable<TestId>, IComparable, IXmlTestStore
-    {
-        #region Constants
-
-        /// <summary>
-        /// Key in <see cref="XmlTestStoreParameters"/> for specifying the location where the test ID is stored, under an XML element
-        /// </summary>
-        internal static readonly string IdLocationKey = "IdLocation";
-
-        /// <summary>
-        /// Location where the test ID is stored, under an XML element
-        /// </summary>
-        private const string DefaultIdLocation = "@testId";
-
-        /// <summary>
-        /// Represents an empty test ID
-        /// </summary>
-        private static readonly TestId EmptyId = new TestId(Guid.Empty);
+    internal static readonly string IdLocationKey = "IdLocation";
 
-        #endregion
-
-        #region Fields
-
-        /// <summary>
-        /// The test ID
-        /// </summary>
-        private Guid id;
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Generates a new test ID
-        /// </summary>
-        public TestId()
-            : this(Guid.NewGuid())
-        {
-        }
+    /// <summary>
+    /// Location where the test ID is stored, under an XML element
+    /// </summary>
+    private const string DefaultIdLocation = "@testId";
 
-        /// <summary>
-        /// Stores the specified ID
-        /// </summary>
-        /// <param name="id">GUID of the test</param>
-        public TestId(Guid id)
-        {
-            this.id = id;
-        }
+    /// <summary>
+    /// Generates a new test ID
+    /// </summary>
+    public TestId()
+        : this(Guid.NewGuid())
+    {
+    }
 
-        #endregion
+    /// <summary>
+    /// Stores the specified ID
+    /// </summary>
+    /// <param name="id">GUID of the test</param>
+    public TestId(Guid id)
+    {
+        Id = id;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Gets an empty test ID
+    /// </summary>
+    public static TestId Empty { get; } = new TestId(Guid.Empty);
 
-        /// <summary>
-        /// Gets an empty test ID
-        /// </summary>
-        public static TestId Empty
-        {
-            get { return EmptyId; }
-        }
+    /// <summary>
+    /// Gets test ID
+    /// </summary>
+    public Guid Id { get; }
 
-        /// <summary>
-        /// Gets test ID
-        /// </summary>
-        public Guid Id
-        {
-            get { return this.id; }
-        }
 
-        #endregion
+    #region IXmlTestStore Members
 
-        #region IXmlTestStore Members
+    /// <summary>
+    /// Saves the state to the XML element
+    /// </summary>
+    /// <param name="element">The XML element to save to</param>
+    /// <param name="parameters">Parameters to customize the save behavior</param>
+    void IXmlTestStore.Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        TPDebug.Assert(element != null, "element is null");
 
-        /// <summary>
-        /// Saves the state to the XML element
-        /// </summary>
-        /// <param name="element">The XML element to save to</param>
-        /// <param name="parameters">Parameters to customize the save behavior</param>
-        void IXmlTestStore.Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            Debug.Assert(element != null, "element is null");
+        GetIdLocation(parameters, out string idLocation);
 
-            string idLocation;
-            this.GetIdLocation(parameters, out idLocation);
+        XmlPersistence helper = new();
+        helper.SaveGuid(element, idLocation, Id);
+    }
 
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveGuid(element, idLocation, this.id);
-        }
+    /// <summary>
+    /// Gets the location of the test ID under an XML element, based on the specified parameters.
+    /// This method is needed to parse the parameters sent by the caller of Save and Load.
+    /// We need to support different locations for saving the test ID, because previously, TestEntry and TestResult stored the test ID to @testId
+    /// (which is now the default location the TestId class' Save and Load methods), but TestElement was storing it to @id.
+    /// Since we can't change the location where the ID is stored in XML, we support custom locations in the TestId class.
+    /// </summary>
+    /// <param name="parameters">The parameters specifying the locations</param>
+    /// <param name="idLocation">The test ID location</param>
+    private static void GetIdLocation(XmlTestStoreParameters? parameters, out string idLocation)
+    {
+        // Initialize to the default ID location
+        idLocation = DefaultIdLocation;
 
-        /// <summary>
-        /// Gets the location of the test ID under an XML element, based on the specified parameters.
-        /// This method is needed to parse the parameters sent by the caller of Save and Load.
-        /// We need to support different locations for saving the test ID, because previously, TestEntry and TestResult stored the test ID to @testId
-        /// (which is now the default location the TestId class' Save and Load methods), but TestElement was storing it to @id.
-        /// Since we can't change the location where the ID is stored in XML, we support custom locations in the TestId class.
-        /// </summary>
-        /// <param name="parameters">The parameters specifying the locations</param>
-        /// <param name="idLocation">The test ID location</param>
-        private void GetIdLocation(XmlTestStoreParameters parameters, out string idLocation)
+        // If any parameters are specified, see if we need to override the defaults
+        if (parameters != null)
         {
-            // Initialize to the default ID location
-            idLocation = DefaultIdLocation;
-
-            // If any parameters are specified, see if we need to override the defaults
-            if (parameters != null)
+            if (parameters.TryGetValue(IdLocationKey, out object? idLocationObj))
             {
-                object idLocationObj;
-                if (parameters.TryGetValue(IdLocationKey, out idLocationObj))
-                {
-                    idLocation = idLocationObj as string ?? idLocation;
-                }
+                idLocation = idLocationObj as string ?? idLocation;
             }
         }
+    }
 
-        #endregion
-
-        #region Equality
-
-        #region IEquatable<TestId> Members
+    #endregion
 
-        /// <summary>
-        /// Compares this instance with the other test ID for value equality
-        /// </summary>
-        /// <param name="other">The other test ID to compare with</param>
-        /// <returns>True if the test IDs are equal in value, false otherwise</returns>
-        public bool Equals(TestId other)
-        {
-            // Check reference equality first, as it is faster than comparing value equality when the references are equal
-            return object.ReferenceEquals(this, other) || this.ValueEquals(other);
-        }
+    #region Equality
 
-        /// <summary>
-        /// Compares this instance with the other test ID for value equality. This method does not check reference equality first.
-        /// </summary>
-        /// <param name="other">The other test ID to compare with</param>
-        /// <returns>True if the test IDs are equal in value, false otherwise</returns>
-        private bool ValueEquals(TestId other)
-        {
-            // Avoid calling of "!= null", as the != operator has been overloaded.
-            return !object.ReferenceEquals(other, null) && this.id == other.id;
-        }
+    #region IEquatable<TestId> Members
 
-        #endregion
+    /// <summary>
+    /// Compares this instance with the other test ID for value equality
+    /// </summary>
+    /// <param name="other">The other test ID to compare with</param>
+    /// <returns>True if the test IDs are equal in value, false otherwise</returns>
+    public bool Equals(TestId? other)
+    {
+        // Check reference equality first, as it is faster than comparing value equality when the references are equal
+        return ReferenceEquals(this, other) || ValueEquals(other);
+    }
 
-        #region Overrides
+    /// <summary>
+    /// Compares this instance with the other test ID for value equality. This method does not check reference equality first.
+    /// </summary>
+    /// <param name="other">The other test ID to compare with</param>
+    /// <returns>True if the test IDs are equal in value, false otherwise</returns>
+    private bool ValueEquals(TestId? other)
+    {
+        // Avoid calling of "!= null", as the != operator has been overloaded.
+        return other is not null && Id == other.Id;
+    }
 
-        /// <summary>
-        /// Compares this instance with the other test ID for value equality
-        /// </summary>
-        /// <param name="other">The other test ID to compare with</param>
-        /// <returns>True if the test IDs are equal in value, false otherwise</returns>
-        public override bool Equals(object other)
-        {
-            return this.Equals(other as TestId);
-        }
+    #endregion
 
-        /// <summary>
-        /// Gets a hash code representing the state of the instance
-        /// </summary>
-        /// <returns>The hash code</returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
+    #region Overrides
 
-        #endregion
+    /// <summary>
+    /// Compares this instance with the other test ID for value equality
+    /// </summary>
+    /// <param name="other">The other test ID to compare with</param>
+    /// <returns>True if the test IDs are equal in value, false otherwise</returns>
+    public override bool Equals(object? other)
+    {
+        return Equals(other as TestId);
+    }
 
-        #region Operators
+    /// <summary>
+    /// Gets a hash code representing the state of the instance
+    /// </summary>
+    /// <returns>The hash code</returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Compares the two test IDs for value equality
-        /// </summary>
-        /// <param name="left">The test ID on the left of the operator</param>
-        /// <param name="right">The test ID on the right of the operator</param>
-        /// <returns>True if the test IDs are equal in value, false otherwise</returns>
-        public static bool operator ==(TestId left, TestId right)
-        {
-            return
-                object.ReferenceEquals(left, right) ||
-                (!object.ReferenceEquals(left, null) && left.ValueEquals(right));
-        }
+    #endregion
 
-        /// <summary>
-        /// Compares the two test IDs for value inequality
-        /// </summary>
-        /// <param name="left">The test ID on the left of the operator</param>
-        /// <param name="right">The test ID on the right of the operator</param>
-        /// <returns>True if the test IDs are unequal in value, false otherwise</returns>
-        public static bool operator !=(TestId left, TestId right)
-        {
-            return !(left == right);
-        }
+    #region Operators
 
-        #endregion
+    /// <summary>
+    /// Compares the two test IDs for value equality
+    /// </summary>
+    /// <param name="left">The test ID on the left of the operator</param>
+    /// <param name="right">The test ID on the right of the operator</param>
+    /// <returns>True if the test IDs are equal in value, false otherwise</returns>
+    public static bool operator ==(TestId? left, TestId? right)
+    {
+        return
+            ReferenceEquals(left, right) ||
+            (left is not null && left.ValueEquals(right));
+    }
 
-        #endregion
+    /// <summary>
+    /// Compares the two test IDs for value inequality
+    /// </summary>
+    /// <param name="left">The test ID on the left of the operator</param>
+    /// <param name="right">The test ID on the right of the operator</param>
+    /// <returns>True if the test IDs are unequal in value, false otherwise</returns>
+    public static bool operator !=(TestId? left, TestId? right)
+    {
+        return !(left == right);
+    }
 
-        #region Comparison
+    #endregion
 
-        #region IComparable<TestId> Members
+    #endregion
 
-        /// <summary>
-        /// Compares this instance with the other test ID
-        /// </summary>
-        /// <param name="other">The other test ID to compare with</param>
-        /// <returns>
-        /// 0 if this instance is equal in value to the other test ID, &lt; 0 if this instance is lesser than the other test ID,
-        /// or &gt; 0 if this instance is greater than the other test ID
-        /// </returns>
-        public int CompareTo(TestId other)
-        {
-            if (other == null)
-            {
-                throw new ArgumentNullException(nameof(other));
-            }
+    #region Comparison
 
-            return this.id.CompareTo(other.id);
-        }
+    #region IComparable<TestId> Members
 
-        #endregion
+    /// <summary>
+    /// Compares this instance with the other test ID
+    /// </summary>
+    /// <param name="other">The other test ID to compare with</param>
+    /// <returns>
+    /// 0 if this instance is equal in value to the other test ID, &lt; 0 if this instance is lesser than the other test ID,
+    /// or &gt; 0 if this instance is greater than the other test ID
+    /// </returns>
+    public int CompareTo(TestId? other)
+    {
+        return other == null ? throw new ArgumentNullException(nameof(other)) : Id.CompareTo(other.Id);
+    }
 
-        #region IComparable Members
+    #endregion
 
-        /// <summary>
-        /// Compares this instance with the other test ID
-        /// </summary>
-        /// <param name="other">The other test ID to compare with</param>
-        /// <returns>
-        /// 0 if this instance is equal in value to the other test ID, &lt; 0 if this instance is less than the other test ID,
-        /// or &gt; 0 if this instance is greater than the other test ID
-        /// </returns>
-        public int CompareTo(object other)
-        {
-            return CompareTo(other as TestId);
-        }
+    #region IComparable Members
 
-        #endregion
+    /// <summary>
+    /// Compares this instance with the other test ID
+    /// </summary>
+    /// <param name="other">The other test ID to compare with</param>
+    /// <returns>
+    /// 0 if this instance is equal in value to the other test ID, &lt; 0 if this instance is less than the other test ID,
+    /// or &gt; 0 if this instance is greater than the other test ID
+    /// </returns>
+    public int CompareTo(object? other)
+    {
+        return CompareTo(other as TestId);
+    }
 
-        #endregion
+    #endregion
 
-        #region Overrides
+    #endregion
 
-        /// <summary>
-        /// Override ToString
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public override string ToString()
-        {
-            // "B" adds curly braces around guid
-            string s = this.id.ToString("B");
-            return string.Format(CultureInfo.InvariantCulture, s);
-        }
+    #region Overrides
 
-        #endregion
+    /// <summary>
+    /// Override ToString
+    /// </summary>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    public override string ToString()
+    {
+        // "B" adds curly braces around guid
+        string s = Id.ToString("B");
+        return string.Format(CultureInfo.InvariantCulture, s);
     }
-    #endregion  TestId
+
+    #endregion
 }
+#endregion  TestId
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestLink.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestLink.cs
index 5b4709b460..8cd4ff284c 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestLink.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestLink.cs
@@ -1,114 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Globalization;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using System;
+using System.Globalization;
 
-    /// <summary>
-    /// Test link.
-    /// </summary>
-    internal sealed class TestLink : IXmlTestStore
-    {
-        private Guid id;
-        private string name = string.Empty;
-        private string storage = string.Empty;
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
-        public TestLink(Guid id, string name, string storage)
-        {
-            if (id == Guid.Empty)
-            {
-                throw new ArgumentException("ID cant be empty");
-            }
-
-            EqtAssert.StringNotNullOrEmpty(name, nameof(name));
-            EqtAssert.ParameterNotNull(storage, nameof(storage));
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-            this.id = id;
-            this.name = name;
-            this.storage = storage;
-        }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public Guid Id
+/// <summary>
+/// Test link.
+/// </summary>
+internal sealed class TestLink : IXmlTestStore
+{
+    public TestLink(Guid id, string name, string storage)
+    {
+        if (id == Guid.Empty)
         {
-            get { return this.id; }
+            throw new ArgumentException("ID cant be empty");
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        public string Name
-        {
-            get { return this.name; }
-        }
+        EqtAssert.StringNotNullOrEmpty(name, nameof(name));
+        EqtAssert.ParameterNotNull(storage, nameof(storage));
 
-        /// <summary>
-        /// Gets the storage.
-        /// </summary>
-        public string Storage
-        {
-            get { return this.storage; }
-        }
+        Id = id;
+        Name = name;
+        Storage = storage;
+    }
 
-        /// <summary>
-        /// Whether this Link is equal to other Link. Compares by Id.
-        /// </summary>
-        public override bool Equals(object other)
-        {
-            TestLink link = other as TestLink;
-            return (link == null) ?
-                false :
-                this.id.Equals(link.id);
-        }
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public Guid Id { get; }
 
-        /// <summary>
-        /// Whether this Link is exactly the same as other Link. Compares all fields.
-        /// </summary>
-        public bool IsSame(TestLink other)
-        {
-            if (other == null)
-                return false;
+    /// <summary>
+    /// Gets the name.
+    /// </summary>
+    public string Name { get; } = string.Empty;
 
-            return this.id.Equals(other.id) &&
-                this.name.Equals(other.name) &&
-                this.storage.Equals(other.storage);
-        }
+    /// <summary>
+    /// Gets the storage.
+    /// </summary>
+    public string Storage { get; } = string.Empty;
 
-        /// <summary>
-        /// Override for GetHashCode.
-        /// </summary>
-        /// <returns></returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
+    /// <summary>
+    /// Whether this Link is equal to other Link. Compares by Id.
+    /// </summary>
+    public override bool Equals(object? other)
+    {
+        return other is TestLink link && Id.Equals(link.Id);
+    }
 
-        /// <summary>
-        /// Override for ToString.
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "Link to '{0}' {1} '{2}'.",
-                this.name ?? "(null)",
-                this.id.ToString("B"),
-                this.storage ?? "(null)");
-        }
+    /// <summary>
+    /// Whether this Link is exactly the same as other Link. Compares all fields.
+    /// </summary>
+    public bool IsSame(TestLink other)
+    {
+        return other != null
+               && Id.Equals(other.Id) &&
+               Name.Equals(other.Name) &&
+               Storage.Equals(other.Storage);
+    }
 
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence h = new XmlPersistence();
-            h.SaveGuid(element, "@id", this.Id);
-            h.SaveSimpleField(element, "@name", this.name, null);
-            h.SaveSimpleField(element, "@storage", this.storage, string.Empty);
-        }
+    /// <summary>
+    /// Override for GetHashCode.
+    /// </summary>
+    /// <returns></returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
+
+    /// <summary>
+    /// Override for ToString.
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "Link to '{0}' {1} '{2}'.",
+            Name ?? "(null)",
+            Id.ToString("B"),
+            Storage ?? "(null)");
+    }
+
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence h = new();
+        h.SaveGuid(element, "@id", Id);
+        h.SaveSimpleField(element, "@name", Name, null);
+        h.SaveSimpleField(element, "@storage", Storage, string.Empty);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs
index 7e90adf154..03f0770741 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs
@@ -1,200 +1,177 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// The test list category.
+/// </summary>
+internal class TestListCategory : IXmlTestStore
 {
-    using System.Diagnostics;
+    private static TestListCategory? s_uncategorizedResults;
+    private static TestListCategory? s_allResults;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    private static readonly object ReservedCategoryLock = new();
+    [StoreXmlSimpleField("@name", DefaultValue = "")]
+    private readonly string _name = string.Empty;
 
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+    private TestListCategoryId _parentCategoryId;
 
     /// <summary>
-    /// The test list category.
+    /// Constructor for TestListCategory .
     /// </summary>
-    internal class TestListCategory : IXmlTestStore
+    /// <param name="name">The name of new category.</param>
+    /// <param name="parentCategoryId">Id of parent category. Use TestListCategoryId.Root for top level categories.</param>
+    public TestListCategory(string name, TestListCategoryId parentCategoryId)
     {
-        #region Fields
-
-        private static TestListCategory uncategorizedResults;
-
-        private static TestListCategory allResults;
-
-        private static object reservedCategoryLock = new object();
-
-        private TestListCategoryId id = new TestListCategoryId();
-
-        [StoreXmlSimpleField(DefaultValue = "")]
-        private string name = string.Empty;
-
-        private TestListCategoryId parentCategoryId;
+        EqtAssert.StringNotNullOrEmpty(name, nameof(name));
+        EqtAssert.ParameterNotNull(parentCategoryId, nameof(parentCategoryId));
 
-        #endregion
-
-        /// <summary>
-        /// Constructor for TestListCategory .
-        /// </summary>
-        /// <param name="name">The name of new category.</param>
-        /// <param name="parentCategoryId">Id of parent category. Use TestListCategoryId.Root for top level categories.</param>
-        public TestListCategory(string name, TestListCategoryId parentCategoryId)
-        {
-            EqtAssert.StringNotNullOrEmpty(name, nameof(name));
-            EqtAssert.ParameterNotNull(parentCategoryId, nameof(parentCategoryId));
-
-            this.name = name;
-            this.parentCategoryId = parentCategoryId;
-        }
-
-        /// <summary>
-        /// Used internally for fake uncategorized category.
-        /// </summary>
-        /// <param name="name">
-        /// Category name.
-        /// </param>
-        /// <param name="id">
-        /// Category id.
-        /// </param>
-        /// <param name="parentId">
-        /// The parent Id.
-        /// </param>
-        private TestListCategory(string name, TestListCategoryId id, TestListCategoryId parentId) : this(name, parentId)
-        {
-            EqtAssert.ParameterNotNull(id, nameof(id));
-            this.id = id;
-        }
+        _name = name;
+        _parentCategoryId = parentCategoryId;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Used internally for fake uncategorized category.
+    /// </summary>
+    /// <param name="name">
+    /// Category name.
+    /// </param>
+    /// <param name="id">
+    /// Category id.
+    /// </param>
+    /// <param name="parentId">
+    /// The parent Id.
+    /// </param>
+    private TestListCategory(string name, TestListCategoryId id, TestListCategoryId parentId) : this(name, parentId)
+    {
+        EqtAssert.ParameterNotNull(id, nameof(id));
+        Id = id;
+    }
 
-        /// <summary>
-        /// Gets the uncategorized results.
-        /// </summary>
-        public static TestListCategory UncategorizedResults
+    /// <summary>
+    /// Gets the uncategorized results.
+    /// </summary>
+    public static TestListCategory UncategorizedResults
+    {
+        get
         {
-            get
+            if (s_uncategorizedResults == null)
             {
-                if (uncategorizedResults == null)
+                lock (ReservedCategoryLock)
                 {
-                    lock (reservedCategoryLock)
-                    {
-                        if (uncategorizedResults == null)
-                        {
-                            uncategorizedResults = new TestListCategory(
-                                TrxLoggerResources.TS_UncategorizedResults, TestListCategoryId.Uncategorized, TestListCategoryId.Root);
-                        }
-                    }
+                    s_uncategorizedResults ??= new TestListCategory(
+                            TrxLoggerResources.TS_UncategorizedResults, TestListCategoryId.Uncategorized, TestListCategoryId.Root);
                 }
-
-                return uncategorizedResults;
             }
+
+            return s_uncategorizedResults;
         }
+    }
 
-        /// <summary>
-        /// Gets the all results.
-        /// </summary>
-        public static TestListCategory AllResults
+    /// <summary>
+    /// Gets the all results.
+    /// </summary>
+    public static TestListCategory AllResults
+    {
+        get
         {
-            get
+            if (s_allResults == null)
             {
-                if (allResults == null)
+                lock (ReservedCategoryLock)
                 {
-                    lock (reservedCategoryLock)
-                    {
-                        if (allResults == null)
-                        {
-                            allResults = new TestListCategory(
-                                        TrxLoggerResources.TS_AllResults, TestListCategoryId.AllItems, TestListCategoryId.Root);
-                        }
-                    }
+                    s_allResults ??= new TestListCategory(
+                            TrxLoggerResources.TS_AllResults, TestListCategoryId.AllItems, TestListCategoryId.Root);
                 }
-
-                return allResults;
             }
+
+            return s_allResults;
         }
+    }
 
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public TestListCategoryId Id
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public TestListCategoryId Id { get; } = new TestListCategoryId();
+
+    /// <summary>
+    /// Gets or sets id of parent category. Use TestCategoryId.Root for top level categories.
+    /// We do not keep category children in Object Model, only parent.
+    /// </summary>
+    public TestListCategoryId ParentCategoryId
+    {
+        get
         {
-            get { return this.id; }
+            return _parentCategoryId;
         }
 
-        /// <summary>
-        /// Gets or sets id of parent category. Use TestCategoryId.Root for top level categories.
-        /// We do not keep category children in Object Model, only parent.
-        /// </summary>
-        public TestListCategoryId ParentCategoryId
+        set
         {
-            get
-            {
-                return this.parentCategoryId;
-            }
-
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "ParentCategoryId.value");
-                this.parentCategoryId = value;
-            }
+            EqtAssert.ParameterNotNull(value, "ParentCategoryId.value");
+            _parentCategoryId = value;
         }
+    }
 
-        #endregion
 
-        #region Overrides
+    #region Overrides
 
-        /// <summary>
-        /// Override function for Equals.
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object obj)
+    /// <summary>
+    /// Override function for Equals.
+    /// </summary>
+    /// <param name="obj">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? obj)
+    {
+        if (obj is not TestListCategory cat)
         {
-            TestListCategory cat = obj as TestListCategory;
-            if (cat == null)
-            {
-                return false;
-            }
-
-            Debug.Assert(this.id != null, "id is null");
-            return this.id.Equals(cat.id);
+            return false;
         }
 
-        /// <summary>
-        /// Override function for GetHashCode.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
-        #endregion
-
-        #region IXmlTestStore Members
-
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence h = new XmlPersistence();
+        TPDebug.Assert(Id != null, "id is null");
+        return Id.Equals(cat.Id);
+    }
 
-            h.SaveSingleFields(element, this, parameters);
-            h.SaveGuid(element, "@id", this.Id.Id);
-            h.SaveGuid(element, "@parentListId", this.ParentCategoryId.Id);
-        }
+    /// <summary>
+    /// Override function for GetHashCode.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
+    #endregion
+
+    #region IXmlTestStore Members
+
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence h = new();
 
-        #endregion
+        h.SaveSingleFields(element, this, parameters);
+        h.SaveGuid(element, "@id", Id.Id);
+        h.SaveGuid(element, "@parentListId", ParentCategoryId.Id);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategoryId.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategoryId.cs
index d50fd06cf8..c88bfe3cbe 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategoryId.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategoryId.cs
@@ -1,134 +1,102 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Globalization;
+using System;
+using System.Globalization;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// Class to categorize the tests.
+/// </summary>
+internal sealed class TestListCategoryId
+{
     /// <summary>
-    /// Class to categorize the tests.
+    /// Initializes a new instance of the <see cref="TestListCategoryId"/> class.
     /// </summary>
-    internal sealed class TestListCategoryId
+    public TestListCategoryId()
     {
-        private static TestListCategoryId emptyId = new TestListCategoryId(Guid.Empty);
-
-        private static TestListCategoryId uncategorizedId = new TestListCategoryId(new Guid("8C84FA94-04C1-424b-9868-57A2D4851A1D"));
-
-        private static TestListCategoryId categoriesId = new TestListCategoryId(new Guid("8C43106B-9DC1-4907-A29F-AA66A61BF5B6"));
-
-        private static TestListCategoryId all = new TestListCategoryId(new Guid("19431567-8539-422a-85D7-44EE4E166BDA"));
-
-        private Guid id;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestListCategoryId"/> class.
-        /// </summary>
-        public TestListCategoryId()
-        {
-            this.id = Guid.NewGuid();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestListCategoryId"/> class.
-        /// </summary>
-        /// <param name="id">
-        /// The id (GUID).
-        /// </param>
-        public TestListCategoryId(Guid id)
-        {
-            this.id = id;
-        }
+        Id = Guid.NewGuid();
+    }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestListCategoryId"/> class.
+    /// </summary>
+    /// <param name="id">
+    /// The id (GUID).
+    /// </param>
+    public TestListCategoryId(Guid id)
+    {
+        Id = id;
+    }
 
-        /// <summary>
-        /// Gets the Id of very root category - parent of all categories (fake, not real category).
-        /// </summary>
-        public static TestListCategoryId Root
-        {
-            get { return emptyId; }
-        }
 
-        /// <summary>
-        /// Gets an object of <see cref="TestListCategoryId"/> class with empty GUID.
-        /// </summary>
-        public static TestListCategoryId Empty
-        {
-            get { return emptyId; }
-        }
+    /// <summary>
+    /// Gets the Id of very root category - parent of all categories (fake, not real category).
+    /// </summary>
+    public static TestListCategoryId Root { get; } = new TestListCategoryId(Guid.Empty);
 
-        /// <summary>
-        /// Gets an object of <see cref="TestListCategoryId"/> class with GUID which represent uncategorized.
-        /// </summary>
-        public static TestListCategoryId Uncategorized
-        {
-            get { return uncategorizedId; }
-        }
+    /// <summary>
+    /// Gets an object of <see cref="TestListCategoryId"/> class with empty GUID.
+    /// </summary>
+    public static TestListCategoryId Empty
+    {
+        get { return Root; }
+    }
 
-        /// <summary>
-        /// Gets an object of <see cref="TestListCategoryId"/> class with GUID which represent categorize.
-        /// </summary>
-        public static TestListCategoryId Categories
-        {
-            get { return categoriesId; }
-        }
+    /// <summary>
+    /// Gets an object of <see cref="TestListCategoryId"/> class with GUID which represent uncategorized.
+    /// </summary>
+    public static TestListCategoryId Uncategorized { get; } = new(new Guid("8C84FA94-04C1-424b-9868-57A2D4851A1D"));
 
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public Guid Id
-        {
-            get { return this.id; }
-        }
+    /// <summary>
+    /// Gets an object of <see cref="TestListCategoryId"/> class with GUID which represent categorize.
+    /// </summary>
+    public static TestListCategoryId Categories { get; } = new TestListCategoryId(new Guid("8C43106B-9DC1-4907-A29F-AA66A61BF5B6"));
 
-        public static TestListCategoryId AllItems
-        {
-            get { return all; }
-        }
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public Guid Id { get; }
 
+    public static TestListCategoryId AllItems { get; } = new(new Guid("19431567-8539-422a-85D7-44EE4E166BDA"));
 
-        /// <summary>
-        /// Override function for Equals.
-        /// </summary>
-        /// <param name="other">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object other)
-        {
-            TestListCategoryId testListCategoryId = other as TestListCategoryId;
-            if (testListCategoryId == null)
-            {
-                return false;
-            }
 
-            return this.id.Equals(testListCategoryId.id);
-        }
+    /// <summary>
+    /// Override function for Equals.
+    /// </summary>
+    /// <param name="other">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? other)
+    {
+        return other is TestListCategoryId testListCategoryId && Id.Equals(testListCategoryId.Id);
+    }
 
-        /// <summary>
-        /// Override function for GetHashCode.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
+    /// <summary>
+    /// Override function for GetHashCode.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Override function for ToString.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public override string ToString()
-        {
-            // "B" adds curly braces around guid
-            string s = this.id.ToString("B");
-            return string.Format(CultureInfo.InvariantCulture, s);
-        }
+    /// <summary>
+    /// Override function for ToString.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    public override string ToString()
+    {
+        // "B" adds curly braces around guid
+        string s = Id.ToString("B");
+        return string.Format(CultureInfo.InvariantCulture, s);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestMethod.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestMethod.cs
index 2bd3830e05..01e74c1331 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestMethod.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestMethod.cs
@@ -1,117 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System.Diagnostics;
-    using System.Xml;
+using System.Xml;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using System;
-    /// <summary>
-    /// TestMethod contains information about a unit test method that needs to be executed
-    /// </summary>
-    internal sealed class TestMethod : IXmlTestStore
-    {
-        private string className;
-        private string name; // test method name
-        private bool isValid;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-        public TestMethod(string name, string className)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(name), "name is null");
-            Debug.Assert(!string.IsNullOrEmpty(className), "className is null");
-            this.name = name;
-            this.className = className;
-        }
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                return this.name;
-            }
-        }
+/// <summary>
+/// TestMethod contains information about a unit test method that needs to be executed
+/// </summary>
+internal sealed class TestMethod : IXmlTestStore
+{
+    public TestMethod(string name, string className)
+    {
+        TPDebug.Assert(!name.IsNullOrEmpty(), "name is null");
+        TPDebug.Assert(!className.IsNullOrEmpty(), "className is null");
+        Name = name;
+        ClassName = className;
+    }
 
-        /// <summary>
-        /// Gets the class name.
-        /// </summary>
-        public string ClassName
-        {
-            get
-            {
-                return this.className;
-            }
-        }
+    /// <summary>
+    /// Gets the name.
+    /// </summary>
+    public string Name { get; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether is valid.
-        /// </summary>
-        public bool IsValid
-        {
-            get
-            {
-                return this.isValid;
-            }
-            set
-            {
-                this.isValid = value;
-            }
-        }
+    /// <summary>
+    /// Gets the class name.
+    /// </summary>
+    public string ClassName { get; }
 
-        #region Override
+    /// <summary>
+    /// Gets or sets a value indicating whether is valid.
+    /// </summary>
+    public bool IsValid { get; set; }
 
-        /// <summary>
-        /// Override function for Equals.
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            TestMethod otherTestMethod = obj as TestMethod;
-            return otherTestMethod != null && this.name == otherTestMethod.name
-                   && this.className == otherTestMethod.className && this.isValid == otherTestMethod.isValid;
-        }
+    #region Override
 
-        /// <summary>
-        /// Override function for GetHashCode.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.Name?.GetHashCode() ?? 0;
-        }
+    /// <summary>
+    /// Override function for Equals.
+    /// </summary>
+    /// <param name="obj">
+    /// The object to compare.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is TestMethod otherTestMethod && Name == otherTestMethod.Name
+                                                 && ClassName == otherTestMethod.ClassName && IsValid == otherTestMethod.IsValid;
+    }
 
-        #endregion Override
+    /// <summary>
+    /// Override function for GetHashCode.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return Name?.GetHashCode() ?? 0;
+    }
 
-        #region IXmlTestStore Members
+    #endregion Override
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSimpleField(element, "@className", this.className, string.Empty);
-            helper.SaveSimpleField(element, "@name", this.name, string.Empty);
-            helper.SaveSimpleField(element, "isValid", this.isValid, false);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+        helper.SaveSimpleField(element, "@className", ClassName, string.Empty);
+        helper.SaveSimpleField(element, "@name", Name, string.Empty);
+        helper.SaveSimpleField(element, "isValid", IsValid, false);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestOutcome.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestOutcome.cs
index 4ba33477af..9091d8fd94 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestOutcome.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestOutcome.cs
@@ -1,106 +1,90 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Outcome of a test or a run.
+/// If a new successful state needs to be added you will need to modify
+/// RunResultAndStatistics in TestRun.cs and TestOutcomeHelper below.
+/// ----------------------------------------------------------------
+/// NOTE: the order is important and is used for computing outcome for aggregations.
+///       More important outcomes come first. See TestOutcomeHelper.GetAggregationOutcome.
+/// </summary>
+internal enum TestOutcome
 {
-    using System.Diagnostics.CodeAnalysis;
-
     /// <summary>
-    /// Outcome of a test or a run.
-    /// If a new successful state needs to be added you will need to modify
-    /// RunResultAndStatistics in TestRun.cs and TestOutcomeHelper below.
-    /// ----------------------------------------------------------------
-    /// NOTE: the order is important and is used for computing outcome for aggregations.
-    ///       More important outcomes come first. See TestOutcomeHelper.GetAggregationOutcome.
+    /// There was a system error while we were trying to execute a test.
     /// </summary>
-    internal enum TestOutcome
-    {
-        /// <summary>
-        /// There was a system error while we were trying to execute a test.
-        /// </summary>
-        Error,
-
-        /// <summary>
-        /// Test was executed, but there were issues.
-        /// Issues may involve exceptions or failed assertions.
-        /// </summary>
-        Failed,
+    Error,
 
-        /// <summary>
-        /// The test timed out
-        /// </summary>
-        Timeout,
-
-        /// <summary>
-        /// Test was aborted.
-        /// This was not caused by a user gesture, but rather by a framework decision.
-        /// </summary>
-        Aborted,
+    /// <summary>
+    /// Test was executed, but there were issues.
+    /// Issues may involve exceptions or failed assertions.
+    /// </summary>
+    Failed,
 
-        /// <summary>
-        /// Test has completed, but we can't say if it passed or failed.
-        /// May be used for aborted tests...
-        /// </summary>
-        Inconclusive,
+    /// <summary>
+    /// The test timed out
+    /// </summary>
+    Timeout,
 
-        /// <summary>
-        /// Test was executed w/o any issues, but run was aborted.
-        /// </summary>
-        PassedButRunAborted,
+    /// <summary>
+    /// Test was aborted.
+    /// This was not caused by a user gesture, but rather by a framework decision.
+    /// </summary>
+    Aborted,
 
-        /// <summary>
-        /// Test had it chance for been executed but was not, as ITestElement.IsRunnable == false.
-        /// </summary>
-        NotRunnable,
+    /// <summary>
+    /// Test has completed, but we can't say if it passed or failed.
+    /// May be used for aborted tests...
+    /// </summary>
+    Inconclusive,
 
-        /// <summary>
-        /// Test was not executed.
-        /// This was caused by a user gesture - e.g. user hit stop button.
-        /// </summary>
-        NotExecuted,
+    /// <summary>
+    /// Test was executed w/o any issues, but run was aborted.
+    /// </summary>
+    PassedButRunAborted,
 
-        /// <summary>
-        /// Test run was disconnected before it finished running.
-        /// </summary>
-        Disconnected,
+    /// <summary>
+    /// Test had it chance for been executed but was not, as ITestElement.IsRunnable == false.
+    /// </summary>
+    NotRunnable,
 
-        /// <summary>
-        /// To be used by Run level results.
-        /// This is not a failure.
-        /// </summary>
-        Warning,
+    /// <summary>
+    /// Test was not executed.
+    /// This was caused by a user gesture - e.g. user hit stop button.
+    /// </summary>
+    NotExecuted,
 
-        /// <summary>
-        /// Test was executed w/o any issues.
-        /// </summary>
-        Passed,
+    /// <summary>
+    /// Test run was disconnected before it finished running.
+    /// </summary>
+    Disconnected,
 
-        /// <summary>
-        /// Test has completed, but there is no qualitative measure of completeness.
-        /// </summary>
-        Completed,
+    /// <summary>
+    /// To be used by Run level results.
+    /// This is not a failure.
+    /// </summary>
+    Warning,
 
-        /// <summary>
-        /// Test is currently executing.
-        /// </summary>
-        InProgress,
+    /// <summary>
+    /// Test was executed w/o any issues.
+    /// </summary>
+    Passed,
 
-        /// <summary>
-        /// Test is in the execution queue, was not started yet.
-        /// </summary>
-        Pending,
+    /// <summary>
+    /// Test has completed, but there is no qualitative measure of completeness.
+    /// </summary>
+    Completed,
 
-        /// <summary>
-        /// The min value of this enum
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
-        Min = Error,
+    /// <summary>
+    /// Test is currently executing.
+    /// </summary>
+    InProgress,
 
-        /// <summary>
-        /// The max value of this enum
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly",
-            Justification = "Reviewed. Suppression is OK here.")]
-        Max = Pending
-    }
+    /// <summary>
+    /// Test is in the execution queue, was not started yet.
+    /// </summary>
+    Pending
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs
index 207c5a248a..07c66ea347 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResult.cs
@@ -1,616 +1,535 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Class to uniquely identify test results
+/// </summary>
+internal sealed class TestResultId : IXmlTestStore
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+    private readonly Guid _runId;
 
     /// <summary>
-    /// Class to uniquely identify test results
+    /// Initializes a new instance of the <see cref="TestResultId"/> class.
     /// </summary>
-    internal sealed class TestResultId : IXmlTestStore
+    /// <param name="runId">
+    /// The run id.
+    /// </param>
+    /// <param name="executionId">
+    /// The execution id.
+    /// </param>
+    /// <param name="parentExecutionId">
+    /// The parent execution id.
+    /// </param>
+    /// <param name="testId">
+    /// The test id.
+    /// </param>
+    public TestResultId(Guid runId, Guid executionId, Guid parentExecutionId, Guid testId)
     {
-        #region Fields
-
-        private Guid runId;
-        private Guid executionId;
-        private Guid parentExecutionId;
-        private Guid testId;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultId"/> class.
-        /// </summary>
-        /// <param name="runId">
-        /// The run id.
-        /// </param>
-        /// <param name="executionId">
-        /// The execution id.
-        /// </param>
-        /// <param name="parentExecutionId">
-        /// The parent execution id.
-        /// </param>
-        /// <param name="testId">
-        /// The test id.
-        /// </param>
-        public TestResultId(Guid runId, Guid executionId, Guid parentExecutionId, Guid testId)
-        {
-            this.runId = runId;
-            this.executionId = executionId;
-            this.parentExecutionId = parentExecutionId;
-            this.testId = testId;
-        }
+        _runId = runId;
+        ExecutionId = executionId;
+        ParentExecutionId = parentExecutionId;
+        TestId = testId;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the execution id.
+    /// </summary>
+    public Guid ExecutionId { get; }
 
-        #region properties
+    /// <summary>
+    /// Gets the parent execution id.
+    /// </summary>
+    public Guid ParentExecutionId { get; }
 
-        /// <summary>
-        /// Gets the execution id.
-        /// </summary>
-        public Guid ExecutionId
-        {
-            get { return this.executionId; }
-        }
+    /// <summary>
+    /// Gets the test id.
+    /// </summary>
+    public Guid TestId { get; }
 
-        /// <summary>
-        /// Gets the parent execution id.
-        /// </summary>
-        public Guid ParentExecutionId
-        {
-            get { return this.parentExecutionId; }
-        }
 
-        /// <summary>
-        /// Gets the test id.
-        /// </summary>
-        public Guid TestId
-        {
-            get { return this.testId; }
-        }
+    #region Overrides
 
-        #endregion
+    /// <summary>
+    /// Override function for Equals
+    /// </summary>
+    /// <param name="obj">
+    /// The object to compare
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    public override bool Equals(object? obj)
+    {
+        return obj is TestResultId tmpId && _runId.Equals(tmpId._runId) && ExecutionId.Equals((object)tmpId.ExecutionId);
+    }
 
-        #region Overrides
+    /// <summary>
+    /// Override function for GetHashCode.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="int"/>.
+    /// </returns>
+    public override int GetHashCode()
+    {
+        return _runId.GetHashCode() ^ ExecutionId.GetHashCode();
+    }
 
-        /// <summary>
-        /// Override function for Equals
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            TestResultId tmpId = obj as TestResultId;
-            if (tmpId == null)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Override function for ToString.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    public override string ToString()
+    {
+        return ExecutionId.ToString("B");
+    }
+    #endregion
 
-            return this.runId.Equals(tmpId.runId) && this.executionId.Equals((object)tmpId.executionId);
-        }
+    #region IXmlTestStore Members
 
-        /// <summary>
-        /// Override function for GetHashCode.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            return this.runId.GetHashCode() ^ this.executionId.GetHashCode();
-        }
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
 
-        /// <summary>
-        /// Override function for ToString.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public override string ToString()
-        {
-            return this.executionId.ToString("B");
-        }
-        #endregion
-
-        #region IXmlTestStore Members
-
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence helper = new XmlPersistence();
+        if (ExecutionId != Guid.Empty)
+            helper.SaveGuid(element, "@executionId", ExecutionId);
+        if (ParentExecutionId != Guid.Empty)
+            helper.SaveGuid(element, "@parentExecutionId", ParentExecutionId);
 
-            if (this.executionId != Guid.Empty)
-                helper.SaveGuid(element, "@executionId", this.executionId);
-            if (this.parentExecutionId != Guid.Empty)
-                helper.SaveGuid(element, "@parentExecutionId", this.parentExecutionId);
+        helper.SaveGuid(element, "@testId", TestId);
+    }
 
-            helper.SaveGuid(element, "@testId", this.testId);
-        }
+    #endregion
+}
+
+/// <summary>
+/// The test result error info class.
+/// </summary>
+internal sealed class TestResultErrorInfo : IXmlTestStore
+{
+    [StoreXmlSimpleField("Message", "")]
+    private string? _message;
 
-        #endregion
+    [StoreXmlSimpleField("StackTrace", "")]
+    private string? _stackTrace;
+
+
+    /// <summary>
+    /// Gets or sets the message.
+    /// </summary>
+    public string? Message
+    {
+        get { return _message; }
+        set { _message = value; }
     }
 
     /// <summary>
-    /// The test result error info class.
+    /// Gets or sets the stack trace.
     /// </summary>
-    internal sealed class TestResultErrorInfo : IXmlTestStore
+    public string? StackTrace
     {
-        [StoreXmlSimpleField("Message", "")]
-        private string message;
+        get { return _stackTrace; }
+        set { _stackTrace = value; }
+    }
 
-        [StoreXmlSimpleField("StackTrace", "")]
-        private string stackTrace;
+    #region IXmlTestStore Members
 
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence.SaveUsingReflection(element, this, typeof(TestResultErrorInfo), parameters);
+    }
 
-        /// <summary>
-        /// Gets or sets the message.
-        /// </summary>
-        public string Message
-        {
-            get { return this.message; }
-            set { this.message = value; }
-        }
+    #endregion
+}
 
-        /// <summary>
-        /// Gets or sets the stack trace.
-        /// </summary>
-        public string StackTrace
-        {
-            get { return this.stackTrace; }
-            set { this.stackTrace = value; }
-        }
+/// <summary>
+/// Class for test result.
+/// </summary>
+internal class TestResult : ITestResult, IXmlTestStore
+{
+    private readonly string _resultName;
+    private string? _stdOut;
+    private string? _stdErr;
+    private string? _debugTrace;
+    private TimeSpan _duration;
+    private readonly TestType _testType;
+    private TestRun? _testRun;
+    private TestResultErrorInfo? _errorInfo;
+    private readonly TestListCategoryId _categoryId;
+    private ArrayList _textMessages;
+    private readonly TrxFileHelper _trxFileHelper;
 
-        #region IXmlTestStore Members
-
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence.SaveUsingReflection(element, this, typeof(TestResultErrorInfo), parameters);
-        }
+    /// <summary>
+    /// Paths to test result files, relative to the test results folder, sorted in increasing order
+    /// </summary>
+    private readonly SortedList<string, object?> _resultFiles = new(StringComparer.OrdinalIgnoreCase);
 
-        #endregion
-    }
+    /// <summary>
+    /// Information provided by data collectors for the test case
+    /// </summary>
+    private readonly List<CollectorDataEntry> _collectorDataEntries = new();
 
     /// <summary>
-    /// Class for test result.
+    /// Initializes a new instance of the <see cref="TestResult"/> class.
     /// </summary>
-    internal class TestResult : ITestResult, IXmlTestStore
+    /// <param name="computerName">
+    /// The computer name.
+    /// </param>
+    /// <param name="runId">
+    /// The run id.
+    /// </param>
+    /// <param name="executionId">Execution id.</param>
+    /// <param name="parentExecutionId">Parent execution id.</param>
+    /// <param name="resultName">Result name.</param>
+    /// <param name="testId">
+    /// The test id.
+    /// </param>
+    /// <param name="outcome">
+    /// The outcome.
+    /// </param>
+    /// <param name="testType"></param>
+    /// <param name="testCategoryId"></param>
+    /// <param name="trxFileHelper"></param>
+    public TestResult(
+        Guid runId,
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string resultName,
+        string computerName,
+        TestOutcome outcome,
+        TestType testType,
+        TestListCategoryId testCategoryId,
+        TrxFileHelper trxFileHelper)
     {
-        #region Fields
-
-        private TestResultId id;
-        private string resultName;
-        private string computerInfo;
-        private string stdOut;
-        private string stdErr;
-        private string debugTrace;
-        private string resultType;
-        private int dataRowInfo;
-        private TimeSpan duration;
-        private DateTime startTime;
-        private DateTime endTime;
-        private TestType testType;
-        private TestOutcome outcome;
-        private TestRun testRun;
-        private TestResultErrorInfo errorInfo;
-        private TestListCategoryId categoryId;
-        private ArrayList textMessages;
-
-        /// <summary>
-        /// Directory containing the test result files, relative to the root test results directory
-        /// </summary>
-        private string relativeTestResultsDirectory;
-        private readonly TrxFileHelper trxFileHelper;
-
-        /// <summary>
-        /// Paths to test result files, relative to the test results folder, sorted in increasing order
-        /// </summary>
-        private SortedList<string, object> resultFiles = new SortedList<string, object>(StringComparer.OrdinalIgnoreCase);
-
-        /// <summary>
-        /// Information provided by data collectors for the test case
-        /// </summary>
-        private List<CollectorDataEntry> collectorDataEntries = new List<CollectorDataEntry>();
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResult"/> class.
-        /// </summary>
-        /// <param name="computerName">
-        /// The computer name.
-        /// </param>
-        /// <param name="runId">
-        /// The run id.
-        /// </param>
-        /// <param name="test">
-        /// The test.
-        /// </param>
-        /// <param name="outcome">
-        /// The outcome.
-        /// </param>
-        public TestResult(
-            Guid runId,
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string resultName,
-            string computerName,
-            TestOutcome outcome,
-            TestType testType,
-            TestListCategoryId testCategoryId,
-            TrxFileHelper trxFileHelper) 
-        {
-            Debug.Assert(computerName != null, "computername is null");
-            Debug.Assert(!Guid.Empty.Equals(executionId), "ExecutionId is empty");
-            Debug.Assert(!Guid.Empty.Equals(testId), "TestId is empty");
-
-            this.Initialize();
-
-            this.id = new TestResultId(runId, executionId, parentExecutionId, testId);
-            this.resultName = resultName;
-            this.testType = testType;
-            this.computerInfo = computerName;
-            this.outcome = outcome;
-            this.categoryId = testCategoryId;
-            this.relativeTestResultsDirectory = TestRunDirectories.GetRelativeTestResultsDirectory(executionId);
-            this.trxFileHelper = trxFileHelper;
-        }
-
-        #endregion
+        TPDebug.Assert(computerName != null, "computername is null");
+        TPDebug.Assert(!Guid.Empty.Equals(executionId), "ExecutionId is empty");
+        TPDebug.Assert(!Guid.Empty.Equals(testId), "TestId is empty");
+
+        _textMessages = new ArrayList();
+        DataRowInfo = -1;
+
+        Id = new TestResultId(runId, executionId, parentExecutionId, testId);
+        _resultName = resultName;
+        _testType = testType;
+        ComputerName = computerName;
+        Outcome = outcome;
+        _categoryId = testCategoryId;
+        RelativeTestResultsDirectory = TestRunDirectories.GetRelativeTestResultsDirectory(executionId);
+        _trxFileHelper = trxFileHelper;
+    }
 
-        #region properties
+    /// <summary>
+    /// Gets or sets the end time.
+    /// </summary>
+    public DateTime EndTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the end time.
-        /// </summary>
-        public DateTime EndTime
-        {
-            get { return this.endTime; }
-            set { this.endTime = value; }
-        }
+    /// <summary>
+    /// Gets or sets the start time.
+    /// </summary>
+    public DateTime StartTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the start time.
-        /// </summary>
-        public DateTime StartTime
-        {
-            get { return this.startTime; }
-            set { this.startTime = value; }
-        }
+    /// <summary>
+    /// Gets or sets the duration.
+    /// </summary>
+    public TimeSpan Duration
+    {
+        get { return _duration; }
 
-        /// <summary>
-        /// Gets or sets the duration.
-        /// </summary>
-        public TimeSpan Duration
+        set
         {
-            get { return this.duration; }
-
-            set
-            {
-                // On some hardware the Stopwatch.Elapsed can return a negative number.  This tends
-                // to happen when the duration of the test is very short and it is hardware dependent
-                // (seems to happen most on virtual machines or machines with AMD processors).  To prevent
-                // reporting a negative duration, use TimeSpan.Zero when the elapsed time is less than zero.
-                EqtTrace.WarningIf(value < TimeSpan.Zero, "TestResult.Duration: The duration is being set to {0}.  Since the duration is negative the duration will be updated to zero.", value);
-                this.duration = value > TimeSpan.Zero ? value : TimeSpan.Zero;
-            }
+            // On some hardware the Stopwatch.Elapsed can return a negative number.  This tends
+            // to happen when the duration of the test is very short and it is hardware dependent
+            // (seems to happen most on virtual machines or machines with AMD processors).  To prevent
+            // reporting a negative duration, use TimeSpan.Zero when the elapsed time is less than zero.
+            EqtTrace.WarningIf(value < TimeSpan.Zero, "TestResult.Duration: The duration is being set to {0}.  Since the duration is negative the duration will be updated to zero.", value);
+            _duration = value > TimeSpan.Zero ? value : TimeSpan.Zero;
         }
+    }
 
-        /// <summary>
-        /// Gets the computer name.
-        /// </summary>
-        public string ComputerName
-        {
-            get { return this.computerInfo; }
-        }
+    /// <summary>
+    /// Gets the computer name.
+    /// </summary>
+    public string ComputerName { get; }
 
-        /// <summary>
-        /// Gets or sets the outcome.
-        /// </summary>
-        public TestOutcome Outcome
-        {
-            get { return this.outcome; }
-            set { this.outcome = value; }
-        }
+    /// <summary>
+    /// Gets or sets the outcome.
+    /// </summary>
+    public TestOutcome Outcome { get; set; }
 
 
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        public TestResultId Id
-        {
-            get { return this.id; }
-            internal set { this.id = value; }
-        }
+    /// <summary>
+    /// Gets or sets the id.
+    /// </summary>
+    public TestResultId Id { get; internal set; }
 
-        /// <summary>
-        /// Gets or sets the error message.
-        /// </summary>
-        public string ErrorMessage
+    /// <summary>
+    /// Gets or sets the error message.
+    /// </summary>
+    public string ErrorMessage
+    {
+        get { return _errorInfo?.Message ?? string.Empty; }
+        set
         {
-            get { return this.errorInfo?.Message ?? string.Empty; }
-            set
-            {
-                if (this.errorInfo == null)
-                    this.errorInfo = new TestResultErrorInfo();
+            _errorInfo ??= new TestResultErrorInfo();
 
-                this.errorInfo.Message = value;
-            }
+            _errorInfo.Message = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the error stack trace.
-        /// </summary>
-        public string ErrorStackTrace
-        {
-            get { return this.errorInfo?.StackTrace ?? string.Empty; }
-
-            set
-            {
-                if (this.errorInfo == null)
-                    this.errorInfo = new TestResultErrorInfo();
-
-                this.errorInfo.StackTrace = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the error stack trace.
+    /// </summary>
+    public string ErrorStackTrace
+    {
+        get { return _errorInfo?.StackTrace ?? string.Empty; }
 
-        /// <summary>
-        /// Gets the text messages.
-        /// </summary>
-        /// <remarks>
-        /// Additional information messages from TestTextResultMessage, e.g. generated by TestOutcome.WriteLine.
-        /// Avoid using this property in the following way: for (int i=0; i&lt;prop.Length; i++) { ... prop[i] ...}
-        /// </remarks>
-        public string[] TextMessages
+        set
         {
-            get { return (string[])this.textMessages.ToArray(typeof(string)); }
+            _errorInfo ??= new TestResultErrorInfo();
 
-            set
-            {
-                if (value != null)
-                    this.textMessages = new ArrayList(value);
-                else
-                    this.textMessages.Clear();
-            }
+            _errorInfo.StackTrace = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the standard out.
-        /// </summary>
-        public string StdOut
-        {
-            get { return this.stdOut ?? string.Empty; }
-            set { this.stdOut = value; }
-        }
+    /// <summary>
+    /// Gets the text messages.
+    /// </summary>
+    /// <remarks>
+    /// Additional information messages from TestTextResultMessage, e.g. generated by TestOutcome.WriteLine.
+    /// Avoid using this property in the following way: for (int i=0; i&lt;prop.Length; i++) { ... prop[i] ...}
+    /// </remarks>
+    [NotNull]
+    public string[]? TextMessages
+    {
+        get { return (string[])_textMessages.ToArray(typeof(string)); }
 
-        /// <summary>
-        /// Gets or sets the standard err.
-        /// </summary>
-        public string StdErr
+        set
         {
-            get { return this.stdErr ?? string.Empty; }
-            set { this.stdErr = value; }
+            if (value != null)
+                _textMessages = new ArrayList(value);
+            else
+                _textMessages.Clear();
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the debug trace.
-        /// </summary>
-        public string DebugTrace
-        {
-            get { return this.debugTrace ?? string.Empty; }
-            set { this.debugTrace = value; }
-        }
+    /// <summary>
+    /// Gets or sets the standard out.
+    /// </summary>
+    public string StdOut
+    {
+        get { return _stdOut ?? string.Empty; }
+        set { _stdOut = value; }
+    }
 
-        /// <summary>
-        /// Gets the path to the test results directory
-        /// </summary>
-        public string TestResultsDirectory
+    /// <summary>
+    /// Gets or sets the standard err.
+    /// </summary>
+    public string StdErr
+    {
+        get { return _stdErr ?? string.Empty; }
+        set { _stdErr = value; }
+    }
+
+    /// <summary>
+    /// Gets or sets the debug trace.
+    /// </summary>
+    public string DebugTrace
+    {
+        get { return _debugTrace ?? string.Empty; }
+        set { _debugTrace = value; }
+    }
+
+    /// <summary>
+    /// Gets the path to the test results directory
+    /// </summary>
+    public string TestResultsDirectory
+    {
+        get
         {
-            get
+            if (_testRun == null)
             {
-                if (this.testRun == null)
-                {
-                    Debug.Fail("'m_testRun' is null");
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_MissingRunInResult));
-                }
-
-                return this.testRun.GetResultFilesDirectory(this);
+                Debug.Fail("'m_testRun' is null");
+                throw new InvalidOperationException(TrxLoggerResources.Common_MissingRunInResult);
             }
-        }
 
-        /// <summary>
-        /// Gets the directory containing the test result files, relative to the root results directory
-        /// </summary>
-        public string RelativeTestResultsDirectory
-        {
-            get { return this.relativeTestResultsDirectory; }
+            return _testRun.GetResultFilesDirectory(this);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the data row info.
-        /// </summary>
-        public int DataRowInfo
-        {
-            get { return this.dataRowInfo; }
-            set { this.dataRowInfo = value; }
-        }
+    /// <summary>
+    /// Gets the directory containing the test result files, relative to the root results directory
+    /// </summary>
+    public string RelativeTestResultsDirectory { get; }
 
-        /// <summary>
-        /// Gets or sets the result type.
-        /// </summary>
-        public string ResultType
-        {
-            get { return this.resultType; }
-            set { this.resultType = value; }
-        }
+    /// <summary>
+    /// Gets or sets the data row info.
+    /// </summary>
+    public int DataRowInfo { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the result type.
+    /// </summary>
+    public string? ResultType { get; set; }
 
-        #region Overrides
-        public override bool Equals(object obj)
-        {
-            TestResult trm = obj as TestResult;
-            if (trm == null)
-            {
-                return false;
-            }
-            Debug.Assert(this.id != null, "id is null");
-            Debug.Assert(trm.id != null, "test result message id is null");
-            return this.id.Equals(trm.id);
-        }
 
-        public override int GetHashCode()
+    #region Overrides
+    public override bool Equals(object? obj)
+    {
+        if (obj is not TestResult trm)
         {
-            Debug.Assert(this.id != null, "id is null");
-            return this.id.GetHashCode();
+            return false;
         }
+        TPDebug.Assert(Id != null, "id is null");
+        TPDebug.Assert(trm.Id != null, "test result message id is null");
+        return Id.Equals(trm.Id);
+    }
 
-        #endregion
-
-        /// <summary>
-        /// Helper function to add a text message info to the test result
-        /// </summary>
-        /// <param name="text">Message to be added</param>
-        public void AddTextMessage(string text)
-        {
-            EqtAssert.ParameterNotNull(text, nameof(text));
-            this.textMessages.Add(text);
-        }
+    public override int GetHashCode()
+    {
+        TPDebug.Assert(Id != null, "id is null");
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Sets the test run the test was executed in
-        /// </summary>
-        /// <param name="testRun">The test run the test was executed in</param>
-        internal virtual void SetTestRun(TestRun testRun)
-        {
-            Debug.Assert(testRun != null, "'testRun' is null");
-            this.testRun = testRun;
-        }
+    #endregion
 
-        /// <summary>
-        /// Adds result files to the <see cref="resultFiles"/> collection
-        /// </summary>
-        /// <param name="resultFileList">Paths to the result files</param>
-        internal void AddResultFiles(IEnumerable<string> resultFileList)
-        {
-            Debug.Assert(resultFileList != null, "'resultFileList' is null");
+    /// <summary>
+    /// Helper function to add a text message info to the test result
+    /// </summary>
+    /// <param name="text">Message to be added</param>
+    public void AddTextMessage(string text)
+    {
+        EqtAssert.ParameterNotNull(text, nameof(text));
+        _textMessages.Add(text);
+    }
 
-            string testResultsDirectory = this.TestResultsDirectory;
-            foreach (string resultFile in resultFileList)
-            {
-                Debug.Assert(!string.IsNullOrEmpty(resultFile), "'resultFile' is null or empty");
-                Debug.Assert(resultFile.Trim() == resultFile, "'resultFile' has whitespace at the ends");
+    /// <summary>
+    /// Sets the test run the test was executed in
+    /// </summary>
+    /// <param name="testRun">The test run the test was executed in</param>
+    internal virtual void SetTestRun(TestRun testRun)
+    {
+        TPDebug.Assert(testRun != null, "'testRun' is null");
+        _testRun = testRun;
+    }
 
-                this.resultFiles[trxFileHelper.MakePathRelative(resultFile, testResultsDirectory)] = null;
-            }
-        }
+    /// <summary>
+    /// Adds result files to the <see cref="_resultFiles"/> collection
+    /// </summary>
+    /// <param name="resultFileList">Paths to the result files</param>
+    internal void AddResultFiles(IEnumerable<string> resultFileList)
+    {
+        TPDebug.Assert(resultFileList != null, "'resultFileList' is null");
 
-        /// <summary>
-        /// Adds collector data entries to the <see cref="collectorDataEntries"/> collection
-        /// </summary>
-        /// <param name="collectorDataEntryList">The collector data entry to add</param>
-        internal void AddCollectorDataEntries(IEnumerable<CollectorDataEntry> collectorDataEntryList)
+        string testResultsDirectory = TestResultsDirectory;
+        foreach (string resultFile in resultFileList)
         {
-            Debug.Assert(collectorDataEntryList != null, "'collectorDataEntryList' is null");
-
-            string testResultsDirectory = this.TestResultsDirectory;
-            foreach (CollectorDataEntry collectorDataEntry in collectorDataEntryList)
-            {
-                Debug.Assert(collectorDataEntry != null, "'collectorDataEntry' is null");
-                Debug.Assert(!this.collectorDataEntries.Contains(collectorDataEntry), "The collector data entry already exists in the collection");
+            TPDebug.Assert(!string.IsNullOrEmpty(resultFile), "'resultFile' is null or empty");
+            TPDebug.Assert(resultFile.Trim() == resultFile, "'resultFile' has whitespace at the ends");
 
-                this.collectorDataEntries.Add(collectorDataEntry.Clone(testResultsDirectory, false));
-            }
+            _resultFiles[TrxFileHelper.MakePathRelative(resultFile, testResultsDirectory)] = null;
         }
+    }
 
+    /// <summary>
+    /// Adds collector data entries to the <see cref="_collectorDataEntries"/> collection
+    /// </summary>
+    /// <param name="collectorDataEntryList">The collector data entry to add</param>
+    internal void AddCollectorDataEntries(IEnumerable<CollectorDataEntry> collectorDataEntryList)
+    {
+        TPDebug.Assert(collectorDataEntryList != null, "'collectorDataEntryList' is null");
 
-        #region IXmlTestStore Members
-
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public virtual void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
+        string testResultsDirectory = TestResultsDirectory;
+        foreach (CollectorDataEntry collectorDataEntry in collectorDataEntryList)
         {
-            XmlPersistence helper = new XmlPersistence();
-
-            helper.SaveObject(this.id, element, ".", parameters);
-            helper.SaveSimpleField(element, "@testName", this.resultName, string.Empty);
-            helper.SaveSimpleField(element, "@computerName", this.computerInfo, string.Empty);
-            helper.SaveSimpleField(element, "@duration", this.duration, default(TimeSpan));
-            helper.SaveSimpleField(element, "@startTime", this.startTime, default(DateTime));
-            helper.SaveSimpleField(element, "@endTime", this.endTime, default(DateTime));
-            helper.SaveGuid(element, "@testType", this.testType.Id);
-
-            if (this.stdOut != null)
-                this.stdOut = this.stdOut.Trim();
-
-            if (this.stdErr != null)
-                this.stdErr = this.stdErr.Trim();
-
-            helper.SaveSimpleField(element, "@outcome", this.outcome, default(TestOutcome));
-            helper.SaveSimpleField(element, "Output/StdOut", this.stdOut, string.Empty);
-            helper.SaveSimpleField(element, "Output/StdErr", this.stdErr, string.Empty);
-            helper.SaveSimpleField(element, "Output/DebugTrace", this.debugTrace, string.Empty);
-            helper.SaveObject(this.errorInfo, element, "Output/ErrorInfo", parameters);
-            helper.SaveGuid(element, "@testListId", this.categoryId.Id);
-            helper.SaveIEnumerable(this.textMessages, element, "Output/TextMessages", ".", "Message", parameters);
-            helper.SaveSimpleField(element, "@relativeResultsDirectory", this.relativeTestResultsDirectory, null);
-            helper.SaveIEnumerable(this.resultFiles.Keys, element, "ResultFiles", "@path", "ResultFile", parameters);
-            helper.SaveIEnumerable(this.collectorDataEntries, element, "CollectorDataEntries", ".", "Collector", parameters);
-
-            if (this.dataRowInfo >= 0)
-                helper.SaveSimpleField(element, "@dataRowInfo", this.dataRowInfo, -1);
-
-            if (!string.IsNullOrEmpty(this.resultType))
-                helper.SaveSimpleField(element, "@resultType", this.resultType, string.Empty);
+            TPDebug.Assert(collectorDataEntry != null, "'collectorDataEntry' is null");
+            TPDebug.Assert(!_collectorDataEntries.Contains(collectorDataEntry), "The collector data entry already exists in the collection");
+
+            _collectorDataEntries.Add(collectorDataEntry.Clone(testResultsDirectory, false));
         }
+    }
 
-        #endregion
 
-        private void Initialize()
-        {
-            this.textMessages = new ArrayList();
-            this.dataRowInfo = -1;
-        }
+    #region IXmlTestStore Members
+
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public virtual void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+
+        helper.SaveObject(Id, element, ".", parameters);
+        helper.SaveSimpleField(element, "@testName", _resultName, string.Empty);
+        helper.SaveSimpleField(element, "@computerName", ComputerName, string.Empty);
+        helper.SaveSimpleField(element, "@duration", _duration, default(TimeSpan));
+        helper.SaveSimpleField(element, "@startTime", StartTime, default(DateTime));
+        helper.SaveSimpleField(element, "@endTime", EndTime, default(DateTime));
+        helper.SaveGuid(element, "@testType", _testType.Id);
+
+        if (_stdOut != null)
+            _stdOut = _stdOut.Trim();
+
+        if (_stdErr != null)
+            _stdErr = _stdErr.Trim();
+
+        helper.SaveSimpleField(element, "@outcome", Outcome, default(TestOutcome));
+        helper.SaveSimpleField(element, "Output/StdOut", _stdOut, string.Empty);
+        helper.SaveSimpleField(element, "Output/StdErr", _stdErr, string.Empty);
+        helper.SaveSimpleField(element, "Output/DebugTrace", _debugTrace, string.Empty);
+        helper.SaveObject(_errorInfo, element, "Output/ErrorInfo", parameters);
+        helper.SaveGuid(element, "@testListId", _categoryId.Id);
+        helper.SaveIEnumerable(_textMessages, element, "Output/TextMessages", ".", "Message", parameters);
+        helper.SaveSimpleField(element, "@relativeResultsDirectory", RelativeTestResultsDirectory, null);
+        helper.SaveIEnumerable(_resultFiles.Keys, element, "ResultFiles", "@path", "ResultFile", parameters);
+        helper.SaveIEnumerable(_collectorDataEntries, element, "CollectorDataEntries", ".", "Collector", parameters);
+
+        if (DataRowInfo >= 0)
+            helper.SaveSimpleField(element, "@dataRowInfo", DataRowInfo, -1);
+
+        if (!string.IsNullOrEmpty(ResultType))
+            helper.SaveSimpleField(element, "@resultType", ResultType, string.Empty);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResultAggregation.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResultAggregation.cs
index 8c06d8ec58..ebd7ee50ba 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResultAggregation.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestResultAggregation.cs
@@ -1,54 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.Collections.Generic;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Test result aggregation.
+/// </summary>
+internal class TestResultAggregation : TestResult, ITestResultAggregation
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    protected List<ITestResult>? _innerResults;
+
+    public TestResultAggregation(
+        Guid runId,
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string resultName,
+        string computerName,
+        TestOutcome outcome,
+        TestType testType,
+        TestListCategoryId testCategoryId,
+        TrxFileHelper trxFileHelper)
+        : base(runId, testId, executionId, parentExecutionId, resultName, computerName, outcome, testType, testCategoryId, trxFileHelper) { }
 
     /// <summary>
-    /// Test result aggregation.
+    /// Gets the inner results.
     /// </summary>
-    internal class TestResultAggregation : TestResult, ITestResultAggregation
+    public List<ITestResult> InnerResults
     {
-        protected List<ITestResult> innerResults;
-
-        public TestResultAggregation(
-            Guid runId,
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string resultName,
-            string computerName,
-            TestOutcome outcome,
-            TestType testType,
-            TestListCategoryId testCategoryId,
-            TrxFileHelper trxFileHelper) : base(runId, testId, executionId, parentExecutionId, resultName, computerName, outcome, testType, testCategoryId, trxFileHelper) { }
-
-        /// <summary>
-        /// Gets the inner results.
-        /// </summary>
-        public List<ITestResult> InnerResults
+        get
         {
-            get
-            {
-                if (innerResults == null)
-                {
-                    innerResults = new List<ITestResult>();
-                }
-                return innerResults;
-            }
+            _innerResults ??= new List<ITestResult>();
+            return _innerResults;
         }
+    }
 
-        public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            base.Save(element, parameters);
+    public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        base.Save(element, parameters);
 
-            XmlPersistence helper = new XmlPersistence();
-            if (this.InnerResults.Count > 0)
-                helper.SaveIEnumerable(this.InnerResults, element, "InnerResults", ".", null, parameters);
-        }
+        XmlPersistence helper = new();
+        if (InnerResults.Count > 0)
+            helper.SaveIEnumerable(InnerResults, element, "InnerResults", ".", null, parameters);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs
index eec01d3e69..4bae23dd26 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs
@@ -1,218 +1,197 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Security.Principal;
-
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
-
-    /// <summary>
-    /// Class having information about a test run.
-    /// </summary>
-    internal sealed class TestRun
-    {
-        #region Fields
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Security.Principal;
 
-        #region Summary fields
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
-        // These fields will be valid when the test run summary is loaded from a results file.
-        // The summary fields need to be first in the class so they get serialized first. When we
-        // read the summary we don't want to parse the XML tags for other fields because they can
-        // be quite large.
-        //
-        // When reading the results file, the summary is considered complete when all summary fields
-        // are non-null. Any new summary fields that are initialized in the constructor should be
-        // placed before the last non-initialized field.
-        //
-        // The summary parsing code is in XmlTestReader.ReadTestRunSummary.
-        [StoreXmlSimpleField]
-        private Guid id;
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
 
-        [StoreXmlSimpleField]
-        private string name;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-        [StoreXmlSimpleField("@runUser", "")]
-        private string runUser;
-
-        private TestRunConfiguration runConfig;
+/// <summary>
+/// Class having information about a test run.
+/// </summary>
+internal sealed class TestRun
+{
+    // These fields will be valid when the test run summary is loaded from a results file.
+    // The summary fields need to be first in the class so they get serialized first. When we
+    // read the summary we don't want to parse the XML tags for other fields because they can
+    // be quite large.
+    //
+    // When reading the results file, the summary is considered complete when all summary fields
+    // are non-null. Any new summary fields that are initialized in the constructor should be
+    // placed before the last non-initialized field.
+    //
+    // The summary parsing code is in XmlTestReader.ReadTestRunSummary.
+    [StoreXmlSimpleField("@id")]
+    private readonly Guid _id;
 
-        #endregion Summary fields
+    [StoreXmlSimpleField("@name")]
+    private string _name;
 
-        #region Non-summary fields
-        [StoreXmlSimpleField("Times/@creation")]
-        private DateTime created;
+    [StoreXmlSimpleField("@runUser", "")]
+    private readonly string _runUser;
 
-        [StoreXmlSimpleField("Times/@queuing")]
-        private DateTime queued;
+    private TestRunConfiguration? _runConfig;
 
-        [StoreXmlSimpleField("Times/@start")]
-        private DateTime started;
+    [StoreXmlSimpleField("Times/@creation")]
+    private readonly DateTime _created;
 
-        [StoreXmlSimpleField("Times/@finish")]
-        private DateTime finished;
+    [StoreXmlSimpleField("Times/@queuing")]
+    private readonly DateTime _queued;
 
-        #endregion
+    [StoreXmlSimpleField("Times/@start")]
+    private DateTime _started;
 
-        #endregion
+    [StoreXmlSimpleField("Times/@finish")]
+    private DateTime _finished;
 
-        #region Constructors
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRun"/> class.
+    /// </summary>
+    /// <param name="runId">
+    /// The run id.
+    /// </param>
+    internal TestRun(Guid runId)
+    {
+        _id = Guid.NewGuid();
+        _name = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_TestRunName, Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRun"/> class.
-        /// </summary>
-        /// <param name="runId">
-        /// The run id.
-        /// </param>
-        internal TestRun(Guid runId)
+        // Fix for issue (https://github.com/Microsoft/vstest/issues/213). Since there is no way to find current user in linux machine.
+        // We are catching PlatformNotSupportedException for non windows machine.
+        try
         {
-            this.Initialize();
-
-            EqtAssert.IsTrue(!Guid.Empty.Equals(runId), "Can't use Guid.Empty for run ID.");
-            this.id = runId;
+            _runUser = WindowsIdentity.GetCurrent().Name;
         }
-
-        #endregion Constructors
-
-        /// <summary>
-        /// Gets or sets the run configuration.
-        /// </summary>
-        internal TestRunConfiguration RunConfiguration
+        catch (PlatformNotSupportedException)
         {
-            get
-            {
-                return this.runConfig;
-            }
-
-            set
-            {
-                EqtAssert.ParameterNotNull(value, "RunConfiguration");
-                this.runConfig = value;
-            }
+            _runUser = string.Empty;
         }
+        _created = DateTime.UtcNow;
+        _queued = DateTime.UtcNow;
+        _started = DateTime.UtcNow;
+        _finished = DateTime.UtcNow;
+
+        EqtAssert.IsTrue(!Guid.Empty.Equals(runId), "Can't use Guid.Empty for run ID.");
+        _id = runId;
+    }
 
-        /// <summary>
-        /// Gets or sets the start time.
-        /// </summary>
-        internal DateTime Started
+    /// <summary>
+    /// Gets or sets the run configuration.
+    /// </summary>
+    internal TestRunConfiguration? RunConfiguration
+    {
+        get
         {
-            get
-            {
-                return this.started;
-            }
-
-            set
-            {
-                this.started = value;
-            }
+            return _runConfig;
         }
 
-        /// <summary>
-        /// Gets or sets the finished time of Test run.
-        /// </summary>
-        internal DateTime Finished
+        set
         {
-            get { return this.finished; }
-            set { this.finished = value; }
+            EqtAssert.ParameterNotNull(value, "RunConfiguration");
+            _runConfig = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        internal string Name
+    /// <summary>
+    /// Gets or sets the start time.
+    /// </summary>
+    internal DateTime Started
+    {
+        get
         {
-            get
-            {
-                return this.name;
-            }
-
-            set
-            {
-                EqtAssert.StringNotNullOrEmpty(value, "Name");
-                this.name = value;
-            }
+            return _started;
         }
 
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        internal Guid Id
+        set
         {
-            get { return this.id; }
+            _started = value;
         }
+    }
 
-        /// <summary>
-        /// WARNING: do not use from inside Test Adapters, use from only on HA by UI etc.
-        /// Returns directory on HA for dependent files for TestResult. XmlPersistence method for UI.
-        /// Throws on error (e.g. if deployment directory was not set for test run).
-        /// </summary>
-        /// <param name="result">
-        /// Test Result to get dependent files directory for.
-        /// </param>
-        /// <returns>
-        /// Result directory.
-        /// </returns>
-        internal string GetResultFilesDirectory(TestResult result)
+    /// <summary>
+    /// Gets or sets the finished time of Test run.
+    /// </summary>
+    internal DateTime Finished
+    {
+        get { return _finished; }
+        set { _finished = value; }
+    }
+
+    /// <summary>
+    /// Gets or sets the name.
+    /// </summary>
+    internal string Name
+    {
+        get
         {
-            EqtAssert.ParameterNotNull(result, nameof(result));
-            return Path.Combine(this.GetResultsDirectory(), result.RelativeTestResultsDirectory);
+            return _name;
         }
 
-        /// <summary>
-        /// Gets the results directory, which is the run deployment In directory
-        /// </summary>
-        /// <returns>The results directory</returns>
-        /// <remarks>This method is called by public properties/methods, so it needs to throw on error</remarks>
-        internal string GetResultsDirectory()
+        set
         {
-            if (this.RunConfiguration == null)
-            {
-                Debug.Fail("'RunConfiguration' is null");
-                throw new Exception(String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_MissingRunConfigInRun));
-            }
-
-            if (string.IsNullOrEmpty(this.RunConfiguration.RunDeploymentRootDirectory))
-            {
-                Debug.Fail("'RunConfiguration.RunDeploymentRootDirectory' is null or empty");
-                throw new Exception(String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_MissingRunDeploymentRootInRunConfig));
-            }
-
-            return this.RunConfiguration.RunDeploymentInDirectory;
+            EqtAssert.StringNotNullOrEmpty(value, "Name");
+            _name = value;
         }
+    }
+
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    internal Guid Id
+    {
+        get { return _id; }
+    }
 
-        private static string FormatDateTimeForRunName(DateTime timeStamp)
+    /// <summary>
+    /// WARNING: do not use from inside Test Adapters, use from only on HA by UI etc.
+    /// Returns directory on HA for dependent files for TestResult. XmlPersistence method for UI.
+    /// Throws on error (e.g. if deployment directory was not set for test run).
+    /// </summary>
+    /// <param name="result">
+    /// Test Result to get dependent files directory for.
+    /// </param>
+    /// <returns>
+    /// Result directory.
+    /// </returns>
+    internal string GetResultFilesDirectory(TestResult result)
+    {
+        EqtAssert.ParameterNotNull(result, nameof(result));
+        return Path.Combine(GetResultsDirectory(), result.RelativeTestResultsDirectory);
+    }
+
+    /// <summary>
+    /// Gets the results directory, which is the run deployment In directory
+    /// </summary>
+    /// <returns>The results directory</returns>
+    /// <remarks>This method is called by public properties/methods, so it needs to throw on error</remarks>
+    internal string GetResultsDirectory()
+    {
+        if (RunConfiguration == null)
         {
-            // We use custom format string to make sure that runs are sorted in the same way on all intl machines.
-            // This is both for directory names and for Data Warehouse.
-            return timeStamp.ToString("yyyy-MM-dd HH:mm:ss", DateTimeFormatInfo.InvariantInfo);
+            Debug.Fail("'RunConfiguration' is null");
+            throw new Exception(TrxLoggerResources.Common_MissingRunConfigInRun);
         }
 
-        private void Initialize()
+        if (string.IsNullOrEmpty(RunConfiguration.RunDeploymentRootDirectory))
         {
-            this.id = Guid.NewGuid();
-            this.name = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_TestRunName, Environment.GetEnvironmentVariable("UserName"), Environment.MachineName, FormatDateTimeForRunName(DateTime.Now));
-
-            // Fix for issue (https://github.com/Microsoft/vstest/issues/213). Since there is no way to find current user in linux machine.
-            // We are catching PlatformNotSupportedException for non windows machine.
-            try
-            {
-                this.runUser = WindowsIdentity.GetCurrent().Name;
-            }
-            catch (PlatformNotSupportedException)
-            {
-                this.runUser = string.Empty;
-            }
-            this.created = DateTime.UtcNow;
-            this.queued = DateTime.UtcNow;
-            this.started = DateTime.UtcNow;
-            this.finished = DateTime.UtcNow;
+            Debug.Fail("'RunConfiguration.RunDeploymentRootDirectory' is null or empty");
+            throw new Exception(TrxLoggerResources.Common_MissingRunDeploymentRootInRunConfig);
         }
+
+        return RunConfiguration.RunDeploymentInDirectory;
+    }
+
+    private static string FormatDateTimeForRunName(DateTime timeStamp)
+    {
+        // We use custom format string to make sure that runs are sorted in the same way on all intl machines.
+        // This is both for directory names and for Data Warehouse.
+        return timeStamp.ToString("yyyy-MM-dd HH:mm:ss", DateTimeFormatInfo.InvariantInfo);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfiguration.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfiguration.cs
index 0605acb7f7..9f71db7581 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfiguration.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfiguration.cs
@@ -1,161 +1,157 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+using System.IO;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// The test run configuration.
+/// </summary>
+internal class TestRunConfiguration : IXmlTestStore, IXmlTestStoreCustom
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Xml;
+    internal static readonly string DeploymentInDirectorySuffix = "In";
+
+    private readonly TestRunConfigurationId _id;
+    private readonly TrxFileHelper _trxFileHelper;
+
+    [StoreXmlSimpleField("@name", DefaultValue = "")]
+    private readonly string _name;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    private string _runDeploymentRoot;
 
     /// <summary>
-    /// The test run configuration.
+    /// Initializes a new instance of the <see cref="TestRunConfiguration"/> class.
     /// </summary>
-    internal class TestRunConfiguration : IXmlTestStore, IXmlTestStoreCustom
+    /// <param name="name">
+    /// The name of Run Configuration.
+    /// </param>
+    /// <param name="trxFileHelper">
+    /// InternalFileHelper instance to use in file operations.
+    /// </param>
+    internal TestRunConfiguration(string name, TrxFileHelper trxFileHelper)
     {
-        internal static readonly string DeploymentInDirectorySuffix = "In";
+        EqtAssert.ParameterNotNull(name, nameof(name));
 
-        #region  Fields
-        private TestRunConfigurationId id;
-        private readonly TrxFileHelper trxFileHelper;
-
-        [StoreXmlSimpleField(DefaultValue = "")]
-        private string name;
-
-        private string runDeploymentRoot;
+        _name = name;
+        _runDeploymentRoot = string.Empty;
+        _id = new TestRunConfigurationId();
+        _trxFileHelper = trxFileHelper;
+    }
 
-        #endregion
+    #region IXmlTestStoreCustom Members
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunConfiguration"/> class.
-        /// </summary>
-        /// <param name="name">
-        /// The name of Run Configuration.
-        /// </param>
-        /// <param name="trxFileHelper">
-        /// InternalFileHelper instance to use in file operations.
-        /// </param>
-        internal TestRunConfiguration(string name, TrxFileHelper trxFileHelper)
+    /// <summary>
+    /// Gets the element name.
+    /// </summary>
+    public string ElementName
+    {
+        get
         {
-            EqtAssert.ParameterNotNull(name, nameof(name));
+            return "TestSettings";
+        }
+    }
 
-            this.name = name;
-            this.runDeploymentRoot = string.Empty;
-            this.id = new TestRunConfigurationId();
-            this.trxFileHelper = trxFileHelper;
+    /// <summary>
+    /// Gets the namespace uri.
+    /// </summary>
+    public string NamespaceUri
+    {
+        get
+        {
+            return @"http://microsoft.com/schemas/VisualStudio/TeamTest/2010";
         }
+    }
 
-        #region IXmlTestStoreCustom Members
+    #endregion
 
-        /// <summary>
-        /// Gets the element name.
-        /// </summary>
-        public string ElementName
+    /// <summary>
+    /// Gets directory that receives reverse-deployed files from Controller.
+    /// </summary>
+    public string RunDeploymentInDirectory
+    {
+        get
         {
-            get
-            {
-                return "TestSettings";
-            }
+            TPDebug.Assert(_runDeploymentRoot != null, "runDeploymentRoot is null");
+            return Path.Combine(_runDeploymentRoot, DeploymentInDirectorySuffix);
         }
+    }
 
-        /// <summary>
-        /// Gets the namespace uri.
-        /// </summary>
-        public string NamespaceUri
+    /// <summary>
+    /// Gets or sets RunDeploymentRootDirectory
+    /// INTERNAL PROPERTY. DO NOT USE (except execution).
+    /// Run-level deployment root directory, already inside RunId directory, parent of In and Out directories.
+    /// </summary>
+    internal string RunDeploymentRootDirectory
+    {
+        get
         {
-            get
-            {
-                return @"http://microsoft.com/schemas/VisualStudio/TeamTest/2010";
-            }
+            return _runDeploymentRoot;
         }
 
-        #endregion
-
-        /// <summary>
-        /// Gets directory that receives reverse-deployed files from Controller.
-        /// </summary>
-        public string RunDeploymentInDirectory
+        set
         {
-            get
-            {
-                Debug.Assert(this.runDeploymentRoot != null, "runDeploymentRoot is null");
-                return Path.Combine(this.runDeploymentRoot, DeploymentInDirectorySuffix);
-            }
+            TPDebug.Assert(!string.IsNullOrEmpty(value), "RunDeploymentRootDirectory.value should not be null or empty.");
+            _runDeploymentRoot = value;
         }
+    }
+
+    #region IXmlTestStore Members
 
-        /// <summary>
-        /// Gets or sets RunDeploymentRootDirectory
-        /// INTERNAL PROPERTY. DO NOT USE (except execution).
-        /// Run-level deployment root directory, already inside RunId directory, parent of In and Out directories.
-        /// </summary>
-        internal string RunDeploymentRootDirectory
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+
+        // Save all fields marked as StoreXmlSimpleField.
+        helper.SaveSingleFields(element, this, parameters);
+
+        helper.SaveGuid(element, "@id", _id.Id);
+
+        // When saving and loading a TRX file, we want to use the run deployment root directory based on where the TRX file
+        // is being saved to or loaded from
+        // REVIEW ME: NRE on parameters, is it expected?
+        if (parameters!.TryGetValue(XmlFilePersistence.RootObjectType, out object? filePersistenceRootObjectType) &&
+            (Type)filePersistenceRootObjectType == typeof(TestRun))
         {
-            get
-            {
-                return this.runDeploymentRoot;
-            }
-
-            set
-            {
-                Debug.Assert(!string.IsNullOrEmpty(value), "RunDeploymentRootDirectory.value should not be null or empty.");
-                this.runDeploymentRoot = value;
-            }
+            TPDebug.Assert(
+                parameters.ContainsKey(XmlFilePersistence.DirectoryPath),
+                "TestRun is the type of the root object being saved to a file, but the DirectoryPath was not specified in the XML test store parameters");
+
+            TPDebug.Assert(
+                !string.IsNullOrEmpty(_runDeploymentRoot),
+                "TestRun is the type of the root object being saved to a file, but the run deployment root directory is null or empty");
+
+            // We are saving a TestRun object as the root element in a file (TRX file), so just save the test run directory
+            // name (last directory in the run deployment root), which is the relative path to the run deployment root
+            // directory from the directory where the TRX file exists
+            helper.SaveSimpleField(
+                element,
+                "Deployment/@runDeploymentRoot",
+                TrxFileHelper.MakePathRelative(_runDeploymentRoot, Path.GetDirectoryName(_runDeploymentRoot)!),
+                string.Empty);
         }
-
-        #region IXmlTestStore Members
-
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
+        else
         {
-            XmlPersistence helper = new XmlPersistence();
-
-            // Save all fields marked as StoreXmlSimpleField.
-            helper.SaveSingleFields(element, this, parameters);
-
-            helper.SaveGuid(element, "@id", this.id.Id);
-
-            // When saving and loading a TRX file, we want to use the run deployment root directory based on where the TRX file
-            // is being saved to or loaded from
-            object filePersistenceRootObjectType;
-            if (parameters.TryGetValue(XmlFilePersistence.RootObjectType, out filePersistenceRootObjectType) &&
-                (Type)filePersistenceRootObjectType == typeof(TestRun))
-            {
-                Debug.Assert(
-                        parameters.ContainsKey(XmlFilePersistence.DirectoryPath),
-                    "TestRun is the type of the root object being saved to a file, but the DirectoryPath was not specified in the XML test store parameters");
-
-                Debug.Assert(
-                        !string.IsNullOrEmpty(this.runDeploymentRoot),
-                    "TestRun is the type of the root object being saved to a file, but the run deployment root directory is null or empty");
-
-                // We are saving a TestRun object as the root element in a file (TRX file), so just save the test run directory
-                // name (last directory in the run deployment root), which is the relative path to the run deployment root
-                // directory from the directory where the TRX file exists
-                helper.SaveSimpleField(
-                        element,
-                        "Deployment/@runDeploymentRoot",
-                        trxFileHelper.MakePathRelative(this.runDeploymentRoot, Path.GetDirectoryName(this.runDeploymentRoot)),
-                    string.Empty);
-            }
-            else
-            {
-                // We are not saving a TestRun object as the root element in a file (i.e., we're not saving a TRX file), so just
-                // save the run deployment root directory as is
-                helper.SaveSimpleField(element, "Deployment/@runDeploymentRoot", this.runDeploymentRoot, string.Empty);
-            }
+            // We are not saving a TestRun object as the root element in a file (i.e., we're not saving a TRX file), so just
+            // save the run deployment root directory as is
+            helper.SaveSimpleField(element, "Deployment/@runDeploymentRoot", _runDeploymentRoot, string.Empty);
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfigurationId.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfigurationId.cs
index a79ddad425..4f698c2fed 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfigurationId.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunConfigurationId.cs
@@ -1,31 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// The test run configuration id.
+/// </summary>
+internal sealed class TestRunConfigurationId
+{
     /// <summary>
-    /// The test run configuration id.
+    /// Initializes a new instance of the <see cref="TestRunConfigurationId"/> class.
     /// </summary>
-    internal sealed class TestRunConfigurationId
+    public TestRunConfigurationId()
     {
-        private Guid id;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunConfigurationId"/> class.
-        /// </summary>
-        public TestRunConfigurationId()
-        {
-            this.id = Guid.NewGuid();
-        }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        public Guid Id
-        {
-            get { return this.id; }
-        }
+        Id = Guid.NewGuid();
     }
+
+    /// <summary>
+    /// Gets the id.
+    /// </summary>
+    public Guid Id { get; }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunSummary.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunSummary.cs
index d0e95888b0..878f048254 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunSummary.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRunSummary.cs
@@ -1,192 +1,148 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Xml;
+using System.Collections.Generic;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// XML object for saving test summary - Outcome and counts (passed, failed etc)
+/// </summary>
+internal class TestRunSummary : IXmlTestStore
+{
+    [StoreXmlSimpleField("Counters/@total")]
+    private readonly int _totalTests;
+    [StoreXmlSimpleField("Counters/@executed")]
+    private readonly int _executedTests;
+    [StoreXmlSimpleField("Counters/@passed")]
+    private readonly int _passedTests;
+    [StoreXmlSimpleField("Counters/@failed")]
+    private readonly int _failedTests;
+    [StoreXmlSimpleField("Counters/@error")]
+    private readonly int _errorTests;
+    [StoreXmlSimpleField("Counters/@timeout")]
+    private readonly int _timeoutTests;
+    [StoreXmlSimpleField("Counters/@aborted")]
+    private readonly int _abortedTests;
+    [StoreXmlSimpleField("Counters/@inconclusive")]
+    private readonly int _inconclusiveTests;
+    [StoreXmlSimpleField("Counters/@passedButRunAborted")]
+    private readonly int _passedButRunAborted;
+    [StoreXmlSimpleField("Counters/@notRunnable")]
+    private readonly int _notRunnable;
+    [StoreXmlSimpleField("Counters/@notExecuted")]
+    private readonly int _notExecuted;
+    [StoreXmlSimpleField("Counters/@disconnected")]
+    private readonly int _disconnected;
+    [StoreXmlSimpleField("Counters/@warning")]
+    private readonly int _warning;
+    [StoreXmlSimpleField("Counters/@completed")]
+    private readonly int _completed;
+    [StoreXmlSimpleField("Counters/@inProgress")]
+    private readonly int _inProgress;
+    [StoreXmlSimpleField("Counters/@pending")]
+    private readonly int _pending;
+    [StoreXmlSimpleField("@outcome")]
+    private readonly TestOutcome _outcome = TestOutcome.Pending;
+    [StoreXmlSimpleField("Output/StdOut", "")]
+    private readonly string _stdOut = string.Empty;
+
+    private readonly List<RunInfo> _runLevelErrorsAndWarnings;
+
+    private readonly List<CollectorDataEntry> _collectorDataEntries;
+
+    private readonly IList<string> _resultFiles;
 
     /// <summary>
-    /// XML object for saving test summary - Outcome and counts (passed, failed etc)
+    /// Initializes a new instance of the <see cref="TestRunSummary"/> class.
     /// </summary>
-    internal class TestRunSummary : IXmlTestStore
+    /// <param name="total">
+    /// The total number of tests discover in this run.
+    /// </param>
+    /// <param name="executed">
+    /// The executed tests.
+    /// </param>
+    /// <param name="pass">
+    /// The pass tests.
+    /// </param>
+    /// <param name="fail">
+    /// The fail tests.
+    /// </param>
+    /// <param name="outcome">
+    /// The outcome.
+    /// </param>
+    /// <param name="runMessages">
+    /// The run messages.
+    /// </param>
+    /// <param name="stdOut">
+    /// The standard out.
+    /// </param>
+    /// <param name="resultFiles">
+    /// The result files.
+    /// </param>
+    /// <param name="dataCollectors">
+    /// The data collectors.
+    /// </param>
+    public TestRunSummary(
+        int total,
+        int executed,
+        int pass,
+        int fail,
+        TestOutcome outcome,
+        List<RunInfo> runMessages,
+        string stdOut,
+        IList<string> resultFiles,
+        List<CollectorDataEntry> dataCollectors)
     {
-        #region Fields
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@total")]
-        private int totalTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@executed")]
-        private int executedTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@passed")]
-        private int passedTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@failed")]
-        private int failedTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@error")]
-        private int errorTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@timeout")]
-        private int timeoutTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@aborted")]
-        private int abortedTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@inconclusive")]
-        private int inconclusiveTests;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@passedButRunAborted")]
-        private int passedButRunAborted;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@notRunnable")]
-        private int notRunnable;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@notExecuted")]
-        private int notExecuted;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@disconnected")]
-        private int disconnected;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@warning")]
-        private int warning;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@completed")]
-        private int completed;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@inProgress")]
-        private int inProgress;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Counters/@pending")]
-        private int pending;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField]
-        private TestOutcome outcome = TestOutcome.Pending;
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Reviewed. Suppression is ok here.")]
-        [StoreXmlSimpleField("Output/StdOut", "")]
-        private string stdOut = string.Empty;
-
-        private List<RunInfo> runLevelErrorsAndWarnings;
-
-        private List<CollectorDataEntry> collectorDataEntries;
-
-        private IList<String> resultFiles;
-
-        #endregion
-
-        #region constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunSummary"/> class.
-        /// </summary>
-        /// <param name="total">
-        /// The total number of tests discover in this run.
-        /// </param>
-        /// <param name="executed">
-        /// The executed tests.
-        /// </param>
-        /// <param name="pass">
-        /// The pass tests.
-        /// </param>
-        /// <param name="fail">
-        /// The fail tests.
-        /// </param>
-        /// <param name="outcome">
-        /// The outcome.
-        /// </param>
-        /// <param name="runMessages">
-        /// The run messages.
-        /// </param>
-        /// <param name="stdOut">
-        /// The standard out.
-        /// </param>
-        /// <param name="resultFiles">
-        /// The result files.
-        /// </param>
-        /// <param name="dataCollectors">
-        /// The data collectors.
-        /// </param>
-        public TestRunSummary(
-            int total,
-            int executed,
-            int pass,
-            int fail,
-            TestOutcome outcome,
-            List<RunInfo> runMessages,
-            string stdOut,
-            IList<String> resultFiles,
-            List<CollectorDataEntry> dataCollectors)
-        {
-            this.totalTests = total;
-            this.executedTests = executed;
-            this.passedTests = pass;
-            this.failedTests = fail;
-            int countForNonExistingResults = 0; // if below values are assigned constants 0, compiler gives warning CS0414
-            this.abortedTests = countForNonExistingResults;
-            this.errorTests = countForNonExistingResults;
-            this.timeoutTests = countForNonExistingResults;
-            this.inconclusiveTests = countForNonExistingResults;
-            this.passedButRunAborted = countForNonExistingResults;
-            this.notRunnable = countForNonExistingResults;
-            this.notExecuted = countForNonExistingResults;
-            this.disconnected = countForNonExistingResults;
-            this.warning = countForNonExistingResults;
-            this.completed = countForNonExistingResults;
-            this.inProgress = countForNonExistingResults;
-            this.pending = countForNonExistingResults;
-
-            this.outcome = outcome;
-            this.stdOut = stdOut;
-
-            this.runLevelErrorsAndWarnings = runMessages;
-            this.resultFiles = resultFiles;
-            this.collectorDataEntries = dataCollectors;
-        }
-
-        #endregion
+        _totalTests = total;
+        _executedTests = executed;
+        _passedTests = pass;
+        _failedTests = fail;
+        int countForNonExistingResults = 0; // if below values are assigned constants 0, compiler gives warning CS0414
+        _abortedTests = countForNonExistingResults;
+        _errorTests = countForNonExistingResults;
+        _timeoutTests = countForNonExistingResults;
+        _inconclusiveTests = countForNonExistingResults;
+        _passedButRunAborted = countForNonExistingResults;
+        _notRunnable = countForNonExistingResults;
+        _notExecuted = countForNonExistingResults;
+        _disconnected = countForNonExistingResults;
+        _warning = countForNonExistingResults;
+        _completed = countForNonExistingResults;
+        _inProgress = countForNonExistingResults;
+        _pending = countForNonExistingResults;
+
+        _outcome = outcome;
+        _stdOut = stdOut;
+
+        _runLevelErrorsAndWarnings = runMessages;
+        _resultFiles = resultFiles;
+        _collectorDataEntries = dataCollectors;
+    }
 
-        #region IXmlTestStore Members
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSingleFields(element, this, parameters);
-            helper.SaveIEnumerable(this.runLevelErrorsAndWarnings, element, "RunInfos", ".", "RunInfo", parameters);
-            helper.SaveIEnumerable(this.resultFiles, element, "ResultFiles", "@path", "ResultFile", parameters);
-            helper.SaveIEnumerable(this.collectorDataEntries, element, "CollectorDataEntries", ".", "Collector", parameters);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+        helper.SaveSingleFields(element, this, parameters);
+        helper.SaveIEnumerable(_runLevelErrorsAndWarnings, element, "RunInfos", ".", "RunInfo", parameters);
+        helper.SaveIEnumerable(_resultFiles, element, "ResultFiles", "@path", "ResultFile", parameters);
+        helper.SaveIEnumerable(_collectorDataEntries, element, "CollectorDataEntries", ".", "Collector", parameters);
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestType.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestType.cs
index 6edc4e3e60..a5e00b4a53 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestType.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestType.cs
@@ -1,69 +1,61 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
+using System;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
-    /// <summary>
-    /// Class identifying test type.
-    /// </summary>
-    internal sealed class TestType : IXmlTestStore
-    {
-        [StoreXmlSimpleField(".")]
-        private Guid typeId;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
-        public TestType(Guid id)
-        {
-            if (id == Guid.Empty)
-            {
-                throw new ArgumentNullException(nameof(id));
-            }
-
-            this.typeId = id;
-        }
+/// <summary>
+/// Class identifying test type.
+/// </summary>
+internal sealed class TestType : IXmlTestStore
+{
+    [StoreXmlSimpleField(".")]
+    private readonly Guid _typeId;
 
-        public Guid Id
+    public TestType(Guid id)
+    {
+        if (id == Guid.Empty)
         {
-            get { return this.typeId; }
+            throw new ArgumentNullException(nameof(id));
         }
 
-        public override bool Equals(object obj)
-        {
-            TestType tt = obj as TestType;
-
-            if (tt == null)
-            {
-                return false;
-            }
+        _typeId = id;
+    }
 
-            return this.typeId.Equals(tt.typeId);
-        }
+    public Guid Id
+    {
+        get { return _typeId; }
+    }
 
+    public override bool Equals(object? obj)
+    {
+        return obj is TestType tt && _typeId.Equals(tt._typeId);
+    }
 
-        public override int GetHashCode()
-        {
-            return this.typeId.GetHashCode();
-        }
 
-        #region IXmlTestStore Members
+    public override int GetHashCode()
+    {
+        return _typeId.GetHashCode();
+    }
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence.SaveUsingReflection(element, this, null, parameters);
-        }
+    #region IXmlTestStore Members
 
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence.SaveUsingReflection(element, this, null, parameters);
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs
index aa13af40c4..ae4084b1bc 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs
@@ -1,91 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Unit test element.
+/// </summary>
+internal class UnitTestElement : TestElement, IXmlTestStoreCustom
 {
-    using System;
-    using System.Diagnostics;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+    private string? _codeBase;
 
-    /// <summary>
-    /// Unit test element.
-    /// </summary>
-    internal class UnitTestElement : TestElement, IXmlTestStoreCustom
+    public UnitTestElement(
+        Guid id,
+        string name,
+        string adapter,
+        TestMethod testMethod) : base(id, name, adapter)
     {
-        private string codeBase;
-        private TestMethod testMethod;
+        TPDebug.Assert(!string.IsNullOrEmpty(adapter), "adapter is null");
+        TPDebug.Assert(testMethod != null, "testMethod is null");
+        TPDebug.Assert(testMethod != null && testMethod.ClassName != null, "className is null");
 
-        public UnitTestElement(
-            Guid id,
-            string name,
-            string adapter,
-            TestMethod testMethod) : base(id, name, adapter)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(adapter), "adapter is null");
-            Debug.Assert(testMethod != null, "testMethod is null");
-            Debug.Assert(testMethod != null && testMethod.ClassName != null, "className is null");
+        TestMethod = testMethod;
+    }
 
-            this.testMethod = testMethod;
-        }
+    string IXmlTestStoreCustom.ElementName
+    {
+        get { return Constants.UnitTestElementName; }
+    }
 
-        string IXmlTestStoreCustom.ElementName
-        {
-            get { return Constants.UnitTestElementName; }
-        }
+    string? IXmlTestStoreCustom.NamespaceUri
+    {
+        get { return null; }
+    }
 
-        string IXmlTestStoreCustom.NamespaceUri
-        {
-            get { return null; }
-        }
+    /// <summary>
+    /// Gets the test type.
+    /// </summary>
+    public override TestType TestType
+    {
+        get { return Constants.UnitTestType; }
+    }
 
-        /// <summary>
-        /// Gets the test type.
-        /// </summary>
-        public override TestType TestType
-        {
-            get { return Constants.UnitTestType; }
-        }
+    /// <summary>
+    /// Gets the test method.
+    /// </summary>
+    public TestMethod TestMethod { get; }
 
-        /// <summary>
-        /// Gets the test method.
-        /// </summary>
-        public TestMethod TestMethod
-        {
-            get { return this.testMethod; }
-        }
+    /// <summary>
+    /// Gets or sets the storage.
+    /// </summary>
+    public string? CodeBase
+    {
+        get { return _codeBase; }
 
-        /// <summary>
-        /// Gets or sets the storage.
-        /// </summary>
-        public string CodeBase
+        set
         {
-            get { return this.codeBase; }
-
-            set
-            {
-                EqtAssert.StringNotNullOrEmpty(value, "CodeBase");
-                this.codeBase = value;
-            }
+            EqtAssert.StringNotNullOrEmpty(value, "CodeBase");
+            _codeBase = value;
         }
+    }
 
-        /// <summary>
-        /// Saves the class under the XmlElement..
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
-        {
-            base.Save(element, parameters);
-            XmlPersistence h = new XmlPersistence();
+    /// <summary>
+    /// Saves the class under the XmlElement..
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public override void Save(System.Xml.XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        base.Save(element, parameters);
+        XmlPersistence h = new();
 
-            h.SaveSimpleField(element, "TestMethod/@codeBase", this.codeBase, string.Empty);
-            h.SaveSimpleField(element, "TestMethod/@adapterTypeName", this.adapter, string.Empty);
-            h.SaveObject(this.testMethod, element, "TestMethod", parameters);
-        }
+        h.SaveSimpleField(element, "TestMethod/@codeBase", _codeBase, string.Empty);
+        h.SaveSimpleField(element, "TestMethod/@adapterTypeName", _adapter, string.Empty);
+        h.SaveObject(TestMethod, element, "TestMethod", parameters);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs
index d37352497c..be0b0e138c 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs
@@ -1,27 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using System;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 
-    /// <summary>
-    /// Class for unit test result.
-    /// </summary>
-    internal class UnitTestResult: TestResultAggregation
-    {
-        public UnitTestResult(
-            Guid runId,
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string resultName,
-            string computerName,
-            TestOutcome outcome,
-            TestType testType,
-            TestListCategoryId testCategoryId,
-            TrxFileHelper trxFileHelper
-            ) : base(runId, testId, executionId, parentExecutionId, resultName, computerName, outcome, testType, testCategoryId, trxFileHelper) { }
-    }
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+/// <summary>
+/// Class for unit test result.
+/// </summary>
+internal class UnitTestResult : TestResultAggregation
+{
+    public UnitTestResult(
+        Guid runId,
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string resultName,
+        string computerName,
+        TestOutcome outcome,
+        TestType testType,
+        TestListCategoryId testCategoryId,
+        TrxFileHelper trxFileHelper
+    ) : base(runId, testId, executionId, parentExecutionId, resultName, computerName, outcome, testType, testCategoryId, trxFileHelper) { }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UriDataAttachment.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UriDataAttachment.cs
index 891f48850f..9beb7066c7 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UriDataAttachment.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UriDataAttachment.cs
@@ -1,153 +1,113 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Xml;
+using System;
+using System.IO;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
 
+/// <summary>
+/// Class that provides a basic implementation of IUriAttachment, which can be used by plugin
+/// writers to send any resource accessible by a URI as an attachment.
+/// </summary>
+internal class UriDataAttachment : IDataAttachment, IXmlTestStore
+{
+    private readonly TrxFileHelper _trxFileHelper;
     /// <summary>
-    /// Class that provides a basic implementation of IUriAttachment, which can be used by plugin
-    /// writers to send any resource accessible by a URI as an attachment.
+    /// The name for the attachment
     /// </summary>
-    internal class UriDataAttachment : IDataAttachment, IXmlTestStore
-    {
-        private readonly TrxFileHelper trxFileHelper;
-        #region Private fields
-
-        /// <summary>
-        /// The name for the attachment
-        /// </summary>
-        private string description;
-
-        /// <summary>
-        /// The URI pointing to the resource that forms the data for this attachment
-        /// </summary>
-        private Uri uri;
-
-        #endregion
-
-        /// <summary>
-        /// Initializes the URI data attachment
-        /// </summary>
-        /// <param name="description">Short description for the attachment</param>
-        /// <param name="uri">The URI pointing to the resource</param>
-        /// <param name="trxFileHelper">InternalFileHelper class instance to use in file operations.</param>
-        /// <exception cref="ArgumentException">'name' is null or empty</exception>
-        /// <exception cref="ArgumentNullException">'uri' is null</exception>
-        public UriDataAttachment(string description, Uri uri, TrxFileHelper trxFileHelper)
-        {
-            this.trxFileHelper = trxFileHelper;
-
-            Initialize(description, uri);
-        }
 
-        #region IDataAttachment Members
+    /// <summary>
+    /// Initializes the URI data attachment
+    /// </summary>
+    /// <param name="description">Short description for the attachment</param>
+    /// <param name="uri">The URI pointing to the resource</param>
+    /// <param name="trxFileHelper">InternalFileHelper class instance to use in file operations.</param>
+    /// <exception cref="ArgumentException">'name' is null or empty</exception>
+    /// <exception cref="ArgumentNullException">'uri' is null</exception>
+    public UriDataAttachment(string description, Uri uri, TrxFileHelper trxFileHelper)
+    {
+        _trxFileHelper = trxFileHelper;
+        EqtAssert.ParameterNotNull(description, nameof(description));
+        EqtAssert.ParameterNotNull(uri, nameof(uri));
 
-        /// <summary>
-        /// Gets short description for the attachment.
-        /// </summary>
-        public string Description
-        {
-            get
-            {
-                return this.description;
-            }
-        }
+        Description = description;
+        Uri = uri;
+    }
 
-        /// <summary>
-        /// Gets the URI that can be used to obtain the data of this attachment
-        /// </summary>
-        public Uri Uri
-        {
-            get
-            {
-                return this.uri;
-            }
-        }
+    #region IDataAttachment Members
 
-        #endregion
+    /// <summary>
+    /// Gets short description for the attachment.
+    /// </summary>
+    public string Description { get; private set; }
 
-        #region IXmlTestStore Members
+    /// <summary>
+    /// Gets the URI that can be used to obtain the data of this attachment
+    /// </summary>
+    public Uri Uri { get; private set; }
 
-        /// <summary>
-        /// Saves the class under the XmlElement.
-        /// </summary>
-        /// <param name="element">
-        /// The parent xml.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameter
-        /// </param>
-        public void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            EqtAssert.ParameterNotNull(element, nameof(element));
-
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSimpleField(element, ".", this.description, null);
-
-            // The URI is not a true URI, it must always be a local path represented as a URI. Also, the URI can be absolute or
-            // relative. We use OriginalString because:
-            //   - ToString gets a string in the form "file://..." for an absolute URI and what was passed in for a relative URI
-            //   - AbsoluteUri only works for an absolute URI naturally
-            //   - LocalPath only works for an absolute URI
-            // Due to the above assumption, that it is always an absolute or relative local path to a file, it's simplest and
-            // safest to treat the URI as a string and just use OriginalString.
-            helper.SaveSimpleField(element, "@href", this.uri.OriginalString, null);
-        }
+    #endregion
 
-        #endregion
+    #region IXmlTestStore Members
 
-        #region Internal Methods
+    /// <summary>
+    /// Saves the class under the XmlElement.
+    /// </summary>
+    /// <param name="element">
+    /// The parent xml.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameter
+    /// </param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        EqtAssert.ParameterNotNull(element, nameof(element));
+
+        XmlPersistence helper = new();
+        helper.SaveSimpleField(element, ".", Description, null);
+
+        // The URI is not a true URI, it must always be a local path represented as a URI. Also, the URI can be absolute or
+        // relative. We use OriginalString because:
+        //   - ToString gets a string in the form "file://..." for an absolute URI and what was passed in for a relative URI
+        //   - AbsoluteUri only works for an absolute URI naturally
+        //   - LocalPath only works for an absolute URI
+        // Due to the above assumption, that it is always an absolute or relative local path to a file, it's simplest and
+        // safest to treat the URI as a string and just use OriginalString.
+        helper.SaveSimpleField(element, "@href", Uri.OriginalString, null);
+    }
 
-        /// <summary>
-        /// Clones the instance and makes the URI in the clone absolute using the specified base directory
-        /// </summary>
-        /// <param name="baseDirectory">The base directory to use to make the URI absolute</param>
-        /// <param name="useAbsoluteUri">True to use an absolute URI in the clone, false to use a relative URI</param>
-        /// <returns>A clone of the instance, with the URI made absolute</returns>
-        internal UriDataAttachment Clone(string baseDirectory, bool useAbsoluteUri)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(baseDirectory), "'baseDirectory' is null or empty");
-            Debug.Assert(baseDirectory == baseDirectory.Trim(), "'baseDirectory' contains whitespace at the ends");
-
-            if (useAbsoluteUri != this.uri.IsAbsoluteUri)
-            {
-                Uri uriToUse;
-                if (useAbsoluteUri)
-                {
-                    uriToUse = new Uri(Path.Combine(baseDirectory, this.uri.OriginalString), UriKind.Absolute);
-                }
-                else
-                {
-                    uriToUse = new Uri(trxFileHelper.MakePathRelative(this.uri.OriginalString, baseDirectory), UriKind.Relative);
-                }
-
-                return new UriDataAttachment(this.description, uriToUse, trxFileHelper);
-            }
-
-            // The URI in this instance is already how we want it, and since this class is immutable, no need to clone
-            return this;
-        }
+    #endregion
 
-        #endregion
+    #region Internal Methods
 
-        #region Private Methods
+    /// <summary>
+    /// Clones the instance and makes the URI in the clone absolute using the specified base directory
+    /// </summary>
+    /// <param name="baseDirectory">The base directory to use to make the URI absolute</param>
+    /// <param name="useAbsoluteUri">True to use an absolute URI in the clone, false to use a relative URI</param>
+    /// <returns>A clone of the instance, with the URI made absolute</returns>
+    internal UriDataAttachment Clone(string baseDirectory, bool useAbsoluteUri)
+    {
+        TPDebug.Assert(!baseDirectory.IsNullOrEmpty(), "'baseDirectory' is null or empty");
+        TPDebug.Assert(baseDirectory == baseDirectory.Trim(), "'baseDirectory' contains whitespace at the ends");
 
-        private void Initialize(string desc, Uri uri)
+        if (useAbsoluteUri != Uri.IsAbsoluteUri)
         {
-            EqtAssert.ParameterNotNull(desc, nameof(desc));
-            EqtAssert.ParameterNotNull(uri, nameof(uri));
-
-            this.description = desc;
-            this.uri = uri;
+            Uri uriToUse = useAbsoluteUri
+                ? new Uri(Path.Combine(baseDirectory, Uri.OriginalString), UriKind.Absolute)
+                : new Uri(TrxFileHelper.MakePathRelative(Uri.OriginalString, baseDirectory), UriKind.Relative);
+            return new UriDataAttachment(Description, uriToUse, _trxFileHelper);
         }
 
-        #endregion
+        // The URI in this instance is already how we want it, and since this class is immutable, no need to clone
+        return this;
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs
index 7a087f322b..8de1582d83 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs
@@ -1,243 +1,223 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel
+using System.Globalization;
+using System.Text;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+#region WorkItem
+/// <summary>
+/// Stores an int which represents a workitem
+/// </summary>
+internal sealed class WorkItem : IXmlTestStore
 {
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using System.Xml;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-
-    #region WorkItem
+    [StoreXmlField(Location = ".")]
+    private readonly int _id = 0;
+
+    /// <summary>
+    /// Create a new item with the workitem set
+    /// </summary>
+    /// <param name="workitemId">The workitem.</param>
+    public WorkItem(int workitemId)
+    {
+        _id = workitemId;
+    }
+
     /// <summary>
-    /// Stores an int which represents a workitem
+    /// Gets the id for this WorkItem
     /// </summary>
-    internal sealed class WorkItem : IXmlTestStore
+    public int Id
     {
-        #region Fields
-        [StoreXmlField(Location = ".")]
-        private int id = 0;
-
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Create a new item with the workitem set
-        /// </summary>
-        /// <param name="workitemId">The workitem.</param>
-        public WorkItem(int workitemId)
+        get
         {
-            this.id = workitemId;
+            return _id;
         }
+    }
 
-        #endregion
 
-        #region Properties/Methods
-        /// <summary>
-        /// Gets the id for this WorkItem
-        /// </summary>
-        public int Id
-        {
-            get
-            {
-                return this.id;
-            }
-        }
+    #region Methods - overrides
+    /// <summary>
+    /// Compare the values of the items
+    /// </summary>
+    /// <param name="other">Value being compared to.</param>
+    /// <returns>True if the values are the same and false otherwise.</returns>
+    public override bool Equals(object? other)
+    {
+        return other is WorkItem otherItem && _id == otherItem._id;
+    }
 
-        #endregion
+    /// <summary>
+    /// Convert the workitem to a hashcode
+    /// </summary>
+    /// <returns>Hashcode of the workitem.</returns>
+    public override int GetHashCode()
+    {
+        return _id.GetHashCode();
+    }
 
-        #region Methods - overrides
-        /// <summary>
-        /// Compare the values of the items
-        /// </summary>
-        /// <param name="other">Value being compared to.</param>
-        /// <returns>True if the values are the same and false otherwise.</returns>
-        public override bool Equals(object other)
-        {
-            WorkItem otherItem = other as WorkItem;
-            if (otherItem == null)
-            {
-                return false;
-            }
-            return this.id == otherItem.id;
-        }
+    /// <summary>
+    /// Convert the workitem to a string
+    /// </summary>
+    /// <returns>The workitem.</returns>
+    public override string ToString()
+    {
+        return _id.ToString(CultureInfo.InvariantCulture);
+    }
+    #endregion
 
-        /// <summary>
-        /// Convert the workitem to a hashcode
-        /// </summary>
-        /// <returns>Hashcode of the workitem.</returns>
-        public override int GetHashCode()
-        {
-            return this.id.GetHashCode();
-        }
+    #region IXmlTestStore Members
 
-        /// <summary>
-        /// Convert the workitem to a string
-        /// </summary>
-        /// <returns>The workitem.</returns>
-        public override string ToString()
-        {
-            return this.id.ToString(CultureInfo.InvariantCulture);
-        }
-        #endregion
+    /// <summary>
+    /// Saves the class under the XmlElement.
+    /// </summary>
+    /// <param name="element"> XmlElement element </param>
+    /// <param name="parameters"> XmlTestStoreParameters parameters</param>
+    public void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        new XmlPersistence().SaveSingleFields(element, this, parameters);
+    }
 
-        #region IXmlTestStore Members
+    #endregion
+}
+#endregion
 
-        /// <summary>
-        /// Saves the class under the XmlElement.
-        /// </summary>
-        /// <param name="element"> XmlElement element </param>
-        /// <param name="parameters"> XmlTestStoreParameters parameters</param>
-        public void Save(System.Xml.XmlElement element, XmlTestStoreParameters parameters)
+#region WorkItemCollection
+/// <summary>
+/// A collection of ints represent the workitems
+/// </summary>
+internal sealed class WorkItemCollection : EqtBaseCollection<WorkItem>
+{
+    /// <summary>
+    /// Creates an empty WorkItemCollection.
+    /// </summary>
+    public WorkItemCollection()
+    {
+    }
+
+    /// <summary>
+    /// Create a new WorkItemCollection based on the int array.
+    /// </summary>
+    /// <param name="items">Add these items to the collection.</param>
+    public WorkItemCollection(int[] items)
+    {
+        EqtAssert.ParameterNotNull(items, nameof(items));
+        foreach (int i in items)
         {
-            new XmlPersistence().SaveSingleFields(element, this, parameters);
+            Add(new WorkItem(i));
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Adds the workitem.
+    /// </summary>
+    /// <param name="item">WorkItem to be added.</param>
+    public void Add(int item)
+    {
+        Add(new WorkItem(item));
     }
-    #endregion
 
-    #region WorkItemCollection
     /// <summary>
-    /// A collection of ints represent the workitems
+    /// Adds the workitem.
     /// </summary>
-    internal sealed class WorkItemCollection : EqtBaseCollection<WorkItem>
+    /// <param name="item">WorkItem to be added.</param>
+    public override void Add(WorkItem item)
     {
-        #region Constructors
-        /// <summary>
-        /// Creates an empty WorkItemCollection.
-        /// </summary>
-        public WorkItemCollection()
-        {
-        }
+        EqtAssert.ParameterNotNull(item, nameof(item));
+        base.Add(item);
+    }
 
-        /// <summary>
-        /// Create a new WorkItemCollection based on the int array.
-        /// </summary>
-        /// <param name="items">Add these items to the collection.</param>
-        public WorkItemCollection(int[] items)
+    /// <summary>
+    /// Convert the WorkItemCollection to a string.
+    /// each item is separated by a comma (,)
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        StringBuilder returnString = new();
+        if (Count > 0)
         {
-            EqtAssert.ParameterNotNull(items, nameof(items));
-            foreach (int i in items)
+            returnString.Append(',');
+            foreach (WorkItem item in this)
             {
-                this.Add(new WorkItem(i));
+                returnString.Append(item);
+                returnString.Append(',');
             }
         }
 
-        #endregion
+        return returnString.ToString();
+    }
 
-        #region Methods
-        /// <summary>
-        /// Adds the workitem.
-        /// </summary>
-        /// <param name="item">WorkItem to be added.</param>
-        public void Add(int item)
+    /// <summary>
+    /// Convert the WorkItemCollection to an array of ints.
+    /// </summary>
+    /// <returns>Array of ints containing the workitems.</returns>
+    public int[] ToArray()
+    {
+        int[] result = new int[Count];
+
+        int i = 0;
+        foreach (WorkItem item in this)
         {
-            this.Add(new WorkItem(item));
+            result[i++] = item.Id;
         }
 
-        /// <summary>
-        /// Adds the workitem.
-        /// </summary>
-        /// <param name="item">WorkItem to be added.</param>
-        public override void Add(WorkItem item)
+        return result;
+    }
+
+    /// <summary>
+    /// Compare the collection items
+    /// </summary>
+    /// <param name="obj">other collection</param>
+    /// <returns>true if the collections contain the same items</returns>
+    public override bool Equals(object? obj)
+    {
+        bool result = false;
+
+        if (obj is not WorkItemCollection other)
         {
-            EqtAssert.ParameterNotNull(item, nameof(item));
-            base.Add(item);
+            result = false;
         }
-
-        /// <summary>
-        /// Convert the WorkItemCollection to a string.
-        /// each item is separated by a comma (,)
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
+        else if (ReferenceEquals(this, other))
         {
-            StringBuilder returnString = new StringBuilder();
-            if (this.Count > 0)
-            {
-                returnString.Append(",");
-                foreach (WorkItem item in this)
-                {
-                    returnString.Append(item);
-                    returnString.Append(",");
-                }
-            }
-
-            return returnString.ToString();
+            result = true;
         }
-
-        /// <summary>
-        /// Convert the WorkItemCollection to an array of ints.
-        /// </summary>
-        /// <returns>Array of ints containing the workitems.</returns>
-        public int[] ToArray()
+        else if (Count != other.Count)
         {
-            int[] result = new int[this.Count];
-
-            int i = 0;
-            foreach (WorkItem item in this)
-            {
-                result[i++] = item.Id;
-            }
-
-            return result;
+            result = false;
         }
-
-        /// <summary>
-        /// Compare the collection items
-        /// </summary>
-        /// <param name="obj">other collection</param>
-        /// <returns>true if the collections contain the same items</returns>
-        public override bool Equals(object obj)
+        else
         {
-            WorkItemCollection other = obj as WorkItemCollection;
-            bool result = false;
-
-            if (other == null)
-            {
-                result = false;
-            }
-            else if (object.ReferenceEquals(this, other))
-            {
-                result = true;
-            }
-            else if (this.Count != other.Count)
-            {
-                result = false;
-            }
-            else
+            foreach (WorkItem item in this)
             {
-                foreach (WorkItem item in this)
+                if (!other.Contains(item))
                 {
-                    if (!other.Contains(item))
-                    {
-                        result = false;
-                        break;
-                    }
+                    result = false;
+                    break;
                 }
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Return the hash code of this collection
-        /// </summary>
-        /// <returns>The hashcode.</returns>
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
+        return result;
+    }
 
-        public override void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence xmlPersistence = new XmlPersistence();
-            xmlPersistence.SaveHashtable(this.container, element, ".", ".", null, "Workitem", parameters);
-        }
-        #endregion
+    /// <summary>
+    /// Return the hash code of this collection
+    /// </summary>
+    /// <returns>The hashcode.</returns>
+    public override int GetHashCode()
+    {
+        return base.GetHashCode();
+    }
+
+    public override void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence xmlPersistence = new();
+        xmlPersistence.SaveHashtable(_container, element, ".", ".", null, "Workitem", parameters);
     }
-    #endregion
 }
+#endregion
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Properties/AssemblyInfo.cs
index afc74f61bc..9f8d84b8c8 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Properties/AssemblyInfo.cs
@@ -1,27 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 using Microsoft.VisualStudio.TestPlatform;
 using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Extensions.TrxLogger")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("60d876ee-f278-4bf8-bc8a-15b356895c6f")]
-
-[assembly: TestExtensionTypes(typeof(TrxLogger))]
\ No newline at end of file
+[assembly: TestExtensionTypes(typeof(TrxLogger))]
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..40eedcd6de
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,6 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger
+Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, string! testResultsDirPath) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, System.Collections.Generic.Dictionary<string!, string?>! parameters) -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger.TrxLogger() -> void
+Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger.TrxLogger(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net6.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net7.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf
index d75ddb68d8..f38f43af47 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.cs.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Parametry LogFileName a LogFilePrefix nejde použít společně. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Nepovedlo se najít dostupný název souboru pro {0} pomocí formátu časového razítka {2} v {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf
index 6a4f1e96f0..276c71abda 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.de.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Die Parameter "LogFileName" und "LogFilePrefix" können nicht zusammen verwendet werden. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Unter "{1}" wurde kein verfügbarer Dateiname für "{0}" mit dem Zeitstempelformat "{2}" abgerufen.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf
index 2dbe2da404..d3bc96a1f1 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.es.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Los parámetros LogFileName y LogFilePrefix no se pueden usar juntos. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">No se encuentra ningún nombre de archivo disponible para {0} con el formato de marca de tiempo "{2}" en {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf
index b635efac79..f31b7b1173 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.fr.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Les paramètres LogFileName et LogFilePrefix ne peuvent pas être utilisés ensemble. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Impossible de trouver un nom de fichier disponible pour {0} avec le format d'horodatage '{2}' à l'emplacement {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf
index 329b1e37b3..f946123aca 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.it.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Non è possibile usare insieme i parametri LogFileName e LogFilePrefix. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Non è possibile ottenere o trovare un nome file disponibile per {0} che usa il formato timestamp '{2}' nella directory {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf
index d12762d191..25806919a4 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ja.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">パラメーター LogFileName と LogFilePrefix を同時に使用することはできません。</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">{1} でタイムスタンプ形式 '{2}' を使用して {0} の使用可能なファイル名を取得できません。</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf
index 27fbe7e1ab..904df514ae 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ko.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">LogFileName 및 LogFilePrefix 매개 변수는 함께 사용할 수 없습니다. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">{1}에서 타임스탬프 형식 '{2}'을(를) 사용하는 {0}의 사용 가능한 파일 이름을 찾을 수 없습니다.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf
index 38f0bddf57..42f58f9a8d 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pl.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Parametry LogFileName i LogFilePrefix nie mogą być używane razem. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Nie można znaleźć dostępnej nazwy pliku dla elementu {0} przy użyciu formatu sygnatury czasowej „{2}” o {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf
index 057672884f..89a4009171 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.pt-BR.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Os parâmetros LogFileName e LogFilePrefix não podem ser usados juntos. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Não é possível localizar um nome de arquivo disponível para {0} usando o formato de carimbo de data/hora '{2}' em {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf
index b7ae385562..7c45a5dfd3 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.ru.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">Параметры LogFileName и LogFilePrefix недопустимо использовать вместе. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">Не удается найти доступное имя файла в {0} с использованием формата метки времени "{2}" в {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf
index 98113d5706..91e401890b 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.tr.xlf
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">LogFileName ve LogFilePrefix parametreleri birlikte kullanılamaz. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">{1} konumundaki '{2}' zaman damgası biçimi kullanılarak {0} için kullanılabilir bir dosya adı alınamıyor.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf
index 7268b9dbc7..99adf679e7 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.xlf
@@ -4,140 +4,140 @@
     <body>
       <trans-unit id="TestOutcomeAborted">
         <source>Aborted</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeCompleted">
         <source>Completed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeDisconnected">
         <source>Disconnected</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeError">
         <source>Error</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeFailed">
         <source>Failed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeInconclusive">
         <source>Inconclusive</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeInProgress">
         <source>In Progress</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeNotExecuted">
         <source>Not Executed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeNotRunnable">
         <source>Not Runnable</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomePassed">
         <source>Passed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomePassedButRunAborted">
         <source>Passed (run aborted)</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomePending">
         <source>Pending</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeTimeout">
         <source>Timeout</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeWarning">
         <source>Warning</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotBeLessThanZero">
         <source>The parameter cannot be less than 0.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotBeNullOrEmpty">
         <source>The parameter cannot be null or empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextIterationName">
         <source>Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_MissingRunConfigInRun">
         <source>Test Settings are not specified.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_MissingRunDeploymentRootInRunConfig">
         <source>The active Test Settings do not define the Run Deployment Directory.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_MissingRunInResult">
         <source>The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_NothingLeftAfterReplaciingBadCharsInName">
         <source>The specified file/directory name '{0}' is not valid.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestRunName">
         <source>{0}@{1} {2}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailureToAttach">
         <source>Failed to attach files from: {0}
 Error Details: {1}:{2}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MessageForSkippedTests">
         <source>Test '{0}' was skipped in the test run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TrxLoggerResultsFile">
         <source>Results File: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TS_AllResults">
         <source>All Loaded Results</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TS_UncategorizedResults">
         <source>Results Not in a List</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_DeploymentItem">
         <source>deployment item '{0}'</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_DeploymentItemWithOutputDirectory">
         <source>deployment item '{0}' (output directory '{1}')</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_NullInMessages">
         <source>(null)</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TrxLoggerResultsFileOverwriteWarning">
         <source>WARNING: Overwriting results file: {0}</source>
         <target state="new">WARNING: Overwriting results file: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="new">The parameters LogFileName and LogFilePrefix cannot be given together. </target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="new">Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf
index 14662e4dfa..855609940b 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hans.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" target-language="zh-HANS" original="../TrxResource.resx" build-num="247625400">
+  <file datatype="xml" source-language="en" target-language="zh-Hans" original="../TrxResource.resx" build-num="247625400">
     <header>
       <count-group name="BlackBox wordcount">
         <count count-type="x-wordCount">134</count>
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">参数 LogFileName 和 LogFilePrefix 不能一起使用。</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">无法在 {1} 处为 {0} 找到使用时间戳格式“{2}”的可用文件名。</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf
index fc8c6e6ba8..438ab8538c 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/xlf/TrxResource.zh-Hant.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" target-language="zh-HANT" original="../TrxResource.resx" build-num="247625400">
+  <file datatype="xml" source-language="en" target-language="zh-Hant" original="../TrxResource.resx" build-num="247625400">
     <header>
       <count-group name="BlackBox wordcount">
         <count count-type="x-wordCount">134</count>
@@ -301,12 +301,12 @@ Fehlerdetails: {1}: {2}</target>
       <trans-unit id="PrefixAndNameProvidedError">
         <source>The parameters LogFileName and LogFilePrefix cannot be used together. </source>
         <target state="translated">不能同時使用參數 LogFileName 和 LogFilePrefix。</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotGetNextTimestampFileName">
         <source>Cannot get find an available filename for {0} using timestamp format '{2}' at {1}.</source>
         <target state="translated">無法在 {1} 中使用時間戳記格式 '{2}' 找到 {0} 的可用檔案名。</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs
index 2d726a4a6f..ea3720b118 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs
@@ -1,779 +1,772 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
+using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+/// <summary>
+/// Logger for Generating TRX
+/// </summary>
+[FriendlyName(TrxLoggerConstants.FriendlyName)]
+[ExtensionUri(TrxLoggerConstants.ExtensionUri)]
+public class TrxLogger : ITestLoggerWithParameters
 {
-    using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using NuGet.Frameworks;
-    using ObjectModel.Logging;
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Xml;
-    using ObjectModelConstants = ObjectModel.Constants;
-    using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
-    using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using TrxLoggerResources = Resources.TrxResource;
-
     /// <summary>
-    /// Logger for Generating TRX
+    /// Initializes a new instance of the <see cref="TrxLogger"/> class.
     /// </summary>
-    [FriendlyName(TrxLoggerConstants.FriendlyName)]
-    [ExtensionUri(TrxLoggerConstants.ExtensionUri)]
-    public class TrxLogger : ITestLoggerWithParameters
-    {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrxLogger"/> class.
-        /// </summary>
-        public TrxLogger() : this(new Utilities.Helpers.FileHelper()) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrxLogger"/> class.
-        /// Constructor with Dependency injection. Used for unit testing.
-        /// </summary>
-        /// <param name="fileHelper">The file helper interface.</param>
-        protected TrxLogger(IFileHelper fileHelper) : this(fileHelper, new TrxFileHelper()) { }
-
-        internal TrxLogger(IFileHelper fileHelper, TrxFileHelper trxFileHelper)
-        {
-            this.converter = new Converter(fileHelper, trxFileHelper);
-            this.trxFileHelper = trxFileHelper;
-        }
-
-        #endregion
+    public TrxLogger() : this(new Utilities.Helpers.FileHelper()) { }
 
-        #region Fields
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TrxLogger"/> class.
+    /// Constructor with Dependency injection. Used for unit testing.
+    /// </summary>
+    /// <param name="fileHelper">The file helper interface.</param>
+    protected TrxLogger(IFileHelper fileHelper) : this(fileHelper, new TrxFileHelper()) { }
 
-        /// <summary>
-        /// Cache the TRX file path
-        /// </summary>
-        private string trxFilePath;
+    internal TrxLogger(IFileHelper fileHelper, TrxFileHelper trxFileHelper)
+    {
+        _converter = new Converter(fileHelper, trxFileHelper);
+        _trxFileHelper = trxFileHelper;
+    }
 
-        // The converter class
-        private Converter converter;
+    /// <summary>
+    /// Cache the TRX file path
+    /// </summary>
+    private string? _trxFilePath;
 
-        private TestRun testRun;
-        private ConcurrentDictionary<Guid, ITestResult> results;
-        private ConcurrentDictionary<Guid, ITestElement> testElements;
-        private ConcurrentDictionary<Guid, TestEntry> entries;
+    // The converter class
+    private readonly Converter _converter;
+    private ConcurrentDictionary<Guid, ITestResult>? _results;
+    private ConcurrentDictionary<Guid, ITestElement>? _testElements;
+    private ConcurrentDictionary<Guid, TestEntry>? _entries;
 
-        // Caching results and inner test entries for constant time lookup for inner parents.
-        private ConcurrentDictionary<Guid, ITestResult> innerResults;
-        private ConcurrentDictionary<Guid, TestEntry> innerTestEntries;
+    // Caching results and inner test entries for constant time lookup for inner parents.
+    private ConcurrentDictionary<Guid, ITestResult>? _innerResults;
+    private ConcurrentDictionary<Guid, TestEntry>? _innerTestEntries;
 
-        private readonly TrxFileHelper trxFileHelper;
+    private readonly TrxFileHelper _trxFileHelper;
 
-        /// <summary>
-        /// Specifies the run level "out" messages
-        /// </summary>
-        private StringBuilder runLevelStdOut;
+    /// <summary>
+    /// Specifies the run level "out" messages
+    /// </summary>
+    private StringBuilder? _runLevelStdOut;
 
-        // List of run level errors and warnings generated. These are logged in the Trx in the Results Summary.
-        private List<RunInfo> runLevelErrorsAndWarnings;
+    // List of run level errors and warnings generated. These are logged in the Trx in the Results Summary.
+    private List<RunInfo>? _runLevelErrorsAndWarnings;
+    private readonly string _trxFileExtension = ".trx";
 
-        private TrxLoggerObjectModel.TestOutcome testRunOutcome = TrxLoggerObjectModel.TestOutcome.Passed;
+    /// <summary>
+    /// Parameters dictionary for logger. Ex: {"LogFileName":"TestResults.trx"}.
+    /// </summary>
+    private Dictionary<string, string?>? _parametersDictionary;
 
-        private int totalTests, passTests, failTests;
+    /// <summary>
+    /// Gets the directory under which default trx file and test results attachments should be saved.
+    /// </summary>
+    private string? _testResultsDirPath;
+    private bool _warnOnFileOverwrite;
 
-        private DateTime testRunStartTime;
 
-        private string trxFileExtension = ".trx";
+    #region ITestLogger
 
-        /// <summary>
-        /// Parameters dictionary for logger. Ex: {"LogFileName":"TestResults.trx"}.
-        /// </summary>
-        private Dictionary<string, string> parametersDictionary;
+    [MemberNotNullWhen(true, nameof(_testResultsDirPath), nameof(_results), nameof(_innerResults), nameof(_testElements), nameof(_entries), nameof(_innerTestEntries), nameof(_runLevelErrorsAndWarnings), nameof(_runLevelStdOut))]
+    private bool IsInitialized { get; set; }
 
-        /// <summary>
-        /// Gets the directory under which default trx file and test results attachments should be saved.
-        /// </summary>
-        private string testResultsDirPath;
+    /// <inheritdoc/>
+    [MemberNotNull(nameof(_testResultsDirPath), nameof(_results), nameof(_innerResults), nameof(_testElements), nameof(_entries), nameof(_innerTestEntries), nameof(_runLevelErrorsAndWarnings), nameof(_runLevelStdOut))]
+    public void Initialize(TestLoggerEvents events, string testResultsDirPath)
+    {
+        ValidateArg.NotNull(events, nameof(events));
+        ValidateArg.NotNullOrEmpty(testResultsDirPath, nameof(testResultsDirPath));
+
+        // Register for the events.
+        events.TestRunMessage += TestMessageHandler;
+        events.TestResult += TestResultHandler;
+        events.TestRunComplete += TestRunCompleteHandler;
+
+        _testResultsDirPath = testResultsDirPath;
+        _results = new ConcurrentDictionary<Guid, ITestResult>();
+        _innerResults = new ConcurrentDictionary<Guid, ITestResult>();
+        _testElements = new ConcurrentDictionary<Guid, ITestElement>();
+        _entries = new ConcurrentDictionary<Guid, TestEntry>();
+        _innerTestEntries = new ConcurrentDictionary<Guid, TestEntry>();
+        _runLevelErrorsAndWarnings = new List<RunInfo>();
+        LoggerTestRun = null;
+        TotalTestCount = 0;
+        PassedTestCount = 0;
+        FailedTestCount = 0;
+        _runLevelStdOut = new StringBuilder();
+        TestRunStartTime = DateTime.UtcNow;
+
+        IsInitialized = true;
+    }
 
-        #endregion
+    /// <inheritdoc/>
+    [MemberNotNull(nameof(_parametersDictionary))]
+    public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
+    {
+        ValidateArg.NotNull(parameters, nameof(parameters));
+        if (parameters.Count == 0)
+        {
+            throw new ArgumentException("No default parameters added", nameof(parameters));
+        }
 
-        #region ITestLogger
+        var isLogFilePrefixParameterExists = parameters.TryGetValue(TrxLoggerConstants.LogFilePrefixKey, out _);
+        var isLogFileNameParameterExists = parameters.TryGetValue(TrxLoggerConstants.LogFileNameKey, out _);
+        _warnOnFileOverwrite = parameters.TryGetValue(TrxLoggerConstants.WarnOnFileOverwrite, out string? warnOnOverwriteString)
+            ? bool.TryParse(warnOnOverwriteString, out bool providedValue)
+                ? providedValue
+                // We found the option but could not parse the value.
+                : true
+            // We did not find the option and want to fallback to warning on write, because that was the default before.
+            : true;
 
-        /// <inheritdoc/>
-        public void Initialize(TestLoggerEvents events, string testResultsDirPath)
+        if (isLogFilePrefixParameterExists && isLogFileNameParameterExists)
         {
-            if (events == null)
-            {
-                throw new ArgumentNullException(nameof(events));
-            }
+            var trxParameterErrorMsg = TrxLoggerResources.PrefixAndNameProvidedError;
 
-            if (string.IsNullOrEmpty(testResultsDirPath))
-            {
-                throw new ArgumentNullException(nameof(testResultsDirPath));
-            }
+            EqtTrace.Error(trxParameterErrorMsg);
+            throw new ArgumentException(trxParameterErrorMsg);
+        }
 
-            // Register for the events.
-            events.TestRunMessage += this.TestMessageHandler;
-            events.TestResult += this.TestResultHandler;
-            events.TestRunComplete += this.TestRunCompleteHandler;
+        _parametersDictionary = parameters;
+        Initialize(events, _parametersDictionary[DefaultLoggerParameterNames.TestRunDirectory]!);
+    }
+    #endregion
 
-            this.testResultsDirPath = testResultsDirPath;
-            this.InitializeInternal();
-        }
+    #region ForTesting
 
-        /// <inheritdoc/>
-        public void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)
-        {
-            if (parameters == null)
-            {
-                throw new ArgumentNullException(nameof(parameters));
-            }
+    internal string GetRunLevelInformationalMessage()
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        return _runLevelStdOut.ToString();
+    }
 
-            if (parameters.Count == 0)
-            {
-                throw new ArgumentException("No default parameters added", nameof(parameters));
-            }
+    internal List<RunInfo> GetRunLevelErrorsAndWarnings()
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        return _runLevelErrorsAndWarnings;
+    }
 
-            var isLogFilePrefixParameterExists = parameters.TryGetValue(TrxLoggerConstants.LogFilePrefixKey, out string logFilePrefixValue);
-            var isLogFileNameParameterExists = parameters.TryGetValue(TrxLoggerConstants.LogFileNameKey, out string logFileNameValue);
+    internal DateTime TestRunStartTime { get; private set; }
 
-            if (isLogFilePrefixParameterExists && isLogFileNameParameterExists)
-            {
-                var trxParameterErrorMsg = string.Format(CultureInfo.CurrentCulture,
-                        TrxLoggerResources.PrefixAndNameProvidedError);
+    internal TestRun? LoggerTestRun { get; private set; }
 
-                EqtTrace.Error(trxParameterErrorMsg);
-                throw new ArgumentException(trxParameterErrorMsg);
-            }
+    internal int TotalTestCount { get; private set; }
 
-            this.parametersDictionary = parameters;
-            this.Initialize(events, this.parametersDictionary[DefaultLoggerParameterNames.TestRunDirectory]);
-        }
-        #endregion
+    internal int PassedTestCount { get; private set; }
 
-        #region ForTesting
+    internal int FailedTestCount { get; private set; }
 
-        internal string GetRunLevelInformationalMessage()
+    internal int TestResultCount
+    {
+        get
         {
-            return this.runLevelStdOut.ToString();
+            TPDebug.Assert(IsInitialized, "Logger is not initialized");
+            return _results.Count;
         }
+    }
 
-        internal List<RunInfo> GetRunLevelErrorsAndWarnings()
+    internal int UnitTestElementCount
+    {
+        get
         {
-            return this.runLevelErrorsAndWarnings;
+            TPDebug.Assert(IsInitialized, "Logger is not initialized");
+            return _testElements.Count;
         }
+    }
 
-        internal DateTime TestRunStartTime
+    internal int TestEntryCount
+    {
+        get
         {
-            get { return this.testRunStartTime; }
+            TPDebug.Assert(IsInitialized, "Logger is not initialized");
+            return _entries.Count;
         }
+    }
 
-        internal TestRun LoggerTestRun
-        {
-            get { return this.testRun; }
-        }
+    internal TrxLoggerObjectModel.TestOutcome TestResultOutcome { get; private set; } = TrxLoggerObjectModel.TestOutcome.Passed;
 
-        internal int TotalTestCount
-        {
-            get { return totalTests; }
-        }
+    #endregion
 
-        internal int PassedTestCount
-        {
-            get { return passTests; }
-        }
+    #region Event Handlers
 
-        internal int FailedTestCount
-        {
-            get { return failTests; }
+    /// <summary>
+    /// Called when a test message is received.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// Event args
+    /// </param>
+    internal void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        RunInfo runMessage;
+
+        switch (e.Level)
+        {
+            case TestMessageLevel.Informational:
+                AddRunLevelInformationalMessage(e.Message);
+                break;
+            case TestMessageLevel.Warning:
+                runMessage = new RunInfo(e.Message, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Warning);
+                _runLevelErrorsAndWarnings.Add(runMessage);
+                break;
+            case TestMessageLevel.Error:
+                TestResultOutcome = TrxLoggerObjectModel.TestOutcome.Failed;
+                runMessage = new RunInfo(e.Message, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Error);
+                _runLevelErrorsAndWarnings.Add(runMessage);
+                break;
+            default:
+                Debug.Fail("TrxLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
+                break;
         }
+    }
 
-        internal int TestResultCount
-        {
-            get { return this.results.Count; }
-        }
+    /// <summary>
+    /// Called when a test result is received.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// The eventArgs.
+    /// </param>
+    internal void TestResultHandler(object? sender, TestResultEventArgs e)
+    {
+        // Create test run
+        if (LoggerTestRun == null)
+            CreateTestRun();
 
-        internal int UnitTestElementCount
-        {
-            get { return this.testElements.Count; }
-        }
+        // Convert skipped test to a log entry as that is the behavior of mstest.
+        if (e.Result.Outcome == ObjectModel.TestOutcome.Skipped)
+            HandleSkippedTest(e.Result);
 
-        internal int TestEntryCount
-        {
-            get { return this.entries.Count; }
-        }
+        var testType = Converter.GetTestType(e.Result);
+        var executionId = Converter.GetExecutionId(e.Result);
+
+        // Setting parent properties like parent result, parent test element, parent execution id.
+        var parentExecutionId = _converter.GetParentExecutionId(e.Result);
+        var parentTestResult = GetTestResult(parentExecutionId);
+        var parentTestElement = parentTestResult != null ? GetTestElement(parentTestResult.Id.TestId) : null;
 
-        internal TrxLoggerObjectModel.TestOutcome TestResultOutcome
+        // Switch to flat test results in case any parent related information is missing.
+        if (parentTestResult == null || parentTestElement == null || parentExecutionId == Guid.Empty)
         {
-            get { return this.testRunOutcome; }
+            parentTestResult = null;
+            parentTestElement = null;
+            parentExecutionId = Guid.Empty;
         }
 
-        #endregion
+        // Create trx test element from rocksteady test case
+        var testElement = GetOrCreateTestElement(executionId, parentExecutionId, testType, parentTestElement, e.Result);
 
-        #region Event Handlers
+        // Update test links. Test Links are updated in case of Ordered test.
+        UpdateTestLinks(testElement, parentTestElement);
 
-        /// <summary>
-        /// Called when a test message is received.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// Event args
-        /// </param>
-        internal void TestMessageHandler(object sender, TestRunMessageEventArgs e)
-        {
-            ValidateArg.NotNull(sender, nameof(sender));
-            ValidateArg.NotNull(e, nameof(e));
+        // Convert the rocksteady result to trx test result
+        var testResult = CreateTestResult(executionId, parentExecutionId, testType, testElement, parentTestElement, parentTestResult, e.Result);
 
-            RunInfo runMessage;
+        // Update test entries
+        UpdateTestEntries(executionId, parentExecutionId, testElement, parentTestElement);
 
-            switch (e.Level)
-            {
-                case TestMessageLevel.Informational:
-                    this.AddRunLevelInformationalMessage(e.Message);
-                    break;
-                case TestMessageLevel.Warning:
-                    runMessage = new RunInfo(e.Message, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Warning);
-                    this.runLevelErrorsAndWarnings.Add(runMessage);
-                    break;
-                case TestMessageLevel.Error:
-                    this.testRunOutcome = TrxLoggerObjectModel.TestOutcome.Failed;
-                    runMessage = new RunInfo(e.Message, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Error);
-                    this.runLevelErrorsAndWarnings.Add(runMessage);
-                    break;
-                default:
-                    Debug.Fail("TrxLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
-                    break;
-            }
+        // Set various counts (passed tests, failed tests, total tests)
+        TotalTestCount++;
+        if (testResult.Outcome == TrxLoggerObjectModel.TestOutcome.Failed)
+        {
+            TestResultOutcome = TrxLoggerObjectModel.TestOutcome.Failed;
+            FailedTestCount++;
         }
-
-        /// <summary>
-        /// Called when a test result is received.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// The eventArgs.
-        /// </param>
-        internal void TestResultHandler(object sender, TestResultEventArgs e)
+        else if (testResult.Outcome == TrxLoggerObjectModel.TestOutcome.Passed)
         {
-            // Create test run
-            if (this.testRun == null)
-                CreateTestRun();
+            PassedTestCount++;
+        }
+    }
 
-            // Convert skipped test to a log entry as that is the behavior of mstest.
-            if (e.Result.Outcome == ObjectModel.TestOutcome.Skipped)
-                this.HandleSkippedTest(e.Result);
+    /// <summary>
+    /// Called when a test run is completed.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="e">
+    /// Test run complete events arguments.
+    /// </param>
+    internal void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        // Create test run
+        // If abort occurs there is no call to TestResultHandler which results in testRun not created.
+        // This happens when some test aborts in the first batch of execution.
+        if (LoggerTestRun == null)
+            CreateTestRun();
 
-            var testType = this.converter.GetTestType(e.Result);
-            var executionId = this.converter.GetExecutionId(e.Result);
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
 
-            // Setting parent properties like parent result, parent test element, parent execution id.
-            var parentExecutionId = this.converter.GetParentExecutionId(e.Result);
-            var parentTestResult = GetTestResult(parentExecutionId);
-            var parentTestElement = (parentTestResult != null) ? GetTestElement(parentTestResult.Id.TestId) : null;
+        XmlPersistence helper = new();
+        XmlTestStoreParameters parameters = XmlTestStoreParameters.GetParameters();
+        XmlElement rootElement = helper.CreateRootElement("TestRun");
 
-            // Switch to flat test results in case any parent related information is missing.
-            if (parentTestResult == null || parentTestElement == null || parentExecutionId == Guid.Empty)
-            {
-                parentTestResult = null;
-                parentTestElement = null;
-                parentExecutionId = Guid.Empty;
-            }
+        // Save runId/username/creation time etc.
+        LoggerTestRun.Finished = DateTime.UtcNow;
+        helper.SaveSingleFields(rootElement, LoggerTestRun, parameters);
 
-            // Create trx test element from rocksteady test case
-            var testElement = GetOrCreateTestElement(executionId, parentExecutionId, testType, parentTestElement, e.Result);
+        // Save test settings
+        helper.SaveObject(LoggerTestRun.RunConfiguration, rootElement, "TestSettings", parameters);
 
-            // Update test links. Test Links are updated in case of Ordered test.
-            UpdateTestLinks(testElement, parentTestElement);
+        // Save test results
+        helper.SaveIEnumerable(_results.Values, rootElement, "Results", ".", null, parameters);
 
-            // Convert the rocksteady result to trx test result
-            var testResult = CreateTestResult(executionId, parentExecutionId, testType, testElement, parentTestElement, parentTestResult, e.Result);
+        // Save test definitions
+        helper.SaveIEnumerable(_testElements.Values, rootElement, "TestDefinitions", ".", null, parameters);
 
-            // Update test entries
-            UpdateTestEntries(executionId, parentExecutionId, testElement, parentTestElement);
+        // Save test entries
+        helper.SaveIEnumerable(_entries.Values, rootElement, "TestEntries", ".", "TestEntry", parameters);
 
-            // Set various counts (passed tests, failed tests, total tests)
-            this.totalTests++;
-            if (testResult.Outcome == TrxLoggerObjectModel.TestOutcome.Failed)
-            {
-                this.testRunOutcome = TrxLoggerObjectModel.TestOutcome.Failed;
-                this.failTests++;
-            }
-            else if (testResult.Outcome == TrxLoggerObjectModel.TestOutcome.Passed)
-            {
-                this.passTests++;
-            }
-        }
+        // Save default categories
+        List<TestListCategory> categories =
+        [
+            TestListCategory.UncategorizedResults,
+            TestListCategory.AllResults
+        ];
+        helper.SaveList(categories, rootElement, "TestLists", ".", "TestList", parameters);
 
-        /// <summary>
-        /// Called when a test run is completed.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="e">
-        /// Test run complete events arguments.
-        /// </param>
-        internal void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
+        // Save summary
+        if (TestResultOutcome == TrxLoggerObjectModel.TestOutcome.Passed)
         {
-            // Create test run
-            // If abort occurs there is no call to TestResultHandler which results in testRun not created.
-            // This happens when some test aborts in the first batch of execution.
-            if (this.testRun == null)
-                CreateTestRun();
-
-            XmlPersistence helper = new XmlPersistence();
-            XmlTestStoreParameters parameters = XmlTestStoreParameters.GetParameters();
-            XmlElement rootElement = helper.CreateRootElement("TestRun");
-
-            // Save runId/username/creation time etc.
-            this.testRun.Finished = DateTime.UtcNow;
-            helper.SaveSingleFields(rootElement, this.testRun, parameters);
-
-            // Save test settings
-            helper.SaveObject(this.testRun.RunConfiguration, rootElement, "TestSettings", parameters);
-
-            // Save test results
-            helper.SaveIEnumerable(this.results.Values, rootElement, "Results", ".", null, parameters);
-
-            // Save test definitions
-            helper.SaveIEnumerable(this.testElements.Values, rootElement, "TestDefinitions", ".", null, parameters);
+            TestResultOutcome = TrxLoggerObjectModel.TestOutcome.Completed;
+        }
 
-            // Save test entries
-            helper.SaveIEnumerable(this.entries.Values, rootElement, "TestEntries", ".", "TestEntry", parameters);
+        TestResultOutcome = ChangeTestOutcomeIfNecessary(TestResultOutcome);
 
-            // Save default categories
-            List<TestListCategory> categories = new List<TestListCategory>();
-            categories.Add(TestListCategory.UncategorizedResults);
-            categories.Add(TestListCategory.AllResults);
-            helper.SaveList(categories, rootElement, "TestLists", ".", "TestList", parameters);
+        List<string> errorMessages = [];
+        List<CollectorDataEntry> collectorEntries = _converter.ToCollectionEntries(e.AttachmentSets, LoggerTestRun, _testResultsDirPath);
+        IList<string> resultFiles = _converter.ToResultFiles(e.AttachmentSets, LoggerTestRun, _testResultsDirPath, errorMessages);
 
-            // Save summary
-            if (this.testRunOutcome == TrxLoggerObjectModel.TestOutcome.Passed)
+        if (errorMessages.Count > 0)
+        {
+            // Got some errors while attaching files, report them and set the outcome of testrun to be Error...
+            TestResultOutcome = TrxLoggerObjectModel.TestOutcome.Error;
+            foreach (string msg in errorMessages)
             {
-                this.testRunOutcome = TrxLoggerObjectModel.TestOutcome.Completed;
+                RunInfo runMessage = new(msg, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Error);
+                _runLevelErrorsAndWarnings.Add(runMessage);
             }
+        }
 
-            testRunOutcome = ChangeTestOutcomeIfNecessary(testRunOutcome);
+        TestRunSummary runSummary = new(
+            TotalTestCount,
+            PassedTestCount + FailedTestCount,
+            PassedTestCount,
+            FailedTestCount,
+            TestResultOutcome,
+            _runLevelErrorsAndWarnings,
+            _runLevelStdOut.ToString(),
+            resultFiles,
+            collectorEntries);
 
-            List<string> errorMessages = new List<string>();
-            List<CollectorDataEntry> collectorEntries = this.converter.ToCollectionEntries(e.AttachmentSets, this.testRun, this.testResultsDirPath);
-            IList<string> resultFiles = this.converter.ToResultFiles(e.AttachmentSets, this.testRun, this.testResultsDirPath, errorMessages);
+        helper.SaveObject(runSummary, rootElement, "ResultSummary", parameters);
 
-            if (errorMessages.Count > 0)
-            {
-                // Got some errors while attaching files, report them and set the outcome of testrun to be Error...
-                this.testRunOutcome = TrxLoggerObjectModel.TestOutcome.Error;
-                foreach (string msg in errorMessages)
-                {
-                    RunInfo runMessage = new RunInfo(msg, null, Environment.MachineName, TrxLoggerObjectModel.TestOutcome.Error);
-                    this.runLevelErrorsAndWarnings.Add(runMessage);
-                }
-            }
-
-            TestRunSummary runSummary = new TestRunSummary(
-                this.totalTests,
-                this.passTests + this.failTests,
-                this.passTests,
-                this.failTests,
-                this.testRunOutcome,
-                this.runLevelErrorsAndWarnings,
-                this.runLevelStdOut.ToString(),
-                resultFiles,
-                collectorEntries);
-
-            helper.SaveObject(runSummary, rootElement, "ResultSummary", parameters);
-
-            this.ReserveTrxFilePath();
-            this.PopulateTrxFile(this.trxFilePath, rootElement);
-        }
+        ReserveTrxFilePath();
+        PopulateTrxFile(_trxFilePath!, rootElement);
+    }
 
-        /// <summary>
-        /// populate trx file from the xml element
-        /// </summary>
-        /// <param name="trxFileName">
-        /// Trx full path
-        /// </param>
-        /// <param name="rootElement">
-        /// XmlElement.
-        /// </param>
-        internal virtual void PopulateTrxFile(string trxFileName, XmlElement rootElement)
+    /// <summary>
+    /// populate trx file from the xml element
+    /// </summary>
+    /// <param name="trxFileName">
+    /// Trx full path
+    /// </param>
+    /// <param name="rootElement">
+    /// XmlElement.
+    /// </param>
+    internal virtual void PopulateTrxFile(string trxFileName, XmlElement rootElement)
+    {
+        try
         {
-            try
-            {
-                using (var fs = File.Open(trxFileName, FileMode.Truncate))
-                {
-                    using (XmlWriter writer = XmlWriter.Create(fs, new XmlWriterSettings { NewLineHandling = NewLineHandling.Entitize, Indent = true }))
-                    {
-                        rootElement.OwnerDocument.Save(writer);
-                        writer.Flush();
-                    }
-                }
-
-                string resultsFileMessage = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFile, trxFileName);
-                ConsoleOutput.Instance.Information(false, resultsFileMessage);
-                EqtTrace.Info(resultsFileMessage);
-            }
-            catch (UnauthorizedAccessException fileWriteException)
+            using (var fs = File.Open(trxFileName, FileMode.Truncate))
             {
-                ConsoleOutput.Instance.Error(false, fileWriteException.Message);
+                using XmlWriter writer = XmlWriter.Create(fs, new XmlWriterSettings { NewLineHandling = NewLineHandling.Entitize, Indent = true });
+                rootElement.OwnerDocument.Save(writer);
+                writer.Flush();
             }
-        }
 
-        // Initializes trx logger cache.
-        private void InitializeInternal()
-        {
-            this.results = new ConcurrentDictionary<Guid, ITestResult>();
-            this.innerResults = new ConcurrentDictionary<Guid, ITestResult>();
-            this.testElements = new ConcurrentDictionary<Guid, ITestElement>();
-            this.entries = new ConcurrentDictionary<Guid, TestEntry>();
-            this.innerTestEntries = new ConcurrentDictionary<Guid, TestEntry>();
-            this.runLevelErrorsAndWarnings = new List<RunInfo>();
-            this.testRun = null;
-            this.totalTests = 0;
-            this.passTests = 0;
-            this.failTests = 0;
-            this.runLevelStdOut = new StringBuilder();
-            this.testRunStartTime = DateTime.UtcNow;
+            string resultsFileMessage = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFile, trxFileName);
+            ConsoleOutput.Instance.Information(false, resultsFileMessage);
+            EqtTrace.Info(resultsFileMessage);
         }
-
-        /// <summary>
-        /// Add run level informational message
-        /// </summary>
-        /// <param name="message">
-        /// The message.
-        /// </param>
-        private void AddRunLevelInformationalMessage(string message)
+        catch (UnauthorizedAccessException fileWriteException)
         {
-            this.runLevelStdOut.AppendLine(message);
+            ConsoleOutput.Instance.Error(false, fileWriteException.Message);
         }
+    }
 
-        // Handle the skipped test result
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Reviewed. Suppression is OK here.")]
-        private void HandleSkippedTest(ObjectModel.TestResult rsTestResult)
-        {
-            Debug.Assert(rsTestResult.Outcome == ObjectModel.TestOutcome.Skipped, "Test Result should be skipped but it is " + rsTestResult.Outcome);
+    /// <summary>
+    /// Add run level informational message
+    /// </summary>
+    /// <param name="message">
+    /// The message.
+    /// </param>
+    private void AddRunLevelInformationalMessage(string message)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        _runLevelStdOut.AppendLine(message);
+    }
 
-            TestCase testCase = rsTestResult.TestCase;
-            string testCaseName = !string.IsNullOrEmpty(testCase.DisplayName) ? testCase.DisplayName : testCase.FullyQualifiedName;
-            string message = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.MessageForSkippedTests, testCaseName);
-            this.AddRunLevelInformationalMessage(message);
-        }
+    // Handle the skipped test result
+    private void HandleSkippedTest(ObjectModel.TestResult rsTestResult)
+    {
+        TPDebug.Assert(rsTestResult.Outcome == ObjectModel.TestOutcome.Skipped, "Test Result should be skipped but it is " + rsTestResult.Outcome);
 
-        private void ReserveTrxFilePath()
+        TestCase testCase = rsTestResult.TestCase;
+        string testCaseName = !string.IsNullOrEmpty(testCase.DisplayName) ? testCase.DisplayName : testCase.FullyQualifiedName;
+        string message = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.MessageForSkippedTests, testCaseName);
+        AddRunLevelInformationalMessage(message);
+    }
+
+    private void ReserveTrxFilePath()
+    {
+        for (short retries = 0; retries != short.MaxValue; retries++)
         {
-            for (short retries = 0; retries != short.MaxValue; retries++)
-            {
-                var filePath = AcquireTrxFileNamePath(out var shouldOverwrite);
+            var filePath = AcquireTrxFileNamePath(out var shouldOverwrite);
 
-                if (shouldOverwrite && File.Exists(filePath))
+            if (shouldOverwrite && File.Exists(filePath))
+            {
+                if (_warnOnFileOverwrite)
                 {
                     var overwriteWarningMsg = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFileOverwriteWarning, filePath);
                     ConsoleOutput.Instance.Warning(false, overwriteWarningMsg);
                     EqtTrace.Warning(overwriteWarningMsg);
                 }
-                else
+            }
+            else
+            {
+                try
                 {
-                    try
-                    {
-                        using (var fs = File.Open(filePath, FileMode.CreateNew)) { }
-                    }
-                    catch (IOException)
-                    {
-                        // File already exists, try again!
-                        continue;
-                    }
+                    using var fs = File.Open(filePath, FileMode.CreateNew);
+                }
+                catch (IOException)
+                {
+                    // File already exists, try again!
+                    continue;
                 }
-
-                trxFilePath = filePath;
-                return;
             }
+
+            _trxFilePath = filePath;
+            return;
         }
+    }
 
-        private string AcquireTrxFileNamePath(out bool shouldOverwrite)
-        {
-            shouldOverwrite = false;
-            var isLogFileNameParameterExists = parametersDictionary.TryGetValue(TrxLoggerConstants.LogFileNameKey, out string logFileNameValue) && !string.IsNullOrWhiteSpace(logFileNameValue);
-            var isLogFilePrefixParameterExists = parametersDictionary.TryGetValue(TrxLoggerConstants.LogFilePrefixKey, out string logFilePrefixValue) && !string.IsNullOrWhiteSpace(logFilePrefixValue);
+    private string AcquireTrxFileNamePath(out bool shouldOverwrite)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
 
-            string filePath = null;
+        shouldOverwrite = false;
+        string? filePath = null;
 
+        if (_parametersDictionary is not null)
+        {
+            var isLogFileNameParameterExists = _parametersDictionary.TryGetValue(TrxLoggerConstants.LogFileNameKey, out string? logFileNameValue) && !logFileNameValue.IsNullOrWhiteSpace();
+            var isLogFilePrefixParameterExists = _parametersDictionary.TryGetValue(TrxLoggerConstants.LogFilePrefixKey, out string? logFilePrefixValue) && !logFilePrefixValue.IsNullOrWhiteSpace();
             if (isLogFilePrefixParameterExists)
             {
-                if (parametersDictionary.TryGetValue(DefaultLoggerParameterNames.TargetFramework, out var framework) && framework != null)
+                if (_parametersDictionary.TryGetValue(DefaultLoggerParameterNames.TargetFramework, out var framework) && framework != null)
                 {
-                    framework = NuGetFramework.Parse(framework).GetShortFolderName();
+                    framework = Framework.FromString(framework)?.ShortName ?? framework;
                     logFilePrefixValue = logFilePrefixValue + "_" + framework;
                 }
 
-                filePath = trxFileHelper.GetNextTimestampFileName(this.testResultsDirPath, logFilePrefixValue + this.trxFileExtension, "_yyyyMMddHHmmss");
+                filePath = _trxFileHelper.GetNextTimestampFileName(_testResultsDirPath, logFilePrefixValue + _trxFileExtension, "_yyyyMMddHHmmss");
             }
             else if (isLogFileNameParameterExists)
             {
-                filePath = Path.Combine(this.testResultsDirPath, logFileNameValue);
+                filePath = Path.Combine(_testResultsDirPath, logFileNameValue!);
                 shouldOverwrite = true;
             }
-
-            filePath = filePath ?? this.SetDefaultTrxFilePath();
-
-            var trxFileDirPath = Path.GetDirectoryName(filePath);
-
-            if (!Directory.Exists(trxFileDirPath))
-            {
-                Directory.CreateDirectory(trxFileDirPath);
-            }
-
-            return filePath;
         }
 
-        /// <summary>
-        /// Returns an auto generated Trx file name under test results directory.
-        /// </summary>
-        private string SetDefaultTrxFilePath()
-        {
-            var defaultTrxFileName = this.testRun.RunConfiguration.RunDeploymentRootDirectory + ".trx";
+        filePath ??= SetDefaultTrxFilePath();
 
-            return trxFileHelper.GetNextIterationFileName(this.testResultsDirPath, defaultTrxFileName, false);
-        }
+        var trxFileDirPath = Path.GetDirectoryName(filePath);
 
-        /// <summary>
-        /// Creates test run.
-        /// </summary>
-        private void CreateTestRun()
+        if (!Directory.Exists(trxFileDirPath))
         {
-            // Skip run creation if already exists.
-            if (testRun != null)
-                return;
-
-            Guid runId = Guid.NewGuid();
-            this.testRun = new TestRun(runId);
-
-            // We cannot rely on the StartTime for the first test result
-            // In case of parallel, first test result is the fastest test and not the one which started first.
-            // Setting Started to DateTime.Now in Initialize will make sure we include the startup cost, which was being ignored earlier.
-            // This is in parity with the way we set this.testRun.Finished
-            this.testRun.Started = this.testRunStartTime;
-
-            // Save default test settings
-            string runDeploymentRoot = trxFileHelper.ReplaceInvalidFileNameChars(this.testRun.Name);
-            TestRunConfiguration testrunConfig = new TestRunConfiguration("default", trxFileHelper);
-            testrunConfig.RunDeploymentRootDirectory = runDeploymentRoot;
-            this.testRun.RunConfiguration = testrunConfig;
+            Directory.CreateDirectory(trxFileDirPath!);
         }
 
-        /// <summary>
-        /// Gets test result from stored test results.
-        /// </summary>
-        /// <param name="executionId"></param>
-        /// <returns>Test result</returns>
-        private ITestResult GetTestResult(Guid executionId)
-        {
-            ITestResult testResult = null;
+        return filePath;
+    }
 
-            if (executionId != Guid.Empty)
-            {
-                this.results.TryGetValue(executionId, out testResult);
+    /// <summary>
+    /// Returns an auto generated Trx file name under test results directory.
+    /// </summary>
+    private string SetDefaultTrxFilePath()
+    {
+        TPDebug.Assert(LoggerTestRun != null, "LoggerTestRun is null");
+        TPDebug.Assert(LoggerTestRun.RunConfiguration != null, "LoggerTestRun.RunConfiguration is null");
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        var defaultTrxFileName = LoggerTestRun.RunConfiguration.RunDeploymentRootDirectory + ".trx";
 
-                if (testResult == null)
-                    this.innerResults.TryGetValue(executionId, out testResult);
-            }
+        return TrxFileHelper.GetNextIterationFileName(_testResultsDirPath, defaultTrxFileName, false);
+    }
 
-            return testResult;
-        }
+    /// <summary>
+    /// Creates test run.
+    /// </summary>
+    [MemberNotNull(nameof(LoggerTestRun))]
+    private void CreateTestRun()
+    {
+        // Skip run creation if already exists.
+        if (LoggerTestRun != null)
+            return;
+
+        Guid runId = Guid.NewGuid();
+        LoggerTestRun = new TestRun(runId);
+
+        // We cannot rely on the StartTime for the first test result
+        // In case of parallel, first test result is the fastest test and not the one which started first.
+        // Setting Started to DateTime.Now in Initialize will make sure we include the startup cost, which was being ignored earlier.
+        // This is in parity with the way we set this.testRun.Finished
+        LoggerTestRun.Started = TestRunStartTime;
+
+        // Save default test settings
+        string runDeploymentRoot = TrxFileHelper.ReplaceInvalidFileNameChars(LoggerTestRun.Name);
+        TestRunConfiguration testrunConfig = new("default", _trxFileHelper);
+        testrunConfig.RunDeploymentRootDirectory = runDeploymentRoot;
+        LoggerTestRun.RunConfiguration = testrunConfig;
+    }
+
+    /// <summary>
+    /// Gets test result from stored test results.
+    /// </summary>
+    /// <param name="executionId"></param>
+    /// <returns>Test result</returns>
+    private ITestResult? GetTestResult(Guid executionId)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        ITestResult? testResult = null;
 
-        /// <summary>
-        /// Gets test element from stored test elements.
-        /// </summary>
-        /// <param name="testId"></param>
-        /// <returns></returns>
-        private ITestElement GetTestElement(Guid testId)
+        if (executionId != Guid.Empty)
         {
-            this.testElements.TryGetValue(testId, out var testElement);
-            return testElement;
+            _results.TryGetValue(executionId, out testResult);
+
+            if (testResult == null)
+                _innerResults.TryGetValue(executionId, out testResult);
         }
 
-        /// <summary>
-        /// Gets or creates test element.
-        /// </summary>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="testType"></param>
-        /// <param name="parentTestElement"></param>
-        /// <param name="rockSteadyTestCase"></param>
-        /// <returns>Trx test element</returns>
-        private ITestElement GetOrCreateTestElement(Guid executionId, Guid parentExecutionId, TestType testType, ITestElement parentTestElement, ObjectModel.TestResult rockSteadyTestResult)
-        {
-            ITestElement testElement = parentTestElement;
+        return testResult;
+    }
 
-            // For scenarios like data driven tests, test element is same as parent test element.
-            if (parentTestElement != null && !parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
-            {
-                return testElement;
-            }
+    /// <summary>
+    /// Gets test element from stored test elements.
+    /// </summary>
+    /// <param name="testId"></param>
+    /// <returns></returns>
+    private ITestElement? GetTestElement(Guid testId)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        _testElements.TryGetValue(testId, out var testElement);
+        return testElement;
+    }
 
-            TestCase testCase = rockSteadyTestResult.TestCase;
-            Guid testId = this.converter.GetTestId(testCase);
+    /// <summary>
+    /// Gets or creates test element.
+    /// </summary>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="testType"></param>
+    /// <param name="parentTestElement"></param>
+    /// <param name="rockSteadyTestResult"></param>
+    /// <returns>Trx test element</returns>
+    private ITestElement GetOrCreateTestElement(Guid executionId, Guid parentExecutionId, TestType testType, ITestElement? parentTestElement, ObjectModel.TestResult rockSteadyTestResult)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        ITestElement? testElement = parentTestElement;
 
-            // Scenario for inner test case when parent test element is not present.
-            var testName = testCase.DisplayName;
-            var adapter = testCase.ExecutorUri.ToString();
-            if (adapter.Contains(TrxLoggerConstants.MstestAdapterString) &&
-                parentTestElement == null &&
-                !string.IsNullOrEmpty(rockSteadyTestResult.DisplayName))
-            {
-                // Note: For old mstest adapters hierarchical support was not present. Thus inner result of data driven was identified using test result display name.
-                // Non null test result display name means its a inner result of data driven/ordered test.
-                // Changing GUID to keep supporting old mstest adapters.
-                testId = Guid.NewGuid();
-                testName = rockSteadyTestResult.DisplayName;
-            }
+        // For scenarios like data driven tests, test element is same as parent test element.
+        if (parentTestElement != null && !parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
+        {
+            return testElement!;
+        }
 
-            // Get test element
-            testElement = GetTestElement(testId);
+        TestCase testCase = rockSteadyTestResult.TestCase;
+        Guid testId = Converter.GetTestId(testCase);
 
-            // Create test element
-            if (testElement == null)
-            {
-                testElement = this.converter.ToTestElement(testId, executionId, parentExecutionId, testName, testType, testCase);
-                testElements.TryAdd(testId, testElement);
-            }
+        // Get test element
+        testElement = GetTestElement(testId);
 
-            return testElement;
+        // Create test element
+        if (testElement == null)
+        {
+            testElement = Converter.ToTestElement(testId, executionId, parentExecutionId, testCase.DisplayName, testType, testCase);
+            _testElements.TryAdd(testId, testElement);
         }
 
-        /// <summary>
-        /// Update test links
-        /// </summary>
-        /// <param name="testElement"></param>
-        /// <param name="parentTestElement"></param>
-        private void UpdateTestLinks(ITestElement testElement, ITestElement parentTestElement)
+        return testElement;
+    }
+
+    /// <summary>
+    /// Update test links
+    /// </summary>
+    /// <param name="testElement"></param>
+    /// <param name="parentTestElement"></param>
+    private static void UpdateTestLinks(ITestElement testElement, ITestElement? parentTestElement)
+    {
+        if (parentTestElement == null
+            || !parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
         {
-            if (parentTestElement != null &&
-                parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType) &&
-                !(parentTestElement as OrderedTestElement).TestLinks.ContainsKey(testElement.Id.Id))
-            {
-                (parentTestElement as OrderedTestElement).TestLinks.Add(testElement.Id.Id, new TestLink(testElement.Id.Id, testElement.Name, testElement.Storage));
-            }
+            return;
         }
 
-        /// <summary>
-        /// Creates test result
-        /// </summary>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="testType"></param>
-        /// <param name="testElement"></param>
-        /// <param name="parentTestElement"></param>
-        /// <param name="parentTestResult"></param>
-        /// <param name="rocksteadyTestResult"></param>
-        /// <returns>Trx test result</returns>
-        private ITestResult CreateTestResult(Guid executionId, Guid parentExecutionId, TestType testType,
-            ITestElement testElement, ITestElement parentTestElement, ITestResult parentTestResult, ObjectModel.TestResult rocksteadyTestResult)
+        var orderedTest = (OrderedTestElement)parentTestElement;
+        if (!orderedTest.TestLinks.ContainsKey(testElement.Id.Id))
         {
-            // Create test result
-            TrxLoggerObjectModel.TestOutcome testOutcome = this.converter.ToOutcome(rocksteadyTestResult.Outcome);
-            var testResult = this.converter.ToTestResult(testElement.Id.Id, executionId, parentExecutionId, testElement.Name,
-                this.testResultsDirPath, testType, testElement.CategoryId, testOutcome, this.testRun, rocksteadyTestResult);
-
-            // Normal result scenario
-            if (parentTestResult == null)
-            {
-                this.results.TryAdd(executionId, testResult);
-                return testResult;
-            }
+            orderedTest.TestLinks.Add(testElement.Id.Id, new TestLink(testElement.Id.Id, testElement.Name, testElement.Storage));
+        }
+    }
 
-            // Ordered test inner result scenario
-            if (parentTestElement != null && parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
-            {
-                (parentTestResult as TestResultAggregation).InnerResults.Add(testResult);
-                this.innerResults.TryAdd(executionId, testResult);
-                return testResult;
-            }
+    /// <summary>
+    /// Creates test result
+    /// </summary>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="testType"></param>
+    /// <param name="testElement"></param>
+    /// <param name="parentTestElement"></param>
+    /// <param name="parentTestResult"></param>
+    /// <param name="rocksteadyTestResult"></param>
+    /// <returns>Trx test result</returns>
+    private ITestResult CreateTestResult(Guid executionId, Guid parentExecutionId, TestType testType,
+        ITestElement testElement, ITestElement? parentTestElement, ITestResult? parentTestResult, ObjectModel.TestResult rocksteadyTestResult)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        // Create test result
+        TrxLoggerObjectModel.TestOutcome testOutcome = Converter.ToOutcome(rocksteadyTestResult.Outcome);
+        TPDebug.Assert(LoggerTestRun != null, "LoggerTestRun is null");
+        var testResult = _converter.ToTestResult(testElement.Id.Id, executionId, parentExecutionId, testElement.Name,
+            _testResultsDirPath, testType, testElement.CategoryId, testOutcome, LoggerTestRun, rocksteadyTestResult);
 
-            // Data driven inner result scenario
-            if (parentTestElement != null && parentTestElement.TestType.Equals(TrxLoggerConstants.UnitTestType))
-            {
-                (parentTestResult as TestResultAggregation).InnerResults.Add(testResult);
-                testResult.DataRowInfo = (parentTestResult as TestResultAggregation).InnerResults.Count;
-                testResult.ResultType = TrxLoggerConstants.InnerDataDrivenResultType;
-                parentTestResult.ResultType = TrxLoggerConstants.ParentDataDrivenResultType;
-                return testResult;
-            }
+        // Normal result scenario
+        if (parentTestResult == null)
+        {
+            _results.TryAdd(executionId, testResult);
+            return testResult;
+        }
 
+        // Ordered test inner result scenario
+        if (parentTestElement != null && parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
+        {
+            TPDebug.Assert(parentTestResult is TestResultAggregation, "parentTestResult is not of type TestResultAggregation");
+            ((TestResultAggregation)parentTestResult).InnerResults.Add(testResult);
+            _innerResults.TryAdd(executionId, testResult);
             return testResult;
         }
 
-        /// <summary>
-        /// Update test entries
-        /// </summary>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="testElement"></param>
-        /// <param name="parentTestElement"></param>
-        private void UpdateTestEntries(Guid executionId, Guid parentExecutionId, ITestElement testElement, ITestElement parentTestElement)
+        // Data driven inner result scenario
+        if (parentTestElement != null && parentTestElement.TestType.Equals(TrxLoggerConstants.UnitTestType))
         {
-            TestEntry te = new TestEntry(testElement.Id, TestListCategory.UncategorizedResults.Id);
-            te.ExecutionId = executionId;
+            TPDebug.Assert(parentTestResult is TestResultAggregation, "parentTestResult is not of type TestResultAggregation");
+            var testResultAggregation = (TestResultAggregation)parentTestResult;
+            testResultAggregation.InnerResults.Add(testResult);
+            testResult.DataRowInfo = testResultAggregation.InnerResults.Count;
+            testResult.ResultType = TrxLoggerConstants.InnerDataDrivenResultType;
+            parentTestResult.ResultType = TrxLoggerConstants.ParentDataDrivenResultType;
+            return testResult;
+        }
 
-            if (parentTestElement == null)
-            {
-                this.entries.TryAdd(executionId, te);
-            }
-            else if (parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
-            {
-                te.ParentExecutionId = parentExecutionId;
+        return testResult;
+    }
 
-                var parentTestEntry = GetTestEntry(parentExecutionId);
-                if (parentTestEntry != null)
-                    parentTestEntry.TestEntries.Add(te);
+    /// <summary>
+    /// Update test entries
+    /// </summary>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="testElement"></param>
+    /// <param name="parentTestElement"></param>
+    private void UpdateTestEntries(Guid executionId, Guid parentExecutionId, ITestElement testElement, ITestElement? parentTestElement)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        TestEntry te = new(testElement.Id, TestListCategory.UncategorizedResults.Id);
+        te.ExecutionId = executionId;
 
-                this.innerTestEntries.TryAdd(executionId, te);
-            }
+        if (parentTestElement == null)
+        {
+            _entries.TryAdd(executionId, te);
         }
-
-        /// <summary>
-        /// Gets test entry from stored test entries.
-        /// </summary>
-        /// <param name="executionId"></param>
-        /// <returns>Test entry</returns>
-        private TestEntry GetTestEntry(Guid executionId)
+        else if (parentTestElement.TestType.Equals(TrxLoggerConstants.OrderedTestType))
         {
-            TestEntry testEntry = null;
+            te.ParentExecutionId = parentExecutionId;
 
-            if (executionId != Guid.Empty)
-            {
-                this.entries.TryGetValue(executionId, out testEntry);
+            var parentTestEntry = GetTestEntry(parentExecutionId);
+            if (parentTestEntry != null)
+                parentTestEntry.TestEntries.Add(te);
 
-                if (testEntry == null)
-                    this.innerTestEntries.TryGetValue(executionId, out testEntry);
-            }
-
-            return testEntry;
+            _innerTestEntries.TryAdd(executionId, te);
         }
+    }
 
-        private TrxLoggerObjectModel.TestOutcome ChangeTestOutcomeIfNecessary (TrxLoggerObjectModel.TestOutcome outcome)
+    /// <summary>
+    /// Gets test entry from stored test entries.
+    /// </summary>
+    /// <param name="executionId"></param>
+    /// <returns>Test entry</returns>
+    private TestEntry? GetTestEntry(Guid executionId)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+        TestEntry? testEntry = null;
+
+        if (executionId != Guid.Empty)
         {
-            // If no tests discovered/executed and TreatNoTestsAsError was set to True
-            // We will return ResultSummary as Failed
-            // Note : we only send the value of TreatNoTestsAsError if it is "True"
-            if (totalTests == 0 && parametersDictionary.ContainsKey(ObjectModelConstants.TreatNoTestsAsError))
-            {
-                outcome = TrxLoggerObjectModel.TestOutcome.Failed;
-            }
+            _entries.TryGetValue(executionId, out testEntry);
+
+            if (testEntry == null)
+                _innerTestEntries.TryGetValue(executionId, out testEntry);
+        }
+
+        return testEntry;
+    }
 
-            return outcome;
+    private TrxLoggerObjectModel.TestOutcome ChangeTestOutcomeIfNecessary(TrxLoggerObjectModel.TestOutcome outcome)
+    {
+        TPDebug.Assert(IsInitialized, "Logger is not initialized");
+
+        // If no tests discovered/executed and TreatNoTestsAsError was set to True
+        // We will return ResultSummary as Failed
+        // Note : we only send the value of TreatNoTestsAsError if it is "True"
+        if (TotalTestCount == 0 && _parametersDictionary?.ContainsKey(ObjectModelConstants.TreatNoTestsAsError) == true)
+        {
+            outcome = TrxLoggerObjectModel.TestOutcome.Failed;
         }
 
-        #endregion
+        return outcome;
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Collection.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Collection.cs
index d4e1074fc1..e8c3a8f15d 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Collection.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Collection.cs
@@ -1,207 +1,191 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
-{
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
+using System.Collections;
+using System.Collections.Generic;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using System.Xml;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 
+/// <summary>
+/// Base class for Eqt Collections.
+/// Fast collection, default implementations (Add/Remove/etc) do not allow null items and ignore duplicates.
+/// </summary>
+internal class EqtBaseCollection<T> : ICollection<T>, IXmlTestStore where T : notnull
+{
+    #region private classes
     /// <summary>
-    /// Base class for Eqt Collections.
-    /// Fast collection, default implementations (Add/Remove/etc) do not allow null items and ignore duplicates.
+    /// Wraps non-generic enumerator.
     /// </summary>
-    internal class EqtBaseCollection<T> : ICollection<T>, IXmlTestStore
-    {
-        #region private classes
-        /// <summary>
-        /// Wraps non-generic enumerator.
-        /// </summary>
-        /// <typeparam name="TemplateType"></typeparam>
-        private sealed class EqtBaseCollectionEnumerator<TemplateType> : IEnumerator<TemplateType>
-        {
-            private IEnumerator enumerator;
-
-            internal EqtBaseCollectionEnumerator(IEnumerator e)
-            {
-                Debug.Assert(e != null, "e is null");
-                this.enumerator = e;
-            }
-
-            public TemplateType Current
-            {
-                get { return (TemplateType)this.enumerator.Current; }
-            }
-
-            object IEnumerator.Current
-            {
-                get { return this.enumerator.Current; }
-            }
-
-            public bool MoveNext()
-            {
-                return this.enumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                this.enumerator.Reset();
-            }
-
-            public void Dispose()
-            {
-            }
-        }
-        #endregion
-
-        #region Fields
-        protected Hashtable container;
-
-        private string childElementName;
-        #endregion
+    /// <typeparam name="TemplateType"></typeparam>
+    private sealed class EqtBaseCollectionEnumerator<TemplateType> : IEnumerator<TemplateType>
+    {
+        private readonly IEnumerator _enumerator;
 
-        #region Constructors
-        protected EqtBaseCollection()
+        internal EqtBaseCollectionEnumerator(IEnumerator e)
         {
-            this.container = new Hashtable();
+            TPDebug.Assert(e != null, "e is null");
+            _enumerator = e;
         }
 
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="comparer">For case insensitive comparison use StringComparer.InvariantCultureIgnoreCase.</param>
-        protected EqtBaseCollection(IEqualityComparer comparer)
+        public TemplateType Current
         {
-            this.container = new Hashtable(0, comparer);   // Ad default Hashtable() constructor creates table with 0 items.
+            get { return (TemplateType)_enumerator.Current; }
         }
 
-        /// <summary>
-        /// Copy constructor. Shallow copy.
-        /// </summary>
-        /// <param name="other">The object to copy items from.</param>
-        protected EqtBaseCollection(EqtBaseCollection<T> other)
+        object IEnumerator.Current
         {
-            EqtAssert.ParameterNotNull(other, nameof(other));
-            this.container = new Hashtable(other.container);
+            get { return _enumerator.Current; }
         }
-        #endregion
 
-        #region Methods: ICollection<T>
-        // TODO: Consider putting check for null to derived classes.
-        public virtual void Add(T item)
+        public bool MoveNext()
         {
-            EqtAssert.ParameterNotNull(item, nameof(item));
-
-            if (!this.container.Contains(item))
-            {
-                this.container.Add(item, null);    // Do not want to xml-persist the value.
-            }
+            return _enumerator.MoveNext();
         }
 
-        public virtual bool Contains(T item)
+        public void Reset()
         {
-            if (item == null)
-            {
-                return false;
-            }
-
-            return this.container.Contains(item);
+            _enumerator.Reset();
         }
 
-        /// <summary>
-        /// Removes specified item from collection.
-        /// </summary>
-        /// <param name="item">The item to remove.</param>
-        /// <returns>True if collection contained the item, otherwise false.</returns>
-        public virtual bool Remove(T item)
+        public void Dispose()
         {
-            EqtAssert.ParameterNotNull(item, nameof(item));   // This is to be consistent with Add...
-            if (this.container.Contains(item))
-            {
-                this.container.Remove(item);
-                return true;
-            }
-
-            return false;
         }
+    }
+    #endregion
 
-        public virtual void Clear()
-        {
-            this.container.Clear();
-        }
+    protected Hashtable _container;
 
-        /// <summary>
-        /// Shallow copy. Assumes that items are immutable. Override if your items are mutable.
-        /// </summary>
-        public virtual object Clone()
-        {
-            return new EqtBaseCollection<T>(this);
-        }
+    private string? _childElementName;
+    protected EqtBaseCollection()
+    {
+        _container = new Hashtable();
+    }
 
-        public virtual int Count
-        {
-            get { return this.container.Count; }
-        }
+    /// <summary>
+    /// Constructor.
+    /// </summary>
+    /// <param name="comparer">For case insensitive comparison use StringComparer.InvariantCultureIgnoreCase.</param>
+    protected EqtBaseCollection(IEqualityComparer comparer)
+    {
+        _container = new Hashtable(0, comparer);   // Ad default Hashtable() constructor creates table with 0 items.
+    }
 
-        /// <summary>
-        /// Copies all items to the array.
-        /// As FxCop recommends, this is an explicit implementation and derived classes need to define strongly typed CopyTo.
-        /// </summary>
-        public virtual void CopyTo(T[] array, int index)
-        {
-            EqtAssert.ParameterNotNull(array, nameof(array));
-            this.container.Keys.CopyTo(array, index);
-        }
+    /// <summary>
+    /// Copy constructor. Shallow copy.
+    /// </summary>
+    /// <param name="other">The object to copy items from.</param>
+    protected EqtBaseCollection(EqtBaseCollection<T> other)
+    {
+        EqtAssert.ParameterNotNull(other, nameof(other));
+        _container = new Hashtable(other._container);
+    }
 
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-        #endregion
+    #region Methods: ICollection<T>
+    // TODO: Consider putting check for null to derived classes.
+    public virtual void Add(T item)
+    {
+        EqtAssert.ParameterNotNull(item, nameof(item));
 
-        #region IEnumerable
-        public virtual IEnumerator GetEnumerator()
+        if (!_container.Contains(item))
         {
-            return this.container.Keys.GetEnumerator();
+            _container.Add(item!, null);    // Do not want to xml-persist the value.
         }
+    }
 
-        IEnumerator<T> IEnumerable<T>.GetEnumerator()
+    public virtual bool Contains(T item)
+    {
+        return item != null && _container.Contains(item);
+    }
+
+    /// <summary>
+    /// Removes specified item from collection.
+    /// </summary>
+    /// <param name="item">The item to remove.</param>
+    /// <returns>True if collection contained the item, otherwise false.</returns>
+    public virtual bool Remove(T item)
+    {
+        EqtAssert.ParameterNotNull(item, nameof(item));   // This is to be consistent with Add...
+        if (_container.Contains(item))
         {
-            return new EqtBaseCollectionEnumerator<T>(this.GetEnumerator());
+            _container.Remove(item);
+            return true;
         }
-        #endregion
 
-        #region IXmlTestStore Members
+        return false;
+    }
 
-        /// <summary>
-        /// Default behavior is to create child elements with name same as name of type T.
-        /// Does not respect IXmlTestStoreCustom.
-        /// </summary>
-        public virtual void Save(XmlElement element, XmlTestStoreParameters parameters)
-        {
-            XmlPersistence xmlPersistence = new XmlPersistence();
-            xmlPersistence.SaveHashtable(this.container, element, ".", ".", null, ChildElementName, parameters);
-        }
+    public virtual void Clear()
+    {
+        _container.Clear();
+    }
+
+    /// <summary>
+    /// Shallow copy. Assumes that items are immutable. Override if your items are mutable.
+    /// </summary>
+    public virtual object Clone()
+    {
+        return new EqtBaseCollection<T>(this);
+    }
+
+    public virtual int Count
+    {
+        get { return _container.Count; }
+    }
+
+    /// <summary>
+    /// Copies all items to the array.
+    /// As FxCop recommends, this is an explicit implementation and derived classes need to define strongly typed CopyTo.
+    /// </summary>
+    public virtual void CopyTo(T[] array, int index)
+    {
+        EqtAssert.ParameterNotNull(array, nameof(array));
+        _container.Keys.CopyTo(array, index);
+    }
+
+    public bool IsReadOnly
+    {
+        get { return false; }
+    }
+    #endregion
+
+    #region IEnumerable
+    public virtual IEnumerator GetEnumerator()
+    {
+        return _container.Keys.GetEnumerator();
+    }
+
+    IEnumerator<T> IEnumerable<T>.GetEnumerator()
+    {
+        return new EqtBaseCollectionEnumerator<T>(GetEnumerator());
+    }
+    #endregion
 
-        #endregion
+    #region IXmlTestStore Members
 
-        #region Private
-        private string ChildElementName
+    /// <summary>
+    /// Default behavior is to create child elements with name same as name of type T.
+    /// Does not respect IXmlTestStoreCustom.
+    /// </summary>
+    public virtual void Save(XmlElement element, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence xmlPersistence = new();
+        xmlPersistence.SaveHashtable(_container, element, ".", ".", null, ChildElementName, parameters);
+    }
+
+    #endregion
+
+    private string ChildElementName
+    {
+        get
         {
-            get
-            {
-                if (this.childElementName == null)
-                {
-                    // All we can do here is to delegate to T. Cannot cast T to IXmlTestStoreCustom as T is a type, not an instance.
-                    this.childElementName = typeof(T).Name;
-                }
-                return this.childElementName;
-            }
+            // All we can do here is to delegate to T. Cannot cast T to IXmlTestStoreCustom as T is a type, not an instance.
+            _childElementName ??= typeof(T).Name;
+            return _childElementName;
         }
-        #endregion
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Constants.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Constants.cs
index 36d426fc85..c8cee63592 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Constants.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Constants.cs
@@ -1,111 +1,110 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
+using System;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+
+internal static class Constants
 {
-    using System;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    internal static class Constants
-    {
-        /// <summary>
-        /// Uri used to uniquely identify the TRX logger.
-        /// </summary>
-        public const string ExtensionUri = "logger://Microsoft/TestPlatform/TrxLogger/v1";
-
-        /// <summary>
-        /// Alternate user friendly string to uniquely identify the console logger.
-        /// </summary>
-        public const string FriendlyName = "Trx";
-
-        /// <summary>
-        /// Prefix of the data collector
-        /// </summary>
-        public const string DataCollectorUriPrefix = "dataCollector://";
-
-        /// <summary>
-        /// Log file parameter key
-        /// </summary>
-        public const string LogFileNameKey = "LogFileName";
-
-        /// <summary>
-        /// Log file prefix key
-        /// </summary>
-        public const string LogFilePrefixKey = "LogFilePrefix";
-
-        /// <summary>
-        /// Ordered test element name
-        /// </summary>
-        public const string OrderedTestElementName = "OrderedTest";
-
-        /// <summary>
-        /// Unit test element name
-        /// </summary>
-        public const string UnitTestElementName = "UnitTest";
-
-        /// <summary>
-        /// Property Id storing the ExecutionId.
-        /// </summary>
-        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
-
-        /// <summary>
-        /// Property Id storing the ParentExecutionId.
-        /// </summary>
-        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
-
-        /// <summary>
-        /// Property If storing the TestType.
-        /// </summary>
-        public const string TestTypePropertyIdentifier = "TestType";
-
-        /// <summary>
-        /// Parent data driven result type.
-        /// </summary>
-        public const string ParentDataDrivenResultType = "DataDrivenTest";
-
-        /// <summary>
-        /// Inner data driven result type.
-        /// </summary>
-        public const string InnerDataDrivenResultType = "DataDrivenDataRow";
-
-        /// <summary>
-        /// Property Id storing the TMITestId.
-        /// </summary>
-        public const string TmiTestIdPropertyIdentifier = "MSTestDiscoverer.TmiTestId";
-
-        /// <summary>
-        /// Mstest adapter string
-        /// </summary>
-        public const string MstestAdapterString = "mstestadapter";
-
-        /// <summary>
-        /// Ordered test type guid
-        /// </summary>
-        public static readonly Guid OrderedTestTypeGuid = new Guid("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
-
-        /// <summary>
-        /// Ordered test type
-        /// </summary>
-        public static readonly TestType OrderedTestType = new TestType(OrderedTestTypeGuid);
-
-        /// <summary>
-        /// Unit test type guid
-        /// </summary>
-        public static readonly Guid UnitTestTypeGuid = new Guid("13CDC9D9-DDB5-4fa4-A97D-D965CCFC6D4B");
-
-        /// <summary>
-        /// Unit test type
-        /// </summary>
-        public static readonly TestType UnitTestType = new TestType(UnitTestTypeGuid);
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
-    }
+    /// <summary>
+    /// Uri used to uniquely identify the TRX logger.
+    /// </summary>
+    public const string ExtensionUri = "logger://Microsoft/TestPlatform/TrxLogger/v1";
+
+    /// <summary>
+    /// Alternate user friendly string to uniquely identify the console logger.
+    /// </summary>
+    public const string FriendlyName = "Trx";
+
+    /// <summary>
+    /// Prefix of the data collector
+    /// </summary>
+    public const string DataCollectorUriPrefix = "dataCollector://";
+
+    /// <summary>
+    /// Log file parameter key
+    /// </summary>
+    public const string LogFileNameKey = "LogFileName";
+
+    /// <summary>
+    /// Log file prefix key
+    /// </summary>
+    public const string LogFilePrefixKey = "LogFilePrefix";
+
+    /// <summary>
+    /// Ordered test element name
+    /// </summary>
+    public const string OrderedTestElementName = "OrderedTest";
+
+    /// <summary>
+    /// Unit test element name
+    /// </summary>
+    public const string UnitTestElementName = "UnitTest";
+
+    /// <summary>
+    /// Property Id storing the ExecutionId.
+    /// </summary>
+    public const string ExecutionIdPropertyIdentifier = "ExecutionId";
+
+    /// <summary>
+    /// Property Id storing the ParentExecutionId.
+    /// </summary>
+    public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
+
+    /// <summary>
+    /// Property If storing the TestType.
+    /// </summary>
+    public const string TestTypePropertyIdentifier = "TestType";
+
+    /// <summary>
+    /// Parent data driven result type.
+    /// </summary>
+    public const string ParentDataDrivenResultType = "DataDrivenTest";
+
+    /// <summary>
+    /// Inner data driven result type.
+    /// </summary>
+    public const string InnerDataDrivenResultType = "DataDrivenDataRow";
+
+    /// <summary>
+    /// Property Id storing the TMITestId.
+    /// </summary>
+    public const string TmiTestIdPropertyIdentifier = "MSTestDiscoverer.TmiTestId";
+
+    /// <summary>
+    /// Warn when overwriting the trx file.
+    /// </summary>
+    public static string WarnOnFileOverwrite = "WarnOnFileOverwrite";
+
+    /// <summary>
+    /// Mstest adapter string
+    /// </summary>
+    public const string MstestAdapterString = "mstestadapter";
+
+    /// <summary>
+    /// Ordered test type guid
+    /// </summary>
+    public static readonly Guid OrderedTestTypeGuid = new("ec4800e8-40e5-4ab3-8510-b8bf29b1904d");
+
+    /// <summary>
+    /// Ordered test type
+    /// </summary>
+    public static readonly TestType OrderedTestType = new(OrderedTestTypeGuid);
+
+    /// <summary>
+    /// Unit test type guid
+    /// </summary>
+    public static readonly Guid UnitTestTypeGuid = new("13CDC9D9-DDB5-4fa4-A97D-D965CCFC6D4B");
+
+    /// <summary>
+    /// Unit test type
+    /// </summary>
+    public static readonly TestType UnitTestType = new(UnitTestTypeGuid);
+    public static readonly TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", ExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
+    public static readonly TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", ParentExecutionIdPropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
+    public static readonly TestProperty TestTypeProperty = TestProperty.Register("TestType", TestTypePropertyIdentifier, typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs
index 3876a5b992..5967dbb202 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs
@@ -1,733 +1,694 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+using TrxObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+
+/// <summary>
+/// The converter class.
+/// </summary>
+internal class Converter
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
-    using TrxObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+    private readonly TrxFileHelper _trxFileHelper;
+    private readonly IFileHelper _fileHelper;
 
     /// <summary>
-    /// The converter class.
+    /// Initializes a new instance of the <see cref="Converter"/> class.
     /// </summary>
-    internal class Converter
+    public Converter(IFileHelper fileHelper, TrxFileHelper trxFileHelper)
     {
-        private readonly TrxFileHelper trxFileHelper;
-        private IFileHelper fileHelper;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Converter"/> class.
-        /// </summary>
-        public Converter(IFileHelper fileHelper, TrxFileHelper trxFileHelper)
-        {
-            this.trxFileHelper = trxFileHelper;
-            this.fileHelper = fileHelper;
-        }
-
-        /// <summary>
-        /// Converts platform test case to trx test element.
-        /// </summary>
-        /// <param name="testId"></param>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="name"></param>
-        /// <param name="testType"></param>
-        /// <param name="rockSteadyTestCase"></param>
-        /// <returns>Trx test element</returns>
-        public ITestElement ToTestElement(
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string testName,
-            TestType testType,
-            TestCase rockSteadyTestCase)
-        {
-            var testElement = CreateTestElement(testId, testName, rockSteadyTestCase.FullyQualifiedName, rockSteadyTestCase.ExecutorUri.ToString(), rockSteadyTestCase.Source, testType);
-
-            testElement.Storage = rockSteadyTestCase.Source;
-            testElement.Priority = GetPriority(rockSteadyTestCase);
-            testElement.Owner = GetOwner(rockSteadyTestCase);
-            testElement.ExecutionId = new TestExecId(executionId);
-            testElement.ParentExecutionId = new TestExecId(parentExecutionId);
+        _trxFileHelper = trxFileHelper;
+        _fileHelper = fileHelper;
+    }
 
-            var testCategories = GetCustomPropertyValueFromTestCase(rockSteadyTestCase, "MSTestDiscoverer.TestCategory");
-            foreach (string testCategory in testCategories)
-            {
-                testElement.TestCategories.Add(testCategory);
-            }
+    /// <summary>
+    /// Converts platform test case to trx test element.
+    /// </summary>
+    /// <param name="testId"></param>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="testName"></param>
+    /// <param name="testType"></param>
+    /// <param name="rockSteadyTestCase"></param>
+    /// <returns>Trx test element</returns>
+    public static ITestElement ToTestElement(
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string testName,
+        TestType testType,
+        TestCase rockSteadyTestCase)
+    {
+        var testElement = CreateTestElement(testId, testName, rockSteadyTestCase.FullyQualifiedName, rockSteadyTestCase.ExecutorUri.ToString(), rockSteadyTestCase.Source, testType);
 
-            var workItems = GetCustomPropertyValueFromTestCase(rockSteadyTestCase, "WorkItemIds")
-                .Select(workItem => int.Parse(workItem));
-            foreach (int workItem in workItems)
-            {
-                testElement.WorkItems.Add(workItem);
-            }
+        testElement.Storage = rockSteadyTestCase.Source;
+        testElement.Priority = GetPriority(rockSteadyTestCase);
+        testElement.Owner = GetOwner(rockSteadyTestCase);
+        testElement.ExecutionId = new TestExecId(executionId);
+        testElement.ParentExecutionId = new TestExecId(parentExecutionId);
 
-            return testElement;
+        var testCategories = GetCustomPropertyValueFromTestCase(rockSteadyTestCase, "MSTestDiscoverer.TestCategory");
+        foreach (string testCategory in testCategories)
+        {
+            testElement.TestCategories.Add(testCategory);
         }
 
-        /// <summary>
-        /// Converts the rockSteady result to unit test result
-        /// </summary>
-        /// <param name="testId"></param>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="testName"></param>
-        /// <param name="trxFileDirectory"></param>
-        /// <param name="testType"></param>
-        /// <param name="testCategoryId"></param>
-        /// <param name="testOutcome"></param>
-        /// <param name="testRun"></param>
-        /// <param name="rockSteadyTestResult"></param>
-        /// <returns>Trx test result object</returns>
-        public ITestResult ToTestResult(
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string testName,
-            string trxFileDirectory,
-            TestType testType,
-            TestListCategoryId testCategoryId,
-            TrxObjectModel.TestOutcome testOutcome,
-            TestRun testRun,
-            ObjectModel.TestResult rockSteadyTestResult)
+        var workItems = GetCustomPropertyValueFromTestCase(rockSteadyTestCase, "WorkItemIds")
+            .Select(workItem => int.Parse(workItem, CultureInfo.CurrentCulture));
+        foreach (int workItem in workItems)
         {
-            var resultName = !string.IsNullOrEmpty(rockSteadyTestResult.DisplayName) ? rockSteadyTestResult.DisplayName : testName;
-            var testResult = CreateTestResult(testRun.Id, testId, executionId, parentExecutionId, resultName, testOutcome, testType, testCategoryId);
+            testElement.WorkItems.Add(workItem);
+        }
 
-            if (rockSteadyTestResult.ErrorMessage != null)
-                testResult.ErrorMessage = rockSteadyTestResult.ErrorMessage;
+        return testElement;
+    }
 
-            if (rockSteadyTestResult.ErrorStackTrace != null)
-                testResult.ErrorStackTrace = rockSteadyTestResult.ErrorStackTrace;
+    /// <summary>
+    /// Converts the rockSteady result to unit test result
+    /// </summary>
+    /// <param name="testId"></param>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="testName"></param>
+    /// <param name="trxFileDirectory"></param>
+    /// <param name="testType"></param>
+    /// <param name="testCategoryId"></param>
+    /// <param name="testOutcome"></param>
+    /// <param name="testRun"></param>
+    /// <param name="rockSteadyTestResult"></param>
+    /// <returns>Trx test result object</returns>
+    public ITestResult ToTestResult(
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string testName,
+        string trxFileDirectory,
+        TestType testType,
+        TestListCategoryId testCategoryId,
+        TrxObjectModel.TestOutcome testOutcome,
+        TestRun testRun,
+        VisualStudio.TestPlatform.ObjectModel.TestResult rockSteadyTestResult)
+    {
+        string resultName = !string.IsNullOrEmpty(rockSteadyTestResult.DisplayName) ? rockSteadyTestResult.DisplayName! : testName;
+        var testResult = CreateTestResult(testRun.Id, testId, executionId, parentExecutionId, resultName, testOutcome, testType, testCategoryId);
 
-            if (rockSteadyTestResult.EndTime != default(DateTimeOffset))
-                testResult.EndTime = rockSteadyTestResult.EndTime.UtcDateTime;
+        if (rockSteadyTestResult.ErrorMessage != null)
+            testResult.ErrorMessage = rockSteadyTestResult.ErrorMessage;
 
-            if (rockSteadyTestResult.StartTime != default(DateTimeOffset))
-                testResult.StartTime = rockSteadyTestResult.StartTime.UtcDateTime;
+        if (rockSteadyTestResult.ErrorStackTrace != null)
+            testResult.ErrorStackTrace = rockSteadyTestResult.ErrorStackTrace;
 
-            if (rockSteadyTestResult.Duration != default(TimeSpan))
-                testResult.Duration = rockSteadyTestResult.Duration;
+        if (rockSteadyTestResult.EndTime != default)
+            testResult.EndTime = rockSteadyTestResult.EndTime.UtcDateTime;
 
-            // Clear existing messages and store rocksteady result messages.
-            testResult.TextMessages = null;
-            UpdateResultMessages(testResult, rockSteadyTestResult);
+        if (rockSteadyTestResult.StartTime != default)
+            testResult.StartTime = rockSteadyTestResult.StartTime.UtcDateTime;
 
-            // Save result attachments to target location.
-            UpdateTestResultAttachments(rockSteadyTestResult, testResult, testRun, trxFileDirectory, true);
+        if (rockSteadyTestResult.Duration != default)
+            testResult.Duration = rockSteadyTestResult.Duration;
 
-            return testResult;
-        }
+        // Clear existing messages and store rocksteady result messages.
+        testResult.TextMessages = null;
+        UpdateResultMessages(testResult, rockSteadyTestResult);
 
-        /// <summary>
-        /// converts ObjectModel.TestOutcome type to TrxLogger.TestOutcome type
-        /// </summary>
-        /// <param name="rockSteadyOutcome">
-        /// The rockSteady Outcome.
-        /// </param>
-        /// <returns>
-        /// The <see cref="TestOutcome"/>.
-        /// </returns>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
-        public TrxObjectModel.TestOutcome ToOutcome(ObjectModel.TestOutcome rockSteadyOutcome)
-        {
-            TrxObjectModel.TestOutcome outcome = TrxObjectModel.TestOutcome.Failed;
+        // Save result attachments to target location.
+        UpdateTestResultAttachments(rockSteadyTestResult, testResult, testRun, trxFileDirectory, true);
 
-            switch (rockSteadyOutcome)
-            {
-                case ObjectModel.TestOutcome.Failed:
-                    outcome = TrxObjectModel.TestOutcome.Failed;
-                    break;
-                case ObjectModel.TestOutcome.Passed:
-                    outcome = TrxObjectModel.TestOutcome.Passed;
-                    break;
-                case ObjectModel.TestOutcome.Skipped:
-                case ObjectModel.TestOutcome.None:
-                case ObjectModel.TestOutcome.NotFound:
-                    outcome = TrxObjectModel.TestOutcome.NotExecuted;
-                    break;
-                default:
-                    Debug.Fail("Unexpected Outcome.");
-                    break;
-            }
+        return testResult;
+    }
 
-            return outcome;
-        }
+    /// <summary>
+    /// converts ObjectModel.TestOutcome type to TrxLogger.TestOutcome type
+    /// </summary>
+    /// <param name="rockSteadyOutcome">
+    /// The rockSteady Outcome.
+    /// </param>
+    /// <returns>
+    /// The <see cref="TestOutcome"/>.
+    /// </returns>
+    public static TrxObjectModel.TestOutcome ToOutcome(VisualStudio.TestPlatform.ObjectModel.TestOutcome rockSteadyOutcome)
+    {
+        TrxObjectModel.TestOutcome outcome = TrxObjectModel.TestOutcome.Failed;
 
-        public List<CollectorDataEntry> ToCollectionEntries(IEnumerable<ObjectModel.AttachmentSet> attachmentSets, TestRun testRun, string trxFileDirectory)
+        switch (rockSteadyOutcome)
         {
-            List<CollectorDataEntry> collectorEntries = new List<CollectorDataEntry>();
-            if (attachmentSets == null)
-            {
-                EqtTrace.Info($"Converter.ToCollectionEntries: Received {nameof(attachmentSets)} as null returning empty collection entries.");
-                return collectorEntries;
-            }
-
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"Converter.ToCollectionEntries: Converting attachmentSets {string.Join(",", attachmentSets)} to collection entries.");
-            }
+            case Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Failed:
+                outcome = TrxObjectModel.TestOutcome.Failed;
+                break;
+            case Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Passed:
+                outcome = TrxObjectModel.TestOutcome.Passed;
+                break;
+            case Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Skipped:
+            case Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.None:
+            case Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.NotFound:
+                outcome = TrxObjectModel.TestOutcome.NotExecuted;
+                break;
+            default:
+                Debug.Fail("Unexpected Outcome.");
+                break;
+        }
 
-            foreach (var attachmentSet in attachmentSets)
-            {
-                if (attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
-                {
-                    CollectorDataEntry collectorEntry = ToCollectorEntry(attachmentSet, Guid.Empty, testRun, trxFileDirectory);
-                    collectorEntries.Add(collectorEntry);
-                }
-            }
+        return outcome;
+    }
 
+    public List<CollectorDataEntry> ToCollectionEntries(IEnumerable<AttachmentSet> attachmentSets, TestRun testRun, string trxFileDirectory)
+    {
+        List<CollectorDataEntry> collectorEntries = new();
+        if (attachmentSets == null)
+        {
+            EqtTrace.Info($"Converter.ToCollectionEntries: Received {nameof(attachmentSets)} as null returning empty collection entries.");
             return collectorEntries;
         }
 
-        public IList<String> ToResultFiles(IEnumerable<ObjectModel.AttachmentSet> attachmentSets, TestRun testRun, string trxFileDirectory,
-            List<string> errorMessages)
+        EqtTrace.Info($"Converter.ToCollectionEntries: Converting attachmentSets {string.Join(",", attachmentSets)} to collection entries.");
+
+        foreach (var attachmentSet in attachmentSets)
         {
-            List<String> resultFiles = new List<string>();
-            if (attachmentSets == null)
+            if (attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
             {
-                return resultFiles;
+                CollectorDataEntry collectorEntry = ToCollectorEntry(attachmentSet, Guid.Empty, testRun, trxFileDirectory);
+                collectorEntries.Add(collectorEntry);
             }
+        }
 
-            foreach (var attachmentSet in attachmentSets)
-            {
-                if (!attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        IList<string> testResultFiles = ToResultFiles(attachmentSet, Guid.Empty, testRun, trxFileDirectory);
-                        resultFiles.AddRange(testResultFiles);
-                    }
-                    catch (Exception e)
-                    {
-                        string errorMsg = string.Format(
-                            CultureInfo.CurrentCulture,
-                            TrxLoggerResources.FailureToAttach,
-                            attachmentSet.DisplayName,
-                            e.GetType().ToString(),
-                            e);
-
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error("Converter: ToResultFiles: " + errorMsg);
-                        }
-
-                        errorMessages.Add(errorMsg);
-                    }
-                }
-            }
+        return collectorEntries;
+    }
+
+    public IList<string> ToResultFiles(IEnumerable<AttachmentSet>? attachmentSets, TestRun testRun, string trxFileDirectory,
+        List<string> errorMessages)
+    {
+        List<string> resultFiles = new();
+        if (attachmentSets == null)
+        {
             return resultFiles;
         }
 
-        /// <summary>
-        /// Copies the result messages to unitTestResult
-        /// </summary>
-        /// <param name="unitTestResult">TRX TestResult</param>
-        /// <param name="testResult"> rock steady test result</param>
-        private void UpdateResultMessages(TrxObjectModel.TestResult unitTestResult, ObjectModel.TestResult testResult)
+        foreach (var attachmentSet in attachmentSets)
         {
-            StringBuilder debugTrace = new StringBuilder();
-            StringBuilder stdErr = new StringBuilder();
-            StringBuilder stdOut = new StringBuilder();
-
-            foreach (TestResultMessage message in testResult.Messages)
+            if (!attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
             {
-                if (TestResultMessage.AdditionalInfoCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
-                {
-                    unitTestResult.AddTextMessage(message.Text);
-                }
-                else if (TestResultMessage.DebugTraceCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
-                {
-                    debugTrace.AppendLine(message.Text);
-                }
-                else if (TestResultMessage.StandardErrorCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
-                {
-                    stdErr.AppendLine(message.Text);
-                }
-                else if (TestResultMessage.StandardOutCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
+                try
                 {
-                    stdOut.AppendLine(message.Text);
+                    IList<string> testResultFiles = ToResultFiles(attachmentSet, Guid.Empty, testRun, trxFileDirectory);
+                    resultFiles.AddRange(testResultFiles);
                 }
-                else
+                catch (Exception e)
                 {
-                    EqtTrace.Warning("The message category " + message.Category + " does not match any predefined category.");
+                    string errorMsg = string.Format(
+                        CultureInfo.CurrentCulture,
+                        TrxLoggerResources.FailureToAttach,
+                        attachmentSet.DisplayName,
+                        e.GetType().ToString(),
+                        e);
+
+                    EqtTrace.Error("Converter: ToResultFiles: " + errorMsg);
+                    errorMessages.Add(errorMsg);
                 }
             }
-
-            unitTestResult.DebugTrace = debugTrace.ToString();
-            unitTestResult.StdErr = stdErr.ToString();
-            unitTestResult.StdOut = stdOut.ToString();
         }
+        return resultFiles;
+    }
 
-        /// <summary>
-        ///  Get Custom property values from test cases.
-        /// </summary>
-        /// <param name="testCase">TestCase object extracted from the TestResult</param>
-        /// <param name="categoryID">Property Name from the list of properties in TestCase</param>
-        /// <returns> list of properties</returns>
-        public List<string> GetCustomPropertyValueFromTestCase(TestCase testCase, string categoryID)
-        {
-            var customProperty = testCase.Properties.FirstOrDefault(t => t.Id.Equals(categoryID));
+    /// <summary>
+    /// Copies the result messages to unitTestResult
+    /// </summary>
+    /// <param name="unitTestResult">TRX TestResult</param>
+    /// <param name="testResult"> rock steady test result</param>
+    private static void UpdateResultMessages(TrxObjectModel.TestResult unitTestResult, VisualStudio.TestPlatform.ObjectModel.TestResult testResult)
+    {
+        StringBuilder debugTrace = new();
+        StringBuilder stdErr = new();
+        StringBuilder stdOut = new();
 
-            if (customProperty != null)
+        foreach (TestResultMessage message in testResult.Messages)
+        {
+            if (TestResultMessage.AdditionalInfoCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
             {
-                var cateogryValues = (string[])testCase.GetPropertyValue(customProperty);
-                if (cateogryValues != null)
-                {
-                    return cateogryValues.ToList();
-                }
-                else
-                {
-                    return Enumerable.Empty<string>().ToList();
-                }
+                unitTestResult.AddTextMessage(message.Text!);
+            }
+            else if (TestResultMessage.DebugTraceCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
+            {
+                debugTrace.AppendLine(message.Text);
+            }
+            else if (TestResultMessage.StandardErrorCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
+            {
+                stdErr.AppendLine(message.Text);
+            }
+            else if (TestResultMessage.StandardOutCategory.Equals(message.Category, StringComparison.OrdinalIgnoreCase))
+            {
+                stdOut.AppendLine(message.Text);
+            }
+            else
+            {
+                EqtTrace.Warning("The message category " + message.Category + " does not match any predefined category.");
             }
-
-            return Enumerable.Empty<string>().ToList();
         }
 
-        /// <summary>
-        /// Gets test id.
-        /// Return TMI Test id when available for TestPlatform test case.
-        /// </summary>
-        /// <param name="rockSteadyTestCase"></param>
-        /// <returns>Test id</returns>
-        public Guid GetTestId(TestCase rockSteadyTestCase)
+        unitTestResult.DebugTrace = debugTrace.ToString();
+        unitTestResult.StdErr = stdErr.ToString();
+        unitTestResult.StdOut = stdOut.ToString();
+    }
+
+    /// <summary>
+    ///  Get Custom property values from test cases.
+    /// </summary>
+    /// <param name="testCase">TestCase object extracted from the TestResult</param>
+    /// <param name="categoryId">Property Name from the list of properties in TestCase</param>
+    /// <returns> list of properties</returns>
+    public static List<string> GetCustomPropertyValueFromTestCase(TestCase testCase, string categoryId)
+    {
+        var customProperty = testCase.Properties.FirstOrDefault(t => t.Id.Equals(categoryId));
+
+        if (customProperty != null)
         {
-            Guid testId = Guid.Empty;
+            var cateogryValues = (string[]?)testCase.GetPropertyValue(customProperty);
+            return cateogryValues != null ? cateogryValues.ToList() : [];
+        }
 
-            // Setting test id to tmi test id.
-            TestProperty tmiTestIdProperty = rockSteadyTestCase.Properties.FirstOrDefault(
-                                             property => property.Id.Equals(Constants.TmiTestIdPropertyIdentifier));
+        return [];
+    }
 
-            if (tmiTestIdProperty != null)
-                testId = rockSteadyTestCase.GetPropertyValue(tmiTestIdProperty, Guid.Empty);
+    /// <summary>
+    /// Gets test id.
+    /// Return TMI Test id when available for TestPlatform test case.
+    /// </summary>
+    /// <param name="rockSteadyTestCase"></param>
+    /// <returns>Test id</returns>
+    public static Guid GetTestId(TestCase rockSteadyTestCase)
+    {
+        Guid testId = Guid.Empty;
 
-            // If tmi test id not present, picking from platform test id.
-            if (Guid.Empty.Equals(testId))
-                testId = rockSteadyTestCase.Id;
+        // Setting test id to tmi test id.
+        TestProperty? tmiTestIdProperty = rockSteadyTestCase.Properties.FirstOrDefault(
+            property => property.Id.Equals(Constants.TmiTestIdPropertyIdentifier));
 
-            return testId;
-        }
+        if (tmiTestIdProperty != null)
+            testId = rockSteadyTestCase.GetPropertyValue(tmiTestIdProperty, Guid.Empty);
 
-        /// <summary>
-        /// Gets parent execution id of test result.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns>Parent execution id.</returns>
-        public Guid GetParentExecutionId(ObjectModel.TestResult testResult)
-        {
-            TestProperty parentExecutionIdProperty = testResult.Properties.FirstOrDefault(
-                                                     property => property.Id.Equals(Constants.ParentExecutionIdPropertyIdentifier));
+        // If tmi test id not present, picking from platform test id.
+        if (Guid.Empty.Equals(testId))
+            testId = rockSteadyTestCase.Id;
 
-            return parentExecutionIdProperty == null ?
-                Guid.Empty :
-                testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
-        }
+        return testId;
+    }
 
-        /// <summary>
-        /// Gets execution Id of test result. Creates new id if not present in test result properties.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns>Execution id.</returns>
-        public Guid GetExecutionId(ObjectModel.TestResult testResult)
-        {
-            TestProperty executionIdProperty = testResult.Properties.FirstOrDefault(
-                property => property.Id.Equals(Constants.ExecutionIdPropertyIdentifier));
+    /// <summary>
+    /// Gets parent execution id of test result.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns>Parent execution id.</returns>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public Guid GetParentExecutionId(VisualStudio.TestPlatform.ObjectModel.TestResult testResult)
+    {
+        TestProperty? parentExecutionIdProperty = testResult.Properties.FirstOrDefault(
+            property => property.Id.Equals(Constants.ParentExecutionIdPropertyIdentifier));
 
-            var executionId = Guid.Empty;
-            if (executionIdProperty != null)
-                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+        return parentExecutionIdProperty == null ?
+            Guid.Empty :
+            testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+    }
 
-            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
-        }
+    /// <summary>
+    /// Gets execution Id of test result. Creates new id if not present in test result properties.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns>Execution id.</returns>
+    public static Guid GetExecutionId(VisualStudio.TestPlatform.ObjectModel.TestResult testResult)
+    {
+        TestProperty? executionIdProperty = testResult.Properties.FirstOrDefault(
+            property => property.Id.Equals(Constants.ExecutionIdPropertyIdentifier));
 
-        /// <summary>
-        /// Gets test type of test result.
-        /// Currently trx supports ordered test and unit test. All tests except ordered test are modified as unit test type.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns>Test type</returns>
-        public TestType GetTestType(ObjectModel.TestResult testResult)
-        {
-            var testTypeGuid = Constants.UnitTestTypeGuid;
+        var executionId = Guid.Empty;
+        if (executionIdProperty != null)
+            executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
 
-            // Get test type from property. default to unit test type.
-            TestProperty testTypeProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(Constants.TestTypePropertyIdentifier));
-            testTypeGuid = (testTypeProperty == null) ? testTypeGuid : testResult.GetPropertyValue(testTypeProperty, testTypeGuid);
+        return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+    }
 
-            // Currently trx supports ordered test and unit test. All tests except ordered test are modified as unit test type.
-            return (testTypeGuid.Equals(Constants.OrderedTestTypeGuid)) ?
-                Constants.OrderedTestType :
-                Constants.UnitTestType;
-        }
+    /// <summary>
+    /// Gets test type of test result.
+    /// Currently trx supports ordered test and unit test. All tests except ordered test are modified as unit test type.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns>Test type</returns>
+    public static TestType GetTestType(VisualStudio.TestPlatform.ObjectModel.TestResult testResult)
+    {
+        var testTypeGuid = Constants.UnitTestTypeGuid;
+
+        // Get test type from property. default to unit test type.
+        TestProperty? testTypeProperty = testResult.Properties.FirstOrDefault(property => property.Id.Equals(Constants.TestTypePropertyIdentifier));
+        testTypeGuid = testTypeProperty == null ? testTypeGuid : testResult.GetPropertyValue(testTypeProperty, testTypeGuid);
 
-        /// <summary>
-        /// Updates test result attachments.
-        /// </summary>
-        /// <param name="rockSteadyTestResult"></param>
-        /// <param name="testResult"></param>
-        /// <param name="testRun"></param>
-        /// <param name="trxFileDirectory"></param>
-        /// <param name="addAttachments"></param>
-        private void UpdateTestResultAttachments(ObjectModel.TestResult rockSteadyTestResult, TrxObjectModel.TestResult testResult, TestRun testRun, string trxFileDirectory, bool addAttachments)
+        // Currently trx supports ordered test and unit test. All tests except ordered test are modified as unit test type.
+        return (testTypeGuid.Equals(Constants.OrderedTestTypeGuid)) ?
+            Constants.OrderedTestType :
+            Constants.UnitTestType;
+    }
+
+    /// <summary>
+    /// Updates test result attachments.
+    /// </summary>
+    /// <param name="rockSteadyTestResult"></param>
+    /// <param name="testResult"></param>
+    /// <param name="testRun"></param>
+    /// <param name="trxFileDirectory"></param>
+    /// <param name="addAttachments"></param>
+    private void UpdateTestResultAttachments(VisualStudio.TestPlatform.ObjectModel.TestResult rockSteadyTestResult, TrxObjectModel.TestResult testResult, TestRun testRun, string trxFileDirectory, bool addAttachments)
+    {
+        if (rockSteadyTestResult.Attachments == null || rockSteadyTestResult.Attachments.Count == 0)
         {
-            if (rockSteadyTestResult.Attachments == null || rockSteadyTestResult.Attachments.Count == 0)
-            {
-                return;
-            }
+            return;
+        }
 
-            // the testResult needs to have the testRun property set. Otherwise Data Collector entries can't be added.
-            testResult.SetTestRun(testRun);
+        // the testResult needs to have the testRun property set. Otherwise Data Collector entries can't be added.
+        testResult.SetTestRun(testRun);
 
-            // result files
-            List<string> resultFiles = new List<string>();
+        // result files
+        List<string> resultFiles = new();
 
-            // data collection files
-            List<CollectorDataEntry> collectorEntries = new List<CollectorDataEntry>();
+        // data collection files
+        List<CollectorDataEntry> collectorEntries = new();
 
-            foreach (AttachmentSet attachmentSet in rockSteadyTestResult.Attachments)
+        foreach (AttachmentSet attachmentSet in rockSteadyTestResult.Attachments)
+        {
+            try
             {
-                try
+                // If the attachment is from data collector
+                if (attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
                 {
-                    // If the attachment is from data collector
-                    if (attachmentSet.Uri.AbsoluteUri.StartsWith(Constants.DataCollectorUriPrefix, StringComparison.OrdinalIgnoreCase))
-                    {
-                        CollectorDataEntry collectorEntry = ToCollectorEntry(attachmentSet, testResult.Id.ExecutionId, testRun, trxFileDirectory);
-                        collectorEntries.Add(collectorEntry);
-                    }
-                    else
-                    {
-                        IList<string> testResultFiles = ToResultFiles(attachmentSet, testResult.Id.ExecutionId, testRun, trxFileDirectory);
-                        resultFiles.AddRange(testResultFiles);
-                    }
+                    CollectorDataEntry collectorEntry = ToCollectorEntry(attachmentSet, testResult.Id.ExecutionId, testRun, trxFileDirectory);
+                    collectorEntries.Add(collectorEntry);
                 }
-                catch (Exception e)
+                else
                 {
-                    string errorMsg = string.Format(
-                        CultureInfo.CurrentCulture,
-                        TrxLoggerResources.FailureToAttach,
-                        attachmentSet.DisplayName,
-                        e.GetType().ToString(),
-                        e);
-
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("Converter: UpdateTestResultAttachments: " + errorMsg);
-                    }
-
-                    StringBuilder stdErr = new StringBuilder(testResult.StdErr);
-                    stdErr.AppendLine(errorMsg);
-
-                    testResult.StdErr = stdErr.ToString();
-                    testResult.Outcome = TrxObjectModel.TestOutcome.Error;
+                    IList<string> testResultFiles = ToResultFiles(attachmentSet, testResult.Id.ExecutionId, testRun, trxFileDirectory);
+                    resultFiles.AddRange(testResultFiles);
                 }
             }
-
-            if (addAttachments)
+            catch (Exception e)
             {
-                if (resultFiles.Count > 0)
-                {
-                    testResult.AddResultFiles(resultFiles);
-                }
+                string errorMsg = string.Format(
+                    CultureInfo.CurrentCulture,
+                    TrxLoggerResources.FailureToAttach,
+                    attachmentSet.DisplayName,
+                    e.GetType().ToString(),
+                    e);
 
-                if (collectorEntries.Count > 0)
-                {
-                    testResult.AddCollectorDataEntries(collectorEntries);
-                }
+                EqtTrace.Error("Converter: UpdateTestResultAttachments: " + errorMsg);
+
+                StringBuilder stdErr = new(testResult.StdErr);
+                stdErr.AppendLine(errorMsg);
+
+                testResult.StdErr = stdErr.ToString();
+                testResult.Outcome = TrxObjectModel.TestOutcome.Error;
             }
         }
 
-        // Returns a list of collector entry
-        private CollectorDataEntry ToCollectorEntry(AttachmentSet attachmentSet, Guid testResultExecutionId, TestRun testRun, string trxFileDirectory)
+        if (addAttachments)
         {
-            string runDirectoryName = Path.Combine(trxFileDirectory, testRun.RunConfiguration.RunDeploymentRootDirectory);
-            string inDirectory = Path.Combine(runDirectoryName, "In");
-
-            string targetDirectory = inDirectory;
-            if (!testResultExecutionId.Equals(Guid.Empty))
+            if (resultFiles.Count > 0)
             {
-                targetDirectory = Path.Combine(inDirectory, testResultExecutionId.ToString());
+                testResult.AddResultFiles(resultFiles);
             }
 
-            targetDirectory = Path.Combine(targetDirectory, Environment.MachineName);
-
-            if (!Directory.Exists(targetDirectory))
+            if (collectorEntries.Count > 0)
             {
-                Directory.CreateDirectory(targetDirectory);
+                testResult.AddCollectorDataEntries(collectorEntries);
             }
+        }
+    }
 
-            List<IDataAttachment> uriDataAttachments = new List<IDataAttachment>();
-            foreach (ObjectModel.UriDataAttachment uriDataAttachment in attachmentSet.Attachments)
-            {
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TrxLogger: ToCollectorEntry: Got attachment " + uriDataAttachment.Uri + " with description " + uriDataAttachment.Description);
-                }
-
-                string sourceFile = uriDataAttachment.Uri.LocalPath;
-
-                var rooted = (Path.GetFullPath(sourceFile) == sourceFile);
-                Debug.Assert(Path.IsPathRooted(sourceFile), "Source file is not rooted");
-
-                // copy the source file to the target location
-                string targetFileName = trxFileHelper.GetNextIterationFileName(targetDirectory, Path.GetFileName(sourceFile), false);
-
-                try
-                {
-                    CopyFile(sourceFile, targetFileName);
+    // Returns a list of collector entry
+    private CollectorDataEntry ToCollectorEntry(AttachmentSet attachmentSet, Guid testResultExecutionId, TestRun testRun, string trxFileDirectory)
+    {
+        string runDirectoryName = Path.Combine(trxFileDirectory, testRun.RunConfiguration!.RunDeploymentRootDirectory);
+        string inDirectory = Path.Combine(runDirectoryName, "In");
 
-                    // Add the target file name to the collector files list.
-                    // (Trx viewer automatically adds In\ to the collected file.
-                    string fileName = Path.Combine(Environment.MachineName, Path.GetFileName(targetFileName));
-                    Uri sourceFileUri = new Uri(fileName, UriKind.Relative);
-                    TrxObjectModel.UriDataAttachment dataAttachment = new TrxObjectModel.UriDataAttachment(uriDataAttachment.Description, sourceFileUri, trxFileHelper);
+        string targetDirectory = inDirectory;
+        if (!testResultExecutionId.Equals(Guid.Empty))
+        {
+            targetDirectory = Path.Combine(inDirectory, testResultExecutionId.ToString());
+        }
 
-                    uriDataAttachments.Add(dataAttachment);
-                }
-                catch(Exception ex)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("Trxlogger: ToCollectorEntry: " + ex);
-                    }
-                }
-            }
+        targetDirectory = Path.Combine(targetDirectory, Environment.MachineName);
 
-            return new CollectorDataEntry(
-                attachmentSet.Uri,
-                attachmentSet.DisplayName,
-                Environment.MachineName,
-                Environment.MachineName,
-                false,
-                uriDataAttachments);
+        if (!Directory.Exists(targetDirectory))
+        {
+            Directory.CreateDirectory(targetDirectory);
         }
 
-        // Get the path to the result files
-        private IList<string> ToResultFiles(AttachmentSet attachmentSet, Guid testResultExecutionId, TestRun testRun, string trxFileDirectory)
+        List<IDataAttachment> uriDataAttachments = new();
+        foreach (VisualStudio.TestPlatform.ObjectModel.UriDataAttachment uriDataAttachment in attachmentSet.Attachments)
         {
-            string runDirectoryName = Path.Combine(trxFileDirectory, testRun.RunConfiguration.RunDeploymentRootDirectory);
-            string testResultDirectory = Path.Combine(runDirectoryName, "In");
+            EqtTrace.Verbose($"TrxLogger.ToCollectorEntry: Got attachment {uriDataAttachment.Uri} with description {uriDataAttachment.Description}");
 
-            if (!Guid.Equals(testResultExecutionId, Guid.Empty))
-            {
-                testResultDirectory = Path.Combine(testResultDirectory, testResultExecutionId.ToString());
-            }
+            string sourceFile = uriDataAttachment.Uri.LocalPath;
+            _ = (Path.GetFullPath(sourceFile) == sourceFile);
+            TPDebug.Assert(Path.IsPathRooted(sourceFile), "Source file is not rooted");
 
-            testResultDirectory = Path.Combine(testResultDirectory, Environment.MachineName);
+            // copy the source file to the target location
+            string targetFileName = TrxFileHelper.GetNextIterationFileName(targetDirectory, Path.GetFileName(sourceFile), false);
 
-            if (!Directory.Exists(testResultDirectory))
+            try
             {
-                Directory.CreateDirectory(testResultDirectory);
-            }
+                CopyFile(sourceFile, targetFileName);
 
-            List<string> resultFiles = new List<string>();
-            foreach (ObjectModel.UriDataAttachment uriDataAttachment in attachmentSet.Attachments)
+                // Add the target file name to the collector files list.
+                // (Trx viewer automatically adds In\ to the collected file.
+                string fileName = Path.Combine(Environment.MachineName, Path.GetFileName(targetFileName));
+                Uri sourceFileUri = new(fileName, UriKind.Relative);
+                TPDebug.Assert(uriDataAttachment.Description is not null, "uriDataAttachment.Description is null");
+                TrxObjectModel.UriDataAttachment dataAttachment = new(uriDataAttachment.Description, sourceFileUri, _trxFileHelper);
+
+                uriDataAttachments.Add(dataAttachment);
+            }
+            catch (Exception ex)
             {
-                string sourceFile = uriDataAttachment.Uri.IsAbsoluteUri ? uriDataAttachment.Uri.LocalPath : uriDataAttachment.Uri.ToString();
+                EqtTrace.Error($"Trxlogger.ToCollectorEntry: {ex}");
+            }
+        }
 
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("TrxLogger: ToResultFiles: Got attachment " + uriDataAttachment.Uri + " with local path " + sourceFile);
-                }
+        return new CollectorDataEntry(
+            attachmentSet.Uri,
+            attachmentSet.DisplayName,
+            Environment.MachineName,
+            Environment.MachineName,
+            false,
+            uriDataAttachments);
+    }
 
-                Debug.Assert(Path.IsPathRooted(sourceFile), "Source file is not rooted");
-                // copy the source file to the target location
-                string targetFileName = trxFileHelper.GetNextIterationFileName(testResultDirectory, Path.GetFileName(sourceFile), false);
+    // Get the path to the result files
+    private IList<string> ToResultFiles(AttachmentSet attachmentSet, Guid testResultExecutionId, TestRun testRun, string trxFileDirectory)
+    {
+        string runDirectoryName = Path.Combine(trxFileDirectory, testRun.RunConfiguration!.RunDeploymentRootDirectory);
+        string testResultDirectory = Path.Combine(runDirectoryName, "In");
 
-                try
-                {
-                    CopyFile(sourceFile, targetFileName);
+        if (!Equals(testResultExecutionId, Guid.Empty))
+        {
+            testResultDirectory = Path.Combine(testResultDirectory, testResultExecutionId.ToString());
+        }
 
-                    // Add the target file name to the result files list.
-                    // (Trx viewer automatically adds In\<Guid> to the result file.
-                    string fileName = Path.Combine(Environment.MachineName, Path.GetFileName(targetFileName));
-                    resultFiles.Add(fileName);
-                }
-                catch(Exception ex)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("Trxlogger: ToResultFiles: " + ex);
-                    }
-                }
-            }
+        testResultDirectory = Path.Combine(testResultDirectory, Environment.MachineName);
 
-            return resultFiles;
+        if (!Directory.Exists(testResultDirectory))
+        {
+            Directory.CreateDirectory(testResultDirectory);
         }
 
-        private void CopyFile(string sourceFile, string targetFile)
+        List<string> resultFiles = new();
+        foreach (VisualStudio.TestPlatform.ObjectModel.UriDataAttachment uriDataAttachment in attachmentSet.Attachments)
         {
+            string sourceFile = uriDataAttachment.Uri.IsAbsoluteUri ? uriDataAttachment.Uri.LocalPath : uriDataAttachment.Uri.ToString();
+
+            EqtTrace.Verbose($"TrxLogger.ToResultFiles: Got attachment {uriDataAttachment.Uri} with local path {sourceFile}");
+
+            TPDebug.Assert(Path.IsPathRooted(sourceFile), "Source file is not rooted");
+            // copy the source file to the target location
+            string targetFileName = TrxFileHelper.GetNextIterationFileName(testResultDirectory, Path.GetFileName(sourceFile), false);
+
             try
             {
-                this.fileHelper.CopyFile(sourceFile, targetFile);
+                CopyFile(sourceFile, targetFileName);
+
+                // Add the target file name to the result files list.
+                // (Trx viewer automatically adds In\<Guid> to the result file.
+                string fileName = Path.Combine(Environment.MachineName, Path.GetFileName(targetFileName));
+                resultFiles.Add(fileName);
             }
             catch (Exception ex)
             {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("Trxlogger: Failed to copy file {0} to {1}. Reason:{2}", sourceFile, targetFile, ex);
-                }
-
-                throw;
+                EqtTrace.Error("Trxlogger: ToResultFiles: " + ex);
             }
         }
 
-        /// <summary>
-        /// Gets priority of test.
-        /// </summary>
-        /// <param name="rockSteadyTestCase"></param>
-        /// <returns>Priority</returns>
-        private int GetPriority(TestCase rockSteadyTestCase)
-        {
-            int priority = int.MaxValue;
-
-            Trait priorityTrait = rockSteadyTestCase.Traits?.FirstOrDefault(t => t.Name.Equals("Priority"));
-            if (priorityTrait != null && int.TryParse(priorityTrait.Value, out int priorityValue))
-                priority = priorityValue;
+        return resultFiles;
+    }
 
-            return priority;
+    private void CopyFile(string sourceFile, string targetFile)
+    {
+        try
+        {
+            _fileHelper.CopyFile(sourceFile, targetFile);
         }
-
-        /// <summary>
-        /// Gets owner of test.
-        /// </summary>
-        /// <param name="rockSteadyTestCase"></param>
-        /// <returns>Owner</returns>
-        private string GetOwner(TestCase rockSteadyTestCase)
+        catch (Exception ex)
         {
-            string owner = null;
+            EqtTrace.Error("Trxlogger: Failed to copy file {0} to {1}. Reason:{2}", sourceFile, targetFile, ex);
+            throw;
+        }
+    }
 
-            Trait ownerTrait = rockSteadyTestCase.Traits?.FirstOrDefault(t => t.Name.Equals("Owner"));
-            if (ownerTrait != null)
-                owner = ownerTrait.Value;
+    /// <summary>
+    /// Gets priority of test.
+    /// </summary>
+    /// <param name="rockSteadyTestCase"></param>
+    /// <returns>Priority</returns>
+    private static int GetPriority(TestCase rockSteadyTestCase)
+    {
+        int priority = int.MaxValue;
 
-            return owner ?? string.Empty;
-        }
+        Trait? priorityTrait = rockSteadyTestCase.Traits?.FirstOrDefault(t => t.Name.Equals("Priority"));
+        if (priorityTrait != null && int.TryParse(priorityTrait.Value, out int priorityValue))
+            priority = priorityValue;
 
-        /// <summary>
-        /// Gets test class name.
-        /// </summary>
-        /// <param name="testName">Test name.</param>
-        /// <param name="fullyQualifiedName">Fully qualified name.</param>
-        /// <param name="source">Source.</param>
-        /// <returns>Test class name.</returns>
-        private string GetTestClassName(string testName, string fullyQualifiedName, string source)
-        {
-            var className = "DefaultClassName";
+        return priority;
+    }
 
-            // In case, fullyQualifiedName ends with testName, className is checked within remaining value of fullyQualifiedName.
-            // Example: In case, testName = TestMethod1(2, 3, 4.0d) and fullyQualifiedName = TestProject1.Class1.TestMethod1(2, 3, 4.0d), className will be checked within 'TestProject1.Class1.' only
-            var nameToCheck = !fullyQualifiedName.Equals(testName, StringComparison.OrdinalIgnoreCase) && fullyQualifiedName.EndsWith(testName) ?
-                fullyQualifiedName.Substring(0, fullyQualifiedName.Length - testName.Length) :
-                fullyQualifiedName;
+    /// <summary>
+    /// Gets owner of test.
+    /// </summary>
+    /// <param name="rockSteadyTestCase"></param>
+    /// <returns>Owner</returns>
+    private static string GetOwner(TestCase rockSteadyTestCase)
+    {
+        string? owner = null;
 
-            // C# test case scenario.
-            if (nameToCheck.Contains("."))
-            {
-                return nameToCheck.Substring(0, nameToCheck.LastIndexOf('.'));
-            }
+        Trait? ownerTrait = rockSteadyTestCase.Traits?.FirstOrDefault(t => t.Name.Equals("Owner"));
+        if (ownerTrait != null)
+            owner = ownerTrait.Value;
 
-            // C++ test case scenario (we would have a "::" instead of a '.')
-            if (nameToCheck.Contains("::"))
-            {
-                className = nameToCheck.Substring(0, nameToCheck.LastIndexOf("::"));
+        return owner ?? string.Empty;
+    }
 
-                // rename for a consistent behavior for all tests.
-                return className.Replace("::", ".");
-            }
+    /// <summary>
+    /// Gets test class name.
+    /// </summary>
+    /// <param name="testName">Test name.</param>
+    /// <param name="fullyQualifiedName">Fully qualified name.</param>
+    /// <param name="source">Source.</param>
+    /// <returns>Test class name.</returns>
+    private static string GetTestClassName(string testName, string fullyQualifiedName, string source)
+    {
+        var className = "DefaultClassName";
 
-            // Ordered test, web test scenario (Setting class name as source name if FQDn doesn't have . or ::)
-            try
-            {
-                string testCaseSource = Path.GetFileNameWithoutExtension(source);
-                if (!string.IsNullOrEmpty(testCaseSource))
-                {
-                    return testCaseSource;
-                }
-            }
-            catch (ArgumentException ex)
-            {
-                // If source is not valid file path, then className will continue to point default value.
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("Converter: GetTestClassName: " + ex);
-                }
-            }
+        // In case, fullyQualifiedName ends with testName, className is checked within remaining value of fullyQualifiedName.
+        // Example: In case, testName = TestMethod1(2, 3, 4.0d) and fullyQualifiedName = TestProject1.Class1.TestMethod1(2, 3, 4.0d), className will be checked within 'TestProject1.Class1.' only
+        var nameToCheck = !fullyQualifiedName.Equals(testName, StringComparison.OrdinalIgnoreCase) && fullyQualifiedName.EndsWith(testName) ?
+            fullyQualifiedName.Substring(0, fullyQualifiedName.Length - testName.Length) :
+            fullyQualifiedName;
 
-            return className;
+        // C# test case scenario.
+        if (nameToCheck.Contains("."))
+        {
+            return nameToCheck.Substring(0, nameToCheck.LastIndexOf('.'));
         }
 
-        /// <summary>
-        /// Create test element.
-        /// Currently trx supports only UnitTest and OrderedTest. All tests except OrderedTest all converted to UnitTest.
-        /// </summary>
-        /// <param name="testId"></param>
-        /// <param name="name"></param>
-        /// <param name="fullyQualifiedName"></param>
-        /// <param name="adapter"></param>
-        /// <param name="source"></param>
-        /// <param name="testType"></param>
-        /// <returns>Trx test element</returns>
-        private TestElement CreateTestElement(Guid testId, string name, string fullyQualifiedName, string adapter, string source, TestType testType)
+        // C++ test case scenario (we would have a "::" instead of a '.')
+        if (nameToCheck.Contains("::"))
         {
-            TestElement testElement = null;
+            className = nameToCheck.Substring(0, nameToCheck.LastIndexOf("::"));
 
-            if (testType.Equals(Constants.OrderedTestType))
-            {
-                testElement = new OrderedTestElement(testId, name, adapter);
-            }
-            else
-            {
-                var codeBase = source;
-                var className = GetTestClassName(name, fullyQualifiedName, source);
-                var testMethodName = fullyQualifiedName.StartsWith($"{className}.") ? fullyQualifiedName.Remove(0, $"{className}.".Length) : fullyQualifiedName;
-                var testMethod = new TestMethod(testMethodName, className);
+            // rename for a consistent behavior for all tests.
+            return className.Replace("::", ".");
+        }
 
-                testElement = new UnitTestElement(testId, name, adapter, testMethod);
-                (testElement as UnitTestElement).CodeBase = codeBase;
+        // Ordered test, web test scenario (Setting class name as source name if FQDn doesn't have . or ::)
+        try
+        {
+            string testCaseSource = Path.GetFileNameWithoutExtension(source);
+            if (!string.IsNullOrEmpty(testCaseSource))
+            {
+                return testCaseSource;
             }
-
-            return testElement;
         }
+        catch (ArgumentException ex)
+        {
+            // If source is not valid file path, then className will continue to point default value.
+            EqtTrace.Verbose("Converter: GetTestClassName: " + ex);
+        }
+
+        return className;
+    }
 
-        /// <summary>
-        /// Create test result.
-        /// Currently trx supports only UnitTest and OrderedTest. All tests except OrderedTest all converted to unit test result.
-        /// </summary>
-        /// <param name="runId"></param>
-        /// <param name="testId"></param>
-        /// <param name="executionId"></param>
-        /// <param name="parentExecutionId"></param>
-        /// <param name="resultName"></param>
-        /// <param name="outcome"></param>
-        /// <param name="testType"></param>
-        /// <param name="testCategoryId"></param>
-        /// <returns>Trx test result</returns>
-        private TrxObjectModel.TestResult CreateTestResult(
-            Guid runId,
-            Guid testId,
-            Guid executionId,
-            Guid parentExecutionId,
-            string resultName,
-            TrxObjectModel.TestOutcome outcome,
-            TestType testType,
-            TestListCategoryId testCategoryId)
+    /// <summary>
+    /// Create test element.
+    /// Currently trx supports only UnitTest and OrderedTest. All tests except OrderedTest all converted to UnitTest.
+    /// </summary>
+    /// <param name="testId"></param>
+    /// <param name="name"></param>
+    /// <param name="fullyQualifiedName"></param>
+    /// <param name="adapter"></param>
+    /// <param name="source"></param>
+    /// <param name="testType"></param>
+    /// <returns>Trx test element</returns>
+    private static TestElement CreateTestElement(Guid testId, string name, string fullyQualifiedName, string adapter, string source, TestType testType)
+    {
+        if (testType.Equals(Constants.OrderedTestType))
         {
-            return testType.Equals(Constants.OrderedTestType) ?
-                new TestResultAggregation(runId, testId, executionId, parentExecutionId, resultName, Environment.MachineName, outcome, testType, testCategoryId, trxFileHelper) :
-                new UnitTestResult(runId, testId, executionId, parentExecutionId, resultName, Environment.MachineName, outcome, testType, testCategoryId, trxFileHelper);
+            return new OrderedTestElement(testId, name, adapter);
         }
+
+        var codeBase = source;
+        var className = GetTestClassName(name, fullyQualifiedName, source);
+        var testMethodName = fullyQualifiedName.StartsWith($"{className}.") ? fullyQualifiedName.Remove(0, $"{className}.".Length) : fullyQualifiedName;
+        var testMethod = new TestMethod(testMethodName, className);
+
+        var testElement = new UnitTestElement(testId, name, adapter, testMethod);
+        testElement.CodeBase = codeBase;
+
+        return testElement;
+    }
+
+    /// <summary>
+    /// Create test result.
+    /// Currently trx supports only UnitTest and OrderedTest. All tests except OrderedTest all converted to unit test result.
+    /// </summary>
+    /// <param name="runId"></param>
+    /// <param name="testId"></param>
+    /// <param name="executionId"></param>
+    /// <param name="parentExecutionId"></param>
+    /// <param name="resultName"></param>
+    /// <param name="outcome"></param>
+    /// <param name="testType"></param>
+    /// <param name="testCategoryId"></param>
+    /// <returns>Trx test result</returns>
+    private TrxObjectModel.TestResult CreateTestResult(
+        Guid runId,
+        Guid testId,
+        Guid executionId,
+        Guid parentExecutionId,
+        string resultName,
+        TrxObjectModel.TestOutcome outcome,
+        TestType testType,
+        TestListCategoryId testCategoryId)
+    {
+        return testType.Equals(Constants.OrderedTestType) ?
+            new TestResultAggregation(runId, testId, executionId, parentExecutionId, resultName, Environment.MachineName, outcome, testType, testCategoryId, _trxFileHelper) :
+            new UnitTestResult(runId, testId, executionId, parentExecutionId, resultName, Environment.MachineName, outcome, testType, testCategoryId, _trxFileHelper);
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs
index 718d891574..694ce5cc6e 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs
@@ -1,78 +1,79 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
 
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 
+/// <summary>
+/// Class to be used for parameter verification.
+/// </summary>
+internal sealed class EqtAssert
+{
     /// <summary>
-    /// Class to be used for parameter verification.
+    /// Do not instantiate.
     /// </summary>
-    internal sealed class EqtAssert
+    private EqtAssert()
     {
-        /// <summary>
-        /// Do not instantiate.
-        /// </summary>
-        private EqtAssert()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Verifies that the specified parameter is not null, Debug.Asserts and throws.
-        /// </summary>
-        /// <param name="expression">Expression to check</param>
-        /// <param name="comment">Comment to write</param>
-        public static void IsTrue(bool expression, string comment)
+    /// <summary>
+    /// Verifies that the specified parameter is not null, TPDebug.Asserts and throws.
+    /// </summary>
+    /// <param name="expression">Expression to check</param>
+    /// <param name="comment">Comment to write</param>
+    public static void IsTrue(bool expression, string comment)
+    {
+        TPDebug.Assert(expression, comment);
+        if (!expression)
         {
-            Debug.Assert(expression, comment);
-            if (!expression)
-            {
-                throw new Exception(comment);
-            }
+            throw new Exception(comment);
         }
+    }
 
-        /// <summary>
-        /// Verifies that the specified parameter is not null, Debug.Asserts and throws.
-        /// </summary>
-        /// <param name="parameter">Parameter to check</param>
-        /// <param name="parameterName">String - parameter name</param>
-        public static void ParameterNotNull(object parameter, string parameterName)
+    /// <summary>
+    /// Verifies that the specified parameter is not null, TPDebug.Asserts and throws.
+    /// </summary>
+    /// <param name="parameter">Parameter to check</param>
+    /// <param name="parameterName">String - parameter name</param>
+    public static void ParameterNotNull([NotNull] object? parameter, string parameterName)
+    {
+        AssertParameterNameNotNullOrEmpty(parameterName);
+        TPDebug.Assert(parameter != null, $"'{nameof(parameterName)}' is null");
+        if (parameter == null)
         {
-            AssertParameterNameNotNullOrEmpty(parameterName);
-            Debug.Assert(parameter != null, string.Format(CultureInfo.InvariantCulture, "'{0}' is null", parameterName));
-            if (parameter == null)
-            {
-                throw new ArgumentNullException(parameterName);
-            }
+            throw new ArgumentNullException(parameterName);
         }
+    }
 
-        /// <summary>
-        /// Verifies that the specified string parameter is neither null nor empty, Debug.Asserts and throws.
-        /// </summary>
-        /// <param name="parameter">Parameter to check</param>
-        /// <param name="parameterName">String - parameter name</param>
-        public static void StringNotNullOrEmpty(string parameter, string parameterName)
+    /// <summary>
+    /// Verifies that the specified string parameter is neither null nor empty, TPDebug.Asserts and throws.
+    /// </summary>
+    /// <param name="parameter">Parameter to check</param>
+    /// <param name="parameterName">String - parameter name</param>
+    public static void StringNotNullOrEmpty([NotNull] string? parameter, string parameterName)
+    {
+        AssertParameterNameNotNullOrEmpty(parameterName);
+        TPDebug.Assert(!parameter.IsNullOrEmpty(), $"'{nameof(parameterName)}' is null or empty");
+        if (parameter.IsNullOrEmpty())
         {
-            AssertParameterNameNotNullOrEmpty(parameterName);
-            Debug.Assert(!string.IsNullOrEmpty(parameter), string.Format(CultureInfo.InvariantCulture, "'{0}' is null or empty", parameterName));
-            if (string.IsNullOrEmpty(parameter))
-            {
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_CannotBeNullOrEmpty));
-            }
+            throw new ArgumentException(TrxLoggerResources.Common_CannotBeNullOrEmpty);
         }
+    }
 
-        /// <summary>
-        /// Asserts that the parameter name is not null or empty
-        /// </summary>
-        /// <param name="parameterName">The parameter name to verify</param>
-        [Conditional("DEBUG")]
-        private static void AssertParameterNameNotNullOrEmpty(string parameterName)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(parameterName), "'parameterName' is null or empty");
-        }
+    /// <summary>
+    /// Asserts that the parameter name is not null or empty
+    /// </summary>
+    /// <param name="parameterName">The parameter name to verify</param>
+    [Conditional("DEBUG")]
+    private static void AssertParameterNameNotNullOrEmpty([NotNull] string? parameterName)
+    {
+        TPDebug.Assert(!parameterName.IsNullOrEmpty(), "'parameterName' is null or empty");
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TestRunDirectories.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TestRunDirectories.cs
index b76cf3ab2c..bbe6b85323 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TestRunDirectories.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TestRunDirectories.cs
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 
+/// <summary>
+/// Class to deal with directories.
+/// </summary>
+internal sealed class TestRunDirectories
+{
     /// <summary>
-    /// Class to deal with directories.
+    /// Computes the test results directory, relative to the root results directory (whatever that may be)
     /// </summary>
-    internal sealed class TestRunDirectories
+    /// <param name="testExecutionId">The test's execution ID</param>
+    /// <returns>
+    /// The test results directory (&lt;testExecutionId&gt;), under which test-specific result files should be stored
+    /// </returns>
+    public static string GetRelativeTestResultsDirectory(Guid testExecutionId)
     {
-        /// <summary>
-        /// Computes the test results directory, relative to the root results directory (whatever that may be)
-        /// </summary>
-        /// <param name="testExecutionId">The test's execution ID</param>
-        /// <returns>
-        /// The test results directory (&lt;testExecutionId&gt;), under which test-specific result files should be stored
-        /// </returns>
-        public static string GetRelativeTestResultsDirectory(Guid testExecutionId)
-        {
-            return testExecutionId.ToString();
-        }
+        return testExecutionId.ToString();
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TrxFileHelper.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TrxFileHelper.cs
index e1a0fadd6f..8104df9806 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TrxFileHelper.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/TrxFileHelper.cs
@@ -1,417 +1,400 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+
+/// <summary>
+/// Helper function to deal with file name.
+/// </summary>
+internal class TrxFileHelper
+
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+    private const string RelativeDirectorySeparator = "..";
 
-    /// <summary>
-    /// Helper function to deal with file name.
-    /// </summary>
-    internal class TrxFileHelper
+    private static readonly HashSet<char> InvalidFileNameChars;
+    private static readonly Regex ReservedFileNamesRegex = new(@"(?i:^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9]|CLOCK\$)(\..*)?)$");
+    private readonly Func<DateTime> _timeProvider;
+
+    // Have to init InvalidFileNameChars dynamically.
+    static TrxFileHelper()
+    {
+        // Create a hash table of invalid chars. On Windows, this should match the contents of System.IO.Path.GetInvalidFileNameChars.
+        // See https://github.com/dotnet/coreclr/blob/8e99cd8031b2f568ea69116e7cf96d55e32cb7f5/src/mscorlib/shared/System/IO/Path.Windows.cs#L12-L19
+        // These are manually listed here to avoid characters that may be valid on Linux but would make a filename invalid when copying the file to Windows.
+        // Path.GetInvalidFileNameChars on Linux only contains { \0, / }
+        InvalidFileNameChars = new HashSet<char>
+        {
+            '\"', '<', '>', '|', '\0',
+            (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10,
+            (char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20,
+            (char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30,
+            (char)31, ':', '*', '?', '\\', '/'
+        };
+
+        // Needed because when kicking off qtsetup.bat cmd.exe is used.  '@' is a special character
+        // for cmd so must be removed from the path to the bat file
+        InvalidFileNameChars.Add('@');
+        InvalidFileNameChars.Add('(');
+        InvalidFileNameChars.Add(')');
+        InvalidFileNameChars.Add('^');
+
+        // Replace white space with underscore from folder/file name to make it command line friendly
+        // Related issues https://github.com/Microsoft/vstest/issues/244 & https://devdiv.visualstudio.com/DevDiv/_workitems?id=507982&_a=edit
+        InvalidFileNameChars.Add(' ');
+    }
+
+    public TrxFileHelper() : this(() => DateTime.Now) { }
 
+    public TrxFileHelper(Func<DateTime> timeProvider)
     {
-        private const string RelativeDirectorySeparator = "..";
+        _timeProvider = timeProvider ?? (() => DateTime.Now);
+    }
 
-        private static readonly HashSet<char> InvalidFileNameChars;
-        private static readonly Regex ReservedFileNamesRegex = new Regex(@"(?i:^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9]|CLOCK\$)(\..*)?)$");
-        private readonly Func<DateTime> TimeProvider;
+    /// <summary>
+    /// Replaces invalid file name chars in the specified string and changes it if it is a reserved file name.
+    /// </summary>
+    /// <param name="fileName">the name of the file</param>
+    /// <returns>Replaced string.</returns>
+    public static string ReplaceInvalidFileNameChars(string fileName)
+    {
+        EqtAssert.StringNotNullOrEmpty(fileName, nameof(fileName));
 
-        #region Constructors
-        [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", Justification = "Reviewed. Suppression is OK here.")]
+        // Replace bad chars by this.
+        char replacementChar = '_';
+        StringBuilder result = new(fileName.Length);
+        result.Length = fileName.Length;
 
-        // Have to init InvalidFileNameChars dynamically.
-        static TrxFileHelper()
+        // Replace each invalid char with replacement char.
+        for (int i = 0; i < fileName.Length; ++i)
         {
-            // Create a hash table of invalid chars. On Windows, this should match the contents of System.IO.Path.GetInvalidFileNameChars.
-            // See https://github.com/dotnet/coreclr/blob/8e99cd8031b2f568ea69116e7cf96d55e32cb7f5/src/mscorlib/shared/System/IO/Path.Windows.cs#L12-L19
-            // These are manually listed here to avoid characters that may be valid on Linux but would make a filename invalid when copying the file to Windows.
-            // Path.GetInvalidFileNameChars on Linux only contains { \0, / }
-            InvalidFileNameChars = new HashSet<char>
-            {
-                '\"', '<', '>', '|', '\0',
-                (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10,
-                (char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20,
-                (char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30,
-                (char)31, ':', '*', '?', '\\', '/'
-            };
-
-            // Needed because when kicking off qtsetup.bat cmd.exe is used.  '@' is a special character
-            // for cmd so must be removed from the path to the bat file
-            InvalidFileNameChars.Add('@');
-            InvalidFileNameChars.Add('(');
-            InvalidFileNameChars.Add(')');
-            InvalidFileNameChars.Add('^');
-
-            // Replace white space with underscore from folder/file name to make it command line friendly
-            // Related issues https://github.com/Microsoft/vstest/issues/244 & https://devdiv.visualstudio.com/DevDiv/_workitems?id=507982&_a=edit
-            InvalidFileNameChars.Add(' ');
+            result[i] = InvalidFileNameChars.Contains(fileName[i]) ? replacementChar : fileName[i];
         }
 
-        public TrxFileHelper() : this(() => DateTime.Now) { }
+        // We trim spaces in the end because CreateFile/Dir trim those.
+        string replaced = result.ToString().TrimEnd();
+        if (replaced.Length == 0)
+        {
+            Debug.Fail($"After replacing invalid chars in file '{fileName}' there's nothing left...");
+            throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_NothingLeftAfterReplaciingBadCharsInName, fileName));
+        }
 
-        public TrxFileHelper(Func<DateTime> timeProvider)
+        if (IsReservedFileName(replaced))
         {
-            TimeProvider = timeProvider ?? (() => DateTime.Now);
+            replaced = replacementChar + replaced;  // Cannot add to the end because it can have extensions.
         }
 
-        #endregion
+        return replaced;
+    }
 
-        /// <summary>
-        /// Replaces invalid file name chars in the specified string and changes it if it is a reserved file name.
-        /// </summary>
-        /// <param name="fileName">the name of the file</param>
-        /// <returns>Replaced string.</returns>
-        public string ReplaceInvalidFileNameChars(string fileName)
+    /// <summary>
+    /// Checks whether file with specified name exists in the specified directory.
+    /// If it exits, adds (1),(2)... to the file name and checks again.
+    /// Returns full file name (with path) of the iteration when the file does not exist.
+    /// </summary>
+    /// <param name="parentDirectoryName">
+    /// The directory where to check.
+    /// </param>
+    /// <param name="originalFileName">
+    /// The original file (that we would add (1),(2),.. in the end of if needed) name to check.
+    /// </param>
+    /// <param name="checkMatchingDirectory">
+    /// If true, and directory with filename without extension exists, try next iteration.
+    /// </param>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    public static string GetNextIterationFileName(string parentDirectoryName, string originalFileName, bool checkMatchingDirectory)
+    {
+        EqtAssert.StringNotNullOrEmpty(parentDirectoryName, nameof(parentDirectoryName));
+        EqtAssert.StringNotNullOrEmpty(originalFileName, nameof(originalFileName));
+        return GetNextIterationNameHelper(parentDirectoryName, originalFileName, new FileIterationHelper(checkMatchingDirectory));
+    }
+
+    /// <summary>
+    /// Constructs and returns first available timestamped file name.
+    /// This does not checks for the file permissions.
+    /// </summary>
+    /// <param name="directoryName">Directory to try timestamped file names in.</param>
+    /// <param name="fileName">Filename (with extension) of the desired file. Timestamp will be added just before extension.</param>
+    /// <param name="timestampFormat">Timestamp format to be passed into DateTime.ToString method.</param>
+    /// <returns>First available filename with the format of `FileName{Timestamp}.ext`.</returns>
+    /// <example>
+    ///     <c>GetNextTimestampFileName("c:\data", "log.txt", "_yyyyMMddHHmmss")</c> will return "c:\data\log_20200801185521.txt", if available.
+    /// </example>
+    public string GetNextTimestampFileName(string directoryName, string fileName, string timestampFormat)
+    {
+        EqtAssert.StringNotNullOrEmpty(directoryName, "parentDirectoryName");
+        EqtAssert.StringNotNullOrEmpty(fileName, nameof(fileName));
+        EqtAssert.StringNotNullOrEmpty(timestampFormat, nameof(timestampFormat));
+
+        ushort iteration = 0;
+        var iterationStamp = _timeProvider();
+        var fileNamePrefix = Path.GetFileNameWithoutExtension(fileName);
+        var extension = Path.GetExtension(fileName);
+        do
         {
-            EqtAssert.StringNotNullOrEmpty(fileName, nameof(fileName));
+            var tryMe = fileNamePrefix + iterationStamp.ToString(timestampFormat, DateTimeFormatInfo.InvariantInfo) + extension;
 
-            // Replace bad chars by this.
-            char replacementChar = '_';
-            StringBuilder result = new StringBuilder(fileName.Length);
-            result.Length = fileName.Length;
+            string tryMePath = Path.Combine(directoryName, tryMe);
 
-            // Replace each invalid char with replacement char.
-            for (int i = 0; i < fileName.Length; ++i)
+            if (!File.Exists(tryMePath))
             {
-                if (InvalidFileNameChars.Contains(fileName[i]))
-                {
-                    result[i] = replacementChar;
-                }
-                else
-                {
-                    result[i] = fileName[i];
-                }
+                return tryMePath;
             }
 
-            // We trim spaces in the end because CreateFile/Dir trim those.
-            string replaced = result.ToString().TrimEnd();
-            if (replaced.Length == 0)
-            {
-                Debug.Fail(string.Format(CultureInfo.InvariantCulture, "After replacing invalid chars in file '{0}' there's nothing left...", fileName));
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_NothingLeftAfterReplaciingBadCharsInName, fileName));
-            }
+            iterationStamp = iterationStamp.AddSeconds(1);
+            ++iteration;
+        }
+        while (iteration != ushort.MaxValue);
 
-            if (IsReservedFileName(replaced))
-            {
-                replaced = replacementChar + replaced;  // Cannot add to the end because it can have extensions.
-            }
+        throw new Exception(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_CannotGetNextTimestampFileName, fileName, directoryName, timestampFormat));
+    }
 
-            return replaced;
-        }
+    public static string MakePathRelative(string path, string basePath)
+    {
+        EqtAssert.StringNotNullOrEmpty(path, nameof(path));
 
-        /// <summary>
-        /// Checks whether file with specified name exists in the specified directory.
-        /// If it exits, adds (1),(2)... to the file name and checks again.
-        /// Returns full file name (with path) of the iteration when the file does not exist.
-        /// </summary>
-        /// <param name="parentDirectoryName">
-        /// The directory where to check.
-        /// </param>
-        /// <param name="originalFileName">
-        /// The original file (that we would add (1),(2),.. in the end of if needed) name to check.
-        /// </param>
-        /// <param name="checkMatchingDirectory">
-        /// If true, and directory with filename without extension exists, try next iteration.
-        /// </param>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        public string GetNextIterationFileName(string parentDirectoryName, string originalFileName, bool checkMatchingDirectory)
+        // Can't be relative to nothing
+        if (basePath.IsNullOrEmpty())
         {
-            EqtAssert.StringNotNullOrEmpty(parentDirectoryName, nameof(parentDirectoryName));
-            EqtAssert.StringNotNullOrEmpty(originalFileName, nameof(originalFileName));
-            return GetNextIterationNameHelper(parentDirectoryName, originalFileName, new FileIterationHelper(checkMatchingDirectory));
+            return path;
         }
 
-        /// <summary>
-        /// Constructs and returns first available timestamped file name.
-        /// This does not checks for the file permissions.
-        /// </summary>
-        /// <param name="directoryName">Directory to try timestamped file names in.</param>
-        /// <param name="fileName">Filename (with extension) of the desired file. Timestamp will be added just before extension.</param>
-        /// <param name="timestampFormat">Timestamp format to be passed into DateTime.ToString method.</param>
-        /// <returns>First available filename with the format of `FileName{Timestamp}.ext`.</returns>
-        /// <example>
-        ///     <c>GetNextTimestampFileName("c:\data", "log.txt", "_yyyyMMddHHmmss")</c> will return "c:\data\log_20200801185521.txt", if available.
-        /// </example>
-        public string GetNextTimestampFileName(string directoryName, string fileName, string timestampFormat)
+        // Canonicalize those paths:
+
+        if (!Path.IsPathRooted(path))
         {
-            EqtAssert.StringNotNullOrEmpty(directoryName, "parentDirectoryName");
-            EqtAssert.StringNotNullOrEmpty(fileName, nameof(fileName));
-            EqtAssert.StringNotNullOrEmpty(timestampFormat, nameof(timestampFormat));
-
-            ushort iteration = 0;
-            var iterationStamp = TimeProvider();
-            var fileNamePrefix = Path.GetFileNameWithoutExtension(fileName);
-            var extension = Path.GetExtension(fileName);
-            do
-            {
-                var tryMe = fileNamePrefix + iterationStamp.ToString(timestampFormat, DateTimeFormatInfo.InvariantInfo) + extension;
+            //If path is relative, we combine it with base path before canonicalizing.
+            //Else Path.GetFullPath is going to use the process worker directory (e.g. e:\binariesy.x86\bin\i386).
+            path = Path.Combine(basePath, path);
+        }
+        path = Path.GetFullPath(path);
+        basePath = Path.GetFullPath(basePath);
 
-                string tryMePath = Path.Combine(directoryName, tryMe);
+        char[] delimiters = [Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar];
 
-                if (!File.Exists(tryMePath))
-                {
-                    return tryMePath;
-                }
+        basePath = basePath.TrimEnd(delimiters);
+        path = path.TrimEnd(delimiters);
 
-                iterationStamp = iterationStamp.AddSeconds(1);
-                ++iteration;
-            }
-            while (iteration != ushort.MaxValue);
+        string[] pathTokens = path.Split(delimiters);
+        string[] basePathTokens = basePath.Split(delimiters);
 
-            throw new Exception(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_CannotGetNextTimestampFileName, fileName, directoryName, timestampFormat));
-        }
+        TPDebug.Assert(pathTokens.Length > 0 && basePathTokens.Length > 0);
+        int max = Math.Min(pathTokens.Length, basePathTokens.Length);
 
-        public string MakePathRelative(string path, string basePath)
+        // Skip all of the empty tokens that result from things like "\dir1"
+        // and "\\dir1". We need to compare the first non-null token
+        // to know if we've got differences.
+        int i;
+        for (i = 0; i < max && pathTokens[i].Length == 0 && basePathTokens[i].Length == 0; i++)
         {
-            EqtAssert.StringNotNullOrEmpty(path, nameof(path));
+        }
 
-            // Can't be relative to nothing
-            if (string.IsNullOrEmpty(basePath))
-            {
-                return path;
-            }
+        if (i >= max)
+        {
+            // At least one of these strings is too short to work with
+            return path;
+        }
 
-            // Canonicalize those paths:
+        if (!pathTokens[i].Equals(basePathTokens[i], StringComparison.OrdinalIgnoreCase))
+        {
+            // These differ from the very start - just return the original path
+            return path;
+        }
 
-            if (!Path.IsPathRooted(path))
+        for (++i; i < max; i++)
+        {
+            if (!pathTokens[i].Equals(basePathTokens[i], StringComparison.OrdinalIgnoreCase))
             {
-                //If path is relative, we combine it with base path before canonicalizing.
-                //Else Path.GetFullPath is going to use the process worker directory (e.g. e:\binariesy.x86\bin\i386).
-                path = Path.Combine(basePath, path);
+                // We've found a non-matching token
+                break;
             }
-            path = Path.GetFullPath(path);
-            basePath = Path.GetFullPath(basePath);
-
-            char[] delimiters = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar };
-
-            basePath = basePath.TrimEnd(delimiters);
-            path = path.TrimEnd(delimiters);
+        }
 
-            string[] pathTokens = path.Split(delimiters);
-            string[] basePathTokens = basePath.Split(delimiters);
+        // i should point to first non-matching token.
 
-            Debug.Assert(pathTokens.Length > 0 && basePathTokens.Length > 0);
-            int max = Math.Min(pathTokens.Length, basePathTokens.Length);
+        StringBuilder newPath = new();
 
-            // Skip all of the empty tokens that result from things like "\dir1"
-            // and "\\dir1". We need to compare the first non-null token
-            // to know if we've got differences.
-            int i = 0;
-            for (i = 0; i < max && pathTokens[i].Length == 0 && basePathTokens[i].Length == 0; i++)
+        // ok, for each remaining token in the base path,
+        // add ..\ to the string.
+        for (int j = i; j < basePathTokens.Length; j++)
+        {
+            if (newPath.Length > 0)
             {
+                newPath.Append(Path.DirectorySeparatorChar);
             }
+            newPath.Append(RelativeDirectorySeparator);
+        }
 
-            if (i >= max)
-            {
-                // At least one of these strings is too short to work with
-                return path;
-            }
+        // And now, for every remaining token in the path,
+        // add it to the string, separated by the directory
+        // separator.
 
-            if (!pathTokens[i].Equals(basePathTokens[i], StringComparison.OrdinalIgnoreCase))
+        for (int j = i; j < pathTokens.Length; j++)
+        {
+            if (newPath.Length > 0)
             {
-                // These differ from the very start - just return the original path
-                return path;
+                newPath.Append(Path.DirectorySeparatorChar);
             }
+            newPath.Append(pathTokens[j]);
+        }
 
-            for (++i; i < max; i++)
-            {
-                if (!pathTokens[i].Equals(basePathTokens[i], StringComparison.OrdinalIgnoreCase))
-                {
-                    // We've found a non-matching token
-                    break;
-                }
-            }
+        return newPath.ToString();
+    }
 
-            // i should point to first non-matching token.
+    /// <summary>
+    /// Returns true if the file name specified is Windows reserved file name.
+    /// </summary>
+    /// <param name="fileName">
+    /// The name of the file. Note: only a file name, does not expect to contain directory separators.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/> True if yes else False.
+    /// </returns>
+    private static bool IsReservedFileName(string fileName)
+    {
+        TPDebug.Assert(!string.IsNullOrEmpty(fileName), "FileHelper.IsReservedFileName: the argument is null or empty string!");
+        if (string.IsNullOrEmpty(fileName))
+        {
+            return false;
+        }
 
-            StringBuilder newPath = new StringBuilder();
+        // CreateFile:
+        // The following reserved device names cannot be used as the name of a file:
+        // CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9,
+        // LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
+        // Also avoid these names followed by an extension, for example, NUL.tx7.
+        // Windows NT: CLOCK$ is also a reserved device name.
+        return ReservedFileNamesRegex.Match(fileName).Success;
+    }
 
-            // ok, for each remaining token in the base path,
-            // add ..\ to the string.
-            for (int j = i; j < basePathTokens.Length; j++)
-            {
-                if (newPath.Length > 0)
-                {
-                    newPath.Append(Path.DirectorySeparatorChar);
-                }
-                newPath.Append(RelativeDirectorySeparator);
-            }
+    /// <summary>
+    /// Helper to get next iteration (1),(2),.. names.
+    /// Note that we don't check for security permissions:
+    ///     If the file exists and you have access to the dir you will get File.Exist = true
+    ///     If the file exists and you don't have access to the dir, you will not be able to create the file anyway.
+    /// Result.trx -&gt; Result(1).trx, Result(2).trx, etc.
+    /// </summary>
+    /// <param name="baseDirectoryName">
+    /// Base directory to try iteration in.
+    /// </param>
+    /// <param name="originalName">
+    /// The name to start the iterations from.
+    /// </param>
+    /// <param name="helper">
+    /// An instance of IterationHelper.
+    /// </param>
+    /// <returns>
+    /// Next valid iteration name.
+    /// </returns>
+    private static string GetNextIterationNameHelper(
+        string baseDirectoryName,
+        string originalName,
+        IterationHelper helper)
+    {
+        TPDebug.Assert(!baseDirectoryName.IsNullOrEmpty(), "baseDirectoryname is null");
+        TPDebug.Assert(!originalName.IsNullOrEmpty(), "originalName is Null");
+        TPDebug.Assert(helper != null, "helper is null");
 
-            // And now, for every remaining token in the path,
-            // add it to the string, separated by the directory
-            // separator.
+        uint iteration = 0;
+        do
+        {
+            var tryMe = iteration == 0 ? originalName : helper.NextIteration(originalName, iteration);
 
-            for (int j = i; j < pathTokens.Length; j++)
+            string tryMePath = Path.Combine(baseDirectoryName, tryMe);
+            if (helper.IsValidIteration(tryMePath))
             {
-                if (newPath.Length > 0)
-                {
-                    newPath.Append(Path.DirectorySeparatorChar);
-                }
-                newPath.Append(pathTokens[j]);
+                return tryMePath;
             }
 
-            return newPath.ToString();
+            ++iteration;
         }
+        while (iteration != uint.MaxValue);
 
-        /// <summary>
-        /// Returns true if the file name specified is Windows reserved file name.
-        /// </summary>
-        /// <param name="fileName">
-        /// The name of the file. Note: only a file name, does not expect to contain directory separators.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/> True if yes else False.
-        /// </returns>
-        private static bool IsReservedFileName(string fileName)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(fileName), "FileHelper.IsReservedFileName: the argument is null or empty string!");
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return false;
-            }
-
-            // CreateFile:
-            // The following reserved device names cannot be used as the name of a file:
-            // CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9,
-            // LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
-            // Also avoid these names followed by an extension, for example, NUL.tx7.
-            // Windows NT: CLOCK$ is also a reserved device name.
-            return ReservedFileNamesRegex.Match(fileName).Success;
-        }
+        throw new Exception(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_CannotGetNextIterationName, originalName, baseDirectoryName));
+    }
 
+    private abstract class IterationHelper
+    {
         /// <summary>
-        /// Helper to get next iteration (1),(2),.. names.
-        /// Note that we don't check for security permissions:
-        ///     If the file exists and you have access to the dir you will get File.Exist = true
-        ///     If the file exists and you don't have access to the dir, you will not be able to create the file anyway.
-        /// Result.trx -&gt; Result(1).trx, Result(2).trx, etc.
+        /// Formats iteration like baseName[1].
         /// </summary>
-        /// <param name="baseDirectoryName">
-        /// Base directory to try iteration in.
+        /// <param name="baseName">
+        /// Base name for the iteration.
         /// </param>
-        /// <param name="originalName">
-        /// The name to start the iterations from.
-        /// </param>
-        /// <param name="helper">
-        /// An instance of IterationHelper.
+        /// <param name="iteration">
+        /// The iteration number
         /// </param>
         /// <returns>
-        /// Next valid iteration name.
+        /// The formatted string.
         /// </returns>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
-        private static string GetNextIterationNameHelper(
-            string baseDirectoryName,
-            string originalName,
-            IterationHelper helper)
+        internal static string FormatIteration(string baseName, uint iteration)
         {
-            Debug.Assert(!string.IsNullOrEmpty(baseDirectoryName), "baseDirectoryname is null");
-            Debug.Assert(!string.IsNullOrEmpty(originalName), "originalName is Null");
-            Debug.Assert(helper != null, "helper is null");
+            TPDebug.Assert(!string.IsNullOrEmpty(baseName), "basename is null");
+
+            var tryMe = string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}[{1}]",
+                baseName,
+                iteration.ToString(CultureInfo.InvariantCulture));
+            return tryMe;
+        }
 
-            uint iteration = 0;
-            do
-            {
-                var tryMe = iteration == 0 ? originalName : helper.NextIteration(originalName, iteration);
+        internal abstract string NextIteration(string baseName, uint iteration);
 
-                string tryMePath = Path.Combine(baseDirectoryName, tryMe);
-                if (helper.IsValidIteration(tryMePath))
-                {
-                    return tryMePath;
-                }
+        internal abstract bool IsValidIteration(string name);
+    }
 
-                ++iteration;
-            }
-            while (iteration != uint.MaxValue);
+    private class FileIterationHelper : IterationHelper
+    {
+        private readonly bool _checkMatchingDirectory;
 
-            throw new Exception(string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.Common_CannotGetNextIterationName, originalName, baseDirectoryName));
+        /// <summary>
+        /// Constructor for class checkMatchingDirectory.
+        /// </summary>
+        /// <param name="checkMatchingDirectory">If true, and directory with filename without extension exists, try next iteration.</param>
+        internal FileIterationHelper(bool checkMatchingDirectory)
+        {
+            _checkMatchingDirectory = checkMatchingDirectory;
         }
 
-        private abstract class IterationHelper
+        internal override string NextIteration(string baseName, uint iteration)
         {
-            /// <summary>
-            /// Formats iteration like baseName[1].
-            /// </summary>
-            /// <param name="baseName">
-            /// Base name for the iteration.
-            /// </param>
-            /// <param name="iteration">
-            /// The iteration number
-            /// </param>
-            /// <returns>
-            /// The formatted string.
-            /// </returns>
-            internal static string FormatIteration(string baseName, uint iteration)
+            TPDebug.Assert(!string.IsNullOrEmpty(baseName), "baseName is null");
+
+            string withoutExtensionName = Path.GetFileNameWithoutExtension(baseName);
+            string tryMe = FormatIteration(withoutExtensionName, iteration);
+            if (Path.HasExtension(baseName))
             {
-                Debug.Assert(!string.IsNullOrEmpty(baseName), "basename is null");
-
-                var tryMe = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "{0}[{1}]",
-                    baseName,
-                    iteration.ToString(CultureInfo.InvariantCulture));
-                return tryMe;
+                tryMe += Path.GetExtension(baseName);   // Path.GetExtension already returns the leading ".".
             }
 
-            internal abstract string NextIteration(string baseName, uint iteration);
-
-            internal abstract bool IsValidIteration(string name);
+            return tryMe;
         }
 
-        private class FileIterationHelper : IterationHelper
+        internal override bool IsValidIteration(string path)
         {
-            private readonly bool checkMatchingDirectory;
+            TPDebug.Assert(!string.IsNullOrEmpty(path), "path is null");
 
-            /// <summary>
-            /// Constructor for class checkMatchingDirectory.
-            /// </summary>
-            /// <param name="checkMatchingDirectory">If true, and directory with filename without extension exists, try next iteration.</param>
-            internal FileIterationHelper(bool checkMatchingDirectory)
+            if (File.Exists(path) || Directory.Exists(path))
             {
-                this.checkMatchingDirectory = checkMatchingDirectory;
-            }
-
-            internal override string NextIteration(string baseName, uint iteration)
-            {
-                Debug.Assert(!string.IsNullOrEmpty(baseName), "baseName is null");
-
-                string withoutExtensionName = Path.GetFileNameWithoutExtension(baseName);
-                string tryMe = FormatIteration(withoutExtensionName, iteration);
-                if (Path.HasExtension(baseName))
-                {
-                    tryMe += Path.GetExtension(baseName);   // Path.GetExtension already returns the leading ".".
-                }
-
-                return tryMe;
+                return false;
             }
 
-            internal override bool IsValidIteration(string path)
-            {
-                Debug.Assert(!string.IsNullOrEmpty(path), "path is null");
-
-                if (File.Exists(path) || Directory.Exists(path))
-                {
-                    return false;
-                }
-
-                // Path.ChangeExtension for "" returns trailing dot but Directory.Exists works the same for dir with and without trailing dot.
-                if (this.checkMatchingDirectory && Path.HasExtension(path) && Directory.Exists(Path.ChangeExtension(path, string.Empty)))
-                {
-                    return false;
-                }
-
-                return true;
-            }
+            // Path.ChangeExtension for "" returns trailing dot but Directory.Exists works the same for dir with and without trailing dot.
+            return !_checkMatchingDirectory || !Path.HasExtension(path) || !Directory.Exists(Path.ChangeExtension(path, string.Empty));
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/Attributes.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/Attributes.cs
index 16c91d8f4a..4b18c574a3 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/Attributes.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/Attributes.cs
@@ -1,142 +1,135 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML
+using System;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+/// <summary>
+/// Additional data needed to describe a field for automatic xml storage
+/// </summary>
+[AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+internal abstract class StoreXmlAttribute : Attribute
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
+    /// <summary>
+    /// simple xpath location. only element and attribute names can be used.
+    /// </summary>
+    public string? Location;
 
     /// <summary>
-    /// Additional data needed to describe a field for automatic xml storage
+    /// Initializes a new instance of the <see cref="StoreXmlAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal abstract class StoreXmlAttribute : Attribute
+    public StoreXmlAttribute()
     {
-        /// <summary>
-        /// simple xpath location. only element and attribute names can be used.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:AccessibleFieldsMustBeginWithUpperCaseLetter", Justification = "Reviewed. Suppression is ok here.")]
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:FieldsMustBePrivate", Justification = "Reviewed. Suppression is ok here.")]
-        public string Location;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlAttribute"/> class.
-        /// </summary>
-        public StoreXmlAttribute()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlAttribute"/> class.
-        /// </summary>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        public StoreXmlAttribute(string location)
-        {
-            this.Location = location;
-        }
     }
 
     /// <summary>
-    /// Additional info for storing simple fields with default value
+    /// Initializes a new instance of the <see cref="StoreXmlAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal sealed class StoreXmlSimpleFieldAttribute : StoreXmlAttribute
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    public StoreXmlAttribute(string? location)
     {
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Reviewed. Suppression is ok here.")]
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:FieldsMustBePrivate", Justification = "Reviewed. Suppression is ok here.")]
-        public object DefaultValue;
+        Location = location;
+    }
+}
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
-        /// </summary>
-        public StoreXmlSimpleFieldAttribute()
-        {
-        }
+/// <summary>
+/// Additional info for storing simple fields with default value
+/// </summary>
+[AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+internal sealed class StoreXmlSimpleFieldAttribute : StoreXmlAttribute
+{
+    public object? DefaultValue;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
-        /// </summary>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        public StoreXmlSimpleFieldAttribute(string location) : base(location)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
+    /// </summary>
+    public StoreXmlSimpleFieldAttribute()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
-        /// </summary>
-        /// <param name="defaultValue">
-        /// The default value.
-        /// </param>
-        public StoreXmlSimpleFieldAttribute(object defaultValue) : this(null, defaultValue)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
+    /// </summary>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    public StoreXmlSimpleFieldAttribute(string location) : base(location)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
-        /// </summary>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        /// <param name="defaultValue">
-        /// The default value.
-        /// </param>
-        public StoreXmlSimpleFieldAttribute(string location, object defaultValue)
-            : base(location)
-        {
-            this.DefaultValue = defaultValue;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
+    /// </summary>
+    /// <param name="defaultValue">
+    /// The default value.
+    /// </param>
+    public StoreXmlSimpleFieldAttribute(object defaultValue) : this(null, defaultValue)
+    {
     }
 
     /// <summary>
-    /// Storing of fields that support IXmlTestStore
+    /// Initializes a new instance of the <see cref="StoreXmlSimpleFieldAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal sealed class StoreXmlFieldAttribute : StoreXmlAttribute
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    /// <param name="defaultValue">
+    /// The default value.
+    /// </param>
+    public StoreXmlSimpleFieldAttribute(string? location, object defaultValue)
+        : base(location)
     {
-        /// <summary>
-        /// If there's no xml for the field a default instance is created or not.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:FieldsMustBePrivate", Justification = "Reviewed. Suppression is ok here.")]
-        public bool CreateDefaultInstance = CreateDefaultInstanceDefault;
+        DefaultValue = defaultValue;
+    }
+}
 
-        /// <summary>
-        /// Default value
-        /// </summary>
-        internal static readonly bool CreateDefaultInstanceDefault = true;
+/// <summary>
+/// Storing of fields that support IXmlTestStore
+/// </summary>
+[AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+internal sealed class StoreXmlFieldAttribute : StoreXmlAttribute
+{
+    /// <summary>
+    /// If there's no xml for the field a default instance is created or not.
+    /// </summary>
+    public bool CreateDefaultInstance = CreateDefaultInstanceDefault;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
-        /// </summary>
-        public StoreXmlFieldAttribute()
-        {
-        }
+    /// <summary>
+    /// Default value
+    /// </summary>
+    internal static readonly bool CreateDefaultInstanceDefault = true;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
-        /// </summary>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        /// <param name="createDefaultInstance">
-        /// The create default instance.
-        /// </param>
-        public StoreXmlFieldAttribute(string location, bool createDefaultInstance) : base(location)
-        {
-            this.CreateDefaultInstance = createDefaultInstance;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
+    /// </summary>
+    public StoreXmlFieldAttribute()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
-        /// </summary>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        public StoreXmlFieldAttribute(string location) : this(location, true)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
+    /// </summary>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    /// <param name="createDefaultInstance">
+    /// The create default instance.
+    /// </param>
+    public StoreXmlFieldAttribute(string location, bool createDefaultInstance) : base(location)
+    {
+        CreateDefaultInstance = createDefaultInstance;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreXmlFieldAttribute"/> class.
+    /// </summary>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    public StoreXmlFieldAttribute(string location) : this(location, true)
+    {
     }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlFilePersistence.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlFilePersistence.cs
index e6f72a1c71..77419e3676 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlFilePersistence.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlFilePersistence.cs
@@ -1,22 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML
-{
-    internal class XmlFilePersistence: XmlPersistence
-    {
-        #region Constants
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML;
 
-        /// <summary>
-        /// Type of the object that is persisted to the file, the object that represents the root element
-        /// </summary>
-        public const string RootObjectType = "RootObjectType";
+internal class XmlFilePersistence : XmlPersistence
+{
+    /// <summary>
+    /// Type of the object that is persisted to the file, the object that represents the root element
+    /// </summary>
+    public const string RootObjectType = "RootObjectType";
 
-        /// <summary>
-        /// The directory to where the file is being saved, or from where the file is being loaded
-        /// </summary>
-        public const string DirectoryPath = "DirectoryPath";
+    /// <summary>
+    /// The directory to where the file is being saved, or from where the file is being loaded
+    /// </summary>
+    public const string DirectoryPath = "DirectoryPath";
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlPersistence.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlPersistence.cs
index 1d3e312721..1bae61bb92 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlPersistence.cs
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/XML/XmlPersistence.cs
@@ -1,899 +1,871 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using TrxObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+
+/// <summary>
+/// The xml persistence class.
+/// </summary>
+internal class XmlPersistence
 {
-    using ObjectModel;
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text.RegularExpressions;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    using TrxObjectModel = ObjectModel;
-    using System.Text;
+    #region Types
 
     /// <summary>
-    /// The xml persistence class.
+    /// The exception type that is thrown when a duplicate key is added to a hashtable or
+    /// dictionary
     /// </summary>
-    internal class XmlPersistence
+    public class DuplicateKeyLoadException : Exception
     {
-        #region Types
+        /// <summary>
+        /// Initializes the instance
+        /// </summary>
+        /// <param name="key">Key that was a duplicate</param>
+        /// <param name="message">The duplicate-key exception message</param>
+        public DuplicateKeyLoadException(object key, string message)
+            : this(key, message, null)
+        {
+        }
 
         /// <summary>
-        /// The exception type that is thrown when a duplicate key is added to a hashtable or
-        /// dictionary
+        /// Initializes the instance
         /// </summary>
-        public class DuplicateKeyLoadException : Exception
+        /// <param name="key">Key that was a duplicate</param>
+        /// <param name="message">The duplicate-key exception message</param>
+        /// <param name="innerException">The inner exception</param>
+        public DuplicateKeyLoadException(object key, string message, Exception? innerException)
+            : base(message, innerException)
         {
-            #region Constructors
+            Key = key;
+        }
 
-            /// <summary>
-            /// Initializes the instance
-            /// </summary>
-            /// <param name="key">Key that was a duplicate</param>
-            /// <param name="message">The duplicate-key exception message</param>
-            public DuplicateKeyLoadException(object key, string message)
-                : this(key, message, null)
-            {
-            }
+        /// <summary>
+        /// Gets the key that was a duplicate
+        /// </summary>
+        public object Key
+        {
+            get;
+            private set;
+        }
 
-            /// <summary>
-            /// Initializes the instance
-            /// </summary>
-            /// <param name="key">Key that was a duplicate</param>
-            /// <param name="message">The duplicate-key exception message</param>
-            /// <param name="innerException">The inner exception</param>
-            public DuplicateKeyLoadException(object key, string message, Exception innerException)
-                : base(message, innerException)
-            {
-                this.Key = key;
-            }
+    }
 
-            #endregion
+    #endregion
 
-            #region Properties
+    /// <summary>This is how we persist date time except DateTime.MinValue.</summary>
+    private const string DateTimePersistenceFormat = "yyyy'-'MM'-'ddTHH':'mm':'ss'.'fffffffzzz";
 
-            /// <summary>
-            /// Gets the key that was a duplicate
-            /// </summary>
-            public object Key
-            {
-                get;
-                private set;
-            }
+    /// <summary>Special case to persist DateTime.MinValue.</summary>
+    private const string DateTimeUtcPersistenceFormat = "u";
 
-            #endregion
-        }
+    private const string DefaultNamespacePrefixEquivalent = "dpe";
 
-        #endregion
+    private static readonly string EmptyGuidString = Guid.Empty.ToString();
 
-        #region Fields
+    private static readonly Type BoolType = typeof(bool);
+    private static readonly Type ByteArrayType = typeof(byte[]);
+    private static readonly Type DateTimeType = typeof(DateTime);
 
-        /// <summary>This is how we persist date time except DateTime.MinValue.</summary>
-        private const string DateTimePersistenceFormat = "yyyy'-'MM'-'ddTHH':'mm':'ss'.'fffffffzzz";
+    /// <summary>
+    /// this is the top level cache: Type->field information
+    /// </summary>
+    private static readonly Dictionary<Type, IEnumerable<FieldPersistenceInfo>> TypeToPersistenceInfoCache =
+        new();
 
-        /// <summary>Special case to persist DateTime.MinValue.</summary>
-        private const string DateTimeUtcPersistenceFormat = "u";
+    /// <summary>
+    /// Optimization: avoid re-parsing same query multiple times
+    /// </summary>
+    private static readonly Dictionary<string, string> QueryCache = new();
 
-        private const string DefaultNamespacePrefixEquivalent = "dpe";
+    private readonly string _prefix;
+    private readonly string _namespaceUri;
+    private readonly XmlNamespaceManager _xmlNamespaceManager = new(new NameTable());
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="XmlPersistence"/> class.
+    /// </summary>
+    public XmlPersistence()
+    {
+        _prefix = string.Empty;
+        _namespaceUri = "http://microsoft.com/schemas/VisualStudio/TeamTest/2010";
 
-        private static readonly string EmptyGuidString = Guid.Empty.ToString();
+        if (!string.IsNullOrEmpty(_prefix))
+        {
+            // Register the specified prefix with the specified namespace
+            _xmlNamespaceManager.AddNamespace(_prefix, _namespaceUri);
+        }
 
-        private static readonly Type BoolType = typeof(bool);
-        private static readonly Type ByteArrayType = typeof(byte[]);
-        private static readonly Type DateTimeType = typeof(DateTime);
+        if (!string.IsNullOrEmpty(_namespaceUri))
+        {
+            // Register a prefix for the namespace. This is needed for XPath queries, since an element in an XPath
+            // expression without a prefix is assumed to be in the empty namespace, and NOT in the provided XML namespace
+            // manager's default namespace (for some reason). So, we need to register a prefix that we will prepend to
+            // elements that are in this namespace (if it is not already the empty namespace) in XPath queries so that we
+            // will be able to find elements, and so that callers will not need to provide the appropriate prefixes.
+            //
+            // See the documentation for the 'XmlNamespaceManager.AddNamespace' method, specifically the Note for the
+            // 'prefix' parameter.
+            _xmlNamespaceManager.AddNamespace(DefaultNamespacePrefixEquivalent, _namespaceUri);
+        }
+    }
 
-        /// <summary>
-        /// this is the top level cache: Type->field information
-        /// </summary>
-        private static Dictionary<Type, IEnumerable<FieldPersistenceInfo>> typeToPersistenceInfoCache =
-            new Dictionary<Type, IEnumerable<FieldPersistenceInfo>>();
+    /// <summary>
+    /// Create root element.
+    /// </summary>
+    /// <param name="name">
+    /// Name of the root element
+    /// </param>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public XmlElement CreateRootElement(string name)
+    {
+        return CreateRootElement(name, _namespaceUri);
+    }
 
-        /// <summary>
-        /// Optimization: avoid re-parsing same query multiple times
-        /// </summary>
-        private static Dictionary<string, string> queryCache = new Dictionary<string, string>();
+    private XmlElement CreateRootElement(string name, string namespaceUri)
+    {
+        namespaceUri ??= _namespaceUri;
 
-        private string prefix;
-        private string namespaceUri;
-        private XmlNamespaceManager xmlNamespaceManager = new XmlNamespaceManager(new NameTable());
+        XmlDocument dom = new();
+        dom.AppendChild(dom.CreateXmlDeclaration("1.0", "UTF-8", null));
+        return (XmlElement)dom.AppendChild(dom.CreateElement(_prefix, name, namespaceUri))!;
+    }
 
-        #endregion Fields
+    #region PublicSaveDataInTrx
 
-        #region Constructors
+    /// <summary>
+    /// Save single fields.
+    /// </summary>
+    /// <param name="parentXml">
+    /// The parent xml.
+    /// </param>
+    /// <param name="instance">
+    /// The instance.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void SaveSingleFields(XmlElement parentXml, object instance, XmlTestStoreParameters? parameters)
+    {
+        SaveSingleFields(parentXml, instance, null, parameters);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlPersistence"/> class.
-        /// </summary>
-        public XmlPersistence()
+    /// <summary>
+    /// Based on the StoreXml* attributes saves simple fields
+    /// </summary>
+    /// <param name="parentXml">
+    /// Parent xml
+    /// </param>
+    /// <param name="instance">
+    /// object to save
+    /// </param>
+    /// <param name="requestedType">
+    /// The requested Type.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void SaveSingleFields(XmlElement parentXml, object? instance, Type? requestedType, XmlTestStoreParameters? parameters)
+    {
+        if (instance == null)
         {
-            this.prefix = string.Empty;
-            this.namespaceUri = "http://microsoft.com/schemas/VisualStudio/TeamTest/2010";
+            return; // nothing to do
+        }
+
+        Type type = requestedType ?? instance.GetType();
 
-            if (!string.IsNullOrEmpty(this.prefix))
+        foreach (FieldPersistenceInfo info in GetFieldInfos(type))
+        {
+            object? fieldValue = info.FieldInfo.GetValue(instance);
+            if (fieldValue == null)
             {
-                // Register the specified prefix with the specified namespace
-                this.xmlNamespaceManager.AddNamespace(this.prefix, this.namespaceUri);
+                continue;
             }
 
-            if (!string.IsNullOrEmpty(this.namespaceUri))
+            if (info.FieldAttribute != null)
             {
-                // Register a prefix for the namespace. This is needed for XPath queries, since an element in an XPath
-                // expression without a prefix is assumed to be in the empty namespace, and NOT in the provided XML namespace
-                // manager's default namespace (for some reason). So, we need to register a prefix that we will prepend to
-                // elements that are in this namespace (if it is not already the empty namespace) in XPath queries so that we
-                // will be able to find elements, and so that callers will not need to provide the appropriate prefixes.
-                //
-                // See the documentation for the 'XmlNamespaceManager.AddNamespace' method, specifically the Note for the
-                // 'prefix' parameter.
-                this.xmlNamespaceManager.AddNamespace(DefaultNamespacePrefixEquivalent, this.namespaceUri);
+                SaveObject(fieldValue, parentXml, info.Location, parameters);
+            }
+            else if (info.SimpleFieldAttribute != null)
+            {
+                SaveSimpleField(parentXml, info.Location!, fieldValue, info.SimpleFieldAttribute.DefaultValue);
             }
         }
+    }
 
-        #endregion Constructors
-
-        /// <summary>
-        /// Create root element.
-        /// </summary>
-        /// <param name="name">
-        /// Name of the root element
-        /// </param>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        public XmlElement CreateRootElement(string name)
+    /// <summary>
+    /// Based on the StoreXml* attributes saves simple fields
+    /// </summary>
+    /// <param name="objectToSave">
+    /// The object to save.
+    /// </param>
+    /// <param name="parentXml">
+    /// The parent xml.
+    /// </param>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void SaveObject(object? objectToSave, XmlElement parentXml, string? location, XmlTestStoreParameters? parameters)
+    {
+        if (objectToSave == null || location == null)
         {
-            return this.CreateRootElement(name, this.namespaceUri);
+            return;
         }
 
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private XmlElement CreateRootElement(string name, string namespaceUri)
+        string? nameSpaceUri = _namespaceUri;
+        if (objectToSave is IXmlTestStoreCustom customStore)
         {
-            if (namespaceUri == null)
-            {
-                namespaceUri = this.namespaceUri;
-            }
-
-            XmlDocument dom = new XmlDocument();
-            dom.AppendChild(dom.CreateXmlDeclaration("1.0", "UTF-8", null));
-            return (XmlElement)dom.AppendChild(dom.CreateElement(this.prefix, name, namespaceUri));
+            nameSpaceUri = customStore.NamespaceUri;
         }
 
-        #region PublicSaveDataInTrx
+        XmlNode? xmlNode = EnsureLocationExists(parentXml, location, nameSpaceUri);
+        TPDebug.Assert(xmlNode != null, "EnsureLocationExists should have returned a node");
+        SaveObject(objectToSave, xmlNode, parameters);
 
-        /// <summary>
-        /// Save single fields.
-        /// </summary>
-        /// <param name="parentXml">
-        /// The parent xml.
-        /// </param>
-        /// <param name="instance">
-        /// The instance.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void SaveSingleFields(XmlElement parentXml, object instance, XmlTestStoreParameters parameters)
+        if (xmlNode is XmlElement element &&
+            !element.HasAttributes &&
+            !element.HasChildNodes &&
+            element.InnerText.IsNullOrEmpty())
         {
-            this.SaveSingleFields(parentXml, instance, null, parameters);
+            element.ParentNode!.RemoveChild(element);    // get rid of empty elements to keep the xml clean
         }
+    }
 
-        /// <summary>
-        /// Based on the StoreXml* attributes saves simple fields
-        /// </summary>
-        /// <param name="parentXml">
-        /// Parent xml
-        /// </param>
-        /// <param name="instance">
-        /// object to save
-        /// </param>
-        /// <param name="requestedType">
-        /// The requested Type.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void SaveSingleFields(XmlElement parentXml, object instance, Type requestedType, XmlTestStoreParameters parameters)
-        {
-            if (instance == null)
-            {
-                return; // nothing to do
-            }
-
-            Type type = requestedType ?? instance.GetType();
+    /// <summary>
+    /// Save object.
+    /// </summary>
+    /// <param name="objectToSave">
+    /// The object to save.
+    /// </param>
+    /// <param name="nodeToSaveAt">
+    /// The node to save at.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public static void SaveObject(object objectToSave, XmlNode nodeToSaveAt, XmlTestStoreParameters? parameters)
+    {
+        SaveObject(objectToSave, nodeToSaveAt, parameters, null);
+    }
 
-            foreach (FieldPersistenceInfo info in GetFieldInfos(type))
-            {
-                object fieldValue = info.FieldInfo.GetValue(instance);
-                if (fieldValue != null)
-                {
-                    if (info.FieldAttribute != null)
-                    {
-                        this.SaveObject(fieldValue, parentXml, info.Location, parameters);
-                    }
-                    else if (info.SimpleFieldAttribute != null)
-                    {
-                        this.SaveSimpleField(parentXml, info.Location, fieldValue, info.SimpleFieldAttribute.DefaultValue);
-                    }
-                }
-            }
+    /// <summary>
+    /// Save the object.
+    /// </summary>
+    /// <param name="objectToSave">
+    /// The object to save.
+    /// </param>
+    /// <param name="nodeToSaveAt">
+    /// The node to save at.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    /// <param name="defaultValue">
+    /// The default value.
+    /// </param>
+    public static void SaveObject(object? objectToSave, XmlNode nodeToSaveAt, XmlTestStoreParameters? parameters, object? defaultValue)
+    {
+        if (objectToSave == null)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Based on the StoreXml* attributes saves simple fields
-        /// </summary>
-        /// <param name="objectToSave">
-        /// The object to save.
-        /// </param>
-        /// <param name="parentXml">
-        /// The parent xml.
-        /// </param>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void SaveObject(object objectToSave, XmlElement parentXml, string location, XmlTestStoreParameters parameters)
-        {
-            if (objectToSave != null && location != null)
-            {
-                string nameSpaceUri = this.namespaceUri;
-                if (objectToSave is IXmlTestStoreCustom customStore)
-                {
-                    nameSpaceUri = customStore.NamespaceUri;
-                }
-
-                XmlNode xmlNode = this.EnsureLocationExists(parentXml, location, nameSpaceUri);
-                this.SaveObject(objectToSave, xmlNode, parameters);
-
-                if (xmlNode is XmlElement element &&
-                    !element.HasAttributes &&
-                    !element.HasChildNodes &&
-                    string.IsNullOrEmpty(element.InnerText))
-                {
-                    element.ParentNode.RemoveChild(element);    // get rid of empty elements to keep the xml clean
-                }
-            }
+        if (objectToSave is IXmlTestStore persistable)
+        {
+            persistable.Save((XmlElement)nodeToSaveAt, parameters);
         }
-
-        /// <summary>
-        /// Save object.
-        /// </summary>
-        /// <param name="objectToSave">
-        /// The object to save.
-        /// </param>
-        /// <param name="nodeToSaveAt">
-        /// The node to save at.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void SaveObject(object objectToSave, XmlNode nodeToSaveAt, XmlTestStoreParameters parameters)
+        else
         {
-            this.SaveObject(objectToSave, nodeToSaveAt, parameters, null);
+            SaveSimpleData(objectToSave, nodeToSaveAt, defaultValue);
         }
+    }
 
-        /// <summary>
-        /// Save the object.
-        /// </summary>
-        /// <param name="objectToSave">
-        /// The object to save.
-        /// </param>
-        /// <param name="nodeToSaveAt">
-        /// The node to save at.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        /// <param name="defaultValue">
-        /// The default value.
-        /// </param>
-        public void SaveObject(object objectToSave, XmlNode nodeToSaveAt, XmlTestStoreParameters parameters, object defaultValue)
-        {
-            if (objectToSave != null)
-            {
-                if (objectToSave is IXmlTestStore persistable)
-                {
-                    persistable.Save((XmlElement)nodeToSaveAt, parameters);
-                }
-                else
-                {
-                    this.SaveSimpleData(objectToSave, nodeToSaveAt, defaultValue);
-                }
-            }
+    /// <summary>
+    /// Save simple field.
+    /// </summary>
+    /// <param name="xml">
+    /// The xml.
+    /// </param>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    /// <param name="defaultValue">
+    /// The default value.
+    /// </param>
+    public void SaveSimpleField(XmlElement xml, string location, object? value, object? defaultValue)
+    {
+        if (value == null || value.Equals(defaultValue))
+        {
+            return;
         }
 
-        /// <summary>
-        /// Save simple field.
-        /// </summary>
-        /// <param name="xml">
-        /// The xml.
-        /// </param>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="defaultValue">
-        /// The default value.
-        /// </param>
-        public void SaveSimpleField(XmlElement xml, string location, object value, object defaultValue)
-        {
-            if (value == null || value.Equals(defaultValue))
-            {
-                return;
-            }
+        XmlNode? saveTarget = EnsureLocationExists(xml, location);
+        TPDebug.Assert(saveTarget != null, "EnsureLocationExists should have returned a node");
+        SaveSimpleData(value, saveTarget, defaultValue);
+    }
 
-            XmlNode saveTarget = this.EnsureLocationExists(xml, location);
-            this.SaveSimpleData(value, saveTarget, defaultValue);
-        }
+    /// <summary>
+    /// Save GUID.
+    /// </summary>
+    /// <param name="xml">
+    /// The xml.
+    /// </param>
+    /// <param name="location">
+    /// The location.
+    /// </param>
+    /// <param name="guid">
+    /// The GUID.
+    /// </param>
+    public void SaveGuid(XmlElement xml, string location, Guid guid)
+    {
+        SaveSimpleField(xml, location, guid.ToString(), EmptyGuidString);
+    }
 
-        /// <summary>
-        /// Save GUID.
-        /// </summary>
-        /// <param name="xml">
-        /// The xml.
-        /// </param>
-        /// <param name="location">
-        /// The location.
-        /// </param>
-        /// <param name="guid">
-        /// The GUID.
-        /// </param>
-        public void SaveGuid(XmlElement xml, string location, Guid guid)
+    public void SaveHashtable(Hashtable ht, XmlElement element, string location, string keyLocation, string? valueLocation, string itemElementName, XmlTestStoreParameters? parameters)
+    {
+        if (ht == null || ht.Count <= 0)
         {
-            this.SaveSimpleField(xml, location, guid.ToString(), EmptyGuidString);
+            return;
         }
 
-        public void SaveHashtable(Hashtable ht, XmlElement element, string location, string keyLocation, string valueLocation, string itemElementName, XmlTestStoreParameters parameters)
+        XmlElement? dictionaryElement = (XmlElement?)EnsureLocationExists(element, location);
+        TPDebug.Assert(dictionaryElement != null, "EnsureLocationExists should have returned a node");
+        foreach (DictionaryEntry de in ht)
         {
-            if (ht != null && ht.Count > 0)
-            {
-                XmlElement dictionaryElement = (XmlElement)this.EnsureLocationExists(element, location);
-                foreach (DictionaryEntry de in ht)
-                {
-                    XmlElement itemXml = this.CreateElement(dictionaryElement, itemElementName);
+            XmlElement itemXml = CreateElement(dictionaryElement, itemElementName);
 
-                    this.SaveObject(de.Key, itemXml, keyLocation, parameters);
-                    this.SaveObject(de.Value, itemXml, valueLocation, parameters);
-                }
-            }
+            SaveObject(de.Key, itemXml, keyLocation, parameters);
+            SaveObject(de.Value, itemXml, valueLocation, parameters);
         }
+    }
 
-        public void SaveStringDictionary(StringDictionary dict, XmlElement element, string location, string keyLocation, string valueLocation, string itemElementName, XmlTestStoreParameters parameters)
+    public void SaveStringDictionary(StringDictionary dict, XmlElement element, string location, string keyLocation, string valueLocation, string itemElementName, XmlTestStoreParameters parameters)
+    {
+        if (dict == null || dict.Count <= 0)
         {
-            if (dict != null && dict.Count > 0)
-            {
-                XmlElement dictionaryElement = (XmlElement)EnsureLocationExists(element, location);
-                foreach (DictionaryEntry de in dict)
-                {
-                    XmlElement itemXml = this.CreateElement(dictionaryElement, itemElementName);
-
-                    this.SaveObject(de.Key, itemXml, keyLocation, parameters);
-                    this.SaveObject(de.Value, itemXml, valueLocation, parameters);
-                }
-            }
+            return;
         }
 
-        #region Lists
-        /// <summary>
-        /// Save list of object .
-        /// </summary>
-        /// <param name="list">
-        /// The list.
-        /// </param>
-        /// <param name="element">
-        /// The parent element.
-        /// </param>
-        /// <param name="listXmlElement">
-        /// The list xml element.
-        /// </param>
-        /// <param name="itemLocation">
-        /// The item location.
-        /// </param>
-        /// <param name="itemElementName">
-        /// The item element name.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        public void SaveIEnumerable(IEnumerable list, XmlElement element, string listXmlElement, string itemLocation, string itemElementName, XmlTestStoreParameters parameters)
-        {
-            if (list != null && list.GetEnumerator().MoveNext())
-            {
-                XmlElement listElement = (XmlElement)this.EnsureLocationExists(element, listXmlElement);
-                foreach (object item in list)
-                {
-                    XmlElement itemXml = this.CreateElement(listElement, itemElementName, item);
-                    this.SaveObject(item, itemXml, itemLocation, parameters);
-                }
-            }
-        }
+        XmlElement? dictionaryElement = (XmlElement?)EnsureLocationExists(element, location);
+        TPDebug.Assert(dictionaryElement != null, "EnsureLocationExists should have returned a node");
+        foreach (DictionaryEntry de in dict)
+        {
+            XmlElement itemXml = CreateElement(dictionaryElement, itemElementName);
 
-        /// <summary>
-        /// Save list.
-        /// </summary>
-        /// <param name="list">
-        /// The list.
-        /// </param>
-        /// <param name="element">
-        /// The element.
-        /// </param>
-        /// <param name="listXmlElement">
-        /// The list xml element.
-        /// </param>
-        /// <param name="itemLocation">
-        /// The item location.
-        /// </param>
-        /// <param name="itemElementName">
-        /// The item element name.
-        /// </param>
-        /// <param name="parameters">
-        /// The parameters.
-        /// </param>
-        /// <typeparam name="V"> Generic parameter
-        /// </typeparam>
-        public void SaveList<V>(IList<V> list, XmlElement element, string listXmlElement, string itemLocation, string itemElementName, XmlTestStoreParameters parameters)
-        {
-            if (list != null && list.Count > 0)
-            {
-                XmlElement listElement = (XmlElement)this.EnsureLocationExists(element, listXmlElement);
-                foreach (V item in list)
-                {
-                    XmlElement itemXml = this.CreateElement(listElement, itemElementName, item);
-                    this.SaveObject(item, itemXml, itemLocation, parameters);
-                }
-            }
+            SaveObject(de.Key, itemXml, keyLocation, parameters);
+            SaveObject(de.Value, itemXml, valueLocation, parameters);
         }
+    }
 
-        #region Counters
+    #region Lists
+    /// <summary>
+    /// Save list of object .
+    /// </summary>
+    /// <param name="list">
+    /// The list.
+    /// </param>
+    /// <param name="element">
+    /// The parent element.
+    /// </param>
+    /// <param name="listXmlElement">
+    /// The list xml element.
+    /// </param>
+    /// <param name="itemLocation">
+    /// The item location.
+    /// </param>
+    /// <param name="itemElementName">
+    /// The item element name.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    public void SaveIEnumerable(IEnumerable? list, XmlElement element, string listXmlElement, string itemLocation, string? itemElementName, XmlTestStoreParameters? parameters)
+    {
+        if (list == null || !list.GetEnumerator().MoveNext())
+        {
+            return;
+        }
 
-        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
-        public void SaveCounters(XmlElement xml, string location, int[] counters)
+        XmlElement? listElement = (XmlElement?)EnsureLocationExists(element, listXmlElement);
+        TPDebug.Assert(listElement != null, "EnsureLocationExists should have returned a node");
+        foreach (object item in list)
         {
-            xml = (XmlElement)LocationToXmlNode(xml, location);
+            XmlElement itemXml = CreateElement(listElement, itemElementName, item);
+            SaveObject(item, itemXml, itemLocation, parameters);
+        }
+    }
 
-            for (int i = 0; i < counters.Length; i++)
-            {
-                TrxObjectModel.TestOutcome outcome = (TrxObjectModel.TestOutcome)i;
-                string attributeName = outcome.ToString();
-                attributeName = attributeName.Substring(0, 1).ToLowerInvariant() + attributeName.Substring(1);
+    /// <summary>
+    /// Save list.
+    /// </summary>
+    /// <param name="list">
+    /// The list.
+    /// </param>
+    /// <param name="element">
+    /// The element.
+    /// </param>
+    /// <param name="listXmlElement">
+    /// The list xml element.
+    /// </param>
+    /// <param name="itemLocation">
+    /// The item location.
+    /// </param>
+    /// <param name="itemElementName">
+    /// The item element name.
+    /// </param>
+    /// <param name="parameters">
+    /// The parameters.
+    /// </param>
+    /// <typeparam name="V"> Generic parameter
+    /// </typeparam>
+    public void SaveList<V>(IList<V> list, XmlElement element, string listXmlElement, string itemLocation, string itemElementName, XmlTestStoreParameters parameters)
+        where V : notnull
+    {
+        if (list == null || list.Count <= 0)
+        {
+            return;
+        }
 
-                xml.SetAttribute(attributeName, counters[i].ToString(CultureInfo.InvariantCulture));
-            }
+        XmlElement? listElement = (XmlElement?)EnsureLocationExists(element, listXmlElement);
+        TPDebug.Assert(listElement != null, "EnsureLocationExists should have returned a node");
+        foreach (V item in list)
+        {
+            XmlElement itemXml = CreateElement(listElement, itemElementName, item);
+            SaveObject(item, itemXml, itemLocation, parameters);
         }
+    }
 
-        #endregion Counters
+    #region Counters
 
-        #endregion List
+    public void SaveCounters(XmlElement xml, string location, int[] counters)
+    {
+        xml = (XmlElement)LocationToXmlNode(xml, location)!;
 
-        internal static void SaveUsingReflection(XmlElement element, object instance, Type requestedType, XmlTestStoreParameters parameters)
+        for (int i = 0; i < counters.Length; i++)
         {
-            XmlPersistence helper = new XmlPersistence();
-            helper.SaveSingleFields(element, instance, requestedType, parameters);
+            TrxObjectModel.TestOutcome outcome = (TrxObjectModel.TestOutcome)i;
+            string attributeName = outcome.ToString();
+            attributeName = attributeName.Substring(0, 1).ToLowerInvariant() + attributeName.Substring(1);
+
+            xml.SetAttribute(attributeName, counters[i].ToString(CultureInfo.InvariantCulture));
         }
+    }
 
-        #endregion PublicSaveDataInTrx
+    #endregion Counters
 
-        #region Utilities
+    #endregion List
 
-        #region Optimization: Reflection caching
+    internal static void SaveUsingReflection(XmlElement element, object instance, Type? requestedType, XmlTestStoreParameters? parameters)
+    {
+        XmlPersistence helper = new();
+        helper.SaveSingleFields(element, instance, requestedType, parameters);
+    }
 
-        /// <summary>
-        /// Updates the cache if needed and gets the field info collection
-        /// </summary>
-        /// <param name="type">
-        /// The type.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable"/>.
-        /// </returns>
-        private static IEnumerable<FieldPersistenceInfo> GetFieldInfos(Type type)
-        {
-            if (!typeToPersistenceInfoCache.TryGetValue(type, out var toReturn))
-            {
-                toReturn = ReflectFields(type);
-                lock (typeToPersistenceInfoCache)
-                {
-                    if (!typeToPersistenceInfoCache.TryGetValue(type, out var checkCache))
-                    {
-                        typeToPersistenceInfoCache.Add(type, toReturn);
-                    }
-                }
-            }
+    #endregion PublicSaveDataInTrx
 
-            return toReturn;
-        }
+    #region Utilities
 
-        /// <summary>
-        /// EXPENSIVE! Uses reflection to build a cache item of information about the type and its fields
-        /// </summary>
-        /// <param name="type">the type to reflect on</param>
-        /// <returns>collection of field information</returns>
-        private static IEnumerable<FieldPersistenceInfo> ReflectFields(Type type)
-        {
-            List<FieldPersistenceInfo> toReturn = new List<FieldPersistenceInfo>();
+    #region Optimization: Reflection caching
 
-            foreach (
-                FieldInfo reflectedFieldInfo in
-                    type.GetTypeInfo().GetFields(
-                        BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly))
+    /// <summary>
+    /// Updates the cache if needed and gets the field info collection
+    /// </summary>
+    /// <param name="type">
+    /// The type.
+    /// </param>
+    /// <returns>
+    /// The <see cref="IEnumerable"/>.
+    /// </returns>
+    private static IEnumerable<FieldPersistenceInfo> GetFieldInfos(Type type)
+    {
+        if (!TypeToPersistenceInfoCache.TryGetValue(type, out var toReturn))
+        {
+            toReturn = ReflectFields(type);
+            lock (TypeToPersistenceInfoCache)
             {
-                FieldPersistenceInfo info = new FieldPersistenceInfo(reflectedFieldInfo);
-
-                // only fields with known location need to be persisted
-                if (!string.IsNullOrEmpty(info.Location))
+                if (!TypeToPersistenceInfoCache.TryGetValue(type, out var checkCache))
                 {
-                    toReturn.Add(info);
+                    TypeToPersistenceInfoCache.Add(type, toReturn);
                 }
             }
-
-            return toReturn;
         }
 
-        #endregion Optimization: Reflection caching
+        return toReturn;
+    }
 
-        /// <summary>
-        /// Convert dateTime to string.
-        /// </summary>
-        /// <param name="dateTime">
-        /// The date time.
-        /// </param>
-        /// <returns>
-        /// The <see cref="string"/>.
-        /// </returns>
-        private static string DateTimeToString(DateTime dateTime)
-        {
-            if (dateTime == DateTime.MinValue)
-            {
-                // DateTime.MinValue has Kind.Unspecified and thus it does not make any sense to convert it to local/universal.
-                // Also note that we use format w/o time zones to persist DateTime.MinValue.
-                return dateTime.ToString(DateTimeUtcPersistenceFormat, CultureInfo.InvariantCulture.DateTimeFormat);
-            }
-            else
-            {
-                // Ensure that the datetime value is in local time..
-                // This is needed as the persistence format we use needs the datetime to be in local time..
-                DateTime localDateTime = dateTime.ToLocalTime();
-                return localDateTime.ToString(DateTimePersistenceFormat, CultureInfo.InvariantCulture.DateTimeFormat);
-            }
-        }
+    /// <summary>
+    /// EXPENSIVE! Uses reflection to build a cache item of information about the type and its fields
+    /// </summary>
+    /// <param name="type">the type to reflect on</param>
+    /// <returns>collection of field information</returns>
+    private static IEnumerable<FieldPersistenceInfo> ReflectFields(Type type)
+    {
+        List<FieldPersistenceInfo> toReturn = new();
 
-        private static string GetFieldLocation(FieldInfo fieldInfo)
+        foreach (
+            FieldInfo reflectedFieldInfo in
+            type.GetFields(
+                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly))
         {
-            string location = null;
+            FieldPersistenceInfo info = new(reflectedFieldInfo);
 
-            StoreXmlAttribute locationAttribute = GetAttribute<StoreXmlAttribute>(fieldInfo);
-            if (locationAttribute != null)
+            // only fields with known location need to be persisted
+            if (!string.IsNullOrEmpty(info.Location))
             {
-                location = locationAttribute.Location ?? GetDefaultFieldLocation(fieldInfo);
+                toReturn.Add(info);
             }
-
-            return location;
         }
 
-        private static string GetDefaultFieldLocation(FieldInfo fieldInfo)
-        {
-            string fieldName = fieldInfo.Name;
-            string defaultFieldLocation = fieldName.StartsWith("m_", StringComparison.Ordinal) ? fieldName.Substring(2, fieldName.Length - 2) : fieldName;
+        return toReturn;
+    }
 
-            if (!ImplementsIXmlTestStore(fieldInfo.FieldType))
-            {
-                defaultFieldLocation = '@' + defaultFieldLocation;
-            }
+    #endregion Optimization: Reflection caching
 
-            return defaultFieldLocation;
+    /// <summary>
+    /// Convert dateTime to string.
+    /// </summary>
+    /// <param name="dateTime">
+    /// The date time.
+    /// </param>
+    /// <returns>
+    /// The <see cref="string"/>.
+    /// </returns>
+    private static string DateTimeToString(DateTime dateTime)
+    {
+        if (dateTime == DateTime.MinValue)
+        {
+            // DateTime.MinValue has Kind.Unspecified and thus it does not make any sense to convert it to local/universal.
+            // Also note that we use format w/o time zones to persist DateTime.MinValue.
+            return dateTime.ToString(DateTimeUtcPersistenceFormat, CultureInfo.InvariantCulture.DateTimeFormat);
         }
-
-        private static bool ImplementsIXmlTestStore(Type type)
+        else
         {
-            return type.GetTypeInfo().GetInterface(typeof(IXmlTestStore).Name) != null;
+            // Ensure that the datetime value is in local time..
+            // This is needed as the persistence format we use needs the datetime to be in local time..
+            DateTime localDateTime = dateTime.ToLocalTime();
+            return localDateTime.ToString(DateTimePersistenceFormat, CultureInfo.InvariantCulture.DateTimeFormat);
         }
+    }
 
-        private static T GetAttribute<T>(FieldInfo fieldInfo) where T : Attribute
+    private static string? GetFieldLocation(FieldInfo fieldInfo)
+    {
+        string? location = null;
+
+        StoreXmlAttribute? locationAttribute = GetAttribute<StoreXmlAttribute>(fieldInfo);
+        if (locationAttribute != null)
         {
-            var attributes = fieldInfo.GetCustomAttributes(typeof(T), false).ToArray();
+            location = locationAttribute.Location ?? GetDefaultFieldLocation(fieldInfo);
+        }
 
-            if (attributes.Length > 0)
-            {
-                return (T)attributes[0];
-            }
+        return location;
+    }
 
-            return default;
-        }
+    private static string GetDefaultFieldLocation(FieldInfo fieldInfo)
+    {
+        string fieldName = fieldInfo.Name;
+        string defaultFieldLocation = fieldName.StartsWith("m_", StringComparison.Ordinal) ? fieldName.Substring(2, fieldName.Length - 2) : fieldName;
 
-        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Reviewed. Suppression is OK here.")]
-        private void SaveSimpleData(object value, XmlNode nodeToSaveAt, object defaultValue)
+        if (!ImplementsIXmlTestStore(fieldInfo.FieldType))
         {
-            if (value == null || value.Equals(defaultValue))
-            {
-                return;
-            }
+            defaultFieldLocation = '@' + defaultFieldLocation;
+        }
 
-            Type valueType = value.GetType();
+        return defaultFieldLocation;
+    }
 
-            string valueToSave;
-            if (valueType == BoolType)
-            {
-                valueToSave = value.ToString().ToLowerInvariant();
-            }
-            else if (valueType == ByteArrayType)
-            {
-                // Use only for Arrays, Collections and Lists. E.g. string is also IEnumerable.
-                valueToSave = Convert.ToBase64String(value as byte[]);
-            }
-            else if (valueType == DateTimeType)
-            {
-                // always save as a sortable date time with fractional seconds.
-                valueToSave = DateTimeToString((DateTime)value);
-            }
-            else
-            {
-                // use the appropriate type converter to get a culture invariant string.
-                try
-                {
-                    TypeConverter convert = TypeDescriptor.GetConverter(valueType);
-                    valueToSave = convert.ConvertToInvariantString(value);
-                }
-                catch (NotSupportedException nosupportEx)
-                {
-                    EqtTrace.Info("TypeConverter not supported for {0} : NotSupportedException: {1}", value.ToString(), nosupportEx);
-                    valueToSave = value.ToString();
-                }
-            }
+    private static bool ImplementsIXmlTestStore(Type type)
+    {
+        return type.GetInterface(typeof(IXmlTestStore).Name) != null;
+    }
 
-            // Remove invalid char if any
-            valueToSave = RemoveInvalidXmlChar(valueToSave);
-            if (nodeToSaveAt is XmlElement elementToSaveAt)
+    private static T? GetAttribute<T>(FieldInfo fieldInfo) where T : Attribute
+    {
+        var attributes = fieldInfo.GetCustomAttributes(typeof(T), false).ToArray();
+
+        return attributes.Length > 0 ? (T)attributes[0] : default;
+    }
+
+    private static void SaveSimpleData(object? value, XmlNode nodeToSaveAt, object? defaultValue)
+    {
+        if (value == null || value.Equals(defaultValue))
+        {
+            return;
+        }
+
+        Type valueType = value.GetType();
+
+        string? valueToSave;
+        if (valueType == BoolType)
+        {
+            valueToSave = value.ToString()!.ToLowerInvariant();
+        }
+        else if (valueType == ByteArrayType)
+        {
+            // Use only for Arrays, Collections and Lists. E.g. string is also IEnumerable.
+            valueToSave = Convert.ToBase64String((byte[])value);
+        }
+        else if (valueType == DateTimeType)
+        {
+            // always save as a sortable date time with fractional seconds.
+            valueToSave = DateTimeToString((DateTime)value);
+        }
+        else
+        {
+            // use the appropriate type converter to get a culture invariant string.
+            try
             {
-                elementToSaveAt.InnerText = valueToSave;
+                TypeConverter convert = TypeDescriptor.GetConverter(valueType);
+                valueToSave = convert.ConvertToInvariantString(value);
             }
-            else
+            catch (NotSupportedException nosupportEx)
             {
-                nodeToSaveAt.Value = valueToSave;
+                EqtTrace.Info("TypeConverter not supported for {0} : NotSupportedException: {1}", value.ToString(), nosupportEx);
+                valueToSave = value.ToString();
             }
         }
 
-        public XmlNode EnsureLocationExists(XmlElement xml, string location)
+        // Remove invalid char if any
+        valueToSave = RemoveInvalidXmlChar(valueToSave);
+        if (nodeToSaveAt is XmlElement elementToSaveAt)
         {
-            return this.EnsureLocationExists(xml, location, this.namespaceUri);
+            TPDebug.Assert(valueToSave is not null, "valueToSave is null");
+            elementToSaveAt.InnerText = valueToSave;
         }
-
-        private static string RemoveInvalidXmlChar(string str)
+        else
         {
-            if (str != null)
-            {
-                // From xml spec (http://www.w3.org/TR/xml/#charsets) valid chars:
-                // #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
-
-                // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
-                // because C# support unicode character in range \u0000 to \uFFFF
-                MatchEvaluator evaluator = new MatchEvaluator(ReplaceInvalidCharacterWithUniCodeEscapeSequence);
-                string invalidChar = @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD]";
-                return Regex.Replace(str, invalidChar, evaluator);
-            }
-
-            return str;
+            nodeToSaveAt.Value = valueToSave;
         }
+    }
 
-        private static string ReplaceInvalidCharacterWithUniCodeEscapeSequence(Match match)
+    public XmlNode? EnsureLocationExists(XmlElement xml, string location)
+    {
+        return EnsureLocationExists(xml, location, _namespaceUri);
+    }
+
+    private static string? RemoveInvalidXmlChar(string? str)
+    {
+        if (str == null)
         {
-            char x = match.Value[0];
-            return string.Format(@"\u{0:x4}", (ushort)x);
+            return null;
         }
 
-        private XmlNode EnsureLocationExists(XmlElement xml, string location, string nameSpaceUri)
-        {
-            XmlNode node = this.LocationToXmlNode(xml, location);
-            if (node != null)
-            {
-                return node;
-            }
+        // From xml spec (http://www.w3.org/TR/xml/#charsets) valid chars:
+        // #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
 
-            if (location.StartsWith("@", StringComparison.Ordinal))
-            {
-                string attributeName = location.Substring(1, location.Length - 1);
-                if (xml.HasAttribute(attributeName))
-                {
-                    return xml.GetAttributeNode(attributeName);
-                }
-                else
-                {
-                    return xml.Attributes.Append(xml.OwnerDocument.CreateAttribute(attributeName));
-                }
-            }
-            else
-            {
-                string[] parts = location.Split(new char[] { '/' }, 2);
-                string firstPart = parts[0];
+        // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+        // because C# support unicode character in range \u0000 to \uFFFF
+        MatchEvaluator evaluator = new(ReplaceInvalidCharacterWithUniCodeEscapeSequence);
+        string invalidChar = @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD]";
+        return Regex.Replace(str, invalidChar, evaluator);
+    }
 
-                XmlNode firstChild = this.LocationToXmlNode(xml, firstPart);
-                if (firstChild == null)
-                {
-                    firstChild = this.CreateElement(xml, firstPart, this.GetNamespaceUriOrDefault(nameSpaceUri));
-                }
+    private static string ReplaceInvalidCharacterWithUniCodeEscapeSequence(Match match)
+    {
+        char x = match.Value[0];
+        return $@"\u{(ushort)x:x4}";
+    }
 
-                if (parts.Length > 1)
-                {
-                    return this.EnsureLocationExists((XmlElement)firstChild, parts[1]);
-                }
-                else
-                {
-                    return firstChild;
-                }
-            }
+    private XmlNode? EnsureLocationExists(XmlElement xml, string location, string? nameSpaceUri)
+    {
+        XmlNode? node = LocationToXmlNode(xml, location);
+        if (node != null)
+        {
+            return node;
         }
 
-        private string GetNamespaceUriOrDefault(string nameSpaceUri)
+        if (location.StartsWith("@", StringComparison.Ordinal))
         {
-            return nameSpaceUri ?? this.namespaceUri;
+            string attributeName = location.Substring(1, location.Length - 1);
+            return xml.HasAttribute(attributeName)
+                ? xml.GetAttributeNode(attributeName)
+                : (XmlNode)xml.Attributes.Append(xml.OwnerDocument.CreateAttribute(attributeName));
         }
-
-        /// <summary>
-        /// Creates a new element with the given name in the current (of this instance of XmlPersistence namespace)
-        /// </summary>
-        /// <param name="xml">parent xml</param>
-        /// <param name="name">element name</param>
-        /// <returns>a new XmlElement attached to the parent</returns>
-        private XmlElement CreateElement(XmlElement xml, string name)
+        else
         {
-            return this.CreateElement(xml, name, this.namespaceUri);
+            string[] parts = location.Split(['/'], 2);
+            string firstPart = parts[0];
+
+            XmlNode? firstChild = LocationToXmlNode(xml, firstPart);
+            firstChild ??= CreateElement(xml, firstPart, GetNamespaceUriOrDefault(nameSpaceUri));
+
+            return parts.Length > 1 ? EnsureLocationExists((XmlElement)firstChild, parts[1]) : firstChild;
         }
+    }
+
+    private string GetNamespaceUriOrDefault(string? nameSpaceUri)
+    {
+        return nameSpaceUri ?? _namespaceUri;
+    }
+
+    /// <summary>
+    /// Creates a new element with the given name in the current (of this instance of XmlPersistence namespace)
+    /// </summary>
+    /// <param name="xml">parent xml</param>
+    /// <param name="name">element name</param>
+    /// <returns>a new XmlElement attached to the parent</returns>
+    private XmlElement CreateElement(XmlElement xml, string name)
+    {
+        return CreateElement(xml, name, _namespaceUri);
+    }
 
-        private XmlElement CreateElement(XmlElement xml, string name, string elementNamespaceUri)
+    private XmlElement CreateElement(XmlElement xml, string name, string? elementNamespaceUri)
+    {
+        return (XmlElement)xml.AppendChild(xml.OwnerDocument.CreateElement(_prefix, name, elementNamespaceUri))!;
+    }
+
+    /// <summary>
+    /// Accepts name == null
+    /// </summary>
+    /// <param name="parent"> parent xml</param>
+    /// <param name="name">The local name of the new element. </param>
+    /// <param name="instance">the object for which element has to create</param>
+    /// <returns>a new XmlElement attached to the parent</returns>
+    private XmlElement CreateElement(XmlElement parent, string? name, object instance)
+    {
+        if (name != null)
         {
-            return (XmlElement)xml.AppendChild(xml.OwnerDocument.CreateElement(this.prefix, name, elementNamespaceUri));
+            return CreateElement(parent, name);
         }
-
-        /// <summary>
-        /// Accepts name == null
-        /// </summary>
-        /// <param name="parent"> parent xml</param>
-        /// <param name="name">The local name of the new element. </param>
-        /// <param name="instance">the object for which element has to create</param>
-        /// <returns>a new XmlElement attached to the parent</returns>
-        private XmlElement CreateElement(XmlElement parent, string name, object instance)
+        else
         {
-            if (name != null)
-            {
-                return this.CreateElement(parent, name);
-            }
-            else
-            {
-                NewElementCreateData createData = this.GetElementCreateData(instance);
-                return this.CreateElement(parent, createData.ElementName, createData.NamespaceUri);
-            }
+            NewElementCreateData createData = GetElementCreateData(instance);
+            TPDebug.Assert(createData.ElementName is not null, "createData.ElementName is null");
+            return CreateElement(parent, createData.ElementName, createData.NamespaceUri);
         }
+    }
+
+    private NewElementCreateData GetElementCreateData(object persistee)
+    {
+        TPDebug.Assert(persistee != null, "persistee is null");
 
-        private NewElementCreateData GetElementCreateData(object persistee)
+        NewElementCreateData toReturn = new();
+        if (persistee is IXmlTestStoreCustom custom)
         {
-            Debug.Assert(persistee != null, "persistee is null");
+            toReturn.ElementName = custom.ElementName;
+            toReturn.NamespaceUri = custom.NamespaceUri;
+        }
 
-            NewElementCreateData toReturn = new NewElementCreateData();
-            if (persistee is IXmlTestStoreCustom custom)
-            {
-                toReturn.ElementName = custom.ElementName;
-                toReturn.NamespaceUri = custom.NamespaceUri;
-            }
+        toReturn.ElementName ??= persistee.GetType().Name;
 
-            if (toReturn.ElementName == null)
-            {
-                toReturn.ElementName = persistee.GetType().Name;
-            }
+        toReturn.NamespaceUri ??= _namespaceUri;
 
-            if (toReturn.NamespaceUri == null)
-            {
-                toReturn.NamespaceUri = this.namespaceUri;
-            }
+        return toReturn;
+    }
+
+    private XmlNode? LocationToXmlNode(XmlElement element, string location)
+    {
+        location = ProcessXPathQuery(location);
 
-            return toReturn;
+        try
+        {
+            return element.SelectSingleNode(location, _xmlNamespaceManager);
+        }
+        catch (System.Xml.XPath.XPathException e)
+        {
+            throw new Exception($"The persistence location is invalid. Element: '{element.Name}', location: '{location}'", e);
         }
+    }
 
-        private XmlNode LocationToXmlNode(XmlElement element, string location)
+    private string ProcessXPathQuery(string queryIn)
+    {
+        // If we are working with the empty namespace, there is no need to decorate elements in the XPath expression, since
+        // elements in the XPath expression that don't have a prefix will be searched for in the empty namespace.
+        if (string.IsNullOrEmpty(_namespaceUri))
         {
-            location = this.ProcessXPathQuery(location);
+            return queryIn;
+        }
 
-            try
-            {
-                return element.SelectSingleNode(location, this.xmlNamespaceManager);
-            }
-            catch (System.Xml.XPath.XPathException e)
-            {
-                throw new Exception("The persistence location is invalid. Element: '" + element.Name + "', location: '" + location + "'", e);
-            }
+        if (QueryCache.ContainsKey(queryIn))
+        {
+            return QueryCache[queryIn];
         }
 
-        private string ProcessXPathQuery(string queryIn)
+        // fix the empty namespaces to a temp prefix, so xpath query can understand them
+        string[] parts = queryIn.Split(['/'], StringSplitOptions.None);
+
+        StringBuilder query = new();
+
+        foreach (string part in parts)
         {
-            // If we are working with the empty namespace, there is no need to decorate elements in the XPath expression, since
-            // elements in the XPath expression that don't have a prefix will be searched for in the empty namespace.
-            if (string.IsNullOrEmpty(this.namespaceUri))
+            if (query.Length > 0 || queryIn.StartsWith("/", StringComparison.Ordinal))
             {
-                return queryIn;
+                query.Append('/');
             }
 
-            if (queryCache.ContainsKey(queryIn))
+            if (part != "." && part != ".." && !part.Contains(":") && (part.Length > 0) && (!part.StartsWith("@", StringComparison.Ordinal)))
             {
-                return queryCache[queryIn];
+                query.Append(DefaultNamespacePrefixEquivalent + ":");
             }
 
-            // fix the empty namespaces to a temp prefix, so xpath query can understand them
-            string[] parts = queryIn.Split(new char[] { '/' }, StringSplitOptions.None);
-
-            StringBuilder query = new StringBuilder();
-
-            foreach (string part in parts)
-            {
-                if (query.Length > 0 || queryIn.StartsWith("/", StringComparison.Ordinal))
-                {
-                    query.Append('/');
-                }
-
-                if (part != "." && part != ".." && !part.Contains(":") && (part.Length > 0) && (!part.StartsWith("@", StringComparison.Ordinal)))
-                {
-                    query.Append(DefaultNamespacePrefixEquivalent + ":");
-                }
-
-                query.Append(part);
-            }
+            query.Append(part);
+        }
 
-            string queryString = query.ToString();
-            queryCache[queryIn] = queryString;
+        string queryString = query.ToString();
+        QueryCache[queryIn] = queryString;
 
-            return queryString;
-        }
+        return queryString;
+    }
 
-        #endregion Utilities
+    #endregion Utilities
 
-        #region Types
+    #region Types
 
-        private class NewElementCreateData
-        {
-            public string NamespaceUri { get; set; }
+    private class NewElementCreateData
+    {
+        public string? NamespaceUri { get; set; }
 
-            public string ElementName { get; set; }
-        }
+        public string? ElementName { get; set; }
+    }
 
-        /// <summary>
-        /// caches information about a field
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:FieldsMustBePrivate", Justification = "Reviewed. Suppression is OK here.")]
-        private class FieldPersistenceInfo
-        {
-            internal FieldInfo FieldInfo;
+    /// <summary>
+    /// caches information about a field
+    /// </summary>
+    private class FieldPersistenceInfo
+    {
+        internal readonly FieldInfo FieldInfo;
 
-            internal string Location;
+        internal readonly string? Location;
 
-            internal StoreXmlAttribute Attribute;
+        internal readonly StoreXmlAttribute? Attribute;
 
-            internal StoreXmlSimpleFieldAttribute SimpleFieldAttribute;
+        internal readonly StoreXmlSimpleFieldAttribute? SimpleFieldAttribute;
 
-            internal StoreXmlFieldAttribute FieldAttribute;
+        internal readonly StoreXmlFieldAttribute? FieldAttribute;
 
-            internal FieldPersistenceInfo(FieldInfo fieldInfo)
-            {
-                this.FieldInfo = fieldInfo;
-                this.Location = GetFieldLocation(fieldInfo);
+        internal FieldPersistenceInfo(FieldInfo fieldInfo)
+        {
+            FieldInfo = fieldInfo;
+            Location = GetFieldLocation(fieldInfo);
 
-                this.Attribute = GetAttribute<StoreXmlAttribute>(fieldInfo);
-                this.SimpleFieldAttribute = this.Attribute as StoreXmlSimpleFieldAttribute;
-                this.FieldAttribute = this.Attribute as StoreXmlFieldAttribute;
-            }
+            Attribute = GetAttribute<StoreXmlAttribute>(fieldInfo);
+            SimpleFieldAttribute = Attribute as StoreXmlSimpleFieldAttribute;
+            FieldAttribute = Attribute as StoreXmlFieldAttribute;
         }
-
-        #endregion
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IDiscoveryContext.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IDiscoveryContext.cs
index c08b35be01..72b0886696 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IDiscoveryContext.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IDiscoveryContext.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Specifies the user specified RunSettings and framework provided context of the discovery.
+/// </summary>
+public interface IDiscoveryContext
 {
     /// <summary>
-    /// Specifies the user specified RunSettings and framework provided context of the discovery.
+    /// Runsettings specified for this request.
     /// </summary>
-    public interface IDiscoveryContext
-    {
-        /// <summary>
-        /// Runsettings specified for this request.
-        /// </summary>
-        IRunSettings RunSettings { get; }
-    }
+    IRunSettings? RunSettings { get; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs
index 4e71e2e870..19e1ed418c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs
@@ -1,31 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+/// <summary>
+/// Handle to the framework which is passed to the test executors.
+/// </summary>
+public interface IFrameworkHandle : ITestExecutionRecorder, IMessageLogger
+{
     /// <summary>
-    /// Handle to the framework which is passed to the test executors.
+    /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true
+    /// and should be used only when absolutely required as using it degrades the performance of the subsequent run.
+    /// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.
     /// </summary>
-    public interface IFrameworkHandle : ITestExecutionRecorder, IMessageLogger
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true
-        /// and should be used only when absolutely required as using it degrades the performance of the subsequent run.
-        /// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.
-        /// </summary>
-        bool EnableShutdownAfterTestRun { get; set; }
+    bool EnableShutdownAfterTestRun { get; set; }
 
-        /// <summary>
-        /// Launch the specified process with the debugger attached.
-        /// </summary>
-        /// <param name="filePath">File path to the exe to launch.</param>
-        /// <param name="workingDirectory">Working directory that process should use.</param>
-        /// <param name="arguments">Command line arguments the process should be launched with.</param>
-        /// <param name="environmentVariables">Environment variables to be set in target process</param>
-        /// <returns>Process ID of the started process.</returns>
-        int LaunchProcessWithDebuggerAttached(string filePath, string workingDirectory, string arguments, IDictionary<string, string> environmentVariables);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Launch the specified process with the debugger attached.
+    /// </summary>
+    /// <param name="filePath">File path to the exe to launch.</param>
+    /// <param name="workingDirectory">Working directory that process should use. If null, the current directory will be used.</param>
+    /// <param name="arguments">Command line arguments the process should be launched with.</param>
+    /// <param name="environmentVariables">Environment variables to be set in target process</param>
+    /// <returns>Process ID of the started process.</returns>
+    int LaunchProcessWithDebuggerAttached(string filePath, string? workingDirectory, string? arguments, IDictionary<string, string?>? environmentVariables);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle2.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle2.cs
index 9f656b590c..7b41f4cdd8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle2.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Handle to the framework which is passed to the test executors.
+/// </summary>
+public interface IFrameworkHandle2 : IFrameworkHandle
 {
     /// <summary>
-    /// Handle to the framework which is passed to the test executors.
+    /// Attach debugger to an already running process.
     /// </summary>
-    public interface IFrameworkHandle2 : IFrameworkHandle
-    {
-        /// <summary>
-        /// Attach debugger to an already running process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid);
-    }
+    /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(int pid);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs
index f80729e30c..5046496188 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunContext.cs
@@ -1,51 +1,50 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// It provides user specified runSettings and framework provided context of the run.
+/// </summary>
+public interface IRunContext : IDiscoveryContext
 {
-    using System;
-    using System.Collections.Generic;
+    /// <summary>
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </summary>
+    bool KeepAlive { get; }
+
+    /// <summary>
+    /// Whether the execution is happening in InProc or outOfProc
+    /// </summary>
+    bool InIsolation { get; }
+
+    /// <summary>
+    /// Whether the data collection is enabled or not
+    /// </summary>
+    bool IsDataCollectionEnabled { get; }
+
+    /// <summary>
+    /// Whether the test is being debugged or not.
+    /// </summary>
+    bool IsBeingDebugged { get; }
+
+    /// <summary>
+    /// Test case filter for user specified criteria which has been validated for 'supportedProperties'.
+    /// It is used only with sources. With specific test cases it will always be null.
+    /// If there is a parsing error or filter expression has unsupported properties, TestPlatformFormatException() is thrown.
+    /// </summary>
+    ITestCaseFilterExpression? GetTestCaseFilter(IEnumerable<string>? supportedProperties, Func<string, TestProperty?> propertyProvider);
+
+    /// <summary>
+    /// Directory which should be used for storing result files/deployment files etc.
+    /// </summary>
+    string? TestRunDirectory { get; }
 
     /// <summary>
-    /// It provides user specified runSettings and framework provided context of the run.
+    /// Solution Directory.
     /// </summary>
-    public interface IRunContext : IDiscoveryContext
-    {
-        /// <summary>
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </summary>
-        bool KeepAlive { get; }
-
-        /// <summary>
-        /// Whether the execution is happening in InProc or outOfProc
-        /// </summary>
-        bool InIsolation { get; }
-
-        /// <summary>
-        /// Whether the data collection is enabled or not
-        /// </summary>
-        bool IsDataCollectionEnabled { get; }
-
-        /// <summary>
-        /// Whether the test is being debugged or not.
-        /// </summary>
-        bool IsBeingDebugged { get; }
-
-        /// <summary>
-        /// Test case filter for user specified criteria which has been validated for 'supportedProperties'.
-        /// It is used only with sources. With specific test cases it will always be null.
-        /// If there is a parsing error or filter expression has unsupported properties, TestPlatformFormatException() is thrown.
-        /// </summary>
-        ITestCaseFilterExpression GetTestCaseFilter(IEnumerable<String> supportedProperties, Func<string, TestProperty> propertyProvider);
-
-        /// <summary>
-        /// Directory which should be used for storing result files/deployment files etc.
-        /// </summary>
-        string TestRunDirectory { get; }
-
-        /// <summary>
-        /// Solution Directory.
-        /// </summary>
-        string SolutionDirectory { get; }
-    }
+    string? SolutionDirectory { get; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunSettings.cs
index 847836f17c..65135af75b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IRunSettings.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Used for loading settings for a run.
+/// </summary>
+public interface IRunSettings
 {
     /// <summary>
-    /// Used for loading settings for a run.
+    /// Get the settings for the provided settings name.
     /// </summary>
-    public interface IRunSettings
-    {
-        /// <summary>
-        /// Get the settings for the provided settings name.
-        /// </summary>
-        /// <param name="settingsName">Name of the settings section to get.</param>
-        /// <returns>The settings provider for the settings or null if one was not found.</returns>
-        ISettingsProvider GetSettings(string settingsName);
+    /// <param name="settingsName">Name of the settings section to get.</param>
+    /// <returns>The settings provider for the settings or null if one was not found.</returns>
+    ISettingsProvider? GetSettings(string? settingsName);
 
-        /// <summary>
-        /// Settings used for this run.
-        /// </summary>
-        string SettingsXml { get; }
-    }
+    /// <summary>
+    /// Settings used for this run.
+    /// </summary>
+    string? SettingsXml { get; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ISettingsProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ISettingsProvider.cs
index 95549db334..9e6615d11e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ISettingsProvider.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ISettingsProvider.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System.Xml;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+/// <summary>
+/// Interface implemented to provide a section in the run settings. A class that
+/// implements this interface will be available for use if it exports its type via
+/// MEF, and if its containing assembly is placed in the Extensions folder.
+/// </summary>
+public interface ISettingsProvider
+{
     /// <summary>
-    /// Interface implemented to provide a section in the run settings. A class that
-    /// implements this interface will be available for use if it exports its type via
-    /// MEF, and if its containing assembly is placed in the Extensions folder.
+    /// Load the settings from the reader.
     /// </summary>
-    public interface ISettingsProvider
-    {
-        /// <summary>
-        /// Load the settings from the reader.
-        /// </summary>
-        /// <param name="reader">Reader to load the settings from.</param>
-        void Load(XmlReader reader);
-    }
+    /// <param name="reader">Reader to load the settings from.</param>
+    void Load(XmlReader reader);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseDiscoverySink.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseDiscoverySink.cs
index 2852239af9..89ac6231ae 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseDiscoverySink.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseDiscoverySink.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// TestCaseDiscovery sink is used by discovery extensions to communicate test cases as they are being discovered,
+/// and various discovery related events.
+/// </summary>
+public interface ITestCaseDiscoverySink
 {
     /// <summary>
-    /// TestCaseDiscovery sink is used by discovery extensions to communicate test cases as they are being discovered,
-    /// and various discovery related events.
+    /// Callback used by discovery extensions to send back testcases as they are being discovered.
     /// </summary>
-    public interface ITestCaseDiscoverySink
-    {
-        /// <summary>
-        /// Callback used by discovery extensions to send back testcases as they are being discovered.
-        /// </summary>
-        /// <param name="discoveredTest">New test discovered since last invocation.</param>
-        void SendTestCase(TestCase discoveredTest);
+    /// <param name="discoveredTest">New test discovered since last invocation.</param>
+    void SendTestCase(TestCase discoveredTest);
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseFilterExpression.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseFilterExpression.cs
index fb9932fc71..469bc5c69b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseFilterExpression.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestCaseFilterExpression.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+/// <summary>
+/// It represents expression for filtering test cases.
+/// </summary>
+public interface ITestCaseFilterExpression
+{
     /// <summary>
-    /// It represents expression for filtering test cases.
+    /// Gets original string for test case filter.
     /// </summary>
-    public interface ITestCaseFilterExpression
-    {
-        /// <summary>
-        /// Gets original string for test case filter.
-        /// </summary>
-        string TestCaseFilterValue { get; }
+    string TestCaseFilterValue { get; }
 
-        /// <summary>
-        /// Matched test case with test case filtering criteria.
-        /// </summary>
-        bool MatchTestCase(TestCase testCase, Func<string, object> propertyValueProvider);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Matched test case with test case filtering criteria.
+    /// </summary>
+    bool MatchTestCase(TestCase testCase, Func<string, object?> propertyValueProvider);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestDiscoverer.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestDiscoverer.cs
index aa8b710962..795cd67f72 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestDiscoverer.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestDiscoverer.cs
@@ -1,26 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Interface implemented to provide tests to the test platform.
+/// </summary>
+/// <remarks>
+/// <para>
+/// A class that implements this interface will be available for use if its containing assembly is either placed in
+/// the Extensions folder or is marked as a 'UnitTestExtension' type in the vsix package.
+/// </para>
+/// <para>
+/// Provide one or more <see cref="FileExtensionAttribute"/>s on the implementing class to indicate the set of file
+/// extensions that are supported for test discovery. If the discoverer supports discovering tests present inside
+/// directories, provide <see cref="DirectoryBasedTestDiscovererAttribute"/> instead. If neither
+/// <see cref="DirectoryBasedTestDiscovererAttribute"/> nor <see cref="FileExtensionAttribute"/> is provided, the
+/// discoverer will be called for all relevant test files and directories.
+/// </para>
+/// </remarks>
+public interface ITestDiscoverer
+{
     /// <summary>
-    /// Interface implemented to provide tests to the test platform.  A class that
-    //  implements this interface will be available for use if its containing
-    //  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type
-    //  in the vsix package.
+    /// Discovers the tests available from the provided source.
     /// </summary>
-    public interface ITestDiscoverer
-    {
-        /// <summary>
-        /// Discovers the tests available from the provided source.
-        /// </summary>
-        /// <param name="sources">Collection of test containers.</param>
-        /// <param name="discoveryContext">Context in which discovery is being performed.</param>
-        /// <param name="logger">Logger used to log messages.</param>
-        /// <param name="discoverySink">Used to send testcases and discovery related events back to Discoverer manager.</param>
-        void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink);
-    }
+    /// <param name="sources">Collection of test containers.</param>
+    /// <param name="discoveryContext">Context in which discovery is being performed.</param>
+    /// <param name="logger">Logger used to log messages.</param>
+    /// <param name="discoverySink">Used to send testcases and discovery related events back to Discoverer manager.</param>
+    void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutionRecorder.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutionRecorder.cs
new file mode 100644
index 0000000000..ade77b32b8
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutionRecorder.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Used for recording test results and test messages.
+/// </summary>
+public interface ITestExecutionRecorder : IMessageLogger
+{
+    /// <summary>
+    /// Notify the framework about the test result.
+    /// </summary>
+    /// <param name="testResult">Test Result to be sent to the framework.</param>
+    /// <exception cref="TestCanceledException">Exception thrown by the framework when an executor attempts to send
+    /// test result to the framework when the test(s) is canceled. </exception>
+    void RecordResult(TestResult testResult);
+
+
+    /// <summary>
+    /// Notify the framework about starting of the test case.
+    /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
+    /// </summary>
+    /// <param name="testCase">testcase which will be started.</param>
+    void RecordStart(TestCase testCase);
+
+    /// <summary>
+    /// Notify the framework about completion of the test case.
+    /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
+    /// </summary>
+    /// <param name="testCase">testcase which has completed.</param>
+    /// <param name="outcome">outcome of the test case.</param>
+    void RecordEnd(TestCase testCase, TestOutcome outcome);
+
+
+    /// <summary>
+    /// Notify the framework about run level attachments.
+    /// </summary>
+    /// <param name="attachmentSets">attachments produced in this run.</param>
+    void RecordAttachments(IList<AttachmentSet> attachmentSets);
+
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs
index e77686a419..785a65ac16 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor.cs
@@ -1,38 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+/// <summary>
+/// Defines the test executor which provides capability to run tests.
+///
+/// A class that implements this interface will be available for use if its containing
+///  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type
+///  in the vsix package.
+/// </summary>
+public interface ITestExecutor
+{
     /// <summary>
-    /// Defines the test executor which provides capability to run tests.
-    ///
-    /// A class that implements this interface will be available for use if its containing
-    //  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type
-    //  in the vsix package.
+    /// Runs only the tests specified by parameter 'tests'.
     /// </summary>
-    public interface ITestExecutor
-    {
-        /// <summary>
-        /// Runs only the tests specified by parameter 'tests'.
-        /// </summary>
-        /// <param name="tests">Tests to be run.</param>
-        /// <param name="runContext">Context to use when executing the tests.</param>
-        /// <param param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
-        void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle);
+    /// <param name="tests">Tests to be run.</param>
+    /// <param name="runContext">Context to use when executing the tests.</param>
+    /// <param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
+    void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle);
 
-        /// <summary>
-        /// Runs 'all' the tests present in the specified 'sources'.
-        /// </summary>
-        /// <param name="sources">Path to test container files to look for tests in.</param>
-        /// <param name="runContext">Context to use when executing the tests.</param>
-        /// <param param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
-        void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle);
+    /// <summary>
+    /// Runs 'all' the tests present in the specified 'sources'.
+    /// </summary>
+    /// <param name="sources">Path to test container files to look for tests in.</param>
+    /// <param name="runContext">Context to use when executing the tests.</param>
+    /// <param name="frameworkHandle">Handle to the framework to record results and to do framework operations.</param>
+    void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle);
 
-        /// <summary>
-        /// Cancel the execution of the tests.
-        /// </summary>
-        void Cancel();
-    }
+    /// <summary>
+    /// Cancel the execution of the tests.
+    /// </summary>
+    void Cancel();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor2.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor2.cs
index 2f3ac9b402..600f932f73 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestExecutor2.cs
@@ -1,40 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System;
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
+/// <summary>
+/// Defines the test executor which provides capability to run tests.
+///
+/// A class that implements this interface will be available for use if its containing
+///  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type
+///  in the vsix package.
+/// </summary>
+public interface ITestExecutor2 : ITestExecutor
+{
     /// <summary>
-    /// Defines the test executor which provides capability to run tests.  
-    /// 
-    /// A class that implements this interface will be available for use if its containing 
-    //  assembly is either placed in the Extensions folder or is marked as a 'UnitTestExtension' type 
-    //  in the vsix package.
+    /// Indicates whether or not the default test host process should be attached to.
     /// </summary>
-    public interface ITestExecutor2 : ITestExecutor
-    {
-        /// <summary>
-        /// Indicates whether or not the default test host process should be attached to.
-        /// </summary>
-        /// <param name="sources">Path to test container files to look for tests in.</param>
-        /// <param name="runContext">Context to use when executing the tests.</param>
-        /// <returns>
-        /// <see cref="true"/> if the default test host process should be attached to,
-        /// <see cref="false"/> otherwise.
-        /// </returns>
-        bool ShouldAttachToTestHost(IEnumerable<string> sources, IRunContext runContext);
+    /// <param name="sources">Path to test container files to look for tests in.</param>
+    /// <param name="runContext">Context to use when executing the tests.</param>
+    /// <returns>
+    /// <see langword="true"/> if the default test host process should be attached to,
+    /// <see langword="false"/> otherwise.
+    /// </returns>
+    bool ShouldAttachToTestHost(IEnumerable<string>? sources, IRunContext runContext);
 
-        /// <summary>
-        /// Indicates whether or not the default test host process should be attached to.
-        /// </summary>
-        /// <param name="tests">Tests to be run.</param>
-        /// <param name="runContext">Context to use when executing the tests.</param>
-        /// <returns>
-        /// <see cref="true"/> if the default test host process should be attached to,
-        /// <see cref="false"/> otherwise.
-        /// </returns>
-        bool ShouldAttachToTestHost(IEnumerable<TestCase> tests, IRunContext runContext);
-    }
+    /// <summary>
+    /// Indicates whether or not the default test host process should be attached to.
+    /// </summary>
+    /// <param name="tests">Tests to be run.</param>
+    /// <param name="runContext">Context to use when executing the tests.</param>
+    /// <returns>
+    /// <see langword="true"/> if the default test host process should be attached to,
+    /// <see langword="false"/> otherwise.
+    /// </returns>
+    bool ShouldAttachToTestHost(IEnumerable<TestCase>? tests, IRunContext runContext);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestLog.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestLog.cs
deleted file mode 100644
index 01a61c541f..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/ITestLog.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <summary>
-    /// Used for recording test results and test messages.
-    /// </summary>
-    public interface ITestExecutionRecorder : IMessageLogger
-    {
-        /// <summary>
-        /// Notify the framework about the test result.
-        /// </summary>
-        /// <param name="testResult">Test Result to be sent to the framework.</param>
-        /// <exception cref="TestCanceledException">Exception thrown by the framework when an executor attempts to send
-        /// test result to the framework when the test(s) is canceled. </exception>
-        void RecordResult(TestResult testResult);
-
-
-        /// <summary>
-        /// Notify the framework about starting of the test case.
-        /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
-        /// </summary>
-        /// <param name="testCase">testcase which will be started.</param>
-        void RecordStart(TestCase testCase);
-
-        /// <summary>
-        /// Notify the framework about completion of the test case.
-        /// Framework sends this event to data collectors enabled in the run. If no data collector is enabled, then the event is ignored.
-        /// </summary>
-        /// <param name="testCase">testcase which has completed.</param>
-        /// <param name="outcome">outcome of the test case.</param>
-        void RecordEnd(TestCase testCase, TestOutcome outcome);
-
-
-        /// <summary>
-        /// Notify the framework about run level attachments.
-        /// </summary>
-        /// <param name="attachmentSets">attachments produced in this run.</param>
-        void RecordAttachments(IList<AttachmentSet> attachmentSets);
-
-    }
-}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs
index 65fa9f9de8..004e0ebfa6 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs
@@ -1,100 +1,91 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System;
-    using System.Runtime.Serialization;
+using System;
+#if NETFRAMEWORK
+using System.Runtime.Serialization;
+#endif
 
-    /// <summary>
-    /// Exception thrown on parsing error in user provided filter expression.
-    /// This can happen when filter has invalid format or has unsupported properties.
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Exception thrown on parsing error in user provided filter expression.
+/// This can happen when filter has invalid format or has unsupported properties.
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    public class TestPlatformFormatException : Exception
+public class TestPlatformFormatException : Exception
+{
+    /// <summary>
+    /// Creates a new TestPlatformFormatException
+    /// </summary>
+    public TestPlatformFormatException()
+        : base()
     {
-        #region Constructors
-
-        /// <summary>
-        /// Creates a new TestPlatformFormatException
-        /// </summary>
-        public TestPlatformFormatException()
-            : base()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public TestPlatformFormatException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public TestPlatformFormatException(string? message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes with the message and filter string.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="filterValue">Filter expression.</param>
-        public TestPlatformFormatException(string message, string filterValue)
-            : base(message)
-        {
-            FilterValue = filterValue;
-        }
+    /// <summary>
+    /// Initializes with the message and filter string.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="filterValue">Filter expression.</param>
+    public TestPlatformFormatException(string? message, string? filterValue)
+        : base(message)
+    {
+        FilterValue = filterValue;
+    }
 
-        /// <summary>
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public TestPlatformFormatException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public TestPlatformFormatException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
+    }
 
 #if NETFRAMEWORK
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        protected TestPlatformFormatException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-            ValidateArg.NotNull(info, nameof(info));
-            // Save the basic properties.
-            this.FilterValue = info.GetString("FilterValue");
-        }
+    /// <summary>
+    /// Serialization constructor.
+    /// </summary>
+    protected TestPlatformFormatException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
+        // Save the basic properties.
+        FilterValue = info.GetString("FilterValue");
+    }
 
 #endif
-        #endregion
-
-        /// <summary>
-        /// Filter expression.
-        /// </summary>
-        public string FilterValue
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Filter expression.
+    /// </summary>
+    public string? FilterValue
+    {
+        get;
+        private set;
+    }
 
 #if NETFRAMEWORK
-        /// <summary>
-        /// Serialization helper.
-        /// </summary>
-        /// <param name="info">Serialization info to add to</param>
-        /// <param name="context">not used</param>
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info == null)
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
-
-            base.GetObjectData(info, context);
-            info.AddValue("FilterValue", this.FilterValue);
-        }
-#endif
+    /// <summary>
+    /// Serialization helper.
+    /// </summary>
+    /// <param name="info">Serialization info to add to</param>
+    /// <param name="context">not used</param>
+    public override void GetObjectData(SerializationInfo info, StreamingContext context)
+    {
+        base.GetObjectData(info, context);
+        info.AddValue("FilterValue", FilterValue);
     }
+#endif
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs
index 5b09bce3ec..f16c2f39ee 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs
@@ -1,61 +1,56 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
-{
-    using System;
-
+using System;
 #if NETFRAMEWORK
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 #endif
 
-    /// <summary>
-    /// Exception thrown by the framework when an executor attempts to send
-    /// test result to the framework when the test is canceled.
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+/// <summary>
+/// Exception thrown by the framework when an executor attempts to send
+/// test result to the framework when the test is canceled.
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    public class TestCanceledException : Exception
+public class TestCanceledException : Exception
+{
+    /// <summary>
+    /// Creates a new TestCanceledException
+    /// </summary>
+    public TestCanceledException()
     {
-#region Constructors
-
-        /// <summary>
-        /// Creates a new TestCanceledException
-        /// </summary>
-        public TestCanceledException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public TestCanceledException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public TestCanceledException(string? message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public TestCanceledException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public TestCanceledException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
+    }
 
 #if NETFRAMEWORK
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        protected TestCanceledException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Serialization constructor.
+    /// </summary>
+    protected TestCanceledException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
+    }
 
 #endif
-#endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs b/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
index 8d3fc386e0..278c9c6b97 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs
@@ -1,15 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public enum Architecture
 {
-    public enum Architecture
-    {
-        Default,
-        X86,
-        X64,
-        ARM,
-        AnyCPU,
-        ARM64,
-    }
+    Default,
+    X86,
+    X64,
+    ARM,
+    AnyCPU,
+    ARM64,
+    S390x,
+    Ppc64le,
+    RiscV64,
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs b/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs
index 3cdd52665a..e4d777786e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs
@@ -1,87 +1,84 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// Represents a set of attachments.
+/// </summary>
+[DataContract]
+public class AttachmentSet
+{
     /// <summary>
-    /// Represents a set of attachments.
+    /// URI of the sender.
+    /// If a data-collector is sending this set, then it should be uri of the data collector. Also if an
+    /// executor is sending this attachment, then it should be uri of executor.
     /// </summary>
-    [DataContract]
-    public class AttachmentSet
-    {
-        /// <summary>
-        /// URI of the sender.
-        /// If a data-collector is sending this set, then it should be uri of the data collector. Also if an
-        /// executor is sending this attachment, then it should be uri of executor.
-        /// </summary>
-        [DataMember]
-        public Uri Uri {get; private set;}
-
-        /// <summary>
-        /// Name of the sender.
-        /// </summary>
-        [DataMember]
-        public string DisplayName {get; private set;}
+    [DataMember]
+    public Uri Uri { get; private set; }
 
-        /// <summary>
-        /// List of data attachments.
-        /// These attachments can be things such as files that the collector/adapter wants to make available to the publishers.
-        /// </summary>
-        [DataMember]
-        public IList<UriDataAttachment> Attachments {get; private set;}
+    /// <summary>
+    /// Name of the sender.
+    /// </summary>
+    [DataMember]
+    public string DisplayName { get; private set; }
 
-        public AttachmentSet(Uri uri, string displayName)
-        {
-            Uri = uri;
-            DisplayName = displayName;
-            Attachments = new List<UriDataAttachment>();
-        }
+    /// <summary>
+    /// List of data attachments.
+    /// These attachments can be things such as files that the collector/adapter wants to make available to the publishers.
+    /// </summary>
+    [DataMember]
+    public IList<UriDataAttachment> Attachments { get; private set; }
 
-        public override string ToString()
-        {
-            return $"{nameof(Uri)}: {Uri.AbsoluteUri}, {nameof(DisplayName)}: {DisplayName}, {nameof(Attachments)}: [{ string.Join(",", Attachments)}]";
-        }
+    public AttachmentSet(Uri uri, string displayName)
+    {
+        Uri = uri;
+        DisplayName = displayName;
+        Attachments = new List<UriDataAttachment>();
     }
 
+    public override string ToString()
+        => $"{nameof(Uri)}: {Uri.AbsoluteUri}, {nameof(DisplayName)}: {DisplayName}, {nameof(Attachments)}: [{string.Join(",", Attachments)}]";
+}
 
+
+/// <summary>
+/// Defines the data attachment.
+/// Dev10 equivalent is UriDataAttachment.
+/// </summary>
+[DataContract]
+public class UriDataAttachment
+{
     /// <summary>
-    /// Defines the data attachment.
-    /// Dev10 equivalent is UriDataAttachment.
+    /// Description of the attachment.
     /// </summary>
-    [DataContract]
-    public class UriDataAttachment
-    {
-        /// <summary>
-        /// Description of the attachment.
-        /// </summary>
-        [DataMember]
-        public string Description { get; private set; }
+    [DataMember]
+    public string? Description { get; }
 
-        /// <summary>
-        /// Uri of the attachment.
-        /// </summary>
-        [DataMember]
-        public Uri Uri { get; private set; }
+    /// <summary>
+    /// Uri of the attachment.
+    /// </summary>
+    [DataMember]
+    public Uri Uri { get; }
 
-        public UriDataAttachment(Uri uri, string description)
-        {
-            Uri = uri;
-            Description = description;
-        }
+    public UriDataAttachment(Uri uri, string? description)
+    {
+        Uri = uri;
+        Description = description;
+    }
 
-        public override string ToString()
-        {
-            return $"{nameof(Uri)}: {Uri.AbsoluteUri}, {nameof(Description)}: {Description}";
-        }
+    public override string ToString()
+    {
+        return $"{nameof(Uri)}: {Uri.AbsoluteUri}, {nameof(Description)}: {Description}";
+    }
 
-        public static UriDataAttachment CreateFrom(string localFilePath, string description)
-        {
-            var uri = new UriBuilder() { Scheme = "file", Host = "", Path = localFilePath }.Uri;
-            return new UriDataAttachment(uri, description);
-        }
+    public static UriDataAttachment CreateFrom(string localFilePath, string? description)
+    {
+        var uri = new UriBuilder() { Scheme = "file", Host = "", Path = localFilePath }.Uri;
+        return new UriDataAttachment(uri, description);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/DiscoveryCriteria.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/DiscoveryCriteria.cs
index b9b53c21c3..293a0fc82e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/DiscoveryCriteria.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/DiscoveryCriteria.cs
@@ -1,188 +1,189 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Defines the discovery criterion.
+/// </summary>
+[DataContract]
+public class DiscoveryCriteria
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Runtime.Serialization;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
+    /// </summary>
+    /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public DiscoveryCriteria()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    {
+        // Parameterless constructor is used for Serialization.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
+    /// </summary>
+    /// <param name="sources">
+    /// Sources from which the tests should be discovered.
+    /// </param>
+    /// <param name="frequencyOfDiscoveredTestsEvent">
+    /// Frequency of discovered test event. This is used for batching discovered tests.
+    /// </param>
+    /// <param name="testSettings">
+    /// Test configuration provided by user.
+    /// </param>
+    public DiscoveryCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfDiscoveredTestsEvent,
+        string? testSettings)
+        : this(
+            sources,
+            frequencyOfDiscoveredTestsEvent,
+            TimeSpan.MaxValue,
+            testSettings)
+    { }
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
+    /// </summary>
+    /// <param name="sources">
+    /// Sources from which the tests should be discovered
+    /// </param>
+    /// <param name="frequencyOfDiscoveredTestsEvent">
+    /// Frequency of discovered test event. This is used for batching discovered tests.
+    /// </param>
+    /// <param name="discoveredTestEventTimeout">
+    /// Timeout that triggers the discovered test event regardless of cache size.
+    /// </param>
+    /// <param name="runSettings">
+    /// Run Settings for the discovery.
+    /// </param>
+    public DiscoveryCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfDiscoveredTestsEvent,
+        TimeSpan discoveredTestEventTimeout,
+        string? runSettings)
+        : this(
+            sources,
+            frequencyOfDiscoveredTestsEvent,
+            discoveredTestEventTimeout,
+            runSettings,
+            testSessionInfo: null)
+    { }
 
     /// <summary>
-    /// Defines the discovery criterion.
+    /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
     /// </summary>
-    [DataContract]
-    public class DiscoveryCriteria
+    /// <param name="sources">
+    /// Sources from which the tests should be discovered
+    /// </param>
+    /// <param name="frequencyOfDiscoveredTestsEvent">
+    /// Frequency of discovered test event. This is used for batching discovered tests.
+    /// </param>
+    /// <param name="discoveredTestEventTimeout">
+    /// Timeout that triggers the discovered test event regardless of cache size.
+    /// </param>
+    /// <param name="runSettings">
+    /// Run Settings for the discovery.
+    /// </param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    public DiscoveryCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfDiscoveredTestsEvent,
+        TimeSpan discoveredTestEventTimeout,
+        string? runSettings,
+        TestSessionInfo? testSessionInfo)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
-        /// </summary>
-        /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
-        public DiscoveryCriteria()
+        ValidateArg.NotNullOrEmpty(sources, nameof(sources));
+        if (frequencyOfDiscoveredTestsEvent <= 0)
         {
-            // Parameterless constructor is used for Serialization.
+            throw new ArgumentOutOfRangeException(
+                nameof(frequencyOfDiscoveredTestsEvent),
+                Resources.Resources.NotificationFrequencyIsNotPositive);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
-        /// </summary>
-        /// <param name="sources">
-        /// Sources from which the tests should be discovered.
-        /// </param>
-        /// <param name="frequencyOfDiscoveredTestsEvent">
-        /// Frequency of discovered test event. This is used for batching discovered tests.
-        /// </param>
-        /// <param name="testSettings">
-        /// Test configuration provided by user.
-        /// </param>
-        public DiscoveryCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfDiscoveredTestsEvent,
-            string testSettings)
-            : this(
-                  sources,
-                  frequencyOfDiscoveredTestsEvent,
-                  TimeSpan.MaxValue,
-                  testSettings)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
-        /// </summary>
-        /// <param name="sources">
-        /// Sources from which the tests should be discovered
-        /// </param>
-        /// <param name="frequencyOfDiscoveredTestsEvent">
-        /// Frequency of discovered test event. This is used for batching discovered tests.
-        /// </param>
-        /// <param name="discoveredTestEventTimeout">
-        /// Timeout that triggers the discovered test event regardless of cache size.
-        /// </param>
-        /// <param name="runSettings">
-        /// Run Settings for the discovery.
-        /// </param>
-        public DiscoveryCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfDiscoveredTestsEvent,
-            TimeSpan discoveredTestEventTimeout,
-            string runSettings)
-            : this(
-                sources,
-                frequencyOfDiscoveredTestsEvent,
-                discoveredTestEventTimeout,
-                runSettings,
-                testSessionInfo: null)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiscoveryCriteria"/> class.
-        /// </summary>
-        /// <param name="sources">
-        /// Sources from which the tests should be discovered
-        /// </param>
-        /// <param name="frequencyOfDiscoveredTestsEvent">
-        /// Frequency of discovered test event. This is used for batching discovered tests.
-        /// </param>
-        /// <param name="discoveredTestEventTimeout">
-        /// Timeout that triggers the discovered test event regardless of cache size.
-        /// </param>
-        /// <param name="runSettings">
-        /// Run Settings for the discovery.
-        /// </param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        public DiscoveryCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfDiscoveredTestsEvent,
-            TimeSpan discoveredTestEventTimeout,
-            string runSettings,
-            TestSessionInfo testSessionInfo)
+        if (discoveredTestEventTimeout <= TimeSpan.MinValue)
         {
-            ValidateArg.NotNullOrEmpty(sources, nameof(sources));
-            if (frequencyOfDiscoveredTestsEvent <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(frequencyOfDiscoveredTestsEvent),
-                    Resources.NotificationFrequencyIsNotPositive);
-            }
-
-            if (discoveredTestEventTimeout <= TimeSpan.MinValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(discoveredTestEventTimeout), Resources.NotificationTimeoutIsZero);
-            }
-
-            this.AdapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            this.AdapterSourceMap.Add(Constants.UnspecifiedAdapterPath, sources);
-            this.FrequencyOfDiscoveredTestsEvent = frequencyOfDiscoveredTestsEvent;
-            this.DiscoveredTestEventTimeout = discoveredTestEventTimeout;
-
-            this.RunSettings = runSettings;
-            this.TestSessionInfo = testSessionInfo;
+            throw new ArgumentOutOfRangeException(nameof(discoveredTestEventTimeout), Resources.Resources.NotificationTimeoutIsZero);
         }
 
-        /// <summary>
-        /// Gets the test Containers (e.g. DLL/EXE/artifacts to scan)
-        /// </summary>
-        [IgnoreDataMember]
-        public IEnumerable<string> Sources
+        AdapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            get
-            {
-                IEnumerable<string> sources = new List<string>();
-                return this.AdapterSourceMap.Values.Aggregate(sources, (current, enumerable) => current.Concat(enumerable));
-            }
-        }
+            { Constants.UnspecifiedAdapterPath, sources }
+        };
+        FrequencyOfDiscoveredTestsEvent = frequencyOfDiscoveredTestsEvent;
+        DiscoveredTestEventTimeout = discoveredTestEventTimeout;
 
-        /// <summary>
-        /// Gets the test Containers (e.g. .appx, .appxrecipie)
-        /// </summary>
-        [DataMember]
-        public string Package { get; set; }
-
-        /// <summary>
-        /// Gets the test adapter and source map which would look like below:
-        /// <code>
-        /// { C:\temp\testAdapter1.dll : [ source1.dll, source2.dll ], C:\temp\testadapter2.dll : [ source3.dll, source2.dll ]
-        /// </code>
-        /// </summary>
-        [DataMember]
-        public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
-
-        /// <summary>
-        /// Gets the frequency of discovered test event. 
-        /// </summary>
-        /// <remarks>
-        /// Discovered test event will be raised after discovering these number of tests. 
-        /// Note that this event is raised asynchronously and the underlying discovery process is not 
-        /// paused during the listener invocation. So if the event handler, you try to query the 
-        /// next set of tests, you may get more than 'FrequencyOfDiscoveredTestsEvent'.
-        /// </remarks>        
-        [DataMember]
-        public long FrequencyOfDiscoveredTestsEvent { get; private set; }
-
-        /// <summary>
-        /// Gets the timeout that triggers the discovered test event regardless of cache size.
-        /// </summary>
-        [DataMember]
-        public TimeSpan DiscoveredTestEventTimeout { get; private set; }
-
-        /// <summary>
-        /// Gets the test settings used for the discovery request. 
-        /// </summary>
-        [DataMember]
-        public string RunSettings { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the criteria for filtering test cases.
-        /// </summary>
-        [DataMember]
-        public string TestCaseFilter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test session info object.
-        /// </summary>
-        [DataMember]
-        public TestSessionInfo TestSessionInfo { get; set; }
+        RunSettings = runSettings;
+        TestSessionInfo = testSessionInfo;
     }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. DLL/EXE/artifacts to scan)
+    /// </summary>
+    [IgnoreDataMember]
+    public IEnumerable<string> Sources
+    {
+        get
+        {
+            IEnumerable<string> sources = new List<string>();
+            return AdapterSourceMap.Values.Aggregate(sources, (current, enumerable) => current.Concat(enumerable));
+        }
+    }
+
+    /// <summary>
+    /// Gets the test Containers (e.g. .appx, .appxrecipie)
+    /// </summary>
+    [DataMember]
+    public string? Package { get; set; }
+
+    /// <summary>
+    /// Gets the test adapter and source map which would look like below:
+    /// <code>
+    /// { C:\temp\testAdapter1.dll : [ source1.dll, source2.dll ], C:\temp\testadapter2.dll : [ source3.dll, source2.dll ]
+    /// </code>
+    /// </summary>
+    [DataMember]
+    public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
+
+    /// <summary>
+    /// Gets the frequency of discovered test event.
+    /// </summary>
+    /// <remarks>
+    /// Discovered test event will be raised after discovering these number of tests.
+    /// Note that this event is raised asynchronously and the underlying discovery process is not
+    /// paused during the listener invocation. So if the event handler, you try to query the
+    /// next set of tests, you may get more than 'FrequencyOfDiscoveredTestsEvent'.
+    /// </remarks>
+    [DataMember]
+    public long FrequencyOfDiscoveredTestsEvent { get; private set; }
+
+    /// <summary>
+    /// Gets the timeout that triggers the discovered test event regardless of cache size.
+    /// </summary>
+    [DataMember]
+    public TimeSpan DiscoveredTestEventTimeout { get; private set; }
+
+    /// <summary>
+    /// Gets the test settings used for the discovery request.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the criteria for filtering test cases.
+    /// </summary>
+    [DataMember]
+    public string? TestCaseFilter { get; set; }
+
+    /// <summary>
+    /// Gets or sets the test session info object.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveredTestsEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveredTestsEventArgs.cs
index 2517c56372..d25e45a9f7 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveredTestsEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveredTestsEventArgs.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
-    /// <summary>
-    /// Event arguments used to notify the availability of new tests
-    /// </summary>
-    public partial class DiscoveredTestsEventArgs : EventArgs
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Event arguments used to notify the availability of new tests
+/// </summary>
+public partial class DiscoveredTestsEventArgs : EventArgs
+{
+    public DiscoveredTestsEventArgs(IEnumerable<TestCase>? discoveredTestCases)
     {
-        public DiscoveredTestsEventArgs(IEnumerable<TestCase> discoveredTestCases)
-        {
-            DiscoveredTestCases = discoveredTestCases;
-        }
-        /// <summary>
-        /// Tests discovered in this discovery request
-        /// </summary>
-        public IEnumerable<TestCase> DiscoveredTestCases { get; private set; }
+        DiscoveredTestCases = discoveredTestCases;
     }
+    /// <summary>
+    /// Tests discovered in this discovery request
+    /// </summary>
+    public IEnumerable<TestCase>? DiscoveredTestCases { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs
index a17323a347..6631ccff15 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs
@@ -1,46 +1,78 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Event arguments used on completion of discovery
+/// </summary>
+[DataContract]
+public class DiscoveryCompleteEventArgs : EventArgs
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
+    public DiscoveryCompleteEventArgs() { }
 
     /// <summary>
-    /// Event arguments used on completion of discovery
+    /// Constructor for creating event args object
     /// </summary>
-    public class DiscoveryCompleteEventArgs : EventArgs
+    /// <param name="totalTests">Total tests which got discovered</param>
+    /// <param name="isAborted">Specifies if discovery has been aborted.</param>
+    public DiscoveryCompleteEventArgs(long totalTests, bool isAborted)
     {
-        /// <summary>
-        /// Constructor for creating event args object
-        /// </summary>
-        /// <param name="totalTests">Total tests which got discovered</param>
-        /// <param name="isAborted">Specifies if discovery has been aborted.</param>
-        public DiscoveryCompleteEventArgs(long totalTests, bool isAborted)
-        {
-            // This event is always raised from the client side, while the total count of tests is maintained
-            // only at the testhost end. In case of a discovery abort (various reasons including crash), it is
-            // not possible to get a list of total tests from testhost. Hence we enforce a -1 count.
-            Debug.Assert((isAborted ? -1 == totalTests : true), "If discovery request is aborted totalTest should be -1.");
-
-            this.TotalCount = totalTests;
-            this.IsAborted = isAborted;
-        }
-
-        /// <summary>
-        ///   Indicates the total tests which got discovered in this request.
-        /// </summary>
-        public long TotalCount { get; private set; }
-
-        /// <summary>
-        /// Specifies if discovery has been aborted. If true TotalCount is also set to -1.
-        /// </summary>
-        public bool IsAborted { get; private set; }
-
-        /// <summary>
-        /// Metrics
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; set; }
+        TotalCount = totalTests;
+        IsAborted = isAborted;
     }
+
+    /// <summary>
+    ///   Indicates the total tests which got discovered in this request.
+    /// </summary>
+    [DataMember]
+    public long TotalCount { get; set; }
+
+    /// <summary>
+    /// Specifies if discovery has been aborted. If true TotalCount is also set to -1.
+    /// </summary>
+    [DataMember]
+    public bool IsAborted { get; set; }
+
+    /// <summary>
+    /// Metrics
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of sources which were fully discovered.
+    /// </summary>
+    [DataMember]
+    public IList<string>? FullyDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets the list of sources which were partially discovered (started discover tests, but then discovery aborted).
+    /// </summary>
+    [DataMember]
+    // Added in protocol version 6.
+    public IList<string>? PartiallyDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    ///  Gets or sets the list of sources that were skipped during discovery.
+    /// </summary>
+    [DataMember]
+    // Added in protocol version 7, for previous versions this is put into NotDiscoveredSources.
+    public IList<string>? SkippedDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets the list of sources which were not discovered at all.
+    /// </summary>
+    [DataMember]
+    public IList<string>? NotDiscoveredSources { get; set; } = new List<string>();
+
+    /// <summary>
+    /// Gets or sets the collection of discovered extensions.
+    /// </summary>
+    [DataMember]
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; } = new();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryStartEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryStartEventArgs.cs
index 2a84ef9258..1f6e8e3eb9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryStartEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryStartEventArgs.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Event arguments used when test discovery starts
+/// </summary>
+public class DiscoveryStartEventArgs : EventArgs
+{
     /// <summary>
-    /// Event arguments used when test discovery starts
+    /// Constructor for creating event args object
     /// </summary>
-    public class DiscoveryStartEventArgs : EventArgs
+    /// <param name="discoveryCriteria"> Discovery criteria to be used for test discovery. </param>
+    public DiscoveryStartEventArgs(DiscoveryCriteria discoveryCriteria)
     {
-        /// <summary>
-        /// Constructor for creating event args object
-        /// </summary>
-        /// <param name="discoveryCriteria"> Discovery criteria to be used for test discovery. </param>
-        public DiscoveryStartEventArgs(DiscoveryCriteria discoveryCriteria)
-        {
-            DiscoveryCriteria = discoveryCriteria;
-        }
-
-        /// <summary>
-        /// Discovery criteria to be used for test discovery
-        /// </summary>
-        public DiscoveryCriteria DiscoveryCriteria { get; private set; }
+        DiscoveryCriteria = discoveryCriteria;
     }
+
+    /// <summary>
+    /// Discovery criteria to be used for test discovery
+    /// </summary>
+    public DiscoveryCriteria DiscoveryCriteria { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StartTestSessionCompleteEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StartTestSessionCompleteEventArgs.cs
new file mode 100644
index 0000000000..011e714b7f
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StartTestSessionCompleteEventArgs.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Event arguments used to notify the caller about the status of the test session.
+/// </summary>
+[DataContract]
+public class StartTestSessionCompleteEventArgs : EventArgs
+{
+    /// <summary>
+    /// Gets or sets the test session info.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
+
+    /// <summary>
+    /// Gets or sets the metrics.
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object>? Metrics { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StopTestSessionCompleteEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StopTestSessionCompleteEventArgs.cs
new file mode 100644
index 0000000000..d5eaad8029
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/StopTestSessionCompleteEventArgs.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Event arguments used to notify the caller about the status of the test session.
+/// </summary>
+[DataContract]
+public class StopTestSessionCompleteEventArgs : EventArgs
+{
+    /// <summary>
+    /// Creates an instance of the current class.
+    /// </summary>
+    public StopTestSessionCompleteEventArgs()
+    { }
+
+    /// <summary>
+    /// Creates an instance of the current class.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info.</param>
+    public StopTestSessionCompleteEventArgs(TestSessionInfo? testSessionInfo)
+    {
+        TestSessionInfo = testSessionInfo;
+    }
+
+    /// <summary>
+    /// Gets or sets the test session info.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
+
+    /// <summary>
+    /// Gets or sets the metrics.
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object>? Metrics { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating if the session was successfully stopped or not.
+    /// </summary>
+    [DataMember]
+    public bool IsStopped { get; set; } = false;
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingCompleteEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingCompleteEventArgs.cs
index b5e446ff68..308fbf8898 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingCompleteEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingCompleteEventArgs.cs
@@ -1,42 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    [DataContract]
-    public class TestRunAttachmentsProcessingCompleteEventArgs : EventArgs
+[DataContract]
+public class TestRunAttachmentsProcessingCompleteEventArgs : EventArgs
+{
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="isCanceled">Specifies whether the attachments processing is canceled.</param>
+    /// <param name="error">Specifies the error encountered during the execution of the attachments processing.</param>
+    public TestRunAttachmentsProcessingCompleteEventArgs(bool isCanceled, Exception? error)
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="isCanceled">Specifies whether the attachments processing is canceled.</param>
-        /// <param name="error">Specifies the error encountered during the execution of the attachments processing.</param>
-        public TestRunAttachmentsProcessingCompleteEventArgs(bool isCanceled, Exception error)
-        {
-            this.IsCanceled = isCanceled;
-            this.Error = error;
-        }
+        IsCanceled = isCanceled;
+        Error = error;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether the attachments processing is canceled or not.
-        /// </summary>
-        [DataMember]
-        public bool IsCanceled { get; private set; }
+    /// <summary>
+    /// Gets a value indicating whether the attachments processing is canceled or not.
+    /// </summary>
+    [DataMember]
+    public bool IsCanceled { get; private set; }
 
-        /// <summary>
-        /// Gets the error encountered during the attachments processing of the test runs. Null if there is no error.
-        /// </summary>
-        [DataMember]
-        public Exception Error { get; private set; }
+    /// <summary>
+    /// Gets the error encountered during the attachments processing of the test runs. Null if there is no error.
+    /// </summary>
+    [DataMember]
+    public Exception? Error { get; private set; }
 
-        /// <summary>
-        /// Get or Sets the Metrics (used for telemetry)
-        /// </summary>
-        [DataMember]
-        public IDictionary<string, object> Metrics { get; set; }
-    }
+    /// <summary>
+    /// Get or Sets the Metrics (used for telemetry)
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object>? Metrics { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingProgressEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingProgressEventArgs.cs
index 8218336e5b..8dd7ff3757 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingProgressEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunAttachmentsProcessingProgressEventArgs.cs
@@ -1,52 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    [DataContract]
-    public class TestRunAttachmentsProcessingProgressEventArgs : EventArgs
+[DataContract]
+public class TestRunAttachmentsProcessingProgressEventArgs : EventArgs
+{
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="currentAttachmentProcessorIndex">Specifies current attachment processor index.</param>
+    /// <param name="currentAttachmentProcessorUris">Specifies current processor Uris.</param>
+    /// <param name="currentAttachmentProcessorProgress">Specifies current processor progress.</param>
+    /// <param name="attachmentProcessorsCount">Specifies the overall number of processors.</param>
+    public TestRunAttachmentsProcessingProgressEventArgs(long currentAttachmentProcessorIndex, ICollection<Uri> currentAttachmentProcessorUris, long currentAttachmentProcessorProgress, long attachmentProcessorsCount)
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="currentAttachmentProcessorIndex">Specifies current attachment processor index.</param>
-        /// <param name="currentAttachmentProcessorUris">Specifies current processor Uris.</param>
-        /// <param name="currentAttachmentProcessorProgress">Specifies current processor progress.</param>
-        /// <param name="attachmentProcessorsCount">Specifies the overall number of processors.</param>
-        public TestRunAttachmentsProcessingProgressEventArgs(long currentAttachmentProcessorIndex, ICollection<Uri> currentAttachmentProcessorUris, long currentAttachmentProcessorProgress, long attachmentProcessorsCount)
-        {
-            CurrentAttachmentProcessorIndex = currentAttachmentProcessorIndex;
-            CurrentAttachmentProcessorUris = currentAttachmentProcessorUris;
-            CurrentAttachmentProcessorProgress = currentAttachmentProcessorProgress;
-            AttachmentProcessorsCount = attachmentProcessorsCount;
-        }
+        CurrentAttachmentProcessorIndex = currentAttachmentProcessorIndex;
+        CurrentAttachmentProcessorUris = currentAttachmentProcessorUris;
+        CurrentAttachmentProcessorProgress = currentAttachmentProcessorProgress;
+        AttachmentProcessorsCount = attachmentProcessorsCount;
+    }
 
-        /// <summary>
-        /// Gets a current attachment processor index.
-        /// </summary>
-        [DataMember]
-        public long CurrentAttachmentProcessorIndex { get; private set; }
+    /// <summary>
+    /// Gets a current attachment processor index.
+    /// </summary>
+    [DataMember]
+    public long CurrentAttachmentProcessorIndex { get; private set; }
 
-        /// <summary>
-        /// Gets a current attachment processor URI.
-        /// </summary>
-        [DataMember]
-        public ICollection<Uri> CurrentAttachmentProcessorUris { get; private set; }
+    /// <summary>
+    /// Gets a current attachment processor URI.
+    /// </summary>
+    [DataMember]
+    public ICollection<Uri> CurrentAttachmentProcessorUris { get; private set; }
 
-        /// <summary>
-        /// Gets a current attachment processor progress.
-        /// </summary>
-        [DataMember]
-        public long CurrentAttachmentProcessorProgress { get; private set; }
+    /// <summary>
+    /// Gets a current attachment processor progress.
+    /// </summary>
+    [DataMember]
+    public long CurrentAttachmentProcessorProgress { get; private set; }
 
-        /// <summary>
-        /// Gets the overall number of attachment processors.
-        /// </summary>
-        [DataMember]
-        public long AttachmentProcessorsCount { get; private set; }
-    }
+    /// <summary>
+    /// Gets the overall number of attachment processors.
+    /// </summary>
+    [DataMember]
+    public long AttachmentProcessorsCount { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunChangedEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunChangedEventArgs.cs
index 89b672193e..96e5e338ed 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunChangedEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunChangedEventArgs.cs
@@ -1,47 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// The test run changed event args that provides the test results available.
+/// </summary>
+[DataContract]
+public class TestRunChangedEventArgs : EventArgs
+{
     /// <summary>
-    /// The test run changed event args that provides the test results available.
+    /// Initializes a new instance of the <see cref="TestRunChangedEventArgs"/> class.
     /// </summary>
-    [DataContract]
-    public class TestRunChangedEventArgs : EventArgs
+    /// <param name="stats"> The stats. </param>
+    /// <param name="newTestResults"> The new test results. </param>
+    /// <param name="activeTests"> The active tests. </param>
+    public TestRunChangedEventArgs(ITestRunStatistics? stats, IEnumerable<TestResult>? newTestResults, IEnumerable<TestCase>? activeTests)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="stats"> The stats. </param>
-        /// <param name="newTestResults"> The new test results. </param>
-        /// <param name="activeTests"> The active tests. </param>
-        public TestRunChangedEventArgs(ITestRunStatistics stats, IEnumerable<TestResult> newTestResults, IEnumerable<TestCase> activeTests)
-        {
-            this.TestRunStatistics = stats;
-            this.NewTestResults = newTestResults;
-            this.ActiveTests = activeTests;
-        }
+        TestRunStatistics = stats;
+        NewTestResults = newTestResults;
+        ActiveTests = activeTests;
+    }
 
-        /// <summary>
-        /// Gets the new test results.
-        /// </summary>
-        [DataMember]
-        public IEnumerable<TestResult> NewTestResults { get; private set; }
+    /// <summary>
+    /// Gets the new test results.
+    /// </summary>
+    [DataMember]
+    public IEnumerable<TestResult>? NewTestResults { get; private set; }
 
-        /// <summary>
-        /// Gets the test run statistics.
-        /// </summary>
-        [DataMember]
-        public ITestRunStatistics TestRunStatistics { get; private set; }
+    /// <summary>
+    /// Gets the test run statistics.
+    /// </summary>
+    [DataMember]
+    public ITestRunStatistics? TestRunStatistics { get; private set; }
 
-        /// <summary>
-        /// Gets the active tests.
-        /// </summary>
-        [DataMember]
-        public IEnumerable<TestCase> ActiveTests { get; private set; }
-    }
+    /// <summary>
+    /// Gets the active tests.
+    /// </summary>
+    [DataMember]
+    public IEnumerable<TestCase>? ActiveTests { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs
index 1a2ff34ad6..58a6b412b2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunCompleteEventArgs.cs
@@ -1,79 +1,137 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Event arguments used when a test run has completed.
+/// </summary>
+[DataContract]
+public class TestRunCompleteEventArgs : EventArgs
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Runtime.Serialization;
+    // We have more than one ctor for backward-compatibility reason but we don't want to add dependency on Newtosoft([JsonConstructor])
+    // We want to fallback to the non-public default constructor https://www.newtonsoft.com/json/help/html/T_Newtonsoft_Json_ConstructorHandling.htm during deserialization
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    private TestRunCompleteEventArgs()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    {
+        AttachmentSets = new Collection<AttachmentSet>();
+        InvokedDataCollectors = new Collection<InvokedDataCollector>();
+    }
 
     /// <summary>
-    /// Event arguments used when a test run has completed.
+    /// Default constructor.
     /// </summary>
-    [DataContract]
-    public class TestRunCompleteEventArgs : EventArgs
+    /// <param name="stats">The final stats for the test run. This parameter is only set for communications between the test host and the clients (like VS)</param>
+    /// <param name="isCanceled">Specifies whether the test run is canceled.</param>
+    /// <param name="isAborted">Specifies whether the test run is aborted.</param>
+    /// <param name="error">Specifies the error encountered during the execution of the test run.</param>
+    /// <param name="attachmentSets">Attachment sets associated with the run.</param>
+    /// <param name="elapsedTime">Time elapsed in just running tests</param>
+    public TestRunCompleteEventArgs(
+        ITestRunStatistics? stats,
+        bool isCanceled,
+        bool isAborted,
+        Exception? error,
+        Collection<AttachmentSet>? attachmentSets,
+        TimeSpan elapsedTime)
+        : this(
+              stats,
+              isCanceled,
+              isAborted,
+              error,
+              attachmentSets,
+              null,
+              elapsedTime)
+    { }
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="stats">The final stats for the test run. This parameter is only set for communications between the test host and the clients (like VS)</param>
+    /// <param name="isCanceled">Specifies whether the test run is canceled.</param>
+    /// <param name="isAborted">Specifies whether the test run is aborted.</param>
+    /// <param name="error">Specifies the error encountered during the execution of the test run.</param>
+    /// <param name="attachmentSets">Attachment sets associated with the run.</param>
+    /// <param name="invokedDataCollectors">Invoked data collectors</param>
+    /// <param name="elapsedTime">Time elapsed in just running tests</param>
+    public TestRunCompleteEventArgs(
+        ITestRunStatistics? stats,
+        bool isCanceled,
+        bool isAborted,
+        Exception? error,
+        Collection<AttachmentSet>? attachmentSets,
+        Collection<InvokedDataCollector>? invokedDataCollectors,
+        TimeSpan elapsedTime)
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="stats">The final stats for the test run. This parameter is only set for communications between the test host and the clients (like VS)</param>
-        /// <param name="isCanceled">Specifies whether the test run is canceled.</param>
-        /// <param name="isAborted">Specifies whether the test run is aborted.</param>
-        /// <param name="error">Specifies the error encountered during the execution of the test run.</param>
-        /// <param name="attachmentSets">Attachment sets associated with the run.</param>
-        /// <param name="elapsedTime">Time elapsed in just running tests</param>
-        public TestRunCompleteEventArgs(ITestRunStatistics stats, bool isCanceled, bool isAborted, Exception error, Collection<AttachmentSet> attachmentSets, TimeSpan elapsedTime)
-        {
-            this.TestRunStatistics = stats;
-            this.IsCanceled = isCanceled;
-            this.IsAborted = isAborted;
-            this.Error = error;
-            this.AttachmentSets = attachmentSets ?? new Collection<AttachmentSet>(); // Ensuring attachmentSets are not null, so that new attachmentSets can be combined whenever required.
-            this.ElapsedTimeInRunningTests = elapsedTime;
-        }
+        TestRunStatistics = stats;
+        IsCanceled = isCanceled;
+        IsAborted = isAborted;
+        Error = error;
+        AttachmentSets = attachmentSets ?? new Collection<AttachmentSet>(); // Ensuring attachmentSets are not null, so that new attachmentSets can be combined whenever required.
+        InvokedDataCollectors = invokedDataCollectors ?? new Collection<InvokedDataCollector>(); // Ensuring that invoked data collectors are not null.
+        ElapsedTimeInRunningTests = elapsedTime;
+
+        DiscoveredExtensions = new Dictionary<string, HashSet<string>>();
+    }
+
+    /// <summary>
+    /// Gets the statistics on the state of the test run.
+    /// </summary>
+    [DataMember]
+    public ITestRunStatistics? TestRunStatistics { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the test run is canceled or not.
+    /// </summary>
+    [DataMember]
+    public bool IsCanceled { get; private set; }
 
-        /// <summary>
-        /// Gets the statistics on the state of the test run.
-        /// </summary>
-        [DataMember]
-        public ITestRunStatistics TestRunStatistics { get; private set; }
+    /// <summary>
+    /// Gets a value indicating whether the test run is aborted.
+    /// </summary>
+    [DataMember]
+    public bool IsAborted { get; private set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the test run is canceled or not.
-        /// </summary>
-        [DataMember]
-        public bool IsCanceled { get; private set; }
+    /// <summary>
+    /// Gets the error encountered during the execution of the test run. Null if there is no error.
+    /// </summary>
+    [DataMember]
+    public Exception? Error { get; private set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the test run is aborted.
-        /// </summary>
-        [DataMember]
-        public bool IsAborted { get; private set; }
+    /// <summary>
+    /// Gets the attachment sets associated with the test run.
+    /// </summary>
+    [DataMember]
+    public Collection<AttachmentSet> AttachmentSets { get; private set; }
 
-        /// <summary>
-        /// Gets the error encountered during the execution of the test run. Null if there is no error.
-        /// </summary>
-        [DataMember]
-        public Exception Error { get; private set; }
+    /// <summary>
+    /// Gets the invoked data collectors for the test session.
+    /// </summary>
+    [DataMember]
+    public Collection<InvokedDataCollector> InvokedDataCollectors { get; private set; }
 
-        /// <summary>
-        /// Gets the attachment sets associated with the test run.
-        /// </summary>
-        [DataMember]
-        public Collection<AttachmentSet> AttachmentSets { get; private set; }
+    /// <summary>
+    /// Gets the time elapsed in just running the tests.
+    /// Value is set to TimeSpan.Zero in case of any error.
+    /// </summary>
+    [DataMember]
+    public TimeSpan ElapsedTimeInRunningTests { get; private set; }
 
-        /// <summary>
-        /// Gets the time elapsed in just running the tests.
-        /// Value is set to TimeSpan.Zero in case of any error.
-        /// </summary>
-        [DataMember]
-        public TimeSpan ElapsedTimeInRunningTests { get; private set; }
+    /// <summary>
+    /// Get or Sets the Metrics
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object>? Metrics { get; set; }
 
-        /// <summary>
-        /// Get or Sets the Metrics
-        /// </summary>
-        [DataMember]
-        public IDictionary<string, object> Metrics { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the collection of discovered extensions.
+    /// </summary>
+    [DataMember]
+    public Dictionary<string, HashSet<string>>? DiscoveredExtensions { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunStartEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunStartEventArgs.cs
index 06320f58a9..1e0d47f9bc 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunStartEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Events/TestRunStartEventArgs.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Event arguments used when test run starts
+/// </summary>
+public class TestRunStartEventArgs : EventArgs
+{
     /// <summary>
-    /// Event arguments used when test run starts
+    /// Constructor for creating event args object
     /// </summary>
-    public class TestRunStartEventArgs : EventArgs
+    /// <param name="testRunCriteria"> Test run criteria to be used for test run. </param>
+    public TestRunStartEventArgs(TestRunCriteria testRunCriteria)
     {
-        /// <summary>
-        /// Constructor for creating event args object
-        /// </summary>
-        /// <param name="testRunCriteria"> Test run criteria to be used for test run. </param>
-        public TestRunStartEventArgs(TestRunCriteria testRunCriteria)
-        {
-            TestRunCriteria = testRunCriteria;
-        }
-
-        /// <summary>
-        /// Test run criteria to be used for test run
-        /// </summary>
-        public TestRunCriteria TestRunCriteria { get; private set; }
+        TestRunCriteria = testRunCriteria;
     }
+
+    /// <summary>
+    /// Test run criteria to be used for test run
+    /// </summary>
+    public TestRunCriteria TestRunCriteria { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/FilterOptions.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/FilterOptions.cs
index 01c7e3bfea..7c087014c9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/FilterOptions.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/FilterOptions.cs
@@ -1,59 +1,58 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Filter options to be passed into the Test Platform during Discovery/Execution.
+/// </summary>
+[DataContract]
+public class FilterOptions
 {
-    using System.Globalization;
-    using System.Runtime.Serialization;
-    using System.Text;
+    /// <summary>
+    /// Gets or sets the regular expression that will be applied on the property before matching.
+    /// </summary>
+    [DataMember]
+    public string? FilterRegEx { get; set; }
 
     /// <summary>
-    /// Filter options to be passed into the Test Platform during Discovery/Execution.
+    /// Gets or sets the optional regular expression replacement string. When this property is set, <see cref="System.Text.RegularExpressions.Regex.Replace(string, string, string)"/>
+    /// will be called upon property value instead of <see cref="System.Text.RegularExpressions.Regex.Match(string)"/> before matching.
     /// </summary>
-    [DataContract]
-    public class FilterOptions
+    [DataMember]
+    public string? FilterRegExReplacement { get; set; }
+
+    /// <inheritdoc/>
+    public override string ToString()
     {
-        /// <summary>
-        /// Gets or sets the regular expression that will be applied on the property before matching.
-        /// </summary>
-        [DataMember]
-        public string FilterRegEx { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional regular expression replacement string. When this property is set, <see cref="System.Text.RegularExpressions.Regex.Replace"/>
-        /// will be called upon property value instead of <see cref="System.Text.RegularExpressions.Regex.Match"/> before matching.
-        /// </summary>
-        [DataMember]
-        public string FilterRegExReplacement { get; set; }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "FilterOptions:"));
-            sb.AppendLine(string.Format(CultureInfo.CurrentCulture,
-                "   FilterRegEx={0}   FilterRegExReplacement={1}",
-                this.FilterRegEx ?? string.Empty,
-                this.FilterRegExReplacement ?? string.Empty));
-            return sb.ToString();
-        }
+        StringBuilder sb = new();
+        sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "FilterOptions:"));
+        sb.AppendLine(string.Format(CultureInfo.CurrentCulture,
+            "   FilterRegEx={0}   FilterRegExReplacement={1}",
+            FilterRegEx ?? string.Empty,
+            FilterRegExReplacement ?? string.Empty));
+        return sb.ToString();
+    }
 
-        protected bool Equals(FilterOptions other) =>
-            other != null &&
-            string.Equals(this.FilterRegEx, other.FilterRegEx) &&
-            string.Equals(this.FilterRegExReplacement, other.FilterRegExReplacement);
+    protected bool Equals(FilterOptions? other) =>
+        other != null &&
+        string.Equals(FilterRegEx, other.FilterRegEx) &&
+        string.Equals(FilterRegExReplacement, other.FilterRegExReplacement);
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj) => Equals(obj as FilterOptions);
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => Equals(obj as FilterOptions);
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        unchecked
         {
-            unchecked
-            {
-                var hashCode = this.FilterRegEx.GetHashCode();
-                return (hashCode * 397) ^ (this.FilterRegExReplacement != null ? this.FilterRegExReplacement.GetHashCode() : 0);
-            }
+            var hashCode = FilterRegEx?.GetHashCode() ?? 0;
+            return (hashCode * 397) ^ (FilterRegExReplacement != null ? FilterRegExReplacement.GetHashCode() : 0);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/AttachDebuggerInfo.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/AttachDebuggerInfo.cs
new file mode 100644
index 0000000000..cec061d0a4
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/AttachDebuggerInfo.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+public class AttachDebuggerInfo
+{
+    public int ProcessId { get; set; }
+    public string? TargetFramework { get; set; }
+    public ICollection<string>? Sources { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IBaseProxy.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IBaseProxy.cs
index 838f6d8807..c22857a2fc 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IBaseProxy.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IBaseProxy.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Provides basic functionality for the Proxy Operation Manager.
+/// </summary>
+public interface IBaseProxy
 {
     /// <summary>
-    /// Provides basic functionality for the Proxy Operation Manager.
+    /// Updates the test process start info.
     /// </summary>
-    public interface IBaseProxy
-    {
-        /// <summary>
-        /// Updates the test process start info.
-        /// </summary>
-        /// 
-        /// <param name="testProcessStartInfo">The test process start info to be updated.</param>
-        /// 
-        /// <returns>The updated test process start info.</returns>
-        TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo);
-    }
+    ///
+    /// <param name="testProcessStartInfo">The test process start info to be updated.</param>
+    ///
+    /// <returns>The updated test process start info.</returns>
+    TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs
index ce3ab28efc..e0916eb363 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs
@@ -1,53 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// IDiscoverTestsRequest returned after calling GetDiscoveredTestsAsync
+/// </summary>
+public interface IDiscoveryRequest : IRequest
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Handler for notifying discovery process is started
+    /// </summary>
+    event EventHandler<DiscoveryStartEventArgs>? OnDiscoveryStart;
+
+    /// <summary>
+    /// Handler for notifying discovery process is complete
+    /// </summary>
+    event EventHandler<DiscoveryCompleteEventArgs>? OnDiscoveryComplete;
+
+    /// <summary>
+    /// Handler for notifying when newly found tests are available for UI to fetch.
+    /// </summary>
+    event EventHandler<DiscoveredTestsEventArgs>? OnDiscoveredTests;
 
     /// <summary>
-    /// IDiscoverTestsRequest returned after calling GetDiscoveredTestsAsync
+    /// Handler for receiving error during fetching/execution. This is used for when abnormal error
+    /// occurs; equivalent of IRunMessageLogger in the current RockSteady core
     /// </summary>
-    public interface IDiscoveryRequest : IRequest
+    event EventHandler<TestRunMessageEventArgs>? OnDiscoveryMessage;
+
+    /// <summary>
+    /// Gets the discovery criterion.
+    /// </summary>
+    DiscoveryCriteria DiscoveryCriteria
     {
-        /// <summary>
-        /// Handler for notifying discovery process is started
-        /// </summary>
-        event EventHandler<DiscoveryStartEventArgs> OnDiscoveryStart;
-
-        /// <summary>
-        /// Handler for notifying discovery process is complete
-        /// </summary>
-        event EventHandler<DiscoveryCompleteEventArgs> OnDiscoveryComplete;
-
-        /// <summary>
-        /// Handler for notifying when newly found tests are available for UI to fetch.
-        /// </summary>
-        event EventHandler<DiscoveredTestsEventArgs> OnDiscoveredTests;
-
-        /// <summary>
-        /// Handler for receiving error during fetching/execution. This is used for when abnormal error
-        /// occurs; equivalent of IRunMessageLogger in the current RockSteady core
-        /// </summary>
-        event EventHandler<TestRunMessageEventArgs> OnDiscoveryMessage;
-
-        /// <summary>
-        /// Gets the discovery criterion.
-        /// </summary>
-        DiscoveryCriteria DiscoveryCriteria
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Starts tests discovery async.
-        /// </summary>
-        void DiscoverAsync();
-
-        /// <summary>
-        /// Aborts the discovery request
-        /// </summary>
-        void Abort();
+        get;
     }
+
+    /// <summary>
+    /// Starts tests discovery async.
+    /// </summary>
+    void DiscoverAsync();
+
+    /// <summary>
+    /// Aborts the discovery request
+    /// </summary>
+    void Abort();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IInternalTestRunEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IInternalTestRunEventsHandler.cs
new file mode 100644
index 0000000000..58023601b0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IInternalTestRunEventsHandler.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface contract for handling internal test run events during run. This interface should have methods similar to <see cref="ITestRunEventsHandler"/> <see cref="ITestRunEventsHandler2"/>,
+/// but only the newest (most broad) version of each method, so that we only operate on the latest interface in the internals, and adapt on the edges.
+/// </summary>
+public interface IInternalTestRunEventsHandler : ITestMessageEventHandler
+{
+    /// <summary>
+    /// Handle the TestRunCompletion event from a test engine
+    /// </summary>
+    /// <param name="testRunCompleteArgs">TestRunCompletion Data</param>
+    /// <param name="lastChunkArgs">Last set of test results</param>
+    /// <param name="runContextAttachments">Attachments of the test run</param>
+    /// <param name="executorUris">ExecutorURIs of the adapters involved in test run</param>
+    void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris);
+
+    /// <summary>
+    /// Handle a change in TestRun i.e. new testresults and stats
+    /// </summary>
+    /// <param name="testRunChangedArgs">TestRunChanged Data</param>
+    void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs);
+
+    /// <summary>
+    /// Launches a process with a given process info under debugger
+    /// Adapter get to call into this to launch any additional processes under debugger
+    /// </summary>
+    /// <param name="testProcessStartInfo">Process start info</param>
+    /// <returns>ProcessId of the launched process</returns>
+    int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo);
+
+    /// <summary>
+    /// Attach debugger to an already running process.
+    /// </summary>
+    /// <param name="attachDebuggerInfo">Process ID of the process and tfm to which the debugger should be attached.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo);
+}
+
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMetricsCollection.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMetricsCollection.cs
index 91cba93e84..08611192ec 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMetricsCollection.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMetricsCollection.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// This Interface Provides API's to Collect Metrics.
+/// </summary>
+public interface IMetricsCollection
+{
     /// <summary>
-    /// This Interface Provides API's to Collect Metrics.
+    /// Add Metric in the Metrics Cache
     /// </summary>
-    public interface IMetricsCollection
-    {
-        /// <summary>
-        /// Add Metric in the Metrics Cache
-        /// </summary>
-        /// <param name="metric">Metric Message</param>
-        /// <param name="value">Value associated with Metric</param>
-        void Add(string metric, object value);
+    /// <param name="metric">Metric Message</param>
+    /// <param name="value">Value associated with Metric</param>
+    void Add(string metric, object value);
 
-        /// <summary>
-        /// Get Metrics
-        /// </summary>
-        /// <value>Returns the Telemetry Data Points</value>
-        IDictionary<string, object> Metrics { get; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Get Metrics
+    /// </summary>
+    /// <value>Returns the Telemetry Data Points</value>
+    IDictionary<string, object> Metrics { get; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequest.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequest.cs
index f9b8613e0b..1e0528060a 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequest.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequest.cs
@@ -1,43 +1,42 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Threading;
+using System;
+using System.Threading;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Represents any request to discover or run tests.
+/// </summary>
+public interface IRequest : IDisposable
+{
     /// <summary>
-    /// Represents any request to discover or run tests.
+    ///  Handler for receiving raw messages directly from host without any deserialization or morphing
+    ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
+    ///  All events should come as raw messages as well as actual serialized events
     /// </summary>
-    public interface IRequest : IDisposable
-    {
-        /// <summary>
-        ///  Handler for receiving raw messages directly from host without any deserialization or morphing
-        ///  This is required if one wants to re-direct the message over the process boundary without any processing overhead
-        ///  All events should come as raw messages as well as actual serialized events
-        /// </summary>
-        event EventHandler<string> OnRawMessageReceived;
+    event EventHandler<string> OnRawMessageReceived;
 
-        /// <summary>
-        /// Waits for the request to complete
-        /// </summary>
-        /// <param name="timeout">Time out</param>
-        /// <returns>True if the request timeouts</returns>
-        bool WaitForCompletion(int timeout);
-    }
+    /// <summary>
+    /// Waits for the request to complete
+    /// </summary>
+    /// <param name="timeout">Time out</param>
+    /// <returns>True if the request timeouts</returns>
+    bool WaitForCompletion(int timeout);
+}
 
+/// <summary>
+/// Extensions for <see cref="IRequest"/>.
+/// </summary>
+public static class RequestExtensions
+{
     /// <summary>
-    /// Extensions for <see cref="IRequest"/>.
+    /// Waits for the request to complete.
     /// </summary>
-    public static class RequestExtensions
+    /// <param name="request">Request to wait on.</param>
+    public static void WaitForCompletion(this IRequest request)
     {
-        /// <summary>
-        /// Waits for the request to complete.
-        /// </summary>
-        /// <param name="request">Request to wait on.</param>
-        public static void WaitForCompletion(this IRequest request)
-        {
-            request.WaitForCompletion(Timeout.Infinite);
-        }
+        request.WaitForCompletion(Timeout.Infinite);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequestData.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequestData.cs
index 64d6a35d60..e59657cd4c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequestData.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IRequestData.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Provide common services and data for a discovery/run request.
+/// </summary>
+public interface IRequestData
 {
     /// <summary>
-    /// Provide common services and data for a discovery/run request.
+    /// Gets an instance of <see cref="IMetricsCollection"/>.
     /// </summary>
-    public interface IRequestData
-    {
-        /// <summary>
-        /// Gets an instance of <see cref="IMetricsCollection"/>.
-        /// </summary>
-        IMetricsCollection MetricsCollection { get; set; }
+    IMetricsCollection MetricsCollection { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ProtocolConfig <see cref="ProtocolConfig"/>
-        /// </summary>
-        ProtocolConfig ProtocolConfig { get; set; }
+    /// <summary>
+    /// Gets or sets the ProtocolConfig <see cref="ProtocolConfig"/>
+    /// </summary>
+    ProtocolConfig? ProtocolConfig { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether is telemetry opted in.
-        /// </summary>
-        bool IsTelemetryOptedIn { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets a value indicating whether is telemetry opted in.
+    /// </summary>
+    bool IsTelemetryOptedIn { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITelemetryEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITelemetryEventsHandler.cs
new file mode 100644
index 0000000000..59786d5002
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITelemetryEventsHandler.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+public interface ITelemetryEventsHandler
+{
+    void HandleTelemetryEvent(TelemetryEvent telemetryEvent);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler.cs
index 5e31a3a3dc..d65d2c8756 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Interface contract for handling discovery events during test discovery operation
+/// </summary>
+public interface ITestDiscoveryEventsHandler : ITestMessageEventHandler
+{
     /// <summary>
-    /// Interface contract for handling discovery events during test discovery operation
+    /// Dispatch DiscoveryComplete event to listeners.
     /// </summary>
-    public interface ITestDiscoveryEventsHandler : ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Dispatch DiscoveryComplete event to listeners.
-        /// </summary>
-        /// <param name="totalTests">Total number of tests discovered.</param>
-        /// <param name="lastChunk">Last set of test cases discovered.</param>
-        /// <param name="isAborted">True if the discovery operation is aborted.</param>
-        void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase> lastChunk, bool isAborted);
+    /// <param name="totalTests">Total number of tests discovered.</param>
+    /// <param name="lastChunk">Last set of test cases discovered.</param>
+    /// <param name="isAborted">True if the discovery operation is aborted.</param>
+    void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase>? lastChunk, bool isAborted);
 
 
-        /// <summary>
-        /// Dispatch DiscoveredTest event to listeners.
-        /// </summary>
-        /// <param name="discoveredTestCases">Discovered  test cases.</param>
-        void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Dispatch DiscoveredTest event to listeners.
+    /// </summary>
+    /// <param name="discoveredTestCases">Discovered test cases.</param>
+    void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler2.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler2.cs
index 4b504b3257..a6583621d4 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestDiscoveryEventsHandler2.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Interface contract for handling discovery events during test discovery operation
+/// </summary>
+public interface ITestDiscoveryEventsHandler2 : ITestMessageEventHandler
+{
     /// <summary>
-    /// Interface contract for handling discovery events during test discovery operation
+    /// Dispatch DiscoveryComplete event to listeners.
     /// </summary>
-    public interface ITestDiscoveryEventsHandler2 : ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Dispatch DiscoveryComplete event to listeners.
-        /// </summary>
-        /// <param name="discoveryCompleteEventArgs">Discovery Complete Event Args</param>
-        /// <param name="lastChunk">Last set of test cases discovered.</param>
-        void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk);
+    /// <param name="discoveryCompleteEventArgs">Discovery Complete Event Args</param>
+    /// <param name="lastChunk">Last set of test cases discovered.</param>
+    void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk);
 
-        /// <summary>
-        /// Dispatch DiscoveredTest event to listeners.
-        /// </summary>
-        /// <param name="discoveredTestCases">Discovered  test cases.</param>
-        void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases);
-    }
+    /// <summary>
+    /// Dispatch DiscoveredTest event to listeners.
+    /// </summary>
+    /// <param name="discoveredTestCases">Discovered  test cases.</param>
+    void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs
index b49eaa7a86..ca0f32162a 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher.cs
@@ -3,31 +3,30 @@
 
 using System.Threading;
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+/// <summary>
+/// Interface defining contract for custom test host implementations
+/// </summary>
+public interface ITestHostLauncher
 {
     /// <summary>
-    /// Interface defining contract for custom test host implementations
+    /// Gets a value indicating whether this is a debug launcher.
     /// </summary>
-    public interface ITestHostLauncher
-    {
-        /// <summary>
-        /// Gets a value indicating whether this is a debug launcher.
-        /// </summary>
-        bool IsDebug { get; }
+    bool IsDebug { get; }
 
-        /// <summary>
-        /// Launches custom test host using the default test process start info
-        /// </summary>
-        /// <param name="defaultTestHostStartInfo">Default TestHost Process Info</param>
-        /// <returns>Process id of the launched test host</returns>
-        int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo);
+    /// <summary>
+    /// Launches custom test host using the default test process start info
+    /// </summary>
+    /// <param name="defaultTestHostStartInfo">Default TestHost Process Info</param>
+    /// <returns>Process id of the launched test host</returns>
+    int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo);
 
-        /// <summary>
-        /// Launches custom test host using the default test process start info
-        /// </summary>
-        /// <param name="defaultTestHostStartInfo">Default TestHost Process Info</param>
-        /// <param name="cancellationToken">The cancellation Token.</param>
-        /// <returns>Process id of the launched test host</returns>
-        int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Launches custom test host using the default test process start info
+    /// </summary>
+    /// <param name="defaultTestHostStartInfo">Default TestHost Process Info</param>
+    /// <param name="cancellationToken">The cancellation Token.</param>
+    /// <returns>Process id of the launched test host</returns>
+    int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher2.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher2.cs
index 641c6cbba7..98955ff2a9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher2.cs
@@ -3,26 +3,25 @@
 
 using System.Threading;
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+/// <summary>
+/// Interface defining contract for custom test host launcher implementation.
+/// </summary>
+public interface ITestHostLauncher2 : ITestHostLauncher
 {
     /// <summary>
-    /// Interface defining contract for custom test host implementations
+    /// Attach debugger to already running custom test host process.
     /// </summary>
-    public interface ITestHostLauncher2 : ITestHostLauncher
-    {
-        /// <summary>
-        /// Attach debugger to already running custom test host process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid);
+    /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(int pid);
 
-        /// <summary>
-        /// Attach debugger to already running custom test host process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Attach debugger to already running custom test host process.
+    /// </summary>
+    /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher3.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher3.cs
new file mode 100644
index 0000000000..a0ea576d78
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestHostLauncher3.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Threading;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+public interface ITestHostLauncher3 : ITestHostLauncher2
+{
+    /// <summary>
+    /// Attach debugger to already running custom test host process.
+    /// </summary>
+    /// <param name="attachDebuggerInfo">Process ID and target framework of the process to which the debugger should be attached.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo, CancellationToken cancellationToken);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs
index 4f487a02f7..789a84d3f3 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs
@@ -1,78 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Defines the functionality of the test platform.
+/// </summary>
+public interface ITestPlatform : IDisposable
+{
     /// <summary>
-    /// Defines the functionality of the test platform.
+    /// Updates the extensions to be used by the test service.
     /// </summary>
-    public interface ITestPlatform : IDisposable
-    {
-        /// <summary>
-        /// Updates the extensions to be used by the test service.
-        /// </summary>
-        /// 
-        /// <param name="pathToAdditionalExtensions">
-        /// Specifies the path to unit test extensions. If no additional extension is available,
-        /// then specify null or empty list.
-        /// </param>
-        /// <param name="skipExtensionFilters">
-        /// Flag indicating if we should skip the default adapters initialization.
-        /// </param>
-        void UpdateExtensions(
-            IEnumerable<string> pathToAdditionalExtensions,
-            bool skipExtensionFilters);
+    ///
+    /// <param name="pathToAdditionalExtensions">
+    /// Specifies the path to unit test extensions. If no additional extension is available,
+    /// then specify null or empty list.
+    /// </param>
+    /// <param name="skipExtensionFilters">
+    /// Flag indicating if we should skip the default adapters initialization.
+    /// </param>
+    void UpdateExtensions(
+        IEnumerable<string>? pathToAdditionalExtensions,
+        bool skipExtensionFilters);
 
-        /// <summary>
-        /// Clears the extensions.
-        /// </summary>
-        void ClearExtensions();
+    /// <summary>
+    /// Clears the extensions.
+    /// </summary>
+    void ClearExtensions();
 
-        /// <summary>
-        /// Creates a discovery request.
-        /// </summary>
-        /// 
-        /// <param name="requestData">Providing common services and data for discovery.</param>
-        /// <param name="discoveryCriteria">Specifies the discovery parameters.</param>
-        /// <param name="options">Test platform options.</param>
-        /// 
-        /// <returns>A DiscoveryRequest object.</returns>
-        IDiscoveryRequest CreateDiscoveryRequest(
-            IRequestData requestData,
-            DiscoveryCriteria discoveryCriteria,
-            TestPlatformOptions options);
+    /// <summary>
+    /// Creates a discovery request.
+    /// </summary>
+    ///
+    /// <param name="requestData">Providing common services and data for discovery.</param>
+    /// <param name="discoveryCriteria">Specifies the discovery parameters.</param>
+    /// <param name="options">Test platform options.</param>
+    /// <param name="sourceToSourceDetailMap">Details of each dll (source).</param>
+    /// <param name="warningLogger">Logger to use for warnings.</param>
+    ///
+    /// <returns>A DiscoveryRequest object.</returns>
+    IDiscoveryRequest CreateDiscoveryRequest(
+        IRequestData requestData,
+        DiscoveryCriteria discoveryCriteria,
+        TestPlatformOptions? options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 
-        /// <summary>
-        /// Creates a test run request.
-        /// </summary>
-        /// 
-        /// <param name="requestData">Providing common services and data for execution.</param>
-        /// <param name="testRunCriteria">Specifies the test run criteria.</param>
-        /// <param name="options">Test platform options.</param>
-        /// 
-        /// <returns>A RunRequest object.</returns>
-        ITestRunRequest CreateTestRunRequest(
-            IRequestData requestData,
-            TestRunCriteria testRunCriteria,
-            TestPlatformOptions options);
+    /// <summary>
+    /// Creates a test run request.
+    /// </summary>
+    ///
+    /// <param name="requestData">Providing common services and data for execution.</param>
+    /// <param name="testRunCriteria">Specifies the test run criteria.</param>
+    /// <param name="options">Test platform options.</param>
+    /// <param name="sourceToSourceDetailMap">Details of each dll (source).</param>
+    /// <param name="warningLogger">Logger to use for warnings.</param>
+    ///
+    /// <returns>A RunRequest object.</returns>
+    ITestRunRequest CreateTestRunRequest(
+        IRequestData requestData,
+        TestRunCriteria testRunCriteria,
+        TestPlatformOptions? options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 
-        /// <summary>
-        /// Starts a test session.
-        /// </summary>
-        /// 
-        /// <param name="requestData">
-        /// Providing common services and data for test session start.
-        /// </param>
-        /// <param name="criteria">Specifies the start test session criteria.</param>
-        /// <param name="eventsHandler">Events handler for handling session events.</param>
-        ///
-        /// <returns>True if the operation succeeded, false otherwise.</returns>
-        bool StartTestSession(
-            IRequestData requestData,
-            StartTestSessionCriteria criteria,
-            ITestSessionEventsHandler eventsHandler);
-    }
+    /// <summary>
+    /// Starts a test session.
+    /// </summary>
+    ///
+    /// <param name="requestData">
+    /// Providing common services and data for test session start.
+    /// </param>
+    /// <param name="criteria">Specifies the start test session criteria.</param>
+    /// <param name="eventsHandler">Events handler for handling session events.</param>
+    /// <param name="sourceToSourceDetailMap">Details of each dll (source).</param>
+    /// <param name="warningLogger">Logger to use for warnings.</param>
+    ///
+    /// <returns>True if the operation succeeded, false otherwise.</returns>
+    bool StartTestSession(
+        IRequestData requestData,
+        StartTestSessionCriteria criteria,
+        ITestSessionEventsHandler eventsHandler,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap,
+        IWarningLogger warningLogger);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatformCapabilities.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatformCapabilities.cs
index 9202bea31a..381c47aed5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatformCapabilities.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatformCapabilities.cs
@@ -1,32 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Diagnostics.CodeAnalysis;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Basic metadata for ITestPlaform.
+/// </summary>
+/// <remarks>
+/// This interface is only public due to limitations in MEF which require metadata interfaces
+/// to be public.  This interface is not intended for external consumption.
+/// </remarks>
+public interface ITestPlatformCapabilities
+{
     /// <summary>
-    /// Basic metadata for ITestPlaform.
+    /// Type of testPlatform
     /// </summary>
-    /// <remarks>
-    /// This interface is only public due to limitations in MEF which require metadata interfaces
-    /// to be public.  This interface is not intended for external consumption.
-    /// </remarks>
-    [SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes", Justification = "This interface is only public due to limitations in MEF which require metadata interfaces to be public.")]
-    public interface ITestPlatformCapabilities
-    {
-        /// <summary>
-        /// Type of testPlatform
-        /// </summary>
-        TestPlatformType TestPlatformType { get; }
-    }
-
-    public enum TestPlatformType
-    {
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
-        InProc,
+    TestPlatformType TestPlatformType { get; }
+}
 
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
-        OutOfProc
-    }
+public enum TestPlatformType
+{
+    InProc,
+    OutOfProc
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunAttachmentsProcessingEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunAttachmentsProcessingEventsHandler.cs
index f6235a92e9..be41a6689c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunAttachmentsProcessingEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunAttachmentsProcessingEventsHandler.cs
@@ -3,30 +3,31 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface contract for handling test run attachments processing events
+/// </summary>
+public interface ITestRunAttachmentsProcessingEventsHandler : ITestMessageEventHandler
 {
     /// <summary>
-    /// Interface contract for handling test run attachments processing events
+    /// Dispatch TestRunAttachmentsProcessingComplete event to listeners.
+    /// </summary>
+    /// <param name="attachmentsProcessingCompleteEventArgs">AttachmentsProcessing Complete event args.</param>
+    /// <param name="lastChunk">Last set of processed attachment sets.</param>
+    void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet>? lastChunk);
+
+    /// <summary>
+    /// Dispatch ProcessedAttachmentsChunk event to listeners.
     /// </summary>
-    public interface ITestRunAttachmentsProcessingEventsHandler : ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Dispatch TestRunAttachmentsProcessingComplete event to listeners.
-        /// </summary>
-        /// <param name="attachmentsProcessingCompleteEventArgs">AttachmentsProcessing Complete event args.</param>
-        /// <param name="attachments">Last set of processed attachment sets.</param>
-        void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk);
+    /// <param name="attachments">Processed attachment sets.</param>
+    void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments);
 
-        /// <summary>
-        /// Dispatch ProcessedAttachmentsChunk event to listeners.
-        /// </summary>
-        /// <param name="attachments">Processed attachment sets.</param>
-        void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments);
 
-        /// <summary>
-        /// Dispatch TestRunAttachmentsProcessingProgress event to listeners.
-        /// </summary>
-        /// <param name="AttachmentsProcessingProgressEventArgs">AttachmentsProcessing Progress event args.</param>
-        void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs);
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Dispatch TestRunAttachmentsProcessingProgress event to listeners.
+    /// </summary>
+    /// <param name="AttachmentsProcessingProgressEventArgs">AttachmentsProcessing Progress event args.</param>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Part of the public API.")]
+    void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunConfiguration.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunConfiguration.cs
index cc81408b5b..3e9f82bbbb 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunConfiguration.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunConfiguration.cs
@@ -1,40 +1,39 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Defines common test run configuration APIs
+/// </summary>
+public interface ITestRunConfiguration
+{
     /// <summary>
-    /// Defines common test run configuration APIs
+    /// Defines the frequency of run stats test event.
     /// </summary>
-    public interface ITestRunConfiguration
-    {
-        /// <summary>
-        /// Defines the frequency of run stats test event.
-        /// </summary>
-        /// <remarks>
-        /// Run stats change event will be raised after completion of these number of tests.
-        ///
-        /// Note that this event is raised asynchronously and the underlying execution process is not
-        /// paused during the listener invocation. So if the event handler, you try to query the
-        /// next set of results, you may get more than 'FrequencyOfRunStatsChangeEvent'.
-        /// </remarks>
-        long FrequencyOfRunStatsChangeEvent { get; }
+    /// <remarks>
+    /// Run stats change event will be raised after completion of these number of tests.
+    ///
+    /// Note that this event is raised asynchronously and the underlying execution process is not
+    /// paused during the listener invocation. So if the event handler, you try to query the
+    /// next set of results, you may get more than 'FrequencyOfRunStatsChangeEvent'.
+    /// </remarks>
+    long FrequencyOfRunStatsChangeEvent { get; }
 
-        /// <summary>
-        /// Returns whether the run is configured to run specific tests
-        /// </summary>
-        bool HasSpecificTests { get; }
+    /// <summary>
+    /// Returns whether the run is configured to run specific tests
+    /// </summary>
+    bool HasSpecificTests { get; }
 
-        /// <summary>
-        /// Returns whether the run is configured to run specific sources
-        /// </summary>
-        bool HasSpecificSources { get; }
+    /// <summary>
+    /// Returns whether the run is configured to run specific sources
+    /// </summary>
+    bool HasSpecificSources { get; }
 
-        /// <summary>
-        /// The specific tests for this test run if any.
-        /// </summary>
-        IEnumerable<TestCase> Tests { get; }
-    }
+    /// <summary>
+    /// The specific tests for this test run if any.
+    /// </summary>
+    IEnumerable<TestCase>? Tests { get; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler.cs
index ecd37b85c7..081151590e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler.cs
@@ -1,57 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface contract for handling test run events during run operation
+/// </summary>
+public interface ITestRunEventsHandler : ITestMessageEventHandler
 {
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Handle the TestRunCompletion event from a test engine
+    /// </summary>
+    /// <param name="testRunCompleteArgs">TestRunCompletion Data</param>
+    /// <param name="lastChunkArgs">Last set of test results</param>
+    /// <param name="runContextAttachments">Attachments of the test run</param>
+    /// <param name="executorUris">ExecutorURIs of the adapters involved in test run</param>
+    void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs? lastChunkArgs, ICollection<AttachmentSet>? runContextAttachments, ICollection<string>? executorUris);
+
+    /// <summary>
+    /// Handle a change in TestRun i.e. new testresults and stats
+    /// </summary>
+    /// <param name="testRunChangedArgs">TestRunChanged Data</param>
+    void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs);
+
+    /// <summary>
+    /// Launches a process with a given process info under debugger
+    /// Adapter get to call into this to launch any additional processes under debugger
+    /// </summary>
+    /// <param name="testProcessStartInfo">Process start info</param>
+    /// <returns>ProcessId of the launched process</returns>
+    int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo);
+}
 
+/// <summary>
+/// Interface for handling generic message events during various operations
+/// </summary>
+public interface ITestMessageEventHandler
+{
     /// <summary>
-    /// Interface contract for handling test run events during run operation
+    /// Raw Message from the host directly
     /// </summary>
-    public interface ITestRunEventsHandler : ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Handle the TestRunCompletion event from a test engine
-        /// </summary>
-        /// <param name="testRunCompleteArgs">TestRunCompletion Data</param>
-        /// <param name="lastChunkArgs">Last set of test results</param>
-        /// <param name="runContextAttachments">Attachments of the test run</param>
-        /// <param name="executorUris">ExecutorURIs of the adapters involved in test run</param>
-        void HandleTestRunComplete(TestRunCompleteEventArgs testRunCompleteArgs, TestRunChangedEventArgs lastChunkArgs, ICollection<AttachmentSet> runContextAttachments, ICollection<string> executorUris);
-
-        /// <summary>
-        /// Handle a change in TestRun i.e. new testresults and stats
-        /// </summary>
-        /// <param name="testRunChangedArgs">TestRunChanged Data</param>
-        void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs);
-
-        /// <summary>
-        /// Launches a process with a given process info under debugger
-        /// Adapter get to call into this to launch any additional processes under debugger
-        /// </summary>
-        /// <param name="testProcessStartInfo">Process start info</param>
-        /// <returns>ProcessId of the launched process</returns>
-        int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo);
-    }
+    /// <param name="rawMessage">raw message args from host</param>
+    void HandleRawMessage(string rawMessage);
 
     /// <summary>
-    /// Interface for handling generic message events during various operations
+    /// Handle a IMessageLogger message event from Adapter
+    /// Whenever adapters call IMessageLogger.SendMessage, TestEngine notifies client with this event
     /// </summary>
-    public interface ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Raw Message from the host directly
-        /// </summary>
-        /// <param name="rawMessage">raw message args from host</param>
-        void HandleRawMessage(string rawMessage);
-
-        /// <summary>
-        /// Handle a IMessageLogger message event from Adapter
-        /// Whenever adapters call IMessageLogger.SendMessage, TestEngine notifies client with this event
-        /// </summary>
-        /// <param name="level">Message Level</param>
-        /// <param name="message">string message</param>
-        void HandleLogMessage(TestMessageLevel level, string message);
-    }
-}
\ No newline at end of file
+    /// <param name="level">Message Level</param>
+    /// <param name="message">string message</param>
+    void HandleLogMessage(TestMessageLevel level, string? message);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler2.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler2.cs
index a8ff3e742f..099c6d4a32 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunEventsHandler2.cs
@@ -1,18 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface contract for handling test run events during run operation.
+/// </summary>
+[Obsolete("You don't have to implement this interface, AttachDebuggerToProcess it is never called back. To attach to debugger implement ITestHostLauncher2 or ITestHostLauncher3.")]
+// /!\ Possible future interface should not be based on this interface, use ITestRunEventsHandler instead.
+public interface ITestRunEventsHandler2 : ITestRunEventsHandler
 {
     /// <summary>
-    /// Interface contract for handling test run events during run operation.
+    /// Attach debugger to an already running process.
     /// </summary>
-    public interface ITestRunEventsHandler2 : ITestRunEventsHandler
-    {
-        /// <summary>
-        /// Attach debugger to an already running process.
-        /// </summary>
-        /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
-        /// <returns><see cref="true"/> if the debugger was successfully attached to the requested process, <see cref="false"/> otherwise.</returns>
-        bool AttachDebuggerToProcess(int pid);
-    }
+    /// <param name="pid">Process ID of the process to which the debugger should be attached.</param>
+    /// <returns><see langword="true"/> if the debugger was successfully attached to the requested process, <see langword="false"/> otherwise.</returns>
+    [Obsolete("You don't have to implement this it is never called back. To attach to debugger implement ITestHostLauncher2 or ITestHostLauncher3.")]
+    bool AttachDebuggerToProcess(int pid);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunRequest.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunRequest.cs
index 43840f7f5d..9d4990d26c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunRequest.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunRequest.cs
@@ -1,69 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// The request that a RunTests API returns.
+/// </summary>
+public interface ITestRunRequest : IRequest
+{
     /// <summary>
-    /// The request that a RunTests API returns.
+    /// Start the current RunTestAsync API call.
     /// </summary>
-    public interface ITestRunRequest : IRequest
-    {
-        /// <summary>
-        /// Start the current RunTestAsync API call.
-        /// </summary>
-        /// <returns>Id of the executor process </returns>
-        int ExecuteAsync();
+    /// <returns>Id of the executor process </returns>
+    int ExecuteAsync();
 
-        /// <summary>
-        ///  Cancel the current RunTestsAsync API call. This can be used when  making async RunTestsAsync call.
-        /// </summary>
-        void CancelAsync();
+    /// <summary>
+    ///  Cancel the current RunTestsAsync API call. This can be used when  making async RunTestsAsync call.
+    /// </summary>
+    void CancelAsync();
 
-        /// <summary>
-        ///  Aborts the test run execution process.
-        /// </summary>
-        void Abort();
+    /// <summary>
+    ///  Aborts the test run execution process.
+    /// </summary>
+    void Abort();
 
-        /// <summary>
-        /// Specifies the test run criteria
-        /// </summary>
-        ITestRunConfiguration TestRunConfiguration
-        {
-            get;
-        }
+    /// <summary>
+    /// Specifies the test run criteria
+    /// </summary>
+    ITestRunConfiguration TestRunConfiguration
+    {
+        get;
+    }
 
-        /// <summary>
-        /// State of the test run
-        /// </summary>
-        TestRunState State { get; }
+    /// <summary>
+    /// State of the test run
+    /// </summary>
+    TestRunState State { get; }
 
-        /// <summary>
-        ///  Handler for notifying when test results came back from the agent!
-        /// </summary>
-        event EventHandler<TestRunChangedEventArgs> OnRunStatsChange;
+    /// <summary>
+    ///  Handler for notifying when test results came back from the agent!
+    /// </summary>
+    event EventHandler<TestRunChangedEventArgs> OnRunStatsChange;
 
-        /// <summary>
-        ///  Handler for notifying test run started
-        /// </summary>
-        event EventHandler<TestRunStartEventArgs> OnRunStart;
+    /// <summary>
+    ///  Handler for notifying test run started
+    /// </summary>
+    event EventHandler<TestRunStartEventArgs> OnRunStart;
 
-        /// <summary>
-        ///  Handler for notifying test run is complete
-        /// </summary>
-        event EventHandler<TestRunCompleteEventArgs> OnRunCompletion;
+    /// <summary>
+    ///  Handler for notifying test run is complete
+    /// </summary>
+    event EventHandler<TestRunCompleteEventArgs> OnRunCompletion;
 
-        /// <summary>
-        ///  Handler for receiving error during fetching/execution. This is used for when abnormal error
-        ///  occurs; equivalent of IRunMessageLogger in the current RockSteady core
-        /// </summary>
-        event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    /// <summary>
+    ///  Handler for receiving error during fetching/execution. This is used for when abnormal error
+    ///  occurs; equivalent of IRunMessageLogger in the current RockSteady core
+    /// </summary>
+    event EventHandler<TestRunMessageEventArgs> TestRunMessage;
 
-        /// <summary>
-        ///  Handler for receiving data collection messages.
-        /// </summary>
-        event EventHandler<DataCollectionMessageEventArgs> DataCollectionMessage;
-    }
+    /// <summary>
+    ///  Handler for receiving data collection messages.
+    /// </summary>
+    event EventHandler<DataCollectionMessageEventArgs> DataCollectionMessage;
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunStatistics.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunStatistics.cs
index 43d6b52b70..d2a0e165a5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunStatistics.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestRunStatistics.cs
@@ -1,31 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Stats on the test run state
+/// </summary>
+public interface ITestRunStatistics
+{
     /// <summary>
-    /// Stats on the test run state
+    /// The number of tests that have the specified value of TestOutcome
     /// </summary>
-    public interface ITestRunStatistics
-    {
-        /// <summary>
-        /// The number of tests that have the specified value of TestOutcome
-        /// </summary>
-        /// <param name="testOutcome"></param>
-        /// <returns></returns>
-        long this[TestOutcome testOutcome] { get; }
-
-        /// <summary>
-        /// TestOutcome - Test count map
-        /// </summary>
-        IDictionary<TestOutcome, long> Stats { get; }
+    /// <param name="testOutcome"></param>
+    /// <returns></returns>
+    long this[TestOutcome testOutcome] { get; }
 
-        /// <summary>
-        /// Number of tests that have been run.
-        /// </summary>
-        long ExecutedTests { get; }
-    }
+    /// <summary>
+    /// TestOutcome - Test count map
+    /// </summary>
+    IDictionary<TestOutcome, long>? Stats { get; }
 
+    /// <summary>
+    /// Number of tests that have been run.
+    /// </summary>
+    long ExecutedTests { get; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestSessionEventsHandler.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestSessionEventsHandler.cs
index fc3dea783a..d94638a2f8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestSessionEventsHandler.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestSessionEventsHandler.cs
@@ -1,30 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface contract for handling test session events.
+/// </summary>
+public interface ITestSessionEventsHandler : ITestMessageEventHandler
 {
     /// <summary>
-    /// Interface contract for handling test session events.
+    /// Dispatch StartTestSession complete event to listeners.
     /// </summary>
-    public interface ITestSessionEventsHandler : ITestMessageEventHandler
-    {
-        /// <summary>
-        /// Dispatch StartTestSession complete event to listeners.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info.</param>
-        void HandleStartTestSessionComplete(TestSessionInfo testSessionInfo);
+    ///
+    /// <param name="eventArgs">The event args.</param>
+    void HandleStartTestSessionComplete(StartTestSessionCompleteEventArgs? eventArgs);
 
-        /// <summary>
-        /// Dispatch StopTestSession complete event to listeners.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">
-        /// The test session info for the session that was stopped.
-        /// </param>
-        /// <param name="stopped">
-        /// True if the session was successfully stopped, false otherwise.
-        /// </param>
-        void HandleStopTestSessionComplete(TestSessionInfo testSessionInfo, bool stopped);
-    }
+    /// <summary>
+    /// Dispatch StopTestSession complete event to listeners.
+    /// </summary>
+    ///
+    /// <param name="eventArgs">The event args.</param>
+    void HandleStopTestSessionComplete(StopTestSessionCompleteEventArgs? eventArgs);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IWarningLogger.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IWarningLogger.cs
new file mode 100644
index 0000000000..ded7ceaf39
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IWarningLogger.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// DO NOT use this to extend TestPlatform, it is public only because ITestPlatform is also public, and will be made internal later.
+/// </summary>
+public interface IWarningLogger
+{
+    /// <summary>
+    /// Log warning message that will be shown to user.
+    /// </summary>
+    /// <param name="message">message string</param>
+    void LogWarning(string message);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/CustomHostLaunchAckPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/CustomHostLaunchAckPayload.cs
index 60cae27735..7c6799b35d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/CustomHostLaunchAckPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/CustomHostLaunchAckPayload.cs
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Class used to define the CustomHostLaunchAckPayload sent by the Vstest.console translation layers into design mode
+/// </summary>
+public class CustomHostLaunchAckPayload
+{
     /// <summary>
-    /// Class used to define the CustomHostLaunchAckPayload sent by the Vstest.console translation layers into design mode
+    /// ProcessId of the TestHost launched by Clients like IDE, LUT etc.
     /// </summary>
-    public class CustomHostLaunchAckPayload
-    {
-        /// <summary>
-        /// ProcessId of the TestHost launched by Clients like IDE, LUT etc.
-        /// </summary>
-        [DataMember]
-        public int HostProcessId { get; set; }
+    [DataMember]
+    public int HostProcessId { get; set; }
 
-        /// <summary>
-        /// ErrorMessage, in cases where custom launch fails
-        /// </summary>
-        [DataMember]
-        public string ErrorMessage { get; set; }
-    }
+    /// <summary>
+    /// ErrorMessage, in cases where custom launch fails
+    /// </summary>
+    [DataMember]
+    public string? ErrorMessage { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/DiscoveryRequestPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/DiscoveryRequestPayload.cs
index c8a69408ca..a7bd6b3fc5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/DiscoveryRequestPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/DiscoveryRequestPayload.cs
@@ -1,43 +1,42 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Class used to define the DiscoveryRequestPayload sent by the Vstest.console translation layers into design mode
+/// </summary>
+[DataContract]
+public class DiscoveryRequestPayload
+{
     /// <summary>
-    /// Class used to define the DiscoveryRequestPayload sent by the Vstest.console translation layers into design mode
+    /// Settings used for the discovery request.
     /// </summary>
-    [DataContract]
-    public class DiscoveryRequestPayload
-    {
-        /// <summary>
-        /// Settings used for the discovery request.
-        /// </summary>
-        [DataMember]
-        public IEnumerable<string> Sources { get; set; }
+    [DataMember]
+    public IEnumerable<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Settings used for the discovery request.
-        /// </summary>
-        [DataMember]
-        public string RunSettings { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test platform options
-        /// </summary>
-        [DataMember]
-        public TestPlatformOptions TestPlatformOptions
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Settings used for the discovery request.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the test session info.
-        /// </summary>
-        [DataMember]
-        public TestSessionInfo TestSessionInfo { get; set; }
+    /// <summary>
+    /// Gets or sets the test platform options
+    /// </summary>
+    [DataMember]
+    public TestPlatformOptions? TestPlatformOptions
+    {
+        get;
+        set;
     }
+
+    /// <summary>
+    /// Gets or sets the test session info.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/EditorAttachDebuggerAckPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/EditorAttachDebuggerAckPayload.cs
index 268ccd1d6b..a18244e1b9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/EditorAttachDebuggerAckPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/EditorAttachDebuggerAckPayload.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Class used to define the <see cref="EditorAttachDebuggerAckPayload"/> sent by the
+/// vstest.console translation layers into design mode.
+/// </summary>
+public class EditorAttachDebuggerAckPayload
+{
     /// <summary>
-    /// Class used to define the <see cref="EditorAttachDebuggerAckPayload"/> sent by the
-    /// vstest.console translation layers into design mode.
+    /// A value indicating if the debugger has successfully attached.
     /// </summary>
-    public class EditorAttachDebuggerAckPayload
-    {
-        /// <summary>
-        /// A value indicating if the debugger has successfully attached.
-        /// </summary>
-        [DataMember]
-        public bool Attached { get; set; }
+    [DataMember]
+    public bool Attached { get; set; }
 
-        /// <summary>
-        /// ErrorMessage, in cases where attaching the debugger fails.
-        /// </summary>
-        [DataMember]
-        public string ErrorMessage { get; set; }
-    }
+    /// <summary>
+    /// ErrorMessage, in cases where attaching the debugger fails.
+    /// </summary>
+    [DataMember]
+    public string? ErrorMessage { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionAckPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionAckPayload.cs
index 5ec1bc5c79..6e3b892e26 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionAckPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionAckPayload.cs
@@ -1,20 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
 
+/// <summary>
+/// Class used to define the start test session ack payload sent by the design mode client
+/// back to the vstest.console translation layers.
+/// </summary>
+[DataContract]
+public class StartTestSessionAckPayload
+{
     /// <summary>
-    /// Class used to define the start test session ack payload sent by the design mode client
-    /// back to the vstest.console translation layers.
+    /// Gets or sets the event args.
     /// </summary>
-    public class StartTestSessionAckPayload
-    {
-        /// <summary>
-        /// Gets or sets the test session info.
-        /// </summary>
-        [DataMember]
-        public TestSessionInfo TestSessionInfo { get; set; }
-    }
+    [DataMember]
+    public StartTestSessionCompleteEventArgs? EventArgs { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionPayload.cs
index cf25fe44a7..eef7d1cd37 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StartTestSessionPayload.cs
@@ -1,45 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
 
+/// <summary>
+/// Class used to define the start test session payload sent by the vstest.console translation
+/// layers into design mode.
+/// </summary>
+[DataContract]
+public class StartTestSessionPayload
+{
     /// <summary>
-    /// Class used to define the start test session payload sent by the vstest.console translation
-    /// layers into design mode.
+    /// Gets or sets the sources used for starting the test session.
     /// </summary>
-    public class StartTestSessionPayload
-    {
-        /// <summary>
-        /// Gets or sets the sources used for starting the test session.
-        /// </summary>
-        [DataMember]
-        public IList<string> Sources { get; set; }
+    [DataMember]
+    public IList<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Gets or sets the run settings used for starting the test session.
-        /// </summary>
-        [DataMember]
-        public string RunSettings { get; set; }
+    /// <summary>
+    /// Gets or sets the run settings used for starting the test session.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets a flag indicating if debugging is enabled.
-        /// </summary>
-        [DataMember]
-        public bool IsDebuggingEnabled { get; set; }
+    /// <summary>
+    /// Gets or sets a flag indicating if debugging is enabled.
+    /// </summary>
+    [DataMember]
+    public bool IsDebuggingEnabled { get; set; }
 
-        /// <summary>
-        /// Gets or sets a flag indicating if a custom host launcher should be used.
-        /// </summary>
-        [DataMember]
-        public bool HasCustomHostLauncher { get; set; }
+    /// <summary>
+    /// Gets or sets a flag indicating if a custom host launcher should be used.
+    /// </summary>
+    [DataMember]
+    public bool HasCustomHostLauncher { get; set; }
 
-        /// <summary>
-        /// Gets or sets the test platform options.
-        /// </summary>
-        [DataMember]
-        public TestPlatformOptions TestPlatformOptions { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the test platform options.
+    /// </summary>
+    [DataMember]
+    public TestPlatformOptions? TestPlatformOptions { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionAckPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionAckPayload.cs
index ecca18eafd..fbc266aa78 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionAckPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionAckPayload.cs
@@ -1,26 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
 
+/// <summary>
+/// Class used to define the stop test session ack payload sent by the design mode client
+/// back to the vstest.console translation layers.
+/// </summary>
+[DataContract]
+public class StopTestSessionAckPayload
+{
     /// <summary>
-    /// Class used to define the stop test session ack payload sent by the design mode client
-    /// back to the vstest.console translation layers.
+    /// Gets or sets the event args.
     /// </summary>
-    public class StopTestSessionAckPayload
-    {
-        /// <summary>
-        /// Gets or sets the test session info.
-        /// </summary>
-        [DataMember]
-        public TestSessionInfo TestSessionInfo { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating if the session was successfully stopped or not.
-        /// </summary>
-        [DataMember]
-        public bool IsStopped { get; set; }
-    }
+    [DataMember]
+    public StopTestSessionCompleteEventArgs? EventArgs { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionPayload.cs
new file mode 100644
index 0000000000..c09f3be1ca
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/StopTestSessionPayload.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+
+/// <summary>
+/// Class used to define the stop test session payload sent by the vstest.console translation
+/// layers into design mode.
+/// </summary>
+[DataContract]
+public class StopTestSessionPayload
+{
+    /// <summary>
+    /// Gets or sets the test session info.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
+
+    /// <summary>
+    /// Gets or sets a flag indicating if metrics should be collected.
+    /// </summary>
+    [DataMember]
+    public bool CollectMetrics { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunAttachmentsProcessingPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunAttachmentsProcessingPayload.cs
index 6abdb68082..2b3046024f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunAttachmentsProcessingPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunAttachmentsProcessingPayload.cs
@@ -1,26 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Class used to define the TestRunAttachmentsProcessingPayload sent by the Vstest.console translation layers into design mode
+/// </summary>
+public class TestRunAttachmentsProcessingPayload
 {
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+    /// <summary>
+    /// Collection of attachments.
+    /// </summary>
+    [DataMember]
+    public IEnumerable<AttachmentSet>? Attachments { get; set; }
 
     /// <summary>
-    /// Class used to define the TestRunAttachmentsProcessingPayload sent by the Vstest.console translation layers into design mode
+    /// Collection of the invoked data collectors.
     /// </summary>
-    public class TestRunAttachmentsProcessingPayload
-    {
-        /// <summary>
-        /// Collection of attachments.
-        /// </summary>
-        [DataMember]
-        public IEnumerable<AttachmentSet> Attachments { get; set; }
+    [DataMember]
+    public IEnumerable<InvokedDataCollector>? InvokedDataCollectors { get; set; }
 
-        /// <summary>
-        ///  Gets or sets whether Metrics should be collected or not.
-        /// </summary>
-        [DataMember]
-        public bool CollectMetrics { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the settings used for the test run request.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; set; }
+
+    /// <summary>
+    ///  Gets or sets whether Metrics should be collected or not.
+    /// </summary>
+    [DataMember]
+    public bool CollectMetrics { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunRequestPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunRequestPayload.cs
index 2c37f3e086..e162c89f7e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunRequestPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/Payloads/TestRunRequestPayload.cs
@@ -1,64 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Class used to define the TestRunRequestPayload sent by the Vstest.console translation layers into design mode
+/// </summary>
+public class TestRunRequestPayload
+{
     /// <summary>
-    /// Class used to define the TestRunRequestPayload sent by the Vstest.console translation layers into design mode
+    /// Gets or sets the sources for the test run request.
     /// </summary>
-    public class TestRunRequestPayload
-    {
-        /// <summary>
-        /// Gets or sets the sources for the test run request.
-        /// </summary>
-        /// <remarks>
-        /// Making this a list instead of an IEnumerable because the json serializer fails to deserialize
-        /// if a linq query outputs the IEnumerable.
-        /// </remarks>
-        [DataMember]
-        public List<string> Sources { get; set; }
+    /// <remarks>
+    /// Making this a list instead of an IEnumerable because the json serializer fails to deserialize
+    /// if a linq query outputs the IEnumerable.
+    /// </remarks>
+    [DataMember]
+    public List<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Gets or sets the test cases for the test run request.
-        /// </summary>
-        /// <remarks>
-        /// Making this a list instead of an IEnumerable because the json serializer fails to deserialize
-        /// if a linq query outputs the IEnumerable.
-        /// </remarks>
-        [DataMember]
-        public List<TestCase> TestCases { get; set; }
+    /// <summary>
+    /// Gets or sets the test cases for the test run request.
+    /// </summary>
+    /// <remarks>
+    /// Making this a list instead of an IEnumerable because the json serializer fails to deserialize
+    /// if a linq query outputs the IEnumerable.
+    /// </remarks>
+    [DataMember]
+    public List<TestCase>? TestCases { get; set; }
 
-        /// <summary>
-        /// Gets or sets the settings used for the test run request.
-        /// </summary>
-        [DataMember]
-        public string RunSettings { get; set; }
+    /// <summary>
+    /// Gets or sets the settings used for the test run request.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; set; }
 
-        /// <summary>
-        /// Settings used for the Run request.
-        /// </summary>
-        [DataMember]
-        public bool KeepAlive { get; set; }
+    /// <summary>
+    /// Settings used for the Run request.
+    /// </summary>
+    [DataMember]
+    public bool KeepAlive { get; set; }
 
-        /// <summary>
-        /// Is Debugging enabled
-        /// </summary>
-        [DataMember]
-        public bool DebuggingEnabled { get; set; }
+    /// <summary>
+    /// Is Debugging enabled
+    /// </summary>
+    [DataMember]
+    public bool DebuggingEnabled { get; set; }
 
-        /// <summary>
-        /// Gets or sets the testplatform options
-        /// </summary>
-        [DataMember]
-        public TestPlatformOptions TestPlatformOptions { get; set; }
+    /// <summary>
+    /// Gets or sets the testplatform options
+    /// </summary>
+    [DataMember]
+    public TestPlatformOptions? TestPlatformOptions { get; set; }
 
-        /// <summary>
-        /// Gets or sets the test session info.
-        /// </summary>
-        [DataMember]
-        public TestSessionInfo TestSessionInfo { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the test session info.
+    /// </summary>
+    [DataMember]
+    public TestSessionInfo? TestSessionInfo { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/ProtocolConfig.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/ProtocolConfig.cs
index 81adb6b394..f95227b186 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/ProtocolConfig.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/ProtocolConfig.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Class for Protocol related information
+/// </summary>
+public class ProtocolConfig
 {
     /// <summary>
-    /// Class for Protocol related information
+    /// Get or Set the version of protocol
     /// </summary>
-    public class ProtocolConfig
-    {
-        /// <summary>
-        /// Get or Set the version of protocol
-        /// </summary>
-        public int Version { get; set; }
-    }
+    public int Version { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/StartTestSessionCriteria.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/StartTestSessionCriteria.cs
index 9970b20d5f..2516ee4907 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/StartTestSessionCriteria.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/StartTestSessionCriteria.cs
@@ -1,34 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
 
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Class used to define the start test session criteria.
+/// </summary>
+[DataContract]
+public class StartTestSessionCriteria
+{
     /// <summary>
-    /// Class used to define the start test session criteria.
+    /// Gets or sets the sources used for starting the test session.
     /// </summary>
-    [DataContract]
-    public class StartTestSessionCriteria
-    {
-        /// <summary>
-        /// Gets or sets the sources used for starting the test session.
-        /// </summary>
-        [DataMember]
-        public IList<string> Sources { get; set; }
+    [DataMember]
+    public IList<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Gets or sets the run settings used for starting the test session.
-        /// </summary>
-        [DataMember]
-        public string RunSettings { get; set; }
+    /// <summary>
+    /// Gets or sets the run settings used for starting the test session.
+    /// </summary>
+    [DataMember]
+    public string? RunSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the test host launcher used for starting the test session.
-        /// </summary>
-        [DataMember]
-        public ITestHostLauncher TestHostLauncher { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the test host launcher used for starting the test session.
+    /// </summary>
+    [DataMember]
+    public ITestHostLauncher? TestHostLauncher { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs
index ea7597419e..d5f96d4fe7 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs
@@ -1,46 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Options to be passed into the Test Platform during Discovery/Execution.
+/// </summary>
+[DataContract]
+public class TestPlatformOptions
+{
     /// <summary>
-    /// Options to be passed into the Test Platform during Discovery/Execution.
+    /// Gets or sets the filter criteria for test cases.
     /// </summary>
-    [DataContract]
-    public class TestPlatformOptions
-    {
-        /// <summary>
-        /// Gets or sets the filter criteria for test cases.
-        /// </summary>
-        /// 
-        /// <remarks>
-        /// This is only used when running tests with sources.
-        /// </remarks>
-        [DataMember]
-        public string TestCaseFilter { get; set; }
+    ///
+    /// <remarks>
+    /// This is only used when running tests with sources.
+    /// </remarks>
+    [DataMember]
+    public string? TestCaseFilter { get; set; }
 
-        /// <summary>
-        /// Gets or sets the filter options if there are any.
-        /// </summary>
-        /// 
-        /// <remarks>
-        /// This will be valid only if TestCase filter is present.
-        /// </remarks>
-        [DataMember]
-        public FilterOptions FilterOptions { get; set; }
+    /// <summary>
+    /// Gets or sets the filter options if there are any.
+    /// </summary>
+    ///
+    /// <remarks>
+    /// This will be valid only if TestCase filter is present.
+    /// </remarks>
+    [DataMember]
+    public FilterOptions? FilterOptions { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether metrics should be collected or not.
-        /// </summary>
-        [DataMember]
-        public bool CollectMetrics { get; set; }
+    /// <summary>
+    /// Gets or sets whether metrics should be collected or not.
+    /// </summary>
+    [DataMember]
+    public bool CollectMetrics { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether default adapters should be skipped or not.
-        /// </summary>
-        [DataMember]
-        public bool SkipDefaultAdapters { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets whether default adapters should be skipped or not.
+    /// </summary>
+    [DataMember]
+    public bool SkipDefaultAdapters { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunCriteria.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunCriteria.cs
index 1e23577f93..8d259a505c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunCriteria.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunCriteria.cs
@@ -1,873 +1,880 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Defines the test run criterion.
+/// </summary>
+public class TestRunCriteria : BaseTestRunCriteria, ITestRunConfiguration
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-    using System.Runtime.Serialization;
-    using System.Text;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
-
-    /// <summary>
-    /// Defines the test run criterion.
-    /// </summary>
-    public class TestRunCriteria : BaseTestRunCriteria, ITestRunConfiguration
-    {
-        private string testCaseFilter;
-        private FilterOptions filterOptions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive: true)
-        {
-        }
+    private string? _testCaseFilter;
+    private FilterOptions? _filterOptions;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings: string.Empty)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive: true)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  TimeSpan.MaxValue)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings: string.Empty)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher: null)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            TimeSpan.MaxValue)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher,
-                  testCaseFilter: null,
-                  filterOptions: null)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher: null)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        /// <param name="testCaseFilter">Test case filter.</param>
-        /// <param name="filterOptions">Filter options.</param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher,
-            string testCaseFilter,
-            FilterOptions filterOptions)
-            : this(
-                  sources,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher,
-                  testCaseFilter,
-                  filterOptions,
-                  testSessionInfo: null,
-                  debugEnabledForTestSession: false)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher,
+            testCaseFilter: null,
+            filterOptions: null)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    /// <param name="testCaseFilter">Test case filter.</param>
+    /// <param name="filterOptions">Filter options.</param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher,
+        string? testCaseFilter,
+        FilterOptions? filterOptions)
+        : this(
+            sources,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher,
+            testCaseFilter,
+            filterOptions,
+            testSessionInfo: null,
+            debugEnabledForTestSession: false)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        /// <param name="testCaseFilter">Test case filter.</param>
-        /// <param name="filterOptions">Filter options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="debugEnabledForTestSession">
-        /// Indicates if debugging should be enabled when we have test session info available.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher,
-            string testCaseFilter,
-            FilterOptions filterOptions,
-            TestSessionInfo testSessionInfo,
-            bool debugEnabledForTestSession)
-            : base(
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    /// <param name="testCaseFilter">Test case filter.</param>
+    /// <param name="filterOptions">Filter options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="debugEnabledForTestSession">
+    /// Indicates if debugging should be enabled when we have test session info available.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher,
+        string? testCaseFilter,
+        FilterOptions? filterOptions,
+        TestSessionInfo? testSessionInfo,
+        bool debugEnabledForTestSession)
+        : base(
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher)
+    {
+        var testSources = sources as IList<string> ?? sources.ToList();
+        ValidateArg.NotNullOrEmpty(testSources, nameof(sources));
+
+        AdapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var testSources = sources as IList<string> ?? sources.ToList();
-            ValidateArg.NotNullOrEmpty(testSources, nameof(sources));
+            { Constants.UnspecifiedAdapterPath, testSources }
+        };
 
-            this.AdapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            this.AdapterSourceMap.Add(Constants.UnspecifiedAdapterPath, testSources);
+        TestCaseFilter = testCaseFilter;
+        FilterOptions = filterOptions;
 
-            this.TestCaseFilter = testCaseFilter;
-            this.FilterOptions = filterOptions;
+        TestSessionInfo = testSessionInfo;
+        DebugEnabledForTestSession = debugEnabledForTestSession;
+    }
 
-            this.TestSessionInfo = testSessionInfo;
-            this.DebugEnabledForTestSession = debugEnabledForTestSession;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// Create the TestRunCriteria for a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources which contains tests that should be executed.</param>
+    /// <param name="testRunCriteria">The test run criteria.</param>
+    public TestRunCriteria(
+        IEnumerable<string> sources,
+        TestRunCriteria testRunCriteria)
+        : base(testRunCriteria)
+    {
+        var testSources = sources as IList<string> ?? sources.ToArray();
+        ValidateArg.NotNullOrEmpty(testSources, nameof(sources));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// Create the TestRunCriteria for a test run.
-        /// </summary>
-        ///
-        /// <param name="sources">Sources which contains tests that should be executed.</param>
-        /// <param name="testRunCriteria">The test run criteria.</param>
-        public TestRunCriteria(
-            IEnumerable<string> sources,
-            TestRunCriteria testRunCriteria)
-            : base(testRunCriteria)
+        AdapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var testSources = sources as IList<string> ?? sources.ToArray();
-            ValidateArg.NotNullOrEmpty(testSources, nameof(sources));
+            { Constants.UnspecifiedAdapterPath, testSources }
+        };
 
-            this.AdapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            this.AdapterSourceMap.Add(Constants.UnspecifiedAdapterPath, testSources);
+        TestCaseFilter = testRunCriteria._testCaseFilter;
+        FilterOptions = testRunCriteria._filterOptions;
+    }
 
-            this.TestCaseFilter = testRunCriteria.testCaseFilter;
-            this.FilterOptions = testRunCriteria.filterOptions;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="adapterSourceMap">
+    /// Sources which contains tests that should be executed.
+    /// </param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether the execution process should be kept alive after the run is finished or not.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    public TestRunCriteria(
+        Dictionary<string, IEnumerable<string>> adapterSourceMap,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher)
+        : base(
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher)
+    {
+        ValidateArg.NotNullOrEmpty(adapterSourceMap, nameof(adapterSourceMap));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="adapterSourceMap">
-        /// Sources which contains tests that should be executed.
-        /// </param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether the execution process should be kept alive after the run is finished or not.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        public TestRunCriteria(
-            Dictionary<string, IEnumerable<string>> adapterSourceMap,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher)
-            : base(
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher)
-        {
-            ValidateArg.NotNullOrEmpty(adapterSourceMap, nameof(adapterSourceMap));
+        AdapterSourceMap = adapterSourceMap;
+    }
 
-            this.AdapterSourceMap = adapterSourceMap;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent)
+        : this(
+            tests,
+            frequencyOfRunStatsChangeEvent,
+            false)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent)
-            : this(
-                  tests,
-                  frequencyOfRunStatsChangeEvent,
-                  false)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether or not to keep the test executor process alive after run completion.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive)
+        : this(
+            tests,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            string.Empty)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether or not to keep the test executor process alive after run completion.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive)
-            : this(
-                  tests,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  string.Empty)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether or not to keep the test executor process alive after run completion.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string testSettings)
+        : this(
+            tests,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            TimeSpan.MaxValue)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether or not to keep the test executor process alive after run completion.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings)
-            : this(
-                  tests,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  TimeSpan.MaxValue)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether or not to keep the test executor process alive after run completion.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string testSettings,
+        TimeSpan runStatsChangeEventTimeout)
+        : this(
+            tests,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            null)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether or not to keep the test executor process alive after run completion.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout)
-            : this(
-                  tests,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  null)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="baseTestRunCriteria">The base test run criteria.</param>
+    public TestRunCriteria(IEnumerable<TestCase> tests, BaseTestRunCriteria baseTestRunCriteria)
+        : base(baseTestRunCriteria)
+    {
+        var testCases = tests as IList<TestCase> ?? tests.ToList();
+        ValidateArg.NotNullOrEmpty(testCases, nameof(tests));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="baseTestRunCriteria">The base test run criteria.</param>
-        public TestRunCriteria(IEnumerable<TestCase> tests, BaseTestRunCriteria baseTestRunCriteria)
-            : base(baseTestRunCriteria)
-        {
-            var testCases = tests as IList<TestCase> ?? tests.ToList();
-            ValidateArg.NotNullOrEmpty(testCases, nameof(tests));
+        Tests = testCases;
+    }
 
-            this.Tests = testCases;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether or not to keep the test executor process alive after run completion.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher)
+        : this(
+            tests,
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher,
+            testSessionInfo: null,
+            debugEnabledForTestSession: false)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="tests">Tests which should be executed.</param>
+    /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
+    /// <param name="keepAlive">
+    /// Whether or not to keep the test executor process alive after run completion.
+    /// </param>
+    /// <param name="testSettings">Settings used for this run.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout that triggers sending results regardless of cache size.
+    /// </param>
+    /// <param name="testHostLauncher">
+    /// Test host launcher. If null then default will be used.
+    /// </param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="debugEnabledForTestSession">
+    /// Indicates if debugging should be enabled when we have test session info available.
+    /// </param>
+    public TestRunCriteria(
+        IEnumerable<TestCase> tests,
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher,
+        TestSessionInfo? testSessionInfo,
+        bool debugEnabledForTestSession)
+        : base(
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            testHostLauncher)
+    {
+        var testCases = tests as IList<TestCase> ?? tests?.ToList();
+        ValidateArg.NotNullOrEmpty(testCases, nameof(tests));
+
+        Tests = testCases;
+        TestSessionInfo = testSessionInfo;
+        DebugEnabledForTestSession = debugEnabledForTestSession;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether or not to keep the test executor process alive after run completion.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher)
-            : this(
-                  tests,
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher,
-                  testSessionInfo: null,
-                  debugEnabledForTestSession: false)
+    /// <summary>
+    /// Gets the test containers (e.g. DLL/EXE/artifacts to scan).
+    /// </summary>
+    [IgnoreDataMember]
+    public IEnumerable<string>? Sources
+    {
+        get
         {
+            IEnumerable<string> sources = new List<string>();
+            return AdapterSourceMap?.Values?.Aggregate(
+                sources,
+                (current, enumerable) => current.Concat(enumerable));
         }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="tests">Tests which should be executed.</param>
-        /// <param name="frequencyOfRunStatsChangeEvent">Frequency of run stats event.</param>
-        /// <param name="keepAlive">
-        /// Whether or not to keep the test executor process alive after run completion.
-        /// </param>
-        /// <param name="testSettings">Settings used for this run.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout that triggers sending results regardless of cache size.
-        /// </param>
-        /// <param name="testHostLauncher">
-        /// Test host launcher. If null then default will be used.
-        /// </param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="debugEnabledForTestSession">
-        /// Indicates if debugging should be enabled when we have test session info available.
-        /// </param>
-        public TestRunCriteria(
-            IEnumerable<TestCase> tests,
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher,
-            TestSessionInfo testSessionInfo,
-            bool debugEnabledForTestSession)
-            : base(
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  testHostLauncher)
-        {
-            var testCases = tests as IList<TestCase> ?? tests.ToList();
-            ValidateArg.NotNullOrEmpty(testCases, nameof(tests));
+    /// <summary>
+    /// Gets the test adapter and source map which would look like below:
+    /// <code>
+    /// { C:\temp\testAdapter1.dll : [ source1.dll, source2.dll ], C:\temp\testadapter2.dll : [ source3.dll, source2.dll ]
+    /// </code>
+    /// </summary>
+    [DataMember]
+    public Dictionary<string, IEnumerable<string>>? AdapterSourceMap { get; private set; }
 
-            this.Tests = testCases;
-            this.TestSessionInfo = testSessionInfo;
-            this.DebugEnabledForTestSession = debugEnabledForTestSession;
-        }
+    /// <summary>
+    /// Gets the tests that need to executed in this test run.
+    /// This will be null if test run is created with specific test containers.
+    /// </summary>
+    [DataMember]
+    public IEnumerable<TestCase>? Tests { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the criteria for filtering test cases.
+    /// </summary>
+    /// <remarks>This is only for with sources.</remarks>
+    [DataMember]
+    public string? TestCaseFilter
+    {
+        get => _testCaseFilter;
 
-        /// <summary>
-        /// Gets the test containers (e.g. DLL/EXE/artifacts to scan).
-        /// </summary>
-        [IgnoreDataMember]
-        public IEnumerable<string> Sources
+        private set
         {
-            get
+            if (value != null && !HasSpecificSources)
             {
-                IEnumerable<string> sources = new List<string>();
-                return this.AdapterSourceMap?.Values?.Aggregate(
-                    sources,
-                    (current, enumerable) => current.Concat(enumerable));
+                throw new InvalidOperationException(Resources.Resources.NoTestCaseFilterForSpecificTests);
             }
+
+            _testCaseFilter = value;
         }
+    }
+
+    /// <summary>
+    /// Gets or sets the filter options.
+    /// </summary>
+    /// <remarks>This is only applicable when TestCaseFilter is present.</remarks>
+    [DataMember]
+    public FilterOptions? FilterOptions
+    {
+        get => _filterOptions;
 
-        /// <summary>
-        /// Gets the test adapter and source map which would look like below:
-        /// <code>
-        /// { C:\temp\testAdapter1.dll : [ source1.dll, source2.dll ], C:\temp\testadapter2.dll : [ source3.dll, source2.dll ]
-        /// </code>
-        /// </summary>
-        [DataMember]
-        public Dictionary<string, IEnumerable<string>> AdapterSourceMap { get; private set; }
-
-        /// <summary>
-        /// Gets the tests that need to executed in this test run.
-        /// This will be null if test run is created with specific test containers.
-        /// </summary>
-        [DataMember]
-        public IEnumerable<TestCase> Tests { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the criteria for filtering test cases.
-        /// </summary>
-        /// <remarks>This is only for with sources.</remarks>
-        [DataMember]
-        public string TestCaseFilter
+        private set
         {
-            get
+            if (value != null && !HasSpecificSources)
             {
-                return this.testCaseFilter;
+                throw new InvalidOperationException(Resources.Resources.NoTestCaseFilterForSpecificTests);
             }
 
-            private set
-            {
-                if (value != null && !this.HasSpecificSources)
-                {
-                    throw new InvalidOperationException(Resources.NoTestCaseFilterForSpecificTests);
-                }
-
-                this.testCaseFilter = value;
-            }
+            _filterOptions = value;
         }
+    }
+
+    /// <summary>
+    /// Gets or sets the test session info object.
+    /// </summary>
+    public TestSessionInfo? TestSessionInfo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the filter options.
-        /// </summary>
-        /// <remarks>This is only applicable when TestCaseFilter is present.</remarks>
-        [DataMember]
-        public FilterOptions FilterOptions
+    /// <summary>
+    /// Gets or sets a flag indicating if debugging should be enabled when we have test session
+    /// info available.
+    /// </summary>
+    public bool DebugEnabledForTestSession { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether run criteria is based on specific tests.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(Tests))]
+    [MemberNotNullWhen(false, nameof(Sources))]
+    public bool HasSpecificTests
+    {
+        get
         {
-            get
+            if (Tests != null)
             {
-                return this.filterOptions;
+                return true;
             }
 
-            private set
-            {
-                if (value != null && !this.HasSpecificSources)
-                {
-                    throw new InvalidOperationException(Resources.NoTestCaseFilterForSpecificTests);
-                }
-
-                this.filterOptions = value;
-            }
+            TPDebug.Assert(Sources is not null, "Sources is null and Tests is null");
+            return false;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the test session info object.
-        /// </summary>
-        public TestSessionInfo TestSessionInfo { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating if debugging should be enabled when we have test session
-        /// info available.
-        /// </summary>
-        public bool DebugEnabledForTestSession { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether run criteria is based on specific tests.
-        /// </summary>
-        public bool HasSpecificTests
+    /// <summary>
+    /// Gets a value indicating whether run criteria is based on specific sources.
+    /// </summary>
+    [DataMember]
+    [MemberNotNullWhen(true, nameof(Sources))]
+    [MemberNotNullWhen(false, nameof(Tests))]
+    public bool HasSpecificSources
+    {
+        get
         {
-            get { return this.Tests != null; }
-        }
+            if (Sources != null)
+            {
+                return true;
+            }
 
-        /// <summary>
-        /// Gets a value indicating whether run criteria is based on specific sources.
-        /// </summary>
-        [DataMember]
-        public bool HasSpecificSources
-        {
-            get { return this.Sources != null; }
+            TPDebug.Assert(Tests is not null, "Tests is null and Sources is null");
+            return false;
         }
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        StringBuilder sb = new();
+        sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "TestRunCriteria:"));
+        sb.AppendLine(string.Format(
+            CultureInfo.CurrentCulture,
+            "   KeepAlive={0},FrequencyOfRunStatsChangeEvent={1},RunStatsChangeEventTimeout={2},TestCaseFilter={3},TestExecutorLauncher={4}",
+            KeepAlive,
+            FrequencyOfRunStatsChangeEvent,
+            RunStatsChangeEventTimeout,
+            TestCaseFilter,
+            TestHostLauncher));
+        sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "   Settingsxml={0}", TestRunSettings));
+
+        return sb.ToString();
+    }
 
-        /// <inheritdoc/>
-        public override string ToString()
+    protected bool Equals(TestRunCriteria? other)
+        => other is not null
+            && base.Equals(other)
+            && string.Equals(TestCaseFilter, other.TestCaseFilter)
+            && Equals(FilterOptions, other.FilterOptions);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        if (obj is null)
         {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "TestRunCriteria:"));
-            sb.AppendLine(string.Format(
-                    CultureInfo.CurrentCulture,
-                    "   KeepAlive={0},FrequencyOfRunStatsChangeEvent={1},RunStatsChangeEventTimeout={2},TestCaseFilter={3},TestExecutorLauncher={4}",
-                    this.KeepAlive,
-                    this.FrequencyOfRunStatsChangeEvent,
-                    this.RunStatsChangeEventTimeout,
-                    this.TestCaseFilter,
-                    this.TestHostLauncher));
-            sb.AppendLine(string.Format(CultureInfo.CurrentCulture, "   Settingsxml={0}", this.TestRunSettings));
-
-            return sb.ToString();
+            return false;
         }
 
-        protected bool Equals(TestRunCriteria other)
+        if (ReferenceEquals(this, obj))
         {
-            return base.Equals(other)
-                && string.Equals(this.TestCaseFilter, other.TestCaseFilter)
-                && string.Equals(this.FilterOptions, other.FilterOptions);
+            return true;
         }
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (object.ReferenceEquals(null, obj))
-            {
-                return false;
-            }
+        return obj.GetType() == GetType() && Equals((TestRunCriteria)obj);
+    }
 
-            if (object.ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        unchecked
+        {
+            int hashCode = base.GetHashCode();
+            hashCode = (hashCode * 397) ^ (_testCaseFilter != null ? _testCaseFilter.GetHashCode() : 0);
+            hashCode = (hashCode * 397) ^ (AdapterSourceMap != null ? AdapterSourceMap.GetHashCode() : 0);
+            hashCode = (hashCode * 397) ^ (Tests != null ? Tests.GetHashCode() : 0);
+            return hashCode;
+        }
+    }
+}
 
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
+/// <summary>
+/// Defines the base test run criterion.
+/// </summary>
+public class BaseTestRunCriteria
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="runCriteria">Run criteria to clone.</param>
+    public BaseTestRunCriteria(BaseTestRunCriteria runCriteria)
+    {
+        ValidateArg.NotNull(runCriteria, nameof(runCriteria));
+        FrequencyOfRunStatsChangeEvent = runCriteria.FrequencyOfRunStatsChangeEvent;
+        KeepAlive = runCriteria.KeepAlive;
+        TestRunSettings = runCriteria.TestRunSettings;
+        RunStatsChangeEventTimeout = runCriteria.RunStatsChangeEventTimeout;
+        TestHostLauncher = runCriteria.TestHostLauncher;
+    }
 
-            return this.Equals((TestRunCriteria)obj);
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="frequencyOfRunStatsChangeEvent">
+    /// Frequency of <c>TestRunChangedEvent</c>.
+    /// </param>
+    public BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent)
+        : this(frequencyOfRunStatsChangeEvent, true)
+    {
+    }
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = base.GetHashCode();
-                hashCode = (hashCode * 397) ^ (this.testCaseFilter != null ? this.testCaseFilter.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (this.AdapterSourceMap != null ? this.AdapterSourceMap.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (this.Tests != null ? this.Tests.GetHashCode() : 0);
-                return hashCode;
-            }
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="frequencyOfRunStatsChangeEvent">
+    /// Frequency of <c>TestRunChangedEvent</c>.
+    /// </param>
+    /// <param name="keepAlive">
+    /// Specify if the test host process should be stay alive after run.
+    /// </param>
+    public BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive)
+        : this(frequencyOfRunStatsChangeEvent, keepAlive, string.Empty)
+    {
     }
 
     /// <summary>
-    /// Defines the base test run criterion.
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
     /// </summary>
-    public class BaseTestRunCriteria
+    ///
+    /// <param name="frequencyOfRunStatsChangeEvent">
+    /// Frequency of <c>TestRunChangedEvent</c>.
+    /// </param>
+    /// <param name="keepAlive">
+    /// Specify if the test host process should be stay alive after run.
+    /// </param>
+    /// <param name="testSettings">Test run settings.</param>
+    public BaseTestRunCriteria(
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings)
+        : this(
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            TimeSpan.MaxValue)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="runCriteria">Run criteria to clone.</param>
-        public BaseTestRunCriteria(BaseTestRunCriteria runCriteria)
-        {
-            ValidateArg.NotNull(runCriteria, nameof(runCriteria));
+    }
 
-            this.FrequencyOfRunStatsChangeEvent = runCriteria.FrequencyOfRunStatsChangeEvent;
-            this.KeepAlive = runCriteria.KeepAlive;
-            this.TestRunSettings = runCriteria.TestRunSettings;
-            this.RunStatsChangeEventTimeout = runCriteria.RunStatsChangeEventTimeout;
-            this.TestHostLauncher = runCriteria.TestHostLauncher;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="frequencyOfRunStatsChangeEvent">
+    /// Frequency of <c>TestRunChangedEvent</c>.
+    /// </param>
+    /// <param name="keepAlive">
+    /// Specify if the test host process should be stay alive after run.
+    /// </param>
+    /// <param name="testSettings">Test run settings.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout for a <c>TestRunChangedEvent</c>.
+    /// </param>
+    public BaseTestRunCriteria(
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout)
+        : this(
+            frequencyOfRunStatsChangeEvent,
+            keepAlive,
+            testSettings,
+            runStatsChangeEventTimeout,
+            null)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="frequencyOfRunStatsChangeEvent">
-        /// Frequency of <c>TestRunChangedEvent</c>.
-        /// </param>
-        public BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent)
-            : this(frequencyOfRunStatsChangeEvent, true)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
+    /// </summary>
+    ///
+    /// <param name="frequencyOfRunStatsChangeEvent">
+    /// Frequency of <c>TestRunChangedEvent</c>.
+    /// </param>
+    /// <param name="keepAlive">
+    /// Specify if the test host process should be stay alive after run.
+    /// </param>
+    /// <param name="testSettings">Test run settings.</param>
+    /// <param name="runStatsChangeEventTimeout">
+    /// Timeout for a <c>TestRunChangedEvent</c>.
+    /// </param>
+    /// <param name="testHostLauncher">Test host launcher.</param>
+    public BaseTestRunCriteria(
+        long frequencyOfRunStatsChangeEvent,
+        bool keepAlive,
+        string? testSettings,
+        TimeSpan runStatsChangeEventTimeout,
+        ITestHostLauncher? testHostLauncher)
+    {
+        if (frequencyOfRunStatsChangeEvent <= 0)
         {
+            throw new ArgumentOutOfRangeException(
+                nameof(frequencyOfRunStatsChangeEvent),
+                Resources.Resources.NotificationFrequencyIsNotPositive);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="frequencyOfRunStatsChangeEvent">
-        /// Frequency of <c>TestRunChangedEvent</c>.
-        /// </param>
-        /// <param name="keepAlive">
-        /// Specify if the test host process should be stay alive after run.
-        /// </param>
-        public BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive)
-            : this(frequencyOfRunStatsChangeEvent, keepAlive, string.Empty)
+        if (runStatsChangeEventTimeout <= TimeSpan.MinValue)
         {
+            throw new ArgumentOutOfRangeException(
+                nameof(runStatsChangeEventTimeout),
+                Resources.Resources.NotificationTimeoutIsZero);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="frequencyOfRunStatsChangeEvent">
-        /// Frequency of <c>TestRunChangedEvent</c>.
-        /// </param>
-        /// <param name="keepAlive">
-        /// Specify if the test host process should be stay alive after run.
-        /// </param>
-        /// <param name="testSettings">Test run settings.</param>
-        public BaseTestRunCriteria(
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings)
-            : this(
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  TimeSpan.MaxValue)
-        {
-        }
+        FrequencyOfRunStatsChangeEvent = frequencyOfRunStatsChangeEvent;
+        KeepAlive = keepAlive;
+        TestRunSettings = testSettings;
+        RunStatsChangeEventTimeout = runStatsChangeEventTimeout;
+        TestHostLauncher = testHostLauncher;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="frequencyOfRunStatsChangeEvent">
-        /// Frequency of <c>TestRunChangedEvent</c>.
-        /// </param>
-        /// <param name="keepAlive">
-        /// Specify if the test host process should be stay alive after run.
-        /// </param>
-        /// <param name="testSettings">Test run settings.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout for a <c>TestRunChangedEvent</c>.
-        /// </param>
-        public BaseTestRunCriteria(
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout)
-            : this(
-                  frequencyOfRunStatsChangeEvent,
-                  keepAlive,
-                  testSettings,
-                  runStatsChangeEventTimeout,
-                  null)
-        {
-        }
+    /// <summary>
+    /// Gets a value indicating whether the test executor process should remain alive after
+    /// run completion.
+    /// </summary>
+    [DataMember]
+    public bool KeepAlive { get; private set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseTestRunCriteria"/> class.
-        /// </summary>
-        ///
-        /// <param name="frequencyOfRunStatsChangeEvent">
-        /// Frequency of <c>TestRunChangedEvent</c>.
-        /// </param>
-        /// <param name="keepAlive">
-        /// Specify if the test host process should be stay alive after run.
-        /// </param>
-        /// <param name="testSettings">Test run settings.</param>
-        /// <param name="runStatsChangeEventTimeout">
-        /// Timeout for a <c>TestRunChangedEvent</c>.
-        /// </param>
-        /// <param name="testHostLauncher">Test host launcher.</param>
-        public BaseTestRunCriteria(
-            long frequencyOfRunStatsChangeEvent,
-            bool keepAlive,
-            string testSettings,
-            TimeSpan runStatsChangeEventTimeout,
-            ITestHostLauncher testHostLauncher)
-        {
-            if (frequencyOfRunStatsChangeEvent <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(frequencyOfRunStatsChangeEvent),
-                    Resources.NotificationFrequencyIsNotPositive);
-            }
+    /// <summary>
+    /// Gets the settings used for this run.
+    /// </summary>
+    [DataMember]
+    public string? TestRunSettings { get; private set; }
 
-            if (runStatsChangeEventTimeout <= TimeSpan.MinValue)
-            {
-                throw new ArgumentOutOfRangeException(
-                    nameof(runStatsChangeEventTimeout),
-                    Resources.NotificationTimeoutIsZero);
-            }
+    /// <summary>
+    /// Gets the custom launcher for test executor.
+    /// </summary>
+    [DataMember]
+    public ITestHostLauncher? TestHostLauncher { get; private set; }
 
-            this.FrequencyOfRunStatsChangeEvent = frequencyOfRunStatsChangeEvent;
-            this.KeepAlive = keepAlive;
-            this.TestRunSettings = testSettings;
-            this.RunStatsChangeEventTimeout = runStatsChangeEventTimeout;
-            this.TestHostLauncher = testHostLauncher;
-        }
+    /// <summary>
+    /// Gets the frequency of run stats test event.
+    /// </summary>
+    ///
+    /// <remarks>
+    /// Run stats change event will be raised after completion of these number of tests.
+    /// Note that this event is raised asynchronously and the underlying execution process is not
+    /// paused during the listener invocation. So if the event handler, you try to query the
+    /// next set of results, you may get more than 'FrequencyOfRunStatsChangeEvent'.
+    /// </remarks>
+    [DataMember]
+    public long FrequencyOfRunStatsChangeEvent { get; private set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the test executor process should remain alive after
-        /// run completion.
-        /// </summary>
-        [DataMember]
-        public bool KeepAlive { get; private set; }
-
-        /// <summary>
-        /// Gets the settings used for this run.
-        /// </summary>
-        [DataMember]
-        public string TestRunSettings { get; private set; }
-
-        /// <summary>
-        /// Gets the custom launcher for test executor.
-        /// </summary>
-        [DataMember]
-        public ITestHostLauncher TestHostLauncher { get; private set; }
-
-        /// <summary>
-        /// Gets the frequency of run stats test event.
-        /// </summary>
-        ///
-        /// <remarks>
-        /// Run stats change event will be raised after completion of these number of tests.
-        /// Note that this event is raised asynchronously and the underlying execution process is not
-        /// paused during the listener invocation. So if the event handler, you try to query the
-        /// next set of results, you may get more than 'FrequencyOfRunStatsChangeEvent'.
-        /// </remarks>
-        [DataMember]
-        public long FrequencyOfRunStatsChangeEvent { get; private set; }
-
-        /// <summary>
-        /// Gets the timeout that triggers sending results regardless of cache size.
-        /// </summary>
-        [DataMember]
-        public TimeSpan RunStatsChangeEventTimeout { get; private set; }
-
-        protected bool Equals(BaseTestRunCriteria other)
+    /// <summary>
+    /// Gets the timeout that triggers sending results regardless of cache size.
+    /// </summary>
+    [DataMember]
+    public TimeSpan RunStatsChangeEventTimeout { get; private set; }
+
+    protected bool Equals(BaseTestRunCriteria? other)
+        => other is not null
+            && KeepAlive == other.KeepAlive
+            && string.Equals(TestRunSettings, other.TestRunSettings)
+            && FrequencyOfRunStatsChangeEvent == other.FrequencyOfRunStatsChangeEvent
+            && RunStatsChangeEventTimeout.Equals(other.RunStatsChangeEventTimeout);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        if (obj is null)
         {
-            return this.KeepAlive == other.KeepAlive
-                && string.Equals(this.TestRunSettings, other.TestRunSettings)
-                && this.FrequencyOfRunStatsChangeEvent == other.FrequencyOfRunStatsChangeEvent
-                && this.RunStatsChangeEventTimeout.Equals(other.RunStatsChangeEventTimeout);
+            return false;
         }
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
+        if (ReferenceEquals(this, obj))
         {
-            if (object.ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-
-            if (object.ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            return this.Equals((BaseTestRunCriteria)obj);
+            return true;
         }
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
+        return obj.GetType() == GetType() && Equals((BaseTestRunCriteria)obj);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        unchecked
         {
-            unchecked
-            {
-                var hashCode = this.KeepAlive.GetHashCode();
-                hashCode = (hashCode * 397) ^ (this.TestRunSettings != null ? this.TestRunSettings.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ this.FrequencyOfRunStatsChangeEvent.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.RunStatsChangeEventTimeout.GetHashCode();
-                return hashCode;
-            }
+            var hashCode = KeepAlive.GetHashCode();
+            hashCode = (hashCode * 397) ^ (TestRunSettings != null ? TestRunSettings.GetHashCode() : 0);
+            hashCode = (hashCode * 397) ^ FrequencyOfRunStatsChangeEvent.GetHashCode();
+            hashCode = (hashCode * 397) ^ RunStatsChangeEventTimeout.GetHashCode();
+            return hashCode;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunState.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunState.cs
index 4016fa14a0..0d6fee2d6d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunState.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunState.cs
@@ -1,41 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// States of the TestRun
+/// </summary>
+public enum TestRunState
 {
     /// <summary>
-    /// States of the TestRun
+    /// Status is not known
     /// </summary>
-    public enum TestRunState
-    {
-        /// <summary>
-        /// Status is not known
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// The run is still being created.  No tests have started yet.
-        /// </summary>
-        Pending = 1,
+    /// <summary>
+    /// The run is still being created.  No tests have started yet.
+    /// </summary>
+    Pending = 1,
 
-        /// <summary>
-        /// Tests are running.
-        /// </summary>
-        InProgress = 2,
+    /// <summary>
+    /// Tests are running.
+    /// </summary>
+    InProgress = 2,
 
-        /// <summary>
-        /// All tests have completed or been skipped.
-        /// </summary>
-        Completed = 3,
+    /// <summary>
+    /// All tests have completed or been skipped.
+    /// </summary>
+    Completed = 3,
 
-        /// <summary>
-        /// Run is canceled and remaining tests have been aborted
-        /// </summary>
-        Canceled = 4,
+    /// <summary>
+    /// Run is canceled and remaining tests have been aborted
+    /// </summary>
+    Canceled = 4,
 
-         /// <summary>
-        /// Run is aborted
-        /// </summary>
-        Aborted = 5
-    }
+    /// <summary>
+    /// Run is aborted
+    /// </summary>
+    Aborted = 5
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunStatistics.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunStatistics.cs
index 9c9cf381a7..0050acb157 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunStatistics.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/TestRunStatistics.cs
@@ -1,75 +1,71 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Defines the test run stats header
+/// </summary>
+[DataContract]
+public class TestRunStatistics : ITestRunStatistics
+{
     /// <summary>
-    /// Defines the test run stats header
+    /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
     /// </summary>
-    [DataContract]
-    public class TestRunStatistics : ITestRunStatistics
+    /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public TestRunStatistics()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
-        /// </summary>
-        /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
-        public TestRunStatistics()
-        {
-            // Default constructor for Serialization.
-        }
+        // Default constructor for Serialization.
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
-        /// </summary>
-        /// <param name="stats"> The stats. </param>
-        public TestRunStatistics(IDictionary<TestOutcome, long> stats)
-        {
-            this.Stats = stats;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
+    /// </summary>
+    /// <param name="stats"> The stats. </param>
+    public TestRunStatistics(IDictionary<TestOutcome, long>? stats)
+    {
+        Stats = stats;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
-        /// </summary>
-        /// <param name="executedTests"> The executed tests. </param>
-        /// <param name="stats"> The stats. </param>
-        /// <remarks> This constructor is only needed to reconstruct the object during deserialization.</remarks>
-        public TestRunStatistics(long executedTests, IDictionary<TestOutcome, long> stats)
-        {
-            this.ExecutedTests = executedTests;
-            this.Stats = stats;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRunStatistics"/> class.
+    /// </summary>
+    /// <param name="executedTests"> The executed tests. </param>
+    /// <param name="stats"> The stats. </param>
+    /// <remarks> This constructor is only needed to reconstruct the object during deserialization.</remarks>
+    public TestRunStatistics(long executedTests, IDictionary<TestOutcome, long>? stats)
+    {
+        ExecutedTests = executedTests;
+        Stats = stats;
+    }
 
-        /// <summary>
-        /// Gets or sets the number of tests that have been run.
-        /// </summary>
-        [DataMember]
-        public long ExecutedTests { get; set; }
+    /// <summary>
+    /// Gets or sets the number of tests that have been run.
+    /// </summary>
+    [DataMember]
+    public long ExecutedTests { get; set; }
 
-        /// <summary>
-        /// Gets the test stats which is the test outcome versus its state.
-        /// </summary>
-        [DataMember]
-        public IDictionary<TestOutcome, long> Stats { get; private set; }
+    /// <summary>
+    /// Gets the test stats which is the test outcome versus its state.
+    /// </summary>
+    [DataMember]
+    public IDictionary<TestOutcome, long>? Stats { get; private set; }
 
-        /// <summary>
-        /// Gets the number of tests with a specified outcome.
-        /// </summary>
-        /// <param name="testOutcome"> The test outcome. </param>
-        /// <returns> The number of tests with this outcome. </returns>
-        public long this[TestOutcome testOutcome]
+    /// <summary>
+    /// Gets the number of tests with a specified outcome.
+    /// </summary>
+    /// <param name="testOutcome"> The test outcome. </param>
+    /// <returns> The number of tests with this outcome. </returns>
+    public long this[TestOutcome testOutcome]
+    {
+        get
         {
-            get
-            {
-                if (this.Stats.TryGetValue(testOutcome, out var count))
-                {
-                    return count;
-                }
-
-                return 0;
-            }
+            return Stats?.TryGetValue(testOutcome, out var count) == true ? count : 0;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestSessionInfo.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestSessionInfo.cs
index 21ce34307b..8eed877a33 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Client/TestSessionInfo.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Client/TestSessionInfo.cs
@@ -1,64 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// Defines the test session info object to be passed around between vstest.console and
+/// vstest.console wrapper in order to identify the current session.
+/// </summary>
+[DataContract]
+public class TestSessionInfo : IEquatable<TestSessionInfo>
+{
     /// <summary>
-    /// Defines the test session info object to be passed around between vstest.console and
-    /// vstest.console wrapper in order to indentify the current session.
+    /// Creates an instance of the current class.
     /// </summary>
-    [DataContract]
-    public class TestSessionInfo : IEquatable<TestSessionInfo>
+    public TestSessionInfo()
     {
-        /// <summary>
-        /// Creates an instance of the current class.
-        /// </summary>
-        public TestSessionInfo()
-        {
-            this.Id = Guid.NewGuid();
-        }
+        Id = Guid.NewGuid();
+    }
 
-        /// <summary>
-        /// Gets the session id.
-        /// </summary>
-        [DataMember]
-        public Guid Id { get; private set; }
+    /// <summary>
+    /// Gets the session id.
+    /// </summary>
+    [DataMember]
+    public Guid Id { get; private set; }
 
-        /// <summary>
-        /// Calculates the hash code for the current object.
-        /// </summary>
-        /// 
-        /// <returns>An integer representing the computed hashcode value.</returns>
-        public override int GetHashCode()
-        {
-            return this.Id.GetHashCode();
-        }
+    /// <summary>
+    /// Calculates the hash code for the current object.
+    /// </summary>
+    ///
+    /// <returns>An integer representing the computed hashcode value.</returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Checks if the specified object is equal to the current instance.
-        /// </summary>
-        /// 
-        /// <param name="obj">The object to be checked.</param>
-        /// 
-        /// <returns>True if the two objects are equal, false otherwise.</returns>
-        public override bool Equals(object obj)
-        {
-            return this.Equals(obj as TestSessionInfo);
-        }
+    /// <summary>
+    /// Checks if the specified object is equal to the current instance.
+    /// </summary>
+    ///
+    /// <param name="obj">The object to be checked.</param>
+    ///
+    /// <returns>True if the two objects are equal, false otherwise.</returns>
+    public override bool Equals(object? obj)
+    {
+        return Equals(obj as TestSessionInfo);
+    }
 
-        /// <summary>
-        /// Checks if the specified session is equal to the current instance.
-        /// </summary>
-        /// 
-        /// <param name="other">The session to be checked.</param>
-        /// 
-        /// <returns>True if the two sessions are equal, false otherwise.</returns>
-        public bool Equals(TestSessionInfo other)
-        {
-            return other != null && this.Id == other.Id;
-        }
+    /// <summary>
+    /// Checks if the specified session is equal to the current instance.
+    /// </summary>
+    ///
+    /// <param name="other">The session to be checked.</param>
+    ///
+    /// <returns>True if the two sessions are equal, false otherwise.</returns>
+    public bool Equals(TestSessionInfo? other)
+    {
+        return other != null && Id.Equals(other.Id);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/CodeCoverage/TestSDKAutoGeneratedCode.cs b/src/Microsoft.TestPlatform.ObjectModel/CodeCoverage/TestSDKAutoGeneratedCode.cs
index 9f17f5f3f5..5f224d9b9d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/CodeCoverage/TestSDKAutoGeneratedCode.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/CodeCoverage/TestSDKAutoGeneratedCode.cs
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform;
+
+/// <summary>
+/// Only to be used to Test platform, to exclude auto generated code from CodeCoverage
+/// </summary>
+[AttributeUsage(AttributeTargets.All)]
+public class TestSDKAutoGeneratedCode : Attribute
 {
-    using System;
-    /// <summary>
-    /// Only to be used to Test platform, to exclude auto generated code from CodeCoverage
-    /// </summary>
-    public class TestSDKAutoGeneratedCode : Attribute
-    {
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfo.cs b/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfo.cs
index 98d812c488..bdf85b3a27 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfo.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfo.cs
@@ -1,119 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Details of EndPoint address for connection b/w test runtime, test runner
+/// </summary>
+public struct TestHostConnectionInfo
 {
     /// <summary>
-    /// Details of EndPoint address for connection b/w test runtime, test runner
+    /// Endpoint where the service is hosted, This endpoint is specific to Transport
+    /// e.g. 127.0.0.0:8080 for sockets
     /// </summary>
-    public struct TestHostConnectionInfo
+    public string Endpoint
     {
-        /// <summary>
-        /// Endpoint where the service is hosted, This endpoint is specific to Transport
-        /// e.g. 127.0.0.0:8080 for sockets
-        /// </summary>
-        public string Endpoint
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the role played by TestRuntime during communication.
-        /// </summary>
-        public ConnectionRole Role
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the transport protocol supported by test runtime
-        /// </summary>
-        public Transport Transport
-        {
-            get;
-            set;
-        }
+        get;
+        set;
     }
 
     /// <summary>
-    /// Specifies the role of application, whether as host or client
+    /// Gets or sets the role played by TestRuntime during communication.
     /// </summary>
-    public enum ConnectionRole
+    public ConnectionRole Role
     {
-        /// <summary>
-        /// Act as server host
-        /// </summary>
-        Host = 0,
-
-        /// <summary>
-        /// Act as client
-        /// </summary>
-        Client = 1
+        get;
+        set;
     }
 
     /// <summary>
-    /// Specifies the underneath Transport channel to be used
-    /// E.g. For UWP/Desktop it is Sockets, for Android it could be SSH
+    /// Gets or sets the transport protocol supported by test runtime
     /// </summary>
-    public enum Transport
+    public Transport Transport
     {
-        /// <summary>
-        /// Act as server host
-        /// </summary>
-        Sockets = 0,
+        get;
+        set;
     }
+}
+
+/// <summary>
+/// Specifies the role of application, whether as host or client
+/// </summary>
+public enum ConnectionRole
+{
+    /// <summary>
+    /// Act as server host
+    /// </summary>
+    Host = 0,
 
     /// <summary>
-    /// Connection information for a test host to communicate with test runner.
+    /// Act as client
     /// </summary>
-    public struct TestRunnerConnectionInfo
+    Client = 1
+}
+
+/// <summary>
+/// Specifies the underneath Transport channel to be used
+/// E.g. For UWP/Desktop it is Sockets, for Android it could be SSH
+/// </summary>
+public enum Transport
+{
+    /// <summary>
+    /// Act as server host
+    /// </summary>
+    Sockets = 0,
+}
+
+/// <summary>
+/// Connection information for a test host to communicate with test runner.
+/// </summary>
+public struct TestRunnerConnectionInfo
+{
+    /// <summary>
+    /// Gets or sets the port for runner to connect to
+    /// Needed for backward compatibility
+    /// </summary>
+    public int Port
     {
-        /// <summary>
-        /// Gets or sets the port for runner to connect to
-        /// Needed for backward compatibility
-        /// </summary>
-        public int Port
-        {
-            get;
-            set;
-        }
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the details of endpoint by test runner for host communication.
-        /// </summary>
-        public TestHostConnectionInfo ConnectionInfo
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the details of endpoint by test runner for host communication.
+    /// </summary>
+    public TestHostConnectionInfo ConnectionInfo
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the diagnostics log file.
-        /// </summary>
-        public string LogFile
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the diagnostics log file.
+    /// </summary>
+    public string? LogFile
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the trace level of logs.
-        /// </summary>
-        public int TraceLevel
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the trace level of logs.
+    /// </summary>
+    public int TraceLevel
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the runner process id.
-        /// </summary>
-        public int RunnerProcessId
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the runner process id.
+    /// </summary>
+    public int RunnerProcessId
+    {
+        get;
+        set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfoExtensions.cs b/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfoExtensions.cs
index 87ef7f5789..23adf2f3b8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfoExtensions.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfoExtensions.cs
@@ -1,28 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Extension methods for <see cref="TestRunnerConnectionInfo"/>.
+/// </summary>
+public static class TestRunnerConnectionInfoExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="TestRunnerConnectionInfo"/>.
+    /// Creates a default command line options string from <see cref="TestRunnerConnectionInfo"/>.
     /// </summary>
-    public static class TestRunnerConnectionInfoExtensions
+    /// <param name="connectionInfo">Connection info for the test host.</param>
+    /// <returns>Command line option string.</returns>
+    public static string ToCommandLineOptions(this TestRunnerConnectionInfo connectionInfo)
     {
-        /// <summary>
-        /// Creates a default command line options string from <see cref="TestRunnerConnectionInfo"/>.
-        /// </summary>
-        /// <param name="connectionInfo">Connection info for the test host.</param>
-        /// <returns>Command line option string.</returns>
-        public static string ToCommandLineOptions(this TestRunnerConnectionInfo connectionInfo)
+        var options = $"--port {connectionInfo.Port} --endpoint {connectionInfo.ConnectionInfo.Endpoint} --role {(connectionInfo.ConnectionInfo.Role == ConnectionRole.Client ? "client" : "host")} --parentprocessid {connectionInfo.RunnerProcessId}";
+        if (!StringUtils.IsNullOrEmpty(connectionInfo.LogFile))
         {
-            var options = "--port " + connectionInfo.Port + " --endpoint " + connectionInfo.ConnectionInfo.Endpoint + " --role " + (connectionInfo.ConnectionInfo.Role == ConnectionRole.Client ? "client" : "host") + " --parentprocessid " + connectionInfo.RunnerProcessId;
-            if (!string.IsNullOrEmpty(connectionInfo.LogFile))
-            {
-                options += " --diag " + connectionInfo.LogFile;
-                options += " --tracelevel " + connectionInfo.TraceLevel;
-            }
-
-            return options;
+            options += " --diag " + connectionInfo.LogFile;
+            options += " --tracelevel " + connectionInfo.TraceLevel;
         }
+
+        return options;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Constants.cs b/src/Microsoft.TestPlatform.ObjectModel/Constants.cs
index 8b1d57bbb8..297e772a51 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Constants.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Constants.cs
@@ -1,252 +1,260 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Defines the defaults/constants used across different components.
+/// </summary>
+public static class Constants
 {
-    using System;
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-
-    /// <summary>
-    /// Defines the defaults/constants used across different components.
-    /// </summary>
-    public static class Constants
-    {
-        /// <summary>
-        /// The in process data collection run settings name.
-        /// </summary>
-        public const string InProcDataCollectionRunSettingsName = "InProcDataCollectionRunSettings";
-
-        /// <summary>
-        /// The in process data collector setting name.
-        /// </summary>
-        public const string InProcDataCollectorSettingName = "InProcDataCollector";
-
-        /// <summary>
-        /// The in process data collectors setting name.
-        /// </summary>
-        public const string InProcDataCollectorsSettingName = "InProcDataCollectors";
-
-        /// <summary>
-        /// Name of collect dump option for blame.
-        /// </summary>
-        public const string BlameCollectDumpKey = "CollectDump";
-
-        /// <summary>
-        /// Name of collect dump option for blame.
-        /// </summary>
-        public const string BlameCollectHangDumpKey = "CollectHangDump";
-
-        /// <summary>
-        /// Name of collect hang dump option for blame.
-        /// </summary>
-        public const string CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang";
-
-        /// <summary>
-        /// Name of data collection settings node in RunSettings.
-        /// </summary>
-        public const string DataCollectionRunSettingsName = "DataCollectionRunSettings";
-
-        /// <summary>
-        /// Name of logger run settings node in RunSettings.
-        /// </summary>
-        public const string LoggerRunSettingsName = "LoggerRunSettings";
-
-        /// <summary>
-        /// Name of loggers node in RunSettings.
-        /// </summary>
-        public const string LoggersSettingName = "Loggers";
-
-        /// <summary>
-        /// Name of logger node in RunSettings.
-        /// </summary>
-        public const string LoggerSettingName = "Logger";
-
-        /// <summary>
-        /// Name of friendlyName attribute of logger node.
-        /// </summary>
-        public const string LoggerFriendlyName = "friendlyName";
-
-        /// <summary>
-        /// Name of friendlyName attribute of logger node in lower case.
-        /// </summary>
-        public const string LoggerFriendlyNameLower = "friendlyname";
-
-        /// <summary>
-        /// Name of uri attribute of logger node.
-        /// </summary>
-        public const string LoggerUriName = "uri";
-
-        /// <summary>
-        /// Name of assemblyQualifiedName attribute of logger node.
-        /// </summary>
-        public const string LoggerAssemblyQualifiedName = "assemblyQualifiedName";
-
-        /// <summary>
-        /// Name of assemblyQualifiedName attribute of logger node in lower case.
-        /// </summary>
-        public const string LoggerAssemblyQualifiedNameLower = "assemblyqualifiedname";
-
-        /// <summary>
-        /// Name of codeBase attribute of logger node.
-        /// </summary>
-        public const string LoggerCodeBase = "codeBase";
-
-        /// <summary>
-        /// Name of codeBase attribute of logger node in lower case.
-        /// </summary>
-        public const string LoggerCodeBaseLower = "codebase";
-
-        /// <summary>
-        /// Name of enabled attribute of logger node.
-        /// </summary>
-        public const string LoggerEnabledName = "enabled";
-
-        /// <summary>
-        /// Name of configuration element of logger node.
-        /// </summary>
-        public const string LoggerConfigurationName = "Configuration";
-
-        /// <summary>
-        /// Name of configuration element of logger node in lower case.
-        /// </summary>
-        public const string LoggerConfigurationNameLower = "configuration";
-
-        /// <summary>
-        /// Name of TreatNoTestsAsError parameter
-        /// </summary>
-        public const string TreatNoTestsAsError = "TreatNoTestsAsError";
-
-        /// <summary>
-        /// Name of RunConfiguration settings node in RunSettings.
-        /// </summary>
-        public const string RunConfigurationSettingsName = "RunConfiguration";
-
-        /// <summary>
-        /// Default testrunner if testrunner is not specified
-        /// </summary>
-        public const string UnspecifiedAdapterPath = "_none_";
-
-        public const string DataCollectorsSettingName = "DataCollectors";
-
-        public const string RunSettingsName = "RunSettings";
-
-        public const string DataCollectorSettingName = "DataCollector";
-
-        /// <summary>
-        /// Pattern used to find test run parameter node.
-        /// </summary>
-        public const string TestRunParametersName = "TestRunParameters";
-
-        /// <summary>
-        /// Type of the unit test extension. (Extension author will use this name while authoring their Vsix)
-        /// </summary>
-        public const string UnitTestExtensionType = "UnitTestExtension";
-
-        /// <summary>
-        /// Maximum size of the trace log file (in kilobytes).
-        /// </summary>
-        public const string TraceLogMaxFileSizeInKB = "TraceLogMaxFileSizeInKb";
-
-        public const string EmptyRunSettings = @"<RunSettings></RunSettings>";
-
-        public static readonly Architecture DefaultPlatform = XmlRunSettingsUtilities.OSArchitecture;
-
-        /// <summary>
-        /// Adding this for compatibility
-        /// </summary>
-        public const FrameworkVersion DefaultFramework = FrameworkVersion.Framework40;
-
-        /// <summary>
-        /// Default option for parallel execution
-        /// </summary>
-        public const int DefaultCpuCount = 1;
-
-        /// <summary>
-        /// The default batch size.
-        /// </summary>
-        public const long DefaultBatchSize = 10;
-
-        /// <summary>
-        /// The default protocol version
-        /// </summary>
-        public static readonly ProtocolConfig DefaultProtocolConfig = new ProtocolConfig { Version = 5 };
-
-        /// <summary>
-        /// The minimum protocol version that has debug support
-        /// </summary>
-        public const int MinimumProtocolVersionWithDebugSupport = 3;
-
-        /// <summary>
-        /// Name of the results directory
-        /// </summary>
-        public const string ResultsDirectoryName = "TestResults";
-
-        /// <summary>
-        /// Default results directory.
-        /// </summary>
-        public static readonly string DefaultResultsDirectory =
-#if NETSTANDARD1_0
-            Path.Combine(".", ResultsDirectoryName);
-#else
-            Path.Combine(Directory.GetCurrentDirectory(), ResultsDirectoryName);
-#endif
+    /// <summary>
+    /// The in process data collection run settings name.
+    /// </summary>
+    public const string InProcDataCollectionRunSettingsName = "InProcDataCollectionRunSettings";
 
-        /// <summary>
-        /// Default treatment of error from test adapters.
-        /// </summary>
-        public const bool DefaultTreatTestAdapterErrorsAsWarnings = false;
+    /// <summary>
+    /// The in process data collector setting name.
+    /// </summary>
+    public const string InProcDataCollectorSettingName = "InProcDataCollector";
 
-        /// <summary>
-        /// The default execution thread apartment state.
-        /// </summary>
-        [CLSCompliant(false)]
-#if NETFRAMEWORK
-        // Keeping default STA thread for desktop tests for UI/Functional test scenarios
-        public static readonly PlatformApartmentState DefaultExecutionThreadApartmentState = PlatformApartmentState.STA;
-#else
-        // STA threads are not supported for net core, default to MTA
-        public static readonly PlatformApartmentState DefaultExecutionThreadApartmentState = PlatformApartmentState.MTA;
-#endif
+    /// <summary>
+    /// The in process data collectors setting name.
+    /// </summary>
+    public const string InProcDataCollectorsSettingName = "InProcDataCollectors";
 
-        /// <summary>
-        ///  Constants for detecting .net framework.
-        /// </summary>
-        public const string TargetFrameworkAttributeFullName = "System.Runtime.Versioning.TargetFrameworkAttribute";
+    /// <summary>
+    /// Name of collect dump option for blame.
+    /// </summary>
+    public const string BlameCollectDumpKey = "CollectDump";
 
-        public const string DotNetFrameWorkStringPrefix = ".NETFramework,Version=";
+    /// <summary>
+    /// Name of collect dump option for blame.
+    /// The internal visibility is because the new feature is not publicly exposed yet and so we can retire it.
+    /// </summary>
+    internal const string BlameCollectMonitorPostMortemDebuggerKey = "MonitorPostmortemDebugger";
 
-        public const string DotNetFramework35 = ".NETFramework,Version=v3.5";
+    /// <summary>
+    /// Name of collect dump option for blame.
+    /// </summary>
+    public const string BlameCollectHangDumpKey = "CollectHangDump";
 
-        public const string DotNetFramework40 = ".NETFramework,Version=v4.0";
+    /// <summary>
+    /// Name of collect hang dump option for blame.
+    /// </summary>
+    public const string CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang";
 
-        public const string DotNetFramework45 = ".NETFramework,Version=v4.5";
+    /// <summary>
+    /// Name of data collection settings node in RunSettings.
+    /// </summary>
+    public const string DataCollectionRunSettingsName = "DataCollectionRunSettings";
 
-        public const string DotNetFramework451 = ".NETFramework,Version=v4.5.1";
+    /// <summary>
+    /// Name of logger run settings node in RunSettings.
+    /// </summary>
+    public const string LoggerRunSettingsName = "LoggerRunSettings";
 
-        public const string DotNetFramework46 = ".NETFramework,Version=v4.6";
+    /// <summary>
+    /// Name of loggers node in RunSettings.
+    /// </summary>
+    public const string LoggersSettingName = "Loggers";
 
-        public const string DotNetFrameworkCore10 = ".NETCoreApp,Version=v1.0";
+    /// <summary>
+    /// Name of logger node in RunSettings.
+    /// </summary>
+    public const string LoggerSettingName = "Logger";
 
-        public const string DotNetFrameworkUap10 = "UAP,Version=v10.0";
+    /// <summary>
+    /// Name of friendlyName attribute of logger node.
+    /// </summary>
+    public const string LoggerFriendlyName = "friendlyName";
 
-        public const string TargetFrameworkName = "TargetFrameworkName";
-    }
+    /// <summary>
+    /// Name of friendlyName attribute of logger node in lower case.
+    /// </summary>
+    public const string LoggerFriendlyNameLower = "friendlyname";
+
+    /// <summary>
+    /// Name of uri attribute of logger node.
+    /// </summary>
+    public const string LoggerUriName = "uri";
+
+    /// <summary>
+    /// Name of assemblyQualifiedName attribute of logger node.
+    /// </summary>
+    public const string LoggerAssemblyQualifiedName = "assemblyQualifiedName";
 
     /// <summary>
-    /// Default parameters to be passed onto all loggers.
+    /// Name of assemblyQualifiedName attribute of logger node in lower case.
     /// </summary>
-    public static class DefaultLoggerParameterNames
-    {
-        // Denotes target location for test run results
-        // For ex. TrxLogger saves test run results at this target
-        public const string TestRunDirectory = "TestRunDirectory";
+    public const string LoggerAssemblyQualifiedNameLower = "assemblyqualifiedname";
 
-        // Denotes target framework for the tests.
-        public const string TargetFramework = "TargetFramework";
-    }
+    /// <summary>
+    /// Name of codeBase attribute of logger node.
+    /// </summary>
+    public const string LoggerCodeBase = "codeBase";
+
+    /// <summary>
+    /// Name of codeBase attribute of logger node in lower case.
+    /// </summary>
+    public const string LoggerCodeBaseLower = "codebase";
+
+    /// <summary>
+    /// Name of enabled attribute of logger node.
+    /// </summary>
+    public const string LoggerEnabledName = "enabled";
+
+    /// <summary>
+    /// Name of configuration element of logger node.
+    /// </summary>
+    public const string LoggerConfigurationName = "Configuration";
+
+    /// <summary>
+    /// Name of configuration element of logger node in lower case.
+    /// </summary>
+    public const string LoggerConfigurationNameLower = "configuration";
+
+    /// <summary>
+    /// Name of TreatNoTestsAsError parameter
+    /// </summary>
+    public const string TreatNoTestsAsError = "TreatNoTestsAsError";
+
+    /// <summary>
+    /// Name of RunConfiguration settings node in RunSettings.
+    /// </summary>
+    public const string RunConfigurationSettingsName = "RunConfiguration";
+
+    /// <summary>
+    /// Default testrunner if testrunner is not specified
+    /// </summary>
+    public const string UnspecifiedAdapterPath = "_none_";
+
+    public const string DataCollectorsSettingName = "DataCollectors";
+
+    public const string RunSettingsName = "RunSettings";
+
+    public const string DataCollectorSettingName = "DataCollector";
+
+    /// <summary>
+    /// Pattern used to find test run parameter node.
+    /// </summary>
+    public const string TestRunParametersName = "TestRunParameters";
+
+    /// <summary>
+    /// Type of the unit test extension. (Extension author will use this name while authoring their Vsix)
+    /// </summary>
+    public const string UnitTestExtensionType = "UnitTestExtension";
+
+    /// <summary>
+    /// Maximum size of the trace log file (in kilobytes).
+    /// </summary>
+    public const string TraceLogMaxFileSizeInKB = "TraceLogMaxFileSizeInKb";
+
+    public const string EmptyRunSettings = @"<RunSettings></RunSettings>";
+
+    public static readonly Architecture DefaultPlatform = XmlRunSettingsUtilities.OSArchitecture;
+
+    /// <summary>
+    /// Adding this for compatibility
+    /// </summary>
+    public const FrameworkVersion DefaultFramework = FrameworkVersion.Framework40;
+
+    /// <summary>
+    /// Default option for parallel execution
+    /// </summary>
+    public const int DefaultCpuCount = 1;
+
+    /// <summary>
+    /// The default batch size.
+    /// </summary>
+    public const long DefaultBatchSize = 10;
+
+    /// <summary>
+    /// The default protocol version
+    /// </summary>
+    // TODO: COMPAT: This is not great because it is not a constant, and so an external dll tells us what
+    // capabilities we have in the implementer (e.g. client), instead we should move this closer to communication
+    // utilities where protocol version actually makes sense. And review all the usages of this, because there are few
+    // ways that the default version is determined.
+    public static readonly ProtocolConfig DefaultProtocolConfig = new() { Version = 7 };
+
+    /// <summary>
+    /// The minimum protocol version that has debug support
+    /// </summary>
+    public const int MinimumProtocolVersionWithDebugSupport = 3;
+
+    /// <summary>
+    /// The minimum protocol version that has debug support
+    /// </summary>
+    public const int MinimumProtocolVersionWithCancelDiscoveryEventHandlerSupport = 6;
+
+    /// <summary>
+    /// Name of the results directory
+    /// </summary>
+    public const string ResultsDirectoryName = "TestResults";
+
+    /// <summary>
+    /// Default results directory.
+    /// </summary>
+    public static readonly string DefaultResultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), ResultsDirectoryName);
+
+    /// <summary>
+    /// Default treatment of error from test adapters.
+    /// </summary>
+    public const bool DefaultTreatTestAdapterErrorsAsWarnings = false;
+
+    /// <summary>
+    /// The default execution thread apartment state.
+    /// </summary>
+    [CLSCompliant(false)]
+#if NETFRAMEWORK
+    // Keeping default STA thread for desktop tests for UI/Functional test scenarios
+    public static readonly PlatformApartmentState DefaultExecutionThreadApartmentState = PlatformApartmentState.STA;
+#else
+    // STA threads are not supported for net core, default to MTA
+    public static readonly PlatformApartmentState DefaultExecutionThreadApartmentState = PlatformApartmentState.MTA;
+#endif
+
+    /// <summary>
+    ///  Constants for detecting .net framework.
+    /// </summary>
+    public const string TargetFrameworkAttributeFullName = "System.Runtime.Versioning.TargetFrameworkAttribute";
+
+    public const string DotNetFrameWorkStringPrefix = ".NETFramework,Version=";
+
+    public const string DotNetFramework35 = ".NETFramework,Version=v3.5";
+
+    public const string DotNetFramework40 = ".NETFramework,Version=v4.0";
+
+    public const string DotNetFramework45 = ".NETFramework,Version=v4.5";
+
+    public const string DotNetFramework451 = ".NETFramework,Version=v4.5.1";
+
+    public const string DotNetFramework46 = ".NETFramework,Version=v4.6";
+
+    public const string DotNetFrameworkCore10 = ".NETCoreApp,Version=v1.0";
+
+    public const string DotNetFrameworkUap10 = "UAP,Version=v10.0";
+
+    public const string TargetFrameworkName = "TargetFrameworkName";
+}
+
+/// <summary>
+/// Default parameters to be passed onto all loggers.
+/// </summary>
+public static class DefaultLoggerParameterNames
+{
+    // Denotes target location for test run results
+    // For ex. TrxLogger saves test run results at this target
+    public const string TestRunDirectory = "TestRunDirectory";
 
+    // Denotes target framework for the tests.
+    public const string TargetFramework = "TargetFramework";
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorAttachmentProcessor.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorAttachmentProcessor.cs
new file mode 100644
index 0000000000..5039313d00
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorAttachmentProcessor.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Registers an attachment processor for a data collector.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class DataCollectorAttachmentProcessorAttribute : Attribute
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectorAttachmentProcessorAttribute"/> class.
+    /// </summary>
+    /// <param name="type">
+    /// The type of the attachement data processor.
+    /// </param>
+    public DataCollectorAttachmentProcessorAttribute(Type type)
+    {
+        Type = type;
+    }
+
+    /// <summary>
+    /// Gets the data collector type uri.
+    /// </summary>
+    public Type Type { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorFriendlyNameAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorFriendlyNameAttribute.cs
index 90617e7a48..e56934e8af 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorFriendlyNameAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorFriendlyNameAttribute.cs
@@ -1,29 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Provides a friendly name for the data collector.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class DataCollectorFriendlyNameAttribute : Attribute
+{
     /// <summary>
-    /// Provides a friendly name for the data collector.
+    /// Initializes a new instance of the <see cref="DataCollectorFriendlyNameAttribute"/> class.
     /// </summary>
-    public class DataCollectorFriendlyNameAttribute : Attribute
+    /// <param name="friendlyName">
+    /// The friendly name.
+    /// </param>
+    public DataCollectorFriendlyNameAttribute(string friendlyName)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectorFriendlyNameAttribute"/> class.
-        /// </summary>
-        /// <param name="friendlyName">
-        /// The friendly name.
-        /// </param>
-        public DataCollectorFriendlyNameAttribute(string friendlyName)
-        {
-            this.FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Gets the friendly name.
-        /// </summary>
-        public string FriendlyName { get; private set; }
+        FriendlyName = friendlyName;
     }
+
+    /// <summary>
+    /// Gets the friendly name.
+    /// </summary>
+    public string FriendlyName { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorTypeUriAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorTypeUriAttribute.cs
index 02571871a3..e551ea387b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorTypeUriAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Attributes/DataCollectorTypeUriAttribute.cs
@@ -1,30 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Provides unique identification of a data collector in the form of a URI.
+/// Recommended format: 'datacollector://Company/Product/Version'
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class DataCollectorTypeUriAttribute : Attribute
+{
     /// <summary>
-    /// Provides unique identification of a data collector in the form of a URI.
-    /// Recommended format: 'datacollector://Company/Product/Version'
+    /// Initializes a new instance of the <see cref="DataCollectorTypeUriAttribute"/> class.
     /// </summary>
-    public class DataCollectorTypeUriAttribute : Attribute
+    /// <param name="typeUri">
+    /// The type uri.
+    /// </param>
+    public DataCollectorTypeUriAttribute(string typeUri)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectorTypeUriAttribute"/> class.
-        /// </summary>
-        /// <param name="typeUri">
-        /// The type uri.
-        /// </param>
-        public DataCollectorTypeUriAttribute(string typeUri)
-        {
-            this.TypeUri = typeUri;
-        }
-
-        /// <summary>
-        /// Gets the data collector type uri.
-        /// </summary>
-        public string TypeUri { get; private set; }
+        TypeUri = typeUri;
     }
+
+    /// <summary>
+    /// Gets the data collector type uri.
+    /// </summary>
+    public string TypeUri { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/DataCollectorMessageLevel.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/DataCollectorMessageLevel.cs
index f7ce5b90fc..03c6349e14 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/DataCollectorMessageLevel.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/DataCollectorMessageLevel.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Severity levels at which a DataCollectionTextMessage can be logged.
+/// </summary>
+public enum DataCollectorMessageLevel
 {
-    /// <summary>
-    /// Severity levels at which a DataCollectionTextMessage can be logged.
-    /// </summary>
-    public enum DataCollectorMessageLevel
-    {
-        Error = 0,
-        Warning = 1,
-        Info = 2,
-        Data = 3,
-    }
+    Error = 0,
+    Warning = 1,
+    Info = 2,
+    Data = 3,
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/FileHelper.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/FileHelper.cs
index 7dc96331c6..15cc946158 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/FileHelper.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/FileHelper.cs
@@ -1,85 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+internal sealed class FileHelper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Text.RegularExpressions;
+    private static readonly Dictionary<char, object?> InvalidFileNameChars;
+    private static readonly Regex ReservedFileNamesRegex = new(@"(?i:^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9]|CLOCK\$)(\..*)?)$");
 
-    internal sealed class FileHelper
+    static FileHelper()
     {
-        private static Dictionary<char, object> invalidFileNameChars;
-        private static Regex ReservedFileNamesRegex = new Regex(@"(?i:^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9]|CLOCK\$)(\..*)?)$");
-
-        #region Constructors
-        [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]  // Have to init invalidFileNameChars dynamically.
-        static FileHelper()
+        // Create a hash table of invalid chars.
+        char[] invalidCharsArray = Path.GetInvalidFileNameChars();
+        InvalidFileNameChars = new(invalidCharsArray.Length);
+        foreach (char c in invalidCharsArray)
         {
-            // Create a hash table of invalid chars.
-            char[] invalidCharsArray = Path.GetInvalidFileNameChars();
-            invalidFileNameChars = new Dictionary<char, object>(invalidCharsArray.Length);
-            foreach (char c in invalidCharsArray)
-            {
-                invalidFileNameChars.Add(c, null);
-            }
+            InvalidFileNameChars.Add(c, null);
         }
+    }
 
-        private FileHelper()
-        {
-        }
-        #endregion
+    private FileHelper()
+    {
+    }
+    /// <summary>
+    /// Determines if a file name has invalid characters.
+    /// </summary>
+    /// <param name="fileName">File name to check.</param>
+    /// <param name="invalidCharacters">Invalid characters which were found in the file name.</param>
+    /// <returns>True if the file name is valid and false if the filename contains invalid characters.</returns>
+    public static bool IsValidFileName(string fileName, out string? invalidCharacters)
+    {
+        bool result = true;
+        //EqtAssert.StringNotNullOrEmpty(fileName, "fileName");
 
-        #region Fields
-        /// <summary>
-        /// Determines if a file name has invalid characters.
-        /// </summary>
-        /// <param name="fileName">File name to check.</param>
-        /// <param name="invalidCharacters">Invalid characters which were found in the file name.</param>
-        /// <returns>True if the file name is valid and false if the filename contains invalid characters.</returns>
-        public static bool IsValidFileName(string fileName, out string invalidCharacters)
+        // Find all of the invalid characters in the file name.
+        invalidCharacters = null;
+        for (int i = 0; i < fileName.Length; i++)
         {
-            bool result = true;
-            //EqtAssert.StringNotNullOrEmpty(fileName, "fileName");
-
-            // Find all of the invalid characters in the file name.
-            invalidCharacters = null;
-            for (int i = 0; i < fileName.Length; i++)
+            if (InvalidFileNameChars.ContainsKey(fileName[i]))
             {
-                if (invalidFileNameChars.ContainsKey(fileName[i]))
-                {
-                    invalidCharacters = String.Concat(invalidCharacters, fileName[i]);
-                    result = false;
-                }
+                invalidCharacters = string.Concat(invalidCharacters, fileName[i]);
+                result = false;
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Returns true if the file name specified is Windows reserved file name.
-        /// </summary>
-        /// <param name="fileName">The name of the file. Note: only a file name, does not expect to contain directory separators.</param>
-        internal static bool IsReservedFileName(string fileName)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(fileName), "FileHelper.IsReservedFileName: the argument is null or empty string!");
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return false;
-            }
+        return result;
+    }
 
-            // CreateFile:
-            // The following reserved device names cannot be used as the name of a file:
-            // CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9,
-            // LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
-            // Also avoid these names followed by an extension, for example, NUL.tx7.
-            // Windows NT: CLOCK$ is also a reserved device name.
-            return ReservedFileNamesRegex.Match(fileName).Success;
+    /// <summary>
+    /// Returns true if the file name specified is Windows reserved file name.
+    /// </summary>
+    /// <param name="fileName">The name of the file. Note: only a file name, does not expect to contain directory separators.</param>
+    internal static bool IsReservedFileName(string fileName)
+    {
+        if (fileName.IsNullOrEmpty())
+        {
+            return false;
         }
 
-        #endregion
+        // CreateFile:
+        // The following reserved device names cannot be used as the name of a file:
+        // CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9,
+        // LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
+        // Also avoid these names followed by an extension, for example, NUL.tx7.
+        // Windows NT: CLOCK$ is also a reserved device name.
+        return ReservedFileNamesRegex.Match(fileName).Success;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/RequestId.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/RequestId.cs
index 32b530d20d..0f882551bd 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/RequestId.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/RequestId.cs
@@ -1,209 +1,183 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Wrapper class for a request ID that can be used for messages or events for identification
+/// purposes
+/// </summary>
+[DataContract]
+public sealed class RequestId : IEquatable<RequestId>, IComparable<RequestId>, IComparable
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Runtime.Serialization;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+    /// <summary>
+    /// A request ID with an empty GUID
+    /// </summary>
+    public static readonly RequestId Empty = new(Guid.Empty);
 
     /// <summary>
-    /// Wrapper class for a request ID that can be used for messages or events for identification
-    /// purposes
+    /// Initializes the instance by creating a new GUID
     /// </summary>
-    [DataContract]
-    [SuppressMessage("Microsoft.Design", "CA1036:OverrideMethodsOnComparableTypes",
-            Justification = "Guid does not define < and > operators")]
-    public sealed class RequestId : IEquatable<RequestId>, IComparable<RequestId>, IComparable
+    internal RequestId()
     {
-        #region Constants
+        Id = Guid.NewGuid();
+    }
 
-        /// <summary>
-        /// A request ID with an empty GUID
-        /// </summary>
-        [SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes",
-            Justification = "RequestId is immutable")]
-        public static readonly RequestId Empty = new RequestId(Guid.Empty);
+    /// <summary>
+    /// Initializes the instance with the provided GUID
+    /// </summary>
+    /// <param name="id">The GUID to use as the underlying ID</param>
+    internal RequestId(Guid id)
+    {
+        Id = id;
+    }
 
-        #endregion
 
-        #region Constructors
+    #region Overrides
 
-        /// <summary>
-        /// Initializes the instance by creating a new GUID
-        /// </summary>
-        internal RequestId()
+    /// <summary>
+    /// Compares this instance with the provided object for value equality
+    /// </summary>
+    /// <param name="obj">The object to compare to</param>
+    /// <returns>True if equal, false otherwise</returns>
+    public override bool Equals(object? obj)
+    {
+        if (obj == null)
         {
-            Id = Guid.NewGuid();
+            return false;
         }
 
-        /// <summary>
-        /// Initializes the instance with the provided GUID
-        /// </summary>
-        /// <param name="id">The GUID to use as the underlying ID</param>
-        internal RequestId(Guid id)
+        if (ReferenceEquals(this, obj))
         {
-            Id = id;
+            return true;
         }
 
-        #endregion
-
-        #region Overrides
-
-        /// <summary>
-        /// Compares this instance with the provided object for value equality
-        /// </summary>
-        /// <param name="obj">The object to compare to</param>
-        /// <returns>True if equal, false otherwise</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (object.ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            RequestId other = obj as RequestId;
-            if (other == null)
-            {
-                return false;
-            }
-
-            return Id == other.Id;
-        }
+        RequestId? other = obj as RequestId;
+        return other != null && Id == other.Id;
+    }
 
-        /// <summary>
-        /// Gets a hash code for this instance
-        /// </summary>
-        /// <returns>The underlying GUID's hash code</returns>
-        public override int GetHashCode()
-        {
-            return Id.GetHashCode();
-        }
+    /// <summary>
+    /// Gets a hash code for this instance
+    /// </summary>
+    /// <returns>The underlying GUID's hash code</returns>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <summary>
-        /// Converts the instance to a string in lower-case registry format
-        /// </summary>
-        /// <returns>A lower-case string in registry format representing the underlying GUID</returns>
-        public override string ToString()
-        {
-            return Id.ToString("B");
-        }
+    /// <summary>
+    /// Converts the instance to a string in lower-case registry format
+    /// </summary>
+    /// <returns>A lower-case string in registry format representing the underlying GUID</returns>
+    public override string ToString()
+    {
+        return Id.ToString("B");
+    }
 
-        #endregion
+    #endregion
 
-        #region Interface implementations
+    #region Interface implementations
 
-        #region IEquatable<RequestId> Members
+    #region IEquatable<RequestId> Members
 
-        /// <summary>
-        /// Compares this instance with the provided request ID for value equality
-        /// </summary>
-        /// <param name="other">The request ID to compare to</param>
-        /// <returns>True if equal, false otherwise</returns>
-        public bool Equals(RequestId other)
-        {
-            return
-                other != null && (
-                        object.ReferenceEquals(this, other) ||
-                        Id == other.Id
-                    );
-        }
+    /// <summary>
+    /// Compares this instance with the provided request ID for value equality
+    /// </summary>
+    /// <param name="other">The request ID to compare to</param>
+    /// <returns>True if equal, false otherwise</returns>
+    public bool Equals(RequestId? other)
+    {
+        return
+            other != null && (
+                ReferenceEquals(this, other) ||
+                Id == other.Id
+            );
+    }
 
-        #endregion
+    #endregion
 
-        #region IComparable<RequestId> Members
+    #region IComparable<RequestId> Members
 
-        /// <summary>
-        /// Compares this instance with the provided request ID
-        /// </summary>
-        /// <param name="other">The request ID to compare to</param>
-        /// <returns>An indication of the two request IDs' relative values</returns>
-        public int CompareTo(RequestId other)
-        {
-            return other == null ? 1 : Id.CompareTo(other.Id);
-        }
+    /// <summary>
+    /// Compares this instance with the provided request ID
+    /// </summary>
+    /// <param name="other">The request ID to compare to</param>
+    /// <returns>An indication of the two request IDs' relative values</returns>
+    public int CompareTo(RequestId? other)
+    {
+        return other == null ? 1 : Id.CompareTo(other.Id);
+    }
 
-        #endregion
+    #endregion
 
-        #region IComparable Members
+    #region IComparable Members
 
-        /// <summary>
-        /// Compares this instance with the provided object
-        /// </summary>
-        /// <param name="obj">The object to compare to</param>
-        /// <returns>An indication of the two objects' relative values</returns>
-        /// <exception cref="ArgumentException">
-        /// 'obj' is not null and not an instance of <see cref="RequestId"/>
-        /// </exception>
-        public int CompareTo(object obj)
+    /// <summary>
+    /// Compares this instance with the provided object
+    /// </summary>
+    /// <param name="obj">The object to compare to</param>
+    /// <returns>An indication of the two objects' relative values</returns>
+    /// <exception cref="ArgumentException">
+    /// 'obj' is not null and not an instance of <see cref="RequestId"/>
+    /// </exception>
+    public int CompareTo(object? obj)
+    {
+        if (obj == null)
         {
-            if (obj == null)
-            {
-                return 1;
-            }
-
-            RequestId other = obj as RequestId;
-            if (other == null)
-            {
-                throw new ArgumentException(string.Format(Resources.Common_ObjectMustBeOfType, new object[] { typeof(RequestId).Name }), nameof(obj));
-            }
-
-            return Id.CompareTo(other.Id);
+            return 1;
         }
 
-        #endregion
-
-        #endregion
-
-        #region Operators
+        RequestId? other = obj as RequestId;
+        return other == null
+            ? throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.Common_ObjectMustBeOfType, [typeof(RequestId).Name]), nameof(obj))
+            : Id.CompareTo(other.Id);
+    }
 
-        /// <summary>
-        /// Compares the two request IDs for value equality
-        /// </summary>
-        /// <param name="left">The left-hand request ID</param>
-        /// <param name="right">The right-hand request ID</param>
-        /// <returns>True if equal, false otherwise</returns>
-        public static bool operator ==(RequestId left, RequestId right)
-        {
-            return
-                object.ReferenceEquals(left, right) ||
-                !object.ReferenceEquals(left, null) &&
-                    !object.ReferenceEquals(right, null) &&
-                    left.Id == right.Id;
-        }
+    #endregion
 
-        /// <summary>
-        /// Compares two request IDs for value inequality
-        /// </summary>
-        /// <param name="left">The left-hand request ID</param>
-        /// <param name="right">The right-hand request ID</param>
-        /// <returns>True if unequal, false otherwise</returns>
-        public static bool operator !=(RequestId left, RequestId right)
-        {
-            return !(left == right);
-        }
+    #endregion
 
-        #endregion
+    #region Operators
 
-        #region Properties
+    /// <summary>
+    /// Compares the two request IDs for value equality
+    /// </summary>
+    /// <param name="left">The left-hand request ID</param>
+    /// <param name="right">The right-hand request ID</param>
+    /// <returns>True if equal, false otherwise</returns>
+    public static bool operator ==(RequestId? left, RequestId? right)
+    {
+        return
+            ReferenceEquals(left, right) ||
+            left is not null &&
+            right is not null &&
+            left.Id == right.Id;
+    }
 
-        /// <summary>
-        /// Gets the underlying GUID that represents the request ID
-        /// </summary>
-        [DataMember]
-        public Guid Id
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Compares two request IDs for value inequality
+    /// </summary>
+    /// <param name="left">The left-hand request ID</param>
+    /// <param name="right">The right-hand request ID</param>
+    /// <returns>True if unequal, false otherwise</returns>
+    public static bool operator !=(RequestId? left, RequestId? right)
+    {
+        return !(left == right);
+    }
 
-        #endregion
+    #endregion
+    /// <summary>
+    /// Gets the underlying GUID that represents the request ID
+    /// </summary>
+    [DataMember]
+    public Guid Id
+    {
+        get;
+        private set;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/Session.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/Session.cs
index 3f9bafdd9b..d27fa87e0e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/Session.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/Session.cs
@@ -1,63 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Class identifying a session.
+/// </summary>
+[DataContract]
+public sealed class SessionId
 {
-    using System;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Class identifying a session.
-    /// </summary>
-    [DataContract]
-    public sealed class SessionId
+    public SessionId()
+    {
+        Id = Guid.NewGuid();
+    }
+
+    public SessionId(Guid id)
     {
-        private Guid sessionId;
-
-        private static SessionId empty = new SessionId(Guid.Empty);
-
-        public SessionId()
-        {
-            sessionId = Guid.NewGuid();
-        }
-
-        public SessionId(Guid id)
-        {
-            sessionId = id;
-        }
-
-        [DataMember]
-        public static SessionId Empty
-        {
-            get { return empty; }
-        }
-
-        [DataMember]
-        public Guid Id
-        {
-            get { return sessionId; }
-        }
-
-        public override bool Equals(object obj)
-        {
-            SessionId id = obj as SessionId;
-
-            if (id == null)
-            {
-                return false;
-            }
-
-            return sessionId.Equals(id.sessionId);
-        }
-
-        public override int GetHashCode()
-        {
-            return sessionId.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            return sessionId.ToString("B");
-        }
+        Id = id;
     }
-}
\ No newline at end of file
+
+    [DataMember]
+    public static SessionId Empty { get; } = new SessionId(Guid.Empty);
+
+    [DataMember]
+    public Guid Id { get; }
+
+    public override bool Equals(object? obj) => obj is SessionId sessionId && Id.Equals(sessionId.Id);
+
+    public override int GetHashCode() => Id.GetHashCode();
+
+    public override string ToString() => Id.ToString("B");
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestCaseFailureType.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestCaseFailureType.cs
index 5f50be9872..63f2690e61 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestCaseFailureType.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestCaseFailureType.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Type of test case failure which occurred.
+/// </summary>
+public enum TestCaseFailureType
 {
-    /// <summary>
-    /// Type of test case failure which occurred.
-    /// </summary>
-    public enum TestCaseFailureType
-    {
-        None = 0,
-        Assertion = 1,
-        UnhandledException = 2,
-        UnexpectedException = 3,
-        MissingException = 4,
-        Other = 5,
-    }
+    None = 0,
+    Assertion = 1,
+    UnhandledException = 2,
+    UnexpectedException = 3,
+    MissingException = 4,
+    Other = 5,
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestExecId.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestExecId.cs
index a79813433f..219e97b210 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestExecId.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Common/TestExecId.cs
@@ -1,64 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Class identifying test execution id.
-    /// Execution ID is assigned to test at run creation time and is guaranteed to be unique within that run.
-    /// </summary>
-    [DataContract]
-    public sealed class TestExecId
-    {
-        private Guid execId;
+using System;
+using System.Runtime.Serialization;
 
-        private static TestExecId empty = new TestExecId(Guid.Empty);
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-        public TestExecId()
-        {
-            execId = Guid.NewGuid();
-        }
-
-        public TestExecId(Guid id)
-        {
-            execId = id;
-        }
-
-        [DataMember]
-        public static TestExecId Empty
-        {
-            get { return empty; }
-        }
+/// <summary>
+/// Class identifying test execution id.
+/// Execution ID is assigned to test at run creation time and is guaranteed to be unique within that run.
+/// </summary>
+[DataContract]
+public sealed class TestExecId
+{
+    public TestExecId()
+    {
+        Id = Guid.NewGuid();
+    }
 
-        [DataMember]
-        public Guid Id
-        {
-            get { return execId; }
-        }
+    public TestExecId(Guid id)
+    {
+        Id = id;
+    }
 
-        public override bool Equals(object obj)
-        {
-            TestExecId id = obj as TestExecId;
+    [DataMember]
+    public static TestExecId Empty { get; } = new TestExecId(Guid.Empty);
 
-            if (id == null)
-            {
-                return false;
-            }
+    [DataMember]
+    public Guid Id { get; }
 
-            return execId.Equals(id.execId);
-        }
+    public override bool Equals(object? obj) => obj is TestExecId testExecId && Id.Equals(testExecId.Id);
 
-        public override int GetHashCode()
-        {
-            return execId.GetHashCode();
-        }
+    public override int GetHashCode() => Id.GetHashCode();
 
-        public override string ToString()
-        {
-            return execId.ToString("B");
-        }
-    }
+    public override string ToString() => Id.ToString("B");
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionContext.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionContext.cs
index 93cd1d125a..495fe298c8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionContext.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionContext.cs
@@ -1,179 +1,146 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Class representing the context in which data collection occurs.
+/// </summary>
+[DataContract]
+public class DataCollectionContext
 {
-    using System;
-    using System.Runtime.Serialization;
+    // NOTE: These constructors are protected internal to allow 3rd parties to
+    //       do unit testing of their data collectors.
+    //
+    //       We do not want to make the constructors of this class public as it
+    //       would lead to a great deal of user error when they start creating
+    //       their own data collection context instances to log errors/warnings
+    //       or send files with.  The potential for this type of error still
+    //       exists by having the protected constructor, but it is less likely
+    //       and we have added safeguards in our DataCollectinLogger and
+    //       DataCollectionDataSink to safeguard against derived types being
+    //       passed to us.
+    //
+    //       In order to create mock instances of the DataCollectionContext for
+    //       unit testing purposes, 3rd parties can derive from this class and
+    //       have public constructors.  This will allow them to instantiate their
+    //       class and pass to us for creating data collection events.
 
     /// <summary>
-    /// Class representing the context in which data collection occurs.
+    /// Constructs DataCollection Context for in process data collectors
     /// </summary>
-    [DataContract]
-    public class DataCollectionContext
+    /// <param name="testCase">test case to identify the context</param>
+    public DataCollectionContext(TestCase? testCase)
     {
-        #region Constructors
-
-        // NOTE: These constructors are protected internal to allow 3rd parties to
-        //       do unit testing of their data collectors.
-        //
-        //       We do not want to make the constructors of this class public as it
-        //       would lead to a great deal of user error when they start creating
-        //       their own data collection context instances to log errors/warnings
-        //       or send files with.  The potential for this type of error still
-        //       exists by having the protected constructor, but it is less likely
-        //       and we have added safeguards in our DataCollectinLogger and
-        //       DataCollectionDataSink to safeguard against derived types being
-        //       passed to us.
-        //
-        //       In order to create mock instances of the DataCollectionContext for
-        //       unit testing purposes, 3rd parties can derive from this class and
-        //       have public constructors.  This will allow them to instantiate their
-        //       class and pass to us for creating data collection events.
-
-        /// <summary>
-        /// Constructs DataCollection Context for in process data collectors
-        /// </summary>
-        /// <param name="testCase">test case to identify the context</param>
-        public DataCollectionContext(TestCase testCase)
-        {
-            this.TestCase = testCase;
-        }
-
-        /// <summary>
-        /// Constructs a DataCollectionContext indicating that there is a session,
-        /// but no executing test, in context.
-        /// </summary>
-        /// <param name="sessionId">The session under which the data collection occurs.  Cannot be null.</param>
-        protected internal DataCollectionContext(SessionId sessionId)
-            : this(sessionId, (TestExecId)null)
-        {
-        }
-
-        /// <summary>
-        /// Constructs a DataCollectionContext indicating that there is a session and an executing test,
-        /// but no test step, in context.
-        /// </summary>
-        /// <param name="sessionId">The session under which the data collection occurs.  Cannot be null.</param>
-        /// <param name="testExecId">The test execution under which the data collection occurs,
-        /// or null if no executing test case is in context</param>
-        protected internal DataCollectionContext(SessionId sessionId, TestExecId testExecId)
-        {
-            //TODO
-            //EqtAssert.ParameterNotNull(sessionId, "sessionId");
-
-            this.sessionId = sessionId;
-            this.testExecId = testExecId;
-            this.hashCode = ComputeHashCode();
-        }
-
-        protected internal DataCollectionContext(SessionId sessionId, TestCase testCase) : this(sessionId, new TestExecId(testCase.Id))
-        {
-            this.TestCase = testCase;
-
-        }
-        #endregion
+        TestCase = testCase;
+        // TODO: Comment says this ctor should never have been made public but it was added.
+        // This leaves a path where SessionId is null but the rest of the class doesn't handle it.
+        SessionId = null!;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Constructs a DataCollectionContext indicating that there is a session,
+    /// but no executing test, in context.
+    /// </summary>
+    /// <param name="sessionId">The session under which the data collection occurs.  Cannot be null.</param>
+    protected internal DataCollectionContext(SessionId sessionId)
+        : this(sessionId, (TestExecId?)null)
+    {
+    }
 
-        /// <summary>
-        /// Gets test case.
-        /// </summary>
-        [DataMember]
-        public TestCase TestCase { get; private set; }
+    /// <summary>
+    /// Constructs a DataCollectionContext indicating that there is a session and an executing test,
+    /// but no test step, in context.
+    /// </summary>
+    /// <param name="sessionId">The session under which the data collection occurs.  Cannot be null.</param>
+    /// <param name="testExecId">The test execution under which the data collection occurs,
+    /// or null if no executing test case is in context</param>
+    protected internal DataCollectionContext(SessionId sessionId, TestExecId? testExecId)
+    {
+        //TODO
+        //EqtAssert.ParameterNotNull(sessionId, "sessionId");
 
-        /// <summary>
-        /// Identifies the session under which the data collection occurs.  Will not be null.
-        /// </summary>
-        [DataMember]
-        public SessionId SessionId
-        {
-            get
-            {
-                return sessionId;
-            }
-        }
+        SessionId = sessionId;
+        TestExecId = testExecId;
+        _hashCode = ComputeHashCode();
+    }
 
-        /// <summary>
-        /// Identifies the test execution under which the data collection occurs,
-        /// or null if no such test exists.
-        /// </summary>
-        [DataMember]
-        public TestExecId TestExecId
-        {
-            get
-            {
-                return testExecId;
-            }
-        }
+    protected internal DataCollectionContext(SessionId sessionId, TestCase testCase)
+        : this(sessionId, new TestExecId(testCase.Id))
+    {
+        TestCase = testCase;
 
-        /// <summary>
-        /// Returns true if there is an executing test case associated with this context.
-        /// </summary>
-        [DataMember]
-        public bool HasTestCase
-        {
-            get { return testExecId != null; }
-        }
+    }
+    /// <summary>
+    /// Gets test case.
+    /// </summary>
+    [DataMember]
+    public TestCase? TestCase { get; private set; }
 
-        #endregion
+    /// <summary>
+    /// Identifies the session under which the data collection occurs.  Will not be null.
+    /// </summary>
+    [DataMember]
+    public SessionId SessionId { get; }
 
-        #region Equals and Hashcode
+    /// <summary>
+    /// Identifies the test execution under which the data collection occurs,
+    /// or null if no such test exists.
+    /// </summary>
+    [DataMember]
+    public TestExecId? TestExecId { get; }
 
-        public static bool operator ==(DataCollectionContext context1, DataCollectionContext context2)
-        {
-            return object.Equals(context1, context2);
-        }
+    /// <summary>
+    /// Returns true if there is an executing test case associated with this context.
+    /// </summary>
+    [DataMember]
+    [MemberNotNullWhen(true, nameof(TestExecId))]
+    public bool HasTestCase
+    {
+        get { return TestExecId != null; }
+    }
 
-        public static bool operator !=(DataCollectionContext context1, DataCollectionContext context2)
-        {
-            return !(context1 == context2);
-        }
+    public static bool operator ==(DataCollectionContext? context1, DataCollectionContext? context2)
+    {
+        return Equals(context1, context2);
+    }
 
-        public override bool Equals(object obj)
-        {
-            DataCollectionContext other = obj as DataCollectionContext;
+    public static bool operator !=(DataCollectionContext? context1, DataCollectionContext? context2)
+    {
+        return !(context1 == context2);
+    }
 
-            if (other == null)
-            {
-                return false;
-            }
+    public override bool Equals(object? obj)
+    {
+        DataCollectionContext? other = obj as DataCollectionContext;
 
-            return sessionId.Equals(other.sessionId)
-                && (testExecId == null ? other.testExecId == null : testExecId.Equals(other.testExecId));
-        }
+        return other != null
+               && SessionId.Equals(other.SessionId)
+               && (TestExecId?.Equals(other.TestExecId) ?? other.TestExecId == null);
+    }
 
-        public override int GetHashCode()
-        {
-            return hashCode;
-        }
+    public override int GetHashCode()
+    {
+        return _hashCode;
+    }
 
-        #endregion
+    private int ComputeHashCode()
+    {
+        int hashCode = 17;
 
-        #region Private Methods
+        hashCode = 31 * hashCode + SessionId.GetHashCode();
 
-        private int ComputeHashCode()
+        if (TestExecId != null)
         {
-            int hashCode = 17;
-
-            hashCode = 31 * hashCode + sessionId.GetHashCode();
-
-            if (testExecId != null)
-            {
-                hashCode = 31 * hashCode + testExecId.GetHashCode();
-            }
-
-            return hashCode;
+            hashCode = 31 * hashCode + TestExecId.GetHashCode();
         }
 
-        #endregion
-
-        #region Private Fields
+        return hashCode;
+    }
 
-        private readonly SessionId sessionId;
-        private readonly TestExecId testExecId;
-        private readonly int hashCode;
+    private readonly int _hashCode;
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs
index 612b8b09cb..0a9a12c778 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs
@@ -1,88 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
 #if NETFRAMEWORK
-    using System;
+using System;
 #endif
 
-    /// <summary>
-    /// Encapsulates the context of the environment a data collector is being hosted in.
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Encapsulates the context of the environment a data collector is being hosted in.
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    public sealed class DataCollectionEnvironmentContext
+public sealed class DataCollectionEnvironmentContext
+{
+    /// <summary>
+    /// Serialization Constructor
+    /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    private DataCollectionEnvironmentContext()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
-        #region Fields
-        /// <summary>
-        /// DataCollectionContext for the session.
-        /// </summary>
-        private DataCollectionContext sessionDataCollectionContext;
-
-        #endregion
-
-        #region Constructors and initialization
-
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        internal DataCollectionEnvironmentContext()
-            : this(null)
-        {
-        }
-
-        /// <summary>
-        /// Initializes with the DataCollectionContext
-        /// </summary>
-        public DataCollectionEnvironmentContext(DataCollectionContext sessionDataCollectionContext)
-        {
-            SessionDataCollectionContext = sessionDataCollectionContext;
-        }
-
-
-        /// <summary>
-        /// Creates an environment context for a local (hosted) agent and controller
-        /// </summary>
-        /// <returns>An environment context for a local (hosted) agent and controller</returns>
-        public static DataCollectionEnvironmentContext CreateForLocalEnvironment()
-        {
-            return CreateForLocalEnvironment(null);
-        }
+    }
 
-        /// <summary>
-        /// Creates an environment context for a local (hosted) agent and controller
-        /// </summary>
-        /// <param name="sessionDataCollectionContext">Session level data collection context.</param>
-        /// <returns>An environment context for a local (hosted) agent and controller</returns>
-        public static DataCollectionEnvironmentContext CreateForLocalEnvironment(DataCollectionContext sessionDataCollectionContext)
-        {
-            var dataCollectionEnvironmentContext = new DataCollectionEnvironmentContext();
-            dataCollectionEnvironmentContext.SessionDataCollectionContext = sessionDataCollectionContext;
+    /// <summary>
+    /// Initializes with the DataCollectionContext
+    /// </summary>
+    public DataCollectionEnvironmentContext(DataCollectionContext sessionDataCollectionContext)
+    {
+        SessionDataCollectionContext = sessionDataCollectionContext;
+    }
 
-            return dataCollectionEnvironmentContext;
-        }
+    /// <summary>
+    /// Creates an environment context for a local (hosted) agent and controller
+    /// </summary>
+    /// <returns>An environment context for a local (hosted) agent and controller</returns>
+    public static DataCollectionEnvironmentContext CreateForLocalEnvironment()
+    {
+        // TODO: This API appears unused, can we remove it?
+        return CreateForLocalEnvironment(null!);
+    }
 
-        #endregion
+    /// <summary>
+    /// Creates an environment context for a local (hosted) agent and controller
+    /// </summary>
+    /// <param name="sessionDataCollectionContext">Session level data collection context.</param>
+    /// <returns>An environment context for a local (hosted) agent and controller</returns>
+    public static DataCollectionEnvironmentContext CreateForLocalEnvironment(DataCollectionContext sessionDataCollectionContext)
+    {
+        var dataCollectionEnvironmentContext = new DataCollectionEnvironmentContext(sessionDataCollectionContext);
 
-        #region Properties
+        return dataCollectionEnvironmentContext;
+    }
 
-        /// <summary>
-        /// DataCollectionContext for the session.
-        /// </summary>
-        public DataCollectionContext SessionDataCollectionContext
-        {
-            get
-            {
-                return sessionDataCollectionContext;
-            }
-            internal set
-            {
-                sessionDataCollectionContext = value;
-            }
-        }
+    /// <summary>
+    /// DataCollectionContext for the session.
+    /// </summary>
+    public DataCollectionContext SessionDataCollectionContext { get; private set; }
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionLogger.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionLogger.cs
index 27f8f76964..83ca4f9d1e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionLogger.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionLogger.cs
@@ -1,81 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Class used by data collectors to send messages to the client (e.g. Manual Test Runner, Visual Studio IDE, MSTest).
+/// </summary>
+public abstract class DataCollectionLogger
+{
     /// <summary>
-    /// Class used by data collectors to send messages to the client (e.g. Manual Test Runner, Visual Studio IDE, MSTest).
+    /// Constructs a DataCollectionLogger
     /// </summary>
-    public abstract class DataCollectionLogger
+    protected DataCollectionLogger()
     {
-        /// <summary>
-        /// Constructs a DataCollectionLogger
-        /// </summary>
-        protected DataCollectionLogger()
-        {
-        }
-
-        #region Public Members
-
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <param name="context">The context in which the message is being sent.</param>
-        /// <param name="text">The error text.  Cannot be null.</param>
-        /// <remarks>
-        /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
-        /// </remarks>
-        public abstract void LogError(DataCollectionContext context, string text);
+    }
 
-        /// <summary>
-        /// Logs an error message for an exception.
-        /// </summary>
-        /// <param name="context">The context in which the message is being sent.</param>
-        /// <param name="exception">The exception.  Cannot be null.</param>
-        /// <remarks>
-        /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
-        /// </remarks>
-        public void LogError(DataCollectionContext context, Exception exception)
-        {
-            LogError(context, string.Empty, exception);
-        }
+    /// <summary>
+    /// Logs an error message.
+    /// </summary>
+    /// <param name="context">The context in which the message is being sent.</param>
+    /// <param name="text">The error text.  Cannot be null.</param>
+    /// <remarks>
+    /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
+    /// </remarks>
+    public abstract void LogError(DataCollectionContext context, string text);
 
-        /// <summary>
-        /// Logs an error message for an exception.
-        /// </summary>
-        /// <param name="context">The context in which the message is being sent.</param>
-        /// <param name="text">Text explaining the exception.  Cannot be null.</param>
-        /// <param name="exception">The exception.  Cannot be null.</param>
-        /// <remarks>
-        /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
-        /// </remarks>
-        public abstract void LogError(DataCollectionContext context, string text, Exception exception);
+    /// <summary>
+    /// Logs an error message for an exception.
+    /// </summary>
+    /// <param name="context">The context in which the message is being sent.</param>
+    /// <param name="exception">The exception.  Cannot be null.</param>
+    /// <remarks>
+    /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
+    /// </remarks>
+    public void LogError(DataCollectionContext context, Exception exception)
+    {
+        LogError(context, string.Empty, exception);
+    }
 
-        /// <summary>
-        /// Logs a warning.
-        /// </summary>
-        /// <param name="context">The context in which the message is being sent.</param>
-        /// <param name="text">The warning text.  Cannot be null.</param>
-        /// <remarks>
-        /// When a Data Collector invokes this method, Client would get called on OnCollectionWarning( ) with a CollectionWarningMessageEventArgs.
-        /// </remarks>
-        public abstract void LogWarning(DataCollectionContext context, string text);
+    /// <summary>
+    /// Logs an error message for an exception.
+    /// </summary>
+    /// <param name="context">The context in which the message is being sent.</param>
+    /// <param name="text">Text explaining the exception.  Cannot be null.</param>
+    /// <param name="exception">The exception.  Cannot be null.</param>
+    /// <remarks>
+    /// When a Data Collector invokes this method, Client would get called on OnCollectionError( ) with a CollectionErrorMessageEventArgs.
+    /// </remarks>
+    public abstract void LogError(DataCollectionContext context, string text, Exception exception);
 
-        /// <summary>
-        /// Logs and given exception to the client.
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="ex">The exception to be logged</param>
-        /// <param name="level"> Is the exception at warning level or error level.</param>
-        /// <remarks>
-        /// When a Data Collector invokes this method, Client would get called on OnCollectionException( ) with a CollectionExceptionMessageEventArgs.
-        /// </remarks>
-        public virtual void LogException(DataCollectionContext context, Exception ex, DataCollectorMessageLevel level)
-        {
-        }
+    /// <summary>
+    /// Logs a warning.
+    /// </summary>
+    /// <param name="context">The context in which the message is being sent.</param>
+    /// <param name="text">The warning text.  Cannot be null.</param>
+    /// <remarks>
+    /// When a Data Collector invokes this method, Client would get called on OnCollectionWarning( ) with a CollectionWarningMessageEventArgs.
+    /// </remarks>
+    public abstract void LogWarning(DataCollectionContext context, string text);
 
-        #endregion
+    /// <summary>
+    /// Logs and given exception to the client.
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="ex">The exception to be logged</param>
+    /// <param name="level"> Is the exception at warning level or error level.</param>
+    /// <remarks>
+    /// When a Data Collector invokes this method, Client would get called on OnCollectionException( ) with a CollectionExceptionMessageEventArgs.
+    /// </remarks>
+    public virtual void LogException(DataCollectionContext context, Exception ex, DataCollectorMessageLevel level)
+    {
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionRunSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionRunSettings.cs
index fe86e4fbdd..ef4d693cac 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionRunSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionRunSettings.cs
@@ -1,233 +1,232 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// The in procedure data collection run settings.
+/// </summary>
+public class DataCollectionRunSettings : TestRunSettings
 {
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Linq;
-    using System.Xml;
+    private readonly string _dataCollectionRootName = string.Empty;
+
+    private readonly string _dataCollectionsName = string.Empty;
+
+    private readonly string _dataCollectorName = string.Empty;
 
     /// <summary>
-    /// The in procedure data collection run settings.
+    /// Initializes a new instance of the <see cref="DataCollectionRunSettings"/> class.
     /// </summary>
-    public class DataCollectionRunSettings : TestRunSettings
+    public DataCollectionRunSettings() : base(Constants.DataCollectionRunSettingsName)
     {
-        private string dataCollectionRootName = string.Empty;
-
-        private string dataCollectionsName = string.Empty;
+        DataCollectorSettingsList = new Collection<DataCollectorSettings>();
+        _dataCollectionRootName = Constants.DataCollectionRunSettingsName;
+        _dataCollectionsName = Constants.DataCollectorsSettingName;
+        _dataCollectorName = Constants.DataCollectorSettingName;
+    }
 
-        private string dataCollectorName = string.Empty;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataCollectionRunSettings"/> class.
+    /// </summary>
+    /// <param name="dataCollectionRootName">
+    /// The data collection root name.
+    /// </param>
+    /// <param name="dataCollectionsName">
+    /// The data collections name.
+    /// </param>
+    /// <param name="dataCollectorName">
+    /// The data collector name.
+    /// </param>
+    public DataCollectionRunSettings(
+        string dataCollectionRootName,
+        string dataCollectionsName,
+        string dataCollectorName)
+        : base(dataCollectionRootName)
+    {
+        _dataCollectionRootName = dataCollectionRootName;
+        _dataCollectionsName = dataCollectionsName;
+        _dataCollectorName = dataCollectorName;
+        DataCollectorSettingsList = new Collection<DataCollectorSettings>();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRunSettings"/> class.
-        /// </summary>
-        public DataCollectionRunSettings() : base(Constants.DataCollectionRunSettingsName)
-        {
-            this.DataCollectorSettingsList = new Collection<DataCollectorSettings>();
-            this.dataCollectionRootName = Constants.DataCollectionRunSettingsName;
-            this.dataCollectionsName = Constants.DataCollectorsSettingName;
-            this.dataCollectorName = Constants.DataCollectorSettingName;
-        }
+    /// <summary>
+    /// Gets the in procedure data collector settings list.
+    /// </summary>
+    public Collection<DataCollectorSettings> DataCollectorSettingsList
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionRunSettings"/> class.
-        /// </summary>
-        /// <param name="dataCollectionRootName">
-        /// The data collection root name.
-        /// </param>
-        /// <param name="dataCollectionsName">
-        /// The data collections name.
-        /// </param>
-        /// <param name="dataCollectorName">
-        /// The data collector name.
-        /// </param>
-        public DataCollectionRunSettings(
-            string dataCollectionRootName,
-            string dataCollectionsName,
-            string dataCollectorName)
-            : base(dataCollectionRootName)
+    /// <summary>
+    /// Gets a value indicating whether is in procedure data collection enabled.
+    /// </summary>
+    public bool IsCollectionEnabled
+    {
+        get
         {
-            this.dataCollectionRootName = dataCollectionRootName;
-            this.dataCollectionsName = dataCollectionsName;
-            this.dataCollectorName = dataCollectorName;
-            this.DataCollectorSettingsList = new Collection<DataCollectorSettings>();
+            return DataCollectorSettingsList.Any(setting => setting.IsEnabled);
         }
+    }
 
-        /// <summary>
-        /// Gets the in procedure data collector settings list.
-        /// </summary>
-        public Collection<DataCollectorSettings> DataCollectorSettingsList
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// The to xml.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public override XmlElement ToXml()
+    {
+        XmlDocument doc = new();
+        XmlElement root = doc.CreateElement(_dataCollectionRootName);
+        XmlElement subRoot = doc.CreateElement(_dataCollectionsName);
+        root.AppendChild(subRoot);
 
-        /// <summary>
-        /// Gets a value indicating whether is in procedure data collection enabled.
-        /// </summary>
-        public bool IsCollectionEnabled
+        foreach (var collectorSettings in DataCollectorSettingsList)
         {
-            get
-            {
-                return this.DataCollectorSettingsList.Any<DataCollectorSettings>(setting => setting.IsEnabled);
-            }
+            XmlNode child = doc.ImportNode(collectorSettings.ToXml(_dataCollectorName), true);
+            subRoot.AppendChild(child);
         }
 
-        /// <summary>
-        /// The to xml.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public override XmlElement ToXml()
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlElement root = doc.CreateElement(this.dataCollectionRootName);
-            XmlElement subRoot = doc.CreateElement(this.dataCollectionsName);
-            root.AppendChild(subRoot);
+        return root;
+    }
 
-            foreach (var collectorSettings in this.DataCollectorSettingsList)
-            {
-                XmlNode child = doc.ImportNode(collectorSettings.ToXml(this.dataCollectorName), true);
-                subRoot.AppendChild(child);
-            }
+    /// <summary>
+    /// The from xml.
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollectionRunSettings"/>.
+    /// </returns>
+    /// <exception cref="SettingsException">
+    /// Settings exception
+    /// </exception>
+    public static DataCollectionRunSettings FromXml(XmlReader reader)
+    {
+        return CreateDataCollectionRunSettings(
+            reader,
+            Constants.DataCollectionRunSettingsName,
+            Constants.DataCollectorsSettingName,
+            Constants.DataCollectorSettingName);
+    }
 
-            return root;
-        }
+    public static DataCollectionRunSettings FromXml(XmlReader reader, string dataCollectionName, string dataCollectorsName, string dataCollectorName)
+    {
+        return CreateDataCollectionRunSettings(reader, dataCollectionName, dataCollectorsName, dataCollectorName);
+    }
 
-        /// <summary>
-        /// The from xml.
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <returns>
-        /// The <see cref="DataCollectionRunSettings"/>.
-        /// </returns>
-        /// <exception cref="SettingsException">
-        /// Settings exception
-        /// </exception>
-        public static DataCollectionRunSettings FromXml(XmlReader reader)
-        {
-            return CreateDataCollectionRunSettings(
-                reader,
-                Constants.DataCollectionRunSettingsName,
-                Constants.DataCollectorsSettingName,
-                Constants.DataCollectorSettingName);
-        }
+    public static DataCollectionRunSettings CreateDataCollectionRunSettings(
+        XmlReader reader,
+        string dataCollectionName,
+        string dataCollectorsName,
+        string dataCollectorName)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+        ValidateArg.NotNull(dataCollectorsName, nameof(dataCollectorsName));
+        ValidateArg.NotNull(dataCollectorName, nameof(dataCollectorName));
 
-        public static DataCollectionRunSettings FromXml(XmlReader reader, string dataCollectionName, string dataCollectorsName, string dataCollectorName)
+        DataCollectionRunSettings settings = new(dataCollectionName, dataCollectorsName, dataCollectorName);
+        bool empty = reader.IsEmptyElement;
+        if (reader.HasAttributes)
         {
-            return CreateDataCollectionRunSettings(reader, dataCollectionName, dataCollectorsName, dataCollectorName);
+            reader.MoveToNextAttribute();
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.InvalidSettingsXmlAttribute,
+                    dataCollectorsName,
+                    reader.Name));
         }
 
-        public static DataCollectionRunSettings CreateDataCollectionRunSettings(
-            XmlReader reader, string dataCollectionName,
-            string dataCollectorsName, string dataCollectorName)
+        // Process the fields in Xml elements
+        reader.Read();
+        if (!empty)
         {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
-            ValidateArg.NotNull<string>(dataCollectorsName, nameof(dataCollectorsName));
-            ValidateArg.NotNull<string>(dataCollectorName, nameof(dataCollectorName));
-
-            DataCollectionRunSettings settings = new DataCollectionRunSettings(dataCollectionName, dataCollectorsName, dataCollectorName);
-            bool empty = reader.IsEmptyElement;
-            if (reader.HasAttributes)
-            {
-                reader.MoveToNextAttribute();
-                throw new SettingsException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        Resources.Resources.InvalidSettingsXmlAttribute,
-                        dataCollectorsName,
-                        reader.Name));
-            }
-
-            // Process the fields in Xml elements
-            reader.Read();
-            if (!empty)
+            while (reader.NodeType == XmlNodeType.Element)
             {
-                while (reader.NodeType == XmlNodeType.Element)
+                if (reader.Name.Equals(dataCollectorsName))
                 {
-                    if (reader.Name.Equals(dataCollectorsName))
-                    {
-                        var items = ReadListElementFromXml(reader, dataCollectorName);
-                            foreach (var item in items)
-                            {
-                                settings.DataCollectorSettingsList.Add(item);
-                            }
-                    }
-                    else
+                    var items = ReadListElementFromXml(reader, dataCollectorName);
+                    foreach (var item in items)
                     {
-                        throw new SettingsException(
-                            string.Format(
-                                CultureInfo.CurrentCulture,
-                                Resources.Resources.InvalidSettingsXmlElement,
-                                dataCollectorsName,
-                                reader.Name));
+                        settings.DataCollectorSettingsList.Add(item);
                     }
                 }
-
-                reader.ReadEndElement();
+                else
+                {
+                    throw new SettingsException(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Resources.Resources.InvalidSettingsXmlElement,
+                            dataCollectorsName,
+                            reader.Name));
+                }
             }
 
-            return settings;
+            reader.ReadEndElement();
         }
 
-        /// <summary>
-        /// The read list element from xml.
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <returns>
-        /// The <see cref="List"/>.
-        /// </returns>
-        /// <exception cref="SettingsException">
-        /// </exception>
-        internal static List<DataCollectorSettings> ReadListElementFromXml(XmlReader reader, string dataCollectorsName)
+        return settings;
+    }
+
+    /// <summary>
+    /// The read list element from xml.
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <param name="dataCollectorsName">Name of the datacollector.</param>
+    /// <returns>
+    /// The <see cref="List{T}"/>.
+    /// </returns>
+    /// <exception cref="SettingsException">
+    /// </exception>
+    internal static List<DataCollectorSettings> ReadListElementFromXml(XmlReader reader, string dataCollectorsName)
+    {
+        List<DataCollectorSettings> settings = new();
+        bool empty = reader.IsEmptyElement;
+        if (reader.HasAttributes)
         {
-            List<DataCollectorSettings> settings = new List<DataCollectorSettings>();
-            bool empty = reader.IsEmptyElement;
-            if (reader.HasAttributes)
-            {
-                reader.MoveToNextAttribute();
-                throw new SettingsException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        Resources.Resources.InvalidSettingsXmlAttribute,
-                        dataCollectorsName,
-                        reader.Name));
-            }
+            reader.MoveToNextAttribute();
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.InvalidSettingsXmlAttribute,
+                    dataCollectorsName,
+                    reader.Name));
+        }
 
-            reader.Read();
-            if (!empty)
+        reader.Read();
+        if (!empty)
+        {
+            while (reader.NodeType == XmlNodeType.Element)
             {
-                while (reader.NodeType == XmlNodeType.Element)
+                if (reader.Name.Equals(dataCollectorsName))
                 {
-                    if (reader.Name.Equals(dataCollectorsName))
-                    {
-                        settings.Add(DataCollectorSettings.FromXml(reader));
-                    }
-                    else
-                    {
-                        throw new SettingsException(
-                                string.Format(
-                                    CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsXmlElement,
-                                    dataCollectorsName,
-                                    reader.Name));
-                    }
+                    settings.Add(DataCollectorSettings.FromXml(reader));
+                }
+                else
+                {
+                    throw new SettingsException(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Resources.Resources.InvalidSettingsXmlElement,
+                            dataCollectorsName,
+                            reader.Name));
                 }
-
-                reader.ReadEndElement();
             }
 
-            return settings;
+            reader.ReadEndElement();
         }
+
+        return settings;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionSink.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionSink.cs
index 8a790b9310..bb55a6e855 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionSink.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionSink.cs
@@ -1,70 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.ComponentModel;
+using System.ComponentModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Class used by data collectors to send data to up-stream components
+/// </summary>
+public abstract class DataCollectionSink
+{
     /// <summary>
-    /// Class used by data collectors to send data to up-stream components
+    /// Initializes a new instance of the <see cref="DataCollectionSink"/> class.
     /// </summary>
-    public abstract class DataCollectionSink
+    protected DataCollectionSink()
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionSink"/> class.
-        /// </summary>
-        protected DataCollectionSink()
-        {
-        }
-
-        #endregion
-
-        #region Events
-
-        /// <summary>
-        /// Called when sending of a file has completed.
-        /// </summary>
-        public abstract event AsyncCompletedEventHandler SendFileCompleted;
-
-        #endregion
+    }
 
-        #region SendFileAsync
+    /// <summary>
+    /// Called when sending of a file has completed.
+    /// </summary>
+    public abstract event AsyncCompletedEventHandler? SendFileCompleted;
 
-        /// <summary>
-        /// Sends a file to up-stream components.
-        /// </summary>
-        /// <param name="context">The context in which the file is being sent.  Cannot be null.</param>
-        /// <param name="path">the path to the file on the local file system</param>
-        /// <param name="deleteFile">True to automatically have the file removed after sending it.</param>
-        public void SendFileAsync(DataCollectionContext context, string path, bool deleteFile)
-        {
-            this.SendFileAsync(context, path, string.Empty, deleteFile);
-        }
+    /// <summary>
+    /// Sends a file to up-stream components.
+    /// </summary>
+    /// <param name="context">The context in which the file is being sent.  Cannot be null.</param>
+    /// <param name="path">the path to the file on the local file system</param>
+    /// <param name="deleteFile">True to automatically have the file removed after sending it.</param>
+    public void SendFileAsync(DataCollectionContext context, string path, bool deleteFile)
+    {
+        SendFileAsync(context, path, string.Empty, deleteFile);
+    }
 
-        /// <summary>
-        /// Sends a file to up-stream components.
-        /// </summary>
-        /// <param name="context">The context in which the file is being sent.  Cannot be null.</param>
-        /// <param name="path">the path to the file on the local file system</param>
-        /// <param name="description">A short description of the data being sent.</param>
-        /// <param name="deleteFile">True to automatically have the file removed after sending it.</param>
-        public void SendFileAsync(DataCollectionContext context, string path, string description, bool deleteFile)
-        {
-            var fileInfo = new FileTransferInformation(context, path, deleteFile);
-            fileInfo.Description = description;
+    /// <summary>
+    /// Sends a file to up-stream components.
+    /// </summary>
+    /// <param name="context">The context in which the file is being sent.  Cannot be null.</param>
+    /// <param name="path">the path to the file on the local file system</param>
+    /// <param name="description">A short description of the data being sent.</param>
+    /// <param name="deleteFile">True to automatically have the file removed after sending it.</param>
+    public void SendFileAsync(DataCollectionContext context, string path, string description, bool deleteFile)
+    {
+        var fileInfo = new FileTransferInformation(context, path, deleteFile);
+        fileInfo.Description = description;
 
-            this.SendFileAsync(fileInfo);
-        }
+        SendFileAsync(fileInfo);
+    }
 
-        /// <summary>
-        /// Sends a file to up-stream components
-        /// </summary>
-        /// <param name="fileTransferInformation">Information about the file to be transferred.</param>
-        public abstract void SendFileAsync(FileTransferInformation fileTransferInformation);
+    /// <summary>
+    /// Sends a file to up-stream components
+    /// </summary>
+    /// <param name="fileTransferInformation">Information about the file to be transferred.</param>
+    public abstract void SendFileAsync(FileTransferInformation fileTransferInformation);
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollector.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollector.cs
index 52644065ab..a6c4de91b9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollector.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollector.cs
@@ -1,62 +1,56 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Interface for data collector add-ins
+/// </summary>
+public abstract class DataCollector : IDisposable
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Xml;
+    /// <summary>
+    /// Initializes the data collector
+    /// </summary>
+    /// <param name="configurationElement">
+    /// The XML element containing configuration information for the data collector. Can be
+    /// null if the add-in does not have any configuration information.
+    /// </param>
+    /// <param name="events">
+    /// Object containing the execution events the data collector can register for
+    /// </param>
+    /// <param name="dataSink">The sink used by the data collector to send its data</param>
+    /// <param name="logger">
+    /// Used by the data collector to send warnings, errors, or other messages
+    /// </param>
+    /// <param name="environmentContext">Provides contextual information about the agent environment</param>
+    public abstract void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext
+    );
 
     /// <summary>
-    /// Interface for data collector add-ins
+    /// Disposes the data collector.
     /// </summary>
-    public abstract class DataCollector : IDisposable
+    public void Dispose()
     {
-        #region Methods
-
-        /// <summary>
-        /// Initializes the data collector
-        /// </summary>
-        /// <param name="configurationElement">
-        /// The XML element containing configuration information for the data collector. Can be
-        /// null if the add-in does not have any configuration information.
-        /// </param>
-        /// <param name="events">
-        /// Object containing the execution events the data collector can register for
-        /// </param>
-        /// <param name="dataSink">The sink used by the data collector to send its data</param>
-        /// <param name="logger">
-        /// Used by the data collector to send warnings, errors, or other messages
-        /// </param>
-        /// <param name="environmentContext">Provides contextual information about the agent environment</param>
-        [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", MessageId = "System.Xml.XmlNode")]
-        public abstract void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext
-        );
-
-        /// <summary>
-        /// Disposes the data collector.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
+        Dispose(true);
 
-            // Suppress Finalize in case a subclass implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Called to perform cleanup when the instance is being disposed.
-        /// </summary>
-        /// <param name="disposing">True when being called from the Dispose method and false when being called during finalization.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-        }
+        // Suppress Finalize in case a subclass implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-        #endregion
+    /// <summary>
+    /// Called to perform cleanup when the instance is being disposed.
+    /// </summary>
+    /// <param name="disposing">True when being called from the Dispose method and false when being called during finalization.</param>
+    protected virtual void Dispose(bool disposing)
+    {
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectorSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectorSettings.cs
index b9f754bffd..bedb92e5ba 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectorSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectorSettings.cs
@@ -1,239 +1,233 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Globalization;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// The in procedure data collector settings.
+/// </summary>
+public class DataCollectorSettings
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Xml;
+    /// <summary>
+    /// Gets or sets the uri.
+    /// </summary>
+    public Uri? Uri
+    {
+        get;
+        set;
+    }
 
     /// <summary>
-    /// The in procedure data collector settings.
+    /// Gets or sets the assembly qualified name.
     /// </summary>
-    public class DataCollectorSettings
+    public string? AssemblyQualifiedName
     {
-        /// <summary>
-        /// Gets or sets the uri.
-        /// </summary>
-        public Uri Uri
-        {
-            get;
-            set;
-        }
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the assembly qualified name.
-        /// </summary>
-        public string AssemblyQualifiedName
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the friendly name.
+    /// </summary>
+    public string? FriendlyName
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the friendly name.
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets a value indicating whether is enabled.
+    /// </summary>
+    public bool IsEnabled
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether is enabled.
-        /// </summary>
-        public bool IsEnabled
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets value CodeBase of collector DLL. The syntax is same as Code Base in AssemblyName class.
+    /// </summary>
+    public string? CodeBase
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the configuration.
+    /// </summary>
+    public XmlElement? Configuration
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// The to xml.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public XmlElement ToXml()
+    {
+        XmlDocument doc = new();
+        XmlElement root = doc.CreateElement(Constants.DataCollectorSettingName);
+        AppendAttribute(doc, root, "uri", Uri?.ToString());
+        AppendAttribute(doc, root, "assemblyQualifiedName", AssemblyQualifiedName);
+        AppendAttribute(doc, root, "friendlyName", FriendlyName);
 
-        /// <summary>
-        /// Gets or sets value CodeBase of collector DLL. The syntax is same as Code Base in AssemblyName class.
-        /// </summary>
-        public string CodeBase
+        root.AppendChild(doc.ImportNode(Configuration!, true));
+
+        return root;
+    }
+
+    /// <summary>
+    /// The to xml.
+    /// </summary>
+    /// <param name="dataCollectorName">
+    /// The data collector name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public XmlElement ToXml(string dataCollectorName)
+    {
+        XmlDocument doc = new();
+        XmlElement root = doc.CreateElement(dataCollectorName);
+        if (Uri != null)
         {
-            get;
-            set;
+            AppendAttribute(doc, root, "uri", Uri.ToString());
         }
 
-        /// <summary>
-        /// Gets or sets the configuration.
-        /// </summary>
-        public XmlElement Configuration
+        if (!StringUtils.IsNullOrWhiteSpace(AssemblyQualifiedName))
         {
-            get;
-            set;
+            AppendAttribute(doc, root, "assemblyQualifiedName", AssemblyQualifiedName);
         }
 
-        /// <summary>
-        /// The to xml.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public XmlElement ToXml()
+        if (!StringUtils.IsNullOrWhiteSpace(FriendlyName))
         {
-            XmlDocument doc = new XmlDocument();
-            XmlElement root = doc.CreateElement(Constants.DataCollectorSettingName);
-            AppendAttribute(doc, root, "uri", this.Uri.ToString());
-            AppendAttribute(doc, root, "assemblyQualifiedName", this.AssemblyQualifiedName);
-            AppendAttribute(doc, root, "friendlyName", this.FriendlyName);
+            AppendAttribute(doc, root, "friendlyName", FriendlyName);
+        }
 
-            root.AppendChild(doc.ImportNode(this.Configuration, true));
+        AppendAttribute(doc, root, "enabled", IsEnabled.ToString());
 
-            return root;
+        if (!StringUtils.IsNullOrWhiteSpace(CodeBase))
+        {
+            AppendAttribute(doc, root, "codebase", CodeBase);
         }
 
-        /// <summary>
-        /// The to xml.
-        /// </summary>
-        /// <param name="dataCollectorName">
-        /// The data collector name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public XmlElement ToXml(string dataCollectorName)
+        if (Configuration != null)
         {
-            XmlDocument doc = new XmlDocument();
-            XmlElement root = doc.CreateElement(dataCollectorName);
-            if (this.Uri != null)
-            {
-                AppendAttribute(doc, root, "uri", this.Uri.ToString());
-            }
-
-            if (!string.IsNullOrWhiteSpace(this.AssemblyQualifiedName))
-            {
-                AppendAttribute(doc, root, "assemblyQualifiedName", this.AssemblyQualifiedName);
-            }
-
-            if (!string.IsNullOrWhiteSpace(this.FriendlyName))
-            {
-                AppendAttribute(doc, root, "friendlyName", this.FriendlyName);
-            }
-
-            AppendAttribute(doc, root, "enabled", this.IsEnabled.ToString());
-
-            if (!string.IsNullOrWhiteSpace(this.CodeBase))
-            {
-                AppendAttribute(doc, root, "codebase", this.CodeBase);
-            }
-
-            if (this.Configuration != null)
-            {
-                root.AppendChild(doc.ImportNode(this.Configuration, true));
-            }
-
-            return root;
+            root.AppendChild(doc.ImportNode(Configuration, true));
         }
 
-        /// <summary>
-        /// The from xml.
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <returns>
-        /// The <see cref="InProcDataCollectorSettings"/>.
-        /// </returns>
-        /// <exception cref="SettingsException">
-        /// Settings exception
-        /// </exception>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        internal static DataCollectorSettings FromXml(XmlReader reader)
+        return root;
+    }
+
+    /// <summary>
+    /// The from xml.
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DataCollectorSettings"/>.
+    /// </returns>
+    /// <exception cref="SettingsException">
+    /// Settings exception
+    /// </exception>
+    internal static DataCollectorSettings FromXml(XmlReader reader)
+    {
+        DataCollectorSettings settings = new();
+        settings.IsEnabled = true;
+        bool empty = reader.IsEmptyElement;
+        if (reader.HasAttributes)
         {
-            DataCollectorSettings settings = new DataCollectorSettings();
-            settings.IsEnabled = true;
-            bool empty = reader.IsEmptyElement;
-            if (reader.HasAttributes)
+            while (reader.MoveToNextAttribute())
             {
-                while (reader.MoveToNextAttribute())
+                switch (reader.Name)
                 {
-                    switch (reader.Name)
-                    {
-                        case "uri":
-                            ValidateArg.NotNullOrEmpty(reader.Value, "uri");
-                            try
-                            {
-                                settings.Uri = new Uri(reader.Value);
-                            }
-                            catch (UriFormatException)
-                            {
-                                throw new SettingsException(String.Format(CultureInfo.CurrentCulture, Resources.Resources.InvalidDataCollectorUriInSettings, reader.Value));
-                            }
-
-                            break;
-
-                        case "assemblyQualifiedName":
-                            ValidateArg.NotNullOrEmpty(reader.Value, "assemblyQualifiedName");
-                            settings.AssemblyQualifiedName = reader.Value;
-                            break;
-
-                        case "friendlyName":
-                            ValidateArg.NotNullOrEmpty(reader.Value, "FriendlyName");
-                            settings.FriendlyName = reader.Value;
-                            break;
-
-                        case "enabled":
-                            settings.IsEnabled = bool.Parse(reader.Value);
-                            break;
-
-                        case "codebase":
-                            settings.CodeBase = reader.Value; // Optional.
-                            break;
-
-                        default:
-                            throw new SettingsException(
-                                String.Format(
-                                    CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsXmlAttribute,
-                                    Constants.DataCollectionRunSettingsName,
-                                    reader.Name));
-                    }
+                    case "uri":
+                        ValidateArg.NotNullOrEmpty(reader.Value, "uri");
+                        try
+                        {
+                            settings.Uri = new Uri(reader.Value);
+                        }
+                        catch (UriFormatException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.InvalidDataCollectorUriInSettings, reader.Value));
+                        }
+
+                        break;
+
+                    case "assemblyQualifiedName":
+                        ValidateArg.NotNullOrEmpty(reader.Value, "assemblyQualifiedName");
+                        settings.AssemblyQualifiedName = reader.Value;
+                        break;
+
+                    case "friendlyName":
+                        ValidateArg.NotNullOrEmpty(reader.Value, "FriendlyName");
+                        settings.FriendlyName = reader.Value;
+                        break;
+
+                    case "enabled":
+                        settings.IsEnabled = bool.Parse(reader.Value);
+                        break;
+
+                    case "codebase":
+                        settings.CodeBase = reader.Value; // Optional.
+                        break;
+
+                    default:
+                        throw new SettingsException(
+                            string.Format(
+                                CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsXmlAttribute,
+                                Constants.DataCollectionRunSettingsName,
+                                reader.Name));
                 }
-
             }
 
-            reader.Read();
-            if (!empty)
+        }
+
+        reader.Read();
+        if (!empty)
+        {
+            while (reader.NodeType == XmlNodeType.Element)
             {
-                while (reader.NodeType == XmlNodeType.Element)
+                switch (reader.Name)
                 {
-                    switch (reader.Name)
-                    {
-                        case "Configuration":
-                            XmlDocument doc = new XmlDocument();
-                            XmlElement element = doc.CreateElement("Configuration");
-                            element.InnerXml = reader.ReadInnerXml();
-                            settings.Configuration = element;
-                            break;
-
-                        default:
-                            throw new SettingsException(
-                                String.Format(
-                                    CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsXmlElement,
-                                    Constants.DataCollectionRunSettingsName,
-                                    reader.Name));
-                    }
+                    case "Configuration":
+                        XmlDocument doc = new();
+                        XmlElement element = doc.CreateElement("Configuration");
+                        element.InnerXml = reader.ReadInnerXml();
+                        settings.Configuration = element;
+                        break;
+
+                    default:
+                        throw new SettingsException(
+                            string.Format(
+                                CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsXmlElement,
+                                Constants.DataCollectionRunSettingsName,
+                                reader.Name));
                 }
-                reader.ReadEndElement();
             }
-            return settings;
+            reader.ReadEndElement();
         }
+        return settings;
+    }
 
-        private static void AppendAttribute(XmlDocument doc, XmlElement owner, string attributeName, string attributeValue)
-        {
-            XmlAttribute attribute = doc.CreateAttribute(attributeName);
-            attribute.Value = attributeValue;
-            owner.Attributes.Append(attribute);
-        }
+    private static void AppendAttribute(XmlDocument doc, XmlElement owner, string attributeName, string? attributeValue)
+    {
+        XmlAttribute attribute = doc.CreateAttribute(attributeName);
+        attribute.Value = attributeValue;
+        owner.Attributes.Append(attribute);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs
index 37596ceffc..3973402bb9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs
@@ -1,70 +1,43 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.Diagnostics;
+using System;
 
-    /// <summary>
-    /// Base class for all execution event arguments
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Base class for all execution event arguments
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    public abstract class DataCollectionEventArgs : EventArgs
+public abstract class DataCollectionEventArgs : EventArgs
+{
+    /// <summary>
+    /// Default constructor added for serialization/deserialization.
+    /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public DataCollectionEventArgs()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor added for serialization/deserialization.
-        /// </summary>
-        public DataCollectionEventArgs()
-        {
-        }
-
-        /// <summary>
-        /// Initializes the instance by storing the given information
-        /// </summary>
-        /// <param name="context">Context information for the event</param>
-        protected DataCollectionEventArgs(DataCollectionContext context)
-        {
-            Context = context;
-        }
-
-        #endregion
-
-        #region Public properties
-
-        /// <summary>
-        /// Gets the context information for the event
-        /// </summary>
-        public DataCollectionContext Context
-        {
-            get;
-            internal set;
-        }
-
-        #endregion
-
-        #region Private Methods
+        // TODO: Make private
+    }
 
-        /// <summary>
-        /// Updates the data collection context stored by this instance.
-        /// </summary>
-        /// <param name="context">Context to update with.</param>
-        /// <remarks>
-        /// Generally the data collection context is known in advance, however there
-        /// are cases around custom notifications where it is not necessarily known
-        /// until the event is being sent.  This is used for updating the context when
-        /// sending the event.
-        /// </remarks>
-        internal void UpdateDataCollectionContext(DataCollectionContext context)
-        {
-            Debug.Assert(context != null, "'context' cannot be null.");
-            Context = context;
-        }
+    /// <summary>
+    /// Initializes the instance by storing the given information
+    /// </summary>
+    /// <param name="context">Context information for the event</param>
+    protected DataCollectionEventArgs(DataCollectionContext context)
+    {
+        Context = context;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the context information for the event
+    /// </summary>
+    public DataCollectionContext Context
+    {
+        get;
+        internal set;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEvents.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEvents.cs
index f7dadc2a29..454389d6e8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEvents.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEvents.cs
@@ -1,53 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Class defining execution events that will be registered for by collectors
+/// </summary>
+public abstract class DataCollectionEvents
+{
     /// <summary>
-    /// Class defining execution events that will be registered for by collectors
+    /// Initializes a new instance of the <see cref="DataCollectionEvents"/> class.
     /// </summary>
-    public abstract class DataCollectionEvents
+    protected DataCollectionEvents()
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataCollectionEvents"/> class.
-        /// </summary>
-        protected DataCollectionEvents()
-        {
-        }
-
-        #endregion
-
-        #region Events
+    }
 
-        /// <summary>
-        /// Raised when test host initialized
-        /// </summary>
-        public abstract event EventHandler<TestHostLaunchedEventArgs> TestHostLaunched;
+    /// <summary>
+    /// Raised when test host initialized
+    /// </summary>
+    public abstract event EventHandler<TestHostLaunchedEventArgs>? TestHostLaunched;
 
-        /// <summary>
-        /// Raised when a session is starting
-        /// </summary>
-        public abstract event EventHandler<SessionStartEventArgs> SessionStart;
+    /// <summary>
+    /// Raised when a session is starting
+    /// </summary>
+    public abstract event EventHandler<SessionStartEventArgs>? SessionStart;
 
-        /// <summary>
-        /// Raised when a session is ending
-        /// </summary>
-        public abstract event EventHandler<SessionEndEventArgs> SessionEnd;
+    /// <summary>
+    /// Raised when a session is ending
+    /// </summary>
+    public abstract event EventHandler<SessionEndEventArgs>? SessionEnd;
 
-        /// <summary>
-        /// Raised when a test case is starting
-        /// </summary>
-        public abstract event EventHandler<TestCaseStartEventArgs> TestCaseStart;
+    /// <summary>
+    /// Raised when a test case is starting
+    /// </summary>
+    public abstract event EventHandler<TestCaseStartEventArgs>? TestCaseStart;
 
-        /// <summary>
-        /// Raised when a test case is ending
-        /// </summary>
-        public abstract event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
+    /// <summary>
+    /// Raised when a test case is ending
+    /// </summary>
+    public abstract event EventHandler<TestCaseEndEventArgs>? TestCaseEnd;
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/SessionEvents.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/SessionEvents.cs
index 99a9cace15..773f3bd6b4 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/SessionEvents.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/SessionEvents.cs
@@ -1,135 +1,128 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Session Start event arguments
+/// </summary>
+[DataContract]
+public sealed class SessionStartEventArgs : DataCollectionEventArgs
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Runtime.Serialization;
+    private readonly IDictionary<string, object?> _properties;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
+    /// </summary>
+    /// <remarks>
+    /// Default constructor with empty properties and default DataCollectionContext.
+    /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
+    /// </remarks>
+    public SessionStartEventArgs()
+        : this(new DataCollectionContext(new SessionId(Guid.Empty)), new Dictionary<string, object?>())
+    {
+
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
+    /// </summary>
+    /// <remarks>
+    /// constructor with properties and default DataCollectionContext.
+    /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
+    /// </remarks>
+    public SessionStartEventArgs(IDictionary<string, object?> properties)
+        : this(new DataCollectionContext(new SessionId(Guid.Empty)), properties)
+    {
+
+    }
 
     /// <summary>
-    /// Session Start event arguments
+    /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
     /// </summary>
-    [DataContract]
-    public sealed class SessionStartEventArgs : DataCollectionEventArgs
+    /// <param name="context">
+    /// Context information for the session
+    /// </param>
+    /// <param name="properties">Properties for the session.</param>
+    public SessionStartEventArgs(DataCollectionContext context, IDictionary<string, object?> properties)
+        : base(context)
     {
-        private IDictionary<string, object> Properties;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
-        /// </summary>
-        /// <remarks>
-        /// Default constructor with empty properties and default DataCollectionContext.
-        /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
-        /// </remarks>
-        public SessionStartEventArgs() : this(new DataCollectionContext(new SessionId(Guid.Empty)), new Dictionary<string, object>())
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
-        /// </summary>
-        /// <remarks>
-        /// constructor with properties and default DataCollectionContext.
-        /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
-        /// </remarks>
-        public SessionStartEventArgs(IDictionary<string, object> properties) : this(new DataCollectionContext(new SessionId(Guid.Empty)), properties)
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionStartEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the session
-        /// </param>
-        public SessionStartEventArgs(DataCollectionContext context, IDictionary<string, object> properties)
-            : base(context)
-        {
-            this.Properties = properties;
-            Debug.Assert(!context.HasTestCase, "Session event has test a case context");
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Gets session start properties enumerator
-        /// </summary>
-        public IEnumerator<KeyValuePair<string, object>> GetProperties()
-        {
-            return this.Properties.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Gets property value
-        /// </summary>
-        /// <param name="property">
-        /// Property name
-        /// </param>
-        public T GetPropertyValue<T>(string property)
-        {
-            ValidateArg.NotNullOrEmpty(property, nameof(property));
-
-            return this.Properties.ContainsKey(property) ? (T)this.Properties[property] : default(T);
-        }
-
-        /// <summary>
-        /// Gets property value
-        /// </summary>
-        /// <param name="property">
-        /// Property name
-        /// </param>
-        public object GetPropertyValue(string property)
-        {
-            ValidateArg.NotNullOrEmpty(property, nameof(property));
-
-            this.Properties.TryGetValue(property, out var propertyValue);
-
-            return propertyValue;
-        }
-
-        #endregion
+        _properties = properties;
+        TPDebug.Assert(!context.HasTestCase, "Session event has test a case context");
     }
 
     /// <summary>
-    /// Session End event arguments
+    /// Gets session start properties enumerator
     /// </summary>
-    [DataContract]
-    public sealed class SessionEndEventArgs : DataCollectionEventArgs
+    public IEnumerator<KeyValuePair<string, object?>> GetProperties()
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionEndEventArgs"/> class.
-        /// </summary>
-        /// <remarks>
-        /// Default constructor with default DataCollectionContext.
-        /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
-        /// </remarks>
-        public SessionEndEventArgs() : this(new DataCollectionContext(new SessionId(Guid.Empty)))
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionEndEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the session
-        /// </param>
-        public SessionEndEventArgs(DataCollectionContext context)
-            : base(context)
-        {
-            Debug.Assert(!context.HasTestCase, "Session event has test a case context");
-        }
-
-        #endregion
+        return _properties.GetEnumerator();
     }
+
+    /// <summary>
+    /// Gets property value
+    /// </summary>
+    /// <param name="property">
+    /// Property name
+    /// </param>
+    public T? GetPropertyValue<T>(string property)
+    {
+        ValidateArg.NotNullOrEmpty(property, nameof(property));
+
+        return _properties.ContainsKey(property) ? (T?)_properties[property] : default;
+    }
+
+    /// <summary>
+    /// Gets property value
+    /// </summary>
+    /// <param name="property">
+    /// Property name
+    /// </param>
+    public object? GetPropertyValue(string property)
+    {
+        ValidateArg.NotNullOrEmpty(property, nameof(property));
+
+        _properties.TryGetValue(property, out var propertyValue);
+
+        return propertyValue;
+    }
+
+}
+
+/// <summary>
+/// Session End event arguments
+/// </summary>
+[DataContract]
+public sealed class SessionEndEventArgs : DataCollectionEventArgs
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SessionEndEventArgs"/> class.
+    /// </summary>
+    /// <remarks>
+    /// Default constructor with default DataCollectionContext.
+    /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
+    /// </remarks>
+    public SessionEndEventArgs() : this(new DataCollectionContext(new SessionId(Guid.Empty)))
+    {
+
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SessionEndEventArgs"/> class.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the session
+    /// </param>
+    public SessionEndEventArgs(DataCollectionContext context)
+        : base(context)
+    {
+        TPDebug.Assert(!context.HasTestCase, "Session event has test a case context");
+    }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestCaseEvents.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestCaseEvents.cs
index c48cc90489..5313b1d5b5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestCaseEvents.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestCaseEvents.cs
@@ -1,437 +1,420 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.Diagnostics;
-    using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Base class for all test case event arguments.
+/// </summary>
+[DataContract]
+public abstract class TestCaseEventArgs : DataCollectionEventArgs
+{
     /// <summary>
-    /// Base class for all test case event arguments.
+    /// Default constructor added for serialization/deserialization.
     /// </summary>
-    [DataContract]
-    public abstract class TestCaseEventArgs : DataCollectionEventArgs
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public TestCaseEventArgs()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor added for serialization/deserialization.
-        /// </summary>
-        public TestCaseEventArgs()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testCaseId">
-        /// The test case ID
-        /// </param>
-        /// <param name="testCaseName">
-        /// The test case name
-        /// </param>
-        /// <param name="isChildTestCase">
-        /// True if this is a child test case, false if this is a top-level test case.
-        /// </param>
-        protected TestCaseEventArgs(
-            DataCollectionContext context,
-            Guid testCaseId,
-            string testCaseName,
-            bool isChildTestCase)
-            : base(context)
-        {
-            this.TestCaseId = testCaseId;
-            this.TestCaseName = testCaseName ?? string.Empty;
-            this.IsChildTestCase = isChildTestCase;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testElement">
-        /// The test element of the test that this event is for.
-        /// </param>
-        protected TestCaseEventArgs(
-            DataCollectionContext context,
-            TestCase testElement)
-            : this(context, Guid.Empty, null, false)
-        {
-            // NOTE: ONLY USE FOR UNIT TESTING!
-            //  This overload is only here for 3rd parties to use for unit testing
-            //  their data collectors.  Internally we should not be passing the test element
-            //  around in the events as this is extra information that needs to be serialized
-            //  and the Execution Plugin Manager will fill this in for us before the event
-            //  is sent to the data collector when running in a production environment.
-
-            // TODO
-            // EqtAssert.ParameterNotNull(testElement, "testElement");
-
-            this.TestElement = testElement;
-            this.TestCaseId = testElement.Id;
-            this.TestCaseName = testElement.DisplayName;
-            // IsChildTestCase = testElement != null &&
-            // !testElement.ParentExecId.Equals(TestExecId.Empty);
-        }
-
-        #endregion
-
-        #region Public properties
-
-        /// <summary>
-        /// Gets the test case ID
-        /// </summary>
-        [DataMember]
-        public Guid TestCaseId
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the test case name
-        /// </summary>
-        [DataMember]
-        public string TestCaseName
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this is a child test case, false if this is a top-level test case
-        /// </summary>
-        [DataMember]
-        public bool IsChildTestCase
-        {
-            get;
-            private set;
-        }
+        // TODO: Make private
+    }
 
-        /// <summary>
-        /// Gets test element of the test this event is for.
-        /// </summary>
-        [DataMember]
-        public TestCase TestElement
-        {
-            get;
-            internal set;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEventArgs"/> class.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testCaseId">
+    /// The test case ID
+    /// </param>
+    /// <param name="testCaseName">
+    /// The test case name
+    /// </param>
+    /// <param name="isChildTestCase">
+    /// True if this is a child test case, false if this is a top-level test case.
+    /// </param>
+    protected TestCaseEventArgs(
+        DataCollectionContext context,
+        Guid testCaseId,
+        string? testCaseName,
+        bool isChildTestCase)
+        : base(context)
+    {
+        TestCaseId = testCaseId;
+        TestCaseName = testCaseName ?? string.Empty;
+        IsChildTestCase = isChildTestCase;
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEventArgs"/> class.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testElement">
+    /// The test element of the test that this event is for.
+    /// </param>
+    protected TestCaseEventArgs(
+        DataCollectionContext context,
+        TestCase testElement)
+        : this(context, Guid.Empty, null, false)
+    {
+        // NOTE: ONLY USE FOR UNIT TESTING!
+        //  This overload is only here for 3rd parties to use for unit testing
+        //  their data collectors.  Internally we should not be passing the test element
+        //  around in the events as this is extra information that needs to be serialized
+        //  and the Execution Plugin Manager will fill this in for us before the event
+        //  is sent to the data collector when running in a production environment.
+
+        // TODO
+        // EqtAssert.ParameterNotNull(testElement, "testElement");
+
+        TestElement = testElement;
+        TestCaseId = testElement.Id;
+        TestCaseName = testElement.DisplayName;
+        // IsChildTestCase = testElement != null &&
+        // !testElement.ParentExecId.Equals(TestExecId.Empty);
     }
 
     /// <summary>
-    /// Test Case Start event arguments.
+    /// Gets the test case ID
     /// </summary>
-    [DataContract]
-    public sealed class TestCaseStartEventArgs : TestCaseEventArgs
+    [DataMember]
+    public Guid TestCaseId
     {
-        #region Constructor
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Default constructor for serialization/deserialization
-        /// </summary>
-        public TestCaseStartEventArgs()
-        {
-        }
+    /// <summary>
+    /// Gets the test case name
+    /// </summary>
+    [DataMember]
+    public string TestCaseName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class with default datacollection context.
-        /// </summary>
-        /// <param name="testElement">
-        /// The test element.
-        /// </param>
-        public TestCaseStartEventArgs(TestCase testElement) : this(new DataCollectionContext(new SessionId(Guid.Empty)), testElement)
-        {
-        }
+    /// <summary>
+    /// Gets a value indicating whether this is a child test case, false if this is a top-level test case
+    /// </summary>
+    [DataMember]
+    public bool IsChildTestCase
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class.
-        /// Initializes the instance by storing the given information.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testElement">
-        /// The test element of the test that this event is for.
-        /// </param>
-        public TestCaseStartEventArgs(
-            DataCollectionContext context,
-            TestCase testElement)
-            : base(context, testElement)
-        {
-            // NOTE: ONLY USE FOR UNIT TESTING!
-            //  This overload is only here for 3rd parties to use for unit testing
-            //  their data collectors.  Internally we should not be passing the test element
-            //  around in the events as this is extra information that needs to be serialized
-            //  and the Execution Plugin Manager will fill this in for us before the event
-            //  is sent to the data collector when running in a production environment.
-        }
+    /// <summary>
+    /// Gets test element of the test this event is for.
+    /// </summary>
+    [DataMember]
+    public TestCase? TestElement
+    {
+        get;
+        internal set;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class.
-        /// Initializes the instance by storing the given information
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testCaseId">
-        /// The test case ID
-        /// </param>
-        /// <param name="testCaseName">
-        /// The test case name
-        /// </param>
-        /// <param name="isChildTestCase">
-        /// True if this is a child test case, false if this is a top-level test case
-        /// </param>
-        internal TestCaseStartEventArgs(
-            DataCollectionContext context,
-            Guid testCaseId,
-            string testCaseName,
-            bool isChildTestCase)
-            : base(context, testCaseId, testCaseName, isChildTestCase)
-        {
-            Debug.Assert(context.HasTestCase, "Context is not for a test case");
-        }
+}
 
-        #endregion
+/// <summary>
+/// Test Case Start event arguments.
+/// </summary>
+[DataContract]
+public sealed class TestCaseStartEventArgs : TestCaseEventArgs
+{
+    /// <summary>
+    /// Default constructor for serialization/deserialization
+    /// </summary>
+    public TestCaseStartEventArgs()
+    {
     }
 
     /// <summary>
-    /// Test Case End event arguments.
+    /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class with default datacollection context.
     /// </summary>
-    [DataContract]
-    public sealed class TestCaseEndEventArgs : TestCaseEventArgs
+    /// <param name="testElement">
+    /// The test element.
+    /// </param>
+    public TestCaseStartEventArgs(TestCase testElement) : this(new DataCollectionContext(new SessionId(Guid.Empty)), testElement)
     {
-        #region Constructor
-        /// <summary>
-        /// Default constructor added for serialization/deserialization.
-        /// </summary>
-        public TestCaseEndEventArgs()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class with default data collection context.
-        /// </summary>
-        /// <param name="testElement">
-        /// The test element.
-        /// </param>
-        /// <param name="testOutcome">
-        /// The test outcome.
-        /// </param>
-        /// <remarks>
-        /// Default constructor with default DataCollectionContext.
-        /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
-        /// </remarks>
-        public TestCaseEndEventArgs(TestCase testElement, TestOutcome testOutcome) : this(new DataCollectionContext(new SessionId(Guid.Empty)), testElement, testOutcome)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
-        /// Initializes the instance by storing the given information.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testElement">
-        /// The test element of the test that this event is for.
-        /// </param>
-        /// <param name="testOutcome">
-        /// The outcome of the test case.
-        /// </param>
-        public TestCaseEndEventArgs(
-            DataCollectionContext context,
-            TestCase testElement,
-            TestOutcome testOutcome)
-            : base(context, testElement)
-        {
-            // NOTE: ONLY USE FOR UNIT TESTING!
-            //  This overload is only here for 3rd parties to use for unit testing
-            //  their data collectors.  Internally we should not be passing the test element
-            //  around in the events as this is extra information that needs to be serialized
-            //  and the Execution Plugin Manager will fill this in for us before the event
-            //  is sent to the data collector when running in a production environment.
-            this.TestOutcome = testOutcome;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class.
+    /// Initializes the instance by storing the given information.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testElement">
+    /// The test element of the test that this event is for.
+    /// </param>
+    public TestCaseStartEventArgs(
+        DataCollectionContext context,
+        TestCase testElement)
+        : base(context, testElement)
+    {
+        // NOTE: ONLY USE FOR UNIT TESTING!
+        //  This overload is only here for 3rd parties to use for unit testing
+        //  their data collectors.  Internally we should not be passing the test element
+        //  around in the events as this is extra information that needs to be serialized
+        //  and the Execution Plugin Manager will fill this in for us before the event
+        //  is sent to the data collector when running in a production environment.
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testCaseId">
-        /// The test case ID
-        /// </param>
-        /// <param name="testCaseName">
-        /// The test case name
-        /// </param>
-        /// <param name="isChildTestCase">
-        /// True if this is a child test case, false if this is a top-level test case
-        /// </param>
-        internal TestCaseEndEventArgs(
-            DataCollectionContext context,
-            Guid testCaseId,
-            string testCaseName,
-            bool isChildTestCase)
-            : this(context, testCaseId, testCaseName, isChildTestCase, TestOutcome.Failed)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseStartEventArgs"/> class.
+    /// Initializes the instance by storing the given information
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testCaseId">
+    /// The test case ID
+    /// </param>
+    /// <param name="testCaseName">
+    /// The test case name
+    /// </param>
+    /// <param name="isChildTestCase">
+    /// True if this is a child test case, false if this is a top-level test case
+    /// </param>
+    internal TestCaseStartEventArgs(
+        DataCollectionContext context,
+        Guid testCaseId,
+        string testCaseName,
+        bool isChildTestCase)
+        : base(context, testCaseId, testCaseName, isChildTestCase)
+    {
+        TPDebug.Assert(context.HasTestCase, "Context is not for a test case");
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
-        /// Initializes the instance by storing the given information
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testCaseId">
-        /// The test case ID
-        /// </param>
-        /// <param name="testCaseName">
-        /// The test case name
-        /// </param>
-        /// <param name="isChildTestCase">
-        /// True if this is a child test case, false if this is a top-level test case
-        /// </param>
-        /// <param name="testOutcome">
-        /// The outcome of the test case.
-        /// </param>
-        internal TestCaseEndEventArgs(
-            DataCollectionContext context,
-            Guid testCaseId,
-            string testCaseName,
-            bool isChildTestCase,
-            TestOutcome testOutcome)
-            : base(context, testCaseId, testCaseName, isChildTestCase)
-        {
-            Debug.Assert(context.HasTestCase, "Context is not for a test case");
-            this.TestOutcome = testOutcome;
-        }
+}
 
-        #endregion
+/// <summary>
+/// Test Case End event arguments.
+/// </summary>
+[DataContract]
+public sealed class TestCaseEndEventArgs : TestCaseEventArgs
+{
+    /// <summary>
+    /// Default constructor added for serialization/deserialization.
+    /// </summary>
+    public TestCaseEndEventArgs()
+    {
+    }
 
-        #region Properties
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class with default data collection context.
+    /// </summary>
+    /// <param name="testElement">
+    /// The test element.
+    /// </param>
+    /// <param name="testOutcome">
+    /// The test outcome.
+    /// </param>
+    /// <remarks>
+    /// Default constructor with default DataCollectionContext.
+    /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
+    /// </remarks>
+    public TestCaseEndEventArgs(TestCase testElement, TestOutcome testOutcome) : this(new DataCollectionContext(new SessionId(Guid.Empty)), testElement, testOutcome)
+    {
+    }
 
-        /// <summary>
-        /// Gets the outcome of the test.
-        /// </summary>
-        [DataMember]
-        public TestOutcome TestOutcome
-        {
-            get;
-            private set;
-        }
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
+    /// Initializes the instance by storing the given information.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testElement">
+    /// The test element of the test that this event is for.
+    /// </param>
+    /// <param name="testOutcome">
+    /// The outcome of the test case.
+    /// </param>
+    public TestCaseEndEventArgs(
+        DataCollectionContext context,
+        TestCase testElement,
+        TestOutcome testOutcome)
+        : base(context, testElement)
+    {
+        // NOTE: ONLY USE FOR UNIT TESTING!
+        //  This overload is only here for 3rd parties to use for unit testing
+        //  their data collectors.  Internally we should not be passing the test element
+        //  around in the events as this is extra information that needs to be serialized
+        //  and the Execution Plugin Manager will fill this in for us before the event
+        //  is sent to the data collector when running in a production environment.
+        TestOutcome = testOutcome;
     }
 
     /// <summary>
-    /// Test Case Result event arguments.
+    /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
     /// </summary>
-    [DataContract]
-    public sealed class TestResultEventArgs : TestCaseEventArgs
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testCaseId">
+    /// The test case ID
+    /// </param>
+    /// <param name="testCaseName">
+    /// The test case name
+    /// </param>
+    /// <param name="isChildTestCase">
+    /// True if this is a child test case, false if this is a top-level test case
+    /// </param>
+    internal TestCaseEndEventArgs(
+        DataCollectionContext context,
+        Guid testCaseId,
+        string testCaseName,
+        bool isChildTestCase)
+        : this(context, testCaseId, testCaseName, isChildTestCase, TestOutcome.Failed)
     {
-        #region Constructor
+    }
 
-        /// <summary>
-        /// Default constructor for serialization/deserialization
-        /// </summary>
-        public TestResultEventArgs()
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCaseEndEventArgs"/> class.
+    /// Initializes the instance by storing the given information
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testCaseId">
+    /// The test case ID
+    /// </param>
+    /// <param name="testCaseName">
+    /// The test case name
+    /// </param>
+    /// <param name="isChildTestCase">
+    /// True if this is a child test case, false if this is a top-level test case
+    /// </param>
+    /// <param name="testOutcome">
+    /// The outcome of the test case.
+    /// </param>
+    internal TestCaseEndEventArgs(
+        DataCollectionContext context,
+        Guid testCaseId,
+        string testCaseName,
+        bool isChildTestCase,
+        TestOutcome testOutcome)
+        : base(context, testCaseId, testCaseName, isChildTestCase)
+    {
+        TPDebug.Assert(context.HasTestCase, "Context is not for a test case");
+        TestOutcome = testOutcome;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class with default data collection context.
-        /// </summary>
-        /// <param name="testResult">
-        /// The test result.
-        /// </param>
-        /// <remarks>
-        /// Default constructor with default DataCollectionContext.
-        /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
-        /// </remarks>
-        public TestResultEventArgs(TestResult testResult)
-            : this(new DataCollectionContext(new SessionId(Guid.Empty)), testResult)
-        {
-        }
+    /// <summary>
+    /// Gets the outcome of the test.
+    /// </summary>
+    [DataMember]
+    public TestOutcome TestOutcome
+    {
+        get;
+        private set;
+    }
+}
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
-        /// Initializes the instance by storing the given information.
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testResult">
-        /// The test Result.
-        /// </param>
-        public TestResultEventArgs(
-            DataCollectionContext context,
-            TestResult testResult)
-            : base(context, testResult.TestCase)
-        {
-            // NOTE: ONLY USE FOR UNIT TESTING!
-            //  This overload is only here for 3rd parties to use for unit testing
-            //  their data collectors.  Internally we should not be passing the test element
-            //  around in the events as this is extra information that needs to be serialized
-            //  and the Execution Plugin Manager will fill this in for us before the event
-            //  is sent to the data collector when running in a production environment.
-            this.TestResult = testResult;
-        }
+/// <summary>
+/// Test Case Result event arguments.
+/// </summary>
+[DataContract]
+public sealed class TestResultEventArgs : TestCaseEventArgs
+{
+    /// <summary>
+    /// Default constructor for serialization/deserialization
+    /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public TestResultEventArgs()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    {
+        // TODO: Make private
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
-        /// Initializes the instance by storing the given information
-        /// </summary>
-        /// <param name="context">
-        /// Context information for the test case
-        /// </param>
-        /// <param name="testCaseId">
-        /// The test case ID
-        /// </param>
-        /// <param name="testCaseName">
-        /// The test case name
-        /// </param>
-        /// <param name="isChildTestCase">
-        /// True if this is a child test case, false if this is a top-level test case
-        /// </param>
-        /// <param name="testResult">
-        /// The test Result.
-        /// </param>
-        internal TestResultEventArgs(
-            DataCollectionContext context,
-            Guid testCaseId,
-            string testCaseName,
-            bool isChildTestCase,
-            TestResult testResult)
-            : base(context, testCaseId, testCaseName, isChildTestCase)
-        {
-            Debug.Assert(context.HasTestCase, "Context is not for a test case");
-            this.TestResult = testResult;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class with default data collection context.
+    /// </summary>
+    /// <param name="testResult">
+    /// The test result.
+    /// </param>
+    /// <remarks>
+    /// Default constructor with default DataCollectionContext.
+    /// DataCollectionContext with empty session signifies that is it irrelevant in the current context.
+    /// </remarks>
+    public TestResultEventArgs(TestResult testResult)
+        : this(new DataCollectionContext(new SessionId(Guid.Empty)), testResult)
+    {
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
+    /// Initializes the instance by storing the given information.
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testResult">
+    /// The test Result.
+    /// </param>
+    public TestResultEventArgs(
+        DataCollectionContext context,
+        TestResult testResult)
+        : base(context, testResult.TestCase)
+    {
+        // NOTE: ONLY USE FOR UNIT TESTING!
+        //  This overload is only here for 3rd parties to use for unit testing
+        //  their data collectors.  Internally we should not be passing the test element
+        //  around in the events as this is extra information that needs to be serialized
+        //  and the Execution Plugin Manager will fill this in for us before the event
+        //  is sent to the data collector when running in a production environment.
+        TestResult = testResult;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
+    /// Initializes the instance by storing the given information
+    /// </summary>
+    /// <param name="context">
+    /// Context information for the test case
+    /// </param>
+    /// <param name="testCaseId">
+    /// The test case ID
+    /// </param>
+    /// <param name="testCaseName">
+    /// The test case name
+    /// </param>
+    /// <param name="isChildTestCase">
+    /// True if this is a child test case, false if this is a top-level test case
+    /// </param>
+    /// <param name="testResult">
+    /// The test Result.
+    /// </param>
+    internal TestResultEventArgs(
+        DataCollectionContext context,
+        Guid testCaseId,
+        string testCaseName,
+        bool isChildTestCase,
+        TestResult testResult)
+        : base(context, testCaseId, testCaseName, isChildTestCase)
+    {
+        TPDebug.Assert(context.HasTestCase, "Context is not for a test case");
+        TestResult = testResult;
+    }
 
-        /// <summary>
-        /// Gets the outcome of the test.
-        /// </summary>
-        [DataMember]
-        public TestResult TestResult
-        {
-            get;
-            private set;
-        }
-        #endregion
+    /// <summary>
+    /// Gets the outcome of the test.
+    /// </summary>
+    [DataMember]
+    public TestResult TestResult
+    {
+        get;
+        private set;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestHostLaunchedEvent.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestHostLaunchedEvent.cs
index 10aa6d93b8..879abbac2a 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestHostLaunchedEvent.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/TestHostLaunchedEvent.cs
@@ -1,54 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Session End event arguments
+/// </summary>
+[DataContract]
+public sealed class TestHostLaunchedEventArgs : DataCollectionEventArgs
 {
-    using System.Runtime.Serialization;
+    /// <summary>
+    /// Process id of the test host
+    /// </summary>
+    public int TestHostProcessId { get; }
 
     /// <summary>
-    /// Session End event arguments
+    /// Initializes a new instance of the <see cref="TestHostLaunchedEventArgs"/> class.
     /// </summary>
-    [DataContract]
-    public sealed class TestHostLaunchedEventArgs : DataCollectionEventArgs
+    /// <param name="context">
+    /// Data collection context
+    /// </param>
+    /// <param name="processId">
+    /// Process id of test host
+    /// </param>
+    public TestHostLaunchedEventArgs(DataCollectionContext context, int processId)
+        : base(context)
     {
-        #region Private members
-
-        /// <summary>
-        /// Process id of the test host
-        /// </summary>
-        private int processId;
-
-        #endregion
-
-        #region Public properties
-
-        public int TestHostProcessId
-        {
-            get
-            {
-                return processId;
-            }
-        }
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestHostLaunchedEventArgs"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// Data collection context
-        /// </param>
-        /// <param name="processId">
-        /// Process id of test host
-        /// </param>
-        public TestHostLaunchedEventArgs(DataCollectionContext context, int processId)
-            : base(context)
-        {
-            this.processId = processId;
-        }
-
-        #endregion
+        TestHostProcessId = processId;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectionSink.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectionSink.cs
index ef97e673e4..1bdf537507 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectionSink.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectionSink.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Class used by data collectors to send data to up-stream components
+/// (agent, controller, client, etc).
+/// </summary>
+public interface IDataCollectionSink
 {
     /// <summary>
-    /// Class used by data collectors to send data to up-stream components
-    /// (agent, controller, client, etc).
+    /// The send data will send the data collection data to upstream applications.
+    /// Key will be set as TestProperty in TestResult and value as corresponding value.
     /// </summary>
-    public interface IDataCollectionSink
-    {
-        /// <summary>
-        /// The send data will send the data collection data to upstream applications.
-        /// Key will be set as TestProperty in TestResult and value as corresponding value.
-        /// </summary>
-        /// <param name="dataCollectionContext">
-        /// The data collection context.
-        /// </param>
-        /// <param name="key">
-        /// The key should be unique for a data collector.
-        /// </param>
-        /// <param name="value">
-        /// The value should be a string or an object serialized into a JSON string.
-        /// </param>
-        void SendData(DataCollectionContext dataCollectionContext, string key, string value);
+    /// <param name="dataCollectionContext">
+    /// The data collection context.
+    /// </param>
+    /// <param name="key">
+    /// The key should be unique for a data collector.
+    /// </param>
+    /// <param name="value">
+    /// The value should be a string or an object serialized into a JSON string.
+    /// </param>
+    void SendData(DataCollectionContext dataCollectionContext, string key, string value);
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachmentProcessor.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachmentProcessor.cs
index dfdc77c9fe..f6876cb431 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachmentProcessor.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachmentProcessor.cs
@@ -1,50 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Interface for data collectors add-ins that choose to reprocess generated attachments
+/// </summary>
+public interface IDataCollectorAttachmentProcessor
+{
     /// <summary>
-    /// Interface for data collectors add-ins that choose to reprocess generated attachments
+    /// Gets the attachments Uris, which are handled by attachment processor
     /// </summary>
-    public interface IDataCollectorAttachmentProcessor
-    {
-        /// <summary>
-        /// Gets the attachments Uris, which are handled by attachment processor
-        /// </summary>
-        IEnumerable<Uri> GetExtensionUris();
+    IEnumerable<Uri>? GetExtensionUris();
 
-        /// <summary>
-        /// Indicates whether attachment processor is supporting incremental processing of attachments
-        /// </summary>
-        /// <remarks>
-        /// `SupportsIncrementalProcessing` should indicate if attachment processor is supporting incremental processing of attachments. It means that `ProcessAttachmentSetsAsync` should be [associative](https://en.wikipedia.org/wiki/Associative_property).
-        /// By default `SupportsIncrementalProcessing` should be `False`, unless processing can take longer time and it's beneficial to start the process as soon as possible.
-        ///
-        /// If `SupportsIncrementalProcessing` is `True` Test Platform may try to speed up whole process by reprocessing data collector attachments as soon as possible when any two test executions are done.For example let's assume we have 5 test executions which are generating 5 data collector attachments: `a1`, `a2`, `a3`, `a4` and `a5`. Test platform could perform invocations:
-        /// * `var result1 = await ProcessAttachmentSetsAsync([a1, a2, a3], ...);` when first 3 executions are done
-        /// * `var result2 = await ProcessAttachmentSetsAsync(result1.Concat([a4]), ...);` when 4th execution is done
-        /// * `var finalResult = await ProcessAttachmentSetsAsync(result2.Concat([a5]), ...);` when last test execution is done
-        /// 
-        /// If `SupportsIncrementalProcessing` is `False` then Test Platform will wait for all test executions to finish and call `ProcessAttachmentSetsAsync` only once:
-        /// * `var finalResult = await ProcessAttachmentSetsAsync([a1, a2, a3, a4, a5], ...);`
-        /// </remarks>
-        bool SupportsIncrementalProcessing { get; }
+    /// <summary>
+    /// Indicates whether attachment processor is supporting incremental processing of attachments
+    /// </summary>
+    /// <remarks>
+    /// `SupportsIncrementalProcessing` should indicate if attachment processor is supporting incremental processing of attachments. It means that `ProcessAttachmentSetsAsync` should be [associative](https://en.wikipedia.org/wiki/Associative_property).
+    /// By default `SupportsIncrementalProcessing` should be `False`, unless processing can take longer time and it's beneficial to start the process as soon as possible.
+    ///
+    /// If `SupportsIncrementalProcessing` is `True` Test Platform may try to speed up whole process by reprocessing data collector attachments as soon as possible when any two test executions are done.For example let's assume we have 5 test executions which are generating 5 data collector attachments: `a1`, `a2`, `a3`, `a4` and `a5`. Test platform could perform invocations:
+    /// * `var result1 = await ProcessAttachmentSetsAsync([a1, a2, a3], ...);` when first 3 executions are done
+    /// * `var result2 = await ProcessAttachmentSetsAsync(result1.Concat([a4]), ...);` when 4th execution is done
+    /// * `var finalResult = await ProcessAttachmentSetsAsync(result2.Concat([a5]), ...);` when last test execution is done
+    ///
+    /// If `SupportsIncrementalProcessing` is `False` then Test Platform will wait for all test executions to finish and call `ProcessAttachmentSetsAsync` only once:
+    /// * `var finalResult = await ProcessAttachmentSetsAsync([a1, a2, a3, a4, a5], ...);`
+    /// </remarks>
+    bool SupportsIncrementalProcessing { get; }
 
-        /// <summary>
-        /// Reprocess attachments generated by independent test executions
-        /// </summary>
-        /// <param name="attachments">Attachments to be processed</param>
-        /// <param name="progressReporter">Progress reporter. Accepts integers from 0 to 100</param>
-        /// <param name="logger">Message logger</param>
-        /// <param name="cancellationToken">Cancellation token</param>
-        /// <returns>Attachments after reprocessing</returns>
-        Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Reprocess attachments generated by independent test executions
+    /// </summary>
+    /// <param name="configurationElement">Configuration of the attachment processor. Will be the same as the data collector that registers it.</param>
+    /// <param name="attachments">Attachments to be processed</param>
+    /// <param name="progressReporter">Progress reporter. Accepts integers from 0 to 100</param>
+    /// <param name="logger">Message logger</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Attachments after reprocessing</returns>
+    Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachments.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachments.cs
index a342d74ea6..322c4d4878 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachments.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/IDataCollectorAttachments.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Interface for data collectors add-ins that choose to handle attachment(s) generated
+/// </summary>
+[Obsolete("Interface is deprecated. Please use IDataCollectorAttachmentProcessor instead")]
+public interface IDataCollectorAttachments
+{
     /// <summary>
-    /// Interface for data collectors add-ins that choose to handle attachment(s) generated
+    /// Gets the attachment set after Test Run Session
     /// </summary>
-    [Obsolete("Interface is deprecated. Please use IDataCollectorAttachmentProcessor instead")]
-    public interface IDataCollectorAttachments
-    {
-        /// <summary>
-        /// Gets the attachment set after Test Run Session
-        /// </summary>
-        /// <returns>Gets the attachment set after Test Run Session</returns>
-        ICollection<AttachmentSet> HandleDataCollectionAttachmentSets(ICollection<AttachmentSet> dataCollectionAttachments);
+    /// <returns>Gets the attachment set after Test Run Session</returns>
+    ICollection<AttachmentSet> HandleDataCollectionAttachmentSets(ICollection<AttachmentSet> dataCollectionAttachments);
 
-        /// <summary>
-        /// Gets the attachment Uri, which is handled by current Collector
-        /// </summary>
-        Uri GetExtensionUri();
-    }
+    /// <summary>
+    /// Gets the attachment Uri, which is handled by current Collector
+    /// </summary>
+    Uri GetExtensionUri();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/ITestExecutionEnvironmentSpecifier.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/ITestExecutionEnvironmentSpecifier.cs
index 462a15d078..c4b470d2f5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/ITestExecutionEnvironmentSpecifier.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/ITestExecutionEnvironmentSpecifier.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+/// <summary>
+/// Interface for data collectors add-ins that choose to specify some information about how the test execution environment
+/// should be set up
+/// </summary>
+public interface ITestExecutionEnvironmentSpecifier
+{
     /// <summary>
-    /// Interface for data collectors add-ins that choose to specify some information about how the test execution environment
-    /// should be set up
+    /// Gets environment variables that should be set in the test execution environment
     /// </summary>
-    public interface ITestExecutionEnvironmentSpecifier
-    {
-        /// <summary>
-        /// Gets environment variables that should be set in the test execution environment
-        /// </summary>
-        /// <returns>Environment variables that should be set in the test execution environment</returns>
-        IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables();
-    }
+    /// <returns>Environment variables that should be set in the test execution environment</returns>
+    IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollectionArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollectionArgs.cs
index adad4514da..18159963c0 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollectionArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollectionArgs.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+/// <summary>
+/// The InProcDataCollectionArgs interface.
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Interface is part of the public API.")]
+public interface InProcDataCollectionArgs
 {
-    /// <summary>
-    /// The InProcDataCollectionArgs interface.
-    /// </summary>
-    public interface InProcDataCollectionArgs
-    {
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollector.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollector.cs
index 18eb7a78fb..bdc7d6af00 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollector.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/InProcDataCollector.cs
@@ -1,52 +1,52 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
 
+/// <summary>
+/// Listener interface for external exe from test host
+/// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Interface is part of the public API.")]
+public interface InProcDataCollection
+{
     /// <summary>
-    /// Listener interface for external exe from test host
+    /// Initializes the In Process DataCollection with the DataCollectionSink
     /// </summary>
-    public interface InProcDataCollection
-    {
-        /// <summary>
-        /// Initializes the In Process DataCollection with the DataCollectionSink
-        /// </summary>
-        /// <param name="dataCollectionSink">data collection sink object</param>
-        void Initialize(IDataCollectionSink dataCollectionSink);
+    /// <param name="dataCollectionSink">data collection sink object</param>
+    void Initialize(IDataCollectionSink dataCollectionSink);
 
-        /// <summary>
-        /// Called when test session starts
-        /// </summary>
-        /// <param name="testSessionStartArgs">
-        /// The test Session Start Args.
-        /// </param>
-        void TestSessionStart(TestSessionStartArgs testSessionStartArgs);
+    /// <summary>
+    /// Called when test session starts
+    /// </summary>
+    /// <param name="testSessionStartArgs">
+    /// The test Session Start Args.
+    /// </param>
+    void TestSessionStart(TestSessionStartArgs testSessionStartArgs);
 
-        /// <summary>
-        /// Called when test case starts
-        /// </summary>
-        /// <param name="testCaseStartArgs">
-        /// Test Case start args
-        /// </param>
-        void TestCaseStart(TestCaseStartArgs testCaseStartArgs);
+    /// <summary>
+    /// Called when test case starts
+    /// </summary>
+    /// <param name="testCaseStartArgs">
+    /// Test Case start args
+    /// </param>
+    void TestCaseStart(TestCaseStartArgs testCaseStartArgs);
 
-        /// <summary>
-        /// Called when test case end
-        /// </summary>
-        /// <param name="testCaseEndArgs">
-        /// The test Case End Args.
-        /// </param>
-        void TestCaseEnd(TestCaseEndArgs testCaseEndArgs);
+    /// <summary>
+    /// Called when test case end
+    /// </summary>
+    /// <param name="testCaseEndArgs">
+    /// The test Case End Args.
+    /// </param>
+    void TestCaseEnd(TestCaseEndArgs testCaseEndArgs);
 
-        /// <summary>
-        /// Called when test session end
-        /// </summary>
-        /// <param name="testSessionEndArgs">
-        /// The test Session End Args.
-        /// </param>
-        void TestSessionEnd(TestSessionEndArgs testSessionEndArgs);
-    }
+    /// <summary>
+    /// Called when test session end
+    /// </summary>
+    /// <param name="testSessionEndArgs">
+    /// The test Session End Args.
+    /// </param>
+    void TestSessionEnd(TestSessionEndArgs testSessionEndArgs);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseEndArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseEndArgs.cs
index 3e4887263b..98d43adbeb 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseEndArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseEndArgs.cs
@@ -1,38 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
 
+/// <summary>
+/// The test case end args.
+/// </summary>
+public class TestCaseEndArgs : InProcDataCollectionArgs
+{
     /// <summary>
-    /// The test case end args.
+    /// Initializes a new instance of the <see cref="TestCaseEndArgs"/> class.
     /// </summary>
-    public class TestCaseEndArgs : InProcDataCollectionArgs
+    /// <param name="dataCollectionContext">
+    /// The data Collection Context.
+    /// </param>
+    /// <param name="outcome">
+    /// The outcome.
+    /// </param>
+    public TestCaseEndArgs(DataCollectionContext dataCollectionContext, TestOutcome outcome)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseEndArgs"/> class.
-        /// </summary>
-        /// <param name="dataCollectionContext">
-        /// The data Collection Context.
-        /// </param>
-        /// <param name="outcome">
-        /// The outcome.
-        /// </param>
-        public TestCaseEndArgs(DataCollectionContext dataCollectionContext, TestOutcome outcome)
-        {
-            this.TestOutcome = outcome;
-            this.DataCollectionContext = dataCollectionContext;
-        }
+        TestOutcome = outcome;
+        DataCollectionContext = dataCollectionContext;
+    }
 
-        /// <summary>
-        /// Gets the outcome.
-        /// </summary>
-        public TestOutcome TestOutcome { get; private set; }
+    /// <summary>
+    /// Gets the outcome.
+    /// </summary>
+    public TestOutcome TestOutcome { get; private set; }
 
-        /// <summary>
-        /// Gets the data collection context.
-        /// </summary>
-        public DataCollectionContext DataCollectionContext { get; private set; }
-    }
+    /// <summary>
+    /// Gets the data collection context.
+    /// </summary>
+    public DataCollectionContext DataCollectionContext { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseStartArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseStartArgs.cs
index f4734db8c5..ed6c8f1d46 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseStartArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestCaseStartArgs.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+/// <summary>
+/// The test case start args.
+/// </summary>
+public class TestCaseStartArgs : InProcDataCollectionArgs
 {
     /// <summary>
-    /// The test case start args.
+    /// Initializes a new instance of the <see cref="TestCaseStartArgs"/> class.
     /// </summary>
-    public class TestCaseStartArgs : InProcDataCollectionArgs
+    /// <param name="testCase">
+    /// The test case.
+    /// </param>
+    public TestCaseStartArgs(TestCase? testCase)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCaseStartArgs"/> class.
-        /// </summary>
-        /// <param name="testCase">
-        /// The test case.
-        /// </param>
-        public TestCaseStartArgs(TestCase testCase)
-        {
-            this.TestCase = testCase;
-        }
-
-        /// <summary>
-        /// Gets the test case.
-        /// </summary>
-        public TestCase TestCase { get; private set; }
+        TestCase = testCase;
     }
+
+    /// <summary>
+    /// Gets the test case.
+    /// </summary>
+    public TestCase? TestCase { get; private set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionEndArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionEndArgs.cs
index 158c660b69..8cc7a62b8b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionEndArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionEndArgs.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+/// <summary>
+/// The test session end args.
+/// </summary>
+public class TestSessionEndArgs : InProcDataCollectionArgs
 {
-    /// <summary>
-    /// The test session end args.
-    /// </summary>
-    public class TestSessionEndArgs : InProcDataCollectionArgs
-    {
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionStartArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionStartArgs.cs
index e546b11713..9fc75fa955 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionStartArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/InProcDataCollector/TestSessionStartArgs.cs
@@ -1,88 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+
+/// <summary>
+/// The test session start args.
+/// </summary>
+public class TestSessionStartArgs : InProcDataCollectionArgs
 {
-    using System;
-    using System.Collections.Generic;
+    private readonly IDictionary<string, object?>? _properties;
 
     /// <summary>
-    /// The test session start args.
+    /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
     /// </summary>
-    public class TestSessionStartArgs : InProcDataCollectionArgs
+    public TestSessionStartArgs()
     {
-        private IDictionary<string, object> Properties;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
-        /// </summary>
-        public TestSessionStartArgs()
-        {
-            this.Configuration = String.Empty;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
-        /// </summary>
-        /// <param name="properties">
-        /// Properties.
-        /// </param>
-        public TestSessionStartArgs(IDictionary<string, object> properties)
-        {
-            this.Configuration = String.Empty;
-            this.Properties = properties;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
-        /// </summary>
-        /// <param name="configuration">
-        /// The configuration.
-        /// </param>
-        public TestSessionStartArgs(string configuration)
-        {
-            this.Configuration = configuration;
-        }
+        Configuration = string.Empty;
+    }
 
-        /// <summary>
-        /// Gets or sets the configuration.
-        /// </summary>
-        public string Configuration { get; set; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
+    /// </summary>
+    /// <param name="properties">
+    /// Properties.
+    /// </param>
+    public TestSessionStartArgs(IDictionary<string, object?> properties)
+    {
+        Configuration = string.Empty;
+        _properties = properties;
+    }
 
-        /// <summary>
-        /// Gets session start properties enumerator
-        /// </summary>
-        public IEnumerator<KeyValuePair<string, object>> GetProperties()
-        {
-            return this.Properties.GetEnumerator();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestSessionStartArgs"/> class.
+    /// </summary>
+    /// <param name="configuration">
+    /// The configuration.
+    /// </param>
+    public TestSessionStartArgs(string configuration)
+    {
+        Configuration = configuration;
+    }
 
-        /// <summary>
-        /// Gets property value
-        /// </summary>
-        /// <param name="property">
-        /// Property name
-        /// </param>
-        public T GetPropertyValue<T>(string property)
-        {
-            ValidateArg.NotNullOrEmpty(property, nameof(property));
+    /// <summary>
+    /// Gets or sets the configuration.
+    /// </summary>
+    public string? Configuration { get; set; }
 
-            return this.Properties.ContainsKey(property) ? (T)this.Properties[property] : default(T);
-        }
+    /// <summary>
+    /// Gets session start properties enumerator
+    /// </summary>
+    public IEnumerator<KeyValuePair<string, object?>> GetProperties()
+    {
+        TPDebug.Assert(_properties is not null, "_properties is null");
+        return _properties.GetEnumerator();
+    }
 
-        /// <summary>
-        /// Gets property value
-        /// </summary>
-        /// <param name="property">
-        /// Property name
-        /// </param>
-        public object GetPropertyValue(string property)
-        {
-            ValidateArg.NotNullOrEmpty(property, nameof(property));
+    /// <summary>
+    /// Gets property value
+    /// </summary>
+    /// <param name="property">
+    /// Property name
+    /// </param>
+    public T? GetPropertyValue<T>(string property)
+    {
+        ValidateArg.NotNullOrEmpty(property, nameof(property));
+        TPDebug.Assert(_properties is not null, "_properties is null");
+        return _properties.ContainsKey(property) ? (T?)_properties[property] : default;
+    }
 
-            this.Properties.TryGetValue(property, out var propertyValue);
+    /// <summary>
+    /// Gets property value
+    /// </summary>
+    /// <param name="property">
+    /// Property name
+    /// </param>
+    public object? GetPropertyValue(string property)
+    {
+        ValidateArg.NotNullOrEmpty(property, nameof(property));
+        TPDebug.Assert(_properties is not null, "_properties is null");
+        _properties.TryGetValue(property, out var propertyValue);
 
-            return propertyValue;
-        }
+        return propertyValue;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/BaseTransferInformation.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/BaseTransferInformation.cs
index 0f982750bd..e3a43d8ef2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/BaseTransferInformation.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/BaseTransferInformation.cs
@@ -1,103 +1,83 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Collects the required and optional information needed for requesting a file transfer from a data collector.
+/// </summary>
+public abstract class BasicTransferInformation
 {
+    private string? _description;
+
     /// <summary>
-    /// Collects the required and optional information needed for requesting a file transfer from a data collector.
+    /// Initializes a new instance of the <see cref="BasicTransferInformation"/> class.
     /// </summary>
-    public abstract class BasicTransferInformation
+    /// <param name="context">
+    /// The data collection context for the transfer.
+    /// </param>
+    protected BasicTransferInformation(DataCollectionContext context)
     {
-        #region Fields
-
-        private string description;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BasicTransferInformation"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// The data collection context for the transfer.
-        /// </param>
-        protected BasicTransferInformation(DataCollectionContext context)
-        {
-            //EqtAssert.ParameterNotNull(context, "context");
-            this.Context = context;
-            this.Description = string.Empty;
-        }
-
-        #endregion
+        //EqtAssert.ParameterNotNull(context, "context");
+        Context = context;
+        Description = string.Empty;
+    }
 
-        #region  Required Parameters.
 
-        /// <summary>
-        /// Gets the data collection context the transfer will be associated with.
-        /// </summary>
-        public DataCollectionContext Context { get; private set; }
+    #region  Required Parameters.
 
-        #endregion
+    /// <summary>
+    /// Gets the data collection context the transfer will be associated with.
+    /// </summary>
+    public DataCollectionContext Context { get; private set; }
 
-        #region Optional Parameters.
+    #endregion
 
-        /// <summary>
-        /// Gets or sets a short description of the data being sent.
-        /// </summary>
-        public string Description
-        {
-            get
-            {
-                return this.description;
-            }
+    #region Optional Parameters.
 
-            set
-            {
-                // If we don't have a description, use an empty string.
-                if (value == null)
-                {
-                    this.description = string.Empty;
-                }
-                else
-                {
-                    this.description = value;
-                }
-            }
-        }
+    /// <summary>
+    /// Gets or sets a short description of the data being sent.
+    /// </summary>
+    public string? Description
+    {
+        get => _description;
 
-        /// <summary>
-        /// Gets or sets the token which will be included with the callback to identify this file transfer.
-        /// </summary>
-        public object UserToken { get; set; }
+        set =>
+            // If we don't have a description, use an empty string.
+            _description = value ?? string.Empty;
+    }
 
-        /// <summary>
-        /// Gets or sets the ID of the request that this file should be associated with. This is used
-        /// for sending transient data which will be associated only with this
-        /// data request and not the session or test cases that are currently running.
-        /// </summary>
-        public RequestId RequestId { get; set; }
+    /// <summary>
+    /// Gets or sets the token which will be included with the callback to identify this file transfer.
+    /// </summary>
+    public object? UserToken { get; set; }
 
-        /// <summary>
-        /// Gets a value indicating whether cleanup should be performed after transferring the resource. This
-        /// can be known by different names in the derived classes so it is protected internal
-        /// so that we can refer to it in a consistent way.
-        /// </summary>
-        protected internal abstract bool PerformCleanup
-        {
-            get;
-        }
+    /// <summary>
+    /// Gets or sets the ID of the request that this file should be associated with. This is used
+    /// for sending transient data which will be associated only with this
+    /// data request and not the session or test cases that are currently running.
+    /// </summary>
+    public RequestId? RequestId { get; set; }
 
-        /// <summary>
-        /// Gets the name of the file to use on the client machine. This
-        /// can be known by different names in the derived classes so it is protected internal
-        /// so that we can refer to it in a consistent way.
-        /// </summary>
-        protected internal abstract string FileName
-        {
-            get;
-        }
+    /// <summary>
+    /// Gets a value indicating whether cleanup should be performed after transferring the resource. This
+    /// can be known by different names in the derived classes so it is protected internal
+    /// so that we can refer to it in a consistent way.
+    /// </summary>
+    protected internal abstract bool PerformCleanup
+    {
+        get;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the name of the file to use on the client machine. This
+    /// can be known by different names in the derived classes so it is protected internal
+    /// so that we can refer to it in a consistent way.
+    /// </summary>
+    protected internal abstract string FileName
+    {
+        get;
     }
+
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/FileTransferInformation.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/FileTransferInformation.cs
index d6cc636665..45aed5c42c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/FileTransferInformation.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/TransferInformation/FileTransferInformation.cs
@@ -1,93 +1,87 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
+using System;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+/// <summary>
+/// Represents required and optional information needed for requesting a file transfer.
+/// </summary>
+public class FileTransferInformation : BasicTransferInformation
 {
-    using System;
-    using System.IO;
+    private readonly IFileHelper _fileHelper;
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FileTransferInformation"/> class.
+    /// </summary>
+    /// <param name="context">
+    /// The context in which the file is being sent.  Cannot be null.
+    /// </param>
+    /// <param name="path">
+    /// The path to the file on the local file system
+    /// </param>
+    /// <param name="deleteFile">
+    /// True to automatically have the file removed after sending it.
+    /// </param>
+    public FileTransferInformation(DataCollectionContext context, string path, bool deleteFile)
+        : this(context, path, deleteFile, new TestPlatform.Utilities.Helpers.FileHelper())
+    {
+    }
 
     /// <summary>
-    /// Represents required and optional information needed for requesting a file transfer.
+    /// Initializes a new instance of the <see cref="FileTransferInformation"/> class.
     /// </summary>
-    public class FileTransferInformation : BasicTransferInformation
+    /// <param name="context">
+    /// The context in which the file is being sent.  Cannot be null.
+    /// </param>
+    /// <param name="path">
+    /// The path to the file on the local file system
+    /// </param>
+    /// <param name="deleteFile">
+    /// True to automatically have the file removed after sending it.
+    /// </param>
+    /// <param name="fileHelper">
+    /// The file Helper.
+    /// </param>
+    [CLSCompliant(false)]
+    public FileTransferInformation(DataCollectionContext context, string path, bool deleteFile, IFileHelper fileHelper)
+        : base(context)
     {
-        private readonly IFileHelper fileHelper;
+        _fileHelper = fileHelper;
 
-        #region Constructor
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileTransferInformation"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// The context in which the file is being sent.  Cannot be null.
-        /// </param>
-        /// <param name="path">
-        /// The path to the file on the local file system
-        /// </param>
-        /// <param name="deleteFile">
-        /// True to automatically have the file removed after sending it.
-        /// </param>
-        public FileTransferInformation(DataCollectionContext context, string path, bool deleteFile)
-            : this(context, path, deleteFile, new TestPlatform.Utilities.Helpers.FileHelper())
-        {
-        }
+        // Expand environment variables in the path
+        path = Environment.ExpandEnvironmentVariables(path);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileTransferInformation"/> class.
-        /// </summary>
-        /// <param name="context">
-        /// The context in which the file is being sent.  Cannot be null.
-        /// </param>
-        /// <param name="path">
-        /// The path to the file on the local file system
-        /// </param>
-        /// <param name="deleteFile">
-        /// True to automatically have the file removed after sending it.
-        /// </param>
-        /// <param name="fileHelper">
-        /// The file Helper.
-        /// </param>
-        [CLSCompliant(false)]
-        public FileTransferInformation(DataCollectionContext context, string path, bool deleteFile, IFileHelper fileHelper)
-            : base(context)
+        // Make sure the file exists.
+        if (!_fileHelper.Exists(path))
         {
-            this.fileHelper = fileHelper;
-
-            // Expand environment variables in the path
-            path = Environment.ExpandEnvironmentVariables(path);
-
-            // Make sure the file exists.
-            if (!this.fileHelper.Exists(path))
-            {
-                throw new FileNotFoundException(string.Format(Resources.Resources.Common_FileNotExist, new object[] { path }), path);
-            }
-
-            // Make sure the path we have is a full path (not relative).
-            this.Path = this.fileHelper.GetFullPath(path);
-
-            this.PerformCleanup = deleteFile;
+            throw new FileNotFoundException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.Common_FileNotExist, [path]), path);
         }
 
-        #endregion
+        // Make sure the path we have is a full path (not relative).
+        Path = _fileHelper.GetFullPath(path);
 
-        #region  Required Parameters.
+        PerformCleanup = deleteFile;
+    }
 
-        /// <summary>
-        /// Gets the path to the file on the local file system.
-        /// </summary>
-        public string Path { get; private set; }
+    /// <summary>
+    /// Gets the path to the file on the local file system.
+    /// </summary>
+    public string Path { get; private set; }
 
-        /// <summary>
-        /// Indicates if cleanup should be performed after transferring the resource.
-        /// </summary>
-        protected internal override bool PerformCleanup { get; }
+    /// <summary>
+    /// Indicates if cleanup should be performed after transferring the resource.
+    /// </summary>
+    protected internal override bool PerformCleanup { get; }
 
-        /// <summary>
-        /// The name of the file to use on the client machine.
-        /// </summary>
-        protected internal override string FileName => this.Path;
+    /// <summary>
+    /// The name of the file to use on the client machine.
+    /// </summary>
+    protected internal override string FileName => Path;
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DefaultExecutorUriAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/DefaultExecutorUriAttribute.cs
index 5f6caabacd..2e7fd6c0cc 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/DefaultExecutorUriAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/DefaultExecutorUriAttribute.cs
@@ -1,44 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// This attribute is applied on the discoverers to inform the framework about their default executor.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public sealed class DefaultExecutorUriAttribute : Attribute
+{
     /// <summary>
-    /// This attribute is applied on the discoverers to inform the framework about their default executor.
+    /// Initializes with the Uri of the executor.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public sealed class DefaultExecutorUriAttribute : Attribute
+    /// <param name="executorUri">The Uri of the executor</param>
+    public DefaultExecutorUriAttribute(string executorUri)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the Uri of the executor.
-        /// </summary>
-        /// <param name="defaultExecutorUri">The Uri of the executor</param>
-        public DefaultExecutorUriAttribute(string executorUri)
-        {
-            if (string.IsNullOrWhiteSpace(executorUri))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(executorUri));
-            }
-
-            ExecutorUri = executorUri;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The Uri of the Test Executor.
-        /// </summary>
-        public string ExecutorUri { get; private set; }
+        ValidateArg.NotNullOrWhiteSpace(executorUri, nameof(executorUri));
+        ExecutorUri = executorUri;
+    }
 
-        #endregion
+    /// <summary>
+    /// The Uri of the Test Executor.
+    /// </summary>
+    public string ExecutorUri { get; private set; }
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/DirectoryBasedTestDiscovererAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/DirectoryBasedTestDiscovererAttribute.cs
new file mode 100644
index 0000000000..0114d5afe7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/DirectoryBasedTestDiscovererAttribute.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// This attribute is applied to <see cref="Adapter.ITestDiscoverer"/>s. It indicates the test discoverer discovers tests
+/// present inside a directory (as opposed to the <see cref="FileExtensionAttribute"/> which indicates that the
+/// discoverer discovers tests present in files with a specified extension).
+/// </summary>
+/// <remarks>
+/// If neither this attribute nor the <see cref="FileExtensionAttribute"/> is provided on the test discoverer,
+/// it will be called for all relevant test files and directories.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class DirectoryBasedTestDiscovererAttribute : Attribute
+{
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs
index 61742d9bc5..89d5246f46 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs
@@ -1,30 +1,28 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
+using System;
 
-    /// <summary>
-    /// Base exception for all Rocksteady service exceptions
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Base exception for all Rocksteady service exceptions
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors")]
-    public class TestPlatformException : Exception
+public class TestPlatformException : Exception
+{
+    public TestPlatformException(string? message)
+        : base(message)
     {
-        public TestPlatformException(String message)
-            : base(message)
-        {
-        }
+    }
 
-        public TestPlatformException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    public TestPlatformException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
+}
 
 #if FullCLR
     /// <summary>
@@ -57,7 +55,7 @@ public static Exception ConvertException(FaultException faultEx)
         /// <param name="innerException">actual exception that is to be wrapped</param>
         /// <returns>actual exception that is represented by the exception name</returns>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Instantiating an instance of Exception class")]
-        private static Exception ConvertException(String exceptionType, String message, Exception innerException)
+        private static Exception ConvertException(string exceptionType, string message, Exception innerException)
         {
             try
             {
@@ -97,12 +95,10 @@ private static Exception ConvertException(String exceptionType, String message,
 #endif
 
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors")]
-    public class ProcessExitedException : TestPlatformException
-    {
-        public ProcessExitedException(string message) : base(message) { }
-        public ProcessExitedException(string message, Exception inner) : base(message, inner) { }
-    }
+public class ProcessExitedException : TestPlatformException
+{
+    public ProcessExitedException(string? message) : base(message) { }
+    public ProcessExitedException(string? message, Exception? inner) : base(message, inner) { }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ExtensionUriAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/ExtensionUriAttribute.cs
index e03a1cd33c..6c37cce362 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/ExtensionUriAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/ExtensionUriAttribute.cs
@@ -1,47 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// This attribute is applied to extensions so they can be uniquely identified.
+/// It indicates the Uri which uniquely identifies the extension.  If this attribute
+/// is not provided on the extensions such as the Test Executor or Test Logger, then
+/// the extensions will not be used.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public sealed class ExtensionUriAttribute : Attribute
 {
-    using System;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
-
     /// <summary>
-    /// This attribute is applied to extensions so they can be uniquely identified.
-    /// It indicates the Uri which uniquely identifies the extension.  If this attribute
-    /// is not provided on the extensions such as the Test Executor or Test Logger, then
-    /// the extensions will not be used.
+    /// Initializes with the Uri of the extension.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public sealed class ExtensionUriAttribute : Attribute
+    /// <param name="extensionUri">The Uri of the extension</param>
+    public ExtensionUriAttribute(string extensionUri)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the Uri of the extension.
-        /// </summary>
-        /// <param name="extensionUri">The Uri of the extension</param>
-        public ExtensionUriAttribute(string extensionUri)
-        {
-            if (string.IsNullOrWhiteSpace(extensionUri))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(extensionUri));
-            }
-
-            ExtensionUri = extensionUri;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The Uri of the Test Executor.
-        /// </summary>
-        public string ExtensionUri { get; private set; }
+        ValidateArg.NotNullOrWhiteSpace(extensionUri, nameof(extensionUri));
+        ExtensionUri = extensionUri;
+    }
 
-        #endregion
+    /// <summary>
+    /// The Uri of the Test Executor.
+    /// </summary>
+    public string ExtensionUri { get; private set; }
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/FileExtensionAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/FileExtensionAttribute.cs
index 1a540dc47f..c2874d62e2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/FileExtensionAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/FileExtensionAttribute.cs
@@ -1,47 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// This attribute is applied to <see cref="ITestDiscoverer"/>s. It indicates that the discoverer discovers tests
+/// present in files with the specified extension.
+/// </summary>
+/// <remarks>
+/// If neither this attribute nor the <see cref="DirectoryBasedTestDiscovererAttribute"/> is provided on the test
+/// discoverer, it will be called for all relevant test files and directories.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public sealed class FileExtensionAttribute : Attribute
 {
-    using System;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
-
     /// <summary>
-    /// This attribute is applied to ITestDiscoverers.  It indicates
-    /// which file extensions the test discoverer knows how to process.
-    /// If this attribute is not provided on the test discoverer it will be
-    /// called for all file types.
+    /// Initializes with a file extension that the test discoverer can process tests from.
+    /// For example ".dll" or ".exe".
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public sealed class FileExtensionAttribute : Attribute
+    /// <param name="fileExtension">The file extensions that the test discoverer can process tests from.</param>
+    public FileExtensionAttribute(string fileExtension)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with a file extension that the test discoverer can process tests from.
-        /// For example ".dll" or ".exe".
-        /// </summary>
-        /// <param name="fileExtension">The file extensions that the test discoverer can process tests from.</param>
-        public FileExtensionAttribute(string fileExtension)
-        {
-            if (string.IsNullOrWhiteSpace(fileExtension))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(fileExtension));
-            }
-
-            FileExtension = fileExtension;
-        }
-
-        #endregion
-
-        #region Properties
+        ValidateArg.NotNullOrWhiteSpace(fileExtension, nameof(fileExtension));
+        FileExtension = fileExtension;
+    }
 
-        /// <summary>
-        /// A file extensions that the test discoverer can process tests from.  For example ".dll" or ".exe".
-        /// </summary>
-        public string FileExtension { get; private set; }
+    /// <summary>
+    /// A file extensions that the test discoverer can process tests from.  For example ".dll" or ".exe".
+    /// </summary>
+    public string FileExtension { get; private set; }
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Framework.cs b/src/Microsoft.TestPlatform.ObjectModel/Framework.cs
index 280719ff98..64ed5f203c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Framework.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Framework.cs
@@ -1,130 +1,140 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+using System.Globalization;
+
+using NuGetClone.Frameworks;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Class for target Framework for the test container
+/// </summary>
+public class Framework
 {
-#if !NETSTANDARD1_0
-    using NuGet.Frameworks;
-    using static NuGet.Frameworks.FrameworkConstants;
-#endif
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. | Suppressed as we know values are set
+    private Framework()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    {
+    }
 
     /// <summary>
-    /// Class for target Framework for the test container
+    /// Default .Net target framework.
     /// </summary>
-    public class Framework
-    {
 #if NETFRAMEWORK
-        private static readonly Framework Default = Framework.FromString(".NETFramework,Version=v4.0");
-#elif NETSTANDARD1_0
-        private static readonly Framework Default = null;
+    public static Framework DefaultFramework { get; } = Framework.FromString(".NETFramework,Version=v4.0")!;
 #else
-        private static readonly Framework Default = Framework.FromString(".NETCoreApp,Version=v1.0");
+    public static Framework DefaultFramework { get; } = Framework.FromString(".NETCoreApp,Version=v1.0")!;
 #endif
 
-        private Framework()
+    /// <summary>
+    /// Gets the FullName of framework.
+    /// </summary>
+    public string Name { get; private set; }
+
+    /// <summary>
+    /// Gets the framework name such as .NETCoreApp.
+    /// </summary>
+    public string FrameworkName { get; private set; }
+
+    /// <summary>
+    /// Common short name, as well as directory name, such as net5.0. Is null when the framework is not correct.
+    /// </summary>
+    public string? ShortName { get; private set; }
+
+    /// <summary>
+    /// Gets the framework version.
+    /// </summary>
+    public string Version { get; private set; }
+
+    /// <summary>
+    /// Returns a valid framework or null when it cannot parse it, or when given null.
+    /// </summary>
+    /// <param name="frameworkString">Framework name</param>
+    /// <returns>A framework object</returns>
+    public static Framework? FromString(string? frameworkString)
+    {
+        if (frameworkString.IsNullOrWhiteSpace())
         {
+            return null;
         }
 
-        /// <summary>
-        /// Default .Net target framework.
-        /// </summary>
-        public static Framework DefaultFramework => Framework.Default;
-
-        /// <summary>
-        /// Gets the FullName of framework.
-        /// </summary>
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets the framework version.
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// Returns a valid framework else returns null
-        /// </summary>
-        /// <param name="frameworkString">Framework name</param>
-        /// <returns>A framework object</returns>
-        public static Framework FromString(string frameworkString)
+        string name, frameworkName, version;
+        string? shortName = null;
+        try
         {
-#if NETSTANDARD1_0
-            var CommonFrameworks = new
+            // IDE always sends framework in form of ENUM, which always throws exception
+            // This throws up in first chance exception, refer Bug https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/591142
+            var formattedFrameworkString = frameworkString.Trim().ToLower(CultureInfo.InvariantCulture);
+            string? mappedShortName = null;
+            switch (formattedFrameworkString)
             {
-                Net35 = new { DotNetFrameworkName = Constants.DotNetFramework35, Version = "3.5.0.0" },
-                Net4 = new { DotNetFrameworkName = Constants.DotNetFramework40, Version = "4.0.0.0" },
-                Net45 = new { DotNetFrameworkName = Constants.DotNetFramework45, Version = "4.5.0.0" },
-                NetCoreApp10 = new { DotNetFrameworkName = Constants.DotNetFrameworkCore10, Version = "1.0.0.0" },
-                UAP10 = new { DotNetFrameworkName = Constants.DotNetFrameworkUap10, Version = "10.0.0.0" },
-            };
-#endif
+                case "framework35":
+                    mappedShortName = "net3.5";
+                    break;
 
-            if (string.IsNullOrWhiteSpace(frameworkString))
-            {
-                return null;
+                case "framework40":
+                    mappedShortName = "net4.0";
+                    break;
+
+                case "framework45":
+                    mappedShortName = "net4.5";
+                    break;
+
+                case "frameworkcore10":
+                    mappedShortName = "netcoreapp1.0";
+                    break;
+
+                case "frameworkuap10":
+                    mappedShortName = "uap10.0";
+                    break;
             }
 
-            string name, version;
-            try
+            if (mappedShortName != null)
             {
-                // IDE always sends framework in form of ENUM, which always throws exception
-                // This throws up in first chance exception, refer Bug https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/591142
-                switch (frameworkString.Trim().ToLower())
-                {
-                    case "framework35":
-                        name = CommonFrameworks.Net35.DotNetFrameworkName;
-                        version = CommonFrameworks.Net35.Version.ToString();
-                        break;
-
-                    case "framework40":
-                        name = CommonFrameworks.Net4.DotNetFrameworkName;
-                        version = CommonFrameworks.Net4.Version.ToString();
-                        break;
-
-                    case "framework45":
-                        name = CommonFrameworks.Net45.DotNetFrameworkName;
-                        version = CommonFrameworks.Net45.Version.ToString();
-                        break;
-
-                    case "frameworkcore10":
-                        name = CommonFrameworks.NetCoreApp10.DotNetFrameworkName;
-                        version = CommonFrameworks.NetCoreApp10.Version.ToString();
-                        break;
-
-                    case "frameworkuap10":
-                        name = CommonFrameworks.UAP10.DotNetFrameworkName;
-                        version = CommonFrameworks.UAP10.Version.ToString();
-                        break;
-
-                    default:
-#if NETSTANDARD1_0
-                        return null;
-#else
-                        var nugetFramework = NuGetFramework.Parse(frameworkString);
-                        if (nugetFramework.IsUnsupported)
-                            return null;
+                frameworkString = mappedShortName;
+            }
 
-                        name = nugetFramework.DotNetFrameworkName;
-                        version = nugetFramework.Version.ToString();
+            var nugetFramework = NuGetFramework.Parse(frameworkString);
+            if (nugetFramework.IsUnsupported)
+                return null;
 
-                        break;
-#endif
-                }
+            // e.g. .NETFramework,Version=v3.5
+            name = nugetFramework.DotNetFrameworkName;
+            // e.g. net35
+            try
+            {
+                // .NETPortable4.5 for example, is not a valid framework
+                // and this will throw.
+                shortName = nugetFramework.GetShortFolderName();
             }
-            catch
+            catch (Exception ex)
             {
-                return null;
+                EqtTrace.Error(ex);
             }
+            // e.g. .NETFramework
+            frameworkName = nugetFramework.Framework;
+            // e.g. 3.5.0.0
+            version = nugetFramework.Version.ToString();
 
-            return new Framework() { Name = name, Version = version };
         }
-
-        /// <summary>
-        /// Returns full name of the framework.
-        /// </summary>
-        /// <returns>String presentation of the object.</returns>
-        public override string ToString()
+        catch
         {
-            return this.Name;
+            return null;
         }
+
+        return new Framework() { Name = name, ShortName = shortName, FrameworkName = frameworkName, Version = version };
+    }
+
+    /// <summary>
+    /// Returns full name of the framework.
+    /// </summary>
+    /// <returns>String presentation of the object.</returns>
+    public override string ToString()
+    {
+        return Name;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/FrameworkVersion.cs b/src/Microsoft.TestPlatform.ObjectModel/FrameworkVersion.cs
index f5748d1c02..0b4ca6d0ac 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/FrameworkVersion.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/FrameworkVersion.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// This holds the major desktop framework versions. This is just to maintain compatibility with older runsettings files.
+/// </summary>
+public enum FrameworkVersion
 {
-    /// <summary>
-    /// This holds the major desktop framework versions. This is just to maintain compatibility with older runsettings files.
-    /// </summary>
-    public enum FrameworkVersion
-    {
-        None,
-        Framework35,
-        Framework40,
-        Framework45,
-        FrameworkCore10,
-        FrameworkUap10
-    }
+    None,
+    Framework35,
+    Framework40,
+    Framework45,
+    FrameworkCore10,
+    FrameworkUap10
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/FriendlyNameAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/FriendlyNameAttribute.cs
index b7b8c90681..a48884122c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/FriendlyNameAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/FriendlyNameAttribute.cs
@@ -1,46 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// This attribute is applied to Loggers so they can be uniquely identified.
+/// It indicates the Friendly Name which uniquely identifies the extension.
+/// This attribute is optional.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public sealed class FriendlyNameAttribute : Attribute
+{
     /// <summary>
-    /// This attribute is applied to Loggers so they can be uniquely identified.
-    /// It indicates the Friendly Name which uniquely identifies the extension.
-    /// This attribute is optional.
+    /// Initializes with the Friendly Name of the logger.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public sealed class FriendlyNameAttribute : Attribute
+    /// <param name="friendlyName">The friendly name of the Logger</param>
+    public FriendlyNameAttribute(string friendlyName)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the Friendly Name of the logger.
-        /// </summary>
-        /// <param name="friendlyName">The friendly name of the Logger</param>
-        public FriendlyNameAttribute(string friendlyName)
-        {
-            if (string.IsNullOrWhiteSpace(friendlyName))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(friendlyName));
-            }
-
-            FriendlyName = friendlyName;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The friendly Name of the Test Logger.
-        /// </summary>
-        public string FriendlyName { get; private set; }
+        ValidateArg.NotNullOrWhiteSpace(friendlyName, nameof(friendlyName));
+        FriendlyName = friendlyName;
+    }
 
-        #endregion
+    /// <summary>
+    /// The friendly Name of the Test Logger.
+    /// </summary>
+    public string FriendlyName { get; private set; }
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Friends.cs b/src/Microsoft.TestPlatform.ObjectModel/Friends.cs
index 7e2123cd6d..4e58caefe6 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Friends.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Friends.cs
@@ -7,9 +7,14 @@
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Extensions.MSPhoneAdapter, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Client, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.ObjectModel.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("Microsoft.TestPlatform.ObjectModel.ManagedNameUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.ObjectModel.ManagedNameUtilities.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRunTimeProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRunTimeProvider.cs
index 8106cc91f4..ec5184be9f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRunTimeProvider.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRunTimeProvider.cs
@@ -1,140 +1,136 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Host
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+
+/// <summary>
+/// Interface for TestRuntimeProvider which manages test host processes for test engine.
+/// </summary>
+public interface ITestRuntimeProvider
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
+    /// <summary>
+    /// Raised when host is launched successfully
+    /// Consumed by TestPlatform to initialize connection b/w test host and test platform
+    /// </summary>
+    event EventHandler<HostProviderEventArgs>? HostLaunched;
+
+    /// <summary>
+    /// Raised when host is cleaned up and removes all it's dependencies
+    /// </summary>
+    event EventHandler<HostProviderEventArgs>? HostExited;
+
+    /// <summary>
+    /// Gets a value indicating whether the test host is specific to a test source. If yes, each test source
+    /// is launched in a separate host process.
+    /// </summary>
+    bool Shared { get; }
+
+    /// <summary>
+    /// Sets a Message Logger
+    /// </summary>
+    /// <param name="logger">provide logger to runtimes</param>
+    /// <param name="runsettingsXml">provide runsettings to runtimes for initialization</param>
+    void Initialize(IMessageLogger? logger, string runsettingsXml);
+
+    /// <summary>
+    /// Gets a value indicating whether the test host is specific to a test source. If yes, each test source
+    /// is launched in a separate host process.
+    /// </summary>
+    /// <param name="runsettingsXml">
+    /// The run Configuration.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    bool CanExecuteCurrentRunConfiguration(string? runsettingsXml);
+
+    /// <summary>
+    /// Sets a custom launcher
+    /// </summary>
+    /// <param name="customLauncher">Custom launcher to set</param>
+    void SetCustomLauncher(ITestHostLauncher customLauncher);
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    /// <summary>
+    /// Gets the end point address and behavior of TestRuntime
+    /// E.g. for phone device EndPoint:127.0.0.1:8080, ConnectionRole Host, TransportProtocol: Sockets
+    /// </summary>
+    /// <returns> Socket where the service is hosted by TestRuntime</returns>
+    TestHostConnectionInfo GetTestHostConnectionInfo();
+
+    /// <summary>
+    /// Launches the test host for discovery/execution.
+    /// </summary>
+    /// <param name="testHostStartInfo">Start parameters for the test host.</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns>Returns whether the test host launched successfully or not.</returns>
+    Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets the start parameters for the test host.
+    /// </summary>
+    /// <param name="sources">Test source paths.</param>
+    /// <param name="environmentVariables">Set of environment variables for the test host process.</param>
+    /// <param name="connectionInfo">Set of connection parameters for the test host process to communicate with test runner.</param>
+    /// <returns>ProcessStartInfo of the test host.</returns>
+    TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string?>? environmentVariables, TestRunnerConnectionInfo connectionInfo);
+
+    /// <summary>
+    /// Gets paths of any additional extensions.
+    /// A test host manager may choose to provide a custom extensions acquisition and discovery
+    /// mechanism. E.g. for .net core, extensions are discovered from the <c>testproject.deps.json</c> file.
+    /// </summary>
+    /// <param name="sources">List of test sources.</param>
+    /// <param name="extensions"></param>
+    /// <returns>List of paths to extension assemblies.</returns>
+    IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions);
 
     /// <summary>
-    /// Interface for TestRuntimeProvider which manages test host processes for test engine.
+    /// Gets path of test sources, based on RuntimeProvider, and where the test is actually deployed(Remote Scenario).
+    /// A test host manager may choose to accept input source as XML file, and provide appropriate source(dll/exe) which the adapters can actually consume
+    /// E.g. for UWP, input source could be "appx recipe" file, which gives information about actual source exe.
     /// </summary>
-    public interface ITestRuntimeProvider
+    /// <param name="sources">List of test sources.</param>
+    /// <returns>Updated List of test sources based on remote/local scenario.</returns>
+    IEnumerable<string> GetTestSources(IEnumerable<string> sources);
+
+    /// <summary>
+    /// Cleanup the test host process and it's dependencies.
+    /// </summary>
+    /// <param name="cancellationToken">
+    /// Cancellation token.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Task"/>.
+    /// </returns>
+    Task CleanTestHostAsync(CancellationToken cancellationToken);
+}
+
+public class HostProviderEventArgs : EventArgs
+{
+    public HostProviderEventArgs(string message)
     {
-        #region events
-        /// <summary>
-        /// Raised when host is launched successfully
-        /// Consumed by TestPlatform to initialize connection b/w test host and test platform
-        /// </summary>
-        event EventHandler<HostProviderEventArgs> HostLaunched;
-
-        /// <summary>
-        /// Raised when host is cleaned up and removes all it's dependencies
-        /// </summary>
-        event EventHandler<HostProviderEventArgs> HostExited;
-
-        #endregion
-
-        /// <summary>
-        /// Gets a value indicating whether the test host is specific to a test source. If yes, each test source
-        /// is launched in a separate host process.
-        /// </summary>
-        bool Shared { get; }
-
-        /// <summary>
-        /// Sets a Message Logger
-        /// </summary>
-        /// <param name="logger">provide logger to runtimes</param>
-        /// <param name="runsettingsXml">provide runsettings to runtimes for initialization</param>
-        void Initialize(IMessageLogger logger, string runsettingsXml);
-
-        /// <summary>
-        /// Gets a value indicating whether the test host is specific to a test source. If yes, each test source
-        /// is launched in a separate host process.
-        /// </summary>
-        /// <param name="runsettingsXml">
-        /// The run Configuration.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        bool CanExecuteCurrentRunConfiguration(string runsettingsXml);
-
-        /// <summary>
-        /// Sets a custom launcher
-        /// </summary>
-        /// <param name="customLauncher">Custom launcher to set</param>
-        void SetCustomLauncher(ITestHostLauncher customLauncher);
-
-        /// <summary>
-        /// Gets the end point address and behavior of TestRuntime
-        /// E.g. for phone device EndPoint:127.0.0.1:8080, ConnectionRole Host, TransportProtocol: Sockets
-        /// </summary>
-        /// <returns> Socket where the service is hosted by TestRuntime</returns>
-        TestHostConnectionInfo GetTestHostConnectionInfo();
-
-        /// <summary>
-        /// Launches the test host for discovery/execution.
-        /// </summary>
-        /// <param name="testHostStartInfo">Start parameters for the test host.</param>
-        /// <param name="cancellationToken"></param>
-        /// <returns>Returns whether the test host launched successfully or not.</returns>
-        Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the start parameters for the test host.
-        /// </summary>
-        /// <param name="sources">Test source paths.</param>
-        /// <param name="environmentVariables">Set of environment variables for the test host process.</param>
-        /// <param name="connectionInfo">Set of connection parameters for the test host process to communicate with test runner.</param>
-        /// <returns>ProcessStartInfo of the test host.</returns>
-        TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string> environmentVariables, TestRunnerConnectionInfo connectionInfo);
-
-        /// <summary>
-        /// Gets paths of any additional extensions.
-        /// A test host manager may choose to provide a custom extensions acquisition and discovery
-        /// mechanism. E.g. for .net core, extensions are discovered from the <c>testproject.deps.json</c> file.
-        /// </summary>
-        /// <param name="sources">List of test sources.</param>
-        /// <param name="extensions"></param>
-        /// <returns>List of paths to extension assemblies.</returns>
-        IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions);
-
-        /// <summary>
-        /// Gets path of test sources, based on RuntimeProvider, and where the test is actually deployed(Remote Scenario).
-        /// A test host manager may choose to accept input source as XML file, and provide appropriate source(dll/exe) which the adapters can actually consume
-        /// E.g. for UWP, input source could be "appx recipe" file, which gives information about actual source exe.
-        /// </summary>
-        /// <param name="sources">List of test sources.</param>
-        /// <returns>Updated List of test sources based on remote/local scenario.</returns>
-        IEnumerable<string> GetTestSources(IEnumerable<string> sources);
-
-        /// <summary>
-        /// Cleanup the test host process and it's dependencies.
-        /// </summary>
-        /// <param name="cancellationToken">
-        /// Cancellation token.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        Task CleanTestHostAsync(CancellationToken cancellationToken);
+        Data = message;
+        ErrroCode = 0;
     }
 
-    public class HostProviderEventArgs : EventArgs
+    public HostProviderEventArgs(string message, int errorCode, int processId)
     {
-        public HostProviderEventArgs(string message)
-        {
-            this.Data = message;
-            this.ErrroCode = 0;
-        }
-
-        public HostProviderEventArgs(string message, int errorCode, int processId)
-        {
-            this.Data = message;
-            this.ErrroCode = errorCode;
-            this.ProcessId = processId;
-        }
+        Data = message;
+        ErrroCode = errorCode;
+        ProcessId = processId;
+    }
 
-        public string Data { get; set; }
+    public string Data { get; set; }
 
-        public int ErrroCode { get; set; }
+    public int ErrroCode { get; set; }
 
-        public int ProcessId { get; set; }
-    }
+    public int ProcessId { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRuntimeProvider2.cs b/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRuntimeProvider2.cs
index 170c1e8343..a6f2a4a5ea 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRuntimeProvider2.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Host/ITestRuntimeProvider2.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Host
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+
+/// <summary>
+/// Interface to define a TestRuntimeProvider with support for attaching the debugger to the
+/// default testhost process.
+/// </summary>
+public interface ITestRuntimeProvider2 : ITestRuntimeProvider
 {
     /// <summary>
-    /// Interface to define a TestRuntimeProvider with support for attaching the debugger to the
-    /// default testhost process.
+    /// Attach the debugger to an already running testhost process.
     /// </summary>
-    public interface ITestRuntimeProvider2 : ITestRuntimeProvider
-    {
-        /// <summary>
-        /// Attach the debugger to an already running testhost process.
-        /// </summary>
-        /// <returns>
-        /// <see cref="true"/> if the debugger was successfully attached to the running testhost
-        /// process, <see cref="false"/> otherwise.
-        /// </returns>
-        bool AttachDebuggerToTestHost();
-    }
+    /// <returns>
+    /// <see langword="true"/> if the debugger was successfully attached to the running testhost
+    /// process, <see langword="false"/> otherwise.
+    /// </returns>
+    bool AttachDebuggerToTestHost();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ITelemetryInitializer.cs b/src/Microsoft.TestPlatform.ObjectModel/ITelemetryInitializer.cs
new file mode 100644
index 0000000000..d32b6b6dca
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/ITelemetryInitializer.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Interface for extensions that choose to send telemetry events
+/// </summary>
+public interface ITelemetryInitializer
+{
+    /// <summary>
+    /// Initializes telemetry reporter
+    /// </summary>
+    void Initialize(ITelemetryReporter telemetryReporter);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/ITelemetryReporter.cs b/src/Microsoft.TestPlatform.ObjectModel/ITelemetryReporter.cs
new file mode 100644
index 0000000000..afd3f78c18
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/ITelemetryReporter.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Interface for extensions that choose to send telemetry events
+/// </summary>
+public interface ITelemetryReporter
+{
+    /// <summary>
+    /// Pushes telemetry event into TP
+    /// </summary>
+    void Report(TelemetryEvent telemetryEvent);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/InvokedDataCollector.cs b/src/Microsoft.TestPlatform.ObjectModel/InvokedDataCollector.cs
new file mode 100644
index 0000000000..9422e8e491
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/InvokedDataCollector.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public sealed class InvokedDataCollector : IEquatable<InvokedDataCollector>
+{
+    /// <summary>
+    /// Initialize an InvokedDataCollector
+    /// </summary>
+    /// <param name="uri">Data collector Uri</param>
+    /// <param name="friendlyName">Friendly name of the datacollector.</param>
+    /// <param name="assemblyQualifiedName">Data collector assembly qualified name</param>
+    /// <param name="filePath">Data collector file path</param>
+    /// <param name="hasAttachmentProcessor">True if data collector registers an attachment processor</param>
+    public InvokedDataCollector(Uri uri, string friendlyName, string assemblyQualifiedName, string filePath, bool hasAttachmentProcessor)
+    {
+        Uri = uri ?? throw new ArgumentNullException(nameof(uri));
+        FriendlyName = friendlyName ?? throw new ArgumentNullException(nameof(friendlyName));
+        AssemblyQualifiedName = assemblyQualifiedName ?? throw new ArgumentNullException(nameof(assemblyQualifiedName));
+        FilePath = filePath ?? throw new ArgumentNullException(nameof(filePath));
+        HasAttachmentProcessor = hasAttachmentProcessor;
+    }
+
+    /// <summary>
+    /// DataCollector uri.
+    /// </summary>
+    [DataMember]
+    public Uri Uri { get; private set; }
+
+    /// <summary>
+    /// DataCollector FriendlyName.
+    /// </summary>
+    [DataMember]
+    public string FriendlyName { get; private set; }
+
+    /// <summary>
+    /// AssemblyQualifiedName of data collector.
+    /// </summary>
+    [DataMember]
+    public string AssemblyQualifiedName { get; private set; }
+
+    /// <summary>
+    /// Data collector file path.
+    /// </summary>
+    [DataMember]
+    public string FilePath { get; private set; }
+
+    /// <summary>
+    /// True if the collector registers an attachments processor.
+    /// </summary>
+    [DataMember]
+    public bool HasAttachmentProcessor { get; private set; }
+
+    /// <summary>
+    /// Compares InvokedDataCollector instances for equality.
+    /// </summary>
+    /// <param name="other">InvokedDataCollector instance</param>
+    /// <returns>True if objects are equal</returns>
+    public bool Equals(InvokedDataCollector? other)
+        => other is not null
+        && HasAttachmentProcessor == other.HasAttachmentProcessor
+        && Uri.AbsoluteUri == other.Uri.AbsoluteUri
+        && FriendlyName == other.FriendlyName
+        && AssemblyQualifiedName == other.AssemblyQualifiedName
+        && FilePath == other.FilePath;
+
+    /// <summary>
+    /// Compares InvokedDataCollector instances for equality.
+    /// </summary>
+    /// <param name="obj">InvokedDataCollector instance</param>
+    /// <returns>True if objects are equal</returns>
+    public override bool Equals(object? obj)
+        => Equals(obj as InvokedDataCollector);
+
+    /// <summary>
+    /// Returns the object hashcode
+    /// </summary>
+    /// <returns>Hashcode value</returns>
+    public override int GetHashCode()
+    {
+        unchecked
+        {
+            var hashCode = Uri.GetHashCode();
+            hashCode = (hashCode * 397) ^ FriendlyName.GetHashCode();
+            hashCode = (hashCode * 397) ^ AssemblyQualifiedName.GetHashCode();
+            hashCode = (hashCode * 397) ^ (FilePath != null ? FilePath.GetHashCode() : 0);
+            hashCode = (hashCode * 397) ^ HasAttachmentProcessor.GetHashCode();
+            return hashCode;
+        }
+    }
+
+    /// <summary>
+    /// Return string representation for the current object
+    /// </summary>
+    /// <returns>String representation</returns>
+    public override string ToString()
+        => $"Uri: '{Uri}' FriendlyName: '{FriendlyName}' AssemblyQualifiedName: '{AssemblyQualifiedName}' FilePath: '{FilePath}' HasAttachmentProcessor: '{HasAttachmentProcessor}'";
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/LazyPropertyValue.cs b/src/Microsoft.TestPlatform.ObjectModel/LazyPropertyValue.cs
index a2cab09f3d..594a5f8ed9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/LazyPropertyValue.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/LazyPropertyValue.cs
@@ -1,61 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// Represents a lazy value calculation for a TestObject
+/// </summary>
+internal interface ILazyPropertyValue
+{
     /// <summary>
-    /// Represents a lazy value calculation for a TestObject
+    /// Forces calculation of the value
     /// </summary>
-    internal interface ILazyPropertyValue
+    object Value { get; }
+}
+
+/// <summary>
+/// Represents a lazy value calculation for a TestObject
+/// </summary>
+/// <typeparam name="T">The type of the value to be calculated</typeparam>
+public sealed class LazyPropertyValue<T> : ILazyPropertyValue
+{
+    private readonly Func<T> _getValue;
+    private T? _value;
+    private bool _isValueCreated;
+
+    public LazyPropertyValue(Func<T> getValue)
     {
-        /// <summary>
-        /// Forces calculation of the value
-        /// </summary>
-        object Value { get; }
+        _isValueCreated = false;
+        _value = default;
+        _getValue = getValue;
     }
 
     /// <summary>
-    /// Represents a lazy value calculation for a TestObject
+    /// Forces calculation of the value
     /// </summary>
-    /// <typeparam name="T">The type of the value to be calculated</typeparam>
-    public sealed class LazyPropertyValue<T> : ILazyPropertyValue
+    public T Value
     {
-        private T value;
-        private Func<T> getValue;
-        private bool isValueCreated;
-
-        public LazyPropertyValue(Func<T> getValue)
+        get
         {
-            this.isValueCreated = false;
-            this.value = default(T);
-            this.getValue = getValue;
-        }
-
-        /// <summary>
-        /// Forces calculation of the value
-        /// </summary>
-        public T Value
-        {
-            get
+            if (!_isValueCreated)
             {
-                if (!isValueCreated)
-                {
-                    this.value = this.getValue();
-                    isValueCreated = true;
-                }
-
-                return this.value;
+                _value = _getValue();
+                _isValueCreated = true;
             }
+
+            return _value!;
         }
+    }
 
-        object ILazyPropertyValue.Value
+    object ILazyPropertyValue.Value
+    {
+        get
         {
-            get
-            {
-                return this.Value;
-            }
+            return Value!;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLogger.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLogger.cs
index cf547de114..6dceecd957 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLogger.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLogger.cs
@@ -1,20 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Interface implemented to log messages and results from tests.  A class that
+/// implements this interface will be available for use if it exports its type via
+/// MEF, and if its containing assembly is placed in the Extensions folder.
+/// </summary>
+public interface ITestLogger
 {
     /// <summary>
-    /// Interface implemented to log messages and results from tests.  A class that
-    /// implements this interface will be available for use if it exports its type via
-    /// MEF, and if its containing assembly is placed in the Extensions folder.
+    /// Initializes the Test Logger.
     /// </summary>
-    public interface ITestLogger
-    {
-        /// <summary>
-        /// Initializes the Test Logger.
-        /// </summary>
-        /// <param name="events">Events that can be registered for.</param>
-        /// <param name="testRunDirectory">Test Run Directory</param>
-        void Initialize(TestLoggerEvents events, string testRunDirectory);
-    }
+    /// <param name="events">Events that can be registered for.</param>
+    /// <param name="testRunDirectory">Test Run Directory</param>
+    void Initialize(TestLoggerEvents events, string testRunDirectory);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLoggerWithParams.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLoggerWithParams.cs
index a133c56e7d..94d103b37f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLoggerWithParams.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/ITestLoggerWithParams.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
+/// <summary>
+/// This Interface extends ITestLogger and adds capability to pass
+/// parameters to loggers such as TfsPublisher.
+/// Currently it is marked for internal consumption (ex: TfsPublisher)
+/// </summary>
+public interface ITestLoggerWithParameters : ITestLogger
+{
     /// <summary>
-    /// This Interface extends ITestLogger and adds capability to pass
-    /// parameters to loggers such as TfsPublisher.
-    /// Currently it is marked for internal consumption (ex: TfsPublisher)
+    /// Initializes the Test Logger with given parameters.
     /// </summary>
-    public interface ITestLoggerWithParameters : ITestLogger
-    {
-        /// <summary>
-        /// Initializes the Test Logger with given parameters.
-        /// </summary>
-        /// <param name="events">Events that can be registered for.</param>
-        /// <param name="parameters">Collection of parameters</param>
-        void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters);
-    }
-}
\ No newline at end of file
+    /// <param name="events">Events that can be registered for.</param>
+    /// <param name="parameters">Collection of parameters</param>
+    void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters);
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerRunSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerRunSettings.cs
index dc543b3e45..a69cbd4222 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerRunSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerRunSettings.cs
@@ -6,219 +6,216 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Xml;
+
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// The logger run settings.
+/// </summary>
+public class LoggerRunSettings : TestRunSettings
 {
+    private readonly string _loggerRunSettingsName = string.Empty;
+    private readonly string _loggersSettingName = string.Empty;
+    private readonly string _loggerSettingName = string.Empty;
+
     /// <summary>
-    /// The logger run settings.
+    /// Initializes a new instance of the <see cref="LoggerRunSettings"/> class.
     /// </summary>
-    public class LoggerRunSettings : TestRunSettings
+    public LoggerRunSettings() : base(Constants.LoggerRunSettingsName)
     {
-        private string loggerRunSettingsName = string.Empty;
-        private string loggersSettingName = string.Empty;
-        private string loggerSettingName = string.Empty;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoggerRunSettings"/> class.
-        /// </summary>
-        public LoggerRunSettings() : base(Constants.LoggerRunSettingsName)
-        {
-            this.LoggerSettingsList = new Collection<LoggerSettings>();
-            this.loggerRunSettingsName = Constants.LoggerRunSettingsName;
-            this.loggersSettingName = Constants.LoggersSettingName;
-            this.loggerSettingName = Constants.LoggerSettingName;
-        }
-
-        /// <summary>
-        /// Gets the logger settings list.
-        /// </summary>
-        public Collection<LoggerSettings> LoggerSettingsList
-        {
-            get;
-            private set;
-        }
+        LoggerSettingsList = new Collection<LoggerSettings>();
+        _loggerRunSettingsName = Constants.LoggerRunSettingsName;
+        _loggersSettingName = Constants.LoggersSettingName;
+        _loggerSettingName = Constants.LoggerSettingName;
+    }
 
-#if !NETSTANDARD1_0
-        public override XmlElement ToXml()
-        {
-            var doc = new XmlDocument();
-            var root = doc.CreateElement(this.loggerRunSettingsName);
-            var subRoot = doc.CreateElement(this.loggersSettingName);
-            root.AppendChild(subRoot);
+    /// <summary>
+    /// Gets the logger settings list.
+    /// </summary>
+    public Collection<LoggerSettings> LoggerSettingsList
+    {
+        get;
+        private set;
+    }
 
-            foreach (var loggerSettings in this.LoggerSettingsList)
-            {
-                XmlNode child = doc.ImportNode(loggerSettings.ToXml(this.loggerSettingName), true);
-                subRoot.AppendChild(child);
-            }
+    public override XmlElement ToXml()
+    {
+        var doc = new XmlDocument();
+        var root = doc.CreateElement(_loggerRunSettingsName);
+        var subRoot = doc.CreateElement(_loggersSettingName);
+        root.AppendChild(subRoot);
 
-            return root;
-        }
-#endif
-
-        /// <summary>
-        /// The from xml.
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <returns>
-        /// The <see cref="LoggerRunSettings"/>.
-        /// </returns>
-        /// <exception cref="SettingsException">
-        /// Settings exception
-        /// </exception>
-        internal static LoggerRunSettings FromXml(XmlReader reader)
+        foreach (var loggerSettings in LoggerSettingsList)
         {
-            ValidateArg.NotNull(reader, nameof(reader));
-
-            return FromXml(reader,
-                Constants.LoggersSettingName,
-                Constants.LoggerSettingName);
+            XmlNode child = doc.ImportNode(loggerSettings.ToXml(_loggerSettingName), true);
+            subRoot.AppendChild(child);
         }
 
-        /// <summary>
-        /// The from xml.
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <param name="loggersSettingName">
-        /// Loggers setting name.
-        /// </param>
-        /// <param name="loggerSettingName">
-        /// Logger setting name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="LoggerRunSettings"/>
-        /// </returns>
-        private static LoggerRunSettings FromXml(XmlReader reader, string loggersSettingName, string loggerSettingName)
-        {
-            // Validation.
-            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        return root;
+    }
 
-            var elementName = reader.Name;
-            var empty = reader.IsEmptyElement;
-            var settings = new LoggerRunSettings();
+    /// <summary>
+    /// The from xml.
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <returns>
+    /// The <see cref="LoggerRunSettings"/>.
+    /// </returns>
+    /// <exception cref="SettingsException">
+    /// Settings exception
+    /// </exception>
+    internal static LoggerRunSettings FromXml(XmlReader reader)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+        return FromXml(reader,
+            Constants.LoggersSettingName,
+            Constants.LoggerSettingName);
+    }
 
-            // Move to next node.
-            reader.Read();
+    /// <summary>
+    /// The from xml.
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <param name="loggersSettingName">
+    /// Loggers setting name.
+    /// </param>
+    /// <param name="loggerSettingName">
+    /// Logger setting name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="LoggerRunSettings"/>
+    /// </returns>
+    private static LoggerRunSettings FromXml(XmlReader reader, string loggersSettingName, string loggerSettingName)
+    {
+        // Validation.
+        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
 
-            // Return empty settings if previous element empty.
-            if (empty)
-            {
-                return settings;
-            }
+        var elementName = reader.Name;
+        var empty = reader.IsEmptyElement;
+        var settings = new LoggerRunSettings();
+
+        // Move to next node.
+        reader.Read();
 
-            // Read inner nodes.
-            while (reader.NodeType == XmlNodeType.Element)
+        // Return empty settings if previous element empty.
+        if (empty)
+        {
+            return settings;
+        }
+
+        // Read inner nodes.
+        while (reader.NodeType == XmlNodeType.Element)
+        {
+            if (reader.Name.Equals(loggersSettingName, StringComparison.OrdinalIgnoreCase))
             {
-                if (reader.Name.Equals(loggersSettingName, StringComparison.OrdinalIgnoreCase))
-                {
-                    var items = ReadListElementFromXml(reader, loggerSettingName);
-                    foreach (var item in items)
-                    {
-                        settings.LoggerSettingsList.Add(item);
-                    }
-                }
-                else
+                var items = ReadListElementFromXml(reader, loggerSettingName);
+                foreach (var item in items)
                 {
-                    throw new SettingsException(
-                        string.Format(
-                            CultureInfo.CurrentCulture,
-                            Resources.Resources.InvalidSettingsXmlElement,
-                            elementName,
-                            reader.Name));
+                    settings.LoggerSettingsList.Add(item);
                 }
             }
-            reader.ReadEndElement();
-
-            return settings;
+            else
+            {
+                throw new SettingsException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.InvalidSettingsXmlElement,
+                        elementName,
+                        reader.Name));
+            }
         }
+        reader.ReadEndElement();
 
-        /// <summary>
-        /// Reads logger settings list from runSettings
-        /// </summary>
-        /// <param name="reader">
-        /// The reader.
-        /// </param>
-        /// <param name="loggerSettingName">
-        /// Logger setting name.
-        /// </param>
-        /// <returns>
-        /// LoggerSettings List
-        /// </returns>
-        private static List<LoggerSettings> ReadListElementFromXml(XmlReader reader, string loggerSettingName)
-        {
-            // Validation.
-            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        return settings;
+    }
+
+    /// <summary>
+    /// Reads logger settings list from runSettings
+    /// </summary>
+    /// <param name="reader">
+    /// The reader.
+    /// </param>
+    /// <param name="loggerSettingName">
+    /// Logger setting name.
+    /// </param>
+    /// <returns>
+    /// LoggerSettings List
+    /// </returns>
+    private static List<LoggerSettings> ReadListElementFromXml(XmlReader reader, string loggerSettingName)
+    {
+        // Validation.
+        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
 
-            var elementName = reader.Name;
-            var empty = reader.IsEmptyElement;
-            var settings = new List<LoggerSettings>();
+        var elementName = reader.Name;
+        var empty = reader.IsEmptyElement;
+        var settings = new List<LoggerSettings>();
 
-            // Move to next node
-            reader.Read();
+        // Move to next node
+        reader.Read();
 
-            // Return empty settings if previous element is empty.
-            if (empty)
+        // Return empty settings if previous element is empty.
+        if (empty)
+        {
+            return settings;
+        }
+
+        // Read inner nodes.
+        while (reader.NodeType == XmlNodeType.Element)
+        {
+            if (reader.Name.Equals(loggerSettingName, StringComparison.OrdinalIgnoreCase))
             {
-                return settings;
+                settings.Add(LoggerSettings.FromXml(reader));
             }
-
-            // Read inner nodes.
-            while (reader.NodeType == XmlNodeType.Element)
+            else
             {
-                if (reader.Name.Equals(loggerSettingName, StringComparison.OrdinalIgnoreCase))
-                {
-                    settings.Add(LoggerSettings.FromXml(reader));
-                }
-                else
-                {
-                    throw new SettingsException(
-                        string.Format(
-                            CultureInfo.CurrentCulture,
-                            Resources.Resources.InvalidSettingsXmlElement,
-                            elementName,
-                            reader.Name));
-                }
+                throw new SettingsException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.InvalidSettingsXmlElement,
+                        elementName,
+                        reader.Name));
             }
-
-            return settings;
         }
 
-        /// <summary>
-        /// Gets existing logger index.
-        /// </summary>
-        /// <param name="loggerSettings">Logger settings.</param>
-        /// <returns>Index of given logger settings.</returns>
-        public int GetExistingLoggerIndex(LoggerSettings loggerSettings)
-        {
-            var existingLoggerIndex = -1;
+        return settings;
+    }
 
-            for (int i = 0; i < LoggerSettingsList.Count; i++)
-            {
-                var logger = LoggerSettingsList[i];
+    /// <summary>
+    /// Gets existing logger index.
+    /// </summary>
+    /// <param name="loggerSettings">Logger settings.</param>
+    /// <returns>Index of given logger settings.</returns>
+    public int GetExistingLoggerIndex(LoggerSettings loggerSettings)
+    {
+        var existingLoggerIndex = -1;
 
-                if (logger.FriendlyName != null &&
-                    loggerSettings.FriendlyName != null &&
-                    logger.FriendlyName.Equals(loggerSettings.FriendlyName, StringComparison.OrdinalIgnoreCase))
-                {
-                    existingLoggerIndex = i;
-                    break;
-                }
+        for (int i = 0; i < LoggerSettingsList.Count; i++)
+        {
+            var logger = LoggerSettingsList[i];
 
-                if (logger.Uri?.ToString() != null &&
-                    loggerSettings.Uri?.ToString() != null &&
-                    logger.Uri.ToString().Equals(loggerSettings.Uri.ToString(), StringComparison.OrdinalIgnoreCase))
-                {
-                    existingLoggerIndex = i;
-                    break;
-                }
+            if (logger.FriendlyName != null &&
+                loggerSettings.FriendlyName != null &&
+                logger.FriendlyName.Equals(loggerSettings.FriendlyName, StringComparison.OrdinalIgnoreCase))
+            {
+                existingLoggerIndex = i;
+                break;
             }
 
-            return existingLoggerIndex;
+            if (logger.Uri?.ToString() != null &&
+                loggerSettings.Uri?.ToString() != null &&
+                logger.Uri.ToString().Equals(loggerSettings.Uri.ToString(), StringComparison.OrdinalIgnoreCase))
+            {
+                existingLoggerIndex = i;
+                break;
+            }
         }
+
+        return existingLoggerIndex;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs
index a2e1fae963..b72b1c7e45 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs
@@ -1,235 +1,228 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Globalization;
-    using System.Xml;
+using System;
+using System.Globalization;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// The logger settings.
+/// </summary>
+public class LoggerSettings
+{
     /// <summary>
-    /// The logger settings.
+    /// Gets or sets the uri.
     /// </summary>
-    public class LoggerSettings
+    public Uri? Uri
     {
-        /// <summary>
-        /// Gets or sets the uri.
-        /// </summary>
-        public Uri Uri
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the assembly qualified name.
-        /// </summary>
-        public string AssemblyQualifiedName
-        {
-            get;
-            set;
-        }
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets value CodeBase of logger DLL. The syntax is same as Code Base in AssemblyName class.
-        /// </summary>
-        public string CodeBase
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the assembly qualified name.
+    /// </summary>
+    public string? AssemblyQualifiedName
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the friendly name.
-        /// </summary>
-        public string FriendlyName
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets value CodeBase of logger DLL. The syntax is same as Code Base in AssemblyName class.
+    /// </summary>
+    public string? CodeBase
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether is enabled.
-        /// </summary>
-        public bool IsEnabled
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets the friendly name.
+    /// </summary>
+    public string? FriendlyName
+    {
+        get;
+        set;
+    }
 
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Gets or sets the configuration.
-        /// </summary>
-        public XmlElement Configuration
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets or sets a value indicating whether is enabled.
+    /// </summary>
+    public bool IsEnabled
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// The to xml.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        public XmlElement ToXml()
-        {
-            return ToXml(Constants.LoggerSettingName);
-        }
+    /// <summary>
+    /// Gets or sets the configuration.
+    /// </summary>
+    public XmlElement? Configuration
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// The to xml.
-        /// </summary>
-        /// <param name="loggerName">
-        /// The logger name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="XmlElement"/>.
-        /// </returns>
-        public XmlElement ToXml(string loggerName)
-        {
-            var doc = new XmlDocument();
-            var root = doc.CreateElement(loggerName);
+    /// <summary>
+    /// The to xml.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public XmlElement ToXml()
+    {
+        return ToXml(Constants.LoggerSettingName);
+    }
 
-            AppendAttribute(doc, root, Constants.LoggerFriendlyName, this.FriendlyName);
-            AppendAttribute(doc, root, Constants.LoggerUriName, this.Uri?.ToString());
-            AppendAttribute(doc, root, Constants.LoggerAssemblyQualifiedName, this.AssemblyQualifiedName);
-            AppendAttribute(doc, root, Constants.LoggerCodeBase, this.CodeBase);
-            AppendAttribute(doc, root, Constants.LoggerEnabledName, this.IsEnabled.ToString());
+    /// <summary>
+    /// The to xml.
+    /// </summary>
+    /// <param name="loggerName">
+    /// The logger name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="XmlElement"/>.
+    /// </returns>
+    public XmlElement ToXml(string loggerName)
+    {
+        var doc = new XmlDocument();
+        var root = doc.CreateElement(loggerName);
 
-            if (Configuration != null)
-            {
-                root.AppendChild(doc.ImportNode(Configuration, true));
-            }
+        AppendAttribute(doc, root, Constants.LoggerFriendlyName, FriendlyName);
+        AppendAttribute(doc, root, Constants.LoggerUriName, Uri?.ToString());
+        AppendAttribute(doc, root, Constants.LoggerAssemblyQualifiedName, AssemblyQualifiedName);
+        AppendAttribute(doc, root, Constants.LoggerCodeBase, CodeBase);
+        AppendAttribute(doc, root, Constants.LoggerEnabledName, IsEnabled.ToString());
 
-            return root;
+        if (Configuration != null)
+        {
+            root.AppendChild(doc.ImportNode(Configuration, true));
         }
 
-        private static void AppendAttribute(XmlDocument doc, XmlElement owner, string attributeName, string attributeValue)
-        {
-            if (string.IsNullOrWhiteSpace(attributeValue))
-            {
-                return;
-            }
+        return root;
+    }
 
-            XmlAttribute attribute = doc.CreateAttribute(attributeName);
-            attribute.Value = attributeValue;
-            owner.Attributes.Append(attribute);
+    private static void AppendAttribute(XmlDocument doc, XmlElement owner, string attributeName, string? attributeValue)
+    {
+        if (StringUtils.IsNullOrWhiteSpace(attributeValue))
+        {
+            return;
         }
-#endif
 
-        internal static LoggerSettings FromXml(XmlReader reader)
+        XmlAttribute attribute = doc.CreateAttribute(attributeName);
+        attribute.Value = attributeValue;
+        owner.Attributes.Append(attribute);
+    }
+
+    internal static LoggerSettings FromXml(XmlReader reader)
+    {
+        var elementName = reader.Name;
+        var empty = reader.IsEmptyElement;
+        var settings = new LoggerSettings
         {
-            var elementName = reader.Name;
-            var empty = reader.IsEmptyElement;
-            var settings = new LoggerSettings
-            {
-                IsEnabled = true
-            };
+            IsEnabled = true
+        };
 
-            // Read attributes.
-            if (reader.HasAttributes)
+        // Read attributes.
+        if (reader.HasAttributes)
+        {
+            while (reader.MoveToNextAttribute())
             {
-                while (reader.MoveToNextAttribute())
+                switch (reader.Name.ToLowerInvariant())
                 {
-                    switch (reader.Name.ToLowerInvariant())
-                    {
-                        case Constants.LoggerFriendlyNameLower:
-                            settings.FriendlyName = reader.Value;
-                            break;
-
-                        case Constants.LoggerUriName:
-                            try
-                            {
-                                settings.Uri = new Uri(reader.Value);
-                            }
-#if NETSTANDARD1_0
-                            catch
-#else
-                            catch (UriFormatException)
-#endif
-                            {
-                                throw new SettingsException(
-                                    string.Format(
-                                        CultureInfo.CurrentCulture,
-                                        Resources.Resources.InvalidUriInSettings,
-                                        reader.Value,
-                                        elementName));
-                            }
-                            break;
-
-                        case Constants.LoggerAssemblyQualifiedNameLower:
-                            settings.AssemblyQualifiedName = reader.Value;
-                            break;
-
-                        case Constants.LoggerCodeBaseLower:
-                            settings.CodeBase = reader.Value;
-                            break;
-
-                        case Constants.LoggerEnabledName:
-                            bool.TryParse(reader.Value, out var value);
-                            settings.IsEnabled = value;
-                            break;
-
-                        default:
+                    case Constants.LoggerFriendlyNameLower:
+                        settings.FriendlyName = reader.Value;
+                        break;
+
+                    case Constants.LoggerUriName:
+                        try
+                        {
+                            settings.Uri = new Uri(reader.Value);
+                        }
+                        catch (UriFormatException)
+                        {
                             throw new SettingsException(
                                 string.Format(
                                     CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsXmlAttribute,
-                                    elementName,
-                                    reader.Name));
-                    }
-                }
-            }
-
-            // Check for required attributes.
-            if (string.IsNullOrWhiteSpace(settings.FriendlyName) &&
-                string.IsNullOrWhiteSpace(settings.Uri?.ToString()) &&
-                string.IsNullOrWhiteSpace(settings.AssemblyQualifiedName))
-            {
-                throw new SettingsException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        Resources.Resources.MissingLoggerAttributes,
-                        elementName,
-                        Constants.LoggerFriendlyName));
-            }
+                                    Resources.Resources.InvalidUriInSettings,
+                                    reader.Value,
+                                    elementName));
+                        }
+                        break;
 
-            // Move to next node.
-            reader.Read();
+                    case Constants.LoggerAssemblyQualifiedNameLower:
+                        settings.AssemblyQualifiedName = reader.Value;
+                        break;
 
-            // Return empty settings if previous element is empty.
-            if (empty)
-            {
-                return settings;
-            }
+                    case Constants.LoggerCodeBaseLower:
+                        settings.CodeBase = reader.Value;
+                        break;
 
-            // Read inner elements.
-            while (reader.NodeType == XmlNodeType.Element)
-            {
-                switch (reader.Name.ToLowerInvariant())
-                {
-#if !NETSTANDARD1_0
-                    case Constants.LoggerConfigurationNameLower:                        
-                        var document = new XmlDocument();
-                        var element = document.CreateElement(reader.Name);
-                        element.InnerXml = reader.ReadInnerXml();
-                        settings.Configuration = element;
+                    case Constants.LoggerEnabledName:
+                        _ = bool.TryParse(reader.Value, out var value);
+                        settings.IsEnabled = value;
                         break;
-#endif
+
                     default:
                         throw new SettingsException(
                             string.Format(
                                 CultureInfo.CurrentCulture,
-                                Resources.Resources.InvalidSettingsXmlElement,
+                                Resources.Resources.InvalidSettingsXmlAttribute,
                                 elementName,
                                 reader.Name));
                 }
             }
-            reader.ReadEndElement();
+        }
 
+        // Check for required attributes.
+        if (StringUtils.IsNullOrWhiteSpace(settings.FriendlyName) &&
+            StringUtils.IsNullOrWhiteSpace(settings.Uri?.ToString()) &&
+            StringUtils.IsNullOrWhiteSpace(settings.AssemblyQualifiedName))
+        {
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.MissingLoggerAttributes,
+                    elementName,
+                    Constants.LoggerFriendlyName));
+        }
+
+        // Move to next node.
+        reader.Read();
+
+        // Return empty settings if previous element is empty.
+        if (empty)
+        {
             return settings;
         }
+
+        // Read inner elements.
+        while (reader.NodeType == XmlNodeType.Element)
+        {
+            switch (reader.Name.ToLowerInvariant())
+            {
+                case Constants.LoggerConfigurationNameLower:
+                    var document = new XmlDocument();
+                    var element = document.CreateElement(reader.Name);
+                    element.InnerXml = reader.ReadInnerXml();
+                    settings.Configuration = element;
+                    break;
+                default:
+                    throw new SettingsException(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Resources.Resources.InvalidSettingsXmlElement,
+                            elementName,
+                            reader.Name));
+            }
+        }
+        reader.ReadEndElement();
+
+        return settings;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/TestLoggerEvents.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/TestLoggerEvents.cs
index c544ae418e..5a71f9c9d9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logger/TestLoggerEvents.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/TestLoggerEvents.cs
@@ -1,69 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+/// <summary>
+/// Exposes events that Test Loggers can register for.
+/// </summary>
+public abstract class TestLoggerEvents
+{
     /// <summary>
-    /// Exposes events that Test Loggers can register for.
+    /// Default constructor.
     /// </summary>
-    public abstract class TestLoggerEvents
+    protected TestLoggerEvents()
     {
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        protected TestLoggerEvents()
-        {
-        }
-
-        #endregion
-
-        #region Events
+    }
 
-        /// <summary>
-        /// Raised when a test message is received.
-        /// </summary>
-        public abstract event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    /// <summary>
+    /// Raised when a test message is received.
+    /// </summary>
+    public abstract event EventHandler<TestRunMessageEventArgs>? TestRunMessage;
 
-        /// <summary>
-        /// Raised when a test run starts.
-        /// </summary>
-        public abstract event EventHandler<TestRunStartEventArgs> TestRunStart;
+    /// <summary>
+    /// Raised when a test run starts.
+    /// </summary>
+    public abstract event EventHandler<TestRunStartEventArgs>? TestRunStart;
 
-        /// <summary>
-        /// Raised when a test result is received.
-        /// </summary>
-        public abstract event EventHandler<TestResultEventArgs> TestResult;
+    /// <summary>
+    /// Raised when a test result is received.
+    /// </summary>
+    public abstract event EventHandler<TestResultEventArgs>? TestResult;
 
-        /// <summary>
-        /// Raised when a test run is complete.
-        /// </summary>
-        public abstract event EventHandler<TestRunCompleteEventArgs> TestRunComplete;
+    /// <summary>
+    /// Raised when a test run is complete.
+    /// </summary>
+    public abstract event EventHandler<TestRunCompleteEventArgs>? TestRunComplete;
 
-        /// <summary>
-        /// Raised when test discovery starts
-        /// </summary>
-        public abstract event EventHandler<DiscoveryStartEventArgs> DiscoveryStart;
+    /// <summary>
+    /// Raised when test discovery starts
+    /// </summary>
+    public abstract event EventHandler<DiscoveryStartEventArgs>? DiscoveryStart;
 
-        /// <summary>
-        /// Raised when a discovery message is received.
-        /// </summary>
-        public abstract event EventHandler<TestRunMessageEventArgs> DiscoveryMessage;
+    /// <summary>
+    /// Raised when a discovery message is received.
+    /// </summary>
+    public abstract event EventHandler<TestRunMessageEventArgs>? DiscoveryMessage;
 
-        /// <summary>
-        /// Raised when discovered tests are received
-        /// </summary>
-        public abstract event EventHandler<DiscoveredTestsEventArgs> DiscoveredTests;
+    /// <summary>
+    /// Raised when discovered tests are received
+    /// </summary>
+    public abstract event EventHandler<DiscoveredTestsEventArgs>? DiscoveredTests;
 
-        /// <summary>
-        /// Raised when test discovery is complete
-        /// </summary>
-        public abstract event EventHandler<DiscoveryCompleteEventArgs> DiscoveryComplete;
+    /// <summary>
+    /// Raised when test discovery is complete
+    /// </summary>
+    public abstract event EventHandler<DiscoveryCompleteEventArgs>? DiscoveryComplete;
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/DataCollectionMessageEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/DataCollectionMessageEventArgs.cs
index d5332da80b..7d5f032afd 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/DataCollectionMessageEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/DataCollectionMessageEventArgs.cs
@@ -1,61 +1,55 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
-{
-    using System;
-    using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+/// <summary>
+/// EventArg used for raising data collector message event.
+/// </summary>
+[DataContract]
+public class DataCollectionMessageEventArgs : TestRunMessageEventArgs
+{
     /// <summary>
-    /// EventArg used for raising data collector message event.
+    /// Constructor
     /// </summary>
-    [DataContract]
-    public class DataCollectionMessageEventArgs : TestRunMessageEventArgs
+    /// <param name="level">Level at which message should be logged.</param>
+    /// <param name="message">Text message.</param>
+    public DataCollectionMessageEventArgs(TestMessageLevel level, string message)
+        : base(level, message)
     {
-        #region Constructor
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="level">Level at which message should be logged.</param>
-        /// <param name="message">Text message.</param>
-        public DataCollectionMessageEventArgs(TestMessageLevel level, string message) : base(level, message)
-        {
-        }
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Friendly name of collector
-        /// </summary>
-        [DataMember]
-        public string FriendlyName
-        {
-            get;
-            set;
-        }
-
+    }
+    /// <summary>
+    /// Friendly name of collector
+    /// </summary>
+    [DataMember]
+    public string? FriendlyName
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Uri of collector.
-        /// </summary>
-        [DataMember]
-        public Uri Uri
-        {
-            get;
-            set;
-        }
 
-        /// <summary>
-        /// Test case id if the message is generated by test case collection.
-        /// </summary>
-        [DataMember]
-        public Guid TestCaseId
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Uri of collector.
+    /// </summary>
+    [DataMember]
+    public Uri? Uri
+    {
+        get;
+        set;
+    }
 
-        #endregion
+    /// <summary>
+    /// Test case id if the message is generated by test case collection.
+    /// </summary>
+    [DataMember]
+    public Guid TestCaseId
+    {
+        get;
+        set;
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestResultEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestResultEventArgs.cs
index 9d125592f6..a191282c5d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestResultEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestResultEventArgs.cs
@@ -1,37 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+/// <summary>
+/// Event arguments used for raising Test Result events.
+/// </summary>
+public class TestResultEventArgs : EventArgs
+{
     /// <summary>
-    /// Event arguments used for raising Test Result events.
+    /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
     /// </summary>
-    public class TestResultEventArgs : EventArgs
+    /// <param name="result">
+    /// Test Result for the event.
+    /// </param>
+    public TestResultEventArgs(TestResult result)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultEventArgs"/> class.
-        /// </summary>
-        /// <param name="result">
-        /// Test Result for the event.
-        /// </param>
-        public TestResultEventArgs(TestResult result)
-        {
-            this.Result = result ?? throw new ArgumentNullException(nameof(result));
-        }
-
-        #endregion
-
-        #region Properties
+        Result = result ?? throw new ArgumentNullException(nameof(result));
+    }
 
-        /// <summary>
-        /// Gets the Test Result.
-        /// </summary>
-        public TestResult Result { get; private set; }
+    /// <summary>
+    /// Gets the Test Result.
+    /// </summary>
+    public TestResult Result { get; private set; }
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunMessageEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunMessageEventArgs.cs
index e9d4c4e511..de2e21bb5b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunMessageEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunMessageEventArgs.cs
@@ -1,58 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
-{
-    using System;
-    using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+/// <summary>
+/// Event arguments used for raising Test Run Message events.
+/// </summary>
+[DataContract]
+public class TestRunMessageEventArgs : EventArgs
+{
     /// <summary>
-    /// Event arguments used for raising Test Run Message events.
+    /// Initializes with the level and the message for the event.
     /// </summary>
-    [DataContract]
-    public class TestRunMessageEventArgs : EventArgs
+    /// <param name="level">Level of the message.</param>
+    /// <param name="message">The message.</param>
+    public TestRunMessageEventArgs(TestMessageLevel level, string message)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the level and the message for the event.
-        /// </summary>
-        /// <param name="level">Level of the message.</param>
-        /// <param name="message">The message.</param>
-        public TestRunMessageEventArgs(TestMessageLevel level, string message)
+        ValidateArg.NotNullOrWhiteSpace(message, nameof(message));
+
+        if (level is < TestMessageLevel.Informational or > TestMessageLevel.Error)
         {
-            if (string.IsNullOrWhiteSpace(message))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(message));
-            }
-
-            if (level < TestMessageLevel.Informational || level > TestMessageLevel.Error)
-            {
-                throw new ArgumentOutOfRangeException(nameof(level));
-            }
-
-            Level = level;
-            Message = message;
+            throw new ArgumentOutOfRangeException(nameof(level));
         }
 
-        #endregion
-
-        #region Properties
+        Level = level;
+        Message = message;
+    }
 
-        /// <summary>
-        /// The message.
-        /// </summary>
-        [DataMember]
-        public string Message { get; set; }
+    /// <summary>
+    /// The message.
+    /// </summary>
+    [DataMember]
+    public string Message { get; set; }
 
-        /// <summary>
-        /// Level of the message.
-        /// </summary>
-        [DataMember]
-        public TestMessageLevel Level { get; set; }
+    /// <summary>
+    /// Level of the message.
+    /// </summary>
+    [DataMember]
+    public TestMessageLevel Level { get; set; }
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunStartedEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunStartedEventArgs.cs
index d612d47b68..03ff39dabf 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunStartedEventArgs.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/Events/TestRunStartedEventArgs.cs
@@ -1,27 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
-{
-    using System;
+using System;
 
-    /// <summary>
-    /// Event arguments used for raising TestRunStarted events.
-    /// Mainly contains the process Id of the test execution process running the tests.
-    /// </summary>
-    public class TestRunStartedEventArgs : EventArgs
-    {
-        public int ProcessId { get; private set; }
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-        /// <param name="processId">The process Id of the test execution process running the tests.</param>
-        public TestRunStartedEventArgs(int processId)
-        {
-            ProcessId = processId;
-        }
+/// <summary>
+/// Event arguments used for raising TestRunStarted events.
+/// Mainly contains the process Id of the test execution process running the tests.
+/// </summary>
+public class TestRunStartedEventArgs : EventArgs
+{
+    public int ProcessId { get; private set; }
 
-        public override string ToString()
-        {
-            return "ProcessId = " + ProcessId;
-        }
+    /// <param name="processId">The process Id of the test execution process running the tests.</param>
+    public TestRunStartedEventArgs(int processId)
+    {
+        ProcessId = processId;
     }
+
+    public override string ToString()
+        => "ProcessId = " + ProcessId;
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/Interfaces/IMessageLogger.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/Interfaces/IMessageLogger.cs
index c9028c09f9..92a7602612 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/Interfaces/IMessageLogger.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/Interfaces/IMessageLogger.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+/// <summary>
+/// Used for logging error warning and informational messages.
+/// </summary>
+public interface IMessageLogger
 {
     /// <summary>
-    /// Used for logging error warning and informational messages.
+    /// Sends a message to the enabled loggers.
     /// </summary>
-    public interface IMessageLogger
-    {
-        /// <summary>
-        /// Sends a message to the enabled loggers.
-        /// </summary>
-        /// <param name="testMessageLevel">Level of the message.</param>
-        /// <param name="message">The message to be sent.</param>
-        void SendMessage(TestMessageLevel testMessageLevel, string message);
+    /// <param name="testMessageLevel">Level of the message.</param>
+    /// <param name="message">The message to be sent.</param>
+    void SendMessage(TestMessageLevel testMessageLevel, string message);
 
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logging/TestMessageLevel.cs b/src/Microsoft.TestPlatform.ObjectModel/Logging/TestMessageLevel.cs
index 0b0cd6d004..c60c6595d1 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Logging/TestMessageLevel.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Logging/TestMessageLevel.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+/// <summary>
+/// Levels for test messages.
+/// </summary>
+public enum TestMessageLevel
 {
     /// <summary>
-    /// Levels for test messages.
+    /// Informational message.
     /// </summary>
-    public enum TestMessageLevel
-    {
-        /// <summary>
-        /// Informational message.
-        /// </summary>
-        Informational = 0,
+    Informational = 0,
 
-        /// <summary>
-        /// Warning message.
-        /// </summary>
-        Warning = 1,
+    /// <summary>
+    /// Warning message.
+    /// </summary>
+    Warning = 1,
 
-        /// <summary>
-        /// Error message.
-        /// </summary>
-        Error = 2
-    }
+    /// <summary>
+    /// Error message.
+    /// </summary>
+    Error = 2
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index 6788cd0802..1675d4cb00 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -1,137 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-	</PropertyGroup>
-	<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-	<PropertyGroup>
-		<AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
-		<TargetFrameworks>net45;net451;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3</TargetFrameworks>
-		<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0;netstandard1.0</TargetFrameworks>
-		<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-		<PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-		<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-		<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-		<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-		<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-		<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-		<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-		<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-		<IsTestProject>false</IsTestProject>
-		<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
-		<Reference Include="System.Xml" />
-		<Reference Include="System.Runtime.Serialization" />
-		<Reference Include="System.Runtime" />
-		<Reference Include="System.IO" />
-		<Reference Include="System" />
-		<Reference Include="Microsoft.CSharp" />
-	</ItemGroup>
+  <PropertyGroup>
+    <AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
+    <!-- Suppress warning that is caused by Nuget.Frameworks code that we copy. -->
+    <NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
+  </PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
-		<PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
-		<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
-		<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
-		<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-		<PackageReference Include="System.Runtime" Version="4.3.0" />
-	</ItemGroup>
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.ObjectModel.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      The Microsoft Test Platform Object Model.
+    </PackageDescription>
+  </PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netcoreapp1.0'">
-		<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
-		<PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
-		<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
-		<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-		<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-		<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
-		<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-		<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-		<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
-		<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-
-		<PackageReference Include="NuGet.Frameworks" Version="4.6.4" />
-	</ItemGroup>
-
-	<ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard1')) AND '$(TargetFramework)' != 'uap10.0' AND '$(TargetFramework)' != 'netcoreapp1.0'">
-		<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
-		<PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
-	</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-	<PackageReference Include="NETStandard.Library" Version="1.6.0" />
-	<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
-	<PackageReference Include="System.Xml.XPath" Version="4.0.1" />
-	<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.0.1" />
-
-	<PackageReference Include="NuGet.Frameworks" Version="4.6.4" />
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
-		<Compile Remove="DataCollector\**" />
-		<Compile Remove="Navigation\**" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="Resources\Resources.resx" />
-		<EmbeddedResource Include="Resources\CommonResources.resx" />
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.IO" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
 
-		<None Include="Resources\CommonResources.tt">
-			<Generator>TextTemplatingFileGenerator</Generator>
-			<LastGenOutput>Resources\CommonResources.resx</LastGenOutput>
-		</None>
-	</ItemGroup>
+  <ItemGroup>
+    <!-- net48 includes tuple, we need to reference it in previous versions but only on .net framework. -->
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" 
+        Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net48')) != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<!-- We normally don't build against net6.0, so the public api analyzer errors would only appear in CI pipeline. -->
-		<PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4-beta1.21554.2">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Resources\CommonResources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>CommonResources.resx</DependentUpon>
-		</Compile>
-		<Compile Update="Resources\Resources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\CommonResources.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<DependentUpon>Resources\CommonResources.tt</DependentUpon>
-			<LastGenOutput>CommonResources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-		<EmbeddedResource Update="Resources\Resources.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-	<PropertyGroup Label="Configuration">
-		<RootNamespace>Microsoft.VisualStudio.TestPlatform.ObjectModel</RootNamespace>
-	</PropertyGroup>
+  <ItemGroup>
+    <None Include="Resources\CommonResources.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Resources\CommonResources.resx</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resources\CommonResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>CommonResources.resx</DependentUpon>
+    </Compile>
+    <Compile Update="Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\CommonResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <DependentUpon>Resources\CommonResources.tt</DependentUpon>
+      <LastGenOutput>CommonResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.ObjectModel</RootNamespace>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<!-- API that is common to all frameworks that we build for. -->
-		<AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
-		<AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
-		<!-- API that is common to all frameworks except for .NET Standard 1.0. -->
-		<AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Shipped.txt" />
-		<AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
-		<!-- Framework specific API -->
-		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
-	</ItemGroup>
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
 
-	<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
new file mode 100644
index 0000000000..e0781a6594
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net462">
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
+      </group>
+
+      <group targetFramework="net8.0">
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
+      </group>
+
+      <group targetFramework="netstandard2.0">
+        <dependency id="System.Reflection.Metadata" version="[8.0.0, )" />
+      </group>
+    </dependencies>
+
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="mscorlib" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
+    </frameworkAssemblies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- net462 -->
+    <file src="net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\net462\" />
+
+
+    <!-- Add localized resources -->
+    <file src="net462\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\de" />
+    <file src="net462\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net462\zh-Hant" />
+    <file src="net462\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\de" />
+    <file src="net462\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net462\zh-Hant" />
+    <!-- /net462 -->
+
+    <!-- net8.0 -->
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\net8.0\" />
+
+
+    <!-- Add localized resources -->
+    <file src="net8.0\**\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   exclude="**\TestHost*\**\*.*" target="lib\net8.0\" />
+    <file src="net8.0\**\Microsoft.TestPlatform.CoreUtilities.resources.dll"               exclude="**\TestHost*\**\*.*" target="lib\net8.0\" />
+    <!-- /net8.0 -->
+
+    <!-- netstandard 2.0 -->
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netstandard2.0\" />
+
+
+    <!-- Add localized resources -->
+    <file src="netstandard2.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hant" />
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hant" />
+    <!-- /netstandard 2.0 -->
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaNavigationData.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaNavigationData.cs
index 0752a50ef5..e82645a884 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaNavigationData.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaNavigationData.cs
@@ -1,29 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
 
-    using System.Diagnostics.CodeAnalysis;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    /// <summary>
-    /// A struct that stores the information needed by the navigation: file name, line number, column number.
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Dia is a specific name.")]
-    public class DiaNavigationData : INavigationData
-    {
-        public string FileName { get; set; }
+/// <summary>
+/// A struct that stores the information needed by the navigation: file name, line number, column number.
+/// </summary>
+public class DiaNavigationData : INavigationData
+{
+    public string? FileName { get; set; }
 
-        public int MinLineNumber { get; set; }
+    public int MinLineNumber { get; set; }
 
-        public int MaxLineNumber { get; set; }
+    public int MaxLineNumber { get; set; }
 
-        public DiaNavigationData(string fileName, int minLineNumber, int maxLineNumber)
-        {
-            this.FileName = fileName;
-            this.MinLineNumber = minLineNumber;
-            this.MaxLineNumber = maxLineNumber;
-        }
+    public DiaNavigationData(string? fileName, int minLineNumber, int maxLineNumber)
+    {
+        FileName = fileName;
+        MinLineNumber = minLineNumber;
+        MaxLineNumber = maxLineNumber;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaSession.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaSession.cs
index 469063eaf2..1130173962 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaSession.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaSession.cs
@@ -1,113 +1,133 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// The class that enables us to get debug information from both managed and native binaries.
+/// </summary>
+[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
+     Justification = "Dia is a specific name.")]
+public class DiaSession : INavigationSession
 {
-    using System.Diagnostics.CodeAnalysis;
+    /// <summary>
+    /// Characters that should be stripped off the end of test names.
+    /// </summary>
+    private static readonly char[] TestNameStripChars = ['(', ')', ' '];
+
+    /// <summary>
+    /// The symbol reader.
+    /// </summary>
+    private readonly ISymbolReader _symbolReader;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+    private bool _isDisposed;
 
     /// <summary>
-    /// The class that enables us to get debug information from both managed and native binaries.
+    /// Initializes a new instance of the <see cref="DiaSession"/> class.
     /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
-         Justification = "Dia is a specific name.")]
-    public class DiaSession : INavigationSession
+    /// <param name="binaryPath">
+    /// The binary path.
+    /// </param>
+    public DiaSession(string binaryPath)
+        : this(binaryPath, null)
     {
-        /// <summary>
-        /// Characters that should be stripped off the end of test names.
-        /// </summary>
-        private static readonly char[] TestNameStripChars = { '(', ')', ' ' };
-
-        /// <summary>
-        /// The symbol reader.
-        /// </summary>
-        private readonly ISymbolReader symbolReader;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiaSession"/> class.
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path.
-        /// </param>
-        public DiaSession(string binaryPath)
-            : this(binaryPath, null)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DiaSession"/> class.
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
-        /// </param>
-        /// <param name="searchPath">
-        /// search path.
-        /// </param>
-        public DiaSession(string binaryPath, string searchPath)
-            : this(binaryPath, searchPath, GetSymbolReader(binaryPath))
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DiaSession"/> class.
+    /// </summary>
+    /// <param name="binaryPath">
+    /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
+    /// </param>
+    /// <param name="searchPath">
+    /// search path.
+    /// </param>
+    public DiaSession(string binaryPath, string? searchPath)
+        : this(binaryPath, searchPath, GetSymbolReader(binaryPath))
+    {
+    }
 
-        internal DiaSession(string binaryPath, string searchPath, ISymbolReader symbolReader)
-        {
-            this.symbolReader = symbolReader;
-            ValidateArg.NotNullOrEmpty(binaryPath, nameof(binaryPath));
-            this.symbolReader.CacheSymbols(binaryPath, searchPath);
-        }
+    internal DiaSession(string binaryPath, string? searchPath, ISymbolReader symbolReader)
+    {
+        _symbolReader = symbolReader;
+        ValidateArg.NotNullOrEmpty(binaryPath, nameof(binaryPath));
+        _symbolReader.CacheSymbols(binaryPath, searchPath);
+    }
 
-        /// <summary>
-        /// Dispose symbol reader
-        /// </summary>
-        public void Dispose()
-        {
-            this.symbolReader?.Dispose();
-        }
+    /// <summary>
+    /// Dispose symbol reader
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+            return;
 
-        /// <summary>
-        /// Gets the navigation data for a method declared in a type.
-        /// </summary>
-        /// <param name="declaringTypeName"> The declaring type name. </param>
-        /// <param name="methodName"> The method name. </param>
-        /// <returns> The <see cref="INavigationData" /> for that method. </returns>
-        /// <remarks> Leaving this method in place to preserve back compatibility. </remarks>
-        public DiaNavigationData GetNavigationData(string declaringTypeName, string methodName)
+        if (disposing)
         {
-            return (DiaNavigationData)this.GetNavigationDataForMethod(declaringTypeName, methodName);
+            _symbolReader.Dispose();
         }
 
-        /// <summary>
-        /// Gets the navigation data for a method declared in a type.
-        /// </summary>
-        /// <param name="declaringTypeName"> The declaring type name. </param>
-        /// <param name="methodName"> The method name. </param>
-        /// <returns> The <see cref="INavigationData" /> for that method. </returns>
-        public INavigationData GetNavigationDataForMethod(string declaringTypeName, string methodName)
+        _isDisposed = true;
+    }
+
+    /// <summary>
+    /// Gets the navigation data for a method declared in a type.
+    /// </summary>
+    /// <param name="declaringTypeName"> The declaring type name. </param>
+    /// <param name="methodName"> The method name. </param>
+    /// <returns> The <see cref="INavigationData" /> for that method. </returns>
+    /// <remarks> Leaving this method in place to preserve back compatibility. </remarks>
+    public DiaNavigationData? GetNavigationData(string declaringTypeName, string methodName)
+    {
+        return (DiaNavigationData?)GetNavigationDataForMethod(declaringTypeName, methodName);
+    }
+
+    /// <summary>
+    /// Gets the navigation data for a method declared in a type.
+    /// </summary>
+    /// <param name="declaringTypeName"> The declaring type name. </param>
+    /// <param name="methodName"> The method name. </param>
+    /// <returns> The <see cref="INavigationData" /> for that method. </returns>
+    public INavigationData? GetNavigationDataForMethod(string declaringTypeName, string methodName)
+    {
+        ValidateArg.NotNullOrEmpty(declaringTypeName, nameof(declaringTypeName));
+        ValidateArg.NotNullOrEmpty(methodName, nameof(methodName));
+        methodName = methodName.TrimEnd(TestNameStripChars);
+        return _symbolReader.GetNavigationData(declaringTypeName, methodName);
+    }
+
+    private static ISymbolReader GetSymbolReader(string? binaryPath)
+    {
+        var pdbFilePath = Path.ChangeExtension(binaryPath, ".pdb");
+
+        // For remote scenario, also look for pdb in current directory, (esp for UWP)
+        // The alternate search path should be an input from Adapters, but since it is not so currently adding a HACK
+        pdbFilePath = !File.Exists(pdbFilePath)
+            ? Path.Combine(Directory.GetCurrentDirectory(), Path.GetFileName(pdbFilePath)!)
+            : pdbFilePath;
+
+        if (File.Exists(pdbFilePath))
         {
-            ValidateArg.NotNullOrEmpty(declaringTypeName, nameof(declaringTypeName));
-            ValidateArg.NotNullOrEmpty(methodName, nameof(methodName));
-            methodName = methodName.TrimEnd(TestNameStripChars);
-            return this.symbolReader.GetNavigationData(declaringTypeName, methodName);
+            using var stream = new FileHelper().GetStream(pdbFilePath!, FileMode.Open, FileAccess.Read);
+            return PortablePdbReader.IsPortable(stream) ? new PortableSymbolReader() : new FullSymbolReader();
         }
-
-        private static ISymbolReader GetSymbolReader(string binaryPath)
+        else
         {
-            var pdbFilePath = Path.ChangeExtension(binaryPath, ".pdb");
-
-            // For remote scenario, also look for pdb in current directory, (esp for UWP)
-            // The alternate search path should be an input from Adapters, but since it is not so currently adding a HACK
-            pdbFilePath = !File.Exists(pdbFilePath) ? Path.Combine(Directory.GetCurrentDirectory(), Path.GetFileName(pdbFilePath)) : pdbFilePath;
-            using (var stream = new FileHelper().GetStream(pdbFilePath, FileMode.Open, FileAccess.Read))
-            {
-                if (PortablePdbReader.IsPortable(stream))
-                {
-                    return new PortableSymbolReader();
-                }
-
-                return new FullSymbolReader();
-            }
+            // If we cannot find the pdb file, it might be embedded in the dll.
+            return new PortableSymbolReader();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs
index ea90a03b6f..856fbd2127 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs
@@ -1,516 +1,513 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+
+/// <summary>
+/// To get method's file name, startline and endline from desktop assembly file.
+/// </summary>
+internal class FullSymbolReader : ISymbolReader
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Runtime.InteropServices;
+    /// <summary>
+    /// To check isDisposed
+    /// </summary>
+    private bool _isDisposed;
+
+    private IDiaDataSource? _source;
+    private IDiaSession? _session;
+
+    /// <summary>
+    /// Holds type symbols available in the source.
+    /// </summary>
+    private readonly Dictionary<string, IDiaSymbol> _typeSymbols = new();
 
     /// <summary>
-    /// To get method's file name, startline and endline from desktop assembly file.
+    /// Holds method symbols for all types in the source.
+    /// Methods in different types can have same name, hence separated dictionary is created for each type.
+    /// Bug: Method overrides in same type are not handled (not a regression)
+    /// ToDo(Solution): Use method token along with as identifier, this will always give unique method.The adapters would need to send this token to us to correct the behavior.
     /// </summary>
-    internal class FullSymbolReader : ISymbolReader
+    private readonly Dictionary<string, Dictionary<string, IDiaSymbol>> _methodSymbols = new();
+
+    /// <summary>
+    /// dispose caches
+    /// </summary>
+    public void Dispose()
     {
-        /// <summary>
-        /// To check isDisposed
-        /// </summary>
-        private bool isDisposed;
-
-        private IDiaDataSource source;
-        private IDiaSession session;
-
-        /// <summary>
-        /// Holds type symbols available in the source.
-        /// </summary>
-        private Dictionary<string, IDiaSymbol> typeSymbols = new Dictionary<string, IDiaSymbol>();
-
-        /// <summary>
-        /// Holds method symbols for all types in the source.
-        /// Methods in different types can have same name, hence separated dictionary is created for each type.
-        /// Bug: Method overrides in same type are not handled (not a regression)
-        /// ToDo(Solution): Use method token along with as identifier, this will always give unique method.The adapters would need to send this token to us to correct the behavior.
-        /// </summary>
-        private Dictionary<string, Dictionary<string, IDiaSymbol>> methodSymbols = new Dictionary<string, Dictionary<string, IDiaSymbol>>();
-
-        /// <summary>
-        /// dispose caches
-        /// </summary>
-        public void Dispose()
-        {
-            this.Dispose(true);
+        Dispose(true);
 
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
+        // Use SupressFinalize in case a subclass
+        // of this type implements a finalizer.
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Cache symbols from binary path
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
-        /// </param>
-        /// <param name="searchPath">
-        /// search path.
-        /// </param>
-        public void CacheSymbols(string binaryPath, string searchPath)
+    /// <summary>
+    /// Cache symbols from binary path
+    /// </summary>
+    /// <param name="binaryPath">
+    /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
+    /// </param>
+    /// <param name="searchPath">
+    /// search path.
+    /// </param>
+    public void CacheSymbols(string binaryPath, string? searchPath)
+    {
+        try
         {
-            try
+            if (OpenSession(binaryPath, searchPath))
             {
-                if(OpenSession(binaryPath, searchPath))
-                {
-                    this.PopulateCacheForTypeAndMethodSymbols();
-                }
-            }
-            catch (COMException)
-            {
-                this.Dispose();
-                throw;
+                PopulateCacheForTypeAndMethodSymbols();
             }
         }
+        catch (COMException)
+        {
+            Dispose();
+            throw;
+        }
+    }
 
-        /// <summary>
-        /// Gets Navigation data from caches
-        /// </summary>
-        /// <param name="declaringTypeName">
-        /// Type name Ex: MyNameSpace.MyType
-        /// </param>
-        /// <param name="methodName">
-        /// Method name in declaringTypeName Ex: Method1
-        /// </param>
-        /// <returns>
-        /// <see cref="INavigationData"/>.
-        /// Returns INavigationData which contains filename and line number.
-        /// </returns>
-        public INavigationData GetNavigationData(string declaringTypeName, string methodName)
+    /// <summary>
+    /// Gets Navigation data from caches
+    /// </summary>
+    /// <param name="declaringTypeName">
+    /// Type name Ex: MyNameSpace.MyType
+    /// </param>
+    /// <param name="methodName">
+    /// Method name in declaringTypeName Ex: Method1
+    /// </param>
+    /// <returns>
+    /// <see cref="INavigationData"/>.
+    /// Returns INavigationData which contains filename and line number.
+    /// </returns>
+    public INavigationData? GetNavigationData(string declaringTypeName, string methodName)
+    {
+        INavigationData? navigationData = null;
+        IDiaSymbol? typeSymbol = GetTypeSymbol(declaringTypeName, SymTagEnum.SymTagCompiland);
+        IDiaSymbol? methodSymbol;
+        if (typeSymbol != null)
+        {
+            methodSymbol = GetMethodSymbol(typeSymbol, methodName);
+        }
+        else
+        {
+            // May be a managed C++ test assembly...
+            string fullMethodName = declaringTypeName.Replace(".", "::");
+            fullMethodName = fullMethodName + "::" + methodName;
+
+            methodSymbol = GetTypeSymbol(fullMethodName, SymTagEnum.SymTagFunction);
+        }
+
+        if (methodSymbol != null)
+        {
+            navigationData = GetSymbolNavigationData(methodSymbol);
+        }
+
+        return navigationData;
+    }
+
+    private bool OpenSession(string filename, string? searchPath)
+    {
+        try
         {
-            INavigationData navigationData = null;
-            IDiaSymbol methodSymbol = null;
+            // Activate the DIA data source COM object
+            _source = DiaSourceObject.GetDiaSourceObject();
 
-            IDiaSymbol typeSymbol = this.GetTypeSymbol(declaringTypeName, SymTagEnum.SymTagCompiland);
-            if (typeSymbol != null)
+            if (_source == null)
             {
-                methodSymbol = this.GetMethodSymbol(typeSymbol, methodName);
+                return false;
             }
-            else
-            {
-                // May be a managed C++ test assembly...
-                string fullMethodName = declaringTypeName.Replace(".", "::");
-                fullMethodName = fullMethodName + "::" + methodName;
 
-                methodSymbol = this.GetTypeSymbol(fullMethodName, SymTagEnum.SymTagFunction);
+            // UWP(App model) scenario
+            if (!Path.IsPathRooted(filename))
+            {
+                filename = Path.Combine(Directory.GetCurrentDirectory(), filename);
+                if (StringUtils.IsNullOrEmpty(searchPath))
+                {
+                    searchPath = Directory.GetCurrentDirectory();
+                }
             }
 
-            if (methodSymbol != null)
+            // Load the data for the executable
+            int hResult = _source.LoadDataForExe(filename, searchPath, IntPtr.Zero);
+            if (HResult.Failed(hResult))
             {
-                navigationData = this.GetSymbolNavigationData(methodSymbol);
+                throw new COMException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.FailedToCreateDiaSession, hResult));
             }
 
-            return navigationData;
+            // Open the session and return it
+            if (HResult.Failed(_source.OpenSession(out _session)))
+            {
+                return false;
+            }
         }
-
-        private bool OpenSession(string filename, string searchPath)
+        catch (COMException)
+        {
+            throw;
+        }
+        finally
         {
-            try
+            if (_source != null)
             {
-                // Activate the DIA data source COM object
-                this.source = DiaSourceObject.GetDiaSourceObject();
+                Marshal.FinalReleaseComObject(_source);
+            }
+        }
 
-                if (this.source == null)
-                {
-                    return false;
-                }
+        return true;
+    }
 
-                // UWP(App model) scenario
-                if (!Path.IsPathRooted(filename))
-                {
-                    filename = Path.Combine(Directory.GetCurrentDirectory(), filename);
-                    if (string.IsNullOrEmpty(searchPath))
-                    {
-                        searchPath = Directory.GetCurrentDirectory();
-                    }
-                }
+    private DiaNavigationData GetSymbolNavigationData(IDiaSymbol symbol)
+    {
+        ValidateArg.NotNull(symbol, nameof(symbol));
 
-                // Load the data for the executable
-                int hResult = this.source.LoadDataForExe(filename, searchPath, IntPtr.Zero);
-                if (HResult.Failed(hResult))
-                {
-                    throw new COMException(string.Format(Resources.Resources.FailedToCreateDiaSession, hResult));
-                }
+        DiaNavigationData navigationData = new(null, int.MaxValue, int.MinValue);
 
-                // Open the session and return it
-                if (HResult.Failed(this.source.OpenSession(out this.session)))
-                {
-                    return false;
-                }
-            }
-            catch (COMException)
+        IDiaEnumLineNumbers? lines = null;
+
+        try
+        {
+            // Get the address section
+            if (HResult.Failed(symbol.GetAddressSection(out uint section)))
             {
-                throw;
+                return navigationData;
             }
-            finally
+
+            // Get the address offset
+            if (HResult.Failed(symbol.GetAddressOffset(out uint offset)))
             {
-                if (this.source != null)
-                {
-                    Marshal.FinalReleaseComObject(this.source);
-                }
+                return navigationData;
             }
 
-            return true;
-        }
-
-        private DiaNavigationData GetSymbolNavigationData(IDiaSymbol symbol)
-        {
-            ValidateArg.NotNull(symbol, nameof(symbol));
-
-            DiaNavigationData navigationData = new DiaNavigationData(null, int.MaxValue, int.MinValue);
+            // Get the length of the symbol
+            if (HResult.Failed(symbol.GetLength(out long length)))
+            {
+                return navigationData;
+            }
 
-            IDiaEnumLineNumbers lines = null;
+            TPDebug.Assert(_session is not null, "_session is null");
+            _session.FindLinesByAddress(section, offset, (uint)length, out lines);
 
-            try
+            while (true)
             {
-                // Get the address section
-                if (HResult.Failed(symbol.GetAddressSection(out uint section)))
-                {
-                    return navigationData;
-                }
+                lines.GetNext(1, out IDiaLineNumber? lineNumber, out uint celt);
 
-                // Get the address offset
-                if (HResult.Failed(symbol.GetAddressOffset(out uint offset)))
+                if (celt != 1)
                 {
-                    return navigationData;
+                    break;
                 }
 
-                // Get the length of the symbol
-                if (HResult.Failed(symbol.GetLength(out long length)))
+                IDiaSourceFile? sourceFile = null;
+                try
                 {
-                    return navigationData;
-                }
+                    lineNumber.GetSourceFile(out sourceFile);
 
-                this.session.FindLinesByAddress(section, offset, (uint)length, out lines);
+                    // Get startline
+                    lineNumber.GetLineNumber(out uint startLine);
 
-                while (true)
-                {
-                    lines.GetNext(1, out IDiaLineNumber lineNumber, out uint celt);
+                    // Get endline
+                    lineNumber.GetLineNumberEnd(out uint endLine);
 
-                    if (celt != 1)
+                    // The magic hex constant below works around weird data reported from GetSequencePoints.
+                    // The constant comes from ILDASM's source code, which performs essentially the same test.
+                    const uint magic = 0xFEEFEE;
+                    if (startLine >= magic || endLine >= magic)
                     {
-                        break;
+                        continue;
                     }
 
-                    IDiaSourceFile sourceFile = null;
-                    try
-                    {
-                        lineNumber.GetSourceFile(out sourceFile);
-
-                        // Get startline
-                        lineNumber.GetLineNumber(out uint startLine);
-
-                        // Get endline
-                        lineNumber.GetLineNumberEnd(out uint endLine);
-
-                        // The magic hex constant below works around weird data reported from GetSequencePoints.
-                        // The constant comes from ILDASM's source code, which performs essentially the same test.
-                        const uint Magic = 0xFEEFEE;
-                        if (startLine >= Magic || endLine >= Magic)
-                        {
-                            continue;
-                        }
+                    sourceFile.GetFilename(out var srcFileName);
 
-                        sourceFile.GetFilename(out var srcFileName);
-
-                        navigationData.FileName = srcFileName;
-                        navigationData.MinLineNumber = Math.Min(navigationData.MinLineNumber, (int)startLine);
-                        navigationData.MaxLineNumber = Math.Max(navigationData.MaxLineNumber, (int)endLine);
-                    }
-                    finally
-                    {
-                        ReleaseComObject(ref sourceFile);
-                        ReleaseComObject(ref lineNumber);
-                    }
+                    navigationData.FileName = srcFileName;
+                    navigationData.MinLineNumber = Math.Min(navigationData.MinLineNumber, (int)startLine);
+                    navigationData.MaxLineNumber = Math.Max(navigationData.MaxLineNumber, (int)endLine);
+                }
+                finally
+                {
+                    ReleaseComObject(ref sourceFile);
+                    ReleaseComObject(ref lineNumber);
                 }
             }
-            finally
-            {
-                ReleaseComObject(ref lines);
-            }
-
-            return navigationData;
         }
+        finally
+        {
+            ReleaseComObject(ref lines);
+        }
+
+        return navigationData;
+    }
 
-        private void PopulateCacheForTypeAndMethodSymbols()
+    private void PopulateCacheForTypeAndMethodSymbols()
+    {
+        IDiaEnumSymbols? enumTypeSymbols = null;
+        IDiaSymbol? global = null;
+        try
         {
-            IDiaEnumSymbols enumTypeSymbols = null;
-            IDiaSymbol global = null;
-            try
+            TPDebug.Assert(_session is not null, "_session is null");
+            _session.GetGlobalScope(out global);
+            global.FindChildren(SymTagEnum.SymTagCompiland, null, 0, out enumTypeSymbols);
+
+            // NOTE::
+            // If foreach loop is used instead of Enumerator iterator, for some reason it leaves
+            // the reference to pdb active, which prevents pdb from being rebuilt (in VS IDE scenario).
+            enumTypeSymbols.GetNext(1, out IDiaSymbol typeSymbol, out uint celtTypeSymbol);
+            while (celtTypeSymbol == 1 && typeSymbol != null)
             {
-                this.session.GetGlobalScope(out global);
-                global.FindChildren(SymTagEnum.SymTagCompiland, null, 0, out enumTypeSymbols);
-
-                // NOTE::
-                // If foreach loop is used instead of Enumerator iterator, for some reason it leaves
-                // the reference to pdb active, which prevents pdb from being rebuilt (in VS IDE scenario).
-                enumTypeSymbols.GetNext(1, out IDiaSymbol typeSymbol, out uint celtTypeSymbol);
-                while (celtTypeSymbol == 1 && typeSymbol != null)
-                {
-                    typeSymbol.GetName(out var name);
-                    this.typeSymbols[name] = typeSymbol;
-
-                    IDiaEnumSymbols enumMethodSymbols = null;
-                    try
-                    {
-                        Dictionary<string, IDiaSymbol> methodSymbolsForType = new Dictionary<string, IDiaSymbol>();
-                        typeSymbol.FindChildren(SymTagEnum.SymTagFunction, null, 0, out enumMethodSymbols);
+                typeSymbol.GetName(out var name);
+                _typeSymbols[name] = typeSymbol;
 
-                        enumMethodSymbols.GetNext(1, out IDiaSymbol methodSymbol, out uint celtMethodSymbol);
-                        while (celtMethodSymbol == 1 && methodSymbol != null)
-                        {
-                            methodSymbol.GetName(out var methodName);
-                            UpdateMethodSymbolCache(methodName, methodSymbol, methodSymbolsForType);
-                            enumMethodSymbols.GetNext(1, out methodSymbol, out celtMethodSymbol);
-                        }
+                IDiaEnumSymbols? enumMethodSymbols = null;
+                try
+                {
+                    Dictionary<string, IDiaSymbol> methodSymbolsForType = new();
+                    typeSymbol.FindChildren(SymTagEnum.SymTagFunction, null, 0, out enumMethodSymbols);
 
-                        this.methodSymbols[name] = methodSymbolsForType;
-                    }
-                    catch (Exception ex)
+                    enumMethodSymbols.GetNext(1, out IDiaSymbol methodSymbol, out uint celtMethodSymbol);
+                    while (celtMethodSymbol == 1 && methodSymbol != null)
                     {
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error(
-                                "Ignoring the exception while iterating method symbols:{0} for type:{1}",
-                                ex,
-                                name);
-                        }
-                    }
-                    finally
-                    {
-                        ReleaseComObject(ref enumMethodSymbols);
+                        methodSymbol.GetName(out var methodName);
+                        UpdateMethodSymbolCache(methodName, methodSymbol, methodSymbolsForType);
+                        enumMethodSymbols.GetNext(1, out methodSymbol, out celtMethodSymbol);
                     }
 
-                    enumTypeSymbols.GetNext(1, out typeSymbol, out celtTypeSymbol);
+                    _methodSymbols[name] = methodSymbolsForType;
                 }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
+                catch (Exception ex)
                 {
-                    EqtTrace.Error("Ignoring the exception while iterating type symbols:{0}", ex);
+                    EqtTrace.Error(
+                        "Ignoring the exception while iterating method symbols:{0} for type:{1}",
+                        ex,
+                        name);
                 }
-            }
-            finally
-            {
-                ReleaseComObject(ref enumTypeSymbols);
-                ReleaseComObject(ref global);
+                finally
+                {
+                    ReleaseComObject(ref enumMethodSymbols);
+                }
+
+                enumTypeSymbols.GetNext(1, out typeSymbol, out celtTypeSymbol);
             }
         }
-
-        private IDiaSymbol GetTypeSymbol(string typeName, SymTagEnum symTag)
+        catch (Exception ex)
         {
-            ValidateArg.NotNullOrEmpty(typeName, nameof(typeName));
+            EqtTrace.Error("Ignoring the exception while iterating type symbols:{0}", ex);
+        }
+        finally
+        {
+            ReleaseComObject(ref enumTypeSymbols);
+            ReleaseComObject(ref global);
+        }
+    }
 
-            IDiaEnumSymbols enumSymbols = null;
-            IDiaSymbol typeSymbol = null;
-            IDiaSymbol global = null;
+    private IDiaSymbol? GetTypeSymbol(string typeName, SymTagEnum symTag)
+    {
+        ValidateArg.NotNullOrEmpty(typeName, nameof(typeName));
+
+        IDiaEnumSymbols? enumSymbols = null;
+        IDiaSymbol? typeSymbol;
+        IDiaSymbol? global = null;
 
-            try
+        try
+        {
+            typeName = typeName.Replace('+', '.');
+            if (_typeSymbols.ContainsKey(typeName))
             {
-                typeName = typeName.Replace('+', '.');
-                if (this.typeSymbols.ContainsKey(typeName))
-                {
-                    return this.typeSymbols[typeName];
-                }
+                return _typeSymbols[typeName];
+            }
 
-                this.session.GetGlobalScope(out global);
-                global.FindChildren(symTag, typeName, 0, out enumSymbols);
+            TPDebug.Assert(_session is not null, "_session is null");
+            _session.GetGlobalScope(out global);
+            global.FindChildren(symTag, typeName, 0, out enumSymbols);
 
-                enumSymbols.GetNext(1, out typeSymbol, out uint celt);
+            enumSymbols.GetNext(1, out typeSymbol, out uint celt);
 
 #if DEBUG
-                if (typeSymbol == null)
+            if (typeSymbol == null)
+            {
+                IDiaEnumSymbols? enumAllSymbols = null;
+                try
                 {
-                    IDiaEnumSymbols enumAllSymbols = null;
-                    try
-                    {
-                        global.FindChildren(symTag, null, 0, out enumAllSymbols);
-                        List<string> children = new List<string>();
+                    global.FindChildren(symTag, null, 0, out enumAllSymbols);
+                    List<string> children = new();
 
-                        while (true)
+                    while (true)
+                    {
+                        enumAllSymbols.GetNext(1, out IDiaSymbol? childSymbol, out uint fetchedCount);
+                        if (fetchedCount == 0 || childSymbol == null)
                         {
-                            enumAllSymbols.GetNext(1, out IDiaSymbol childSymbol, out uint fetchedCount);
-                            if (fetchedCount == 0 || childSymbol == null)
-                            {
-                                break;
-                            }
-
-                            childSymbol.GetName(out var childSymbolName);
-                            children.Add(childSymbolName);
-                            ReleaseComObject(ref childSymbol);
+                            break;
                         }
 
-                        Debug.Assert(children.Count > 0);
+                        childSymbol.GetName(out var childSymbolName);
+                        children.Add(childSymbolName);
+                        ReleaseComObject(ref childSymbol);
                     }
-                    finally
-                    {
-                        ReleaseComObject(ref enumAllSymbols);
-                    }
-                }
 
-#endif
-            }
-            finally
-            {
-                ReleaseComObject(ref enumSymbols);
-                ReleaseComObject(ref global);
-            }
-
-            if (typeSymbol != null)
-            {
-                this.typeSymbols[typeName] = typeSymbol;
+                    TPDebug.Assert(children.Count > 0);
+                }
+                finally
+                {
+                    ReleaseComObject(ref enumAllSymbols);
+                }
             }
 
-            return typeSymbol;
+#endif
+        }
+        finally
+        {
+            ReleaseComObject(ref enumSymbols);
+            ReleaseComObject(ref global);
         }
 
-        private IDiaSymbol GetMethodSymbol(IDiaSymbol typeSymbol, string methodName)
+        if (typeSymbol != null)
         {
-            ValidateArg.NotNull(typeSymbol, nameof(typeSymbol));
-            ValidateArg.NotNullOrEmpty(methodName, nameof(methodName));
+            _typeSymbols[typeName] = typeSymbol;
+        }
+
+        return typeSymbol;
+    }
+
+    private IDiaSymbol? GetMethodSymbol(IDiaSymbol typeSymbol, string methodName)
+    {
+        ValidateArg.NotNull(typeSymbol, nameof(typeSymbol));
+        ValidateArg.NotNullOrEmpty(methodName, nameof(methodName));
 
-            IDiaEnumSymbols enumSymbols = null;
-            IDiaSymbol methodSymbol = null;
-            Dictionary<string, IDiaSymbol> methodSymbolsForType;
+        IDiaEnumSymbols? enumSymbols = null;
+        IDiaSymbol? methodSymbol;
+        Dictionary<string, IDiaSymbol> methodSymbolsForType;
 
-            try
+        try
+        {
+            typeSymbol.GetName(out string symbolName);
+            if (_methodSymbols.ContainsKey(symbolName))
             {
-                typeSymbol.GetName(out string symbolName);
-                if (this.methodSymbols.ContainsKey(symbolName))
-                {
-                    methodSymbolsForType = this.methodSymbols[symbolName];
-                    if (methodSymbolsForType.ContainsKey(methodName))
-                    {
-                        return methodSymbolsForType[methodName];
-                    }
-                }
-                else
+                methodSymbolsForType = _methodSymbols[symbolName];
+                if (methodSymbolsForType.ContainsKey(methodName))
                 {
-                    methodSymbolsForType = new Dictionary<string, IDiaSymbol>();
-                    this.methodSymbols[symbolName] = methodSymbolsForType;
+                    return methodSymbolsForType[methodName];
                 }
+            }
+            else
+            {
+                methodSymbolsForType = new Dictionary<string, IDiaSymbol>();
+                _methodSymbols[symbolName] = methodSymbolsForType;
+            }
 
-                typeSymbol.FindChildren(SymTagEnum.SymTagFunction, methodName, 0, out enumSymbols);
+            typeSymbol.FindChildren(SymTagEnum.SymTagFunction, methodName, 0, out enumSymbols);
 
-                enumSymbols.GetNext(1, out methodSymbol, out uint celtFetched);
+            enumSymbols.GetNext(1, out methodSymbol, out uint celtFetched);
 
 #if DEBUG
-                if (methodSymbol == null)
+            if (methodSymbol == null)
+            {
+                IDiaEnumSymbols? enumAllSymbols = null;
+                try
                 {
-                    IDiaEnumSymbols enumAllSymbols = null;
-                    try
-                    {
-                        typeSymbol.FindChildren(SymTagEnum.SymTagFunction, null, 0, out enumAllSymbols);
-                        List<string> children = new List<string>();
+                    typeSymbol.FindChildren(SymTagEnum.SymTagFunction, null, 0, out enumAllSymbols);
+                    List<string> children = new();
 
-                        while (true)
+                    while (true)
+                    {
+                        enumAllSymbols.GetNext(1, out IDiaSymbol? childSymbol, out uint fetchedCount);
+                        if (fetchedCount == 0 || childSymbol == null)
                         {
-                            enumAllSymbols.GetNext(1, out IDiaSymbol childSymbol, out uint fetchedCount);
-                            if (fetchedCount == 0 || childSymbol == null)
-                            {
-                                break;
-                            }
-
-                            childSymbol.GetName(out string childSymbolName);
-                            children.Add(childSymbolName);
-                            ReleaseComObject(ref childSymbol);
+                            break;
                         }
 
-                        Debug.Assert(children.Count > 0);
+                        childSymbol.GetName(out string childSymbolName);
+                        children.Add(childSymbolName);
+                        ReleaseComObject(ref childSymbol);
                     }
-                    finally
-                    {
-                        ReleaseComObject(ref enumAllSymbols);
-                    }
-                }
 
-#endif
-            }
-            finally
-            {
-                ReleaseComObject(ref enumSymbols);
+                    TPDebug.Assert(children.Count > 0);
+                }
+                finally
+                {
+                    ReleaseComObject(ref enumAllSymbols);
+                }
             }
 
-            if (methodSymbol != null)
-            {
-                methodSymbolsForType[methodName] = methodSymbol;
-            }
+#endif
+        }
+        finally
+        {
+            ReleaseComObject(ref enumSymbols);
+        }
 
-            return methodSymbol;
+        if (methodSymbol != null)
+        {
+            methodSymbolsForType[methodName] = methodSymbol;
         }
 
-        /// <summary>
-        /// Update the method symbol cache.
-        /// </summary>
-        private static void UpdateMethodSymbolCache(string methodName, IDiaSymbol methodSymbol, Dictionary<string, IDiaSymbol> methodSymbolCache)
+        return methodSymbol;
+    }
+
+    /// <summary>
+    /// Update the method symbol cache.
+    /// </summary>
+    private static void UpdateMethodSymbolCache(string methodName, IDiaSymbol methodSymbol, Dictionary<string, IDiaSymbol> methodSymbolCache)
+    {
+        TPDebug.Assert(!StringUtils.IsNullOrEmpty(methodName), "MethodName cannot be empty.");
+        TPDebug.Assert(methodSymbol != null, "Method symbol cannot be null.");
+        TPDebug.Assert(methodSymbolCache != null, "Method symbol cache cannot be null.");
+
+        // #827589, In case a type has overloaded methods, then there could be a method already in the
+        // cache which should be disposed.
+        if (methodSymbolCache.TryGetValue(methodName, out IDiaSymbol? oldSymbol))
         {
-            Debug.Assert(!string.IsNullOrEmpty(methodName), "MethodName cannot be empty.");
-            Debug.Assert(methodSymbol != null, "Method symbol cannot be null.");
-            Debug.Assert(methodSymbolCache != null, "Method symbol cache cannot be null.");
+            ReleaseComObject(ref oldSymbol);
+        }
 
-            // #827589, In case a type has overloaded methods, then there could be a method already in the
-            // cache which should be disposed.
-            if (methodSymbolCache.TryGetValue(methodName, out IDiaSymbol oldSymbol))
-            {
-                ReleaseComObject(ref oldSymbol);
-            }
+        methodSymbolCache[methodName] = methodSymbol;
+    }
 
-            methodSymbolCache[methodName] = methodSymbol;
+    private static void ReleaseComObject<T>(ref T? obj)
+        where T : class
+    {
+        if (obj != null)
+        {
+            Marshal.FinalReleaseComObject(obj);
+            obj = null;
         }
+    }
 
-        private static void ReleaseComObject<T>(ref T obj)
-          where T : class
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
         {
-            if (obj != null)
-            {
-                Marshal.FinalReleaseComObject(obj);
-                obj = null;
-            }
+            return;
         }
 
-        private void Dispose(bool disposing)
+        if (disposing)
         {
-            if (!this.isDisposed)
+            foreach (Dictionary<string, IDiaSymbol> methodSymbolsForType in _methodSymbols.Values)
             {
-                if (disposing)
+                foreach (IDiaSymbol methodSymbol in methodSymbolsForType.Values)
                 {
-                    foreach (Dictionary<string, IDiaSymbol> methodSymbolsForType in this.methodSymbols.Values)
-                    {
-                        foreach (IDiaSymbol methodSymbol in methodSymbolsForType.Values)
-                        {
-                            IDiaSymbol symToRelease = methodSymbol;
-                            ReleaseComObject(ref symToRelease);
-                        }
-
-                        methodSymbolsForType.Clear();
-                    }
-
-                    this.methodSymbols.Clear();
-                    this.methodSymbols = null;
-                    foreach (IDiaSymbol typeSymbol in this.typeSymbols.Values)
-                    {
-                        IDiaSymbol symToRelease = typeSymbol;
-                        ReleaseComObject(ref symToRelease);
-                    }
-
-                    this.typeSymbols.Clear();
-                    this.typeSymbols = null;
-                    ReleaseComObject(ref this.session);
-                    ReleaseComObject(ref this.source);
+                    IDiaSymbol? symToRelease = methodSymbol;
+                    ReleaseComObject(ref symToRelease);
                 }
 
-                this.isDisposed = true;
+                methodSymbolsForType.Clear();
+            }
+
+            _methodSymbols.Clear();
+            foreach (IDiaSymbol typeSymbol in _typeSymbols.Values)
+            {
+                IDiaSymbol? symToRelease = typeSymbol;
+                ReleaseComObject(ref symToRelease);
             }
+
+            _typeSymbols.Clear();
+            ReleaseComObject(ref _session);
+            ReleaseComObject(ref _source);
         }
+
+        _isDisposed = true;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationData.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationData.cs
index 9b1a88418f..564751b6a2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationData.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationData.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+
+/// <summary>
+/// Stores the navigation data associated with the .exe/.dll file
+/// </summary>
+public interface INavigationData
 {
     /// <summary>
-    /// Stores the navigation data associated with the .exe/.dll file
+    /// Gets or sets the file name of the file containing the method being navigated.
     /// </summary>
-    public interface INavigationData
-    {
-        /// <summary>
-        /// Gets or sets the file name of the file containing the method being navigated.
-        /// </summary>
-        string FileName { get; set; }
+    string? FileName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the min line number of the method being navigated in the file.
-        /// </summary>
-        int MinLineNumber { get; set; }
+    /// <summary>
+    /// Gets or sets the min line number of the method being navigated in the file.
+    /// </summary>
+    int MinLineNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the max line number of the method being navigated in the file.
-        /// </summary>
-        int MaxLineNumber { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the max line number of the method being navigated in the file.
+    /// </summary>
+    int MaxLineNumber { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationSession.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationSession.cs
index f5a2cee0e6..70e2f26706 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationSession.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/INavigationSession.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
 
+/// <summary>
+/// Manages the debug data associated with the .exe/.dll file
+/// </summary>
+public interface INavigationSession : IDisposable
+{
     /// <summary>
-    /// Manages the debug data associated with the .exe/.dll file
+    /// Gets the navigation data for a method.
     /// </summary>
-    public interface INavigationSession : IDisposable
-    {
-        /// <summary>
-        /// Gets the navigation data for a method.
-        /// </summary>
-        /// <param name="declaringTypeName"> The declaring type name. </param>
-        /// <param name="methodName"> The method name. </param>
-        /// <returns> The <see cref="INavigationData"/> to get to the method. </returns>
-        INavigationData GetNavigationDataForMethod(string declaringTypeName, string methodName);
-    }
+    /// <param name="declaringTypeName"> The declaring type name. </param>
+    /// <param name="methodName"> The method name. </param>
+    /// <returns> The <see cref="INavigationData"/> to get to the method. </returns>
+    INavigationData? GetNavigationDataForMethod(string declaringTypeName, string methodName);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/ISymbolReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/ISymbolReader.cs
index 6aa582b52a..286a5baa3b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/ISymbolReader.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/ISymbolReader.cs
@@ -1,39 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
 
+/// <summary>
+/// Caches filename and line number for symbols in assembly.
+/// </summary>
+internal interface ISymbolReader : IDisposable
+{
     /// <summary>
-    /// Caches filename and line number for symbols in assembly.
+    /// Cache symbols from binary path
     /// </summary>
-    internal interface ISymbolReader : IDisposable
-    {
-        /// <summary>
-        /// Cache symbols from binary path
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
-        /// </param>
-        /// <param name="searchPath">
-        /// search path.
-        /// </param>
-        void CacheSymbols(string binaryPath, string searchPath);
+    /// <param name="binaryPath">
+    /// The binary path is assembly path Ex: \path\to\bin\Debug\simpleproject.dll
+    /// </param>
+    /// <param name="searchPath">
+    /// search path.
+    /// </param>
+    void CacheSymbols(string binaryPath, string? searchPath);
 
-        /// <summary>
-        /// Gets Navigation data from caches
-        /// </summary>
-        /// <param name="declaringTypeName">
-        /// Type name Ex: MyNameSpace.MyType
-        /// </param>
-        /// <param name="methodName">
-        /// Method name in declaringTypeName Ex: Method1
-        /// </param>
-        /// <returns>
-        /// <see cref="INavigationData"/>.
-        /// Returns INavigationData which contains file name and line number.
-        /// </returns>
-        INavigationData GetNavigationData(string declaringTypeName, string methodName);
-    }
+    /// <summary>
+    /// Gets Navigation data from caches
+    /// </summary>
+    /// <param name="declaringTypeName">
+    /// Type name Ex: MyNameSpace.MyType
+    /// </param>
+    /// <param name="methodName">
+    /// Method name in declaringTypeName Ex: Method1
+    /// </param>
+    /// <returns>
+    /// <see cref="INavigationData"/>.
+    /// Returns INavigationData which contains file name and line number.
+    /// </returns>
+    INavigationData? GetNavigationData(string declaringTypeName, string methodName);
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/NativeMethods.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/NativeMethods.cs
index 8987e22311..3b59e05659 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/NativeMethods.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/NativeMethods.cs
@@ -1,642 +1,639 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-// ReSharper disable StyleCop.SA1602
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
-{
-    using System;
-    using System.IO;
-    using System.Runtime.InteropServices;
-    using PlatformAbstractions;
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
 
-    internal static class HResult
-    {
-        public static bool Failed(int hr)
-        {
-            return hr < 0;
-        }
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-        public static bool Succeeded(int hr)
-        {
-            return !Failed(hr);
-        }
-    }
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
 
-    /// <summary>
-    /// Some GUID constants we use to instantiate COM objects.
-    /// </summary>
-    internal static class Guids
+internal static class HResult
+{
+    public static bool Failed(int hr)
     {
-        internal static Guid CLSID_DiaSource = new Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D");
+        return hr < 0;
     }
 
-    /// <summary>
-    /// DIA's IDiaEnumLineNumbers used for enumerating a symbol's line numbers.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("FE30E878-54AC-44f1-81BA-39DE940F6052")]
-    internal interface IDiaEnumLineNumbers
+    public static bool Succeeded(int hr)
     {
-        int Stub1();
-
-        [PreserveSig]
-        int GetCount(out uint count);
-
-        [PreserveSig]
-        int GetItem(uint index, out IDiaLineNumber line);
+        return !Failed(hr);
+    }
+}
 
-        [PreserveSig]
-        int GetNext(uint celt, out IDiaLineNumber rgelt, out uint pceltFetched);
+/// <summary>
+/// Some GUID constants we use to instantiate COM objects.
+/// </summary>
+internal static class Guids
+{
+    internal static Guid CLSID_DiaSource = new("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D");
+}
 
-        int Stub5();
+/// <summary>
+/// DIA's IDiaEnumLineNumbers used for enumerating a symbol's line numbers.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("FE30E878-54AC-44f1-81BA-39DE940F6052")]
+internal interface IDiaEnumLineNumbers
+{
+    int Stub1();
 
-        int Stub6();
+    [PreserveSig]
+    int GetCount(out uint count);
 
-        int Stub7();
-    }
+    [PreserveSig]
+    int GetItem(uint index, out IDiaLineNumber line);
 
-    /// <summary>
-    /// DIA's IDiaLineNumber used for retrieving line information.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("B388EB14-BE4D-421d-A8A1-6CF7AB057086")]
-    internal interface IDiaLineNumber
-    {
-        int Stub1();
+    [PreserveSig]
+    int GetNext(uint celt, out IDiaLineNumber rgelt, out uint pceltFetched);
 
-        [PreserveSig]
-        int GetSourceFile(out IDiaSourceFile file);
+    int Stub5();
 
-        [PreserveSig]
-        int GetLineNumber(out uint line);
+    int Stub6();
 
-        [PreserveSig]
-        int GetLineNumberEnd(out uint line);
+    int Stub7();
+}
 
-        [PreserveSig]
-        int GetColumnNumber(out uint line);
+/// <summary>
+/// DIA's IDiaLineNumber used for retrieving line information.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("B388EB14-BE4D-421d-A8A1-6CF7AB057086")]
+internal interface IDiaLineNumber
+{
+    int Stub1();
 
-        int Stub6();
+    [PreserveSig]
+    int GetSourceFile(out IDiaSourceFile file);
 
-        int Stub7();
+    [PreserveSig]
+    int GetLineNumber(out uint line);
 
-        int Stub8();
+    [PreserveSig]
+    int GetLineNumberEnd(out uint line);
 
-        int Stub9();
+    [PreserveSig]
+    int GetColumnNumber(out uint line);
 
-        int Stub10();
+    int Stub6();
 
-        int Stub11();
+    int Stub7();
 
-        int Stub12();
+    int Stub8();
 
-        int Stub13();
+    int Stub9();
 
-        int Stub14();
-    }
+    int Stub10();
 
-    /// <summary>
-    /// DIA's IDiaSession used for locating symbols.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("2F609EE1-D1C8-4E24-8288-3326BADCD211")]
-    internal interface IDiaSession
-    {
-        int Stub1();
+    int Stub11();
 
-        int Stub2();
+    int Stub12();
 
-        [PreserveSig]
-        int GetGlobalScope(out IDiaSymbol diaSymbol);
+    int Stub13();
 
-        int Stub4();
+    int Stub14();
+}
 
-        int Stub5();
+/// <summary>
+/// DIA's IDiaSession used for locating symbols.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("2F609EE1-D1C8-4E24-8288-3326BADCD211")]
+internal interface IDiaSession
+{
+    int Stub1();
 
-        int Stub6();
+    int Stub2();
 
-        int Stub7();
+    [PreserveSig]
+    int GetGlobalScope(out IDiaSymbol diaSymbol);
 
-        int Stub8();
+    int Stub4();
 
-        int Stub9();
+    int Stub5();
 
-        int Stub10();
+    int Stub6();
 
-        int Stub11();
+    int Stub7();
 
-        int Stub12();
+    int Stub8();
 
-        int Stub13();
+    int Stub9();
 
-        [PreserveSig]
-        int FindSymbolByToken(uint token, SymTagEnum tag, out IDiaSymbol symbol);
+    int Stub10();
 
-        int Stub15();
+    int Stub11();
 
-        int Stub16();
+    int Stub12();
 
-        int Stub17();
+    int Stub13();
 
-        int Stub18();
+    [PreserveSig]
+    int FindSymbolByToken(uint token, SymTagEnum tag, out IDiaSymbol symbol);
 
-        int Stub19();
+    int Stub15();
 
-        int Stub20();
+    int Stub16();
 
-        int Stub21();
+    int Stub17();
 
-        [PreserveSig]
-        int FindLinesByAddress(uint section, uint offset, uint length, out IDiaEnumLineNumbers enumerator);
+    int Stub18();
 
-        int Stub23();
+    int Stub19();
 
-        int Stub24();
+    int Stub20();
 
-        int Stub25();
+    int Stub21();
 
-        int Stub26();
+    [PreserveSig]
+    int FindLinesByAddress(uint section, uint offset, uint length, out IDiaEnumLineNumbers enumerator);
 
-        int Stub27();
-    }
+    int Stub23();
 
-    /// <summary>
-    /// DIA's IDiaSourceFile used for getting source filenames.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("A2EF5353-F5A8-4eb3-90D2-CB526ACB3CDD")]
-    internal interface IDiaSourceFile
-    {
-        int Stub1();
+    int Stub24();
 
-        [PreserveSig]
-        int GetFilename([MarshalAs(UnmanagedType.BStr)] out string filename);
+    int Stub25();
 
-        int Stub3();
+    int Stub26();
 
-        int Stub4();
+    int Stub27();
+}
 
-        int Stub5();
-    }
+/// <summary>
+/// DIA's IDiaSourceFile used for getting source filenames.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("A2EF5353-F5A8-4eb3-90D2-CB526ACB3CDD")]
+internal interface IDiaSourceFile
+{
+    int Stub1();
 
-    /// <summary>
-    /// Represents the DIA symbol tags.
-    /// </summary>
-    internal enum SymTagEnum : uint
-    {
-        SymTagNull,
-        SymTagExe,
-        SymTagCompiland,
-        SymTagCompilandDetails,
-        SymTagCompilandEnv,
-        SymTagFunction,
-        SymTagBlock,
-        SymTagData,
-        SymTagAnnotation,
-        SymTagLabel,
-        SymTagPublicSymbol,
-        SymTagUDT,
-        SymTagEnum,
-        SymTagFunctionType,
-        SymTagPointerType,
-        SymTagArrayType,
-        SymTagBaseType,
-        SymTagTypedef,
-        SymTagBaseClass,
-        SymTagFriend,
-        SymTagFunctionArgType,
-        SymTagFuncDebugStart,
-        SymTagFuncDebugEnd,
-        SymTagUsingNamespace,
-        SymTagVTableShape,
-        SymTagVTable,
-        SymTagCustom,
-        SymTagThunk,
-        SymTagCustomType,
-        SymTagManagedType,
-        SymTagDimension
-    }
+    [PreserveSig]
+    int GetFilename([MarshalAs(UnmanagedType.BStr)] out string filename);
 
-    /// <summary>
-    /// DIA's IDiaSymbol used for getting the address of function symbols.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("cb787b2f-bd6c-4635-ba52-933126bd2dcd")]
-    internal interface IDiaSymbol
-    {
-        int Stub1();
+    int Stub3();
 
-        [PreserveSig]
-        int GetSymTag(out SymTagEnum tag);
+    int Stub4();
 
-        int GetName(out string name);
+    int Stub5();
+}
 
-        int Stub4();
+/// <summary>
+/// Represents the DIA symbol tags.
+/// </summary>
+internal enum SymTagEnum : uint
+{
+    SymTagNull,
+    SymTagExe,
+    SymTagCompiland,
+    SymTagCompilandDetails,
+    SymTagCompilandEnv,
+    SymTagFunction,
+    SymTagBlock,
+    SymTagData,
+    SymTagAnnotation,
+    SymTagLabel,
+    SymTagPublicSymbol,
+    SymTagUDT,
+    SymTagEnum,
+    SymTagFunctionType,
+    SymTagPointerType,
+    SymTagArrayType,
+    SymTagBaseType,
+    SymTagTypedef,
+    SymTagBaseClass,
+    SymTagFriend,
+    SymTagFunctionArgType,
+    SymTagFuncDebugStart,
+    SymTagFuncDebugEnd,
+    SymTagUsingNamespace,
+    SymTagVTableShape,
+    SymTagVTable,
+    SymTagCustom,
+    SymTagThunk,
+    SymTagCustomType,
+    SymTagManagedType,
+    SymTagDimension
+}
 
-        int Stub5();
+/// <summary>
+/// DIA's IDiaSymbol used for getting the address of function symbols.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("cb787b2f-bd6c-4635-ba52-933126bd2dcd")]
+internal interface IDiaSymbol
+{
+    int Stub1();
 
-        int Stub6();
+    [PreserveSig]
+    int GetSymTag(out SymTagEnum tag);
 
-        int Stub7();
+    int GetName(out string name);
 
-        int Stub8();
+    int Stub4();
 
-        [PreserveSig]
-        int GetAddressSection(out uint section);
+    int Stub5();
 
-        [PreserveSig]
-        int GetAddressOffset(out uint offset);
+    int Stub6();
 
-        int Stub11();
+    int Stub7();
 
-        int Stub12();
+    int Stub8();
 
-        int Stub13();
+    [PreserveSig]
+    int GetAddressSection(out uint section);
 
-        int Stub14();
+    [PreserveSig]
+    int GetAddressOffset(out uint offset);
 
-        [PreserveSig]
-        int GetLength(out long length);
+    int Stub11();
 
-        int Stub16();
+    int Stub12();
 
-        int Stub17();
+    int Stub13();
 
-        int Stub18();
+    int Stub14();
 
-        int Stub19();
+    [PreserveSig]
+    int GetLength(out long length);
 
-        int Stub20();
+    int Stub16();
 
-        int Stub21();
+    int Stub17();
 
-        int Stub22();
+    int Stub18();
 
-        int Stub23();
+    int Stub19();
 
-        int Stub24();
+    int Stub20();
 
-        int Stub25();
+    int Stub21();
 
-        int Stub26();
+    int Stub22();
 
-        int Stub27();
+    int Stub23();
 
-        int Stub28();
+    int Stub24();
 
-        int Stub29();
+    int Stub25();
 
-        int Stub30();
+    int Stub26();
 
-        int Stub31();
+    int Stub27();
 
-        int Stub32();
+    int Stub28();
 
-        int Stub33();
+    int Stub29();
 
-        int Stub34();
+    int Stub30();
 
-        int Stub35();
+    int Stub31();
 
-        int Stub36();
+    int Stub32();
 
-        int Stub37();
+    int Stub33();
 
-        int Stub38();
+    int Stub34();
 
-        int Stub39();
+    int Stub35();
 
-        int Stub40();
+    int Stub36();
 
-        int Stub41();
+    int Stub37();
 
-        int Stub42();
+    int Stub38();
 
-        int Stub43();
+    int Stub39();
 
-        int Stub44();
+    int Stub40();
 
-        int Stub45();
+    int Stub41();
 
-        int Stub46();
+    int Stub42();
 
-        int Stub47();
+    int Stub43();
 
-        int Stub48();
+    int Stub44();
 
-        int Stub49();
+    int Stub45();
 
-        int Stub50();
+    int Stub46();
 
-        int Stub51();
+    int Stub47();
 
-        int Stub52();
+    int Stub48();
 
-        int Stub53();
+    int Stub49();
 
-        int Stub54();
+    int Stub50();
 
-        int Stub55();
+    int Stub51();
 
-        int Stub56();
+    int Stub52();
 
-        int Stub57();
+    int Stub53();
 
-        int Stub58();
+    int Stub54();
 
-        int Stub59();
+    int Stub55();
 
-        int Stub60();
+    int Stub56();
 
-        int Stub61();
+    int Stub57();
 
-        int Stub62();
+    int Stub58();
 
-        int Stub63();
+    int Stub59();
 
-        int Stub64();
+    int Stub60();
 
-        int Stub65();
+    int Stub61();
 
-        int Stub66();
+    int Stub62();
 
-        int Stub67();
+    int Stub63();
 
-        int Stub68();
+    int Stub64();
 
-        int Stub69();
+    int Stub65();
 
-        int Stub70();
+    int Stub66();
 
-        int Stub71();
+    int Stub67();
 
-        int Stub72();
+    int Stub68();
 
-        int Stub73();
+    int Stub69();
 
-        int Stub74();
+    int Stub70();
 
-        int Stub75();
+    int Stub71();
 
-        int Stub76();
+    int Stub72();
 
-        int Stub77();
+    int Stub73();
 
-        int Stub78();
+    int Stub74();
 
-        int Stub79();
+    int Stub75();
 
-        int Stub80();
+    int Stub76();
 
-        int Stub81();
+    int Stub77();
 
-        int Stub82();
+    int Stub78();
 
-        [PreserveSig]
-        int FindChildren(SymTagEnum tag, string str, int flags, out IDiaEnumSymbols symbol);
+    int Stub79();
 
-        int Stub84();
+    int Stub80();
 
-        int Stub85();
+    int Stub81();
 
-        int Stub86();
+    int Stub82();
 
-        int Stub87();
+    [PreserveSig]
+    int FindChildren(SymTagEnum tag, string? str, int flags, out IDiaEnumSymbols symbol);
 
-        int Stub88();
+    int Stub84();
 
-        int Stub89();
+    int Stub85();
 
-        int Stub90();
+    int Stub86();
 
-        int Stub91();
+    int Stub87();
 
-        int Stub92();
+    int Stub88();
 
-        int Stub93();
+    int Stub89();
 
-        int Stub94();
+    int Stub90();
 
-        int Stub95();
+    int Stub91();
 
-        int Stub96();
+    int Stub92();
 
-        int Stub97();
+    int Stub93();
 
-        int Stub98();
+    int Stub94();
 
-        int Stub99();
+    int Stub95();
 
-        int Stub100();
+    int Stub96();
 
-        int Stub101();
+    int Stub97();
 
-        int Stub102();
+    int Stub98();
 
-        int Stub103();
+    int Stub99();
 
-        int Stub104();
+    int Stub100();
 
-        int Stub105();
+    int Stub101();
 
-        int Stub106();
+    int Stub102();
 
-        int Stub107();
+    int Stub103();
 
-        int Stub108();
+    int Stub104();
 
-        int Stub109();
+    int Stub105();
 
-        int Stub110();
+    int Stub106();
 
-        int Stub111();
+    int Stub107();
 
-        int Stub112();
+    int Stub108();
 
-        int Stub113();
+    int Stub109();
 
-        int Stub114();
+    int Stub110();
 
-        int Stub115();
+    int Stub111();
 
-        int Stub116();
+    int Stub112();
 
-        int Stub117();
+    int Stub113();
 
-        int Stub118();
+    int Stub114();
 
-        int Stub119();
+    int Stub115();
 
-        int Stub120();
+    int Stub116();
 
-        int Stub121();
+    int Stub117();
 
-        int Stub122();
+    int Stub118();
 
-        int Stub123();
+    int Stub119();
 
-        int Stub124();
+    int Stub120();
 
-        int Stub125();
+    int Stub121();
 
-        int Stub126();
+    int Stub122();
 
-        int Stub127();
+    int Stub123();
 
-        int Stub128();
+    int Stub124();
 
-        int Stub129();
+    int Stub125();
 
-        int Stub130();
+    int Stub126();
 
-        int Stub131();
+    int Stub127();
 
-        int Stub132();
+    int Stub128();
 
-        int Stub133();
+    int Stub129();
 
-        int Stub134();
+    int Stub130();
 
-        int Stub135();
+    int Stub131();
 
-        int Stub136();
+    int Stub132();
 
-        int Stub137();
+    int Stub133();
 
-        int Stub138();
+    int Stub134();
 
-        int Stub139();
+    int Stub135();
 
-        int Stub140();
+    int Stub136();
 
-        int Stub141();
+    int Stub137();
 
-        int Stub142();
+    int Stub138();
 
-        int Stub143();
+    int Stub139();
 
-        int Stub144();
+    int Stub140();
 
-        int Stub145();
+    int Stub141();
 
-        int Stub146();
+    int Stub142();
 
-        int Stub147();
+    int Stub143();
 
-        int Stub148();
+    int Stub144();
 
-        int Stub149();
+    int Stub145();
 
-        int Stub150();
+    int Stub146();
 
-        int Stub151();
+    int Stub147();
 
-        int Stub152();
+    int Stub148();
 
-        int Stub153();
+    int Stub149();
 
-        int Stub154();
+    int Stub150();
 
-        int Stub155();
-    }
+    int Stub151();
 
-    // The definition for DiaSource COM object is present InternalApis\vctools\inc\dia2.h
-    // The GUID here must match what is present in dia2.h
-    [ComImport, CoClass(typeof(DiaSourceClass)), Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D")]
-    internal interface DiaSource : IDiaDataSource
-    {
-    }
+    int Stub152();
 
-    // The definition for DiaSourceClass COM object is present InternalApis\vctools\inc\dia2.h
-    // The GUID here must match what is present in dia2.h
-    [ComImport, ClassInterface((short)0), Guid("E6756135-1E65-4D17-8576-610761398C3C")]
-    internal class DiaSourceClass
-    {
-    }
+    int Stub153();
 
-    internal static class DiaSourceObject
-    {
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hReservedNull, int dwFlags);
+    int Stub154();
 
-        public static IDiaDataSource GetDiaSourceObject()
-        {
-            var nativeDllDirectory = new ProcessHelper().GetNativeDllDirectory();
+    int Stub155();
+}
 
-            IntPtr modHandle = LoadLibraryEx(Path.Combine(nativeDllDirectory, "msdia140.dll"), IntPtr.Zero, 0);
+// The definition for DiaSource COM object is present InternalApis\vctools\inc\dia2.h
+// The GUID here must match what is present in dia2.h
+[ComImport, CoClass(typeof(DiaSourceClass)), Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "COM interface.")]
+internal interface DiaSource : IDiaDataSource
+{
+}
 
-            if (modHandle == IntPtr.Zero)
-            {
-                throw new COMException(string.Format(Resources.Resources.FailedToLoadMsDia));
-            }
+// The definition for DiaSourceClass COM object is present InternalApis\vctools\inc\dia2.h
+// The GUID here must match what is present in dia2.h
+[ComImport, ClassInterface((short)0), Guid("E6756135-1E65-4D17-8576-610761398C3C")]
+internal class DiaSourceClass
+{
+}
 
-            var diaSourceClassGuid = new Guid("{E6756135-1E65-4D17-8576-610761398C3C}");
-            var comClassFactory = (IClassFactory)DllGetClassObject(diaSourceClassGuid, new Guid("00000001-0000-0000-C000-000000000046"));
+internal static class DiaSourceObject
+{
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hReservedNull, int dwFlags);
 
-            Guid iDataDataSourceGuid = new Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D");
-            comClassFactory.CreateInstance(null, ref iDataDataSourceGuid, out object comObject);
-            return (comObject as IDiaDataSource);
-        }
+    public static IDiaDataSource? GetDiaSourceObject()
+    {
+        var nativeDllDirectory = new ProcessHelper().GetNativeDllDirectory();
 
-        #region Private
+        IntPtr modHandle = LoadLibraryEx(Path.Combine(nativeDllDirectory, "msdia140.dll"), IntPtr.Zero, 0);
 
-        [ComImport, ComVisible(false), Guid("00000001-0000-0000-C000-000000000046"),
-         InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        private interface IClassFactory
+        if (modHandle == IntPtr.Zero)
         {
-            void CreateInstance(
-                [MarshalAs(UnmanagedType.Interface)] object aggregator,
-                ref Guid refiid,
-                [MarshalAs(UnmanagedType.Interface)] out object createdObject);
-
-            void LockServer(bool incrementRefCount);
+            throw new COMException(Resources.Resources.FailedToLoadMsDia);
         }
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        [DllImport("msdia140.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern object DllGetClassObject(
-            [In, MarshalAs(UnmanagedType.LPStruct)] Guid rclsid,
-            [In, MarshalAs(UnmanagedType.LPStruct)] Guid riid);
+        var diaSourceClassGuid = new Guid("{E6756135-1E65-4D17-8576-610761398C3C}");
+        var comClassFactory = (IClassFactory)DllGetClassObject(diaSourceClassGuid, new Guid("00000001-0000-0000-C000-000000000046"));
 
-        #endregion
+        Guid iDataDataSourceGuid = new("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D");
+        comClassFactory.CreateInstance(null, ref iDataDataSourceGuid, out object comObject);
+        return (comObject as IDiaDataSource);
     }
 
-    /// <summary>
-    /// DIA's IDiaDataSource used for opening symbols.
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D")]
-    internal interface IDiaDataSource
+    [ComImport, ComVisible(false), Guid("00000001-0000-0000-C000-000000000046"),
+     InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IClassFactory
     {
-        int Stub1();
+        void CreateInstance(
+            [MarshalAs(UnmanagedType.Interface)] object? aggregator,
+            ref Guid refiid,
+            [MarshalAs(UnmanagedType.Interface)] out object createdObject);
 
-        int Stub2();
+        void LockServer(bool incrementRefCount);
+    }
 
-        int Stub3();
+    [return: MarshalAs(UnmanagedType.Interface)]
+    [DllImport("msdia140.dll", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
+    internal static extern object DllGetClassObject(
+        [In, MarshalAs(UnmanagedType.LPStruct)] Guid rclsid,
+        [In, MarshalAs(UnmanagedType.LPStruct)] Guid riid);
 
-        [PreserveSig]
-        int LoadDataForExe(
-            [MarshalAs(UnmanagedType.LPWStr)] string executable,
-            [MarshalAs(UnmanagedType.LPWStr)] string searchPath,
-            IntPtr callback);
+}
 
-        int Stub5();
+/// <summary>
+/// DIA's IDiaDataSource used for opening symbols.
+/// </summary>
+[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("79F1BB5F-B66E-48E5-B6A9-1545C323CA3D")]
+internal interface IDiaDataSource
+{
+    int Stub1();
 
-        [PreserveSig]
-        int OpenSession(out IDiaSession session);
-    }
+    int Stub2();
 
-    [ComImport, Guid("CAB72C48-443B-48F5-9B0B-42F0820AB29A"), InterfaceType(1)]
-    internal interface IDiaEnumSymbols
-    {
-        int Stub1();
+    int Stub3();
 
-        [PreserveSig]
-        int GetCount(out uint count);
+    [PreserveSig]
+    int LoadDataForExe(
+        [MarshalAs(UnmanagedType.LPWStr)] string executable,
+        [MarshalAs(UnmanagedType.LPWStr)] string? searchPath,
+        IntPtr callback);
 
-        [PreserveSig]
-        int GetItem(uint index, out IDiaSymbol symbol);
+    int Stub5();
 
-        int GetNext(uint index, out IDiaSymbol symbol, out uint pceltFetched);
+    [PreserveSig]
+    int OpenSession(out IDiaSession session);
+}
+
+[ComImport, Guid("CAB72C48-443B-48F5-9B0B-42F0820AB29A"), InterfaceType(1)]
+internal interface IDiaEnumSymbols
+{
+    int Stub1();
 
-        int Stub5();
+    [PreserveSig]
+    int GetCount(out uint count);
 
-        int Stub6();
+    [PreserveSig]
+    int GetItem(uint index, out IDiaSymbol symbol);
 
-        int Stub7();
-    }
+    int GetNext(uint index, out IDiaSymbol symbol, out uint pceltFetched);
+
+    int Stub5();
+
+    int Stub6();
+
+    int Stub7();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortablePdbReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortablePdbReader.cs
index 7bda8a6e56..7b0e8ddad9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortablePdbReader.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortablePdbReader.cs
@@ -1,168 +1,178 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.Metadata.Ecma335;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+
+/// <summary>
+/// The portable pdb reader.
+/// </summary>
+internal class PortablePdbReader : IDisposable
 {
-    using System;
-    using System.IO;
-    using System.Reflection;
-    using System.Reflection.Metadata;
-    using System.Reflection.Metadata.Ecma335;
+    /// <summary>
+    /// Use to get method token
+    /// </summary>
+    private static readonly PropertyInfo MethodInfoMethodTokenProperty =
+        typeof(MethodInfo).GetProperty("MetadataToken")!;
 
     /// <summary>
-    /// The portable pdb reader.
+    /// Metadata reader provider from portable pdb stream
+    /// To get Metadata reader
     /// </summary>
-    internal class PortablePdbReader : IDisposable
-    {
-        /// <summary>
-        /// Use to get method token
-        /// </summary>
-        private static readonly PropertyInfo MethodInfoMethodTokenProperty =
-            typeof(MethodInfo).GetProperty("MetadataToken");
-
-        /// <summary>
-        /// Metadata reader provider from portable pdb stream
-        /// To get Metadata reader
-        /// </summary>
-        private MetadataReaderProvider provider;
-
-        /// <summary>
-        /// Metadata reader from portable pdb stream
-        /// To get method debug info from method info
-        /// </summary>
-        private MetadataReader reader;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PortablePdbReader"/> class.
-        /// </summary>
-        /// <param name="stream">
-        /// Portable pdb stream
-        /// </param>
-        /// <exception cref="Exception">
-        /// Raises Exception on given stream is not portable pdb stream
-        /// </exception>
-        public PortablePdbReader(Stream stream)
-        {
-            if (!IsPortable(stream))
-            {
-                throw new Exception("Given stream is not portable stream");
-            }
+    private readonly MetadataReaderProvider _provider;
 
-            this.provider = MetadataReaderProvider.FromPortablePdbStream(stream);
-            this.reader = this.provider.GetMetadataReader();
-        }
+    /// <summary>
+    /// Metadata reader from portable pdb stream
+    /// To get method debug info from method info
+    /// </summary>
+    private readonly MetadataReader _reader;
 
-        /// <summary>
-        /// Dispose Metadata reader
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PortablePdbReader"/> class.
+    /// </summary>
+    /// <param name="stream">
+    /// Portable pdb stream
+    /// </param>
+    /// <exception cref="Exception">
+    /// Raises Exception on given stream is not portable pdb stream
+    /// </exception>
+    public PortablePdbReader(Stream stream)
+    {
+        if (!IsPortable(stream))
         {
-            this.provider?.Dispose();
-            this.provider = null;
-            this.reader = null;
+            throw new Exception("Given stream is not portable stream");
         }
 
-        /// <summary>
-        /// Gets dia navigation data from Metadata reader
-        /// </summary>
-        /// <param name="methodInfo">
-        /// Method info.
-        /// </param>
-        /// <returns>
-        /// The <see cref="DiaNavigationData"/>.
-        /// </returns>
-        public DiaNavigationData GetDiaNavigationData(MethodInfo methodInfo)
-        {
-            if (methodInfo == null)
-            {
-                return null;
-            }
+        _provider = MetadataReaderProvider.FromPortablePdbStream(stream);
+        _reader = _provider.GetMetadataReader();
+    }
 
-            var handle = GetMethodDebugInformationHandle(methodInfo);
+    /// <summary>
+    /// Reads the pdb using a provided metadata reader, when the pdb is embedded in the dll, or found by
+    /// path that is in the dll metadata.
+    /// </summary>
+    /// <param name="metadataReaderProvider"></param>
+    public PortablePdbReader(MetadataReaderProvider metadataReaderProvider)
+    {
+        _provider = metadataReaderProvider ?? throw new ArgumentNullException(nameof(metadataReaderProvider));
+        _reader = _provider.GetMetadataReader();
+    }
 
-            return this.GetDiaNavigationData(handle);
-        }
+    /// <summary>
+    /// Dispose Metadata reader
+    /// </summary>
+    public void Dispose()
+    {
+        _provider?.Dispose();
+    }
 
-        /// <summary>
-        /// Checks gives stream is from portable pdb or not
-        /// </summary>
-        /// <param name="stream">
-        /// Stream.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        internal static bool IsPortable(Stream stream)
+    /// <summary>
+    /// Gets dia navigation data from Metadata reader
+    /// </summary>
+    /// <param name="methodInfo">
+    /// Method info.
+    /// </param>
+    /// <returns>
+    /// The <see cref="DiaNavigationData"/>.
+    /// </returns>
+    public DiaNavigationData? GetDiaNavigationData(MethodInfo? methodInfo)
+    {
+        if (methodInfo == null)
         {
-            // First four bytes should be 'BSJB'
-            var result = (stream.ReadByte() == 'B') && (stream.ReadByte() == 'S') && (stream.ReadByte() == 'J')
-                         && (stream.ReadByte() == 'B');
-            stream.Position = 0;
-            return result;
+            return null;
         }
 
-        internal static MethodDebugInformationHandle GetMethodDebugInformationHandle(MethodInfo methodInfo)
-        {
-            var methodToken = (int)MethodInfoMethodTokenProperty.GetValue(methodInfo);
-            var handle = ((MethodDefinitionHandle)MetadataTokens.Handle(methodToken)).ToDebugInformationHandle();
-            return handle;
-        }
+        var handle = GetMethodDebugInformationHandle(methodInfo);
 
-        private static void GetMethodMinAndMaxLineNumber(
-            MethodDebugInformation methodDebugDefinition,
-            out int minLineNumber,
-            out int maxLineNumber)
+        return GetDiaNavigationData(handle);
+    }
+
+    /// <summary>
+    /// Checks gives stream is from portable pdb or not
+    /// </summary>
+    /// <param name="stream">
+    /// Stream.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    internal static bool IsPortable(Stream stream)
+    {
+        // First four bytes should be 'BSJB'
+#pragma warning disable IDE0078 // Use pattern matching (may change code meaning)
+        var result = (stream.ReadByte() == 'B') && (stream.ReadByte() == 'S') && (stream.ReadByte() == 'J')
+                     && (stream.ReadByte() == 'B');
+#pragma warning restore IDE0078 // Use pattern matching (may change code meaning)
+        stream.Position = 0;
+        return result;
+    }
+
+    internal static MethodDebugInformationHandle GetMethodDebugInformationHandle(MethodInfo methodInfo)
+    {
+        var methodToken = (int)MethodInfoMethodTokenProperty.GetValue(methodInfo)!;
+        var handle = ((MethodDefinitionHandle)MetadataTokens.Handle(methodToken)).ToDebugInformationHandle();
+        return handle;
+    }
+
+    private static void GetMethodMinAndMaxLineNumber(
+        MethodDebugInformation methodDebugDefinition,
+        out int minLineNumber,
+        out int maxLineNumber)
+    {
+        minLineNumber = int.MaxValue;
+        maxLineNumber = int.MinValue;
+        var orderedSequencePoints = methodDebugDefinition.GetSequencePoints();
+        foreach (var sequencePoint in orderedSequencePoints)
         {
-            minLineNumber = int.MaxValue;
-            maxLineNumber = int.MinValue;
-            var orderedSequencePoints = methodDebugDefinition.GetSequencePoints();
-            foreach (var sequencePoint in orderedSequencePoints)
+            if (sequencePoint.IsHidden)
             {
-                if (sequencePoint.IsHidden)
-                {
-                    // Special sequence point with startLine is Magic number 0xFEEFEE
-                    // Magic number comes from Potable CodeGen source code
-                    continue;
-                }
-                minLineNumber = Math.Min(minLineNumber, sequencePoint.StartLine);
-                maxLineNumber = Math.Max(maxLineNumber, sequencePoint.StartLine);
+                // Special sequence point with startLine is Magic number 0xFEEFEE
+                // Magic number comes from Potable CodeGen source code
+                continue;
             }
+            minLineNumber = Math.Min(minLineNumber, sequencePoint.StartLine);
+            maxLineNumber = Math.Max(maxLineNumber, sequencePoint.StartLine);
         }
+    }
 
-        private DiaNavigationData GetDiaNavigationData(MethodDebugInformationHandle handle)
+    private DiaNavigationData? GetDiaNavigationData(MethodDebugInformationHandle handle)
+    {
+        if (_reader == null)
         {
-            if (this.reader == null)
-            {
-                throw new ObjectDisposedException(nameof(PortablePdbReader));
-            }
-
-            DiaNavigationData diaNavigationData = null;
-            try
-            {
-                var methodDebugDefinition = this.reader.GetMethodDebugInformation(handle);
-                var fileName = this.GetMethodFileName(methodDebugDefinition);
-                GetMethodMinAndMaxLineNumber(methodDebugDefinition, out var minLineNumber, out var maxLineNumber);
+            throw new ObjectDisposedException(nameof(PortablePdbReader));
+        }
 
-                diaNavigationData = new DiaNavigationData(fileName, minLineNumber, maxLineNumber);
-            }
-            catch (BadImageFormatException exception)
-            {
-                EqtTrace.Error("failed to get dia navigation data: {0}", exception);
-            }
+        DiaNavigationData? diaNavigationData = null;
+        try
+        {
+            var methodDebugDefinition = _reader.GetMethodDebugInformation(handle);
+            var fileName = GetMethodFileName(methodDebugDefinition);
+            GetMethodMinAndMaxLineNumber(methodDebugDefinition, out var minLineNumber, out var maxLineNumber);
 
-            return diaNavigationData;
+            diaNavigationData = new DiaNavigationData(fileName, minLineNumber, maxLineNumber);
         }
-
-        private string GetMethodFileName(MethodDebugInformation methodDebugDefinition)
+        catch (BadImageFormatException exception)
         {
-            var fileName = string.Empty;
-            if (!methodDebugDefinition.Document.IsNil)
-            {
-                var document = this.reader.GetDocument(methodDebugDefinition.Document);
-                fileName = this.reader.GetString(document.Name);
-            }
+            EqtTrace.Error("failed to get dia navigation data: {0}", exception);
+        }
+
+        return diaNavigationData;
+    }
 
-            return fileName;
+    private string GetMethodFileName(MethodDebugInformation methodDebugDefinition)
+    {
+        var fileName = string.Empty;
+        if (!methodDebugDefinition.Document.IsNil)
+        {
+            var document = _reader.GetDocument(methodDebugDefinition.Document);
+            fileName = _reader.GetString(document.Name);
         }
+
+        return fileName;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortableSymbolReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortableSymbolReader.cs
index ba03fecb79..983e7fa3cd 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortableSymbolReader.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Navigation/PortableSymbolReader.cs
@@ -1,152 +1,176 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Reflection.PortableExecutable;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation;
+
+/// <summary>
+///     The portable symbol reader.
+/// </summary>
+internal class PortableSymbolReader : ISymbolReader
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
+    /// <summary>
+    ///     Key in first dict is Type FullName
+    ///     Key in second dict is method name
+    /// </summary>
+    private readonly Dictionary<string, Dictionary<string, DiaNavigationData>> _methodsNavigationDataForType = new();
 
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+    /// <summary>
+    /// The cache symbols.
+    /// </summary>
+    /// <param name="binaryPath">
+    /// The binary path.
+    /// </param>
+    /// <param name="searchPath">
+    /// The search path.
+    /// </param>
+    public void CacheSymbols(string binaryPath, string? searchPath)
+    {
+        PopulateCacheForTypeAndMethodSymbols(binaryPath);
+    }
 
     /// <summary>
-    ///     The portable symbol reader.
+    /// The dispose.
     /// </summary>
-    internal class PortableSymbolReader : ISymbolReader
+    public void Dispose()
     {
-        /// <summary>
-        ///     Key in first dict is Type FullName
-        ///     Key in second dict is method name
-        /// </summary>
-        private Dictionary<string, Dictionary<string, DiaNavigationData>> methodsNavigationDataForType =
-            new Dictionary<string, Dictionary<string, DiaNavigationData>>();
-
-        /// <summary>
-        /// The cache symbols.
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path.
-        /// </param>
-        /// <param name="searchPath">
-        /// The search path.
-        /// </param>
-        public void CacheSymbols(string binaryPath, string searchPath)
+        foreach (var methodsNavigationData in _methodsNavigationDataForType.Values)
         {
-            this.PopulateCacheForTypeAndMethodSymbols(binaryPath);
+            methodsNavigationData.Clear();
         }
 
-        /// <summary>
-        /// The dispose.
-        /// </summary>
-        public void Dispose()
+        _methodsNavigationDataForType.Clear();
+    }
+
+    /// <summary>
+    /// The get navigation data.
+    /// </summary>
+    /// <param name="declaringTypeName">
+    /// The declaring type name.
+    /// </param>
+    /// <param name="methodName">
+    /// The method name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="INavigationData"/>.
+    /// </returns>
+    public INavigationData? GetNavigationData(string declaringTypeName, string methodName)
+    {
+        INavigationData? navigationData = null;
+        if (_methodsNavigationDataForType.ContainsKey(declaringTypeName))
         {
-            foreach (var methodsNavigationData in this.methodsNavigationDataForType.Values)
+            var methodDict = _methodsNavigationDataForType[declaringTypeName];
+            if (methodDict.ContainsKey(methodName))
             {
-                methodsNavigationData.Clear();
+                navigationData = methodDict[methodName];
             }
-
-            this.methodsNavigationDataForType.Clear();
-            this.methodsNavigationDataForType = null;
         }
 
-        /// <summary>
-        /// The get navigation data.
-        /// </summary>
-        /// <param name="declaringTypeName">
-        /// The declaring type name.
-        /// </param>
-        /// <param name="methodName">
-        /// The method name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="INavigationData"/>.
-        /// </returns>
-        public INavigationData GetNavigationData(string declaringTypeName, string methodName)
+        return navigationData;
+    }
+
+    /// <summary>
+    /// The populate cache for type and method symbols.
+    /// </summary>
+    /// <param name="binaryPath">
+    /// The binary path.
+    /// </param>
+    private void PopulateCacheForTypeAndMethodSymbols(string binaryPath)
+    {
+        try
         {
-            INavigationData navigationData = null;
-            if (this.methodsNavigationDataForType.ContainsKey(declaringTypeName))
+            var pdbFilePath = Path.ChangeExtension(binaryPath, ".pdb");
+            using PortablePdbReader pdbReader = File.Exists(pdbFilePath)
+                ? CreatePortablePdbReaderFromExistingPdbFile(pdbFilePath)
+                : CreatePortablePdbReaderFromPEData(binaryPath);
+
+            // At this point, the assembly should be already loaded into the load context. We query for a reference to
+            // find the types and cache the symbol information. Let the loader follow default lookup order instead of
+            // forcing load from a specific path.
+            Assembly asm;
+            try
             {
-                var methodDict = this.methodsNavigationDataForType[declaringTypeName];
-                if (methodDict.ContainsKey(methodName))
-                {
-                    navigationData = methodDict[methodName];
-                }
+                asm = Assembly.Load(new PlatformAssemblyLoadContext().GetAssemblyNameFromPath(binaryPath));
+            }
+            catch (FileNotFoundException)
+            {
+                // fallback when the assembly is not loaded
+                asm = Assembly.LoadFile(binaryPath);
             }
 
-            return navigationData;
-        }
-
-        /// <summary>
-        /// The populate cache for type and method symbols.
-        /// </summary>
-        /// <param name="binaryPath">
-        /// The binary path.
-        /// </param>
-        private void PopulateCacheForTypeAndMethodSymbols(string binaryPath)
-        {
-            try
+            foreach (var type in asm.GetTypes())
             {
-                var pdbFilePath = Path.ChangeExtension(binaryPath, ".pdb");
-                using (var pdbReader = new PortablePdbReader(new FileHelper().GetStream(pdbFilePath, FileMode.Open, FileAccess.Read)))
+                // Get declared method infos
+                var methodInfoList = type.GetTypeInfo().DeclaredMethods;
+                var methodsNavigationData = new Dictionary<string, DiaNavigationData>();
+
+                foreach (var methodInfo in methodInfoList)
                 {
-                    // At this point, the assembly should be already loaded into the load context. We query for a reference to
-                    // find the types and cache the symbol information. Let the loader follow default lookup order instead of
-                    // forcing load from a specific path.
-                    Assembly asm;
-                    try
+                    var diaNavigationData = pdbReader.GetDiaNavigationData(methodInfo);
+                    if (diaNavigationData != null)
                     {
-                        asm = Assembly.Load(new PlatformAssemblyLoadContext().GetAssemblyNameFromPath(binaryPath));
+                        methodsNavigationData[methodInfo.Name] = diaNavigationData;
                     }
-                    catch (FileNotFoundException)
+                    else
                     {
-#if !NETSTANDARD1_3 && !WINDOWS_UWP && !NETCOREAPP1_0
-                        // fallback when the assembly is not loaded
-                        asm = Assembly.LoadFile(binaryPath);
-#else
-                        // fallback is not supported
-                        throw;
-#endif
+                        EqtTrace.Error($"Unable to find source information for method: {methodInfo.Name} type: {type.FullName}");
                     }
+                }
 
-                    foreach (var type in asm.GetTypes())
-                    {
-                        // Get declared method infos
-                        var methodInfoList = type.GetTypeInfo().DeclaredMethods;
-                        var methodsNavigationData = new Dictionary<string, DiaNavigationData>();
-
-                        foreach (var methodInfo in methodInfoList)
-                        {
-                            var diaNavigationData = pdbReader.GetDiaNavigationData(methodInfo);
-                            if (diaNavigationData != null)
-                            {
-                                methodsNavigationData[methodInfo.Name] = diaNavigationData;
-                            }
-                            else
-                            {
-                                EqtTrace.Error(
-                                    string.Format(
-                                        "Unable to find source information for method: {0} type: {1}",
-                                        methodInfo.Name,
-                                        type.FullName));
-                            }
-                        }
-
-                        if (methodsNavigationData.Count != 0)
-                        {
-                            this.methodsNavigationDataForType[type.FullName] = methodsNavigationData;
-                        }
-                    }
+                if (methodsNavigationData.Count != 0)
+                {
+                    _methodsNavigationDataForType[type.FullName!] = methodsNavigationData;
                 }
             }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("PortableSymbolReader: Failed to load symbols for binary: {0}", binaryPath);
-                EqtTrace.Error(ex);
-                this.Dispose();
-                throw;
-            }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("PortableSymbolReader: Failed to load symbols for binary: {0}", binaryPath);
+            EqtTrace.Error(ex);
+            Dispose();
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Reads the pdb data from the dlls itself, either by loading the referenced pdb file, or by reading
+    /// embedded pdb from the dll itself.
+    /// </summary>
+    /// <param name="binaryPath"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    private static PortablePdbReader CreatePortablePdbReaderFromPEData(string binaryPath)
+    {
+        using var dllStream = new FileStream(binaryPath, FileMode.Open, FileAccess.Read);
+        using var peReader = new PEReader(dllStream);
+
+        var hasPdb = peReader.TryOpenAssociatedPortablePdb(binaryPath, pdbPath => new FileStream(pdbPath, FileMode.Open, FileAccess.Read), out var mp, pdbPath: out _);
+
+        // The out parameters don't give additional info about the pdbFile in case it is not found. So we have few reasons to fail:
+        if (!hasPdb)
+        {
+            throw new InvalidOperationException($"Cannot find portable .PDB file for {binaryPath}. This can have multiple reasons:"
+                + "\n- The dll was built with <DebugType>portable</DebugType> and the pdb file is missing (it was deleted, or not moved together with the dll)."
+                + "\n- The dll was built with <DebugType>embedded</DebugType> and there is some unknown error reading the metadata from the dll."
+                + "\n- The sll was built with <DebugType>none</DebugType> and the pdb file was never even emitted during build."
+                + "\n- Additionally if your dll is built with <DebugType>full</DebugType>, see FullPdbReader instead.");
+        }
+
+        TPDebug.Assert(mp is not null, "mp is null");
+        return new PortablePdbReader(mp);
+    }
+
+    private static PortablePdbReader CreatePortablePdbReaderFromExistingPdbFile(string pdbFilePath)
+    {
+        return new PortablePdbReader(new FileHelper().GetStream(pdbFilePath, FileMode.Open, FileAccess.Read));
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/.editorconfig b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/.editorconfig
new file mode 100644
index 0000000000..5e94bf7109
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/.editorconfig
@@ -0,0 +1,153 @@
+; EditorConfig to support per-solution formatting.
+; Use the EditorConfig VS add-in to make this work.
+; http://editorconfig.org/
+
+; This is the default for the codeline.
+root = true
+
+[*]
+; Don't use tabs for indentation.
+indent_style = space
+; (Please don't specify an indent_size here; that has too many unintended consequences.)
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# Spell checker configuration
+spelling_exclusion_path = spelling.dic
+
+; Code files
+[*.{cs}]
+indent_size = 4
+
+; All XML-based file formats
+[*.{config,csproj,nuspec,props,resx,ruleset,targets,vsct,vsixmanifest,xaml,xml,vsmanproj,swixproj}]
+indent_size = 2
+
+; JSON files
+[*.json]
+indent_size = 2
+
+; PowerShell scripts
+[*.{ps1}]
+indent_size = 4
+
+[*.{sh}]
+indent_size = 4
+
+; Dotnet code style settings
+[*.{cs,vb}]
+; Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+
+; IDE0003 Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+; IDE0012 Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+; IDE0013
+dotnet_style_predefined_type_for_member_access = true:warning
+
+; Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+
+; Licence header
+file_header_template = Copyright (c) .NET Foundation. All rights reserved.\nLicensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+; CSharp code style settings
+[*.cs]
+; IDE0007 'var' preferences
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_elsewhere = false:none
+
+; Prefer method-like constructs to have a block body
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+
+; Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
+
+; Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:none
+csharp_style_pattern_matching_over_as_with_null_check = true:none
+csharp_style_inlined_variable_declaration = true:none
+csharp_style_throw_expression = true:none
+csharp_style_conditional_delegate_call = true:suggestion
+
+; Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+
+; Naming styles
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+dotnet_naming_style.camel_case_style.capitalization = camel_case
+
+; Naming rule: async methods end in Async
+dotnet_naming_style.async_method_style.capitalization  = pascal_case
+dotnet_naming_style.async_method_style.required_suffix = Async
+dotnet_naming_symbols.async_method_symbols.applicable_kinds = method
+dotnet_naming_symbols.async_method_symbols.required_modifiers = async
+dotnet_naming_rule.async_methods_rule.severity = suggestion
+dotnet_naming_rule.async_methods_rule.symbols = async_method_symbols
+dotnet_naming_rule.async_methods_rule.style = async_method_style
+
+; Naming rule: Interfaces must be pascal-cased prefixed with I
+dotnet_naming_style.interface_style.capitalization = pascal_case
+dotnet_naming_style.interface_style.required_prefix = I
+dotnet_naming_symbols.interface_symbols.applicable_kinds = interface
+dotnet_naming_symbols.interface_symbols.applicable_accessibilities = *
+dotnet_naming_rule.interfaces_rule.severity = warning
+dotnet_naming_rule.interfaces_rule.symbols  = interface_symbols
+dotnet_naming_rule.interfaces_rule.style = interface_style
+
+; Naming rule: All methods and properties must be pascal-cased
+dotnet_naming_symbols.method_and_property_symbols.applicable_kinds = method,property,class,struct,enum:property,namespace
+dotnet_naming_symbols.method_and_property_symbols.applicable_accessibilities = *
+dotnet_naming_rule.methods_and_properties_rule.severity = warning
+dotnet_naming_rule.methods_and_properties_rule.symbols  = method_and_property_symbols
+dotnet_naming_rule.methods_and_properties_rule.style = pascal_case_style
+
+; Naming rule: Static fields must be pascal-cased
+dotnet_naming_symbols.static_member_symbols.applicable_kinds = field
+dotnet_naming_symbols.static_member_symbols.applicable_accessibilities = *
+dotnet_naming_symbols.static_member_symbols.required_modifiers = static
+dotnet_naming_symbols.const_member_symbols.applicable_kinds = field
+dotnet_naming_symbols.const_member_symbols.applicable_accessibilities = *
+dotnet_naming_symbols.const_member_symbols.required_modifiers = const
+dotnet_naming_rule.static_fields_rule.severity = warning
+dotnet_naming_rule.static_fields_rule.symbols  = static_member_symbols
+dotnet_naming_rule.static_fields_rule.style = pascal_case_style
+
+; Naming rule: Private members must be camel-cased and prefixed with underscore
+dotnet_naming_style.private_member_style.capitalization = camel_case
+dotnet_naming_style.private_member_style.required_prefix = _
+dotnet_naming_symbols.private_field_symbols.applicable_kinds = field,event
+dotnet_naming_symbols.private_field_symbols.applicable_accessibilities = private,protected,internal
+dotnet_naming_rule.private_field_rule.severity = warning
+dotnet_naming_rule.private_field_rule.symbols  = private_field_symbols
+dotnet_naming_rule.private_field_rule.style = private_member_style
+
+; Diagnostics rule: Don't leave unnecessary suppressions
+dotnet_diagnostic.IDE0076.severity = warning
+dotnet_diagnostic.IDE0005.severity = warning
+
+[*.{cs,vb}]
+dotnet_diagnostic.IDE0001.severity = none
+dotnet_diagnostic.IDE0005.severity = none
+dotnet_diagnostic.IDE1006.severity = none
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityCacheKey.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityCacheKey.cs
new file mode 100644
index 0000000000..a3ed7babc2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityCacheKey.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using NuGetClone.Shared;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// Internal cache key used to store framework compatibility.
+    /// </summary>
+    internal readonly struct CompatibilityCacheKey : IEquatable<CompatibilityCacheKey>
+    {
+        public NuGetFramework Target { get; }
+
+        public NuGetFramework Candidate { get; }
+
+        private readonly int _hashCode;
+
+        public CompatibilityCacheKey(NuGetFramework target, NuGetFramework candidate)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (candidate == null)
+            {
+                throw new ArgumentNullException(nameof(candidate));
+            }
+
+            Target = target;
+            Candidate = candidate;
+
+            // This is designed to be cached, just get the hash up front
+            var combiner = new HashCodeCombiner();
+            combiner.AddObject(target);
+            combiner.AddObject(candidate);
+            _hashCode = combiner.CombinedHash;
+        }
+
+        public override int GetHashCode()
+        {
+            return _hashCode;
+        }
+
+        public bool Equals(CompatibilityCacheKey other)
+        {
+            return Target.Equals(other.Target)
+                && Candidate.Equals(other.Candidate);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is CompatibilityCacheKey other && Equals(other);
+        }
+
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.CurrentCulture,
+                "{0} -> {1}",
+                Target.DotNetFrameworkName,
+                Candidate.DotNetFrameworkName);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityMappingComparer.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityMappingComparer.cs
new file mode 100644
index 0000000000..60399ce19f
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityMappingComparer.cs
@@ -0,0 +1,56 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using NuGetClone.Shared;
+
+namespace NuGetClone.Frameworks
+{
+    internal class CompatibilityMappingComparer : IEqualityComparer<OneWayCompatibilityMappingEntry>
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static CompatibilityMappingComparer Instance { get; } = new();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Obsolete("Use singleton CompatibilityMappingComparer.Instance instead")]
+        public CompatibilityMappingComparer()
+        {
+        }
+
+        public bool Equals(OneWayCompatibilityMappingEntry? x, OneWayCompatibilityMappingEntry? y)
+        {
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (ReferenceEquals(x, null)
+                || ReferenceEquals(y, null))
+            {
+                return false;
+            }
+
+            var comparer = FrameworkRangeComparer.Instance;
+
+            return comparer.Equals(x.TargetFrameworkRange, y.TargetFrameworkRange)
+                   && comparer.Equals(x.SupportedFrameworkRange, y.SupportedFrameworkRange);
+        }
+
+        public int GetHashCode(OneWayCompatibilityMappingEntry obj)
+        {
+            if (ReferenceEquals(obj, null))
+            {
+                return 0;
+            }
+
+            var combiner = new HashCodeCombiner();
+            var comparer = FrameworkRangeComparer.Instance;
+
+            combiner.AddObject(comparer.GetHashCode(obj.TargetFrameworkRange));
+            combiner.AddObject(comparer.GetHashCode(obj.SupportedFrameworkRange));
+
+            return combiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityProvider.cs
new file mode 100644
index 0000000000..332bb9cf35
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/CompatibilityProvider.cs
@@ -0,0 +1,260 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    internal class CompatibilityProvider : IFrameworkCompatibilityProvider
+    {
+        private readonly IFrameworkNameProvider _mappings;
+        private readonly FrameworkExpander _expander;
+        private static readonly NuGetFrameworkFullComparer FullComparer = NuGetFrameworkFullComparer.Instance;
+        private readonly ConcurrentDictionary<CompatibilityCacheKey, bool> _cache;
+
+        public CompatibilityProvider(IFrameworkNameProvider mappings)
+        {
+            _mappings = mappings ?? throw new ArgumentNullException(nameof(mappings));
+            _expander = new FrameworkExpander(mappings);
+            _cache = new ConcurrentDictionary<CompatibilityCacheKey, bool>();
+        }
+
+        /// <summary>
+        /// Check if the frameworks are compatible.
+        /// </summary>
+        /// <param name="target">Project framework</param>
+        /// <param name="candidate">Other framework to check against the project framework</param>
+        /// <returns>True if framework supports other</returns>
+        public bool IsCompatible(NuGetFramework target, NuGetFramework candidate)
+        {
+            if (target == null) throw new ArgumentNullException(nameof(target));
+            if (candidate == null) throw new ArgumentNullException(nameof(candidate));
+
+            // check the cache for a solution
+            var cacheKey = new CompatibilityCacheKey(target, candidate);
+
+            if (!_cache.TryGetValue(cacheKey, out bool result))
+            {
+                result = IsCompatibleCore(target, candidate) == true;
+                _cache.TryAdd(cacheKey, result);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Actual compatibility check without caching
+        /// </summary>
+        private bool? IsCompatibleCore(NuGetFramework target, NuGetFramework candidate)
+        {
+            bool? result = null;
+
+            // check if they are the exact same
+            if (FullComparer.Equals(target, candidate))
+            {
+                return true;
+            }
+
+            // special cased frameworks
+            if (!target.IsSpecificFramework
+                || !candidate.IsSpecificFramework)
+            {
+                result = IsSpecialFrameworkCompatible(target, candidate);
+            }
+
+            if (result == null)
+            {
+                if (target.IsPCL || candidate.IsPCL)
+                {
+                    // PCL compat logic
+                    result = IsPCLCompatible(target, candidate);
+                }
+                else
+                {
+                    // regular framework compat check
+                    result = IsCompatibleWithTarget(target, candidate);
+                }
+            }
+
+            return result;
+        }
+
+        private bool? IsSpecialFrameworkCompatible(NuGetFramework target, NuGetFramework candidate)
+        {
+            // TODO: Revist these
+            if (target.IsAny
+                || candidate.IsAny)
+            {
+                return true;
+            }
+
+            if (target.IsUnsupported)
+            {
+                return false;
+            }
+
+            if (candidate.IsAgnostic)
+            {
+                return true;
+            }
+
+            if (candidate.IsUnsupported)
+            {
+                return false;
+            }
+
+            return null;
+        }
+
+        private bool IsPCLCompatible(NuGetFramework target, NuGetFramework candidate)
+        {
+            if (target.IsPCL && !candidate.IsPCL)
+            {
+                return IsCompatibleWithTarget(target, candidate);
+            }
+
+            IEnumerable<NuGetFramework>? targetFrameworks;
+            IEnumerable<NuGetFramework>? candidateFrameworks;
+
+            if (target.IsPCL)
+            {
+                // do not include optional frameworks here since we might be unable to tell what is optional on the other framework
+                if (!_mappings.TryGetPortableFrameworks(target.Profile, includeOptional: false, out targetFrameworks))
+                {
+                    targetFrameworks = Array.Empty<NuGetFramework>();
+                }
+            }
+            else
+            {
+                targetFrameworks = new NuGetFramework[] { target };
+            }
+
+            if (candidate.IsPCL)
+            {
+                // include optional frameworks here, the larger the list the more compatible it is
+                if (!_mappings.TryGetPortableFrameworks(candidate.Profile, includeOptional: true, out candidateFrameworks))
+                {
+                    candidateFrameworks = Array.Empty<NuGetFramework>();
+                }
+            }
+            else
+            {
+                candidateFrameworks = new NuGetFramework[] { candidate };
+            }
+
+            // check if we this is a compatible superset
+            return PCLInnerCompare(targetFrameworks, candidateFrameworks);
+        }
+
+        private bool PCLInnerCompare(IEnumerable<NuGetFramework> targetFrameworks, IEnumerable<NuGetFramework> candidateFrameworks)
+        {
+            // TODO: Does this check need to make sure multiple frameworks aren't matched against a single framework from the other list?
+            return targetFrameworks.Count() <= candidateFrameworks.Count() && targetFrameworks.All(f => candidateFrameworks.Any(ff => IsCompatible(f, ff)));
+        }
+
+        private bool IsCompatibleWithTarget(NuGetFramework target, NuGetFramework candidate)
+        {
+            // find all possible substitutions
+            var targetSet = new List<NuGetFramework>() { target };
+            targetSet.AddRange(_expander.Expand(target));
+
+            var candidateSet = new List<NuGetFramework>() { candidate };
+            candidateSet.AddRange(GetEquivalentFrameworksClosure(candidate));
+
+            // check for compat
+            foreach (var currentCandidate in candidateSet)
+            {
+                if (targetSet.Any(framework => IsCompatibleWithTargetCore(framework, currentCandidate)))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static bool IsCompatibleWithTargetCore(NuGetFramework target, NuGetFramework candidate)
+        {
+            bool result = true;
+            bool isNet6Era = target.IsNet5Era && target.Version.Major >= 6;
+            if (isNet6Era && target.HasPlatform && !NuGetFramework.FrameworkNameComparer.Equals(target, candidate))
+            {
+                if (candidate.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, StringComparison.OrdinalIgnoreCase))
+                {
+                    result = result && StringComparer.OrdinalIgnoreCase.Equals(target.Platform, "android");
+                }
+                else if (candidate.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.Tizen, StringComparison.OrdinalIgnoreCase))
+                {
+                    result = result && StringComparer.OrdinalIgnoreCase.Equals(target.Platform, "tizen");
+                }
+                else
+                {
+                    result = false;
+                }
+            }
+            else
+            {
+                result = NuGetFramework.FrameworkNameComparer.Equals(target, candidate)
+                            && IsVersionCompatible(target.Version, candidate.Version)
+                            && StringComparer.OrdinalIgnoreCase.Equals(target.Profile, candidate.Profile);
+
+                if (target.IsNet5Era && candidate.HasPlatform)
+                {
+                    result = result
+                        && StringComparer.OrdinalIgnoreCase.Equals(target.Platform, candidate.Platform)
+                        && IsVersionCompatible(target.PlatformVersion, candidate.PlatformVersion);
+                }
+            }
+
+
+            return result;
+        }
+
+        private static bool IsVersionCompatible(Version target, Version candidate)
+        {
+            return candidate == FrameworkConstants.EmptyVersion || candidate <= target;
+        }
+
+        /// <summary>
+        /// Find all equivalent frameworks, and their equivalent frameworks.
+        /// Example:
+        /// Mappings:
+        /// A &lt;&#8210;&gt; B
+        /// B &lt;&#8210;&gt; C
+        /// C &lt;&#8210;&gt; D
+        /// For A we need to find B, C, and D so we must retrieve equivalent frameworks for A, B, and C
+        /// also as we discover them.
+        /// </summary>
+        private IEnumerable<NuGetFramework> GetEquivalentFrameworksClosure(NuGetFramework framework)
+        {
+            // add the current framework to the seen list to avoid returning it later
+            var seen = new HashSet<NuGetFramework>() { framework };
+
+            var toExpand = new Stack<NuGetFramework>();
+            toExpand.Push(framework);
+
+            while (toExpand.Count > 0)
+            {
+                var frameworkToExpand = toExpand.Pop();
+
+                if (_mappings.TryGetEquivalentFrameworks(frameworkToExpand, out IEnumerable<NuGetFramework>? compatibleFrameworks))
+                {
+                    foreach (var curFramework in compatibleFrameworks)
+                    {
+                        if (seen.Add(curFramework))
+                        {
+                            yield return curFramework;
+
+                            toExpand.Push(curFramework);
+                        }
+                    }
+                }
+            }
+
+            yield break;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultCompatibilityProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultCompatibilityProvider.cs
new file mode 100644
index 0000000000..ecc59c3ab2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultCompatibilityProvider.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGetClone.Frameworks
+{
+    internal sealed class DefaultCompatibilityProvider : CompatibilityProvider
+    {
+        public DefaultCompatibilityProvider()
+            : base(DefaultFrameworkNameProvider.Instance)
+        {
+        }
+
+        private static IFrameworkCompatibilityProvider? _instance;
+
+        public static IFrameworkCompatibilityProvider Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new DefaultCompatibilityProvider();
+                }
+
+                return _instance;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkMappings.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkMappings.cs
new file mode 100644
index 0000000000..cc943d021a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkMappings.cs
@@ -0,0 +1,665 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    internal sealed class DefaultFrameworkMappings : IFrameworkMappings
+    {
+        private static Lazy<KeyValuePair<string, string>[]> IdentifierSynonymsLazy = new(() =>
+        {
+            return
+            [
+                // .NET
+                new KeyValuePair<string, string>("NETFramework", FrameworkConstants.FrameworkIdentifiers.Net),
+                new KeyValuePair<string, string>(".NET", FrameworkConstants.FrameworkIdentifiers.Net),
+
+                // .NET Core
+                new KeyValuePair<string, string>("NETCore", FrameworkConstants.FrameworkIdentifiers.NetCore),
+
+                // Portable
+                new KeyValuePair<string, string>("NETPortable", FrameworkConstants.FrameworkIdentifiers.Portable),
+
+                // ASP
+                new KeyValuePair<string, string>("asp.net", FrameworkConstants.FrameworkIdentifiers.AspNet),
+                new KeyValuePair<string, string>("asp.netcore", FrameworkConstants.FrameworkIdentifiers.AspNetCore),
+
+                // Mono/Xamarin
+                new KeyValuePair<string, string>("Xamarin.PlayStationThree", FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation3),
+                new KeyValuePair<string, string>("XamarinPlayStationThree", FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation3),
+                new KeyValuePair<string, string>("Xamarin.PlayStationFour", FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation4),
+                new KeyValuePair<string, string>("XamarinPlayStationFour", FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation4),
+                new KeyValuePair<string, string>("XamarinPlayStationVita", FrameworkConstants.FrameworkIdentifiers.XamarinPlayStationVita)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<string, string>> IdentifierSynonyms
+        {
+            get
+            {
+                return IdentifierSynonymsLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<string, string>[]> IdentifierShortNamesLazy = new(() =>
+        {
+            return
+            [
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, "netcoreapp"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetStandardApp, "netstandardapp"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetStandard, "netstandard"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetPlatform, "dotnet"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Net, "net"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetMicro, "netmf"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Silverlight, "sl"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Portable, "portable"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.WindowsPhone, "wp"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.WindowsPhoneApp, "wpa"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Windows, "win"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.AspNet, "aspnet"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.AspNetCore, "aspnetcore"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Native, "native"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, "monoandroid"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.MonoTouch, "monotouch"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.MonoMac, "monomac"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinIOs, "xamarinios"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinMac, "xamarinmac"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation3, "xamarinpsthree"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation4, "xamarinpsfour"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinPlayStationVita, "xamarinpsvita"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinWatchOS, "xamarinwatchos"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinTVOS, "xamarintvos"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinXbox360, "xamarinxboxthreesixty"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.XamarinXboxOne, "xamarinxboxone"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Dnx, "dnx"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.DnxCore, "dnxcore"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NetCore, "netcore"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.WinRT, "winrt"), // legacy
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.UAP, "uap"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.Tizen, "tizen"),
+                new KeyValuePair<string, string>(FrameworkConstants.FrameworkIdentifiers.NanoFramework, "netnano")
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<string, string>> IdentifierShortNames
+        {
+            get
+            {
+                return IdentifierShortNamesLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<FrameworkSpecificMapping[]> ProfileShortNamesLazy = new(() =>
+        {
+            return
+            [
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Net, "Client", "Client"),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Net, "CF", "CompactFramework"),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Net, "Full", string.Empty),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Silverlight, "WP", "WindowsPhone"),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Silverlight, "WP71", "WindowsPhone71")
+            ];
+        });
+
+        public IEnumerable<FrameworkSpecificMapping> ProfileShortNames
+        {
+            get
+            {
+                return ProfileShortNamesLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<NuGetFramework, NuGetFramework>[]> EquivalentFrameworksLazy = new(() =>
+        {
+            return
+            [
+                // UAP 0.0 <-> UAP 10.0
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.EmptyVersion),
+                    FrameworkConstants.CommonFrameworks.UAP10),
+
+                // win <-> win8
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Windows, FrameworkConstants.EmptyVersion),
+                    FrameworkConstants.CommonFrameworks.Win8),
+
+                // win8 <-> netcore45
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.Win8,
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, new Version(4, 5, 0, 0))),
+
+                // netcore45 <-> winrt45
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, new Version(4, 5, 0, 0)),
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WinRT, new Version(4, 5, 0, 0))),
+
+                // netcore <-> netcore45
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, FrameworkConstants.EmptyVersion),
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, new Version(4, 5, 0, 0))),
+
+                // winrt <-> winrt45
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WinRT, FrameworkConstants.EmptyVersion),
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WinRT, new Version(4, 5, 0, 0))),
+
+                // win81 <-> netcore451
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.Win81,
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, new Version(4, 5, 1, 0))),
+
+                // wp <-> wp7
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WindowsPhone, FrameworkConstants.EmptyVersion),
+                    FrameworkConstants.CommonFrameworks.WP7),
+
+                // wp7 <-> f:sl3-wp
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.WP7,
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Silverlight, new Version(3, 0, 0, 0), "WindowsPhone")),
+
+                // wp71 <-> f:sl4-wp71
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WindowsPhone, new Version(7, 1, 0, 0)),
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Silverlight, new Version(4, 0, 0, 0), "WindowsPhone71")),
+
+                // wp8 <-> f:sl8-wp
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.WP8,
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Silverlight, new Version(8, 0, 0, 0), "WindowsPhone")),
+
+                // wp81 <-> f:sl81-wp
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.WP81,
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Silverlight, new Version(8, 1, 0, 0), "WindowsPhone")),
+
+                // wpa <-> wpa81
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WindowsPhoneApp, FrameworkConstants.EmptyVersion),
+                    FrameworkConstants.CommonFrameworks.WPA81),
+
+                // tizen <-> tizen3
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Tizen, FrameworkConstants.EmptyVersion),
+                    FrameworkConstants.CommonFrameworks.Tizen3),
+
+                // dnx <-> dnx45
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.Dnx,
+                    FrameworkConstants.CommonFrameworks.Dnx45),
+
+                // dnxcore <-> dnxcore50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.DnxCore,
+                    FrameworkConstants.CommonFrameworks.DnxCore50),
+
+                // dotnet <-> dotnet50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.DotNet,
+                    FrameworkConstants.CommonFrameworks.DotNet50),
+
+                // TODO: remove these rules post-RC
+                // aspnet <-> aspnet50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.AspNet,
+                    FrameworkConstants.CommonFrameworks.AspNet50),
+
+                // aspnetcore <-> aspnetcore50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.AspNetCore,
+                    FrameworkConstants.CommonFrameworks.AspNetCore50),
+
+                // dnx451 <-> aspnet50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.Dnx45,
+                    FrameworkConstants.CommonFrameworks.AspNet50),
+
+                // dnxcore50 <-> aspnetcore50
+                new KeyValuePair<NuGetFramework, NuGetFramework>(
+                    FrameworkConstants.CommonFrameworks.DnxCore50,
+                    FrameworkConstants.CommonFrameworks.AspNetCore50)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> EquivalentFrameworks
+        {
+            get
+            {
+                return EquivalentFrameworksLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<FrameworkSpecificMapping[]> EquivalentProfilesLazy = new(() =>
+        {
+            return
+            [
+                // The client profile, for the purposes of NuGet, is the same as the full framework
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Net, "Client", string.Empty),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Net, "Full", string.Empty),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.Silverlight, "WindowsPhone71", "WindowsPhone"),
+                new FrameworkSpecificMapping(FrameworkConstants.FrameworkIdentifiers.WindowsPhone, "WindowsPhone71", "WindowsPhone")
+            ];
+        });
+
+        public IEnumerable<FrameworkSpecificMapping> EquivalentProfiles
+        {
+            get
+            {
+                return EquivalentProfilesLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<string, string>[]> SubSetFrameworksLazy = new(() =>
+        {
+            return
+            [
+                // .NET is a subset of DNX
+                new KeyValuePair<string, string>(
+                    FrameworkConstants.FrameworkIdentifiers.Net,
+                    FrameworkConstants.FrameworkIdentifiers.Dnx),
+
+                // NetPlatform is a subset of DNXCore
+                new KeyValuePair<string, string>(
+                    FrameworkConstants.FrameworkIdentifiers.NetPlatform,
+                    FrameworkConstants.FrameworkIdentifiers.DnxCore),
+
+                // NetStandard is a subset of NetStandardApp
+                new KeyValuePair<string, string>(
+                    FrameworkConstants.FrameworkIdentifiers.NetStandard,
+                    FrameworkConstants.FrameworkIdentifiers.NetStandardApp)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<string, string>> SubSetFrameworks
+        {
+            get
+            {
+                return SubSetFrameworksLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<OneWayCompatibilityMappingEntry[]> CompatibilityMappingsLazy = new(() =>
+        {
+            return new[]
+                {
+                    // UAP supports Win81
+                    new OneWayCompatibilityMappingEntry(new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.MaxVersion)),
+                        new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Windows, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Windows, new Version(8, 1, 0, 0)))),
+
+                    // UAP supports WPA81
+                    new OneWayCompatibilityMappingEntry(new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.MaxVersion)),
+                        new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WindowsPhoneApp, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WindowsPhoneApp, new Version(8, 1, 0, 0)))),
+
+                    // UAP supports NetCore50
+                    new OneWayCompatibilityMappingEntry(new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, FrameworkConstants.MaxVersion)),
+                        new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, FrameworkConstants.Version5),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.NetCore, FrameworkConstants.Version5))),
+
+                    // Win projects support WinRT
+                    new OneWayCompatibilityMappingEntry(new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Windows, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.Windows, FrameworkConstants.MaxVersion)),
+                        new FrameworkRange(
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WinRT, FrameworkConstants.EmptyVersion),
+                            new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.WinRT, new Version(4, 5, 0, 0)))),
+
+                    // Tizen3 projects support NETStandard1.6
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Tizen3,
+                        FrameworkConstants.CommonFrameworks.NetStandard16),
+
+                    // Tizen4 projects support NETStandard2.0
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Tizen4,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    // Tizen6 projects support NETStandard2.1
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Tizen6,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    // UAP 10.0.15064.0 projects support NETStandard2.0
+                    CreateStandardMapping(
+                        new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.UAP, new Version(10, 0, 15064, 0)),
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    // NetCoreApp1.0 projects support NetStandard1.6
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCoreApp10,
+                        FrameworkConstants.CommonFrameworks.NetStandard16),
+
+                    // NetCoreApp1.1 projects support NetStandard1.7
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCoreApp11,
+                        FrameworkConstants.CommonFrameworks.NetStandard17),
+
+                    // NetCoreApp2.0 projects support NetStandard2.0
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCoreApp20,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    // NetCoreApp3.0 projects support NetStandard2.1
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCoreApp30,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    // net463 projects support NetStandard2.0
+                    CreateStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net463,
+                        FrameworkConstants.CommonFrameworks.NetStandard20)
+                }
+                .Concat(new[]
+                {
+                    // dnxcore50 -> dotnet5.6, netstandard1.5
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.DnxCore,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard15),
+
+                    // uap -> dotnet5.5, netstandard1.4
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.UAP,
+                        FrameworkConstants.CommonFrameworks.DotNet55,
+                        FrameworkConstants.CommonFrameworks.NetStandard14),
+
+                    // netcore50 -> dotnet5.5, netstandard1.4
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCore50,
+                        FrameworkConstants.CommonFrameworks.DotNet55,
+                        FrameworkConstants.CommonFrameworks.NetStandard14),
+
+                    // wpa81 -> dotnet5.3, netstandard1.2
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.WPA81,
+                        FrameworkConstants.CommonFrameworks.DotNet53,
+                        FrameworkConstants.CommonFrameworks.NetStandard12),
+
+                    // wp8, wp81 -> dotnet5.1, netstandard1.0
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.WP8,
+                        FrameworkConstants.CommonFrameworks.DotNet51,
+                        FrameworkConstants.CommonFrameworks.NetStandard10),
+
+                    // net45 -> dotnet5.2, netstandard1.1
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net45,
+                        FrameworkConstants.CommonFrameworks.DotNet52,
+                        FrameworkConstants.CommonFrameworks.NetStandard11),
+
+                    // net451 -> dotnet5.3, netstandard1.2
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net451,
+                        FrameworkConstants.CommonFrameworks.DotNet53,
+                        FrameworkConstants.CommonFrameworks.NetStandard12),
+
+                    // net46 -> dotnet5.4, netstandard1.3
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net46,
+                        FrameworkConstants.CommonFrameworks.DotNet54,
+                        FrameworkConstants.CommonFrameworks.NetStandard13),
+
+                    // net461 -> dotnet5.5, netstandard2.0
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net461,
+                        FrameworkConstants.CommonFrameworks.DotNet55,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    // net462 -> dotnet5.6, netstandard2.0
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.Net462,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    // netcore45 -> dotnet5.2, netstandard1.1
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCore45,
+                        FrameworkConstants.CommonFrameworks.DotNet52,
+                        FrameworkConstants.CommonFrameworks.NetStandard11),
+
+                    // netcore451 -> dotnet5.3, netstandard1.2
+                    CreateGenerationAndStandardMapping(
+                        FrameworkConstants.CommonFrameworks.NetCore451,
+                        FrameworkConstants.CommonFrameworks.DotNet53,
+                        FrameworkConstants.CommonFrameworks.NetStandard12),
+
+                    // xamarin frameworks
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.MonoAndroid,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.MonoMac,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.MonoTouch,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinIOs,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinMac,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation3,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinPlayStation4,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinPlayStationVita,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinXbox360,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinXboxOne,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard20),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinTVOS,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21),
+
+                    CreateGenerationAndStandardMappingForAllVersions(
+                        FrameworkConstants.FrameworkIdentifiers.XamarinWatchOS,
+                        FrameworkConstants.CommonFrameworks.DotNet56,
+                        FrameworkConstants.CommonFrameworks.NetStandard21)
+                }.SelectMany(mappings => mappings))
+                .ToArray();
+        });
+
+        public IEnumerable<OneWayCompatibilityMappingEntry> CompatibilityMappings
+        {
+            get
+            {
+                return CompatibilityMappingsLazy.Value;
+            }
+        }
+
+        private static OneWayCompatibilityMappingEntry CreateGenerationMapping(
+            NuGetFramework framework,
+            NuGetFramework netPlatform)
+        {
+            return new OneWayCompatibilityMappingEntry(
+                new FrameworkRange(
+                    framework,
+                    new NuGetFramework(framework.Framework, FrameworkConstants.MaxVersion)),
+                new FrameworkRange(
+                    FrameworkConstants.CommonFrameworks.DotNet,
+                    netPlatform));
+        }
+
+        private static OneWayCompatibilityMappingEntry CreateStandardMapping(
+            NuGetFramework framework,
+            NuGetFramework netPlatform)
+        {
+            return new OneWayCompatibilityMappingEntry(
+                new FrameworkRange(
+                    framework,
+                    new NuGetFramework(framework.Framework, FrameworkConstants.MaxVersion)),
+                new FrameworkRange(
+                    FrameworkConstants.CommonFrameworks.NetStandard10,
+                    netPlatform));
+        }
+
+        private static IEnumerable<OneWayCompatibilityMappingEntry> CreateGenerationAndStandardMapping(
+            NuGetFramework framework,
+            NuGetFramework netPlatform,
+            NuGetFramework netStandard)
+        {
+            yield return CreateGenerationMapping(framework, netPlatform);
+            yield return CreateStandardMapping(framework, netStandard);
+        }
+
+        private static IEnumerable<OneWayCompatibilityMappingEntry> CreateGenerationAndStandardMappingForAllVersions(
+            string framework,
+            NuGetFramework netPlatform,
+            NuGetFramework netStandard)
+        {
+            var lowestFramework = new NuGetFramework(framework, FrameworkConstants.EmptyVersion);
+            return CreateGenerationAndStandardMapping(lowestFramework, netPlatform, netStandard);
+        }
+
+        private static readonly Lazy<string[]> NonPackageBasedFrameworkPrecedenceLazy = new(() =>
+        {
+            return
+            [
+                FrameworkConstants.FrameworkIdentifiers.Net,
+                FrameworkConstants.FrameworkIdentifiers.NetCore,
+                FrameworkConstants.FrameworkIdentifiers.Windows,
+                FrameworkConstants.FrameworkIdentifiers.WindowsPhoneApp
+            ];
+        });
+
+        public IEnumerable<string> NonPackageBasedFrameworkPrecedence
+        {
+            get
+            {
+                return NonPackageBasedFrameworkPrecedenceLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<string[]> PackageBasedFrameworkPrecedenceLazy = new(() =>
+        {
+            return
+            [
+                FrameworkConstants.FrameworkIdentifiers.NetCoreApp,
+                FrameworkConstants.FrameworkIdentifiers.NetStandardApp,
+                FrameworkConstants.FrameworkIdentifiers.NetStandard,
+                FrameworkConstants.FrameworkIdentifiers.NetPlatform
+            ];
+        });
+
+        public IEnumerable<string> PackageBasedFrameworkPrecedence
+        {
+            get
+            {
+                return PackageBasedFrameworkPrecedenceLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<string[]> EquivalentFrameworkPrecedenceLazy = new(() =>
+        {
+            return
+            [
+                FrameworkConstants.FrameworkIdentifiers.Windows,
+                FrameworkConstants.FrameworkIdentifiers.NetCore,
+                FrameworkConstants.FrameworkIdentifiers.WinRT,
+
+                FrameworkConstants.FrameworkIdentifiers.WindowsPhone,
+                FrameworkConstants.FrameworkIdentifiers.Silverlight,
+
+                FrameworkConstants.FrameworkIdentifiers.DnxCore,
+                FrameworkConstants.FrameworkIdentifiers.AspNetCore,
+
+                FrameworkConstants.FrameworkIdentifiers.Dnx,
+                FrameworkConstants.FrameworkIdentifiers.AspNet
+            ];
+        });
+
+        public IEnumerable<string> EquivalentFrameworkPrecedence
+        {
+            get
+            {
+                return EquivalentFrameworkPrecedenceLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<NuGetFramework, NuGetFramework>[]> ShortNameReplacementsLazy = new(() =>
+        {
+            return
+            [
+                new KeyValuePair<NuGetFramework, NuGetFramework>(FrameworkConstants.CommonFrameworks.DotNet50, FrameworkConstants.CommonFrameworks.DotNet)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> ShortNameReplacements
+        {
+            get
+            {
+                return ShortNameReplacementsLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<NuGetFramework, NuGetFramework>[]> FullNameReplacementsLazy = new(() =>
+        {
+            return
+            [
+                new KeyValuePair<NuGetFramework, NuGetFramework>(FrameworkConstants.CommonFrameworks.DotNet, FrameworkConstants.CommonFrameworks.DotNet50)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> FullNameReplacements
+        {
+            get
+            {
+                return FullNameReplacementsLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<IFrameworkMappings> InstanceLazy = new(() => new DefaultFrameworkMappings());
+
+        /// <summary>
+        /// Singleton instance of the default framework mappings.
+        /// </summary>
+        public static IFrameworkMappings Instance
+        {
+            get
+            {
+                return InstanceLazy.Value;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkNameProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkNameProvider.cs
new file mode 100644
index 0000000000..2b442392d3
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultFrameworkNameProvider.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace NuGetClone.Frameworks
+{
+    internal sealed class DefaultFrameworkNameProvider : FrameworkNameProvider
+    {
+        public DefaultFrameworkNameProvider()
+            : base(new IFrameworkMappings[] { DefaultFrameworkMappings.Instance },
+                new IPortableFrameworkMappings[] { DefaultPortableFrameworkMappings.Instance })
+        {
+        }
+
+        private static readonly Lazy<IFrameworkNameProvider> InstanceLazy = new(() => new DefaultFrameworkNameProvider());
+
+        public static IFrameworkNameProvider Instance
+        {
+            get { return InstanceLazy.Value; }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultPortableFrameworkMappings.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultPortableFrameworkMappings.cs
new file mode 100644
index 0000000000..bcb22c4a3e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/DefaultPortableFrameworkMappings.cs
@@ -0,0 +1,186 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// Contains the standard portable framework mappings
+    /// </summary>
+    internal class DefaultPortableFrameworkMappings : IPortableFrameworkMappings
+    {
+
+        private static readonly Lazy<KeyValuePair<int, NuGetFramework[]>[]> ProfileFrameworksLazy = new(() =>
+        {
+            var net4 = FrameworkConstants.CommonFrameworks.Net4;
+            var net403 = FrameworkConstants.CommonFrameworks.Net403;
+            var net45 = FrameworkConstants.CommonFrameworks.Net45;
+            var net451 = FrameworkConstants.CommonFrameworks.Net451;
+
+            var win8 = FrameworkConstants.CommonFrameworks.Win8;
+            var win81 = FrameworkConstants.CommonFrameworks.Win81;
+
+            var sl4 = FrameworkConstants.CommonFrameworks.SL4;
+            var sl5 = FrameworkConstants.CommonFrameworks.SL5;
+
+            var wp7 = FrameworkConstants.CommonFrameworks.WP7;
+            var wp75 = FrameworkConstants.CommonFrameworks.WP75;
+            var wp8 = FrameworkConstants.CommonFrameworks.WP8;
+            var wp81 = FrameworkConstants.CommonFrameworks.WP81;
+
+            var wpa81 = FrameworkConstants.CommonFrameworks.WPA81;
+
+            return
+            [
+                // v4.6
+                CreateProfileFrameworks(31, win81, wp81),
+                CreateProfileFrameworks(32, win81, wpa81),
+                CreateProfileFrameworks(44, net451, win81),
+                CreateProfileFrameworks(84, wp81, wpa81),
+                CreateProfileFrameworks(151, net451, win81, wpa81),
+                CreateProfileFrameworks(157, win81, wp81, wpa81),
+
+                // v4.5
+                CreateProfileFrameworks(7, net45, win8),
+                CreateProfileFrameworks(49, net45, wp8),
+                CreateProfileFrameworks(78, net45, win8, wp8),
+                CreateProfileFrameworks(111, net45, win8, wpa81),
+                CreateProfileFrameworks(259, net45, win8, wpa81, wp8),
+
+                // v4.0
+                CreateProfileFrameworks(2, net4, win8, sl4, wp7),
+                CreateProfileFrameworks(3, net4, sl4),
+                CreateProfileFrameworks(4, net45, sl4, win8, wp7),
+                CreateProfileFrameworks(5, net4, win8),
+                CreateProfileFrameworks(6, net403, win8),
+                CreateProfileFrameworks(14, net4, sl5),
+                CreateProfileFrameworks(18, net403, sl4),
+                CreateProfileFrameworks(19, net403, sl5),
+                CreateProfileFrameworks(23, net45, sl4),
+                CreateProfileFrameworks(24, net45, sl5),
+                CreateProfileFrameworks(36, net4, sl4, win8, wp8),
+                CreateProfileFrameworks(37, net4, sl5, win8),
+                CreateProfileFrameworks(41, net403, sl4, win8),
+                CreateProfileFrameworks(42, net403, sl5, win8),
+                CreateProfileFrameworks(46, net45, sl4, win8),
+                CreateProfileFrameworks(47, net45, sl5, win8),
+                CreateProfileFrameworks(88, net4, sl4, win8, wp75),
+                CreateProfileFrameworks(92, net4, win8, wpa81),
+                CreateProfileFrameworks(95, net403, sl4, win8, wp7),
+                CreateProfileFrameworks(96, net403, sl4, win8, wp75),
+                CreateProfileFrameworks(102, net403, win8, wpa81),
+                CreateProfileFrameworks(104, net45, sl4, win8, wp75),
+                CreateProfileFrameworks(136, net4, sl5, win8, wp8),
+                CreateProfileFrameworks(143, net403, sl4, win8, wp8),
+                CreateProfileFrameworks(147, net403, sl5, win8, wp8),
+                CreateProfileFrameworks(154, net45, sl4, win8, wp8),
+                CreateProfileFrameworks(158, net45, sl5, win8, wp8),
+                CreateProfileFrameworks(225, net4, sl5, win8, wpa81),
+                CreateProfileFrameworks(240, net403, sl5, win8, wpa81),
+                CreateProfileFrameworks(255, net45, sl5, win8, wpa81),
+                CreateProfileFrameworks(328, net4, sl5, win8, wpa81, wp8),
+                CreateProfileFrameworks(336, net403, sl5, win8, wpa81, wp8),
+                CreateProfileFrameworks(344, net45, sl5, win8, wpa81, wp8)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<int, NuGetFramework[]>> ProfileFrameworks
+        {
+            get
+            {
+                return ProfileFrameworksLazy.Value;
+            }
+        }
+
+        private static KeyValuePair<int, NuGetFramework[]> CreateProfileFrameworks(int profile, params NuGetFramework[] frameworks)
+        {
+            return new KeyValuePair<int, NuGetFramework[]>(profile, frameworks);
+        }
+
+        // profiles that also support monotouch1+monoandroid1
+        private static readonly int[] ProfilesWithOptionalFrameworks =
+        [
+            5, 6, 7, 14, 19, 24, 37, 42, 44, 47, 49, 78, 92, 102, 111, 136, 147, 151, 158, 225, 255, 259, 328, 336, 344
+        ];
+
+        private static readonly Lazy<List<KeyValuePair<int, NuGetFramework[]>>> ProfileOptionalFrameworksLazy = new(() =>
+        {
+            var monoandroid = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, new Version(0, 0));
+            var monotouch = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.MonoTouch, new Version(0, 0));
+            var xamarinIOs = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.XamarinIOs, new Version(0, 0));
+            var xamarinMac = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.XamarinMac, new Version(0, 0));
+            var xamarinTVOS = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.XamarinTVOS, new Version(0, 0));
+            var xamarinWatchOS = new NuGetFramework(FrameworkConstants.FrameworkIdentifiers.XamarinWatchOS, new Version(0, 0));
+            var monoFrameworks = new NuGetFramework[] { monoandroid, monotouch, xamarinIOs, xamarinMac, xamarinWatchOS, xamarinTVOS };
+
+            var profileOptionalFrameworks = new List<KeyValuePair<int, NuGetFramework[]>>(ProfilesWithOptionalFrameworks.Length);
+
+            foreach (var profile in ProfilesWithOptionalFrameworks)
+            {
+                profileOptionalFrameworks.Add(new KeyValuePair<int, NuGetFramework[]>(profile, monoFrameworks));
+            }
+
+            return profileOptionalFrameworks;
+        });
+
+        public IEnumerable<KeyValuePair<int, NuGetFramework[]>> ProfileOptionalFrameworks
+        {
+            get
+            {
+                return ProfileOptionalFrameworksLazy.Value;
+            }
+        }
+
+        private static readonly Lazy<KeyValuePair<int, FrameworkRange>[]> CompatibilityMappingsLazy = new(() =>
+        {
+            return
+            [
+                CreateStandardMapping(7, FrameworkConstants.CommonFrameworks.NetStandard11),
+                CreateStandardMapping(31, FrameworkConstants.CommonFrameworks.NetStandard10),
+                CreateStandardMapping(32, FrameworkConstants.CommonFrameworks.NetStandard12),
+                CreateStandardMapping(44, FrameworkConstants.CommonFrameworks.NetStandard12),
+                CreateStandardMapping(49, FrameworkConstants.CommonFrameworks.NetStandard10),
+                CreateStandardMapping(78, FrameworkConstants.CommonFrameworks.NetStandard10),
+                CreateStandardMapping(84, FrameworkConstants.CommonFrameworks.NetStandard10),
+                CreateStandardMapping(111, FrameworkConstants.CommonFrameworks.NetStandard11),
+                CreateStandardMapping(151, FrameworkConstants.CommonFrameworks.NetStandard12),
+                CreateStandardMapping(157, FrameworkConstants.CommonFrameworks.NetStandard10),
+                CreateStandardMapping(259, FrameworkConstants.CommonFrameworks.NetStandard10)
+            ];
+        });
+
+        public IEnumerable<KeyValuePair<int, FrameworkRange>> CompatibilityMappings
+        {
+            get
+            {
+                return CompatibilityMappingsLazy.Value;
+            }
+        }
+
+        private static KeyValuePair<int, FrameworkRange> CreateStandardMapping(
+            int profileNumber,
+            NuGetFramework netStandard)
+        {
+            var range = new FrameworkRange(
+                    FrameworkConstants.CommonFrameworks.NetStandard10,
+                    netStandard);
+
+            return new KeyValuePair<int, FrameworkRange>(profileNumber, range);
+        }
+
+        private static readonly Lazy<IPortableFrameworkMappings> InstanceLazy = new(() => new DefaultPortableFrameworkMappings());
+
+        /// <summary>
+        /// Static instance of the portable framework mappings
+        /// </summary>
+        public static IPortableFrameworkMappings Instance
+        {
+            get
+            {
+                return InstanceLazy.Value;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FallbackFramework.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FallbackFramework.cs
new file mode 100644
index 0000000000..71f191051a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FallbackFramework.cs
@@ -0,0 +1,82 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using NuGetClone.Shared;
+
+using FallbackList = System.Collections.Generic.IReadOnlyList<NuGetClone.Frameworks.NuGetFramework>;
+
+namespace NuGetClone.Frameworks
+{
+    internal class FallbackFramework : NuGetFramework, IEquatable<FallbackFramework>
+    {
+        /// <summary>
+        /// List framework to fall back to.
+        /// </summary>
+        public FallbackList Fallback { get; }
+
+        private int? _hashCode;
+
+        public FallbackFramework(NuGetFramework framework, FallbackList fallbackFrameworks)
+            : base(framework)
+        {
+            if (framework == null)
+            {
+                throw new ArgumentNullException(nameof(framework));
+            }
+
+            if (fallbackFrameworks == null)
+            {
+                throw new ArgumentNullException(nameof(fallbackFrameworks));
+            }
+
+            if (fallbackFrameworks.Count == 0)
+            {
+                throw new ArgumentException("Empty fallbackFrameworks is invalid", nameof(fallbackFrameworks));
+            }
+
+            Fallback = fallbackFrameworks;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return Equals(obj as FallbackFramework);
+        }
+
+        public override int GetHashCode()
+        {
+            if (_hashCode == null)
+            {
+                var combiner = new HashCodeCombiner();
+
+                combiner.AddObject(Comparer.GetHashCode(this));
+
+                foreach (var each in Fallback)
+                {
+                    combiner.AddObject(Comparer.GetHashCode(each));
+                }
+
+                _hashCode = combiner.CombinedHash;
+            }
+
+            return _hashCode.Value;
+        }
+
+        public bool Equals(FallbackFramework? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (Object.ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            return NuGetFramework.Comparer.Equals(this, other)
+                && Fallback.SequenceEqual(other.Fallback);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkConstants.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkConstants.cs
new file mode 100644
index 0000000000..ffa9bf4793
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkConstants.cs
@@ -0,0 +1,195 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    internal static class FrameworkConstants
+    {
+        public static readonly Version EmptyVersion = new(0, 0, 0, 0);
+        public static readonly Version MaxVersion = new(int.MaxValue, 0, 0, 0);
+        public static readonly Version Version5 = new(5, 0, 0, 0);
+        public static readonly Version Version6 = new(6, 0, 0, 0);
+        public static readonly Version Version7 = new(7, 0, 0, 0);
+        public static readonly Version Version10 = new(10, 0, 0, 0);
+        public static readonly FrameworkRange DotNetAll = new(
+                        new NuGetFramework(FrameworkIdentifiers.NetPlatform, FrameworkConstants.EmptyVersion),
+                        new NuGetFramework(FrameworkIdentifiers.NetPlatform, FrameworkConstants.MaxVersion));
+
+        internal static class SpecialIdentifiers
+        {
+            public const string Any = "Any";
+            public const string Agnostic = "Agnostic";
+            public const string Unsupported = "Unsupported";
+        }
+
+        internal static class PlatformIdentifiers
+        {
+            public const string WindowsPhone = "WindowsPhone";
+            public const string Windows = "Windows";
+        }
+
+        internal static class FrameworkIdentifiers
+        {
+            public const string NetCoreApp = ".NETCoreApp";
+            public const string NetStandardApp = ".NETStandardApp";
+            public const string NetStandard = ".NETStandard";
+            public const string NetPlatform = ".NETPlatform";
+            public const string DotNet = "dotnet";
+            public const string Net = ".NETFramework";
+            public const string NetCore = ".NETCore";
+            public const string WinRT = "WinRT"; // deprecated
+            public const string NetMicro = ".NETMicroFramework";
+            public const string Portable = ".NETPortable";
+            public const string WindowsPhone = "WindowsPhone";
+            public const string Windows = "Windows";
+            public const string WindowsPhoneApp = "WindowsPhoneApp";
+            public const string Dnx = "DNX";
+            public const string DnxCore = "DNXCore";
+            public const string AspNet = "ASP.NET";
+            public const string AspNetCore = "ASP.NETCore";
+            public const string Silverlight = "Silverlight";
+            public const string Native = "native";
+            public const string MonoAndroid = "MonoAndroid";
+            public const string MonoTouch = "MonoTouch";
+            public const string MonoMac = "MonoMac";
+            public const string XamarinIOs = "Xamarin.iOS";
+            public const string XamarinMac = "Xamarin.Mac";
+            public const string XamarinPlayStation3 = "Xamarin.PlayStation3";
+            public const string XamarinPlayStation4 = "Xamarin.PlayStation4";
+            public const string XamarinPlayStationVita = "Xamarin.PlayStationVita";
+            public const string XamarinWatchOS = "Xamarin.WatchOS";
+            public const string XamarinTVOS = "Xamarin.TVOS";
+            public const string XamarinXbox360 = "Xamarin.Xbox360";
+            public const string XamarinXboxOne = "Xamarin.XboxOne";
+            public const string UAP = "UAP";
+            public const string Tizen = "Tizen";
+            public const string NanoFramework = ".NETnanoFramework";
+        }
+
+        /// <summary>
+        /// Interned frameworks that are commonly used in NuGet
+        /// </summary>
+        internal static class CommonFrameworks
+        {
+            public static readonly NuGetFramework Net11 = new(FrameworkIdentifiers.Net, new Version(1, 1, 0, 0));
+            public static readonly NuGetFramework Net2 = new(FrameworkIdentifiers.Net, new Version(2, 0, 0, 0));
+            public static readonly NuGetFramework Net35 = new(FrameworkIdentifiers.Net, new Version(3, 5, 0, 0));
+            public static readonly NuGetFramework Net4 = new(FrameworkIdentifiers.Net, new Version(4, 0, 0, 0));
+            public static readonly NuGetFramework Net403 = new(FrameworkIdentifiers.Net, new Version(4, 0, 3, 0));
+            public static readonly NuGetFramework Net45 = new(FrameworkIdentifiers.Net, new Version(4, 5, 0, 0));
+            public static readonly NuGetFramework Net451 = new(FrameworkIdentifiers.Net, new Version(4, 5, 1, 0));
+            public static readonly NuGetFramework Net452 = new(FrameworkIdentifiers.Net, new Version(4, 5, 2, 0));
+            public static readonly NuGetFramework Net46 = new(FrameworkIdentifiers.Net, new Version(4, 6, 0, 0));
+            public static readonly NuGetFramework Net461 = new(FrameworkIdentifiers.Net, new Version(4, 6, 1, 0));
+            public static readonly NuGetFramework Net462 = new(FrameworkIdentifiers.Net, new Version(4, 6, 2, 0));
+            public static readonly NuGetFramework Net463 = new(FrameworkIdentifiers.Net, new Version(4, 6, 3, 0));
+            public static readonly NuGetFramework Net47 = new(FrameworkIdentifiers.Net, new Version(4, 7, 0, 0));
+            public static readonly NuGetFramework Net471 = new(FrameworkIdentifiers.Net, new Version(4, 7, 1, 0));
+            public static readonly NuGetFramework Net472 = new(FrameworkIdentifiers.Net, new Version(4, 7, 2, 0));
+
+            public static readonly NuGetFramework NetCore45 = new(FrameworkIdentifiers.NetCore, new Version(4, 5, 0, 0));
+            public static readonly NuGetFramework NetCore451 = new(FrameworkIdentifiers.NetCore, new Version(4, 5, 1, 0));
+            public static readonly NuGetFramework NetCore50 = new(FrameworkIdentifiers.NetCore, new Version(5, 0, 0, 0));
+
+            public static readonly NuGetFramework Win8 = new(FrameworkIdentifiers.Windows, new Version(8, 0, 0, 0));
+            public static readonly NuGetFramework Win81 = new(FrameworkIdentifiers.Windows, new Version(8, 1, 0, 0));
+            public static readonly NuGetFramework Win10 = new(FrameworkIdentifiers.Windows, new Version(10, 0, 0, 0));
+
+            public static readonly NuGetFramework SL4 = new(FrameworkIdentifiers.Silverlight, new Version(4, 0, 0, 0));
+            public static readonly NuGetFramework SL5 = new(FrameworkIdentifiers.Silverlight, new Version(5, 0, 0, 0));
+
+            public static readonly NuGetFramework WP7 = new(FrameworkIdentifiers.WindowsPhone, new Version(7, 0, 0, 0));
+            public static readonly NuGetFramework WP75 = new(FrameworkIdentifiers.WindowsPhone, new Version(7, 5, 0, 0));
+            public static readonly NuGetFramework WP8 = new(FrameworkIdentifiers.WindowsPhone, new Version(8, 0, 0, 0));
+            public static readonly NuGetFramework WP81 = new(FrameworkIdentifiers.WindowsPhone, new Version(8, 1, 0, 0));
+            public static readonly NuGetFramework WPA81 = new(FrameworkIdentifiers.WindowsPhoneApp, new Version(8, 1, 0, 0));
+
+            public static readonly NuGetFramework Tizen3 = new(FrameworkIdentifiers.Tizen, new Version(3, 0, 0, 0));
+            public static readonly NuGetFramework Tizen4 = new(FrameworkIdentifiers.Tizen, new Version(4, 0, 0, 0));
+            public static readonly NuGetFramework Tizen6 = new(FrameworkIdentifiers.Tizen, new Version(6, 0, 0, 0));
+
+            public static readonly NuGetFramework AspNet = new(FrameworkIdentifiers.AspNet, EmptyVersion);
+            public static readonly NuGetFramework AspNetCore = new(FrameworkIdentifiers.AspNetCore, EmptyVersion);
+            public static readonly NuGetFramework AspNet50 = new(FrameworkIdentifiers.AspNet, Version5);
+            public static readonly NuGetFramework AspNetCore50 = new(FrameworkIdentifiers.AspNetCore, Version5);
+
+            public static readonly NuGetFramework Dnx = new(FrameworkIdentifiers.Dnx, EmptyVersion);
+            public static readonly NuGetFramework Dnx45 = new(FrameworkIdentifiers.Dnx, new Version(4, 5, 0, 0));
+            public static readonly NuGetFramework Dnx451 = new(FrameworkIdentifiers.Dnx, new Version(4, 5, 1, 0));
+            public static readonly NuGetFramework Dnx452 = new(FrameworkIdentifiers.Dnx, new Version(4, 5, 2, 0));
+            public static readonly NuGetFramework DnxCore = new(FrameworkIdentifiers.DnxCore, EmptyVersion);
+            public static readonly NuGetFramework DnxCore50 = new(FrameworkIdentifiers.DnxCore, Version5);
+
+            public static readonly NuGetFramework DotNet
+                = new(FrameworkIdentifiers.NetPlatform, EmptyVersion);
+            public static readonly NuGetFramework DotNet50
+                = new(FrameworkIdentifiers.NetPlatform, Version5);
+            public static readonly NuGetFramework DotNet51
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 1, 0, 0));
+            public static readonly NuGetFramework DotNet52
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 2, 0, 0));
+            public static readonly NuGetFramework DotNet53
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 3, 0, 0));
+            public static readonly NuGetFramework DotNet54
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 4, 0, 0));
+            public static readonly NuGetFramework DotNet55
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 5, 0, 0));
+            public static readonly NuGetFramework DotNet56
+                = new(FrameworkIdentifiers.NetPlatform, new Version(5, 6, 0, 0));
+
+            public static readonly NuGetFramework NetStandard
+                = new(FrameworkIdentifiers.NetStandard, EmptyVersion);
+            public static readonly NuGetFramework NetStandard10
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 0, 0, 0));
+            public static readonly NuGetFramework NetStandard11
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 1, 0, 0));
+            public static readonly NuGetFramework NetStandard12
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 2, 0, 0));
+            public static readonly NuGetFramework NetStandard13
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 3, 0, 0));
+            public static readonly NuGetFramework NetStandard14
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 4, 0, 0));
+            public static readonly NuGetFramework NetStandard15
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 5, 0, 0));
+            public static readonly NuGetFramework NetStandard16
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 6, 0, 0));
+            public static readonly NuGetFramework NetStandard17
+                = new(FrameworkIdentifiers.NetStandard, new Version(1, 7, 0, 0));
+            public static readonly NuGetFramework NetStandard20
+                = new(FrameworkIdentifiers.NetStandard, new Version(2, 0, 0, 0));
+            public static readonly NuGetFramework NetStandard21
+                = new(FrameworkIdentifiers.NetStandard, new Version(2, 1, 0, 0));
+
+            public static readonly NuGetFramework NetStandardApp15
+                = new(FrameworkIdentifiers.NetStandardApp, new Version(1, 5, 0, 0));
+
+            public static readonly NuGetFramework UAP10
+                = new(FrameworkIdentifiers.UAP, Version10);
+
+            public static readonly NuGetFramework NetCoreApp10
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(1, 0, 0, 0));
+            public static readonly NuGetFramework NetCoreApp11
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(1, 1, 0, 0));
+            public static readonly NuGetFramework NetCoreApp20
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(2, 0, 0, 0));
+            public static readonly NuGetFramework NetCoreApp21
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(2, 1, 0, 0));
+            public static readonly NuGetFramework NetCoreApp22
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(2, 2, 0, 0));
+            public static readonly NuGetFramework NetCoreApp30
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(3, 0, 0, 0));
+            public static readonly NuGetFramework NetCoreApp31
+                = new(FrameworkIdentifiers.NetCoreApp, new Version(3, 1, 0, 0));
+
+            // .NET 5.0 and later has NetCoreApp identifier
+            public static readonly NuGetFramework Net50 = new(FrameworkIdentifiers.NetCoreApp, Version5);
+            public static readonly NuGetFramework Net60 = new(FrameworkIdentifiers.NetCoreApp, Version6);
+            public static readonly NuGetFramework Net70 = new(FrameworkIdentifiers.NetCoreApp, Version7);
+
+            public static readonly NuGetFramework Native = new(FrameworkIdentifiers.Native, new Version(0, 0, 0, 0));
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkException.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkException.cs
new file mode 100644
index 0000000000..101b2726cf
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkException.cs
@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace NuGetClone.Frameworks
+{
+    [Serializable]
+    internal class FrameworkException : Exception
+    {
+        public FrameworkException(string message)
+            : base(message)
+        {
+        }
+
+        protected FrameworkException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkExpander.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkExpander.cs
new file mode 100644
index 0000000000..59e53543bc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkExpander.cs
@@ -0,0 +1,128 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// FrameworkExpander finds all equivalent and compatible frameworks for a NuGetFramework
+    /// </summary>
+    internal class FrameworkExpander
+    {
+        private readonly IFrameworkNameProvider _mappings;
+
+        public FrameworkExpander()
+            : this(DefaultFrameworkNameProvider.Instance)
+        {
+        }
+
+        public FrameworkExpander(IFrameworkNameProvider mappings)
+        {
+            _mappings = mappings ?? throw new ArgumentNullException(nameof(mappings));
+        }
+
+        /// <summary>
+        /// Return all possible equivalent, subset, and known compatible frameworks.
+        /// </summary>
+        public IEnumerable<NuGetFramework> Expand(NuGetFramework framework)
+        {
+            if (framework == null) throw new ArgumentNullException(nameof(framework));
+
+            var seen = new HashSet<NuGetFramework>() { framework };
+            var toExpand = new Stack<NuGetFramework>();
+            toExpand.Push(framework);
+
+            while (toExpand.Count > 0)
+            {
+                foreach (var expansion in ExpandInternal(toExpand.Pop()))
+                {
+                    // only return distinct frameworks
+                    if (seen.Add(expansion))
+                    {
+                        yield return expansion;
+
+                        toExpand.Push(expansion);
+                    }
+                }
+            }
+
+            // This PCL check is done outside of the loop because we do not want
+            // to recurse (via the stack above) on this PCL equivalence. The
+            // intent here is to ensure that PCL should expand to netstandard,
+            // but NOT to dotnet (which is deprecated).
+            if (framework.IsPCL)
+            {
+                if (_mappings.TryGetPortableProfileNumber(framework.Profile, out int profileNumber)
+                    && _mappings.TryGetPortableCompatibilityMappings(profileNumber, out IEnumerable<FrameworkRange>? ranges))
+                {
+                    foreach (var range in ranges)
+                    {
+                        yield return range.Min;
+
+                        if (!range.Min.Equals(range.Max))
+                        {
+                            yield return range.Max;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Finds all expansions using the mapping provider
+        /// </summary>
+        private IEnumerable<NuGetFramework> ExpandInternal(NuGetFramework framework)
+        {
+            // check the framework directly, this includes profiles which the range doesn't return
+            if (_mappings.TryGetEquivalentFrameworks(framework, out IEnumerable<NuGetFramework>? directlyEquivalent))
+            {
+                foreach (var eqFw in directlyEquivalent)
+                {
+                    yield return eqFw;
+                }
+            }
+
+            // 0.0 through the current framework
+            var frameworkRange = new FrameworkRange(
+                new NuGetFramework(framework.Framework, new Version(0, 0), framework.Profile),
+                framework);
+
+            if (_mappings.TryGetEquivalentFrameworks(frameworkRange, out IEnumerable<NuGetFramework>? equivalent))
+            {
+                foreach (var eqFw in equivalent)
+                {
+                    yield return eqFw;
+                }
+            }
+
+            // find all possible sub set frameworks if no profile is used
+            if (!framework.HasProfile)
+            {
+                if (_mappings.TryGetSubSetFrameworks(framework.Framework, out IEnumerable<string>? subSetFrameworks))
+                {
+                    foreach (var subFramework in subSetFrameworks)
+                    {
+                        // clone the framework but use the sub framework instead
+                        yield return new NuGetFramework(subFramework, framework.Version, framework.Profile);
+                    }
+                }
+            }
+
+            // explicit compatiblity mappings
+            if (_mappings.TryGetCompatibilityMappings(framework, out IEnumerable<FrameworkRange>? ranges))
+            {
+                foreach (var range in ranges)
+                {
+                    yield return range.Min;
+
+                    if (!range.Min.Equals(range.Max))
+                    {
+                        yield return range.Max;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameHelpers.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameHelpers.cs
new file mode 100644
index 0000000000..9c6fa9bd1d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameHelpers.cs
@@ -0,0 +1,73 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    internal static class FrameworkNameHelpers
+    {
+        public static string GetPortableProfileNumberString(int profileNumber)
+        {
+            return String.Format(CultureInfo.InvariantCulture, "Profile{0}", profileNumber);
+        }
+
+        public static string GetFolderName(string identifierShortName, string versionString, string? profileShortName)
+        {
+            return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}{3}", identifierShortName, versionString, String.IsNullOrEmpty(profileShortName) ? string.Empty : "-", profileShortName);
+        }
+
+        public static string GetVersionString(Version version)
+        {
+            string? versionString = null;
+
+            if (version != null)
+            {
+                if (version.Major > 9
+                    || version.Minor > 9
+                    || version.Build > 9
+                    || version.Revision > 9)
+                {
+                    versionString = version.ToString();
+                }
+                else
+                {
+                    versionString = version.ToString().Replace(".", "").TrimEnd('0');
+                }
+            }
+
+            return versionString!;
+        }
+
+        public static Version GetVersion(string? versionString)
+        {
+            if (string.IsNullOrEmpty(versionString))
+            {
+                return FrameworkConstants.EmptyVersion;
+            }
+            else
+            {
+                if (versionString!.IndexOf('.') > -1)
+                {
+                    // parse the version as a normal dot delimited version
+                    return Version.Parse(versionString);
+                }
+                else
+                {
+                    // make sure we have at least 2 digits
+                    if (versionString.Length < 2)
+                    {
+                        versionString += "0";
+                    }
+
+                    // take only the first 4 digits and add dots
+                    // 451 -> 4.5.1
+                    // 81233 -> 8123
+                    return Version.Parse(string.Join(".", versionString.ToCharArray().Take(4)));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameProvider.cs
new file mode 100644
index 0000000000..1a52d91003
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkNameProvider.cs
@@ -0,0 +1,1185 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace NuGetClone.Frameworks
+{
+    internal class FrameworkNameProvider : IFrameworkNameProvider
+    {
+        private static readonly HashSet<NuGetFramework> EmptyFrameworkSet = new();
+
+        /// <summary>
+        /// Legacy frameworks that are allowed to have a single digit for the version number.
+        /// </summary>
+        private static readonly HashSet<string> SingleDigitVersionFrameworks = new(StringComparer.OrdinalIgnoreCase)
+        {
+            FrameworkConstants.FrameworkIdentifiers.Windows,
+            FrameworkConstants.FrameworkIdentifiers.WindowsPhone,
+            FrameworkConstants.FrameworkIdentifiers.Silverlight
+        };
+
+        /// <summary>
+        /// Frameworks that must always include a decimal point (period) between numerical parts.
+        /// </summary>
+        private static readonly HashSet<string> DecimalPointFrameworks = new(StringComparer.OrdinalIgnoreCase)
+        {
+            FrameworkConstants.FrameworkIdentifiers.NetCoreApp,
+            FrameworkConstants.FrameworkIdentifiers.NetStandard,
+            FrameworkConstants.FrameworkIdentifiers.NanoFramework
+        };
+
+        /// <summary>
+        /// Contains identifier -> identifier
+        /// Ex: .NET Framework -> .NET Framework
+        /// Ex: NET Framework -> .NET Framework
+        /// This includes self mappings.
+        /// </summary>
+        private readonly Dictionary<string, string> _identifierSynonyms;
+
+        private readonly Dictionary<string, string> _identifierToShortName;
+        private readonly Dictionary<string, string> _profilesToShortName;
+        private readonly Dictionary<string, string> _identifierShortToLong;
+        private readonly Dictionary<string, string> _profileShortToLong;
+
+        // profile -> supported frameworks, optional frameworks
+        private readonly Dictionary<int, HashSet<NuGetFramework>> _portableFrameworks;
+        private readonly Dictionary<int, HashSet<NuGetFramework>> _portableOptionalFrameworks;
+
+        // PCL compatibility mappings
+        private readonly Dictionary<int, HashSet<FrameworkRange>> _portableCompatibilityMappings;
+
+        // equivalent frameworks
+        private readonly Dictionary<NuGetFramework, HashSet<NuGetFramework>> _equivalentFrameworks;
+
+        // equivalent profiles
+        private readonly Dictionary<string, Dictionary<string, HashSet<string>>> _equivalentProfiles;
+
+        // non-PCL compatibility mappings
+        private readonly Dictionary<string, HashSet<OneWayCompatibilityMappingEntry>> _compatibilityMappings;
+
+        // subsets, net -> netcore
+        private readonly Dictionary<string, HashSet<string>> _subSetFrameworks;
+
+        // framework ordering (for non-package based frameworks)
+        private readonly Dictionary<string, int> _nonPackageBasedFrameworkPrecedence;
+
+        // framework ordering (for package based frameworks)
+        private readonly Dictionary<string, int> _packageBasedFrameworkPrecedence;
+
+        // framework ordering (when choosing between equivalent frameworks)
+        private readonly Dictionary<string, int> _equivalentFrameworkPrecedence;
+
+        // Rewrite mappings
+        private readonly Dictionary<NuGetFramework, NuGetFramework> _shortNameRewrites;
+        private readonly Dictionary<NuGetFramework, NuGetFramework> _fullNameRewrites;
+
+        // NetStandard information
+        private readonly List<NuGetFramework> _netStandardVersions;
+        private readonly List<NuGetFramework> _compatibleCandidates;
+
+        public FrameworkNameProvider(IEnumerable<IFrameworkMappings>? mappings, IEnumerable<IPortableFrameworkMappings>? portableMappings)
+        {
+            _identifierSynonyms = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _identifierToShortName = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _profilesToShortName = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _identifierShortToLong = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _profileShortToLong = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            _portableFrameworks = new Dictionary<int, HashSet<NuGetFramework>>();
+            _portableOptionalFrameworks = new Dictionary<int, HashSet<NuGetFramework>>();
+            _equivalentFrameworks = new Dictionary<NuGetFramework, HashSet<NuGetFramework>>();
+            _equivalentProfiles = new Dictionary<string, Dictionary<string, HashSet<string>>>(StringComparer.OrdinalIgnoreCase);
+            _subSetFrameworks = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
+            _nonPackageBasedFrameworkPrecedence = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+            _packageBasedFrameworkPrecedence = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+            _equivalentFrameworkPrecedence = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+            _compatibilityMappings = new Dictionary<string, HashSet<OneWayCompatibilityMappingEntry>>(StringComparer.OrdinalIgnoreCase);
+            _portableCompatibilityMappings = new Dictionary<int, HashSet<FrameworkRange>>();
+            _shortNameRewrites = new Dictionary<NuGetFramework, NuGetFramework>();
+            _fullNameRewrites = new Dictionary<NuGetFramework, NuGetFramework>();
+            _netStandardVersions = new List<NuGetFramework>();
+            _compatibleCandidates = new List<NuGetFramework>();
+
+            InitMappings(mappings);
+
+            InitPortableMappings(portableMappings);
+
+            InitNetStandard();
+        }
+
+        /// <summary>
+        /// Converts a key using the mappings, or if the key is already converted, finds the normalized form.
+        /// </summary>
+        private static bool TryConvertOrNormalize(string key, IDictionary<string, string> mappings, IDictionary<string, string> reverse, [NotNullWhen(true)] out string? value)
+        {
+            if (mappings.TryGetValue(key, out value))
+            {
+                return true;
+            }
+            else if (reverse.ContainsKey(key))
+            {
+                value = reverse.Where(p => StringComparer.OrdinalIgnoreCase.Equals(p.Key, key)).Select(s => s.Key).Single();
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
+
+        public bool TryGetIdentifier(string framework, [NotNullWhen(true)] out string? identifier)
+        {
+            return TryConvertOrNormalize(framework, _identifierSynonyms, _identifierToShortName, out identifier);
+        }
+
+        public bool TryGetProfile(string frameworkIdentifier, string profileShortName, [NotNullWhen(true)] out string? profile)
+        {
+            return TryConvertOrNormalize(profileShortName, _profileShortToLong, _profilesToShortName, out profile);
+        }
+
+        public bool TryGetShortIdentifier(string identifier, [NotNullWhen(true)] out string? identifierShortName)
+        {
+            return TryConvertOrNormalize(identifier, _identifierToShortName, _identifierShortToLong, out identifierShortName);
+        }
+
+        public bool TryGetShortProfile(string frameworkIdentifier, string profile, [NotNullWhen(true)] out string? profileShortName)
+        {
+            return TryConvertOrNormalize(profile, _profilesToShortName, _profileShortToLong, out profileShortName);
+        }
+
+        public bool TryGetVersion(string versionString, [NotNullWhen(true)] out Version? version)
+        {
+            if (string.IsNullOrEmpty(versionString))
+            {
+                version = null;
+                return false;
+            }
+            else
+            {
+                if (versionString.IndexOf('.') > -1)
+                {
+                    // parse the version as a normal dot delimited version
+                    return Version.TryParse(versionString, out version);
+                }
+                else
+                {
+                    // make sure we have at least 2 digits
+                    if (versionString.Length < 2)
+                    {
+                        versionString += "0";
+                    }
+
+                    // take only the first 4 digits and add dots
+                    // 451 -> 4.5.1
+                    // 81233 -> 8123
+                    return Version.TryParse(string.Join(".", versionString.ToCharArray().Take(4)), out version);
+                }
+            }
+        }
+
+        public bool TryGetPlatformVersion(string versionString, [NotNullWhen(true)] out Version? version)
+        {
+            if (string.IsNullOrEmpty(versionString))
+            {
+                version = null;
+                return false;
+            }
+            else
+            {
+                if (versionString.IndexOf('.') < 0)
+                {
+                    versionString += ".0";
+                }
+                return Version.TryParse(versionString, out version);
+            }
+        }
+
+        public string GetVersionString(string framework, Version version)
+        {
+            if (version is null || IsZero(version))
+            {
+                return string.Empty;
+            }
+
+            int major = version.Major > 0 ? version.Major : 0;
+            int minor = version.Minor > 0 ? version.Minor : 0;
+            int build = version.Build > 0 ? version.Build : 0;
+            int revision = version.Revision > 0 ? version.Revision : 0;
+
+            // Remove all trailing zeros beyond the minor version.
+            int partCount = (minor == 0, build == 0, revision == 0) switch
+            {
+                (true, true, true) => 1,
+                (false, true, true) => 2,
+                (_, false, true) => 3,
+                (_, _, false) => 4
+            };
+
+            // Only some legacy frameworks are allowed to have one part in their version.
+            if (partCount == 1 && !SingleDigitVersionFrameworks.Contains(framework))
+            {
+                partCount = 2;
+            }
+
+            StringBuilder sb = StringBuilderPool.Shared.Rent(256);
+
+            // Some frameworks require a decimal point between parts.
+            // If any part is greater than 9 (requiring multiple digits), we add decimal points.
+            if (DecimalPointFrameworks.Contains(framework) || HasGreaterThanNinePart())
+            {
+                // An additional zero is needed for decimals.
+                if (partCount == 1)
+                    partCount = 2;
+
+                sb.Append(major);
+                if (partCount > 1)
+                    sb.Append('.').Append(minor);
+                if (partCount > 2)
+                    sb.Append('.').Append(build);
+                if (partCount > 3)
+                    sb.Append('.').Append(revision);
+            }
+            else
+            {
+                sb.Append(major);
+                if (partCount > 1)
+                    sb.Append(minor);
+                if (partCount > 2)
+                    sb.Append(build);
+                if (partCount > 3)
+                    sb.Append(revision);
+            }
+
+            return StringBuilderPool.Shared.ToStringAndReturn(sb);
+
+            bool HasGreaterThanNinePart()
+            {
+                return major > 9 || minor > 9 || build > 9 || revision > 9;
+            }
+
+            static bool IsZero(Version version)
+            {
+                // Build and Revision can be -1 when only major & minor are specified.
+                // Out of caution, check all values for zero or less.
+                return version.Major <= 0
+                    && version.Minor <= 0
+                    && version.Build <= 0
+                    && version.Revision <= 0;
+            }
+        }
+
+        public bool TryGetPortableProfile(IEnumerable<NuGetFramework> supportedFrameworks, out int profileNumber)
+        {
+            if (supportedFrameworks == null)
+            {
+                throw new ArgumentNullException(nameof(supportedFrameworks));
+            }
+
+            profileNumber = -1;
+
+            // Remove duplicate frameworks, ex: win+win8 -> win
+            var profileFrameworks = RemoveDuplicateFramework(supportedFrameworks);
+
+            var reduced = new HashSet<NuGetFramework>();
+            foreach (var pair in _portableFrameworks)
+            {
+                // to match the required set must be less than or the same count as the input
+                // if we knew which frameworks were optional in the input we could rule out the lesser ones also
+                if (pair.Value.Count <= profileFrameworks.Count)
+                {
+                    foreach (var curFw in profileFrameworks)
+                    {
+                        var isOptional = false;
+
+                        foreach (var optional in GetOptionalFrameworks(pair.Key))
+                        {
+                            // TODO: profile check? Is the version check correct here?
+                            if (NuGetFramework.FrameworkNameComparer.Equals(optional, curFw)
+                                && StringComparer.OrdinalIgnoreCase.Equals(optional.Profile, curFw.Profile)
+                                && curFw.Version >= optional.Version)
+                            {
+                                isOptional = true;
+                            }
+                        }
+
+                        if (!isOptional)
+                        {
+                            reduced.Add(curFw);
+                        }
+                    }
+
+                    // check all frameworks while taking into account equivalent variations
+                    foreach (var permutation in GetEquivalentPermutations(pair.Value))
+                    {
+                        if (SetEquals(reduced, permutation))
+                        {
+                            // found a match
+                            profileNumber = pair.Key;
+                            return true;
+                        }
+                    }
+                }
+
+                reduced.Clear();
+            }
+
+            return false;
+        }
+
+        private HashSet<NuGetFramework> RemoveDuplicateFramework(IEnumerable<NuGetFramework> supportedFrameworks)
+        {
+            var result = new HashSet<NuGetFramework>();
+            var existingFrameworks = new HashSet<NuGetFramework>();
+
+            foreach (var framework in supportedFrameworks)
+            {
+                if (!existingFrameworks.Contains(framework))
+                {
+                    result.Add(framework);
+
+                    // Add in the existing framework (included here) and all equivalent frameworks
+                    var equivalentFrameworks = GetAllEquivalentFrameworks(framework);
+
+                    UnionWith(existingFrameworks, equivalentFrameworks);
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Get all equivalent frameworks including the given framework
+        /// </summary>
+        private HashSet<NuGetFramework> GetAllEquivalentFrameworks(NuGetFramework framework)
+        {
+            // Loop through the frameworks, all frameworks that are not in results yet
+            // will be added to toProcess to get the equivalent frameworks
+            var toProcess = new Stack<NuGetFramework>();
+            var results = new HashSet<NuGetFramework>();
+
+            toProcess.Push(framework);
+            results.Add(framework);
+
+            while (toProcess.Count > 0)
+            {
+                var current = toProcess.Pop();
+
+                if (_equivalentFrameworks.TryGetValue(current, out HashSet<NuGetFramework>? currentEquivalent))
+                {
+                    foreach (var equalFramework in currentEquivalent)
+                    {
+                        if (results.Add(equalFramework))
+                        {
+                            toProcess.Push(equalFramework);
+                        }
+                    }
+                }
+            }
+
+            return results;
+        }
+
+        // find all combinations that are equivalent
+        // ex: net4+win8 <-> net4+netcore45
+        private IEnumerable<HashSet<NuGetFramework>> GetEquivalentPermutations(HashSet<NuGetFramework> frameworks)
+        {
+            if (frameworks.Count > 0)
+            {
+                NuGetFramework? current = null;
+                var remaining = frameworks.Count == 1 ? null : new HashSet<NuGetFramework>();
+
+                var isFirst = true;
+                foreach (var fw in frameworks)
+                {
+                    if (isFirst)
+                    {
+                        current = fw;
+                        isFirst = false;
+                        continue;
+                    }
+
+                    remaining!.Add(fw);
+                }
+
+                var equalFrameworks = new HashSet<NuGetFramework>();
+                // include ourselves
+                equalFrameworks.Add(current!);
+
+                // find all equivalent frameworks for the current one
+                if (_equivalentFrameworks.TryGetValue(current!, out HashSet<NuGetFramework>? curFrameworks))
+                {
+                    UnionWith(equalFrameworks, curFrameworks);
+                }
+
+                foreach (var fw in equalFrameworks)
+                {
+                    if (remaining != null && remaining.Count > 0)
+                    {
+                        foreach (var result in GetEquivalentPermutations(remaining))
+                        {
+                            // work backwards adding the frameworks into the sets
+                            result.Add(fw);
+                            yield return result;
+                        }
+                    }
+                    else
+                    {
+                        var singleFramework = new HashSet<NuGetFramework>();
+                        singleFramework.Add(fw);
+                        yield return singleFramework;
+                    }
+                }
+            }
+
+            yield break;
+        }
+
+        private HashSet<NuGetFramework> GetOptionalFrameworks(int profile)
+        {
+            if (_portableOptionalFrameworks.TryGetValue(profile, out HashSet<NuGetFramework>? frameworks))
+            {
+                return frameworks;
+            }
+
+            return EmptyFrameworkSet;
+        }
+
+        public bool TryGetPortableFrameworks(int profile, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            return TryGetPortableFrameworks(profile, true, out frameworks);
+        }
+
+        public bool TryGetPortableFrameworks(int profile, bool includeOptional, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            var result = new HashSet<NuGetFramework>();
+            if (_portableFrameworks.TryGetValue(profile, out HashSet<NuGetFramework>? tmpFrameworks))
+            {
+                foreach (var fw in tmpFrameworks)
+                {
+                    result.Add(fw);
+                }
+            }
+
+            if (includeOptional)
+            {
+                if (_portableOptionalFrameworks.TryGetValue(profile, out HashSet<NuGetFramework>? optional))
+                {
+                    foreach (var fw in optional)
+                    {
+                        result.Add(fw);
+                    }
+                }
+            }
+
+            frameworks = result;
+            return result.Count > 0;
+        }
+
+        public bool TryGetPortableFrameworks(string shortPortableProfiles, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            if (shortPortableProfiles == null)
+            {
+                throw new ArgumentNullException(nameof(shortPortableProfiles));
+            }
+
+            var shortNames = shortPortableProfiles.Split(['+'], StringSplitOptions.RemoveEmptyEntries);
+
+            var result = new List<NuGetFramework>();
+            foreach (var name in shortNames)
+            {
+                var framework = NuGetFramework.Parse(name, this);
+                if (framework.HasProfile)
+                {
+                    // Frameworks within the portable profile are not allowed
+                    // to have profiles themselves #1869
+                    throw new ArgumentException(string.Format(
+                        CultureInfo.CurrentCulture,
+                        Strings.InvalidPortableFrameworksDueToHyphen,
+                        shortPortableProfiles));
+                }
+
+                result.Add(framework);
+            }
+
+            frameworks = result;
+            return result.Count > 0;
+        }
+
+        public bool TryGetPortableCompatibilityMappings(int profile, [NotNullWhen(true)] out IEnumerable<FrameworkRange>? supportedFrameworkRanges)
+        {
+            if (_portableCompatibilityMappings.TryGetValue(profile, out HashSet<FrameworkRange>? entries))
+            {
+                supportedFrameworkRanges = entries;
+                return supportedFrameworkRanges.Any();
+            }
+
+            supportedFrameworkRanges = null;
+            return false;
+        }
+
+        public bool TryGetPortableProfileNumber(string profile, out int profileNumber)
+        {
+            // attempt to parse the profile for a number
+            if (profile.StartsWith("Profile", StringComparison.OrdinalIgnoreCase))
+            {
+                var trimmed = profile.Substring(7, profile.Length - 7);
+                return int.TryParse(trimmed, out profileNumber);
+            }
+
+            profileNumber = -1;
+            return false;
+        }
+
+        public bool TryGetPortableFrameworks(string profile, bool includeOptional, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            // attempt to parse the profile for a number
+            int profileNum;
+            if (TryGetPortableProfileNumber(profile, out profileNum))
+            {
+                if (TryGetPortableFrameworks(profileNum, includeOptional, out frameworks))
+                {
+                    return true;
+                }
+
+                frameworks = [];
+                return false;
+            }
+
+            // treat the profile as a list of frameworks
+            return TryGetPortableFrameworks(profile, out frameworks);
+        }
+
+        public bool TryGetEquivalentFrameworks(NuGetFramework framework, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            var result = new HashSet<NuGetFramework>();
+
+            // add in all framework aliases
+            if (_equivalentFrameworks.TryGetValue(framework, out HashSet<NuGetFramework>? eqFrameworks))
+            {
+                foreach (var eqFw in eqFrameworks)
+                {
+                    result.Add(eqFw);
+                }
+            }
+
+            var baseFrameworks = new List<NuGetFramework>(result);
+            baseFrameworks.Add(framework);
+
+            // add in all profile aliases
+            foreach (var fw in baseFrameworks)
+            {
+                if (_equivalentProfiles.TryGetValue(fw.Framework, out Dictionary<string, HashSet<string>>? eqProfiles))
+                {
+                    if (eqProfiles.TryGetValue(fw.Profile, out HashSet<string>? matchingProfiles))
+                    {
+                        foreach (var eqProfile in matchingProfiles)
+                        {
+                            result.Add(new NuGetFramework(fw.Framework, fw.Version, eqProfile));
+                        }
+                    }
+                }
+            }
+
+            // do not include the original framework
+            result.Remove(framework);
+
+            frameworks = result;
+            return result.Count > 0;
+        }
+
+        public bool TryGetEquivalentFrameworks(FrameworkRange range, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks)
+        {
+            if (range == null)
+            {
+                throw new ArgumentNullException(nameof(range));
+            }
+
+            var relevant = new HashSet<NuGetFramework>();
+
+            foreach (var framework in _equivalentFrameworks.Keys.Where(f => range.Satisfies(f)))
+            {
+                relevant.Add(framework);
+            }
+
+            var results = new HashSet<NuGetFramework>();
+
+            foreach (var framework in relevant)
+            {
+                if (TryGetEquivalentFrameworks(framework, out IEnumerable<NuGetFramework>? values))
+                {
+                    foreach (var val in values)
+                    {
+                        results.Add(val);
+                    }
+                }
+            }
+
+            frameworks = results;
+            return results.Count > 0;
+        }
+
+        private void InitMappings(IEnumerable<IFrameworkMappings>? mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    // eq profiles
+                    AddEquivalentProfiles(mapping.EquivalentProfiles);
+
+                    // equivalent frameworks
+                    AddEquivalentFrameworks(mapping.EquivalentFrameworks);
+
+                    // add synonyms
+                    AddFrameworkSynonyms(mapping.IdentifierSynonyms);
+
+                    // populate short <-> long
+                    AddIdentifierShortNames(mapping.IdentifierShortNames);
+
+                    // official profile short names
+                    AddProfileShortNames(mapping.ProfileShortNames);
+
+                    // add compatibility mappings
+                    AddCompatibilityMappings(mapping.CompatibilityMappings);
+
+                    // add subset frameworks
+                    AddSubSetFrameworks(mapping.SubSetFrameworks);
+
+                    // add framework ordering rules
+                    AddFrameworkPrecedenceMappings(_nonPackageBasedFrameworkPrecedence, mapping.NonPackageBasedFrameworkPrecedence);
+                    AddFrameworkPrecedenceMappings(_packageBasedFrameworkPrecedence, mapping.PackageBasedFrameworkPrecedence);
+                    AddFrameworkPrecedenceMappings(_equivalentFrameworkPrecedence, mapping.EquivalentFrameworkPrecedence);
+
+                    // add rewrite rules
+                    AddShortNameRewriteMappings(mapping.ShortNameReplacements);
+                    AddFullNameRewriteMappings(mapping.FullNameReplacements);
+                }
+            }
+        }
+
+        private void InitPortableMappings(IEnumerable<IPortableFrameworkMappings>? portableMappings)
+        {
+            if (portableMappings != null)
+            {
+                foreach (var portableMapping in portableMappings)
+                {
+                    // populate portable framework names
+                    AddPortableProfileMappings(portableMapping.ProfileFrameworks);
+
+                    // populate portable optional frameworks
+                    AddPortableOptionalFrameworks(portableMapping.ProfileOptionalFrameworks);
+
+                    // populate portable compatibility mappings
+                    AddPortableCompatibilityMappings(portableMapping.CompatibilityMappings);
+                }
+            }
+        }
+
+        private void InitNetStandard()
+        {
+            // populate the list of frameworks that could be compatible with NetStandard
+            AddCompatibleCandidates();
+
+            // populate the list of NetStandard versions
+            AddNetStandardVersions();
+        }
+
+        private void AddShortNameRewriteMappings(IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    if (!_shortNameRewrites.ContainsKey(mapping.Key))
+                    {
+                        _shortNameRewrites.Add(mapping.Key, mapping.Value);
+                    }
+                }
+            }
+        }
+
+        private void AddFullNameRewriteMappings(IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    if (!_fullNameRewrites.ContainsKey(mapping.Key))
+                    {
+                        _fullNameRewrites.Add(mapping.Key, mapping.Value);
+                    }
+                }
+            }
+        }
+
+        private void AddCompatibilityMappings(IEnumerable<OneWayCompatibilityMappingEntry> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    if (!_compatibilityMappings.TryGetValue(mapping.TargetFrameworkRange.Min.Framework, out HashSet<OneWayCompatibilityMappingEntry>? entries))
+                    {
+                        entries = new HashSet<OneWayCompatibilityMappingEntry>(OneWayCompatibilityMappingEntry.Comparer);
+                        _compatibilityMappings.Add(mapping.TargetFrameworkRange.Min.Framework, entries);
+                    }
+
+                    entries.Add(mapping);
+                }
+            }
+        }
+
+        private void AddSubSetFrameworks(IEnumerable<KeyValuePair<string, string>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    if (!_subSetFrameworks.TryGetValue(mapping.Value, out HashSet<string>? subSets))
+                    {
+                        subSets = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                        _subSetFrameworks.Add(mapping.Value, subSets);
+                    }
+
+                    subSets.Add(mapping.Key);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 2 way per framework profile equivalence
+        /// </summary>
+        /// <param name="mappings"></param>
+        private void AddEquivalentProfiles(IEnumerable<FrameworkSpecificMapping> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var profileMapping in mappings)
+                {
+                    var frameworkIdentifier = profileMapping.FrameworkIdentifier;
+                    var profile1 = profileMapping.Mapping.Key;
+                    var profile2 = profileMapping.Mapping.Value;
+
+                    if (!_equivalentProfiles.TryGetValue(frameworkIdentifier, out Dictionary<string, HashSet<string>>? profileMappings))
+                    {
+                        profileMappings = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
+                        _equivalentProfiles.Add(frameworkIdentifier, profileMappings);
+                    }
+
+                    if (!profileMappings.TryGetValue(profile1, out HashSet<string>? innerMappings1))
+                    {
+                        innerMappings1 = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                        profileMappings.Add(profile1, innerMappings1);
+                    }
+
+                    if (!profileMappings.TryGetValue(profile2, out HashSet<string>? innerMappings2))
+                    {
+                        innerMappings2 = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                        profileMappings.Add(profile2, innerMappings2);
+                    }
+
+                    innerMappings1.Add(profile2);
+                    innerMappings2.Add(profile1);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 2 way framework equivalence
+        /// </summary>
+        /// <param name="mappings"></param>
+        private void AddEquivalentFrameworks(IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var pair in mappings)
+                {
+                    var remaining = new Stack<NuGetFramework>();
+                    remaining.Push(pair.Key);
+                    remaining.Push(pair.Value);
+
+                    var seen = new HashSet<NuGetFramework>();
+                    while (remaining.Any())
+                    {
+                        var next = remaining.Pop();
+                        if (!seen.Add(next))
+                        {
+                            continue;
+                        }
+
+                        if (!_equivalentFrameworks.TryGetValue(next, out HashSet<NuGetFramework>? eqFrameworks))
+                        {
+                            // initialize set
+                            eqFrameworks = new HashSet<NuGetFramework>();
+                            _equivalentFrameworks.Add(next, eqFrameworks);
+                        }
+                        else
+                        {
+                            // explore all equivalent
+                            foreach (var framework in eqFrameworks)
+                            {
+                                remaining.Push(framework);
+                            }
+                        }
+                    }
+
+                    // add this equivalency rule, enforcing transitivity
+                    foreach (var framework in seen)
+                    {
+                        foreach (var other in seen)
+                        {
+                            if (!NuGetFramework.Comparer.Equals(framework, other))
+                            {
+                                _equivalentFrameworks[framework].Add(other);
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+
+        private void AddFrameworkSynonyms(IEnumerable<KeyValuePair<string, string>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var pair in mappings)
+                {
+                    if (!_identifierSynonyms.ContainsKey(pair.Key))
+                    {
+                        _identifierSynonyms.Add(pair.Key, pair.Value);
+                    }
+                }
+            }
+        }
+
+        private void AddIdentifierShortNames(IEnumerable<KeyValuePair<string, string>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var pair in mappings)
+                {
+                    var shortName = pair.Value;
+                    var longName = pair.Key;
+
+                    if (!_identifierSynonyms.ContainsKey(pair.Value))
+                    {
+                        _identifierSynonyms.Add(pair.Value, pair.Key);
+                    }
+
+                    _identifierShortToLong.Add(shortName, longName);
+
+                    _identifierToShortName.Add(longName, shortName);
+                }
+            }
+        }
+
+        private void AddProfileShortNames(IEnumerable<FrameworkSpecificMapping> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var profileMapping in mappings)
+                {
+                    _profilesToShortName.Add(profileMapping.Mapping.Value, profileMapping.Mapping.Key);
+                    _profileShortToLong.Add(profileMapping.Mapping.Key, profileMapping.Mapping.Value);
+                }
+            }
+        }
+
+        // Add supported frameworks for each portable profile number
+        private void AddPortableProfileMappings(IEnumerable<KeyValuePair<int, NuGetFramework[]>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var pair in mappings)
+                {
+                    if (!_portableFrameworks.TryGetValue(pair.Key, out HashSet<NuGetFramework>? frameworks))
+                    {
+                        frameworks = new HashSet<NuGetFramework>();
+                        _portableFrameworks.Add(pair.Key, frameworks);
+                    }
+
+                    foreach (var fw in pair.Value)
+                    {
+                        frameworks.Add(fw);
+                    }
+                }
+            }
+        }
+
+        // Add optional frameworks for each portable profile number
+        private void AddPortableOptionalFrameworks(IEnumerable<KeyValuePair<int, NuGetFramework[]>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var pair in mappings)
+                {
+                    if (!_portableOptionalFrameworks.TryGetValue(pair.Key, out HashSet<NuGetFramework>? frameworks))
+                    {
+                        frameworks = new HashSet<NuGetFramework>();
+                        _portableOptionalFrameworks.Add(pair.Key, frameworks);
+                    }
+
+                    foreach (var fw in pair.Value)
+                    {
+                        frameworks.Add(fw);
+                    }
+                }
+            }
+        }
+
+        private void AddPortableCompatibilityMappings(IEnumerable<KeyValuePair<int, FrameworkRange>> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var mapping in mappings)
+                {
+                    if (!_portableCompatibilityMappings.TryGetValue(mapping.Key, out HashSet<FrameworkRange>? entries))
+                    {
+                        entries = new HashSet<FrameworkRange>(FrameworkRangeComparer.Instance);
+                        _portableCompatibilityMappings.Add(mapping.Key, entries);
+                    }
+
+                    entries.Add(mapping.Value);
+                }
+            }
+        }
+
+        // Ordered lists of framework identifiers
+        public void AddFrameworkPrecedenceMappings(IDictionary<string, int> destination, IEnumerable<string> mappings)
+        {
+            if (mappings != null)
+            {
+                foreach (var framework in mappings)
+                {
+                    if (!destination.ContainsKey(framework))
+                    {
+                        destination.Add(framework, destination.Count);
+                    }
+                }
+            }
+        }
+
+        public bool TryGetCompatibilityMappings(NuGetFramework framework, [NotNullWhen(true)] out IEnumerable<FrameworkRange>? supportedFrameworkRanges)
+        {
+            if (_compatibilityMappings.TryGetValue(framework.Framework, out HashSet<OneWayCompatibilityMappingEntry>? entries))
+            {
+                supportedFrameworkRanges = entries.Where(m => m.TargetFrameworkRange.Satisfies(framework)).Select(m => m.SupportedFrameworkRange);
+                return supportedFrameworkRanges.Any();
+            }
+
+            supportedFrameworkRanges = null;
+            return false;
+        }
+
+        public bool TryGetSubSetFrameworks(string frameworkIdentifier, [NotNullWhen(true)] out IEnumerable<string>? subSetFrameworks)
+        {
+            if (_subSetFrameworks.TryGetValue(frameworkIdentifier, out HashSet<string>? values))
+            {
+                subSetFrameworks = values;
+                return true;
+            }
+
+            subSetFrameworks = null;
+            return false;
+        }
+
+        public int CompareFrameworks(NuGetFramework? x, NuGetFramework? y)
+        {
+            if (x is null && y is null) return 0;
+            if (x is null) return -1;
+            if (y is null) return 1;
+
+            // For the purposes of this compare do not treat netcore50 as packages based
+            var xPackagesBased = x.IsPackageBased && !NuGetFrameworkUtility.IsNetCore50AndUp(x);
+            var yPackagesBased = y.IsPackageBased && !NuGetFrameworkUtility.IsNetCore50AndUp(y);
+
+            if (xPackagesBased != yPackagesBased)
+            {
+                // non-package based always come before package based
+                return xPackagesBased.CompareTo(yPackagesBased);
+            }
+
+            var precedence = xPackagesBased ? _packageBasedFrameworkPrecedence : _nonPackageBasedFrameworkPrecedence;
+
+            return CompareUsingPrecedence(x, y, precedence);
+        }
+
+        public int CompareEquivalentFrameworks(NuGetFramework? x, NuGetFramework? y)
+        {
+            return CompareUsingPrecedence(x, y, _equivalentFrameworkPrecedence);
+        }
+
+        private static int CompareUsingPrecedence(NuGetFramework? x, NuGetFramework? y, Dictionary<string, int> precedence)
+        {
+            if (x is null && y is null) return 0;
+            if (x is null) return -1;
+            if (y is null) return 1;
+
+            if (StringComparer.OrdinalIgnoreCase.Equals(x.Framework, y.Framework))
+            {
+                return 0;
+            }
+
+            int xIndex;
+            if (!precedence.TryGetValue(x.Framework, out xIndex))
+            {
+                xIndex = int.MaxValue;
+            }
+
+            int yIndex;
+            if (!precedence.TryGetValue(y.Framework, out yIndex))
+            {
+                yIndex = int.MaxValue;
+            }
+
+            return xIndex.CompareTo(yIndex);
+        }
+
+
+        public NuGetFramework GetShortNameReplacement(NuGetFramework framework)
+        {
+            // Replace the framework name if a rewrite exists
+            if (!_shortNameRewrites.TryGetValue(framework, out NuGetFramework? result))
+            {
+                result = framework;
+            }
+
+            return result;
+        }
+
+        public NuGetFramework GetFullNameReplacement(NuGetFramework framework)
+        {
+            // Replace the framework name if a rewrite exists
+            if (!_fullNameRewrites.TryGetValue(framework, out NuGetFramework? result))
+            {
+                result = framework;
+            }
+
+            return result;
+        }
+
+        public IEnumerable<NuGetFramework> GetNetStandardVersions()
+        {
+            return _netStandardVersions.AsReadOnly();
+        }
+
+        public IEnumerable<NuGetFramework> GetCompatibleCandidates()
+        {
+            return _compatibleCandidates.AsReadOnly();
+        }
+
+        private void AddNetStandardVersions()
+        {
+            foreach (var framework in _compatibleCandidates)
+            {
+                if (StringComparer.OrdinalIgnoreCase.Equals(framework.Framework, FrameworkConstants.FrameworkIdentifiers.NetStandard))
+                {
+                    _netStandardVersions.Add(framework);
+                }
+            }
+
+            _netStandardVersions.Sort(NuGetFrameworkSorter.Instance);
+        }
+
+        private void AddCompatibleCandidates()
+        {
+            var set = new HashSet<NuGetFramework>();
+
+            // equivalent
+            foreach (var framework in _equivalentFrameworks.Values.SelectMany(x => x))
+            {
+                set.Add(framework);
+            }
+
+            // compatible
+            foreach (var mapping in _compatibilityMappings.SelectMany(p => p.Value))
+            {
+                set.Add(mapping.TargetFrameworkRange.Min);
+                set.Add(mapping.TargetFrameworkRange.Max);
+                set.Add(mapping.SupportedFrameworkRange.Min);
+                set.Add(mapping.SupportedFrameworkRange.Max);
+            }
+
+            // portable compatible
+            foreach (var pair in _portableCompatibilityMappings)
+            {
+                var portable = new NuGetFramework(
+                    FrameworkConstants.FrameworkIdentifiers.Portable,
+                    FrameworkConstants.EmptyVersion,
+                    string.Format(NumberFormatInfo.InvariantInfo, "Profile{0}", pair.Key));
+
+                set.Add(portable);
+                foreach (var range in pair.Value)
+                {
+                    set.Add(range.Min);
+                    set.Add(range.Max);
+                }
+            }
+
+            // subset and superset
+            var superSetFrameworks = _subSetFrameworks
+                .SelectMany(p => p.Value.Select(subset => new { Superset = p.Key, Subset = subset }))
+                .GroupBy(p => p.Subset, p => p.Superset, StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(g => g.Key, g => new HashSet<string>(g, StringComparer.OrdinalIgnoreCase));
+
+            foreach (var framework in set.ToArray())
+            {
+                if (framework.HasProfile)
+                {
+                    continue;
+                }
+
+                if (_subSetFrameworks.TryGetValue(framework.Framework, out HashSet<string>? subset))
+                {
+                    foreach (var subFramework in subset)
+                    {
+                        set.Add(new NuGetFramework(subFramework, framework.Version, framework.Profile));
+                    }
+                }
+
+                if (superSetFrameworks.TryGetValue(framework.Framework, out HashSet<string>? superset))
+                {
+                    foreach (var superFramework in superset)
+                    {
+                        set.Add(new NuGetFramework(superFramework, framework.Version, framework.Profile));
+                    }
+                }
+            }
+
+            _compatibleCandidates.AddRange(set);
+            _compatibleCandidates.Sort(NuGetFrameworkSorter.Instance);
+        }
+
+        // Strong typed non-IEnumerator based HashSet functions
+        private static bool SetEquals(HashSet<NuGetFramework> left, HashSet<NuGetFramework> right)
+        {
+            if (left.Count != right.Count)
+            {
+                return false;
+            }
+
+            foreach (var fw in left)
+            {
+                if (!right.Contains(fw))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static void UnionWith(HashSet<NuGetFramework> toAccumulate, HashSet<NuGetFramework> toAdd)
+        {
+            foreach (var fw in toAdd)
+            {
+                toAccumulate.Add(fw);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkPrecedenceSorter.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkPrecedenceSorter.cs
new file mode 100644
index 0000000000..7c72d24b07
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkPrecedenceSorter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// Sorts frameworks according to the framework mappings
+    /// </summary>
+    internal class FrameworkPrecedenceSorter : IComparer<NuGetFramework>
+    {
+        private readonly IFrameworkNameProvider _mappings;
+        private readonly bool _allEquivalent;
+
+        public FrameworkPrecedenceSorter(IFrameworkNameProvider mappings, bool allEquivalent)
+        {
+            _mappings = mappings ?? throw new ArgumentNullException(nameof(mappings));
+            _allEquivalent = allEquivalent;
+        }
+
+        public int Compare(NuGetFramework? x, NuGetFramework? y)
+        {
+            return _allEquivalent ? _mappings.CompareEquivalentFrameworks(x, y) : _mappings.CompareFrameworks(x, y);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRange.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRange.cs
new file mode 100644
index 0000000000..1ef6c58d6b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRange.cs
@@ -0,0 +1,119 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// An inclusive range of frameworks
+    /// </summary>
+    internal class FrameworkRange : IEquatable<FrameworkRange>
+    {
+        private readonly bool _includeMin;
+        private readonly bool _includeMax;
+
+        public FrameworkRange(NuGetFramework min, NuGetFramework max)
+            : this(min, max, true, true)
+        {
+
+        }
+
+        public FrameworkRange(NuGetFramework min, NuGetFramework max, bool includeMin, bool includeMax)
+        {
+            if (min == null) throw new ArgumentNullException(nameof(min));
+            if (max == null) throw new ArgumentNullException(nameof(max));
+
+            if (!SameExceptForVersion(min, max))
+            {
+                throw new FrameworkException(Strings.FrameworkMismatch);
+            }
+
+            Min = min;
+            Max = max;
+            _includeMin = includeMin;
+            _includeMax = includeMax;
+        }
+
+        /// <summary>
+        /// Minimum Framework
+        /// </summary>
+        public NuGetFramework Min { get; }
+
+        /// <summary>
+        /// Maximum Framework
+        /// </summary>
+        public NuGetFramework Max { get; }
+
+        /// <summary>
+        /// Minimum version inclusiveness.
+        /// </summary>
+        public bool IncludeMin
+        {
+            get
+            {
+                return _includeMin;
+            }
+        }
+
+        /// <summary>
+        /// Maximum version inclusiveness.
+        /// </summary>
+        public bool IncludeMax
+        {
+            get
+            {
+                return _includeMax;
+            }
+        }
+
+        /// <summary>
+        /// Framework Identifier of both the Min and Max
+        /// </summary>
+        public string FrameworkIdentifier => Min.Framework;
+
+        /// <summary>
+        /// True if the framework version falls between the min and max
+        /// </summary>
+        public bool Satisfies(NuGetFramework framework)
+        {
+            return SameExceptForVersion(Min, framework)
+                && (_includeMin ? Min.Version <= framework.Version : Min.Version < framework.Version)
+                && (_includeMax ? Max.Version >= framework.Version : Max.Version > framework.Version);
+        }
+
+        private static bool SameExceptForVersion(NuGetFramework x, NuGetFramework y)
+        {
+            return StringComparer.OrdinalIgnoreCase.Equals(x.Framework, y.Framework)
+                   && (StringComparer.OrdinalIgnoreCase.Equals(x.Profile, y.Profile));
+        }
+
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "[{0}, {1}]", Min.ToString(), Max.ToString());
+        }
+
+        public bool Equals(FrameworkRange? other)
+        {
+            return FrameworkRangeComparer.Instance.Equals(this, other);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            var other = obj as FrameworkRange;
+
+            if (other != null)
+            {
+                return Equals(other);
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return FrameworkRangeComparer.Instance.GetHashCode(this);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRangeComparer.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRangeComparer.cs
new file mode 100644
index 0000000000..a615279fc0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkRangeComparer.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using NuGetClone.Shared;
+
+namespace NuGetClone.Frameworks
+{
+    internal class FrameworkRangeComparer : IEqualityComparer<FrameworkRange>
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static FrameworkRangeComparer Instance { get; } = new();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Obsolete("Use singleton FrameworkRangeComparer.Instance instead")]
+        public FrameworkRangeComparer()
+        {
+        }
+
+        public bool Equals(FrameworkRange? x, FrameworkRange? y)
+        {
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (ReferenceEquals(x, null)
+                || ReferenceEquals(y, null))
+            {
+                return false;
+            }
+
+            return StringComparer.OrdinalIgnoreCase.Equals(x.FrameworkIdentifier, y.FrameworkIdentifier) &&
+                   NuGetFramework.Comparer.Equals(x.Min, y.Min) && NuGetFramework.Comparer.Equals(x.Max, y.Max)
+                   && x.IncludeMin == y.IncludeMin && x.IncludeMax == y.IncludeMax;
+        }
+
+        public int GetHashCode(FrameworkRange obj)
+        {
+            if (ReferenceEquals(obj, null))
+            {
+                return 0;
+            }
+
+            var combiner = new HashCodeCombiner();
+
+            combiner.AddStringIgnoreCase(obj.FrameworkIdentifier);
+            combiner.AddObject(obj.Min);
+            combiner.AddObject(obj.Max);
+            combiner.AddObject(obj.IncludeMin);
+            combiner.AddObject(obj.IncludeMax);
+
+            return combiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkReducer.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkReducer.cs
new file mode 100644
index 0000000000..9c2ab2fd57
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkReducer.cs
@@ -0,0 +1,561 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// Reduces a list of frameworks into the smallest set of frameworks required.
+    /// </summary>
+    internal class FrameworkReducer
+    {
+        private readonly IFrameworkNameProvider _mappings;
+        private readonly IFrameworkCompatibilityProvider _compat;
+
+        /// <summary>
+        /// Creates a FrameworkReducer using the default framework mappings.
+        /// </summary>
+        public FrameworkReducer()
+            : this(DefaultFrameworkNameProvider.Instance, DefaultCompatibilityProvider.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a FrameworkReducer using custom framework mappings.
+        /// </summary>
+        public FrameworkReducer(IFrameworkNameProvider mappings, IFrameworkCompatibilityProvider compat)
+        {
+            _mappings = mappings ?? throw new ArgumentNullException(nameof(mappings));
+            _compat = compat ?? throw new ArgumentNullException(nameof(compat));
+        }
+
+        /// <summary>
+        /// Returns the nearest matching framework that is compatible.
+        /// </summary>
+        /// <param name="framework">Project target framework</param>
+        /// <param name="possibleFrameworks">Possible frameworks to narrow down</param>
+        /// <returns>Nearest compatible framework. If no frameworks are compatible null is returned.</returns>
+        public NuGetFramework? GetNearest(NuGetFramework framework, IEnumerable<NuGetFramework> possibleFrameworks)
+        {
+            if (framework == null) throw new ArgumentNullException(nameof(framework));
+            if (possibleFrameworks == null) throw new ArgumentNullException(nameof(possibleFrameworks));
+
+            var nearest = GetNearestInternal(framework, possibleFrameworks);
+
+            var fallbackFramework = framework as FallbackFramework;
+
+            if (fallbackFramework != null)
+            {
+                if (nearest == null || nearest.IsAny)
+                {
+                    foreach (var supportFramework in fallbackFramework.Fallback)
+                    {
+                        nearest = GetNearestInternal(supportFramework, possibleFrameworks);
+                        if (nearest != null)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return nearest;
+        }
+
+        private NuGetFramework? GetNearestInternal(NuGetFramework framework, IEnumerable<NuGetFramework> possibleFrameworks)
+        {
+            NuGetFramework? nearest = null;
+
+            // Unsupported frameworks always lose, throw them out unless it's all we were given
+            if (possibleFrameworks.Any(e => e != NuGetFramework.UnsupportedFramework))
+            {
+                possibleFrameworks = possibleFrameworks.Where(e => e != NuGetFramework.UnsupportedFramework);
+            }
+
+            // Try exact matches first
+            nearest = possibleFrameworks.Where(f => NuGetFrameworkFullComparer.Instance.Equals(framework, f)).FirstOrDefault();
+
+            if (nearest == null)
+            {
+                // Elimate non-compatible frameworks
+                var compatible = possibleFrameworks.Where(f => _compat.IsCompatible(framework, f));
+
+                // Remove lower versions of compatible frameworks
+                var reduced = ReduceUpwards(compatible);
+
+                bool isNet6Era = framework.IsNet5Era && framework.Version.Major >= 6;
+
+                // Reduce to the same framework name if possible, with an exception for Xamarin, MonoAndroid and Tizen when net6.0+
+                if (reduced.Count() > 1 && reduced.Any(f => NuGetFrameworkNameComparer.Instance.Equals(f, framework)))
+                {
+                    reduced = reduced.Where(f =>
+                    {
+                        if (isNet6Era && framework.HasPlatform && (
+                            f.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, StringComparison.OrdinalIgnoreCase)
+                            || f.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.Tizen, StringComparison.OrdinalIgnoreCase)
+                            ))
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            return NuGetFrameworkNameComparer.Instance.Equals(f, framework);
+                        }
+                    });
+                }
+
+                // PCL reduce
+                if (reduced.Count() > 1)
+                {
+                    // if we have a pcl and non-pcl mix, throw out the pcls
+                    if (reduced.Any(f => f.IsPCL)
+                        && reduced.Any(f => !f.IsPCL))
+                    {
+                        reduced = reduced.Where(f => !f.IsPCL);
+                    }
+                    else if (reduced.All(f => f.IsPCL))
+                    {
+                        // decide between PCLs
+                        if (framework.IsPCL)
+                        {
+                            reduced = GetNearestPCLtoPCL(framework, reduced);
+                        }
+                        else
+                        {
+                            reduced = GetNearestNonPCLtoPCL(framework, reduced);
+                        }
+
+                        if (reduced.Count() > 1)
+                        {
+                            // For scenarios where we are unable to decide between PCLs, choose the PCL with the
+                            // least frameworks. Less frameworks means less compatibility which means it is nearer to the target.
+                            reduced = new NuGetFramework[] { GetBestPCL(reduced)! };
+                        }
+                    }
+                }
+
+                // Packages based framework reduce, only if the project is not packages based
+                if (reduced.Count() > 1
+                    && !framework.IsPackageBased
+                    && reduced.Any(f => f.IsPackageBased)
+                    && reduced.Any(f => !f.IsPackageBased))
+                {
+                    // If we have a packages based and non-packages based mix, throw out the packages based frameworks.
+                    // This situation is unlikely but it could happen with framework mappings that do not provide
+                    // a relationship between the frameworks and the compatible packages based frameworks.
+                    // Ex: net46, dotnet -> net46
+                    reduced = reduced.Where(f => !f.IsPackageBased);
+                }
+
+                // Profile reduce
+                if (reduced.Count() > 1
+                    && !reduced.Any(f => f.IsPCL))
+                {
+                    // Prefer the same framework and profile
+                    if (framework.HasProfile)
+                    {
+                        var sameProfile = reduced.Where(f => NuGetFrameworkNameComparer.Instance.Equals(framework, f)
+                                                             && StringComparer.OrdinalIgnoreCase.Equals(framework.Profile, f.Profile));
+
+                        if (sameProfile.Any())
+                        {
+                            reduced = sameProfile;
+                        }
+                    }
+
+                    // Prefer frameworks without profiles
+                    if (reduced.Count() > 1
+                        && reduced.Any(f => f.HasProfile)
+                        && reduced.Any(f => !f.HasProfile))
+                    {
+                        reduced = reduced.Where(f => !f.HasProfile);
+                    }
+                }
+
+                // Platforms reduce
+                if (reduced.Count() > 1
+                    && framework.HasPlatform)
+                {
+                    if (!isNet6Era || reduced.Any(f => NuGetFrameworkNameComparer.Instance.Equals(framework, f) && f.Version.Major >= 6))
+                    {
+                        // Prefer the highest framework version, likely to be the non-platform specific option.
+                        reduced = reduced.Where(f => NuGetFrameworkNameComparer.Instance.Equals(framework, f)).GroupBy(f => f.Version).OrderByDescending(f => f.Key).First();
+                    }
+                    else if (isNet6Era && reduced.Any(f =>
+                    {
+                        return f.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, StringComparison.OrdinalIgnoreCase)
+                        || f.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.Tizen, StringComparison.OrdinalIgnoreCase);
+                    }))
+                    {
+                        // We have a special case for *some* Xamarin-related frameworks here. For specific precedence rules, please see:
+                        // https://github.com/dotnet/designs/blob/main/accepted/2021/net6.0-tfms/net6.0-tfms.md#compatibility-rules
+                        reduced = reduced.GroupBy(f => f.Framework).OrderByDescending(f => f.Key).First(f =>
+                        {
+                            NuGetFramework first = f.First();
+                            return first.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.MonoAndroid, StringComparison.OrdinalIgnoreCase)
+                                || first.Framework.Equals(FrameworkConstants.FrameworkIdentifiers.Tizen, StringComparison.OrdinalIgnoreCase);
+                        });
+                    }
+                }
+
+                // if we have reduced down to a single framework, use that
+                if (reduced.Count() == 1)
+                {
+                    nearest = reduced.Single();
+                }
+
+                // this should be a very rare occurrence
+                // at this point we are unable to decide between the remaining frameworks in any useful way
+                // just take the first one by rev alphabetical order if we can't narrow it down at all
+                if (nearest == null && reduced.Any())
+                {
+                    // Sort by precedence rules, then by name in the case of a tie
+                    nearest = reduced
+                        .OrderBy(f => f, new FrameworkPrecedenceSorter(_mappings, false))
+                        .ThenByDescending(f => f, NuGetFrameworkSorter.Instance)
+                        .ThenBy(f => f.GetHashCode())
+                        .First();
+                }
+            }
+
+            return nearest;
+        }
+
+        /// <summary>
+        /// Remove duplicates found in the equivalence mappings.
+        /// </summary>
+        public IEnumerable<NuGetFramework> ReduceEquivalent(IEnumerable<NuGetFramework> frameworks)
+        {
+            if (frameworks == null) throw new ArgumentNullException(nameof(frameworks));
+
+            // order first so we get consistent results for equivalent frameworks
+            var input = frameworks
+                .OrderBy(f => f, new FrameworkPrecedenceSorter(_mappings, true))
+                .ThenByDescending(f => f, NuGetFrameworkSorter.Instance)
+                .ToArray();
+
+            var duplicates = new HashSet<NuGetFramework>();
+            foreach (var framework in input)
+            {
+                if (duplicates.Contains(framework))
+                {
+                    continue;
+                }
+
+                yield return framework;
+
+                duplicates.Add(framework);
+
+                if (_mappings.TryGetEquivalentFrameworks(framework, out IEnumerable<NuGetFramework>? eqFrameworks))
+                {
+                    foreach (var eqFramework in eqFrameworks)
+                    {
+                        duplicates.Add(eqFramework);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reduce to the highest framework
+        /// Ex: net45, net403, net40 -> net45
+        /// </summary>
+        public IEnumerable<NuGetFramework> ReduceUpwards(IEnumerable<NuGetFramework> frameworks)
+        {
+            if (frameworks is null) throw new ArgumentNullException(nameof(frameworks));
+
+            // NuGetFramework.AnyFramework is a special case
+            if (frameworks.Any(e => e != NuGetFramework.AnyFramework))
+            {
+                // Remove all instances of Any unless it is the only one in the list
+                frameworks = frameworks.Where(e => e != NuGetFramework.AnyFramework);
+            }
+
+            // x: net40 j: net45 -> remove net40
+            // x: wp8 j: win8 -> keep wp8
+            return ReduceCore(frameworks, (x, y) => _compat.IsCompatible(y, x)).ToArray();
+        }
+
+        /// <summary>
+        /// Reduce to the lowest framework
+        /// Ex: net45, net403, net40 -> net40
+        /// </summary>
+        public IEnumerable<NuGetFramework> ReduceDownwards(IEnumerable<NuGetFramework> frameworks)
+        {
+            if (frameworks is null) throw new ArgumentNullException(nameof(frameworks));
+
+            // NuGetFramework.AnyFramework is a special case
+            if (frameworks.Any(e => e == NuGetFramework.AnyFramework))
+            {
+                // Any is always the lowest
+                return new[] { NuGetFramework.AnyFramework };
+            }
+
+            return ReduceCore(frameworks, (x, y) => _compat.IsCompatible(x, y)).ToArray();
+        }
+
+        private IEnumerable<NuGetFramework> ReduceCore(IEnumerable<NuGetFramework> frameworks, Func<NuGetFramework, NuGetFramework, bool> isCompat)
+        {
+            // remove duplicate frameworks
+            var input = frameworks.Distinct(NuGetFrameworkFullComparer.Instance).ToArray();
+
+            var results = new List<NuGetFramework>(input.Length);
+
+            for (var i = 0; i < input.Length; i++)
+            {
+                var dupe = false;
+
+                var x = input[i];
+
+                for (var j = 0; !dupe && j < input.Length; j++)
+                {
+                    if (j != i)
+                    {
+                        var y = input[j];
+
+                        // remove frameworks that are compatible with other frameworks in the list
+                        // do not remove frameworks which tie with others, for example: net40 and net40-client
+                        // these equivalent frameworks should both be returned to let the caller decide between them
+                        if (isCompat(x, y))
+                        {
+                            var revCompat = isCompat(y, x);
+
+                            dupe = !revCompat;
+
+                            // for scenarios where the framework identifiers are the same dupe the zero version
+                            // Ex: win, win8 - these are equivalent, but only one is needed
+                            if (revCompat && NuGetFrameworkNameComparer.Instance.Equals(x, y))
+                            {
+                                // Throw out the zero version
+                                // Profile, Platform, and all other aspects should have been covered by the compat check already
+                                dupe = x.Version == FrameworkConstants.EmptyVersion && y.Version != FrameworkConstants.EmptyVersion;
+                            }
+                        }
+                    }
+                }
+
+                if (!dupe)
+                {
+                    results.Add(input[i]);
+                }
+            }
+
+            // sort the results just to make this more deterministic for the callers
+            return results.OrderBy(f => f.Framework, StringComparer.OrdinalIgnoreCase).ThenBy(f => f.ToString());
+        }
+
+        private IEnumerable<NuGetFramework> GetNearestNonPCLtoPCL(NuGetFramework framework, IEnumerable<NuGetFramework> reduced)
+        {
+            // If framework is not a PCL, find the PCL with the sub framework nearest to framework
+            // Collect all frameworks from all PCLs we are considering
+            var pclToFrameworks = ExplodePortableFrameworks(reduced);
+            var allPclFrameworks = pclToFrameworks.Values.SelectMany(f => f);
+
+            // Find the nearest (no PCLs are involved at this point)
+            Debug.Assert(allPclFrameworks.All(f => !f.IsPCL), "a PCL returned a PCL as its profile framework");
+            var nearestProfileFramework = GetNearest(framework, allPclFrameworks);
+
+            // Reduce to only PCLs that include the nearest match
+            reduced = pclToFrameworks.Where(pair =>
+                pair.Value.Contains(nearestProfileFramework))
+                .Select(pair => pair.Key);
+
+            return reduced;
+        }
+
+        private IEnumerable<NuGetFramework> GetNearestPCLtoPCL(NuGetFramework framework, IEnumerable<NuGetFramework> reduced)
+        {
+            // Compare each framework in the target framework individually
+            // against the list of possible PCLs. This effectively lets
+            // each sub-framework vote on which PCL is nearest.
+            var subFrameworks = ExplodePortableFramework(framework);
+
+            // reduce the sub frameworks - this would only have an effect if the PCL is
+            // poorly formed and contains duplicates such as portable-win8+win81
+            subFrameworks = ReduceEquivalent(subFrameworks);
+
+            // Find all frameworks in all PCLs
+            var pclToFrameworks = ExplodePortableFrameworks(reduced);
+            var allPclFrameworks = pclToFrameworks.Values.SelectMany(f => f).Distinct(NuGetFrameworkFullComparer.Instance);
+
+            var scores = new Dictionary<NuGetFramework, int>();
+
+            // find the nearest PCL for each framework
+            foreach (var sub in subFrameworks)
+            {
+                Debug.Assert(!sub.IsPCL, "a PCL returned a PCL as its profile framework");
+
+                // from all possible frameworks, find the best match
+                var nearestForSub = GetNearest(sub, allPclFrameworks);
+
+                if (nearestForSub != null)
+                {
+                    // +1 each framework containing the best match
+                    foreach (KeyValuePair<NuGetFramework, IEnumerable<NuGetFramework>> pair in pclToFrameworks)
+                    {
+                        if (pair.Value.Contains(nearestForSub, NuGetFrameworkFullComparer.Instance))
+                        {
+                            if (!scores.ContainsKey(pair.Key))
+                            {
+                                scores.Add(pair.Key, 1);
+                            }
+                            else
+                            {
+                                scores[pair.Key]++;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // take the highest vote count, this will be at least one
+            reduced = scores.GroupBy(pair => pair.Value).OrderByDescending(g => g.Key).First().Select(e => e.Key);
+
+            return reduced;
+        }
+
+        /// <summary>
+        /// Create lookup of the given PCLs to their actual frameworks
+        /// </summary>
+        private Dictionary<NuGetFramework, IEnumerable<NuGetFramework>> ExplodePortableFrameworks(IEnumerable<NuGetFramework> pcls)
+        {
+            var result = new Dictionary<NuGetFramework, IEnumerable<NuGetFramework>>();
+
+            foreach (var pcl in pcls)
+            {
+                var frameworks = ExplodePortableFramework(pcl);
+                result.Add(pcl, frameworks);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// portable-net45+win8 -> net45, win8
+        /// </summary>
+        private IEnumerable<NuGetFramework> ExplodePortableFramework(NuGetFramework pcl, bool includeOptional = true)
+        {
+            if (!_mappings.TryGetPortableFrameworks(pcl.Profile, includeOptional, out IEnumerable<NuGetFramework>? frameworks))
+            {
+                Debug.Fail("Unable to get portable frameworks from: " + pcl.ToString());
+                frameworks = [];
+            }
+
+            return frameworks;
+        }
+
+        /// <summary>
+        /// Order PCLs when there is no other way to decide.
+        /// </summary>
+        private NuGetFramework? GetBestPCL(IEnumerable<NuGetFramework> reduced)
+        {
+            NuGetFramework? current = null;
+
+            foreach (var considering in reduced)
+            {
+                if (current == null
+                    || IsBetterPCL(current, considering))
+                {
+                    current = considering;
+                }
+            }
+
+            return current;
+        }
+
+        /// <summary>
+        /// Sort PCLs using these criteria
+        /// 1. Lowest number of frameworks (highest surface area) wins first
+        /// 2. Profile with the highest version numbers wins next
+        /// 3. String compare is used as a last resort
+        /// </summary>
+        private bool IsBetterPCL(NuGetFramework current, NuGetFramework considering)
+        {
+            Debug.Assert(considering.IsPCL && current.IsPCL, "This method should be used only to compare PCLs");
+
+            // Find all frameworks in the profile
+            var consideringFrameworks = ExplodePortableFramework(considering, false);
+
+            var currentFrameworks = ExplodePortableFramework(current, false);
+
+            // The PCL with the least frameworks (highest surface area) goes first
+            if (consideringFrameworks.Count() < currentFrameworks.Count())
+            {
+                return true;
+            }
+            else if (currentFrameworks.Count() < consideringFrameworks.Count())
+            {
+                return false;
+            }
+
+            // If both frameworks have the same number of frameworks take the framework that has the highest
+            // overall set of framework versions
+
+            // Find Frameworks that both profiles have in common
+            var sharedFrameworkIds = consideringFrameworks.Select(f => f.Framework)
+                .Where(f =>
+                    currentFrameworks.Any(consideringFramework => StringComparer.OrdinalIgnoreCase.Equals(f, consideringFramework.Framework)));
+
+            var consideringHighest = 0;
+            var currentHighest = 0;
+
+            // Determine which framework has the highest version of each shared framework
+            foreach (var sharedId in sharedFrameworkIds)
+            {
+                var consideringFramework = consideringFrameworks.First(f => StringComparer.OrdinalIgnoreCase.Equals(f.Framework, sharedId));
+                var currentFramework = currentFrameworks.First(f => StringComparer.OrdinalIgnoreCase.Equals(f.Framework, sharedId));
+
+                if (consideringFramework.Version < currentFramework.Version)
+                {
+                    currentHighest++;
+                }
+                else if (currentFramework.Version < consideringFramework.Version)
+                {
+                    consideringHighest++;
+                }
+            }
+
+            // Prefer the highest count
+            if (currentHighest < consideringHighest)
+            {
+                return true;
+            }
+            else if (consideringHighest < currentHighest)
+            {
+                return false;
+            }
+
+            // Take the highest version of .NET if no winner could be determined, this is usually a good indicator of which is newer
+            var consideringNet = consideringFrameworks.FirstOrDefault(f => StringComparer.OrdinalIgnoreCase.Equals(f.Framework, FrameworkConstants.FrameworkIdentifiers.Net));
+            var currentNet = currentFrameworks.FirstOrDefault(f => StringComparer.OrdinalIgnoreCase.Equals(f.Framework, FrameworkConstants.FrameworkIdentifiers.Net));
+
+            // Compare using .NET only if both frameworks have it. PCLs should always have .NET, but since users can make these strings up we should
+            // try to handle that as best as possible.
+            if (consideringNet != null
+                && currentNet != null)
+            {
+                if (currentNet.Version < consideringNet.Version)
+                {
+                    return true;
+                }
+                else if (consideringNet.Version < currentNet.Version)
+                {
+                    return false;
+                }
+            }
+
+            // In the very rare case that both frameworks are still equal, we have to pick one.
+            // There is nothing but we need to be deterministic, so compare the profiles as strings.
+            if (StringComparer.OrdinalIgnoreCase.Compare(considering.GetShortFolderName(_mappings), current.GetShortFolderName(_mappings)) < 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkSpecificMapping.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkSpecificMapping.cs
new file mode 100644
index 0000000000..5b8ebdcb39
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/FrameworkSpecificMapping.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A keyvalue pair specific to a framework identifier
+    /// </summary>
+    internal class FrameworkSpecificMapping
+    {
+        public FrameworkSpecificMapping(string frameworkIdentifier, string key, string value)
+            : this(frameworkIdentifier, new KeyValuePair<string, string>(key, value))
+        {
+        }
+
+        public FrameworkSpecificMapping(string frameworkIdentifier, KeyValuePair<string, string> mapping)
+        {
+            FrameworkIdentifier = frameworkIdentifier ?? throw new ArgumentNullException(nameof(frameworkIdentifier));
+            Mapping = mapping;
+        }
+
+        public string FrameworkIdentifier { get; }
+
+        public KeyValuePair<string, string> Mapping { get; }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/HashCodeCombiner.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/HashCodeCombiner.cs
new file mode 100644
index 0000000000..c762592f70
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/HashCodeCombiner.cs
@@ -0,0 +1,220 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Shared
+{
+    /// <summary>
+    /// Hash code creator, based on the original NuGet hash code combiner/ASP hash code combiner implementations
+    /// </summary>
+    internal ref struct HashCodeCombiner
+    {
+        // seed from String.GetHashCode()
+        private const long Seed = 0x1505L;
+
+        private long _combinedHash = Seed;
+
+        public HashCodeCombiner()
+        {
+        }
+
+        internal int CombinedHash => _combinedHash.GetHashCode();
+
+        private void AddHashCode(int i)
+        {
+            _combinedHash = ((_combinedHash << 5) + _combinedHash) ^ i;
+        }
+
+        internal void AddObject(int i)
+        {
+            AddHashCode(i);
+        }
+
+        internal void AddObject(bool b)
+        {
+            AddHashCode(b ? 1 : 0);
+        }
+
+        internal void AddObject<T>(T? o, IEqualityComparer<T> comparer)
+            where T : class
+        {
+            if (o != null)
+            {
+                AddHashCode(comparer.GetHashCode(o));
+            }
+        }
+
+        internal void AddObject<T>(T? o)
+            where T : class
+        {
+            if (o != null)
+            {
+                AddHashCode(o.GetHashCode());
+            }
+        }
+
+        // Optimization: for value types, we can avoid boxing "o" by skipping the null check
+        internal void AddStruct<T>(T? o)
+            where T : struct
+        {
+            if (o.HasValue)
+            {
+                AddHashCode(o.GetHashCode());
+            }
+        }
+
+        // Optimization: for value types, we can avoid boxing "o" by skipping the null check
+        internal void AddStruct<T>(T o)
+            where T : struct
+        {
+            AddHashCode(o.GetHashCode());
+        }
+
+        internal void AddStringIgnoreCase(string? s)
+        {
+            if (s != null)
+            {
+                AddHashCode(StringComparer.OrdinalIgnoreCase.GetHashCode(s));
+            }
+        }
+
+        internal void AddSequence<T>(IEnumerable<T>? sequence) where T : notnull
+        {
+            if (sequence != null)
+            {
+                foreach (var item in sequence.NoAllocEnumerate())
+                {
+                    AddHashCode(item.GetHashCode());
+                }
+            }
+        }
+
+        internal void AddSequence<T>(T[]? array) where T : notnull
+        {
+            if (array != null)
+            {
+                foreach (var item in array)
+                {
+                    AddHashCode(item.GetHashCode());
+                }
+            }
+        }
+
+        internal void AddSequence<T>(IList<T>? list) where T : notnull
+        {
+            if (list != null)
+            {
+                foreach (var item in list.NoAllocEnumerate())
+                {
+                    AddHashCode(item.GetHashCode());
+                }
+            }
+        }
+
+        internal void AddSequence<T>(IReadOnlyList<T>? list) where T : notnull
+        {
+            if (list != null)
+            {
+                var count = list.Count;
+                for (var i = 0; i < count; i++)
+                {
+                    AddHashCode(list[i].GetHashCode());
+                }
+            }
+        }
+
+        internal void AddUnorderedSequence<T>(IEnumerable<T>? list) where T : notnull
+        {
+            if (list != null)
+            {
+                int count = 0;
+                int hashCode = 0;
+                foreach (var item in list.NoAllocEnumerate())
+                {
+                    // XOR is commutative -- the order of operations doesn't matter
+                    hashCode ^= item.GetHashCode();
+                    count++;
+                }
+                AddHashCode(hashCode);
+                AddHashCode(count);
+            }
+        }
+
+        internal void AddUnorderedSequence<T>(IEnumerable<T>? list, IEqualityComparer<T> comparer) where T : notnull
+        {
+            if (list != null)
+            {
+                int count = 0;
+                int hashCode = 0;
+                foreach (var item in list.NoAllocEnumerate())
+                {
+                    // XOR is commutative -- the order of operations doesn't matter
+                    hashCode ^= comparer.GetHashCode(item);
+                    count++;
+                }
+                AddHashCode(hashCode);
+                AddHashCode(count);
+            }
+        }
+
+        internal void AddDictionary<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>>? dictionary)
+            where TKey : notnull
+            where TValue : notnull
+        {
+            if (dictionary != null)
+            {
+                int count = 0;
+                int dictionaryHash = 0;
+
+                foreach (var pair in dictionary.NoAllocEnumerate())
+                {
+                    int keyHash = pair.Key.GetHashCode();
+                    int valHash = pair.Value.GetHashCode();
+                    int pairHash = ((keyHash << 5) + keyHash) ^ valHash;
+
+                    // XOR is commutative -- the order of operations doesn't matter
+                    dictionaryHash ^= pairHash;
+                    count++;
+                }
+
+                AddHashCode(dictionaryHash + count);
+            }
+        }
+
+        /// <summary>
+        /// Create a unique hash code for the given set of items
+        /// </summary>
+        internal static int GetHashCode<T1, T2>(T1 o1, T2 o2)
+            where T1 : notnull
+            where T2 : notnull
+        {
+            var combiner = new HashCodeCombiner();
+
+            combiner.AddHashCode(o1.GetHashCode());
+            combiner.AddHashCode(o2.GetHashCode());
+
+            return combiner.CombinedHash;
+        }
+
+        /// <summary>
+        /// Create a unique hash code for the given set of items
+        /// </summary>
+        internal static int GetHashCode<T1, T2, T3>(T1 o1, T2 o2, T3 o3)
+            where T1 : notnull
+            where T2 : notnull
+            where T3 : notnull
+        {
+            var combiner = new HashCodeCombiner();
+
+            combiner.AddHashCode(o1.GetHashCode());
+            combiner.AddHashCode(o2.GetHashCode());
+            combiner.AddHashCode(o3.GetHashCode());
+
+            return combiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityListProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityListProvider.cs
new file mode 100644
index 0000000000..5ba144c766
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityListProvider.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    internal interface IFrameworkCompatibilityListProvider
+    {
+        /// <summary>
+        /// Get a list of frameworks supporting the provided framework. This list
+        /// is not meant to be exhaustive but is instead meant to be human-readable.
+        /// Ex: netstandard1.5 -> netstandardapp1.5, net462, dnxcore50, ...
+        /// </summary>
+        IEnumerable<NuGetFramework> GetFrameworksSupporting(NuGetFramework target);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityProvider.cs
new file mode 100644
index 0000000000..b0df62e651
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkCompatibilityProvider.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGetClone.Frameworks
+{
+    internal interface IFrameworkCompatibilityProvider
+    {
+        /// <summary>
+        /// Ex: IsCompatible(net45, net40) -> true
+        /// Ex: IsCompatible(net40, net45) -> false
+        /// </summary>
+        /// <param name="framework">Project target framework</param>
+        /// <param name="other">Library framework that is going to be installed</param>
+        /// <returns>True if framework supports other</returns>
+        bool IsCompatible(NuGetFramework framework, NuGetFramework other);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkMappings.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkMappings.cs
new file mode 100644
index 0000000000..b3989a7288
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkMappings.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A raw list of framework mappings. These are indexed by the framework name provider and in most cases all
+    /// mappings are
+    /// mirrored so that the IFrameworkMappings implementation only needs to provide the minimum amount of
+    /// mappings.
+    /// </summary>
+    internal interface IFrameworkMappings
+    {
+        /// <summary>
+        /// Synonym &#8210;&gt; Identifier
+        /// Ex: NET Framework &#8210;&gt; .NET Framework
+        /// </summary>
+        IEnumerable<KeyValuePair<string, string>> IdentifierSynonyms { get; }
+
+        /// <summary>
+        /// Ex: .NET Framework &#8210;&gt; net
+        /// </summary>
+        IEnumerable<KeyValuePair<string, string>> IdentifierShortNames { get; }
+
+        /// <summary>
+        /// Ex: WindowsPhone &#8210;&gt; wp
+        /// </summary>
+        IEnumerable<FrameworkSpecificMapping> ProfileShortNames { get; }
+
+        /// <summary>
+        /// Equal frameworks. Used for legacy conversions.
+        /// ex: Framework: Win8 &lt;&#8210;&gt; Framework: NetCore45 Platform: Win8
+        /// </summary>
+        IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> EquivalentFrameworks { get; }
+
+        /// <summary>
+        /// Framework, EquivalentProfile1, EquivalentProfile2
+        /// Ex: Silverlight, WindowsPhone71, WindowsPhone
+        /// </summary>
+        IEnumerable<FrameworkSpecificMapping> EquivalentProfiles { get; }
+
+        /// <summary>
+        /// Frameworks which are subsets of others.
+        /// Ex: .NETCore &#8210;&gt; .NET
+        /// Everything in .NETCore maps to .NET and is one way compatible. Version numbers follow the same format.
+        /// </summary>
+        IEnumerable<KeyValuePair<string, string>> SubSetFrameworks { get; }
+
+        /// <summary>
+        /// Additional framework compatibility rules beyond name and version matching.
+        /// Ex: .NETFramework supports &#8210;&gt; Native
+        /// </summary>
+        IEnumerable<OneWayCompatibilityMappingEntry> CompatibilityMappings { get; }
+
+        /// <summary>
+        /// Ordered list of framework identifiers. The first framework in the list will be preferred over other 
+        /// framework identifiers. This is enable better tie breaking in scenarios where legacy frameworks are 
+        /// equivalently compatible to a new framework.
+        /// Example: UAP10.0 &#8210;&gt; win81, wpa81
+        /// </summary>
+        IEnumerable<string> NonPackageBasedFrameworkPrecedence { get; }
+
+        /// <summary>
+        /// Same as <see cref="NonPackageBasedFrameworkPrecedence"/> but is only referred to if all of the packages
+        /// in consideration are package based (determined by <see cref="NuGetFramework.IsPackageBased"/>).
+        /// </summary>
+        IEnumerable<string> PackageBasedFrameworkPrecedence { get; }
+
+        /// <summary>
+        /// Only used to choose between frameworks that are equivalent. This favors more human-readable target
+        /// frameworks identifiers.
+        /// </summary>
+        IEnumerable<string> EquivalentFrameworkPrecedence { get; }
+
+        /// <summary>
+        /// Rewrite folder short names to the given value.
+        /// Ex: dotnet50 &#8210;&gt; dotnet
+        /// </summary>
+        IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> ShortNameReplacements { get; }
+
+        /// <summary>
+        /// Rewrite full framework names to the given value.
+        /// Ex: .NETPlatform,Version=v0.0 &#8210;&gt; .NETPlatform,Version=v5.0
+        /// </summary>
+        IEnumerable<KeyValuePair<NuGetFramework, NuGetFramework>> FullNameReplacements { get; }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkNameProvider.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkNameProvider.cs
new file mode 100644
index 0000000000..b35a2dd6ac
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkNameProvider.cs
@@ -0,0 +1,157 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace NuGetClone.Frameworks
+{
+    internal interface IFrameworkNameProvider
+    {
+        /// <summary>
+        /// Returns the official framework identifier for an alias or short name.
+        /// </summary>
+        bool TryGetIdentifier(string identifierShortName, [NotNullWhen(true)] out string? identifier);
+
+        /// <summary>
+        /// Gives the short name used for folders in NuGet
+        /// </summary>
+        bool TryGetShortIdentifier(string identifier, [NotNullWhen(true)] out string? identifierShortName);
+
+        /// <summary>
+        /// Get the official profile name from the short name.
+        /// </summary>
+        bool TryGetProfile(string frameworkIdentifier, string profileShortName, [NotNullWhen(true)] out string? profile);
+
+        /// <summary>
+        /// Returns the shortened version of the profile name.
+        /// </summary>
+        bool TryGetShortProfile(string frameworkIdentifier, string profile, [NotNullWhen(true)] out string? profileShortName);
+
+        /// <summary>
+        /// Parses a version string using single digit rules if no dots exist
+        /// </summary>
+        bool TryGetVersion(string versionString, [NotNullWhen(true)] out Version? version);
+
+        /// <summary>
+        /// Parses a version string. If no dots exist, all digits are treated
+        /// as semver-major, instead of inserting dots.
+        /// </summary>
+        bool TryGetPlatformVersion(string versionString, [NotNullWhen(true)] out Version? version);
+
+        /// <summary>
+        /// Returns a shortened version. If all digits are single digits no dots will be used.
+        /// </summary>
+        string GetVersionString(string framework, Version version);
+
+        /// <summary>
+        /// Tries to parse the portable profile number out of a profile.
+        /// </summary>
+        bool TryGetPortableProfileNumber(string profile, out int profileNumber);
+
+        /// <summary>
+        /// Looks up the portable profile number based on the framework list.
+        /// </summary>
+        bool TryGetPortableProfile(IEnumerable<NuGetFramework> supportedFrameworks, out int profileNumber);
+
+        /// <summary>
+        /// Returns the frameworks based on a portable profile number.
+        /// </summary>
+        bool TryGetPortableFrameworks(int profile, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Returns the frameworks based on a portable profile number.
+        /// </summary>
+        bool TryGetPortableFrameworks(int profile, bool includeOptional, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Returns the frameworks based on a profile string.
+        /// Profile can be either the number in format: Profile=7, or the shortened NuGet version: net45+win8
+        /// </summary>
+        bool TryGetPortableFrameworks(string profile, bool includeOptional, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Parses a shortened portable framework profile list.
+        /// Ex: net45+win8
+        /// </summary>
+        bool TryGetPortableFrameworks(string shortPortableProfiles, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Returns ranges of frameworks that are known to be supported by the given portable profile number.
+        /// Ex: Profile7 -> netstandard1.1
+        /// </summary>
+        bool TryGetPortableCompatibilityMappings(int profile, [NotNullWhen(true)] out IEnumerable<FrameworkRange>? supportedFrameworkRanges);
+
+        /// <summary>
+        /// Returns a list of all possible substitutions where the framework name
+        /// have equivalents.
+        /// Ex: sl3 -> wp8
+        /// </summary>
+        bool TryGetEquivalentFrameworks(NuGetFramework framework, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Gives all substitutions for a framework range.
+        /// </summary>
+        bool TryGetEquivalentFrameworks(FrameworkRange range, [NotNullWhen(true)] out IEnumerable<NuGetFramework>? frameworks);
+
+        /// <summary>
+        /// Returns ranges of frameworks that are known to be supported by the given framework.
+        /// Ex: net45 -> native
+        /// </summary>
+        bool TryGetCompatibilityMappings(NuGetFramework framework, [NotNullWhen(true)] out IEnumerable<FrameworkRange>? supportedFrameworkRanges);
+
+        /// <summary>
+        /// Returns all sub sets of the given framework.
+        /// Ex: .NETFramework -> .NETCore
+        /// These will have the same version, but a different framework
+        /// </summary>
+        bool TryGetSubSetFrameworks(string frameworkIdentifier, [NotNullWhen(true)] out IEnumerable<string>? subSetFrameworkIdentifiers);
+
+        /// <summary>
+        /// The ascending order of frameworks should be based on the following ordered groups:
+        /// 
+        /// 1. Non-package-based frameworks in <see cref="IFrameworkMappings.NonPackageBasedFrameworkPrecedence"/>.
+        /// 2. Other non-package-based frameworks.
+        /// 3. Package-based frameworks in <see cref="IFrameworkMappings.PackageBasedFrameworkPrecedence"/>.
+        /// 4. Other package-based frameworks.
+        /// 
+        /// For group #1 and #3, the order within the group is based on the order of the respective precedence list.
+        /// For group #2 and #4, the order is the original order in the incoming list. This should later be made
+        /// consistent between different input orderings by using the <see cref="NuGetFrameworkSorter"/>.
+        /// </summary>
+        /// <remarks>netcore50 is a special case since netcore451 is not packages based, but netcore50 is.
+        /// This sort will treat all versions of netcore as non-packages based.</remarks>
+        int CompareFrameworks(NuGetFramework? x, NuGetFramework? y);
+
+        /// <summary>
+        /// Used to pick between two equivalent frameworks. This is meant to favor the more human-readable
+        /// framework. Note that this comparison does not validate that the provided frameworks are indeed
+        /// equivalent (e.g. with
+        /// <see cref="TryGetEquivalentFrameworks(NuGetFramework, out IEnumerable{NuGetFramework})"/>).
+        /// </summary>
+        int CompareEquivalentFrameworks(NuGetFramework? x, NuGetFramework? y);
+
+        /// <summary>
+        /// Returns folder short names rewrites.
+        /// Ex: dotnet50 -> dotnet
+        /// </summary>
+        NuGetFramework GetShortNameReplacement(NuGetFramework framework);
+
+        /// <summary>
+        /// Returns full name rewrites.
+        /// Ex: .NETPlatform,Version=v0.0 -> .NETPlatform,Version=v5.0
+        /// </summary>
+        NuGetFramework GetFullNameReplacement(NuGetFramework framework);
+
+        /// <summary>
+        /// Returns all versions of .NETStandard in ascending order.
+        /// </summary>
+        IEnumerable<NuGetFramework> GetNetStandardVersions();
+
+        /// <summary>
+        /// Returns a list of frameworks that could be compatible with .NETStandard.
+        /// </summary>
+        IEnumerable<NuGetFramework> GetCompatibleCandidates();
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkSpecific.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkSpecific.cs
new file mode 100644
index 0000000000..7f6f4fe876
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IFrameworkSpecific.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A group or object that is specific to a single target framework
+    /// </summary>
+    internal interface IFrameworkSpecific
+    {
+        /// <summary>
+        /// Target framework
+        /// </summary>
+        NuGetFramework TargetFramework { get; }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IPortableFrameworkMappings.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IPortableFrameworkMappings.cs
new file mode 100644
index 0000000000..4b027fef01
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/IPortableFrameworkMappings.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    internal interface IPortableFrameworkMappings
+    {
+        /// <summary>
+        /// Ex: 5 -> net4, win8
+        /// </summary>
+        IEnumerable<KeyValuePair<int, NuGetFramework[]>> ProfileFrameworks { get; }
+
+        /// <summary>
+        /// Additional optional frameworks supported in a portable profile.
+        /// Ex: 5 -> MonoAndroid1+MonoTouch1
+        /// </summary>
+        IEnumerable<KeyValuePair<int, NuGetFramework[]>> ProfileOptionalFrameworks { get; }
+
+        /// <summary>
+        /// Compatibility mapping for portable profiles. This is a separate compatibility from that in
+        /// <see cref="IFrameworkMappings.CompatibilityMappings"/>.
+        /// </summary>
+        IEnumerable<KeyValuePair<int, FrameworkRange>> CompatibilityMappings { get; }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NoAllocEnumerateExtensions.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NoAllocEnumerateExtensions.cs
new file mode 100644
index 0000000000..d726723f99
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NoAllocEnumerateExtensions.cs
@@ -0,0 +1,404 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone;
+
+internal static class NoAllocEnumerateExtensions
+{
+    #region IList
+
+    /// <summary>
+    /// Avoids allocating an enumerator when enumerating an <see cref="IList{T}"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Returns a struct-based enumerator that avoids heap allocation during enumeration.
+    /// If the underlying type is <see cref="List{T}"/> then this method will delegate to <see cref="List{T}.Enumerator"/>,
+    /// otherwise the collection's items are accessed by index via <see cref="IList{T}"/>'s indexer directly.
+    /// </para>
+    /// <para>
+    /// When using a struct-based enumerator, no heap allocation occurs during enumeration via <see langword="foreach" />.
+    /// This is in contrast to the interface-based enumerator <see cref="IEnumerator{T}"/> which will
+    /// always be allocated on the heap.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// <![CDATA[IList<string> list = ...;
+    ///
+    /// foreach (string item in list.NoAllocEnumerate())
+    /// {
+    ///     // ...
+    /// }]]>
+    /// </code>
+    /// </example>
+    public static OptimisticallyNonAllocatingListEnumerable<T> NoAllocEnumerate<T>(this IList<T> list)
+        where T : notnull
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return new(list);
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    /// <summary>
+    /// Provides a struct-based enumerator for use with <see cref="IList{T}"/>.
+    /// Do not use this type directly. Use <see cref="NoAllocEnumerate{T}(IList{T})"/> instead.
+    /// </summary>
+    public readonly ref struct OptimisticallyNonAllocatingListEnumerable<T>
+        where T : notnull
+    {
+        private readonly IList<T> _list;
+
+        [Obsolete("Do not construct directly. Use internal static method NoAllocEnumerateExtensions.NoAllocEnumerate instead.")]
+        internal OptimisticallyNonAllocatingListEnumerable(IList<T> list) => _list = list;
+
+        public Enumerator GetEnumerator() => new(_list);
+
+        /// <summary>
+        /// A struct-based enumerator for use with <see cref="IList{T}"/>.
+        /// Do not use this type directly. Use <see cref="NoAllocEnumerate{T}(IList{T})"/> instead.
+        /// </summary>
+        public struct Enumerator : IDisposable
+        {
+            private enum EnumeratorKind : byte { Empty, List, IList };
+
+            private readonly EnumeratorKind _kind;
+            private List<T>.Enumerator _listEnumerator;
+            private readonly IList<T>? _iList;
+            private int _iListIndex;
+
+            internal Enumerator(IList<T> list)
+            {
+                if (list.Count == 0)
+                {
+                    // The collection is empty, just return false from MoveNext.
+                    _kind = EnumeratorKind.Empty;
+                }
+                else if (list is List<T> concreteList)
+                {
+                    _kind = EnumeratorKind.List;
+                    _listEnumerator = concreteList.GetEnumerator();
+                }
+                else
+                {
+                    _kind = EnumeratorKind.IList;
+                    _iList = list;
+                    _iListIndex = -1;
+                }
+            }
+
+            public T Current
+            {
+                get
+                {
+                    return _kind switch
+                    {
+                        EnumeratorKind.List => _listEnumerator.Current,
+                        EnumeratorKind.IList => _iList![_iListIndex],
+                        _ => default!
+                    };
+                }
+            }
+
+            public bool MoveNext()
+            {
+                return _kind switch
+                {
+                    EnumeratorKind.List => _listEnumerator.MoveNext(),
+                    EnumeratorKind.IList => ++_iListIndex < _iList!.Count,
+                    _ => false
+                };
+            }
+
+            public void Dispose()
+            {
+                switch (_kind)
+                {
+                    case EnumeratorKind.List:
+                        _listEnumerator.Dispose();
+                        break;
+                }
+            }
+        }
+    }
+
+    #endregion
+
+    #region IEnumerable
+
+    /// <summary>
+    /// Avoids allocating an enumerator when enumerating an <see cref="IEnumerable{T}"/> where the concrete type
+    /// has a well known struct enumerator, such as for <see cref="List{T}"/>, or when index-based access is possible via
+    /// <see cref="IList{T}"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Several collection types (e.g. <see cref="List{T}"/>) provide a struct-based enumerator type
+    /// (e.g. <see cref="List{T}.Enumerator"/>) which the compiler can use in <see langword="foreach" /> statements.
+    /// When using a struct-based enumerator, no heap allocation occurs during such enumeration.
+    /// This is in contrast to the interface-based enumerator <see cref="IEnumerator{T}"/> which will
+    /// always be allocated on the heap.
+    /// </para>
+    /// <para>
+    /// This method returns a custom struct enumerator that will avoid any heap allocation if <paramref name="source"/>
+    /// (which is declared via interface <see cref="IEnumerable{T}"/>) is actually of known concrete type that
+    /// provides its own struct enumerator. If so, it delegates to that type's enumerator without any boxing
+    /// or other heap allocation.
+    /// </para>
+    /// <para>
+    /// If <paramref name="source"/> is not of a known concrete type, the returned enumerator falls back to the
+    /// interface-based enumerator, which will be allocated on the heap. Benchmarking shows the overhead in
+    /// such cases is low enough to be within the measurement error, meaning this is an inexpensive optimization
+    /// that won't regress behavior and with low downside for cases where it cannot apply an optimization.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// <![CDATA[IEnumerable<string> source = ...;
+    ///
+    /// foreach (string item in source.NoAllocEnumerate())
+    /// {
+    ///     // ...
+    /// }]]>
+    /// </code>
+    /// </example>
+    public static OptimisticallyNonAllocatingEnumerable<T> NoAllocEnumerate<T>(this IEnumerable<T> source)
+        where T : notnull
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return new(source);
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    /// <summary>
+    /// Provides a struct-based enumerator for use with <see cref="IEnumerable{T}"/>.
+    /// Do not use this type directly. Use <see cref="NoAllocEnumerate{T}(IEnumerable{T})"/> instead.
+    /// </summary>
+    public readonly ref struct OptimisticallyNonAllocatingEnumerable<T>
+        where T : notnull
+    {
+        private readonly IEnumerable<T> _source;
+
+        [Obsolete("Do not construct directly. Use internal static method NoAllocEnumerateExtensions.NoAllocEnumerate instead.")]
+        internal OptimisticallyNonAllocatingEnumerable(IEnumerable<T> source) => _source = source;
+
+        public Enumerator GetEnumerator() => new(_source);
+
+        /// <summary>
+        /// A struct-based enumerator for use with <see cref="IEnumerable{T}"/>.
+        /// Do not use this type directly. Use <see cref="NoAllocEnumerate{T}(IEnumerable{T})"/> instead.
+        /// </summary>
+        public struct Enumerator : IDisposable
+        {
+            private enum EnumeratorKind : byte { Empty, List, IList, Fallback };
+
+            private readonly EnumeratorKind _kind;
+            private readonly IEnumerator<T>? _fallbackEnumerator;
+            private List<T>.Enumerator _listEnumerator;
+            private readonly IList<T>? _iList;
+            private int _iListIndex;
+
+            internal Enumerator(IEnumerable<T> source)
+            {
+                if (source is ICollection<T> { Count: 0 } or IReadOnlyCollection<T> { Count: 0 })
+                {
+                    // The collection is empty, just return false from MoveNext.
+                    _kind = EnumeratorKind.Empty;
+                }
+                else if (source is List<T> list)
+                {
+                    _kind = EnumeratorKind.List;
+                    _listEnumerator = list.GetEnumerator();
+                }
+                else if (source is IList<T> iList)
+                {
+                    _kind = EnumeratorKind.IList;
+                    _iList = iList;
+                    _iListIndex = -1;
+                }
+                else
+                {
+                    _kind = EnumeratorKind.Fallback;
+                    _fallbackEnumerator = source.GetEnumerator();
+                }
+            }
+
+            public T Current
+            {
+                get
+                {
+                    return _kind switch
+                    {
+                        EnumeratorKind.List => _listEnumerator.Current,
+                        EnumeratorKind.IList => _iList![_iListIndex],
+                        EnumeratorKind.Fallback => _fallbackEnumerator!.Current,
+                        _ => default!,
+                    };
+                }
+            }
+
+            public bool MoveNext()
+            {
+                return _kind switch
+                {
+                    EnumeratorKind.List => _listEnumerator.MoveNext(),
+                    EnumeratorKind.IList => ++_iListIndex < _iList!.Count,
+                    EnumeratorKind.Fallback => _fallbackEnumerator!.MoveNext(),
+                    _ => false
+                };
+            }
+
+            public void Dispose()
+            {
+                switch (_kind)
+                {
+                    case EnumeratorKind.List:
+                        _listEnumerator.Dispose();
+                        break;
+                    case EnumeratorKind.Fallback:
+                        _fallbackEnumerator!.Dispose();
+                        break;
+                }
+            }
+        }
+    }
+
+    #endregion
+
+    #region IDictionary
+
+    /// <summary>
+    /// Avoids allocating an enumerator when enumerating an <see cref="IDictionary{TKey,TValue}"/> where the concrete type
+    /// has a well known struct enumerator, such as for <see cref="Dictionary{TKey,TValue}"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Several collection types (e.g. <see cref="Dictionary{TKey,TValue}"/>) provide a struct-based enumerator type
+    /// (e.g. <see cref="Dictionary{TKey,TValue}.Enumerator"/>) which the compiler can use in <see langword="foreach" /> statements.
+    /// When using a struct-based enumerator, no heap allocation occurs during such enumeration.
+    /// This is in contrast to the interface-based enumerator <see cref="IEnumerator{T}"/> which will
+    /// always be allocated on the heap.
+    /// </para>
+    /// <para>
+    /// This method returns a custom struct enumerator that will avoid any heap allocation if <paramref name="dictionary"/>
+    /// (which is declared via interface <see cref="IEnumerable{T}"/>) is actually of known concrete type that
+    /// provides its own struct enumerator. If so, it delegates to that type's enumerator without any boxing
+    /// or other heap allocation.
+    /// </para>
+    /// <para>
+    /// If <paramref name="dictionary"/> is not of a known concrete type, the returned enumerator falls back to the
+    /// interface-based enumerator, which will be allocated on the heap. Benchmarking shows the overhead in
+    /// such cases is low enough to be within the measurement error, meaning this is an inexpensive optimization
+    /// that won't regress behavior and with low downside for cases where it cannot apply an optimization.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// <![CDATA[IDictionary<string, string> dictionary = ...;
+    ///
+    /// foreach ((string key, string value) in dictionary.NoAllocEnumerate())
+    /// {
+    ///     // ...
+    /// }]]>
+    /// </code>
+    /// </example>
+    public static OptimisticallyNonAllocatingDictionaryEnumerable<TKey, TValue> NoAllocEnumerate<TKey, TValue>(this IDictionary<TKey, TValue> dictionary)
+        where TKey : notnull
+        where TValue : notnull
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return new(dictionary);
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    /// <summary>
+    /// Provides a struct-based enumerator for use with <see cref="IDictionary{TKey,TValue}"/>.
+    /// Do not use this type directly. Use <see cref="NoAllocEnumerate{TKey, TValue}(IDictionary{TKey, TValue})"/> instead.
+    /// </summary>
+    public readonly ref struct OptimisticallyNonAllocatingDictionaryEnumerable<TKey, TValue>
+        where TKey : notnull
+        where TValue : notnull
+    {
+        private readonly IDictionary<TKey, TValue> _dictionary;
+
+        [Obsolete("Do not construct directly. Use internal static method NoAllocEnumerateExtensions.NoAllocEnumerate instead.")]
+        internal OptimisticallyNonAllocatingDictionaryEnumerable(IDictionary<TKey, TValue> dictionary) => _dictionary = dictionary;
+
+        public Enumerator GetEnumerator() => new(_dictionary);
+
+        /// <summary>
+        /// A struct-based enumerator for use with <see cref="IEnumerable{T}"/>.
+        /// Do not use this type directly. Use <see cref="NoAllocEnumerate{TKey, TValue}(IDictionary{TKey, TValue})"/> instead.
+        /// </summary>
+        public struct Enumerator : IDisposable
+        {
+            private enum EnumeratorKind : byte { Empty, Dictionary, Fallback };
+
+            private readonly EnumeratorKind _kind;
+            private readonly IEnumerator<KeyValuePair<TKey, TValue>>? _fallbackEnumerator;
+            private Dictionary<TKey, TValue>.Enumerator _concreteEnumerator;
+
+            internal Enumerator(IDictionary<TKey, TValue> dictionary)
+            {
+                if (dictionary.Count == 0)
+                {
+                    // The collection is empty, just return false from MoveNext.
+                    _kind = EnumeratorKind.Empty;
+                }
+                else if (dictionary is Dictionary<TKey, TValue> concrete)
+                {
+                    _kind = EnumeratorKind.Dictionary;
+                    _concreteEnumerator = concrete.GetEnumerator();
+                }
+                else
+                {
+                    _kind = EnumeratorKind.Fallback;
+                    _fallbackEnumerator = dictionary.GetEnumerator();
+                }
+            }
+
+            public KeyValuePair<TKey, TValue> Current
+            {
+                get
+                {
+                    return _kind switch
+                    {
+                        EnumeratorKind.Dictionary => _concreteEnumerator.Current,
+                        EnumeratorKind.Fallback => _fallbackEnumerator!.Current,
+                        _ => default!,
+                    };
+                }
+            }
+
+            public bool MoveNext()
+            {
+                return _kind switch
+                {
+                    EnumeratorKind.Dictionary => _concreteEnumerator.MoveNext(),
+                    EnumeratorKind.Fallback => _fallbackEnumerator!.MoveNext(),
+                    _ => false,
+                };
+            }
+
+            public void Dispose()
+            {
+                switch (_kind)
+                {
+                    case EnumeratorKind.Dictionary:
+                        _concreteEnumerator.Dispose();
+                        break;
+                    case EnumeratorKind.Fallback:
+                        _fallbackEnumerator!.Dispose();
+                        break;
+                }
+            }
+        }
+    }
+
+    #endregion
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFramework.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFramework.cs
new file mode 100644
index 0000000000..495929e018
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFramework.cs
@@ -0,0 +1,500 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A portable implementation of the .NET FrameworkName type with added support for NuGet folder names.
+    /// </summary>
+    internal partial class NuGetFramework : IEquatable<NuGetFramework>
+    {
+        private readonly string _frameworkIdentifier;
+        private readonly Version _frameworkVersion;
+        private readonly string _frameworkProfile;
+        private string? _targetFrameworkMoniker;
+        private string? _targetPlatformMoniker;
+        private int? _hashCode;
+
+        public NuGetFramework(NuGetFramework framework)
+            : this(framework.Framework, framework.Version, framework.Profile, framework.Platform, framework.PlatformVersion)
+        {
+        }
+
+        public NuGetFramework(string framework)
+            : this(framework, FrameworkConstants.EmptyVersion)
+        {
+        }
+
+        public NuGetFramework(string framework, Version version)
+            : this(framework, version, string.Empty, FrameworkConstants.EmptyVersion)
+        {
+        }
+
+        private const int Version5 = 5;
+
+        /// <summary>
+        /// Creates a new NuGetFramework instance, with an optional profile (only available for netframework)
+        /// </summary>
+        public NuGetFramework(string frameworkIdentifier, Version frameworkVersion, string? frameworkProfile)
+            : this(frameworkIdentifier, frameworkVersion, profile: frameworkProfile ?? string.Empty, platform: string.Empty, platformVersion: FrameworkConstants.EmptyVersion)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new NuGetFramework instance, with an optional platform and platformVersion (only available for net5.0+)
+        /// </summary>
+        public NuGetFramework(string frameworkIdentifier, Version frameworkVersion, string platform, Version platformVersion)
+            : this(frameworkIdentifier, frameworkVersion, profile: string.Empty, platform: platform, platformVersion: platformVersion)
+        {
+        }
+
+        internal NuGetFramework(string frameworkIdentifier, Version frameworkVersion, string profile, string platform, Version platformVersion)
+        {
+            if (frameworkIdentifier == null) throw new ArgumentNullException(nameof(frameworkIdentifier));
+            if (frameworkVersion == null) throw new ArgumentNullException(nameof(frameworkVersion));
+            if (platform == null) throw new ArgumentNullException(nameof(platform));
+            if (platformVersion == null) throw new ArgumentNullException(nameof(platformVersion));
+
+            _frameworkIdentifier = frameworkIdentifier;
+            _frameworkVersion = NormalizeVersion(frameworkVersion);
+            _frameworkProfile = profile;
+
+            IsNet5Era = (_frameworkVersion.Major >= Version5 && StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, _frameworkIdentifier));
+            Platform = IsNet5Era ? platform : string.Empty;
+            PlatformVersion = IsNet5Era ? NormalizeVersion(platformVersion) : FrameworkConstants.EmptyVersion;
+        }
+
+        /// <summary>
+        /// Target framework
+        /// </summary>
+        public string Framework => _frameworkIdentifier;
+
+        /// <summary>
+        /// Target framework version
+        /// </summary>
+        public Version Version => _frameworkVersion;
+
+        /// <summary>
+        /// Framework Platform (net5.0+)
+        /// </summary>
+        public string Platform { get; }
+
+        /// <summary>
+        /// Framework Platform Version (net5.0+)
+        /// </summary>
+        public Version PlatformVersion { get; }
+
+        /// <summary>
+        /// True if the platform is non-empty
+        /// </summary>
+        public bool HasPlatform
+        {
+            get { return !string.IsNullOrEmpty(Platform); }
+        }
+
+        /// <summary>
+        /// True if the profile is non-empty
+        /// </summary>
+        public bool HasProfile
+        {
+            get { return !string.IsNullOrEmpty(Profile); }
+        }
+
+        /// <summary>
+        /// Target framework profile
+        /// </summary>
+        public string Profile => _frameworkProfile;
+
+        /// <summary>The TargetFrameworkMoniker identifier of the current NuGetFramework.</summary>
+        /// <remarks>Formatted to a System.Versioning.FrameworkName</remarks>
+        public string DotNetFrameworkName
+        {
+            get
+            {
+                if (_targetFrameworkMoniker == null)
+                {
+                    _targetFrameworkMoniker = GetDotNetFrameworkName(DefaultFrameworkNameProvider.Instance);
+                }
+                return _targetFrameworkMoniker;
+            }
+        }
+
+        /// <summary>The TargetFrameworkMoniker identifier of the current NuGetFramework.</summary>
+        /// <remarks>Formatted to a System.Versioning.FrameworkName</remarks>
+        public string GetDotNetFrameworkName(IFrameworkNameProvider mappings)
+        {
+            if (mappings == null)
+            {
+                throw new ArgumentNullException(nameof(mappings));
+            }
+
+            // Check for rewrites
+            var framework = mappings.GetFullNameReplacement(this);
+
+            if (framework.IsSpecificFramework)
+            {
+                var parts = new List<string>(3) { Framework };
+
+                parts.Add(string.Format(CultureInfo.InvariantCulture, "Version=v{0}", GetDisplayVersion(framework.Version)));
+
+                if (!string.IsNullOrEmpty(framework.Profile))
+                {
+                    parts.Add(string.Format(CultureInfo.InvariantCulture, "Profile={0}", framework.Profile));
+                }
+
+                return string.Join(",", parts);
+            }
+            else
+            {
+                return string.Format(CultureInfo.InvariantCulture, "{0},Version=v0.0", framework.Framework);
+            }
+        }
+
+        /// <summary>The TargetPlatformMoniker identifier of the current NuGetFramework.</summary>
+        /// <remarks>Similar to a System.Versioning.FrameworkName, but missing the v at the beginning of the version.</remarks>
+        public string DotNetPlatformName
+        {
+            get
+            {
+                if (_targetPlatformMoniker == null)
+                {
+                    _targetPlatformMoniker = string.IsNullOrEmpty(Platform)
+                        ? string.Empty
+                        : Platform + ",Version=" + GetDisplayVersion(PlatformVersion);
+                }
+
+                return _targetPlatformMoniker;
+            }
+        }
+
+        /// <summary>
+        /// Creates the shortened version of the framework using the default mappings.
+        /// Ex: net45
+        /// </summary>
+        public string GetShortFolderName()
+        {
+            return GetShortFolderName(DefaultFrameworkNameProvider.Instance);
+        }
+
+        /// <summary>
+        /// Helper that is .NET 5 Era aware to replace identifier when appropriate
+        /// </summary>
+        private string GetFrameworkIdentifier()
+        {
+            return IsNet5Era ? FrameworkConstants.FrameworkIdentifiers.Net : Framework;
+        }
+
+        /// <summary>
+        /// Creates the shortened version of the framework using the given mappings.
+        /// </summary>
+        public virtual string GetShortFolderName(IFrameworkNameProvider mappings)
+        {
+            // Check for rewrites
+            var framework = mappings.GetShortNameReplacement(this);
+
+            var sb = new StringBuilder();
+
+            if (IsSpecificFramework)
+            {
+                var shortFramework = string.Empty;
+
+                // get the framework
+                if (!mappings.TryGetShortIdentifier(
+                    GetFrameworkIdentifier(),
+                    out shortFramework))
+                {
+                    shortFramework = GetLettersAndDigitsOnly(framework.Framework);
+                }
+
+                if (string.IsNullOrEmpty(shortFramework))
+                {
+                    throw new FrameworkException(string.Format(
+                        CultureInfo.CurrentCulture,
+                        Strings.InvalidFrameworkIdentifier,
+                        shortFramework));
+                }
+
+                // add framework
+                sb.Append(shortFramework);
+
+                // add the version if it is non-empty
+                if (!AllFrameworkVersions)
+                {
+                    sb.Append(mappings.GetVersionString(framework.Framework, framework.Version));
+                }
+
+                if (IsPCL)
+                {
+                    sb.Append("-");
+
+                    if (framework.HasProfile
+                        && mappings.TryGetPortableFrameworks(framework.Profile, includeOptional: false, out IEnumerable<NuGetFramework>? frameworks)
+                        && frameworks.Any())
+                    {
+                        var required = new HashSet<NuGetFramework>(frameworks, Comparer);
+
+                        // Normalize by removing all optional frameworks
+                        mappings.TryGetPortableFrameworks(framework.Profile, includeOptional: false, out frameworks);
+
+                        // sort the PCL frameworks by alphabetical order
+                        var sortedFrameworks = required.Select(e => e.GetShortFolderName(mappings)).OrderBy(e => e, StringComparer.OrdinalIgnoreCase);
+
+                        sb.Append(string.Join("+", sortedFrameworks));
+                    }
+                    else
+                    {
+                        throw new FrameworkException(string.Format(
+                            CultureInfo.CurrentCulture,
+                            Strings.MissingPortableFrameworks,
+                            framework.DotNetFrameworkName));
+                    }
+                }
+                else if (IsNet5Era)
+                {
+                    if (!string.IsNullOrEmpty(framework.Platform))
+                    {
+                        sb.Append("-");
+                        sb.Append(framework.Platform.ToLowerInvariant());
+
+                        if (framework.PlatformVersion != FrameworkConstants.EmptyVersion)
+                        {
+                            sb.Append(mappings.GetVersionString(framework.Framework, framework.PlatformVersion));
+                        }
+                    }
+                }
+                else
+                {
+                    // add the profile
+                    var shortProfile = string.Empty;
+
+                    if (framework.HasProfile && !mappings.TryGetShortProfile(framework.Framework, framework.Profile, out shortProfile))
+                    {
+                        // if we have a profile, but can't get a mapping, just use the profile as is
+                        shortProfile = framework.Profile;
+                    }
+
+                    if (!string.IsNullOrEmpty(shortProfile))
+                    {
+                        sb.Append("-");
+                        sb.Append(shortProfile);
+                    }
+                }
+            }
+            else
+            {
+                // unsupported, any, agnostic
+                sb.Append(Framework);
+            }
+
+            return sb.ToString().ToLowerInvariant();
+        }
+
+        private static string GetDisplayVersion(Version version)
+        {
+            var sb = new StringBuilder(string.Format(CultureInfo.InvariantCulture, "{0}.{1}", version.Major, version.Minor));
+
+            if (version.Build > 0
+                || version.Revision > 0)
+            {
+                sb.AppendFormat(CultureInfo.InvariantCulture, ".{0}", version.Build);
+
+                if (version.Revision > 0)
+                {
+                    sb.AppendFormat(CultureInfo.InvariantCulture, ".{0}", version.Revision);
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        private static string GetLettersAndDigitsOnly(string s)
+        {
+            var sb = new StringBuilder();
+
+            foreach (var c in s.ToCharArray())
+            {
+                if (char.IsLetterOrDigit(c))
+                {
+                    sb.Append(c);
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Portable class library check
+        /// </summary>
+        public bool IsPCL
+        {
+            get { return StringComparer.OrdinalIgnoreCase.Equals(Framework, FrameworkConstants.FrameworkIdentifiers.Portable) && Version.Major < 5; }
+        }
+
+        /// <summary>
+        /// True if the framework is packages based.
+        /// Ex: dotnet, dnxcore, netcoreapp, netstandard, uap, netcore50
+        /// </summary>
+        public bool IsPackageBased
+        {
+            get
+            {
+                // For these frameworks all versions are packages based.
+                if (PackagesBased.Contains(Framework))
+                {
+                    return true;
+                }
+
+                // NetCore 5.0 and up are packages based.
+                // Everything else is not packages based.
+                return NuGetFrameworkUtility.IsNetCore50AndUp(this);
+            }
+        }
+
+        /// <summary>
+        /// True if this framework matches for all versions.
+        /// Ex: net
+        /// </summary>
+        public bool AllFrameworkVersions
+        {
+            get { return Version.Major == 0 && Version.Minor == 0 && Version.Build == 0 && Version.Revision == 0; }
+        }
+
+        /// <summary>
+        /// True if this framework was invalid or unknown. This framework is only compatible with Any and Agnostic.
+        /// </summary>
+        public bool IsUnsupported
+        {
+            get { return UnsupportedFramework.Equals(this); }
+        }
+
+        /// <summary>
+        /// True if this framework is non-specific. Always compatible.
+        /// </summary>
+        public bool IsAgnostic
+        {
+            get { return AgnosticFramework.Equals(this); }
+        }
+
+        /// <summary>
+        /// True if this is the any framework. Always compatible.
+        /// </summary>
+        public bool IsAny
+        {
+            get { return AnyFramework.Equals(this); }
+        }
+
+        /// <summary>
+        /// True if this framework is real and not one of the special identifiers.
+        /// </summary>
+        public bool IsSpecificFramework
+        {
+            get { return !IsAgnostic && !IsAny && !IsUnsupported; }
+        }
+
+        /// <summary>
+        /// True if this framework is Net5 or later, until we invent something new.
+        /// </summary>
+        internal bool IsNet5Era { get; private set; }
+
+        /// <summary>
+        /// Full framework comparison of the identifier, version, profile, platform, and platform version
+        /// </summary>
+        public static readonly IEqualityComparer<NuGetFramework> Comparer = NuGetFrameworkFullComparer.Instance;
+
+        /// <summary>
+        /// Framework name only comparison.
+        /// </summary>
+        public static readonly IEqualityComparer<NuGetFramework> FrameworkNameComparer = NuGetFrameworkNameComparer.Instance;
+
+        public override string ToString()
+        {
+            return IsNet5Era
+                ? GetShortFolderName()
+                : DotNetFrameworkName;
+        }
+
+        public bool Equals(NuGetFramework? other)
+        {
+#pragma warning disable CS8604 // Possible null reference argument.
+            // Nullable annotations were added to the BCL for IEqualityComparer in .NET 5
+            return Comparer.Equals(this, other);
+#pragma warning restore CS8604 // Possible null reference argument.
+        }
+
+        public static bool operator ==(NuGetFramework? left, NuGetFramework? right)
+        {
+#pragma warning disable CS8604 // Possible null reference argument.
+            // Nullable annotations were added to the BCL for IEqualityComparer in .NET 5
+            return Comparer.Equals(left, right);
+#pragma warning restore CS8604 // Possible null reference argument.
+        }
+
+        public static bool operator !=(NuGetFramework? left, NuGetFramework? right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            if (_hashCode == null)
+            {
+                _hashCode = Comparer.GetHashCode(this);
+            }
+
+            return _hashCode.Value;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            var other = obj as NuGetFramework;
+
+            if (other != null)
+            {
+                return Equals(other);
+            }
+            else
+            {
+                return base.Equals(obj);
+            }
+        }
+
+        private static Version NormalizeVersion(Version version)
+        {
+            var normalized = version;
+
+            if (version.Build < 0
+                || version.Revision < 0)
+            {
+                normalized = new Version(
+                    version.Major,
+                    version.Minor,
+                    Math.Max(version.Build, 0),
+                    Math.Max(version.Revision, 0));
+            }
+
+            return normalized;
+        }
+
+        /// <summary>
+        /// Frameworks that are packages based across all versions.
+        /// </summary>
+        private static readonly SortedSet<string> PackagesBased = new(
+            new[]
+            {
+                        FrameworkConstants.FrameworkIdentifiers.DnxCore,
+                        FrameworkConstants.FrameworkIdentifiers.NetPlatform,
+                        FrameworkConstants.FrameworkIdentifiers.NetStandard,
+                        FrameworkConstants.FrameworkIdentifiers.NetStandardApp,
+                        FrameworkConstants.FrameworkIdentifiers.NetCoreApp,
+                        FrameworkConstants.FrameworkIdentifiers.UAP,
+                        FrameworkConstants.FrameworkIdentifiers.Tizen,
+            },
+            StringComparer.OrdinalIgnoreCase);
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFactory.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFactory.cs
new file mode 100644
index 0000000000..019fde8102
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFactory.cs
@@ -0,0 +1,668 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    internal partial class NuGetFramework
+    {
+        /// <summary>
+        /// An unknown or invalid framework
+        /// </summary>
+        public static readonly NuGetFramework UnsupportedFramework = new(FrameworkConstants.SpecialIdentifiers.Unsupported);
+
+        /// <summary>
+        /// A framework with no specific target framework. This can be used for content only packages.
+        /// </summary>
+        public static readonly NuGetFramework AgnosticFramework = new(FrameworkConstants.SpecialIdentifiers.Agnostic);
+
+        /// <summary>
+        /// A wildcard matching all frameworks
+        /// </summary>
+        public static readonly NuGetFramework AnyFramework = new(FrameworkConstants.SpecialIdentifiers.Any);
+
+        /// <summary>
+        /// Creates a NuGetFramework from a folder name using the default mappings.
+        /// </summary>
+        public static NuGetFramework Parse(string folderName)
+        {
+            return Parse(folderName, DefaultFrameworkNameProvider.Instance);
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from a folder name using the given mappings.
+        /// </summary>
+        public static NuGetFramework Parse(string folderName, IFrameworkNameProvider mappings)
+        {
+            if (folderName == null) throw new ArgumentNullException(nameof(folderName));
+            if (mappings == null) throw new ArgumentNullException(nameof(mappings));
+
+            Debug.Assert(folderName.IndexOf(";", StringComparison.Ordinal) < 0, "invalid folder name, this appears to contain multiple frameworks");
+
+            NuGetFramework framework = folderName.IndexOf(',') > -1
+                ? ParseFrameworkName(folderName, mappings)
+                : ParseFolder(folderName, mappings);
+
+            return framework;
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from individual components
+        /// </summary>
+        public static NuGetFramework ParseComponents(string targetFrameworkMoniker, string? targetPlatformMoniker)
+        {
+            return ParseComponents(targetFrameworkMoniker, targetPlatformMoniker, DefaultFrameworkNameProvider.Instance);
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from individual components, using the given mappings.
+        /// This method may have individual component preference, as described in the remarks.
+        /// </summary>
+        /// <remarks>
+        /// Profiles and TargetPlatforms can't mix. As such the precedence order is profile over target platforms (TPI, TPV).
+        /// .NETCoreApp,Version=v5.0 and later do not support profiles.
+        /// Target Platforms are ignored for any frameworks not supporting them.
+        /// This allows to handle the old project scenarios where the TargetPlatformIdentifier and TargetPlatformVersion may be set to Windows and v7.0 respectively.
+        /// </remarks>
+        internal static NuGetFramework ParseComponents(string targetFrameworkMoniker, string? targetPlatformMoniker, IFrameworkNameProvider mappings)
+        {
+            if (string.IsNullOrEmpty(targetFrameworkMoniker)) throw new ArgumentException(Strings.ArgumentCannotBeNullOrEmpty, nameof(targetFrameworkMoniker));
+            if (mappings == null) throw new ArgumentNullException(nameof(mappings));
+
+            NuGetFramework? result;
+            string targetFrameworkIdentifier;
+            Version targetFrameworkVersion;
+            var parts = GetParts(targetFrameworkMoniker);
+
+            // if the first part is a special framework, ignore the rest
+            if (TryParseSpecialFramework(parts[0], out result))
+            {
+                return result;
+            }
+
+            string? profile;
+            string? targetFrameworkProfile;
+            ParseFrameworkNameParts(mappings, parts, out targetFrameworkIdentifier, out targetFrameworkVersion, out targetFrameworkProfile);
+            if (!mappings.TryGetProfile(targetFrameworkIdentifier, targetFrameworkProfile ?? string.Empty, out profile))
+            {
+                profile = targetFrameworkProfile;
+            }
+
+            if (StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.Portable, targetFrameworkIdentifier))
+            {
+                if (profile != null && mappings.TryGetPortableFrameworks(profile, out IEnumerable<NuGetFramework>? clientFrameworks))
+                {
+                    if (mappings.TryGetPortableProfile(clientFrameworks, out int profileNumber))
+                    {
+                        profile = FrameworkNameHelpers.GetPortableProfileNumberString(profileNumber);
+                    }
+                }
+                else
+                {
+                    return UnsupportedFramework;
+                }
+            }
+
+            var isNet5EraTfm = targetFrameworkVersion.Major >= 5 &&
+                StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, targetFrameworkIdentifier);
+
+            if (!string.IsNullOrEmpty(profile) && isNet5EraTfm)
+            {
+                throw new ArgumentException(string.Format(
+                    CultureInfo.CurrentCulture,
+                    Strings.FrameworkDoesNotSupportProfiles,
+                    profile
+                ));
+            }
+
+            if (!string.IsNullOrEmpty(targetPlatformMoniker) && isNet5EraTfm)
+            {
+                string targetPlatformIdentifier;
+                Version platformVersion;
+                ParsePlatformParts(GetParts(targetPlatformMoniker!), out targetPlatformIdentifier, out platformVersion);
+                result = new NuGetFramework(targetFrameworkIdentifier, targetFrameworkVersion, targetPlatformIdentifier ?? string.Empty, platformVersion);
+            }
+            else
+            {
+                result = new NuGetFramework(targetFrameworkIdentifier, targetFrameworkVersion, profile);
+            }
+
+            return result;
+        }
+
+        private static readonly char[] CommaSeparator = [','];
+
+        private static string[] GetParts(string targetPlatformMoniker)
+        {
+            return targetPlatformMoniker.Split(CommaSeparator, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToArray();
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from a .NET FrameworkName
+        /// </summary>
+        public static NuGetFramework ParseFrameworkName(string frameworkName, IFrameworkNameProvider mappings)
+        {
+            if (frameworkName == null) throw new ArgumentNullException(nameof(frameworkName));
+            if (mappings == null) throw new ArgumentNullException(nameof(mappings));
+
+            string[] parts = frameworkName.Split(CommaSeparator, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToArray();
+
+            // if the first part is a special framework, ignore the rest
+            if (!TryParseSpecialFramework(parts[0], out NuGetFramework? result))
+            {
+                ParseFrameworkNameParts(mappings, parts, out string? framework, out Version version, out string? profile);
+
+                if (version.Major >= 5
+                    && StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, framework))
+                {
+                    result = new NuGetFramework(framework, version, string.Empty, FrameworkConstants.EmptyVersion);
+                }
+                else
+                {
+                    result = new NuGetFramework(framework, version, profile);
+                }
+            }
+
+            return result;
+        }
+
+        private static void ParseFrameworkNameParts(IFrameworkNameProvider mappings, string[] parts, out string framework, out Version version, out string? profile)
+        {
+            framework = mappings.TryGetIdentifier(parts[0], out string? mappedFramework)
+                ? mappedFramework
+                : parts[0];
+
+            version = new Version(0, 0);
+            profile = null;
+            var versionPart = SingleOrDefaultSafe(parts.Where(s => s.IndexOf("Version=", StringComparison.OrdinalIgnoreCase) == 0));
+            var profilePart = SingleOrDefaultSafe(parts.Where(s => s.IndexOf("Profile=", StringComparison.OrdinalIgnoreCase) == 0));
+            if (!string.IsNullOrEmpty(versionPart))
+            {
+                var versionString = versionPart!.Split('=')[1].TrimStart('v');
+
+                if (versionString.IndexOf('.') < 0)
+                {
+                    versionString += ".0";
+                }
+
+                version = Version.TryParse(versionString, out Version? parsedVersion)
+                    ? parsedVersion
+                    : throw new ArgumentException(string.Format(
+                        CultureInfo.CurrentCulture,
+                        Strings.InvalidFrameworkVersion,
+                        versionString));
+            }
+
+            if (!string.IsNullOrEmpty(profilePart))
+            {
+                profile = profilePart!.Split('=')[1];
+            }
+
+            if (StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.Portable, framework)
+                && !string.IsNullOrEmpty(profile)
+                && profile!.Contains("-"))
+            {
+                // Frameworks within the portable profile are not allowed
+                // to have profiles themselves #1869
+                throw new ArgumentException(string.Format(
+                    CultureInfo.CurrentCulture,
+                    Strings.InvalidPortableFrameworksDueToHyphen,
+                    profile));
+            }
+        }
+
+        private static void ParsePlatformParts(string[] parts, out string targetPlatformIdentifier, out Version platformVersion)
+        {
+            targetPlatformIdentifier = parts[0];
+            platformVersion = new Version(0, 0);
+            var versionPart = SingleOrDefaultSafe(parts.Where(s => s.IndexOf("Version=", StringComparison.OrdinalIgnoreCase) == 0));
+            if (!string.IsNullOrEmpty(versionPart))
+            {
+                var versionString = versionPart!.Split('=')[1].TrimStart('v');
+
+                if (versionString.IndexOf('.') < 0)
+                {
+                    versionString += ".0";
+                }
+
+                platformVersion = Version.TryParse(versionString, out Version? parsedVersion)
+                    ? parsedVersion
+                    : throw new ArgumentException(string.Format(
+                        CultureInfo.CurrentCulture,
+                        Strings.InvalidPlatformVersion,
+                        versionString));
+            }
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from a folder name using the default mappings.
+        /// </summary>
+        public static NuGetFramework ParseFolder(string folderName)
+        {
+            return ParseFolder(folderName, DefaultFrameworkNameProvider.Instance);
+        }
+
+        /// <summary>
+        /// Creates a NuGetFramework from a folder name using the given mappings.
+        /// </summary>
+        public static NuGetFramework ParseFolder(string folderName, IFrameworkNameProvider mappings)
+        {
+            if (folderName == null)
+            {
+                throw new ArgumentNullException(nameof(folderName));
+            }
+
+            if (mappings == null)
+            {
+                throw new ArgumentNullException(nameof(mappings));
+            }
+
+            if (folderName.IndexOf('%') > -1)
+            {
+                folderName = Uri.UnescapeDataString(folderName);
+            }
+
+            NuGetFramework? result;
+            // first check if we have a special or common framework
+            if (!TryParseSpecialFramework(folderName, out result)
+                && !TryParseCommonFramework(folderName, out result))
+            {
+                // assume this is unsupported unless we find a match
+                result = UnsupportedFramework;
+
+                var parts = RawParse(folderName);
+
+                if (parts != null)
+                {
+                    if (mappings.TryGetIdentifier(parts.Item1, out string? framework))
+                    {
+                        var version = FrameworkConstants.EmptyVersion;
+
+                        if (parts.Item2 == null
+                            || mappings.TryGetVersion(parts.Item2, out version))
+                        {
+                            string profileShort = parts.Item3;
+
+                            if (version.Major >= 5
+                                && (StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.Net, framework)
+                                    || StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.NetCoreApp, framework)
+                                   )
+                                )
+                            {
+                                // net should be treated as netcoreapp in 5.0 and later
+                                framework = FrameworkConstants.FrameworkIdentifiers.NetCoreApp;
+                                if (!string.IsNullOrEmpty(profileShort))
+                                {
+                                    // Find a platform version if it exists and yank it out
+                                    var platformChars = profileShort;
+                                    var versionStart = 0;
+                                    while (versionStart < platformChars.Length
+                                           && IsLetterOrDot(platformChars[versionStart]))
+                                    {
+                                        versionStart++;
+                                    }
+                                    string platform = versionStart > 0 ? profileShort.Substring(0, versionStart) : profileShort;
+                                    string? platformVersionString = versionStart > 0 ? profileShort.Substring(versionStart, profileShort.Length - versionStart) : null;
+
+                                    // Parse the version if it's there.
+                                    Version? platformVersion = FrameworkConstants.EmptyVersion;
+                                    if ((string.IsNullOrEmpty(platformVersionString) || mappings.TryGetPlatformVersion(platformVersionString!, out platformVersion)))
+                                    {
+                                        result = new NuGetFramework(framework, version, platform ?? string.Empty, platformVersion ?? FrameworkConstants.EmptyVersion);
+                                    }
+                                    else
+                                    {
+                                        return result; // with result == UnsupportedFramework
+                                    }
+                                }
+                                else
+                                {
+                                    result = new NuGetFramework(framework, version, string.Empty, FrameworkConstants.EmptyVersion);
+                                }
+                            }
+                            else
+                            {
+                                if (!mappings.TryGetProfile(framework, profileShort, out string? profile))
+                                {
+                                    profile = profileShort ?? string.Empty;
+                                }
+
+                                if (StringComparer.OrdinalIgnoreCase.Equals(FrameworkConstants.FrameworkIdentifiers.Portable, framework))
+                                {
+                                    if (!mappings.TryGetPortableFrameworks(profileShort!, out IEnumerable<NuGetFramework>? clientFrameworks))
+                                    {
+                                        result = UnsupportedFramework;
+                                    }
+                                    else
+                                    {
+                                        var profileNumber = -1;
+                                        if (mappings.TryGetPortableProfile(clientFrameworks, out profileNumber))
+                                        {
+                                            var portableProfileNumber = FrameworkNameHelpers.GetPortableProfileNumberString(profileNumber);
+                                            result = new NuGetFramework(framework, version, portableProfileNumber);
+                                        }
+                                        else
+                                        {
+                                            result = new NuGetFramework(framework, version, profileShort);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    result = new NuGetFramework(framework, version, profile);
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // If the framework was not recognized check if it is a deprecated framework
+                    if (TryParseDeprecatedFramework(folderName, out NuGetFramework? deprecated))
+                    {
+                        result = deprecated;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Attempt to parse a common but deprecated framework using an exact string match
+        /// Support for these should be dropped as soon as possible.
+        /// </summary>
+        private static bool TryParseDeprecatedFramework(string s, [NotNullWhen(true)] out NuGetFramework? framework)
+        {
+            framework = null;
+
+            switch (s)
+            {
+                case "45":
+                case "4.5":
+                    framework = FrameworkConstants.CommonFrameworks.Net45;
+                    break;
+                case "40":
+                case "4.0":
+                case "4":
+                    framework = FrameworkConstants.CommonFrameworks.Net4;
+                    break;
+                case "35":
+                case "3.5":
+                    framework = FrameworkConstants.CommonFrameworks.Net35;
+                    break;
+                case "20":
+                case "2":
+                case "2.0":
+                    framework = FrameworkConstants.CommonFrameworks.Net2;
+                    break;
+            }
+
+            return framework != null;
+        }
+
+        private static Tuple<string, string?, string>? RawParse(string s)
+        {
+            string identifier;
+            var profile = string.Empty;
+            string? version = null;
+
+            var chars = s.ToCharArray();
+
+            var versionStart = 0;
+
+            while (versionStart < chars.Length
+                   && IsLetterOrDot(chars[versionStart]))
+            {
+                versionStart++;
+            }
+
+            if (versionStart > 0)
+            {
+                identifier = s.Substring(0, versionStart);
+            }
+            else
+            {
+                // invalid, we no longer support names like: 40
+                return null;
+            }
+
+            var profileStart = versionStart;
+
+            while (profileStart < chars.Length
+                   && IsDigitOrDot(chars[profileStart]))
+            {
+                profileStart++;
+            }
+
+            var versionLength = profileStart - versionStart;
+
+            if (versionLength > 0)
+            {
+                version = s.Substring(versionStart, versionLength);
+            }
+
+            if (profileStart < chars.Length)
+            {
+                if (chars[profileStart] == '-')
+                {
+                    var actualProfileStart = profileStart + 1;
+
+                    if (actualProfileStart == chars.Length)
+                    {
+                        // empty profiles are not allowed
+                        return null;
+                    }
+
+                    profile = s.Substring(actualProfileStart, s.Length - actualProfileStart);
+
+                    foreach (var c in profile.ToArray())
+                    {
+                        // validate the profile string to AZaz09-+.
+                        if (!IsValidProfileChar(c))
+                        {
+                            return null;
+                        }
+                    }
+                }
+                else
+                {
+                    // invalid profile
+                    return null;
+                }
+            }
+
+            return new Tuple<string, string?, string>(identifier, version, profile);
+        }
+
+        private static bool IsLetterOrDot(char c)
+        {
+            var x = (int)c;
+
+            // "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+            return (x >= 65 && x <= 90) || (x >= 97 && x <= 122) || x == 46;
+        }
+
+        private static bool IsDigitOrDot(char c)
+        {
+            var x = (int)c;
+
+            // "0123456789"
+            return (x >= 48 && x <= 57) || x == 46;
+        }
+
+        private static bool IsValidProfileChar(char c)
+        {
+            var x = (int)c;
+
+            // letter, digit, dot, dash, or plus
+            return (x >= 48 && x <= 57) || (x >= 65 && x <= 90) || (x >= 97 && x <= 122) || x == 46 || x == 43 || x == 45;
+        }
+
+        private static bool TryParseSpecialFramework(string frameworkString, [NotNullWhen(true)] out NuGetFramework? framework)
+        {
+            framework = null;
+
+            if (StringComparer.OrdinalIgnoreCase.Equals(frameworkString, FrameworkConstants.SpecialIdentifiers.Any))
+            {
+                framework = AnyFramework;
+            }
+            else if (StringComparer.OrdinalIgnoreCase.Equals(frameworkString, FrameworkConstants.SpecialIdentifiers.Agnostic))
+            {
+                framework = AgnosticFramework;
+            }
+            else if (StringComparer.OrdinalIgnoreCase.Equals(frameworkString, FrameworkConstants.SpecialIdentifiers.Unsupported))
+            {
+                framework = UnsupportedFramework;
+            }
+
+            return framework != null;
+        }
+
+        /// <summary>
+        /// A set of special and common frameworks that can be returned from the list of constants without parsing
+        /// Using the interned frameworks here optimizes comparisons since they can be checked by reference.
+        /// This is designed to optimize
+        /// </summary>
+        private static bool TryParseCommonFramework(string frameworkString, [NotNullWhen(true)] out NuGetFramework? framework)
+        {
+            framework = null;
+
+            frameworkString = frameworkString.ToLowerInvariant();
+
+            switch (frameworkString)
+            {
+                case "dotnet":
+                case "dotnet50":
+                case "dotnet5.0":
+                    framework = FrameworkConstants.CommonFrameworks.DotNet50;
+                    break;
+                case "net40":
+                case "net4":
+                    framework = FrameworkConstants.CommonFrameworks.Net4;
+                    break;
+                case "net45":
+                    framework = FrameworkConstants.CommonFrameworks.Net45;
+                    break;
+                case "net451":
+                    framework = FrameworkConstants.CommonFrameworks.Net451;
+                    break;
+                case "net46":
+                    framework = FrameworkConstants.CommonFrameworks.Net46;
+                    break;
+                case "net461":
+                    framework = FrameworkConstants.CommonFrameworks.Net461;
+                    break;
+                case "net462":
+                    framework = FrameworkConstants.CommonFrameworks.Net462;
+                    break;
+                case "net47":
+                    framework = FrameworkConstants.CommonFrameworks.Net47;
+                    break;
+                case "net471":
+                    framework = FrameworkConstants.CommonFrameworks.Net471;
+                    break;
+                case "net472":
+                    framework = FrameworkConstants.CommonFrameworks.Net472;
+                    break;
+                case "win8":
+                    framework = FrameworkConstants.CommonFrameworks.Win8;
+                    break;
+                case "win81":
+                    framework = FrameworkConstants.CommonFrameworks.Win81;
+                    break;
+                case "netstandard":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard;
+                    break;
+                case "netstandard1.0":
+                case "netstandard10":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard10;
+                    break;
+                case "netstandard1.1":
+                case "netstandard11":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard11;
+                    break;
+                case "netstandard1.2":
+                case "netstandard12":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard12;
+                    break;
+                case "netstandard1.3":
+                case "netstandard13":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard13;
+                    break;
+                case "netstandard1.4":
+                case "netstandard14":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard14;
+                    break;
+                case "netstandard1.5":
+                case "netstandard15":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard15;
+                    break;
+                case "netstandard1.6":
+                case "netstandard16":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard16;
+                    break;
+                case "netstandard1.7":
+                case "netstandard17":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard17;
+                    break;
+                case "netstandard2.0":
+                case "netstandard20":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard20;
+                    break;
+                case "netstandard2.1":
+                case "netstandard21":
+                    framework = FrameworkConstants.CommonFrameworks.NetStandard21;
+                    break;
+                case "netcoreapp2.1":
+                case "netcoreapp21":
+                    framework = FrameworkConstants.CommonFrameworks.NetCoreApp21;
+                    break;
+                case "netcoreapp3.0":
+                case "netcoreapp30":
+                    framework = FrameworkConstants.CommonFrameworks.NetCoreApp30;
+                    break;
+                case "netcoreapp3.1":
+                case "netcoreapp31":
+                    framework = FrameworkConstants.CommonFrameworks.NetCoreApp31;
+                    break;
+                case "netcoreapp5.0":
+                case "netcoreapp50":
+                case "net5.0":
+                case "net50":
+                    framework = FrameworkConstants.CommonFrameworks.Net50;
+                    break;
+                case "netcoreapp6.0":
+                case "netcoreapp60":
+                case "net6.0":
+                case "net60":
+                    framework = FrameworkConstants.CommonFrameworks.Net60;
+                    break;
+                case "netcoreapp7.0":
+                case "netcoreapp70":
+                case "net7.0":
+                case "net70":
+                    framework = FrameworkConstants.CommonFrameworks.Net70;
+                    break;
+            }
+
+            return framework != null;
+        }
+
+        private static string? SingleOrDefaultSafe(IEnumerable<string> items)
+        {
+            if (items.Count() == 1)
+            {
+                return items.Single();
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFullComparer.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFullComparer.cs
new file mode 100644
index 0000000000..d7f0744f5e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkFullComparer.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using NuGetClone.Shared;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A case insensitive compare of the framework, version, and profile
+    /// </summary>
+    internal class NuGetFrameworkFullComparer : IEqualityComparer<NuGetFramework>
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static NuGetFrameworkFullComparer Instance { get; } = new();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Obsolete("Use singleton via NuGetFrameworkFullComparer.Instance instead")]
+        public NuGetFrameworkFullComparer() { }
+
+        public bool Equals(NuGetFramework? x, NuGetFramework? y)
+        {
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (ReferenceEquals(x, null)
+                || ReferenceEquals(y, null))
+            {
+                return false;
+            }
+
+            return x.Version == y.Version
+                   && StringComparer.OrdinalIgnoreCase.Equals(x.Framework, y.Framework)
+                   && StringComparer.OrdinalIgnoreCase.Equals(x.Profile, y.Profile)
+                   && StringComparer.OrdinalIgnoreCase.Equals(x.Platform, y.Platform)
+                   && x.PlatformVersion == y.PlatformVersion
+                   && !x.IsUnsupported;
+        }
+
+        public int GetHashCode(NuGetFramework obj)
+        {
+            if (ReferenceEquals(obj, null))
+            {
+                return 0;
+            }
+
+            var combiner = new HashCodeCombiner();
+
+            combiner.AddStringIgnoreCase(obj.Framework);
+            combiner.AddObject(obj.Version);
+            combiner.AddStringIgnoreCase(obj.Profile);
+
+            return combiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkNameComparer.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkNameComparer.cs
new file mode 100644
index 0000000000..fb8744985e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkNameComparer.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// A case insensitive compare of the framework name only
+    /// </summary>
+    internal class NuGetFrameworkNameComparer : IEqualityComparer<NuGetFramework>
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static NuGetFrameworkNameComparer Instance { get; } = new();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Obsolete("Use singleton NuGetFrameworkNameComparer instead")]
+        public NuGetFrameworkNameComparer()
+        {
+        }
+
+        public bool Equals(NuGetFramework? x, NuGetFramework? y)
+        {
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (ReferenceEquals(x, null)
+                || ReferenceEquals(y, null))
+            {
+                return false;
+            }
+
+            return StringComparer.OrdinalIgnoreCase.Equals(x.Framework, y.Framework);
+        }
+
+        public int GetHashCode(NuGetFramework obj)
+        {
+            if (ReferenceEquals(obj, null)
+                || ReferenceEquals(obj.Framework, null))
+            {
+                return 0;
+            }
+
+            return obj.Framework.ToUpperInvariant().GetHashCode();
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkSorter.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkSorter.cs
new file mode 100644
index 0000000000..1a4e9f5da9
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkSorter.cs
@@ -0,0 +1,107 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace NuGetClone.Frameworks
+{
+    /// <summary>
+    /// Sorts NuGet Frameworks in a consistent way for package readers.
+    /// The order is not particularly useful here beyond making things deterministic
+    /// since it compares completely different frameworks.
+    /// </summary>
+    internal class NuGetFrameworkSorter : IComparer<NuGetFramework>
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static NuGetFrameworkSorter Instance { get; } = new();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        [Obsolete("Use Instance singleton instead")]
+        public NuGetFrameworkSorter()
+        {
+        }
+
+        public int Compare(NuGetFramework? x, NuGetFramework? y)
+        {
+            if (ReferenceEquals(x, y))
+            {
+                return 0;
+            }
+
+            if (ReferenceEquals(x, null))
+            {
+                return -1;
+            }
+
+            if (ReferenceEquals(y, null))
+            {
+                return 1;
+            }
+
+            // Any goes first
+            if (x.IsAny
+                && !y.IsAny)
+            {
+                return -1;
+            }
+
+            if (!x.IsAny
+                && y.IsAny)
+            {
+                return 1;
+            }
+
+            // Unsupported goes last
+            if (x.IsUnsupported
+                && !y.IsUnsupported)
+            {
+                return 1;
+            }
+
+            if (!x.IsUnsupported
+                && y.IsUnsupported)
+            {
+                return -1;
+            }
+
+            // Compare on Framework, Version, Profile, Platform, and PlatformVersion
+            var result = StringComparer.OrdinalIgnoreCase.Compare(x.Framework, y.Framework);
+
+            if (result != 0)
+            {
+                return result;
+            }
+
+            result = x.Version.CompareTo(y.Version);
+
+            if (result != 0)
+            {
+                return result;
+            }
+
+            result = StringComparer.OrdinalIgnoreCase.Compare(x.Profile, y.Profile);
+
+            if (result != 0)
+            {
+                return result;
+            }
+
+            result = StringComparer.OrdinalIgnoreCase.Compare(x.Platform, y.Platform);
+
+            if (result != 0)
+            {
+                return result;
+            }
+
+            result = x.PlatformVersion.CompareTo(y.PlatformVersion);
+
+            if (result != 0)
+            {
+                return result;
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkUtility.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkUtility.cs
new file mode 100644
index 0000000000..b01fe1ab34
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/NuGetFrameworkUtility.cs
@@ -0,0 +1,137 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NuGetClone.Frameworks
+{
+    internal static class NuGetFrameworkUtility
+    {
+        /// <summary>
+        /// Find the most compatible group based on target framework
+        /// </summary>
+        /// <param name="items">framework specific groups or items</param>
+        /// <param name="framework">project target framework</param>
+        /// <param name="selector">retrieves the framework from the group</param>
+        internal static T? GetNearest<T>(IEnumerable<T> items, NuGetFramework framework, Func<T, NuGetFramework> selector) where T : class
+        {
+            return GetNearest<T>(items, framework, DefaultFrameworkNameProvider.Instance, DefaultCompatibilityProvider.Instance, selector);
+        }
+
+        /// <summary>
+        /// Find the most compatible group based on target framework
+        /// </summary>
+        /// <param name="items">framework specific groups or items</param>
+        /// <param name="framework">project target framework</param>
+        /// <param name="selector">retrieves the framework from the group</param>
+        /// <param name="frameworkMappings">framework mappings</param>
+        /// <param name="compatibilityProvider">compatibility provider</param>
+        public static T? GetNearest<T>(IEnumerable<T> items,
+            NuGetFramework framework,
+            IFrameworkNameProvider frameworkMappings,
+            IFrameworkCompatibilityProvider compatibilityProvider,
+            Func<T, NuGetFramework> selector) where T : class
+        {
+            if (framework == null) throw new ArgumentNullException(nameof(framework));
+            if (frameworkMappings == null) throw new ArgumentNullException(nameof(frameworkMappings));
+            if (compatibilityProvider == null) throw new ArgumentNullException(nameof(compatibilityProvider));
+
+            if (items != null)
+            {
+                var reducer = new FrameworkReducer(frameworkMappings, compatibilityProvider);
+
+                var mostCompatibleFramework = reducer.GetNearest(framework, items.Select(selector));
+                if (mostCompatibleFramework != null)
+                {
+                    return items.FirstOrDefault(item => NuGetFramework.Comparer.Equals(selector(item), mostCompatibleFramework));
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Find the most compatible group based on target framework
+        /// </summary>
+        /// <param name="items">framework specific groups or items</param>
+        /// <param name="framework">project target framework</param>
+        public static T? GetNearest<T>(IEnumerable<T> items, NuGetFramework framework) where T : IFrameworkSpecific
+        {
+            return GetNearest<T>(items, framework, DefaultFrameworkNameProvider.Instance, DefaultCompatibilityProvider.Instance);
+        }
+
+        /// <summary>
+        /// Find the most compatible group based on target framework
+        /// </summary>
+        /// <param name="items">framework specific groups or items</param>
+        /// <param name="framework">project target framework</param>
+        /// <param name="frameworkMappings">framework mappings</param>
+        /// <param name="compatibilityProvider">compatibility provider</param>
+        public static T? GetNearest<T>(IEnumerable<T> items,
+                                        NuGetFramework framework,
+                                        IFrameworkNameProvider frameworkMappings,
+                                        IFrameworkCompatibilityProvider compatibilityProvider) where T : IFrameworkSpecific
+        {
+            if (framework == null) throw new ArgumentNullException(nameof(framework));
+            if (frameworkMappings == null) throw new ArgumentNullException(nameof(frameworkMappings));
+            if (compatibilityProvider == null) throw new ArgumentNullException(nameof(compatibilityProvider));
+
+            if (items != null)
+            {
+                var reducer = new FrameworkReducer(frameworkMappings, compatibilityProvider);
+
+                var mostCompatibleFramework = reducer.GetNearest(framework, items.Select(item => item.TargetFramework));
+                if (mostCompatibleFramework != null)
+                {
+                    return items.FirstOrDefault(item => NuGetFramework.Comparer.Equals(item.TargetFramework, mostCompatibleFramework));
+                }
+            }
+
+            return default(T);
+        }
+
+        /// <summary>
+        /// Check compatibility with additional checks for the fallback framework.
+        /// </summary>
+        public static bool IsCompatibleWithFallbackCheck(NuGetFramework projectFramework, NuGetFramework candidate)
+        {
+            if (projectFramework is null) throw new ArgumentNullException(nameof(projectFramework));
+            if (candidate is null) throw new ArgumentNullException(nameof(candidate));
+
+            var compatible = DefaultCompatibilityProvider.Instance.IsCompatible(projectFramework, candidate);
+
+            if (!compatible)
+            {
+                var fallbackFramework = projectFramework as FallbackFramework;
+
+                if (fallbackFramework != null && fallbackFramework.Fallback != null)
+                {
+                    foreach (var supportFramework in fallbackFramework.Fallback)
+                    {
+                        compatible = DefaultCompatibilityProvider.Instance.IsCompatible(supportFramework, candidate);
+                        if (compatible)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return compatible;
+        }
+
+        /// <summary>
+        /// True if the framework is netcore50 or higher. This is where the framework
+        /// becomes packages based.
+        /// </summary>
+        public static bool IsNetCore50AndUp(NuGetFramework framework)
+        {
+            return (framework.Version.Major >= 5
+                    && StringComparer.OrdinalIgnoreCase.Equals(
+                        framework.Framework,
+                        FrameworkConstants.FrameworkIdentifiers.NetCore));
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/OneWayCompatibilityMappingEntry.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/OneWayCompatibilityMappingEntry.cs
new file mode 100644
index 0000000000..5a35dad4bb
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/OneWayCompatibilityMappingEntry.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+
+namespace NuGetClone.Frameworks
+{
+    internal class OneWayCompatibilityMappingEntry : IEquatable<OneWayCompatibilityMappingEntry>
+    {
+        private readonly FrameworkRange _targetFramework;
+        private readonly FrameworkRange _supportedFramework;
+
+        /// <summary>
+        /// Creates a one way compatibility mapping.
+        /// Ex: net -supports-> native
+        /// </summary>
+        /// <param name="targetFramework">Project framework</param>
+        /// <param name="supportedFramework">Framework that is supported by the project framework</param>
+        public OneWayCompatibilityMappingEntry(FrameworkRange targetFramework, FrameworkRange supportedFramework)
+        {
+            _targetFramework = targetFramework;
+            _supportedFramework = supportedFramework;
+        }
+
+        /// <summary>
+        /// Primary framework range or project target framework that supports the SuppportedFrameworkRange
+        /// </summary>
+        public FrameworkRange TargetFrameworkRange
+        {
+            get { return _targetFramework; }
+        }
+
+        /// <summary>
+        /// Framework range that is supported by the TargetFrameworkRange
+        /// </summary>
+        public FrameworkRange SupportedFrameworkRange
+        {
+            get { return _supportedFramework; }
+        }
+
+        public static CompatibilityMappingComparer Comparer
+        {
+            get { return CompatibilityMappingComparer.Instance; }
+        }
+
+        public bool Equals(OneWayCompatibilityMappingEntry? other)
+        {
+            return Comparer.Equals(this, other);
+        }
+
+        public override string ToString()
+        {
+            return String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", TargetFrameworkRange.ToString(), SupportedFrameworkRange.ToString());
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/README.md b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/README.md
new file mode 100644
index 0000000000..6f38b67bec
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/README.md
@@ -0,0 +1,10 @@
+This directory contains code that is copied from https://github.com/NuGet/NuGet.Client/tree/dev/src/NuGet.Core/NuGet.Frameworks, with the namespaces changed
+and class visibility changed. This is done to ensure we are providing the same functionality as Nuget.Frameworks, without depending on the package explicitly.
+
+The files in this folder are coming from tag 6.8.0.117, on commit 7fb5ed8.
+
+To update this code, run the script in: \scripts\update-nuget-frameworks.ps1 , with -VersionTag <theDesiredVersion>.
+
+Exception to this is the Strings.cs, this is coming from Strings.Designer.cs because we don't localize those messages here. These messages
+go only into logs.
+
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/SimplePool.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/SimplePool.cs
new file mode 100644
index 0000000000..1d72d34acf
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/SimplePool.cs
@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#nullable enable
+
+using System;
+using System.Collections.Concurrent;
+
+namespace NuGetClone
+{
+    internal class SimplePool<T> where T : class
+    {
+        private readonly ConcurrentStack<T> _values = new();
+        private readonly Func<T> _allocate;
+
+        public SimplePool(Func<T> allocate)
+        {
+            _allocate = allocate;
+        }
+
+        public T Allocate()
+        {
+            if (_values.TryPop(out T? result))
+            {
+                return result;
+            }
+
+            return _allocate();
+        }
+
+        public void Free(T value)
+        {
+            _values.Push(value);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/StringBuilderPool.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/StringBuilderPool.cs
new file mode 100644
index 0000000000..1848471e45
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/StringBuilderPool.cs
@@ -0,0 +1,89 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#nullable enable
+
+using System.Text;
+
+namespace NuGetClone
+{
+    /// <summary>
+    /// Provides a resource pool that enables reusing instances of <see cref="StringBuilder"/> instances.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Renting and returning buffers with an <see cref="StringBuilderPool"/> can increase performance
+    /// in situations where <see cref="StringBuilder"/> instances are created and destroyed frequently,
+    /// resulting in significant memory pressure on the garbage collector.
+    /// </para>
+    /// <para>
+    /// This class is thread-safe.  All members may be used by multiple threads concurrently.
+    /// </para>
+    /// </remarks>
+    internal class StringBuilderPool
+    {
+        private const int MaxPoolSize = 256;
+        private readonly SimplePool<StringBuilder> _pool = new(() => new StringBuilder(MaxPoolSize));
+
+        /// <summary>
+        /// Retrieves a shared <see cref="StringBuilderPool"/> instance.
+        /// </summary>
+        public static readonly StringBuilderPool Shared = new();
+
+        private StringBuilderPool()
+        {
+        }
+
+        /// <summary>
+        /// Retrieves a <see cref="StringBuilder"/> that is at least the requested length.
+        /// </summary>
+        /// <param name="minimumCapacity">The minimum capacity of the <see cref="StringBuilder"/> needed.</param>
+        /// <returns>
+        /// A <see cref="StringBuilder"/> that is at least <paramref name="minimumCapacity"/> in length.
+        /// </returns>
+        /// <remarks>
+        /// This buffer is loaned to the caller and should be returned to the same pool via
+        /// <see cref="ToStringAndReturn"/> so that it may be reused in subsequent usage of <see cref="Rent"/>.
+        /// It is not a fatal error to not return a rented string builder, but failure to do so may lead to
+        /// decreased application performance, as the pool may need to create a new instance to replace
+        /// the one lost.
+        /// </remarks>
+        public StringBuilder Rent(int minimumCapacity)
+        {
+            if (minimumCapacity <= MaxPoolSize)
+            {
+                return _pool.Allocate();
+            }
+
+            return new StringBuilder(minimumCapacity);
+        }
+
+        /// <summary>
+        /// Returns to the pool an array that was previously obtained via <see cref="Rent"/> on the same
+        /// <see cref="StringBuilderPool"/> instance, returning the built string.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="StringBuilder"/> previously obtained from <see cref="Rent"/> to return to the pool.
+        /// </param>
+        /// <remarks>
+        /// Once a <see cref="StringBuilder"/> has been returned to the pool, the caller gives up all ownership
+        /// of the instance and must not use it. The reference returned from a given call to <see cref="Rent"/>
+        /// must only be returned via <see cref="ToStringAndReturn"/> once.  The default <see cref="StringBuilderPool"/>
+        /// may hold onto the returned instance in order to rent it again, or it may release the returned instance
+        /// if it's determined that the pool already has enough instances stored.
+        /// </remarks>
+        /// <returns>The string, built from <paramref name="builder"/>.</returns>
+        public string ToStringAndReturn(StringBuilder builder)
+        {
+            string result = builder.ToString();
+
+            if (builder.Capacity <= MaxPoolSize)
+            {
+                builder.Clear();
+                _pool.Free(builder);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/Strings.cs b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/Strings.cs
new file mode 100644
index 0000000000..a99c6176b8
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/Strings.cs
@@ -0,0 +1,54 @@
+
+namespace NuGetClone.Frameworks {    
+    
+    internal class Strings {
+        
+        internal static string ArgumentCannotBeNullOrEmpty {
+            get {
+                return "The argument cannot be null or empty.";
+            }
+        }
+        
+        internal static string FrameworkDoesNotSupportProfiles {
+            get {
+                return ".NET 5.0 and above does not support profiles.";
+            }
+        }
+
+        internal static string FrameworkMismatch {
+            get {
+                return "Frameworks must have the same identifier, profile, and platform.";
+            }
+        }
+        
+        internal static string InvalidFrameworkIdentifier {
+            get {
+                return "{0} is the invalid framework identifier.";
+            }
+        }
+        
+        internal static string InvalidFrameworkVersion {
+            get {
+                return "{0} is the invalid framework version.";
+            }
+        }
+        
+        internal static string InvalidPlatformVersion {
+            get {
+                return "{0} is the invalid platform version.";
+            }
+        }
+        
+        internal static string InvalidPortableFrameworksDueToHyphen {
+            get {
+                return "{0} is the invalid portable framework string.";
+            }
+        }
+        
+        internal static string MissingPortableFrameworks {
+            get {
+                return "{0} is the invalid portable framework string.";
+            }
+        }
+    }
+}
diff --git a/src/package/nuspec/_._ b/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/spelling.dic
similarity index 100%
rename from src/package/nuspec/_._
rename to src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/spelling.dic
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.ObjectModel/Properties/AssemblyInfo.cs
index df64621811..1549b3f744 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Properties/AssemblyInfo.cs
@@ -2,34 +2,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Reflection;
-using System.Resources;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatfrom.ObjectModel")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
 [assembly: CLSCompliant(true)]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-#if !NETSTANDARD1_0
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8a200cda-4813-43a1-aa18-9faedc31d2af")]
-#endif
-
 // Type forwarding utility classes defined earlier in object model to a core utilities assembly.
 [assembly: TypeForwardedTo(typeof(EqtTrace))]
-[assembly: TypeForwardedTo(typeof(ValidateArg))]
\ No newline at end of file
+[assembly: TypeForwardedTo(typeof(ValidateArg))]
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
index a6f4408765..681d90bb9e 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt
@@ -1,401 +1,475 @@
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveredTests -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestResult -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs>
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.BlameCollectDumpKey = "CollectDump" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.BlameCollectHangDumpKey = "CollectHangDump" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectionRunSettingsName = "DataCollectionRunSettings" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectorSettingName = "DataCollector" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectorsSettingName = "DataCollectors" -> string
+#nullable enable
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.CannotBeNullOrEmpty.get -> string
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.Culture.get -> System.Globalization.CultureInfo
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.Culture.set -> void
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.DisplayChosenSettings.get -> string
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.MalformedRunSettingsFile.get -> string
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.NoMatchingSourcesFound.get -> string
+~static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.SourceIncompatible.get -> string
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveredTests -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.DiscoveryStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestResult -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestRunStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs!>?
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.BlameCollectDumpKey = "CollectDump" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.BlameCollectHangDumpKey = "CollectHangDump" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.CollectDumpOnTestSessionHang = "CollectDumpOnTestSessionHang" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectionRunSettingsName = "DataCollectionRunSettings" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectorSettingName = "DataCollector" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DataCollectorsSettingName = "DataCollectors" -> string!
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultBatchSize = 10 -> long
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultCpuCount = 1 -> int
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultFramework = Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.Framework40 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultTreatTestAdapterErrorsAsWarnings = false -> bool
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework35 = ".NETFramework,Version=v3.5" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework40 = ".NETFramework,Version=v4.0" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework45 = ".NETFramework,Version=v4.5" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework451 = ".NETFramework,Version=v4.5.1" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework46 = ".NETFramework,Version=v4.6" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameworkCore10 = ".NETCoreApp,Version=v1.0" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameWorkStringPrefix = ".NETFramework,Version=" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameworkUap10 = "UAP,Version=v10.0" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.EmptyRunSettings = "<RunSettings></RunSettings>" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectionRunSettingsName = "InProcDataCollectionRunSettings" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectorSettingName = "InProcDataCollector" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectorsSettingName = "InProcDataCollectors" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerAssemblyQualifiedName = "assemblyQualifiedName" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerAssemblyQualifiedNameLower = "assemblyqualifiedname" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerCodeBase = "codeBase" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerCodeBaseLower = "codebase" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerConfigurationName = "Configuration" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerConfigurationNameLower = "configuration" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerEnabledName = "enabled" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerFriendlyName = "friendlyName" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerFriendlyNameLower = "friendlyname" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerRunSettingsName = "LoggerRunSettings" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerSettingName = "Logger" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggersSettingName = "Loggers" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerUriName = "uri" -> string
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework35 = ".NETFramework,Version=v3.5" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework40 = ".NETFramework,Version=v4.0" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework45 = ".NETFramework,Version=v4.5" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework451 = ".NETFramework,Version=v4.5.1" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFramework46 = ".NETFramework,Version=v4.6" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameworkCore10 = ".NETCoreApp,Version=v1.0" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameWorkStringPrefix = ".NETFramework,Version=" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DotNetFrameworkUap10 = "UAP,Version=v10.0" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.EmptyRunSettings = "<RunSettings></RunSettings>" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectionRunSettingsName = "InProcDataCollectionRunSettings" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectorSettingName = "InProcDataCollector" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.InProcDataCollectorsSettingName = "InProcDataCollectors" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerAssemblyQualifiedName = "assemblyQualifiedName" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerAssemblyQualifiedNameLower = "assemblyqualifiedname" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerCodeBase = "codeBase" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerCodeBaseLower = "codebase" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerConfigurationName = "Configuration" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerConfigurationNameLower = "configuration" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerEnabledName = "enabled" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerFriendlyName = "friendlyName" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerFriendlyNameLower = "friendlyname" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerRunSettingsName = "LoggerRunSettings" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerSettingName = "Logger" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggersSettingName = "Loggers" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.LoggerUriName = "uri" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.MinimumProtocolVersionWithCancelDiscoveryEventHandlerSupport = 6 -> int
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.MinimumProtocolVersionWithDebugSupport = 3 -> int
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.ResultsDirectoryName = "TestResults" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.RunConfigurationSettingsName = "RunConfiguration" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.RunSettingsName = "RunSettings" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TargetFrameworkAttributeFullName = "System.Runtime.Versioning.TargetFrameworkAttribute" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TargetFrameworkName = "TargetFrameworkName" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TestRunParametersName = "TestRunParameters" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TraceLogMaxFileSizeInKB = "TraceLogMaxFileSizeInKb" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TreatNoTestsAsError = "TreatNoTestsAsError" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnitTestExtensionType = "UnitTestExtension" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath = "_none_" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultLoggerParameterNames.TargetFramework = "TargetFramework" -> string
-const Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultLoggerParameterNames.TestRunDirectory = "TestRunDirectory" -> string
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.ResultsDirectoryName = "TestResults" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.RunConfigurationSettingsName = "RunConfiguration" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.RunSettingsName = "RunSettings" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TargetFrameworkAttributeFullName = "System.Runtime.Versioning.TargetFrameworkAttribute" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TargetFrameworkName = "TargetFrameworkName" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TestRunParametersName = "TestRunParameters" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TraceLogMaxFileSizeInKB = "TraceLogMaxFileSizeInKb" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.TreatNoTestsAsError = "TreatNoTestsAsError" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnitTestExtensionType = "UnitTestExtension" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath = "_none_" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultLoggerParameterNames.TargetFramework = "TargetFramework" -> string!
+const Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultLoggerParameterNames.TestRunDirectory = "TestRunDirectory" -> string!
 const Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.EscapeCharacter = '\\' -> char
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IDiscoveryContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IDiscoveryContext.RunSettings.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IDiscoveryContext.RunSettings.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle.EnableShutdownAfterTestRun.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle.EnableShutdownAfterTestRun.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle.LaunchProcessWithDebuggerAttached(string filePath, string workingDirectory, string arguments, System.Collections.Generic.IDictionary<string, string> environmentVariables) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle.LaunchProcessWithDebuggerAttached(string! filePath, string? workingDirectory, string? arguments, System.Collections.Generic.IDictionary<string!, string?>? environmentVariables) -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle2
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle2.AttachDebuggerToProcess(int pid) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.GetTestCaseFilter(System.Collections.Generic.IEnumerable<string> supportedProperties, System.Func<string, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty> propertyProvider) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.GetTestCaseFilter(System.Collections.Generic.IEnumerable<string!>? supportedProperties, System.Func<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty?>! propertyProvider) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.InIsolation.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.IsBeingDebugged.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.IsDataCollectionEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.KeepAlive.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.SolutionDirectory.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.TestRunDirectory.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.SolutionDirectory.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext.TestRunDirectory.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings.GetSettings(string settingsName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings.SettingsXml.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings.GetSettings(string? settingsName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunSettings.SettingsXml.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider.Load(System.Xml.XmlReader reader) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ISettingsProvider.Load(System.Xml.XmlReader! reader) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseDiscoverySink
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseDiscoverySink.SendTestCase(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase discoveredTest) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseDiscoverySink.SendTestCase(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! discoveredTest) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression.MatchTestCase(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase, System.Func<string, object> propertyValueProvider) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression.TestCaseFilterValue.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression.MatchTestCase(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase, System.Func<string!, object?>! propertyValueProvider) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseFilterExpression.TestCaseFilterValue.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestDiscoverer
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestDiscoverer.DiscoverTests(System.Collections.Generic.IEnumerable<string> sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IDiscoveryContext discoveryContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseDiscoverySink discoverySink) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestDiscoverer.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IDiscoveryContext! discoveryContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger! logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestCaseDiscoverySink! discoverySink) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordAttachments(System.Collections.Generic.IList<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> attachmentSets) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult testResult) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordAttachments(System.Collections.Generic.IList<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachmentSets) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult! testResult) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutionRecorder.RecordStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor.Cancel() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext runContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle frameworkHandle) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor.RunTests(System.Collections.Generic.IEnumerable<string> sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext runContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle frameworkHandle) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext? runContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle? frameworkHandle) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor.RunTests(System.Collections.Generic.IEnumerable<string!>? sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext? runContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IFrameworkHandle? frameworkHandle) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor2
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor2.ShouldAttachToTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext runContext) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor2.ShouldAttachToTestHost(System.Collections.Generic.IEnumerable<string> sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext runContext) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor2.ShouldAttachToTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext! runContext) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.ITestExecutor2.ShouldAttachToTestHost(System.Collections.Generic.IEnumerable<string!>? sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.IRunContext! runContext) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(string message, System.Exception innerException) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(string? message, System.Exception? innerException) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.FilterValue.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.FilterValue.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string message, string filterValue) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string message, System.Exception innerException) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string? message, string? filterValue) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(string? message, System.Exception? innerException) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.AnyCPU = 4 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM = 3 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Default = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Ppc64le = 7 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.S390x = 6 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X64 = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X86 = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet
-Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.Attachments.get -> System.Collections.Generic.IList<Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.AttachmentSet(System.Uri uri, string displayName) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.DisplayName.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.Uri.get -> System.Uri
+Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.Attachments.get -> System.Collections.Generic.IList<Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.AttachmentSet(System.Uri! uri, string! displayName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.DisplayName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.Uri.get -> System.Uri!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria runCriteria) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.BaseTestRunCriteria(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria! runCriteria) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria? other) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.FrequencyOfRunStatsChangeEvent.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.KeepAlive.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.RunStatsChangeEventTimeout.get -> System.TimeSpan
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.TestHostLauncher.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.TestRunSettings.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.TestHostLauncher.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.TestRunSettings.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.CustomHostLaunchAckPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.ErrorMessage.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.ErrorMessage.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.ErrorMessage.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.HostProcessId.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.CustomHostLaunchAckPayload.HostProcessId.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs.DiscoveredTestCases.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs.DiscoveredTestsEventArgs(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs.DiscoveredTestCases.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs.DiscoveredTestsEventArgs(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.DiscoveredExtensions.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.DiscoveredExtensions.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.DiscoveryCompleteEventArgs() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.DiscoveryCompleteEventArgs(long totalTests, bool isAborted) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.FullyDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.FullyDiscoveredSources.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.IsAborted.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string, object>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.IsAborted.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.Metrics.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.NotDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.NotDiscoveredSources.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.PartiallyDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.PartiallyDiscoveredSources.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.SkippedDiscoveredSources.get -> System.Collections.Generic.IList<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.SkippedDiscoveredSources.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.TotalCount.get -> long
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs.TotalCount.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.AdapterSourceMap.get -> System.Collections.Generic.Dictionary<string, System.Collections.Generic.IEnumerable<string>>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.AdapterSourceMap.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveredTestEventTimeout.get -> System.TimeSpan
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfDiscoveredTestsEvent, string testSettings) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfDiscoveredTestsEvent, System.TimeSpan discoveredTestEventTimeout, string runSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfDiscoveredTestsEvent, string? testSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfDiscoveredTestsEvent, System.TimeSpan discoveredTestEventTimeout, string? runSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfDiscoveredTestsEvent, System.TimeSpan discoveredTestEventTimeout, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.FrequencyOfDiscoveredTestsEvent.get -> long
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.Package.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.Package.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.Package.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.RunSettings.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.Sources.get -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestCaseFilter.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.RunSettings.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.Sources.get -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestCaseFilter.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestCaseFilter.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.DiscoveryRequestPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.RunSettings.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.RunSettings.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.RunSettings.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.Sources.get -> System.Collections.Generic.IEnumerable<string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.Sources.get -> System.Collections.Generic.IEnumerable<string!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.Sources.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestPlatformOptions.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs.DiscoveryCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs.DiscoveryStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria discoveryCriteria) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs.DiscoveryCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs.DiscoveryStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.Attached.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.Attached.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.EditorAttachDebuggerAckPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.ErrorMessage.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.ErrorMessage.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.EditorAttachDebuggerAckPayload.ErrorMessage.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions? other) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterOptions() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegEx.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegEx.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegEx.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegExReplacement.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegExReplacement.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.FilterRegExReplacement.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IBaseProxy
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IBaseProxy.UpdateTestProcessStartInfo(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo testProcessStartInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IBaseProxy.UpdateTestProcessStartInfo(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.Abort() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.DiscoverAsync() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.DiscoveryCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveredTests -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.DiscoveryCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveredTests -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveredTestsEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryComplete -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest.OnDiscoveryStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryStartEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IInternalTestRunEventsHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection.Add(string metric, object value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection.Metrics.get -> System.Collections.Generic.IDictionary<string, object>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection.Add(string! metric, object! value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.AttachDebuggerInfo() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.ProcessId.get -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.ProcessId.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.Sources.get -> System.Collections.Generic.ICollection<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.Sources.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.TargetFramework.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo.TargetFramework.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher.IsDebug.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher.LaunchTestHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo defaultTestHostStartInfo) -> int
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher.LaunchTestHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo defaultTestHostStartInfo, System.Threading.CancellationToken cancellationToken) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher.LaunchTestHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! defaultTestHostStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher.LaunchTestHost(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! defaultTestHostStartInfo, System.Threading.CancellationToken cancellationToken) -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher2
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher2.AttachDebuggerToProcess(int pid) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher2.AttachDebuggerToProcess(int pid, System.Threading.CancellationToken cancellationToken) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher3
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher3.AttachDebuggerToProcess(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.AttachDebuggerInfo! attachDebuggerInfo, System.Threading.CancellationToken cancellationToken) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest.OnRawMessageReceived -> System.EventHandler<string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest.OnRawMessageReceived -> System.EventHandler<string!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest.WaitForCompletion(int timeout) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.IsTelemetryOptedIn.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.IsTelemetryOptedIn.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.MetricsCollection.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.MetricsCollection.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IMetricsCollection!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.MetricsCollection.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.ProtocolConfig.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.ProtocolConfig.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData.ProtocolConfig.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> discoveredTestCases) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler.HandleDiscoveryComplete(long totalTests, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> lastChunk, bool isAborted) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler.HandleDiscoveryComplete(long totalTests, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk, bool isAborted) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> discoveredTestCases) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLogger
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents events, string testRunDirectory) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLogger.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, string! testRunDirectory) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLoggerWithParameters
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLoggerWithParameters.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents events, System.Collections.Generic.Dictionary<string, string> parameters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestLoggerWithParameters.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents! events, System.Collections.Generic.Dictionary<string!, string?>! parameters) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler.HandleRawMessage(string rawMessage) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestMessageEventHandler.HandleRawMessage(string! rawMessage) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.ClearExtensions() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.CreateDiscoveryRequest(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions options) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.CreateTestRunRequest(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria testRunCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions options) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.UpdateExtensions(System.Collections.Generic.IEnumerable<string> pathToAdditionalExtensions, bool skipExtensionFilters) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.CreateDiscoveryRequest(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria! discoveryCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, System.Collections.Generic.Dictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IDiscoveryRequest!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.CreateTestRunRequest(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, System.Collections.Generic.Dictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.StartTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData! requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria! criteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, System.Collections.Generic.Dictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail!>! sourceToSourceDetailMap, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger! warningLogger) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.UpdateExtensions(System.Collections.Generic.IEnumerable<string!>? pathToAdditionalExtensions, bool skipExtensionFilters) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatformCapabilities
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatformCapabilities.TestPlatformType.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleProcessedAttachmentsChunk(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> attachments) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> lastChunk) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingProgress(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleProcessedAttachmentsChunk(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs! attachmentsProcessingCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? lastChunk) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler.HandleTestRunAttachmentsProcessingProgress(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs! AttachmentsProcessingProgressEventArgs) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration.FrequencyOfRunStatsChangeEvent.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration.HasSpecificSources.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration.HasSpecificTests.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration.Tests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration.Tests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> runContextAttachments, System.Collections.Generic.ICollection<string> executorUris) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs testRunChangedArgs) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo testProcessStartInfo) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.HandleTestRunComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs! testRunCompleteArgs, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? lastChunkArgs, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? runContextAttachments, System.Collections.Generic.ICollection<string!>? executorUris) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.HandleTestRunStatsChange(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs? testRunChangedArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler.LaunchProcessWithDebuggerAttached(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testProcessStartInfo) -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler2
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler2.AttachDebuggerToProcess(int pid) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.Abort() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.CancelAsync() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.DataCollectionMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.DataCollectionMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.ExecuteAsync() -> int
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunCompletion -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunStatsChange -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunCompletion -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.OnRunStatsChange -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.State.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.TestRunConfiguration.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.TestRunMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.TestRunConfiguration.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunConfiguration!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunRequest.TestRunMessage -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics.ExecutedTests.get -> long
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics.Stats.get -> System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics.Stats.get -> System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics.this[Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome].get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler.HandleStartTestSessionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo testSessionInfo) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler.HandleStopTestSessionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo testSessionInfo, bool stopped) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler.HandleStartTestSessionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs? eventArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler.HandleStopTestSessionComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs? eventArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IWarningLogger.LogWarning(string! message) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload.EventArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload.EventArgs.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload.StartTestSessionAckPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionAckPayload.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.HasCustomHostLauncher.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.HasCustomHostLauncher.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.IsDebuggingEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.IsDebuggingEnabled.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.RunSettings.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.RunSettings.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.RunSettings.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.Sources.get -> System.Collections.Generic.IList<string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.Sources.get -> System.Collections.Generic.IList<string!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.Sources.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.StartTestSessionPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StartTestSessionPayload.TestPlatformOptions.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.IsStopped.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.IsStopped.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.EventArgs.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.EventArgs.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.StopTestSessionAckPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionAckPayload.TestSessionInfo.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload.CollectMetrics.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload.CollectMetrics.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload.StopTestSessionPayload() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads.StopTestSessionPayload.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig.ProtocolConfig() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig.Version.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig.Version.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.RequestExtensions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs.Metrics.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs.StartTestSessionCompleteEventArgs() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCompleteEventArgs.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.RunSettings.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.RunSettings.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.RunSettings.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.Sources.get -> System.Collections.Generic.IList<string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.Sources.get -> System.Collections.Generic.IList<string!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.Sources.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.StartTestSessionCriteria() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.TestHostLauncher.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.TestHostLauncher.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria.TestHostLauncher.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.IsStopped.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.IsStopped.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.Metrics.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.StopTestSessionCompleteEventArgs() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.StopTestSessionCompleteEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StopTestSessionCompleteEventArgs.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestLoggerEvents.TestLoggerEvents() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.CollectMetrics.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.CollectMetrics.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.FilterOptions.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.SkipDefaultAdapters.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.SkipDefaultAdapters.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.TestCaseFilter.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.TestCaseFilter.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.TestCaseFilter.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions.TestPlatformOptions() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType.InProc = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType.OutOfProc = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.Error.get -> System.Exception
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.Error.get -> System.Exception?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.IsCanceled.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string, object>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.Metrics.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.TestRunAttachmentsProcessingCompleteEventArgs(bool isCanceled, System.Exception error) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingCompleteEventArgs.TestRunAttachmentsProcessingCompleteEventArgs(bool isCanceled, System.Exception? error) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.Attachments.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.Attachments.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.Attachments.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.CollectMetrics.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.CollectMetrics.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.InvokedDataCollectors.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.InvokedDataCollectors.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.RunSettings.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.RunSettings.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingPayload.TestRunAttachmentsProcessingPayload() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.AttachmentProcessorsCount.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.CurrentAttachmentProcessorIndex.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.CurrentAttachmentProcessorProgress.get -> long
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.CurrentAttachmentProcessorUris.get -> System.Collections.Generic.ICollection<System.Uri>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.TestRunAttachmentsProcessingProgressEventArgs(long currentAttachmentProcessorIndex, System.Collections.Generic.ICollection<System.Uri> currentAttachmentProcessorUris, long currentAttachmentProcessorProgress, long attachmentProcessorsCount) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.CurrentAttachmentProcessorUris.get -> System.Collections.Generic.ICollection<System.Uri!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs.TestRunAttachmentsProcessingProgressEventArgs(long currentAttachmentProcessorIndex, System.Collections.Generic.ICollection<System.Uri!>! currentAttachmentProcessorUris, long currentAttachmentProcessorProgress, long attachmentProcessorsCount) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.ActiveTests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.NewTestResults.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.TestRunChangedEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics stats, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> newTestResults, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> activeTests) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.TestRunStatistics.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.ActiveTests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.NewTestResults.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.TestRunChangedEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics? stats, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult!>? newTestResults, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? activeTests) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunChangedEventArgs.TestRunStatistics.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.AttachmentSets.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.AttachmentSets.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.DiscoveredExtensions.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.DiscoveredExtensions.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.ElapsedTimeInRunningTests.get -> System.TimeSpan
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.Error.get -> System.Exception
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.Error.get -> System.Exception?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.InvokedDataCollectors.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.IsAborted.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.IsCanceled.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string, object>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.Metrics.get -> System.Collections.Generic.IDictionary<string!, object!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.Metrics.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.TestRunCompleteEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics stats, bool isCanceled, bool isAborted, System.Exception error, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> attachmentSets, System.TimeSpan elapsedTime) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.TestRunStatistics.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.TestRunCompleteEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics? stats, bool isCanceled, bool isAborted, System.Exception? error, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? attachmentSets, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>? invokedDataCollectors, System.TimeSpan elapsedTime) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.TestRunCompleteEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics? stats, bool isCanceled, bool isAborted, System.Exception? error, System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? attachmentSets, System.TimeSpan elapsedTime) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs.TestRunStatistics.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunStatistics?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.AdapterSourceMap.get -> System.Collections.Generic.Dictionary<string, System.Collections.Generic.IEnumerable<string>>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.AdapterSourceMap.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.DebugEnabledForTestSession.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.DebugEnabledForTestSession.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria other) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria? other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.FilterOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.HasSpecificSources.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.HasSpecificTests.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Sources.get -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestCaseFilter.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.Dictionary<string, System.Collections.Generic.IEnumerable<string>> adapterSourceMap, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent, bool keepAlive) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo testSessionInfo, bool debugEnabledForTestSession) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase> tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria baseTestRunCriteria) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher, string testCaseFilter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions filterOptions) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher testHostLauncher, string testCaseFilter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions filterOptions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo testSessionInfo, bool debugEnabledForTestSession) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string> sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria testRunCriteria) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Tests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Sources.get -> System.Collections.Generic.IEnumerable<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestCaseFilter.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.Dictionary<string!, System.Collections.Generic.IEnumerable<string!>!>! adapterSourceMap, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent, bool keepAlive) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string! testSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string! testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string! testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, bool debugEnabledForTestSession) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! tests, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria! baseTestRunCriteria) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher, string? testCaseFilter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions? filterOptions) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, long frequencyOfRunStatsChangeEvent, bool keepAlive, string? testSettings, System.TimeSpan runStatsChangeEventTimeout, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher, string? testCaseFilter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions? filterOptions, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, bool debugEnabledForTestSession) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestRunCriteria(System.Collections.Generic.IEnumerable<string!>! sources, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Tests.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.DebuggingEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.DebuggingEnabled.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.KeepAlive.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.KeepAlive.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.RunSettings.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.RunSettings.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.RunSettings.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.Sources.get -> System.Collections.Generic.List<string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.Sources.get -> System.Collections.Generic.List<string!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.Sources.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestCases.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestCases.get -> System.Collections.Generic.List<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestCases.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestPlatformOptions.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestPlatformOptions.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestRunRequestPayload() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunRequestPayload.TestSessionInfo.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs.TestRunCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs.TestRunStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria testRunCriteria) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs.TestRunCriteria.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStartEventArgs.TestRunStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria! testRunCriteria) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState.Aborted = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState.Canceled = 4 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState
@@ -406,13 +480,13 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunState.Pending = 1
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.ExecutedTests.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.ExecutedTests.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.Stats.get -> System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.Stats.get -> System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.TestRunStatistics() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.TestRunStatistics(long executedTests, System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long> stats) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.TestRunStatistics(System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long> stats) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.TestRunStatistics(long executedTests, System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>? stats) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.TestRunStatistics(System.Collections.Generic.IDictionary<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, long>? stats) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunStatistics.this[Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome].get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? other) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.Id.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.TestSessionInfo() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole
@@ -420,19 +494,31 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole.Client = 1 -> Mic
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole.Host = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultExecutorUriAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultExecutorUriAttribute.DefaultExecutorUriAttribute(string executorUri) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultExecutorUriAttribute.ExecutorUri.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultExecutorUriAttribute.DefaultExecutorUriAttribute(string! executorUri) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultExecutorUriAttribute.ExecutorUri.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DefaultLoggerParameterNames
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DirectoryBasedTestDiscovererAttribute
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DirectoryBasedTestDiscovererAttribute.DirectoryBasedTestDiscovererAttribute() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.EditorAttachDebuggerPayload() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.ProcessID.get -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.ProcessID.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.Sources.get -> System.Collections.Generic.ICollection<string!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.Sources.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.TargetFramework.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.EditorAttachDebuggerPayload.TargetFramework.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute.ExtensionUri.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute.ExtensionUriAttribute(string extensionUri) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute.ExtensionUri.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute.ExtensionUriAttribute(string! extensionUri) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FileExtensionAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.FileExtensionAttribute.FileExtension.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.FileExtensionAttribute.FileExtensionAttribute(string fileExtension) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.FileExtensionAttribute.FileExtension.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.FileExtensionAttribute.FileExtensionAttribute(string! fileExtension) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.Name.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.Version.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.FrameworkName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.Name.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.ShortName.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.Version.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.Framework35 = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.Framework40 = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
@@ -441,87 +527,98 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.FrameworkCore10
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.FrameworkUap10 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion.None = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
 Microsoft.VisualStudio.TestPlatform.ObjectModel.FriendlyNameAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.FriendlyNameAttribute.FriendlyName.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.FriendlyNameAttribute.FriendlyNameAttribute(string friendlyName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.FriendlyNameAttribute.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.FriendlyNameAttribute.FriendlyNameAttribute(string! friendlyName) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.Data.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.Data.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.Data.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.ErrroCode.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.ErrroCode.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.HostProviderEventArgs(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.HostProviderEventArgs(string message, int errorCode, int processId) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.HostProviderEventArgs(string! message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.HostProviderEventArgs(string! message, int errorCode, int processId) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.ProcessId.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs.ProcessId.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.CanExecuteCurrentRunConfiguration(string runsettingsXml) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.CleanTestHostAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.CanExecuteCurrentRunConfiguration(string? runsettingsXml) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.CleanTestHostAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestHostConnectionInfo() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestHostProcessStartInfo(System.Collections.Generic.IEnumerable<string> sources, System.Collections.Generic.IDictionary<string, string> environmentVariables, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestPlatformExtensions(System.Collections.Generic.IEnumerable<string> sources, System.Collections.Generic.IEnumerable<string> extensions) -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestSources(System.Collections.Generic.IEnumerable<string> sources) -> System.Collections.Generic.IEnumerable<string>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.HostExited -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.HostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger logger, string runsettingsXml) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.LaunchTestHostAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo testHostStartInfo, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.SetCustomLauncher(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher customLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestHostProcessStartInfo(System.Collections.Generic.IEnumerable<string!>! sources, System.Collections.Generic.IDictionary<string!, string?>? environmentVariables, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestPlatformExtensions(System.Collections.Generic.IEnumerable<string!>! sources, System.Collections.Generic.IEnumerable<string!>! extensions) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.GetTestSources(System.Collections.Generic.IEnumerable<string!>! sources) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.HostExited -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.HostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger? logger, string! runsettingsXml) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.LaunchTestHostAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testHostStartInfo, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.SetCustomLauncher(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customLauncher) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider.Shared.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider2
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.ITestRuntimeProvider2.AttachDebuggerToTestHost() -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.AssemblyQualifiedName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector? other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.FilePath.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.FriendlyName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.HasAttachmentProcessor.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.InvokedDataCollector(System.Uri! uri, string! friendlyName, string! assemblyQualifiedName, string! filePath, bool hasAttachmentProcessor) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.Uri.get -> System.Uri!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>.LazyPropertyValue(System.Func<T> getValue) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>.LazyPropertyValue(System.Func<T>! getValue) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>.Value.get -> T
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.GetExistingLoggerIndex(Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings loggerSettings) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.GetExistingLoggerIndex(Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings! loggerSettings) -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.LoggerRunSettings() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.LoggerSettingsList.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.LoggerSettingsList.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.AssemblyQualifiedName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.AssemblyQualifiedName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.AssemblyQualifiedName.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.CodeBase.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.CodeBase.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.CodeBase.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.FriendlyName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.FriendlyName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.FriendlyName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.IsEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.IsEnabled.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.LoggerSettings() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Uri.get -> System.Uri
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Uri.get -> System.Uri?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Uri.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.DataCollectionMessageEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.FriendlyName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.DataCollectionMessageEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string! message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.FriendlyName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.FriendlyName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.TestCaseId.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.TestCaseId.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.Uri.get -> System.Uri
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.Uri.get -> System.Uri?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.DataCollectionMessageEventArgs.Uri.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger.SendMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel testMessageLevel, string message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger.SendMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel testMessageLevel, string! message) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Error = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Informational = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs.Result.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult result) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs.Result.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult! result) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.Level.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.Level.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.Message.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.Message.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.Message.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.TestRunMessageEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunMessageEventArgs.TestRunMessageEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string! message) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunStartedEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunStartedEventArgs.ProcessId.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunStartedEventArgs.TestRunStartedEventArgs(int processId) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ProcessExitedException
-Microsoft.VisualStudio.TestPlatform.ObjectModel.ProcessExitedException.ProcessExitedException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.ProcessExitedException.ProcessExitedException(string message, System.Exception inner) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ProcessExitedException.ProcessExitedException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ProcessExitedException.ProcessExitedException(string? message, System.Exception? inner) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.BatchSize.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.BatchSize.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.BatchSizeSet.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.BinariesRoot.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.BinariesRoot.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.CollectSourceInformationSet.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DefaultPlatform.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DefaultPlatform.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DefaultPlatformSet.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DesignMode.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DesignMode.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DesignModeSet.get -> bool
@@ -531,7 +628,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DisableAppDomai
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DisableParallelization.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DisableParallelization.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DisableParallelizationSet.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DotnetHostPath.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DotnetHostPath.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ExecutionThreadApartmentState.get -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ExecutionThreadApartmentState.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.InIsolation.get -> bool
@@ -539,17 +636,17 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.InIsolation.set
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.MaxCpuCount.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.MaxCpuCount.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.MaxCpuCountSet.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ResultsDirectory.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ResultsDirectory.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ResultsDirectory.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ResultsDirectorySet.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.RunConfiguration() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ShouldCollectSourceInformation.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ShouldCollectSourceInformation.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.SolutionDirectory.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.SolutionDirectory.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.SolutionDirectory.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetDevice.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetDevice.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetDevice.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFramework.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFrameworkSet.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFrameworkVersion.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion
@@ -557,10 +654,10 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetFramework
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetPlatform.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetPlatform.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TargetPlatformSet.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestAdaptersPaths.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestAdaptersPaths.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestAdaptersPaths.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestAdaptersPathsSet.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestCaseFilter.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestCaseFilter.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestSessionTimeout.get -> long
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TestSessionTimeout.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TreatNoTestsAsError.get -> bool
@@ -569,33 +666,38 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TreatTestAdapte
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.TreatTestAdapterErrorsAsWarnings.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException
 Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(string message, System.Exception innerException) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(string? message, System.Exception? innerException) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsNameAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsNameAttribute.SettingsName.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsNameAttribute.SettingsNameAttribute(string settingsName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsNameAttribute.SettingsName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsNameAttribute.SettingsNameAttribute(string! settingsName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail.Architecture.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail.Framework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail.Source.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SourceDetail.SourceDetail() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.CodeFilePath.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.CodeFilePath.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.CodeFilePath.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.DisplayName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.DisplayName.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.DisplayName.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.ExecutorUri.get -> System.Uri
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.ExecutorUri.get -> System.Uri!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.ExecutorUri.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.FullyQualifiedName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.FullyQualifiedName.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.FullyQualifiedName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Id.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Id.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.LineNumber.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.LineNumber.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.LocalExtensionData.get -> object
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.LocalExtensionData.get -> object?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.LocalExtensionData.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Source.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Source.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Source.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.TestCase() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.TestCase(string fullyQualifiedName, System.Uri executorUri, string source) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.TestCase(string! fullyQualifiedName, System.Uri! executorUri, string! source) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Endpoint.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Endpoint.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Endpoint.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Role.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.ConnectionRole
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Role.set -> void
@@ -604,18 +706,18 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Transport
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo.Transport.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.CacheLazyValuesOnSerializing(System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetProperties() -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty, object>>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property) -> object
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, T defaultValue) -> T
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, T defaultValue, System.Globalization.CultureInfo culture) -> T
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.RemovePropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, object value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T> value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T> value, System.Globalization.CultureInfo culture) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, T value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, T value, System.Globalization.CultureInfo culture) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetProperties() -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!, object?>>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property) -> object?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, T? defaultValue) -> T?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.GetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, T? defaultValue, System.Globalization.CultureInfo! culture) -> T?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.RemovePropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, object? value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>! value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, Microsoft.VisualStudio.TestPlatform.ObjectModel.LazyPropertyValue<T>! value, System.Globalization.CultureInfo! culture) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, T value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.SetPropertyValue<T>(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, T value, System.Globalization.CultureInfo! culture) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.TestObject() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.Traits.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.Traits.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Failed = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.None = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
@@ -624,40 +726,42 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Passed = 1 -> Micros
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Skipped = 3 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcomeHelper
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException.TestPlatformException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException.TestPlatformException(string message, System.Exception innerException) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException.TestPlatformException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPlatformException.TestPlatformException(string? message, System.Exception? innerException) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload.ProcessID.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload.ProcessID.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload.TargetFramework.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload.TargetFramework.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessAttachDebuggerPayload.TestProcessAttachDebuggerPayload(int pid) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.Arguments.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.Arguments.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.Arguments.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.CustomProperties.get -> System.Collections.Generic.IDictionary<string, string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.CustomProperties.get -> System.Collections.Generic.IDictionary<string!, string!>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.CustomProperties.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.EnvironmentVariables.get -> System.Collections.Generic.IDictionary<string, string>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.EnvironmentVariables.get -> System.Collections.Generic.IDictionary<string!, string?>?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.EnvironmentVariables.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.FileName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.FileName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.FileName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.TestProcessStartInfo() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.WorkingDirectory.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.WorkingDirectory.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo.WorkingDirectory.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Attributes.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Attributes.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Category.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Category.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Category.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Description.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Description.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Description.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty other) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.GetRealObject(System.Runtime.Serialization.StreamingContext context) -> object
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.GetValueType() -> System.Type
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Id.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty? other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.GetRealObject(System.Runtime.Serialization.StreamingContext context) -> object!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.GetValueType() -> System.Type!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Id.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Id.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Label.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Label.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Label.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ValidateValueCallback.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ValueType.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ValidateValueCallback.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ValueType.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ValueType.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes.Hidden = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes
@@ -665,35 +769,35 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes.Immutable
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes.None = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes.Trait = 4 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Attachments.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ComputerName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Attachments.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ComputerName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ComputerName.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.DisplayName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.DisplayName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.DisplayName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Duration.get -> System.TimeSpan
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Duration.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.EndTime.get -> System.DateTimeOffset
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.EndTime.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorMessage.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorMessage.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorMessage.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorStackTrace.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorStackTrace.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ErrorStackTrace.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Messages.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Messages.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Outcome.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Outcome.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.StartTime.get -> System.DateTimeOffset
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.StartTime.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.TestResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.TestResult(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.Category.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.TestResultMessage(string category, string text) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.Text.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.Category.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.TestResultMessage(string! category, string? text) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.Text.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.ConnectionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.ConnectionInfo.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.LogFile.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.LogFile.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.LogFile.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.Port.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.Port.set -> void
@@ -704,26 +808,26 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.TraceLe
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo.TraceLevel.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfoExtensions
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.Name.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.TestRunSettings(string name) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.Name.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.TestRunSettings(string! name) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Name.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Name.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Name.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Trait(string name, string value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Value.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Trait(string! name, string! value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Value.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait.Value.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.Add(Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait trait) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.Add(string name, string value) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.AddRange(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait> traits) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.GetEnumerator() -> System.Collections.Generic.IEnumerator<Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.Add(Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait! trait) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.Add(string! name, string! value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.AddRange(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait!>! traits) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TraitCollection.GetEnumerator() -> System.Collections.Generic.IEnumerator<Microsoft.VisualStudio.TestPlatform.ObjectModel.Trait!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Transport
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Transport.Sockets = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Transport
 Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants
 Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment
-Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.Description.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.Uri.get -> System.Uri
-Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.UriDataAttachment(System.Uri uri, string description) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.Description.get -> string?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.Uri.get -> System.Uri!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.UriDataAttachment(System.Uri! uri, string? description) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.EqtHash
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper
@@ -734,140 +838,140 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg (forwarded, containe
 Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback
 Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode
 Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode.TestSDKAutoGeneratedCode() -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.BaseTestRunCriteria.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.FilterOptions.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCriteria.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunStartedEventArgs.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty>
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.Equals(object? obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.GetHashCode() -> int
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestRunStartedEventArgs.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!>!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty>
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.ToString() -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.RequestExtensions.WaitForCompletion(this Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest request) -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!>!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.ToString() -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.RequestExtensions.WaitForCompletion(this Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequest! request) -> void
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.DoNotInitailize.get -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.DoNotInitailize.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(System.Exception exceptionToTrace) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorAssert(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.get -> string (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Error(System.Exception! exceptionToTrace) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorAssert(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorIf(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.get -> string? (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorOnInitialization.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeVerboseTrace(string customLogFile) -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnless(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.ErrorUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Fail(string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Info(string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoIf(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnless(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InfoUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.InitializeVerboseTrace(string? customLogFile) -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsErrorEnabled.get -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsInfoEnabled.get -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsVerboseEnabled.get -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.IsWarningEnabled.get -> bool (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.LogFile.get -> string (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string format, params object[] args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.FromString(string frameworkString) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.CannotBeNullOrEmpty.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.Culture.get -> System.Globalization.CultureInfo
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.Culture.set -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.DisplayChosenSettings.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.MalformedRunSettingsFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.NoMatchingSourcesFound.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources.SourceIncompatible.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.FromXml(System.Xml.XmlReader reader) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcomeHelper.GetOutcomeString(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> string
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.LogFile.get -> string? (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Verbose(string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseIf(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnless(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.VerboseUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.Warning(string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningIf(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnless(bool condition, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string! format, params object?[]! args) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.WarningUnlessAlterTrace(bool condition, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel bumpLevel, string? message) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.FromString(string? frameworkString) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.FromXml(System.Xml.XmlReader! reader) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcomeHelper.GetOutcomeString(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> string!
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.ClearRegisteredProperties() -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Find(string id) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string id, string label, string category, string description, System.Type valueType, Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback validateValueCallback, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes attributes, System.Type owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string id, string label, System.Type valueType, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes attributes, System.Type owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string id, string label, System.Type valueType, System.Type owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.TryUnregister(string id, out System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty, System.Collections.Generic.HashSet<System.Type>> propertyTypePair) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfoExtensions.ToCommandLineOptions(this Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.CreateFrom(string localFilePath, string description) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetCustomAttributes(this System.Reflection.Assembly assembly, string fullyQualifiedName) -> System.Collections.Generic.IEnumerable<System.Attribute>
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.EqtHash.GuidFromString(string data) -> System.Guid
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.Escape(string str) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.Unescape(string str) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.StringUtilities.IsNullOrWhiteSpace(string input) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.StringUtilities.PrepareForOutput(string input) -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.ReadToNextElement(this System.Xml.XmlReader reader) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.ReadToRootNode(System.Xml.XmlReader reader) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.SkipToNextElement(this System.Xml.XmlReader reader) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetLoggerRunSettings(string runSettings) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetRunConfigurationNode(string settingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetTestRunParameters(string settingsXml) -> System.Collections.Generic.Dictionary<string, object>
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Find(string! id) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string! id, string! label, string! category, string! description, System.Type! valueType, Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateValueCallback? validateValueCallback, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes attributes, System.Type! owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string! id, string! label, System.Type! valueType, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestPropertyAttributes attributes, System.Type! owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.Register(string! id, string! label, System.Type! valueType, System.Type! owner) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty.TryUnregister(string! id, out System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!, System.Collections.Generic.HashSet<System.Type!>!> propertyTypePair) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfoExtensions.ToCommandLineOptions(this Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment.CreateFrom(string! localFilePath, string? description) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetCustomAttributes(this System.Reflection.Assembly! assembly, string! fullyQualifiedName) -> System.Collections.Generic.IEnumerable<System.Attribute!>!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.EqtHash.GuidFromString(string! data) -> System.Guid
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.Escape(string! str) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.FilterHelper.Unescape(string! str) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.StringUtilities.IsNullOrWhiteSpace(string? input) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.StringUtilities.PrepareForOutput(string? input) -> string!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.ReadToNextElement(this System.Xml.XmlReader! reader) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.ReadToRootNode(System.Xml.XmlReader! reader) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlReaderUtilities.SkipToNextElement(this System.Xml.XmlReader! reader) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetLoggerRunSettings(string? runSettings) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetRunConfigurationNode(string? settingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetTestRunParameters(string? settingsXml) -> System.Collections.Generic.Dictionary<string!, object!>!
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.OSArchitecture.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.ReaderSettings.get -> System.Xml.XmlReaderSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(int arg, string parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(long arg, string parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNull<T>(T arg, string parameterName) -> T (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty(string arg, string parameterName) -> string (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty<T>(System.Collections.Generic.IEnumerable<T> arg, string parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrWhiteSpace(string arg, string parameterName) -> string (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.TypeOf<T>(object arg, string parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.ReaderSettings.get -> System.Xml.XmlReaderSettings!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(int arg, string! parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNegative(long arg, string! parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNull<T>(T? arg, string! parameterName) -> T (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty(string? arg, string! parameterName) -> string! (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrEmpty<T>(System.Collections.Generic.IEnumerable<T>? arg, string! parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.NotNullOrWhiteSpace(string? arg, string! parameterName) -> string! (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.ValidateArg.TypeOf<T>(object? arg, string! parameterName) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultExecutionThreadApartmentState -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState
 static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultPlatform -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultProtocolConfig -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultResultsDirectory -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.CodeFilePath -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.DisplayName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.ExecutorUri -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.FullyQualifiedName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.Id -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.LineNumber -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.Source -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.AdditionalInfoCategory -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.DebugTraceCategory -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.StandardErrorCategory -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.StandardOutCategory -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ComputerName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.DisplayName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.Duration -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.EndTime -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ErrorMessage -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ErrorStackTrace -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.Outcome -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.StartTime -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants.UapAppUserModeId -> string
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants.UapPackageFullName -> string
-virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty>
-virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedGetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, object defaultValue) -> object
-virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedSetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty property, object value) -> void
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultProtocolConfig -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ProtocolConfig!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.DefaultResultsDirectory -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.CodeFilePath -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.DisplayName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.ExecutorUri -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.FullyQualifiedName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.Id -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.LineNumber -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCaseProperties.Source -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.AdditionalInfoCategory -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.DebugTraceCategory -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.StandardErrorCategory -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultMessage.StandardOutCategory -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ComputerName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.DisplayName -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.Duration -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.EndTime -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ErrorMessage -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.ErrorStackTrace -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.Outcome -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResultProperties.StartTime -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants.UapAppUserModeId -> string!
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.UapConstants.UapPackageFullName -> string!
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.Properties.get -> System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty!>!
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedGetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, object? defaultValue) -> object?
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.TestObject.ProtectedSetPropertyValue(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProperty! property, object? value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.RiscV64 = 8 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.CaptureStandardOutput.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ForwardStandardOutput.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.DisableSharedTestHost.get -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.SkipDefaultAdapters.get -> bool
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Unshipped.txt
index e3d7f85f98..343eac0f8d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Unshipped.txt
@@ -1,6 +1,11 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.DiscoveryCriteria(System.Collections.Generic.IEnumerable<string> sources, long frequencyOfDiscoveredTestsEvent, System.TimeSpan discoveredTestEventTimeout, string runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo testSessionInfo) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCriteria.TestSessionInfo.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryRequestPayload.TestSessionInfo.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestPlatform.StartTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.IRequestData requestData, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.StartTestSessionCriteria criteria, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler eventsHandler) -> bool
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler.HandleTelemetryEvent(Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent! telemetryEvent) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ITelemetryInitializer
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ITelemetryInitializer.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.ITelemetryReporter! telemetryReporter) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ITelemetryReporter
+Microsoft.VisualStudio.TestPlatform.ObjectModel.ITelemetryReporter.Report(Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent! telemetryEvent) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent.Name.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent.Properties.get -> System.Collections.Generic.IDictionary<string!, object!>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.TelemetryEvent.TelemetryEvent(string! name, System.Collections.Generic.IDictionary<string!, object!>! properties) -> void
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Shipped.txt
index 7ac21e41e1..39fb930c1f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Shipped.txt
@@ -1,112 +1,113 @@
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.FileName.get -> string
+#nullable enable
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.FileName.get -> string!
 abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.PerformCleanup.get -> bool
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.SessionEnd -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.SessionStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestCaseEnd -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestCaseStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestHostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs>
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string text) -> void
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string text, System.Exception exception) -> void
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogWarning(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string text) -> void
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation fileTransferInformation) -> void
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileCompleted -> System.ComponentModel.AsyncCompletedEventHandler
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector.Initialize(System.Xml.XmlElement configurationElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents events, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink dataSink, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext environmentContext) -> void
-abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.ToXml() -> System.Xml.XmlElement
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.SessionEnd -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.SessionStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestCaseEnd -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestCaseStart -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.TestHostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs!>?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! text) -> void
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! text, System.Exception! exception) -> void
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogWarning(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! text) -> void
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation! fileTransferInformation) -> void
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileCompleted -> System.ComponentModel.AsyncCompletedEventHandler?
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector.Initialize(System.Xml.XmlElement? configurationElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents! events, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink! dataSink, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger! logger, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext? environmentContext) -> void
+abstract Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunSettings.ToXml() -> System.Xml.XmlElement!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.BasicTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.Context.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.Description.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.BasicTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.Context.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.Description.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.Description.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.RequestId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.RequestId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.RequestId.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.UserToken.get -> object
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.UserToken.get -> object?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.BasicTransferInformation.UserToken.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId sessionId) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId sessionId, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId testExecId) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId sessionId, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId! sessionId) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId! sessionId, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId? testExecId) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId! sessionId, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.DataCollectionContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase? testCase) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.HasTestCase.get -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.SessionId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.TestExecId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.SessionId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.TestExecId.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.DataCollectionEnvironmentContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext sessionDataCollectionContext) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.SessionDataCollectionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.DataCollectionEnvironmentContext(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! sessionDataCollectionContext) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.SessionDataCollectionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs.Context.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs.Context.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs.DataCollectionEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs.DataCollectionEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEventArgs.DataCollectionEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEvents.DataCollectionEvents() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.DataCollectionLogger() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, System.Exception exception) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogError(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, System.Exception! exception) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.DataCollectionSink() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string path, bool deleteFile) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string path, string description, bool deleteFile) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! path, bool deleteFile) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionSink.SendFileAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! path, string! description, bool deleteFile) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector.DataCollector() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector.Dispose() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorFriendlyNameAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorFriendlyNameAttribute.DataCollectorFriendlyNameAttribute(string friendlyName) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorFriendlyNameAttribute.FriendlyName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorFriendlyNameAttribute.DataCollectorFriendlyNameAttribute(string! friendlyName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorFriendlyNameAttribute.FriendlyName.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel.Data = 3 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel.Error = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel.Info = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel.Warning = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorTypeUriAttribute
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorTypeUriAttribute.DataCollectorTypeUriAttribute(string typeUri) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorTypeUriAttribute.TypeUri.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorTypeUriAttribute.DataCollectorTypeUriAttribute(string! typeUri) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorTypeUriAttribute.TypeUri.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string path, bool deleteFile) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, string path, bool deleteFile, Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper fileHelper) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.Path.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! path, bool deleteFile) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileTransferInformation(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, string! path, bool deleteFile, Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.Path.get -> string!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectionSink
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectionSink.SendData(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext dataCollectionContext, string key, string value) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectionSink.SendData(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! dataCollectionContext, string! key, string! value) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor.GetExtensionUris() -> System.Collections.Generic.IEnumerable<System.Uri>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor.ProcessAttachmentSetsAsync(System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> attachments, System.IProgress<int> progressReporter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger logger, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet>>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor.GetExtensionUris() -> System.Collections.Generic.IEnumerable<System.Uri!>?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor.ProcessAttachmentSetsAsync(System.Xml.XmlElement! configurationElement, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments, System.IProgress<int>! progressReporter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger! logger, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachmentProcessor.SupportsIncrementalProcessing.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachments
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachments.GetExtensionUri() -> System.Uri
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachments.HandleDataCollectionAttachmentSets(System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet> dataCollectionAttachments) -> System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachments.GetExtensionUri() -> System.Uri!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectorAttachments.HandleDataCollectionAttachmentSets(System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! dataCollectionAttachments) -> System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.ITestExecutionEnvironmentSpecifier
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.ITestExecutionEnvironmentSpecifier.GetTestExecutionEnvironmentVariables() -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.ITestExecutionEnvironmentSpecifier.GetTestExecutionEnvironmentVariables() -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string!>>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.CompareTo(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId other) -> int
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.CompareTo(object obj) -> int
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId other) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.CompareTo(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? other) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.CompareTo(object? obj) -> int
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Equals(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? other) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Id.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs.SessionEndEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs.SessionEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionEndEventArgs.SessionEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.Id.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.SessionId() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.SessionId(System.Guid id) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetProperties() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object>>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetPropertyValue(string property) -> object
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetPropertyValue<T>(string property) -> T
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetProperties() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object?>>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetPropertyValue(string! property) -> object?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.GetPropertyValue<T>(string! property) -> T?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.SessionStartEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.SessionStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, System.Collections.Generic.IDictionary<string, object> properties) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.SessionStartEventArgs(System.Collections.Generic.IDictionary<string, object> properties) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.SessionStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, System.Collections.Generic.IDictionary<string!, object?>! properties) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionStartEventArgs.SessionStartEventArgs(System.Collections.Generic.IDictionary<string!, object?>! properties) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestCaseEndEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestCaseEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestCaseEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestCaseEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestCaseEndEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testElement, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome testOutcome) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEndEventArgs.TestOutcome.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.IsChildTestCase.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testElement) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, System.Guid testCaseId, string testCaseName, bool isChildTestCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testElement) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, System.Guid testCaseId, string? testCaseName, bool isChildTestCase) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseId.get -> System.Guid
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseName.get -> string
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestElement.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestCaseName.get -> string!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseEventArgs.TestElement.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType.Assertion = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType.MissingException = 4 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType
@@ -116,128 +117,132 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureTy
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType.UnhandledException = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseFailureType
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs.TestCaseStartEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs.TestCaseStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testElement) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs.TestCaseStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testElement) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs.TestCaseStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testElement) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestCaseStartEventArgs.TestCaseStartEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase! testElement) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.Id.get -> System.Guid
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.TestExecId() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.TestExecId(System.Guid id) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs.TestHostLaunchedEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, int processId) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs.TestHostLaunchedEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, int processId) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestHostLaunchedEventArgs.TestHostProcessId.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResult.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResult.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResultEventArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult testResult) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult testResult) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult! testResult) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestResultEventArgs.TestResultEventArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult! testResult) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.DataCollectionRunSettings() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.DataCollectionRunSettings(string dataCollectionRootName, string dataCollectionsName, string dataCollectorName) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.DataCollectorSettingsList.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings>
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.DataCollectionRunSettings(string! dataCollectionRootName, string! dataCollectionsName, string! dataCollectorName) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.DataCollectorSettingsList.get -> System.Collections.ObjectModel.Collection<Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings!>!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.IsCollectionEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.InProcDataCollectionArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs.DataCollectionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs.TestCaseEndArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext dataCollectionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs.DataCollectionContext.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs.TestCaseEndArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! dataCollectionContext, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome outcome) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs.TestOutcome.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs.TestCaseStartArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase testCase) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs.TestCase.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs.TestCaseStartArgs(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase? testCase) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionEndArgs
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionEndArgs.TestSessionEndArgs() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.Configuration.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.Configuration.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.Configuration.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetProperties() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object>>
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetPropertyValue(string property) -> object
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetPropertyValue<T>(string property) -> T
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetProperties() -> System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string!, object?>>!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetPropertyValue(string! property) -> object?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.GetPropertyValue<T>(string! property) -> T?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.TestSessionStartArgs() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.TestSessionStartArgs(string configuration) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.TestSessionStartArgs(System.Collections.Generic.IDictionary<string, object> properties) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.TestSessionStartArgs(string! configuration) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs.TestSessionStartArgs(System.Collections.Generic.IDictionary<string!, object?>! properties) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.AssemblyQualifiedName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.AssemblyQualifiedName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.AssemblyQualifiedName.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.CodeBase.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.CodeBase.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.CodeBase.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Configuration.get -> System.Xml.XmlElement
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Configuration.get -> System.Xml.XmlElement?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Configuration.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.DataCollectorSettings() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.FriendlyName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.FriendlyName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.FriendlyName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.IsEnabled.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.IsEnabled.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.ToXml() -> System.Xml.XmlElement
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.ToXml(string dataCollectorName) -> System.Xml.XmlElement
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Uri.get -> System.Uri
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.ToXml() -> System.Xml.XmlElement!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.ToXml(string! dataCollectorName) -> System.Xml.XmlElement!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Uri.get -> System.Uri?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings.Uri.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.DiaNavigationData(string fileName, int minLineNumber, int maxLineNumber) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.FileName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.DiaNavigationData(string? fileName, int minLineNumber, int maxLineNumber) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.FileName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.FileName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.MaxLineNumber.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.MaxLineNumber.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.MinLineNumber.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData.MinLineNumber.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.DiaSession(string binaryPath) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.DiaSession(string binaryPath, string searchPath) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.DiaSession(string! binaryPath) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.DiaSession(string! binaryPath, string? searchPath) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.Dispose() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.GetNavigationData(string declaringTypeName, string methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData
-Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.GetNavigationDataForMethod(string declaringTypeName, string methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.GetNavigationData(string! declaringTypeName, string! methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaNavigationData?
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DiaSession.GetNavigationDataForMethod(string! declaringTypeName, string! methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection
-Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectionSink dataCollectionSink) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestCaseEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs testCaseEndArgs) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestCaseStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs testCaseStartArgs) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestSessionEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionEndArgs testSessionEndArgs) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestSessionStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs testSessionStartArgs) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Configuration.get -> System.Xml.XmlElement
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.IDataCollectionSink! dataCollectionSink) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestCaseEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseEndArgs! testCaseEndArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestCaseStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestCaseStartArgs! testCaseStartArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestSessionEnd(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionEndArgs! testSessionEndArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector.InProcDataCollection.TestSessionStart(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector.TestSessionStartArgs! testSessionStartArgs) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Configuration.get -> System.Xml.XmlElement?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.Configuration.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.ToXml() -> System.Xml.XmlElement
-Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.ToXml(string loggerName) -> System.Xml.XmlElement
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.ToXml() -> System.Xml.XmlElement!
+Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerSettings.ToXml(string! loggerName) -> System.Xml.XmlElement!
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.FileName.get -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.FileName.get -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.FileName.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.MaxLineNumber.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.MaxLineNumber.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.MinLineNumber.get -> int
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData.MinLineNumber.set -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationSession
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationSession.GetNavigationDataForMethod(string declaringTypeName, string methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.Equals(object obj) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationSession.GetNavigationDataForMethod(string! declaringTypeName, string! methodName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Navigation.INavigationData?
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileName.get -> string
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.FileName.get -> string!
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.FileTransferInformation.PerformCleanup.get -> bool
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.Equals(object obj) -> bool
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.Equals(object? obj) -> bool
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.GetHashCode() -> int
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.ToString() -> string
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.ToXml() -> System.Xml.XmlElement
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.ToXml() -> System.Xml.XmlElement
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ToXml() -> System.Xml.XmlElement
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.operator !=(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context1, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context2) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.operator ==(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context1, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context2) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.CreateForLocalEnvironment() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.CreateForLocalEnvironment(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext sessionDataCollectionContext) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.operator !=(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId left, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId right) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.operator ==(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId left, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId right) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.Empty.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.Empty.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.CreateDataCollectionRunSettings(System.Xml.XmlReader reader, string dataCollectionName, string dataCollectorsName, string dataCollectorName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.FromXml(System.Xml.XmlReader reader) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.FromXml(System.Xml.XmlReader reader, string dataCollectionName, string dataCollectorsName, string dataCollectorName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.ContainsDataCollector(System.Xml.XPath.IXPathNavigable runSettingDocument, string dataCollectorUri) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.CreateDefaultRunSettings() -> System.Xml.XmlDocument
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetDataCollectionRunSettings(string runSettingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(string runsettingsXml) -> System.Collections.Generic.IList<string>
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(string runSettingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.InsertDataCollectorsNode(System.Xml.XPath.IXPathNavigable runSettingDocument, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings settings) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.IsDataCollectionEnabled(string runSettingsXml) -> bool
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(string runSettingsXml) -> bool
-static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Empty -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId
-virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogException(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext context, System.Exception ex, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel level) -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.ToString() -> string!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.ToXml() -> System.Xml.XmlElement!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.LoggerRunSettings.ToXml() -> System.Xml.XmlElement!
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RunConfiguration.ToXml() -> System.Xml.XmlElement!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.operator !=(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext? context1, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext? context2) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext.operator ==(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext? context1, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext? context2) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.CreateForLocalEnvironment() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext.CreateForLocalEnvironment(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! sessionDataCollectionContext) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionEnvironmentContext!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.operator !=(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? left, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? right) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.operator ==(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? left, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId? right) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId.Empty.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.SessionId!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId.Empty.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.TestExecId!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.CreateDataCollectionRunSettings(System.Xml.XmlReader! reader, string! dataCollectionName, string! dataCollectorsName, string! dataCollectorName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.FromXml(System.Xml.XmlReader! reader) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings.FromXml(System.Xml.XmlReader! reader, string! dataCollectionName, string! dataCollectorsName, string! dataCollectorName) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.ContainsDataCollector(System.Xml.XPath.IXPathNavigable! runSettingDocument, string! dataCollectorUri) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.CreateDefaultRunSettings() -> System.Xml.XmlDocument!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetDataCollectionRunSettings(string? runSettingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(string? runsettingsXml) -> System.Collections.Generic.IList<string!>!
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(string? runSettingsXml) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectionRunSettings?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.InsertDataCollectorsNode(System.Xml.XPath.IXPathNavigable! runSettingDocument, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollectorSettings! settings) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.IsDataCollectionEnabled(string? runSettingsXml) -> bool
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(string? runSettingsXml) -> bool
+static readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId.Empty -> Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.RequestId!
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionLogger.LogException(Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectionContext! context, System.Exception! ex, Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorMessageLevel level) -> void
 virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollector.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorAttachmentProcessorAttribute
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorAttachmentProcessorAttribute.DataCollectorAttachmentProcessorAttribute(System.Type! type) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection.DataCollectorAttachmentProcessorAttribute.Type.get -> System.Type!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Shipped.txt
deleted file mode 100644
index ae8e28ce42..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.Dispose() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.SuspendCodeCoverage() -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.DoesReferencesAssembly(string source, System.Reflection.AssemblyName referenceAssembly) -> bool?
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetFrameworkVersionAndArchitectureForSource(string testSource) -> System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture, Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion>
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetReferencedAssemblies(string source) -> string[]
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.SetAppDomainFrameworkVersionBasedOnTestSource(System.AppDomainSetup setup, string testSource) -> void
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt
deleted file mode 100644
index ae8e28ce42..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.Dispose() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.SuspendCodeCoverage() -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.DoesReferencesAssembly(string source, System.Reflection.AssemblyName referenceAssembly) -> bool?
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetFrameworkVersionAndArchitectureForSource(string testSource) -> System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture, Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion>
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetReferencedAssemblies(string source) -> string[]
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.SetAppDomainFrameworkVersionBasedOnTestSource(System.AppDomainSetup setup, string testSource) -> void
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..ac68aae3ff
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1,18 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.Dispose() -> void
+virtual Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.SuspendCodeCoverage() -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.GetObjectData(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.DoesReferencesAssembly(string! source, System.Reflection.AssemblyName! referenceAssembly) -> bool?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetFrameworkVersionAndArchitectureForSource(string! testSource) -> System.Collections.Generic.KeyValuePair<Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture, Microsoft.VisualStudio.TestPlatform.ObjectModel.FrameworkVersion>
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetReferencedAssemblies(string! source) -> string![]?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.SetAppDomainFrameworkVersionBasedOnTestSource(System.AppDomainSetup! setup, string! testSource) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt
index 5f282702bb..2ceb9ba877 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Shipped.txt
@@ -1 +1,4 @@
-
\ No newline at end of file
+#nullable enable
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net6.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..2ceb9ba877
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1,4 @@
+#nullable enable
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 79675341e6..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt
deleted file mode 100644
index 5f618267fc..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 5f618267fc..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
deleted file mode 100644
index 5f618267fc..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
index 5f618267fc..2ceb9ba877 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -1,2 +1,4 @@
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+#nullable enable
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities)
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Shipped.txt
index e02abfc9b0..6562cba370 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Shipped.txt
@@ -1 +1,2 @@
-
+#nullable enable
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!
diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.cs b/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.cs
index 4c9600f246..2558cb3d39 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.cs
@@ -3,150 +3,151 @@
 
 #if NETFRAMEWORK
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <remarks>
+/// Enable registry-free COM context
+/// </remarks>
+internal class RegistryFreeActivationContext : IDisposable
 {
-    using System;
-    using System.ComponentModel;
-    using System.Runtime.InteropServices;
-
-    /// <remarks>
-    /// Enable registry-free COM context
-    /// </remarks>
-    internal class RegistryFreeActivationContext : IDisposable
-    {
-        private IntPtr cookie = IntPtr.Zero;
+    private IntPtr _cookie = IntPtr.Zero;
 
-        private IntPtr hActCtx = IntPtr.Zero;
+    private IntPtr _hActCtx = IntPtr.Zero;
 
-        private bool disposed = false;
+    private bool _disposed;
 
-        private string manifestFilePath = string.Empty;
+    private readonly string _manifestFilePath = string.Empty;
+
+    /// <summary>
+    /// Initializes a new instance of RegistryFreeActivationContext class.
+    /// </summary>
+    ///<param name="manifest">Manifest file path.</param>
+    public RegistryFreeActivationContext(string manifest)
+    {
+        _manifestFilePath = manifest;
+    }
+
+    /// <summary>
+    /// Finalize an instance of RegistryFreeActivationContext class.
+    /// </summary>
+    ~RegistryFreeActivationContext()
+    {
+        Dispose(false);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of RegistryFreeActivationContext class.
-        /// </summary>
-        ///<param name="manifest">Manifest file path.</param>
-        public RegistryFreeActivationContext(string manifest)
+    /// <summary>
+    /// Load manifest to enable registry-free COM context.
+    /// </summary>
+    public void ActivateContext()
+    {
+        if (_cookie != IntPtr.Zero || _hActCtx != IntPtr.Zero)
         {
-            this.manifestFilePath = manifest;
+            return;
         }
 
-        /// <summary>
-        /// Finalize an instance of RegistryFreeActivationContext class.
-        /// </summary>
-        ~RegistryFreeActivationContext()
+        ActivationContextNativeMethods.ACTCTX context = new();
+        context.cbSize = Marshal.SizeOf(typeof(ActivationContextNativeMethods.ACTCTX));
+
+        context.lpSource = _manifestFilePath;
+
+        _hActCtx = ActivationContextNativeMethods.CreateActCtx(ref context);
+        if (_hActCtx == (IntPtr)(-1))
+        {
+            throw new Win32Exception(Marshal.GetLastWin32Error(), "Fail to create registry-free COM context");
+        }
+        if (!ActivationContextNativeMethods.ActivateActCtx(_hActCtx, out _cookie))
         {
-            this.Dispose(false);
+            throw new Win32Exception(Marshal.GetLastWin32Error(), "Fail to activate registry-free COM context");
         }
+    }
 
-        /// <summary>
-        /// Load manifest to enable registry-free COM context.
-        /// </summary>
-        public void ActivateContext()
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_disposed)
         {
-            if (cookie != IntPtr.Zero || hActCtx != IntPtr.Zero)
-            {
-                return;
-            }
-
-            ActivationContextNativeMethods.ACTCTX context = new ActivationContextNativeMethods.ACTCTX();
-            context.cbSize = Marshal.SizeOf(typeof(ActivationContextNativeMethods.ACTCTX));
-
-            context.lpSource = this.manifestFilePath;
-
-            hActCtx = ActivationContextNativeMethods.CreateActCtx(ref context);
-            if (hActCtx == (IntPtr)(-1))
-            {
-                throw new Win32Exception(Marshal.GetLastWin32Error(), "Fail to create registry-free COM context");
-            }
-            if (!ActivationContextNativeMethods.ActivateActCtx(hActCtx, out cookie))
-            {
-                throw new Win32Exception(Marshal.GetLastWin32Error(), "Fail to activate registry-free COM context");
-            }
+            return;
         }
 
-        public void Dispose()
+        if (disposing)
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            // No managed resources to release
         }
 
-        protected virtual void Dispose(bool disposing)
+        DeactivateContext();
+        _disposed = true;
+    }
+
+    /// <summary>
+    /// Disable registry-free COM context.
+    /// </summary>
+    private void DeactivateContext()
+    {
+        if (_cookie == IntPtr.Zero && _hActCtx == IntPtr.Zero)
         {
-            if (!disposed)
-            {
-                if (disposing)
-                {
-                    // No managed resources to release
-                }
-
-                this.DeactivateContext();
-                disposed = true;
-            }
+            return;
         }
 
-        /// <summary>
-        /// Disable registry-free COM context.
-        /// </summary>
-        private void DeactivateContext()
+        try
         {
-            if (cookie == IntPtr.Zero && hActCtx == IntPtr.Zero)
-            {
-                return;
-            }
-
-            try
-            {
-                ActivationContextNativeMethods.DeactivateActCtx(0, cookie);
-                ActivationContextNativeMethods.ReleaseActCtx(hActCtx);
-                cookie = IntPtr.Zero;
-                hActCtx = IntPtr.Zero;
-            }
-            catch (Exception ex)
-            {
-                // Log any exceptions during deactivation.
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error(ex);
-                }
-            }
+            ActivationContextNativeMethods.DeactivateActCtx(0, _cookie);
+            ActivationContextNativeMethods.ReleaseActCtx(_hActCtx);
+            _cookie = IntPtr.Zero;
+            _hActCtx = IntPtr.Zero;
+        }
+        catch (Exception ex)
+        {
+            // Log any exceptions during deactivation.
+            EqtTrace.Error(ex);
         }
     }
+}
 
-    /// ActivationContextNativeMethods class needed for registry-free context
-    /// </summary>
-    internal static class ActivationContextNativeMethods
-    {
-        // Activation Context API Functions
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "CreateActCtxW")]
-        public extern static IntPtr CreateActCtx(ref ACTCTX actctx);
+/// <summary>
+/// ActivationContextNativeMethods class needed for registry-free context
+/// </summary>
+internal static class ActivationContextNativeMethods
+{
+    // Activation Context API Functions
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "CreateActCtxW")]
+    public extern static IntPtr CreateActCtx(ref ACTCTX actctx);
 
-        [DllImport("Kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool ActivateActCtx(IntPtr hActCtx, out IntPtr lpCookie);
+    [DllImport("Kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool ActivateActCtx(IntPtr hActCtx, out IntPtr lpCookie);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DeactivateActCtx(int dwFlags, IntPtr lpCookie);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DeactivateActCtx(int dwFlags, IntPtr lpCookie);
 
-        [DllImport("Kernel32.dll", SetLastError = true)]
-        public static extern void ReleaseActCtx(IntPtr hActCtx);
+    [DllImport("Kernel32.dll", SetLastError = true)]
+    public static extern void ReleaseActCtx(IntPtr hActCtx);
 
-        // Activation context structure
-        [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
-        public struct ACTCTX
-        {
-            public Int32 cbSize;
-            public UInt32 dwFlags;
-            public string lpSource;
-            public UInt16 wProcessorArchitecture;
-            public UInt16 wLangId;
-            public string lpAssemblyDirectory;
-            public string lpResourceName;
-            public string lpApplicationName;
-            public IntPtr hModule;
-        }
+    // Activation context structure
+    [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+    [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Layout struct")]
+    public struct ACTCTX
+    {
+        public Int32 cbSize;
+        public UInt32 dwFlags;
+        public string lpSource;
+        public UInt16 wProcessorArchitecture;
+        public UInt16 wLangId;
+        public string lpAssemblyDirectory;
+        public string lpResourceName;
+        public string lpApplicationName;
+        public IntPtr hModule;
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs
index 3a37b375e5..696900893f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs
@@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class CommonResources {
@@ -71,7 +71,7 @@ public static string CannotBeNullOrEmpty {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings..
+        ///   Looks up a localized string similar to Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings..
         /// </summary>
         public static string DisplayChosenSettings {
             get {
@@ -98,7 +98,7 @@ public static string NoMatchingSourcesFound {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to {0} is built for Framework {1} and Platform {2}..
+        ///   Looks up a localized string similar to {0} would use Framework {1} and Platform {2}..
         /// </summary>
         public static string SourceIncompatible {
             get {
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.resx b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.resx
index be18466964..329f3050ef 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.resx
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.resx
@@ -121,7 +121,7 @@
     <value>The parameter cannot be null or empty.</value>
   </data>
   <data name="DisplayChosenSettings" xml:space="preserve">
-    <value>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</value>
+    <value>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</value>
   </data>
   <data name="MalformedRunSettingsFile" xml:space="preserve">
     <value>Settings file provided does not conform to required format.</value>
@@ -130,6 +130,6 @@
     <value>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</value>
   </data>
   <data name="SourceIncompatible" xml:space="preserve">
-    <value>{0} is built for Framework {1} and Platform {2}.</value>
+    <value>{0} would use Framework {1} and Platform {2}.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.cs.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.cs.xlf
index 5e6f6bda56..f1e43d1cfe 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.cs.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.cs.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="cs">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Otestujte zjištěné knihovny DLL, které se vytvořily pro různé verze architektury a platformy. Následující knihovny DLL neodpovídají aktuálnímu nastavení, tedy architektuře {0} a platformě {1}.{2}Další podrobnosti o správě těchto nastavení najdete v {3}.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Žádný s poskytnutých kontejnerů testů neodpovídá nastavení architektury platformy a rozhraní .NET Framework pro testovací běh. Platforma: {0}  .NET Framework: {1}. Další podrobnosti o správě těchto nastavení najdete na adrese http://go.microsoft.com/fwlink/?LinkID=330428.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Zadaný soubor nastavení neodpovídá požadovanému formátu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">Produkt {0} je sestaven pro rozhraní {1} a platformu {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="cs">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">Testovací běh zjistil knihovny DLL, které by používaly různé verze architektury a platformy. Následující knihovny DLL neodpovídají aktuálnímu nastavení architektury {0} a platformy {1}.{2}Pro další podrobnosti o správě těchto nastavení přejděte na {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Žádný s poskytnutých kontejnerů testů neodpovídá nastavení architektury platformy a rozhraní .NET Framework pro testovací běh. Platforma: {0}  .NET Framework: {1}. Další podrobnosti o správě těchto nastavení najdete na adrese http://go.microsoft.com/fwlink/?LinkID=330428.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Zadaný soubor nastavení neodpovídá požadovanému formátu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} by používal architekturu {1} a platformu {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.de.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.de.xlf
index 0904b4e6a4..e5ec4735b2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.de.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.de.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="de">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Beim Testlauf wurden DLLs erkannt, die für verschiedene Framework- und Plattformversionen erstellt wurden. Die folgenden DLLs entsprechen nicht den aktuellen Einstellungen: Framework {0} und Plattform {1}.{2}Wechseln Sie zu {3}, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Keiner der angegebenen Testcontainer stimmt mit der Plattformarchitektur und den .NET Framework-Einstellungen für den Testlauf überein. Plattform: {0}, .NET Framework: {1}. Navigieren Sie zu http://go.microsoft.com/fwlink/?LinkID=330428, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Die angegebene Einstellungsdatei entspricht nicht dem erforderlichen Format.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">"{0}" wurde für das Framework {1} und die Plattform {2} erstellt.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="de">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">Beim Testlauf wurden DLLs erkannt, die für verschiedene Framework- und Plattformversionen erstellt wurden. Die folgenden DLLs entsprechen nicht den aktuellen Einstellungen: {0} Framework und {1} Plattform.{2}Wechseln Sie zu {3}, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Keiner der angegebenen Testcontainer stimmt mit der Plattformarchitektur und den .NET Framework-Einstellungen für den Testlauf überein. Plattform: {0}, .NET Framework: {1}. Navigieren Sie zu http://go.microsoft.com/fwlink/?LinkID=330428, um weitere Informationen zum Verwalten dieser Einstellungen zu erhalten.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Die angegebene Einstellungsdatei entspricht nicht dem erforderlichen Format.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} würde Framework {1} und Platform {2} verwenden.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.es.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.es.xlf
index ea9dd037da..d37812b28c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.es.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.es.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="es">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">La serie de pruebas detectó archivos DLL que se compilaron para diferentes versiones de marco de trabajo y plataforma. Los siguientes archivos DLL no coinciden con la configuración actual, que es el marco de trabajo {0} y la plataforma {1}. {2}Vaya a {3} para obtener más información sobre cómo administrar esta configuración.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Ninguno de los contenedores de prueba proporcionados coincide con la configuración de arquitectura de plataforma y .Net Framework de la serie de pruebas. Plataforma: {0}, .Net Framework: {1}. Vaya a http://go.microsoft.com/fwlink/?LinkID=330428 para obtener más información sobre cómo administrar esta configuración.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">El archivo de configuración proporcionado no tiene el formato requerido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} se ha compilado para el marco {1} y la plataforma {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="es">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">La serie de pruebas detectó archivos DLL que usarían diferentes versiones de marco de trabajo y plataforma. Los siguientes archivos DLL no coinciden con la configuración actual, que es el marco de trabajo {0} y la plataforma {1}. {2}Vaya a {3} para obtener más información sobre cómo administrar esta configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Ninguno de los contenedores de prueba proporcionados coincide con la configuración de arquitectura de plataforma y .Net Framework de la serie de pruebas. Plataforma: {0}, .Net Framework: {1}. Vaya a http://go.microsoft.com/fwlink/?LinkID=330428 para obtener más información sobre cómo administrar esta configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">El archivo de configuración proporcionado no tiene el formato requerido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} usaría el marco de trabajo {1} y la plataforma {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.fr.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.fr.xlf
index 0c9b75f180..56255af163 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.fr.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.fr.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="fr">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">La série de tests a détecté une ou plusieurs DLL qui ont été générées pour d'autres versions de framework et de plateforme. La ou les DLL suivantes ne correspondent pas aux paramètres actuels : framework {0} et plateforme {1}.{2}Accédez à {3} pour plus d'informations sur la gestion de ces paramètres.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Aucun des conteneurs de tests fournis ne correspond aux paramètres d'architecture de la plateforme et du .Net Framework pour la série de tests. Plateforme : {0} .Net Framework : {1}. Accédez à http://go.microsoft.com/fwlink/?LinkID=330428 pour plus de détails sur la gestion de ces paramètres.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Le fichier de paramètres fourni n'est pas conforme au format requis.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} est généré pour le framework {1} et la plateforme {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="fr">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">La série de tests a détecté une ou plusieurs DLL qui utiliseraient d'autres versions de framework et de plateforme. La ou les DLL suivantes ne correspondent pas aux paramètres actuels : framework {0} et plateforme {1}.{2}Accédez à {3} pour plus d'informations sur la gestion de ces paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Aucun des conteneurs de tests fournis ne correspond aux paramètres d'architecture de la plateforme et du .Net Framework pour la série de tests. Plateforme : {0} .Net Framework : {1}. Accédez à http://go.microsoft.com/fwlink/?LinkID=330428 pour plus de détails sur la gestion de ces paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Le fichier de paramètres fourni n'est pas conforme au format requis.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} utiliserait framework {1} et {2} plateforme.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.it.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.it.xlf
index cde112bdb8..54bea3539a 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.it.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.it.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="it">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Il parametro non può essere vuoto o Null.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">L'esecuzione dei test ha rilevato DLL compilate per versioni diverse del framework e della piattaforma. Le DLL seguenti non corrispondono alle impostazioni correnti, ovvero al framework {0} e alla piattaforma {1}.{2}Per altri dettagli sulla gestione di queste impostazioni, vedere {3}.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Nessuno dei contenitori di test specificati corrisponde alle impostazioni di architettura della piattaforma e .NET Framework per l'esecuzione dei test. Piattaforma: {0} .NET Framework: {1}. Per altre informazioni sulla gestione di tali impostazioni, visitare http://go.microsoft.com/fwlink/?LinkID=330428</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Il file di impostazioni specificato non è conforme al formato richiesto.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} viene compilato per il framework {1} e la piattaforma {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="it">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Il parametro non può essere vuoto o Null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">L'esecuzione dei test ha rilevato DLL compilate per versioni diverse del framework e della piattaforma. Le DLL seguenti non corrispondono alle impostazioni correnti, ovvero al framework {0} e alla piattaforma {1}.{2}Per altri dettagli sulla gestione di queste impostazioni, vedi {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Nessuno dei contenitori di test specificati corrisponde alle impostazioni di architettura della piattaforma e .NET Framework per l'esecuzione dei test. Piattaforma: {0} .NET Framework: {1}. Per altre informazioni sulla gestione di tali impostazioni, visitare http://go.microsoft.com/fwlink/?LinkID=330428</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Il file di impostazioni specificato non è conforme al formato richiesto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} userebbe Framework {1} e platform {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ja.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ja.xlf
index 5e8f037b7a..4e9c23e6b8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ja.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ja.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ja">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">パラメーターを null または空にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">テストの実行で、別のフレームワークとプラットフォームのバージョン用にビルドされた DLL が検出されました。以下の DLL は、現在の設定と一致しません。現在のフレームワーク: {0}、プラットフォーム: {1}。{2}これらの設定を管理することについて詳しくは、{3} にアクセスしてください。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">提供されたどのテスト コンテナーも、テスト実行のプラットフォーム アーキテクチャおよび .NET Framework 設定に一致しません。プラットフォーム: {0}、.NET Framework: {1}。これらの設定の管理方法の詳細については、http://go.microsoft.com/fwlink/?LinkID=330428 にアクセスしてください。</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">指定された設定ファイルは、必要な形式に準拠していません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} はフレームワーク {1} およびプラットフォーム {2} 向けにビルドされます。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ja">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">パラメーターを null または空にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">テストの実行で、別のフレームワークとプラットフォームのバージョンを使用する DLL が検出されました。以下の DLL は、現在の設定と一致しません。現在のフレームワーク: {0}、プラットフォーム: {1}。{2}これらの設定の管理について詳しくは、{3} にアクセスしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">提供されたどのテスト コンテナーも、テスト実行のプラットフォーム アーキテクチャおよび .NET Framework 設定に一致しません。プラットフォーム: {0}、.NET Framework: {1}。これらの設定の管理方法の詳細については、http://go.microsoft.com/fwlink/?LinkID=330428 にアクセスしてください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">指定された設定ファイルは、必要な形式に準拠していません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} では、フレームワーク {1} と プラットフォーム {2} が使用されます。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ko.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ko.xlf
index ee4b96f092..78f2247f34 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ko.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ko.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ko">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">테스트 실행에서 다른 프레임워크 및 플랫폼 버전용으로 빌드된 DLL을 감지했습니다. 다음 DLL은 현재 설정({0} 프레임워크 및 {1} 플랫폼)과 일치하지 않습니다.{2}이 설정을 관리하는 방법에 대한 자세한 내용을 보려면 {3}(으)로 이동하세요.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">제공된 테스트 컨테이너 중에 테스트 실행을 위한 플랫폼 아키텍처 및 .NET Framework 설정과 일치하는 것이 없습니다. 플랫폼: {0}, .NET Framework: {1}. 이러한 설정의 관리에 대한 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=330428을 참조하세요.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">제공된 설정 파일이 필요한 형식에 맞지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0}은(는) 프레임워크 {1} 및 플랫폼 {2}을(를) 대상으로 빌드됩니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ko">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">테스트 실행에서 다른 프레임워크 및 플랫폼 버전용을 사용하는 DLL을 감지했습니다. 다음 DLL은 현재 설정({0} 프레임워크 및 {1} 플랫폼)과 일치하지 않습니다.{2}이 설정을 관리하는 방법에 대한 자세한 내용을 보려면 {3}(으)로 이동하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">제공된 테스트 컨테이너 중에 테스트 실행을 위한 플랫폼 아키텍처 및 .NET Framework 설정과 일치하는 것이 없습니다. 플랫폼: {0}, .NET Framework: {1}. 이러한 설정의 관리에 대한 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=330428을 참조하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">제공된 설정 파일이 필요한 형식에 맞지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0}은(는) Framework {1} 및 Platform {2}을(를) 사용합니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pl.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pl.xlf
index e4e0d81fb4..ca2bbddacf 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pl.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pl.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="pl">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Przebieg testowy wykrył biblioteki DLL utworzone dla innych wersji struktury i platformy. Następujące biblioteki DLL są niezgodne z bieżącymi ustawieniami (określającymi strukturę {0} i platformę {1}).{2}Aby uzyskać więcej informacji o zarządzaniu tymi ustawieniami, przejdź do: {3}.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Żaden z dostarczonych kontenerów testów nie odpowiada architekturze platformy i ustawieniom programu .NET Framework dotyczącym przebiegu testu. Platforma: {0}. Program .NET Framework: {1}. Aby uzyskać więcej informacji na temat zarządzania tymi ustawieniami, przejdź do strony http://go.microsoft.com/fwlink/?LinkID=330428.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Podany plik ustawień nie jest zgodny z wymaganym formatem.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">Element {0} został skompilowany dla struktury {1} i platformy {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="pl">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">Przebieg testowy wykrył biblioteki DLL używające innych wersji struktury i platformy. Następujące biblioteki DLL są niezgodne z bieżącymi ustawieniami (określającymi strukturę {0} i platformę {1}).{2}Aby uzyskać więcej informacji o zarządzaniu tymi ustawieniami, przejdź do: {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Żaden z dostarczonych kontenerów testów nie odpowiada architekturze platformy i ustawieniom programu .NET Framework dotyczącym przebiegu testu. Platforma: {0}. Program .NET Framework: {1}. Aby uzyskać więcej informacji na temat zarządzania tymi ustawieniami, przejdź do strony http://go.microsoft.com/fwlink/?LinkID=330428.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Podany plik ustawień nie jest zgodny z wymaganym formatem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} będzie używać struktury {1} i platformy {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pt-BR.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pt-BR.xlf
index d36d02f785..5ff19843c3 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.pt-BR.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">A execução de teste detectou DLLs que foram criadas para diferentes versões de estrutura e de plataforma. As DLLs a seguir não correspondem às configurações atuais, que são a estrutura {0} e a plataforma {1}.{2}Acesse {3} para obter mais detalhes sobre o gerenciamento dessas configurações.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Nenhum dos contêineres de teste fornecidos corresponde às configurações da Arquitetura da Plataforma e do .Net Framework para a execução de teste. Plataforma: {0}  .Net Framework: {1}. Acesse http://go.microsoft.com/fwlink/?LinkID=330428 para obter mais detalhes sobre como gerenciar essas configurações.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">O arquivo de configurações fornecido não está em conformidade com o formato exigido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} é compilado para Framework {1} e Platform {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">A execução do teste detectou DLL(s) que usariam diferentes versões de estrutura e de plataforma. A(s) DLL(s) a seguir não corresponde(m) às configurações atuais, que são a estrutura {0} e a plataforma {1}.{2}Acesse {3} para obter mais detalhes sobre o gerenciamento dessas configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Nenhum dos contêineres de teste fornecidos corresponde às configurações da Arquitetura da Plataforma e do .Net Framework para a execução de teste. Plataforma: {0}  .Net Framework: {1}. Acesse http://go.microsoft.com/fwlink/?LinkID=330428 para obter mais detalhes sobre como gerenciar essas configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">O arquivo de configurações fornecido não está em conformidade com o formato exigido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} usariam a estrutura {1} e a plataforma {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ru.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ru.xlf
index 10fda594fd..a4babf8f6f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ru.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.ru.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ru">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Тестовый запуск обнаружил библиотеки DLL, которые были созданы для различных версий инфраструктуры и платформы. Следующие библиотеки DLL не соответствуют текущим параметрам (инфраструктура {0} и платформа {1}).{2}Перейдите по ссылке {3} для получения дополнительных сведений об управлении этими параметрами.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Ни один из предоставленных контейнеров тестов не соответствует архитектуре платформы и параметрам .NET Framework для тестового запуска. Платформа: {0} .NET Framework: {1}. Дополнительные сведения об управлении этими параметрами см. по адресу http://go.microsoft.com/fwlink/?LinkID=330428.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Указанный файл параметров не соответствует требуемому формату.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} создается для программной платформы {1} и аппаратной платформы {2}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="ru">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">Тестовый запуск обнаружил библиотеки DLL, предназначенные для других версий инфраструктуры и платформы. Следующие DLL не соответствуют текущим параметрам (инфраструктура {0} и платформа {1}).{2}Дополнительные сведения об управлении этими параметрами: {3}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Ни один из предоставленных контейнеров тестов не соответствует архитектуре платформы и параметрам .NET Framework для тестового запуска. Платформа: {0} .NET Framework: {1}. Дополнительные сведения об управлении этими параметрами см. по адресу http://go.microsoft.com/fwlink/?LinkID=330428.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Указанный файл параметров не соответствует требуемому формату.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} предполагает использование инфраструктуры {1} и платформы {2}.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.tr.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.tr.xlf
index d8243a5dff..526caf3203 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.tr.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.tr.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="tr">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametre null veya boş olamaz.</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Test çalıştırması, farklı çerçeve ve platform sürümleri için oluşturulmuş DLL'ler buldu. Aşağıdaki DLL'ler, {0} çerçevesi ve {1} platformu olan geçerli ayarlarla eşleşmiyor. {2}Bu ayarları yönetme hakkında daha fazla ayrıntı için {3} bölümüne gidin.</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">Belirtilen test kapsayıcılarının hiçbiri test çalıştırmasına ait Platform Mimarisi ve .NET Framework ayarlarıyla eşleşmiyor. Platform: {0} .NET Framework: {1}. Bu ayarları yönetmeye ilişkin ayrıntılar için bkz. http://go.microsoft.com/fwlink/?LinkID=330428.</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">Belirtilen ayarlar dosyası, gerekli biçime uymuyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0}, {1} Çerçevesi ve {2} Platformu için derlenmiştir.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="tr">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametre null veya boş olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">Test çalıştırması, farklı çerçeve ve platform sürümlerini kullanan DLL’ler algıladı. Aşağıdaki DLL’ler, {0} çerçevesi ve {1} platformu olarak seçilmiş geçerli ayarlarla eşleşmiyor. {2}Bu ayarları yönetme hakkında daha fazla ayrıntı için {3} bölümüne gidin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">Belirtilen test kapsayıcılarının hiçbiri test çalıştırmasına ait Platform Mimarisi ve .NET Framework ayarlarıyla eşleşmiyor. Platform: {0} .NET Framework: {1}. Bu ayarları yönetmeye ilişkin ayrıntılar için bkz. http://go.microsoft.com/fwlink/?LinkID=330428.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">Belirtilen ayarlar dosyası, gerekli biçime uymuyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0}, {1} Çerçevesini ve {2} Platformunu kullanır.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf
index 29ceff30df..5e21921af7 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.xlf
@@ -4,26 +4,26 @@
     <body>
       <trans-unit id="CannotBeNullOrEmpty">
         <source>The parameter cannot be null or empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <note />
       </trans-unit>
       <trans-unit id="NoMatchingSourcesFound">
         <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MalformedRunSettingsFile">
         <source>Settings file provided does not conform to required format.</source>
         <target state="new">Settings file does not conform with to required format.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
+        <source>{0} would use Framework {1} and Platform {2}.</source>
         <target state="new">{0} is built for Framework {1} and Platform {2}.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hans.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hans.xlf
index 91aa3fa748..8d0e07ec5f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hans.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">参数不能为 NULL 或为空。</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">测试运行检测到为不同框架和平台版本构建的 DLL。后面的 DLL 与当前设置(即 {0} 框架和 {1} 平台)不匹配。{2}如需了解如何管理这些设置，请转到 {3}。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">提供的所有测试容器均与用于测试运行的平台体系结构和 .Net Framework 设置不匹配。平台: {0}。.Net Framework: {1}。有关管理这些设置的详细信息，请转到http://go.microsoft.com/fwlink/?LinkID=330428。</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">提供的设置文件不符合格式要求。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} 适用于 {1} 框架和 {2} 平台。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">参数不能为 NULL 或为空。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">测试运行检测到将使用不同框架和平台版本的 DLL。后面的 DLL 与当前设置(即 {0} 框架和 {1} 平台)不匹配。{2}要了解如何管理这些设置的更多详细信息，请转到 {3}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">提供的所有测试容器均与用于测试运行的平台体系结构和 .Net Framework 设置不匹配。平台: {0}。.Net Framework: {1}。有关管理这些设置的详细信息，请转到http://go.microsoft.com/fwlink/?LinkID=330428。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">提供的设置文件不符合格式要求。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} 将使用 {1} 框架和 {2} 平台。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hant.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hant.xlf
index faa0382b32..8b0e98363f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/CommonResources.zh-Hant.xlf
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">參數不可為 null 或空白。</target>
-      </trans-unit>
-      <trans-unit id="DisplayChosenSettings">
-        <source>Test run detected DLL(s) which were built for different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">測試回合偵測到為不同架構和平台版本所建置的 DLL。下列 DLL 與目前的設定不相符，亦即 {0} 架構及 {1} 平台。{2}如需管理這些設定的詳細資料，請前往 {3}。</target>
-      </trans-unit>
-      <trans-unit id="NoMatchingSourcesFound">
-        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
-        <note></note>
-        <target state="translated">提供的測試容器全都不符合測試回合的平台架構與 .Net Framework 設定。平台: {0}  .Net Framework: {1}。如需如何管理這些設定的詳細資料，請前往 http://go.microsoft.com/fwlink/?LinkID=330428。</target>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsFile">
-        <source>Settings file provided does not conform to required format.</source>
-        <target state="translated">提供的設定檔案不符合所需的格式。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SourceIncompatible">
-        <source>{0} is built for Framework {1} and Platform {2}.</source>
-        <target state="translated">{0} 專為架構 {1} 及平台 {2} 建置。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../CommonResources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">參數不可為 null 或空白。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisplayChosenSettings">
+        <source>Test run detected DLL(s) which would use different framework and platform versions. Following DLL(s) do not match current settings, which are {0} framework and {1} platform.{2}Go to {3} for more details on managing these settings.</source>
+        <target state="translated">測試回合偵測到的 DLL 會使用不同架構和平台版本。下列 DLL 與目前的設定不相符，亦即 {0} 架構及 {1} 平台。{2}如需管理這些設定的詳細資料，請前往 {3}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoMatchingSourcesFound">
+        <source>None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0}  .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.</source>
+        <target state="translated">提供的測試容器全都不符合測試回合的平台架構與 .Net Framework 設定。平台: {0}  .Net Framework: {1}。如需如何管理這些設定的詳細資料，請前往 http://go.microsoft.com/fwlink/?LinkID=330428。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsFile">
+        <source>Settings file provided does not conform to required format.</source>
+        <target state="translated">提供的設定檔案不符合所需的格式。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SourceIncompatible">
+        <source>{0} would use Framework {1} and Platform {2}.</source>
+        <target state="translated">{0} 將使用架構 {1} 與平台 {2}。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.cs.xlf
index 1976fdb514..24c3e8f100 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.cs.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Neúspěšné</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Žádné</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Úspěšné</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Zprávy testů:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Zpráva: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  Trasování zásobníku:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Vlastnost {0} nejde zaregistrovat jako typ hodnoty {1}, protože už je zaregistrovaná jako {2}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Číslo sloupce</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">Identifikátor URI prováděcího modulu</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Zdroj</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Číslo řádku</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Název</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Název počítače</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Zobrazovaný název výsledku testu</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Doba trvání</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Čas ukončení</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Číslo sloupce chyby</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Chybová zpráva</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Trasování zásobníku chyb</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Výsledek</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Čas zahájení</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">Nejde najít TypeConverter pro typ {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Cesta k souboru</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">Četnost oznámení musí být kladné číslo.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Neplatné nastavení {0}. Neočekávaný XmlAttribute: {1}</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Neplatné nastavení {0}. Neočekávaný XmlElement: {1}</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Neplatné nastavení kolekce dat. Očekávaný atribut '{0}' nebyl nalezen.  Typické nastavení kolekce dat by mělo vypadat přibližně následovně &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">Nenalezeno</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Přeskočeno</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Časový limit upozornění musí být větší než nula.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Neplatné nastavení {0}.  Pro {2} se zadala neplatná hodnota {1}.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Kořenový uzel parametrů spouštění se musí jmenovat RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter se nedá zadat pro konkrétní běh testů. Parametr FilterCriteria je určený jenom pro běhy se zdroji.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Typ vlastnosti testu {0} vlastnosti {1} se nepodporuje. Použijte jeden z podporovaných typů vlastností (primitivní typy, identifikátor URI, řetězec, string[]) a zkuste to znovu. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Nepovedlo se najít uzel {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">PlněKvalifikovanýNázev</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Vlastnosti</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">Adresář řešení {0} neexistuje. Ujistěte se prosím, že adresář řešení zadaný v nastavení Runsettings existuje a že máte oprávnění ho číst.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Soubor {0} neexistuje.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">Objekt musí být typu {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Přerušené</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Dokončené</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Odpojené</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Chyba</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Neúspěšné</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Neprůkazné</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">Probíhá</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Neprovedené</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Nejde spustit</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Úspěšné</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Úspěšné (běh se přerušil)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Čekající</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Časový limit</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Upozornění</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Z poskytnutého streamu nejde číst. Pokud stream nepodporuje čtení, jeho data nejde poslat.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Zadaný název souboru {0} obsahuje tyto neplatné znaky: {1}</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Zadaný název souboru {0} je rezervovaný.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Nepovedlo se vytvořit model COM pro relaci msdia. HResult: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Nepovedlo se načíst knihovnu msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">Neplatný identifikátor URI v nastavení {0} kolekce dat</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">Neplatný identifikátor URI {0} v nastavení {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Neplatné nastavení {0}. Očekával se alespoň jeden XmlAttribute: popisný název (friendlyName), identifikátor URI (uri) nebo kvalifikovaný název sestavení (assemblyQualifiedName).</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">Řetězec filtru {0} zahrnuje nerozpoznanou řídicí sekvenci.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Neúspěšné</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Žádné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Úspěšné</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Zprávy testů:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Zpráva: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  Trasování zásobníku:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Vlastnost {0} nejde zaregistrovat jako typ hodnoty {1}, protože už je zaregistrovaná jako {2}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Číslo sloupce</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">Identifikátor URI prováděcího modulu</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Zdroj</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Číslo řádku</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Název</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Název počítače</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Zobrazovaný název výsledku testu</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Doba trvání</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Čas ukončení</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Číslo sloupce chyby</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Chybová zpráva</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Trasování zásobníku chyb</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Výsledek</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Čas zahájení</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">Nejde najít TypeConverter pro typ {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Cesta k souboru</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">Četnost oznámení musí být kladné číslo.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Neplatné nastavení {0}. Neočekávaný XmlAttribute: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Neplatné nastavení {0}. Neočekávaný XmlElement: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Neplatné nastavení kolekce dat. Očekávaný atribut '{0}' nebyl nalezen.  Typické nastavení kolekce dat by mělo vypadat přibližně následovně &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">Nenalezeno</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Přeskočeno</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Časový limit upozornění musí být větší než nula.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Neplatné nastavení {0}.  Pro {2} se zadala neplatná hodnota {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Kořenový uzel parametrů spouštění se musí jmenovat RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">TestCaseFilter se nedá zadat pro konkrétní běh testů. Parametr FilterCriteria je určený jenom pro běhy se zdroji.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Typ vlastnosti testu {0} vlastnosti {1} se nepodporuje. Použijte jeden z podporovaných typů vlastností (primitivní typy, identifikátor URI, řetězec, string[]) a zkuste to znovu. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Nepovedlo se najít uzel {0}.</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">PlněKvalifikovanýNázev</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Vlastnosti</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">Adresář řešení {0} neexistuje. Ujistěte se prosím, že adresář řešení zadaný v nastavení Runsettings existuje a že máte oprávnění ho číst.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nemůže být null nebo prázdný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Soubor {0} neexistuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">Objekt musí být typu {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Přerušené</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Dokončené</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Odpojené</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Chyba</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Neúspěšné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Neprůkazné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">Probíhá</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Neprovedené</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Nejde spustit</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Úspěšné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Úspěšné (běh se přerušil)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Čekající</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Časový limit</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Upozornění</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Z poskytnutého streamu nejde číst. Pokud stream nepodporuje čtení, jeho data nejde poslat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Zadaný název souboru {0} obsahuje tyto neplatné znaky: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Zadaný název souboru {0} je rezervovaný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Nepovedlo se vytvořit model COM pro relaci msdia. HResult: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Nepovedlo se načíst knihovnu msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">Neplatný identifikátor URI v nastavení {0} kolekce dat</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">Neplatný identifikátor URI {0} v nastavení {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Neplatné nastavení {0}. Očekával se alespoň jeden XmlAttribute: popisný název (friendlyName), identifikátor URI (uri) nebo kvalifikovaný název sestavení (assemblyQualifiedName).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">Řetězec filtru {0} zahrnuje nerozpoznanou řídicí sekvenci.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.de.xlf
index 8308ca4528..1f1f2cec15 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.de.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Fehler</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Keine</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Bestanden</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10} {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Testmeldungen:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Meldung: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(NULL)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Die Eigenschaft "{0}" kann nicht als Werttyp "{1}" registriert werden, weil sie bereits als "{2}" registriert wurde.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Spaltennummer</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">Executor-URI</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Quelle</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Zeilennummer</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Name</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Computername</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult-Anzeigename</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Dauer</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Endzeit</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Spaltennummer des Fehlers</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Fehlermeldung</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Fehlerstapelüberwachung</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Ergebnis</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Startzeit</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">TypeConverter für den Typ "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Dateipfad</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">Die Benachrichtigungshäufigkeit muss ein positiver Wert sein.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Ungültige Einstellungen "{0}". Unerwartetes XmlAttribute: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Ungültige Einstellungen "{0}". Unerwartetes XmlElement: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Ungültige Datensammlereinstellungen. Das erwartete Attribut '{0}' fehlt. Eine typische Datensammlereinstellung hat das folgende Format: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Übersprungen</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Das Benachrichtigungstimeout muss größer als null sein.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Ungültige Einstellung "{0}". Es wurde ein ungültiger Wert "{1}" für "{2}" angegeben.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Der Stammknoten der Laufzeiteinstellungen muss "RunSettings" heißen.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">TestCaseFilter kann nicht für einen bestimmten Testlauf angegeben werden. FilterCriteria gilt nur für Ausführungen mit Quellen.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Der Testeigenschaftentyp "{0}" der Eigenschaft "{1}" wird nicht unterstützt. Verwenden Sie einen der unterstützten Eigenschaftentypen (primitive Typen, uri, string, string[]), und versuchen Sie es erneut. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Der Knoten "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Merkmale</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">Das Projektmappenverzeichnis "{0}" ist nicht vorhanden. Stellen Sie sicher, dass das in "runsettings" angegebene Projektmappenverzeichnis vorhanden ist und über Leseberechtigungen für das Verzeichnis verfügt.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Die Datei "{0}" ist nicht vorhanden.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">Das Objekt muss vom Typ {0} sein.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Abgebrochen</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Abgeschlossen</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Getrennt</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Fehler</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Fehler</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Nicht eindeutig</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">In Bearbeitung</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Nicht ausgeführt</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Nicht ausführbar</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Bestanden</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Bestanden (Ausführung abgebrochen)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Ausstehend</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Timeout</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Warnung</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Aus dem bereitgestellten Datenstrom kann nicht gelesen werden. Daten aus einem Datenstrom können nur gesendet werden, wenn der Datenstrom Lesevorgänge unterstützt.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Der angegebene Dateiname "{0}" enthält die folgenden ungültigen Zeichen: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Der angegebene Dateiname "{0}" ist reserviert.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Fehler beim Erstellen von MSDIA-Sitzung. COM-HRESULT "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Fehler beim Laden von MSDIA.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">Ungültiger URI in Datensammlereinstellungen "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">Ungültiger URI "{0}" in den Einstellungen "{1}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Ungültige Einstellungen "{0}". Erwartet wird mindestens ein XmlAttribute: "friendlyName", "uri" oder "assemblyQualifiedName".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">Die Filterzeichenfolge "{0}" umfasst eine nicht erkannte Escapesequenz.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Fehler</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Keine</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Bestanden</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Testmeldungen:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Meldung: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(NULL)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Die Eigenschaft "{0}" kann nicht als Werttyp "{1}" registriert werden, weil sie bereits als "{2}" registriert wurde.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Spaltennummer</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">Executor-URI</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Quelle</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Zeilennummer</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Name</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Computername</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult-Anzeigename</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Dauer</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Endzeit</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Spaltennummer des Fehlers</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Fehlermeldung</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Fehlerstapelüberwachung</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Ergebnis</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Startzeit</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">TypeConverter für den Typ "{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Dateipfad</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">Die Benachrichtigungshäufigkeit muss ein positiver Wert sein.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Ungültige Einstellungen "{0}". Unerwartetes XmlAttribute: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Ungültige Einstellungen "{0}". Unerwartetes XmlElement: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Ungültige Datensammlereinstellungen. Das erwartete Attribut '{0}' fehlt. Eine typische Datensammlereinstellung hat das folgende Format: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Übersprungen</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Das Benachrichtigungstimeout muss größer als null sein.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Ungültige Einstellung "{0}". Es wurde ein ungültiger Wert "{1}" für "{2}" angegeben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Der Stammknoten der Laufzeiteinstellungen muss "RunSettings" heißen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">TestCaseFilter kann nicht für einen bestimmten Testlauf angegeben werden. FilterCriteria gilt nur für Ausführungen mit Quellen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Der Testeigenschaftentyp "{0}" der Eigenschaft "{1}" wird nicht unterstützt. Verwenden Sie einen der unterstützten Eigenschaftentypen (primitive Typen, uri, string, string[]), und versuchen Sie es erneut. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Der Knoten "{0}" wurde nicht gefunden.</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Merkmale</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">Das Projektmappenverzeichnis "{0}" ist nicht vorhanden. Stellen Sie sicher, dass das in "runsettings" angegebene Projektmappenverzeichnis vorhanden ist und über Leseberechtigungen für das Verzeichnis verfügt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Der Parameter darf nicht NULL oder leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Die Datei "{0}" ist nicht vorhanden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">Das Objekt muss vom Typ {0} sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Abgebrochen</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Abgeschlossen</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Getrennt</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Fehler</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Fehler</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Nicht eindeutig</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">In Bearbeitung</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Nicht ausgeführt</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Nicht ausführbar</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Bestanden</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Bestanden (Ausführung abgebrochen)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Ausstehend</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Timeout</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Warnung</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Aus dem bereitgestellten Datenstrom kann nicht gelesen werden. Daten aus einem Datenstrom können nur gesendet werden, wenn der Datenstrom Lesevorgänge unterstützt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Der angegebene Dateiname "{0}" enthält die folgenden ungültigen Zeichen: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Der angegebene Dateiname "{0}" ist reserviert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Fehler beim Erstellen von MSDIA-Sitzung. COM-HRESULT "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Fehler beim Laden von MSDIA.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">Ungültiger URI in Datensammlereinstellungen "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">Ungültiger URI "{0}" in den Einstellungen "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Ungültige Einstellungen "{0}". Erwartet wird mindestens ein XmlAttribute: "friendlyName", "uri" oder "assemblyQualifiedName".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">Die Filterzeichenfolge "{0}" umfasst eine nicht erkannte Escapesequenz.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.es.xlf
index 22bc2f8f0d..34209c5830 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.es.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Con error</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Ninguna</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Correctas</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Mensajes de prueba:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Mensaje: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  Seguimiento de la pila:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(nulo)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">No se puede registrar la propiedad '{0}' como tipo de valor '{1}' porque ya se registró como '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Número de columna</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">URI del ejecutor</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Origen</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Número de línea</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Nombre</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Nombre de equipo</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Nombre para mostrar del resultado de la prueba</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Duración</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Hora de finalización</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Número de columna de error</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Mensaje de error</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Seguimiento de la pila de errores</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Resultado</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Hora de inicio</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">No se encuentra TypeConverter para el tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Ruta de acceso del archivo</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">La frecuencia de notificación debe ser un valor positivo.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">Id.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Configuración no válida: '{0}'. Atributo XML no esperado: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Configuración no válida: '{0}'. Elemento XML no esperado: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">La configuración del recolector de datos no es válida. Falta el atributo esperado '{0}'. Una configuración de colector de datos típica debería ser similar a &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">No se encuentra</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Se ha omitido</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">El tiempo de espera de notificación debe ser mayor que cero.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Configuración no válida: '{0}'. Se ha especificado un valor no válido ('{1}') para '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">El nodo raíz de los parámetros de ejecución debe denominarse 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">No se puede especificar TestCaseFilter para series de pruebas específicas. FilterCriteria se usa solo para ejecuciones con orígenes.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">No se admite el tipo '{0}' de la propiedad de prueba '{1}'. Use un tipo de propiedad admitido (tipos primitivos, URI, string, string[]) y vuelva a intentarlo. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">No se encuentra el nodo '{0}'</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">Nombre completo</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Rasgos</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">El directorio de solución '{0}' no existe. Asegúrese de que el directorio de solución especificado en Runsettings existe y de que tiene permisos de lectura para el directorio.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">El archivo {0} no existe.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">El objeto debe ser de tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Anuladas</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Finalizadas</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Desconectadas</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Error</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Con error</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">No concluyentes</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">En curso</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">No ejecutadas</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">No ejecutables</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Correctas</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Correctas (ejecución anulada)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Pendientes</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Tiempo de espera agotado</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Advertencia</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">No se puede leer el flujo proporcionado. Los datos de un flujo no se pueden enviar si el flujo no admite lectura.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">El nombre de archivo proporcionado ({0}) contiene los siguientes caracteres no válidos: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">El nombre de archivo proporcionado ({0}) es un nombre reservado.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">No se pudo crear msdia Session COM HResult "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">No se pudo cargar msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">URI no válido en la configuración del recopilador de datos "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">URI "{0}" no válido en la configuración "{1}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Configuración "{0}" no válida. Se esperaba al menos uno de los siguientes valores de XmlAttribute: friendlyName, uri y assemblyQualifiedName.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">La cadena de filtro "{0}" incluye una secuencia de escape no reconocida.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Con error</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Ninguna</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Correctas</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Mensajes de prueba:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Mensaje: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  Seguimiento de la pila:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(nulo)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">No se puede registrar la propiedad '{0}' como tipo de valor '{1}' porque ya se registró como '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Número de columna</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">URI del ejecutor</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Origen</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Número de línea</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Nombre</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Nombre de equipo</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Nombre para mostrar del resultado de la prueba</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Duración</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Hora de finalización</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Número de columna de error</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Mensaje de error</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Seguimiento de la pila de errores</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Resultado</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Hora de inicio</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">No se encuentra TypeConverter para el tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Ruta de acceso del archivo</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">La frecuencia de notificación debe ser un valor positivo.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">Id.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Configuración no válida: '{0}'. Atributo XML no esperado: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Configuración no válida: '{0}'. Elemento XML no esperado: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">La configuración del recolector de datos no es válida. Falta el atributo esperado '{0}'. Una configuración de colector de datos típica debería ser similar a &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">No se encuentra</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Se ha omitido</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">El tiempo de espera de notificación debe ser mayor que cero.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Configuración no válida: '{0}'. Se ha especificado un valor no válido ('{1}') para '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">El nodo raíz de los parámetros de ejecución debe denominarse 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">No se puede especificar TestCaseFilter para series de pruebas específicas. FilterCriteria se usa solo para ejecuciones con orígenes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">No se admite el tipo '{0}' de la propiedad de prueba '{1}'. Use un tipo de propiedad admitido (tipos primitivos, URI, string, string[]) y vuelva a intentarlo. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">No se encuentra el nodo '{0}'</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">Nombre completo</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Rasgos</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">El directorio de solución '{0}' no existe. Asegúrese de que el directorio de solución especificado en Runsettings existe y de que tiene permisos de lectura para el directorio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">El parámetro no puede ser nulo ni estar vacío.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">El archivo {0} no existe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">El objeto debe ser de tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Anuladas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Finalizadas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Desconectadas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Error</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Con error</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">No concluyentes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">En curso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">No ejecutadas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">No ejecutables</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Correctas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Correctas (ejecución anulada)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Pendientes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Tiempo de espera agotado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Advertencia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">No se puede leer el flujo proporcionado. Los datos de un flujo no se pueden enviar si el flujo no admite lectura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">El nombre de archivo proporcionado ({0}) contiene los siguientes caracteres no válidos: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">El nombre de archivo proporcionado ({0}) es un nombre reservado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">No se pudo crear msdia Session COM HResult "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">No se pudo cargar msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">URI no válido en la configuración del recopilador de datos "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">URI "{0}" no válido en la configuración "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Configuración "{0}" no válida. Se esperaba al menos uno de los siguientes valores de XmlAttribute: friendlyName, uri y assemblyQualifiedName.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">La cadena de filtro "{0}" incluye una secuencia de escape no reconocida.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.fr.xlf
index b25476ad1d..084d5372c8 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.fr.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Échec</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Aucun</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Réussite</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0} :
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Messages de test :
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Message : {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace :
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Impossible d'inscrire la propriété '{0}' en tant que type valeur '{1}', car elle est déjà inscrite en tant que '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Numéro de colonne</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">URI de l'exécuteur</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Source</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Numéro de ligne</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Nom</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Nom de l'ordinateur</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Nom d'affichage de TestResult</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Durée</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Heure de fin</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Numéro de colonne d'erreur</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Message d'erreur</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Arborescence des appels de procédure d'erreur</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Résultat</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Heure de début</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">TypeConverter introuvable pour le type {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Chemin du fichier</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">La fréquence de notification doit être une valeur positive.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Paramètres non valides '{0}'. XmlAttribute inattendu : '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Paramètres non valides '{0}'. XmlElement inattendu : '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Paramètres de collecteur de données non valides. Attribut attendu '{0}' manquant. Un paramétrage de collecteur de données classique se présente comme suit : &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Ignoré</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Le délai d'expiration de notification doit être supérieur à zéro.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Paramètres non valides '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Le nœud racine des paramètres d'exécution doit être nommé 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Impossible de spécifier TestCaseFilter pour l'exécution de tests spécifiques. FilterCriteria est destiné uniquement à l'exécution avec des sources.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Le type de propriété de test '{0}' de la propriété '{1}' n'est pas pris en charge. Utilisez l'un des types de propriété pris en charge (types primitifs, uri, string, string[]), puis réessayez. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Nœud '{0}' introuvable</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Caractéristiques</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">Le répertoire de solution '{0}' n'existe pas. Vérifiez que le répertoire de solution spécifié dans runsettings existe, et que vous disposez d'autorisations d'accès en lecture pour celui-ci.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Le fichier {0} n'existe pas.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">L'objet doit être de type {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Abandonné</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Effectué</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Déconnecté</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Erreur</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Échec</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Non concluant</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">En cours</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Non exécuté</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Non exécutable</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Réussite</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Réussi (exécution abandonnée)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">En attente</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Délai d'expiration</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Avertissement</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Impossible de lire le flux fourni. Impossible d'envoyer les données d'un flux s'il ne prend pas en charge la lecture.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Le nom de fichier '{0}' fourni contient les caractères non valides suivants : '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Le nom de fichier '{0}' fourni est réservé.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Échec de la création du HResult COM de la session msdia : '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Échec du chargement de msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">URI non valide dans les paramètres de collecteur de données '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">URI '{0}' non valide dans les paramètres '{1}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Paramètres '{0}' non valides. Au moins un des attributs XmlAttribute (friendlyName, uri ou assemblyQualifiedName) était attendu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">La chaîne de filtre '{0}' inclut une séquence d'échappement non reconnue.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Échec</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Aucun</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Réussite</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0} :
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Messages de test :
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Message : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace :
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Impossible d'inscrire la propriété '{0}' en tant que type valeur '{1}', car elle est déjà inscrite en tant que '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Numéro de colonne</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">URI de l'exécuteur</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Source</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Numéro de ligne</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Nom</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Nom de l'ordinateur</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Nom d'affichage de TestResult</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Durée</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Heure de fin</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Numéro de colonne d'erreur</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Message d'erreur</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Arborescence des appels de procédure d'erreur</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Résultat</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Heure de début</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">TypeConverter introuvable pour le type {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Chemin du fichier</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">La fréquence de notification doit être une valeur positive.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Paramètres non valides '{0}'. XmlAttribute inattendu : '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Paramètres non valides '{0}'. XmlElement inattendu : '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Paramètres de collecteur de données non valides. Attribut attendu '{0}' manquant. Un paramétrage de collecteur de données classique se présente comme suit : &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Ignoré</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Le délai d'expiration de notification doit être supérieur à zéro.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Paramètres non valides '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Le nœud racine des paramètres d'exécution doit être nommé 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Impossible de spécifier TestCaseFilter pour l'exécution de tests spécifiques. FilterCriteria est destiné uniquement à l'exécution avec des sources.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Le type de propriété de test '{0}' de la propriété '{1}' n'est pas pris en charge. Utilisez l'un des types de propriété pris en charge (types primitifs, uri, string, string[]), puis réessayez. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Nœud '{0}' introuvable</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Caractéristiques</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">Le répertoire de solution '{0}' n'existe pas. Vérifiez que le répertoire de solution spécifié dans runsettings existe, et que vous disposez d'autorisations d'accès en lecture pour celui-ci.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Le paramètre ne peut pas avoir une valeur null ou être vide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Le fichier {0} n'existe pas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">L'objet doit être de type {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Abandonné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Effectué</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Déconnecté</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Erreur</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Échec</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Non concluant</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">En cours</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Non exécuté</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Non exécutable</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Réussite</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Réussi (exécution abandonnée)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">En attente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Délai d'expiration</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Avertissement</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Impossible de lire le flux fourni. Impossible d'envoyer les données d'un flux s'il ne prend pas en charge la lecture.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Le nom de fichier '{0}' fourni contient les caractères non valides suivants : '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Le nom de fichier '{0}' fourni est réservé.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Échec de la création du HResult COM de la session msdia : '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Échec du chargement de msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">URI non valide dans les paramètres de collecteur de données '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">URI '{0}' non valide dans les paramètres '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Paramètres '{0}' non valides. Au moins un des attributs XmlAttribute (friendlyName, uri ou assemblyQualifiedName) était attendu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">La chaîne de filtre '{0}' inclut une séquence d'échappement non reconnue.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.it.xlf
index 376f7da07a..2a5ef20af3 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.it.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Non superato</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Nessuno</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Superato</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Messaggi di test:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Messaggio: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  Analisi dello stack:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(Null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Non è possibile registrare la proprietà '{0}' come tipo valore '{1}' perché è stata già registrata come '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Numero di colonna</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">URI executor</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Origine</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Numero di riga</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Nome</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Nome computer</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Nome visualizzato TestResult</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Durata</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Ora di fine</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Numero di colonna errore</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Messaggio di errore</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Analisi dello stack errore</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Risultato</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Ora di inizio</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">Non è stato trovato alcun convertitore di tipo per il tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Percorso file</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">La frequenza di notifica deve essere un valore positivo.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Le impostazioni '{0}' non sono valide. Elemento XmlAttribute imprevisto: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Le impostazioni '{0}' non sono valide. Elemento XmlElement imprevisto: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Impostazioni agente di raccolta dati non valide. Attributo previsto '{0}' mancante. Un'impostazione tipica dell'agente di raccolta dati è analoga alla seguente: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">Non trovato</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Ignorato</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Il timeout di notifica deve essere un valore maggiore di zero.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Le impostazioni '{0}' non sono valide. È stato specificato un valore '{1}' non valido per '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Al nodo radice delle impostazioni esecuzione test è necessario assegnare il nome 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Non è possibile specificare TestCaseFilter per la specifica esecuzione dei test. FilterCriteria è valido solo per l'esecuzione con origini.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Il tipo '{0}' della proprietà di test '{1}' non è supportato. Usare un tipo di proprietà supportato (tipi primitivi, uri, string, string[]) e riprovare. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Il nodo '{0}' non è stato trovato</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">Nome completo</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Tratti</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">La directory '{0}' della soluzione non esiste. Assicurarsi che la directory della soluzione specificata in runsettings esista e che siano disponibili le autorizzazioni di lettura.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Il parametro non può essere vuoto o Null.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Il file {0} non esiste.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">L'oggetto deve essere di tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Interrotto</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Completato</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Disconnesso</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Errore</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Non superato</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Senza risultati</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">In corso</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Non eseguito</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Non eseguibile</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Superato</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Superato (esecuzione interrotta)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">In sospeso</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Timeout</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Avviso</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Non è possibile leggere dal flusso specificato. I dati di un flusso non possono essere inviati se il flusso non supporta l'operazione di lettura.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Il nome file '{0}' specificato contiene i seguenti caratteri non validi: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Il nome file '{0}' specificato è riservato.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Non è stato possibile creare la sessione msdia. HResult COM: '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Non è stato possibile caricare msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">URI non valido nelle impostazioni '{0}' dell'agente di raccolta dati.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">URI '{0}' non valido nelle impostazioni '{1}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Impostazioni '{0}' non valide. È previsto almeno un elemento XmlAttribute, tra friendlyName, uri e assemblyQualifiedName.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">La stringa di filtro '{0}' include una sequenza di escape non riconosciuta.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Non superato</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Nessuno</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Superato</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Messaggi di test:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Messaggio: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  Analisi dello stack:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(Null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Non è possibile registrare la proprietà '{0}' come tipo valore '{1}' perché è stata già registrata come '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Numero di colonna</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">URI executor</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Origine</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Numero di riga</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Nome</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Nome computer</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Nome visualizzato TestResult</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Durata</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Ora di fine</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Numero di colonna errore</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Messaggio di errore</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Analisi dello stack errore</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Risultato</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Ora di inizio</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">Non è stato trovato alcun convertitore di tipo per il tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Percorso file</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">La frequenza di notifica deve essere un valore positivo.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Le impostazioni '{0}' non sono valide. Elemento XmlAttribute imprevisto: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Le impostazioni '{0}' non sono valide. Elemento XmlElement imprevisto: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Impostazioni agente di raccolta dati non valide. Attributo previsto '{0}' mancante. Un'impostazione tipica dell'agente di raccolta dati è analoga alla seguente: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">Non trovato</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Ignorato</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Il timeout di notifica deve essere un valore maggiore di zero.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Le impostazioni '{0}' non sono valide. È stato specificato un valore '{1}' non valido per '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Al nodo radice delle impostazioni esecuzione test è necessario assegnare il nome 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Non è possibile specificare TestCaseFilter per la specifica esecuzione dei test. FilterCriteria è valido solo per l'esecuzione con origini.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Il tipo '{0}' della proprietà di test '{1}' non è supportato. Usare un tipo di proprietà supportato (tipi primitivi, uri, string, string[]) e riprovare. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Il nodo '{0}' non è stato trovato</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">Nome completo</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Tratti</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">La directory '{0}' della soluzione non esiste. Assicurarsi che la directory della soluzione specificata in runsettings esista e che siano disponibili le autorizzazioni di lettura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Il parametro non può essere vuoto o Null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Il file {0} non esiste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">L'oggetto deve essere di tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Interrotto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Completato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Disconnesso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Errore</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Non superato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Senza risultati</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">In corso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Non eseguito</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Non eseguibile</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Superato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Superato (esecuzione interrotta)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">In sospeso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Timeout</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Avviso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Non è possibile leggere dal flusso specificato. I dati di un flusso non possono essere inviati se il flusso non supporta l'operazione di lettura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Il nome file '{0}' specificato contiene i seguenti caratteri non validi: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Il nome file '{0}' specificato è riservato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Non è stato possibile creare la sessione msdia. HResult COM: '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Non è stato possibile caricare msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">URI non valido nelle impostazioni '{0}' dell'agente di raccolta dati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">URI '{0}' non valido nelle impostazioni '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Impostazioni '{0}' non valide. È previsto almeno un elemento XmlAttribute, tra friendlyName, uri e assemblyQualifiedName.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">La stringa di filtro '{0}' include una sequenza di escape non riconosciuta.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ja.xlf
index bd660a2009..cb02014c7b 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ja.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">なし</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">成功</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10} {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  テスト メッセージ:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  メッセージ: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  スタック トレース:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">プロパティ '{0}' は既に値の型 '{2}' として登録されていたため、'{1}' として登録できません。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">列番号</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">実行プログラムの URI</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">ソース</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">行番号</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">名前</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">コンピューター名</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult 表示名</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">期間</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">終了時刻</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">エラー列番号</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">エラー メッセージ</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">エラーのスタック トレース</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">結果</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">開始時刻</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">型 {0} の TypeConverter が見つかりません。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">ファイル パス</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">通知頻度は正の値である必要があります。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' は無効です。予期しない XmlAttribute: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' は無効です。予期しない XmlElement: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">データ コレクターの設定が無効です。予期された属性 '{0}' が見つかりません。通常のデータ コレクターの設定は &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt; のようになります。</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">スキップ</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">通知タイムアウトは 0 より大きくする必要があります。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">無効な設定です: '{0}'。'{2}' に対して無効な値 '{1}' が指定されました。</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">実行設定のルート ノードには 'RunSettings' という名前を付ける必要があります。</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">特定のテストの実行には TestCaseFilter を指定できません。FilterCriteria は、ソースでの実行だけで使用できます。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">プロパティ '{1}' のテスト プロパティの型 '{0}' はサポートされていません。サポートされているプロパティの型 (プリミティブ型、URI、string、string[]) のいずれかを使用して、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">'{0}' ノードが見つかりませんでした</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">特徴</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">ソリューション ディレクトリ '{0}' は存在しません。実行設定で指定したソリューション ディレクトリが存在することと、ディレクトリの読み取りアクセス許可があることをご確認ください。</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">パラメーターを null または空にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">ファイル {0} は存在しません。</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">オブジェクトは {0} 型でなければなりません。</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">中止</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">完了</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">切断</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">エラー</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">結果不確定</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">処理中</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">実行されませんでした</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">実行できませんでした</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">成功</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">成功 (中止された実行)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">保留中</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">タイムアウト</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">警告</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">指定されたストリームからデータを読み取ることができません。ストリームで読み取りがサポートされていない場合は、ストリームのデータを送信できません。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">指定されたファイル名 '{0}' に次の無効な文字が含まれています: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">指定されたファイル名 '{0}' は、予約済みです。</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">msdia Session COM HResult '{0}' を作成できませんでした。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">msdia を読み込めませんでした</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">データ コレクター設定 '{0}' の URI は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">設定 '{1}' の URI '{0}' は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">設定 '{0}' は無効です。friendlyName、uri、assemblyQualifiedName のうち少なくとも一つの XmlAttribute が必要です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">フィルター文字列 '{0}' には、認識されないエスケープ シーケンスが含まれています。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">なし</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">成功</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  テスト メッセージ:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  メッセージ: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  スタック トレース:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">プロパティ '{0}' は既に値の型 '{2}' として登録されていたため、'{1}' として登録できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">列番号</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">実行プログラムの URI</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">ソース</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">行番号</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">名前</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">コンピューター名</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult 表示名</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">期間</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">終了時刻</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">エラー列番号</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">エラー メッセージ</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">エラーのスタック トレース</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">結果</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">開始時刻</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">型 {0} の TypeConverter が見つかりません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">ファイル パス</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">通知頻度は正の値である必要があります。</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">設定 '{0}' は無効です。予期しない XmlAttribute: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">設定 '{0}' は無効です。予期しない XmlElement: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">データ コレクターの設定が無効です。予期された属性 '{0}' が見つかりません。通常のデータ コレクターの設定は &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt; のようになります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">スキップ</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">通知タイムアウトは 0 より大きくする必要があります。</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">無効な設定です: '{0}'。'{2}' に対して無効な値 '{1}' が指定されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">実行設定のルート ノードには 'RunSettings' という名前を付ける必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">特定のテストの実行には TestCaseFilter を指定できません。FilterCriteria は、ソースでの実行だけで使用できます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">プロパティ '{1}' のテスト プロパティの型 '{0}' はサポートされていません。サポートされているプロパティの型 (プリミティブ型、URI、string、string[]) のいずれかを使用して、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">'{0}' ノードが見つかりませんでした</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">特徴</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">ソリューション ディレクトリ '{0}' は存在しません。実行設定で指定したソリューション ディレクトリが存在することと、ディレクトリの読み取りアクセス許可があることをご確認ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">パラメーターを null または空にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">ファイル {0} は存在しません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">オブジェクトは {0} 型でなければなりません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">中止</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">完了</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">切断</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">エラー</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">結果不確定</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">処理中</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">実行されませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">実行できませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">成功</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">成功 (中止された実行)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">保留中</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">タイムアウト</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">警告</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">指定されたストリームからデータを読み取ることができません。ストリームで読み取りがサポートされていない場合は、ストリームのデータを送信できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">指定されたファイル名 '{0}' に次の無効な文字が含まれています: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">指定されたファイル名 '{0}' は、予約済みです。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">msdia Session COM HResult '{0}' を作成できませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">msdia を読み込めませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">データ コレクター設定 '{0}' の URI は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">設定 '{1}' の URI '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">設定 '{0}' は無効です。friendlyName、uri、assemblyQualifiedName のうち少なくとも一つの XmlAttribute が必要です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">フィルター文字列 '{0}' には、認識されないエスケープ シーケンスが含まれています。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ko.xlf
index bbd2c3ec0c..7852fc2ac0 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ko.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">실패</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">없음</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">통과</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  테스트 메시지:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  메시지: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' 속성은 이미 '{2}'(으)로 등록되었으므로 '{1}' 값 형식으로 등록할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">열 번호</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">Executor URI</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">소스</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">줄 번호</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">이름</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">컴퓨터 이름</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult 표시 이름</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">기간</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">종료 시간</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">오류 열 번호</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">오류 메시지</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">오류 스택 추적</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">결과</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">시작 시간</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">{0} 형식에 대해 TypeConverter를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">파일 경로</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">알림 빈도는 양수 값이어야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">'{0}' 설정이 잘못되었습니다. 예기치 않은 XmlAttribute '{1}'이(가) 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">'{0}' 설정이 잘못되었습니다. 예기치 않은 XmlElement '{1}'이(가) 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">데이터 수집기 설정이 잘못되었습니다. 필요한 '{0}' 특성이 없습니다. 일반적인 데이터 수집기 설정은 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;와 같습니다. </target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">건너뜀</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">알림 시간 제한은 0보다 커야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">실행 설정의 루트 노드 이름은 'RunSettings'여야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">특정 테스트 실행에 대해 TestCaseFilter를 지정할 수 없습니다. FilterCriteria는 소스와 실행하기 위한 용도로만 사용됩니다.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">속성 '{1}'의 테스트 속성 형식 '{0}'이(가) 지원되지 않습니다. 지원되는 속성 형식(기본 형식, URI, 문자열, string[]) 중 하나를 사용하고 다시 시도하세요. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">'{0}' 노드를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">특성</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">솔루션 디렉터리 '{0}'이(가) 없습니다. runsettings에 지정된 솔루션 디렉터리가 존재하는지와 디렉터리에 대한 읽기 권한이 있는지 확인하세요.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">{0} 파일이 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">개체는 {0} 형식이어야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">중단됨</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">완료됨</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">연결 끊김</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">오류</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">실패</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">결과 불충분</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">진행 중</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">실행되지 않음</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">실행할 수 없음</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">통과</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">통과(실행이 중단됨)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">보류 중</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">시간 초과</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">경고</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">제공된 스트림에서 읽을 수 없습니다. 스트림에서 읽기를 지원하지 않으면 스트림의 데이터를 보낼 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">제공된 파일 이름 '{0}'에 다음과 같은 잘못된 문자가 들어 있습니다. '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">제공된 파일 이름 '{0}'이(가) 예약되어 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">msdia 세션 COM HResult '{0}'을(를) 만들지 못했습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">msdia 로드 실패</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">데이터 수집기 설정 '{0}'의 URI가 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">'{1}' 설정의 '{0}' URI가 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">'{0}' 설정이 잘못되었습니다. friendlyName, URI 및 assemblyQualifiedName 중 하나 이상의 XmlAttribute가 필요합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">필터 문자열 '{0}'에 인식할 수 없는 이스케이프 시퀀스가 포함되어 있습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">실패</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">없음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">통과</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  테스트 메시지:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  메시지: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">'{0}' 속성은 이미 '{2}'(으)로 등록되었으므로 '{1}' 값 형식으로 등록할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">열 번호</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">Executor URI</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">소스</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">줄 번호</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">이름</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">컴퓨터 이름</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult 표시 이름</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">기간</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">종료 시간</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">오류 열 번호</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">오류 메시지</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">오류 스택 추적</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">결과</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">시작 시간</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">{0} 형식에 대해 TypeConverter를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">파일 경로</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">알림 빈도는 양수 값이어야 합니다.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">'{0}' 설정이 잘못되었습니다. 예기치 않은 XmlAttribute '{1}'이(가) 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">'{0}' 설정이 잘못되었습니다. 예기치 않은 XmlElement '{1}'이(가) 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">데이터 수집기 설정이 잘못되었습니다. 필요한 '{0}' 특성이 없습니다. 일반적인 데이터 수집기 설정은 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;와 같습니다. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">건너뜀</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">알림 시간 제한은 0보다 커야 합니다.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">'{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">실행 설정의 루트 노드 이름은 'RunSettings'여야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">특정 테스트 실행에 대해 TestCaseFilter를 지정할 수 없습니다. FilterCriteria는 소스와 실행하기 위한 용도로만 사용됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">속성 '{1}'의 테스트 속성 형식 '{0}'이(가) 지원되지 않습니다. 지원되는 속성 형식(기본 형식, URI, 문자열, string[]) 중 하나를 사용하고 다시 시도하세요. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">'{0}' 노드를 찾을 수 없습니다.</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">특성</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">솔루션 디렉터리 '{0}'이(가) 없습니다. runsettings에 지정된 솔루션 디렉터리가 존재하는지와 디렉터리에 대한 읽기 권한이 있는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">매개 변수는 null이거나 비워 둘 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">{0} 파일이 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">개체는 {0} 형식이어야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">중단됨</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">완료됨</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">연결 끊김</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">오류</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">실패</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">결과 불충분</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">진행 중</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">실행되지 않음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">실행할 수 없음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">통과</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">통과(실행이 중단됨)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">보류 중</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">시간 초과</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">경고</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">제공된 스트림에서 읽을 수 없습니다. 스트림에서 읽기를 지원하지 않으면 스트림의 데이터를 보낼 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">제공된 파일 이름 '{0}'에 다음과 같은 잘못된 문자가 들어 있습니다. '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">제공된 파일 이름 '{0}'이(가) 예약되어 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">msdia 세션 COM HResult '{0}'을(를) 만들지 못했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">msdia 로드 실패</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">데이터 수집기 설정 '{0}'의 URI가 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">'{1}' 설정의 '{0}' URI가 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">'{0}' 설정이 잘못되었습니다. friendlyName, URI 및 assemblyQualifiedName 중 하나 이상의 XmlAttribute가 필요합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">필터 문자열 '{0}'에 인식할 수 없는 이스케이프 시퀀스가 포함되어 있습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pl.xlf
index 7502541035..2f3329295f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pl.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Niepowodzenie</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Brak</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Powodzenie</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Komunikaty testowe:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Komunikat: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  Ślad stosu:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Nie można zarejestrować właściwości „{0}” jako typu wartości „{1}”, ponieważ została już ona zarejestrowana jako „{2}”.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Numer kolumny</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">Identyfikator URI modułu wykonywania</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Źródło</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Numer wiersza</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Nazwa</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Nazwa komputera</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Nazwa wyświetlana wyniku testu</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Czas trwania</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Czas zakończenia</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Numer kolumny błędu</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Komunikat o błędzie</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Ślad stosu błędów</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Wynik</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Czas rozpoczęcia</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć elementu TypeConverter dla typu {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Ścieżka do pliku</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">Częstotliwość powiadomień musi być wartością dodatnią.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">Identyfikator</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlAttribute: „{1}”.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlElement: „{1}”.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowe ustawienia modułów zbierających dane. Brak oczekiwanego atrybutu „{0}”.  Typowe ustawienia modułu zbierającego dane typowe mają postać &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">Nie znaleziono</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Pominięto</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Limit czasu powiadomienia musi mieć wartość większą niż zero.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Węzeł główny ustawień uruchamiania musi mieć nazwę „RunSettings”.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Nie można określić elementu TestCaseFilter dla określonego przebiegu testów. Element FilterCriteria jest przeznaczony tylko dla przebiegu ze źródłami.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Typ „{0}” właściwości testu „{1}” nie jest obsługiwany. Użyj jednego z obsługiwanych typów właściwości (typy pierwotne, identyfikator URI, ciąg, ciąg[]) i spróbuj ponownie. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Nie można odnaleźć węzła „{0}”</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">W pełni kwalifikowana nazwa</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Cechy</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">Katalog „{0}” rozwiązania nie istnieje. Upewnij się, że katalog rozwiązania podany w pliku runsettings istnieje, a Ty masz uprawnienia odczytu wobec katalogu.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Plik {0} nie istnieje.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">Obiekt musi być typu {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Przerwano</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Zakończono</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Rozłączono</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Błąd</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Niepowodzenie</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Niejednoznaczny</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">W toku</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Niewykonany</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Niemożliwy do uruchomienia</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Powodzenie</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Powodzenie (uruchomienie zostało przerwane)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Oczekiwanie</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Limit czasu</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Ostrzeżenie</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Nie można przeprowadzić odczytu z podanego strumienia. Nie można wysłać danych ze strumienia, jeśli strumień nie obsługuje odczytu.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Podana nazwa pliku „{0}” zawiera następujące nieprawidłowe znaki: „{1}”.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Podana nazwa pliku „{0}” została zarezerwowana.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Nie można utworzyć modelu COM sesji msdia, wartość HResult: „{0}”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Nie można załadować elementu msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">Nieprawidłowy identyfikator URI w ustawieniach modułu zbierającego dane „{0}”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">Nieprawidłowy identyfikator URI „{0}” w ustawieniach „{1}”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Nieprawidłowe ustawienia „{0}”. Oczekiwany jest co najmniej jeden atrybut XmlAttribute wraz z przyjazną nazwą, identyfikatorem URI oraz kwalifikowaną nazwą zestawu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">Ciąg filtra „{0}” obejmuje nierozpoznaną sekwencję ucieczki.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Niepowodzenie</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Brak</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Powodzenie</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Komunikaty testowe:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Komunikat: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  Ślad stosu:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Nie można zarejestrować właściwości „{0}” jako typu wartości „{1}”, ponieważ została już ona zarejestrowana jako „{2}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Numer kolumny</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">Identyfikator URI modułu wykonywania</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Źródło</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Numer wiersza</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Nazwa</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Nazwa komputera</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Nazwa wyświetlana wyniku testu</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Czas trwania</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Czas zakończenia</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Numer kolumny błędu</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Komunikat o błędzie</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Ślad stosu błędów</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Wynik</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Czas rozpoczęcia</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">Nie można odnaleźć elementu TypeConverter dla typu {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Ścieżka do pliku</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">Częstotliwość powiadomień musi być wartością dodatnią.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">Identyfikator</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlAttribute: „{1}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieoczekiwany atrybut XmlElement: „{1}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Nieprawidłowe ustawienia modułów zbierających dane. Brak oczekiwanego atrybutu „{0}”.  Typowe ustawienia modułu zbierającego dane typowe mają postać &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">Nie znaleziono</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Pominięto</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Limit czasu powiadomienia musi mieć wartość większą niż zero.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Nieprawidłowe ustawienia „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Węzeł główny ustawień uruchamiania musi mieć nazwę „RunSettings”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Nie można określić elementu TestCaseFilter dla określonego przebiegu testów. Element FilterCriteria jest przeznaczony tylko dla przebiegu ze źródłami.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Typ „{0}” właściwości testu „{1}” nie jest obsługiwany. Użyj jednego z obsługiwanych typów właściwości (typy pierwotne, identyfikator URI, ciąg, ciąg[]) i spróbuj ponownie. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Nie można odnaleźć węzła „{0}”</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">W pełni kwalifikowana nazwa</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Cechy</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">Katalog „{0}” rozwiązania nie istnieje. Upewnij się, że katalog rozwiązania podany w pliku runsettings istnieje, a Ty masz uprawnienia odczytu wobec katalogu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametr nie może mieć wartości null ani być pusty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Plik {0} nie istnieje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">Obiekt musi być typu {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Przerwano</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Zakończono</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Rozłączono</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Błąd</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Niepowodzenie</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Niejednoznaczny</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">W toku</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Niewykonany</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Niemożliwy do uruchomienia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Powodzenie</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Powodzenie (uruchomienie zostało przerwane)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Oczekiwanie</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Limit czasu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Ostrzeżenie</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Nie można przeprowadzić odczytu z podanego strumienia. Nie można wysłać danych ze strumienia, jeśli strumień nie obsługuje odczytu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Podana nazwa pliku „{0}” zawiera następujące nieprawidłowe znaki: „{1}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Podana nazwa pliku „{0}” została zarezerwowana.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Nie można utworzyć modelu COM sesji msdia, wartość HResult: „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Nie można załadować elementu msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">Nieprawidłowy identyfikator URI w ustawieniach modułu zbierającego dane „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">Nieprawidłowy identyfikator URI „{0}” w ustawieniach „{1}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Nieprawidłowe ustawienia „{0}”. Oczekiwany jest co najmniej jeden atrybut XmlAttribute wraz z przyjazną nazwą, identyfikatorem URI oraz kwalifikowaną nazwą zestawu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">Ciąg filtra „{0}” obejmuje nierozpoznaną sekwencję ucieczki.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pt-BR.xlf
index 08797c50a5..bcee002edf 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.pt-BR.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Com falha</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Nenhum</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Aprovado</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Mensagens de teste:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Mensagem: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(nulo)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Não é possível registrar a propriedade '{0}' com o tipo de valor '{1}' porque ela já foi registrada como '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Número da coluna</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">URI do executor</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Fonte</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Número de linha</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Nome</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Nome do computador</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Nome de exibição de TestResult</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Duração</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Hora de término</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Número da coluna com erro</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Mensagem de erro</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Rastreamento de pilha com erro</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Resultado</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Hora de início</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">Não é possível localizar o TypeConverter para o tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Caminho do arquivo</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">A frequência de notificação deve ser um valor positivo.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Configurações inválidas '{0}'. XmlAttribute inesperado: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Configurações inválidas '{0}'. XmlElement inesperado: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Configurações de coletores de dados inválidas. Atributo esperado '{0}' está ausente. O coletor de dados típico de configuração se pareceria com &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyqualifiedname="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Ignorado</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">O tempo limite de notificação deve ser maior que zero.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Configurações inválidas '{0}'. Valor inválido '{1}' especificado para '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">O nó raiz das configurações de execução deve ser nomeado como 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Não é possível especificar o TestCaseFilter para a execução de testes específicos. FilterCriteria é somente para execução com fontes.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Não há suporte para o tipo de propriedade de teste '{0}' da propriedade '{1}'. Use um dos tipos de propriedade com suporte (tipos primitivos, URI, cadeia de caracteres, string[]) e tente novamente. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Não foi possível localizar o nó '{0}'</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Características</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">O diretório da solução '{0}' não existe. Verifique se o diretório da solução especificado em runsettings existe e se tem permissões de leitura para o diretório.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">O arquivo {0} não existe.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">O objeto deve ser do tipo {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Anulado</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Concluído</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Desconectado</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Erro</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Com falha</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Inconclusivo</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">Em andamento</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Não executado</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Não executável</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Aprovado</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Aprovado (execução anulada)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Pendente</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Tempo limite</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Aviso</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Não é possível ler o fluxo fornecido. Não é possível enviar dados de um fluxo, a menos que o fluxo ofereça suporte para leitura.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">O nome de arquivo fornecido '{0}' contém os seguintes caracteres inválidos: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">O nome de arquivo fornecido '{0}' é reservado.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Falha ao Criar o HResult COM de Sessão msdia '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Falha ao carregar msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">URI inválido nas configurações do coletor de dados '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">URI inválido '{0}' nas configurações '{1}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Configurações inválidas '{0}'. Era esperado pelo menos um do XmlAttribute entre friendlyName, uri e assemblyQualifiedName.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">A cadeia de caracteres de filtro '{0}' inclui sequência de escape não reconhecida</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Com falha</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Nenhum</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Aprovado</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Mensagens de teste:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Mensagem: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(nulo)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Não é possível registrar a propriedade '{0}' com o tipo de valor '{1}' porque ela já foi registrada como '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Número da coluna</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">URI do executor</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Fonte</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Número de linha</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Nome</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Nome do computador</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Nome de exibição de TestResult</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Duração</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Hora de término</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Número da coluna com erro</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Mensagem de erro</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Rastreamento de pilha com erro</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Resultado</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Hora de início</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">Não é possível localizar o TypeConverter para o tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Caminho do arquivo</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">A frequência de notificação deve ser um valor positivo.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Configurações inválidas '{0}'. XmlAttribute inesperado: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Configurações inválidas '{0}'. XmlElement inesperado: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Configurações de coletores de dados inválidas. Atributo esperado '{0}' está ausente. O coletor de dados típico de configuração se pareceria com &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyqualifiedname="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Ignorado</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">O tempo limite de notificação deve ser maior que zero.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Configurações inválidas '{0}'. Valor inválido '{1}' especificado para '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">O nó raiz das configurações de execução deve ser nomeado como 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Não é possível especificar o TestCaseFilter para a execução de testes específicos. FilterCriteria é somente para execução com fontes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Não há suporte para o tipo de propriedade de teste '{0}' da propriedade '{1}'. Use um dos tipos de propriedade com suporte (tipos primitivos, URI, cadeia de caracteres, string[]) e tente novamente. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Não foi possível localizar o nó '{0}'</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Características</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">O diretório da solução '{0}' não existe. Verifique se o diretório da solução especificado em runsettings existe e se tem permissões de leitura para o diretório.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">O parâmetro não pode ser nulo ou estar vazio.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">O arquivo {0} não existe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">O objeto deve ser do tipo {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Anulado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Concluído</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Desconectado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Erro</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Com falha</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Inconclusivo</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">Em andamento</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Não executado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Não executável</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Aprovado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Aprovado (execução anulada)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Pendente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Tempo limite</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Aviso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Não é possível ler o fluxo fornecido. Não é possível enviar dados de um fluxo, a menos que o fluxo ofereça suporte para leitura.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">O nome de arquivo fornecido '{0}' contém os seguintes caracteres inválidos: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">O nome de arquivo fornecido '{0}' é reservado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Falha ao Criar o HResult COM de Sessão msdia '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Falha ao carregar msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">URI inválido nas configurações do coletor de dados '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">URI inválido '{0}' nas configurações '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Configurações inválidas '{0}'. Era esperado pelo menos um do XmlAttribute entre friendlyName, uri e assemblyQualifiedName.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">A cadeia de caracteres de filtro '{0}' inclui sequência de escape não reconhecida</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ru.xlf
index a4d319626c..3f40387a89 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.ru.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Не пройден</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Нет</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Пройден</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Тестовые сообщения:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  Сообщение: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  Трассировка стека:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">Невозможно зарегистрировать свойство "{0}" как тип значения "{1}", так как оно уже зарегистрировано как "{2}".</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Номер столбца</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">URI исполнителя</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Источник</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Номер строки</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Имя</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Имя компьютера</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">Отображаемое имя результатов теста</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Длительность</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Время окончания</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Номер столбца ошибки</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Сообщение об ошибке</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Трассировка стека ошибок</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Результат</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Время начала</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">Не удается найти преобразователь TypeConverter для типа {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Путь к файлу</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">Частота уведомлений должна быть положительным значением.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">Идентификатор</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">Недопустимые параметры "{0}". Неожиданный атрибут XmlAttribute: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">Недопустимые параметры "{0}". Неожиданный элемент XmlElement: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Недопустимые параметры сборщика данных. Отсутствует ожидаемый атрибут "{0}".  Типичный параметр сборщика данных обычно выглядит следующим образом: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">Не найден</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Пропущен</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Время ожидания уведомления должно быть больше нуля.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Недопустимые параметры "{0}". Недопустимое значение "{1}", указанное для "{2}".</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Корневой узел параметров запуска должен иметь имя RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Нельзя указывать фильтр TestCaseFilter для конкретного тестового запуска. Условия фильтра FilterCriteria предназначены только для выполнения с использованием источников.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">Тип свойства теста "{0}" для свойства "{1}" не поддерживается. Используйте один из поддерживаемых типов свойств (типы-примитивы, URI, string, string[]) и повторите попытку. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">Не удалось найти узел "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Признаки</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">Каталог решения "{0}" не существует. Убедитесь, что указанный в файле параметров запуска RUNSETTINGS каталог решения существует и для него имеются разрешения на чтение.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Файл {0} не существует.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">Объект должен принадлежать типу {0}.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">Прерван</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Завершен</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Отключен</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Ошибка</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Не пройден</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">С неопределенным результатом</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">Выполняется</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Не выполнен</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Не готов к запуску</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Пройден</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Пройден (выполнение прервано)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Ожидание</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Время ожидания</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Предупреждение</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Не удается прочитать данные из указанного потока. Данные из потока не могут быть отправлены, если поток поддерживает чтение.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Указанное имя файла "{0}" содержит следующие недопустимые символы: "{1}".</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Указанное имя файла "{0}" зарезервировано.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Не удалось создать HResult COM сеанса msdia "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Не удалось загрузить msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">Недопустимый URI в параметрах сборщика данных "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">Недопустимый URI "{0}" в параметрах "{1}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Недопустимые параметры "{0}". Ожидается как минимум один атрибут XmlAttribute: friendlyName, uri или assemblyQualifiedName.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">Строка фильтра "{0}" содержит нераспознанную escape-последовательность.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Не пройден</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Нет</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Пройден</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Тестовые сообщения:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  Сообщение: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  Трассировка стека:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">Невозможно зарегистрировать свойство "{0}" как тип значения "{1}", так как оно уже зарегистрировано как "{2}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Номер столбца</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">URI исполнителя</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Источник</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Номер строки</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Имя</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Имя компьютера</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">Отображаемое имя результатов теста</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Длительность</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Время окончания</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Номер столбца ошибки</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Сообщение об ошибке</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Трассировка стека ошибок</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Результат</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Время начала</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">Не удается найти преобразователь TypeConverter для типа {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Путь к файлу</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">Частота уведомлений должна быть положительным значением.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">Идентификатор</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">Недопустимые параметры "{0}". Неожиданный атрибут XmlAttribute: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">Недопустимые параметры "{0}". Неожиданный элемент XmlElement: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Недопустимые параметры сборщика данных. Отсутствует ожидаемый атрибут "{0}".  Типичный параметр сборщика данных обычно выглядит следующим образом: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">Не найден</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Пропущен</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Время ожидания уведомления должно быть больше нуля.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Недопустимые параметры "{0}". Недопустимое значение "{1}", указанное для "{2}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Корневой узел параметров запуска должен иметь имя RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Нельзя указывать фильтр TestCaseFilter для конкретного тестового запуска. Условия фильтра FilterCriteria предназначены только для выполнения с использованием источников.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">Тип свойства теста "{0}" для свойства "{1}" не поддерживается. Используйте один из поддерживаемых типов свойств (типы-примитивы, URI, string, string[]) и повторите попытку. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">Не удалось найти узел "{0}".</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Признаки</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">Каталог решения "{0}" не существует. Убедитесь, что указанный в файле параметров запуска RUNSETTINGS каталог решения существует и для него имеются разрешения на чтение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Параметр не может быть пустым или иметь значение null.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">Файл {0} не существует.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">Объект должен принадлежать типу {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">Прерван</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Завершен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Отключен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Ошибка</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Не пройден</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">С неопределенным результатом</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">Выполняется</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Не выполнен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Не готов к запуску</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Пройден</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Пройден (выполнение прервано)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Ожидание</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Время ожидания</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Предупреждение</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Не удается прочитать данные из указанного потока. Данные из потока не могут быть отправлены, если поток поддерживает чтение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Указанное имя файла "{0}" содержит следующие недопустимые символы: "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Указанное имя файла "{0}" зарезервировано.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Не удалось создать HResult COM сеанса msdia "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Не удалось загрузить msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">Недопустимый URI в параметрах сборщика данных "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">Недопустимый URI "{0}" в параметрах "{1}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Недопустимые параметры "{0}". Ожидается как минимум один атрибут XmlAttribute: friendlyName, uri или assemblyQualifiedName.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">Строка фильтра "{0}" содержит нераспознанную escape-последовательность.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.tr.xlf
index 0ebbc06b6b..85e5e4c130 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.tr.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">Başarısız</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">Yok</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">Başarılı</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  Test İletileri:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  İleti: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' özelliği daha önce '{2}' olarak kaydedildiğinden '{1}' değer türü olarak kaydedilemiyor.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">Sütun Numarası</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">Yürütücü URI’si</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">Kaynak</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">Satır Numarası</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">Ad</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">Bilgisayar Adı</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult Görünen Adı</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">Süre</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">Bitiş Saati</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">Hata Sütun Numarası</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">Hata İletisi</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">Hata Yığın İzlemesi</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">Sonuç</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">Başlangıç Saati</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">{0} türü için TypeConverter bulunamıyor.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">Dosya Yolu</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">Bildirim sıklığı pozitif bir değer olmalıdır.</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">Kimlik</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">'{0}' ayarları geçersiz. Beklenmeyen XmlAttribute: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">'{0}' ayarları geçersiz. Beklenmeyen XmlElement: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">Geçersiz veri toplayıcı ayarları. Beklenen '{0}' özniteliği eksik. Normal bir veri toplayıcı ayarı şöyle görünmelidir: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">Atlandı</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">Bildirim zaman aşımı sıfırdan büyük olmalıdır.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' ayarları geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">Çalıştırma ayarlarının kök düğümü 'RunSettings' olarak adlandırılmalıdır.</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">Belirli bir test çalıştırması için TestCaseFilter belirtilemiyor. FilterCriteria yalnızca kaynakları olan bir çalıştırma içindir.</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">'{1}' özelliğinin '{0}' test özelliği türü desteklenmiyor. Desteklenen özellik türlerinden birini (temel türler, uri, string, string[]) seçin ve yeniden deneyin. </target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">'{0}' düğümü bulunamadı</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">Nitelikler</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">'{0}' çözüm dizini yok. Lütfen runsettings içinde belirtilen çözüm dizininin mevcut olduğundan ve dizin için okuma izinlerine sahip olduğundan emin olun.</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">Parametre null veya boş olamaz.</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">{0} dosyası yok.</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">Nesne {0} türünde olmalıdır.</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">İptal edildi</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">Tamamlandı</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">Bağlantı kesildi</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">Hata</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">Başarısız</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">Sonuçsuz</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">Sürüyor</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">Yürütülmedi</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">Çalıştırılamıyor</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">Başarılı</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">Başarılı (çalıştırma iptal edildi)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">Bekliyor</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">Zaman aşımı</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">Uyarı</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">Belirtilen akıştan okunamadı. Bir akış okumayı desteklemiyorsa, akıştaki veriler gönderilemez.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">Belirtilen '{0}' dosya adı şu geçersiz karakterleri içeriyor: '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">Belirtilen '{0}' dosya adı ayrılmış.</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">Msdia Oturumu COM HResult '{0}' oluşturulamadı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">Msdia yüklenemedi</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">'{0}' veri toplayıcı ayarlarında geçersiz URI.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">'{1}' ayarlarında geçersiz URI '{0}'.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">Geçersiz ayarlar '{0}'. FriendlyName, URI veya AssemblyQualifiedName değişkenlerinden en az biri bekleniyordu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">'{0}' filtre dizesi tanınmayan atlatma sırası içeriyor.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Başarısız</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">Yok</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Başarılı</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  Test İletileri:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  İleti: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">'{0}' özelliği daha önce '{2}' olarak kaydedildiğinden '{1}' değer türü olarak kaydedilemiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">Sütun Numarası</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">Yürütücü URI’si</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">Kaynak</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">Satır Numarası</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">Ad</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">Bilgisayar Adı</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult Görünen Adı</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">Süre</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">Bitiş Saati</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">Hata Sütun Numarası</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">Hata İletisi</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">Hata Yığın İzlemesi</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">Sonuç</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">Başlangıç Saati</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">{0} türü için TypeConverter bulunamıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">Dosya Yolu</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">Bildirim sıklığı pozitif bir değer olmalıdır.</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">Kimlik</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">'{0}' ayarları geçersiz. Beklenmeyen XmlAttribute: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">'{0}' ayarları geçersiz. Beklenmeyen XmlElement: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">Geçersiz veri toplayıcı ayarları. Beklenen '{0}' özniteliği eksik. Normal bir veri toplayıcı ayarı şöyle görünmelidir: &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">Atlandı</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">Bildirim zaman aşımı sıfırdan büyük olmalıdır.</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">'{0}' ayarları geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">Çalıştırma ayarlarının kök düğümü 'RunSettings' olarak adlandırılmalıdır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">Belirli bir test çalıştırması için TestCaseFilter belirtilemiyor. FilterCriteria yalnızca kaynakları olan bir çalıştırma içindir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">'{1}' özelliğinin '{0}' test özelliği türü desteklenmiyor. Desteklenen özellik türlerinden birini (temel türler, uri, string, string[]) seçin ve yeniden deneyin. </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">'{0}' düğümü bulunamadı</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">Nitelikler</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">'{0}' çözüm dizini yok. Lütfen runsettings içinde belirtilen çözüm dizininin mevcut olduğundan ve dizin için okuma izinlerine sahip olduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">Parametre null veya boş olamaz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">{0} dosyası yok.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">Nesne {0} türünde olmalıdır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">İptal edildi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">Tamamlandı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">Bağlantı kesildi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">Hata</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">Başarısız</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">Sonuçsuz</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">Sürüyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">Yürütülmedi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">Çalıştırılamıyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">Başarılı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">Başarılı (çalıştırma iptal edildi)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">Bekliyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">Zaman aşımı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">Uyarı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">Belirtilen akıştan okunamadı. Bir akış okumayı desteklemiyorsa, akıştaki veriler gönderilemez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">Belirtilen '{0}' dosya adı şu geçersiz karakterleri içeriyor: '{1}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">Belirtilen '{0}' dosya adı ayrılmış.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">Msdia Oturumu COM HResult '{0}' oluşturulamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">Msdia yüklenemedi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">'{0}' veri toplayıcı ayarlarında geçersiz URI.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">'{1}' ayarlarında geçersiz URI '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">Geçersiz ayarlar '{0}'. FriendlyName, URI veya AssemblyQualifiedName değişkenlerinden en az biri bekleniyordu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">'{0}' filtre dizesi tanınmayan atlatma sırası içeriyor.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf
index 2aa5a54dfd..3a9bacf780 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.xlf
@@ -8,7 +8,7 @@
       </trans-unit>
       <trans-unit id="TestOutcomeNone">
         <source>None</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomePassed">
         <source>Passed</source>
@@ -16,34 +16,34 @@
       </trans-unit>
       <trans-unit id="BasicTestResultFormat">
         <source>{0,-10}  {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestResultMessageFormat">
         <source>  {0}:
 {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestResultTextMessagesFormat">
         <source>  Test Messages:
 {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestFailureMessageFormat">
         <source>  Message: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestFailureStackTraceFormat">
         <source>  StackTrace:
 {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NullString">
         <source>(null)</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
         <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCasePropertyColumnNumberLabel">
         <source>Column Number</source>
@@ -103,7 +103,7 @@
       </trans-unit>
       <trans-unit id="ConverterNotSupported">
         <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCasePropertyFilePathLabel">
         <source>File Path</source>
@@ -115,19 +115,19 @@
       </trans-unit>
       <trans-unit id="TestCasePropertyIdLabel">
         <source>Id</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidSettingsXmlAttribute">
         <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidSettingsXmlElement">
         <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingDataCollectorAttributes">
         <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestOutcomeNotFound">
         <source>NotFound</source>
@@ -143,19 +143,19 @@
       </trans-unit>
       <trans-unit id="InvalidSettingsIncorrectValue">
         <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidRunSettingsRootNode">
         <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestCaseFilterForSpecificTests">
         <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnexpectedTypeOfProperty">
         <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CouldNotFindXmlNode">
         <source>Could not find '{0}' node</source>
@@ -163,7 +163,7 @@
       </trans-unit>
       <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
         <source>FullyQualifiedName</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCasePropertyTraitsLabel">
         <source>Traits</source>
@@ -171,118 +171,118 @@
       </trans-unit>
       <trans-unit id="SolutionDirectoryNotExists">
         <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_CannotBeNullOrEmpty">
         <source>The parameter cannot be null or empty.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_FileNotExist">
         <source>File {0} does not exist.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_ObjectMustBeOfType">
         <source>Object must be of type {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeAborted">
         <source>Aborted</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeCompleted">
         <source>Completed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeDisconnected">
         <source>Disconnected</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeError">
         <source>Error</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeFailed">
         <source>Failed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeInconclusive">
         <source>Inconclusive</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeInProgress">
         <source>In Progress</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeNotExecuted">
         <source>Not Executed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeNotRunnable">
         <source>Not Runnable</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomePassed">
         <source>Passed</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomePassedButRunAborted">
         <source>Passed (run aborted)</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomePending">
         <source>Pending</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeTimeout">
         <source>Timeout</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Common_TestOutcomeWarning">
         <source>Warning</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectionSink_CanNotReadStream">
         <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
         <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
         <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToCreateDiaSession">
         <source>Failed to Create msdia Session COM HResult '{0}'.</source>
         <target state="new">Failed to Create msdia Session COM HResult '{0}'.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToLoadMsDia">
         <source>Failed to load msdia</source>
         <target state="new">Failed to load msdia</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidDataCollectorUriInSettings">
         <source>Invalid URI in data collector settings '{0}'.</source>
         <target state="new">Invalid URI in data collector settings '{0}'.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidUriInSettings">
         <source>Invalid URI '{0}' in settings '{1}'.</source>
         <target state="new">Invalid URI '{0}' in settings '{1}'.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingLoggerAttributes">
         <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
         <target state="new">Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCaseFilterEscapeException">
         <source>Filter string '{0}' includes unrecognized escape sequence.</source>
         <target state="new">Filter string '{0}' includes unrecognized escape sequence.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hans.xlf
index f34e584153..d1e11f64bb 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">失败</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">无</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">已通过</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  测试消息:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  消息: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">无法将属性“{0}”注册为值类型“{1}”，因为已将它注册为“{2}”。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">列号</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">执行器 URI</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">源</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">行号</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">名称</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">计算机名</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult 显示名称</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">持续时间</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">结束时间</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">错误列号</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">错误消息</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">错误堆栈跟踪</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">结果</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">开始时间</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">找不到类型 {0} 的 TypeConverter。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">文件路径</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">通知频率需为正值。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">ID</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">设置“{0}”无效。意外的 XmlAttribute:“{1}”。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">设置“{0}”无效。意外的 XmlElement:“{1}”。</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">数据收集器设置无效。缺少所需的特性“{0}”。典型数据收集器设置将类似于 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;。</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">已跳过</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">通知超时值必须大于零。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">设置“{0}”无效。为“{2}”指定的值“{1}”无效。</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">必须将运行设置的根节点命名为 "RunSettings"。</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">不能为特定测试运行指定 TestCaseFilter。FilterCriteria 仅用于与源一起运行。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">不支持属性“{1}”的测试属性类型“{0}”。使用一种支持的属性类型(基元类型、URI、字符串和 string[])，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">找不到“{0}”节点</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">特征</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">解决方案目录“{0}”不存在。请确保在 runsettings 中指定的解决方案目录存在并且具有对该目录的读取权限。</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">参数不能为 NULL 或为空。</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">文件 {0} 不存在。</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">对象必须为类型 {0}。</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">已中止</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">完成</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">已断开连接</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">错误</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">失败</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">无结论</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">正在进行</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">未执行</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">不可运行</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">已通过</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">已通过(运行已中止)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">待定</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">超时</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">警告</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">无法从所提供的流读取。无法发送流中的数据，除非该流支持读取。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">提供的文件名“{0}”包含以下无效字符:“{1}”。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">所提供的文件名“{0}”是保留文件名。</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">未能创建 msdia 会话 COM HResult“{0}”。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">未能加载 msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">数据收集器设置“{0}”中的 URI 无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">设置 "{1}" 中的 URI "{0}" 无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">无效设置 "{0}"。按照预期，在 friendlyName、URI 和 assemblyQualifiedName 中至少存在一个 XmlAttribute。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">筛选器字符串“{0}”包含无法识别的转义序列。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失败</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">无</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">已通过</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  测试消息:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  消息: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">无法将属性“{0}”注册为值类型“{1}”，因为已将它注册为“{2}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">列号</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">执行器 URI</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">源</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">行号</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">名称</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">计算机名</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult 显示名称</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">持续时间</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">结束时间</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">错误列号</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">错误消息</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">错误堆栈跟踪</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">结果</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">开始时间</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">找不到类型 {0} 的 TypeConverter。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">文件路径</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">通知频率需为正值。</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">ID</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">设置“{0}”无效。意外的 XmlAttribute:“{1}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">设置“{0}”无效。意外的 XmlElement:“{1}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">数据收集器设置无效。缺少所需的特性“{0}”。典型数据收集器设置将类似于 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">已跳过</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">通知超时值必须大于零。</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">设置“{0}”无效。为“{2}”指定的值“{1}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">必须将运行设置的根节点命名为 "RunSettings"。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">不能为特定测试运行指定 TestCaseFilter。FilterCriteria 仅用于与源一起运行。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">不支持属性“{1}”的测试属性类型“{0}”。使用一种支持的属性类型(基元类型、URI、字符串和 string[])，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">找不到“{0}”节点</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">特征</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">解决方案目录“{0}”不存在。请确保在 runsettings 中指定的解决方案目录存在并且具有对该目录的读取权限。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">参数不能为 NULL 或为空。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">文件 {0} 不存在。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">对象必须为类型 {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">已中止</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">完成</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">已断开连接</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">错误</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失败</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">无结论</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">正在进行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">未执行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">不可运行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">已通过</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">已通过(运行已中止)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">待定</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">超时</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">警告</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">无法从所提供的流读取。无法发送流中的数据，除非该流支持读取。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">提供的文件名“{0}”包含以下无效字符:“{1}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">所提供的文件名“{0}”是保留文件名。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">未能创建 msdia 会话 COM HResult“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">未能加载 msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">数据收集器设置“{0}”中的 URI 无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">设置 "{1}" 中的 URI "{0}" 无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">无效设置 "{0}"。按照预期，在 friendlyName、URI 和 assemblyQualifiedName 中至少存在一个 XmlAttribute。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">筛选器字符串“{0}”包含无法识别的转义序列。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hant.xlf
index 566ec5baec..780e17c7ec 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="TestOutcomeFailed">
-        <source>Failed</source>
-        <note>Test result for failed test</note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNone">
-        <source>None</source>
-        <note></note>
-        <target state="translated">無</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomePassed">
-        <source>Passed</source>
-        <note>Test result for passed test</note>
-        <target state="translated">成功</target>
-      </trans-unit>
-      <trans-unit id="BasicTestResultFormat">
-        <source>{0,-10}  {1}</source>
-        <note></note>
-        <target state="translated">{0,-10}  {1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultMessageFormat">
-        <source>  {0}:
-{1}</source>
-        <note></note>
-        <target state="translated">  {0}:
-{1}</target>
-      </trans-unit>
-      <trans-unit id="TestResultTextMessagesFormat">
-        <source>  Test Messages:
-{0}</source>
-        <note></note>
-        <target state="translated">  測試訊息:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureMessageFormat">
-        <source>  Message: {0}</source>
-        <note></note>
-        <target state="translated">  訊息: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestFailureStackTraceFormat">
-        <source>  StackTrace:
-{0}</source>
-        <note></note>
-        <target state="translated">  StackTrace:
-{0}</target>
-      </trans-unit>
-      <trans-unit id="NullString">
-        <source>(null)</source>
-        <note></note>
-        <target state="translated">(null)</target>
-      </trans-unit>
-      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
-        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
-        <note></note>
-        <target state="translated">無法將屬性 '{0}' 登錄為值類型 '{1}'，因為它已登錄為 '{2}'。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyColumnNumberLabel">
-        <source>Column Number</source>
-        <note>The label of the test property ColumnNumber for test case.</note>
-        <target state="translated">欄號</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyExecutorUriLabel">
-        <source>Executor Uri</source>
-        <note>The label of the test property ExecutorUri for test case.</note>
-        <target state="translated">執行程式 URI</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertySourceLabel">
-        <source>Source</source>
-        <note>The label of the test property Source for test case.</note>
-        <target state="translated">來源</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyLineNumberLabel">
-        <source>Line Number</source>
-        <note>The label of the test property LineNumber for test case.</note>
-        <target state="translated">行號</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyNameLabel">
-        <source>Name</source>
-        <note>The label of the test property Name for test case.</note>
-        <target state="translated">名稱</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyComputerNameLabel">
-        <source>Computer Name</source>
-        <note>The label of the test property ComputerName for test result.</note>
-        <target state="translated">電腦名稱</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDisplayNameLabel">
-        <source>TestResult Display Name</source>
-        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
-        <target state="translated">TestResult 顯示名稱</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyDurationLabel">
-        <source>Duration</source>
-        <note>The label of the test property Duration for test result.</note>
-        <target state="translated">持續時間</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyEndTimeLabel">
-        <source>End Time</source>
-        <note>The label of the test property EndTime for test result.</note>
-        <target state="translated">結束時間</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
-        <source>Error Column Number</source>
-        <note>The label of the test property ErrorColumnNumber for test result.</note>
-        <target state="translated">錯誤欄號</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorMessageLabel">
-        <source>Error Message</source>
-        <note>The label of the test property ErrorMessage for test result.</note>
-        <target state="translated">錯誤訊息</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
-        <source>Error Stack Trace</source>
-        <note>The label of the test property ErrorStackTrace for test result.</note>
-        <target state="translated">錯誤堆疊追蹤</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyOutcomeLabel">
-        <source>Outcome</source>
-        <note>The label of the test property Outcome for test result.</note>
-        <target state="translated">結果</target>
-      </trans-unit>
-      <trans-unit id="TestResultPropertyStartTimeLabel">
-        <source>Start Time</source>
-        <note>The label of the test property StartTime for test result.</note>
-        <target state="translated">開始時間</target>
-      </trans-unit>
-      <trans-unit id="ConverterNotSupported">
-        <source>Cannot find TypeConverter for type {0}.</source>
-        <note></note>
-        <target state="translated">找不到類型 {0} 的 TypeConverter。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFilePathLabel">
-        <source>File Path</source>
-        <note>The label of the test property FilePath for test case.</note>
-        <target state="translated">檔案路徑</target>
-      </trans-unit>
-      <trans-unit id="NotificationFrequencyIsNotPositive">
-        <source>Notification frequency need to be a positive value.</source>
-        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
-        <target state="translated">通知頻率必須為正值。</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyIdLabel">
-        <source>Id</source>
-        <note></note>
-        <target state="translated">識別碼</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlAttribute">
-        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' 無效。未預期的 XmlAttribute: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsXmlElement">
-        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' 無效。未預期的 XmlElement: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="MissingDataCollectorAttributes">
-        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
-        <note></note>
-        <target state="translated">無效的資料收集器設定。預期的屬性 '{0}' 遺失。一般的資料收集器設定看起來像 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;。</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeNotFound">
-        <source>NotFound</source>
-        <note>Test result for not found test</note>
-        <target state="translated">NotFound</target>
-      </trans-unit>
-      <trans-unit id="TestOutcomeSkipped">
-        <source>Skipped</source>
-        <note>Test result for skipped test </note>
-        <target state="translated">略過</target>
-      </trans-unit>
-      <trans-unit id="NotificationTimeoutIsZero">
-        <source>Notification timeout must be greater than zero.</source>
-        <note>Timeout used during test discovery and execution must be greater than zero.</note>
-        <target state="translated">通知逾時必須大於零。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。</target>
-      </trans-unit>
-      <trans-unit id="InvalidRunSettingsRootNode">
-        <source>The root node of the run settings must be named 'RunSettings'.</source>
-        <note></note>
-        <target state="translated">回合設定的根節點必須命名為 'RunSettings'。</target>
-      </trans-unit>
-      <trans-unit id="NoTestCaseFilterForSpecificTests">
-        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
-        <note></note>
-        <target state="translated">無法為特定測試回合指定 TestCaseFilter。FilterCriteria 只適用於以來源執行的狀況。</target>
-      </trans-unit>
-      <trans-unit id="UnexpectedTypeOfProperty">
-        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
-        <note></note>
-        <target state="translated">不支援屬性 '{1}' 的測試屬性類型 '{0}'。請使用其中一個支援的屬性類型 (基本類型、uri、string、string[])，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="CouldNotFindXmlNode">
-        <source>Could not find '{0}' node</source>
-        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
-        <target state="translated">找不到 '{0}' 節點</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
-        <source>FullyQualifiedName</source>
-        <note></note>
-        <target state="translated">FullyQualifiedName</target>
-      </trans-unit>
-      <trans-unit id="TestCasePropertyTraitsLabel">
-        <source>Traits</source>
-        <note>The label of the test property Traits for test case.</note>
-        <target state="translated">特性</target>
-      </trans-unit>
-      <trans-unit id="SolutionDirectoryNotExists">
-        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
-        <note></note>
-        <target state="translated">解決方案目錄 '{0}' 不存在。請確認 runsettings 中指定的解決方案目錄存在，並且具有目錄的讀取權限。</target>
-      </trans-unit>
-      <trans-unit id="Common_CannotBeNullOrEmpty">
-        <source>The parameter cannot be null or empty.</source>
-        <note></note>
-        <target state="translated">參數不可為 null 或空白。</target>
-      </trans-unit>
-      <trans-unit id="Common_FileNotExist">
-        <source>File {0} does not exist.</source>
-        <note></note>
-        <target state="translated">檔案 {0} 不存在。</target>
-      </trans-unit>
-      <trans-unit id="Common_ObjectMustBeOfType">
-        <source>Object must be of type {0}.</source>
-        <note></note>
-        <target state="translated">物件必須為 {0} 類型。</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeAborted">
-        <source>Aborted</source>
-        <note></note>
-        <target state="translated">已中止</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeCompleted">
-        <source>Completed</source>
-        <note></note>
-        <target state="translated">已完成</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeDisconnected">
-        <source>Disconnected</source>
-        <note></note>
-        <target state="translated">已中斷連線</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeError">
-        <source>Error</source>
-        <note></note>
-        <target state="translated">錯誤</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeFailed">
-        <source>Failed</source>
-        <note></note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInconclusive">
-        <source>Inconclusive</source>
-        <note></note>
-        <target state="translated">結果不明</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeInProgress">
-        <source>In Progress</source>
-        <note></note>
-        <target state="translated">進行中</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotExecuted">
-        <source>Not Executed</source>
-        <note></note>
-        <target state="translated">未執行</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeNotRunnable">
-        <source>Not Runnable</source>
-        <note></note>
-        <target state="translated">無法執行</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassed">
-        <source>Passed</source>
-        <note></note>
-        <target state="translated">成功</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePassedButRunAborted">
-        <source>Passed (run aborted)</source>
-        <note></note>
-        <target state="translated">成功 (執行已中止)</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomePending">
-        <source>Pending</source>
-        <note></note>
-        <target state="translated">暫止</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeTimeout">
-        <source>Timeout</source>
-        <note></note>
-        <target state="translated">逾時</target>
-      </trans-unit>
-      <trans-unit id="Common_TestOutcomeWarning">
-        <source>Warning</source>
-        <note></note>
-        <target state="translated">警告</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_CanNotReadStream">
-        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
-        <note></note>
-        <target state="translated">無法讀取提供的資料流。除非資料流支援讀取，否則無法傳送來自資料流的資料。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
-        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
-        <note></note>
-        <target state="translated">提供的檔案名稱 '{0}' 含有下列無效的字元: '{1}'。</target>
-      </trans-unit>
-      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
-        <source>The provided file name '{0}' is reserved.</source>
-        <note></note>
-        <target state="translated">已保留提供的檔案名稱 '{0}'。</target>
-      </trans-unit>
-      <trans-unit id="FailedToCreateDiaSession">
-        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
-        <target state="translated">無法建立 msdia 工作階段 COM HResult '{0}'。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="FailedToLoadMsDia">
-        <source>Failed to load msdia</source>
-        <target state="translated">無法載入 msdia</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDataCollectorUriInSettings">
-        <source>Invalid URI in data collector settings '{0}'.</source>
-        <target state="translated">資料收集器設定 '{0}' 中的 URI 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidUriInSettings">
-        <source>Invalid URI '{0}' in settings '{1}'.</source>
-        <target state="translated">設定 '{1}' 中的 URI '{0}' 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MissingLoggerAttributes">
-        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
-        <target state="translated">設定 '{0}' 無效。在 friendlyName、URI assemblyQualifiedName 之間，至少要有一個 XmlAttribute。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterEscapeException">
-        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
-        <target state="translated">篩選字串 '{0}' 包含無法辨識的逸出序列。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note>Test result for failed test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeNone">
+        <source>None</source>
+        <target state="translated">無</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">成功</target>
+        <note>Test result for passed test</note>
+      </trans-unit>
+      <trans-unit id="BasicTestResultFormat">
+        <source>{0,-10}  {1}</source>
+        <target state="translated">{0,-10}  {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultMessageFormat">
+        <source>  {0}:
+{1}</source>
+        <target state="translated">  {0}:
+{1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestResultTextMessagesFormat">
+        <source>  Test Messages:
+{0}</source>
+        <target state="translated">  測試訊息:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureMessageFormat">
+        <source>  Message: {0}</source>
+        <target state="translated">  訊息: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestFailureStackTraceFormat">
+        <source>  StackTrace:
+{0}</source>
+        <target state="translated">  StackTrace:
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NullString">
+        <source>(null)</source>
+        <target state="translated">(null)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Exception_RegisteredTestPropertyHasDifferentValueType">
+        <source>Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.</source>
+        <target state="translated">無法將屬性 '{0}' 登錄為值類型 '{1}'，因為它已登錄為 '{2}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyColumnNumberLabel">
+        <source>Column Number</source>
+        <target state="translated">欄號</target>
+        <note>The label of the test property ColumnNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyExecutorUriLabel">
+        <source>Executor Uri</source>
+        <target state="translated">執行程式 URI</target>
+        <note>The label of the test property ExecutorUri for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertySourceLabel">
+        <source>Source</source>
+        <target state="translated">來源</target>
+        <note>The label of the test property Source for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyLineNumberLabel">
+        <source>Line Number</source>
+        <target state="translated">行號</target>
+        <note>The label of the test property LineNumber for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyNameLabel">
+        <source>Name</source>
+        <target state="translated">名稱</target>
+        <note>The label of the test property Name for test case.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyComputerNameLabel">
+        <source>Computer Name</source>
+        <target state="translated">電腦名稱</target>
+        <note>The label of the test property ComputerName for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDisplayNameLabel">
+        <source>TestResult Display Name</source>
+        <target state="translated">TestResult 顯示名稱</target>
+        <note>The label of TestResult.DisplayName, mainly used for parameterized data tests</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyDurationLabel">
+        <source>Duration</source>
+        <target state="translated">持續時間</target>
+        <note>The label of the test property Duration for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyEndTimeLabel">
+        <source>End Time</source>
+        <target state="translated">結束時間</target>
+        <note>The label of the test property EndTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorColumnNumberLabel">
+        <source>Error Column Number</source>
+        <target state="translated">錯誤欄號</target>
+        <note>The label of the test property ErrorColumnNumber for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorMessageLabel">
+        <source>Error Message</source>
+        <target state="translated">錯誤訊息</target>
+        <note>The label of the test property ErrorMessage for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyErrorStackTraceLabel">
+        <source>Error Stack Trace</source>
+        <target state="translated">錯誤堆疊追蹤</target>
+        <note>The label of the test property ErrorStackTrace for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyOutcomeLabel">
+        <source>Outcome</source>
+        <target state="translated">結果</target>
+        <note>The label of the test property Outcome for test result.</note>
+      </trans-unit>
+      <trans-unit id="TestResultPropertyStartTimeLabel">
+        <source>Start Time</source>
+        <target state="translated">開始時間</target>
+        <note>The label of the test property StartTime for test result.</note>
+      </trans-unit>
+      <trans-unit id="ConverterNotSupported">
+        <source>Cannot find TypeConverter for type {0}.</source>
+        <target state="translated">找不到類型 {0} 的 TypeConverter。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFilePathLabel">
+        <source>File Path</source>
+        <target state="translated">檔案路徑</target>
+        <note>The label of the test property FilePath for test case.</note>
+      </trans-unit>
+      <trans-unit id="NotificationFrequencyIsNotPositive">
+        <source>Notification frequency need to be a positive value.</source>
+        <target state="translated">通知頻率必須為正值。</target>
+        <note>frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyIdLabel">
+        <source>Id</source>
+        <target state="translated">識別碼</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlAttribute">
+        <source>Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.</source>
+        <target state="translated">設定 '{0}' 無效。未預期的 XmlAttribute: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsXmlElement">
+        <source>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</source>
+        <target state="translated">設定 '{0}' 無效。未預期的 XmlElement: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingDataCollectorAttributes">
+        <source>Invalid data collector settings. Expected attribute '{0}' is missing.  A typical data collector setting would look like &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;.</source>
+        <target state="translated">無效的資料收集器設定。預期的屬性 '{0}' 遺失。一般的資料收集器設定看起來像 &lt;DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector"&gt;。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestOutcomeNotFound">
+        <source>NotFound</source>
+        <target state="translated">NotFound</target>
+        <note>Test result for not found test</note>
+      </trans-unit>
+      <trans-unit id="TestOutcomeSkipped">
+        <source>Skipped</source>
+        <target state="translated">略過</target>
+        <note>Test result for skipped test </note>
+      </trans-unit>
+      <trans-unit id="NotificationTimeoutIsZero">
+        <source>Notification timeout must be greater than zero.</source>
+        <target state="translated">通知逾時必須大於零。</target>
+        <note>Timeout used during test discovery and execution must be greater than zero.</note>
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid settings '{0}'.  Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidRunSettingsRootNode">
+        <source>The root node of the run settings must be named 'RunSettings'.</source>
+        <target state="translated">回合設定的根節點必須命名為 'RunSettings'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestCaseFilterForSpecificTests">
+        <source>Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.</source>
+        <target state="translated">無法為特定測試回合指定 TestCaseFilter。FilterCriteria 只適用於以來源執行的狀況。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTypeOfProperty">
+        <source>The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. </source>
+        <target state="translated">不支援屬性 '{1}' 的測試屬性類型 '{0}'。請使用其中一個支援的屬性類型 (基本類型、uri、string、string[])，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CouldNotFindXmlNode">
+        <source>Could not find '{0}' node</source>
+        <target state="translated">找不到 '{0}' 節點</target>
+        <note>Error message when the specified {0}  xml node can not be found in the run settings xml document</note>
+      </trans-unit>
+      <trans-unit id="TestCasePropertyFullyQualifiedNameLabel">
+        <source>FullyQualifiedName</source>
+        <target state="translated">FullyQualifiedName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCasePropertyTraitsLabel">
+        <source>Traits</source>
+        <target state="translated">特性</target>
+        <note>The label of the test property Traits for test case.</note>
+      </trans-unit>
+      <trans-unit id="SolutionDirectoryNotExists">
+        <source>Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.</source>
+        <target state="translated">解決方案目錄 '{0}' 不存在。請確認 runsettings 中指定的解決方案目錄存在，並且具有目錄的讀取權限。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_CannotBeNullOrEmpty">
+        <source>The parameter cannot be null or empty.</source>
+        <target state="translated">參數不可為 null 或空白。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_FileNotExist">
+        <source>File {0} does not exist.</source>
+        <target state="translated">檔案 {0} 不存在。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_ObjectMustBeOfType">
+        <source>Object must be of type {0}.</source>
+        <target state="translated">物件必須為 {0} 類型。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeAborted">
+        <source>Aborted</source>
+        <target state="translated">已中止</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeCompleted">
+        <source>Completed</source>
+        <target state="translated">已完成</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeDisconnected">
+        <source>Disconnected</source>
+        <target state="translated">已中斷連線</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeError">
+        <source>Error</source>
+        <target state="translated">錯誤</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeFailed">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInconclusive">
+        <source>Inconclusive</source>
+        <target state="translated">結果不明</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeInProgress">
+        <source>In Progress</source>
+        <target state="translated">進行中</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotExecuted">
+        <source>Not Executed</source>
+        <target state="translated">未執行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeNotRunnable">
+        <source>Not Runnable</source>
+        <target state="translated">無法執行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassed">
+        <source>Passed</source>
+        <target state="translated">成功</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePassedButRunAborted">
+        <source>Passed (run aborted)</source>
+        <target state="translated">成功 (執行已中止)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomePending">
+        <source>Pending</source>
+        <target state="translated">暫止</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeTimeout">
+        <source>Timeout</source>
+        <target state="translated">逾時</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Common_TestOutcomeWarning">
+        <source>Warning</source>
+        <target state="translated">警告</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_CanNotReadStream">
+        <source>Unable to read from the provided stream.  Data from a stream cannot be sent unless the stream supports reading.</source>
+        <target state="translated">無法讀取提供的資料流。除非資料流支援讀取，否則無法傳送來自資料流的資料。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_InvalidFileNameCharacters">
+        <source>The provided file name '{0}' contains the following invalid characters: '{1}'.</source>
+        <target state="translated">提供的檔案名稱 '{0}' 含有下列無效的字元: '{1}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectionSink_ReservedFilenameUsed">
+        <source>The provided file name '{0}' is reserved.</source>
+        <target state="translated">已保留提供的檔案名稱 '{0}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToCreateDiaSession">
+        <source>Failed to Create msdia Session COM HResult '{0}'.</source>
+        <target state="translated">無法建立 msdia 工作階段 COM HResult '{0}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToLoadMsDia">
+        <source>Failed to load msdia</source>
+        <target state="translated">無法載入 msdia</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDataCollectorUriInSettings">
+        <source>Invalid URI in data collector settings '{0}'.</source>
+        <target state="translated">資料收集器設定 '{0}' 中的 URI 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUriInSettings">
+        <source>Invalid URI '{0}' in settings '{1}'.</source>
+        <target state="translated">設定 '{1}' 中的 URI '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingLoggerAttributes">
+        <source>Invalid settings '{0}'. Expected atleast one of the XmlAttribute among friendlyName, uri and assemblyQualifiedName.</source>
+        <target state="translated">設定 '{0}' 無效。在 friendlyName、URI assemblyQualifiedName 之間，至少要有一個 XmlAttribute。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterEscapeException">
+        <source>Filter string '{0}' includes unrecognized escape sequence.</source>
+        <target state="translated">篩選字串 '{0}' 包含無法辨識的逸出序列。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/RunConfiguration.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/RunConfiguration.cs
index bee3c87e8d..1de0786730 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/RunConfiguration.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/RunConfiguration.cs
@@ -1,963 +1,1037 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Stores information about a test settings.
+/// </summary>
+public class RunConfiguration : TestRunSettings
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+    /// <summary>
+    /// Platform architecture which rocksteady should use for discovery/execution
+    /// </summary>
+    private Architecture _platform;
+
+    private Architecture? _defaultPlatform;
+
+    /// <summary>
+    /// Maximum number of cores that the engine can use to run tests in parallel
+    /// </summary>
+    private int _maxCpuCount;
+
+    /// <summary>
+    /// .Net framework which rocksteady should use for discovery/execution
+    /// </summary>
+    private Framework? _framework;
 
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
+    /// <summary>
+    /// Specifies the frequency of the runStats/discoveredTests event
+    /// </summary>
+    private long _batchSize;
+
+    /// <summary>
+    /// Directory in which rocksteady/adapter should keep their run specific data.
+    /// </summary>
+    private string _resultsDirectory;
 
     /// <summary>
-    /// Stores information about a test settings.
+    /// Paths at which rocksteady should look for test adapters
     /// </summary>
-    public class RunConfiguration : TestRunSettings
+    private string? _testAdaptersPaths;
+
+    /// <summary>
+    /// Indication to adapters to disable app domain.
+    /// </summary>
+    private bool _disableAppDomain;
+
+    /// <summary>
+    /// Indication to adapters to disable parallelization.
+    /// </summary>
+    private bool _disableParallelization;
+
+    /// <summary>
+    /// True if test run is triggered
+    /// </summary>
+    private bool _designMode;
+
+    /// <summary>
+    /// False indicates that the test adapter should not collect source information for discovered tests
+    /// </summary>
+    private bool _shouldCollectSourceInformation;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RunConfiguration"/> class.
+    /// </summary>
+    public RunConfiguration() : base(Constants.RunConfigurationSettingsName)
     {
-        #region Private Fields
-
-        /// <summary>
-        /// Platform architecture which rocksteady should use for discovery/execution
-        /// </summary>
-        private Architecture platform;
-
-        /// <summary>
-        /// Maximum number of cores that the engine can use to run tests in parallel
-        /// </summary>
-        private int maxCpuCount;
-
-        /// <summary>
-        /// .Net framework which rocksteady should use for discovery/execution
-        /// </summary>
-        private Framework framework;
-
-        /// <summary>
-        /// Specifies the frequency of the runStats/discoveredTests event
-        /// </summary>
-        private long batchSize;
-
-        /// <summary>
-        /// Specifies the Test Session Timeout in milliseconds
-        /// </summary>
-        private long testSessionTimeout;
-
-        /// <summary>
-        /// Directory in which rocksteady/adapter should keep their run specific data.
-        /// </summary>
-        private string resultsDirectory;
-
-        /// <summary>
-        /// Paths at which rocksteady should look for test adapters
-        /// </summary>
-        private string testAdaptersPaths;
-
-        /// <summary>
-        /// Indication to adapters to disable app domain.
-        /// </summary>
-        private bool disableAppDomain;
-
-        /// <summary>
-        /// Indication to adapters to disable parallelization.
-        /// </summary>
-        private bool disableParallelization;
-
-        /// <summary>
-        /// True if test run is triggered
-        /// </summary>
-        private bool designMode;
-
-        /// <summary>
-        /// Specify to run tests in isolation
-        /// </summary>
-        private bool inIsolation;
-
-        /// <summary>
-        /// False indicates that the test adapter should not collect source information for discovered tests
-        /// </summary>
-        private bool shouldCollectSourceInformation;
-
-        /// <summary>
-        /// Gets the targetDevice IP for UWP app deployment
-        /// </summary>
-        private string targetDevice;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RunConfiguration"/> class.
-        /// </summary>
-        public RunConfiguration() : base(Constants.RunConfigurationSettingsName)
-        {
-            // Set defaults for target platform, framework version type and results directory.
-            this.platform = Constants.DefaultPlatform;
-            this.framework = Framework.DefaultFramework;
-            this.resultsDirectory = Constants.DefaultResultsDirectory;
-            this.SolutionDirectory = null;
-            this.TreatTestAdapterErrorsAsWarnings = Constants.DefaultTreatTestAdapterErrorsAsWarnings;
-            this.BinariesRoot = null;
-            this.testAdaptersPaths = null;
-            this.maxCpuCount = Constants.DefaultCpuCount;
-            this.batchSize = Constants.DefaultBatchSize;
-            this.testSessionTimeout = 0;
-            this.disableAppDomain = false;
-            this.disableParallelization = false;
-            this.designMode = false;
-            this.inIsolation = false;
-            this.shouldCollectSourceInformation = false;
-            this.targetDevice = null;
-            this.ExecutionThreadApartmentState = Constants.DefaultExecutionThreadApartmentState;
-        }
+        // Set defaults for target platform, framework version type and results directory.
+        _platform = Constants.DefaultPlatform;
+        _framework = Framework.DefaultFramework;
+        _resultsDirectory = Constants.DefaultResultsDirectory;
+        SolutionDirectory = null;
+        TreatTestAdapterErrorsAsWarnings = Constants.DefaultTreatTestAdapterErrorsAsWarnings;
+        BinariesRoot = null;
+        _testAdaptersPaths = null;
+        _maxCpuCount = Constants.DefaultCpuCount;
+        _batchSize = Constants.DefaultBatchSize;
+        TestSessionTimeout = 0;
+        _disableAppDomain = false;
+        _disableParallelization = false;
+        _designMode = false;
+        InIsolation = false;
+        _shouldCollectSourceInformation = false;
+        TargetDevice = null;
+        ExecutionThreadApartmentState = Constants.DefaultExecutionThreadApartmentState;
+        CaptureStandardOutput = !FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_STANDARD_OUTPUT_CAPTURING);
+        ForwardStandardOutput = !FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_STANDARD_OUTPUT_FORWARDING);
+        DisableSharedTestHost = FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_SHARING_NETFRAMEWORK_TESTHOST);
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the solution directory.
+    /// </summary>
+    public string? SolutionDirectory
+    {
+        get;
+        set;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Gets or sets the results directory.
+    /// </summary>
+    public string ResultsDirectory
+    {
+        get => _resultsDirectory;
 
-        /// <summary>
-        /// Gets or sets the solution directory.
-        /// </summary>
-        public string SolutionDirectory
+        set
         {
-            get;
-            set;
+            _resultsDirectory = value;
+            ResultsDirectorySet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the results directory.
-        /// </summary>
-        public string ResultsDirectory
+    /// <summary>
+    /// Gets or sets the Parallel execution option. Should be non-negative integer.
+    /// </summary>
+    public int MaxCpuCount
+    {
+        get => _maxCpuCount;
+        set
         {
-            get
-            {
-                return this.resultsDirectory;
-            }
-
-            set
-            {
-                this.resultsDirectory = value;
-                this.ResultsDirectorySet = true;
-            }
+            _maxCpuCount = value;
+            MaxCpuCountSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the Parallel execution option. Should be non-negative integer.
-        /// </summary>
-        public int MaxCpuCount
+    /// <summary>
+    /// Gets or sets the frequency of the runStats/discoveredTests event. Should be non-negative integer.
+    /// </summary>
+    public long BatchSize
+    {
+        get => _batchSize;
+        set
         {
-            get
-            {
-                return this.maxCpuCount;
-            }
-            set
-            {
-                this.maxCpuCount = value;
-                this.MaxCpuCountSet = true;
-            }
+            _batchSize = value;
+            BatchSizeSet = true;
         }
+    }
+
+    /// <summary>
+    /// Gets or sets the testSessionTimeout. Should be non-negative integer.
+    /// </summary>
+    public long TestSessionTimeout { get; set; }
 
-        /// <summary>
-        /// Gets or sets the frequency of the runStats/discoveredTests event. Should be non-negative integer.
-        /// </summary>
-        public long BatchSize
+    /// <summary>
+    /// Gets or sets the design mode value.
+    /// </summary>
+    public bool DesignMode
+    {
+        get => _designMode;
+
+        set
         {
-            get
-            {
-                return this.batchSize;
-            }
-            set
-            {
-                this.batchSize = value;
-                this.BatchSizeSet = true;
-            }
+            _designMode = value;
+            DesignModeSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the testSessionTimeout. Should be non-negative integer.
-        /// </summary>
-        public long TestSessionTimeout
+    /// <summary>
+    /// Gets or sets a value indicating whether to run tests in isolation or not.
+    /// </summary>
+    public bool InIsolation { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether test adapter needs to collect source information for discovered tests
+    /// </summary>
+    public bool ShouldCollectSourceInformation
+    {
+        get => (CollectSourceInformationSet) ? _shouldCollectSourceInformation : _designMode;
+
+        set
         {
-            get
-            {
-                return this.testSessionTimeout;
-            }
-            set
-            {
-                this.testSessionTimeout = value;
-            }
+            _shouldCollectSourceInformation = value;
+            CollectSourceInformationSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the design mode value.
-        /// </summary>
-        public bool DesignMode
-        {
-            get
-            {
-                return this.designMode;
-            }
+    /// <summary>
+    /// Gets or sets a value indicating whether app domain creation should be disabled.
+    /// </summary>
+    public bool DisableAppDomain
+    {
+        get => _disableAppDomain;
 
-            set
-            {
-                this.designMode = value;
-                this.DesignModeSet = true;
-            }
+        set
+        {
+            _disableAppDomain = value;
+            DisableAppDomainSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to run tests in isolation or not.
-        /// </summary>
-        public bool InIsolation
-        {
-            get
-            {
-                return this.inIsolation;
-            }
+    /// <summary>
+    /// Gets or sets the test adapter loading strategy.
+    /// </summary>
+    internal TestAdapterLoadingStrategy TestAdapterLoadingStrategy { get; set; }
 
-            set
-            {
-                this.inIsolation = value;
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether parallelism needs to be disabled by the adapters.
+    /// </summary>
+    public bool DisableParallelization
+    {
+        get => _disableParallelization;
 
-        /// <summary>
-        /// Gets a value indicating whether test adapter needs to collect source information for discovered tests
-        /// </summary>
-        public bool ShouldCollectSourceInformation
+        set
         {
-            get
-            {
-                return (this.CollectSourceInformationSet) ? this.shouldCollectSourceInformation : this.designMode;
-            }
-
-            set
-            {
-                this.shouldCollectSourceInformation = value;
-                this.CollectSourceInformationSet = true;
-            }
+            _disableParallelization = value;
+            DisableParallelizationSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether app domain creation should be disabled.
-        /// </summary>
-        public bool DisableAppDomain
-        {
-            get
-            {
-                return this.disableAppDomain;
-            }
+    /// <summary>
+    /// Gets or sets the Target platform this run is targeting. Possible values are <see cref="Architecture"/> except for AnyCPU and Default.
+    /// </summary>
+    public Architecture TargetPlatform
+    {
+        get => _platform;
 
-            set
-            {
-                this.disableAppDomain = value;
-                this.DisableAppDomainSet = true;
-            }
+        set
+        {
+            _platform = value;
+            TargetPlatformSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether parallelism needs to be disabled by the adapters.
-        /// </summary>
-        public bool DisableParallelization
-        {
-            get
-            {
-                return this.disableParallelization;
-            }
+    /// <summary>
+    /// Gets or sets the default platform that will be used for AnyCPU sources, or non-dll sources. Possible values are <see cref="Architecture"/> except for AnyCPU and Default.
+    /// </summary>
+    public Architecture? DefaultPlatform
+    {
+        get => _defaultPlatform;
 
-            set
-            {
-                this.disableParallelization = value;
-                this.DisableParallelizationSet = true;
-            }
+        set
+        {
+            _defaultPlatform = value;
+            DefaultPlatformSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the Target platform this run is targeting. Possible values are <c>x86|x64|arm|anycpu</c>.
-        /// </summary>
-        public Architecture TargetPlatform
-        {
-            get
-            {
-                return this.platform;
-            }
+    /// <summary>
+    /// Gets or sets the target Framework this run is targeting.
+    /// </summary>
+    public Framework? TargetFramework
+    {
+        get => _framework;
 
-            set
-            {
-                this.platform = value;
-                this.TargetPlatformSet = true;
-            }
+        set
+        {
+            _framework = value;
+            TargetFrameworkSet = true;
         }
+    }
+    /// <summary>
+    /// Gets or sets value indicating exit code when no tests are discovered or executed
+    /// </summary>
+    public bool TreatNoTestsAsError
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets or sets the target Framework this run is targeting.
-        /// </summary>
-        public Framework TargetFramework
+    /// <summary>
+    /// Gets or sets the target Framework this run is targeting. Possible values are Framework3.5|Framework4.0|Framework4.5
+    /// </summary>
+    [Obsolete("Use TargetFramework instead")]
+    public FrameworkVersion TargetFrameworkVersion
+    {
+        get => _framework?.Name switch
         {
-            get
-            {
-                return this.framework;
-            }
-
-            set
-            {
-                this.framework = value;
-                this.TargetFrameworkSet = true;
-            }
-        }
-        /// <summary>
-        /// Gets or sets value indicating exit code when no tests are discovered or executed
-        /// </summary>
-        public bool TreatNoTestsAsError 
-        { 
-            get; 
-            set; 
+            Constants.DotNetFramework35 => FrameworkVersion.Framework35,
+            Constants.DotNetFramework40 => FrameworkVersion.Framework40,
+            Constants.DotNetFramework45 => FrameworkVersion.Framework45,
+            Constants.DotNetFrameworkCore10 => FrameworkVersion.FrameworkCore10,
+            Constants.DotNetFrameworkUap10 => FrameworkVersion.FrameworkUap10,
+            _ => Constants.DefaultFramework,
+        };
+
+        set
+        {
+            _framework = Framework.FromString(value.ToString());
+            TargetFrameworkSet = true;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the target Framework this run is targeting. Possible values are Framework3.5|Framework4.0|Framework4.5
-        /// </summary>
-        [Obsolete("Use TargetFramework instead")]
-        public FrameworkVersion TargetFrameworkVersion
-        {
-            get
-            {
-                switch (this.framework?.Name)
-                {
-                    case Constants.DotNetFramework35:
-                        return FrameworkVersion.Framework35;
-                    case Constants.DotNetFramework40:
-                        return FrameworkVersion.Framework40;
-                    case Constants.DotNetFramework45:
-                        return FrameworkVersion.Framework45;
-                    case Constants.DotNetFrameworkCore10:
-                        return FrameworkVersion.FrameworkCore10;
-                    case Constants.DotNetFrameworkUap10:
-                        return FrameworkVersion.FrameworkUap10;
-                    default:
-                        return Constants.DefaultFramework;
-                }
-            }
+    /// <summary>
+    /// Gets or sets the target device IP. For Phone this value is Device, for emulators "Mobile Emulator 10.0.15063.0 WVGA 4 inch 1GB"
+    /// </summary>
+    public string? TargetDevice { get; set; }
 
-            set
-            {
-                this.framework = Framework.FromString(value.ToString());
-                this.TargetFrameworkSet = true;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the paths used for test adapters lookup in test platform.
+    /// </summary>
+    public string? TestAdaptersPaths
+    {
+        get => _testAdaptersPaths;
 
-        /// <summary>
-        /// Gets or sets the target device IP. For Phone this value is Device, for emulators "Mobile Emulator 10.0.15063.0 WVGA 4 inch 1GB"
-        /// </summary>
-        public string TargetDevice
+        set
         {
-            get
-            {
-                return this.targetDevice;
-            }
+            _testAdaptersPaths = value;
 
-            set
+            if (_testAdaptersPaths != null)
             {
-                this.targetDevice = value;
+                TestAdaptersPathsSet = true;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the paths used for test adapters lookup in test platform.
-        /// </summary>
-        public string TestAdaptersPaths
-        {
-            get
-            {
-                return this.testAdaptersPaths;
-            }
+    /// <summary>
+    /// Gets or sets the execution thread apartment state.
+    /// </summary>
+    [CLSCompliant(false)]
+    public PlatformApartmentState ExecutionThreadApartmentState { get; set; }
 
-            set
-            {
-                this.testAdaptersPaths = value;
+    /// <summary>
+    /// Gets or sets a value indicating whether to treat the errors from test adapters as warnings.
+    /// </summary>
+    public bool TreatTestAdapterErrorsAsWarnings
+    {
+        get;
+        set;
+    }
 
-                if (this.testAdaptersPaths != null)
-                {
-                    this.TestAdaptersPathsSet = true;
-                }
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether target platform set.
+    /// </summary>
+    public bool TargetPlatformSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets or sets the execution thread apartment state.
-        /// </summary>
-        [CLSCompliant(false)]
-        public PlatformApartmentState ExecutionThreadApartmentState
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether default platform is set.
+    /// </summary>
+    public bool DefaultPlatformSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to treat the errors from test adapters as warnings.
-        /// </summary>
-        public bool TreatTestAdapterErrorsAsWarnings
-        {
-            get;
-            set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether maximum parallelization count is set.
+    /// </summary>
+    public bool MaxCpuCountSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether target platform set.
-        /// </summary>
-        public bool TargetPlatformSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating batch size is set
+    /// </summary>
+    public bool BatchSizeSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether maximum parallelization count is set.
-        /// </summary>
-        public bool MaxCpuCountSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether design mode is set.
+    /// </summary>
+    public bool DesignModeSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating batch size is set
-        /// </summary>
-        public bool BatchSizeSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether disable appdomain is set.
+    /// </summary>
+    public bool DisableAppDomainSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether design mode is set.
-        /// </summary>
-        public bool DesignModeSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether parallelism needs to be disabled by the adapters.
+    /// </summary>
+    public bool DisableParallelizationSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether disable appdomain is set.
-        /// </summary>
-        public bool DisableAppDomainSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether target framework set.
+    /// </summary>
+    public bool TargetFrameworkSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether parallelism needs to be disabled by the adapters.
-        /// </summary>
-        public bool DisableParallelizationSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether test adapters paths set.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(TestAdaptersPaths))]
+    public bool TestAdaptersPathsSet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether target framework set.
-        /// </summary>
-        public bool TargetFrameworkSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets a value indicating whether results directory is set.
+    /// </summary>
+    public bool ResultsDirectorySet
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether test adapters paths set.
-        /// </summary>
-        public bool TestAdaptersPathsSet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the binaries root.
+    /// </summary>
+    public string? BinariesRoot { get; private set; }
 
-        /// <summary>
-        /// Gets a value indicating whether results directory is set.
-        /// </summary>
-        public bool ResultsDirectorySet
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Collect source information
+    /// </summary>
+    public bool CollectSourceInformationSet { get; private set; }
+
+    /// <summary>
+    /// Default filter to use to filter tests
+    /// </summary>
+    public string? TestCaseFilter { get; private set; }
 
-        /// <summary>
-        /// Gets the binaries root.
-        /// </summary>
-        public string BinariesRoot { get; private set; }
+    /// <summary>
+    /// Path to dotnet executable to be used to invoke testhost.dll. Specifying this will skip looking up testhost.exe and will force usage of the testhost.dll.
+    /// </summary>
+    public string? DotnetHostPath { get; private set; }
 
-        /// <summary>
-        /// Collect source information
-        /// </summary>
-        public bool CollectSourceInformationSet { get; private set; } = false;
+    /// <summary>
+    /// When true, we capture standard output of child processes. When false the standard output is not captured and it will end up in command line.
+    /// This makes the output visible to the user when running in vstest.console in-process. Such setup makes the behavior the same as in 17.6.3 and earlier.
+    /// 
+    /// The recommended way is to use this with ForwardStandardOutput=true to forward output as informational messages so the output is always visible in console and VS,
+    /// unless the logging level is set to Warning or higher.
+    ///
+    /// Lastly this can be used with ForwardStandardOutput=false, to suppress the output in console, which is behavior of 17.7.0 till now.
+    /// </summary>
+    public bool CaptureStandardOutput { get; private set; }
 
-        /// <summary>
-        /// Default filter to use to filter tests
-        /// </summary>
-        public string TestCaseFilter { get; private set; }
+    /// <summary>
+    /// Forward captured standard output of testhost as Informational test messages. Default is true. Needs CaptureStandardOutput to be true.
+    /// </summary>
+    public bool ForwardStandardOutput { get; private set; }
 
-        /// Path to dotnet executable to be used to invoke testhost.dll. Specifying this will skip looking up testhost.exe and will force usage of the testhost.dll. 
-        /// </summary>
-        public string DotnetHostPath { get; private set; }
+    /// <summary>
+    /// Disables sharing of .NET Framework testhosts.
+    /// </summary>
+    public bool DisableSharedTestHost { get; private set; }
 
-        #endregion
+    /// <summary>
+    /// Skips passing VisualStudio built in adapters to the project.
+    /// </summary>
+    public bool SkipDefaultAdapters { get; private set; }
 
-#if !NETSTANDARD1_0
-        /// <inheritdoc/>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public override XmlElement ToXml()
-        {
-            XmlDocument doc = new XmlDocument();
+    /// <inheritdoc/>
+    public override XmlElement ToXml()
+    {
+        XmlDocument doc = new();
 
-            XmlElement root = doc.CreateElement(Constants.RunConfigurationSettingsName);
+        XmlElement root = doc.CreateElement(Constants.RunConfigurationSettingsName);
 
-            XmlElement resultDirectory = doc.CreateElement("ResultsDirectory");
-            resultDirectory.InnerXml = this.ResultsDirectory;
-            root.AppendChild(resultDirectory);
+        XmlElement resultDirectory = doc.CreateElement("ResultsDirectory");
+        resultDirectory.InnerXml = ResultsDirectory;
+        root.AppendChild(resultDirectory);
 
-            XmlElement targetPlatform = doc.CreateElement("TargetPlatform");
-            targetPlatform.InnerXml = this.TargetPlatform.ToString();
-            root.AppendChild(targetPlatform);
+        XmlElement targetPlatform = doc.CreateElement("TargetPlatform");
+        targetPlatform.InnerXml = TargetPlatform.ToString();
+        root.AppendChild(targetPlatform);
 
-            XmlElement maxCpuCount = doc.CreateElement("MaxCpuCount");
-            maxCpuCount.InnerXml = this.MaxCpuCount.ToString();
-            root.AppendChild(maxCpuCount);
+        if (DefaultPlatform != null)
+        {
+            XmlElement defaultPlatform = doc.CreateElement("DefaultPlatform");
+            defaultPlatform.InnerXml = DefaultPlatform.ToString()!;
+            root.AppendChild(defaultPlatform);
+        }
 
-            XmlElement batchSize = doc.CreateElement("BatchSize");
-            batchSize.InnerXml = this.BatchSize.ToString();
-            root.AppendChild(batchSize);
+        XmlElement maxCpuCount = doc.CreateElement("MaxCpuCount");
+        maxCpuCount.InnerXml = MaxCpuCount.ToString(CultureInfo.CurrentCulture);
+        root.AppendChild(maxCpuCount);
 
-            XmlElement testSessionTimeout = doc.CreateElement("TestSessionTimeout");
-            testSessionTimeout.InnerXml = this.TestSessionTimeout.ToString();
-            root.AppendChild(testSessionTimeout);
+        XmlElement batchSize = doc.CreateElement("BatchSize");
+        batchSize.InnerXml = BatchSize.ToString(CultureInfo.CurrentCulture);
+        root.AppendChild(batchSize);
 
-            XmlElement designMode = doc.CreateElement("DesignMode");
-            designMode.InnerXml = this.DesignMode.ToString();
-            root.AppendChild(designMode);
+        XmlElement testSessionTimeout = doc.CreateElement("TestSessionTimeout");
+        testSessionTimeout.InnerXml = TestSessionTimeout.ToString(CultureInfo.CurrentCulture);
+        root.AppendChild(testSessionTimeout);
 
-            XmlElement inIsolation = doc.CreateElement("InIsolation");
-            inIsolation.InnerXml = this.InIsolation.ToString();
-            root.AppendChild(inIsolation);
+        XmlElement designMode = doc.CreateElement("DesignMode");
+        designMode.InnerXml = DesignMode.ToString();
+        root.AppendChild(designMode);
 
-            XmlElement collectSourceInformation = doc.CreateElement("CollectSourceInformation");
-            collectSourceInformation.InnerXml = this.ShouldCollectSourceInformation.ToString();
-            root.AppendChild(collectSourceInformation);
+        XmlElement inIsolation = doc.CreateElement("InIsolation");
+        inIsolation.InnerXml = InIsolation.ToString();
+        root.AppendChild(inIsolation);
 
-            XmlElement disableAppDomain = doc.CreateElement("DisableAppDomain");
-            disableAppDomain.InnerXml = this.DisableAppDomain.ToString();
-            root.AppendChild(disableAppDomain);
+        XmlElement collectSourceInformation = doc.CreateElement("CollectSourceInformation");
+        collectSourceInformation.InnerXml = ShouldCollectSourceInformation.ToString();
+        root.AppendChild(collectSourceInformation);
 
-            XmlElement disableParallelization = doc.CreateElement("DisableParallelization");
-            disableParallelization.InnerXml = this.DisableParallelization.ToString();
-            root.AppendChild(disableParallelization);
+        XmlElement disableAppDomain = doc.CreateElement("DisableAppDomain");
+        disableAppDomain.InnerXml = DisableAppDomain.ToString();
+        root.AppendChild(disableAppDomain);
 
-            XmlElement targetFrameworkVersion = doc.CreateElement("TargetFrameworkVersion");
-            targetFrameworkVersion.InnerXml = this.TargetFramework.ToString();
-            root.AppendChild(targetFrameworkVersion);
+        XmlElement disableParallelization = doc.CreateElement("DisableParallelization");
+        disableParallelization.InnerXml = DisableParallelization.ToString();
+        root.AppendChild(disableParallelization);
 
-            XmlElement executionThreadApartmentState = doc.CreateElement("ExecutionThreadApartmentState");
-            executionThreadApartmentState.InnerXml = this.ExecutionThreadApartmentState.ToString();
-            root.AppendChild(executionThreadApartmentState);
+        XmlElement targetFrameworkVersion = doc.CreateElement("TargetFrameworkVersion");
+        targetFrameworkVersion.InnerXml = TargetFramework?.ToString()!;
+        root.AppendChild(targetFrameworkVersion);
 
-            if (this.TestAdaptersPaths != null)
-            {
-                XmlElement testAdaptersPaths = doc.CreateElement("TestAdaptersPaths");
-                testAdaptersPaths.InnerXml = this.TestAdaptersPaths;
-                root.AppendChild(testAdaptersPaths);
-            }
+        XmlElement executionThreadApartmentState = doc.CreateElement("ExecutionThreadApartmentState");
+        executionThreadApartmentState.InnerXml = ExecutionThreadApartmentState.ToString();
+        root.AppendChild(executionThreadApartmentState);
 
-            XmlElement treatTestAdapterErrorsAsWarnings = doc.CreateElement("TreatTestAdapterErrorsAsWarnings");
-            treatTestAdapterErrorsAsWarnings.InnerXml = this.TreatTestAdapterErrorsAsWarnings.ToString();
-            root.AppendChild(treatTestAdapterErrorsAsWarnings);
+        if (TestAdaptersPaths != null)
+        {
+            XmlElement testAdaptersPaths = doc.CreateElement("TestAdaptersPaths");
+            testAdaptersPaths.InnerXml = TestAdaptersPaths;
+            root.AppendChild(testAdaptersPaths);
+        }
 
-            if (this.BinariesRoot != null)
-            {
-                XmlElement binariesRoot = doc.CreateElement("BinariesRoot");
-                binariesRoot.InnerXml = this.BinariesRoot;
-                root.AppendChild(binariesRoot);
-            }
+        if (TestAdapterLoadingStrategy != TestAdapterLoadingStrategy.Default)
+        {
+            XmlElement adapterLoadingStrategy = doc.CreateElement("TestAdapterLoadingStrategy");
+            adapterLoadingStrategy.InnerXml = TestAdapterLoadingStrategy.ToString();
+            root.AppendChild(adapterLoadingStrategy);
+        }
 
-            if(!string.IsNullOrEmpty(this.TargetDevice))
-            {
-                XmlElement targetDevice = doc.CreateElement("TargetDevice");
-                targetDevice.InnerXml = this.TargetDevice;
-                root.AppendChild(targetDevice);
-            }
+        XmlElement treatTestAdapterErrorsAsWarnings = doc.CreateElement("TreatTestAdapterErrorsAsWarnings");
+        treatTestAdapterErrorsAsWarnings.InnerXml = TreatTestAdapterErrorsAsWarnings.ToString();
+        root.AppendChild(treatTestAdapterErrorsAsWarnings);
 
-            if (!string.IsNullOrEmpty(this.TestCaseFilter))
-            {
-                XmlElement testCaseFilter = doc.CreateElement(nameof(TestCaseFilter));
-                testCaseFilter.InnerXml = this.TestCaseFilter;
-                root.AppendChild(testCaseFilter);
-            }
-            
-            if (!string.IsNullOrEmpty(this.DotnetHostPath))
-            {
-                XmlElement dotnetHostPath = doc.CreateElement(nameof(DotnetHostPath));
-                dotnetHostPath.InnerXml = this.DotnetHostPath;
-                root.AppendChild(dotnetHostPath);
-            }
+        if (BinariesRoot != null)
+        {
+            XmlElement binariesRoot = doc.CreateElement("BinariesRoot");
+            binariesRoot.InnerXml = BinariesRoot;
+            root.AppendChild(binariesRoot);
+        }
 
-            if (this.TreatNoTestsAsError)
-            {
-                XmlElement treatAsError = doc.CreateElement(nameof(TreatNoTestsAsError));
-                treatAsError.InnerText = this.TreatNoTestsAsError.ToString();
-                root.AppendChild(treatAsError);
-            }
+        if (!StringUtils.IsNullOrEmpty(TargetDevice))
+        {
+            XmlElement targetDevice = doc.CreateElement("TargetDevice");
+            targetDevice.InnerXml = TargetDevice;
+            root.AppendChild(targetDevice);
+        }
 
-            return root;
+        if (!StringUtils.IsNullOrEmpty(TestCaseFilter))
+        {
+            XmlElement testCaseFilter = doc.CreateElement(nameof(TestCaseFilter));
+            testCaseFilter.InnerXml = TestCaseFilter;
+            root.AppendChild(testCaseFilter);
         }
-#endif
 
-        /// <summary>
-        /// Loads RunConfiguration from XmlReader.
-        /// </summary>
-        /// <param name="reader">XmlReader having run configuration node.</param>
-        /// <returns></returns>
-        public static RunConfiguration FromXml(XmlReader reader)
+        if (!StringUtils.IsNullOrEmpty(DotnetHostPath))
         {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
-            var runConfiguration = new RunConfiguration();
-            var empty = reader.IsEmptyElement;
+            XmlElement dotnetHostPath = doc.CreateElement(nameof(DotnetHostPath));
+            dotnetHostPath.InnerXml = DotnetHostPath;
+            root.AppendChild(dotnetHostPath);
+        }
 
-            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        if (TreatNoTestsAsError)
+        {
+            XmlElement treatAsError = doc.CreateElement(nameof(TreatNoTestsAsError));
+            treatAsError.InnerText = TreatNoTestsAsError.ToString();
+            root.AppendChild(treatAsError);
+        }
 
-            // Process the fields in Xml elements
-            reader.Read();
-            if (!empty)
-            {
-                while (reader.NodeType == XmlNodeType.Element)
-                {
-                    string elementName = reader.Name;
-                    switch (elementName)
-                    {
-                        case "ResultsDirectory":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        XmlElement captureStandardOutput = doc.CreateElement(nameof(CaptureStandardOutput));
+        captureStandardOutput.InnerXml = CaptureStandardOutput.ToString();
+        root.AppendChild(captureStandardOutput);
 
-                            string resultsDir = reader.ReadElementContentAsString();
-                            if (string.IsNullOrEmpty(resultsDir))
-                            {
-                                throw new SettingsException(
-                                   string.Format(
-                                       CultureInfo.CurrentCulture,
-                                       Resources.Resources.InvalidSettingsIncorrectValue,
-                                       Constants.RunConfigurationSettingsName,
-                                       resultsDir,
-                                       elementName));
-                            }
+        XmlElement forwardStandardOutput = doc.CreateElement(nameof(ForwardStandardOutput));
+        forwardStandardOutput.InnerXml = ForwardStandardOutput.ToString();
+        root.AppendChild(forwardStandardOutput);
 
-                            runConfiguration.ResultsDirectory = resultsDir;
-                            break;
+        XmlElement disableSharedTesthost = doc.CreateElement(nameof(DisableSharedTestHost));
+        disableSharedTesthost.InnerXml = DisableSharedTestHost.ToString();
+        root.AppendChild(disableSharedTesthost);
 
-                        case "CollectSourceInformation":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            string collectSourceInformationStr = reader.ReadElementContentAsString();
+        XmlElement skipDefaultAdapters = doc.CreateElement(nameof(SkipDefaultAdapters));
+        skipDefaultAdapters.InnerXml = SkipDefaultAdapters.ToString();
+        root.AppendChild(skipDefaultAdapters);
 
-                            bool bCollectSourceInformation = true;
-                            if (!bool.TryParse(collectSourceInformationStr, out bCollectSourceInformation))
-                            {
-                                throw new SettingsException(String.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, bCollectSourceInformation, elementName));
-                            }
+        return root;
+    }
 
-                            runConfiguration.ShouldCollectSourceInformation = bCollectSourceInformation;
-                            break;
+    /// <summary>
+    /// Loads RunConfiguration from XmlReader.
+    /// </summary>
+    /// <param name="reader">XmlReader having run configuration node.</param>
+    /// <returns></returns>
+    public static RunConfiguration FromXml(XmlReader reader)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+        var runConfiguration = new RunConfiguration();
+        var empty = reader.IsEmptyElement;
 
-                        case "MaxCpuCount":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
 
-                            string cpuCount = reader.ReadElementContentAsString();
-                            int count;
-                            if (!int.TryParse(cpuCount, out count) || count < 0)
+        // Process the fields in Xml elements
+        reader.Read();
+        if (!empty)
+        {
+            while (reader.NodeType == XmlNodeType.Element)
+            {
+                string elementName = reader.Name;
+                // TODO: make run settings nodes case insensitive?
+                switch (elementName)
+                {
+                    case "ResultsDirectory":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string resultsDir = reader.ReadElementContentAsString();
+                        if (StringUtils.IsNullOrEmpty(resultsDir))
+                        {
+                            throw new SettingsException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue,
+                                    Constants.RunConfigurationSettingsName,
+                                    resultsDir,
+                                    elementName));
+                        }
+
+                        runConfiguration.ResultsDirectory = resultsDir;
+                        break;
+
+                    case "CollectSourceInformation":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string collectSourceInformationStr = reader.ReadElementContentAsString();
+
+                        bool bCollectSourceInformation;
+                        if (!bool.TryParse(collectSourceInformationStr, out bCollectSourceInformation))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, bCollectSourceInformation, elementName));
+                        }
+
+                        runConfiguration.ShouldCollectSourceInformation = bCollectSourceInformation;
+                        break;
+
+                    case "MaxCpuCount":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string cpuCount = reader.ReadElementContentAsString();
+                        if (!int.TryParse(cpuCount, out int count) || count < 0)
+                        {
+                            throw new SettingsException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue,
+                                    Constants.RunConfigurationSettingsName,
+                                    cpuCount,
+                                    elementName));
+                        }
+
+                        runConfiguration.MaxCpuCount = count;
+                        break;
+
+                    case "BatchSize":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string batchSize = reader.ReadElementContentAsString();
+                        if (!long.TryParse(batchSize, out long size) || size < 0)
+                        {
+                            throw new SettingsException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue,
+                                    Constants.RunConfigurationSettingsName,
+                                    batchSize,
+                                    elementName));
+                        }
+
+                        runConfiguration.BatchSize = size;
+                        break;
+
+                    case "TestSessionTimeout":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string testSessionTimeout = reader.ReadElementContentAsString();
+                        if (!long.TryParse(testSessionTimeout, out long sessionTimeout) || sessionTimeout < 0)
+                        {
+                            throw new SettingsException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue,
+                                    Constants.RunConfigurationSettingsName,
+                                    testSessionTimeout,
+                                    elementName));
+                        }
+
+                        runConfiguration.TestSessionTimeout = sessionTimeout;
+                        break;
+
+                    case "DesignMode":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string designModeValueString = reader.ReadElementContentAsString();
+                        if (!bool.TryParse(designModeValueString, out bool designMode))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, designModeValueString, elementName));
+                        }
+                        runConfiguration.DesignMode = designMode;
+                        break;
+
+                    case "InIsolation":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string inIsolationValueString = reader.ReadElementContentAsString();
+                        if (!bool.TryParse(inIsolationValueString, out bool inIsolation))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, inIsolationValueString, elementName));
+                        }
+                        runConfiguration.InIsolation = inIsolation;
+                        break;
+
+                    case "DisableAppDomain":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string disableAppDomainValueString = reader.ReadElementContentAsString();
+                        if (!bool.TryParse(disableAppDomainValueString, out bool disableAppDomainCheck))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, disableAppDomainValueString, elementName));
+                        }
+                        runConfiguration.DisableAppDomain = disableAppDomainCheck;
+                        break;
+
+                    case "DisableParallelization":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+
+                        string disableParallelizationValueString = reader.ReadElementContentAsString();
+                        if (!bool.TryParse(disableParallelizationValueString, out bool disableParallelizationCheck))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, disableParallelizationValueString, elementName));
+                        }
+                        runConfiguration.DisableParallelization = disableParallelizationCheck;
+                        break;
+
+                    case "TargetPlatform":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        Architecture archType;
+                        string value = reader.ReadElementContentAsString();
+                        try
+                        {
+                            archType = (Architecture)Enum.Parse(typeof(Architecture), value, true);
+                            // Ensure that the parsed value is actually in the enum, and that Default or AnyCpu are not provided.
+                            if (!Enum.IsDefined(typeof(Architecture), archType) || Architecture.Default == archType || Architecture.AnyCPU == archType)
                             {
                                 throw new SettingsException(
                                     string.Format(
                                         CultureInfo.CurrentCulture,
                                         Resources.Resources.InvalidSettingsIncorrectValue,
                                         Constants.RunConfigurationSettingsName,
-                                        cpuCount,
+                                        value,
                                         elementName));
                             }
-
-                            runConfiguration.MaxCpuCount = count;
-                            break;
-
-                        case "BatchSize":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string batchSize = reader.ReadElementContentAsString();
-                            long size;
-                            if (!long.TryParse(batchSize, out size) || size < 0)
+                        }
+                        catch (ArgumentException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
+                        }
+
+                        runConfiguration.TargetPlatform = archType;
+                        break;
+
+                    case nameof(DefaultPlatform):
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        Architecture defaultArchType;
+                        string defaultPlatformValue = reader.ReadElementContentAsString();
+                        try
+                        {
+                            defaultArchType = (Architecture)Enum.Parse(typeof(Architecture), defaultPlatformValue, true);
+                            // Ensure that the parsed value is actually in the enum, and that Default or AnyCpu are not provided.
+                            if (!Enum.IsDefined(typeof(Architecture), defaultArchType) || Architecture.Default == defaultArchType || Architecture.AnyCPU == defaultArchType)
                             {
                                 throw new SettingsException(
                                     string.Format(
                                         CultureInfo.CurrentCulture,
                                         Resources.Resources.InvalidSettingsIncorrectValue,
                                         Constants.RunConfigurationSettingsName,
-                                        batchSize,
+                                        defaultPlatformValue,
                                         elementName));
                             }
-
-                            runConfiguration.BatchSize = size;
-                            break;
-
-                        case "TestSessionTimeout":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string testSessionTimeout = reader.ReadElementContentAsString();
-                            long sessionTimeout;
-                            if (!long.TryParse(testSessionTimeout, out sessionTimeout) || sessionTimeout < 0)
+                        }
+                        catch (ArgumentException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, defaultPlatformValue, elementName));
+                        }
+
+                        runConfiguration.DefaultPlatform = defaultArchType;
+                        break;
+
+                    case "TargetFrameworkVersion":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        Framework? frameworkType;
+                        value = reader.ReadElementContentAsString();
+                        try
+                        {
+                            frameworkType = Framework.FromString(value);
+
+                            if (frameworkType == null)
                             {
                                 throw new SettingsException(
                                     string.Format(
                                         CultureInfo.CurrentCulture,
                                         Resources.Resources.InvalidSettingsIncorrectValue,
                                         Constants.RunConfigurationSettingsName,
-                                        testSessionTimeout,
+                                        value,
                                         elementName));
                             }
-
-                            runConfiguration.TestSessionTimeout = sessionTimeout;
-                            break;
-
-                        case "DesignMode":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string designModeValueString = reader.ReadElementContentAsString();
-                            bool designMode;
-                            if (!bool.TryParse(designModeValueString, out designMode))
-                            {
-                                throw new SettingsException(String.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, designModeValueString, elementName));
-                            }
-                            runConfiguration.DesignMode = designMode;
-                            break;
-
-                        case "InIsolation":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string inIsolationValueString = reader.ReadElementContentAsString();
-                            bool inIsolation;
-                            if (!bool.TryParse(inIsolationValueString, out inIsolation))
-                            {
-                                throw new SettingsException(String.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, inIsolationValueString, elementName));
-                            }
-                            runConfiguration.InIsolation = inIsolation;
-                            break;
-
-                        case "DisableAppDomain":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string disableAppDomainValueString = reader.ReadElementContentAsString();
-                            bool disableAppDomainCheck;
-                            if (!bool.TryParse(disableAppDomainValueString, out disableAppDomainCheck))
-                            {
-                                throw new SettingsException(String.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, disableAppDomainValueString, elementName));
-                            }
-                            runConfiguration.DisableAppDomain = disableAppDomainCheck;
-                            break;
-
-                        case "DisableParallelization":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-
-                            string disableParallelizationValueString = reader.ReadElementContentAsString();
-                            bool disableParallelizationCheck;
-                            if (!bool.TryParse(disableParallelizationValueString, out disableParallelizationCheck))
-                            {
-                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, disableParallelizationValueString, elementName));
-                            }
-                            runConfiguration.DisableParallelization = disableParallelizationCheck;
-                            break;
-
-                        case "TargetPlatform":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            Architecture archType;
-                            string value = reader.ReadElementContentAsString();
-                            try
-                            {
-                                archType = (Architecture)Enum.Parse(typeof(Architecture), value, true);
-                                // Ensure that the parsed value is actually in the enum, and that Default or AnyCpu are not provided.
-                                if (!Enum.IsDefined(typeof(Architecture), archType) || Architecture.Default == archType || Architecture.AnyCPU == archType)
-                                {
-                                    throw new SettingsException(
-                                        string.Format(
-                                            CultureInfo.CurrentCulture,
-                                            Resources.Resources.InvalidSettingsIncorrectValue,
-                                            Constants.RunConfigurationSettingsName,
-                                            value,
-                                            elementName));
-                                }
-                            }
-                            catch (ArgumentException)
-                            {
-                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
-                            }
-
-                            runConfiguration.TargetPlatform = archType;
-                            break;
-
-                        case "TargetFrameworkVersion":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            Framework frameworkType;
-                            value = reader.ReadElementContentAsString();
-                            try
-                            {
-                                frameworkType = Framework.FromString(value);
-
-                                if (frameworkType == null)
-                                {
-                                    throw new SettingsException(
-                                        string.Format(
-                                            CultureInfo.CurrentCulture,
-                                            Resources.Resources.InvalidSettingsIncorrectValue,
-                                            Constants.RunConfigurationSettingsName,
-                                            value,
-                                            elementName));
-                                }
-                            }
-                            catch (ArgumentException)
-                            {
-                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                        }
+                        catch (ArgumentException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
+                        }
+
+                        runConfiguration.TargetFramework = frameworkType;
+                        break;
+
+                    case "TestAdaptersPaths":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        runConfiguration.TestAdaptersPaths = reader.ReadElementContentAsString();
+                        break;
+
+                    case "TestAdapterLoadingStrategy":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        value = reader.ReadElementContentAsString();
+                        runConfiguration.TestAdapterLoadingStrategy = Enum.TryParse<TestAdapterLoadingStrategy>(value, out var loadingStrategy)
+                            ? loadingStrategy
+                            : throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
                                     Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
-                            }
-
-                            runConfiguration.TargetFramework = frameworkType;
-                            break;
 
-                        case "TestAdaptersPaths":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            runConfiguration.TestAdaptersPaths = reader.ReadElementContentAsString();
-                            break;
+                        break;
+
+                    case "TreatTestAdapterErrorsAsWarnings":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        bool treatTestAdapterErrorsAsWarnings;
+
+                        value = reader.ReadElementContentAsString();
+
+                        try
+                        {
+                            treatTestAdapterErrorsAsWarnings = bool.Parse(value);
+                        }
+                        catch (ArgumentException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
+                        }
+                        catch (FormatException)
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
+                        }
+
+                        runConfiguration.TreatTestAdapterErrorsAsWarnings = treatTestAdapterErrorsAsWarnings;
+                        break;
+
+                    case "SolutionDirectory":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string? solutionDirectory = reader.ReadElementContentAsString();
+                        solutionDirectory = Environment.ExpandEnvironmentVariables(solutionDirectory);
+
+                        if (solutionDirectory.IsNullOrEmpty()
+                            || !System.IO.Directory.Exists(solutionDirectory))
+                        {
+                            EqtTrace.Error(string.Format(CultureInfo.CurrentCulture, Resources.Resources.SolutionDirectoryNotExists, solutionDirectory));
+                            solutionDirectory = null;
+                        }
+
+                        runConfiguration.SolutionDirectory = solutionDirectory;
+
+                        break;
+
+                    case "BinariesRoot":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        runConfiguration.BinariesRoot = reader.ReadElementContentAsString();
+                        break;
+
+                    case "ExecutionThreadApartmentState":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string executionThreadApartmentState = reader.ReadElementContentAsString();
+                        if (!Enum.TryParse(executionThreadApartmentState, out PlatformApartmentState apartmentState))
+                        {
+                            throw new SettingsException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue,
+                                    Constants.RunConfigurationSettingsName,
+                                    executionThreadApartmentState,
+                                    elementName));
+                        }
+
+                        runConfiguration.ExecutionThreadApartmentState = apartmentState;
+                        break;
+
+                    case "TargetDevice":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        runConfiguration.TargetDevice = reader.ReadElementContentAsString();
+                        break;
+
+                    case "TestCaseFilter":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        runConfiguration.TestCaseFilter = reader.ReadElementContentAsString();
+                        break;
+
+                    case "DotNetHostPath":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string? dotnetHostPath = reader.ReadElementContentAsString();
 
-                        case "TreatTestAdapterErrorsAsWarnings":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            bool treatTestAdapterErrorsAsWarnings = false;
-
-                            value = reader.ReadElementContentAsString();
-
-                            try
-                            {
-                                treatTestAdapterErrorsAsWarnings = bool.Parse(value);
-                            }
-                            catch (ArgumentException)
-                            {
-                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
-                            }
-                            catch (FormatException)
-                            {
-                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, value, elementName));
-                            }
-
-                            runConfiguration.TreatTestAdapterErrorsAsWarnings = treatTestAdapterErrorsAsWarnings;
-                            break;
-
-                        case "SolutionDirectory":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            string solutionDirectory = reader.ReadElementContentAsString();
-
-#if !NETSTANDARD1_0
-                            solutionDirectory = Environment.ExpandEnvironmentVariables(solutionDirectory);
-#endif
-
-                            if (string.IsNullOrEmpty(solutionDirectory)
 #if !NETSTANDARD1_0
-                                || !Directory.Exists(solutionDirectory)
+                        dotnetHostPath = Environment.ExpandEnvironmentVariables(dotnetHostPath);
 #endif
-                            )
-                            {
-                                if (EqtTrace.IsErrorEnabled)
-                                {
-                                    EqtTrace.Error(string.Format(CultureInfo.CurrentCulture, Resources.Resources.SolutionDirectoryNotExists, solutionDirectory));
-                                }
-
-                                solutionDirectory = null;
-                            }
-
-                            runConfiguration.SolutionDirectory = solutionDirectory;
-
-                            break;
 
-                        case "BinariesRoot":
+                        runConfiguration.DotnetHostPath = dotnetHostPath;
+                        break;
+                    case "TreatNoTestsAsError":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string treatNoTestsAsErrorValueString = reader.ReadElementContentAsString();
+                        if (!bool.TryParse(treatNoTestsAsErrorValueString, out bool treatNoTestsAsError))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, treatNoTestsAsErrorValueString, elementName));
+                        }
+                        runConfiguration.TreatNoTestsAsError = treatNoTestsAsError;
+                        break;
+                    // Configuration used but not exposed to the public to avoid the Warning inside the log
+                    case "ForceOneTestAtTimePerTestHost":
+                    case "EnvironmentVariables":
+                    case "TargetFrameworkTestHostDemultiplexer":
+                        reader.Skip();
+                        break;
+
+                    case "CaptureStandardOutput":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string captureStandardOutputStr = reader.ReadElementContentAsString();
+
+                        bool bCaptureStandardOutput;
+                        if (!bool.TryParse(captureStandardOutputStr, out bCaptureStandardOutput))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, bCaptureStandardOutput, elementName));
+                        }
+
+                        runConfiguration.CaptureStandardOutput = bCaptureStandardOutput;
+                        break;
+
+                    case "ForwardStandardOutput":
+                        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+                        string forwardStandardOutputStr = reader.ReadElementContentAsString();
+
+                        bool bForwardStandardOutput;
+                        if (!bool.TryParse(forwardStandardOutputStr, out bForwardStandardOutput))
+                        {
+                            throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, bForwardStandardOutput, elementName));
+                        }
+
+                        runConfiguration.ForwardStandardOutput = bForwardStandardOutput;
+                        break;
+
+                    case nameof(DisableSharedTestHost):
+                        {
                             XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            runConfiguration.BinariesRoot = reader.ReadElementContentAsString();
-                            break;
+                            string element = reader.ReadElementContentAsString();
 
-                        case "ExecutionThreadApartmentState":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            string executionThreadApartmentState = reader.ReadElementContentAsString();
-                            PlatformApartmentState apartmentState;
-                            if (!Enum.TryParse(executionThreadApartmentState, out apartmentState))
+                            bool boolValue;
+                            if (!bool.TryParse(element, out boolValue))
                             {
-                                throw new SettingsException(
-                                    string.Format(
-                                        CultureInfo.CurrentCulture,
-                                        Resources.Resources.InvalidSettingsIncorrectValue,
-                                        Constants.RunConfigurationSettingsName,
-                                        executionThreadApartmentState,
-                                        elementName));
+                                throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
+                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, boolValue, elementName));
                             }
 
-                            runConfiguration.ExecutionThreadApartmentState = apartmentState;
-                            break;
-
-                        case "TargetDevice":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            runConfiguration.TargetDevice = reader.ReadElementContentAsString();
+                            runConfiguration.DisableSharedTestHost = boolValue;
                             break;
+                        }
 
-                        case "TestCaseFilter":
+                    case nameof(SkipDefaultAdapters):
+                        {
                             XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            runConfiguration.TestCaseFilter = reader.ReadElementContentAsString();
-                            break;
+                            string element = reader.ReadElementContentAsString();
 
-                        case "DotNetHostPath":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            runConfiguration.DotnetHostPath = reader.ReadElementContentAsString();
-                            break;
-                        case "TreatNoTestsAsError":
-                            XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                            string treatNoTestsAsErrorValueString = reader.ReadElementContentAsString();
-                            bool treatNoTestsAsError;
-                            if (!bool.TryParse(treatNoTestsAsErrorValueString, out treatNoTestsAsError))
+                            bool boolValue;
+                            if (!bool.TryParse(element, out boolValue))
                             {
                                 throw new SettingsException(string.Format(CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, treatNoTestsAsErrorValueString, elementName));
+                                    Resources.Resources.InvalidSettingsIncorrectValue, Constants.RunConfigurationSettingsName, boolValue, elementName));
                             }
-                            runConfiguration.TreatNoTestsAsError = treatNoTestsAsError;
-                            break;
 
-                        default:
-                            // Ignore a runsettings element that we don't understand. It could occur in the case
-                            // the test runner is of a newer version, but the test host is of an earlier version.
-                            if (EqtTrace.IsErrorEnabled)
-                            {
-                                EqtTrace.Warning(
-                                    string.Format(
-                                        CultureInfo.CurrentCulture,
-                                        Resources.Resources.InvalidSettingsXmlElement,
-                                        Constants.RunConfigurationSettingsName,
-                                        reader.Name));
-                            }
-                            reader.Skip();
+                            runConfiguration.SkipDefaultAdapters = boolValue;
                             break;
-                    }
-                }
+                        }
 
-                reader.ReadEndElement();
+                    default:
+                        // Ignore a runsettings element that we don't understand. It could occur in the case
+                        // the test runner is of a newer version, but the test host is of an earlier version.
+                        EqtTrace.Warning(
+                            string.Format(
+                                CultureInfo.CurrentCulture,
+                                Resources.Resources.InvalidSettingsXmlElement,
+                                Constants.RunConfigurationSettingsName,
+                                reader.Name));
+                        reader.Skip();
+                        break;
+                }
             }
 
-            return runConfiguration;
+            reader.ReadEndElement();
         }
+
+        return runConfiguration;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs
index 4bc746f0c2..31dc838ff9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs
@@ -1,61 +1,56 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
 #if NETFRAMEWORK
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 #endif
 
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    /// <summary>
-    /// Exception thrown by Run Settings when an error with a settings provider
-    /// is encountered.
-    /// </summary>
+/// <summary>
+/// Exception thrown by Run Settings when an error with a settings provider
+/// is encountered.
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    public class SettingsException : Exception
+public class SettingsException : Exception
+{
+    /// <summary>
+    /// Default Constructor
+    /// </summary>
+    public SettingsException() : base()
     {
-        #region Constructors
-
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        public SettingsException() : base()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public SettingsException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public SettingsException(string? message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public SettingsException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public SettingsException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
+    }
 
 #if NETFRAMEWORK
-        /// <summary>
-        /// Serialization constructor.
-        /// </summary>
-        protected SettingsException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Serialization constructor.
+    /// </summary>
+    protected SettingsException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
+    }
 
 #endif
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsNameAttribute.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsNameAttribute.cs
index 8218511cd7..fc49e6dfcd 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsNameAttribute.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsNameAttribute.cs
@@ -1,44 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// Attribute applied to ISettingsProviders to associate it with a settings
+/// name.  This name will be used to request the settings from the RunSettings.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public sealed class SettingsNameAttribute : Attribute
+{
     /// <summary>
-    /// Attribute applied to ISettingsProviders to associate it with a settings
-    /// name.  This name will be used to request the settings from the RunSettings.
+    /// Initializes with the name of the settings.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public sealed class SettingsNameAttribute : Attribute
+    /// <param name="settingsName">Name of the settings</param>
+    public SettingsNameAttribute(string settingsName)
     {
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the name of the settings.
-        /// </summary>
-        /// <param name="settingsName">Name of the settings</param>
-        public SettingsNameAttribute(string settingsName)
-        {
-            if (string.IsNullOrWhiteSpace(settingsName))
-            {
-                throw new ArgumentException(CommonResources.CannotBeNullOrEmpty, nameof(settingsName));
-            }
-
-            SettingsName = settingsName;
-        }
-
-        #endregion
-
-        #region Properties
+        ValidateArg.NotNullOrWhiteSpace(settingsName, nameof(settingsName));
+        SettingsName = settingsName;
+    }
 
-        /// <summary>
-        /// The name of the settings.
-        /// </summary>
-        public string SettingsName { get; private set; }
+    /// <summary>
+    /// The name of the settings.
+    /// </summary>
+    public string SettingsName { get; private set; }
 
-        #endregion
-    }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunParameters.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunParameters.cs
index b263ee864c..a23e28101d 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunParameters.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunParameters.cs
@@ -1,76 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Xml;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// This class deals with the run settings, Test Run Parameters node and the extracting of Key Value Pair's from the parameters listed.
+/// </summary>
+internal class TestRunParameters
+{
     /// <summary>
-    /// This class deals with the run settings, Test Run Parameters node and the extracting of Key Value Pair's from the parameters listed.
+    /// Get the test run parameters from the provided reader.
     /// </summary>
-    internal class TestRunParameters
+    /// <param name="reader"> The reader. </param>
+    /// <returns> The dictionary of test run parameters. </returns>
+    /// <exception cref="SettingsException"> Throws when format is incorrect. </exception>
+    internal static Dictionary<string, object> FromXml(XmlReader reader)
     {
-        /// <summary>
-        /// Get the test run parameters from the provided reader.
-        /// </summary>
-        /// <param name="reader"> The reader. </param>
-        /// <returns> The dictionary of test run parameters. </returns>
-        /// <exception cref="SettingsException"> Throws when format is incorrect. </exception>
-        internal static Dictionary<string, object> FromXml(XmlReader reader)
+        var testParameters = new Dictionary<string, object>();
+
+        if (reader.IsEmptyElement)
         {
-            var testParameters = new Dictionary<string, object>();
+            return testParameters;
+        }
 
-            if (!reader.IsEmptyElement)
-            {
-                XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
-                reader.Read();
+        XmlRunSettingsUtilities.ThrowOnHasAttributes(reader);
+        reader.Read();
 
-                while (reader.NodeType == XmlNodeType.Element)
-                {
-                    string elementName = reader.Name;
-                    switch (elementName)
+        while (reader.NodeType == XmlNodeType.Element)
+        {
+            string elementName = reader.Name;
+            switch (elementName)
+            {
+                case "Parameter":
+                    string? paramName = null;
+                    string? paramValue = null;
+                    for (int attIndex = 0; attIndex < reader.AttributeCount; attIndex++)
                     {
-                        case "Parameter":
-                            string paramName = null;
-                            string paramValue = null;
-                            for (int attIndex = 0; attIndex < reader.AttributeCount; attIndex++)
-                            {
-                                reader.MoveToAttribute(attIndex);
-                                if (string.Equals(reader.Name, "Name", StringComparison.OrdinalIgnoreCase))
-                                {
-                                    paramName = reader.Value;
-                                }
-                                else if (string.Equals(reader.Name, "Value", StringComparison.OrdinalIgnoreCase))
-                                {
-                                    paramValue = reader.Value;
-                                }
-                            }
-
-                            if (paramName != null && paramValue != null)
-                            {
-                                testParameters[paramName] = paramValue;
-                            }
+                        reader.MoveToAttribute(attIndex);
+                        if (string.Equals(reader.Name, "Name", StringComparison.OrdinalIgnoreCase))
+                        {
+                            paramName = reader.Value;
+                        }
+                        else if (string.Equals(reader.Name, "Value", StringComparison.OrdinalIgnoreCase))
+                        {
+                            paramValue = reader.Value;
+                        }
+                    }
 
-                            break;
-                        default:
-                            throw new SettingsException(
-                                string.Format(
-                                    CultureInfo.CurrentCulture,
-                                    Resources.Resources.InvalidSettingsXmlElement,
-                                    Constants.TestRunParametersName,
-                                    reader.Name));
+                    if (paramName != null && paramValue != null)
+                    {
+                        testParameters[paramName] = paramValue;
                     }
 
-                    reader.Read();
-                }
+                    break;
+                default:
+                    throw new SettingsException(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Resources.Resources.InvalidSettingsXmlElement,
+                            Constants.TestRunParametersName,
+                            reader.Name));
             }
 
-            return testParameters;
+            reader.Read();
         }
+
+        return testParameters;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunSettings.cs
index 1efd70b7a9..1d5b682ce9 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunSettings.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/TestRunSettings.cs
@@ -1,52 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System.Xml;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// Stores information about a test settings.
+/// </summary>
+public abstract class TestRunSettings
+{
     /// <summary>
-    /// Stores information about a test settings.
+    /// Initializes with the name of the test case.
     /// </summary>
-    public abstract class TestRunSettings
+    /// <param name="name">The name of the test case.</param>
+    protected TestRunSettings(string name)
     {
-        private string name;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes with the name of the test case.
-        /// </summary>
-        /// <param name="name">The name of the test case.</param>
-        protected TestRunSettings(string name)
-        {
-            ValidateArg.NotNullOrEmpty(name, nameof(name));
-
-            this.name = name;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the name of the test settings.
-        /// Do not put a private setter on this
-        /// Chutzpah adapter checks for setters of all properties and it throws error if its private
-        /// during RunSettings.LoadSection() call
-        /// TODO: Communicate to Chutzpah and fix it
-        /// </summary>
-        public string Name => name;
+        ValidateArg.NotNullOrEmpty(name, nameof(name));
+        Name = name;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the name of the test settings.
+    /// Do not put a private setter on this
+    /// Chutzpah adapter checks for setters of all properties and it throws error if its private
+    /// during RunSettings.LoadSection() call
+    /// TODO: Communicate to Chutzpah and fix it
+    /// </summary>
+    public string Name { get; }
 
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Converter the setting to be an XmlElement.
-        /// </summary>
-        /// <returns>The Xml element for the run settings provided.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", Justification = "XmlElement is required in the data collector.")]
-        public abstract XmlElement ToXml();
-#endif
-    }
+    /// <summary>
+    /// Converter the setting to be an XmlElement.
+    /// </summary>
+    /// <returns>The Xml element for the run settings provided.</returns>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes", Justification = "XmlElement is required in the data collector.")]
+    public abstract XmlElement ToXml();
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/SourceDetail.cs b/src/Microsoft.TestPlatform.ObjectModel/SourceDetail.cs
new file mode 100644
index 0000000000..cba8b66872
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/SourceDetail.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public class SourceDetail
+{
+    public string? Source { get; internal set; }
+    public Architecture Architecture { get; internal set; }
+    public Framework? Framework { get; internal set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TelemetryEvent.cs b/src/Microsoft.TestPlatform.ObjectModel/TelemetryEvent.cs
new file mode 100644
index 0000000000..9b99d23384
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/TelemetryEvent.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public sealed class TelemetryEvent
+{
+    /// <summary>
+    /// Initialize an TelemetryEvent
+    /// </summary>
+    /// <param name="name">Telemetry event name</param>
+    /// <param name="properties">Telemetry event properties</param>
+    public TelemetryEvent(string name, IDictionary<string, object> properties)
+    {
+        Name = name;
+        Properties = properties;
+    }
+
+    /// <summary>
+    /// Telemetry event name.
+    /// </summary>
+    [DataMember]
+    public string Name { get; private set; }
+
+    /// <summary>
+    /// Telemetry event properties.
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, object> Properties { get; private set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestAdapterLoadingStrategy.cs b/src/Microsoft.TestPlatform.ObjectModel/TestAdapterLoadingStrategy.cs
new file mode 100644
index 0000000000..904b40ea10
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestAdapterLoadingStrategy.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Represents a loading strategy
+/// </summary>
+[Flags]
+internal enum TestAdapterLoadingStrategy
+{
+    /// <summary>
+    /// A strategy not defined, Test Platform will load adapters normally.
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node).
+    /// If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded.
+    /// If no adapter path is specified, test run will fail.
+    /// This will imply /InIsolation switch and force the tests to be run in an isolated process.
+    /// </summary>
+    Explicit = 1,
+
+    /// <summary>
+    /// Load adapters next to source.
+    /// </summary>
+    NextToSource = 2,
+
+    /// <summary>
+    /// Default runtime providers inside Extensions folder will be included.
+    /// </summary>
+    DefaultRuntimeProviders = 4,
+
+    /// <summary>
+    /// Load adapters inside Extensions folder.
+    /// </summary>
+    ExtensionsDirectory = 8,
+
+    /// <summary>
+    /// Directory wide searches will be recursive, this is required to be used with <see cref="NextToSource" /> or <see cref="Explicit" />.
+    /// </summary>
+    Recursive = 16,
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs b/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs
index 809f559abf..b9c260fb9f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs
@@ -1,433 +1,390 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Stores information about a test case.
+/// </summary>
+[DataContract]
+public sealed class TestCase : TestObject
 {
-    using System;
-    using System.IO;
-    using System.Runtime.Serialization;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+    private Guid _defaultId = Guid.Empty;
+    private Guid _id;
+    private string? _displayName;
+    private string _fullyQualifiedName;
+    private string _source;
 
     /// <summary>
-    /// Stores information about a test case.
+    /// Initializes a new instance of the <see cref="TestCase"/> class.
     /// </summary>
-    [DataContract]
-    public sealed class TestCase : TestObject
+    /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    public TestCase()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
-        /// <summary>
-        /// LocalExtensionData which can be used by Adapter developers for local transfer of extended properties.
-        /// Note that this data is available only for in-Proc execution, and may not be available for OutProc executors
-        /// </summary>
-        private object localExtensionData;
-
-        private Guid defaultId = Guid.Empty;
-        private Guid id;
-        private string displayName;
-        private string fullyQualifiedName;
-        private string source;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCase"/> class.
-        /// </summary>
-        /// <remarks>This constructor doesn't perform any parameter validation, it is meant to be used for serialization."/></remarks>
-        public TestCase()
-        {
-            // Default constructor for Serialization.
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestCase"/> class.
-        /// </summary>
-        /// <param name="fullyQualifiedName">
-        /// Fully qualified name of the test case.
-        /// </param>
-        /// <param name="executorUri">
-        /// The Uri of the executor to use for running this test.
-        /// </param>
-        /// <param name="source">
-        /// Test container source from which the test is discovered.
-        /// </param>
-        public TestCase(string fullyQualifiedName, Uri executorUri, string source)
-        {
-            ValidateArg.NotNullOrEmpty(fullyQualifiedName, nameof(fullyQualifiedName));
-            ValidateArg.NotNull(executorUri, nameof(executorUri));
-            ValidateArg.NotNullOrEmpty(source, nameof(source));
-
-            this.FullyQualifiedName = fullyQualifiedName;
-            this.ExecutorUri = executorUri;
-            this.Source = source;
-            this.LineNumber = -1;
-        }
-        #endregion
-
-        #region Properties
+        // TODO: Make private
+        // Default constructor for Serialization.
+    }
 
-        /// <summary>
-        /// LocalExtensionData which can be used by Adapter developers for local transfer of extended properties.
-        /// Note that this data is available only for in-Proc execution, and may not be available for OutProc executors
-        /// </summary>
-        public object LocalExtensionData
-        {
-            get { return localExtensionData; }
-            set { localExtensionData = value; }
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestCase"/> class.
+    /// </summary>
+    /// <param name="fullyQualifiedName">
+    /// Fully qualified name of the test case.
+    /// </param>
+    /// <param name="executorUri">
+    /// The Uri of the executor to use for running this test.
+    /// </param>
+    /// <param name="source">
+    /// Test container source from which the test is discovered.
+    /// </param>
+    public TestCase(string fullyQualifiedName, Uri executorUri, string source)
+    {
+        ValidateArg.NotNullOrEmpty(fullyQualifiedName, nameof(fullyQualifiedName));
+        ValidateArg.NotNullOrEmpty(source, nameof(source));
+
+        _fullyQualifiedName = fullyQualifiedName;
+        ExecutorUri = executorUri ?? throw new ArgumentNullException(nameof(executorUri));
+        _source = source;
+        LineNumber = -1;
+        _defaultId = Guid.Empty;
+    }
+    /// <summary>
+    /// LocalExtensionData which can be used by Adapter developers for local transfer of extended properties.
+    /// Note that this data is available only for in-Proc execution, and may not be available for OutProc executors
+    /// </summary>
+    public object? LocalExtensionData { get; set; }
 
-        /// <summary>
-        /// Gets or sets the id of the test case.
-        /// </summary>
-        [DataMember]
-        public Guid Id
+    /// <summary>
+    /// Gets or sets the id of the test case.
+    /// </summary>
+    [DataMember]
+    public Guid Id
+    {
+        get
         {
-            get
+            if (_id == Guid.Empty)
             {
-                if (this.id == Guid.Empty)
+                if (_defaultId == Guid.Empty)
                 {
-                    if (this.defaultId == Guid.Empty)
-                    {
-                        this.defaultId = this.GetTestId();
-                    }
-
-                    return this.defaultId;
+                    _defaultId = GetTestId();
                 }
 
-                return this.id;
+                return _defaultId;
             }
 
-            set
-            {
-                this.id = value;
-            }
+            return _id;
         }
 
-        /// <summary>
-        /// Gets or sets the fully qualified name of the test case.
-        /// </summary>
-        [DataMember]
-        public string FullyQualifiedName
-        {
-            get => fullyQualifiedName;
+        set => _id = value;
+    }
 
-            // defaultId should be reset as it is based on FullyQualifiedName and Source.
-            set => SetVariableAndResetId(ref fullyQualifiedName, value);
-        }
+    /// <summary>
+    /// Gets or sets the fully qualified name of the test case.
+    /// </summary>
+    [DataMember]
+    public string FullyQualifiedName
+    {
+        get => _fullyQualifiedName;
 
-        /// <summary>
-        /// Gets or sets the display name of the test case.
-        /// </summary>
-        [DataMember]
-        public string DisplayName
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(this.displayName))
-                {
-                    return this.GetFullyQualifiedName();
-                }
+        // defaultId should be reset as it is based on FullyQualifiedName and Source.
+        set => SetVariableAndResetId(ref _fullyQualifiedName, value);
+    }
 
-                return this.displayName;
-            }
-            set
-            {
-                this.displayName = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the display name of the test case.
+    /// </summary>
+    [DataMember]
+    public string DisplayName
+    {
+        get => _displayName.IsNullOrEmpty() ? GetFullyQualifiedName() : _displayName;
+        set => _displayName = value;
+    }
 
-        /// <summary>
-        /// Gets or sets the Uri of the Executor to use for running this test.
-        /// </summary>
-        [DataMember]
-        public Uri ExecutorUri
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets or sets the Uri of the Executor to use for running this test.
+    /// </summary>
+    [DataMember]
+    public Uri ExecutorUri
+    {
+        get; set;
+    }
 
-        /// <summary>
-        /// Gets the test container source from which the test is discovered.
-        /// </summary>
-        [DataMember]
-        public string Source
+    /// <summary>
+    /// Gets the test container source from which the test is discovered.
+    /// </summary>
+    [DataMember]
+    public string Source
+    {
+        get => _source;
+        set
         {
-            get
-            {
-                return this.source;
-            }
-            set
-            {
-                this.source = value;
+            _source = value;
 
-                // defaultId should be reset as it is based on FullyQualifiedName and Source.
-                this.defaultId = Guid.Empty;
-            }
+            // defaultId should be reset as it is based on FullyQualifiedName and Source.
+            _defaultId = Guid.Empty;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the source code file path of the test.
-        /// </summary>
-        [DataMember]
-        public string CodeFilePath
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets or sets the source code file path of the test.
+    /// </summary>
+    [DataMember]
+    public string? CodeFilePath
+    {
+        get; set;
+    }
 
-        /// <summary>
-        /// Gets or sets the line number of the test.
-        /// </summary>
-        [DataMember]
-        public int LineNumber
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets or sets the line number of the test.
+    /// </summary>
+    [DataMember]
+    public int LineNumber
+    {
+        get; set;
+    }
 
-        /// <summary>
-        /// Returns the TestProperties currently specified in this TestObject.
-        /// </summary>
-        public override IEnumerable<TestProperty> Properties
+    /// <summary>
+    /// Returns the TestProperties currently specified in this TestObject.
+    /// </summary>
+    public override IEnumerable<TestProperty> Properties
+    {
+        get
         {
-            get
-            {
-                return TestCaseProperties.Properties.Concat(base.Properties);
-            }
+            return TestCaseProperties.Properties.Concat(base.Properties);
         }
+    }
 
-        #endregion
-
-        #region private methods
-
-        /// <summary>
-        /// Creates a Id of TestCase
-        /// </summary>
-        /// <returns>Guid test id</returns>
-        private Guid GetTestId()
+    /// <summary>
+    /// Creates a Id of TestCase
+    /// </summary>
+    /// <returns>Guid test id</returns>
+    private Guid GetTestId()
+    {
+        // To generate id hash "ExecutorUri + source + Name";
+
+        // If source is a file name then just use the filename for the identifier since the
+        // file might have moved between discovery and execution (in appx mode for example)
+        // This is not elegant because the Source contents should be a black box to the framework.
+        // For example in the database adapter case this is not a file path.
+        string source = Source;
+
+        // As discussed with team, we found no scenario for netcore, & fullclr where the Source is not present where ID is generated,
+        // which means we would always use FileName to generate ID. In cases where somehow Source Path contained garbage character the API Path.GetFileName()
+        // we are simply returning original input.
+        // For UWP where source during discovery, & during execution can be on different machine, in such case we should always use Path.GetFileName()
+        try
         {
-            // To generate id hash "ExecutorUri + source + Name";
-
-            // If source is a file name then just use the filename for the identifier since the
-            // file might have moved between discovery and execution (in appx mode for example)
-            // This is not elegant because the Source contents should be a black box to the framework.
-            // For example in the database adapter case this is not a file path.
-            string source = this.Source;
-
-            // As discussed with team, we found no scenario for netcore, & fullclr where the Source is not present where ID is generated,
-            // which means we would always use FileName to generate ID. In cases where somehow Source Path contained garbage character the API Path.GetFileName()
-            // we are simply returning original input.
-            // For UWP where source during discovery, & during execution can be on different machine, in such case we should always use Path.GetFileName()
-            try
-            {
-                // If source name is malformed, GetFileName API will throw exception, so use same input malformed string to generate ID
-                source = Path.GetFileName(source);
-            }
-            catch
-            {
-                // do nothing
-            }
-
-            // We still need to handle parameters in the case of a Theory or TestGroup of test cases that are only
-            // distinguished by parameters.
-            var testcaseFullName = this.ExecutorUri + source;
-
-            // If ManagedType and ManagedMethod properties are filled than TestId should be based on those.
-            testcaseFullName += this.GetFullyQualifiedName();
-
-            return EqtHash.GuidFromString(testcaseFullName);
+            // If source name is malformed, GetFileName API will throw exception, so use same input malformed string to generate ID
+            source = Path.GetFileName(source);
         }
-
-        private void SetVariableAndResetId<T>(ref T variable, T value)
+        catch
         {
-            variable = value;
-            this.defaultId = Guid.Empty;
+            // do nothing
         }
 
-        private void SetPropertyAndResetId<T>(TestProperty property, T value)
-        {
-            SetPropertyValue(property, value);
-            this.defaultId = Guid.Empty;
-        }
+        // We still need to handle parameters in the case of a Theory or TestGroup of test cases that are only
+        // distinguished by parameters.
+        var testcaseFullName = ExecutorUri + source;
 
-        #endregion
+        // If ManagedType and ManagedMethod properties are filled than TestId should be based on those.
+        testcaseFullName += GetFullyQualifiedName();
 
-        #region Protected Methods
+        return EqtHash.GuidFromString(testcaseFullName);
+    }
 
-        /// <summary>
-        /// Return TestProperty's value
-        /// </summary>
-        /// <returns></returns>
-        protected override object ProtectedGetPropertyValue(TestProperty property, object defaultValue)
-        {
-            ValidateArg.NotNull(property, nameof(property));
+    private void SetVariableAndResetId<T>(ref T variable, T value)
+    {
+        variable = value;
+        _defaultId = Guid.Empty;
+    }
 
-            switch (property.Id)
-            {
-                case "TestCase.CodeFilePath":
-                    return this.CodeFilePath;
-                case "TestCase.DisplayName":
-                    return this.DisplayName;
-                case "TestCase.ExecutorUri":
-                    return this.ExecutorUri;
-                case "TestCase.FullyQualifiedName":
-                    return this.FullyQualifiedName;
-                case "TestCase.Id":
-                    return this.Id;
-                case "TestCase.LineNumber":
-                    return this.LineNumber;
-                case "TestCase.Source":
-                    return this.Source;
-            }
+    private void SetPropertyAndResetId<T>(TestProperty property, T value)
+    {
+        SetPropertyValue(property, value);
+        _defaultId = Guid.Empty;
+    }
 
+    /// <summary>
+    /// Return TestProperty's value
+    /// </summary>
+    /// <returns></returns>
+    protected override object? ProtectedGetPropertyValue(TestProperty property, object? defaultValue)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        return property.Id switch
+        {
+            "TestCase.CodeFilePath" => CodeFilePath,
+            "TestCase.DisplayName" => DisplayName,
+            "TestCase.ExecutorUri" => ExecutorUri,
+            "TestCase.FullyQualifiedName" => FullyQualifiedName,
+            "TestCase.Id" => Id,
+            "TestCase.LineNumber" => LineNumber,
+            "TestCase.Source" => Source,
             // It is a custom test case property. Should be retrieved from the TestObject store.
-            return base.ProtectedGetPropertyValue(property, defaultValue);
-        }
+            _ => base.ProtectedGetPropertyValue(property, defaultValue),
+        };
+    }
 
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        protected override void ProtectedSetPropertyValue(TestProperty property, object value)
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    protected override void ProtectedSetPropertyValue(TestProperty property, object? value)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        switch (property.Id)
         {
-            ValidateArg.NotNull(property, nameof(property));
+            case "TestCase.CodeFilePath":
+                CodeFilePath = value as string;
+                return;
 
-            switch (property.Id)
-            {
-                case "TestCase.CodeFilePath":
-                    this.CodeFilePath = value as string;
-                    return;
-
-                case "TestCase.DisplayName":
-                    this.DisplayName = value as string;
-                    return;
+            case "TestCase.DisplayName":
+                DisplayName = (value as string)!;
+                return;
 
-                case "TestCase.ExecutorUri":
-                    this.ExecutorUri = value as Uri ?? new Uri(value as string);
-                    return;
+            case "TestCase.ExecutorUri":
+                ExecutorUri = value as Uri ?? new Uri((value as string)!);
+                return;
 
-                case "TestCase.FullyQualifiedName":
-                    this.FullyQualifiedName = value as string;
-                    return;
+            case "TestCase.FullyQualifiedName":
+                FullyQualifiedName = (value as string)!;
+                return;
 
-                case "TestCase.Id":
-                    this.Id = value is Guid ? (Guid)value : Guid.Parse(value as string);
-                    return;
+            case "TestCase.Id":
+                if (value is Guid guid)
+                {
+                    Id = guid;
+                }
+                else if (value is string guidString)
+                {
+                    Id = GuidPolyfill.Parse(guidString, CultureInfo.InvariantCulture);
+                }
+                else
+                {
+                    Id = Guid.Empty;
+                }
 
-                case "TestCase.LineNumber":
-                    this.LineNumber = (int)value;
-                    return;
+                return;
 
-                case "TestCase.Source":
-                    this.Source = value as string;
-                    return;
-            }
+            case "TestCase.LineNumber":
+                LineNumber = (int)value!;
+                return;
 
-            // It is a custom test case property. Should be set in the TestObject store.
-            base.ProtectedSetPropertyValue(property, value);
+            case "TestCase.Source":
+                Source = (value as string)!;
+                return;
         }
 
-        #endregion
+        // It is a custom test case property. Should be set in the TestObject store.
+        base.ProtectedSetPropertyValue(property, value);
+    }
 
-        #region ManagedName and ManagedType implementations
+    private static readonly TestProperty ManagedTypeProperty = TestProperty.Register("TestCase.ManagedType", "ManagedType", string.Empty, string.Empty, typeof(string), o => !StringUtils.IsNullOrWhiteSpace(o as string), TestPropertyAttributes.Hidden, typeof(TestCase));
+    private static readonly TestProperty ManagedMethodProperty = TestProperty.Register("TestCase.ManagedMethod", "ManagedMethod", string.Empty, string.Empty, typeof(string), o => !StringUtils.IsNullOrWhiteSpace(o as string), TestPropertyAttributes.Hidden, typeof(TestCase));
 
-        private static readonly TestProperty ManagedTypeProperty = TestProperty.Register("TestCase.ManagedType", "ManagedType", string.Empty, string.Empty, typeof(string), o => !string.IsNullOrWhiteSpace(o as string), TestPropertyAttributes.Hidden, typeof(TestCase));
-        private static readonly TestProperty ManagedMethodProperty = TestProperty.Register("TestCase.ManagedMethod", "ManagedMethod", string.Empty, string.Empty, typeof(string), o => !string.IsNullOrWhiteSpace(o as string), TestPropertyAttributes.Hidden, typeof(TestCase));
+    private bool ContainsManagedMethodAndType => !StringUtils.IsNullOrWhiteSpace(ManagedMethod) && !StringUtils.IsNullOrWhiteSpace(ManagedType);
 
-        private bool ContainsManagedMethodAndType => !string.IsNullOrWhiteSpace(ManagedMethod) && !string.IsNullOrWhiteSpace(ManagedType);
+    private string? ManagedType
+    {
+        get => GetPropertyValue<string>(ManagedTypeProperty, null);
+        set => SetPropertyAndResetId(ManagedTypeProperty, value);
+    }
 
-        private string ManagedType
-        {
-            get => GetPropertyValue<string>(ManagedTypeProperty, null);
-            set => SetPropertyAndResetId(ManagedTypeProperty, value);
-        }
+    private string? ManagedMethod
+    {
+        get => GetPropertyValue<string>(ManagedMethodProperty, null);
+        set => SetPropertyAndResetId(ManagedMethodProperty, value);
+    }
 
-        private string ManagedMethod
-        {
-            get => GetPropertyValue<string>(ManagedMethodProperty, null);
-            set => SetPropertyAndResetId(ManagedMethodProperty, value);
-        }
+    private string GetFullyQualifiedName() => ContainsManagedMethodAndType ? $"{ManagedType}.{ManagedMethod}" : FullyQualifiedName;
 
-        private string GetFullyQualifiedName() => ContainsManagedMethodAndType ? $"{ManagedType}.{ManagedMethod}" : FullyQualifiedName;
+    /// <inheritdoc/>
+    public override string ToString() => GetFullyQualifiedName();
+}
 
-        #endregion
+/// <summary>
+/// Well-known TestCase properties
+/// </summary>
+public static class TestCaseProperties
+{
+    /// <summary>
+    /// These are the core Test properties and may be available in commandline/TeamBuild to filter tests.
+    /// These Property names should not be localized.
+    /// </summary>
+    private const string IdLabel = "Id";
+    private const string FullyQualifiedNameLabel = "FullyQualifiedName";
+    private const string NameLabel = "Name";
+    private const string ExecutorUriLabel = "Executor Uri";
+    private const string SourceLabel = "Source";
+    private const string FilePathLabel = "File Path";
+    private const string LineNumberLabel = "Line Number";
+
+    public static readonly TestProperty Id = TestProperty.Register("TestCase.Id", IdLabel, string.Empty, string.Empty, typeof(Guid), ValidateGuid, TestPropertyAttributes.Hidden, typeof(TestCase));
+    public static readonly TestProperty FullyQualifiedName = TestProperty.Register("TestCase.FullyQualifiedName", FullyQualifiedNameLabel, string.Empty, string.Empty, typeof(string), ValidateName, TestPropertyAttributes.Hidden, typeof(TestCase));
+    public static readonly TestProperty DisplayName = TestProperty.Register("TestCase.DisplayName", NameLabel, string.Empty, string.Empty, typeof(string), ValidateDisplay, TestPropertyAttributes.None, typeof(TestCase));
+    public static readonly TestProperty ExecutorUri = TestProperty.Register("TestCase.ExecutorUri", ExecutorUriLabel, string.Empty, string.Empty, typeof(Uri), ValidateExecutorUri, TestPropertyAttributes.Hidden, typeof(TestCase));
+    public static readonly TestProperty Source = TestProperty.Register("TestCase.Source", SourceLabel, typeof(string), typeof(TestCase));
+    public static readonly TestProperty CodeFilePath = TestProperty.Register("TestCase.CodeFilePath", FilePathLabel, typeof(string), typeof(TestCase));
+    public static readonly TestProperty LineNumber = TestProperty.Register("TestCase.LineNumber", LineNumberLabel, typeof(int), TestPropertyAttributes.Hidden, typeof(TestCase));
+
+    internal static TestProperty[] Properties { get; } =
+    [
+        CodeFilePath,
+        DisplayName,
+        ExecutorUri,
+        FullyQualifiedName,
+        Id,
+        LineNumber,
+        Source
+    ];
+
+    private static bool ValidateName(object? value)
+    {
+        return !StringUtils.IsNullOrWhiteSpace((string?)value);
+    }
 
-        /// <inheritdoc/>
-        public override string ToString() => this.GetFullyQualifiedName();
+    private static bool ValidateDisplay(object? value)
+    {
+        // only check for null and pass the rest up to UI for validation
+        return value != null;
     }
 
-    /// <summary>
-    /// Well-known TestCase properties
-    /// </summary>
-    public static class TestCaseProperties
+    private static bool ValidateExecutorUri(object? value)
     {
-        #region Private Constants
-
-        /// <summary>
-        /// These are the core Test properties and may be available in commandline/TeamBuild to filter tests.
-        /// These Property names should not be localized.
-        /// </summary>
-        private const string IdLabel = "Id";
-        private const string FullyQualifiedNameLabel = "FullyQualifiedName";
-        private const string NameLabel = "Name";
-        private const string ExecutorUriLabel = "Executor Uri";
-        private const string SourceLabel = "Source";
-        private const string FilePathLabel = "File Path";
-        private const string LineNumberLabel = "Line Number";
-
-        #endregion
-
-        public static readonly TestProperty Id = TestProperty.Register("TestCase.Id", IdLabel, string.Empty, string.Empty, typeof(Guid), ValidateGuid, TestPropertyAttributes.Hidden, typeof(TestCase));
-        public static readonly TestProperty FullyQualifiedName = TestProperty.Register("TestCase.FullyQualifiedName", FullyQualifiedNameLabel, string.Empty, string.Empty, typeof(string), ValidateName, TestPropertyAttributes.Hidden, typeof(TestCase));
-        public static readonly TestProperty DisplayName = TestProperty.Register("TestCase.DisplayName", NameLabel, string.Empty, string.Empty, typeof(string), ValidateDisplay, TestPropertyAttributes.None, typeof(TestCase));
-        public static readonly TestProperty ExecutorUri = TestProperty.Register("TestCase.ExecutorUri", ExecutorUriLabel, string.Empty, string.Empty, typeof(Uri), ValidateExecutorUri, TestPropertyAttributes.Hidden, typeof(TestCase));
-        public static readonly TestProperty Source = TestProperty.Register("TestCase.Source", SourceLabel, typeof(string), typeof(TestCase));
-        public static readonly TestProperty CodeFilePath = TestProperty.Register("TestCase.CodeFilePath", FilePathLabel, typeof(string), typeof(TestCase));
-        public static readonly TestProperty LineNumber = TestProperty.Register("TestCase.LineNumber", LineNumberLabel, typeof(int), TestPropertyAttributes.Hidden, typeof(TestCase));
-
-        internal static TestProperty[] Properties { get; } =
-        {
-            CodeFilePath,
-            DisplayName,
-            ExecutorUri,
-            FullyQualifiedName,
-            Id,
-            LineNumber,
-            Source
-        };
+        return value != null;
+    }
 
-        private static bool ValidateName(object value)
+    private static bool ValidateGuid(object? value)
+    {
+        if (value?.ToString() is not string sValue)
         {
-            return !string.IsNullOrWhiteSpace((string)value);
+            return false;
         }
 
-        private static bool ValidateDisplay(object value)
+        // TODO: Replace with TryParse?
+        try
         {
-            // only check for null and pass the rest up to UI for validation
-            return value != null;
+            _ = new Guid(sValue);
+            return true;
         }
-
-        private static bool ValidateExecutorUri(object value)
+        catch (FormatException)
         {
-            return value != null;
+            return false;
         }
-
-        private static bool ValidateGuid(object value)
+        catch (OverflowException)
         {
-            try
-            {
-                new Guid(value.ToString());
-                return true;
-            }
-            catch (ArgumentNullException)
-            {
-                return false;
-            }
-            catch (FormatException)
-            {
-                return false;
-            }
-            catch (OverflowException)
-            {
-                return false;
-            }
+            return false;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs b/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs
index 4fd29c1043..634fe33e5f 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs
@@ -1,386 +1,348 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+///  Base class for test related classes.
+/// </summary>
+[DataContract]
+public abstract class TestObject
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Runtime.Serialization;
+    private static readonly CustomKeyValueConverter KeyValueConverter = new();
+    private static readonly CustomStringArrayConverter StringArrayConverter = new();
 
     /// <summary>
-    ///  Base class for test related classes.
+    /// The store for all the properties registered.
     /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1012:AbstractTypesShouldNotHaveConstructors")]
-    [DataContract]
-    public abstract class TestObject
+    private readonly ConcurrentDictionary<TestProperty, object?> _store = new();
+
+    /// <summary>
+    /// Property used for Json (de)serialization of store dictionary. Serialization of dictionaries
+    /// by default doesn't provide the required object representation. <c>List of KeyValuePair</c> on the
+    /// other hand provides a clean Key, Value entries for <c>TestProperty</c> and it's value.
+    /// </summary>
+    [DataMember(Name = "Properties")]
+    private List<KeyValuePair<TestProperty, object?>> StoreKeyValuePairs
     {
-        #region Fields
-
-        private static CustomKeyValueConverter keyValueConverter = new CustomKeyValueConverter();
-        private static CustomStringArrayConverter stringArrayConverter = new CustomStringArrayConverter();
-
-        /// <summary>
-        /// The store for all the properties registered.
-        /// </summary>
-        private readonly Dictionary<TestProperty, object> store;
-
-        /// <summary>
-        /// Property used for Json (de)serialization of store dictionary. Serialization of dictionaries
-        /// by default doesn't provide the required object representation. <c>List of KeyValuePair</c> on the
-        /// other hand provides a clean Key, Value entries for <c>TestProperty</c> and it's value.
-        /// </summary>
-        [DataMember(Name = "Properties")]
-        private List<KeyValuePair<TestProperty, object>> StoreKeyValuePairs
-        {
-            get
-            {
-                return this.store.ToList();
-            }
+        get => _store.ToList();
 
-            set
+        set
+        {
+            // Receive the <TestProperty, String> key value pairs from deserialized entity.
+            // Store each property and value in the property data store.
+            foreach (var property in value)
             {
-                // Receive the <TestProperty, String> key value pairs from deserialized entity.
-                // Store each property and value in the property data store.
-                foreach (var property in value)
-                {
-                    TestProperty.Register(
-                        property.Key.Id,
-                        property.Key.Label,
-                        property.Key.Category,
-                        property.Key.Description,
-                        property.Key.GetValueType(),
-                        null,
-                        property.Key.Attributes,
-                        typeof(TestObject));
-
-                    // Do not call SetPropertyValue(TestProperty property, object value) as it does not
-                    // invoke ConvertPropertyFrom and does not store the properties in correct types.
-                    this.SetPropertyValue(property.Key, property.Value, CultureInfo.InvariantCulture);
-                }
+                TestProperty.Register(
+                    property.Key.Id,
+                    property.Key.Label,
+                    property.Key.Category,
+                    property.Key.Description,
+                    property.Key.GetValueType(),
+                    null,
+                    property.Key.Attributes,
+                    typeof(TestObject));
+
+                // Do not call SetPropertyValue(TestProperty property, object value) as it does not
+                // invoke ConvertPropertyFrom and does not store the properties in correct types.
+                SetPropertyValue(property.Key, property.Value, CultureInfo.InvariantCulture);
             }
         }
+    }
 
-        public IEnumerable<KeyValuePair<TestProperty, object>> GetProperties()
-        {
-            return this.store;
-        }
-
-        #endregion Fields
-
-        #region Constructors
-
-        protected TestObject()
-        {
-            this.store = new Dictionary<TestProperty, object>();
-        }
+    public IEnumerable<KeyValuePair<TestProperty, object?>> GetProperties()
+    {
+        return _store;
+    }
 
-        [OnSerializing]
+    [OnSerializing]
 #if FullCLR
         private void CacheLazyValuesOnSerializing(StreamingContext context)
 #else
-        public void CacheLazyValuesOnSerializing(StreamingContext context)
+    public void CacheLazyValuesOnSerializing(StreamingContext context)
 #endif
+    {
+        var lazyValues = _store.Where(kvp => kvp.Value is ILazyPropertyValue).ToArray();
+
+        foreach (var kvp in lazyValues)
         {
-            var lazyValues = this.store.Where(kvp => kvp.Value is ILazyPropertyValue).ToArray();
+            var lazyValue = (ILazyPropertyValue?)kvp.Value;
+            var value = lazyValue?.Value;
+            _store.TryRemove(kvp.Key, out _);
 
-            foreach (var kvp in lazyValues)
+            if (value != null)
             {
-                var lazyValue = (ILazyPropertyValue)kvp.Value;
-                var value = lazyValue.Value;
-                this.store.Remove(kvp.Key);
-
-                if (value != null)
-                {
-                    this.store.Add(kvp.Key, value);
-                }
+                _store.TryAdd(kvp.Key, value);
             }
         }
+    }
 
-        #endregion Constructors
+    /// <summary>
+    /// Returns the TestProperties currently specified in this TestObject.
+    /// </summary>
+    public virtual IEnumerable<TestProperty> Properties
+    {
+        get { return _store.Keys; }
+    }
 
-        #region Properties
+    /// <summary>
+    /// Returns property value of the specify TestProperty
+    /// </summary>
+    /// <param name="property">TestObject's TestProperty</param>
+    /// <returns>property value</returns>
+    public object? GetPropertyValue(TestProperty property)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        object? defaultValue = null;
+        var valueType = property.GetValueType();
 
-        /// <summary>
-        /// Returns the TestProperties currently specified in this TestObject.
-        /// </summary>
-        public virtual IEnumerable<TestProperty> Properties
+        if (valueType != null && valueType.IsValueType)
         {
-            get { return this.store.Keys; }
+            defaultValue = Activator.CreateInstance(valueType);
         }
 
-        /// <summary>
-        /// Returns property value of the specify TestProperty
-        /// </summary>
-        /// <param name="property">TestObject's TestProperty</param>
-        /// <returns>property value</returns>
-        public object GetPropertyValue(TestProperty property)
-        {
-            ValidateArg.NotNull(property, nameof(property));
+        return ProtectedGetPropertyValue(property, defaultValue);
+    }
 
-            object defaultValue = null;
-            var valueType = property.GetValueType();
+    /// <summary>
+    /// Returns property value of the specify TestProperty
+    /// </summary>
+    /// <typeparam name="T">Property value type</typeparam>
+    /// <param name="property">TestObject's TestProperty</param>
+    /// <param name="defaultValue">default property value if property is not present</param>
+    /// <returns>property value</returns>
+    [return: NotNullIfNotNull("defaultValue")]
+    public T? GetPropertyValue<T>(TestProperty property, T? defaultValue)
+    {
+        return GetPropertyValue(property, defaultValue, CultureInfo.InvariantCulture);
+    }
 
-            if (valueType != null && valueType.GetTypeInfo().IsValueType)
-            {
-                defaultValue = Activator.CreateInstance(valueType);
-            }
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    /// <typeparam name="T">Property value type</typeparam>
+    /// <param name="property">TestObject's TestProperty</param>
+    /// <param name="value">value to be set</param>
+    public void SetPropertyValue<T>(TestProperty property, T value)
+    {
+        SetPropertyValue(property, value, CultureInfo.InvariantCulture);
+    }
 
-            return this.ProtectedGetPropertyValue(property, defaultValue);
-        }
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    /// <typeparam name="T">Property value type</typeparam>
+    /// <param name="property">TestObject's TestProperty</param>
+    /// <param name="value">value to be set</param>
+    public void SetPropertyValue<T>(TestProperty property, LazyPropertyValue<T> value)
+    {
+        SetPropertyValue(property, value, CultureInfo.InvariantCulture);
+    }
+
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    /// <param name="property">TestObject's TestProperty</param>
+    /// <param name="value">value to be set</param>
+    public void SetPropertyValue(TestProperty property, object? value)
+    {
+        ProtectedSetPropertyValue(property, value);
+    }
+
+    /// <summary>
+    ///  Remove test property from the current TestObject.
+    /// </summary>
+    /// <param name="property"></param>
+    public void RemovePropertyValue(TestProperty property)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        _store.TryRemove(property, out _);
+    }
+
+    /// <summary>
+    /// Returns TestProperty's value
+    /// </summary>
+    /// <returns>property's value. default value is returned if the property is not present</returns>
+    [return: NotNullIfNotNull("defaultValue")]
+    public T? GetPropertyValue<T>(TestProperty property, T? defaultValue, CultureInfo culture)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        ValidateArg.NotNull(culture, nameof(culture));
+        object? objValue = ProtectedGetPropertyValue(property, defaultValue);
+
+        return ConvertPropertyTo<T>(property, culture, objValue);
+    }
+
+    /// <summary>
+    /// Set TestProperty's value to the specified value T.
+    /// </summary>
+    public void SetPropertyValue<T>(TestProperty property, T value, CultureInfo culture)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        ValidateArg.NotNull(culture, nameof(culture));
+        object? objValue = ConvertPropertyFrom<T>(property, culture, value);
+
+        ProtectedSetPropertyValue(property, objValue);
+    }
+
+    /// <summary>
+    /// Set TestProperty's value to the specified value T.
+    /// </summary>
+    public void SetPropertyValue<T>(TestProperty property, LazyPropertyValue<T> value, CultureInfo culture)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        ValidateArg.NotNull(culture, nameof(culture));
+        object? objValue = ConvertPropertyFrom<T>(property, culture, value);
+
+        ProtectedSetPropertyValue(property, objValue);
+    }
 
-        /// <summary>
-        /// Returns property value of the specify TestProperty
-        /// </summary>
-        /// <typeparam name="T">Property value type</typeparam>
-        /// <param name="property">TestObject's TestProperty</param>
-        /// <param name="defaultValue">default property value if property is not present</param>
-        /// <returns>property value</returns>
-        public T GetPropertyValue<T>(TestProperty property, T defaultValue)
+    /// <summary>
+    /// Return TestProperty's value
+    /// </summary>
+    /// <returns></returns>
+    [return: NotNullIfNotNull("defaultValue")]
+    protected virtual object? ProtectedGetPropertyValue(TestProperty property, object? defaultValue)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        if (!_store.TryGetValue(property, out var value) || value == null)
         {
-            return this.GetPropertyValue<T>(property, defaultValue, CultureInfo.InvariantCulture);
+            value = defaultValue;
         }
 
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        /// <typeparam name="T">Property value type</typeparam>
-        /// <param name="property">TestObject's TestProperty</param>
-        /// <param name="value">value to be set</param>
-        public void SetPropertyValue<T>(TestProperty property, T value)
+        return value;
+    }
+
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    protected virtual void ProtectedSetPropertyValue(TestProperty property, object? value)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        _store[property] = property.ValidateValueCallback == null || property.ValidateValueCallback(value)
+            ? value
+            : throw new ArgumentException(property.Label);
+    }
+
+    /// <summary>
+    /// Convert passed in value from TestProperty's specified value type.
+    /// </summary>
+    /// <returns>Converted object</returns>
+    private static object? ConvertPropertyFrom<T>(TestProperty property, CultureInfo culture, object? value)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        ValidateArg.NotNull(culture, nameof(culture));
+        var valueType = property.GetValueType();
+
+        // Do not try conversion if the object is already of the type we're trying to convert.
+        // Note that typeof(T) may be object in case the value is getting deserialized via the StoreKvpList, however
+        // the de-serializer could have converted it already, hence the runtime type check.
+        if (valueType != null && (valueType.IsAssignableFrom(typeof(T)) || valueType.IsAssignableFrom(value?.GetType())))
         {
-            this.SetPropertyValue<T>(property, value, CultureInfo.InvariantCulture);
+            return value;
         }
 
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        /// <typeparam name="T">Property value type</typeparam>
-        /// <param name="property">TestObject's TestProperty</param>
-        /// <param name="value">value to be set</param>
-        public void SetPropertyValue<T>(TestProperty property, LazyPropertyValue<T> value)
+        // Traits are KeyValuePair based. Use the custom converter in that case.
+        if (valueType == typeof(KeyValuePair<string, string>[]))
         {
-            this.SetPropertyValue<T>(property, value, CultureInfo.InvariantCulture);
+            return KeyValueConverter.ConvertFrom(null, culture, (string?)value);
         }
 
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        /// <param name="property">TestObject's TestProperty</param>
-        /// <param name="value">value to be set</param>
-        public void SetPropertyValue(TestProperty property, object value)
+        // Use a custom string array converter for string[] types.
+        if (valueType == typeof(string[]))
         {
-            this.ProtectedSetPropertyValue(property, value);
+            return StringArrayConverter.ConvertFrom(null, culture, (string?)value);
         }
 
-        /// <summary>
-        ///  Remove test property from the current TestObject.
-        /// </summary>
-        /// <param name="property"></param>
-        public void RemovePropertyValue(TestProperty property)
+        TPDebug.Assert(valueType is not null, "valueType is null");
+        TypeConverter converter = TypeDescriptor.GetConverter(valueType);
+        if (converter == null)
         {
-            ValidateArg.NotNull(property, nameof(property));
-
-            if (this.store.TryGetValue(property, out var value))
-            {
-                this.store.Remove(property);
-            }
+            throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ConverterNotSupported, valueType.Name));
         }
 
-        /// <summary>
-        /// Returns TestProperty's value
-        /// </summary>
-        /// <returns>property's value. default value is returned if the property is not present</returns>
-        public T GetPropertyValue<T>(TestProperty property, T defaultValue, CultureInfo culture)
+        try
         {
-            ValidateArg.NotNull(property, nameof(property));
-            ValidateArg.NotNull(culture, nameof(culture));
-
-            object objValue = this.ProtectedGetPropertyValue(property, defaultValue);
-
-            return ConvertPropertyTo<T>(property, culture, objValue);
+            return converter.ConvertFrom(null, culture, value!);
         }
-
-        /// <summary>
-        /// Set TestProperty's value to the specified value T.
-        /// </summary>
-        public void SetPropertyValue<T>(TestProperty property, T value, CultureInfo culture)
+        catch (FormatException)
         {
-            ValidateArg.NotNull(property, nameof(property));
-            ValidateArg.NotNull(culture, nameof(culture));
-
-            object objValue = ConvertPropertyFrom<T>(property, culture, value);
-
-            this.ProtectedSetPropertyValue(property, objValue);
+            throw;
         }
-
-        /// <summary>
-        /// Set TestProperty's value to the specified value T.
-        /// </summary>
-        public void SetPropertyValue<T>(TestProperty property, LazyPropertyValue<T> value, CultureInfo culture)
+        catch (Exception e)
         {
-            ValidateArg.NotNull(property, nameof(property));
-            ValidateArg.NotNull(culture, nameof(culture));
-
-            object objValue = ConvertPropertyFrom<T>(property, culture, value);
-
-            this.ProtectedSetPropertyValue(property, objValue);
+            // some type converters throw strange exceptions (e.g.: System.Exception by Int32Converter)
+            throw new FormatException(e.Message, e);
         }
+    }
 
-        #endregion Property Values
-
-        #region Helpers
+    /// <summary>
+    /// Convert passed in value into the specified type when property is registered.
+    /// </summary>
+    /// <returns>Converted object</returns>
+    [return: NotNullIfNotNull("value")]
+    private static T? ConvertPropertyTo<T>(TestProperty property, CultureInfo culture, object? value)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        ValidateArg.NotNull(culture, nameof(culture));
 
-        /// <summary>
-        /// Return TestProperty's value
-        /// </summary>
-        /// <returns></returns>
-        protected virtual object ProtectedGetPropertyValue(TestProperty property, object defaultValue)
+        if (value == null)
         {
-            ValidateArg.NotNull(property, nameof(property));
-
-            if (!this.store.TryGetValue(property, out var value))
-            {
-                value = defaultValue;
-            }
-
-            return value;
+            return default;
         }
-
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        protected virtual void ProtectedSetPropertyValue(TestProperty property, object value)
+        else if (value is T t)
         {
-            ValidateArg.NotNull(property, nameof(property));
-
-            if (property.ValidateValueCallback == null || property.ValidateValueCallback(value))
-            {
-                this.store[property] = value;
-            }
-            else
-            {
-                throw new ArgumentException(property.Label);
-            }
+            return t;
         }
-
-        /// <summary>
-        /// Convert passed in value from TestProperty's specified value type.
-        /// </summary>
-        /// <returns>Converted object</returns>
-        private static object ConvertPropertyFrom<T>(TestProperty property, CultureInfo culture, object value)
+        else if (value is LazyPropertyValue<T> lazyValue)
         {
-            ValidateArg.NotNull(property, nameof(property));
-            ValidateArg.NotNull(culture, nameof(culture));
-
-            var valueType = property.GetValueType();
+            return lazyValue.Value!;
+        }
 
-            // Do not try conversion if the object is already of the type we're trying to convert.
-            // Note that typeof(T) may be object in case the value is getting deserialized via the StoreKvpList, however
-            // the de-serializer could have converted it already, hence the runtime type check.
-            if (valueType != null && (valueType.GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo()) || valueType.GetTypeInfo().IsAssignableFrom(value?.GetType().GetTypeInfo())))
-            {
-                return value;
-            }
+        var valueType = property.GetValueType();
 
-            // Traits are KeyValuePair based. Use the custom converter in that case.
-            if (valueType == typeof(KeyValuePair<string, string>[]))
-            {
-                return keyValueConverter.ConvertFrom(null, culture, (string)value);
-            }
+        TypeConverter converter = TypeDescriptor.GetConverter(valueType);
 
-            // Use a custom string array converter for string[] types.
-            if (valueType == typeof(string[]))
-            {
-                return stringArrayConverter.ConvertFrom(null, culture, (string)value);
-            }
-
-            TypeConverter converter = TypeDescriptor.GetConverter(valueType);
-            if (converter == null)
-            {
-                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ConverterNotSupported, valueType.Name));
-            }
-
-            try
-            {
-                return converter.ConvertFrom(null, culture, value);
-            }
-            catch (FormatException)
-            {
-                throw;
-            }
-            catch (Exception e)
-            {
-                // some type converters throw strange exceptions (e.g.: System.Exception by Int32Converter)
-                throw new FormatException(e.Message, e);
-            }
+        if (converter == null)
+        {
+            throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ConverterNotSupported, valueType.Name));
         }
 
-        /// <summary>
-        /// Convert passed in value into the specified type when property is registered.
-        /// </summary>
-        /// <returns>Converted object</returns>
-        private static T ConvertPropertyTo<T>(TestProperty property, CultureInfo culture, object value)
+        try
         {
-            ValidateArg.NotNull(property, nameof(property));
-            ValidateArg.NotNull(culture, nameof(culture));
-
-
-            if (value == null)
-            {
-                return default;
-            }
-            else if (value is T t)
-            {
-                return t;
-            }
-            else if (value is LazyPropertyValue<T> lazyValue)
-            {
-                return lazyValue.Value;
-            }
-
-            var valueType = property.GetValueType();
-
-            TypeConverter converter = TypeDescriptor.GetConverter(valueType);
-
-            if (converter == null)
-            {
-                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.ConverterNotSupported, valueType.Name));
-            }
-
-            try
-            {
-                return (T)converter.ConvertTo(null, culture, value, typeof(T));
-            }
-            catch (FormatException)
-            {
-                throw;
-            }
-            catch (Exception e)
-            {
-                // some type converters throw strange exceptions (e.g.: System.Exception by Int32Converter)
-                throw new FormatException(e.Message, e);
-            }
+            return (T?)converter.ConvertTo(null, culture, value, typeof(T))!;
         }
+        catch (FormatException)
+        {
+            throw;
+        }
+        catch (Exception e)
+        {
+            // some type converters throw strange exceptions (e.g.: System.Exception by Int32Converter)
+            throw new FormatException(e.Message, e);
+        }
+    }
 
-        #endregion Helpers
-
-        private TraitCollection traits;
+    private TraitCollection? _traits;
 
-        public TraitCollection Traits
+    public TraitCollection Traits
+    {
+        get
         {
-            get
-            {
-                if (this.traits == null)
-                {
-                    this.traits = new TraitCollection(this);
-                }
+            _traits ??= new TraitCollection(this);
 
-                return this.traits;
-            }
+            return _traits;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestOutcome.cs b/src/Microsoft.TestPlatform.ObjectModel/TestOutcome.cs
index d77e505c50..9d4e924c4c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestOutcome.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestOutcome.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Represents the outcomes of a test case.
+/// </summary>
+public enum TestOutcome
 {
     /// <summary>
-    /// Represents the outcomes of a test case.
+    /// Test Case Does Not Have an outcome.
     /// </summary>
-    public enum TestOutcome
-    {
-        /// <summary>
-        /// Test Case Does Not Have an outcome.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// Test Case Passed
-        /// </summary>
-        Passed = 1,
+    /// <summary>
+    /// Test Case Passed
+    /// </summary>
+    Passed = 1,
 
-        /// <summary>
-        /// Test Case Failed
-        /// </summary>
-        Failed = 2,
+    /// <summary>
+    /// Test Case Failed
+    /// </summary>
+    Failed = 2,
 
-        /// <summary>
-        /// Test Case Skipped
-        /// </summary>
-        Skipped = 3,
+    /// <summary>
+    /// Test Case Skipped
+    /// </summary>
+    Skipped = 3,
 
-        /// <summary>
-        /// Test Case Not found
-        /// </summary>
-        NotFound = 4,
-    }
+    /// <summary>
+    /// Test Case Not found
+    /// </summary>
+    NotFound = 4,
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestOutcomeHelper.cs b/src/Microsoft.TestPlatform.ObjectModel/TestOutcomeHelper.cs
index 65e5fec5e5..680499b897 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestOutcomeHelper.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestOutcomeHelper.cs
@@ -1,46 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// Helper methods for working with the TestOutcome enum.
+/// </summary>
+public static class TestOutcomeHelper
+{
     /// <summary>
-    /// Helper methods for working with the TestOutcome enum.
+    /// Converts the outcome into its localized string representation.
     /// </summary>
-    public static class TestOutcomeHelper
+    /// <param name="outcome">The outcome to get the string for.</param>
+    /// <returns>The localized outcome string.</returns>
+    public static string GetOutcomeString(TestOutcome outcome)
     {
-        /// <summary>
-        /// Converts the outcome into its localized string representation.
-        /// </summary>
-        /// <param name="outcome">The outcome to get the string for.</param>
-        /// <returns>The localized outcome string.</returns>
-        public static string GetOutcomeString(TestOutcome outcome)
+        string result = outcome switch
         {
-            string result = null;
-
-            switch (outcome)
-            {
-                case TestOutcome.None:
-                    result = Resources.Resources.TestOutcomeNone;
-                    break;
-                case TestOutcome.Passed:
-                    result = Resources.Resources.TestOutcomePassed;
-                    break;
-                case TestOutcome.Failed:
-                    result = Resources.Resources.TestOutcomeFailed;
-                    break;
-                case TestOutcome.Skipped:
-                    result = Resources.Resources.TestOutcomeSkipped;
-                    break;
-                case TestOutcome.NotFound:
-                    result = Resources.Resources.TestOutcomeNotFound;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(outcome));
-            }
-
-            return result;
-        }
+            TestOutcome.None => Resources.Resources.TestOutcomeNone,
+            TestOutcome.Passed => Resources.Resources.TestOutcomePassed,
+            TestOutcome.Failed => Resources.Resources.TestOutcomeFailed,
+            TestOutcome.Skipped => Resources.Resources.TestOutcomeSkipped,
+            TestOutcome.NotFound => Resources.Resources.TestOutcomeNotFound,
+            _ => throw new ArgumentOutOfRangeException(nameof(outcome)),
+        };
+        return result;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProcessAttachDebuggerPayload.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProcessAttachDebuggerPayload.cs
index 371a0dd65f..b820302fb5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProcessAttachDebuggerPayload.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProcessAttachDebuggerPayload.cs
@@ -1,29 +1,50 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// The test process info payload.
+/// </summary>
+[DataContract]
+public class TestProcessAttachDebuggerPayload
+{
     /// <summary>
-    /// The test process info payload.
+    /// Creates a new instance of this class.
     /// </summary>
-    [DataContract]
-    public class TestProcessAttachDebuggerPayload
+    /// <param name="pid">The process id the debugger should attach to.</param>
+    public TestProcessAttachDebuggerPayload(int pid)
     {
-        /// <summary>
-        /// Creates a new instance of this class.
-        /// </summary>
-        /// <param name="pid">The process id the debugger should attach to.</param>
-        public TestProcessAttachDebuggerPayload(int pid)
-        {
-            this.ProcessID = pid;
-        }
-
-        /// <summary>
-        /// The process id the debugger should attach to.
-        /// </summary>
-        [DataMember]
-        public int ProcessID { get; set; }
+        ProcessID = pid;
     }
+
+    /// <summary>
+    /// The process id the debugger should attach to.
+    /// </summary>
+    [DataMember]
+    public int ProcessID { get; set; }
+
+    [DataMember]
+    // Added in version 7.
+    public string? TargetFramework { get; set; }
+}
+
+[DataContract]
+// Added in version 7.
+public class EditorAttachDebuggerPayload
+{
+    /// <summary>
+    /// The process id the debugger should attach to.
+    /// </summary>
+    [DataMember]
+    public int ProcessID { get; set; }
+
+    [DataMember]
+    public string? TargetFramework { get; set; }
+
+    [DataMember]
+    public ICollection<string>? Sources { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProcessStartInfo.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProcessStartInfo.cs
index 64f5861df3..0260e63194 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProcessStartInfo.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProcessStartInfo.cs
@@ -1,46 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+/// <summary>
+/// The start info of the test runner
+/// </summary>
+[DataContract]
+public class TestProcessStartInfo
+{
     /// <summary>
-    /// The start info of the test runner
+    /// The name of the test runner exe
     /// </summary>
-    [DataContract]
-    public class TestProcessStartInfo
-    {
-        /// <summary>
-        /// The name of the test runner exe
-        /// </summary>
-        [DataMember]
-        public string FileName { get; set; }
+    [DataMember]
+    public string? FileName { get; set; }
 
-        /// <summary>
-        /// The arguments for the test runner
-        /// </summary>
-        [DataMember]
-        public string Arguments { get; set; }
+    /// <summary>
+    /// The arguments for the test runner
+    /// </summary>
+    [DataMember]
+    public string? Arguments { get; set; }
 
-        /// <summary>
-        /// The working directory for the test runner
-        /// </summary>
-        [DataMember]
-        public string WorkingDirectory { get; set; }
+    /// <summary>
+    /// The working directory for the test runner
+    /// </summary>
+    [DataMember]
+    public string? WorkingDirectory { get; set; }
 
-        /// <summary>
-        /// The associated environment variables
-        /// </summary>
-        [DataMember]
-        public IDictionary<string, string> EnvironmentVariables { get; set; }
+    /// <summary>
+    /// The associated environment variables
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, string?>? EnvironmentVariables { get; set; }
 
-        /// <summary>
-        /// Any additional custom properties that might be required for the launch
-        /// For example - emulator ID, remote machine details etc.
-        /// </summary>
-        [DataMember]
-        public IDictionary<string, string> CustomProperties { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Any additional custom properties that might be required for the launch
+    /// For example - emulator ID, remote machine details etc.
+    /// </summary>
+    [DataMember]
+    public IDictionary<string, string>? CustomProperties { get; set; }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs
index 6183496e9e..75f4742a45 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomKeyValueConverter.cs
@@ -1,67 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Runtime.Serialization.Json;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Converts a json representation of <see cref="KeyValuePair{String,String}"/> to an object.
+/// </summary>
+internal class CustomKeyValueConverter : TypeConverter
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
+    private readonly DataContractJsonSerializer _serializer = new(typeof(TraitObject[]));
 
-    /// <summary>
-    /// Converts a json representation of <see cref="KeyValuePair{String,String}"/> to an object.
-    /// </summary>
-    internal class CustomKeyValueConverter : TypeConverter
+    /// <inheritdoc/>
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
     {
-        /// <inheritdoc/>
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return sourceType == typeof(string);
-        }
-
-        /// <inheritdoc/>
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            var keyValuePairs = value as KeyValuePair<string, string>[];
-            if (keyValuePairs != null)
-            {
-                return keyValuePairs;
-            }
+        return sourceType == typeof(string);
+    }
 
-            return base.ConvertTo(context, culture, value, destinationType);
-        }
+    /// <inheritdoc/>
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+    {
+        return value is KeyValuePair<string, string>[] keyValuePairs
+            ? keyValuePairs
+            : base.ConvertTo(context, culture, value, destinationType);
+    }
 
-        /// <inheritdoc/>
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+    /// <inheritdoc/>
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object? value)
+    {
+        // KeyValuePairs are used for traits.
+        if (value is string data)
         {
-            // KeyValuePairs are used for traits. 
-            var data = value as string;
-            if (data != null)
-            {
-                using (var stream = new MemoryStream(Encoding.Unicode.GetBytes(data)))
-                {
-                    // Converting Json data to array of KeyValuePairs with duplicate keys.
-                    var serializer = new System.Runtime.Serialization.Json.DataContractJsonSerializer(typeof(TraitObject[]));
-                    var listOfTraitObjects = serializer.ReadObject(stream) as TraitObject[];
-
-                    return listOfTraitObjects.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToArray();
-                }
-            }
+            // PERF: The values returned here can possibly be cached, but the benefits are very small speed wise,
+            // and it is unclear how many distinct objects we get, and how much memory this would consume. I was seeing around 100ms improvement on 10k tests.
 
-            return null;
+            using var stream = new MemoryStream(Encoding.Unicode.GetBytes(data));
+            // Converting Json data to array of KeyValuePairs with duplicate keys.
+            var listOfTraitObjects = _serializer.ReadObject(stream) as TraitObject[];
+            return listOfTraitObjects?.Select(trait => new KeyValuePair<string?, string?>(trait.Key, trait.Value)).ToArray() ?? [];
         }
 
-        [System.Runtime.Serialization.DataContract]
-        private class TraitObject
-        {
-            [System.Runtime.Serialization.DataMember(Name = "Key")]
-            public string Key { get; set; }
+        return null;
+    }
 
-            [System.Runtime.Serialization.DataMember(Name = "Value")]
-            public string Value { get; set; }
-        }
+    [System.Runtime.Serialization.DataContract]
+    private class TraitObject
+    {
+        [System.Runtime.Serialization.DataMember(Name = "Key")]
+        public string? Key { get; set; }
+
+        [System.Runtime.Serialization.DataMember(Name = "Value")]
+        public string? Value { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs
index 254562555a..423d46efd4 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/CustomStringArrayConverter.cs
@@ -1,51 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization.Json;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+internal class CustomStringArrayConverter : TypeConverter
 {
-    using System;
-    using System.ComponentModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
+    private readonly DataContractJsonSerializer _serializer = new(typeof(string[]));
 
-    internal class CustomStringArrayConverter : TypeConverter
+    /// <inheritdoc/>
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
     {
-        /// <inheritdoc/>
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return sourceType == typeof(string);
-        }
+        return sourceType == typeof(string);
+    }
 
-        /// <inheritdoc/>
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-        {
-            var strings = value as string[];
-            if (strings != null)
-            {
-                return strings;
-            }
+    /// <inheritdoc/>
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+    {
+        return value is string[] strings ? strings : base.ConvertTo(context, culture, value, destinationType);
+    }
 
-            return base.ConvertTo(context, culture, value, destinationType);
-        }
+    /// <inheritdoc/>
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object? value)
+    {
+        // PERF: The strings returned here can possibly be cached, but the benefits are not huge speed wise,
+        // and it is unclear how many distinct strings we get, and how much memory this would consume. I was seeing around 200ms improvement on 10k tests.
 
-        /// <inheritdoc/>
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        // String[] are used by adapters. E.g. TestCategory[]
+        if (value is string data)
         {
-            // String[] are used by adapters. E.g. TestCategory[]
-            var data = value as string;
-            if (data != null)
-            {
-                using (var stream = new MemoryStream(Encoding.Unicode.GetBytes(data)))
-                {
-                    var serializer = new System.Runtime.Serialization.Json.DataContractJsonSerializer(typeof(string[]));
-                    var strings = serializer.ReadObject(stream) as string[];
-
-                    return strings;
-                }
-            }
-
-            return null;
+            using var stream = new MemoryStream(Encoding.Unicode.GetBytes(data));
+            var strings = _serializer.ReadObject(stream) as string[];
+            return strings;
         }
+
+        return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestProperty.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestProperty.cs
index fcdcf8ecd5..911901b439 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestProperty.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestProperty.cs
@@ -1,404 +1,391 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Reflection;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Runtime.Serialization;
 
-    public delegate bool ValidateValueCallback(object value);
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    [DataContract]
-    public class TestProperty : IEquatable<TestProperty>
-    {
-        #region Fields
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        private Type valueType;
+public delegate bool ValidateValueCallback(object? value);
 
-        #endregion Fields
+[DataContract]
+public class TestProperty : IEquatable<TestProperty>
+{
+    private static readonly ConcurrentDictionary<string, Type> TypeCache = new();
 
-        #region Constructors
+    private static bool DisableFastJson { get; set; } = FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_FASTER_JSON_SERIALIZATION);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestProperty"/> class.
-        /// </summary>
-        private TestProperty()
-        {
-            // Default constructor for Serialization.
-        }
+    private Type _valueType;
 
-        private TestProperty(string id, string label, string category, string description, Type valueType, ValidateValueCallback validateValueCallback, TestPropertyAttributes attributes)
-        {
-            ValidateArg.NotNullOrEmpty(id, nameof(id));
-            ValidateArg.NotNull(label, nameof(label));
-            ValidateArg.NotNull(category, nameof(category));
-            ValidateArg.NotNull(description, nameof(description));
-            ValidateArg.NotNull(valueType, nameof(valueType));
-
-            // If the type of property is unexpected, then fail as otherwise we will not be to serialize it over the wcf channel and serialize it in db.
-            if (valueType == typeof(KeyValuePair<string, string>[]))
-            {
-                this.ValueType = "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]";
-            }
-            else if (valueType == typeof(string)
-                || valueType == typeof(Uri)
-                || valueType == typeof(string[])
-                || valueType.AssemblyQualifiedName.Contains("System.Private")
-                || valueType.AssemblyQualifiedName.Contains("mscorlib"))
-            {
-                // This comparison is a check to ensure assembly information is not embedded in data.
-                // Use type.FullName instead of type.AssemblyQualifiedName since the internal assemblies
-                // are different in desktop and coreclr. Thus AQN in coreclr includes System.Private.CoreLib which
-                // is not available on the desktop.
-                // Note that this doesn't handle generic types. Such types will fail during serialization.
-                this.ValueType = valueType.FullName;
-            }
-            else if (valueType.GetTypeInfo().IsValueType)
-            {
-                // In case of custom types, let the assembly qualified name be available to help
-                // deserialization on the client.
-                this.ValueType = valueType.AssemblyQualifiedName;
-            }
-            else
-            {
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.UnexpectedTypeOfProperty, valueType, id));
-            }
+    //public static Stopwatch
 
-            this.Id = id;
-            this.Label = label;
-            this.Category = category;
-            this.Description = description;
-            this.ValidateValueCallback = validateValueCallback;
-            this.Attributes = attributes;
-            this.valueType = valueType;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestProperty"/> class.
+    /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    private TestProperty()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    {
+        // Default constructor for Serialization.
+    }
 
-        #endregion Constructors
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the Id for the property.
-        /// </summary>
-        [DataMember]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets a label for the property.
-        /// </summary>
-        [DataMember]
-        public string Label { get; set; }
-
-        /// <summary>
-        /// Gets or sets a category for the property.
-        /// </summary>
-        [DataMember]
-        public string Category { get; set; }
-
-        /// <summary>
-        /// Gets or sets a description for the property.
-        /// </summary>
-        [DataMember]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Gets the callback for validation of property value.
-        /// </summary>
-        /// <remarks>This property is not required at the client side.</remarks>
-        [IgnoreDataMember]
-        public ValidateValueCallback ValidateValueCallback { get; }
-
-        /// <summary>
-        /// Gets or sets the attributes for this property.
-        /// </summary>
-        [DataMember]
-        public TestPropertyAttributes Attributes { get; set; }
-
-        /// <summary>
-        /// Gets or sets a string representation of the type for value.
-        /// </summary>
-        [DataMember]
-        public string ValueType { get; set; }
-
-        #endregion Properties
-
-        #region IEquatable
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
+    private TestProperty(string id, string label, string category, string description, Type valueType, ValidateValueCallback? validateValueCallback, TestPropertyAttributes attributes)
+    {
+        ValidateArg.NotNullOrEmpty(id, nameof(id));
+        ValidateArg.NotNull(label, nameof(label));
+        ValidateArg.NotNull(category, nameof(category));
+        ValidateArg.NotNull(description, nameof(description));
+        ValidateArg.NotNull(valueType, nameof(valueType));
+
+        // If the type of property is unexpected, then fail as otherwise we will not be to serialize it over the wcf channel and serialize it in db.
+        if (valueType == typeof(KeyValuePair<string, string>[]))
         {
-            return this.Id.GetHashCode();
+            ValueType = "System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]";
         }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
+        else if (valueType == typeof(string)
+                 || valueType == typeof(Uri)
+                 || valueType == typeof(string[])
+                 || valueType.AssemblyQualifiedName!.Contains("System.Private")
+                 || valueType.AssemblyQualifiedName.Contains("mscorlib"))
         {
-            return base.Equals(obj as TestProperty);
+            // This comparison is a check to ensure assembly information is not embedded in data.
+            // Use type.FullName instead of type.AssemblyQualifiedName since the internal assemblies
+            // are different in desktop and coreclr. Thus AQN in coreclr includes System.Private.CoreLib which
+            // is not available on the desktop.
+            // Note that this doesn't handle generic types. Such types will fail during serialization.
+            ValueType = valueType.FullName!;
         }
-
-        /// <inheritdoc/>
-        public bool Equals(TestProperty other)
+        else if (valueType.IsValueType)
+        {
+            // In case of custom types, let the assembly qualified name be available to help
+            // deserialization on the client.
+            ValueType = valueType.AssemblyQualifiedName;
+        }
+        else
         {
-            return (other != null) && (this.Id == other.Id);
+            throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.UnexpectedTypeOfProperty, valueType, id));
         }
 
-        #endregion IEquatable
+        Id = id;
+        Label = label;
+        Category = category;
+        Description = description;
+        ValidateValueCallback = validateValueCallback;
+        Attributes = attributes;
+        _valueType = valueType;
+    }
 
-        #region Methods
+    /// <summary>
+    /// Gets or sets the Id for the property.
+    /// </summary>
+    [DataMember]
+    public string Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets a label for the property.
+    /// </summary>
+    [DataMember]
+    public string Label { get; set; }
+
+    /// <summary>
+    /// Gets or sets a category for the property.
+    /// </summary>
+    [DataMember]
+    public string Category { get; set; }
+
+    /// <summary>
+    /// Gets or sets a description for the property.
+    /// </summary>
+    [DataMember]
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Gets the callback for validation of property value.
+    /// </summary>
+    /// <remarks>This property is not required at the client side.</remarks>
+    [IgnoreDataMember]
+    public ValidateValueCallback? ValidateValueCallback { get; }
+
+    /// <summary>
+    /// Gets or sets the attributes for this property.
+    /// </summary>
+    [DataMember]
+    public TestPropertyAttributes Attributes { get; set; }
+
+    /// <summary>
+    /// Gets or sets a string representation of the type for value.
+    /// </summary>
+    [DataMember]
+    public string ValueType { get; set; }
+
+    #region IEquatable
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
 
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return this.Id;
-        }
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        return base.Equals(obj as TestProperty);
+    }
 
-        /// <summary>
-        /// Gets the valueType.
-        /// </summary>
-        /// <remarks>Only works for the valueType that is in the currently executing assembly or in Mscorlib.dll. The default valueType is of string valueType.</remarks>
-        /// <returns>The valueType of the test property</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", Justification = "This could take a bit time, is not simple enough to be a property.")]
-        public Type GetValueType()
-        {
-            if (this.valueType == null)
-            {
-                this.valueType = this.GetType(this.ValueType);
-            }
+    /// <inheritdoc/>
+    public bool Equals(TestProperty? other)
+    {
+        return (other != null) && (Id == other.Id);
+    }
 
-            return this.valueType;
-        }
+    #endregion IEquatable
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Use this in the body in debug mode")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "We use the default type whenever exception thrown")]
-        private Type GetType(string typeName)
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return Id;
+    }
+
+    /// <summary>
+    /// Gets the valueType.
+    /// </summary>
+    /// <remarks>Only works for the valueType that is in the currently executing assembly or in Mscorlib.dll. The default valueType is of string valueType.</remarks>
+    /// <returns>The valueType of the test property</returns>
+    public Type GetValueType()
+    {
+        _valueType ??= GetType(ValueType);
+
+        return _valueType;
+    }
+
+    private Type GetType(string typeName)
+    {
+        ValidateArg.NotNull(typeName, nameof(typeName));
+
+        if (!DisableFastJson && TypeCache.TryGetValue(typeName, out var t))
         {
-            ValidateArg.NotNull(typeName, nameof(typeName));
+            return t;
+        }
 
-            Type type = null;
+        Type? type = null;
 
-            try
-            {
-                // This only works for the type is in the currently executing assembly or in Mscorlib.dll.
-                type = Type.GetType(typeName);
+        try
+        {
+            // This only works for the type is in the currently executing assembly or in Mscorlib.dll.
+            type = Type.GetType(typeName);
 
-                if (type == null)
+            if (!DisableFastJson)
+            {
+                if (type != null)
                 {
-                    type = Type.GetType(typeName.Replace("Version=4.0.0.0", "Version=2.0.0.0")); // Try 2.0 version as discovery returns version of 4.0 for all cases
+                    TypeCache.TryAdd(typeName, type);
+                    return type;
                 }
+            }
 
-                // For UAP the type namespace for System.Uri,System.TimeSpan and System.DateTimeOffset differs from the desktop version.
-                if (type == null && typeName.StartsWith("System.Uri"))
-                {
-                    type = typeof(System.Uri);
-                }
-                else if (type == null && typeName.StartsWith("System.TimeSpan"))
-                {
-                    type = typeof(System.TimeSpan);
-                }
-                else if (type == null && typeName.StartsWith("System.DateTimeOffset"))
-                {
-                    type = typeof(System.DateTimeOffset);
-                }
-                else if (type == null && typeName.StartsWith("System.Int16"))
-                {
-                    // For LineNumber property - Int is required
-                    type = typeof(System.Int16);
-                }
-                else if (type == null && typeName.StartsWith("System.Int32"))
-                {
-                    type = typeof(System.Int32);
-                }
-                else if (type == null && typeName.StartsWith("System.Int64"))
-                {
-                    type = typeof(System.Int64);
-                }
+            // Try 2.0 version as discovery returns version of 4.0 for all cases
+            type ??= Type.GetType(typeName.Replace("Version=4.0.0.0", "Version=2.0.0.0"));
+
+            // For UAP the type namespace for System.Uri,System.TimeSpan and System.DateTimeOffset differs from the desktop version.
+            if (type == null && typeName.StartsWith("System.Uri"))
+            {
+                type = typeof(Uri);
+            }
+            else if (type == null && typeName.StartsWith("System.TimeSpan"))
+            {
+                type = typeof(TimeSpan);
+            }
+            else if (type == null && typeName.StartsWith("System.DateTimeOffset"))
+            {
+                type = typeof(DateTimeOffset);
+            }
+            else if (type == null && typeName.StartsWith("System.Int16"))
+            {
+                // For LineNumber property - Int is required
+                type = typeof(Int16);
             }
-            catch (Exception)
+            else if (type == null && typeName.StartsWith("System.Int32"))
             {
+                type = typeof(Int32);
+            }
+            else if (type == null && typeName.StartsWith("System.Int64"))
+            {
+                type = typeof(Int64);
+            }
+        }
+        catch (Exception)
+        {
 #if FullCLR
-                // Try to see if the typeName contains Windows Phone PKT in that case load it from
-                // desktop side
-                if (typeName.Contains(s_windowsPhonePKT))
-                {
-                    type = this.GetType(typeName.Replace(s_windowsPhonePKT, s_visualStudioPKT));
-                }
+            // Try to see if the typeName contains Windows Phone PKT in that case load it from
+            // desktop side
+            if (typeName.Contains(s_windowsPhonePKT))
+            {
+                type = GetType(typeName.Replace(s_windowsPhonePKT, s_visualStudioPKT));
+            }
 
-                if (type == null)
-                {
-                    System.Diagnostics.Debug.Fail("The test property type " + typeName + " of property " + this.id + "is not supported.");
+            if (type == null)
+            {
+                System.Diagnostics.Debug.Fail("The test property type " + typeName + " of property " + Id + "is not supported.");
 #else
-                System.Diagnostics.Debug.WriteLine("The test property type " + typeName + " of property " + this.Id + "is not supported.");
+            System.Diagnostics.Debug.WriteLine("The test property type " + typeName + " of property " + Id + "is not supported.");
 #endif
 #if FullCLR
-                }
-#endif
             }
-            finally
-            {
-                // default is of string type.
-                if (type == null)
-                {
-                    type = typeof(string);
-                }
-            }
-
-            return type;
+#endif
+        }
+        finally
+        {
+            // default is of string type.
+            type ??= typeof(string);
         }
 
-        #endregion Methods
-
-        #region Static Fields
+        if (!DisableFastJson)
+        {
+            TypeCache.TryAdd(typeName, type);
+        }
+        return type;
+    }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies")]
-        private static Dictionary<string, KeyValuePair<TestProperty, HashSet<Type>>> s_properties = new Dictionary<string, KeyValuePair<TestProperty, HashSet<Type>>>();
+    private static readonly Dictionary<string, KeyValuePair<TestProperty, HashSet<Type>>> Properties = new();
 
 #if FullCLR
-        private static string s_visualStudioPKT = "b03f5f7f11d50a3a";
-        private static string s_windowsPhonePKT = "7cec85d7bea7798e";
+    private static string s_visualStudioPKT = "b03f5f7f11d50a3a";
+    private static string s_windowsPhonePKT = "7cec85d7bea7798e";
 #endif
 
-        #endregion Static Fields
-
-        #region Static Methods
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies")]
-        public static void ClearRegisteredProperties()
+    public static void ClearRegisteredProperties()
+    {
+        lock (Properties)
         {
-            lock (s_properties)
-            {
-                s_properties.Clear();
-            }
+            Properties.Clear();
         }
+    }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies")]
-        public static TestProperty Find(string id)
-        {
-            ValidateArg.NotNull(id, nameof(id));
+    public static TestProperty? Find(string id)
+    {
+        ValidateArg.NotNull(id, nameof(id));
 
-            TestProperty result = null;
+        TestProperty? result = null;
 
-            lock (s_properties)
+        lock (Properties)
+        {
+            if (Properties.TryGetValue(id, out var propertyTypePair))
             {
-                if (s_properties.TryGetValue(id, out var propertyTypePair))
-                {
-                    result = propertyTypePair.Key;
-                }
+                result = propertyTypePair.Key;
             }
-
-            return result;
         }
 
-        public static TestProperty Register(string id, string label, Type valueType, Type owner)
-        {
-            ValidateArg.NotNullOrEmpty(id, nameof(id));
-            ValidateArg.NotNull(label, nameof(label));
-            ValidateArg.NotNull(valueType, nameof(valueType));
-            ValidateArg.NotNull(owner, nameof(owner));
+        return result;
+    }
 
-            return Register(id, label, string.Empty, string.Empty, valueType, null, TestPropertyAttributes.None, owner);
-        }
+    public static TestProperty Register(string id, string label, Type valueType, Type owner)
+    {
+        ValidateArg.NotNullOrEmpty(id, nameof(id));
+        ValidateArg.NotNull(label, nameof(label));
+        ValidateArg.NotNull(valueType, nameof(valueType));
+        ValidateArg.NotNull(owner, nameof(owner));
 
-        public static TestProperty Register(string id, string label, Type valueType, TestPropertyAttributes attributes, Type owner)
-        {
-            ValidateArg.NotNullOrEmpty(id, nameof(id));
-            ValidateArg.NotNull(label, nameof(label));
-            ValidateArg.NotNull(valueType, nameof(valueType));
-            ValidateArg.NotNull(owner, nameof(owner));
+        return Register(id, label, string.Empty, string.Empty, valueType, null, TestPropertyAttributes.None, owner);
+    }
 
-            return Register(id, label, string.Empty, string.Empty, valueType, null, attributes, owner);
-        }
+    public static TestProperty Register(string id, string label, Type valueType, TestPropertyAttributes attributes, Type owner)
+    {
+        ValidateArg.NotNullOrEmpty(id, nameof(id));
+        ValidateArg.NotNull(label, nameof(label));
+        ValidateArg.NotNull(valueType, nameof(valueType));
+        ValidateArg.NotNull(owner, nameof(owner));
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies")]
-        public static TestProperty Register(string id, string label, string category, string description, Type valueType, ValidateValueCallback validateValueCallback, TestPropertyAttributes attributes, Type owner)
-        {
-            ValidateArg.NotNullOrEmpty(id, nameof(id));
-            ValidateArg.NotNull(label, nameof(label));
-            ValidateArg.NotNull(category, nameof(category));
-            ValidateArg.NotNull(description, nameof(description));
-            ValidateArg.NotNull(valueType, nameof(valueType));
-            ValidateArg.NotNull(owner, nameof(owner));
+        return Register(id, label, string.Empty, string.Empty, valueType, null, attributes, owner);
+    }
+
+    public static TestProperty Register(string id, string label, string category, string description, Type valueType, ValidateValueCallback? validateValueCallback, TestPropertyAttributes attributes, Type owner)
+    {
+        ValidateArg.NotNullOrEmpty(id, nameof(id));
+        ValidateArg.NotNull(label, nameof(label));
+        ValidateArg.NotNull(category, nameof(category));
+        ValidateArg.NotNull(description, nameof(description));
+        ValidateArg.NotNull(valueType, nameof(valueType));
+        ValidateArg.NotNull(owner, nameof(owner));
 
-            TestProperty result;
+        TestProperty result;
 
-            lock (s_properties)
+        lock (Properties)
+        {
+            if (Properties.TryGetValue(id, out var propertyTypePair))
             {
-                if (s_properties.TryGetValue(id, out var propertyTypePair))
+                // verify the data valueType is valid
+                if (propertyTypePair.Key.ValueType == valueType.AssemblyQualifiedName
+                    || propertyTypePair.Key.ValueType == valueType.FullName
+                    || propertyTypePair.Key._valueType == valueType)
                 {
-                    // verify the data valueType is valid
-                    if (propertyTypePair.Key.ValueType == valueType.AssemblyQualifiedName
-                        || propertyTypePair.Key.ValueType == valueType.FullName
-                        || propertyTypePair.Key.valueType == valueType)
-                    {
-                        // add the owner to set of owners for this GraphProperty object
-                        propertyTypePair.Value.Add(owner);
-                        result = propertyTypePair.Key;
-                    }
-                    else
-                    {
-                        // not the data valueType we expect, throw an exception
-                        string message = string.Format(
-                            CultureInfo.CurrentCulture,
-                            Resources.Resources.Exception_RegisteredTestPropertyHasDifferentValueType,
-                            id,
-                            valueType.ToString(),
-                            propertyTypePair.Key.ValueType);
-
-                        throw new InvalidOperationException(message);
-                    }
+                    // add the owner to set of owners for this GraphProperty object
+                    propertyTypePair.Value.Add(owner);
+                    result = propertyTypePair.Key;
                 }
                 else
                 {
-                    // create a new TestProperty object
-                    result = new TestProperty(id, label, category, description, valueType, validateValueCallback, attributes);
-
-                    // setup the data pair used to track owners of this GraphProperty
-                    propertyTypePair = new KeyValuePair<TestProperty, HashSet<Type>>(result, new HashSet<Type>());
-                    propertyTypePair.Value.Add(owner);
-
-                    // add to the dictionary
-                    s_properties[id] = propertyTypePair;
+                    // not the data valueType we expect, throw an exception
+                    string message = string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.Exception_RegisteredTestPropertyHasDifferentValueType,
+                        id,
+                        valueType.ToString(),
+                        propertyTypePair.Key.ValueType);
+
+                    throw new InvalidOperationException(message);
                 }
             }
+            else
+            {
+                // create a new TestProperty object
+                result = new TestProperty(id, label, category, description, valueType, validateValueCallback, attributes);
 
-            return result;
-        }
-
-        public static bool TryUnregister(string id, out KeyValuePair<TestProperty, HashSet<Type>> propertyTypePair)
-        {
-            ValidateArg.NotNullOrEmpty(id, nameof(id));
+                // setup the data pair used to track owners of this GraphProperty
+                propertyTypePair = new KeyValuePair<TestProperty, HashSet<Type>>(result, new HashSet<Type>());
+                propertyTypePair.Value.Add(owner);
 
-            lock (s_properties)
-            {
-                if (s_properties.TryGetValue(id, out propertyTypePair))
-                {
-                    return s_properties.Remove(id);
-                }
+                // add to the dictionary
+                Properties[id] = propertyTypePair;
             }
-            return false;
         }
 
-        #endregion Static Methods
+        return result;
+    }
+
+    public static bool TryUnregister(string id, out KeyValuePair<TestProperty, HashSet<Type>> propertyTypePair)
+    {
+        ValidateArg.NotNullOrEmpty(id, nameof(id));
 
-        public object GetRealObject(StreamingContext context)
+        lock (Properties)
         {
-            var registeredProperty = TestProperty.Find(this.Id);
-            if (registeredProperty == null)
+            if (Properties.TryGetValue(id, out propertyTypePair))
             {
-                registeredProperty = TestProperty.Register(
-                    this.Id,
-                    this.Label,
-                    this.Category,
-                    this.Description,
-                    this.GetValueType(),
-                    this.ValidateValueCallback,
-                    this.Attributes,
-                    typeof(TestObject));
+                return Properties.Remove(id);
             }
-
-            return registeredProperty;
         }
+        return false;
+    }
+
+    [SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Part of the public API")]
+    public object GetRealObject(StreamingContext context)
+    {
+        var registeredProperty = Find(Id);
+        registeredProperty ??= Register(
+                Id,
+                Label,
+                Category,
+                Description,
+                GetValueType(),
+                ValidateValueCallback,
+                Attributes,
+                typeof(TestObject));
+
+        return registeredProperty;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestPropertyAttributes.cs b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestPropertyAttributes.cs
index 9388e922f5..c01aac3e74 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestPropertyAttributes.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestProperty/TestPropertyAttributes.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    [Flags]
-    public enum TestPropertyAttributes
-    {
-        None = 0x00, // Default
-        Hidden = 0x01,
-        Immutable = 0x02,
-        [Obsolete("Use TestObject.Traits collection to create traits")]
-        Trait = 0x04,
-    }
+[Flags]
+public enum TestPropertyAttributes
+{
+    None = 0x00, // Default
+    Hidden = 0x01,
+    Immutable = 0x02,
+    [Obsolete("Use TestObject.Traits collection to create traits")]
+    Trait = 0x04,
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestResult.cs b/src/Microsoft.TestPlatform.ObjectModel/TestResult.cs
index b01a6fb8eb..7e9c33c528 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TestResult.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestResult.cs
@@ -1,338 +1,299 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Represents the result of a test case.
+/// </summary>
+[DataContract]
+public sealed class TestResult : TestObject
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.Linq;
-    using System.Runtime.Serialization;
-    using System.Text;
-
     /// <summary>
-    /// Represents the result of a test case.
+    /// Initializes a new instance of the <see cref="TestResult"/> class.
     /// </summary>
-    [DataContract]
-    public sealed class TestResult : TestObject
+    /// <param name="testCase">The test case the result is for.</param>
+    public TestResult(TestCase testCase)
     {
-        #region Constructor
+        TestCase = testCase ?? throw new ArgumentNullException(nameof(testCase));
+        Messages = new Collection<TestResultMessage>();
+        Attachments = new Collection<AttachmentSet>();
+
+        // Default start and end time values for a test result are initialized to current time stamp
+        // to maintain compatibility.
+        StartTime = DateTimeOffset.UtcNow;
+        EndTime = DateTimeOffset.UtcNow;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResult"/> class.
-        /// </summary>
-        /// <param name="testCase">The test case the result is for.</param>
-        public TestResult(TestCase testCase)
-        {
-            this.TestCase = testCase ?? throw new ArgumentNullException(nameof(testCase));
-            this.Messages = new Collection<TestResultMessage>();
-            this.Attachments = new Collection<AttachmentSet>();
-
-            // Default start and end time values for a test result are initialized to current time stamp
-            // to maintain compatibility.
-            this.StartTime = DateTimeOffset.UtcNow;
-            this.EndTime = DateTimeOffset.UtcNow;
-        }
+    /// <summary>
+    /// Gets the test case that this result is for.
+    /// </summary>
+    [DataMember]
+    public TestCase TestCase { get; private set; }
 
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the test case that this result is for.
-        /// </summary>
-        [DataMember]
-        public TestCase TestCase { get; private set; }
-
-        /// <summary>
-        /// Gets the list of attachment sets for this TestResult.
-        /// </summary>
-        [DataMember]
-        public Collection<AttachmentSet> Attachments { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the outcome of a test case.
-        /// </summary>
-        [DataMember]
-        public TestOutcome Outcome { get; set; }
-
-        /// <summary>
-        /// Gets or sets the exception message.
-        /// </summary>
-        [DataMember]
-        public string ErrorMessage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the exception stack trace.
-        /// </summary>
-        [DataMember]
-        public string ErrorStackTrace { get; set; }
-
-        /// <summary>
-        /// Gets or sets the TestResult Display name. Used for Data Driven Test (i.e. Data Driven Test. E.g. InlineData in xUnit)
-        /// </summary>
-        [DataMember]
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets the test messages.
-        /// </summary>
-        [DataMember]
-        public Collection<TestResultMessage> Messages { get; private set; }
-
-        /// <summary>
-        /// Gets or sets test result ComputerName.
-        /// </summary>
-        [DataMember]
-        public string ComputerName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test result Duration.
-        /// </summary>
-        [DataMember]
-        public TimeSpan Duration { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test result StartTime.
-        /// </summary>
-        [DataMember]
-        public DateTimeOffset StartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets test result EndTime.
-        /// </summary>
-        [DataMember]
-        public DateTimeOffset EndTime { get; set; }
-
-        /// <summary>
-        /// Returns the TestProperties currently specified in this TestObject.
-        /// </summary>
-        public override IEnumerable<TestProperty> Properties
-        {
-            get
-            {
-                return TestResultProperties.Properties.Concat(base.Properties);
-            }
-        }
+    /// <summary>
+    /// Gets the list of attachment sets for this TestResult.
+    /// </summary>
+    [DataMember]
+    public Collection<AttachmentSet> Attachments { get; private set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the outcome of a test case.
+    /// </summary>
+    [DataMember]
+    public TestOutcome Outcome { get; set; }
 
-        #region Methods
+    /// <summary>
+    /// Gets or sets the exception message.
+    /// </summary>
+    [DataMember]
+    public string? ErrorMessage { get; set; }
 
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            StringBuilder result = new StringBuilder();
+    /// <summary>
+    /// Gets or sets the exception stack trace.
+    /// </summary>
+    [DataMember]
+    public string? ErrorStackTrace { get; set; }
 
-            // Add the outcome of the test and the name of the test.
-            result.AppendFormat(
-                CultureInfo.CurrentUICulture,
-                Resources.Resources.BasicTestResultFormat,
-                this.TestCase.DisplayName,
-                TestOutcomeHelper.GetOutcomeString(this.Outcome));
+    /// <summary>
+    /// Gets or sets the TestResult Display name. Used for Data Driven Test (i.e. Data Driven Test. E.g. InlineData in xUnit)
+    /// </summary>
+    [DataMember]
+    public string? DisplayName { get; set; }
 
-            // Add the error message and stack trace if this is a test failure.
-            if (this.Outcome == TestOutcome.Failed)
-            {
-                // Add Error message.
-                result.AppendLine();
-                result.AppendFormat(CultureInfo.CurrentUICulture, Resources.Resources.TestFailureMessageFormat, this.ErrorMessage);
+    /// <summary>
+    /// Gets the test messages.
+    /// </summary>
+    [DataMember]
+    public Collection<TestResultMessage> Messages { get; private set; }
 
-                // Add stack trace if we have one.
-                if (!string.IsNullOrWhiteSpace(this.ErrorStackTrace))
-                {
-                    result.AppendLine();
-                    result.AppendFormat(
-                        CultureInfo.CurrentUICulture,
-                        Resources.Resources.TestFailureStackTraceFormat,
-                        this.ErrorStackTrace);
-                }
-            }
+    /// <summary>
+    /// Gets or sets test result ComputerName.
+    /// </summary>
+    [DataMember]
+    public string? ComputerName { get; set; }
 
-            // Add any text messages we have.
-            if (this.Messages.Count > 0)
-            {
-                StringBuilder testMessages = new StringBuilder();
-                foreach (TestResultMessage message in this.Messages)
-                {
-                    if (!string.IsNullOrEmpty(message?.Category) && !string.IsNullOrEmpty(message.Text))
-                    {
-                        testMessages.AppendFormat(
-                            CultureInfo.CurrentUICulture,
-                            Resources.Resources.TestResultMessageFormat,
-                            message.Category,
-                            message.Text);
-                    }
-                }
+    /// <summary>
+    /// Gets or sets the test result Duration.
+    /// </summary>
+    [DataMember]
+    public TimeSpan Duration { get; set; }
 
-                result.AppendLine();
-                result.AppendFormat(
-                    CultureInfo.CurrentUICulture,
-                    Resources.Resources.TestResultTextMessagesFormat,
-                    testMessages.ToString());
-            }
+    /// <summary>
+    /// Gets or sets the test result StartTime.
+    /// </summary>
+    [DataMember]
+    public DateTimeOffset StartTime { get; set; }
 
-            return result.ToString();
+    /// <summary>
+    /// Gets or sets test result EndTime.
+    /// </summary>
+    [DataMember]
+    public DateTimeOffset EndTime { get; set; }
+
+    /// <summary>
+    /// Returns the TestProperties currently specified in this TestObject.
+    /// </summary>
+    public override IEnumerable<TestProperty> Properties
+    {
+        get
+        {
+            return TestResultProperties.Properties.Concat(base.Properties);
         }
+    }
 
-        #endregion
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        StringBuilder result = new();
 
-        #region Protected Methods
+        // Add the outcome of the test and the name of the test.
+        result.AppendFormat(
+            CultureInfo.CurrentCulture,
+            Resources.Resources.BasicTestResultFormat,
+            TestCase.DisplayName,
+            TestOutcomeHelper.GetOutcomeString(Outcome));
 
-        /// <summary>
-        /// Return TestProperty's value
-        /// </summary>
-        /// <returns></returns>
-        protected override object ProtectedGetPropertyValue(TestProperty property, object defaultValue)
+        // Add the error message and stack trace if this is a test failure.
+        if (Outcome == TestOutcome.Failed)
         {
-            ValidateArg.NotNull(property, nameof(property));
+            // Add Error message.
+            result.AppendLine();
+            result.AppendFormat(CultureInfo.CurrentCulture, Resources.Resources.TestFailureMessageFormat, ErrorMessage);
 
-            switch (property.Id)
+            // Add stack trace if we have one.
+            if (!StringUtils.IsNullOrWhiteSpace(ErrorStackTrace))
             {
-                case "TestResult.ComputerName":
-                    return this.ComputerName;
-                case "TestResult.DisplayName":
-                    return this.DisplayName;
-                case "TestResult.Duration":
-                    return this.Duration;
-                case "TestResult.EndTime":
-                    return this.EndTime;
-                case "TestResult.ErrorMessage":
-                    return this.ErrorMessage;
-                case "TestResult.ErrorStackTrace":
-                    return this.ErrorStackTrace;
-                case "TestResult.Outcome":
-                    return this.Outcome;
-                case "TestResult.StartTime":
-                    return this.StartTime;
+                result.AppendLine();
+                result.AppendFormat(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.TestFailureStackTraceFormat,
+                    ErrorStackTrace);
             }
-
-            return base.ProtectedGetPropertyValue(property, defaultValue);
         }
 
-        /// <summary>
-        /// Set TestProperty's value
-        /// </summary>
-        protected override void ProtectedSetPropertyValue(TestProperty property, object value)
+        // Add any text messages we have.
+        if (Messages.Count > 0)
         {
-            ValidateArg.NotNull(property, nameof(property));
-
-            switch (property.Id)
+            StringBuilder testMessages = new();
+            foreach (TestResultMessage message in Messages)
             {
-                case "TestResult.ComputerName":
-                    this.ComputerName = (string)value; return;
-                case "TestResult.DisplayName":
-                    this.DisplayName = (string)value; return;
-                case "TestResult.Duration":
-                    this.Duration = (TimeSpan)value; return;
-                case "TestResult.EndTime":
-                    this.EndTime = (DateTimeOffset)value; return;
-                case "TestResult.ErrorMessage":
-                    this.ErrorMessage = (string)value; return;
-                case "TestResult.ErrorStackTrace":
-                    this.ErrorStackTrace = (string)value; return;
-                case "TestResult.Outcome":
-                    this.Outcome = (TestOutcome)value; return;
-                case "TestResult.StartTime":
-                    this.StartTime = (DateTimeOffset)value; return;
+                if (!StringUtils.IsNullOrEmpty(message?.Category) && !StringUtils.IsNullOrEmpty(message.Text))
+                {
+                    testMessages.AppendFormat(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.TestResultMessageFormat,
+                        message.Category,
+                        message.Text);
+                }
             }
-            base.ProtectedSetPropertyValue(property, value);
+
+            result.AppendLine();
+            result.AppendFormat(
+                CultureInfo.CurrentCulture,
+                Resources.Resources.TestResultTextMessagesFormat,
+                testMessages.ToString());
         }
 
-        #endregion
+        return result.ToString();
     }
 
     /// <summary>
-    /// Represents the test result message.
+    /// Return TestProperty's value
     /// </summary>
-    [DataContract]
-    public class TestResultMessage
+    /// <returns></returns>
+    protected override object? ProtectedGetPropertyValue(TestProperty property, object? defaultValue)
     {
-        // Bugfix: 297759 Moving the category from the resources to the code
-        // so that it works on machines which has eng OS & non-eng VS and vice versa.
-
-        /// <summary>
-        ///     Standard Output Message Category
-        /// </summary>
-        public static readonly string StandardOutCategory = "StdOutMsgs";
-
-        /// <summary>
-        ///     Standard Error Message Category
-        /// </summary>
-        public static readonly string StandardErrorCategory = "StdErrMsgs";
-
-        /// <summary>
-        ///     Debug Trace Message Category
-        /// </summary>
-        public static readonly string DebugTraceCategory = "DbgTrcMsgs";
-
-        /// <summary>
-        ///     Additional Information Message Category
-        /// </summary>
-        public static readonly string AdditionalInfoCategory = "AdtnlInfo";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestResultMessage"/> class.
-        /// </summary>
-        /// <param name="category">Category of the message.</param>
-        /// <param name="text">Text of the message.</param>
-        public TestResultMessage(string category, string text)
-        {
-            this.Category = category;
-            this.Text = text;
-        }
-
-        /// <summary>
-        /// Gets the message category
-        /// </summary>
-        [DataMember]
-        public string Category
+        ValidateArg.NotNull(property, nameof(property));
+        return property.Id switch
         {
-            get;
-            private set;
-        }
+            "TestResult.ComputerName" => ComputerName,
+            "TestResult.DisplayName" => DisplayName,
+            "TestResult.Duration" => Duration,
+            "TestResult.EndTime" => EndTime,
+            "TestResult.ErrorMessage" => ErrorMessage,
+            "TestResult.ErrorStackTrace" => ErrorStackTrace,
+            "TestResult.Outcome" => Outcome,
+            "TestResult.StartTime" => StartTime,
+            _ => base.ProtectedGetPropertyValue(property, defaultValue),
+        };
+    }
 
-        /// <summary>
-        /// Gets the message text
-        /// </summary>
-        [DataMember]
-        public string Text
+    /// <summary>
+    /// Set TestProperty's value
+    /// </summary>
+    protected override void ProtectedSetPropertyValue(TestProperty property, object? value)
+    {
+        ValidateArg.NotNull(property, nameof(property));
+        switch (property.Id)
         {
-            get;
-            private set;
+            case "TestResult.ComputerName":
+                ComputerName = (string?)value; return;
+            case "TestResult.DisplayName":
+                DisplayName = (string?)value; return;
+            case "TestResult.Duration":
+                Duration = (TimeSpan)value!; return;
+            case "TestResult.EndTime":
+                EndTime = (DateTimeOffset)value!; return;
+            case "TestResult.ErrorMessage":
+                ErrorMessage = (string?)value; return;
+            case "TestResult.ErrorStackTrace":
+                ErrorStackTrace = (string?)value; return;
+            case "TestResult.Outcome":
+                Outcome = (TestOutcome)value!; return;
+            case "TestResult.StartTime":
+                StartTime = (DateTimeOffset)value!; return;
         }
+        base.ProtectedSetPropertyValue(property, value);
     }
 
+}
+
+/// <summary>
+/// Represents the test result message.
+/// </summary>
+[DataContract]
+public class TestResultMessage
+{
+    // Bugfix: 297759 Moving the category from the resources to the code
+    // so that it works on machines which has eng OS & non-eng VS and vice versa.
+
     /// <summary>
-    /// Well-known TestResult properties
+    ///     Standard Output Message Category
     /// </summary>
-    public static class TestResultProperties
-    {
-#if !FullCLR
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty DisplayName = TestProperty.Register("TestResult.DisplayName", "TestResult Display Name", typeof(string), TestPropertyAttributes.Hidden, typeof(TestResult));
+    public static readonly string StandardOutCategory = "StdOutMsgs";
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty ComputerName = TestProperty.Register("TestResult.ComputerName", "Computer Name", typeof(string), TestPropertyAttributes.None, typeof(TestResult));
+    /// <summary>
+    ///     Standard Error Message Category
+    /// </summary>
+    public static readonly string StandardErrorCategory = "StdErrMsgs";
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty Outcome = TestProperty.Register("TestResult.Outcome", "Outcome", string.Empty, string.Empty, typeof(TestOutcome), ValidateOutcome, TestPropertyAttributes.None, typeof(TestResult));
+    /// <summary>
+    ///     Debug Trace Message Category
+    /// </summary>
+    public static readonly string DebugTraceCategory = "DbgTrcMsgs";
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty Duration = TestProperty.Register("TestResult.Duration", "Duration", typeof(TimeSpan), typeof(TestResult));
+    /// <summary>
+    ///     Additional Information Message Category
+    /// </summary>
+    public static readonly string AdditionalInfoCategory = "AdtnlInfo";
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty StartTime = TestProperty.Register("TestResult.StartTime", "Start Time", typeof(DateTimeOffset), typeof(TestResult));
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestResultMessage"/> class.
+    /// </summary>
+    /// <param name="category">Category of the message.</param>
+    /// <param name="text">Text of the message.</param>
+    public TestResultMessage(string category, string? text)
+    {
+        Category = category;
+        Text = text;
+    }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty EndTime = TestProperty.Register("TestResult.EndTime", "End Time", typeof(DateTimeOffset), typeof(TestResult));
+    /// <summary>
+    /// Gets the message category
+    /// </summary>
+    [DataMember]
+    public string Category
+    {
+        get;
+        private set;
+    }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty ErrorMessage = TestProperty.Register("TestResult.ErrorMessage", "Error Message", typeof(string), typeof(TestResult));
+    /// <summary>
+    /// Gets the message text
+    /// </summary>
+    [DataMember]
+    public string? Text
+    {
+        get;
+        private set;
+    }
+}
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly TestProperty ErrorStackTrace = TestProperty.Register("TestResult.ErrorStackTrace", "Error Stack Trace", typeof(string), typeof(TestResult));
+/// <summary>
+/// Well-known TestResult properties
+/// </summary>
+public static class TestResultProperties
+{
+#if !FullCLR
+    public static readonly TestProperty DisplayName = TestProperty.Register("TestResult.DisplayName", "TestResult Display Name", typeof(string), TestPropertyAttributes.Hidden, typeof(TestResult));
+    public static readonly TestProperty ComputerName = TestProperty.Register("TestResult.ComputerName", "Computer Name", typeof(string), TestPropertyAttributes.None, typeof(TestResult));
+    public static readonly TestProperty Outcome = TestProperty.Register("TestResult.Outcome", "Outcome", string.Empty, string.Empty, typeof(TestOutcome), ValidateOutcome, TestPropertyAttributes.None, typeof(TestResult));
+    public static readonly TestProperty Duration = TestProperty.Register("TestResult.Duration", "Duration", typeof(TimeSpan), typeof(TestResult));
+    public static readonly TestProperty StartTime = TestProperty.Register("TestResult.StartTime", "Start Time", typeof(DateTimeOffset), typeof(TestResult));
+    public static readonly TestProperty EndTime = TestProperty.Register("TestResult.EndTime", "End Time", typeof(DateTimeOffset), typeof(TestResult));
+    public static readonly TestProperty ErrorMessage = TestProperty.Register("TestResult.ErrorMessage", "Error Message", typeof(string), typeof(TestResult));
+    public static readonly TestProperty ErrorStackTrace = TestProperty.Register("TestResult.ErrorStackTrace", "Error Stack Trace", typeof(string), typeof(TestResult));
 #else
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty DisplayName = TestProperty.Register("TestResult.DisplayName", Resources.Resources.TestResultPropertyDisplayNameLabel, typeof(string), TestPropertyAttributes.Hidden, typeof(TestResult));
@@ -358,21 +319,20 @@ public static class TestResultProperties
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
         public static readonly TestProperty ErrorStackTrace = TestProperty.Register("TestResult.ErrorStackTrace", Resources.Resources.TestResultPropertyErrorStackTraceLabel, typeof(string), typeof(TestResult));
 #endif
-        internal static TestProperty[] Properties { get; } =
-        {
-            ComputerName,
-            DisplayName,
-            Duration,
-            EndTime,
-            ErrorMessage,
-            ErrorStackTrace,
-            Outcome,
-            StartTime
-        };
-
-        private static bool ValidateOutcome(object value)
-        {
-            return (TestOutcome)value <= TestOutcome.NotFound && (TestOutcome)value >= TestOutcome.None;
-        }
+    internal static TestProperty[] Properties { get; } =
+    [
+        ComputerName,
+        DisplayName,
+        Duration,
+        EndTime,
+        ErrorMessage,
+        ErrorStackTrace,
+        Outcome,
+        StartTime
+    ];
+
+    private static bool ValidateOutcome(object? value)
+    {
+        return value is TestOutcome testOutcome && testOutcome <= TestOutcome.NotFound && testOutcome >= TestOutcome.None;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestServiceLocator.cs b/src/Microsoft.TestPlatform.ObjectModel/TestServiceLocator.cs
new file mode 100644
index 0000000000..a518e678d5
--- /dev/null
+++ b/src/Microsoft.TestPlatform.ObjectModel/TestServiceLocator.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// We don't want this in our shipped code. Build only for debug until I am able to remove it.
+#if DEBUG
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+#pragma warning disable RS0016 // Add public types and members to the declared API
+#pragma warning disable RS0037 // Enable tracking of nullability of reference types in the declared API
+
+public static class TestServiceLocator
+{
+    public static Dictionary<string, object> Instances { get; } = new Dictionary<string, object>();
+    public static List<Resolve> Resolves { get; } = new();
+
+    public static void Register<TRegistration>(string name, TRegistration instance) where TRegistration : notnull
+    {
+        Instances.Add(name, instance);
+    }
+
+    public static TRegistration? Get<TRegistration>(string name)
+    {
+        if (!Instances.TryGetValue(name, out var instance))
+        {
+            return default;
+            // TODO: Add enable flag for the whole provider to activate so I can leverage throwing in programmer tests, but not run into it in Playground, or other debug builds.
+            // throw new InvalidOperationException($"Cannot find an instance for name {name}.");
+        }
+
+        Resolves.Add(new Resolve(name, typeof(TRegistration).FullName!, Environment.StackTrace));
+        return (TRegistration)instance;
+    }
+
+    public static void Clear()
+    {
+        Instances.Clear();
+        Resolves.Clear();
+    }
+}
+
+// TODO: Make this internal, I am just trying to have easier time trying this out.
+public class Resolve
+{
+    public Resolve(string name, string type, string stackTrace)
+    {
+        Name = name;
+        Type = type;
+        StackTrace = stackTrace;
+    }
+
+    public string Name { get; }
+    public string Type { get; }
+    public string StackTrace { get; }
+}
+
+#pragma warning restore RS0037 // Enable tracking of nullability of reference types in the declared API
+#pragma warning restore RS0016 // Add public types and members to the declared API
+#endif
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Trait.cs b/src/Microsoft.TestPlatform.ObjectModel/Trait.cs
index 5d28417880..578611c814 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Trait.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Trait.cs
@@ -1,41 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-#if NETFRAMEWORK
-    using System;
-#endif
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
 
-    /// <summary>
-    /// Class that holds Trait.
-    /// A traits is Name, Value pair.
-    /// </summary>
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Class that holds Trait.
+/// A traits is Name, Value pair.
+/// </summary>
 #if NETFRAMEWORK
-    [Serializable]
+[Serializable]
 #endif
-    [DataContract]
-    public class Trait
-    {
-        [DataMember(Name = "Key")]
-        public string Name { get; set; }
-
-        [DataMember(Name = "Value")]
-        public string Value { get; set; }
+[DataContract]
+public class Trait
+{
+    [DataMember(Name = "Key")]
+    public string Name { get; set; }
 
-        internal Trait(KeyValuePair<string, string> data)
-            : this(data.Key, data.Value)
-        {
-        }
+    [DataMember(Name = "Value")]
+    public string Value { get; set; }
 
-        public Trait(string name, string value)
-        {
-            ValidateArg.NotNull(name, nameof(name));
+    internal Trait(KeyValuePair<string, string> data)
+        : this(data.Key, data.Value)
+    {
+    }
 
-            this.Name = name;
-            this.Value = value;
-        }
+    public Trait(string name, string value)
+    {
+        Name = name ?? throw new ArgumentNullException(nameof(name));
+        Value = value;
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs
index 7bd21fdcd1..1729efd4a5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs
@@ -1,103 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Class that holds collection of traits
+/// </summary>
+[Serializable]
+public class TraitCollection : IEnumerable<Trait>
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Class that holds collection of traits
-    /// </summary>
-#if NETFRAMEWORK
-    [Serializable]
-#endif
-    public class TraitCollection : IEnumerable<Trait>
-    {
-        internal const string TraitPropertyId = "TestObject.Traits";
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        private static readonly TestProperty TraitsProperty = TestProperty.Register(
-            TraitPropertyId,
-#if !NET451
-            // TODO: Fix this with proper resourcing for UWP and Win 8.1 Apps
-            // Trying to access resources will throw "MissingManifestResourceException" percolated as "TypeInitialization" exception
-            "Traits",
-#else
-            Resources.Resources.TestCasePropertyTraitsLabel,
-#endif
-            typeof(KeyValuePair<string, string>[]),
+    internal const string TraitPropertyId = "TestObject.Traits";
+    private static readonly TestProperty TraitsProperty = TestProperty.Register(
+        TraitPropertyId,
+        // REVIEW ME: We should make some test to see if that's causing any crash on WinUI/UWP
+        Resources.Resources.TestCasePropertyTraitsLabel,
+        typeof(KeyValuePair<string, string>[]),
 #pragma warning disable 618
-            TestPropertyAttributes.Hidden | TestPropertyAttributes.Trait,
+        TestPropertyAttributes.Hidden | TestPropertyAttributes.Trait,
 #pragma warning restore 618
-            typeof(TestObject));
+        typeof(TestObject));
 
-#if NETFRAMEWORK
-        [NonSerialized]
-#endif
-        private readonly TestObject testObject;
+    [NonSerialized]
+    private readonly TestObject _testObject;
 
-        internal TraitCollection(TestObject testObject)
-        {
-            ValidateArg.NotNull(testObject, nameof(testObject));
-
-            this.testObject = testObject;
-        }
-
-        public void Add(Trait trait)
-        {
-            ValidateArg.NotNull(trait, nameof(trait));
+    internal TraitCollection(TestObject testObject)
+    {
+        _testObject = testObject ?? throw new ArgumentNullException(nameof(testObject));
+    }
 
-            this.AddRange(new[] { trait });
-        }
+    public void Add(Trait trait)
+    {
+        ValidateArg.NotNull(trait, nameof(trait));
+        AddRange(new[] { trait });
+    }
 
-        public void Add(string name, string value)
-        {
-            ValidateArg.NotNull(name, nameof(name));
+    public void Add(string name, string value)
+    {
+        ValidateArg.NotNull(name, nameof(name));
+        Add(new Trait(name, value));
+    }
 
-            this.Add(new Trait(name, value));
-        }
+    public void AddRange(IEnumerable<Trait> traits)
+    {
+        ValidateArg.NotNull(traits, nameof(traits));
+        var existingTraits = GetTraits();
+        Add(existingTraits, traits);
+    }
 
-        public void AddRange(IEnumerable<Trait> traits)
-        {
-            ValidateArg.NotNull(traits, nameof(traits));
+    public IEnumerator<Trait> GetEnumerator()
+    {
+        var enumerable = GetTraits();
+        return enumerable.GetEnumerator();
+    }
 
-            var existingTraits = this.GetTraits();
-            this.Add(existingTraits, traits);
-        }
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
 
-        public IEnumerator<Trait> GetEnumerator()
+    private IEnumerable<Trait> GetTraits()
+    {
+        if (!_testObject.Properties.Contains(TraitsProperty))
         {
-            var enumerable = this.GetTraits();
-            return enumerable.GetEnumerator();
+            return Array.Empty<Trait>();
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        var traitsKvp = _testObject.GetPropertyValue(TraitsProperty, Enumerable.Empty<KeyValuePair<string, string>>().ToArray());
+        var traits = new Trait[traitsKvp.Length];
+        for (int i = 0; i < traits.Length; i++)
         {
-            return this.GetEnumerator();
+            traits[i] = new Trait(traitsKvp[i]);
         }
 
-        private IEnumerable<Trait> GetTraits()
-        {
-            if (!this.testObject.Properties.Contains(TraitsProperty))
-            {
-                yield break;
-            }
-
-            var traits = this.testObject.GetPropertyValue(TraitsProperty, Enumerable.Empty<KeyValuePair<string, string>>().ToArray());
-
-            foreach (var trait in traits)
-            {
-                yield return new Trait(trait);
-            }
-        }
+        return traits;
+    }
 
-        private void Add(IEnumerable<Trait> traits, IEnumerable<Trait> newTraits)
-        {
-            var newValue = traits.Union(newTraits);
-            var newPairs = newValue.Select(t => new KeyValuePair<string, string>(t.Name, t.Value)).ToArray();
-            this.testObject.SetPropertyValue<KeyValuePair<string, string>[]>(TraitsProperty, newPairs);
-        }
+    private void Add(IEnumerable<Trait> traits, IEnumerable<Trait> newTraits)
+    {
+        var newValue = traits.Union(newTraits);
+        var newPairs = newValue.Select(t => new KeyValuePair<string, string>(t.Name, t.Value)).ToArray();
+        _testObject.SetPropertyValue(TraitsProperty, newPairs);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/UapConstants.cs b/src/Microsoft.TestPlatform.ObjectModel/UapConstants.cs
index ab8a0bd267..2c9b2e21b2 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/UapConstants.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/UapConstants.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Defines the constants used during UWP app execution.
+/// </summary>
+public static class UapConstants
 {
     /// <summary>
-    /// Defines the constants used during UWP app execution.
+    /// The UWP PackageName after it is deployed.
     /// </summary>
-    public static class UapConstants
-    {
-        /// <summary>
-        /// The UWP PackageName after it is deployed.
-        /// </summary>
-        public static readonly string UapPackageFullName = "PackageFullName";
+    public static readonly string UapPackageFullName = "PackageFullName";
 
-        /// <summary>
-        /// The UWP Package ID after it is deployed.
-        /// </summary>
-        public static readonly string UapAppUserModeId = "AppUserModeId";
-    }
+    /// <summary>
+    /// The UWP Package ID after it is deployed.
+    /// </summary>
+    public static readonly string UapAppUserModeId = "AppUserModeId";
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs
index 080532c492..d704625aed 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs
@@ -1,172 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using System;
+using System.Collections.Generic;
+#if NETFRAMEWORK
+using System.IO;
+#endif
+using System.Linq;
+using System.Reflection;
+
+#if NETFRAMEWORK
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+#endif
 
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+/// <summary>
+/// Implementation of finding assembly references using "managed route", i.e. Assembly.Load.
+/// </summary>
+public static class AssemblyHelper
+{
+#if NETFRAMEWORK
+    private static readonly Version DefaultVersion = new();
+    private static readonly Version Version45 = new("4.5");
 
     /// <summary>
-    /// Implementation of finding assembly references using "managed route", i.e. Assembly.Load.
+    /// Checks whether the source assembly directly references given assembly or not.
+    /// Only assembly name and public key token are match. Version is ignored for matching.
+    /// Returns null if not able to check if source references assembly.
     /// </summary>
-    public static class AssemblyHelper
+    public static bool? DoesReferencesAssembly(string source, AssemblyName referenceAssembly)
     {
-#if NETFRAMEWORK
-        private static Version defaultVersion = new Version();
-        private static Version version45 = new Version("4.5");
-
-        /// <summary>
-        /// Checks whether the source assembly directly references given assembly or not.
-        /// Only assembly name and public key token are match. Version is ignored for matching.
-        /// Returns null if not able to check if source references assembly.
-        /// </summary>
-        public static bool? DoesReferencesAssembly(string source, AssemblyName referenceAssembly)
+        if (source.IsNullOrEmpty() || referenceAssembly is null)
         {
-            try
-            {
-                ValidateArg.NotNullOrEmpty(source, nameof(source));
-                ValidateArg.NotNull(referenceAssembly, nameof(referenceAssembly));
-
-                Debug.Assert(!string.IsNullOrEmpty(source));
-
-                var referenceAssemblyName = referenceAssembly.Name;
-                var referenceAssemblyPublicKeyToken = referenceAssembly.GetPublicKeyToken();
-
-                var setupInfo = new AppDomainSetup();
-                setupInfo.ApplicationBase = Path.GetDirectoryName(Path.GetFullPath(source));
-
-                // In Dev10 by devenv uses its own app domain host which has default optimization to share everything.
-                // Set LoaderOptimization to MultiDomainHost which means:
-                //   Indicates that the application will probably host unique code in multiple domains,
-                //   and the loader must share resources across application domains only for globally available (strong-named)
-                //   assemblies that have been added to the global assembly cache.
-                setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
-
-                AppDomain ad = null;
-                try
-                {
-                    ad = AppDomain.CreateDomain("Dependency finder domain", null, setupInfo);
-
-                    var assemblyLoadWorker = typeof(AssemblyLoadWorker);
-                    AssemblyLoadWorker worker = null;
-                    if (assemblyLoadWorker.Assembly.GlobalAssemblyCache)
-                    {
-                        worker = (AssemblyLoadWorker)ad.CreateInstanceAndUnwrap(
-                            assemblyLoadWorker.Assembly.FullName,
-                            assemblyLoadWorker.FullName,
-                            false, BindingFlags.Default, null,
-                            null, null, null);
-                    }
-                    else
-                    {
-                        // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
-                        worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
-                            assemblyLoadWorker.Assembly.Location,
-                            assemblyLoadWorker.FullName,
-                            false, BindingFlags.Default, null,
-                            null, null, null);
-                    }
-
-                    return worker.CheckAssemblyReference(source, referenceAssemblyName, referenceAssemblyPublicKeyToken);
-                }
-                finally
-                {
-                    if (ad != null)
-                    {
-                        AppDomain.Unload(ad);
-                    }
-                }
-            }
-            catch
-            {
-                return null; // Return null if something goes wrong.
-            }
+            return null;
         }
 
-        /// <summary>
-        /// Finds platform and .Net framework version for a given test container.
-        /// If there is an error while inferring this information, defaults (AnyCPU, None) are returned
-        /// for faulting container.
-        /// </summary>
-        /// <param name="testSource"></param>
-        /// <returns></returns>
-        public static KeyValuePair<Architecture, FrameworkVersion> GetFrameworkVersionAndArchitectureForSource(string testSource)
+        try
         {
-            ValidateArg.NotNullOrEmpty(testSource, nameof(testSource));
-
-            var sourceDirectory = Path.GetDirectoryName(testSource);
-            var setupInfo = new AppDomainSetup();
-            setupInfo.ApplicationBase = sourceDirectory;
-            setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
-            AppDomain ad = null;
-            try
-            {
-                ad = AppDomain.CreateDomain("Multiargeting settings domain", null, setupInfo);
-
-                Type assemblyLoadWorker = typeof(AssemblyLoadWorker);
-                AssemblyLoadWorker worker = null;
-
-                // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
-                worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
-                    assemblyLoadWorker.Assembly.Location,
-                    assemblyLoadWorker.FullName,
-                    false, BindingFlags.Default, null,
-                    null, null, null);
-
-                worker.GetPlatformAndFrameworkSettings(testSource, out var procArchType, out var frameworkVersion);
-
-                Architecture targetPlatform = (Architecture)Enum.Parse(typeof(Architecture), procArchType);
-                FrameworkVersion targetFramework = FrameworkVersion.Framework45;
-                switch (frameworkVersion.ToUpperInvariant())
-                {
-                    case "V4.5":
-                        targetFramework = FrameworkVersion.Framework45;
-                        break;
-
-                    case "V4.0":
-                        targetFramework = FrameworkVersion.Framework40;
-                        break;
-
-                    case "V3.5":
-                    case "V2.0":
-                        targetFramework = FrameworkVersion.Framework35;
-                        break;
-
-                    default:
-                        targetFramework = FrameworkVersion.None;
-                        break;
-                }
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("Inferred Multi-Targeting settings:{0} Platform:{1} FrameworkVersion:{2}", testSource, targetPlatform, targetFramework);
-                }
-                return new KeyValuePair<Architecture, FrameworkVersion>(targetPlatform, targetFramework);
-
-            }
-            finally
-            {
-                if (ad != null)
-                {
-                    AppDomain.Unload(ad);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the full name (AssemblyName.FullName) of the referenced assemblies by the assembly on the specified path.
-        ///
-        /// Returns null on failure and an empty array if there is no reference in the project.
-        /// </summary>
-        /// <param name="source">Full path to the assembly to get dependencies for.</param>
-        public static string[] GetReferencedAssemblies(string source)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(source));
+            var referenceAssemblyName = referenceAssembly.Name;
+            var referenceAssemblyPublicKeyToken = referenceAssembly.GetPublicKeyToken();
 
             var setupInfo = new AppDomainSetup();
             setupInfo.ApplicationBase = Path.GetDirectoryName(Path.GetFullPath(source));
@@ -178,13 +52,13 @@ public static string[] GetReferencedAssemblies(string source)
             //   assemblies that have been added to the global assembly cache.
             setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
 
-            AppDomain ad = null;
+            AppDomain? ad = null;
             try
             {
                 ad = AppDomain.CreateDomain("Dependency finder domain", null, setupInfo);
 
                 var assemblyLoadWorker = typeof(AssemblyLoadWorker);
-                AssemblyLoadWorker worker = null;
+                AssemblyLoadWorker? worker = null;
                 if (assemblyLoadWorker.Assembly.GlobalAssemblyCache)
                 {
                     worker = (AssemblyLoadWorker)ad.CreateInstanceAndUnwrap(
@@ -203,7 +77,7 @@ public static string[] GetReferencedAssemblies(string source)
                         null, null, null);
                 }
 
-                return worker.GetReferencedAssemblies(source);
+                return AssemblyLoadWorker.CheckAssemblyReference(source, referenceAssemblyName, referenceAssemblyPublicKeyToken);
             }
             finally
             {
@@ -213,145 +87,250 @@ public static string[] GetReferencedAssemblies(string source)
                 }
             }
         }
+        catch
+        {
+            return null; // Return null if something goes wrong.
+        }
+    }
 
-        /// <summary>
-        /// Set the target framework for app domain setup if target framework of dll is > 4.5
-        /// </summary>
-        /// <param name="setup">AppdomainSetup for app domain creation</param>
-        /// <param name="testSource">path of test file</param>
-        public static void SetAppDomainFrameworkVersionBasedOnTestSource(AppDomainSetup setup, string testSource)
+    /// <summary>
+    /// Finds platform and .Net framework version for a given test container.
+    /// If there is an error while inferring this information, defaults (AnyCPU, None) are returned
+    /// for faulting container.
+    /// </summary>
+    /// <param name="testSource"></param>
+    /// <returns></returns>
+    public static KeyValuePair<Architecture, FrameworkVersion> GetFrameworkVersionAndArchitectureForSource(string testSource)
+    {
+        ValidateArg.NotNullOrEmpty(testSource, nameof(testSource));
+
+        var sourceDirectory = Path.GetDirectoryName(testSource);
+        var setupInfo = new AppDomainSetup();
+        setupInfo.ApplicationBase = sourceDirectory;
+        setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
+        AppDomain? ad = null;
+        try
         {
-            string assemblyVersionString = GetTargetFrameworkVersionString(testSource);
+            ad = AppDomain.CreateDomain("Multiargeting settings domain", null, setupInfo);
 
-            if (GetTargetFrameworkVersionFromVersionString(assemblyVersionString).CompareTo(version45) > 0)
+            Type assemblyLoadWorker = typeof(AssemblyLoadWorker);
+            AssemblyLoadWorker? worker = null;
+
+            // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
+            worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
+                assemblyLoadWorker.Assembly.Location,
+                assemblyLoadWorker.FullName,
+                false, BindingFlags.Default, null,
+                null, null, null);
+
+            AssemblyLoadWorker.GetPlatformAndFrameworkSettings(testSource, out var procArchType, out var frameworkVersion);
+
+            Architecture targetPlatform = (Architecture)Enum.Parse(typeof(Architecture), procArchType);
+            var targetFramework = frameworkVersion.ToUpperInvariant() switch
             {
-                var pInfo = typeof(AppDomainSetup).GetProperty(Constants.TargetFrameworkName);
-                if (null != pInfo)
-                {
-                    pInfo.SetValue(setup, assemblyVersionString, null);
-                }
+                "V4.5" => FrameworkVersion.Framework45,
+                "V4.0" => FrameworkVersion.Framework40,
+                "V3.5" or "V2.0" => FrameworkVersion.Framework35,
+                _ => FrameworkVersion.None,
+            };
+
+            EqtTrace.Verbose("Inferred Multi-Targeting settings:{0} Platform:{1} FrameworkVersion:{2}", testSource, targetPlatform, targetFramework);
+
+            return new KeyValuePair<Architecture, FrameworkVersion>(targetPlatform, targetFramework);
+
+        }
+        finally
+        {
+            if (ad != null)
+            {
+                AppDomain.Unload(ad);
             }
         }
+    }
 
-        /// <summary>
-        /// Get the target dot net framework string for the assembly
-        /// </summary>
-        /// <param name="path">Path of the assembly file</param>
-        /// <returns>String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
-        internal static string GetTargetFrameworkVersionString(string path)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(path));
+    /// <summary>
+    /// Returns the full name (AssemblyName.FullName) of the referenced assemblies by the assembly on the specified path.
+    ///
+    /// Returns null on failure and an empty array if there is no reference in the project.
+    /// </summary>
+    /// <param name="source">Full path to the assembly to get dependencies for.</param>
+    public static string[]? GetReferencedAssemblies(string source)
+    {
+        TPDebug.Assert(!source.IsNullOrEmpty());
 
-            var setupInfo = new AppDomainSetup();
-            setupInfo.ApplicationBase = Path.GetDirectoryName(Path.GetFullPath(path));
+        var setupInfo = new AppDomainSetup();
+        setupInfo.ApplicationBase = Path.GetDirectoryName(Path.GetFullPath(source));
 
-            // In Dev10 by devenv uses its own app domain host which has default optimization to share everything.
-            // Set LoaderOptimization to MultiDomainHost which means:
-            //   Indicates that the application will probably host unique code in multiple domains,
-            //   and the loader must share resources across application domains only for globally available (strong-named)
-            //   assemblies that have been added to the global assembly cache.
-            setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
+        // In Dev10 by devenv uses its own app domain host which has default optimization to share everything.
+        // Set LoaderOptimization to MultiDomainHost which means:
+        //   Indicates that the application will probably host unique code in multiple domains,
+        //   and the loader must share resources across application domains only for globally available (strong-named)
+        //   assemblies that have been added to the global assembly cache.
+        setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
+
+        AppDomain? ad = null;
+        try
+        {
+            ad = AppDomain.CreateDomain("Dependency finder domain", null, setupInfo);
 
-            if (File.Exists(path))
+            var assemblyLoadWorker = typeof(AssemblyLoadWorker);
+            AssemblyLoadWorker? worker = null;
+            if (assemblyLoadWorker.Assembly.GlobalAssemblyCache)
             {
-                AppDomain ad = null;
-                try
-                {
-                    ad = AppDomain.CreateDomain("Framework Version String Domain", null, setupInfo);
-
-                    var assemblyLoadWorker = typeof(AssemblyLoadWorker);
-                    AssemblyLoadWorker worker = null;
-                    if (assemblyLoadWorker.Assembly.GlobalAssemblyCache)
-                    {
-                        worker = (AssemblyLoadWorker)ad.CreateInstanceAndUnwrap(
-                            assemblyLoadWorker.Assembly.FullName,
-                            assemblyLoadWorker.FullName,
-                            false, BindingFlags.Default, null,
-                            null, null, null);
-                    }
-                    else
-                    {
-                        // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
-                        worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
-                            assemblyLoadWorker.Assembly.Location,
-                            assemblyLoadWorker.FullName,
-                            false, BindingFlags.Default, null,
-                            null, null, null);
-                    }
-
-                    return worker.GetTargetFrameworkVersionStringFromPath(path);
-                }
-                finally
-                {
-                    if (ad != null)
-                    {
-                        AppDomain.Unload(ad);
-                    }
-                }
+                worker = (AssemblyLoadWorker)ad.CreateInstanceAndUnwrap(
+                    assemblyLoadWorker.Assembly.FullName,
+                    assemblyLoadWorker.FullName,
+                    false, BindingFlags.Default, null,
+                    null, null, null);
+            }
+            else
+            {
+                // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
+                worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
+                    assemblyLoadWorker.Assembly.Location,
+                    assemblyLoadWorker.FullName,
+                    false, BindingFlags.Default, null,
+                    null, null, null);
             }
 
-            return string.Empty;
+            return AssemblyLoadWorker.GetReferencedAssemblies(source);
+        }
+        finally
+        {
+            if (ad != null)
+            {
+                AppDomain.Unload(ad);
+            }
         }
+    }
+
+    /// <summary>
+    /// Set the target framework for app domain setup if target framework of dll is > 4.5
+    /// </summary>
+    /// <param name="setup">AppdomainSetup for app domain creation</param>
+    /// <param name="testSource">path of test file</param>
+    public static void SetAppDomainFrameworkVersionBasedOnTestSource(AppDomainSetup setup, string testSource)
+    {
+        string assemblyVersionString = GetTargetFrameworkVersionString(testSource);
 
-        /// <summary>
-        /// Get the Version for the target framework version string
-        /// </summary>
-        /// <param name="version">Target framework string</param>
-        /// <returns>Framework Version</returns>
-        internal static Version GetTargetFrameworkVersionFromVersionString(string version)
+        if (GetTargetFrameworkVersionFromVersionString(assemblyVersionString).CompareTo(Version45) > 0)
         {
-            if (version.Length > Constants.DotNetFrameWorkStringPrefix.Length + 1)
+            var pInfo = typeof(AppDomainSetup).GetProperty(Constants.TargetFrameworkName);
+            if (null != pInfo)
             {
-                string versionPart = version.Substring(Constants.DotNetFrameWorkStringPrefix.Length + 1);
-                return new Version(versionPart);
+                pInfo.SetValue(setup, assemblyVersionString, null);
             }
+        }
+    }
+
+    /// <summary>
+    /// Get the target dot net framework string for the assembly
+    /// </summary>
+    /// <param name="path">Path of the assembly file</param>
+    /// <returns>String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
+    internal static string GetTargetFrameworkVersionString(string path)
+    {
+        TPDebug.Assert(!path.IsNullOrEmpty());
+
+        var setupInfo = new AppDomainSetup();
+        setupInfo.ApplicationBase = Path.GetDirectoryName(Path.GetFullPath(path));
+
+        // In Dev10 by devenv uses its own app domain host which has default optimization to share everything.
+        // Set LoaderOptimization to MultiDomainHost which means:
+        //   Indicates that the application will probably host unique code in multiple domains,
+        //   and the loader must share resources across application domains only for globally available (strong-named)
+        //   assemblies that have been added to the global assembly cache.
+        setupInfo.LoaderOptimization = LoaderOptimization.MultiDomainHost;
 
-            return defaultVersion;
+        if (!File.Exists(path))
+        {
+            return string.Empty;
         }
 
-        /// <summary>
-        /// When test run is targeted for .Net4.0, set target framework of test appdomain to be v4.0.
-        /// With this done tests would be executed in 4.0 compatibility mode even when  .Net4.5 is installed.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Failure to set this property should be ignored.")]
-        internal static void SetNETFrameworkCompatiblityMode(AppDomainSetup setup, IRunContext runContext)
+        AppDomain? ad = null;
+        try
         {
-            try
+            ad = AppDomain.CreateDomain("Framework Version String Domain", null, setupInfo);
+
+            var assemblyLoadWorker = typeof(AssemblyLoadWorker);
+            AssemblyLoadWorker? worker = null;
+            if (assemblyLoadWorker.Assembly.GlobalAssemblyCache)
             {
-                RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runContext.RunSettings.SettingsXml);
-                if (null != runConfiguration && (Enum.Equals(runConfiguration.TargetFramework, FrameworkVersion.Framework40) ||
-                    string.Equals(runConfiguration.TargetFramework.ToString(), Constants.DotNetFramework40, StringComparison.OrdinalIgnoreCase)))
-                {
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("AssemblyHelper.SetNETFrameworkCompatiblityMode: setting .NetFramework,Version=v4.0 compatibility mode.");
-                    }
-                    setup.TargetFrameworkName = Constants.DotNetFramework40;
-                }
+                worker = (AssemblyLoadWorker)ad.CreateInstanceAndUnwrap(
+                    assemblyLoadWorker.Assembly.FullName,
+                    assemblyLoadWorker.FullName,
+                    false, BindingFlags.Default, null,
+                    null, null, null);
             }
-            catch (Exception e)
+            else
             {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("AssemblyHelper:SetNETFrameworkCompatiblityMode:  Caught an exception:{0}", e);
-                }
+                // This has to be LoadFrom, otherwise we will have to use AssemblyResolver to find self.
+                worker = (AssemblyLoadWorker)ad.CreateInstanceFromAndUnwrap(
+                    assemblyLoadWorker.Assembly.Location,
+                    assemblyLoadWorker.FullName,
+                    false, BindingFlags.Default, null,
+                    null, null, null);
             }
+
+            return AssemblyLoadWorker.GetTargetFrameworkVersionStringFromPath(path);
         }
-#endif
+        finally
+        {
+            if (ad != null)
+            {
+                AppDomain.Unload(ad);
+            }
+        }
+    }
 
-        public static IEnumerable<Attribute> GetCustomAttributes(this Assembly assembly, string fullyQualifiedName)
+    /// <summary>
+    /// Get the Version for the target framework version string
+    /// </summary>
+    /// <param name="version">Target framework string</param>
+    /// <returns>Framework Version</returns>
+    internal static Version GetTargetFrameworkVersionFromVersionString(string version)
+    {
+        if (version.Length > Constants.DotNetFrameWorkStringPrefix.Length + 1)
         {
-            ValidateArg.NotNull(assembly, nameof(assembly));
-            ValidateArg.NotNullOrWhiteSpace(fullyQualifiedName, nameof(fullyQualifiedName));
+            string versionPart = version.Substring(Constants.DotNetFrameWorkStringPrefix.Length + 1);
+            return new Version(versionPart);
+        }
+
+        return DefaultVersion;
+    }
 
-            if(assembly.GetType(fullyQualifiedName) is Type attribute)
+    /// <summary>
+    /// When test run is targeted for .Net4.0, set target framework of test appdomain to be v4.0.
+    /// With this done tests would be executed in 4.0 compatibility mode even when .Net4.5 is installed.
+    /// </summary>
+    internal static void SetNETFrameworkCompatiblityMode(AppDomainSetup setup, IRunContext runContext)
+    {
+        try
+        {
+            RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runContext.RunSettings?.SettingsXml);
+            if (null != runConfiguration && (Equals(runConfiguration.TargetFramework, FrameworkVersion.Framework40) ||
+                string.Equals(runConfiguration.TargetFramework?.ToString(), Constants.DotNetFramework40, StringComparison.OrdinalIgnoreCase)))
             {
-                return assembly.GetCustomAttributes(attribute);
+                EqtTrace.Verbose("AssemblyHelper.SetNETFrameworkCompatiblityMode: setting .NetFramework,Version=v4.0 compatibility mode.");
+                setup.TargetFrameworkName = Constants.DotNetFramework40;
             }
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Error("AssemblyHelper:SetNETFrameworkCompatiblityMode: Caught an exception:{0}", e);
+        }
+    }
+#endif
 
-            return assembly
+    public static IEnumerable<Attribute> GetCustomAttributes(this Assembly assembly, string fullyQualifiedName)
+    {
+        ValidateArg.NotNull(assembly, nameof(assembly));
+        ValidateArg.NotNullOrWhiteSpace(fullyQualifiedName, nameof(fullyQualifiedName));
+
+        return assembly.GetType(fullyQualifiedName) is Type attribute
+            ? assembly.GetCustomAttributes(attribute)
+            : assembly
                 .GetCustomAttributes()
                 .Where(i => i.GetType().FullName == fullyQualifiedName);
-        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs
index 6ce8754042..4992e32033 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs
@@ -1,385 +1,358 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
 #if NETFRAMEWORK
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
+/// <summary>
+/// Does the real work of finding references using Assembly.ReflectionOnlyLoadFrom.
+/// The caller is supposed to create AppDomain and create instance of given class in there.
+/// </summary>
+internal class AssemblyLoadWorker : MarshalByRefObject
+{
     /// <summary>
-    /// Does the real work of finding references using Assembly.ReflectionOnlyLoadFrom.
-    /// The caller is supposed to create AppDomain and create instance of given class in there.
+    /// Get the target dot net framework string for the assembly
     /// </summary>
-    internal class AssemblyLoadWorker : MarshalByRefObject
+    /// <param name="path">Path of the assembly file</param>
+    /// <returns> String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
+    public static string GetTargetFrameworkVersionStringFromPath(string path)
     {
-        /// <summary>
-        /// Get the target dot net framework string for the assembly
-        /// </summary>
-        /// <param name="path">Path of the assembly file</param>
-        /// <returns> String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
-        public string GetTargetFrameworkVersionStringFromPath(string path)
+        if (!File.Exists(path))
         {
-            if (!File.Exists(path))
-            {
-                return string.Empty;
-            }
-
-            try
-            {
-                var a = Assembly.ReflectionOnlyLoadFrom(path);
-                return GetTargetFrameworkStringFromAssembly(a);
-            }
-            catch (BadImageFormatException)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("AssemblyLoadWorker:GetTargetFrameworkVersionString() caught BadImageFormatException. Falling to native binary.");
-                }
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
-                {
-                    EqtTrace.Error("AssemblyLoadWorker:GetTargetFrameworkVersionString() Returning default. Unhandled exception: {0}.", ex);
-                }
-            }
-
             return string.Empty;
         }
 
-        /// <summary>
-        /// Get the target dot net framework string for the assembly
-        /// </summary>
-        /// <param name="assembly">Assembly</param>
-        /// <returns>String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
-        internal static string GetTargetFrameworkStringFromAssembly(Assembly assembly)
+        try
         {
-            var dotNetVersion = string.Empty;
-            foreach (var data in CustomAttributeData.GetCustomAttributes(assembly))
+            var a = Assembly.ReflectionOnlyLoadFrom(path);
+            return GetTargetFrameworkStringFromAssembly(a);
+        }
+        catch (BadImageFormatException)
+        {
+            EqtTrace.Error("AssemblyLoadWorker:GetTargetFrameworkVersionString() caught BadImageFormatException. Falling to native binary.");
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("AssemblyLoadWorker:GetTargetFrameworkVersionString() Returning default. Unhandled exception: {0}.", ex);
+        }
+
+        return string.Empty;
+    }
+
+    /// <summary>
+    /// Get the target dot net framework string for the assembly
+    /// </summary>
+    /// <param name="assembly">Assembly</param>
+    /// <returns>String representation of the target dot net framework e.g. .NETFramework,Version=v4.0 </returns>
+    internal static string GetTargetFrameworkStringFromAssembly(Assembly assembly)
+    {
+        var dotNetVersion = string.Empty;
+        foreach (var data in CustomAttributeData.GetCustomAttributes(assembly))
+        {
+            if (data.NamedArguments?.Count > 0)
             {
-                if (data.NamedArguments?.Count > 0)
+                string attributeName = data.NamedArguments[0].MemberInfo.DeclaringType.FullName;
+                if (string.Equals(attributeName, Constants.TargetFrameworkAttributeFullName, StringComparison.OrdinalIgnoreCase))
                 {
-                    string attributeName = data.NamedArguments[0].MemberInfo.DeclaringType.FullName;
-                    if (string.Equals(attributeName, Constants.TargetFrameworkAttributeFullName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        dotNetVersion = data.ConstructorArguments[0].Value.ToString();
-                        break;
-                    }
+                    dotNetVersion = data.ConstructorArguments[0].Value.ToString();
+                    break;
                 }
             }
-
-            return dotNetVersion;
         }
 
-        /// <summary>
-        /// Returns the full name of the referenced assemblies by the assembly on the specified path.
-        ///
-        /// Returns null on failure and an empty array if there is no reference in the project.
-        /// </summary>
-        /// <param name="path">Path to the assembly file to load from.</param>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Being created in a separate app-domain"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public string[] GetReferencedAssemblies(string path)
-        {
-            Debug.Assert(!string.IsNullOrEmpty(path));
-
-            Assembly a = null;
-            try
-            {
-                // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
-                // specified path only and does not let code to be executed by the assembly
-                // in the loaded context.
-                a = Assembly.ReflectionOnlyLoadFrom(path);
-            }
-            catch
-            {
-                return null;
-            }
-            Debug.Assert(a != null);
+        return dotNetVersion;
+    }
 
-            AssemblyName[] assemblies = a.GetReferencedAssemblies();
-            if (assemblies == null || assemblies.Length == 0)
-            {
-                return new string[0];
-            }
+    /// <summary>
+    /// Returns the full name of the referenced assemblies by the assembly on the specified path.
+    ///
+    /// Returns null on failure and an empty array if there is no reference in the project.
+    /// </summary>
+    /// <param name="path">Path to the assembly file to load from.</param>
+    public static string[]? GetReferencedAssemblies(string path)
+    {
+        TPDebug.Assert(!path.IsNullOrEmpty());
 
-            return (from assembly in assemblies
-                    select assembly.FullName).ToArray();
+        Assembly? a = null;
+        try
+        {
+            // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
+            // specified path only and does not let code to be executed by the assembly
+            // in the loaded context.
+            a = Assembly.ReflectionOnlyLoadFrom(path);
         }
+        catch
+        {
+            return null;
+        }
+        TPDebug.Assert(a != null);
 
-        /// <summary>
-        /// Returns true if given assembly matched name and public key token.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Being created in a separate app-domain"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public bool? CheckAssemblyReference(string path, string referenceAssemblyName, byte[] publicKeyToken)
+        AssemblyName[] assemblies = a.GetReferencedAssemblies();
+        return assemblies == null || assemblies.Length == 0
+            ? ([])
+            : (from assembly in assemblies
+               select assembly.FullName).ToArray();
+    }
+
+    /// <summary>
+    /// Returns true if given assembly matched name and public key token.
+    /// </summary>
+    public static bool? CheckAssemblyReference(string path, string referenceAssemblyName, byte[] publicKeyToken)
+    {
+        try
         {
-            Assembly a = null;
-            try
-            {
-                // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
-                // specified path only and does not let code to be executed by the assembly
-                // in the loaded context.
-                //
-                a = Assembly.ReflectionOnlyLoadFrom(path);
+            // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
+            // specified path only and does not let code to be executed by the assembly
+            // in the loaded context.
+            //
+            Assembly a = Assembly.ReflectionOnlyLoadFrom(path);
 
-                Debug.Assert(a != null);
+            TPDebug.Assert(a != null);
 
-                AssemblyName[] assemblies = a.GetReferencedAssemblies();
+            AssemblyName[] assemblies = a.GetReferencedAssemblies();
 
-                foreach (AssemblyName referencedAssembly in assemblies)
+            foreach (AssemblyName referencedAssembly in assemblies)
+            {
+                // Check without version. Only name and public key token.
+                if (string.Equals(referencedAssembly.Name, referenceAssemblyName, StringComparison.OrdinalIgnoreCase))
                 {
-                    // Check without version. Only name and public key token.
-                    if (string.Equals(referencedAssembly.Name, referenceAssemblyName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        byte[] publicKeyToken1 = referencedAssembly.GetPublicKeyToken();
+                    byte[] publicKeyToken1 = referencedAssembly.GetPublicKeyToken();
 
-                        bool isMatch = true;
-                        if (publicKeyToken1.Length != publicKeyToken.Length)
-                        {
-                            continue;
-                        }
+                    bool isMatch = true;
+                    if (publicKeyToken1.Length != publicKeyToken.Length)
+                    {
+                        continue;
+                    }
 
-                        for (int i = 0; i < publicKeyToken1.Length; ++i)
+                    for (int i = 0; i < publicKeyToken1.Length; ++i)
+                    {
+                        if (publicKeyToken1[i] != publicKeyToken[i])
                         {
-                            if (publicKeyToken1[i] != publicKeyToken[i])
-                            {
-                                isMatch = false;
-                                break;
-                            }
+                            isMatch = false;
+                            break;
                         }
+                    }
 
-                        if (isMatch)
-                        {
-                            return true;
-                        }
+                    if (isMatch)
+                    {
+                        return true;
                     }
                 }
             }
-            catch
-            {
-                return null; // return null if not able to check.
-            }
-
-            return false;
         }
-
-        /// <summary>
-        /// Finds platform and .Net framework version for a given container.
-        /// In case of errors defaults are returned.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="procArchType"></param>
-        /// <param name="frameworkVersion"></param>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Being created in a separate app-domain")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        public void GetPlatformAndFrameworkSettings(string path, out string procArchType, out string frameworkVersion)
+        catch
         {
-            procArchType = nameof(Architecture.Default);
-            frameworkVersion = String.Empty;
+            return null; // return null if not able to check.
+        }
+
+        return false;
+    }
 
-            try
+    /// <summary>
+    /// Finds platform and .Net framework version for a given container.
+    /// In case of errors defaults are returned.
+    /// </summary>
+    /// <param name="path"></param>
+    /// <param name="procArchType"></param>
+    /// <param name="frameworkVersion"></param>
+    public static void GetPlatformAndFrameworkSettings(string path, out string procArchType, out string frameworkVersion)
+    {
+        procArchType = nameof(Architecture.Default);
+        frameworkVersion = string.Empty;
+
+        try
+        {
+            // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
+            // specified path only and does not let code to be executed by the assembly
+            // in the loaded context.
+
+            var a = Assembly.ReflectionOnlyLoadFrom(path);
+            TPDebug.Assert(a != null);
+            a.ManifestModule.GetPEKind(out var peKind, out var machine);
+
+            // conversion to string type is needed for below reason
+            // -- PortableExecutableKinds.Preferred32Bit and ImageFileMachine.ARM is available only
+            //    in .Net4.0 and above. Below code is compiled with .Net3.5 but runs in .Net4.0
+            string peKindString = peKind.ToString();
+            string machineTypeString = machine.ToString();
+            if (string.Equals(machineTypeString, "I386", StringComparison.OrdinalIgnoreCase))
             {
-                // ReflectionOnlyLoadFrom does not use the probing paths and loads from the
-                // specified path only and does not let code to be executed by the assembly
-                // in the loaded context.
-
-                var a = Assembly.ReflectionOnlyLoadFrom(path);
-                Debug.Assert(a != null);
-                a.ManifestModule.GetPEKind(out var peKind, out var machine);
-
-                // conversion to string type is needed for below reason
-                // -- PortableExecutableKinds.Preferred32Bit and ImageFileMachine.ARM is available only
-                //    in .Net4.0 and above. Below code is compiled with .Net3.5 but runs in .Net4.0
-                string peKindString = peKind.ToString();
-                string machineTypeString = machine.ToString();
-                if (string.Equals(machineTypeString, "I386", StringComparison.OrdinalIgnoreCase))
+                if (peKindString.Contains("Preferred32Bit") || peKindString.Contains("Required32Bit"))
                 {
-                    if (peKindString.Contains("Preferred32Bit") || peKindString.Contains("Required32Bit"))
-                    {
-                        procArchType = "X86";
-                    }
-                    else if (string.Equals(peKindString, "ILOnly", StringComparison.OrdinalIgnoreCase))
-                    {
-                        procArchType = "AnyCPU";
-                    }
+                    procArchType = "X86";
                 }
-                else if (string.Equals(machineTypeString, "AMD64", StringComparison.OrdinalIgnoreCase) ||
-                         string.Equals(machineTypeString, "IA64", StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(peKindString, "ILOnly", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (string.Equals(peKindString, "ILOnly, PE32Plus", StringComparison.OrdinalIgnoreCase))
-                    {
-                        procArchType = "X64";
-                    }
+                    procArchType = "AnyCPU";
                 }
-                else if (string.Equals(machineTypeString, "ARM", StringComparison.OrdinalIgnoreCase))
+            }
+            else if (string.Equals(machineTypeString, "AMD64", StringComparison.OrdinalIgnoreCase) ||
+                     string.Equals(machineTypeString, "IA64", StringComparison.OrdinalIgnoreCase))
+            {
+                if (string.Equals(peKindString, "ILOnly, PE32Plus", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (string.Equals(peKindString, "ILOnly", StringComparison.OrdinalIgnoreCase))
-                    {
-                        procArchType = "ARM";
-                    }
+                    procArchType = "X64";
                 }
-
-                if (string.IsNullOrEmpty(procArchType))
+            }
+            else if (string.Equals(machineTypeString, "ARM", StringComparison.OrdinalIgnoreCase))
+            {
+                if (string.Equals(peKindString, "ILOnly", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (EqtTrace.IsVerboseEnabled)
-                    {
-                        EqtTrace.Verbose("Unable to find the platform type for image:{0} with PEKind:{1}, Machine:{2}. Returning Default:{3}", path, peKindString, machineTypeString, "AnyCPU");
-                    }
-                    procArchType = "AnyCPU";
+                    procArchType = "ARM";
                 }
+            }
 
+            if (StringUtils.IsNullOrEmpty(procArchType))
+            {
+                EqtTrace.Verbose("Unable to find the platform type for image:{0} with PEKind:{1}, Machine:{2}. Returning Default:{3}", path, peKindString, machineTypeString, "AnyCPU");
+                procArchType = "AnyCPU";
+            }
 
-                frameworkVersion = a.ImageRuntimeVersion.Substring(0, 4).ToUpperInvariant();
 
-                // ImageRuntimeVersion for v4.0 & v4.5 are same and it return v4.0
-                // Since there is behavioral difference in both its important to differentiate them
-                // Using TargetFrameworkAttribute for the purpose.
-                if (string.Equals(frameworkVersion, "v4.0", StringComparison.OrdinalIgnoreCase))
-                {
-                    // Try to determine the exact .NET framework by inspecting custom attributes on assembly.
-                    string dotNetVersion = GetTargetFrameworkStringFromAssembly(a);
-                    if (dotNetVersion.StartsWith(Constants.DotNetFramework40, StringComparison.OrdinalIgnoreCase))
-                    {
-                        frameworkVersion = "v4.0";
-                    }
-                    else if (dotNetVersion.StartsWith(Constants.DotNetFramework45, StringComparison.OrdinalIgnoreCase))
-                    {
-                        frameworkVersion = "v4.5";
-                    }
-                    else if (dotNetVersion.Length > Constants.DotNetFrameWorkStringPrefix.Length)
-                    {
-                        frameworkVersion = dotNetVersion.Substring(Constants.DotNetFrameWorkStringPrefix.Length);
-                    }
-                }
+            frameworkVersion = a.ImageRuntimeVersion.Substring(0, 4).ToUpperInvariant();
 
-            }
-            catch (BadImageFormatException)
+            // ImageRuntimeVersion for v4.0 & v4.5 are same and it return v4.0
+            // Since there is behavioral difference in both its important to differentiate them
+            // Using TargetFrameworkAttribute for the purpose.
+            if (string.Equals(frameworkVersion, "v4.0", StringComparison.OrdinalIgnoreCase))
             {
-                if (EqtTrace.IsErrorEnabled)
+                // Try to determine the exact .NET framework by inspecting custom attributes on assembly.
+                string dotNetVersion = GetTargetFrameworkStringFromAssembly(a);
+                if (dotNetVersion.StartsWith(Constants.DotNetFramework40, StringComparison.OrdinalIgnoreCase))
                 {
-                    EqtTrace.Error("AssemblyLoadWorker:GetPlatformAndFrameworkSettings() caught BadImageFormatException. Falling to native binary.");
+                    frameworkVersion = "v4.0";
                 }
-                procArchType = GetArchitectureForSource(path);
-            }
-            catch (Exception ex)
-            {
-                if (EqtTrace.IsErrorEnabled)
+                else if (dotNetVersion.StartsWith(Constants.DotNetFramework45, StringComparison.OrdinalIgnoreCase))
+                {
+                    frameworkVersion = "v4.5";
+                }
+                else if (dotNetVersion.Length > Constants.DotNetFrameWorkStringPrefix.Length)
                 {
-                    EqtTrace.Error("AssemblyLoadWorker:GetPlatformAndFrameworkSettings() Returning default. Unhandled exception: {0}.", ex);
+                    frameworkVersion = dotNetVersion.Substring(Constants.DotNetFrameWorkStringPrefix.Length);
                 }
-                return;
             }
-        }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        private static string GetArchitectureForSource(string imagePath)
+        }
+        catch (BadImageFormatException)
+        {
+            EqtTrace.Error("AssemblyLoadWorker:GetPlatformAndFrameworkSettings() caught BadImageFormatException. Falling to native binary.");
+            procArchType = GetArchitectureForSource(path);
+        }
+        catch (Exception ex)
         {
-            // For details refer to below code available on MSDN.
-            // http://code.msdn.microsoft.com/CSCheckExeType-aab06100/sourcecode?fileId=22010&pathId=1874010322
+            EqtTrace.Error("AssemblyLoadWorker:GetPlatformAndFrameworkSettings() Returning default. Unhandled exception: {0}.", ex);
+            return;
+        }
+    }
 
-            string archType = "AnyCPU";
-            ushort machine = 0;
+    private static string GetArchitectureForSource(string imagePath)
+    {
+        // For details refer to below code available on MSDN.
+        // http://code.msdn.microsoft.com/CSCheckExeType-aab06100/sourcecode?fileId=22010&pathId=1874010322
+
+        string archType = "AnyCPU";
+        ushort machine = 0;
+
+        uint peHeader;
+        const int imageFileMachineAmd64 = 0x8664;
+        const int imageFileMachineIa64 = 0x200;
+        const int imageFileMachineI386 = 0x14c;
+        const int imageFileMachineArm = 0x01c0;  // ARM Little-Endian
+        const int imageFileMachineThumb = 0x01c2;  // ARM Thumb/Thumb-2 Little-Endian
+        const int imageFileMachineArmnt = 0x01c4; // ARM Thumb-2 Little-Endian
+        const int imageFileMachineArm64 = 0xAA64; // ARM64 Little-Endian
+
+        try
+        {
+            //get the input stream
+            using Stream fs = new FileStream(imagePath, FileMode.Open, FileAccess.Read);
+            bool validImage = true;
 
-            uint peHeader;
-            const int IMAGE_FILE_MACHINE_AMD64 = 0x8664;
-            const int IMAGE_FILE_MACHINE_IA64 = 0x200;
-            const int IMAGE_FILE_MACHINE_I386 = 0x14c;
-            const int IMAGE_FILE_MACHINE_ARM = 0x01c0;  // ARM Little-Endian
-            const int IMAGE_FILE_MACHINE_THUMB = 0x01c2;  // ARM Thumb/Thumb-2 Little-Endian
-            const int IMAGE_FILE_MACHINE_ARMNT = 0x01c4; // ARM Thumb-2 Little-Endian
+            BinaryReader reader = new(fs);
+            //PE Header starts @ 0x3C (60). Its a 4 byte header.
+            fs.Position = 0x3C;
+            peHeader = reader.ReadUInt32();
 
-            try
+            // Check if the offset is invalid
+            if (peHeader > fs.Length - 5)
             {
-                //get the input stream
-                using (Stream fs = new FileStream(imagePath, FileMode.Open, FileAccess.Read))
-                {
-                    bool validImage = true;
+                validImage = false;
+            }
+            if (validImage)
+            {
+                //Moving to PE Header start location...
+                fs.Position = peHeader;
 
-                    BinaryReader reader = new BinaryReader(fs);
-                    //PE Header starts @ 0x3C (60). Its a 4 byte header.
-                    fs.Position = 0x3C;
-                    peHeader = reader.ReadUInt32();
+                UInt32 signature = reader.ReadUInt32(); //peHeaderSignature
+                                                        // 0x00004550 is the letters "PE" followed by two terminating zeros.
+                if (signature != 0x00004550)
+                {
+                    validImage = false;
+                }
 
-                    // Check if the offset is invalid
-                    if (peHeader > fs.Length - 5)
+                if (validImage)
+                {
+                    //Read the image file header.
+                    machine = reader.ReadUInt16();
+                    reader.ReadUInt16(); //NumberOfSections
+                    reader.ReadUInt32(); //TimeDateStamp
+                    reader.ReadUInt32(); //PointerToSymbolTable
+                    reader.ReadUInt32(); //NumberOfSymbols
+                    reader.ReadUInt16(); //SizeOfOptionalHeader
+                    reader.ReadUInt16(); //Characteristics
+
+                    // magic number.32bit or 64bit assembly.
+                    UInt16 magic = reader.ReadUInt16();
+                    if (magic is not 0x010B and not 0x020B)
                     {
                         validImage = false;
                     }
-                    if (validImage)
-                    {
-                        //Moving to PE Header start location...
-                        fs.Position = peHeader;
-
-                        UInt32 signature = reader.ReadUInt32(); //peHeaderSignature
-                        // 0x00004550 is the letters "PE" followed by two terminating zeros.
-                        if (signature != 0x00004550)
-                        {
-                            validImage = false;
-                        }
-
-                        if (validImage)
-                        {
-                            //Read the image file header.
-                            machine = reader.ReadUInt16();
-                            reader.ReadUInt16(); //NumberOfSections
-                            reader.ReadUInt32(); //TimeDateStamp
-                            reader.ReadUInt32(); //PointerToSymbolTable
-                            reader.ReadUInt32(); //NumberOfSymbols
-                            reader.ReadUInt16(); //SizeOfOptionalHeader
-                            reader.ReadUInt16(); //Characteristics
-
-                            // magic number.32bit or 64bit assembly.
-                            UInt16 magic = reader.ReadUInt16();
-                            if (magic != 0x010B && magic != 0x020B)
-                            {
-                                validImage = false;
-                            }
-                        }
+                }
 
-                        if (validImage)
-                        {
-                            switch (machine)
-                            {
-                                case IMAGE_FILE_MACHINE_I386:
-                                    archType = "X86";
-                                    break;
-
-                                case IMAGE_FILE_MACHINE_AMD64:
-                                case IMAGE_FILE_MACHINE_IA64:
-                                    archType = "X64";
-                                    break;
-
-                                case IMAGE_FILE_MACHINE_ARM:
-                                case IMAGE_FILE_MACHINE_THUMB:
-                                case IMAGE_FILE_MACHINE_ARMNT:
-                                    archType = "ARM";
-                                    break;
-                            }
-                        }
-                        else
-                        {
-                            if (EqtTrace.IsVerboseEnabled)
-                            {
-                                EqtTrace.Verbose("Source path {0} is not a valid image path. Returning default proc arch type {1}.", imagePath, "AnyCPU");
-                            }
-                        }
+                if (validImage)
+                {
+                    switch (machine)
+                    {
+                        case imageFileMachineI386:
+                            archType = "X86";
+                            break;
+
+                        case imageFileMachineAmd64:
+                        case imageFileMachineIa64:
+                            archType = "X64";
+                            break;
+
+                        case imageFileMachineArm:
+                        case imageFileMachineThumb:
+                        case imageFileMachineArmnt:
+                            archType = "ARM";
+                            break;
+
+                        case imageFileMachineArm64:
+                            archType = "ARM64";
+                            break;
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                //Ignore all exception
-                if (EqtTrace.IsErrorEnabled)
+                else
                 {
-                    EqtTrace.Error("AssemblyLoadWorker:GetArchitectureForSource() Returning default:{0}. Unhandled exception: {1}.", "AnyCPU", ex.ToString());
+                    EqtTrace.Verbose("Source path {0} is not a valid image path. Returning default proc arch type {1}.", imagePath, "AnyCPU");
                 }
             }
-
-            return archType;
         }
+        catch (Exception ex)
+        {
+            //Ignore all exception
+            EqtTrace.Error("AssemblyLoadWorker:GetArchitectureForSource() Returning default:{0}. Unhandled exception: {1}.", "AnyCPU", ex.ToString());
+        }
+
+        return archType;
     }
-#endif
 }
+#endif
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/EqtHash.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/EqtHash.cs
index 4c04e6b13d..ef595cffb5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/EqtHash.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/EqtHash.cs
@@ -1,46 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
-    using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
 
-#if !NETSTANDARD1_0
-    using System.Security.Cryptography;
-#endif
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
+/// <summary>
+/// Wrapper class for cryptographic hashing.
+/// This class uses SHA1 instead of MD5 in order to conform to the FIPS standard.
+/// </summary>
+public static class EqtHash
+{
     /// <summary>
-    /// Wrapper class for cryptographic hashing.
-    /// This class uses SHA1 instead of MD5 in order to conform to the FIPS standard.
+    /// Calculates a hash of the string and copies the first 128 bits of the hash
+    /// to a new Guid.
     /// </summary>
-    public static class EqtHash
+    public static Guid GuidFromString(string data)
     {
-        /// <summary>
-        /// Calculates a hash of the string and copies the first 128 bits of the hash
-        /// to a new Guid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Cryptographic.Standard", "CA5354:SHA1CannotBeUsed", Justification = "Hash Algorithm is used only to generate unique testcase id.")]
-        public static Guid GuidFromString(string data)
-        {
-            Debug.Assert(data != null);
-
-            // Do NOT change the algorithm ever as this will have compat implications
-            // TC-TA team has a feature in VS where workitems are associated based on TestCase Ids
-            // If Algorithm changes, then all the bugs/workitems filed in TFS Server against a given TestCase become unassociated if IDs change
-            // Any algorithm or logic change must require a sign off from feature owners of above
-            // Also, TPV2 and TPV1 must use same Algorithm until the time TPV1 is completely deleted to be on-par
-            // If LUT or .Net core scenario uses TPV2 to discover, but if it uses TPV1 in Devenv, then there will be testcase matching issues
-            byte[] hash = Sha1Helper.ComputeSha1(System.Text.Encoding.Unicode.GetBytes(data));
-
-            // Guid is always 16 bytes
-            Debug.Assert(Guid.Empty.ToByteArray().Length == 16, "Expected Guid to be 16 bytes");
-
-            byte[] toGuid = new byte[16];
-            Array.Copy(hash, toGuid, 16);
-
-            return new Guid(toGuid);
-        }
+        TPDebug.Assert(data != null);
+
+        // Do NOT change the algorithm ever as this will have compat implications
+        // TC-TA team has a feature in VS where workitems are associated based on TestCase Ids
+        // If Algorithm changes, then all the bugs/workitems filed in TFS Server against a given TestCase become unassociated if IDs change
+        // Any algorithm or logic change must require a sign off from feature owners of above
+        // Also, TPV2 and TPV1 must use same Algorithm until the time TPV1 is completely deleted to be on-par
+        // If LUT or .Net core scenario uses TPV2 to discover, but if it uses TPV1 in Devenv, then there will be testcase matching issues
+        byte[] hash = Sha1Helper.ComputeSha1(System.Text.Encoding.Unicode.GetBytes(data));
+
+        // Guid is always 16 bytes
+        TPDebug.Assert(Guid.Empty.ToByteArray().Length == 16, "Expected Guid to be 16 bytes");
+
+        byte[] toGuid = new byte[16];
+        Array.Copy(hash, toGuid, 16);
+
+        return new Guid(toGuid);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/FilterHelper.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/FilterHelper.cs
index 7f7408b936..f2f6239863 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/FilterHelper.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/FilterHelper.cs
@@ -1,88 +1,78 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+public static class FilterHelper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+    public const char EscapeCharacter = '\\';
+    private static readonly char[] SpecialCharacters = ['\\', '(', ')', '&', '|', '=', '!', '~'];
+    private static readonly HashSet<char> SpecialCharactersSet = new(SpecialCharacters);
 
-    public static class FilterHelper
+    /// <summary>
+    /// Escapes a set of special characters for filter (%, (, ), &amp;, |, =, !, ~) by replacing them with their escape sequences.
+    /// </summary>
+    /// <param name="str">The input string that contains the text to convert.</param>
+    /// <returns>A string of characters with special characters converted to their escaped form.</returns>
+    public static string Escape(string str)
     {
-        public const char EscapeCharacter = '\\';
-        private static readonly char[] SpecialCharacters = { '\\', '(', ')', '&', '|', '=', '!', '~' };
-        private static readonly HashSet<char> SpecialCharactersSet = new HashSet<char>(SpecialCharacters);
-
-        /// <summary>
-        /// Escapes a set of special characters for filter (%, (, ), &, |, =, !, ~) by replacing them with their escape sequences.
-        /// </summary>
-        /// <param name="str">The input string that contains the text to convert.</param>
-        /// <returns>A string of characters with special characters converted to their escaped form.</returns>
-        public static string Escape(string str)
+        ValidateArg.NotNull(str, nameof(str));
+        if (str.IndexOfAny(SpecialCharacters) < 0)
         {
-            if (str == null)
-            {
-                throw new ArgumentNullException(nameof(str));
-            }
+            return str;
+        }
 
-            if (str.IndexOfAny(SpecialCharacters) < 0)
+        var builder = new StringBuilder();
+        for (int i = 0; i < str.Length; ++i)
+        {
+            var currentChar = str[i];
+            if (SpecialCharactersSet.Contains(currentChar))
             {
-                return str;
+                builder.Append(EscapeCharacter);
             }
+            builder.Append(currentChar);
+        }
 
-            var builder = new StringBuilder();
-            for (int i = 0; i < str.Length; ++i)
-            {
-                var currentChar = str[i];
-                if (SpecialCharactersSet.Contains(currentChar))
-                {
-                    builder.Append(EscapeCharacter);
-                }
-                builder.Append(currentChar);
-            }
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    /// <summary>
+    /// Converts any escaped characters in the input filter string.
+    /// </summary>
+    /// <param name="str">The input string that contains the text to convert.</param>
+    /// <returns>A filter string of characters with any escaped characters converted to their un-escaped form.</returns>
+    public static string Unescape(string str)
+    {
+        ValidateArg.NotNull(str, nameof(str));
+        if (str.IndexOf(EscapeCharacter) < 0)
+        {
+            return str;
         }
 
-        /// <summary>
-        /// Converts any escaped characters in the input filter string.
-        /// </summary>
-        /// <param name="str">The input string that contains the text to convert.</param>
-        /// <returns>A filter string of characters with any escaped characters converted to their un-escaped form.</returns>
-        public static string Unescape(string str)
+        var builder = new StringBuilder();
+        for (int i = 0; i < str.Length; ++i)
         {
-            if (str == null)
-            {
-                throw new ArgumentNullException(nameof(str));
-            }
-
-            if (str.IndexOf(EscapeCharacter) < 0)
-            {
-                return str;
-            }
-
-            var builder = new StringBuilder();
-            for (int i = 0; i < str.Length; ++i)
+            var currentChar = str[i];
+            if (currentChar == EscapeCharacter)
             {
-                var currentChar = str[i];
-                if (currentChar == EscapeCharacter)
+                if (++i == str.Length || !SpecialCharactersSet.Contains(currentChar = str[i]))
                 {
-                    if (++i == str.Length || !SpecialCharactersSet.Contains(currentChar = str[i]))
-                    {
-                        // "\" should be followed by a special character.
-                        throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.TestCaseFilterEscapeException, str));
-                    }
+                    // "\" should be followed by a special character.
+                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Resources.Resources.TestCaseFilterEscapeException, str));
                 }
-
-                // Strictly speaking, string to be un-escaped shouldn't contain any of the special characters,
-                // other than being part of escape sequence, but we will ignore that to avoid additional overhead.
-
-                builder.Append(currentChar);
             }
 
-            return builder.ToString();
+            // Strictly speaking, string to be un-escaped shouldn't contain any of the special characters,
+            // other than being part of escape sequence, but we will ignore that to avoid additional overhead.
+
+            builder.Append(currentChar);
         }
+
+        return builder.ToString();
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/Sha1Helper.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/Sha1Helper.cs
index 9acf17ebae..7b2a249fa3 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/Sha1Helper.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/Sha1Helper.cs
@@ -1,269 +1,230 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
+using System;
+using System.Security.Cryptography;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+/// <summary>
+/// Used to calculate SHA1 hash.
+///
+/// https://tools.ietf.org/html/rfc3174
+/// </summary>
+internal static class Sha1Helper
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
+    public static byte[] ComputeSha1(byte[] message)
+    {
+        using HashAlgorithm provider = SHA1.Create();
+        byte[] hash = provider.ComputeHash(message);
 
-#if !NETSTANDARD1_0
-    using System.Security.Cryptography;
-#endif 
+        return hash;
+    }
 
     /// <summary>
-    /// Used to calculate SHA1 hash. 
-    /// 
-    /// https://tools.ietf.org/html/rfc3174
+    /// SHA-1 Implementation as in https://tools.ietf.org/html/rfc3174
     /// </summary>
-    internal static class Sha1Helper
+    /// <remarks>
+    /// This implementation only works with messages with a length
+    /// that is a multiple of the size of 8-bits.
+    /// </remarks>
+    internal class Sha1Implementation
     {
-        [SuppressMessage("Microsoft.Cryptographic.Standard", "CA5354:SHA1CannotBeUsed", Justification = "Hash Algorithm is used only to generate unique testcase id.")]
-        public static byte[] ComputeSha1(byte[] message)
+        /*
+         * Many of the variable, function and parameter names in this code
+         * were used because those were the names used in the publication.
+         *
+         * For more information please refer to https://tools.ietf.org/html/rfc3174.
+         */
+
+        private const int BlockBits = 512;
+        private const int DigestBits = 160;
+        private const int BlockBytes = BlockBits / 8;
+        private const int DigestBytes = DigestBits / 8;
+
+        /// <summary>
+        /// A sequence of logical functions to be used in SHA-1.
+        /// Each f(t), 0 &lt;= t &lt;= 79, operates on three 32-bit words B, C, D and produces a 32-bit word as output.
+        /// </summary>
+        /// <param name="t">Function index. 0 &lt;= t &lt;= 79</param>
+        /// <param name="b">Word B</param>
+        /// <param name="c">Word C</param>
+        /// <param name="d">Word D</param>
+        /// <returns>
+        /// f(t;B,C,D) = (B AND C) OR ((NOT B) AND D)         ( 0 &lt;= t &lt;= 19)
+        /// f(t;B,C,D) = B XOR C XOR D                        (20 &lt;= t &lt;= 39)
+        /// f(t;B,C,D) = (B AND C) OR (B AND D) OR (C AND D)  (40 &lt;= t &lt;= 59)
+        /// f(t;B,C,D) = B XOR C XOR D                        (60 &lt;= t &lt;= 79)
+        /// </returns>
+        private static uint F(int t, uint b, uint c, uint d)
         {
-#if NETSTANDARD1_0
-            var hasher = new Sha1Implementation();
+            return t switch
+            {
+                >= 0 and <= 19 => b & c | ~b & d,
+                >= 20 and <= 39 or >= 60 and <= 79 => b ^ c ^ d,
+                _ => t is >= 40 and <= 59
+                    ? b & c | b & d | c & d
+                    : throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t))
+            };
+        }
 
-            return hasher.ComputeHash(message);
-#else
-            using (HashAlgorithm provider = SHA1.Create())
+        /// <summary>
+        /// Returns a constant word K(t) which is used in the SHA-1.
+        /// </summary>
+        /// <param name="t">Word index.</param>
+        /// <returns>
+        /// K(t) = 0x5A827999 ( 0 &lt;= t &lt;= 19)
+        /// K(t) = 0x6ED9EBA1 (20 &lt;= t &lt;= 39)
+        /// K(t) = 0x8F1BBCDC (40 &lt;= t &lt;= 59)
+        /// K(t) = 0xCA62C1D6 (60 &lt;= t &lt;= 79)
+        /// </returns>
+        private static uint K(int t)
+        {
+            return t switch
             {
-                byte[] hash = provider.ComputeHash(message);
+                >= 0 and <= 19 => 0x5A827999u,
+                >= 20 and <= 39 => 0x6ED9EBA1u,
+                >= 40 and <= 59 => 0x8F1BBCDCu,
+                _ => t is >= 60 and <= 79
+                    ? 0xCA62C1D6u
+                    : throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t))
+            };
+        }
 
-                return hash;
-            }
-#endif
+        /// <summary>
+        /// The circular left shift operation.
+        /// </summary>
+        /// <param name="x">An uint word.</param>
+        /// <param name="n">0 &lt;= n &lt; 32</param>
+        /// <returns>S^n(X)  =  (X &lt;&lt; n) OR (X >> 32-n)</returns>
+        private static uint S(uint x, byte n)
+        {
+            return n > 32 ? throw new ArgumentOutOfRangeException(nameof(n)) : (x << n) | (x >> (32 - n));
         }
 
         /// <summary>
-        /// SHA-1 Implementation as in https://tools.ietf.org/html/rfc3174
+        /// Ensures that given bytes are in big endian notation.
         /// </summary>
-        /// <remarks>
-        /// This implementation only works with messages with a length 
-        /// that is a multiple of the size of 8-bits.
-        /// </remarks>
-        internal class Sha1Implementation
+        /// <param name="array">An array of bytes</param>
+        private static void EnsureBigEndian(ref byte[] array)
         {
-            /* 
-             * Many of the variable, function and parameter names in this code 
-             * were used because those were the names used in the publication.
-             * 
-             * For more information please refer to https://tools.ietf.org/html/rfc3174.
-             */
-
-            private const int BlockBits = 512;
-            private const int DigestBits = 160;
-            private const int BlockBytes = BlockBits / 8;
-            private const int DigestBytes = DigestBits / 8;
-
-            /// <summary>
-            /// A sequence of logical functions to be used in SHA-1. 
-            /// Each f(t), 0 <= t <= 79, operates on three 32-bit words B, C, D and produces a 32-bit word as output.  
-            /// </summary>
-            /// <param name="t">Function index. 0 <= t <= 79</param>
-            /// <param name="B">Word B</param>
-            /// <param name="C">Word C</param>
-            /// <param name="D">Word D</param>
-            /// <returns>
-            /// f(t;B,C,D) = (B AND C) OR ((NOT B) AND D)         ( 0 <= t <= 19)
-            /// f(t;B,C,D) = B XOR C XOR D                        (20 <= t <= 39)
-            /// f(t;B,C,D) = (B AND C) OR (B AND D) OR (C AND D)  (40 <= t <= 59)
-            /// f(t;B,C,D) = B XOR C XOR D                        (60 <= t <= 79)
-            /// </returns>
-            private static uint F(int t, uint B, uint C, uint D)
+            ValidateArg.NotNull(array, nameof(array));
+
+            if (BitConverter.IsLittleEndian)
             {
-                if (t >= 0 && t <= 19)
-                {
-                    return (B & C) | (~B & D);
-                }
-                else if ((t >= 20 && t <= 39) || (t >= 60 && t <= 79))
-                {
-                    return B ^ C ^ D;
-                }
-                else if (t >= 40 && t <= 59)
-                {
-                    return (B & C) | (B & D) | (C & D);
-                }
-                else
-                {
-                    throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t));
-                }
+                Array.Reverse(array);
             }
+        }
 
-            /// <summary>
-            /// Returns a constant word K(t) which is used in the SHA-1.
-            /// </summary>
-            /// <param name="t">Word index.</param>
-            /// <returns>
-            /// K(t) = 0x5A827999 ( 0 <= t <= 19)
-            /// K(t) = 0x6ED9EBA1 (20 <= t <= 39)
-            /// K(t) = 0x8F1BBCDC (40 <= t <= 59)
-            /// K(t) = 0xCA62C1D6 (60 <= t <= 79)
-            /// </returns>
-            private static uint K(int t)
-            {
+        private readonly uint[] _h = new uint[5];
 
-                if (t >= 0 && t <= 19)
-                {
-                    return 0x5A827999u;
-                }
-                else if (t >= 20 && t <= 39)
-                {
-                    return 0x6ED9EBA1u;
-                }
-                else if (t >= 40 && t <= 59)
-                {
-                    return 0x8F1BBCDCu;
-                }
-                else if (t >= 60 && t <= 79)
-                {
-                    return 0xCA62C1D6u;
-                }
-                else
-                {
-                    throw new ArgumentException("Argument out of bounds! 0 <= t < 80", nameof(t));
-                }
-            }
+        private void Reset()
+        {
+            // as defined in https://tools.ietf.org/html/rfc3174#section-6.1
+            _h[0] = 0x67452301u;
+            _h[1] = 0xEFCDAB89u;
+            _h[2] = 0x98BADCFEu;
+            _h[3] = 0x10325476u;
+            _h[4] = 0xC3D2E1F0u;
+        }
 
-            /// <summary>
-            /// The circular left shift operation.
-            /// </summary>
-            /// <param name="x">An uint word.</param>
-            /// <param name="n">0 <= n < 32</param>
-            /// <returns>S^n(X)  =  (X << n) OR (X >> 32-n)</returns>
-            private static uint S(uint X, byte n)
-            {
-                if (n > 32)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(n));
-                }
+        public byte[] ComputeHash(byte[] message)
+        {
+            ValidateArg.NotNull(message, nameof(message));
 
-                return (X << n) | (X >> (32 - n));
+            Reset();
+            PadMessage(ref message);
+
+            var messageCount = message.Length / BlockBytes;
+            for (var i = 0; i < messageCount; ++i)
+            {
+                ProcessBlock(message, i * BlockBytes, BlockBytes);
             }
 
-            /// <summary>
-            /// Ensures that given bytes are in big endian notation.
-            /// </summary>
-            /// <param name="array">An array of bytes</param>
-            private static void EnsureBigEndian(ref byte[] array)
+            var digest = new byte[DigestBytes];
+            for (int t = 0; t < _h.Length; t++)
             {
-                ValidateArg.NotNull(array, nameof(array));
+                var hi = BitConverter.GetBytes(_h[t]);
+                EnsureBigEndian(ref hi);
 
-                if (BitConverter.IsLittleEndian)
-                {
-                    Array.Reverse(array);
-                }
+                Buffer.BlockCopy(hi, 0, digest, t * hi.Length, hi.Length);
             }
 
-            private readonly uint[] H = new uint[5];
+            return digest;
+        }
 
-            private void Reset()
-            {
-                // as defined in https://tools.ietf.org/html/rfc3174#section-6.1
-                H[0] = 0x67452301u;
-                H[1] = 0xEFCDAB89u;
-                H[2] = 0x98BADCFEu;
-                H[3] = 0x10325476u;
-                H[4] = 0xC3D2E1F0u;
-            }
+        private static void PadMessage(ref byte[] message)
+        {
+            var length = message.Length;
+            var paddingBytes = BlockBytes - (length % BlockBytes);
 
-            public byte[] ComputeHash(byte[] message)
-            {
-                ValidateArg.NotNull(message, nameof(message));
+            // 64bit uint message size will be appended to end of the padding, making sure we have space for it.
+            if (paddingBytes <= 8)
+                paddingBytes += BlockBytes;
 
-                Reset();
-                PadMessage(ref message);
+            var padding = new byte[paddingBytes];
+            padding[0] = 0b10000000;
 
-                var messageCount = message.Length / BlockBytes;
-                for (var i = 0; i < messageCount; ++i)
-                {
-                    ProcessBlock(message, i * BlockBytes, BlockBytes);
-                }
+            var messageBits = (ulong)message.Length << 3;
+            var messageSize = BitConverter.GetBytes(messageBits);
+            EnsureBigEndian(ref messageSize);
 
-                var digest = new byte[DigestBytes];
-                for (int t = 0; t < H.Length; t++)
-                {
-                    var hi = BitConverter.GetBytes(H[t]);
-                    EnsureBigEndian(ref hi);
+            Buffer.BlockCopy(messageSize, 0, padding, padding.Length - messageSize.Length, messageSize.Length);
 
-                    Buffer.BlockCopy(hi, 0, digest, t * hi.Length, hi.Length);
-                }
+            Array.Resize(ref message, message.Length + padding.Length);
+            Buffer.BlockCopy(padding, 0, message, length, padding.Length);
+        }
 
-                return digest;
+        private void ProcessBlock(byte[] message, int start, int length)
+        {
+            if (start + length > message.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
             }
-
-            private void PadMessage(ref byte[] message)
+            if (length != BlockBytes)
             {
-                var length = message.Length;
-                var paddingBytes = BlockBytes - (length % BlockBytes);
-
-                // 64bit uint message size will be appended to end of the padding, making sure we have space for it.
-                if (paddingBytes <= 8)
-                    paddingBytes += BlockBytes;
+                throw new ArgumentException($"Invalid block size. Actual: {length}, Expected: {BlockBytes}", nameof(length));
+            }
 
-                var padding = new byte[paddingBytes];
-                padding[0] = 0b10000000;
+            var w = new uint[80];
 
-                var messageBits = (ulong)message.Length << 3;
-                var messageSize = BitConverter.GetBytes(messageBits);
-                EnsureBigEndian(ref messageSize);
+            // Get W(0) .. W(15)
+            for (int t = 0; t <= 15; t++)
+            {
+                var wordBytes = new byte[sizeof(uint)];
+                Buffer.BlockCopy(message, start + (t * sizeof(uint)), wordBytes, 0, sizeof(uint));
+                EnsureBigEndian(ref wordBytes);
 
-                Buffer.BlockCopy(messageSize, 0, padding, padding.Length - messageSize.Length, messageSize.Length);
+                w[t] = BitConverter.ToUInt32(wordBytes, 0);
+            }
 
-                Array.Resize(ref message, message.Length + padding.Length);
-                Buffer.BlockCopy(padding, 0, message, length, padding.Length);
+            // Calculate W(16) .. W(79)
+            for (int t = 16; t <= 79; t++)
+            {
+                w[t] = S(w[t - 3] ^ w[t - 8] ^ w[t - 14] ^ w[t - 16], 1);
             }
 
-            private void ProcessBlock(byte[] message, int start, int length)
+            uint a = _h[0],
+                b = _h[1],
+                c = _h[2],
+                d = _h[3],
+                e = _h[4];
+
+            for (int t = 0; t < 80; t++)
             {
-                if (start + length > message.Length)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(length));
-                }
-                if (length != BlockBytes)
-                {
-                    throw new ArgumentException($"Invalid block size. Actual: {length}, Expected: {BlockBytes}", nameof(length));
-                }
-
-                var W = new uint[80];
-
-                // Get W(0) .. W(15)
-                for (int t = 0; t <= 15; t++)
-                {
-                    var wordBytes = new byte[sizeof(uint)];
-                    Buffer.BlockCopy(message, start + (t * sizeof(uint)), wordBytes, 0, sizeof(uint));
-                    EnsureBigEndian(ref wordBytes);
-
-                    W[t] = BitConverter.ToUInt32(wordBytes, 0);
-                }
-
-                // Calculate W(16) .. W(79)
-                for (int t = 16; t <= 79; t++)
-                {
-                    W[t] = S(W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16], 1);
-                }
-
-                uint A = H[0],
-                     B = H[1],
-                     C = H[2],
-                     D = H[3],
-                     E = H[4];
-
-                for (int t = 0; t < 80; t++)
-                {
-                    var temp = S(A, 5) + F(t, B, C, D) + E + W[t] + K(t);
-                    E = D;
-                    D = C;
-                    C = S(B, 30);
-                    B = A;
-                    A = temp;
-                }
-
-                H[0] += A;
-                H[1] += B;
-                H[2] += C;
-                H[3] += D;
-                H[4] += E;
+                var temp = S(a, 5) + F(t, b, c, d) + e + w[t] + K(t);
+                e = d;
+                d = c;
+                c = S(b, 30);
+                b = a;
+                a = temp;
             }
+
+            _h[0] += a;
+            _h[1] += b;
+            _h[2] += c;
+            _h[3] += d;
+            _h[4] += e;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/StringUtilities.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/StringUtilities.cs
index a3e145ae3c..e845d22a09 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/StringUtilities.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/StringUtilities.cs
@@ -1,47 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
-    using System;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
+/// <summary>
+/// Utility methods for manipulating strings.
+/// </summary>
+public static class StringUtilities
+{
     /// <summary>
-    /// Utility methods for manipulating strings.
+    /// Prepares the string for output by converting null values to the "(null)" string
+    /// and removing any trailing new lines.
     /// </summary>
-    public static class StringUtilities
+    /// <param name="input">The input string.</param>
+    /// <returns>The string that is prepared for output.</returns>
+    public static string PrepareForOutput(string? input)
     {
-        /// <summary>
-        /// Prepares the string for output by converting null values to the "(null)" string
-        /// and removing any trailing new lines.
-        /// </summary>
-        /// <param name="input">The input string.</param>
-        /// <returns>The string that is prepared for output.</returns>
-        public static string PrepareForOutput(string input)
-        {
-            string result = input;
-            if (input == null)
-            {
-                result = Resources.Resources.NullString;
-            }
+        string? result = input;
+        result ??= Resources.Resources.NullString;
 
-            result = result.TrimEnd(Environment.NewLine.ToCharArray());
+        result = result.TrimEnd(Environment.NewLine.ToCharArray());
 
-            return result;
-        }
+        return result;
+    }
 
-        /// <summary>
-        /// Checks if given string is null or a whitespace.
-        /// </summary>
-        /// <param name="input">string to check</param>
-        /// <returns>True if string is null or a whitespace, false otherwise</returns>
-        public static bool IsNullOrWhiteSpace(string input)
+    /// <summary>
+    /// Checks if given string is null or a whitespace.
+    /// </summary>
+    /// <param name="input">string to check</param>
+    /// <returns>True if string is null or a whitespace, false otherwise</returns>
+    public static bool IsNullOrWhiteSpace(string? input)
+    {
+        if (input != null)
         {
-            if (input != null)
-            {
-                input = input.Trim();
-            }
-
-            return string.IsNullOrEmpty(input);
+            input = input.Trim();
         }
+
+        return input.IsNullOrEmpty();
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs
index bc1ea0354f..1bcd046485 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs
@@ -1,72 +1,65 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
 #if NETFRAMEWORK
-    using System;
-
-    /// <summary>
-    /// Suspends the instrumentation (for code coverage) of the modules which are loaded
-    /// during this object is created and disposed
-    /// exceeded.
-    /// </summary>
-    public class SuspendCodeCoverage : IDisposable
-    {
-        #region Private Variables
+using System;
 
-        private const string SuspendCodeCoverageEnvVarName = "__VANGUARD_SUSPEND_INSTRUMENT__";
-        private const string SuspendCodeCoverageEnvVarTrueValue = "TRUE";
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
-        private string prevEnvValue;
+/// <summary>
+/// Suspends the instrumentation (for code coverage) of the modules which are loaded
+/// during this object is created and disposed
+/// exceeded.
+/// </summary>
+public class SuspendCodeCoverage : IDisposable
+{
+    private const string SuspendCodeCoverageEnvVarName = "__VANGUARD_SUSPEND_INSTRUMENT__";
+    private const string SuspendCodeCoverageEnvVarTrueValue = "TRUE";
 
-        /// <summary>
-        /// Whether the object is disposed or not.
-        /// </summary>
-        private bool isDisposed = false;
+    private readonly string? _prevEnvValue;
 
-        #endregion
+    /// <summary>
+    /// Whether the object is disposed or not.
+    /// </summary>
+    private bool _isDisposed;
 
-        /// <summary>
-        /// Constructor. Code Coverage instrumentation of the modules, which are loaded
-        /// during this object is created and disposed, is disabled.
-        /// </summary>
-        public SuspendCodeCoverage()
-        {
-            this.prevEnvValue = Environment.GetEnvironmentVariable(SuspendCodeCoverageEnvVarName, EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable(SuspendCodeCoverageEnvVarName, SuspendCodeCoverageEnvVarTrueValue, EnvironmentVariableTarget.Process);
-        }
+    /// <summary>
+    /// Constructor. Code Coverage instrumentation of the modules, which are loaded
+    /// during this object is created and disposed, is disabled.
+    /// </summary>
+    public SuspendCodeCoverage()
+    {
+        _prevEnvValue = Environment.GetEnvironmentVariable(SuspendCodeCoverageEnvVarName, EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable(SuspendCodeCoverageEnvVarName, SuspendCodeCoverageEnvVarTrueValue, EnvironmentVariableTarget.Process);
+    }
 
-        #region IDisposable
+    /// <summary>
+    /// Disposes this instance
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Disposes this instance
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Disposes instance.
+    /// </summary>
+    /// <param name="disposing"> Should dispose. </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
         {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
+            return;
         }
 
-        /// <summary>
-        /// Disposes instance.
-        /// </summary>
-        /// <param name="disposing"> Should dispose. </param>
-        internal void Dispose(bool disposing)
+        if (disposing)
         {
-            if (!this.isDisposed)
-            {
-                if (disposing)
-                {
-                    Environment.SetEnvironmentVariable(SuspendCodeCoverageEnvVarName, this.prevEnvValue, EnvironmentVariableTarget.Process);
-                }
-
-                this.isDisposed = true;
-            }
+            Environment.SetEnvironmentVariable(SuspendCodeCoverageEnvVarName, _prevEnvValue, EnvironmentVariableTarget.Process);
         }
 
-        #endregion IDisposable
+        _isDisposed = true;
     }
+}
 
 #endif
-}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlReaderUtilities.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlReaderUtilities.cs
index 024e17996d..02e723b398 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlReaderUtilities.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlReaderUtilities.cs
@@ -1,74 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+/// <summary>
+/// Utility methods for working with an XmlReader.
+/// </summary>
+public static class XmlReaderUtilities
 {
-    using System;
-    using System.Globalization;
-    using System.Xml;
+    private const string RunSettingsRootNodeName = "RunSettings";
 
     /// <summary>
-    /// Utility methods for working with an XmlReader.
+    /// Reads up to the next Element in the document.
     /// </summary>
-    public static class XmlReaderUtilities
+    /// <param name="reader">Reader to move to the next element.</param>
+    public static void ReadToNextElement(this XmlReader reader)
     {
-        #region Constants
-
-        private const string RunSettingsRootNodeName = "RunSettings";
-
-        #endregion
-
-        #region Utility Methods
-
-        /// <summary>
-        /// Reads up to the next Element in the document.
-        /// </summary>
-        /// <param name="reader">Reader to move to the next element.</param>
-        public static void ReadToNextElement(this XmlReader reader)
+        ValidateArg.NotNull(reader, nameof(reader));
+        while (!reader.EOF && reader.Read() && reader.NodeType != XmlNodeType.Element)
         {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
-            while (!reader.EOF && reader.Read() && reader.NodeType != XmlNodeType.Element)
-            {
-            }
         }
+    }
 
-        /// <summary>
-        /// Skips the current element and moves to the next Element in the document.
-        /// </summary>
-        /// <param name="reader">Reader to move to the next element.</param>
-        public static void SkipToNextElement(this XmlReader reader)
-        {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
-            reader.Skip();
+    /// <summary>
+    /// Skips the current element and moves to the next Element in the document.
+    /// </summary>
+    /// <param name="reader">Reader to move to the next element.</param>
+    public static void SkipToNextElement(this XmlReader reader)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+        reader.Skip();
 
-            if (reader.NodeType != XmlNodeType.Element)
-            {
-                reader.ReadToNextElement();
-            }
+        if (reader.NodeType != XmlNodeType.Element)
+        {
+            reader.ReadToNextElement();
         }
+    }
 
-        /// <summary>
-        /// Reads to the root node of the run settings and verifies that it is a "RunSettings" node.
-        /// </summary>
-        /// <param name="path">Path to the file.</param>
-        /// <param name="reader">XmlReader for the file.</param>
-        public static void ReadToRootNode(XmlReader reader)
-        {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
+    /// <summary>
+    /// Reads to the root node of the run settings and verifies that it is a "RunSettings" node.
+    /// </summary>
+    /// <param name="reader">XmlReader for the file.</param>
+    public static void ReadToRootNode(XmlReader reader)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
 
-            // Read to the root node.
-            reader.ReadToNextElement();
+        // Read to the root node.
+        reader.ReadToNextElement();
 
-            // Verify that it is a "RunSettings" node.
-            if (reader.Name != RunSettingsRootNodeName)
-            {
-                throw new SettingsException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        Resources.Resources.InvalidRunSettingsRootNode));
-            }
+        // Verify that it is a "RunSettings" node.
+        if (reader.Name != RunSettingsRootNodeName)
+        {
+            throw new SettingsException(Resources.Resources.InvalidRunSettingsRootNode);
         }
-
-        #endregion
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlRunSettingsUtilities.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlRunSettingsUtilities.cs
index c0e21ac443..8926383223 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlRunSettingsUtilities.cs
+++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/XmlRunSettingsUtilities.cs
@@ -1,469 +1,415 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-#if !NETSTANDARD1_0
-    using System.Xml.XPath;
-#endif 
+using ObjectModelResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.Resources;
 
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using ObjectModelResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
+/// <summary>
+/// Utilities for the run settings XML.
+/// </summary>
+public static class XmlRunSettingsUtilities
+{
     /// <summary>
-    /// Utilities for the run settings XML.
+    /// Gets the os architecture of the machine where this application is running
     /// </summary>
-    public static class XmlRunSettingsUtilities
+    public static Architecture OSArchitecture
     {
-        /// <summary>
-        /// Gets the os architecture of the machine where this application is running
-        /// </summary>
-        public static ObjectModel.Architecture OSArchitecture
+        get
         {
-            get
-            {
-                var arch = new PlatformEnvironment().Architecture;
-
-                switch (arch)
-                {
-                    case PlatformArchitecture.X64:
-                        return ObjectModel.Architecture.X64;
-                    case PlatformArchitecture.X86:
-                        return ObjectModel.Architecture.X86;
-                    case PlatformArchitecture.ARM64:
-                        return ObjectModel.Architecture.ARM64;
-                    case PlatformArchitecture.ARM:
-                        return ObjectModel.Architecture.ARM;
-                    default:
-                        return ObjectModel.Architecture.X64;
-                }
-            }
-        }
+            var arch = new PlatformEnvironment().Architecture;
 
-        /// <summary>
-        /// Gets the settings to be used while creating XmlReader for runsettings.
-        /// </summary>
-        public static XmlReaderSettings ReaderSettings
-        {
-            get
+            return arch switch
             {
-                return new XmlReaderSettings { IgnoreComments = true, IgnoreWhitespace = true, DtdProcessing = DtdProcessing.Prohibit };
-            }
+                PlatformArchitecture.X64 => Architecture.X64,
+                PlatformArchitecture.X86 => Architecture.X86,
+                PlatformArchitecture.ARM64 => Architecture.ARM64,
+                PlatformArchitecture.ARM => Architecture.ARM,
+                _ => Architecture.X64,
+            };
         }
+    }
 
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Examines the given XPathNavigable representation of a runsettings file and determines if it has a configuration node
-        /// for the data collector (used for Fakes and CodeCoverage)
-        /// </summary>
-        /// <param name="runSettingDocument"> XPathNavigable representation of a runsettings file </param>
-        /// <param name="dataCollectorUri"> The data Collector Uri. </param>
-        /// <returns> True if there is a datacollector configured. </returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#")]
-        public static bool ContainsDataCollector(IXPathNavigable runSettingDocument, string dataCollectorUri)
+    /// <summary>
+    /// Gets the settings to be used while creating XmlReader for runsettings.
+    /// </summary>
+    public static XmlReaderSettings ReaderSettings
+    {
+        get
         {
-            if (runSettingDocument == null)
-            {
-                throw new ArgumentNullException(nameof(runSettingDocument));
-            }
+            return new XmlReaderSettings { IgnoreComments = true, IgnoreWhitespace = true, DtdProcessing = DtdProcessing.Prohibit };
+        }
+    }
 
-            if (dataCollectorUri == null)
-            {
-                throw new ArgumentNullException(nameof(dataCollectorUri));
-            }
+    /// <summary>
+    /// Examines the given XPathNavigable representation of a runsettings file and determines if it has a configuration node
+    /// for the data collector (used for Fakes and CodeCoverage)
+    /// </summary>
+    /// <param name="runSettingDocument"> XPathNavigable representation of a runsettings file </param>
+    /// <param name="dataCollectorUri"> The data Collector Uri. </param>
+    /// <returns> True if there is a datacollector configured. </returns>
+    public static bool ContainsDataCollector(IXPathNavigable runSettingDocument, string dataCollectorUri)
+    {
+        ValidateArg.NotNull(runSettingDocument, nameof(runSettingDocument));
+        ValidateArg.NotNull(dataCollectorUri, nameof(dataCollectorUri));
 
-            var navigator = runSettingDocument.CreateNavigator();
-            var nodes = navigator.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+        var navigator = runSettingDocument.CreateNavigator();
+        var nodes = navigator!.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
 
-            foreach (XPathNavigator dataCollectorNavigator in nodes)
+        foreach (XPathNavigator? dataCollectorNavigator in nodes)
+        {
+            var uri = dataCollectorNavigator?.GetAttribute("uri", string.Empty);
+            if (string.Equals(dataCollectorUri, uri, StringComparison.OrdinalIgnoreCase))
             {
-                var uri = dataCollectorNavigator.GetAttribute("uri", string.Empty);
-                if (string.Equals(dataCollectorUri, uri, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
 
-        /// <summary>
-        /// Get the list of friendly name of all data collector present in runsettings.
-        /// </summary>
-        /// <param name="runsettingsXml">runsettings xml string</param>
-        /// <returns>List of friendly name</returns>
-        public static IList<string> GetDataCollectorsFriendlyName(string runsettingsXml)
+        return false;
+    }
+
+    /// <summary>
+    /// Get the list of friendly name of all data collector present in runsettings.
+    /// </summary>
+    /// <param name="runsettingsXml">runsettings xml string</param>
+    /// <returns>List of friendly name</returns>
+    public static IList<string> GetDataCollectorsFriendlyName(string? runsettingsXml)
+    {
+        var friendlyNameList = new List<string>();
+        if (!runsettingsXml.IsNullOrWhiteSpace())
         {
-            var friendlyNameList = new List<string>();
-            if (!string.IsNullOrWhiteSpace(runsettingsXml))
-            {
-                using (var stream = new StringReader(runsettingsXml))
-                using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
-                {
-                    var document = new XmlDocument();
-                    document.Load(reader);
-
-                    var runSettingsNavigator = document.CreateNavigator();
-                    var nodes = runSettingsNavigator.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
-
-                    foreach (XPathNavigator dataCollectorNavigator in nodes)
-                    {
-                        var friendlyName = dataCollectorNavigator.GetAttribute("friendlyName", string.Empty);
-                        friendlyNameList.Add(friendlyName);
-                    }
-                }
-            }
+            using var stream = new StringReader(runsettingsXml);
+            using var reader = XmlReader.Create(stream, ReaderSettings);
+            var document = new XmlDocument();
+            document.Load(reader);
 
-            return friendlyNameList;
-        }
+            var runSettingsNavigator = document.CreateNavigator();
+            var nodes = runSettingsNavigator!.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
 
-        /// <summary>
-        /// Inserts a data collector settings in the file
-        /// </summary>
-        /// <param name="runSettingDocument">runSettingDocument</param>
-        /// <param name="settings">settings</param>
-        public static void InsertDataCollectorsNode(IXPathNavigable runSettingDocument, DataCollectorSettings settings)
-        {
-            if (runSettingDocument == null)
+            foreach (XPathNavigator? dataCollectorNavigator in nodes)
             {
-                throw new ArgumentNullException(nameof(runSettingDocument));
+                var friendlyName = dataCollectorNavigator?.GetAttribute("friendlyName", string.Empty);
+                friendlyNameList.Add(friendlyName!);
             }
+        }
 
-            if (settings == null)
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
+        return friendlyNameList;
+    }
 
-            var navigator = runSettingDocument.CreateNavigator();
-            MoveToDataCollectorsNode(ref navigator);
+    /// <summary>
+    /// Inserts a data collector settings in the file
+    /// </summary>
+    /// <param name="runSettingDocument">runSettingDocument</param>
+    /// <param name="settings">settings</param>
+    public static void InsertDataCollectorsNode(IXPathNavigable runSettingDocument, DataCollectorSettings settings)
+    {
+        ValidateArg.NotNull(runSettingDocument, nameof(runSettingDocument));
+        ValidateArg.NotNull(settings, nameof(settings));
 
-            var settingsXml = settings.ToXml();
-            var dataCollectorNode = settingsXml.CreateNavigator();
-            dataCollectorNode.MoveToRoot();
+        var navigator = runSettingDocument.CreateNavigator()!;
+        MoveToDataCollectorsNode(ref navigator);
 
-            navigator.AppendChild(dataCollectorNode);
-        }
-#endif
-
-        /// <summary>
-        /// Returns RunConfiguration from settingsXml.
-        /// </summary>
-        /// <param name="settingsXml">The run settings.</param>
-        /// <returns> The RunConfiguration node as defined in the settings xml.</returns>
-        public static RunConfiguration GetRunConfigurationNode(string settingsXml)
-        {
-            var nodeValue = GetNodeValue<RunConfiguration>(settingsXml, Constants.RunConfigurationSettingsName, RunConfiguration.FromXml);
-            if (nodeValue == default(RunConfiguration))
-            {
-                // Return default one.
-                nodeValue = new RunConfiguration();
-            }
+        var settingsXml = settings.ToXml();
+        var dataCollectorNode = settingsXml.CreateNavigator()!;
+        dataCollectorNode.MoveToRoot();
 
-            return nodeValue;
-        }
+        navigator.AppendChild(dataCollectorNode);
+    }
 
-        /// <summary>
-        /// Gets the set of user defined test run parameters from settings xml as key value pairs.
-        /// </summary>
-        /// <param name="settingsXml">The run settings xml.</param>
-        /// <returns>The test run parameters defined in the run settings.</returns>
-        /// <remarks>If there is no test run parameters section defined in the settings xml a blank dictionary is returned.</remarks>
-        public static Dictionary<string, object> GetTestRunParameters(string settingsXml)
+    /// <summary>
+    /// Returns RunConfiguration from settingsXml.
+    /// </summary>
+    /// <param name="settingsXml">The run settings.</param>
+    /// <returns> The RunConfiguration node as defined in the settings xml.</returns>
+    public static RunConfiguration GetRunConfigurationNode(string? settingsXml)
+    {
+        var nodeValue = GetNodeValue(settingsXml, Constants.RunConfigurationSettingsName, RunConfiguration.FromXml);
+        if (nodeValue == default(RunConfiguration))
         {
-            var nodeValue = GetNodeValue<Dictionary<string, object>>(settingsXml, Constants.TestRunParametersName, TestRunParameters.FromXml);
-            if (nodeValue == default(Dictionary<string, object>))
-            {
-                // Return default.
-                nodeValue = new Dictionary<string, object>();
-            }
-
-            return nodeValue;
+            // Return default one.
+            nodeValue = new RunConfiguration();
         }
 
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Create a default run settings
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IXPathNavigable"/>.
-        /// </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public static XmlDocument CreateDefaultRunSettings()
+        return nodeValue;
+    }
+
+    /// <summary>
+    /// Gets the set of user defined test run parameters from settings xml as key value pairs.
+    /// </summary>
+    /// <param name="settingsXml">The run settings xml.</param>
+    /// <returns>The test run parameters defined in the run settings.</returns>
+    /// <remarks>If there is no test run parameters section defined in the settings xml a blank dictionary is returned.</remarks>
+    public static Dictionary<string, object> GetTestRunParameters(string? settingsXml)
+    {
+        var nodeValue = GetNodeValue(settingsXml, Constants.TestRunParametersName, TestRunParameters.FromXml);
+        if (nodeValue == default(Dictionary<string, object>))
         {
-            // Create a new default xml doc that looks like this:
-            // <?xml version="1.0" encoding="utf-8"?>
-            // <RunSettings>
-            //   <DataCollectionRunSettings>
-            //     <DataCollectors>
-            //     </DataCollectors>
-            //   </DataCollectionRunSettings>
-            // </RunSettings>
-            var doc = new XmlDocument();
-            var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
-
-            doc.AppendChild(xmlDeclaration);
-            var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
-            doc.AppendChild(runSettingsNode);
-
-            var dataCollectionRunSettingsNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
-            runSettingsNode.AppendChild(dataCollectionRunSettingsNode);
-
-            var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
-            dataCollectionRunSettingsNode.AppendChild(dataCollectorsNode);
-
-            return doc;
+            // Return default.
+            nodeValue = new Dictionary<string, object>();
         }
 
-        /// <summary>
-        /// Returns whether data collection is enabled in the parameter settings xml or not
-        /// </summary>
-        /// <param name="runSettingsXml"> The run Settings Xml. </param>
-        /// <returns> True if data collection is enabled. </returns>
-        public static bool IsDataCollectionEnabled(string runSettingsXml)
-        {
-            var dataCollectionRunSettings = GetDataCollectionRunSettings(runSettingsXml);
+        return nodeValue;
+    }
 
-            if (dataCollectionRunSettings == null || !dataCollectionRunSettings.IsCollectionEnabled)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Create a default run settings
+    /// </summary>
+    /// <returns>
+    /// The <see cref="IXPathNavigable"/>.
+    /// </returns>
+    public static XmlDocument CreateDefaultRunSettings()
+    {
+        // Create a new default xml doc that looks like this:
+        // <?xml version="1.0" encoding="utf-8"?>
+        // <RunSettings>
+        //   <DataCollectionRunSettings>
+        //     <DataCollectors>
+        //     </DataCollectors>
+        //   </DataCollectionRunSettings>
+        // </RunSettings>
+        var doc = new XmlDocument();
+        var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+
+        doc.AppendChild(xmlDeclaration);
+        var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
+        doc.AppendChild(runSettingsNode);
+
+        var dataCollectionRunSettingsNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
+        runSettingsNode.AppendChild(dataCollectionRunSettingsNode);
+
+        var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
+        dataCollectionRunSettingsNode.AppendChild(dataCollectorsNode);
+
+        return doc;
+    }
 
-            return true;
-        }
+    /// <summary>
+    /// Returns whether data collection is enabled in the parameter settings xml or not
+    /// </summary>
+    /// <param name="runSettingsXml"> The run Settings Xml. </param>
+    /// <returns> True if data collection is enabled. </returns>
+    public static bool IsDataCollectionEnabled(string? runSettingsXml)
+    {
+        var dataCollectionRunSettings = GetDataCollectionRunSettings(runSettingsXml);
 
-        /// <summary>
-        /// Returns whether in-proc data collection is enabled in the parameter settings xml or not
-        /// </summary>
-        /// <param name="runSettingsXml"> The run Settings Xml. </param>
-        /// <returns> True if data collection is enabled. </returns>
-        public static bool IsInProcDataCollectionEnabled(string runSettingsXml)
-        {
-            var dataCollectionRunSettings = GetInProcDataCollectionRunSettings(runSettingsXml);
+        return dataCollectionRunSettings != null && dataCollectionRunSettings.IsCollectionEnabled;
+    }
 
-            if (dataCollectionRunSettings == null || !dataCollectionRunSettings.IsCollectionEnabled)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Returns whether in-proc data collection is enabled in the parameter settings xml or not
+    /// </summary>
+    /// <param name="runSettingsXml"> The run Settings Xml. </param>
+    /// <returns> True if data collection is enabled. </returns>
+    public static bool IsInProcDataCollectionEnabled(string? runSettingsXml)
+    {
+        var dataCollectionRunSettings = GetInProcDataCollectionRunSettings(runSettingsXml);
+
+        return dataCollectionRunSettings != null && dataCollectionRunSettings.IsCollectionEnabled;
+    }
 
-            return true;
+    /// <summary>
+    /// Get DataCollection Run settings from the settings XML.
+    /// </summary>
+    /// <param name="runSettingsXml"> The run Settings Xml. </param>
+    /// <returns> The <see cref="DataCollectionRunSettings"/>. </returns>
+    public static DataCollectionRunSettings? GetDataCollectionRunSettings(string? runSettingsXml)
+    {
+        // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
+        if (runSettingsXml.IsNullOrWhiteSpace())
+        {
+            return null;
         }
 
-        /// <summary>
-        /// Get DataCollection Run settings from the settings XML.
-        /// </summary>
-        /// <param name="runSettingsXml"> The run Settings Xml. </param>
-        /// <returns> The <see cref="DataCollectionRunSettings"/>. </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public static DataCollectionRunSettings GetDataCollectionRunSettings(string runSettingsXml)
+        try
         {
-            // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
-            if (string.IsNullOrWhiteSpace(runSettingsXml))
-            {
-                return null;
-            }
+            using var stringReader = new StringReader(runSettingsXml);
+            using var reader = XmlReader.Create(stringReader, ReaderSettings);
 
-            try
-            {
-                using (var stringReader = new StringReader(runSettingsXml))
-                {
-                    var reader = XmlReader.Create(stringReader, ReaderSettings);
-
-                    // read to the fist child
-                    XmlReaderUtilities.ReadToRootNode(reader);
-                    reader.ReadToNextElement();
-
-                    // Read till we reach DC element or reach EOF
-                    while (!string.Equals(reader.Name, Constants.DataCollectionRunSettingsName) && !reader.EOF)
-                    {
-                        reader.SkipToNextElement();
-                    }
-
-                    // If reached EOF => DC element not there
-                    if (reader.EOF)
-                    {
-                        return null;
-                    }
-
-                    // Reached here => DC element present.
-                    return DataCollectionRunSettings.FromXml(reader);
-                }
-            }
-            catch (XmlException ex)
+            // read to the fist child
+            XmlReaderUtilities.ReadToRootNode(reader);
+            reader.ReadToNextElement();
+
+            // Read till we reach DC element or reach EOF
+            while (!string.Equals(reader.Name, Constants.DataCollectionRunSettingsName) && !reader.EOF)
             {
-                throw new SettingsException(string.Format(CultureInfo.CurrentCulture, "{0} {1}", Resources.CommonResources.MalformedRunSettingsFile, ex.Message), ex);
+                reader.SkipToNextElement();
             }
-        }
 
-        /// <summary>
-        /// Get InProc DataCollection Run settings
-        /// </summary>
-        /// <param name="runSettingsXml">
-        /// The run Settings Xml.
-        /// </param>
-        /// <returns>Data collection run settings.</returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public static DataCollectionRunSettings GetInProcDataCollectionRunSettings(string runSettingsXml)
-        {
-            // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
-            if (string.IsNullOrWhiteSpace(runSettingsXml))
+            // If reached EOF => DC element not there
+            if (reader.EOF)
             {
                 return null;
             }
 
-            runSettingsXml = runSettingsXml.Trim();
-            using (StringReader stringReader1 = new StringReader(runSettingsXml))
-            {
-                XmlReader reader = XmlReader.Create(stringReader1, ReaderSettings);
-
-                // read to the fist child
-                XmlReaderUtilities.ReadToRootNode(reader);
-                reader.ReadToNextElement();
-
-                // Read till we reach In Proc IDC element or reach EOF
-                while (!string.Equals(reader.Name, Constants.InProcDataCollectionRunSettingsName) && !reader.EOF)
-                {
-                    reader.SkipToNextElement();
-                }
-
-                // If reached EOF => IDC element not there
-                if (reader.EOF)
-                {
-                    return null;
-                }
-
-                // Reached here => In Proc IDC element present.
-                return DataCollectionRunSettings.FromXml(reader, Constants.InProcDataCollectionRunSettingsName, Constants.InProcDataCollectorsSettingName, Constants.InProcDataCollectorSettingName);
-            }
+            // Reached here => DC element present.
+            return DataCollectionRunSettings.FromXml(reader);
         }
-
-#endif
-
-        /// <summary>
-        /// Get logger run settings from the settings XML.
-        /// </summary>
-        /// <param name="runSettings">The run Settings Xml.</param>
-        /// <returns> The <see cref="LoggerRunSettings"/>. </returns>
-        public static LoggerRunSettings GetLoggerRunSettings(String runSettings)
+        catch (XmlException ex)
         {
-            return GetNodeValue(
-                runSettings,
-                Constants.LoggerRunSettingsName,
-                LoggerRunSettings.FromXml);
+            throw new SettingsException(string.Format(CultureInfo.CurrentCulture, "{0} {1}", Resources.CommonResources.MalformedRunSettingsFile, ex.Message), ex);
         }
+    }
 
-        /// <summary>
-        /// Throws a settings exception if the node the reader is on has attributes defined.
-        /// </summary>
-        /// <param name="reader"> The xml reader. </param>
-        internal static void ThrowOnHasAttributes(XmlReader reader)
+    /// <summary>
+    /// Get InProc DataCollection Run settings
+    /// </summary>
+    /// <param name="runSettingsXml">
+    /// The run Settings Xml.
+    /// </param>
+    /// <returns>Data collection run settings.</returns>
+    public static DataCollectionRunSettings? GetInProcDataCollectionRunSettings(string? runSettingsXml)
+    {
+        // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
+        if (runSettingsXml.IsNullOrWhiteSpace())
         {
-            if (!reader.HasAttributes) return;
+            return null;
+        }
 
-            string elementName = reader.Name;
-            reader.MoveToNextAttribute();
+        runSettingsXml = runSettingsXml.Trim();
+        using StringReader stringReader1 = new(runSettingsXml);
+        using XmlReader reader = XmlReader.Create(stringReader1, ReaderSettings);
 
-            throw new SettingsException(
-                string.Format(
-                    CultureInfo.CurrentCulture,
-                    Resources.Resources.InvalidSettingsXmlAttribute,
-                    elementName,
-                    reader.Name));
-        }
+        // read to the fist child
+        XmlReaderUtilities.ReadToRootNode(reader);
+        reader.ReadToNextElement();
 
-        /// <summary>
-        /// Throws a settings exception if the node the reader is on doesn't have attributes defined.
-        /// </summary>
-        /// <param name="reader"> The xml reader. </param>
-        internal static void ThrowOnNoAttributes(XmlReader reader)
+        // Read till we reach In Proc IDC element or reach EOF
+        while (!string.Equals(reader.Name, Constants.InProcDataCollectionRunSettingsName) && !reader.EOF)
         {
-            if (reader.HasAttributes) return;
-
-            throw new SettingsException(
-                string.Format(
-                    CultureInfo.CurrentCulture,
-                    Resources.Resources.InvalidSettingsXmlAttribute,
-                    reader.Name));
+            reader.SkipToNextElement();
         }
 
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private static T GetNodeValue<T>(string settingsXml, string nodeName, Func<XmlReader, T> nodeParser)
+        // If reached EOF => IDC element not there
+        if (reader.EOF)
         {
-            // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
-            if (!string.IsNullOrWhiteSpace(settingsXml))
-            {
-                try
-                {
-                    using (var stringReader = new StringReader(settingsXml))
-                    {
-                        XmlReader reader = XmlReader.Create(stringReader, ReaderSettings);
-
-                        // read to the fist child
-                        XmlReaderUtilities.ReadToRootNode(reader);
-                        reader.ReadToNextElement();
-
-                        // Read till we reach nodeName element or reach EOF
-                        while (!string.Equals(reader.Name, nodeName, StringComparison.OrdinalIgnoreCase)
-                                &&
-                                !reader.EOF)
-                        {
-                            reader.SkipToNextElement();
-                        }
-
-                        if (!reader.EOF)
-                        {
-                            // read nodeName element.
-                            return nodeParser(reader);
-                        }
-                    }
-                }
-                catch (XmlException ex)
-                {
-                    throw new SettingsException(
-                    string.Format(CultureInfo.CurrentCulture, "{0} {1}", Resources.CommonResources.MalformedRunSettingsFile, ex.Message),
-                        ex);
-                }
-            }
+            return null;
+        }
+
+        // Reached here => In Proc IDC element present.
+        return DataCollectionRunSettings.FromXml(reader, Constants.InProcDataCollectionRunSettingsName, Constants.InProcDataCollectorsSettingName, Constants.InProcDataCollectorSettingName);
+    }
 
-            return default(T);
+    /// <summary>
+    /// Get logger run settings from the settings XML.
+    /// </summary>
+    /// <param name="runSettings">The run Settings Xml.</param>
+    /// <returns> The <see cref="LoggerRunSettings"/>. </returns>
+    public static LoggerRunSettings? GetLoggerRunSettings(string? runSettings)
+    {
+        return GetNodeValue(
+            runSettings,
+            Constants.LoggerRunSettingsName,
+            LoggerRunSettings.FromXml);
+    }
+
+    /// <summary>
+    /// Throws a settings exception if the node the reader is on has attributes defined.
+    /// </summary>
+    /// <param name="reader"> The xml reader. </param>
+    internal static void ThrowOnHasAttributes(XmlReader reader)
+    {
+        if (!reader.HasAttributes) return;
+
+        string elementName = reader.Name;
+        reader.MoveToNextAttribute();
+
+        throw new SettingsException(
+            string.Format(
+                CultureInfo.CurrentCulture,
+                ObjectModelResources.InvalidSettingsXmlAttribute,
+                elementName,
+                reader.Name));
+    }
+
+    /// <summary>
+    /// Throws a settings exception if the node the reader is on doesn't have attributes defined.
+    /// </summary>
+    /// <param name="reader"> The xml reader. </param>
+    internal static void ThrowOnNoAttributes(XmlReader reader)
+    {
+        if (reader.HasAttributes) return;
+
+        throw new SettingsException(
+            string.Format(
+                CultureInfo.CurrentCulture,
+                ObjectModelResources.InvalidSettingsXmlAttribute,
+                reader.Name));
+    }
+
+    private static T? GetNodeValue<T>(string? settingsXml, string nodeName, Func<XmlReader, T> nodeParser)
+    {
+        // use XmlReader to avoid loading of the plugins in client code (mainly from VS).
+        if (settingsXml.IsNullOrWhiteSpace())
+        {
+            return default;
         }
 
-#if !NETSTANDARD1_0
-        /// <summary>
-        /// Moves the given runsettings file navigator to the DataCollectors node in the runsettings xml.
-        /// Throws XmlException if it was unable to find the DataCollectors node.
-        /// </summary>
-        /// <param name="runSettingsNavigator">XPathNavigator for a runsettings xml document.</param>
-        private static void MoveToDataCollectorsNode(ref XPathNavigator runSettingsNavigator)
+        try
         {
-            runSettingsNavigator.MoveToRoot();
-            if (!runSettingsNavigator.MoveToChild("RunSettings", string.Empty))
-            {
-                throw new XmlException(string.Format(CultureInfo.CurrentCulture, ObjectModelResources.CouldNotFindXmlNode, "RunSettings"));
-            }
+            using var stringReader = new StringReader(settingsXml);
+            using XmlReader reader = XmlReader.Create(stringReader, ReaderSettings);
 
-            if (!runSettingsNavigator.MoveToChild("DataCollectionRunSettings", string.Empty))
+            // read to the fist child
+            XmlReaderUtilities.ReadToRootNode(reader);
+            reader.ReadToNextElement();
+
+            // Read till we reach nodeName element or reach EOF
+            while (!string.Equals(reader.Name, nodeName, StringComparison.OrdinalIgnoreCase)
+                   &&
+                   !reader.EOF)
             {
-                runSettingsNavigator.AppendChildElement(string.Empty, "DataCollectionRunSettings", string.Empty, string.Empty);
-                runSettingsNavigator.MoveToChild("DataCollectionRunSettings", string.Empty);
+                reader.SkipToNextElement();
             }
 
-            if (!runSettingsNavigator.MoveToChild("DataCollectors", string.Empty))
+            if (!reader.EOF)
             {
-                runSettingsNavigator.AppendChildElement(string.Empty, "DataCollectors", string.Empty, string.Empty);
-                runSettingsNavigator.MoveToChild("DataCollectors", string.Empty);
+                // read nodeName element.
+                return nodeParser(reader);
             }
         }
-#endif
+        catch (XmlException ex)
+        {
+            throw new SettingsException(
+                string.Format(CultureInfo.CurrentCulture, "{0} {1}", Resources.CommonResources.MalformedRunSettingsFile, ex.Message),
+                ex);
+        }
+
+        return default;
+    }
+
+    /// <summary>
+    /// Moves the given runsettings file navigator to the DataCollectors node in the runsettings xml.
+    /// Throws XmlException if it was unable to find the DataCollectors node.
+    /// </summary>
+    /// <param name="runSettingsNavigator">XPathNavigator for a runsettings xml document.</param>
+    private static void MoveToDataCollectorsNode(ref XPathNavigator runSettingsNavigator)
+    {
+        runSettingsNavigator.MoveToRoot();
+        if (!runSettingsNavigator.MoveToChild("RunSettings", string.Empty))
+        {
+            throw new XmlException(string.Format(CultureInfo.CurrentCulture, ObjectModelResources.CouldNotFindXmlNode, "RunSettings"));
+        }
+
+        if (!runSettingsNavigator.MoveToChild("DataCollectionRunSettings", string.Empty))
+        {
+            runSettingsNavigator.AppendChildElement(string.Empty, "DataCollectionRunSettings", string.Empty, string.Empty);
+            runSettingsNavigator.MoveToChild("DataCollectionRunSettings", string.Empty);
+        }
+
+        if (!runSettingsNavigator.MoveToChild("DataCollectors", string.Empty))
+        {
+            runSettingsNavigator.AppendChildElement(string.Empty, "DataCollectors", string.Empty, string.Empty);
+            runSettingsNavigator.MoveToChild("DataCollectors", string.Empty);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Friends.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Friends.cs
new file mode 100644
index 0000000000..ca1fd757f7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Friends.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.CompilerServices;
+
+#region Product Assemblies
+
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+#endregion
+
+#region Test Assemblies
+
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+#endregion
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/IO/IStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/IO/IStream.cs
index 2dca8f26db..1c3be3afd4 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/IO/IStream.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/IO/IStream.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
-{
-    using System.IO;
+using System.IO;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
+/// <summary>
+/// Helper class to return platform specific stream.
+/// </summary>
+public interface IStream
+{
     /// <summary>
-    /// Helper class to return platform specific stream.
+    /// Returns platform specific Buffered Stream with desired buffer size.
     /// </summary>
-    public interface IStream
-    {
-        /// <summary>
-        /// Returns platform specific Buffered Stream with desired buffer size.
-        /// </summary>
-        /// <param name="stream">Input Stream</param>
-        /// <param name="bufferSize">Buffer Size</param>
-        /// <returns>Buffered Stream</returns>
-        Stream CreateBufferedStream(Stream stream, int bufferSize);
-    }
-}
\ No newline at end of file
+    /// <param name="stream">Input Stream</param>
+    /// <param name="bufferSize">Buffer Size</param>
+    /// <returns>Buffered Stream</returns>
+    Stream CreateBufferedStream(Stream stream, int bufferSize);
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyLoadContext.cs
index ad41df795b..4de9220947 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyLoadContext.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyLoadContext.cs
@@ -1,27 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
-{
-    using System.Reflection;
+using System.Reflection;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
+/// <summary>
+/// Abstraction for Assembly Methods
+/// </summary>
+public interface IAssemblyLoadContext
+{
     /// <summary>
-    /// Abstraction for Assembly Methods
+    /// Loads assembly from given path
     /// </summary>
-    public interface IAssemblyLoadContext
-    {
-        /// <summary>
-        /// Loads assembly from given path
-        /// </summary>
-        /// <param name="assemblyPath">Assembly path</param>
-        /// <returns>Assembly from given path</returns>
-        Assembly LoadAssemblyFromPath(string assemblyPath);
+    /// <param name="assemblyPath">Assembly path</param>
+    /// <returns>Assembly from given path</returns>
+    Assembly LoadAssemblyFromPath(string assemblyPath);
 
-        /// <summary>
-        /// Gets Assembly Name from given path
-        /// </summary>
-        /// <param name="assemblyPath">Assembly path</param>
-        /// <returns>AssemblyName from given path</returns>
-        AssemblyName GetAssemblyNameFromPath(string assemblyPath);
-    }
+    /// <summary>
+    /// Gets Assembly Name from given path
+    /// </summary>
+    /// <param name="assemblyPath">Assembly path</param>
+    /// <returns>AssemblyName from given path</returns>
+    AssemblyName GetAssemblyNameFromPath(string assemblyPath);
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyResolver.cs
index 13d1e70faf..10ab276d2b 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyResolver.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Runtime/IAssemblyResolver.cs
@@ -1,50 +1,49 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
-{
-    using System;
-    using System.Reflection;
+using System;
+using System.Reflection;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+/// <summary>
+/// Represents a method that handles the AssemblyResolve event of an Platform.
+/// </summary>
+/// <param name="sender">The source of the event.</param>
+/// <param name="args">The event data.</param>
+/// <returns>The assembly that resolves the type, assembly, or resource; or null if the assembly
+/// cannot be resolved.
+/// </returns>
+public delegate Assembly? AssemblyResolveEventHandler(object? sender, AssemblyResolveEventArgs? args);
 
+/// <summary>
+/// The AssemblyResolver interface.
+/// </summary>
+public interface IAssemblyResolver : IDisposable
+{
     /// <summary>
-    /// Represents a method that handles the AssemblyResolve event of an Platform.
+    /// Occurs when the resolution of an assembly fails
     /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="args">The event data.</param>
-    /// <returns>The assembly that resolves the type, assembly, or resource; or null if the assembly
-    /// cannot be resolved.
-    /// </returns>
-    public delegate Assembly AssemblyResolveEventHandler(object sender, AssemblyResolveEventArgs args);
+    event AssemblyResolveEventHandler? AssemblyResolve;
+}
 
+/// <summary>
+/// Provides data for loader resolution events, such as the AppDomain.AssemblyResolve events.
+/// </summary>
+public class AssemblyResolveEventArgs : EventArgs
+{
     /// <summary>
-    /// The AssemblyResolver interface.
+    /// Initializes a new instance of the <see cref="AssemblyResolveEventArgs"/> class.
+    /// name of the item to resolve.
     /// </summary>
-    public interface IAssemblyResolver : IDisposable
+    /// <param name="name">The Full name of an assembly to resolve.</param>
+    public AssemblyResolveEventArgs(string? name)
     {
-        /// <summary>
-        /// Occurs when the resolution of an assembly fails
-        /// </summary>
-        event AssemblyResolveEventHandler AssemblyResolve;
+        Name = name;
     }
 
     /// <summary>
-    /// Provides data for loader resolution events, such as the AppDomain.AssemblyResolve events.
+    /// Gets or sets the name of the item to resolve.
     /// </summary>
-    public class AssemblyResolveEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AssemblyResolveEventArgs"/> class.
-        /// name of the item to resolve.
-        /// </summary>
-        /// <param name="name">The Full name of an assembly to resolve.</param>
-        public AssemblyResolveEventArgs(string name)
-        {
-            this.Name = name;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the item to resolve.
-        /// </summary>
-        public string Name { get; set; }
-    }
+    public string? Name { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IEnvironment.cs
index 5ddff59101..7af77732e5 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IEnvironment.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IEnvironment.cs
@@ -1,38 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+/// <summary>
+/// Operating system environment abstractions.
+/// </summary>
+public interface IEnvironment
 {
     /// <summary>
-    /// Operating system environment abstractions.
+    /// Gets the Operating System architecture.
     /// </summary>
-    public interface IEnvironment
-    {
-        /// <summary>
-        /// Gets the Operating System architecture.
-        /// </summary>
-        PlatformArchitecture Architecture { get; }
+    PlatformArchitecture Architecture { get; }
 
-        /// <summary>
-        /// Gets the Operating System name.
-        /// </summary>
-        PlatformOperatingSystem OperatingSystem { get; }
+    /// <summary>
+    /// Gets the Operating System name.
+    /// </summary>
+    PlatformOperatingSystem OperatingSystem { get; }
+
+    /// <summary>
+    /// Gets the Operating System Version
+    /// </summary>
+    string OperatingSystemVersion { get; }
 
-        /// <summary>
-        /// Gets the Operating System Version
-        /// </summary>
-        string OperatingSystemVersion { get; }
+    /// <summary>
+    /// Exits the current process as per Operating System
+    /// </summary>
+    /// <param name="exitcode">Exit code set by user</param>
+    void Exit(int exitcode);
 
-        /// <summary>
-        /// Exits the current process as per Operating System
-        /// </summary>
-        /// <param name="exitcode">Exit code set by user</param>
-        void Exit(int exitcode);
+    /// <summary>
+    /// Returns Operating System managed thread Id
+    /// </summary>
+    /// <returns>Returns the thread Id</returns>
+    int GetCurrentManagedThreadId();
 
-        /// <summary>
-        /// Returns Operating System managed thread Id
-        /// </summary>
-        /// <returns>Returns the thread Id</returns>
-        int GetCurrentManagedThreadId();
-    }
+    /// <inheritdoc cref="System.Environment.ProcessorCount"/>
+    int ProcessorCount { get; }
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IProcessHelper.cs
index d64f5c8132..0824fd314c 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IProcessHelper.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IProcessHelper.cs
@@ -1,115 +1,120 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+/// <summary>
+/// Interface for any process related functionality. This is needed for clean unit-testing.
+/// </summary>
+public interface IProcessHelper
 {
-    using System;
-    using System.Collections.Generic;
+    /// <summary>
+    /// Launches the process with the given arguments.
+    /// </summary>
+    /// <param name="processPath">The full file name of the process.</param>
+    /// <param name="arguments">The command-line arguments.</param>
+    /// <param name="workingDirectory">The working directory for this process.</param>
+    /// <param name="envVariables">Environment variables to set while bootstrapping the process.</param>
+    /// <param name="errorCallback">Call back for to read error stream data</param>
+    /// <param name="exitCallBack">Call back for on process exit</param>
+    /// <param name="outputCallBack">Call back for on process output</param>
+    /// <returns>The process created.</returns>
+    object LaunchProcess(string processPath, string? arguments, string? workingDirectory, IDictionary<string, string?>? envVariables, Action<object?, string?>? errorCallback, Action<object?>? exitCallBack, Action<object?, string?>? outputCallBack);
+
+    /// <summary>
+    /// Gets the current process file path.
+    /// </summary>
+    /// <returns>The current process file path.</returns>
+    string? GetCurrentProcessFileName();
+
+    /// <summary>
+    /// Gets the current process location.
+    /// </summary>
+    /// <returns>The current process location.</returns>
+    string GetCurrentProcessLocation();
+
+    /// <summary>
+    /// Gets the location of test engine.
+    /// </summary>
+    /// <returns>Location of test engine.</returns>
+    string? GetTestEngineDirectory();
+
+    /// <summary>
+    /// Gets the location of native dll's, depending on current process architecture..
+    /// </summary>
+    /// <returns>Location of native dll's</returns>
+    string GetNativeDllDirectory();
+
+    /// <summary>
+    /// Gets current process architecture
+    /// </summary>
+    /// <returns>Process Architecture</returns>
+    PlatformArchitecture GetCurrentProcessArchitecture();
+
+    /// <summary>
+    /// Gets process architecture
+    /// </summary>
+    /// <returns>Process Architecture</returns>
+    PlatformArchitecture GetProcessArchitecture(int processId);
+
+    /// <summary>
+    /// Gets the process id of test engine.
+    /// </summary>
+    /// <returns>process id of test engine.</returns>
+    int GetCurrentProcessId();
+
+    /// <summary>
+    /// Gets the process id of input process.
+    /// </summary>
+    /// <param name="process">process parameter</param>
+    /// <returns>process id.</returns>
+    int GetProcessId(object? process);
+
+    /// <summary>
+    /// Gets the process name for given process id.
+    /// </summary>
+    /// <param name="processId">process id</param>
+    /// <returns>Name of process</returns>
+    string GetProcessName(int processId);
+
+    /// <summary>
+    /// False if process has not exited, True otherwise. Set exitCode only if process has exited.
+    /// </summary>
+    /// <param name="process">process parameter</param>
+    /// <param name="exitCode">return value of exitCode</param>
+    /// <returns>False if process has not exited, True otherwise</returns>
+    bool TryGetExitCode(object? process, out int exitCode);
+
+    /// <summary>
+    /// Sets the process exit callback.
+    /// </summary>
+    /// <param name="processId">
+    /// The process id.
+    /// </param>
+    /// <param name="callbackAction">
+    /// Callback on process exit.
+    /// </param>
+    void SetExitCallback(int processId, Action<object?>? callbackAction);
+
+    /// <summary>
+    /// Terminates a process.
+    /// </summary>
+    /// <param name="process">Reference of process to terminate.</param>
+    void TerminateProcess(object? process);
+
+    /// <summary>
+    /// Wait for process to exit
+    /// </summary>
+    /// <param name="process">Reference to process</param>
+    void WaitForProcessExit(object? process);
 
     /// <summary>
-    /// Interface for any process related functionality. This is needed for clean unit-testing.
+    /// Gets the process handle for given process Id.
     /// </summary>
-    public interface IProcessHelper
-    {
-        /// <summary>
-        /// Launches the process with the given arguments.
-        /// </summary>
-        /// <param name="processPath">The full file name of the process.</param>
-        /// <param name="arguments">The command-line arguments.</param>
-        /// <param name="workingDirectory">The working directory for this process.</param>
-        /// <param name="environmentVariables">Environment variables to set while bootstrapping the process.</param>
-        /// <param name="errorCallback">Call back for to read error stream data</param>
-        /// <param name="exitCallBack">Call back for on process exit</param>
-        /// <param name="outputCallback">Call back for on process output</param>
-        /// <returns>The process created.</returns>
-        object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> environmentVariables, Action<object, string> errorCallback, Action<object> exitCallBack, Action<object, string> outputCallback);
-
-        /// <summary>
-        /// Gets the current process file path.
-        /// </summary>
-        /// <returns>The current process file path.</returns>
-        string GetCurrentProcessFileName();
-
-        /// <summary>
-        /// Gets the current process location.
-        /// </summary>
-        /// <returns>The current process location.</returns>
-        string GetCurrentProcessLocation();
-
-        /// <summary>
-        /// Gets the location of test engine.
-        /// </summary>
-        /// <returns>Location of test engine.</returns>
-        string GetTestEngineDirectory();
-
-        /// <summary>
-        /// Gets the location of native dll's, depending on current process architecture..
-        /// </summary>
-        /// <returns>Location of native dll's</returns>
-        string GetNativeDllDirectory();
-
-        /// <summary>
-        /// Gets current process architecture
-        /// </summary>
-        /// <returns>Process Architecture</returns>
-        PlatformArchitecture GetCurrentProcessArchitecture();
-
-        /// <summary>
-        /// Gets the process id of test engine.
-        /// </summary>
-        /// <returns>process id of test engine.</returns>
-        int GetCurrentProcessId();
-
-        /// <summary>
-        /// Gets the process id of input process.
-        /// </summary>
-        /// <param name="process">process parameter</param>
-        /// <returns>process id.</returns>
-        int GetProcessId(object process);
-
-        /// <summary>
-        /// Gets the process name for given process id.
-        /// </summary>
-        /// <param name="processId">process id</param>
-        /// <returns>Name of process</returns>
-        string GetProcessName(int processId);
-
-        /// <summary>
-        /// False if process has not exited, True otherwise. Set exitCode only if process has exited.
-        /// </summary>
-        /// <param name="process">process parameter</param>
-        /// <param name="exitCode">return value of exitCode</param>
-        /// <returns>False if process has not exited, True otherwise</returns>
-        bool TryGetExitCode(object process, out int exitCode);
-
-        /// <summary>
-        /// Sets the process exit callback.
-        /// </summary>
-        /// <param name="processId">
-        /// The process id.
-        /// </param>
-        /// <param name="callbackAction">
-        /// Callback on process exit.
-        /// </param>
-        void SetExitCallback(int processId, Action<object> callbackAction);
-
-        /// <summary>
-        /// Terminates a process.
-        /// </summary>
-        /// <param name="process">Reference of process to terminate.</param>
-        void TerminateProcess(object process);
-
-        /// <summary>
-        /// Wait for process to exit
-        /// </summary>
-        /// <param name="process">Reference to process</param>
-        void WaitForProcessExit(object process);
-
-        /// <summary>
-        /// Gets the process handle for given process Id.
-        /// </summary>
-        /// <param name="processId">process id</param>
-        /// <returns>Process Handle</returns>
-        IntPtr GetProcessHandle(int processId);
-    }
+    /// <param name="processId">process id</param>
+    /// <returns>Process Handle</returns>
+    nint GetProcessHandle(int processId);
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IThread.cs
index a003f1cb5c..eac70a45ee 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IThread.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IThread.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    public interface IThread
-    {
-        /// <summary>
-        /// Runs the action in a thread with given apartment state.
-        /// </summary>
-        /// <param name="action">The Action to be called. No-Op if action is null.</param>
-        /// <param name="apartmentState">The apartment state.</param>
-        /// <param name="waitForCompletion"> True for running in Sync, False for running in Async</param>
-        /// <exception cref="ThreadApartmentStateNotSupportedException"> When thread apartment state not supported for platform. </exception>>
-        void Run(Action action, PlatformApartmentState apartmentState, bool waitForCompletion);
-    }
+public interface IThread
+{
+    /// <summary>
+    /// Runs the action in a thread with given apartment state.
+    /// </summary>
+    /// <param name="action">The Action to be called. No-Op if action is null.</param>
+    /// <param name="apartmentState">The apartment state.</param>
+    /// <param name="waitForCompletion"> True for running in Sync, False for running in Async</param>
+    /// <exception cref="ThreadApartmentStateNotSupportedException"> When thread apartment state not supported for platform. </exception>>
+    void Run(Action? action, PlatformApartmentState apartmentState, bool waitForCompletion);
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformApartmentState.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformApartmentState.cs
index be6d472f66..7267f586ab 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformApartmentState.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformApartmentState.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <summary>
+/// Available apartment states for test platform.
+/// </summary>
+public enum PlatformApartmentState
 {
-    /// <summary>
-    /// Available apartment states for test platform.
-    /// </summary>
-    public enum PlatformApartmentState
-    {
-        MTA,
-        STA
-    }
+    MTA,
+    STA,
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
index 2c7db68f75..9c656677de 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs
@@ -1,17 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <summary>
+/// Available architectures for test platform.
+/// </summary>
+public enum PlatformArchitecture
 {
-    /// <summary>
-    /// Available architectures for test platform.
-    /// </summary>
-    public enum PlatformArchitecture
-    {
-        X86,
-        X64,
-        ARM,
-        ARM64,
-        S390x
-    }
+    X86,
+    X64,
+    ARM,
+    ARM64,
+    S390x,
+    Ppc64le,
+    RiscV64,
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperatingSystem.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperatingSystem.cs
new file mode 100644
index 0000000000..94515fe380
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperatingSystem.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <summary>
+/// Available operating systems.
+/// </summary>
+public enum PlatformOperatingSystem
+{
+    Windows,
+    Unix,
+    OSX,
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperationSystem.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperationSystem.cs
deleted file mode 100644
index 16679783b2..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformOperationSystem.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    /// <summary>
-    /// Available operating systems.
-    /// </summary>
-    public enum PlatformOperatingSystem
-    {
-        Windows,
-        Unix,
-        OSX
-    }
-}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/ThreadApartmentStateNotSupportedException.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/ThreadApartmentStateNotSupportedException.cs
index 6824252767..5fca45c871 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/ThreadApartmentStateNotSupportedException.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/ThreadApartmentStateNotSupportedException.cs
@@ -1,48 +1,42 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
+/// <summary>
+/// Thread apartment state not supported exception.
+/// </summary>
+public class ThreadApartmentStateNotSupportedException : Exception
+{
     /// <summary>
-    /// Thread apartment state not supported exception.
+    /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
+    /// Initializes with the message.
     /// </summary>
-    public class ThreadApartmentStateNotSupportedException : Exception
+    public ThreadApartmentStateNotSupportedException()
     {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public ThreadApartmentStateNotSupportedException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public ThreadApartmentStateNotSupportedException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public ThreadApartmentStateNotSupportedException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public ThreadApartmentStateNotSupportedException(string? message)
+        : base(message)
+    {
+    }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ThreadApartmentStateNotSupportedException"/> class.
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public ThreadApartmentStateNotSupportedException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
+
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs
index 6e815a4697..8faa2a2dce 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs
@@ -1,78 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Specifies what messages to output for the System.Diagnostics.Debug, System.Diagnostics.Trace
+/// and System.Diagnostics.TraceSwitch classes.
+/// </summary>
+public partial interface IPlatformEqtTrace
 {
-    /// <summary>
-    /// Specifies what messages to output for the System.Diagnostics.Debug, System.Diagnostics.Trace
-    /// and System.Diagnostics.TraceSwitch classes.
-    /// </summary>
-    public partial interface IPlatformEqtTrace
+    // This is added to ensure that tracing for testhost/datacollector should not be instantiated if not enabled via --diag switch.
+    bool DoNotInitialize
     {
-        // This is added to ensure that tracing for testhost/datacollector should not be instantiated if not enabled via --diag switch.
-        bool DoNotInitialize
-        {
-            get;
-            set;
-        }
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Adds the message to the trace log.
-        /// The line becomes:
-        ///     [I, PID, ThreadID, 2003/06/11 11:56:07.445] CallingAssemblyName: message.
-        /// </summary>
-        /// <param name="level">Trace level.</param>
-        /// <param name="message">The message to add to trace.</param>
-        void WriteLine(PlatformTraceLevel level, string message);
+    /// <summary>
+    /// Adds the message to the trace log.
+    /// The line becomes:
+    ///     [I, PID, ThreadID, 2003/06/11 11:56:07.445] CallingAssemblyName: message.
+    /// </summary>
+    /// <param name="level">Trace level.</param>
+    /// <param name="message">The message to add to trace.</param>
+    void WriteLine(PlatformTraceLevel level, string? message);
 
-        /// <summary>
-        /// Initializes the verbose tracing with custom log file
-        /// And overrides if any trace is set before
-        /// </summary>
-        /// <param name="customLogFile">
-        /// A custom log file for trace messages.
-        /// </param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        bool InitializeVerboseTrace(string customLogFile);
+    /// <summary>
+    /// Initializes the verbose tracing with custom log file
+    /// And overrides if any trace is set before
+    /// </summary>
+    /// <param name="customLogFile">
+    /// A custom log file for trace messages.
+    /// </param>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    bool InitializeVerboseTrace(string? customLogFile);
 
-        /// <summary>
-        /// Initializes the tracing with custom log file and trace level.
-        /// Overrides if any trace is set before.
-        /// </summary>
-        /// <param name="customLogFile">Custom log file for trace messages.</param>
-        /// <param name="traceLevel">Trace level.</param>
-        /// <returns>Trace initialized flag.</returns>
-        bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel);
+    /// <summary>
+    /// Initializes the tracing with custom log file and trace level.
+    /// Overrides if any trace is set before.
+    /// </summary>
+    /// <param name="customLogFile">Custom log file for trace messages.</param>
+    /// <param name="traceLevel">Trace level.</param>
+    /// <returns>Trace initialized flag.</returns>
+    bool InitializeTrace(string? customLogFile, PlatformTraceLevel traceLevel);
 
-        /// <summary>
-        /// Gets a value indicating if tracing is enabled for a trace level.
-        /// </summary>
-        /// <param name="traceLevel">Trace level.</param>
-        /// <returns>True if tracing is enabled.</returns>
-        bool ShouldTrace(PlatformTraceLevel traceLevel);
+    /// <summary>
+    /// Gets a value indicating if tracing is enabled for a trace level.
+    /// </summary>
+    /// <param name="traceLevel">Trace level.</param>
+    /// <returns>True if tracing is enabled.</returns>
+    bool ShouldTrace(PlatformTraceLevel traceLevel);
 
-        /// <summary>
-        /// Gets file path for trace log file.
-        /// </summary>
-        /// <returns>True if tracing is enabled.</returns>
-        string GetLogFile();
+    /// <summary>
+    /// Gets file path for trace log file.
+    /// </summary>
+    /// <returns>True if tracing is enabled.</returns>
+    string? GetLogFile();
 
-        /// <summary>
-        /// Sets platform specific trace value for tracing verbosity.
-        /// </summary>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        void SetTraceLevel(PlatformTraceLevel value);
+    /// <summary>
+    /// Sets platform specific trace value for tracing verbosity.
+    /// </summary>
+    /// <param name="value">
+    /// The value.
+    /// </param>
+    void SetTraceLevel(PlatformTraceLevel value);
 
-        /// <summary>
-        /// Gets platform specific trace value for tracing verbosity.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="PlatformTraceLevel"/>.
-        /// </returns>
-        PlatformTraceLevel GetTraceLevel();
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets platform specific trace value for tracing verbosity.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="PlatformTraceLevel"/>.
+    /// </returns>
+    PlatformTraceLevel GetTraceLevel();
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/PlatformTraceLevel.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/PlatformTraceLevel.cs
index 341829721e..b01a5293dc 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/PlatformTraceLevel.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/PlatformTraceLevel.cs
@@ -1,33 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public enum PlatformTraceLevel
 {
-    public enum PlatformTraceLevel
-    {
-        /// <summary>
-        /// Output no tracing and debugging messages..
-        /// </summary>
-        Off = 0,
+    /// <summary>
+    /// Output no tracing and debugging messages..
+    /// </summary>
+    Off = 0,
 
-        /// <summary>
-        /// Output error-handling messages.
-        /// </summary>
-        Error = 1,
+    /// <summary>
+    /// Output error-handling messages.
+    /// </summary>
+    Error = 1,
 
-        /// <summary>
-        /// Output warnings and error-handling messages.
-        /// </summary>
-        Warning = 2,
+    /// <summary>
+    /// Output warnings and error-handling messages.
+    /// </summary>
+    Warning = 2,
 
-        /// <summary>
-        /// Output informational messages, warnings, and error-handling messages..
-        /// </summary>
-        Info = 3,
+    /// <summary>
+    /// Output informational messages, warnings, and error-handling messages..
+    /// </summary>
+    Info = 3,
 
-        /// <summary>
-        /// Output all debugging and tracing messages..
-        /// </summary>
-        Verbose = 4
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Output all debugging and tracing messages..
+    /// </summary>
+    Verbose = 4
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
index 6ec22c7bc4..7bc1805000 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
@@ -1,77 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-	</PropertyGroup>
-	<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-	<PropertyGroup>
-		<AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
-		<RootNamespace>Microsoft.TestPlatform.PlatformAbstractions</RootNamespace>
-		<TargetFrameworks>net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0;netstandard1.0</TargetFrameworks>
-		<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-		<EnableCodeAnalysis>true</EnableCodeAnalysis>
-		<IsTestProject>false</IsTestProject>
-		<!-- This causes a build error on netcoreapp1.0 -->
-		<NoWarn Condition="'$(TargetFramework)' != 'netcoreapp1.0'">NU1605</NoWarn>
-	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-		<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-		<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-		<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-		<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-		<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-		<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-		<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-		<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-	</PropertyGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netcoreapp1.0' ">
-		<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
-		<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
-		<PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.0.0" />
-		<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
-		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
-		<PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
-		<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
-		<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />
-
-		<Reference Include="System.Configuration" />
-		<Reference Include="System" />
-		<Reference Include="Microsoft.CSharp" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-		<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.1.0" />
-		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-		<PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<!-- API that is common to all frameworks that we build for. -->
-		<AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
-		<AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
-		<!-- API that is common to all frameworks except for .NET Standard 1.0. -->
-		<AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Shipped.txt" />
-		<AdditionalFiles Condition=" '$(TargetFramework)' != 'netstandard1.0' " Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
-		<!-- Framework specific API -->
-		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-		<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<!-- We normally don't build against net6.0, so the public api analyzer errors would only appear in CI pipeline. -->
-		<PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4-beta1.21554.2">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <PropertyGroup>
+    <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
+    <RootNamespace>Microsoft.TestPlatform.PlatformAbstractions</RootNamespace>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
+    <IsTestProject>false</IsTestProject>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI\net\PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))&#xD;&#xA;                                or '$(TargetFramework)' == 'netstandard2.0' " Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API for net8.0+ -->
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) " Include="PublicAPI\net8.0\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.cs
new file mode 100644
index 0000000000..09da0eae41
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.PlatformAbstractions;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.tt b/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Properties/AssemblyInfo.cs
deleted file mode 100644
index aa2352b2fa..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.PlatformAbstractions")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
index 90c3e8b2dd..99667b0d8c 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt
@@ -1,19 +1,20 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace
 Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.DoNotInitialize.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.DoNotInitialize.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.GetLogFile() -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.GetLogFile() -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.GetTraceLevel() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.InitializeVerboseTrace(string customLogFile) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.InitializeVerboseTrace(string? customLogFile) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetTraceLevel(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel value) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.ShouldTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.DoNotInitialize.get -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.DoNotInitialize.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.GetLogFile() -> string
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.GetLogFile() -> string?
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.GetTraceLevel() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeVerboseTrace(string customLogFile) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeVerboseTrace(string? customLogFile) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.PlatformEqtTrace() -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetTraceLevel(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel value) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ShouldTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
@@ -24,56 +25,59 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel.Off = 0 -> Mi
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel.Verbose = 4 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel.Warning = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs.AssemblyResolveEventArgs(string name) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs.Name.get -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs.AssemblyResolveEventArgs(string? name) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs.Name.get -> string?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventArgs.Name.set -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyLoadContext
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyLoadContext.GetAssemblyNameFromPath(string assemblyPath) -> System.Reflection.AssemblyName
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyLoadContext.LoadAssemblyFromPath(string assemblyPath) -> System.Reflection.Assembly
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyLoadContext.GetAssemblyNameFromPath(string! assemblyPath) -> System.Reflection.AssemblyName!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyLoadContext.LoadAssemblyFromPath(string! assemblyPath) -> System.Reflection.Assembly!
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyResolver
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyResolver.AssemblyResolve -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IAssemblyResolver.AssemblyResolve -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.Architecture.get -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.Exit(int exitcode) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.GetCurrentManagedThreadId() -> int
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.OperatingSystem.get -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.OperatingSystemVersion.get -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.OperatingSystemVersion.get -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IEnvironment.ProcessorCount.get -> int
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessArchitecture() -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessFileName() -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessFileName() -> string?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessId() -> int
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessLocation() -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetNativeDllDirectory() -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessHandle(int processId) -> System.IntPtr
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessId(object process) -> int
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessName(int processId) -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetTestEngineDirectory() -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> environmentVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallback) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.TerminateProcess(object process) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.TryGetExitCode(object process, out int exitCode) -> bool
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.WaitForProcessExit(object process) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetCurrentProcessLocation() -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetNativeDllDirectory() -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessArchitecture(int processId) -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessHandle(int processId) -> nint
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessId(object? process) -> int
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetProcessName(int processId) -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.GetTestEngineDirectory() -> string?
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.SetExitCallback(int processId, System.Action<object?>? callbackAction) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.TerminateProcess(object? process) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.TryGetExitCode(object? process, out int exitCode) -> bool
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IProcessHelper.WaitForProcessExit(object? process) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IStream
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IStream.CreateBufferedStream(System.IO.Stream stream, int bufferSize) -> System.IO.Stream
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IStream.CreateBufferedStream(System.IO.Stream! stream, int bufferSize) -> System.IO.Stream!
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IThread
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.IThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState.MTA = 0 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState.STA = 1 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM = 2 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM64 = 3 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.Ppc64le = 5 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.S390x = 4 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X64 = 1 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X86 = 0 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext.GetAssemblyNameFromPath(string assemblyPath) -> System.Reflection.AssemblyName
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext.LoadAssemblyFromPath(string assemblyPath) -> System.Reflection.Assembly
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext.GetAssemblyNameFromPath(string! assemblyPath) -> System.Reflection.AssemblyName!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext.LoadAssemblyFromPath(string! assemblyPath) -> System.Reflection.Assembly!
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyLoadContext.PlatformAssemblyLoadContext() -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.AssemblyResolve -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.AssemblyResolve -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces.AssemblyResolveEventHandler?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose() -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.PlatformAssemblyResolver() -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment
@@ -81,35 +85,39 @@ Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.Arc
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.Exit(int exitcode) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.GetCurrentManagedThreadId() -> int
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.OperatingSystem.get -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.OperatingSystemVersion.get -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.OperatingSystemVersion.get -> string!
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.PlatformEnvironment() -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformEnvironment.ProcessorCount.get -> int
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem.OSX = 2 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem.Unix = 1 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem.Windows = 0 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformOperatingSystem
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformStream
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformStream.CreateBufferedStream(System.IO.Stream stream, int bufferSize) -> System.IO.Stream
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformStream.CreateBufferedStream(System.IO.Stream! stream, int bufferSize) -> System.IO.Stream!
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformStream.PlatformStream() -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.PlatformThread() -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessArchitecture() -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessFileName() -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessFileName() -> string?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessId() -> int
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessLocation() -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetNativeDllDirectory() -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessHandle(int processId) -> System.IntPtr
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessId(object process) -> int
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessName(int processId) -> string
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetTestEngineDirectory() -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetCurrentProcessLocation() -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetNativeDllDirectory() -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessArchitecture(int processId) -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessHandle(int processId) -> nint
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessId(object? process) -> int
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessName(int processId) -> string!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetTestEngineDirectory() -> string?
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.ProcessHelper() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.TerminateProcess(object process) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.TryGetExitCode(object process, out int exitCode) -> bool
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.WaitForProcessExit(object process) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.TerminateProcess(object? process) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.TryGetExitCode(object? process, out int exitCode) -> bool
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.WaitForProcessExit(object? process) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException.ThreadApartmentStateNotSupportedException() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException.ThreadApartmentStateNotSupportedException(string message) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException.ThreadApartmentStateNotSupportedException(string message, System.Exception innerException) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ErrorOnInitialization.get -> string
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException.ThreadApartmentStateNotSupportedException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ThreadApartmentStateNotSupportedException.ThreadApartmentStateNotSupportedException(string? message, System.Exception? innerException) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ErrorOnInitialization.get -> string?
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.ErrorOnInitialization.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions.GetAssemblyLocation(this System.Reflection.Assembly assembly) -> string
+static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions.GetAssemblyLocation(this System.Reflection.Assembly! assembly) -> string!
+virtual Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.RiscV64 = 6 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Shipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Shipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Shipped.txt
deleted file mode 100644
index 900229a3de..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.RemoteEqtTrace() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt
deleted file mode 100644
index 900229a3de..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener listener) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain childDomain) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.RemoteEqtTrace() -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.set -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..c8d1f7b662
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1,25 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.RemoteEqtTrace() -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.set -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object?>? callbackAction) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo! startInfo, string! name, string? value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Shipped.txt
deleted file mode 100644
index cd6e7ecdfc..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net6.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d17adb2a82
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1,17 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object?>? callbackAction) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo! startInfo, string! name, string? value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt
deleted file mode 100644
index cd6e7ecdfc..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp1.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt
deleted file mode 100644
index cd6e7ecdfc..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp2.1/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..d17adb2a82
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
@@ -0,0 +1,17 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object?>? callbackAction) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string?
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
+static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo! startInfo, string! name, string? value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..ab058de62d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
deleted file mode 100644
index 52c2c42ffb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel, string message) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState platformApartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessById(int processId) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> environmentVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> ouputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int parentProcessId, System.Action<object> callbackAction) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.0/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
deleted file mode 100644
index 52c2c42ffb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel, string message) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState platformApartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessById(int processId) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> environmentVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> ouputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int parentProcessId, System.Action<object> callbackAction) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
deleted file mode 100644
index 5f282702bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard1.3/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
index cd6e7ecdfc..d17adb2a82 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -1,17 +1,17 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool
 Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
 Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener
-Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string fileName, string name, int rollSizeKB) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> envVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallBack) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object> callbackAction) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action<object?>? callbackAction) -> void
 Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions
 override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void
-override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string message) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
+override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string? message) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string?
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void
-static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo startInfo, string name, string value) -> void
+static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo! startInfo, string! name, string? value) -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Shipped.txt
index e83d369b18..d396faaefd 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Shipped.txt
@@ -1,8 +1,9 @@
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
-Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string message) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessById(int processId) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string processPath, string arguments, string workingDirectory, System.Collections.Generic.IDictionary<string, string> environmentVariables, System.Action<object, string> errorCallback, System.Action<object> exitCallBack, System.Action<object, string> outputCallback) -> object
-Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int parentProcessId, System.Action<object> callbackAction) -> void
-static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> bool
+Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.GetProcessById(int processId) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary<string!, string?>? envVariables, System.Action<object?, string?>? errorCallback, System.Action<object?>? exitCallBack, System.Action<object?, string?>? outputCallBack) -> object!
+Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int parentProcessId, System.Action<object?>? callbackAction) -> void
+static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string?
 static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.set -> void
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
index 5f282702bb..ab058de62d 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/uap10.0/PublicAPI.Unshipped.txt
@@ -1 +1 @@
-
\ No newline at end of file
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/VersionAttribute.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/VersionAttribute.cs
new file mode 100644
index 0000000000..dbe5de5bc1
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/VersionAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.TestPlatform.PlatformAbstractions;
+
+[Conditional("DEBUG")]
+[AttributeUsage(AttributeTargets.Method)]
+internal class VersionAttribute : Attribute
+{
+    public string? Description { get; set; }
+
+#pragma warning disable IDE0060 // Remove unused parameter // TODO: Do something with version or remove it
+    public VersionAttribute(int version)
+#pragma warning restore IDE0060 // Remove unused parameter
+    {
+
+    }
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs
index ce58abfd9c..4d1ecdfbd6 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs
@@ -3,20 +3,19 @@
 
 #if NETFRAMEWORK || NETCOREAPP || NETSTANDARD2_0
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.IO;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
+/// <inheritdoc/>
+public class PlatformStream : IStream
+{
     /// <inheritdoc/>
-    public class PlatformStream : IStream
+    public Stream CreateBufferedStream(Stream stream, int bufferSize)
     {
-        /// <inheritdoc/>
-        public Stream CreateBufferedStream(Stream stream, int bufferSize)
-        {
-            return new BufferedStream(stream, bufferSize);
-        }
+        return new BufferedStream(stream, bufferSize);
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/NativeMethods.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/NativeMethods.cs
new file mode 100644
index 0000000000..e75a249168
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/common/NativeMethods.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+internal class NativeMethods
+{
+    public const ushort IMAGE_FILE_MACHINE_ARM64 = 0xAA64;
+    public const ushort IMAGE_FILE_MACHINE_UNKNOWN = 0;
+
+    [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool IsWow64Process2([In] IntPtr process, [Out] out ushort processMachine, [Out] out ushort nativeMachine);
+
+    // A pointer to a value that is set to TRUE if the process is running under WOW64.
+    // If the process is running under 32-bit Windows, the value is set to FALSE.
+    // If the process is a 64-bit application running under 64-bit Windows, the value is also set to FALSE.
+    [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IsWow64Process([In] IntPtr process, [Out] out bool wow64Process);
+}
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
index 3d727f8260..b378c5a923 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
@@ -1,220 +1,339 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if NETFRAMEWORK || NETCOREAPP ||  NETSTANDARD2_0
+#if NETFRAMEWORK || NETCOREAPP || NETSTANDARD2_0
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+#if !NET5_0_OR_GREATER
+using System.Threading.Tasks;
+#endif
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <summary>
+/// Helper class to deal with process related functionality.
+/// </summary>
+public partial class ProcessHelper : IProcessHelper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
+    private static readonly string Arm = "arm";
+    private readonly Process _currentProcess = Process.GetCurrentProcess();
 
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+#if !NET5_0_OR_GREATER
+    private readonly IEnvironment _environment;
+#endif
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public ProcessHelper() : this(new PlatformEnvironment())
+    {
+    }
+
+    internal ProcessHelper(IEnvironment environment)
+    {
+#if !NET5_0_OR_GREATER
+        _environment = environment;
+#endif
+    }
 
     /// <summary>
-    /// Helper class to deal with process related functionality.
+    /// Gets or sets the set of environment variables to be used when spawning a new process.
+    /// Should this set of environment variables be null, the environment variables inherited from
+    /// the parent process will be used.
     /// </summary>
-    public partial class ProcessHelper : IProcessHelper
+    internal static IDictionary<string, string?>? ExternalEnvironmentVariables { get; set; }
+
+    /// <inheritdoc/>
+    public object LaunchProcess(string processPath, string? arguments, string? workingDirectory, IDictionary<string, string?>? envVariables, Action<object?, string?>? errorCallback, Action<object?>? exitCallBack, Action<object?, string?>? outputCallBack)
     {
-        private static readonly string ARM = "arm";
+        if (!File.Exists(processPath))
+        {
+            throw new FileNotFoundException("Path does not exist: " + processPath, processPath);
+        }
 
-        /// <inheritdoc/>
-        public object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> envVariables, Action<object, string> errorCallback, Action<object> exitCallBack, Action<object, string> outputCallBack)
+        var process = new Process();
+        try
         {
-            var process = new Process();
-            try
-            {
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.WorkingDirectory = workingDirectory;
+            InitializeAndStart();
+        }
+        catch (Exception)
+        {
+            process.Dispose();
 
-                process.StartInfo.FileName = processPath;
-                process.StartInfo.Arguments = arguments;
-                process.StartInfo.RedirectStandardError = true;
+            //EqtTrace.Error("TestHost Object {0} failed to launch with the following exception: {1}", processPath, exception.Message);
+            throw;
+        }
 
-                process.EnableRaisingEvents = true;
+        return process;
 
-                if (envVariables != null)
+        // Local functions
+        void InitializeAndStart()
+        {
+            process.StartInfo.UseShellExecute = false;
+            process.StartInfo.CreateNoWindow = true;
+            process.StartInfo.WorkingDirectory = workingDirectory;
+
+            process.StartInfo.FileName = processPath;
+            process.StartInfo.Arguments = arguments;
+            process.StartInfo.RedirectStandardError = true;
+
+            process.EnableRaisingEvents = true;
+
+            // When vstest.console is started in its own process in VisualStudio it is TestWindowStoreHost that starts it.
+            // TestWindowStoreHost inherits environment variables from ServiceHost and DevEnv. Those env variables,
+            // contain multiple "internal" environment variables, and they also contain DOTNET_ROOT pointing to the 
+            // .NET that is shipped with VisualStudio. So to work around this, vstest.console is given a set of environment
+            // variables that has only variables that DevEnv was started with. So it gets a "clean" set of env variables.
+            //
+            // When we run vstest.console in process, we cannot start ourselves with the same clean set of env variables,
+            // and the best we can do is to start our child processes (testhost / datacollector) with this environment.
+            // To do that we pass that set of "clean" env variables down to the ProcessHelper, and use those instead
+            // of all the variables that are set in the current process.
+            if (ExternalEnvironmentVariables is not null)
+            {
+                process.StartInfo.EnvironmentVariables.Clear();
+                foreach (var kvp in ExternalEnvironmentVariables)
                 {
-                    foreach (var kvp in envVariables)
+                    if (kvp.Value is null)
                     {
-                        process.StartInfo.AddEnvironmentVariable(kvp.Key, kvp.Value);
+                        continue;
                     }
-                }
 
-                if (outputCallBack != null)
-                {
-                    process.StartInfo.RedirectStandardOutput = true;
-                    process.OutputDataReceived += (sender, args) => outputCallBack(sender as Process, args.Data);
+                    process.StartInfo.AddEnvironmentVariable(kvp.Key, kvp.Value);
                 }
+            }
 
-                if (errorCallback != null)
+            // Set additional environment variables.
+            if (envVariables != null)
+            {
+                foreach (var kvp in envVariables)
                 {
-                    process.ErrorDataReceived += (sender, args) => errorCallback(sender as Process, args.Data);
+                    process.StartInfo.AddEnvironmentVariable(kvp.Key, kvp.Value);
                 }
+            }
+
+            if (outputCallBack != null)
+            {
+                process.StartInfo.RedirectStandardOutput = true;
+                process.OutputDataReceived += (sender, args) => outputCallBack(sender as Process, args.Data);
+            }
+
+            if (errorCallback != null)
+            {
+                process.ErrorDataReceived += (sender, args) => errorCallback(sender as Process, args.Data);
+            }
 
-                if (exitCallBack != null)
+            if (exitCallBack != null)
+            {
+                process.Exited += async (sender, args) =>
                 {
-                    process.Exited += (sender, args) =>
+                    const int timeout = 500;
+
+                    if (sender is Process p)
                     {
-                        // Call WaitForExit without again to ensure all streams are flushed,
-                        var p = sender as Process;
                         try
                         {
-                            // Add timeout to avoid indefinite waiting on child process exit.
-                            p.WaitForExit(500);
+                            // NOTE: When receiving an exit event, we want to give some time to the child process
+                            // to close properly (i.e. flush output, error stream...). Despite this simple need,
+                            // the actual implementation needs to be complex, especially for Unix systems.
+                            // See ticket https://github.com/microsoft/vstest/issues/3375 to get the links to all
+                            // issues, discussions and documentations.
+                            //
+                            // On .NET 5 and later, the solution is simple, we can simply use WaitForExitAsync which
+                            // correctly ensure that some time is given to the child process (or any grandchild) to
+                            // flush before exit happens.
+                            //
+                            // For older frameworks, the solution is more tricky but it seems we can get the expected
+                            // behavior using the parameterless 'WaitForExit()' combined with an awaited Task.Run call.
+                            var cts = new CancellationTokenSource(timeout);
+#if NET5_0_OR_GREATER
+                            await p.WaitForExitAsync(cts.Token);
+#else
+                            // NOTE: In case we run on Windows we must call 'WaitForExit(timeout)' instead of calling
+                            // the parameterless overload. The reason for this requirement stems from the behavior of
+                            // the Selenium WebDriver when debugging a test. If the debugger is detached, the default
+                            // action is to kill the testhost process that it was attached to, but for some reason we
+                            // end up with a zombie process that would make us wait indefinitely with a simple
+                            // 'WaitForExit()' call. This in turn causes the vstest.console to block waiting for the
+                            // test request to finish and this behavior will be visible to the user since TW will
+                            // show the Selenium test as still running. Only killing the Edge Driver process would help
+                            // unblock vstest.console, but this is not a reasonable ask to our users.
+                            //
+                            // TODO: This fix is not ideal, it's only a workaround to make Selenium tests usable again.
+                            // Ideally, we should spend some more time here in order to better understand what causes
+                            // the testhost to become a zombie process in the first place.
+                            if (_environment.OperatingSystem is PlatformOperatingSystem.Windows)
+                            {
+                                p.WaitForExit(timeout);
+                            }
+                            else
+                            {
+                                cts.Token.Register(() =>
+                                {
+                                    try
+                                    {
+                                        if (!p.HasExited)
+                                        {
+                                            p.Kill();
+                                        }
+                                    }
+                                    catch
+                                    {
+                                        // Ignore all exceptions thrown when trying to kill a process that may be
+                                        // left hanging. This is a best effort to kill it, but should we fail for
+                                        // any reason we'd probably block on 'WaitForExit()' anyway.
+                                    }
+                                });
+                                await Task.Run(() => p.WaitForExit(), cts.Token).ConfigureAwait(false);
+                            }
+#endif
                         }
-                        catch (InvalidOperationException)
+                        catch
                         {
+                            // Ignore all exceptions thrown when asking for process to exit.
+                            // We "expect" TaskCanceledException, COMException (if process was disposed before calling
+                            // the exit) or InvalidOperationException.
                         }
+                    }
 
-                        // If exit callback has code that access Process object, ensure that the exceptions handling should be done properly.
-                        exitCallBack(p);
-                    };
-                }
-
-                // EqtTrace.Verbose("ProcessHelper: Starting process '{0}' with command line '{1}'", processPath, arguments);
-                process.Start();
+                    // If exit callback has code that access Process object, ensure that the exceptions handling should be done properly.
+                    exitCallBack(sender);
+                };
+            }
 
-                if (errorCallback != null)
-                {
-                    process.BeginErrorReadLine();
-                }
+            // EqtTrace.Verbose("ProcessHelper: Starting process '{0}' with command line '{1}'", processPath, arguments);
+            // TODO: Enable logging here, and consider wrapping Win32Exception into another that shows the path of the process.
+            process.Start();
 
-                if (outputCallBack != null)
-                {
-                    process.BeginOutputReadLine();
-                }
-            }
-            catch (Exception)
+            if (errorCallback != null)
             {
-                process.Dispose();
-                process = null;
-
-                // EqtTrace.Error("TestHost Object {0} failed to launch with the following exception: {1}", processPath, exception.Message);
-                throw;
+                process.BeginErrorReadLine();
             }
 
-            return process as object;
+            if (outputCallBack != null)
+            {
+                process.BeginOutputReadLine();
+            }
         }
+    }
 
-        /// <inheritdoc/>
-        public string GetCurrentProcessFileName()
-        {
-            return Process.GetCurrentProcess().MainModule.FileName;
-        }
+    /// <inheritdoc/>
+    public string? GetCurrentProcessFileName()
+    {
+        return _currentProcess.MainModule?.FileName;
+    }
 
-        /// <inheritdoc/>
-        public string GetTestEngineDirectory()
-        {
-            return Path.GetDirectoryName(typeof(ProcessHelper).GetTypeInfo().Assembly.Location);
-        }
+    /// <inheritdoc/>
+    public string? GetTestEngineDirectory()
+    {
+        return Path.GetDirectoryName(typeof(ProcessHelper).Assembly.Location);
+    }
 
-        /// <inheritdoc/>
-        public int GetCurrentProcessId()
-        {
-            return Process.GetCurrentProcess().Id;
-        }
+    /// <inheritdoc/>
+    public int GetCurrentProcessId()
+    {
+        return _currentProcess.Id;
+    }
 
-        /// <inheritdoc/>
-        public string GetProcessName(int processId)
+    /// <inheritdoc/>
+    public string GetProcessName(int processId)
+    {
+        if (processId == _currentProcess.Id)
         {
-            return Process.GetProcessById(processId).ProcessName;
+            return _currentProcess.ProcessName;
         }
 
-        /// <inheritdoc/>
-        public bool TryGetExitCode(object process, out int exitCode)
+        return Process.GetProcessById(processId).ProcessName;
+    }
+
+    /// <inheritdoc/>
+    public bool TryGetExitCode(object? process, out int exitCode)
+    {
+        try
         {
-            var proc = process as Process;
-            try
-            {
-                if (proc != null && proc.HasExited)
-                {
-                    exitCode = proc.ExitCode;
-                    return true;
-                }
-            }
-            catch (InvalidOperationException)
+            if (process is Process proc && proc.HasExited)
             {
+                exitCode = proc.ExitCode;
+                return true;
             }
-
-            exitCode = 0;
-            return false;
         }
-
-        /// <inheritdoc/>
-        public void SetExitCallback(int processId, Action<object> callbackAction)
+        catch (InvalidOperationException)
         {
-            try
-            {
-                var process = Process.GetProcessById(processId);
-                process.EnableRaisingEvents = true;
-                process.Exited += (sender, args) => callbackAction?.Invoke(sender);
-            }
-            catch (ArgumentException)
-            {
-                // Process.GetProcessById() throws ArgumentException if process is not running(identifier might be expired).
-                // Invoke callback immediately.
-                callbackAction?.Invoke(null);
-            }
         }
 
-        /// <inheritdoc/>
-        public void TerminateProcess(object process)
+        exitCode = 0;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public void SetExitCallback(int processId, Action<object?>? callbackAction)
+    {
+        try
         {
-            var proc = process as Process;
-            try
-            {
-                if (proc != null && !proc.HasExited)
-                {
-                    proc.Kill();
-                }
-            }
-            catch (InvalidOperationException)
-            {
-            }
+            var process = processId == _currentProcess.Id ? _currentProcess : Process.GetProcessById(processId);
+            process.EnableRaisingEvents = true;
+            process.Exited += (sender, args) => callbackAction?.Invoke(sender);
         }
-
-        /// <inheritdoc/>
-        public int GetProcessId(object process)
+        catch (ArgumentException)
         {
-            var proc = process as Process;
-            return proc?.Id ?? -1;
+            // Process.GetProcessById() throws ArgumentException if process is not running(identifier might be expired).
+            // Invoke callback immediately.
+            callbackAction?.Invoke(null);
         }
+    }
 
-        /// <inheritdoc/>
-        public PlatformArchitecture GetCurrentProcessArchitecture()
+    /// <inheritdoc/>
+    public void TerminateProcess(object? process)
+    {
+        try
         {
-            if (IntPtr.Size == 8)
+            if (process is Process proc && !proc.HasExited)
             {
-                return PlatformArchitecture.X64;
+                proc.Kill();
             }
-
-            return PlatformArchitecture.X86;
         }
-
-        /// <inheritdoc/>
-        public string GetNativeDllDirectory()
+        catch (InvalidOperationException)
         {
-            var osArchitecture = new PlatformEnvironment().Architecture;
-            if (osArchitecture == PlatformArchitecture.ARM || osArchitecture == PlatformArchitecture.ARM64)
-            {
-                return Path.Combine(this.GetCurrentProcessLocation(), this.GetCurrentProcessArchitecture().ToString().ToLower(), ARM);
-            }
-
-            return Path.Combine(this.GetCurrentProcessLocation(), this.GetCurrentProcessArchitecture().ToString().ToLower());
         }
+    }
 
-        /// <inheritdoc/>
-        public void WaitForProcessExit(object process)
+    /// <inheritdoc/>
+    public int GetProcessId(object? process)
+    {
+        var proc = process as Process;
+        return proc?.Id ?? -1;
+    }
+
+    /// <inheritdoc/>
+    public string GetNativeDllDirectory()
+    {
+        var osArchitecture = new PlatformEnvironment().Architecture;
+        return osArchitecture is PlatformArchitecture.ARM or PlatformArchitecture.ARM64
+            ? Path.Combine(GetCurrentProcessLocation(), GetFormattedCurrentProcessArchitecture(), Arm)
+            : Path.Combine(GetCurrentProcessLocation(), GetFormattedCurrentProcessArchitecture());
+    }
+
+    private string GetFormattedCurrentProcessArchitecture()
+        => GetCurrentProcessArchitecture().ToString()
+            .ToLower(
+#if !NETCOREAPP1_0
+        CultureInfo.InvariantCulture
+#endif
+            );
+
+    /// <inheritdoc/>
+    public void WaitForProcessExit(object? process)
+    {
+        if (process is Process proc && !proc.HasExited)
         {
-            var proc = process as Process;
-            if (proc != null && !proc.HasExited)
-            {
-                proc.WaitForExit();
-            }
+            proc.WaitForExit();
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs
index a23b471d01..7c5f9858fb 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs
@@ -3,439 +3,448 @@
 
 #if NETFRAMEWORK || NETCOREAPP || NETSTANDARD2_0
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Wrapper class for tracing.
+///     - Shortcut-methods for Error, Warning, Info, Verbose.
+///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
+///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
+///     - By default tracing if OFF.
+///     - Our build environment always sets the /d:TRACE so this class is always enabled,
+///       the Debug class is enabled only in debug builds (/d:DEBUG).
+///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
+///       We log ignored exceptions to system Application log.
+///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
+/// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
+/// </summary>
+public partial class PlatformEqtTrace : IPlatformEqtTrace
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Threading;
+    /// <summary>
+    /// Name of the trace listener.
+    /// </summary>
+    private const string ListenerName = "TptTraceListener";
 
     /// <summary>
-    /// Wrapper class for tracing.
-    ///     - Shortcut-methods for Error, Warning, Info, Verbose.
-    ///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
-    ///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
-    ///     - By default tracing if OFF.
-    ///     - Our build environment always sets the /d:TRACE so this class is always enabled,
-    ///       the Debug class is enabled only in debug builds (/d:DEBUG).
-    ///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
-    ///       We log ignored exceptions to system Application log.
-    ///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
-    /// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
+    /// Create static maps for TraceLevel to SourceLevels. The APIs need to provide TraceLevel
+    /// for backward compatibility with older versions of Object Model.
     /// </summary>
-    public partial class PlatformEqtTrace : IPlatformEqtTrace
-    {
-        /// <summary>
-        /// Name of the trace listener.
-        /// </summary>
-        private const string ListenerName = "TptTraceListener";
-
-        /// <summary>
-        /// Create static maps for TraceLevel to SourceLevels. The APIs need to provide TraceLevel
-        /// for backward compatibility with older versions of Object Model.
-        /// </summary>
-        private static readonly Dictionary<TraceLevel, SourceLevels> TraceSourceLevelsMap =
-            new Dictionary<TraceLevel, SourceLevels>
-                {
-                        { TraceLevel.Error, SourceLevels.Error },
-                        { TraceLevel.Info, SourceLevels.Information },
-                        { TraceLevel.Off, SourceLevels.Off },
-                        { TraceLevel.Verbose, SourceLevels.Verbose },
-                        { TraceLevel.Warning, SourceLevels.Warning }
-                };
-
-        /// <summary>
-        /// Create static maps for SourceLevels to TraceLevel. The APIs need to provide TraceLevel
-        /// for backward compatibility with older versions of Object Model.
-        /// </summary>
-        private static readonly Dictionary<SourceLevels, TraceLevel> SourceTraceLevelsMap =
-            new Dictionary<SourceLevels, TraceLevel>
-                {
-                        { SourceLevels.Error, TraceLevel.Error },
-                        { SourceLevels.Information, TraceLevel.Info },
-                        { SourceLevels.Off, TraceLevel.Off },
-                        { SourceLevels.Verbose, TraceLevel.Verbose },
-                        { SourceLevels.Warning, TraceLevel.Warning },
-                        { SourceLevels.All, TraceLevel.Verbose }
-                };
-
-        /// <summary>
-        /// Create static maps for SourceLevels to TraceLevel. The APIs need to provide TraceLevel
-        /// for backward compatibility with older versions of Object Model.
-        /// </summary>
-        private static readonly Dictionary<TraceLevel, TraceEventType> TraceLevelEventTypeMap =
-            new Dictionary<TraceLevel, TraceEventType>
-                {
-                        { TraceLevel.Error, TraceEventType.Error },
-                        { TraceLevel.Info, TraceEventType.Information },
-                        { TraceLevel.Verbose, TraceEventType.Verbose },
-                        { TraceLevel.Warning, TraceEventType.Warning }
-                };
+    private static readonly Dictionary<TraceLevel, SourceLevels> TraceSourceLevelsMap =
+        new()
+        {
+            { TraceLevel.Error, SourceLevels.Error },
+            { TraceLevel.Info, SourceLevels.Information },
+            { TraceLevel.Off, SourceLevels.Off },
+            { TraceLevel.Verbose, SourceLevels.Verbose },
+            { TraceLevel.Warning, SourceLevels.Warning }
+        };
 
-        // Current process name/id that called trace so that it's easier to read logs.
-        // We cache them for performance reason.
-        private static readonly string ProcessName = GetProcessName();
+    /// <summary>
+    /// Create static maps for SourceLevels to TraceLevel. The APIs need to provide TraceLevel
+    /// for backward compatibility with older versions of Object Model.
+    /// </summary>
+    private static readonly Dictionary<SourceLevels, TraceLevel> SourceTraceLevelsMap =
+        new()
+        {
+            { SourceLevels.Error, TraceLevel.Error },
+            { SourceLevels.Information, TraceLevel.Info },
+            { SourceLevels.Off, TraceLevel.Off },
+            { SourceLevels.Verbose, TraceLevel.Verbose },
+            { SourceLevels.Warning, TraceLevel.Warning },
+            { SourceLevels.All, TraceLevel.Verbose }
+        };
 
-        private static readonly int ProcessId = GetProcessId();
+    /// <summary>
+    /// Create static maps for SourceLevels to TraceLevel. The APIs need to provide TraceLevel
+    /// for backward compatibility with older versions of Object Model.
+    /// </summary>
+    private static readonly Dictionary<TraceLevel, TraceEventType> TraceLevelEventTypeMap =
+        new()
+        {
+            { TraceLevel.Error, TraceEventType.Error },
+            { TraceLevel.Info, TraceEventType.Information },
+            { TraceLevel.Verbose, TraceEventType.Verbose },
+            { TraceLevel.Warning, TraceEventType.Warning }
+        };
+
+    // Current process name/id that called trace so that it's easier to read logs.
+    // We cache them for performance reason.
+    private static readonly string ProcessName = GetProcessName();
+
+    private static readonly int ProcessId = GetProcessId();
+
+    private static readonly object LockObject = new();
 
-        private static object lockObject = new object();
+    private static TraceSource? s_traceSource;
 
-        private static TraceSource traceSource;
+    /// <summary>
+    /// Specifies whether the trace is initialized or not
+    /// </summary>
+    private static bool s_isInitialized;
 
-        /// <summary>
-        /// Specifies whether the trace is initialized or not
-        /// </summary>
-        private static bool isInitialized = false;
+    /// <summary>
+    /// Lock over initialization
+    /// </summary>
+    private static readonly object IsInitializationLock = new();
 
-        /// <summary>
-        /// Lock over initialization
-        /// </summary>
-        private static object isInitializationLock = new object();
+    private static int s_traceFileSize;
+    private static readonly int DefaultTraceFileSize = 10240; // 10Mb.
 
-        private static int traceFileSize = 0;
-        private static int defaultTraceFileSize = 10240; // 10Mb.
+    public static string? LogFile
+    {
+        get;
+        private set;
+    }
 
-        public static string LogFile
+    /// <summary>
+    /// Gets or sets the trace level.
+    /// </summary>
+    public static TraceLevel TraceLevel
+    {
+        get
         {
-            get;
-            private set;
+            return SourceTraceLevelsMap[Source.Switch.Level];
         }
 
-        /// <summary>
-        /// Gets or sets the trace level.
-        /// </summary>
-        public static TraceLevel TraceLevel
+        set
         {
-            get
+            try
             {
-                return SourceTraceLevelsMap[Source.Switch.Level];
+                Source.Switch.Level = TraceSourceLevelsMap[value];
             }
-
-            set
+            catch (ArgumentException e)
             {
-                try
-                {
-                    Source.Switch.Level = TraceSourceLevelsMap[value];
-                }
-                catch (ArgumentException e)
-                {
-                    LogIgnoredException(e);
-                }
+                LogIgnoredException(e);
             }
         }
+    }
 
-        public static string ErrorOnInitialization
-        {
-            get;
-            set;
-        }
+    public static string? ErrorOnInitialization
+    {
+        get;
+        set;
+    }
 
-        // This is added to ensure that traceSource should not be instantiated in when creating appdomains if EqtTrace is not enabled.
-        public bool DoNotInitialize
-        {
-            get;
-            set;
-        }
+    // This is added to ensure that traceSource should not be instantiated in when creating appdomains if EqtTrace is not enabled.
+    public bool DoNotInitialize
+    {
+        get;
+        set;
+    }
 
-        /// <summary>
-        /// Gets a custom trace source. This doesn't pollute the default tracing for user applications.
-        /// </summary>
-        private static TraceSource Source
+    /// <summary>
+    /// Gets a custom trace source. This doesn't pollute the default tracing for user applications.
+    /// </summary>
+    private static TraceSource Source
+    {
+        get
         {
-            get
+            if (s_traceSource == null)
             {
-                if (traceSource == null)
+                lock (LockObject)
                 {
-                    lock (lockObject)
-                    {
-                        if (traceSource == null)
-                        {
-                            traceSource = new TraceSource("TpTrace", SourceLevels.Off);
-                        }
-                    }
+                    s_traceSource ??= new TraceSource("TpTrace", SourceLevels.Off);
                 }
-
-                return traceSource;
             }
-        }
 
-        /// <inheritdoc/>
-        public bool InitializeVerboseTrace(string customLogFile)
-        {
-            return this.InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+            return s_traceSource;
         }
+    }
 
-        /// <inheritdoc/>
-        public bool InitializeTrace(string customLogFile, PlatformTraceLevel platformTraceLevel)
-        {
-            isInitialized = false;
+    /// <inheritdoc/>
+    public bool InitializeVerboseTrace(string? customLogFile)
+    {
+        return InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+    }
 
-            LogFile = customLogFile;
-            TraceLevel = this.MapPlatformTraceToTrace(platformTraceLevel);
-            Source.Switch.Level = TraceSourceLevelsMap[TraceLevel];
+    /// <inheritdoc/>
+    public bool InitializeTrace(string? customLogFile, PlatformTraceLevel platformTraceLevel)
+    {
+        s_isInitialized = false;
 
-            // Ensure trace is initialized
-            return EnsureTraceIsInitialized();
-        }
+        LogFile = customLogFile;
+        TraceLevel = MapPlatformTraceToTrace(platformTraceLevel);
+        Source.Switch.Level = TraceSourceLevelsMap[TraceLevel];
 
-        /// <inheritdoc/>
-        public bool ShouldTrace(PlatformTraceLevel traceLevel)
-        {
-            if (this.DoNotInitialize)
-            {
-                return false;
-            }
+        // Ensure trace is initialized
+        return EnsureTraceIsInitialized();
+    }
 
-            switch (traceLevel)
-            {
-                case PlatformTraceLevel.Off:
-                    return false;
-                case PlatformTraceLevel.Error:
-                    return Source.Switch.ShouldTrace(TraceEventType.Error);
-                case PlatformTraceLevel.Warning:
-                    return Source.Switch.ShouldTrace(TraceEventType.Warning);
-                case PlatformTraceLevel.Info:
-                    return Source.Switch.ShouldTrace(TraceEventType.Information);
-                case PlatformTraceLevel.Verbose:
-                    return Source.Switch.ShouldTrace(TraceEventType.Verbose);
-                default:
-                    Debug.Fail("Should never get here!");
-                    return false;
-            }
+    /// <inheritdoc/>
+    public bool ShouldTrace(PlatformTraceLevel traceLevel)
+    {
+        if (DoNotInitialize)
+        {
+            return false;
         }
 
-        /// <inheritdoc/>
-        public string GetLogFile()
+        switch (traceLevel)
         {
-            return LogFile;
+            case PlatformTraceLevel.Off:
+                return false;
+            case PlatformTraceLevel.Error:
+                return Source.Switch.ShouldTrace(TraceEventType.Error);
+            case PlatformTraceLevel.Warning:
+                return Source.Switch.ShouldTrace(TraceEventType.Warning);
+            case PlatformTraceLevel.Info:
+                return Source.Switch.ShouldTrace(TraceEventType.Information);
+            case PlatformTraceLevel.Verbose:
+                return Source.Switch.ShouldTrace(TraceEventType.Verbose);
+            default:
+                Debug.Fail("Should never get here!");
+                return false;
         }
+    }
+
+    /// <inheritdoc/>
+    public string? GetLogFile()
+    {
+        return LogFile;
+    }
 
-        /// <inheritdoc/>
-        public void WriteLine(PlatformTraceLevel level, string message)
+    /// <inheritdoc/>
+    public void WriteLine(PlatformTraceLevel level, string? message)
+    {
+        TPDebug.Assert(message != null, "message != null");
+        TPDebug.Assert(!string.IsNullOrEmpty(ProcessName), "!string.IsNullOrEmpty(ProcessName)");
+
+        if (EnsureTraceIsInitialized())
         {
-            Debug.Assert(message != null, "message != null");
-            Debug.Assert(!string.IsNullOrEmpty(ProcessName), "!string.IsNullOrEmpty(ProcessName)");
+            // The format below is a CSV so that Excel could be used easily to
+            // view/filter the logs.
+            var log = string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}, {1}, {2:yyyy}/{2:MM}/{2:dd}, {2:HH}:{2:mm}:{2:ss}.{2:fff}, {5}, {3}, {4}",
+                ProcessId,
+                Environment.CurrentManagedThreadId,
+                DateTime.Now,
+                ProcessName,
+                message,
+                Stopwatch.GetTimestamp());
 
-            if (EnsureTraceIsInitialized())
+            try
             {
-                // The format below is a CSV so that Excel could be used easily to
-                // view/filter the logs.
-                var log = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "{0}, {1}, {2:yyyy}/{2:MM}/{2:dd}, {2:HH}:{2:mm}:{2:ss}.{2:fff}, {5}, {3}, {4}",
-                    ProcessId,
-                    Thread.CurrentThread.ManagedThreadId,
-                    DateTime.Now,
-                    ProcessName,
-                    message,
-                    Stopwatch.GetTimestamp());
-
-                try
-                {
-                    Source.TraceEvent(TraceLevelEventTypeMap[this.MapPlatformTraceToTrace(level)], 0, log);
-                    Source.Flush();
-                }
-                catch (Exception e)
-                {
-                    // valid suppress
-                    // Log exception from tracing into event viewer.
-                    LogIgnoredException(e);
-                }
+                Source.TraceEvent(TraceLevelEventTypeMap[MapPlatformTraceToTrace(level)], 0, log);
+                Source.Flush();
+            }
+            catch (Exception e)
+            {
+                // valid suppress
+                // Log exception from tracing into event viewer.
+                LogIgnoredException(e);
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public void SetTraceLevel(PlatformTraceLevel value)
-        {
-            Source.Switch.Level = TraceSourceLevelsMap[this.MapPlatformTraceToTrace(value)];
-        }
+    /// <inheritdoc/>
+    public void SetTraceLevel(PlatformTraceLevel value)
+    {
+        Source.Switch.Level = TraceSourceLevelsMap[MapPlatformTraceToTrace(value)];
+    }
 
-        public PlatformTraceLevel GetTraceLevel()
+    public PlatformTraceLevel GetTraceLevel()
+    {
+        return (PlatformTraceLevel)SourceTraceLevelsMap[Source.Switch.Level];
+    }
+
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public TraceLevel MapPlatformTraceToTrace(PlatformTraceLevel traceLevel)
+    {
+        switch (traceLevel)
         {
-            return (PlatformTraceLevel)SourceTraceLevelsMap[Source.Switch.Level];
+            case PlatformTraceLevel.Off:
+                return TraceLevel.Off;
+            case PlatformTraceLevel.Error:
+                return TraceLevel.Error;
+            case PlatformTraceLevel.Warning:
+                return TraceLevel.Warning;
+            case PlatformTraceLevel.Info:
+                return TraceLevel.Info;
+            case PlatformTraceLevel.Verbose:
+                return TraceLevel.Verbose;
+            default:
+                Debug.Fail("Should never get here!");
+                return TraceLevel.Verbose;
         }
+    }
 
-        public TraceLevel MapPlatformTraceToTrace(PlatformTraceLevel traceLevel)
+    /// <summary>
+    /// Setup trace listeners. It should be called when setting trace listener for child domain.
+    /// </summary>
+    /// <param name="listener">New listener.</param>
+    internal static void SetupRemoteListeners(TraceListener? listener)
+    {
+        lock (IsInitializationLock)
         {
-            switch (traceLevel)
+            // Add new listeners.
+            if (listener != null)
             {
-                case PlatformTraceLevel.Off:
-                    return TraceLevel.Off;
-                case PlatformTraceLevel.Error:
-                    return TraceLevel.Error;
-                case PlatformTraceLevel.Warning:
-                    return TraceLevel.Warning;
-                case PlatformTraceLevel.Info:
-                    return TraceLevel.Info;
-                case PlatformTraceLevel.Verbose:
-                    return TraceLevel.Verbose;
-                default:
-                    Debug.Fail("Should never get here!");
-                    return TraceLevel.Verbose;
+                Source.Listeners.Add(listener);
             }
+
+            s_isInitialized = true;
         }
+    }
+
+    /// <summary>
+    /// Auxiliary method: logs the exception that is being ignored.
+    /// </summary>
+    /// <param name="e">The exception to log.</param>
+    private static void LogIgnoredException(Exception e)
+    {
+        TPDebug.Assert(e != null, "e != null");
 
-        /// <summary>
-        /// Setup trace listeners. It should be called when setting trace listener for child domain.
-        /// </summary>
-        /// <param name="listener">New listener.</param>
-        internal static void SetupRemoteListeners(TraceListener listener)
+        try
         {
-            lock (isInitializationLock)
-            {
-                // Add new listeners.
-                if (listener != null)
-                {
-                    Source.Listeners.Add(listener);
-                }
+            EnsureTraceIsInitialized();
 
-                isInitialized = true;
-            }
+            // Note: Debug.WriteLine may throw if there is a problem in .config file.
+            Debug.WriteLine("Ignore exception: " + e);
         }
-
-        /// <summary>
-        /// Auxiliary method: logs the exception that is being ignored.
-        /// </summary>
-        /// <param name="e">The exception to log.</param>
-        private static void LogIgnoredException(Exception e)
+        catch
         {
-            Debug.Assert(e != null, "e != null");
-
-            try
-            {
-                EnsureTraceIsInitialized();
+            // Ignore everything at this point.
+        }
+    }
 
-                // Note: Debug.WriteLine may throw if there is a problem in .config file.
-                Debug.WriteLine("Ignore exception: " + e);
-            }
-            catch
-            {
-                // Ignore everything at this point.
-            }
+    /// <summary>
+    /// Ensure the trace is initialized
+    /// </summary>
+    /// <returns>
+    /// The <see cref="bool"/>.
+    /// </returns>
+    private static bool EnsureTraceIsInitialized()
+    {
+        if (s_isInitialized)
+        {
+            return true;
         }
 
-        /// <summary>
-        /// Ensure the trace is initialized
-        /// </summary>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private static bool EnsureTraceIsInitialized()
+        lock (IsInitializationLock)
         {
-            if (isInitialized)
+            if (s_isInitialized)
             {
                 return true;
             }
 
-            lock (isInitializationLock)
-            {
-                if (isInitialized)
-                {
-                    return true;
-                }
+            using var process = Process.GetCurrentProcess();
+            string runnerLogFileName = $"{Path.GetFileNameWithoutExtension(process.MainModule!.FileName)}_{process.Id}.{DateTime.Now:yy-MM-dd_HH-mm-ss_fffff}.diag";
+            string logsDirectory = Path.GetTempPath();
 
-                string logsDirectory = Path.GetTempPath();
+            // Set the trace level and add the trace listener
+            LogFile ??= Path.Combine(logsDirectory, runnerLogFileName);
 
-                // Set the trace level and add the trace listener
-                if (LogFile == null)
+            // Add a default listener
+            s_traceFileSize = DefaultTraceFileSize;
+            try
+            {
+                // If we point to a folder we create default filename
+                if (LogFile.EndsWith(@"\") || LogFile.EndsWith("/"))
                 {
-                    using (var process = Process.GetCurrentProcess())
+                    if (!Directory.Exists(LogFile))
                     {
-                        // In case of parallel execution, there may be several processes with same name.
-                        // Add a process id to make the traces unique.
-                        LogFile = Path.Combine(
-                            logsDirectory,
-                            Path.GetFileNameWithoutExtension(process.MainModule.FileName) + "." + process.Id + ".TpTrace.log");
+                        Directory.CreateDirectory(LogFile);
                     }
-                }
 
-                // Add a default listener
-                traceFileSize = defaultTraceFileSize;
-                try
-                {
-                    Source.Listeners.Add(new RollingFileTraceListener(LogFile, ListenerName, traceFileSize));
+                    runnerLogFileName = Path.Combine(LogFile, runnerLogFileName);
+                    LogFile = Path.Combine(LogFile, $"{Path.GetFileNameWithoutExtension(process.MainModule.FileName)}_{process.Id}.diag");
                 }
-                catch (Exception e)
+                else
                 {
-                    UnInitializeTrace();
-                    ErrorOnInitialization = e.ToString();
-                    return false;
+                    runnerLogFileName = LogFile;
                 }
 
-                isInitialized = true;
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Get the process name. Note: we cache it, use m_processName.
-        /// </summary>
-        /// <returns>Name of the process.</returns>
-        private static string GetProcessName()
-        {
-            try
-            {
-                string processName = null;
-
-                string[] args = Environment.GetCommandLineArgs();
-
-                if (args != null && args.Length != 0)
+                var runnerLogFileInfo = new FileInfo(runnerLogFileName);
+                if (!Directory.Exists(runnerLogFileInfo.DirectoryName))
                 {
-                    // Leave the extension if specified, otherwise don't add it (e.g. case a.exe.exe).
-                    // It seems that if .exe suffix is not specified Framework adds .EXE to args[0].
-                    processName = Path.GetFileName(args[0]);
+                    Directory.CreateDirectory(runnerLogFileInfo.DirectoryName!);
                 }
 
-                // If we still have not got process name from command line - use the slow way.
-                // This should never happen unless the process is called from execv with empty cmdline.
-                if (string.IsNullOrEmpty(processName))
-                {
-                    Debug.Fail("Could not get process name from command line, will try to use the slow way.");
-                    using (var process = Process.GetCurrentProcess())
-                    {
-                        processName = process.ProcessName;
-                    }
-                }
-
-                return processName;
+                Source.Listeners.Add(new RollingFileTraceListener(runnerLogFileName, ListenerName, s_traceFileSize));
             }
             catch (Exception e)
             {
-                // valid suppress
-                Debug.Fail("Could not get process name: " + e);
-                LogIgnoredException(e);
-                return e.Message;
+                UnInitializeTrace();
+                ErrorOnInitialization = e.ToString();
+                return false;
             }
+
+            s_isInitialized = true;
+            return true;
         }
+    }
 
-        private static int GetProcessId()
+    /// <summary>
+    /// Get the process name. Note: we cache it, use m_processName.
+    /// </summary>
+    /// <returns>Name of the process.</returns>
+    private static string GetProcessName()
+    {
+        try
         {
-            try
+            string? processName = null;
+
+            string[] args = Environment.GetCommandLineArgs();
+
+            if (args != null && args.Length != 0)
             {
-                using (var process = Process.GetCurrentProcess())
-                {
-                    return process.Id;
-                }
+                // Leave the extension if specified, otherwise don't add it (e.g. case a.exe.exe).
+                // It seems that if .exe suffix is not specified Framework adds .EXE to args[0].
+                processName = Path.GetFileName(args[0]);
             }
-            catch (InvalidOperationException e)
+
+            // If we still have not got process name from command line - use the slow way.
+            // This should never happen unless the process is called from execv with empty cmdline.
+            if (processName.IsNullOrEmpty())
             {
-                Debug.Fail("Could not get process id: " + e);
-                LogIgnoredException(e);
-                return -1;
+                Debug.Fail("Could not get process name from command line, will try to use the slow way.");
+                using var process = Process.GetCurrentProcess();
+                processName = process.ProcessName;
             }
-        }
 
-        private static void UnInitializeTrace()
+            return processName;
+        }
+        catch (Exception e)
         {
-            isInitialized = false;
+            // valid suppress
+            Debug.Fail("Could not get process name: " + e);
+            LogIgnoredException(e);
+            return e.Message;
+        }
+    }
 
-            LogFile = null;
-            TraceLevel = TraceLevel.Off;
-            Source.Switch.Level = SourceLevels.Off;
+    private static int GetProcessId()
+    {
+        try
+        {
+            using var process = Process.GetCurrentProcess();
+            return process.Id;
+        }
+        catch (InvalidOperationException e)
+        {
+            Debug.Fail("Could not get process id: " + e);
+            LogIgnoredException(e);
+            return -1;
         }
     }
+
+    private static void UnInitializeTrace()
+    {
+        s_isInitialized = false;
+
+        LogFile = null;
+        TraceLevel = TraceLevel.Off;
+        Source.Switch.Level = SourceLevels.Off;
+    }
 }
 
 #endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs
index b431bff37c..0364aee728 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs
@@ -3,474 +3,480 @@
 
 #if NETFRAMEWORK || NETCOREAPP || NETSTANDARD2_0
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+using Microsoft.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Performs logging to a file and rolls the output file when either time or size thresholds are
+/// exceeded.
+/// </summary>
+public class RollingFileTraceListener : TextWriterTraceListener
 {
-    using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Text;
+    private readonly int _rollSizeInBytes;
+    private bool _isDisposed;
 
     /// <summary>
-    /// Performs logging to a file and rolls the output file when either time or size thresholds are
-    /// exceeded.
+    /// Initializes a new instance of the <see cref="RollingFileTraceListener"/> class.
     /// </summary>
-    public class RollingFileTraceListener : TextWriterTraceListener
+    /// <param name="fileName">The filename where the entries will be logged.</param>
+    /// <param name="name">Name of the trace listener.</param>
+    /// <param name="rollSizeKB">The maximum file size (KB) before rolling.</param>
+    public RollingFileTraceListener(
+        string fileName,
+        string name,
+        int rollSizeKB)
+        : base(OpenTextWriter(fileName), name)
     {
-        private readonly StreamWriterRollingHelper rollingHelper;
-
-        private readonly int rollSizeInBytes;
+        if (fileName.IsNullOrWhiteSpace())
+        {
+            throw new ArgumentException("fileName was null or whitespace", nameof(fileName));
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RollingFileTraceListener"/> class.
-        /// </summary>
-        /// <param name="fileName">The filename where the entries will be logged.</param>
-        /// <param name="name">Name of the trace listener.</param>
-        /// <param name="rollSizeKB">The maximum file size (KB) before rolling.</param>
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "the fileStream is passed into the TextWriterTraceListener")]
-        public RollingFileTraceListener(
-            string fileName,
-            string name,
-            int rollSizeKB)
-            : base(OpenTextWriter(fileName), name)
+        if (rollSizeKB <= 0)
         {
-            if (string.IsNullOrWhiteSpace(fileName))
-            {
-                throw new ArgumentException("fileName was null or whitespace", nameof(fileName));
-            }
+            throw new ArgumentOutOfRangeException(nameof(rollSizeKB));
+        }
 
-            if (rollSizeKB <= 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(rollSizeKB));
-            }
+        TraceFileName = fileName;
+        _rollSizeInBytes = rollSizeKB * 1024;
+        RollingHelper = new StreamWriterRollingHelper(this);
+    }
 
-            this.TraceFileName = fileName;
-            this.rollSizeInBytes = rollSizeKB * 1024;
-            this.rollingHelper = new StreamWriterRollingHelper(this);
-        }
+    /// <summary>
+    /// Gets name of the Trace file.
+    /// </summary>
+    internal string TraceFileName
+    {
+        get;
+        private set;
+    }
 
-        /// <summary>
-        /// Gets name of the Trace file.
-        /// </summary>
-        internal string TraceFileName
+    /// <summary>
+    /// Gets the <see cref="StreamWriterRollingHelper"/> for the flat file.
+    /// </summary>
+    /// <value>
+    /// The <see cref="StreamWriterRollingHelper"/> for the flat file.
+    /// </value>
+    internal StreamWriterRollingHelper RollingHelper { get; }
+
+    /// <summary>
+    /// Writes the trace messages to the file.
+    /// </summary>
+    /// <param name="message">Trace message string</param>
+    public override void WriteLine(string? message)
+    {
+        RollingHelper.RollIfNecessary();
+        base.WriteLine(message);
+    }
+
+    /// <summary>
+    /// Opens specified file and returns text writer.
+    /// </summary>
+    /// <param name="fileName">The file to open.</param>
+    /// <returns>A <see cref="TallyKeepingFileStreamWriter"/> instance.</returns>
+    internal static TallyKeepingFileStreamWriter OpenTextWriter(string fileName)
+    {
+        return new TallyKeepingFileStreamWriter(
+                                File.Open(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite),
+                                GetEncodingWithFallback());
+    }
+
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+            return;
+
+        if (disposing)
         {
-            get;
-            private set;
+            RollingHelper.Dispose();
         }
 
+        base.Dispose(disposing);
+
+        _isDisposed = true;
+    }
+
+    private static Encoding GetEncodingWithFallback()
+    {
+        Encoding encoding = (Encoding)new UTF8Encoding(false).Clone();
+#if TODO
+            encoding.EncoderFallback = EncoderFallback.ReplacementFallback;
+            encoding.DecoderFallback = DecoderFallback.ReplacementFallback;
+#endif
+        return encoding;
+    }
+
+    /// <summary>
+    /// Encapsulates the logic to perform rolls.
+    /// </summary>
+    /// <remarks>
+    /// If no rolling behavior has been configured no further processing will be performed.
+    /// </remarks>
+    internal sealed class StreamWriterRollingHelper : IDisposable
+    {
         /// <summary>
-        /// Gets the <see cref="StreamWriterRollingHelper"/> for the flat file.
+        /// Synchronization lock.
         /// </summary>
-        /// <value>
-        /// The <see cref="StreamWriterRollingHelper"/> for the flat file.
-        /// </value>
-        internal StreamWriterRollingHelper RollingHelper
-        {
-            get { return this.rollingHelper; }
-        }
+        private readonly object _synclock = new();
 
         /// <summary>
-        /// Writes the trace messages to the file.
+        /// Whether the object is disposed or not.
         /// </summary>
-        /// <param name="message">Trace message string</param>
-        public override void WriteLine(string message)
-        {
-            this.rollingHelper.RollIfNecessary();
-            base.WriteLine(message);
-        }
+        private bool _disposed;
 
         /// <summary>
-        /// Opens specified file and returns text writer.
+        /// A tally keeping writer used when file size rolling is configured.<para/>
+        /// The original stream writer from the base trace listener will be replaced with
+        /// this listener.
         /// </summary>
-        /// <param name="fileName">The file to open.</param>
-        /// <returns>A <see cref="TallyKeepingFileStreamWriter"/> instance.</returns>
-        internal static TallyKeepingFileStreamWriter OpenTextWriter(string fileName)
-        {
-            return new TallyKeepingFileStreamWriter(
-                                    File.Open(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite),
-                                    GetEncodingWithFallback());
-        }
+        private TallyKeepingFileStreamWriter? _managedWriter;
+        private bool _lastRollFailed;
+        private readonly Stopwatch _sinceLastRoll = Stopwatch.StartNew();
+        private readonly long _failedRollTimeout = TimeSpan.FromMinutes(1).Ticks;
 
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            this.rollingHelper?.Dispose();
-
-            base.Dispose(disposing);
-        }
+        /// <summary>
+        /// The trace listener for which rolling is being managed.
+        /// </summary>
+        private readonly RollingFileTraceListener _owner;
 
-        private static Encoding GetEncodingWithFallback()
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriterRollingHelper"/> class.
+        /// </summary>
+        /// <param name="owner">
+        /// The <see cref="RollingFileTraceListener"/> to use.
+        /// </param>
+        public StreamWriterRollingHelper(RollingFileTraceListener owner)
         {
-            Encoding encoding = (Encoding)new UTF8Encoding(false).Clone();
-#if TODO
-            encoding.EncoderFallback = EncoderFallback.ReplacementFallback;
-            encoding.DecoderFallback = DecoderFallback.ReplacementFallback;
-#endif
-            return encoding;
+            _owner = owner;
+            _managedWriter = owner.Writer as TallyKeepingFileStreamWriter;
         }
 
         /// <summary>
-        /// Encapsulates the logic to perform rolls.
+        /// Checks whether rolling should be performed, and returns the date to use when performing the roll.
         /// </summary>
+        /// <returns>The date roll to use if performing a roll, or <see langword="null"/> if no rolling should occur.</returns>
         /// <remarks>
-        /// If no rolling behavior has been configured no further processing will be performed.
+        /// Defer request for the roll date until it is necessary to avoid overhead.<para/>
+        /// Information used for rolling checks should be set by now.
         /// </remarks>
-        internal sealed class StreamWriterRollingHelper : IDisposable
+        public DateTime? CheckIsRollNecessary()
         {
-            /// <summary>
-            /// Synchronization lock.
-            /// </summary>
-            private object synclock = new object();
-
-            /// <summary>
-            /// Whether the object is disposed or not.
-            /// </summary>
-            private bool disposed = false;
-
-            /// <summary>
-            /// A tally keeping writer used when file size rolling is configured.<para/>
-            /// The original stream writer from the base trace listener will be replaced with
-            /// this listener.
-            /// </summary>
-            private TallyKeepingFileStreamWriter managedWriter;
-
-            /// <summary>
-            /// The trace listener for which rolling is being managed.
-            /// </summary>
-            private RollingFileTraceListener owner;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="StreamWriterRollingHelper"/> class.
-            /// </summary>
-            /// <param name="owner">
-            /// The <see cref="RollingFileTraceListener"/> to use.
-            /// </param>
-            public StreamWriterRollingHelper(RollingFileTraceListener owner)
+            // check for size roll, if enabled.
+            if (_managedWriter != null && _managedWriter.Tally > _owner._rollSizeInBytes)
             {
-                this.owner = owner;
-                this.managedWriter = owner.Writer as TallyKeepingFileStreamWriter;
+                return DateTime.Now;
             }
 
-            /// <summary>
-            /// Checks whether rolling should be performed, and returns the date to use when performing the roll.
-            /// </summary>
-            /// <returns>The date roll to use if performing a roll, or <see langword="null"/> if no rolling should occur.</returns>
-            /// <remarks>
-            /// Defer request for the roll date until it is necessary to avoid overhead.<para/>
-            /// Information used for rolling checks should be set by now.
-            /// </remarks>
-            public DateTime? CheckIsRollNecessary()
-            {
-                // check for size roll, if enabled.
-                if (this.managedWriter != null && this.managedWriter.Tally > this.owner.rollSizeInBytes)
-                {
-                    return DateTime.Now;
-                }
-
-                // no roll is necessary, return a null roll date
-                return null;
-            }
+            // no roll is necessary, return a null roll date
+            return null;
+        }
 
-            /// <summary>
-            /// Perform the roll for the next date.
-            /// </summary>
-            /// <param name="rollDateTime">The roll date.</param>
-            public void PerformRoll(DateTime rollDateTime)
-            {
-                string actualFileName = ((FileStream)((StreamWriter)this.owner.Writer).BaseStream).Name;
+        /// <summary>
+        /// Perform the roll for the next date.
+        /// </summary>
+        /// <param name="rollDateTime">The roll date.</param>
+        public void PerformRoll(DateTime rollDateTime)
+        {
+            string actualFileName = ((FileStream)((StreamWriter)_owner.Writer!).BaseStream).Name;
 
-                // calculate archive name
-                string directory = Path.GetDirectoryName(actualFileName);
-                string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(actualFileName);
-                string extension = Path.GetExtension(actualFileName);
+            // calculate archive name
+            string directory = Path.GetDirectoryName(actualFileName)!;
+            string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(actualFileName);
+            string extension = Path.GetExtension(actualFileName);
 
-                StringBuilder fileNameBuilder = new StringBuilder(fileNameWithoutExtension);
-                fileNameBuilder.Append('.');
-                fileNameBuilder.Append("bak");
-                fileNameBuilder.Append(extension);
+            StringBuilder fileNameBuilder = new(fileNameWithoutExtension);
+            fileNameBuilder.Append('.');
+            fileNameBuilder.Append("bak");
+            fileNameBuilder.Append(extension);
 
-                string archiveFileName = Path.Combine(directory, fileNameBuilder.ToString());
+            string archiveFileName = Path.Combine(directory, fileNameBuilder.ToString());
 #if TODO
 
 // close file
                 owner.Writer.Close();
 #endif
 
-                // move file
-                SafeMove(actualFileName, archiveFileName, rollDateTime);
+            // move file
+            SafeMove(actualFileName, archiveFileName, rollDateTime);
 
-                // update writer - let TWTL open the file as needed to keep consistency
-                this.owner.Writer = null;
-                this.managedWriter = null;
-                this.UpdateRollingInformationIfNecessary();
-            }
+            // update writer - let TWTL open the file as needed to keep consistency
+            _owner.Writer = null;
+            _managedWriter = null;
+            UpdateRollingInformationIfNecessary();
+        }
 
-            /// <summary>
-            /// Rolls the file if necessary.
-            /// </summary>
-            public void RollIfNecessary()
+        /// <summary>
+        /// Rolls the file if necessary.
+        /// </summary>
+        public void RollIfNecessary()
+        {
+            if (!UpdateRollingInformationIfNecessary())
             {
-                if (!this.UpdateRollingInformationIfNecessary())
-                {
-                    // an error was detected while handling roll information - avoid further processing
-                    return;
-                }
-
-                DateTime? rollDateTime;
-                if ((rollDateTime = this.CheckIsRollNecessary()) != null)
-                {
-                    lock (this.synclock)
-                    {
-                        // double check if the roll is still required and do it...
-                        if ((rollDateTime = this.CheckIsRollNecessary()) != null)
-                        {
-                            this.PerformRoll(rollDateTime.Value);
-                        }
-                    }
-                }
+                // an error was detected while handling roll information - avoid further processing
+                return;
             }
 
-            /// <summary>
-            /// Updates book keeping information necessary for rolling, as required by the specified
-            /// rolling configuration.
-            /// </summary>
-            /// <returns>true if update was successful, false if an error occurred.</returns>
-            public bool UpdateRollingInformationIfNecessary()
+            DateTime? rollDateTime;
+            if ((rollDateTime = CheckIsRollNecessary()) != null)
             {
-                // replace writer with the tally keeping version if necessary for size rolling
-                if (this.managedWriter == null)
+                lock (_synclock)
                 {
-                    try
+                    // double check if the roll is still required and do it...
+                    if ((rollDateTime = CheckIsRollNecessary()) != null)
                     {
-                        this.managedWriter = OpenTextWriter(this.owner.TraceFileName);
+                        PerformRoll(rollDateTime.Value);
                     }
-                    catch (Exception)
-                    {
-                        // there's a slight chance of error here - abort if this occurs and just let TWTL handle it without attempting to roll
-                        return false;
-                    }
-
-                    this.owner.Writer = this.managedWriter;
                 }
-
-                return true;
             }
+        }
 
-            /// <summary>
-            /// Disposes this instance
-            /// </summary>
-            public void Dispose()
+        /// <summary>
+        /// Updates book keeping information necessary for rolling, as required by the specified
+        /// rolling configuration.
+        /// </summary>
+        /// <returns>true if update was successful, false if an error occurred.</returns>
+        public bool UpdateRollingInformationIfNecessary()
+        {
+            // if we fail to move the file, don't retry to move it for a long time
+            // it is most likely locked, and we end up trying to move it twice
+            // on each message write.
+            if (_lastRollFailed && _sinceLastRoll.ElapsedTicks < _failedRollTimeout)
             {
-                this.Dispose(true);
-                GC.SuppressFinalize(this);
+                return false;
             }
 
-            private static void SafeMove(string actualFileName, string archiveFileName, DateTime currentDateTime)
+            // replace writer with the tally keeping version if necessary for size rolling
+            if (_managedWriter == null)
             {
                 try
                 {
-                    if (File.Exists(archiveFileName))
-                    {
-                        File.Delete(archiveFileName);
-                    }
-
-                    // take care of tunneling issues http://support.microsoft.com/kb/172190
-                    File.SetCreationTime(actualFileName, currentDateTime);
-                    File.Move(actualFileName, archiveFileName);
+                    _managedWriter = OpenTextWriter(_owner.TraceFileName);
                 }
-                catch (IOException)
+                catch (Exception)
                 {
-                    // catch errors and attempt move to a new file with a GUID
-                    archiveFileName += Guid.NewGuid().ToString();
-
-                    try
-                    {
-                        File.Move(actualFileName, archiveFileName);
-                    }
-                    catch (IOException)
-                    {
-                    }
+                    // there's a slight chance of error here - abort if this occurs and just let TWTL handle it without attempting to roll
+                    return false;
                 }
-            }
 
-            private void Dispose(bool disposing)
-            {
-                if (!this.disposed)
-                {
-                    if (disposing && this.managedWriter != null)
-                    {
-#if TODO
-                        managedWriter.Close();
-#endif
-                    }
-
-                    this.disposed = true;
-                }
+                _owner.Writer = _managedWriter;
             }
+
+            return true;
         }
 
         /// <summary>
-        /// Represents a file stream writer that keeps a tally of the length of the file.
+        /// Disposes this instance
         /// </summary>
-        internal sealed class TallyKeepingFileStreamWriter : StreamWriter
+        public void Dispose()
         {
-            private long tally;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TallyKeepingFileStreamWriter"/> class.
-            /// </summary>
-            /// <param name="stream">
-            /// The <see cref="FileStream"/> to write to.
-            /// </param>
-            public TallyKeepingFileStreamWriter(FileStream stream)
-                : base(stream)
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void SafeMove(string actualFileName, string archiveFileName, DateTime currentDateTime)
+        {
+            try
             {
-                if (stream == null)
+                if (File.Exists(archiveFileName))
                 {
-                    throw new ArgumentNullException(nameof(stream));
+                    File.Delete(archiveFileName);
                 }
 
-                this.tally = stream.Length;
-            }
+                // take care of tunneling issues http://support.microsoft.com/kb/172190
+                File.SetCreationTime(actualFileName, currentDateTime);
+                File.Move(actualFileName, archiveFileName);
 
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TallyKeepingFileStreamWriter"/> class.
-            /// </summary>
-            /// <param name="stream">
-            /// The <see cref="FileStream"/> to write to.
-            /// </param>
-            /// <param name="encoding">
-            /// The <see cref="Encoding"/> to use.
-            /// </param>
-            public TallyKeepingFileStreamWriter(FileStream stream, Encoding encoding)
-                : base(stream, encoding)
+                _lastRollFailed = false;
+                _sinceLastRoll.Restart();
+            }
+            catch (IOException)
             {
-                if (stream == null)
+                _lastRollFailed = true;
+
+                // catch errors and attempt move to a new file with a GUID
+                archiveFileName += Guid.NewGuid().ToString();
+
+                try
                 {
-                    throw new ArgumentNullException(nameof(stream));
-                }
+                    File.Move(actualFileName, archiveFileName);
 
-                if (encoding == null)
+                    _lastRollFailed = false;
+                    _sinceLastRoll.Restart();
+                }
+                catch (IOException)
                 {
-                    throw new ArgumentNullException(nameof(encoding));
+                    _lastRollFailed = true;
                 }
-
-                this.tally = stream.Length;
             }
+        }
 
-            /// <summary>
-            /// Gets the tally of the length of the string.
-            /// </summary>
-            /// <value>
-            /// The tally of the length of the string.
-            /// </value>
-            public long Tally
+        private void Dispose(bool disposing)
+        {
+            if (_disposed)
             {
-                get { return this.tally; }
+                return;
             }
 
-            /// <summary>
-            /// Writes a character to the stream.
-            /// </summary>
-            /// <param name="value">
-            /// The character to write to the text stream.
-            /// </param>
-            /// <exception cref="T:System.ObjectDisposedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
-            /// </exception>
-            /// <exception cref="T:System.NotSupportedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
-            /// </exception>
-            /// <exception cref="T:System.IO.IOException">
-            /// An I/O error occurs.
-            /// </exception>
-            /// <filterpriority>1</filterpriority>
-            public override void Write(char value)
+            if (disposing && _managedWriter != null)
             {
-                base.Write(value);
-                this.tally += this.Encoding.GetByteCount(new[] { value });
+#if TODO
+                     managedWriter.Close();
+#endif
             }
 
-            /// <summary>
-            /// Writes a character array to the stream.
-            /// </summary>
-            /// <param name="buffer">
-            /// A character array containing the data to write. If buffer is null, nothing is written.
-            /// </param>
-            /// <exception cref="T:System.ObjectDisposedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
-            /// </exception>
-            /// <exception cref="T:System.NotSupportedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
-            /// </exception>
-            /// <exception cref="T:System.IO.IOException">
-            /// An I/O error occurs.
-            /// </exception>
-            /// <filterpriority>1</filterpriority>
-            public override void Write(char[] buffer)
-            {
-                base.Write(buffer);
-                this.tally += this.Encoding.GetByteCount(buffer);
-            }
+            _disposed = true;
+        }
+    }
 
-            /// <summary>
-            /// Writes an array of characters to the stream.
-            /// </summary>
-            /// <param name="buffer">
-            /// A character array containing the data to write.
-            /// </param>
-            /// <param name="index">
-            /// The index into buffer at which to begin writing.
-            /// </param>
-            /// <param name="count">
-            /// The number of characters to read from buffer.
-            /// </param>
-            /// <exception cref="T:System.IO.IOException">
-            /// An I/O error occurs.
-            /// </exception>
-            /// <exception cref="T:System.ObjectDisposedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
-            /// </exception>
-            /// <exception cref="T:System.NotSupportedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
-            /// </exception>
-            /// <exception cref="T:System.ArgumentOutOfRangeException">
-            /// index or count is negative.
-            /// </exception>
-            /// <exception cref="T:System.ArgumentException">
-            /// The buffer length minus index is less than count.
-            /// </exception>
-            /// <exception cref="T:System.ArgumentNullException">
-            /// buffer is null.
-            /// </exception>
-            /// <filterpriority>1</filterpriority>
-            public override void Write(char[] buffer, int index, int count)
-            {
-                base.Write(buffer, index, count);
-                this.tally += this.Encoding.GetByteCount(buffer, index, count);
-            }
+    /// <summary>
+    /// Represents a file stream writer that keeps a tally of the length of the file.
+    /// </summary>
+    internal sealed class TallyKeepingFileStreamWriter : StreamWriter
+    {
 
-            /// <summary>
-            /// Writes a string to the stream.
-            /// </summary>
-            /// <param name="value">
-            /// The string to write to the stream. If value is null, nothing is written.
-            /// </param>
-            /// <exception cref="T:System.ObjectDisposedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
-            /// </exception>
-            /// <exception cref="T:System.NotSupportedException">
-            /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
-            /// </exception>
-            /// <exception cref="T:System.IO.IOException">
-            /// An I/O error occurs.
-            /// </exception>
-            /// <filterpriority>1</filterpriority>
-            public override void Write(string value)
-            {
-                base.Write(value);
-                this.tally += this.Encoding.GetByteCount(value);
-            }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TallyKeepingFileStreamWriter"/> class.
+        /// </summary>
+        /// <param name="stream">
+        /// The <see cref="FileStream"/> to write to.
+        /// </param>
+        public TallyKeepingFileStreamWriter(FileStream stream)
+            : base(stream)
+        {
+            Tally = stream.Length;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TallyKeepingFileStreamWriter"/> class.
+        /// </summary>
+        /// <param name="stream">
+        /// The <see cref="FileStream"/> to write to.
+        /// </param>
+        /// <param name="encoding">
+        /// The <see cref="Encoding"/> to use.
+        /// </param>
+        public TallyKeepingFileStreamWriter(FileStream stream, Encoding encoding)
+            : base(stream, encoding)
+        {
+            Tally = stream.Length;
+        }
+
+        /// <summary>
+        /// Gets the tally of the length of the string.
+        /// </summary>
+        /// <value>
+        /// The tally of the length of the string.
+        /// </value>
+        public long Tally { get; private set; }
+
+        /// <summary>
+        /// Writes a character to the stream.
+        /// </summary>
+        /// <param name="value">
+        /// The character to write to the text stream.
+        /// </param>
+        /// <exception cref="T:System.ObjectDisposedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
+        /// </exception>
+        /// <exception cref="T:System.NotSupportedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
+        /// </exception>
+        /// <exception cref="T:System.IO.IOException">
+        /// An I/O error occurs.
+        /// </exception>
+        /// <filterpriority>1</filterpriority>
+        public override void Write(char value)
+        {
+            base.Write(value);
+            Tally += Encoding.GetByteCount(new[] { value });
+        }
+
+        /// <summary>
+        /// Writes a character array to the stream.
+        /// </summary>
+        /// <param name="buffer">
+        /// A character array containing the data to write. If buffer is null, nothing is written.
+        /// </param>
+        /// <exception cref="T:System.ObjectDisposedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
+        /// </exception>
+        /// <exception cref="T:System.NotSupportedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
+        /// </exception>
+        /// <exception cref="T:System.IO.IOException">
+        /// An I/O error occurs.
+        /// </exception>
+        /// <filterpriority>1</filterpriority>
+        public override void Write(char[]? buffer)
+        {
+            base.Write(buffer);
+            Tally += (buffer is not null) ? Encoding.GetByteCount(buffer) : 0;
+        }
+
+        /// <summary>
+        /// Writes an array of characters to the stream.
+        /// </summary>
+        /// <param name="buffer">
+        /// A character array containing the data to write.
+        /// </param>
+        /// <param name="index">
+        /// The index into buffer at which to begin writing.
+        /// </param>
+        /// <param name="count">
+        /// The number of characters to read from buffer.
+        /// </param>
+        /// <exception cref="T:System.IO.IOException">
+        /// An I/O error occurs.
+        /// </exception>
+        /// <exception cref="T:System.ObjectDisposedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
+        /// </exception>
+        /// <exception cref="T:System.NotSupportedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">
+        /// index or count is negative.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentException">
+        /// The buffer length minus index is less than count.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// buffer is null.
+        /// </exception>
+        /// <filterpriority>1</filterpriority>
+        public override void Write(char[] buffer, int index, int count)
+        {
+            base.Write(buffer, index, count);
+            Tally += Encoding.GetByteCount(buffer, index, count);
+        }
+
+        /// <summary>
+        /// Writes a string to the stream.
+        /// </summary>
+        /// <param name="value">
+        /// The string to write to the stream. If value is null, nothing is written.
+        /// </param>
+        /// <exception cref="T:System.ObjectDisposedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and current writer is closed.
+        /// </exception>
+        /// <exception cref="T:System.NotSupportedException">
+        /// <see cref="P:System.IO.StreamWriter.AutoFlush"></see>is true or the<see cref="T:System.IO.StreamWriter"></see>buffer is full, and the contents of the buffer cannot be written to the underlying fixed size stream because the<see cref="T:System.IO.StreamWriter"></see>is at the end the stream.
+        /// </exception>
+        /// <exception cref="T:System.IO.IOException">
+        /// An I/O error occurs.
+        /// </exception>
+        /// <filterpriority>1</filterpriority>
+        public override void Write(string? value)
+        {
+            base.Write(value);
+            Tally += (value is not null) ? Encoding.GetByteCount(value) : 0;
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs
deleted file mode 100644
index 446d7f9966..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-
-    public partial interface IPlatformEqtTrace
-    {
-        /// <summary>
-        /// Setup remote trace listener in the child domain.
-        /// If calling domain, doesn't have tracing enabled nothing is done.
-        /// </summary>
-        /// <param name="childDomain">Child <c>AppDomain</c>.</param>
-        void SetupRemoteEqtTraceListeners(AppDomain childDomain);
-
-        /// <summary>
-        /// Setup a custom trace listener instead of default trace listener created by test platform.
-        /// This is needed by DTA Agent where it needs to listen test platform traces but doesn't use test platform listener.
-        /// </summary>
-        /// <param name="listener">
-        /// The listener.
-        /// </param>
-        void SetupListener(TraceListener listener);
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs
deleted file mode 100644
index 764f020ba2..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Reflection;
-
-    /// <summary>
-    /// Assembly Extensions
-    /// </summary>
-    public static class PlatformAssemblyExtensions
-    {
-        /// <summary>
-        /// Get current assembly location as per current platform
-        /// </summary>
-        /// <param name="assembly">Assembly</param>
-        /// <returns>Returns Assembly location as per platform</returns>
-        public static string GetAssemblyLocation(this Assembly assembly)
-        {
-            return assembly.Location;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs
deleted file mode 100644
index ab1e63f3ce..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyLoadContext : IAssemblyLoadContext
-    {
-        /// <inheritdoc/>
-        public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
-        {
-            return AssemblyName.GetAssemblyName(assemblyPath);
-        }
-
-        public Assembly LoadAssemblyFromPath(string assemblyPath)
-        {
-            return Assembly.LoadFrom(assemblyPath);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs
deleted file mode 100644
index 359ed112b2..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyResolver : IAssemblyResolver
-    {
-        /// <summary>
-        /// Specifies whether the resolver is disposed or not
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlatformAssemblyResolver"/> class.
-        /// </summary>
-        public PlatformAssemblyResolver()
-        {
-            AppDomain.CurrentDomain.AssemblyResolve += this.AssemblyResolverEvent;
-        }
-
-        ~PlatformAssemblyResolver()
-        {
-            this.Dispose(false);
-        }
-
-        /// <inheritdoc/>
-        public event AssemblyResolveEventHandler AssemblyResolve;
-
-        public void Dispose()
-        {
-            this.Dispose(true);
-
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
-        }
-
-        protected void Dispose(bool disposing)
-        {
-            if (!this.disposed)
-            {
-                if (disposing)
-                {
-                    AppDomain.CurrentDomain.AssemblyResolve -= this.AssemblyResolverEvent;
-                }
-
-                this.disposed = true;
-            }
-        }
-
-        /// <summary>
-        /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="eventArgs">
-        /// The event Args.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Assembly"/>.
-        /// </returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Justification")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Justification = "Justification")]
-        private Assembly AssemblyResolverEvent(object sender, object eventArgs)
-        {
-            ResolveEventArgs args = eventArgs as ResolveEventArgs;
-
-            return args == null ? null : this.AssemblyResolve(this, new AssemblyResolveEventArgs(args.Name));
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs
deleted file mode 100644
index be6fc31982..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc />
-    public class PlatformEnvironment : IEnvironment
-    {
-        /// <inheritdoc />
-        public PlatformArchitecture Architecture
-        {
-            get
-            {
-                // On Mono System.Runtime.InteropServices.RuntimeInformation breaks
-                // See https://github.com/dotnet/corefx/issues/15112
-                // Support just x86 and x64 for now, likely our solution for ARM is going to be
-                // netcore based.
-                return Environment.Is64BitOperatingSystem ? PlatformArchitecture.X64 : PlatformArchitecture.X86;
-            }
-        }
-
-        /// <inheritdoc />
-        public PlatformOperatingSystem OperatingSystem
-        {
-            get
-            {
-                // Ensure the value is detected appropriately for Desktop CLR, Mono CLR 1.x and Mono
-                // CLR 2.x. See below link for more information:
-                // http://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform
-                int p = (int)System.Environment.OSVersion.Platform;
-                if ((p == 4) || (p == 6) || (p == 128))
-                {
-                    return PlatformOperatingSystem.Unix;
-                }
-
-                return PlatformOperatingSystem.Windows;
-            }
-        }
-
-        /// <inheritdoc />
-        public string OperatingSystemVersion
-        {
-            get
-            {
-                return System.Environment.OSVersion.ToString();
-            }
-        }
-
-        /// <inheritdoc />
-        public void Exit(int exitcode)
-        {
-            Environment.Exit(exitcode);
-        }
-
-        /// <inheritdoc />
-        public int GetCurrentManagedThreadId()
-        {
-            return Thread.CurrentThread.ManagedThreadId;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs
deleted file mode 100644
index f03199043a..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Runtime.ExceptionServices;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    public class PlatformThread : IThread
-    {
-        /// <inheritdoc/>
-        public void Run(Action action, PlatformApartmentState apartmentState, bool waitForCompletion)
-        {
-            if (action == null)
-            {
-                return;
-            }
-
-            Exception exThrown = null;
-            var thread = new System.Threading.Thread(() =>
-            {
-                try
-                {
-                    action();
-                }
-                catch (Exception e)
-                {
-                    exThrown = e;
-                }
-            });
-
-            ApartmentState state = Enum.TryParse(apartmentState.ToString(), out state) ? state : ApartmentState.MTA;
-            thread.SetApartmentState(state);
-            thread.IsBackground = true;
-            thread.Start();
-            if (waitForCompletion)
-            {
-                thread.Join();
-                if (exThrown != null)
-                {
-                    // Preserve the stacktrace when re-throwing the exception.
-                    ExceptionDispatchInfo.Capture(exThrown).Throw();
-                }
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs
deleted file mode 100644
index 8093a753ac..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    public partial class ProcessHelper : IProcessHelper
-    {
-        /// <inheritdoc/>
-        public string GetCurrentProcessLocation()
-        {
-            return Path.GetDirectoryName(this.GetCurrentProcessFileName());
-        }
-
-        public IntPtr GetProcessHandle(int processId)
-        {
-            return Process.GetProcessById(processId).Handle;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs
deleted file mode 100644
index e0b3b47169..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK || NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Diagnostics;
-
-    public static class ProcessStartInfoExtensions
-    {
-        /// <summary>
-        /// Add environment variable that apply to this process and child processes.
-        /// </summary>
-        /// <param name="startInfo">The process start info</param>
-        /// <param name="name">Environment Variable name. </param>
-        /// <param name="value">Environment Variable value.</param>
-        public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, string name, string value)
-        {
-            startInfo.EnvironmentVariables[name] = value;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs
deleted file mode 100644
index ab24a8a303..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-
-    /// <summary>
-    /// Wrapper class for tracing.
-    ///     - Shortcut-methods for Error, Warning, Info, Verbose.
-    ///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
-    ///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
-    ///     - By default tracing if OFF.
-    ///     - Our build environment always sets the /d:TRACE so this class is always enabled,
-    ///       the Debug class is enabled only in debug builds (/d:DEBUG).
-    ///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
-    ///       We log ignored exceptions to system Application log.
-    ///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
-    /// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
-    /// </summary>
-    public partial class PlatformEqtTrace : IPlatformEqtTrace
-    {
-        /// <summary>
-        /// Setup remote trace listener in the child domain.
-        /// If calling domain, doesn't have tracing enabled nothing is done.
-        /// </summary>
-        /// <param name="childDomain">Child <c>AppDomain</c>.</param>
-        public void SetupRemoteEqtTraceListeners(AppDomain childDomain)
-        {
-            Debug.Assert(childDomain != null, "domain");
-            if (childDomain != null)
-            {
-                RemoteEqtTrace remoteEqtTrace = (RemoteEqtTrace)childDomain.CreateInstanceFromAndUnwrap(
-                    typeof(RemoteEqtTrace).Assembly.Location,
-                    typeof(RemoteEqtTrace).FullName);
-
-                if (!Enum.Equals(TraceLevel, TraceLevel.Off))
-                {
-                    remoteEqtTrace.TraceLevel = TraceLevel;
-
-                    TraceListener tptListner = null;
-                    foreach (TraceListener listener in Trace.Listeners)
-                    {
-                        if (string.Equals(listener.Name, ListenerName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            Debug.Assert(tptListner == null, "Multiple TptListeners found.");
-                            tptListner = listener;
-                        }
-                    }
-
-                    remoteEqtTrace.SetupRemoteListeners(tptListner);
-                }
-                else
-                {
-                    this.DoNotInitialize = true;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void SetupListener(TraceListener listener)
-        {
-            lock (isInitializationLock)
-            {
-                // Add new listeners.
-                if (listener != null)
-                {
-                    Source.Listeners.Add(listener);
-                }
-
-                isInitialized = true;
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs
deleted file mode 100644
index fa0ce155bb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETFRAMEWORK
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// A class used to expose EqtTrace functionality across AppDomains.
-    /// </summary>
-    public sealed class RemoteEqtTrace : MarshalByRefObject
-    {
-        /// <summary>
-        /// Gets or sets the trace level.
-        /// </summary>
-        public TraceLevel TraceLevel
-        {
-            get
-            {
-                return PlatformEqtTrace.TraceLevel;
-            }
-
-            set
-            {
-                PlatformEqtTrace.TraceLevel = value;
-            }
-        }
-
-        /// <summary>
-        /// Register listeners from parent domain in current domain.
-        /// </summary>
-        /// <param name="listener">Trace listener instance.</param>
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Used in remote objects.")]
-        internal void SetupRemoteListeners(TraceListener listener)
-        {
-            PlatformEqtTrace.SetupRemoteListeners(listener);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Interfaces/Tracing/IPlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Interfaces/Tracing/IPlatformEqtTrace.cs
new file mode 100644
index 0000000000..a244bb699d
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Interfaces/Tracing/IPlatformEqtTrace.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+public partial interface IPlatformEqtTrace
+{
+    /// <summary>
+    /// Setup remote trace listener in the child domain.
+    /// If calling domain, doesn't have tracing enabled nothing is done.
+    /// </summary>
+    /// <param name="childDomain">Child <c>AppDomain</c>.</param>
+    void SetupRemoteEqtTraceListeners(AppDomain? childDomain);
+
+    /// <summary>
+    /// Setup a custom trace listener instead of default trace listener created by test platform.
+    /// This is needed by DTA Agent where it needs to listen test platform traces but doesn't use test platform listener.
+    /// </summary>
+    /// <param name="listener">
+    /// The listener.
+    /// </param>
+    void SetupListener(TraceListener? listener);
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyExtensions.cs
new file mode 100644
index 0000000000..90378811f7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System.Reflection;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <summary>
+/// Assembly Extensions
+/// </summary>
+public static class PlatformAssemblyExtensions
+{
+    /// <summary>
+    /// Get current assembly location as per current platform
+    /// </summary>
+    /// <param name="assembly">Assembly</param>
+    /// <returns>Returns Assembly location as per platform</returns>
+    public static string GetAssemblyLocation(this Assembly assembly)
+    {
+        return assembly.Location;
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyLoadContext.cs
new file mode 100644
index 0000000000..2893bfa7de
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyLoadContext.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <inheritdoc/>
+public class PlatformAssemblyLoadContext : IAssemblyLoadContext
+{
+    /// <inheritdoc/>
+    public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
+    {
+        return AssemblyName.GetAssemblyName(assemblyPath);
+    }
+
+    public Assembly LoadAssemblyFromPath(string assemblyPath)
+    {
+        return Assembly.LoadFrom(assemblyPath);
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyResolver.cs
new file mode 100644
index 0000000000..4b581d0ef0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyResolver.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <inheritdoc/>
+public class PlatformAssemblyResolver : IAssemblyResolver
+{
+    /// <summary>
+    /// Specifies whether the resolver is disposed or not
+    /// </summary>
+    private bool _isDisposed;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlatformAssemblyResolver"/> class.
+    /// </summary>
+    public PlatformAssemblyResolver()
+    {
+        AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolverEvent;
+    }
+
+    ~PlatformAssemblyResolver()
+    {
+        Dispose(false);
+    }
+
+    /// <inheritdoc/>
+    public event AssemblyResolveEventHandler? AssemblyResolve;
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+        {
+            return;
+        }
+
+        if (disposing)
+        {
+            AppDomain.CurrentDomain.AssemblyResolve -= AssemblyResolverEvent;
+        }
+
+        _isDisposed = true;
+    }
+
+    /// <summary>
+    /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="eventArgs">
+    /// The event Args.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Assembly"/>.
+    /// </returns>
+    private Assembly? AssemblyResolverEvent(object sender, object eventArgs)
+    {
+        return eventArgs is not ResolveEventArgs args ? null : AssemblyResolve?.Invoke(this, new AssemblyResolveEventArgs(args.Name));
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformEnvironment.cs
new file mode 100644
index 0000000000..09fb1ea528
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformEnvironment.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <inheritdoc />
+public class PlatformEnvironment : IEnvironment
+{
+    private PlatformArchitecture? _architecture;
+
+    /// <inheritdoc />
+    public PlatformArchitecture Architecture
+    {
+        get
+        {
+            return _architecture ??= Environment.Is64BitOperatingSystem
+                ? IsArm64()
+                    ? PlatformArchitecture.ARM64
+                    : PlatformArchitecture.X64
+                : PlatformArchitecture.X86;
+        }
+    }
+
+    private static bool IsArm64()
+    {
+        try
+        {
+            var currentProcess = Process.GetCurrentProcess();
+            if (!NativeMethods.IsWow64Process2(currentProcess.Handle, out ushort _, out ushort nativeMachine))
+            {
+                throw new Win32Exception();
+            }
+
+            // If nativeMachine is IMAGE_FILE_MACHINE_ARM64 it means that we're running on ARM64 architecture device.
+            return nativeMachine == NativeMethods.IMAGE_FILE_MACHINE_ARM64;
+        }
+        catch
+        {
+            // At the moment we cannot log messages inside the Microsoft.TestPlatform.PlatformAbstractions.
+            // We did an attempt in https://github.com/microsoft/vstest/pull/3422 - 17.2.0-preview-20220301-01 - but we reverted after
+            // because we broke a scenario where for .NET Framework application inside the test host
+            // we loaded runner version of Microsoft.TestPlatform.PlatformAbstractions but newer version Microsoft.TestPlatform.ObjectModel(the one close
+            // to the test container) and the old PlatformAbstractions doesn't contain the methods expected by the new ObjectModel throwing
+            // a MissedMethodException.
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public PlatformOperatingSystem OperatingSystem
+    {
+        get
+        {
+            // Ensure the value is detected appropriately for Desktop CLR, Mono CLR 1.x and Mono
+            // CLR 2.x. See below link for more information:
+            // http://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform
+            int p = (int)Environment.OSVersion.Platform;
+            return p is 4 or 6 or 128
+                ? PlatformOperatingSystem.Unix
+                : PlatformOperatingSystem.Windows;
+        }
+    }
+
+    /// <inheritdoc />
+    public string OperatingSystemVersion => Environment.OSVersion.ToString();
+
+    /// <inheritdoc />
+    public int ProcessorCount => Environment.ProcessorCount;
+
+    /// <inheritdoc />
+    public void Exit(int exitcode)
+    {
+        Environment.Exit(exitcode);
+    }
+
+    /// <inheritdoc />
+    public int GetCurrentManagedThreadId()
+        => Environment.CurrentManagedThreadId;
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformThread.cs
new file mode 100644
index 0000000000..805843c406
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformThread.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+public class PlatformThread : IThread
+{
+    /// <inheritdoc/>
+    public void Run(Action? action, PlatformApartmentState apartmentState, bool waitForCompletion)
+    {
+        if (action == null)
+        {
+            return;
+        }
+
+        Exception? exThrown = null;
+        var thread = new Thread(() =>
+        {
+            try
+            {
+                action();
+            }
+            catch (Exception e)
+            {
+                exThrown = e;
+            }
+        });
+
+        ApartmentState state = Enum.TryParse(apartmentState.ToString(), out state) ? state : ApartmentState.MTA;
+        thread.SetApartmentState(state);
+        thread.IsBackground = true;
+        thread.Start();
+        if (waitForCompletion)
+        {
+            thread.Join();
+            if (exThrown != null)
+            {
+                // Preserve the stacktrace when re-throwing the exception.
+                ExceptionDispatchInfo.Capture(exThrown).Throw();
+            }
+        }
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessHelper.cs
new file mode 100644
index 0000000000..cc65454857
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessHelper.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+public partial class ProcessHelper : IProcessHelper
+{
+    private PlatformArchitecture? _currentProcessArchitecture;
+
+    /// <inheritdoc/>
+    public string GetCurrentProcessLocation()
+        => Path.GetDirectoryName(GetCurrentProcessFileName());
+
+    /// <inheritdoc/>
+    public nint GetProcessHandle(int processId) =>
+        processId == _currentProcess.Id
+            ? _currentProcess.Handle
+            : Process.GetProcessById(processId).Handle;
+
+    /// <inheritdoc/>
+    public PlatformArchitecture GetCurrentProcessArchitecture()
+    {
+        _currentProcessArchitecture ??= GetProcessArchitecture(_currentProcess.Id);
+        return _currentProcessArchitecture.Value;
+    }
+
+    public PlatformArchitecture GetProcessArchitecture(int processId)
+    {
+        if (_currentProcess.Id == processId)
+        {
+            // If we already cached the current process architecture, no need to figure it out again.
+            if (_currentProcessArchitecture is not null)
+            {
+                return _currentProcessArchitecture.Value;
+            }
+
+            // When this is current process, we can just check if IntPointer size to get if we are 64-bit or 32-bit.
+            // When it is 32-bit we can just return, if it is 64-bit we need to clarify if x64 or arm64.
+            if (IntPtr.Size == 4)
+            {
+                return PlatformArchitecture.X86;
+            }
+        }
+
+        // If the current process is 64-bit, or this is any remote process, we need to query it via native api.
+        var process = processId == _currentProcess.Id ? _currentProcess : Process.GetProcessById(processId);
+        try
+        {
+            if (!NativeMethods.IsWow64Process2(process.Handle, out ushort processMachine, out ushort nativeMachine))
+            {
+                throw new Win32Exception();
+            }
+
+            if (processMachine != NativeMethods.IMAGE_FILE_MACHINE_UNKNOWN)
+            {
+                // The process is running using WOW64, which suggests it is 32-bit (or any of the other machines, that we cannot
+                // handle, so we just assume x86).
+                return PlatformArchitecture.X86;
+            }
+
+            // If processMachine is IMAGE_FILE_MACHINE_UNKNOWN mean that we're not running using WOW64 emulation.
+            // If nativeMachine is IMAGE_FILE_MACHINE_ARM64 mean that we're running on ARM64 architecture device.
+            if (processMachine == NativeMethods.IMAGE_FILE_MACHINE_UNKNOWN && nativeMachine == NativeMethods.IMAGE_FILE_MACHINE_ARM64)
+            {
+                // To distinguish between ARM64 and x64 emulated on ARM64 we check the PE header of the current running executable.
+                if (IsArm64Executable(process.MainModule.FileName))
+                {
+                    return PlatformArchitecture.ARM64;
+                }
+                else
+                {
+                    return PlatformArchitecture.X64;
+                }
+            }
+            else
+            {
+                return PlatformArchitecture.X64;
+            }
+        }
+        catch
+        {
+            // At the moment we cannot log messages inside the Microsoft.TestPlatform.PlatformAbstractions.
+            // We did an attempt in https://github.com/microsoft/vstest/pull/3422 - 17.2.0-preview-20220301-01 - but we reverted after
+            // because we broke a scenario where for .NET Framework application inside the test host
+            // we loaded runner version of Microsoft.TestPlatform.PlatformAbstractions but newer version Microsoft.TestPlatform.ObjectModel(the one close
+            // to the test container) and the old PlatformAbstractions doesn't contain the methods expected by the new ObjectModel throwing
+            // a MissedMethodException.
+
+            if (!Environment.Is64BitOperatingSystem)
+            {
+                // When we know this is not 64-bit operating system, then all processes are running as 32-bit, both
+                // the current process and other processes.
+                return PlatformArchitecture.X86;
+            }
+
+            try
+            {
+                var isWow64Process = NativeMethods.IsWow64Process(process.Handle, out var isWow64);
+                if (!isWow64Process)
+                {
+                    // Do nothing we cannot log errors here.
+                }
+
+                // The process is running using WOW64, which suggests it is 32-bit (or any of the other machines, that we cannot
+                // handle, so we just assume x86). If it is not wow, we assume x64, because we failed the call to more advanced api
+                // that can tell us if this is arm64, so we are probably on older version of OS which is x64.
+                // We could call PlatformArchitecture.Architecture, but that uses the same api that we just failed to invoke.
+                return isWow64 ? PlatformArchitecture.X86 : PlatformArchitecture.X64;
+            }
+            catch
+            {
+                // We are on 64-bit system, let's assume x64 when we fail to determine the value.
+                return PlatformArchitecture.X64;
+            }
+        }
+    }
+
+    private static bool IsArm64Executable(string path)
+    {
+        // This document specifies the structure of executable (image) files
+        // https://docs.microsoft.com/windows/win32/debug/pe-format#general-concepts
+        using Stream fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+        using BinaryReader reader = new(fs);
+
+        // https://docs.microsoft.com/windows/win32/debug/pe-format#ms-dos-stub-image-only
+        // At location 0x3c, the stub has the file offset to the PE signature.
+        fs.Position = 0x3C;
+        var peHeader = reader.ReadUInt32();
+
+        // Check if the offset is invalid
+        if (peHeader > fs.Length - 5)
+        {
+            return false;
+        }
+
+        // https://docs.microsoft.com/windows/win32/debug/pe-format#signature-image-only
+        // Moving to the PE Header start location.
+        fs.Position = peHeader;
+
+        // After the MS-DOS stub, at the file offset specified at offset 0x3c, is a 4-byte signature that identifies the file as a PE format image file.
+        // This signature is "PE\0\0" (the letters "P" and "E" followed by two null bytes).
+        uint signature = reader.ReadUInt32();
+        if (signature != 0x00004550)
+        {
+            return false;
+        }
+
+        // https://docs.microsoft.com/windows/win32/debug/pe-format#coff-file-header-object-and-image
+        // At the beginning of an object file, or immediately after the signature of an image file, is a standard COFF file header.
+        var machine = reader.ReadUInt16();
+        reader.ReadUInt16(); //NumberOfSections
+        reader.ReadUInt32(); //TimeDateStamp
+        reader.ReadUInt32(); //PointerToSymbolTable
+        reader.ReadUInt32(); //NumberOfSymbols
+        reader.ReadUInt16(); //SizeOfOptionalHeader
+        reader.ReadUInt16(); //Characteristics
+
+        // https://docs.microsoft.com/windows/win32/debug/pe-format#optional-header-image-only
+        ushort magic = reader.ReadUInt16();
+        return magic is 0x010B or 0x020B && machine == NativeMethods.IMAGE_FILE_MACHINE_ARM64;
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessStartInfoExtensions.cs
new file mode 100644
index 0000000000..cf851752b0
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessStartInfoExtensions.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK || NETSTANDARD2_0
+
+using System.Diagnostics;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+public static class ProcessStartInfoExtensions
+{
+    /// <summary>
+    /// Add environment variable that apply to this process and child processes.
+    /// </summary>
+    /// <param name="startInfo">The process start info</param>
+    /// <param name="name">Environment Variable name. </param>
+    /// <param name="value">Environment Variable value.</param>
+    public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, string name, string? value)
+    {
+        startInfo.EnvironmentVariables[name] = value;
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/PlatformEqtTrace.cs
new file mode 100644
index 0000000000..6185920c0e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/PlatformEqtTrace.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Diagnostics;
+
+using Microsoft.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// Wrapper class for tracing.
+///     - Shortcut-methods for Error, Warning, Info, Verbose.
+///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
+///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
+///     - By default tracing if OFF.
+///     - Our build environment always sets the /d:TRACE so this class is always enabled,
+///       the Debug class is enabled only in debug builds (/d:DEBUG).
+///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
+///       We log ignored exceptions to system Application log.
+///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
+/// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
+/// </summary>
+public partial class PlatformEqtTrace : IPlatformEqtTrace
+{
+    /// <summary>
+    /// Setup remote trace listener in the child domain.
+    /// If calling domain, doesn't have tracing enabled nothing is done.
+    /// </summary>
+    /// <param name="childDomain">Child <c>AppDomain</c>.</param>
+    public void SetupRemoteEqtTraceListeners(AppDomain? childDomain)
+    {
+        TPDebug.Assert(childDomain != null, "domain");
+        if (childDomain == null)
+        {
+            return;
+        }
+
+        RemoteEqtTrace remoteEqtTrace = (RemoteEqtTrace)childDomain.CreateInstanceFromAndUnwrap(
+            typeof(RemoteEqtTrace).Assembly.Location,
+            typeof(RemoteEqtTrace).FullName);
+
+        if (!Equals(TraceLevel, TraceLevel.Off))
+        {
+            remoteEqtTrace.TraceLevel = TraceLevel;
+
+            TraceListener? tptListner = null;
+            foreach (TraceListener listener in Trace.Listeners)
+            {
+                if (string.Equals(listener.Name, ListenerName, StringComparison.OrdinalIgnoreCase))
+                {
+                    TPDebug.Assert(tptListner == null, "Multiple TptListeners found.");
+                    tptListner = listener;
+                }
+            }
+
+            RemoteEqtTrace.SetupRemoteListeners(tptListner);
+        }
+        else
+        {
+            DoNotInitialize = true;
+        }
+    }
+
+    /// <inheritdoc/>
+    public void SetupListener(TraceListener? listener)
+    {
+        lock (IsInitializationLock)
+        {
+            // Add new listeners.
+            if (listener != null)
+            {
+                Source.Listeners.Add(listener);
+            }
+
+            s_isInitialized = true;
+        }
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/RemoteEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/RemoteEqtTrace.cs
new file mode 100644
index 0000000000..84dae4f736
--- /dev/null
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/RemoteEqtTrace.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+/// <summary>
+/// A class used to expose EqtTrace functionality across AppDomains.
+/// </summary>
+public sealed class RemoteEqtTrace : MarshalByRefObject
+{
+    /// <summary>
+    /// Gets or sets the trace level.
+    /// </summary>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public TraceLevel TraceLevel
+    {
+        get
+        {
+            return PlatformEqtTrace.TraceLevel;
+        }
+
+        set
+        {
+            PlatformEqtTrace.TraceLevel = value;
+        }
+    }
+
+    /// <summary>
+    /// Register listeners from parent domain in current domain.
+    /// </summary>
+    /// <param name="listener">Trace listener instance.</param>
+    internal static void SetupRemoteListeners(TraceListener? listener)
+    {
+        PlatformEqtTrace.SetupRemoteListeners(listener);
+    }
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs
index fd8a665908..3d8018bf0a 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs
@@ -3,24 +3,23 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Reflection;
+using System.Reflection;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
+/// <summary>
+/// Assembly Extensions
+/// </summary>
+public static class PlatformAssemblyExtensions
+{
     /// <summary>
-    /// Assembly Extensions
+    /// Get current assembly location as per current platform
     /// </summary>
-    public static class PlatformAssemblyExtensions
+    /// <param name="assembly">Assembly</param>
+    /// <returns>Returns Assembly location as per platform</returns>
+    public static string GetAssemblyLocation(this Assembly assembly)
     {
-        /// <summary>
-        /// Get current assembly location as per current platform
-        /// </summary>
-        /// <param name="assembly">Assembly</param>
-        /// <returns>Returns Assembly location as per platform</returns>
-        public static string GetAssemblyLocation(this Assembly assembly)
-        {
-            return assembly.Location;
-        }
+        return assembly.Location;
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs
index e364274b1b..f25d7439d9 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs
@@ -3,26 +3,25 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Reflection;
-    using System.Runtime.Loader;
+using System.Reflection;
+using System.Runtime.Loader;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
+/// <inheritdoc/>
+public class PlatformAssemblyLoadContext : IAssemblyLoadContext
+{
     /// <inheritdoc/>
-    public class PlatformAssemblyLoadContext : IAssemblyLoadContext
+    public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
     {
-        /// <inheritdoc/>
-        public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
-        {
-            return AssemblyLoadContext.GetAssemblyName(assemblyPath);
-        }
+        return AssemblyLoadContext.GetAssemblyName(assemblyPath);
+    }
 
-        public Assembly LoadAssemblyFromPath(string assemblyPath)
-        {
-            return AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
-        }
+    public Assembly LoadAssemblyFromPath(string assemblyPath)
+    {
+        return AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs
index cf530b492c..914e93f998 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs
@@ -3,80 +3,74 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+using System;
+using System.Reflection;
+using System.Runtime.Loader;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <inheritdoc/>
+public class PlatformAssemblyResolver : IAssemblyResolver
 {
-    using System;
-    using System.Reflection;
-    using System.Runtime.Loader;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+    /// <summary>
+    /// Specifies whether the resolver is disposed or not
+    /// </summary>
+    private bool _disposed;
 
-    /// <inheritdoc/>
-    public class PlatformAssemblyResolver : IAssemblyResolver
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlatformAssemblyResolver"/> class.
+    /// </summary>
+    public PlatformAssemblyResolver()
     {
-        /// <summary>
-        /// Specifies whether the resolver is disposed or not
-        /// </summary>
-        private bool disposed;
+        AssemblyLoadContext.Default.Resolving += AssemblyResolverEvent;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlatformAssemblyResolver"/> class.
-        /// </summary>
-        /// <param name="directories"> The search directories. </param>
-        public PlatformAssemblyResolver()
-        {
-            AssemblyLoadContext.Default.Resolving += this.AssemblyResolverEvent;
-        }
+    ~PlatformAssemblyResolver()
+    {
+        Dispose(false);
+    }
 
-        ~PlatformAssemblyResolver()
-        {
-            this.Dispose(false);
-        }
+    /// <inheritdoc/>
+    public event AssemblyResolveEventHandler? AssemblyResolve;
 
-        /// <inheritdoc/>
-        public event AssemblyResolveEventHandler AssemblyResolve;
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        public void Dispose()
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_disposed)
         {
-            this.Dispose(true);
-
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
+            return;
         }
 
-        protected void Dispose(bool disposing)
+        if (disposing)
         {
-            if (!this.disposed)
-            {
-                if (disposing)
-                {
-                    AssemblyLoadContext.Default.Resolving -= this.AssemblyResolverEvent;
-                }
-
-                this.disposed = true;
-            }
+            AssemblyLoadContext.Default.Resolving -= AssemblyResolverEvent;
         }
 
-        /// <summary>
-        /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
-        /// </summary>
-        /// <param name="sender">
-        /// The sender.
-        /// </param>
-        /// <param name="eventArgs">
-        /// The event Args.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Assembly"/>.
-        /// </returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "<Justification>")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Justification = "<Justification>")]
-        private Assembly AssemblyResolverEvent(object sender, object eventArgs)
-        {
-            AssemblyName args = eventArgs as AssemblyName;
+        _disposed = true;
+    }
 
-            return args == null ? null : this.AssemblyResolve(this, new AssemblyResolveEventArgs(args.Name));
-        }
+    /// <summary>
+    /// Assembly Resolve event handler for App Domain - called when CLR loader cannot resolve assembly.
+    /// </summary>
+    /// <param name="sender">
+    /// The sender.
+    /// </param>
+    /// <param name="eventArgs">
+    /// The event Args.
+    /// </param>
+    /// <returns>
+    /// The <see cref="Assembly"/>.
+    /// </returns>
+    private Assembly? AssemblyResolverEvent(object sender, object eventArgs)
+    {
+        return eventArgs is not AssemblyName args ? null : AssemblyResolve?.Invoke(this, new AssemblyResolveEventArgs(args.Name));
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
index e96c3aaf9b..31f5fde389 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
@@ -3,83 +3,73 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using System;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+/// <inheritdoc />
+public class PlatformEnvironment : IEnvironment
+{
     /// <inheritdoc />
-    public class PlatformEnvironment : IEnvironment
+    public PlatformArchitecture Architecture
     {
-        /// <inheritdoc />
-        public PlatformArchitecture Architecture
+        get
         {
-            get
+            return RuntimeInformation.OSArchitecture switch
             {
-                switch (RuntimeInformation.OSArchitecture)
-                {
-                    case System.Runtime.InteropServices.Architecture.X86:
-                        return PlatformArchitecture.X86;
-                    case System.Runtime.InteropServices.Architecture.X64:
-                        return PlatformArchitecture.X64;
-                    case System.Runtime.InteropServices.Architecture.Arm:
-                        return PlatformArchitecture.ARM;
-                    case System.Runtime.InteropServices.Architecture.Arm64:
-                        return PlatformArchitecture.ARM64;
-
-                    // The symbolic value is only available with .NET 6
-                    // preview 6 or later, so use the numerical value for now.
-                    // case System.Runtime.InteropServices.Architecture.S390x:
-                    case (Architecture)5:
-                        return PlatformArchitecture.S390x;
-                    default:
-                        throw new NotSupportedException();
-                }
-            }
+                System.Runtime.InteropServices.Architecture.X86 => PlatformArchitecture.X86,
+                System.Runtime.InteropServices.Architecture.X64 => PlatformArchitecture.X64,
+                System.Runtime.InteropServices.Architecture.Arm => PlatformArchitecture.ARM,
+                System.Runtime.InteropServices.Architecture.Arm64 => PlatformArchitecture.ARM64,
+                // The symbolic value is only available with .NET 6
+                // preview 6 or later, so use the numerical value for now.
+                // case System.Runtime.InteropServices.Architecture.S390x:
+                (Architecture)5 => PlatformArchitecture.S390x,
+                (Architecture)8 => PlatformArchitecture.Ppc64le,
+                (Architecture)9 => PlatformArchitecture.RiscV64,
+                _ => throw new NotSupportedException(),
+            };
         }
+    }
 
-        /// <inheritdoc />
-        public PlatformOperatingSystem OperatingSystem
+    /// <inheritdoc />
+    public PlatformOperatingSystem OperatingSystem
+    {
+        get
         {
-            get
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    return PlatformOperatingSystem.Windows;
-                }
-
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                {
-                    return PlatformOperatingSystem.OSX;
-                }
-
-                return PlatformOperatingSystem.Unix;
+                return PlatformOperatingSystem.Windows;
             }
-        }
 
-        /// <inheritdoc />
-        public string OperatingSystemVersion
-        {
-            get
-            {
-                return RuntimeInformation.OSDescription;
-            }
+            return RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? PlatformOperatingSystem.OSX : PlatformOperatingSystem.Unix;
         }
+    }
 
-        /// <inheritdoc />
-        public void Exit(int exitcode)
+    /// <inheritdoc />
+    public string OperatingSystemVersion
+    {
+        get
         {
-            Environment.Exit(exitcode);
+            return RuntimeInformation.OSDescription;
         }
+    }
 
-        /// <inheritdoc />
-        public int GetCurrentManagedThreadId()
-        {
-            return Thread.CurrentThread.ManagedThreadId;
-        }
+    /// <inheritdoc />
+    public int ProcessorCount => Environment.ProcessorCount;
+
+    /// <inheritdoc />
+    public void Exit(int exitcode)
+    {
+        Environment.Exit(exitcode);
     }
+
+    /// <inheritdoc />
+    public int GetCurrentManagedThreadId()
+        => Environment.CurrentManagedThreadId;
 }
 
 #endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs
index 69e0416896..78afab12b2 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs
@@ -3,52 +3,51 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Runtime.ExceptionServices;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
-    public class PlatformThread : IThread
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+public class PlatformThread : IThread
+{
+    /// <inheritdoc/>
+    public void Run(Action? action, PlatformApartmentState apartmentState, bool waitForCompletion)
     {
-        /// <inheritdoc/>
-        public void Run(Action action, PlatformApartmentState apartmentState, bool waitForCompletion)
+        if (apartmentState == PlatformApartmentState.STA)
+        {
+            throw new ThreadApartmentStateNotSupportedException();
+        }
+
+        if (action == null)
         {
-            if (apartmentState == PlatformApartmentState.STA)
+            return;
+        }
+
+        Exception? exThrown = null;
+        var thread = new Thread(() =>
+        {
+            try
             {
-                throw new ThreadApartmentStateNotSupportedException();
+                action();
             }
-
-            if (action == null)
+            catch (Exception e)
             {
-                return;
+                exThrown = e;
             }
+        });
 
-            Exception exThrown = null;
-            var thread = new Thread(() =>
-            {
-                try
-                {
-                    action();
-                }
-                catch (Exception e)
-                {
-                    exThrown = e;
-                }
-            });
-
-            // ApartmentState is not supported in netcoreapp1.0.
-            thread.IsBackground = true;
-            thread.Start();
-            if (waitForCompletion)
+        thread.IsBackground = true;
+        thread.Start();
+        if (waitForCompletion)
+        {
+            thread.Join();
+            if (exThrown != null)
             {
-                thread.Join();
-                if (exThrown != null)
-                {
-                    // Preserve the stacktrace when re-throwing the exception.
-                    ExceptionDispatchInfo.Capture(exThrown).Throw();
-                }
+                // Preserve the stacktrace when re-throwing the exception.
+                ExceptionDispatchInfo.Capture(exThrown).Throw();
             }
         }
     }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
index 74d6cb45a2..24c07fa5ed 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
@@ -3,29 +3,54 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+public partial class ProcessHelper : IProcessHelper
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+    /// <inheritdoc/>
+    public string GetCurrentProcessLocation()
+    {
+        return Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!;
+    }
 
-    public partial class ProcessHelper : IProcessHelper
+    /// <inheritdoc/>
+    public nint GetProcessHandle(int processId)
     {
-        /// <inheritdoc/>
-        public string GetCurrentProcessLocation()
-        {
-            return Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-        }
+        // An IntPtr representing the value of the handle field.
+        // If the handle has been marked invalid with SetHandleAsInvalid, this method still returns the original handle value, which can be a stale value.
+        return Process.GetProcessById(processId).SafeHandle.DangerousGetHandle();
+    }
 
-        /// <inheritdoc/>
-        public IntPtr GetProcessHandle(int processId)
+    public PlatformArchitecture GetCurrentProcessArchitecture()
+    {
+        return RuntimeInformation.ProcessArchitecture switch
         {
-            // An IntPtr representing the value of the handle field.
-            // If the handle has been marked invalid with SetHandleAsInvalid, this method still returns the original handle value, which can be a stale value.
-            return Process.GetProcessById(processId).SafeHandle.DangerousGetHandle();
-        }
+            Architecture.X86 => PlatformArchitecture.X86,
+            Architecture.X64 => PlatformArchitecture.X64,
+            Architecture.Arm => PlatformArchitecture.ARM,
+            Architecture.Arm64 => PlatformArchitecture.ARM64,
+            // The symbolic value is only available with .NET 6
+            // preview 6 or later, so use the numerical value for now.
+            // case System.Runtime.InteropServices.Architecture.S390x:
+            (Architecture)5 => PlatformArchitecture.S390x,
+            (Architecture)8 => PlatformArchitecture.Ppc64le,
+            (Architecture)9 => PlatformArchitecture.RiscV64,
+            _ => throw new NotSupportedException(),
+        };
+    }
+
+    public PlatformArchitecture GetProcessArchitecture(int processId)
+    {
+        // Return the same as the current process.
+        return GetCurrentProcessArchitecture();
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs
index 51c821d981..e784c47c6c 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs
@@ -3,22 +3,21 @@
 
 #if NETCOREAPP
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Diagnostics;
+using System.Diagnostics;
+
+namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-    public static class ProcessStartInfoExtensions
+public static class ProcessStartInfoExtensions
+{
+    /// <summary>
+    /// Add environment variable that apply to this process and child processes.
+    /// </summary>
+    /// <param name="startInfo">The process start info</param>
+    /// <param name="name">Environment Variable name. </param>
+    /// <param name="value">Environment Variable value.</param>
+    public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, string name, string? value)
     {
-        /// <summary>
-        /// Add environment variable that apply to this process and child processes.
-        /// </summary>
-        /// <param name="startInfo">The process start info</param>
-        /// <param name="name">Environment Variable name. </param>
-        /// <param name="value">Environment Variable value.</param>
-        public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, string name, string value)
-        {
-            startInfo.Environment[name] = value;
-        }
+        startInfo.Environment[name] = value;
     }
 }
 
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/IO/PlatformStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/IO/PlatformStream.cs
deleted file mode 100644
index b29af08dda..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/IO/PlatformStream.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformStream : IStream
-    {
-        /// <inheritdoc/>
-        public Stream CreateBufferedStream(Stream stream, int bufferSize)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyExtensions.cs
deleted file mode 100644
index 86f514ff9d..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Reflection;
-
-    public static class PlatformAssemblyExtensions
-    {
-        public static string GetAssemblyLocation(this Assembly assembly)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyLoadContext.cs
deleted file mode 100644
index 794d6c2782..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyLoadContext.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyLoadContext : IAssemblyLoadContext
-    {
-        /// <inheritdoc/>
-        public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public Assembly LoadAssemblyFromPath(string assemblyPath)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyResolver.cs
deleted file mode 100644
index 8e6bdfd9d2..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Runtime/PlatformAssemblyResolver.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyResolver : IAssemblyResolver
-    {
-        public PlatformAssemblyResolver()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public event AssemblyResolveEventHandler AssemblyResolve;
-
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
-
-        private void DummyEventThrower()
-        {
-            this.AssemblyResolve(this, null);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformEnvironment.cs
deleted file mode 100644
index 85dba7ead8..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformEnvironment.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc />
-    public class PlatformEnvironment : IEnvironment
-    {
-        /// <inheritdoc />
-        public PlatformArchitecture Architecture
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <inheritdoc />
-        public PlatformOperatingSystem OperatingSystem
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <inheritdoc />
-        public string OperatingSystemVersion
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <inheritdoc />
-        public void Exit(int exitcode)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc />
-        public int GetCurrentManagedThreadId()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformThread.cs
deleted file mode 100644
index 38c4968766..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/PlatformThread.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc />
-    public class PlatformThread : IThread
-    {
-        /// <inheritdoc />
-        public void Run(Action action, PlatformApartmentState platformApartmentState, bool waitForCompletion)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/ProcessHelper.cs
deleted file mode 100644
index 2d07d938eb..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/ProcessHelper.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <summary>
-    /// Helper class to deal with process related functionality.
-    /// </summary>
-    public class ProcessHelper : IProcessHelper
-    {
-        /// <inheritdoc/>
-        public object LaunchProcess(
-            string processPath,
-            string arguments,
-            string workingDirectory,
-            IDictionary<string, string> environmentVariables,
-            Action<object, string> errorCallback,
-            Action<object> exitCallBack,
-            Action<object, string> ouputCallBack)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetCurrentProcessFileName()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetCurrentProcessLocation()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetTestEngineDirectory()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public int GetCurrentProcessId()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetProcessName(int processId)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetExitCode(object process, out int exitCode)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public void SetExitCallback(int parentProcessId, Action<object> callbackAction)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public void TerminateProcess(object process)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public int GetProcessId(object process)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetNativeDllDirectory()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public PlatformArchitecture GetCurrentProcessArchitecture()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public void WaitForProcessExit(object process)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IntPtr GetProcessHandle(int processId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public object GetProcessById(int processId)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Tracing/PlatformEqtTrace.cs
deleted file mode 100644
index 8333c5c1ff..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/Tracing/PlatformEqtTrace.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD && !NETSTANDARD2_0
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics;
-
-    /// <summary>
-    /// Wrapper class for tracing.
-    ///     - Shortcut-methods for Error, Warning, Info, Verbose.
-    ///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
-    ///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
-    ///     - By default tracing if OFF.
-    ///     - Our build environment always sets the /d:TRACE so this class is always enabled,
-    ///       the Debug class is enabled only in debug builds (/d:DEBUG).
-    ///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
-    ///       We log ignored exceptions to system Application log.
-    ///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
-    /// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
-    /// </summary>
-    public class PlatformEqtTrace : IPlatformEqtTrace
-    {
-        private PlatformTraceLevel traceLevel = PlatformTraceLevel.Off;
-
-        public static string ErrorOnInitialization { get; set; }
-
-        public bool DoNotInitialize { get; set; }
-
-        public void WriteLine(PlatformTraceLevel traceLevel, string message)
-        {
-            if (!this.ShouldTrace(traceLevel))
-            {
-                return;
-            }
-
-            var level = Enum.GetName(typeof(PlatformTraceLevel), traceLevel);
-            Debug.WriteLine($"[{level}] {message}");
-        }
-
-        public bool InitializeVerboseTrace(string customLogFile)
-        {
-            return false;
-        }
-
-        public bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
-        {
-            this.traceLevel = traceLevel;
-
-            return false;
-        }
-
-        public bool ShouldTrace(PlatformTraceLevel traceLevel)
-        {
-            if (this.DoNotInitialize)
-            {
-                return false;
-            }
-
-            return (int)this.traceLevel >= (int)traceLevel;
-        }
-
-        public string GetLogFile() => string.Empty;
-
-        public void SetTraceLevel(PlatformTraceLevel value)
-        {
-            this.traceLevel = value;
-        }
-
-        public PlatformTraceLevel GetTraceLevel() => this.traceLevel;
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/IO/PlatformStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/IO/PlatformStream.cs
deleted file mode 100644
index 7ed4956de3..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/IO/PlatformStream.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformStream : IStream
-    {
-        /// <inheritdoc/>
-        public Stream CreateBufferedStream(Stream stream, int bufferSize)
-        {
-            return stream;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyExtensions.cs
deleted file mode 100644
index 71c6da95cc..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.IO;
-    using System.Reflection;
-
-    /// <summary>
-    /// Assembly Extensions
-    /// </summary>
-    public static class PlatformAssemblyExtensions
-    {
-        /// <summary>
-        /// Get current assembly location as per current platform
-        /// </summary>
-        /// <param name="assembly">Assembly</param>
-        /// <returns>Returns Assembly location as per platform</returns>
-        public static string GetAssemblyLocation(this Assembly assembly)
-        {
-            // In UWP all assemblies are packages inside Appx folder, so we return location of current directory
-            return Directory.GetCurrentDirectory();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyLoadContext.cs
deleted file mode 100644
index e7858222f6..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyLoadContext.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System.IO;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyLoadContext : IAssemblyLoadContext
-    {
-        /// <inheritdoc/>
-        public AssemblyName GetAssemblyNameFromPath(string assemblyPath)
-        {
-            string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(assemblyPath);
-            return new AssemblyName(fileNameWithoutExtension);
-        }
-
-        /// <inheritdoc/>
-        public Assembly LoadAssemblyFromPath(string assemblyPath)
-        {
-            return Assembly.Load(this.GetAssemblyNameFromPath(assemblyPath));
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyResolver.cs
deleted file mode 100644
index dfcf702806..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Runtime/PlatformAssemblyResolver.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc/>
-    public class PlatformAssemblyResolver : IAssemblyResolver
-    {
-        public PlatformAssemblyResolver()
-        {
-        }
-
-        /// <inheritdoc/>
-        public event AssemblyResolveEventHandler AssemblyResolve;
-
-        public void Dispose()
-        {
-        }
-
-        private void DummyEventThrower()
-        {
-            // need to raise this event, else compiler throws error
-            this.AssemblyResolve(this, null);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformEnvironment.cs
deleted file mode 100644
index 3952010753..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformEnvironment.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <inheritdoc />
-    public class PlatformEnvironment : IEnvironment
-    {
-        /// <inheritdoc />
-        public PlatformArchitecture Architecture
-        {
-            get
-            {
-                switch (RuntimeInformation.OSArchitecture)
-                {
-                    case System.Runtime.InteropServices.Architecture.X86:
-                        return PlatformArchitecture.X86;
-                    case System.Runtime.InteropServices.Architecture.X64:
-                        return PlatformArchitecture.X64;
-                    case System.Runtime.InteropServices.Architecture.Arm:
-                        return PlatformArchitecture.ARM;
-                    case System.Runtime.InteropServices.Architecture.Arm64:
-                        return PlatformArchitecture.ARM64;
-                    default:
-                        throw new NotSupportedException();
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public PlatformOperatingSystem OperatingSystem
-        {
-            get
-            {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    return PlatformOperatingSystem.Windows;
-                }
-
-                return PlatformOperatingSystem.Unix;
-            }
-        }
-
-        /// <inheritdoc />
-        public string OperatingSystemVersion
-        {
-            get
-            {
-                return RuntimeInformation.OSDescription;
-            }
-        }
-
-        /// <inheritdoc />
-        public void Exit(int exitcode)
-        {
-            Environment.FailFast("Process terminating with exit code: " + exitcode);
-        }
-
-        /// <inheritdoc />
-        public int GetCurrentManagedThreadId()
-        {
-            return Environment.CurrentManagedThreadId;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformThread.cs
deleted file mode 100644
index 5ceba42402..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/PlatformThread.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    public class PlatformThread : IThread
-    {
-        /// <inheritdoc/>
-        public void Run(Action action, PlatformApartmentState apartmentState, bool waitForCompletion)
-        {
-            if (apartmentState == PlatformApartmentState.STA)
-            {
-                throw new ThreadApartmentStateNotSupportedException();
-            }
-
-            if (action == null)
-            {
-                return;
-            }
-
-            Task task = Task.Run(action);
-            if (waitForCompletion)
-            {
-                task.Wait();
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/ProcessHelper.cs
deleted file mode 100644
index d3fb928707..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/ProcessHelper.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-
-    /// <summary>
-    /// Helper class to deal with process related functionality.
-    /// </summary>
-    public partial class ProcessHelper : IProcessHelper
-    {
-        /// <inheritdoc/>
-        public object LaunchProcess(
-            string processPath,
-            string arguments,
-            string workingDirectory,
-            IDictionary<string, string> environmentVariables,
-            Action<object, string> errorCallback,
-            Action<object> exitCallBack,
-            Action<object, string> outputCallback)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetCurrentProcessFileName()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public string GetCurrentProcessLocation()
-        {
-            return Directory.GetCurrentDirectory();
-        }
-
-        /// <inheritdoc/>
-        public string GetTestEngineDirectory()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public int GetCurrentProcessId()
-        {
-            return -1;
-        }
-
-        /// <inheritdoc/>
-        public string GetProcessName(int processId)
-        {
-            return string.Empty;
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetExitCode(object process, out int exitCode)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public void SetExitCallback(int parentProcessId, Action<object> callbackAction)
-        {
-        }
-
-        /// <inheritdoc/>
-        public void TerminateProcess(object process)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public int GetProcessId(object process)
-        {
-            return -1;
-        }
-
-        /// <inheritdoc/>
-        public PlatformArchitecture GetCurrentProcessArchitecture()
-        {
-            if (IntPtr.Size == 8)
-            {
-                return PlatformArchitecture.X64;
-            }
-
-            return PlatformArchitecture.X86;
-        }
-
-        /// <inheritdoc/>
-        public string GetNativeDllDirectory()
-        {
-            // For UWP the native dll's are to be kept in same directory
-            return this.GetCurrentProcessLocation();
-        }
-
-        /// <inheritdoc/>
-        public void WaitForProcessExit(object process)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IntPtr GetProcessHandle(int processId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public object GetProcessById(int processId)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/FileEventListener.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/FileEventListener.cs
deleted file mode 100644
index 206a43dd05..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/FileEventListener.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.Tracing;
-    using System.IO;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    internal sealed class FileEventListener : EventListener
-    {
-        /// <summary>
-        /// Storage file to be used to write logs
-        /// </summary>
-        private FileStream fileStream = null;
-
-        /// <summary>
-        /// StreamWriter to write logs to file
-        /// </summary>
-        private StreamWriter streamWriter = null;
-
-        /// <summary>
-        /// Name of the current log file
-        /// </summary>
-        private string fileName;
-
-        /// <summary>
-        /// The format to be used by logging.
-        /// </summary>
-        private string format = "{0:yyyy-MM-dd HH\\:mm\\:ss\\:ffff}\tType: {1}\tId: {2}\tMessage: '{3}'";
-
-        private SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1);
-
-        public FileEventListener(string name)
-        {
-            this.fileName = name;
-
-            this.AssignLocalFile();
-        }
-
-        protected override void OnEventWritten(EventWrittenEventArgs eventData)
-        {
-            if (this.streamWriter == null)
-            {
-                return;
-            }
-
-            var lines = new List<string>();
-
-            var newFormatedLine = string.Format(this.format, DateTime.Now, eventData.Level, eventData.EventId, eventData.Payload[0]);
-
-            Debug.WriteLine(newFormatedLine);
-
-            lines.Add(newFormatedLine);
-
-            this.WriteToFile(lines);
-        }
-
-        private void AssignLocalFile()
-        {
-            this.fileStream = new FileStream(this.fileName, FileMode.Append | FileMode.OpenOrCreate);
-            this.streamWriter = new StreamWriter(this.fileStream)
-            {
-                AutoFlush = true
-            };
-        }
-
-        private async void WriteToFile(IEnumerable<string> lines)
-        {
-            await this.semaphoreSlim.WaitAsync();
-
-            await Task.Run(async () =>
-            {
-                try
-                {
-                    foreach (var line in lines)
-                    {
-                        await this.streamWriter.WriteLineAsync(line);
-                    }
-                }
-                catch (Exception)
-                {
-                    // Ignore
-                }
-                finally
-                {
-                    this.semaphoreSlim.Release();
-                }
-            });
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs
deleted file mode 100644
index 15cd7306ce..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System;
-    using System.Diagnostics.Tracing;
-    using System.IO;
-
-    /// <summary>
-    /// Wrapper class for tracing.
-    ///     - Shortcut-methods for Error, Warning, Info, Verbose.
-    ///     - Adds additional information to the trace: calling process name, PID, ThreadID, Time.
-    ///     - Uses custom switch <c>EqtTraceLevel</c> from .config file.
-    ///     - By default tracing if OFF.
-    ///     - Our build environment always sets the /d:TRACE so this class is always enabled,
-    ///       the Debug class is enabled only in debug builds (/d:DEBUG).
-    ///     - We ignore exceptions thrown by underlying TraceSwitch (e.g. due to config file error).
-    ///       We log ignored exceptions to system Application log.
-    ///       We pass through exceptions thrown due to incorrect arguments to <c>EqtTrace</c> methods.
-    /// Usage: <c>EqtTrace.Info("Here's how to trace info");</c>
-    /// </summary>
-    public class PlatformEqtTrace : IPlatformEqtTrace
-    {
-        private static object initLock = new object();
-
-        private static bool isInitialized = false;
-
-        public static string ErrorOnInitialization { get; set; }
-
-        public static string LogFile { get; set; }
-
-        public bool DoNotInitialize
-        {
-            get;
-            set;
-        }
-
-        private static PlatformTraceLevel TraceLevel { get; set; }
-
-        /// <inheritdoc/>
-        public void WriteLine(PlatformTraceLevel level, string message)
-        {
-            if (this.TraceInitialized() && TraceLevel > PlatformTraceLevel.Off)
-            {
-                switch (level)
-                {
-                    case PlatformTraceLevel.Off:
-                        break;
-
-                    case PlatformTraceLevel.Error:
-                        UnitTestEventSource.Log.Error(message);
-                        break;
-
-                    case PlatformTraceLevel.Warning:
-                        UnitTestEventSource.Log.Warn(message);
-                        break;
-
-                    case PlatformTraceLevel.Info:
-                        UnitTestEventSource.Log.Info(message);
-                        break;
-
-                    case PlatformTraceLevel.Verbose:
-                        UnitTestEventSource.Log.Verbose(message);
-                        break;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool InitializeVerboseTrace(string customLogFile)
-        {
-            return this.InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
-        }
-
-        /// <inheritdoc/>
-        public bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
-        {
-            string logFileName = string.Empty;
-            try
-            {
-                logFileName = Path.GetFileNameWithoutExtension(customLogFile.TrimStart('"').TrimEnd('"')).Replace(" ", "_");
-            }
-            catch
-            {
-                logFileName = Guid.NewGuid().ToString();
-            }
-
-            LogFile = Path.Combine(Path.GetTempPath(), logFileName + ".TpTrace.log");
-            TraceLevel = traceLevel;
-
-            return this.TraceInitialized();
-        }
-
-        /// <inheritdoc/>
-        public bool ShouldTrace(PlatformTraceLevel traceLevel)
-        {
-            return isInitialized;
-        }
-
-        /// <inheritdoc/>
-        public string GetLogFile()
-        {
-            return LogFile;
-        }
-
-        /// <inheritdoc/>
-        public void SetTraceLevel(PlatformTraceLevel value)
-        {
-            TraceLevel = value;
-        }
-
-        /// <inheritdoc/>
-        public PlatformTraceLevel GetTraceLevel()
-        {
-            return TraceLevel;
-        }
-
-        /// <summary>
-        /// Initializes Tracing based on Trace Level
-        /// </summary>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private bool TraceInitialized()
-        {
-            lock (initLock)
-            {
-                if (isInitialized)
-                {
-                    return isInitialized;
-                }
-
-                try
-                {
-                    var eventListener = new FileEventListener(string.IsNullOrEmpty(LogFile) ? "UnitTestLog" : LogFile);
-
-                    PlatformTraceLevel traceLevel = this.GetTraceLevel();
-                    if (traceLevel > PlatformTraceLevel.Off)
-                    {
-                        eventListener.EnableEvents(UnitTestEventSource.Log, EventLevel.Error);
-                    }
-
-                    if (traceLevel > PlatformTraceLevel.Error)
-                    {
-                        eventListener.EnableEvents(UnitTestEventSource.Log, EventLevel.Warning);
-                    }
-
-                    if (traceLevel > PlatformTraceLevel.Warning)
-                    {
-                        eventListener.EnableEvents(UnitTestEventSource.Log, EventLevel.Informational);
-                    }
-
-                    if (traceLevel > PlatformTraceLevel.Info)
-                    {
-                        eventListener.EnableEvents(UnitTestEventSource.Log, EventLevel.Verbose);
-                    }
-
-                    isInitialized = true;
-                }
-                catch (Exception ex)
-                {
-                    this.UnInitializeTrace();
-                    ErrorOnInitialization = ex.Message;
-                    return false;
-                }
-
-                return isInitialized;
-            }
-        }
-
-        private void UnInitializeTrace()
-        {
-            isInitialized = false;
-            LogFile = null;
-            TraceLevel = PlatformTraceLevel.Off;
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/UnitTestEventSource.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/UnitTestEventSource.cs
deleted file mode 100644
index 7bf7fb4fb8..0000000000
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/UnitTestEventSource.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if WINDOWS_UWP
-
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
-{
-    using System.Diagnostics.Tracing;
-
-    internal sealed class UnitTestEventSource : EventSource
-    {
-        private static UnitTestEventSource log = new UnitTestEventSource();
-
-        public static UnitTestEventSource Log
-        {
-            get
-            {
-                return log;
-            }
-        }
-
-        [Event(1, Level = EventLevel.Verbose)]
-        public void Verbose(string message)
-        {
-            this.WriteEvent(1, message);
-        }
-
-        [Event(2, Level = EventLevel.Informational)]
-        public void Info(string message)
-        {
-            this.WriteEvent(2, message);
-        }
-
-        [Event(3, Level = EventLevel.Warning)]
-        public void Warn(string message)
-        {
-            this.WriteEvent(3, message);
-        }
-
-        [Event(4, Level = EventLevel.Error)]
-        public void Error(string message)
-        {
-            this.WriteEvent(4, message);
-        }
-
-        [Event(5, Level = EventLevel.Critical)]
-        public void Critical(string message)
-        {
-            this.WriteEvent(5, message);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/BannedSymbols.txt b/src/Microsoft.TestPlatform.TestHostProvider/BannedSymbols.txt
new file mode 100644
index 0000000000..209d2ca894
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/BannedSymbols.txt
@@ -0,0 +1,4 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Friends.cs b/src/Microsoft.TestPlatform.TestHostProvider/Friends.cs
index a52ba53674..958577ec88 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Friends.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Friends.cs
@@ -7,5 +7,6 @@
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("datacollector.arm64, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestHostProvider.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestHostProvider.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/AppxManifestFile.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/AppxManifestFile.cs
index 8e68f0c076..3051c2b54c 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/AppxManifestFile.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/AppxManifestFile.cs
@@ -1,33 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider
-{
-    using System.IO;
-    using System.Xml.Linq;
+using System.IO;
+using System.Xml.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider;
 
-    /// <summary> Wrapper for an appx manifest file. </summary>
-    internal static class AppxManifestFile
+/// <summary> Wrapper for an appx manifest file. </summary>
+internal static class AppxManifestFile
+{
+    /// <summary> Gets the app's exe name. </summary>
+    /// <param name="filePath">
+    /// AppxManifest filePath
+    /// </param>
+    /// <returns>ExecutableName</returns>
+    public static string? GetApplicationExecutableName(string filePath)
     {
-        /// <summary> Gets the app's exe name. </summary>
-        /// <param name="filePath">
-        /// AppxManifest filePath
-        /// </param>
-        /// <returns>ExecutableName</returns>
-        public static string GetApplicationExecutableName(string filePath)
+        if (File.Exists(filePath))
         {
-            if (File.Exists(filePath))
-            {
-                var doc = XDocument.Load(filePath);
-                var ns = doc.Root.Name.Namespace;
+            var doc = XDocument.Load(filePath);
+            var ns = doc.Root!.Name.Namespace;
 
-                return doc.Element(ns + "Package").
-                    Element(ns + "Applications").
-                    Element(ns + "Application").
-                    Attribute("Executable").Value;
-            }
-
-            return null;
+            return doc.Element(ns + "Package")!.
+                Element(ns + "Applications")!.
+                Element(ns + "Application")!.
+                Attribute("Executable")!.Value;
         }
+
+        return null;
     }
 }
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
index a35763c775..ffddd06178 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
@@ -1,445 +1,606 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.TestHostProvider;
+using Microsoft.TestPlatform.TestHostProvider.Hosting;
+using Microsoft.TestPlatform.TestHostProvider.Resources;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
+
+/// <summary>
+/// The default test host launcher for the engine.
+/// This works for Desktop local scenarios
+/// </summary>
+[ExtensionUri(DefaultTestHostUri)]
+[FriendlyName(DefaultTestHostFriendlyName)]
+public class DefaultTestHostManager : ITestRuntimeProvider2
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using System.Xml.Linq;
-    using Microsoft.TestPlatform.TestHostProvider.Hosting;
-    using Microsoft.TestPlatform.TestHostProvider.Resources;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    private const string DefaultTestHostUri = "HostProvider://DefaultTestHost";
+    // Should the friendly name ever change, please make sure to change the corresponding constant
+    // inside ProxyOperationManager::IsTesthostCompatibleWithTestSessions().
+    private const string DefaultTestHostFriendlyName = "DefaultTestHost";
+    private const string TestAdapterEndsWithPattern = @"TestAdapter.dll";
+
+    // Any version (older or newer) that is not in this list will use the default testhost.exe that is built using net462.
+    // TODO: Add net481 when it is published, if it uses a new moniker.
+    private static readonly ImmutableArray<string> SupportedTargetFrameworks = ImmutableArray.Create("net47", "net471", "net472", "net48");
+
+    private readonly IProcessHelper _processHelper;
+    private readonly IFileHelper _fileHelper;
+    private readonly IEnvironment _environment;
+    private readonly IDotnetHostHelper _dotnetHostHelper;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+    private bool _disableAppDomain;
+    private Architecture _architecture;
+    private Framework? _targetFramework;
+    private ITestHostLauncher? _customTestHostLauncher;
+    private Process? _testHostProcess;
+    private StringBuilder? _testHostProcessStdError;
+    private StringBuilder? _testHostProcessStdOut;
+    private IMessageLogger? _messageLogger;
+    private bool _captureOutput;
+    private bool _hostExitedEventRaised;
+    private TestHostManagerCallbacks? _testHostManagerCallbacks;
 
     /// <summary>
-    /// The default test host launcher for the engine.
-    /// This works for Desktop local scenarios
+    /// Initializes a new instance of the <see cref="DefaultTestHostManager"/> class.
     /// </summary>
-    [ExtensionUri(DefaultTestHostUri)]
-    [FriendlyName(DefaultTestHostFriendlyName)]
-    public class DefaultTestHostManager : ITestRuntimeProvider2
+    public DefaultTestHostManager()
+        : this(
+            new ProcessHelper(),
+            new FileHelper(),
+            new DotnetHostHelper(),
+            new PlatformEnvironment(),
+            new EnvironmentVariableHelper())
     {
-        private const string X64TestHostProcessName = "testhost{0}.exe";
-        private const string X86TestHostProcessName = "testhost{0}.x86.exe";
-
-        private const string DefaultTestHostUri = "HostProvider://DefaultTestHost";
-        private const string DefaultTestHostFriendlyName = "DefaultTestHost";
-        private const string TestAdapterEndsWithPattern = @"TestAdapter.dll";
-
-        private Architecture architecture;
-        private Framework targetFramework;
-        private IProcessHelper processHelper;
-        private IFileHelper fileHelper;
-        private IEnvironment environment;
-        private IDotnetHostHelper dotnetHostHelper;
-
-        private ITestHostLauncher customTestHostLauncher;
-        private Process testHostProcess;
-        private StringBuilder testHostProcessStdError;
-        private IMessageLogger messageLogger;
-        private bool hostExitedEventRaised;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultTestHostManager"/> class.
-        /// </summary>
-        public DefaultTestHostManager()
-            : this(new ProcessHelper(), new FileHelper(), new PlatformEnvironment(), new DotnetHostHelper())
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultTestHostManager"/> class.
-        /// </summary>
-        /// <param name="processHelper">Process helper instance.</param>
-        /// <param name="fileHelper">File helper instance.</param>
-        /// <param name="environment">Instance of platform environment.</param>
-        /// <param name="dotnetHostHelper">Instance of dotnet host helper.</param>
-        internal DefaultTestHostManager(IProcessHelper processHelper, IFileHelper fileHelper, IEnvironment environment, IDotnetHostHelper dotnetHostHelper)
-        {
-            this.processHelper = processHelper;
-            this.fileHelper = fileHelper;
-            this.environment = environment;
-            this.dotnetHostHelper = dotnetHostHelper;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DefaultTestHostManager"/> class.
+    /// </summary>
+    /// <param name="processHelper">Process helper instance.</param>
+    /// <param name="fileHelper">File helper instance.</param>
+    /// <param name="environment">Instance of platform environment.</param>
+    /// <param name="environmentVariableHelper">The environment helper.</param>
+    /// <param name="dotnetHostHelper">Instance of dotnet host helper.</param>
+    internal DefaultTestHostManager(
+        IProcessHelper processHelper,
+        IFileHelper fileHelper,
+        IDotnetHostHelper dotnetHostHelper,
+        IEnvironment environment,
+        IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _dotnetHostHelper = dotnetHostHelper;
+        _environment = environment;
+        _environmentVariableHelper = environmentVariableHelper;
+    }
 
-        /// <inheritdoc/>
-        public event EventHandler<HostProviderEventArgs> HostLaunched;
+    /// <inheritdoc/>
+    public event EventHandler<HostProviderEventArgs>? HostLaunched;
 
-        /// <inheritdoc/>
-        public event EventHandler<HostProviderEventArgs> HostExited;
+    /// <inheritdoc/>
+    public event EventHandler<HostProviderEventArgs>? HostExited;
 
-        /// <inheritdoc/>
-        public bool Shared { get; private set; }
+    /// <inheritdoc/>
+    public bool Shared { get; private set; }
 
-        /// <summary>
-        /// Gets the properties of the test executor launcher. These could be the targetID for emulator/phone specific scenarios.
-        /// </summary>
-        public IDictionary<string, string> Properties => new Dictionary<string, string>();
+    /// <summary>
+    /// Gets the properties of the test executor launcher. These could be the targetID for emulator/phone specific scenarios.
+    /// </summary>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public IDictionary<string, string> Properties => new Dictionary<string, string>();
 
-        /// <summary>
-        /// Gets callback on process exit
-        /// </summary>
-        private Action<object> ExitCallBack => (process) =>
-        {
-            TestHostManagerCallbacks.ExitCallBack(this.processHelper, process, this.testHostProcessStdError, this.OnHostExited);
-        };
+    /// <summary>
+    /// Gets callback on process exit
+    /// </summary>
+    private Action<object?> ExitCallBack => process =>
+    {
+        TPDebug.Assert(_testHostProcessStdError is not null, "LaunchTestHostAsync must have been called before ExitCallBack");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ExitCallBack");
+        TestHostManagerCallbacks.ExitCallBack(_processHelper, process, _testHostProcessStdError, OnHostExited);
+    };
 
-        /// <summary>
-        /// Gets callback to read from process error stream
-        /// </summary>
-        private Action<object, string> ErrorReceivedCallback => (process, data) =>
-        {
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, data);
-        };
+    /// <summary>
+    /// Gets callback to read from process error stream
+    /// </summary>
+    private Action<object?, string?> ErrorReceivedCallback => (process, data) =>
+    {
+        TPDebug.Assert(_testHostProcessStdError is not null, "LaunchTestHostAsync must have been called before ErrorReceivedCallback");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ErrorReceivedCallback");
+        _testHostManagerCallbacks.ErrorReceivedCallback(_testHostProcessStdError, data);
+    };
 
-        /// <inheritdoc/>
-        public void SetCustomLauncher(ITestHostLauncher customLauncher)
-        {
-            this.customTestHostLauncher = customLauncher;
-        }
+    /// <summary>
+    /// Gets callback to read from process standard stream
+    /// </summary>
+    private Action<object?, string?> OutputReceivedCallback => (process, data) =>
+    {
+        TPDebug.Assert(_testHostProcessStdOut is not null, "LaunchTestHostAsync must have been called before OutputReceivedCallback");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before OutputReceivedCallback");
+        _testHostManagerCallbacks.StandardOutputReceivedCallback(_testHostProcessStdOut, data);
+    };
+
+    /// <inheritdoc/>
+    public void SetCustomLauncher(ITestHostLauncher customLauncher)
+    {
+        _customTestHostLauncher = customLauncher;
+    }
+
+    /// <inheritdoc/>
+    public TestHostConnectionInfo GetTestHostConnectionInfo()
+    {
+        return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+    }
+
+    /// <inheritdoc/>
+    public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        // Do NOT offload this to thread pool using Task.Run, we already are on thread pool
+        // and this would go into a queue after all the other startup tasks. Meaning we will start
+        // testhost much later, and not immediately.
+        return Task.FromResult(LaunchHost(testHostStartInfo, cancellationToken));
+    }
+
+    /// <inheritdoc/>
+    public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
+        IEnumerable<string> sources,
+        IDictionary<string, string?>? environmentVariables,
+        TestRunnerConnectionInfo connectionInfo)
+    {
+        TPDebug.Assert(IsInitialized, "Initialize must have been called before GetTestHostProcessStartInfo");
+
+        string testHostProcessName = GetTestHostName(_architecture, _targetFramework, _processHelper.GetCurrentProcessArchitecture());
+
+        var currentWorkingDirectory = Path.GetDirectoryName(typeof(DefaultTestHostManager).Assembly.Location);
+        var argumentsString = " " + connectionInfo.ToCommandLineOptions();
+
+        TPDebug.Assert(currentWorkingDirectory is not null, "Current working directory must not be null.");
+
+        // check in current location for testhost exe
+        var testhostProcessPath = Path.Combine(currentWorkingDirectory, testHostProcessName);
+
+        var originalTestHostProcessName = testHostProcessName;
 
-        /// <inheritdoc/>
-        public TestHostConnectionInfo GetTestHostConnectionInfo()
+        if (!_fileHelper.Exists(testhostProcessPath))
         {
-            return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+            // We assume that we could not find testhost.exe in the root folder so we are going to lookup in the
+            // TestHostNetFramework folder (assuming we are currently running under .NET) or in dotnet SDK
+            // context.
+            testHostProcessName = Path.Combine("TestHostNetFramework", originalTestHostProcessName);
+            testhostProcessPath = Path.Combine(currentWorkingDirectory, "..", testHostProcessName);
         }
 
-        /// <inheritdoc/>
-        public async Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+        if (_disableAppDomain)
         {
-            return await Task.Run(() => this.LaunchHost(testHostStartInfo, cancellationToken), cancellationToken);
+            // When host appdomains are disabled (in that case host is not shared) we need to pass the test assembly path as argument
+            // so that the test host can create one appdomain on startup (Main method) and set appbase.
+            argumentsString += " --testsourcepath " + sources.FirstOrDefault()?.AddDoubleQuote();
         }
 
-        /// <inheritdoc/>
-        public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
-            IEnumerable<string> sources,
-            IDictionary<string, string> environmentVariables,
-            TestRunnerConnectionInfo connectionInfo)
+        EqtTrace.Verbose("DefaultTestHostmanager.GetTestHostProcessStartInfo: Trying to use {0} from {1}", originalTestHostProcessName, testhostProcessPath);
+
+        var launcherPath = testhostProcessPath;
+        var processName = _processHelper.GetCurrentProcessFileName();
+        if (processName is not null)
         {
-            string testHostProcessName;
-            if (this.targetFramework.Name.StartsWith(".NETFramework,Version=v"))
+            if (!_environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)
+                && !processName.EndsWith(DotnetHostHelper.MONOEXENAME, StringComparison.OrdinalIgnoreCase))
             {
-                var targetFrameworkMoniker = "net" + this.targetFramework.Name.Replace(".NETFramework,Version=v", string.Empty).Replace(".", string.Empty);
-
-                // Net451 or older will use the default testhost.exe that is compiled against net451.
-                var isSupportedNetTarget = new[] { "net452", "net46", "net461", "net462", "net47", "net471", "net472", "net48" }.Contains(targetFrameworkMoniker);
-                var targetFrameworkSuffix = isSupportedNetTarget ? $".{targetFrameworkMoniker}" : string.Empty;
-
-                // Default test host manager supports shared test sources
-                testHostProcessName = string.Format(this.architecture == Architecture.X86 ? X86TestHostProcessName : X64TestHostProcessName, targetFrameworkSuffix);
+                launcherPath = _dotnetHostHelper.GetMonoPath();
+                argumentsString = testhostProcessPath.AddDoubleQuote() + " " + argumentsString;
             }
             else
             {
-                // This path is probably happening only in our tests, because otherwise we are first running CanExecuteCurrentRunConfiguration
-                // which would disqualify anything that is not netframework.
-                testHostProcessName = string.Format(this.architecture == Architecture.X86 ? X86TestHostProcessName : X64TestHostProcessName, string.Empty);
+                // Patching the relative path for IDE scenarios.
+                if (_environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)
+                    && !(processName.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase)
+                        || processName.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase))
+                    && !File.Exists(testhostProcessPath))
+                {
+                    testhostProcessPath = Path.Combine(currentWorkingDirectory, "..", originalTestHostProcessName);
+                    EqtTrace.Verbose("DefaultTestHostmanager.GetTestHostProcessStartInfo: Could not find {0} in previous location, now using {1}", originalTestHostProcessName, testhostProcessPath);
+                    launcherPath = testhostProcessPath;
+                }
             }
+        }
 
-            var currentWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(DefaultTestHostManager).GetTypeInfo().Assembly.Location), "..//");
-            var argumentsString = " " + connectionInfo.ToCommandLineOptions();
+        // For IDEs and other scenario, current directory should be the
+        // working directory (not the vstest.console.exe location).
+        // For VS - this becomes the solution directory for example
+        // "TestResults" directory will be created at "current directory" of test host
+        var processWorkingDirectory = Directory.GetCurrentDirectory();
 
-            // check in current location for testhost exe
-            var testhostProcessPath = Path.Combine(currentWorkingDirectory, testHostProcessName);
+        return new TestProcessStartInfo
+        {
+            FileName = launcherPath,
+            Arguments = argumentsString,
+            EnvironmentVariables = environmentVariables ?? new Dictionary<string, string?>(),
+            WorkingDirectory = processWorkingDirectory
+        };
+    }
 
-            if (!File.Exists(testhostProcessPath))
-            {
-                // "TestHost" is the name of the folder which contain Full CLR built testhost package assemblies.
-                testHostProcessName = Path.Combine("TestHost", testHostProcessName);
-                testhostProcessPath = Path.Combine(currentWorkingDirectory, testHostProcessName);
-            }
+    private static string GetTestHostName(Architecture architecture, Framework targetFramework, PlatformArchitecture processArchitecture)
+    {
+        // We ship multiple executables for testhost that follow this naming schema:
+        // testhost<.tfm><.architecture>.exe
+        // e.g.: testhost.net472.x86.exe -> 32-bit testhost for .NET Framework 4.7.2
+        //
+        // The tfm is omitted for .NET Framework 4.5.1 testhost.
+        // testhost.x86.exe -> 32-bit testhost for .NET Framework 4.5.1
+        //
+        // The architecture is omitted for 64-bit (x64) testhost.
+        // testhost.net472.exe -> 64-bit testhost for .NET Framework 4.7.2
+        // testhost.exe -> 64-bit testhost for .NET Framework 4.5.1
+        //
+        // These omissions are done for backwards compatibility because originally there were
+        // only testhost.exe and testhost.x86.exe, both built against .NET Framework 4.5.1.
+
+        StringBuilder testHostProcessName = new("testhost");
+
+        if (targetFramework.Name.StartsWith(".NETFramework,Version=v"))
+        {
+            // Transform target framework name into moniker.
+            // e.g. ".NETFramework,Version=v4.7.2" -> "net472".
+            var targetFrameworkMoniker = "net" + targetFramework.Name.Replace(".NETFramework,Version=v", string.Empty).Replace(".", string.Empty);
 
-            if (!this.Shared)
+            var isSupportedTargetFramework = SupportedTargetFrameworks.Contains(targetFrameworkMoniker);
+            if (isSupportedTargetFramework)
             {
-                // Not sharing the host which means we need to pass the test assembly path as argument
-                // so that the test host can create an appdomain on startup (Main method) and set appbase
-                argumentsString += " --testsourcepath " + sources.FirstOrDefault().AddDoubleQuote();
+                testHostProcessName.Append('.').Append(targetFrameworkMoniker);
             }
-
-            EqtTrace.Verbose("DefaultTestHostmanager: Full path of {0} is {1}", testHostProcessName, testhostProcessPath);
-
-            var launcherPath = testhostProcessPath;
-            if (!this.environment.OperatingSystem.Equals(PlatformOperatingSystem.Windows) &&
-                !this.processHelper.GetCurrentProcessFileName().EndsWith(DotnetHostHelper.MONOEXENAME, StringComparison.OrdinalIgnoreCase))
+            else
             {
-                launcherPath = this.dotnetHostHelper.GetMonoPath();
-                argumentsString = testhostProcessPath.AddDoubleQuote() + " " + argumentsString;
+                // The .NET Framework 4.5.1 testhost that does not have moniker in the name is used as fallback.
             }
-
-            // For IDEs and other scenario, current directory should be the
-            // working directory (not the vstest.console.exe location).
-            // For VS - this becomes the solution directory for example
-            // "TestResults" directory will be created at "current directory" of test host
-            var processWorkingDirectory = Directory.GetCurrentDirectory();
-
-            return new TestProcessStartInfo
-            {
-                FileName = launcherPath,
-                Arguments = argumentsString,
-                EnvironmentVariables = environmentVariables ?? new Dictionary<string, string>(),
-                WorkingDirectory = processWorkingDirectory
-            };
         }
 
-        /// <inheritdoc/>
-        public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+        var processArchitectureAsArchitecture = processArchitecture switch
         {
-            if (sources != null && sources.Any())
-            {
-                extensions = extensions.Concat(sources.SelectMany(s => this.fileHelper.EnumerateFiles(Path.GetDirectoryName(s), SearchOption.TopDirectoryOnly, TestAdapterEndsWithPattern)));
-            }
+            PlatformArchitecture.X86 => Architecture.X86,
+            PlatformArchitecture.X64 => Architecture.X64,
+            PlatformArchitecture.ARM => Architecture.ARM,
+            PlatformArchitecture.ARM64 => Architecture.ARM64,
+            PlatformArchitecture.S390x => Architecture.S390x,
+            PlatformArchitecture.Ppc64le => Architecture.Ppc64le,
+            PlatformArchitecture.RiscV64 => Architecture.RiscV64,
+            _ => throw new NotSupportedException(),
+        };
 
-            extensions = this.FilterExtensionsBasedOnVersion(extensions);
+        // Default architecture, or AnyCPU architecture will use the architecture of the current process,
+        // so when you run from 32-bit vstest.console, or from 32-bit dotnet test, you will get 32-bit testhost
+        // as the preferred testhost.
+        var actualArchitecture = architecture is Architecture.Default or Architecture.AnyCPU
+            ? processArchitectureAsArchitecture
+            : architecture;
 
-            return extensions;
+        if (actualArchitecture != Architecture.X64)
+        {
+            // Append .<architecture> to the name, such as .x86. It is possible that we are not shipping the
+            // executable for the architecture with VS, and that will fail later with file not found exception,
+            // which is okay.
+            testHostProcessName.Append('.').Append(architecture.ToString().ToLowerInvariant());
+        }
+        else
+        {
+            // 64-bit (x64) executable, uses no architecture suffix in the name.
+            // E.g.: testhost.exe or testhost.net472.exe
         }
 
-        /// <inheritdoc/>
-        public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+        testHostProcessName.Append(".exe");
+        return testHostProcessName.ToString();
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string>? sources, IEnumerable<string> extensions)
+    {
+        if (sources != null && sources.Any())
         {
-            // We are doing this specifically for UWP, should we extract it out to some other utility?
-            // Why? Lets say if we have to do same for some other source extension, would we just add another if check?
-            var uwpSources = sources.Where(source => source.EndsWith(".appxrecipe", StringComparison.OrdinalIgnoreCase));
+            extensions = extensions.Concat(sources.SelectMany(s => _fileHelper.EnumerateFiles(Path.GetDirectoryName(s)!, SearchOption.TopDirectoryOnly, TestAdapterEndsWithPattern)));
+        }
 
-            if (uwpSources.Any())
-            {
-                List<string> actualSources = new List<string>();
-                foreach (var uwpSource in uwpSources)
-                {
-                    actualSources.Add(Path.Combine(Path.GetDirectoryName(uwpSource), this.GetUwpSources(uwpSource)));
-                }
+        extensions = FilterExtensionsBasedOnVersion(extensions);
 
-                return actualSources;
-            }
+        return extensions;
+    }
 
-            return sources;
-        }
+    /// <inheritdoc/>
+    public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+    {
+        // We are doing this specifically for UWP, should we extract it out to some other utility?
+        // Why? Lets say if we have to do same for some other source extension, would we just add another if check?
+        var uwpSources = sources.Where(source => source.EndsWith(".appxrecipe", StringComparison.OrdinalIgnoreCase));
 
-        /// <inheritdoc/>
-        public bool CanExecuteCurrentRunConfiguration(string runsettingsXml)
+        if (uwpSources.Any())
         {
-            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-            var framework = config.TargetFramework;
-
-            // This is expected to be called once every run so returning a new instance every time.
-            if (framework.Name.IndexOf("NETFramework", StringComparison.OrdinalIgnoreCase) >= 0)
+            List<string> actualSources = new();
+            foreach (var uwpSource in uwpSources)
             {
-                return true;
+                actualSources.Add(Path.Combine(Path.GetDirectoryName(uwpSource)!, GetUwpSources(uwpSource)!));
             }
 
-            return false;
+            return actualSources;
         }
 
-        /// <inheritdoc/>
-        public void Initialize(IMessageLogger logger, string runsettingsXml)
-        {
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+        return sources;
+    }
 
-            this.messageLogger = logger;
-            this.architecture = runConfiguration.TargetPlatform;
-            this.targetFramework = runConfiguration.TargetFramework;
-            this.testHostProcess = null;
+    /// <inheritdoc/>
+    public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+    {
+        var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+        var framework = config.TargetFramework;
 
-            this.Shared = !runConfiguration.DisableAppDomain;
-            this.hostExitedEventRaised = false;
-        }
+        // This is expected to be called once every run so returning a new instance every time.
+        return framework!.Name.IndexOf("NETFramework", StringComparison.OrdinalIgnoreCase) >= 0;
+    }
 
-        /// <inheritdoc/>
-        public Task CleanTestHostAsync(CancellationToken cancellationToken)
-        {
-            try
-            {
-                this.processHelper.TerminateProcess(this.testHostProcess);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Warning("DefaultTestHostManager: Unable to terminate test host process: " + ex);
-            }
+    [MemberNotNullWhen(true, nameof(_messageLogger), nameof(_targetFramework))]
+    private bool IsInitialized { get; set; }
 
-            this.testHostProcess?.Dispose();
+    /// <inheritdoc/>
+    public void Initialize(IMessageLogger? logger, string runsettingsXml)
+    {
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+
+        _messageLogger = logger;
+        _captureOutput = runConfiguration.CaptureStandardOutput;
+        var forwardOutput = runConfiguration.ForwardStandardOutput;
+        _testHostManagerCallbacks = new TestHostManagerCallbacks(forwardOutput, logger);
+        _architecture = runConfiguration.TargetPlatform;
+        _targetFramework = runConfiguration.TargetFramework;
+        _testHostProcess = null;
+
+        _disableAppDomain = runConfiguration.DisableAppDomain;
+        // If appdomains are disabled the host cannot be shared, because sharing means loading multiple assemblies
+        // into the same process, and without appdomains we cannot safely do that.
+        //
+        // The OPPOSITE is not true though, disabling testhost sharing does not mean that we should not load the
+        // dll into a separate appdomain in the host. It just means that we wish to run each dll in separate exe.
+        Shared = !_disableAppDomain && !runConfiguration.DisableSharedTestHost;
+        _hostExitedEventRaised = false;
+
+        IsInitialized = true;
+    }
 
-            return Task.FromResult(true);
+    /// <inheritdoc/>
+    public Task CleanTestHostAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            _processHelper.TerminateProcess(_testHostProcess);
         }
-
-        /// <inheritdoc />
-        public bool AttachDebuggerToTestHost()
+        catch (Exception ex)
         {
-            return this.customTestHostLauncher is ITestHostLauncher2 launcher
-                ? launcher.AttachDebuggerToProcess(this.testHostProcess.Id)
-                : false;
+            EqtTrace.Warning("DefaultTestHostManager: Unable to terminate test host process: " + ex);
         }
 
-        /// <summary>
-        /// Filter duplicate extensions, include only the highest versioned extension
-        /// </summary>
-        /// <param name="extensions">Entire list of extensions</param>
-        /// <returns>Filtered list of extensions</returns>
-        private IEnumerable<string> FilterExtensionsBasedOnVersion(IEnumerable<string> extensions)
+        _testHostProcess?.Dispose();
+
+        return Task.FromResult(true);
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToTestHost()
+    {
+        TPDebug.Assert(_targetFramework is not null && _testHostProcess is not null, "Initialize and LaunchTestHostAsync must be called before AttachDebuggerToTestHost");
+
+        return _customTestHostLauncher switch
+        {
+            ITestHostLauncher3 launcher3 => launcher3.AttachDebuggerToProcess(new AttachDebuggerInfo { ProcessId = _testHostProcess.Id, TargetFramework = _targetFramework.ToString() }, CancellationToken.None),
+            ITestHostLauncher2 launcher2 => launcher2.AttachDebuggerToProcess(_testHostProcess.Id),
+            _ => false,
+        };
+    }
+
+    /// <summary>
+    /// Filter duplicate extensions, include only the highest versioned extension
+    /// </summary>
+    /// <param name="extensions">Entire list of extensions</param>
+    /// <returns>Filtered list of extensions</returns>
+    private IEnumerable<string> FilterExtensionsBasedOnVersion(IEnumerable<string> extensions)
+    {
+        TPDebug.Assert(IsInitialized, "Initialize must be called before FilterExtensionsBasedOnVersion");
+
+        Dictionary<string, string> selectedExtensions = new();
+        Dictionary<string, Version?> highestFileVersions = new();
+        Dictionary<string, Version> conflictingExtensions = new();
+
+        foreach (var extensionFullPath in extensions)
         {
-            Dictionary<string, string> selectedExtensions = new Dictionary<string, string>();
-            Dictionary<string, Version> highestFileVersions = new Dictionary<string, Version>();
-            Dictionary<string, Version> conflictingExtensions = new Dictionary<string, Version>();
+            // assemblyName is the key
+            var extensionAssemblyName = Path.GetFileNameWithoutExtension(extensionFullPath);
 
-            foreach (var extensionFullPath in extensions)
+            if (selectedExtensions.TryGetValue(extensionAssemblyName, out var oldExtensionPath))
             {
-                // assemblyName is the key
-                var extensionAssemblyName = Path.GetFileNameWithoutExtension(extensionFullPath);
+                // This extension is duplicate
+                var currentVersion = GetAndLogFileVersion(extensionFullPath);
 
-                if (selectedExtensions.TryGetValue(extensionAssemblyName, out var oldExtensionPath))
+                var oldVersionFound = highestFileVersions.TryGetValue(extensionAssemblyName, out var oldVersion);
+                if (!oldVersionFound)
                 {
-                    // This extension is duplicate
-                    var currentVersion = this.GetAndLogFileVersion(extensionFullPath);
+                    oldVersion = GetAndLogFileVersion(oldExtensionPath);
+                }
 
-                    var oldVersionFound = highestFileVersions.TryGetValue(extensionAssemblyName, out var oldVersion);
-                    if (!oldVersionFound)
+                // If the version of current file is higher than the one in the map
+                // replace the older with the current file
+                if (currentVersion > oldVersion)
+                {
+                    highestFileVersions[extensionAssemblyName] = currentVersion;
+                    conflictingExtensions[extensionAssemblyName] = currentVersion;
+                    selectedExtensions[extensionAssemblyName] = extensionFullPath;
+                }
+                else
+                {
+                    if (currentVersion < oldVersion)
                     {
-                        oldVersion = this.GetAndLogFileVersion(oldExtensionPath);
+                        conflictingExtensions[extensionAssemblyName] = oldVersion;
                     }
 
-                    // If the version of current file is higher than the one in the map
-                    // replace the older with the current file
-                    if (currentVersion > oldVersion)
-                    {
-                        highestFileVersions[extensionAssemblyName] = currentVersion;
-                        conflictingExtensions[extensionAssemblyName] = currentVersion;
-                        selectedExtensions[extensionAssemblyName] = extensionFullPath;
-                    }
-                    else
+                    if (!oldVersionFound)
                     {
-                        if (currentVersion < oldVersion)
-                        {
-                            conflictingExtensions[extensionAssemblyName] = oldVersion;
-                        }
-
-                        if (!oldVersionFound)
-                        {
-                            highestFileVersions.Add(extensionAssemblyName, oldVersion);
-                        }
+                        highestFileVersions.Add(extensionAssemblyName, oldVersion!);
                     }
                 }
-                else
-                {
-                    selectedExtensions.Add(extensionAssemblyName, extensionFullPath);
-                }
             }
-
-            // Log warning if conflicting version extensions are found
-            if (conflictingExtensions.Any())
+            else
             {
-                var extensionsString = string.Join("\n", conflictingExtensions.Select(kv => string.Format("  {0} : {1}", kv.Key, kv.Value)));
-                string message = string.Format(CultureInfo.CurrentCulture, Resources.MultipleFileVersions, extensionsString);
-                this.messageLogger.SendMessage(TestMessageLevel.Warning, message);
+                selectedExtensions.Add(extensionAssemblyName, extensionFullPath);
             }
-
-            return selectedExtensions.Values;
         }
 
-        private Version GetAndLogFileVersion(string path)
+        // Log warning if conflicting version extensions are found
+        if (conflictingExtensions.Count != 0)
         {
-            var fileVersion = this.fileHelper.GetFileVersion(path);
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("FileVersion for {0} : {1}", path, fileVersion);
-            }
+            var extensionsString = string.Join("\n", conflictingExtensions.Select(kv => $"  {kv.Key} : {kv.Value}"));
+            string message = string.Format(CultureInfo.CurrentCulture, Resources.MultipleFileVersions, extensionsString);
+            _messageLogger.SendMessage(TestMessageLevel.Warning, message);
+        }
 
-            return fileVersion;
+        return selectedExtensions.Values;
+    }
+
+    private Version GetAndLogFileVersion(string path)
+    {
+        var fileVersion = _fileHelper.GetFileVersion(path);
+        EqtTrace.Verbose("FileVersion for {0} : {1}", path, fileVersion);
+
+        return fileVersion;
+    }
+
+    /// <summary>
+    /// Raises HostLaunched event
+    /// </summary>
+    /// <param name="e">host provider event args</param>
+    private void OnHostLaunched(HostProviderEventArgs e)
+    {
+        HostLaunched?.SafeInvoke(this, e, "HostProviderEvents.OnHostLaunched");
+    }
+
+    /// <summary>
+    /// Raises HostExited event
+    /// </summary>
+    /// <param name="e">host provider event args</param>
+    private void OnHostExited(HostProviderEventArgs e)
+    {
+        if (!_hostExitedEventRaised)
+        {
+            _hostExitedEventRaised = true;
+            HostExited?.SafeInvoke(this, e, "HostProviderEvents.OnHostExited");
         }
+    }
 
-        /// <summary>
-        /// Raises HostLaunched event
-        /// </summary>
-        /// <param name="e">host provider event args</param>
-        private void OnHostLaunched(HostProviderEventArgs e)
+    [MemberNotNullWhen(true, nameof(_testHostProcess), nameof(_testHostProcessStdError))]
+    private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        _testHostProcessStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+        _testHostProcessStdOut = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+        EqtTrace.Verbose("Launching default test Host Process {0} with arguments {1}", testHostStartInfo.FileName, testHostStartInfo.Arguments);
+
+        // We launch the test host process here if we're on the normal test running workflow.
+        // If we're debugging and we have access to the newest version of the testhost launcher
+        // interface we launch it here as well, but we expect to attach later to the test host
+        // process by using its PID.
+        // For every other workflow (e.g.: profiling) we ask the IDE to launch the custom test
+        // host for us. In the profiling case this is needed because then the IDE sets some
+        // additional environmental variables for us to help with probing.
+        if (_customTestHostLauncher == null
+            || (_customTestHostLauncher.IsDebug && _customTestHostLauncher is ITestHostLauncher2))
         {
-            this.HostLaunched.SafeInvoke(this, e, "HostProviderEvents.OnHostLaunched");
+            EqtTrace.Verbose("DefaultTestHostManager: Starting process '{0}' with command line '{1}'", testHostStartInfo.FileName, testHostStartInfo.Arguments);
+            cancellationToken.ThrowIfCancellationRequested();
+            var outputCallback = _captureOutput ? OutputReceivedCallback : null;
+            _testHostProcess = _processHelper.LaunchProcess(
+                testHostStartInfo.FileName!,
+                testHostStartInfo.Arguments,
+                testHostStartInfo.WorkingDirectory,
+                testHostStartInfo.EnvironmentVariables,
+                ErrorReceivedCallback,
+                ExitCallBack,
+                outputCallback) as Process;
+        }
+        else
+        {
+            int processId = _customTestHostLauncher.LaunchTestHost(testHostStartInfo, cancellationToken);
+            _testHostProcess = Process.GetProcessById(processId);
+            _processHelper.SetExitCallback(processId, ExitCallBack);
         }
 
-        /// <summary>
-        /// Raises HostExited event
-        /// </summary>
-        /// <param name="e">host provider event args</param>
-        private void OnHostExited(HostProviderEventArgs e)
+        if (_testHostProcess is null)
         {
-            if (!this.hostExitedEventRaised)
-            {
-                this.hostExitedEventRaised = true;
-                this.HostExited.SafeInvoke(this, e, "HostProviderEvents.OnHostExited");
-            }
+            return false;
         }
 
-        private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+        AdjustProcessPriorityBasedOnSettings(_testHostProcess, testHostStartInfo.EnvironmentVariables);
+        OnHostLaunched(new HostProviderEventArgs("Test Runtime launched", 0, _testHostProcess.Id));
+
+        return true;
+    }
+
+    internal static void AdjustProcessPriorityBasedOnSettings(Process testHostProcess, IDictionary<string, string?>? testHostEnvironmentVariables)
+    {
+        ProcessPriorityClass testHostPriority = ProcessPriorityClass.BelowNormal;
+        try
         {
-            this.testHostProcessStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
-            EqtTrace.Verbose("Launching default test Host Process {0} with arguments {1}", testHostStartInfo.FileName, testHostStartInfo.Arguments);
-
-            // We launch the test host process here if we're on the normal test running workflow.
-            // If we're debugging and we have access to the newest version of the testhost launcher
-            // interface we launch it here as well, but we expect to attach later to the test host
-            // process by using its PID.
-            // For every other workflow (e.g.: profiling) we ask the IDE to launch the custom test
-            // host for us. In the profiling case this is needed because then the IDE sets some
-            // additional environmental variables for us to help with probing.
-            if ((this.customTestHostLauncher == null)
-                || (this.customTestHostLauncher.IsDebug
-                    && this.customTestHostLauncher is ITestHostLauncher2))
-            {
-                EqtTrace.Verbose("DefaultTestHostManager: Starting process '{0}' with command line '{1}'", testHostStartInfo.FileName, testHostStartInfo.Arguments);
-                cancellationToken.ThrowIfCancellationRequested();
-                this.testHostProcess = this.processHelper.LaunchProcess(
-                    testHostStartInfo.FileName,
-                    testHostStartInfo.Arguments,
-                    testHostStartInfo.WorkingDirectory,
-                    testHostStartInfo.EnvironmentVariables,
-                    this.ErrorReceivedCallback,
-                    this.ExitCallBack,
-                    null) as Process;
-            }
-            else
+            if (testHostEnvironmentVariables is not null
+                && testHostEnvironmentVariables.TryGetValue("VSTEST_BACKGROUND_DISCOVERY", out var isBackgroundDiscoveryEnabled)
+                && isBackgroundDiscoveryEnabled == "1")
             {
-                int processId = this.customTestHostLauncher.LaunchTestHost(testHostStartInfo, cancellationToken);
-                this.testHostProcess = Process.GetProcessById(processId);
-                this.processHelper.SetExitCallback(processId, this.ExitCallBack);
+                testHostProcess.PriorityClass = testHostPriority;
+                EqtTrace.Verbose("Setting test host process priority to {0}", testHostProcess.PriorityClass);
             }
-
-            this.OnHostLaunched(new HostProviderEventArgs("Test Runtime launched", 0, this.testHostProcess.Id));
-            return this.testHostProcess != null;
         }
-
-        private string GetUwpSources(string uwpSource)
+        // Setting the process Priority can fail with Win32Exception, NotSupportedException or InvalidOperationException.
+        catch (Exception ex)
         {
-            var doc = XDocument.Load(uwpSource);
-            var ns = doc.Root.Name.Namespace;
+            EqtTrace.Error("Failed to set test host process priority to {0}. Exception: {1}", testHostPriority, ex);
+        }
+    }
 
-            string appxManifestPath = doc.Element(ns + "Project").
-                Element(ns + "ItemGroup").
-                Element(ns + "AppXManifest").
-                Attribute("Include").Value;
+    private static string? GetUwpSources(string uwpSource)
+    {
+        var doc = XDocument.Load(uwpSource);
+        var ns = doc.Root!.Name.Namespace;
 
-            if (!Path.IsPathRooted(appxManifestPath))
-            {
-                appxManifestPath = Path.Combine(Path.GetDirectoryName(uwpSource), appxManifestPath);
-            }
+        string appxManifestPath = doc.Element(ns + "Project")!.
+            Element(ns + "ItemGroup")!.
+            Element(ns + "AppXManifest")!.
+            Attribute("Include")!.Value;
 
-            return AppxManifestFile.GetApplicationExecutableName(appxManifestPath);
+        if (!Path.IsPathRooted(appxManifestPath))
+        {
+            appxManifestPath = Path.Combine(Path.GetDirectoryName(uwpSource)!, appxManifestPath);
         }
+
+        return AppxManifestFile.GetApplicationExecutableName(appxManifestPath);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
index 65a4c52eaf..f536907aae 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
@@ -1,814 +1,974 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.DependencyModel;
+using Microsoft.TestPlatform.TestHostProvider;
+using Microsoft.TestPlatform.TestHostProvider.Hosting;
+using Microsoft.TestPlatform.TestHostProvider.Resources;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
+
+/// <summary>
+/// A host manager for <c>dotnet</c> core runtime.
+/// </summary>
+/// <remarks>
+/// Note that some functionality of this entity overlaps with that of <see cref="DefaultTestHostManager"/>. That is
+/// intentional since we want to move this to a separate assembly (with some runtime extensibility discovery).
+/// </remarks>
+[ExtensionUri(DotnetTestHostUri)]
+[FriendlyName(DotnetTestHostFriendlyName)]
+public class DotnetTestHostManager : ITestRuntimeProvider2
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.Extensions.DependencyModel;
-    using Microsoft.TestPlatform.TestHostProvider.Hosting;
-    using Microsoft.TestPlatform.TestHostProvider.Resources;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.Win32;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
+    private const string DotnetTestHostUri = "HostProvider://DotnetTestHost";
+    // Should the friendly name ever change, please make sure to change the corresponding constant
+    // inside ProxyOperationManager::IsTesthostCompatibleWithTestSessions().
+    private const string DotnetTestHostFriendlyName = "DotnetTestHost";
+    private const string TestAdapterRegexPattern = @"TestAdapter.dll";
+    private const string PROCESSOR_ARCHITECTURE = nameof(PROCESSOR_ARCHITECTURE);
+
+    private readonly IDotnetHostHelper _dotnetHostHelper;
+    private readonly IEnvironment _platformEnvironment;
+    private readonly IProcessHelper _processHelper;
+    private readonly IRunSettingsHelper _runsettingHelper;
+    private readonly IFileHelper _fileHelper;
+    private readonly IWindowsRegistryHelper _windowsRegistryHelper;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+
+    private ITestHostLauncher? _customTestHostLauncher;
+    private Process? _testHostProcess;
+    private StringBuilder? _testHostProcessStdError;
+    private StringBuilder? _testHostProcessStdOut;
+    private bool _hostExitedEventRaised;
+    private string _hostPackageVersion = "15.0.0";
+    private Architecture _architecture;
+    private Framework? _targetFramework;
+    private bool _isVersionCheckRequired = true;
+    private string? _dotnetHostPath;
+    private bool _captureOutput;
+    private protected TestHostManagerCallbacks? _testHostManagerCallbacks;
 
     /// <summary>
-    /// A host manager for <c>dotnet</c> core runtime.
+    /// Initializes a new instance of the <see cref="DotnetTestHostManager"/> class.
+    /// </summary>
+    public DotnetTestHostManager()
+        : this(
+            new ProcessHelper(),
+            new FileHelper(),
+            new DotnetHostHelper(),
+            new PlatformEnvironment(),
+            RunSettingsHelper.Instance,
+            new WindowsRegistryHelper(),
+            new EnvironmentVariableHelper())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DotnetTestHostManager"/> class.
+    /// </summary>
+    /// <param name="processHelper">Process helper instance.</param>
+    /// <param name="fileHelper">File helper instance.</param>
+    /// <param name="dotnetHostHelper">DotnetHostHelper helper instance.</param>
+    /// <param name="platformEnvironment">Platform Environment</param>
+    /// <param name="runsettingHelper">RunsettingHelper instance</param>
+    /// <param name="windowsRegistryHelper">WindowsRegistryHelper instance</param>
+    /// <param name="environmentVariableHelper">EnvironmentVariableHelper instance</param>
+    internal DotnetTestHostManager(
+        IProcessHelper processHelper,
+        IFileHelper fileHelper,
+        IDotnetHostHelper dotnetHostHelper,
+        IEnvironment platformEnvironment,
+        IRunSettingsHelper runsettingHelper,
+        IWindowsRegistryHelper windowsRegistryHelper,
+        IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _processHelper = processHelper;
+        _fileHelper = fileHelper;
+        _dotnetHostHelper = dotnetHostHelper;
+        _platformEnvironment = platformEnvironment;
+        _runsettingHelper = runsettingHelper;
+        _windowsRegistryHelper = windowsRegistryHelper;
+        _environmentVariableHelper = environmentVariableHelper;
+    }
+
+    /// <inheritdoc />
+    public event EventHandler<HostProviderEventArgs>? HostLaunched;
+
+    /// <inheritdoc />
+    public event EventHandler<HostProviderEventArgs>? HostExited;
+
+    /// <summary>
+    /// Gets a value indicating whether gets a value indicating if the test host can be shared for multiple sources.
     /// </summary>
     /// <remarks>
-    /// Note that some functionality of this entity overlaps with that of <see cref="DefaultTestHostManager"/>. That is
-    /// intentional since we want to move this to a separate assembly (with some runtime extensibility discovery).
+    /// Dependency resolution for .net core projects are pivoted by the test project. Hence each test
+    /// project must be launched in a separate test host process.
     /// </remarks>
-    [ExtensionUri(DotnetTestHostUri)]
-    [FriendlyName(DotnetTestHostFriendlyName)]
-    public class DotnetTestHostManager : ITestRuntimeProvider2
+    public bool Shared => false;
+
+    /// <summary>
+    /// Gets a value indicating whether the test host supports protocol version check
+    /// By default this is set to true. For host package version 15.0.0, this will be set to false;
+    /// </summary>
+    internal virtual bool IsVersionCheckRequired
     {
-        private const string DotnetTestHostUri = "HostProvider://DotnetTestHost";
-        private const string DotnetTestHostFriendlyName = "DotnetTestHost";
-        private const string TestAdapterRegexPattern = @"TestAdapter.dll";
+        get
+        {
+            return _isVersionCheckRequired;
+        }
 
-        private IDotnetHostHelper dotnetHostHelper;
-        private IEnvironment platformEnvironment;
-        private IProcessHelper processHelper;
-        private IRunSettingsHelper runsettingHelper;
-        private IFileHelper fileHelper;
-        private IWindowsRegistryHelper windowsRegistryHelper;
-        private IEnvironmentVariableHelper environmentVariableHelper;
+        private set
+        {
+            _isVersionCheckRequired = value;
+        }
+    }
 
-        private ITestHostLauncher customTestHostLauncher;
+    /// <summary>
+    /// Gets a value indicating whether the test host supports protocol version check
+    /// </summary>
+    internal bool MakeRunsettingsCompatible => _hostPackageVersion.StartsWith("15.0.0-preview");
 
-        private Process testHostProcess;
+    /// <summary>
+    /// Gets callback on process exit
+    /// </summary>
+    private Action<object?> ExitCallBack => process =>
+    {
+        TPDebug.Assert(_testHostProcessStdError is not null, "_testHostProcessStdError is null");
+        TestHostManagerCallbacks.ExitCallBack(_processHelper, process, _testHostProcessStdError, OnHostExited);
+    };
 
-        private StringBuilder testHostProcessStdError;
+    /// <summary>
+    /// Gets callback to read from process error stream
+    /// </summary>
+    private Action<object?, string?> ErrorReceivedCallback => (process, data) =>
+    {
+        TPDebug.Assert(_testHostProcessStdError is not null, "_testHostProcessStdError is null");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ExitCallBack");
+        _testHostManagerCallbacks.ErrorReceivedCallback(_testHostProcessStdError, data);
+    };
 
-        private IMessageLogger messageLogger;
+    /// <summary>
+    /// Gets callback to read from process standard stream
+    /// </summary>
+    private Action<object?, string?> OutputReceivedCallback => (process, data) =>
+    {
+        TPDebug.Assert(_testHostProcessStdOut is not null, "LaunchTestHostAsync must have been called before OutputReceivedCallback");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before OutputReceivedCallback");
+        _testHostManagerCallbacks.StandardOutputReceivedCallback(_testHostProcessStdOut, data);
+    };
 
-        private bool hostExitedEventRaised;
+    /// <inheritdoc/>
+    public void Initialize(IMessageLogger? logger, string runsettingsXml)
+    {
+        _hostExitedEventRaised = false;
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+        _captureOutput = runConfiguration.CaptureStandardOutput;
+        var forwardOutput = runConfiguration.ForwardStandardOutput;
+        _testHostManagerCallbacks = new TestHostManagerCallbacks(forwardOutput, logger);
+
+        _architecture = runConfiguration.TargetPlatform;
+        _targetFramework = runConfiguration.TargetFramework;
+        _dotnetHostPath = runConfiguration.DotnetHostPath;
+    }
 
-        private string hostPackageVersion = "15.0.0";
+    /// <inheritdoc/>
+    public void SetCustomLauncher(ITestHostLauncher customLauncher)
+    {
+        _customTestHostLauncher = customLauncher;
+    }
 
-        private Architecture architecture;
-        private Framework targetFramework;
-        private bool isVersionCheckRequired = true;
+    /// <inheritdoc/>
+    public TestHostConnectionInfo GetTestHostConnectionInfo()
+    {
+        return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+    }
 
-        private string dotnetHostPath;
+    /// <inheritdoc/>
+    public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        // Do NOT offload this to thread pool using Task.Run, we already are on thread pool
+        // and this would go into a queue after all the other startup tasks. Meaning we will start
+        // testhost much later, and not immediately.
+        return Task.FromResult(LaunchHost(testHostStartInfo, cancellationToken));
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetTestHostManager"/> class.
-        /// </summary>
-        public DotnetTestHostManager()
-            : this(
-                  new ProcessHelper(),
-                  new FileHelper(),
-                  new DotnetHostHelper(),
-                  new PlatformEnvironment(),
-                  RunSettingsHelper.Instance,
-                  new WindowsRegistryHelper(),
-                  new EnvironmentVariableHelper())
-        {
-        }
+    /// <inheritdoc/>
+    public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
+        IEnumerable<string> sources,
+        IDictionary<string, string?>? environmentVariables,
+        TestRunnerConnectionInfo connectionInfo)
+    {
+        TPDebug.Assert(_targetFramework is not null, "_targetFramework is null");
+        EqtTrace.Verbose($"DotnetTestHostmanager.GetTestHostProcessStartInfo: Platform environment '{_platformEnvironment.Architecture}' target architecture '{_architecture}' framework '{_targetFramework}' OS '{_platformEnvironment.OperatingSystem}'");
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DotnetTestHostManager"/> class.
-        /// </summary>
-        /// <param name="processHelper">Process helper instance.</param>
-        /// <param name="fileHelper">File helper instance.</param>
-        /// <param name="dotnetHostHelper">DotnetHostHelper helper instance.</param>
-        /// <param name="platformEnvironment">Platform Environment</param>
-        /// <param name="runsettingHelper">RunsettingHelper instance</param>
-        /// <param name="windowsRegistryHelper">WindowsRegistryHelper instance</param>
-        /// <param name="environmentVariableHelper">EnvironmentVariableHelper instance</param>
-        internal DotnetTestHostManager(
-            IProcessHelper processHelper,
-            IFileHelper fileHelper,
-            IDotnetHostHelper dotnetHostHelper,
-            IEnvironment platformEnvironment,
-            IRunSettingsHelper runsettingHelper,
-            IWindowsRegistryHelper windowsRegistryHelper,
-            IEnvironmentVariableHelper environmentVariableHelper)
-        {
-            this.processHelper = processHelper;
-            this.fileHelper = fileHelper;
-            this.dotnetHostHelper = dotnetHostHelper;
-            this.platformEnvironment = platformEnvironment;
-            this.runsettingHelper = runsettingHelper;
-            this.windowsRegistryHelper = windowsRegistryHelper;
-            this.environmentVariableHelper = environmentVariableHelper;
-        }
+        var startInfo = new TestProcessStartInfo();
+        startInfo.EnvironmentVariables = environmentVariables ?? new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
+
+        string? dotnetRootPath = _environmentVariableHelper.GetEnvironmentVariable("VSTEST_DOTNET_ROOT_PATH");
+        string? dotnetRootArchitecture = _environmentVariableHelper.GetEnvironmentVariable("VSTEST_DOTNET_ROOT_ARCHITECTURE");
 
-        /// <inheritdoc />
-        public event EventHandler<HostProviderEventArgs> HostLaunched;
-
-        /// <inheritdoc />
-        public event EventHandler<HostProviderEventArgs> HostExited;
-
-        /// <summary>
-        /// Gets a value indicating whether gets a value indicating if the test host can be shared for multiple sources.
-        /// </summary>
-        /// <remarks>
-        /// Dependency resolution for .net core projects are pivoted by the test project. Hence each test
-        /// project must be launched in a separate test host process.
-        /// </remarks>
-        public bool Shared => false;
-
-        /// <summary>
-        /// Gets a value indicating whether the test host supports protocol version check
-        /// By default this is set to true. For host package version 15.0.0, this will be set to false;
-        /// </summary>
-        internal virtual bool IsVersionCheckRequired
+        if (!StringUtilities.IsNullOrWhiteSpace(dotnetRootPath))
         {
-            get
+            if (StringUtils.IsNullOrWhiteSpace(dotnetRootArchitecture))
             {
-                return this.isVersionCheckRequired;
+                throw new InvalidOperationException("'VSTEST_DOTNET_ROOT_PATH' and 'VSTEST_DOTNET_ROOT_ARCHITECTURE' must be both always set. If you are seeing this error, this is a bug in dotnet SDK that sets those variables.");
             }
 
-            private set
+            EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: VSTEST_DOTNET_ROOT_PATH={dotnetRootPath}");
+            EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: VSTEST_DOTNET_ROOT_ARCHITECTURE={dotnetRootArchitecture}");
+
+            if (!FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_DOTNET_ROOT_ON_NONWINDOWS))
             {
-                this.isVersionCheckRequired = value;
+                // Set DOTNET_ROOT_<ARCH> for any run, so it gets propagated to testhost and its child processes, like dotnet run does it. This allows executables that start under testhost to find the path to dotnet
+                // from which we called dotnet test. Before this change we only expected testhost.exe to be in this situation, but with xunit v3 running separate exe under testhost, the need for setting architecture
+                // specific DOTNET_ROOT increases and makes this necessary for users to have good experience.
+                SetDotnetRootForArchitecture(startInfo, dotnetRootPath!, dotnetRootArchitecture);
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the test host supports protocol version check
-        /// </summary>
-        internal bool MakeRunsettingsCompatible => this.hostPackageVersion.StartsWith("15.0.0-preview");
-
-        /// <summary>
-        /// Gets callback on process exit
-        /// </summary>
-        private Action<object> ExitCallBack => (process) =>
+        // .NET core host manager is not a shared host. It will expect a single test source to be provided.
+        // TODO: Throw an exception when we get 0 or more than 1 source, that explains what happened, instead of .Single throwing a generic exception?
+        var args = string.Empty;
+        var sourcePath = sources.Single();
+        var sourceFile = Path.GetFileNameWithoutExtension(sourcePath);
+        var sourceDirectory = Path.GetDirectoryName(sourcePath)!;
+
+        // Probe for runtime config and deps file for the test source
+        var runtimeConfigPath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".runtimeconfig.json"));
+        var runtimeConfigFound = false;
+        if (_fileHelper.Exists(runtimeConfigPath))
         {
-            TestHostManagerCallbacks.ExitCallBack(this.processHelper, process, this.testHostProcessStdError, this.OnHostExited);
-        };
-
-        /// <summary>
-        /// Gets callback to read from process error stream
-        /// </summary>
-        private Action<object, string> ErrorReceivedCallback => (process, data) =>
-        {
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, data);
-        };
-
-        /// <inheritdoc/>
-        public void Initialize(IMessageLogger logger, string runsettingsXml)
+            runtimeConfigFound = true;
+            string argsToAdd = " --runtimeconfig " + runtimeConfigPath.AddDoubleQuote();
+            args += argsToAdd;
+            EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
+        }
+        else
         {
-            this.messageLogger = logger;
-            this.hostExitedEventRaised = false;
-
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-            this.architecture = runConfiguration.TargetPlatform;
-            this.targetFramework = runConfiguration.TargetFramework;
-            this.dotnetHostPath = runConfiguration.DotnetHostPath;
+            EqtTrace.Verbose("DotnetTestHostmanager: File {0}, does not exist", runtimeConfigPath);
         }
 
-        /// <inheritdoc/>
-        public void SetCustomLauncher(ITestHostLauncher customLauncher)
+        // Use the deps.json for test source
+        var depsFilePath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".deps.json"));
+        if (_fileHelper.Exists(depsFilePath))
         {
-            this.customTestHostLauncher = customLauncher;
+            string argsToAdd = " --depsfile " + depsFilePath.AddDoubleQuote();
+            args += argsToAdd;
+            EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
         }
-
-        /// <inheritdoc/>
-        public TestHostConnectionInfo GetTestHostConnectionInfo()
+        else
         {
-            return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+            EqtTrace.Verbose("DotnetTestHostmanager: File {0}, does not exist", depsFilePath);
         }
 
-        /// <inheritdoc/>
-        public async Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+        var runtimeConfigDevPath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".runtimeconfig.dev.json"));
+        string testHostPath = string.Empty;
+        bool useCustomDotnetHostpath = !_dotnetHostPath.IsNullOrEmpty();
+
+        if (useCustomDotnetHostpath)
         {
-            return await Task.Run(() => this.LaunchHost(testHostStartInfo, cancellationToken), cancellationToken);
+            EqtTrace.Verbose("DotnetTestHostmanager: User specified custom path to dotnet host: '{0}'.", _dotnetHostPath);
         }
 
-        /// <inheritdoc/>
-        public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
-            IEnumerable<string> sources,
-            IDictionary<string, string> environmentVariables,
-            TestRunnerConnectionInfo connectionInfo)
+        // Try find testhost.exe (or the architecture specific version). We ship those ngened executables for Windows
+        // because they have faster startup time. We ship them only for some platforms.
+        // When user specified path to dotnet.exe don't try to find the executable, because we will always use the
+        // testhost.dll together with their dotnet.exe.
+        bool testHostExeFound = false;
+        if (!useCustomDotnetHostpath
+            && _platformEnvironment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)
+            // On arm we cannot rely on apphost and we'll use dotnet.exe muxer.
+            && !IsWinOnArm())
         {
-            EqtTrace.Verbose($"DotnetTestHostmanager.GetTestHostProcessStartInfo: Platform environment '{this.platformEnvironment.Architecture}' target architecture '{this.architecture}' framework '{this.targetFramework}' OS '{this.platformEnvironment.OperatingSystem}'");
-
-            var startInfo = new TestProcessStartInfo();
+            // testhost.exe is 64-bit and has no suffix other versions have architecture suffix.
+            var exeName = _architecture is Architecture.X64 or Architecture.Default or Architecture.AnyCPU
+                ? "testhost.exe"
+                : $"testhost.{_architecture.ToString().ToLowerInvariant()}.exe";
 
-            // .NET core host manager is not a shared host. It will expect a single test source to be provided.
-            // TODO: Throw an exception when we get 0 or more than 1 source, that explains what happened, instead of .Single throwing a generic exception?
-            var args = string.Empty;
-            var sourcePath = sources.Single();
-            var sourceFile = Path.GetFileNameWithoutExtension(sourcePath);
-            var sourceDirectory = Path.GetDirectoryName(sourcePath);
-
-            // Probe for runtime config and deps file for the test source
-            var runtimeConfigPath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".runtimeconfig.json"));
-            var runtimeConfigFound = false;
-            if (this.fileHelper.Exists(runtimeConfigPath))
-            {
-                runtimeConfigFound = true;
-                string argsToAdd = " --runtimeconfig " + runtimeConfigPath.AddDoubleQuote();
-                args += argsToAdd;
-                EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
-            }
-            else
-            {
-                EqtTrace.Verbose("DotnetTestHostmanager: File {0}, does not exist", runtimeConfigPath);
-            }
+            var fullExePath = Path.Combine(sourceDirectory, exeName);
 
-            // Use the deps.json for test source
-            var depsFilePath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".deps.json"));
-            if (this.fileHelper.Exists(depsFilePath))
+            // check for testhost.exe in sourceDirectory. If not found, check in nuget folder.
+            if (_fileHelper.Exists(fullExePath))
             {
-                string argsToAdd = " --depsfile " + depsFilePath.AddDoubleQuote();
-                args += argsToAdd;
-                EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
+                EqtTrace.Verbose($"DotnetTestHostManager: {exeName} found at path: " + fullExePath);
+                startInfo.FileName = fullExePath;
+                testHostExeFound = true;
             }
             else
             {
-                EqtTrace.Verbose("DotnetTestHostmanager: File {0}, does not exist", depsFilePath);
-            }
-
-            var runtimeConfigDevPath = Path.Combine(sourceDirectory, string.Concat(sourceFile, ".runtimeconfig.dev.json"));
-            string testHostPath = string.Empty;
-            bool useCustomDotnetHostpath = !string.IsNullOrEmpty(this.dotnetHostPath);
-
-            if (useCustomDotnetHostpath)
-            {
-                EqtTrace.Verbose("DotnetTestHostmanager: User specified custom path to dotnet host: '{0}'.", this.dotnetHostPath);
-            }
-
-            // Try find testhost.exe (or the architecture specific version). We ship those ngened executables for Windows because they have faster startup time. We ship them only for some platforms.
-            // When user specified path to dotnet.exe don't try to find the exexutable, because we will always use the testhost.dll together with their dotnet.exe.
-            // We use dotnet.exe on Windows/ARM.
-            // TODO: Check if we're on ARM64 win using env var PROCESSARCHITECTURE
-            bool testHostExeFound = false;
-            if (!useCustomDotnetHostpath
-                && this.platformEnvironment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)
-
-                // testhost*.exe are build for netcoreapp2.1 and are not able to search for the correct runtime in case of x64/x86 on arm because the new logic(registry lookup)
-                // was added in since netcoreapp3.0. On arm we cannot rely on apphost and we'll use dotnet.exe muxer
-                && !IsWinOnArm())
-            {
-                // testhost.exe is 64-bit and has no suffix other versions have architecture suffix.
-                var exeName = this.architecture == Architecture.X64 || this.architecture == Architecture.Default || this.architecture == Architecture.AnyCPU
-                    ? "testhost.exe"
-                    : $"testhost.{this.architecture.ToString().ToLowerInvariant()}.exe";
-
-                var fullExePath = Path.Combine(sourceDirectory, exeName);
-
-                // check for testhost.exe in sourceDirectory. If not found, check in nuget folder.
-                if (this.fileHelper.Exists(fullExePath))
-                {
-                    EqtTrace.Verbose($"DotnetTestHostManager: {exeName} found at path: " + fullExePath);
-                    startInfo.FileName = fullExePath;
-                    testHostExeFound = true;
-                }
-                else
+                // Check if testhost.dll is found in nuget folder or next to the test.dll, and use that to locate testhost.exe that is in the build folder in the same Nuget package.
+                testHostPath = GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
+                if (!testHostPath.IsNullOrWhiteSpace() && testHostPath.IndexOf("microsoft.testplatform.testhost", StringComparison.OrdinalIgnoreCase) >= 0)
                 {
-                    // Check if testhost.dll is found in nuget folder or next to the test.dll, and use that to locate testhost.exe that is in the build folder in the same Nuget package.
-                    testHostPath = this.GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
-                    if (!string.IsNullOrWhiteSpace(testHostPath) && testHostPath.IndexOf("microsoft.testplatform.testhost", StringComparison.OrdinalIgnoreCase) >= 0)
-                    {
-                        // testhost.dll is present in path {testHostNugetRoot}\lib\netcoreapp2.1\testhost.dll
-                        // testhost.(x86).exe is present in location {testHostNugetRoot}\build\netcoreapp2.1\{x86/x64}\{testhost.x86.exe/testhost.exe}
-                        var folderName = this.architecture == Architecture.X64 || this.architecture == Architecture.Default || this.architecture == Architecture.AnyCPU
-                            ? Architecture.X64.ToString().ToLowerInvariant()
-                            : this.architecture.ToString().ToLowerInvariant();
+                    // testhost.dll is present in path {testHostNugetRoot}\lib\net8.0\testhost.dll
+                    // testhost.(x86).exe is present in location {testHostNugetRoot}\build\net8.0\{x86/x64}\{testhost.x86.exe/testhost.exe}
+                    var folderName = _architecture is Architecture.X64 or Architecture.Default or Architecture.AnyCPU
+                        ? Architecture.X64.ToString().ToLowerInvariant()
+                        : _architecture.ToString().ToLowerInvariant();
 
-                        var testHostNugetRoot = new DirectoryInfo(testHostPath).Parent.Parent.Parent;
+                    var testHostNugetRoot = new DirectoryInfo(testHostPath).Parent!.Parent!.Parent!;
 
 #if DOTNET_BUILD_FROM_SOURCE
-                        var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net6.0", folderName, exeName);
+                    var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net8.0", folderName, exeName);
+                    if (!_fileHelper.Exists(testHostExeNugetPath))
+                    {
+                        testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net9.0", folderName, exeName);
+                    }
 #else
-                        var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp2.1", folderName, exeName);
+                    var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "net8.0", folderName, exeName);
 #endif
 
-                        if (this.fileHelper.Exists(testHostExeNugetPath))
-                        {
-                            EqtTrace.Verbose("DotnetTestHostManager: Testhost.exe/testhost.x86.exe found at path: " + testHostExeNugetPath);
-                            startInfo.FileName = testHostExeNugetPath;
-                            testHostExeFound = true;
-                        }
+                    if (_fileHelper.Exists(testHostExeNugetPath))
+                    {
+                        EqtTrace.Verbose("DotnetTestHostManager: Testhost.exe/testhost.x86.exe found at path: " + testHostExeNugetPath);
+                        startInfo.FileName = testHostExeNugetPath;
+                        testHostExeFound = true;
                     }
                 }
             }
+        }
 
-            if (!testHostExeFound)
+        if (!testHostExeFound)
+        {
+            // We did not find testhost.exe, either it did not exist, or we are not on Windows, or the user forced a custom path to dotnet. So we will try
+            // to find testhost.dll from the runtime config and deps.json.
+            if (testHostPath.IsNullOrEmpty())
             {
-                // We did not find testhost.exe, either it did not exist, or we are not on Windows, or the user forced a custom path to dotnet. So we will try
-                // to find testhost.dll from the runtime config and deps.json.
-                if (string.IsNullOrEmpty(testHostPath))
-                {
-                    testHostPath = this.GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
-                }
+                testHostPath = GetTestHostPath(runtimeConfigDevPath, depsFilePath, sourceDirectory);
+            }
 
-                if (string.IsNullOrEmpty(testHostPath))
-                {
-                    // We still did not find testhost.dll. Try finding it next to vstest.console, (or in next to vstest.console ./TestHost for .NET Framework)
+            if (testHostPath.IsNullOrEmpty())
+            {
+                // We still did not find testhost.dll. Try finding it next to vstest.console, (or in next to vstest.console ./TestHostNet for .NET Framework)
 #if NETFRAMEWORK
-                    var testHostNextToRunner = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "TestHost", "testhost.dll");
+                var testHostNextToRunner = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!, "TestHostNet", "testhost.dll");
 #else
-                    var testHostNextToRunner = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "testhost.dll");
+                var testHostNextToRunner = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!, "testhost.dll");
 #endif
-                    if (this.fileHelper.Exists(testHostNextToRunner))
+                if (_fileHelper.Exists(testHostNextToRunner))
+                {
+                    EqtTrace.Verbose("DotnetTestHostManager: Found testhost.dll next to runner executable: {0}.", testHostNextToRunner);
+                    testHostPath = testHostNextToRunner;
+
+                    // Because we could not find the testhost based on the project reference, or next to the tested dll,
+                    // it is most likely not referenced from it, or the .dll is unmanaged.
+                    //
+                    // Add additional deps, that describes the dependencies of testhost.dll, which will merge with deps.json
+                    // if the process provided any, or will be used by itself if none was provided.
+                    var testhostDeps = Path.Combine(Path.GetDirectoryName(testHostNextToRunner)!, "testhost.deps.json");
+                    string argsToAdd = " --additional-deps " + testhostDeps.AddDoubleQuote();
+                    args += argsToAdd;
+                    EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
+
+                    // Additional deps will contain relative paths, tell the process to search for the dlls also
+                    // next to the testhost.dll. The additional deps file is specially crafted to keep all the
+                    // .dlls in the root folder, by only referencing libraries, and setting the path to "/".
+                    // Without this, e.g. using the normal deps.json that is generated when testhost.dll is built,
+                    // dotnet would consider additional deps path as the root of a Nuget package source,
+                    // and would try to locate the dlls in a more complicated folder structure, and would fail to
+                    // find those dependencies.
+                    //
+                    // If they were in the base path (where the test dll is) it would work
+                    // fine, because in base folder, dotnet searches directly in that folder, but not in probing paths.
+                    var testHostProbingPath = Path.GetDirectoryName(testHostNextToRunner)!;
+                    argsToAdd = " --additionalprobingpath " + testHostProbingPath.AddDoubleQuote();
+                    args += argsToAdd;
+                    EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
+
+                    if (!runtimeConfigFound)
                     {
-                        EqtTrace.Verbose("DotnetTestHostManager: Found testhost.dll next to runner executable: {0}.", testHostNextToRunner);
-                        testHostPath = testHostNextToRunner;
-
-                        // Because we could not find the testhost based on the project reference, or next to the tested dll,
-                        // it is most likely not referenced from it, or the .dll is unmanaged.
+                        // When runtime config is not found, we don't know which version exactly should be selected for the runtime.
+                        // This can happen when the test project is .NET (Core) but does not have EXE output type, or when the dll is native.
                         //
-                        // Add additional deps, that describes the dependencies of testhost.dll, which will merge with deps.json
-                        // if the process provided any, or will be used by itself if none was provided.
-                        var testhostDeps = Path.Combine(Path.GetDirectoryName(testHostNextToRunner), "testhost.deps.json");
-                        string argsToAdd = " --additional-deps " + testhostDeps.AddDoubleQuote();
-                        args += argsToAdd;
-                        EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
-
-                        // Additional deps will contain relative paths, tell the process to search for the dlls also
-                        // next to the testhost.dll. The additional deps file is specially crafted to keep all the
-                        // .dlls in the root folder, by only referencing libraries, and setting the path to "/".
-                        // Without this, e.g. using the normal deps.json that is generated when testhost.dll is built,
-                        // dotnet would consider additional deps path as the root of a Nuget package source,
-                        // and would try to locate the dlls in a more complicated folder structure, and would fail to
-                        // find those dependencies.
+                        // When the project is .NET (Core) we can look at the TargetFramework and gather the rough version from there. We then
+                        // provide a runtime config targetting that version. It rolls forward on the minor version by default, so the latest
+                        // version that is present will be selected in that range. Same as if you had EXE and no special settings.
+                        // E.g. the dll targets netcoreapp3.1, we get 3.1 from the attribute in the Dll, and provide testhost-3.1.runtimeconfig.json
+                        // this will resolve to 3.1.17 runtime because that is the latest installed on the system.
                         //
-                        // If they were in the base path (where the test dll is) it would work
-                        // fine, because in base folder, dotnet searches directly in that folder, but not in probing paths.
-                        var testHostProbingPath = Path.GetDirectoryName(testHostNextToRunner);
-                        argsToAdd = " --additionalprobingpath " + testHostProbingPath.AddDoubleQuote();
-                        args += argsToAdd;
-                        EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
-
-                        if (!runtimeConfigFound)
+                        //
+                        // In the other case, where the Dll is native, we take the a runtime config that will roll forward to the latest version
+                        // because we don't care on which version we will run, and rolling forward gives us the best chance of findind some runtime.
+                        //
+                        //
+                        // There are 2 options how to provide the runtime version. Using --runtimeconfig, and --fx-version. The --fx-version does
+                        // not roll forward even when the --roll-forward option is provided (or --roll-forward-on-no-candidate-fx for netcoreapp2.1)
+                        // and we don't know the exact version we want to use. So the only option for us is to use the runtimeconfig.json.
+                        //
+                        //
+                        // TODO: This version check is a hack, when the target framework is figured out it tries to unify to a single common framework
+                        // even if there are incompatible frameworks (e.g any .NET Framwork assembly and any .NET (Core) assembly). Those incompatibilities
+                        // will fall back to a common default framework. And that framework (stored in Framework.DefaultFramework) depends on compile time variables
+                        // so depending on the version of vstest.console you are using, you will get a different value. This value for vstest.console.exe (under VS)
+                        // is .NET Framework 4, but for vstest.console.dll (under dotnet test) is .NET Core 1.0. Those values are also valid values, so we have no idea
+                        // if user actually provided a .NET Core 1.0 dll, or we are using fallback because we are running under vstest.console, and there is conflict,
+                        // or if user provided native dll which does not have the attribute (that we read via PEReader).
+                        //
+                        // Another aspect of this is that we are unifying the dlls, so until we add per assembly data, this would be less accurate than using runtimeconfig.json
+                        // but we can work around that by 1) changing how we schedule runners, to make sure we can process more that 1 type of assembly in vstest.console and
+                        // 2) making sure we still make the project executable (and so we actually do get runtimeconfig unless the user tries hard to not make the test and EXE).
+                        var suffix = _targetFramework.Version == "1.0.0.0" ? "latest" : $"{new Version(_targetFramework.Version).Major}.{new Version(_targetFramework.Version).Minor}";
+                        var testhostRuntimeConfig = Path.Combine(Path.GetDirectoryName(testHostNextToRunner)!, $"testhost-{suffix}.runtimeconfig.json");
+                        if (!_fileHelper.Exists(testhostRuntimeConfig))
                         {
-                            // When runtime config is not found, we don't know which version exactly should be selected for the runtime.
-                            // This can happen when the test project is .NET (Core) but does not have EXE output type, or when the dll is native.
-                            //
-                            // When the project is .NET (Core) we can look at the TargetFramework and gather the rough version from there. We then
-                            // provide a runtime config targetting that version. It rolls forward on the minor version by default, so the latest
-                            // version that is present will be selected in that range. Same as if you had EXE and no special settings.
-                            // E.g. the dll targets netcoreapp3.1, we get 3.1 from the attribute in the Dll, and provide testhost-3.1.runtimeconfig.json
-                            // this will resolve to 3.1.17 runtime because that is the latest installed on the system.
-                            //
-                            //
-                            // In the other case, where the Dll is native, we take the a runtime config that will roll forward to the latest version
-                            // because we don't care on which version we will run, and rolling forward gives us the best chance of findind some runtime.
-                            //
-                            //
-                            // There are 2 options how to provide the runtime version. Using --runtimeconfig, and --fx-version. The --fx-version does
-                            // not roll forward even when the --roll-forward option is provided (or --roll-forward-on-no-candidate-fx for netcoreapp2.1)
-                            // and we don't know the exact version we want to use. So the only option for us is to use the runtimeconfig.json.
-                            //
-                            //
-                            // TODO: This version check is a hack, when the target framework is figured out it tries to unify to a single common framework
-                            // even if there are incompatible frameworks (e.g any .NET Framwork assembly and any .NET (Core) assembly). Those incompatibilities
-                            // will fall back to a common default framework. And that framework (stored in Framework.DefaultFramework) depends on compile time variables
-                            // so depending on the version of vstest.console you are using, you will get a different value. This value for vstest.console.exe (under VS)
-                            // is .NET Framework 4, but for vstest.console.dll (under dotnet test) is .NET Core 1.0. Those values are also valid values, so we have no idea
-                            // if user actually provided a .NET Core 1.0 dll, or we are using fallback because we are running under vstest.console, and there is conflict,
-                            // or if user provided native dll which does not have the attribute (that we read via PEReader).
-                            //
-                            // Another aspect of this is that we are unifying the dlls, so until we add per assembly data, this would be less accurate than using runtimeconfig.json
-                            // but we can work around that by 1) changing how we schedule runners, to make sure we can process more that 1 type of assembly in vstest.console and
-                            // 2) making sure we still make the project executable (and so we actually do get runtimeconfig unless the user tries hard to not make the test and EXE).
-                            var suffix = this.targetFramework.Version == "1.0.0.0" ? "latest" : $"{new Version(this.targetFramework.Version).Major}.{new Version(this.targetFramework.Version).Minor}";
-                            var testhostRuntimeConfig = Path.Combine(Path.GetDirectoryName(testHostNextToRunner), $"testhost-{suffix}.runtimeconfig.json");
-                            argsToAdd = " --runtimeconfig " + testhostRuntimeConfig.AddDoubleQuote();
-                            args += argsToAdd;
-                            EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
+                            testhostRuntimeConfig = Path.Combine(Path.GetDirectoryName(testHostNextToRunner)!, $"testhost-latest.runtimeconfig.json");
                         }
+
+                        argsToAdd = " --runtimeconfig " + testhostRuntimeConfig.AddDoubleQuote();
+                        args += argsToAdd;
+                        EqtTrace.Verbose("DotnetTestHostmanager: Adding {0} in args", argsToAdd);
                     }
                 }
+            }
 
-                if (string.IsNullOrEmpty(testHostPath))
-                {
-                    throw new TestPlatformException("Could not find testhost");
-                }
+            if (testHostPath.IsNullOrEmpty())
+            {
+                throw new TestPlatformException("Could not find testhost");
+            }
 
-                // We silently force x64 only if the target architecture is the default one and is not specified by user
-                // through --arch or runsettings or -- RunConfiguration.TargetPlatform=arch
-                bool forceToX64 = SilentlyForceToX64() && this.runsettingHelper.IsDefaultTargetArchitecture;
-                bool isSameArchitecture = IsSameArchitecture(this.architecture, this.platformEnvironment.Architecture);
-                var currentProcessPath = this.processHelper.GetCurrentProcessFileName();
-                bool isRunningWithDotnetMuxer = IsRunningWithDotnetMuxer(currentProcessPath);
-                if (useCustomDotnetHostpath)
-                {
-                    startInfo.FileName = this.dotnetHostPath;
-                }
+            // We silently force x64 only if the target architecture is the default one and is not specified by user
+            // through --arch or runsettings or -- RunConfiguration.TargetPlatform=arch
+            bool forceToX64 = _runsettingHelper.IsDefaultTargetArchitecture && SilentlyForceToX64(sourcePath);
+            EqtTrace.Verbose($"DotnetTestHostmanager: Current process architetcure '{_processHelper.GetCurrentProcessArchitecture()}'");
+            bool isSameArchitecture = IsSameArchitecture(_architecture, _processHelper.GetCurrentProcessArchitecture());
+            var currentProcessPath = _processHelper.GetCurrentProcessFileName()!;
+            bool isRunningWithDotnetMuxer = IsRunningWithDotnetMuxer(currentProcessPath);
+            if (useCustomDotnetHostpath)
+            {
+                startInfo.FileName = _dotnetHostPath;
+            }
 
-                // If already running with the dotnet executable and the architecture is compatible, use it; otherwise search the correct muxer architecture on disk.
-                else if (isRunningWithDotnetMuxer && isSameArchitecture && !forceToX64)
+            // If already running with the dotnet executable and the architecture is compatible, use it; otherwise search the correct muxer architecture on disk.
+            else if (isRunningWithDotnetMuxer && isSameArchitecture && !forceToX64)
+            {
+                EqtTrace.Verbose("DotnetTestHostmanager.LaunchTestHostAsync: Compatible muxer architecture of running process '{0}' and target architecture '{1}'", _processHelper.GetCurrentProcessArchitecture(), _architecture);
+                startInfo.FileName = currentProcessPath;
+            }
+            else
+            {
+                PlatformArchitecture targetArchitecture = TranslateToPlatformArchitecture(_architecture);
+                EqtTrace.Verbose($"DotnetTestHostmanager: Searching muxer for the architecture '{targetArchitecture}', OS '{_platformEnvironment.OperatingSystem}' framework '{_targetFramework}' SDK platform architecture '{_platformEnvironment.Architecture}'");
+                if (forceToX64)
                 {
-                    EqtTrace.Verbose("DotnetTestHostmanager.LaunchTestHostAsync: Compatible muxer architecture of running process '{0}'", this.platformEnvironment.Architecture);
-                    startInfo.FileName = currentProcessPath;
+                    EqtTrace.Verbose($"DotnetTestHostmanager: Forcing the search to x64 architecure, IsDefaultTargetArchitecture '{_runsettingHelper.IsDefaultTargetArchitecture}' OS '{_platformEnvironment.OperatingSystem}' framework '{_targetFramework}'");
                 }
-                else
-                {
-                    PlatformArchitecture targetArchitecture = TranslateToPlatformArchitecture(this.architecture);
-                    EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: Searching muxer for the architecture '{targetArchitecture}', OS '{this.platformEnvironment.OperatingSystem}' framework '{this.targetFramework}' SDK platform architecture '{this.platformEnvironment.Architecture}'");
-                    if (forceToX64)
-                    {
-                        EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: Forcing the search to x64 architecure, IsDefaultTargetArchitecture '{this.runsettingHelper.IsDefaultTargetArchitecture}' OS '{this.platformEnvironment.OperatingSystem}' framework '{this.targetFramework}'");
-                    }
 
-                    PlatformArchitecture finalTargetArchitecture = forceToX64 ? PlatformArchitecture.X64 : targetArchitecture;
-                    if (!this.dotnetHostHelper.TryGetDotnetPathByArchitecture(finalTargetArchitecture, out string muxerPath))
-                    {
-                        string message = string.Format(Resources.NoDotnetMuxerFoundForArchitecture, $"dotnet{(this.platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows ? ".exe" : string.Empty)}", finalTargetArchitecture.ToString());
-                        EqtTrace.Error(message);
-                        throw new TestPlatformException(message);
-                    }
+                // Check if DOTNET_ROOT resolution should be bypassed.
+                var shouldIgnoreDotnetRoot = (_environmentVariableHelper.GetEnvironmentVariable("VSTEST_IGNORE_DOTNET_ROOT")?.Trim() ?? "0") != "0";
+                var muxerResolutionStrategy = shouldIgnoreDotnetRoot
+                        ? (DotnetMuxerResolutionStrategy.GlobalInstallationLocation | DotnetMuxerResolutionStrategy.DefaultInstallationLocation)
+                        : DotnetMuxerResolutionStrategy.Default;
 
-                    startInfo.FileName = muxerPath;
+                PlatformArchitecture finalTargetArchitecture = forceToX64 ? PlatformArchitecture.X64 : targetArchitecture;
+                if (!_dotnetHostHelper.TryGetDotnetPathByArchitecture(finalTargetArchitecture, muxerResolutionStrategy, out string? muxerPath))
+                {
+                    string message = string.Format(CultureInfo.CurrentCulture, Resources.NoDotnetMuxerFoundForArchitecture, $"dotnet{(_platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows ? ".exe" : string.Empty)}", finalTargetArchitecture.ToString());
+                    EqtTrace.Error(message);
+                    throw new TestPlatformException(message);
                 }
 
-                EqtTrace.Verbose("DotnetTestHostmanager.LaunchTestHostAsync: Full path of testhost.dll is {0}", testHostPath);
-                args = "exec" + args;
-                args += " " + testHostPath.AddDoubleQuote();
+                startInfo.FileName = muxerPath;
             }
 
-            EqtTrace.Verbose("DotnetTestHostmanager: Full path of host exe is {0}", startInfo.FileName);
-
-            args += " " + connectionInfo.ToCommandLineOptions();
+            EqtTrace.Verbose("DotnetTestHostmanager: Full path of testhost.dll is {0}", testHostPath);
+            args = "exec" + args;
+            args += " " + testHostPath.AddDoubleQuote();
+        }
 
-            // Create a additional probing path args with Nuget.Client
-            // args += "--additionalprobingpath xxx"
-            // TODO this may be required in ASP.net, requires validation
+        EqtTrace.Verbose("DotnetTestHostmanager: Full path of host exe is {0}", startInfo.FileName);
 
-            // Sample command line for the spawned test host
-            // "D:\dd\gh\Microsoft\vstest\tools\dotnet\dotnet.exe" exec
-            // --runtimeconfig G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.runtimeconfig.json
-            // --depsfile G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.deps.json
-            // --additionalprobingpath C:\Users\username\.nuget\packages\
-            // G:\nuget-package-path\microsoft.testplatform.testhost\version\**\testhost.dll
-            // G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.dll
-            startInfo.Arguments = args;
-            startInfo.EnvironmentVariables = environmentVariables ?? new Dictionary<string, string>();
+        // Attempt to upgrade netcoreapp2.1 and earlier versions of testhost to netcoreapp3.1 or a newer runtime,
+        // assuming that the user does not have that old runtime installed.
+        if (_targetFramework.Name.StartsWith(".NETCoreApp,", StringComparison.OrdinalIgnoreCase)
+            && Version.TryParse(_targetFramework.Version, out var version)
+            && version < new Version(3, 0))
+        {
+            args += " --roll-forward Major";
+        }
 
-            // If we're running using custom apphost we need to set DOTNET_ROOT/DOTNET_ROOT(x86)
-            // We're setting it inside SDK to support private install scenario.
-            // i.e. I've got only private install and no global installation, in this case apphost needs to use env var to locate runtime.
-            if (testHostExeFound)
+        args += " " + connectionInfo.ToCommandLineOptions();
+
+        // Create a additional probing path args with Nuget.Client
+        // args += "--additionalprobingpath xxx"
+        // TODO this may be required in ASP.net, requires validation
+
+        // Sample command line for the spawned test host
+        // "D:\dd\gh\Microsoft\vstest\tools\dotnet\dotnet.exe" exec
+        // --runtimeconfig G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.runtimeconfig.json
+        // --depsfile G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.deps.json
+        // --additionalprobingpath C:\Users\username\.nuget\packages\
+        // G:\nuget-package-path\microsoft.testplatform.testhost\version\**\testhost.dll
+        // G:\tmp\netcore-test\bin\Debug\netcoreapp1.0\netcore-test.dll
+        startInfo.Arguments = args;
+
+        // If we're running using custom apphost we need to set DOTNET_ROOT/DOTNET_ROOT(x86)
+        // We're setting it inside SDK to support private install scenario.
+        // i.e. I've got only private install and no global installation, in this case apphost needs to use env var to locate runtime.
+        if (testHostExeFound)
+        {
+            if (!StringUtilities.IsNullOrWhiteSpace(dotnetRootPath))
             {
-                string prefix = "VSTEST_WINAPPHOST_";
-                string dotnetRootEnvName = $"{prefix}DOTNET_ROOT(x86)";
-                var dotnetRoot = this.environmentVariableHelper.GetEnvironmentVariable(dotnetRootEnvName);
-                if (dotnetRoot is null)
+                // The parent process is passing to us the path in which the dotnet.exe is and is passing the architecture of the dotnet.exe,
+                // so if the child process (testhost) is the same architecture it can pick up that dotnet.exe location and run. This is to allow
+                // local installations of dotnet/sdk to work with testhost.
+                //
+                // There are 2 complications in this process:
+                // 1) There are differences between how .NET Apphosts are handling DOTNET_ROOT, versions pre-net6 are only looking at
+                //    DOTNET_ROOT(x86) and then DOTNET_ROOT. This makes is really easy to set DOTNET_ROOT to point at x64 dotnet installation
+                //    and have that picked up by x86 testhost and fail.
+                //    Unfortunately vstest.console has to support both new (17.14+) testhosts that are built against net8, and old (pre 17.14)
+                //    testhosts that are built using netcoreapp3.1 apphost, and so their approach to resolving DOTNET_ROOT differ.
+                //
+                //    /!\ The apphost version does not align with the targeted framework (tfm), an older testhost is built against netcoreapp3.1
+                //        but can be used to run net8 tests. The only way to tell is the version of the testhost.
+                //
+                //    netcoreapp3.1 hosts only support DOTNET_ROOT and DOTNET_ROOT(x86) env variables.
+                //    net8          hosts, support also DOTNET_ROOT_<ARCH> variables, which is what we should prefer to set the location of dotnet
+                //                  in a more architecture specific way.
+                //
+                // 2) The surrounding environment might already have the environment variables set, most likely by setting DOTNET_ROOT, which is
+                //    a universal way of setting where the dotnet is, that works across all different architectures of the .NET apphost.
+                //    By setting our (hopefully more specific variable) we might overwrite what user specified, and in case of DOTNET_ROOT it is probably
+                //    preferable when we can set the DOTNET_ROOT_<ARCH> variable.
+                var testhostDllPath = Path.ChangeExtension(startInfo.FileName, ".dll");
+                // This file check is for unit tests, we expect the file to always be there. Otherwise testhost.exe would not be able to run.
+                var testhostVersionInfo = _fileHelper.Exists(testhostDllPath) ? FileVersionInfo.GetVersionInfo(testhostDllPath) : null;
+                if (testhostVersionInfo != null && testhostVersionInfo.ProductMajorPart >= 17 && testhostVersionInfo.ProductMinorPart >= 14)
                 {
-                    dotnetRootEnvName = $"{prefix}DOTNET_ROOT";
-                    dotnetRoot = this.environmentVariableHelper.GetEnvironmentVariable(dotnetRootEnvName);
-                }
-
-                if (dotnetRoot != null)
-                {
-                    EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: Found '{dotnetRootEnvName}' in env variables, value '{dotnetRoot}'");
-                    startInfo.EnvironmentVariables.Add(dotnetRootEnvName.Replace(prefix, string.Empty), dotnetRoot);
+                    // This is a new testhost that builds at least against net8 we should set the architecture specific DOTNET_ROOT_<ARCH>.
+                    //
+                    // We ship just testhost.exe and testhost.x86.exe if the architecture is different we won't find the testhost*.exe and
+                    // won't reach this code, but let's write this in a generic way anyway, to avoid breaking if we add more variants of testhost*.exe.
+                    //
+                    // If the feature flag is set, revert to previous behavior of setting DOTNET_ROOT_<ARCH> only on Windows after we found testhost.exe.
+                    if (FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_DOTNET_ROOT_ON_NONWINDOWS))
+                    {
+                        SetDotnetRootForArchitecture(startInfo, dotnetRootPath!, dotnetRootArchitecture!);
+                    }
                 }
                 else
                 {
-                    EqtTrace.Verbose($"DotnetTestHostmanager.LaunchTestHostAsync: Prefix '{prefix}*' not found in env variables");
-                }
-            }
-
-            startInfo.WorkingDirectory = sourceDirectory;
-
-            return startInfo;
-
-            bool IsRunningWithDotnetMuxer(string currentProcessPath)
-                => currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) ||
-                   currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase);
-
-            bool IsWinOnArm()
-            {
-                bool isWinOnArm = false;
-                if (this.platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows)
-                {
-                    using (IRegistryKey hklm = this.windowsRegistryHelper.OpenBaseKey(RegistryHive.LocalMachine, Environment.Is64BitProcess ? RegistryView.Registry64 : RegistryView.Registry32))
+                    // This is an old testhost that built against netcoreapp3.1, it does not understand architecture specific DOTNET_ROOT_<ARCH>, we have to set it more carefully
+                    // to avoid setting DOTNET_ROOT that points to x64 but is picked up by x86 host.
+                    //
+                    // Also avoid setting it if we are already getting it from the surrounding environment.
+                    var architectureFromEnv = (Architecture)Enum.Parse(typeof(Architecture), dotnetRootArchitecture!, ignoreCase: true);
+                    if (architectureFromEnv == _architecture)
                     {
-                        if (hklm != null)
+                        if (_architecture == Architecture.X86)
                         {
-                            using (IRegistryKey environment = hklm.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"))
+                            const string dotnetRootX86 = "DOTNET_ROOT(x86)";
+                            if (StringUtils.IsNullOrWhiteSpace(_environmentVariableHelper.GetEnvironmentVariable(dotnetRootX86)))
                             {
-                                if (environment != null)
-                                {
-                                    var processorArchitecture = environment.GetValue("PROCESSOR_ARCHITECTURE");
-                                    if (processorArchitecture != null)
-                                    {
-                                        EqtTrace.Verbose($"DotnetTestHostmanager.IsWinOnArm: Current PROCESSOR_ARCHITECTURE from registry '{processorArchitecture}'");
-                                        isWinOnArm = processorArchitecture.ToString().ToLowerInvariant().Contains("arm");
-                                    }
-                                }
+                                startInfo.EnvironmentVariables.Add(dotnetRootX86, dotnetRootPath);
+                            }
+                        }
+                        else
+                        {
+                            const string dotnetRoot = "DOTNET_ROOT";
+                            if (StringUtils.IsNullOrWhiteSpace(_environmentVariableHelper.GetEnvironmentVariable(dotnetRoot)))
+                            {
+                                startInfo.EnvironmentVariables.Add(dotnetRoot, dotnetRootPath);
                             }
                         }
                     }
                 }
-
-                EqtTrace.Verbose($"DotnetTestHostmanager.IsWinOnArm: Is Windows on ARM '{isWinOnArm}'");
-                return isWinOnArm;
             }
+        }
 
-            PlatformArchitecture TranslateToPlatformArchitecture(Architecture targetArchitecture)
-            {
-                switch (targetArchitecture)
-                {
-                    case Architecture.X86:
-                        return PlatformArchitecture.X86;
-                    case Architecture.X64:
-                        return PlatformArchitecture.X64;
-                    case Architecture.ARM:
-                        return PlatformArchitecture.ARM;
-                    case Architecture.ARM64:
-                        return PlatformArchitecture.ARM64;
-                    case Architecture.AnyCPU:
-                    case Architecture.Default:
-                    default:
-                        break;
-                }
+        startInfo.WorkingDirectory = sourceDirectory;
 
-                throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'");
-            }
+        return startInfo;
 
-            bool IsSameArchitecture(Architecture targetArchitecture, PlatformArchitecture platformAchitecture)
-            {
-                switch (targetArchitecture)
-                {
-                    case Architecture.X86:
-                        return platformAchitecture == PlatformArchitecture.X86;
-                    case Architecture.X64:
-                        return platformAchitecture == PlatformArchitecture.X64;
-                    case Architecture.ARM:
-                        return platformAchitecture == PlatformArchitecture.ARM;
-                    case Architecture.ARM64:
-                        return platformAchitecture == PlatformArchitecture.ARM64;
-                    case Architecture.AnyCPU:
-                    case Architecture.Default:
-                    default:
-                        throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'");
-                }
-            }
+        bool IsRunningWithDotnetMuxer(string currentProcessPath)
+            => currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) ||
+               currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase);
 
-            bool SilentlyForceToX64()
+        bool IsWinOnArm()
+        {
+            bool isWinOnArm = false;
+            if (_platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows)
             {
-                // We need to force x64 in some scenario
-                // https://github.com/dotnet/sdk/blob/main/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets#L140-L143
-
-                // If we are running on an M1 with a native SDK and the TFM is < 6.0, we have to use a x64 apphost since there are no osx-arm64 apphosts previous to .NET 6.0.
-                if (this.platformEnvironment.OperatingSystem == PlatformOperatingSystem.OSX &&
-                    this.platformEnvironment.Architecture == PlatformArchitecture.ARM64 &&
-                    new Version(this.targetFramework.Version).Major < 6)
-                {
-                    return true;
-                }
-
-                // If we are running on win-arm64 and the TFM is < 5.0, we have to use a x64 apphost since there are no win-arm64 apphosts previous to .NET 5.0.
-                if (this.platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows &&
-                    this.platformEnvironment.Architecture == PlatformArchitecture.ARM64 &&
-                    new Version(this.targetFramework.Version).Major < 5)
+                string? processorArchitecture = Environment.GetEnvironmentVariable(PROCESSOR_ARCHITECTURE, EnvironmentVariableTarget.Machine);
+                if (processorArchitecture is not null)
                 {
-                    return true;
+                    EqtTrace.Verbose($"DotnetTestHostmanager.IsWinOnArm: Current PROCESSOR_ARCHITECTURE from environment variable '{processorArchitecture}'");
+                    isWinOnArm = processorArchitecture.ToString().ToLowerInvariant().Contains("arm");
                 }
-
-                return false;
             }
+
+            EqtTrace.Verbose($"DotnetTestHostmanager.IsWinOnArm: Is Windows on ARM '{isWinOnArm}'");
+            return isWinOnArm;
         }
 
-        /// <inheritdoc/>
-        public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+        PlatformArchitecture TranslateToPlatformArchitecture(Architecture targetArchitecture)
         {
-            List<string> extensionPaths = new List<string>();
-            var sourceDirectory = Path.GetDirectoryName(sources.Single());
-
-            if (!string.IsNullOrEmpty(sourceDirectory) && this.fileHelper.DirectoryExists(sourceDirectory))
+            switch (targetArchitecture)
             {
-                extensionPaths.AddRange(this.fileHelper.EnumerateFiles(sourceDirectory, SearchOption.TopDirectoryOnly, TestAdapterRegexPattern));
+                case Architecture.X86:
+                    return PlatformArchitecture.X86;
+                case Architecture.X64:
+                    return PlatformArchitecture.X64;
+                case Architecture.ARM:
+                    return PlatformArchitecture.ARM;
+                case Architecture.ARM64:
+                    return PlatformArchitecture.ARM64;
+                case Architecture.S390x:
+                    return PlatformArchitecture.S390x;
+                case Architecture.Ppc64le:
+                    return PlatformArchitecture.Ppc64le;
+                case Architecture.RiscV64:
+                    return PlatformArchitecture.RiscV64;
+                case Architecture.AnyCPU:
+                case Architecture.Default:
+                default:
+                    break;
             }
 
-            return extensionPaths;
+            throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'");
         }
 
-        /// <inheritdoc/>
-        public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+        static bool IsSameArchitecture(Architecture targetArchitecture, PlatformArchitecture platformAchitecture)
+            => targetArchitecture switch
+            {
+                Architecture.X86 => platformAchitecture == PlatformArchitecture.X86,
+                Architecture.X64 => platformAchitecture == PlatformArchitecture.X64,
+                Architecture.ARM => platformAchitecture == PlatformArchitecture.ARM,
+                Architecture.ARM64 => platformAchitecture == PlatformArchitecture.ARM64,
+                Architecture.S390x => platformAchitecture == PlatformArchitecture.S390x,
+                Architecture.Ppc64le => platformAchitecture == PlatformArchitecture.Ppc64le,
+                Architecture.RiscV64 => platformAchitecture == PlatformArchitecture.RiscV64,
+                _ => throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'"),
+            };
+
+        bool SilentlyForceToX64(string sourcePath)
         {
-            // We do not have scenario where netcore tests are deployed to remote machine, so no need to update sources
-            return sources;
+            // We need to force x64 in some scenario
+            // https://github.com/dotnet/sdk/blob/main/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets#L140-L143
+
+            // If we are running on an M1 with a native SDK and the TFM is < 6.0, we have to use a x64 apphost since there are no osx-arm64 apphosts previous to .NET 6.0.
+            if (_platformEnvironment.OperatingSystem == PlatformOperatingSystem.OSX &&
+                _platformEnvironment.Architecture == PlatformArchitecture.ARM64 &&
+                new Version(_targetFramework.Version).Major < 6)
+            {
+                return true;
+            }
+
+            // If we are running on win-arm64 and the TFM is < 5.0, we have to use a x64 apphost since there are no win-arm64 apphosts previous to .NET 5.0.
+            return _platformEnvironment.OperatingSystem == PlatformOperatingSystem.Windows &&
+                   _platformEnvironment.Architecture == PlatformArchitecture.ARM64 &&
+                   new Version(_targetFramework.Version).Major < 5 &&
+                   !IsNativeModule(sourcePath);
         }
 
-        /// <inheritdoc/>
-        public bool CanExecuteCurrentRunConfiguration(string runsettingsXml)
+        bool IsNativeModule(string modulePath)
         {
-            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-            var framework = config.TargetFramework;
-
-            // This is expected to be called once every run so returning a new instance every time.
-            if (framework.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
-                || framework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
-                || framework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0)
+            // Scenario: dotnet test nativeArm64.dll for CppUnitTestFramework
+            // If the dll is native and we're not running in process(vstest.console.exe)
+            // the expected target framework is ".NETCoreApp,Version=v1.0".
+            // In this case we don't want to force x64 architecture
+            using var assemblyStream = _fileHelper.GetStream(sourcePath, FileMode.Open, FileAccess.Read);
+            using var peReader = new PEReader(assemblyStream);
+            if (!peReader.HasMetadata || (peReader.PEHeaders.CorHeader?.Flags & CorFlags.ILOnly) == 0)
             {
+                EqtTrace.Verbose($"DotnetTestHostmanager.IsNativeModule: Source '{sourcePath}' is native.");
                 return true;
             }
 
             return false;
         }
+    }
+
+    private void SetDotnetRootForArchitecture(TestProcessStartInfo startInfo, string dotnetRootPath, string dotnetRootArchitecture)
+    {
+        var environmentVariableName = $"DOTNET_ROOT_{dotnetRootArchitecture.ToUpperInvariant()}";
 
-        /// <inheritdoc/>
-        public Task CleanTestHostAsync(CancellationToken cancellationToken)
+        var existingDotnetRoot = _environmentVariableHelper.GetEnvironmentVariable(environmentVariableName);
+        if (!StringUtilities.IsNullOrWhiteSpace(existingDotnetRoot))
         {
-            try
-            {
-                this.processHelper.TerminateProcess(this.testHostProcess);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Warning("DotnetTestHostManager: Unable to terminate test host process: " + ex);
-            }
+            EqtTrace.Verbose($"DotnetTestHostManager.SetDotnetRootForArchitecture: The variable {environmentVariableName} is already set in the surrounding environment, don't add it to testhost start info, because we want to keep what user provided externally.");
+        }
+        else
+        {
+            startInfo.EnvironmentVariables ??= new Dictionary<string, string?>();
 
-            this.testHostProcess?.Dispose();
+            // Set the architecture specific variable to the environment of the process so it is picked up.
+            startInfo.EnvironmentVariables.Add(environmentVariableName, dotnetRootPath);
 
-            return Task.FromResult(true);
+            EqtTrace.Verbose($"DotnetTestHostManager.SetDotnetRootForArchitecture: Adding {environmentVariableName}={dotnetRootPath} to testhost start info.");
         }
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+    {
+        List<string> extensionPaths = new();
+        var sourceDirectory = Path.GetDirectoryName(sources.Single());
 
-        /// <inheritdoc />
-        public bool AttachDebuggerToTestHost()
+        if (!sourceDirectory.IsNullOrEmpty() && _fileHelper.DirectoryExists(sourceDirectory))
         {
-            return this.customTestHostLauncher is ITestHostLauncher2 launcher
-            && launcher.AttachDebuggerToProcess(this.testHostProcess.Id);
+            extensionPaths.AddRange(_fileHelper.EnumerateFiles(sourceDirectory, SearchOption.TopDirectoryOnly, TestAdapterRegexPattern));
         }
 
-        /// <summary>
-        /// Raises HostLaunched event
-        /// </summary>
-        /// <param name="e">host provider event args</param>
-        private void OnHostLaunched(HostProviderEventArgs e)
+        return extensionPaths;
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+    {
+        // We do not have scenario where netcore tests are deployed to remote machine, so no need to update sources
+        return sources;
+    }
+
+    /// <inheritdoc/>
+    public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+    {
+        var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+        var framework = config.TargetFramework;
+
+        return framework!.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
+               || framework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0;
+    }
+
+    /// <inheritdoc/>
+    public Task CleanTestHostAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            _processHelper.TerminateProcess(_testHostProcess);
+        }
+        catch (Exception ex)
         {
-            this.HostLaunched.SafeInvoke(this, e, "HostProviderEvents.OnHostLaunched");
+            EqtTrace.Warning("DotnetTestHostManager: Unable to terminate test host process: " + ex);
         }
 
-        /// <summary>
-        /// Raises HostExited event
-        /// </summary>
-        /// <param name="e">host provider event args</param>
-        private void OnHostExited(HostProviderEventArgs e)
+        _testHostProcess?.Dispose();
+
+        return Task.FromResult(true);
+    }
+
+    /// <inheritdoc />
+    public bool AttachDebuggerToTestHost()
+    {
+        TPDebug.Assert(_targetFramework is not null && _testHostProcess is not null, "DotnetTestHostManager: TargetFramework is null");
+        return _customTestHostLauncher switch
         {
-            if (!this.hostExitedEventRaised)
-            {
-                this.hostExitedEventRaised = true;
-                EqtTrace.Verbose("DotnetTestHostManager.OnHostExited: invoking OnHostExited callback");
-                this.HostExited.SafeInvoke(this, e, "HostProviderEvents.OnHostExited");
-            }
-            else
-            {
-                EqtTrace.Verbose("DotnetTestHostManager.OnHostExited: exit event was already raised, skipping");
-            }
+            ITestHostLauncher3 launcher3 => launcher3.AttachDebuggerToProcess(new AttachDebuggerInfo { ProcessId = _testHostProcess.Id, TargetFramework = _targetFramework.ToString() }, CancellationToken.None),
+            ITestHostLauncher2 launcher2 => launcher2.AttachDebuggerToProcess(_testHostProcess.Id),
+            _ => false,
+        };
+    }
+
+    /// <summary>
+    /// Raises HostLaunched event
+    /// </summary>
+    /// <param name="e">host provider event args</param>
+    private void OnHostLaunched(HostProviderEventArgs e)
+    {
+        HostLaunched?.SafeInvoke(this, e, "HostProviderEvents.OnHostLaunched");
+    }
+
+    /// <summary>
+    /// Raises HostExited event
+    /// </summary>
+    /// <param name="e">host provider event args</param>
+    private void OnHostExited(HostProviderEventArgs e)
+    {
+        if (!_hostExitedEventRaised)
+        {
+            _hostExitedEventRaised = true;
+            EqtTrace.Verbose("DotnetTestHostManager.OnHostExited: invoking OnHostExited callback");
+            HostExited?.SafeInvoke(this, e, "HostProviderEvents.OnHostExited");
+        }
+        else
+        {
+            EqtTrace.Verbose("DotnetTestHostManager.OnHostExited: exit event was already raised, skipping");
         }
+    }
 
-        private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    [MemberNotNull(nameof(_testHostProcessStdError))]
+    [MemberNotNullWhen(true, nameof(_testHostProcess))]
+    private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        _testHostProcessStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+        _testHostProcessStdOut = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+
+        // We launch the test host process here if we're on the normal test running workflow.
+        // If we're debugging and we have access to the newest version of the testhost launcher
+        // interface we launch it here as well, but we expect to attach later to the test host
+        // process by using its PID.
+        // For every other workflow (e.g.: profiling) we ask the IDE to launch the custom test
+        // host for us. In the profiling case this is needed because then the IDE sets some
+        // additional environmental variables for us to help with probing.
+        if ((_customTestHostLauncher == null)
+            || (_customTestHostLauncher.IsDebug
+                && _customTestHostLauncher is ITestHostLauncher2))
         {
-            this.testHostProcessStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
-
-            // We launch the test host process here if we're on the normal test running workflow.
-            // If we're debugging and we have access to the newest version of the testhost launcher
-            // interface we launch it here as well, but we expect to attach later to the test host
-            // process by using its PID.
-            // For every other workflow (e.g.: profiling) we ask the IDE to launch the custom test
-            // host for us. In the profiling case this is needed because then the IDE sets some
-            // additional environmental variables for us to help with probing.
-            if ((this.customTestHostLauncher == null)
-                || (this.customTestHostLauncher.IsDebug
-                    && this.customTestHostLauncher is ITestHostLauncher2))
-            {
-                EqtTrace.Verbose("DotnetTestHostManager: Starting process '{0}' with command line '{1}'", testHostStartInfo.FileName, testHostStartInfo.Arguments);
-
-                cancellationToken.ThrowIfCancellationRequested();
-                this.testHostProcess = this.processHelper.LaunchProcess(
-                    testHostStartInfo.FileName,
-                    testHostStartInfo.Arguments,
-                    testHostStartInfo.WorkingDirectory,
-                    testHostStartInfo.EnvironmentVariables,
-                    this.ErrorReceivedCallback,
-                    this.ExitCallBack,
-                    null) as Process;
-            }
-            else
+            if (EqtTrace.IsVerboseEnabled)
             {
-                var processId = this.customTestHostLauncher.LaunchTestHost(testHostStartInfo, cancellationToken);
-                this.testHostProcess = Process.GetProcessById(processId);
-                this.processHelper.SetExitCallback(processId, this.ExitCallBack);
-            }
+                var dotnetEnvVars = testHostStartInfo.EnvironmentVariables?
+                    .Where(kvp => kvp.Key.StartsWith("DOTNET_", StringComparison.OrdinalIgnoreCase))
+                    .Select(kvp => $"{kvp.Key}={kvp.Value}")
+                    .ToArray() ?? Array.Empty<string>();
 
-            this.OnHostLaunched(new HostProviderEventArgs("Test Runtime launched", 0, this.testHostProcess.Id));
+                EqtTrace.Verbose($"DotnetTestHostManager: Starting process '{0}' with command line '{1}' and DOTNET environment: {string.Join(", ", dotnetEnvVars)} ", testHostStartInfo.FileName, testHostStartInfo.Arguments);
+            }
 
-            return this.testHostProcess != null;
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var outputCallback = _captureOutput ? OutputReceivedCallback : null;
+            _testHostProcess = _processHelper.LaunchProcess(
+                testHostStartInfo.FileName!,
+                testHostStartInfo.Arguments,
+                testHostStartInfo.WorkingDirectory,
+                testHostStartInfo.EnvironmentVariables,
+                ErrorReceivedCallback,
+                ExitCallBack,
+                outputCallback) as Process;
+        }
+        else
+        {
+            var processId = _customTestHostLauncher.LaunchTestHost(testHostStartInfo, cancellationToken);
+            _testHostProcess = Process.GetProcessById(processId);
+            _processHelper.SetExitCallback(processId, ExitCallBack);
         }
 
-        private string GetTestHostPath(string runtimeConfigDevPath, string depsFilePath, string sourceDirectory)
+        if (_testHostProcess is null)
         {
-            string testHostPackageName = "microsoft.testplatform.testhost";
-            string testHostPath = null;
+            return false;
+        }
 
-            if (this.fileHelper.Exists(depsFilePath))
+        DefaultTestHostManager.AdjustProcessPriorityBasedOnSettings(_testHostProcess, testHostStartInfo.EnvironmentVariables);
+        OnHostLaunched(new HostProviderEventArgs("Test Runtime launched", 0, _testHostProcess.Id));
+        return true;
+    }
+
+    private string GetTestHostPath(string runtimeConfigDevPath, string depsFilePath, string sourceDirectory)
+    {
+        string testHostPackageName = "microsoft.testplatform.testhost";
+        // This must be empty string, otherwise the Path.Combine below
+        // will fail if a very specific setup is used where you add our dlls
+        // as assemblies directly, but you have no RuntimeAssemblyGroups in deps.json
+        // because you don't add our nuget package. In such case we just want to move on
+        // to the next fallback.
+        string testHostPath = string.Empty;
+
+        if (_fileHelper.Exists(depsFilePath))
+        {
+            if (_fileHelper.Exists(runtimeConfigDevPath))
             {
-                if (this.fileHelper.Exists(runtimeConfigDevPath))
+                EqtTrace.Verbose("DotnetTestHostmanager: Reading file {0} to get path of testhost.dll", depsFilePath);
+
+                // Get testhost relative path
+                using (var stream = _fileHelper.GetStream(depsFilePath, FileMode.Open, FileAccess.Read))
                 {
-                    EqtTrace.Verbose("DotnetTestHostmanager: Reading file {0} to get path of testhost.dll", depsFilePath);
+                    var context = new DependencyContextJsonReader().Read(stream);
+                    var testhostPackage = context.RuntimeLibraries.FirstOrDefault(lib => lib.Name.Equals(testHostPackageName, StringComparison.OrdinalIgnoreCase));
 
-                    // Get testhost relative path
-                    using (var stream = this.fileHelper.GetStream(depsFilePath, FileMode.Open, FileAccess.Read))
+                    if (testhostPackage != null)
                     {
-                        var context = new DependencyContextJsonReader().Read(stream);
-                        var testhostPackage = context.RuntimeLibraries.FirstOrDefault(lib => lib.Name.Equals(testHostPackageName, StringComparison.OrdinalIgnoreCase));
-
-                        if (testhostPackage != null)
+                        foreach (var runtimeAssemblyGroup in testhostPackage.RuntimeAssemblyGroups)
                         {
-                            foreach (var runtimeAssemblyGroup in testhostPackage.RuntimeAssemblyGroups)
+                            foreach (var path in runtimeAssemblyGroup.AssetPaths)
                             {
-                                foreach (var path in runtimeAssemblyGroup.AssetPaths)
+                                if (path.EndsWith("testhost.dll", StringComparison.OrdinalIgnoreCase))
                                 {
-                                    if (path.EndsWith("testhost.dll", StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        testHostPath = path;
-                                        break;
-                                    }
+                                    testHostPath = path;
+                                    break;
                                 }
                             }
+                        }
 
+                        if (testhostPackage.Path is not null)
+                        {
                             testHostPath = Path.Combine(testhostPackage.Path, testHostPath);
-                            this.hostPackageVersion = testhostPackage.Version;
-                            this.IsVersionCheckRequired = !this.hostPackageVersion.StartsWith("15.0.0");
-                            EqtTrace.Verbose("DotnetTestHostmanager: Relative path of testhost.dll with respect to package folder is {0}", testHostPath);
                         }
+                        _hostPackageVersion = testhostPackage.Version;
+                        IsVersionCheckRequired = !_hostPackageVersion.StartsWith("15.0.0");
+                        EqtTrace.Verbose("DotnetTestHostmanager: Relative path of testhost.dll with respect to package folder is {0}", testHostPath);
                     }
+                }
 
-                    // Get probing path
-                    using (StreamReader file = new StreamReader(this.fileHelper.GetStream(runtimeConfigDevPath, FileMode.Open, FileAccess.Read)))
-                    using (JsonTextReader reader = new JsonTextReader(file))
+                // Get probing path
+                using (StreamReader file = new(_fileHelper.GetStream(runtimeConfigDevPath, FileMode.Open, FileAccess.Read)))
+                using (JsonTextReader reader = new(file))
+                {
+                    JObject context = (JObject)JToken.ReadFrom(reader);
+                    JObject runtimeOptions = (JObject)context.GetValue("runtimeOptions")!;
+                    JToken additionalProbingPaths = runtimeOptions.GetValue("additionalProbingPaths")!;
+                    foreach (var x in additionalProbingPaths)
                     {
-                        JObject context = (JObject)JToken.ReadFrom(reader);
-                        JObject runtimeOptions = (JObject)context.GetValue("runtimeOptions");
-                        JToken additionalProbingPaths = runtimeOptions.GetValue("additionalProbingPaths");
-                        foreach (var x in additionalProbingPaths)
+                        EqtTrace.Verbose("DotnetTestHostmanager: Looking for path {0} in folder {1}", testHostPath, x.ToString());
+                        string testHostFullPath;
+                        try
                         {
-                            EqtTrace.Verbose("DotnetTestHostmanager: Looking for path {0} in folder {1}", testHostPath, x.ToString());
-                            string testHostFullPath;
-                            try
-                            {
-                                testHostFullPath = Path.Combine(x.ToString(), testHostPath);
-                            }
-                            catch (ArgumentException)
-                            {
-                                // https://github.com/Microsoft/vstest/issues/847
-                                // skip any invalid paths and continue checking the others
-                                continue;
-                            }
+                            testHostFullPath = Path.Combine(x.ToString(), testHostPath);
+                        }
+                        catch (ArgumentException)
+                        {
+                            // https://github.com/Microsoft/vstest/issues/847
+                            // skip any invalid paths and continue checking the others
+                            continue;
+                        }
 
-                            if (this.fileHelper.Exists(testHostFullPath))
-                            {
-                                EqtTrace.Verbose("DotnetTestHostmanager: Found testhost.dll in {0}", testHostFullPath);
-                                return testHostFullPath;
-                            }
+                        if (_fileHelper.Exists(testHostFullPath))
+                        {
+                            EqtTrace.Verbose("DotnetTestHostmanager: Found testhost.dll in {0}", testHostFullPath);
+                            return testHostFullPath;
                         }
                     }
                 }
-                else
-                {
-                    EqtTrace.Verbose("DotnetTestHostmanager: Runtimeconfig.dev.json {0} does not exist.", runtimeConfigDevPath);
-                }
             }
             else
             {
-                EqtTrace.Verbose("DotnetTestHostmanager: Deps file {0} does not exist.", depsFilePath);
-            }
-
-            // If we are here it means it couldn't resolve testhost.dll from nuget cache.
-            // Try resolving testhost from output directory of test project. This is required if user has published the test project
-            // and is running tests in an isolated machine. A second scenario is self test: test platform unit tests take a project
-            // dependency on testhost (instead of nuget dependency), this drops testhost to output path.
-            var testHostNextToTestProject = Path.Combine(sourceDirectory, "testhost.dll");
-            if (this.fileHelper.Exists(testHostNextToTestProject))
-            {
-                EqtTrace.Verbose("DotnetTestHostManager: Found testhost.dll in source directory: {0}.", testHostNextToTestProject);
-                return testHostNextToTestProject;
+                EqtTrace.Verbose("DotnetTestHostmanager: Runtimeconfig.dev.json {0} does not exist.", runtimeConfigDevPath);
             }
+        }
+        else
+        {
+            EqtTrace.Verbose("DotnetTestHostmanager: Deps file {0} does not exist.", depsFilePath);
+        }
 
-            return testHostPath;
+        // If we are here it means it couldn't resolve testhost.dll from nuget cache.
+        // Try resolving testhost from output directory of test project. This is required if user has published the test project
+        // and is running tests in an isolated machine. A second scenario is self test: test platform unit tests take a project
+        // dependency on testhost (instead of nuget dependency), this drops testhost to output path.
+        var testHostNextToTestProject = Path.Combine(sourceDirectory, "testhost.dll");
+        if (_fileHelper.Exists(testHostNextToTestProject))
+        {
+            EqtTrace.Verbose("DotnetTestHostManager: Found testhost.dll in source directory: {0}.", testHostNextToTestProject);
+            return testHostNextToTestProject;
         }
+
+        return testHostPath;
     }
 }
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/TestHostManagerCallbacks.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/TestHostManagerCallbacks.cs
index 3edb5873de..645db3c0a2 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/TestHostManagerCallbacks.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/TestHostManagerCallbacks.cs
@@ -1,59 +1,111 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.TestHostProvider.Hosting
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace Microsoft.TestPlatform.TestHostProvider.Hosting;
+
+internal class TestHostManagerCallbacks
 {
-    using System;
-    using System.Diagnostics;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using VisualStudio.TestPlatform.CoreUtilities.Extensions;
-
-    internal class TestHostManagerCallbacks
+    private const int E_HANDLE = unchecked((int)0x80070006);
+    private readonly bool _forwardOutput;
+    private readonly IMessageLogger? _messageLogger;
+
+    public TestHostManagerCallbacks(bool forwardOutput, IMessageLogger? logger)
     {
-        public static void ErrorReceivedCallback(StringBuilder testHostProcessStdError, string data)
+        if (forwardOutput)
+        {
+            string? but = null;
+            if (logger == null)
+            {
+                but = " But logger is null, so it won't forward any output.";
+            }
+            EqtTrace.Verbose($"TestHostManagerCallbacks.ctor: Forwarding output is enabled.{but}");
+        }
+        else
         {
-            // Log all standard error message because on too much data we ignore starting part.
-            // This is helpful in abnormal failure of testhost.
-            EqtTrace.Warning("TestHostManagerCallbacks.ErrorReceivedCallback Test host standard error line: {0}", data);
+            EqtTrace.Verbose($"TestHostManagerCallbacks.ctor: Forwarding output is disabled.");
+        }
+        _forwardOutput = forwardOutput;
+        _messageLogger = logger;
+    }
 
-            testHostProcessStdError.AppendSafeWithNewLine(data);
+    public void StandardOutputReceivedCallback(StringBuilder testHostProcessStdOut, string? data)
+    {
+        EqtTrace.Verbose("TestHostManagerCallbacks.StandardOutputReceivedCallback Test host standard output line: {0}", data);
+        testHostProcessStdOut.AppendSafeWithNewLine(data);
+        if (_forwardOutput && _messageLogger != null && !StringUtils.IsNullOrWhiteSpace(data))
+        {
+            _messageLogger.SendMessage(TestMessageLevel.Informational, data);
         }
+    }
+
+    public void ErrorReceivedCallback(StringBuilder testHostProcessStdError, string? data)
+    {
+        // Log all standard error message because on too much data we ignore starting part.
+        // This is helpful in abnormal failure of testhost.
+        EqtTrace.Warning("TestHostManagerCallbacks.ErrorReceivedCallback Test host standard error line: {0}", data);
 
-        public static void ExitCallBack(
-            IProcessHelper processHelper,
-            object process,
-            StringBuilder testHostProcessStdError,
-            Action<HostProviderEventArgs> onHostExited)
+        testHostProcessStdError.AppendSafeWithNewLine(data);
+        if (_forwardOutput && _messageLogger != null && !StringUtils.IsNullOrWhiteSpace(data))
         {
-            EqtTrace.Verbose("TestHostProvider.ExitCallBack: Host exited starting callback.");
-            var exitCode = 0;
-            var testHostProcessStdErrorStr = testHostProcessStdError.ToString();
+            // Forward the error output, but DO NOT forward it as error. Until now it was only written into logs,
+            // and applications love to write Debug messages into error stream. Which we do not want to fail the test run.
+            _messageLogger.SendMessage(TestMessageLevel.Informational, data);
+        }
+    }
 
-            processHelper.TryGetExitCode(process, out exitCode);
+    public static void ExitCallBack(
+        IProcessHelper processHelper,
+        object? process,
+        StringBuilder testHostProcessStdError,
+        Action<HostProviderEventArgs> onHostExited)
+    {
+        EqtTrace.Verbose("TestHostProvider.ExitCallBack: Host exited starting callback.");
+        var testHostProcessStdErrorStr = testHostProcessStdError.ToString();
 
-            int procId = -1;
-            try
-            {
-                procId = (process as Process).Id;
-            }
-            catch (InvalidOperationException ex)
-            {
-                EqtTrace.Error("TestHostProvider.ExitCallBack: could not get proccess id from process, error: {0}.", ex);
-            }
+        int exitCode;
+        try
+        {
+            processHelper.TryGetExitCode(process, out exitCode);
+        }
+        catch (COMException ex) when (ex.HResult == E_HANDLE)
+        {
+            exitCode = -1;
+            EqtTrace.Error("TestHostProvider.ExitCallBack: Invalid process handle we cannot get the error code, error {0}.", ex);
+        }
 
-            if (exitCode != 0)
-            {
-                EqtTrace.Error("TestHostManagerCallbacks.ExitCallBack: Testhost processId: {0} exited with exitcode: {1} error: '{2}'", procId, exitCode, testHostProcessStdErrorStr);
-            }
-            else
+        int procId = -1;
+        try
+        {
+            if (process is Process p)
             {
-                EqtTrace.Info("TestHostManagerCallbacks.ExitCallBack: Testhost processId: {0} exited with exitcode: 0 error: '{1}'", procId, testHostProcessStdErrorStr);
+                procId = p.Id;
             }
+        }
+        catch (InvalidOperationException ex)
+        {
+            EqtTrace.Error("TestHostProvider.ExitCallBack: could not get proccess id from process, error: {0}.", ex);
+        }
 
-            onHostExited(new HostProviderEventArgs(testHostProcessStdErrorStr, exitCode, procId));
+        if (exitCode != 0)
+        {
+            EqtTrace.Error("TestHostManagerCallbacks.ExitCallBack: Testhost processId: {0} exited with exitcode: {1} error: '{2}'", procId, exitCode, testHostProcessStdErrorStr);
+        }
+        else
+        {
+            EqtTrace.Info("TestHostManagerCallbacks.ExitCallBack: Testhost processId: {0} exited with exitcode: 0 error: '{1}'", procId, testHostProcessStdErrorStr);
         }
+
+        onHostExited(new HostProviderEventArgs(testHostProcessStdErrorStr, exitCode, procId));
     }
 }
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
index 6af482f19c..3bd5ea9246 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestHostRuntimeProvider</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <DefineConstants Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(DefineConstants);DOTNET_BUILD_FROM_SOURCE</DefineConstants>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+    <!--
+      This project is client that is used only by runners, and shipped only in runner packages.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Configuration" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="BannedSymbols.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
@@ -26,14 +27,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" Condition=" '$(DotNetBuildFromSource)' != 'true' " />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -41,6 +43,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
     <None Update="Resources\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -49,5 +55,17 @@
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.TestPlatform.TestHostProvider</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.cs b/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.cs
new file mode 100644
index 0000000000..88f496a309
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.TestHostProvider;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.tt b/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.TestHostProvider/Properties/AssemblyInfo.cs
index d92238b7ba..9ee28e58ff 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Properties/AssemblyInfo.cs
@@ -1,27 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
-using System.Runtime.InteropServices;
-
 using Microsoft.VisualStudio.TestPlatform;
 using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.TestHostRuntimeProvider")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("83693884-04ee-4083-bae1-e7827b8f5fbc")]
-
-[assembly: TestExtensionTypes(typeof(DefaultTestHostManager), typeof(DotnetTestHostManager))]
\ No newline at end of file
+[assembly: TestExtensionTypes(typeof(DefaultTestHostManager), typeof(DotnetTestHostManager))]
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Properties/TestExtensionTypesAttribute.cs b/src/Microsoft.TestPlatform.TestHostProvider/Properties/TestExtensionTypesAttribute.cs
index 4cce7e2fbc..5b493e6cec 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Properties/TestExtensionTypesAttribute.cs
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Properties/TestExtensionTypesAttribute.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform
-{
-    using System;
+using System;
 
-    /// <summary>
-    /// Custom Attribute to specify the exact types which should be loaded from assembly
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
-    internal sealed class TestExtensionTypesAttribute : Attribute
-    {
-        public TestExtensionTypesAttribute(params Type[] types)
-        {
-            this.Types = types;
-        }
+namespace Microsoft.VisualStudio.TestPlatform;
 
-        public Type[] Types { get; }
+/// <summary>
+/// Custom Attribute to specify the exact types which should be loaded from assembly
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+internal sealed class TestExtensionTypesAttribute : Attribute
+{
+    public TestExtensionTypesAttribute(params Type[] types)
+    {
+        Types = types;
     }
-}
\ No newline at end of file
+
+    public Type[] Types { get; }
+}
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..937306c08b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,32 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.AttachDebuggerToTestHost() -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.CanExecuteCurrentRunConfiguration(string? runsettingsXml) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.CleanTestHostAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.DefaultTestHostManager() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.GetTestHostConnectionInfo() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.GetTestPlatformExtensions(System.Collections.Generic.IEnumerable<string!>? sources, System.Collections.Generic.IEnumerable<string!>! extensions) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.GetTestSources(System.Collections.Generic.IEnumerable<string!>! sources) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.HostExited -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.HostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger? logger, string! runsettingsXml) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.LaunchTestHostAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testHostStartInfo, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.Properties.get -> System.Collections.Generic.IDictionary<string!, string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.SetCustomLauncher(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.Shared.get -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.AttachDebuggerToTestHost() -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.CanExecuteCurrentRunConfiguration(string? runsettingsXml) -> bool
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.CleanTestHostAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.DotnetTestHostManager() -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.GetTestHostConnectionInfo() -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestHostConnectionInfo
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.GetTestPlatformExtensions(System.Collections.Generic.IEnumerable<string!>! sources, System.Collections.Generic.IEnumerable<string!>! extensions) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.GetTestSources(System.Collections.Generic.IEnumerable<string!>! sources) -> System.Collections.Generic.IEnumerable<string!>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.HostExited -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.HostLaunched -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.ObjectModel.Host.HostProviderEventArgs!>?
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.Initialize(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger? logger, string! runsettingsXml) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.LaunchTestHostAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo! testHostStartInfo, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.SetCustomLauncher(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.Shared.get -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager.GetTestHostProcessStartInfo(System.Collections.Generic.IEnumerable<string!>! sources, System.Collections.Generic.IDictionary<string!, string?>? environmentVariables, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
+virtual Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager.GetTestHostProcessStartInfo(System.Collections.Generic.IEnumerable<string!>! sources, System.Collections.Generic.IDictionary<string!, string?>? environmentVariables, Microsoft.VisualStudio.TestPlatform.ObjectModel.TestRunnerConnectionInfo connectionInfo) -> Microsoft.VisualStudio.TestPlatform.ObjectModel.TestProcessStartInfo!
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.cs.xlf
index c71b4ca73c..256626d298 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.cs.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Našlo se více verzí stejného rozšíření. Vybere se nejvyšší verze.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">Nejde najít {0}. Ujistěte se, že testovací projekt má odkaz na balíček nuget Microsoft.NET.Test.Sdk.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">Nejde najít {0}. Publikujte prosím svůj testovací projekt a zkuste to znovu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Nepovedlo se najít hostitele {0} pro architekturu {1}.
-
-Problém můžete vyřešit instalací {1} technologie .NET.
-
-Zadaná architektura se dá najít tady:
-  – https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Našlo se více verzí stejného rozšíření. Vybere se nejvyšší verze.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">Nejde najít {0}. Ujistěte se, že testovací projekt má odkaz na balíček nuget Microsoft.NET.Test.Sdk.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">Nejde najít {0}. Publikujte prosím svůj testovací projekt a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Nepovedlo se najít hostitele {0} pro architekturu {1}.
+
+Problém můžete vyřešit instalací {1} technologie .NET.
+
+Zadaná architektura se dá najít tady:
+  – https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.de.xlf
index ae1bd4ef32..2967eba3cd 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.de.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Es wurden mehrere Versionen derselben Erweiterung gefunden. Die höchste Version wird ausgewählt.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">"{0}" wurde nicht gefunden. Stellen Sie sicher, dass das Testprojekt einen NuGet-Verweis des Pakets "Microsoft.NET.Test.Sdk" aufweist.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">"{0}" wurde nicht gefunden. Veröffentlichen Sie Ihr Testprojekt, und versuchen Sie es noch mal.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Der Host "{0}" für die Architektur "{1}" wurde nicht gefunden.
-
-Sie können das Problem beheben, indem Sie .NET "{1}" installieren.
-
-Das angegebene Framework finden Sie unter:
- – https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Es wurden mehrere Versionen derselben Erweiterung gefunden. Die höchste Version wird ausgewählt.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">"{0}" wurde nicht gefunden. Stellen Sie sicher, dass das Testprojekt einen NuGet-Verweis des Pakets "Microsoft.NET.Test.Sdk" aufweist.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">"{0}" wurde nicht gefunden. Veröffentlichen Sie Ihr Testprojekt, und versuchen Sie es noch mal.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Der Host "{0}" für die Architektur "{1}" wurde nicht gefunden.
+
+Sie können das Problem beheben, indem Sie .NET "{1}" installieren.
+
+Das angegebene Framework finden Sie unter:
+ – https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.es.xlf
index 9c570da209..1baa96fce9 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.es.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Se encontraron varias versiones de la misma extensión. Seleccionando la versión más alta.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">No se encuentra {0}. Asegúrese de que el proyecto de prueba tenga una referencia NuGet del paquete "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">No se encuentra {0}. Publique el proyecto de prueba y vuelva a intentarlo.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">No se encontró el host "{0}" para la arquitectura "{1}".
-
-Puede resolver el problema instalando el .NET "{1}".
-
-El marco especificado se puede encontrar en:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Se encontraron varias versiones de la misma extensión. Seleccionando la versión más alta.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">No se encuentra {0}. Asegúrese de que el proyecto de prueba tenga una referencia NuGet del paquete "Microsoft.NET.Test.Sdk".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">No se encuentra {0}. Publique el proyecto de prueba y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">No se encontró el host "{0}" para la arquitectura "{1}".
+
+Puede resolver el problema instalando el .NET "{1}".
+
+El marco especificado se puede encontrar en:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.fr.xlf
index 2aa7d69a31..6bc1c4ece8 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.fr.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Plusieurs versions de la même extension ont été trouvées. Sélection de la version la plus élevée.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">{0} est introuvable. Vérifiez que le projet de test a une référence nuget du package "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">{0} est introuvable. Publiez votre projet de test et réessayez.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Hôte « {0} » introuvable pour l’architecture '{1}'.
-
-Vous pouvez résoudre le problème en installant le fichier .NET '{1}'.
-
-L’infrastructure spécifiée se trouve à l’adresse suivante :
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Plusieurs versions de la même extension ont été trouvées. Sélection de la version la plus élevée.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">{0} est introuvable. Vérifiez que le projet de test a une référence nuget du package "Microsoft.NET.Test.Sdk".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">{0} est introuvable. Publiez votre projet de test et réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Hôte « {0} » introuvable pour l’architecture '{1}'.
+
+Vous pouvez résoudre le problème en installant le fichier .NET '{1}'.
+
+L’infrastructure spécifiée se trouve à l’adresse suivante :
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.it.xlf
index 21a53e33a5..28a9ab558a 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.it.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Sono state trovate più versioni della stessa estensione. Verrà selezionata quella più recente.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">Non è possibile trovare {0}. Assicurarsi che il progetto di test includa un riferimento NuGet del pacchetto "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">Non è possibile trovare {0}. Pubblicare il progetto di test e riprovare.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Non è stato possibile trovare l'{0}' host per l'architettura '{1}'.
-
-Per risolvere il problema, installare il '{1}' .NET.
-
-Il framework specificato è disponibile in:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Sono state trovate più versioni della stessa estensione. Verrà selezionata quella più recente.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">Non è possibile trovare {0}. Assicurarsi che il progetto di test includa un riferimento NuGet del pacchetto "Microsoft.NET.Test.Sdk".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">Non è possibile trovare {0}. Pubblicare il progetto di test e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Non è stato possibile trovare l'{0}' host per l'architettura '{1}'.
+
+Per risolvere il problema, installare il '{1}' .NET.
+
+Il framework specificato è disponibile in:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ja.xlf
index 898db96e44..77a6d4fa7a 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ja.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">同じ拡張子で複数のバージョンが見つかりました。最新のバージョンを選択しています。
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">{0} を見つけることができません。テスト プロジェクトにパッケージ "Microsoft.NET.Test.Sdk" の NuGet 参照があることを確認してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">{0} を見つけることができません。テスト プロジェクトを公開してもう一度お試しください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">'{1}' アーキテクチャの '{0}' ホストが見つかりませんでした。
-
-'{1}' .NET をインストールすると、問題を解決できます。
-
-指定したフレームワークは次の場所にあります:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">同じ拡張子で複数のバージョンが見つかりました。最新のバージョンを選択しています。
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">{0} を見つけることができません。テスト プロジェクトにパッケージ "Microsoft.NET.Test.Sdk" の NuGet 参照があることを確認してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">{0} を見つけることができません。テスト プロジェクトを公開してもう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">'{1}' アーキテクチャの '{0}' ホストが見つかりませんでした。
+
+'{1}' .NET をインストールすると、問題を解決できます。
+
+指定したフレームワークは次の場所にあります:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ko.xlf
index 88a3ed8e65..bc1dea8896 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ko.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">동일한 확장의 여러 버전을 찾았습니다. 가장 높은 버전을 선택합니다.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">{0}을(를) 찾을 수 없습니다. 테스트 프로젝트에 "Microsoft.NET.Test.Sdk" 패키지의 nuget 참조가 포함되어 있는지 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">{0}을(를) 찾을 수 없습니다. 테스트 프로젝트를 게시하고 다시 시도하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">'{1}' 아키텍처에 대한 '{0}' 호스트를 찾을 수 없습니다..
-
-'{1}' .NET을 사용하여 문제를 해결할 수 있습니다.
-
-지정된 프레임워크는 다음에서 찾을 수 있습니다.
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">동일한 확장의 여러 버전을 찾았습니다. 가장 높은 버전을 선택합니다.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">{0}을(를) 찾을 수 없습니다. 테스트 프로젝트에 "Microsoft.NET.Test.Sdk" 패키지의 nuget 참조가 포함되어 있는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">{0}을(를) 찾을 수 없습니다. 테스트 프로젝트를 게시하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">'{1}' 아키텍처에 대한 '{0}' 호스트를 찾을 수 없습니다..
+
+'{1}' .NET을 사용하여 문제를 해결할 수 있습니다.
+
+지정된 프레임워크는 다음에서 찾을 수 있습니다.
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pl.xlf
index 4a49963acf..167d6f7382 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pl.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Znaleziono wiele wersji tego samego rozszerzenia. Wybierana jest najwyższa wersja.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">Nie można znaleźć elementu {0}. Upewnij się, że projekt testowy ma odwołanie nuget do pakietu „Microsoft.NET.Test.Sdk”.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">Nie można znaleźć elementu {0}. Opublikuj swój projekt testowy i spróbuj ponownie.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Nie można odnaleźć hosta „{0}” dla architektury „{1}”.
-
-Problem można rozwiązać, instalując program .NET „{1}”.
-
-Określoną strukturę można znaleźć pod adresem:
- — https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Znaleziono wiele wersji tego samego rozszerzenia. Wybierana jest najwyższa wersja.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">Nie można znaleźć elementu {0}. Upewnij się, że projekt testowy ma odwołanie nuget do pakietu „Microsoft.NET.Test.Sdk”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">Nie można znaleźć elementu {0}. Opublikuj swój projekt testowy i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Nie można odnaleźć hosta „{0}” dla architektury „{1}”.
+
+Problem można rozwiązać, instalując program .NET „{1}”.
+
+Określoną strukturę można znaleźć pod adresem:
+ — https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pt-BR.xlf
index 598c00f230..2c6e6e4e81 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.pt-BR.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Várias versões da mesma extensão foram encontradas. Selecionando a versão mais alta.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">Não foi possível localizar {0}. Certifique-se de que o projeto de teste tem uma referência nuget do pacote "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">Não foi possível localizar {0}. Publique o projeto de teste e tente novamente.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Não foi possível '{0}' o host para a '{1}' configuração.
-
-Você pode resolver o problema instalando o '{1}' .NET.
-
-A estrutura especificada pode ser encontrada em:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Várias versões da mesma extensão foram encontradas. Selecionando a versão mais alta.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">Não foi possível localizar {0}. Certifique-se de que o projeto de teste tem uma referência nuget do pacote "Microsoft.NET.Test.Sdk".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">Não foi possível localizar {0}. Publique o projeto de teste e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Não foi possível '{0}' o host para a '{1}' configuração.
+
+Você pode resolver o problema instalando o '{1}' .NET.
+
+A estrutura especificada pode ser encontrada em:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ru.xlf
index 7e9bd85756..e8b38482c5 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.ru.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Обнаружено несколько версий одного расширения. Выбрана самая поздняя версия.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">Не удается найти {0}. Убедитесь, что в тестовом проекте есть ссылка NuGet на пакет "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">Не удалось найти {0}. Опубликуйте тестовый проект и повторите попытку.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">Не удалось найти узел "{0}" для архитектуры "{1}".
-
-Чтобы устранить проблему, установите .NET "{1}".
-
-Указанную платформу можно найти по адресу:
-  https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Обнаружено несколько версий одного расширения. Выбрана самая поздняя версия.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">Не удается найти {0}. Убедитесь, что в тестовом проекте есть ссылка NuGet на пакет "Microsoft.NET.Test.Sdk".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">Не удалось найти {0}. Опубликуйте тестовый проект и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">Не удалось найти узел "{0}" для архитектуры "{1}".
+
+Чтобы устранить проблему, установите .NET "{1}".
+
+Указанную платформу можно найти по адресу:
+  https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.tr.xlf
index 6c9dbd1837..b66a5a4d50 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.tr.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">Aynı uzantının birden çok sürümü bulundu. En yüksek sürüm seçiliyor.
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">{0} bulunamıyor. Test projesinin "Microsoft.NET.Test.Sdk" paketinde nuget başvurusu olduğundan emin olun.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">{0} bulunamıyor. Lütfen test projenizi yayımlayın ve yeniden deneyin.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">'{1}' mimarisi için '{0}' ana bilgisayarı bulunamadı.
-
-‘{1}’ .NET'i yükleyerek sorunu çözebilirsiniz.
-
-Belirtilen çerçeve şu konumda bulunamadı:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">Aynı uzantının birden çok sürümü bulundu. En yüksek sürüm seçiliyor.
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">{0} bulunamıyor. Test projesinin "Microsoft.NET.Test.Sdk" paketinde nuget başvurusu olduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">{0} bulunamıyor. Lütfen test projenizi yayımlayın ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">'{1}' mimarisi için '{0}' ana bilgisayarı bulunamadı.
+
+‘{1}’ .NET'i yükleyerek sorunu çözebilirsiniz.
+
+Belirtilen çerçeve şu konumda bulunamadı:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf
index 5e5ceea8b4..b3629397aa 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.xlf
@@ -7,17 +7,17 @@
 {0}</source>
         <target state="new">Multiple extensions with different file versions found. Selected extensions with version:
 {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnableToFindDepsFile">
         <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
         <target state="new">Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SuggestPublishTestProject">
         <source>Unable to find {0}. Please publish your test project and retry.</source>
         <target state="new">Unable to find {0}. Please publish your test project and retry.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoDotnetMuxerFoundForArchitecture">
         <source>Could not find '{0}' host for the '{1}' architecture.
@@ -32,4 +32,4 @@ The specified framework can be found at:
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hans.xlf
index 7b1164395a..29ea7524b7 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">找到多个具有相同扩展的版本。请选择最高版本。
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">无法找到 {0}。确保测试项目具有包 "Microsoft.NET.Test.Sdk" 的 nuget 引用。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">无法找到 {0}。请发布测试项目并重试。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">找不到“{1}”体系结构的“{0}”主机。
-
-你可以通过安装“{1}”.NET 来解决该问题。
-
-可以在以下位置找到指定的框架:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">找到多个具有相同扩展的版本。请选择最高版本。
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">无法找到 {0}。确保测试项目具有包 "Microsoft.NET.Test.Sdk" 的 nuget 引用。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">无法找到 {0}。请发布测试项目并重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">找不到“{1}”体系结构的“{0}”主机。
+
+你可以通过安装“{1}”.NET 来解决该问题。
+
+可以在以下位置找到指定的框架:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hant.xlf
index 1ef1fc0dd8..9f370fae8a 100644
--- a/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.TestHostProvider/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="MultipleFileVersions">
-        <source>Multiple versions of same extension found. Selecting the highest version.
-{0}</source>
-        <target state="translated">找到相同延伸模組的多個版本。系統會選取最高版本。
-{0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnableToFindDepsFile">
-        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
-        <target state="translated">找不到 {0}。請確認測試專案有 "Microsoft.NET.Test.Sdk "套件的 nuget 參考。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestPublishTestProject">
-        <source>Unable to find {0}. Please publish your test project and retry.</source>
-        <target state="translated">找不到 {0}。請發佈您的測試專案並重試。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
-        <source>Could not find '{0}' host for the '{1}' architecture.
-
-You can resolve the problem by installing the '{1}' .NET.
-
-The specified framework can be found at:
-  - https://aka.ms/dotnet-download
-</source>
-        <target state="translated">找不到 '{1}' 架構的 '{0}' 主機。
-
-您可以安裝 '{1}' .NET 來解決問題。
-
-指定的架構可在下列位置找到:
-  - https://aka.ms/dotnet-download
-</target>
-        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="MultipleFileVersions">
+        <source>Multiple versions of same extension found. Selecting the highest version.
+{0}</source>
+        <target state="translated">找到相同延伸模組的多個版本。系統會選取最高版本。
+{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnableToFindDepsFile">
+        <source>Unable to find {0}. Make sure test project has a nuget reference of package "Microsoft.NET.Test.Sdk".</source>
+        <target state="translated">找不到 {0}。請確認測試專案有 "Microsoft.NET.Test.Sdk "套件的 nuget 參考。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestPublishTestProject">
+        <source>Unable to find {0}. Please publish your test project and retry.</source>
+        <target state="translated">找不到 {0}。請發佈您的測試專案並重試。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoDotnetMuxerFoundForArchitecture">
+        <source>Could not find '{0}' host for the '{1}' architecture.
+
+You can resolve the problem by installing the '{1}' .NET.
+
+The specified framework can be found at:
+  - https://aka.ms/dotnet-download
+</source>
+        <target state="translated">找不到 '{1}' 架構的 '{0}' 主機。
+
+您可以安裝 '{1}' .NET 來解決問題。
+
+指定的架構可在下列位置找到:
+  - https://aka.ms/dotnet-download
+</target>
+        <note>'{0}' is the placeholder for 'dotnet.exe' or 'dotnet' value and depends on platform Windows/Unix, '{1}' is the placeholder for the architeture name like ARM64, X64 etc...</note>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/ClientUtilities.cs b/src/Microsoft.TestPlatform.Utilities/ClientUtilities.cs
index 7cad5e447d..0bbef70c71 100644
--- a/src/Microsoft.TestPlatform.Utilities/ClientUtilities.cs
+++ b/src/Microsoft.TestPlatform.Utilities/ClientUtilities.cs
@@ -1,78 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using System;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Utilities used by the client to understand the environment of the current run.
+/// </summary>
+public static class ClientUtilities
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.Xml;
+    private const string TestSettingsFileXPath = "RunSettings/MSTest/SettingsFile";
+    private const string ResultsDirectoryXPath = "RunSettings/RunConfiguration/ResultsDirectory";
+    private const string DotnetHostPathXPath = "RunSettings/RunConfiguration/DotNetHostPath";
+    private const string RunsettingsDirectory = "RunSettingsDirectory";
 
     /// <summary>
-    /// Utilities used by the client to understand the environment of the current run.
+    /// Converts the relative paths in a runsetting file to absolute ones.
     /// </summary>
-    public static class ClientUtilities
+    /// <param name="xmlDocument">Xml Document containing Runsettings xml</param>
+    /// <param name="path">Path of the .runsettings xml file</param>
+    public static void FixRelativePathsInRunSettings(XmlDocument xmlDocument, string path)
     {
-        private const string TestSettingsFileXPath = "RunSettings/MSTest/SettingsFile";
-        private const string ResultsDirectoryXPath = "RunSettings/RunConfiguration/ResultsDirectory";
-        private const string RunsettingsDirectory = "RunSettingsDirectory";
-
-        /// <summary>
-        /// Converts the relative paths in a runsetting file to absolute ones.
-        /// </summary>
-        /// <param name="xmlDocument">Xml Document containing Runsettings xml</param>
-        /// <param name="path">Path of the .runsettings xml file</param>
-        [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")]
-        public static void FixRelativePathsInRunSettings(XmlDocument xmlDocument, string path)
-        {
-            if (xmlDocument == null)
-            {
-                throw new ArgumentNullException(nameof(xmlDocument));
-            }
-
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+        ValidateArg.NotNull(xmlDocument, nameof(xmlDocument));
+        ValidateArg.NotNullOrEmpty(path, nameof(path));
 
-            string root = Path.GetDirectoryName(path);
+        var root = Path.GetDirectoryName(path)!;
 
-            AddRunSettingsDirectoryNode(xmlDocument, root);
+        AddRunSettingsDirectoryNode(xmlDocument, root);
 
-            var testRunSettingsNode = xmlDocument.SelectSingleNode(TestSettingsFileXPath);
-            if (testRunSettingsNode != null)
-            {
-                FixNodeFilePath(testRunSettingsNode, root);
-            }
-
-            var resultsDirectoryNode = xmlDocument.SelectSingleNode(ResultsDirectoryXPath);
-            if (resultsDirectoryNode != null)
-            {
-                FixNodeFilePath(resultsDirectoryNode, root);
-            }
+        var testRunSettingsNode = xmlDocument.SelectSingleNode(TestSettingsFileXPath);
+        if (testRunSettingsNode != null)
+        {
+            FixNodeFilePath(testRunSettingsNode, root);
         }
 
-        private static void AddRunSettingsDirectoryNode(XmlDocument doc, string path)
+        var resultsDirectoryNode = xmlDocument.SelectSingleNode(ResultsDirectoryXPath);
+        if (resultsDirectoryNode != null)
         {
-            var node = doc.CreateNode(XmlNodeType.Element, RunsettingsDirectory, string.Empty);
-            node.InnerXml = path;
-            doc.DocumentElement.AppendChild(node);
+            FixNodeFilePath(resultsDirectoryNode, root);
         }
 
-        private static void FixNodeFilePath(XmlNode node, string root)
+        var dotnetHostPathNode = xmlDocument.SelectSingleNode(DotnetHostPathXPath);
+        if (dotnetHostPathNode != null)
         {
-            string fileName = node.InnerXml;
-            fileName = Environment.ExpandEnvironmentVariables(fileName);
+            FixNodeFilePath(dotnetHostPathNode, root);
+        }
+    }
+
+    private static void AddRunSettingsDirectoryNode(XmlDocument doc, string path)
+    {
+        var node = doc.CreateNode(XmlNodeType.Element, RunsettingsDirectory, string.Empty);
+        node.InnerXml = path;
+        doc.DocumentElement!.AppendChild(node);
+    }
 
-            if (!string.IsNullOrEmpty(fileName)
-                    && !Path.IsPathRooted(fileName))
-            {
-                // We have a relative file path...
-                fileName = Path.Combine(root, fileName);
-                fileName = Path.GetFullPath(fileName);
-            }
+    private static void FixNodeFilePath(XmlNode node, string root)
+    {
+        string fileName = node.InnerXml;
+        fileName = Environment.ExpandEnvironmentVariables(fileName);
 
-            node.InnerXml = fileName;
+        if (!fileName.IsNullOrEmpty()
+            && !Path.IsPathRooted(fileName))
+        {
+            // We have a relative file path...
+            fileName = Path.Combine(root, fileName);
+            fileName = Path.GetFullPath(fileName);
         }
+
+        node.InnerXml = fileName;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs b/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs
index 371b71046f..2a8241906c 100644
--- a/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs
+++ b/src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs
@@ -1,165 +1,181 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+public class CodeCoverageDataAttachmentsHandler : IDataCollectorAttachmentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-
-    public class CodeCoverageDataAttachmentsHandler : IDataCollectorAttachmentProcessor
-    {
-        private const string CoverageUri = "datacollector://microsoft/CodeCoverage/2.0";
-        private const string CoverageFileExtension = ".coverage";
-        private const string XmlFileExtension = ".xml";
-        private const string CoverageFriendlyName = "Code Coverage";
+    private const string CoverageUri = "datacollector://microsoft/CodeCoverage/2.0";
+    private const string CoverageFileExtension = ".coverage";
+    private const string XmlFileExtension = ".xml";
+    private const string CoverageFriendlyName = "Code Coverage";
 
-        private const string CodeCoverageIOAssemblyName = "Microsoft.VisualStudio.Coverage.IO";
-        private const string CoverageFileUtilityTypeName = "CoverageFileUtility";
-        private const string MergeMethodName = "MergeCoverageReportsAsync";
-        private const string CoverageMergeOperationName = "CoverageMergeOperation";
+    private const string CodeCoverageIoAssemblyName = "Microsoft.CodeCoverage.IO";
+    private const string CoverageFileUtilityTypeName = "CoverageFileUtility";
+    private const string MergeMethodName = "MergeCoverageReportsAsync";
+    private const string CoverageMergeOperationName = "CoverageMergeOperation";
 
-        private static readonly Uri CodeCoverageDataCollectorUri = new Uri(CoverageUri);
-        private static Assembly CodeCoverageAssembly;
-        private static object ClassInstance;
-        private static MethodInfo MergeMethodInfo;
-        private static Array MergeOperationEnumValues;
+    private static readonly Uri CodeCoverageDataCollectorUri = new(CoverageUri);
+    private static Assembly? s_codeCoverageAssembly;
+    private static object? s_classInstance;
+    private static MethodInfo? s_mergeMethodInfo;
+    private static Array? s_mergeOperationEnumValues;
 
-        public bool SupportsIncrementalProcessing => true;
+    public bool SupportsIncrementalProcessing => true;
 
-        public IEnumerable<Uri> GetExtensionUris()
-        {
-            yield return CodeCoverageDataCollectorUri;
-        }
+    public IEnumerable<Uri>? GetExtensionUris()
+    {
+        yield return CodeCoverageDataCollectorUri;
+    }
 
-        public async Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
-        {
-            if ((attachments?.Any()) != true)
-                return new Collection<AttachmentSet>();
+    public async Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet>? attachments, IProgress<int> progressReporter, IMessageLogger? logger, CancellationToken cancellationToken)
+    {
+        if (attachments?.Any() != true)
+            return new Collection<AttachmentSet>();
 
-            var coverageReportFilePaths = new List<string>();
-            var coverageOtherFilePaths = new List<string>();
+        var coverageReportFilePaths = new List<string>();
+        var coverageOtherFilePaths = new List<string>();
 
-            foreach (var attachmentSet in attachments)
+        foreach (var attachmentSet in attachments)
+        {
+            foreach (var attachment in attachmentSet.Attachments)
             {
-                foreach (var attachment in attachmentSet.Attachments)
+                if (attachment.Uri.LocalPath.EndsWith(CoverageFileExtension, StringComparison.OrdinalIgnoreCase) ||
+                    attachment.Uri.LocalPath.EndsWith(XmlFileExtension, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (attachment.Uri.LocalPath.EndsWith(CoverageFileExtension, StringComparison.OrdinalIgnoreCase) ||
-                        attachment.Uri.LocalPath.EndsWith(XmlFileExtension, StringComparison.OrdinalIgnoreCase))
-                    {
-                        coverageReportFilePaths.Add(attachment.Uri.LocalPath);
-                    }
-                    else
-                    {
-                        coverageOtherFilePaths.Add(attachment.Uri.LocalPath);
-                    }
+                    coverageReportFilePaths.Add(attachment.Uri.LocalPath);
+                }
+                else
+                {
+                    coverageOtherFilePaths.Add(attachment.Uri.LocalPath);
                 }
             }
+        }
 
-            if (coverageReportFilePaths.Count > 1)
-            {
-                var mergedCoverageReports = await this.MergeCodeCoverageFilesAsync(coverageReportFilePaths, progressReporter, cancellationToken).ConfigureAwait(false);
-                var resultAttachmentSet = new AttachmentSet(CodeCoverageDataCollectorUri, CoverageFriendlyName);
+        if (coverageReportFilePaths.Count > 1)
+        {
+            var resultAttachmentSet = new AttachmentSet(CodeCoverageDataCollectorUri, CoverageFriendlyName);
 
+            var mergedCoverageReports = await MergeCodeCoverageFilesAsync(coverageReportFilePaths, progressReporter, cancellationToken).ConfigureAwait(false);
+            if (mergedCoverageReports is not null)
+            {
                 foreach (var coverageReport in mergedCoverageReports)
                 {
                     resultAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(coverageReport, CoverageFriendlyName));
                 }
-
-                foreach (var coverageOtherFilePath in coverageOtherFilePaths)
-                {
-                    resultAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(coverageOtherFilePath, string.Empty));
-                }
-
-                return new Collection<AttachmentSet> { resultAttachmentSet };
             }
 
-            return attachments;
-        }
-
-        private async Task<IList<string>> MergeCodeCoverageFilesAsync(IList<string> files, IProgress<int> progressReporter, CancellationToken cancellationToken)
-        {
-            try
+            foreach (var coverageOtherFilePath in coverageOtherFilePaths)
             {
-                // Warning: Don't remove this method call.
-                //
-                // We took a dependency on Coverage.CoreLib.Net. In the unlikely case it cannot be
-                // resolved, this method call will throw an exception that will be caught and
-                // absorbed here.
-                var result = await this.MergeCodeCoverageFilesAsync(files, cancellationToken).ConfigureAwait(false);
-                progressReporter?.Report(100);
-                return result;
-            }
-            catch (OperationCanceledException)
-            {
-                // Occurs due to cancellation, ok to re-throw.
-                throw;
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "CodeCoverageDataCollectorAttachmentsHandler: Failed to load datacollector. Error: {0}",
-                    ex.ToString());
+                resultAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(coverageOtherFilePath, string.Empty));
             }
 
-            return null;
+            return new Collection<AttachmentSet> { resultAttachmentSet };
         }
 
-        private async Task<IList<string>> MergeCodeCoverageFilesAsync(IList<string> files, CancellationToken cancellationToken)
+        return attachments;
+    }
+
+    private static async Task<IList<string>?> MergeCodeCoverageFilesAsync(IList<string> files, IProgress<int> progressReporter, CancellationToken cancellationToken)
+    {
+        try
         {
-            cancellationToken.ThrowIfCancellationRequested();
+            // Warning: Don't remove this method call.
+            //
+            // We took a dependency on Coverage.CoreLib.Net. In the unlikely case it cannot be
+            // resolved, this method call will throw an exception that will be caught and
+            // absorbed here.
+            var result = await MergeCodeCoverageFilesAsync(files, cancellationToken).ConfigureAwait(false);
+            progressReporter?.Report(100);
+            return result;
+        }
+        catch (OperationCanceledException)
+        {
+            // Occurs due to cancellation, ok to re-throw.
+            throw;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error(
+                "CodeCoverageDataCollectorAttachmentsHandler: Failed to load datacollector. Error: {0}",
+                ex.ToString());
+        }
 
-            // Invoke methods
-            LoadCodeCoverageAssembly();
-            var task = (Task)MergeMethodInfo.Invoke(ClassInstance, new object[] { files[0], files, MergeOperationEnumValues.GetValue(0), true, cancellationToken });
-            await task.ConfigureAwait(false);
-            var coverageData = task.GetType().GetProperty("Result").GetValue(task, null);
-            var mergedResults = coverageData as IList<string>;
+        return null;
+    }
 
-            // Delete original files and keep merged file only
-            foreach (var file in files)
-            {
-                if (mergedResults.Contains(file))
-                    continue;
+    private static async Task<IList<string>?> MergeCodeCoverageFilesAsync(IList<string> files, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-                try
-                {
-                    File.Delete(file);
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error($"CodeCoverageDataCollectorAttachmentsHandler: Failed to remove {file}. Error: {ex}");
-                }
-            }
+        // Invoke methods
+        LoadCodeCoverageAssembly();
+
+        TPDebug.Assert(s_mergeOperationEnumValues != null);
+
+        var task = (Task)s_mergeMethodInfo.Invoke(s_classInstance, [files[0], files, s_mergeOperationEnumValues.GetValue(0)!, true, cancellationToken])!;
+        await task.ConfigureAwait(false);
 
-            return mergedResults;
+        if (task.GetType().GetProperty("Result")!.GetValue(task, null) is not IList<string> mergedResults)
+        {
+            EqtTrace.Error("CodeCoverageDataCollectorAttachmentsHandler: Failed to merge code coverage files.");
+            return files;
         }
 
-        private void LoadCodeCoverageAssembly()
+        // Delete original files and keep merged file only
+        foreach (var file in files)
         {
-            if (CodeCoverageAssembly != null)
-                return;
+            if (mergedResults.Contains(file))
+                continue;
 
-            var assemblyPath = Path.Combine(Path.GetDirectoryName(typeof(CodeCoverageDataAttachmentsHandler).GetTypeInfo().Assembly.GetAssemblyLocation()), CodeCoverageIOAssemblyName + ".dll");
-            CodeCoverageAssembly = new PlatformAssemblyLoadContext().LoadAssemblyFromPath(assemblyPath);
+            try
+            {
+                File.Delete(file);
+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Error($"CodeCoverageDataCollectorAttachmentsHandler: Failed to remove {file}. Error: {ex}");
+            }
+        }
 
-            var classType = CodeCoverageAssembly.GetType($"{CodeCoverageIOAssemblyName}.{CoverageFileUtilityTypeName}");
-            ClassInstance = Activator.CreateInstance(classType);
+        return mergedResults;
+    }
 
-            var types = CodeCoverageAssembly.GetTypes();
-            var mergeOperationEnum = Array.Find(types, d => d.Name == CoverageMergeOperationName);
-            MergeOperationEnumValues = Enum.GetValues(mergeOperationEnum);
-            MergeMethodInfo = classType?.GetMethod(MergeMethodName, new[] { typeof(string), typeof(IList<string>), mergeOperationEnum, typeof(bool), typeof(CancellationToken) });
+    [MemberNotNull(nameof(s_codeCoverageAssembly), nameof(s_classInstance), nameof(s_mergeOperationEnumValues), nameof(s_mergeMethodInfo))]
+    private static void LoadCodeCoverageAssembly()
+    {
+        if (s_codeCoverageAssembly != null)
+        {
+            TPDebug.Assert(s_classInstance != null && s_mergeOperationEnumValues != null && s_mergeMethodInfo != null);
+            return;
         }
+
+        var dataAttachmentAssemblyLocation = typeof(CodeCoverageDataAttachmentsHandler).Assembly.GetAssemblyLocation()!;
+        var assemblyPath = Path.Combine(Path.GetDirectoryName(dataAttachmentAssemblyLocation)!, CodeCoverageIoAssemblyName + ".dll");
+        s_codeCoverageAssembly = new PlatformAssemblyLoadContext().LoadAssemblyFromPath(assemblyPath);
+
+        var classType = s_codeCoverageAssembly.GetType($"{CodeCoverageIoAssemblyName}.{CoverageFileUtilityTypeName}")!;
+        s_classInstance = Activator.CreateInstance(classType)!;
+
+        var types = s_codeCoverageAssembly.GetTypes();
+        var mergeOperationEnum = Array.Find(types, d => d.Name == CoverageMergeOperationName)!;
+        s_mergeOperationEnumValues = Enum.GetValues(mergeOperationEnum);
+        s_mergeMethodInfo = classType.GetMethod(MergeMethodName, [typeof(string), typeof(IList<string>), mergeOperationEnum, typeof(bool), typeof(CancellationToken)])!;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/CodeCoverageRunSettingsProcessor.cs b/src/Microsoft.TestPlatform.Utilities/CodeCoverageRunSettingsProcessor.cs
index 402e68eca8..42b6ec1a56 100644
--- a/src/Microsoft.TestPlatform.Utilities/CodeCoverageRunSettingsProcessor.cs
+++ b/src/Microsoft.TestPlatform.Utilities/CodeCoverageRunSettingsProcessor.cs
@@ -1,313 +1,312 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Xml;
-    using System.Xml.XPath;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Represents the run settings processor for code coverage data collectors.
+/// </summary>
+public class CodeCoverageRunSettingsProcessor
+{
+    /// <summary>
+    /// Represents the default settings loaded as an <see cref="XmlNode"/>.
+    /// </summary>
+    private readonly XmlNode _defaultSettingsRootNode;
+    /// <summary>
+    /// Constructs an <see cref="CodeCoverageRunSettingsProcessor"/> object.
+    /// </summary>
+    ///
+    /// <param name="defaultSettingsRootNode">The default settings root node.</param>
+    public CodeCoverageRunSettingsProcessor(XmlNode defaultSettingsRootNode)
+    {
+        _defaultSettingsRootNode = defaultSettingsRootNode ?? throw new ArgumentNullException(nameof(defaultSettingsRootNode));
+    }
 
+    #region Public Interface
     /// <summary>
-    /// Represents the run settings processor for code coverage data collectors.
+    /// Processes the current settings for the code coverage data collector.
     /// </summary>
-    public class CodeCoverageRunSettingsProcessor
+    ///
+    /// <param name="currentSettings">The code coverage settings.</param>
+    ///
+    /// <returns>An updated version of the current run settings.</returns>
+    public XmlNode? Process(string? currentSettings)
     {
-        #region Members
-        /// <summary>
-        /// Represents the default settings loaded as an <see cref="XmlNode"/>.
-        /// </summary>
-        private XmlNode defaultSettingsRootNode;
-        #endregion
-
-        #region Constructors & Helpers
-        /// <summary>
-        /// Constructs an <see cref="CodeCoverageRunSettingsProcessor"/> object.
-        /// </summary>
-        ///
-        /// <param name="defaultSettingsRootNode">The default settings root node.</param>
-        public CodeCoverageRunSettingsProcessor(XmlNode defaultSettingsRootNode)
+        if (currentSettings.IsNullOrEmpty())
         {
-            this.defaultSettingsRootNode = defaultSettingsRootNode ?? throw new ArgumentNullException(nameof(defaultSettingsRootNode), "Default settings root node is null.");
+            return null;
         }
-        #endregion
-
-        #region Public Interface
-        /// <summary>
-        /// Processes the current settings for the code coverage data collector.
-        /// </summary>
-        ///
-        /// <param name="currentSettings">The code coverage settings.</param>
-        ///
-        /// <returns>An updated version of the current run settings.</returns>
-        public XmlNode Process(string currentSettings)
-        {
-            if (string.IsNullOrEmpty(currentSettings))
-            {
-                return null;
-            }
 
-            // Load current settings from string.
-            var document = new XmlDocument();
-            document.LoadXml(currentSettings);
+        // Load current settings from string.
+        var document = new XmlDocument();
+        document.LoadXml(currentSettings);
 
-            return this.Process(document.DocumentElement);
-        }
+        return Process(document.DocumentElement);
+    }
 
-        /// <summary>
-        /// Processes the current settings for the code coverage data collector.
-        /// </summary>
-        ///
-        /// <param name="currentSettingsDocument">
-        /// The code coverage settings document.
-        /// </param>
-        ///
-        /// <returns>An updated version of the current run settings.</returns>
-        public XmlNode Process(XmlDocument currentSettingsDocument)
+    /// <summary>
+    /// Processes the current settings for the code coverage data collector.
+    /// </summary>
+    ///
+    /// <param name="currentSettingsDocument">
+    /// The code coverage settings document.
+    /// </param>
+    ///
+    /// <returns>An updated version of the current run settings.</returns>
+    public XmlNode? Process(XmlDocument? currentSettingsDocument)
+    {
+        return currentSettingsDocument == null ? null : Process(currentSettingsDocument.DocumentElement);
+    }
+
+    /// <summary>
+    /// Processes the current settings for the code coverage data collector.
+    /// </summary>
+    ///
+    /// <param name="currentSettingsRootNode">The code coverage root element.</param>
+    ///
+    /// <returns>An updated version of the current run settings.</returns>
+    public XmlNode? Process(XmlNode? currentSettingsRootNode)
+    {
+        if (currentSettingsRootNode == null)
         {
-            if (currentSettingsDocument == null)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            return this.Process(currentSettingsDocument.DocumentElement);
+        // Get the code coverage node from the current settings. If unable to get any
+        // particular component down the path just add the default values for that component
+        // from the default settings document and return since there's nothing else to be done.
+        var codeCoveragePathComponents = new List<string>() { "CodeCoverage" };
+        var currentCodeCoverageNode = SelectNodeOrAddDefaults(
+            currentSettingsRootNode,
+            _defaultSettingsRootNode,
+            codeCoveragePathComponents);
+
+        // Cannot extract current code coverage node from the given settings so we bail out.
+        // However, the default code coverage node has already been added to the document's
+        // root.
+        if (currentCodeCoverageNode == null)
+        {
+            return currentSettingsRootNode;
         }
 
-        /// <summary>
-        /// Processes the current settings for the code coverage data collector.
-        /// </summary>
-        ///
-        /// <param name="currentSettingsRootNode">The code coverage root element.</param>
-        ///
-        /// <returns>An updated version of the current run settings.</returns>
-        public XmlNode Process(XmlNode currentSettingsRootNode)
+        // Get the code coverage node from the default settings.
+        var defaultCodeCoverageNode = ExtractNode(
+            _defaultSettingsRootNode,
+            BuildPath(codeCoveragePathComponents));
+
+        // Create the exclusion type list.
+        var exclusions = new List<IList<string>>
         {
-            if (currentSettingsRootNode == null)
-            {
-                return null;
-            }
+            new List<string> { "ModulePaths", "Exclude" },
+            new List<string> { "Attributes", "Exclude" },
+            new List<string> { "Sources", "Exclude" },
+            new List<string> { "Functions", "Exclude" }
+        };
 
-            // Get the code coverage node from the current settings. If unable to get any
-            // particular component down the path just add the default values for that component
-            // from the default settings document and return since there's nothing else to be done.
-            var codeCoveragePathComponents = new List<string>() { "CodeCoverage" };
-            var currentCodeCoverageNode = this.SelectNodeOrAddDefaults(
-                currentSettingsRootNode,
-                this.defaultSettingsRootNode,
-                codeCoveragePathComponents);
-
-            // Cannot extract current code coverage node from the given settings so we bail out.
-            // However, the default code coverage node has already been added to the document's
-            // root.
-            if (currentCodeCoverageNode == null)
+        foreach (var exclusion in exclusions)
+        {
+            // Get the <Exclude> node for the current exclusion type. If unable to get any
+            // particular component down the path just add the default values for that
+            // component from the default settings document and continue since there's nothing
+            // else to be done.
+            var currentNode = SelectNodeOrAddDefaults(
+                currentCodeCoverageNode,
+                defaultCodeCoverageNode,
+                exclusion);
+
+            // Check if the node extraction was successful and we should process the current
+            // node in order to merge the current exclusion rules with the default ones.
+            if (currentNode == null)
             {
-                return currentSettingsRootNode;
+                continue;
             }
 
-            // Get the code coverage node from the default settings.
-            var defaultCodeCoverageNode = this.ExtractNode(
-                this.defaultSettingsRootNode,
-                this.BuildPath(codeCoveragePathComponents));
+            // Extract the <Exclude> node from the default settings.
+            var defaultNode = ExtractNode(
+                defaultCodeCoverageNode,
+                BuildPath(exclusion));
 
-            // Create the exclusion type list.
-            var exclusions = new List<IList<string>>
-            {
-                new List<string> { "ModulePaths", "Exclude" },
-                new List<string> { "Attributes", "Exclude" },
-                new List<string> { "Sources", "Exclude" },
-                new List<string> { "Functions", "Exclude" }
-            };
+            // Merge the current and default settings for the current exclusion rule.
+            MergeNodes(currentNode, defaultNode);
+        }
 
-            foreach (var exclusion in exclusions)
-            {
-                // Get the <Exclude> node for the current exclusion type. If unable to get any
-                // particular component down the path just add the default values for that
-                // component from the default settings document and continue since there's nothing
-                // else to be done.
-                var currentNode = this.SelectNodeOrAddDefaults(
-                    currentCodeCoverageNode,
-                    defaultCodeCoverageNode,
-                    exclusion);
-
-                // Check if the node extraction was successful and we should process the current
-                // node in order to merge the current exclusion rules with the default ones.
-                if (currentNode == null)
-                {
-                    continue;
-                }
+        return currentSettingsRootNode;
+    }
+    #endregion
 
-                // Extract the <Exclude> node from the default settings.
-                var defaultNode = this.ExtractNode(
-                    defaultCodeCoverageNode,
-                    this.BuildPath(exclusion));
+    /// <summary>
+    /// Selects the node from the current settings node using the given
+    /// <see cref="XPathNavigator"/> style path. If unable to select the requested node it adds
+    /// default settings along the path.
+    /// </summary>
+    ///
+    /// <param name="currentRootNode">
+    /// The root node from the current settings document for the extraction.
+    /// </param>
+    /// <param name="defaultRootNode">
+    /// The corresponding root node from the default settings document.
+    /// </param>
+    /// <param name="pathComponents">The path components.</param>
+    ///
+    /// <returns>The requested node if successful, <see langword="null"/> otherwise.</returns>
+    private static XmlNode? SelectNodeOrAddDefaults(
+        XmlNode currentRootNode,
+        XmlNode? defaultRootNode,
+        IList<string> pathComponents)
+    {
+        var currentNode = currentRootNode;
+        var partialPath = new StringBuilder();
 
-                // Merge the current and default settings for the current exclusion rule.
-                this.MergeNodes(currentNode, defaultNode);
-            }
+        partialPath.Append('.');
 
-            return currentSettingsRootNode;
-        }
-        #endregion
-
-        #region Private Methods
-        /// <summary>
-        /// Selects the node from the current settings node using the given
-        /// <see cref="XPathNavigator"/> style path. If unable to select the requested node it adds
-        /// default settings along the path.
-        /// </summary>
-        ///
-        /// <param name="currentRootNode">
-        /// The root node from the current settings document for the extraction.
-        /// </param>
-        /// <param name="defaultRootNode">
-        /// The corresponding root node from the default settings document.
-        /// </param>
-        /// <param name="pathComponents">The path components.</param>
-        ///
-        /// <returns>The requested node if successful, <see cref="null"/> otherwise.</returns>
-        private XmlNode SelectNodeOrAddDefaults(
-            XmlNode currentRootNode,
-            XmlNode defaultRootNode,
-            IList<string> pathComponents)
+        foreach (var component in pathComponents)
         {
-            var currentNode = currentRootNode;
-            var partialPath = new StringBuilder();
-
-            partialPath.Append('.');
+            var currentPathComponent = "/" + component;
 
-            foreach (var component in pathComponents)
-            {
-                var currentPathComponent = "/" + component;
+            // Append the current path component to the partial path.
+            partialPath.Append(currentPathComponent);
 
-                // Append the current path component to the partial path.
-                partialPath.Append(currentPathComponent);
+            // Extract the node corresponding to the latest path component.
+            var tempNode = ExtractNode(currentNode, "." + currentPathComponent);
 
-                // Extract the node corresponding to the latest path component.
-                var tempNode = this.ExtractNode(currentNode, "." + currentPathComponent);
+            // Extraction is pruned here because we shouldn't be processing the current node.
+            if (tempNode != null && !ShouldProcessCurrentExclusion(tempNode))
+            {
+                return null;
+            }
 
-                // Extraction is pruned here because we shouldn't be processing the current node.
-                if (tempNode != null && !this.ShouldProcessCurrentExclusion(tempNode))
+            // If the current node extraction is unsuccessful then add the corresponding
+            // default settings node and bail out.
+            if (tempNode == null)
+            {
+                var defaultNode = ExtractNode(defaultRootNode, partialPath.ToString());
+                if (defaultNode == null)
                 {
                     return null;
                 }
 
-                // If the current node extraction is unsuccessful then add the corresponding
-                // default settings node and bail out.
-                if (tempNode == null)
-                {
-                    var defaultNode = this.ExtractNode(
-                        defaultRootNode,
-                        partialPath.ToString());
-
-                    var importedChild = currentNode.OwnerDocument.ImportNode(defaultNode, true);
-                    currentNode.AppendChild(importedChild);
-
-                    return null;
-                }
+                var importedChild = currentNode.OwnerDocument!.ImportNode(defaultNode, true);
+                currentNode.AppendChild(importedChild);
 
-                // Node corresponding to the latest path component is the new root node for the
-                // next extraction.
-                currentNode = tempNode;
+                return null;
             }
 
-            return currentNode;
+            // Node corresponding to the latest path component is the new root node for the
+            // next extraction.
+            currentNode = tempNode;
         }
 
-        /// <summary>
-        /// Checks if we should process the current exclusion node.
-        /// </summary>
-        ///
-        /// <param name="node">The current exclusion node.</param>
-        ///
-        /// <returns>
-        /// <see cref="true"/> if the node should be processed, <see cref="false"/> otherwise.
-        /// </returns>
-        private bool ShouldProcessCurrentExclusion(XmlNode node)
-        {
-            const string attributeName = "mergeDefaults";
+        return currentNode;
+    }
 
-            foreach (XmlAttribute attribute in node.Attributes)
-            {
-                // If the attribute is present and set on 'false' we skip processing for the
-                // current exclusion.
-                if (attribute.Name == attributeName
-                    && bool.TryParse(attribute.Value, out var value)
-                    && !value)
-                {
-                    return false;
-                }
-            }
+    /// <summary>
+    /// Checks if we should process the current exclusion node.
+    /// </summary>
+    ///
+    /// <param name="node">The current exclusion node.</param>
+    ///
+    /// <returns>
+    /// <see langword="true"/> if the node should be processed, <see langword="false"/> otherwise.
+    /// </returns>
+    private static bool ShouldProcessCurrentExclusion(XmlNode node)
+    {
+        const string attributeName = "mergeDefaults";
 
+        if (node.Attributes == null)
+        {
             return true;
         }
 
-        /// <summary>
-        /// Assembles a relative path from the path given as components.
-        /// </summary>
-        ///
-        /// <returns>A relative path built from path components.</returns>
-        private string BuildPath(IList<string> pathComponents)
+        foreach (XmlAttribute attribute in node.Attributes)
         {
-            return string.Join("/", new[] { "." }.Concat(pathComponents));
+            // If the attribute is present and set on 'false' we skip processing for the
+            // current exclusion.
+            if (attribute.Name == attributeName
+                && bool.TryParse(attribute.Value, out var value)
+                && !value)
+            {
+                return false;
+            }
         }
 
-        /// <summary>
-        /// Extracts the node specified by the current path using the provided node as root.
-        /// </summary>
-        ///
-        /// <param name="node">The root to be used for extraction.</param>
-        /// <param name="path">The path used to specify the requested node.</param>
-        ///
-        /// <returns>The extracted node if successful, <see cref="null"/> otherwise.</returns>
-        private XmlNode ExtractNode(XmlNode node, string path)
+        return true;
+    }
+
+    /// <summary>
+    /// Assembles a relative path from the path given as components.
+    /// </summary>
+    ///
+    /// <returns>A relative path built from path components.</returns>
+    private static string BuildPath(IList<string> pathComponents)
+    {
+        return string.Join("/", new[] { "." }.Concat(pathComponents));
+    }
+
+    /// <summary>
+    /// Extracts the node specified by the current path using the provided node as root.
+    /// </summary>
+    ///
+    /// <param name="node">The root to be used for extraction.</param>
+    /// <param name="path">The path used to specify the requested node.</param>
+    ///
+    /// <returns>The extracted node if successful, <see langword="null"/> otherwise.</returns>
+    private static XmlNode? ExtractNode(XmlNode? node, string path)
+    {
+        try
         {
-            try
-            {
-                return node.SelectSingleNode(path);
-            }
-            catch (XPathException ex)
-            {
-                EqtTrace.Error(
-                    "CodeCoverageRunSettingsProcessor.ExtractNode: Cannot select single node \"{0}\".",
-                    ex.Message);
-            }
+            return node?.SelectSingleNode(path);
+        }
+        catch (XPathException ex)
+        {
+            EqtTrace.Error(
+                "CodeCoverageRunSettingsProcessor.ExtractNode: Cannot select single node \"{0}\".",
+                ex.Message);
+        }
 
-            return null;
+        return null;
+    }
+
+    /// <summary>
+    /// Merges the current settings rules with the default settings rules.
+    /// </summary>
+    ///
+    /// <param name="currentNode">The current settings root node.</param>
+    /// <param name="defaultNode">The default settings root node.</param>
+    private static void MergeNodes(XmlNode currentNode, XmlNode? defaultNode)
+    {
+        var exclusionCache = new HashSet<string>();
+
+        // Add current exclusions to the exclusion cache.
+        foreach (XmlNode child in currentNode.ChildNodes)
+        {
+            exclusionCache.Add(child.OuterXml);
         }
 
-        /// <summary>
-        /// Merges the current settings rules with the default settings rules.
-        /// </summary>
-        ///
-        /// <param name="currentNode">The current settings root node.</param>
-        /// <param name="defaultNode">The default settings root node.</param>
-        private void MergeNodes(XmlNode currentNode, XmlNode defaultNode)
+        if (defaultNode is null)
         {
-            var exclusionCache = new HashSet<string>();
+            return;
+        }
 
-            // Add current exclusions to the exclusion cache.
-            foreach (XmlNode child in currentNode.ChildNodes)
+        // Iterate through default exclusions and import missing ones.
+        foreach (XmlNode child in defaultNode.ChildNodes)
+        {
+            if (exclusionCache.Contains(child.OuterXml))
             {
-                exclusionCache.Add(child.OuterXml);
+                continue;
             }
 
-            // Iterate through default exclusions and import missing ones.
-            foreach (XmlNode child in defaultNode.ChildNodes)
-            {
-                if (exclusionCache.Contains(child.OuterXml))
-                {
-                    continue;
-                }
-
-                // Import missing default exclusions.
-                var importedChild = currentNode.OwnerDocument.ImportNode(child, true);
-                currentNode.AppendChild(importedChild);
-            }
+            // Import missing default exclusions.
+            var importedChild = currentNode.OwnerDocument!.ImportNode(child, true);
+            currentNode.AppendChild(importedChild);
         }
-        #endregion
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs b/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs
index ea6c283009..b7c7fc0b66 100644
--- a/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs
+++ b/src/Microsoft.TestPlatform.Utilities/CommandLineUtilities.cs
@@ -1,107 +1,106 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Text;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    public static class CommandLineUtilities
+public static class CommandLineUtilities
+{
+    public static bool SplitCommandLineIntoArguments(string args, out string[] arguments)
     {
-        public static bool SplitCommandLineIntoArguments(string args, out string[] arguments)
-        {
-            bool hadError = false;
-            var argArray = new List<string>();
-            var currentArg = new StringBuilder();
-            bool inQuotes = false;
-            int index = 0;
+        bool hadError = false;
+        var argArray = new List<string>();
+        var currentArg = new StringBuilder();
+        bool inQuotes = false;
+        int index = 0;
 
-            try
+        try
+        {
+            while (true)
             {
-                while (true)
+                // skip whitespace
+                while (char.IsWhiteSpace(args[index]))
                 {
-                    // skip whitespace
-                    while (char.IsWhiteSpace(args[index]))
+                    index++;
+                }
+
+                // # - comment to end of line
+                if (args[index] == '#')
+                {
+                    index++;
+                    while (args[index] != '\n')
                     {
                         index++;
                     }
+                    continue;
+                }
 
-                    // # - comment to end of line
-                    if (args[index] == '#')
+                // do one argument
+                do
+                {
+                    if (args[index] == '\\')
                     {
+                        int cSlashes = 1;
                         index++;
-                        while (args[index] != '\n')
+                        while (index == args.Length && args[index] == '\\')
                         {
-                            index++;
+                            cSlashes++;
                         }
-                        continue;
-                    }
 
-                    // do one argument
-                    do
-                    {
-                        if (args[index] == '\\')
+                        if (index == args.Length || args[index] != '"')
                         {
-                            int cSlashes = 1;
-                            index++;
-                            while (index == args.Length && args[index] == '\\')
-                            {
-                                cSlashes++;
-                            }
-
-                            if (index == args.Length || args[index] != '"')
+                            currentArg.Append('\\', cSlashes);
+                        }
+                        else
+                        {
+                            currentArg.Append('\\', (cSlashes >> 1));
+                            if (0 != (cSlashes & 1))
                             {
-                                currentArg.Append('\\', cSlashes);
+                                currentArg.Append('"');
                             }
                             else
                             {
-                                currentArg.Append('\\', (cSlashes >> 1));
-                                if (0 != (cSlashes & 1))
-                                {
-                                    currentArg.Append('"');
-                                }
-                                else
-                                {
-                                    inQuotes = !inQuotes;
-                                }
+                                inQuotes = !inQuotes;
                             }
                         }
-                        else if (args[index] == '"')
-                        {
-                            inQuotes = !inQuotes;
-                            index++;
-                        }
-                        else
-                        {
-                            currentArg.Append(args[index]);
-                            index++;
-                        }
-                    } while (!char.IsWhiteSpace(args[index]) || inQuotes);
-                    argArray.Add(currentArg.ToString());
-                    currentArg.Clear();
-                }
+                    }
+                    else if (args[index] == '"')
+                    {
+                        inQuotes = !inQuotes;
+                        index++;
+                    }
+                    else
+                    {
+                        currentArg.Append(args[index]);
+                        index++;
+                    }
+                } while (!char.IsWhiteSpace(args[index]) || inQuotes);
+                argArray.Add(currentArg.ToString());
+                currentArg.Clear();
             }
-            catch (IndexOutOfRangeException)
+        }
+        catch (IndexOutOfRangeException)
+        {
+            // got EOF
+            if (inQuotes)
             {
-                // got EOF
-                if (inQuotes)
-                {
-                    EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", 1);
-                    EqtTrace.Error(string.Format(CultureInfo.InvariantCulture, "Error: Unbalanced '\"' in command line argument file"));
-                    hadError = true;
-                }
-                else if (currentArg.Length > 0)
-                {
-                    // valid argument can be terminated by EOF
-                    argArray.Add(currentArg.ToString());
-                }
+                EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", 1);
+                EqtTrace.Error("Error: Unbalanced '\"' in command line argument file");
+                hadError = true;
+            }
+            else if (currentArg.Length > 0)
+            {
+                // valid argument can be terminated by EOF
+                argArray.Add(currentArg.ToString());
             }
-
-            arguments = argArray.ToArray();
-            return hadError;
         }
+
+        arguments = argArray.ToArray();
+        return hadError;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs b/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
index 1993fc734c..7825d9adb8 100644
--- a/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
+++ b/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
@@ -1,755 +1,801 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+using OMResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+using UtilitiesResources = Microsoft.VisualStudio.TestPlatform.Utilities.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Utility class for Inferring the runsettings from the current environment and the user specified command line switches.
+/// </summary>
+public class InferRunSettingsHelper
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Xml;
-    using System.Xml.XPath;
-    using OMResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
-    using UtilitiesResources = Microsoft.VisualStudio.TestPlatform.Utilities.Resources.Resources;
+    private const string DesignModeNodeName = "DesignMode";
+    private const string BatchSizeNodeName = "BatchSize";
+    private const string CollectSourceInformationNodeName = "CollectSourceInformation";
+    private const string RunSettingsNodeName = "RunSettings";
+    private const string RunConfigurationNodeName = "RunConfiguration";
+    private const string ResultsDirectoryNodeName = "ResultsDirectory";
+    private const string TargetPlatformNodeName = "TargetPlatform";
+    private const string TargetFrameworkNodeName = "TargetFrameworkVersion";
+    private const string TargetDevice = "TargetDevice";
+
+    private const string DesignModeNodePath = @"/RunSettings/RunConfiguration/DesignMode";
+    private const string BatchSizeNodePath = @"/RunSettings/RunConfiguration/BatchSize";
+    private const string CollectSourceInformationNodePath = @"/RunSettings/RunConfiguration/CollectSourceInformation";
+    private const string RunConfigurationNodePath = @"/RunSettings/RunConfiguration";
+    private const string TargetPlatformNodePath = @"/RunSettings/RunConfiguration/TargetPlatform";
+    private const string TargetFrameworkNodePath = @"/RunSettings/RunConfiguration/TargetFrameworkVersion";
+    private const string ResultsDirectoryNodePath = @"/RunSettings/RunConfiguration/ResultsDirectory";
+    private const string TargetDeviceNodePath = @"/RunSettings/RunConfiguration/TargetDevice";
+    private const string EnvironmentVariablesNodePath = @"/RunSettings/RunConfiguration/EnvironmentVariables";
+    private const string MultiTargetingForwardLink = @"https://aka.ms/tp/vstest/multitargetingdoc?view=vs-2019";
+
+    // To make things compatible for older runsettings
+    private const string MsTestTargetDeviceNodePath = @"/RunSettings/MSPhoneTest/TargetDevice";
+
+    private const string CodeCoverageCollectorUri = @"datacollector://microsoft/CodeCoverage/2.0";
+    private const string FakesCollectorUri = @"datacollector://microsoft/unittestisolation/1.0";
+    private const string CodeCoverageFriendlyName = "Code Coverage";
+    private const string FakesFriendlyName = "UnitTestIsolation";
+
+    private const string LegacyElementsString = "Elements";
+    private const string DeploymentAttributesString = "DeploymentAttributes";
+    private const string ExecutionAttributesString = "ExecutionAttributes";
+    private static readonly List<string> ExecutionNodesPaths =
+    [
+        @"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution",
+        @"/RunSettings/LegacySettings/Execution/Timeouts", @"/RunSettings/LegacySettings/Execution/Hosts"
+    ];
 
     /// <summary>
-    /// Utility class for Inferring the runsettings from the current environment and the user specified command line switches.
+    /// Make runsettings compatible with testhost of version 15.0.0-preview
+    /// Due to bug https://github.com/Microsoft/vstest/issues/970 we need this function
     /// </summary>
-    public class InferRunSettingsHelper
+    /// <param name="runsettingsXml">string content of runsettings </param>
+    /// <returns>compatible runsettings</returns>
+    public static string? MakeRunsettingsCompatible(string? runsettingsXml)
     {
-        private const string DesignModeNodeName = "DesignMode";
-        private const string CollectSourceInformationNodeName = "CollectSourceInformation";
-        private const string RunSettingsNodeName = "RunSettings";
-        private const string RunConfigurationNodeName = "RunConfiguration";
-        private const string ResultsDirectoryNodeName = "ResultsDirectory";
-        private const string TargetPlatformNodeName = "TargetPlatform";
-        private const string TargetFrameworkNodeName = "TargetFrameworkVersion";
-        private const string TargetDevice = "TargetDevice";
-
-        private const string DesignModeNodePath = @"/RunSettings/RunConfiguration/DesignMode";
-        private const string CollectSourceInformationNodePath = @"/RunSettings/RunConfiguration/CollectSourceInformation";
-        private const string RunConfigurationNodePath = @"/RunSettings/RunConfiguration";
-        private const string TargetPlatformNodePath = @"/RunSettings/RunConfiguration/TargetPlatform";
-        private const string TargetFrameworkNodePath = @"/RunSettings/RunConfiguration/TargetFrameworkVersion";
-        private const string ResultsDirectoryNodePath = @"/RunSettings/RunConfiguration/ResultsDirectory";
-        private const string TargetDeviceNodePath = @"/RunSettings/RunConfiguration/TargetDevice";
-        private const string EnvironmentVariablesNodePath = @"/RunSettings/RunConfiguration/EnvironmentVariables";
-        private const string multiTargettingForwardLink = @"https://aka.ms/tp/vstest/multitargetingdoc?view=vs-2019";
-
-        // To make things compatible for older runsettings
-        private const string MsTestTargetDeviceNodePath = @"/RunSettings/MSPhoneTest/TargetDevice";
-
-        private const string CodeCoverageCollectorUri = @"datacollector://microsoft/CodeCoverage/2.0";
-        private const string FakesCollectorUri = @"datacollector://microsoft/unittestisolation/1.0";
-        private const string CodeCoverageFriendlyName = "Code Coverage";
-        private const string FakesFriendlyName = "UnitTestIsolation";
-
-        private const string LegacyElementsString = "Elements";
-        private const string DeploymentAttributesString = "DeploymentAttributes";
-        private const string ExecutionAttributesString = "ExecutionAttributes";
-        private static readonly List<string> ExecutionNodesPaths = new List<string> { @"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution", @"/RunSettings/LegacySettings/Execution/Timeouts", @"/RunSettings/LegacySettings/Execution/Hosts" };
-
-        /// <summary>
-        /// Make runsettings compatible with testhost of version 15.0.0-preview
-        /// Due to bug https://github.com/Microsoft/vstest/issues/970 we need this function
-        /// </summary>
-        /// <param name="runsettingsXml">string content of runsettings </param>
-        /// <returns>compatible runsettings</returns>
-        public static string MakeRunsettingsCompatible(string runsettingsXml)
-        {
-            // These are the list of valid RunConfiguration setting name which old testhost understand.
-            var listOfValidRunConfigurationSettings = new HashSet<string>
-            {
-                "TargetPlatform",
-                "TargetFrameworkVersion",
-                "TestAdaptersPaths",
-                "ResultsDirectory",
-                "SolutionDirectory",
-                "MaxCpuCount",
-                "DisableParallelization",
-                "DisableAppDomain"
-            };
-            return MakeRunsettingsCompatible(runsettingsXml, listOfValidRunConfigurationSettings, null);
+        // These are the list of valid RunConfiguration setting name which old testhost understand.
+        var listOfValidRunConfigurationSettings = new HashSet<string>
+        {
+            "TargetPlatform",
+            "TargetFrameworkVersion",
+            "TestAdaptersPaths",
+            "ResultsDirectory",
+            "SolutionDirectory",
+            "MaxCpuCount",
+            "DisableParallelization",
+            "DisableAppDomain"
+        };
+
+        return MakeRunsettingsCompatible(runsettingsXml, listOfValidRunConfigurationSettings, null);
+    }
+
+    private static string? MakeRunsettingsCompatible(string? runsettingsXml, HashSet<string>? listOfValidRunConfigurationSettings, HashSet<string>? listOfInValidRunConfigurationSettings)
+    {
+        var updatedRunSettingsXml = runsettingsXml;
+
+        if (runsettingsXml.IsNullOrWhiteSpace())
+        {
+            return updatedRunSettingsXml;
         }
 
-        private static string MakeRunsettingsCompatible(string runsettingsXml, HashSet<string> listOfValidRunConfigurationSettings, HashSet<string> listOfInValidRunConfigurationSettings)
+        using var stream = new StringReader(runsettingsXml);
+        using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
+
+        var runSettingsNavigator = document.CreateNavigator()!;
+
+        // Move navigator to RunConfiguration node
+        if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty) ||
+            !runSettingsNavigator.MoveToChild(RunConfigurationNodeName, string.Empty))
+        {
+            EqtTrace.Error("InferRunSettingsHelper.MakeRunsettingsCompatible: Unable to navigate to RunConfiguration. Current node: " + runSettingsNavigator.LocalName);
+        }
+        else if (runSettingsNavigator.HasChildren)
         {
-            var updatedRunSettingsXml = runsettingsXml;
+            listOfInValidRunConfigurationSettings ??= new HashSet<string>();
 
-            if (!string.IsNullOrWhiteSpace(runsettingsXml))
+            // Find all invalid RunConfiguration Settings
+            runSettingsNavigator.MoveToFirstChild();
+            if (listOfValidRunConfigurationSettings != null)
             {
-                using (var stream = new StringReader(runsettingsXml))
-                using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
+                do
                 {
-                    var document = new XmlDocument();
-                    document.Load(reader);
-
-                    var runSettingsNavigator = document.CreateNavigator();
-
-                    // Move navigator to RunConfiguration node
-                    if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty) ||
-                        !runSettingsNavigator.MoveToChild(RunConfigurationNodeName, string.Empty))
+                    if (!listOfValidRunConfigurationSettings.Contains(runSettingsNavigator.LocalName))
                     {
-                        EqtTrace.Error("InferRunSettingsHelper.MakeRunsettingsCompatible: Unable to navigate to RunConfiguration. Current node: " + runSettingsNavigator.LocalName);
+                        listOfInValidRunConfigurationSettings.Add(runSettingsNavigator.LocalName);
                     }
-                    else if (runSettingsNavigator.HasChildren)
-                    {
-                        if (listOfInValidRunConfigurationSettings is null)
-                        {
-                            listOfInValidRunConfigurationSettings = new HashSet<string>();
-                        }
-
-                        // Find all invalid RunConfiguration Settings
-                        runSettingsNavigator.MoveToFirstChild();
-                        if (listOfValidRunConfigurationSettings != null)
-                        {
-                            do
-                            {
-                                if (!listOfValidRunConfigurationSettings.Contains(runSettingsNavigator.LocalName))
-                                {
-                                    listOfInValidRunConfigurationSettings.Add(runSettingsNavigator.LocalName);
-                                }
-                            } while (runSettingsNavigator.MoveToNext());
-                        }
-
-                        // Delete all invalid RunConfiguration Settings
-                        if (listOfInValidRunConfigurationSettings.Count > 0)
-                        {
-                            if (EqtTrace.IsWarningEnabled)
-                            {
-                                string settingsName = string.Join(", ", listOfInValidRunConfigurationSettings);
-                                EqtTrace.Warning(string.Format("InferRunSettingsHelper.MakeRunsettingsCompatible: Removing the following settings: {0} from RunSettings file. To use those settings please move to latest version of Microsoft.NET.Test.Sdk", settingsName));
-                            }
+                } while (runSettingsNavigator.MoveToNext());
+            }
 
-                            // move navigator to RunConfiguration node
-                            runSettingsNavigator.MoveToParent();
+            // Delete all invalid RunConfiguration Settings
+            if (listOfInValidRunConfigurationSettings.Count > 0)
+            {
+                string settingsName = string.Join(", ", listOfInValidRunConfigurationSettings);
+                EqtTrace.Warning("InferRunSettingsHelper.MakeRunsettingsCompatible: Removing the following settings: {0} from RunSettings file. To use those settings please move to latest version of Microsoft.NET.Test.Sdk", settingsName);
 
-                            foreach (var s in listOfInValidRunConfigurationSettings)
-                            {
-                                var nodePath = RunConfigurationNodePath + "/" + s;
-                                XmlUtilities.RemoveChildNode(runSettingsNavigator, nodePath, s);
-                            }
+                // move navigator to RunConfiguration node
+                runSettingsNavigator.MoveToParent();
 
-                            runSettingsNavigator.MoveToRoot();
-                            updatedRunSettingsXml = runSettingsNavigator.OuterXml;
-                        }
-                    }
+                foreach (var s in listOfInValidRunConfigurationSettings)
+                {
+                    var nodePath = RunConfigurationNodePath + "/" + s;
+                    XmlUtilities.RemoveChildNode(runSettingsNavigator, nodePath, s);
                 }
-            }
 
-            return updatedRunSettingsXml;
+                runSettingsNavigator.MoveToRoot();
+                updatedRunSettingsXml = runSettingsNavigator.OuterXml;
+            }
         }
 
-        public static string RemoveTargetPlatformElement(string runsettingsXml)
-            => MakeRunsettingsCompatible(runsettingsXml, null, new HashSet<string> { "TargetPlatform" });
-
-        /// <summary>
-        /// Updates the run settings XML with the specified values.
-        /// </summary>
-        /// <param name="runSettingsDocument"> The XmlDocument of the XML. </param>
-        /// <param name="architecture"> The architecture. </param>
-        /// <param name="framework"> The framework. </param>
-        /// <param name="resultsDirectory"> The results directory. </param>
-        public static void UpdateRunSettingsWithUserProvidedSwitches(XmlDocument runSettingsDocument, Architecture architecture, Framework framework, string resultsDirectory)
-        {
-            var runSettingsNavigator = runSettingsDocument.CreateNavigator();
+        return updatedRunSettingsXml;
+    }
 
-            ValidateRunConfiguration(runSettingsNavigator);
+    public static string? RemoveTargetPlatformElement(string? runsettingsXml)
+        => MakeRunsettingsCompatible(runsettingsXml, null, new HashSet<string> { "TargetPlatform" });
 
-            // when runsettings specifies platform, that takes precedence over the user specified platform via command line arguments.
-            var shouldUpdatePlatform = true;
+    /// <summary>
+    /// Updates the run settings XML with the specified values.
+    /// </summary>
+    /// <param name="runSettingsDocument"> The XmlDocument of the XML. </param>
+    /// <param name="architecture"> The architecture. </param>
+    /// <param name="framework"> The framework. </param>
+    /// <param name="resultsDirectory"> The results directory. </param>
+    public static void UpdateRunSettingsWithUserProvidedSwitches(XmlDocument runSettingsDocument, Architecture architecture, Framework framework, string? resultsDirectory)
+    {
+        var runSettingsNavigator = runSettingsDocument.CreateNavigator()!;
 
-            TryGetPlatformXml(runSettingsNavigator, out var nodeXml);
-            if (!string.IsNullOrEmpty(nodeXml))
-            {
-                architecture = (Architecture)Enum.Parse(typeof(Architecture), nodeXml, true);
-                shouldUpdatePlatform = false;
-            }
+        ValidateRunConfiguration(runSettingsNavigator);
 
-            // when runsettings specifies framework, that takes precedence over the user specified input framework via the command line arguments.
-            var shouldUpdateFramework = true;
-            TryGetFrameworkXml(runSettingsNavigator, out nodeXml);
+        // when runsettings specifies platform, that takes precedence over the user specified platform via command line arguments.
+        var shouldUpdatePlatform = true;
 
-            if (!string.IsNullOrEmpty(nodeXml))
-            {
-                framework = Framework.FromString(nodeXml);
-                shouldUpdateFramework = false;
-            }
+        TryGetPlatformXml(runSettingsNavigator, out var nodeXml);
+        if (!nodeXml.IsNullOrEmpty())
+        {
+            architecture = (Architecture)Enum.Parse(typeof(Architecture), nodeXml, true);
+            shouldUpdatePlatform = false;
+        }
 
-            EqtTrace.Verbose("Using effective platform:{0} effective framework:{1}", architecture, framework);
+        // when runsettings specifies framework, that takes precedence over the user specified input framework via the command line arguments.
+        var shouldUpdateFramework = true;
+        TryGetFrameworkXml(runSettingsNavigator, out nodeXml);
 
-            // check if platform is compatible with current system architecture.
-            VerifyCompatibilityWithOSArchitecture(architecture);
+        if (!nodeXml.IsNullOrEmpty())
+        {
+            var fwkFromString = Framework.FromString(nodeXml);
+            TPDebug.Assert(fwkFromString is not null, "fwkFromString is null");
+            framework = fwkFromString;
+            shouldUpdateFramework = false;
+        }
 
-            // Check if inputRunSettings has results directory configured.
-            var hasResultsDirectory = runSettingsDocument.SelectSingleNode(ResultsDirectoryNodePath) != null;
+        EqtTrace.Verbose("Using effective platform:{0} effective framework:{1}", architecture, framework);
 
-            // Regenerate the effective settings.
-            if (shouldUpdatePlatform || shouldUpdateFramework || !hasResultsDirectory)
-            {
-                UpdateRunConfiguration(runSettingsDocument, architecture, framework, resultsDirectory);
-            }
-        }
+        // Check if inputRunSettings has results directory configured.
+        var hasResultsDirectory = runSettingsDocument.SelectSingleNode(ResultsDirectoryNodePath) != null;
 
-        /// <summary>
-        /// Updates the <c>RunConfiguration.DesignMode</c> value for a run settings. Doesn't do anything if the value is already set.
-        /// </summary>
-        /// <param name="runSettingsDocument">Document for runsettings xml</param>
-        /// <param name="designModeValue">Value to set</param>
-        public static void UpdateDesignMode(XmlDocument runSettingsDocument, bool designModeValue)
+        // Regenerate the effective settings.
+        if (shouldUpdatePlatform || shouldUpdateFramework || !hasResultsDirectory)
         {
-            AddNodeIfNotPresent<bool>(runSettingsDocument, DesignModeNodePath, DesignModeNodeName, designModeValue);
+            UpdateRunConfiguration(runSettingsDocument, architecture, framework, resultsDirectory);
         }
+    }
 
-        /// <summary>
-        /// Updates the <c>RunConfiguration.CollectSourceInformation</c> value for a run settings. Doesn't do anything if the value is already set.
-        /// </summary>
-        /// <param name="runSettingsDocument">Navigator for runsettings xml</param>
-        /// <param name="collectSourceInformationValue">Value to set</param>
-        public static void UpdateCollectSourceInformation(XmlDocument runSettingsDocument, bool collectSourceInformationValue)
-        {
-            AddNodeIfNotPresent<bool>(runSettingsDocument, CollectSourceInformationNodePath, CollectSourceInformationNodeName, collectSourceInformationValue);
-        }
+    /// <summary>
+    /// Updates the <c>RunConfiguration.DesignMode</c> value for a run settings. Doesn't do anything if the value is already set.
+    /// </summary>
+    /// <param name="runSettingsDocument">Document for runsettings xml</param>
+    /// <param name="designModeValue">Value to set</param>
+    public static void UpdateDesignMode(XmlDocument runSettingsDocument, bool designModeValue)
+    {
+        AddNodeIfNotPresent(runSettingsDocument, DesignModeNodePath, DesignModeNodeName, designModeValue);
+    }
 
-        /// <summary>
-        /// Updates the <c>RunConfiguration.TargetDevice</c> value for a run settings. Doesn't do anything if the value is already set.
-        /// </summary>
-        /// <param name="runSettingsDocument">XmlDocument for runsettings xml</param>
-        /// <param name="targetDevice">Value to set</param>
-        public static void UpdateTargetDevice(XmlDocument runSettingsDocument, string targetDevice)
-        {
-            AddNodeIfNotPresent<string>(runSettingsDocument, TargetDeviceNodePath, TargetDevice, targetDevice);
-        }
+    /// <summary>
+    /// Updates the <c>RunConfiguration.BatchSize</c> value for a run settings. Doesn't do anything if the value is already set.
+    /// </summary>
+    /// <param name="runSettingsDocument">Document for runsettings xml</param>
+    /// <param name="batchSizeValue">Value to set</param>
+    public static void UpdateBatchSize(XmlDocument runSettingsDocument, long batchSizeValue)
+    {
+        AddNodeIfNotPresent(runSettingsDocument, BatchSizeNodePath, BatchSizeNodeName, batchSizeValue);
+    }
+
+    /// <summary>
+    /// Updates the <c>RunConfiguration.CollectSourceInformation</c> value for a run settings. Doesn't do anything if the value is already set.
+    /// </summary>
+    /// <param name="runSettingsDocument">Navigator for runsettings xml</param>
+    /// <param name="collectSourceInformationValue">Value to set</param>
+    public static void UpdateCollectSourceInformation(XmlDocument runSettingsDocument, bool collectSourceInformationValue)
+    {
+        AddNodeIfNotPresent(runSettingsDocument, CollectSourceInformationNodePath, CollectSourceInformationNodeName, collectSourceInformationValue);
+    }
+
+    /// <summary>
+    /// Updates the <c>RunConfiguration.TargetDevice</c> value for a run settings. Doesn't do anything if the value is already set.
+    /// </summary>
+    /// <param name="runSettingsDocument">XmlDocument for runsettings xml</param>
+    /// <param name="targetDevice">Value to set</param>
+    public static void UpdateTargetDevice(XmlDocument runSettingsDocument, string targetDevice)
+    {
+        AddNodeIfNotPresent(runSettingsDocument, TargetDeviceNodePath, TargetDevice, targetDevice);
+    }
+
+    /// <summary>
+    /// Updates the <c>RunConfiguration.TargetFrameworkVersion</c> value for a run settings. if the value is already set, behavior depends on overwrite.
+    /// </summary>
+    /// <param name="runSettingsDocument">XmlDocument for runsettings xml</param>
+    /// <param name="framework">Value to set</param>
+    /// <param name="overwrite">Overwrite option.</param>
+    public static void UpdateTargetFramework(XmlDocument runSettingsDocument, string framework, bool overwrite = false)
+    {
+        AddNodeIfNotPresent(runSettingsDocument, TargetFrameworkNodePath, TargetFrameworkNodeName, framework, overwrite);
+    }
 
-        /// <summary>
-        /// Updates the <c>RunConfiguration.TargetFrameworkVersion</c> value for a run settings. if the value is already set, behavior depends on overwrite.
-        /// </summary>
-        /// <param name="runSettingsDocument">XmlDocument for runsettings xml</param>
-        /// <param name="framework">Value to set</param>
-        /// <param name="overwrite">Overwrite option.</param>
-        public static void UpdateTargetFramework(XmlDocument runSettingsDocument, string framework, bool overwrite = false)
+    /// <summary>
+    /// Validates the collectors in runsettings when an in-lined testsettings is specified
+    /// </summary>
+    /// <param name="runsettings">RunSettings used for the run</param>
+    /// <returns>True if an incompatible collector is found</returns>
+    public static bool AreRunSettingsCollectorsIncompatibleWithTestSettings(string? runsettings)
+    {
+        // If there's no embedded testsettings.. bail out
+        if (!IsTestSettingsEnabled(runsettings))
         {
-            AddNodeIfNotPresent(runSettingsDocument, TargetFrameworkNodePath, TargetFrameworkNodeName, framework, overwrite);
+            return false;
         }
 
-        /// <summary>
-        /// Validates the collectors in runsettings when an in-lined testsettings is specified
-        /// </summary>
-        /// <param name="runsettings">RunSettings used for the run</param>
-        /// <returns>True if an incompatible collector is found</returns>
-        public static bool AreRunSettingsCollectorsIncompatibleWithTestSettings(string runsettings)
+        // Explicitly blocking usage of data collectors through modes runsettings and testsettings except
+        // for couple of scenarios where the IDE generates the collector settings in the runsettings file even when
+        // it has an embedded testsettings file. Longterm runsettings will be the single run configuration source
+        // In-proc collectors are incompatible with testsettings
+        var inprocDataCollectionSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(runsettings);
+        if (inprocDataCollectionSettings != null && inprocDataCollectionSettings.IsCollectionEnabled && inprocDataCollectionSettings.DataCollectorSettingsList != null)
         {
-            // If there's no embedded testsettings.. bail out
-            if (!IsTestSettingsEnabled(runsettings))
-            {
-                return false;
-            }
-
-            // Explicitly blocking usage of data collectors through modes runsettings and testsettings except
-            // for couple of scenarios where the IDE generates the collector settings in the runsettings file even when
-            // it has an embedded testsettings file. Longterm runsettings will be the single run configuration source
-            // In-proc collectors are incompatible with testsettings
-            var inprocDataCollectionSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(runsettings);
-            if (inprocDataCollectionSettings != null && inprocDataCollectionSettings.IsCollectionEnabled && inprocDataCollectionSettings.DataCollectorSettingsList != null)
-            {
-                foreach (var collectorSettings in inprocDataCollectionSettings.DataCollectorSettingsList)
-                {
-                    if (collectorSettings.IsEnabled)
-                    {
-                        EqtTrace.Warning($"Incompatible collector found. {collectorSettings.FriendlyName} : {collectorSettings.Uri}");
-                        return true;
-                    }
-                }
-            }
-
-            // TestSettings and collection is enabled in runsetttings.. the only allowed collectors are code coverage and fakes
-            var datacollectionSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(runsettings);
-            if (datacollectionSettings != null && datacollectionSettings.IsCollectionEnabled && datacollectionSettings.DataCollectorSettingsList != null)
+            foreach (var collectorSettings in inprocDataCollectionSettings.DataCollectorSettingsList)
             {
-                foreach (var collectorRef in datacollectionSettings.DataCollectorSettingsList)
+                if (collectorSettings.IsEnabled)
                 {
-                    // Ignore disabled collector
-                    if (!collectorRef.IsEnabled)
-                    {
-                        continue;
-                    }
-
-                    // If the configured collector is code coverage or fakes.. ignore
-                    if (!string.IsNullOrWhiteSpace(collectorRef.FriendlyName) &&
-                         (FakesFriendlyName.Equals(collectorRef.FriendlyName, StringComparison.OrdinalIgnoreCase) ||
-                          CodeCoverageFriendlyName.Equals(collectorRef.FriendlyName, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        continue;
-                    }
-
-                    // If the configured collector is code coverage or fakes.. ignore
-                    if (collectorRef.Uri != null &&
-                        (CodeCoverageCollectorUri.Equals(collectorRef.Uri.ToString(), StringComparison.OrdinalIgnoreCase) ||
-                         FakesCollectorUri.Equals(collectorRef.Uri.ToString(), StringComparison.OrdinalIgnoreCase)))
-                    {
-                        continue;
-                    }
-
-                    EqtTrace.Warning($"Incompatible collector found. {collectorRef.FriendlyName} : {collectorRef.Uri}");
+                    EqtTrace.Warning($"Incompatible collector found. {collectorSettings.FriendlyName} : {collectorSettings.Uri}");
                     return true;
                 }
             }
-
-            return false;
         }
 
-        /// <summary>
-        /// Returns true if legacy settings node is present in runsettings
-        /// </summary>
-        /// <param name="runsettingsXml">The run settings xml string</param>
-        /// <param name="legacySettingsTelemetry">The telemetry data that needs to be captured</param>
-        /// <returns></returns>
-        public static bool TryGetLegacySettingElements(string runsettingsXml, out Dictionary<string, string> legacySettingsTelemetry)
+        // TestSettings and collection is enabled in runsetttings.. the only allowed collectors are code coverage and fakes
+        var datacollectionSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(runsettings);
+        if (datacollectionSettings != null && datacollectionSettings.IsCollectionEnabled && datacollectionSettings.DataCollectorSettingsList != null)
         {
-            legacySettingsTelemetry = new Dictionary<string, string>();
-            try
+            foreach (var collectorRef in datacollectionSettings.DataCollectorSettingsList)
             {
-                using (var stream = new StringReader(runsettingsXml))
-                using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
+                // Ignore disabled collector
+                if (!collectorRef.IsEnabled)
                 {
-                    var document = new XmlDocument();
-                    document.Load(reader);
-                    var runSettingsNavigator = document.CreateNavigator();
-
-                    var node = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings");
-                    if (node == null)
-                    {
-                        return false;
-                    }
+                    continue;
+                }
 
-                    var childNodes = node.SelectChildren(XPathNodeType.Element);
+                // If the configured collector is code coverage or fakes.. ignore
+                if (!string.IsNullOrWhiteSpace(collectorRef.FriendlyName) &&
+                    (FakesFriendlyName.Equals(collectorRef.FriendlyName, StringComparison.OrdinalIgnoreCase) ||
+                     CodeCoverageFriendlyName.Equals(collectorRef.FriendlyName, StringComparison.OrdinalIgnoreCase)))
+                {
+                    continue;
+                }
 
-                    var legacySettingElements = new List<string>();
-                    while (childNodes.MoveNext())
-                    {
-                        legacySettingElements.Add(childNodes.Current.Name);
-                    }
+                // If the configured collector is code coverage or fakes.. ignore
+                if (collectorRef.Uri != null &&
+                    (CodeCoverageCollectorUri.Equals(collectorRef.Uri.ToString(), StringComparison.OrdinalIgnoreCase) ||
+                     FakesCollectorUri.Equals(collectorRef.Uri.ToString(), StringComparison.OrdinalIgnoreCase)))
+                {
+                    continue;
+                }
 
-                    foreach (var executionNodePath in ExecutionNodesPaths)
-                    {
-                        var executionNode = runSettingsNavigator.SelectSingleNode(executionNodePath);
-                        if (executionNode != null)
-                        {
-                            legacySettingElements.Add(executionNode.Name);
-                        }
-                    }
+                EqtTrace.Warning($"Incompatible collector found. {collectorRef.FriendlyName} : {collectorRef.Uri}");
+                return true;
+            }
+        }
 
-                    if (legacySettingElements.Count > 0)
-                    {
-                        legacySettingsTelemetry.Add(LegacyElementsString, string.Join(", ", legacySettingElements));
-                    }
+        return false;
+    }
 
-                    var deploymentNode = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment");
-                    var deploymentAttributes = GetNodeAttributes(deploymentNode);
-                    if (deploymentAttributes != null)
-                    {
-                        legacySettingsTelemetry.Add(DeploymentAttributesString, string.Join(", ", deploymentAttributes));
-                    }
+    /// <summary>
+    /// Returns true if legacy settings node is present in runsettings
+    /// </summary>
+    /// <param name="runsettingsXml">The run settings xml string</param>
+    /// <param name="legacySettingsTelemetry">The telemetry data that needs to be captured</param>
+    /// <returns></returns>
+    public static bool TryGetLegacySettingElements(string runsettingsXml, out Dictionary<string, string> legacySettingsTelemetry)
+    {
+        legacySettingsTelemetry = new Dictionary<string, string>();
+        try
+        {
+            using var stream = new StringReader(runsettingsXml);
+            using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+            var document = new XmlDocument();
+            document.Load(reader);
+            var runSettingsNavigator = document.CreateNavigator()!;
 
-                    var executiontNode = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings/Execution");
-                    var executiontAttributes = GetNodeAttributes(executiontNode);
-                    if (executiontAttributes != null)
-                    {
-                        legacySettingsTelemetry.Add(ExecutionAttributesString, string.Join(", ", executiontAttributes));
-                    }
-                }
-            }
-            catch (Exception ex)
+            var node = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings");
+            if (node == null)
             {
-                EqtTrace.Error("Error while trying to read legacy settings. Message: {0}", ex.ToString());
                 return false;
             }
 
-            return true;
-        }
+            var childNodes = node.SelectChildren(XPathNodeType.Element);
 
-        private static List<string> GetNodeAttributes(XPathNavigator node)
-        {
-            if (node != null && node.HasAttributes)
+            var legacySettingElements = new List<string>();
+            while (childNodes.MoveNext())
             {
-                var attributes = new List<string>();
-                node.MoveToFirstAttribute();
-                attributes.Add(node.Name);
-                while (node.MoveToNextAttribute())
-                {
-                    attributes.Add(node.Name);
-                }
-                return attributes;
+                legacySettingElements.Add(childNodes.Current!.Name);
             }
 
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a dictionary of environment variables given in run settings
-        /// </summary>
-        /// <param name="runsettingsXml">The run settings xml string</param>
-        /// <returns>Environment Variables Dictionary</returns>
-        public static Dictionary<string, string> GetEnvironmentVariables(string runSettings)
-        {
-            Dictionary<string, string> environmentVariables = null;
-            try
+            foreach (var executionNodePath in ExecutionNodesPaths)
             {
-                using (var stream = new StringReader(runSettings))
-                using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
+                var executionNode = runSettingsNavigator.SelectSingleNode(executionNodePath);
+                if (executionNode != null)
                 {
-                    var document = new XmlDocument();
-                    document.Load(reader);
-                    var runSettingsNavigator = document.CreateNavigator();
-
-                    var node = runSettingsNavigator.SelectSingleNode(EnvironmentVariablesNodePath);
-                    if (node == null)
-                    {
-                        return null;
-                    }
-
-                    environmentVariables = new Dictionary<string, string>();
-                    var childNodes = node.SelectChildren(XPathNodeType.Element);
-
-                    while (childNodes.MoveNext())
-                    {
-                        if (!environmentVariables.ContainsKey(childNodes.Current.Name))
-                        {
-                            environmentVariables.Add(childNodes.Current.Name, childNodes.Current?.Value);
-                        }
-                    }
+                    legacySettingElements.Add(executionNode.Name);
                 }
             }
-            catch (Exception ex)
+
+            if (legacySettingElements.Count > 0)
             {
-                EqtTrace.Error("Error while trying to read environment variables settings. Message: {0}", ex.ToString());
-                return null;
+                legacySettingsTelemetry.Add(LegacyElementsString, string.Join(", ", legacySettingElements));
             }
 
-            return environmentVariables;
+            var deploymentNode = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment");
+            var deploymentAttributes = GetNodeAttributes(deploymentNode);
+            if (deploymentAttributes != null)
+            {
+                legacySettingsTelemetry.Add(DeploymentAttributesString, string.Join(", ", deploymentAttributes));
+            }
+
+            var executiontNode = runSettingsNavigator.SelectSingleNode(@"/RunSettings/LegacySettings/Execution");
+            var executiontAttributes = GetNodeAttributes(executiontNode);
+            if (executiontAttributes != null)
+            {
+                legacySettingsTelemetry.Add(ExecutionAttributesString, string.Join(", ", executiontAttributes));
+            }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("Error while trying to read legacy settings. Message: {0}", ex.ToString());
+            return false;
+        }
+
+        return true;
+    }
 
-        /// <summary>
-        /// Updates the <c>RunConfiguration.TargetPlatform</c> value for a run settings. if the value is already set, behavior depends on overwrite.
-        /// </summary>
-        /// <param name="runSettingsDocument">Navigator for runsettings xml</param>
-        /// <param name="platform">Value to set</param>
-        /// <param name="overwrite">Overwrite option.</param>
-        public static void UpdateTargetPlatform(XmlDocument runSettingsDocument, string platform, bool overwrite = false)
+    private static List<string>? GetNodeAttributes(XPathNavigator? node)
+    {
+        if (node == null || !node.HasAttributes)
         {
-            AddNodeIfNotPresent<string>(runSettingsDocument, TargetPlatformNodePath, TargetPlatformNodeName, platform, overwrite);
+            return null;
         }
 
-        public static bool TryGetDeviceXml(XPathNavigator runSettingsNavigator, out String deviceXml)
+        var attributes = new List<string>();
+        node.MoveToFirstAttribute();
+        attributes.Add(node.Name);
+        while (node.MoveToNextAttribute())
         {
-            ValidateArg.NotNull(runSettingsNavigator, nameof(runSettingsNavigator));
+            attributes.Add(node.Name);
+        }
+        return attributes;
+    }
 
-            deviceXml = null;
-            XPathNavigator targetDeviceNode = runSettingsNavigator.SelectSingleNode(MsTestTargetDeviceNodePath);
-            if (targetDeviceNode != null)
-            {
-                deviceXml = targetDeviceNode.InnerXml;
-                return true;
-            }
-            return false;
+    /// <summary>
+    /// Returns a dictionary of environment variables given in run settings
+    /// </summary>
+    /// <param name="runSettings">The run settings xml string</param>
+    /// <returns>Environment Variables Dictionary</returns>
+    public static Dictionary<string, string?>? GetEnvironmentVariables(string? runSettings)
+    {
+        Dictionary<string, string?>? environmentVariables = null;
+        if (runSettings is null)
+        {
+            return environmentVariables;
         }
 
-        /// <summary>
-        /// Check if testsettings in configured using runsettings.
-        /// </summary>
-        /// <param name="runsettingsXml">xml string of runsetting</param>
-        /// <returns></returns>
-        public static bool IsTestSettingsEnabled(string runsettingsXml)
+        try
         {
-            if (string.IsNullOrWhiteSpace(runsettingsXml))
-            {
-                return false;
-            }
+            using var stream = new StringReader(runSettings);
+            using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+            var document = new XmlDocument();
+            document.Load(reader);
+            var runSettingsNavigator = document.CreateNavigator()!;
 
-            using (var stream = new StringReader(runsettingsXml))
-            using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
+            var node = runSettingsNavigator.SelectSingleNode(EnvironmentVariablesNodePath);
+            if (node == null)
             {
-                var document = new XmlDocument();
-                document.Load(reader);
-
-                var runSettingsNavigator = document.CreateNavigator();
+                return null;
+            }
 
-                // Move navigator to MSTest node
-                if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty) ||
-                    !runSettingsNavigator.MoveToChild("MSTest", string.Empty))
-                {
-                    EqtTrace.Info("InferRunSettingsHelper.IsTestSettingsEnabled: Unable to navigate to RunSettings/MSTest. Current node: " + runSettingsNavigator.LocalName);
-                    return false;
-                }
+            environmentVariables = new Dictionary<string, string?>();
+            var childNodes = node.SelectChildren(XPathNodeType.Element);
 
-                var node = runSettingsNavigator.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-                if (node != null && !string.IsNullOrEmpty(node.InnerXml))
+            while (childNodes.MoveNext())
+            {
+                if (!environmentVariables.ContainsKey(childNodes.Current!.Name))
                 {
-                    return true;
+                    environmentVariables.Add(childNodes.Current.Name, childNodes.Current?.Value);
                 }
             }
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("Error while trying to read environment variables settings. Message: {0}", ex.ToString());
+            return null;
+        }
+
+        return environmentVariables;
+    }
+
+    /// <summary>
+    /// Updates the <c>RunConfiguration.TargetPlatform</c> value for a run settings. if the value is already set, behavior depends on overwrite.
+    /// </summary>
+    /// <param name="runSettingsDocument">Navigator for runsettings xml</param>
+    /// <param name="platform">Value to set</param>
+    /// <param name="overwrite">Overwrite option.</param>
+    public static void UpdateTargetPlatform(XmlDocument runSettingsDocument, string platform, bool overwrite = false)
+        => AddNodeIfNotPresent(runSettingsDocument, TargetPlatformNodePath, TargetPlatformNodeName, platform, overwrite);
+
+    public static bool TryGetDeviceXml(XPathNavigator runSettingsNavigator, [NotNullWhen(true)] out string? deviceXml)
+    {
+        ValidateArg.NotNull(runSettingsNavigator, nameof(runSettingsNavigator));
 
+        deviceXml = null;
+        var targetDeviceNode = runSettingsNavigator.SelectSingleNode(MsTestTargetDeviceNodePath);
+        if (targetDeviceNode != null)
+        {
+            deviceXml = targetDeviceNode.InnerXml;
+            return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// Check if testsettings in configured using runsettings.
+    /// </summary>
+    /// <param name="runsettingsXml">xml string of runsetting</param>
+    /// <returns></returns>
+    public static bool IsTestSettingsEnabled(string? runsettingsXml)
+    {
+        if (runsettingsXml.IsNullOrWhiteSpace())
+        {
+            return false;
+        }
+
+        using var stream = new StringReader(runsettingsXml);
+        using var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
+
+        var runSettingsNavigator = document.CreateNavigator()!;
+
+        // Move navigator to MSTest node
+        if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty) ||
+            !runSettingsNavigator.MoveToChild("MSTest", string.Empty))
+        {
+            EqtTrace.Info("InferRunSettingsHelper.IsTestSettingsEnabled: Unable to navigate to RunSettings/MSTest. Current node: " + runSettingsNavigator.LocalName);
             return false;
         }
 
-        /// <summary>
-        /// Adds node under RunConfiguration setting. No op if node is already present.
-        /// </summary>
-        private static void AddNodeIfNotPresent<T>(XmlDocument xmlDocument, string nodePath, string nodeName, T nodeValue, bool overwrite = false)
+        var node = runSettingsNavigator.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+        if (node != null && !node.InnerXml.IsNullOrEmpty())
         {
-            // Navigator should be at Root of runsettings xml, attempt to move to /RunSettings/RunConfiguration
-            var root = xmlDocument.DocumentElement;
+            return true;
+        }
 
-            if (root.SelectSingleNode(RunConfigurationNodePath) == null)
+        return false;
+    }
+
+    /// <summary>
+    /// Adds node under RunConfiguration setting. No op if node is already present.
+    /// </summary>
+    private static void AddNodeIfNotPresent<T>(XmlDocument xmlDocument, string nodePath, string nodeName, T nodeValue, bool overwrite = false)
+        where T : notnull
+    {
+        // Navigator should be at Root of runsettings xml, attempt to move to /RunSettings/RunConfiguration
+        var root = xmlDocument.DocumentElement;
+
+        if (root?.SelectSingleNode(RunConfigurationNodePath) == null)
+        {
+            if (root?.Name == RunSettingsNodeName)
+            {
+                // When just <RunSettings></RunSettings> is provided in the runsettings string, then this will add the common RunConfiguration inner node.
+                XmlUtilities.AppendOrModifyChild(xmlDocument, RunConfigurationNodePath, RunConfigurationNodeName, innerXml: null);
+            }
+            else
             {
                 EqtTrace.Error("InferRunSettingsHelper.UpdateNodeIfNotPresent: Unable to navigate to RunConfiguration. Current node: " + xmlDocument.LocalName);
                 return;
             }
+        }
 
-            var node = xmlDocument.SelectSingleNode(nodePath);
-            if (node == null || overwrite)
-            {
-                XmlUtilities.AppendOrModifyChild(xmlDocument, nodePath, nodeName, nodeValue.ToString());
-            }
+        var node = xmlDocument.SelectSingleNode(nodePath);
+        if (node == null || overwrite)
+        {
+            XmlUtilities.AppendOrModifyChild(xmlDocument, nodePath, nodeName, nodeValue.ToString());
+        }
+    }
+
+    /// <summary>
+    /// Validates the RunConfiguration setting in run settings.
+    /// </summary>
+    private static void ValidateRunConfiguration(XPathNavigator runSettingsNavigator)
+    {
+        if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty))
+        {
+            throw new XmlException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    UtilitiesResources.RunSettingsParseError,
+                    UtilitiesResources.MissingRunSettingsNode));
         }
 
-        /// <summary>
-        /// Validates the RunConfiguration setting in run settings.
-        /// </summary>
-        private static void ValidateRunConfiguration(XPathNavigator runSettingsNavigator)
+        if (runSettingsNavigator.MoveToChild(RunConfigurationNodeName, string.Empty))
         {
-            if (!runSettingsNavigator.MoveToChild(RunSettingsNodeName, string.Empty))
+            if (!TryGetPlatformXml(runSettingsNavigator, out var nodeXml))
             {
                 throw new XmlException(
                     string.Format(
                         CultureInfo.CurrentCulture,
                         UtilitiesResources.RunSettingsParseError,
-                        UtilitiesResources.MissingRunSettingsNode));
-            }
-
-            if (runSettingsNavigator.MoveToChild(RunConfigurationNodeName, string.Empty))
-            {
-                if (!TryGetPlatformXml(runSettingsNavigator, out var nodeXml))
-                {
-                    throw new XmlException(
                         string.Format(
                             CultureInfo.CurrentCulture,
-                            UtilitiesResources.RunSettingsParseError,
-                            string.Format(
-                                CultureInfo.CurrentCulture,
-                                UtilitiesResources.InvalidSettingsIncorrectValue,
-                                Constants.RunConfigurationSettingsName,
-                                nodeXml,
-                                TargetPlatformNodeName)));
-                }
+                            UtilitiesResources.InvalidSettingsIncorrectValue,
+                            Constants.RunConfigurationSettingsName,
+                            nodeXml,
+                            TargetPlatformNodeName)));
+            }
 
-                if (!TryGetFrameworkXml(runSettingsNavigator, out nodeXml))
-                {
-                    throw new XmlException(
+            if (!TryGetFrameworkXml(runSettingsNavigator, out nodeXml))
+            {
+                throw new XmlException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        UtilitiesResources.RunSettingsParseError,
                         string.Format(
                             CultureInfo.CurrentCulture,
-                            UtilitiesResources.RunSettingsParseError,
-                            string.Format(
-                                CultureInfo.CurrentCulture,
-                                UtilitiesResources.InvalidSettingsIncorrectValue,
-                                Constants.RunConfigurationSettingsName,
-                                nodeXml,
-                                TargetFrameworkNodeName)));
-                }
+                            UtilitiesResources.InvalidSettingsIncorrectValue,
+                            Constants.RunConfigurationSettingsName,
+                            nodeXml,
+                            TargetFrameworkNodeName)));
             }
         }
+    }
 
-        /// <summary>
-        /// Throws SettingsException if platform is incompatible with system architecture.
-        /// </summary>
-        /// <param name="architecture"></param>
-        private static void VerifyCompatibilityWithOSArchitecture(Architecture architecture)
+    /// <summary>
+    /// Regenerates the RunConfiguration node with new values under runsettings.
+    /// </summary>
+    private static void UpdateRunConfiguration(
+        XmlDocument xmlDocument,
+        Architecture effectivePlatform,
+        Framework effectiveFramework,
+        string? resultsDirectory)
+    {
+        var childNode = xmlDocument.SelectSingleNode(ResultsDirectoryNodePath);
+        if (childNode != null)
         {
-            var osArchitecture = XmlRunSettingsUtilities.OSArchitecture;
+            resultsDirectory = childNode.InnerXml;
+        }
 
-            if (architecture == Architecture.X86 && osArchitecture == Architecture.X64)
-            {
-                return;
-            }
+        XmlUtilities.AppendOrModifyChild(xmlDocument, RunConfigurationNodePath, RunConfigurationNodeName, null);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, ResultsDirectoryNodePath, ResultsDirectoryNodeName, resultsDirectory);
 
-            if (architecture == osArchitecture)
-            {
-                return;
-            }
+        XmlUtilities.AppendOrModifyChild(xmlDocument, TargetPlatformNodePath, TargetPlatformNodeName, effectivePlatform.ToString());
+        XmlUtilities.AppendOrModifyChild(xmlDocument, TargetFrameworkNodePath, TargetFrameworkNodeName, effectiveFramework.ToString());
+    }
+
+    public static bool TryGetPlatformXml(XPathNavigator runSettingsNavigator, out string? platformXml)
+    {
+        platformXml = XmlUtilities.GetNodeXml(runSettingsNavigator, TargetPlatformNodePath);
 
-            throw new SettingsException(string.Format(CultureInfo.CurrentCulture, UtilitiesResources.SystemArchitectureIncompatibleWithTargetPlatform, architecture, osArchitecture));
+        if (platformXml == null)
+        {
+            return true;
         }
 
-        /// <summary>
-        /// Regenerates the RunConfiguration node with new values under runsettings.
-        /// </summary>
-        private static void UpdateRunConfiguration(
-            XmlDocument xmlDocument,
-            Architecture effectivePlatform,
-            Framework effectiveFramework,
-            string resultsDirectory)
-        {
-            var childNode = xmlDocument.SelectSingleNode(ResultsDirectoryNodePath);
-            if (childNode != null)
-            {
-                resultsDirectory = childNode.InnerXml;
-            }
+        Func<string, bool> validator = (string xml) =>
+        {
+            var value = (Architecture)Enum.Parse(typeof(Architecture), xml, true);
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, RunConfigurationNodePath, RunConfigurationNodeName, null);
-            XmlUtilities.AppendOrModifyChild(xmlDocument, ResultsDirectoryNodePath, ResultsDirectoryNodeName, resultsDirectory);
+            return Enum.IsDefined(typeof(Architecture), value) && value != Architecture.Default && value != Architecture.AnyCPU;
+        };
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, TargetPlatformNodePath, TargetPlatformNodeName, effectivePlatform.ToString());
-            XmlUtilities.AppendOrModifyChild(xmlDocument, TargetFrameworkNodePath, TargetFrameworkNodeName, effectiveFramework.ToString());
-        }
+        return XmlUtilities.IsValidNodeXmlValue(platformXml, validator);
+    }
+
+    /// <summary>
+    /// Validate if TargetFrameworkVersion in run settings has valid value.
+    /// </summary>
+    public static bool TryGetFrameworkXml(XPathNavigator runSettingsNavigator, out string? frameworkXml)
+    {
+        frameworkXml = XmlUtilities.GetNodeXml(runSettingsNavigator, TargetFrameworkNodePath);
 
-        public static bool TryGetPlatformXml(XPathNavigator runSettingsNavigator, out string platformXml)
+        if (frameworkXml == null)
         {
-            platformXml = XmlUtilities.GetNodeXml(runSettingsNavigator, TargetPlatformNodePath);
+            return true;
+        }
 
-            if (platformXml == null)
+        Func<string, bool> validator = (string xml) =>
+        {
+            if (Framework.FromString(xml) != null)
             {
+                // Allow TargetFrameworkMoniker values like .NETFramework,Version=v4.5, ".NETCoreApp,Version=v1.0
                 return true;
             }
 
-            Func<string, bool> validator = (string xml) =>
-            {
-                var value = (Architecture)Enum.Parse(typeof(Architecture), xml, true);
-
-                if (!Enum.IsDefined(typeof(Architecture), value) || value == Architecture.Default || value == Architecture.AnyCPU)
-                {
-                    return false;
-                }
+            var value = (FrameworkVersion)Enum.Parse(typeof(FrameworkVersion), xml, true);
 
-                return true;
-            };
+            return Enum.IsDefined(typeof(FrameworkVersion), value) && value != FrameworkVersion.None;
+        };
 
-            return XmlUtilities.IsValidNodeXmlValue(platformXml, validator);
-        }
+        return XmlUtilities.IsValidNodeXmlValue(frameworkXml, validator);
+    }
 
-        /// <summary>
-        /// Validate if TargetFrameworkVersion in run settings has valid value.
-        /// </summary>
-        public static bool TryGetFrameworkXml(XPathNavigator runSettingsNavigator, out string frameworkXml)
+    /// <summary>
+    /// Returns the sources matching the specified platform and framework settings.
+    /// For incompatible sources, warning is added to incompatibleSettingWarning.
+    /// </summary>
+    [SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Part of the public API")]
+    public static IEnumerable<string> FilterCompatibleSources(Architecture chosenPlatform, Architecture defaultArchitecture, Framework chosenFramework, IDictionary<string, Architecture> sourcePlatforms, IDictionary<string, Framework> sourceFrameworks, out string incompatibleSettingWarning)
+    {
+        incompatibleSettingWarning = string.Empty;
+        List<string> compatibleSources = new();
+        StringBuilder warnings = new();
+        warnings.AppendLine();
+        bool incompatibilityFound = false;
+        foreach (var source in sourcePlatforms.Keys)
         {
-            frameworkXml = XmlUtilities.GetNodeXml(runSettingsNavigator, TargetFrameworkNodePath);
+            Architecture actualPlatform = sourcePlatforms[source];
+            Framework actualFramework = sourceFrameworks[source];
+            bool isSettingIncompatible = IsSettingIncompatible(actualPlatform, chosenPlatform, actualFramework, chosenFramework);
+            if (isSettingIncompatible)
+            {
+                var onlyFileName = Path.GetFileName(source);
+                // Add message for incompatible sources.
+                var incompatibilityMessage = string.Format(CultureInfo.CurrentCulture, OMResources.SourceIncompatible, onlyFileName, actualFramework.Name, actualPlatform);
 
-            if (frameworkXml == null)
+                warnings.AppendLine(incompatibilityMessage);
+                incompatibilityFound = true;
+            }
+            else
             {
-                return true;
+                compatibleSources.Add(source);
             }
+        }
 
-            Func<string, bool> validator = (string xml) =>
-            {
-                if (Framework.FromString(xml) != null)
-                {
-                    // Allow TargetFrameworkMoniker values like .NETFramework,Version=v4.5, ".NETCoreApp,Version=v1.0
-                    return true;
-                }
+        if (incompatibilityFound)
+        {
+            incompatibleSettingWarning = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, chosenFramework, chosenPlatform, warnings.ToString(), MultiTargetingForwardLink);
+        }
 
-                var value = (FrameworkVersion)Enum.Parse(typeof(FrameworkVersion), xml, true);
+        return compatibleSources;
+    }
 
-                if (!Enum.IsDefined(typeof(FrameworkVersion), value) || value == FrameworkVersion.None)
-                {
-                    return false;
-                }
+    /// <summary>
+    /// Returns true if source settings are incompatible with target settings.
+    /// </summary>
+    private static bool IsSettingIncompatible(Architecture sourcePlatform,
+        Architecture targetPlatform,
+        Framework sourceFramework,
+        Framework targetFramework)
+    {
+        return IsPlatformIncompatible(sourcePlatform, targetPlatform) || IsFrameworkIncompatible(sourceFramework, targetFramework);
+    }
 
-                return true;
-            };
+    /// <summary>
+    /// Returns true if source Platform is incompatible with target platform.
+    /// </summary>
+    private static bool IsPlatformIncompatible(Architecture sourcePlatform, Architecture targetPlatform)
+    {
+        return sourcePlatform is not Architecture.Default and not Architecture.AnyCPU
+            && (targetPlatform == Architecture.X64 && !Environment.Is64BitOperatingSystem || sourcePlatform != targetPlatform);
+    }
 
-            return XmlUtilities.IsValidNodeXmlValue(frameworkXml, validator);
-        }
+    /// <summary>
+    /// Returns true if source FrameworkVersion is incompatible with target FrameworkVersion.
+    /// </summary>
+    private static bool IsFrameworkIncompatible(Framework sourceFramework, Framework targetFramework)
+    {
+        return !sourceFramework.Name.Equals(Framework.DefaultFramework.Name, StringComparison.OrdinalIgnoreCase)
+               && !sourceFramework.Name.Equals(targetFramework.Name, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public static bool UpdateCollectCoverageSettings(XmlDocument xmlDocument)
+    {
+        var root = xmlDocument.DocumentElement;
 
-        /// <summary>
-        /// Returns the sources matching the specified platform and framework settings.
-        /// For incompatible sources, warning is added to incompatibleSettingWarning.
-        /// </summary>
-        public static IEnumerable<String> FilterCompatibleSources(Architecture chosenPlatform, Architecture defaultArchitecture, Framework chosenFramework, IDictionary<String, Architecture> sourcePlatforms, IDictionary<String, Framework> sourceFrameworks, out String incompatibleSettingWarning)
-        {
-            incompatibleSettingWarning = string.Empty;
-            List<String> compatibleSources = new List<String>();
-            StringBuilder warnings = new StringBuilder();
-            warnings.AppendLine();
-            bool incompatiblityFound = false;
-            foreach (var source in sourcePlatforms.Keys)
+        var dataCollectorNodes = root?.SelectNodes("DataCollectionRunSettings/DataCollectors/DataCollector");
+        if (dataCollectorNodes == null)
+        {
+            return false;
+        }
+        foreach (XmlNode dataCollectorNode in dataCollectorNodes)
+        {
+            var dataCollectorFound = false;
+            foreach (XmlAttribute attribute in dataCollectorNode.Attributes!)
             {
-                Architecture actualPlatform = sourcePlatforms[source];
-                Framework actualFramework = sourceFrameworks[source];
-                bool isSettingIncompatible = IsSettingIncompatible(actualPlatform, chosenPlatform, actualFramework, chosenFramework);
-                if (isSettingIncompatible)
+                if (attribute.Name.Equals("friendlyName", StringComparison.OrdinalIgnoreCase) &&
+                    attribute.Value.Equals("Code Coverage", StringComparison.OrdinalIgnoreCase))
                 {
-                    string incompatiblityMessage;
-                    var onlyFileName = Path.GetFileName(source);
-                    // Add message for incompatible sources.
-                    incompatiblityMessage = string.Format(CultureInfo.CurrentCulture, OMResources.SourceIncompatible, onlyFileName, actualFramework.Name, actualPlatform);
+                    dataCollectorFound = true;
+                    break;
+                }
 
-                    warnings.AppendLine(incompatiblityMessage);
-                    incompatiblityFound = true;
+                if (attribute.Name.Equals("uri", StringComparison.OrdinalIgnoreCase) &&
+                    attribute.Value.Equals(CodeCoverageCollectorUri, StringComparison.OrdinalIgnoreCase))
+                {
+                    dataCollectorFound = true;
+                    break;
                 }
-                else
+
+                if (attribute.Name.Equals("assemblyQualifiedName", StringComparison.OrdinalIgnoreCase) &&
+                    attribute.Value.IndexOf("Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector", StringComparison.OrdinalIgnoreCase) >= 0)
                 {
-                    compatibleSources.Add(source);
+                    dataCollectorFound = true;
+                    break;
                 }
             }
 
-            if (incompatiblityFound)
+            if (dataCollectorFound)
             {
-                incompatibleSettingWarning = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, chosenFramework, defaultArchitecture, warnings.ToString(), multiTargettingForwardLink);
-            }
+                var coverageCollectorNode = dataCollectorNode;
+                // Code coverage settings are present, we should update them.
 
-            return compatibleSources;
-        }
+                var dynamicNativeInstrumentationNode = coverageCollectorNode.SelectSingleNode("Configuration/CodeCoverage/EnableDynamicNativeInstrumentation");
 
-        /// <summary>
-        /// Returns true if source settings are incompatible with target settings.
-        /// </summary>
-        private static bool IsSettingIncompatible(Architecture sourcePlatform,
-            Architecture targetPlatform,
-            Framework sourceFramework,
-            Framework targetFramework)
-        {
-            return IsPlatformIncompatible(sourcePlatform, targetPlatform) || IsFrameworkIncompatible(sourceFramework, targetFramework);
-        }
+                if (dynamicNativeInstrumentationNode == null)
+                {
+                    // EnableDynamicNativeInstrumentation is not set explicitly, we should set it. Whole tree might not exist.
 
-        /// <summary>
-        /// Returns true if source Platform is incompatible with target platform.
-        /// </summary>
-        private static bool IsPlatformIncompatible(Architecture sourcePlatform, Architecture targetPlatform)
-        {
-            if (sourcePlatform == Architecture.Default ||
-                sourcePlatform == Architecture.AnyCPU)
-            {
-                return false;
-            }
-            if (targetPlatform == Architecture.X64 && !Is64BitOperatingSystem())
-            {
-                return true;
-            }
-            return sourcePlatform != targetPlatform;
+                    var currentNode = coverageCollectorNode;
+                    var paths = "Configuration/CodeCoverage/EnableDynamicNativeInstrumentation".Split('/');
+                    foreach (var nodeName in paths)
+                    {
+                        var found = false;
+                        foreach (XmlNode childNode in currentNode.ChildNodes)
+                        {
+                            if (childNode.Name == nodeName)
+                            {
+                                currentNode = childNode;
+                                found = true;
+                                break;
+                            }
+                        }
 
-            bool Is64BitOperatingSystem()
-            {
-#if !NETSTANDARD1_3
-                return Environment.Is64BitOperatingSystem;
-#else
-                // In the absence of APIs to check, assume the majority case
-                return true;
-#endif
-            }
-        }
+                        if (!found)
+                        {
+                            var newNode = xmlDocument.CreateElement(nodeName);
+                            currentNode.AppendChild(newNode);
+                            currentNode = newNode;
+                        }
+                    }
 
-        /// <summary>
-        /// Returns true if source FrameworkVersion is incompatible with target FrameworkVersion.
-        /// </summary>
-        private static bool IsFrameworkIncompatible(Framework sourceFramework, Framework targetFramework)
-        {
-            if (sourceFramework.Name.Equals(Framework.DefaultFramework.Name, StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
+                    currentNode.InnerXml = "False";
+
+                    return true;
+                }
             }
-            return !sourceFramework.Name.Equals(targetFramework.Name, StringComparison.OrdinalIgnoreCase);
         }
+
+        return false;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/MSTestSettingsUtilities.cs b/src/Microsoft.TestPlatform.Utilities/MSTestSettingsUtilities.cs
index e0cb77acf2..7ab3c57cde 100644
--- a/src/Microsoft.TestPlatform.Utilities/MSTestSettingsUtilities.cs
+++ b/src/Microsoft.TestPlatform.Utilities/MSTestSettingsUtilities.cs
@@ -1,96 +1,90 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using UtilitiesResources = Microsoft.VisualStudio.TestPlatform.Utilities.Resources.Resources;
 
-    using UtilitiesResources = Microsoft.VisualStudio.TestPlatform.Utilities.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
 
+/// <summary>
+/// The legacy mstest.exe settings utilities.
+/// </summary>
+public static class MSTestSettingsUtilities
+{
     /// <summary>
-    /// The legacy mstest.exe settings utilities.
+    /// Imports the parameter settings file in the default runsettings.
     /// </summary>
-    public static class MSTestSettingsUtilities
+    /// <param name="settingsFile">
+    /// Settings file which need to be imported. The file extension of the settings file will be specified by <c>SettingsFileExtension</c> property.
+    /// </param>
+    /// <param name="defaultRunSettings"> Input RunSettings document to which settings file need to be imported. </param>
+    /// <returns> Updated RunSetting Xml document with imported settings. </returns>
+    public static XmlDocument Import(string settingsFile, XmlDocument defaultRunSettings)
     {
-        /// <summary>
-        /// Imports the parameter settings file in the default runsettings.
-        /// </summary>
-        /// <param name="settingsFile">
-        /// Settings file which need to be imported. The file extension of the settings file will be specified by <paramref name="SettingsFileExtension"/> property.
-        /// </param>
-        /// <param name="defaultRunSettings"> Input RunSettings document to which settings file need to be imported. </param>
-        /// <returns> Updated RunSetting Xml document with imported settings. </returns>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        public static XmlDocument Import(string settingsFile, XmlDocument defaultRunSettings)
-        {
-            ValidateArg.NotNull(settingsFile, nameof(settingsFile));
-            ValidateArg.NotNull(defaultRunSettings, nameof(defaultRunSettings));
-
-            if (IsLegacyTestSettingsFile(settingsFile) == false)
-            {
-                throw new XmlException(string.Format(CultureInfo.CurrentCulture, UtilitiesResources.UnExpectedSettingsFile));
-            }
+        ValidateArg.NotNull(settingsFile, nameof(settingsFile));
+        ValidateArg.NotNull(defaultRunSettings, nameof(defaultRunSettings));
 
-            var navigator = defaultRunSettings.CreateNavigator();
+        if (IsLegacyTestSettingsFile(settingsFile) == false)
+        {
+            throw new XmlException(string.Format(CultureInfo.CurrentCulture, UtilitiesResources.UnExpectedSettingsFile));
+        }
 
-            if (!navigator.MoveToChild(Constants.RunSettingsName, string.Empty))
-            {
-                throw new XmlException(UtilitiesResources.NoRunSettingsNodeFound);
-            }
+        var navigator = defaultRunSettings.CreateNavigator()!;
 
-            var settingsNode = GenerateMSTestXml(settingsFile);
+        if (!navigator.MoveToChild(Constants.RunSettingsName, string.Empty))
+        {
+            throw new XmlException(UtilitiesResources.NoRunSettingsNodeFound);
+        }
 
-            defaultRunSettings.DocumentElement.PrependChild(defaultRunSettings.ImportNode(settingsNode, true));
+        var settingsNode = GenerateMsTestXml(settingsFile);
 
-            // Adding RunConfig
-            if (!navigator.MoveToChild(Constants.RunConfigurationSettingsName, string.Empty))
-            {
-                var doc = new XmlDocument();
-                var runConfigurationNode = doc.CreateElement(Constants.RunConfigurationSettingsName);
+        defaultRunSettings.DocumentElement!.PrependChild(defaultRunSettings.ImportNode(settingsNode, true));
 
-                defaultRunSettings.DocumentElement.PrependChild(defaultRunSettings.ImportNode(runConfigurationNode, true));
-            }
+        // Adding RunConfig
+        if (!navigator.MoveToChild(Constants.RunConfigurationSettingsName, string.Empty))
+        {
+            var doc = new XmlDocument();
+            var runConfigurationNode = doc.CreateElement(Constants.RunConfigurationSettingsName);
 
-            return defaultRunSettings;
+            defaultRunSettings.DocumentElement.PrependChild(defaultRunSettings.ImportNode(runConfigurationNode, true));
         }
 
-        public static bool IsLegacyTestSettingsFile(string settingsFile)
-        {
-            return string.Equals(Path.GetExtension(settingsFile), ".testSettings", StringComparison.OrdinalIgnoreCase)
-                                || string.Equals(Path.GetExtension(settingsFile), ".testrunConfig", StringComparison.OrdinalIgnoreCase)
-                                || string.Equals(Path.GetExtension(settingsFile), ".vsmdi", StringComparison.OrdinalIgnoreCase);
-        }
+        return defaultRunSettings;
+    }
 
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private static XmlElement GenerateMSTestXml(string settingsFile)
-        {
-            // Generate the MSTest xml
-            //
-            // <MSTest>
-            //   <TestSettingsFile>C:\local.testsettings</TestSettingsFile>
-            //   <ForcedLegacyMode>true</ForcedLegacyMode>
-            // </MSTest>
-            //
-            XmlDocument doc = new XmlDocument();
-            XmlElement mstestNode = doc.CreateElement("MSTest");
-
-            XmlElement testSettingsFileNode = doc.CreateElement("SettingsFile");
-            testSettingsFileNode.InnerXml = settingsFile;
-            mstestNode.AppendChild(testSettingsFileNode);
-
-            XmlElement forcedLegacyModeNode = doc.CreateElement("ForcedLegacyMode");
-            forcedLegacyModeNode.InnerXml = "true";
-            mstestNode.AppendChild(forcedLegacyModeNode);
-
-            return mstestNode;
-        }
+    public static bool IsLegacyTestSettingsFile(string? settingsFile)
+    {
+        return string.Equals(Path.GetExtension(settingsFile), ".testSettings", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(Path.GetExtension(settingsFile), ".testrunConfig", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(Path.GetExtension(settingsFile), ".vsmdi", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static XmlElement GenerateMsTestXml(string settingsFile)
+    {
+        // Generate the MSTest xml
+        //
+        // <MSTest>
+        //   <TestSettingsFile>C:\local.testsettings</TestSettingsFile>
+        //   <ForcedLegacyMode>true</ForcedLegacyMode>
+        // </MSTest>
+        //
+        XmlDocument doc = new();
+        XmlElement mstestNode = doc.CreateElement("MSTest");
+
+        XmlElement testSettingsFileNode = doc.CreateElement("SettingsFile");
+        testSettingsFileNode.InnerXml = settingsFile;
+        mstestNode.AppendChild(testSettingsFileNode);
+
+        XmlElement forcedLegacyModeNode = doc.CreateElement("ForcedLegacyMode");
+        forcedLegacyModeNode.InnerXml = "true";
+        mstestNode.AppendChild(forcedLegacyModeNode);
+
+        return mstestNode;
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
index 5ca7b108d1..8fd6b0b3cd 100644
--- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
+++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
@@ -1,29 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.Utilities</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(ExtensionTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
-  <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -39,5 +31,25 @@
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.Utilities</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.Utilities/NullableHelpers.cs b/src/Microsoft.TestPlatform.Utilities/NullableHelpers.cs
new file mode 100644
index 0000000000..3120aeb0c7
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Utilities/NullableHelpers.tt b/src/Microsoft.TestPlatform.Utilities/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/Microsoft.TestPlatform.Utilities/ParallelRunSettingsUtilities.cs b/src/Microsoft.TestPlatform.Utilities/ParallelRunSettingsUtilities.cs
index a6961b9dee..1eca08118f 100644
--- a/src/Microsoft.TestPlatform.Utilities/ParallelRunSettingsUtilities.cs
+++ b/src/Microsoft.TestPlatform.Utilities/ParallelRunSettingsUtilities.cs
@@ -1,54 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
+using System.Xml.XPath;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+/// <summary>
+/// Utility class for MaxCpuCount element of RunSetting
+/// </summary>
+public static class ParallelRunSettingsUtilities
 {
-    using System.Diagnostics.CodeAnalysis;
-    using System.Xml.XPath;
+    private static readonly string XpathOfRunSettings = @"/RunSettings";
+    private static readonly string XpathOfRunConfiguration = @"/RunSettings/RunConfiguration";
+    private static readonly string XpathOfMaxCpuCount = @"/RunSettings/RunConfiguration/MaxCpuCount";
 
     /// <summary>
-    /// Utility class for MaxCpuCount element of RunSetting
+    /// The MaxCpuCount setting template.
     /// </summary>
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
-    public static class ParallelRunSettingsUtilities
-    {
-        private static string XpathOfRunSettings = @"/RunSettings";
-        private static string XpathOfRunConfiguration = @"/RunSettings/RunConfiguration";
-        private static string XpathOfMaxCpuCount = @"/RunSettings/RunConfiguration/MaxCpuCount";
-
-        /// <summary>
-        /// The MaxCpuCount setting template.
-        /// </summary>
-        private static readonly string MaxCpuCountSettingTemplate = @"<MaxCpuCount>0</MaxCpuCount>";
+    private static readonly string MaxCpuCountSettingTemplate = @"<MaxCpuCount>0</MaxCpuCount>";
 
-        /// <summary>
-        /// The RunConfiguration with MaxCpuCount setting template.
-        /// </summary>
-        private static readonly string RunConfigurationWithMaxCpuCountSettingTemplate = @"<RunConfiguration>
+    /// <summary>
+    /// The RunConfiguration with MaxCpuCount setting template.
+    /// </summary>
+    private static readonly string RunConfigurationWithMaxCpuCountSettingTemplate = @"<RunConfiguration>
                                                                                             <MaxCpuCount>0</MaxCpuCount>
                                                                                           </RunConfiguration>";
 
-        /// <summary>
-        /// This will update the RunSetting with MaxCpuCount 0 if RunSetting doesn't configured with this setting.
-        /// </summary>
-        /// <param name="runSettingsDocument">RunSetting file.</param>
-        public static void UpdateRunSettingsWithParallelSettingIfNotConfigured(XPathNavigator navigator)
+    /// <summary>
+    /// This will update the RunSetting with MaxCpuCount 0 if RunSetting doesn't configured with this setting.
+    /// </summary>
+    /// <param name="navigator">XPATH navigator.</param>
+    public static void UpdateRunSettingsWithParallelSettingIfNotConfigured(XPathNavigator navigator)
+    {
+        var node = navigator.SelectSingleNode(XpathOfMaxCpuCount);
+        // run settings given by user takes precedence over parallel switch
+        if (node != null)
+        {
+            return;
+        }
+
+        var runConfigurationNavigator = navigator.SelectSingleNode(XpathOfRunConfiguration);
+        if (runConfigurationNavigator != null)
+        {
+            runConfigurationNavigator.AppendChild(MaxCpuCountSettingTemplate);
+        }
+        else
         {
-            var node = navigator.SelectSingleNode(XpathOfMaxCpuCount);
-            // run settings given by user takes precedence over parallel switch
-            if (node == null)
-            {
-                var runConfigurationNavigator = navigator.SelectSingleNode(XpathOfRunConfiguration);
-                if (runConfigurationNavigator != null)
-                {
-                    runConfigurationNavigator.AppendChild(MaxCpuCountSettingTemplate);
-                }
-                else
-                {
-                    runConfigurationNavigator = navigator.SelectSingleNode(XpathOfRunSettings);
-                    runConfigurationNavigator?.AppendChild(RunConfigurationWithMaxCpuCountSettingTemplate);
-                }
-            }
+            runConfigurationNavigator = navigator.SelectSingleNode(XpathOfRunSettings);
+            runConfigurationNavigator?.AppendChild(RunConfigurationWithMaxCpuCountSettingTemplate);
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.Utilities/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.Utilities/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5e3b063fa3..0000000000
--- a/src/Microsoft.TestPlatform.Utilities/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Utilities")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bcf6e952-bc36-4e24-b1c4-41988588c59d")]
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..9639b6660b
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,44 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.Utilities.ClientUtilities
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageDataAttachmentsHandler
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageDataAttachmentsHandler.CodeCoverageDataAttachmentsHandler() -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageDataAttachmentsHandler.GetExtensionUris() -> System.Collections.Generic.IEnumerable<System.Uri!>?
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(System.Xml.XmlElement! configurationElement, System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>? attachments, System.IProgress<int>! progressReporter, Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.IMessageLogger? logger, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>!>!
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageDataAttachmentsHandler.SupportsIncrementalProcessing.get -> bool
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageRunSettingsProcessor
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageRunSettingsProcessor.CodeCoverageRunSettingsProcessor(System.Xml.XmlNode! defaultSettingsRootNode) -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageRunSettingsProcessor.Process(string? currentSettings) -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageRunSettingsProcessor.Process(System.Xml.XmlDocument? currentSettingsDocument) -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.Utilities.CodeCoverageRunSettingsProcessor.Process(System.Xml.XmlNode? currentSettingsRootNode) -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.Utilities.CommandLineUtilities
+Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper
+Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.InferRunSettingsHelper() -> void
+Microsoft.VisualStudio.TestPlatform.Utilities.MSTestSettingsUtilities
+Microsoft.VisualStudio.TestPlatform.Utilities.ParallelRunSettingsUtilities
+Microsoft.VisualStudio.TestPlatform.Utilities.StringExtensions
+static Microsoft.VisualStudio.TestPlatform.Utilities.ClientUtilities.FixRelativePathsInRunSettings(System.Xml.XmlDocument! xmlDocument, string! path) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.CommandLineUtilities.SplitCommandLineIntoArguments(string! args, out string![]! arguments) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(string? runsettings) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.FilterCompatibleSources(Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture chosenPlatform, Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture defaultArchitecture, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework! chosenFramework, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture>! sourcePlatforms, System.Collections.Generic.IDictionary<string!, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework!>! sourceFrameworks, out string! incompatibleSettingWarning) -> System.Collections.Generic.IEnumerable<string!>!
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.GetEnvironmentVariables(string? runSettings) -> System.Collections.Generic.Dictionary<string!, string?>?
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.IsTestSettingsEnabled(string? runsettingsXml) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.MakeRunsettingsCompatible(string? runsettingsXml) -> string?
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.RemoveTargetPlatformElement(string? runsettingsXml) -> string?
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.TryGetDeviceXml(System.Xml.XPath.XPathNavigator! runSettingsNavigator, out string? deviceXml) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.TryGetFrameworkXml(System.Xml.XPath.XPathNavigator! runSettingsNavigator, out string? frameworkXml) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.TryGetLegacySettingElements(string! runsettingsXml, out System.Collections.Generic.Dictionary<string!, string!>! legacySettingsTelemetry) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.TryGetPlatformXml(System.Xml.XPath.XPathNavigator! runSettingsNavigator, out string? platformXml) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateCollectSourceInformation(System.Xml.XmlDocument! runSettingsDocument, bool collectSourceInformationValue) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateDesignMode(System.Xml.XmlDocument! runSettingsDocument, bool designModeValue) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(System.Xml.XmlDocument! runSettingsDocument, Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture architecture, Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework! framework, string? resultsDirectory) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateTargetDevice(System.Xml.XmlDocument! runSettingsDocument, string! targetDevice) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateTargetFramework(System.Xml.XmlDocument! runSettingsDocument, string! framework, bool overwrite = false) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateTargetPlatform(System.Xml.XmlDocument! runSettingsDocument, string! platform, bool overwrite = false) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.MSTestSettingsUtilities.Import(string! settingsFile, System.Xml.XmlDocument! defaultRunSettings) -> System.Xml.XmlDocument!
+static Microsoft.VisualStudio.TestPlatform.Utilities.MSTestSettingsUtilities.IsLegacyTestSettingsFile(string? settingsFile) -> bool
+static Microsoft.VisualStudio.TestPlatform.Utilities.ParallelRunSettingsUtilities.UpdateRunSettingsWithParallelSettingIfNotConfigured(System.Xml.XPath.XPathNavigator! navigator) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.StringExtensions.Tokenize(this string? input, char separator, char escape) -> System.Collections.Generic.IEnumerable<string!>!
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateBatchSize(System.Xml.XmlDocument! runSettingsDocument, long batchSizeValue) -> void
+static Microsoft.VisualStudio.TestPlatform.Utilities.InferRunSettingsHelper.UpdateCollectCoverageSettings(System.Xml.XmlDocument! xmlDocument) -> bool
+
+
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
index 25477ab959..7973a35232 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
@@ -11,8 +11,8 @@
 namespace Microsoft.VisualStudio.TestPlatform.Utilities.Resources {
     using System;
     using System.Reflection;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Utilities.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -106,15 +106,6 @@ internal static string RunSettingsParseError {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Incompatible Target platform settings &apos;{0}&apos; with system architecture &apos;{1}&apos;..
-        /// </summary>
-        internal static string SystemArchitectureIncompatibleWithTargetPlatform {
-            get {
-                return ResourceManager.GetString("SystemArchitectureIncompatibleWithTargetPlatform", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unexpected settings file specified..
         /// </summary>
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
index 6a9c1f39f1..0e7cec5c32 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
@@ -132,9 +132,6 @@
   <data name="RunSettingsParseError" xml:space="preserve">
     <value>An error occurred while loading the settings.  Error: {0}.</value>
   </data>
-  <data name="SystemArchitectureIncompatibleWithTargetPlatform" xml:space="preserve">
-    <value>Incompatible Target platform settings '{0}' with system architecture '{1}'.</value>
-  </data>
   <data name="UnExpectedSettingsFile" xml:space="preserve">
     <value>Unexpected settings file specified.</value>
   </data>
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
index 8c267db1e4..ab91224f87 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">Kód XML parametrů spouštění neobsahuje uzel RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Neplatné nastavení {0}. Pro {2} se zadala neplatná hodnota {1}.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít uzel RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít uzel RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Při načítání nastavení se stala chyba. Chyba: {0}</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Nastavení cílové platformy {0} není kompatibilní s architekturou systému {1}.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Zadal se neočekávaný soubor nastavení.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">Kód XML parametrů spouštění neobsahuje uzel RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Neplatné nastavení {0}. Pro {2} se zadala neplatná hodnota {1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nepovedlo se najít uzel RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nepovedlo se najít uzel RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Při načítání nastavení se stala chyba. Chyba: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Zadal se neočekávaný soubor nastavení.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
index 38ee0127b6..2c044f7e52 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">Das Laufzeiteinstellungen-XML enthält nicht den Knoten "RunSettings".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Ungültige Einstellung "{0}". Für "{2}" wurde ein ungültiger Wert "{1}" angegeben.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Der Knoten "RunSettings" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Der Knoten "RunSettings" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Fehler beim Laden der Einstellungen. Fehler: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Inkompatible Zielplattformeinstellungen "{0}" mit der Systemarchitektur "{1}".</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Es wurde eine unerwartete Einstellungsdatei angegeben.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">Das Laufzeiteinstellungen-XML enthält nicht den Knoten "RunSettings".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Ungültige Einstellung "{0}". Für "{2}" wurde ein ungültiger Wert "{1}" angegeben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Der Knoten "RunSettings" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Der Knoten "RunSettings" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Fehler beim Laden der Einstellungen. Fehler: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Es wurde eine unerwartete Einstellungsdatei angegeben.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
index 692b6957eb..c30b355b82 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">El archivo XML de parámetros de ejecución no contiene el nodo "RunSettings".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Parámetro '{0}' no válido. Se ha especificado un valor no válido ({1}) para '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">No se encuentra el nodo 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">No se encuentra el nodo 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Error al cargar la configuración. Error: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">La configuración de plataforma de destino '{0}' es incompatible con la arquitectura del sistema '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Se ha especificado un archivo de configuración no esperado.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">El archivo XML de parámetros de ejecución no contiene el nodo "RunSettings".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Parámetro '{0}' no válido. Se ha especificado un valor no válido ({1}) para '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">No se encuentra el nodo 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">No se encuentra el nodo 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Error al cargar la configuración. Error: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Se ha especificado un archivo de configuración no esperado.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
index 748f424522..7dd5e8a47d 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">Le fichier XML des paramètres d'exécution ne contient pas le nœud "RunSettings".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Paramètre non valide '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nœud 'RunSettings' introuvable.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nœud 'RunSettings' introuvable.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Une erreur s'est produite durant le chargement des paramètres. Erreur : {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Paramètres de plateforme cible '{0}' incompatibles avec l'architecture système '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Un fichier de paramètres inattendu a été spécifié.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">Le fichier XML des paramètres d'exécution ne contient pas le nœud "RunSettings".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Paramètre non valide '{0}'. Valeur non valide '{1}' spécifiée pour '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nœud 'RunSettings' introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nœud 'RunSettings' introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Une erreur s'est produite durant le chargement des paramètres. Erreur : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Un fichier de paramètres inattendu a été spécifié.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
index f5104eff95..355349edf8 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">L'XML delle impostazioni esecuzione test non contiene il nodo "RunSettings".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">L'impostazione '{0}' non è valida. Il valore '{1}' specificato per '{2}' non è valido.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Il nodo 'RunSettings' non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Il nodo 'RunSettings' non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Si è verificato un errore durante il caricamento delle impostazioni. Errore: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Le impostazioni della piattaforma di destinazione '{0}' non sono compatibili con l'architettura di sistema '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">È stato specificato un file di impostazioni imprevisto.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">L'XML delle impostazioni esecuzione test non contiene il nodo "RunSettings".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">L'impostazione '{0}' non è valida. Il valore '{1}' specificato per '{2}' non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Il nodo 'RunSettings' non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Il nodo 'RunSettings' non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Si è verificato un errore durante il caricamento delle impostazioni. Errore: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">È stato specificato un file di impostazioni imprevisto.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
index 6aa4ff3684..357e6d0aff 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">実行設定 XML に "RunSettings" ノードがありません。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' は無効です。無効な値 '{1}' が '{2}' に指定されました。</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' ノードが見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' ノードが見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">設定の読み込み中にエラーが発生しました。エラー: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">ターゲット プラットフォームの設定 '{0}' はシステム アーキテクチャ '{1}' と互換性がありません。</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">予期しない設定ファイルが指定されました。</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">実行設定 XML に "RunSettings" ノードがありません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">設定 '{0}' は無効です。無効な値 '{1}' が '{2}' に指定されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' ノードが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' ノードが見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">設定の読み込み中にエラーが発生しました。エラー: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">予期しない設定ファイルが指定されました。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
index f59fb250b3..fae0afe348 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">실행 설정 XML에 "RunSettings" 노드가 포함되어 있지 않습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' 노드를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' 노드를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">대상 플랫폼 설정 '{0}'이(가) 시스템 아키텍처 '{1}'과(와) 호환되지 않습니다.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">예기치 않은 설정 파일을 지정했습니다.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">실행 설정 XML에 "RunSettings" 노드가 포함되어 있지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">'{0}' 설정이 잘못되었습니다. '{2}'에 대해 잘못된 값 '{1}'을(를) 지정했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' 노드를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' 노드를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">예기치 않은 설정 파일을 지정했습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
index b9c2a6974b..9945aa63de 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">Plik XML parametrów uruchomieniowych nie zawiera węzła „RunSettings”.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowe ustawienie „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć węzła „RunSettings”.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć węzła „RunSettings”.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Wystąpił błąd podczas ładowania ustawień. Błąd: {0}</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Niezgodne ustawienia platformy docelowej „{0}” z architekturą systemu „{1}”.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Określono nieoczekiwany plik ustawień.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">Plik XML parametrów uruchomieniowych nie zawiera węzła „RunSettings”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Nieprawidłowe ustawienie „{0}”. Nieprawidłowa wartość „{1}” określona dla elementu „{2}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nie można odnaleźć węzła „RunSettings”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Nie można odnaleźć węzła „RunSettings”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Wystąpił błąd podczas ładowania ustawień. Błąd: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Określono nieoczekiwany plik ustawień.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
index a8cb17021f..9572a1265d 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">O XML de configurações de execução não contém o nó de "RunSettings".</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Configuração inválida '{0}'. Valor inválido '{1}' especificado para '{2}'.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Não foi possível localizar o nó 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Não foi possível localizar o nó 'RunSettings'.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Ocorreu um erro ao carregar as configurações. Erro: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Configurações da plataforma de destino '{0}' incompatíveis com a arquitetura do sistema '{1}'.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Arquivo de configurações inesperado especificado.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">O XML de configurações de execução não contém o nó de "RunSettings".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Configuração inválida '{0}'. Valor inválido '{1}' especificado para '{2}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Não foi possível localizar o nó 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Não foi possível localizar o nó 'RunSettings'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Ocorreu um erro ao carregar as configurações. Erro: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Arquivo de configurações inesperado especificado.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
index 321ddfc8a5..5c41d58db7 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">XML-файл параметров запуска не содержит узел RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">Недопустимый параметр "{0}". Недопустимое значение "{1}", указанное для "{2}".</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Не удалось найти узел RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">Не удалось найти узел RunSettings.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Произошла ошибка при загрузке параметров. Ошибка: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">Параметры целевой платформы "{0}" несовместимы с архитектурой системы "{1}".</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Указанный неожиданный файл параметров.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">XML-файл параметров запуска не содержит узел RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">Недопустимый параметр "{0}". Недопустимое значение "{1}", указанное для "{2}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Не удалось найти узел RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">Не удалось найти узел RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Произошла ошибка при загрузке параметров. Ошибка: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Указанный неожиданный файл параметров.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
index 96cb6bfb86..cd38321dd6 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">Çalıştırma ayarları XML dosyası "RunSettings" düğümünü içermiyor.</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">'{0}' ayarı geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' düğümü bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">'RunSettings' düğümü bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">Ayarlar yüklenirken bir hata oluştu. Hata: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">'{0}' hedef platform ayarları, '{1}' sistem mimarisiyle uyumlu değil.</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">Beklenmeyen ayarlar dosyası belirtildi.</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">Çalıştırma ayarları XML dosyası "RunSettings" düğümünü içermiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">'{0}' ayarı geçersiz. '{2}' için geçersiz '{1}' değeri belirtildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' düğümü bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">'RunSettings' düğümü bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">Ayarlar yüklenirken bir hata oluştu. Hata: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">Beklenmeyen ayarlar dosyası belirtildi.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
index 07a69c0e27..6e82164e2f 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
@@ -4,32 +4,28 @@
     <body>
       <trans-unit id="InvalidRunSettingsXml">
         <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidSettingsIncorrectValue">
         <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingRunSettingsNode">
         <source>Could not find 'RunSettings' node.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoRunSettingsNodeFound">
         <source>Could not find 'RunSettings' node.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsParseError">
         <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnExpectedSettingsFile">
         <source>Unexpected settings file specified.</source>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
index 435639785f..529d998066 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">运行设置 XML 不包含 "RunSettings" 节点。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">设置“{0}”无效。为“{2}”指定的值“{1}”无效。</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">找不到 "RunSettings" 节点。</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">找不到 "RunSettings" 节点。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">加载设置时出错。错误: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">目标平台设置“{0}”与系统体系结构“{1}”不兼容。</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">指定了意外的设置文件。</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">运行设置 XML 不包含 "RunSettings" 节点。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">设置“{0}”无效。为“{2}”指定的值“{1}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">找不到 "RunSettings" 节点。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">找不到 "RunSettings" 节点。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">加载设置时出错。错误: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">指定了意外的设置文件。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
index 8895f16c8f..4834872086 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,42 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="InvalidRunSettingsXml">
-        <source>Run settings XML does not contain "RunSettings" node.</source>
-        <note></note>
-        <target state="translated">回合設定 XML 不包含 " RunSettings" 節點。</target>
-      </trans-unit>
-      <trans-unit id="InvalidSettingsIncorrectValue">
-        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
-        <note></note>
-        <target state="translated">設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。</target>
-      </trans-unit>
-      <trans-unit id="MissingRunSettingsNode">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">找不到 'RunSettings' 節點。</target>
-      </trans-unit>
-      <trans-unit id="NoRunSettingsNodeFound">
-        <source>Could not find 'RunSettings' node.</source>
-        <note></note>
-        <target state="translated">找不到 'RunSettings' 節點。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsParseError">
-        <source>An error occurred while loading the settings.  Error: {0}.</source>
-        <note></note>
-        <target state="translated">載入設定時發生錯誤。錯誤: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SystemArchitectureIncompatibleWithTargetPlatform">
-        <source>Incompatible Target platform settings '{0}' with system architecture '{1}'.</source>
-        <note></note>
-        <target state="translated">目標平台設定 '{0}' 與系統架構 '{1}' 不相容。</target>
-      </trans-unit>
-      <trans-unit id="UnExpectedSettingsFile">
-        <source>Unexpected settings file specified.</source>
-        <note></note>
-        <target state="translated">指定了非預期的設定檔案。</target>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="InvalidRunSettingsXml">
+        <source>Run settings XML does not contain "RunSettings" node.</source>
+        <target state="translated">回合設定 XML 不包含 " RunSettings" 節點。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidSettingsIncorrectValue">
+        <source>Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.</source>
+        <target state="translated">設定 '{0}' 無效。為 '{2}' 指定的值 '{1}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingRunSettingsNode">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">找不到 'RunSettings' 節點。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoRunSettingsNodeFound">
+        <source>Could not find 'RunSettings' node.</source>
+        <target state="translated">找不到 'RunSettings' 節點。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsParseError">
+        <source>An error occurred while loading the settings.  Error: {0}.</source>
+        <target state="translated">載入設定時發生錯誤。錯誤: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnExpectedSettingsFile">
+        <source>Unexpected settings file specified.</source>
+        <target state="translated">指定了非預期的設定檔案。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.Utilities/StringExtensions.cs b/src/Microsoft.TestPlatform.Utilities/StringExtensions.cs
new file mode 100644
index 0000000000..b67c6b64da
--- /dev/null
+++ b/src/Microsoft.TestPlatform.Utilities/StringExtensions.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
+
+public static class StringExtensions
+{
+    public static IEnumerable<string> Tokenize(this string? input, char separator, char escape)
+    {
+        if (input.IsNullOrEmpty())
+            yield break;
+
+        var buffer = new StringBuilder();
+        var escaping = false;
+        foreach (var c in input)
+        {
+            if (escaping)
+            {
+                buffer.Append(c);
+                escaping = false;
+            }
+            else if (c == escape)
+            {
+                escaping = true;
+            }
+            else if (c == separator)
+            {
+                yield return buffer.Flush();
+            }
+            else
+            {
+                buffer.Append(c);
+            }
+        }
+        if (buffer.Length > 0 || input[input.Length - 1] == separator)
+            yield return buffer.Flush();
+    }
+
+    private static string Flush(this StringBuilder stringBuilder)
+    {
+        var result = stringBuilder.ToString();
+        stringBuilder.Clear();
+        return result;
+    }
+}
diff --git a/src/Microsoft.TestPlatform.Utilities/StringUtilities.cs b/src/Microsoft.TestPlatform.Utilities/StringUtilities.cs
deleted file mode 100644
index f71f809976..0000000000
--- a/src/Microsoft.TestPlatform.Utilities/StringUtilities.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using System.Collections.Generic;
-    using System.Text;
-
-    public static class StringExtensions
-    {
-        public static IEnumerable<string> Tokenize(this string input, char separator, char escape)
-        {
-            if (string.IsNullOrEmpty(input)) yield break;
-
-            var buffer = new StringBuilder();
-            var escaping = false;
-            foreach (var c in input)
-            {
-                if (escaping)
-                {
-                    buffer.Append(c);
-                    escaping = false;
-                }
-                else if (c == escape)
-                {
-                    escaping = true;
-                }
-                else if (c == separator)
-                {
-                    yield return buffer.Flush();
-                }
-                else
-                {
-                    buffer.Append(c);
-                }
-            }
-            if (buffer.Length > 0 || input[input.Length - 1] == separator) yield return buffer.Flush();
-        }
-
-        private static string Flush(this StringBuilder stringBuilder)
-        {
-            var result = stringBuilder.ToString();
-            stringBuilder.Clear();
-            return result;
-        }
-    }
-}
diff --git a/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs b/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs
index ed6f6220d7..9b82ee44b1 100644
--- a/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs
+++ b/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs
@@ -1,99 +1,102 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Utilities
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
+using System;
 #if NETFRAMEWORK
-    using System.Security;
+using System.Security;
 #endif
-    using System.Xml;
-    using System.Xml.XPath;
+using System.Xml;
+using System.Xml.XPath;
+
+namespace Microsoft.VisualStudio.TestPlatform.Utilities;
 
+/// <summary>
+/// Utilities class to read and operate on Xml content.
+/// </summary>
+internal class XmlUtilities
+{
     /// <summary>
-    /// Utilities class to read and operate on Xml content.
+    /// Gets the Inner XML of the specified node.
     /// </summary>
-    internal class XmlUtilities
+    /// <param name="runSettingsNavigator"> The xml navigator. </param>
+    /// <param name="nodeXPath"> The xPath of the node. </param>
+    /// <returns></returns>
+    internal static string? GetNodeXml(XPathNavigator runSettingsNavigator, string nodeXPath)
     {
-        /// <summary>
-        /// Gets the Inner XML of the specified node.
-        /// </summary>
-        /// <param name="runSettingsNavigator"> The xml navigator. </param>
-        /// <param name="nodeXPath"> The xPath of the node. </param>
-        /// <returns></returns>
-        internal static string GetNodeXml(XPathNavigator runSettingsNavigator, string nodeXPath)
+        var node = runSettingsNavigator.SelectSingleNode(nodeXPath);
+        return node?.InnerXml;
+    }
+
+    /// <summary>
+    /// Validates if the Node value is correct according to the provided validator.
+    /// </summary>
+    /// <param name="xmlNodeValue"> The node value. </param>
+    /// <param name="validator"> The validator. </param>
+    /// <returns></returns>
+    internal static bool IsValidNodeXmlValue(string xmlNodeValue, Func<string, bool> validator)
+    {
+        try
         {
-            var node = runSettingsNavigator.SelectSingleNode(nodeXPath);
-            return node?.InnerXml;
+            return validator.Invoke(xmlNodeValue);
         }
-
-        /// <summary>
-        /// Validates if the Node value is correct according to the provided validator.
-        /// </summary>
-        /// <param name="xmlNodeValue"> The node value. </param>
-        /// <param name="validator"> The validator. </param>
-        /// <returns></returns>
-        internal static bool IsValidNodeXmlValue(string xmlNodeValue, Func<string, bool> validator)
+        catch (ArgumentException)
         {
-            try
-            {
-                return validator.Invoke(xmlNodeValue);
-            }
-            catch (ArgumentException)
-            {
-                return false;
-            }
+            return false;
         }
+    }
 
-        /// <summary>
-        /// If xml node exists with given path, its value is set to innerXml, otherwise a new node is created.
-        /// </summary>
-        /// <remarks> Ensure that the navigator is set to right parent.</remarks>
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        internal static void AppendOrModifyChild(
-            XmlDocument xmlDocument,
-            string nodeXPath,
-            string nodeName,
-            string innerXml)
-        {
-            var childNode = xmlDocument.SelectSingleNode(nodeXPath);
+    /// <summary>
+    /// If xml node exists with given path, its value is set to innerXml, otherwise a new node is created.
+    /// </summary>
+    /// <remarks> Ensure that the navigator is set to right parent.</remarks>
+    internal static void AppendOrModifyChild(
+        XmlDocument xmlDocument,
+        string nodeXPath,
+        string nodeName,
+        string? innerXml)
+    {
+        var childNode = xmlDocument.SelectSingleNode(nodeXPath);
 
-            // TODO: There isn't an equivalent API to SecurityElement.Escape in Core yet.
-            // So trusting that the XML is always valid for now.
+        // TODO: There isn't an equivalent API to SecurityElement.Escape in Core yet.
+        // So trusting that the XML is always valid for now.
 #if NETFRAMEWORK
-            var secureInnerXml = SecurityElement.Escape(innerXml);
+        var secureInnerXml = SecurityElement.Escape(innerXml);
 #else
-            // fixing manually as we currently target to netcore 1.1 and we don't have default implementation for Escape functionality
-            var secureInnerXml = string.IsNullOrEmpty(innerXml) ? innerXml : innerXml.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("\"", "&quot;").Replace("'", "&apos;");
+        // fixing manually as we currently target to netcore 1.1 and we don't have default implementation for Escape functionality
+        string secureInnerXml;
+        if (innerXml.IsNullOrEmpty())
+        {
+            secureInnerXml = string.Empty;
+        }
+        else
+        {
+            secureInnerXml = innerXml.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("\"", "&quot;").Replace("'", "&apos;");
+        }
 #endif
-            if (childNode == null)
-            {
-                var childElement = xmlDocument.CreateElement(nodeName);
-
-                if (!string.IsNullOrEmpty(innerXml))
-                {
-                    childElement.InnerXml = secureInnerXml;
-                }
+        if (childNode == null)
+        {
+            var childElement = xmlDocument.CreateElement(nodeName);
 
-                var parentNode = xmlDocument.SelectSingleNode(nodeXPath.Substring(0, nodeXPath.LastIndexOf('/')));
-                parentNode?.AppendChild(childElement);
-            }
-            else if (!string.IsNullOrEmpty(innerXml))
+            if (!innerXml.IsNullOrEmpty())
             {
-                childNode.InnerXml = secureInnerXml;
+                childElement.InnerXml = secureInnerXml;
             }
+
+            var parentNode = xmlDocument.SelectSingleNode(nodeXPath.Substring(0, nodeXPath.LastIndexOf('/')));
+            parentNode?.AppendChild(childElement);
+        }
+        else if (!innerXml.IsNullOrEmpty())
+        {
+            childNode.InnerXml = secureInnerXml;
         }
+    }
 
-        internal static void RemoveChildNode(XPathNavigator parentNavigator, string nodeXPath, string childName)
+    internal static void RemoveChildNode(XPathNavigator? parentNavigator, string nodeXPath, string childName)
+    {
+        if (parentNavigator?.SelectSingleNode(nodeXPath) is { })
         {
-            var childNodeNavigator = parentNavigator.SelectSingleNode(nodeXPath);
-            if (childNodeNavigator != null)
-            {
-                parentNavigator.MoveToChild(childName, string.Empty);
-                parentNavigator.DeleteSelf();
-            }
+            parentNavigator.MoveToChild(childName, string.Empty);
+            parentNavigator.DeleteSelf();
         }
     }
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs
index d40d888127..397e4ce591 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs
@@ -1,97 +1,100 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+
+/// <summary>
+/// Class which defines additional specifiable parameters for vstest.console.exe
+/// </summary>
+public class ConsoleParameters
 {
-    using System;
-#if NETFRAMEWORK
-    using System.Collections.Generic;
-#endif
-    using System.Diagnostics;
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    internal static readonly ConsoleParameters Default = new();
+
+    private readonly IFileHelper _fileHelper;
+
+    private string? _logFilePath;
+
+    /// <summary>
+    /// Create instance of <see cref="ConsoleParameters"/>
+    /// </summary>
+    public ConsoleParameters() : this(new FileHelper())
+    { }
 
     /// <summary>
-    /// Class which defines additional specifiable parameters for vstest.console.exe
+    /// Create instance of <see cref="ConsoleParameters"/>
     /// </summary>
-    public class ConsoleParameters
+    /// <param name="fileHelper"> Object of type <see cref="IFileHelper"/></param>
+    public ConsoleParameters(IFileHelper fileHelper)
     {
-        internal static readonly ConsoleParameters Default = new ConsoleParameters();
-
-        private string logFilePath = null;
-        private IFileHelper fileHelper;
-
-        /// <summary>
-        /// Create instance of <see cref="ConsoleParameters"/>
-        /// </summary>
-        public ConsoleParameters() : this(new FileHelper())
-        { }
-
-        /// <summary>
-        /// Create instance of <see cref="ConsoleParameters"/>
-        /// </summary>
-        /// <param name="fileHelper"> Object of type <see cref="IFileHelper"/></param>
-        public ConsoleParameters(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
+        _fileHelper = fileHelper;
+    }
 
-#if NETFRAMEWORK
+    /// <summary>
+    /// Environment variables to be set for the process. This will merge the specified entries to the environment variables
+    /// inherited from the current process. If you wish to provide a full set of environment variables yourself set <see cref="InheritEnvironmentVariables"/> to false.
+    /// </summary>
+    public Dictionary<string, string?> EnvironmentVariables { get; set; } = new();
 
-        /// <summary>
-        /// TODO: Remove the #if when project is targeted to netstandard2.0
-        /// Environment variables to be set for the process
-        /// </summary>
-        public Dictionary<string, string> EnvironmentVariables { get; set; }
+    /// <summary>
+    /// When set to true (default), all environment variables are inherited from the current process and the entries provided in <see cref="EnvironmentVariables"/> are merged with that set.
+    /// When set to false, only the values you provide in <see cref="EnvironmentVariables"/> are used. Giving you full control of the environment vstest.console is started with.
+    /// This is only rarely useful and can lead to vstest.console not being able to start at all.
+    /// You most likely want to use <see cref="System.Environment.GetEnvironmentVariables(System.EnvironmentVariableTarget)"/> and combine
+    /// <see cref="System.EnvironmentVariableTarget.Machine"/> and <see cref="System.EnvironmentVariableTarget.User"/> responses.
+    /// </summary>
+    public bool InheritEnvironmentVariables { get; set; } = true;
 
-#endif
+    /// <summary>
+    /// Trace level for logs.
+    /// </summary>
+    public TraceLevel TraceLevel { get; set; } = TraceLevel.Verbose;
 
-        /// <summary>
-        /// Trace level for logs.
-        /// </summary>
-        public TraceLevel TraceLevel { get; set; } = TraceLevel.Verbose;
+    /// <summary>
+    /// Full path for the log file
+    /// </summary>
+    public string? LogFilePath
+    {
+        get
+        {
+            return _logFilePath;
+        }
 
-        /// <summary>
-        /// Full path for the log file
-        /// </summary>
-        public string LogFilePath
+        set
         {
-            get
+            ValidateArg.NotNullOrEmpty(value!, "LogFilePath");
+            var directoryPath = Path.GetDirectoryName(value);
+            if (!directoryPath.IsNullOrEmpty() && !_fileHelper.DirectoryExists(directoryPath))
             {
-                return logFilePath;
+                Directory.CreateDirectory(directoryPath);
             }
 
-            set
-            {
-                ValidateArg.NotNullOrEmpty(value, "LogFilePath");
-                var directoryPath = Path.GetDirectoryName(value);
-                if (!string.IsNullOrEmpty(directoryPath) && !fileHelper.DirectoryExists(Path.GetDirectoryName(value)))
-                {
-                    throw new ArgumentException("LogFilePath must point to a valid directory for logging!");
-                }
-
-                // Ensure path is double quoted. if path has white space then it can create problem.
-                this.logFilePath = value.AddDoubleQuote();
-            }
+            // Ensure path is double quoted. if path has white space then it can create problem.
+            _logFilePath = value!.AddDoubleQuote();
         }
-
-        /// <summary>
-        /// Port Number for communication
-        /// vstest.console will need this port number to communicate with this component - translation layer
-        /// Currently Internal as we are not intentionally exposing this to consumers of translation layer
-        /// </summary>
-        internal int PortNumber { get; set; }
-
-        /// <summary>
-        /// Parent Process ID of the process whose lifetime should dictate the life time of vstest.console.exe
-        /// vstest.console will need this process ID to know when the process exits.
-        /// If parent process dies/crashes without invoking EndSession, vstest.console should exit immediately
-        /// Currently Internal as we are not intentionally exposing this to consumers of translation layer
-        /// </summary>
-        internal int ParentProcessId { get; set; }
     }
+
+    /// <summary>
+    /// Port Number for communication
+    /// vstest.console will need this port number to communicate with this component - translation layer
+    /// Currently Internal as we are not intentionally exposing this to consumers of translation layer
+    /// </summary>
+    internal int PortNumber { get; set; }
+
+    /// <summary>
+    /// Parent Process ID of the process whose lifetime should dictate the life time of vstest.console.exe
+    /// vstest.console will need this process ID to know when the process exits.
+    /// If parent process dies/crashes without invoking EndSession, vstest.console should exit immediately
+    /// Currently Internal as we are not intentionally exposing this to consumers of translation layer
+    /// </summary>
+    internal int ParentProcessId { get; set; }
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/DiscoveryEventsHandleConverter.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/DiscoveryEventsHandleConverter.cs
index 9312163b83..e665c6e41c 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/DiscoveryEventsHandleConverter.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/DiscoveryEventsHandleConverter.cs
@@ -1,69 +1,68 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+/// <summary>
+/// The Discovery Events Handler Converter.
+/// Converts the ITestDiscoveryEventsHandler to ITestDiscoveryEventsHandler2
+/// </summary>
+public class DiscoveryEventsHandleConverter : ITestDiscoveryEventsHandler2
+{
+    private readonly ITestDiscoveryEventsHandler _testDiscoveryEventsHandler;
 
     /// <summary>
-    /// The Discovery Events Handler Converter.
+    /// The Discovery Complete Handler.
     /// Converts the ITestDiscoveryEventsHandler to ITestDiscoveryEventsHandler2
     /// </summary>
-    public class DiscoveryEventsHandleConverter : ITestDiscoveryEventsHandler2
+    /// <param name="testDiscoveryEventsHandler"></param>
+    public DiscoveryEventsHandleConverter(ITestDiscoveryEventsHandler testDiscoveryEventsHandler)
     {
-        private ITestDiscoveryEventsHandler testDiscoveryEventsHandler;
-
-        /// <summary>
-        /// The Discovery Complete Handler.
-        /// Converts the ITestDiscoveryEventsHandler to ITestDiscoveryEventsHandler2
-        /// </summary>
-        /// <param name="testDiscoveryEventsHandler"></param>
-        public DiscoveryEventsHandleConverter(ITestDiscoveryEventsHandler testDiscoveryEventsHandler)
-        {
-            this.testDiscoveryEventsHandler = testDiscoveryEventsHandler ?? throw new ArgumentNullException(nameof(testDiscoveryEventsHandler));
-        }
+        _testDiscoveryEventsHandler = testDiscoveryEventsHandler ?? throw new ArgumentNullException(nameof(testDiscoveryEventsHandler));
+    }
 
-        /// <summary>
-        /// Handles Raw Message
-        /// </summary>
-        /// <param name="rawMessage"></param>
-        public void HandleRawMessage(string rawMessage)
-        {
-            this.testDiscoveryEventsHandler.HandleRawMessage(rawMessage);
-        }
+    /// <summary>
+    /// Handles Raw Message
+    /// </summary>
+    /// <param name="rawMessage"></param>
+    public void HandleRawMessage(string rawMessage)
+    {
+        _testDiscoveryEventsHandler.HandleRawMessage(rawMessage);
+    }
 
-        /// <summary>
-        /// Handles Log Message
-        /// </summary>
-        /// <param name="level"></param>
-        /// <param name="message"></param>
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.testDiscoveryEventsHandler.HandleLogMessage(level, message);
-        }
+    /// <summary>
+    /// Handles Log Message
+    /// </summary>
+    /// <param name="level"></param>
+    /// <param name="message"></param>
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        _testDiscoveryEventsHandler.HandleLogMessage(level, message);
+    }
 
-        /// <summary>
-        /// Handle Discovery Complete
-        /// </summary>
-        /// <param name="discoveryCompleteEventArgs"></param>
-        /// <param name="lastChunk"></param>
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            this.testDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs.TotalCount, lastChunk, discoveryCompleteEventArgs.IsAborted);
-        }
+    /// <summary>
+    /// Handle Discovery Complete
+    /// </summary>
+    /// <param name="discoveryCompleteEventArgs"></param>
+    /// <param name="lastChunk"></param>
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        _testDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs.TotalCount, lastChunk, discoveryCompleteEventArgs.IsAborted);
+    }
 
-        /// <summary>
-        /// Handles Discovery Tests
-        /// </summary>
-        /// <param name="discoveredTestCases"></param>
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            this.testDiscoveryEventsHandler.HandleDiscoveredTests(discoveredTestCases);
-        }
+    /// <summary>
+    /// Handles Discovery Tests
+    /// </summary>
+    /// <param name="discoveredTestCases"></param>
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        _testDiscoveryEventsHandler.HandleDiscoveredTests(discoveredTestCases);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs
index a9db03174f..61d7eb8b3f 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs
@@ -5,11 +5,17 @@
 
 #region Product Assemblies
 
+[assembly: InternalsVisibleTo("cts, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
 #endregion
 
 #region Test Assemblies
 
 [assembly: InternalsVisibleTo("TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.TestUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("TestPlatform.Playground, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 
 #endregion
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IProcessManager.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IProcessManager.cs
index 82c71a1eef..69f72975a8 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IProcessManager.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IProcessManager.cs
@@ -1,34 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
 
+/// <summary>
+/// Defines the interface that can manage a process
+/// </summary>
+internal interface IProcessManager
+{
     /// <summary>
-    /// Defines the interface that can manage a process
+    /// Starts the Process
     /// </summary>
-    internal interface IProcessManager
-    {
-        /// <summary>
-        /// Starts the Process
-        /// </summary>
-        void StartProcess(ConsoleParameters consoleParameters);
+    void StartProcess(ConsoleParameters consoleParameters);
 
-        /// <summary>
-        /// Is Process Initialized
-        /// </summary>
-        /// <returns>True, if process initialized</returns>
-        bool IsProcessInitialized();
+    /// <summary>
+    /// Is Process Initialized
+    /// </summary>
+    /// <returns>True, if process initialized</returns>
+    bool IsProcessInitialized();
 
-        /// <summary>
-        /// Shutdown Process
-        /// </summary>
-        void ShutdownProcess();
+    /// <summary>
+    /// Shutdown Process
+    /// </summary>
+    void ShutdownProcess();
 
-        /// <summary>
-        /// Raise event on process exit
-        /// </summary>
-        event EventHandler ProcessExited;
-    }
+    /// <summary>
+    /// Raise event on process exit
+    /// </summary>
+    event EventHandler ProcessExited;
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
index 2fbb324371..c57b8761d2 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSession.cs
@@ -1,210 +1,292 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+/// <summary>
+/// Defines a test session that can be used to make calls to the vstest.console
+/// process.
+/// </summary>
+[Obsolete("This API is not final yet and is subject to changes.", false)]
+public interface ITestSession : IDisposable, ITestSessionAsync
 {
-    using System;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-
-    /// <summary>
-    /// Defines a test session that can be used to make calls to the vstest.console
-    /// process.
-    /// </summary>
-    [Obsolete("This API is not final yet and is subject to changes.", false)]
-    public interface ITestSession : IDisposable, ITestSessionAsync
-    {
-        /// <summary>
-        /// Gets the underlying test session info object.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        TestSessionInfo TestSessionInfo { get; }
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Cancels the last discovery request.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        new void CancelDiscovery();
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        bool StopTestSession();
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        bool StopTestSession(ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Cancels the last test run.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        new void CancelTestRun();
-
-        /// <summary>
-        /// Aborts the last test run.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        new void AbortTestRun();
-    }
+    /// <summary>
+    /// Gets the underlying test session info object.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    TestSessionInfo? TestSessionInfo { get; }
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        TestPlatformOptions options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Cancels the last discovery request.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    new void CancelDiscovery();
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    bool StopTestSession();
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    bool StopTestSession(ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="options">Test Platform options.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    bool StopTestSession(TestPlatformOptions options, ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Cancels the last test run.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    new void CancelTestRun();
+
+    /// <summary>
+    /// Aborts the last test run.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    new void AbortTestRun();
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
index 6846ca7788..b97ed5fe21 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITestSessionAsync.cs
@@ -1,207 +1,291 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+/// <summary>
+/// Defines a test session that can be used to make async calls to the vstest.console
+/// process.
+/// </summary>
+[Obsolete("This API is not final yet and is subject to changes.", false)]
+public interface ITestSessionAsync : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-
-    /// <summary>
-    /// Defines a test session that can be used to make async calls to the vstest.console
-    /// process.
-    /// </summary>
-    [Obsolete("This API is not final yet and is subject to changes.", false)]
-    public interface ITestSessionAsync : IDisposable
-    {
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        /// <returns></returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Cancels the last discovery request.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void CancelDiscovery();
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<bool> StopTestSessionAsync();
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<bool> StopTestSessionAsync(
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Cancels the last test run.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void CancelTestRun();
-
-        /// <summary>
-        /// Aborts the last test run.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        void AbortTestRun();
-    }
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    /// <returns></returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        TestPlatformOptions options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Cancels the last discovery request.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void CancelDiscovery();
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task<bool> StopTestSessionAsync();
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task<bool> StopTestSessionAsync(
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="options">Test Platform options.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task<bool> StopTestSessionAsync(
+        TestPlatformOptions options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Cancels the last test run.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void CancelTestRun();
+
+    /// <summary>
+    /// Aborts the last test run.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    void AbortTestRun();
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
index d4b19d826a..2a606f21e6 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs
@@ -1,182 +1,192 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+/// <summary>
+/// Defines contract to send test platform requests to test host
+/// </summary>
+internal interface ITranslationLayerRequestSender : IDisposable, ITranslationLayerRequestSenderAsync
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-
-    /// <summary>
-    /// Defines contract to send test platform requests to test host
-    /// </summary>
-    internal interface ITranslationLayerRequestSender : IDisposable, ITranslationLayerRequestSenderAsync
-    {
-        /// <summary>
-        /// Initializes communication with the vstest.console.exe process.
-        /// Hosts a communication channel and asynchronously connects to vstest.console.exe.
-        /// </summary>
-        /// 
-        /// <returns>Port number of the hosted server on this side.</returns>
-        int InitializeCommunication();
-
-        /// <summary>
-        /// Waits for the request handler to be connected.
-        /// </summary>
-        /// 
-        /// <param name="connectionTimeout">Time to wait for connection.</param>
-        /// 
-        /// <returns>True if the handler has connected, false otherwise.</returns>
-        bool WaitForRequestHandlerConnection(int connectionTimeout);
-
-        /// <summary>
-        /// Closes the sender.
-        /// </summary>
-        void Close();
-
-        /// <summary>
-        /// Initializes the extensions while probing additional extension paths.
-        /// </summary>
-        /// 
-        /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions.</param>
-        void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions);
-
-        /// <summary>
-        /// Discovers the tests
-        /// </summary>
-        /// 
-        /// <param name="sources">Sources for discovering tests.</param>
-        /// <param name="runSettings">Run settings for discovering tests.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="discoveryEventsHandler">Event handler for discovery events.</param>
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts the test run with given sources and criteria.
-        /// </summary>
-        /// 
-        /// <param name="sources">Sources for test run.</param>
-        /// <param name="runSettings">Run settings for test run.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="runEventsHandler">Event handler for test run events.</param>
-        void StartTestRun(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler);
-
-        /// <summary>
-        /// Starts the test run with given sources and criteria.
-        /// </summary>
-        /// 
-        /// <param name="testCases">Test cases to run.</param>
-        /// <param name="runSettings">Run settings for test run.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="runEventsHandler">Event handler for test run events.</param>
-        void StartTestRun(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler);
-
-        /// <summary>
-        /// Starts the test run with given sources and criteria and a custom launcher.
-        /// </summary>
-        /// 
-        /// <param name="sources">Sources for test run.</param>
-        /// <param name="runSettings">Run settings for test run.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="runEventsHandler">Event handler for test run events.</param>
-        /// <param name="customTestHostLauncher">Custom test host launcher.</param>
-        void StartTestRunWithCustomHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts the test run with given sources and criteria and a custom launcher.
-        /// </summary>
-        /// 
-        /// <param name="testCases">Test cases to run.</param>
-        /// <param name="runSettings">Run settings for test run.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="runEventsHandler">Event handler for test run events.</param>
-        /// <param name="customTestHostLauncher">Custom test host launcher.</param>
-        void StartTestRunWithCustomHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">Sources for test run.</param>
-        /// <param name="runSettings">Run settings for test run.</param>
-        /// <param name="options">Options to be passed into the platform.</param>
-        /// <param name="eventsHandler">Event handler for test session events.</param>
-        /// <param name="testHostLauncher">Custom test host launcher.</param>
-        /// <returns></returns>
-        TestSessionInfo StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">Test session info.</param>
-        /// <param name="eventsHandler">Event handler for test session events.</param>
-        bool StopTestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Ends the session.
-        /// </summary>
-        void EndSession();
-
-        /// <summary>
-        /// Cancels the test run.
-        /// </summary>
-        void CancelTestRun();
-
-        /// <summary>
-        /// Aborts the test run.
-        /// </summary>
-        void AbortTestRun();
-
-        /// <summary>
-        /// On process exit unblocks communication waiting calls.
-        /// </summary>
-        void OnProcessExited();
-
-        /// <summary>
-        /// Cancels the discovery of tests.
-        /// </summary>
-        void CancelDiscovery();
-    }
+    /// <summary>
+    /// Initializes communication with the vstest.console.exe process.
+    /// Hosts a communication channel and asynchronously connects to vstest.console.exe.
+    /// </summary>
+    ///
+    /// <returns>Port number of the hosted server on this side.</returns>
+    int InitializeCommunication();
+
+    /// <summary>
+    /// Waits for the request handler to be connected.
+    /// </summary>
+    ///
+    /// <param name="connectionTimeout">Time to wait for connection.</param>
+    ///
+    /// <returns>True if the handler has connected, false otherwise.</returns>
+    bool WaitForRequestHandlerConnection(int connectionTimeout);
+
+    /// <summary>
+    /// Closes the sender.
+    /// </summary>
+    void Close();
+
+    /// <summary>
+    /// Initializes the extensions while probing additional extension paths.
+    /// </summary>
+    ///
+    /// <param name="pathToAdditionalExtensions">Paths to check for additional extensions.</param>
+    void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions);
+
+    /// <summary>
+    /// Discovers the tests
+    /// </summary>
+    ///
+    /// <param name="sources">Sources for discovering tests.</param>
+    /// <param name="runSettings">Run settings for discovering tests.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="discoveryEventsHandler">Event handler for discovery events.</param>
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts the test run with given sources and criteria.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources for test run.</param>
+    /// <param name="runSettings">Run settings for test run.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="runEventsHandler">Event handler for test run events.</param>
+    /// <param name="telemetryEventsHandler">Event handler for telemetry events.</param>
+    void StartTestRun(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts the test run with given sources and criteria.
+    /// </summary>
+    ///
+    /// <param name="testCases">Test cases to run.</param>
+    /// <param name="runSettings">Run settings for test run.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="runEventsHandler">Event handler for test run events.</param>
+    /// <param name="telemetryEventsHandler">Event handler for telemetry events.</param>
+    void StartTestRun(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts the test run with given sources and criteria and a custom launcher.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources for test run.</param>
+    /// <param name="runSettings">Run settings for test run.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="runEventsHandler">Event handler for test run events.</param>
+    /// <param name="telemetryEventsHandler">Event handler for telemetry events.</param>
+    /// <param name="customTestHostLauncher">Custom test host launcher.</param>
+    void StartTestRunWithCustomHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts the test run with given sources and criteria and a custom launcher.
+    /// </summary>
+    ///
+    /// <param name="testCases">Test cases to run.</param>
+    /// <param name="runSettings">Run settings for test run.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="runEventsHandler">Event handler for test run events.</param>
+    /// <param name="telemetryEventsHandler">Event handler for telemetry events.</param>
+    /// <param name="customTestHostLauncher">Custom test host launcher.</param>
+    void StartTestRunWithCustomHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a new test session.
+    /// </summary>
+    ///
+    /// <param name="sources">Sources for test run.</param>
+    /// <param name="runSettings">Run settings for test run.</param>
+    /// <param name="options">Options to be passed into the platform.</param>
+    /// <param name="eventsHandler">Event handler for test session events.</param>
+    /// <param name="testHostLauncher">Custom test host launcher.</param>
+    /// <returns></returns>
+    TestSessionInfo? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">Test session info.</param>
+    /// <param name="options">Test Platform options.</param>
+    /// <param name="eventsHandler">Event handler for test session events.</param>
+    bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Ends the session.
+    /// </summary>
+    void EndSession();
+
+    /// <summary>
+    /// Cancels the test run.
+    /// </summary>
+    void CancelTestRun();
+
+    /// <summary>
+    /// Aborts the test run.
+    /// </summary>
+    void AbortTestRun();
+
+    /// <summary>
+    /// On process exit unblocks communication waiting calls.
+    /// </summary>
+    void OnProcessExited();
+
+    /// <summary>
+    /// Cancels the discovery of tests.
+    /// </summary>
+    void CancelDiscovery();
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
index aa07882a6b..161ecb31bb 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSenderAsync.cs
@@ -1,148 +1,161 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
 
+/// <summary>
+/// Asynchronous equivalent of <see cref="ITranslationLayerRequestSender"/>.
+/// </summary>
+internal interface ITranslationLayerRequestSenderAsync : IDisposable
+{
     /// <summary>
-    /// Asynchronous equivalent of <see cref="ITranslationLayerRequestSender"/>.
+    /// Asynchronous equivalent of <see cref="
+    ///     ITranslationLayerRequestSender.InitializeCommunication"/>
+    /// and <see cref="
+    ///     ITranslationLayerRequestSender.WaitForRequestHandlerConnection(
+    ///     int)"/>.
     /// </summary>
-    internal interface ITranslationLayerRequestSenderAsync : IDisposable
-    {
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        ///     ITranslationLayerRequestSender.InitializeCommunication"/>
-        /// and <see cref="
-        ///     ITranslationLayerRequestSender.WaitForRequestHandlerConnection(
-        ///     int)"/>.
-        /// </summary>
-        Task<int> InitializeCommunicationAsync(int clientConnectionTimeout);
+    Task<int> InitializeCommunicationAsync(int clientConnectionTimeout);
 
-        /// <summary>
-        /// Asynchronous equivalent of ITranslationLayerRequestSender.DiscoverTests/>.
-        /// </summary>
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+    /// <summary>
+    /// Asynchronous equivalent of ITranslationLayerRequestSender.DiscoverTests/>.
+    /// </summary>
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StartTestRun(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task StartTestRunAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StartTestRun(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler)"/>.
+    /// </summary>
+    Task StartTestRunAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StartTestRun(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task StartTestRunAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StartTestRun(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler)"/>.
+    /// </summary>
+    Task StartTestRunAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StartTestRunWithCustomHost(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task StartTestRunWithCustomHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StartTestRunWithCustomHost(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    Task StartTestRunWithCustomHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StartTestRunWithCustomHost(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task StartTestRunWithCustomHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StartTestRunWithCustomHost(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    Task StartTestRunWithCustomHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestSessionEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task<TestSessionInfo> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StartTestSession(
+    ///     IList{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestSessionEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    Task<TestSessionInfo?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher);
 
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// ITranslationLayerRequestSender.StopTestSession(
-        ///     TestSessionInfo,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        Task<bool> StopTestSessionAsync(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// ITranslationLayerRequestSender.StopTestSession(
+    ///     TestSessionInfo,
+    ///     TestPlatformOptions,
+    ///     ITestSessionEventsHandler)"/>.
+    /// </summary>
+    Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
 
-        /// <summary>
-        /// Provides back all attachments to test platform for additional processing (for example
-        /// merging).
-        /// </summary>
-        /// 
-        /// <param name="attachments">Collection of attachments.</param>
-        /// <param name="collectMetrics">Enables metrics collection.</param>
-        /// <param name="testRunAttachmentsProcessingCompleteEventsHandler">Events handler.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        Task ProcessTestRunAttachmentsAsync(
-            IEnumerable<AttachmentSet> attachments,
-            bool collectMetrics,
-            ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingCompleteEventsHandler,
-            CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Provides back all attachments to test platform for additional processing (for example
+    /// merging).
+    /// </summary>
+    ///
+    /// <param name="attachments">Collection of attachments.</param>
+    /// <param name="invokedDataCollectors">Collection of invoked data collectors.</param>
+    /// <param name="runSettings">RunSettings configuration</param>
+    /// <param name="collectMetrics">Enables metrics collection.</param>
+    /// <param name="testRunAttachmentsProcessingCompleteEventsHandler">Events handler.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? runSettings,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingCompleteEventsHandler,
+        CancellationToken cancellationToken);
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
index 23dde8cbae..ed4754b130 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
@@ -1,337 +1,428 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+/// <summary>
+/// Controller for various test operations on the test runner.
+/// </summary>
+public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+    /// <summary>
+    /// Starts the test runner process and readies for requests.
+    /// </summary>
+    void StartSession();
+
+    /// <summary>
+    /// Starts a new test session.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>A test session info object.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Starts a new test session.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>A test session info object.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Starts a new test session.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    /// <param name="testHostLauncher">The custom host launcher.</param>
+    ///
+    /// <returns>A test session info object.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher testHostLauncher);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Stops the test session.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="options">Test Platform options.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    ///
+    /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Initializes the test platform with paths to extensions like adapters, loggers and any
+    /// other extensions.
+    /// </summary>
+    ///
+    /// <param name="pathToAdditionalExtensions">Full paths to extension DLLs.</param>
+    void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions);
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Starts test discovery.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the discovery.</param>
+    /// <param name="discoverySettings">The run settings for the discovery.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="discoveryEventsHandler">The discovery event handler.</param>
+    void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Cancels the last discovery request.
+    /// </summary>
+    new void CancelDiscovery();
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry events handler.</param>
+    void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry events handler.</param>
+    void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="sources">The list of source assemblies for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry events handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Starts a test run.
+    /// </summary>
+    ///
+    /// <param name="testCases">The list of test cases for the test run.</param>
+    /// <param name="runSettings">The run settings for the run.</param>
+    /// <param name="options">The test platform options.</param>
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="testRunEventsHandler">The run event handler.</param>
+    /// <param name="telemetryEventsHandler">The telemetry events handler.</param>
+    /// <param name="customTestHostLauncher">The custom host launcher.</param>
+    void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Cancels the last test run.
+    /// </summary>
+    new void CancelTestRun();
+
+    /// <summary>
+    /// Aborts the last test run.
+    /// </summary>
+    new void AbortTestRun();
 
     /// <summary>
-    /// Controller for various test operations on the test runner.
+    /// Ends the test session and stops processing requests.
     /// </summary>
-    public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
-    {
-        /// <summary>
-        /// Starts the test runner process and readies for requests.
-        /// </summary>
-        void StartSession();
-
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Starts a new test session.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// <param name="testHostLauncher">The custom host launcher.</param>
-        /// 
-        /// <returns>A test session info object.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
-
-        /// <summary>
-        /// Stops the test session.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// 
-        /// <returns>True if the session was successfuly stopped, false otherwise.</returns>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        bool StopTestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Initializes the test platform with paths to extensions like adapters, loggers and any
-        /// other extensions.
-        /// </summary>
-        /// 
-        /// <param name="pathToAdditionalExtensions">Full paths to extension DLLs.</param>
-        void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions);
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Starts test discovery.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the discovery.</param>
-        /// <param name="discoverySettings">The run settings for the discovery.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="discoveryEventsHandler">The discovery event handler.</param>
-        void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Cancels the last discovery request.
-        /// </summary>
-        new void CancelDiscovery();
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="sources">The list of source assemblies for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Starts a test run.
-        /// </summary>
-        /// 
-        /// <param name="testCases">The list of test cases for the test run.</param>
-        /// <param name="runSettings">The run settings for the run.</param>
-        /// <param name="options">The test platform options.</param>
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="testRunEventsHandler">The run event handler.</param>
-        /// <param name="customTestHostLauncher">The custom host launcher.</param>
-        void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Cancels the last test run.
-        /// </summary>
-        new void CancelTestRun();
-
-        /// <summary>
-        /// Aborts the last test run.
-        /// </summary>
-        new void AbortTestRun();
-
-        /// <summary>
-        /// Ends the test session and stops processing requests.
-        /// </summary>
-        new void EndSession();
-    }
+    new void EndSession();
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
index 3474af900f..88179eb7e6 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
@@ -1,351 +1,486 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+/// <summary>
+/// Asynchronous equivalent of <see cref="IVsTestConsoleWrapper"/>.
+/// </summary>
+public interface IVsTestConsoleWrapperAsync
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-
-    /// <summary>
-    /// Asynchronous equivalent of <see cref="IVsTestConsoleWrapper"/>.
-    /// </summary>
-    public interface IVsTestConsoleWrapperAsync
-    {
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="IVsTestConsoleWrapper.StartSession"/>.
-        /// </summary>
-        Task StartSessionAsync();
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StartTestSession(
-        ///     IList{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestSessionEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.StopTestSession(
-        ///     TestSessionInfo,
-        ///     ITestSessionEventsHandler)"/>.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        Task<bool> StopTestSessionAsync(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.InitializeExtensions(
-        ///     IEnumerable{string})"/>.
-        /// </summary>
-        Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditionalExtensions);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.DiscoverTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     ITestDiscoveryEventsHandler)"/>.
-        /// </summary>
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.DiscoverTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestDiscoveryEventsHandler2)"/>.
-        /// </summary>
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.DiscoverTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestDiscoveryEventsHandler2)"/>.
-        /// </summary>
-        Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler);
-
-        /// <summary>
-        /// See <see cref="IVsTestConsoleWrapper.CancelDiscovery"/>.
-        /// </summary>
-        void CancelDiscovery();
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        ///     IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        ///     IVsTestConsoleWrapper.RunTests(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler)"/>.
-        /// </summary>
-        Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{string},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// Asynchronous equivalent of <see cref="
-        /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
-        ///     IEnumerable{TestCase},
-        ///     string,
-        ///     TestPlatformOptions,
-        ///     TestSessionInfo,
-        ///     ITestRunEventsHandler,
-        ///     ITestHostLauncher)"/>.
-        /// </summary>
-        Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher);
-
-        /// <summary>
-        /// See <see cref="IVsTestConsoleWrapper.CancelTestRun"/>.
-        /// </summary>
-        void CancelTestRun();
-
-        /// <summary>
-        /// See <see cref="IVsTestConsoleWrapper.AbortTestRun"/>.
-        /// </summary>
-        void AbortTestRun();
-
-        /// <summary>
-        /// Gets back all attachments to test platform for additional processing (for example merging).
-        /// </summary>
-        /// 
-        /// <param name="attachments">Collection of attachments.</param>
-        /// <param name="processingSettings">XML processing settings.</param>
-        /// <param name="isLastBatch">
-        /// Indicates that all test executions are done and all data is provided.
-        /// </param>
-        /// <param name="collectMetrics">Enables metrics collection (used for telemetry).</param>
-        /// <param name="eventsHandler">Event handler to receive session complete event.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>        
-        Task ProcessTestRunAttachmentsAsync(
-            IEnumerable<AttachmentSet> attachments,
-            string processingSettings,
-            bool isLastBatch,
-            bool collectMetrics,
-            ITestRunAttachmentsProcessingEventsHandler eventsHandler,
-            CancellationToken cancellationToken);
-
-        /// <summary>
-        /// See <see cref="IVsTestConsoleWrapper.EndSession"/>.
-        /// </summary>
-        void EndSession();
-    }
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="IVsTestConsoleWrapper.StartSession"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task StartSessionAsync();
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.StartTestSession(
+    ///     IList{string},
+    ///     string,
+    ///     ITestSessionEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.StartTestSession(
+    ///     IList{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestSessionEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.StartTestSession(
+    ///     IList{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestSessionEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher testHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.StopTestSession(
+    ///     TestSessionInfo,
+    ///     ITestSessionEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.StopTestSession(
+    ///     TestSessionInfo,
+    ///     TestPlatformOptions,
+    ///     ITestSessionEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.InitializeExtensions(
+    ///     IEnumerable{string})"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditionalExtensions);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.DiscoverTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     ITestDiscoveryEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.DiscoverTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestDiscoveryEventsHandler2)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.DiscoverTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestDiscoveryEventsHandler2)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+
+    /// <summary>
+    /// See <see cref="IVsTestConsoleWrapper.CancelDiscovery"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    void CancelDiscovery();
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    ///     IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    ///     IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    ///     IVsTestConsoleWrapper.RunTests(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{string},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// Asynchronous equivalent of <see cref="
+    /// IVsTestConsoleWrapper.RunTestsWithCustomTestHost(
+    ///     IEnumerable{TestCase},
+    ///     string,
+    ///     TestPlatformOptions,
+    ///     TestSessionInfo,
+    ///     ITestRunEventsHandler,
+    ///     ITelemetryEventsHandler,
+    ///     ITestHostLauncher)"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher);
+
+    /// <summary>
+    /// See <see cref="IVsTestConsoleWrapper.CancelTestRun"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    void CancelTestRun();
+
+    /// <summary>
+    /// See <see cref="IVsTestConsoleWrapper.AbortTestRun"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    void AbortTestRun();
+
+    /// <summary>
+    /// Gets back all attachments to test platform for additional processing (for example merging).
+    /// </summary>
+    ///
+    /// <param name="attachments">Collection of attachments.</param>
+    /// <param name="processingSettings">XML processing settings.</param>
+    /// <param name="isLastBatch">
+    /// Indicates that all test executions are done and all data is provided.
+    /// </param>
+    /// <param name="collectMetrics">Enables metrics collection (used for telemetry).</param>
+    /// <param name="eventsHandler">Event handler to receive session complete event.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler eventsHandler,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets back all attachments to test platform for additional processing (for example merging).
+    /// </summary>
+    ///
+    /// <param name="attachments">Collection of attachments.</param>
+    /// <param name="invokedDataCollectors">Collection of invoked data collectors.</param>
+    /// <param name="processingSettings">XML processing settings.</param>
+    /// <param name="isLastBatch">
+    /// Indicates that all test executions are done and all data is provided.
+    /// </param>
+    /// <param name="collectMetrics">Enables metrics collection (used for telemetry).</param>
+    /// <param name="eventsHandler">Event handler to receive session complete event.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler eventsHandler,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// See <see cref="IVsTestConsoleWrapper.EndSession"/>.
+    /// </summary>
+    [Obsolete("The async APIs don't work, use the sync API instead.")]
+    void EndSession();
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
index 70ced3649b..cda5cf5075 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
@@ -1,54 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.VsTestConsole.TranslationLayer</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
+
   <PropertyGroup>
     <DocumentationFile>$(BaseIntermediateOutputPath)\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.XML</DocumentationFile>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
+
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.TranslationLayer</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Xml" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
+
   <ItemGroup>
+    <Compile Update="Resources\InternalResources.Designer.cs">
+      <DependentUpon>InternalResources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Resources\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Resources\InternalResources.resx">
+      <LastGenOutput>InternalResources.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
   </ItemGroup>
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
   <Target Name="WorkAroundPackageAndProjectReferenceConflict" BeforeTargets="ResolveLockFileReferences">
     <ItemGroup>
       <ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'%(ResolvedCompileFileDefinitions.Filename)' == 'Microsoft.TestPlatform.Common'" />
     </ItemGroup>
   </Target>
+
 </Project>
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec
new file mode 100644
index 0000000000..4da3c58780
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net462">
+        <dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="NETStandard.Library" version="[2.0.0, )" />
+      </group>
+    </dependencies>
+
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
+      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
+    </frameworkAssemblies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <file src="net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.XML" target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\net462\" />
+    <file src="net462\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\net462\" />
+    <file src="net462\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\net462\" />
+
+    <file src="netstandard2.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.XML" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\netstandard2.0\" />
+
+
+    <!-- Add localized resources -->
+    <file src="net462\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="net462\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="net462\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="net462\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\cs" />
+    <file src="net462\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\de" />
+    <file src="net462\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\es" />
+    <file src="net462\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\fr" />
+    <file src="net462\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\it" />
+    <file src="net462\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\ja" />
+    <file src="net462\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\ko" />
+    <file src="net462\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\pl" />
+    <file src="net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\pt-BR" />
+    <file src="net462\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\ru" />
+    <file src="net462\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\tr" />
+    <file src="net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\zh-Hans" />
+    <file src="net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net462\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="netstandard2.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+  </files>
+</package>
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/NoOpTelemetryEventsHandler.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/NoOpTelemetryEventsHandler.cs
new file mode 100644
index 0000000000..e0fb418ee2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/NoOpTelemetryEventsHandler.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer;
+
+internal class NoOpTelemetryEventsHandler : ITelemetryEventsHandler
+{
+    public void HandleTelemetryEvent(TelemetryEvent telemetryEvent)
+    {
+        // no op
+    }
+}
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Properties/AssemblyInfo.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Properties/AssemblyInfo.cs
index a68e7c5899..3f6bd597c1 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Properties/AssemblyInfo.cs
@@ -1,30 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.ManagedConsoleWrapper")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b5e3af48-222f-4378-9ed9-f0238e2a278e")]
 
 //To make visible internal interface to unittests
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=00240000048000009"+
-    "40000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a360"+
-    "2f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0ba"+
-    "c1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924"+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=00240000048000009" +
+    "40000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a360" +
+    "2f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0ba" +
+    "c1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924" +
     "cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..3643b74345
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,212 @@
+#nullable enable
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.ConsoleParameters() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.ConsoleParameters(Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces.IFileHelper! fileHelper) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.EnvironmentVariables.get -> System.Collections.Generic.Dictionary<string!, string?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.EnvironmentVariables.set -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.InheritEnvironmentVariables.get -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.InheritEnvironmentVariables.set -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.LogFilePath.get -> string?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.LogFilePath.set -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.TraceLevel.get -> System.Diagnostics.TraceLevel
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters.TraceLevel.set -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter.DiscoveryEventsHandleConverter(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! testDiscoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter.HandleDiscoveredTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? discoveredTestCases) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter.HandleDiscoveryComplete(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.DiscoveryCompleteEventArgs! discoveryCompleteEventArgs, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>? lastChunk) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter.HandleLogMessage(Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel level, string? message) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.DiscoveryEventsHandleConverter.HandleRawMessage(string! rawMessage) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.AbortTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.CancelDiscovery() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.CancelTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.EndSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.InitializeExtensions(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StartSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! testHostLauncher) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.AbortTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.CancelDiscovery() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.CancelTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.EndSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.InitializeExtensionsAsync(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.ProcessTestRunAttachmentsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments, string? processingSettings, bool isLastBatch, bool collectMetrics, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler! eventsHandler, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.ProcessTestRunAttachmentsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>? invokedDataCollectors, string? processingSettings, bool isLastBatch, bool collectMetrics, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler! eventsHandler, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StartSessionAsync() -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! testHostLauncher) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.AbortTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.CancelDiscovery() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.CancelTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.Dispose() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSession() -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSessionAsync() -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.TestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper! consoleWrapper) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.~TestSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TransationLayerException
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TransationLayerException.TransationLayerException(string? message) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TransationLayerException.TransationLayerException(string? message, System.Exception? innerException) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.AbortTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.CancelDiscovery() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.CancelTestRun() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.EndSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.InitializeExtensions(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.InitializeExtensionsAsync(System.Collections.Generic.IEnumerable<string!>! pathToAdditionalExtensions) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.ProcessTestRunAttachmentsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments, string? processingSettings, bool isLastBatch, bool collectMetrics, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler! testSessionEventsHandler, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.ProcessTestRunAttachmentsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet!>! attachments, System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.InvokedDataCollector!>? invokedDataCollectors, string? processingSettings, bool isLastBatch, bool collectMetrics, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunAttachmentsProcessingEventsHandler! testSessionEventsHandler, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartSession() -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartSessionAsync() -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSession(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StartTestSessionAsync(System.Collections.Generic.IList<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher? testHostLauncher) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession?>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.VsTestConsoleWrapper(string! vstestConsolePath) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.VsTestConsoleWrapper(string! vstestConsolePath, Microsoft.TestPlatform.VsTestConsole.TranslationLayer.ConsoleParameters! consoleParameters) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.AbortTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.CancelDiscovery() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.CancelTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.DiscoverTests(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.StopTestSession() -> bool
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.StopTestSession(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> bool
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.TestSessionInfo.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo?
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.AbortTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.CancelDiscovery() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.CancelTestRun() -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.DiscoverTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! discoverySettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestDiscoveryEventsHandler2! discoveryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.StopTestSessionAsync() -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.StopTestSessionAsync(Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestSessionEventsHandler! eventsHandler) -> System.Threading.Tasks.Task<bool>!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources
+virtual Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.Dispose(bool disposing) -> void
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.AbortedStartTestSession.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.AbortedStopTestSession.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.AbortedTestRunAttachmentsProcessing.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.AbortedTestsDiscovery.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.AbortedTestsRun.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.Culture.get -> System.Globalization.CultureInfo
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.Culture.set -> void
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.FailedToReceiveMessage.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.InvalidFilePath.get -> string
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.ResourceManager.get -> System.Resources.ResourceManager
+~static Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources.VsTestProcessExitedAbnormally.get -> string
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..4e39cac22a
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1,33 @@
+#nullable enable
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.IVsTestConsoleWrapperAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.VsTestConsoleWrapper.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string? runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestSessionInfo? testSessionInfo, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.TestPlatform.VsTestConsole.TranslationLayer.TestSession.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions? options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTests(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSession.RunTestsWithCustomTestHost(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> void
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase!>! testCases, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces.ITestSessionAsync.RunTestsWithCustomTestHostAsync(System.Collections.Generic.IEnumerable<string!>! sources, string! runSettings, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestPlatformOptions! options, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITestRunEventsHandler! testRunEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.ITelemetryEventsHandler! telemetryEventsHandler, Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces.ITestHostLauncher! customTestHostLauncher) -> System.Threading.Tasks.Task!
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.Designer.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.Designer.cs
new file mode 100644
index 0000000000..7ec9fed243
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.Designer.cs
@@ -0,0 +1,82 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class InternalResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal InternalResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Inte" +
+                            "rnalResources", typeof(InternalResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot find the console runner {0}..
+        /// </summary>
+        internal static string CannotFindConsoleRunner {
+            get {
+                return ResourceManager.GetString("CannotFindConsoleRunner", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred when opening the file {0} with arguments {1}..
+        /// </summary>
+        internal static string ProcessStartWin32Failure {
+            get {
+                return ResourceManager.GetString("ProcessStartWin32Failure", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.resx b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.resx
new file mode 100644
index 0000000000..ee9848ec43
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/InternalResources.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CannotFindConsoleRunner" xml:space="preserve">
+    <value>Cannot find the console runner {0}.</value>
+    <comment>{0}: the console runner path</comment>
+  </data>
+  <data name="ProcessStartWin32Failure" xml:space="preserve">
+    <value>An error occurred when opening the file {0} with arguments {1}.</value>
+    <comment>{0}: process path
+{1}: arguments passed to the process invocation</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs
index 222fa23065..46026b8c06 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Res
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.cs.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.cs.xlf
new file mode 100644
index 0000000000..410aa5879e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.cs.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="cs">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Nepovedlo se najít {0} spouštěče konzoly.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Při otevírání {0} souboru s argumenty {1} došlo k chybě.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.de.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.de.xlf
new file mode 100644
index 0000000000..37accae976
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.de.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="de">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Der Konsolen-Runner {0} wurde nicht gefunden.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Beim Öffnen der Datei {0} mit den Argumenten {1} ist ein Fehler aufgetreten.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.es.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.es.xlf
new file mode 100644
index 0000000000..6fa1ef30fc
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.es.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="es">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">No se encuentra el ejecutor de consola {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Error al abrir el archivo {0} con los argumentos {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.fr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.fr.xlf
new file mode 100644
index 0000000000..1620e28ec2
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.fr.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="fr">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Impossible de trouver l’exécuteur de console {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Une erreur s’est produite lors de l’ouverture du fichier {0} avec des arguments {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.it.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.it.xlf
new file mode 100644
index 0000000000..0508a368ca
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.it.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="it">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Impossibile trovare lo strumento di esecuzione della console {0}..</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Errore durante l'apertura del file {0} con argomenti {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ja.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ja.xlf
new file mode 100644
index 0000000000..67faac9173
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ja.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="ja">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">コンソール ランナー {0}が見つかりません。</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">引数 {1} でファイル {0} を開くときにエラーが発生しました。</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ko.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ko.xlf
new file mode 100644
index 0000000000..10a75c3c29
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ko.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="ko">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">{0} 콘솔 실행기를 찾을 수 없습니다.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">{1} 인스가 있는 {0} 파일을 여는 동안 오류가 발생했습니다.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pl.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pl.xlf
new file mode 100644
index 0000000000..01eb8ee75e
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pl.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="pl">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Nie można odnaleźć modułu uruchamiającego konsoli {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Wystąpił błąd podczas otwierania pliku {0} z argumentami {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pt-BR.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pt-BR.xlf
new file mode 100644
index 0000000000..6aec215e47
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.pt-BR.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Não é possível localizar o executor do console {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Erro ao abrir o arquivo {0} com argumentos {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ru.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ru.xlf
new file mode 100644
index 0000000000..731c823e1c
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.ru.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="ru">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Не удается найти средство выполнения консоли {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">Произошла ошибка при открытии файла {0} с аргументами {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.tr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.tr.xlf
new file mode 100644
index 0000000000..871fb2f22c
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.tr.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="tr">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">Konsol çalıştırıcısı {0} bulunamıyor.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">{1} bağımsız değişkenleriyle {0} dosyası açılırken bir hata oluştu.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.xlf
new file mode 100644
index 0000000000..c70b46fb90
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="new">Cannot find the console runner {0}.</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="new">An error occurred when opening the file {0} with arguments {1}.</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hans.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hans.xlf
new file mode 100644
index 0000000000..a72f148157
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hans.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">无法找到控制台运行其 {0}。</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">使用参数 {1} 打开文件 {0} 时出错。</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hant.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hant.xlf
new file mode 100644
index 0000000000..4ccf5ed147
--- /dev/null
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/InternalResources.zh-Hant.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../InternalResources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="CannotFindConsoleRunner">
+        <source>Cannot find the console runner {0}.</source>
+        <target state="translated">找不到主控台執行器 {0}。</target>
+        <note>{0}: the console runner path</note>
+      </trans-unit>
+      <trans-unit id="ProcessStartWin32Failure">
+        <source>An error occurred when opening the file {0} with arguments {1}.</source>
+        <target state="translated">開啟具有引數 {1} 的檔案 {0} 時發生錯誤。</target>
+        <note>{0}: process path
+{1}: arguments passed to the process invocation</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf
index bfb979a970..606739e965 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Aktivní testovací běh se přerušil.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Aktivní zjišťování testů se přerušilo.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Nepovedlo se přijmout zprávu z procesu vstest.console.</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Proces vstest.console se ukončil neobvyklým způsobem.</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Soubor {0} neexistuje.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Aktivní zpracovávání příloh testovacího běhu se přerušilo.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">Operace zahájení testovací relace se přerušila.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">Operace zastavení testovací relace se přerušila.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Aktivní testovací běh se přerušil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Aktivní zjišťování testů se přerušilo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Nepovedlo se přijmout zprávu z procesu vstest.console.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Proces vstest.console se ukončil neobvyklým způsobem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Soubor {0} neexistuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Aktivní zpracovávání příloh testovacího běhu se přerušilo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">Operace zahájení testovací relace se přerušila.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">Operace zastavení testovací relace se přerušila.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf
index f5dbd9ebfd..2bcf8be295 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Der aktive Testlauf wurde abgebrochen.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Die aktive Testermittlung wurde abgebrochen.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Fehler beim Empfangen der Nachricht aus dem vstest.console-Prozess.</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Der vstest.console-Prozess wurde anormal beendet.</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Die Datei "{0}" ist nicht vorhanden.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Die Verarbeitung aktiver Testlaufanlagen wurde abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">Der Vorgang zum Starten der Testsitzung wurde abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">Der Vorgang zum Beenden der Testsitzung wurde abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Der aktive Testlauf wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Die aktive Testermittlung wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Fehler beim Empfangen der Nachricht aus dem vstest.console-Prozess.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Der vstest.console-Prozess wurde anormal beendet.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Die Datei "{0}" ist nicht vorhanden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Die Verarbeitung aktiver Testlaufanlagen wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">Der Vorgang zum Starten der Testsitzung wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">Der Vorgang zum Beenden der Testsitzung wurde abgebrochen.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf
index 846a8c672e..c003e2e574 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Se ha anulado la serie de pruebas activa.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Se ha anulado la detección de pruebas activa.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">No se pudo recibir el mensaje del proceso vstest.console</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">El proceso vstest.console finalizó de forma anómala</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">El archivo {0} no existe</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Se ha anulado el procesamiento de los datos adjuntos de la serie de pruebas activa.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">La operación de inicio de la sesión de prueba se ha anulado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">La operación de detención de la sesión de prueba se ha anulado.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Se ha anulado la serie de pruebas activa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Se ha anulado la detección de pruebas activa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">No se pudo recibir el mensaje del proceso vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">El proceso vstest.console finalizó de forma anómala</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">El archivo {0} no existe</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Se ha anulado el procesamiento de los datos adjuntos de la serie de pruebas activa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">La operación de inicio de la sesión de prueba se ha anulado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">La operación de detención de la sesión de prueba se ha anulado.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf
index 520701f49e..33e49af784 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">La série de tests active a été abandonnée.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">La découverte de tests active a été abandonnée.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Échec de réception du message du processus vstest.console</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Sortie anormale du processus vstest.console</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Le fichier {0} n'existe pas</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Le traitement des pièces jointes de série de tests actif a été abandonné.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">L'opération de démarrage de la session de test a été abandonnée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">L'opération d'arrêt de la session de test a été abandonnée.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">La série de tests active a été abandonnée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">La découverte de tests active a été abandonnée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Échec de réception du message du processus vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Sortie anormale du processus vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Le fichier {0} n'existe pas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Le traitement des pièces jointes de série de tests actif a été abandonné.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">L'opération de démarrage de la session de test a été abandonnée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">L'opération d'arrêt de la session de test a été abandonnée.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf
index 9c961daa74..80b4b793b7 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">L'esecuzione dei test attiva è stata interrotta.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">L'individuazione dei test attiva è stata interrotta.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Non è stato possibile ricevere il messaggio dal processo vstest.console</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Il processo vstest.console è stato chiuso in modo anomalo</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Il file {0} non esiste</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">L'elaborazione degli allegati dell'esecuzione dei test attiva è stata interrotta.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">L'operazione di avvio della sessione di test è stata interrotta.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">L'operazione di arresto della sessione di test è stata interrotta.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">L'esecuzione dei test attiva è stata interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">L'individuazione dei test attiva è stata interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Non è stato possibile ricevere il messaggio dal processo vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Il processo vstest.console è stato chiuso in modo anomalo</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Il file {0} non esiste</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">L'elaborazione degli allegati dell'esecuzione dei test attiva è stata interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">L'operazione di avvio della sessione di test è stata interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">L'operazione di arresto della sessione di test è stata interrotta.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf
index f8a2a7df30..3d7294aed6 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">アクティブなテストの実行が中止されました。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">アクティブなテスト探索が中止されました。</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">vstest.console プロセスからメッセージを受信できませんでした</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">vstest.console プロセスが異常終了しました</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">ファイル {0} が存在しません</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">アクティブなテストの実行の添付ファイルの処理が中止されました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">テスト セッションの開始操作が中止されました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">テスト セッションの停止操作が中止されました。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">アクティブなテストの実行が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">アクティブなテスト探索が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">vstest.console プロセスからメッセージを受信できませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">vstest.console プロセスが異常終了しました</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">ファイル {0} が存在しません</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">アクティブなテストの実行の添付ファイルの処理が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">テスト セッションの開始操作が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">テスト セッションの停止操作が中止されました。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf
index 7b5468fb0e..6124e01c75 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">활성 테스트 실행이 중단되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">활성 테스트 검색이 중단되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">vstest.console 프로세스에서 메시지를 받지 못했습니다.</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">vstest.console 프로세스가 비정상적으로 종료되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">{0} 파일이 없습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">활성 테스트 실행 첨부 파일 처리가 중단되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">테스트 세션 시작 작업이 중단되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">테스트 세션 중지 작업이 중단되었습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">활성 테스트 실행이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">활성 테스트 검색이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">vstest.console 프로세스에서 메시지를 받지 못했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">vstest.console 프로세스가 비정상적으로 종료되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">{0} 파일이 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">활성 테스트 실행 첨부 파일 처리가 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">테스트 세션 시작 작업이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">테스트 세션 중지 작업이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf
index 1210941c11..e864c216ca 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Aktywny przebieg testów został przerwany.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Aktywny proces wykrywania testów został przerwany.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Nie można odebrać komunikatu z procesu vstest.console</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Proces vstest.console zakończył się nieprawidłowo</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Plik {0} nie istnieje</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Aktywne przetwarzanie załączników przebiegu testu zostało przerwane.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">Operacja uruchamiania sesji testowania została przerwana.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">Operacja zatrzymywania sesji testowania została przerwana.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Aktywny przebieg testów został przerwany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Aktywny proces wykrywania testów został przerwany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Nie można odebrać komunikatu z procesu vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Proces vstest.console zakończył się nieprawidłowo</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Plik {0} nie istnieje</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Aktywne przetwarzanie załączników przebiegu testu zostało przerwane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">Operacja uruchamiania sesji testowania została przerwana.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">Operacja zatrzymywania sesji testowania została przerwana.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf
index b0403adaac..a9368c6aa1 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">A Execução de Testes ativa foi anulada.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">A Descoberta de Testes ativa foi anulada.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Falha ao receber mensagem do processo vstest.console</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">processo de vstest.console encerrado de forma anormal</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">O arquivo {0} não existe</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">O Processamento de Anexos de Execução de Teste ativo foi anulado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">A operação Iniciar a Sessão de Teste foi anulada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">A operação Parar a Sessão de Teste foi anulada.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">A Execução de Testes ativa foi anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">A Descoberta de Testes ativa foi anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Falha ao receber mensagem do processo vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">processo de vstest.console encerrado de forma anormal</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">O arquivo {0} não existe</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">O Processamento de Anexos de Execução de Teste ativo foi anulado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">A operação Iniciar a Sessão de Teste foi anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">A operação Parar a Sessão de Teste foi anulada.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf
index c35d49a2a9..d86672c1ad 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Активный тестовый запуск прерван.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Активное обнаружение тестов прервано.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">Не удалось получить сообщение из процесса vstest.console.</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">Аварийное завершение процесса vstest.console</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">Файл {0} не существует.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Обработка вложений активного тестового запуска прервана.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">Операция запуска сеанса тестирования прервана.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">Операция остановки сеанса тестирования прервана.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Активный тестовый запуск прерван.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Активное обнаружение тестов прервано.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">Не удалось получить сообщение из процесса vstest.console.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">Аварийное завершение процесса vstest.console</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">Файл {0} не существует.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Обработка вложений активного тестового запуска прервана.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">Операция запуска сеанса тестирования прервана.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">Операция остановки сеанса тестирования прервана.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf
index bc43e1e1f6..a10a642a8e 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">Etkin Test Çalıştırması iptal edildi.</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">Etkin Test Bulma iptal edildi.</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">vstest.console işleminden ileti alınamadı</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">vstest.console işlemi anormal şekilde çıkış yaptı</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">{0} dosyası yok</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">Etkin Test Çalıştırması Ekleri İşlemi durduruldu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">Test Oturumunu Başlatma işlemi iptal edildi.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">Test Oturumunu Durdurma işlemi iptal edildi.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">Etkin Test Çalıştırması iptal edildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">Etkin Test Bulma iptal edildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">vstest.console işleminden ileti alınamadı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">vstest.console işlemi anormal şekilde çıkış yaptı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">{0} dosyası yok</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">Etkin Test Çalıştırması Ekleri İşlemi durduruldu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">Test Oturumunu Başlatma işlemi iptal edildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">Test Oturumunu Durdurma işlemi iptal edildi.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf
index 4aca1abbc0..05a1062077 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.xlf
@@ -4,40 +4,40 @@
     <body>
       <trans-unit id="AbortedTestsRun">
         <source>The active Tests Run was aborted.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AbortedTestsDiscovery">
         <source>The active Tests Discovery was aborted.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedToReceiveMessage">
         <source>Failed to receive message from vstest.console process</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="VsTestProcessExitedAbnormally">
         <source>vstest.console process exited abnormally</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidFilePath">
         <source>File {0} does not exists</source>
         <target state="new">File {0} does not exists</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AbortedTestRunAttachmentsProcessing">
         <source>The active Test Run Attachments Processing was aborted.</source>
         <target state="new">The active Test Run Attachments Processing was aborted.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AbortedStartTestSession">
         <source>The Start Test Session operation was aborted.</source>
         <target state="new">The Start Test Session operation was aborted.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AbortedStopTestSession">
         <source>The Stop Test Session operation was aborted.</source>
         <target state="new">The Stop Test Session operation was aborted.</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf
index 261a682df9..88829d455f 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">活动的测试运行已中止。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">活动的测试发现已中止。</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">未能从 vstest.console 进程接收消息</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">vstest.console 进程异常退出</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">文件 {0} 不存在</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">已中止正在进行的测试运行附件处理操作。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">已中止启动测试会话操作。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">已中止停止测试会话操作。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">活动的测试运行已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">活动的测试发现已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">未能从 vstest.console 进程接收消息</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">vstest.console 进程异常退出</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">文件 {0} 不存在</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">已中止正在进行的测试运行附件处理操作。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">已中止启动测试会话操作。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">已中止停止测试会话操作。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf
index 0baa3681f5..b5ef69e200 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="AbortedTestsRun">
-        <source>The active Tests Run was aborted.</source>
-        <note></note>
-        <target state="translated">已中止使用中的測試回合。</target>
-      </trans-unit>
-      <trans-unit id="AbortedTestsDiscovery">
-        <source>The active Tests Discovery was aborted.</source>
-        <note></note>
-        <target state="translated">已中止使用中的測試探索。</target>
-      </trans-unit>
-      <trans-unit id="FailedToReceiveMessage">
-        <source>Failed to receive message from vstest.console process</source>
-        <note></note>
-        <target state="translated">無法接收來自 vstest.console 處理序的訊息</target>
-      </trans-unit>
-      <trans-unit id="VsTestProcessExitedAbnormally">
-        <source>vstest.console process exited abnormally</source>
-        <note></note>
-        <target state="translated">vstest.console 處理序異常結束</target>
-      </trans-unit>
-      <trans-unit id="InvalidFilePath">
-        <source>File {0} does not exists</source>
-        <target state="translated">檔案 {0} 不存在</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedTestRunAttachmentsProcessing">
-        <source>The active Test Run Attachments Processing was aborted.</source>
-        <target state="translated">執行中的測試回合附件處理已中止。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStartTestSession">
-        <source>The Start Test Session operation was aborted.</source>
-        <target state="translated">開始測試工作階段作業已中止。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="AbortedStopTestSession">
-        <source>The Stop Test Session operation was aborted.</source>
-        <target state="translated">停止測試工作階段作業已中止。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="AbortedTestsRun">
+        <source>The active Tests Run was aborted.</source>
+        <target state="translated">已中止使用中的測試回合。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestsDiscovery">
+        <source>The active Tests Discovery was aborted.</source>
+        <target state="translated">已中止使用中的測試探索。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedToReceiveMessage">
+        <source>Failed to receive message from vstest.console process</source>
+        <target state="translated">無法接收來自 vstest.console 處理序的訊息</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VsTestProcessExitedAbnormally">
+        <source>vstest.console process exited abnormally</source>
+        <target state="translated">vstest.console 處理序異常結束</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFilePath">
+        <source>File {0} does not exists</source>
+        <target state="translated">檔案 {0} 不存在</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedTestRunAttachmentsProcessing">
+        <source>The active Test Run Attachments Processing was aborted.</source>
+        <target state="translated">執行中的測試回合附件處理已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStartTestSession">
+        <source>The Start Test Session operation was aborted.</source>
+        <target state="translated">開始測試工作階段作業已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AbortedStopTestSession">
+        <source>The Stop Test Session operation was aborted.</source>
+        <target state="translated">停止測試工作階段作業已中止。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
index 9db1bf6fc3..5c0c0c1602 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TestSession.cs
@@ -1,483 +1,654 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+
+/// <summary>
+/// Defines a test session object that can be used to make calls to the vstest.console
+/// process.
+/// </summary>
+[Obsolete("This API is not final yet and is subject to changes.", false)]
+public class TestSession : ITestSession
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
+    private bool _disposed;
 
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+    private readonly ITestSessionEventsHandler _eventsHandler;
+    private readonly IVsTestConsoleWrapper _consoleWrapper;
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public TestSessionInfo? TestSessionInfo { get; private set; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestSession"/> class.
+    /// </summary>
+    ///
+    /// <param name="testSessionInfo">The test session info object.</param>
+    /// <param name="eventsHandler">The session event handler.</param>
+    /// <param name="consoleWrapper">The encapsulated console wrapper.</param>
+    public TestSession(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler,
+        IVsTestConsoleWrapper consoleWrapper)
+    {
+        TestSessionInfo = testSessionInfo;
+        _eventsHandler = eventsHandler;
+        _consoleWrapper = consoleWrapper;
+    }
+
+    /// <summary>
+    /// Destroys the current instance of the <see cref="TestSession"/> class.
+    /// </summary>
+    ~TestSession() => Dispose(false);
 
     /// <summary>
-    /// Defines a test session object that can be used to make calls to the vstest.console
-    /// process.
+    /// Disposes of the current instance of the <see cref="TestSession"/> class.
     /// </summary>
     [Obsolete("This API is not final yet and is subject to changes.", false)]
-    public class TestSession : ITestSession
-    {
-        private bool disposed = false;
-
-        private readonly ITestSessionEventsHandler eventsHandler;
-        private readonly IVsTestConsoleWrapper consoleWrapper;
-
-        #region Properties
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public TestSessionInfo TestSessionInfo { get; private set; }
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSession"/> class.
-        /// </summary>
-        /// 
-        /// <param name="testSessionInfo">The test session info object.</param>
-        /// <param name="eventsHandler">The session event handler.</param>
-        /// <param name="consoleWrapper">The encapsulated console wrapper.</param>
-        public TestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler,
-            IVsTestConsoleWrapper consoleWrapper)
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Disposes of the current instance of the <see cref="TestSession"/> class.
+    /// </summary>
+    ///
+    /// <param name="disposing">Indicates if managed resources should be disposed.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_disposed)
         {
-            this.TestSessionInfo = testSessionInfo;
-            this.eventsHandler = eventsHandler;
-            this.consoleWrapper = consoleWrapper;
+            return;
         }
 
-        /// <summary>
-        /// Destroys the current instance of the <see cref="TestSession"/> class.
-        /// </summary>
-        ~TestSession() => this.Dispose(false);
-
-        /// <summary>
-        /// Disposes of the current instance of the <see cref="TestSession"/> class.
-        /// </summary>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void Dispose()
+        if (disposing)
         {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
+            StopTestSession();
         }
 
-        /// <summary>
-        /// Disposes of the current instance of the <see cref="TestSession"/> class.
-        /// </summary>
-        /// 
-        /// <param name="disposing">Indicates if managed resources should be disposed.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (this.disposed)
-            {
-                return;
-            }
+        _disposed = true;
+    }
 
-            this.StopTestSession();
-            this.disposed = true;
-        }
-        #endregion
+    #region ITestSession
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void AbortTestRun()
+    {
+        _consoleWrapper.AbortTestRun();
+    }
 
-        #region ITestSession
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void AbortTestRun()
-        {
-            this.consoleWrapper.AbortTestRun();
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void CancelDiscovery()
+    {
+        _consoleWrapper.CancelDiscovery();
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void CancelDiscovery()
-        {
-            this.consoleWrapper.CancelDiscovery();
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void CancelTestRun()
+    {
+        _consoleWrapper.CancelTestRun();
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void CancelTestRun()
-        {
-            this.consoleWrapper.CancelTestRun();
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        DiscoverTests(
+            sources,
+            discoverySettings,
+            options: null,
+            discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler));
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler)
-        {
-            this.DiscoverTests(
-                sources,
-                discoverySettings,
-                options: null,
-                discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler));
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        _consoleWrapper.DiscoverTests(
+            sources,
+            discoverySettings,
+            options,
+            TestSessionInfo,
+            discoveryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            this.consoleWrapper.DiscoverTests(
-                sources,
-                discoverySettings,
-                options,
-                this.TestSessionInfo,
-                discoveryEventsHandler);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler());
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.consoleWrapper.RunTests(
-                sources,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        _consoleWrapper.RunTests(
+            sources,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.consoleWrapper.RunTests(
-                testCases,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler());
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        _consoleWrapper.RunTests(
+            testCases,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                sources,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                testCases,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public bool StopTestSession()
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession()
+    {
+        return StopTestSession(_eventsHandler);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(ITestSessionEventsHandler eventsHandler)
+    {
+        return StopTestSession(options: null, eventsHandler);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        if (TestSessionInfo == null)
         {
-            return this.StopTestSession(this.eventsHandler);
+            return true;
         }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public bool StopTestSession(ITestSessionEventsHandler eventsHandler)
+        try
         {
-            if (this.TestSessionInfo == null)
-            {
-                return true;
-            }
-
-            try
-            {
-                return this.consoleWrapper.StopTestSession(
-                    this.TestSessionInfo,
-                    eventsHandler);
-            }
-            finally
-            {
-                this.TestSessionInfo = null;
-            }
+            return _consoleWrapper.StopTestSession(
+                TestSessionInfo,
+                options,
+                eventsHandler);
         }
-        #endregion
-
-        #region ITestSessionAsync
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler)
+        finally
         {
-            await this.DiscoverTestsAsync(
-                    sources,
-                    discoverySettings,
-                    options: null,
-                    discoveryEventsHandler:
-                        new DiscoveryEventsHandleConverter(discoveryEventsHandler))
-                .ConfigureAwait(false);
+            TestSessionInfo = null;
         }
+    }
+    #endregion
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            await this.consoleWrapper.DiscoverTestsAsync(
+    #region ITestSessionAsync
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        await DiscoverTestsAsync(
                 sources,
                 discoverySettings,
-                options,
-                this.TestSessionInfo,
-                discoveryEventsHandler).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                sources,
-                runSettings,
                 options: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+                discoveryEventsHandler:
+                new DiscoveryEventsHandleConverter(discoveryEventsHandler))
+            .ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.consoleWrapper.RunTestsAsync(
-                sources,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        await _consoleWrapper.DiscoverTestsAsync(
+            sources,
+            discoverySettings,
+            options,
+            TestSessionInfo,
+            discoveryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.consoleWrapper.RunTestsAsync(
-                testCases,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            sources,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler()).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        await _consoleWrapper.RunTestsAsync(
+            sources,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                sources,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            testCases,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler()).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        await _consoleWrapper.RunTestsAsync(
+            testCases,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await _consoleWrapper.RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await _consoleWrapper.RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options,
+            TestSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync()
+    {
+        return await StopTestSessionAsync(_eventsHandler).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync(ITestSessionEventsHandler eventsHandler)
+    {
+        return await StopTestSessionAsync(options: null, eventsHandler).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync(
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        if (TestSessionInfo == null)
         {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                testCases,
-                runSettings,
-                options,
-                this.TestSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
+            return true;
         }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<bool> StopTestSessionAsync()
+        try
         {
-            return await this.StopTestSessionAsync(this.eventsHandler).ConfigureAwait(false);
+            return await _consoleWrapper.StopTestSessionAsync(
+                TestSessionInfo,
+                options,
+                eventsHandler).ConfigureAwait(false);
         }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<bool> StopTestSessionAsync(ITestSessionEventsHandler eventsHandler)
+        finally
         {
-            if (this.TestSessionInfo == null)
-            {
-                return true;
-            }
-
-            try
-            {
-                return await this.consoleWrapper.StopTestSessionAsync(
-                    this.TestSessionInfo,
-                    eventsHandler).ConfigureAwait(false);
-            }
-            finally
-            {
-                this.TestSessionInfo = null;
-            }
+            TestSessionInfo = null;
         }
-        #endregion
     }
+    #endregion
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TransationLayerException.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TransationLayerException.cs
index ae69a20db0..65068115fd 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TransationLayerException.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/TransationLayerException.cs
@@ -1,32 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
-{
-    using System;
+using System;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
 
+/// <summary>
+/// Specialized exception for TranslationLayer
+/// </summary>
+public class TransationLayerException : Exception
+{
     /// <summary>
-    /// Specialized exception for TranslationLayer
+    /// Initializes a new instance of the TransationLayerException class.
     /// </summary>
-    public class TransationLayerException : Exception
+    /// <param name="message">The message that describes the error.</param>
+    public TransationLayerException(string? message)
+        : base(message)
     {
-        /// <summary>
-        /// Initializes a new instance of the TransationLayerException class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public TransationLayerException(string message)
-            : base(message)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the TransationLayerException class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public TransationLayerException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the TransationLayerException class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public TransationLayerException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs
index 83f42032b6..9a7cb250f4 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs
@@ -1,235 +1,274 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources;
+
+using Resources = Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+
+/// <summary>
+/// Vstest.console process manager
+/// </summary>
+internal sealed class VsTestConsoleProcessManager : IProcessManager, IDisposable
 {
-    using Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Threading;
-    using Resources = Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources;
+    /// <summary>
+    /// Port number for communicating with Vstest CLI
+    /// </summary>
+    private const string PortArgument = "/port:{0}";
+
+    /// <summary>
+    /// Process Id of the Current Process which is launching Vstest CLI
+    /// Helps Vstest CLI in auto-exit if current process dies without notifying it
+    /// </summary>
+    private const string ParentProcessidArgument = "/parentprocessid:{0}";
+
+    /// <summary>
+    /// Diagnostics argument for Vstest CLI
+    /// Enables Diagnostic logging for Vstest CLI and TestHost - Optional
+    /// </summary>
+    private const string DiagArgument = "/diag:{0};tracelevel={1}";
+
+    /// <summary>
+    /// EndSession timeout
+    /// </summary>
+    private const int Endsessiontimeout = 1000;
+
+    private readonly string _vstestConsolePath;
+    private readonly object _syncObject = new();
+    private readonly bool _isNetCoreRunner;
+    private readonly string? _dotnetExePath;
+    private readonly ManualResetEvent _processExitedEvent = new(false);
+    private Process? _process;
+    private bool _vstestConsoleStarted;
+    private bool _vstestConsoleExited;
+    private bool _isDisposed;
+
+    internal IFileHelper FileHelper { get; set; }
+
+    /// <inheritdoc/>
+    public event EventHandler? ProcessExited;
 
     /// <summary>
-    /// Vstest.console process manager
+    /// Creates an instance of VsTestConsoleProcessManager class.
     /// </summary>
-    internal class VsTestConsoleProcessManager : IProcessManager
+    /// <param name="vstestConsolePath">The full path to vstest.console</param>
+    public VsTestConsoleProcessManager(string vstestConsolePath)
     {
-        #region Private Members
-
-        /// <summary>
-        /// Port number for communicating with Vstest CLI
-        /// </summary>
-        private const string PORT_ARGUMENT = "/port:{0}";
-
-        /// <summary>
-        /// Process Id of the Current Process which is launching Vstest CLI
-        /// Helps Vstest CLI in auto-exit if current process dies without notifying it
-        /// </summary>
-        private const string PARENT_PROCESSID_ARGUMENT = "/parentprocessid:{0}";
-
-        /// <summary>
-        /// Diagnostics argument for Vstest CLI
-        /// Enables Diagnostic logging for Vstest CLI and TestHost - Optional
-        /// </summary>
-        private const string DIAG_ARGUMENT = "/diag:{0};tracelevel={1}";
-
-        /// <summary>
-        /// EndSession timeout
-        /// </summary>
-        private const int ENDSESSIONTIMEOUT = 1000;
-
-        private string vstestConsolePath;
-        private object syncObject = new object();
-        private bool vstestConsoleStarted = false;
-        private bool vstestConsoleExited = false;
-        private readonly bool isNetCoreRunner;
-        private string dotnetExePath;
-        private Process process;
-        private ManualResetEvent processExitedEvent = new ManualResetEvent(false);
-
-        internal IFileHelper FileHelper { get; set; }
-
-        #endregion
-
-        /// <inheritdoc/>
-        public event EventHandler ProcessExited;
-
-        #region Constructor
-
-        /// <summary>
-        /// Creates an instance of VsTestConsoleProcessManager class.
-        /// </summary>
-        /// <param name="vstestConsolePath">The full path to vstest.console</param>
-        public VsTestConsoleProcessManager(string vstestConsolePath)
-        {
-            this.FileHelper = new FileHelper();
-            if (!this.FileHelper.Exists(vstestConsolePath))
-            {
-                EqtTrace.Error("Invalid File Path: {0}", vstestConsolePath);
-                throw new Exception(string.Format(CultureInfo.CurrentCulture, Resources.InvalidFilePath, vstestConsolePath));
-            }
-            this.vstestConsolePath = vstestConsolePath;
-            isNetCoreRunner = vstestConsolePath.EndsWith(".dll");
+        FileHelper = new FileHelper();
+        if (!FileHelper.Exists(vstestConsolePath))
+        {
+            EqtTrace.Error("Invalid File Path: {0}", vstestConsolePath);
+            throw new Exception(string.Format(CultureInfo.CurrentCulture, Resources.InvalidFilePath, vstestConsolePath));
         }
+        _vstestConsolePath = vstestConsolePath;
+        _isNetCoreRunner = vstestConsolePath.EndsWith(".dll");
+    }
 
-        public VsTestConsoleProcessManager(string vstestConsolePath, string dotnetExePath) : this(vstestConsolePath)
+    public VsTestConsoleProcessManager(string vstestConsolePath, string dotnetExePath) : this(vstestConsolePath)
+    {
+        _dotnetExePath = dotnetExePath;
+    }
+
+    /// <summary>
+    /// Checks if the process has been initialized.
+    /// </summary>
+    /// <returns>True if process is successfully initialized</returns>
+    public bool IsProcessInitialized()
+    {
+        lock (_syncObject)
         {
-            this.dotnetExePath = dotnetExePath;
+            return _vstestConsoleStarted && !_vstestConsoleExited && _process != null;
         }
+    }
 
-        #endregion Constructor
+    /// <summary>
+    /// Call vstest.console with the parameters previously specified
+    /// </summary>
+    public void StartProcess(ConsoleParameters consoleParameters)
+    {
+        var consoleRunnerPath = GetConsoleRunner();
 
-        /// <summary>
-        /// Checks if the process has been initialized.
-        /// </summary>
-        /// <returns>True if process is successfully initialized</returns>
-        public bool IsProcessInitialized()
+        // The console runner path we retrieve might have been escaped so we need to remove the
+        // extra double quotes before testing whether the file exists.
+        if (!File.Exists(consoleRunnerPath.Trim('"')))
         {
-            lock (syncObject)
-            {
-                return this.vstestConsoleStarted && !vstestConsoleExited &&
-                       this.process != null;
-            }
+            throw new FileNotFoundException(string.Format(CultureInfo.CurrentCulture, InternalResources.CannotFindConsoleRunner, consoleRunnerPath), consoleRunnerPath);
         }
 
-        /// <summary>
-        /// Call vstest.console with the parameters previously specified
-        /// </summary>
-        public void StartProcess(ConsoleParameters consoleParameters)
+        var arguments = string.Join(" ", BuildArguments(consoleParameters));
+        var info = new ProcessStartInfo(consoleRunnerPath, arguments)
         {
-            var info = new ProcessStartInfo(GetConsoleRunner(), string.Join(" ", BuildArguments(consoleParameters)))
-            {
-                UseShellExecute = false,
-                CreateNoWindow = true,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true
-            };
+            UseShellExecute = false,
+            CreateNoWindow = true,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+        };
+
+        EqtTrace.Verbose("VsTestCommandLineWrapper.StartProcess: Process Start Info {0} {1}", info.FileName, info.Arguments);
+
+        if (!consoleParameters.InheritEnvironmentVariables)
+        {
+            EqtTrace.Verbose("VsTestCommandLineWrapper.StartProcess: Clearing all environment variables.");
 
-            EqtTrace.Verbose("VsTestCommandLineWrapper: Process Start Info {0} {1}", info.FileName, info.Arguments);
+            info.EnvironmentVariables.Clear();
+        }
 
-#if NETFRAMEWORK
-            if (consoleParameters.EnvironmentVariables != null)
+        if (consoleParameters.EnvironmentVariables != null)
+        {
+            foreach (var envVariable in consoleParameters.EnvironmentVariables)
             {
-                info.EnvironmentVariables.Clear();
-                foreach (var envVariable in consoleParameters.EnvironmentVariables)
+                if (envVariable.Key != null)
                 {
-                    if (envVariable.Key != null)
-                    {
-                        info.EnvironmentVariables.Add(envVariable.Key, envVariable.Value?.ToString());
-                    }
+                    // Not printing the value on purpose, env variables can contain secrets and we don't need to know the values
+                    // most of the time.
+                    EqtTrace.Verbose("VsTestCommandLineWrapper.StartProcess: Setting environment variable: {0}", envVariable.Key);
+                    info.EnvironmentVariables[envVariable.Key] = envVariable.Value?.ToString();
                 }
             }
-#endif
-            this.process = Process.Start(info);
-
-            lock (syncObject)
-            {
-                vstestConsoleExited = false;
-                vstestConsoleStarted = true;
-            }
+        }
 
-            this.process.EnableRaisingEvents = true;
-            this.process.Exited += Process_Exited;
+        try
+        {
+            _process = Process.Start(info);
+        }
+        catch (Win32Exception ex)
+        {
+            throw new Exception(string.Format(CultureInfo.CurrentCulture, InternalResources.ProcessStartWin32Failure, consoleRunnerPath, arguments), ex);
+        }
 
-            this.process.OutputDataReceived += Process_OutputDataReceived;
-            this.process.ErrorDataReceived += Process_ErrorDataReceived;
-            this.process.BeginOutputReadLine();
-            this.process.BeginErrorReadLine();
-            processExitedEvent.Reset();
+        lock (_syncObject)
+        {
+            _vstestConsoleExited = false;
+            _vstestConsoleStarted = true;
         }
 
-        /// <summary>
-        /// Shutdown the vstest.console process
-        /// </summary>
-        public void ShutdownProcess()
+        _process!.EnableRaisingEvents = true;
+        _process.Exited += Process_Exited;
+
+        _process.OutputDataReceived += Process_OutputDataReceived;
+        _process.ErrorDataReceived += Process_ErrorDataReceived;
+        _process.BeginOutputReadLine();
+        _process.BeginErrorReadLine();
+        _processExitedEvent.Reset();
+    }
+
+    /// <summary>
+    /// Shutdown the vstest.console process
+    /// </summary>
+    public void ShutdownProcess()
+    {
+        // Ideally process should die by itself
+        if (!_processExitedEvent.WaitOne(Endsessiontimeout) && IsProcessInitialized())
         {
-            // Ideally process should die by itself
-            if (!processExitedEvent.WaitOne(ENDSESSIONTIMEOUT) && IsProcessInitialized())
+            EqtTrace.Info($"VsTestConsoleProcessManager.ShutDownProcess : Terminating vstest.console process after waiting for {Endsessiontimeout} milliseconds.");
+            _vstestConsoleExited = true;
+            if (_process is not null)
             {
-                EqtTrace.Info($"VsTestConsoleProcessManager.ShutDownProcess : Terminating vstest.console process after waiting for {ENDSESSIONTIMEOUT} milliseconds.");
-                vstestConsoleExited = true;
-                this.process.OutputDataReceived -= Process_OutputDataReceived;
-                this.process.ErrorDataReceived -= Process_ErrorDataReceived;
+                _process.OutputDataReceived -= Process_OutputDataReceived;
+                _process.ErrorDataReceived -= Process_ErrorDataReceived;
                 SafelyTerminateProcess();
-                this.process.Dispose();
-                this.process = null;
+                _process.Dispose();
+                _process = null;
             }
         }
+    }
 
-        private void SafelyTerminateProcess()
+    private void SafelyTerminateProcess()
+    {
+        try
         {
-            try
-            {
-                if (this.process != null && !this.process.HasExited)
-                {
-                    this.process.Kill();
-                }
-            }
-            catch (InvalidOperationException ex)
+            if (_process != null && !_process.HasExited)
             {
-                EqtTrace.Info("VsTestCommandLineWrapper: Error While Terminating Process {0} ", ex.Message);
+                _process.Kill();
             }
         }
-
-        private void Process_Exited(object sender, EventArgs e)
+        catch (InvalidOperationException ex)
         {
-            lock (syncObject)
-            {
-                processExitedEvent.Set();
-                vstestConsoleExited = true;
-                this.ProcessExited?.Invoke(sender, e);
-            }
+            EqtTrace.Info("VsTestCommandLineWrapper: Error While Terminating Process {0} ", ex.Message);
         }
+    }
 
-        private void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+    private void Process_Exited(object? sender, EventArgs e)
+    {
+        lock (_syncObject)
         {
-            if (e.Data != null)
-            {
-                EqtTrace.Error(e.Data);
-            }
+            _processExitedEvent.Set();
+            _vstestConsoleExited = true;
+            ProcessExited?.Invoke(sender, e);
         }
+    }
 
-        private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
+    private void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+    {
+        if (e.Data != null)
         {
-            if (e.Data != null)
-            {
-                EqtTrace.Verbose(e.Data);
-            }
+            EqtTrace.Error(e.Data);
         }
+    }
 
-        private string[] BuildArguments(ConsoleParameters parameters)
+    private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
+    {
+        if (e.Data != null)
         {
-            var args = new List<string>
-            {
-                // Start Vstest.console with args: --parentProcessId|/parentprocessid:<ppid> --port|/port:<port>
-                string.Format(CultureInfo.InvariantCulture, PARENT_PROCESSID_ARGUMENT, parameters.ParentProcessId),
-                string.Format(CultureInfo.InvariantCulture, PORT_ARGUMENT, parameters.PortNumber)
-            };
+            EqtTrace.Verbose(e.Data);
+        }
+    }
 
-            if (!string.IsNullOrEmpty(parameters.LogFilePath))
-            {
-                // Extra args: --diag|/diag:<PathToLogFile>;tracelevel=<tracelevel>
-                args.Add(string.Format(CultureInfo.InvariantCulture, DIAG_ARGUMENT, parameters.LogFilePath, parameters.TraceLevel));
-            }
+    internal string[] BuildArguments(ConsoleParameters parameters)
+    {
+        var args = new List<string>
+        {
+            // Start Vstest.console with args: --parentProcessId|/parentprocessid:<ppid> --port|/port:<port>
+            string.Format(CultureInfo.InvariantCulture, ParentProcessidArgument, parameters.ParentProcessId),
+            string.Format(CultureInfo.InvariantCulture, PortArgument, parameters.PortNumber)
+        };
 
-            if (isNetCoreRunner)
-            {
-                args.Insert(0, GetEscapeSequencedPath(vstestConsolePath));
-            }
+        if (!parameters.LogFilePath.IsNullOrEmpty())
+        {
+            // Extra args: --diag|/diag:<PathToLogFile>;tracelevel=<tracelevel>
+            args.Add(string.Format(CultureInfo.InvariantCulture, DiagArgument, parameters.LogFilePath, parameters.TraceLevel));
+        }
 
-            return args.ToArray();
+        if (_isNetCoreRunner)
+        {
+            args.Insert(0, GetEscapeSequencedPath(_vstestConsolePath));
         }
 
-        private string GetConsoleRunner()
-            => isNetCoreRunner ? (string.IsNullOrEmpty(this.dotnetExePath) ? new DotnetHostHelper().GetDotnetPath() : this.dotnetExePath) : GetEscapeSequencedPath(this.vstestConsolePath);
+        return args.ToArray();
+    }
 
-        private string GetEscapeSequencedPath(string path)
-            => string.IsNullOrEmpty(path) ? path : $"\"{path.Trim('"')}\"";
+    private string GetConsoleRunner()
+        => _isNetCoreRunner
+            ? _dotnetExePath.IsNullOrEmpty()
+                ? new DotnetHostHelper().GetDotnetPath()
+                : _dotnetExePath
+            : GetEscapeSequencedPath(_vstestConsolePath);
+
+    private static string GetEscapeSequencedPath(string path)
+        => path.IsNullOrEmpty() ? path : $"\"{path.Trim('"')}\"";
+
+    public void Dispose()
+    {
+        if (!_isDisposed)
+        {
+            _processExitedEvent.Dispose();
+            _process?.Dispose();
+            _isDisposed = true;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
index be26f63f1f..4c623ed472 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
@@ -1,1529 +1,1542 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using TranslationLayerResources = Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+
+/// <summary>
+/// Vstest console request sender for sending requests to vstest.console.exe
+/// </summary>
+internal class VsTestConsoleRequestSender : ITranslationLayerRequestSender
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    using TranslationLayerResources = Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources;
-
     /// <summary>
-    /// Vstest console request sender for sending requests to vstest.console.exe
+    /// The minimum protocol version that has test session support.
     /// </summary>
-    internal class VsTestConsoleRequestSender : ITranslationLayerRequestSender
-    {
-        /// <summary>
-        /// The minimum protocol version that has test session support.
-        /// </summary>
-        private const int MinimumProtocolVersionWithTestSessionSupport = 5;
+    private const int MinimumProtocolVersionWithTestSessionSupport = 5;
 
-        private readonly ICommunicationManager communicationManager;
+    private readonly ICommunicationManager _communicationManager;
+    private readonly IDataSerializer _dataSerializer;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly ManualResetEvent _handShakeComplete = new(false);
 
-        private readonly IDataSerializer dataSerializer;
-        private readonly ITestPlatformEventSource testPlatformEventSource;
+    private bool _handShakeSuccessful;
+    private int _protocolVersion = ProtocolVersioning.HighestSupportedVersion;
 
-        private readonly ManualResetEvent handShakeComplete = new ManualResetEvent(false);
+    /// <summary>
+    /// Used to cancel blocking tasks associated with the vstest.console process.
+    /// </summary>
+    private CancellationTokenSource? _processExitCancellationTokenSource;
 
-        private bool handShakeSuccessful = false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleRequestSender"/> class.
+    /// </summary>
+    public VsTestConsoleRequestSender()
+        : this(
+            new SocketCommunicationManager(),
+            JsonDataSerializer.Instance,
+            TestPlatformEventSource.Instance)
+    {
+    }
 
-        private int protocolVersion = 5;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleRequestSender"/> class.
+    /// </summary>
+    ///
+    /// <param name="communicationManager">The communication manager.</param>
+    /// <param name="dataSerializer">The data serializer.</param>
+    /// <param name="testPlatformEventSource">The test platform event source.</param>
+    internal VsTestConsoleRequestSender(
+        ICommunicationManager communicationManager,
+        IDataSerializer dataSerializer,
+        ITestPlatformEventSource testPlatformEventSource)
+    {
+        _communicationManager = communicationManager;
+        _dataSerializer = dataSerializer;
+        _testPlatformEventSource = testPlatformEventSource;
+    }
 
-        /// <summary>
-        /// Used to cancel blocking tasks associated with the vstest.console process.
-        /// </summary>
-        private CancellationTokenSource processExitCancellationTokenSource;
 
-        #region Constructor
+    #region ITranslationLayerRequestSender
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleRequestSender"/> class.
-        /// </summary>
-        public VsTestConsoleRequestSender()
-            : this(
-                  new SocketCommunicationManager(),
-                  JsonDataSerializer.Instance,
-                  TestPlatformEventSource.Instance)
+    /// <inheritdoc/>
+    public int InitializeCommunication()
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunication: Started.");
+
+        _processExitCancellationTokenSource = new CancellationTokenSource();
+        _handShakeSuccessful = false;
+        _handShakeComplete.Reset();
+        int port = -1;
+        try
         {
-        }
+            port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+            _communicationManager.AcceptClientAsync();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleRequestSender"/> class.
-        /// </summary>
-        /// 
-        /// <param name="communicationManager">The communication manager.</param>
-        /// <param name="dataSerializer">The data serializer.</param>
-        /// <param name="testPlatformEventSource">The test platform event source.</param>
-        internal VsTestConsoleRequestSender(
-            ICommunicationManager communicationManager,
-            IDataSerializer dataSerializer,
-            ITestPlatformEventSource testPlatformEventSource)
+            Task.Run(() =>
+            {
+                _communicationManager.WaitForClientConnection(Timeout.Infinite);
+                _handShakeSuccessful = HandShakeWithVsTestConsole();
+                _handShakeComplete.Set();
+            });
+        }
+        catch (Exception ex)
         {
-            this.communicationManager = communicationManager;
-            this.dataSerializer = dataSerializer;
-            this.testPlatformEventSource = testPlatformEventSource;
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.InitializeCommunication: Error initializing communication with VstestConsole: {0}",
+                ex);
+            _handShakeComplete.Set();
         }
 
-        #endregion
+        EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunication: Ended.");
 
-        #region ITranslationLayerRequestSender
-
-        /// <inheritdoc/>
-        public int InitializeCommunication()
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunication: Started.");
-            }
+        return port;
+    }
 
-            this.processExitCancellationTokenSource = new CancellationTokenSource();
-            this.handShakeSuccessful = false;
-            this.handShakeComplete.Reset();
-            int port = -1;
-            try
-            {
-                port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-                this.communicationManager.AcceptClientAsync();
+    /// <inheritdoc/>
+    public bool WaitForRequestHandlerConnection(int clientConnectionTimeout)
+    {
+        var waitSuccess = _handShakeComplete.WaitOne(clientConnectionTimeout);
+        return waitSuccess && _handShakeSuccessful;
+    }
 
-                Task.Run(() =>
-                {
-                    this.communicationManager.WaitForClientConnection(Timeout.Infinite);
-                    this.handShakeSuccessful = this.HandShakeWithVsTestConsole();
-                    this.handShakeComplete.Set();
-                });
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "VsTestConsoleRequestSender.InitializeCommunication: Error initializing communication with VstestConsole: {0}",
-                    ex);
-                this.handShakeComplete.Set();
-            }
+    /// <inheritdoc/>
+    public async Task<int> InitializeCommunicationAsync(int clientConnectionTimeout)
+    {
+        EqtTrace.Info($"VsTestConsoleRequestSender.InitializeCommunicationAsync: Started with client connection timeout {clientConnectionTimeout} milliseconds.");
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunication: Ended.");
-            }
+        _processExitCancellationTokenSource = new CancellationTokenSource();
+        _handShakeSuccessful = false;
+        _handShakeComplete.Reset();
+        int port = -1;
+        try
+        {
+            port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+            var timeoutSource = new CancellationTokenSource(clientConnectionTimeout);
+            await Task.Run(() =>
+                _communicationManager.AcceptClientAsync(), timeoutSource.Token).ConfigureAwait(false);
 
-            return port;
+            _handShakeSuccessful = await HandShakeWithVsTestConsoleAsync().ConfigureAwait(false);
+            _handShakeComplete.Set();
         }
-
-        /// <inheritdoc/>
-        public bool WaitForRequestHandlerConnection(int clientConnectionTimeout)
+        catch (Exception ex)
         {
-            var waitSucess = this.handShakeComplete.WaitOne(clientConnectionTimeout);
-            return waitSucess && this.handShakeSuccessful;
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.InitializeCommunicationAsync: Error initializing communication with VstestConsole: {0}",
+                ex);
+            _handShakeComplete.Set();
         }
 
-        /// <inheritdoc/>
-        public async Task<int> InitializeCommunicationAsync(int clientConnectionTimeout)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"VsTestConsoleRequestSender.InitializeCommunicationAsync: Started with client connection timeout {clientConnectionTimeout} milliseconds.");
-            }
+        EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunicationAsync: Ended.");
 
-            this.processExitCancellationTokenSource = new CancellationTokenSource();
-            this.handShakeSuccessful = false;
-            this.handShakeComplete.Reset();
-            int port = -1;
-            try
-            {
-                port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-                var timeoutSource = new CancellationTokenSource(clientConnectionTimeout);
-                await Task.Run(() =>
-                    this.communicationManager.AcceptClientAsync(), timeoutSource.Token).ConfigureAwait(false);
+        return _handShakeSuccessful ? port : -1;
+    }
 
-                this.handShakeSuccessful = await this.HandShakeWithVsTestConsoleAsync().ConfigureAwait(false);
-                this.handShakeComplete.Set();
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "VsTestConsoleRequestSender.InitializeCommunicationAsync: Error initializing communication with VstestConsole: {0}",
-                    ex);
-                this.handShakeComplete.Set();
-            }
+    /// <inheritdoc/>
+    public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        EqtTrace.Info($"VsTestConsoleRequestSender.InitializeExtensions: Initializing extensions with additional extensions path {string.Join(",", pathToAdditionalExtensions.ToList())}.");
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.InitializeCommunicationAsync: Ended.");
-            }
+        _communicationManager.SendMessage(
+            MessageType.ExtensionsInitialize,
+            pathToAdditionalExtensions,
+            _protocolVersion);
+    }
 
-            return this.handShakeSuccessful ? port : -1;
-        }
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.DiscoverTests: Starting test discovery.");
+
+        SendMessageAndListenAndReportTestCases(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            eventHandler);
+    }
 
-        /// <inheritdoc/>
-        public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info($"VsTestConsoleRequestSender.InitializeExtensions: Initializing extensions with additional extensions path {string.Join(",", pathToAdditionalExtensions.ToList())}.");
-            }
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.DiscoverTestsAsync: Starting test discovery.");
+
+        await SendMessageAndListenAndReportTestCasesAsync(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            eventHandler).ConfigureAwait(false);
+    }
 
-            this.communicationManager.SendMessage(
-                MessageType.ExtensionsInitialize,
-                pathToAdditionalExtensions,
-                this.protocolVersion);
-        }
+    /// <inheritdoc/>
+    public void StartTestRun(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRun: Starting test run.");
+
+        SendMessageAndListenAndReportTestResults(
+            MessageType.TestRunAllSourcesWithDefaultHost,
+            new TestRunRequestPayload()
+            {
+                Sources = sources.ToList(),
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            null);
+    }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 eventHandler)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.DiscoverTests: Starting test discovery.");
-            }
+    /// <inheritdoc/>
+    public async Task StartTestRunAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunAsync: Starting test run.");
+
+        await SendMessageAndListenAndReportTestResultsAsync(
+            MessageType.TestRunAllSourcesWithDefaultHost,
+            new TestRunRequestPayload()
+            {
+                Sources = sources.ToList(),
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            null).ConfigureAwait(false);
+    }
 
-            this.SendMessageAndListenAndReportTestCases(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo,
-                eventHandler);
-        }
+    /// <inheritdoc/>
+    public void StartTestRun(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRun: Starting test run.");
+
+        SendMessageAndListenAndReportTestResults(
+            MessageType.TestRunAllSourcesWithDefaultHost,
+            new TestRunRequestPayload()
+            {
+                TestCases = testCases.ToList(),
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            null);
+    }
 
-        /// <inheritdoc/>
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 eventHandler)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.DiscoverTestsAsync: Starting test discovery.");
-            }
+    /// <inheritdoc/>
+    public async Task StartTestRunAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunAsync: Starting test run.");
+
+        await SendMessageAndListenAndReportTestResultsAsync(
+            MessageType.TestRunAllSourcesWithDefaultHost,
+            new TestRunRequestPayload()
+            {
+                TestCases = testCases.ToList(),
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            null).ConfigureAwait(false);
+    }
 
-            await this.SendMessageAndListenAndReportTestCasesAsync(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo,
-                eventHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public void StartTestRunWithCustomHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customHostLauncher)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHost: Starting test run.");
+
+        SendMessageAndListenAndReportTestResults(
+            MessageType.GetTestRunnerProcessStartInfoForRunAll,
+            new TestRunRequestPayload()
+            {
+                Sources = sources.ToList(),
+                RunSettings = runSettings,
+                DebuggingEnabled = customHostLauncher.IsDebug,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            customHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void StartTestRun(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRun: Starting test run.");
-            }
+    /// <inheritdoc/>
+    public async Task StartTestRunWithCustomHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customHostLauncher)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHostAsync: Starting test run.");
+
+        await SendMessageAndListenAndReportTestResultsAsync(
+            MessageType.GetTestRunnerProcessStartInfoForRunAll,
+            new TestRunRequestPayload()
+            {
+                Sources = sources.ToList(),
+                RunSettings = runSettings,
+                DebuggingEnabled = customHostLauncher.IsDebug,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            customHostLauncher).ConfigureAwait(false);
+    }
 
-            this.SendMessageAndListenAndReportTestResults(
-                MessageType.TestRunAllSourcesWithDefaultHost,
-                new TestRunRequestPayload()
-                {
-                    Sources = sources.ToList(),
-                    RunSettings = runSettings,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                null);
-        }
+    /// <inheritdoc/>
+    public void StartTestRunWithCustomHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customHostLauncher)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHost: Starting test run.");
+
+        SendMessageAndListenAndReportTestResults(
+            MessageType.GetTestRunnerProcessStartInfoForRunSelected,
+            new TestRunRequestPayload
+            {
+                TestCases = testCases.ToList(),
+                RunSettings = runSettings,
+                DebuggingEnabled = customHostLauncher.IsDebug,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            customHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public async Task StartTestRunAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunAsync: Starting test run.");
-            }
+    /// <inheritdoc/>
+    public async Task StartTestRunWithCustomHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler runEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customHostLauncher)
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHostAsync: Starting test run.");
+
+        await SendMessageAndListenAndReportTestResultsAsync(
+            MessageType.GetTestRunnerProcessStartInfoForRunSelected,
+            new TestRunRequestPayload()
+            {
+                TestCases = testCases.ToList(),
+                RunSettings = runSettings,
+                DebuggingEnabled = customHostLauncher.IsDebug,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            },
+            runEventsHandler,
+            telemetryEventsHandler,
+            customHostLauncher).ConfigureAwait(false);
+    }
 
-            await this.SendMessageAndListenAndReportTestResultsAsync(
-                MessageType.TestRunAllSourcesWithDefaultHost,
-                new TestRunRequestPayload()
-                {
-                    Sources = sources.ToList(),
-                    RunSettings = runSettings,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                null).ConfigureAwait(false);
+    /// <inheritdoc/>
+    public TestSessionInfo? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        // Make sure vstest.console knows how to handle start/stop test session messages.
+        // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
+        // that will never come.
+        if (_protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
+        {
+            eventsHandler?.HandleStartTestSessionComplete(new());
+            return null;
         }
 
-        /// <inheritdoc/>
-        public void StartTestRun(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler)
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestSession: Starting test session.");
+
+        try
         {
-            if (EqtTrace.IsInfoEnabled)
+            var payload = new StartTestSessionPayload
             {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRun: Starting test run.");
-            }
+                // TODO (copoiena): When sharing the test host between test discovery and test
+                // execution, should we use the test host launcher to launch it ? What side
+                // effects does this have ?
+                //
+                // This is useful for profiling and maybe for launching hosts other than the
+                // ones managed by us (i.e., the default host and the dotnet host), examples
+                // including UWP and other hosts that don't implement the ITestRuntimeProvider2
+                // interface and/or are not aware of the possibility of attaching to an already
+                // running process.
+                Sources = sources,
+                RunSettings = runSettings,
+                HasCustomHostLauncher = testHostLauncher != null,
+                IsDebuggingEnabled = (testHostLauncher != null)
+                                     && testHostLauncher.IsDebug,
+                TestPlatformOptions = options
+            };
 
-            this.SendMessageAndListenAndReportTestResults(
-                MessageType.TestRunAllSourcesWithDefaultHost,
-                new TestRunRequestPayload()
-                {
-                    TestCases = testCases.ToList(),
-                    RunSettings = runSettings,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                null);
-        }
+            _communicationManager.SendMessage(
+                MessageType.StartTestSession,
+                payload,
+                _protocolVersion);
 
-        /// <inheritdoc/>
-        public async Task StartTestRunAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler)
-        {
-            if (EqtTrace.IsInfoEnabled)
+            while (true)
             {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunAsync: Starting test run.");
-            }
+                var message = TryReceiveMessage();
 
-            await this.SendMessageAndListenAndReportTestResultsAsync(
-                MessageType.TestRunAllSourcesWithDefaultHost,
-                new TestRunRequestPayload()
+                switch (message.MessageType)
                 {
-                    TestCases = testCases.ToList(),
-                    RunSettings = runSettings,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                null).ConfigureAwait(false);
-        }
+                    case MessageType.StartTestSessionCallback:
+                        var ackPayload = _dataSerializer.DeserializePayload<StartTestSessionAckPayload>(message);
+                        TPDebug.Assert(ackPayload is not null, "ackPayload is null");
+                        eventsHandler?.HandleStartTestSessionComplete(ackPayload.EventArgs);
+                        return ackPayload.EventArgs!.TestSessionInfo;
+
+                    case MessageType.CustomTestHostLaunch:
+                        HandleCustomHostLaunch(testHostLauncher, message);
+                        break;
+
+                    case MessageType.EditorAttachDebugger:
+                    case MessageType.EditorAttachDebugger2:
+                        AttachDebuggerToProcess(testHostLauncher, message);
+                        break;
+
+                    case MessageType.TestMessage:
+                        var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                        TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                        eventsHandler?.HandleLogMessage(
+                            testMessagePayload.MessageLevel,
+                            testMessagePayload.Message);
+                        break;
 
-        /// <inheritdoc/>
-        public void StartTestRunWithCustomHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customHostLauncher)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHost: Starting test run.");
+                    default:
+                        EqtTrace.Warning(
+                            "VsTestConsoleRequestSender.StartTestSession: Unexpected message received: {0}",
+                            message.MessageType);
+                        break;
+                }
             }
-
-            this.SendMessageAndListenAndReportTestResults(
-                MessageType.GetTestRunnerProcessStartInfoForRunAll,
-                new TestRunRequestPayload()
-                {
-                    Sources = sources.ToList(),
-                    RunSettings = runSettings,
-                    DebuggingEnabled = customHostLauncher.IsDebug,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                customHostLauncher);
         }
-
-        /// <inheritdoc/>
-        public async Task StartTestRunWithCustomHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customHostLauncher)
+        catch (Exception exception)
         {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHostAsync: Starting test run.");
-            }
-
-            await this.SendMessageAndListenAndReportTestResultsAsync(
-                MessageType.GetTestRunnerProcessStartInfoForRunAll,
-                new TestRunRequestPayload()
-                {
-                    Sources = sources.ToList(),
-                    RunSettings = runSettings,
-                    DebuggingEnabled = customHostLauncher.IsDebug,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                customHostLauncher).ConfigureAwait(false);
+            EqtTrace.Error(
+                "Aborting StartTestSession operation due to error: {0}",
+                exception);
+            eventsHandler?.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedStartTestSession);
+
+            eventsHandler?.HandleStartTestSessionComplete(new());
         }
-
-        /// <inheritdoc/>
-        public void StartTestRunWithCustomHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customHostLauncher)
+        finally
         {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHost: Starting test run.");
-            }
-
-            this.SendMessageAndListenAndReportTestResults(
-                MessageType.GetTestRunnerProcessStartInfoForRunSelected,
-                new TestRunRequestPayload
-                {
-                    TestCases = testCases.ToList(),
-                    RunSettings = runSettings,
-                    DebuggingEnabled = customHostLauncher.IsDebug,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                customHostLauncher);
+            _testPlatformEventSource.TranslationLayerStartTestSessionStop();
         }
 
-        /// <inheritdoc/>
-        public async Task StartTestRunWithCustomHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler runEventsHandler,
-            ITestHostLauncher customHostLauncher)
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestRunWithCustomHostAsync: Starting test run.");
-            }
+        return null;
+    }
 
-            await this.SendMessageAndListenAndReportTestResultsAsync(
-                MessageType.GetTestRunnerProcessStartInfoForRunSelected,
-                new TestRunRequestPayload()
-                {
-                    TestCases = testCases.ToList(),
-                    RunSettings = runSettings,
-                    DebuggingEnabled = customHostLauncher.IsDebug,
-                    TestPlatformOptions = options,
-                    TestSessionInfo = testSessionInfo
-                },
-                runEventsHandler,
-                customHostLauncher).ConfigureAwait(false);
+    /// <inheritdoc/>
+    public async Task<TestSessionInfo?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        // Make sure vstest.console knows how to handle start/stop test session messages.
+        // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
+        // that will never come.
+        if (_protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
+        {
+            eventsHandler?.HandleStartTestSessionComplete(new());
+            return await Task.FromResult((TestSessionInfo?)null);
         }
 
-        /// <inheritdoc/>
-        public TestSessionInfo StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher)
+        EqtTrace.Info("VsTestConsoleRequestSender.StartTestSession: Starting test session.");
+
+        try
         {
-            // Make sure vstest.console knows how to handle start/stop test session messages.
-            // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
-            // that will never come.
-            if (this.protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
+            var payload = new StartTestSessionPayload
             {
-                eventsHandler?.HandleStartTestSessionComplete(null);
-                return null;
-            }
+                // TODO (copoiena): When sharing the test host between test discovery and test
+                // execution, should we use the test host launcher to launch it ? What side
+                // effects does this have ?
+                //
+                // This is useful for profiling and maybe for launching hosts other than the
+                // ones managed by us (i.e., the default host and the dotnet host), examples
+                // including UWP and other hosts that don't implement the ITestRuntimeProvider2
+                // interface and/or are not aware of the possibility of attaching to an already
+                // running process.
+                Sources = sources,
+                RunSettings = runSettings,
+                HasCustomHostLauncher = testHostLauncher != null,
+                IsDebuggingEnabled = testHostLauncher != null && testHostLauncher.IsDebug,
+                TestPlatformOptions = options
+            };
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestSession: Starting test session.");
-            }
+            _communicationManager.SendMessage(
+                MessageType.StartTestSession,
+                payload,
+                _protocolVersion);
 
-            try
+            while (true)
             {
-                var payload = new StartTestSessionPayload
-                {
-                    // TODO (copoiena): When sharing the test host between test discovery and test
-                    // execution, should we use the test host launcher to launch it ? What side
-                    // effects does this have ?
-                    //
-                    // This is useful for profiling and maybe for launching hosts other than the
-                    // ones managed by us (i.e., the default host and the dotnet host), examples
-                    // including UWP and other hosts that don't implement the ITestRuntimeProvider2
-                    // interface and/or are not aware of the possibility of attaching to an already
-                    // running process.
-                    Sources = sources,
-                    RunSettings = runSettings,
-                    HasCustomHostLauncher = testHostLauncher != null,
-                    IsDebuggingEnabled = (testHostLauncher != null)
-                    && testHostLauncher.IsDebug,
-                    TestPlatformOptions = options
-                };
-
-                this.communicationManager.SendMessage(
-                    MessageType.StartTestSession,
-                    payload,
-                    this.protocolVersion);
-
-                while (true)
+                var message = await TryReceiveMessageAsync().ConfigureAwait(false);
+
+                switch (message.MessageType)
                 {
-                    var message = this.TryReceiveMessage();
+                    case MessageType.StartTestSessionCallback:
+                        var ackPayload = _dataSerializer.DeserializePayload<StartTestSessionAckPayload>(message);
+                        TPDebug.Assert(ackPayload is not null, "ackPayload is null");
+                        eventsHandler?.HandleStartTestSessionComplete(ackPayload.EventArgs);
+                        return ackPayload.EventArgs!.TestSessionInfo;
+
+                    case MessageType.CustomTestHostLaunch:
+                        HandleCustomHostLaunch(testHostLauncher, message);
+                        break;
+
+                    case MessageType.EditorAttachDebugger:
+                    case MessageType.EditorAttachDebugger2:
+                        AttachDebuggerToProcess(testHostLauncher, message);
+                        break;
+
+                    case MessageType.TestMessage:
+                        var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                        TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                        eventsHandler?.HandleLogMessage(
+                            testMessagePayload.MessageLevel,
+                            testMessagePayload.Message);
+                        break;
 
-                    switch (message.MessageType)
-                    {
-                        case MessageType.StartTestSessionCallback:
-                            var ackPayload = this.dataSerializer
-                                .DeserializePayload<StartTestSessionAckPayload>(message);
-                            eventsHandler?.HandleStartTestSessionComplete(
-                                ackPayload.TestSessionInfo);
-                            return ackPayload.TestSessionInfo;
-
-                        case MessageType.CustomTestHostLaunch:
-                            this.HandleCustomHostLaunch(testHostLauncher, message);
-                            break;
-
-                        case MessageType.EditorAttachDebugger:
-                            this.AttachDebuggerToProcess(testHostLauncher, message);
-                            break;
-
-                        case MessageType.TestMessage:
-                            var testMessagePayload = this.dataSerializer
-                                .DeserializePayload<TestMessagePayload>(message);
-                            eventsHandler?.HandleLogMessage(
-                                testMessagePayload.MessageLevel,
-                                testMessagePayload.Message);
-                            break;
-
-                        default:
-                            EqtTrace.Warning(
-                                "VsTestConsoleRequestSender.StartTestSession: Unexpected message received: {0}",
-                                message.MessageType);
-                            break;
-                    }
+                    default:
+                        EqtTrace.Warning(
+                            "VsTestConsoleRequestSender.StartTestSession: Unexpected message received: {0}",
+                            message.MessageType);
+                        break;
                 }
             }
-            catch (Exception exception)
-            {
-                EqtTrace.Error(
-                    "Aborting StartTestSession operation due to error: {0}",
-                    exception);
-                eventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedStartTestSession);
-
-                eventsHandler?.HandleStartTestSessionComplete(null);
-            }
-            finally
-            {
-                this.testPlatformEventSource.TranslationLayerStartTestSessionStop();
-            }
+        }
+        catch (Exception exception)
+        {
+            EqtTrace.Error("Aborting StartTestSession operation due to error: {0}", exception);
+            eventsHandler?.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedStartTestSession);
 
-            return null;
+            eventsHandler?.HandleStartTestSessionComplete(new());
+        }
+        finally
+        {
+            _testPlatformEventSource.TranslationLayerStartTestSessionStop();
         }
 
-        /// <inheritdoc/>
-        public async Task<TestSessionInfo> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher)
+        return null;
+    }
+
+    /// <inheritdoc/>
+    public bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        // Make sure vstest.console knows how to handle start/stop test session messages.
+        // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
+        // that will never come.
+        if (_protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
         {
-            // Make sure vstest.console knows how to handle start/stop test session messages.
-            // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
-            // that will never come.
-            if (this.protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
-            {
-                eventsHandler?.HandleStartTestSessionComplete(null);
-                return await Task.FromResult((TestSessionInfo)null);
-            }
+            eventsHandler?.HandleStopTestSessionComplete(new(testSessionInfo));
+            return false;
+        }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StartTestSession: Starting test session.");
-            }
+        EqtTrace.Info("VsTestConsoleRequestSender.StopTestSession: Stop test session.");
+
+        // Due to various considertaions it is possible to end up with a null test session
+        // after doing the start test session call. However, we should filter out requests
+        // to stop such a session as soon as possible, at the request sender level.
+        //
+        // We do this here instead of on the wrapper level in order to benefit from the
+        // testplatform events being fired still.
+        if (testSessionInfo == null)
+        {
+            _testPlatformEventSource.TranslationLayerStopTestSessionStop();
+            return true;
+        }
 
-            try
+        try
+        {
+            var stopTestSessionPayload = new StopTestSessionPayload
             {
-                var payload = new StartTestSessionPayload
-                {
-                    // TODO (copoiena): When sharing the test host between test discovery and test
-                    // execution, should we use the test host launcher to launch it ? What side
-                    // effects does this have ?
-                    //
-                    // This is useful for profiling and maybe for launching hosts other than the
-                    // ones managed by us (i.e., the default host and the dotnet host), examples
-                    // including UWP and other hosts that don't implement the ITestRuntimeProvider2
-                    // interface and/or are not aware of the possibility of attaching to an already
-                    // running process.
-                    Sources = sources,
-                    RunSettings = runSettings,
-                    HasCustomHostLauncher = testHostLauncher != null,
-                    IsDebuggingEnabled = (testHostLauncher != null) && testHostLauncher.IsDebug,
-                    TestPlatformOptions = options
-                };
+                TestSessionInfo = testSessionInfo,
+                CollectMetrics = options?.CollectMetrics ?? false,
+            };
 
-                this.communicationManager.SendMessage(
-                    MessageType.StartTestSession,
-                    payload,
-                    this.protocolVersion);
+            _communicationManager.SendMessage(
+                MessageType.StopTestSession,
+                stopTestSessionPayload,
+                _protocolVersion);
+
+            while (true)
+            {
+                var message = TryReceiveMessage();
 
-                while (true)
+                switch (message.MessageType)
                 {
-                    var message = await this.TryReceiveMessageAsync().ConfigureAwait(false);
+                    case MessageType.StopTestSessionCallback:
+                        var payload = _dataSerializer.DeserializePayload<StopTestSessionAckPayload>(message);
+                        TPDebug.Assert(payload is not null, "payload is null");
+                        eventsHandler?.HandleStopTestSessionComplete(payload.EventArgs);
+                        return payload.EventArgs!.IsStopped;
+
+                    case MessageType.TestMessage:
+                        var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                        TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                        eventsHandler?.HandleLogMessage(
+                            testMessagePayload.MessageLevel,
+                            testMessagePayload.Message);
+                        break;
 
-                    switch (message.MessageType)
-                    {
-                        case MessageType.StartTestSessionCallback:
-                            var ackPayload = this.dataSerializer
-                                .DeserializePayload<StartTestSessionAckPayload>(message);
-                            eventsHandler?.HandleStartTestSessionComplete(
-                                ackPayload.TestSessionInfo);
-                            return ackPayload.TestSessionInfo;
-
-                        case MessageType.CustomTestHostLaunch:
-                            this.HandleCustomHostLaunch(testHostLauncher, message);
-                            break;
-
-                        case MessageType.EditorAttachDebugger:
-                            this.AttachDebuggerToProcess(testHostLauncher, message);
-                            break;
-
-                        case MessageType.TestMessage:
-                            var testMessagePayload = this.dataSerializer
-                                .DeserializePayload<TestMessagePayload>(message);
-                            eventsHandler?.HandleLogMessage(
-                                testMessagePayload.MessageLevel,
-                                testMessagePayload.Message);
-                            break;
-
-                        default:
-                            EqtTrace.Warning(
-                                "VsTestConsoleRequestSender.StartTestSession: Unexpected message received: {0}",
-                                message.MessageType);
-                            break;
-                    }
+                    default:
+                        EqtTrace.Warning(
+                            "VsTestConsoleRequestSender.StopTestSession: Unexpected message received: {0}",
+                            message.MessageType);
+                        break;
                 }
             }
-            catch (Exception exception)
-            {
-                EqtTrace.Error("Aborting StartTestSession operation due to error: {0}", exception);
-                eventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedStartTestSession);
+        }
+        catch (Exception exception)
+        {
+            EqtTrace.Error(
+                "Aborting StopTestSession operation for id {0} due to error: {1}",
+                testSessionInfo?.Id,
+                exception);
+            eventsHandler?.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedStopTestSession);
+
+            eventsHandler?.HandleStopTestSessionComplete(new(testSessionInfo));
+        }
+        finally
+        {
+            _testPlatformEventSource.TranslationLayerStopTestSessionStop();
+        }
 
-                eventsHandler?.HandleStartTestSessionComplete(null);
-            }
-            finally
-            {
-                this.testPlatformEventSource.TranslationLayerStartTestSessionStop();
-            }
+        return false;
+    }
 
-            return null;
+    /// <inheritdoc/>
+    public async Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        // Make sure vstest.console knows how to handle start/stop test session messages.
+        // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
+        // that will never come.
+        if (_protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
+        {
+            eventsHandler?.HandleStopTestSessionComplete(new(testSessionInfo));
+            return await Task.FromResult(false);
         }
 
-        /// <inheritdoc/>
-        public bool StopTestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler)
+        EqtTrace.Info("VsTestConsoleRequestSender.StopTestSession: Stop test session.");
+
+        // Due to various considertaions it is possible to end up with a null test session
+        // after doing the start test session call. However, we should filter out requests
+        // to stop such a session as soon as possible, at the request sender level.
+        //
+        // We do this here instead of on the wrapper level in order to benefit from the
+        // testplatform events being fired still.
+        if (testSessionInfo == null)
         {
-            // Make sure vstest.console knows how to handle start/stop test session messages.
-            // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
-            // that will never come.
-            if (this.protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
-            {
-                eventsHandler?.HandleStopTestSessionComplete(testSessionInfo, false);
-                return false;
-            }
+            _testPlatformEventSource.TranslationLayerStopTestSessionStop();
+            return true;
+        }
 
-            if (EqtTrace.IsInfoEnabled)
+        try
+        {
+            var stopTestSessionPayload = new StopTestSessionPayload
             {
-                EqtTrace.Info("VsTestConsoleRequestSender.StopTestSession: Stop test session.");
-            }
+                TestSessionInfo = testSessionInfo,
+                CollectMetrics = options?.CollectMetrics ?? false,
+            };
 
-            // Due to various considertaions it is possible to end up with a null test session
-            // after doing the start test session call. However, we should filter out requests
-            // to stop such a session as soon as possible, at the request sender level.
-            //
-            // We do this here instead of on the wrapper level in order to benefit from the
-            // testplatform events being fired still.
-            if (testSessionInfo == null)
-            {
-                this.testPlatformEventSource.TranslationLayerStopTestSessionStop();
-                return true;
-            }
+            _communicationManager.SendMessage(
+                MessageType.StopTestSession,
+                stopTestSessionPayload,
+                _protocolVersion);
 
-            try
+            while (true)
             {
-                this.communicationManager.SendMessage(
-                    MessageType.StopTestSession,
-                    testSessionInfo,
-                    this.protocolVersion);
+                var message = await TryReceiveMessageAsync().ConfigureAwait(false);
 
-                while (true)
+                switch (message.MessageType)
                 {
-                    var message = this.TryReceiveMessage();
+                    case MessageType.StopTestSessionCallback:
+                        var payload = _dataSerializer.DeserializePayload<StopTestSessionAckPayload>(message);
+                        TPDebug.Assert(payload is not null, "payload is null");
+                        eventsHandler?.HandleStopTestSessionComplete(payload.EventArgs);
+                        return payload.EventArgs!.IsStopped;
+
+                    case MessageType.TestMessage:
+                        var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                        TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                        eventsHandler?.HandleLogMessage(
+                            testMessagePayload.MessageLevel,
+                            testMessagePayload.Message);
+                        break;
 
-                    switch (message.MessageType)
-                    {
-                        case MessageType.StopTestSessionCallback:
-                            var payload = this.dataSerializer.DeserializePayload<StopTestSessionAckPayload>(message);
-                            eventsHandler?.HandleStopTestSessionComplete(payload.TestSessionInfo, payload.IsStopped);
-                            return payload.IsStopped;
-
-                        case MessageType.TestMessage:
-                            var testMessagePayload = this.dataSerializer
-                                .DeserializePayload<TestMessagePayload>(message);
-                            eventsHandler?.HandleLogMessage(
-                                testMessagePayload.MessageLevel,
-                                testMessagePayload.Message);
-                            break;
-
-                        default:
-                            EqtTrace.Warning(
-                                "VsTestConsoleRequestSender.StopTestSession: Unexpected message received: {0}",
-                                message.MessageType);
-                            break;
-                    }
+                    default:
+                        EqtTrace.Warning(
+                            "VsTestConsoleRequestSender.StopTestSession: Unexpected message received: {0}",
+                            message.MessageType);
+                        break;
                 }
             }
-            catch (Exception exception)
-            {
-                EqtTrace.Error(
-                    "Aborting StopTestSession operation for id {0} due to error: {1}",
-                    testSessionInfo?.Id,
-                    exception);
-                eventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedStopTestSession);
-
-                eventsHandler?.HandleStopTestSessionComplete(testSessionInfo, false);
-            }
-            finally
-            {
-                this.testPlatformEventSource.TranslationLayerStopTestSessionStop();
-            }
-
-            return false;
         }
-
-        /// <inheritdoc/>
-        public async Task<bool> StopTestSessionAsync(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler)
+        catch (Exception exception)
         {
-            // Make sure vstest.console knows how to handle start/stop test session messages.
-            // Bail out if it doesn't, otherwise we'll hang waiting for a reply from the console
-            // that will never come.
-            if (this.protocolVersion < MinimumProtocolVersionWithTestSessionSupport)
-            {
-                eventsHandler?.HandleStopTestSessionComplete(testSessionInfo, false);
-                return await Task.FromResult(false);
-            }
+            EqtTrace.Error(
+                "Aborting StopTestSession operation for id {0} due to error: {1}",
+                testSessionInfo?.Id,
+                exception);
+            eventsHandler?.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedStopTestSession);
+
+            eventsHandler?.HandleStopTestSessionComplete(new(testSessionInfo));
+        }
+        finally
+        {
+            _testPlatformEventSource.TranslationLayerStopTestSessionStop();
+        }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.StopTestSession: Stop test session.");
-            }
+        return false;
+    }
 
-            // Due to various considertaions it is possible to end up with a null test session
-            // after doing the start test session call. However, we should filter out requests
-            // to stop such a session as soon as possible, at the request sender level.
-            //
-            // We do this here instead of on the wrapper level in order to benefit from the
-            // testplatform events being fired still.
-            if (testSessionInfo == null)
-            {
-                this.testPlatformEventSource.TranslationLayerStopTestSessionStop();
-                return true;
-            }
+    /// <inheritdoc/>
+    public void CancelTestRun()
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.CancelTestRun: Canceling test run.");
 
-            try
-            {
-                this.communicationManager.SendMessage(
-                    MessageType.StopTestSession,
-                    testSessionInfo,
-                    this.protocolVersion);
+        _communicationManager.SendMessage(MessageType.CancelTestRun);
+    }
 
-                while (true)
-                {
-                    var message = await this.TryReceiveMessageAsync().ConfigureAwait(false);
+    /// <inheritdoc/>
+    public void AbortTestRun()
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.AbortTestRun: Aborting test run.");
 
-                    switch (message.MessageType)
-                    {
-                        case MessageType.StopTestSessionCallback:
-                            var payload = this.dataSerializer.DeserializePayload<StopTestSessionAckPayload>(message);
-                            eventsHandler?.HandleStopTestSessionComplete(payload.TestSessionInfo, payload.IsStopped);
-                            return payload.IsStopped;
-
-                        case MessageType.TestMessage:
-                            var testMessagePayload = this.dataSerializer
-                                .DeserializePayload<TestMessagePayload>(message);
-                            eventsHandler?.HandleLogMessage(
-                                testMessagePayload.MessageLevel,
-                                testMessagePayload.Message);
-                            break;
-
-                        default:
-                            EqtTrace.Warning(
-                                "VsTestConsoleRequestSender.StopTestSession: Unexpected message received: {0}",
-                                message.MessageType);
-                            break;
-                    }
-                }
-            }
-            catch (Exception exception)
-            {
-                EqtTrace.Error(
-                    "Aborting StopTestSession operation for id {0} due to error: {1}",
-                    testSessionInfo?.Id,
-                    exception);
-                eventsHandler?.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedStopTestSession);
-
-                eventsHandler?.HandleStopTestSessionComplete(testSessionInfo, false);
-            }
-            finally
-            {
-                this.testPlatformEventSource.TranslationLayerStopTestSessionStop();
-            }
+        _communicationManager.SendMessage(MessageType.AbortTestRun);
+    }
 
-            return false;
-        }
+    /// <inheritdoc/>
+    public void CancelDiscovery()
+    {
+        EqtTrace.Info("VsTestConsoleRequestSender.CancelDiscovery: Canceling test discovery.");
 
-        /// <inheritdoc/>
-        public void CancelTestRun()
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.CancelTestRun: Canceling test run.");
-            }
+        _communicationManager.SendMessage(MessageType.CancelDiscovery);
+    }
+
+    /// <inheritdoc/>
+    public void OnProcessExited()
+    {
+        _processExitCancellationTokenSource?.Cancel();
+    }
+
+    /// <inheritdoc/>
+    public void Close()
+    {
+        Dispose();
+    }
+
+    /// <inheritdoc/>
+    public void EndSession()
+    {
+        _communicationManager.SendMessage(MessageType.SessionEnd);
+    }
+
+    /// <inheritdoc/>
+    public Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? runSettings,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler testSessionEventsHandler,
+        CancellationToken cancellationToken)
+    {
+        return SendMessageAndListenAndReportAttachmentsProcessingResultAsync(
+            attachments,
+            invokedDataCollectors,
+            runSettings,
+            collectMetrics,
+            testSessionEventsHandler,
+            cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        _communicationManager?.StopServer();
+    }
+
+    #endregion
 
-            this.communicationManager.SendMessage(MessageType.CancelTestRun);
+    private bool HandShakeWithVsTestConsole()
+    {
+        var message = _communicationManager.ReceiveMessage();
+
+        if (message?.MessageType != MessageType.SessionConnected)
+        {
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: SessionConnected Message Expected but different message received: Received MessageType: {0}",
+                message?.MessageType);
+            return false;
         }
 
-        /// <inheritdoc/>
-        public void AbortTestRun()
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.AbortTestRun: Aborting test run.");
-            }
+        _communicationManager.SendMessage(
+            MessageType.VersionCheck,
+            _protocolVersion);
 
-            this.communicationManager.SendMessage(MessageType.AbortTestRun);
-        }
+        message = _communicationManager.ReceiveMessage();
+        var success = false;
 
-        /// <inheritdoc/>
-        public void CancelDiscovery()
+        if (message?.MessageType == MessageType.VersionCheck)
         {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleRequestSender.CancelDiscovery: Canceling test discovery.");
-            }
-
-            this.communicationManager.SendMessage(MessageType.CancelDiscovery);
+            _protocolVersion = _dataSerializer
+                .DeserializePayload<int>(message);
+            success = true;
         }
-
-        /// <inheritdoc/>
-        public void OnProcessExited()
+        else if (message?.MessageType == MessageType.ProtocolError)
         {
-            this.processExitCancellationTokenSource.Cancel();
+            // TODO : Payload for ProtocolError needs to finalized.
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: Version Check failed. ProtolError was received from the runner");
         }
-
-        /// <inheritdoc/>
-        public void Close()
+        else
         {
-            this.Dispose();
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: VersionCheck Message Expected but different message received: Received MessageType: {0}",
+                message?.MessageType);
         }
 
-        /// <inheritdoc/>
-        public void EndSession()
+        return success;
+    }
+
+    private async Task<bool> HandShakeWithVsTestConsoleAsync()
+    {
+        TPDebug.Assert(_processExitCancellationTokenSource is not null, "_processExitCancellationTokenSource is null");
+        var message = await _communicationManager.ReceiveMessageAsync(
+            _processExitCancellationTokenSource.Token).ConfigureAwait(false);
+
+        if (message?.MessageType != MessageType.SessionConnected)
         {
-            this.communicationManager.SendMessage(MessageType.SessionEnd);
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: SessionConnected Message Expected but different message received: Received MessageType: {0}",
+                message?.MessageType);
+            return false;
         }
 
-        /// <inheritdoc/>
-        public Task ProcessTestRunAttachmentsAsync(
-            IEnumerable<AttachmentSet> attachments,
-            bool collectMetrics,
-            ITestRunAttachmentsProcessingEventsHandler testSessionEventsHandler,
-            CancellationToken cancellationToken)
+        _communicationManager.SendMessage(
+            MessageType.VersionCheck,
+            _protocolVersion);
+
+        message = await _communicationManager.ReceiveMessageAsync(
+            _processExitCancellationTokenSource.Token).ConfigureAwait(false);
+
+        var success = false;
+        if (message?.MessageType == MessageType.VersionCheck)
         {
-            return this.SendMessageAndListenAndReportAttachmentsProcessingResultAsync(
-                attachments,
-                collectMetrics,
-                testSessionEventsHandler,
-                cancellationToken);
+            _protocolVersion = _dataSerializer.DeserializePayload<int>(message);
+            success = true;
         }
-
-        /// <inheritdoc/>
-        public void Dispose()
+        else if (message?.MessageType == MessageType.ProtocolError)
+        {
+            // TODO : Payload for ProtocolError needs to finalized.
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: Version Check failed. ProtolError was received from the runner");
+        }
+        else
         {
-            this.communicationManager?.StopServer();
+            EqtTrace.Error(
+                "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: VersionCheck Message Expected but different message received: Received MessageType: {0}",
+                message?.MessageType);
         }
 
-        #endregion
+        return success;
+    }
 
-        private bool HandShakeWithVsTestConsole()
+    private void SendMessageAndListenAndReportTestCases(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        try
         {
-            var success = false;
-            var message = this.communicationManager.ReceiveMessage();
+            _communicationManager.SendMessage(
+                MessageType.StartDiscovery,
+                new DiscoveryRequestPayload()
+                {
+                    Sources = sources,
+                    RunSettings = runSettings,
+                    TestPlatformOptions = options,
+                    TestSessionInfo = testSessionInfo
+                },
+                _protocolVersion);
+            var isDiscoveryComplete = false;
 
-            if (message.MessageType == MessageType.SessionConnected)
+            // Cycle through the messages that vstest.console sends.
+            // Currently each operation is not a separate task since it should not take that
+            // much time to complete.
+            //
+            // This is just a notification.
+            while (!isDiscoveryComplete)
             {
-                this.communicationManager.SendMessage(
-                    MessageType.VersionCheck,
-                    this.protocolVersion);
+                var message = TryReceiveMessage();
 
-                message = this.communicationManager.ReceiveMessage();
-
-                if (message.MessageType == MessageType.VersionCheck)
+                if (string.Equals(MessageType.TestCasesFound, message.MessageType))
                 {
-                    this.protocolVersion = this.dataSerializer
-                        .DeserializePayload<int>(message);
-                    success = true;
+                    var testCases = _dataSerializer
+                        .DeserializePayload<IEnumerable<TestCase>>(message);
+
+                    eventHandler.HandleDiscoveredTests(testCases);
                 }
-                else if (message.MessageType == MessageType.ProtocolError)
+                else if (string.Equals(MessageType.DiscoveryComplete, message.MessageType))
                 {
-                    // TODO : Payload for ProtocolError needs to finalized.
-                    EqtTrace.Error(
-                        "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: Version Check failed. ProtolError was received from the runner");
+                    EqtTrace.Info(
+                        "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestCases: Discovery complete.");
+
+                    var discoveryCompletePayload = _dataSerializer.DeserializePayload<DiscoveryCompletePayload>(message);
+                    TPDebug.Assert(discoveryCompletePayload is not null, "discoveryCompletePayload is null");
+
+                    var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs
+                    {
+                        TotalCount = discoveryCompletePayload.TotalTests,
+                        IsAborted = discoveryCompletePayload.IsAborted,
+                        FullyDiscoveredSources = discoveryCompletePayload.FullyDiscoveredSources,
+                        PartiallyDiscoveredSources = discoveryCompletePayload.PartiallyDiscoveredSources,
+                        NotDiscoveredSources = discoveryCompletePayload.NotDiscoveredSources,
+                        SkippedDiscoveredSources = discoveryCompletePayload.SkippedDiscoverySources,
+                        DiscoveredExtensions = discoveryCompletePayload.DiscoveredExtensions,
+                        Metrics = discoveryCompletePayload.Metrics,
+                    };
+
+                    eventHandler.HandleDiscoveryComplete(
+                        discoveryCompleteEventArgs,
+                        discoveryCompletePayload.LastDiscoveredTests);
+                    isDiscoveryComplete = true;
                 }
-                else
+                else if (string.Equals(MessageType.TestMessage, message.MessageType))
                 {
-                    EqtTrace.Error(
-                        "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: VersionCheck Message Expected but different message received: Received MessageType: {0}",
-                        message.MessageType);
+                    var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    eventHandler.HandleLogMessage(
+                        testMessagePayload.MessageLevel,
+                        testMessagePayload.Message);
                 }
             }
-            else
-            {
-                EqtTrace.Error(
-                    "VsTestConsoleRequestSender.HandShakeWithVsTestConsole: SessionConnected Message Expected but different message received: Received MessageType: {0}",
-                    message.MessageType);
-            }
-
-            return success;
         }
+        catch (Exception exception)
+        {
+            EqtTrace.Error("Aborting Test Discovery Operation: {0}", exception);
+            eventHandler.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedTestsDiscovery);
+            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true);
+            eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
+
+            // Earlier we were closing the connection with vstest.console in case of exceptions.
+            // Removing that code because vstest.console might be in a healthy state and letting
+            // the client know of the error, so that the TL can wait for the next instruction
+            // from the client itself.
+            // Also, connection termination might not kill the process which could result in
+            // files being locked by testhost.
+        }
+
+        _testPlatformEventSource.TranslationLayerDiscoveryStop();
+    }
 
-        private async Task<bool> HandShakeWithVsTestConsoleAsync()
+    private async Task SendMessageAndListenAndReportTestCasesAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 eventHandler)
+    {
+        try
         {
-            var success = false;
-            var message = await this.communicationManager.ReceiveMessageAsync(
-                this.processExitCancellationTokenSource.Token).ConfigureAwait(false);
+            _communicationManager.SendMessage(
+                MessageType.StartDiscovery,
+                new DiscoveryRequestPayload()
+                {
+                    Sources = sources,
+                    RunSettings = runSettings,
+                    TestPlatformOptions = options,
+                    TestSessionInfo = testSessionInfo
+                },
+                _protocolVersion);
+            var isDiscoveryComplete = false;
 
-            if (message.MessageType == MessageType.SessionConnected)
+            // Cycle through the messages that vstest.console sends.
+            // Currently each operation is not a separate task since it should not take that
+            // much time to complete.
+            //
+            // This is just a notification.
+            while (!isDiscoveryComplete)
             {
-                this.communicationManager.SendMessage(
-                    MessageType.VersionCheck,
-                    this.protocolVersion);
+                var message = await TryReceiveMessageAsync().ConfigureAwait(false);
 
-                message = await this.communicationManager.ReceiveMessageAsync(
-                    this.processExitCancellationTokenSource.Token).ConfigureAwait(false);
-
-                if (message.MessageType == MessageType.VersionCheck)
+                if (string.Equals(MessageType.TestCasesFound, message.MessageType))
                 {
-                    this.protocolVersion = this.dataSerializer.DeserializePayload<int>(message);
-                    success = true;
+                    var testCases = _dataSerializer
+                        .DeserializePayload<IEnumerable<TestCase>>(message);
+
+                    eventHandler.HandleDiscoveredTests(testCases);
                 }
-                else if (message.MessageType == MessageType.ProtocolError)
+                else if (string.Equals(MessageType.DiscoveryComplete, message.MessageType))
                 {
-                    // TODO : Payload for ProtocolError needs to finalized.
-                    EqtTrace.Error(
-                        "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: Version Check failed. ProtolError was received from the runner");
+                    EqtTrace.Info(
+                        "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestCasesAsync: Discovery complete.");
+
+                    var discoveryCompletePayload =
+                        _dataSerializer.DeserializePayload<DiscoveryCompletePayload>(message);
+                    TPDebug.Assert(discoveryCompletePayload is not null, "discoveryCompletePayload is null");
+                    var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs
+                    {
+                        TotalCount = discoveryCompletePayload.TotalTests,
+                        IsAborted = discoveryCompletePayload.IsAborted,
+                        FullyDiscoveredSources = discoveryCompletePayload.FullyDiscoveredSources,
+                        PartiallyDiscoveredSources = discoveryCompletePayload.PartiallyDiscoveredSources,
+                        NotDiscoveredSources = discoveryCompletePayload.NotDiscoveredSources,
+                        SkippedDiscoveredSources = discoveryCompletePayload.SkippedDiscoverySources,
+                        DiscoveredExtensions = discoveryCompletePayload.DiscoveredExtensions,
+                    };
+
+                    // Adding Metrics from VsTestConsole
+                    discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
+
+                    eventHandler.HandleDiscoveryComplete(
+                        discoveryCompleteEventArgs,
+                        discoveryCompletePayload.LastDiscoveredTests);
+                    isDiscoveryComplete = true;
                 }
-                else
+                else if (string.Equals(MessageType.TestMessage, message.MessageType))
                 {
-                    EqtTrace.Error(
-                        "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: VersionCheck Message Expected but different message received: Received MessageType: {0}",
-                        message.MessageType);
+                    var testMessagePayload = _dataSerializer
+                        .DeserializePayload<TestMessagePayload>(message);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    eventHandler.HandleLogMessage(
+                        testMessagePayload.MessageLevel,
+                        testMessagePayload.Message);
                 }
             }
-            else
-            {
-                EqtTrace.Error(
-                    "VsTestConsoleRequestSender.HandShakeWithVsTestConsoleAsync: SessionConnected Message Expected but different message received: Received MessageType: {0}",
-                    message.MessageType);
-            }
-
-            return success;
         }
-
-        private void SendMessageAndListenAndReportTestCases(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 eventHandler)
+        catch (Exception exception)
         {
-            try
-            {
-                this.communicationManager.SendMessage(
-                    MessageType.StartDiscovery,
-                    new DiscoveryRequestPayload()
-                    {
-                        Sources = sources,
-                        RunSettings = runSettings,
-                        TestPlatformOptions = options,
-                        TestSessionInfo = testSessionInfo
-                    },
-                    this.protocolVersion);
-                var isDiscoveryComplete = false;
+            EqtTrace.Error("Aborting Test Discovery Operation: {0}", exception);
 
-                // Cycle through the messages that vstest.console sends.
-                // Currently each operation is not a separate task since it should not take that
-                // much time to complete.
-                //
-                // This is just a notification.
-                while (!isDiscoveryComplete)
-                {
-                    var message = this.TryReceiveMessage();
+            eventHandler.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedTestsDiscovery);
 
-                    if (string.Equals(MessageType.TestCasesFound, message.MessageType))
-                    {
-                        var testCases = this.dataSerializer
-                            .DeserializePayload<IEnumerable<TestCase>>(message);
+            eventHandler.HandleDiscoveryComplete(new(-1, true), null);
 
-                        eventHandler.HandleDiscoveredTests(testCases);
-                    }
-                    else if (string.Equals(MessageType.DiscoveryComplete, message.MessageType))
-                    {
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info(
-                                "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestCases: Discovery complete.");
-                        }
+            // Earlier we were closing the connection with vstest.console in case of exceptions.
+            // Removing that code because vstest.console might be in a healthy state and letting
+            // the client know of the error, so that the TL can wait for the next instruction
+            // from the client itself.
+            // Also, connection termination might not kill the process which could result in
+            // files being locked by testhost.
+        }
 
-                        var discoveryCompletePayload =
-                            this.dataSerializer
-                                .DeserializePayload<DiscoveryCompletePayload>(message);
+        _testPlatformEventSource.TranslationLayerDiscoveryStop();
+    }
 
-                        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(
-                            discoveryCompletePayload.TotalTests,
-                            discoveryCompletePayload.IsAborted);
+    private void SendMessageAndListenAndReportTestResults(
+        string messageType,
+        object payload,
+        ITestRunEventsHandler eventHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher? customHostLauncher)
+    {
+        try
+        {
+            _communicationManager.SendMessage(messageType, payload, _protocolVersion);
+            var isTestRunComplete = false;
 
-                        // Adding metrics from vstest.console.
-                        discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
+            // Cycle through the messages that vstest.console sends.
+            // Currently each operation is not a separate task since it should not take that
+            // much time to complete.
+            //
+            // This is just a notification.
+            while (!isTestRunComplete)
+            {
+                var message = TryReceiveMessage();
 
-                        eventHandler.HandleDiscoveryComplete(
-                            discoveryCompleteEventArgs,
-                            discoveryCompletePayload.LastDiscoveredTests);
-                        isDiscoveryComplete = true;
-                    }
-                    else if (string.Equals(MessageType.TestMessage, message.MessageType))
-                    {
-                        var testMessagePayload = this.dataSerializer
-                            .DeserializePayload<TestMessagePayload>(message);
-                        eventHandler.HandleLogMessage(
-                            testMessagePayload.MessageLevel,
-                            testMessagePayload.Message);
-                    }
+                if (string.Equals(MessageType.TestRunStatsChange, message.MessageType))
+                {
+                    var testRunChangedArgs = _dataSerializer
+                        .DeserializePayload<TestRunChangedEventArgs>(
+                            message);
+                    eventHandler.HandleTestRunStatsChange(testRunChangedArgs);
+                }
+                else if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
+                {
+                    EqtTrace.Info(
+                        "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestResults: Execution complete.");
+
+                    var testRunCompletePayload = _dataSerializer
+                        .DeserializePayload<TestRunCompletePayload>(message);
+                    TPDebug.Assert(testRunCompletePayload is not null, "testRunCompletePayload is null");
+                    eventHandler.HandleTestRunComplete(
+                        testRunCompletePayload.TestRunCompleteArgs!,
+                        testRunCompletePayload.LastRunTests,
+                        testRunCompletePayload.RunAttachments,
+                        testRunCompletePayload.ExecutorUris);
+                    isTestRunComplete = true;
+                }
+                else if (string.Equals(MessageType.TestMessage, message.MessageType))
+                {
+                    var testMessagePayload = _dataSerializer
+                        .DeserializePayload<TestMessagePayload>(message);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    eventHandler.HandleLogMessage(
+                        testMessagePayload.MessageLevel,
+                        testMessagePayload.Message);
+                }
+                else if (string.Equals(MessageType.CustomTestHostLaunch, message.MessageType))
+                {
+                    HandleCustomHostLaunch(customHostLauncher, message);
+                }
+                else if (string.Equals(MessageType.EditorAttachDebugger, message.MessageType) || string.Equals(MessageType.EditorAttachDebugger2, message.MessageType))
+                {
+                    AttachDebuggerToProcess(customHostLauncher, message);
+                }
+                else if (string.Equals(MessageType.TelemetryEventMessage, message.MessageType))
+                {
+                    HandleTelemetryEvent(telemetryEventsHandler, message);
                 }
             }
-            catch (Exception exception)
-            {
-                EqtTrace.Error("Aborting Test Discovery Operation: {0}", exception);
-                eventHandler.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedTestsDiscovery);
-                var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true);
-                eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
-
-                // Earlier we were closing the connection with vstest.console in case of exceptions.
-                // Removing that code because vstest.console might be in a healthy state and letting
-                // the client know of the error, so that the TL can wait for the next instruction
-                // from the client itself.
-                // Also, connection termination might not kill the process which could result in
-                // files being locked by testhost.
-            }
-
-            this.testPlatformEventSource.TranslationLayerDiscoveryStop();
         }
-
-        private async Task SendMessageAndListenAndReportTestCasesAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 eventHandler)
+        catch (Exception exception)
         {
-            try
-            {
-                this.communicationManager.SendMessage(
-                    MessageType.StartDiscovery,
-                    new DiscoveryRequestPayload()
-                    {
-                        Sources = sources,
-                        RunSettings = runSettings,
-                        TestPlatformOptions = options,
-                        TestSessionInfo = testSessionInfo
-                    },
-                    this.protocolVersion);
-                var isDiscoveryComplete = false;
-
-                // Cycle through the messages that vstest.console sends.
-                // Currently each operation is not a separate task since it should not take that
-                // much time to complete.
-                //
-                // This is just a notification.
-                while (!isDiscoveryComplete)
-                {
-                    var message = await this.TryReceiveMessageAsync().ConfigureAwait(false);
-
-                    if (string.Equals(MessageType.TestCasesFound, message.MessageType))
-                    {
-                        var testCases = this.dataSerializer
-                            .DeserializePayload<IEnumerable<TestCase>>(message);
-
-                        eventHandler.HandleDiscoveredTests(testCases);
-                    }
-                    else if (string.Equals(MessageType.DiscoveryComplete, message.MessageType))
-                    {
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info(
-                                "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestCasesAsync: Discovery complete.");
-                        }
-
-                        var discoveryCompletePayload =
-                            this.dataSerializer.DeserializePayload<DiscoveryCompletePayload>(message);
+            EqtTrace.Error("Aborting Test Run Operation: {0}", exception);
+            eventHandler.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedTestsRun + " " + exception.ToString());
+            var completeArgs = new TestRunCompleteEventArgs(
+                null, false, true, exception, null, null, TimeSpan.Zero);
+            eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
+
+            // Earlier we were closing the connection with vstest.console in case of exceptions.
+            // Removing that code because vstest.console might be in a healthy state and letting
+            // the client know of the error, so that the TL can wait for the next instruction
+            // from the client itself.
+            // Also, connection termination might not kill the process which could result in
+            // files being locked by testhost.
+        }
 
-                        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(
-                            discoveryCompletePayload.TotalTests,
-                            discoveryCompletePayload.IsAborted);
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
 
-                        // Adding Metrics from VsTestConsole
-                        discoveryCompleteEventArgs.Metrics = discoveryCompletePayload.Metrics;
+    private async Task SendMessageAndListenAndReportTestResultsAsync(
+        string messageType,
+        object payload,
+        ITestRunEventsHandler eventHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher? customHostLauncher)
+    {
+        try
+        {
+            _communicationManager.SendMessage(messageType, payload, _protocolVersion);
+            var isTestRunComplete = false;
 
-                        eventHandler.HandleDiscoveryComplete(
-                            discoveryCompleteEventArgs,
-                            discoveryCompletePayload.LastDiscoveredTests);
-                        isDiscoveryComplete = true;
-                    }
-                    else if (string.Equals(MessageType.TestMessage, message.MessageType))
-                    {
-                        var testMessagePayload = this.dataSerializer
-                            .DeserializePayload<TestMessagePayload>(message);
-                        eventHandler.HandleLogMessage(
-                            testMessagePayload.MessageLevel,
-                            testMessagePayload.Message);
-                    }
-                }
-            }
-            catch (Exception exception)
+            // Cycle through the messages that vstest.console sends.
+            // Currently each operation is not a separate task since it should not take that
+            // much time to complete.
+            //
+            // This is just a notification.
+            while (!isTestRunComplete)
             {
-                EqtTrace.Error("Aborting Test Discovery Operation: {0}", exception);
-
-                eventHandler.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedTestsDiscovery);
+                var message = await TryReceiveMessageAsync().ConfigureAwait(false);
 
-                var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(-1, true);
-                eventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
-
-                // Earlier we were closing the connection with vstest.console in case of exceptions.
-                // Removing that code because vstest.console might be in a healthy state and letting
-                // the client know of the error, so that the TL can wait for the next instruction
-                // from the client itself.
-                // Also, connection termination might not kill the process which could result in
-                // files being locked by testhost.
+                if (string.Equals(MessageType.TestRunStatsChange, message.MessageType))
+                {
+                    var testRunChangedArgs = _dataSerializer
+                        .DeserializePayload<TestRunChangedEventArgs>(message);
+                    eventHandler.HandleTestRunStatsChange(testRunChangedArgs);
+                }
+                else if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
+                {
+                    EqtTrace.Info(
+                        "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestResultsAsync: Execution complete.");
+
+                    var testRunCompletePayload = _dataSerializer
+                        .DeserializePayload<TestRunCompletePayload>(message);
+                    TPDebug.Assert(testRunCompletePayload is not null, "testRunCompletePayload is null");
+                    eventHandler.HandleTestRunComplete(
+                        testRunCompletePayload.TestRunCompleteArgs!,
+                        testRunCompletePayload.LastRunTests,
+                        testRunCompletePayload.RunAttachments,
+                        testRunCompletePayload.ExecutorUris);
+                    isTestRunComplete = true;
+                }
+                else if (string.Equals(MessageType.TestMessage, message.MessageType))
+                {
+                    var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                    TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+                    eventHandler.HandleLogMessage(
+                        testMessagePayload.MessageLevel,
+                        testMessagePayload.Message);
+                }
+                else if (string.Equals(MessageType.CustomTestHostLaunch, message.MessageType))
+                {
+                    HandleCustomHostLaunch(customHostLauncher, message);
+                }
+                else if (string.Equals(MessageType.EditorAttachDebugger, message.MessageType))
+                {
+                    AttachDebuggerToProcess(customHostLauncher, message);
+                }
+                else if (string.Equals(MessageType.TelemetryEventMessage, message.MessageType))
+                {
+                    HandleTelemetryEvent(telemetryEventsHandler, message);
+                }
             }
-
-            this.testPlatformEventSource.TranslationLayerDiscoveryStop();
         }
-
-        private void SendMessageAndListenAndReportTestResults(
-            string messageType,
-            object payload,
-            ITestRunEventsHandler eventHandler,
-            ITestHostLauncher customHostLauncher)
+        catch (Exception exception)
         {
-            try
-            {
-                this.communicationManager.SendMessage(messageType, payload, this.protocolVersion);
-                var isTestRunComplete = false;
+            EqtTrace.Error("Aborting Test Run Operation: {0}", exception);
+            eventHandler.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedTestsRun + " " + exception.ToString());
+            var completeArgs = new TestRunCompleteEventArgs(
+                null, false, true, exception, null, null, TimeSpan.Zero);
+            eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
+
+            // Earlier we were closing the connection with vstest.console in case of exceptions.
+            // Removing that code because vstest.console might be in a healthy state and letting
+            // the client know of the error, so that the TL can wait for the next instruction
+            // from the client itself.
+            // Also, connection termination might not kill the process which could result in
+            // files being locked by testhost.
+        }
 
-                // Cycle through the messages that vstest.console sends.
-                // Currently each operation is not a separate task since it should not take that
-                // much time to complete.
-                //
-                // This is just a notification.
-                while (!isTestRunComplete)
-                {
-                    var message = this.TryReceiveMessage();
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
 
-                    if (string.Equals(MessageType.TestRunStatsChange, message.MessageType))
-                    {
-                        var testRunChangedArgs = this.dataSerializer
-                            .DeserializePayload<TestRunChangedEventArgs>(
-                            message);
-                        eventHandler.HandleTestRunStatsChange(testRunChangedArgs);
-                    }
-                    else if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
-                    {
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info(
-                                "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestResults: Execution complete.");
-                        }
-
-                        var testRunCompletePayload = this.dataSerializer
-                            .DeserializePayload<TestRunCompletePayload>(message);
-
-                        eventHandler.HandleTestRunComplete(
-                            testRunCompletePayload.TestRunCompleteArgs,
-                            testRunCompletePayload.LastRunTests,
-                            testRunCompletePayload.RunAttachments,
-                            testRunCompletePayload.ExecutorUris);
-                        isTestRunComplete = true;
-                    }
-                    else if (string.Equals(MessageType.TestMessage, message.MessageType))
-                    {
-                        var testMessagePayload = this.dataSerializer
-                            .DeserializePayload<TestMessagePayload>(message);
-                        eventHandler.HandleLogMessage(
-                            testMessagePayload.MessageLevel,
-                            testMessagePayload.Message);
-                    }
-                    else if (string.Equals(MessageType.CustomTestHostLaunch, message.MessageType))
-                    {
-                        this.HandleCustomHostLaunch(customHostLauncher, message);
-                    }
-                    else if (string.Equals(MessageType.EditorAttachDebugger, message.MessageType))
-                    {
-                        this.AttachDebuggerToProcess(customHostLauncher, message);
-                    }
-                }
-            }
-            catch (Exception exception)
+    private async Task SendMessageAndListenAndReportAttachmentsProcessingResultAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? runSettings,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler eventHandler,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            var payload = new TestRunAttachmentsProcessingPayload
             {
-                EqtTrace.Error("Aborting Test Run Operation: {0}", exception);
-                eventHandler.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedTestsRun);
-                var completeArgs = new TestRunCompleteEventArgs(
-                    null, false, true, exception, null, TimeSpan.Zero);
-                eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
-
-                // Earlier we were closing the connection with vstest.console in case of exceptions.
-                // Removing that code because vstest.console might be in a healthy state and letting
-                // the client know of the error, so that the TL can wait for the next instruction
-                // from the client itself.
-                // Also, connection termination might not kill the process which could result in
-                // files being locked by testhost.
-            }
+                Attachments = attachments,
+                InvokedDataCollectors = invokedDataCollectors,
+                RunSettings = runSettings,
+                CollectMetrics = collectMetrics
+            };
 
-            this.testPlatformEventSource.TranslationLayerExecutionStop();
-        }
+            _communicationManager.SendMessage(
+                MessageType.TestRunAttachmentsProcessingStart,
+                payload);
+            var isTestRunAttachmentsProcessingComplete = false;
 
-        private async Task SendMessageAndListenAndReportTestResultsAsync(
-            string messageType,
-            object payload,
-            ITestRunEventsHandler eventHandler,
-            ITestHostLauncher customHostLauncher)
-        {
-            try
+            using (cancellationToken.Register(() =>
+                       _communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingCancel)))
             {
-                this.communicationManager.SendMessage(messageType, payload, this.protocolVersion);
-                var isTestRunComplete = false;
-
                 // Cycle through the messages that vstest.console sends.
                 // Currently each operation is not a separate task since it should not take that
                 // much time to complete.
                 //
                 // This is just a notification.
-                while (!isTestRunComplete)
+                while (!isTestRunAttachmentsProcessingComplete)
                 {
-                    var message = await this.TryReceiveMessageAsync().ConfigureAwait(false);
+                    var message = await TryReceiveMessageAsync().ConfigureAwait(false);
 
-                    if (string.Equals(MessageType.TestRunStatsChange, message.MessageType))
+                    if (string.Equals(
+                            MessageType.TestRunAttachmentsProcessingComplete,
+                            message.MessageType))
                     {
-                        var testRunChangedArgs = this.dataSerializer
-                            .DeserializePayload<TestRunChangedEventArgs>(message);
-                        eventHandler.HandleTestRunStatsChange(testRunChangedArgs);
+                        EqtTrace.Info(
+                            "VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachments: Process complete.");
+
+                        var testRunAttachmentsProcessingCompletePayload = _dataSerializer
+                            .DeserializePayload<TestRunAttachmentsProcessingCompletePayload>(message);
+                        TPDebug.Assert(testRunAttachmentsProcessingCompletePayload is not null, "testRunAttachmentsProcessingCompletePayload is null");
+
+                        eventHandler.HandleTestRunAttachmentsProcessingComplete(
+                            testRunAttachmentsProcessingCompletePayload.AttachmentsProcessingCompleteEventArgs!,
+                            testRunAttachmentsProcessingCompletePayload.Attachments);
+                        isTestRunAttachmentsProcessingComplete = true;
                     }
-                    else if (string.Equals(MessageType.ExecutionComplete, message.MessageType))
+                    else if (string.Equals(
+                                 MessageType.TestRunAttachmentsProcessingProgress,
+                                 message.MessageType))
                     {
-                        if (EqtTrace.IsInfoEnabled)
-                        {
-                            EqtTrace.Info(
-                                "VsTestConsoleRequestSender.SendMessageAndListenAndReportTestResultsAsync: Execution complete.");
-                        }
-
-                        var testRunCompletePayload = this.dataSerializer
-                            .DeserializePayload<TestRunCompletePayload>(message);
-
-                        eventHandler.HandleTestRunComplete(
-                            testRunCompletePayload.TestRunCompleteArgs,
-                            testRunCompletePayload.LastRunTests,
-                            testRunCompletePayload.RunAttachments,
-                            testRunCompletePayload.ExecutorUris);
-                        isTestRunComplete = true;
+                        var testRunAttachmentsProcessingProgressPayload = _dataSerializer
+                            .DeserializePayload<TestRunAttachmentsProcessingProgressPayload>(message);
+                        TPDebug.Assert(testRunAttachmentsProcessingProgressPayload is not null, "testRunAttachmentsProcessingProgressPayload is null");
+
+                        eventHandler.HandleTestRunAttachmentsProcessingProgress(
+                            testRunAttachmentsProcessingProgressPayload.AttachmentsProcessingProgressEventArgs!);
                     }
                     else if (string.Equals(MessageType.TestMessage, message.MessageType))
                     {
-                        var testMessagePayload = this.dataSerializer
-                            .DeserializePayload<TestMessagePayload>(message);
+                        var testMessagePayload = _dataSerializer.DeserializePayload<TestMessagePayload>(message);
+                        TPDebug.Assert(testMessagePayload is not null, "testMessagePayload is null");
+
                         eventHandler.HandleLogMessage(
                             testMessagePayload.MessageLevel,
                             testMessagePayload.Message);
                     }
-                    else if (string.Equals(MessageType.CustomTestHostLaunch, message.MessageType))
+                    else
                     {
-                        this.HandleCustomHostLaunch(customHostLauncher, message);
-                    }
-                    else if (string.Equals(MessageType.EditorAttachDebugger, message.MessageType))
-                    {
-                        this.AttachDebuggerToProcess(customHostLauncher, message);
+                        EqtTrace.Warning(
+                            $"VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachments: Unexpected message received {message.MessageType}.");
                     }
                 }
             }
-            catch (Exception exception)
-            {
-                EqtTrace.Error("Aborting Test Run Operation: {0}", exception);
-                eventHandler.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedTestsRun);
-                var completeArgs = new TestRunCompleteEventArgs(
-                    null, false, true, exception, null, TimeSpan.Zero);
-                eventHandler.HandleTestRunComplete(completeArgs, null, null, null);
-
-                // Earlier we were closing the connection with vstest.console in case of exceptions.
-                // Removing that code because vstest.console might be in a healthy state and letting
-                // the client know of the error, so that the TL can wait for the next instruction
-                // from the client itself.
-                // Also, connection termination might not kill the process which could result in
-                // files being locked by testhost.
-            }
-
-            this.testPlatformEventSource.TranslationLayerExecutionStop();
         }
+        catch (Exception exception)
+        {
+            EqtTrace.Error("Aborting Test Session End Operation: {0}", exception);
+            eventHandler.HandleLogMessage(
+                TestMessageLevel.Error,
+                TranslationLayerResources.AbortedTestRunAttachmentsProcessing);
+            eventHandler.HandleTestRunAttachmentsProcessingComplete(
+                new TestRunAttachmentsProcessingCompleteEventArgs(false, exception),
+                null);
 
-        private async Task SendMessageAndListenAndReportAttachmentsProcessingResultAsync(
-            IEnumerable<AttachmentSet> attachments,
-            bool collectMetrics,
-            ITestRunAttachmentsProcessingEventsHandler eventHandler,
-            CancellationToken cancellationToken)
+            // Earlier we were closing the connection with vstest.console in case of exceptions.
+            // Removing that code because vstest.console might be in a healthy state and letting
+            // the client know of the error, so that the TL can wait for the next instruction
+            // from the client itself.
+            // Also, connection termination might not kill the process which could result in
+            // files being locked by testhost.
+        }
+        finally
         {
-            try
-            {
-                var payload = new TestRunAttachmentsProcessingPayload
-                {
-                    Attachments = attachments,
-                    CollectMetrics = collectMetrics
-                };
+            _testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStop();
+        }
+    }
 
-                this.communicationManager.SendMessage(
-                    MessageType.TestRunAttachmentsProcessingStart,
-                    payload);
-                var isTestRunAttachmentsProcessingComplete = false;
+    private Message TryReceiveMessage()
+    {
+        return TryReceiveMessageAsync().GetAwaiter().GetResult();
+    }
 
-                using (cancellationToken.Register(() =>
-                    this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingCancel)))
-                {
-                    // Cycle through the messages that vstest.console sends.
-                    // Currently each operation is not a separate task since it should not take that
-                    // much time to complete.
-                    //
-                    // This is just a notification.
-                    while (!isTestRunAttachmentsProcessingComplete)
-                    {
-                        var message = await this.TryReceiveMessageAsync().ConfigureAwait(false);
+    private async Task<Message> TryReceiveMessageAsync()
+    {
+        // TODO: Rework logic of this class to avoid relying on throwing/catching exceptions:
+        // - NRE on null _processExitCancellationTokenSource
+        // - TransationLayerException on null message
+        Message? message = await _communicationManager.ReceiveMessageAsync(_processExitCancellationTokenSource!.Token)
+            .ConfigureAwait(false);
 
-                        if (string.Equals(
-                            MessageType.TestRunAttachmentsProcessingComplete,
-                            message.MessageType))
-                        {
-                            if (EqtTrace.IsInfoEnabled)
-                            {
-                                EqtTrace.Info(
-                                    "VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachments: Process complete.");
-                            }
-
-                            var testRunAttachmentsProcessingCompletePayload = this.dataSerializer
-                                .DeserializePayload<TestRunAttachmentsProcessingCompletePayload>(message);
-
-                            eventHandler.HandleTestRunAttachmentsProcessingComplete(
-                                testRunAttachmentsProcessingCompletePayload.AttachmentsProcessingCompleteEventArgs,
-                                testRunAttachmentsProcessingCompletePayload.Attachments);
-                            isTestRunAttachmentsProcessingComplete = true;
-                        }
-                        else if (string.Equals(
-                            MessageType.TestRunAttachmentsProcessingProgress,
-                            message.MessageType))
-                        {
-                            var testRunAttachmentsProcessingProgressPayload = this.dataSerializer
-                                .DeserializePayload<TestRunAttachmentsProcessingProgressPayload>(message);
-                            eventHandler.HandleTestRunAttachmentsProcessingProgress(
-                                testRunAttachmentsProcessingProgressPayload.AttachmentsProcessingProgressEventArgs);
-                        }
-                        else if (string.Equals(MessageType.TestMessage, message.MessageType))
-                        {
-                            var testMessagePayload = this.dataSerializer
-                                .DeserializePayload<TestMessagePayload>(message);
-                            eventHandler.HandleLogMessage(
-                                testMessagePayload.MessageLevel,
-                                testMessagePayload.Message);
-                        }
-                        else
-                        {
-                            EqtTrace.Warning(
-                                $"VsTestConsoleRequestSender.SendMessageAndListenAndReportAttachments: Unexpected message received {message.MessageType}.");
-                        }
-                    }
-                }
-            }
-            catch (Exception exception)
-            {
-                EqtTrace.Error("Aborting Test Session End Operation: {0}", exception);
-                eventHandler.HandleLogMessage(
-                    TestMessageLevel.Error,
-                    TranslationLayerResources.AbortedTestRunAttachmentsProcessing);               
-                eventHandler.HandleTestRunAttachmentsProcessingComplete(
-                    new TestRunAttachmentsProcessingCompleteEventArgs(false, exception),
-                    null);
-
-                // Earlier we were closing the connection with vstest.console in case of exceptions.
-                // Removing that code because vstest.console might be in a healthy state and letting
-                // the client know of the error, so that the TL can wait for the next instruction
-                // from the client itself.
-                // Also, connection termination might not kill the process which could result in
-                // files being locked by testhost.
-            }
-            finally
-            {
-                this.testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStop();
-            }
-        }
+        return message ?? throw new TransationLayerException(TranslationLayerResources.FailedToReceiveMessage);
+    }
 
-        private Message TryReceiveMessage()
+    private void HandleCustomHostLaunch(ITestHostLauncher? customHostLauncher, Message message)
+    {
+        var ackPayload = new CustomHostLaunchAckPayload()
         {
-            Message message = null;
-            var receiverMessageTask = this.communicationManager.ReceiveMessageAsync(
-                this.processExitCancellationTokenSource.Token);
-            receiverMessageTask.Wait();
-            message = receiverMessageTask.Result;
+            HostProcessId = -1,
+            ErrorMessage = null
+        };
 
-            if (message == null)
-            {
-                throw new TransationLayerException(
-                    TranslationLayerResources.FailedToReceiveMessage);
-            }
+        try
+        {
+            var testProcessStartInfo = _dataSerializer.DeserializePayload<TestProcessStartInfo>(message);
 
-            return message;
+            ackPayload.HostProcessId = customHostLauncher?.LaunchTestHost(testProcessStartInfo!) ?? -1;
         }
-
-        private async Task<Message> TryReceiveMessageAsync()
+        catch (Exception ex)
         {
-            Message message = await this.communicationManager.ReceiveMessageAsync(
-                this.processExitCancellationTokenSource.Token).ConfigureAwait(false);
-
-            if (message == null)
-            {
-                throw new TransationLayerException(
-                    TranslationLayerResources.FailedToReceiveMessage);
-            }
+            EqtTrace.Error("Error while launching custom host: {0}", ex);
 
-            return message;
+            // Vstest.console will send the abort message properly while cleaning up all the
+            // flow, so do not abort here.
+            // Let the ack go through and let vstest.console handle the error.
+            ackPayload.ErrorMessage = ex.Message;
+        }
+        finally
+        {
+            // Always unblock the vstest.console thread which is indefinitely waiting on this
+            // ACK.
+            _communicationManager.SendMessage(
+                MessageType.CustomTestHostLaunchCallback,
+                ackPayload,
+                _protocolVersion);
         }
+    }
 
-        private void HandleCustomHostLaunch(ITestHostLauncher customHostLauncher, Message message)
+    private void AttachDebuggerToProcess(ITestHostLauncher? customHostLauncher, Message message)
+    {
+        var ackPayload = new EditorAttachDebuggerAckPayload()
         {
-            var ackPayload = new CustomHostLaunchAckPayload()
-            {
-                HostProcessId = -1,
-                ErrorMessage = null
-            };
+            Attached = false,
+            ErrorMessage = null
+        };
 
-            try
+        try
+        {
+            // Handle EditorAttachDebugger2.
+            if (message.MessageType == MessageType.EditorAttachDebugger2)
             {
-                var testProcessStartInfo = this.dataSerializer
-                    .DeserializePayload<TestProcessStartInfo>(message);
-
-                ackPayload.HostProcessId = customHostLauncher != null
-                    ? customHostLauncher.LaunchTestHost(testProcessStartInfo)
-                    : -1;
+                var attachDebuggerPayload = _dataSerializer.DeserializePayload<EditorAttachDebuggerPayload>(message);
+                TPDebug.Assert(attachDebuggerPayload is not null, "attachDebuggerPayload is null");
+                switch (customHostLauncher)
+                {
+                    case ITestHostLauncher3 launcher3:
+                        var attachDebuggerInfo = new AttachDebuggerInfo
+                        {
+                            ProcessId = attachDebuggerPayload.ProcessID,
+                            TargetFramework = attachDebuggerPayload.TargetFramework,
+                            Sources = attachDebuggerPayload.Sources,
+                        };
+                        ackPayload.Attached = launcher3.AttachDebuggerToProcess(attachDebuggerInfo, CancellationToken.None);
+                        break;
+                    case ITestHostLauncher2 launcher2:
+                        ackPayload.Attached = launcher2.AttachDebuggerToProcess(attachDebuggerPayload.ProcessID);
+                        break;
+                    default:
+                        // TODO: Maybe we should do something, but the rest of the story is broken, so it's better to not block users.
+                        break;
+                }
             }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("Error while launching custom host: {0}", ex);
 
-                // Vstest.console will send the abort message properly while cleaning up all the
-                // flow, so do not abort here.
-                // Let the ack go through and let vstest.console handle the error.
-                ackPayload.ErrorMessage = ex.Message;
-            }
-            finally
+            // Handle EditorAttachDebugger.
+            if (message.MessageType == MessageType.EditorAttachDebugger)
             {
-                // Always unblock the vstest.console thread which is indefinitely waiting on this
-                // ACK.
-                this.communicationManager.SendMessage(
-                    MessageType.CustomTestHostLaunchCallback,
-                    ackPayload,
-                    this.protocolVersion);
+                var pid = _dataSerializer.DeserializePayload<int>(message);
+
+                switch (customHostLauncher)
+                {
+                    case ITestHostLauncher3 launcher3:
+                        ackPayload.Attached = launcher3.AttachDebuggerToProcess(new AttachDebuggerInfo { ProcessId = pid }, CancellationToken.None);
+                        break;
+                    case ITestHostLauncher2 launcher2:
+                        ackPayload.Attached = launcher2.AttachDebuggerToProcess(pid);
+                        break;
+                    default:
+                        // TODO: Maybe we should do something, but the rest of the story is broken, so it's better to not block users.
+                        break;
+                }
             }
         }
-
-        private void AttachDebuggerToProcess(ITestHostLauncher customHostLauncher, Message message)
+        catch (Exception ex)
         {
-            var ackPayload = new EditorAttachDebuggerAckPayload()
-            {
-                Attached = false,
-                ErrorMessage = null
-            };
+            EqtTrace.Error("VsTestConsoleRequestSender.AttachDebuggerToProcess: Error while attaching debugger to process: {0}", ex);
 
-            try
-            {
-                var pid = this.dataSerializer.DeserializePayload<int>(message);
+            // vstest.console will send the abort message properly while cleaning up all the
+            // flow, so do not abort here.
+            // Let the ack go through and let vstest.console handle the error.
+            ackPayload.ErrorMessage = ex.Message;
+        }
+        finally
+        {
+            // Always unblock the vstest.console thread which is indefintitely waiting on this
+            // ACK.
+            _communicationManager.SendMessage(
+                MessageType.EditorAttachDebuggerCallback,
+                ackPayload,
+                _protocolVersion);
+        }
+    }
 
-                ackPayload.Attached = customHostLauncher is ITestHostLauncher2 launcher
-                && launcher.AttachDebuggerToProcess(pid);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error(
-                    "VsTestConsoleRequestSender.AttachDebuggerToProcess: Error while attaching debugger to process: {0}",
-                    ex);
-
-                // vstest.console will send the abort message properly while cleaning up all the
-                // flow, so do not abort here.
-                // Let the ack go through and let vstest.console handle the error.
-                ackPayload.ErrorMessage = ex.Message;
-            }
-            finally
+    private void HandleTelemetryEvent(ITelemetryEventsHandler telemetryEventsHandler, Message message)
+    {
+        try
+        {
+            TelemetryEvent? telemetryEvent = _dataSerializer.DeserializePayload<TelemetryEvent>(message);
+            if (telemetryEvent is not null)
             {
-                // Always unblock the vstest.console thread which is indefintitely waiting on this
-                // ACK.
-                this.communicationManager.SendMessage(
-                    MessageType.EditorAttachDebuggerCallback,
-                    ackPayload,
-                    this.protocolVersion);
+                telemetryEventsHandler.HandleTelemetryEvent(telemetryEvent);
             }
         }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("VsTestConsoleRequestSender.HandleTelemetryEvent: Error while handling telemetry event: {0}", ex);
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
index dbfeaf780f..e3b99521c7 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs
@@ -1,1013 +1,1218 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
+using System;
+using System.Collections.Generic;
+#if !NET5_0_OR_GREATER
+using System.Diagnostics;
+#endif
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+
+/// <summary>
+/// An implementation of <see cref="IVsTestConsoleWrapper"/> to invoke test operations
+/// via the <c>vstest.console</c> test runner.
+/// </summary>
+public class VsTestConsoleWrapper : IVsTestConsoleWrapper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+    private readonly IProcessManager _vstestConsoleProcessManager;
+
+    private readonly ITranslationLayerRequestSender _requestSender;
+
+    private readonly IProcessHelper _processHelper;
+
+    private bool _sessionStarted;
 
     /// <summary>
-    /// An implementation of <see cref="IVsTestConsoleWrapper"/> to invoke test operations
-    /// via the <c>vstest.console</c> test runner.
+    /// Path to additional extensions to reinitialize vstest.console
     /// </summary>
-    public class VsTestConsoleWrapper : IVsTestConsoleWrapper
-    {
-        #region Private Members
+    private IEnumerable<string> _pathToAdditionalExtensions;
 
-        private readonly IProcessManager vstestConsoleProcessManager;
+    /// <summary>
+    /// Additional parameters for vstest.console.exe
+    /// </summary>
+    private readonly ConsoleParameters _consoleParameters;
 
-        private readonly ITranslationLayerRequestSender requestSender;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
 
-        private readonly IProcessHelper processHelper;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
+    /// </summary>
+    ///
+    /// <param name="vstestConsolePath">
+    /// Path to the test runner <c>vstest.console.exe</c>.
+    /// </param>
+    public VsTestConsoleWrapper(
+        string vstestConsolePath)
+        : this(
+            vstestConsolePath,
+            ConsoleParameters.Default)
+    {
+    }
 
-        private bool sessionStarted;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
+    /// </summary>
+    ///
+    /// <param name="vstestConsolePath">Path to the test runner <c>vstest.console.exe</c>.</param>
+    /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
+    public VsTestConsoleWrapper(
+        string vstestConsolePath,
+        ConsoleParameters consoleParameters)
+        : this(
+            new VsTestConsoleRequestSender(),
+            new VsTestConsoleProcessManager(vstestConsolePath),
+            consoleParameters,
+            TestPlatformEventSource.Instance,
+            new ProcessHelper())
+    {
+    }
 
-        /// <summary>
-        /// Path to additional extensions to reinitialize vstest.console
-        /// </summary>
-        private IEnumerable<string> pathToAdditionalExtensions;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
+    /// </summary>
+    ///
+    /// <remarks>Defined for testing purposes.</remarks>
+    ///
+    /// <param name="vstestConsolePath">Path to the test runner <c>vstest.console.exe</c>.</param>
+    /// <param name="dotnetExePath">Path to dotnet exe, needed for CI builds.</param>
+    /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
+    internal VsTestConsoleWrapper(
+        string vstestConsolePath,
+        string dotnetExePath,
+        ConsoleParameters consoleParameters)
+        : this(
+            new VsTestConsoleRequestSender(),
+            new VsTestConsoleProcessManager(vstestConsolePath, dotnetExePath),
+            consoleParameters,
+            TestPlatformEventSource.Instance,
+            new ProcessHelper())
+    {
+    }
 
-        /// <summary>
-        /// Additional parameters for vstest.console.exe
-        /// </summary>
-        private readonly ConsoleParameters consoleParameters;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
+    /// </summary>
+    ///
+    /// <param name="requestSender">Sender for test messages.</param>
+    /// <param name="processManager">Process manager.</param>
+    /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
+    /// <param name="testPlatformEventSource">Performance event source.</param>
+    /// <param name="processHelper">Helper for process related utilities.</param>
+    internal VsTestConsoleWrapper(
+        ITranslationLayerRequestSender requestSender,
+        IProcessManager processManager,
+        ConsoleParameters consoleParameters,
+        ITestPlatformEventSource testPlatformEventSource,
+        IProcessHelper processHelper)
+    {
+        _requestSender = requestSender;
+        _vstestConsoleProcessManager = processManager;
+        _consoleParameters = consoleParameters;
+        _testPlatformEventSource = testPlatformEventSource;
+        _processHelper = processHelper;
+        _pathToAdditionalExtensions = new List<string>();
+
+        _vstestConsoleProcessManager.ProcessExited += (sender, args) => _requestSender.OnProcessExited();
+        _sessionStarted = false;
+    }
 
-        private readonly ITestPlatformEventSource testPlatformEventSource;
 
-        #endregion
+    #region IVsTestConsoleWrapper
 
-        #region Constructor
+    /// <inheritdoc/>
+    public void StartSession()
+    {
+        EqtTrace.Info("VsTestConsoleWrapper.StartSession: Starting VsTestConsoleWrapper session.");
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
-        /// </summary>
-        ///
-        /// <param name="vstestConsolePath">
-        /// Path to the test runner <c>vstest.console.exe</c>.
-        /// </param>
-        public VsTestConsoleWrapper(
-            string vstestConsolePath)
-            : this(
-                  vstestConsolePath,
-                  ConsoleParameters.Default)
-        {
-        }
+        _testPlatformEventSource.TranslationLayerInitializeStart();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
-        /// </summary>
-        ///
-        /// <param name="vstestConsolePath">Path to the test runner <c>vstest.console.exe</c>.</param>
-        /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
-        public VsTestConsoleWrapper(
-            string vstestConsolePath,
-            ConsoleParameters consoleParameters)
-            : this(
-                  new VsTestConsoleRequestSender(),
-                  new VsTestConsoleProcessManager(vstestConsolePath),
-                  consoleParameters,
-                  TestPlatformEventSource.Instance,
-                  new ProcessHelper())
-        {
-        }
+        // Start communication
+        var port = _requestSender.InitializeCommunication();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
-        /// </summary>
-        ///
-        /// <remarks>Defined for testing purposes.</remarks>
-        ///
-        /// <param name="vstestConsolePath">Path to the test runner <c>vstest.console.exe</c>.</param>
-        /// <param name="dotnetExePath">Path to dotnet exe, needed for CI builds.</param>
-        /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
-        internal VsTestConsoleWrapper(
-            string vstestConsolePath,
-            string dotnetExePath,
-            ConsoleParameters consoleParameters)
-            : this(
-                  new VsTestConsoleRequestSender(),
-                  new VsTestConsoleProcessManager(vstestConsolePath, dotnetExePath),
-                  consoleParameters,
-                  TestPlatformEventSource.Instance,
-                  new ProcessHelper())
+        if (port > 0)
         {
+            // Fill the parameters
+#if NET5_0_OR_GREATER
+            _consoleParameters.ParentProcessId = Environment.ProcessId;
+#else
+            using (var process = Process.GetCurrentProcess())
+                _consoleParameters.ParentProcessId = process.Id;
+#endif
+            _consoleParameters.PortNumber = port;
+
+            // Start vstest.console.exe process
+            _vstestConsoleProcessManager.StartProcess(_consoleParameters);
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VsTestConsoleWrapper"/> class.
-        /// </summary>
-        ///
-        /// <param name="requestSender">Sender for test messages.</param>
-        /// <param name="processManager">Process manager.</param>
-        /// <param name="consoleParameters">The parameters to be passed onto the runner process.</param>
-        /// <param name="testPlatformEventSource">Performance event source.</param>
-        /// <param name="processHelper">Helper for process related utilities.</param>
-        internal VsTestConsoleWrapper(
-            ITranslationLayerRequestSender requestSender,
-            IProcessManager processManager,
-            ConsoleParameters consoleParameters,
-            ITestPlatformEventSource testPlatformEventSource,
-            IProcessHelper processHelper)
+        else
         {
-            this.requestSender = requestSender;
-            this.vstestConsoleProcessManager = processManager;
-            this.consoleParameters = consoleParameters;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.processHelper = processHelper;
-            this.pathToAdditionalExtensions = new List<string>();
-
-            this.vstestConsoleProcessManager.ProcessExited += (sender, args) => this.requestSender.OnProcessExited();
-            this.sessionStarted = false;
+            // Close the sender as it failed to host server
+            _requestSender.Close();
+            throw new TransationLayerException("Error hosting communication channel");
         }
+    }
 
-        #endregion
-
-        #region IVsTestConsoleWrapper
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StartTestSession(
+            sources,
+            runSettings,
+            options: null,
+            eventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void StartSession()
-        {
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("VsTestConsoleWrapper.StartSession: Starting VsTestConsoleWrapper session.");
-            }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StartTestSession(
+            sources,
+            runSettings,
+            options,
+            eventsHandler,
+            testHostLauncher: null);
+    }
 
-            this.testPlatformEventSource.TranslationLayerInitializeStart();
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        _testPlatformEventSource.TranslationLayerStartTestSessionStart();
 
-            // Start communication
-            var port = this.requestSender.InitializeCommunication();
+        EnsureInitialized();
 
-            if (port > 0)
-            {
-                // Fill the parameters
-                this.consoleParameters.ParentProcessId = Process.GetCurrentProcess().Id;
-                this.consoleParameters.PortNumber = port;
+        var testSessionInfo = _requestSender.StartTestSession(
+            sources,
+            runSettings,
+            options,
+            eventsHandler,
+            testHostLauncher);
 
-                // Start vstest.console.exe process
-                this.vstestConsoleProcessManager.StartProcess(this.consoleParameters);
-            }
-            else
-            {
-                // Close the sender as it failed to host server
-                this.requestSender.Close();
-                throw new TransationLayerException("Error hosting communication channel");
-            }
-        }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler)
-        {
-            return this.StartTestSession(
-                sources,
-                runSettings,
-                options: null,
-                eventsHandler);
-        }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler)
-        {
-            return this.StartTestSession(
-                sources,
-                runSettings,
-                options,
+        return (testSessionInfo != null)
+            ? new TestSession(
+                testSessionInfo,
                 eventsHandler,
-                testHostLauncher: null);
-        }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public ITestSession StartTestSession(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher)
-        {
-            this.testPlatformEventSource.TranslationLayerStartTestSessionStart();
+                this)
+            : null;
+    }
 
-            this.EnsureInitialized();
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StopTestSession(
+            testSessionInfo,
+            options: null,
+            eventsHandler);
+    }
 
-            var testSessionInfo = this.requestSender.StartTestSession(
-                sources,
-                runSettings,
-                options,
-                eventsHandler,
-                testHostLauncher);
-
-            return (testSessionInfo != null)
-                ? new TestSession(
-                    testSessionInfo,
-                    eventsHandler,
-                    this)
-                : null;
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerStopTestSessionStart();
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public bool StopTestSession(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler)
-        {
-            this.testPlatformEventSource.TranslationLayerStopTestSessionStart();
+        EnsureInitialized();
+        return _requestSender.StopTestSession(
+            testSessionInfo,
+            options,
+            eventsHandler);
+    }
 
-            this.EnsureInitialized();
-            return this.requestSender.StopTestSession(
-                testSessionInfo,
-                eventsHandler);
-        }
+    /// <inheritdoc/>
+    public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        EnsureInitialized();
 
-        /// <inheritdoc/>
-        public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
-        {
-            this.EnsureInitialized();
+        _pathToAdditionalExtensions = pathToAdditionalExtensions.ToList();
+        _requestSender.InitializeExtensions(_pathToAdditionalExtensions);
+    }
 
-            this.pathToAdditionalExtensions = pathToAdditionalExtensions.ToList();
-            this.requestSender.InitializeExtensions(this.pathToAdditionalExtensions);
-        }
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        DiscoverTests(
+            sources,
+            discoverySettings,
+            options: null,
+            discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler));
+    }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler)
-        {
-            this.DiscoverTests(
-                sources,
-                discoverySettings,
-                options: null,
-                discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler));
-        }
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        DiscoverTests(
+            sources,
+            discoverySettings,
+            options,
+            testSessionInfo: null,
+            discoveryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            this.DiscoverTests(
-                sources,
-                discoverySettings,
-                options,
-                testSessionInfo: null,
-                discoveryEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerDiscoveryStart();
+
+        EnsureInitialized();
+        _requestSender.DiscoverTests(
+            sources,
+            discoverySettings,
+            options,
+            testSessionInfo,
+            discoveryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void DiscoverTests(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            this.testPlatformEventSource.TranslationLayerDiscoveryStart();
+    /// <inheritdoc/>
+    public void CancelDiscovery()
+    {
+        _requestSender.CancelDiscovery();
+    }
 
-            this.EnsureInitialized();
-            this.requestSender.DiscoverTests(
-                sources,
-                discoverySettings,
-                options,
-                testSessionInfo,
-                discoveryEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler: testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void CancelDiscovery()
-        {
-            this.requestSender.CancelDiscovery();
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler: testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler());
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            sourceList.Count,
+            0,
+            runSettings ?? string.Empty);
+
+        EnsureInitialized();
+        _requestSender.StartTestRun(
+            sourceList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            var sourceList = sources.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                0,
-                sourceList.Count,
-                0,
-                runSettings ?? string.Empty);
-
-            this.EnsureInitialized();
-            this.requestSender.StartTestRun(
-                sourceList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            this.RunTests(
-                testCases,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler());
+    }
 
-        /// <inheritdoc/>
-        public void RunTests(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            var testCaseList = testCases.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                0,
-                0,
-                testCaseList.Count,
-                runSettings ?? string.Empty);
-
-            this.EnsureInitialized();
-            this.requestSender.StartTestRun(
-                testCaseList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler);
-        }
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        EnsureInitialized();
+        _requestSender.StartTestRun(
+            testCaseList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler: testRunEventsHandler,
-                customTestHostLauncher: customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler: testRunEventsHandler,
+            customTestHostLauncher: customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            var sourceList = sources.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                1,
-                sourceList.Count,
-                0,
-                runSettings ?? string.Empty);
-
-            this.EnsureInitialized();
-            this.requestSender.StartTestRunWithCustomHost(
-                sourceList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            sourceList.Count,
+            0,
+            runSettings ?? string.Empty);
+
+        EnsureInitialized();
+        _requestSender.StartTestRunWithCustomHost(
+            sourceList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            this.RunTestsWithCustomTestHost(
-                testCases,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void RunTestsWithCustomTestHost(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            var testCaseList = testCases.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                1,
-                0,
-                testCaseList.Count,
-                runSettings ?? string.Empty);
-
-            this.EnsureInitialized();
-            this.requestSender.StartTestRunWithCustomHost(
-                testCaseList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher);
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void CancelTestRun()
-        {
-            this.requestSender.CancelTestRun();
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void AbortTestRun()
-        {
-            this.requestSender.AbortTestRun();
-        }
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        EnsureInitialized();
+        _requestSender.StartTestRunWithCustomHost(
+            testCaseList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher);
+    }
 
-        /// <inheritdoc/>
-        public void EndSession()
-        {
-            EqtTrace.Info("VsTestConsoleWrapper.EndSession: Ending VsTestConsoleWrapper session");
+    /// <inheritdoc/>
+    public void CancelTestRun()
+    {
+        _requestSender.CancelTestRun();
+    }
 
-            this.requestSender.EndSession();
-            this.requestSender.Close();
+    /// <inheritdoc/>
+    public void AbortTestRun()
+    {
+        _requestSender.AbortTestRun();
+    }
 
-            // If vstest.console is still hanging around, it should be explicitly killed.
-            this.vstestConsoleProcessManager.ShutdownProcess();
+    /// <inheritdoc/>
+    public void EndSession()
+    {
+        EqtTrace.Info("VsTestConsoleWrapper.EndSession: Ending VsTestConsoleWrapper session");
 
-            this.sessionStarted = false;
-        }
+        _requestSender.EndSession();
+        _requestSender.Close();
 
-        #endregion
+        // If vstest.console is still hanging around, it should be explicitly killed.
+        _vstestConsoleProcessManager.ShutdownProcess();
 
-        #region IVsTestConsoleWrapperAsync
+        _sessionStarted = false;
+    }
 
-        /// <inheritdoc/>
-        public async Task StartSessionAsync()
-        {
-            EqtTrace.Info("VsTestConsoleWrapperAsync.StartSessionAsync: Starting VsTestConsoleWrapper session");
+    #endregion
 
-            this.testPlatformEventSource.TranslationLayerInitializeStart();
+    #region IVsTestConsoleWrapperAsync
 
-            var timeout = EnvironmentHelper.GetConnectionTimeout();
-            // Start communication
-            var port = await this.requestSender.InitializeCommunicationAsync(timeout * 1000).ConfigureAwait(false);
+    /// <inheritdoc/>
+    public async Task StartSessionAsync()
+    {
+        EqtTrace.Info("VsTestConsoleWrapperAsync.StartSessionAsync: Starting VsTestConsoleWrapper session");
 
-            if (port > 0)
-            {
-                // Fill the parameters
-                this.consoleParameters.ParentProcessId = Process.GetCurrentProcess().Id;
-                this.consoleParameters.PortNumber = port;
+        _testPlatformEventSource.TranslationLayerInitializeStart();
 
-                // Start vstest.console.exe process
-                this.vstestConsoleProcessManager.StartProcess(this.consoleParameters);
-            }
-            else
-            {
-                // Close the sender as it failed to host server
-                this.requestSender.Close();
-                throw new TransationLayerException("Error hosting communication channel and connecting to console");
-            }
-        }
+        var timeout = EnvironmentHelper.GetConnectionTimeout();
+        // Start communication
+        var port = await _requestSender.InitializeCommunicationAsync(timeout * 1000).ConfigureAwait(false);
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            ITestSessionEventsHandler eventsHandler)
+        if (port > 0)
         {
-            return await this.StartTestSessionAsync(
-                sources,
-                runSettings,
-                options: null,
-                eventsHandler).ConfigureAwait(false);
+            // Fill the parameters
+#if NET5_0_OR_GREATER
+            _consoleParameters.ParentProcessId = Environment.ProcessId;
+#else
+            using (var process = Process.GetCurrentProcess())
+                _consoleParameters.ParentProcessId = process.Id;
+#endif
+            _consoleParameters.PortNumber = port;
+
+            // Start vstest.console.exe process
+            _vstestConsoleProcessManager.StartProcess(_consoleParameters);
         }
-
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler)
+        else
         {
-            return await this.StartTestSessionAsync(
-                sources,
-                runSettings,
-                options,
-                eventsHandler,
-                testHostLauncher: null).ConfigureAwait(false);
+            // Close the sender as it failed to host server
+            _requestSender.Close();
+            throw new TransationLayerException("Error hosting communication channel and connecting to console");
         }
+    }
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<ITestSession> StartTestSessionAsync(
-            IList<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestSessionEventsHandler eventsHandler,
-            ITestHostLauncher testHostLauncher)
-        {
-            this.testPlatformEventSource.TranslationLayerStartTestSessionStart();
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StartTestSessionAsync(
+            sources,
+            runSettings,
+            options: null,
+            eventsHandler).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StartTestSessionAsync(
+            sources,
+            runSettings,
+            options,
+            eventsHandler,
+            testHostLauncher: null).ConfigureAwait(false);
+    }
 
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        _testPlatformEventSource.TranslationLayerStartTestSessionStart();
 
-            var testSessionInfo = await this.requestSender.StartTestSessionAsync(
-                sources,
-                runSettings,
-                options,
-                eventsHandler,
-                testHostLauncher).ConfigureAwait(false);
-
-            return (testSessionInfo != null)
-                ? new TestSession(
-                    testSessionInfo,
-                    eventsHandler,
-                    this)
-                : null;
-        }
+        await EnsureInitializedAsync().ConfigureAwait(false);
 
-        /// <inheritdoc/>
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task<bool> StopTestSessionAsync(
-            TestSessionInfo testSessionInfo,
-            ITestSessionEventsHandler eventsHandler)
-        {
-            this.testPlatformEventSource.TranslationLayerStopTestSessionStart();
+        var testSessionInfo = await _requestSender.StartTestSessionAsync(
+            sources,
+            runSettings,
+            options,
+            eventsHandler,
+            testHostLauncher).ConfigureAwait(false);
 
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            return await this.requestSender.StopTestSessionAsync(
+        return testSessionInfo != null
+            ? new TestSession(
                 testSessionInfo,
-                eventsHandler).ConfigureAwait(false);
-        }
+                eventsHandler,
+                this)
+            : null;
+    }
 
-        /// <inheritdoc/>
-        public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditionalExtensions)
-        {
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            this.pathToAdditionalExtensions = pathToAdditionalExtensions.ToList();
-            this.requestSender.InitializeExtensions(this.pathToAdditionalExtensions);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StopTestSessionAsync(
+            testSessionInfo,
+            options: null,
+            eventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            ITestDiscoveryEventsHandler discoveryEventsHandler)
-        {
-            await this.DiscoverTestsAsync(
-                    sources,
-                    discoverySettings,
-                    options: null,
-                    discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler))
-                .ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerStopTestSessionStart();
 
-        /// <inheritdoc/>
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            await this.DiscoverTestsAsync(
-                sources,
-                discoverySettings,
-                options,
-                testSessionInfo: null,
-                discoveryEventsHandler).ConfigureAwait(false);
-        }
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        return await _requestSender.StopTestSessionAsync(
+            testSessionInfo,
+            options,
+            eventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task DiscoverTestsAsync(
-            IEnumerable<string> sources,
-            string discoverySettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestDiscoveryEventsHandler2 discoveryEventsHandler)
-        {
-            this.testPlatformEventSource.TranslationLayerDiscoveryStart();
+    /// <inheritdoc/>
+    public async Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        _pathToAdditionalExtensions = pathToAdditionalExtensions.ToList();
+        _requestSender.InitializeExtensions(_pathToAdditionalExtensions);
+    }
 
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await this.requestSender.DiscoverTestsAsync(
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        await DiscoverTestsAsync(
                 sources,
                 discoverySettings,
-                options,
-                testSessionInfo,
-                discoveryEventsHandler).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                sources,
-                runSettings,
                 options: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+                discoveryEventsHandler: new DiscoveryEventsHandleConverter(discoveryEventsHandler))
+            .ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        await DiscoverTestsAsync(
+            sources,
+            discoverySettings,
+            options,
+            testSessionInfo: null,
+            discoveryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            var sourceList = sources.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                0,
-                sourceList.Count,
-                0,
-                runSettings ?? string.Empty);
-
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await this.requestSender.StartTestRunAsync(
-                sourceList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerDiscoveryStart();
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.DiscoverTestsAsync(
+            sources,
+            discoverySettings,
+            options,
+            testSessionInfo,
+            discoveryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            await this.RunTestsAsync(
-                testCases,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler)
-        {
-            var testCaseList = testCases.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                0,
-                0,
-                testCaseList.Count,
-                runSettings ?? string.Empty);
-
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await this.requestSender.StartTestRunAsync(
-                testCaseList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler()).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                sources,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            sourceList.Count,
+            0,
+            runSettings ?? string.Empty);
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.StartTestRunAsync(
+            sourceList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                sources,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<string> sources,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            var sourceList = sources.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                1,
-                sourceList.Count,
-                0,
-                runSettings ?? string.Empty);
-
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await this.requestSender.StartTestRunWithCustomHostAsync(
-                sourceList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                testCases,
-                runSettings,
-                options: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler()).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            await this.RunTestsWithCustomTestHostAsync(
-                testCases,
-                runSettings,
-                options,
-                testSessionInfo: null,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.StartTestRunAsync(
+            testCaseList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task RunTestsWithCustomTestHostAsync(
-            IEnumerable<TestCase> testCases,
-            string runSettings,
-            TestPlatformOptions options,
-            TestSessionInfo testSessionInfo,
-            ITestRunEventsHandler testRunEventsHandler,
-            ITestHostLauncher customTestHostLauncher)
-        {
-            var testCaseList = testCases.ToList();
-            this.testPlatformEventSource.TranslationLayerExecutionStart(
-                1,
-                0,
-                testCaseList.Count,
-                runSettings ?? string.Empty);
-
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await this.requestSender.StartTestRunWithCustomHostAsync(
-                testCaseList,
-                runSettings,
-                options,
-                testSessionInfo,
-                testRunEventsHandler,
-                customTestHostLauncher).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
 
-        /// <inheritdoc/>
-        public async Task ProcessTestRunAttachmentsAsync(
-            IEnumerable<AttachmentSet> attachments,
-            string processingSettings,
-            bool isLastBatch,
-            bool collectMetrics,
-            ITestRunAttachmentsProcessingEventsHandler testSessionEventsHandler,
-            CancellationToken cancellationToken)
-        {
-            this.testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStart();
-
-            await this.EnsureInitializedAsync().ConfigureAwait(false);
-            await requestSender.ProcessTestRunAttachmentsAsync(
-                attachments,
-                collectMetrics,
-                testSessionEventsHandler,
-                cancellationToken).ConfigureAwait(false);
-        }
-        #endregion
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            sourceList.Count,
+            0,
+            runSettings ?? string.Empty);
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.StartTestRunWithCustomHostAsync(
+            sourceList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            new NoOpTelemetryEventsHandler(),
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.StartTestRunWithCustomHostAsync(
+            testCaseList,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            telemetryEventsHandler,
+            customTestHostLauncher).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler testSessionEventsHandler,
+        CancellationToken cancellationToken)
+    {
+        _testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStart();
+
+        await EnsureInitializedAsync().ConfigureAwait(false);
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            attachments,
+            invokedDataCollectors,
+            processingSettings,
+            collectMetrics,
+            testSessionEventsHandler,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler testSessionEventsHandler,
+        CancellationToken cancellationToken)
+        => ProcessTestRunAttachmentsAsync(attachments, [], processingSettings, isLastBatch, collectMetrics, testSessionEventsHandler, cancellationToken);
 
-        private void EnsureInitialized()
+    #endregion
+
+    private void EnsureInitialized()
+    {
+        if (!_vstestConsoleProcessManager.IsProcessInitialized())
         {
-            if (!this.vstestConsoleProcessManager.IsProcessInitialized())
-            {
-                EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Process is not started.");
-                this.StartSession();
-                this.sessionStarted = this.WaitForConnection();
-
-                if (this.sessionStarted)
-                {
-                    EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Send a request to initialize extensions.");
-                    this.requestSender.InitializeExtensions(this.pathToAdditionalExtensions);
-                }
-            }
+            EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Process is not started.");
+            StartSession();
+            _sessionStarted = WaitForConnection();
 
-            if (!this.sessionStarted && this.requestSender != null)
+            if (_sessionStarted)
             {
-                EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Process Started.");
-                this.sessionStarted = this.WaitForConnection();
+                EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Send a request to initialize extensions.");
+                _requestSender.InitializeExtensions(_pathToAdditionalExtensions);
             }
         }
 
-        private async Task EnsureInitializedAsync()
+        if (!_sessionStarted && _requestSender != null)
         {
-            if (!this.vstestConsoleProcessManager.IsProcessInitialized())
-            {
-                EqtTrace.Info("VsTestConsoleWrapper.EnsureInitializedAsync: Process is not started.");
-                await this.StartSessionAsync().ConfigureAwait(false);
-
-                EqtTrace.Info("VsTestConsoleWrapper.EnsureInitializedAsync: Send a request to initialize extensions.");
-                this.requestSender.InitializeExtensions(this.pathToAdditionalExtensions);
-            }
+            EqtTrace.Info("VsTestConsoleWrapper.EnsureInitialized: Process Started.");
+            _sessionStarted = WaitForConnection();
         }
+    }
 
-        private bool WaitForConnection()
+    private async Task EnsureInitializedAsync()
+    {
+        if (!_vstestConsoleProcessManager.IsProcessInitialized())
         {
-            EqtTrace.Info("VsTestConsoleWrapper.WaitForConnection: Waiting for connection to command line runner.");
+            EqtTrace.Info("VsTestConsoleWrapper.EnsureInitializedAsync: Process is not started.");
+            await StartSessionAsync().ConfigureAwait(false);
 
-            var timeout = EnvironmentHelper.GetConnectionTimeout();
-            if (!this.requestSender.WaitForRequestHandlerConnection(timeout * 1000))
-            {
-                var processName = this.processHelper.GetCurrentProcessFileName();
-                throw new TransationLayerException(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                        processName,
-                        CoreUtilitiesConstants.VstestConsoleProcessName,
-                        timeout,
-                        EnvironmentHelper.VstestConnectionTimeout)
-                    );
-            }
+            EqtTrace.Info("VsTestConsoleWrapper.EnsureInitializedAsync: Send a request to initialize extensions.");
+            _requestSender.InitializeExtensions(_pathToAdditionalExtensions);
+        }
+    }
+
+    private bool WaitForConnection()
+    {
+        EqtTrace.Info("VsTestConsoleWrapper.WaitForConnection: Waiting for connection to command line runner.");
 
-            this.testPlatformEventSource.TranslationLayerInitializeStop();
-            return true;
+        var timeout = EnvironmentHelper.GetConnectionTimeout();
+        if (!_requestSender.WaitForRequestHandlerConnection(timeout * 1000))
+        {
+            var processName = _processHelper.GetCurrentProcessFileName();
+            throw new TransationLayerException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                    processName,
+                    CoreUtilitiesConstants.VstestConsoleProcessName,
+                    timeout,
+                    EnvironmentHelper.VstestConnectionTimeout)
+            );
         }
+
+        _testPlatformEventSource.TranslationLayerInitializeStop();
+        return true;
     }
 }
diff --git a/src/SettingsMigrator/Migrator.cs b/src/SettingsMigrator/Migrator.cs
index d558d52d17..e2edb5c224 100644
--- a/src/SettingsMigrator/Migrator.cs
+++ b/src/SettingsMigrator/Migrator.cs
@@ -1,396 +1,423 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+
+using SettingsMigrator;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
+
+/// <summary>
+/// Migrator used to migrate test settings and run settings with embedded testsettings to run settings.
+/// </summary>
+public class Migrator
 {
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
-    using CommandLineResources = Resources.Resources;
+    private const string TestTimeoutAttributeName = "testTimeout";
 
-    /// <summary>
-    /// Migrator used to migrate test settings and run settings with embedded testsettings to run settings.
-    /// </summary>
-    public class Migrator
-    {
-        private const string TestTimeoutAttributeName = "testTimeout";
+    private const string ParallelTestCountAttributeName = "parallelTestCount";
 
-        private const string ParallelTestCountAttributeName = "parallelTestCount";
+    private const string HostProcessPlatformAttributeName = "hostProcessPlatform";
 
-        private const string HostProcessPlatformAttributeName = "hostProcessPlatform";
+    private const string RunTimeoutAttributeName = "runTimeout";
 
-        private const string RunTimeoutAttributeName = "runTimeout";
+    private const string LegacySettingsNodeName = "LegacySettings";
 
-        private const string LegacySettingsNodeName = "LegacySettings";
+    private const string MSTestNodeName = "MSTest";
 
-        private const string MSTestNodeName = "MSTest";
+    private const string ForcedLegacyModeName = "ForcedLegacyMode";
 
-        private const string ForcedLegacyModeName = "ForcedLegacyMode";
+    private const string ExecutionNodeName = "Execution";
 
-        private const string ExecutionNodeName = "Execution";
+    private const string TimeoutsNodeName = "Timeouts";
 
-        private const string TimeoutsNodeName = "Timeouts";
+    private const string TestTypeSpecificNodeName = "TestTypeSpecific";
 
-        private const string TestTypeSpecificNodeName = "TestTypeSpecific";
+    private const string RunConfigurationNodeName = "RunConfiguration";
 
-        private const string RunConfigurationNodeName = "RunConfiguration";
+    private const string TestSessionTimeoutNodeName = "TestSessionTimeout";
 
-        private const string TestSessionTimeoutNodeName = "TestSessionTimeout";
+    private const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
 
-        private const string DataCollectionRunSettingsNodeName = "DataCollectionRunSettings";
+    private const string DataCollectorsNodeName = "DataCollectors";
 
-        private const string DataCollectorsNodeName = "DataCollectors";
+    private const string SampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                                                    "<RunSettings></RunSettings>";
 
-        private const string SampleRunSettingsContent = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-                                                "<RunSettings></RunSettings>";
+    private const string AgentNotRespondingTimeoutAttribute = "agentNotRespondingTimeout";
 
-        private const string AgentNotRespondingTimeoutAttribute = "agentNotRespondingTimeout";
+    private const string DeploymentTimeoutAttribute = "deploymentTimeout";
 
-        private const string DeploymentTimeoutAttribute = "deploymentTimeout";
+    private const string ScriptTimeoutAttribute = "scriptTimeout";
 
-        private const string ScriptTimeoutAttribute = "scriptTimeout";
+    private const string TestSettingsExtension = ".testsettings";
 
-        private const string TestSettingsExtension = ".testsettings";
+    private const string RunSettingsExtension = ".runsettings";
 
-        private const string RunSettingsExtension = ".runsettings";
+    /// <summary>
+    /// Migrates the nodes from given settings to run settings format.
+    /// </summary>
+    /// <param name="oldFilePath">Path to old file</param>
+    /// <param name="newFilePath">Path to new file</param>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public void Migrate(string oldFilePath, string newFilePath)
+    {
+        if (!Path.IsPathRooted(oldFilePath))
+        {
+            Console.WriteLine(CommandLineResources.ValidUsage);
+        }
 
-        /// <summary>
-        /// Migrates the nodes from given settings to run settings format.
-        /// </summary>
-        /// <param name="oldFilePath">Path to old file</param>
-        /// <param name="newFilePath">Path to new file</param>
-        public void Migrate(string oldFilePath, string newFilePath)
+        if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension, StringComparison.OrdinalIgnoreCase))
         {
-            if (!Path.IsPathRooted(oldFilePath))
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-            }
+            MigrateTestSettings(oldFilePath, newFilePath);
+        }
+        else if (string.Equals(Path.GetExtension(oldFilePath), RunSettingsExtension, StringComparison.OrdinalIgnoreCase))
+        {
+            MigrateRunSettings(oldFilePath, newFilePath);
+        }
+        else
+        {
+            Console.WriteLine(CommandLineResources.ValidUsage);
+        }
+    }
 
-            if (string.Equals(Path.GetExtension(oldFilePath), TestSettingsExtension, StringComparison.OrdinalIgnoreCase))
-            {
-                this.MigrateTestSettings(oldFilePath, newFilePath);
-            }
-            else if (string.Equals(Path.GetExtension(oldFilePath), RunSettingsExtension, StringComparison.OrdinalIgnoreCase))
-            {
-                this.MigrateRunSettings(oldFilePath, newFilePath);
-            }
-            else
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-            }
+    /// <summary>
+    /// Given a runSettings with an embedded testSettings, converts it to runSettings.
+    /// </summary>
+    /// <param name="oldRunSettingsPath"> Path to old runsettings.</param>
+    /// <param name="newRunSettingsPath">Path to new runsettings.</param>
+    private static void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
+    {
+        string? testSettingsPath = null;
+        using XmlTextReader reader = new(oldRunSettingsPath);
+        reader.Namespaces = false;
+
+        var runSettingsXmlDoc = new XmlDocument();
+        runSettingsXmlDoc.Load(reader);
+        var root = runSettingsXmlDoc.DocumentElement;
+
+        var testSettingsNode = root?.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+        if (testSettingsNode != null)
+        {
+            testSettingsPath = testSettingsNode.InnerText;
         }
 
-        /// <summary>
-        /// Given a runSettings with an embedded testSettings, converts it to runSettings.
-        /// </summary>
-        /// <param name="oldRunSettingsPath"> Path to old runsettings.</param>
-        /// <param name="newRunSettingsPath">Path to new runsettings.</param>
-        private void MigrateRunSettings(string oldRunSettingsPath, string newRunSettingsPath)
+        if (!testSettingsPath.IsNullOrWhiteSpace())
         {
-            string testSettingsPath = null;
-            using (XmlTextReader reader = new XmlTextReader(oldRunSettingsPath))
+            // Expand path relative to runSettings location.
+            if (!Path.IsPathRooted(testSettingsPath))
             {
-                reader.Namespaces = false;
-
-                var runSettingsXmlDoc = new XmlDocument();
-                runSettingsXmlDoc.Load(reader);
-                var root = runSettingsXmlDoc.DocumentElement;
-
-                var testSettingsNode = root.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-
-                if (testSettingsNode != null)
-                {
-                    testSettingsPath = testSettingsNode.InnerText;
-                }
-
-                if (!string.IsNullOrWhiteSpace(testSettingsPath))
-                {
-                    // Expand path relative to runSettings location.
-                    if (!Path.IsPathRooted(testSettingsPath))
-                    {
-                        testSettingsPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(oldRunSettingsPath), testSettingsPath));
-                    }
-
-                    // Remove the embedded testSettings node if it exists.
-                    this.RemoveEmbeddedTestSettings(runSettingsXmlDoc);
-
-                    this.MigrateTestSettingsNodesToRunSettings(testSettingsPath, runSettingsXmlDoc);
-
-                    runSettingsXmlDoc.Save(newRunSettingsPath);
-                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.RunSettingsCreated, newRunSettingsPath));
-                }
-                else
-                {
-                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoEmbeddedSettings));
-                }
+                testSettingsPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(oldRunSettingsPath)!, testSettingsPath));
             }
-        }
 
-        /// <summary>
-        /// Given a testSettings, converts it to runSettings.
-        /// </summary>
-        /// <param name="oldTestSettingsPath">Path to old testsettings.</param>
-        /// <param name="newRunSettingsPath">Path to new runsettings.</param>
-        private void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
-        {
-            var runSettingsXmlDoc = new XmlDocument();
-            runSettingsXmlDoc.LoadXml(SampleRunSettingsContent);
+            // Remove the embedded testSettings node if it exists.
+            RemoveEmbeddedTestSettings(runSettingsXmlDoc);
 
-            this.MigrateTestSettingsNodesToRunSettings(oldTestSettingsPath, runSettingsXmlDoc);
+            MigrateTestSettingsNodesToRunSettings(testSettingsPath, runSettingsXmlDoc);
 
             runSettingsXmlDoc.Save(newRunSettingsPath);
             Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.RunSettingsCreated, newRunSettingsPath));
         }
-
-        /// <summary>
-        /// Given a testSettings, converts it to runSettings
-        /// </summary>
-        /// <param name="testSettingsPath">Path to test settings</param>
-        /// <param name="runSettingsXmlDoc">Runsettings Xml</param>
-        private void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
+        else
         {
-            var testSettingsNodes = this.ReadTestSettingsNodes(testSettingsPath);
+            Console.WriteLine(CommandLineResources.NoEmbeddedSettings);
+        }
+    }
 
-            string testTimeout = null;
-            if (testSettingsNodes.Timeout != null && testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName] != null)
-            {
-                testTimeout = testSettingsNodes.Timeout.Attributes[TestTimeoutAttributeName].Value;
-            }
+    /// <summary>
+    /// Given a testSettings, converts it to runSettings.
+    /// </summary>
+    /// <param name="oldTestSettingsPath">Path to old testsettings.</param>
+    /// <param name="newRunSettingsPath">Path to new runsettings.</param>
+    private static void MigrateTestSettings(string oldTestSettingsPath, string newRunSettingsPath)
+    {
+        var runSettingsXmlDoc = new XmlDocument();
+        runSettingsXmlDoc.LoadXml(SampleRunSettingsContent);
 
-            string runTimeout = null;
-            if (testSettingsNodes.Timeout != null && testSettingsNodes.Timeout.Attributes[RunTimeoutAttributeName] != null)
+        MigrateTestSettingsNodesToRunSettings(oldTestSettingsPath, runSettingsXmlDoc);
+
+        runSettingsXmlDoc.Save(newRunSettingsPath);
+        Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.RunSettingsCreated, newRunSettingsPath));
+    }
+
+    /// <summary>
+    /// Given a testSettings, converts it to runSettings
+    /// </summary>
+    /// <param name="testSettingsPath">Path to test settings</param>
+    /// <param name="runSettingsXmlDoc">Runsettings Xml</param>
+    private static void MigrateTestSettingsNodesToRunSettings(string testSettingsPath, XmlDocument runSettingsXmlDoc)
+    {
+        TestSettingsNodes testSettingsNodes = ReadTestSettingsNodes(testSettingsPath);
+
+        string? testTimeout = null;
+        string? runTimeout = null;
+        if (testSettingsNodes.Timeout is not null)
+        {
+            if (testSettingsNodes.Timeout.Attributes?[TestTimeoutAttributeName] is XmlAttribute testTimeoutAttribute)
             {
-                runTimeout = testSettingsNodes.Timeout.Attributes[RunTimeoutAttributeName].Value;
+                testTimeout = testTimeoutAttribute.Value;
             }
 
-            string parallelTestCount = null;
-            if (testSettingsNodes.Execution != null && testSettingsNodes.Execution.Attributes[ParallelTestCountAttributeName] != null)
+            if (testSettingsNodes.Timeout.Attributes?[RunTimeoutAttributeName] is XmlAttribute runTimeoutAttribute)
             {
-                parallelTestCount = testSettingsNodes.Execution.Attributes[ParallelTestCountAttributeName].Value;
+                runTimeout = runTimeoutAttribute.Value;
             }
+        }
 
-            string hostProcessPlatform = null;
-            if (testSettingsNodes.Execution != null && testSettingsNodes.Execution.Attributes[HostProcessPlatformAttributeName] != null)
+        string? parallelTestCount = null;
+        string? hostProcessPlatform = null;
+        if (testSettingsNodes.Execution is not null)
+        {
+            if (testSettingsNodes.Execution.Attributes?[ParallelTestCountAttributeName] is XmlAttribute parallelTestCountAttribute)
             {
-                hostProcessPlatform = testSettingsNodes.Execution.Attributes[HostProcessPlatformAttributeName].Value;
+                parallelTestCount = parallelTestCountAttribute.Value;
             }
 
-            // WebTestRunConfiguration node.
-            if (testSettingsNodes.WebSettings != null)
+            if (testSettingsNodes.Execution.Attributes?[HostProcessPlatformAttributeName] is XmlAttribute hostProcessPlatformAttribute)
             {
-                runSettingsXmlDoc.DocumentElement.AppendChild(runSettingsXmlDoc.ImportNode(testSettingsNodes.WebSettings, deep: true));
+                hostProcessPlatform = hostProcessPlatformAttribute.Value;
             }
+        }
 
-            // LegacySettings node.
-            this.AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, hostProcessPlatform, runSettingsXmlDoc);
+        // WebTestRunConfiguration node.
+        if (testSettingsNodes.WebSettings != null)
+        {
+            runSettingsXmlDoc.DocumentElement?.AppendChild(runSettingsXmlDoc.ImportNode(testSettingsNodes.WebSettings, deep: true));
+        }
 
-            // TestSessionTimeout node.
-            if (!string.IsNullOrEmpty(runTimeout))
-            {
-                this.AddRunTimeoutNode(runTimeout, runSettingsXmlDoc);
-            }
+        // LegacySettings node.
+        AddLegacyNodes(testSettingsNodes, testTimeout, parallelTestCount, hostProcessPlatform, runSettingsXmlDoc);
 
-            // DataCollectors node.
-            if (testSettingsNodes.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
-            {
-                this.AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc);
-            }
+        // TestSessionTimeout node.
+        if (!runTimeout.IsNullOrEmpty())
+        {
+            AddRunTimeoutNode(runTimeout, runSettingsXmlDoc!);
         }
 
-        private TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
+        // DataCollectors node.
+        if (testSettingsNodes?.Datacollectors != null && testSettingsNodes.Datacollectors.Count > 0)
         {
-            var testSettingsNodes = new TestSettingsNodes();
+            AddDataCollectorNodes(testSettingsNodes.Datacollectors, runSettingsXmlDoc);
+        }
+    }
 
-            using (XmlTextReader reader = new XmlTextReader(testSettingsPath))
+    private static TestSettingsNodes ReadTestSettingsNodes(string testSettingsPath)
+    {
+        TestSettingsNodes testSettingsNodes = new();
+
+        using (XmlTextReader reader = new(testSettingsPath))
+        {
+            reader.Namespaces = false;
+
+            var testSettingsXmlDoc = new XmlDocument();
+            testSettingsXmlDoc.Load(reader);
+            var testSettingsRoot = testSettingsXmlDoc.DocumentElement!;
+
+            // Select the interesting nodes from the xml.
+            testSettingsNodes.Deployment = testSettingsRoot.SelectSingleNode(@"/TestSettings/Deployment");
+            testSettingsNodes.Script = testSettingsRoot.SelectSingleNode(@"/TestSettings/Scripts");
+            testSettingsNodes.WebSettings = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
+            testSettingsNodes.Datacollectors = testSettingsRoot.SelectNodes(@"/TestSettings/Execution/AgentRule/DataCollectors/DataCollector");
+            testSettingsNodes.Timeout = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
+            testSettingsNodes.UnitTestConfig = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
+            testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
+            testSettingsNodes.Execution = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution");
+
+            if (testSettingsNodes.Timeout != null
+                && (testSettingsNodes.Timeout.Attributes?[AgentNotRespondingTimeoutAttribute] != null
+                    || testSettingsNodes.Timeout.Attributes?[DeploymentTimeoutAttribute] != null
+                    || testSettingsNodes.Timeout.Attributes?[ScriptTimeoutAttribute] != null))
             {
-                reader.Namespaces = false;
-
-                var testSettingsXmlDoc = new XmlDocument();
-                testSettingsXmlDoc.Load(reader);
-                var testSettingsRoot = testSettingsXmlDoc.DocumentElement;
-
-                // Select the interesting nodes from the xml.
-                testSettingsNodes.Deployment = testSettingsRoot.SelectSingleNode(@"/TestSettings/Deployment");
-                testSettingsNodes.Script = testSettingsRoot.SelectSingleNode(@"/TestSettings/Scripts");
-                testSettingsNodes.WebSettings = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/WebTestRunConfiguration");
-                testSettingsNodes.Datacollectors = testSettingsRoot.SelectNodes(@"/TestSettings/Execution/AgentRule/DataCollectors/DataCollector");
-                testSettingsNodes.Timeout = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Timeouts");
-                testSettingsNodes.UnitTestConfig = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/TestTypeSpecific/UnitTestRunConfig");
-                testSettingsNodes.Hosts = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution/Hosts");
-                testSettingsNodes.Execution = testSettingsRoot.SelectSingleNode(@"/TestSettings/Execution");
-
-                if (testSettingsNodes.Timeout != null && (testSettingsNodes.Timeout.Attributes[AgentNotRespondingTimeoutAttribute] != null ||
-                    testSettingsNodes.Timeout.Attributes[DeploymentTimeoutAttribute] != null || testSettingsNodes.Timeout.Attributes[ScriptTimeoutAttribute] != null))
-                {
-                    Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UnsupportedAttributes));
-                }
+                Console.WriteLine(CommandLineResources.UnsupportedAttributes);
             }
+        }
 
-            return testSettingsNodes;
+        return testSettingsNodes!;
+    }
+
+    /// <summary>
+    /// Removes the embedded testSettings node if present.
+    /// </summary>
+    /// <param name="newXmlDoc">Xml doc to process</param>
+    private static void RemoveEmbeddedTestSettings(XmlDocument newXmlDoc)
+    {
+        var testSettingsNode = newXmlDoc.DocumentElement?.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+        if (testSettingsNode != null)
+        {
+            testSettingsNode.ParentNode?.RemoveChild(testSettingsNode);
         }
+    }
 
-        /// <summary>
-        /// Removes the embedded testSettings node if present.
-        /// </summary>
-        /// <param name="newXmlDoc">Xml doc to process</param>
-        private void RemoveEmbeddedTestSettings(XmlDocument newXmlDoc)
+    /// <summary>
+    /// Adds the legacy nodes to runSettings xml.
+    /// </summary>
+    /// <param name="testSettingsNodes">testSettingsNodes</param>
+    /// <param name="testTimeout">testTimeout</param>
+    /// <param name="parallelTestCount">parallelTestCount</param>
+    /// <param name="hostProcessPlatform">hostProcessPlatform</param>
+    /// <param name="newXmlDoc">newXmlDoc</param>
+    private static void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string? testTimeout, string? parallelTestCount, string? hostProcessPlatform, XmlDocument newXmlDoc)
+    {
+        if (testSettingsNodes.Deployment == null
+            && testSettingsNodes.Script == null
+            && testSettingsNodes.UnitTestConfig == null
+            && parallelTestCount.IsNullOrEmpty()
+            && testTimeout.IsNullOrEmpty()
+            && hostProcessPlatform.IsNullOrEmpty()
+            && testSettingsNodes.Hosts == null)
         {
-            var testSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-            if (testSettingsNode != null)
-            {
-                testSettingsNode.ParentNode.RemoveChild(testSettingsNode);
-            }
+            return;
         }
 
-        /// <summary>
-        /// Adds the legacy nodes to runSettings xml.
-        /// </summary>
-        /// <param name="testSettingsNodes">testSettingsNodes</param>
-        /// <param name="testTimeout">testTimeout</param>
-        /// <param name="parallelTestCount">parallelTestCount</param>
-        /// <param name="hostProcessPlatform">hostProcessPlatform</param>
-        /// <param name="newXmlDoc">newXmlDoc</param>
-        private void AddLegacyNodes(TestSettingsNodes testSettingsNodes, string testTimeout, string parallelTestCount, string hostProcessPlatform, XmlDocument newXmlDoc)
+        if (newXmlDoc.DocumentElement == null)
         {
-            if (testSettingsNodes.Deployment == null && testSettingsNodes.Script == null && testSettingsNodes.UnitTestConfig == null &&
-                string.IsNullOrEmpty(parallelTestCount) && string.IsNullOrEmpty(testTimeout) && string.IsNullOrEmpty(hostProcessPlatform) && testSettingsNodes.Hosts == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            // Add ForcedLegacy node.
-            var mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
-            XmlNode forcedLegacyNode;
-            if (mstestNode == null)
-            {
-                mstestNode = newXmlDoc.CreateNode(XmlNodeType.Element, MSTestNodeName, null);
-                newXmlDoc.DocumentElement.AppendChild(mstestNode);
-                mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
-            }
+        // Add ForcedLegacy node.
+        var mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
+        if (mstestNode == null)
+        {
+            mstestNode = newXmlDoc.CreateNode(XmlNodeType.Element, MSTestNodeName, null);
+            newXmlDoc.DocumentElement.AppendChild(mstestNode);
+            mstestNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest");
+        }
 
-            forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
-            if (forcedLegacyNode == null)
-            {
-                forcedLegacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, ForcedLegacyModeName, null);
-                mstestNode.AppendChild(newXmlDoc.ImportNode(forcedLegacyNode, deep: true));
-                forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
-            }
+        if (mstestNode == null)
+        {
+            return;
+        }
 
-            forcedLegacyNode.InnerText = "true";
+        var forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
+        if (forcedLegacyNode == null)
+        {
+            forcedLegacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, ForcedLegacyModeName, null);
+            mstestNode.AppendChild(newXmlDoc.ImportNode(forcedLegacyNode, deep: true));
+            forcedLegacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode")!;
+        }
 
-            // Remove if the legacy node already exists.
-            var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
-            if (legacyNode != null)
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.IgnoringLegacySettings));
-                legacyNode.ParentNode.RemoveChild(legacyNode);
-            }
+        forcedLegacyNode.InnerText = "true";
 
-            legacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, LegacySettingsNodeName, null);
+        // Remove if the legacy node already exists.
+        var legacyNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/LegacySettings");
+        if (legacyNode?.ParentNode != null)
+        {
+            Console.WriteLine(CommandLineResources.IgnoringLegacySettings);
+            legacyNode.ParentNode.RemoveChild(legacyNode);
+        }
 
-            if (testSettingsNodes.Deployment != null)
-            {
-                legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Deployment, deep: true));
-            }
+        legacyNode = newXmlDoc.CreateNode(XmlNodeType.Element, LegacySettingsNodeName, null);
 
-            if (testSettingsNodes.Script != null)
+        if (testSettingsNodes.Deployment != null)
+        {
+            legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Deployment, deep: true));
+        }
+
+        if (testSettingsNodes.Script != null)
+        {
+            legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Script, deep: true));
+        }
+
+        // Execution node.
+        if (testSettingsNodes.UnitTestConfig != null || !parallelTestCount.IsNullOrEmpty() || !testTimeout.IsNullOrEmpty() || testSettingsNodes.Hosts != null)
+        {
+            XmlNode newExecutionNode = newXmlDoc.CreateNode(XmlNodeType.Element, ExecutionNodeName, null);
+
+            if (!parallelTestCount.IsNullOrEmpty())
             {
-                legacyNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Script, deep: true));
+                var parallelAttribute = newXmlDoc.CreateAttribute(ParallelTestCountAttributeName);
+                parallelAttribute.Value = parallelTestCount;
+                newExecutionNode.Attributes?.Append(parallelAttribute);
             }
 
-            // Execution node.
-            if (testSettingsNodes.UnitTestConfig != null || !string.IsNullOrEmpty(parallelTestCount) || !string.IsNullOrEmpty(testTimeout) || testSettingsNodes.Hosts != null)
+            if (!hostProcessPlatform.IsNullOrEmpty())
             {
-                var newExecutionNode = newXmlDoc.CreateNode(XmlNodeType.Element, ExecutionNodeName, null);
-
-                if (!string.IsNullOrEmpty(parallelTestCount))
-                {
-                    var paralellAttribute = newXmlDoc.CreateAttribute(ParallelTestCountAttributeName);
-                    paralellAttribute.Value = parallelTestCount;
-                    newExecutionNode.Attributes.Append(paralellAttribute);
-                }
-
-                if (!string.IsNullOrEmpty(hostProcessPlatform))
-                {
-                    var hostProcessPlatformAttribute = newXmlDoc.CreateAttribute(HostProcessPlatformAttributeName);
-                    hostProcessPlatformAttribute.Value = hostProcessPlatform;
-                    newExecutionNode.Attributes.Append(hostProcessPlatformAttribute);
-                }
-
-                if (!string.IsNullOrEmpty(testTimeout))
-                {
-                    var newTimeoutsNode = newXmlDoc.CreateNode(XmlNodeType.Element, TimeoutsNodeName, null);
-                    var testtimeoutattribute = newXmlDoc.CreateAttribute(TestTimeoutAttributeName);
-                    testtimeoutattribute.Value = testTimeout;
-                    newTimeoutsNode.Attributes.Append(testtimeoutattribute);
-                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(newTimeoutsNode, deep: true));
-                }
-
-                if (testSettingsNodes.Hosts != null)
-                {
-                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Hosts, deep: true));
-                }
-
-                if (testSettingsNodes.UnitTestConfig != null)
-                {
-                    var testTypeSpecificNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestTypeSpecificNodeName, null);
-                    testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.UnitTestConfig, deep: true));
-                    newExecutionNode.AppendChild(newXmlDoc.ImportNode(testTypeSpecificNode, deep: true));
-                }
-
-                legacyNode.AppendChild(newXmlDoc.ImportNode(newExecutionNode, deep: true));
+                var hostProcessPlatformAttribute = newXmlDoc.CreateAttribute(HostProcessPlatformAttributeName);
+                hostProcessPlatformAttribute.Value = hostProcessPlatform;
+                newExecutionNode.Attributes?.Append(hostProcessPlatformAttribute);
             }
 
-            newXmlDoc.DocumentElement.AppendChild(legacyNode);
-        }
-
-        /// <summary>
-        /// Adds the datacollector nodes to the runSettings xml.
-        /// </summary>
-        /// <param name="oldDatacollectorNodes"> Datacollector Nodes</param>
-        /// <param name="newXmlDoc">Xml doc to process</param>
-        private void AddDataCollectorNodes(XmlNodeList oldDatacollectorNodes, XmlDocument newXmlDoc)
-        {
-            var dataCollectionRunSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings");
-            if (dataCollectionRunSettingsNode == null)
+            if (!testTimeout.IsNullOrEmpty())
             {
-                dataCollectionRunSettingsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectionRunSettingsNodeName, null);
+                var newTimeoutsNode = newXmlDoc.CreateNode(XmlNodeType.Element, TimeoutsNodeName, null);
+                var testTimeoutAttribute = newXmlDoc.CreateAttribute(TestTimeoutAttributeName);
+                testTimeoutAttribute.Value = testTimeout;
+                newTimeoutsNode.Attributes?.Append(testTimeoutAttribute);
+                newExecutionNode.AppendChild(newXmlDoc.ImportNode(newTimeoutsNode, deep: true));
             }
 
-            var dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
-            if (dataCollectorsNode == null)
+            if (testSettingsNodes.Hosts != null)
             {
-                dataCollectorsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectorsNodeName, null);
-                dataCollectionRunSettingsNode.AppendChild(newXmlDoc.ImportNode(dataCollectorsNode, deep: true));
-                newXmlDoc.DocumentElement.AppendChild(dataCollectionRunSettingsNode);
-                dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
+                newExecutionNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.Hosts, deep: true));
             }
 
-            foreach (XmlNode datacollector in oldDatacollectorNodes)
+            if (testSettingsNodes.UnitTestConfig != null)
             {
-                dataCollectorsNode.AppendChild(newXmlDoc.ImportNode(datacollector, deep: true));
+                var testTypeSpecificNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestTypeSpecificNodeName, null);
+                testTypeSpecificNode.AppendChild(newXmlDoc.ImportNode(testSettingsNodes.UnitTestConfig, deep: true));
+                newExecutionNode.AppendChild(newXmlDoc.ImportNode(testTypeSpecificNode, deep: true));
             }
+
+            legacyNode.AppendChild(newXmlDoc.ImportNode(newExecutionNode, deep: true));
         }
 
-        /// <summary>
-        /// Adds run session timeout node.
-        /// </summary>
-        /// <param name="runTimeout">Run Timeout</param>
-        /// <param name="newXmlDoc">Xml doc to process</param>
-        private void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
+        newXmlDoc.DocumentElement.AppendChild(legacyNode);
+    }
+
+    /// <summary>
+    /// Adds the dataCollector nodes to the runSettings xml.
+    /// </summary>
+    /// <param name="oldDataCollectorNodes"> Datacollector Nodes</param>
+    /// <param name="newXmlDoc">Xml doc to process</param>
+    private static void AddDataCollectorNodes(XmlNodeList oldDataCollectorNodes, XmlDocument? newXmlDoc)
+    {
+        if (newXmlDoc?.DocumentElement == null)
         {
-            var runConfigurationNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/RunConfiguration");
-            if (runConfigurationNode == null)
-            {
-                runConfigurationNode = newXmlDoc.CreateNode(XmlNodeType.Element, RunConfigurationNodeName, null);
-            }
+            return;
+        }
+
+        var dataCollectionRunSettingsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings");
+        dataCollectionRunSettingsNode ??= newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectionRunSettingsNodeName, null);
+
+        var dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors");
+        if (dataCollectorsNode == null)
+        {
+            dataCollectorsNode = newXmlDoc.CreateNode(XmlNodeType.Element, DataCollectorsNodeName, null);
+            dataCollectionRunSettingsNode.AppendChild(newXmlDoc.ImportNode(dataCollectorsNode, deep: true));
+            newXmlDoc.DocumentElement.AppendChild(dataCollectionRunSettingsNode);
+            dataCollectorsNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors")!;
+        }
 
-            var testSessionTimeoutNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestSessionTimeoutNodeName, null);
-            testSessionTimeoutNode.InnerText = runTimeout;
-            runConfigurationNode.AppendChild(newXmlDoc.ImportNode(testSessionTimeoutNode, deep: true));
+        foreach (XmlNode dataCollector in oldDataCollectorNodes)
+        {
+            dataCollectorsNode.AppendChild(newXmlDoc.ImportNode(dataCollector, deep: true));
+        }
+    }
 
-            newXmlDoc.DocumentElement.AppendChild(runConfigurationNode);
+    /// <summary>
+    /// Adds run session timeout node.
+    /// </summary>
+    /// <param name="runTimeout">Run Timeout</param>
+    /// <param name="newXmlDoc">Xml doc to process</param>
+    private static void AddRunTimeoutNode(string runTimeout, XmlDocument newXmlDoc)
+    {
+        if (newXmlDoc.DocumentElement == null)
+        {
+            return;
         }
+
+        var runConfigurationNode = newXmlDoc.DocumentElement.SelectSingleNode(@"/RunSettings/RunConfiguration");
+        runConfigurationNode ??= newXmlDoc.CreateNode(XmlNodeType.Element, RunConfigurationNodeName, null);
+
+        var testSessionTimeoutNode = newXmlDoc.CreateNode(XmlNodeType.Element, TestSessionTimeoutNodeName, null);
+        testSessionTimeoutNode.InnerText = runTimeout;
+        runConfigurationNode.AppendChild(newXmlDoc.ImportNode(testSessionTimeoutNode, deep: true));
+
+        newXmlDoc.DocumentElement.AppendChild(runConfigurationNode);
     }
-}
\ No newline at end of file
+}
diff --git a/src/SettingsMigrator/NullableHelpers.cs b/src/SettingsMigrator/NullableHelpers.cs
new file mode 100644
index 0000000000..08dfce98e4
--- /dev/null
+++ b/src/SettingsMigrator/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace SettingsMigrator;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/SettingsMigrator/NullableHelpers.tt b/src/SettingsMigrator/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/SettingsMigrator/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/SettingsMigrator/PathResolver.cs b/src/SettingsMigrator/PathResolver.cs
index b363428112..cb197a3241 100644
--- a/src/SettingsMigrator/PathResolver.cs
+++ b/src/SettingsMigrator/PathResolver.cs
@@ -1,47 +1,49 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
+
+/// <summary>
+/// Used to resolve the inputs provided by the user to paths needed by migrator.
+/// </summary>
+public class PathResolver
 {
-    using System;
-    using System.IO;
+    private const string RunSettingsExtension = ".runsettings";
 
     /// <summary>
-    /// Used to resolve the inputs provided by the user to paths needed by migrator.
+    /// Gets the target path based on user inputs.
     /// </summary>
-    public class PathResolver
+    /// <param name="args">User inputs</param>
+    /// <returns>New file path to create</returns>
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Part of the public API")]
+    public string? GetTargetPath(string[] args)
     {
-        private const string RunSettingsExtension = ".runsettings";
-
-        /// <summary>
-        /// Gets the target path based on user inputs.
-        /// </summary>
-        /// <param name="args">User inputs</param>
-        /// <returns>New file path to create</returns>
-        public string GetTargetPath(string[] args)
+        string? newFilePath = null;
+        if (args.Length < 1 || !Path.IsPathRooted(args[0]))
         {
-            string newFilePath = null;
-            if (args.Length < 1 || !Path.IsPathRooted(args[0]))
-            {
-                return newFilePath;
-            }
+            return newFilePath;
+        }
 
-            if (args.Length == 1)
-            {
-                var oldFilePath = args[0];
-                var newFileName = string.Concat(Path.GetFileNameWithoutExtension(oldFilePath), "_", DateTime.Now.ToString("MM-dd-yyyy_hh-mm-ss"), RunSettingsExtension);
-                newFilePath = Path.Combine(Path.GetDirectoryName(oldFilePath), newFileName);
-            }
-            else if (args.Length == 2)
+        if (args.Length == 1)
+        {
+            var oldFilePath = args[0];
+            var newFileName = string.Concat(Path.GetFileNameWithoutExtension(oldFilePath), "_", DateTime.Now.ToString("MM-dd-yyyy_hh-mm-ss", CultureInfo.CurrentCulture), RunSettingsExtension);
+            newFilePath = Path.Combine(Path.GetDirectoryName(oldFilePath)!, newFileName);
+        }
+        else if (args.Length == 2)
+        {
+            newFilePath = args[1];
+            if (!Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunSettingsExtension, StringComparison.OrdinalIgnoreCase))
             {
-                newFilePath = args[1];
-                if (!Path.IsPathRooted(newFilePath) || !string.Equals(Path.GetExtension(newFilePath), RunSettingsExtension, StringComparison.OrdinalIgnoreCase))
-                {
-                    newFilePath = null;
-                }
+                newFilePath = null;
             }
-
-            return newFilePath;
         }
+
+        return newFilePath;
     }
-}
\ No newline at end of file
+}
diff --git a/src/SettingsMigrator/Program.cs b/src/SettingsMigrator/Program.cs
index 93218beef7..5b84b735bc 100644
--- a/src/SettingsMigrator/Program.cs
+++ b/src/SettingsMigrator/Program.cs
@@ -1,40 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
-{
-    using System;
-    using System.Globalization;
-    using CommandLineResources = Resources.Resources;
+using System;
+
+using SettingsMigrator;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Resources.Resources;
 
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
+
+/// <summary>
+/// Entry point for SettingsMigrator.
+/// </summary>
+public static class Program
+{
     /// <summary>
-    /// Entry point for SettingsMigrator.
+    /// Main entry point. Hands off execution to Migrator.
     /// </summary>
-    public static class Program
+    /// <param name="args">Arguments on the command line</param>
+    /// <returns>Exit code</returns>
+    public static int Main(string[] args)
     {
-        /// <summary>
-        /// Main entry point. Hands off execution to Migrator.
-        /// </summary>
-        /// <param name="args">Arguments on the command line</param>
-        /// <returns>Exit code</returns>
-        public static int Main(string[] args)
-        {
-            var pathResolver = new PathResolver();
-            string newFilePath = pathResolver.GetTargetPath(args);
+        var pathResolver = new PathResolver();
+        string? newFilePath = pathResolver.GetTargetPath(args);
 
-            if (!string.IsNullOrEmpty(newFilePath))
-            {
-                string oldFilePath = args[0];
-                var migrator = new Migrator();
-                migrator.Migrate(oldFilePath, newFilePath);
-            }
-            else
-            {
-                Console.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ValidUsage));
-                return 1;
-            }
-
-            return 0;
+        if (!newFilePath.IsNullOrEmpty())
+        {
+            string oldFilePath = args[0];
+            var migrator = new Migrator();
+            migrator.Migrate(oldFilePath, newFilePath);
         }
+        else
+        {
+            Console.WriteLine(CommandLineResources.ValidUsage);
+            return 1;
+        }
+
+        return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/SettingsMigrator/Properties/AssemblyInfo.cs b/src/SettingsMigrator/Properties/AssemblyInfo.cs
deleted file mode 100644
index 08e165147b..0000000000
--- a/src/SettingsMigrator/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("SettingsMigrator")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8193192e-8ead-4871-b626-8b832f8fa654")]
diff --git a/src/SettingsMigrator/PublicAPI/PublicAPI.Shipped.txt b/src/SettingsMigrator/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..706bd9259e
--- /dev/null
+++ b/src/SettingsMigrator/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,27 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Migrator
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Migrator.Migrate(string! oldFilePath, string! newFilePath) -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Migrator.Migrator() -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.PathResolver
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.PathResolver.GetTargetPath(string![]! args) -> string?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.PathResolver.PathResolver() -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Program
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Datacollectors.get -> System.Xml.XmlNodeList?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Datacollectors.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Deployment.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Deployment.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Execution.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Execution.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Hosts.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Hosts.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Script.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Script.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.TestSettingsNodes() -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Timeout.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.Timeout.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.UnitTestConfig.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.UnitTestConfig.set -> void
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.WebSettings.get -> System.Xml.XmlNode?
+Microsoft.VisualStudio.TestPlatform.SettingsMigrator.TestSettingsNodes.WebSettings.set -> void
+static Microsoft.VisualStudio.TestPlatform.SettingsMigrator.Program.Main(string![]! args) -> int
diff --git a/src/SettingsMigrator/PublicAPI/PublicAPI.Unshipped.txt b/src/SettingsMigrator/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/SettingsMigrator/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
index 20546a6c23..2974629c07 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.cs.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Všechny uzly LegacySettings, které už jsou v souboru Runsettings, se odstraní.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings neobsahuje žádné vložené testSettings, nemigruje se.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Migrovaný soubor RunSettings se vytvořil v: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Atributy agentNotRespondingTimeout, deploymentTimeout a scriptTimeout uzlu Timeouts nejsou podporované, takže se nebudou migrovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Platné použití:
-SettingsMigrator.exe &lt;Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat&gt;
-SettingsMigrator.exe &lt;Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat&gt; &lt;Úplná cesta k souboru runsettings, který se má vytvořit&gt;
-Příklady:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Všechny uzly LegacySettings, které už jsou v souboru Runsettings, se odstraní.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings neobsahuje žádné vložené testSettings, nemigruje se.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Migrovaný soubor RunSettings se vytvořil v: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Atributy agentNotRespondingTimeout, deploymentTimeout a scriptTimeout uzlu Timeouts nejsou podporované, takže se nebudou migrovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Platné použití:
+SettingsMigrator.exe &lt;Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat&gt;
+SettingsMigrator.exe &lt;Úplná cesta k souboru testsettings nebo runsettings, který se má migrovat&gt; &lt;Úplná cesta k souboru runsettings, který se má vytvořit&gt;
+Příklady:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
index 58f1501e26..7844d26972 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.de.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Bereits in RunSettings vorhandene LegacySettings-Knoten werden entfernt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings enthält keine eingebetteten testSettings. Die Migration wird nicht durchgeführt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Die migrierte RunSettings-Datei wurde in folgendem Verzeichnis erstellt: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Die Attribute "agentNotRespondingTimeout", "deploymentTimeout" und "scriptTimeout" des Knotens "Timeouts" werden nicht unterstützt und daher nicht migriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Gültige Syntax:
-SettingsMigrator.exe &lt;vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration&gt;
-SettingsMigrator.exe &lt;vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration&gt; &lt;vollständiger Pfad zur zu erstellenden RUNSETTINGS-Datei&gt;
-Beispiele:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Bereits in RunSettings vorhandene LegacySettings-Knoten werden entfernt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings enthält keine eingebetteten testSettings. Die Migration wird nicht durchgeführt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Die migrierte RunSettings-Datei wurde in folgendem Verzeichnis erstellt: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Die Attribute "agentNotRespondingTimeout", "deploymentTimeout" und "scriptTimeout" des Knotens "Timeouts" werden nicht unterstützt und daher nicht migriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Gültige Syntax:
+SettingsMigrator.exe &lt;vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration&gt;
+SettingsMigrator.exe &lt;vollständiger Pfad zur TESTSETTINGS-Datei oder RUNSETTINGS-Datei für die Migration&gt; &lt;vollständiger Pfad zur zu erstellenden RUNSETTINGS-Datei&gt;
+Beispiele:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
index 5c53ace202..8e73dc517f 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.es.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Se quitará cualquier nodo de LegacySettings que ya exista en el archivo RunSettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings no contiene ningún valor de testSettings incrustado, por lo que no se migrará.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">El archivo RunSettings migrado se ha creado a las {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Los atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts no se admiten, por lo que no se migrarán.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Uso válido:
-SettingsMigrator.exe &lt;Ruta completa al archivo testsettings o runsettings que se va a migrar&gt;
-SettingsMigrator.exe &lt;Ruta completa al archivo testsettings o runsettings que se va a migrar&gt; &lt;Ruta completa al archivo runsettings que se va a crear&gt;
-Ejemplos:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Se quitará cualquier nodo de LegacySettings que ya exista en el archivo RunSettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings no contiene ningún valor de testSettings incrustado, por lo que no se migrará.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">El archivo RunSettings migrado se ha creado a las {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Los atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts no se admiten, por lo que no se migrarán.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Uso válido:
+SettingsMigrator.exe &lt;Ruta completa al archivo testsettings o runsettings que se va a migrar&gt;
+SettingsMigrator.exe &lt;Ruta completa al archivo testsettings o runsettings que se va a migrar&gt; &lt;Ruta completa al archivo runsettings que se va a crear&gt;
+Ejemplos:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
index 47500388c1..2c3d50d885 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.fr.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Tout nœud LegacySettings déjà présent dans les paramètres d’exécution sera supprimé.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings ne contient pas de testSettings incorporé. Échec de la migration.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Le fichier RunSettings migré a été créé à : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Les attributs agentNotRespondingTimeout, deploymentTimeout et scriptTimeout du nœud Timeouts ne sont pas pris en charge. Ils ne seront donc pas migrés.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Utilisation valide :
-SettingsMigrator.exe &lt;chemin complet du fichier testsettings ou runsettings à migrer&gt;
-SettingsMigrator.exe &lt;chemin complet du fichier testsettings ou runsettings à migrer&gt; &lt;chemin complet du fichier runsettings à créer&gt;
-Exemples :
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Tout nœud LegacySettings déjà présent dans les paramètres d’exécution sera supprimé.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings ne contient pas de testSettings incorporé. Échec de la migration.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Le fichier RunSettings migré a été créé à : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Les attributs agentNotRespondingTimeout, deploymentTimeout et scriptTimeout du nœud Timeouts ne sont pas pris en charge. Ils ne seront donc pas migrés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Utilisation valide :
+SettingsMigrator.exe &lt;chemin complet du fichier testsettings ou runsettings à migrer&gt;
+SettingsMigrator.exe &lt;chemin complet du fichier testsettings ou runsettings à migrer&gt; &lt;chemin complet du fichier runsettings à créer&gt;
+Exemples :
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
index 7c0c22c825..31c97f9c80 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.it.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">L'eventuale nodo LegacySettings già presente nel file RunSettings verrà rimosso.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">Il file RunSettings non contiene un elemento testSettings incorporato. La migrazione non verrà eseguita.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Il file RunSettings di cui è stata eseguita la migrazione è stato creato in: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Gli attributi agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts non sono supportati, di conseguenza non ne verrà eseguita la migrazione.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Sintassi valida:
-SettingsMigrator.exe &lt;percorso completo del file testsettings o runsettings di cui eseguire la migrazione&gt;
-SettingsMigrator.exe &lt;percorso completo del file testsettings o runsettings di cui eseguire la migrazione&gt; &lt;percorso completo del file runsettings da creare&gt;
-Esempi:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">L'eventuale nodo LegacySettings già presente nel file RunSettings verrà rimosso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">Il file RunSettings non contiene un elemento testSettings incorporato. La migrazione non verrà eseguita.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Il file RunSettings di cui è stata eseguita la migrazione è stato creato in: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Gli attributi agentNotRespondingTimeout, deploymentTimeout, scriptTimeout del nodo Timeouts non sono supportati, di conseguenza non ne verrà eseguita la migrazione.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Sintassi valida:
+SettingsMigrator.exe &lt;percorso completo del file testsettings o runsettings di cui eseguire la migrazione&gt;
+SettingsMigrator.exe &lt;percorso completo del file testsettings o runsettings di cui eseguire la migrazione&gt; &lt;percorso completo del file runsettings da creare&gt;
+Esempi:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
index d9f7f28410..7a4bc29684 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ja.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">RunSettings 内に既に存在するすべての LegacySettings ノードは削除されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings には埋め込み testSettings が含まれていないため、移行されません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">移行された RunSettings ファイルは次の場所に作成されました: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Timeouts ノードの agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 属性はサポートされていないため、これらは移行されません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">有効な使用法:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-例:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">RunSettings 内に既に存在するすべての LegacySettings ノードは削除されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings には埋め込み testSettings が含まれていないため、移行されません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">移行された RunSettings ファイルは次の場所に作成されました: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Timeouts ノードの agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 属性はサポートされていないため、これらは移行されません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">有効な使用法:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+例:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
index a0eabdc951..4428f36393 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ko.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">runsettings에 이미 존재하는 LegacySettings 노드가 제거됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings에 포함된 testSettings이 없으며 마이그레이션되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">마이그레이션된 RunSettings 파일은 {0}에 생성되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">시간 제한 노드의 agentNotRespondingTimeout, deploymentTimeout, scriptTimeout 특성은 지원되지 않으므로 마이그레이션되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">유효한 사용법:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">runsettings에 이미 존재하는 LegacySettings 노드가 제거됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings에 포함된 testSettings이 없으며 마이그레이션되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">마이그레이션된 RunSettings 파일은 {0}에 생성되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">시간 제한 노드의 agentNotRespondingTimeout, deploymentTimeout, scriptTimeout 특성은 지원되지 않으므로 마이그레이션되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">유효한 사용법:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
index 2e71fcf941..4f824d09fe 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pl.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Wszelkie węzły LegacySettings już istniejące w pliku runsettings zostaną usunięte.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">Plik RunSettings nie zawiera osadzonego elementu testSettings, migracja nie jest wykonywana.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Zmigrowany plik RunSettings został utworzony w: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Atrybuty agentNotRespondingTimeout, deploymentTimeout i scriptTimeout węzła Timeouts nie są obsługiwane, więc nie zostaną zmigrowane.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Prawidłowe użycie:
-SettingsMigrator.exe &lt;pełna ścieżka do pliku testsettings lub runsettings do zmigrowania&gt;
-SettingsMigrator.exe &lt;pełna ścieżka do pliku testsettings lub runsettings do zmigrowania&gt; &lt;pełna ścieżka do pliku runsettings do utworzenia&gt;
-Przykłady:
-SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings
-SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings
-SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings
-SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Wszelkie węzły LegacySettings już istniejące w pliku runsettings zostaną usunięte.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">Plik RunSettings nie zawiera osadzonego elementu testSettings, migracja nie jest wykonywana.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Zmigrowany plik RunSettings został utworzony w: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Atrybuty agentNotRespondingTimeout, deploymentTimeout i scriptTimeout węzła Timeouts nie są obsługiwane, więc nie zostaną zmigrowane.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Prawidłowe użycie:
+SettingsMigrator.exe &lt;pełna ścieżka do pliku testsettings lub runsettings do zmigrowania&gt;
+SettingsMigrator.exe &lt;pełna ścieżka do pliku testsettings lub runsettings do zmigrowania&gt; &lt;pełna ścieżka do pliku runsettings do utworzenia&gt;
+Przykłady:
+SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings
+SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings
+SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoTestu.testsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings
+SettingsMigrator.exe  E:\MójTest\UstawieniaMojegoStaregoPrzebiegu.runsettings E:\MójTest\UstawieniaMojegoNowegoPrzebiegu.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
index d49ed59e0a..6245aad7cb 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.pt-BR.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Qualquer nó LegacySettings já presente em runsettings será removido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">O RunSettings que não contém um testSettings incorporado não migrará.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">O arquivo RunSettings migrado foi criado em: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Os atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout do nó Timeouts não têm suporte, portanto, não serão migrados.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Uso válido:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Qualquer nó LegacySettings já presente em runsettings será removido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">O RunSettings que não contém um testSettings incorporado não migrará.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">O arquivo RunSettings migrado foi criado em: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Os atributos agentNotRespondingTimeout, deploymentTimeout, scriptTimeout do nó Timeouts não têm suporte, portanto, não serão migrados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Uso válido:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
index 7441b23f98..b7fc9ca6de 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.ru.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Любые узлы LegacySettings в runsettings будут удалены.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">Файл RunSettings не содержит внутри себя testSettings. Перенос выполняться не будет.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Перенесенный файл RunSettings создан в {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Атрибуты agentNotRespondingTimeout, deploymentTimeout, scriptTimeout узла Timeouts не поддерживаются и перенесены не будут.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Допустимое использование:
-SettingsMigrator.exe &lt;полный путь к переносимому файлу TestSettings или RunSettings&gt;
-SettingsMigrator.exe &lt;полный путь к переносимому файлу TestSettings или RunSettings&gt; &lt;полный путь к создаваемому файлу RunSettings&gt;
-Примеры:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Любые узлы LegacySettings в runsettings будут удалены.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">Файл RunSettings не содержит внутри себя testSettings. Перенос выполняться не будет.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Перенесенный файл RunSettings создан в {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Атрибуты agentNotRespondingTimeout, deploymentTimeout, scriptTimeout узла Timeouts не поддерживаются и перенесены не будут.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Допустимое использование:
+SettingsMigrator.exe &lt;полный путь к переносимому файлу TestSettings или RunSettings&gt;
+SettingsMigrator.exe &lt;полный путь к переносимому файлу TestSettings или RunSettings&gt; &lt;полный путь к создаваемому файлу RunSettings&gt;
+Примеры:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
index 2640caa2e8..16b557ad45 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.tr.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">Runsettings içinde zaten mevcut olan tüm Any LegacySettings düğümleri kaldırılacak.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings, ekli bir testSettings içermiyor ve geçirilmiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">Geçirilen RunSettings dosyası şu konumda oluşturuldu: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Zaman aşımları düğümünün agentNotRespondingTimeout, deploymentTimeout, scriptTimeout öznitelikleri desteklenmediğinden bunlar geçirilmeyecek.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">Geçerli kullanım:
-SettingsMigrator.exe &lt;Geçirilecek olan testsettings veya runsettings dosyasının tam yolu&gt;
-SettingsMigrator.exe &lt;Geçirilecek olan testsettings veya runsettings dosyasının tam yolu&gt; &lt;Oluşturulacak olan runsettings dosyasının tam yolu&gt;
-Örnekler:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">Runsettings içinde zaten mevcut olan tüm Any LegacySettings düğümleri kaldırılacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings, ekli bir testSettings içermiyor ve geçirilmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">Geçirilen RunSettings dosyası şu konumda oluşturuldu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Zaman aşımları düğümünün agentNotRespondingTimeout, deploymentTimeout, scriptTimeout öznitelikleri desteklenmediğinden bunlar geçirilmeyecek.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">Geçerli kullanım:
+SettingsMigrator.exe &lt;Geçirilecek olan testsettings veya runsettings dosyasının tam yolu&gt;
+SettingsMigrator.exe &lt;Geçirilecek olan testsettings veya runsettings dosyasının tam yolu&gt; &lt;Oluşturulacak olan runsettings dosyasının tam yolu&gt;
+Örnekler:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.xlf b/src/SettingsMigrator/Resources/xlf/Resources.xlf
index 847aadaac8..ae68935d4d 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.xlf
@@ -5,22 +5,22 @@
       <trans-unit id="IgnoringLegacySettings">
         <source>Any LegacySettings node already present in the runsettings will be removed.</source>
         <target state="new">Any LegacySettings node already present in the runsettings will be removed.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoEmbeddedSettings">
         <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
         <target state="new">RunSettings does not contain an embedded testSettings, not migrating.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsCreated">
         <source>The migrated RunSettings file has been created at: {0}</source>
         <target state="new">The migrated RunSettings file has been created at: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UnsupportedAttributes">
         <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
         <target state="new">The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout are not supported, so these will not be migrated.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ValidUsage">
         <source>Valid usage:
@@ -34,8 +34,8 @@ SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunS
         <target state="new">Valid usage: SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to new runsettings file&gt;
 Example: SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings  E:\MyTest\MyRunSettings.runsettings
 Example: SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings  E:\MyTest\MyRunSettings.runsettings</target>
-        <note></note>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
index 47cfb40472..79ef44f17d 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">已经存在于 runsettings 中的任何 LegacySettings 节点都将被删除。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings 不包含嵌入的 testSettings，不会迁移。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">已迁移的 RunSettings 文件已在 {0} 中创建</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">Timeouts 节点的属性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 不受支持，因此不会迁移它们。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">有效用法:
-SettingsMigrator.exe&lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">已经存在于 runsettings 中的任何 LegacySettings 节点都将被删除。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings 不包含嵌入的 testSettings，不会迁移。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">已迁移的 RunSettings 文件已在 {0} 中创建</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">Timeouts 节点的属性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout 不受支持，因此不会迁移它们。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">有效用法:
+SettingsMigrator.exe&lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
index 1a25da44e4..00a73dac4d 100644
--- a/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/SettingsMigrator/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="IgnoringLegacySettings">
-        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
-        <target state="translated">所有出現在 runsettings 中的 LegacySettings 節點，都將移除。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NoEmbeddedSettings">
-        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
-        <target state="translated">RunSettings 並不包含內嵌的 testSettings，所以未移轉。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunSettingsCreated">
-        <source>The migrated RunSettings file has been created at: {0}</source>
-        <target state="translated">移轉的 RunSettings 檔案已於 {0} 建立</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UnsupportedAttributes">
-        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
-        <target state="translated">不支援 Timeouts 節點的屬性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout，所以這些將不會移轉。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ValidUsage">
-        <source>Valid usage:
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
-SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
-Examples:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
-        <target state="translated">有效的用法:
-SettingsMigrator.exe &lt;testsettings 檔案或要移轉的 runsettings 檔案的完整路徑&gt;
-SettingsMigrator.exe &lt;testsettings 檔案或要移轉的 runsettings 檔案的完整路徑&gt; &lt;要建立的 runsettings 檔案的完整路徑&gt;
-範例:
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
-SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="IgnoringLegacySettings">
+        <source>Any LegacySettings node already present in the runsettings will be removed.</source>
+        <target state="translated">所有出現在 runsettings 中的 LegacySettings 節點，都將移除。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoEmbeddedSettings">
+        <source>RunSettings does not contain an embedded testSettings, not migrating.</source>
+        <target state="translated">RunSettings 並不包含內嵌的 testSettings，所以未移轉。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsCreated">
+        <source>The migrated RunSettings file has been created at: {0}</source>
+        <target state="translated">移轉的 RunSettings 檔案已於 {0} 建立</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnsupportedAttributes">
+        <source>The attributes agentNotRespondingTimeout, deploymentTimeout, scriptTimeout of Timeouts node are not supported, so these will not be migrated.</source>
+        <target state="translated">不支援 Timeouts 節點的屬性 agentNotRespondingTimeout、deploymentTimeout、scriptTimeout，所以這些將不會移轉。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ValidUsage">
+        <source>Valid usage:
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt;
+SettingsMigrator.exe &lt;Full path to testsettings file or runsettings file to be migrated&gt; &lt;Full path to runsettings file to be created&gt;
+Examples:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</source>
+        <target state="translated">有效的用法:
+SettingsMigrator.exe &lt;testsettings 檔案或要移轉的 runsettings 檔案的完整路徑&gt;
+SettingsMigrator.exe &lt;testsettings 檔案或要移轉的 runsettings 檔案的完整路徑&gt; &lt;要建立的 runsettings 檔案的完整路徑&gt;
+範例:
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyTestSettings.testsettings E:\MyTest\MyNewRunSettings.runsettings
+SettingsMigrator.exe  E:\MyTest\MyOldRunSettings.runsettings E:\MyTest\MyNewRunSettings.runsettings</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
index f1a3b92d9e..e87d54f8dc 100644
--- a/src/SettingsMigrator/SettingsMigrator.csproj
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>SettingsMigrator</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--
+      Shipped with TestPlatform package.
+    -->
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsTestProject>false</IsTestProject>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime" />
@@ -29,6 +23,11 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -41,5 +40,22 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SettingsMigrator/TestSettingsNodes.cs b/src/SettingsMigrator/TestSettingsNodes.cs
index c0e3271366..d2b6ce1934 100644
--- a/src/SettingsMigrator/TestSettingsNodes.cs
+++ b/src/SettingsMigrator/TestSettingsNodes.cs
@@ -1,29 +1,28 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator
-{
-    using System.Xml;
+using System.Xml;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator;
 
-    /// <summary>
-    /// Contains the test settings nodes that need to be converted.
-    /// </summary>
-    public class TestSettingsNodes
-    {
-        public XmlNode Deployment { get; set; }
+/// <summary>
+/// Contains the test settings nodes that need to be converted.
+/// </summary>
+public class TestSettingsNodes
+{
+    public XmlNode? Deployment { get; set; }
 
-        public XmlNode Script { get; set; }
+    public XmlNode? Script { get; set; }
 
-        public XmlNode WebSettings { get; set; }
+    public XmlNode? WebSettings { get; set; }
 
-        public XmlNodeList Datacollectors { get; set; }
+    public XmlNodeList? Datacollectors { get; set; }
 
-        public XmlNode Timeout { get; set; }
+    public XmlNode? Timeout { get; set; }
 
-        public XmlNode UnitTestConfig { get; set; }
+    public XmlNode? UnitTestConfig { get; set; }
 
-        public XmlNode Hosts { get; set; }
+    public XmlNode? Hosts { get; set; }
 
-        public XmlNode Execution { get; set; }
-    }
+    public XmlNode? Execution { get; set; }
 }
diff --git a/src/datacollector.arm64/datacollector.arm64.csproj b/src/datacollector.arm64/datacollector.arm64.csproj
new file mode 100644
index 0000000000..c2584b21dc
--- /dev/null
+++ b/src/datacollector.arm64/datacollector.arm64.csproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
+  <PropertyGroup Label="Configuration">
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AssemblyName>datacollector.arm64</AssemblyName>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+    <RuntimeIdentifier Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">win10-arm64</RuntimeIdentifier>
+    <!-- Setting both RuntimeIdentifier and PlatformTarget ends up building as AnyCPU and selecting the default x86 architecture, irregardles of RuntimeIdentifier,
+    so order here matters. -->
+    <PlatformTarget Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <OutputType>Exe</OutputType>
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
+    <UseAppHost>false</UseAppHost>
+    <RollForward>Major</RollForward>
+    <IsTestProject>false</IsTestProject>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\datacollector\**\*.cs" Exclude="..\datacollector\bin\**\*;..\datacollector\obj\**\*"/>
+    <None Include="..\datacollector\app.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\datacollector\PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\datacollector\PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="..\datacollector\PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\datacollector\PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/datacollector/DataCollectorMain.cs b/src/datacollector/DataCollectorMain.cs
index 9bfbeeffd3..5946455b36 100644
--- a/src/datacollector/DataCollectorMain.cs
+++ b/src/datacollector/DataCollectorMain.cs
@@ -1,171 +1,182 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector
-{
-    using System;
-    using System.Globalization;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using PlatformAbstractions.Interfaces;
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-
-    public class DataCollectorMain
-    {
-        /// <summary>
-        /// Port number used to communicate with test runner process.
-        /// </summary>
-        private const string PortArgument = "--port";
-
-        /// <summary>
-        /// Parent process Id argument to monitor parent process.
-        /// </summary>
-        private const string ParentProcessArgument = "--parentprocessid";
-
-        /// <summary>
-        /// Log file for writing eqt trace logs.
-        /// </summary>
-        private const string LogFileArgument = "--diag";
-
-        /// <summary>
-        /// Trace level for logs.
-        /// </summary>
-        private const string TraceLevelArgument = "--tracelevel";
-
-        private IProcessHelper processHelper;
-
-        private IEnvironment environment;
-        private IDataCollectionRequestHandler requestHandler;
-
-        public DataCollectorMain():
-            this(
-                new ProcessHelper(),
-                new PlatformEnvironment(),
-                DataCollectionRequestHandler.Create(new SocketCommunicationManager(), new MessageSink())
-                )
-        {
-        }
+using System;
+using System.Globalization;
+using System.Reflection;
 
-        internal DataCollectorMain(IProcessHelper processHelper, IEnvironment environment, IDataCollectionRequestHandler requestHandler)
-        {
-            this.processHelper = processHelper;
-            this.environment = environment;
-            this.requestHandler = requestHandler;
-        }
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
 
-        public void Run(string[] args)
-        {
-            DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS");
-            DebuggerBreakpoint.WaitForDebugger("VSTEST_DATACOLLECTOR_DEBUG");
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
 
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args);
+using Microsoft.VisualStudio.TestPlatform.Execution;
 
-            // Setup logging if enabled
-            if (argsDictionary.TryGetValue(LogFileArgument, out var logFile))
-            {
-                var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
-                var isTraceLevelArgValid = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt);
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-                // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
-                var traceLevel = isTraceLevelArgValid ? (PlatformTraceLevel)traceLevelInt : PlatformTraceLevel.Verbose;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
 
-                // Initialize trace.
-                EqtTrace.InitializeTrace(logFile, traceLevel);
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 
+using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
 
-                // Log warning in case tracelevel passed in arg is invalid
-                if (!isTraceLevelArgValid)
-                {
-                    EqtTrace.Warning("DataCollectorMain.Run: Invalid trace level: {0}, defaulting to verbose tracelevel.", traceLevelInt);
-                }
-            }
-            else
-            {
-                EqtTrace.DoNotInitailize = true;
-            }
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector;
 
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                var version = typeof(DataCollectorMain)
-                    .GetTypeInfo()
-                    .Assembly
-                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
-                EqtTrace.Verbose($"Version: { version }");
-            }
+public class DataCollectorMain
+{
+    /// <summary>
+    /// Port number used to communicate with test runner process.
+    /// </summary>
+    private const string PortArgument = "--port";
+
+    /// <summary>
+    /// Parent process Id argument to monitor parent process.
+    /// </summary>
+    private const string ParentProcessArgument = "--parentprocessid";
+
+    /// <summary>
+    /// Log file for writing eqt trace logs.
+    /// </summary>
+    private const string LogFileArgument = "--diag";
+
+    /// <summary>
+    /// Trace level for logs.
+    /// </summary>
+    private const string TraceLevelArgument = "--tracelevel";
+
+    private readonly IProcessHelper _processHelper;
+
+    private readonly IEnvironment _environment;
+    private readonly IDataCollectionRequestHandler _requestHandler;
+    private readonly UiLanguageOverride _uiLanguageOverride;
+
+    public DataCollectorMain() :
+        this(
+            new ProcessHelper(),
+            new PlatformEnvironment(),
+            DataCollectionRequestHandler.Create(new SocketCommunicationManager(), new MessageSink()),
+            new UiLanguageOverride()
+        )
+    {
+    }
 
-            UILanguageOverride.SetCultureSpecifiedByUser();
+    internal DataCollectorMain(IProcessHelper processHelper, IEnvironment environment, IDataCollectionRequestHandler requestHandler, UiLanguageOverride uiLanguageOverride)
+    {
+        _processHelper = processHelper;
+        _environment = environment;
+        _requestHandler = requestHandler;
+        _uiLanguageOverride = uiLanguageOverride;
+    }
 
-            EqtTrace.Info("DataCollectorMain.Run: Starting data collector run with args: {0}", string.Join(",", args));
+    public void Run(string[]? args)
+    {
+        DebuggerBreakpoint.AttachVisualStudioDebugger(WellKnownDebugEnvironmentVariables.VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS);
+        DebuggerBreakpoint.WaitForDebugger(WellKnownDebugEnvironmentVariables.VSTEST_DATACOLLECTOR_DEBUG);
+
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args);
 
-            // Attach to exit of parent process
-            var parentProcessId = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, ParentProcessArgument);
-            EqtTrace.Info("DataCollector: Monitoring parent process with id: '{0}'", parentProcessId);
+        // Setup logging if enabled
+        if (argsDictionary.TryGetValue(LogFileArgument, out var logFile))
+        {
+            var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
+            var isTraceLevelArgValid = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt);
 
-            this.processHelper.SetExitCallback(
-                parentProcessId,
-                (obj) =>
-                {
-                    EqtTrace.Info("DataCollector: ParentProcess '{0}' Exited.", parentProcessId);
-                    this.environment.Exit(1);
-                });
+            // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
+            var traceLevel = isTraceLevelArgValid ? (PlatformTraceLevel)traceLevelInt : PlatformTraceLevel.Verbose;
 
-            // Get server port and initialize communication.
-            int port = argsDictionary.TryGetValue(PortArgument, out var portValue) ? int.Parse(portValue) : 0;
+            // Initialize trace.
+            EqtTrace.InitializeTrace(logFile, traceLevel);
 
-            if (port <= 0)
+
+            // Log warning in case tracelevel passed in arg is invalid
+            if (!isTraceLevelArgValid)
             {
-                throw new ArgumentException("Incorrect/No Port number");
+                EqtTrace.Warning("DataCollectorMain.Run: Invalid trace level: {0}, defaulting to verbose tracelevel.", traceLevelInt);
             }
+        }
+        else
+        {
+            EqtTrace.DoNotInitailize = true;
+        }
+
+        if (EqtTrace.IsVerboseEnabled)
+        {
+            var version = typeof(DataCollectorMain)
+                .Assembly
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            EqtTrace.Verbose($"Version: {version}");
+        }
+
+        _uiLanguageOverride.SetCultureSpecifiedByUser();
 
-            this.requestHandler.InitializeCommunication(port);
+        EqtTrace.Info("DataCollectorMain.Run: Starting data collector run with args: {0}", args != null ? string.Join(",", args) : "null");
 
-            // Can only do this after InitializeCommunication because datacollector cannot "Send Log" unless communications are initialized
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
+        // Attach to exit of parent process
+        var parentProcessId = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, ParentProcessArgument);
+        EqtTrace.Info("DataCollector: Monitoring parent process with id: '{0}'", parentProcessId);
+
+        _processHelper.SetExitCallback(
+            parentProcessId,
+            (obj) =>
             {
-                (this.requestHandler as DataCollectionRequestHandler)?.SendDataCollectionMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Informational, string.Format("Logging DataCollector Diagnostics in file: {0}", EqtTrace.LogFile)));
-            }
+                EqtTrace.Info("DataCollector: ParentProcess '{0}' Exited.", parentProcessId);
+                _environment.Exit(1);
+            });
+
+        // Get server port and initialize communication.
+        int port = argsDictionary.TryGetValue(PortArgument, out var portValue)
+            && int.TryParse(portValue, NumberStyles.Integer, CultureInfo.CurrentCulture, out var p)
+            ? p
+            : 0;
 
-            // Start processing async in a different task
-            EqtTrace.Info("DataCollector: Start Request Processing.");
-            StartProcessing();
+        if (port <= 0)
+        {
+            throw new ArgumentException("Incorrect/No Port number");
         }
 
+        _requestHandler.InitializeCommunication(port);
 
-        private void StartProcessing()
+        // Can only do this after InitializeCommunication because datacollector cannot "Send Log" unless communications are initialized
+        if (!string.IsNullOrEmpty(EqtTrace.LogFile))
         {
-            var timeout = EnvironmentHelper.GetConnectionTimeout();
+            (_requestHandler as DataCollectionRequestHandler)?.SendDataCollectionMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Informational, $"Logging DataCollector Diagnostics in file: {EqtTrace.LogFile}"));
+        }
 
-            // Wait for the connection to the sender and start processing requests from sender
-            if (this.requestHandler.WaitForRequestSenderConnection(timeout * 1000))
-            {
-                this.requestHandler.ProcessRequests();
-            }
-            else
-            {
-                EqtTrace.Error(
-                    "DataCollectorMain.StartProcessing: RequestHandler timed out while connecting to the Sender, timeout: {0} seconds.",
-                    timeout);
-
-                this.requestHandler.Close();
-
-                throw new TestPlatformException(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                        CoreUtilitiesConstants.DatacollectorProcessName,
-                        CoreUtilitiesConstants.VstestConsoleProcessName,
-                        timeout,
-                        EnvironmentHelper.VstestConnectionTimeout)
-                    );
-            }
+        // Start processing async in a different task
+        EqtTrace.Info("DataCollector: Start Request Processing.");
+        StartProcessing();
+    }
+
+
+    private void StartProcessing()
+    {
+        var timeout = EnvironmentHelper.GetConnectionTimeout();
+
+        // Wait for the connection to the sender and start processing requests from sender
+        if (_requestHandler.WaitForRequestSenderConnection(timeout * 1000))
+        {
+            _requestHandler.ProcessRequests();
+        }
+        else
+        {
+            EqtTrace.Error(
+                "DataCollectorMain.StartProcessing: RequestHandler timed out while connecting to the Sender, timeout: {0} seconds.",
+                timeout);
+
+            _requestHandler.Close();
+
+            throw new TestPlatformException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                    CoreUtilitiesConstants.DatacollectorProcessName,
+                    CoreUtilitiesConstants.VstestConsoleProcessName,
+                    timeout,
+                    EnvironmentHelper.VstestConnectionTimeout)
+            );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/datacollector/MessageSink.cs b/src/datacollector/MessageSink.cs
index e6499dd201..579736ea50 100644
--- a/src/datacollector/MessageSink.cs
+++ b/src/datacollector/MessageSink.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector;
 
-    /// <inheritdoc />
-    internal class MessageSink : IMessageSink
+/// <inheritdoc />
+internal class MessageSink : IMessageSink
+{
+    /// <summary>
+    /// Data collection message as sent by DataCollectionLogger.
+    /// </summary>
+    /// <param name="args">Data collection message event args.</param>
+    public void SendMessage(DataCollectionMessageEventArgs args)
     {
-        /// <summary>
-        /// Data collection message as sent by DataCollectionLogger.
-        /// </summary>
-        /// <param name="args">Data collection message event args.</param>
-        public void SendMessage(DataCollectionMessageEventArgs args)
-        {
-            DataCollectionRequestHandler.Instance.SendDataCollectionMessage(args);
-        }
+        DataCollectionRequestHandler.Instance?.SendDataCollectionMessage(args);
     }
 }
diff --git a/src/datacollector/Program.cs b/src/datacollector/Program.cs
index 3554b2c75d..2a380e1d76 100644
--- a/src/datacollector/Program.cs
+++ b/src/datacollector/Program.cs
@@ -1,37 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector;
+
+/// <summary>
+/// The program.
+/// </summary>
+public class Program
+{
     /// <summary>
-    /// The program.
+    /// The main.
     /// </summary>
-    public class Program
+    /// <param name="args">
+    /// The args.
+    /// </param>
+    public static void Main(string[]? args)
     {
-        /// <summary>
-        /// The main.
-        /// </summary>
-        /// <param name="args">
-        /// The args.
-        /// </param>
-        public static void Main(string[] args)
+        try
+        {
+            new DataCollectorMain().Run(args);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("Program.Main: Error occurred during initialization of Datacollector : {0}", ex);
+            throw;
+        }
+        finally
         {
-            try
-            {
-                new DataCollectorMain().Run(args);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("Program.Main: Error occurred during initialization of Datacollector : {0}", ex);
-                throw;
-            }
-            finally
-            {
-                EqtTrace.Info("Program.Main: exiting datacollector process.");
-            }
+            EqtTrace.Info("Program.Main: exiting datacollector process.");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/datacollector/Properties/AssemblyInfo.cs b/src/datacollector/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9e902b9f63..0000000000
--- a/src/datacollector/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("datacollector")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("00dfb5c7-3850-4a65-986b-713f200482d4")]
diff --git a/src/datacollector/PublicAPI/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..ac21e58c10
--- /dev/null
+++ b/src/datacollector/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,7 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.DataCollector.DataCollectorMain
+Microsoft.VisualStudio.TestPlatform.DataCollector.DataCollectorMain.DataCollectorMain() -> void
+Microsoft.VisualStudio.TestPlatform.DataCollector.DataCollectorMain.Run(string![]? args) -> void
+Microsoft.VisualStudio.TestPlatform.DataCollector.Program
+Microsoft.VisualStudio.TestPlatform.DataCollector.Program.Program() -> void
+static Microsoft.VisualStudio.TestPlatform.DataCollector.Program.Main(string![]? args) -> void
diff --git a/src/datacollector/PublicAPI/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net48/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/datacollector/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/datacollector/app.config b/src/datacollector/app.config
index 28f81c598d..8e3b9f898c 100644
--- a/src/datacollector/app.config
+++ b/src/datacollector/app.config
@@ -16,6 +16,22 @@
         <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
index 84ef896876..94ba8f6058 100644
--- a/src/datacollector/datacollector.csproj
+++ b/src/datacollector/datacollector.csproj
@@ -1,27 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup>
     <AssemblyName>datacollector</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <PlatformTarget Condition="$(TargetFramework.StartsWith('net4'))">AnyCPU</PlatformTarget>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+    <PlatformTarget Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
     <OutputType>Exe</OutputType>
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
+    <UseAppHost>false</UseAppHost>
+    <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
+
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
@@ -33,10 +39,19 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
 </Project>
diff --git a/src/package/Directory.Build.props b/src/package/Directory.Build.props
new file mode 100644
index 0000000000..f97c8e3f1a
--- /dev/null
+++ b/src/package/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="../../Directory.Build.props" />
+
+  <PropertyGroup>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+  </PropertyGroup>
+</Project>
diff --git a/src/package/Icon.png b/src/package/Icon.png
deleted file mode 100644
index a0f1fdbf4d..0000000000
Binary files a/src/package/Icon.png and /dev/null differ
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj
new file mode 100644
index 0000000000..11f305b215
--- /dev/null
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.csproj
@@ -0,0 +1,48 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!--
+      This is shipped as nuget package, it needs to be installable to all projects that would be able to run
+      via testhost. The dlls will then be loaded by datacollector, which will have the same or newer TFMs.
+    -->
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks);$(ExtensionTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.CodeCoverage.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.CodeCoverage</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing codecoverage code-coverage</PackageTags>
+    <PackageDescription>
+      Microsoft.CodeCoverage package brings infra for collecting code coverage from vstest.console.exe and "dotnet test".
+    </PackageDescription>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="Build">
+    <ItemGroup>
+      <MicrosoftInternalCodeCoverage Include="$(PkgMicrosoft_Internal_CodeCoverage)\contentFiles\Microsoft.CodeCoverage\**\*"></MicrosoftInternalCodeCoverage>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftInternalCodeCoverage)" DestinationFiles="$(OutDir)\Microsoft.Internal.CodeCoverage\%(RecursiveDir)%(Filename)%(Extension)" />
+  </Target>
+
+  <ItemGroup>
+    <None Update="ThirdPartyNoticesCodeCoverage.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Microsoft.CodeCoverage.props">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Microsoft.CodeCoverage.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
new file mode 100644
index 0000000000..06b13fcb24
--- /dev/null
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net462"></group>
+      <group targetFramework="net8.0"></group>
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="net462\ThirdPartyNoticesCodeCoverage.txt" target="ThirdPartyNotices.txt" />
+    <file src="net462\ThirdPartyNoticesCodeCoverage.txt" target="build\netstandard2.0\ThirdPartyNotices.txt" />
+
+    <file src="net462\Microsoft.CodeCoverage.props" target="build\netstandard2.0\" />
+    <file src="net462\Microsoft.CodeCoverage.targets" target="build\netstandard2.0\" />
+
+    <file src="net462\Microsoft.Internal.CodeCoverage\**\*" target="" />
+  </files>
+</package>
diff --git a/src/package/nuspec/Microsoft.CodeCoverage.props b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.props
similarity index 100%
rename from src/package/nuspec/Microsoft.CodeCoverage.props
rename to src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.props
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.targets b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.targets
new file mode 100644
index 0000000000..0e75c6c723
--- /dev/null
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.targets
@@ -0,0 +1,60 @@
+<!--
+ ***********************************************************************************************
+ Microsoft.CodeCoverage.targets
+
+ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+           created a backup copy.  Incorrect changes to this file will make it
+           impossible to load or build your test projects from the command-line or the IDE.
+
+ Copyright (c) Microsoft. All rights reserved.
+ ***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- This target required to enable /collect:"Code Coverage" in "dotnet publish" scenario with "dotnet vstest".
+       E.g: Release pipelines where user/project nuget cache not available on current machine. -->
+  <Target Name="CopyTraceDataCollectorArtifacts" AfterTargets="ComputeFilesToPublish">
+
+    <ItemGroup>
+      <TraceDataCollectorArtifacts Include="$(MSBuildThisFileDirectory)\**\*.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(TraceDataCollectorArtifacts)" DestinationFolder="$(PublishDir)%(RecursiveDir)" />
+
+  </Target>
+
+  <PropertyGroup Condition="'$(NETCoreSdkVersion)' != '' and '$(DisableMsCoverageReferencedPathMaps)' != 'true'">
+    <_msCoverageSdkNETCoreSdkVersion>$(NETCoreSdkVersion)</_msCoverageSdkNETCoreSdkVersion>
+    <_msCoverageSdkNETCoreSdkVersion Condition="$(_msCoverageSdkNETCoreSdkVersion.Contains('-'))">$(_msCoverageSdkNETCoreSdkVersion.Split('-')[0])</_msCoverageSdkNETCoreSdkVersion>
+    <_msCoverageSdkMinVersionWithDependencyTarget>6.0.100</_msCoverageSdkMinVersionWithDependencyTarget>
+    <_msCoverageSourceRootTargetName>MsCoverageGetPathMap</_msCoverageSourceRootTargetName>
+    <_msCoverageSourceRootTargetName Condition="'$([System.Version]::Parse($(_msCoverageSdkNETCoreSdkVersion)).CompareTo($([System.Version]::Parse($(_msCoverageSdkMinVersionWithDependencyTarget)))))' &gt;= '0' ">InitializeSourceRootMappedPaths</_msCoverageSourceRootTargetName>
+  </PropertyGroup>
+
+  <!-- This target required to store deterministic sources mapping.
+       It is modified version of https://github.com/coverlet-coverage/coverlet/blob/d1ca364b7dbff38abce0457d94c4ce1b7e3a4cd9/src/coverlet.collector/build/coverlet.collector.targets#L35 -->
+  <Target Condition="'$(NETCoreSdkVersion)' != '' and '$(DisableMsCoverageReferencedPathMaps)' != 'true'" Name="MsCoverageReferencedPathMaps" BeforeTargets="CoreCompile" DependsOnTargets="ResolveProjectReferences" >
+    <MSBuild Projects="@(AnnotatedProjects->'%(FullPath)')"
+             Targets="$(_msCoverageSourceRootTargetName)"
+             Properties="TargetFramework=%(AnnotatedProjects.NearestTargetFramework)"
+             SkipNonexistentTargets="true">
+      <Output TaskParameter="TargetOutputs"
+              ItemName="_msCoverageLocalTopLevelSourceRoot" />
+    </MSBuild>
+    <ItemGroup>
+      <_msCoverageByProject Include="@(_msCoverageLocalTopLevelSourceRoot->'%(MSBuildSourceProjectFile)')" OriginalPath="%(Identity)" />
+      <_msCoverageMapping Include="@(_msCoverageByProject->'%(Identity)|%(OriginalPath)=%(MappedPath)')" />
+    </ItemGroup>
+    <PropertyGroup>
+      <_msCoverageSourceRootMappingFilePath>$([MSBuild]::EnsureTrailingSlash('$(OutputPath)')).msCoverageSourceRootsMapping_$(AssemblyName)</_msCoverageSourceRootMappingFilePath>
+    </PropertyGroup>
+    <WriteLinesToFile File="$(_msCoverageSourceRootMappingFilePath)" Lines="@(_msCoverageMapping)"
+                      Overwrite="true" Encoding="Unicode"
+                      Condition="'@(_msCoverageMapping)'!=''"
+                      WriteOnlyWhenDifferent="true" />
+    <ItemGroup>
+      <FileWrites Include="$(_msCoverageSourceRootMappingFilePath)" Condition="'@(_msCoverageMapping)'!=''" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/package/ThirdPartyNoticesCodeCoverage.txt b/src/package/Microsoft.CodeCoverage/ThirdPartyNoticesCodeCoverage.txt
similarity index 100%
rename from src/package/ThirdPartyNoticesCodeCoverage.txt
rename to src/package/Microsoft.CodeCoverage/ThirdPartyNoticesCodeCoverage.txt
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj
new file mode 100644
index 0000000000..6c3cb6a586
--- /dev/null
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.NET.Test.Sdk.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.NET.Test.Sdk</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      The MSbuild targets and properties for building .NET test projects.
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="netcoreapp\Microsoft.NET.Test.Sdk.Program.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="netcoreapp\Microsoft.NET.Test.Sdk.Program.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="_._">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Microsoft.NET.Test.Sdk.props">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Microsoft.NET.Test.Sdk.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="netcoreapp\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="netfx\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
new file mode 100644
index 0000000000..13812afbd9
--- /dev/null
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
+        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
+      </group>
+
+      <group targetFramework="net462">
+        <!-- TestHost gets shipped with vstest.console -->
+        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
+      </group>
+
+      <group targetFramework="native0.0">
+      </group>
+      
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <file src="netstandard2.0\netcoreapp\*" target="build\net8.0\" />
+    <file src="netstandard2.0\netfx\*" target="build\net462\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\net462\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\net8.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net8.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\net462\" />
+
+    <!-- Add incompatibility error, and add the props, in case user decides to ignore it. -->
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\netcoreapp2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netcoreapp2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netcoreapp2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="buildMultiTargeting\netstandard2.0\" />
+
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.props" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.NET.Test.Sdk.targets" target="build\netstandard2.0\" />
+
+    <file src="netstandard2.0\_._" target="lib/net8.0" />
+    <file src="netstandard2.0\_._" target="lib/net462" />
+
+    <file src="netstandard2.0\_._" target="lib/native" />
+  </files>
+</package>
diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.props b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.props
similarity index 100%
rename from src/package/nuspec/Microsoft.NET.Test.Sdk.props
rename to src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.props
diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
new file mode 100644
index 0000000000..d2d47da66e
--- /dev/null
+++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.targets
@@ -0,0 +1,6 @@
+<Project InitialTargets="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0">
+  <Target Name="NonCompatibleTargetFrameworkError_Microsoft_NET_Test_Sdk_net8_0"
+          Condition="'$(SuppressTfmSupportBuildErrors)' == ''">
+    <Error Text="Microsoft.NET.Test.Sdk doesn't support $(TargetFramework) and has not been tested with it. Consider upgrading your TargetFramework to net8.0 or later. You may also set &lt;SuppressTfmSupportBuildErrors&gt;true&lt;/SuppressTfmSupportBuildErrors&gt; in the project file to ignore this warning and attempt to run in this unsupported configuration at your own risk." />
+  </Target>
+</Project>
diff --git a/src/package/Microsoft.NET.Test.Sdk/_._ b/src/package/Microsoft.NET.Test.Sdk/_._
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.cs b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.cs
similarity index 100%
rename from src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.cs
rename to src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.cs
diff --git a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.fs b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.fs
similarity index 100%
rename from src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.fs
rename to src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.fs
diff --git a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.vb b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.vb
similarity index 100%
rename from src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.Program.vb
rename to src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.Program.vb
diff --git a/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
new file mode 100644
index 0000000000..575fd6be00
--- /dev/null
+++ b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
@@ -0,0 +1,61 @@
+<!--
+ ***********************************************************************************************
+ Microsoft.NET.Test.Sdk.targets
+
+ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+           created a backup copy.  Incorrect changes to this file will make it
+           impossible to load or build your projects from the command-line or the IDE.
+
+ Copyright (c) .NET Foundation. All rights reserved. 
+ ***********************************************************************************************
+-->
+
+<Project InitialTargets="GenerateProgramFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Output type for .NET Core test projects should be exe.
+    https://devdiv.visualstudio.com/DevDiv/_workitems?id=375688&_a=edit
+    Note: we skip this for WinUI and UWP apps, as they must use 'WinExe'.
+  -->
+  <PropertyGroup>
+    <OutputType Condition="'$(UseWinUI)' != 'true' AND '$(UseUwpTools)' != 'true'">Exe</OutputType>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GeneratedProgramFile Condition="'$(GeneratedProgramFile)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.Test.Sdk.Program$(DefaultLanguageSourceExtension)</GeneratedProgramFile>
+
+    <!--
+      We always skip the generated entry point for UWP apps on .NET 9, as those need a separate entry point
+      to initialize the 'CoreApplication' app, which is handled separately. That is, it will either be in
+      the project template, or generated by the XAML compiler (for UWP XAML apps). We also do the same
+      for WinUI apps, since those also have a special entry point produced by the XAML compiler.
+  -->
+    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == '' AND ('$(UseWinUI)' == 'true' OR '$(UseUwpTools)' == 'true')">false</GenerateProgramFile>
+    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
+  </PropertyGroup>
+
+  <!--
+    ============================================================
+    GenerateProgramFile
+    Generates Program file which contains the Main entry point
+    ============================================================
+  -->
+  <Target Name="GenerateProgramFile"
+          Condition="'$(GenerateProgramFile)' == 'true'">
+
+    <ItemGroup Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
+      <RemoveExistingMicrosoftNETTestSdkProgram Include="@(Compile)" Condition="'%(FileName)' == 'Microsoft.NET.Test.Sdk.Program'" />
+      <Compile Remove="@(RemoveExistingMicrosoftNETTestSdkProgram)" />
+      <Compile Include="$(GeneratedProgramFile)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)' == 'F#'">
+      <ProgramCompiles Include="@(Compile)" Condition="'%(Identity)' == 'Program.fs'" />
+      <CompileAfter Include="$(GeneratedProgramFile)" Condition="@(ProgramCompiles-&gt;Count()) == 0" />
+    </ItemGroup>
+
+    <Warning Condition="@(ProgramCompiles-&gt;Count()) != 0" Text="A 'Program.fs' file can be automatically generated for F# .NET Core test projects. To fix this warning, either delete the file from the project, or set the &lt;GenerateProgramFile&gt; property to 'false'." />
+
+  </Target>
+
+</Project>
diff --git a/src/package/nuspec/netfx/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/netfx/Microsoft.NET.Test.Sdk.targets
similarity index 100%
rename from src/package/nuspec/netfx/Microsoft.NET.Test.Sdk.targets
rename to src/package/Microsoft.NET.Test.Sdk/netfx/Microsoft.NET.Test.Sdk.targets
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
new file mode 100644
index 0000000000..d07e188d4d
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
@@ -0,0 +1,110 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>$(NetSDKTargetFramework);$(TestHostAllTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' != 'true' ">Microsoft.TestPlatform.CLI.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' != 'true'">Microsoft.TestPlatform.CLI.sourcebuild.nuspec</NuspecFile>
+    <NuspecFile Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec</NuspecFile>
+    <IsPackable>true</IsPackable>
+    <!-- This package is included even in source build -->
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.CLI</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageProjectUrl>https://github.com/microsoft/vstest</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/microsoft/vstest</RepositoryUrl>
+    <PackageDescription>
+      The cross platform Microsoft Test Platform.
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
+    <NuspecProperty Include="TesthostRuntimeconfig=$(RepoRoot)temp\testhost" />
+    <NuspecProperty Include="SourceBuildTfmPrevious=$(NetPrevious)" />
+    <NuspecProperty Include="SourceBuildTfmCurrent=$(NetCurrent)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- NU5100: No dlls in lib folder -->
+    <NoWarn>$(NoWarn);NU5100</NoWarn>
+    <!--
+      Sometimes NU1702 is not suppressed correctly, so force reducing severity of the warning.
+      See https://github.com/NuGet/Home/issues/9147
+    -->
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <!-- runner and runner dependencies -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetSDKTargetFramework)'))
+                        or '$(DotNetBuildSourceOnly)' == 'true'">
+    <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
+    <!-- EventLogCollector only works on Windows and .NET Framework. -->
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"
+                      SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"
+                      Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
+  </ItemGroup>
+
+  <!-- datacollectors are taken from both .NET and .NET Framework -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetSDKTargetFramework)'))
+              or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))
+              or '$(DotNetBuildSourceOnly)' == 'true'">
+    <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
+    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" GeneratePathProperty="true" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="$(MicrosoftDiagnosticsNETCoreClientVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" Condition="'$(TargetFramework)'=='$(NetFrameworkRunnerTargetFramework)'" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" Condition="'$(TargetFramework)' != 'NetFrameworkRunnerTargetFramework'" />
+  </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="Build">
+    <ItemGroup>
+      <MicrosoftCodeCoverageIO Include="$(PkgMicrosoft_CodeCoverage_IO)\lib\netstandard2.0\**\*"></MicrosoftCodeCoverageIO>
+      <MicrosoftExtensionsDependencyModel Include="$(PkgMicrosoft_Extensions_DependencyModel)\lib\netstandard2.0\*"></MicrosoftExtensionsDependencyModel>
+      <MicrosoftExtensionsFileSystemGlobbing Include="$(PkgMicrosoft_Extensions_FileSystemGlobbing)\lib\netstandard2.0\*"></MicrosoftExtensionsFileSystemGlobbing>
+      <NewtonsoftJson Include="$(PkgNewtonsoft_Json)\lib\netstandard2.0\*"></NewtonsoftJson>
+      <MicrosoftInternalDia Include="$(PkgMicrosoft_Internal_Dia)\tools\netstandard\**\*"></MicrosoftInternalDia>
+      <SystemComponentModelComposition Include="$(PkgSystem_ComponentModel_Composition)\lib\netstandard2.0\**\*"></SystemComponentModelComposition>
+      <MicrosoftDiagnosticsNETCoreClient Include="$(PkgMicrosoft_Diagnostics_NETCore_Client)\lib\netstandard2.0\**\*"></MicrosoftDiagnosticsNETCoreClient>
+      <MicrosoftInternalDia Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\**\*"></MicrosoftInternalDia>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftCodeCoverageIO)" DestinationFiles="$(OutDir)\Microsoft.CodeCoverage.IO\%(RecursiveDir)%(Filename)%(Extension)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <Copy SourceFiles="@(MicrosoftExtensionsDependencyModel)" DestinationFiles="$(OutDir)\Microsoft.Extensions.DependencyModel\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftExtensionsFileSystemGlobbing)" DestinationFiles="$(OutDir)\Microsoft.Extensions.FileSystemGlobbing\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(NewtonsoftJson)" DestinationFiles="$(OutDir)\Newtonsoft.Json\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemComponentModelComposition)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftDiagnosticsNETCoreClient)" DestinationFiles="$(OutDir)\Microsoft.Diagnostics.NETCore.Client\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalDia)" DestinationFiles="$(OutDir)\Microsoft.Internal.Dia\%(RecursiveDir)%(Filename)%(Extension)" />
+  </Target>
+
+</Project>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
new file mode 100644
index 0000000000..905e3042f3
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -0,0 +1,426 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <contentFiles>
+      <files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
+    </contentFiles>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <file src="net9.0\datacollector.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.dll.config" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.deps.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\datacollector.runtimeconfig.json" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\System.ComponentModel.Composition.dll" target="contentFiles\any\net9.0" />
+
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\testhost.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\testhost.deps.json" target="contentFiles\any\net9.0" />
+
+    <file src="net9.0\vstest.console.dll" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.dll.config" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.deps.json" target="contentFiles\any\net9.0" />
+    <file src="net9.0\vstest.console.runtimeconfig.json" target="contentFiles\any\net9.0" />
+
+    <!-- Extensions -->
+    <file src="net9.0\DumpMinitool.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.x86.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.x86.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.arm64.exe" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\DumpMinitool.arm64.exe.config" target="contentFiles\any\net9.0\Extensions\dump" />
+    <file src="net9.0\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\net9.0\Extensions" />
+    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\net9.0\Extensions" />
+
+    <!-- TestHostNetFramework -->
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll"          target="contentFiles\any\net9.0\TestHostNetFramework\x64" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="contentFiles\any\net9.0\TestHostNetFramework\x64" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll"          target="contentFiles\any\net9.0\TestHostNetFramework\x86" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="contentFiles\any\net9.0\TestHostNetFramework\x86" />
+
+    <file src="net48\datacollector.exe" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\datacollector.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net48\datacollector.arm64.exe" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\datacollector.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.x86.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.x86.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.x86.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.x86.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.x86.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.x86.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.x86.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.x86.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\testhost.arm64.exe"               target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\testhost.arm64.exe.config"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net47\testhost.net47.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.arm64.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net471\testhost.net471.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.arm64.exe"        target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net472\testhost.net472.arm64.exe.config" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net48\testhost.net48.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.arm64.exe"          target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net481\testhost.net481.arm64.exe.config"   target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\Newtonsoft.Json.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <file src="net462\System*.dll" exclude="net462\System.ComponentModel.Composition.dll;net462\System.Threading.Tasks.Extensions.dll;net462\System.Diagnostics.DiagnosticSource.dll;net462\System.Text.Json.dll;net462\System.Text.Encodings.Web.dll;net462\System.IO.Pipelines.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\netstandard.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+    <file src="net462\Microsoft.Win32.Primitives.dll" target="contentFiles\any\net9.0\TestHostNetFramework" />
+
+    <!-- Resources -->
+    <file src="net9.0\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"   target="contentFiles\any\net9.0\TestHostNetFramework\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"      target="contentFiles\any\net9.0\TestHostNetFramework\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="contentFiles\any\net9.0\TestHostNetFramework\zh-Hant" />
+
+    <file src="net9.0\cs\vstest.console.resources.dll" target="contentFiles\any\net9.0\cs" />
+    <file src="net9.0\de\vstest.console.resources.dll" target="contentFiles\any\net9.0\de" />
+    <file src="net9.0\es\vstest.console.resources.dll" target="contentFiles\any\net9.0\es" />
+    <file src="net9.0\fr\vstest.console.resources.dll" target="contentFiles\any\net9.0\fr" />
+    <file src="net9.0\it\vstest.console.resources.dll" target="contentFiles\any\net9.0\it" />
+    <file src="net9.0\ja\vstest.console.resources.dll" target="contentFiles\any\net9.0\ja" />
+    <file src="net9.0\ko\vstest.console.resources.dll" target="contentFiles\any\net9.0\ko" />
+    <file src="net9.0\pl\vstest.console.resources.dll" target="contentFiles\any\net9.0\pl" />
+    <file src="net9.0\pt-BR\vstest.console.resources.dll" target="contentFiles\any\net9.0\pt-BR" />
+    <file src="net9.0\ru\vstest.console.resources.dll" target="contentFiles\any\net9.0\ru" />
+    <file src="net9.0\tr\vstest.console.resources.dll" target="contentFiles\any\net9.0\tr" />
+    <file src="net9.0\zh-Hans\vstest.console.resources.dll" target="contentFiles\any\net9.0\zh-Hans" />
+    <file src="net9.0\zh-Hant\vstest.console.resources.dll" target="contentFiles\any\net9.0\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+
+    <file src="net9.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\cs" />
+    <file src="net9.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\de" />
+    <file src="net9.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\es" />
+    <file src="net9.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\fr" />
+    <file src="net9.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\it" />
+    <file src="net9.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ja" />
+    <file src="net9.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ko" />
+    <file src="net9.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pl" />
+    <file src="net9.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\pt-BR" />
+    <file src="net9.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\ru" />
+    <file src="net9.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\tr" />
+    <file src="net9.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hans" />
+    <file src="net9.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\net9.0\Extensions\zh-Hant" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
new file mode 100644
index 0000000000..fe469909cf
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <contentFiles>
+      <files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
+    </contentFiles>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <file src="$SourceBuildTfmPrevious$\datacollector.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\datacollector.dll.config" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.dll.config" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\datacollector.deps.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\datacollector.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmPrevious$\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmPrevious$\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\System.ComponentModel.Composition.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\System.ComponentModel.Composition.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\testhost.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\testhost.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\testhost.deps.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\testhost.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmPrevious$\vstest.console.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\vstest.console.dll.config" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.dll.config" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\vstest.console.deps.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmPrevious$\vstest.console.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <!-- Extensions -->
+    <file src="$SourceBuildTfmPrevious$\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+
+    <!-- Resources -->
+    <!-- Copy all, except the excluded, because those belong to Extensions folder. -->
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" exclude="**.TestHostRuntimeProvider**;**BlameDataCollector**" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" exclude="**.TestHostRuntimeProvider**;**BlameDataCollector**" />
+
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    
+    <!-- Copy all, except the excluded, because those belong to Extensions folder. -->
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.VisualStudio.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" exclude="**Html**;**Trx**" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" exclude="**Html**;**Trx**" />
+
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmPrevious$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+
+
+    <file src="$SourceBuildTfmPrevious$\**\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfmPrevious$" />
+    <file src="$SourceBuildTfmCurrent$\**\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec
new file mode 100644
index 0000000000..9a3222b6d0
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.product.nuspec
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <contentFiles>
+      <files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
+    </contentFiles>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <file src="$SourceBuildTfmCurrent$\datacollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.dll.config" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\datacollector.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CoreUtilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.CrossPlatEngine.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Utilities.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmCurrent$\Newtonsoft.Json\Newtonsoft.Json.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\System.ComponentModel.Composition.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-9.0.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\testhost.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\testhost.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <file src="$SourceBuildTfmCurrent$\vstest.console.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.dll.config" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.deps.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+    <file src="$SourceBuildTfmCurrent$\vstest.console.runtimeconfig.json" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+
+    <!-- Extensions -->
+    <file src="$SourceBuildTfmCurrent$\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.TestPlatform.TesthostRuntimeProvider.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+
+    <!-- Resources -->
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" exclude="**.TestHostRuntimeProvider**;**BlameDataCollector**" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.*.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" exclude="**Html**;**Trx**" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    <file src="$SourceBuildTfmCurrent$\**\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$\Extensions" />
+    
+    <file src="$SourceBuildTfmCurrent$\**\vstest.console.resources.dll" target="contentFiles\any\$SourceBuildTfmCurrent$" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.csproj b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.csproj
new file mode 100644
index 0000000000..bf5d4d1ad6
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IsPackable Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</IsPackable>
+    <!-- This is an internal package not meant to be published outside -->
+    <IsShippingPackage>false</IsShippingPackage>
+    <NuspecFile>Microsoft.TestPlatform.Internal.Uwp.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.Internal.Uwp</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      Internal Microsoft Test Platform libraries for UWP runner.
+    </PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec
new file mode 100644
index 0000000000..0eed862a9a
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="netstandard2.0"></group>
+    </dependencies>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="netstandard2.0\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="netstandard2.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="netstandard2.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="netstandard2.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="netstandard2.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="netstandard2.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="netstandard2.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="netstandard2.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="netstandard2.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="netstandard2.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="netstandard2.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="netstandard2.0\Microsoft.TestPlatform.CrossPlatEngine.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.Utilities.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard2.0\" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
new file mode 100644
index 0000000000..33fde7df1b
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
@@ -0,0 +1,101 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!--  $(NetPortableTargetFrameworks); should be added here, but it makes net8.0 duplicate and nuget restore fails.  -->
+    <TargetFrameworks>$(TestHostAllTargetFrameworks);netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <!--
+      Sometimes NU1702 is not suppressed correctly, so force reducing severity of the warning.
+      See https://github.com/NuGet/Home/issues/9147
+    -->
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Don't produce this package when building the .NET product as it relies on a VS license. -->
+    <IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.Portable.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.Portable</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      This package contains a subset of binaries for the Visual Studio Test Platform (vstest).
+      Vstest provides a modern, cross platform testing engine that also powers the testing on .NET Core.
+      Supports the following popular test frameworks: MSTest v2, xUnit and Nunit with support for extensibility.
+
+      Visit https://github.com/microsoft/vstest to know more about vstest platform.
+      For running tests based on the MSTest v1 framework, .orderedtest, .webtest and .generictest please use Microsoft.TestPlatform package.
+    </PackageDescription>
+    <!-- Override default license -->
+    <PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
+    <PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)')) or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)'))">
+    <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
+    <ProjectReference Include="..\..\vstest.console.arm64\vstest.console.arm64.csproj" />
+    <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
+    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
+
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="Build">
+    <ItemGroup>
+      <MicrosoftCodeCoverageIO Include="$(PkgMicrosoft_CodeCoverage_IO)\lib\netstandard2.0\**\*" />
+      <MicrosoftExtensionsDependencyModel Include="$(PkgMicrosoft_Extensions_DependencyModel)\lib\netstandard2.0\*" />
+      <MicrosoftExtensionsFileSystemGlobbing Include="$(PkgMicrosoft_Extensions_FileSystemGlobbing)\lib\netstandard2.0\*" />
+      <NewtonsoftJson Include="$(PkgNewtonsoft_Json)\lib\netstandard2.0\*" />
+      <SystemCollectionsImmutable Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\*" />
+      <SystemReflectionMetadata Include="$(PkgSystem_Reflection_Metadata)\lib\netstandard2.0\*" />
+      <MicrosoftInternalDia Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\**\*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftCodeCoverageIO)" DestinationFiles="$(OutDir)\Microsoft.CodeCoverage.IO\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftExtensionsDependencyModel)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftExtensionsFileSystemGlobbing)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(NewtonsoftJson)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemCollectionsImmutable)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemReflectionMetadata)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalDia)" DestinationFiles="$(OutDir)\Microsoft.Internal.Dia\%(RecursiveDir)%(Filename)%(Extension)" />
+  </Target>
+</Project>
diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
new file mode 100644
index 0000000000..404c1ad2c0
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.nuspec
@@ -0,0 +1,656 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <!-- net48 -->
+    <file src="net48\datacollector.exe" target="tools\net462\datacollector.exe" />
+    <file src="net48\datacollector.exe.config" target="tools\net462\datacollector.exe.config" />
+
+    <file src="net48\datacollector.arm64.exe" target="tools\net462\datacollector.arm64.exe" />
+    <file src="net48\datacollector.arm64.exe.config"	target="tools\net462\datacollector.arm64.exe.config" />
+
+    <file src="net48\Microsoft.Extensions.DependencyModel.dll"	target="tools\net462\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="net48\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net462\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net462\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net462\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll"	target="tools\net462\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net462\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+
+    <file src="net48\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\cs\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\de\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\es\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\fr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\it\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ja\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ko\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pl\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	  target="tools\net462\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ru\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\tr\Microsoft.CodeCoverage.IO.resources.dll"	    target="tools\net462\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net462\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\Newtonsoft.Json.dll"	target="tools\net462\Newtonsoft.Json.dll" />
+    <file src="net48\System.Collections.Immutable.dll"	target="tools\net462\System.Collections.Immutable.dll" />
+    
+    <file src="net48\System.Reflection.Metadata.dll"	target="tools\net462\System.Reflection.Metadata.dll" />
+    <file src="net48\System.Memory.dll" target="tools\net462\System.Memory.dll" />
+    <file src="net48\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\System.Runtime.CompilerServices.Unsafe.dll" />
+    <file src="net48\System.Numerics.Vectors.dll" target="tools\net462\System.Numerics.Vectors.dll" />
+    <file src="net48\System.Buffers.dll" target="tools\net462\System.Buffers.dll" />
+    
+    <file src="net462\System.Runtime.InteropServices.RuntimeInformation.dll"	target="tools\net462\System.Runtime.InteropServices.RuntimeInformation.dll" />
+    <file src="net462\testhost.exe"	target="tools\net462\testhost.exe" />
+    <file src="net462\testhost.exe.config"	target="tools\net462\testhost.exe.config" />
+    <file src="net47\testhost.net47.exe"	target="tools\net462\testhost.net47.exe" />
+    <file src="net47\testhost.net47.exe.config"	target="tools\net462\testhost.net47.exe.config" />
+    <file src="net471\testhost.net471.exe"	target="tools\net462\testhost.net471.exe" />
+    <file src="net471\testhost.net471.exe.config"	target="tools\net462\testhost.net471.exe.config" />
+    <file src="net472\testhost.net472.exe"	target="tools\net462\testhost.net472.exe" />
+    <file src="net472\testhost.net472.exe.config"	target="tools\net462\testhost.net472.exe.config" />
+    <file src="net48\testhost.net48.exe"	target="tools\net462\testhost.net48.exe" />
+    <file src="net48\testhost.net48.exe.config"	target="tools\net462\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe"	target="tools\net462\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config"	target="tools\net462\testhost.net481.exe.config" />
+
+    <file src="net462\testhost.x86.exe"	target="tools\net462\testhost.x86.exe" />
+    <file src="net462\testhost.x86.exe.config"	target="tools\net462\testhost.x86.exe.config" />
+    <file src="net47\testhost.net47.x86.exe"	target="tools\net462\testhost.net47.x86.exe" />
+    <file src="net47\testhost.net47.x86.exe.config"	target="tools\net462\testhost.net47.x86.exe.config" />
+    <file src="net471\testhost.net471.x86.exe"	target="tools\net462\testhost.net471.x86.exe" />
+    <file src="net471\testhost.net471.x86.exe.config"	target="tools\net462\testhost.net471.x86.exe.config" />
+    <file src="net472\testhost.net472.x86.exe"	target="tools\net462\testhost.net472.x86.exe" />
+    <file src="net472\testhost.net472.x86.exe.config"	target="tools\net462\testhost.net472.x86.exe.config" />
+    <file src="net48\testhost.net48.x86.exe"	target="tools\net462\testhost.net48.x86.exe" />
+    <file src="net48\testhost.net48.x86.exe.config"	target="tools\net462\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe"	target="tools\net462\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config"	target="tools\net462\testhost.net481.x86.exe.config" />
+
+    <file src="net462\testhost.arm64.exe"	target="tools\net462\testhost.arm64.exe" />
+    <file src="net462\testhost.arm64.exe.config"	target="tools\net462\testhost.arm64.exe.config" />
+    <file src="net47\testhost.net47.arm64.exe"	target="tools\net462\testhost.net47.arm64.exe" />
+    <file src="net47\testhost.net47.arm64.exe.config"	target="tools\net462\testhost.net47.arm64.exe.config" />
+    <file src="net471\testhost.net471.arm64.exe"	target="tools\net462\testhost.net471.arm64.exe" />
+    <file src="net471\testhost.net471.arm64.exe.config"	target="tools\net462\testhost.net471.arm64.exe.config" />
+    <file src="net472\testhost.net472.arm64.exe"	target="tools\net462\testhost.net472.arm64.exe" />
+    <file src="net472\testhost.net472.arm64.exe.config"	target="tools\net462\testhost.net472.arm64.exe.config" />
+    <file src="net48\testhost.net48.arm64.exe"	target="tools\net462\testhost.net48.arm64.exe" />
+    <file src="net48\testhost.net48.arm64.exe.config"	target="tools\net462\testhost.net48.arm64.exe.config" />
+    <file src="net481\testhost.net481.arm64.exe"	target="tools\net462\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config"	target="tools\net462\testhost.net481.arm64.exe.config" />
+
+    <file src="net48\vstest.console.exe"	target="tools\net462\vstest.console.exe" />
+    <file src="net48\vstest.console.exe.config"	target="tools\net462\vstest.console.exe.config" />
+    <file src="net48\vstest.console.arm64.exe"	target="tools\net462\vstest.console.arm64.exe" />
+    <file src="net48\vstest.console.arm64.exe.config"	target="tools\net462\vstest.console.arm64.exe.config" />
+
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\cs\vstest.console.resources.dll"	target="tools\net462\cs\vstest.console.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\vstest.console.resources.dll"	target="tools\net462\de\vstest.console.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\vstest.console.resources.dll"	target="tools\net462\es\vstest.console.resources.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+
+    <file src="net48\DumpMinitool.exe" target="tools\net462\Extensions\dump\DumpMinitool.exe" />
+    <file src="net48\DumpMinitool.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.exe.config" />
+
+    <file src="net48\DumpMinitool.x86.exe" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net48\DumpMinitool.x86.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.x86.exe.config" />
+
+    <file src="net48\DumpMinitool.arm64.exe" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net48\DumpMinitool.arm64.exe.config" target="tools\net462\Extensions\dump\DumpMinitool.arm64.exe.config" />
+
+    <file src="net48\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net462\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net462\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net462\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net462\Extensions\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
+
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\vstest.console.resources.dll"	target="tools\net462\fr\vstest.console.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\vstest.console.resources.dll"	target="tools\net462\it\vstest.console.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\vstest.console.resources.dll"	target="tools\net462\ja\vstest.console.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\vstest.console.resources.dll"	target="tools\net462\ko\vstest.console.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\vstest.console.resources.dll"	target="tools\net462\pl\vstest.console.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\vstest.console.resources.dll"	target="tools\net462\pt-BR\vstest.console.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\vstest.console.resources.dll"	target="tools\net462\ru\vstest.console.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\vstest.console.resources.dll"	target="tools\net462\tr\vstest.console.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hans\vstest.console.resources.dll"	target="tools\net462\zh-Hans\vstest.console.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net462\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net462\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net462\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\vstest.console.resources.dll"	target="tools\net462\zh-Hant\vstest.console.resources.dll" />
+
+    <!-- net8.0 -->
+    <file src="net8.0\datacollector.deps.json"	target="tools\net8.0\datacollector.deps.json" />
+    <file src="net8.0\datacollector.dll"	target="tools\net8.0\datacollector.dll" />
+    <file src="net8.0\datacollector.dll.config"	target="tools\net8.0\datacollector.dll.config" />
+    <file src="net8.0\datacollector.runtimeconfig.json"	target="tools\net8.0\datacollector.runtimeconfig.json" />
+    <file src="netstandard2.0\Microsoft.Extensions.DependencyModel.dll"	target="tools\net8.0\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net8.0\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.Utilities.dll"	target="tools\net8.0\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\net8.0\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\Microsoft.CodeCoverage.IO.dll"	target="tools\net8.0\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\cs\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\de\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\es\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\fr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\it\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ja\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ko\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pl\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\pt-BR\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\ru\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\tr\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="netstandard2.0\Microsoft.CodeCoverage.IO\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\net8.0\Newtonsoft.Json.dll" />
+    <file src="net8.0\vstest.console.deps.json"	target="tools\net8.0\vstest.console.deps.json" />
+    <file src="net8.0\vstest.console.dll"	target="tools\net8.0\vstest.console.dll" />
+    <file src="net8.0\vstest.console.dll.config"	target="tools\net8.0\vstest.console.dll.config" />
+    <file src="net8.0\vstest.console.runtimeconfig.json"	target="tools\net8.0\vstest.console.runtimeconfig.json" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\cs\vstest.console.resources.dll"	target="tools\net8.0\cs\vstest.console.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\de\vstest.console.resources.dll"	target="tools\net8.0\de\vstest.console.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\es\vstest.console.resources.dll"	target="tools\net8.0\es\vstest.console.resources.dll" />
+
+    <file src="net8.0\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net8.0\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+
+    <file src="net8.0\DumpMinitool.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.exe" />
+    <file src="net8.0\DumpMinitool.exe.config" target="tools\net8.0\Extensions\dump\DumpMinitool.exe.config" />
+
+    <file src="net8.0\DumpMinitool.x86.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net8.0\DumpMinitool.x86.exe.config" target="tools\net8.0\Extensions\dump\DumpMinitool.x86.exe.config" />
+
+    <file src="net8.0\DumpMinitool.arm64.exe" target="tools\net8.0\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net8.0\DumpMinitool.arm64.exe.config" target="tools\net8.0\dump\Extensions\dump\DumpMinitool.arm64.exe.config" />
+
+    <file src="net8.0\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net8.0\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net8.0\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net8.0\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\fr\vstest.console.resources.dll"	target="tools\net8.0\fr\vstest.console.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\it\vstest.console.resources.dll"	target="tools\net8.0\it\vstest.console.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ja\vstest.console.resources.dll"	target="tools\net8.0\ja\vstest.console.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ko\vstest.console.resources.dll"	target="tools\net8.0\ko\vstest.console.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pl\vstest.console.resources.dll"	target="tools\net8.0\pl\vstest.console.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pt-BR\vstest.console.resources.dll"	target="tools\net8.0\pt-BR\vstest.console.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ru\vstest.console.resources.dll"	target="tools\net8.0\ru\vstest.console.resources.dll" />
+
+    <file src="net48\datacollector.exe"	target="tools\net8.0\TestHostNetFramework\datacollector.exe" />
+    <file src="net48\datacollector.exe.config"	target="tools\net8.0\TestHostNetFramework\datacollector.exe.config" />
+
+    <file src="net8.0\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net8.0\Microsoft.TestPlatform.Utilities.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net8.0\TestHostNetFramework\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="netstandard2.0\Newtonsoft.Json.dll"	target="tools\net8.0\TestHostNetFramework\Newtonsoft.Json.dll" />
+    <file src="netstandard2.0\System.Collections.Immutable.dll"	target="tools\net8.0\TestHostNetFramework\System.Collections.Immutable.dll" />
+    <file src="netstandard2.0\System.Reflection.Metadata.dll"	target="tools\net8.0\TestHostNetFramework\System.Reflection.Metadata.dll" />
+
+    <file src="net462\testhost.exe"	target="tools\net8.0\TestHostNetFramework\testhost.exe" />
+    <file src="net462\testhost.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.exe.config" />
+    <file src="net47\testhost.net47.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.exe" />
+    <file src="net47\testhost.net47.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.exe.config" />
+    <file src="net471\testhost.net471.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.exe" />
+    <file src="net471\testhost.net471.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.exe.config" />
+    <file src="net472\testhost.net472.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.exe" />
+    <file src="net472\testhost.net472.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.exe.config" />
+    <file src="net48\testhost.net48.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.exe" />
+    <file src="net48\testhost.net48.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.exe.config" />
+
+    <file src="net462\testhost.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.x86.exe" />
+    <file src="net462\testhost.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.x86.exe.config" />
+    <file src="net47\testhost.net47.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.x86.exe" />
+    <file src="net47\testhost.net47.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.x86.exe.config" />
+    <file src="net471\testhost.net471.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.x86.exe" />
+    <file src="net471\testhost.net471.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.x86.exe.config" />
+    <file src="net472\testhost.net472.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.x86.exe" />
+    <file src="net472\testhost.net472.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.x86.exe.config" />
+    <file src="net48\testhost.net48.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.x86.exe" />
+    <file src="net48\testhost.net48.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.x86.exe.config" />
+
+    <file src="net462\testhost.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.arm64.exe" />
+    <file src="net462\testhost.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.arm64.exe.config" />
+    <file src="net47\testhost.net47.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net47.arm64.exe" />
+    <file src="net47\testhost.net47.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net47.arm64.exe.config" />
+    <file src="net471\testhost.net471.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net471.arm64.exe" />
+    <file src="net471\testhost.net471.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net471.arm64.exe.config" />
+    <file src="net472\testhost.net472.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net472.arm64.exe" />
+    <file src="net472\testhost.net472.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net472.arm64.exe.config" />
+    <file src="net48\testhost.net48.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net48.arm64.exe" />
+    <file src="net48\testhost.net48.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net48.arm64.exe.config" />
+    <file src="net481\testhost.net481.arm64.exe"	target="tools\net8.0\TestHostNetFramework\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config"	target="tools\net8.0\TestHostNetFramework\testhost.net481.arm64.exe.config" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+
+    <file src="net8.0\Microsoft.Internal.Dia\x64\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\x64\msdia140.dll" />
+    <file src="net8.0\Microsoft.Internal.Dia\x64\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x64\msdia140.dll.manifest" />
+    <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll" />
+    <file src="net8.0\Microsoft.Internal.Dia\x86\msdia140.dll.manifest"	target="tools\net8.0\TestHostNetFramework\x86\msdia140.dll.manifest" />
+
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\TestHostNetFramework\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\tr\vstest.console.resources.dll"	target="tools\net8.0\tr\vstest.console.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hans\vstest.console.resources.dll"	target="tools\net8.0\zh-Hans\vstest.console.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net8.0\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net8.0\zh-Hant\vstest.console.resources.dll"	target="tools\net8.0\zh-Hant\vstest.console.resources.dll" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
new file mode 100644
index 0000000000..085d532b35
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
@@ -0,0 +1,58 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>$(TestHostMinimumTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Don't pack on non-Windows as it doesn't build correctly. -->
+    <IsPackable Condition="'$(OS)' == 'Windows_NT'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.TestHost.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform.TestHost</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      Testplatform host executes the test using specified adapter.
+    </PackageDescription>
+    <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="_._">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\testhost\testhost.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\testhost.x86\testhost.x86.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Target Name="CopyDiaFiles" AfterTargets="Build">
+    <ItemGroup>
+      <DiaFilesX86 Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\x86\*"></DiaFilesX86>
+      <DiaFilesX64 Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\x64\*"></DiaFilesX64>
+    </ItemGroup>
+    <Copy SourceFiles="@(DiaFilesX86)" DestinationFolder="$(OutDir)\x86" />
+    <Copy SourceFiles="@(DiaFilesX64)" DestinationFolder="$(OutDir)\x64" />
+  </Target>
+
+  <ItemGroup>
+    <None Update="Microsoft.TestPlatform.TestHost.props" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Microsoft.TestPlatform.TestHost.targets" Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
new file mode 100644
index 0000000000..4b513a4b2e
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+
+    <dependencies>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
+        <dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
+      </group>
+
+      <group targetFramework="net462"></group>
+    </dependencies>
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+
+    <!-- net462 -->
+    <file src="net8.0\_._" target="lib\net462\" />
+
+    <!-- net8.0 -->
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.*.dll" exclude="net8.0\**\Microsoft.TestPlatform.TestHost.dll" target="lib\net8.0\" />
+
+    <file src="net8.0\testhost.dll" target="lib\net8.0\" />
+    <file src="net8.0\testhost.deps.json" target="lib\net8.0\" />
+
+    <file src="net8.0\x86\msdia140.dll" target="lib\net8.0\x86\" />
+    <file src="net8.0\x64\msdia140.dll" target="lib\net8.0\x64\" />
+
+    <!--
+          We move AnyCPU version of testhost.dll, at the moment we don't have native code that needs particular architecture inside testhost.dll.
+          This prevent possible issue related to override x64(testshost.dll) compilation inside Microsoft.TestPlatform.TestHost.NetCore.prop net8.0\x64\testhost.dll to the bin folder
+          that contains AnyCPU version.
+          In case of -arch arm64/x86 with a x64 SDK on arm where we use only dotnet muxer+testhost.dll to do arch switch,
+          if we copy x64 testshost.dll we'll fail to load with `arm64/dotnet.exe exec testhost.dll`.
+          Another possible way to keep x64 version if needed is to understand if we're on -arch scenario and act as expected
+          and avoid to copy testhost.dll if we're switching to a non x64 arch.
+          This means parse/understand -arch inside msbuild, not trivial, so for now we simply copy the AnyCPU version and we keep
+          the package authoring as-is for back compatibiliy.
+    -->
+    <file src="net8.0\testhost.dll" target="build\net8.0\x64\" />
+    <file src="net8.0\testhost.exe" target="build\net8.0\x64\" />
+
+    <file src="net8.0\testhost.x86.dll" target="build\net8.0\x86\" />
+    <file src="net8.0\testhost.x86.exe" target="build\net8.0\x86\" />
+
+    <file src="net8.0\Microsoft.TestPlatform.TestHost.props" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.TestHost.targets" target="build\net8.0\" />
+
+
+    <!-- Add localized resources net8.0 -->
+    <file src="net8.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net8.0\zh-Hant" />
+
+    <file src="net8.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\net8.0\zh-Hant" />
+
+    <file src="net8.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\cs" />
+    <file src="net8.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\de" />
+    <file src="net8.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\es" />
+    <file src="net8.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\fr" />
+    <file src="net8.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\it" />
+    <file src="net8.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ja" />
+    <file src="net8.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ko" />
+    <file src="net8.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\pl" />
+    <file src="net8.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\pt-BR" />
+    <file src="net8.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\ru" />
+    <file src="net8.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\tr" />
+    <file src="net8.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\zh-Hans" />
+    <file src="net8.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net8.0\zh-Hant" />
+  </files>
+</package>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.props b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.props
new file mode 100644
index 0000000000..b57ffe1287
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.props
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" ('$(Platform)' == 'x86' OR '$(PlatformTarget)' == 'x86') AND '$(OS)' == 'Windows_NT'">
+    <Content Include="$(MSBuildThisFileDirectory)x86\testhost.x86.exe">
+      <Link>testhost.x86.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)x86\testhost.x86.dll">
+      <Link>testhost.x86.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+  <ItemGroup Condition=" ('$(Platform)'!= 'x86' AND '$(PlatformTarget)' != 'x86') AND '$(OS)' == 'Windows_NT'" >
+    <Content Include="$(MSBuildThisFileDirectory)x64\testhost.exe">
+      <Link>testhost.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)x64\testhost.dll">
+      <Link>testhost.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.targets b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.targets
new file mode 100644
index 0000000000..02bd7df7a8
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_MSTestEnableParentProcessQuery Condition="'$(UseUwpTools)'=='true'">false</_MSTestEnableParentProcessQuery>
+    <_MSTestEnableParentProcessQuery Condition="'$(_MSTestEnableParentProcessQuery)'==''">true</_MSTestEnableParentProcessQuery>
+  </PropertyGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption
+      Include="MSTest.EnableParentProcessQuery"
+      Value="$(_MSTestEnableParentProcessQuery)"
+      Trim="true" />
+  </ItemGroup>
+</Project>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/_._ b/src/package/Microsoft.TestPlatform.TestHost/_._
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
new file mode 100644
index 0000000000..5158174729
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
@@ -0,0 +1,145 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- $(NetFrameworkRunnerTargetFramework); should be added here, but it causes duplicates in tfm names and nuget restore fails -->
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!--
+      Sometimes NU1702 is not suppressed correctly, so force reducing severity of the warning.
+      See https://github.com/NuGet/Home/issues/9147
+    -->
+    <MSBuildWarningsAsMessages>NU1702;NETSDK1023</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Don't produce this package when building the .NET product as it relies on a VS license. -->
+    <IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
+    <NuspecFile>Microsoft.TestPlatform.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.TestPlatform</PackageId>
+    <PackageTags>vstest visual-studio unittest testplatform mstest microsoft test testing</PackageTags>
+    <PackageDescription>
+      This package contains the full set of binaries for the Visual Studio Test Platform (vstest).
+      It provides a modern, cross platform testing engine that powers the testing on .NET Core as well.
+      It integrates with popular test frameworks like MSTest(v1 and v2), xUnit and Nunit with support for extensibility.
+    </PackageDescription>
+    <!-- Override default license -->
+    <PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
+    <PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
+  </PropertyGroup>
+
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
+    <NuspecProperty Include="TesthostRuntimeconfig=$(RepoRoot)temp\testhost" />
+  </ItemGroup>
+
+  <!--
+    Runner dependencies are copied to the output package, and target only .NET Framework.
+  -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
+    <ProjectReference Include="..\..\vstest.console\vstest.console.csproj" />
+    <ProjectReference Include="..\..\vstest.console.arm64\vstest.console.arm64.csproj" />
+
+    <ProjectReference Include="..\..\datacollector\datacollector.csproj" />
+    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj" />
+    
+    <!-- We are forcing the reference here to .NET Framework project for both .NET and .NET Framework builds.
+    This is because we are offloading the dumping to this tool on Windows, and we need this tool to run anywhere with any selected architecture, and using .NET Framework (or eventually .NET Native)
+    prevents us from having to lookup the correct .NET runtime. -->
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool\DumpMinitool.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.x86\DumpMinitool.x86.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+    <ProjectReference Include="$(RepoRoot)src\DataCollectors\DumpMinitool.arm64\DumpMinitool.arm64.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkMinimum)" />
+
+    <ProjectReference Include="..\..\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj"  SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)"/>
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
+    <ProjectReference Include="..\..\SettingsMigrator\SettingsMigrator.csproj" />
+  </ItemGroup>
+
+  <!--
+    Testhost needs to be built for all versions of .NET Framework, and for the lowest supported version of .NET.
+  -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\testhost\testhost.csproj" />
+    <ProjectReference Include="..\..\testhost.x86\testhost.x86.csproj" />
+    <ProjectReference Include="..\..\testhost.arm64\testhost.arm64.csproj" />
+  </ItemGroup>
+  
+  <!-- 
+    We copy files from these packages, we want to update them as much as we can, so we are using the runner TFM
+    which is most likely higher than what is the minimum supported .NET Framework.
+  -->
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)')) ">
+    <PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.Intellitrace" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.Intellitrace.Extensions" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Diagnostics.Utilities" Version="$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Enterprise.AspNetHelper" Version="$(MicrosoftVisualStudioEnterpriseAspNetHelper)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.QualityTools" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.TestPlatform.Extensions" Version="$(MicrosoftInternalTestPlatformExtensions)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.TraceDataCollector" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness" Version="$(MicrosoftFakesVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVSTelemetryVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.VisualStudio.Utilities.Internal" Version="$(MicrosoftVSUtilitiesInternalVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="Build" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
+    <ItemGroup>
+      <MicrosoftCodeCoverageIOFiles Include="$(PkgMicrosoft_CodeCoverage_IO)\lib\netstandard2.0\**\*"></MicrosoftCodeCoverageIOFiles>
+      <MicrosoftExtensionsDependencyModelFiles Include="$(PkgMicrosoft_Extensions_DependencyModel)\lib\net461\*"></MicrosoftExtensionsDependencyModelFiles>
+      <MicrosoftExtensionsFileSystemGlobbingFiles Include="$(PkgMicrosoft_Extensions_FileSystemGlobbing)\lib\netstandard2.0\*"></MicrosoftExtensionsFileSystemGlobbingFiles>
+      <PlatformAbstractionsDepsJsonFiles Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\bin\$(Configuration)\$(TargetFramework)\*.deps.json"></PlatformAbstractionsDepsJsonFiles>
+      <PackageDepsJsonFiles Include="..\..\Microsoft.TestPlatform.PlatformAbstractions\bin\$(Configuration)\$(TargetFramework)\*.deps.json"></PackageDepsJsonFiles>
+      <NewtonsoftJsonFiles Include="$(PkgNewtonsoft_Json)\lib\netstandard2.0\*"></NewtonsoftJsonFiles>
+      <SystemCollectionsImmutableFiles Include="$(PkgSystem_Collections_Immutable)\lib\netstandard2.0\*"></SystemCollectionsImmutableFiles>
+      <SystemComponentModelComposition Include="$(PkgSystem_ComponentModel_Composition)\lib\netstandard2.0\**\*"></SystemComponentModelComposition>
+      <SystemReflectionMetadataFiles Include="$(PkgSystem_Reflection_Metadata)\lib\netstandard2.0\*"></SystemReflectionMetadataFiles>
+      <MicrosoftInternalDiaFiles Include="$(PkgMicrosoft_Internal_Dia)\tools\net451\**\*"></MicrosoftInternalDiaFiles>
+      <MicrosoftInternalIntellitraceFiles Include="$(PkgMicrosoft_Internal_Intellitrace)\tools\net451\**\*"></MicrosoftInternalIntellitraceFiles>
+      <MicrosoftInternalIntellitraceExtensionsFiles Include="$(PkgMicrosoft_Internal_Intellitrace_Extensions)\tools\net451\**\*"></MicrosoftInternalIntellitraceExtensionsFiles>
+      <MicrosoftVisualStudioQualityToolsFiles Include="$(PkgMicrosoft_VisualStudio_QualityTools)\tools\net451\**\*"></MicrosoftVisualStudioQualityToolsFiles>
+      <MicrosoftInternalTestPlatformExtensionsFiles Include="$(PkgMicrosoft_Internal_TestPlatform_Extensions)\tools\net451\**\*"></MicrosoftInternalTestPlatformExtensionsFiles>
+      <MicrosoftInternalCodeCoverageFiles Include="$(PkgMicrosoft_Internal_CodeCoverage)\contentFiles\MS.TP\**\*"></MicrosoftInternalCodeCoverageFiles>
+      <MicrosoftVSSDKBuildToolsFiles Include="$(PkgMicrosoft_VSSDK_BuildTools)\tools\vssdk\**\*"></MicrosoftVSSDKBuildToolsFiles>
+      <MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles Include="$(PkgMicrosoft_QualityTools_Testing_Fakes_TestRunnerHarness)\contentFiles\**\*"></MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles>
+      <MicrosoftInternalTestPlatformRemoteFiles Include="$(PkgMicrosoft_Internal_TestPlatform_Remote)\tools\netstandard\**\*"></MicrosoftInternalTestPlatformRemoteFiles>
+      <MicrosoftVisualStudioTelemetryFiles Include="$(PkgMicrosoft_VisualStudio_Telemetry)\lib\net45\**\*"></MicrosoftVisualStudioTelemetryFiles>
+      <MicrosoftVisualStudioUtilitiesInternalFiles Include="$(PkgMicrosoft_VisualStudio_Utilities_Internal)\lib\net45\**\*"></MicrosoftVisualStudioUtilitiesInternalFiles>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftCodeCoverageIOFiles)" DestinationFiles="$(OutDir)\Microsoft.CodeCoverage.IO\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftExtensionsDependencyModelFiles)" DestinationFiles="$(OutDir)\Microsoft.Extensions.DependencyModel\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftExtensionsFileSystemGlobbingFiles)" DestinationFiles="$(OutDir)\Microsoft.Extensions.FileSystemGlobbing\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(PlatformAbstractionsDepsJsonFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(NewtonsoftJsonFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemCollectionsImmutableFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemComponentModelComposition)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(SystemReflectionMetadataFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalDiaFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.Dia\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalIntellitraceFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.Intellitrace\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalIntellitraceExtensionsFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.Intellitrace.Extensions\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftVisualStudioQualityToolsFiles)" DestinationFiles="$(OutDir)\Microsoft.VisualStudio.QualityTools\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalTestPlatformExtensionsFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.TestPlatform.Extensions\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftInternalCodeCoverageFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.CodeCoverage\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftVSSDKBuildToolsFiles)" DestinationFolder="$(OutDir)\Microsoft.VSSDK.BuildTools" />
+    <Copy SourceFiles="@(MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles)" DestinationFiles="$(OutDir)\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftVisualStudioTelemetryFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Copy SourceFiles="@(MicrosoftVisualStudioUtilitiesInternalFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
+  </Target>
+</Project>
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
new file mode 100644
index 0000000000..92cab69a7b
--- /dev/null
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -0,0 +1,523 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+  </metadata>
+
+  <files>
+    $CommonFileElements$
+
+    <!-- Add a third party notice file -->
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="" />
+    <file src="$SrcPackageFolder$ThirdPartyNotices.txt" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ThirdPartyNotices.txt" />
+
+    <!-- Intellitrace -->
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" />
+    <file src="net48\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.DiaSymReader.dll" />
+    <file src="net48\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" target="tools\net462\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" />
+
+    <!-- Test Platform -->
+    <file src="net48\datacollector.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe" />
+    <file src="net48\datacollector.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.exe.config" />
+    <file src="net48\datacollector.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe" />
+    <file src="net48\datacollector.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\datacollector.arm64.exe.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.DiaSymReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.DiaSymReader.dll" />
+    <file src="net48\Microsoft.Extensions.DependencyModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.DependencyModel.dll" />
+    <file src="net48\Microsoft.Extensions.FileSystemGlobbing\Microsoft.Extensions.FileSystemGlobbing.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.FileSystemGlobbing.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CoreUtilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.Utilities.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
+    <file src="net48\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
+    <file src="net48\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
+    <file src="net48\Microsoft.VisualStudio.Diagnostics.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
+    <file src="net48\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
+    <file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Client.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Client.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="net48\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
+
+    <!-- This is needed by System.Reflection.Metadata and its dependencies. -->
+    <file src="net48\System.Reflection.Metadata.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Reflection.Metadata.dll" />
+    <file src="net48\System.Collections.Immutable.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Collections.Immutable.dll" />
+    <file src="net48\System.Memory.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Memory.dll" />
+    <file src="net48\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Runtime.CompilerServices.Unsafe.dll" />
+    <file src="net48\System.Numerics.Vectors.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Numerics.Vectors.dll" />
+    <file src="net48\System.Buffers.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\System.Buffers.dll" />
+
+    <file src="net48\System.Collections.Immutable.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\System.Collections.Immutable.dll" />
+    <!-- end System.Reflection.Metadata -->
+
+    <file src="net462\testhost.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.exe" />
+    <file src="net462\testhost.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.exe.config" />
+    <file src="net47\testhost.net47.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.exe" />
+    <file src="net47\testhost.net47.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.exe.config" />
+    <file src="net471\testhost.net471.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.exe" />
+    <file src="net471\testhost.net471.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.exe.config" />
+    <file src="net472\testhost.net472.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.exe" />
+    <file src="net472\testhost.net472.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.exe.config" />
+    <file src="net48\testhost.net48.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe" />
+    <file src="net48\testhost.net48.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe.config" />
+    <file src="net481\testhost.net481.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.exe" />
+    <file src="net481\testhost.net481.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.exe.config" />
+
+    <file src="net462\testhost.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe" />
+    <file src="net462\testhost.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe.config" />
+    <file src="net47\testhost.net47.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.x86.exe" />
+    <file src="net47\testhost.net47.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.x86.exe.config" />
+    <file src="net471\testhost.net471.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.x86.exe" />
+    <file src="net471\testhost.net471.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.x86.exe.config" />
+    <file src="net472\testhost.net472.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.x86.exe" />
+    <file src="net472\testhost.net472.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.x86.exe.config" />
+    <file src="net48\testhost.net48.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe" />
+    <file src="net48\testhost.net48.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe.config" />
+    <file src="net481\testhost.net481.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.x86.exe" />
+    <file src="net481\testhost.net481.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.x86.exe.config" />
+
+    <file src="net462\testhost.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.arm64.exe" />
+    <file src="net462\testhost.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.arm64.exe.config" />
+    <file src="net47\testhost.net47.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.arm64.exe" />
+    <file src="net47\testhost.net47.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net47.arm64.exe.config" />
+    <file src="net471\testhost.net471.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.arm64.exe" />
+    <file src="net471\testhost.net471.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net471.arm64.exe.config" />
+    <file src="net472\testhost.net472.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.arm64.exe" />
+    <file src="net472\testhost.net472.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net472.arm64.exe.config" />
+    <file src="net48\testhost.net48.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.arm64.exe" />
+    <file src="net48\testhost.net48.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net48.arm64.exe.config" />
+    <file src="net481\testhost.net481.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.arm64.exe" />
+    <file src="net481\testhost.net481.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\testhost.net481.arm64.exe.config" />
+
+    <file src="net48\vstest.console.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
+    <file src="net48\vstest.console.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
+    <file src="net48\vstest.console.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe" />
+    <file src="net48\vstest.console.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.arm64.exe.config" />
+    <file src="net48\SettingsMigrator.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
+
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\cs\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\vstest.console.resources.dll" />
+    <file src="net48\cs\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\SettingsMigrator.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\vstest.console.resources.dll" />
+    <file src="net48\de\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\SettingsMigrator.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\vstest.console.resources.dll" />
+    <file src="net48\es\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\SettingsMigrator.resources.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
+    <file src="net48\DumpMinitool.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe" />
+    <file src="net48\DumpMinitool.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.exe.config" />
+    <file src="net48\DumpMinitool.x86.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe" />
+    <file src="net48\DumpMinitool.x86.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.x86.exe.config" />
+    <file src="net48\DumpMinitool.arm64.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe" />
+    <file src="net48\DumpMinitool.arm64.exe.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\dump\DumpMinitool.arm64.exe.config" />
+    <file src="net48\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
+    <file src="net48\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
+
+    <file src="net48\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\cs\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\de\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\de\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\es\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\es\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\fr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\it\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ja\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ko\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pl\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\pt-BR\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\ru\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\tr\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.CodeCoverage.IO.dll" />
+    <file src="net48\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.CodeCoverage.IO.dll" />
+
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\x64\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\arm64\dbghelp.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\vstest.console.resources.dll" />
+    <file src="net48\fr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\fr\SettingsMigrator.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\vstest.console.resources.dll" />
+    <file src="net48\it\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\it\SettingsMigrator.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\vstest.console.resources.dll" />
+    <file src="net48\ja\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ja\SettingsMigrator.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\vstest.console.resources.dll" />
+    <file src="net48\ko\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ko\SettingsMigrator.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\vstest.console.resources.dll" />
+    <file src="net48\pl\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pl\SettingsMigrator.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\vstest.console.resources.dll" />
+    <file src="net48\pt-BR\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\pt-BR\SettingsMigrator.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\vstest.console.resources.dll" />
+    <file src="net48\ru\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\ru\SettingsMigrator.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\vstest.console.resources.dll" />
+    <file src="net48\tr\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\tr\SettingsMigrator.resources.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
+    <file src="net48\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll.manifest" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hans\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\vstest.console.resources.dll" />
+    <file src="net48\zh-Hans\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hans\SettingsMigrator.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\vstest.console.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\vstest.console.resources.dll" />
+    <file src="net48\zh-Hant\SettingsMigrator.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\zh-Hant\SettingsMigrator.resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Microsoft.IntelliTrace.Core.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll" />
+    <file src="net48\Microsoft.Internal.Intellitrace.Extensions\x86\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" />
+    <file src="net48\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" target="tools\net462\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
+    <file src="net48\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />
+
+    <!-- CodeCoverage -->
+    <file src="net48\Microsoft.Internal.CodeCoverage\TestPlatform\**\*" target="tools\net462\Common7\IDE\Extensions\TestPlatform\" />
+    <file src="net48\Microsoft.Internal.CodeCoverage\Dynamic Code Coverage Tools\**\*" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+
+    <!-- .NET Core testhost and CPP adapter -->
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\dbghelp.dll" />
+    <file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CommunicationUtilities.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CoreUtilities.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CrossPlatEngine.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.PlatformAbstractions.dll" />
+
+    <file src="net48\Microsoft.TestPlatform.Utilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.Utilities.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.Common.dll" />
+
+    <file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
+    <file src="net48\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Newtonsoft.Json.dll" />
+    <file src="net48\System.ComponentModel.Composition.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\System.ComponentModel.Composition.dll" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-1.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-1.1.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-1.1.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-2.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-2.1.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-2.1.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-3.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-3.1.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-3.1.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-5.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-5.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-6.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-6.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-7.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-7.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-8.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-8.0.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-9.0.runtimeconfig.json" />
+    <file src="$TesthostRuntimeconfig$\testhost-latest.runtimeconfig.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost-latest.runtimeconfig.json" />
+    <file src="net8.0\testhost.deps.json" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.deps.json" />
+    <file src="net8.0\testhost.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll" />
+
+    <file src="net8.0\testhost.dll.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\testhost.dll.config" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\arm64\dbghelp.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\x64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\x64\dbghelp.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
+    <file src="net48\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
+
+    <!-- External dependencies-->
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" />
+
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.VisualStudio.Fakes.DataCollector.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Fakes.DataCollector.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\DataCollector\Microsoft.Cci.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Cci.dll" />
+
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x86\FakesInstrumentationProfiler_x86.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\FakesInstrumentationProfiler_x86.config" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\x64\FakesInstrumentationProfiler_x64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\FakesInstrumentationProfiler_x64.config" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\Instrumentation\arm64\FakesInstrumentationProfiler_arm64.config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\arm64\FakesInstrumentationProfiler_arm64.config" />
+
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
+    <file src="net48\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\MicrosoftInstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="tools\net462\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
+  </files>
+</package>
diff --git a/src/package/VSIXProject/License.rtf b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf
similarity index 99%
rename from src/package/VSIXProject/License.rtf
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf
index 6785a881eb..c56b303fd6 100644
--- a/src/package/VSIXProject/License.rtf
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf
@@ -1,666 +1,666 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff43\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
-{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
-{\f11\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt \'cb\'ce\'cc\'e5};}
-{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f43\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Tahoma{\*\falt ?l?r ???};}
-{\f44\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS{\*\falt Arial};}{\f46\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@SimSun;}{\f47\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho;}
-{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 00000000000000000000}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f48\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\f49\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f51\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f52\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f53\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\f54\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f55\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f56\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f68\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}
-{\f69\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f71\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f72\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f73\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
-{\f74\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f75\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f76\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}
-{\f160\fbidi \fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f158\fbidi \fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
-{\f159\fbidi \fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f161\fbidi \fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
-{\f162\fbidi \fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f165\fbidi \fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
-{\f180\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt \'cb\'ce\'cc\'e5};}{\f418\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f419\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f421\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}
-{\f422\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f423\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f424\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f425\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\f426\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f478\fbidi \fswiss\fcharset238\fprq2 Tahoma CE{\*\falt ?l?r ???};}{\f479\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr{\*\falt ?l?r ???};}
-{\f481\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek{\*\falt ?l?r ???};}{\f482\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur{\*\falt ?l?r ???};}{\f483\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew){\*\falt ?l?r ???};}
-{\f484\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic){\*\falt ?l?r ???};}{\f485\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic{\*\falt ?l?r ???};}{\f486\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese){\*\falt ?l?r ???};}
-{\f487\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai){\*\falt ?l?r ???};}{\f488\fbidi \fswiss\fcharset238\fprq2 Trebuchet MS CE{\*\falt Arial};}{\f489\fbidi \fswiss\fcharset204\fprq2 Trebuchet MS Cyr{\*\falt Arial};}
-{\f491\fbidi \fswiss\fcharset161\fprq2 Trebuchet MS Greek{\*\falt Arial};}{\f492\fbidi \fswiss\fcharset162\fprq2 Trebuchet MS Tur{\*\falt Arial};}{\f495\fbidi \fswiss\fcharset186\fprq2 Trebuchet MS Baltic{\*\falt Arial};}
-{\f510\fbidi \fnil\fcharset0\fprq2 @SimSun Western;}{\f520\fbidi \fmodern\fcharset0\fprq1 @MS Mincho Western;}{\f518\fbidi \fmodern\fcharset238\fprq1 @MS Mincho CE;}{\f519\fbidi \fmodern\fcharset204\fprq1 @MS Mincho Cyr;}
-{\f521\fbidi \fmodern\fcharset161\fprq1 @MS Mincho Greek;}{\f522\fbidi \fmodern\fcharset162\fprq1 @MS Mincho Tur;}{\f525\fbidi \fmodern\fcharset186\fprq1 @MS Mincho Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
-{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;\cfollowedhyperlink\ctint255\cshade255\red128\green0\blue128;\red230\green230\blue230;}{\*\defchp 
-\f31506\fs22 }{\*\defpap \ql \fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
-\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \sautoupd \sqformat \spriority0 \styrsid4934124 Normal;}{\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext1 \slink15 \sqformat \styrsid4934124 heading 1;}{\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \rtlch\fcs1 
-\ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext2 \slink16 \sunhideused \sqformat \styrsid4934124 heading 2;}{\s3\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
-\tx1077\jclisttab\tx1440\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext3 \slink17 \sunhideused \sqformat \styrsid4934124 heading 3;}{\s4\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl3\outlinelevel3\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 
-\af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext4 \slink18 \sunhideused \sqformat \styrsid4934124 heading 4;}{\s5\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar
-\tx1792\jclisttab\tx2155\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl4\outlinelevel4\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext5 \slink19 \sunhideused \sqformat \styrsid4934124 heading 5;}{\s6\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar\jclisttab\tx2152\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl5\outlinelevel5\adjustright\rin0\lin2149\itap0 \rtlch\fcs1 
-\af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext6 \slink20 \sunhideused \sqformat \styrsid4934124 heading 6;}{\s7\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar
-\jclisttab\tx2509\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl6\outlinelevel6\adjustright\rin0\lin2506\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext7 \slink21 \sunhideused \sqformat \styrsid4934124 heading 7;}{\s8\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar\jclisttab\tx2866\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl7\outlinelevel7\adjustright\rin0\lin2863\itap0 \rtlch\fcs1 
-\af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext8 \slink22 \sunhideused \sqformat \styrsid4934124 heading 8;}{\s9\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar
-\jclisttab\tx3223\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl8\outlinelevel8\adjustright\rin0\lin3221\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext9 \slink23 \sunhideused \sqformat \styrsid4934124 heading 9;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
-\ql \fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
-Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\f43\fs19 \sbasedon10 \slink1 \slocked \styrsid4934124 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\f43\fs19 
-\sbasedon10 \slink2 \slocked \ssemihidden \styrsid4934124 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink3 \slocked \ssemihidden \styrsid4934124 Heading 3 Char;}{\*\cs18 \additive \rtlch\fcs1 
-\af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink4 \slocked \ssemihidden \styrsid4934124 Heading 4 Char;}{\*\cs19 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink5 \slocked \ssemihidden \styrsid4934124 Heading 5 Char;}{\*
-\cs20 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink6 \slocked \ssemihidden \styrsid4934124 Heading 6 Char;}{\*\cs21 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
-\sbasedon10 \slink7 \slocked \ssemihidden \styrsid4934124 Heading 7 Char;}{\*\cs22 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink8 \slocked \ssemihidden \styrsid4934124 Heading 8 Char;}{\*\cs23 
-\additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink9 \slocked \ssemihidden \styrsid4934124 Heading 9 Char;}{\*\cs24 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \f0\ul\cf2 \sbasedon10 \sunhideused \styrsid4934124 
-Hyperlink;}{\s25\ql \li357\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext25 \styrsid4934124 Body 1;}{\s26\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 \styrsid4934124 Bullet 2;}{\s27\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
-\jclisttab\tx1080\wrapdefault\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext27 \slink48 \styrsid4934124 Bullet 3;}{\s28\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
-\b\fs28\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid4934124 Heading EULA;}{\s29\ql \li0\ri0\sb120\sa120\widctlpar\brdrb\brdrs\brdrw10\brsp20 
-\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 \b\fs28\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid4934124 
-Heading Software Title;}{\s30\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
-\b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext30 \styrsid4934124 Preamble;}{\s31\ql \li0\ri0\sb120\sa120\widctlpar\brdrt\brdrs\brdrw10\brsp20 
-\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon30 \snext31 \styrsid4934124 
-Preamble Border Above;}{\s32\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\snext0 \styrsid4934124 Body 0 Bold;}{\s33\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \styrsid4934124 Body 0;}{\s34\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs16\alang1025 \ltrch\fcs0 
-\fs16\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext34 \slink35 \ssemihidden \sunhideused \styrsid11950712 Balloon Text;}{\*\cs35 \additive \rtlch\fcs1 \af43\afs16 \ltrch\fcs0 
-\fs16\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink34 \slocked \ssemihidden \styrsid11950712 Balloon Text Char;}{\s36\ql \fi-357\li357\ri0\sb120\sa120\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin357\itap0 
-\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext36 \styrsid11950712 Bullet 1;}{\s37\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar
-\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext37 \styrsid11950712 Bullet 4;}{\s38\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar\jclisttab\tx1795\wrapdefault\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext38 \styrsid11950712 Bullet 5;}{\s39\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
-\tx1077\jclisttab\tx1440\wrapdefault\aspalpha\aspnum\faauto\ls7\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
-\sbasedon3 \snext39 \slink50 \styrsid11950712 Heading 3 Bold;}{\s40\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\ul\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon37 \snext40 \styrsid11950712 Bullet 4 Underline;}{\*\cs41 \additive \rtlch\fcs1 \af43 \ltrch\fcs0 \f43\lang1033\langfe1033\langnp1033\langfenp1033 
-\sbasedon10 \styrsid11950712 Body 2 Char;}{\*\cs42 \additive \rtlch\fcs1 \af43 \ltrch\fcs0 \f43\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \styrsid11950712 Body 3 Char;}{\*\cs43 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 
-\sbasedon10 \ssemihidden \sunhideused \styrsid8850722 annotation reference;}{\s44\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs20\alang1025 \ltrch\fcs0 
-\fs20\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext44 \slink45 \sunhideused \styrsid8850722 annotation text;}{\*\cs45 \additive \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\f43\hich\af43\dbch\af11 
-\sbasedon10 \slink44 \slocked \styrsid8850722 Comment Text Char;}{\s46\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs20\alang1025 \ltrch\fcs0 
-\b\fs20\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon44 \snext44 \slink47 \ssemihidden \sunhideused \styrsid8850722 annotation subject;}{\*\cs47 \additive \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 
-\b\fs20\loch\f43\hich\af43\dbch\af11 \sbasedon45 \slink46 \slocked \ssemihidden \styrsid8850722 Comment Subject Char;}{\*\cs48 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink27 \slocked \styrsid2434661 
-Bullet 3 Char1;}{\s49\ql \fi-357\li357\ri0\sb120\sa120\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\ul\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon37 \snext49 \spriority0 \styrsid3941498 Bullet 4 Underlined;}{\*\cs50 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\fs19\loch\f43\hich\af43\dbch\af11 
-\sbasedon10 \slink39 \slocked \styrsid3941498 Heading 3 Bold Char;}{\s51\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs21\alang1025 \ltrch\fcs0 
-\f37\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext51 \slink52 \ssemihidden \sunhideused \styrsid3941498 Plain Text;}{\*\cs52 \additive \rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f37\fs21 
-\sbasedon10 \slink51 \slocked \ssemihidden \styrsid3941498 Plain Text Char;}{\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext53 \slink54 \sunhideused \styrsid11152386 header;}{\*\cs54 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
-\sbasedon10 \slink53 \slocked \styrsid11152386 Header Char;}{\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext55 \slink56 \sunhideused \styrsid11152386 footer;}{\*\cs56 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
-\sbasedon10 \slink55 \slocked \styrsid11152386 Footer Char;}{\*\cs57 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf19 \sbasedon10 \ssemihidden \sunhideused \styrsid13192943 FollowedHyperlink;}{\*\cs58 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 
-\cf15\chshdng0\chcfpat0\chcbpat20 \sbasedon10 \ssemihidden \sunhideused \styrsid12217836 Unresolved Mention;}}{\*\listtable{\list\listtemplateid-899113366{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\cf0\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
-\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
-\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
-\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
-\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
-\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
-\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid113718381}{\list\listtemplateid1122370636\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-357\li720\jclisttab\tx723\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1083\jclisttab\tx1083\lin1083 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li1803\jclisttab\tx1803\lin1803 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2523\jclisttab\tx2523\lin2523 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3243\jclisttab\tx3243\lin3243 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li3963\jclisttab\tx3963\lin3963 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li4683\jclisttab\tx4683\lin4683 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5403\jclisttab\tx5403\lin5403 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6123\jclisttab\tx6123\lin6123 }{\listname ;}\listid152650329}{\list\listtemplateid-355573436{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat2
-\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li2247\jclisttab\tx2610\lin2247 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
-\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
-\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
-\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
-\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
-\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
-\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398096909}{\list\listtemplateid1928476992{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \s39\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3
-\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }
-{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
-\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
-\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
-\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
-\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
-\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398796681}{\list\listtemplateid789093748\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid-317712510\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s26\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid477573462}{\list\listtemplateid830884688\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1077\lin1077 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1797\lin1797 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2517\lin2517 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3237\lin3237 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3957\lin3957 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4677\lin4677 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5397\lin5397 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li6117\lin6117 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6837\lin6837 }{\listname ;}\listid545946042}{\list\listtemplateid-603941590{\listlevel\levelnfc0\levelnfcn0
-\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4
-\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li-1797\jclisttab\tx-1797\lin-1797 }
-{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-357\li-10173
-\jclisttab\tx-9810\lin-10173 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\b0\i0\strike0\f3\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 
-\fi-358\li-10265\jclisttab\tx-10263\lin-10265 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
-\b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \fi-357\li-9908\jclisttab\tx-9545\lin-9908 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers
-\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-9551\jclisttab\tx-9548\lin-9551 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-9194\jclisttab\tx-9191\lin-9194 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-8837\jclisttab\tx-8834\lin-8837 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li-8479\jclisttab\tx-8477\lin-8479 }{\listname ;}\listid562301967}{\list\listtemplateid-170633512
-{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\cf0\fbias0\hres0\chhres0 \s1\fi-357\li357
-\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \s2
-\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 
-\b\i0\f43\fs20\fbias0\hres0\chhres0 \s3\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 
-\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \s4\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \s5\fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s6\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4
-\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s7\fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel
-\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s8\fi-357\li2863\jclisttab\tx2866\lin2863 
-}{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s9\fi-358\li3221
-\jclisttab\tx3223\lin3221 }{\listname ;}\listid752163927}{\list\listtemplateid1725578678{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 
-\ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\cf0\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}
-\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0
-\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel
-\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 
-}{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863
-\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
-\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid1107626792}{\list\listtemplateid-41362566\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s37\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160
-\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1559511898}{\list\listtemplateid-743794326\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\leveltemplateid2033377338\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s27\fi-357\li1077\jclisttab\tx1080\lin1077 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1567649130}{\list\listtemplateid419070574\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li1080\lin1080 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1800\lin1800 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4680\lin4680 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers
-;}\f2\fbias0\hres0\chhres0 \fi-360\li6120\lin6120 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li6840\lin6840 }{\listname ;}\listid1589268858}{\list\listtemplateid1363474438\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid-1175557160\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s38\fi-357\li1792\jclisttab\tx1795\lin1792 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1848404271}{\list\listtemplateid-761117952\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li717\lin717 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1437\lin1437 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2157\lin2157 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2877\lin2877 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3597\lin3597 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4317\lin4317 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5037\lin5037 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5757\lin5757 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6477\lin6477 }{\listname ;}\listid1870291363}{\list\listtemplateid1186249844\listhybrid{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1637229796\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s36\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc23\levelnfcn23
-\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid2054619191}{\list\listtemplateid-1344757370{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
-\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
-\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
-\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
-\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
-\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
-\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
-\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid2057971432}{\list\listtemplateid-569628034{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \b\fbias0\hres0\chhres0 \fi-360\li717\lin717 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
-{\leveltext\'02\'01);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1077\lin1077 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers\'01;}
-\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1437\lin1437 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
-\hres0\chhres0 \fi-360\li1797\lin1797 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'04);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2157\lin2157 }
-{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'05);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2517\lin2517 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
-\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2877\lin2877 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3237\lin3237 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
-\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3597\lin3597 }{\listname ;}\listid2106000387}}{\*\listoverridetable{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}
-{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat
-\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls1}{\listoverride\listid477573462\listoverridecount0\ls2}{\listoverride\listid1567649130\listoverridecount0\ls3}{\listoverride\listid2054619191
-\listoverridecount0\ls4}{\listoverride\listid1559511898\listoverridecount0\ls5}{\listoverride\listid1848404271\listoverridecount0\ls6}{\listoverride\listid398796681\listoverridecount0\ls7}{\listoverride\listid545946042\listoverridecount0\ls8}
-{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
-\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls9}{\listoverride\listid1870291363
-\listoverridecount0\ls10}{\listoverride\listid152650329\listoverridecount0\ls11}{\listoverride\listid1589268858\listoverridecount0\ls12}{\listoverride\listid2057971432\listoverridecount0\ls13}{\listoverride\listid398096909\listoverridecount0\ls14}
-{\listoverride\listid752163927\listoverridecount0\ls15}{\listoverride\listid1107626792\listoverridecount0\ls16}{\listoverride\listid113718381\listoverridecount0\ls17}{\listoverride\listid2106000387\listoverridecount0\ls18}{\listoverride\listid398796681
-\listoverridecount0\ls19}{\listoverride\listid562301967\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat0}
-{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls20}
-{\listoverride\listid562301967\listoverridecount0\ls21}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
-\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat
-\levelstartat1}\ls22}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}
-{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls23}
-{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
-\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls24}{\listoverride\listid752163927
-\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
-\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls25}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat
-\levelstartat3}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
-\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls26}{\listoverride\listid752163927\listoverridecount0\ls27}{\listoverride\listid752163927\listoverridecount0\ls28}
-{\listoverride\listid752163927\listoverridecount0\ls29}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid79668\rsid150779\rsid211660\rsid213676\rsid263352\rsid270541
-\rsid342430\rsid483838\rsid489647\rsid528777\rsid554910\rsid608234\rsid686391\rsid736743\rsid792304\rsid922358\rsid947296\rsid999719\rsid1145719\rsid1335391\rsid1527700\rsid1714580\rsid1799620\rsid2040850\rsid2062659\rsid2322952\rsid2365705\rsid2434661
-\rsid2633486\rsid2635842\rsid2695079\rsid2708164\rsid2902063\rsid2965976\rsid2973522\rsid3041209\rsid3042054\rsid3171745\rsid3285590\rsid3355994\rsid3418540\rsid3571087\rsid3611845\rsid3623294\rsid3634687\rsid3636551\rsid3875660\rsid3882158\rsid3882522
-\rsid3882949\rsid3941498\rsid4080070\rsid4149814\rsid4402402\rsid4409825\rsid4536802\rsid4537652\rsid4609004\rsid4611858\rsid4731914\rsid4742223\rsid4748609\rsid4801980\rsid4805534\rsid4805706\rsid4858977\rsid4868258\rsid4929965\rsid4934124\rsid5113462
-\rsid5262441\rsid5309509\rsid5318439\rsid5465657\rsid5467606\rsid5471954\rsid5720387\rsid5780125\rsid6124814\rsid6171721\rsid6292707\rsid6318271\rsid6364904\rsid6424248\rsid6496414\rsid6561381\rsid6584761\rsid6620178\rsid6643866\rsid6644215\rsid6755756
-\rsid6761489\rsid6828031\rsid6833860\rsid7040710\rsid7080991\rsid7091446\rsid7099326\rsid7109146\rsid7150192\rsid7344474\rsid7420369\rsid7432529\rsid7503579\rsid7698999\rsid7756319\rsid7879410\rsid8007569\rsid8205106\rsid8332882\rsid8334492\rsid8416259
-\rsid8455816\rsid8460809\rsid8528894\rsid8586851\rsid8662808\rsid8729106\rsid8850722\rsid8921755\rsid8979707\rsid9004944\rsid9066668\rsid9072635\rsid9135771\rsid9176743\rsid9306427\rsid9380011\rsid9399500\rsid9448986\rsid9465849\rsid9516204\rsid9518548
-\rsid9577151\rsid9584906\rsid9709666\rsid9722926\rsid9728818\rsid9765890\rsid9782115\rsid9835407\rsid9860928\rsid9902756\rsid10428435\rsid10576842\rsid10688326\rsid10956334\rsid10962326\rsid11143314\rsid11152386\rsid11207705\rsid11303858\rsid11408012
-\rsid11423848\rsid11496807\rsid11541309\rsid11626503\rsid11677882\rsid11690930\rsid11760915\rsid11930791\rsid11950712\rsid12217836\rsid12536975\rsid12545879\rsid12584315\rsid12605359\rsid12799626\rsid12868905\rsid12992444\rsid13004280\rsid13056010
-\rsid13066823\rsid13192943\rsid13198603\rsid13378284\rsid13456345\rsid13513072\rsid13662583\rsid13776901\rsid13967657\rsid14108197\rsid14179805\rsid14293912\rsid14373468\rsid14418632\rsid14426867\rsid14435085\rsid14507627\rsid14684443\rsid14685080
-\rsid14707821\rsid14712272\rsid14898254\rsid14958727\rsid15158534\rsid15278441\rsid15287965\rsid15364209\rsid15405862\rsid15494051\rsid15539022\rsid15602361\rsid15602734\rsid15749471\rsid15804309\rsid15809401\rsid15870741\rsid15949319\rsid16020560
-\rsid16065250\rsid16073823\rsid16084478\rsid16334972\rsid16346709\rsid16388644\rsid16405449\rsid16537650\rsid16544777\rsid16653828\rsid16715114}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440
-\mintLim0\mnaryLim1}{\info{\creatim\yr2018\mo5\dy23\hr14\min17}{\revtim\yr2018\mo5\dy23\hr14\min17}{\version1}{\edmins0}{\nofpages3}{\nofwords1423}{\nofchars8113}{\nofcharsws9517}{\vern59}}{\*\userprops {\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb859
-95028c_Enabled}\proptype30{\staticval True}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId}\proptype30{\staticval 72f988bf-86f1-41af-91ab-2d7cd011db47}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Owner}\proptype30
-{\staticval jagarg@microsoft.com}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate}\proptype30{\staticval 2018-05-23T08:47:46.8790302Z}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name}\proptype30{\staticval General}
-{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application}\proptype30{\staticval Microsoft Azure Information Protection}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method}\proptype30{\staticval Automatic}
-{\propname Sensitivity}\proptype30{\staticval General}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
-\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen
-\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
-\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\rempersonalinfo\allowfieldendsel
-\wrppunct\asianbrkrule\rsidroot4934124\newtblstyruls\nogrowautofit\remdttm\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal 
-\nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 
-\ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsep 
-\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsepc 
-\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsep 
-\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsepc 
-\par }}\ltrpar \sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\headerl \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
-\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\headerr \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\footerl \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\footerr \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\headerf \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\footerf \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
-\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}
-{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8
-\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
-\s28\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
-\b\fs28\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 MICROSOFT SOFTWARE LICENSE TERMS
-\par }\pard\plain \ltrpar\s29\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrb\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
-\b\fs28\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 MICROSOFT }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid2973522 \hich\af43\dbch\af13\loch\f43 VISUAL STUDIO }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid3042054 \hich\af43\dbch\af13\loch\f43 TEST PLATFORM}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid4934124\charrsid342430 
-\par }\pard\plain \ltrpar\s30\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
-\b\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid342430 \hich\af43\dbch\af13\loch\f43 
-These license terms are an agreement between Microsoft Corporation (or based on where you live, one of }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 its 
-\hich\af43\dbch\af13\loch\f43 affiliates) and you. They apply to the software named above. The terms also apply to any Microsoft}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
- services or updates for the software, except to the extent those have }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 additional}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
-\b0\fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43  terms.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
-\par }\pard\plain \ltrpar\s31\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrt\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
-\b\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-If you comply with these license terms, you have the rights below.
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 1.\tab}}\pard\plain \ltrpar\s1\ql \fi-360\li360\ri0\sb120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid15287965 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
-\ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 IN\hich\af43\dbch\af13\loch\f43 STALLATION AND USE RIGHTS. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4731914 \hich\af43\dbch\af13\loch\f43 
-You may install and use any number of copies of the software.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid14179805\charrsid10576842 \hich\af43\dbch\af0\loch\f43 2.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid5318439 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid14179805\charrsid10576842 T}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\insrsid13378284\charrsid10576842 ERMS FOR SPECIFIC}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid14179805\charrsid10576842  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid15405862\charrsid10576842 COMPONENTS. 
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\loch\af43\hich\af43\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 a.\tab}}\pard\plain \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid8332882 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \fs20\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 Third Party Components.\~ }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 
-The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software.\~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\b0\fs20\dbch\af11\insrsid8332882\charrsid8332882 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid9066668\charrsid8332882 \hich\af43\dbch\af0\loch\f43 3.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls1\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid8332882 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
-\ltrch\fcs0 \fs20\insrsid9066668\charrsid8332882 DATA.  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid2708164\charrsid8332882 
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid2708164\charrsid10576842 \hich\af43\dbch\af0\loch\f43 a.\tab}}\pard\plain \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar
-\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid2708164 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \fs20\insrsid2708164\charrsid10576842 Data Collection. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 The software may collect information abou
-t you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services.  You may opt-out of many of these scenarios, but not all, as described in the product documentati
-on.  There are also s}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid9066668\charrsid10576842 ome features in the software that may enable you }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid16020560\charrsid10576842 and Microsoft }{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid9066668\charrsid10576842 to collect data from users of your applications.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  If you use these features}{\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10688326\charrsid10576842 ,}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  you must comply with applicable law, including providing appropriate notices to users of your applications}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid6761489\charrsid10576842  together with }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid608234\charrsid10576842 a copy of }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\b0\fs20\insrsid6761489\charrsid10576842 Microsoft\rquote s privacy statement}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 . }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid6761489\charrsid10576842 
-Our privacy statement is located}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  at}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid3171745\charrsid10576842  }{\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab0\af43\afs20 
-\ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid270541  HYPERLINK "https://go.microsoft.com/fwlink/?LinkID=824704" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid12217836\charrsid10576842 
-https://go.microsoft.com/fwlink/?LinkID=824704}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 . }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\b0\fs20\insrsid7109146\charrsid10576842 You can learn more about data collection and use in the help documentation and our privacy statement. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 
-Your use of the software operates as your consent to these practices.
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid213676\charrsid10576842 \hich\af43\dbch\af0\loch\f43 b.\tab}}\pard \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar
-\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid213676 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid213676\charrsid10576842 Processing of Personal Data. }{\rtlch\fcs1 \ab0\af43\afs20 
-\ltrch\fcs0 \b0\fs20\insrsid213676\charrsid10576842 To the extent Microsoft is a processor or subprocessor 
-of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at }{\field\fldedit{\*\fldinst {
-\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid270541  HYPERLINK "http://go.microsoft.com/?linkid=9840733" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid12217836\charrsid10576842 
-http://go.microsoft.com/?linkid=9840733}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid213676\charrsid10576842 .}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\insrsid213676\charrsid10576842  
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 4.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid15804309 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
-\ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Scope of License}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
-\b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
- The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more right\hich\af43\dbch\af13\loch\f43 
-s despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. }{\rtlch\fcs1 \ab0\af43\afs20 
-\ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 For more information, see }{\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\dbch\af13\insrsid270541 
-\hich\af43\dbch\af13\loch\f43  HYPER\hich\af43\dbch\af13\loch\f43 LINK "http://www.microsoft.com/licensing/userights" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\dbch\af13\insrsid554910\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43 www.microsoft.com/licensing/userights}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43 . }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 You may not}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
-
-\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid4934124\charrsid342430 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}\pard\plain \ltrpar\s26\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0\pararsid4934124 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid342430 \hich\af43\dbch\af13\loch\f43 work around any technical limitations in the software}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid4934124\charrsid342430 
-\hich\af43\dbch\af11\loch\f43 ;}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid342430 
-\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid4934124\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 reverse engineer, decompile or disassemble the software, }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-or attempt to do so, }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 except and only to the extent }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid554910\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43 required by third party licensing terms governing use of certain open-source components that may be included with the software}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid4934124\charrsid10576842 
-\hich\af43\dbch\af11\loch\f43 ;}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}\pard \ltrpar\s26\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0\pararsid2434661 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-remove, minimize, block or modify any notices of Microsoft or its suppliers in the software; 
-\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}\hich\af43\dbch\af13\loch\f43 use \hich\af43\dbch\af13\loch\f43 
-the software in any way that is against the law; or
-\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}\hich\af43\dbch\af13\loch\f43 share, publish}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 , rent, or lease}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
- the software, or provide the software as a stand-alone }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid5780125 \hich\af43\dbch\af13\loch\f43 offering}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43  for others to use.
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 5.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid13594873 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
-\ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Export Restrictions}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
-\b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-You must comply with all domestic and international export laws and r\hich\af43\dbch\af13\loch\f43 
-egulations that apply to the software, which include restrictions on destinations, end users and end use.  For further information on export restrictions, visit (aka.ms/exporting).}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid10956334\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 6.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 SUPPORT SERVICES.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \ab0\af43\afs20 
-\ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Because this software is \'93\loch\f43 \hich\f43 as is,\'94\loch\f43  we may not provide supp\hich\af43\dbch\af13\loch\f43 ort services for it.}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 7.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid4934124 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Entire Agreement.}
-{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
- This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 8.\tab}}\pard \ltrpar\s1\ql \fi-360\li360\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid528777 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Applicable Law}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid528777\charrsid10576842 \hich\af43\dbch\af13\loch\f43   }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\b0\fs20\insrsid528777\charrsid10576842 If you acquired the s
-oftware in the United States, Washington law applies to interpretation of and claims for breach of this agreement, and the laws of the state where you live apply to all other claims. If you acquired the software in any other country, its laws apply.}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid528777\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 9.\tab}}\pard \ltrpar\s1\ql \fi-360\li360\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid11541309 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 CONSUMER RIGHTS; REGIONAL VARIATIONS. }{\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
-This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft, you may also have rights
- with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or ma
-ndatory country law applies, then the following provisions apply to you:
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 a.\tab}}\pard\plain \ltrpar
-\s2\ql \fi-360\li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls18\outlinelevel1\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
-\b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 Australia. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
-You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 b.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 Canada. }{\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 If you acquired this software in 
-Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninsta
-lling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334 
-\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid11626503 \hich\af43\dbch\af0\loch\f43 c.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid11626503 Germany and Austria}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid11626503 .
-\par }\pard\plain \ltrpar\ql \li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 (i)}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\insrsid10956334\charrsid10576842 \tab }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 Warranty}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 
-\hich\af43\dbch\af11\loch\f43 . The properly licensed software will perform substantially as described in any Microsoft \hich\af43\dbch\af11\loch\f43 
-materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to the licensed software.
-\par }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 (ii)}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 \tab }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 Limitation of Liability}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 
-. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as wel\hich\af43\dbch\af11\loch\f43 l as, in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
-\par }\pard\plain \ltrpar\s1\ql \li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
-\b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
-Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obli
-gations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other
- cases of slight negligence, Microsoft will not be liable for slight negligence.
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 10.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid4934124 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-Disclaimer of Warranty.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43 \hich\f43 THE SOFTWARE IS LICENSED \'93\loch\f43 \hich\f43 AS-IS.\'94\loch\f43  YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTE
-\hich\af43\dbch\af13\loch\f43 D UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 
-\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 11.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
-\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-Limitation on and Exclusion of Damages. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid12584315\charrsid10576842 YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP T
-O U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-\par }\pard\plain \ltrpar\s25\ql \li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0\pararsid12584315 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, breach of warranty, guarantee or condition, strict liabi
-\hich\af43\dbch\af13\loch\f43 l\hich\af43\dbch\af13\loch\f43 ity, negligence, or other tort to the extent permitted by applicable law.
-\par }\pard\plain \ltrpar\ql \li360\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0\pararsid12584315 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
-\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not \hich\af43\dbch\af13\loch\f43 
-allow the exclusion or limitation of incidental, consequential or other damages.
-\par }\pard \ltrpar\ql \li0\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin0\itap0\pararsid12584315 {\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.
-\par \hich\af43\dbch\af13\loch\f43 \hich\f43 Remarque : Ce logiciel \'e9\loch\f43 \hich\f43 tant distribu\'e9\hich\af43\dbch\af13\loch\f43 \hich\f43  au Qu\'e9\loch\f43 \hich\f43 
-bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7\loch\f43 ais.
-\par \hich\af43\dbch\af13\loch\f43 \hich\f43 EXON\'c9\loch\f43 RATION DE GARANTIE.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Le logiciel vis\'e9\loch\f43 \hich\f43  par une licence est offert \'ab\loch\f43 \hich\f43  tel quel \'bb\loch\f43 . Toute utilisation de ce logici}{\rtlch\fcs1 
-\af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid342430 \hich\af43\dbch\af13\loch\f43 \hich\f43 el est \'e0\loch\f43 \hich\f43  votre seule risque et p\'e9\loch\f43 ril. Microsoft\hich\af43\dbch\af13\loch\f43  n\hich\f43 \rquote \loch\f43 
-\hich\f43 accorde aucune autre garantie expresse. Vous pouvez b\'e9\loch\f43 \hich\f43 n\'e9\loch\f43 
-ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites \hich\af43\dbch\af13\loch\f43 d
-\hich\af43\dbch\af13\loch\f43 \hich\f43 e qualit\'e9\loch\f43  marchande, d\hich\f43 \rquote \loch\f43 \hich\f43 ad\'e9\loch\f43 \hich\f43 quation \'e0\loch\f43  un usage particulier et d\hich\f43 \rquote \loch\f43 \hich\f43 absence de contrefa\'e7
-\loch\f43 on sont exclues.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
-\par }{\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 LIMITATION DES DOMMAGES-INT\'c9\loch\f43 \hich\f43 R\'ca\loch\f43 \hich\f43 TS ET EXCLUSION DE RESPONSABILIT\'c9\loch\f43 
- POUR LES DOMMAGES.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
-Vous pouvez}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \hich\af43\dbch\af11\loch\f43  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
-\hich\af43\dbch\af13\loch\f43 obtenir de Microsoft et de ses fournisseurs une indemnisation \hich\af43\dbch\af13\loch\f43 \hich\f43 en cas de dommages directs uniquement \'e0\loch\f43 \hich\f43  hauteur de 5,00 $ US. Vous ne pouvez pr\'e9\loch\f43 
-\hich\f43 tendre \'e0\loch\f43 \hich\f43  aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9\loch\f43 \hich\f43 ciaux, indirects ou accessoires et pertes de b\'e9}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
-\fs20\dbch\af13\insrsid12584315\charrsid342430 \hich\af43\dbch\af13\loch\f43 \hich\f43 n\'e9\loch\f43 fices.
-\par \hich\af43\dbch\af13\loch\f43 Cette limitation concerne:
-\par }\pard \ltrpar\ql \fi-363\li363\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin363\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \loch\af43\dbch\af13\hich\f43 \'b7\~\~\~\~\tab 
-\loch\f43 tout \hich\af43\dbch\af13\loch\f43 \hich\f43 ce qui est reli\'e9\loch\f43  au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et
-\par \loch\af43\dbch\af13\hich\f43 \'b7\~\~\~\~\~\loch\f43 \hich\f43 les r\'e9\loch\f43 \hich\f43 clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9\loch\f43  stric\hich\af43\dbch\af13\loch\f43 \hich\f43 te, de n\'e9
-\loch\f43 gligence ou d\hich\f43 \rquote \loch\f43 \hich\f43 une autre faute dans la limite autoris\'e9\loch\f43 e par la loi en vigueur.
-\par }\pard \ltrpar\ql \li0\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin0\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Elle s\hich\f43 \rquote 
-\loch\f43 \hich\f43 applique \'e9\loch\f43 \hich\f43 galement, m\'ea\loch\f43 \hich\f43 me si Microsoft connaissait ou devrait conna\'ee\loch\f43 tre l\hich\f43 \rquote \'e9\loch\f43 \hich\f43 ventualit\'e9\loch\f43  d\hich\f43 \rquote \loch\f43 
-un tel dommage. Si votre pays n\hich\f43 \rquote \loch\f43 autorise pas l\hich\f43 \rquote \loch\f43 exclusion ou la limitation d\hich\af43\dbch\af13\loch\f43 \hich\f43 e responsabilit\'e9\loch\f43 
- pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\hich\f43 \rquote \loch\f43 exclusion ci-dessus ne s\hich\f43 \rquote \loch\f43 \hich\f43 appliquera pas \'e0\loch\f43 \hich\f43  votre \'e9
-\loch\f43 gard.
-\par }{\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 EFFET JURIDIQUE.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{
-\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Le pr\'e9\loch\f43 \hich\f43 sent contrat d\'e9\loch\f43 crit certains droits juridiques. Vous\hich\af43\dbch\af13\loch\f43 
- pourriez avoir d\hich\f43 \rquote \loch\f43 \hich\f43 autres droits pr\'e9\loch\f43 \hich\f43 vus par les lois de votre pays. Le pr\'e9\loch\f43 \hich\f43 sent contrat ne modifie pas les droits que vous conf\'e8\loch\f43 
-rent les lois de votre pays si celles-ci ne le permettent pas.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid342430 
-\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid9860928\charrsid342430 
-\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
-9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
-5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
-b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
-0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
-a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
-c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
-0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
-a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
-4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
-4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f
-7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87
-615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad
-79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b
-5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab
-999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9
-699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586
-8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6
-0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f
-9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be
-15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979
-3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d
-32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a
-f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86
-e877f0034e16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb
-44f95d843b5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a
-6409fb44d08741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c
-3d9058edf2c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db0256
-5e85f3b9660d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276
-b9f7dec44b7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8
-c33585b5fb9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e
-51440ca2e0088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95
-b21be5ceaf8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff
-6dce591a26ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec6
-9ffb9e65d028d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239
-b75a5bb1e6345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a449
-59d366ad93b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e8
-2db8df9f30254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468
-656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4
-350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d2624
-52282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe5141
-73d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000
-0000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000
-000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019
-0200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b00001600000000
-000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027
-00000000000000000000000000a00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d0100009b0a00000000}
-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax375\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdlocked0 heading 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority59 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;
-\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;
-\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;
-\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;
-\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;
-\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;
-\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;
-\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;
-\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;
-\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;
-\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;
-\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;
-\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
-\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
-\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
-\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
-\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
-\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
-\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
-\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
-\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
-\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;}}{\*\datastore 010500000200000018000000
-4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
-d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000020cc
-88b972f2d301feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff43\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
+{\f11\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt \'cb\'ce\'cc\'e5};}
+{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f43\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Tahoma{\*\falt ?l?r ???};}
+{\f44\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS{\*\falt Arial};}{\f46\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@SimSun;}{\f47\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho;}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 00000000000000000000}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f48\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f49\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f51\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f52\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f53\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f54\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f55\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f56\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f68\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}
+{\f69\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f71\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f72\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f73\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
+{\f74\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f75\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f76\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}
+{\f160\fbidi \fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f158\fbidi \fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
+{\f159\fbidi \fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f161\fbidi \fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
+{\f162\fbidi \fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}{\f165\fbidi \fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt \'82\'6c\'82\'72 \'96\'be\'92\'a9};}
+{\f180\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt \'cb\'ce\'cc\'e5};}{\f418\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f419\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f421\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}
+{\f422\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f423\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f424\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f425\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\f426\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f478\fbidi \fswiss\fcharset238\fprq2 Tahoma CE{\*\falt ?l?r ???};}{\f479\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr{\*\falt ?l?r ???};}
+{\f481\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek{\*\falt ?l?r ???};}{\f482\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur{\*\falt ?l?r ???};}{\f483\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew){\*\falt ?l?r ???};}
+{\f484\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic){\*\falt ?l?r ???};}{\f485\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic{\*\falt ?l?r ???};}{\f486\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese){\*\falt ?l?r ???};}
+{\f487\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai){\*\falt ?l?r ???};}{\f488\fbidi \fswiss\fcharset238\fprq2 Trebuchet MS CE{\*\falt Arial};}{\f489\fbidi \fswiss\fcharset204\fprq2 Trebuchet MS Cyr{\*\falt Arial};}
+{\f491\fbidi \fswiss\fcharset161\fprq2 Trebuchet MS Greek{\*\falt Arial};}{\f492\fbidi \fswiss\fcharset162\fprq2 Trebuchet MS Tur{\*\falt Arial};}{\f495\fbidi \fswiss\fcharset186\fprq2 Trebuchet MS Baltic{\*\falt Arial};}
+{\f510\fbidi \fnil\fcharset0\fprq2 @SimSun Western;}{\f520\fbidi \fmodern\fcharset0\fprq1 @MS Mincho Western;}{\f518\fbidi \fmodern\fcharset238\fprq1 @MS Mincho CE;}{\f519\fbidi \fmodern\fcharset204\fprq1 @MS Mincho Cyr;}
+{\f521\fbidi \fmodern\fcharset161\fprq1 @MS Mincho Greek;}{\f522\fbidi \fmodern\fcharset162\fprq1 @MS Mincho Tur;}{\f525\fbidi \fmodern\fcharset186\fprq1 @MS Mincho Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
+{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;\cfollowedhyperlink\ctint255\cshade255\red128\green0\blue128;\red230\green230\blue230;}{\*\defchp 
+\f31506\fs22 }{\*\defpap \ql \fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \sautoupd \sqformat \spriority0 \styrsid4934124 Normal;}{\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext1 \slink15 \sqformat \styrsid4934124 heading 1;}{\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \rtlch\fcs1 
+\ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext2 \slink16 \sunhideused \sqformat \styrsid4934124 heading 2;}{\s3\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
+\tx1077\jclisttab\tx1440\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext3 \slink17 \sunhideused \sqformat \styrsid4934124 heading 3;}{\s4\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl3\outlinelevel3\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 
+\af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext4 \slink18 \sunhideused \sqformat \styrsid4934124 heading 4;}{\s5\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar
+\tx1792\jclisttab\tx2155\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl4\outlinelevel4\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext5 \slink19 \sunhideused \sqformat \styrsid4934124 heading 5;}{\s6\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar\jclisttab\tx2152\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl5\outlinelevel5\adjustright\rin0\lin2149\itap0 \rtlch\fcs1 
+\af43\afs19\alang1025 \ltrch\fcs0 \f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext6 \slink20 \sunhideused \sqformat \styrsid4934124 heading 6;}{\s7\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar
+\jclisttab\tx2509\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl6\outlinelevel6\adjustright\rin0\lin2506\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext7 \slink21 \sunhideused \sqformat \styrsid4934124 heading 7;}{\s8\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar\jclisttab\tx2866\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl7\outlinelevel7\adjustright\rin0\lin2863\itap0 \rtlch\fcs1 
+\af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext8 \slink22 \sunhideused \sqformat \styrsid4934124 heading 8;}{\s9\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar
+\jclisttab\tx3223\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl8\outlinelevel8\adjustright\rin0\lin3221\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext9 \slink23 \sunhideused \sqformat \styrsid4934124 heading 9;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
+Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\f43\fs19 \sbasedon10 \slink1 \slocked \styrsid4934124 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\f43\fs19 
+\sbasedon10 \slink2 \slocked \ssemihidden \styrsid4934124 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink3 \slocked \ssemihidden \styrsid4934124 Heading 3 Char;}{\*\cs18 \additive \rtlch\fcs1 
+\af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink4 \slocked \ssemihidden \styrsid4934124 Heading 4 Char;}{\*\cs19 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink5 \slocked \ssemihidden \styrsid4934124 Heading 5 Char;}{\*
+\cs20 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \f43\fs19 \sbasedon10 \slink6 \slocked \ssemihidden \styrsid4934124 Heading 6 Char;}{\*\cs21 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
+\sbasedon10 \slink7 \slocked \ssemihidden \styrsid4934124 Heading 7 Char;}{\*\cs22 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink8 \slocked \ssemihidden \styrsid4934124 Heading 8 Char;}{\*\cs23 
+\additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink9 \slocked \ssemihidden \styrsid4934124 Heading 9 Char;}{\*\cs24 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \f0\ul\cf2 \sbasedon10 \sunhideused \styrsid4934124 
+Hyperlink;}{\s25\ql \li357\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext25 \styrsid4934124 Body 1;}{\s26\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 \styrsid4934124 Bullet 2;}{\s27\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1080\wrapdefault\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext27 \slink48 \styrsid4934124 Bullet 3;}{\s28\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid4934124 Heading EULA;}{\s29\ql \li0\ri0\sb120\sa120\widctlpar\brdrb\brdrs\brdrw10\brsp20 
+\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 \b\fs28\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid4934124 
+Heading Software Title;}{\s30\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
+\b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext30 \styrsid4934124 Preamble;}{\s31\ql \li0\ri0\sb120\sa120\widctlpar\brdrt\brdrs\brdrw10\brsp20 
+\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon30 \snext31 \styrsid4934124 
+Preamble Border Above;}{\s32\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\snext0 \styrsid4934124 Body 0 Bold;}{\s33\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \styrsid4934124 Body 0;}{\s34\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs16\alang1025 \ltrch\fcs0 
+\fs16\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext34 \slink35 \ssemihidden \sunhideused \styrsid11950712 Balloon Text;}{\*\cs35 \additive \rtlch\fcs1 \af43\afs16 \ltrch\fcs0 
+\fs16\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink34 \slocked \ssemihidden \styrsid11950712 Balloon Text Char;}{\s36\ql \fi-357\li357\ri0\sb120\sa120\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin357\itap0 
+\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext36 \styrsid11950712 Bullet 1;}{\s37\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext37 \styrsid11950712 Bullet 4;}{\s38\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar\jclisttab\tx1795\wrapdefault\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext38 \styrsid11950712 Bullet 5;}{\s39\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
+\tx1077\jclisttab\tx1440\wrapdefault\aspalpha\aspnum\faauto\ls7\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon3 \snext39 \slink50 \styrsid11950712 Heading 3 Bold;}{\s40\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\ul\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon37 \snext40 \styrsid11950712 Bullet 4 Underline;}{\*\cs41 \additive \rtlch\fcs1 \af43 \ltrch\fcs0 \f43\lang1033\langfe1033\langnp1033\langfenp1033 
+\sbasedon10 \styrsid11950712 Body 2 Char;}{\*\cs42 \additive \rtlch\fcs1 \af43 \ltrch\fcs0 \f43\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \styrsid11950712 Body 3 Char;}{\*\cs43 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 
+\sbasedon10 \ssemihidden \sunhideused \styrsid8850722 annotation reference;}{\s44\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext44 \slink45 \sunhideused \styrsid8850722 annotation text;}{\*\cs45 \additive \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\f43\hich\af43\dbch\af11 
+\sbasedon10 \slink44 \slocked \styrsid8850722 Comment Text Char;}{\s46\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af43\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon44 \snext44 \slink47 \ssemihidden \sunhideused \styrsid8850722 annotation subject;}{\*\cs47 \additive \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 
+\b\fs20\loch\f43\hich\af43\dbch\af11 \sbasedon45 \slink46 \slocked \ssemihidden \styrsid8850722 Comment Subject Char;}{\*\cs48 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 \sbasedon10 \slink27 \slocked \styrsid2434661 
+Bullet 3 Char1;}{\s49\ql \fi-357\li357\ri0\sb120\sa120\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\ul\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon37 \snext49 \spriority0 \styrsid3941498 Bullet 4 Underlined;}{\*\cs50 \additive \rtlch\fcs1 \ab\af43\afs19 \ltrch\fcs0 \b\fs19\loch\f43\hich\af43\dbch\af11 
+\sbasedon10 \slink39 \slocked \styrsid3941498 Heading 3 Bold Char;}{\s51\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs21\alang1025 \ltrch\fcs0 
+\f37\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext51 \slink52 \ssemihidden \sunhideused \styrsid3941498 Plain Text;}{\*\cs52 \additive \rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f37\fs21 
+\sbasedon10 \slink51 \slocked \ssemihidden \styrsid3941498 Plain Text Char;}{\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext53 \slink54 \sunhideused \styrsid11152386 header;}{\*\cs54 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
+\sbasedon10 \slink53 \slocked \styrsid11152386 Header Char;}{\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\f43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext55 \slink56 \sunhideused \styrsid11152386 footer;}{\*\cs56 \additive \rtlch\fcs1 \af43\afs19 \ltrch\fcs0 \fs19\loch\f43\hich\af43\dbch\af11 
+\sbasedon10 \slink55 \slocked \styrsid11152386 Footer Char;}{\*\cs57 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf19 \sbasedon10 \ssemihidden \sunhideused \styrsid13192943 FollowedHyperlink;}{\*\cs58 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 
+\cf15\chshdng0\chcfpat0\chcbpat20 \sbasedon10 \ssemihidden \sunhideused \styrsid12217836 Unresolved Mention;}}{\*\listtable{\list\listtemplateid-899113366{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\cf0\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
+\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
+\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
+\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
+\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
+\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
+\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid113718381}{\list\listtemplateid1122370636\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-357\li720\jclisttab\tx723\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1083\jclisttab\tx1083\lin1083 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li1803\jclisttab\tx1803\lin1803 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2523\jclisttab\tx2523\lin2523 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3243\jclisttab\tx3243\lin3243 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li3963\jclisttab\tx3963\lin3963 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li4683\jclisttab\tx4683\lin4683 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5403\jclisttab\tx5403\lin5403 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6123\jclisttab\tx6123\lin6123 }{\listname ;}\listid152650329}{\list\listtemplateid-355573436{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat2
+\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li2247\jclisttab\tx2610\lin2247 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
+\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
+\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
+\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
+\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
+\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
+\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398096909}{\list\listtemplateid1928476992{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \s39\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }
+{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
+\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
+\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
+\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
+\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
+\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398796681}{\list\listtemplateid789093748\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid-317712510\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s26\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid477573462}{\list\listtemplateid830884688\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1077\lin1077 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1797\lin1797 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2517\lin2517 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3237\lin3237 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3957\lin3957 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4677\lin4677 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5397\lin5397 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li6117\lin6117 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6837\lin6837 }{\listname ;}\listid545946042}{\list\listtemplateid-603941590{\listlevel\levelnfc0\levelnfcn0
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4
+\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li-1797\jclisttab\tx-1797\lin-1797 }
+{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-357\li-10173
+\jclisttab\tx-9810\lin-10173 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\b0\i0\strike0\f3\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 
+\fi-358\li-10265\jclisttab\tx-10263\lin-10265 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
+\b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \fi-357\li-9908\jclisttab\tx-9545\lin-9908 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers
+\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-9551\jclisttab\tx-9548\lin-9551 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-9194\jclisttab\tx-9191\lin-9194 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li-8837\jclisttab\tx-8834\lin-8837 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li-8479\jclisttab\tx-8477\lin-8479 }{\listname ;}\listid562301967}{\list\listtemplateid-170633512
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\cf0\fbias0\hres0\chhres0 \s1\fi-357\li357
+\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \s2
+\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 
+\b\i0\f43\fs20\fbias0\hres0\chhres0 \s3\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 
+\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \s4\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\animtext0\striked0\fbias0\hres0\chhres0 \s5\fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s6\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s7\fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel
+\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s8\fi-357\li2863\jclisttab\tx2866\lin2863 
+}{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \s9\fi-358\li3221
+\jclisttab\tx3223\lin3221 }{\listname ;}\listid752163927}{\list\listtemplateid1725578678{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 
+\ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\cf0\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \ab\ai0\af43\afs20 \ltrch\fcs0 \b\i0\f43\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel
+\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 
+}{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863
+\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
+\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid1107626792}{\list\listtemplateid-41362566\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s37\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}
+\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160
+\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel
+\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1559511898}{\list\listtemplateid-743794326\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid2033377338\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s27\fi-357\li1077\jclisttab\tx1080\lin1077 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1567649130}{\list\listtemplateid419070574\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li1080\lin1080 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1800\lin1800 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2520\lin2520 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li3240\lin3240 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3960\lin3960 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4680\lin4680 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5400\lin5400 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers
+;}\f2\fbias0\hres0\chhres0 \fi-360\li6120\lin6120 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fbias0\hres0\chhres0 \fi-360\li6840\lin6840 }{\listname ;}\listid1589268858}{\list\listtemplateid1363474438\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid-1175557160\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s38\fi-357\li1792\jclisttab\tx1795\lin1792 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1848404271}{\list\listtemplateid-761117952\listhybrid{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li717\lin717 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1437\lin1437 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2157\lin2157 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2877\lin2877 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3597\lin3597 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4317\lin4317 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5037\lin5037 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5757\lin5757 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6477\lin6477 }{\listname ;}\listid1870291363}{\list\listtemplateid1186249844\listhybrid{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1637229796\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s36\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc23\levelnfcn23
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid2054619191}{\list\listtemplateid-1344757370{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af44\afs20 \ltrch\fcs0 \b\i0\f44\fs20\fbias0\hres0\chhres0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0\afs20 \ltrch\fcs0 \b\i0\fs20\fbias0\hres0\chhres0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1
+\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\strike0\f44\fs20\ulnone\fbias0\hres0\chhres0 \fi-357\li1792
+\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 
+\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af44\afs20 \ltrch\fcs0 
+\b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af44\afs20 
+\ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 
+\ab0\ai0\af44\afs20 \ltrch\fcs0 \b0\i0\f44\fs20\fbias0\hres0\chhres0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid2057971432}{\list\listtemplateid-569628034{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \b\fbias0\hres0\chhres0 \fi-360\li717\lin717 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'01);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1077\lin1077 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1437\lin1437 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-360\li1797\lin1797 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'04);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2157\lin2157 }
+{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'05);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2517\lin2517 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2877\lin2877 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3237\lin3237 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3597\lin3597 }{\listname ;}\listid2106000387}}{\*\listoverridetable{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}
+{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat
+\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls1}{\listoverride\listid477573462\listoverridecount0\ls2}{\listoverride\listid1567649130\listoverridecount0\ls3}{\listoverride\listid2054619191
+\listoverridecount0\ls4}{\listoverride\listid1559511898\listoverridecount0\ls5}{\listoverride\listid1848404271\listoverridecount0\ls6}{\listoverride\listid398796681\listoverridecount0\ls7}{\listoverride\listid545946042\listoverridecount0\ls8}
+{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
+\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls9}{\listoverride\listid1870291363
+\listoverridecount0\ls10}{\listoverride\listid152650329\listoverridecount0\ls11}{\listoverride\listid1589268858\listoverridecount0\ls12}{\listoverride\listid2057971432\listoverridecount0\ls13}{\listoverride\listid398096909\listoverridecount0\ls14}
+{\listoverride\listid752163927\listoverridecount0\ls15}{\listoverride\listid1107626792\listoverridecount0\ls16}{\listoverride\listid113718381\listoverridecount0\ls17}{\listoverride\listid2106000387\listoverridecount0\ls18}{\listoverride\listid398796681
+\listoverridecount0\ls19}{\listoverride\listid562301967\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat0}
+{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls20}
+{\listoverride\listid562301967\listoverridecount0\ls21}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
+\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat
+\levelstartat1}\ls22}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}
+{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls23}
+{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
+\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls24}{\listoverride\listid752163927
+\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
+\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls25}{\listoverride\listid752163927\listoverridecount9{\lfolevel\listoverridestartat
+\levelstartat3}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
+\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls26}{\listoverride\listid752163927\listoverridecount0\ls27}{\listoverride\listid752163927\listoverridecount0\ls28}
+{\listoverride\listid752163927\listoverridecount0\ls29}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid79668\rsid150779\rsid211660\rsid213676\rsid263352\rsid270541
+\rsid342430\rsid483838\rsid489647\rsid528777\rsid554910\rsid608234\rsid686391\rsid736743\rsid792304\rsid922358\rsid947296\rsid999719\rsid1145719\rsid1335391\rsid1527700\rsid1714580\rsid1799620\rsid2040850\rsid2062659\rsid2322952\rsid2365705\rsid2434661
+\rsid2633486\rsid2635842\rsid2695079\rsid2708164\rsid2902063\rsid2965976\rsid2973522\rsid3041209\rsid3042054\rsid3171745\rsid3285590\rsid3355994\rsid3418540\rsid3571087\rsid3611845\rsid3623294\rsid3634687\rsid3636551\rsid3875660\rsid3882158\rsid3882522
+\rsid3882949\rsid3941498\rsid4080070\rsid4149814\rsid4402402\rsid4409825\rsid4536802\rsid4537652\rsid4609004\rsid4611858\rsid4731914\rsid4742223\rsid4748609\rsid4801980\rsid4805534\rsid4805706\rsid4858977\rsid4868258\rsid4929965\rsid4934124\rsid5113462
+\rsid5262441\rsid5309509\rsid5318439\rsid5465657\rsid5467606\rsid5471954\rsid5720387\rsid5780125\rsid6124814\rsid6171721\rsid6292707\rsid6318271\rsid6364904\rsid6424248\rsid6496414\rsid6561381\rsid6584761\rsid6620178\rsid6643866\rsid6644215\rsid6755756
+\rsid6761489\rsid6828031\rsid6833860\rsid7040710\rsid7080991\rsid7091446\rsid7099326\rsid7109146\rsid7150192\rsid7344474\rsid7420369\rsid7432529\rsid7503579\rsid7698999\rsid7756319\rsid7879410\rsid8007569\rsid8205106\rsid8332882\rsid8334492\rsid8416259
+\rsid8455816\rsid8460809\rsid8528894\rsid8586851\rsid8662808\rsid8729106\rsid8850722\rsid8921755\rsid8979707\rsid9004944\rsid9066668\rsid9072635\rsid9135771\rsid9176743\rsid9306427\rsid9380011\rsid9399500\rsid9448986\rsid9465849\rsid9516204\rsid9518548
+\rsid9577151\rsid9584906\rsid9709666\rsid9722926\rsid9728818\rsid9765890\rsid9782115\rsid9835407\rsid9860928\rsid9902756\rsid10428435\rsid10576842\rsid10688326\rsid10956334\rsid10962326\rsid11143314\rsid11152386\rsid11207705\rsid11303858\rsid11408012
+\rsid11423848\rsid11496807\rsid11541309\rsid11626503\rsid11677882\rsid11690930\rsid11760915\rsid11930791\rsid11950712\rsid12217836\rsid12536975\rsid12545879\rsid12584315\rsid12605359\rsid12799626\rsid12868905\rsid12992444\rsid13004280\rsid13056010
+\rsid13066823\rsid13192943\rsid13198603\rsid13378284\rsid13456345\rsid13513072\rsid13662583\rsid13776901\rsid13967657\rsid14108197\rsid14179805\rsid14293912\rsid14373468\rsid14418632\rsid14426867\rsid14435085\rsid14507627\rsid14684443\rsid14685080
+\rsid14707821\rsid14712272\rsid14898254\rsid14958727\rsid15158534\rsid15278441\rsid15287965\rsid15364209\rsid15405862\rsid15494051\rsid15539022\rsid15602361\rsid15602734\rsid15749471\rsid15804309\rsid15809401\rsid15870741\rsid15949319\rsid16020560
+\rsid16065250\rsid16073823\rsid16084478\rsid16334972\rsid16346709\rsid16388644\rsid16405449\rsid16537650\rsid16544777\rsid16653828\rsid16715114}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440
+\mintLim0\mnaryLim1}{\info{\creatim\yr2018\mo5\dy23\hr14\min17}{\revtim\yr2018\mo5\dy23\hr14\min17}{\version1}{\edmins0}{\nofpages3}{\nofwords1423}{\nofchars8113}{\nofcharsws9517}{\vern59}}{\*\userprops {\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb859
+95028c_Enabled}\proptype30{\staticval True}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId}\proptype30{\staticval 72f988bf-86f1-41af-91ab-2d7cd011db47}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Owner}\proptype30
+{\staticval jagarg@microsoft.com}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate}\proptype30{\staticval 2018-05-23T08:47:46.8790302Z}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name}\proptype30{\staticval General}
+{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application}\proptype30{\staticval Microsoft Azure Information Protection}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method}\proptype30{\staticval Automatic}
+{\propname Sensitivity}\proptype30{\staticval General}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen
+\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\rempersonalinfo\allowfieldendsel
+\wrppunct\asianbrkrule\rsidroot4934124\newtblstyruls\nogrowautofit\remdttm\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal 
+\nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 
+\ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsep 
+\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsepc 
+\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsep 
+\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11152386 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid270541 \chftnsepc 
+\par }}\ltrpar \sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\headerl \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 
+\rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\headerr \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\footerl \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\footerr \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\headerf \ltrpar \pard\plain \ltrpar\s53\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\footerf \ltrpar \pard\plain \ltrpar\s55\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43 \ltrch\fcs0 \insrsid11152386 
+\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}
+{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8
+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
+\s28\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 MICROSOFT SOFTWARE LICENSE TERMS
+\par }\pard\plain \ltrpar\s29\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrb\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 MICROSOFT }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid2973522 \hich\af43\dbch\af13\loch\f43 VISUAL STUDIO }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid3042054 \hich\af43\dbch\af13\loch\f43 TEST PLATFORM}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid4934124\charrsid342430 
+\par }\pard\plain \ltrpar\s30\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
+\b\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid342430 \hich\af43\dbch\af13\loch\f43 
+These license terms are an agreement between Microsoft Corporation (or based on where you live, one of }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 its 
+\hich\af43\dbch\af13\loch\f43 affiliates) and you. They apply to the software named above. The terms also apply to any Microsoft}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+ services or updates for the software, except to the extent those have }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 additional}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
+\b0\fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43  terms.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
+\par }\pard\plain \ltrpar\s31\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrt\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4934124 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
+\b\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+If you comply with these license terms, you have the rights below.
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 1.\tab}}\pard\plain \ltrpar\s1\ql \fi-360\li360\ri0\sb120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid15287965 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
+\ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 IN\hich\af43\dbch\af13\loch\f43 STALLATION AND USE RIGHTS. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4731914 \hich\af43\dbch\af13\loch\f43 
+You may install and use any number of copies of the software.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid14179805\charrsid10576842 \hich\af43\dbch\af0\loch\f43 2.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid5318439 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid14179805\charrsid10576842 T}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\insrsid13378284\charrsid10576842 ERMS FOR SPECIFIC}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid14179805\charrsid10576842  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid15405862\charrsid10576842 COMPONENTS. 
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\loch\af43\hich\af43\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 a.\tab}}\pard\plain \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid8332882 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \fs20\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 Third Party Components.\~ }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af11\insrsid4609004\charrsid8332882 \hich\af43\dbch\af11\loch\f43 
+The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software.\~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\b0\fs20\dbch\af11\insrsid8332882\charrsid8332882 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid9066668\charrsid8332882 \hich\af43\dbch\af0\loch\f43 3.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls1\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid8332882 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
+\ltrch\fcs0 \fs20\insrsid9066668\charrsid8332882 DATA.  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid2708164\charrsid8332882 
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid2708164\charrsid10576842 \hich\af43\dbch\af0\loch\f43 a.\tab}}\pard\plain \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid2708164 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \fs20\insrsid2708164\charrsid10576842 Data Collection. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 The software may collect information abou
+t you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services.  You may opt-out of many of these scenarios, but not all, as described in the product documentati
+on.  There are also s}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid9066668\charrsid10576842 ome features in the software that may enable you }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid16020560\charrsid10576842 and Microsoft }{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\cf1\insrsid9066668\charrsid10576842 to collect data from users of your applications.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  If you use these features}{\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10688326\charrsid10576842 ,}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  you must comply with applicable law, including providing appropriate notices to users of your applications}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid6761489\charrsid10576842  together with }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid608234\charrsid10576842 a copy of }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\b0\fs20\insrsid6761489\charrsid10576842 Microsoft\rquote s privacy statement}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 . }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid6761489\charrsid10576842 
+Our privacy statement is located}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842  at}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid3171745\charrsid10576842  }{\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab0\af43\afs20 
+\ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid270541  HYPERLINK "https://go.microsoft.com/fwlink/?LinkID=824704" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid12217836\charrsid10576842 
+https://go.microsoft.com/fwlink/?LinkID=824704}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 . }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\b0\fs20\insrsid7109146\charrsid10576842 You can learn more about data collection and use in the help documentation and our privacy statement. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid9066668\charrsid10576842 
+Your use of the software operates as your consent to these practices.
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid213676\charrsid10576842 \hich\af43\dbch\af0\loch\f43 b.\tab}}\pard \ltrpar\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls15\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0\pararsid213676 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid213676\charrsid10576842 Processing of Personal Data. }{\rtlch\fcs1 \ab0\af43\afs20 
+\ltrch\fcs0 \b0\fs20\insrsid213676\charrsid10576842 To the extent Microsoft is a processor or subprocessor 
+of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at }{\field\fldedit{\*\fldinst {
+\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid270541  HYPERLINK "http://go.microsoft.com/?linkid=9840733" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\insrsid12217836\charrsid10576842 
+http://go.microsoft.com/?linkid=9840733}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid213676\charrsid10576842 .}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\insrsid213676\charrsid10576842  
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 4.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid15804309 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
+\ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Scope of License}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
+\b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+ The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more right\hich\af43\dbch\af13\loch\f43 
+s despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. }{\rtlch\fcs1 \ab0\af43\afs20 
+\ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 For more information, see }{\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\dbch\af13\insrsid270541 
+\hich\af43\dbch\af13\loch\f43  HYPER\hich\af43\dbch\af13\loch\f43 LINK "http://www.microsoft.com/licensing/userights" }}{\fldrslt {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \cs24\b0\fs20\ul\cf2\dbch\af13\insrsid554910\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43 www.microsoft.com/licensing/userights}}}\sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid9860928\sftnbj {\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43 . }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 You may not}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
+
+\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid4934124\charrsid342430 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}\pard\plain \ltrpar\s26\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0\pararsid4934124 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 \fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid342430 \hich\af43\dbch\af13\loch\f43 work around any technical limitations in the software}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid4934124\charrsid342430 
+\hich\af43\dbch\af11\loch\f43 ;}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid342430 
+\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid4934124\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 reverse engineer, decompile or disassemble the software, }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+or attempt to do so, }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 except and only to the extent }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid554910\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43 required by third party licensing terms governing use of certain open-source components that may be included with the software}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid4934124\charrsid10576842 
+\hich\af43\dbch\af11\loch\f43 ;}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}}\pard \ltrpar\s26\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0\pararsid2434661 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+remove, minimize, block or modify any notices of Microsoft or its suppliers in the software; 
+\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}\hich\af43\dbch\af13\loch\f43 use \hich\af43\dbch\af13\loch\f43 
+the software in any way that is against the law; or
+\par {\listtext\pard\plain\ltrpar \s26 \rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\loch\af3\hich\af3\dbch\af13\insrsid2434661\charrsid10576842 \loch\af3\dbch\af13\hich\f3 \'b7\tab}\hich\af43\dbch\af13\loch\f43 share, publish}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 , rent, or lease}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+ the software, or provide the software as a stand-alone }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid5780125 \hich\af43\dbch\af13\loch\f43 offering}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid2434661\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43  for others to use.
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 5.\tab}}\pard\plain \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid13594873 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 \b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 
+\ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Export Restrictions}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 
+\b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid554910\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+You must comply with all domestic and international export laws and r\hich\af43\dbch\af13\loch\f43 
+egulations that apply to the software, which include restrictions on destinations, end users and end use.  For further information on export restrictions, visit (aka.ms/exporting).}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid10956334\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 6.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 SUPPORT SERVICES.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \ab0\af43\afs20 
+\ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Because this software is \'93\loch\f43 \hich\f43 as is,\'94\loch\f43  we may not provide supp\hich\af43\dbch\af13\loch\f43 ort services for it.}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 7.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid4934124 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Entire Agreement.}
+{\rtlch\fcs1 \ab0\af43\afs20 \ltrch\fcs0 \b0\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+ This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 8.\tab}}\pard \ltrpar\s1\ql \fi-360\li360\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid528777 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Applicable Law}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 .}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid528777\charrsid10576842 \hich\af43\dbch\af13\loch\f43   }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\b0\fs20\insrsid528777\charrsid10576842 If you acquired the s
+oftware in the United States, Washington law applies to interpretation of and claims for breach of this agreement, and the laws of the state where you live apply to all other claims. If you acquired the software in any other country, its laws apply.}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid528777\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 9.\tab}}\pard \ltrpar\s1\ql \fi-360\li360\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid11541309 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 CONSUMER RIGHTS; REGIONAL VARIATIONS. }{\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
+This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft, you may also have rights
+ with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or ma
+ndatory country law applies, then the following provisions apply to you:
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 a.\tab}}\pard\plain \ltrpar
+\s2\ql \fi-360\li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls18\outlinelevel1\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
+\b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 Australia. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
+You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af0\loch\f43 b.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 Canada. }{\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 If you acquired this software in 
+Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninsta
+lling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334 
+\par {\listtext\pard\plain\ltrpar \s2 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f43\fs20\insrsid10956334\charrsid11626503 \hich\af43\dbch\af0\loch\f43 c.\tab}}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid11626503 Germany and Austria}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid11626503 .
+\par }\pard\plain \ltrpar\ql \li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 (i)}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\insrsid10956334\charrsid10576842 \tab }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 Warranty}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 
+\hich\af43\dbch\af11\loch\f43 . The properly licensed software will perform substantially as described in any Microsoft \hich\af43\dbch\af11\loch\f43 
+materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to the licensed software.
+\par }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 (ii)}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 \tab }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\b\fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 Limitation of Liability}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid10956334\charrsid10576842 \hich\af43\dbch\af11\loch\f43 
+. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as wel\hich\af43\dbch\af11\loch\f43 l as, in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
+\par }\pard\plain \ltrpar\s1\ql \li717\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin717\itap0\pararsid10956334 \rtlch\fcs1 \ab\af43\afs19\alang1025 \ltrch\fcs0 
+\b\f43\fs19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \b0\fs20\insrsid10956334\charrsid10576842 
+Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obli
+gations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other
+ cases of slight negligence, Microsoft will not be liable for slight negligence.
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 10.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid4934124 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+Disclaimer of Warranty.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43 \hich\f43 THE SOFTWARE IS LICENSED \'93\loch\f43 \hich\f43 AS-IS.\'94\loch\f43  YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTE
+\hich\af43\dbch\af13\loch\f43 D UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\caps\fs20\loch\af43\hich\af43\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 11.\tab}}\pard \ltrpar\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls15\outlinelevel0\adjustright\rin0\lin357\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \caps\fs20\dbch\af13\insrsid4934124\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+Limitation on and Exclusion of Damages. }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid12584315\charrsid10576842 YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP T
+O U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
+\par }\pard\plain \ltrpar\s25\ql \li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0\pararsid12584315 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, breach of warranty, guarantee or condition, strict liabi
+\hich\af43\dbch\af13\loch\f43 l\hich\af43\dbch\af13\loch\f43 ity, negligence, or other tort to the extent permitted by applicable law.
+\par }\pard\plain \ltrpar\ql \li360\ri0\sb120\sa120\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0\pararsid12584315 \rtlch\fcs1 \af43\afs19\alang1025 \ltrch\fcs0 
+\fs19\lang1033\langfe1033\loch\af43\hich\af43\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not \hich\af43\dbch\af13\loch\f43 
+allow the exclusion or limitation of incidental, consequential or other damages.
+\par }\pard \ltrpar\ql \li0\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin0\itap0\pararsid12584315 {\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.
+\par \hich\af43\dbch\af13\loch\f43 \hich\f43 Remarque : Ce logiciel \'e9\loch\f43 \hich\f43 tant distribu\'e9\hich\af43\dbch\af13\loch\f43 \hich\f43  au Qu\'e9\loch\f43 \hich\f43 
+bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7\loch\f43 ais.
+\par \hich\af43\dbch\af13\loch\f43 \hich\f43 EXON\'c9\loch\f43 RATION DE GARANTIE.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Le logiciel vis\'e9\loch\f43 \hich\f43  par une licence est offert \'ab\loch\f43 \hich\f43  tel quel \'bb\loch\f43 . Toute utilisation de ce logici}{\rtlch\fcs1 
+\af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid342430 \hich\af43\dbch\af13\loch\f43 \hich\f43 el est \'e0\loch\f43 \hich\f43  votre seule risque et p\'e9\loch\f43 ril. Microsoft\hich\af43\dbch\af13\loch\f43  n\hich\f43 \rquote \loch\f43 
+\hich\f43 accorde aucune autre garantie expresse. Vous pouvez b\'e9\loch\f43 \hich\f43 n\'e9\loch\f43 
+ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites \hich\af43\dbch\af13\loch\f43 d
+\hich\af43\dbch\af13\loch\f43 \hich\f43 e qualit\'e9\loch\f43  marchande, d\hich\f43 \rquote \loch\f43 \hich\f43 ad\'e9\loch\f43 \hich\f43 quation \'e0\loch\f43  un usage particulier et d\hich\f43 \rquote \loch\f43 \hich\f43 absence de contrefa\'e7
+\loch\f43 on sont exclues.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
+\par }{\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 LIMITATION DES DOMMAGES-INT\'c9\loch\f43 \hich\f43 R\'ca\loch\f43 \hich\f43 TS ET EXCLUSION DE RESPONSABILIT\'c9\loch\f43 
+ POUR LES DOMMAGES.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 
+Vous pouvez}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \hich\af43\dbch\af11\loch\f43  }{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 
+\hich\af43\dbch\af13\loch\f43 obtenir de Microsoft et de ses fournisseurs une indemnisation \hich\af43\dbch\af13\loch\f43 \hich\f43 en cas de dommages directs uniquement \'e0\loch\f43 \hich\f43  hauteur de 5,00 $ US. Vous ne pouvez pr\'e9\loch\f43 
+\hich\f43 tendre \'e0\loch\f43 \hich\f43  aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9\loch\f43 \hich\f43 ciaux, indirects ou accessoires et pertes de b\'e9}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 
+\fs20\dbch\af13\insrsid12584315\charrsid342430 \hich\af43\dbch\af13\loch\f43 \hich\f43 n\'e9\loch\f43 fices.
+\par \hich\af43\dbch\af13\loch\f43 Cette limitation concerne:
+\par }\pard \ltrpar\ql \fi-363\li363\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin363\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \loch\af43\dbch\af13\hich\f43 \'b7\~\~\~\~\tab 
+\loch\f43 tout \hich\af43\dbch\af13\loch\f43 \hich\f43 ce qui est reli\'e9\loch\f43  au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et
+\par \loch\af43\dbch\af13\hich\f43 \'b7\~\~\~\~\~\loch\f43 \hich\f43 les r\'e9\loch\f43 \hich\f43 clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9\loch\f43  stric\hich\af43\dbch\af13\loch\f43 \hich\f43 te, de n\'e9
+\loch\f43 gligence ou d\hich\f43 \rquote \loch\f43 \hich\f43 une autre faute dans la limite autoris\'e9\loch\f43 e par la loi en vigueur.
+\par }\pard \ltrpar\ql \li0\ri0\sb40\sa40\widctlpar\wrapdefault\faauto\adjustright\rin0\lin0\itap0\pararsid12584315 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 Elle s\hich\f43 \rquote 
+\loch\f43 \hich\f43 applique \'e9\loch\f43 \hich\f43 galement, m\'ea\loch\f43 \hich\f43 me si Microsoft connaissait ou devrait conna\'ee\loch\f43 tre l\hich\f43 \rquote \'e9\loch\f43 \hich\f43 ventualit\'e9\loch\f43  d\hich\f43 \rquote \loch\f43 
+un tel dommage. Si votre pays n\hich\f43 \rquote \loch\f43 autorise pas l\hich\f43 \rquote \loch\f43 exclusion ou la limitation d\hich\af43\dbch\af13\loch\f43 \hich\f43 e responsabilit\'e9\loch\f43 
+ pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\hich\f43 \rquote \loch\f43 exclusion ci-dessus ne s\hich\f43 \rquote \loch\f43 \hich\f43 appliquera pas \'e0\loch\f43 \hich\f43  votre \'e9
+\loch\f43 gard.
+\par }{\rtlch\fcs1 \ab\af43\afs20 \ltrch\fcs0 \b\fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 EFFET JURIDIQUE.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\cf1\lang1036\langfe1033\langnp1036\insrsid12584315\charrsid10576842 \~}{
+\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid10576842 \hich\af43\dbch\af13\loch\f43 \hich\f43 Le pr\'e9\loch\f43 \hich\f43 sent contrat d\'e9\loch\f43 crit certains droits juridiques. Vous\hich\af43\dbch\af13\loch\f43 
+ pourriez avoir d\hich\f43 \rquote \loch\f43 \hich\f43 autres droits pr\'e9\loch\f43 \hich\f43 vus par les lois de votre pays. Le pr\'e9\loch\f43 \hich\f43 sent contrat ne modifie pas les droits que vous conf\'e8\loch\f43 
+rent les lois de votre pays si celles-ci ne le permettent pas.}{\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\dbch\af13\insrsid12584315\charrsid342430 
+\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af43\afs20 \ltrch\fcs0 \fs20\insrsid9860928\charrsid342430 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f
+7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87
+615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad
+79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b
+5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab
+999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9
+699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586
+8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6
+0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f
+9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be
+15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979
+3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d
+32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a
+f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86
+e877f0034e16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb
+44f95d843b5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a
+6409fb44d08741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c
+3d9058edf2c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db0256
+5e85f3b9660d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276
+b9f7dec44b7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8
+c33585b5fb9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e
+51440ca2e0088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95
+b21be5ceaf8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff
+6dce591a26ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec6
+9ffb9e65d028d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239
+b75a5bb1e6345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a449
+59d366ad93b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e8
+2db8df9f30254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468
+656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4
+350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d2624
+52282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe5141
+73d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000
+0000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000
+000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019
+0200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b00001600000000
+000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027
+00000000000000000000000000a00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d0100009b0a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax375\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority59 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;
+\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;
+\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;
+\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;
+\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;
+\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;
+\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;
+\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;
+\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;
+\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;
+\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;
+\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;}}{\*\datastore 010500000200000018000000
+4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000020cc
+88b972f2d301feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
new file mode 100644
index 0000000000..05c6992e46
--- /dev/null
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <IsVsixProject>true</IsVsixProject>
+    <TargetFrameworks>$(NetFrameworkRunnerTargetFramework)</TargetFrameworks>
+    <!-- MSB3270 Suppress warnings about platform specific projects imported in AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
+  <!-- VSIX -->
+  <PropertyGroup>
+    <!-- General properties -->
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <DeployExtension>false</DeployExtension>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <IncludeCopyLocalReferencesInVSIXContainer>false</IncludeCopyLocalReferencesInVSIXContainer>
+    <ExtensionInstallationFolder>TestPlatform</ExtensionInstallationFolder>
+
+    <!-- Arcade SDK marks all the assemblies included in the packages for NGEN by default. -->
+    <Ngen>false</Ngen>
+
+    <!-- VS Insertion -->
+    <VisualStudioInsertionComponent>Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI</VisualStudioInsertionComponent>
+    <IsVisualStudioBuildPackage>true</IsVisualStudioBuildPackage>
+
+    <!-- Properties for items we include in VSIX -->
+    <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
+    <TestPlatformCliBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\</TestPlatformCliBinFolder>
+    <TestPlatformBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\</TestPlatformBinFolder>
+    <MsDiaFolder>$(TestPlatformBinFolder)Microsoft.Internal.Dia\</MsDiaFolder>
+    <CodeCoverageIOFolder>$(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\</CodeCoverageIOFolder>
+    <VSQualityToolsFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\</VSQualityToolsFolder>
+    <DependencyModelFolder>$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\</DependencyModelFolder>
+    <FileSystemGlobbingFolder>$(TestPlatformBinFolder)Microsoft.Extensions.FileSystemGlobbing\</FileSystemGlobbingFolder>
+    <VSSDKBuildToolsFolder>$(TestPlatformBinFolder)Microsoft.VSSDK.BuildTools\</VSSDKBuildToolsFolder>
+    <InternalTestPlatformExtensionsFolder>$(TestPlatformBinFolder)Microsoft.Internal.TestPlatform.Extensions\</InternalTestPlatformExtensionsFolder>
+  </PropertyGroup>
+
+  <!-- Localized langpack files -->
+  <ItemGroup>
+    <VsixSourceItem Include="Resources\cs\extension.vsixlangpack">
+      <VSIXSubPath>cs</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\de\extension.vsixlangpack">
+      <VSIXSubPath>de</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\es\extension.vsixlangpack">
+      <VSIXSubPath>es</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\fr\extension.vsixlangpack">
+      <VSIXSubPath>fr</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\it\extension.vsixlangpack">
+      <VSIXSubPath>it</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\ja\extension.vsixlangpack">
+      <VSIXSubPath>ja</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\ko\extension.vsixlangpack">
+      <VSIXSubPath>ko</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\pl\extension.vsixlangpack">
+      <VSIXSubPath>pl</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\pt-BR\extension.vsixlangpack">
+      <VSIXSubPath>pt-BR</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\ru\extension.vsixlangpack">
+      <VSIXSubPath>ru</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\tr\extension.vsixlangpack">
+      <VSIXSubPath>tr</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\zh-Hans\extension.vsixlangpack">
+      <VSIXSubPath>zh-Hans</VSIXSubPath>
+    </VsixSourceItem>
+    <VsixSourceItem Include="Resources\zh-Hant\extension.vsixlangpack">
+      <VSIXSubPath>zh-Hant</VSIXSubPath>
+    </VsixSourceItem>
+  </ItemGroup>
+
+  <!--
+    We cannot use the VSIXSourceItems for wildcard as the evaluation is not done at the correct time. This is causing wildcard items to be missed.
+    Instead use a target that runs before 'GenerateFileManifest' since that's when the VSIX files are collected.
+  -->
+  <Target Name="AddDependencyItems" BeforeTargets="GenerateFileManifest">
+
+    <!-- Test host dependencies -->
+    <ItemGroup>
+      <!-- We still need to manually include artifacts from the other tfms -->
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net4*\win*\*.*" Exclude="$(ArtifactsBinDir)\testhost\$(Configuration)\net4*\win*\testhost.exe;$(ArtifactsBinDir)\testhost\$(Configuration)\net4*\win*\testhost.net4*.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\$(NetFrameworkMinimum)\win*\testhost.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net47\win*\testhost.net47.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net47.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net471\win*\testhost.net471.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net472\win*\testhost.net472.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net48\win*\testhost.net48.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost\$(Configuration)\net481\win*\testhost.net481.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.exe" />
+
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\*.*" Exclude="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\testhost.x86.exe;$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net4*\win*\testhost.net4*.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win*\testhost.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net47\win*\testhost.net47.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net47.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net471\win*\testhost.net471.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net472\win*\testhost.net472.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net48\win*\testhost.net48.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.x86.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.x86\$(Configuration)\net481\win*\testhost.net481.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.x86.exe" />
+
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\*.*" Exclude="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\testhost.arm64.exe;$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net4*\win*\testhost.net4*.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\$(NetFrameworkMinimum)\win*\testhost.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net47\win*\testhost.net47.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net47.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net471\win*\testhost.net471.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net472\win*\testhost.net472.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net48\win*\testhost.net48.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.arm64.exe" />
+      <VsixSourceItem Include="$(ArtifactsBinDir)\testhost.arm64\$(Configuration)\net481\win*\testhost.net481.arm64.exe" Ngen="true" NgenArchitecture="Arm64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net481.arm64.exe" />
+    </ItemGroup>
+
+    <!-- Cpp Extensions -->
+    <ItemGroup>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\*" Exclude="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\*.pdb">
+        <VSIXSubPath>Extensions\Cpp</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\arm64\dbghelp.dll">
+        <VSIXSubPath>Extensions\Cpp\arm64</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\x64\dbghelp.dll">
+        <VSIXSubPath>Extensions\Cpp\x64</VSIXSubPath>
+      </VsixSourceItem>
+    </ItemGroup>
+
+    <!-- msdia -->
+    <ItemGroup>
+      <VsixSourceItem Include="$(MsDiaFolder)x64\*">
+        <VSIXSubPath>x64</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(MsDiaFolder)x86\*">
+        <VSIXSubPath>x86</VSIXSubPath>
+      </VsixSourceItem>
+    </ItemGroup>
+
+    <!-- Code Coverage -->
+    <ItemGroup>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)Microsoft.CodeCoverage.IO.dll" />
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\cs\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>cs</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\de\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>de</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\es\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>es</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\fr\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>fr</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\it\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>it</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\ja\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>ja</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\ko\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>ko</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\pl\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>pl</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\pt-BR\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>pt-BR</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\ru\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>ru</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\tr\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>tr</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\zh-Hans\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>zh-Hans</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(CodeCoverageIOFolder)\zh-Hant\Microsoft.CodeCoverage.IO.resources.dll">
+        <VSIXSubPath>zh-Hant</VSIXSubPath>
+      </VsixSourceItem>
+    </ItemGroup>
+
+    <!-- Microsoft.Internal.TestPlatform.Extensions -->
+    <ItemGroup>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)Microsoft.DiaSymReader.dll" />
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)Microsoft.IntelliTrace.Core.dll" />
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.*.dll" Exclude="$(InternalTestPlatformExtensionsFolder)\**\*Media*.dll;$(InternalTestPlatformExtensionsFolder)\**\*Video*.dll;">
+        <VSIXSubPath>Extensions</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.*.dll">
+        <VSIXSubPath>Extensions</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.*.dll" Exclude="$(InternalTestPlatformExtensionsFolder)\**\*Web*.dll;$(InternalTestPlatformExtensionsFolder)\**\*Tmi*.dll;$(InternalTestPlatformExtensionsFolder)\**\*Video*.dll;">
+        <VSIXSubPath>Extensions</VSIXSubPath>
+      </VsixSourceItem>
+    </ItemGroup>
+
+    <!-- Microsoft.TestPlatform -->
+    <ItemGroup>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Reflection.Metadata.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Collections.Immutable.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Memory.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Text.Json.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Runtime.CompilerServices.Unsafe.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Numerics.Vectors.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)System.Buffers.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft.VisualStudio.ArchitectureTools.PEReader.dll">
+        <VSIXSubPath>Extensions</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft.VisualStudio.Interop.dll" />
+      <VsixSourceItem Include="$(TestPlatformBinFolder)Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)Microsoft.TestPlatform.TestHostRuntimeProvider.dll">
+        <VSIXSubPath>Extensions</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)cs\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\cs</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)de\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\de</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)es\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\es</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)fr\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\fr</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)it\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\it</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)ja\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\ja</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)ko\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\ko</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)pl\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\pl</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)pt-BR\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\pt-BR</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)ru\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\ru</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)tr\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\tr</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)zh-Hans\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\zh-Hans</VSIXSubPath>
+      </VsixSourceItem>
+      <VsixSourceItem Include="$(TestPlatformBinFolder)zh-Hant\Microsoft*.TestPlatform.Extensions.*.dll;$(TestPlatformBinFolder)zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll">
+        <VSIXSubPath>Extensions\zh-Hant</VSIXSubPath>
+      </VsixSourceItem>
+
+      <VsixSourceItem Include="$(TestPlatformBinFolder)DumpMiniTool*">
+        <VSIXSubPath>Extensions\dump</VSIXSubPath>
+      </VsixSourceItem>
+    </ItemGroup>
+
+    <ItemGroup>
+      <VsixSourceItem Include="$(DependencyModelFolder)Microsoft.Extensions.DependencyModel.dll" />
+      <VsixSourceItem Include="$(FileSystemGlobbingFolder)Microsoft.Extensions.FileSystemGlobbing.dll" />
+      <VsixSourceItem Include="$(VSSDKBuildToolsFolder)System.Diagnostics.DiagnosticSource.dll" />
+      <VsixSourceItem Include="$(VSSDKBuildToolsFolder)System.Runtime.CompilerServices.Unsafe.dll" />
+      <VsixSourceItem Include="$(VSQualityToolsFolder)Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- For some reason, this is not included through the project reference so manually force adding it -->
+      <VsixSourceItem Include="$(OutputPath)SettingsMigrator.exe.config" />
+    </ItemGroup>
+  </Target>
+
+  <ItemGroup>
+    <Content Include="License.rtf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="testplatform.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+    <Content Include="$(SrcPackageFolder)ThirdPartyNotices.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkRunnerTargetFramework)'))">
+    <ProjectReference Include="..\..\datacollector.arm64\datacollector.arm64.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\..\datacollector\datacollector.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SettingsMigrator\SettingsMigrator.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\..\vstest.console.arm64\vstest.console.arm64.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\..\vstest.console\vstest.console.csproj">
+      <Ngen>false</Ngen>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform\Microsoft.TestPlatform.csproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+      <ExcludeAssets>all</ExcludeAssets>
+      <Private>False</Private>
+      <PrivateAssets>all</PrivateAssets>
+      <Ngen>false</Ngen>
+    </ProjectReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/package/VSIXProject/Resources/cs/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/cs/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/cs/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/cs/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/de/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/de/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/de/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/de/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/es/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/es/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/es/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/es/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/fr/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/fr/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/fr/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/fr/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/it/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/it/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/it/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/it/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/ja/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ja/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/ja/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ja/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/ko/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ko/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/ko/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ko/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/pl/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/pl/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/pl/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/pl/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/pt-BR/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/pt-BR/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/pt-BR/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/pt-BR/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/ru/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ru/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/ru/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/ru/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/tr/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/tr/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/tr/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/tr/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/zh-Hans/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/zh-Hans/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/zh-Hans/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/zh-Hans/extension.vsixlangpack
diff --git a/src/package/VSIXProject/Resources/zh-Hant/extension.vsixlangpack b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/zh-Hant/extension.vsixlangpack
similarity index 100%
rename from src/package/VSIXProject/Resources/zh-Hant/extension.vsixlangpack
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Resources/zh-Hant/extension.vsixlangpack
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/source.extension.vsixmanifest b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/source.extension.vsixmanifest
new file mode 100644
index 0000000000..544925804e
--- /dev/null
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/source.extension.vsixmanifest
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="Microsoft.TestPlatform.VSIX.Microsoft.0e51abf6-9f5f-401e-a812-4043b87acabf" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>Microsoft Visual Studio Test Platform</DisplayName>
+    <Description xml:space="preserve">Extensible Test Platform that allows developers to discover, execute and analyze automated tests.</Description>
+    <License>License.rtf</License>
+    <PackageId>Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI</PackageId>
+  </Metadata>
+  <Installation AllUsers="true" Experimental="true">
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Community"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Community"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Pro"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Pro"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Enterprise"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.Enterprise"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VSWinExpress"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VSWinExpress"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VWDExpress"><ProductArchitecture>amd64</ProductArchitecture></InstallationTarget>
+    <InstallationTarget Version="[17.0, 18.0)" Id="Microsoft.VisualStudio.VWDExpress"><ProductArchitecture>x86</ProductArchitecture></InstallationTarget>
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="[4.6.2,)" />
+  </Dependencies>
+  <Assets>
+    <Asset Type="Microsoft.TestPlatform.V2" Path="vstest.console.exe" />
+  </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0, 18.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
+</PackageManifest>
diff --git a/src/package/VSIXProject/testplatform.config b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/testplatform.config
similarity index 100%
rename from src/package/VSIXProject/testplatform.config
rename to src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/testplatform.config
diff --git a/src/package/ThirdPartyNotices.txt b/src/package/ThirdPartyNotices.txt
index 8efcee2fa8..bb349995be 100644
--- a/src/package/ThirdPartyNotices.txt
+++ b/src/package/ThirdPartyNotices.txt
@@ -8,9 +8,9 @@ and the licenses under which Microsoft received such components are set forth be
 informational purposes only. Microsoft reserves all rights not expressly granted herein, whether by 
 implication, estoppel or otherwise.
 
-1.	Newtonsoft version 9.0.1 (https://github.com/JamesNK/Newtonsoft.Json)
-2.	Mono.Cecil version 0.11.3 (https://github.com/jbevain/cecil)
-
+1. Newtonsoft version 13.0.3 (https://github.com/JamesNK/Newtonsoft.Json)
+2. Mono.Cecil version 0.11.3 (https://github.com/jbevain/cecil)
+3. Nuget.Client version 6.8.0.117 \(https://github.com/NuGet/NuGet.Client)
 
 
 %% Newtonsoft NOTICES AND INFORMATION BEGIN HERE
@@ -62,3 +62,24 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF Mono.Cecil NOTICES AND INFORMATION
+
+
+%% NuGet.Client NOTICES AND INFORMATION BEGIN HERE
+==================================================
+Copyright (c) .NET Foundation and Contributors.
+
+All rights reserved.
+
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+these files except in compliance with the License. You may obtain a copy of the
+License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+=========================================
+END OF NuGet.Client NOTICES AND INFORMATION
diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj
deleted file mode 100644
index ca48090d5c..0000000000
--- a/src/package/VSIXProject/TestPlatform.csproj
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot>..\..\..\</TestPlatformRoot>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.Dependencies.props" />
-  <Import Project="$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('($TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{0625257F-549C-4558-97ED-C79EC43C3480}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TestPlatform</RootNamespace>
-    <AssemblyName>TestPlatform</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <DeployExtension>False</DeployExtension>
-    <IsProductComponent>true</IsProductComponent>
-    <VsixInputFileLocation>$(TestPlatformRoot)artifacts\$(Configuration)\net451\win7-x64</VsixInputFileLocation>
-    <OutputPath>$(TestPlatformRoot)artifacts\$(Configuration)\VSIX</OutputPath>
-    <ExtensionInstallationFolder>TestPlatform</ExtensionInstallationFolder>
-    <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
-
-    <!-- Disable warning that there are no source files. It is intentional. -->
-    <NoWarn>$(NoWarn);2008</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-
-    <!-- Localized langpack files -->
-    <VsixSourceItem Include="Resources\cs\extension.vsixlangpack">
-      <VSIXSubPath>cs</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\de\extension.vsixlangpack">
-      <VSIXSubPath>de</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\es\extension.vsixlangpack">
-      <VSIXSubPath>es</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\fr\extension.vsixlangpack">
-      <VSIXSubPath>fr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\it\extension.vsixlangpack">
-      <VSIXSubPath>it</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\ja\extension.vsixlangpack">
-      <VSIXSubPath>ja</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\ko\extension.vsixlangpack">
-      <VSIXSubPath>ko</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\pl\extension.vsixlangpack">
-      <VSIXSubPath>pl</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\pt-BR\extension.vsixlangpack">
-      <VSIXSubPath>pt-BR</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\ru\extension.vsixlangpack">
-      <VSIXSubPath>ru</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\tr\extension.vsixlangpack">
-      <VSIXSubPath>tr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\zh-Hans\extension.vsixlangpack">
-      <VSIXSubPath>zh-Hans</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="Resources\zh-Hant\extension.vsixlangpack">
-      <VSIXSubPath>zh-Hant</VSIXSubPath>
-    </VsixSourceItem>
-    
-    <!-- Localized resources -->
-    <VsixSourceItem Include="$(VsixInputFileLocation)\cs\*.dll">
-      <VSIXSubPath>cs</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\de\*.dll">
-      <VSIXSubPath>de</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\es\*.dll">
-      <VSIXSubPath>es</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\fr\*.dll">
-      <VSIXSubPath>fr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\it\*.dll">
-      <VSIXSubPath>it</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\ja\*.dll">
-      <VSIXSubPath>ja</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\ko\*.dll">
-      <VSIXSubPath>ko</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\pl\*.dll">
-      <VSIXSubPath>pl</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\pt-BR\*.dll">
-      <VSIXSubPath>pt-BR</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\ru\*.dll">
-      <VSIXSubPath>ru</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\tr\*.dll">
-      <VSIXSubPath>tr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\zh-Hans\*.dll">
-      <VSIXSubPath>zh-Hans</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\zh-Hant\*.dll">
-      <VSIXSubPath>zh-Hant</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\*.*" Exclude="$(VsixInputFileLocation)\Extensions\*.pdb">
-      <VSIXSubPath>Extensions</VSIXSubPath>
-    </VsixSourceItem>
-
-    <!-- Localized Extensions resources -->
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\cs\*.dll">
-      <VSIXSubPath>Extensions\cs</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\de\*.dll">
-      <VSIXSubPath>Extensions\de</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\es\*.dll">
-      <VSIXSubPath>Extensions\es</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\fr\*.dll">
-      <VSIXSubPath>Extensions\fr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\it\*.dll">
-      <VSIXSubPath>Extensions\it</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\ja\*.dll">
-      <VSIXSubPath>Extensions\ja</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\ko\*.dll">
-      <VSIXSubPath>Extensions\ko</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\pl\*.dll">
-      <VSIXSubPath>Extensions\pl</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\pt-BR\*.dll">
-      <VSIXSubPath>Extensions\pt-BR</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\ru\*.dll">
-      <VSIXSubPath>Extensions\ru</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\tr\*.dll">
-      <VSIXSubPath>Extensions\tr</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\zh-Hans\*.dll">
-      <VSIXSubPath>Extensions\zh-Hans</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\zh-Hant\*.dll">
-      <VSIXSubPath>Extensions\zh-Hant</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\CoreCon\*.*">
-      <VSIXSubPath>CoreCon</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\Cpp\*.*" Exclude="$(VsixInputFileLocation)\Extensions\Cpp\*.pdb">
-      <VSIXSubPath>Extensions\Cpp</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\Cpp\x64\*.*" Exclude="$(VsixInputFileLocation)\Extensions\Cpp\x64\*.pdb">
-      <VSIXSubPath>Extensions\Cpp\x64</VSIXSubPath>
-    </VsixSourceItem>
-    
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\TestImpact\ComComponents\x64\*.*">
-      <VSIXSubPath>Extensions\TestImpact\ComComponents\x64</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\TestImpact\ComComponents\x86\*.*">
-      <VSIXSubPath>Extensions\TestImpact\ComComponents\x86</VSIXSubPath>
-    </VsixSourceItem>
-
-    <!-- CUIT -->
-    <VsixSourceItem Include="$(VsixInputFileLocation)\CUITPlugins\*.*" Exclude="$(VsixInputFileLocation)\CUITPlugins\*.pdb">
-      <VSIXSubPath>CUITPlugins</VSIXSubPath>
-    </VsixSourceItem>
-
-    <!-- V1 Data Collectors -->
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\V1\*.*" Exclude="$(VsixInputFileLocation)\Extensions\V1\*.pdb">
-      <VSIXSubPath>Extensions\V1</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\V1\x86\*.*" Exclude="$(VsixInputFileLocation)\Extensions\V1\*.pdb">
-      <VSIXSubPath>Extensions\V1\x86</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\V1\x64\*.*" Exclude="$(VsixInputFileLocation)\Extensions\V1\*.pdb">
-      <VSIXSubPath>Extensions\V1\x64</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\V1\TestImpact\ComComponents\x64\*.*">
-      <VSIXSubPath>Extensions\V1\TestImpact\ComComponents\x64</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\V1\TestImpact\ComComponents\x86\*.*">
-      <VSIXSubPath>Extensions\V1\TestImpact\ComComponents\x86</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\Extensions\VideoRecorder\*.*">
-      <VSIXSubPath>Extensions\VideoRecorder</VSIXSubPath>
-    </VsixSourceItem>
-
-    <!-- Test host dependencies -->
-    <VsixSourceItem Include="$(VsixInputFileLocation)\x64\*.*">
-      <VSIXSubPath>x64</VSIXSubPath>
-    </VsixSourceItem>
-    <VsixSourceItem Include="$(VsixInputFileLocation)\x86\*.*">
-      <VSIXSubPath>x86</VSIXSubPath>
-    </VsixSourceItem>
-
-    <VsixSourceItem Include="$(VsixInputFileLocation)\*.*" Exclude="$(VsixInputFileLocation)\*.pdb" />
-
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net452.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net452.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net452.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net452.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net46.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net46.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net46.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net46.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net461.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net461.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net461.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net461.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net462.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net462.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net462.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net462.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net47.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net47.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net47.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net47.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net471.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net471.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net471.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net472.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net472.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net472.x86.exe" />
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net48.exe" Ngen="true" NgenArchitecture="X64" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.exe" /> 
-    <VsixSourceItem Update="$(VsixInputFileLocation)\testhost.net48.x86.exe" Ngen="true" NgenArchitecture="X86" NgenPriority="2" NgenApplication="$(ExtensionInstallationRelativeToVS)\testhost.net48.x86.exe" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="License.rtf">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="testplatform.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>    
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.targets'))" />
-  </Target>
-  <Import Project="$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('$(TestPlatformRoot)packages\microsoft.vssdk.buildtools\$(VSSdkBuildToolsVersion)\build\Microsoft.VSSDK.BuildTools.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/src/package/VSIXProject/source.extension.vsixmanifest b/src/package/VSIXProject/source.extension.vsixmanifest
deleted file mode 100644
index f08d3ef7b1..0000000000
--- a/src/package/VSIXProject/source.extension.vsixmanifest
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="Microsoft.TestPlatform.VSIX.Microsoft.0e51abf6-9f5f-401e-a812-4043b87acabf" Version="$version$" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>Microsoft Visual Studio Test Platform</DisplayName>
-    <Description xml:space="preserve">Extensible Test Platform that allows developers to discover, execute and analyze automated tests.</Description>
-    <License>License.rtf</License>
-    <PackageId>Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI</PackageId>
-  </Metadata>
-  <Installation AllUsers="true" SystemComponent="true">
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
-    <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.VWDExpress" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="[4.5,)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="Microsoft.TestPlatform.V2" Path="vstest.console.exe" />
-  </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
-</PackageManifest>
-
-
-
diff --git a/src/package/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj b/src/package/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj
deleted file mode 100644
index cf2b23a470..0000000000
--- a/src/package/VSmanproj/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsmanproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Copyright (c)  Microsoft.  All Rights Reserved. -->
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-    <FinalizeManifest>true</FinalizeManifest>
-    <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <IsPackage>true</IsPackage>
-    <OutputPath>$(TestPlatformRoot)artifacts\$(Configuration)\VSIX\</OutputPath>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-	  <UseVisualStudioVersion>true</UseVisualStudioVersion>
-    <ValidateManifest>false</ValidateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(RunningInMicroBuild)' != 'true'"> 
-     <FinalizeValidate>false</FinalizeValidate> 
-     <ManifestPublishUrl>https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/VS/lab/d15prerel/$(BUILD_BUILDNUMBER);</ManifestPublishUrl> 
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\packages\MicroBuild.Core\0.2.0\build\MicroBuild.Core.targets" />
-  <Import Project="..\..\..\packages\MicroBuild.Core\0.2.0\build\MicroBuild.Core.props" />
-  <ItemGroup>
-    <MergeManifest Include="$(OutputPath)Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.json" />
-  </ItemGroup>
-</Project>
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
deleted file mode 100644
index 8796ae8438..0000000000
--- a/src/package/external/external.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">../../../</TestPlatformRoot>
-    <!-- TODO: Remove this before comitting, it ignores nuget signing issues. -->
-    <NoWarn>$(NoWarn);NU3018;NU3027</NoWarn>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
-    <AssemblyName>restore</AssemblyName>
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
-
-    <!-- This proj file shouldn't create outputs during build or publish -->
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
-    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
-    <!-- This csproj restore external tools required for build process -->
-    <PackageReference Include="NuGet.CommandLine" Version="5.8.1" PrivateAssets="All" />
-    <PackageReference Include="fmdev.xlftool" Version="0.1.3" PrivateAssets="All" />
-    <PackageReference Include="MicroBuild.Core" Version="0.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" Version="14.0.12-pre" PrivateAssets="All" />
-    <PackageReference Include="vswhere" Version="2.0.2" PrivateAssets="All" />
-	  <PackageReference Include="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-21075-01" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.TestPlatform.Remote" Version="$(TestPlatformRemoteExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.TestPlatform.Extensions" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.TraceDataCollector" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Coverage.IO" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" />     
-    <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.QualityTools" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.QualityTools.DataCollectors" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.CUIT" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.Intellitrace" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.8.3247" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(InteropExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="16.3.58" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.23" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.23" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness" Version="$(MicrosoftFakesVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Internal.Intellitrace.Extensions" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
-    <PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(ILAsmPackageVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" PrivateAssets="All" />
-
-    <!-- Required for resolution of desktop dependencies in non windows environment.
-         We've to set to net472 since the net451 and other packages have assemblies in wrong case.
-         E.g. System.XML instead of System.Xml. -->
-    <PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.7.2" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-
-  <!-- Prevent Csc from being called -->
-  <Target Name="CoreCompile" />
-</Project>
diff --git a/src/package/licenses/LICENSE_MIT.txt b/src/package/licenses/LICENSE_MIT.txt
new file mode 100644
index 0000000000..623364765d
--- /dev/null
+++ b/src/package/licenses/LICENSE_MIT.txt
@@ -0,0 +1,24 @@
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/src/package/licenses/LICENSE_NET.txt b/src/package/licenses/LICENSE_NET.txt
deleted file mode 100644
index 5b03e9dce1..0000000000
--- a/src/package/licenses/LICENSE_NET.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-MICROSOFT SOFTWARE LICENSE TERMS
-
-MICROSOFT .NET LIBRARY
-
-These license terms are an agreement between you and Microsoft Corporation (or based on where you live, one of its affiliates). They apply to the software named above. The terms also apply to any Microsoft services or updates for the software, except to the extent those have different terms.
-
-IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.
-
-1.    INSTALLATION AND USE RIGHTS.
-You may install and use any number of copies of the software to develop and test your applications. 
-
-2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software.
-3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.
-a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. “Distributable Code” is code that you are permitted to distribute in applications you develop if you comply with the terms below.
-i.      Right to Use and Distribute.
-·        You may copy and distribute the object code form of the software.
-
-·        Third Party Distribution. You may permit distributors of your applications to copy and distribute the Distributable Code as part of those applications.
-
-ii.     Distribution Requirements. For any Distributable Code you distribute, you must
-·        use the Distributable Code in your applications and not as a standalone distribution;
-
-·        require distributors and external end users to agree to terms that protect it at least as much as this agreement; and
-
-·        indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, related to the distribution or use of your applications, except to the extent that any claim is based solely on the unmodified Distributable Code.
-
-iii.   Distribution Restrictions. You may not
-·        use Microsoft’s trademarks in your applications’ names or in a way that suggests your applications come from or are endorsed by Microsoft; or
-
-·        modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An “Excluded License” is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it.
-
-4.    DATA.
-a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products and services.  You may opt-out of many of these scenarios, but not all, as described in the software documentation.  There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with Microsoft’s privacy statement. Our privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices.
-b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at https://docs.microsoft.com/en-us/legal/gdpr.
-5.    SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not
-·        work around any technical limitations in the software;
-
-·        reverse engineer, decompile or disassemble the software, or otherwise attempt to derive the source code for the software, except and to the extent required by third party licensing terms governing use of certain open source components that may be included in the software;
-
-·        remove, minimize, block or modify any notices of Microsoft or its suppliers in the software;
-
-·        use the software in any way that is against the law; or
-
-·        share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party.
-
-6.    EXPORT RESTRICTIONS. You must comply with all domestic and international export laws and regulations that apply to the software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit www.microsoft.com/exporting.  
-7.    SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it.
-8.    ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.
-9.    APPLICABLE LAW.  If you acquired the software in the United States, Washington law applies to interpretation of and claims for breach of this agreement, and the laws of the state where you live apply to all other claims. If you acquired the software in any other country, its laws apply.
-10. CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you:
-a)    Australia. You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
-b)    Canada. If you acquired this software in Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninstalling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.
-c)    Germany and Austria.
-(i)        Warranty. The software will perform substantially as described in any Microsoft materials that accompany it. However, Microsoft gives no contractual guarantee in relation to the software.
-
-(ii)       Limitation of Liability. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as well as in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
-
-Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence
-11. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-12. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.
-
-It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your state or country may not allow the exclusion or limitation of incidental, consequential or other damages.
-
- 
\ No newline at end of file
diff --git a/src/package/localize/localize.proj b/src/package/localize/localize.proj
deleted file mode 100644
index 46aa11898b..0000000000
--- a/src/package/localize/localize.proj
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">$(MSBuildThisFileDirectory)..\..\..\</TestPlatformRoot>
-    <SourceRoot>$(TestPlatformRoot)src\</SourceRoot>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProductSource Include="$(SourceRoot)**\*.csproj" Exclude="$(SourceRoot)package\**\*.csproj" />
-  </ItemGroup>
-
-  <Target Name="Localize">
-    <MSBuild Projects="@(ProductSource)" Targets="Localize" BuildInParallel="True" />
-  </Target>
-</Project>
diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec
deleted file mode 100644
index 8e5d92e547..0000000000
--- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.CodeCoverage</id>
-    <version>$Version$</version>
-    <title>Microsoft.CodeCoverage</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>Microsoft.CodeCoverage package brings infra for collecting code coverage from vstest.console.exe and "dotnet test".</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing codecoverage code-coverage</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <dependencies>
-      <group targetFramework="net45"></group>
-      <group targetFramework="netcoreapp1.0"></group>
-    </dependencies>
-  </metadata>
-
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <file src="ThirdPartyNoticesCodeCoverage.txt" target="ThirdPartyNotices.txt" />
-    <file src="ThirdPartyNoticesCodeCoverage.txt" target="build\netstandard1.0\ThirdPartyNotices.txt" />
-    <file src="Microsoft.CodeCoverage.props" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage.targets" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.TraceDataCollector.dll" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Core.dll" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Interprocess.dll" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Instrumentation.dll" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Mono.Cecil.dll" target="build\netstandard1.0\" />
-    <file src="Microsoft.CodeCoverage\Mono.Cecil.Pdb.dll" target="build\netstandard1.0\" />
-    
-    <file src="Microsoft.CodeCoverage\CodeCoverage\CodeCoverage.config" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\CodeCoverage.exe" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\codecoveragemessages.dll" target="build\netstandard1.0\CodeCoverage\codecoveragemessages.dll" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\covrun32.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msdia140.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcdis140.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcp140.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcp140_atomic_wait.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\vcruntime140.dll" target="build\netstandard1.0\CodeCoverage\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="build\netstandard1.0\CodeCoverage\" />
-    
-    <file src="Microsoft.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="build\netstandard1.0\CodeCoverage\coreclr\" />
-    
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\CodeCoverage.exe" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\covrun64.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcdis140.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcp140.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcp140_atomic_wait.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\vcruntime140.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\vcruntime140_1.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard1.0\CodeCoverage\amd64\" />
-
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll"	target="build\netstandard1.0\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll"	target="build\netstandard1.0\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
-    
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard1.0\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so"	target="build\netstandard1.0\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\ubuntu\x64\ProductionBreakpoints_x64.config"	target="build\netstandard1.0\InstrumentationEngine\ubuntu\x64\ProductionBreakpoints_x64.config" />
-
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard1.0\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so"	target="build\netstandard1.0\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\alpine\x64\ProductionBreakpoints_x64.config"	target="build\netstandard1.0\InstrumentationEngine\alpine\x64\ProductionBreakpoints_x64.config" />
-
-    <file src="Microsoft.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\netcoreapp1.0\" />
-    <file src="Microsoft.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net45\" />
-
-    <!-- Add localized resources for trace data collector -->
-    <file src="Microsoft.CodeCoverage\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\cs" />
-    <file src="Microsoft.CodeCoverage\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\de" />
-    <file src="Microsoft.CodeCoverage\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\es" />
-    <file src="Microsoft.CodeCoverage\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\fr" />
-    <file src="Microsoft.CodeCoverage\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\it" />
-    <file src="Microsoft.CodeCoverage\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\ja" />
-    <file src="Microsoft.CodeCoverage\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\ko" />
-    <file src="Microsoft.CodeCoverage\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\pl" />
-    <file src="Microsoft.CodeCoverage\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\pt-BR" />
-    <file src="Microsoft.CodeCoverage\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\ru" />
-    <file src="Microsoft.CodeCoverage\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\tr" />
-    <file src="Microsoft.CodeCoverage\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\zh-Hans" />
-    <file src="Microsoft.CodeCoverage\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard1.0\zh-Hant" />
-  </files>
-</package>
diff --git a/src/package/nuspec/Microsoft.CodeCoverage.targets b/src/package/nuspec/Microsoft.CodeCoverage.targets
deleted file mode 100644
index 9a0a9787dd..0000000000
--- a/src/package/nuspec/Microsoft.CodeCoverage.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ***********************************************************************************************
- Microsoft.CodeCoverage.targets
-
- WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-           created a backup copy.  Incorrect changes to this file will make it
-           impossible to load or build your test projects from the command-line or the IDE.
-
- Copyright (c) Microsoft. All rights reserved.
- ***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- This target required to enable /collect:"Code Coverage" in "dotnet publish" scenario with "dotnet vstest".
-       E.g: Release pipelines where user/project nuget cache not available on current machine. -->
-  <Target Name="CopyTraceDataCollectorArtifacts" AfterTargets="ComputeFilesToPublish">
-
-    <ItemGroup>
-      <TraceDataCollectorArtifacts Include="$(MSBuildThisFileDirectory)\**\*.*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(TraceDataCollectorArtifacts)" DestinationFolder="$(PublishDir)%(RecursiveDir)" />
-
-  </Target>
-</Project>
diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
deleted file mode 100644
index 7727e08372..0000000000
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.NET.Test.Sdk</id>
-    <version>$Version$</version>
-    <title>Microsoft.NET.Test.Sdk</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <description>The MSbuild targets and properties for building .NET test projects.</description>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-    <dependencies>
-      <group targetFramework="uap10.0">
-        <dependency id="System.ComponentModel.Primitives" version="[4.1.0, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
-        <dependency id="Newtonsoft.Json" version="[$JsonNetVersion$, )" />
-        <!-- TestHost gets shipped as ExtensionSDKs with name TestPlatform.Universal. -->
-        <!-- Currently code coverage not supported for uap10.0. -->
-      </group>
-      <group targetFramework="netcoreapp1.0">
-        <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
-        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
-      </group>
-      <group targetFramework="netcoreapp2.1">
-        <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
-        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
-      </group>
-      <group targetFramework="net40"></group>
-      <group targetFramework="net45">
-        <!-- TestHost gets shipped with vstest.console -->
-        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <file src="netcoreapp\*" target="build\netcoreapp1.0\" />
-    <file src="netcoreapp\*" target="build\netcoreapp2.1\" />
-    <file src="netfx\*" target="build\net40\" />
-    <file src="netfx\*" target="build\net45\" />
-
-    <file src="Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
-    <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp1.0\" />
-    <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.1\" />
-    <file src="Microsoft.NET.Test.Sdk.props" target="build\net40\" />
-    <file src="Microsoft.NET.Test.Sdk.props" target="build\net45\" />
-    <file src="Microsoft.NET.Test.Sdk.props" target="build\uap10.0\" />
-
-    <file src="_._" target="lib/netcoreapp1.0" />
-    <file src="_._" target="lib/netcoreapp2.1" />
-    <file src="_._" target="lib/net40" />
-    <file src="_._" target="lib/net45" />
-    <file src="_._" target="lib/uap10.0" />
-  </files>
-</package>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec
deleted file mode 100644
index 9ac341631d..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <metadata>
-        <id>Microsoft.TestPlatform.AdapterUtilities</id>
-        <version>15.0.0</version>
-        <title>Microsoft.TestPlatform.AdapterUtilities</title>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>
-            Includes helpers for the Test Platform's modern functionality such as standardized fully qualified names and hierarchical test case names.
-        </description>
-        <license type="file">LICENSE_NET.txt</license>
-        <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-        <icon>Icon.png</icon>
-        <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-        <repository type="git" 
-                    url="https://github.com/microsoft/vstest" 
-                    branch="$BranchName$" 
-                    commit="$CommitId$" />
-
-        <dependencies>
-            <group targetFramework="netstandard1.0">
-                <dependency id="System.Globalization" version="[4.0.11, )" />
-                <dependency id="System.Reflection" version="[4.1.0, )" />
-                <dependency id="System.Runtime" version="[4.1.0, )" />
-                <dependency id="System.Collections" version="[4.0.11, )" />
-                <dependency id="System.Diagnostics.Debug" version="[4.0.11, )" />
-                <dependency id="System.Linq" version="[4.1.0, )" />
-                <dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
-                <dependency id="System.Resources.ResourceManager" version="[4.0.1, )" />
-            </group>
-
-            <group targetFramework="netstandard2.0" />
-            
-            <group targetFramework="uap10.0">
-                <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="[5.1.0, )" />
-            </group>
-            
-            <group targetFramework="net45" />
-        </dependencies>
-    </metadata>
-
-    <files>
-        <file src="Icon.png" target="" />
-        <file src="licenses\LICENSE_NET.txt" target="" />
-
-        <file src="netstandard1.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\netstandard1.0" />
-        <file src="netstandard1.0\**\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard1.0" />
-
-        <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\netstandard2.0" />
-        <file src="netstandard2.0\**\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0" />
-        
-        <file src="uap10.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\uap10.0" />
-        <file src="uap10.0\**\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\uap10.0" />
-        
-        <file src="net45\Microsoft.TestPlatform.AdapterUtilities.dll" target="lib\net45" />
-        <file src="net45\**\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\net45" />
-    </files>
-</package>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
deleted file mode 100644
index 038fbf8920..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
-    <NuspecProperties>version=$(Version)</NuspecProperties>
-
-    <!-- Don't include the output.dll and output.runtimeconfig.json files in nuget package -->
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <NoBuild>true</NoBuild>
-  </PropertyGroup>
-</Project>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
deleted file mode 100644
index 29198ba2f3..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
-    <NuspecProperties>version=$(Version)</NuspecProperties>
-
-    <!-- Don't include the output.dll and output.runtimeconfig.json files in nuget package -->
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <NoBuild>true</NoBuild>
-  </PropertyGroup>
-</Project>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
deleted file mode 100644
index c9db7ca2b4..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ /dev/null
@@ -1,633 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.Portable</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.Portable</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This package contains a subset of binaries for the Visual Studio Test Platform (vstest). vstest provides a modern, cross platform testing engine that also powers the testing on .NET Core. Supports the following popular test frameworks - MSTest v2, xUnit and Nunit with support for extensibility. Visit https://github.com/microsoft/vstest to know more about vstest platform. For running tests based on the MSTest v1 framework, .orderedtest, .webtest and .generictest please use Microsoft.TestPlatform package.</description>
-    <summary>This package contains a subset of binaries for the Visual Studio Test Platform (vstest). vstest provides a modern, cross platform testing engine that also powers the testing on .NET Core. Supports the following popular test frameworks - MSTest v2, xUnit and Nunit with support for extensibility.</summary>
-    <license type="file">LICENSE_VS.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_VS.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-    
-    <!-- net451 -->
-    <file src="net451\$Runtime$\datacollector.exe"	target="tools\net451\datacollector.exe" />
-    <file src="net451\$Runtime$\datacollector.exe.config"	target="tools\net451\datacollector.exe.config" />
-    <file src="net451\$Runtime$\Microsoft.Extensions.DependencyModel.dll"	target="tools\net451\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net451\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net451\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net451\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net451\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net451\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.Utilities.dll"	target="tools\net451\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net451\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net451\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Coverage.IO.dll"	target="tools\net451\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\cs\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\de\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\es\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\fr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\it\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\ja\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\ko\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\pl\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\pt-BR\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\ru\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\tr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\zh-Hans\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\zh-Hant\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\msdia140typelib_clr0200.dll"	target="tools\net451\msdia140typelib_clr0200.dll" />
-    <file src="net451\$Runtime$\Newtonsoft.Json.dll"	target="tools\net451\Newtonsoft.Json.dll" />
-    <file src="net451\$Runtime$\System.Collections.Immutable.dll"	target="tools\net451\System.Collections.Immutable.dll" />
-    <file src="net451\$Runtime$\System.Reflection.Metadata.dll"	target="tools\net451\System.Reflection.Metadata.dll" />
-    <file src="net451\$Runtime$\System.Runtime.InteropServices.RuntimeInformation.dll"	target="tools\net451\System.Runtime.InteropServices.RuntimeInformation.dll" />
-    <file src="net451\$Runtime$\testhost.exe"	target="tools\net451\testhost.exe" />
-    <file src="net451\$Runtime$\testhost.exe.config"	target="tools\net451\testhost.exe.config" />
-    <file src="net451\$Runtime$\testhost.net452.exe"	target="tools\net451\testhost.net452.exe" />
-    <file src="net451\$Runtime$\testhost.net452.exe.config"	target="tools\net451\testhost.net452.exe.config" />
-    <file src="net451\$Runtime$\testhost.net46.exe"	target="tools\net451\testhost.net46.exe" />
-    <file src="net451\$Runtime$\testhost.net46.exe.config"	target="tools\net451\testhost.net46.exe.config" />
-    <file src="net451\$Runtime$\testhost.net461.exe"	target="tools\net451\testhost.net461.exe" />
-    <file src="net451\$Runtime$\testhost.net461.exe.config"	target="tools\net451\testhost.net461.exe.config" />
-    <file src="net451\$Runtime$\testhost.net462.exe"	target="tools\net451\testhost.net462.exe" />
-    <file src="net451\$Runtime$\testhost.net462.exe.config"	target="tools\net451\testhost.net462.exe.config" />
-    <file src="net451\$Runtime$\testhost.net47.exe"	target="tools\net451\testhost.net47.exe" />
-    <file src="net451\$Runtime$\testhost.net47.exe.config"	target="tools\net451\testhost.net47.exe.config" />
-    <file src="net451\$Runtime$\testhost.net471.exe"	target="tools\net451\testhost.net471.exe" />
-    <file src="net451\$Runtime$\testhost.net471.exe.config"	target="tools\net451\testhost.net471.exe.config" />
-    <file src="net451\$Runtime$\testhost.net472.exe"	target="tools\net451\testhost.net472.exe" />
-    <file src="net451\$Runtime$\testhost.net472.exe.config"	target="tools\net451\testhost.net472.exe.config" />
-    <file src="net451\$Runtime$\testhost.net48.exe"	target="tools\net451\testhost.net48.exe" />
-    <file src="net451\$Runtime$\testhost.net48.exe.config"	target="tools\net451\testhost.net48.exe.config" />
-    <file src="net451\$Runtime$\testhost.x86.exe"	target="tools\net451\testhost.x86.exe" />
-    <file src="net451\$Runtime$\testhost.x86.exe.config"	target="tools\net451\testhost.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net452.x86.exe"	target="tools\net451\testhost.net452.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net452.x86.exe.config"	target="tools\net451\testhost.net452.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net46.x86.exe"	target="tools\net451\testhost.net46.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net46.x86.exe.config"	target="tools\net451\testhost.net46.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net461.x86.exe"	target="tools\net451\testhost.net461.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net461.x86.exe.config"	target="tools\net451\testhost.net461.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net462.x86.exe"	target="tools\net451\testhost.net462.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net462.x86.exe.config"	target="tools\net451\testhost.net462.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net47.x86.exe"	target="tools\net451\testhost.net47.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net47.x86.exe.config"	target="tools\net451\testhost.net47.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net471.x86.exe"	target="tools\net451\testhost.net471.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net471.x86.exe.config"	target="tools\net451\testhost.net471.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net472.x86.exe"	target="tools\net451\testhost.net472.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net472.x86.exe.config"	target="tools\net451\testhost.net472.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net48.x86.exe"	target="tools\net451\testhost.net48.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net48.x86.exe.config"	target="tools\net451\testhost.net48.x86.exe.config" />
-    <file src="net451\$Runtime$\vstest.console.exe"	target="tools\net451\vstest.console.exe" />
-    <file src="net451\$Runtime$\vstest.console.exe.config"	target="tools\net451\vstest.console.exe.config" />
-    <file src="net451\$Runtime$\NuGet.Frameworks.dll"	target="tools\net451\NuGet.Frameworks.dll" />
-
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\cs\vstest.console.resources.dll"	target="tools\net451\cs\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\de\vstest.console.resources.dll"	target="tools\net451\de\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\es\vstest.console.resources.dll"	target="tools\net451\es\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\net451\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.exe" target="tools\net451\Extensions\DumpMinitool.exe" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.exe.config" target="tools\net451\Extensions\DumpMinitool.exe.config" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.x86.exe" target="tools\net451\Extensions\DumpMinitool.x86.exe" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.x86.exe.config" target="tools\net451\Extensions\DumpMinitool.x86.exe.config" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net451\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\it\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\de\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll"	target="tools\net451\Extensions\es\Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\cs\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\it\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\de\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll"	target="tools\net451\Extensions\es\Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" />
-
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\fr\vstest.console.resources.dll"	target="tools\net451\fr\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\it\vstest.console.resources.dll"	target="tools\net451\it\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ja\vstest.console.resources.dll"	target="tools\net451\ja\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ko\vstest.console.resources.dll"	target="tools\net451\ko\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\pl\vstest.console.resources.dll"	target="tools\net451\pl\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\vstest.console.resources.dll"	target="tools\net451\pt-BR\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ru\vstest.console.resources.dll"	target="tools\net451\ru\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\tr\vstest.console.resources.dll"	target="tools\net451\tr\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\vstest.console.resources.dll"	target="tools\net451\zh-Hans\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\vstest.console.resources.dll"	target="tools\net451\zh-Hant\vstest.console.resources.dll" />
-
-    <!-- netcoreapp2.1 -->
-    <file src="netcoreapp2.1\datacollector.deps.json"	target="tools\netcoreapp2.1\datacollector.deps.json" />
-    <file src="netcoreapp2.1\datacollector.dll"	target="tools\netcoreapp2.1\datacollector.dll" />
-    <file src="netcoreapp2.1\datacollector.dll.config"	target="tools\netcoreapp2.1\datacollector.dll.config" />
-    <file src="netcoreapp2.1\datacollector.runtimeconfig.json"	target="tools\netcoreapp2.1\datacollector.runtimeconfig.json" />
-    <file src="netcoreapp2.1\Microsoft.Extensions.DependencyModel.dll"	target="tools\netcoreapp2.1\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="netcoreapp2.1\System.Runtime.CompilerServices.Unsafe.dll"   target="tools\netcoreapp2.1\System.Runtime.CompilerServices.Unsafe.dll" />
-    <file src="netcoreapp2.1\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\netcoreapp2.1\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.deps.json"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.deps.json" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.Utilities.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-    <file src="netcoreapp2.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\netcoreapp2.1\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="netcoreapp2.1\Microsoft.VisualStudio.Coverage.IO.dll"	target="tools\netcoreapp2.1\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="netcoreapp2.1\Newtonsoft.Json.dll"	target="tools\netcoreapp2.1\Newtonsoft.Json.dll" />
-    <file src="netcoreapp2.1\package.deps.json"	target="tools\netcoreapp2.1\package.deps.json" />
-    <file src="netcoreapp2.1\vstest.console.deps.json"	target="tools\netcoreapp2.1\vstest.console.deps.json" />
-    <file src="netcoreapp2.1\vstest.console.dll"	target="tools\netcoreapp2.1\vstest.console.dll" />
-    <file src="netcoreapp2.1\vstest.console.dll.config"	target="tools\netcoreapp2.1\vstest.console.dll.config" />
-    <file src="netcoreapp2.1\vstest.console.runtimeconfig.json"	target="tools\netcoreapp2.1\vstest.console.runtimeconfig.json" />
-    <file src="netcoreapp2.1\NuGet.Frameworks.dll"	target="tools\netcoreapp2.1\NuGet.Frameworks.dll" />
-
-    <file src="netcoreapp2.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\cs\vstest.console.resources.dll"	target="tools\netcoreapp2.1\cs\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\de\vstest.console.resources.dll"	target="tools\netcoreapp2.1\de\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\es\vstest.console.resources.dll"	target="tools\netcoreapp2.1\es\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-    <file src="netcoreapp2.1\Extensions\DumpMinitool.exe" target="tools\netcoreapp2.1\Extensions\DumpMinitool.exe" />
-    <file src="netcoreapp2.1\Extensions\DumpMinitool.exe.config" target="tools\netcoreapp2.1\Extensions\DumpMinitool.exe.config" />
-    <file src="netcoreapp2.1\Extensions\DumpMinitool.x86.exe" target="tools\netcoreapp2.1\Extensions\DumpMinitool.x86.exe" />
-    <file src="netcoreapp2.1\Extensions\DumpMinitool.x86.exe.config" target="tools\netcoreapp2.1\Extensions\DumpMinitool.x86.exe.config" />
-    <file src="netcoreapp2.1\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-    <file src="netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\netcoreapp2.1\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\fr\vstest.console.resources.dll"	target="tools\netcoreapp2.1\fr\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\it\vstest.console.resources.dll"	target="tools\netcoreapp2.1\it\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\ja\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ja\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\ko\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ko\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\pl\vstest.console.resources.dll"	target="tools\netcoreapp2.1\pl\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\pt-BR\vstest.console.resources.dll"	target="tools\netcoreapp2.1\pt-BR\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\ru\vstest.console.resources.dll"	target="tools\netcoreapp2.1\ru\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\datacollector.exe"	target="tools\netcoreapp2.1\TestHost\datacollector.exe" />
-    <file src="netcoreapp2.1\TestHost\datacollector.exe.config"	target="tools\netcoreapp2.1\TestHost\datacollector.exe.config" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.TestPlatform.Utilities.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\netcoreapp2.1\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="netcoreapp2.1\TestHost\NuGet.Frameworks.dll"	target="tools\netcoreapp2.1\TestHost\NuGet.Frameworks.dll" />
-    <file src="netcoreapp2.1\TestHost\msdia140typelib_clr0200.dll"	target="tools\netcoreapp2.1\TestHost\msdia140typelib_clr0200.dll" />
-    <file src="netcoreapp2.1\TestHost\Newtonsoft.Json.dll"	target="tools\netcoreapp2.1\TestHost\Newtonsoft.Json.dll" />
-    <file src="netcoreapp2.1\TestHost\System.Collections.Immutable.dll"	target="tools\netcoreapp2.1\TestHost\System.Collections.Immutable.dll" />
-    <file src="netcoreapp2.1\TestHost\System.Reflection.Metadata.dll"	target="tools\netcoreapp2.1\TestHost\System.Reflection.Metadata.dll" />
-    <file src="netcoreapp2.1\TestHost\testhost.exe"	target="tools\netcoreapp2.1\TestHost\testhost.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net452.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net452.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net452.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net452.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net46.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net46.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net46.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net46.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net461.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net461.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net461.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net461.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net462.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net462.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net462.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net462.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net47.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net47.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net47.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net47.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net471.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net471.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net471.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net471.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net472.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net472.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net472.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net472.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net48.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net48.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net48.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net48.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net452.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net452.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net452.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net452.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net46.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net46.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net46.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net46.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net461.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net461.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net461.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net461.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net462.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net462.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net462.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net462.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net47.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net47.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net47.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net47.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net471.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net471.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net471.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net471.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net472.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net472.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net472.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net472.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\testhost.net48.x86.exe"	target="tools\netcoreapp2.1\TestHost\testhost.net48.x86.exe" />
-    <file src="netcoreapp2.1\TestHost\testhost.net48.x86.exe.config"	target="tools\netcoreapp2.1\TestHost\testhost.net48.x86.exe.config" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\x64\msdia140.dll"	target="tools\netcoreapp2.1\TestHost\x64\msdia140.dll" />
-    <file src="netcoreapp2.1\TestHost\x64\msdia140.dll.manifest"	target="tools\netcoreapp2.1\TestHost\x64\msdia140.dll.manifest" />
-    <file src="netcoreapp2.1\TestHost\x86\msdia140.dll"	target="tools\netcoreapp2.1\TestHost\x86\msdia140.dll" />
-    <file src="netcoreapp2.1\TestHost\x86\msdia140.dll.manifest"	target="tools\netcoreapp2.1\TestHost\x86\msdia140.dll.manifest" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\tr\vstest.console.resources.dll"	target="tools\netcoreapp2.1\tr\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hans\vstest.console.resources.dll"	target="tools\netcoreapp2.1\zh-Hans\vstest.console.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\netcoreapp2.1\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="netcoreapp2.1\zh-Hant\vstest.console.resources.dll"	target="tools\netcoreapp2.1\zh-Hant\vstest.console.resources.dll" />
-  </files>
-</package>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.TestHost.NetCore.props b/src/package/nuspec/Microsoft.TestPlatform.TestHost.NetCore.props
deleted file mode 100644
index 7dd28d882f..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.TestHost.NetCore.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition=" ('$(Platform)' == 'x86' OR '$(PlatformTarget)' == 'x86') AND '$(OS)' == 'Windows_NT'">
-    <Content Include="$(MSBuildThisFileDirectory)x86\testhost.x86.exe">
-      <Link>testhost.x86.exe</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)x86\testhost.x86.dll">
-      <Link>testhost.x86.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)x86\Microsoft.TestPlatform.PlatformAbstractions.dll">
-      <Link>Microsoft.TestPlatform.PlatformAbstractions.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition=" ('$(Platform)'!= 'x86' AND '$(PlatformTarget)' != 'x86') AND '$(OS)' == 'Windows_NT'" >
-    <Content Include="$(MSBuildThisFileDirectory)x64\testhost.exe">
-      <Link>testhost.exe</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)x64\testhost.dll">
-      <Link>testhost.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)x64\Microsoft.TestPlatform.PlatformAbstractions.dll">
-      <Link>Microsoft.TestPlatform.PlatformAbstractions.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT'" >
-    <Content Include="$(MSBuildThisFileDirectory)Microsoft.TestPlatform.PlatformAbstractions.dll">
-      <Link>Microsoft.TestPlatform.PlatformAbstractions.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
deleted file mode 100644
index 5c31b2b917..0000000000
--- a/src/package/nuspec/Microsoft.TestPlatform.nuspec
+++ /dev/null
@@ -1,643 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This package contains the full set of binaries for the Visual Studio Test Platform (vstest). It provides a modern, cross platform testing engine that powers the testing on .NET Core as well. It integrates with popular test frameworks like MSTest(v1 and v2), xUnit and Nunit with support for extensibility. The package supports running Coded UI tests. While running Coded UI tests, you must ensure that the package version matches the major version of Visual Studio used to build the test binaries. For example, if your Coded UI test project was built using Visual Studio 2019 (version 16.x), you must use test platform version 16.x. Coded UI test is deprecated (https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-preview#test-tools) and Visual Studio 2019 (Test Platform version 16.x) will be the last version with Coded UI test functionality. Visit https://github.com/microsoft/vstest to know more about vstest platform.</description>
-    <summary>This package contains the full set of binaries for the Visual Studio Test Platform (vstest). It provides a modern, cross platform testing engine that powers the testing on .NET Core as well. It integrates with popular test frameworks like MSTest(v1 and v2), xUnit and Nunit with support for extensibility. </summary>
-    <license type="file">LICENSE_VS.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_VS.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-    
-    <!-- Intellitrace -->
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\extension.vsixmanifest" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.exe.config" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.frontend.pkgdef" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTrace.pkgdef" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\IntelliTraceCollection.cab" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Concord.vsdconfig" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.ConfigUI.dll" />
-    <file src="net451\$Runtime$\Microsoft.IntelliTrace.Core.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Core.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.Common.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Debugger.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.DebuggerMargin.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.Common.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Package.vsdconfig" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.Profiler.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.SearchMargin.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.Common.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.CoreClr.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.IntelliTrace.TelemetryObserver.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.DefaultDataQueries.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.TfsSymbolResolver.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Diagnostics.Utilities.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
-    <file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.dll" />
-    <file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\Microsoft.VisualStudio.VIL.NotifyPointInProcHost.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\ProcessSnapshotCleanup.exe.config" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\TDEnvCleanup.exe.config" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\1033\Microsoft.IntelliTrace.Profilerui.dll" />
-    <file src="net451\$Runtime$\Microsoft.DiaSymReader.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.DiaSymReader.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\deps\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\en\collectionplan.xml" />
-    <file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\Microsoft.IntelliTrace.Profiler.dll" />
-    <file src="Intellitrace\x64\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Microsoft\IntelliTrace\x64\1033\Microsoft.IntelliTrace.Profilerui.dll" />
-
-    <!-- Test Platform -->
-    <file src="net451\$Runtime$\datacollector.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\datacollector.exe" />
-    <file src="net451\$Runtime$\datacollector.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\datacollector.exe.config" />
-    <file src="net451\$Runtime$\LegacyTypes.testtype"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\LegacyTypes.testtype" />
-    <file src="net451\$Runtime$\ManualTests.testtype"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ManualTests.testtype" />
-    <file src="net451\$Runtime$\Microsoft.DiaSymReader.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.DiaSymReader.dll" />
-    <file src="net451\$Runtime$\NuGet.Frameworks.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\NuGet.Frameworks.dll" />
-    <file src="net451\$Runtime$\Microsoft.Extensions.DependencyModel.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.DependencyModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.Extensions.FileSystemGlobbing.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.FileSystemGlobbing.dll" />
-    <file src="net451\$Runtime$\Microsoft.IntelliTrace.Core.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.IntelliTrace.Core.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CommunicationUtilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CrossPlatEngine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.PlatformAbstractions.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.Utilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Diagnostics.Utilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Utilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Enterprise.AspNetHelper.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.AgentObject.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentObject.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.AgentProcessManager.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Common.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Common.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.ControllerObject.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ControllerObject.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.ExecutionCommon.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.LoadTest.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTest.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.LoadTestFramework.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Resource.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Resource.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.WebTestFramework.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.TMI.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.TMI.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Adapter.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.ObjectModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.ManualTest.Tip.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.AssemblyResolver.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Tips.WebLoadTest.Tip.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.Client.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Client.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.Common.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" />
-    <file src="net451\$Runtime$\msdia140typelib_clr0200.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\msdia140typelib_clr0200.dll" />
-    <file src="net451\$Runtime$\Newtonsoft.Json.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
-    <file src="net451\$Runtime$\QTAgent.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent.exe" />
-    <file src="net451\$Runtime$\QTAgent.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent.exe.Config" />
-    <file src="net451\$Runtime$\QTAgent32.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe" />
-    <file src="net451\$Runtime$\QTAgent32.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32.exe.Config" />
-    <file src="net451\$Runtime$\QTAgent32_35.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe" />
-    <file src="net451\$Runtime$\QTAgent32_35.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32_35.exe.Config" />
-    <file src="net451\$Runtime$\QTAgent32_40.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe" />
-    <file src="net451\$Runtime$\QTAgent32_40.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent32_40.exe.Config" />
-    <file src="net451\$Runtime$\QTAgent_35.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe" />
-    <file src="net451\$Runtime$\QTAgent_35.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent_35.exe.Config" />
-    <file src="net451\$Runtime$\QTAgent_40.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe" />
-    <file src="net451\$Runtime$\QTAgent_40.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTAgent_40.exe.Config" />
-    <file src="net451\$Runtime$\QTDCAgent.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe" />
-    <file src="net451\$Runtime$\QTDCAgent.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTDCAgent.exe.Config" />
-    <file src="net451\$Runtime$\QTDCAgent32.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe" />
-    <file src="net451\$Runtime$\QTDCAgent32.exe.Config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\QTDCAgent32.exe.Config" />
-    <file src="net451\$Runtime$\System.Collections.Immutable.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\System.Collections.Immutable.dll" />
-    <file src="net451\$Runtime$\System.Reflection.Metadata.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\System.Reflection.Metadata.dll" />
-    <file src="net451\$Runtime$\System.Runtime.InteropServices.RuntimeInformation.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\System.Runtime.InteropServices.RuntimeInformation.dll" />
-    <file src="net451\$Runtime$\testhost.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.exe" />
-    <file src="net451\$Runtime$\testhost.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.exe.config" />
-    <file src="net451\$Runtime$\testhost.net452.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net452.exe" />
-    <file src="net451\$Runtime$\testhost.net452.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net452.exe.config" />
-    <file src="net451\$Runtime$\testhost.net46.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net46.exe" />
-    <file src="net451\$Runtime$\testhost.net46.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net46.exe.config" />
-    <file src="net451\$Runtime$\testhost.net461.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net461.exe" />
-    <file src="net451\$Runtime$\testhost.net461.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net461.exe.config" />
-    <file src="net451\$Runtime$\testhost.net462.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net462.exe" />
-    <file src="net451\$Runtime$\testhost.net462.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net462.exe.config" />
-    <file src="net451\$Runtime$\testhost.net47.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net47.exe" />
-    <file src="net451\$Runtime$\testhost.net47.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net47.exe.config" />
-    <file src="net451\$Runtime$\testhost.net471.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net471.exe" />
-    <file src="net451\$Runtime$\testhost.net471.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net471.exe.config" />
-    <file src="net451\$Runtime$\testhost.net472.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net472.exe" />
-    <file src="net451\$Runtime$\testhost.net472.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net472.exe.config" />
-    <file src="net451\$Runtime$\testhost.net48.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe" />
-    <file src="net451\$Runtime$\testhost.net48.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net48.exe.config" />    
-    <file src="net451\$Runtime$\testhost.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe" />
-    <file src="net451\$Runtime$\testhost.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net452.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net452.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net452.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net452.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net46.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net46.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net46.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net46.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net461.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net461.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net461.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net461.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net462.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net462.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net462.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net462.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net47.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net47.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net47.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net47.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net471.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net471.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net471.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net471.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net472.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net472.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net472.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net472.x86.exe.config" />
-    <file src="net451\$Runtime$\testhost.net48.x86.exe"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe" />
-    <file src="net451\$Runtime$\testhost.net48.x86.exe.config"  target="tools\net451\Common7\IDE\Extensions\TestPlatform\testhost.net48.x86.exe.config" />
-    <file src="net451\$Runtime$\ThirdPartyNotices.txt"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ThirdPartyNotices.txt" />
-    <file src="net451\$Runtime$\vstest.console.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" />
-    <file src="net451\$Runtime$\vstest.console.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe.config" />
-    <file src="net451\$Runtime$\SettingsMigrator.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\SettingsMigrator.exe" />
-    <file src="net451\$Runtime$\Webloadtest.testtype"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Webloadtest.testtype" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\cs\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\cs\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\de\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\de\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\es\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\es\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.exe" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\DumpMinitool.exe" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.exe.config" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\DumpMinitool.exe.config" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.x86.exe" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\DumpMinitool.x86.exe" />
-    <file src="net451\$Runtime$\Extensions\DumpMinitool.x86.exe.config" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\DumpMinitool.x86.exe.config" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
-    
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.dll" />
-
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Interprocess.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Interprocess.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Instrumentation.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Instrumentation.dll" />
-    <file src="net451\$Runtime$\Extensions\Mono.Cecil.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
-    <file src="net451\$Runtime$\Extensions\Mono.Cecil.Pdb.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Core.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Core.dll" />
-    
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Coverage.IO.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\de\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\es\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.Coverage.IO.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.Coverage.IO.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.Coverage.IO.dll" />
-
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\VSTestVideoRecorder.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\VSTestVideoRecorder.exe" />
-    <file src="net451\$Runtime$\Extensions\Cpp\dbghelp.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\dbghelp.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
-    <file src="net451\$Runtime$\Extensions\Cpp\x64\dbghelp.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\x64\dbghelp.dll" />
-    <file src="net451\$Runtime$\Extensions\TestImpact\x64\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll" />
-    <file src="net451\$Runtime$\Extensions\TestImpact\x64\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\TestImpact\x86\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
-    <file src="net451\$Runtime$\Extensions\TestImpact\x86\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll.config" />
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.EventLog.dll.config" />
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorder.dll.config" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.TraceCollector.dll.config" />
-    <file src="net451\$Runtime$\Extensions\VideoRecorder\VSTestVideoRecorder.exe"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe" />
-    <file src="net451\$Runtime$\Extensions\V1\VSTestVideoRecorder.exe.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\VSTestVideoRecorder.exe.config" />
-    <file src="net451\$Runtime$\Extensions\V1\TestImpact\x64\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\TestImpact\x64\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\V1\TestImpact\x86\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\TestImpact\x86\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x64\Microsoft.VisualStudio.Coverage.Monitor.dll" />
-    <file src="net451\$Runtime$\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\V1\x86\Microsoft.VisualStudio.Coverage.Monitor.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\fr\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\fr\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\fr\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\it\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\it\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\it\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ja\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ja\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ja\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ko\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ko\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ko\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\pl\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\pl\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pl\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\pt-BR\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\pt-BR\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\ru\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\ru\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\ru\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\tr\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\tr\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\tr\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\x64\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll" />
-    <file src="net451\$Runtime$\x64\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x64\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\x86\msdia140.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll" />
-    <file src="net451\$Runtime$\x86\msdia140.dll.manifest"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\x86\msdia140.dll.manifest" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hans\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hans\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Client.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\vstest.console.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\vstest.console.resources.dll" />
-    <file src="net451\$Runtime$\zh-Hant\SettingsMigrator.resources.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\zh-Hant\SettingsMigrator.resources.dll" />
-    <file src="net451\$Runtime$\Microsoft.IntelliTrace.Core.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.Core.dll" />
-    <file src="Intellitrace\x86\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.IntelliTrace.ObjectModel.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll"	target="tools\net451\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.ArchitectureTools.PEReader.dll" />
-    
-    <file src="Microsoft.CodeCoverage\CodeCoverage\CodeCoverage.config" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\CodeCoverage.exe" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\codecoveragemessages.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\codecoveragemessages.dll" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\covrun32.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msdia140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcdis140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcp140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\msvcp140_atomic_wait.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\vcruntime140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\" />
-    
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\CodeCoverage.exe" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\covrun64.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcdis140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcp140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msvcp140_atomic_wait.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\vcruntime140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\vcruntime140_1.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="Microsoft.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    
-    <file src="Intellitrace\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
-    <file src="Intellitrace\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />
-    <file src="Microsoft.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.CodeCoverage.Shim.dll" />
-
-    <!-- CUIT -->
-    <file src="net451\$Runtime$\Interop.UIAutomationClient.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Interop.UIAutomationClient.dll" />
-    <file src="net451\$Runtime$\Microsoft.ShDocVw.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.ShDocVw.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Diagnostics.Measurement.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.Interop.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Interop.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.QualityTools.Sqm.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Sqm.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Common.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Common.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Framework.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Logging.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Playback.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITesting.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITesting.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" />
-    <file src="net451\$Runtime$\UIAComWrapper.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\UIAComWrapper.dll" />
-
-    <file src="net451\$Runtime$\CUITPlugins\IEPropertyConfiguration.xml"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xml" />
-    <file src="net451\$Runtime$\CUITPlugins\IEPropertyConfiguration.xsd"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xsd" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" />
-    <file src="net451\$Runtime$\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" />
-
-    <!-- .NET Core testhost and CPP adapter -->
-    <file src="net451\$Runtime$\TestHost\dbghelp.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\dbghelp.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.TestPlatform.Utilities.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.TestPlatform.Utilities.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll" />
-    <file src="net451\$Runtime$\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll" />
-    <file src="net451\$Runtime$\TestHost\Newtonsoft.Json.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\Newtonsoft.Json.dll" />
-    <file src="net451\$Runtime$\TestHost\NuGet.Frameworks.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\NuGet.Frameworks.dll" />
-    <file src="net451\$Runtime$\TestHost\System.ComponentModel.Composition.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\System.ComponentModel.Composition.dll" />
-    <file src="net451\$Runtime$\TestHost\testhost-1.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-1.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-1.1.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-1.1.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-2.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-2.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-2.1.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-2.1.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-3.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-3.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-3.1.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-3.1.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-5.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-5.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-6.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-6.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-7.0.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-7.0.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost-latest.runtimeconfig.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost-latest.runtimeconfig.json" />
-    <file src="net451\$Runtime$\TestHost\testhost.deps.json" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost.deps.json" />
-    <file src="net451\$Runtime$\TestHost\testhost.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost.dll" />
-    <file src="net451\$Runtime$\TestHost\testhost.dll.config" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\testhost.dll.config" />
-    <file src="net451\$Runtime$\TestHost\arm64\dbghelp.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\arm64\dbghelp.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\x64\dbghelp.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\x64\dbghelp.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" />
-    <file src="net451\$Runtime$\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\TestHost\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" />
-
-
-    <!-- External dependencies-->
-    <file src="$FakesPackageDir$\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Fakes.dll" />
-
-    <file src="$FakesPackageDir$\DataCollector\Microsoft.VisualStudio.Fakes.DataCollector.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Fakes.DataCollector.dll" />
-    <file src="$FakesPackageDir$\DataCollector\Microsoft.Cci.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Cci.dll" />
-
-    <file src="$FakesPackageDir$\Instrumentation\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
-    <file src="$FakesPackageDir$\Instrumentation\x86\FakesInstrumentationProfiler_x86.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x86\FakesInstrumentationProfiler_x86.config" />
-    <file src="$FakesPackageDir$\Instrumentation\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\Microsoft.QualityTools.Testing.Fakes.Instrumentation.dll" />
-    <file src="$FakesPackageDir$\Instrumentation\x64\FakesInstrumentationProfiler_x64.config"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Fakes\x64\FakesInstrumentationProfiler_x64.config" />
-
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
-    <file src="Microsoft.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll"	target="tools\net451\Common7\IDE\CommonExtensions\Platform\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec
deleted file mode 100644
index 3808b2965f..0000000000
--- a/src/package/nuspec/TestPlatform.Build.nuspec
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.Build</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.Build</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>Build tasks and targets for running tests with Test Platform</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <dependencies>
-      <group targetFramework="netstandard2.0"></group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <file src="Microsoft.TestPlatform.Build\netstandard2.0\Microsoft.TestPlatform.targets" target="runtimes\any\native" />
-
-    <!-- Add localized resources -->
-    <file src="Microsoft.TestPlatform.Build\netstandard2.0\**\*.dll" target="lib\netstandard2.0" />
-
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec
deleted file mode 100644
index 0e72bf5885..0000000000
--- a/src/package/nuspec/TestPlatform.CLI.nuspec
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.CLI</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.CLI</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>The cross platform Microsoft Test Platform.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <contentFiles>
-      <files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
-    </contentFiles>
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-    
-    <file src="netcoreapp2.1\**\*.*" exclude="**\*.pdb" target="contentFiles\any\netcoreapp2.1" />
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec
deleted file mode 100644
index 802ce1eba2..0000000000
--- a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.Extensions.TrxLogger</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.Extensions.TrxLogger</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <dependencies>
-      <group targetFramework="net451">
-        <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-      </group>
-      <group targetFramework="netstandard1.5">
-        <dependency id="System.Collections.NonGeneric" version="[4.0.1, )" />
-        <dependency id="System.Security.Principal.Windows" version="[4.0.1, )" />
-        <dependency id="System.Collections.Specialized" version="[4.0.1, )" />
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
-    </frameworkAssemblies>
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="lib\net451\" />
-    <file src="$NetCoreTargetFramework$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="lib\netstandard1.5\" />
-
-    <!-- Add localized resources -->
-    <file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\cs" />
-    <file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\de" />
-    <file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\es" />
-    <file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\fr" />
-    <file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\it" />
-    <file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\ja" />
-    <file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\ko" />
-    <file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\pl" />
-    <file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\pt-BR" />
-    <file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\ru" />
-    <file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\tr" />
-    <file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\zh-Hans" />
-    <file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\net451\zh-Hant" />
-
-    <file src="$NetCoreTargetFramework$\Extensions\cs\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\cs" />
-    <file src="$NetCoreTargetFramework$\Extensions\de\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\de" />
-    <file src="$NetCoreTargetFramework$\Extensions\es\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\es" />
-    <file src="$NetCoreTargetFramework$\Extensions\fr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\fr" />
-    <file src="$NetCoreTargetFramework$\Extensions\it\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\it" />
-    <file src="$NetCoreTargetFramework$\Extensions\ja\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\ja" />
-    <file src="$NetCoreTargetFramework$\Extensions\ko\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\ko" />
-    <file src="$NetCoreTargetFramework$\Extensions\pl\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\pl" />
-    <file src="$NetCoreTargetFramework$\Extensions\pt-BR\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\pt-BR" />
-    <file src="$NetCoreTargetFramework$\Extensions\ru\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\ru" />
-    <file src="$NetCoreTargetFramework$\Extensions\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\tr" />
-    <file src="$NetCoreTargetFramework$\Extensions\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\zh-Hans" />
-    <file src="$NetCoreTargetFramework$\Extensions\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard1.5\zh-Hant" />
-
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.Internal.Uwp.nuspec b/src/package/nuspec/TestPlatform.Internal.Uwp.nuspec
deleted file mode 100644
index 8196ae77f4..0000000000
--- a/src/package/nuspec/TestPlatform.Internal.Uwp.nuspec
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.Internal.Uwp</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.Internal.Uwp</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>Internal Microsoft Test Platform libraries for UWP runner.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" url="https://github.com/microsoft/vstest" branch="$BranchName$" commit="$CommitId$" />
-
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-
-    <!-- netstandard 1.3 -->
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.pdb" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\cs" />
-    <file src="$NetStandard13Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\de" />
-    <file src="$NetStandard13Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\es" />
-    <file src="$NetStandard13Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\fr" />
-    <file src="$NetStandard13Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\it" />
-    <file src="$NetStandard13Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\ja" />
-    <file src="$NetStandard13Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\ko" />
-    <file src="$NetStandard13Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\pl" />
-    <file src="$NetStandard13Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\pt-BR" />
-    <file src="$NetStandard13Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\ru" />
-    <file src="$NetStandard13Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\tr" />
-    <file src="$NetStandard13Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\zh-Hans" />
-    <file src="$NetStandard13Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\zh-Hant" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CoreUtilities.pdb" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\cs" />
-    <file src="$NetStandard13Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\de" />
-    <file src="$NetStandard13Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\es" />
-    <file src="$NetStandard13Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\fr" />
-    <file src="$NetStandard13Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\it" />
-    <file src="$NetStandard13Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\ja" />
-    <file src="$NetStandard13Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\ko" />
-    <file src="$NetStandard13Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\pl" />
-    <file src="$NetStandard13Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\pt-BR" />
-    <file src="$NetStandard13Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\ru" />
-    <file src="$NetStandard13Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\tr" />
-    <file src="$NetStandard13Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\zh-Hans" />
-    <file src="$NetStandard13Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.3\zh-Hant" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CrossPlatEngine.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CrossPlatEngine.pdb" target="lib\netstandard1.3\" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CommunicationUtilities.pdb" target="lib\netstandard1.3\" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.Utilities.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.Utilities.pdb" target="lib\netstandard1.3\" />
-    
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\netstandard1.3\" />
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.Common.pdb" target="lib\netstandard1.3\" />
-
-    <file src="$Uap10Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard1.3\" />
-    <file src="$Uap10Framework$\Microsoft.TestPlatform.PlatformAbstractions.pdb" target="lib\netstandard1.3\" />
-
-    <!-- /netstandard1.3 -->
-
-    <!-- uap10.0 -->
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.pdb" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\cs" />
-    <file src="$NetStandard13Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\de" />
-    <file src="$NetStandard13Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\es" />
-    <file src="$NetStandard13Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\fr" />
-    <file src="$NetStandard13Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\it" />
-    <file src="$NetStandard13Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\ja" />
-    <file src="$NetStandard13Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\ko" />
-    <file src="$NetStandard13Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\pl" />
-    <file src="$NetStandard13Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\pt-BR" />
-    <file src="$NetStandard13Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\ru" />
-    <file src="$NetStandard13Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\tr" />
-    <file src="$NetStandard13Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\zh-Hans" />
-    <file src="$NetStandard13Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\zh-Hant" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CoreUtilities.pdb" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\cs" />
-    <file src="$NetStandard13Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\de" />
-    <file src="$NetStandard13Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\es" />
-    <file src="$NetStandard13Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\fr" />
-    <file src="$NetStandard13Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\it" />
-    <file src="$NetStandard13Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\ja" />
-    <file src="$NetStandard13Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\ko" />
-    <file src="$NetStandard13Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\pl" />
-    <file src="$NetStandard13Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\pt-BR" />
-    <file src="$NetStandard13Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\ru" />
-    <file src="$NetStandard13Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\tr" />
-    <file src="$NetStandard13Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\zh-Hans" />
-    <file src="$NetStandard13Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\uap10.0\zh-Hant" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CrossPlatEngine.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CrossPlatEngine.pdb" target="lib\uap10.0\" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CommunicationUtilities.pdb" target="lib\uap10.0\" />
-
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.Utilities.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.TestPlatform.Utilities.pdb" target="lib\uap10.0\" />
-    
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\uap10.0\" />
-    <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.Common.pdb" target="lib\uap10.0\" />
-
-    <file src="$Uap10Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\uap10.0\" />
-    <file src="$Uap10Framework$\Microsoft.TestPlatform.PlatformAbstractions.pdb" target="lib\uap10.0\" />
-    
-    <!-- /uap10.0 -->
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
deleted file mode 100644
index b7291894c0..0000000000
--- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.ObjectModel</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.ObjectModel</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>The Microsoft Test Platform Object Model.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <dependencies>
-      <group targetFramework="net45">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="NuGet.Frameworks" version="[5.11.0, )" />
-      </group>
-      
-      <group targetFramework="net451">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="NuGet.Frameworks" version="[5.11.0, )" />
-      </group>
-
-      <group targetFramework="netcoreapp1.0">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="NuGet.Frameworks" version="4.6.4" />
-      </group>
-            
-      <group targetFramework="netcoreapp2.1">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="NuGet.Frameworks" version="[5.11.0, )" />
-      </group>
-      
-      <group targetFramework="netstandard1.0">
-        <dependency id="System.ComponentModel.EventBasedAsync" version="[4.3.0, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
-        <dependency id="System.Runtime" version="[4.3.0, )" />
-        <dependency id="System.Runtime.Serialization.Json" version="[4.3.0, )" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
-      </group>
-      
-      <group targetFramework="netstandard1.3">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="System.ComponentModel.EventBasedAsync" version="[4.3.0, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
-        <dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
-        <dependency id="System.Runtime.Serialization.Json" version="[4.3.0, )" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
-        <dependency id="System.Xml.XmlDocument" version="[4.3.0, )" />
-        <dependency id="System.Xml.XPath" version="[4.3.0, )" />
-        <dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
-
-        <!-- After 4.6.4, netstandard1.3 support is dropped from NuGet.Frameworks -->
-        <dependency id="NuGet.Frameworks" version="[4.6.4]" />
-      </group>
-      
-      <group targetFramework="uap10.0">
-        <dependency id="NETStandard.Library" version="[1.6.0, )" />
-        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="[5.0.0, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.0.0, )" />
-        <dependency id="System.Xml.XPath" version="[4.0.0, )" />
-        <dependency id="System.Xml.XPath.XmlDocument" version="[4.0.0, )" />
-
-        <!-- After 4.6.4, netstandard1.3 support is dropped from NuGet.Frameworks -->
-        <dependency id="NuGet.Frameworks" version="[4.6.4]" />
-      </group>
-
-      <group targetFramework="netstandard2.0">
-        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
-        <dependency id="NuGet.Frameworks" version="[5.11.0, )" />
-      </group>
-    </dependencies>
-    
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="mscorlib" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
-    </frameworkAssemblies>
-  </metadata>
-  <files>	
-      <file src="Icon.png" target="" />
-      <file src="licenses\LICENSE_NET.txt" target="" />
-
-    <!-- net45 -->
-      <file src="net45\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net45\" />
-      <file src="net45\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net45\" />
-      <file src="net45\$Runtime$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\net45\" />
-
-      <!-- Add localized resources -->
-      <file src="net45\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\cs" />
-      <file src="net45\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\de" />
-      <file src="net45\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\es" />
-      <file src="net45\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\fr" />
-      <file src="net45\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\it" />
-      <file src="net45\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\ja" />
-      <file src="net45\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\ko" />
-      <file src="net45\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\pl" />
-      <file src="net45\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\net45\pt-BR" />
-      <file src="net45\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\ru" />
-      <file src="net45\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net45\tr" />
-      <file src="net45\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net45\zh-Hans" />
-      <file src="net45\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net45\zh-Hant" />
-      <file src="net45\$Runtime$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\cs" />
-      <file src="net45\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\de" />
-      <file src="net45\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\es" />
-      <file src="net45\$Runtime$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\fr" />
-      <file src="net45\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\it" />
-      <file src="net45\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\ja" />
-      <file src="net45\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\ko" />
-      <file src="net45\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\pl" />
-      <file src="net45\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\net45\pt-BR" />
-      <file src="net45\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\ru" />
-      <file src="net45\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net45\tr" />
-      <file src="net45\$Runtime$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net45\zh-Hans" />
-      <file src="net45\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net45\zh-Hant" />
-    <!-- /net45 -->
-
-    <!-- net451 -->
-      <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\net451\" />
-      <file src="net451\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\net451\" />
-      <file src="net451\$Runtime$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\net451\" />
-
-      <!-- Add localized resources -->
-      <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\cs" />
-      <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\de" />
-      <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\es" />
-      <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\fr" />
-      <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\it" />
-      <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\ja" />
-      <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\ko" />
-      <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\pl" />
-      <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\net451\pt-BR" />
-      <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\ru" />
-      <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\net451\tr" />
-      <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net451\zh-Hans" />
-      <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\net451\zh-Hant" />
-      <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\cs" />
-      <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\de" />
-      <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\es" />
-      <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\fr" />
-      <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\it" />
-      <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\ja" />
-      <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\ko" />
-      <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\pl" />
-      <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\net451\pt-BR" />
-      <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\ru" />
-      <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\net451\tr" />
-      <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net451\zh-Hans" />
-      <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\net451\zh-Hant" />
-    <!-- /net451 -->
-
-    <!-- netcoreapp1.0 -->
-      <file src="netcoreapp1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netcoreapp1.0\" />
-      <file src="netcoreapp1.0\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netcoreapp1.0\" />
-      <file src="netcoreapp1.0\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netcoreapp1.0\" />
-
-      <!-- Add localized resources -->
-      <file src="netcoreapp1.0\**\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   exclude="**\TestHost\**\*.*" target="lib\netcoreapp1.0\" />
-      <file src="netcoreapp1.0\**\Microsoft.TestPlatform.CoreUtilities.resources.dll"               exclude="**\TestHost\**\*.*" target="lib\netcoreapp1.0\" />
-    <!-- /netcoreapp1.0 -->
-
-    <!-- netcoreapp2.1 -->
-      <file src="netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netcoreapp2.1\" />
-      <file src="netcoreapp2.1\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netcoreapp2.1\" />
-      <file src="netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netcoreapp2.1\" />
-
-      <!-- Add localized resources -->
-      <file src="netcoreapp2.1\**\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   exclude="**\TestHost\**\*.*" target="lib\netcoreapp2.1\" />
-      <file src="netcoreapp2.1\**\Microsoft.TestPlatform.CoreUtilities.resources.dll"               exclude="**\TestHost\**\*.*" target="lib\netcoreapp2.1\" />
-    <!-- /netcoreapp2.1 -->
-
-    <!-- netstandard 1.0 -->
-      <file src="$NetStandard10Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.0\" />
-      <file src="$NetStandard10Framework$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netstandard1.0\" />
-      <file src="$NetStandard10Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netstandard1.0\" />
-
-      <!-- Add localized resources -->
-      <file src="$NetStandard10Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\cs" />
-      <file src="$NetStandard10Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\de" />
-      <file src="$NetStandard10Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\es" />
-      <file src="$NetStandard10Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\fr" />
-      <file src="$NetStandard10Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\it" />
-      <file src="$NetStandard10Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\ja" />
-      <file src="$NetStandard10Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\ko" />
-      <file src="$NetStandard10Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\pl" />
-      <file src="$NetStandard10Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\netstandard1.0\pt-BR" />
-      <file src="$NetStandard10Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\ru" />
-      <file src="$NetStandard10Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.0\tr" />
-      <file src="$NetStandard10Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.0\zh-Hans" />
-      <file src="$NetStandard10Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.0\zh-Hant" />
-      <file src="$NetStandard10Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\cs" />
-      <file src="$NetStandard10Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\de" />
-      <file src="$NetStandard10Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\es" />
-      <file src="$NetStandard10Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\fr" />
-      <file src="$NetStandard10Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\it" />
-      <file src="$NetStandard10Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\ja" />
-      <file src="$NetStandard10Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\ko" />
-      <file src="$NetStandard10Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\pl" />
-      <file src="$NetStandard10Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\netstandard1.0\pt-BR" />
-      <file src="$NetStandard10Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\ru" />
-      <file src="$NetStandard10Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.0\tr" />
-      <file src="$NetStandard10Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard1.0\zh-Hans" />
-      <file src="$NetStandard10Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard1.0\zh-Hant" />
-    <!-- /netstandard 1.0 -->
-
-    <!-- netstandard 1.3 -->
-      <file src="$NetStandard13Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.3\" />
-      <file src="$NetStandard13Framework$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netstandard1.3\" />
-      <file src="$NetStandard13Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netstandard1.3\" />
-
-      <!-- Add localized resources -->
-      <file src="$NetStandard13Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\cs" />
-      <file src="$NetStandard13Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\de" />
-      <file src="$NetStandard13Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\es" />
-      <file src="$NetStandard13Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\fr" />
-      <file src="$NetStandard13Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\it" />
-      <file src="$NetStandard13Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\ja" />
-      <file src="$NetStandard13Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\ko" />
-      <file src="$NetStandard13Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\pl" />
-      <file src="$NetStandard13Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\netstandard1.3\pt-BR" />
-      <file src="$NetStandard13Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\ru" />
-      <file src="$NetStandard13Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard1.3\tr" />
-      <file src="$NetStandard13Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\zh-Hans" />
-      <file src="$NetStandard13Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard1.3\zh-Hant" />
-      <file src="$NetStandard13Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\cs" />
-      <file src="$NetStandard13Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\de" />
-      <file src="$NetStandard13Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\es" />
-      <file src="$NetStandard13Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\fr" />
-      <file src="$NetStandard13Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\it" />
-      <file src="$NetStandard13Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\ja" />
-      <file src="$NetStandard13Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\ko" />
-      <file src="$NetStandard13Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\pl" />
-      <file src="$NetStandard13Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\netstandard1.3\pt-BR" />
-      <file src="$NetStandard13Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\ru" />
-      <file src="$NetStandard13Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard1.3\tr" />
-      <file src="$NetStandard13Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard1.3\zh-Hans" />
-      <file src="$NetStandard13Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard1.3\zh-Hant" />
-    <!-- /netstandard 1.3 -->
-
-    <!-- netstandard 2.0 -->	
-      <file src="$NetStandard20Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard2.0\" />	
-      <file src="$NetStandard20Framework$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\netstandard2.0\" />	
-      <file src="$NetStandard20Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\netstandard2.0\" />	
-
-      <!-- Add localized resources -->	
-      <file src="$NetStandard20Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\cs" />	
-      <file src="$NetStandard20Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\de" />	
-      <file src="$NetStandard20Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\es" />	
-      <file src="$NetStandard20Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\fr" />	
-      <file src="$NetStandard20Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\it" />	
-      <file src="$NetStandard20Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ja" />	
-      <file src="$NetStandard20Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ko" />	
-      <file src="$NetStandard20Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\pl" />	
-      <file src="$NetStandard20Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\netstandard2.0\pt-BR" />	
-      <file src="$NetStandard20Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\ru" />	
-      <file src="$NetStandard20Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\netstandard2.0\tr" />	
-      <file src="$NetStandard20Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hans" />	
-      <file src="$NetStandard20Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hant" />	
-      <file src="$NetStandard20Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\cs" />	
-      <file src="$NetStandard20Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\de" />	
-      <file src="$NetStandard20Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\es" />	
-      <file src="$NetStandard20Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\fr" />	
-      <file src="$NetStandard20Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\it" />	
-      <file src="$NetStandard20Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ja" />	
-      <file src="$NetStandard20Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ko" />	
-      <file src="$NetStandard20Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\pl" />	
-      <file src="$NetStandard20Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\netstandard2.0\pt-BR" />	
-      <file src="$NetStandard20Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\ru" />	
-      <file src="$NetStandard20Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\netstandard2.0\tr" />	
-      <file src="$NetStandard20Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hans" />	
-      <file src="$NetStandard20Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hant" />	
-    <!-- /netstandard 2.0 -->	
-
-    <!-- uap10.0 -->
-      <file src="$Uap10Framework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\uap10.0\" />
-      <file src="$Uap10Framework$\Microsoft.TestPlatform.CoreUtilities.dll"            target="lib\uap10.0\" />
-      <file src="$Uap10Framework$\Microsoft.TestPlatform.PlatformAbstractions.dll"     target="lib\uap10.0\" />
-
-      <!-- Add localized resources -->
-      <file src="$Uap10Framework$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\cs" />
-      <file src="$Uap10Framework$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\de" />
-      <file src="$Uap10Framework$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\es" />
-      <file src="$Uap10Framework$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\fr" />
-      <file src="$Uap10Framework$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\it" />
-      <file src="$Uap10Framework$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\ja" />
-      <file src="$Uap10Framework$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\ko" />
-      <file src="$Uap10Framework$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\pl" />
-      <file src="$Uap10Framework$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"   target="lib\uap10.0\pt-BR" />
-      <file src="$Uap10Framework$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\ru" />
-      <file src="$Uap10Framework$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll"      target="lib\uap10.0\tr" />
-      <file src="$Uap10Framework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\zh-Hans" />
-      <file src="$Uap10Framework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\uap10.0\zh-Hant" />
-      <file src="$Uap10Framework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\cs" />
-      <file src="$Uap10Framework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\de" />
-      <file src="$Uap10Framework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\es" />
-      <file src="$Uap10Framework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\fr" />
-      <file src="$Uap10Framework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\it" />
-      <file src="$Uap10Framework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\ja" />
-      <file src="$Uap10Framework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\ko" />
-      <file src="$Uap10Framework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\pl" />
-      <file src="$Uap10Framework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll"               target="lib\uap10.0\pt-BR" />
-      <file src="$Uap10Framework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\ru" />
-      <file src="$Uap10Framework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll"                  target="lib\uap10.0\tr" />
-      <file src="$Uap10Framework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\uap10.0\zh-Hans" />
-      <file src="$Uap10Framework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\uap10.0\zh-Hant" />
-    <!-- /uap10.0 -->
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec
deleted file mode 100644
index fd9c485842..0000000000
--- a/src/package/nuspec/TestPlatform.TestHost.nuspec
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.TestHost</id>
-    <version>$Version$</version>
-    <title>Microsoft.TestPlatform.TestHost</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>Testplatform host executes the test using specified adapter.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-                
-    <dependencies>
-      <group targetFramework="netcoreapp1.0">
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-        <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
-        <dependency id="System.Diagnostics.StackTrace" version="[4.3.0, )"/>
-        <dependency id="System.Diagnostics.TraceSource" version="[4.3.0, )"/>
-
-        <dependency id="System.Threading.Thread" version="[4.0.0, )" />
-        <dependency id="System.Diagnostics.Process" version="[4.1.0, )" />
-        <dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.0.0, )" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
-        <dependency id="System.Runtime.Loader" version="[4.0.0, )" />
-      </group>
-
-      <group targetFramework="netcoreapp2.1">
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-        <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
-      </group>
-
-      <group targetFramework="uap10.0">
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-        <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
-        <dependency id="System.Xml.ReaderWriter" version="4.0.11" />
-      </group>
-      
-      <group targetFramework="net45"></group>
-    </dependencies>
-  </metadata>
-
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-
-    <!-- net45 -->
-    <file src="_._" target="lib\net45\" />
-
-    <!-- netcoreapp1.0 -->
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\netcoreapp1.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.*.dll" target="lib\netcoreapp1.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\testhost.dll" target="lib\netcoreapp1.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\testhost.deps.json" target="lib\netcoreapp1.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\x86\msdia140.dll" target="lib\netcoreapp1.0\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\x64\msdia140.dll" target="lib\netcoreapp1.0\x64\" />
-  
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp1.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\testhost.dll" target="build\netcoreapp1.0\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\testhost.exe" target="build\netcoreapp1.0\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp1.0\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\testhost.x86.dll" target="build\netcoreapp1.0\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\testhost.x86.exe" target="build\netcoreapp1.0\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp1.0\x86\" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.TestHost.props" target="build\netcoreapp1.0\" />
-
-    <!-- netcoreapp2.1 -->
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\netcoreapp2.1\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.*.dll" target="lib\netcoreapp2.1\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\testhost.dll" target="lib\netcoreapp2.1\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\testhost.deps.json" target="lib\netcoreapp2.1\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\x86\msdia140.dll" target="lib\netcoreapp2.1\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\x64\msdia140.dll" target="lib\netcoreapp2.1\x64\" />
-    
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp2.1\" />
-    <!-- 
-          We move AnyCPU version of testhost.dll, at the moment we don't have native code that needs particular architecture inside testhost.dll.
-          This prevent possible issue related to override x64(testshost.dll) compilation inside Microsoft.TestPlatform.TestHost.NetCore.prop netcoreapp2.1\x64\testhost.dll to the bin folder
-          that contains AnyCPU version.
-          In case of -arch arm64/x86 with a x64 SDK on arm where we use only dotnet muxer+testhost.dll to do arch switch, 
-          if we copy x64 testshost.dll we'll fail to load with `arm64/dotnet.exe exec testhost.dll`.
-          Another possible way to keep x64 version if needed is to understand if we're on -arch scenario and act as expected
-          and avoid to copy testhost.dll if we're switching to a non x64 arch.
-          This means parse/understand -arch inside msbuild, not trivial, so for now we simply copy the AnyCPU version and we keep 
-          the package authoring as-is for back compatibiliy.
-    -->
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\testhost.dll" target="build\netcoreapp2.1\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x64\testhost.exe" target="build\netcoreapp2.1\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x64\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp2.1\x64\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\testhost.x86.dll" target="build\netcoreapp2.1\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\testhost.x86.exe" target="build\netcoreapp2.1\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\Microsoft.TestPlatform.PlatformAbstractions.dll" target="build\netcoreapp2.1\x86\" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.TestHost.props" target="build\netcoreapp2.1\" />
-    
-    <!-- UWP -->
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\testhost.dll" target="lib\uap10.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.*.dll" target="lib\uap10.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.VisualStudio.TestPlatform.*.dll" target="lib\uap10.0\" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\x86\msdia140.dll" target="build\uap10.0\x86\" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\x64\msdia140.dll" target="build\uap10.0\x64\" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.TestHost.props" target="build\uap10.0\" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.TestHost.targets" target="build\uap10.0\" />
-
-    <!-- Add localized resources UWP -->
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="build\uap10.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="build\uap10.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="build\uap10.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.TestPlatform.Utilities.resources.dll" target="build\uap10.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="build\uap10.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\uap10.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll" target="build\uap10.0\zh-Hant" />
-    
-    <!-- Add localized resources netcoreapp1.0 -->
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp1.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp1.0\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp1.0\zh-Hant" />
-
-    <!-- Add localized resources netcoreapp2.1 -->
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netcoreapp2.1\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\cs\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\de\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\es\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\fr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\it\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ja\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ko\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pl\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pt-BR\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ru\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\tr\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hans\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hant\Microsoft.TestPlatform.CrossPlatEngine.resources.dll" target="lib\netcoreapp2.1\zh-Hant" />
-
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\cs" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\de" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\es" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\fr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\it" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\ja" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\ko" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\pl" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\pt-BR" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\ru" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\tr" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\zh-Hans" />
-    <file src="Microsoft.TestPlatform.TestHost\netcoreapp2.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp2.1\zh-Hant" />
-  </files>
-</package>
diff --git a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec
deleted file mode 100644
index 420efde67c..0000000000
--- a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.TestPlatform.TranslationLayer</id>
-    <version>15.0.0</version>
-    <title>Microsoft.TestPlatform.TranslationLayer</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests.</description>
-    <license type="file">LICENSE_NET.txt</license>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <icon>Icon.png</icon>
-    <projectUrl>https://github.com/microsoft/vstest/</projectUrl>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
-    <repository type="git" 
-                url="https://github.com/microsoft/vstest" 
-                branch="$BranchName$" 
-                commit="$CommitId$" />
-
-    <dependencies>
-      <group targetFramework="net451">
-        <dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
-        <dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
-      </group>
-      <group targetFramework="netstandard2.0">
-        <dependency id="NETStandard.Library" version="[2.0.0, )" />
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
-      <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.6" />
-    </frameworkAssemblies>
-  </metadata>
-  <files>
-    <file src="Icon.png" target="" />
-    <file src="licenses\LICENSE_NET.txt" target="" />
-    <!-- Add a third party notice file -->
-    <file src="ThirdPartyNotices.txt" target="" />
-    
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="lib\net451\" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.XML" target="lib\net451\" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\net451\" />
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\net451\" />    
-    <file src="net451\$Runtime$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\net451\" />
-    <file src="net451\$Runtime$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\net451\" />
-
-    <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" target="lib\netstandard2.0\" />
-    <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.XML" target="lib\netstandard2.0\" />
-    <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\netstandard2.0\" />
-    <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard2.0\" />    
-    <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard2.0\" />
-    <file src="$NetCoreTargetFramework$\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\netstandard2.0\" />
-
-    <!-- Add localized resources -->
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\cs" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\de" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\es" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\fr" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\it" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\ja" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\ko" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\pl" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\pt-BR" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\ru" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\tr" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\zh-Hans" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\net451\zh-Hant" />
-
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\cs" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\de" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\es" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\fr" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\it" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\ja" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\ko" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\pl" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\pt-BR" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\ru" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\tr" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\zh-Hans" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\net451\zh-Hant" />
-
-    <file src="net451\$Runtime$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\cs" />
-    <file src="net451\$Runtime$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\de" />
-    <file src="net451\$Runtime$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\es" />
-    <file src="net451\$Runtime$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\fr" />
-    <file src="net451\$Runtime$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\it" />
-    <file src="net451\$Runtime$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\ja" />
-    <file src="net451\$Runtime$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\ko" />
-    <file src="net451\$Runtime$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\pl" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\pt-BR" />
-    <file src="net451\$Runtime$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\ru" />
-    <file src="net451\$Runtime$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\tr" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\zh-Hans" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\net451\zh-Hant" />
-
-    <file src="net451\$Runtime$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\cs" />
-    <file src="net451\$Runtime$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\de" />
-    <file src="net451\$Runtime$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\es" />
-    <file src="net451\$Runtime$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\fr" />
-    <file src="net451\$Runtime$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\it" />
-    <file src="net451\$Runtime$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\ja" />
-    <file src="net451\$Runtime$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\ko" />
-    <file src="net451\$Runtime$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\pl" />
-    <file src="net451\$Runtime$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\pt-BR" />
-    <file src="net451\$Runtime$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\ru" />
-    <file src="net451\$Runtime$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\tr" />
-    <file src="net451\$Runtime$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\zh-Hans" />
-    <file src="net451\$Runtime$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\net451\zh-Hant" />
-
-    <file src="$NetCoreTargetFramework$\cs\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\cs" />
-    <file src="$NetCoreTargetFramework$\de\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\de" />
-    <file src="$NetCoreTargetFramework$\es\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\es" />
-    <file src="$NetCoreTargetFramework$\fr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\fr" />
-    <file src="$NetCoreTargetFramework$\it\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\it" />
-    <file src="$NetCoreTargetFramework$\ja\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ja" />
-    <file src="$NetCoreTargetFramework$\ko\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ko" />
-    <file src="$NetCoreTargetFramework$\pl\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\pl" />
-    <file src="$NetCoreTargetFramework$\pt-BR\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\pt-BR" />
-    <file src="$NetCoreTargetFramework$\ru\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\ru" />
-    <file src="$NetCoreTargetFramework$\tr\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\tr" />
-    <file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\zh-Hans" />
-    <file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll" target="lib\netstandard2.0\zh-Hant" />
-
-    <file src="$NetCoreTargetFramework$\cs\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\cs" />
-    <file src="$NetCoreTargetFramework$\de\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\de" />
-    <file src="$NetCoreTargetFramework$\es\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\es" />
-    <file src="$NetCoreTargetFramework$\fr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\fr" />
-    <file src="$NetCoreTargetFramework$\it\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\it" />
-    <file src="$NetCoreTargetFramework$\ja\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ja" />
-    <file src="$NetCoreTargetFramework$\ko\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ko" />
-    <file src="$NetCoreTargetFramework$\pl\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\pl" />
-    <file src="$NetCoreTargetFramework$\pt-BR\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
-    <file src="$NetCoreTargetFramework$\ru\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\ru" />
-    <file src="$NetCoreTargetFramework$\tr\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\tr" />
-    <file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
-    <file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.TestPlatform.CommunicationUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
-
-    <file src="$NetCoreTargetFramework$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\cs" />
-    <file src="$NetCoreTargetFramework$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\de" />
-    <file src="$NetCoreTargetFramework$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\es" />
-    <file src="$NetCoreTargetFramework$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\fr" />
-    <file src="$NetCoreTargetFramework$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\it" />
-    <file src="$NetCoreTargetFramework$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ja" />
-    <file src="$NetCoreTargetFramework$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ko" />
-    <file src="$NetCoreTargetFramework$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pl" />
-    <file src="$NetCoreTargetFramework$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
-    <file src="$NetCoreTargetFramework$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ru" />
-    <file src="$NetCoreTargetFramework$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\tr" />
-    <file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
-    <file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
-
-    <file src="$NetCoreTargetFramework$\cs\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\cs" />
-    <file src="$NetCoreTargetFramework$\de\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\de" />
-    <file src="$NetCoreTargetFramework$\es\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\es" />
-    <file src="$NetCoreTargetFramework$\fr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\fr" />
-    <file src="$NetCoreTargetFramework$\it\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\it" />
-    <file src="$NetCoreTargetFramework$\ja\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ja" />
-    <file src="$NetCoreTargetFramework$\ko\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ko" />
-    <file src="$NetCoreTargetFramework$\pl\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\pl" />
-    <file src="$NetCoreTargetFramework$\pt-BR\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\pt-BR" />
-    <file src="$NetCoreTargetFramework$\ru\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\ru" />
-    <file src="$NetCoreTargetFramework$\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\tr" />
-    <file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hans" />
-    <file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hant" />
-
-  </files>
-</package>
diff --git a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets
deleted file mode 100644
index 7769237ada..0000000000
--- a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- ***********************************************************************************************
- Microsoft.NET.Test.Sdk.targets
-
- WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-           created a backup copy.  Incorrect changes to this file will make it
-           impossible to load or build your projects from the command-line or the IDE.
-
- Copyright (c) .NET Foundation. All rights reserved. 
- ***********************************************************************************************
--->
-
-<Project InitialTargets="GenerateProgramFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-    Output type for .NET Core test projects should be exe.
-    https://devdiv.visualstudio.com/DevDiv/_workitems?id=375688&_a=edit
-  -->
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GeneratedProgramFile Condition="'$(GeneratedProgramFile)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.Test.Sdk.Program$(DefaultLanguageSourceExtension)</GeneratedProgramFile>
-    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
-  </PropertyGroup>
-
-  <!--
-    ============================================================
-    GenerateProgramFile
-    Generates Program file which contains the Main entry point
-    ============================================================
-  -->
-  <Target Name="GenerateProgramFile"
-          Condition="'$(GenerateProgramFile)' == 'true'">
-
-    <ItemGroup Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
-      <RemoveExistingMicrosoftNETTestSdkProgram Include="@(Compile)" Condition="'%(FileName)' == 'Microsoft.NET.Test.Sdk.Program'" />
-      <Compile Remove="@(RemoveExistingMicrosoftNETTestSdkProgram)" />
-      <Compile Include="$(GeneratedProgramFile)"/>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Language)' == 'F#'">
-      <ProgramCompiles Include="@(Compile)" Condition="'%(Identity)' == 'Program.fs'" />
-      <CompileAfter Include="$(GeneratedProgramFile)" Condition="@(ProgramCompiles-&gt;Count()) == 0" />
-    </ItemGroup>
-
-    <Warning Condition="@(ProgramCompiles-&gt;Count()) != 0" Text="A 'Program.fs' file can be automatically generated for F# .NET Core test projects. To fix this warning, either delete the file from the project, or set the &lt;GenerateProgramFile&gt; property to 'false'." />
-
-  </Target>
-
-</Project>
diff --git a/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.props b/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.props
deleted file mode 100644
index 2082b1f903..0000000000
--- a/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)x86\msdia140.dll">
-      <Link>x86\msdia140.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)x64\msdia140.dll">
-      <Link>x64\msdia140.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-</Project>
diff --git a/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.targets b/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.targets
deleted file mode 100644
index 773e743c92..0000000000
--- a/src/package/nuspec/uap/Microsoft.TestPlatform.TestHost.Uap.targets
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <EnableTestPlatformV2CopyResources Condition="$(EnableTestPlatformV2CopyResources) == ''">true</EnableTestPlatformV2CopyResources>
-  </PropertyGroup>
-
-  <Target Name="GetTestPlatformV2CultureHierarchy">
-    <!-- Only traversing 5 levels in the culture hierarchy. This is the maximum lenght for all cultures and should be sufficient to get to a culture name that maps to a resource folder we package. 
-    The root culture name for all cultures is invariant whose name is ''(empty) and the parent for invariant culture is invariant itself.(https://msdn.microsoft.com/en-us/library/system.globalization.cultureinfo.parent(v=vs.110).aspx.) 
-    So the below code should not break build in any case. -->
-    <ItemGroup>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Name)" />
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Name)"/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Name)"  Condition="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Name) != ''"/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Name)"  Condition="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Name) != ''"/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Parent.Name)"  Condition="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Parent.Name) != ''"/>
-    </ItemGroup>
-  </Target>
-
-  <!-- Copy resources over to $(TargetDir) if this is a localized build. -->
-  <Target Name="CopyTestPlatformV2Resources" BeforeTargets="PrepareForBuild" Condition="$(EnableTestPlatformV2CopyResources) == 'true'" DependsOnTargets="GetTestPlatformV2CultureHierarchy">
-
-    <PropertyGroup>
-      <CurrentUICultureHierarchy>%(CurrentUICultureHierarchy.Identity)</CurrentUICultureHierarchy>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <TestPlatformV2Files Include="$(MSBuildThisFileDirectory)*.dll" />
-    </ItemGroup>
-
-	<ItemGroup>
-      <Content Include="@(TestPlatformV2Files->'%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')" 
-               Condition="Exists('%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')">
-         <Link>$(CurrentUICultureHierarchy)\%(FileName).resources.dll</Link>
-         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-         <BaseAssemblyFullPath>%(FullPath)</BaseAssemblyFullPath>
-         <Visible>False</Visible>
-      </Content>
-    </ItemGroup>
-  </Target>
-
-  <!-- This is required because an empty resource folder is left even though the files within are cleaned up. -->
-  <Target Name="CleanupTestPlatformV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableTestPlatformV2CopyResources) == 'true'" DependsOnTargets="GetTestPlatformV2CultureHierarchy">
-    <ItemGroup>
-       <ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
-    </ItemGroup>
-    <!-- RemoveDir does not throw if the folder does not exist. Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
-    <RemoveDir Directories="@(ResourceDirectories)" ContinueOnError="true"/>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj
deleted file mode 100644
index fe9908116d..0000000000
--- a/src/package/package/package.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <AssemblyName>package</AssemblyName>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
-    <!-- This proj file shouldn't create outputs during build or publish -->
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
-    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
-
-    <!-- Disable warning that there are no source files. It is intentional. -->
-    <NoWarn>$(NoWarn);2008</NoWarn>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
-    <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\vstest.console\vstest.console.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
-      <FromP2P>true</FromP2P>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-  
-  <!-- Prevent Csc from being called -->
-  <Target Name="CoreCompile" />
-</Project>
diff --git a/src/package/sign/sign.csproj b/src/package/sign/sign.csproj
deleted file mode 100644
index e933aed303..0000000000
--- a/src/package/sign/sign.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
-    <AssemblyName>sign</AssemblyName>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MicroBuild.Core">
-      <Version>0.2.0</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-  </PropertyGroup>
-</Project>
diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj
deleted file mode 100644
index c70207f8ee..0000000000
--- a/src/package/sign/sign.proj
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="SignAssemblies" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SignType Condition="'$(SignType)' == ''">Test</SignType>
-    <MicrobuildVersion>0.2.0</MicrobuildVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RootDirectory>$(MSBuildThisFileDirectory)..\..\..\</RootDirectory>
-    <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">Release</BuildConfiguration>
-    <TargetFramework Condition="'$(TargetFramework)' == ''">net451</TargetFramework>
-    <TargetRuntime Condition="'$(TargetRuntime)' == ''">win7-x64</TargetRuntime>
-    <IncludeLegacyComponents Condition="'$(IncludeLegacyComponents)' == ''">False</IncludeLegacyComponents>
-
-    <PackagesDirectory Condition="'$(PackagesDirectory)' == ''">$(RootDirectory)packages\</PackagesDirectory>
-    <ArtifactsBaseDirectory Condition="'$(ArtifactsBaseDirectory)' == ''">$(RootDirectory)artifacts\$(BuildConfiguration)\</ArtifactsBaseDirectory>
-
-    <!-- Directory with .NET binaries -->
-    <ArtifactsFw45Directory Condition="'$(ArtifactsFw45Directory)' == ''">$(ArtifactsBaseDirectory)net45\</ArtifactsFw45Directory>
-
-    <!-- Directory with .NET binaries -->
-    <ArtifactsDirectory Condition="'$(ArtifactsDirectory)' == ''">$(ArtifactsBaseDirectory)$(TargetFramework)\$(TargetRuntime)\</ArtifactsDirectory>
-
-    <!-- Directory with netcoreapp2.1 binaries -->
-    <ArtifactsCore21Directory Condition="'$(ArtifactsCore21Directory)' == ''">$(ArtifactsBaseDirectory)netcoreapp2.1\</ArtifactsCore21Directory>
-    
-    <!-- Directory with netcoreapp1.0 binaries -->
-    <ArtifactsCore10Directory Condition="'$(ArtifactsCore10Directory)' == ''">$(ArtifactsBaseDirectory)netcoreapp1.0\</ArtifactsCore10Directory>
-    
-    <!-- Directory with NetStandard1.0 binaries -->
-    <ArtifactsNS10Directory Condition="'$(ArtifactsNS10Directory)' == ''">$(ArtifactsBaseDirectory)netstandard1.0\</ArtifactsNS10Directory>
-    
-    <!-- Directory with NetStandard1.3 binaries -->
-    <ArtifactsNS13Directory Condition="'$(ArtifactsNS13Directory)' == ''">$(ArtifactsBaseDirectory)netstandard1.3\</ArtifactsNS13Directory>
-    
-    <!-- Directory with NetStandard2.0 binaries -->
-    <ArtifactsNS20Directory Condition="'$(ArtifactsNS20Directory)' == ''">$(ArtifactsBaseDirectory)netstandard2.0\</ArtifactsNS20Directory>
-    
-    <!-- Directory with UAP10.0 binaries -->
-    <ArtifactsUAP100Directory Condition="'$(ArtifactsUAP100Directory)' == ''">$(ArtifactsBaseDirectory)uap10.0\</ArtifactsUAP100Directory>
-
-    <IntermediatesDirectory Condition="'$(IntermediatesDirectory)' == ''">$(ArtifactsBaseDirectory)obj\$(BuildConfiguration)\$(TargetFramework)\$(TargetRuntime)\</IntermediatesDirectory>
-  </PropertyGroup>
-
-  <ImportGroup>
-    <Import Project="$(PackagesDirectory)Microbuild.Core\$(MicrobuildVersion)\build\Microbuild.Core.props" />
-    <Import Project="$(PackagesDirectory)Microbuild.Core\$(MicrobuildVersion)\build\Microbuild.Core.targets" />
-  </ImportGroup>
-
-  <ItemGroup>
-    <ResxLang Include="cs;de;es;fr;it;ja;ko;pl;pt-BR;ru;tr;zh-Hans;zh-Hant" />
-  </ItemGroup>
-  
-  <Target Name="SignAssemblies">
-    <!-- Sign all files if IncludeLegacyComponents is set to true -->
-    <ItemGroup Condition="'$(IncludeLegacyComponents)' == 'true'">
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.VSTestIntegration.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\DumpMinitool.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\DumpMinitool.x86.exe" />
-  
-      <!-- QualityTools dlls -->
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.QualityTools.TMI.dll" />
-    </ItemGroup>
-
-    <!-- Sign .Net 4.5 assemblies -->
-    <ItemGroup>
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)\Microsoft.TestPlatform.AdapterUtilities.dll" />
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)$(TargetRuntime)\Microsoft.TestPlatform.CoreUtilities.dll" />
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)$(TargetRuntime)\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)$(TargetRuntime)\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      
-      <!-- Localized resources -->
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)\%(ResxLang.Identity)\*.*" />
-      <Fw45AssembliesToSign Include="$(ArtifactsFw45Directory)$(TargetRuntime)\%(ResxLang.Identity)\*.*" />
-    </ItemGroup>
-
-    <!-- Sign test platform v2 assemblies for .NET 4.6-->
-    <ItemGroup>
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.Utilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.TestPlatform.Client.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)datacollector.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)vstest.console.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net452.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net452.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net46.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net46.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net461.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net461.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net462.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net462.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net47.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net47.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net471.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net471.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net472.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net472.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net48.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)testhost.net48.x86.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)SettingsMigrator.exe" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.Interop.dll" />
-
-      <!-- NetFullExtensions -->
-      <!--<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" /> -->
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
-
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.TestPlatform.Utilities.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsDirectory)TestHost\Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\testhost.dll" />
-
-      <!-- Localized resources -->
-      <AssembliesToSign Include="$(ArtifactsDirectory)%(ResxLang.Identity)\*.*" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)TestHost\%(ResxLang.Identity)\*.*" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\%(ResxLang.Identity)\*.*" />
-
-      <!-- Third Party assemblies to sign -->
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsDirectory)Newtonsoft.Json.dll" />
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsDirectory)TestHost\Newtonsoft.Json.dll" />
-    </ItemGroup>
-
-    <!-- Sign test platform v2 assemblies for .NET Core -->
-    <ItemGroup>
-      <Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-    
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)DataCollector.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.Utilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.Client.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)testhost.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)vstest.console.dll" />
-
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.Utilities.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net452.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net452.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net46.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net46.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net461.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net461.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net462.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net462.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net47.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net47.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net471.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net471.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net472.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net472.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net48.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net48.x86.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\datacollector.exe" />
-
-      <NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />
-
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.Utilities.dll" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.VisualStudio.TestPlatform.Common.dll" />
-
-      <NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />
-
-      <UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />
-      <UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
-      <UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
-
-      <!-- NetCoreExtensions -->
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\DumpMinitool.exe" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\DumpMinitool.x86.exe" />
-
-      <!-- Localized resources -->
-      <Core10AssembliesToSign Include="$(ArtifactsCore10Directory)%(ResxLang.Identity)\*.*" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)%(ResxLang.Identity)\*.*" />
-      <NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)%(ResxLang.Identity)\*.*" />
-      <NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)%(ResxLang.Identity)\*.*" />
-      <NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)%(ResxLang.Identity)\*.*" />
-      <UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)%(ResxLang.Identity)\*.*" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\%(ResxLang.Identity)\*.*" />
-      <Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\%(ResxLang.Identity)\*.*" />
-
-      <!-- Third Party assemblies to sign -->
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsCore21Directory)Newtonsoft.Json.dll" />
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Newtonsoft.Json.dll" />
-    </ItemGroup>
-
-    <!-- Sign Microsoft.TestPlatform.Build -->
-    <ItemGroup>
-      <BuildAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.Build\netstandard2.0\Microsoft.TestPlatform.Build.dll" />
-      <BuildAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.Build\netstandard2.0\%(ResxLang.Identity)\*.*" />
-    </ItemGroup>
-
-    <!-- Sign Microsoft.TestPlatform.TestHost -->
-    <ItemGroup>
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\testhost.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\testhost.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\testhost.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x64\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\testhost.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\testhost.x86.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\win7-x86\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.Utilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.CoreUtilities.dll" />
-
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\testhost.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x64\testhost.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x64\testhost.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x64\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <NativeBinariesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\testhost.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\testhost.x86.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\win7-x86\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.Utilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Microsoft.TestPlatform.CoreUtilities.dll" />
-
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\testhost.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.CommunicationUtilities.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.CrossPlatEngine.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.PlatformAbstractions.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.Utilities.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.VisualStudio.TestPlatform.Common.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />	
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Microsoft.TestPlatform.CoreUtilities.dll" />
-
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.TestPlatform.CommunicationUtilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.TestPlatform.CoreUtilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.TestPlatform.CrossPlatEngine.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.TestPlatform.PlatformAbstractions.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.TestPlatform.Utilities.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.VisualStudio.TestPlatform.Common.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net452.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net452.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net46.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net46.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net461.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net461.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net462.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net462.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net47.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net47.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net471.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net471.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net472.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net472.x86.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net48.exe" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\testhost.net48.x86.exe" />
-
-      <!-- Localized resources -->
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\%(ResxLang.Identity)\*.*" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\%(ResxLang.Identity)\*.*" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\%(ResxLang.Identity)\*.*" />
-      <TestHostCoreAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\%(ResxLang.Identity)\*.*" />
-      
-      <!-- Third Party assemblies to sign -->
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp1.0\Newtonsoft.Json.dll" />
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\netcoreapp2.1\Newtonsoft.Json.dll" />
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\uap10.0\Newtonsoft.Json.dll" />
-      <ThirdPartyAssembliesToSign Include="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost\net451\$(TargetRuntime)\Newtonsoft.Json.dll" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <NetStandard10AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </NetStandard10AssembliesToSign>
-      
-      <NetStandard13AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </NetStandard13AssembliesToSign>
-      
-      <NetStandard20AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </NetStandard20AssembliesToSign>
-      
-      <UAP100AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </UAP100AssembliesToSign>
-
-      <AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </AssembliesToSign>
-
-      <Fw45AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </Fw45AssembliesToSign>
-
-      <Core21AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </Core21AssembliesToSign>
-
-      <Core10AssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </Core10AssembliesToSign>
-
-      <BuildAssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </BuildAssembliesToSign>
-
-      <TestHostCoreAssembliesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-        <StrongName>StrongName</StrongName>
-      </TestHostCoreAssembliesToSign>
-
-      <NativeBinariesToSign>
-        <Authenticode>Microsoft400</Authenticode>
-      </NativeBinariesToSign>
-
-      <ThirdPartyAssembliesToSign>
-        <Authenticode>3PartySHA2</Authenticode>
-      </ThirdPartyAssembliesToSign>
-    </ItemGroup>
-
-    <Message Text="Signing 3rd party assemblies using authenticode certificate '%(ThirdPartyAssembliesToSign.Authenticode)' for @(ThirdPartyAssembliesToSign)"/>
-    <SignFiles Files="@(ThirdPartyAssembliesToSign)"
-               BinariesDirectory="$(ArtifactsBaseDirectory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing native libraries using authenticode certificate '%(NativeBinariesToSign.Authenticode)' for @(NativeBinariesToSign)"/>
-    <SignFiles Files="@(NativeBinariesToSign)"
-               BinariesDirectory="$(ArtifactsBaseDirectory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate '%(NetStandard10AssembliesToSign.Authenticode)' for @(NetStandard10AssembliesToSign)"/>
-    <SignFiles Files="@(NetStandard10AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsNS10Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate NetStandard13AssembliesToSign:'%(NetStandard13AssembliesToSign.Authenticode)' for @(NetStandard13AssembliesToSign)"/>
-    <SignFiles Files="@(NetStandard13AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsNS13Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate NetStandard20AssembliesToSign:'%(NetStandard20AssembliesToSign.Authenticode)' for @(NetStandard20AssembliesToSign)"/>
-    <SignFiles Files="@(NetStandard20AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsNS20Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate UAP100AssembliesToSign:'%(UAP100AssembliesToSign.Authenticode)' for @(UAP100AssembliesToSign)"/>
-    <SignFiles Files="@(UAP100AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsUAP100Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate Fw45AssembliesToSign:'%(Fw45AssembliesToSign.Authenticode)' for @(Fw45AssembliesToSign)"/>
-    <SignFiles Files="@(Fw45AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsFw45Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate AssembliesToSign:'%(AssembliesToSign.Authenticode)' for @(AssembliesToSign)"/>
-    <SignFiles Files="@(AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsDirectory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate Core21AssembliesToSign:'%(Core21AssembliesToSign.Authenticode)' for @(Core21AssembliesToSign)"/>
-    <SignFiles Files="@(Core21AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsCore21Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate Core10AssembliesToSign:'%(Core10AssembliesToSign.Authenticode)' for @(Core10AssembliesToSign)"/>
-    <SignFiles Files="@(Core10AssembliesToSign)"
-               BinariesDirectory="$(ArtifactsCore10Directory)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate BuildAssembliesToSign:'%(BuildAssembliesToSign.Authenticode)' for @(BuildAssembliesToSign)"/>
-    <SignFiles Files="@(BuildAssembliesToSign)"
-               BinariesDirectory="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.Build"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-
-    <Message Text="Signing using authenticode certificate TestHostCoreAssembliesToSign:'%(TestHostCoreAssembliesToSign.Authenticode)' for @(TestHostCoreAssembliesToSign)"/>
-    <SignFiles Files="@(TestHostCoreAssembliesToSign)"
-               BinariesDirectory="$(ArtifactsBaseDirectory)Microsoft.TestPlatform.TestHost"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-  </Target>
-
-  <Target Name="SignNugetPackages">
-    <PropertyGroup>
-      <NugetOutDir>$(ArtifactsBaseDirectory)\packages</NugetOutDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <FilesToSign Include="$(NugetOutDir)/*.nupkg">
-        <Authenticode>NuGet</Authenticode>
-      </FilesToSign>
-
-      <FilesToSign Include="$(NugetOutDir)/source-build/*.nupkg">
-        <Authenticode>NuGet</Authenticode>
-      </FilesToSign>
-    </ItemGroup>
-
-    <Message Text="Signing using authenticode certificate '%(FilesToSign.Authenticode)' for @(FilesToSign)"/>
-    <SignFiles Files="@(FilesToSign)"
-               BinariesDirectory="$(NugetOutDir)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-  </Target>
-
-  <Target Name="SignVsix">
-    <PropertyGroup>
-      <VsixOutDir>$(ArtifactsBaseDirectory)VSIX\</VsixOutDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <VsixToSign Include="$(VsixOutDir)TestPlatform.vsix">
-        <Authenticode>VsixSHA2</Authenticode>
-      </VsixToSign>
-    </ItemGroup>
-
-    <Message Text="Signing using authenticode certificate '%(VsixToSign.Authenticode)' for @(VsixToSign)"/>
-    <SignFiles Files="@(VsixToSign)"
-               BinariesDirectory="$(VsixOutDir)"
-               IntermediatesDirectory="$(IntermediatesDirectory)"
-               Type="$(SignType)" />
-  </Target>
-</Project>
diff --git a/src/testhost.arm64/app.manifest b/src/testhost.arm64/app.manifest
new file mode 100644
index 0000000000..83296df511
--- /dev/null
+++ b/src/testhost.arm64/app.manifest
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <!-- Make the application long-path aware (see #5179) -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+    </application>
+  </compatibility>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
\ No newline at end of file
diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj
new file mode 100644
index 0000000000..218480d5d7
--- /dev/null
+++ b/src/testhost.arm64/testhost.arm64.csproj
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
+  <PropertyGroup>
+    <AssemblyName>testhost.arm64</AssemblyName>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <IsTestProject>false</IsTestProject>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win10-arm64</RuntimeIdentifier>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64</TargetName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\testhost.x86\DebugAssertException.cs" Link="DebugAssertException.cs" />
+    <Compile Include="..\testhost.x86\Program.cs;..\testhost.x86\DefaultEngineInvoker.cs;..\testhost.x86\IEngineInvoker.cs;..\testhost.x86\AppDomainEngineInvoker.cs;..\testhost.x86\Friends.cs;..\testhost.x86\UnitTestClient.cs" />
+    <Compile Include="..\testhost.x86\TestHostTraceListener.cs" Link="TestHostTraceListener.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
+    <Reference Include="System" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\testhost.x86\PublicAPI\PublicAPI.Shipped.txt" Link="PublicAPI\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\testhost.x86\PublicAPI\PublicAPI.Unshipped.txt" Link="PublicAPI\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\testhost.x86\app.config" Link="app.config" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/testhost.x86/AppDomainEngineInvoker.cs b/src/testhost.x86/AppDomainEngineInvoker.cs
index 1586cdcbfe..f26ac8557b 100644
--- a/src/testhost.x86/AppDomainEngineInvoker.cs
+++ b/src/testhost.x86/AppDomainEngineInvoker.cs
@@ -1,308 +1,306 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
-{
 #if NETFRAMEWORK
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
 
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml.Linq;
-    using System.Collections.Generic;
-    using System.Globalization;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
 
-    /// <summary>
-    /// Implementation for the Invoker which invokes engine in a new AppDomain
-    /// Type of the engine must be a marshalable object for app domain calls and also must have a parameterless constructor
-    /// </summary>
-    internal class AppDomainEngineInvoker<T> : IEngineInvoker where T : MarshalByRefObject, IEngineInvoker, new()
-    {
-        private const string XmlNamespace = "urn:schemas-microsoft-com:asm.v1";
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        protected readonly AppDomain appDomain;
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
 
-        protected readonly IEngineInvoker actualInvoker;
+/// <summary>
+/// Implementation for the Invoker which invokes engine in a new AppDomain
+/// Type of the engine must be a marshalable object for app domain calls and also must have a parameterless constructor
+/// </summary>
+internal class AppDomainEngineInvoker<T> : IEngineInvoker where T : MarshalByRefObject, IEngineInvoker, new()
+{
+    private const string XmlNamespace = "urn:schemas-microsoft-com:asm.v1";
 
-        private string mergedTempConfigFile = null;
+    protected readonly AppDomain _appDomain;
+    protected readonly IEngineInvoker _actualInvoker;
 
-        public AppDomainEngineInvoker(string testSourcePath)
-        {
-            TestPlatformEventSource.Instance.TestHostAppDomainCreationStart();
+    private string? _mergedTempConfigFile;
+
+    public AppDomainEngineInvoker(string testSourcePath)
+    {
+        TestPlatformEventSource.Instance.TestHostAppDomainCreationStart();
 
-            this.appDomain = CreateNewAppDomain(testSourcePath);
-            this.actualInvoker = CreateInvokerInAppDomain(appDomain);
+        _appDomain = CreateNewAppDomain(testSourcePath);
+        _actualInvoker = CreateInvokerInAppDomain(_appDomain);
 
-            TestPlatformEventSource.Instance.TestHostAppDomainCreationStop();
-        }
+        TestPlatformEventSource.Instance.TestHostAppDomainCreationStop();
+    }
 
-        /// <summary>
-        /// Invokes the Engine with the arguments
-        /// </summary>
-        /// <param name="argsDictionary">Arguments for the engine</param>
-        public void Invoke(IDictionary<string, string> argsDictionary)
+    /// <summary>
+    /// Invokes the Engine with the arguments
+    /// </summary>
+    /// <param name="argsDictionary">Arguments for the engine</param>
+    public void Invoke(IDictionary<string, string?> argsDictionary)
+    {
+        try
+        {
+            _actualInvoker.Invoke(argsDictionary);
+        }
+        finally
         {
             try
             {
-                this.actualInvoker.Invoke(argsDictionary);
-            }
-            finally
-            {
-                try
+                //if(appDomain != null)
+                //{
+                // Do not unload appdomain as there are lot is issues reported against appdomain unload
+                // any ways the process is going to die off.
+                // AppDomain.Unload(appDomain);
+                //}
+
+                if (!string.IsNullOrWhiteSpace(_mergedTempConfigFile) && File.Exists(_mergedTempConfigFile))
                 {
-                    //if(appDomain != null)
-                    //{
-                    // Do not unload appdomain as there are lot is issues reported against appdomain unload
-                    // any ways the process is going to die off.
-                    // AppDomain.Unload(appDomain);
-                    //}
-
-                    if (!string.IsNullOrWhiteSpace(this.mergedTempConfigFile) && File.Exists(mergedTempConfigFile))
-                    {
-                        File.Delete(mergedTempConfigFile);
-                    }
-                }
-                catch
-                {
-                    // ignore
+                    File.Delete(_mergedTempConfigFile);
                 }
             }
+            catch
+            {
+                // ignore
+            }
         }
+    }
 
-        private AppDomain CreateNewAppDomain(string testSourcePath)
-        {
-            var appDomainSetup = new AppDomainSetup();
-            var testSourceFolder = Path.GetDirectoryName(testSourcePath);
+    private AppDomain CreateNewAppDomain(string testSourcePath)
+    {
+        var appDomainSetup = new AppDomainSetup();
+        var testSourceFolder = Path.GetDirectoryName(testSourcePath);
 
-            // Set AppBase to TestAssembly location
-            appDomainSetup.ApplicationBase = testSourceFolder;
-            appDomainSetup.LoaderOptimization = LoaderOptimization.MultiDomainHost;
+        // Set AppBase to TestAssembly location
+        appDomainSetup.ApplicationBase = testSourceFolder;
+        appDomainSetup.LoaderOptimization = LoaderOptimization.MultiDomainHost;
 
-            // Set User Config file as app domain config
-            SetConfigurationFile(appDomainSetup, testSourcePath, testSourceFolder);
+        // Set User Config file as app domain config
+        SetConfigurationFile(appDomainSetup, testSourcePath, testSourceFolder);
 
-            // Create new AppDomain
-            var appDomain = AppDomain.CreateDomain("TestHostAppDomain", null, appDomainSetup);
-            
-            return appDomain;
-        }
+        // Create new AppDomain
+        var appDomain = AppDomain.CreateDomain("TestHostAppDomain", null, appDomainSetup);
 
-        /// <summary>
-        /// Create the Engine Invoker in new AppDomain based on test source path
-        /// </summary>
-        /// <param name="testSourcePath">Test Source to run/discover tests for</param>
-        /// <param name="mergedConfigFile">Merged config file if there is any merging of test config and test host config</param>
-        /// <returns></returns>
-        private IEngineInvoker CreateInvokerInAppDomain(AppDomain appDomain)
-        {
-            // Create CustomAssembly setup that sets a custom assembly resolver to be able to resolve TestPlatform assemblies
-            // and also sets the correct UI culture to propagate the dotnet or VS culture to the adapters running in the app domain
-            appDomain.CreateInstanceFromAndUnwrap(
-                    typeof(CustomAssemblySetup).Assembly.Location,
-                    typeof(CustomAssemblySetup).FullName,
-                    false,
-                    BindingFlags.Default,
-                    null,
-                    new object[] { CultureInfo.DefaultThreadCurrentUICulture?.Name, Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) },
-                    null,
-                    null);
-
-            // Create Invoker object in new appdomain
-            var invokerType = typeof(T);
-            return (IEngineInvoker)appDomain.CreateInstanceFromAndUnwrap(
-                    invokerType.Assembly.Location,
-                    invokerType.FullName,
-                    false,
-                    BindingFlags.Default,
-                    null,
-                    null,
-                    null,
-                    null);
-        }
+        return appDomain;
+    }
+
+    /// <summary>
+    /// Create the Engine Invoker in new AppDomain based on test source path
+    /// </summary>
+    /// <param name="appDomain">The appdomain in which the invoker should be created.</param>
+    /// <returns></returns>
+    private static IEngineInvoker CreateInvokerInAppDomain(AppDomain appDomain)
+    {
+        // Create CustomAssembly setup that sets a custom assembly resolver to be able to resolve TestPlatform assemblies
+        // and also sets the correct UI culture to propagate the dotnet or VS culture to the adapters running in the app domain
+        appDomain.CreateInstanceFromAndUnwrap(
+            typeof(CustomAssemblySetup).Assembly.Location,
+            typeof(CustomAssemblySetup).FullName,
+            false,
+            BindingFlags.Default,
+            null,
+            [CultureInfo.DefaultThreadCurrentUICulture?.Name, Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)],
+            null,
+            null);
+
+        // Create Invoker object in new appdomain
+        var invokerType = typeof(T);
+        return (IEngineInvoker)appDomain.CreateInstanceFromAndUnwrap(
+            invokerType.Assembly.Location,
+            invokerType.FullName,
+            false,
+            BindingFlags.Default,
+            null,
+            null,
+            null,
+            null);
+    }
+
+    private void SetConfigurationFile(AppDomainSetup appDomainSetup, string testSource, string testSourceFolder)
+    {
+        var userConfigFile = GetConfigFile(testSource, testSourceFolder);
+        var testHostAppConfigFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
 
-        private void SetConfigurationFile(AppDomainSetup appDomainSetup, string testSource, string testSourceFolder)
+        if (!string.IsNullOrEmpty(userConfigFile))
         {
-            var userConfigFile = GetConfigFile(testSource, testSourceFolder);
-            var testHostAppConfigFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
+            var userConfigDoc = XDocument.Load(userConfigFile);
+            var testHostConfigDoc = XDocument.Load(testHostAppConfigFile);
 
-            if (!string.IsNullOrEmpty(userConfigFile))
-            {
-                var userConfigDoc = XDocument.Load(userConfigFile);
-                var testHostConfigDoc = XDocument.Load(testHostAppConfigFile);
+            // Merge user's config file and testHost config file and use merged one
+            var mergedConfigDocument = MergeApplicationConfigFiles(userConfigDoc, testHostConfigDoc);
 
-                // Merge user's config file and testHost config file and use merged one
-                var mergedConfigDocument = MergeApplicationConfigFiles(userConfigDoc, testHostConfigDoc);
+            // Create a temp file with config
+            _mergedTempConfigFile = Path.GetTempFileName();
+            mergedConfigDocument.Save(_mergedTempConfigFile);
 
-                // Create a temp file with config
-                this.mergedTempConfigFile = Path.GetTempFileName();
-                mergedConfigDocument.Save(this.mergedTempConfigFile);
+            // Set config file to merged one
+            appDomainSetup.ConfigurationFile = _mergedTempConfigFile;
+        }
+        else
+        {
+            // Use the current domains configuration setting.
+            appDomainSetup.ConfigurationFile = testHostAppConfigFile;
+        }
+    }
 
-                // Set config file to merged one
-                appDomainSetup.ConfigurationFile = this.mergedTempConfigFile;
-            }
-            else
+    private static string? GetConfigFile(string testSource, string testSourceFolder)
+    {
+        string? configFile = null;
+
+        if (File.Exists(testSource + ".config"))
+        {
+            // Path to config file cannot be bad: storage is already checked, and extension is valid.
+            configFile = testSource + ".config";
+        }
+        else
+        {
+            var netAppConfigFile = Path.Combine(testSourceFolder, "App.Config");
+            if (File.Exists(netAppConfigFile))
             {
-                // Use the current domains configuration setting.
-                appDomainSetup.ConfigurationFile = testHostAppConfigFile;
+                configFile = netAppConfigFile;
             }
         }
 
-        private static string GetConfigFile(string testSource, string testSourceFolder)
-        {
-            string configFile = null;
+        return configFile;
+    }
 
-            if (File.Exists(testSource + ".config"))
-            {
-                // Path to config file cannot be bad: storage is already checked, and extension is valid.
-                configFile = testSource + ".config";
-            }
-            else
-            {
-                var netAppConfigFile = Path.Combine(testSourceFolder, "App.Config");
-                if (File.Exists(netAppConfigFile))
-                {
-                    configFile = netAppConfigFile;
-                }
-            }
+    protected static XDocument MergeApplicationConfigFiles(XDocument userConfigDoc, XDocument testHostConfigDoc)
+    {
+        // Start with User's config file as the base
+        var mergedDoc = new XDocument(userConfigDoc);
 
-            return configFile;
+        // Take testhost.exe Startup node
+        var startupNode = testHostConfigDoc.Descendants("startup")?.FirstOrDefault();
+        if (startupNode != null)
+        {
+            // Remove user's startup and add ours which supports NET35
+            mergedDoc.Descendants("startup")?.Remove();
+            mergedDoc.Root.Add(startupNode);
         }
 
-        protected static XDocument MergeApplicationConfigFiles(XDocument userConfigDoc, XDocument testHostConfigDoc)
+        // Runtime node must be merged which contains assembly redirections
+        var runtimeTestHostNode = testHostConfigDoc.Descendants("runtime")?.FirstOrDefault();
+        if (runtimeTestHostNode != null)
         {
-            // Start with User's config file as the base
-            var mergedDoc = new XDocument(userConfigDoc);
-
-            // Take testhost.exe Startup node
-            var startupNode = testHostConfigDoc.Descendants("startup")?.FirstOrDefault();
-            if (startupNode != null)
+            var runTimeNode = mergedDoc.Descendants("runtime")?.FirstOrDefault();
+            if (runTimeNode == null)
             {
-                // Remove user's startup and add ours which supports NET35
-                mergedDoc.Descendants("startup")?.Remove();
-                mergedDoc.Root.Add(startupNode);
-            }
+                // remove test host relative probing paths' element
+                // TestHost Probing Paths do not make sense since we are setting "AppBase" to user's test assembly location
+                runtimeTestHostNode.Descendants().Where((element) => string.Equals(element.Name.LocalName, "probing")).Remove();
 
-            // Runtime node must be merged which contains assembly redirections
-            var runtimeTestHostNode = testHostConfigDoc.Descendants("runtime")?.FirstOrDefault();
-            if (runtimeTestHostNode != null)
+                // no runtime node exists in user's config - just add ours entirely
+                mergedDoc.Root.Add(runtimeTestHostNode);
+            }
+            else
             {
-                var runTimeNode = mergedDoc.Descendants("runtime")?.FirstOrDefault();
-                if (runTimeNode == null)
-                {
-                    // remove test host relative probing paths' element
-                    // TestHost Probing Paths do not make sense since we are setting "AppBase" to user's test assembly location
-                    runtimeTestHostNode.Descendants().Where((element) => string.Equals(element.Name.LocalName, "probing")).Remove();
+                var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
+                var mergedDocAssemblyBindingNode = mergedDoc.Descendants(assemblyBindingXName)?.FirstOrDefault();
+                var testHostAssemblyBindingNode = runtimeTestHostNode.Descendants(assemblyBindingXName)?.FirstOrDefault();
 
-                    // no runtime node exists in user's config - just add ours entirely
-                    mergedDoc.Root.Add(runtimeTestHostNode);
-                }
-                else
+                if (testHostAssemblyBindingNode != null)
                 {
-                    var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
-                    var mergedDocAssemblyBindingNode = mergedDoc.Descendants(assemblyBindingXName)?.FirstOrDefault();
-                    var testHostAssemblyBindingNode = runtimeTestHostNode.Descendants(assemblyBindingXName)?.FirstOrDefault();
-
-                    if (testHostAssemblyBindingNode != null)
+                    if (mergedDocAssemblyBindingNode == null)
                     {
-                        if (mergedDocAssemblyBindingNode == null)
-                        {
-                            // add another assemblyBinding element as none exists in user's config
-                            runTimeNode.Add(testHostAssemblyBindingNode);
-                        }
-                        else
-                        {
-                            var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
-                            var redirections = testHostAssemblyBindingNode.Descendants(dependentAssemblyXName);
+                        // add another assemblyBinding element as none exists in user's config
+                        runTimeNode.Add(testHostAssemblyBindingNode);
+                    }
+                    else
+                    {
+                        var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
+                        var redirections = testHostAssemblyBindingNode.Descendants(dependentAssemblyXName);
 
-                            if (redirections != null)
-                            {
-                                mergedDocAssemblyBindingNode.Add(redirections);
-                            }
+                        if (redirections != null)
+                        {
+                            mergedDocAssemblyBindingNode.Add(redirections);
                         }
                     }
                 }
             }
-
-            return mergedDoc;
         }
+
+        return mergedDoc;
     }
+}
 
-    /// <summary>
-    /// Custom domain setup that sets UICulture and an Assembly resolver for child app domain to resolve testplatform assemblies    
-    /// </summary>
-    // The normal AppDomainInitializer api was not used to do this because it cannot load the assemblies for testhost. --JJR
-    internal class CustomAssemblySetup : MarshalByRefObject
-    {
-        private readonly IDictionary<string, Assembly> resolvedAssemblies;
+/// <summary>
+/// Custom domain setup that sets UICulture and an Assembly resolver for child app domain to resolve testplatform assemblies
+/// </summary>
+// The normal AppDomainInitializer api was not used to do this because it cannot load the assemblies for testhost. --JJR
+internal class CustomAssemblySetup : MarshalByRefObject
+{
+    private readonly IDictionary<string, Assembly?> _resolvedAssemblies;
 
-        private readonly string[] resolverPaths;
+    private readonly string[] _resolverPaths;
 
-        public CustomAssemblySetup(string uiCulture, string testPlatformPath)
+    public CustomAssemblySetup(string uiCulture, string testPlatformPath)
+    {
+        if (uiCulture != null)
         {
-            if (uiCulture != null)
-            {
-                CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.CreateSpecificCulture(uiCulture);
-            }
-
-            this.resolverPaths = new string[] { testPlatformPath, Path.Combine(testPlatformPath, "Extensions") };
-            this.resolvedAssemblies = new Dictionary<string, Assembly>();
-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.CreateSpecificCulture(uiCulture);
         }
 
-        private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            var assemblyName = new AssemblyName(args.Name);
+        _resolverPaths = [testPlatformPath, Path.Combine(testPlatformPath, "Extensions")];
+        _resolvedAssemblies = new Dictionary<string, Assembly?>();
+        AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+    }
+
+    private Assembly? CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+    {
+        var assemblyName = new AssemblyName(args.Name);
 
-            Assembly assembly = null;
-            lock (resolvedAssemblies)
+        Assembly? assembly = null;
+        lock (_resolvedAssemblies)
+        {
+            try
             {
-                try
-                {
-                    EqtTrace.Verbose("CurrentDomain_AssemblyResolve: Resolving assembly '{0}'.", args.Name);
+                EqtTrace.Verbose("CurrentDomain_AssemblyResolve: Resolving assembly '{0}'.", args.Name);
 
-                    if (resolvedAssemblies.TryGetValue(args.Name, out assembly))
-                    {
-                        return assembly;
-                    }
+                if (_resolvedAssemblies.TryGetValue(args.Name, out assembly))
+                {
+                    return assembly;
+                }
 
-                    // Put it in the resolved assembly so that if below Assembly.Load call
-                    // triggers another assembly resolution, then we don't end up in stack overflow
-                    resolvedAssemblies[args.Name] = null;
+                // Put it in the resolved assembly so that if below Assembly.Load call
+                // triggers another assembly resolution, then we don't end up in stack overflow
+                _resolvedAssemblies[args.Name] = null;
 
-                    foreach (var path in resolverPaths)
+                foreach (var path in _resolverPaths)
+                {
+                    var testPlatformFilePath = Path.Combine(path, assemblyName.Name) + ".dll";
+                    if (File.Exists(testPlatformFilePath))
                     {
-                        var testPlatformFilePath = Path.Combine(path, assemblyName.Name) + ".dll";
-                        if (File.Exists(testPlatformFilePath))
+                        try
                         {
-                            try
-                            {
-                                assembly = Assembly.LoadFrom(testPlatformFilePath);
-                                break;
-                            }
-                            catch (Exception)
-                            {
-                                // ignore
-                            }
+                            assembly = Assembly.LoadFrom(testPlatformFilePath);
+                            break;
+                        }
+                        catch (Exception)
+                        {
+                            // ignore
                         }
                     }
+                }
 
-                    // Replace the value with the loaded assembly
-                    resolvedAssemblies[args.Name] = assembly;
+                // Replace the value with the loaded assembly
+                _resolvedAssemblies[args.Name] = assembly;
 
-                    return assembly;
-                }
-                finally
+                return assembly;
+            }
+            finally
+            {
+                if (null == assembly)
                 {
-                    if (null == assembly)
-                    {
-                        EqtTrace.Verbose("CurrentDomainAssemblyResolve: Failed to resolve assembly '{0}'.", args.Name);
-                    }
+                    EqtTrace.Verbose("CurrentDomainAssemblyResolve: Failed to resolve assembly '{0}'.", args.Name);
                 }
             }
         }
     }
+}
 #endif
-}
\ No newline at end of file
diff --git a/src/testhost.x86/DebugAssertException.cs b/src/testhost.x86/DebugAssertException.cs
index 1255f5898e..cdc70df9dc 100644
--- a/src/testhost.x86/DebugAssertException.cs
+++ b/src/testhost.x86/DebugAssertException.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
-{
-    using System;
+using System;
 
-    internal sealed class DebugAssertException : Exception
-    {
-        public DebugAssertException(string message, string stackTrace) : base(message)
-        {
-            StackTrace = stackTrace;
-        }
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
 
-        public override string StackTrace { get; }
+internal sealed class DebugAssertException : Exception
+{
+    public DebugAssertException(string? message, string? stackTrace) : base(message)
+    {
+        StackTrace = stackTrace;
     }
+
+    public override string? StackTrace { get; }
 }
diff --git a/src/testhost.x86/DefaultEngineInvoker.cs b/src/testhost.x86/DefaultEngineInvoker.cs
index dc36ca08ea..95e65cba7f 100644
--- a/src/testhost.x86/DefaultEngineInvoker.cs
+++ b/src/testhost.x86/DefaultEngineInvoker.cs
@@ -1,306 +1,333 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Net;
-    using System.Reflection;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using PlatformAbstractions.Interfaces;
-    using CommunicationUtilitiesResources =
-        Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-
-    internal class DefaultEngineInvoker :
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+#if NETCOREAPP2_0_OR_GREATER || NETFRAMEWORK
+using System.IO;
+#endif
+using System.Net;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+using CommunicationUtilitiesResources =
+    Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
+using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
+
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
+
+internal class DefaultEngineInvoker :
 #if NETFRAMEWORK
-        MarshalByRefObject,
+    MarshalByRefObject,
 #endif
-        IEngineInvoker
-    {
-        /// <summary>
-        /// The timeout for the client to connect to the server.
-        /// Increasing Timeout to allow client to connect, not always the client can connect within 5 seconds
-        /// </summary>
-        private const int ClientListenTimeOut = Timeout.Infinite;
+    IEngineInvoker
+{
+    /// <summary>
+    /// The timeout for the client to connect to the server.
+    /// Increasing Timeout to allow client to connect, not always the client can connect within 5 seconds
+    /// </summary>
+    private const int ClientListenTimeOut = Timeout.Infinite;
 
-        private const string EndpointArgument = "--endpoint";
+    private const string EndpointArgument = "--endpoint";
 
-        private const string RoleArgument = "--role";
+    private const string RoleArgument = "--role";
 
-        private const string ParentProcessIdArgument = "--parentprocessid";
+    private const string ParentProcessIdArgument = "--parentprocessid";
 
-        private const string LogFileArgument = "--diag";
+    private const string LogFileArgument = "--diag";
 
-        private const string TraceLevelArgument = "--tracelevel";
+    private const string TraceLevelArgument = "--tracelevel";
 
-        private const string DataCollectionPortArgument = "--datacollectionport";
+    private const string DataCollectionPortArgument = "--datacollectionport";
 
-        private const string TelemetryOptedIn = "--telemetryoptedin";
+    private const string TelemetryOptedIn = "--telemetryoptedin";
 
-        private ITestRequestHandler requestHandler;
+    // this path is where the sources were originally located on the source system
+    // we are in a testhost that runs on the remote system, so this local path is
+    // actually remote for us and the remote path is local for us.
+    private const string LocalPath = "--local-path";
 
-        private IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender;
+    private const string RemotePath = "--remote-path";
 
-        private IProcessHelper processHelper;
+    private static readonly bool EnableParentProcessQuery =
+        AppContext.TryGetSwitch(
+            switchName: "MSTest.EnableParentProcessQuery",
+            isEnabled: out bool value)
+        ? value : true;
 
-        public DefaultEngineInvoker() : this(new TestRequestHandler(), DataCollectionTestCaseEventSender.Create(), new ProcessHelper())
-        {
-        }
+    private readonly ITestRequestHandler _requestHandler;
 
-        internal DefaultEngineInvoker(ITestRequestHandler requestHandler,
-            IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender, IProcessHelper processHelper)
-        {
-            this.processHelper = processHelper;
-            this.requestHandler = requestHandler;
-            this.dataCollectionTestCaseEventSender = dataCollectionTestCaseEventSender;
-        }
+    private readonly IDataCollectionTestCaseEventSender _dataCollectionTestCaseEventSender;
+
+    private readonly IProcessHelper _processHelper;
+
+    public DefaultEngineInvoker() : this(new TestRequestHandler(), DataCollectionTestCaseEventSender.Create(), new ProcessHelper())
+    {
+    }
 
-        public void Invoke(IDictionary<string, string> argsDictionary)
+    internal DefaultEngineInvoker(ITestRequestHandler requestHandler,
+        IDataCollectionTestCaseEventSender dataCollectionTestCaseEventSender, IProcessHelper processHelper)
+    {
+        _processHelper = processHelper;
+        _requestHandler = requestHandler;
+        _dataCollectionTestCaseEventSender = dataCollectionTestCaseEventSender;
+    }
+
+    public void Invoke(IDictionary<string, string?> argsDictionary)
+    {
+        InitializeEqtTrace(argsDictionary);
+
+        // We don't have a way to pass these values to TestRequestHandler directly
+        // beacuse of it's public interface, we work around that by making it implement a second interface
+        if (_requestHandler is IDeploymentAwareTestRequestHandler deployedHandler)
         {
-            DefaultEngineInvoker.InitializeEqtTrace(argsDictionary);
+            if (argsDictionary.TryGetValue(RemotePath, out var remotePath) && remotePath != null)
+            {
+                deployedHandler.RemotePath = remotePath;
+            }
 
-            if (EqtTrace.IsVerboseEnabled)
+            if (argsDictionary.TryGetValue(LocalPath, out var localPath) && localPath != null)
             {
-                var version = typeof(DefaultEngineInvoker)
-                    .GetTypeInfo()
-                    .Assembly
-                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
-                EqtTrace.Verbose($"Version: { version }");
+                deployedHandler.LocalPath = localPath;
             }
+        }
 
-            if (EqtTrace.IsInfoEnabled)
+        if (EqtTrace.IsVerboseEnabled)
+        {
+            var version = typeof(DefaultEngineInvoker)
+                .Assembly
+                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            EqtTrace.Verbose($"Version: {version} Current process architecture: {_processHelper.GetCurrentProcessArchitecture()}");
+#if NETCOREAPP2_0_OR_GREATER || NETFRAMEWORK
+            // https://docs.microsoft.com/en-us/dotnet/api/system.reflection.assembly.location?view=net-6.0#remarks
+            // In .NET 5 and later versions, for bundled assemblies, the value returned is an empty string.
+            string objectTypeLocation = typeof(object).Assembly.Location;
+            if (!objectTypeLocation.IsNullOrEmpty())
             {
-                EqtTrace.Info("DefaultEngineInvoker.Invoke: Testhost process started with args :{0}",
-                    string.Join(",", argsDictionary));
+                EqtTrace.Verbose($"Runtime location: {Path.GetDirectoryName(objectTypeLocation)}");
+            }
+#endif
+        }
+
+        if (EqtTrace.IsInfoEnabled)
+        {
+            EqtTrace.Info("DefaultEngineInvoker.Invoke: Testhost process started with args :{0}",
+                string.Join(",", argsDictionary));
 #if NETFRAMEWORK
-                var appConfigText =
- System.IO.File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-                EqtTrace.Info("DefaultEngineInvoker: Using Application Configuration: '{0}'", appConfigText);
+            var appConfigText =
+                System.IO.File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
+            EqtTrace.Info("DefaultEngineInvoker: Using Application Configuration: '{0}'", appConfigText);
 #endif
-            }
+        }
 
 #if NETCOREAPP
-            TestHostTraceListener.Setup();
+        TestHostTraceListener.Setup();
 #endif
 
-            this.SetParentProcessExitCallback(argsDictionary);
+        SetParentProcessExitCallback(argsDictionary);
+
+        _requestHandler.ConnectionInfo = GetConnectionInfo(argsDictionary);
 
-            this.requestHandler.ConnectionInfo =
-                DefaultEngineInvoker.GetConnectionInfo(argsDictionary);
+        // Initialize Communication with vstest.console
+        _requestHandler.InitializeCommunication();
+
+        // skipping because 0 is the default value, and also the value the the callers use when they
+        // call with the parameter specified, but without providing an actual port
+        var dcPort = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, DataCollectionPortArgument);
+        if (dcPort > 0)
+        {
+            ConnectToDatacollector(dcPort);
+        }
 
-            // Initialize Communication with vstest.console
-            this.requestHandler.InitializeCommunication();
+        var telemetryOptedIn = GetTelemetryStatusFromArgs(argsDictionary);
 
-            // skipping because 0 is the default value, and also the value the the callers use when they
-            // call with the parameter specified, but without providing an actual port
-            var dcPort = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, DataCollectionPortArgument);
+        // Start processing async in a different task
+        EqtTrace.Info("DefaultEngineInvoker.Invoke: Start Request Processing.");
+        try
+        {
+            StartProcessingAsync(_requestHandler, new TestHostManagerFactory(telemetryOptedIn)).Wait();
+        }
+        finally
+        {
             if (dcPort > 0)
             {
-                this.ConnectToDatacollector(dcPort);
+                // Close datacollector communication.
+                _dataCollectionTestCaseEventSender.Close();
             }
 
-            var requestData = DefaultEngineInvoker.GetRequestData(argsDictionary);
+            _requestHandler.Dispose();
+        }
+    }
 
-            // Start processing async in a different task
-            EqtTrace.Info("DefaultEngineInvoker.Invoke: Start Request Processing.");
-            try
-            {
-                this.StartProcessingAsync(requestHandler, new TestHostManagerFactory(requestData)).Wait();
-            }
-            finally
-            {
-                if (dcPort > 0)
-                {
-                    // Close datacollector communication.
-                    this.dataCollectionTestCaseEventSender.Close();
-                }
+    private static bool GetTelemetryStatusFromArgs(IDictionary<string, string?> argsDictionary)
+    {
+        // Checks if telemetry is opted in in the command line arguments.
+        // By default opting out in testhost to handle the scenario when the user is running an old
+        // version of vstest.console.
+        var telemetryStatus = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, TelemetryOptedIn);
 
-                this.requestHandler.Dispose();
-            }
+        return string.Equals(telemetryStatus, "true", StringComparison.Ordinal);
+    }
+
+    private void ConnectToDatacollector(int dcPort)
+    {
+        EqtTrace.Info("DefaultEngineInvoker.ConnectToDatacollector: Connecting to datacollector, port: {0}",
+            dcPort);
+        _dataCollectionTestCaseEventSender.InitializeCommunication(dcPort);
+
+        // It's possible that connection to vstest.console happens, but to datacollector fails, why?
+        // DataCollector keeps the server alive for testhost only for 15secs(increased to 90 now),
+        // if somehow(on slower machines, with Profiler Enabled) testhost can take considerable time to launch,
+        // in such scenario dc.exe would have killed the server, but testhost will wait infinitely to connect to it,
+        // hence do not wait to connect to datacollector process infinitely, as it will cause process hang.
+        var timeout = EnvironmentHelper.GetConnectionTimeout();
+        if (!_dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(timeout * 1000))
+        {
+            EqtTrace.Error(
+                "DefaultEngineInvoker.ConnectToDatacollector: Connection to DataCollector failed: '{0}', DataCollection will not happen in this session",
+                dcPort);
+            throw new TestPlatformException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
+                    CoreUtilitiesConstants.TesthostProcessName,
+                    CoreUtilitiesConstants.DatacollectorProcessName,
+                    timeout,
+                    EnvironmentHelper.VstestConnectionTimeout)
+            );
         }
+    }
 
-        private static RequestData GetRequestData(IDictionary<string, string> argsDictionary)
+    private void SetParentProcessExitCallback(IDictionary<string, string?> argsDictionary)
+    {
+        // Attach to exit of parent process
+        var hasParentProcessArgument = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, ParentProcessIdArgument, out var parentProcessId);
+
+        if (!hasParentProcessArgument)
         {
-            // Checks for Telemetry Opted in or not from Command line Arguments.
-            // By Default opting out in Test Host to handle scenario when user running old version of vstest.console
-            var telemetryStatus = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, TelemetryOptedIn);
-            var telemetryOptedIn = false;
-            if (!string.IsNullOrWhiteSpace(telemetryStatus))
-            {
-                if (telemetryStatus.Equals("true", StringComparison.Ordinal))
-                {
-                    telemetryOptedIn = true;
-                }
-            }
+            throw new ArgumentException($"Argument {ParentProcessIdArgument} was not specified.");
+        }
 
-            var requestData = new RequestData
-            {
-                MetricsCollection =
-                    telemetryOptedIn
-                        ? (IMetricsCollection)new MetricsCollection()
-                        : new NoOpMetricsCollection(),
-                IsTelemetryOptedIn = telemetryOptedIn
-            };
-            return requestData;
+        if (!EnableParentProcessQuery)
+        {
+            EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: Skipping querying parent process with id: '{0}'", parentProcessId);
+            return;
         }
 
-        private void ConnectToDatacollector(int dcPort)
+        EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: Monitoring parent process with id: '{0}'", parentProcessId);
+
+        if (parentProcessId == -1)
         {
-            EqtTrace.Info("DefaultEngineInvoker.ConnectToDatacollector: Connecting to datacollector, port: {0}",
-                dcPort);
-            this.dataCollectionTestCaseEventSender.InitializeCommunication(dcPort);
-
-            // It's possible that connection to vstest.console happens, but to datacollector fails, why?
-            // DataCollector keeps the server alive for testhost only for 15secs(increased to 90 now),
-            // if somehow(on slower machines, with Profiler Enabled) testhost can take considerable time to launch,
-            // in such scenario dc.exe would have killed the server, but testhost will wait infinitely to connect to it,
-            // hence do not wait to connect to datacollector process infinitely, as it will cause process hang.
-            var timeout = EnvironmentHelper.GetConnectionTimeout();
-            if (!this.dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(timeout * 1000))
-            {
-                EqtTrace.Error(
-                    "DefaultEngineInvoker.ConnectToDatacollector: Connection to DataCollector failed: '{0}', DataCollection will not happen in this session",
-                    dcPort);
-                throw new TestPlatformException(
-                    string.Format(
-                        CultureInfo.CurrentUICulture,
-                        CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
-                        CoreUtilitiesConstants.TesthostProcessName,
-                        CoreUtilitiesConstants.DatacollectorProcessName,
-                        timeout,
-                        EnvironmentHelper.VstestConnectionTimeout)
-                );
-            }
+            // In remote scenario we cannot monitor parent process, so we expect user to pass parentProcessId as -1
+            return;
         }
 
-        private void SetParentProcessExitCallback(IDictionary<string, string> argsDictionary)
+        if (parentProcessId == 0)
         {
-            // Attach to exit of parent process
-            var hasParentProcessArgument = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, ParentProcessIdArgument, out var parentProcessId);
+            //TODO: should there be a warning / error in this case, on windows and linux we are most likely not started by this PID 0, because it's Idle process on Windows, and Swapper on Linux, and similarly in docker
+            // Trying to attach to 0 will cause access denied error on Windows
+        }
 
-            if (!hasParentProcessArgument)
+        _processHelper.SetExitCallback(
+            parentProcessId,
+            (obj) =>
             {
-                throw new ArgumentException($"Argument {ParentProcessIdArgument} was not specified.");
-            }
-
-            EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: Monitoring parent process with id: '{0}'", parentProcessId);
+                EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: ParentProcess '{0}' Exited.",
+                    parentProcessId);
+                new PlatformEnvironment().Exit(1);
+            });
+    }
 
-            if (parentProcessId == -1)
-            {
-                // In remote scenario we cannot monitor parent process, so we expect user to pass parentProcessId as -1
-                return;
-            }
+    private static TestHostConnectionInfo GetConnectionInfo(IDictionary<string, string?> argsDictionary)
+    {
+        // vstest.console < 15.5 won't send endpoint and role arguments.
+        // So derive endpoint from port argument and Make connectionRole as Client.
+        var endpoint = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, EndpointArgument);
+        if (string.IsNullOrWhiteSpace(endpoint))
+        {
+            var port = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
+            endpoint = IPAddress.Loopback + ":" + port;
+        }
 
-            if (parentProcessId == 0)
-            {
-                //TODO: should there be a warning / error in this case, on windows and linux we are most likely not started by this PID 0, because it's Idle process on Windows, and Swapper on Linux, and similarly in docker
-                // Trying to attach to 0 will cause access denied error on Windows
-            }
+        EqtTrace.Info("DefaultEngineInvoker.GetConnectionInfo: Initialize communication on endpoint address: '{0}'", endpoint);
 
-            this.processHelper.SetExitCallback(
-                parentProcessId,
-                (obj) =>
-                {
-                    EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: ParentProcess '{0}' Exited.",
-                        parentProcessId);
-                    new PlatformEnvironment().Exit(1);
-                });
+        var connectionRole = ConnectionRole.Client;
+        string? role = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, RoleArgument);
+        if (string.Equals(role, "host", StringComparison.OrdinalIgnoreCase))
+        {
+            connectionRole = ConnectionRole.Host;
         }
 
-        private static TestHostConnectionInfo GetConnectionInfo(IDictionary<string, string> argsDictionary)
+        // Start Processing of requests
+        var connectionInfo = new TestHostConnectionInfo
         {
-            // vstest.console < 15.5 won't send endpoint and role arguments.
-            // So derive endpoint from port argument and Make connectionRole as Client.
-            var endpoint = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, EndpointArgument);
-            if (string.IsNullOrWhiteSpace(endpoint))
-            {
-                var port = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
-                endpoint = IPAddress.Loopback + ":" + port;
-            }
+            Endpoint = endpoint!,
+            Role = connectionRole,
+            Transport = Transport.Sockets
+        };
 
-            EqtTrace.Info("DefaultEngineInvoker.GetConnectionInfo: Initialize communication on endpoint address: '{0}'", endpoint);
+        return connectionInfo;
+    }
 
-            var connectionRole = ConnectionRole.Client;
-            string role = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, RoleArgument);
-            if (!string.IsNullOrWhiteSpace(role) && string.Equals(role, "host", StringComparison.OrdinalIgnoreCase))
-            {
-                connectionRole = ConnectionRole.Host;
-            }
+    private static void InitializeEqtTrace(IDictionary<string, string?> argsDictionary)
+    {
+        // Setup logging if enabled
+        if (argsDictionary.TryGetValue(LogFileArgument, out var logFile))
+        {
+            var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
 
-            // Start Processing of requests
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = endpoint,
-                Role = connectionRole,
-                Transport = Transport.Sockets
-            };
+            // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
+            var traceLevel = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt) ?
+                (PlatformTraceLevel)traceLevelInt :
+                PlatformTraceLevel.Verbose;
 
-            return connectionInfo;
+            EqtTrace.InitializeTrace(logFile, traceLevel);
         }
-
-        private static void InitializeEqtTrace(IDictionary<string, string> argsDictionary)
+        else
         {
-            // Setup logging if enabled
-            if (argsDictionary.TryGetValue(LogFileArgument, out var logFile))
-            {
-                var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
-
-                // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
-                var traceLevel = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt) ?
-                    (PlatformTraceLevel)traceLevelInt :
-                    PlatformTraceLevel.Verbose;
-
-                EqtTrace.InitializeTrace(logFile, traceLevel);
-            }
-            else
-            {
-                EqtTrace.DoNotInitailize = true;
-            }
+            EqtTrace.DoNotInitailize = true;
         }
+    }
 
-        private Task StartProcessingAsync(ITestRequestHandler requestHandler, ITestHostManagerFactory managerFactory)
-        {
-            var task = new Task(
-                () =>
+    private static Task StartProcessingAsync(ITestRequestHandler requestHandler, ITestHostManagerFactory managerFactory)
+    {
+        var task = new Task(
+            () =>
+            {
+                // Wait for the connection to the sender and start processing requests from sender
+                // Note that we are waiting here infinitely to connect to vstest.console, but at the same time vstest.console doesn't wait infinitely.
+                // It has a default timeout of 60secs(which is configurable), & then it kills testhost.exe
+                // The reason to wait infinitely, was remote debugging scenarios of UWP app,
+                // in such cases after the app gets launched, VS debugger takes control of it, & causes a lot of delay, which frequently causes timeout with vstest.console.
+                // One fix would be just double this timeout, but there is no telling how much time it can actually take.
+                // Hence we are waiting here indefinitely, to avoid such guessed timeouts, & letting user kill the debugging if they feel it is taking too much time.
+                // In other cases if vstest.console's timeout exceeds it will definitely such down the app.
+                if (requestHandler.WaitForRequestSenderConnection(ClientListenTimeOut))
                 {
-                    // Wait for the connection to the sender and start processing requests from sender
-                    // Note that we are waiting here infinitely to connect to vstest.console, but at the same time vstest.console doesn't wait infinitely.
-                    // It has a default timeout of 60secs(which is configurable), & then it kills testhost.exe
-                    // The reason to wait infinitely, was remote debugging scenarios of UWP app,
-                    // in such cases after the app gets launched, VS debugger takes control of it, & causes a lot of delay, which frequently causes timeout with vstest.console.
-                    // One fix would be just double this timeout, but there is no telling how much time it can actually take.
-                    // Hence we are waiting here indefinitely, to avoid such guessed timeouts, & letting user kill the debugging if they feel it is taking too much time.
-                    // In other cases if vstest.console's timeout exceeds it will definitely such down the app.
-                    if (requestHandler.WaitForRequestSenderConnection(ClientListenTimeOut))
-                    {
-                        EqtTrace.Info("DefaultEngineInvoker.StartProcessingAsync: Connected to vstest.console, Starting process requests.");
-                        requestHandler.ProcessRequests(managerFactory);
-                    }
-                    else
-                    {
-                        EqtTrace.Info(
-                            "DefaultEngineInvoker.StartProcessingAsync: RequestHandler timed out while connecting to the Sender.");
-                        throw new TimeoutException();
-                    }
-                },
-                TaskCreationOptions.LongRunning);
-
-            task.Start();
-            return task;
-        }
+                    EqtTrace.Info("DefaultEngineInvoker.StartProcessingAsync: Connected to vstest.console, Starting process requests.");
+                    requestHandler.ProcessRequests(managerFactory);
+                }
+                else
+                {
+                    EqtTrace.Info(
+                        "DefaultEngineInvoker.StartProcessingAsync: RequestHandler timed out while connecting to the Sender.");
+                    throw new TimeoutException();
+                }
+            },
+            TaskCreationOptions.LongRunning);
+
+        task.Start();
+        return task;
     }
-}
\ No newline at end of file
+}
diff --git a/src/testhost.x86/IEngineInvoker.cs b/src/testhost.x86/IEngineInvoker.cs
index c37ddf0cb2..62e29ab128 100644
--- a/src/testhost.x86/IEngineInvoker.cs
+++ b/src/testhost.x86/IEngineInvoker.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
 
+/// <summary>
+/// Interface contract for invoking the engine
+/// </summary>
+public interface IEngineInvoker
+{
     /// <summary>
-    /// Interface contract for invoking the engine
+    /// Invokes the Engine with the arguments
     /// </summary>
-    public interface IEngineInvoker
-    {
-        /// <summary>
-        /// Invokes the Engine with the arguments
-        /// </summary>
-        /// <param name="argsDictionary">Arguments for the engine</param>
-        void Invoke(IDictionary<string, string> argsDictionary);
-    }
+    /// <param name="argsDictionary">Arguments for the engine</param>
+    void Invoke(IDictionary<string, string?> argsDictionary);
 }
diff --git a/src/testhost.x86/Program.cs b/src/testhost.x86/Program.cs
index 7b97a43d3f..7c5c414220 100644
--- a/src/testhost.x86/Program.cs
+++ b/src/testhost.x86/Program.cs
@@ -1,87 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+#if NETFRAMEWORK
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+#endif
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
+
+/// <summary>
+/// The program.
+/// </summary>
+public class Program
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Runtime.InteropServices;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+#if NETFRAMEWORK
+    private const string TestSourceArgumentString = "--testsourcepath";
+#endif
 
     /// <summary>
-    /// The program.
+    /// The main.
     /// </summary>
-    public class Program
+    /// <param name="args">
+    /// The args.
+    /// </param>
+    public static void Main(string[]? args)
     {
-        private const string TestSourceArgumentString = "--testsourcepath";
-
-        /// <summary>
-        /// The main.
-        /// </summary>
-        /// <param name="args">
-        /// The args.
-        /// </param>
-        public static void Main(string[] args)
+        try
         {
-            try
-            {
-                TestPlatformEventSource.Instance.TestHostStart();
-                Run(args);
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("TestHost: Error occurred during initialization of TestHost : {0}", ex);
-
-                // Throw exception so that vstest.console get the exception message.
-                throw;
-            }
-            finally
-            {
-                TestPlatformEventSource.Instance.TestHostStop();
-                EqtTrace.Info("Testhost process exiting.");
-            }
+            TestPlatformEventSource.Instance.TestHostStart();
+            Run(args);
         }
-
-        // In UWP(App models) Run will act as entry point from Application end, so making this method public
-        public static void Run(string[] args)
+        catch (Exception ex)
         {
-            DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_HOST_DEBUG_ATTACHVS");
-            DebuggerBreakpoint.WaitForNativeDebugger("VSTEST_HOST_NATIVE_DEBUG");
-            DebuggerBreakpoint.WaitForDebugger("VSTEST_HOST_DEBUG");
-            UILanguageOverride.SetCultureSpecifiedByUser();
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args);
+            EqtTrace.Error("TestHost: Error occurred during initialization of TestHost : {0}", ex);
 
-            // Invoke the engine with arguments
-            GetEngineInvoker(argsDictionary).Invoke(argsDictionary);
+            // Throw exception so that vstest.console get the exception message.
+            throw;
         }
-
-        private static IEngineInvoker GetEngineInvoker(IDictionary<string, string> argsDictionary)
+        finally
         {
-            IEngineInvoker invoker = null;
+            TestPlatformEventSource.Instance.TestHostStop();
+            EqtTrace.Info("Testhost process exiting.");
+        }
+    }
+
+    // In UWP(App models) Run will act as entry point from Application end, so making this method public
+    public static void Run(string[]? args) => Run(args, new());
+
+    internal static void Run(string[]? args, UiLanguageOverride uiLanguageOverride)
+    {
+        DebuggerBreakpoint.AttachVisualStudioDebugger(WellKnownDebugEnvironmentVariables.VSTEST_HOST_DEBUG_ATTACHVS);
+        DebuggerBreakpoint.WaitForNativeDebugger(WellKnownDebugEnvironmentVariables.VSTEST_HOST_NATIVE_DEBUG);
+        DebuggerBreakpoint.WaitForDebugger(WellKnownDebugEnvironmentVariables.VSTEST_HOST_DEBUG);
+        uiLanguageOverride.SetCultureSpecifiedByUser();
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args);
+
+        // Invoke the engine with arguments
+        GetEngineInvoker(argsDictionary).Invoke(argsDictionary);
+    }
+
+    private static IEngineInvoker GetEngineInvoker(IDictionary<string, string?> argsDictionary)
+    {
+        IEngineInvoker? invoker = null;
 #if NETFRAMEWORK
-            // If Args contains test source argument, invoker Engine in new appdomain
-            if (argsDictionary.TryGetValue(TestSourceArgumentString, out var testSourcePath) && !string.IsNullOrWhiteSpace(testSourcePath))
-            {
-                // remove the test source arg from dictionary
-                argsDictionary.Remove(TestSourceArgumentString);
+        // If Args contains test source argument, invoker Engine in new appdomain
+        if (argsDictionary.TryGetValue(TestSourceArgumentString, out var testSourcePath) && !testSourcePath.IsNullOrWhiteSpace())
+        {
+            // remove the test source arg from dictionary
+            argsDictionary.Remove(TestSourceArgumentString);
 
-                // Only DLLs and EXEs can have app.configs or ".exe.config" or ".dll.config"
-                if (System.IO.File.Exists(testSourcePath) &&
-                        (testSourcePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)
-                        || testSourcePath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)))
-                {
-                    invoker = new AppDomainEngineInvoker<DefaultEngineInvoker>(testSourcePath);
-                }
+            // Only DLLs and EXEs can have app.configs or ".exe.config" or ".dll.config"
+            if (System.IO.File.Exists(testSourcePath) &&
+                (testSourcePath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)
+                 || testSourcePath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)))
+            {
+                invoker = new AppDomainEngineInvoker<DefaultEngineInvoker>(testSourcePath);
             }
-#endif
-            return invoker ?? new DefaultEngineInvoker();
         }
+#endif
+        return invoker ?? new DefaultEngineInvoker();
     }
 }
diff --git a/src/testhost.x86/Properties/AssemblyInfo.cs b/src/testhost.x86/Properties/AssemblyInfo.cs
deleted file mode 100644
index a1ea0c91c9..0000000000
--- a/src/testhost.x86/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestHost.x86")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d00e4b49-b503-496c-9f48-f425ae05e049")]
diff --git a/src/testhost.x86/PublicAPI/PublicAPI.Shipped.txt b/src/testhost.x86/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..a29c7c1116
--- /dev/null
+++ b/src/testhost.x86/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,10 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient
+Microsoft.VisualStudio.TestPlatform.TestHost.IEngineInvoker
+Microsoft.VisualStudio.TestPlatform.TestHost.IEngineInvoker.Invoke(System.Collections.Generic.IDictionary<string!, string?>! argsDictionary) -> void
+Microsoft.VisualStudio.TestPlatform.TestHost.Program
+Microsoft.VisualStudio.TestPlatform.TestHost.Program.Program() -> void
+static Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI() -> void
+static Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(string! arguments) -> void
+static Microsoft.VisualStudio.TestPlatform.TestHost.Program.Main(string![]? args) -> void
+static Microsoft.VisualStudio.TestPlatform.TestHost.Program.Run(string![]? args) -> void
diff --git a/src/testhost.x86/PublicAPI/PublicAPI.Unshipped.txt b/src/testhost.x86/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/testhost.x86/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/testhost.x86/TestHostTraceListener.cs b/src/testhost.x86/TestHostTraceListener.cs
index 423dc1a947..d5dd7b78de 100644
--- a/src/testhost.x86/TestHostTraceListener.cs
+++ b/src/testhost.x86/TestHostTraceListener.cs
@@ -1,130 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-
-namespace Microsoft.VisualStudio.TestPlatform.TestHost
-{
 #if NETCOREAPP
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Reflection;
 
-    internal class TestHostTraceListener : DefaultTraceListener
-    {
-        public static void Setup()
-        {
-            EqtTrace.Info("Setting up debug trace listener.");
-            // in the majority of cases there will be only a single DefaultTraceListener in this collection
-            // and we will replace that with our listener, in case there are listeners of different types we keep
-            // them as is
-            for (var i = 0; i < Trace.Listeners.Count; i++)
-            {
-                var listener = Trace.Listeners[i];
-                if (listener is DefaultTraceListener)
-                {
-                    EqtTrace.Verbose($"TestPlatformTraceListener.Setup: Replacing listener {0} with { nameof(TestHostTraceListener) }.", Trace.Listeners[i]);
-                    Trace.Listeners[i] = new TestHostTraceListener();
-                }
-            }
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
 
-            EqtTrace.Verbose("TestPlatformTraceListener.Setup: Added test platform trace listener.");
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-            // this is a netcoreapp2.1 only fix, but because we always compile against netcoreapp2.1 
-            // and upgrade the executable as necessary this needs to be a runtime check and not a compile time 
-            // check. This call returns ".NET Core 4.6.xxx" on netcore 2.1 and older, and ".NET Core 3.1.xxx"
-            // or the respective version on the newer runtimes
-            if (System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.StartsWith(".NET Core 4.6"))
+namespace Microsoft.VisualStudio.TestPlatform.TestHost;
+
+internal class TestHostTraceListener : DefaultTraceListener
+{
+    public static void Setup()
+    {
+        EqtTrace.Info("Setting up debug trace listener.");
+        // in the majority of cases there will be only a single DefaultTraceListener in this collection
+        // and we will replace that with our listener, in case there are listeners of different types we keep
+        // them as is
+        for (var i = 0; i < Trace.Listeners.Count; i++)
+        {
+            var listener = Trace.Listeners[i];
+            if (listener is DefaultTraceListener)
             {
-                try
-                {
-                    // workaround for netcoreapp2.1 where the trace listener api is not called when 
-                    // Debug.Assert fails. This method is internal, but the class is on purpose keeping the 
-                    // callback settable so tests can set the callback
-                    var field = typeof(Debug).GetField("s_ShowDialog", BindingFlags.Static | BindingFlags.NonPublic);
-                    if (field != null)
-                    {
-                        var value = field.GetValue(null);
-                        field.SetValue(null, (Action<string, string, string, string>)ShowDialog);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("TestPlatformTraceListener.Setup: Failed to replace inner callback to ShowDialog in Debug.Assert. Calls to Debug.Assert with crash the test host process. {0}", ex);
-                }
+                EqtTrace.Verbose($"TestPlatformTraceListener.Setup: Replacing listener {Trace.Listeners[i]} with {nameof(TestHostTraceListener)}.");
+                Trace.Listeners[i] = new TestHostTraceListener();
             }
         }
 
-        public override void Fail(string message)
-        {
-            throw GetException(message);
-        }
+        EqtTrace.Verbose("TestPlatformTraceListener.Setup: Added test platform trace listener.");
+    }
 
-        public override void Fail(string message, string detailMessage)
-        {
-            throw GetException((message + Environment.NewLine + detailMessage));
-        }
+    public override void Fail(string? message)
+    {
+        throw GetException(message);
+    }
 
-        public static void ShowDialog(string stackTrace, string message, string detailMessage, string _)
-        {
-            var text = !string.IsNullOrEmpty(message)
-                ? !string.IsNullOrEmpty(detailMessage)
-                    ? (message + Environment.NewLine + detailMessage)
-                    : message
-                : null;
-            throw GetException(text);
-        }
+    public override void Fail(string? message, string? detailMessage)
+    {
+        throw GetException((message + Environment.NewLine + detailMessage));
+    }
 
-        private static DebugAssertException GetException(string message)
+    private static DebugAssertException GetException(string? message)
+    {
+        var stack = new StackTrace(true);
+        var debugMethodFound = false;
+        var frameCount = 0;
+        MethodBase? method = null;
+        var frames = stack.GetFrames();
+        foreach (var f in frames)
         {
-            var debugTypes = new Type[] { typeof(Debug), typeof(Trace) };
-#if NETCOREAPP1_0
-            Exception exceptionForStack;
-            try
+            var m = f?.GetMethod();
+            var declaringType = m?.DeclaringType;
+            if (!debugMethodFound && (declaringType == typeof(Debug) || declaringType == typeof(Trace)))
             {
-                throw new Exception();
+                method = m;
+                debugMethodFound = true;
             }
-            catch (Exception e)
-            {
-                exceptionForStack = e;
-            }
-
-            var stack = new StackTrace(exceptionForStack, true);
-#else
-            var stack = new StackTrace(true);
-#endif
 
-            var debugMethodFound = false;
-            var frameCount = 0;
-            MethodBase method = null;
-            foreach (var f in stack.GetFrames())
+            if (debugMethodFound)
             {
-                var m = f.GetMethod();
-                var declaringType = m?.DeclaringType;
-                if (!debugMethodFound && (declaringType == typeof(Debug) || declaringType == typeof(Trace)))
-                {
-                    method = m;
-                    debugMethodFound = true;
-                }
-
-                if (debugMethodFound)
-                {
-                    frameCount++;
-                }
+                frameCount++;
             }
+        }
 
-#if NETCOREAPP1_0
-            var stackTrace = string.Join(Environment.NewLine, stack.ToString().Replace(Environment.NewLine, "\n").Split('\n').Reverse().Take(frameCount).Reverse());
-#else
-            var stackTrace = string.Join(Environment.NewLine, stack.ToString().Split(Environment.NewLine).TakeLast(frameCount));
-#endif
-            var methodName = method != null ? $"{method.DeclaringType.Name}.{method.Name}" : "<method>";
-            var wholeMessage = $"Method {methodName} failed with '{message}', and was translated to { typeof(DebugAssertException).FullName } to avoid terminating the process hosting the test.";
+        var stackTrace = new StackTrace(frames.TakeLast(frameCount)).ToString();
+        var methodName = method != null ? $"{method.DeclaringType?.Name}.{method.Name}" : "<method>";
+        var wholeMessage = $"Method {methodName} failed with '{message}', and was translated to {typeof(DebugAssertException).FullName} to avoid terminating the process hosting the test.";
 
-            return new DebugAssertException(wholeMessage, stackTrace);
-        }
+        return new DebugAssertException(wholeMessage, stackTrace);
     }
+}
 
 #endif
-}
\ No newline at end of file
diff --git a/src/testhost.x86/UnitTestClient.cs b/src/testhost.x86/UnitTestClient.cs
index ee1e02d6bc..de0f39cfa6 100644
--- a/src/testhost.x86/UnitTestClient.cs
+++ b/src/testhost.x86/UnitTestClient.cs
@@ -1,63 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestExecutor
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+
+namespace Microsoft.VisualStudio.TestPlatform.TestExecutor;
+
+/// <summary>
+/// Initialization point for Old UWP application
+/// </summary>
+public static class UnitTestClient
 {
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.TestHost;
+    /// <summary>
+    /// Create default UI for UWP app
+    /// </summary>
+    public static void CreateDefaultUI()
+    {
+    }
 
     /// <summary>
-    /// Initialization point for Old UWP application
+    /// Entry point for testhost, in App Model(UWP) scenario
     /// </summary>
-    public static class UnitTestClient
+    /// <param name="arguments">testhost initialization arguments</param>
+    public static void Run(string arguments)
     {
-        /// <summary>
-        /// Create default UI for UWP app
-        /// </summary>
-        public static void CreateDefaultUI()
-        {
-        }
+        Task.Run(() => Program.Run(SplitArguments(arguments)));
+    }
 
-        /// <summary>
-        /// Entry point for testhost, in App Model(UWP) scenario
-        /// </summary>
-        /// <param name="arguments">testhost initialization arguments</param>
-        public static void Run(string arguments)
-        {
-            Task.Run(() =>
-            {
-                Program.Run(SplitArguments(arguments));
-            });
-        }
+    /// <summary>
+    /// Split Arguments on space, if they are not inside Single/Double Quotes
+    /// </summary>
+    /// <param name="commandLine"></param>
+    /// <returns></returns>
+    internal static string[] SplitArguments(string commandLine)
+    {
+        var parmChars = commandLine.ToCharArray();
+        var inDoubleQuote = false;
+        var inSingleQuote = false;
 
-        /// <summary>
-        /// Split Arguments on space, if they are not inside Single/Double Quotes
-        /// </summary>
-        /// <param name="commandLine"></param>
-        /// <returns></returns>
-        internal static string[] SplitArguments(string commandLine)
+        for (var index = 0; index < parmChars.Length; index++)
         {
-            var parmChars = commandLine.ToCharArray();
-            var inDoubleQuote = false;
-            var inSingleQuote = false;
+            if (parmChars[index] == '"' && !inSingleQuote)
+            {
+                inDoubleQuote = !inDoubleQuote;
+            }
 
-            for (var index = 0; index < parmChars.Length; index++)
+            if (parmChars[index] == '\'' && !inDoubleQuote)
             {
-                if (parmChars[index] == '"' && !inSingleQuote)
-                {
-                    inDoubleQuote = !inDoubleQuote;
-                }
-
-                if (parmChars[index] == '\'' && !inDoubleQuote)
-                {
-                    inSingleQuote = !inSingleQuote;
-                }
-
-                if (!inSingleQuote && !inDoubleQuote && parmChars[index] == ' ')
-                    parmChars[index] = '\n';
+                inSingleQuote = !inSingleQuote;
             }
 
-            return (new string(parmChars)).Split(new[] { '\n' });
+            if (!inSingleQuote && !inDoubleQuote && parmChars[index] == ' ')
+                parmChars[index] = '\n';
         }
+
+        return (new string(parmChars)).Split(['\n']);
     }
-}
\ No newline at end of file
+}
diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config
index 254425ccbe..61d2d0fa06 100644
--- a/src/testhost.x86/app.config
+++ b/src/testhost.x86/app.config
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
   </startup>
   <runtime>
-    <legacyUnhandledExceptionPolicy enabled="1"/>
-    <legacyCorruptedStateExceptionsPolicy enabled="true"/>
-
+    <legacyUnhandledExceptionPolicy enabled="1" />
+    <legacyCorruptedStateExceptionsPolicy enabled="true" />
     <!-- To get stacktrace information for portable and embedded pdbs when net472 installed on machine.
           More details https://github.com/dotnet/designs/blob/master/accepted/diagnostics/debugging-with-symbols-and-sources.md#stack-traces -->
     <AppContextSwitchOverrides value="Switch.System.Diagnostics.IgnorePortablePDBsInStackTraces=false" />
-
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="Extensions" />
       <!-- Test adapters compiled against version 11-14, need to be redirected to version 15. -->
@@ -20,31 +18,32 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.VisualStudio.TestWindow.Interfaces" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-16.0.0.0"  newVersion="17.0.0.0"/>
+        <bindingRedirect oldVersion="11.0.0.0-18.0.0.0" newVersion="18.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTestFramework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.1.0.0" newVersion="10.0.0.0"/>
+        <bindingRedirect oldVersion="10.1.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Resource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0"/>
+        <!-- Microsoft.Extensions.DependencyModel depends on version 9.0.0, and newer versions of that nuget don't support all the frameworks we need anymore. -->
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="9.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.ControllerObject" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.ExecutionCommon" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0"/>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Common" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0"/>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
@@ -57,7 +56,6 @@
     <!--<add key="ExecutionThreadApartmentState" value ="MTA"/>-->
     <!--<add key="TraceLogMaxFileSizeInKb" value ="10240"/>-->
     <!-- MsTest Adapter Specific AppSettings -->
-    
     <!-- This flag is added to support test execution for net35 tests through TMI adapter. -->
     <add key="TestProjectRetargetTo35Allowed" value="true" />
   </appSettings>
diff --git a/src/testhost.x86/app.manifest b/src/testhost.x86/app.manifest
index 161dc3ad9e..06e64089d4 100644
--- a/src/testhost.x86/app.manifest
+++ b/src/testhost.x86/app.manifest
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <!-- Make the application long-path aware (see #5179) -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </windowsSettings>
+  </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
@@ -24,4 +32,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
index d27bf4962b..50245b8159 100644
--- a/src/testhost.x86/testhost.x86.csproj
+++ b/src/testhost.x86/testhost.x86.csproj
@@ -1,35 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
   <PropertyGroup>
     <AssemblyName>testhost.x86</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>true</Prefer32Bit>
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x86</RuntimeIdentifier>
+    <Prefer32Bit Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">true</Prefer32Bit>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <!--
+    NETSDK1201: For projects targeting .NET 8.0 and higher, specifying a RuntimeIdentifier will no longer produce a
+    self contained app by default. To continue building self-contained apps, set the SelfContained property to true
+    or use the -\-self-contained argument.
+    -->
+    <MSBuildWarningsAsMessages>NETSDK1201</MSBuildWarningsAsMessages>
+    <NoWarn>$(NoWarn);NETSDK1201</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'net6.0' ">
-    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x86</RuntimeIdentifier>
+
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <TargetName Condition="'$(TargetFramework)' != 'net451'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName>
+    <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName>
   </PropertyGroup>
+
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Diagnostics.StackTrace" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="4.3.0" />
-    <PackageReference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="$(SystemNetHttpVersion)" />
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
@@ -41,13 +48,19 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="netstandard" />
+
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/testhost/Properties/AssemblyInfo.cs b/src/testhost/Properties/AssemblyInfo.cs
deleted file mode 100644
index 54aecbfac4..0000000000
--- a/src/testhost/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("Microsoft.TestHost")]
-[assembly: AssemblyTrademark("")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("99d82e36-6b51-4db9-bd37-adbf373125ed")]
diff --git a/src/testhost/app.config b/src/testhost/app.config
deleted file mode 100644
index 2a67681b5e..0000000000
--- a/src/testhost/app.config
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
-  </startup>
-  <runtime>
-    <legacyUnhandledExceptionPolicy enabled="1" />
-    <legacyCorruptedStateExceptionsPolicy enabled="true" />
-
-    <!-- To get stacktrace information for portable and embedded pdbs when net472 installed on machine.
-          More details https://github.com/dotnet/designs/blob/master/accepted/diagnostics/debugging-with-symbols-and-sources.md#stack-traces -->
-    <AppContextSwitchOverrides value="Switch.System.Diagnostics.IgnorePortablePDBsInStackTraces=false" />
-
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="Extensions" />
-      <!-- Test adapters compiled against version 11-14, need to be redirected to version 15. -->
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.TestWindow.Interfaces" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTestFramework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.1.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Resource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.ControllerObject" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.ExecutionCommon" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Common" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <system.diagnostics>
-    <switches>
-      <add name="TpTraceLevel" value="0" />
-    </switches>
-  </system.diagnostics>
-  <appSettings>
-    <!--<add key="ExecutionThreadApartmentState" value ="MTA"/>-->
-    <!--<add key="TraceLogMaxFileSizeInKb" value ="10240"/>-->
-    <!-- MsTest Adapter Specific AppSettings -->
-    
-    <!-- This flag is added to support test execution for net35 tests through TMI adapter. -->
-    <add key="TestProjectRetargetTo35Allowed" value="true" />
-  </appSettings>
-</configuration>
\ No newline at end of file
diff --git a/src/testhost/app.manifest b/src/testhost/app.manifest
index 161dc3ad9e..06e64089d4 100644
--- a/src/testhost/app.manifest
+++ b/src/testhost/app.manifest
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <!-- Make the application long-path aware (see #5179) -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </windowsSettings>
+  </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
@@ -24,4 +32,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
index 1a4fceea0e..05f048d7a1 100644
--- a/src/testhost/testhost.csproj
+++ b/src/testhost/testhost.csproj
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
   <PropertyGroup>
     <AssemblyName>testhost</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
+    <TargetFrameworks>$(TestHostAllTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsTestProject>false</IsTestProject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'net6.0' ">
-    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x64</RuntimeIdentifier>
+
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
+    <RuntimeIdentifier Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x64</RuntimeIdentifier>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <TargetName Condition="'$(TargetFramework)' != 'net451'">$(AssemblyName).$(TargetFramework)</TargetName>
+    <TargetName Condition="'$(TargetFramework)' != '$(NetFrameworkMinimum)'">$(AssemblyName).$(TargetFramework)</TargetName>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\testhost.x86\DebugAssertException.cs" Link="DebugAssertException.cs" />
     <Compile Include="..\testhost.x86\Program.cs;..\testhost.x86\DefaultEngineInvoker.cs;..\testhost.x86\IEngineInvoker.cs;..\testhost.x86\AppDomainEngineInvoker.cs;..\testhost.x86\Friends.cs;..\testhost.x86\UnitTestClient.cs" />
     <Compile Include="..\testhost.x86\TestHostTraceListener.cs" Link="TestHostTraceListener.cs" />
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Diagnostics.StackTrace" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="4.3.0" />
-    <PackageReference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'netcoreapp1.0'" Version="$(SystemNetHttpVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
@@ -41,13 +41,23 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="netstandard" />
+
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(OS)' != 'Windows_NT' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\testhost.x86\PublicAPI\PublicAPI.Shipped.txt" Link="PublicAPI\PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\testhost.x86\PublicAPI\PublicAPI.Unshipped.txt" Link="PublicAPI\PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\testhost.x86\app.config" Link="app.config" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/vstest.console.arm64/vstest.console.arm64.csproj b/src/vstest.console.arm64/vstest.console.arm64.csproj
new file mode 100644
index 0000000000..dd04b9ba0c
--- /dev/null
+++ b/src/vstest.console.arm64/vstest.console.arm64.csproj
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+  <PropertyGroup>
+    <AssemblyName>vstest.console.arm64</AssemblyName>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <!-- Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1 -->
+    <UseAppHost>false</UseAppHost>
+    <RollForward>Major</RollForward>
+    <IsTestProject>false</IsTestProject>
+    <RuntimeIdentifier Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">win10-arm64</RuntimeIdentifier>
+    <!-- Setting both RuntimeIdentifier and PlatformTarget ends up building as AnyCPU and selecting the default x86 architecture, irregardles of RuntimeIdentifier,
+    so order here matters. -->
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' ">AnyCPU</PlatformTarget>
+    <ApplicationManifest>..\vstest.console\app.manifest</ApplicationManifest>
+    <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommandLine</RootNamespace>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+    <!--
+      Prevents adding a bunch of binding redirects causing exception
+      (e.g. System.Runtime 4.1.2 instead of 4.0.0)
+    -->
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <DefineConstants>$(DefineConstants);USE_EXTERN_ALIAS</DefineConstants>
+
+    <SkipLocalization>true</SkipLocalization>
+
+    <MSBuildWarningsAsMessages>
+      $(MSBuildWarningsAsMessages);MSB3276;
+    </MSBuildWarningsAsMessages>
+  </PropertyGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
+    <Reference Include="System" />
+    <Reference Include="System.IO" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Collections" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" Aliases="Abstraction" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\vstest.console\**\*.cs" Exclude="..\vstest.console\NullableHelpers.cs;..\vstest.console\bin\**\*;..\vstest.console\obj\**\*" />
+    <None Include="..\vstest.console\app.config" />
+    <None Include="$(RepoRoot)src\vstest.console\**\*.xlf" Exclude="..\vstest.console\bin\**\*;..\vstest.console\obj\**\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\vstest.console\NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
+    <Compile Update="$(RepoRoot)src\vstest.console\Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <Link>Resources\Resources.Designer.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(RepoRoot)src\vstest.console\Resources\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Link>Resources\Resources.resx</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\vstest.console\NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\vstest.console\BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="..\vstest.console\PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\vstest.console\PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="..\vstest.console\PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="..\vstest.console\PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+</Project>
diff --git a/src/vstest.console/BannedSymbols.txt b/src/vstest.console/BannedSymbols.txt
new file mode 100644
index 0000000000..9b29bb0a3c
--- /dev/null
+++ b/src/vstest.console/BannedSymbols.txt
@@ -0,0 +1,6 @@
+M:System.Diagnostics.TPDebug.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.TPDebug.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.Contracts.Contract.Assert(System.Boolean); Use 'TPDebug.Assert' instead
+M:System.Diagnostics.Contracts.Contract.Assert(System.Boolean,System.String); Use 'TPDebug.Assert' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
index 2424097983..816855d099 100644
--- a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
+++ b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
@@ -1,297 +1,304 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Runtime.Versioning;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+
+internal class AssemblyMetadataProvider : IAssemblyMetadataProvider
 {
-    using System;
-    using System.IO;
-    using System.Reflection;
-    using System.Reflection.Metadata;
-    using System.Reflection.PortableExecutable;
-    using System.Runtime.Versioning;
-    using System.Text;
-    using ObjectModel;
-    using TestPlatform.Utilities.Helpers;
-    using TestPlatform.Utilities.Helpers.Interfaces;
-
-    internal class AssemblyMetadataProvider : IAssemblyMetadataProvider
-    {
-        private static AssemblyMetadataProvider instance;
-        private IFileHelper fileHelper;
+    private static AssemblyMetadataProvider? s_instance;
+    private readonly IFileHelper _fileHelper;
+
+    /// <summary>
+    /// Gets the instance.
+    /// </summary>
+    public static AssemblyMetadataProvider Instance => s_instance ??= new AssemblyMetadataProvider(new FileHelper());
 
-        /// <summary>
-        /// Gets the instance.
-        /// </summary>
-        public static AssemblyMetadataProvider Instance => instance ?? (instance = new AssemblyMetadataProvider(new FileHelper()));
+    internal AssemblyMetadataProvider(IFileHelper fileHelper)
+    {
+        _fileHelper = fileHelper;
+    }
 
-        internal AssemblyMetadataProvider(IFileHelper fileHelper)
+    /// <inheritdoc />
+    public FrameworkName GetFrameworkName(string filePath)
+    {
+        FrameworkName frameworkName = new(Framework.DefaultFramework.Name);
+        try
         {
-            this.fileHelper = fileHelper;
+            using var assemblyStream = _fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read);
+            frameworkName = GetFrameworkNameFromAssemblyMetadata(assemblyStream);
         }
-
-        /// <inheritdoc />
-        public FrameworkName GetFrameWork(string filePath)
+        catch (Exception ex)
         {
-            FrameworkName frameworkName = new FrameworkName(Framework.DefaultFramework.Name);
-            try
-            {
-                using (var assemblyStream = this.fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read))
-                {
-                    frameworkName = AssemblyMetadataProvider.GetFrameworkNameFromAssemblyMetadata(assemblyStream);
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Warning("AssemblyMetadataProvider.GetFrameWork: failed to determine TargetFrameworkVersion exception: {0} for assembly: {1}", ex, filePath);
-            }
+            EqtTrace.Warning("AssemblyMetadataProvider.GetFrameworkName: failed to determine TargetFrameworkVersion exception: {0} for assembly: {1}", ex, filePath);
+        }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("AssemblyMetadataProvider.GetFrameWork: Determined framework:'{0}' for source: '{1}'", frameworkName, filePath);
-            }
+        EqtTrace.Info("AssemblyMetadataProvider.GetFrameworkName: Determined framework:'{0}' for source: '{1}'", frameworkName, filePath);
 
-            return frameworkName;
-        }
+        return frameworkName;
+    }
 
-        /// <inheritdoc />
-        public Architecture GetArchitecture(string assemblyPath)
+    /// <inheritdoc />
+    public Architecture GetArchitecture(string assemblyPath)
+    {
+        Architecture archType = Architecture.AnyCPU;
+        try
+        {
+            // AssemblyName won't load the assembly into current domain.
+            var assemblyName = AssemblyName.GetAssemblyName(assemblyPath);
+
+            var processorArchitecture =
+#if NET7_0_OR_GREATER
+                // AssemblyName doesn't include ProcessorArchitecture in net7.
+                // It will always be ProcessorArchitecture.None.
+                ProcessorArchitecture.None;
+#else
+                assemblyName.ProcessorArchitecture;
+#endif
+
+            archType = MapToArchitecture(processorArchitecture, assemblyPath);
+        }
+        catch (Exception ex)
         {
-            Architecture archType = Architecture.AnyCPU;
+            // AssemblyName will throw Exception if assembly contains native code or no manifest.
+
+            EqtTrace.Verbose("AssemblyMetadataProvider.GetArchitecture: Failed get ProcessorArchitecture using AssemblyName API with exception: {0}", ex);
+
             try
             {
-                // AssemblyName won't load the assembly into current domain.
-                var assemblyName = AssemblyName.GetAssemblyName(assemblyPath);
-                archType = MapToArchitecture(assemblyName.ProcessorArchitecture, assemblyPath);
+                archType = GetArchitectureForSource(assemblyPath);
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
-                // AssemblyName will throw Exception if assembly contains native code or no manifest.
-
-                if (EqtTrace.IsVerboseEnabled)
-                {
-                    EqtTrace.Verbose("AssemblyMetadataProvider.GetArchitecture: Failed get ProcessorArchitecture using AssemblyName API with exception: {0}", ex);
-                }
-
-                try
-                {
-                    archType = GetArchitectureForSource(assemblyPath);
-                }
-                catch (Exception e)
-                {
-                    if (EqtTrace.IsInfoEnabled)
-                    {
-                        EqtTrace.Info("AssemblyMetadataProvider.GetArchitecture: Failed to determine Assembly Architecture with exception: {0}", e);
-                    }
-                }
+                EqtTrace.Info("AssemblyMetadataProvider.GetArchitecture: Failed to determine Assembly Architecture with exception: {0}", e);
             }
+        }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("AssemblyMetadataProvider.GetArchitecture: Determined architecture:{0} info for assembly: {1}", archType,
-                    assemblyPath);
-            }
+        EqtTrace.Info("AssemblyMetadataProvider.GetArchitecture: Determined architecture:{0} info for assembly: {1}", archType,
+            assemblyPath);
 
-            return archType;
-        }
+        return archType;
+    }
 
-        private Architecture GetArchitectureFromAssemblyMetadata(string path)
+    private Architecture GetArchitectureFromAssemblyMetadata(string path)
+    {
+        Architecture arch = Architecture.AnyCPU;
+        using (Stream stream = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read))
+        using (PEReader peReader = new(stream))
         {
-            Architecture arch = Architecture.AnyCPU;
-            using (Stream stream = this.fileHelper.GetStream(path, FileMode.Open, FileAccess.Read))
-            using (PEReader peReader = new PEReader(stream))
+            switch (peReader.PEHeaders.CoffHeader.Machine)
             {
-                switch (peReader.PEHeaders.CoffHeader.Machine)
-                {
-                    case Machine.Amd64:
-                        return Architecture.X64;
-                    case Machine.IA64:
-                        return Architecture.X64;
-                    case Machine.Arm64:
-                        return Architecture.ARM64;
-                    case Machine.Arm:
-                        return Architecture.ARM;
-                    case Machine.I386:
-                        return Architecture.X86;
-                    default:
+                case Machine.Amd64:
+                case Machine.IA64:
+                    return Architecture.X64;
+                case Machine.Arm64:
+                    return Architecture.ARM64;
+                case Machine.Arm:
+                    return Architecture.ARM;
+                case Machine.I386:
+                    // We can distinguish AnyCPU only from the set of CorFlags.Requires32Bit, but in case of Ready
+                    // to Run image that flag is not "updated" and ignored. So we check if the module is IL only or not.
+                    // If it's not IL only it means that is a R2R (Ready to Run) and we're already in the correct architecture x86.
+                    // In all other cases the architecture will end inside the correct switch branch.
+                    var corflags = peReader.PEHeaders.CorHeader?.Flags;
+                    return (corflags & CorFlags.Requires32Bit) != 0 || (corflags & CorFlags.ILOnly) == 0
+                        ? Architecture.X86 : Architecture.AnyCPU;
+                default:
+                    {
+                        EqtTrace.Error($"AssemblyMetadataProvider.GetArchitecture: Unhandled architecture '{peReader.PEHeaders.CoffHeader.Machine}'.");
                         break;
-                }
+                    }
             }
-
-            return arch;
         }
 
-        private static FrameworkName GetFrameworkNameFromAssemblyMetadata(Stream assemblyStream)
+        return arch;
+    }
+
+    private static FrameworkName GetFrameworkNameFromAssemblyMetadata(Stream assemblyStream)
+    {
+        FrameworkName frameworkName = new(Framework.DefaultFramework.Name);
+        using (var peReader = new PEReader(assemblyStream))
         {
-            FrameworkName frameworkName = new FrameworkName(Framework.DefaultFramework.Name);
-            using (var peReader = new PEReader(assemblyStream))
-            {
-                var metadataReader = peReader.GetMetadataReader();
+            var metadataReader = peReader.GetMetadataReader();
 
-                foreach (var customAttributeHandle in metadataReader.CustomAttributes)
+            foreach (var customAttributeHandle in metadataReader.CustomAttributes)
+            {
+                var attr = metadataReader.GetCustomAttribute(customAttributeHandle);
+                var result = Encoding.UTF8.GetString(metadataReader.GetBlobBytes(attr.Value));
+                if (result.Contains(".NET") && result.Contains(",Version="))
                 {
-                    var attr = metadataReader.GetCustomAttribute(customAttributeHandle);
-                    var result = Encoding.UTF8.GetString(metadataReader.GetBlobBytes(attr.Value));
-                    if (result.Contains(".NET") && result.Contains(",Version="))
+                    var fxStartIndex = result.IndexOf(".NET", StringComparison.Ordinal);
+                    var fxEndIndex = result.IndexOf("\u0001", fxStartIndex, StringComparison.Ordinal);
+                    if (fxStartIndex > -1 && fxEndIndex > fxStartIndex)
                     {
-                        var fxStartIndex = result.IndexOf(".NET", StringComparison.Ordinal);
-                        var fxEndIndex = result.IndexOf("\u0001", fxStartIndex, StringComparison.Ordinal);
-                        if (fxStartIndex > -1 && fxEndIndex > fxStartIndex)
-                        {
-                            // Using -3 because custom attribute values separated by unicode characters.
-                            result = result.Substring(fxStartIndex, fxEndIndex - 3);
-                            frameworkName = new FrameworkName(result);
-                            break;
-                        }
+                        // Using -3 because custom attribute values separated by unicode characters.
+                        result = result.Substring(fxStartIndex, fxEndIndex - 3);
+                        frameworkName = new FrameworkName(result);
+                        break;
                     }
                 }
             }
-
-            return frameworkName;
         }
 
-        private Architecture MapToArchitecture(ProcessorArchitecture processorArchitecture, string assemblyPath)
-        {
-            Architecture arch = Architecture.AnyCPU;
-            // Mapping to Architecture based on https://msdn.microsoft.com/en-us/library/system.reflection.processorarchitecture(v=vs.110).aspx
+        return frameworkName;
+    }
 
-            if (processorArchitecture.Equals(ProcessorArchitecture.Amd64)
-                || processorArchitecture.Equals(ProcessorArchitecture.IA64))
-            {
-                arch = Architecture.X64;
-            }
-            else if (processorArchitecture.Equals(ProcessorArchitecture.X86))
-            {
-                arch = Architecture.X86;
-            }
-            else if (processorArchitecture.Equals(ProcessorArchitecture.MSIL))
-            {
-                arch = Architecture.AnyCPU;
-            }
-            else if (processorArchitecture.Equals(ProcessorArchitecture.Arm))
-            {
-                arch = Architecture.ARM;
-            }
-            else if (processorArchitecture.Equals(ProcessorArchitecture.None))
-            {
-                // In case of None we fallback to PEReader
-                // We don't use only PEReader for back compatibility.
-                // An AnyCPU returned by AssemblyName.GetAssemblyName(assemblyPath) will result in a I386 for PEReader.
-                // Also MSIL processor architecture is missing with PEReader.
-                // For now it should fix the issue for the missing ARM64 architecture.
-                arch = GetArchitectureFromAssemblyMetadata(assemblyPath);
-            }
-            else
-            {
-                EqtTrace.Info("Unable to map to Architecture, using platform: {0}", arch);
-            }
+    private Architecture MapToArchitecture(ProcessorArchitecture processorArchitecture, string assemblyPath)
+    {
+        Architecture arch = Architecture.AnyCPU;
+        // Mapping to Architecture based on https://msdn.microsoft.com/en-us/library/system.reflection.processorarchitecture(v=vs.110).aspx
 
-            return arch;
+        if (processorArchitecture.Equals(ProcessorArchitecture.Amd64)
+            || processorArchitecture.Equals(ProcessorArchitecture.IA64))
+        {
+            arch = Architecture.X64;
         }
-
-        public Architecture GetArchitectureForSource(string imagePath)
+        else if (processorArchitecture.Equals(ProcessorArchitecture.X86))
+        {
+            arch = Architecture.X86;
+        }
+        else if (processorArchitecture.Equals(ProcessorArchitecture.MSIL))
+        {
+            arch = Architecture.AnyCPU;
+        }
+        else if (processorArchitecture.Equals(ProcessorArchitecture.Arm))
+        {
+            arch = Architecture.ARM;
+        }
+        else if (processorArchitecture.Equals(ProcessorArchitecture.None))
         {
-            // For details refer to below code available on MSDN.
-            //https://code.msdn.microsoft.com/windowsapps/CSCheckExeType-aab06100#content
+            // In case of None we fallback to PEReader
+            // We don't use only PEReader for back compatibility.
+            // An AnyCPU returned by AssemblyName.GetAssemblyName(assemblyPath) will result in a I386 for PEReader.
+            // Also MSIL processor architecture is missing with PEReader.
+            // For now it should fix the issue for the missing ARM64 architecture.
+            arch = GetArchitectureFromAssemblyMetadata(assemblyPath);
+        }
+        else
+        {
+            EqtTrace.Info("Unable to map to Architecture, using platform: {0}", arch);
+        }
 
-            var archType = Architecture.AnyCPU;
-            ushort machine = 0;
+        return arch;
+    }
 
-            uint peHeader;
-            const int IMAGE_FILE_MACHINE_AMD64 = 0x8664;
-            const int IMAGE_FILE_MACHINE_IA64 = 0x200;
-            const int IMAGE_FILE_MACHINE_I386 = 0x14c;
-            const int IMAGE_FILE_MACHINE_ARM = 0x01c0; // ARM Little-Endian
-            const int IMAGE_FILE_MACHINE_THUMB = 0x01c2; // ARM Thumb/Thumb-2 Little-Endian
-            const int IMAGE_FILE_MACHINE_ARMNT = 0x01c4; // ARM Thumb-2 Little-Endian
+    public Architecture GetArchitectureForSource(string imagePath)
+    {
+        // For details refer to below code available on MSDN.
+        //https://code.msdn.microsoft.com/windowsapps/CSCheckExeType-aab06100#content
+
+        var archType = Architecture.AnyCPU;
+        ushort machine = 0;
+
+        uint peHeader;
+        const int imageFileMachineAmd64 = 0x8664;
+        const int imageFileMachineIa64 = 0x200;
+        const int imageFileMachineI386 = 0x14c;
+        const int imageFileMachineArm = 0x01c0; // ARM Little-Endian
+        const int imageFileMachineThumb = 0x01c2; // ARM Thumb/Thumb-2 Little-Endian
+        const int imageFileMachineArmnt = 0x01c4; // ARM Thumb-2 Little-Endian
+        const int imageFileMachineArm64 = 0xAA64; // ARM64 Little-Endian
+
+        try
+        {
+            //get the input stream
+            using Stream fs = _fileHelper.GetStream(imagePath, FileMode.Open, FileAccess.Read);
+            using var reader = new BinaryReader(fs);
+            var validImage = true;
 
+            //PE Header starts @ 0x3C (60). Its a 4 byte header.
+            fs.Position = 0x3C;
+            peHeader = reader.ReadUInt32();
 
-            try
+            // Check if the offset is invalid
+            if (peHeader > fs.Length - 5)
             {
-                //get the input stream
-                using (Stream fs = this.fileHelper.GetStream(imagePath, FileMode.Open, FileAccess.Read))
-                using (var reader = new BinaryReader(fs))
-                {
-                    var validImage = true;
+                validImage = false;
+            }
+
+            if (validImage)
+            {
+                //Moving to PE Header start location...
+                fs.Position = peHeader;
 
-                    //PE Header starts @ 0x3C (60). Its a 4 byte header.
-                    fs.Position = 0x3C;
-                    peHeader = reader.ReadUInt32();
+                var signature = reader.ReadUInt32(); //peHeaderSignature
+                // 0x00004550 is the letters "PE" followed by two terminating zeros.
+                if (signature != 0x00004550)
+                {
+                    validImage = false;
+                }
 
-                    // Check if the offset is invalid
-                    if (peHeader > fs.Length - 5)
+                if (validImage)
+                {
+                    //Read the image file header.
+                    machine = reader.ReadUInt16();
+                    reader.ReadUInt16(); //NumberOfSections
+                    reader.ReadUInt32(); //TimeDateStamp
+                    reader.ReadUInt32(); //PointerToSymbolTable
+                    reader.ReadUInt32(); //NumberOfSymbols
+                    reader.ReadUInt16(); //SizeOfOptionalHeader
+                    reader.ReadUInt16(); //Characteristics
+
+                    // magic number.32bit or 64bit assembly.
+                    var magic = reader.ReadUInt16();
+                    if (magic is not 0x010B and not 0x020B)
                     {
                         validImage = false;
                     }
+                }
 
-                    if (validImage)
+                if (validImage)
+                {
+                    switch (machine)
                     {
-                        //Moving to PE Header start location...
-                        fs.Position = peHeader;
-
-                        var signature = reader.ReadUInt32(); //peHeaderSignature
-                        // 0x00004550 is the letters "PE" followed by two terminating zeros.
-                        if (signature != 0x00004550)
-                        {
-                            validImage = false;
-                        }
-
-                        if (validImage)
-                        {
-                            //Read the image file header.
-                            machine = reader.ReadUInt16();
-                            reader.ReadUInt16(); //NumberOfSections
-                            reader.ReadUInt32(); //TimeDateStamp
-                            reader.ReadUInt32(); //PointerToSymbolTable
-                            reader.ReadUInt32(); //NumberOfSymbols
-                            reader.ReadUInt16(); //SizeOfOptionalHeader
-                            reader.ReadUInt16(); //Characteristics
-
-                            // magic number.32bit or 64bit assembly.
-                            var magic = reader.ReadUInt16();
-                            if (magic != 0x010B && magic != 0x020B)
-                            {
-                                validImage = false;
-                            }
-                        }
-
-                        if (validImage)
-                        {
-                            switch (machine)
-                            {
-                                case IMAGE_FILE_MACHINE_I386:
-                                    archType = Architecture.X86;
-                                    break;
-
-                                case IMAGE_FILE_MACHINE_AMD64:
-                                case IMAGE_FILE_MACHINE_IA64:
-                                    archType = Architecture.X64;
-                                    break;
-
-                                case IMAGE_FILE_MACHINE_ARM:
-                                case IMAGE_FILE_MACHINE_THUMB:
-                                case IMAGE_FILE_MACHINE_ARMNT:
-                                    archType = Architecture.ARM;
-                                    break;
-                            }
-                        }
-                        else
-                        {
-                            EqtTrace.Info(
-                                "GetArchitectureForSource: Source path {0} is not a valid image path. Returning default proc arch type: {1}.",
-                                imagePath, archType);
-                        }
+                        case imageFileMachineI386:
+                            archType = Architecture.X86;
+                            break;
+
+                        case imageFileMachineAmd64:
+                        case imageFileMachineIa64:
+                            archType = Architecture.X64;
+                            break;
+
+                        case imageFileMachineArm:
+                        case imageFileMachineThumb:
+                        case imageFileMachineArmnt:
+                            archType = Architecture.ARM;
+                            break;
+
+                        case imageFileMachineArm64:
+                            archType = Architecture.ARM64;
+                            break;
                     }
                 }
+                else
+                {
+                    EqtTrace.Info(
+                        "GetArchitectureForSource: Source path {0} is not a valid image path. Returning default proc arch type: {1}.",
+                        imagePath, archType);
+                }
             }
-            catch (Exception ex)
-            {
-                //Ignore all exception
-                EqtTrace.Info(
-                    "GetArchitectureForSource: Returning default:{0}. Unhandled exception: {1}.",
-                    archType, ex);
-            }
-
-            return archType;
         }
+        catch (Exception ex)
+        {
+            //Ignore all exception
+            EqtTrace.Info(
+                "GetArchitectureForSource: Returning default:{0}. Unhandled exception: {1}.",
+                archType, ex);
+        }
+
+        return archType;
     }
 }
diff --git a/src/vstest.console/CommandLine/CommandArgumentPair.cs b/src/vstest.console/CommandLine/CommandArgumentPair.cs
index aa8f8bfb19..428198b121 100644
--- a/src/vstest.console/CommandLine/CommandArgumentPair.cs
+++ b/src/vstest.console/CommandLine/CommandArgumentPair.cs
@@ -1,109 +1,80 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
-{
-    using System;
-    using System.Diagnostics.Contracts;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
 
+/// <summary>
+/// Breaks a string down into command and argument based on the following format:
+///     /command:argument.
+/// </summary>
+internal class CommandArgumentPair
+{
     /// <summary>
-    /// Breaks a string down into command and argument based on the following format:
-    ///     /command:argument.
+    /// The separator.
     /// </summary>
-    internal class CommandArgumentPair
-    {
-        #region Constants
-
-        /// <summary>
-        /// The separator.
-        /// </summary>
-        internal const string Separator = ":";
+    internal const string Separator = ":";
 
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The command portion of the input.
-        /// </summary>
-        public string Command { get; private set; }
+    /// <summary>
+    /// The command portion of the input.
+    /// </summary>
+    public string Command { get; private set; }
 
-        /// <summary>
-        /// The argument portion of the input.
-        /// </summary>
-        public string Argument { get; private set; }
+    /// <summary>
+    /// The argument portion of the input.
+    /// </summary>
+    public string Argument { get; private set; }
 
-        #endregion
+    /// <summary>
+    /// Breaks the provided command line switch into the command and argument pair.
+    /// </summary>
+    /// <param name="input">Input to break up.</param>
+    public CommandArgumentPair(string input)
+    {
+        ValidateArg.NotNullOrWhiteSpace(input, nameof(input));
+        Parse(input);
+    }
 
-        #region Constructor
+    /// <summary>
+    /// Stores the provided command and argument pair.
+    /// </summary>
+    /// <param name="command">The command portion of the input.</param>
+    /// <param name="argument">The argument portion of the input.</param>
+    public CommandArgumentPair(string command, string argument)
+    {
+        ValidateArg.NotNullOrWhiteSpace(command, nameof(command));
+        Command = command;
+        Argument = argument;
+    }
 
-        /// <summary>
-        /// Breaks the provided command line switch into the command and argument pair.
-        /// </summary>
-        /// <param name="input">Input to break up.</param>
-        public CommandArgumentPair(string input)
-        {
-            if (String.IsNullOrWhiteSpace(input))
-            {
-                throw new ArgumentException(CommandLineResources.CannotBeNullOrEmpty, nameof(input));
-            }
-            Contract.Ensures(!String.IsNullOrWhiteSpace(Command));
+    /// <summary>
+    /// Parses the input into the command and argument parts.
+    /// </summary>
+    /// <param name="input">Input string to parse.</param>
+    [MemberNotNull(nameof(Command), nameof(Argument))]
+    private void Parse(string input)
+    {
+        ValidateArg.NotNull(input, nameof(input));
 
-            this.Parse(input);
-        }
+        // Find the index of the separator (":")
+        int index = input.IndexOf(Separator, StringComparison.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// Stores the provided command and argument pair.
-        /// </summary>
-        /// <param name="command">The command portion of the input.</param>
-        /// <param name="argument">The argument portion of the input.</param>
-        public CommandArgumentPair(string command, string argument)
+        if (index == -1)
         {
-            if (String.IsNullOrWhiteSpace(command))
-            {
-                throw new ArgumentException(CommandLineResources.CannotBeNullOrEmpty, nameof(command));
-            }
-
-            Contract.Ensures(Command == command);
-            Contract.Ensures(Argument == argument);
-
-            this.Command = command;
-            this.Argument = argument;
+            // No separator was found, so use the input as the command.
+            Command = input;
+            Argument = string.Empty;
         }
-
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Parses the input into the command and argument parts.
-        /// </summary>
-        /// <param name="input">Input string to parse.</param>
-        private void Parse(string input)
+        else
         {
-            Contract.Requires(!String.IsNullOrWhiteSpace(input));
-            Contract.Ensures(!String.IsNullOrWhiteSpace(Command));
-            Contract.Ensures(Argument != null);
-
-            // Find the index of the separator (":")
-            int index = input.IndexOf(CommandArgumentPair.Separator, StringComparison.OrdinalIgnoreCase);
-
-            if (index == -1)
-            {
-                // No separator was found, so use the input as the command.
-                this.Command = input;
-                this.Argument = String.Empty;
-            }
-            else
-            {
-                // Separator was found, so separate the command and the input.
-                this.Command = input.Substring(0, index);
-                this.Argument = input.Substring(index + 1);
-            }
+            // Separator was found, so separate the command and the input.
+            Command = input.Substring(0, index);
+            Argument = input.Substring(index + 1);
         }
-
-#endregion
     }
+
 }
diff --git a/src/vstest.console/CommandLine/CommandLineException.cs b/src/vstest.console/CommandLine/CommandLineException.cs
index 4defc252ba..f41e285fca 100644
--- a/src/vstest.console/CommandLine/CommandLineException.cs
+++ b/src/vstest.console/CommandLine/CommandLineException.cs
@@ -1,44 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
 
+/// <summary>
+/// Exception thrown by argument processors when they encounter an error with
+/// the command line arguments.
+/// </summary>
+public class CommandLineException : Exception
+{
     /// <summary>
-    /// Exception thrown by argument processors when they encounter an error with
-    /// the command line arguments.
+    /// Creates a new CommandLineException
     /// </summary>
-    public class CommandLineException : Exception
+    public CommandLineException()
     {
-        #region Constructors
-
-        /// <summary>
-        /// Creates a new CommandLineException
-        /// </summary>
-        public CommandLineException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public CommandLineException(string message)
-            : base(message)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes with message and inner exception.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The inner exception.</param>
-        public CommandLineException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public CommandLineException(string? message)
+        : base(message)
+    {
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes with message and inner exception.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The inner exception.</param>
+    public CommandLineException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
+
 }
diff --git a/src/vstest.console/CommandLine/CommandLineOptions.cs b/src/vstest.console/CommandLine/CommandLineOptions.cs
index 4edd13929b..a6ea07be1f 100644
--- a/src/vstest.console/CommandLine/CommandLineOptions.cs
+++ b/src/vstest.console/CommandLine/CommandLineOptions.cs
@@ -1,321 +1,303 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using vstest.console.Internal;
 
-    using Utilities.Helpers;
-    using Utilities.Helpers.Interfaces;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-    using vstest.console.Internal;
-    using System.Globalization;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
 
+/// <summary>
+/// Provides access to the command-line options.
+/// </summary>
+internal class CommandLineOptions
+{
     /// <summary>
-    /// Provides access to the command-line options.
+    /// The default batch size for Run.
     /// </summary>
-    internal class CommandLineOptions
-    {
-        #region Constants/Readonly
+    public const long DefaultRunBatchSize = 10;
 
-        /// <summary>
-        /// The default batch size.
-        /// </summary>
-        public const long DefaultBatchSize = 10;
+    /// <summary>
+    /// The default batch size for Discovery.
+    /// </summary>
+    public const long DefaultDiscoveryBatchSize = 1000;
 
-        /// <summary>
-        /// The use vsix extensions key.
-        /// </summary>
-        public const string UseVsixExtensionsKey = "UseVsixExtensions";
+    /// <summary>
+    /// The use vsix extensions key.
+    /// </summary>
+    public const string UseVsixExtensionsKey = "UseVsixExtensions";
 
-        /// <summary>
-        /// The default use vsix extensions value.
-        /// </summary>
-        public const bool DefaultUseVsixExtensionsValue = false;
+    /// <summary>
+    /// The default retrieval timeout for fetching of test results or test cases
+    /// </summary>
+    private readonly TimeSpan _defaultRetrievalTimeout = new(0, 0, 0, 1, 500);
 
-        /// <summary>
-        /// The default retrieval timeout for fetching of test results or test cases
-        /// </summary>
-        private readonly TimeSpan DefaultRetrievalTimeout = new TimeSpan(0, 0, 0, 1, 500);
+    private static CommandLineOptions? s_instance;
 
-        #endregion
+    private List<string> _sources = new();
 
-        #region PrivateMembers
+    private Architecture _architecture;
 
-        private static CommandLineOptions instance;
+    private Framework? _frameworkVersion;
 
-        private List<string> sources = new List<string>();
+    /// <summary>
+    /// Gets the instance.
+    /// </summary>
+    internal static CommandLineOptions Instance
+        => s_instance ??= new CommandLineOptions();
 
-        private Architecture architecture;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    internal CommandLineOptions()
+    {
+        BatchSize = DefaultRunBatchSize;
+        TestStatsEventTimeout = _defaultRetrievalTimeout;
+        FileHelper = new FileHelper();
+        FilePatternParser = new FilePatternParser();
+#if TODO
+        UseVsixExtensions = Utilities.GetAppSettingValue(UseVsixExtensionsKey, false);
+#endif
+    }
 
-        private Framework frameworkVersion;
+    /// <summary>
+    /// Specifies whether parallel execution is on or off.
+    /// </summary>
+    public bool Parallel { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Specifies whether InIsolation is on or off.
+    /// </summary>
+    public bool InIsolation { get; set; }
 
-        /// <summary>
-        /// Gets the instance.
-        /// </summary>
-        internal static CommandLineOptions Instance
+    /// <summary>
+    /// Read only collection of all available test sources
+    /// </summary>
+    public IEnumerable<string> Sources
+    {
+        get
         {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new CommandLineOptions();
-                }
-
-                return instance;
-            }
+            return _sources.AsReadOnly();
         }
+    }
 
-        #region Constructor
+    /// <summary>
+    /// Specifies whether dynamic code coverage diagnostic data adapter needs to be configured.
+    /// </summary>
+    public bool EnableCodeCoverage { get; set; }
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        protected CommandLineOptions()
-        {
-            this.BatchSize = DefaultBatchSize;
-            this.TestStatsEventTimeout = this.DefaultRetrievalTimeout;
-            this.FileHelper = new FileHelper();
-            this.FilePatternParser = new FilePatternParser();
-#if TODO
-            UseVsixExtensions = Utilities.GetAppSettingValue(UseVsixExtensionsKey, false);
-#endif
-        }
+    /// <summary>
+    /// Specifies whether the Fakes automatic configuration should be disabled.
+    /// </summary>
+    public bool DisableAutoFakes { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Specifies whether vsixExtensions is enabled or not.
+    /// </summary>
+    public bool UseVsixExtensions { get; set; }
 
-        #region Properties
+    /// <summary>
+    /// Path to the custom test adapters.
+    /// </summary>
+    public string[]? TestAdapterPath { get; set; }
 
-        /// <summary>
-        /// Specifies whether parallel execution is on or off.
-        /// </summary>
-        public bool Parallel { get; set; }
+    /// <summary>
+    /// Test adapter loading strategy.
+    /// </summary>
+    public TestAdapterLoadingStrategy TestAdapterLoadingStrategy { get; set; }
 
-        /// <summary>
-        /// Specifies whether InIsolation is on or off.
-        /// </summary>
-        public bool InIsolation { get; set; }
+    /// <summary>
+    /// Process Id of the process which launched vstest runner
+    /// </summary>
+    public int ParentProcessId { get; set; }
 
-        /// <summary>
-        /// Read only collection of all available test sources
-        /// </summary>
-        public IEnumerable<string> Sources
-        {
-            get
-            {
-                return this.sources.AsReadOnly();
-            }
-        }
+    /// <summary>
+    /// Port IDE process is listening to
+    /// </summary>
+    public int Port { get; set; }
 
-        /// <summary>
-        /// Specifies whether dynamic code coverage diagnostic data adapter needs to be configured.
-        /// </summary>
-        public bool EnableCodeCoverage { get; set; }
-
-        /// <summary>
-        /// Specifies whether the Fakes automatic configuration should be disabled.
-        /// </summary>
-        public bool DisableAutoFakes { get; set; } = false;
-
-        /// <summary>
-        /// Specifies whether vsixExtensions is enabled or not.
-        /// </summary>
-        public bool UseVsixExtensions { get; set; }
-
-        /// <summary>
-        /// Path to the custom test adapters.
-        /// </summary>
-        public string TestAdapterPath { get; set; }
-
-        /// <summary>
-        /// Process Id of the process which launched vstest runner
-        /// </summary>
-        public int ParentProcessId { get; set; }
-
-        /// <summary>
-        /// Port IDE process is listening to
-        /// </summary>
-        public int Port { get; set; }
-
-        /// <summary>
-        /// Configuration the project is built for e.g. Debug/Release
-        /// </summary>
-        public string Configuration { get; set; }
-
-        /// <summary>
-        /// Directory containing the temporary outputs
-        /// </summary>
-        public string BuildBasePath { get; set; }
-
-        /// <summary>
-        /// Directory containing the binaries to run
-        /// </summary>
-        public string Output { get; set; }
-
-        /// <summary>
-        /// Specifies the frequency of the runStats/discoveredTests event
-        /// </summary>
-        public long BatchSize { get; set; }
-
-        /// <summary>
-        /// Specifies the timeout of the test stats cache timeout event
-        /// </summary>
-        public TimeSpan TestStatsEventTimeout { get; set; }
-
-        /// <summary>
-        /// Test case filter value for run with sources.
-        /// </summary>
-        public string TestCaseFilterValue { get; set; }
-
-        /// <summary>
-        /// Target Path used by ListFullyQualifiedTests option
-        /// </summary>
-        public string ListTestsTargetPath { get; set; }
-
-        /// <summary>
-        /// Specifies the Target Device
-        /// </summary>
-        public string TargetDevice { get; set; }
-
-        /// <summary>
-        /// Specifies whether the target device has a Windows Phone context or not
-        /// </summary>
-        public bool HasPhoneContext
-        {
-            get
-            {
-                return !string.IsNullOrEmpty(TargetDevice);
-            }
-        }
+    /// <summary>
+    /// Configuration the project is built for e.g. Debug/Release
+    /// </summary>
+    public string? Configuration { get; set; }
+
+    /// <summary>
+    /// Directory containing the temporary outputs
+    /// </summary>
+    public string? BuildBasePath { get; set; }
+
+    /// <summary>
+    /// Directory containing the binaries to run
+    /// </summary>
+    public string? Output { get; set; }
+
+    /// <summary>
+    /// Specifies the frequency of the runStats/discoveredTests event
+    /// </summary>
+    public long BatchSize { get; set; }
 
-        /// <summary>
-        /// Specifies the target platform type for test run.
-        /// </summary>
-        public Architecture TargetArchitecture
+    /// <summary>
+    /// Specifies the timeout of the test stats cache timeout event
+    /// </summary>
+    public TimeSpan TestStatsEventTimeout { get; set; }
+
+    /// <summary>
+    /// Test case filter value for run with sources.
+    /// </summary>
+    public string? TestCaseFilterValue { get; set; }
+
+    /// <summary>
+    /// Target Path used by ListFullyQualifiedTests option
+    /// </summary>
+    public string? ListTestsTargetPath { get; set; }
+
+    /// <summary>
+    /// Specifies the Target Device
+    /// </summary>
+    public string? TargetDevice { get; set; }
+
+    /// <summary>
+    /// Specifies whether the target device has a Windows Phone context or not
+    /// </summary>
+    public bool HasPhoneContext => !TargetDevice.IsNullOrEmpty();
+
+    public bool TestAdapterPathsSet => (TestAdapterPath?.Length ?? 0) != 0;
+
+    /// <summary>
+    /// Specifies the target platform type for test run.
+    /// </summary>
+    public Architecture TargetArchitecture
+    {
+        get
         {
-            get
-            {
-                return this.architecture;
-            }
-            set
-            {
-                this.architecture = value;
-                this.ArchitectureSpecified = true;
-            }
+            return _architecture;
         }
-
-        /// <summary>
-        /// True indicates the test run is started from an Editor or IDE.
-        /// Defaults to false.
-        /// </summary>
-        public bool IsDesignMode
+        set
         {
-            get;
-            set;
+            _architecture = value;
+            ArchitectureSpecified = true;
         }
+    }
 
-        /// <summary>
-        /// If not already set from IDE in the runSettings, ShouldCollectSourceInformation defaults to IsDesignMode value
-        /// </summary>
-        public bool ShouldCollectSourceInformation
+    /// <summary>
+    /// True indicates the test run is started from an Editor or IDE.
+    /// Defaults to false.
+    /// </summary>
+    public bool IsDesignMode
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// If not already set from IDE in the runSettings, ShouldCollectSourceInformation defaults to IsDesignMode value
+    /// </summary>
+    public bool ShouldCollectSourceInformation
+    {
+        get
         {
-            get
-            {
-                return IsDesignMode;
-            }
+            return IsDesignMode;
         }
+    }
 
-        /// <summary>
-        /// Specifies if /Platform has been specified on command line or not.
-        /// </summary>
-        internal bool ArchitectureSpecified { get; private set; }
+    /// <summary>
+    /// Specifies if /Platform has been specified on command line or not.
+    /// </summary>
+    internal bool ArchitectureSpecified { get; private set; }
 
-        internal IFileHelper FileHelper { get; set; }
+    internal IFileHelper FileHelper { get; set; }
 
-        internal FilePatternParser FilePatternParser { get; set; }
+    internal FilePatternParser FilePatternParser { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target Framework version for test run.
-        /// </summary>
-        internal Framework TargetFrameworkVersion
+    /// <summary>
+    /// Gets or sets the target Framework version for test run.
+    /// </summary>
+    internal Framework? TargetFrameworkVersion
+    {
+        get
+        {
+            return _frameworkVersion;
+        }
+        set
         {
-            get
-            {
-                return this.frameworkVersion;
-            }
-            set
-            {
-                this.frameworkVersion = value;
-                this.FrameworkVersionSpecified = true;
-            }
+            _frameworkVersion = value;
+            FrameworkVersionSpecified = true;
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether /Framework has been specified on command line or not.
-        /// </summary>
-        internal bool FrameworkVersionSpecified { get; private set; }
+    /// <summary>
+    /// Gets a value indicating whether /Framework has been specified on command line or not.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(TargetFrameworkVersion))]
+    internal bool FrameworkVersionSpecified { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the results directory for test run.
-        /// </summary>
-        internal string ResultsDirectory { get; set; }
+    /// <summary>
+    /// Gets or sets the results directory for test run.
+    /// </summary>
+    internal string? ResultsDirectory { get; set; }
 
-        /// <summary>
-        /// Gets or sets the /setting switch value. i.e path to settings file.
-        /// </summary>
-        internal string SettingsFile { get; set; }
+    /// <summary>
+    /// Gets or sets the /setting switch value. i.e path to settings file.
+    /// </summary>
+    internal string? SettingsFile { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the /ArtifactsProcessingMode value.
+    /// </summary>
+    internal ArtifactProcessingMode ArtifactProcessingMode { get; set; }
 
-        #region Public Methods
+    /// <summary>
+    /// Gets or sets the /TestSessionCorrelationId value.
+    /// </summary>
+    internal string? TestSessionCorrelationId { get; set; }
 
-        /// <summary>
-        /// Adds a source file to look for tests in.
-        /// </summary>
-        /// <param name="source">Path to source file to look for tests in.</param>
-        public void AddSource(string source)
+    /// <summary>
+    /// Adds a source file to look for tests in.
+    /// </summary>
+    /// <param name="source">Path to source file to look for tests in.</param>
+    public void AddSource(string source)
+    {
+        if (source.IsNullOrWhiteSpace())
         {
-            if (String.IsNullOrWhiteSpace(source))
-            {
-                throw new TestSourceException(CommandLineResources.CannotBeNullOrEmpty);
-            }
-
-            source = source.Trim();
-
-            List<string> matchingFiles;
-            try
-            {
-                // Get matching files from file pattern parser
-                matchingFiles = FilePatternParser.GetMatchingFiles(source);
-            }
-            catch(TestSourceException ex) when (source.StartsWith("-") || source.StartsWith("/"))
-            {
-                throw new TestSourceException(
-                    string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidArgument, source), ex);
-            }
-            // Add the matching files to source list
-            this.sources = this.sources.Union(matchingFiles).ToList();
+            throw new TestSourceException(CommandLineResources.CannotBeNullOrEmpty);
         }
 
-        #endregion
-
-        #region Internal Methods
+        source = source.Trim();
 
-        /// <summary>
-        /// Resets the options. Clears the sources.
-        /// </summary>
-        internal void Reset()
+        List<string> matchingFiles;
+        try
         {
-            instance = null;
+            // Get matching files from file pattern parser
+            matchingFiles = FilePatternParser.GetMatchingFiles(source);
         }
+        catch (TestSourceException ex) when (source.StartsWith("-") || source.StartsWith("/"))
+        {
+            throw new TestSourceException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidArgument, source), ex);
+        }
+        // Add the matching files to source list
+        var filteredFiles = KnownPlatformSourceFilter.FilterKnownPlatformSources(matchingFiles);
+        _sources = _sources.Union(filteredFiles).ToList();
+    }
 
-        #endregion
+    /// <summary>
+    /// Resets the options. Clears the sources.
+    /// </summary>
+    internal static void Reset()
+    {
+        s_instance = null;
     }
+
 }
diff --git a/src/vstest.console/CommandLine/Executor.cs b/src/vstest.console/CommandLine/Executor.cs
index 4357c0af3a..a153dd4957 100644
--- a/src/vstest.console/CommandLine/Executor.cs
+++ b/src/vstest.console/CommandLine/Executor.cs
@@ -1,6 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+extern alias Abstraction;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
 // General Flow:
 // Create a command processor for each argument.
 //   If there is no matching command processor for an argument, output error, display help and exit.
@@ -21,334 +48,255 @@
 //   Required
 //   Single or multiple
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+/// <summary>
+/// Performs the execution based on the arguments provided.
+/// </summary>
+internal class Executor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    private const string NonARM64RunnerName = "vstest.console.exe";
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IProcessHelper _processHelper;
+    private readonly IEnvironment _environment;
+    private bool _showHelp;
 
     /// <summary>
-    /// Performs the execution based on the arguments provided.
+    /// Default constructor.
     /// </summary>
-    internal class Executor
+    public Executor(IOutput output) : this(output, TestPlatformEventSource.Instance, new ProcessHelper(), new PlatformEnvironment())
     {
-        private ITestPlatformEventSource testPlatformEventSource;
-        private bool showHelp;
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public Executor(IOutput output) : this(output, TestPlatformEventSource.Instance)
-        {
-        }
-
-        internal Executor(IOutput output, ITestPlatformEventSource testPlatformEventSource)
+        if (!FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_THREADPOOL_SIZE_INCREASE))
         {
-            this.Output = output;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.showHelp = true;
+            // TODO: Get rid of this by making vstest.console code properly async.
+            // The current implementation of vstest.console is blocking many threads that just wait
+            // for completion in non-async way. Because threadpool is setting the limit based on processor count,
+            // we exhaust the threadpool threads quickly when we set maxCpuCount to use as many workers as we have threads.
+            //
+            // This setting allow the threadpool to start start more threads than it normally would without any delay.
+            // This won't pre-start the threads, it just pushes the limit of how many are allowed to start without waiting,
+            // and in effect makes callbacks processed earlier, because we don't have to wait that much to receive the callback.
+            // The correct fix would be to re-visit all code that offloads work to threadpool and avoid blocking any thread,
+            // and also use async await when we need to await a completion of an action. But that is a far away goal, so this
+            // is a "temporary" measure to remove the threadpool contention.
+            //
+            // The increase to 5* (1* is the standard + 4*) the standard limit is arbitrary. I saw that making it 2* did not help
+            // and there are usually 2-3 threads blocked by waiting for other actions, so 5 seemed like a good limit.
+            var additionalThreadsCount = Environment.ProcessorCount * 4;
+            ThreadPool.GetMinThreads(out var workerThreads, out var completionPortThreads);
+            ThreadPool.SetMinThreads(workerThreads + additionalThreadsCount, completionPortThreads + additionalThreadsCount);
         }
+    }
 
-        #endregion
-
-        #region Properties
+    internal Executor(IOutput output, ITestPlatformEventSource testPlatformEventSource, IProcessHelper processHelper, IEnvironment environment)
+    {
+        DebuggerBreakpoint.AttachVisualStudioDebugger(WellKnownDebugEnvironmentVariables.VSTEST_RUNNER_DEBUG_ATTACHVS);
+        DebuggerBreakpoint.WaitForNativeDebugger(WellKnownDebugEnvironmentVariables.VSTEST_RUNNER_NATIVE_DEBUG);
+        DebuggerBreakpoint.WaitForDebugger(WellKnownDebugEnvironmentVariables.VSTEST_RUNNER_DEBUG);
+
+        Output = output;
+        _testPlatformEventSource = testPlatformEventSource;
+        _showHelp = true;
+        _processHelper = processHelper;
+        _environment = environment;
+    }
 
-        /// <summary>
-        /// Instance to use for sending output.
-        /// </summary>
-        private IOutput Output { get; set; }
+    /// <summary>
+    /// Instance to use for sending output.
+    /// </summary>
+    private IOutput Output { get; set; }
 
-        #endregion
+    /// <summary>
+    /// Performs the execution based on the arguments provided.
+    /// </summary>
+    /// <param name="args">
+    /// Arguments provided to perform execution with.
+    /// </param>
+    /// <returns>
+    /// Exit Codes - Zero (for successful command execution), One (for bad command)
+    /// </returns>
+    internal int Execute(params string[]? args)
+    {
+        _testPlatformEventSource.VsTestConsoleStart();
 
-        #region Methods
+        var isDiag = args != null && args.Any(arg => arg.StartsWith("--diag", StringComparison.OrdinalIgnoreCase));
 
-        /// <summary>
-        /// Performs the execution based on the arguments provided.
-        /// </summary>
-        /// <param name="args">
-        /// Arguments provided to perform execution with.
-        /// </param>
-        /// <returns>
-        /// Exit Codes - Zero (for successful command execution), One (for bad command) 
-        /// </returns>
-        internal int Execute(params string[] args)
+        // If User specifies --nologo via dotnet, do not print splat screen
+        if (args != null && args.Length != 0 && args.Contains("--nologo"))
         {
-            this.testPlatformEventSource.VsTestConsoleStart();
-
-            // If User specifies --nologo via dotnet, do not print splat screen
-            if (args != null && args.Length !=0 && args.Contains("--nologo"))
-            {
-                // Sanitizing this list, as I don't think we should write Argument processor for this.
-                args = args.Where(val => val != "--nologo").ToArray();
-            }
-            else
-            {
-                var isDiag = args != null && args.Any(arg => arg.StartsWith("--diag", StringComparison.OrdinalIgnoreCase));
-                this.PrintSplashScreen(isDiag);
-            }
-
-            int exitCode = 0;
-
-            // If we have no arguments, set exit code to 1, add a message, and include the help processor in the args.
-            if (args == null || args.Length == 0 || args.Any(string.IsNullOrWhiteSpace))
+            // Sanitizing this list, as I don't think we should write Argument processor for this.
+            args = args.Where(val => val != "--nologo").ToArray();
+        }
+        else
+        {
+            // If we're postprocessing we don't need to show the splash
+            if (!ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(args))
             {
-                this.Output.Error(true, CommandLineResources.NoArgumentsProvided);
-                args = new string[] { HelpArgumentProcessor.CommandName };
-                exitCode = 1;
+                PrintSplashScreen(isDiag, args);
             }
+        }
 
-            // Flatten arguments and process response files.
-            string[] flattenedArguments;
-            exitCode |= this.FlattenArguments(args, out flattenedArguments);
-
-            // Get the argument processors for the arguments.
-            List<IArgumentProcessor> argumentProcessors;
-            exitCode |= this.GetArgumentProcessors(flattenedArguments, out argumentProcessors);
-
-            // Verify that the arguments are valid.
-            exitCode |= this.IdentifyDuplicateArguments(argumentProcessors);
+        int exitCode = 0;
 
-            // Quick exit for syntax error
-            if (exitCode == 1
-                && argumentProcessors.All(
-                    processor => processor.Metadata.Value.CommandName != HelpArgumentProcessor.CommandName))
-            {
-                this.testPlatformEventSource.VsTestConsoleStop();
-                return exitCode;
-            }
+        // If we have no arguments, set exit code to 1, add a message, and include the help processor in the args.
+        if (args == null || args.Length == 0 || args.Any(StringUtils.IsNullOrWhiteSpace))
+        {
+            Output.Error(true, CommandLineResources.NoArgumentsProvided);
+            args = [HelpArgumentProcessor.CommandName];
+            exitCode = 1;
+        }
 
-            // Execute all argument processors
-            foreach (var processor in argumentProcessors)
+        if (!isDiag)
+        {
+            // This takes a path to log directory and log.txt file. Same as the --diag parameter, e.g. VSTEST_DIAG="logs\log.txt"
+            var diag = Environment.GetEnvironmentVariable("VSTEST_DIAG");
+            // This takes Verbose, Info (not Information), Warning, and Error.
+            var diagVerbosity = Environment.GetEnvironmentVariable("VSTEST_DIAG_VERBOSITY");
+            if (!StringUtils.IsNullOrWhiteSpace(diag))
             {
-                if (!this.ExecuteArgumentProcessor(processor, ref exitCode))
+                var verbosity = TraceLevel.Verbose;
+                if (diagVerbosity != null)
                 {
-                    break;
+                    if (Enum.TryParse<TraceLevel>(diagVerbosity, ignoreCase: true, out var parsedVerbosity))
+                    {
+                        verbosity = parsedVerbosity;
+                    }
                 }
-            }
-
-            // Use the test run result aggregator to update the exit code.
-            exitCode |= (TestRunResultAggregator.Instance.Outcome == TestOutcome.Passed) ? 0 : 1;
 
-            EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", exitCode);
+                args = args.Concat(new[] { $"--diag:{diag};TraceLevel={verbosity}" }).ToArray();
+            }
+        }
 
-            this.testPlatformEventSource.VsTestConsoleStop();
+        // Flatten arguments and process response files.
+        exitCode |= FlattenArguments(args, out var flattenedArguments);
 
-            this.testPlatformEventSource.MetricsDisposeStart();
+        // Get the argument processors for the arguments.
+        exitCode |= GetArgumentProcessors(flattenedArguments, out List<IArgumentProcessor> argumentProcessors);
 
-            // Disposing Metrics Publisher when VsTestConsole ends
-            TestRequestManager.Instance.Dispose();
+        // Verify that the arguments are valid.
+        exitCode |= IdentifyDuplicateArguments(argumentProcessors);
 
-            this.testPlatformEventSource.MetricsDisposeStop();
+        // Quick exit for syntax error
+        if (exitCode == 1
+            && argumentProcessors.All(
+                processor => processor.Metadata.Value.CommandName != HelpArgumentProcessor.CommandName))
+        {
+            _testPlatformEventSource.VsTestConsoleStop();
             return exitCode;
         }
 
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Get the list of argument processors for the arguments.
-        /// </summary>
-        /// <param name="args">Arguments provided to perform execution with.</param>
-        /// <param name="processors">List of argument processors for the arguments.</param>
-        /// <returns>0 if all of the processors were created successfully and 1 otherwise.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "processorInstance", Justification = "Done on purpose to force the instances to be created")]
-        private int GetArgumentProcessors(string[] args, out List<IArgumentProcessor> processors)
+        // Execute all argument processors
+        foreach (var processor in argumentProcessors)
         {
-            processors = new List<IArgumentProcessor>();
-            int result = 0;
-            var processorFactory = ArgumentProcessorFactory.Create();
-            for (var index = 0; index < args.Length; index++)
+            if (!ExecuteArgumentProcessor(processor, ref exitCode))
             {
-                var arg = args[index];
-                // If argument is '--', following arguments are key=value pairs for run settings.
-                if (arg.Equals("--"))
-                {
-                    var cliRunSettingsProcessor = processorFactory.CreateArgumentProcessor(arg, args.Skip(index + 1).ToArray());
-                    processors.Add(cliRunSettingsProcessor);
-                    break;
-                }
+                break;
+            }
+        }
 
-                var processor = processorFactory.CreateArgumentProcessor(arg);
+        // Use the test run result aggregator to update the exit code.
+        exitCode |= (TestRunResultAggregator.Instance.Outcome == TestOutcome.Passed) ? 0 : 1;
 
-                if (processor != null)
-                {
-                    processors.Add(processor);
-                }
-                else
-                {
-                    // No known processor was found, report an error and continue
-                    this.Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoArgumentProcessorFound, arg));
+        EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", exitCode);
 
-                    // Add the help processor
-                    if (result == 0)
-                    {
-                        result = 1;
-                        processors.Add(processorFactory.CreateArgumentProcessor(HelpArgumentProcessor.CommandName));
-                    }
-                }
-            }
+        _testPlatformEventSource.VsTestConsoleStop();
 
-            // Add the internal argument processors that should always be executed.
-            // Examples: processors to enable loggers that are statically configured, and to start logging,
-            // should always be executed.
-            var processorsToAlwaysExecute = processorFactory.GetArgumentProcessorsToAlwaysExecute();
-            processors.AddRange(processorsToAlwaysExecute);
+        _testPlatformEventSource.MetricsDisposeStart();
 
-            // Initialize Runsettings with defaults
-            RunSettingsManager.Instance.AddDefaultRunSettings();
+        // Disposing Metrics Publisher when VsTestConsole ends
+        TestRequestManager.Instance.Dispose();
 
-            // Ensure we have an action argument.
-            this.EnsureActionArgumentIsPresent(processors, processorFactory);
+        _testPlatformEventSource.MetricsDisposeStop();
+        return exitCode;
+    }
 
-            // Instantiate and initialize the processors in priority order.
-            processors.Sort((p1, p2) => Comparer<ArgumentProcessorPriority>.Default.Compare(p1.Metadata.Value.Priority, p2.Metadata.Value.Priority));
-            foreach (var processor in processors)
+    /// <summary>
+    /// Get the list of argument processors for the arguments.
+    /// </summary>
+    /// <param name="args">Arguments provided to perform execution with.</param>
+    /// <param name="processors">List of argument processors for the arguments.</param>
+    /// <returns>0 if all of the processors were created successfully and 1 otherwise.</returns>
+    private int GetArgumentProcessors(string[] args, out List<IArgumentProcessor> processors)
+    {
+        processors = new List<IArgumentProcessor>();
+        int result = 0;
+        var processorFactory = ArgumentProcessorFactory.Create();
+        for (var index = 0; index < args.Length; index++)
+        {
+            var arg = args[index];
+            // If argument is '--', following arguments are key=value pairs for run settings.
+            if (arg.Equals("--"))
             {
-                IArgumentExecutor executorInstance;
-                try
-                {
-                    // Ensure the instance is created.  Note that the Lazy not only instantiates
-                    // the argument processor, but also initializes it.
-                    executorInstance = processor.Executor.Value;
-                }
-                catch (Exception ex)
-                {
-                    if (ex is CommandLineException || ex is TestPlatformException || ex is SettingsException)
-                    {
-                        this.Output.Error(false, ex.Message);
-                        result = 1;
-                        this.showHelp = false;
-                    }
-                    else if(ex is TestSourceException)
-                    {
-                        this.Output.Error(false, ex.Message);
-                        result = 1;
-                        this.showHelp = false;
-                        break;
-                    }
-                    else
-                    {
-                        // Let it throw - User must see crash and report it with stack trace!
-                        // No need for recoverability as user will start a new vstest.console anyway
-                        throw;
-                    }
-                }
+                var cliRunSettingsProcessor = processorFactory.CreateArgumentProcessor(arg, args.Skip(index + 1).ToArray());
+                processors.Add(cliRunSettingsProcessor!);
+                break;
             }
 
-            // If some argument was invalid, add help argument processor in beginning(i.e. at highest priority) 
-            if (result == 1 && this.showHelp && processors.First<IArgumentProcessor>().Metadata.Value.CommandName != HelpArgumentProcessor.CommandName)
+            var processor = processorFactory.CreateArgumentProcessor(arg);
+
+            if (processor != null)
             {
-                processors.Insert(0, processorFactory.CreateArgumentProcessor(HelpArgumentProcessor.CommandName));
+                processors.Add(processor);
             }
-            return result;
-        }
-
-        /// <summary>
-        /// Verify that the arguments are valid.
-        /// </summary>
-        /// <param name="argumentProcessors">Processors to verify against.</param>
-        /// <returns>0 if successful and 1 otherwise.</returns>
-        private int IdentifyDuplicateArguments(IEnumerable<IArgumentProcessor> argumentProcessors)
-        {
-            int result = 0;
-
-            // Used to keep track of commands that are only allowed to show up once.  The first time it is seen
-            // an entry for the command will be added to the dictionary and the value will be set to 1.  If we
-            // see the command again and the value is 1 (meaning this is the second time we have seen the command),
-            // we will output an error and increment the count.  This ensures that the error message will only be
-            // displayed once even if the user does something like /ListDiscoverers /ListDiscoverers /ListDiscoverers.
-            var commandSeenCount = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
-
-            // Check each processor.
-            foreach (var processor in argumentProcessors)
+            else
             {
-                if (!processor.Metadata.Value.AllowMultiple)
-                {
-                    int count;
-                    if (!commandSeenCount.TryGetValue(processor.Metadata.Value.CommandName, out count))
-                    {
-                        commandSeenCount.Add(processor.Metadata.Value.CommandName, 1);
-                    }
-                    else if (count == 1)
-                    {
-                        result = 1;
+                // No known processor was found, report an error and continue
+                Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoArgumentProcessorFound, arg));
 
-                        // Update the count so we do not print the error out for this argument multiple times.
-                        commandSeenCount[processor.Metadata.Value.CommandName] = ++count;
-                        this.Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.DuplicateArgumentError, processor.Metadata.Value.CommandName));
-                    }
+                // Add the help processor
+                if (result == 0)
+                {
+                    result = 1;
+                    processors.Add(processorFactory.CreateArgumentProcessor(HelpArgumentProcessor.CommandName)!);
                 }
             }
-            return result;
         }
 
-        /// <summary>
-        /// Ensures that an action argument is present and if one is not, then the default action argument is added.
-        /// </summary>
-        /// <param name="argumentProcessors">The arguments that are being processed.</param>
-        /// <param name="processorFactory">A factory for creating argument processors.</param>
-        private void EnsureActionArgumentIsPresent(List<IArgumentProcessor> argumentProcessors, ArgumentProcessorFactory processorFactory)
+        // Add the internal argument processors that should always be executed.
+        // Examples: processors to enable loggers that are statically configured, and to start logging,
+        // should always be executed.
+        var processorsToAlwaysExecute = processorFactory.GetArgumentProcessorsToAlwaysExecute();
+        foreach (var processor in processorsToAlwaysExecute)
         {
-            Contract.Requires(argumentProcessors != null);
-            Contract.Requires(processorFactory != null);
-
-            // Determine if any of the argument processors are actions.
-            var isActionIncluded = argumentProcessors.Any((processor) => processor.Metadata.Value.IsAction);
-
-            // If no action arguments have been provided, then add the default action argument.
-            if (!isActionIncluded)
+            if (processors.Any(i => i.Metadata.Value.CommandName == processor.Metadata.Value.CommandName))
             {
-                argumentProcessors.Add(processorFactory.CreateDefaultActionArgumentProcessor());
+                continue;
             }
+
+            // We need to initialize the argument executor if it's set to always execute. This ensures it will be initialized with other executors.
+            processors.Add(ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation(processor));
         }
 
-        /// <summary>
-        /// Executes the argument processor
-        /// </summary>
-        /// <param name="processor">Argument processor to execute.</param>
-        /// <param name="exitCode">Exit status of Argument processor</param>
-        /// <returns> true if continue execution, false otherwise.</returns>
-        private bool ExecuteArgumentProcessor(IArgumentProcessor processor, ref int exitCode)
+        // Initialize Runsettings with defaults
+        RunSettingsManager.Instance.AddDefaultRunSettings();
+
+        // Ensure we have an action argument.
+        EnsureActionArgumentIsPresent(processors, processorFactory);
+
+        // Instantiate and initialize the processors in priority order.
+        processors.Sort((p1, p2) => Comparer<ArgumentProcessorPriority>.Default.Compare(p1.Metadata.Value.Priority, p2.Metadata.Value.Priority));
+        foreach (var processor in processors)
         {
-            var continueExecution = true;
-            ArgumentProcessorResult result;
             try
             {
-                result = processor.Executor.Value.Execute();
+                // Ensure the instance is created.  Note that the Lazy not only instantiates
+                // the argument processor, but also initializes it.
+                var executorInstance = processor.Executor?.Value;
             }
             catch (Exception ex)
             {
-                if (ex is CommandLineException || ex is TestPlatformException || ex is SettingsException || ex is InvalidOperationException)
+                if (ex is CommandLineException or TestPlatformException or SettingsException)
                 {
-                    EqtTrace.Error("ExecuteArgumentProcessor: failed to execute argument process: {0}", ex);
-                    this.Output.Error(false, ex.Message);
-                    result = ArgumentProcessorResult.Fail;
-
-                    // Send inner exception only when its message is different to avoid duplicate.
-                    if (ex is TestPlatformException &&
-                        ex.InnerException != null &&
-                        !string.Equals(ex.InnerException.Message, ex.Message, StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        this.Output.Error(false, ex.InnerException.Message);
-                    }
+                    Output.Error(false, ex.Message);
+                    result = 1;
+                    _showHelp = false;
+                }
+                else if (ex is TestSourceException)
+                {
+                    Output.Error(false, ex.Message);
+                    result = 1;
+                    _showHelp = false;
+                    break;
                 }
                 else
                 {
@@ -357,125 +305,250 @@ private bool ExecuteArgumentProcessor(IArgumentProcessor processor, ref int exit
                     throw;
                 }
             }
+        }
+
+        // If some argument was invalid, add help argument processor in beginning(i.e. at highest priority)
+        if (result == 1 && _showHelp && processors.First().Metadata.Value.CommandName != HelpArgumentProcessor.CommandName)
+        {
+            processors.Insert(0, processorFactory.CreateArgumentProcessor(HelpArgumentProcessor.CommandName)!);
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Verify that the arguments are valid.
+    /// </summary>
+    /// <param name="argumentProcessors">Processors to verify against.</param>
+    /// <returns>0 if successful and 1 otherwise.</returns>
+    private int IdentifyDuplicateArguments(IEnumerable<IArgumentProcessor> argumentProcessors)
+    {
+        int result = 0;
 
-            Debug.Assert(
-                result >= ArgumentProcessorResult.Success && result <= ArgumentProcessorResult.Abort,
-                "Invalid argument processor result.");
+        // Used to keep track of commands that are only allowed to show up once.  The first time it is seen
+        // an entry for the command will be added to the dictionary and the value will be set to 1.  If we
+        // see the command again and the value is 1 (meaning this is the second time we have seen the command),
+        // we will output an error and increment the count.  This ensures that the error message will only be
+        // displayed once even if the user does something like /ListDiscoverers /ListDiscoverers /ListDiscoverers.
+        var commandSeenCount = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
 
-            if (result == ArgumentProcessorResult.Fail)
+        // Check each processor.
+        foreach (var processor in argumentProcessors)
+        {
+            if (processor.Metadata.Value.AllowMultiple)
             {
-                exitCode = 1;
+                continue;
             }
 
-            if (result == ArgumentProcessorResult.Abort)
+            if (!commandSeenCount.TryGetValue(processor.Metadata.Value.CommandName, out int count))
             {
-                continueExecution = false;
+                commandSeenCount.Add(processor.Metadata.Value.CommandName, 1);
             }
-            return continueExecution;
-        }
-
-        /// <summary>
-        /// Displays the Company and Copyright splash title info immediately after launch
-        /// </summary>
-        private void PrintSplashScreen(bool isDiag)
-        {
-            string assemblyVersion = Product.Version;
-            if (!isDiag)
+            else if (count == 1)
             {
-                var end = Product.Version?.IndexOf("-release");
+                result = 1;
 
-                if (end >= 0)
-                {
-                    assemblyVersion = Product.Version?.Substring(0, end.Value);
-                }
+                // Update the count so we do not print the error out for this argument multiple times.
+                commandSeenCount[processor.Metadata.Value.CommandName] = ++count;
+                Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.DuplicateArgumentError, processor.Metadata.Value.CommandName));
             }
-
-            string commandLineBanner = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.MicrosoftCommandLineTitle, assemblyVersion);
-            this.Output.WriteLine(commandLineBanner, OutputLevel.Information);
-            this.Output.WriteLine(CommandLineResources.CopyrightCommandLineTitle, OutputLevel.Information);
-            this.Output.WriteLine(string.Empty, OutputLevel.Information);
         }
+        return result;
+    }
+
+    /// <summary>
+    /// Ensures that an action argument is present and if one is not, then the default action argument is added.
+    /// </summary>
+    /// <param name="argumentProcessors">The arguments that are being processed.</param>
+    /// <param name="processorFactory">A factory for creating argument processors.</param>
+    private static void EnsureActionArgumentIsPresent(List<IArgumentProcessor> argumentProcessors, ArgumentProcessorFactory processorFactory)
+    {
+        ValidateArg.NotNull(argumentProcessors, nameof(argumentProcessors));
+        ValidateArg.NotNull(processorFactory, nameof(processorFactory));
 
-        /// <summary>
-        /// Flattens command line arguments by processing response files.
-        /// </summary>
-        /// <param name="arguments">Arguments provided to perform execution with.</param>
-        /// <param name="flattenedArguments">Array of flattened arguments.</param>
-        /// <returns>0 if successful and 1 otherwise.</returns>
-        private int FlattenArguments(IEnumerable<string> arguments, out string[] flattenedArguments)
+        // Determine if any of the argument processors are actions.
+        var isActionIncluded = argumentProcessors.Any((processor) => processor.Metadata.Value.IsAction);
+
+        // If no action arguments have been provided, then add the default action argument.
+        if (!isActionIncluded)
         {
-            List<string> outputArguments = new List<string>();
-            int result = 0;
+            argumentProcessors.Add(processorFactory.CreateDefaultActionArgumentProcessor());
+        }
+    }
 
-            foreach (var arg in arguments)
+    /// <summary>
+    /// Executes the argument processor
+    /// </summary>
+    /// <param name="processor">Argument processor to execute.</param>
+    /// <param name="exitCode">Exit status of Argument processor</param>
+    /// <returns> true if continue execution, false otherwise.</returns>
+    private bool ExecuteArgumentProcessor(IArgumentProcessor processor, ref int exitCode)
+    {
+        var continueExecution = true;
+        ArgumentProcessorResult result;
+        try
+        {
+            // TODO: Only executor that could return null is ResponseFileArgumentProcessor, maybe it could be updated
+            // to follow a pattern similar to other processors and avoid returning null.
+            result = processor.Executor!.Value.Execute();
+        }
+        catch (Exception ex)
+        {
+            if (ex is CommandLineException or TestPlatformException or SettingsException or InvalidOperationException)
             {
-                if (arg.StartsWith("@", StringComparison.Ordinal))
-                {
-                    // response file:
-                    string path = arg.Substring(1).TrimEnd(null);
-                    var hadError = this.ReadArgumentsAndSanitize(path, out var responseFileArgs, out var nestedArgs);
-
-                    if (hadError)
-                    {
-                        result |= 1;
-                    }
-                    else
-                    {
-                        this.Output.WriteLine(string.Format("vstest.console.exe {0}", responseFileArgs), OutputLevel.Information);
-                        outputArguments.AddRange(nestedArgs);
-                    }
-                }
-                else
+                EqtTrace.Error("ExecuteArgumentProcessor: failed to execute argument process: {0}", ex);
+                Output.Error(false, ex.Message);
+                result = ArgumentProcessorResult.Fail;
+
+                // Send inner exception only when its message is different to avoid duplicate.
+                if (ex is TestPlatformException &&
+                    ex.InnerException != null &&
+                    !string.Equals(ex.InnerException.Message, ex.Message, StringComparison.CurrentCultureIgnoreCase))
                 {
-                    outputArguments.Add(arg);
+                    Output.Error(false, ex.InnerException.Message);
                 }
             }
+            else
+            {
+                // Let it throw - User must see crash and report it with stack trace!
+                // No need for recoverability as user will start a new vstest.console anyway
+                throw;
+            }
+        }
 
-            flattenedArguments = outputArguments.ToArray();
-            return result;
+        TPDebug.Assert(
+            result is >= ArgumentProcessorResult.Success and <= ArgumentProcessorResult.Abort,
+            "Invalid argument processor result.");
+
+        if (result == ArgumentProcessorResult.Fail)
+        {
+            exitCode = 1;
         }
 
-        /// <summary>
-        /// Read and sanitize the arguments.
-        /// </summary>
-        /// <param name="fileName">File provided by user.</param>
-        /// <param name="args">argument in the file as string.</param>
-        /// <param name="arguments">Modified argument after sanitizing the contents of the file.</param>
-        /// <returns>0 if successful and 1 otherwise.</returns>
-        public bool ReadArgumentsAndSanitize(string fileName, out string args, out string[] arguments)
+        if (result == ArgumentProcessorResult.Abort)
         {
-            arguments = null;
-            if (GetContentUsingFile(fileName, out args))
-            {
-                return true;
-            }
+            continueExecution = false;
+        }
+        return continueExecution;
+    }
+
+    /// <summary>
+    /// Displays the Company and Copyright splash title info immediately after launch
+    /// </summary>
+    private void PrintSplashScreen(bool isDiag, string[]? args)
+    {
+        string? assemblyVersion = Product.Version;
+        if (!isDiag)
+        {
+            var end = Product.Version?.IndexOf("-release");
 
-            if (string.IsNullOrEmpty(args))
+            if (end >= 0)
             {
-                return false;
+                assemblyVersion = Product.Version?.Substring(0, end.Value);
             }
+        }
 
-            return CommandLineUtilities.SplitCommandLineIntoArguments(args, out arguments);
+        string assemblyVersionAndArchitecture = $"{assemblyVersion} ({_processHelper.GetCurrentProcessArchitecture().ToString().ToLowerInvariant()})";
+        string commandLineBanner = string.Format(CultureInfo.CurrentCulture, CommandLineResources.MicrosoftCommandLineTitle, assemblyVersionAndArchitecture);
+        Output.WriteLine(commandLineBanner, OutputLevel.Information);
+        PrintWarningIfRunningEmulatedOnArm64();
+        PrintWarningIfInvokedThroughDotnetVSTest(args);
+        Output.WriteLine(string.Empty, OutputLevel.Information);
+    }
+
+    /// <summary>
+    /// Display a warning if we're executed through `dotnet vstest`
+    /// </summary>
+    private void PrintWarningIfInvokedThroughDotnetVSTest(string[]? args)
+    {
+        if (ShowDeprecateDotnetVStestMessageArgumentProcessor.ContainsShowDeprecateDotnetVSTestMessageCommand(args))
+        {
+            Output.Warning(false, CommandLineResources.VSTestDeprecationMessage);
         }
+    }
 
-        private bool GetContentUsingFile(string fileName, out string contents)
+    /// <summary>
+    /// Display a warning if we're running the runner on ARM64 but with a different current process architecture.
+    /// </summary>
+    private void PrintWarningIfRunningEmulatedOnArm64()
+    {
+        var currentProcessArchitecture = _processHelper.GetCurrentProcessArchitecture();
+        if (Path.GetFileName(_processHelper.GetCurrentProcessFileName()) == NonARM64RunnerName &&
+            _environment.Architecture == PlatformArchitecture.ARM64 &&
+            currentProcessArchitecture != PlatformArchitecture.ARM64)
         {
-            contents = null;
-            try
+            Output.Warning(false, CommandLineResources.WarningEmulatedOnArm64, currentProcessArchitecture.ToString().ToLowerInvariant());
+        }
+    }
+
+    /// <summary>
+    /// Flattens command line arguments by processing response files.
+    /// </summary>
+    /// <param name="arguments">Arguments provided to perform execution with.</param>
+    /// <param name="flattenedArguments">Array of flattened arguments.</param>
+    /// <returns>0 if successful and 1 otherwise.</returns>
+    private int FlattenArguments(IEnumerable<string> arguments, out string[] flattenedArguments)
+    {
+        List<string> outputArguments = new();
+        int result = 0;
+
+        foreach (var arg in arguments)
+        {
+            if (arg.StartsWith("@", StringComparison.Ordinal))
             {
-                contents = File.ReadAllText(fileName);
+                // response file:
+                string path = arg.Substring(1).TrimEnd(null);
+                var hadError = ReadArgumentsAndSanitize(path, out var responseFileArgs, out var nestedArgs);
+
+                if (hadError)
+                {
+                    result |= 1;
+                }
+                else
+                {
+                    Output.WriteLine($"vstest.console.exe {responseFileArgs}", OutputLevel.Information);
+                    outputArguments.AddRange(nestedArgs!);
+                }
             }
-            catch (Exception e)
+            else
             {
-                EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", 1);
-                EqtTrace.Error(string.Format(CultureInfo.InvariantCulture, "Error: Can't open command line argument file '{0}' : '{1}'", fileName, e.Message));
-                this.Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.OpenResponseFileError, fileName));
-                return true;
+                outputArguments.Add(arg);
             }
+        }
 
-            return false;
+        flattenedArguments = outputArguments.ToArray();
+        return result;
+    }
+
+    /// <summary>
+    /// Read and sanitize the arguments.
+    /// </summary>
+    /// <param name="fileName">File provided by user.</param>
+    /// <param name="args">argument in the file as string.</param>
+    /// <param name="arguments">Modified argument after sanitizing the contents of the file.</param>
+    /// <returns>0 if successful and 1 otherwise.</returns>
+    public bool ReadArgumentsAndSanitize(string fileName, out string? args, out string[]? arguments)
+    {
+        arguments = null;
+        return GetContentUsingFile(fileName, out args)
+            || (!args.IsNullOrEmpty() && Utilities.CommandLineUtilities.SplitCommandLineIntoArguments(args, out arguments));
+    }
+
+    private bool GetContentUsingFile(string fileName, out string? contents)
+    {
+        contents = null;
+        try
+        {
+            contents = File.ReadAllText(fileName);
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Verbose("Executor.Execute: Exiting with exit code of {0}", 1);
+            EqtTrace.Error(string.Format(CultureInfo.InvariantCulture, "Error: Can't open command line argument file '{0}' : '{1}'", fileName, e.Message));
+            Output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.OpenResponseFileError, fileName));
+            return true;
         }
 
-        #endregion
+        return false;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/vstest.console/CommandLine/GenerateFakesUtilities.cs b/src/vstest.console/CommandLine/GenerateFakesUtilities.cs
index eb46ffc394..cc28997261 100644
--- a/src/vstest.console/CommandLine/GenerateFakesUtilities.cs
+++ b/src/vstest.console/CommandLine/GenerateFakesUtilities.cs
@@ -1,24 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLineUtilities
-{
-    using System.Collections.Generic;
-    using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
 
-    public static class GenerateFakesUtilities
+public static class GenerateFakesUtilities
+{
+    internal static string GenerateFakesSettings(CommandLineOptions? commandLineOptions, IEnumerable<string> sources, string runSettingsXml)
     {
-        internal static void GenerateFakesSettings(CommandLineOptions commandLineOptions, IEnumerable<string> sources, ref string runSettingsXml)
+        // dynamically compute the fakes datacollector settings
+        // This runs with or without design mode.
+        if (commandLineOptions == null || !commandLineOptions.DisableAutoFakes)
         {
-            // dynamically compute the fakes datacollector settings
-            // This runs with or without design mode.
-            if (commandLineOptions == null || !commandLineOptions.DisableAutoFakes)
-            {
-                runSettingsXml = FakesUtilities.GenerateFakesSettingsForRunConfiguration(sources.ToArray(), runSettingsXml);
-            }
+            runSettingsXml = FakesUtilities.GenerateFakesSettingsForRunConfiguration(sources.ToArray(), runSettingsXml);
         }
+
+        return runSettingsXml;
     }
 }
diff --git a/src/vstest.console/CommandLine/InferHelper.cs b/src/vstest.console/CommandLine/InferHelper.cs
index 5b0d6c4835..71a0a06597 100644
--- a/src/vstest.console/CommandLine/InferHelper.cs
+++ b/src/vstest.console/CommandLine/InferHelper.cs
@@ -1,133 +1,175 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLineUtilities
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Versioning;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+
+internal class InferHelper
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Runtime.Versioning;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-
-    internal class InferHelper
+    private readonly IAssemblyMetadataProvider _assemblyMetadataProvider;
+
+    internal InferHelper(IAssemblyMetadataProvider assemblyMetadataProvider)
     {
-        private IAssemblyMetadataProvider assemblyMetadataProvider;
+        _assemblyMetadataProvider = assemblyMetadataProvider;
+    }
 
-        internal InferHelper(IAssemblyMetadataProvider assemblyMetadataProvider)
+    /// <summary>
+    /// Determines Architecture from sources.
+    /// </summary>
+    public Architecture AutoDetectArchitecture(IList<string>? sources, Architecture defaultArchitecture, out IDictionary<string, Architecture> sourceToPlatformMap)
+    {
+        sourceToPlatformMap = new Dictionary<string, Architecture>();
+        if (sources == null || sources.Count == 0)
+            return defaultArchitecture;
+
+        // Set the default for all sources.
+        foreach (var source in sources)
         {
-            this.assemblyMetadataProvider = assemblyMetadataProvider;
+            // TODO: Add default architecture to runtime providers info, or something and that will allow us to have test
+            // cases without any sources. Otherwise change test AutoDetectArchitectureShouldReturnDefaultArchitectureOnNullItemInSources
+            // because this condition is making that test happy.
+            if (source != null)
+            {
+                sourceToPlatformMap.Add(source, defaultArchitecture);
+            }
         }
 
-        /// <summary>
-        /// Determines Architecture from sources.
-        /// </summary>
-        public Architecture AutoDetectArchitecture(IList<string> sources, IDictionary<string, Architecture> sourcePlatforms, Architecture defaultArchitecture)
+        try
         {
-            var architecture = defaultArchitecture;
-            try
+            Architecture? commonArchitecture = null;
+            foreach (var source in sources)
             {
-                if (sources != null && sources.Count > 0)
+                if (source == null)
+                    continue;
+
+                try
                 {
-                    Architecture? finalArch = null;
-                    foreach (string source in sources)
+                    Architecture detectedArchitecture;
+                    if (IsDllOrExe(source))
                     {
-                        Architecture arch;
-                        if (IsDotNETAssembly(source))
+                        detectedArchitecture = _assemblyMetadataProvider.GetArchitecture(source);
+
+                        if (detectedArchitecture == Architecture.AnyCPU)
                         {
-                            arch = assemblyMetadataProvider.GetArchitecture(source);
+                            // This is AnyCPU .NET assembly, this source should run using the default architecture,
+                            // which we've already set for the source.
+                            EqtTrace.Info("Determined platform for source '{0}' was AnyCPU and it will use the default plaform {1}.", source, defaultArchitecture);
                         }
                         else
                         {
-                            // Set AnyCPU for non dotnet test sources (js, py and other). Otherwise warning will
-                            // show up if there is mismatch with user provided platform.
-                            arch = Architecture.AnyCPU;
-                        }
-                        EqtTrace.Info("Determined platform for source '{0}' is '{1}'", source, arch);
-                        sourcePlatforms[source]= arch;
-
-                        if (Architecture.AnyCPU.Equals(arch))
-                        {
-                            // If arch is AnyCPU ignore it.
-                            continue;
+                            sourceToPlatformMap[source] = detectedArchitecture;
+                            EqtTrace.Info("Determined platform for source '{0}' was '{1}'.", source, detectedArchitecture);
                         }
+                    }
+                    else
+                    {
+                        // This is non-dll source, this source should run using the default architecture,
+                        // which we've already set for the source.
+                        EqtTrace.Info("No platform was determined for source '{0}' because it is not a dll or an executable.", source);
+
+                        // This source has no associated architecture so it does not help use determine a common architecture for
+                        // all the sources, so we continue to next one.
+                        sourceToPlatformMap[source] = defaultArchitecture;
+                        continue;
+                    }
 
-                        if (finalArch == null)
-                        {
-                            finalArch = arch;
-                            continue;
-                        }
+                    if (Architecture.AnyCPU.Equals(detectedArchitecture))
+                    {
+                        // The architecture of the source is AnyCPU and so we can skip to the next one,
+                        // because it does not help use determine a common architecture for all the sources.
+                        continue;
+                    }
 
-                        if (!finalArch.Equals(arch))
-                        {
-                            finalArch = defaultArchitecture;
-                            EqtTrace.Info("Conflict in platform architecture, using default platform:{0}", finalArch);
-                        }
+                    // This is the first source that provided some architecture use that as a candidate
+                    // for the common architecture.
+                    if (commonArchitecture == null)
+                    {
+                        commonArchitecture = detectedArchitecture;
+                        continue;
                     }
 
-                    if (finalArch != null)
+                    // The detected architecture, is different than the common architecture. So at least
+                    // one of the sources is incompatible with the others. Use the default architecture as the common
+                    // fallback.
+                    if (!commonArchitecture.Equals(detectedArchitecture))
                     {
-                        architecture = (Architecture)finalArch;
+                        commonArchitecture = defaultArchitecture;
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("Failed to determine platform: {0}, using default: {1}", ex, architecture);
+                catch (Exception ex)
+                {
+                    EqtTrace.Error("Failed to determine platform for source: {0}, using default: {1}, exception: {2}", source, defaultArchitecture, ex);
+                    sourceToPlatformMap[source] = defaultArchitecture;
+                }
             }
 
-            if (EqtTrace.IsInfoEnabled)
+            if (commonArchitecture != null)
             {
-                EqtTrace.Info("Determined platform for all sources: {0}", architecture);
+                EqtTrace.Info("Determined platform for all sources: {0}", commonArchitecture);
+                return commonArchitecture.Value;
             }
 
-            return architecture;
-        }
+            EqtTrace.Info("None of the sources provided any runnable platform, using the default platform: {0}", defaultArchitecture);
 
-        /// <summary>
-        /// Determines Framework from sources.
-        /// </summary>
-        public Framework AutoDetectFramework(IList<string> sources, IDictionary<string, Framework> sourceFrameworkVersions)
+            return defaultArchitecture;
+        }
+        catch (Exception ex)
         {
-            Framework framework = Framework.DefaultFramework;
-            try
-            {
-                if (sources != null && sources.Count > 0)
-                {
-                    var finalFx = DetermineFrameworkName(sources, sourceFrameworkVersions, out var conflictInFxIdentifier);
-                    framework = Framework.FromString(finalFx.FullName);
-                    if (conflictInFxIdentifier && EqtTrace.IsInfoEnabled)
-                    {
-                        // TODO Log to console and client.
-                        EqtTrace.Info(
-                            "conflicts in Framework identifier of provided sources(test assemblies), using default framework:{0}",
-                            framework);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                EqtTrace.Error("Failed to determine framework:{0}, using default: {1}", ex, framework);
-            }
+            EqtTrace.Error("Failed to determine platform for all sources: {0}, using default: {1}", ex, defaultArchitecture);
+            return defaultArchitecture;
+        }
+    }
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Determined framework for all sources: {0}", framework);
-            }
+    /// <summary>
+    /// Determines Framework from sources.
+    /// </summary>
+    public Framework AutoDetectFramework(IList<string?>? sources, out IDictionary<string, Framework> sourceToFrameworkMap)
+    {
+        sourceToFrameworkMap = new Dictionary<string, Framework>();
 
-            return framework;
+        if (sources == null || sources.Count == 0)
+            return Framework.DefaultFramework;
+
+        var framework = DetermineFramework(sources, out sourceToFrameworkMap, out var conflictInFxIdentifier);
+        if (conflictInFxIdentifier)
+        {
+            // TODO Log to console and client.
+            EqtTrace.Info(
+                "conflicts in Framework identifier of provided sources(test assemblies), using default framework: {0}",
+                framework);
         }
 
-        private FrameworkName DetermineFrameworkName(IEnumerable<string> sources, IDictionary<string, Framework> sourceFrameworkVersions, out bool conflictInFxIdentifier)
+        EqtTrace.Info("Determined framework for all sources: {0}", framework);
+        return framework!;
+    }
+
+    private Framework? DetermineFramework(IEnumerable<string?> sources, out IDictionary<string, Framework> sourceToFrameworkMap, out bool conflictInFxIdentifier)
+    {
+        sourceToFrameworkMap = new Dictionary<string, Framework>();
+
+        var defaultFramework = Framework.DefaultFramework;
+        FrameworkName? finalFx = null;
+        conflictInFxIdentifier = false;
+        foreach (var source in sources)
         {
-            FrameworkName finalFx = null;
-            conflictInFxIdentifier = false;
-            foreach (string source in sources)
+            if (source is null)
+            {
+                continue;
+            }
+
+            try
             {
                 FrameworkName fx;
-                if (IsDotNETAssembly(source))
+                if (IsDllOrExe(source))
                 {
-                    fx = assemblyMetadataProvider.GetFrameWork(source);
+                    fx = _assemblyMetadataProvider.GetFrameworkName(source);
                 }
                 else
                 {
@@ -139,18 +181,17 @@ private FrameworkName DetermineFrameworkName(IEnumerable<string> sources, IDicti
                         // possible for js files. So using default .NET Full framework version.
                         fx = new FrameworkName(Constants.DotNetFramework40);
                     }
-                    else if (extension.Equals(".appx", StringComparison.OrdinalIgnoreCase)
-                        || extension.Equals(".msix", StringComparison.OrdinalIgnoreCase)
-                        || extension.Equals(".appxrecipe", StringComparison.OrdinalIgnoreCase))
-                    {
-                        fx = new FrameworkName(Constants.DotNetFrameworkUap10);
-                    }
                     else
                     {
-                        fx = new FrameworkName(Framework.DefaultFramework.Name);
+                        fx = extension.Equals(".appx", StringComparison.OrdinalIgnoreCase)
+                             || extension.Equals(".msix", StringComparison.OrdinalIgnoreCase)
+                             || extension.Equals(".appxrecipe", StringComparison.OrdinalIgnoreCase)
+                            ? new FrameworkName(Constants.DotNetFrameworkUap10)
+                            : new FrameworkName(Framework.DefaultFramework.Name);
                     }
                 }
-                sourceFrameworkVersions[source] = Framework.FromString(fx.FullName);
+
+                sourceToFrameworkMap.Add(source, Framework.FromString(fx.FullName)!);
 
                 if (finalFx == null)
                 {
@@ -169,17 +210,25 @@ private FrameworkName DetermineFrameworkName(IEnumerable<string> sources, IDicti
                 else
                 {
                     conflictInFxIdentifier = true;
-                    finalFx = new FrameworkName(Framework.DefaultFramework.Name);
+                    finalFx = new FrameworkName(defaultFramework.Name);
                 }
             }
-            return finalFx;
+            catch (Exception ex)
+            {
+                sourceToFrameworkMap.Add(source, defaultFramework);
+                EqtTrace.Error("Failed to determine framework for source: {0} using default framework: {1}, exception: {2}", source, defaultFramework.Name, ex);
+            }
         }
 
-        private bool IsDotNETAssembly(string filePath)
-        {
-            var extType = Path.GetExtension(filePath);
-            return extType != null && (extType.Equals(".dll", StringComparison.OrdinalIgnoreCase) ||
-                                       extType.Equals(".exe", StringComparison.OrdinalIgnoreCase));
-        }
+        return finalFx != null
+            ? Framework.FromString(finalFx.FullName)
+            : defaultFramework;
+    }
+
+    private static bool IsDllOrExe(string? filePath)
+    {
+        var extType = Path.GetExtension(filePath);
+        return extType != null && (extType.Equals(".dll", StringComparison.OrdinalIgnoreCase) ||
+                                   extType.Equals(".exe", StringComparison.OrdinalIgnoreCase));
     }
 }
diff --git a/src/vstest.console/CommandLine/Interfaces/IAssemblyMetadataProvider.cs b/src/vstest.console/CommandLine/Interfaces/IAssemblyMetadataProvider.cs
index 03f55c077b..5d4e83f2c6 100644
--- a/src/vstest.console/CommandLine/Interfaces/IAssemblyMetadataProvider.cs
+++ b/src/vstest.console/CommandLine/Interfaces/IAssemblyMetadataProvider.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System.Runtime.Versioning;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using System.Runtime.Versioning;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+/// Defines interface for assembly properties.
+/// </summary>
+internal interface IAssemblyMetadataProvider
+{
     /// <summary>
-    /// Defines interface for assembly properties.
+    /// Determines FrameworkName from filePath.
     /// </summary>
-    internal interface IAssemblyMetadataProvider
-    {
-        /// <summary>
-        /// Determines FrameworkName from filePath.
-        /// </summary>
-        FrameworkName GetFrameWork(string filePath);
+    FrameworkName GetFrameworkName(string filePath);
 
-        /// <summary>
-        /// Determines Architecture from filePath.
-        /// </summary>
-        Architecture GetArchitecture(string filePath);
-    }
+    /// <summary>
+    /// Determines Architecture from filePath.
+    /// </summary>
+    Architecture GetArchitecture(string filePath);
 }
diff --git a/src/vstest.console/CommandLine/TestRunResultAggregator.cs b/src/vstest.console/CommandLine/TestRunResultAggregator.cs
index 726d321b99..77f55fe667 100644
--- a/src/vstest.console/CommandLine/TestRunResultAggregator.cs
+++ b/src/vstest.console/CommandLine/TestRunResultAggregator.cs
@@ -1,133 +1,105 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+/// <summary>
+/// Aggregates test messages and test results received to determine the test run result.
+/// </summary>
+internal class TestRunResultAggregator
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+    private static TestRunResultAggregator? s_instance;
 
     /// <summary>
-    /// Aggregates test messages and test results received to determine the test run result.
+    /// Initializes the TestRunResultAggregator
     /// </summary>
-    internal class TestRunResultAggregator
+    /// <remarks>Constructor is private since the factory method should be used to get the instance.</remarks>
+    protected internal TestRunResultAggregator()
     {
-        private static TestRunResultAggregator instance = null;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes the TestRunResultAggregator
-        /// </summary>
-        /// <remarks>Constructor is private since the factory method should be used to get the instance.</remarks>
-        protected TestRunResultAggregator()
-        {
-            // Outcome is passed until we see a failure.
-            this.Outcome = TestOutcome.Passed;
-        }
-
-        #endregion
-
-        #region Static Methods
-
-        /// <summary>
-        /// Gets the instance of the test run result aggregator.
-        /// </summary>
-        /// <returns>Instance of the test run result aggregator.</returns>
-        public static TestRunResultAggregator Instance
-        {
-            get
-            {
-                if(instance == null)
-                {
-                    instance = new TestRunResultAggregator();
-                }
-
-                return instance;
-            }
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The current test run outcome.
-        /// </summary>
-        public TestOutcome Outcome { get; private set; }
-
-        #endregion
+        // Outcome is passed until we see a failure.
+        Outcome = TestOutcome.Passed;
+    }
 
-        #region Event Handlers
+    /// <summary>
+    /// Gets the instance of the test run result aggregator.
+    /// </summary>
+    /// <returns>Instance of the test run result aggregator.</returns>
+    public static TestRunResultAggregator Instance
+        => s_instance ??= new TestRunResultAggregator();
 
-        /// <summary>
-        /// Registers to receive events from the provided test run request.
-        /// These events will then be broadcast to any registered loggers.
-        /// </summary>
-        /// <param name="testRunRequest">The run request to register for events on.</param>
-        public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
-        {
-            ValidateArg.NotNull<ITestRunRequest>(testRunRequest, nameof(testRunRequest));
+    /// <summary>
+    /// The current test run outcome.
+    /// </summary>
+    public TestOutcome Outcome { get; private set; }
 
-            // Register for the events.
-            testRunRequest.TestRunMessage += TestRunMessageHandler;
-            testRunRequest.OnRunCompletion += TestRunCompletionHandler;
-        }
+    /// <summary>
+    /// Registers to receive events from the provided test run request.
+    /// These events will then be broadcast to any registered loggers.
+    /// </summary>
+    /// <param name="testRunRequest">The run request to register for events on.</param>
+    public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        ValidateArg.NotNull(testRunRequest, nameof(testRunRequest));
+        // Register for the events.
+        testRunRequest.TestRunMessage += TestRunMessageHandler;
+        testRunRequest.OnRunCompletion += TestRunCompletionHandler;
+    }
 
-        /// <summary>
-        /// Unregisters from the provided test run request to stop receiving events.
-        /// </summary>
-        /// <param name="testRunRequest">The run request from which events should be unregistered.</param>
-        public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
-        {
-            ValidateArg.NotNull<ITestRunRequest>(testRunRequest, nameof(testRunRequest));
+    /// <summary>
+    /// Unregisters from the provided test run request to stop receiving events.
+    /// </summary>
+    /// <param name="testRunRequest">The run request from which events should be unregistered.</param>
+    public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        ValidateArg.NotNull(testRunRequest, nameof(testRunRequest));
+        testRunRequest.TestRunMessage -= TestRunMessageHandler;
+        testRunRequest.OnRunCompletion -= TestRunCompletionHandler;
+    }
 
-            testRunRequest.TestRunMessage -= TestRunMessageHandler;
-            testRunRequest.OnRunCompletion -= TestRunCompletionHandler;
-        }
+    /// <summary>
+    /// To mark the test run as failed.
+    /// </summary>
+    public void MarkTestRunFailed()
+    {
+        Outcome = TestOutcome.Failed;
+    }
 
-        /// <summary>
-        /// To mark the test run as failed.
-        /// </summary>
-        public void MarkTestRunFailed()
-        {
-            this.Outcome = TestOutcome.Failed;
-        }
+    /// <summary>
+    /// Resets the outcome to default state i.e. Passed
+    /// </summary>
+    public void Reset()
+    {
+        Outcome = TestOutcome.Passed;
+    }
 
-        /// <summary>
-        /// Resets the outcome to default state i.e. Passed
-        /// </summary>
-        public void Reset()
+    /// <summary>
+    /// Called when a test run is complete.
+    /// </summary>
+    private void TestRunCompletionHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        if (e.TestRunStatistics == null || e.IsCanceled || e.IsAborted)
         {
-            this.Outcome = TestOutcome.Passed;
+            Outcome = TestOutcome.Failed;
         }
-
-        /// <summary>
-        /// Called when a test run is complete.
-        /// </summary>
-        private void TestRunCompletionHandler(object sender, TestRunCompleteEventArgs e)
+        else if (e.TestRunStatistics[TestOutcome.Failed] > 0)
         {
-            if (e.TestRunStatistics == null || e.IsCanceled || e.IsAborted)
-            {
-                this.Outcome = TestOutcome.Failed;
-            }
-            else if (e.TestRunStatistics[TestOutcome.Failed] > 0)
-            {
-                this.Outcome = TestOutcome.Failed;
-            }
+            Outcome = TestOutcome.Failed;
         }
+    }
 
-        /// <summary>
-        /// Called when a test run message is sent.
-        /// </summary>
-        private void TestRunMessageHandler(object sender, TestRunMessageEventArgs e)
+    /// <summary>
+    /// Called when a test run message is sent.
+    /// </summary>
+    private void TestRunMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        if (e.Level == TestMessageLevel.Error)
         {
-            if (e.Level == TestMessageLevel.Error)
-            {
-                this.Outcome = TestOutcome.Failed;
-            }
+            Outcome = TestOutcome.Failed;
         }
-
-        #endregion
     }
+
 }
diff --git a/src/vstest.console/CommandLine/TestSourceException.cs b/src/vstest.console/CommandLine/TestSourceException.cs
index 05f5e734f2..c61faa10ab 100644
--- a/src/vstest.console/CommandLine/TestSourceException.cs
+++ b/src/vstest.console/CommandLine/TestSourceException.cs
@@ -1,44 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
 
+/// <summary>
+/// Exception thrown by argument processors when they encounter an error with test source
+/// arguments.
+/// </summary>
+public class TestSourceException : Exception
+{
     /// <summary>
-    /// Exception thrown by argument processors when they encounter an error with test source
-    /// arguments.
+    /// Creates a new TestSourceException
     /// </summary>
-    public class TestSourceException : Exception
+    public TestSourceException()
     {
-        #region Constructors
-
-        /// <summary>
-        /// Creates a new TestSourceException
-        /// </summary>
-        public TestSourceException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes with the message.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        public TestSourceException(string message)
-            : this(message, innerException: null)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes with the message and innerException.
-        /// </summary>
-        /// <param name="message">Message for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception, or a null reference.</param>
-        public TestSourceException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes with the message.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    public TestSourceException(string? message)
+        : this(message, innerException: null)
+    {
+    }
 
-        #endregion
+    /// <summary>
+    /// Initializes with the message and innerException.
+    /// </summary>
+    /// <param name="message">Message for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception, or a null reference.</param>
+    public TestSourceException(string? message, Exception? innerException)
+        : base(message, innerException)
+    {
     }
+
 }
diff --git a/src/vstest.console/Friends.cs b/src/vstest.console/Friends.cs
index 9b2a48fabe..d1585a0dc4 100644
--- a/src/vstest.console/Friends.cs
+++ b/src/vstest.console/Friends.cs
@@ -5,12 +5,17 @@
 
 #region Product Assemblies
 
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestWindow.Host, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
 #endregion
 
 #region Test Assemblies
 
-[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("vstest.console.PlatformTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
+[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("TestPlatform.Playground, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.TestPlatform.Acceptance.IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
 #endregion
diff --git a/src/vstest.console/HandlerToEventsRegistrarAdapter.cs b/src/vstest.console/HandlerToEventsRegistrarAdapter.cs
new file mode 100644
index 0000000000..7da6a8c54c
--- /dev/null
+++ b/src/vstest.console/HandlerToEventsRegistrarAdapter.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+internal class DiscoveryHandlerToEventsRegistrarAdapter : ITestDiscoveryEventsRegistrar
+{
+    private readonly ITestDiscoveryEventsHandler2 _handler;
+    private readonly EventHandler<DiscoveredTestsEventArgs> _handleDiscoveredTests;
+    private readonly EventHandler<TestRunMessageEventArgs> _handleLogMessage;
+    private readonly EventHandler<DiscoveryCompleteEventArgs> _handleDiscoveryComplete;
+    private readonly EventHandler<string> _handleRawMessage;
+
+    public DiscoveryHandlerToEventsRegistrarAdapter(ITestDiscoveryEventsHandler2 handler)
+    {
+        _handler = handler;
+        _handleDiscoveredTests += (_, e) => _handler.HandleDiscoveredTests(e.DiscoveredTestCases);
+        _handleLogMessage += (_, e) => _handler.HandleLogMessage(e.Level, e.Message);
+        _handleDiscoveryComplete += (_, e) => _handler.HandleDiscoveryComplete(e, null);
+        _handleRawMessage += (_, e) =>
+        {
+            // No-op by design.
+            //
+            // For out-of-process vstest.console, raw messages are passed to the translation layer but
+            // they are never read and don't get passed to the actual events handler in TW. If they
+            // were (as it happens for in-process vstest.console since there is no more translation
+            // layer) a NotImplemented exception would be raised as per the time this of writing this
+            // note.
+            //
+            // Consider changing this logic in the future if TW changes the handling logic for raw
+            // messages.
+        };
+    }
+
+    public void LogWarning(string message)
+    {
+        _handler.HandleLogMessage(TestMessageLevel.Warning, message);
+    }
+
+    public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnDiscoveredTests += _handleDiscoveredTests;
+        discoveryRequest.OnDiscoveryMessage += _handleLogMessage;
+        discoveryRequest.OnDiscoveryComplete += _handleDiscoveryComplete;
+        discoveryRequest.OnRawMessageReceived += _handleRawMessage;
+    }
+
+    public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnDiscoveredTests -= _handleDiscoveredTests;
+        discoveryRequest.OnDiscoveryMessage -= _handleLogMessage;
+        discoveryRequest.OnDiscoveryComplete -= _handleDiscoveryComplete;
+        discoveryRequest.OnRawMessageReceived -= _handleRawMessage;
+    }
+}
+
+internal class RunHandlerToEventsRegistrarAdapter : ITestRunEventsRegistrar
+{
+    private readonly ITestRunEventsHandler _handler;
+    private readonly EventHandler<TestRunMessageEventArgs> _handleLogMessage;
+    private readonly EventHandler<string> _handleRawMessage;
+    private readonly EventHandler<TestRunChangedEventArgs> _handleTestRunStatsChange;
+    private readonly EventHandler<TestRunCompleteEventArgs> _handleTestRunComplete;
+
+    public RunHandlerToEventsRegistrarAdapter(ITestRunEventsHandler handler)
+    {
+        _handler = handler;
+        _handleLogMessage = (_, e) => _handler.HandleLogMessage(e.Level, e.Message);
+        _handleRawMessage = (_, e) =>
+        {
+            // No-op by design.
+            //
+            // For out-of-process vstest.console, raw messages are passed to the translation layer but
+            // they are never read and don't get passed to the actual events handler in TW. If they
+            // were (as it happens for in-process vstest.console since there is no more translation
+            // layer) a NotImplemented exception would be raised as per the time this of writing this
+            // note.
+            //
+            // Consider changing this logic in the future if TW changes the handling logic for raw
+            // messages.
+        };
+        _handleTestRunComplete = (_, e) => _handler.HandleTestRunComplete(e, null, null, null);
+        _handleTestRunStatsChange = (_, e) => _handler.HandleTestRunStatsChange(e);
+    }
+
+    public void LogWarning(string message)
+    {
+        _handler.HandleLogMessage(TestMessageLevel.Warning, message);
+    }
+
+    public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.TestRunMessage += _handleLogMessage;
+        testRunRequest.OnRawMessageReceived += _handleRawMessage;
+        testRunRequest.OnRunStatsChange += _handleTestRunStatsChange;
+        testRunRequest.OnRunCompletion += _handleTestRunComplete;
+    }
+
+    public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.TestRunMessage -= _handleLogMessage;
+        testRunRequest.OnRawMessageReceived -= _handleRawMessage;
+        testRunRequest.OnRunStatsChange -= _handleTestRunStatsChange;
+        testRunRequest.OnRunCompletion -= _handleTestRunComplete;
+    }
+}
diff --git a/src/vstest.console/InProcessVsTestConsoleWrapper.cs b/src/vstest.console/InProcessVsTestConsoleWrapper.cs
new file mode 100644
index 0000000000..5c9236d358
--- /dev/null
+++ b/src/vstest.console/InProcessVsTestConsoleWrapper.cs
@@ -0,0 +1,1304 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+extern alias Abstraction;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+/// <summary>
+/// The in-process wrapper.
+/// </summary>
+internal class InProcessVsTestConsoleWrapper : IVsTestConsoleWrapper
+{
+    // Must be in sync with the highest supported version in
+    // src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs file.
+    private readonly int _highestSupportedVersion = 6;
+
+    private readonly ITranslationLayerRequestSender _requestSender;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="InProcessVsTestConsoleWrapper"/>.
+    /// </summary>
+    /// 
+    /// <param name="consoleParameters">The console parameters.</param>
+    public InProcessVsTestConsoleWrapper(ConsoleParameters consoleParameters)
+        : this(
+              consoleParameters,
+              environmentVariableHelper: new EnvironmentVariableHelper(),
+              requestSender: new VsTestConsoleRequestSender(),
+              testRequestManager: null,
+              executor: new Executor(ConsoleOutput.Instance),
+              testPlatformEventSource: TestPlatformEventSource.Instance,
+              new())
+    { }
+
+    internal InProcessVsTestConsoleWrapper(
+        ConsoleParameters consoleParameters,
+        IEnvironmentVariableHelper environmentVariableHelper,
+        ITranslationLayerRequestSender requestSender,
+        ITestRequestManager? testRequestManager,
+        Executor executor,
+        ITestPlatformEventSource testPlatformEventSource,
+        UiLanguageOverride languageOverride)
+    {
+        // Setting the culture specified by user here since there's no more vstest.console process
+        // to set it for us. See vstest.console Main method for more info.
+        languageOverride.SetCultureSpecifiedByUser();
+
+        EqtTrace.Info("VsTestConsoleWrapper.StartSession: Starting VsTestConsoleWrapper session.");
+
+        _environmentVariableHelper = environmentVariableHelper;
+        _testPlatformEventSource = testPlatformEventSource;
+        _testPlatformEventSource.TranslationLayerInitializeStart();
+
+        // Start communication.
+        _requestSender = requestSender;
+        var port = _requestSender.InitializeCommunication();
+        if (port <= 0)
+        {
+            // Close the sender as it failed to host server.
+            _requestSender.Close();
+            throw new TransationLayerException(Resources.Resources.ErrorHostingCommunicationChannel);
+        }
+
+        // Fill the parameters.
+        consoleParameters.ParentProcessId =
+#if NET6_0_OR_GREATER
+            Environment.ProcessId;
+#else
+            System.Diagnostics.Process.GetCurrentProcess().Id;
+#endif
+        consoleParameters.PortNumber = port;
+
+        // Start vstest.console.
+        // Running vstest.console in process means we inherit all environment variables from the
+        // process we load the wrapper into. We do not want to alter this environment since that
+        // would mean we may interfer with the way the host process works. However, certain
+        // alterations are desired. The solution is to pass the environment variables we get via
+        // the console parameters directly to the testhost process and make sure that at least the
+        // testhost environment is predictable.
+        IDictionary<string, string?> environmentVariableBaseline = new Dictionary<string, string?>();
+        if (consoleParameters.InheritEnvironmentVariables)
+        {
+            // This is needed because GetEnvironmentVariables() returns a non-generic dictionary
+            // and we need to convert it to a generic dictionary for our use-case.
+            foreach (DictionaryEntry? entry in _environmentVariableHelper.GetEnvironmentVariables())
+            {
+                environmentVariableBaseline[entry?.Key.ToString()!] = entry?.Value?.ToString();
+            }
+        }
+
+        foreach (var pair in consoleParameters.EnvironmentVariables)
+        {
+            environmentVariableBaseline[pair.Key] = pair.Value;
+        }
+
+        ProcessHelper.ExternalEnvironmentVariables = environmentVariableBaseline;
+
+        string someExistingFile = typeof(InProcessVsTestConsoleWrapper).Assembly.Location;
+        using var manager = new VsTestConsoleProcessManager(someExistingFile);
+        var args = manager.BuildArguments(consoleParameters);
+        // Skip vstest.console path, we are already running in process, so it would just end up
+        // being understood as test dll to run. (it is present even though we don't provide
+        // dotnet path, because it is a .dll file).
+        args = args.Skip(1).ToArray();
+
+        // We standup the client, and it will allocate port as normal that we will never use.
+        // This is just to avoid "duplicating" all the setup logic that is done in argument
+        // processors before client processor. It created design mode client, and stores it as
+        // single instance.
+        // We connect back to the client but never use that connection, it only serves as
+        // "await" to make sure the design mode client is already initialized.
+        Task.Run<int>(() => executor.Execute(args));
+        WaitForConnection();
+
+        // Set the test request manager here.
+        TestRequestManager = testRequestManager;
+        if (TestRequestManager is null)
+        {
+            TPDebug.Assert(
+                DesignModeClient.Instance != null,
+                "DesignModeClient.Instance is null");
+            TestRequestManager = DesignModeClient.Instance.TestRequestManager;
+        }
+
+        _testPlatformEventSource.TranslationLayerInitializeStop();
+    }
+
+    internal ITestRequestManager? TestRequestManager { get; set; }
+
+    /// <inheritdoc/>
+    public void AbortTestRun()
+    {
+        try
+        {
+            TestRequestManager?.AbortTestRun();
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.AbortTestRun: Exception occurred: " + ex);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void CancelDiscovery()
+    {
+        try
+        {
+            TestRequestManager?.CancelDiscovery();
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.CancelDiscovery: Exception occurred: " + ex);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void CancelTestRun()
+    {
+        try
+        {
+            TestRequestManager?.CancelTestRun();
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.CancelTestRun: Exception occurred: " + ex);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void EndSession()
+    {
+        // Session means vstest.console process in the original api
+        // we don't have a process to manage, we are in-process.
+    }
+
+    /// <inheritdoc/>
+    public void StartSession()
+    {
+        // Session means vstest.console process in the original api
+        // we don't have a process to manage, we are in-process.
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StartTestSession(sources, runSettings, options: null, eventsHandler);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StartTestSession(
+            sources,
+            runSettings,
+            options,
+            eventsHandler,
+            testHostLauncher: null);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public ITestSession? StartTestSession(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        _testPlatformEventSource.TranslationLayerStartTestSessionStart();
+
+        var resetEvent = new ManualResetEvent(false);
+        TestSessionInfo? testSessionInfo = null;
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+            var startTestSessionPayload = new StartTestSessionPayload()
+            {
+                Sources = sources,
+                RunSettings = runSettings,
+                HasCustomHostLauncher = testHostLauncher != null,
+                IsDebuggingEnabled = testHostLauncher != null
+                                     && testHostLauncher.IsDebug,
+                TestPlatformOptions = options
+            };
+
+            var inProcessEventsHandler = new InProcessTestSessionEventsHandler(eventsHandler);
+            inProcessEventsHandler.StartTestSessionCompleteEventHandler += (_, eventArgs) =>
+            {
+                testSessionInfo = eventArgs?.TestSessionInfo;
+                resetEvent.Set();
+            };
+
+            TestRequestManager?.StartTestSession(
+                startTestSessionPayload,
+                (ITestHostLauncher3?)testHostLauncher,
+                inProcessEventsHandler,
+                new ProtocolConfig { Version = _highestSupportedVersion });
+
+            var timeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
+            if (!resetEvent.WaitOne(timeout))
+            {
+                throw new TransationLayerException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.StartTestSessionTimedOut,
+                        timeout));
+            }
+
+            inProcessEventsHandler.StartTestSessionCompleteEventHandler = null;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.StartTestSession: Exception occurred: " + ex);
+
+            eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            eventsHandler.HandleStartTestSessionComplete(new());
+        }
+
+        _testPlatformEventSource.TranslationLayerStartTestSessionStop();
+
+        return new TestSession(testSessionInfo, eventsHandler, this);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return StopTestSession(testSessionInfo, options: null, eventsHandler);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public bool StopTestSession(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerStopTestSessionStart();
+
+        var isStopped = false;
+        var resetEvent = new ManualResetEvent(false);
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+            var stopTestSessionPayload = new StopTestSessionPayload()
+            {
+                TestSessionInfo = testSessionInfo,
+                CollectMetrics = options?.CollectMetrics ?? false
+            };
+
+            var inProcessEventsHandler = new InProcessTestSessionEventsHandler(eventsHandler);
+            inProcessEventsHandler.StopTestSessionCompleteEventHandler += (_, eventArgs) =>
+            {
+                isStopped = (eventArgs?.IsStopped == true);
+                resetEvent.Set();
+            };
+
+            TestRequestManager?.StopTestSession(
+                stopTestSessionPayload,
+                inProcessEventsHandler,
+                new ProtocolConfig { Version = _highestSupportedVersion });
+
+            var timeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
+            if (!resetEvent.WaitOne(timeout))
+            {
+                throw new TransationLayerException(
+                    string.Format(
+                        CultureInfo.CurrentCulture,
+                        Resources.Resources.StopTestSessionTimedOut,
+                        timeout));
+            }
+
+            inProcessEventsHandler.StopTestSessionCompleteEventHandler = null;
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.StopTestSession: Exception occurred: " + ex);
+
+            eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            eventsHandler.HandleStopTestSessionComplete(new());
+        }
+
+        _testPlatformEventSource.TranslationLayerStopTestSessionStop();
+
+        return isStopped;
+    }
+
+    /// <inheritdoc/>
+    public void InitializeExtensions(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        try
+        {
+            TestRequestManager?.InitializeExtensions(
+                pathToAdditionalExtensions,
+                skipExtensionFilters: true);
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.InitializeExtensions: Exception occurred: " + ex);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        DiscoverTests(
+            sources,
+            discoverySettings,
+            options: null,
+            new DiscoveryEventsHandleConverter(discoveryEventsHandler));
+    }
+
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        DiscoverTests(
+            sources,
+            discoverySettings,
+            options,
+            testSessionInfo: null,
+            discoveryEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void DiscoverTests(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        _testPlatformEventSource.TranslationLayerDiscoveryStart();
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+            var discoveryRequestPayload = new DiscoveryRequestPayload()
+            {
+                Sources = sources,
+                RunSettings = discoverySettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            };
+
+            TestRequestManager?.DiscoverTests(
+                discoveryRequestPayload,
+                new DiscoveryHandlerToEventsRegistrarAdapter(discoveryEventsHandler),
+                new ProtocolConfig { Version = _highestSupportedVersion });
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.DiscoverTests: Exception occurred: " + ex);
+
+            discoveryEventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            var errorDiscoveryComplete = new DiscoveryCompleteEventArgs
+            {
+                IsAborted = true,
+                TotalCount = -1,
+            };
+            discoveryEventsHandler.HandleDiscoveryComplete(
+                errorDiscoveryComplete,
+                lastChunk: null);
+        }
+
+        _testPlatformEventSource.TranslationLayerDiscoveryStop();
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            0,
+            sourceList.Count,
+            runSettings ?? string.Empty);
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+
+            var testRunPayload = new TestRunRequestPayload
+            {
+                Sources = sourceList,
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            };
+
+            TestRequestManager?.RunTests(
+                testRunPayload,
+                customTestHostLauncher: null,
+                new RunHandlerToEventsRegistrarAdapter(testRunEventsHandler),
+                new ProtocolConfig { Version = _highestSupportedVersion });
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.RunTests: Exception occurred: " + ex);
+            var testRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, null, TimeSpan.MinValue);
+
+            testRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, null, null, null);
+        }
+
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        RunTests(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            0,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+
+            var testRunPayload = new TestRunRequestPayload
+            {
+                TestCases = testCaseList,
+                RunSettings = runSettings,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            };
+
+            TestRequestManager?.RunTests(
+                testRunPayload,
+                customTestHostLauncher: null,
+                new RunHandlerToEventsRegistrarAdapter(testRunEventsHandler),
+                new ProtocolConfig { Version = _highestSupportedVersion });
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.RunTests: Exception occurred: " + ex);
+            var testRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, null, TimeSpan.MinValue);
+
+            testRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, null, null, null);
+        }
+
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
+
+    /// <inheritdoc/>
+    public void RunTests(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        RunTests(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        var sourceList = sources.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            sourceList.Count,
+            0,
+            runSettings ?? string.Empty);
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+
+            // We must avoid re-launching the test host if the test run payload already
+            // contains test session info. Test session info being present is an indicative
+            // of an already running test host spawned by a start test session call.
+            var customLauncher =
+                testSessionInfo is null
+                    ? customTestHostLauncher
+                    : null;
+
+            var testRunPayload = new TestRunRequestPayload
+            {
+                Sources = sourceList,
+                RunSettings = runSettings,
+                DebuggingEnabled = customLauncher?.IsDebug == true,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            };
+
+            // TODO: this will need to be via an adapter instead. Because we will get a "live"
+            // implementation rather than our own implementation that we normally have in design
+            // mode client. It probably will even throw on this cast.
+            var upcastCustomLauncher = (ITestHostLauncher3?)customLauncher;
+
+            TestRequestManager?.RunTests(
+                testRunPayload,
+                upcastCustomLauncher,
+                new RunHandlerToEventsRegistrarAdapter(testRunEventsHandler),
+                new ProtocolConfig { Version = _highestSupportedVersion });
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.RunTestsWithCustomTestHost: Exception occurred: " + ex);
+            var testRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, null, TimeSpan.MinValue);
+
+            testRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, null, null, null);
+        }
+
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            sources,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo: null,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        var testCaseList = testCases.ToList();
+        _testPlatformEventSource.TranslationLayerExecutionStart(
+            1,
+            0,
+            testCaseList.Count,
+            runSettings ?? string.Empty);
+
+        try
+        {
+            TestRequestManager?.ResetOptions();
+
+            // We must avoid re-launching the test host if the test run payload already
+            // contains test session info. Test session info being present is an indicative
+            // of an already running test host spawned by a start test session call.
+            var customLauncher =
+                testSessionInfo is null
+                    ? customTestHostLauncher
+                    : null;
+
+            var testRunPayload = new TestRunRequestPayload
+            {
+                TestCases = testCaseList,
+                RunSettings = runSettings,
+                DebuggingEnabled = customLauncher?.IsDebug == true,
+                TestPlatformOptions = options,
+                TestSessionInfo = testSessionInfo
+            };
+
+            // TODO: this will need to be via an adapter instead. Because we will get a "live"
+            // implementation rather than our own implementation that we normally have in design
+            // mode client. It probably will even throw on this cast.
+            var upcastCustomLauncher = (ITestHostLauncher3?)customLauncher;
+
+            TestRequestManager?.RunTests(
+                testRunPayload,
+                upcastCustomLauncher,
+                new RunHandlerToEventsRegistrarAdapter(testRunEventsHandler),
+                new ProtocolConfig { Version = _highestSupportedVersion });
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.RunTestsWithCustomTestHost: Exception occurred: " + ex);
+            var testRunCompleteArgs = new TestRunCompleteEventArgs(null, false, true, ex, null, null, TimeSpan.MinValue);
+
+            testRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            testRunEventsHandler.HandleTestRunComplete(testRunCompleteArgs, null, null, null);
+        }
+
+        _testPlatformEventSource.TranslationLayerExecutionStop();
+    }
+
+    /// <inheritdoc/>
+    public void RunTestsWithCustomTestHost(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher? customTestHostLauncher)
+    {
+        RunTestsWithCustomTestHost(
+            testCases,
+            runSettings,
+            options,
+            testSessionInfo,
+            testRunEventsHandler,
+            customTestHostLauncher);
+    }
+
+    #region Async, not implemented
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        ITestDiscoveryEventsHandler discoveryEventsHandler)
+    {
+        await DiscoverTestsAsync(
+                sources,
+                discoverySettings,
+                options: null,
+                new DiscoveryEventsHandleConverter(discoveryEventsHandler))
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        await DiscoverTestsAsync(
+                sources,
+                discoverySettings,
+                options,
+                testSessionInfo: null,
+                discoveryEventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task DiscoverTestsAsync(
+        IEnumerable<string> sources,
+        string? discoverySettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestDiscoveryEventsHandler2 discoveryEventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task InitializeExtensionsAsync(IEnumerable<string> pathToAdditionalExtensions)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public async Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler eventsHandler,
+        CancellationToken cancellationToken)
+    {
+        await ProcessTestRunAttachmentsAsync(
+                attachments,
+                invokedDataCollectors: null,
+                processingSettings,
+                isLastBatch,
+                collectMetrics,
+                eventsHandler,
+                cancellationToken)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task ProcessTestRunAttachmentsAsync(
+        IEnumerable<AttachmentSet> attachments,
+        IEnumerable<InvokedDataCollector>? invokedDataCollectors,
+        string? processingSettings,
+        bool isLastBatch,
+        bool collectMetrics,
+        ITestRunAttachmentsProcessingEventsHandler eventsHandler,
+        CancellationToken cancellationToken)
+    {
+        _testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStart();
+
+        try
+        {
+            var attachmentProcessingPayload = new TestRunAttachmentsProcessingPayload
+            {
+                Attachments = attachments,
+                InvokedDataCollectors = invokedDataCollectors,
+                RunSettings = processingSettings,
+                CollectMetrics = collectMetrics
+            };
+
+            using (cancellationToken.Register(() =>
+                TestRequestManager?.CancelTestRunAttachmentsProcessing()))
+            {
+                // Awaiting the attachment processing task here. The implementation of the
+                // underlying operation guarantees the event handler is called when processing
+                // is complete, so when awaiting ends, the results have already been passed to
+                // the caller via the event handler. No need for further synchronization.
+                //
+                // NOTE: We're passing in CancellationToken.None and that is by design, *DO NOT*
+                // attempt to optimize this code by passing in the cancellation token registered
+                // above. Passing in the said token would result in potentially leaving the caller
+                // hanging when the token is signaled before even starting the test run attachment
+                // processing. In this scenario, the Task.Run should not even run in the first
+                // place, and as such the event handler that signals processing is complete will
+                // not be triggered anymore.
+                await Task.Run(() =>
+                        TestRequestManager?.ProcessTestRunAttachments(
+                            attachmentProcessingPayload,
+                            new InProcessTestRunAttachmentsProcessingEventsHandler(eventsHandler),
+                            new ProtocolConfig { Version = _highestSupportedVersion }),
+                        CancellationToken.None)
+                    .ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            EqtTrace.Error("InProcessVsTestConsoleWrapper.ProcessTestRunAttachmentsAsync: Exception occurred: " + ex);
+
+            var attachmentsProcessingArgs = new TestRunAttachmentsProcessingCompleteEventArgs(
+                isCanceled: cancellationToken.IsCancellationRequested,
+                ex);
+
+            eventsHandler.HandleLogMessage(TestMessageLevel.Error, ex.ToString());
+            eventsHandler.HandleTestRunAttachmentsProcessingComplete(attachmentsProcessingArgs, lastChunk: null);
+        }
+
+        _testPlatformEventSource.TranslationLayerTestRunAttachmentsProcessingStop();
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+                sources,
+                runSettings,
+                options: null,
+                testRunEventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+                sources,
+                runSettings,
+                options,
+                testSessionInfo: null,
+                testRunEventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+                testCases,
+                runSettings,
+                options: null,
+                testRunEventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        await RunTestsAsync(
+                testCases,
+                runSettings,
+                options,
+                testSessionInfo: null,
+                testRunEventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+                sources,
+                runSettings,
+                options: null,
+                testRunEventsHandler,
+                customTestHostLauncher)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+                sources,
+                runSettings,
+                options,
+                testSessionInfo: null,
+                testRunEventsHandler,
+                customTestHostLauncher)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+                testCases,
+                runSettings,
+                options: null,
+                testRunEventsHandler,
+                customTestHostLauncher)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        await RunTestsWithCustomTestHostAsync(
+                testCases,
+                runSettings,
+                options,
+                testSessionInfo: null,
+                testRunEventsHandler,
+                customTestHostLauncher)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task RunTestsWithCustomTestHostAsync(
+        IEnumerable<TestCase> testCases,
+        string? runSettings,
+        TestPlatformOptions? options,
+        TestSessionInfo? testSessionInfo,
+        ITestRunEventsHandler testRunEventsHandler,
+        ITelemetryEventsHandler telemetryEventsHandler,
+        ITestHostLauncher customTestHostLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    public Task StartSessionAsync()
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StartTestSessionAsync(
+                sources,
+                runSettings,
+                options: null,
+                eventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StartTestSessionAsync(
+                sources,
+                runSettings,
+                options,
+                eventsHandler,
+                testHostLauncher: null)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public Task<ITestSession?> StartTestSessionAsync(
+        IList<string> sources,
+        string? runSettings,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler,
+        ITestHostLauncher? testHostLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public async Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        return await StopTestSessionAsync(
+                testSessionInfo,
+                options: null,
+                eventsHandler)
+            .ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public Task<bool> StopTestSessionAsync(
+        TestSessionInfo? testSessionInfo,
+        TestPlatformOptions? options,
+        ITestSessionEventsHandler eventsHandler)
+    {
+        throw new NotImplementedException();
+    }
+    #endregion
+
+    private bool WaitForConnection()
+    {
+        EqtTrace.Info("InProcessVsTestConsoleWrapper.WaitForConnection: Waiting for connection to command line runner.");
+
+        var timeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
+        if (!_requestSender.WaitForRequestHandlerConnection(timeout))
+        {
+            throw new TransationLayerException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.RequestHandlerConnectionTimedOut,
+                    timeout));
+        }
+
+        _testPlatformEventSource.TranslationLayerInitializeStop();
+        return true;
+    }
+}
diff --git a/src/vstest.console/Internal/ConsoleHelper.cs b/src/vstest.console/Internal/ConsoleHelper.cs
index 73ad3975c4..cf4473b7d7 100644
--- a/src/vstest.console/Internal/ConsoleHelper.cs
+++ b/src/vstest.console/Internal/ConsoleHelper.cs
@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
-{
-    using System;
+using System;
 
-    internal class ConsoleHelper : IConsoleHelper
-    {
-        /// <inheritdoc />
-        public int CursorLeft => Console.CursorLeft;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
 
-        /// <inheritdoc />
-        public int CursorTop => Console.CursorTop;
+internal class ConsoleHelper : IConsoleHelper
+{
+    /// <inheritdoc />
+    public int CursorLeft => Console.CursorLeft;
 
-        /// <inheritdoc />
-        public int WindowWidth => Console.WindowWidth;
+    /// <inheritdoc />
+    public int CursorTop => Console.CursorTop;
 
-        /// <inheritdoc />
-        public void SetCursorPosition(int left, int top)
-        {
-            Console.SetCursorPosition(left, top);
-        }
+    /// <inheritdoc />
+    public int WindowWidth => Console.WindowWidth;
+
+    /// <inheritdoc />
+    public void SetCursorPosition(int left, int top)
+    {
+        Console.SetCursorPosition(left, top);
     }
 }
diff --git a/src/vstest.console/Internal/ConsoleLogger.cs b/src/vstest.console/Internal/ConsoleLogger.cs
index a12fde8bcb..7d6ef0278f 100644
--- a/src/vstest.console/Internal/ConsoleLogger.cs
+++ b/src/vstest.console/Internal/ConsoleLogger.cs
@@ -1,696 +1,693 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+/// <summary>
+/// Logger for sending output to the console.
+/// All the console logger messages prints to Standard Output with respective color, except OutputLevel.Error messages
+/// from adapters and test run result on failed.
+/// </summary>
+[FriendlyName(FriendlyName)]
+[ExtensionUri(ExtensionUri)]
+internal class ConsoleLogger : ITestLoggerWithParameters
 {
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Text;
-    using System.Xml.XPath;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using NuGet.Frameworks;
-    using CommandLineResources = Resources.Resources;
+    private const string TestMessageFormattingPrefix = " ";
+
     /// <summary>
-    /// Logger for sending output to the console.
-    /// All the console logger messages prints to Standard Output with respective color, except OutputLevel.Error messages
-    /// from adapters and test run result on failed.
+    /// Prefix used for formatting the result output
     /// </summary>
-    [FriendlyName(ConsoleLogger.FriendlyName)]
-    [ExtensionUri(ConsoleLogger.ExtensionUri)]
-    internal class ConsoleLogger : ITestLoggerWithParameters
-    {
-        #region Constants
-        private const string TestMessageFormattingPrefix = " ";
-
-        /// <summary>
-        /// Prefix used for formatting the result output
-        /// </summary>
-        private const string TestResultPrefix = "  ";
-
-        /// <summary>
-        /// Bool to decide whether Verbose level should be added as prefix or not in log messages.
-        /// </summary>
-        internal static bool AppendPrefix;
-
-        /// <summary>
-        /// Bool to decide whether progress indicator should be enabled.
-        /// </summary>
-        internal static bool EnableProgress;
-
-        /// <summary>
-        /// Uri used to uniquely identify the console logger.
-        /// </summary>
-        public const string ExtensionUri = "logger://Microsoft/TestPlatform/ConsoleLogger/v1";
-
-        /// <summary>
-        /// Alternate user friendly string to uniquely identify the console logger.
-        /// </summary>
-        public const string FriendlyName = "Console";
-
-        /// <summary>
-        /// Parameter for Verbosity
-        /// </summary>
-        public const string VerbosityParam = "verbosity";
-
-        /// <summary>
-        /// Parameter for log message prefix
-        /// </summary>
-        public const string PrefixParam = "prefix";
-
-        /// <summary>
-        /// Parameter for disabling progress
-        /// </summary>
-        public const string ProgressIndicatorParam = "progress";
-
-        /// <summary>
-        ///  Property Id storing the ParentExecutionId.
-        /// </summary>
-        public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
-
-        /// <summary>
-        ///  Property Id storing the ExecutionId.
-        /// </summary>
-        public const string ExecutionIdPropertyIdentifier = "ExecutionId";
-
-        // Figure out the longest result string (+1 for ! where applicable), so we don't 
-        // get misaligned output on non-english systems
-        private static int LongestResultIndicator = new[]
-        {
-            CommandLineResources.FailedTestIndicator.Length + 1,
-            CommandLineResources.PassedTestIndicator.Length + 1,
-            CommandLineResources.SkippedTestIndicator.Length + 1,
-            CommandLineResources.None.Length
-        }.Max();
-
-        #endregion
-
-        internal enum Verbosity
-        {
-            Quiet,
-            Minimal,
-            Normal,
-            Detailed
-        }
-
-        #region Fields
-
-        /// <summary>
-        /// Level of verbosity
-        /// </summary>
-#if NETFRAMEWORK
-        private Verbosity verbosityLevel = Verbosity.Normal;
-#else
-        // Keep default verbosity for x-plat command line as minimal
-        private Verbosity verbosityLevel = Verbosity.Minimal;
-#endif
-
-        private bool testRunHasErrorMessages = false;
+    private const string TestResultPrefix = "  ";
 
-        /// <summary>
-        /// Framework on which the test runs.
-        /// </summary>
-        private string targetFramework;
+    /// <summary>
+    /// Suffix used for formatting the result output
+    /// </summary>
+    private const string TestResultSuffix = " ";
 
-        #endregion
+    /// <summary>
+    /// Bool to decide whether Verbose level should be added as prefix or not in log messages.
+    /// </summary>
+    internal static bool AppendPrefix;
 
-        #region Constructor
+    /// <summary>
+    /// Bool to decide whether progress indicator should be enabled.
+    /// </summary>
+    internal static bool EnableProgress;
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public ConsoleLogger()
-        {
-        }
+    /// <summary>
+    /// Uri used to uniquely identify the console logger.
+    /// </summary>
+    public const string ExtensionUri = "logger://Microsoft/TestPlatform/ConsoleLogger/v1";
 
-        /// <summary>
-        /// Constructor added for testing purpose
-        /// </summary>
-        /// <param name="output"></param>
-        internal ConsoleLogger(IOutput output, IProgressIndicator progressIndicator)
-        {
-            ConsoleLogger.Output = output;
-            this.progressIndicator = progressIndicator;
-        }
+    /// <summary>
+    /// Alternate user friendly string to uniquely identify the console logger.
+    /// </summary>
+    public const string FriendlyName = "Console";
 
-        #endregion
+    /// <summary>
+    /// Parameter for Verbosity
+    /// </summary>
+    public const string VerbosityParam = "verbosity";
 
-        #region Properties 
+    /// <summary>
+    /// Parameter for log message prefix
+    /// </summary>
+    public const string PrefixParam = "prefix";
 
-        /// <summary>
-        /// Gets instance of IOutput used for sending output.
-        /// </summary>
-        /// <remarks>Protected so this can be detoured for testing purposes.</remarks>
-        protected static IOutput Output
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Parameter for disabling progress
+    /// </summary>
+    public const string ProgressIndicatorParam = "progress";
 
-        private IProgressIndicator progressIndicator;
+    /// <summary>
+    ///  Property Id storing the ParentExecutionId.
+    /// </summary>
+    public const string ParentExecutionIdPropertyIdentifier = "ParentExecId";
 
-        /// <summary>
-        /// Get the verbosity level for the console logger
-        /// </summary>
-        public Verbosity VerbosityLevel => verbosityLevel;
+    /// <summary>
+    ///  Property Id storing the ExecutionId.
+    /// </summary>
+    public const string ExecutionIdPropertyIdentifier = "ExecutionId";
 
-        /// <summary>
-        /// Tracks leaf test outcomes per source. This is needed to correctly count hierarchical tests as well as 
-        /// tracking counts per source for the minimal and quiet output.
-        /// </summary>
-        private ConcurrentDictionary<Guid, MinimalTestResult> LeafTestResults { get; set; }
+    // Figure out the longest result string (+1 for ! where applicable), so we don't
+    // get misaligned output on non-english systems
+    private static readonly int LongestResultIndicator = new[]
+    {
+        CommandLineResources.FailedTestIndicator.Length + 1,
+        CommandLineResources.PassedTestIndicator.Length + 1,
+        CommandLineResources.SkippedTestIndicator.Length + 1,
+        CommandLineResources.None.Length
+    }.Max();
 
-        #endregion
+    internal enum Verbosity
+    {
+        Quiet,
+        Minimal,
+        Normal,
+        Detailed
+    }
 
-        #region ITestLoggerWithParameters
+    private bool _testRunHasErrorMessages;
 
-        /// <summary>
-        /// Initializes the Test Logger.
-        /// </summary>
-        /// <param name="events">Events that can be registered for.</param>
-        /// <param name="testRunDirectory">Test Run Directory</param>
-        public void Initialize(TestLoggerEvents events, string testRunDirectory)
-        {
-            if (events == null)
-            {
-                throw new ArgumentNullException(nameof(events));
-            }
+    /// <summary>
+    /// Framework on which the test runs.
+    /// </summary>
+    private string? _targetFramework;
 
-            if (ConsoleLogger.Output == null)
-            {
-                ConsoleLogger.Output = ConsoleOutput.Instance;
-            }
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public ConsoleLogger()
+    {
+    }
 
-            if (this.progressIndicator == null && !Console.IsOutputRedirected && EnableProgress)
-            {
-                // Progress indicator needs to be displayed only for cli experience.
-                this.progressIndicator = new ProgressIndicator(Output, new ConsoleHelper());
-            }
+    /// <summary>
+    /// Constructor added for testing purpose
+    /// </summary>
+    internal ConsoleLogger(IOutput output, IProgressIndicator progressIndicator, IFeatureFlag featureFlag)
+    {
+        Output = output;
+        _progressIndicator = progressIndicator;
+        _featureFlag = featureFlag;
+    }
 
-            // Register for the events.
-            events.TestRunMessage += this.TestMessageHandler;
-            events.TestResult += this.TestResultHandler;
-            events.TestRunComplete += this.TestRunCompleteHandler;
-            events.TestRunStart += this.TestRunStartHandler;
+    /// <summary>
+    /// Gets instance of IOutput used for sending output.
+    /// </summary>
+    /// <remarks>Protected so this can be detoured for testing purposes.</remarks>
+    protected static IOutput? Output
+    {
+        get;
+        private set;
+    }
 
-            // Register for the discovery events.
-            events.DiscoveryMessage += this.TestMessageHandler;
-            this.LeafTestResults = new ConcurrentDictionary<Guid, MinimalTestResult>();
+    private IProgressIndicator? _progressIndicator;
 
-            // TODO Get changes from https://github.com/Microsoft/vstest/pull/1111/
-            // events.DiscoveredTests += DiscoveredTestsHandler;
-        }
+    private readonly IFeatureFlag _featureFlag = FeatureFlag.Instance;
 
-        public void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)
-        {
-            if (parameters == null)
-            {
-                throw new ArgumentNullException(nameof(parameters));
-            }
+    /// <summary>
+    /// Get the verbosity level for the console logger
+    /// </summary>
 
-            if (parameters.Count == 0)
-            {
-                throw new ArgumentException("No default parameters added", nameof(parameters));
-            }
+    public Verbosity VerbosityLevel { get; private set; } =
+#if NETFRAMEWORK
+        Verbosity.Normal;
+#else
+        // Keep default verbosity for x-plat command line as minimal
+        Verbosity.Minimal;
+#endif
 
-            var verbosityExists = parameters.TryGetValue(ConsoleLogger.VerbosityParam, out var verbosity);
-            if (verbosityExists && Enum.TryParse(verbosity, true, out Verbosity verbosityLevel))
-            {
-                this.verbosityLevel = verbosityLevel;
-            }
+    /// <summary>
+    /// Tracks leaf test outcomes per source. This is needed to correctly count hierarchical tests as well as
+    /// tracking counts per source for the minimal and quiet output.
+    /// </summary>
+    private ConcurrentDictionary<Guid, MinimalTestResult>? LeafTestResults { get; set; }
 
-            var prefixExists = parameters.TryGetValue(ConsoleLogger.PrefixParam, out var prefix);
-            if (prefixExists)
-            {
-                bool.TryParse(prefix, out AppendPrefix);
-            }
+    #region ITestLoggerWithParameters
 
-            var progressArgExists = parameters.TryGetValue(ConsoleLogger.ProgressIndicatorParam, out var enableProgress);
-            if (progressArgExists)
-            {
-                bool.TryParse(enableProgress, out EnableProgress);
-            }
+    /// <summary>
+    /// Initializes the Test Logger.
+    /// </summary>
+    /// <param name="events">Events that can be registered for.</param>
+    /// <param name="testRunDirectory">Test Run Directory</param>
+    [MemberNotNull(nameof(Output), nameof(LeafTestResults))]
+    public void Initialize(TestLoggerEvents events, string testRunDirectory)
+    {
+        ValidateArg.NotNull(events, nameof(events));
 
-            parameters.TryGetValue(DefaultLoggerParameterNames.TargetFramework, out this.targetFramework);
-            this.targetFramework = !string.IsNullOrEmpty(this.targetFramework) ? NuGetFramework.Parse(this.targetFramework).GetShortFolderName() : this.targetFramework;
+        Output ??= ConsoleOutput.Instance;
 
-            Initialize(events, String.Empty);
+        if (_progressIndicator == null && !Console.IsOutputRedirected && EnableProgress)
+        {
+            // Progress indicator needs to be displayed only for cli experience.
+            _progressIndicator = new ProgressIndicator(Output, new ConsoleHelper());
         }
-        #endregion
 
-        #region Private Methods
+        // Register for the events.
+        events.TestRunMessage += TestMessageHandler;
+        events.TestResult += TestResultHandler;
+        events.TestRunComplete += TestRunCompleteHandler;
+        events.TestRunStart += TestRunStartHandler;
 
-        /// <summary>
-        /// Prints the timespan onto console. 
-        /// </summary>
-        private static void PrintTimeSpan(TimeSpan timeSpan)
+        // Register for the discovery events.
+        events.DiscoveryMessage += TestMessageHandler;
+        LeafTestResults = new ConcurrentDictionary<Guid, MinimalTestResult>();
+
+        // TODO Get changes from https://github.com/Microsoft/vstest/pull/1111/
+        // events.DiscoveredTests += DiscoveredTestsHandler;
+    }
+
+    public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
+    {
+        ValidateArg.NotNull(parameters, nameof(parameters));
+
+        if (parameters.Count == 0)
         {
-            if (timeSpan.TotalDays >= 1)
-            {
-                Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalDays, CommandLineResources.Days));
-            }
-            else if (timeSpan.TotalHours >= 1)
-            {
-                Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalHours, CommandLineResources.Hours));
-            }
-            else if (timeSpan.TotalMinutes >= 1)
-            {
-                Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalMinutes, CommandLineResources.Minutes));
-            }
-            else
-            {
-                Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalSeconds, CommandLineResources.Seconds));
-            }
+            throw new ArgumentException("No default parameters added", nameof(parameters));
         }
 
-        /// <summary>
-        /// Constructs a well formatted string using the given prefix before every message content on each line.
-        /// </summary>
-        private static string GetFormattedOutput(Collection<TestResultMessage> testMessageCollection)
+        var verbosityExists = parameters.TryGetValue(VerbosityParam, out var verbosity);
+        if (verbosityExists && Enum.TryParse(verbosity, true, out Verbosity verbosityLevel))
         {
-            if (testMessageCollection != null)
-            {
-                var sb = new StringBuilder();
-                foreach (var message in testMessageCollection)
-                {
-                    var prefix = String.Format(CultureInfo.CurrentCulture, "{0}{1}", Environment.NewLine, TestMessageFormattingPrefix);
-                    var messageText = message.Text?.Replace(Environment.NewLine, prefix).TrimEnd(TestMessageFormattingPrefix.ToCharArray());
+            VerbosityLevel = verbosityLevel;
+        }
 
-                    if (!string.IsNullOrWhiteSpace(messageText))
-                    {
-                        sb.AppendFormat(CultureInfo.CurrentCulture, "{0}{1}", TestMessageFormattingPrefix, messageText);
-                    }
-                }
-                return sb.ToString();
-            }
-            return String.Empty;
+        var prefixExists = parameters.TryGetValue(PrefixParam, out var prefix);
+        if (prefixExists)
+        {
+            _ = bool.TryParse(prefix, out AppendPrefix);
         }
 
-        /// <summary>
-        /// Collects all the messages of a particular category(Standard Output/Standard Error/Debug Traces) and returns a collection.
-        /// </summary>
-        private static Collection<TestResultMessage> GetTestMessages(Collection<TestResultMessage> Messages, string requiredCategory)
+        var progressArgExists = parameters.TryGetValue(ProgressIndicatorParam, out var enableProgress);
+        if (progressArgExists)
         {
-            var selectedMessages = Messages.Where(msg => msg.Category.Equals(requiredCategory, StringComparison.OrdinalIgnoreCase));
-            var requiredMessageCollection = new Collection<TestResultMessage>(selectedMessages.ToList());
-            return requiredMessageCollection;
+            _ = bool.TryParse(enableProgress, out EnableProgress);
         }
 
-        /// <summary>
-        /// outputs the Error messages, Stack Trace, and other messages for the parameter test.
-        /// </summary>
-        private static void DisplayFullInformation(TestResult result)
+        parameters.TryGetValue(DefaultLoggerParameterNames.TargetFramework, out _targetFramework);
+        _targetFramework = Framework.FromString(_targetFramework)?.ShortName ?? _targetFramework;
+
+        Initialize(events, string.Empty);
+    }
+    #endregion
+
+    /// <summary>
+    /// Prints the timespan onto console.
+    /// </summary>
+    private static void PrintTimeSpan(TimeSpan timeSpan)
+    {
+        TPDebug.Assert(Output is not null, "ConsoleLogger.Output is null");
+
+        if (timeSpan.TotalDays >= 1)
+        {
+            Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalDays, CommandLineResources.Days));
+        }
+        else if (timeSpan.TotalHours >= 1)
         {
+            Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalHours, CommandLineResources.Hours));
+        }
+        else if (timeSpan.TotalMinutes >= 1)
+        {
+            Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalMinutes, CommandLineResources.Minutes));
+        }
+        else
+        {
+            Output.Information(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, timeSpan.TotalSeconds, CommandLineResources.Seconds));
+        }
+    }
 
-            // Add newline if it is not in given output data.
-            var addAdditionalNewLine = false;
+    /// <summary>
+    /// Constructs a well formatted string using the given prefix before every message content on each line.
+    /// </summary>
+    private static string GetFormattedOutput(Collection<TestResultMessage> testMessageCollection)
+    {
+        if (testMessageCollection == null)
+        {
+            return string.Empty;
+        }
 
-            Debug.Assert(result != null, "a null result can not be displayed");
-            if (!String.IsNullOrEmpty(result.ErrorMessage))
-            {
-                addAdditionalNewLine = true;
-                Output.Information(false, ConsoleColor.Red, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.ErrorMessageBanner));
-                var errorMessage = String.Format(CultureInfo.CurrentCulture, "{0}{1}{2}", TestResultPrefix, TestMessageFormattingPrefix, result.ErrorMessage);
-                Output.Information(false, ConsoleColor.Red, errorMessage);
-            }
+        var sb = new StringBuilder();
+        foreach (var message in testMessageCollection)
+        {
+            var prefix = string.Format(CultureInfo.CurrentCulture, "{0}{1}", Environment.NewLine, TestMessageFormattingPrefix);
+            var messageText = message.Text?.Replace(Environment.NewLine, prefix).TrimEnd(TestMessageFormattingPrefix.ToCharArray());
 
-            if (!String.IsNullOrEmpty(result.ErrorStackTrace))
+            if (!messageText.IsNullOrWhiteSpace())
             {
-                addAdditionalNewLine = false;
-                Output.Information(false, ConsoleColor.Red, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.StacktraceBanner));
-                var stackTrace = String.Format(CultureInfo.CurrentCulture, "{0}{1}", TestResultPrefix, result.ErrorStackTrace);
-                Output.Information(false, ConsoleColor.Red, stackTrace);
+                sb.AppendFormat(CultureInfo.CurrentCulture, "{0}{1}", TestMessageFormattingPrefix, messageText);
             }
+        }
+        return sb.ToString();
+    }
 
-            var stdOutMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardOutCategory);
-            if (stdOutMessagesCollection.Count > 0)
-            {
-                addAdditionalNewLine = true;
-                var stdOutMessages = GetFormattedOutput(stdOutMessagesCollection);
+    /// <summary>
+    /// Collects all the messages of a particular category(Standard Output/Standard Error/Debug Traces) and returns a collection.
+    /// </summary>
+    private static Collection<TestResultMessage> GetTestMessages(Collection<TestResultMessage> messages, string requiredCategory)
+    {
+        var selectedMessages = messages.Where(msg => msg.Category.Equals(requiredCategory, StringComparison.OrdinalIgnoreCase));
+        var requiredMessageCollection = new Collection<TestResultMessage>(selectedMessages.ToList());
+        return requiredMessageCollection;
+    }
 
-                if (!string.IsNullOrEmpty(stdOutMessages))
-                {
-                    Output.Information(false, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.StdOutMessagesBanner));
-                    Output.Information(false, stdOutMessages);
-                }
-            }
+    /// <summary>
+    /// outputs the Error messages, Stack Trace, and other messages for the parameter test.
+    /// </summary>
+    private static void DisplayFullInformation(TestResult result)
+    {
+        TPDebug.Assert(result != null, "a null result can not be displayed");
+        TPDebug.Assert(Output != null, "Initialize should have been called.");
 
-            var stdErrMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardErrorCategory);
-            if (stdErrMessagesCollection.Count > 0)
-            {
-                addAdditionalNewLine = false;
-                var stdErrMessages = GetFormattedOutput(stdErrMessagesCollection);
+        // Add newline if it is not in given output data.
+        var addAdditionalNewLine = false;
 
-                if (!string.IsNullOrEmpty(stdErrMessages))
-                {
-                    Output.Information(false, ConsoleColor.Red, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.StdErrMessagesBanner));
-                    Output.Information(false, ConsoleColor.Red, stdErrMessages);
-                }
-            }
+        if (!result.ErrorMessage.IsNullOrEmpty())
+        {
+            addAdditionalNewLine = true;
+            Output.Information(false, ConsoleColor.Red, TestResultPrefix + CommandLineResources.ErrorMessageBanner);
+            var errorMessage = string.Format(CultureInfo.CurrentCulture, "{0}{1}{2}", TestResultPrefix, TestMessageFormattingPrefix, result.ErrorMessage);
+            Output.Information(false, ConsoleColor.Red, errorMessage);
+        }
 
-            var DbgTrcMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.DebugTraceCategory);
-            if (DbgTrcMessagesCollection.Count > 0)
-            {
-                addAdditionalNewLine = false;
-                var dbgTrcMessages = GetFormattedOutput(DbgTrcMessagesCollection);
+        if (!result.ErrorStackTrace.IsNullOrEmpty())
+        {
+            addAdditionalNewLine = false;
+            Output.Information(false, ConsoleColor.Red, TestResultPrefix + CommandLineResources.StacktraceBanner);
+            var stackTrace = string.Format(CultureInfo.CurrentCulture, "{0}{1}", TestResultPrefix, result.ErrorStackTrace);
+            Output.Information(false, ConsoleColor.Red, stackTrace);
+        }
 
-                if (!string.IsNullOrEmpty(dbgTrcMessages))
-                {
-                    Output.Information(false, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.DbgTrcMessagesBanner));
-                    Output.Information(false, dbgTrcMessages);
-                }
-            }
+        var stdOutMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardOutCategory);
+        if (stdOutMessagesCollection.Count > 0)
+        {
+            addAdditionalNewLine = true;
+            var stdOutMessages = GetFormattedOutput(stdOutMessagesCollection);
 
-            var addnlInfoMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.AdditionalInfoCategory);
-            if (addnlInfoMessagesCollection.Count > 0)
+            if (!stdOutMessages.IsNullOrEmpty())
             {
-                addAdditionalNewLine = false;
-                var addnlInfoMessages = GetFormattedOutput(addnlInfoMessagesCollection);
-
-                if (!string.IsNullOrEmpty(addnlInfoMessages))
-                {
-                    Output.Information(false, string.Format("{0}{1}", TestResultPrefix, CommandLineResources.AddnlInfoMessagesBanner));
-                    Output.Information(false, addnlInfoMessages);
-                }
+                Output.Information(false, TestResultPrefix + CommandLineResources.StdOutMessagesBanner);
+                Output.Information(false, stdOutMessages);
             }
+        }
 
-            if (addAdditionalNewLine)
+        var stdErrMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardErrorCategory);
+        if (stdErrMessagesCollection.Count > 0)
+        {
+            addAdditionalNewLine = false;
+            var stdErrMessages = GetFormattedOutput(stdErrMessagesCollection);
+
+            if (!stdErrMessages.IsNullOrEmpty())
             {
-                Output.WriteLine(String.Empty, OutputLevel.Information);
+                Output.Information(false, ConsoleColor.Red, TestResultPrefix + CommandLineResources.StdErrMessagesBanner);
+                Output.Information(false, ConsoleColor.Red, stdErrMessages);
             }
         }
 
-        /// <summary>
-        /// Returns the parent Execution id of given test result.
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns></returns>
-        private Guid GetParentExecutionId(TestResult testResult)
+        var dbgTrcMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.DebugTraceCategory);
+        if (dbgTrcMessagesCollection.Count > 0)
         {
-            var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
-                property.Id.Equals(ParentExecutionIdPropertyIdentifier));
-            return parentExecutionIdProperty == null
-                ? Guid.Empty
-                : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+            addAdditionalNewLine = false;
+            var dbgTrcMessages = GetFormattedOutput(dbgTrcMessagesCollection);
+
+            if (!dbgTrcMessages.IsNullOrEmpty())
+            {
+                Output.Information(false, TestResultPrefix + CommandLineResources.DbgTrcMessagesBanner);
+                Output.Information(false, dbgTrcMessages);
+            }
         }
 
-        /// <summary>
-        /// Returns execution id of given test result
-        /// </summary>
-        /// <param name="testResult"></param>
-        /// <returns></returns>
-        private Guid GetExecutionId(TestResult testResult)
+        var addnlInfoMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.AdditionalInfoCategory);
+        if (addnlInfoMessagesCollection.Count > 0)
         {
-            var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
-                property.Id.Equals(ExecutionIdPropertyIdentifier));
-            var executionId = Guid.Empty;
+            addAdditionalNewLine = false;
+            var addnlInfoMessages = GetFormattedOutput(addnlInfoMessagesCollection);
 
-            if (executionIdProperty != null)
+            if (!addnlInfoMessages.IsNullOrEmpty())
             {
-                executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+                Output.Information(false, TestResultPrefix + CommandLineResources.AddnlInfoMessagesBanner);
+                Output.Information(false, addnlInfoMessages);
             }
+        }
 
-            return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+        if (addAdditionalNewLine)
+        {
+            Output.WriteLine(string.Empty, OutputLevel.Information);
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Returns the parent Execution id of given test result.
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns></returns>
+    private static Guid GetParentExecutionId(TestResult testResult)
+    {
+        var parentExecutionIdProperty = testResult.Properties.FirstOrDefault(property =>
+            property.Id.Equals(ParentExecutionIdPropertyIdentifier));
+        return parentExecutionIdProperty == null
+            ? Guid.Empty
+            : testResult.GetPropertyValue(parentExecutionIdProperty, Guid.Empty);
+    }
 
-       #region Event Handlers
+    /// <summary>
+    /// Returns execution id of given test result
+    /// </summary>
+    /// <param name="testResult"></param>
+    /// <returns></returns>
+    private static Guid GetExecutionId(TestResult testResult)
+    {
+        var executionIdProperty = testResult.Properties.FirstOrDefault(property =>
+            property.Id.Equals(ExecutionIdPropertyIdentifier));
+        var executionId = Guid.Empty;
 
-        /// <summary>
-        /// Called when a test run start is received
-        /// </summary>
-        private void TestRunStartHandler(object sender, TestRunStartEventArgs e)
+        if (executionIdProperty != null)
         {
-            ValidateArg.NotNull<object>(sender, nameof(sender));
-            ValidateArg.NotNull<TestRunStartEventArgs>(e, nameof(e));
+            executionId = testResult.GetPropertyValue(executionIdProperty, Guid.Empty);
+        }
 
-            // Print all test containers.
-            Output.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information);
-            if (verbosityLevel == Verbosity.Detailed)
+        return executionId.Equals(Guid.Empty) ? Guid.NewGuid() : executionId;
+    }
+
+    /// <summary>
+    /// Called when a test run start is received
+    /// </summary>
+    private void TestRunStartHandler(object? sender, TestRunStartEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(Output != null, "Initialize should have been called");
+
+        // Print all test containers.
+        Output.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information);
+        if (VerbosityLevel == Verbosity.Detailed)
+        {
+            foreach (var source in CommandLineOptions.Instance.Sources)
             {
-                foreach (var source in CommandLineOptions.Instance.Sources)
-                {
-                    Output.WriteLine(source, OutputLevel.Information);
-                }
+                Output.WriteLine(source, OutputLevel.Information);
             }
         }
+    }
 
-        /// <summary>
-        /// Called when a test message is received.
-        /// </summary>
-        private void TestMessageHandler(object sender, TestRunMessageEventArgs e)
-        {
-            ValidateArg.NotNull<object>(sender, nameof(sender));
-            ValidateArg.NotNull<TestRunMessageEventArgs>(e, nameof(e));
+    /// <summary>
+    /// Called when a test message is received.
+    /// </summary>
+    private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(Output is not null, "ConsoleLogger.Output is null");
 
-            switch (e.Level)
-            {
-                case TestMessageLevel.Informational:
+        switch (e.Level)
+        {
+            case TestMessageLevel.Informational:
+                {
+                    if (VerbosityLevel is Verbosity.Quiet or Verbosity.Minimal)
                     {
-                        if (verbosityLevel == Verbosity.Quiet || verbosityLevel == Verbosity.Minimal)
-                        {
-                            break;
-                        }
-
-                        // Pause the progress indicator to print the message
-                        this.progressIndicator?.Pause();
-
-                        Output.Information(AppendPrefix, e.Message);
-
-                        // Resume the progress indicator after printing the message
-                        this.progressIndicator?.Start();
-
                         break;
                     }
 
-                case TestMessageLevel.Warning:
-                    {
-                        if (verbosityLevel == Verbosity.Quiet)
-                        {
-                            break;
-                        }
+                    // Pause the progress indicator to print the message
+                    _progressIndicator?.Pause();
 
-                        // Pause the progress indicator to print the message
-                        this.progressIndicator?.Pause();
+                    Output.Information(AppendPrefix, e.Message);
 
-                        Output.Warning(AppendPrefix, e.Message);
+                    // Resume the progress indicator after printing the message
+                    _progressIndicator?.Start();
 
-                        // Resume the progress indicator after printing the message
-                        this.progressIndicator?.Start();
+                    break;
+                }
 
+            case TestMessageLevel.Warning:
+                {
+                    if (VerbosityLevel == Verbosity.Quiet)
+                    {
                         break;
                     }
 
-                case TestMessageLevel.Error:
-                    {
-                        // Pause the progress indicator to print the message
-                        this.progressIndicator?.Pause();
+                    // Pause the progress indicator to print the message
+                    _progressIndicator?.Pause();
 
-                        this.testRunHasErrorMessages = true;
-                        Output.Error(AppendPrefix, e.Message);
+                    Output.Warning(AppendPrefix, e.Message);
 
-                        // Resume the progress indicator after printing the message
-                        this.progressIndicator?.Start();
+                    // Resume the progress indicator after printing the message
+                    _progressIndicator?.Start();
 
-                        break;
-                    }
-                default:
-                    EqtTrace.Warning("ConsoleLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
                     break;
-            }
-        }
+                }
 
-        /// <summary>
-        /// Called when a test result is received.
-        /// </summary>
-        private void TestResultHandler(object sender, TestResultEventArgs e)
-        {
-            ValidateArg.NotNull<object>(sender, nameof(sender));
-            ValidateArg.NotNull<TestResultEventArgs>(e, nameof(e));
+            case TestMessageLevel.Error:
+                {
+                    // Pause the progress indicator to print the message
+                    _progressIndicator?.Pause();
 
-            var testDisplayName = e.Result.DisplayName;
+                    _testRunHasErrorMessages = true;
+                    Output.Error(AppendPrefix, e.Message);
 
-            if (string.IsNullOrWhiteSpace(e.Result.DisplayName))
-            {
-                testDisplayName = e.Result.TestCase.DisplayName;
-            }
+                    // Resume the progress indicator after printing the message
+                    _progressIndicator?.Start();
 
-            string formattedDuration = this.GetFormattedDurationString(e.Result.Duration);
-            if (!string.IsNullOrEmpty(formattedDuration))
-            {
-                testDisplayName = string.Format("{0} [{1}]", testDisplayName, formattedDuration);
-            }
+                    break;
+                }
+            default:
+                EqtTrace.Warning("ConsoleLogger.TestMessageHandler: The test message level is unrecognized: {0}", e.Level.ToString());
+                break;
+        }
+    }
 
-            var executionId = GetExecutionId(e.Result);
-            var parentExecutionId = GetParentExecutionId(e.Result);
+    /// <summary>
+    /// Called when a test result is received.
+    /// </summary>
+    private void TestResultHandler(object? sender, TestResultEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(Output != null && LeafTestResults != null, "Initialize should have been called");
 
-            if (parentExecutionId != Guid.Empty)
-            {
-                // Not checking the result value.
-                // This would return false if the id did not exist,
-                // or true if it did exist. In either case the id is not in the dictionary
-                // which is our goal.
-                LeafTestResults.TryRemove(parentExecutionId, out _);
-            }
+        var testDisplayName = e.Result.DisplayName;
 
-            if (!LeafTestResults.TryAdd(executionId, new MinimalTestResult(e.Result)))
-            {
-                // This would happen if the key already exists. This should not happen, because we are 
-                // inserting by GUID key, so this would mean an error in our code.
-                throw new InvalidOperationException($"ExecutionId {executionId} already exists.");
-            }
+        if (e.Result.DisplayName.IsNullOrWhiteSpace())
+        {
+            testDisplayName = e.Result.TestCase.DisplayName;
+        }
 
-            switch (e.Result.Outcome)
-            {
-                case TestOutcome.Skipped:
-                    {
-                        if (this.verbosityLevel == Verbosity.Quiet)
-                        {
-                            break;
-                        }
+        string? formattedDuration = GetFormattedDurationString(e.Result.Duration);
+        if (!formattedDuration.IsNullOrEmpty())
+        {
+            testDisplayName = $"{testDisplayName} [{formattedDuration}]";
+        }
 
-                        // Pause the progress indicator before displaying test result information
-                        this.progressIndicator?.Pause();
+        var executionId = GetExecutionId(e.Result);
+        var parentExecutionId = GetParentExecutionId(e.Result);
 
-                        Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow);
-                        Output.WriteLine(testDisplayName, OutputLevel.Information);
-                        if (this.verbosityLevel == Verbosity.Detailed)
-                        {
-                            DisplayFullInformation(e.Result);
-                        }
+        if (parentExecutionId != Guid.Empty)
+        {
+            // Not checking the result value.
+            // This would return false if the id did not exist,
+            // or true if it did exist. In either case the id is not in the dictionary
+            // which is our goal.
+            LeafTestResults.TryRemove(parentExecutionId, out _);
+        }
 
-                        // Resume the progress indicator after displaying the test result information
-                        this.progressIndicator?.Start();
+        if (!LeafTestResults.TryAdd(executionId, new MinimalTestResult(e.Result)))
+        {
+            // This would happen if the key already exists. This should not happen, because we are
+            // inserting by GUID key, so this would mean an error in our code.
+            throw new InvalidOperationException($"ExecutionId {executionId} already exists.");
+        }
 
+        switch (e.Result.Outcome)
+        {
+            case TestOutcome.Skipped:
+                {
+                    if (VerbosityLevel == Verbosity.Quiet)
+                    {
                         break;
                     }
 
-                case TestOutcome.Failed:
-                    {
-                        if (this.verbosityLevel == Verbosity.Quiet)
-                        {
-                            break;
-                        }
+                    // Pause the progress indicator before displaying test result information
+                    _progressIndicator?.Pause();
 
-                        // Pause the progress indicator before displaying test result information
-                        this.progressIndicator?.Pause();
-
-                        Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.FailedTestIndicator), OutputLevel.Information, ConsoleColor.Red);
-                        Output.WriteLine(testDisplayName, OutputLevel.Information);
+                    Output.Write(GetFormattedTestIndicator(CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow);
+                    Output.WriteLine(testDisplayName, OutputLevel.Information);
+                    if (VerbosityLevel == Verbosity.Detailed)
+                    {
                         DisplayFullInformation(e.Result);
+                    }
 
-                        // Resume the progress indicator after displaying the test result information
-                        this.progressIndicator?.Start();
+                    // Resume the progress indicator after displaying the test result information
+                    _progressIndicator?.Start();
 
-                        break;
-                    }
+                    break;
+                }
 
-                case TestOutcome.Passed:
+            case TestOutcome.Failed:
+                {
+                    if (VerbosityLevel == Verbosity.Quiet)
                     {
-                        if (this.verbosityLevel == Verbosity.Normal || this.verbosityLevel == Verbosity.Detailed)
-                        {
-                            // Pause the progress indicator before displaying test result information
-                            this.progressIndicator?.Pause();
-
-                            Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.PassedTestIndicator), OutputLevel.Information, ConsoleColor.Green);
-                            Output.WriteLine(testDisplayName, OutputLevel.Information);
-                            if (this.verbosityLevel == Verbosity.Detailed)
-                            {
-                                DisplayFullInformation(e.Result);
-                            }
-
-                            // Resume the progress indicator after displaying the test result information
-                            this.progressIndicator?.Start();
-                        }
-
                         break;
                     }
 
-                default:
-                    {
-                        if (this.verbosityLevel == Verbosity.Quiet)
-                        {
-                            break;
-                        }
+                    // Pause the progress indicator before displaying test result information
+                    _progressIndicator?.Pause();
+
+                    Output.Write(GetFormattedTestIndicator(CommandLineResources.FailedTestIndicator), OutputLevel.Information, ConsoleColor.Red);
+                    Output.WriteLine(testDisplayName, OutputLevel.Information);
+                    DisplayFullInformation(e.Result);
 
+                    // Resume the progress indicator after displaying the test result information
+                    _progressIndicator?.Start();
+
+                    break;
+                }
+
+            case TestOutcome.Passed:
+                {
+                    if (VerbosityLevel is Verbosity.Normal or Verbosity.Detailed)
+                    {
                         // Pause the progress indicator before displaying test result information
-                        this.progressIndicator?.Pause();
+                        _progressIndicator?.Pause();
 
-                        Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow);
+                        Output.Write(GetFormattedTestIndicator(CommandLineResources.PassedTestIndicator), OutputLevel.Information, ConsoleColor.Green);
                         Output.WriteLine(testDisplayName, OutputLevel.Information);
-                        if (this.verbosityLevel == Verbosity.Detailed)
+                        if (VerbosityLevel == Verbosity.Detailed)
                         {
                             DisplayFullInformation(e.Result);
                         }
 
                         // Resume the progress indicator after displaying the test result information
-                        this.progressIndicator?.Start();
+                        _progressIndicator?.Start();
+                    }
+
+                    break;
+                }
 
+            default:
+                {
+                    if (VerbosityLevel == Verbosity.Quiet)
+                    {
                         break;
                     }
-            }
+
+                    // Pause the progress indicator before displaying test result information
+                    _progressIndicator?.Pause();
+
+                    Output.Write(GetFormattedTestIndicator(CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow);
+                    Output.WriteLine(testDisplayName, OutputLevel.Information);
+                    if (VerbosityLevel == Verbosity.Detailed)
+                    {
+                        DisplayFullInformation(e.Result);
+                    }
+
+                    // Resume the progress indicator after displaying the test result information
+                    _progressIndicator?.Start();
+
+                    break;
+                }
         }
 
-        private string GetFormattedDurationString(TimeSpan duration)
+        // Local functions
+        static string GetFormattedTestIndicator(string indicator) => TestResultPrefix + indicator + TestResultSuffix;
+    }
+
+    private static string? GetFormattedDurationString(TimeSpan duration)
+    {
+        if (duration == default)
         {
-            if (duration == default(TimeSpan))
-            {
-                return null;
-            }
+            return null;
+        }
 
-            var time = new List<string>();
-            if (duration.Hours > 0)
-            {
-                time.Add(duration.Hours + " h");
-            }
+        var time = new List<string>();
+        if (duration.Hours > 0)
+        {
+            time.Add(duration.Hours + " h");
+        }
+
+        if (duration.Minutes > 0)
+        {
+            time.Add(duration.Minutes + " m");
+        }
 
-            if (duration.Minutes > 0)
+        if (duration.Hours == 0)
+        {
+            if (duration.Seconds > 0)
             {
-                time.Add(duration.Minutes + " m");
+                time.Add(duration.Seconds + " s");
             }
 
-            if (duration.Hours == 0)
+            if (duration.Milliseconds > 0 && duration.Minutes == 0 && duration.Seconds == 0)
             {
-                if (duration.Seconds > 0)
-                {
-                    time.Add(duration.Seconds + " s");
-                }
-
-                if (duration.Milliseconds > 0 && duration.Minutes == 0 && duration.Seconds == 0)
-                {
-                    time.Add(duration.Milliseconds + " ms");
-                }
+                time.Add(duration.Milliseconds + " ms");
             }
-
-            return time.Count == 0 ? "< 1 ms" : string.Join(" ", time);
         }
 
-        /// <summary>
-        /// Called when a test run is completed.
-        /// </summary>
-        private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
-        {
-            // Stop the progress indicator as we are about to print the summary
-            this.progressIndicator?.Stop();
-            var passedTests = 0;
-            var failedTests = 0;
-            var skippedTests = 0;
-            var totalTests = 0;
-            Output.WriteLine(string.Empty, OutputLevel.Information);
+        return time.Count == 0 ? "< 1 ms" : string.Join(" ", time);
+    }
 
-            // Printing Run-level Attachments
-            var runLevelAttachementCount = (e.AttachmentSets == null) ? 0 : e.AttachmentSets.Sum(attachmentSet => attachmentSet.Attachments.Count);
-            if (runLevelAttachementCount > 0)
+    /// <summary>
+    /// Called when a test run is completed.
+    /// </summary>
+    private void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        TPDebug.Assert(Output != null, "Initialize should have been called");
+
+        // Stop the progress indicator as we are about to print the summary
+        _progressIndicator?.Stop();
+        var passedTests = 0;
+        var failedTests = 0;
+        var skippedTests = 0;
+        var totalTests = 0;
+        Output.WriteLine(string.Empty, OutputLevel.Information);
+
+        // Printing Run-level Attachments
+        var runLevelAttachmentsCount = e.AttachmentSets == null ? 0 : e.AttachmentSets.Sum(attachmentSet => attachmentSet.Attachments.Count);
+        if (runLevelAttachmentsCount > 0)
+        {
+            // If ARTIFACTS_POSTPROCESSING is disabled
+            if (_featureFlag.IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING) ||
+                // DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX(new UX) is disabled
+                _featureFlag.IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING_NEW_SDK_UX) ||
+                // TestSessionCorrelationId is null(we're not running through the dotnet SDK).
+                CommandLineOptions.Instance.TestSessionCorrelationId is null)
             {
                 Output.Information(false, CommandLineResources.AttachmentsBanner);
+                TPDebug.Assert(e.AttachmentSets != null, "e.AttachmentSets should not be null when runLevelAttachmentsCount > 0.");
                 foreach (var attachmentSet in e.AttachmentSets)
                 {
                     foreach (var uriDataAttachment in attachmentSet.Attachments)
@@ -700,8 +697,11 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                     }
                 }
             }
+        }
 
-            var leafTestResultsPerSource = this.LeafTestResults.Select(p => p.Value).GroupBy(r => r.TestCase.Source);
+        var leafTestResultsPerSource = LeafTestResults?.Select(p => p.Value)?.GroupBy(r => r.TestCase.Source);
+        if (leafTestResultsPerSource is not null)
+        {
             foreach (var sd in leafTestResultsPerSource)
             {
                 var source = sd.Key;
@@ -731,7 +731,7 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                     }
                 }
 
-                if (verbosityLevel == Verbosity.Quiet || verbosityLevel == Verbosity.Minimal)
+                if (VerbosityLevel is Verbosity.Quiet or Verbosity.Minimal)
                 {
                     TestOutcome sourceOutcome = TestOutcome.None;
                     if (sourceSummary.FailedTests > 0)
@@ -747,36 +747,25 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                         sourceOutcome = TestOutcome.Skipped;
                     }
 
-
-                    string resultString;
-                    switch (sourceOutcome)
+                    string resultString = sourceOutcome switch
                     {
-                        case TestOutcome.Failed:
-                            resultString = (CommandLineResources.FailedTestIndicator + "!").PadRight(LongestResultIndicator);
-                            break;
-                        case TestOutcome.Passed:
-                            resultString = (CommandLineResources.PassedTestIndicator + "!").PadRight(LongestResultIndicator);
-                            break;
-                        case TestOutcome.Skipped:
-                            resultString = (CommandLineResources.SkippedTestIndicator + "!").PadRight(LongestResultIndicator);
-                            break;
-                        default:
-                            resultString = CommandLineResources.None.PadRight(LongestResultIndicator);
-                            break;
-                    }
-
-                    var failed = sourceSummary.FailedTests.ToString().PadLeft(5);
-                    var passed = sourceSummary.PassedTests.ToString().PadLeft(5);
-                    var skipped = sourceSummary.SkippedTests.ToString().PadLeft(5);
-                    var total = sourceSummary.TotalTests.ToString().PadLeft(5);
-
-
-                    var frameworkString = string.IsNullOrEmpty(targetFramework)
+                        TestOutcome.Failed => (CommandLineResources.FailedTestIndicator + "!").PadRight(LongestResultIndicator),
+                        TestOutcome.Passed => (CommandLineResources.PassedTestIndicator + "!").PadRight(LongestResultIndicator),
+                        TestOutcome.Skipped => (CommandLineResources.SkippedTestIndicator + "!").PadRight(LongestResultIndicator),
+                        _ => CommandLineResources.None.PadRight(LongestResultIndicator),
+                    };
+                    var failed = sourceSummary.FailedTests.ToString(CultureInfo.CurrentCulture).PadLeft(5);
+                    var passed = sourceSummary.PassedTests.ToString(CultureInfo.CurrentCulture).PadLeft(5);
+                    var skipped = sourceSummary.SkippedTests.ToString(CultureInfo.CurrentCulture).PadLeft(5);
+                    var total = sourceSummary.TotalTests.ToString(CultureInfo.CurrentCulture).PadLeft(5);
+
+
+                    var frameworkString = _targetFramework.IsNullOrEmpty()
                         ? string.Empty
-                        : $"({targetFramework})";
+                        : $"({_targetFramework})";
 
                     var duration = GetFormattedDurationString(sourceSummary.Duration);
-                    var sourceName = sd.Key.Split('\\').Last();
+                    var sourceName = Path.GetFileName(sd.Key);
 
                     var outputLine = string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
                         resultString,
@@ -822,28 +811,10 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                 skippedTests += sourceSummary.SkippedTests;
                 totalTests += sourceSummary.TotalTests;
             }
+        }
 
-            if (verbosityLevel == Verbosity.Quiet || verbosityLevel == Verbosity.Minimal)
-            {
-                if (e.IsCanceled)
-                {
-                    Output.Error(false, CommandLineResources.TestRunCanceled);
-                }
-                else if (e.IsAborted)
-                {
-                    if (e.Error == null)
-                    {
-                        Output.Error(false, CommandLineResources.TestRunAborted);
-                    }
-                    else
-                    {
-                        Output.Error(false, CommandLineResources.TestRunAbortedWithError, e.Error);
-                    }
-                }
-
-                return;
-            }
-
+        if (VerbosityLevel is Verbosity.Quiet or Verbosity.Minimal)
+        {
             if (e.IsCanceled)
             {
                 Output.Error(false, CommandLineResources.TestRunCanceled);
@@ -859,77 +830,104 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
                     Output.Error(false, CommandLineResources.TestRunAbortedWithError, e.Error);
                 }
             }
-            else if (failedTests > 0 || this.testRunHasErrorMessages)
+
+            return;
+        }
+
+        if (e.IsCanceled)
+        {
+            Output.Error(false, CommandLineResources.TestRunCanceled);
+        }
+        else if (e.IsAborted)
+        {
+            if (e.Error == null)
             {
-                Output.Error(false, CommandLineResources.TestRunFailed);
+                Output.Error(false, CommandLineResources.TestRunAborted);
             }
-            else if (totalTests > 0)
+            else
             {
-                Output.Information(false, ConsoleColor.Green, CommandLineResources.TestRunSuccessful);
+                Output.Error(false, CommandLineResources.TestRunAbortedWithError, e.Error);
             }
+        }
+        else if (failedTests > 0 || _testRunHasErrorMessages)
+        {
+            Output.Error(false, CommandLineResources.TestRunFailed);
+        }
+        else if (totalTests > 0)
+        {
+            Output.Information(false, ConsoleColor.Green, CommandLineResources.TestRunSuccessful);
+        }
 
-            // Output a summary.
-            if (totalTests > 0)
-            {
-                string totalTestsformat = (e.IsAborted || e.IsCanceled) ? CommandLineResources.TestRunSummaryForCanceledOrAbortedRun : CommandLineResources.TestRunSummaryTotalTests;
-                Output.Information(false, string.Format(CultureInfo.CurrentCulture, totalTestsformat, totalTests));
+        // Output a summary.
+        if (totalTests > 0)
+        {
+            string totalTestsformat = (e.IsAborted || e.IsCanceled) ? CommandLineResources.TestRunSummaryForCanceledOrAbortedRun : CommandLineResources.TestRunSummaryTotalTests;
+            Output.Information(false, string.Format(CultureInfo.CurrentCulture, totalTestsformat, totalTests));
 
-                if (passedTests > 0)
-                {
-                    Output.Information(false, ConsoleColor.Green, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, passedTests));
-                }
-                if (failedTests > 0)
-                {
-                    Output.Information(false, ConsoleColor.Red, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, failedTests));
-                }
-                if (skippedTests > 0)
-                {
-                    Output.Information(false, ConsoleColor.Yellow, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, skippedTests));
-                }
+            if (passedTests > 0)
+            {
+                Output.Information(false, ConsoleColor.Green, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, passedTests));
             }
-
-            if (totalTests > 0)
+            if (failedTests > 0)
             {
-                if (e.ElapsedTimeInRunningTests.Equals(TimeSpan.Zero))
-                {
-                    EqtTrace.Info("Skipped printing test execution time on console because it looks like the test run had faced some errors");
-                }
-                else
-                {
-                    PrintTimeSpan(e.ElapsedTimeInRunningTests);
-                }
+                Output.Information(false, ConsoleColor.Red, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, failedTests));
+            }
+            if (skippedTests > 0)
+            {
+                Output.Information(false, ConsoleColor.Yellow, string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, skippedTests));
             }
         }
-        #endregion
 
-        /// <summary>
-        /// Raises test run warning occurred before console logger starts listening warning events.
-        /// </summary>
-        /// <param name="warningMessage"></param>
-        public static void RaiseTestRunWarning(string warningMessage)
+        if (totalTests > 0)
         {
-            if (ConsoleLogger.Output == null)
+            if (e.ElapsedTimeInRunningTests.Equals(TimeSpan.Zero))
             {
-                ConsoleLogger.Output = ConsoleOutput.Instance;
+                EqtTrace.Info("Skipped printing test execution time on console because it looks like the test run had faced some errors");
+            }
+            else
+            {
+                PrintTimeSpan(e.ElapsedTimeInRunningTests);
             }
-
-            Output.Warning(AppendPrefix, warningMessage);
         }
+    }
+    /// <summary>
+    /// Raises test run warning occurred before console logger starts listening warning events.
+    /// </summary>
+    /// <param name="warningMessage"></param>
+    public static void RaiseTestRunWarning(string warningMessage)
+    {
+        Output ??= ConsoleOutput.Instance;
 
-        private class MinimalTestResult
+        Output.Warning(AppendPrefix, warningMessage);
+    }
+
+    private class MinimalTestResult
+    {
+        public MinimalTestResult(TestResult testResult)
         {
-            public MinimalTestResult(TestResult testResult)
-            {
-                TestCase = testResult.TestCase;
-                Outcome = testResult.Outcome;
-                StartTime = testResult.StartTime;
-                EndTime = testResult.EndTime;
+            TestCase = testResult.TestCase;
+            Outcome = testResult.Outcome;
+            StartTime = testResult.StartTime;
+            EndTime = testResult.EndTime;
+
+            // When the test framework (e.g. xUnit 2.x.x) does not report start or end time
+            // we assign it to UTC now when constructing the test result. But that does not
+            // work for our logger, because we take the earliest StartTime and oldest EndTime
+            // to calculate the duration and this makes the first test to be "missing" from the
+            // duration.
+            //
+            // Instead we subtract the duration to get a more accurate result. We also
+            // don't compare the times for equality because the times in the TestResult are assigned
+            // on two different lines so they don't have to be the same.
+            if (EndTime - StartTime < testResult.Duration)
+            {
+                StartTime = EndTime - testResult.Duration;
             }
-
-            public TestCase TestCase { get; }
-            public TestOutcome Outcome { get; }
-            public DateTimeOffset StartTime { get; }
-            public DateTimeOffset EndTime { get; }
         }
+
+        public TestCase TestCase { get; }
+        public TestOutcome Outcome { get; }
+        public DateTimeOffset StartTime { get; }
+        public DateTimeOffset EndTime { get; }
     }
 }
diff --git a/src/vstest.console/Internal/EventRegistrarToWarningLoggerAdapter.cs b/src/vstest.console/Internal/EventRegistrarToWarningLoggerAdapter.cs
new file mode 100644
index 0000000000..9f5e31b2e2
--- /dev/null
+++ b/src/vstest.console/Internal/EventRegistrarToWarningLoggerAdapter.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+internal class EventRegistrarToWarningLoggerAdapter : IWarningLogger
+{
+    private readonly IBaseTestEventsRegistrar _testEventsRegistrar;
+
+    public EventRegistrarToWarningLoggerAdapter(IBaseTestEventsRegistrar testEventsRegistrar)
+    {
+        _testEventsRegistrar = testEventsRegistrar;
+    }
+
+    public void LogWarning(string message)
+    {
+        _testEventsRegistrar.LogWarning(message);
+    }
+}
diff --git a/src/vstest.console/Internal/FilePatternParser.cs b/src/vstest.console/Internal/FilePatternParser.cs
index 7c1fdb2eb5..9dfcd08678 100644
--- a/src/vstest.console/Internal/FilePatternParser.cs
+++ b/src/vstest.console/Internal/FilePatternParser.cs
@@ -1,105 +1,125 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.Internal
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+#pragma warning disable IDE1006 // Naming Styles
+namespace vstest.console.Internal;
+#pragma warning restore IDE1006 // Naming Styles
+
+/// <summary>
+/// Class for getting matching files from wild card pattern file name
+/// Microsoft.Extensions.FileSystemGlobbing methods used to get matching file names
+/// </summary>
+public class FilePatternParser
 {
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    private readonly Matcher _matcher;
+    private readonly IFileHelper _fileHelper;
+    private readonly char[] _wildCardCharacters = ['*'];
+
+    public FilePatternParser()
+        : this(new Matcher(), new FileHelper())
+    {
+    }
+
+    internal FilePatternParser(Matcher matcher, IFileHelper fileHelper)
+    {
+        _matcher = matcher;
+        _fileHelper = fileHelper;
+    }
 
     /// <summary>
-    /// Class for getting matching files from wild card pattern file name
-    /// Microsoft.Extensions.FileSystemGlobbing methods used to get matching file names
+    /// Used to get matching files with pattern
     /// </summary>
-    public class FilePatternParser
+    /// <returns>Returns the list of matching files</returns>
+    public List<string> GetMatchingFiles(string filePattern)
     {
-        private Matcher matcher;
-        private IFileHelper fileHelper;
-        private char[] wildCardCharacters = { '*' };
-
-        public FilePatternParser()
-            : this(new Matcher(), new FileHelper())
-        {
-        }
+        var matchingFiles = new List<string>();
 
-        internal FilePatternParser(Matcher matcher, IFileHelper fileHelper)
+        // Convert the relative path to absolute path
+        if (!Path.IsPathRooted(filePattern))
         {
-            this.matcher = matcher;
-            this.fileHelper = fileHelper;
+            filePattern = Path.Combine(_fileHelper.GetCurrentDirectory(), filePattern);
         }
 
-        /// <summary>
-        /// Used to get matching files with pattern
-        /// </summary>
-        /// <returns>Returns the list of matching files</returns>
-        public List<string> GetMatchingFiles(string filePattern)
+        // If there is no wild card simply add the file to the list of matching files.
+        if (filePattern.IndexOfAny(_wildCardCharacters) == -1)
         {
-            var matchingFiles = new List<string>();
+            EqtTrace.Info($"FilePatternParser: The given file {filePattern} is a full path.");
 
-            // Convert the relative path to absolute path
-            if (!Path.IsPathRooted(filePattern))
+            // Check if the file exists.
+            if (!_fileHelper.Exists(filePattern))
             {
-                filePattern = Path.Combine(this.fileHelper.GetCurrentDirectory(), filePattern);
+                throw new TestSourceException(
+                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourceFileNotFound, filePattern));
             }
 
-            // If there is no wild card simply add the file to the list of matching files.
-            if (filePattern.IndexOfAny(wildCardCharacters) == -1)
-            {
-                EqtTrace.Info($"FilePatternParser: The given file {filePattern} is a full path.");
-
-                // Check if the file exists.
-                if (!this.fileHelper.Exists(filePattern))
-                {
-                    throw new TestSourceException(
-                        string.Format(CultureInfo.CurrentUICulture, CommandLineResources.TestSourceFileNotFound, filePattern));
-                }
+            matchingFiles.Add(filePattern);
 
-                matchingFiles.Add(filePattern);
+            return matchingFiles;
+        }
 
-                return matchingFiles;
-            }
+        // Split the given wild card into search directory and pattern to be searched.
+        var splitPattern = SplitFilePatternOnWildCard(filePattern);
+        EqtTrace.Info($"FilePatternParser: Matching file pattern '{splitPattern.Item2}' within directory '{splitPattern.Item1}'");
 
-            // Split the given wild card into search directory and pattern to be searched.
-            var splitPattern = SplitFilePatternOnWildCard(filePattern);
-            EqtTrace.Info($"FilePatternParser: Matching file pattern '{splitPattern.Item2}' within directory '{splitPattern.Item1}'");
+        _matcher.AddInclude(splitPattern.Item2);
 
-            this.matcher.AddInclude(splitPattern.Item2);
+        // Execute the given pattern in the search directory.
+        var matches = _matcher.Execute(new DirectoryInfoWrapper(new DirectoryInfo(splitPattern.Item1)));
 
-            // Execute the given pattern in the search directory.
-            var matches = this.matcher.Execute(new DirectoryInfoWrapper(new DirectoryInfo(splitPattern.Item1)));
+        // Add all the files to the list of matching files.
+        foreach (var match in matches.Files)
+        {
+            matchingFiles.Add(Path.Combine(splitPattern.Item1, match.Path));
+        }
 
-            // Add all the files to the list of matching files.
-            foreach (var match in matches.Files)
-            {
-                matchingFiles.Add(Path.Combine(splitPattern.Item1, match.Path));
-            }
+        return matchingFiles;
+    }
 
-            return matchingFiles;
+    /// <summary>
+    /// Splits full pattern into search directory and pattern.
+    /// </summary>
+    private Tuple<string, string> SplitFilePatternOnWildCard(string filePattern)
+    {
+        // Split the pattern based on first wild card character found.
+        var splitOnWildCardIndex = filePattern.IndexOfAny(_wildCardCharacters);
+        var pathBeforeWildCard = filePattern.Substring(0, splitOnWildCardIndex);
+
+        // Find the last directory separator before the wildcard
+        // On Windows, we need to check both \ and / as both are valid
+        // On Unix-like systems, only / is the directory separator
+        int directorySeparatorIndex;
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            // On Windows, check both separators and take the last one found
+            directorySeparatorIndex = Math.Max(
+                pathBeforeWildCard.LastIndexOf(Path.DirectorySeparatorChar),
+                pathBeforeWildCard.LastIndexOf(Path.AltDirectorySeparatorChar));
         }
-
-        /// <summary>
-        /// Splits full pattern into search directory and pattern.
-        /// </summary>
-        private Tuple<string, string> SplitFilePatternOnWildCard(string filePattern)
+        else
         {
-            // Split the pattern based on first wild card character found.
-            var splitOnWildCardIndex = filePattern.IndexOfAny(wildCardCharacters);
-            var directorySeparatorIndex = filePattern.Substring(0, splitOnWildCardIndex).LastIndexOf(Path.DirectorySeparatorChar);
+            // On Unix-like systems, only use the forward slash
+            directorySeparatorIndex = pathBeforeWildCard.LastIndexOf(Path.DirectorySeparatorChar);
+        }
 
-            string searchDir = filePattern.Substring(0, directorySeparatorIndex);
-            string pattern = filePattern.Substring(directorySeparatorIndex + 1);
+        string searchDir = filePattern.Substring(0, directorySeparatorIndex);
+        string pattern = filePattern.Substring(directorySeparatorIndex + 1);
 
-            Tuple<string, string> splitPattern = new Tuple<string, string>(searchDir, pattern);
-            return splitPattern;
-        }
+        Tuple<string, string> splitPattern = new(searchDir, pattern);
+        return splitPattern;
     }
 }
diff --git a/src/vstest.console/Internal/Interfaces/IConsoleHelper.cs b/src/vstest.console/Internal/Interfaces/IConsoleHelper.cs
index fbed8bb99d..c4b0d91141 100644
--- a/src/vstest.console/Internal/Interfaces/IConsoleHelper.cs
+++ b/src/vstest.console/Internal/Interfaces/IConsoleHelper.cs
@@ -1,33 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+/// <summary>
+/// Interface for wrapping the Console class
+/// </summary>
+internal interface IConsoleHelper
 {
     /// <summary>
-    /// Interface for wrapping the Console class
+    /// Returns the left position of the cursor
     /// </summary>
-    internal interface IConsoleHelper
-    {
-        /// <summary>
-        /// Returns the left position of the cursor
-        /// </summary>
-        int CursorLeft { get; }
+    int CursorLeft { get; }
 
-        /// <summary>
-        /// Returns the right position of the cursor
-        /// </summary>
-        int CursorTop { get; }
+    /// <summary>
+    /// Returns the right position of the cursor
+    /// </summary>
+    int CursorTop { get; }
 
-        /// <summary>
-        /// Returns the width of the console window
-        /// </summary>
-        int WindowWidth { get; }
+    /// <summary>
+    /// Returns the width of the console window
+    /// </summary>
+    int WindowWidth { get; }
 
-        /// <summary>
-        /// Sets the cursor position based on the left and top values
-        /// </summary>
-        /// <param name="left"></param>
-        /// <param name="top"></param>
-        void SetCursorPosition(int left, int top);
-    }
+    /// <summary>
+    /// Sets the cursor position based on the left and top values
+    /// </summary>
+    /// <param name="left"></param>
+    /// <param name="top"></param>
+    void SetCursorPosition(int left, int top);
 }
diff --git a/src/vstest.console/Internal/Interfaces/IProgressIndicator.cs b/src/vstest.console/Internal/Interfaces/IProgressIndicator.cs
index 79110adbd1..6d7ae1d864 100644
--- a/src/vstest.console/Internal/Interfaces/IProgressIndicator.cs
+++ b/src/vstest.console/Internal/Interfaces/IProgressIndicator.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+internal interface IProgressIndicator
 {
-    internal interface IProgressIndicator
-    {
-        /// <summary>
-        /// Marks the start of the progress indicator
-        /// </summary>
-        void Start();
+    /// <summary>
+    /// Marks the start of the progress indicator
+    /// </summary>
+    void Start();
 
-        /// <summary>
-        /// Pause the progress indicator
-        /// </summary>
-        void Pause();
+    /// <summary>
+    /// Pause the progress indicator
+    /// </summary>
+    void Pause();
 
-        /// <summary>
-        /// Stop the progress indicator
-        /// </summary>
-        void Stop();
-    }
+    /// <summary>
+    /// Stop the progress indicator
+    /// </summary>
+    void Stop();
 }
diff --git a/src/vstest.console/Internal/MSBuildLogger.cs b/src/vstest.console/Internal/MSBuildLogger.cs
new file mode 100644
index 0000000000..691236db32
--- /dev/null
+++ b/src/vstest.console/Internal/MSBuildLogger.cs
@@ -0,0 +1,474 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+[ExtensionUri(ExtensionUri)]
+[FriendlyName(FriendlyName)]
+internal class MSBuildLogger : ITestLoggerWithParameters
+{
+    public const string ExtensionUri = "logger://Microsoft/TestPlatform/MSBuildLogger/v1";
+
+    // This name is not so friendly on purpose, because MSBuild seems like a name that someone might have
+    // already claimed, and we will use this just programmatically.
+    public const string FriendlyName = "Microsoft.TestPlatform.MSBuildLogger";
+
+    /// <summary>
+    /// Gets instance of IOutput used for sending output.
+    /// </summary>
+    /// <remarks>Protected so this can be detoured for testing purposes.</remarks>
+    protected static IOutput? Output
+    {
+        get;
+        private set;
+    }
+
+    // Default constructor is needed for a logger to be able to activate it.
+    public MSBuildLogger() { }
+
+    /// <summary>
+    /// Constructor added for testing purpose
+    /// </summary>
+    internal MSBuildLogger(IOutput output)
+    {
+        Output = output;
+    }
+
+    [MemberNotNull(nameof(Output))]
+    public void Initialize(TestLoggerEvents events, string testRunDirectory)
+    {
+        ValidateArg.NotNull(events, nameof(events));
+
+        Output ??= ConsoleOutput.Instance;
+
+        // Register for the events.
+        events.TestRunMessage += TestMessageHandler;
+        events.TestResult += TestResultHandler;
+        events.TestRunComplete += TestRunCompleteHandler;
+    }
+
+    public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
+    {
+        Initialize(events, string.Empty);
+    }
+
+    private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
+    {
+        switch (e.Level)
+        {
+            case TestMessageLevel.Informational:
+                SendMessage($"output-info", e.Message);
+                break;
+            case TestMessageLevel.Warning:
+                // Downgrade xUnit skip warning to info, otherwise any skipped test will report warning, which is often upgraded to error.
+                if (e.Message.EndsWith("[SKIP]"))
+                {
+                    SendMessage($"output-info", e.Message);
+                }
+                else
+                {
+                    SendMessage($"output-warning", e.Message);
+                }
+                break;
+            case TestMessageLevel.Error:
+                SendMessage($"output-error", e.Message);
+                break;
+        }
+    }
+
+    private void TestRunCompleteHandler(object? sender, TestRunCompleteEventArgs e)
+    {
+        TPDebug.Assert(Output != null, "Initialize should have been called");
+
+        if (e.IsCanceled)
+        {
+            SendMessage("run-cancel", CommandLineResources.TestRunCanceled);
+        }
+        else if (e.IsAborted)
+        {
+            if (e.Error == null)
+            {
+                SendMessage("run-abort", CommandLineResources.TestRunAborted);
+            }
+            else
+            {
+                SendMessage("run-abort", string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunAbortedWithError, e.Error));
+            }
+        }
+        else
+        {
+            var total = e.TestRunStatistics?.ExecutedTests ?? 0;
+            var passed = e.TestRunStatistics?[TestOutcome.Passed] ?? 0;
+            var skipped = e.TestRunStatistics?[TestOutcome.Skipped] ?? 0;
+            var failed = e.TestRunStatistics?[TestOutcome.Failed] ?? 0;
+            var time = e.ElapsedTimeInRunningTests.TotalMilliseconds;
+
+            var resultIndicator = failed > 0
+                ? CommandLineResources.FailedTestIndicator
+                : skipped == total
+                    ? CommandLineResources.SkippedTestIndicator
+                    : CommandLineResources.PassedTestIndicator;
+            var summary = string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
+                        resultIndicator + "!",
+                        failed,
+                        passed,
+                        skipped,
+                        total,
+                        $"[{GetFormattedDurationString(e.ElapsedTimeInRunningTests)}]"
+                        );
+
+
+            SendMessage("run-finish", summary,
+                total.ToString(CultureInfo.InvariantCulture),
+                passed.ToString(CultureInfo.InvariantCulture),
+                skipped.ToString(CultureInfo.InvariantCulture),
+                failed.ToString(CultureInfo.InvariantCulture),
+                time.ToString(CultureInfo.InvariantCulture));
+        }
+    }
+
+    private void TestResultHandler(object? sender, TestResultEventArgs e)
+    {
+        ValidateArg.NotNull(sender, nameof(sender));
+        ValidateArg.NotNull(e, nameof(e));
+        TPDebug.Assert(Output != null, "Initialize should have been called.");
+        switch (e.Result.Outcome)
+        {
+            // DO NOT report passed or skipped until there is a proper msbuild progress api. This is polluting user output too much.
+            //case TestOutcome.Passed:
+            //    SendMessage("test-passed",
+            //        CommandLineResources.PassedTestIndicator,
+            //        e.Result.TestCase.DisplayName,
+            //        e.Result.Duration.TotalMilliseconds.ToString(CultureInfo.InvariantCulture),
+            //        FormatOutputs(e.Result));
+            //    break;
+            // DO NOT report passed or skipped until there is a proper msbuild progress api. This is polluting user output too much.
+            //case TestOutcome.Skipped:
+            //    SendMessage("test-skipped",
+            //        CommandLineResources.PassedTestIndicator,
+            //        e.Result.TestCase.DisplayName,
+            //        e.Result.Duration.TotalMilliseconds.ToString(CultureInfo.InvariantCulture));
+            //    break;
+            case TestOutcome.Failed:
+                var result = e.Result;
+                Debug.WriteLine(">>>>ERR:" + result.ErrorMessage);
+                Debug.WriteLine(">>>>STK:" + result.ErrorStackTrace);
+
+                var formattedError = new StringBuilder();
+
+                formattedError.Append(result.TestCase.DisplayName);
+                formattedError.Append(" (");
+                formattedError.Append(GetFormattedDurationString(e.Result.Duration));
+                formattedError.Append("): ");
+
+                formattedError.Append(Resources.Resources.ErrorMessageBanner);
+                formattedError.Append(' ');
+                formattedError.AppendLine(result.ErrorMessage);
+
+                string? line = null;
+                string? file = null;
+
+                if (!StringUtils.IsNullOrWhiteSpace(result.ErrorStackTrace))
+                {
+                    var stackFrames = Regex.Split(result.ErrorStackTrace, Environment.NewLine);
+                    if (stackFrames.Length > 0)
+                    {
+                        foreach (var frame in stackFrames.Take(20))
+                        {
+                            if (StackTraceHelper.TryFindLocationFromStackFrame(frame, out file, out line, out _))
+                            {
+                                break;
+                            }
+                        }
+                    }
+
+                    // We did not find any stack frame with location in the first 20 frames.
+                    // Try getting location of the test.
+                    if (file == null)
+                    {
+                        if (!StringUtils.IsNullOrEmpty(result.TestCase.CodeFilePath))
+                        {
+                            // if there are no symbols but we collect source info, us the source info.
+                            file = result.TestCase.CodeFilePath;
+                            line = result.TestCase.LineNumber > 0 ? result.TestCase.LineNumber.ToString(CultureInfo.InvariantCulture) : null;
+                        }
+                        else
+                        {
+                            // if there are no symbols and no source info use the dll
+                            file = result.TestCase.Source;
+                        }
+                    }
+
+                    formattedError.AppendLine(Resources.Resources.StacktraceBanner);
+                    formattedError.AppendLine(result.ErrorStackTrace);
+                }
+
+                AppendOutputs(result, formattedError);
+                SendMessage("test-failed", formattedError.ToString().TrimEnd(), file ?? string.Empty, line ?? "0");
+
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Writes message to standard output, with the name of the message followed by the number of
+    /// parameters. With each parameter delimited by '||||', and newlines replaced with ~~~~ and !!!!.
+    /// Such as:
+    ///  ||||run-start1||||s:\t\mstest97\bin\Debug\net8.0\mstest97.dll
+    ///  ||||test-failed6||||TestMethod5||||Assert.IsTrue failed. ||||   at mstest97.UnitTest1.TestMethod5() in s:\t\mstest97\UnitTest1.cs:line 27~~~~!!!!   at Syste...
+    /// </summary>
+    /// <param name="name"></param>
+    /// <param name="data"></param>
+    private static void SendMessage(string name, params string?[] data)
+    {
+        TPDebug.Assert(Output != null, "Initialize should have been called");
+
+        var message = FormatMessage(name, data);
+        Debug.WriteLine($"MSBUILDLOGGER: {message}");
+        Output.Information(appendPrefix: false, message);
+    }
+
+    private static string FormatMessage(string name, params string?[] data)
+    {
+        return $"||||{name}||||{string.Join("||||", data.Select(Escape))}";
+    }
+
+    private static string? Escape(string? input)
+    {
+        if (input == null)
+        {
+            return null;
+        }
+
+        return input
+            // Cleanup characters that we are using ourselves to delimit the message
+            .Replace("||||", "____").Replace("~~~~", "____").Replace("!!!!", "____")
+            // Replace new line characters that would change how the message is consumed.
+            .Replace("\r", "~~~~").Replace("\n", "!!!!");
+    }
+
+    /// <summary>
+    /// Collects all the messages of a particular category(Standard Output/Standard Error/Debug Traces) and returns a collection.
+    /// </summary>
+    private static Collection<TestResultMessage> GetTestMessages(Collection<TestResultMessage> messages, string requiredCategory)
+    {
+        var selectedMessages = messages.Where(msg => msg.Category.Equals(requiredCategory, StringComparison.OrdinalIgnoreCase));
+        var requiredMessageCollection = new Collection<TestResultMessage>(selectedMessages.ToList());
+        return requiredMessageCollection;
+    }
+
+    private static void AppendOutputs(TestResult result, StringBuilder stringBuilder)
+    {
+        var testResultPrefix = "  ";
+        TPDebug.Assert(result != null, "a null result can not be displayed");
+
+        var stdOutMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardOutCategory);
+        if (stdOutMessagesCollection.Count > 0)
+        {
+            stringBuilder.AppendLine(testResultPrefix + CommandLineResources.StdOutMessagesBanner);
+            AddFormattedOutput(stdOutMessagesCollection, stringBuilder);
+        }
+
+        var stdErrMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.StandardErrorCategory);
+        if (stdErrMessagesCollection.Count > 0)
+        {
+            stringBuilder.AppendLine(testResultPrefix + CommandLineResources.StdErrMessagesBanner);
+            AddFormattedOutput(stdErrMessagesCollection, stringBuilder);
+        }
+
+        var dbgTrcMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.DebugTraceCategory);
+        if (dbgTrcMessagesCollection.Count > 0)
+        {
+            stringBuilder.AppendLine(testResultPrefix + CommandLineResources.DbgTrcMessagesBanner);
+            AddFormattedOutput(dbgTrcMessagesCollection, stringBuilder);
+        }
+
+        var addnlInfoMessagesCollection = GetTestMessages(result.Messages, TestResultMessage.AdditionalInfoCategory);
+        if (addnlInfoMessagesCollection.Count > 0)
+        {
+            stringBuilder.AppendLine(testResultPrefix + CommandLineResources.AddnlInfoMessagesBanner);
+            AddFormattedOutput(addnlInfoMessagesCollection, stringBuilder);
+        }
+    }
+
+    private static void AddFormattedOutput(Collection<TestResultMessage> testMessageCollection, StringBuilder stringBuilder)
+    {
+        string testMessageFormattingPrefix = " ";
+        if (testMessageCollection == null)
+        {
+            return;
+        }
+
+        foreach (var message in testMessageCollection)
+        {
+            var prefix = string.Format(CultureInfo.CurrentCulture, "{0}{1}", Environment.NewLine, testMessageFormattingPrefix);
+            var messageText = message.Text?.Replace(Environment.NewLine, prefix).TrimEnd(testMessageFormattingPrefix.ToCharArray());
+
+            if (!messageText.IsNullOrWhiteSpace())
+            {
+                stringBuilder.AppendFormat(CultureInfo.CurrentCulture, "{0}{1}", testMessageFormattingPrefix, messageText);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Converts the time span format to readable string.
+    /// </summary>
+    /// <param name="duration"></param>
+    /// <returns></returns>
+    internal static string GetFormattedDurationString(TimeSpan duration)
+    {
+        if (duration == default)
+        {
+            return "< 1ms";
+        }
+
+        var time = new List<string>();
+        if (duration.Days > 0)
+        {
+            time.Add("> 1d");
+        }
+        else
+        {
+            if (duration.Hours > 0)
+            {
+                time.Add(duration.Hours + "h");
+            }
+
+            if (duration.Minutes > 0)
+            {
+                time.Add(duration.Minutes + "m");
+            }
+
+            if (duration.Hours == 0)
+            {
+                if (duration.Seconds > 0)
+                {
+                    time.Add(duration.Seconds + "s");
+                }
+
+                if (duration.Milliseconds > 0 && duration.Minutes == 0)
+                {
+                    time.Add(duration.Milliseconds + "ms");
+                }
+            }
+        }
+
+        return time.Count == 0 ? "< 1ms" : string.Join(" ", time);
+    }
+}
+
+internal class StackTraceHelper
+{
+    private static Regex? s_regex;
+
+    internal static bool TryFindLocationFromStackFrame(string? errorStackTrace, [NotNullWhen(true)] out string? file, out string? lineNumber, out string? place)
+    {
+        file = null;
+        place = null;
+        lineNumber = null;
+
+        if (errorStackTrace == null)
+        {
+            return false;
+        }
+
+        string[] stackFrames = Regex.Split(errorStackTrace, Environment.NewLine);
+        if (stackFrames.Length == 0)
+        {
+            return false;
+        }
+
+        // Take 20 frames at max, so we don't search 1000 items in a long stack trace.
+        foreach (string? stackFrame in stackFrames.Take(20))
+        {
+            if (TryGetStackFrameLocation(stackFrame, out lineNumber, out file, out place))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static bool TryGetStackFrameLocation(string stackFrame, out string? line, [NotNullWhen(true)] out string? file, out string? place)
+    {
+        InitializeRegex();
+
+        // stack frame looks like this '   at Program.<Main>$(String[] args) in S:\t\ConsoleApp81\ConsoleApp81\Program.cs:line 9'
+        Match match = s_regex.Match(stackFrame);
+
+        line = null;
+        file = null;
+        place = null;
+
+        if (match.Success)
+        {
+            // get the exact info from stack frame.
+            place = match.Groups["code"].Value;
+            file = match.Groups["file"].Value;
+            line = match.Groups["line"].Value;
+        }
+
+        return match.Success;
+    }
+
+    [MemberNotNull(nameof(s_regex))]
+    private static void InitializeRegex()
+    {
+        if (s_regex != null)
+        {
+            return;
+        }
+
+        string atResourceName = "Word_At";
+        string inResourceName = "StackTrace_InFileLineNumber";
+
+        string? atString = null;
+        string? inString = null;
+
+        // Grab words from localized resource, in case the stack trace is localized.
+        try
+        {
+            // Get these resources: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
+            MethodInfo? getResourceStringMethod = typeof(Environment).GetMethod("GetResourceString", BindingFlags.Static | BindingFlags.NonPublic, null, [typeof(string)], null);
+            if (getResourceStringMethod is not null)
+            {
+                // <value>at</value>
+                atString = (string?)getResourceStringMethod.Invoke(null, [atResourceName]);
+
+                // <value>in {0}:line {1}</value>
+                inString = (string?)getResourceStringMethod.Invoke(null, [inResourceName]);
+            }
+        }
+        catch
+        {
+            // If we fail, populate the defaults below.
+        }
+
+        atString = atString == null || atString == atResourceName ? "at" : atString;
+        inString = inString == null || inString == inResourceName ? "in {0}:line {1}" : inString;
+
+        string inPattern = string.Format(CultureInfo.InvariantCulture, inString, "(?<file>.+)", @"(?<line>\d+)");
+
+        s_regex = new Regex(@$"^   {atString} (?<code>.+) {inPattern}$", RegexOptions.Compiled, matchTimeout: TimeSpan.FromSeconds(1));
+    }
+}
diff --git a/src/vstest.console/Internal/NullWarningLogger.cs b/src/vstest.console/Internal/NullWarningLogger.cs
new file mode 100644
index 0000000000..916eab1579
--- /dev/null
+++ b/src/vstest.console/Internal/NullWarningLogger.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+internal class NullWarningLogger : IWarningLogger
+{
+    public void LogWarning(string message)
+    {
+        //TODO: Implement registrar in StartTestSession instead of passing null, and stop using this class.
+    }
+}
diff --git a/src/vstest.console/Internal/Product.cs b/src/vstest.console/Internal/Product.cs
index 93bdcdfe21..de39a99c4f 100644
--- a/src/vstest.console/Internal/Product.cs
+++ b/src/vstest.console/Internal/Product.cs
@@ -1,21 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
+using System.Reflection;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+public class Product
 {
-    using System.Reflection;
+    public static readonly string? Version = GetProductVersion();
 
-    public class Product
+    private static string? GetProductVersion()
     {
-        public static readonly string Version = GetProductVersion();
-
-        private static string GetProductVersion()
-        {
-            var attr = typeof(Product)
-                .GetTypeInfo()
-                .Assembly
-                .GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-            return attr?.InformationalVersion;
-        }
+        var attr = typeof(Product)
+            .Assembly
+            .GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+        return attr?.InformationalVersion;
     }
 }
diff --git a/src/vstest.console/Internal/ProgressIndicator.cs b/src/vstest.console/Internal/ProgressIndicator.cs
index 429fab10fe..5b7fec2d48 100644
--- a/src/vstest.console/Internal/ProgressIndicator.cs
+++ b/src/vstest.console/Internal/ProgressIndicator.cs
@@ -1,117 +1,124 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Timer = System.Timers.Timer;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+
+/// <summary>
+/// Indicates the test run progress
+/// </summary>
+internal sealed class ProgressIndicator : IProgressIndicator, IDisposable
 {
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Timer = System.Timers.Timer;
+    private readonly object _syncObject = new();
+    private int _dotCounter;
+    private Timer? _timer;
+    private readonly string _testRunProgressString;
+
+    /// <summary>
+    /// Used to output to the console
+    /// </summary>
+    public IOutput ConsoleOutput { get; private set; }
+
+    /// <summary>
+    /// Wrapper over the System Console class
+    /// </summary>
+    public IConsoleHelper ConsoleHelper { get; private set; }
 
     /// <summary>
-    /// Indicates the test run progress
+    /// True is the indicator is to be displayed
     /// </summary>
-    internal class ProgressIndicator : IProgressIndicator
+    public bool IsRunning { get; private set; }
+
+    public ProgressIndicator(IOutput output, IConsoleHelper consoleHelper)
     {
-        private object syncObject = new object();
-        private int dotCounter;
-        private Timer timer;
-        private string testRunProgressString;
-
-        /// <summary>
-        /// Used to output to the console
-        /// </summary>
-        public IOutput ConsoleOutput { get; private set; }
-
-        /// <summary>
-        /// Wrapper over the System Console class
-        /// </summary>
-        public IConsoleHelper ConsoleHelper { get; private set; }
-
-        /// <summary>
-        /// True is the indicator is to be displayed
-        /// </summary>
-        public bool IsRunning { get; private set; }
-
-        public ProgressIndicator(IOutput output, IConsoleHelper consoleHelper)
-        {
-            this.ConsoleOutput = output;
-            this.ConsoleHelper = consoleHelper;
-            this.testRunProgressString = string.Format(CultureInfo.CurrentCulture, "{0}...", Resources.Resources.ProgressIndicatorString);
-        }
+        ConsoleOutput = output;
+        ConsoleHelper = consoleHelper;
+        _testRunProgressString = string.Format(CultureInfo.CurrentCulture, "{0}...", Resources.Resources.ProgressIndicatorString);
+    }
 
-        /// <inheritdoc />
-        public void Start()
+    /// <inheritdoc />
+    public void Start()
+    {
+        lock (_syncObject)
         {
-            lock (syncObject)
+            if (_timer == null)
             {
-                if (timer == null)
-                {
-                    this.timer = new Timer(1000);
-                    this.timer.Elapsed += Timer_Elapsed;
-                    this.timer.Start();
-                }
-
-                // Print the string based on the previous state, that is dotCounter
-                // This is required for smooth transition
-                this.ConsoleOutput.Write(testRunProgressString.Substring(0, testRunProgressString.Length + dotCounter - 2), OutputLevel.Information);
-                this.IsRunning = true;
+                _timer = new Timer(1000);
+                _timer.Elapsed += Timer_Elapsed;
+                _timer.Start();
             }
-        }
 
-        /// <summary>
-        // Get the current cursor position
-        // Clear the console starting given position
-        // Reset the cursor position back
-        /// </summary>
-        /// <param name="startPos">the starting position</param>
-        private void Clear(int startPos)
-        {
-            var currentLineCursor = this.ConsoleHelper.CursorTop;
-            this.ConsoleHelper.SetCursorPosition(startPos, this.ConsoleHelper.CursorTop);
-            this.ConsoleOutput.Write(new string(' ', this.ConsoleHelper.WindowWidth - startPos), OutputLevel.Information);
-            this.ConsoleHelper.SetCursorPosition(startPos, currentLineCursor);
+            // Print the string based on the previous state, that is dotCounter
+            // This is required for smooth transition
+            ConsoleOutput.Write(_testRunProgressString.Substring(0, _testRunProgressString.Length + _dotCounter - 2), OutputLevel.Information);
+            IsRunning = true;
         }
+    }
+
+    /// <summary>
+    /// Get the current cursor position
+    /// Clear the console starting given position
+    /// Reset the cursor position back
+    /// </summary>
+    /// <param name="startPos">the starting position</param>
+    private void Clear(int startPos)
+    {
+        var currentLineCursor = ConsoleHelper.CursorTop;
+        ConsoleHelper.SetCursorPosition(startPos, ConsoleHelper.CursorTop);
+        ConsoleOutput.Write(new string(' ', ConsoleHelper.WindowWidth - startPos), OutputLevel.Information);
+        ConsoleHelper.SetCursorPosition(startPos, currentLineCursor);
+    }
 
-        /// <summary>
-        /// Sets the isRunning flag to false so that indicator is not shown.
-        /// </summary>
-        public void Pause()
+    /// <summary>
+    /// Sets the isRunning flag to false so that indicator is not shown.
+    /// </summary>
+    public void Pause()
+    {
+        lock (_syncObject)
         {
-            lock (syncObject)
-            {
-                this.IsRunning = false;
-                this.Clear(0);
-            }
+            IsRunning = false;
+            Clear(0);
         }
+    }
 
-        /// <summary>
-        /// Stops the indicator and clears the current line.
-        /// </summary>
-        public void Stop()
+    /// <summary>
+    /// Stops the indicator and clears the current line.
+    /// </summary>
+    public void Stop()
+    {
+        lock (_syncObject)
         {
-            lock (syncObject)
-            {
-                this.IsRunning = false;
-                this.timer?.Stop();
-                this.Clear(0);
-            }
+            IsRunning = false;
+            _timer?.Stop();
+            Clear(0);
         }
+    }
 
-        private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+    private void Timer_Elapsed(object? sender, System.Timers.ElapsedEventArgs e)
+    {
+        if (IsRunning)
         {
-            if (IsRunning)
+            // If running, prints dot every second.
+            ConsoleOutput.Write(".", OutputLevel.Information);
+            _dotCounter = ++_dotCounter % 3;
+
+            // When counter reaches 3, that is 3 dots have been printed
+            // Clear and start printing again
+            if (_dotCounter == 0)
             {
-                // If running, prints dot every second.
-                this.ConsoleOutput.Write(".", OutputLevel.Information);
-                dotCounter = ++dotCounter % 3;
-
-                // When counter reaches 3, that is 3 dots have been printed
-                // Clear and start printing again
-                if (dotCounter == 0)
-                {
-                    this.Clear(this.ConsoleHelper.CursorLeft - 3);
-                }
+                Clear(ConsoleHelper.CursorLeft - 3);
             }
         }
     }
+
+    public void Dispose()
+    {
+        _timer?.Dispose();
+    }
 }
diff --git a/src/vstest.console/Internal/SourceSummary.cs b/src/vstest.console/Internal/SourceSummary.cs
index d0f228b6de..72b7d7f20f 100644
--- a/src/vstest.console/Internal/SourceSummary.cs
+++ b/src/vstest.console/Internal/SourceSummary.cs
@@ -1,38 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
 
+/// <summary>
+/// Summary of test results per source.
+/// </summary>
+internal class SourceSummary
+{
     /// <summary>
-    /// Summary of test results per source. 
+    /// Total tests of a test run.
     /// </summary>
-    internal class SourceSummary
-    {
-        /// <summary>
-        /// Total tests of a test run.
-        /// </summary>
-        public int TotalTests { get; set; }
+    public int TotalTests { get; set; }
 
-        /// <summary>
-        /// Passed tests of a test run.
-        /// </summary>
-        public int PassedTests { get; set; }
+    /// <summary>
+    /// Passed tests of a test run.
+    /// </summary>
+    public int PassedTests { get; set; }
 
-        /// <summary>
-        /// Failed tests of a test run.
-        /// </summary>
-        public int FailedTests { get; set; }
+    /// <summary>
+    /// Failed tests of a test run.
+    /// </summary>
+    public int FailedTests { get; set; }
 
-        /// <summary>
-        /// Skipped tests of a test run.
-        /// </summary>
-        public int SkippedTests { get; set; }
+    /// <summary>
+    /// Skipped tests of a test run.
+    /// </summary>
+    public int SkippedTests { get; set; }
 
-        /// <summary>
-        /// Duration of the test run.
-        /// </summary>
-        public TimeSpan Duration { get; set; }
-    }
+    /// <summary>
+    /// Duration of the test run.
+    /// </summary>
+    public TimeSpan Duration { get; set; }
 }
diff --git a/src/vstest.console/NullableHelpers.cs b/src/vstest.console/NullableHelpers.cs
new file mode 100644
index 0000000000..248be64410
--- /dev/null
+++ b/src/vstest.console/NullableHelpers.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/vstest.console/NullableHelpers.tt b/src/vstest.console/NullableHelpers.tt
new file mode 100644
index 0000000000..7e3d8e7270
--- /dev/null
+++ b/src/vstest.console/NullableHelpers.tt
@@ -0,0 +1,45 @@
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Core" #>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// <auto-generated>
+// This code is auto-generated. Changes to this file will be lost!
+// This T4 file is copied in various projects because inclusion as link or through shared project
+// doesn't allow to generate the C# file locally. If some modification is required, please update
+// all instances.
+// </auto-generated>
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace <#= System.Runtime.Remoting.Messaging.CallContext.LogicalGetData("NamespaceHint") #>;
+
+internal static class StringUtils
+{
+    /// <inheritdoc cref="string.IsNullOrEmpty(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace(string)"/>
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}
+
+[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+internal static class TPDebug
+{
+    /// <inheritdoc cref="Debug.Assert(bool)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b)
+        => Debug.Assert(b);
+
+    /// <inheritdoc cref="Debug.Assert(bool, string)"/>
+    [Conditional("DEBUG")]
+    public static void Assert([DoesNotReturnIf(false)] bool b, string message)
+        => Debug.Assert(b, message);
+}
diff --git a/src/vstest.console/Processors/AeDebuggerArgumentProcessor.cs b/src/vstest.console/Processors/AeDebuggerArgumentProcessor.cs
new file mode 100644
index 0000000000..f3a1f044ef
--- /dev/null
+++ b/src/vstest.console/Processors/AeDebuggerArgumentProcessor.cs
@@ -0,0 +1,259 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+extern alias Abstraction;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class AeDebuggerArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/AeDebugger";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new AeDebuggerArgumentExecutor(new PlatformEnvironment(), new FileHelper(), new ProcessHelper(), ConsoleOutput.Instance, new EnvironmentVariableHelper()));
+
+        set => _executor = value;
+    }
+
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new AeDebuggerArgumentProcessorCapabilities());
+}
+
+internal class AeDebuggerArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => AeDebuggerArgumentProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    public override bool IsAction => true;
+
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+
+    // This feature is for internal usage at the moment, we can advertise in future when we'll have
+    // good feedback on the usage.
+    public override string? HelpContentResourceName => null;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.EnableDiagArgumentProcessorHelpPriority;
+}
+
+internal class AeDebuggerArgumentExecutor : IArgumentExecutor
+{
+    private const int ProcDumpTimeoutSeconds = 10;
+    private const string InstallCommandArgumentName = "Install";
+    private const string UninstallCommandArgumentName = "Uninstall";
+
+    private readonly IEnvironment _environment;
+    private readonly IFileHelper _fileHelper;
+    private readonly IProcessHelper _processHelper;
+    private readonly IOutput _output;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
+    private string? _argument;
+    private Dictionary<string, string>? _collectDumpParameters;
+    private readonly ProcDumpExecutableHelper _procDumpExecutableHelper;
+    public AeDebuggerArgumentExecutor(IEnvironment environment, IFileHelper fileHelper, IProcessHelper processHelper, IOutput output, IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _environment = environment ?? throw new ArgumentNullException(nameof(environment));
+        _fileHelper = fileHelper ?? throw new ArgumentNullException(nameof(fileHelper));
+        _processHelper = processHelper ?? throw new ArgumentNullException(nameof(processHelper));
+        _output = output ?? throw new ArgumentNullException(nameof(output));
+        _environmentVariableHelper = environmentVariableHelper ?? throw new ArgumentNullException(nameof(environmentVariableHelper));
+        _procDumpExecutableHelper = new ProcDumpExecutableHelper(processHelper, fileHelper, environment, environmentVariableHelper);
+    }
+
+    public void Initialize(string? argument) => _argument = argument;
+
+    public ArgumentProcessorResult Execute()
+    {
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidAeDebuggerArgument, _argument ?? "");
+        if (StringUtils.IsNullOrEmpty(_argument))
+        {
+            _output.Error(false, exceptionMessage);
+            return ArgumentProcessorResult.Fail;
+        }
+
+        string[] aeDebuggerArgumentList = ArgumentProcessorUtilities.GetArgumentList(_argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
+        _collectDumpParameters = ArgumentProcessorUtilities.GetArgumentParameters(
+            aeDebuggerArgumentList.Where(x => !x.Equals(InstallCommandArgumentName, StringComparison.OrdinalIgnoreCase) &&
+            !x.Equals(UninstallCommandArgumentName, StringComparison.OrdinalIgnoreCase)),
+            ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
+
+        if (aeDebuggerArgumentList.Contains(InstallCommandArgumentName, StringComparer.OrdinalIgnoreCase))
+        {
+            return InstallUnistallPostmortemDebugger(true);
+        }
+
+        if (aeDebuggerArgumentList.Contains(UninstallCommandArgumentName, StringComparer.OrdinalIgnoreCase))
+        {
+            return InstallUnistallPostmortemDebugger(false);
+        }
+
+        _output.Error(false, exceptionMessage);
+        return ArgumentProcessorResult.Fail;
+    }
+
+    private ArgumentProcessorResult InstallUnistallPostmortemDebugger(bool install)
+    {
+        if (_environment.OperatingSystem != PlatformOperatingSystem.Windows)
+        {
+            _output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.PostmortemDebuggerNotSupportedForCurrentOS));
+            return ArgumentProcessorResult.Fail;
+        }
+
+        if (_collectDumpParameters is null)
+        {
+            _output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ProcDumpToolDirectoryPathArgumenNotFound));
+            return ArgumentProcessorResult.Fail;
+        }
+
+        // Look for procdump
+        string? procDumpPath = null;
+        if (!TryGetDirectoryInfo(_collectDumpParameters, "ProcDumpToolDirectoryPath", out DirectoryInfo? procDumpToolDirectoryPath) &&
+            !_procDumpExecutableHelper.TryGetProcDumpExecutable(out procDumpPath)
+            )
+        {
+            _output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidProcDumpToolDirectoryPath));
+            return ArgumentProcessorResult.Fail;
+        }
+
+        if (procDumpPath is null && procDumpToolDirectoryPath is not null)
+        {
+            procDumpPath = Path.Combine(procDumpToolDirectoryPath.FullName, ProcDumpExecutableHelper.ProcDumpFileName(_environment.Architecture));
+        }
+
+        if (procDumpPath is null)
+        {
+            _output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ProcDumpFileNameNotFound, procDumpPath));
+            return ArgumentProcessorResult.Fail;
+        }
+
+        // Looking for procdump*.exe
+        if (!_fileHelper.Exists(procDumpPath))
+        {
+            _output.Error(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.ProcDumpFileNameNotFound, procDumpPath));
+            return ArgumentProcessorResult.Fail;
+        }
+
+        string procDumpInstallUnistallArgument = "";
+        if (install)
+        {
+            // Validate ProcDumpDirectoryPath
+            if (!TryGetDirectoryInfoAndReportToOutput(_collectDumpParameters,
+                "DumpDirectoryPath",
+                CommandLineResources.ProcDumpDirectoryPathArgumenNotFound,
+                CommandLineResources.InvalidProcDumpDirectoryPath,
+                out DirectoryInfo? dumpDirectoryPath))
+            {
+                return ArgumentProcessorResult.Fail;
+            }
+
+            procDumpInstallUnistallArgument = dumpDirectoryPath.FullName;
+        }
+
+        if (_processHelper.LaunchProcess(procDumpPath, install ? "-ma -i" : "-u", procDumpInstallUnistallArgument, null,
+            (_, data) =>
+            {
+                if (data is not null && !StringUtilities.IsNullOrWhiteSpace(data))
+                {
+                    _output.Error(false, data, null);
+                }
+            },
+            null,
+            (_, data) =>
+            {
+                if (data is not null && !StringUtilities.IsNullOrWhiteSpace(data))
+                {
+                    _output.Information(false, data, null);
+                }
+            })
+            is Process process)
+        {
+            return !process.WaitForExit(TimeSpan.FromSeconds(ProcDumpTimeoutSeconds).Seconds)
+                ? ArgumentProcessorResult.Fail
+                : process.ExitCode == 0 ? ArgumentProcessorResult.Success : ArgumentProcessorResult.Fail;
+        }
+
+        // We suppose a success if the object returned by the LaunchProcess is not a Process object.
+        return ArgumentProcessorResult.Success;
+
+        bool TryGetDirectoryInfoAndReportToOutput(Dictionary<string, string> collectDumpParameters,
+            string directoryArgumentName,
+            string invalidArgumentErrorMessage,
+            string invalidDirectoryErrorMessage,
+            [NotNullWhen(true)] out DirectoryInfo? directoryInfo)
+        {
+            directoryInfo = null;
+
+            if (!collectDumpParameters.TryGetValue(directoryArgumentName, out string? directoryPath))
+            {
+                _output.Error(false, string.Format(CultureInfo.CurrentCulture, invalidArgumentErrorMessage));
+                return false;
+            }
+
+            if (directoryPath is null)
+            {
+                _output.Error(false, string.Format(CultureInfo.CurrentCulture, invalidArgumentErrorMessage));
+                return false;
+            }
+
+            directoryInfo = new(directoryPath);
+            if (!_fileHelper.DirectoryExists(directoryInfo.FullName))
+            {
+                _output.Error(false, string.Format(CultureInfo.CurrentCulture, invalidDirectoryErrorMessage, directoryInfo.FullName));
+                directoryInfo = null;
+                return false;
+            }
+
+            return true;
+        }
+
+        bool TryGetDirectoryInfo(Dictionary<string, string> collectDumpParameters, string directoryArgumentName, [NotNullWhen(true)] out DirectoryInfo? directoryInfo)
+        {
+            directoryInfo = null;
+
+            if (!collectDumpParameters.TryGetValue(directoryArgumentName, out string? directoryPath))
+            {
+                return false;
+            }
+
+            if (directoryPath is null)
+            {
+                return false;
+            }
+
+            directoryInfo = new(directoryPath);
+            if (!_fileHelper.DirectoryExists(directoryInfo.FullName))
+            {
+                directoryInfo = null;
+                return false;
+            }
+
+            return true;
+        }
+    }
+
+}
diff --git a/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs b/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs
new file mode 100644
index 0000000000..8dd1be8dd6
--- /dev/null
+++ b/src/vstest.console/Processors/ArtifactProcessingCollectModeProcessor.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Processor for the "--artifactsProcessingMode-collect|/ArtifactsProcessingMode-Collect" command line argument.
+/// </summary>
+internal class ArtifactProcessingCollectModeProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the ArtifactProcessingModeProcessor handles.
+    /// </summary>
+    public const string CommandName = "/ArtifactsProcessingMode-Collect";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ArtifactProcessingCollectModeProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArtifactProcessingCollectModeProcessorExecutor(CommandLineOptions.Instance));
+
+        set => _executor = value;
+    }
+}
+
+internal class ArtifactProcessingCollectModeProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ArtifactProcessingCollectModeProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    // We put priority at the same level of the argument processor for runsettings passed as argument through cli.
+    // We'll be sure to run before test run arg processor.
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.CliRunSettings;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.None;
+
+    // We want to be sure that this command won't show in user help
+    public override string? HelpContentResourceName => null;
+}
+
+internal enum ArtifactProcessingMode
+{
+    None,
+    Collect,
+    PostProcess
+}
+
+/// <summary>
+/// Argument Executor for the "/ArtifactsProcessingMode-Collect" command line argument.
+/// </summary>
+internal class ArtifactProcessingCollectModeProcessorExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+
+    public ArtifactProcessingCollectModeProcessorExecutor(CommandLineOptions options)
+    {
+        _commandLineOptions = options ?? throw new ArgumentNullException(nameof(options));
+    }
+
+    public void Initialize(string? _)
+    {
+        _commandLineOptions.ArtifactProcessingMode = ArtifactProcessingMode.Collect;
+        EqtTrace.Verbose($"ArtifactProcessingPostProcessModeProcessorExecutor.Initialize: ArtifactProcessingMode.Collect");
+    }
+
+    public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
+}
diff --git a/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs b/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs
new file mode 100644
index 0000000000..0a446e1b61
--- /dev/null
+++ b/src/vstest.console/Processors/ArtifactProcessingPostProcessModeProcessor.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Processor for the "--artifactsProcessingMode-postprocess|/ArtifactsProcessingMode-PostProcess" command line argument.
+/// </summary>
+internal class ArtifactProcessingPostProcessModeProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the ArtifactProcessingModeProcessor handles.
+    /// </summary>
+    public const string CommandName = "/ArtifactsProcessingMode-PostProcess";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ArtifactProcessingPostProcessModeProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArtifactProcessingPostProcessModeProcessorExecutor(CommandLineOptions.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId)));
+
+        set => _executor = value;
+    }
+
+    public static bool ContainsPostProcessCommand(string[]? args, IFeatureFlag? featureFlag = null)
+        => !(featureFlag ?? FeatureFlag.Instance).IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING) &&
+            (args?.Contains("--artifactsProcessingMode-postprocess", StringComparer.OrdinalIgnoreCase) == true ||
+            args?.Contains(CommandName, StringComparer.OrdinalIgnoreCase) == true);
+}
+
+internal class ArtifactProcessingPostProcessModeProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ArtifactProcessingPostProcessModeProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.None;
+
+    // We want to be sure that this command won't show in user help
+    public override string? HelpContentResourceName => null;
+
+    public override bool IsAction => true;
+}
+
+/// <summary>
+/// Argument Executor for the "/ArtifactsProcessingMode-PostProcess" command line argument.
+/// </summary>
+internal class ArtifactProcessingPostProcessModeProcessorExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly IArtifactProcessingManager _artifactProcessingManage;
+
+    public ArtifactProcessingPostProcessModeProcessorExecutor(CommandLineOptions options, IArtifactProcessingManager artifactProcessingManager)
+    {
+        _commandLineOptions = options ?? throw new ArgumentNullException(nameof(options));
+        _artifactProcessingManage = artifactProcessingManager ?? throw new ArgumentNullException(nameof(artifactProcessingManager));
+    }
+
+    public void Initialize(string? _)
+    {
+        _commandLineOptions.ArtifactProcessingMode = ArtifactProcessingMode.PostProcess;
+        EqtTrace.Verbose($"ArtifactProcessingPostProcessModeProcessorExecutor.Initialize: ArtifactProcessingMode.PostProcess");
+    }
+
+    public ArgumentProcessorResult Execute()
+    {
+        try
+        {
+            // We don't have async execution at the moment for the argument processors.
+            // Anyway post processing could involve a lot of I/O and so we make some space
+            // for some possible parallelization async/await and fair I/O for the callee.
+            _artifactProcessingManage.PostProcessArtifactsAsync().Wait();
+            return ArgumentProcessorResult.Success;
+        }
+        catch (Exception e)
+        {
+            EqtTrace.Error("ArtifactProcessingPostProcessModeProcessorExecutor: Exception during artifact post processing: " + e);
+            return ArgumentProcessorResult.Fail;
+        }
+    }
+}
diff --git a/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs b/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
index 88575c2254..20b0c677b3 100644
--- a/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/CLIRunSettingsArgumentProcessor.cs
@@ -1,264 +1,240 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Globalization;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// The argument processor for runsettings passed as argument through cli
+/// </summary>
+internal class CliRunSettingsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Xml.XPath;
-    using System.Collections.Generic;
+    /// <summary>
+    /// The name of the command line argument that the PortArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "--";
 
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new CliRunSettingsArgumentProcessorCapabilities());
 
     /// <summary>
-    /// The argument processor for runsettings passed as argument through cli
+    /// Gets or sets the executor.
     /// </summary>
-    internal class CLIRunSettingsArgumentProcessor : IArgumentProcessor
+    public Lazy<IArgumentExecutor>? Executor
     {
-        #region Constants
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new CliRunSettingsArgumentExecutor(RunSettingsManager.Instance, CommandLineOptions.Instance));
 
-        /// <summary>
-        /// The name of the command line argument that the PortArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "--";
+        set => _executor = value;
+    }
+}
 
-        #endregion
+internal class CliRunSettingsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => CliRunSettingsArgumentProcessor.CommandName;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public override bool AllowMultiple => false;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override bool IsAction => false;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new CLIRunSettingsArgumentProcessorCapabilities());
-                }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.CliRunSettings;
 
-                return this.metadata;
-            }
-        }
+    public override string HelpContentResourceName => CommandLineResources.CLIRunSettingsArgumentHelp;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new CLIRunSettingsArgumentExecutor(RunSettingsManager.Instance, CommandLineOptions.Instance));
-                }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.CliRunSettingsArgumentProcessorHelpPriority;
+}
 
-                return this.executor;
-            }
+internal class CliRunSettingsArgumentExecutor : IArgumentsExecutor
+{
+    private readonly IRunSettingsProvider _runSettingsManager;
+    private readonly CommandLineOptions _commandLineOptions;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
+    internal CliRunSettingsArgumentExecutor(IRunSettingsProvider runSettingsManager, CommandLineOptions commandLineOptions)
+    {
+        _runSettingsManager = runSettingsManager;
+        _commandLineOptions = commandLineOptions;
     }
 
-    internal class CLIRunSettingsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    public void Initialize(string? argument)
     {
-        public override string CommandName => CLIRunSettingsArgumentProcessor.CommandName;
-
-        public override bool AllowMultiple => false;
-
-        public override bool IsAction => false;
-
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.CLIRunSettings;
-
-        public override string HelpContentResourceName => CommandLineResources.CLIRunSettingsArgumentHelp;
-
-        public override HelpContentPriority HelpPriority => HelpContentPriority.CLIRunSettingsArgumentProcessorHelpPriority;
+        throw new NotImplementedException();
     }
 
-    internal class CLIRunSettingsArgumentExecutor : IArgumentsExecutor
+    public void Initialize(string[]? arguments)
     {
-        private IRunSettingsProvider runSettingsManager;
-        private CommandLineOptions commandLineOptions;
-
-        internal CLIRunSettingsArgumentExecutor(IRunSettingsProvider runSettingsManager, CommandLineOptions commandLineOptions)
+        // if argument is null or doesn't contain any element, don't do anything.
+        if (arguments == null || arguments.Length == 0)
         {
-            this.runSettingsManager = runSettingsManager;
-            this.commandLineOptions = commandLineOptions;
+            return;
         }
 
-        public void Initialize(string argument)
+        Contract.EndContractBlock();
+
+        // Load up the run settings and set it as the active run settings.
+        try
         {
-            throw new NotImplementedException();
+            // Append / Override run settings supplied in CLI
+            CreateOrOverwriteRunSettings(_runSettingsManager, arguments);
         }
-
-        public void Initialize(string[] arguments)
+        catch (XPathException exception)
         {
-            // if argument is null or doesn't contain any element, don't do anything.
-            if (arguments == null || arguments.Length == 0)
-            {
-                return;
-            }
-
-            Contract.EndContractBlock();
-
-            // Load up the run settings and set it as the active run settings.
-            try
-            {
-                // Append / Override run settings supplied in CLI
-                CreateOrOverwriteRunSettings(this.runSettingsManager, arguments);
-            }
-            catch (XPathException exception)
-            {
-                throw new CommandLineException(CommandLineResources.MalformedRunSettingsKey, exception);
-            }
-            catch (SettingsException exception)
-            {
-                throw new CommandLineException(exception.Message, exception);
-            }
+            throw new CommandLineException(CommandLineResources.MalformedRunSettingsKey, exception);
         }
-
-        public ArgumentProcessorResult Execute()
+        catch (SettingsException exception)
         {
-            // Nothing to do here, the work was done in initialization.
-            return ArgumentProcessorResult.Success;
+            throw new CommandLineException(exception.Message, exception);
         }
+    }
 
-        private void CreateOrOverwriteRunSettings(IRunSettingsProvider runSettingsProvider, string[] args)
-        {
-            var mergedArgs = new List<string>();
-            var mergedArg = string.Empty;
-            var merge = false;
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do here, the work was done in initialization.
+        return ArgumentProcessorResult.Success;
+    }
 
-            foreach (var arg in args)
-            {
-                // when we see that the parameter begins with TestRunParameters 
-                // but does not end with ") we start merging the params
-                if (arg.StartsWith("TestRunParameters", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (arg.EndsWith("\")"))
-                    {
-                        // this parameter is complete
-                        mergedArgs.Add(arg);
-                    }
-                    else
-                    {
-                        // this parameter needs merging
-                        merge = true;
-                    }
-                }
+    private void CreateOrOverwriteRunSettings(IRunSettingsProvider runSettingsProvider, string[] args)
+    {
+        var mergedArgs = new List<string>();
+        var mergedArg = string.Empty;
+        var merge = false;
 
-                // we merge as long as the flag is set
-                // hoping that we find the end of the parameter
-                if (merge)
-                {
-                    mergedArg += string.IsNullOrWhiteSpace(mergedArg) ? arg : $" {arg}";
-                }
-                else
+        foreach (var arg in args)
+        {
+            // when we see that the parameter begins with TestRunParameters
+            // but does not end with ") we start merging the params
+            if (arg.StartsWith("TestRunParameters", StringComparison.OrdinalIgnoreCase))
+            {
+                if (arg.EndsWith("\")"))
                 {
-                    // if we are not merging just pass the param as is
+                    // this parameter is complete
                     mergedArgs.Add(arg);
                 }
-
-                // once we detect the end we add the whole parameter to the args
-                if (merge && arg.EndsWith("\")"))
+                else
                 {
-                    mergedArgs.Add(mergedArg);
-                    mergedArg = string.Empty;
-                    merge = false;
+                    // this parameter needs merging
+                    merge = true;
                 }
             }
 
+            // we merge as long as the flag is set
+            // hoping that we find the end of the parameter
             if (merge)
             {
-                // we tried to merge but never found the end of that 
-                // test paramter, add what we merged up until now
-                mergedArgs.Add(mergedArg);
+                mergedArg += StringUtils.IsNullOrWhiteSpace(mergedArg) ? arg : $" {arg}";
             }
-
-
-            var length = mergedArgs.Count;
-
-            for (int index = 0; index < length; index++)
+            else
             {
-                var arg = mergedArgs[index];
-
-                if (UpdateTestRunParameterNode(runSettingsProvider, arg))
-                {
-                    continue;
-                }
+                // if we are not merging just pass the param as is
+                mergedArgs.Add(arg);
+            }
 
-                var indexOfSeparator = arg.IndexOf("=");
+            // once we detect the end we add the whole parameter to the args
+            if (merge && arg.EndsWith("\")"))
+            {
+                mergedArgs.Add(mergedArg);
+                mergedArg = string.Empty;
+                merge = false;
+            }
+        }
 
-                if (indexOfSeparator <= 0 || indexOfSeparator >= arg.Length - 1)
-                {
-                    continue;
-                }
+        if (merge)
+        {
+            // we tried to merge but never found the end of that
+            // test paramter, add what we merged up until now
+            mergedArgs.Add(mergedArg);
+        }
 
-                var key = arg.Substring(0, indexOfSeparator).Trim();
-                var value = arg.Substring(indexOfSeparator + 1);
 
-                if (string.IsNullOrWhiteSpace(key))
-                {
-                    continue;
-                }
+        var length = mergedArgs.Count;
 
-                // To determine whether to infer framework and platform.
-                UpdateFrameworkAndPlatform(key, value);
+        for (int index = 0; index < length; index++)
+        {
+            var arg = mergedArgs[index];
 
-                runSettingsProvider.UpdateRunSettingsNode(key, value);
+            if (UpdateTestRunParameterNode(runSettingsProvider, arg))
+            {
+                continue;
             }
-        }
 
-        private bool UpdateTestRunParameterNode(IRunSettingsProvider runSettingsProvider, string node)
-        {
-            if (!node.Contains(Constants.TestRunParametersName))
+            var indexOfSeparator = arg.IndexOf("=");
+
+            if (indexOfSeparator <= 0 || indexOfSeparator >= arg.Length - 1)
             {
-                return false;
+                continue;
             }
 
-            var match = runSettingsProvider.GetTestRunParameterNodeMatch(node);
+            var key = arg.Substring(0, indexOfSeparator).Trim();
+            var value = arg.Substring(indexOfSeparator + 1);
 
-            if (string.Compare(match.Value, node) == 0)
+            if (StringUtils.IsNullOrWhiteSpace(key))
             {
-                runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
-                return true;
+                continue;
             }
 
-            var exceptionMessage = string.Format(CommandLineResources.InvalidTestRunParameterArgument, node);
-            throw new CommandLineException(exceptionMessage);
+            // To determine whether to infer framework and platform.
+            UpdateFrameworkAndPlatform(key, value);
+
+            runSettingsProvider.UpdateRunSettingsNode(key, value);
         }
+    }
+
+    private static bool UpdateTestRunParameterNode(IRunSettingsProvider runSettingsProvider, string node)
+    {
+        if (!node.Contains(Constants.TestRunParametersName))
+        {
+            return false;
+        }
+
+        var match = runSettingsProvider.GetTestRunParameterNodeMatch(node);
 
-        private void UpdateFrameworkAndPlatform(string key, string value)
+        if (string.Compare(match.Value, node) == 0)
         {
-            if (key.Equals(FrameworkArgumentExecutor.RunSettingsPath))
+            runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
+            return true;
+        }
+
+        var exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidTestRunParameterArgument, node);
+        throw new CommandLineException(exceptionMessage);
+    }
+
+    private void UpdateFrameworkAndPlatform(string key, string value)
+    {
+        if (key.Equals(FrameworkArgumentExecutor.RunSettingsPath))
+        {
+            Framework? framework = Framework.FromString(value);
+            if (framework != null)
             {
-                Framework framework = Framework.FromString(value);
-                if (framework != null)
-                {
-                    this.commandLineOptions.TargetFrameworkVersion = framework;
-                }
+                _commandLineOptions.TargetFrameworkVersion = framework;
             }
+        }
 
-            if (key.Equals(PlatformArgumentExecutor.RunSettingsPath))
+        if (key.Equals(PlatformArgumentExecutor.RunSettingsPath))
+        {
+            bool success = Enum.TryParse<Architecture>(value, true, out var architecture);
+            if (success)
             {
-                bool success = Enum.TryParse<Architecture>(value, true, out var architecture);
-                if (success)
-                {
-                    RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
-                    this.commandLineOptions.TargetArchitecture = architecture;
-                }
+                RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
+                _commandLineOptions.TargetArchitecture = architecture;
             }
         }
     }
diff --git a/src/vstest.console/Processors/CollectArgumentProcessor.cs b/src/vstest.console/Processors/CollectArgumentProcessor.cs
index 99f6dfebce..c050e85f22 100644
--- a/src/vstest.console/Processors/CollectArgumentProcessor.cs
+++ b/src/vstest.console/Processors/CollectArgumentProcessor.cs
@@ -1,331 +1,307 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// The argument processor for enabling data collectors.
+/// </summary>
+internal class CollectArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
     /// <summary>
-    /// The argument processor for enabling data collectors.
+    /// The name of command for enabling code coverage.
     /// </summary>
-    internal class CollectArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
-
-        /// <summary>
-        /// The name of command for enabling code coverage.
-        /// </summary>
-        public const string CommandName = "/Collect";
+    public const string CommandName = "/Collect";
 
-        #endregion
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
-
-        private Lazy<IArgumentExecutor> executor;
-
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new CollectArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new CollectArgumentExecutor(RunSettingsManager.Instance, new FileHelper()));
-                }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new CollectArgumentProcessorCapabilities());
 
-                return this.executor;
-            }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new CollectArgumentExecutor(RunSettingsManager.Instance, new FileHelper()));
 
-            set
-            {
-                this.executor = value;
-            }
-        }
+        set => _executor = value;
     }
+}
 
+internal class CollectArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => CollectArgumentProcessor.CommandName;
 
-    internal class CollectArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => CollectArgumentProcessor.CommandName;
+    public override bool AllowMultiple => true;
 
-        public override bool AllowMultiple => true;
+    public override bool IsAction => false;
 
-        public override bool IsAction => false;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+    public override string HelpContentResourceName => CommandLineResources.CollectArgumentHelp;
 
-        public override string HelpContentResourceName => CommandLineResources.CollectArgumentHelp;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.CollectArgumentProcessorHelpPriority;
+}
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.CollectArgumentProcessorHelpPriority;
+/// <inheritdoc />
+internal class CollectArgumentExecutor : IArgumentExecutor
+{
+    private readonly IRunSettingsProvider _runSettingsManager;
+    private readonly IFileHelper _fileHelper;
+    internal static List<string> EnabledDataCollectors = new();
+    internal CollectArgumentExecutor(IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+    {
+        _runSettingsManager = runSettingsManager;
+        _fileHelper = fileHelper;
     }
 
     /// <inheritdoc />
-    internal class CollectArgumentExecutor : IArgumentExecutor
+    public void Initialize(string? argument)
     {
-        private readonly IRunSettingsProvider runSettingsManager;
-        private readonly IFileHelper fileHelper;
-        internal static List<string> EnabledDataCollectors = new List<string>();
-        internal CollectArgumentExecutor(IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+        // 1. Disable all other data collectors. Enable only those data collectors that are explicitly specified by user.
+        // 2. Check if Code Coverage Data Collector is specified in runsettings, if not add it and also set enable to true.
+
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.DataCollectorFriendlyNameInvalid, argument);
+
+        // if argument is null or doesn't contain any element, don't do anything.
+        if (argument.IsNullOrWhiteSpace())
         {
-            this.runSettingsManager = runSettingsManager;
-            this.fileHelper = fileHelper;
+            throw new CommandLineException(exceptionMessage);
         }
 
-        /// <inheritdoc />
-        public void Initialize(string argument)
+        // Get collect argument list.
+        var collectArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
+
+        // First argument is collector name. Remaining are key value pairs for configurations.
+        if (collectArgumentList[0].Contains("="))
         {
-            // 1. Disable all other data collectors. Enable only those data collectors that are explicitly specified by user.
-            // 2. Check if Code Coverage Data Collector is specified in runsettings, if not add it and also set enable to true.
+            throw new CommandLineException(exceptionMessage);
+        }
 
-            string exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.DataCollectorFriendlyNameInvalid, argument);
+        if (InferRunSettingsHelper.IsTestSettingsEnabled(_runSettingsManager.ActiveRunSettings?.SettingsXml))
+        {
+            throw new SettingsException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.CollectWithTestSettingErrorMessage, argument));
+        }
+        AddDataCollectorToRunSettings(collectArgumentList, _runSettingsManager, _fileHelper, exceptionMessage);
+    }
 
-            // if argument is null or doesn't contain any element, don't do anything.
-            if (string.IsNullOrWhiteSpace(argument))
+    /// <summary>
+    /// Returns coverlet code base searching coverlet.collector.dll assembly inside adaptersPaths
+    /// </summary>
+    private static string? GetCoverletCodeBasePath(IRunSettingsProvider runSettingProvider, IFileHelper fileHelper)
+    {
+        foreach (string adapterPath in RunSettingsUtilities.GetTestAdaptersPaths(runSettingProvider.ActiveRunSettings?.SettingsXml))
+        {
+            string collectorPath = Path.Combine(adapterPath, CoverletConstants.CoverletDataCollectorCodebase);
+            if (fileHelper.Exists(collectorPath))
             {
-                throw new CommandLineException(exceptionMessage);
+                EqtTrace.Verbose("CoverletDataCollector in-process codeBase path '{0}'", collectorPath);
+                return collectorPath;
             }
+        }
 
-            // Get collect argument list.
-            var collectArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
+        return null;
+    }
 
-            // First argument is collector name. Remaining are key value pairs for configurations.
-            if (collectArgumentList[0].Contains("="))
-            {
-                throw new CommandLineException(exceptionMessage);
-            }
+    /// <inheritdoc />
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
+    }
 
-            if (InferRunSettingsHelper.IsTestSettingsEnabled(this.runSettingsManager.ActiveRunSettings.SettingsXml))
-            {
-                throw new SettingsException(string.Format(CommandLineResources.CollectWithTestSettingErrorMessage, argument));
-            }
-            AddDataCollectorToRunSettings(collectArgumentList, this.runSettingsManager, this.fileHelper, exceptionMessage);
-        }
+    internal static DataCollectorSettings EnableDataCollectorUsingFriendlyName(string argument, DataCollectionRunSettings dataCollectionRunSettings)
+    {
 
-        /// <summary>
-        /// Returns coverlet code base searching coverlet.collector.dll assembly inside adaptersPaths
-        /// </summary>
-        private static string GetCoverletCodeBasePath(IRunSettingsProvider runSettingProvider, IFileHelper fileHelper)
+        if (!DoesDataCollectorSettingsExist(argument, dataCollectionRunSettings, out var dataCollectorSettings))
         {
-            foreach (string adapterPath in RunSettingsUtilities.GetTestAdaptersPaths(runSettingProvider.ActiveRunSettings.SettingsXml))
-            {
-                string collectorPath = Path.Combine(adapterPath, CoverletConstants.CoverletDataCollectorCodebase);
-                if (fileHelper.Exists(collectorPath))
-                {
-                    EqtTrace.Verbose("CoverletDataCollector in-process codeBase path '{0}'", collectorPath);
-                    return collectorPath;
-                }
-            }
-
-            return null;
+            dataCollectorSettings = new DataCollectorSettings();
+            dataCollectorSettings.FriendlyName = argument;
+            dataCollectorSettings.IsEnabled = true;
+            dataCollectionRunSettings.DataCollectorSettingsList.Add(dataCollectorSettings);
+        }
+        else
+        {
+            dataCollectorSettings.IsEnabled = true;
         }
 
-        /// <inheritdoc />
-        public ArgumentProcessorResult Execute()
+        return dataCollectorSettings;
+    }
+
+    private static void AddDataCollectorConfigurations(string[] configurations, DataCollectorSettings dataCollectorSettings, string exceptionMessage)
+    {
+        if (dataCollectorSettings.Configuration == null)
         {
-            return ArgumentProcessorResult.Success;
+            XmlDocument doc = new();
+            dataCollectorSettings.Configuration = doc.CreateElement("Configuration");
         }
 
-        internal static DataCollectorSettings EnableDataCollectorUsingFriendlyName(string argument, DataCollectionRunSettings dataCollectionRunSettings)
+        foreach (var configuration in configurations)
         {
-            DataCollectorSettings dataCollectorSettings = null;
+            var keyValuePair = ArgumentProcessorUtilities.GetArgumentList(configuration, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
 
-            if (!DoesDataCollectorSettingsExist(argument, dataCollectionRunSettings, out dataCollectorSettings))
+            if (keyValuePair.Length == 2)
             {
-                dataCollectorSettings = new DataCollectorSettings();
-                dataCollectorSettings.FriendlyName = argument;
-                dataCollectorSettings.IsEnabled = true;
-                dataCollectionRunSettings.DataCollectorSettingsList.Add(dataCollectorSettings);
+                AddOrUpdateConfiguration(dataCollectorSettings.Configuration, keyValuePair[0], keyValuePair[1]);
             }
             else
             {
-                dataCollectorSettings.IsEnabled = true;
+                throw new CommandLineException(exceptionMessage);
             }
-
-            return dataCollectorSettings;
         }
+    }
 
-        private static void AddDataCollectorConfigurations(string[] configurations, DataCollectorSettings dataCollectorSettings, string exceptionMessage)
-        {
-            if (dataCollectorSettings.Configuration == null)
-            {
-                XmlDocument doc = new XmlDocument();
-                dataCollectorSettings.Configuration = doc.CreateElement("Configuration");
-            }
-
-            foreach (var configuration in configurations)
-            {
-                var keyValuePair = ArgumentProcessorUtilities.GetArgumentList(configuration, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
-
-                if (keyValuePair.Length == 2)
-                {
-                    AddOrUpdateConfiguration(dataCollectorSettings.Configuration, keyValuePair[0], keyValuePair[1]);
-                }
-                else
-                {
-                    throw new CommandLineException(exceptionMessage);
-                }
-            }
-        }
+    private static void AddOrUpdateConfiguration(XmlElement configuration, string configurationName, string configurationValue)
+    {
+        var existingConfigurations = configuration.GetElementsByTagName(configurationName);
 
-        private static void AddOrUpdateConfiguration(XmlElement configuration, string configurationName, string configurationValue)
+        // Update existing configuration if present.
+        if (existingConfigurations.Count == 0)
         {
-            var existingConfigurations = configuration.GetElementsByTagName(configurationName);
-
-            // Update existing configuration if present.
-            if (existingConfigurations.Count == 0)
-            {
-                XmlElement newConfiguration = configuration.OwnerDocument.CreateElement(configurationName);
-                newConfiguration.InnerText = configurationValue;
-                configuration.AppendChild(newConfiguration);
-                return;
-            }
-
-            foreach (XmlNode existingConfiguration in existingConfigurations)
-            {
-                existingConfiguration.InnerText = configurationValue;
-            }
+            XmlElement newConfiguration = configuration.OwnerDocument.CreateElement(configurationName);
+            newConfiguration.InnerText = configurationValue;
+            configuration.AppendChild(newConfiguration);
+            return;
         }
 
-        /// <summary>
-        /// Enables coverlet in-proc datacollector
-        /// </summary>
-        internal static void EnableCoverletInProcDataCollector(string argument, DataCollectionRunSettings dataCollectionRunSettings, IRunSettingsProvider runSettingProvider, IFileHelper fileHelper)
+        foreach (XmlNode? existingConfiguration in existingConfigurations)
         {
-            DataCollectorSettings dataCollectorSettings = null;
-
-            if (!DoesDataCollectorSettingsExist(argument, dataCollectionRunSettings, out dataCollectorSettings))
-            {
-                // Create a new setting with default values
-                dataCollectorSettings = new DataCollectorSettings();
-                dataCollectorSettings.FriendlyName = argument;
-                dataCollectorSettings.AssemblyQualifiedName = CoverletConstants.CoverletDataCollectorAssemblyQualifiedName;
-                dataCollectorSettings.CodeBase = GetCoverletCodeBasePath(runSettingProvider, fileHelper) ?? CoverletConstants.CoverletDataCollectorCodebase;
-                dataCollectorSettings.IsEnabled = true;
-                dataCollectionRunSettings.DataCollectorSettingsList.Add(dataCollectorSettings);
-            }
-            else
-            {
-                // Set Assembly qualified name and code base if not already set
-                dataCollectorSettings.AssemblyQualifiedName = dataCollectorSettings.AssemblyQualifiedName ?? CoverletConstants.CoverletDataCollectorAssemblyQualifiedName;
-                dataCollectorSettings.CodeBase = (dataCollectorSettings.CodeBase ?? GetCoverletCodeBasePath(runSettingProvider, fileHelper)) ?? CoverletConstants.CoverletDataCollectorCodebase;
-                dataCollectorSettings.IsEnabled = true;
-            }
+            TPDebug.Assert(existingConfiguration is not null, "existingConfiguration is null");
+            existingConfiguration.InnerText = configurationValue;
         }
+    }
 
-        private static bool DoesDataCollectorSettingsExist(string friendlyName,
-            DataCollectionRunSettings dataCollectionRunSettings,
-            out DataCollectorSettings dataCollectorSettings)
-        {
-            dataCollectorSettings = null;
-            foreach (var dataCollectorSetting in dataCollectionRunSettings.DataCollectorSettingsList)
-            {
-                if (dataCollectorSetting.FriendlyName.Equals(friendlyName, StringComparison.OrdinalIgnoreCase))
-                {
-                    dataCollectorSettings = dataCollectorSetting;
-                    return true;
-                }
-            }
+    /// <summary>
+    /// Enables coverlet in-proc datacollector
+    /// </summary>
+    internal static void EnableCoverletInProcDataCollector(string argument, DataCollectionRunSettings dataCollectionRunSettings, IRunSettingsProvider runSettingProvider, IFileHelper fileHelper)
+    {
 
-            return false;
+        if (!DoesDataCollectorSettingsExist(argument, dataCollectionRunSettings, out DataCollectorSettings? dataCollectorSettings))
+        {
+            // Create a new setting with default values
+            dataCollectorSettings = new DataCollectorSettings();
+            dataCollectorSettings.FriendlyName = argument;
+            dataCollectorSettings.AssemblyQualifiedName = CoverletConstants.CoverletDataCollectorAssemblyQualifiedName;
+            dataCollectorSettings.CodeBase = GetCoverletCodeBasePath(runSettingProvider, fileHelper) ?? CoverletConstants.CoverletDataCollectorCodebase;
+            dataCollectorSettings.IsEnabled = true;
+            dataCollectionRunSettings.DataCollectorSettingsList.Add(dataCollectorSettings);
         }
-
-        internal static void AddDataCollectorToRunSettings(string arguments, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+        else
         {
-            AddDataCollectorToRunSettings(new string[] { arguments }, runSettingsManager, fileHelper, string.Empty);
+            // Set Assembly qualified name and code base if not already set
+            dataCollectorSettings.AssemblyQualifiedName ??= CoverletConstants.CoverletDataCollectorAssemblyQualifiedName;
+            dataCollectorSettings.CodeBase = (dataCollectorSettings.CodeBase ?? GetCoverletCodeBasePath(runSettingProvider, fileHelper)) ?? CoverletConstants.CoverletDataCollectorCodebase;
+            dataCollectorSettings.IsEnabled = true;
         }
+    }
 
-        internal static void AddDataCollectorToRunSettings(string[] arguments, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper, string exceptionMessage)
+    private static bool DoesDataCollectorSettingsExist(string friendlyName,
+        DataCollectionRunSettings dataCollectionRunSettings,
+        [NotNullWhen(returnValue: true)] out DataCollectorSettings? dataCollectorSettings)
+    {
+        dataCollectorSettings = null;
+        foreach (var dataCollectorSetting in dataCollectionRunSettings.DataCollectorSettingsList)
         {
-            var collectorName = arguments[0];
-            var additionalConfigurations = arguments.Skip(1).ToArray();
-            EnabledDataCollectors.Add(collectorName.ToLower());
-
-            var settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
-            if (settings == null)
+            if (string.Equals(dataCollectorSetting.FriendlyName, friendlyName, StringComparison.OrdinalIgnoreCase))
             {
-                runSettingsManager.AddDefaultRunSettings();
-                settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
+                dataCollectorSettings = dataCollectorSetting;
+                return true;
             }
+        }
 
-            var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settings) ?? new DataCollectionRunSettings();
-            var inProcDataCollectionRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settings)
-                ?? new DataCollectionRunSettings(
-                    Constants.InProcDataCollectionRunSettingsName,
-                    Constants.InProcDataCollectorsSettingName,
-                    Constants.InProcDataCollectorSettingName);
-
-            // Add data collectors if not already present, enable if already present.
-            var dataCollectorSettings = EnableDataCollectorUsingFriendlyName(collectorName, dataCollectionRunSettings);
+        return false;
+    }
 
-            if (additionalConfigurations.Length > 0)
-            {
-                AddDataCollectorConfigurations(additionalConfigurations, dataCollectorSettings, exceptionMessage);
-            }
+    internal static void AddDataCollectorToRunSettings(string arguments, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+    {
+        AddDataCollectorToRunSettings([arguments], runSettingsManager, fileHelper, string.Empty);
+    }
 
-            runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.DataCollectionRunSettingsName, dataCollectionRunSettings.ToXml().InnerXml);
+    internal static void AddDataCollectorToRunSettings(string[] arguments, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper, string exceptionMessage)
+    {
+        var collectorName = arguments[0];
+        var additionalConfigurations = arguments.Skip(1).ToArray();
+        EnabledDataCollectors.Add(collectorName.ToLower(CultureInfo.CurrentCulture));
 
-            if (string.Equals(collectorName, CoverletConstants.CoverletDataCollectorFriendlyName, StringComparison.OrdinalIgnoreCase))
-            {
-                // Add in-proc data collector to runsettings if coverlet code coverage is enabled
-                EnableCoverletInProcDataCollector(collectorName, inProcDataCollectionRunSettings, runSettingsManager, fileHelper);
-                runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.InProcDataCollectionRunSettingsName, inProcDataCollectionRunSettings.ToXml().InnerXml);
-            }
+        var settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
+        if (settings == null)
+        {
+            runSettingsManager.AddDefaultRunSettings();
+            settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
         }
 
-        internal static void AddDataCollectorFriendlyName(string friendlyName)
+        var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settings) ?? new DataCollectionRunSettings();
+        var inProcDataCollectionRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settings)
+                                              ?? new DataCollectionRunSettings(
+                                                  Constants.InProcDataCollectionRunSettingsName,
+                                                  Constants.InProcDataCollectorsSettingName,
+                                                  Constants.InProcDataCollectorSettingName);
+
+        // Add data collectors if not already present, enable if already present.
+        var dataCollectorSettings = EnableDataCollectorUsingFriendlyName(collectorName, dataCollectionRunSettings);
+
+        if (additionalConfigurations.Length > 0)
         {
-            EnabledDataCollectors.Add(friendlyName.ToLower());
+            AddDataCollectorConfigurations(additionalConfigurations, dataCollectorSettings, exceptionMessage);
         }
 
-        internal static class CoverletConstants
+        runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.DataCollectionRunSettingsName, dataCollectionRunSettings.ToXml().InnerXml);
+
+        if (string.Equals(collectorName, CoverletConstants.CoverletDataCollectorFriendlyName, StringComparison.OrdinalIgnoreCase))
         {
-            /// <summary>
-            /// Coverlet in-proc data collector friendly name
-            /// </summary>
-            public const string CoverletDataCollectorFriendlyName = "XPlat Code Coverage";
-
-            /// <summary>
-            /// Coverlet in-proc data collector assembly qualified name
-            /// </summary>
-            public const string CoverletDataCollectorAssemblyQualifiedName = "Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null";
-
-            /// <summary>
-            /// Coverlet in-proc data collector code base
-            /// </summary>
-            public const string CoverletDataCollectorCodebase = "coverlet.collector.dll";
+            // Add in-proc data collector to runsettings if coverlet code coverage is enabled
+            EnableCoverletInProcDataCollector(collectorName, inProcDataCollectionRunSettings, runSettingsManager, fileHelper);
+            runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.InProcDataCollectionRunSettingsName, inProcDataCollectionRunSettings.ToXml().InnerXml);
         }
     }
-}
\ No newline at end of file
+
+    internal static void AddDataCollectorFriendlyName(string friendlyName)
+    {
+        EnabledDataCollectors.Add(friendlyName.ToLower(CultureInfo.CurrentCulture));
+    }
+
+    internal static class CoverletConstants
+    {
+        /// <summary>
+        /// Coverlet in-proc data collector friendly name
+        /// </summary>
+        public const string CoverletDataCollectorFriendlyName = "XPlat Code Coverage";
+
+        /// <summary>
+        /// Coverlet in-proc data collector assembly qualified name
+        /// </summary>
+        public const string CoverletDataCollectorAssemblyQualifiedName = "Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null";
+
+        /// <summary>
+        /// Coverlet in-proc data collector code base
+        /// </summary>
+        public const string CoverletDataCollectorCodebase = "coverlet.collector.dll";
+    }
+}
diff --git a/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs b/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
index 90396805ef..4b128a0287 100644
--- a/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
+++ b/src/vstest.console/Processors/DisableAutoFakesArgumentProcessor.cs
@@ -1,108 +1,83 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
+using System;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    /// <summary>
-    /// An argument processor that allows the user to disable fakes
-    /// from the command line using the --DisableAutoFakes|/DisableAutoFakes command line switch.
-    /// </summary>
-    internal class DisableAutoFakesArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        public const string CommandName = "/DisableAutoFakes";
+/// <summary>
+/// An argument processor that allows the user to disable fakes
+/// from the command line using the --DisableAutoFakes|/DisableAutoFakes command line switch.
+/// </summary>
+internal class DisableAutoFakesArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/DisableAutoFakes";
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private Lazy<IArgumentExecutor> executor;
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new DisableAutoFakesArgumentExecutor(CommandLineOptions.Instance));
 
-        #endregion
+        set => _executor = value;
+    }
 
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                return this.executor ?? (this.executor =
-                                             new Lazy<IArgumentExecutor>(
-                                                 () => new DisableAutoFakesArgumentExecutor(
-                                                     CommandLineOptions.Instance)));
-            }
-
-            set => this.executor = value;
-        }
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new DisableAutoFakesArgumentProcessorCapabilities());
+}
 
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                return this.metadata ?? (this.metadata =
-                                             new Lazy<IArgumentProcessorCapabilities>(
-                                                 () => new DisableAutoFakesArgumentProcessorCapabilities()));
-            }
-        }
-    }
+internal class DisableAutoFakesArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override bool AllowMultiple => false;
 
-    internal class DisableAutoFakesArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override bool AllowMultiple => false;
+    public override string CommandName => DisableAutoFakesArgumentProcessor.CommandName;
 
-        public override string CommandName => DisableAutoFakesArgumentProcessor.CommandName;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.DisableAutoFakesArgumentProcessorHelpPriority;
+}
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.DisableAutoFakesArgumentProcessorHelpPriority;
-    }
+internal class DisableAutoFakesArgumentExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
 
-    internal class DisableAutoFakesArgumentExecutor : IArgumentExecutor
+    public DisableAutoFakesArgumentExecutor(CommandLineOptions commandLineOptions)
     {
-        private readonly CommandLineOptions commandLineOptions;
-
-        #region Constructors
-        public DisableAutoFakesArgumentExecutor(CommandLineOptions commandLineOptions)
-        {
-            this.commandLineOptions = commandLineOptions;
-        }
-        #endregion
+        _commandLineOptions = commandLineOptions;
+    }
 
-        #region IArgumentProcessor
+    #region IArgumentProcessor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace() || !bool.TryParse(argument, out bool value))
         {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(CommandLineResources.DisableAutoFakesUsage);
-            }
-
-            bool value;
-            if (!bool.TryParse(argument, out value))
-            {
-                throw new CommandLineException(CommandLineResources.DisableAutoFakesUsage);
-            }
-
-            this.commandLineOptions.DisableAutoFakes = value;
+            throw new CommandLineException(CommandLineResources.DisableAutoFakesUsage);
         }
 
-        /// <summary>
-        /// Execute.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="ArgumentProcessorResult"/>.
-        /// </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do since we updated the parameter during initialize parameter
-            return ArgumentProcessorResult.Success;
-        }
+        _commandLineOptions.DisableAutoFakes = value;
+    }
 
-        #endregion
+    /// <summary>
+    /// Execute.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="ArgumentProcessorResult"/>.
+    /// </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
index d96d48f569..6afdcd808e 100644
--- a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs
@@ -1,388 +1,350 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+extern alias Abstraction;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class EnableBlameArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    internal class EnableBlameArgumentProcessor : IArgumentProcessor
-    {
-        /// <summary>
-        /// The name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Blame";
-
-        private Lazy<IArgumentProcessorCapabilities> metadata;
-
-        private Lazy<IArgumentExecutor> executor;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableBlameArgumentProcessor"/> class.
-        /// </summary>
-        public EnableBlameArgumentProcessor()
-        {
-        }
-
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableBlameArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// The name of the command line argument that the ListTestsArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/Blame";
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new EnableBlameArgumentExecutor(RunSettingsManager.Instance, new PlatformEnvironment(), new FileHelper()));
-                }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-                return this.executor;
-            }
-            set
-            {
-                this.executor = value;
-            }
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnableBlameArgumentProcessor"/> class.
+    /// </summary>
+    public EnableBlameArgumentProcessor()
+    {
     }
 
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableBlameArgumentProcessorCapabilities());
+
     /// <summary>
-    /// The argument capabilities.
+    /// Gets or sets the executor.
     /// </summary>
-    internal class EnableBlameArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    public Lazy<IArgumentExecutor>? Executor
     {
-        public override string CommandName => EnableBlameArgumentProcessor.CommandName;
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableBlameArgumentExecutor(RunSettingsManager.Instance, new PlatformEnvironment(), new FileHelper()));
 
-        public override bool AllowMultiple => false;
+        set => _executor = value;
+    }
+}
 
-        public override bool IsAction => false;
+/// <summary>
+/// The argument capabilities.
+/// </summary>
+internal class EnableBlameArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => EnableBlameArgumentProcessor.CommandName;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Logging;
+    public override bool AllowMultiple => false;
 
-        public override string HelpContentResourceName => CommandLineResources.EnableBlameUsage;
+    public override bool IsAction => false;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.EnableDiagArgumentProcessorHelpPriority;
-    }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Logging;
 
-    /// <summary>
-    /// The argument executor.
-    /// </summary>
-    internal class EnableBlameArgumentExecutor : IArgumentExecutor
-    {
-        /// <summary>
-        /// Blame logger and data collector friendly name
-        /// </summary>
-        private static string BlameFriendlyName = "blame";
-
-        /// <summary>
-        /// Run settings manager
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
+    public override string HelpContentResourceName => CommandLineResources.EnableBlameUsage;
 
-        /// <summary>
-        /// Platform environment
-        /// </summary>
-        private IEnvironment environment;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.EnableDiagArgumentProcessorHelpPriority;
+}
 
-        /// <summary>
-        /// For file related operation
-        /// </summary>
-        private readonly IFileHelper fileHelper;
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class EnableBlameArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Blame logger and data collector friendly name
+    /// </summary>
+    private static readonly string BlameFriendlyName = "blame";
 
-        #region Constructor
+    /// <summary>
+    /// Run settings manager
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        internal EnableBlameArgumentExecutor(IRunSettingsProvider runSettingsManager, IEnvironment environment, IFileHelper fileHelper)
-        {
-            this.runSettingsManager = runSettingsManager;
-            this.environment = environment;
-            this.Output = ConsoleOutput.Instance;
-            this.fileHelper = fileHelper;
-        }
+    /// <summary>
+    /// Platform environment
+    /// </summary>
+    private readonly IEnvironment _environment;
 
-        #endregion
+    /// <summary>
+    /// For file related operation
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
 
-        #region Properties
+    internal EnableBlameArgumentExecutor(IRunSettingsProvider runSettingsManager, IEnvironment environment, IFileHelper fileHelper)
+    {
+        _runSettingsManager = runSettingsManager;
+        _environment = environment;
+        Output = ConsoleOutput.Instance;
+        _fileHelper = fileHelper;
+    }
 
-        internal IOutput Output { get; set; }
+    internal IOutput Output { get; set; }
 
-        #endregion
 
-        #region IArgumentExecutor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        var enableDump = false;
+        var enableHangDump = false;
+        var monitorPostMortemDebugger = false;
+        var exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidBlameArgument, argument);
+        Dictionary<string, string>? collectDumpParameters = null;
+        if (!argument.IsNullOrWhiteSpace())
         {
-            var enableDump = false;
-            var enableHangDump = false;
-            var exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidBlameArgument, argument);
-            Dictionary<string, string> collectDumpParameters = null;
+            // Get blame argument list.
+            string[] blameArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
+            Func<string, bool> isDumpCollect = a => Constants.BlameCollectDumpKey.Equals(a, StringComparison.OrdinalIgnoreCase);
+            Func<string, bool> isHangDumpCollect = a => Constants.BlameCollectHangDumpKey.Equals(a, StringComparison.OrdinalIgnoreCase);
+            Func<string, bool> isMonitorPostmortemDebugger = a => Constants.BlameCollectMonitorPostMortemDebuggerKey.Equals(a, StringComparison.OrdinalIgnoreCase);
 
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                // Get blame argument list.
-                var blameArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
-                Func<string, bool> isDumpCollect = a => Constants.BlameCollectDumpKey.Equals(a, StringComparison.OrdinalIgnoreCase);
-                Func<string, bool> isHangDumpCollect = a => Constants.BlameCollectHangDumpKey.Equals(a, StringComparison.OrdinalIgnoreCase);
+            // Get collect dump key.
+            var hasCollectDumpKey = blameArgumentList.Any(isDumpCollect);
+            var hasCollectHangDumpKey = blameArgumentList.Any(isHangDumpCollect);
+            var hasMonitorPostmortemDebugger = blameArgumentList.Any(isMonitorPostmortemDebugger);
 
-                // Get collect dump key.
-                var hasCollectDumpKey = blameArgumentList.Any(isDumpCollect);
-                var hasCollectHangDumpKey = blameArgumentList.Any(isHangDumpCollect);
+            // Check if dump should be enabled or not.
+            enableDump = hasCollectDumpKey;
 
-                // Check if dump should be enabled or not.
-                enableDump = hasCollectDumpKey && IsDumpCollectionSupported();
+            // Check if dump should be enabled or not.
+            enableHangDump = hasCollectHangDumpKey;
 
-                // Check if dump should be enabled or not.
-                enableHangDump = hasCollectHangDumpKey && IsHangDumpCollectionSupported();
+            // Check if we need to monitor the postmortem debugger folder
+            monitorPostMortemDebugger = hasMonitorPostmortemDebugger;
 
-                if (!enableDump && !enableHangDump)
-                {
-                    Output.Warning(false, string.Format(CultureInfo.CurrentUICulture, CommandLineResources.BlameIncorrectOption, argument));
-                }
-                else
-                {
-                    // Get collect dump parameters.
-                    var collectDumpParameterArgs = blameArgumentList.Where(a => !isDumpCollect(a) && !isHangDumpCollect(a));
-                    collectDumpParameters = ArgumentProcessorUtilities.GetArgumentParameters(collectDumpParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
-                }
+            if (!enableDump && !enableHangDump && !monitorPostMortemDebugger)
+            {
+                Output.Warning(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.BlameIncorrectOption, argument));
             }
+            else
+            {
+                // Get collect dump parameters.
+                IEnumerable<string> collectDumpParameterArgs = blameArgumentList
+                    .Where(a => !isDumpCollect(a) &&
+                    !isHangDumpCollect(a) &&
+                    !isMonitorPostmortemDebugger(a));
 
-            // Initialize blame.
-            InitializeBlame(enableDump, enableHangDump, collectDumpParameters);
+                collectDumpParameters = ArgumentProcessorUtilities.GetArgumentParameters(collectDumpParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
+            }
         }
 
-        /// <summary>
-        /// Executes the argument processor.
-        /// </summary>
-        /// <returns>The <see cref="ArgumentProcessorResult"/>.</returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do since we updated the logger and data collector list in initialize
-            return ArgumentProcessorResult.Success;
-        }
+        // Initialize blame.
+        InitializeBlame(enableDump, enableHangDump, monitorPostMortemDebugger, collectDumpParameters);
+    }
 
-        /// <summary>
-        /// Initialize blame.
-        /// </summary>
-        /// <param name="enableCrashDump">Enable dump.</param>
-        /// <param name="blameParameters">Blame parameters.</param>
-        private void InitializeBlame(bool enableCrashDump, bool enableHangDump, Dictionary<string, string> collectDumpParameters)
-        {
-            // Add Blame Logger
-            LoggerUtilities.AddLoggerToRunSettings(BlameFriendlyName, null, this.runSettingsManager);
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns>The <see cref="ArgumentProcessorResult"/>.</returns>
+    public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
 
-            // Add Blame Data Collector
-            CollectArgumentExecutor.AddDataCollectorToRunSettings(BlameFriendlyName, this.runSettingsManager, this.fileHelper);
+    /// <summary>
+    /// Initialize blame.
+    /// </summary>
+    private void InitializeBlame(bool enableCrashDump, bool enableHangDump, bool monitorPostMortemDebugger, Dictionary<string, string>? collectDumpParameters)
+    {
+        // Add Blame Logger
+        LoggerUtilities.AddLoggerToRunSettings(BlameFriendlyName, null, _runSettingsManager);
 
+        // Add Blame Data Collector
+        CollectArgumentExecutor.AddDataCollectorToRunSettings(BlameFriendlyName, _runSettingsManager, _fileHelper);
 
-            // Add default run settings if required.
-            if (this.runSettingsManager.ActiveRunSettings?.SettingsXml == null)
-            {
-                this.runSettingsManager.AddDefaultRunSettings();
-            }
-            var settings = this.runSettingsManager.ActiveRunSettings?.SettingsXml;
 
-            // Get results directory from RunSettingsManager
-            var resultsDirectory = GetResultsDirectory(settings);
+        // Add default run settings if required.
+        if (_runSettingsManager.ActiveRunSettings?.SettingsXml == null)
+        {
+            _runSettingsManager.AddDefaultRunSettings();
+        }
+        var settings = _runSettingsManager.ActiveRunSettings?.SettingsXml;
+
+        // Get results directory from RunSettingsManager
+        var resultsDirectory = GetResultsDirectory(settings)!;
+
+        // Get data collection run settings. Create if not present.
+        var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settings);
+        dataCollectionRunSettings ??= new DataCollectionRunSettings();
+        var xmlDocument = new XmlDocument();
+        var outernode = xmlDocument.CreateElement("Configuration");
+        var node = xmlDocument.CreateElement("ResultsDirectory");
+        outernode.AppendChild(node);
+        node.InnerText = resultsDirectory;
+
+        // Add collect dump node in configuration element.
+        if (enableCrashDump)
+        {
+            var dumpParameters = collectDumpParameters
+                ?.Where(p => new[] { "CollectAlways", "DumpType" }.Contains(p.Key, StringComparer.OrdinalIgnoreCase))
+                .ToDictionary(p => p.Key, p => p.Value, StringComparer.OrdinalIgnoreCase)
+                ?? new Dictionary<string, string>();
 
-            // Get data collection run settings. Create if not present.
-            var dataCollectionRunSettings = XmlRunSettingsUtilities.GetDataCollectionRunSettings(settings);
-            if (dataCollectionRunSettings == null)
+            if (!dumpParameters.ContainsKey("DumpType"))
             {
-                dataCollectionRunSettings = new DataCollectionRunSettings();
+                dumpParameters.Add("DumpType", "Full");
             }
 
-            // Create blame configuration element.
-            var XmlDocument = new XmlDocument();
-            var outernode = XmlDocument.CreateElement("Configuration");
-            var node = XmlDocument.CreateElement("ResultsDirectory");
-            outernode.AppendChild(node);
-            node.InnerText = resultsDirectory;
-
-            // Add collect dump node in configuration element.
-            if (enableCrashDump)
-            {
-                var dumpParameters = collectDumpParameters
-                    .Where(p => new[] { "CollectAlways", "DumpType" }.Contains(p.Key, StringComparer.OrdinalIgnoreCase))
-                    .ToDictionary(p => p.Key, p => p.Value, StringComparer.OrdinalIgnoreCase);
-
-                if (!dumpParameters.ContainsKey("DumpType"))
-                {
-                    dumpParameters.Add("DumpType", "Full");
-                }
+            AddCollectDumpNode(dumpParameters, xmlDocument, outernode);
+        }
 
-                AddCollectDumpNode(dumpParameters, XmlDocument, outernode);
-            }
+        // Add collect hang dump node in configuration element.
+        if (enableHangDump)
+        {
+            var hangDumpParameters = collectDumpParameters
+                ?.Where(p => new[] { "TestTimeout", "HangDumpType" }.Contains(p.Key, StringComparer.OrdinalIgnoreCase))
+                .ToDictionary(p => p.Key, p => p.Value, StringComparer.OrdinalIgnoreCase)
+                ?? new Dictionary<string, string>();
 
-            // Add collect hang dump node in configuration element.
-            if (enableHangDump)
+            if (!hangDumpParameters.ContainsKey("TestTimeout"))
             {
-                var hangDumpParameters = collectDumpParameters
-                    .Where(p => new[] { "TestTimeout", "HangDumpType" }.Contains(p.Key, StringComparer.OrdinalIgnoreCase))
-                    .ToDictionary(p => p.Key, p => p.Value, StringComparer.OrdinalIgnoreCase);
-
-                if (!hangDumpParameters.ContainsKey("TestTimeout"))
-                {
-                    hangDumpParameters.Add("TestTimeout", TimeSpan.FromHours(1).TotalMilliseconds.ToString());
-                }
-
-                if (!hangDumpParameters.ContainsKey("HangDumpType"))
-                {
-                    hangDumpParameters.Add("HangDumpType", "Full");
-                }
-
-                AddCollectHangDumpNode(hangDumpParameters, XmlDocument, outernode);
+                hangDumpParameters.Add("TestTimeout", TimeSpan.FromHours(1).TotalMilliseconds.ToString(CultureInfo.CurrentCulture));
             }
 
-            // Add blame configuration element to blame collector.
-            foreach (var item in dataCollectionRunSettings.DataCollectorSettingsList)
+            if (!hangDumpParameters.ContainsKey("HangDumpType"))
             {
-                if (item.FriendlyName.Equals(BlameFriendlyName))
-                {
-                    item.Configuration = outernode;
-                }
+                hangDumpParameters.Add("HangDumpType", "Full");
             }
 
-            // Update run settings.
-            runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.DataCollectionRunSettingsName, dataCollectionRunSettings.ToXml().InnerXml);
+            AddCollectHangDumpNode(hangDumpParameters, xmlDocument, outernode);
         }
 
-        /// <summary>
-        /// Get results directory.
-        /// </summary>
-        /// <param name="settings">Settings xml.</param>
-        /// <returns>Results directory.</returns>
-        private string GetResultsDirectory(string settings)
+        // Check if have to monitor the post mortem debugger
+        if (monitorPostMortemDebugger)
         {
-            string resultsDirectory = null;
-            if (settings != null)
+            if (collectDumpParameters is not null)
             {
-                try
-                {
-                    RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settings);
-                    resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
-                }
-                catch (SettingsException se)
+                // We don't need to check if present or not if null we'll set empty dump directory path
+                collectDumpParameters.TryGetValue("DumpDirectoryPath", out string? directoryPath);
+                Dictionary<string, string> monitorPostMortemDebuggerParameters = new()
                 {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("EnableBlameArgumentProcessor: Unable to get the test results directory: Error {0}", se);
-                    }
-                }
+                    { "DumpDirectoryPath", directoryPath ?? "" }
+                };
+                AddMonitorPostMortemDebuggerNode(monitorPostMortemDebuggerParameters, xmlDocument, outernode);
             }
-
-            return resultsDirectory;
         }
 
-        /// <summary>
-        /// Checks if crash dump collection is supported.
-        /// </summary>
-        /// <returns>Dump collection supported flag.</returns>
-        private bool IsDumpCollectionSupported()
+        // Add blame configuration element to blame collector.
+        foreach (var item in dataCollectionRunSettings.DataCollectorSettingsList)
         {
-            var dumpCollectionSupported =
-                this.environment.OperatingSystem == PlatformOperatingSystem.Unix ||
-                this.environment.OperatingSystem == PlatformOperatingSystem.OSX ||
-                (this.environment.OperatingSystem == PlatformOperatingSystem.Windows
-                && this.environment.Architecture != PlatformArchitecture.ARM64
-                && this.environment.Architecture != PlatformArchitecture.ARM);
-
-            if (!dumpCollectionSupported)
+            if (string.Equals(item.FriendlyName, BlameFriendlyName))
             {
-                Output.Warning(false, CommandLineResources.BlameCollectDumpNotSupportedForPlatform);
+                item.Configuration = outernode;
             }
-
-            return dumpCollectionSupported;
         }
 
-        /// <summary>
-        /// Checks if hang dump collection is supported.
-        /// </summary>
-        /// <returns>Dump collection supported flag.</returns>
-        private bool IsHangDumpCollectionSupported()
-        {
-            var dumpCollectionSupported = true;
-
-            if (!dumpCollectionSupported)
-            {
-                Output.Warning(false, CommandLineResources.BlameCollectDumpTestTimeoutNotSupportedForPlatform);
-            }
+        // Update run settings.
+        _runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.DataCollectionRunSettingsName, dataCollectionRunSettings.ToXml().InnerXml);
+    }
 
-            return dumpCollectionSupported;
+    /// <summary>
+    /// Get results directory.
+    /// </summary>
+    /// <param name="settings">Settings xml.</param>
+    /// <returns>Results directory.</returns>
+    private static string? GetResultsDirectory(string? settings)
+    {
+        string? resultsDirectory = null;
+        if (settings == null)
+        {
+            return resultsDirectory;
         }
 
-        /// <summary>
-        /// Adds collect dump node in outer node.
-        /// </summary>
-        /// <param name="parameters">Parameters.</param>
-        /// <param name="XmlDocument">Xml document.</param>
-        /// <param name="outernode">Outer node.</param>
-        private void AddCollectDumpNode(Dictionary<string, string> parameters, XmlDocument XmlDocument, XmlElement outernode)
+        try
         {
-            var dumpNode = XmlDocument.CreateElement(Constants.BlameCollectDumpKey);
-            if (parameters != null && parameters.Count > 0)
-            {
-                foreach (KeyValuePair<string, string> entry in parameters)
-                {
-                    var attribute = XmlDocument.CreateAttribute(entry.Key);
-                    attribute.Value = entry.Value;
-                    dumpNode.Attributes.Append(attribute);
-                }
-            }
-            outernode.AppendChild(dumpNode);
+            RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settings);
+            resultsDirectory = RunSettingsUtilities.GetTestResultsDirectory(runConfiguration);
+        }
+        catch (SettingsException se)
+        {
+            EqtTrace.Error("EnableBlameArgumentProcessor: Unable to get the test results directory: Error {0}", se);
         }
 
-        /// <summary>
-        /// Adds collect dump node in outer node.
-        /// </summary>
-        /// <param name="parameters">Parameters.</param>
-        /// <param name="XmlDocument">Xml document.</param>
-        /// <param name="outernode">Outer node.</param>
-        private void AddCollectHangDumpNode(Dictionary<string, string> parameters, XmlDocument XmlDocument, XmlElement outernode)
+        return resultsDirectory;
+    }
+
+    /// <summary>
+    /// Adds collect dump node in outer node.
+    /// </summary>
+    /// <param name="parameters">Parameters.</param>
+    /// <param name="xmlDocument">Xml document.</param>
+    /// <param name="outernode">Outer node.</param>
+    private static void AddCollectDumpNode(Dictionary<string, string>? parameters, XmlDocument xmlDocument, XmlElement outernode)
+    {
+        AddNode(parameters, xmlDocument, outernode, Constants.BlameCollectDumpKey);
+    }
+
+    /// <summary>
+    /// Adds collect dump node in outer node.
+    /// </summary>
+    /// <param name="parameters">Parameters.</param>
+    /// <param name="xmlDocument">Xml document.</param>
+    /// <param name="outernode">Outer node.</param>
+    private static void AddCollectHangDumpNode(Dictionary<string, string> parameters, XmlDocument xmlDocument, XmlElement outernode)
+    {
+        AddNode(parameters, xmlDocument, outernode, Constants.CollectDumpOnTestSessionHang);
+    }
+
+    /// <summary>
+    /// Adds monitor postmortem debuggerNode de dump node in outer node.
+    /// </summary>
+    /// <param name="parameters">Parameters.</param>
+    /// <param name="xmlDocument">Xml document.</param>
+    /// <param name="outernode">Outer node.</param>
+    private static void AddMonitorPostMortemDebuggerNode(Dictionary<string, string> parameters, XmlDocument xmlDocument, XmlElement outernode)
+    {
+        AddNode(parameters, xmlDocument, outernode, Constants.BlameCollectMonitorPostMortemDebuggerKey);
+    }
+
+    /// <summary>
+    /// Adds node in outer node.
+    /// </summary>
+    private static void AddNode(Dictionary<string, string>? parameters, XmlDocument xmlDocument, XmlElement outernode, string nodeName)
+    {
+        var dumpNode = xmlDocument.CreateElement(nodeName);
+        if (parameters != null && parameters.Count > 0)
         {
-            var dumpNode = XmlDocument.CreateElement(Constants.CollectDumpOnTestSessionHang);
-            if (parameters != null && parameters.Count > 0)
+            foreach (KeyValuePair<string, string> entry in parameters)
             {
-                foreach (KeyValuePair<string, string> entry in parameters)
-                {
-                    var attribute = XmlDocument.CreateAttribute(entry.Key);
-                    attribute.Value = entry.Value;
-                    dumpNode.Attributes.Append(attribute);
-                }
+                var attribute = xmlDocument.CreateAttribute(entry.Key);
+                attribute.Value = entry.Value;
+                dumpNode.Attributes.Append(attribute);
             }
-            outernode.AppendChild(dumpNode);
         }
-
-        #endregion
+        outernode.AppendChild(dumpNode);
     }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs b/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
index a77e320fce..db2ce05372 100644
--- a/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableCodeCoverageArgumentProcessor.cs
@@ -1,339 +1,298 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// The argument processor for enabling data collectors.
+/// </summary>
+internal class EnableCodeCoverageArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
-    using System.Xml.XPath;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    /// <summary>
+    /// The name of command for enabling code coverage.
+    /// </summary>
+    public const string CommandName = "/EnableCodeCoverage";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableCodeCoverageArgumentProcessorCapabilities());
 
     /// <summary>
-    /// The argument processor for enabling data collectors.
+    /// Gets or sets the executor.
     /// </summary>
-    internal class EnableCodeCoverageArgumentProcessor : IArgumentProcessor
+    public Lazy<IArgumentExecutor>? Executor
     {
-        #region Constants
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, new FileHelper()));
 
-        /// <summary>
-        /// The name of command for enabling code coverage.
-        /// </summary>
-        public const string CommandName = "/EnableCodeCoverage";
+        set => _executor = value;
+    }
+}
 
-        #endregion
+/// <inheritdoc />
+internal class EnableCodeCoverageArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => EnableCodeCoverageArgumentProcessor.CommandName;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public override bool AllowMultiple => false;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override bool IsAction => false;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableCodeCoverageArgumentProcessorCapabilities());
-                }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-                return this.metadata;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, new FileHelper()));
-                }
+    //public override string HelpContentResourceName => CommandLineResources.EnableCodeCoverageArgumentProcessorHelp;
 
-                return this.executor;
-            }
+    //public override HelpContentPriority HelpPriority => HelpContentPriority.EnableCodeCoverageArgumentProcessorHelpPriority;
+}
 
-            set
-            {
-                this.executor = value;
-            }
-        }
+/// <summary>
+/// The enable code coverage argument executor.
+/// </summary>
+internal class EnableCodeCoverageArgumentExecutor : IArgumentExecutor
+{
+    private readonly IRunSettingsProvider _runSettingsManager;
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly IFileHelper _fileHelper;
+
+    internal const string FriendlyName = "Code Coverage";
+
+    private static readonly string XPathSeperator = "/";
+    private static readonly string[] NodeNames = [Constants.RunSettingsName, Constants.DataCollectionRunSettingsName, Constants.DataCollectorsSettingName, Constants.DataCollectorSettingName
+    ];
+
+    #region Default  CodeCoverage Settings String
+
+    private static readonly string CodeCoverageCollectorSettingsTemplate =
+        @"      <DataCollector uri=""datacollector://microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=16.0.0.0 " + @", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"" friendlyName=""Code Coverage"">" + Environment.NewLine +
+        @"        <Configuration>" + Environment.NewLine +
+        @"          <CodeCoverage>" + Environment.NewLine +
+        @"            <ModulePaths>" + Environment.NewLine +
+        @"              <Exclude>" + Environment.NewLine +
+        @"                 <ModulePath>.*CPPUnitTestFramework.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*vstest.console.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.intellitrace.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*testhost.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*datacollector.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.teamfoundation.testplatform.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.visualstudio.testplatform.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.visualstudio.testwindow.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.visualstudio.mstest.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.visualstudio.qualitytools.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.vssdk.testhostadapter.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*microsoft.vssdk.testhostframework.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*qtagent32.*</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*msvcr.*dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*msvcp.*dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*clr.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*clr.ni.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*clrjit.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*clrjit.ni.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*mscoree.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*mscoreei.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*mscoreei.ni.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*mscorlib.dll$</ModulePath>" + Environment.NewLine +
+        @"                 <ModulePath>.*mscorlib.ni.dll$</ModulePath>" + Environment.NewLine +
+        @"               </Exclude>" + Environment.NewLine +
+        @"            </ModulePaths>" + Environment.NewLine +
+        @"            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>" + Environment.NewLine +
+        @"            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>" + Environment.NewLine +
+        @"            <CollectFromChildProcesses>True</CollectFromChildProcesses>" + Environment.NewLine +
+        @"            <CollectAspDotNet>false</CollectAspDotNet>" + Environment.NewLine +
+        @"            <SymbolSearchPaths />" + Environment.NewLine +
+        @"            <Functions>" + Environment.NewLine +
+        @"              <Exclude>" + Environment.NewLine +
+        @"                <Function>^std::.*</Function>" + Environment.NewLine +
+        @"                <Function>^ATL::.*</Function>" + Environment.NewLine +
+        @"                <Function>.*::__GetTestMethodInfo.*</Function>" + Environment.NewLine +
+        @"                <Function>.*__CxxPureMSILEntry.*</Function>" + Environment.NewLine +
+        @"                <Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>" + Environment.NewLine +
+        @"                <Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>" + Environment.NewLine +
+        @"                <Function>^__empty_global_delete.*</Function>" + Environment.NewLine +
+        @"              </Exclude>" + Environment.NewLine +
+        @"            </Functions>" + Environment.NewLine +
+        @"            <Attributes>" + Environment.NewLine +
+        @"              <Exclude>" + Environment.NewLine +
+        @"                <Attribute>^System\.Diagnostics\.DebuggerHiddenAttribute$</Attribute>" + Environment.NewLine +
+        @"                <Attribute>^System\.Diagnostics\.DebuggerNonUserCodeAttribute$</Attribute>" + Environment.NewLine +
+        @"                <Attribute>^System\.Diagnostics\.CodeAnalysis\.ExcludeFromCodeCoverageAttribute$</Attribute>" + Environment.NewLine +
+        @"                <Attribute>^Microsoft\.VisualStudio\.TestPlatform\.TestSDKAutoGeneratedCode$</Attribute>" + Environment.NewLine +
+        @"              </Exclude>" + Environment.NewLine +
+        @"            </Attributes>" + Environment.NewLine +
+        @"            <Sources>" + Environment.NewLine +
+        @"              <Exclude>" + Environment.NewLine +
+        @"                <Source>.*\\atlmfc\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\vctools\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\public\\sdk\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\externalapis\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\microsoft sdks\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\vc\\include\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\msclr\\.*</Source>" + Environment.NewLine +
+        @"                <Source>.*\\ucrt\\.*</Source>" + Environment.NewLine +
+        @"              </Exclude>" + Environment.NewLine +
+        @"            </Sources>" + Environment.NewLine +
+        @"            <CompanyNames/>" + Environment.NewLine +
+        @"            <PublicKeyTokens/>" + Environment.NewLine +
+        @"          </CodeCoverage>" + Environment.NewLine +
+        @"        </Configuration>" + Environment.NewLine +
+        @"      </DataCollector>";
+
+    #endregion
+
+    internal EnableCodeCoverageArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+    {
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+        _fileHelper = fileHelper;
     }
 
     /// <inheritdoc />
-    internal class EnableCodeCoverageArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    public void Initialize(string? argument)
     {
-        public override string CommandName => EnableCodeCoverageArgumentProcessor.CommandName;
-
-        public override bool AllowMultiple => false;
-
-        public override bool IsAction => false;
+        _commandLineOptions.EnableCodeCoverage = true;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
-
-        //public override string HelpContentResourceName => CommandLineResources.EnableCodeCoverageArgumentProcessorHelp;
+        // Add this enabled data collectors list, this will ensure Code Coverage isn't disabled when other DCs are configured using /Collect.
+        CollectArgumentExecutor.AddDataCollectorFriendlyName(FriendlyName);
+        try
+        {
+            UpdateWithCodeCoverageSettingsIfNotConfigured();
+        }
+        catch (XPathException e)
+        {
+            throw new SettingsException(
+                string.Format(CultureInfo.CurrentCulture, "{0} {1}", ObjectModel.Resources.CommonResources.MalformedRunSettingsFile, e.Message), e);
+        }
+    }
 
-        //public override HelpContentPriority HelpPriority => HelpContentPriority.EnableCodeCoverageArgumentProcessorHelpPriority;
+    /// <inheritdoc />
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
     }
 
     /// <summary>
-    /// The enable code coverage argument executor.
+    /// Updates with code coverage settings if not configured.
     /// </summary>
-    internal class EnableCodeCoverageArgumentExecutor : IArgumentExecutor
+    private void UpdateWithCodeCoverageSettingsIfNotConfigured()
     {
-        #region private variables
-
-        private IRunSettingsProvider runSettingsManager;
-        private CommandLineOptions commandLineOptions;
-        private IFileHelper fileHelper;
-
-        internal const string FriendlyName = "Code Coverage";
-
-        private static string xPathSeperator = "/";
-        private static string[] nodeNames = new string[] { Constants.RunSettingsName, Constants.DataCollectionRunSettingsName, Constants.DataCollectorsSettingName, Constants.DataCollectorSettingName };
-
-        #region Default  CodeCoverage Settings String
-
-        private static string codeCoverageCollectorSettingsTemplate =
-@"      <DataCollector uri=""datacollector://microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=16.0.0.0 " + @", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"" friendlyName=""Code Coverage"">" + Environment.NewLine +
-@"        <Configuration>" + Environment.NewLine +
-@"          <CodeCoverage>" + Environment.NewLine +
-@"            <ModulePaths>" + Environment.NewLine +
-@"              <Exclude>" + Environment.NewLine +
-@"                 <ModulePath>.*CPPUnitTestFramework.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*vstest.console.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.intellitrace.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*testhost.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*datacollector.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.teamfoundation.testplatform.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.visualstudio.testplatform.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.visualstudio.testwindow.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.visualstudio.mstest.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.visualstudio.qualitytools.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.vssdk.testhostadapter.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*microsoft.vssdk.testhostframework.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*qtagent32.*</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*msvcr.*dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*msvcp.*dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*clr.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*clr.ni.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*clrjit.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*clrjit.ni.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*mscoree.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*mscoreei.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*mscoreei.ni.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*mscorlib.dll$</ModulePath>" + Environment.NewLine +
-@"                 <ModulePath>.*mscorlib.ni.dll$</ModulePath>" + Environment.NewLine +
-@"               </Exclude>" + Environment.NewLine +
-@"            </ModulePaths>" + Environment.NewLine +
-@"            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>" + Environment.NewLine +
-@"            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>" + Environment.NewLine +
-@"            <CollectFromChildProcesses>True</CollectFromChildProcesses>" + Environment.NewLine +
-@"            <CollectAspDotNet>false</CollectAspDotNet>" + Environment.NewLine +
-@"            <SymbolSearchPaths />" + Environment.NewLine +
-@"            <Functions>" + Environment.NewLine +
-@"              <Exclude>" + Environment.NewLine +
-@"                <Function>^std::.*</Function>" + Environment.NewLine +
-@"                <Function>^ATL::.*</Function>" + Environment.NewLine +
-@"                <Function>.*::__GetTestMethodInfo.*</Function>" + Environment.NewLine +
-@"                <Function>.*__CxxPureMSILEntry.*</Function>" + Environment.NewLine +
-@"                <Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>" + Environment.NewLine +
-@"                <Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>" + Environment.NewLine +
-@"                <Function>.*::YOU_CAN_ONLY_DESIGNATE_ONE_.*</Function>" + Environment.NewLine +
-@"                <Function>^__.*</Function>" + Environment.NewLine +
-@"                <Function>.*::__.*</Function>" + Environment.NewLine +
-@"              </Exclude>" + Environment.NewLine +
-@"            </Functions>" + Environment.NewLine +
-@"            <Attributes>" + Environment.NewLine +
-@"              <Exclude>" + Environment.NewLine +
-@"                <Attribute>^System.Diagnostics.DebuggerHiddenAttribute$</Attribute>" + Environment.NewLine +
-@"                <Attribute>^System.Diagnostics.DebuggerNonUserCodeAttribute$</Attribute>" + Environment.NewLine +
-@"                <Attribute>^System.Runtime.CompilerServices.CompilerGeneratedAttribute$</Attribute>" + Environment.NewLine +
-@"                <Attribute>^System.CodeDom.Compiler.GeneratedCodeAttribute$</Attribute>" + Environment.NewLine +
-@"                <Attribute>^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$</Attribute>" + Environment.NewLine +
-@"                <Attribute>^Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode.*</Attribute>" + Environment.NewLine +
-@"              </Exclude>" + Environment.NewLine +
-@"            </Attributes>" + Environment.NewLine +
-@"            <Sources>" + Environment.NewLine +
-@"              <Exclude>" + Environment.NewLine +
-@"                <Source>.*\\atlmfc\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\vctools\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\public\\sdk\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\externalapis\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\microsoft sdks\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\vc\\include\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\msclr\\.*</Source>" + Environment.NewLine +
-@"                <Source>.*\\ucrt\\.*</Source>" + Environment.NewLine +
-@"              </Exclude>" + Environment.NewLine +
-@"            </Sources>" + Environment.NewLine +
-@"            <CompanyNames/>" + Environment.NewLine +
-@"            <PublicKeyTokens/>" + Environment.NewLine +
-@"          </CodeCoverage>" + Environment.NewLine +
-@"        </Configuration>" + Environment.NewLine +
-@"      </DataCollector>";
-
-        #endregion
-
-        #endregion
-
-        internal EnableCodeCoverageArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager, IFileHelper fileHelper)
+        var runsettingsXml = _runSettingsManager.ActiveRunSettings?.SettingsXml;
+        if (runsettingsXml == null)
         {
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
-            this.fileHelper = fileHelper;
+            _runSettingsManager.AddDefaultRunSettings();
+            runsettingsXml = _runSettingsManager.ActiveRunSettings!.SettingsXml!;
         }
 
-        /// <inheritdoc />
-        public void Initialize(string argument)
+        IXPathNavigable runSettingsDocument;
+        using (var stream = new StringReader(runsettingsXml))
+        using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
         {
-            this.commandLineOptions.EnableCodeCoverage = true;
-
-            // Add this enabled data collectors list, this will ensure Code Coverage isn't disabled when other DCs are configured using /Collect.
-            CollectArgumentExecutor.AddDataCollectorFriendlyName(FriendlyName);
-            try
-            {
-                this.UpdateWithCodeCoverageSettingsIfNotConfigured();
-            }
-            catch (XPathException e)
-            {
-                throw new SettingsException(
-                    string.Format(CultureInfo.CurrentCulture, "{0} {1}", ObjectModel.Resources.CommonResources.MalformedRunSettingsFile, e.Message), e);
-            }
+            var document = new XmlDocument();
+            document.Load(reader);
+            runSettingsDocument = document;
         }
 
-        /// <inheritdoc />
-        public ArgumentProcessorResult Execute()
+        var runSettingsNavigator = runSettingsDocument.CreateNavigator()!;
+        if (ContainsDataCollectorWithFriendlyName(runSettingsNavigator, FriendlyName))
         {
-            return ArgumentProcessorResult.Success;
+            // runsettings already has Code coverage data collector, just enable it.
+            CollectArgumentExecutor.AddDataCollectorToRunSettings(FriendlyName, _runSettingsManager, _fileHelper);
         }
-
-        /// <summary>
-        /// Updates with code coverage settings if not configured.
-        /// </summary>
-        /// <param name="runSettingsDocument"> The run settings document. </param>
-        private void UpdateWithCodeCoverageSettingsIfNotConfigured()
+        else
         {
-            var runsettingsXml = this.runSettingsManager.ActiveRunSettings?.SettingsXml;
-            if (runsettingsXml == null)
+            var existingPath = string.Empty;
+            var xpaths = new string[]
             {
-                this.runSettingsManager.AddDefaultRunSettings();
-                runsettingsXml = this.runSettingsManager.ActiveRunSettings?.SettingsXml;
-            }
-
-            IXPathNavigable runSettingsDocument;
-            using (var stream = new StringReader(runsettingsXml))
-            using (var reader = XmlReader.Create(stream, XmlRunSettingsUtilities.ReaderSettings))
-            {
-                var document = new XmlDocument();
-                document.Load(reader);
-                runSettingsDocument = document;
-            }
-
-            var runSettingsNavigator = runSettingsDocument.CreateNavigator();
+                string.Join(XPathSeperator, NodeNames, 0, 1),
+                string.Join(XPathSeperator, NodeNames, 0, 2),
+                string.Join(XPathSeperator, NodeNames, 0, 3)
+            };
 
-            if (ContainsDataCollectorWithFriendlyName(runSettingsNavigator, FriendlyName))
+            foreach (var xpath in xpaths)
             {
-                // runsettings already has Code coverage data collector, just enable it.
-                CollectArgumentExecutor.AddDataCollectorToRunSettings(FriendlyName, this.runSettingsManager, this.fileHelper);
-            }
-            else
-            {
-                var existingPath = string.Empty;
-                var xpaths = new string[]
-                             {
-                                 string.Join(xPathSeperator, nodeNames, 0, 1),
-                                 string.Join(xPathSeperator, nodeNames, 0, 2),
-                                 string.Join(xPathSeperator, nodeNames, 0, 3)
-                             };
-
-                foreach (var xpath in xpaths)
+                if (runSettingsNavigator.SelectSingleNode(xpath) != null)
                 {
-                    if (runSettingsNavigator.SelectSingleNode(xpath) != null)
-                    {
-                        existingPath = xpath;
-                    }
-                    else
-                    {
-                        break;
-                    }
+                    existingPath = xpath;
                 }
-
-                // If any nodes are missing to add code coverage default settings, add the missing xml nodes.
-                XPathNavigator dataCollectorsNavigator;
-                if (existingPath.Equals(xpaths[2]) == false)
+                else
                 {
-                    dataCollectorsNavigator = runSettingsNavigator.SelectSingleNode(existingPath);
-                    var missingNodesText = GetMissingNodesTextIfAny(existingPath, xpaths[2]);
-                    dataCollectorsNavigator.AppendChild(missingNodesText);
+                    break;
                 }
-
-                dataCollectorsNavigator = runSettingsNavigator.SelectSingleNode(xpaths[2]);
-                dataCollectorsNavigator.AppendChild(codeCoverageCollectorSettingsTemplate);
-
-                this.runSettingsManager.UpdateRunSettings(runSettingsDocument.CreateNavigator().OuterXml);
             }
-        }
-
-        private static string GetMissingNodesTextIfAny(string existingPath, string fullpath)
-        {
-            var xmlText = "{0}";
-            var nonExistingPath = fullpath.Substring(existingPath.Length);
-            var requiredNodeNames = nonExistingPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-            var format = "<{0}>{1}</{0}>";
 
-            foreach (var nodeName in requiredNodeNames)
+            // If any nodes are missing to add code coverage default settings, add the missing xml nodes.
+            XPathNavigator dataCollectorsNavigator;
+            if (existingPath.Equals(xpaths[2]) == false)
             {
-                xmlText = string.Format(CultureInfo.InvariantCulture, xmlText, string.Format(CultureInfo.InvariantCulture, format, nodeName, "{0}"));
+                dataCollectorsNavigator = runSettingsNavigator.SelectSingleNode(existingPath)!;
+                var missingNodesText = GetMissingNodesTextIfAny(existingPath, xpaths[2]);
+                dataCollectorsNavigator.AppendChild(missingNodesText);
             }
 
-            xmlText = string.Format(CultureInfo.InvariantCulture, xmlText, string.Empty);
-            return xmlText;
+            dataCollectorsNavigator = runSettingsNavigator.SelectSingleNode(xpaths[2])!;
+            dataCollectorsNavigator.AppendChild(CodeCoverageCollectorSettingsTemplate);
+
+            _runSettingsManager.UpdateRunSettings(runSettingsDocument.CreateNavigator()!.OuterXml);
         }
+    }
+
+    private static string GetMissingNodesTextIfAny(string existingPath, string fullpath)
+    {
+        var xmlText = "{0}";
+        var nonExistingPath = fullpath.Substring(existingPath.Length);
+        var requiredNodeNames = nonExistingPath.Split(['/'], StringSplitOptions.RemoveEmptyEntries);
+        var format = "<{0}>{1}</{0}>";
 
-        /// <summary>
-        /// Check data collector exist with friendly name
-        /// </summary>
-        /// <param name="runSettingDocument"> XPathNavigable representation of a runsettings file </param>
-        /// <param name="dataCollectorFriendlyName"> The data Collector friendly name. </param>
-        /// <returns> True if there is a datacollector configured. </returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "1#")]
-        private static bool ContainsDataCollectorWithFriendlyName(IXPathNavigable runSettingDocument, string dataCollectorFriendlyName)
+        foreach (var nodeName in requiredNodeNames)
         {
-            if (runSettingDocument == null)
-            {
-                throw new ArgumentNullException(nameof(runSettingDocument));
-            }
+            xmlText = string.Format(CultureInfo.InvariantCulture, xmlText, string.Format(CultureInfo.InvariantCulture, format, nodeName, "{0}"));
+        }
 
-            if (dataCollectorFriendlyName == null)
-            {
-                throw new ArgumentNullException(nameof(dataCollectorFriendlyName));
-            }
+        xmlText = string.Format(CultureInfo.InvariantCulture, xmlText, string.Empty);
+        return xmlText;
+    }
 
-            var navigator = runSettingDocument.CreateNavigator();
-            var nodes = navigator.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+    /// <summary>
+    /// Check data collector exist with friendly name
+    /// </summary>
+    /// <param name="runSettingDocument"> XPathNavigable representation of a runsettings file </param>
+    /// <param name="dataCollectorFriendlyName"> The data Collector friendly name. </param>
+    /// <returns> True if there is a datacollector configured. </returns>
+    private static bool ContainsDataCollectorWithFriendlyName(IXPathNavigable runSettingDocument, string dataCollectorFriendlyName)
+    {
+        _ = runSettingDocument ?? throw new ArgumentNullException(nameof(runSettingDocument));
+        _ = dataCollectorFriendlyName ?? throw new ArgumentNullException(nameof(dataCollectorFriendlyName));
 
-            foreach (XPathNavigator dataCollectorNavigator in nodes)
+        var navigator = runSettingDocument.CreateNavigator()!;
+        var nodes = navigator.Select("/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+
+        foreach (XPathNavigator? dataCollectorNavigator in nodes)
+        {
+            var fn = dataCollectorNavigator?.GetAttribute("friendlyName", string.Empty);
+            if (string.Equals(dataCollectorFriendlyName, fn, StringComparison.OrdinalIgnoreCase))
             {
-                var fn = dataCollectorNavigator.GetAttribute("friendlyName", string.Empty);
-                if (string.Equals(dataCollectorFriendlyName, fn, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs b/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
index 39b24dbea1..d3bc5e6a6b 100644
--- a/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableDiagArgumentProcessor.cs
@@ -1,252 +1,246 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    internal class EnableDiagArgumentProcessor : IArgumentProcessor
-    {
-        /// <summary>
-        /// The name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Diag";
+extern alias Abstraction;
 
-        private readonly IFileHelper fileHelper;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 
-        private Lazy<IArgumentExecutor> executor;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableDiagArgumentProcessor"/> class.
-        /// </summary>
-        public EnableDiagArgumentProcessor() : this(new FileHelper())
-        {
-        }
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableDiagArgumentProcessor"/> class.
-        /// </summary>
-        /// <param name="fileHelper">A file helper instance.</param>
-        protected EnableDiagArgumentProcessor(IFileHelper fileHelper)
-        {
-            this.fileHelper = fileHelper;
-        }
+internal class EnableDiagArgumentProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the ListTestsArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/Diag";
 
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableDiagArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    private readonly IFileHelper _fileHelper;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new EnableDiagArgumentExecutor(this.fileHelper));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnableDiagArgumentProcessor"/> class.
+    /// </summary>
+    public EnableDiagArgumentProcessor() : this(new FileHelper())
+    {
     }
 
     /// <summary>
-    /// The argument capabilities.
+    /// Initializes a new instance of the <see cref="EnableDiagArgumentProcessor"/> class.
     /// </summary>
-    internal class EnableDiagArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    /// <param name="fileHelper">A file helper instance.</param>
+    protected EnableDiagArgumentProcessor(IFileHelper fileHelper)
     {
-        public override string CommandName => EnableDiagArgumentProcessor.CommandName;
+        _fileHelper = fileHelper;
+    }
 
-        public override bool AllowMultiple => false;
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableDiagArgumentProcessorCapabilities());
 
-        public override bool IsAction => false;
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() => new EnableDiagArgumentExecutor(_fileHelper, new ProcessHelper()));
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Diag;
+        set => _executor = value;
+    }
+}
 
-        public override string HelpContentResourceName => CommandLineResources.EnableDiagUsage;
+/// <summary>
+/// The argument capabilities.
+/// </summary>
+internal class EnableDiagArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => EnableDiagArgumentProcessor.CommandName;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.EnableDiagArgumentProcessorHelpPriority;
-    }
+    public override bool AllowMultiple => false;
+
+    public override bool IsAction => false;
+
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Diag;
+
+    public override string HelpContentResourceName => CommandLineResources.EnableDiagUsage;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.EnableDiagArgumentProcessorHelpPriority;
+}
+
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class EnableDiagArgumentExecutor : IArgumentExecutor
+{
+    private readonly IFileHelper _fileHelper;
+    private readonly IProcessHelper _processHelper;
 
     /// <summary>
-    /// The argument executor.
+    /// Parameter for trace level
     /// </summary>
-    internal class EnableDiagArgumentExecutor : IArgumentExecutor
+    public const string TraceLevelParam = "tracelevel";
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="fileHelper">The file helper.</param>
+    /// <param name="processHelper">Process helper</param>
+    public EnableDiagArgumentExecutor(IFileHelper fileHelper, IProcessHelper processHelper)
     {
-        private readonly IFileHelper fileHelper;
+        _fileHelper = fileHelper;
+        _processHelper = processHelper;
+    }
 
-        /// <summary>
-        /// Parameter for trace level
-        /// </summary>
-        public const string TraceLevelParam = "tracelevel";
+    #region IArgumentExecutor
 
-        #region Constructor
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidDiagArgument, argument);
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="fileHelper">The file helper.</param>
-        public EnableDiagArgumentExecutor(IFileHelper fileHelper)
+        // Throw error if argument is null or empty.
+        if (argument.IsNullOrWhiteSpace())
         {
-            this.fileHelper = fileHelper;
+            throw new CommandLineException(exceptionMessage);
         }
 
-        #endregion
+        // Get diag argument list.
+        var diagArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
 
-        #region IArgumentExecutor
+        // Get diag file path.
+        // Note: Even though semi colon is valid file path, we are not respecting the file name having semi-colon [As we are separating arguments based on semi colon].
+        var diagFilePathArg = diagArgumentList[0];
+        var diagFilePath = GetDiagFilePath(diagFilePathArg);
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
-        {
-            string exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidDiagArgument, argument);
+        // Get diag parameters.
+        var diagParameterArgs = diagArgumentList.Skip(1);
+        var diagParameters = ArgumentProcessorUtilities.GetArgumentParameters(diagParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
 
-            // Throw error if argument is null or empty.
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(exceptionMessage);
-            }
+        // Initialize diag logging.
+        InitializeDiagLogging(diagFilePath, diagParameters);
 
-            // Get diag argument list.
-            var diagArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
-
-            // Get diag file path.
-            // Note: Even though semi colon is valid file path, we are not respecting the file name having semi-colon [As we are separating arguments based on semi colon].
-            var diagFilePathArg = diagArgumentList[0];
-            var diagFilePath = GetDiagFilePath(diagFilePathArg);
+        // Write version to the log here, because that is the
+        // first place where we know if we log or not.
+        EqtTrace.Verbose($"Version: {Product.Version} Current process architecture: {_processHelper.GetCurrentProcessArchitecture()}");
+        // https://docs.microsoft.com/en-us/dotnet/api/system.reflection.assembly.location?view=net-6.0#remarks
+        // In .NET 5 and later versions, for bundled assemblies, the value returned is an empty string.
+        string objectTypeLocation = typeof(object).Assembly.Location;
+        if (!objectTypeLocation.IsNullOrEmpty())
+        {
+            EqtTrace.Verbose($"Runtime location: {Path.GetDirectoryName(objectTypeLocation)}");
+        }
+    }
 
-            // Get diag parameters.
-            var diagParameterArgs = diagArgumentList.Skip(1);
-            var diagParameters = ArgumentProcessorUtilities.GetArgumentParameters(diagParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns>The <see cref="ArgumentProcessorResult"/>.</returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
+    }
 
-            // Initialize diag logging.
-            InitializeDiagLogging(diagFilePath, diagParameters);
+    /// <summary>
+    /// Initialize diag logging.
+    /// </summary>
+    /// <param name="diagFilePath">Diag file path.</param>
+    /// <param name="diagParameters">Diag parameters</param>
+    private static void InitializeDiagLogging(string diagFilePath, Dictionary<string, string> diagParameters)
+    {
+        // Get trace level from diag parameters.
+        var traceLevel = GetDiagTraceLevel(diagParameters);
 
-            // Write version to the log here, because that is the 
-            // first place where we know if we log or not.
-            EqtTrace.Verbose($"Version: {Product.Version}");
-        }
+        // Initialize trace.
+        // Trace initialized is false in case of any exception at time of initialization like Catch exception(UnauthorizedAccessException, PathTooLongException...)
+        var traceInitialized = EqtTrace.InitializeTrace(diagFilePath, traceLevel);
 
-        /// <summary>
-        /// Executes the argument processor.
-        /// </summary>
-        /// <returns>The <see cref="ArgumentProcessorResult"/>.</returns>
-        public ArgumentProcessorResult Execute()
+        // Show console warning in case trace is not initialized.
+        if (!traceInitialized && !StringUtils.IsNullOrEmpty(EqtTrace.ErrorOnInitialization))
         {
-            // Nothing to do since we updated the parameter during initialize parameter
-            return ArgumentProcessorResult.Success;
+            ConsoleOutput.Instance.Warning(false, EqtTrace.ErrorOnInitialization);
         }
+    }
 
-        /// <summary>
-        /// Initialize diag logging.
-        /// </summary>
-        /// <param name="diagFilePath">Diag file path.</param>
-        /// <param name="diagParameters">Diag parameters</param>
-        private void InitializeDiagLogging(string diagFilePath, Dictionary<string, string> diagParameters)
+    /// <summary>
+    /// Gets diag trace level.
+    /// </summary>
+    /// <param name="diagParameters">Diag parameters.</param>
+    /// <returns>Diag trace level.</returns>
+    private static PlatformTraceLevel GetDiagTraceLevel(Dictionary<string, string> diagParameters)
+    {
+        // If diag parameters is null, set value of trace level as verbose.
+        if (diagParameters == null)
         {
-            // Get trace level from diag parameters.
-            var traceLevel = GetDiagTraceLevel(diagParameters);
-
-            // Initialize trace.
-            // Trace initialized is false in case of any exception at time of initialization like Catch exception(UnauthorizedAccessException, PathTooLongException...)
-            var traceInitialized = EqtTrace.InitializeTrace(diagFilePath, traceLevel);
-
-            // Show console warning in case trace is not initialized.
-            if (!traceInitialized && !string.IsNullOrEmpty(EqtTrace.ErrorOnInitialization))
-            {
-                ConsoleOutput.Instance.Warning(false, EqtTrace.ErrorOnInitialization);
-            }
+            return PlatformTraceLevel.Verbose;
         }
 
-        /// <summary>
-        /// Gets diag trace level.
-        /// </summary>
-        /// <param name="diagParameters">Diag parameters.</param>
-        /// <returns>Diag trace level.</returns>
-        private PlatformTraceLevel GetDiagTraceLevel(Dictionary<string, string> diagParameters)
+        // Get trace level from diag parameters.
+        var traceLevelExists = diagParameters.TryGetValue(TraceLevelParam, out var traceLevelStr);
+        if (traceLevelExists && Enum.TryParse(traceLevelStr, true, out PlatformTraceLevel traceLevel))
         {
-            // If diag parameters is null, set value of trace level as verbose.
-            if (diagParameters == null)
-            {
-                return PlatformTraceLevel.Verbose;
-            }
-
-            // Get trace level from diag parameters.
-            var traceLevelExists = diagParameters.TryGetValue(TraceLevelParam, out var traceLevelStr);
-            if (traceLevelExists && Enum.TryParse(traceLevelStr, true, out PlatformTraceLevel traceLevel))
-            {
-                return traceLevel;
-            }
-
-            // Default value of diag trace level is verbose.
-            return PlatformTraceLevel.Verbose;
+            return traceLevel;
         }
 
-        /// <summary>
-        /// Gets diag file path.
-        /// </summary>
-        /// <param name="diagFilePathArgument">Diag file path argument.</param>
-        /// <returns>Diag file path.</returns>
-        private string GetDiagFilePath(string diagFilePathArgument)
-        {
-            // Remove double quotes if present.
-            diagFilePathArgument = diagFilePathArgument.Replace("\"", "");
+        // Default value of diag trace level is verbose.
+        return PlatformTraceLevel.Verbose;
+    }
+
+    /// <summary>
+    /// Gets diag file path.
+    /// </summary>
+    /// <param name="diagFilePathArgument">Diag file path argument.</param>
+    /// <returns>Diag file path.</returns>
+    private string GetDiagFilePath(string diagFilePathArgument)
+    {
+        // Remove double quotes if present.
+        diagFilePathArgument = diagFilePathArgument.Replace("\"", "");
 
+        // If we provide a directory we don't need to create the base directory.
+        if (!diagFilePathArgument.EndsWith(@"\") && !diagFilePathArgument.EndsWith("/"))
+        {
             // Create base directory for diag file path (if doesn't exist)
             CreateDirectoryIfNotExists(diagFilePathArgument);
-
-            // return full diag file path. (This is done so that vstest and testhost create logs at same location.)
-            return Path.GetFullPath(diagFilePathArgument);
         }
 
-        /// <summary>
-        /// Create directory if not exists.
-        /// </summary>
-        /// <param name="filePath">File path.</param>
-        private void CreateDirectoryIfNotExists(string filePath)
+        // return full diag file path. (This is done so that vstest and testhost create logs at same location.)
+        return Path.GetFullPath(diagFilePathArgument);
+    }
+
+    /// <summary>
+    /// Create directory if not exists.
+    /// </summary>
+    /// <param name="filePath">File path.</param>
+    private void CreateDirectoryIfNotExists(string filePath)
+    {
+        // Create the base directory of file path if doesn't exist.
+        // Directory could be empty if just a filename is provided. E.g. log.txt
+        var directory = Path.GetDirectoryName(filePath);
+        if (!StringUtils.IsNullOrEmpty(directory) && !_fileHelper.DirectoryExists(directory))
         {
-            // Create the base directory of file path if doesn't exist.
-            // Directory could be empty if just a filename is provided. E.g. log.txt
-            var directory = Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrEmpty(directory) && !this.fileHelper.DirectoryExists(directory))
-            {
-                this.fileHelper.CreateDirectory(directory);
-            }
+            _fileHelper.CreateDirectory(directory);
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs b/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
index d05365dc88..6cdc279818 100644
--- a/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnableLoggerArgumentProcessor.cs
@@ -1,182 +1,150 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.Linq;
+using System;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// An argument processor that allows the user to enable a specific logger
+/// from the command line using the --Logger|/Logger command line switch.
+/// </summary>
+internal class EnableLoggerArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    /// An argument processor that allows the user to enable a specific logger
-    /// from the command line using the --Logger|/Logger command line switch.
+    /// The command name.
     /// </summary>
-    internal class EnableLoggerArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/Logger";
 
-        /// <summary>
-        /// The command name.
-        /// </summary>
-        public const string CommandName = "/Logger";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new EnableLoggerArgumentExecutor(RunSettingsManager.Instance));
 
-        #region Fields
+        set => _executor = value;
+    }
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new EnableLoggerArgumentProcessorCapabilities());
+}
 
-        private Lazy<IArgumentExecutor> executor;
+internal class EnableLoggerArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    /// <summary>
+    /// Gets the command name.
+    /// </summary>
+    public override string CommandName => EnableLoggerArgumentProcessor.CommandName;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new EnableLoggerArgumentExecutor(RunSettingsManager.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether allow multiple.
+    /// </summary>
+    public override bool AllowMultiple => true;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new EnableLoggerArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether is action.
+    /// </summary>
+    public override bool IsAction => false;
 
-        #endregion
-    }
+    /// <summary>
+    /// Gets the priority.
+    /// </summary>
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Logging;
 
-    internal class EnableLoggerArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        /// <summary>
-        /// Gets the command name.
-        /// </summary>
-        public override string CommandName => EnableLoggerArgumentProcessor.CommandName;
-
-        /// <summary>
-        /// Gets a value indicating whether allow multiple.
-        /// </summary>
-        public override bool AllowMultiple => true;
-
-        /// <summary>
-        /// Gets a value indicating whether is action.
-        /// </summary>
-        public override bool IsAction => false;
-
-        /// <summary>
-        /// Gets the priority.
-        /// </summary>
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Logging;
-
-        /// <summary>
-        /// Gets the help content resource name.
-        /// </summary>
+    /// <summary>
+    /// Gets the help content resource name.
+    /// </summary>
 #if NETFRAMEWORK
-        public override string HelpContentResourceName => CommandLineResources.EnableLoggersArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.EnableLoggersArgumentHelp;
 #else
-        public override string HelpContentResourceName => CommandLineResources.EnableLoggerArgumentsInNetCore;
+    public override string HelpContentResourceName => CommandLineResources.EnableLoggerArgumentsInNetCore;
 #endif
 
-        /// <summary>
-        /// Gets the help priority.
-        /// </summary>
-        public override HelpContentPriority HelpPriority => HelpContentPriority.EnableLoggerArgumentProcessorHelpPriority;
-    }
+    /// <summary>
+    /// Gets the help priority.
+    /// </summary>
+    public override HelpContentPriority HelpPriority => HelpContentPriority.EnableLoggerArgumentProcessorHelpPriority;
+}
+
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class EnableLoggerArgumentExecutor : IArgumentExecutor
+{
+    private readonly IRunSettingsProvider _runSettingsManager;
 
     /// <summary>
-    /// The argument executor.
+    /// Initializes a new instance of the <see cref="EnableLoggerArgumentExecutor"/> class.
     /// </summary>
-    internal class EnableLoggerArgumentExecutor : IArgumentExecutor
+    public EnableLoggerArgumentExecutor(IRunSettingsProvider runSettingsManager)
     {
-        private readonly IRunSettingsProvider runSettingsManager;
+        ValidateArg.NotNull(runSettingsManager, nameof(runSettingsManager));
+        _runSettingsManager = runSettingsManager;
+    }
+
+    #region IArgumentProcessor
 
-#region Constructors
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.LoggerUriInvalid, argument);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableLoggerArgumentExecutor"/> class.
-        /// </summary>
-        public EnableLoggerArgumentExecutor(IRunSettingsProvider runSettingsManager)
+        // Throw error in case logger argument null or empty.
+        if (argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(runSettingsManager != null);
-            this.runSettingsManager = runSettingsManager;
+            throw new CommandLineException(exceptionMessage);
         }
 
-#endregion
+        // Get logger argument list.
+        var loggerArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
 
-#region IArgumentProcessor
-
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        // Get logger identifier.
+        var loggerIdentifier = loggerArgumentList[0];
+        if (loggerIdentifier.Contains("="))
         {
-            string exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.LoggerUriInvalid, argument);
-
-            // Throw error in case logger argument null or empty.
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(exceptionMessage);
-            }
-
-            // Get logger argument list.
-            var loggerArgumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, exceptionMessage);
-
-            // Get logger identifier.
-            var loggerIdentifier = loggerArgumentList[0];
-            if (loggerIdentifier.Contains("="))
-            {
-                throw new CommandLineException(exceptionMessage);
-            }
-
-            // Get logger parameters
-            var loggerParameterArgs = loggerArgumentList.Skip(1);
-            var loggerParameters = ArgumentProcessorUtilities.GetArgumentParameters(loggerParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
-
-            // Add logger to run settings.
-            LoggerUtilities.AddLoggerToRunSettings(loggerIdentifier, loggerParameters, runSettingsManager);
+            throw new CommandLineException(exceptionMessage);
         }
 
-        /// <summary>
-        /// Execute logger argument.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="ArgumentProcessorResult"/>.
-        /// </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do since we enabled the logger in the initialize method.
-            return ArgumentProcessorResult.Success;
-        }
+        // Get logger parameters
+        var loggerParameterArgs = loggerArgumentList.Skip(1);
+        var loggerParameters = ArgumentProcessorUtilities.GetArgumentParameters(loggerParameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, exceptionMessage);
 
-#endregion
+        // Add logger to run settings.
+        LoggerUtilities.AddLoggerToRunSettings(loggerIdentifier, loggerParameters, _runSettingsManager);
     }
+
+    /// <summary>
+    /// Execute logger argument.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="ArgumentProcessorResult"/>.
+    /// </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we enabled the logger in the initialize method.
+        return ArgumentProcessorResult.Success;
+    }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs b/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
index 2ea77d84a7..c38bd87461 100644
--- a/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
+++ b/src/vstest.console/Processors/EnvironmentArgumentProcessor.cs
@@ -1,145 +1,117 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Executor for the "-e|--Environment|/e|/Environment" command line argument.
+/// </summary>
+internal class EnvironmentArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.Contracts;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    /// <summary>
+    /// The short name of the command line argument that the EnvironmentArgumentProcessor handles.
+    /// </summary>
+    public const string ShortCommandName = "/e";
 
     /// <summary>
-    /// Argument Executor for the "-e|--Environment|/e|/Environment" command line argument.
+    /// The name of the command line argument that the EnvironmentArgumentProcessor handles.
     /// </summary>
-    internal class EnvironmentArgumentProcessor : IArgumentProcessor
+    public const string CommandName = "/Environment";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance));
+
+        set => _executor = value;
+    }
+
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new ArgumentProcessorCapabilities());
+
+    internal class ArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    {
+        public override string CommandName => EnvironmentArgumentProcessor.CommandName;
+        public override string ShortCommandName => EnvironmentArgumentProcessor.ShortCommandName;
+        public override bool AllowMultiple => true;
+        public override bool IsAction => false;
+        public override string HelpContentResourceName => CommandLineResources.EnvironmentArgumentHelp;
+        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+        public override HelpContentPriority HelpPriority => HelpContentPriority.EnvironmentArgumentProcessorHelpPriority;
+    }
+
+    internal class ArgumentExecutor : IArgumentExecutor
     {
-        #region Constants
         /// <summary>
-        /// The short name of the command line argument that the EnvironmentArgumentProcessor handles.
+        /// Used when warning about overridden environment variables.
         /// </summary>
-        public const string ShortCommandName = "/e";
+        private readonly IOutput _output;
 
         /// <summary>
-        /// The name of the command line argument that the EnvironmentArgumentProcessor handles.
+        /// Used when setting Environment variables.
         /// </summary>
-        public const string CommandName = "/Environment";
-        #endregion
-
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+        private readonly IRunSettingsProvider _runSettingsProvider;
 
-        private Lazy<IArgumentExecutor> executor;
-
-        public Lazy<IArgumentExecutor> Executor
+        /// <summary>
+        /// Used when checking and forcing InIsolation mode.
+        /// </summary>
+        private readonly CommandLineOptions _commandLineOptions;
+        public ArgumentExecutor(CommandLineOptions commandLineOptions, IRunSettingsProvider runSettingsProvider, IOutput output)
         {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(
-                        () => new ArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance)
-                    );
-                }
-
-                return this.executor;
-            }
-            set
-            {
-                this.executor = value;
-            }
+            _commandLineOptions = commandLineOptions;
+            _output = output;
+            _runSettingsProvider = runSettingsProvider;
         }
 
-        public Lazy<IArgumentProcessorCapabilities> Metadata
+        /// <summary>
+        /// Set the environment variables in RunSettings.xml
+        /// </summary>
+        /// <param name="argument">
+        /// Environment variable to set.
+        /// </param>
+        public void Initialize(string? argument)
         {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+            TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(argument));
+            TPDebug.Assert(_output != null);
+            TPDebug.Assert(_commandLineOptions != null);
+            TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(_runSettingsProvider.ActiveRunSettings?.SettingsXml));
 
-        internal class ArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-        {
-            public override string CommandName => EnvironmentArgumentProcessor.CommandName;
-            public override string ShortCommandName => EnvironmentArgumentProcessor.ShortCommandName;
-            public override bool AllowMultiple => true;
-            public override bool IsAction => false;
-            public override string HelpContentResourceName => CommandLineResources.EnvironmentArgumentHelp;
-            public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
-            public override HelpContentPriority HelpPriority => HelpContentPriority.EnvironmentArgumentProcessorHelpPriority;
-        }
+            var key = argument;
+            var value = string.Empty;
 
-        internal class ArgumentExecutor : IArgumentExecutor
-        {
-            #region Fields
-            /// <summary>
-            /// Used when warning about overriden environment variables.
-            /// </summary>
-            private IOutput output;
-
-            /// <summary>
-            /// Used when setting Environemnt variables.
-            /// </summary>
-            private IRunSettingsProvider runSettingsProvider;
-
-            /// <summary>
-            /// Used when checking and forcing InIsolation mode.
-            /// </summary>
-            private CommandLineOptions commandLineOptions;
-            #endregion
-
-            public ArgumentExecutor(CommandLineOptions commandLineOptions, IRunSettingsProvider runSettingsProvider, IOutput output)
+            if (key.Contains("="))
             {
-                this.commandLineOptions = commandLineOptions;
-                this.output = output;
-                this.runSettingsProvider = runSettingsProvider;
+                value = key.Substring(key.IndexOf("=") + 1);
+                key = key.Substring(0, key.IndexOf("="));
             }
 
-            /// <summary>
-            /// Set the environment variables in RunSettings.xml
-            /// </summary>
-            /// <param name="argument">
-            /// Environment variable to set. 
-            /// </param>
-            public void Initialize(string argument)
+            var node = _runSettingsProvider.QueryRunSettingsNode($"RunConfiguration.EnvironmentVariables.{key}");
+            if (node != null)
             {
-                Contract.Assert(!string.IsNullOrWhiteSpace(argument));
-                Contract.Assert(this.output != null);
-                Contract.Assert(this.commandLineOptions != null);
-                Contract.Assert(!string.IsNullOrWhiteSpace(this.runSettingsProvider.ActiveRunSettings.SettingsXml));
-                Contract.EndContractBlock();
-
-                var key = argument;
-                var value = string.Empty;
-
-                if(key.Contains("="))
-                {
-                    value = key.Substring(key.IndexOf("=") + 1);
-                    key = key.Substring(0, key.IndexOf("="));
-                }
-
-                var node = this.runSettingsProvider.QueryRunSettingsNode($"RunConfiguration.EnvironmentVariables.{key}");
-                if(node != null)
-                {
-                    output.Warning(true, CommandLineResources.EnvironmentVariableXIsOverriden, key);
-                }
-
-                this.runSettingsProvider.UpdateRunSettingsNode($"RunConfiguration.EnvironmentVariables.{key}", value);
-                
-                if(!this.commandLineOptions.InIsolation) { 
-                    this.commandLineOptions.InIsolation = true;
-                    this.runSettingsProvider.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
-                }
+                _output.Warning(true, CommandLineResources.EnvironmentVariableXIsOverriden, key);
             }
 
-            // Nothing to do here, the work was done in initialization.
-            public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
+            _runSettingsProvider.UpdateRunSettingsNode($"RunConfiguration.EnvironmentVariables.{key}", value);
+
+            if (!_commandLineOptions.InIsolation)
+            {
+                _commandLineOptions.InIsolation = true;
+                _runSettingsProvider.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
+            }
         }
+
+        // Nothing to do here, the work was done in initialization.
+        public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
     }
 }
diff --git a/src/vstest.console/Processors/FrameworkArgumentProcessor.cs b/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
index fcce28a2dc..b2bdd90a31 100644
--- a/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
+++ b/src/vstest.console/Processors/FrameworkArgumentProcessor.cs
@@ -1,177 +1,141 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+///  An argument processor that allows the user to specify the target platform architecture
+///  for test run.
+/// </summary>
+internal class FrameworkArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    ///  An argument processor that allows the user to specify the target platform architecture
-    ///  for test run.
+    /// The name of the command line argument that the OutputArgumentExecutor handles.
     /// </summary>
-    internal class FrameworkArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
-
-        /// <summary>
-        /// The name of the command line argument that the OutputArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Framework";
+    public const string CommandName = "/Framework";
 
-        #endregion
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
-
-        private Lazy<IArgumentExecutor> executor;
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new FrameworkArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new FrameworkArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new FrameworkArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new FrameworkArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+        set => _executor = value;
     }
+}
 
-    internal class FrameworkArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => FrameworkArgumentProcessor.CommandName;
+internal class FrameworkArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => FrameworkArgumentProcessor.CommandName;
 
-        public override bool AllowMultiple => false;
+    public override bool AllowMultiple => false;
 
-        public override bool IsAction => false;
+    public override bool IsAction => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override string HelpContentResourceName => CommandLineResources.FrameworkArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.FrameworkArgumentHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.FrameworkArgumentProcessorHelpPriority;
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.FrameworkArgumentProcessorHelpPriority;
+}
 
+/// <summary>
+/// Argument Executor for the "/Platform" command line argument.
+/// </summary>
+internal class FrameworkArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// Argument Executor for the "/Platform" command line argument.
+    /// Used for getting sources.
     /// </summary>
-    internal class FrameworkArgumentExecutor : IArgumentExecutor
-    {
-        #region Fields
+    private readonly CommandLineOptions _commandLineOptions;
 
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        private IRunSettingsProvider runSettingsManager;
+    public const string RunSettingsPath = "RunConfiguration.TargetFrameworkVersion";
 
-        public const string RunSettingsPath = "RunConfiguration.TargetFrameworkVersion";
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager"> The runsettings manager. </param>
+    public FrameworkArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        ValidateArg.NotNull(runSettingsManager, nameof(runSettingsManager));
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+    }
 
-        #endregion
 
-        #region Constructor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options"> The options. </param>
-        /// <param name="runSettingsManager"> The runsettings manager. </param>
-        public FrameworkArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            Contract.Requires(runSettingsManager != null);
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
+            throw new CommandLineException(CommandLineResources.FrameworkVersionRequired);
         }
 
-        #endregion
-
-        #region IArgumentExecutor
+        var validFramework = Framework.FromString(argument);
+        _commandLineOptions.TargetFrameworkVersion = validFramework ?? throw new CommandLineException(
+            string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidFrameworkVersion, argument));
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        if (_commandLineOptions.TargetFrameworkVersion != Framework.DefaultFramework
+            && !StringUtils.IsNullOrWhiteSpace(_commandLineOptions.SettingsFile)
+            && MSTestSettingsUtilities.IsLegacyTestSettingsFile(_commandLineOptions.SettingsFile))
         {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(CommandLineResources.FrameworkVersionRequired);
-            }
-
-            var validFramework = Framework.FromString(argument);
-            this.commandLineOptions.TargetFrameworkVersion = validFramework ?? throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidFrameworkVersion, argument));
-
-            if (this.commandLineOptions.TargetFrameworkVersion != Framework.DefaultFramework
-                && !string.IsNullOrWhiteSpace(this.commandLineOptions.SettingsFile)
-                && MSTestSettingsUtilities.IsLegacyTestSettingsFile(this.commandLineOptions.SettingsFile))
-            {
-                // Legacy testsettings file support only default target framework.
-                IOutput output = ConsoleOutput.Instance;
-                output.Warning(
-                    false,
-                    CommandLineResources.TestSettingsFrameworkMismatch,
-                    this.commandLineOptions.TargetFrameworkVersion.ToString(),
-                    Framework.DefaultFramework.ToString());
-            }
-            else
-            {
-                this.runSettingsManager.UpdateRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath,
-                    validFramework.ToString());
-            }
-
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Using .Net Framework version:{0}", commandLineOptions.TargetFrameworkVersion);
-            }
+            // Legacy testsettings file support only default target framework.
+            IOutput output = ConsoleOutput.Instance;
+            output.Warning(
+                false,
+                CommandLineResources.TestSettingsFrameworkMismatch,
+                _commandLineOptions.TargetFrameworkVersion.ToString(),
+                Framework.DefaultFramework.ToString());
         }
-
-        /// <summary>
-        /// The output path is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
+        else
         {
-            return ArgumentProcessorResult.Success;
+            _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath,
+                validFramework.ToString());
         }
 
-        #endregion
+        EqtTrace.Info("Using .Net Framework version:{0}", _commandLineOptions.TargetFrameworkVersion);
     }
+
+    /// <summary>
+    /// The output path is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
+    }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/HelpArgumentProcessor.cs b/src/vstest.console/Processors/HelpArgumentProcessor.cs
index a6d0171e02..31a611c3e9 100644
--- a/src/vstest.console/Processors/HelpArgumentProcessor.cs
+++ b/src/vstest.console/Processors/HelpArgumentProcessor.cs
@@ -1,205 +1,165 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    // <summary>
-    //     Argument Executor for the "-?|--Help|/?|/Help" Help command line argument.
-    // </summary>
-    internal class HelpArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
-
-        /// <summary>
-        /// The name of the command line argument that the HelpArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Help";
-
-        /// <summary>
-        /// The short name of the command line argument that the HelpArgumentExecutor handles.
-        /// </summary>
-        public const string ShortCommandName = "/?";
-
-
-        #endregion
+using System;
+using System.Collections.Generic;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-        private Lazy<IArgumentExecutor> executor;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new HelpArgumentProcessorCapabilities());
-                }
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+// <summary>
+//     Argument Executor for the "-?|--Help|/?|/Help" Help command line argument.
+// </summary>
+internal class HelpArgumentProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the HelpArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/Help";
 
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// The short name of the command line argument that the HelpArgumentExecutor handles.
+    /// </summary>
+    public const string ShortCommandName = "/?";
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new HelpArgumentExecutor());
-                }
 
-                return this.executor;
-            }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new HelpArgumentProcessorCapabilities());
 
     /// <summary>
-    /// The help argument processor capabilities.
+    /// Gets or sets the executor.
     /// </summary>
-    internal class HelpArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    public Lazy<IArgumentExecutor>? Executor
     {
-        public override string CommandName => HelpArgumentProcessor.CommandName;
+        get => _executor ??= new Lazy<IArgumentExecutor>(() => new HelpArgumentExecutor());
+
+        set => _executor = value;
+    }
+}
 
-        public override string ShortCommandName => HelpArgumentProcessor.ShortCommandName;
+/// <summary>
+/// The help argument processor capabilities.
+/// </summary>
+internal class HelpArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => HelpArgumentProcessor.CommandName;
 
-        public override string HelpContentResourceName => CommandLineResources.HelpArgumentHelp;
+    public override string ShortCommandName => HelpArgumentProcessor.ShortCommandName;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.HelpArgumentProcessorHelpPriority;
+    public override string HelpContentResourceName => CommandLineResources.HelpArgumentHelp;
 
-        public override bool IsAction => false;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.HelpArgumentProcessorHelpPriority;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Help;
-    }
+    public override bool IsAction => false;
 
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Help;
+}
+
+/// <summary>
+/// Argument Executor for the "/?" Help command line argument.
+/// </summary>
+internal class HelpArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// Argument Executor for the "/?" Help command line argument.
+    /// Constructs the HelpArgumentExecutor
     /// </summary>
-    internal class HelpArgumentExecutor : IArgumentExecutor
+    public HelpArgumentExecutor()
     {
-        #region Constructor
-
-        /// <summary>
-        /// Constructs the HelpArgumentExecutor
-        /// </summary>
-        public HelpArgumentExecutor()
-        {
-            this.Output = ConsoleOutput.Instance;
-        }
-
-        #endregion
+        Output = ConsoleOutput.Instance;
+    }
 
-        #region Properties
+    /// <summary>
+    /// Gets the output object
+    /// </summary>
+    internal IOutput Output { get; set; }
 
-        /// <summary>
-        /// Gets the output object
-        /// </summary>
-        internal IOutput Output { get; set; }
 
-        #endregion
+    #region IArgumentExecutor Members
 
-        #region IArgumentExecutor Members
+    public void Initialize(string? argument)
+    {
+    }
 
-        public void Initialize(string argument)
+    public ArgumentProcessorResult Execute()
+    {
+        // Output the stock output text
+        OutputSection(CommandLineResources.HelpUsageText);
+        OutputSection(CommandLineResources.HelpDescriptionText);
+        OutputSection(CommandLineResources.HelpArgumentsText);
+
+        var argumentProcessorFactory = ArgumentProcessorFactory.Create();
+        List<IArgumentProcessor> processors = new();
+        processors.AddRange(argumentProcessorFactory.AllArgumentProcessors);
+        processors.Sort((p1, p2) => Comparer<HelpContentPriority>.Default.Compare(p1.Metadata.Value.HelpPriority, p2.Metadata.Value.HelpPriority));
+
+        // Output the help description for RunTestsArgumentProcessor
+        IArgumentProcessor? runTestsArgumentProcessor = processors.Find(p1 => p1.GetType() == typeof(RunTestsArgumentProcessor));
+        TPDebug.Assert(runTestsArgumentProcessor is not null, "runTestsArgumentProcessor is null");
+        processors.Remove(runTestsArgumentProcessor);
+        var helpDescription = LookupHelpDescription(runTestsArgumentProcessor);
+        if (helpDescription != null)
         {
+            OutputSection(helpDescription);
         }
 
-        public ArgumentProcessorResult Execute()
+        // Output the help description for each available argument processor
+        OutputSection(CommandLineResources.HelpOptionsText);
+        foreach (var argumentProcessor in processors)
         {
-            // Output the stock output text
-            OutputSection(CommandLineResources.HelpUsageText);
-            OutputSection(CommandLineResources.HelpDescriptionText);
-            OutputSection(CommandLineResources.HelpArgumentsText);
-
-            var argumentProcessorFactory = ArgumentProcessorFactory.Create();
-            List<IArgumentProcessor> processors = new List<IArgumentProcessor>();
-            processors.AddRange(argumentProcessorFactory.AllArgumentProcessors);
-            processors.Sort((p1, p2) => Comparer<HelpContentPriority>.Default.Compare(p1.Metadata.Value.HelpPriority, p2.Metadata.Value.HelpPriority));
-
-            // Output the help description for RunTestsArgumentProcessor
-            IArgumentProcessor runTestsArgumentProcessor = processors.Find(p1 => p1.GetType() == typeof(RunTestsArgumentProcessor));
-            processors.Remove(runTestsArgumentProcessor);
-            var helpDescription = LookupHelpDescription(runTestsArgumentProcessor);
+            helpDescription = LookupHelpDescription(argumentProcessor);
             if (helpDescription != null)
             {
                 OutputSection(helpDescription);
             }
-
-            // Output the help description for each available argument processor
-            OutputSection(CommandLineResources.HelpOptionsText);
-            foreach (var argumentProcessor in processors)
-            {
-                helpDescription = LookupHelpDescription(argumentProcessor);
-                if (helpDescription != null)
-                {
-                    OutputSection(helpDescription);
-                }
-            }
-            OutputSection(CommandLineResources.Examples);
-
-            // When Help has finished abort any subsequent argument processor operations
-            return ArgumentProcessorResult.Abort;
         }
+        OutputSection(CommandLineResources.Examples);
 
-        #endregion
+        // When Help has finished abort any subsequent argument processor operations
+        return ArgumentProcessorResult.Abort;
+    }
 
-        #region Private Methods
+    #endregion
+    /// <summary>
+    /// Lookup the help description for the argument processor.
+    /// </summary>
+    /// <param name="argumentProcessor">The argument processor for which to discover any help content</param>
+    /// <returns>The formatted string containing the help description if found null otherwise</returns>
+    private string? LookupHelpDescription(IArgumentProcessor argumentProcessor)
+    {
+        string? result = null;
 
-        /// <summary>
-        /// Lookup the help description for the argument processor.
-        /// </summary>
-        /// <param name="argumentProcessor">The argument processor for which to discover any help content</param>
-        /// <returns>The formatted string containing the help description if found null otherwise</returns>
-        private string LookupHelpDescription(IArgumentProcessor argumentProcessor)
+        if (argumentProcessor.Metadata.Value.HelpContentResourceName != null)
         {
-            string result = null;
-
-            if (argumentProcessor.Metadata.Value.HelpContentResourceName != null)
+            try
             {
-                try
-                {
-                    result = string.Format(
-                        CultureInfo.CurrentUICulture,
-                        argumentProcessor.Metadata.Value.HelpContentResourceName);
-                    //ResourceHelper.GetString(argumentProcessor.Metadata.HelpContentResourceName, assembly, CultureInfo.CurrentUICulture);
-                }
-                catch (Exception e)
-                {
-                    Output.Warning(false, e.Message);
-                }
+                result = argumentProcessor.Metadata.Value.HelpContentResourceName;
+                //ResourceHelper.GetString(argumentProcessor.Metadata.HelpContentResourceName, assembly, CultureInfo.CurrentUICulture);
+            }
+            catch (Exception e)
+            {
+                Output.Warning(false, e.Message);
             }
-
-            return result;
         }
 
-        /// <summary>
-        /// Output a section followed by an empty line.
-        /// </summary>
-        /// <param name="message">Message to output.</param>
-        private void OutputSection(string message)
-        {
-            Output.WriteLine(message, OutputLevel.Information);
-            Output.WriteLine(string.Empty, OutputLevel.Information);
-        }
+        return result;
+    }
 
-        #endregion
+    /// <summary>
+    /// Output a section followed by an empty line.
+    /// </summary>
+    /// <param name="message">Message to output.</param>
+    private void OutputSection(string message)
+    {
+        Output.WriteLine(message, OutputLevel.Information);
+        Output.WriteLine(string.Empty, OutputLevel.Information);
     }
+
 }
diff --git a/src/vstest.console/Processors/InIsolationArgumentProcessor.cs b/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
index ab886429cb..0666f0e8d5 100644
--- a/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
+++ b/src/vstest.console/Processors/InIsolationArgumentProcessor.cs
@@ -1,136 +1,109 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    /// <summary>
-    ///  An argument processor that allows the user to specify whether the execution
-    ///  should happen in the current vstest.console.exe process or a new different process.
-    /// </summary>
-    internal class InIsolationArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+using System;
+using System.Globalization;
 
-        public const string CommandName = "/InIsolation";
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        #endregion
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        private Lazy<IArgumentExecutor> executor;
+/// <summary>
+///  An argument processor that allows the user to specify whether the execution
+///  should happen in the current vstest.console.exe process or a new different process.
+/// </summary>
+internal class InIsolationArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/InIsolation";
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new InIsolationArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor =
-                        new Lazy<IArgumentExecutor>(
-                            () =>
-                            new InIsolationArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new InIsolationArgumentProcessorCapabilities());
 
-    internal class InIsolationArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
     {
-        public override string CommandName => InIsolationArgumentProcessor.CommandName;
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new InIsolationArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
+
+        set => _executor = value;
+    }
+}
 
-        public override bool AllowMultiple => false;
+internal class InIsolationArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => InIsolationArgumentProcessor.CommandName;
 
-        public override bool IsAction => false;
+    public override bool AllowMultiple => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+    public override bool IsAction => false;
 
-        public override string HelpContentResourceName => CommandLineResources.InIsolationHelp;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.InIsolationArgumentProcessorHelpPriority;
-    }
+    public override string HelpContentResourceName => CommandLineResources.InIsolationHelp;
 
-    internal class InIsolationArgumentExecutor : IArgumentExecutor
+    public override HelpContentPriority HelpPriority => HelpContentPriority.InIsolationArgumentProcessorHelpPriority;
+}
+
+internal class InIsolationArgumentExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly IRunSettingsProvider _runSettingsManager;
+
+    public const string RunSettingsPath = "RunConfiguration.InIsolation";
+
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="options">Command line options</param>
+    /// <param name="runSettingsManager">the runsettings manager</param>
+    public InIsolationArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
     {
-        private CommandLineOptions commandLineOptions;
-        private IRunSettingsProvider runSettingsManager;
-
-        public const string RunSettingsPath = "RunConfiguration.InIsolation";
-
-        #region Constructors
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="options">Command line options</param>
-        /// <param name="runSettingsManager">the runsettings manager</param>
-        public InIsolationArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
-        {
-            Contract.Requires(options != null);
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
-        }
-        #endregion
+        ValidateArg.NotNull(options, nameof(options));
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+    }
 
-        #region IArgumentProcessor
+    #region IArgumentProcessor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        // InIsolation does not require any argument, throws exception if argument specified
+        if (!argument.IsNullOrWhiteSpace())
         {
-            // InIsolation does not require any argument, throws exception if argument specified
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidInIsolationCommand, argument));
-            }
-
-            this.commandLineOptions.InIsolation = true;
-            this.runSettingsManager.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
+            throw new CommandLineException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidInIsolationCommand, argument));
         }
 
-        /// <summary>
-        /// Execute.
-        /// </summary>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do since we updated the parameter during initialize parameter
-            return ArgumentProcessorResult.Success;
-        }
+        _commandLineOptions.InIsolation = true;
+        _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, "true");
+    }
 
-        #endregion
+    /// <summary>
+    /// Execute.
+    /// </summary>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
     }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/Interfaces/IArgumentExector.cs b/src/vstest.console/Processors/Interfaces/IArgumentExector.cs
index 8e0881336b..b0aebc52bf 100644
--- a/src/vstest.console/Processors/Interfaces/IArgumentExector.cs
+++ b/src/vstest.console/Processors/Interfaces/IArgumentExector.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Defines interface for interacting with a command line argument executor.
+/// Items exporting this interface will be used in processing command line arguments.
+/// </summary>
+internal interface IArgumentExecutor
 {
     /// <summary>
-    /// Defines interface for interacting with a command line argument executor.
-    /// Items exporting this interface will be used in processing command line arguments.
+    /// Initializes the Argument Processor with the argument that was provided with the command.
     /// </summary>
-    internal interface IArgumentExecutor
-    {
-        /// <summary>
-        /// Initializes the Argument Processor with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        void Initialize(string argument);
+    /// <param name="argument">Argument that was provided with the command.</param>
+    void Initialize(string? argument);
 
-        /// <summary>
-        /// Perform the action associated with the argument processor.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="ArgumentProcessorResult"/>.
-        /// </returns>
-        ArgumentProcessorResult Execute();
-    }
+    /// <summary>
+    /// Perform the action associated with the argument processor.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="ArgumentProcessorResult"/>.
+    /// </returns>
+    ArgumentProcessorResult Execute();
 }
diff --git a/src/vstest.console/Processors/Interfaces/IArgumentProcessor.cs b/src/vstest.console/Processors/Interfaces/IArgumentProcessor.cs
index 0b4099c620..45118aa554 100644
--- a/src/vstest.console/Processors/Interfaces/IArgumentProcessor.cs
+++ b/src/vstest.console/Processors/Interfaces/IArgumentProcessor.cs
@@ -1,24 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+/// Defines interface for interacting with a command line argument processor.
+/// Items exporting this interface will be used in processing command line arguments.
+/// </summary>
+internal interface IArgumentProcessor
+{
     /// <summary>
-    /// Defines interface for interacting with a command line argument processor.
-    /// Items exporting this interface will be used in processing command line arguments.
+    /// Gets or sets the executor.
     /// </summary>
-    internal interface IArgumentProcessor
-    {
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        Lazy<IArgumentExecutor> Executor { get; set; }
+    Lazy<IArgumentExecutor>? Executor { get; set; }
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        Lazy<IArgumentProcessorCapabilities> Metadata { get; }
-    }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    Lazy<IArgumentProcessorCapabilities> Metadata { get; }
 }
diff --git a/src/vstest.console/Processors/Interfaces/IArgumentProcessorCapabilities.cs b/src/vstest.console/Processors/Interfaces/IArgumentProcessorCapabilities.cs
index 69a61f27f9..b9e65f5de9 100644
--- a/src/vstest.console/Processors/Interfaces/IArgumentProcessorCapabilities.cs
+++ b/src/vstest.console/Processors/Interfaces/IArgumentProcessorCapabilities.cs
@@ -1,58 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Represents capabilities for an Argument Executor
+/// </summary>
+internal interface IArgumentProcessorCapabilities
 {
     /// <summary>
-    /// Represents capabilities for an Argument Executor
-    /// </summary>
-    internal interface IArgumentProcessorCapabilities
-    {
-        /// <summary>
-        /// The short name of the command the ArgumentProcessor handles.  For example "/t".
-        /// </summary>
-        string ShortCommandName { get; }
-
-        /// <summary>
-        /// The long name of the command the ArgumentProcessor handles.  For example "/tests".
-        /// </summary>
-        string CommandName { get; }
-
-        /// <summary>
-        /// Indicates if multiple of the command are allowed.
-        /// </summary>
-        bool AllowMultiple { get; }
-
-        /// <summary>
-        /// Indicates if the command is a special command.  Special commands can not
-        /// be specified directly on the command line (like run tests).
-        /// </summary>
-        bool IsSpecialCommand { get; }
-
-        /// <summary>
-        /// Indicates if the command should always be executed.
-        /// </summary>
-        bool AlwaysExecute { get; }
-
-        /// <summary>
-        /// Indicates if the argument processor is a primary action.
-        /// </summary>
-        bool IsAction { get; }
-
-        /// <summary>
-        /// Indicates the priority of the argument processor.
-        /// The priority determines the order in which processors are initialized and executed.
-        /// </summary>
-        ArgumentProcessorPriority Priority { get; }
-
-        /// <summary>
-        /// The resource identifier for the Help Content associated with the decorated argument processor
-        /// </summary>
-        string HelpContentResourceName { get; }
-
-        /// <summary>
-        /// Based on this enum, corresponding help text will be shown.
-        /// </summary>
-        HelpContentPriority HelpPriority { get; }
-    }
+    /// The short name of the command the ArgumentProcessor handles.  For example "/t".
+    /// </summary>
+    string? ShortCommandName { get; }
+
+    /// <summary>
+    /// The long name of the command the ArgumentProcessor handles.  For example "/tests".
+    /// </summary>
+    string CommandName { get; }
+
+    /// <summary>
+    /// Indicates if multiple of the command are allowed.
+    /// </summary>
+    bool AllowMultiple { get; }
+
+    /// <summary>
+    /// Indicates if the command is a special command.  Special commands can not
+    /// be specified directly on the command line (like run tests).
+    /// </summary>
+    bool IsSpecialCommand { get; }
+
+    /// <summary>
+    /// Indicates if the command should always be executed.
+    /// </summary>
+    bool AlwaysExecute { get; }
+
+    /// <summary>
+    /// Indicates if the argument processor is a primary action.
+    /// </summary>
+    bool IsAction { get; }
+
+    /// <summary>
+    /// Indicates the priority of the argument processor.
+    /// The priority determines the order in which processors are initialized and executed.
+    /// </summary>
+    ArgumentProcessorPriority Priority { get; }
+
+    /// <summary>
+    /// The resource identifier for the Help Content associated with the decorated argument processor
+    /// </summary>
+    string? HelpContentResourceName { get; }
+
+    /// <summary>
+    /// Based on this enum, corresponding help text will be shown.
+    /// </summary>
+    HelpContentPriority HelpPriority { get; }
 }
diff --git a/src/vstest.console/Processors/Interfaces/IArgumentsExecutor.cs b/src/vstest.console/Processors/Interfaces/IArgumentsExecutor.cs
index 2c1e968eab..2523fad786 100644
--- a/src/vstest.console/Processors/Interfaces/IArgumentsExecutor.cs
+++ b/src/vstest.console/Processors/Interfaces/IArgumentsExecutor.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Defines interface for interacting with a command line arguments executor.
+/// Items exporting this interface will be used in processing command line arguments.
+/// </summary>
+internal interface IArgumentsExecutor : IArgumentExecutor
 {
     /// <summary>
-    /// Defines interface for interacting with a command line arguments executor.
-    /// Items exporting this interface will be used in processing command line arguments.
+    /// Initializes the Argument Processor with the arguments that was provided with the command.
     /// </summary>
-    internal interface IArgumentsExecutor : IArgumentExecutor
-    {
-        /// <summary>
-        /// Initializes the Argument Processor with the arguments that was provided with the command.
-        /// </summary>
-        /// <param name="arguments">Arguments that are provided with the command.</param>
-        void Initialize(string[] arguments);
-    }
+    /// <param name="arguments">Arguments that are provided with the command.</param>
+    void Initialize(string[]? arguments);
 }
diff --git a/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs b/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
index b3f775722d..7ba694b34f 100644
--- a/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListExtensionsArgumentProcessor.cs
@@ -1,235 +1,214 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Globalization;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class ListExtensionsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    private readonly string _commandName;
 
-    internal class ListExtensionsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ListExtensionsArgumentProcessorCapabilities"/> class.
+    /// </summary>
+    /// <param name="commandName">Name of the command</param>
+    public ListExtensionsArgumentProcessorCapabilities(string commandName)
     {
-        private string commandName;
+        _commandName = commandName;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ListExtensionsArgumentProcessorCapabilities"/> class.
-        /// </summary>
-        /// <param name="commandName">Name of the command</param>
-        public ListExtensionsArgumentProcessorCapabilities(string commandName)
-        {
-            this.commandName = commandName;
-        }
+    public override string CommandName => _commandName;
 
-        public override string CommandName => this.commandName;
+    /// <inheritdoc />
+    public override bool AllowMultiple => false;
 
-        /// <inheritdoc />
-        public override bool AllowMultiple => false;
+    /// <inheritdoc />
+    public override bool IsAction => true;
+}
+
+internal abstract class ListExtensionsArgumentProcessor : IArgumentProcessor
+{
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+    private readonly Func<IArgumentExecutor> _getExecutor;
+    private readonly Func<IArgumentProcessorCapabilities> _getCapabilities;
 
-        /// <inheritdoc />
-        public override bool IsAction => true;
+    public ListExtensionsArgumentProcessor(Func<IArgumentExecutor> getExecutor, Func<IArgumentProcessorCapabilities> getCapabilities)
+    {
+        _getExecutor = getExecutor;
+        _getCapabilities = getCapabilities;
     }
 
-    internal abstract class ListExtensionsArgumentProcessor : IArgumentProcessor
+    public Lazy<IArgumentExecutor>? Executor
     {
-        private Lazy<IArgumentProcessorCapabilities> metadata;
-        private Lazy<IArgumentExecutor> executor;
-        private Func<IArgumentExecutor> getExecutor;
-        private Func<IArgumentProcessorCapabilities> getCapabilities;
+        get => _executor ??= new Lazy<IArgumentExecutor>(_getExecutor);
 
-        public ListExtensionsArgumentProcessor(Func<IArgumentExecutor> getExecutor, Func<IArgumentProcessorCapabilities> getCapabilities)
-        {
-            this.getExecutor = getExecutor;
-            this.getCapabilities = getCapabilities;
-        }
+        set => _executor = value;
+    }
 
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(getExecutor);
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(_getCapabilities);
+}
 
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(getCapabilities);
-                }
-
-                return this.metadata;
-            }
-        }
-    }
+#region List discoverers
+/// <summary>
+/// Argument Executor for the "/ListDiscoverers" command line argument.
+/// </summary>
+internal class ListDiscoverersArgumentProcessor : ListExtensionsArgumentProcessor
+{
+    private const string CommandName = "/ListDiscoverers";
 
-    #region List discoverers
-    /// <summary>
-    /// Argument Executor for the "/ListDiscoverers" command line argument.
-    /// </summary>
-    internal class ListDiscoverersArgumentProcessor : ListExtensionsArgumentProcessor
+    public ListDiscoverersArgumentProcessor()
+        : base(() => new ListDiscoverersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
     {
-        private const string CommandName = "/ListDiscoverers";
+    }
+}
 
-        public ListDiscoverersArgumentProcessor()
-            : base(() => new ListDiscoverersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
-        {
-        }
+internal class ListDiscoverersArgumentExecutor : IArgumentExecutor
+{
+    public void Initialize(string? argument)
+    {
     }
 
-    internal class ListDiscoverersArgumentExecutor : IArgumentExecutor
+    public ArgumentProcessorResult Execute()
     {
-        public void Initialize(string argument)
+        ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableDiscoverersHeaderMessage, OutputLevel.Information);
+        _ = TestPlatformFactory.GetTestPlatform();
+        var extensionManager = TestDiscoveryExtensionManager.Create();
+        foreach (var extension in extensionManager.Discoverers)
         {
+            ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UriOfDefaultExecutor, extension.Metadata.DefaultExecutorUri), OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SupportedFileTypesIndicator + " " + string.Join(", ", extension.Metadata.FileExtension!)), OutputLevel.Information);
         }
 
-        public ArgumentProcessorResult Execute()
-        {
-            ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableDiscoverersHeaderMessage, OutputLevel.Information);
-            var testPlatform = TestPlatformFactory.GetTestPlatform();
-            var extensionManager = TestDiscoveryExtensionManager.Create();
-            foreach (var extension in extensionManager.Discoverers)
-            {
-                ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UriOfDefaultExecutor, extension.Metadata.DefaultExecutorUri), OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SupportedFileTypesIndicator + " " + string.Join(", ", extension.Metadata.FileExtension)), OutputLevel.Information);
-            }
-
-            return ArgumentProcessorResult.Success;
-        }
+        return ArgumentProcessorResult.Success;
     }
-    #endregion
+}
+#endregion
 
-    #region List executors
-    /// <summary>
-    /// Argument Executor for the "/ListExecutors" command line argument.
-    /// </summary>
-    internal class ListExecutorsArgumentProcessor : ListExtensionsArgumentProcessor
+#region List executors
+/// <summary>
+/// Argument Executor for the "/ListExecutors" command line argument.
+/// </summary>
+internal class ListExecutorsArgumentProcessor : ListExtensionsArgumentProcessor
+{
+    private const string CommandName = "/ListExecutors";
+
+    public ListExecutorsArgumentProcessor()
+        : base(() => new ListExecutorsArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
     {
-        private const string CommandName = "/ListExecutors";
+    }
+}
 
-        public ListExecutorsArgumentProcessor()
-            : base(() => new ListExecutorsArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
-        {
-        }
+internal class ListExecutorsArgumentExecutor : IArgumentExecutor
+{
+    public void Initialize(string? argument)
+    {
     }
 
-    internal class ListExecutorsArgumentExecutor : IArgumentExecutor
+    public ArgumentProcessorResult Execute()
     {
-        public void Initialize(string argument)
+        ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableExecutorsHeaderMessage, OutputLevel.Information);
+        _ = TestPlatformFactory.GetTestPlatform();
+        var extensionManager = TestExecutorExtensionManager.Create();
+        foreach (var extension in extensionManager.TestExtensions)
         {
+            ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "Uri", extension.Metadata.ExtensionUri), OutputLevel.Information);
         }
 
-        public ArgumentProcessorResult Execute()
-        {
-            ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableExecutorsHeaderMessage, OutputLevel.Information);
-            var testPlatform = TestPlatformFactory.GetTestPlatform();
-            var extensionManager = TestExecutorExtensionManager.Create();
-            foreach (var extension in extensionManager.TestExtensions)
-            {
-                ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "Uri", extension.Metadata.ExtensionUri), OutputLevel.Information);
-            }
-
-            return ArgumentProcessorResult.Success;
-        }
+        return ArgumentProcessorResult.Success;
     }
-    #endregion
+}
+#endregion
 
-    #region List loggers
-    /// <summary>
-    /// Argument Executor for the "/ListLoggers" command line argument.
-    /// </summary>
-    internal class ListLoggersArgumentProcessor : ListExtensionsArgumentProcessor
+#region List loggers
+/// <summary>
+/// Argument Executor for the "/ListLoggers" command line argument.
+/// </summary>
+internal class ListLoggersArgumentProcessor : ListExtensionsArgumentProcessor
+{
+    private const string CommandName = "/ListLoggers";
+
+    public ListLoggersArgumentProcessor()
+        : base(() => new ListLoggersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
     {
-        private const string CommandName = "/ListLoggers";
+    }
+}
 
-        public ListLoggersArgumentProcessor()
-            : base(() => new ListLoggersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
-        {
-        }
+internal class ListLoggersArgumentExecutor : IArgumentExecutor
+{
+    public void Initialize(string? argument)
+    {
     }
 
-    internal class ListLoggersArgumentExecutor : IArgumentExecutor
+    public ArgumentProcessorResult Execute()
     {
-        public void Initialize(string argument)
+        ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableLoggersHeaderMessage, OutputLevel.Information);
+        _ = TestPlatformFactory.GetTestPlatform();
+        var extensionManager = TestLoggerExtensionManager.Create(new NullMessageLogger());
+        foreach (var extension in extensionManager.TestExtensions)
         {
+            ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "Uri", extension.Metadata.ExtensionUri), OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "FriendlyName", string.Join(", ", extension.Metadata.FriendlyName)), OutputLevel.Information);
         }
 
-        public ArgumentProcessorResult Execute()
-        {
-            ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableLoggersHeaderMessage, OutputLevel.Information);
-            var testPlatform = TestPlatformFactory.GetTestPlatform();
-            var extensionManager = TestLoggerExtensionManager.Create(new NullMessageLogger());
-            foreach (var extension in extensionManager.TestExtensions)
-            {
-                ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "Uri", extension.Metadata.ExtensionUri), OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "FriendlyName", string.Join(", ", extension.Metadata.FriendlyName)), OutputLevel.Information);
-            }
-
-            return ArgumentProcessorResult.Success;
-        }
+        return ArgumentProcessorResult.Success;
+    }
 
-        private class NullMessageLogger : IMessageLogger
+    private class NullMessageLogger : IMessageLogger
+    {
+        public void SendMessage(TestMessageLevel testMessageLevel, string message)
         {
-            public void SendMessage(TestMessageLevel testMessageLevel, string message)
-            {
-            }
         }
     }
-    #endregion
+}
+#endregion
 
-    #region List settings providers
-    /// <summary>
-    /// Argument Executor for the "/ListSettingsProviders" command line argument.
-    /// </summary>
-    internal class ListSettingsProvidersArgumentProcessor : ListExtensionsArgumentProcessor
+#region List settings providers
+/// <summary>
+/// Argument Executor for the "/ListSettingsProviders" command line argument.
+/// </summary>
+internal class ListSettingsProvidersArgumentProcessor : ListExtensionsArgumentProcessor
+{
+    private const string CommandName = "/ListSettingsProviders";
+
+    public ListSettingsProvidersArgumentProcessor()
+        : base(() => new ListSettingsProvidersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
     {
-        private const string CommandName = "/ListSettingsProviders";
+    }
+}
 
-        public ListSettingsProvidersArgumentProcessor()
-            : base(() => new ListSettingsProvidersArgumentExecutor(), () => new ListExtensionsArgumentProcessorCapabilities(CommandName))
-        {
-        }
+internal class ListSettingsProvidersArgumentExecutor : IArgumentExecutor
+{
+    public void Initialize(string? argument)
+    {
     }
 
-    internal class ListSettingsProvidersArgumentExecutor : IArgumentExecutor
+    public ArgumentProcessorResult Execute()
     {
-        public void Initialize(string argument)
+        ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableSettingsProvidersHeaderMessage, OutputLevel.Information);
+        _ = TestPlatformFactory.GetTestPlatform();
+        var extensionManager = SettingsProviderExtensionManager.Create();
+        foreach (var extension in extensionManager.SettingsProvidersMap.Values)
         {
+            ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
+            ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "SettingName", extension.Metadata.SettingsName), OutputLevel.Information);
         }
 
-        public ArgumentProcessorResult Execute()
-        {
-            ConsoleOutput.Instance.WriteLine(CommandLineResources.AvailableSettingsProvidersHeaderMessage, OutputLevel.Information);
-            var testPlatform = TestPlatformFactory.GetTestPlatform();
-            var extensionManager = SettingsProviderExtensionManager.Create();
-            foreach (var extension in extensionManager.SettingsProvidersMap.Values)
-            {
-                ConsoleOutput.Instance.WriteLine(extension.Value.GetType().FullName, OutputLevel.Information);
-                ConsoleOutput.Instance.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableExtensionsMetadataFormat, "SettingName", extension.Metadata.SettingsName), OutputLevel.Information);
-            }
-
-            return ArgumentProcessorResult.Success;
-        }
+        return ArgumentProcessorResult.Success;
     }
-    #endregion
 }
+#endregion
diff --git a/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs b/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
index 273adce9cb..8bd9581d09 100644
--- a/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListFullyQualifiedTestsArgumentProcessor.cs
@@ -1,471 +1,420 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Executor for the "--ListFullyQualifiedTests|/ListFullyQualifiedTests" command line argument.
+/// </summary>
+internal class ListFullyQualifiedTestsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    /// <summary>
+    /// The name of the command line argument that the ListFullyQualifiedTestsArgumentProcessor handles.
+    /// </summary>
+    public const string CommandName = "/ListFullyQualifiedTests";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListFullyQualifiedTestsArgumentProcessorCapabilities());
 
     /// <summary>
-    /// Argument Executor for the "--ListFullyQualifiedTests|/ListFullyQualifiedTests" command line argument.
+    /// Gets or sets the executor.
     /// </summary>
-    internal class ListFullyQualifiedTestsArgumentProcessor : IArgumentProcessor
+    public Lazy<IArgumentExecutor>? Executor
     {
-        #region Constants
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListFullyQualifiedTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance));
 
-        /// <summary>
-        /// The name of the command line argument that the ListFullyQualifiedTestsArgumentProcessor handles.
-        /// </summary>
-        public const string CommandName = "/ListFullyQualifiedTests";
+        set => _executor = value;
+    }
+}
 
-        #endregion
+internal class ListFullyQualifiedTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ListFullyQualifiedTestsArgumentProcessor.CommandName;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public override bool AllowMultiple => false;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override bool IsAction => true;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListFullyQualifiedTestsArgumentProcessorCapabilities());
-                }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+}
 
-                return this.metadata;
-            }
-        }
+/// <summary>
+/// Argument Executor for the "/ListTests" command line argument.
+/// </summary>
+internal class ListFullyQualifiedTestsArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor =
-                        new Lazy<IArgumentExecutor>(
-                            () =>
-                            new ListFullyQualifiedTestsArgumentExecutor(
-                                CommandLineOptions.Instance,
-                                RunSettingsManager.Instance,
-                                TestRequestManager.Instance));
-                }
+    /// <summary>
+    /// Used for getting tests.
+    /// </summary>
+    private readonly ITestRequestManager _testRequestManager;
 
-                return this.executor;
-            }
+    /// <summary>
+    /// Used for sending output.
+    /// </summary>
+    internal IOutput Output;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
+    /// <summary>
+    /// RunSettingsManager to get currently active run settings.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
+
+    /// <summary>
+    /// Registers for discovery events during discovery
+    /// </summary>
+    private readonly ITestDiscoveryEventsRegistrar _discoveryEventsRegistrar;
+
+    /// <summary>
+    /// List to store the discovered tests
+    /// </summary>
+    private readonly List<string> _discoveredTests = new();
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    /// <param name="runSettingsProvider">Runsettings provider.</param>
+    /// <param name="testRequestManager">Test request manager.</param>
+    public ListFullyQualifiedTestsArgumentExecutor(
+        CommandLineOptions options,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager) :
+        this(options, runSettingsProvider, testRequestManager, ConsoleOutput.Instance)
+    {
     }
 
-    internal class ListFullyQualifiedTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    /// <param name="runSettingsProvider">Runsettings provider.</param>
+    /// <param name="testRequestManager">Test request manager.</param>
+    /// <param name="output">Output such as console.</param>
+    internal ListFullyQualifiedTestsArgumentExecutor(
+        CommandLineOptions options,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager,
+        IOutput output)
     {
-        public override string CommandName => ListFullyQualifiedTestsArgumentProcessor.CommandName;
+        ValidateArg.NotNull(options, nameof(options));
 
-        public override bool AllowMultiple => false;
+        _commandLineOptions = options;
+        Output = output;
+        _testRequestManager = testRequestManager;
 
-        public override bool IsAction => true;
+        _runSettingsManager = runSettingsProvider;
+        _discoveryEventsRegistrar = new DiscoveryEventsRegistrar(_discoveredTests, _commandLineOptions);
+    }
+
+    #region IArgumentExecutor
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (!argument.IsNullOrWhiteSpace())
+        {
+            _commandLineOptions.AddSource(argument);
+        }
     }
 
     /// <summary>
-    /// Argument Executor for the "/ListTests" command line argument.
+    /// Lists out the available discoverers.
     /// </summary>
-    internal class ListFullyQualifiedTestsArgumentExecutor : IArgumentExecutor
+    public ArgumentProcessorResult Execute()
     {
-        #region Fields
+        TPDebug.Assert(Output != null);
+        TPDebug.Assert(_commandLineOptions != null);
+        TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(_runSettingsManager?.ActiveRunSettings?.SettingsXml));
 
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
+        if (!_commandLineOptions.Sources.Any())
+        {
+            throw new CommandLineException(CommandLineResources.MissingTestSourceFile);
+        }
 
-        /// <summary>
-        /// Used for getting tests.
-        /// </summary>
-        private ITestRequestManager testRequestManager;
+        if (!EqtTrace.LogFile.IsNullOrEmpty())
+        {
+            Output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
+        }
 
-        /// <summary>
-        /// Used for sending output.
-        /// </summary>
-        internal IOutput output;
+        var runSettings = _runSettingsManager.ActiveRunSettings.SettingsXml;
 
-        /// <summary>
-        /// RunSettingsManager to get currently active run settings.
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
+        _testRequestManager.DiscoverTests(
+            new DiscoveryRequestPayload { Sources = _commandLineOptions.Sources, RunSettings = runSettings },
+            _discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
 
-        /// <summary>
-        /// Registers for discovery events during discovery
-        /// </summary>
-        private ITestDiscoveryEventsRegistrar discoveryEventsRegistrar;
+        if (_commandLineOptions.ListTestsTargetPath.IsNullOrEmpty())
+        {
+            // This string does not need to go to Resources. Reason - only internal consumption
+            throw new CommandLineException("Target Path should be specified for listing FQDN tests!");
+        }
 
-        /// <summary>
-        /// Test case filter instance
-        /// </summary>
-        private TestCaseFilter testCasefilter;
+        File.WriteAllLines(_commandLineOptions.ListTestsTargetPath, _discoveredTests);
+        return ArgumentProcessorResult.Success;
+    }
 
-        /// <summary>
-        /// List to store the discovered tests
-        /// </summary>
-        private List<string> discoveredTests = new List<string>();
+    #endregion
 
-        #endregion
+    private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+    {
+        private readonly List<string> _discoveredTests;
+        private readonly CommandLineOptions _options;
 
-        #region Constructor
+        public DiscoveryEventsRegistrar(List<string> discoveredTests, CommandLineOptions cmdOptions)
+        {
+            _discoveredTests = discoveredTests;
+            _options = cmdOptions;
+        }
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        public ListFullyQualifiedTestsArgumentExecutor(
-            CommandLineOptions options,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager) :
-                this(options, runSettingsProvider, testRequestManager, ConsoleOutput.Instance)
+        public void LogWarning(string message)
         {
+            ConsoleLogger.RaiseTestRunWarning(message);
+        }
+        public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+        {
+            discoveryRequest.OnDiscoveredTests += DiscoveryRequest_OnDiscoveredTests;
         }
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        internal ListFullyQualifiedTestsArgumentExecutor(
-            CommandLineOptions options,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager,
-            IOutput output)
+        public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
         {
-            Contract.Requires(options != null);
+            discoveryRequest.OnDiscoveredTests -= DiscoveryRequest_OnDiscoveredTests;
+        }
 
-            this.commandLineOptions = options;
-            this.output = output;
-            this.testRequestManager = testRequestManager;
+        private void DiscoveryRequest_OnDiscoveredTests(object? sender, DiscoveredTestsEventArgs args)
+        {
+            if (args == null)
+            {
+                throw new TestPlatformException("DiscoveredTestsEventArgs cannot be null.");
+            }
 
-            this.runSettingsManager = runSettingsProvider;
-            this.testCasefilter = new TestCaseFilter();
-            this.discoveryEventsRegistrar = new DiscoveryEventsRegistrar(output, this.testCasefilter, discoveredTests, this.commandLineOptions);
+            // Initializing the test case filter here because the filter value is read late.
+            TestCaseFilter.Initialize(_options.TestCaseFilterValue);
+            var discoveredTests = args.DiscoveredTestCases!.ToList();
+            var filteredTests = TestCaseFilter.FilterTests(discoveredTests).ToList();
+
+            // remove any duplicate tests
+            filteredTests = filteredTests.Select(test => test.FullyQualifiedName)
+                .Distinct()
+                .Select(fqdn => filteredTests.First(test => test.FullyQualifiedName == fqdn))
+                .ToList();
+            _discoveredTests.AddRange(filteredTests.Select(test => test.FullyQualifiedName));
         }
+    }
 
-        #endregion
-
-        #region IArgumentExecutor
+    private static class TestCaseFilter
+    {
+        private static TestCaseFilterExpression? s_filterExpression;
+        private const string TestCategory = "TestCategory";
+        private const string Category = "Category";
+        private const string Traits = "Traits";
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        public static void Initialize(string? filterString)
         {
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                this.commandLineOptions.AddSource(argument);
-            }
+            ValidateFilter(filterString);
         }
 
         /// <summary>
-        /// Lists out the available discoverers.
+        /// Filter tests
         /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")]
-        public ArgumentProcessorResult Execute()
+        public static IEnumerable<TestCase> FilterTests(IEnumerable<TestCase> testCases)
         {
-            Contract.Assert(this.output != null);
-            Contract.Assert(this.commandLineOptions != null);
-            Contract.Assert(!string.IsNullOrWhiteSpace(this.runSettingsManager?.ActiveRunSettings?.SettingsXml));
+            EqtTrace.Verbose("TestCaseFilter.FilterTests : Test Filtering invoked.");
 
-            if (!this.commandLineOptions.Sources.Any())
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.MissingTestSourceFile));
-            }
+            List<TestCase> filteredList;
 
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
+            try
             {
-                this.output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
+                filteredList = GetFilteredTestCases(testCases);
             }
-
-            var runSettings = this.runSettingsManager.ActiveRunSettings.SettingsXml;
-
-            this.testRequestManager.DiscoverTests(
-                new DiscoveryRequestPayload { Sources = this.commandLineOptions.Sources, RunSettings = runSettings },
-                this.discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
-
-            if (string.IsNullOrEmpty(this.commandLineOptions.ListTestsTargetPath))
+            catch (Exception ex)
             {
-                // This string does not need to go to Resources. Reason - only internal consumption
-                throw new CommandLineException("Target Path should be specified for listing FQDN tests!");
+                EqtTrace.Error("TestCaseFilter.FilterTests : Exception during filtering : {0}", ex.ToString());
+                throw;
             }
 
-            File.WriteAllLines(this.commandLineOptions.ListTestsTargetPath, this.discoveredTests);
-            return ArgumentProcessorResult.Success;
+            return filteredList;
         }
 
-        #endregion
-
-        private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+        private static void ValidateFilter(string? filterString)
         {
-            private IOutput output;
-            private TestCaseFilter testCasefilter;
-            private List<string> discoveredTests;
-            private CommandLineOptions options;
-
-            public DiscoveryEventsRegistrar(IOutput output, TestCaseFilter filter, List<string> discoveredTests, CommandLineOptions cmdOptions)
+            if (filterString.IsNullOrEmpty())
             {
-                this.output = output;
-                this.testCasefilter = filter;
-                this.discoveredTests = discoveredTests;
-                this.options = cmdOptions;
+                s_filterExpression = null;
+                return;
             }
 
-            public void LogWarning(string message)
-            {
-                ConsoleLogger.RaiseTestRunWarning(message);
-            }
-            public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-            {
-                discoveryRequest.OnDiscoveredTests += this.DiscoveryRequest_OnDiscoveredTests;
-            }
+            var filterWrapper = new FilterExpressionWrapper(filterString);
 
-            public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+            if (filterWrapper.ParseError != null)
             {
-                discoveryRequest.OnDiscoveredTests -= this.DiscoveryRequest_OnDiscoveredTests;
+                var fe = new FormatException($"Invalid Test Case Filter: {filterString}");
+                EqtTrace.Error("TestCaseFilter.ValidateFilter : Filtering failed with exception : " + fe.Message);
+                throw fe;
             }
 
-            private void DiscoveryRequest_OnDiscoveredTests(Object sender, DiscoveredTestsEventArgs args)
-            {
-                if (args == null)
-                {
-                    throw new TestPlatformException("DiscoveredTestsEventArgs cannot be null.");
-                }
+            s_filterExpression = new TestCaseFilterExpression(filterWrapper);
 
-                // Initializing the test case filter here because the filter value is read late.
-                this.testCasefilter.Initialize(this.options.TestCaseFilterValue);
-                var discoveredTests = args.DiscoveredTestCases.ToList();
-                var filteredTests = this.testCasefilter.FilterTests(discoveredTests).ToList();
-
-                // remove any duplicate tests
-                filteredTests = filteredTests.Select(test => test.FullyQualifiedName)
-                                                           .Distinct()
-                                                           .Select(fqdn => filteredTests.First(test => test.FullyQualifiedName == fqdn))
-                                                           .ToList();
-                this.discoveredTests.AddRange(filteredTests.Select(test => test.FullyQualifiedName));
-            }
         }
 
-        private class TestCaseFilter
+        /// <summary>
+        /// get list of test cases that satisfy the filter criteria
+        /// </summary>
+        private static List<TestCase> GetFilteredTestCases(IEnumerable<TestCase> testCases)
         {
-            private static TestCaseFilterExpression filterExpression;
-            private const string TestCategory = "TestCategory";
-            private const string Category = "Category";
-            private const string Traits = "Traits";
-
-            public TestCaseFilter()
-            {
-
-            }
-
-            public void Initialize(string filterString)
-            {
-                ValidateFilter(filterString);
-            }
+            var filteredList = new List<TestCase>();
 
-            /// <summary>
-            /// Filter tests
-            /// </summary>
-            public IEnumerable<TestCase> FilterTests(IEnumerable<TestCase> testCases)
+            if (s_filterExpression == null)
             {
-                EqtTrace.Verbose("TestCaseFilter.FilterTests : Test Filtering invoked.");
-
-                List<TestCase> filteredList;
-
-                try
-                {
-                    filteredList = GetFilteredTestCases(testCases);
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("TestCaseFilter.FilterTests : Exception during filtering : {0}", ex.ToString());
-                    throw;
-                }
-
+                filteredList = testCases.ToList();
                 return filteredList;
             }
 
-            private static void ValidateFilter(string filterString)
+            foreach (var testCase in testCases)
             {
-                if (string.IsNullOrEmpty(filterString))
-                {
-                    filterExpression = null;
-                    return;
-                }
-
-                var filterWrapper = new FilterExpressionWrapper(filterString);
+                var traitDictionary = GetTestPropertiesInTraitDictionary(testCase);// Dictionary with trait key to value mapping
+                traitDictionary = GetTraitsInTraitDictionary(traitDictionary, testCase.Traits);
 
-                if (filterWrapper.ParseError != null)
+                // Skip test if not fitting filter criteria.
+                if (!s_filterExpression.MatchTestCase(testCase, p => PropertyValueProvider(p, traitDictionary)))
                 {
-                    var fe = new FormatException(String.Format("Invalid Test Case Filter: {0}", filterString));
-                    EqtTrace.Error("TestCaseFilter.ValidateFilter : Filtering failed with exception : " + fe.Message);
-                    throw fe;
+                    continue;
                 }
 
-                filterExpression = new TestCaseFilterExpression(filterWrapper);
-
+                filteredList.Add(testCase);
             }
 
-            /// <summary>
-            /// get list of test cases that satisfy the filter criteria
-            /// </summary>
-            private static List<TestCase> GetFilteredTestCases(IEnumerable<TestCase> testCases)
+            return filteredList;
+        }
+
+        /// <summary>
+        /// fetch the test properties on this test method as traits and populate a trait dictionary
+        /// </summary>
+        private static Dictionary<string, List<string>> GetTestPropertiesInTraitDictionary(TestCase testCase)
+        {
+            var traitDictionary = new Dictionary<string, List<string>>();
+            foreach (var testProperty in testCase.Properties)
             {
-                var filteredList = new List<TestCase>();
+                string testPropertyKey = testProperty.Label;
 
-                if (filterExpression == null)
+                if (testPropertyKey.Equals(Traits))
                 {
-                    filteredList = testCases.ToList();
-                    return filteredList;
+                    // skip the "Traits" property. traits to be set separately
+                    continue;
                 }
 
-                foreach (var testCase in testCases)
-                {
-                    var traitDictionary = GetTestPropertiesInTraitDictionary(testCase);// Dictionary with trait key to value mapping
-                    traitDictionary = GetTraitsInTraitDictionary(traitDictionary, testCase.Traits);
+                var testPropertyValue = testCase.GetPropertyValue(testProperty);
 
-                    // Skip test if not fitting filter criteria.
-                    if (!filterExpression.MatchTestCase(testCase, p => PropertyValueProvider(p, traitDictionary)))
+                if (testPropertyKey.Equals(TestCategory))
+                {
+                    if (testPropertyValue is string[] testPropertyValueArray)
                     {
+                        var testPropertyValueList = new List<string>(testPropertyValueArray);
+                        traitDictionary.Add(testPropertyKey, testPropertyValueList);
                         continue;
                     }
-
-                    filteredList.Add(testCase);
                 }
 
-                return filteredList;
-            }
-
-            /// <summary>
-            /// fetch the test properties on this test method as traits and populate a trait dictionary
-            /// </summary>
-            private static Dictionary<string, List<string>> GetTestPropertiesInTraitDictionary(TestCase testCase)
-            {
-                var traitDictionary = new Dictionary<string, List<string>>();
-                foreach (var testProperty in testCase.Properties)
+                //always return value as a list of string
+                if (testPropertyValue != null)
                 {
-                    string testPropertyKey = testProperty.Label;
-
-                    if (testPropertyKey.Equals(Traits))
-                    {
-                        // skip the "Traits" property. traits to be set separately
-                        continue;
-                    }
-
-                    var testPropertyValue = testCase.GetPropertyValue(testProperty);
-
-                    if (testPropertyKey.Equals(TestCategory))
-                    {
-                        var testPropertyValueArray = testPropertyValue as string[];
-                        if (testPropertyValueArray != null)
-                        {
-                            var testPropertyValueList = new List<string>(testPropertyValueArray);
-                            traitDictionary.Add(testPropertyKey, testPropertyValueList);
-                            continue;
-                        }
-                    }
-
-                    //always return value as a list of string
-                    if (testPropertyValue != null)
-                    {
-                        var multiValue = new List<string> { testPropertyValue.ToString() };
-                        traitDictionary.Add(testPropertyKey, multiValue);
-                    }
+                    var multiValue = new List<string> { testPropertyValue.ToString()! };
+                    traitDictionary.Add(testPropertyKey, multiValue);
                 }
-
-                return traitDictionary;
             }
 
-            /// <summary>
-            /// fetch the traits on this test method and populate a trait dictionary
-            /// </summary>
-            private static Dictionary<string, List<string>> GetTraitsInTraitDictionary(Dictionary<string, List<string>> traitDictionary, TraitCollection traits)
+            return traitDictionary;
+        }
+
+        /// <summary>
+        /// fetch the traits on this test method and populate a trait dictionary
+        /// </summary>
+        private static Dictionary<string, List<string>> GetTraitsInTraitDictionary(Dictionary<string, List<string>> traitDictionary, TraitCollection traits)
+        {
+            foreach (var trait in traits)
             {
-                foreach (var trait in traits)
+                var newTraitValueList = new List<string> { trait.Value };
+                if (!traitDictionary.TryGetValue(trait.Name, out List<string>? currentTraitValue))
                 {
-                    var newTraitValueList = new List<string> { trait.Value };
-                    List<string> currentTraitValue;
-                    if (!traitDictionary.TryGetValue(trait.Name, out currentTraitValue))
+                    // if the current trait's key is not already present, add the current trait key-value pair
+                    traitDictionary.Add(trait.Name, newTraitValueList);
+                }
+                else
+                {
+                    if (null == currentTraitValue)
                     {
-                        // if the current trait's key is not already present, add the current trait key-value pair
-                        traitDictionary.Add(trait.Name, newTraitValueList);
+                        // if the current trait's value is null, replace the previous value with the current value
+                        traitDictionary[trait.Name] = newTraitValueList;
                     }
                     else
                     {
-                        if (null == currentTraitValue)
-                        {
-                            // if the current trait's value is null, replace the previous value with the current value
-                            traitDictionary[trait.Name] = newTraitValueList;
-                        }
-                        else
-                        {
-                            // if the current trait's key is already present and is not null, append current value to the previous value list
-                            List<string> traitValueList = currentTraitValue;
-                            traitValueList.Add(trait.Value);
-                        }
+                        // if the current trait's key is already present and is not null, append current value to the previous value list
+                        List<string> traitValueList = currentTraitValue;
+                        traitValueList.Add(trait.Value);
                     }
                 }
+            }
 
-                //This is hack for NUnit, XUnit to understand test category -> This method is called only for NUnit/XUnit
-                if (!traitDictionary.ContainsKey(TestCategory) && traitDictionary.ContainsKey(Category))
-                {
-                    traitDictionary.TryGetValue(Category, out var categoryValue);
-                    traitDictionary.Add(TestCategory, categoryValue);
-                }
-
-                return traitDictionary;
+            //This is hack for NUnit, XUnit to understand test category -> This method is called only for NUnit/XUnit
+            if (!traitDictionary.ContainsKey(TestCategory) && traitDictionary.ContainsKey(Category))
+            {
+                traitDictionary.TryGetValue(Category, out var categoryValue);
+                traitDictionary.Add(TestCategory, categoryValue!);
             }
 
-            /// <summary>
-            /// Provides value for property name 'propertyName' as used in filter.
-            /// </summary>
-            private static string[] PropertyValueProvider(string propertyName, Dictionary<string, List<string>> traitDictionary)
+            return traitDictionary;
+        }
+
+        /// <summary>
+        /// Provides value for property name 'propertyName' as used in filter.
+        /// </summary>
+        private static string[]? PropertyValueProvider(string propertyName, Dictionary<string, List<string>> traitDictionary)
+        {
+            traitDictionary.TryGetValue(propertyName, out List<string>? propertyValueList);
+            if (propertyValueList != null)
             {
-                List<string> propertyValueList;
-                traitDictionary.TryGetValue(propertyName, out propertyValueList);
-                if (propertyValueList != null)
-                {
-                    var propertyValueArray = propertyValueList.ToArray();
+                var propertyValueArray = propertyValueList.ToArray();
 
-                    return propertyValueArray;
-                }
-                return null;
+                return propertyValueArray;
             }
+            return null;
         }
     }
 }
diff --git a/src/vstest.console/Processors/ListTestsArgumentProcessor.cs b/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
index b247c56b5c..18dcba4914 100644
--- a/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListTestsArgumentProcessor.cs
@@ -1,263 +1,229 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Executor for the "-lt|--ListTests|/lt|/ListTests" command line argument.
+/// </summary>
+internal class ListTestsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    /// <summary>
+    /// The short name of the command line argument that the ListTestsArgumentExecutor handles.
+    /// </summary>
+    public const string ShortCommandName = "/lt";
 
     /// <summary>
-    /// Argument Executor for the "-lt|--ListTests|/lt|/ListTests" command line argument.
+    /// The name of the command line argument that the ListTestsArgumentExecutor handles.
     /// </summary>
-    internal class ListTestsArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/ListTests";
 
-        /// <summary>
-        /// The short name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string ShortCommandName = "/lt";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        /// <summary>
-        /// The name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/ListTests";
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListTestsArgumentProcessorCapabilities());
 
-        #endregion
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance));
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+        set => _executor = value;
+    }
+}
 
-        private Lazy<IArgumentExecutor> executor;
+internal class ListTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ListTestsArgumentProcessor.CommandName;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListTestsArgumentProcessorCapabilities());
-                }
+    public override string ShortCommandName => ListTestsArgumentProcessor.ShortCommandName;
 
-                return this.metadata;
-            }
-        }
+    public override bool AllowMultiple => false;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor =
-                        new Lazy<IArgumentExecutor>(
-                            () =>
-                            new ListTestsArgumentExecutor(
-                                CommandLineOptions.Instance,
-                                RunSettingsManager.Instance,
-                                TestRequestManager.Instance));
-                }
-
-                return this.executor;
-            }
+    public override bool IsAction => true;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-    internal class ListTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ListTestsArgumentProcessor.CommandName;
+    public override string HelpContentResourceName => CommandLineResources.ListTestsHelp;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.ListTestsArgumentProcessorHelpPriority;
+}
 
-        public override string ShortCommandName => ListTestsArgumentProcessor.ShortCommandName;
+/// <summary>
+/// Argument Executor for the "/ListTests" command line argument.
+/// </summary>
+internal class ListTestsArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
 
-        public override bool AllowMultiple => false;
+    /// <summary>
+    /// Used for getting tests.
+    /// </summary>
+    private readonly ITestRequestManager _testRequestManager;
 
-        public override bool IsAction => true;
+    /// <summary>
+    /// Used for sending output.
+    /// </summary>
+    internal IOutput Output;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    /// <summary>
+    /// RunSettingsManager to get currently active run settings.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        public override string HelpContentResourceName => CommandLineResources.ListTestsHelp;
+    /// <summary>
+    /// Registers for discovery events during discovery
+    /// </summary>
+    private readonly ITestDiscoveryEventsRegistrar _discoveryEventsRegistrar;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.ListTestsArgumentProcessorHelpPriority;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    /// <param name="runSettingsProvider">Runsettings provider.</param>
+    /// <param name="testRequestManager">Test request manager.</param>
+    public ListTestsArgumentExecutor(
+        CommandLineOptions options,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager) :
+        this(options, runSettingsProvider, testRequestManager, ConsoleOutput.Instance)
+    {
     }
 
     /// <summary>
-    /// Argument Executor for the "/ListTests" command line argument.
+    /// Default constructor.
     /// </summary>
-    internal class ListTestsArgumentExecutor : IArgumentExecutor
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    /// <param name="runSettingsProvider">Run setting provider.</param>
+    /// <param name="output">Output such as console.</param>
+    /// <param name="testRequestManager">Test request manager</param>
+    internal ListTestsArgumentExecutor(
+        CommandLineOptions options,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager,
+        IOutput output)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        /// <summary>
-        /// Used for getting tests.
-        /// </summary>
-        private ITestRequestManager testRequestManager;
-
-        /// <summary>
-        /// Used for sending output.
-        /// </summary>
-        internal IOutput output;
-
-        /// <summary>
-        /// RunSettingsManager to get currently active run settings.
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
-
-        /// <summary>
-        /// Registers for discovery events during discovery
-        /// </summary>
-        private ITestDiscoveryEventsRegistrar discoveryEventsRegistrar;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        public ListTestsArgumentExecutor(
-            CommandLineOptions options,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager) :
-                this(options, runSettingsProvider, testRequestManager, ConsoleOutput.Instance)
-        {
-        }
+        ValidateArg.NotNull(options, nameof(options));
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        internal ListTestsArgumentExecutor(
-            CommandLineOptions options,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager,
-            IOutput output)
-        {
-            Contract.Requires(options != null);
+        _commandLineOptions = options;
+        Output = output;
+        _testRequestManager = testRequestManager;
 
-            this.commandLineOptions = options;
-            this.output = output;
-            this.testRequestManager = testRequestManager;
+        _runSettingsManager = runSettingsProvider;
+        _discoveryEventsRegistrar = new DiscoveryEventsRegistrar(output);
+    }
 
-            this.runSettingsManager = runSettingsProvider;
-            this.discoveryEventsRegistrar = new DiscoveryEventsRegistrar(output);
-        }
+    #region IArgumentExecutor
 
-        #endregion
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (!argument.IsNullOrWhiteSpace())
+        {
+            _commandLineOptions.AddSource(argument);
+        }
+    }
 
-        #region IArgumentExecutor
+    /// <summary>
+    /// Lists out the available discoverers.
+    /// </summary>
+    public ArgumentProcessorResult Execute()
+    {
+        TPDebug.Assert(Output != null);
+        TPDebug.Assert(_commandLineOptions != null);
+        TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(_runSettingsManager?.ActiveRunSettings?.SettingsXml));
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        if (!_commandLineOptions.Sources.Any())
         {
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                this.commandLineOptions.AddSource(argument);
-            }
+            throw new CommandLineException(CommandLineResources.MissingTestSourceFile);
         }
 
-        /// <summary>
-        /// Lists out the available discoverers.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")]
-        public ArgumentProcessorResult Execute()
+        Output.WriteLine(CommandLineResources.ListTestsHeaderMessage, OutputLevel.Information);
+        if (!StringUtils.IsNullOrEmpty(EqtTrace.LogFile))
         {
-            Contract.Assert(this.output != null);
-            Contract.Assert(this.commandLineOptions != null);
-            Contract.Assert(!string.IsNullOrWhiteSpace(this.runSettingsManager?.ActiveRunSettings?.SettingsXml));
+            Output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
+        }
 
-            if (!this.commandLineOptions.Sources.Any())
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.MissingTestSourceFile));
-            }
+        var runSettings = _runSettingsManager.ActiveRunSettings.SettingsXml;
 
-            this.output.WriteLine(CommandLineResources.ListTestsHeaderMessage, OutputLevel.Information);
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
-            {
-                this.output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
-            }
+        _testRequestManager.DiscoverTests(
+            new DiscoveryRequestPayload() { Sources = _commandLineOptions.Sources, RunSettings = runSettings },
+            _discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
 
-            var runSettings = this.runSettingsManager.ActiveRunSettings.SettingsXml;
+        return ArgumentProcessorResult.Success;
+    }
 
-            this.testRequestManager.DiscoverTests(
-                new DiscoveryRequestPayload() { Sources = this.commandLineOptions.Sources, RunSettings = runSettings },
-                this.discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
+    #endregion
 
-            return ArgumentProcessorResult.Success;
-        }
-
-        #endregion
+    private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+    {
+        private readonly IOutput _output;
 
-        private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+        public DiscoveryEventsRegistrar(IOutput output)
         {
-            private IOutput output;
-
-            public DiscoveryEventsRegistrar(IOutput output)
-            {
-                this.output = output;
-            }
+            _output = output;
+        }
 
-            public void LogWarning(string message)
-            {
-                ConsoleLogger.RaiseTestRunWarning(message);
-            }
+        public void LogWarning(string message)
+        {
+            ConsoleLogger.RaiseTestRunWarning(message);
+        }
 
-            public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-            {
-                discoveryRequest.OnDiscoveredTests += this.DiscoveryRequest_OnDiscoveredTests;
-            }
+        public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+        {
+            discoveryRequest.OnDiscoveredTests += DiscoveryRequest_OnDiscoveredTests;
+        }
 
-            public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-            {
-                discoveryRequest.OnDiscoveredTests -= this.DiscoveryRequest_OnDiscoveredTests;
-            }
+        public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+        {
+            discoveryRequest.OnDiscoveredTests -= DiscoveryRequest_OnDiscoveredTests;
+        }
 
-            private void DiscoveryRequest_OnDiscoveredTests(Object sender, DiscoveredTestsEventArgs args)
+        private void DiscoveryRequest_OnDiscoveredTests(object? sender, DiscoveredTestsEventArgs args)
+        {
+            // List out each of the tests.
+            foreach (var test in args.DiscoveredTestCases!)
             {
-                // List out each of the tests.
-                foreach (var test in args.DiscoveredTestCases)
-                {
-                    this.output.WriteLine(String.Format(CultureInfo.CurrentUICulture,
-                                                    CommandLineResources.AvailableTestsFormat,
-                                                    test.DisplayName),
-                                       OutputLevel.Information);
-                }
+                _output.WriteLine(
+                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.AvailableTestsFormat, test.DisplayName),
+                    OutputLevel.Information);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs b/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
index 95e5d71f72..bbb0a8df8a 100644
--- a/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ListTestsTargetPathArgumentProcessor.cs
@@ -1,129 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using System;
 
-    /// <summary>
-    //  An argument processor to provide path to the file for listing fully qualified tests.
-    /// To be used only with ListFullyQualifiedTests
-    /// </summary>
-    internal class ListTestsTargetPathArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        public const string CommandName = "/ListTestsTargetPath";
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        #endregion
+/// <summary>
+///  An argument processor to provide path to the file for listing fully qualified tests.
+/// To be used only with ListFullyQualifiedTests
+/// </summary>
+internal class ListTestsTargetPathArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/ListTestsTargetPath";
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private Lazy<IArgumentExecutor> executor;
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ListTestsTargetPathArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ListTestsTargetPathArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance));
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+        set => _executor = value;
     }
+}
 
-    internal class ListTestsTargetPathArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ListTestsTargetPathArgumentProcessor.CommandName;
-
-        public override bool AllowMultiple => false;
+internal class ListTestsTargetPathArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ListTestsTargetPathArgumentProcessor.CommandName;
 
-        public override bool IsAction => false;
+    public override bool AllowMultiple => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
-    }
+    public override bool IsAction => false;
 
-    internal class ListTestsTargetPathArgumentExecutor : IArgumentExecutor
-    {
-        #region Fields
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+}
 
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
+internal class ListTestsTargetPathArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
 
-        #endregion
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    public ListTestsTargetPathArgumentExecutor(CommandLineOptions options)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        _commandLineOptions = options;
+    }
 
-        #region Constructor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        public ListTestsTargetPathArgumentExecutor(CommandLineOptions options)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            this.commandLineOptions = options;
+            // Not adding this string to resources because this processor is only used internally.
+            throw new CommandLineException("ListTestsTargetPath is required with ListFullyQualifiedTests!");
         }
-        #endregion
-
-        #region IArgumentExecutor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
-        {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                // Not adding this string to resources because this processor is only used internally.
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, "ListTestsTargetPath is required with ListFullyQualifiedTests!"));
-            }
-
-            this.commandLineOptions.ListTestsTargetPath = argument;
-        }
+        _commandLineOptions.ListTestsTargetPath = argument;
+    }
 
-        /// <summary>
-        /// The ListTestsTargetPath is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            return ArgumentProcessorResult.Success;
-        }
-        #endregion
+    /// <summary>
+    /// The ListTestsTargetPath is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
     }
-}
\ No newline at end of file
+    #endregion
+}
diff --git a/src/vstest.console/Processors/ParallelArgumentProcessor.cs b/src/vstest.console/Processors/ParallelArgumentProcessor.cs
index 149b65d313..3b2d880049 100644
--- a/src/vstest.console/Processors/ParallelArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ParallelArgumentProcessor.cs
@@ -1,150 +1,116 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using System;
+using System.Globalization;
 
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    /// <summary>
-    /// Parallel Option Argument processor that allows the user to specify if tests are to be run in parallel.
-    /// </summary>
-    internal class ParallelArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        public const string CommandName = "/Parallel";
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        #endregion
+/// <summary>
+/// Parallel Option Argument processor that allows the user to specify if tests are to be run in parallel.
+/// </summary>
+internal class ParallelArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/Parallel";
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private Lazy<IArgumentExecutor> executor;
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ParallelArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ParallelArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ParallelArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new ParallelArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+        set => _executor = value;
     }
+}
 
-    internal class ParallelArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ParallelArgumentProcessor.CommandName;
+internal class ParallelArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ParallelArgumentProcessor.CommandName;
 
-        public override bool AllowMultiple => false;
+    public override bool AllowMultiple => false;
 
-        public override bool IsAction => false;
+    public override bool IsAction => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override string HelpContentResourceName => CommandLineResources.ParallelArgumentProcessorHelp;
+    public override string HelpContentResourceName => CommandLineResources.ParallelArgumentProcessorHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.ParallelArgumentProcessorHelpPriority;
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.ParallelArgumentProcessorHelpPriority;
+}
 
+/// <summary>
+/// Argument Executor for the "/Parallel" command line argument.
+/// </summary>
+internal class ParallelArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// Argument Executor for the "/Parallel" command line argument.
+    /// Used for getting sources.
     /// </summary>
-    internal class ParallelArgumentExecutor : IArgumentExecutor
-    {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        private IRunSettingsProvider runSettingsManager;
+    private readonly CommandLineOptions _commandLineOptions;
 
-        public const string RunSettingsPath = "RunConfiguration.MaxCpuCount";
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        #endregion
+    public const string RunSettingsPath = "RunConfiguration.MaxCpuCount";
 
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options"> The options. </param>
-        /// <param name="runSettingsManager"> The runsettings manager. </param>
-        public ParallelArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
-        {
-            Contract.Requires(options != null);
-            Contract.Requires(runSettingsManager != null);
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
-        }
-
-        #endregion
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager"> The runsettings manager. </param>
+    public ParallelArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        ValidateArg.NotNull(runSettingsManager, nameof(runSettingsManager));
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+    }
 
-        #region IArgumentExecutor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        // parallel does not require any argument, throws exception if argument specified
+        if (!argument.IsNullOrWhiteSpace())
         {
-            // parallel does not require any argument, throws exception if argument specified
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidParallelCommand, argument));
-            }
-
-            commandLineOptions.Parallel = true;
-            this.runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, "0");
+            throw new CommandLineException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidParallelCommand, argument));
         }
 
-        /// <summary>
-        /// The output path is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            return ArgumentProcessorResult.Success;
-        }
+        _commandLineOptions.Parallel = true;
+        _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, "0");
+    }
 
-        #endregion
+    /// <summary>
+    /// The output path is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
     }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs b/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
index f782207dc8..608f56a4e3 100644
--- a/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ParentProcessIdArgumentProcessor.cs
@@ -1,138 +1,104 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+/// Argument Processor for the "--ParentProcessId|/ParentProcessId" command line argument.
+/// </summary>
+internal class ParentProcessIdArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    /// Argument Processor for the "--ParentProcessId|/ParentProcessId" command line argument.
+    /// The name of the command line argument that the ParentProcessIdArgumentExecutor handles.
     /// </summary>
-    internal class ParentProcessIdArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/ParentProcessId";
 
-        /// <summary>
-        /// The name of the command line argument that the ParentProcessIdArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/ParentProcessId";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        #endregion
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ParentProcessIdArgumentProcessorCapabilities());
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance));
 
-        private Lazy<IArgumentExecutor> executor;
+        set => _executor = value;
+    }
+}
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ParentProcessIdArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+internal class ParentProcessIdArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ParentProcessIdArgumentProcessor.CommandName;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() =>
-                    new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override bool AllowMultiple => false;
 
-    internal class ParentProcessIdArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ParentProcessIdArgumentProcessor.CommandName;
+    public override bool IsAction => false;
 
-        public override bool AllowMultiple => false;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.DesignMode;
 
-        public override bool IsAction => false;
+    public override string HelpContentResourceName => CommandLineResources.ParentProcessIdArgumentHelp;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.DesignMode;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.ParentProcessIdArgumentProcessorHelpPriority;
+}
 
-        public override string HelpContentResourceName => CommandLineResources.ParentProcessIdArgumentHelp;
+/// <summary>
+/// Argument Executor for the "/ParentProcessId" command line argument.
+/// </summary>
+internal class ParentProcessIdArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.ParentProcessIdArgumentProcessorHelpPriority;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    public ParentProcessIdArgumentExecutor(CommandLineOptions options)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        _commandLineOptions = options;
     }
 
     /// <summary>
-    /// Argument Executor for the "/ParentProcessId" command line argument.
+    /// Initializes with the argument that was provided with the command.
     /// </summary>
-    internal class ParentProcessIdArgumentExecutor : IArgumentExecutor
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        public ParentProcessIdArgumentExecutor(CommandLineOptions options)
+        if (argument.IsNullOrWhiteSpace() || !int.TryParse(argument, out int parentProcessId))
         {
-            Contract.Requires(options != null);
-            this.commandLineOptions = options;
+            throw new CommandLineException(CommandLineResources.InvalidParentProcessIdArgument);
         }
 
-        #endregion
-
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
-        {
-            int parentProcessId;
-            if (string.IsNullOrWhiteSpace(argument) || !int.TryParse(argument, out parentProcessId))
-            {
-                throw new CommandLineException(CommandLineResources.InvalidParentProcessIdArgument);
-            }
-
-            this.commandLineOptions.ParentProcessId = parentProcessId;
-        }
+        _commandLineOptions.ParentProcessId = parentProcessId;
+    }
 
-        /// <summary>
-        /// ParentProcessId is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do here, the work was done in initialization.
-            return ArgumentProcessorResult.Success;
-        }
+    /// <summary>
+    /// ParentProcessId is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do here, the work was done in initialization.
+        return ArgumentProcessorResult.Success;
     }
 }
diff --git a/src/vstest.console/Processors/PlatformArgumentProcessor.cs b/src/vstest.console/Processors/PlatformArgumentProcessor.cs
index 0bc418de47..7b4dd50c87 100644
--- a/src/vstest.console/Processors/PlatformArgumentProcessor.cs
+++ b/src/vstest.console/Processors/PlatformArgumentProcessor.cs
@@ -1,180 +1,145 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using System;
+using System.Globalization;
+using System.Linq;
 
-    /// <summary>
-    ///  An argument processor that allows the user to specify the target platform architecture
-    ///  for test run.
-    /// </summary>
-    internal class PlatformArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
 
-        /// <summary>
-        /// The name of the command line argument that the OutputArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Platform";
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        #endregion
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+/// <summary>
+///  An argument processor that allows the user to specify the target platform architecture
+///  for test run.
+/// </summary>
+internal class PlatformArgumentProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the OutputArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/Platform";
 
-        private Lazy<IArgumentExecutor> executor;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new PlatformArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new PlatformArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new PlatformArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new PlatformArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
+
+        set => _executor = value;
     }
+}
 
-    internal class PlatformArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => PlatformArgumentProcessor.CommandName;
-        public override bool AllowMultiple => false;
+internal class PlatformArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => PlatformArgumentProcessor.CommandName;
+    public override bool AllowMultiple => false;
 
-        public override bool IsAction => false;
+    public override bool IsAction => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override string HelpContentResourceName => CommandLineResources.PlatformArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.PlatformArgumentHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.PlatformArgumentProcessorHelpPriority;
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.PlatformArgumentProcessorHelpPriority;
+}
 
+/// <summary>
+/// Argument Executor for the "/Platform" command line argument.
+/// </summary>
+internal class PlatformArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// Argument Executor for the "/Platform" command line argument.
+    /// Used for getting sources.
     /// </summary>
-    internal class PlatformArgumentExecutor : IArgumentExecutor
-    {
-        #region Fields
+    private readonly CommandLineOptions _commandLineOptions;
 
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        private IRunSettingsProvider runSettingsManager;
+    public const string RunSettingsPath = "RunConfiguration.TargetPlatform";
 
-        public const string RunSettingsPath = "RunConfiguration.TargetPlatform";
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager"> The runsettings manager. </param>
+    public PlatformArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        ValidateArg.NotNull(runSettingsManager, nameof(runSettingsManager));
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+    }
 
-        #endregion
 
-        #region Constructor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options"> The options. </param>
-        /// <param name="runSettingsManager"> The runsettings manager. </param>
-        public PlatformArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            Contract.Requires(runSettingsManager != null);
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
+            throw new CommandLineException(CommandLineResources.PlatformTypeRequired);
         }
 
-        #endregion
-
-        #region IArgumentExecutor
+        var validPlatforms = Enum.GetValues(typeof(Architecture)).Cast<Architecture>()
+            .Where(e => e is not Architecture.AnyCPU and not Architecture.Default)
+            .ToList();
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        var validPlatform = Enum.TryParse(argument, true, out Architecture platform);
+        if (validPlatform)
         {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(CommandLineResources.PlatformTypeRequired);
-            }
-
-            var validPlatforms = Enum.GetValues(typeof(Architecture)).Cast<Architecture>()
-                .Where(e => e != Architecture.AnyCPU && e != Architecture.Default)
-                .ToList();
-
-            Architecture platform;
-            var validPlatform = Enum.TryParse(argument, true, out platform);
-            if (validPlatform)
-            {
-                // Ensure that the case-insensitively parsed enum is in the list of valid platforms.
-                // This filters out:
-                //  - values that parse correctly but the enum does not define them (e.g. "1" parses as valid enum value 1)
-                //  - the Default or AnyCpu that are not valid target to provide via settings
-                validPlatform = validPlatforms.Contains(platform);
-            }
-
-            if (validPlatform)
-            {
-                RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
-                this.commandLineOptions.TargetArchitecture = platform;
-                this.runSettingsManager.UpdateRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath, platform.ToString());
-            }
-            else
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidPlatformType, argument, string.Join(", ", validPlatforms)));
-            }
-
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Using platform:{0}", this.commandLineOptions.TargetArchitecture);
-            }
+            // Ensure that the case-insensitively parsed enum is in the list of valid platforms.
+            // This filters out:
+            //  - values that parse correctly but the enum does not define them (e.g. "1" parses as valid enum value 1)
+            //  - the Default or AnyCpu that are not valid target to provide via settings
+            validPlatform = validPlatforms.Contains(platform);
         }
 
-        /// <summary>
-        /// The output path is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
+        if (validPlatform)
         {
-            return ArgumentProcessorResult.Success;
+            RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
+            _commandLineOptions.TargetArchitecture = platform;
+            _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, platform.ToString());
         }
+        else
+        {
+            throw new CommandLineException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidPlatformType, argument, string.Join(", ", validPlatforms)));
+        }
+
+        EqtTrace.Info("Using platform:{0}", _commandLineOptions.TargetArchitecture);
+    }
 
-        #endregion
+    /// <summary>
+    /// The output path is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
     }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/PortArgumentProcessor.cs b/src/vstest.console/Processors/PortArgumentProcessor.cs
index 884cc7a55f..fc05019274 100644
--- a/src/vstest.console/Processors/PortArgumentProcessor.cs
+++ b/src/vstest.console/Processors/PortArgumentProcessor.cs
@@ -1,215 +1,183 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
+extern alias Abstraction;
+
+using System;
+using System.Globalization;
 
-    using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
 
-    using TestPlatformHelpers;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+/// Argument Processor for the "--Port|/Port" command line argument.
+/// </summary>
+internal class PortArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    /// Argument Processor for the "--Port|/Port" command line argument.
+    /// The name of the command line argument that the PortArgumentExecutor handles.
     /// </summary>
-    internal class PortArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/Port";
 
-        /// <summary>
-        /// The name of the command line argument that the PortArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Port";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        #endregion
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new PortArgumentProcessorCapabilities());
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new PortArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance));
 
-        private Lazy<IArgumentExecutor> executor;
+        set => _executor = value;
+    }
+}
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new PortArgumentProcessorCapabilities());
-                }
+internal class PortArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => PortArgumentProcessor.CommandName;
 
-                return this.metadata;
-            }
-        }
+    public override bool AllowMultiple => false;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() =>
-                    new PortArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance));
-                }
+    public override bool IsAction => false;
 
-                return this.executor;
-            }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.DesignMode;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override string HelpContentResourceName => CommandLineResources.PortArgumentHelp;
 
-    internal class PortArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => PortArgumentProcessor.CommandName;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.PortArgumentProcessorHelpPriority;
+}
+
+/// <summary>
+/// Argument Executor for the "/Port" command line argument.
+/// </summary>
+internal class PortArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
+
+    /// <summary>
+    /// Test Request Manager
+    /// </summary>
+    private readonly ITestRequestManager _testRequestManager;
 
-        public override bool AllowMultiple => false;
+    /// <summary>
+    /// Initializes Design mode when called
+    /// </summary>
+    private readonly Func<int, IProcessHelper, IDesignModeClient> _designModeInitializer;
 
-        public override bool IsAction => false;
+    /// <summary>
+    /// IDesignModeClient
+    /// </summary>
+    private IDesignModeClient? _designModeClient;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.DesignMode;
+    /// <summary>
+    /// Process helper for process management actions.
+    /// </summary>
+    private readonly IProcessHelper _processHelper;
 
-        public override string HelpContentResourceName => CommandLineResources.PortArgumentHelp;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    /// <param name="testRequestManager"> Test request manager</param>
+    public PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager)
+        : this(options, testRequestManager, InitializeDesignMode, new ProcessHelper())
+    {
+    }
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.PortArgumentProcessorHelpPriority;
+    /// <summary>
+    /// For Unit testing only
+    /// </summary>
+    internal PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager, IProcessHelper processHelper)
+        : this(options, testRequestManager, InitializeDesignMode, processHelper)
+    {
     }
 
     /// <summary>
-    /// Argument Executor for the "/Port" command line argument.
+    /// For Unit testing only
     /// </summary>
-    internal class PortArgumentExecutor : IArgumentExecutor
+    internal PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager, Func<int, IProcessHelper, IDesignModeClient> designModeInitializer, IProcessHelper processHelper)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        /// <summary>
-        /// Test Request Manager
-        /// </summary>
-        private ITestRequestManager testRequestManager;
-
-        /// <summary>
-        /// Initializes Design mode when called
-        /// </summary>
-        private Func<int, IProcessHelper, IDesignModeClient> designModeInitializer;
-
-        /// <summary>
-        /// IDesignModeClient
-        /// </summary>
-        private IDesignModeClient designModeClient;
-
-        /// <summary>
-        /// Process helper for process management actions.
-        /// </summary>
-        private IProcessHelper processHelper;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        /// <param name="testRequestManager"> Test request manager</param>
-        public PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager)
-            : this(options, testRequestManager, InitializeDesignMode, new ProcessHelper())
-        {
-        }
+        ValidateArg.NotNull(options, nameof(options));
+        _commandLineOptions = options;
+        _testRequestManager = testRequestManager;
+        _designModeInitializer = designModeInitializer;
+        _processHelper = processHelper;
+    }
 
-        /// <summary>
-        /// For Unit testing only
-        /// </summary>
-        internal PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager, IProcessHelper processHelper)
-            : this(options, testRequestManager, InitializeDesignMode, processHelper)
-        {
-        }
 
-        /// <summary>
-        /// For Unit testing only
-        /// </summary>
-        internal PortArgumentExecutor(CommandLineOptions options, ITestRequestManager testRequestManager, Func<int, IProcessHelper, IDesignModeClient> designModeInitializer, IProcessHelper processHelper)
+    #region IArgumentExecutor
+
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace() || !int.TryParse(argument, out int portNumber))
         {
-            Contract.Requires(options != null);
-            this.commandLineOptions = options;
-            this.testRequestManager = testRequestManager;
-            this.designModeInitializer = designModeInitializer;
-            this.processHelper = processHelper;
+            throw new CommandLineException(CommandLineResources.InvalidPortArgument);
         }
 
-        #endregion
-
-        #region IArgumentExecutor
+        _commandLineOptions.Port = portNumber;
+        _commandLineOptions.IsDesignMode = true;
+        RunSettingsHelper.Instance.IsDesignMode = true;
+        _designModeClient = _designModeInitializer?.Invoke(_commandLineOptions.ParentProcessId, _processHelper);
+    }
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initialize the design mode client.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult.Success"/> if initialization is successful. </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        try
         {
-            if (string.IsNullOrWhiteSpace(argument) || !int.TryParse(argument, out int portNumber))
-            {
-                throw new CommandLineException(CommandLineResources.InvalidPortArgument);
-            }
-
-            this.commandLineOptions.Port = portNumber;
-            this.commandLineOptions.IsDesignMode = true;
-            this.designModeClient = this.designModeInitializer?.Invoke(this.commandLineOptions.ParentProcessId, this.processHelper);
+            _designModeClient?.ConnectToClientAndProcessRequests(_commandLineOptions.Port, _testRequestManager);
         }
-
-        /// <summary>
-        /// Initialize the design mode client.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult.Success"/> if initialization is successful. </returns>
-        public ArgumentProcessorResult Execute()
+        catch (TimeoutException ex)
         {
-            try
-            {
-                this.designModeClient?.ConnectToClientAndProcessRequests(this.commandLineOptions.Port, this.testRequestManager);
-            }
-            catch (TimeoutException ex)
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, string.Format(CommandLineResources.DesignModeClientTimeoutError, this.commandLineOptions.Port)), ex);
-            }
-
-            return ArgumentProcessorResult.Success;
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.DesignModeClientTimeoutError, _commandLineOptions.Port), ex);
         }
 
-        #endregion
+        return ArgumentProcessorResult.Success;
+    }
+
+    #endregion
 
-        private static IDesignModeClient InitializeDesignMode(int parentProcessId, IProcessHelper processHelper)
+    private static IDesignModeClient InitializeDesignMode(int parentProcessId, IProcessHelper processHelper)
+    {
+        if (parentProcessId > 0)
         {
-            if (parentProcessId > 0)
+            processHelper.SetExitCallback(parentProcessId, (obj) =>
             {
-                processHelper.SetExitCallback(parentProcessId, (obj) =>
-                {
-                    EqtTrace.Info($"PortArgumentProcessor: parent process:{parentProcessId} exited.");
-                    DesignModeClient.Instance?.HandleParentProcessExit();
-                });
-            }
-
-            DesignModeClient.Initialize();
-            return DesignModeClient.Instance;
+                EqtTrace.Info($"PortArgumentProcessor: parent process:{parentProcessId} exited.");
+                DesignModeClient.Instance?.HandleParentProcessExit();
+            });
         }
+
+        DesignModeClient.Initialize();
+        return DesignModeClient.Instance;
     }
 }
diff --git a/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs b/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
index 5885abf0fe..5226169140 100644
--- a/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ResponseFileArgumentProcessor.cs
@@ -1,68 +1,54 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
+using System;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+///  An argument processor that allows the user to specify additional arguments from a response file.
+///  for test run.
+/// </summary>
+internal class ResponseFileArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    ///  An argument processor that allows the user to specify additional arguments from a response file.
-    ///  for test run.
+    /// The name of the command line argument that the OutputArgumentExecutor handles.
     /// </summary>
-    internal class ResponseFileArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
-
-        /// <summary>
-        /// The name of the command line argument that the OutputArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "@";
-
-        #endregion
-
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public const string CommandName = "@";
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ResponseFileArgumentProcessorCapabilities());
-                }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
 
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ResponseFileArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        /// <remarks>
-        /// As this manipulates the command line arguments themselves, this has no executor.
-        /// </remarks>
-        public Lazy<IArgumentExecutor> Executor { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    /// <remarks>
+    /// As this manipulates the command line arguments themselves, this has no executor.
+    /// </remarks>
+    public Lazy<IArgumentExecutor>? Executor { get; set; }
+}
 
-    internal class ResponseFileArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ResponseFileArgumentProcessor.CommandName;
+internal class ResponseFileArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ResponseFileArgumentProcessor.CommandName;
 
-        public override bool AllowMultiple => true;
+    public override bool AllowMultiple => true;
 
-        public override bool IsAction => false;
+    public override bool IsAction => false;
 
-        public override bool IsSpecialCommand => true;
+    public override bool IsSpecialCommand => true;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        public override string HelpContentResourceName => CommandLineResources.ResponseFileArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.ResponseFileArgumentHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.ResponseFileArgumentProcessorHelpPriority;
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.ResponseFileArgumentProcessorHelpPriority;
 }
diff --git a/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs b/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
index 8d3648f1d7..b7e03835fd 100644
--- a/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ResultsDirectoryArgumentProcessor.cs
@@ -1,170 +1,139 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.IO;
-    using System.Security;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Security;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Allows the user to specify a path to save test results.
+/// </summary>
+internal class ResultsDirectoryArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    /// Allows the user to specify a path to save test results.
+    /// The name of the command line argument that the ListTestsArgumentExecutor handles.
     /// </summary>
-    internal class ResultsDirectoryArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/ResultsDirectory";
 
-        /// <summary>
-        /// The name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/ResultsDirectory";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        private const string RunSettingsPath = "RunConfiguration.ResultsDirectory";
-        #endregion
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new ResultsDirectoryArgumentProcessorCapabilities());
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        private Lazy<IArgumentExecutor> executor;
+        set => _executor = value;
+    }
+}
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new ResultsDirectoryArgumentProcessorCapabilities());
-                }
+/// <summary>
+/// The argument capabilities.
+/// </summary>
+internal class ResultsDirectoryArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ResultsDirectoryArgumentProcessor.CommandName;
 
-                return this.metadata;
-            }
-        }
+    public override bool AllowMultiple => false;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
+    public override bool IsAction => false;
 
-                return this.executor;
-            }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override string HelpContentResourceName => CommandLineResources.ResultsDirectoryArgumentHelp;
 
+    public override HelpContentPriority HelpPriority => HelpContentPriority.ResultsDirectoryArgumentProcessorHelpPriority;
+}
+
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class ResultsDirectoryArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// The argument capabilities.
+    /// Used for getting sources.
     /// </summary>
-    internal class ResultsDirectoryArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => ResultsDirectoryArgumentProcessor.CommandName;
-
-        public override bool AllowMultiple => false;
+    private readonly CommandLineOptions _commandLineOptions;
 
-        public override bool IsAction => false;
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
-
-        public override string HelpContentResourceName => CommandLineResources.ResultsDirectoryArgumentHelp;
-
-        public override HelpContentPriority HelpPriority => HelpContentPriority.ResultsDirectoryArgumentProcessorHelpPriority;
-    }
+    public const string RunSettingsPath = "RunConfiguration.ResultsDirectory";
 
     /// <summary>
-    /// The argument executor.
+    /// Default constructor.
     /// </summary>
-    internal class ResultsDirectoryArgumentExecutor : IArgumentExecutor
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager">Runsettings manager.</param>
+    public ResultsDirectoryArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        private IRunSettingsProvider runSettingsManager;
+        ValidateArg.NotNull(options, nameof(options));
+        ValidateArg.NotNull(runSettingsManager, nameof(runSettingsManager));
 
-        public const string RunSettingsPath = "RunConfiguration.ResultsDirectory";
+        _commandLineOptions = options;
+        _runSettingsManager = runSettingsManager;
+    }
 
-        #endregion
 
-        #region Constructor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options"> The options. </param>
-        /// <param name="testPlatform">The test platform</param>
-        public ResultsDirectoryArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            Contract.Requires(runSettingsManager != null);
-
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
+            throw new CommandLineException(CommandLineResources.ResultsDirectoryValueRequired);
         }
 
-        #endregion
-
-        #region IArgumentExecutor
-
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        try
         {
-            if (string.IsNullOrWhiteSpace(argument))
+            if (!Path.IsPathRooted(argument))
             {
-                throw new CommandLineException(CommandLineResources.ResultsDirectoryValueRequired);
+                argument = Path.GetFullPath(argument);
             }
 
-            try
-            {
-                if (!Path.IsPathRooted(argument))
-                {
-                    argument = Path.GetFullPath(argument);
-                }
-
-                var di = Directory.CreateDirectory(argument);
-            }
-            catch (Exception ex) when( ex is NotSupportedException || ex is SecurityException || ex is ArgumentException || ex is PathTooLongException || ex is IOException)
-            {
-                throw new CommandLineException(string.Format(CommandLineResources.InvalidResultsDirectoryPathCommand, argument, ex.Message));
-            }
-
-            this.commandLineOptions.ResultsDirectory = argument;
-            this.runSettingsManager.UpdateRunSettingsNode(ResultsDirectoryArgumentExecutor.RunSettingsPath, argument);
+            var di = Directory.CreateDirectory(argument);
         }
-
-        /// <summary>
-        /// Executes the argument processor.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/>. </returns>
-        public ArgumentProcessorResult Execute()
+        catch (Exception ex) when (ex is NotSupportedException or SecurityException or ArgumentException or PathTooLongException or IOException)
         {
-            // Nothing to do since we updated the parameter during initialize parameter
-            return ArgumentProcessorResult.Success;
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidResultsDirectoryPathCommand, argument, ex.Message));
         }
 
-        #endregion
+        _commandLineOptions.ResultsDirectory = argument;
+        _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, argument);
     }
+
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/>. </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
+    }
+
+    #endregion
 }
diff --git a/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs b/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
index b06ef8abf8..62597c2c6a 100644
--- a/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunSettingsArgumentProcessor.cs
@@ -1,216 +1,183 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Diagnostics.Contracts;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class RunSettingsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.IO;
-    using System.Text;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    internal class RunSettingsArgumentProcessor : IArgumentProcessor
+    /// <summary>
+    /// The name of the command line argument that the PortArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/Settings";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunSettingsArgumentProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
     {
-        #region Constants
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunSettingsArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
 
-        /// <summary>
-        /// The name of the command line argument that the PortArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/Settings";
+        set => _executor = value;
+    }
+}
 
-        #endregion
+internal class RunSettingsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => RunSettingsArgumentProcessor.CommandName;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public override bool AllowMultiple => false;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override bool IsAction => false;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunSettingsArgumentProcessorCapabilities());
-                }
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.RunSettings;
 
-                return this.metadata;
-            }
-        }
+    public override string HelpContentResourceName => CommandLineResources.RunSettingsArgumentHelp;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance));
-                }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.RunSettingsArgumentProcessorHelpPriority;
+}
 
-                return this.executor;
-            }
+internal class RunSettingsArgumentExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    internal IFileHelper FileHelper { get; set; }
 
-    internal class RunSettingsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    internal RunSettingsArgumentExecutor(CommandLineOptions commandLineOptions, IRunSettingsProvider runSettingsManager)
     {
-        public override string CommandName => RunSettingsArgumentProcessor.CommandName;
-
-        public override bool AllowMultiple => false;
-
-        public override bool IsAction => false;
-
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.RunSettings;
-
-        public override string HelpContentResourceName => CommandLineResources.RunSettingsArgumentHelp;
-
-        public override HelpContentPriority HelpPriority => HelpContentPriority.RunSettingsArgumentProcessorHelpPriority;
+        _commandLineOptions = commandLineOptions;
+        _runSettingsManager = runSettingsManager;
+        FileHelper = new FileHelper();
     }
 
-    internal class RunSettingsArgumentExecutor : IArgumentExecutor
+    public void Initialize(string? argument)
     {
-        private CommandLineOptions commandLineOptions;
-        private IRunSettingsProvider runSettingsManager;
-
-        internal IFileHelper FileHelper { get; set; }
-
-        internal RunSettingsArgumentExecutor(CommandLineOptions commandLineOptions, IRunSettingsProvider runSettingsManager)
+        if (argument.IsNullOrWhiteSpace())
         {
-            this.commandLineOptions = commandLineOptions;
-            this.runSettingsManager = runSettingsManager;
-            this.FileHelper = new FileHelper();
+            throw new CommandLineException(CommandLineResources.RunSettingsRequired);
         }
 
-        public void Initialize(string argument)
+        if (!FileHelper.Exists(argument))
         {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(CommandLineResources.RunSettingsRequired);
-            }
-
-            if (!this.FileHelper.Exists(argument))
-            {
-                throw new CommandLineException(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        CommandLineResources.RunSettingsFileNotFound,
-                        argument));
-            }
-
-            Contract.EndContractBlock();
+            throw new CommandLineException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    CommandLineResources.RunSettingsFileNotFound,
+                    argument));
+        }
 
-            // Load up the run settings and set it as the active run settings.
-            try
-            {
-                XmlDocument document = this.GetRunSettingsDocument(argument);
+        Contract.EndContractBlock();
 
-                this.runSettingsManager.UpdateRunSettings(document.OuterXml);
+        // Load up the run settings and set it as the active run settings.
+        try
+        {
+            XmlDocument document = GetRunSettingsDocument(argument);
 
-                // To determine whether to infer framework and platform.
-                ExtractFrameworkAndPlatform();
+            _runSettingsManager.UpdateRunSettings(document.OuterXml);
 
-                //Add default runsettings values if not exists in given runsettings file.
-                this.runSettingsManager.AddDefaultRunSettings();
+            // To determine whether to infer framework and platform.
+            ExtractFrameworkAndPlatform();
 
-                this.commandLineOptions.SettingsFile = argument;
+            //Add default runsettings values if not exists in given runsettings file.
+            _runSettingsManager.AddDefaultRunSettings();
 
-                if (this.runSettingsManager.QueryRunSettingsNode("RunConfiguration.EnvironmentVariables") != null)
-                {
-                    this.commandLineOptions.InIsolation = true;
-                    this.runSettingsManager.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
-                }
+            _commandLineOptions.SettingsFile = argument;
 
-                var testCaseFilter = this.runSettingsManager.QueryRunSettingsNode("RunConfiguration.TestCaseFilter");
-                if (testCaseFilter != null)
-                {
-                    this.commandLineOptions.TestCaseFilterValue = testCaseFilter;
-                }
-            }
-            catch (XmlException exception)
+            if (_runSettingsManager.QueryRunSettingsNode("RunConfiguration.EnvironmentVariables") != null)
             {
-                throw new SettingsException(
-                        string.Format(CultureInfo.CurrentCulture, "{0} {1}", ObjectModel.Resources.CommonResources.MalformedRunSettingsFile, exception.Message),
-                        exception);
+                _commandLineOptions.InIsolation = true;
+                _runSettingsManager.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
             }
-        }
 
-        private void ExtractFrameworkAndPlatform()
-        {
-            var framworkStr = this.runSettingsManager.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath);
-            Framework framework = Framework.FromString(framworkStr);
-            if (framework != null)
+            var testCaseFilter = _runSettingsManager.QueryRunSettingsNode("RunConfiguration.TestCaseFilter");
+            if (testCaseFilter != null)
             {
-                this.commandLineOptions.TargetFrameworkVersion = framework;
-            }
-
-            var platformStr = this.runSettingsManager.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath);
-            if (Enum.TryParse<Architecture>(platformStr, true, out var architecture))
-            {
-                RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
-                this.commandLineOptions.TargetArchitecture = architecture;
+                _commandLineOptions.TestCaseFilterValue = testCaseFilter;
             }
         }
+        catch (XmlException exception)
+        {
+            throw new SettingsException(
+                string.Format(CultureInfo.CurrentCulture, "{0} {1}", ObjectModel.Resources.CommonResources.MalformedRunSettingsFile, exception.Message),
+                exception);
+        }
+    }
 
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlReaderSettings.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        protected virtual XmlReader GetReaderForFile(string runSettingsFile)
+    private void ExtractFrameworkAndPlatform()
+    {
+        var framworkStr = _runSettingsManager.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath);
+        Framework? framework = Framework.FromString(framworkStr);
+        if (framework != null)
         {
-            return XmlReader.Create(new StringReader(File.ReadAllText(runSettingsFile, Encoding.UTF8)), XmlRunSettingsUtilities.ReaderSettings);
+            _commandLineOptions.TargetFrameworkVersion = framework;
         }
 
-        [SuppressMessage("Microsoft.Security.Xml", "CA3053:UseXmlSecureResolver",
-            Justification = "XmlDocument.XmlResolver is not available in core. Suppress until fxcop issue is fixed.")]
-        private XmlDocument GetRunSettingsDocument(string runSettingsFile)
+        var platformStr = _runSettingsManager.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath);
+        if (Enum.TryParse<Architecture>(platformStr, true, out var architecture))
         {
-            XmlDocument runSettingsDocument;
+            RunSettingsHelper.Instance.IsDefaultTargetArchitecture = false;
+            _commandLineOptions.TargetArchitecture = architecture;
+        }
+    }
 
-            if (!MSTestSettingsUtilities.IsLegacyTestSettingsFile(runSettingsFile))
-            {
-                using (XmlReader reader = this.GetReaderForFile(runSettingsFile))
-                {
-                    var settingsDocument = new XmlDocument();
-                    settingsDocument.Load(reader);
-                    ClientUtilities.FixRelativePathsInRunSettings(settingsDocument, runSettingsFile);
-                    runSettingsDocument = settingsDocument;
-                }
-            }
-            else
-            {
-                runSettingsDocument = XmlRunSettingsUtilities.CreateDefaultRunSettings();
-                runSettingsDocument = MSTestSettingsUtilities.Import(runSettingsFile, runSettingsDocument);
-            }
+    protected virtual XmlReader GetReaderForFile(string runSettingsFile)
+    {
+        return XmlReader.Create(new StringReader(File.ReadAllText(runSettingsFile, Encoding.UTF8)), XmlRunSettingsUtilities.ReaderSettings);
+    }
 
-            return runSettingsDocument;
-        }
+    private XmlDocument GetRunSettingsDocument(string runSettingsFile)
+    {
+        XmlDocument runSettingsDocument;
 
-        public ArgumentProcessorResult Execute()
+        if (!MSTestSettingsUtilities.IsLegacyTestSettingsFile(runSettingsFile))
+        {
+            using XmlReader reader = GetReaderForFile(runSettingsFile);
+            var settingsDocument = new XmlDocument();
+            settingsDocument.Load(reader);
+            ClientUtilities.FixRelativePathsInRunSettings(settingsDocument, runSettingsFile);
+            runSettingsDocument = settingsDocument;
+        }
+        else
         {
-            // Nothing to do here, the work was done in initialization.
-            return ArgumentProcessorResult.Success;
+            runSettingsDocument = XmlRunSettingsUtilities.CreateDefaultRunSettings();
+            runSettingsDocument = MSTestSettingsUtilities.Import(runSettingsFile, runSettingsDocument);
         }
+
+        return runSettingsDocument;
+    }
+
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do here, the work was done in initialization.
+        return ArgumentProcessorResult.Success;
     }
 }
diff --git a/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs b/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
index 96e3e44223..e3aba77d0a 100644
--- a/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunSpecificTestsArgumentProcessor.cs
@@ -1,396 +1,379 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class RunSpecificTestsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using CommandLineResources = Resources.Resources;
-
-    internal class RunSpecificTestsArgumentProcessor : IArgumentProcessor
-    {
-        public const string CommandName = "/Tests";
-
-        private Lazy<IArgumentProcessorCapabilities> metadata;
-
-        private Lazy<IArgumentExecutor> executor;
-
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunSpecificTestsArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    public const string CommandName = "/Tests";
 
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() =>
-                    new RunSpecificTestsArgumentExecutor(
-                        CommandLineOptions.Instance,
-                        RunSettingsManager.Instance,
-                        TestRequestManager.Instance,
-                        ConsoleOutput.Instance));
-                }
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-                return this.executor;
-            }
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunSpecificTestsArgumentProcessorCapabilities());
 
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
-
-    internal class RunSpecificTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    public Lazy<IArgumentExecutor>? Executor
     {
-        public override string CommandName => RunSpecificTestsArgumentProcessor.CommandName;
-
-        public override bool IsAction => true;
-
-        public override bool AllowMultiple => false;
-
-        public override string HelpContentResourceName => CommandLineResources.RunSpecificTestsHelp;
-
-        public override HelpContentPriority HelpPriority => HelpContentPriority.RunSpecificTestsArgumentProcessorHelpPriority;
-
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunSpecificTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
+                ConsoleOutput.Instance));
+
+        set => _executor = value;
     }
+}
 
-    internal class RunSpecificTestsArgumentExecutor : IArgumentExecutor
-    {
-        public const char SplitDelimiter = ',';
-        public const char EscapeDelimiter = '\\';
-
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        /// <summary>
-        /// The instance of testPlatforms
-        /// </summary>
-        private ITestRequestManager testRequestManager;
-
-        /// <summary>
-        /// Used for sending output.
-        /// </summary>
-        internal IOutput output;
-
-        /// <summary>
-        /// RunSettingsManager to get currently active run settings.
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
+internal class RunSpecificTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => RunSpecificTestsArgumentProcessor.CommandName;
 
-        /// <summary>
-        /// Given Collection of strings for filtering test cases
-        /// </summary>
-        private Collection<string> selectedTestNames;
+    public override bool IsAction => true;
 
-        /// <summary>
-        /// Used for tracking the total no. of tests discovered from the given sources.
-        /// </summary>
-        private long discoveredTestCount = 0;
+    public override bool AllowMultiple => false;
 
-        /// <summary>
-        /// Collection of test cases that match at least one of the given search strings
-        /// </summary>
-        private Collection<TestCase> selectedTestCases = new Collection<TestCase>();
+    public override string HelpContentResourceName => CommandLineResources.RunSpecificTestsHelp;
 
-        /// <summary>
-        /// Effective run settings applicable to test run after inferring the multi-targeting settings.
-        /// </summary>
-        private string effectiveRunSettings = null;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.RunSpecificTestsArgumentProcessorHelpPriority;
 
-        /// <summary>
-        /// List of filters that have not yet been discovered
-        /// </summary>
-        HashSet<string> undiscoveredFilters = new HashSet<string>();
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+}
 
-        /// <summary>
-        /// Registers for discovery events during discovery
-        /// </summary>
-        private ITestDiscoveryEventsRegistrar discoveryEventsRegistrar;
+internal class RunSpecificTestsArgumentExecutor : IArgumentExecutor
+{
+    public const char SplitDelimiter = ',';
+    public const char EscapeDelimiter = '\\';
+
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
+
+    /// <summary>
+    /// The instance of testPlatforms
+    /// </summary>
+    private readonly ITestRequestManager _testRequestManager;
+
+    /// <summary>
+    /// Used for sending output.
+    /// </summary>
+    internal IOutput Output;
+
+    /// <summary>
+    /// RunSettingsManager to get currently active run settings.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
+
+    /// <summary>
+    /// Given Collection of strings for filtering test cases
+    /// </summary>
+    private Collection<string>? _selectedTestNames;
+
+    /// <summary>
+    /// Used for tracking the total no. of tests discovered from the given sources.
+    /// </summary>
+    private long _discoveredTestCount;
+
+    /// <summary>
+    /// Collection of test cases that match at least one of the given search strings
+    /// </summary>
+    private readonly Collection<TestCase> _selectedTestCases = new();
+
+    /// <summary>
+    /// Effective run settings applicable to test run after inferring the multi-targeting settings.
+    /// </summary>
+    private string? _effectiveRunSettings;
+
+    /// <summary>
+    /// List of filters that have not yet been discovered
+    /// </summary>
+    HashSet<string> _undiscoveredFilters = new();
+
+    /// <summary>
+    /// Registers for discovery events during discovery
+    /// </summary>
+    private readonly ITestDiscoveryEventsRegistrar _discoveryEventsRegistrar;
+
+    /// <summary>
+    /// Registers and Unregisters for test run events before and after test run
+    /// </summary>
+    private readonly ITestRunEventsRegistrar _testRunEventsRegistrar;
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public RunSpecificTestsArgumentExecutor(
+        CommandLineOptions options,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager,
+        IArtifactProcessingManager artifactProcessingManager,
+        IOutput output)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        ValidateArg.NotNull(testRequestManager, nameof(testRequestManager));
 
-        /// <summary>
-        /// Registers and Unregisters for test run events before and after test run
-        /// </summary>
-        private ITestRunEventsRegistrar testRunEventsRegistrar;
+        _commandLineOptions = options;
+        _testRequestManager = testRequestManager;
 
-        #endregion
+        _runSettingsManager = runSettingsProvider;
+        Output = output;
+        _discoveryEventsRegistrar = new DiscoveryEventsRegistrar(DiscoveryRequest_OnDiscoveredTests);
+        _testRunEventsRegistrar = new TestRunRequestEventsRegistrar(Output, _commandLineOptions, artifactProcessingManager);
+    }
 
-        #region Constructor
+    #region IArgumentProcessor
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public RunSpecificTestsArgumentExecutor(
-            CommandLineOptions options,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager,
-            IOutput output)
+    /// <summary>
+    /// Splits given the search strings and adds to selectTestNamesCollection.
+    /// </summary>
+    /// <param name="argument"></param>
+    [MemberNotNull(nameof(_selectedTestNames))]
+    public void Initialize(string? argument)
+    {
+        if (!argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            Contract.Requires(testRequestManager != null);
-
-            this.commandLineOptions = options;
-            this.testRequestManager = testRequestManager;
-
-            this.runSettingsManager = runSettingsProvider;
-            this.output = output;
-            this.discoveryEventsRegistrar = new DiscoveryEventsRegistrar(this.DiscoveryRequest_OnDiscoveredTests);
-            this.testRunEventsRegistrar = new TestRunRequestEventsRegistrar(this.output, this.commandLineOptions);
+            _selectedTestNames = new Collection<string>(
+                argument.Tokenize(SplitDelimiter, EscapeDelimiter)
+                    .Where(x => !StringUtils.IsNullOrWhiteSpace(x))
+                    .Select(s => s.Trim()).ToList());
         }
 
-        #endregion
-
-        #region IArgumentProcessor
-
-        /// <summary>
-        /// Splits given the search strings and adds to selectTestNamesCollection.
-        /// </summary>
-        /// <param name="argument"></param>
-        public void Initialize(string argument)
+        if (_selectedTestNames == null || _selectedTestNames.Count <= 0)
         {
-            if (!string.IsNullOrWhiteSpace(argument))
-            {
-                this.selectedTestNames = new Collection<string>(
-                    argument.Tokenize(SplitDelimiter, EscapeDelimiter)
-                        .Where(x => !string.IsNullOrWhiteSpace(x))
-                        .Select(s => s.Trim()).ToList());
-            }
+            throw new CommandLineException(CommandLineResources.SpecificTestsRequired);
+        }
 
-            if (this.selectedTestNames == null || this.selectedTestNames.Count <= 0)
-            {
-                throw new CommandLineException(CommandLineResources.SpecificTestsRequired);
-            }
+        // by default all filters are not discovered on launch
+        _undiscoveredFilters = new HashSet<string>(_selectedTestNames);
+    }
 
-            // by default all filters are not discovered on launch
-            this.undiscoveredFilters = new HashSet<string>(this.selectedTestNames);
-        }
+    /// <summary>
+    /// Execute specific tests that match any of the given strings.
+    /// </summary>
+    /// <returns></returns>
+    public ArgumentProcessorResult Execute()
+    {
+        TPDebug.Assert(Output != null);
+        TPDebug.Assert(_commandLineOptions != null);
+        TPDebug.Assert(_testRequestManager != null);
+        TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(_runSettingsManager.ActiveRunSettings?.SettingsXml));
 
-        /// <summary>
-        /// Execute specific tests that match any of the given strings.
-        /// </summary>
-        /// <returns></returns>
-        public ArgumentProcessorResult Execute()
+        if (!_commandLineOptions.Sources.Any())
         {
-            Contract.Assert(this.output != null);
-            Contract.Assert(this.commandLineOptions != null);
-            Contract.Assert(this.testRequestManager != null);
-            Contract.Assert(!string.IsNullOrWhiteSpace(this.runSettingsManager.ActiveRunSettings.SettingsXml));
+            throw new CommandLineException(CommandLineResources.MissingTestSourceFile);
+        }
 
-            if (!this.commandLineOptions.Sources.Any())
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.MissingTestSourceFile));
-            }
+        _effectiveRunSettings = _runSettingsManager.ActiveRunSettings.SettingsXml;
 
-            this.effectiveRunSettings = this.runSettingsManager.ActiveRunSettings.SettingsXml;
+        // Discover tests from sources and filter on every discovery reported.
+        DiscoverTestsAndSelectSpecified(_commandLineOptions.Sources);
 
-            // Discover tests from sources and filter on every discovery reported.
-            this.DiscoverTestsAndSelectSpecified(this.commandLineOptions.Sources);
+        // Now that tests are discovered and filtered, we run only those selected tests.
+        ExecuteSelectedTests();
 
-            // Now that tests are discovered and filtered, we run only those selected tests.
-            this.ExecuteSelectedTests();
+        bool treatNoTestsAsError = RunSettingsUtilities.GetTreatNoTestsAsError(_effectiveRunSettings);
 
-            bool treatNoTestsAsError = RunSettingsUtilities.GetTreatNoTestsAsError(effectiveRunSettings);
+        return treatNoTestsAsError && _selectedTestCases.Count == 0 ? ArgumentProcessorResult.Fail : ArgumentProcessorResult.Success;
+    }
 
-            if (treatNoTestsAsError && this.selectedTestCases.Count == 0)
-            {
-                return ArgumentProcessorResult.Fail;
-            }
+    #endregion
 
-            return ArgumentProcessorResult.Success;
+    /// <summary>
+    /// Discovers tests from the given sources and selects only specified tests.
+    /// </summary>
+    /// <param name="sources"> Test source assemblies paths. </param>
+    private void DiscoverTestsAndSelectSpecified(IEnumerable<string> sources)
+    {
+        if (Environment.GetEnvironmentVariable("VSTEST_MSBUILD_NOLOGO") != "1")
+        {
+            Output.WriteLine(CommandLineResources.StartingDiscovery, OutputLevel.Information);
         }
 
-        #endregion
+        if (!StringUtils.IsNullOrEmpty(EqtTrace.LogFile))
+        {
+            Output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
+        }
 
-        #region Private Methods
+        _testRequestManager.DiscoverTests(
+            new DiscoveryRequestPayload() { Sources = sources, RunSettings = _effectiveRunSettings }, _discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
+    }
 
-        /// <summary>
-        /// Discovers tests from the given sources and selects only specified tests.
-        /// </summary>
-        /// <param name="sources"> Test source assemblies paths. </param>
-        private void DiscoverTestsAndSelectSpecified(IEnumerable<string> sources)
+    /// <summary>
+    ///  Executes the selected tests
+    /// </summary>
+    private void ExecuteSelectedTests()
+    {
+        if (_selectedTestCases.Count > 0)
         {
-            this.output.WriteLine(CommandLineResources.StartingDiscovery, OutputLevel.Information);
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
+            if (_undiscoveredFilters.Count != 0)
             {
-                this.output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
+                string missingFilters = string.Join(", ", _undiscoveredFilters);
+                string warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.SomeTestsUnavailableAfterFiltering, _discoveredTestCount, missingFilters);
+                Output.Warning(false, warningMessage);
             }
 
-            this.testRequestManager.DiscoverTests(
-                new DiscoveryRequestPayload() { Sources = sources, RunSettings = this.effectiveRunSettings }, this.discoveryEventsRegistrar, Constants.DefaultProtocolConfig);
-        }
+            // for command line keep alive is always false.
+            bool keepAlive = false;
 
-        /// <summary>
-        ///  Executes the selected tests
-        /// </summary>
-        private void ExecuteSelectedTests()
+            EqtTrace.Verbose("RunSpecificTestsArgumentProcessor:Execute: Test run is queued.");
+            var runRequestPayload = new TestRunRequestPayload() { TestCases = _selectedTestCases.ToList(), RunSettings = _effectiveRunSettings, KeepAlive = keepAlive, TestPlatformOptions = new TestPlatformOptions() { TestCaseFilter = _commandLineOptions.TestCaseFilterValue } };
+            _testRequestManager.RunTests(runRequestPayload, null, _testRunEventsRegistrar, Constants.DefaultProtocolConfig);
+        }
+        else
         {
-            if (this.selectedTestCases.Count > 0)
+            string warningMessage;
+            if (_discoveredTestCount > 0)
             {
-                if (this.undiscoveredFilters.Count != 0)
-                {
-                    string missingFilters = string.Join(", ", this.undiscoveredFilters);
-                    string warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.SomeTestsUnavailableAfterFiltering, this.discoveredTestCount, missingFilters);
-                    this.output.Warning(false, warningMessage);
-                }
-
-                // for command line keep alive is always false.
-                bool keepAlive = false;
-
-                EqtTrace.Verbose("RunSpecificTestsArgumentProcessor:Execute: Test run is queued.");
-                var runRequestPayload = new TestRunRequestPayload() { TestCases = this.selectedTestCases.ToList(), RunSettings = this.effectiveRunSettings, KeepAlive = keepAlive, TestPlatformOptions = new TestPlatformOptions() { TestCaseFilter = this.commandLineOptions.TestCaseFilterValue }};
-                this.testRequestManager.RunTests(runRequestPayload, null, this.testRunEventsRegistrar, Constants.DefaultProtocolConfig);
+                // No tests that matched any of the given strings.
+                warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoTestsAvailableAfterFiltering, _discoveredTestCount, string.Join(", ", _selectedTestNames!));
             }
             else
             {
-                string warningMessage;
-                if (this.discoveredTestCount > 0)
-                {
-                    // No tests that matched any of the given strings.
-                    warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoTestsAvailableAfterFiltering, this.discoveredTestCount, string.Join(", ", this.selectedTestNames));
-                }
-                else
-                {
-                    // No tests were discovered from the given sources.
-                    warningMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.NoTestsAvailableInSources, string.Join(", ", this.commandLineOptions.Sources));
+                // No tests were discovered from the given sources.
+                warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.NoTestsAvailableInSources, string.Join(", ", _commandLineOptions.Sources));
 
-                    if (string.IsNullOrEmpty(this.commandLineOptions.TestAdapterPath))
-                    {
-                        warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.StringFormatToJoinTwoStrings, warningMessage, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
-                    }
+                if (!_commandLineOptions.TestAdapterPathsSet)
+                {
+                    warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.StringFormatToJoinTwoStrings, warningMessage, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
                 }
-
-                this.output.Warning(false, warningMessage);
             }
+
+            Output.Warning(false, warningMessage);
         }
+    }
 
-        /// <summary>
-        /// Filter discovered tests and find matching tests from given search strings.
-        /// Any name of the test that can match multiple strings will be added only once.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        private void DiscoveryRequest_OnDiscoveredTests(object sender, DiscoveredTestsEventArgs args)
+    /// <summary>
+    /// Filter discovered tests and find matching tests from given search strings.
+    /// Any name of the test that can match multiple strings will be added only once.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    private void DiscoveryRequest_OnDiscoveredTests(object? sender, DiscoveredTestsEventArgs args)
+    {
+        TPDebug.Assert(_selectedTestNames != null, "Initialize should have been called");
+        TPDebug.Assert(args.DiscoveredTestCases != null);
+
+        _discoveredTestCount += args.DiscoveredTestCases.Count();
+        foreach (var testCase in args.DiscoveredTestCases!)
         {
-            this.discoveredTestCount += args.DiscoveredTestCases.Count();
-            foreach (var testCase in args.DiscoveredTestCases)
+            foreach (var nameCriteria in _selectedTestNames)
             {
-                foreach (var nameCriteria in this.selectedTestNames)
+                if (testCase.FullyQualifiedName.IndexOf(nameCriteria, StringComparison.OrdinalIgnoreCase) != -1)
                 {
-                    if (testCase.FullyQualifiedName.IndexOf(nameCriteria, StringComparison.OrdinalIgnoreCase) != -1)
-                    {
-                        this.selectedTestCases.Add(testCase);
-
-                        // If a testcase matched then a filter matched - so remove the filter from not found list
-                        this.undiscoveredFilters.Remove(nameCriteria);
-                        break;
-                    }
+                    _selectedTestCases.Add(testCase);
+
+                    // If a testcase matched then a filter matched - so remove the filter from not found list
+                    _undiscoveredFilters.Remove(nameCriteria);
+                    break;
                 }
             }
         }
+    }
+
+    private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+    {
+        private readonly EventHandler<DiscoveredTestsEventArgs> _discoveredTestsHandler;
 
-        #endregion
+        public DiscoveryEventsRegistrar(EventHandler<DiscoveredTestsEventArgs> discoveredTestsHandler)
+        {
+            _discoveredTestsHandler = discoveredTestsHandler;
+        }
 
-        private class DiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+        public void LogWarning(string message)
         {
-            private EventHandler<DiscoveredTestsEventArgs> discoveredTestsHandler;
+            ConsoleLogger.RaiseTestRunWarning(message);
+        }
 
-            public DiscoveryEventsRegistrar(EventHandler<DiscoveredTestsEventArgs> discoveredTestsHandler)
-            {
-                this.discoveredTestsHandler = discoveredTestsHandler;
-            }
+        public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+        {
+            discoveryRequest.OnDiscoveredTests += _discoveredTestsHandler;
+        }
 
-            public void LogWarning(string message)
-            {
-                ConsoleLogger.RaiseTestRunWarning(message);
-            }
+        public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+        {
+            discoveryRequest.OnDiscoveredTests -= _discoveredTestsHandler;
+        }
+    }
 
-            public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-            {
-                discoveryRequest.OnDiscoveredTests += this.discoveredTestsHandler;
-            }
+    private class TestRunRequestEventsRegistrar : ITestRunEventsRegistrar
+    {
+        private readonly IOutput _output;
+        private readonly CommandLineOptions _commandLineOptions;
+        private readonly IArtifactProcessingManager _artifactProcessingManager;
 
-            public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
-            {
-                discoveryRequest.OnDiscoveredTests -= this.discoveredTestsHandler;
-            }
+        public TestRunRequestEventsRegistrar(IOutput output, CommandLineOptions commandLineOptions, IArtifactProcessingManager artifactProcessingManager)
+        {
+            _output = output;
+            _commandLineOptions = commandLineOptions;
+            _artifactProcessingManager = artifactProcessingManager;
         }
 
-        private class TestRunRequestEventsRegistrar : ITestRunEventsRegistrar
+        public void LogWarning(string message)
         {
-            private IOutput output;
-            private CommandLineOptions commandLineOptions;
+            ConsoleLogger.RaiseTestRunWarning(message);
+        }
 
-            public TestRunRequestEventsRegistrar(IOutput output, CommandLineOptions commandLineOptions)
-            {
-                this.output = output;
-                this.commandLineOptions = commandLineOptions;
-            }
+        public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+        {
+            testRunRequest.OnRunCompletion += TestRunRequest_OnRunCompletion;
+        }
 
-            public void LogWarning(string message)
-            {
-                ConsoleLogger.RaiseTestRunWarning(message);
-            }
+        public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+        {
+            testRunRequest.OnRunCompletion -= TestRunRequest_OnRunCompletion;
+        }
 
-            public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+        /// <summary>
+        /// Handles the TestRunRequest complete event
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e">RunCompletion args</param>
+        private void TestRunRequest_OnRunCompletion(object? sender, TestRunCompleteEventArgs e)
+        {
+            // If run is not aborted/canceled then check the count of executed tests.
+            // we need to check if there are any tests executed - to try show some help info to user to check for installed vsix extensions
+            if (!e.IsAborted && !e.IsCanceled)
             {
-                testRunRequest.OnRunCompletion += TestRunRequest_OnRunCompletion;
-            }
+                var testsFoundInAnySource = e.TestRunStatistics != null && (e.TestRunStatistics.ExecutedTests > 0);
 
-            public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
-            {
-                testRunRequest.OnRunCompletion -= TestRunRequest_OnRunCompletion;
+                // Indicate the user to use testadapterpath command if there are no tests found
+                if (!testsFoundInAnySource && !CommandLineOptions.Instance.TestAdapterPathsSet && _commandLineOptions.TestCaseFilterValue == null)
+                {
+                    _output.Warning(false, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
+                }
             }
 
-            /// <summary>
-            /// Handles the TestRunRequest complete event
-            /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e">RunCompletion args</param>
-            private void TestRunRequest_OnRunCompletion(object sender, TestRunCompleteEventArgs e)
+            // Collect tests session artifacts for post processing
+            if (_commandLineOptions.ArtifactProcessingMode == ArtifactProcessingMode.Collect)
             {
-                // If run is not aborted/canceled then check the count of executed tests.
-                // we need to check if there are any tests executed - to try show some help info to user to check for installed vsix extensions
-                if (!e.IsAborted && !e.IsCanceled)
-                {
-                    var testsFoundInAnySource = (e.TestRunStatistics == null) ? false : (e.TestRunStatistics.ExecutedTests > 0);
-
-                    // Indicate the user to use testadapterpath command if there are no tests found
-                    if (!testsFoundInAnySource && string.IsNullOrEmpty(CommandLineOptions.Instance.TestAdapterPath) && this.commandLineOptions.TestCaseFilterValue == null)
-                    {
-                        this.output.Warning(false, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
-                    }
-                }
+                TPDebug.Assert(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml is not null, "RunSettingsManager.Instance.ActiveRunSettings.SettingsXml is null");
+                _artifactProcessingManager.CollectArtifacts(e, RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/vstest.console/Processors/RunTestsArgumentProcessor.cs b/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
index 4e624019f2..2ac81b3d48 100644
--- a/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/RunTestsArgumentProcessor.cs
@@ -1,267 +1,238 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class RunTestsArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-
-    using CommandLineResources = Resources.Resources;
-
-    internal class RunTestsArgumentProcessor : IArgumentProcessor
-    {
-        public const string CommandName = "/RunTests";
-
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public const string CommandName = "/RunTests";
 
-        private Lazy<IArgumentExecutor> executor;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new RunTestsArgumentProcessorCapabilities());
-                }
-                return this.metadata;
-            }
-        }
-
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() =>
-                    new RunTestsArgumentExecutor(
-                        CommandLineOptions.Instance,
-                        RunSettingsManager.Instance,
-                        TestRequestManager.Instance,
-                        ConsoleOutput.Instance));
-                }
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new RunTestsArgumentProcessorCapabilities());
 
-                return this.executor;
-            }
-            set
-            {
-                this.executor = value;
-            }
-        }
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new RunTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                RunSettingsManager.Instance,
+                TestRequestManager.Instance,
+                new ArtifactProcessingManager(CommandLineOptions.Instance.TestSessionCorrelationId),
+                ConsoleOutput.Instance));
+
+        set => _executor = value;
     }
+}
 
-    internal class RunTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => RunTestsArgumentProcessor.CommandName;
+internal class RunTestsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => RunTestsArgumentProcessor.CommandName;
 
-        public override bool AllowMultiple => false;
+    public override bool AllowMultiple => false;
 
-        public override bool IsAction => true;
+    public override bool IsAction => true;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        public override string HelpContentResourceName => CommandLineResources.RunTestsArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.RunTestsArgumentHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.RunTestsArgumentProcessorHelpPriority;
+    public override HelpContentPriority HelpPriority => HelpContentPriority.RunTestsArgumentProcessorHelpPriority;
 
-        public override bool IsSpecialCommand => true;
+    public override bool IsSpecialCommand => true;
 
-        public override bool AlwaysExecute => false;
-    }
+    public override bool AlwaysExecute => false;
+}
 
-    internal class RunTestsArgumentExecutor : IArgumentExecutor
+internal class RunTestsArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting tests to run.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
+
+    /// <summary>
+    /// The instance of testPlatforms
+    /// </summary>
+    private readonly ITestRequestManager _testRequestManager;
+
+    /// <summary>
+    /// Used for sending discovery messages.
+    /// </summary>
+    internal IOutput Output;
+
+    /// <summary>
+    /// Settings manager to get currently active settings.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
+
+    /// <summary>
+    /// Registers and Unregisters for test run events before and after test run
+    /// </summary>
+    private readonly ITestRunEventsRegistrar _testRunEventsRegistrar;
+
+    /// <summary>
+    /// Shows the number of tests which were executed
+    /// </summary>
+    private static long s_numberOfExecutedTests;
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public RunTestsArgumentExecutor(
+        CommandLineOptions commandLineOptions,
+        IRunSettingsProvider runSettingsProvider,
+        ITestRequestManager testRequestManager,
+        IArtifactProcessingManager artifactProcessingManager,
+        IOutput output)
     {
-        #region Fields
+        ValidateArg.NotNull(commandLineOptions, nameof(commandLineOptions));
 
-        /// <summary>
-        /// Used for getting tests to run.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        /// <summary>
-        /// The instance of testPlatforms
-        /// </summary>
-        private ITestRequestManager testRequestManager;
-
-        /// <summary>
-        /// Used for sending discovery messages.
-        /// </summary>
-        internal IOutput output;
-
-        /// <summary>
-        /// Settings manager to get currently active settings.
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
-
-        /// <summary>
-        /// Registers and Unregisters for test run events before and after test run
-        /// </summary>
-        private ITestRunEventsRegistrar testRunEventsRegistrar;
-        
-        /// <summary>
-        /// Shows the number of tests which were executed
-        /// </summary>
-        private static long numberOfExecutedTests;
+        _commandLineOptions = commandLineOptions;
+        _runSettingsManager = runSettingsProvider;
+        _testRequestManager = testRequestManager;
+        Output = output;
+        _testRunEventsRegistrar = new TestRunRequestEventsRegistrar(Output, _commandLineOptions, artifactProcessingManager);
+    }
 
-        #endregion
+    public void Initialize(string? argument)
+    {
+        // Nothing to do.
+    }
 
-        #region Constructor
+    /// <summary>
+    /// Execute all of the tests.
+    /// </summary>
+    public ArgumentProcessorResult Execute()
+    {
+        TPDebug.Assert(_commandLineOptions != null);
+        TPDebug.Assert(!StringUtils.IsNullOrWhiteSpace(_runSettingsManager?.ActiveRunSettings?.SettingsXml));
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public RunTestsArgumentExecutor(
-            CommandLineOptions commandLineOptions,
-            IRunSettingsProvider runSettingsProvider,
-            ITestRequestManager testRequestManager,
-            IOutput output)
+        if (_commandLineOptions.IsDesignMode)
         {
-            Contract.Requires(commandLineOptions != null);
+            // Do not attempt execution in case of design mode. Expect execution to happen via the design mode client.
+            return ArgumentProcessorResult.Success;
+        }
 
-            this.commandLineOptions = commandLineOptions;
-            this.runSettingsManager = runSettingsProvider;
-            this.testRequestManager = testRequestManager;
-            this.output = output;
-            this.testRunEventsRegistrar = new TestRunRequestEventsRegistrar(this.output, this.commandLineOptions);
+        // Ensure a test source file was provided
+        var anySource = _commandLineOptions.Sources.FirstOrDefault();
+        if (anySource == null)
+        {
+            throw new CommandLineException(CommandLineResources.MissingTestSourceFile);
         }
 
-        #endregion
+        if (Environment.GetEnvironmentVariable("VSTEST_MSBUILD_NOLOGO") != "1")
+        {
+            Output.WriteLine(CommandLineResources.StartingExecution, OutputLevel.Information);
+        }
 
-        public void Initialize(string argument)
+        if (!StringUtils.IsNullOrEmpty(EqtTrace.LogFile))
         {
-            // Nothing to do.
+            Output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
         }
 
-        /// <summary>
-        /// Execute all of the tests.
-        /// </summary>
-        public ArgumentProcessorResult Execute()
+        var runSettings = _runSettingsManager.ActiveRunSettings.SettingsXml;
+
+        if (_commandLineOptions.Sources.Any())
         {
-            Contract.Assert(this.commandLineOptions != null);
-            Contract.Assert(!string.IsNullOrWhiteSpace(this.runSettingsManager?.ActiveRunSettings?.SettingsXml));
+            RunTests(runSettings);
+        }
 
-            if (this.commandLineOptions.IsDesignMode)
-            {
-                // Do not attempt execution in case of design mode. Expect execution to happen
-                // via the design mode client.
-                return ArgumentProcessorResult.Success;
-            }
+        bool treatNoTestsAsError = RunSettingsUtilities.GetTreatNoTestsAsError(runSettings);
 
-            // Ensure a test source file was provided
-            var anySource = this.commandLineOptions.Sources.FirstOrDefault();
-            if (anySource == null)
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.MissingTestSourceFile));
-            }
+        return treatNoTestsAsError && s_numberOfExecutedTests == 0 ? ArgumentProcessorResult.Fail : ArgumentProcessorResult.Success;
+    }
 
-            this.output.WriteLine(CommandLineResources.StartingExecution, OutputLevel.Information);
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
-            {
-                this.output.Information(false, CommandLineResources.VstestDiagLogOutputPath, EqtTrace.LogFile);
-            }
+    private void RunTests(string runSettings)
+    {
+        // create/start test run
+        EqtTrace.Info("RunTestsArgumentProcessor:Execute: Test run is starting.");
+        EqtTrace.Verbose("RunTestsArgumentProcessor:Execute: Queuing Test run.");
 
-            var runSettings = this.runSettingsManager.ActiveRunSettings.SettingsXml;
+        // for command line keep alive is always false.
+        // for Windows Store apps it should be false, as Windows Store apps executor should terminate after finishing the test execution.
+        var keepAlive = false;
 
-            if (this.commandLineOptions.Sources.Any())
-            {
-                this.RunTests(runSettings);
-            }
+        var runRequestPayload = new TestRunRequestPayload() { Sources = _commandLineOptions.Sources.ToList(), RunSettings = runSettings, KeepAlive = keepAlive, TestPlatformOptions = new TestPlatformOptions() { TestCaseFilter = _commandLineOptions.TestCaseFilterValue } };
+        _testRequestManager.RunTests(runRequestPayload, null, _testRunEventsRegistrar, Constants.DefaultProtocolConfig);
 
-            bool treatNoTestsAsError = RunSettingsUtilities.GetTreatNoTestsAsError(runSettings);
+        EqtTrace.Info("RunTestsArgumentProcessor:Execute: Test run is completed.");
+    }
 
-            if (treatNoTestsAsError && numberOfExecutedTests == 0)
-            {
-                return ArgumentProcessorResult.Fail;
-            }
+    private class TestRunRequestEventsRegistrar : ITestRunEventsRegistrar
+    {
+        private readonly IOutput _output;
+        private readonly CommandLineOptions _commandLineOptions;
+        private readonly IArtifactProcessingManager _artifactProcessingManager;
 
-            return ArgumentProcessorResult.Success;
+        public TestRunRequestEventsRegistrar(IOutput output, CommandLineOptions commandLineOptions, IArtifactProcessingManager artifactProcessingManager)
+        {
+            _output = output;
+            _commandLineOptions = commandLineOptions;
+            _artifactProcessingManager = artifactProcessingManager;
         }
 
-        private void RunTests(string runSettings)
+        public void LogWarning(string message)
         {
-            // create/start test run
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("RunTestsArgumentProcessor:Execute: Test run is starting.");
-            }
-
-            if (EqtTrace.IsVerboseEnabled)
-            {
-                EqtTrace.Verbose("RunTestsArgumentProcessor:Execute: Queuing Test run.");
-            }
-
-            // for command line keep alive is always false.
-            // for Windows Store apps it should be false, as Windows Store apps executor should terminate after finishing the test execution.
-            var keepAlive = false;
-
-            var runRequestPayload = new TestRunRequestPayload() { Sources = this.commandLineOptions.Sources.ToList(), RunSettings = runSettings, KeepAlive = keepAlive, TestPlatformOptions= new TestPlatformOptions() { TestCaseFilter = this.commandLineOptions.TestCaseFilterValue } };
-            this.testRequestManager.RunTests(runRequestPayload, null, this.testRunEventsRegistrar, Constants.DefaultProtocolConfig);
-
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("RunTestsArgumentProcessor:Execute: Test run is completed.");
-            }
+            ConsoleLogger.RaiseTestRunWarning(message);
         }
 
-        private class TestRunRequestEventsRegistrar : ITestRunEventsRegistrar
+        public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
         {
-            private IOutput output;
-            private CommandLineOptions commandLineOptions;
-
-            public TestRunRequestEventsRegistrar(IOutput output, CommandLineOptions commandLineOptions)
-            {
-                this.output = output;
-                this.commandLineOptions = commandLineOptions;
-            }
+            testRunRequest.OnRunCompletion += TestRunRequest_OnRunCompletion;
+        }
 
-            public void LogWarning(string message)
-            {
-                ConsoleLogger.RaiseTestRunWarning(message);
-            }
+        public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+        {
+            testRunRequest.OnRunCompletion -= TestRunRequest_OnRunCompletion;
+        }
 
-            public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+        /// <summary>
+        /// Handles the TestRunRequest complete event
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e">RunCompletion args</param>
+        private void TestRunRequest_OnRunCompletion(object? sender, TestRunCompleteEventArgs e)
+        {
+            // If run is not aborted/canceled then check the count of executed tests.
+            // we need to check if there are any tests executed - to try show some help info to user to check for installed vsix extensions
+            if (!e.IsAborted && !e.IsCanceled)
             {
-                testRunRequest.OnRunCompletion += TestRunRequest_OnRunCompletion;
-            }
+                var testsFoundInAnySource = e.TestRunStatistics != null && e.TestRunStatistics.ExecutedTests > 0;
+                s_numberOfExecutedTests = e.TestRunStatistics!.ExecutedTests;
 
-            public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
-            {
-                testRunRequest.OnRunCompletion -= TestRunRequest_OnRunCompletion;
+                // Indicate the user to use test adapter path command if there are no tests found
+                if (!testsFoundInAnySource && !CommandLineOptions.Instance.TestAdapterPathsSet && _commandLineOptions.TestCaseFilterValue == null)
+                {
+                    _output.Warning(false, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
+                }
             }
 
-            /// <summary>
-            /// Handles the TestRunRequest complete event
-            /// </summary>
-            /// <param name="sender"></param>
-            /// <param name="e">RunCompletion args</param>
-            private void TestRunRequest_OnRunCompletion(object sender, TestRunCompleteEventArgs e)
+            // Collect tests session artifacts for post processing
+            if (_commandLineOptions.ArtifactProcessingMode == ArtifactProcessingMode.Collect)
             {
-                // If run is not aborted/canceled then check the count of executed tests.
-                // we need to check if there are any tests executed - to try show some help info to user to check for installed vsix extensions
-                if (!e.IsAborted && !e.IsCanceled)
-                {
-                    numberOfExecutedTests = e.TestRunStatistics.ExecutedTests;
-                    var testsFoundInAnySource = (e.TestRunStatistics == null) ? false : (e.TestRunStatistics.ExecutedTests > 0);
-
-                    // Indicate the user to use test adapter path command if there are no tests found
-                    if (!testsFoundInAnySource && string.IsNullOrEmpty(CommandLineOptions.Instance.TestAdapterPath) && this.commandLineOptions.TestCaseFilterValue == null)
-                    {
-                        this.output.Warning(false, CommandLineResources.SuggestTestAdapterPathIfNoTestsIsFound);
-                    }
-                }
+                TPDebug.Assert(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml is not null, "RunSettingsManager.Instance.ActiveRunSettings.SettingsXml is null");
+                _artifactProcessingManager.CollectArtifacts(e, RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
             }
         }
     }
diff --git a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
new file mode 100644
index 0000000000..686c3a44a5
--- /dev/null
+++ b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+internal class ShowDeprecateDotnetVStestMessageArgumentProcessor : IArgumentProcessor
+{
+    public const string CommandName = "/ShowDeprecateDotnetVSTestMessage";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new ShowDeprecateDotnetVStestMessageProcessorExecutor());
+
+        set => _executor = value;
+    }
+
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() => new ShowDeprecateDotnetVStestMessageProcessorCapabilities());
+
+    public static bool ContainsShowDeprecateDotnetVSTestMessageCommand(string[]? args) =>
+          args?.Contains("--ShowDeprecateDotnetVSTestMessage", StringComparer.OrdinalIgnoreCase) == true;
+}
+
+internal class ShowDeprecateDotnetVStestMessageProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => ShowDeprecateDotnetVStestMessageArgumentProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.CliRunSettings;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.None;
+
+    public override string? HelpContentResourceName => null;
+}
+
+internal class ShowDeprecateDotnetVStestMessageProcessorExecutor : IArgumentExecutor
+{
+    public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
+
+    public void Initialize(string? argument) { }
+}
diff --git a/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs b/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs
new file mode 100644
index 0000000000..91ee48d550
--- /dev/null
+++ b/src/vstest.console/Processors/TestAdapterLoadingStrategyArgumentProcessor.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Allows the user to specify a order of loading custom adapters from.
+/// </summary>
+internal class TestAdapterLoadingStrategyArgumentProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the TestAdapterLoadingStrategyArgumentProcessor handles.
+    /// </summary>
+    public const string CommandName = "/TestAdapterLoadingStrategy";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestAdapterLoadingStrategyArgumentProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance, new FileHelper()));
+
+        set => _executor = value;
+    }
+}
+
+/// <summary>
+/// The argument capabilities.
+/// </summary>
+internal class TestAdapterLoadingStrategyArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => TestAdapterLoadingStrategyArgumentProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    public override bool IsAction => false;
+
+    public override bool AlwaysExecute => true;
+
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.TestAdapterLoadingStrategy;
+
+    public override string HelpContentResourceName => CommandLineResources.TestAdapterLoadingStrategyHelp;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.TestAdapterLoadingStrategyArgumentProcessorHelpPriority;
+}
+
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class TestAdapterLoadingStrategyArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for getting sources.
+    /// </summary>
+    private readonly CommandLineOptions _commandLineOptions;
+
+    /// <summary>
+    /// Run settings provider.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
+
+    /// <summary>
+    /// Used for sending output.
+    /// </summary>
+    private readonly IOutput _output;
+
+    /// <summary>
+    /// For file related operation
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
+
+    public const string RunSettingsPath = "RunConfiguration.TestAdapterLoadingStrategy";
+
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager">Run setting manager.</param>
+    /// <param name="output">Output such as console.</param>
+    /// <param name="fileHelper">File helper</param>
+    public TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager, IOutput output, IFileHelper fileHelper)
+    {
+        _commandLineOptions = options ?? throw new ArgumentNullException(nameof(options));
+        _runSettingsManager = runSettingsManager ?? throw new ArgumentNullException(nameof(runSettingsManager));
+        _output = output ?? throw new ArgumentNullException(nameof(output));
+        _fileHelper = fileHelper ?? throw new ArgumentNullException(nameof(fileHelper));
+    }
+
+    #region IArgumentExecutor
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        ExtractStrategy(argument, out var strategy);
+
+        if (strategy == TestAdapterLoadingStrategy.Recursive)
+        {
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestAdapterLoadingStrategyValueInvalidRecursive, $"{nameof(TestAdapterLoadingStrategy.Explicit)}, {nameof(TestAdapterLoadingStrategy.NextToSource)}"));
+        }
+
+        if (strategy == TestAdapterLoadingStrategy.Default)
+        {
+            InitializeDefaultStrategy();
+            return;
+        }
+
+        InitializeStrategy(strategy);
+    }
+
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/>. </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
+    }
+    #endregion
+
+    private void ExtractStrategy(string? value, out TestAdapterLoadingStrategy strategy)
+    {
+        value ??= _runSettingsManager.QueryRunSettingsNode(RunSettingsPath);
+
+        if (value.IsNullOrWhiteSpace())
+        {
+            strategy = TestAdapterLoadingStrategy.Default;
+            return;
+        }
+
+        if (!Enum.TryParse(value, out strategy))
+        {
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestAdapterLoadingStrategyValueInvalid, value));
+        }
+    }
+
+    private void InitializeDefaultStrategy()
+    {
+        ValidateTestAdapterPaths(TestAdapterLoadingStrategy.Default);
+
+        SetStrategy(TestAdapterLoadingStrategy.Default);
+    }
+
+    private void InitializeStrategy(TestAdapterLoadingStrategy strategy)
+    {
+        ValidateTestAdapterPaths(strategy);
+
+        if (!_commandLineOptions.TestAdapterPathsSet && strategy.HasFlag(TestAdapterLoadingStrategy.Explicit))
+        {
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestAdapterPathValueRequiredWhenStrategyXIsUsed, nameof(TestAdapterLoadingStrategy.Explicit)));
+        }
+
+        SetStrategy(strategy);
+    }
+
+    private void ForceIsolation()
+    {
+        if (_commandLineOptions.InIsolation)
+        {
+            return;
+        }
+
+        EqtTrace.Warning(
+            $"{nameof(TestAdapterLoadingStrategyArgumentExecutor)}.{nameof(ForceIsolation)}: InIsolation setting is forced when {nameof(TestAdapterLoadingStrategy.Explicit)} strategy is used." +
+            "Tests will run in isolation."
+        );
+        _commandLineOptions.InIsolation = true;
+        _runSettingsManager.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "true");
+    }
+
+    private void ValidateTestAdapterPaths(TestAdapterLoadingStrategy strategy)
+    {
+        var testAdapterPaths = _commandLineOptions.TestAdapterPath ?? [];
+        if (!_commandLineOptions.TestAdapterPathsSet)
+        {
+            testAdapterPaths = TestAdapterPathArgumentExecutor.SplitPaths(_runSettingsManager.QueryRunSettingsNode(TestAdapterPathArgumentExecutor.RunSettingsPath)).Union(testAdapterPaths).Distinct().ToArray();
+        }
+
+        for (var i = 0; i < testAdapterPaths.Length; i++)
+        {
+            var adapterPath = testAdapterPaths[i];
+            var testAdapterPath = _fileHelper.GetFullPath(Environment.ExpandEnvironmentVariables(adapterPath));
+
+            if (strategy == TestAdapterLoadingStrategy.Default && !_fileHelper.DirectoryExists(testAdapterPath))
+            {
+                throw new CommandLineException(
+                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidTestAdapterPathCommand, adapterPath, CommandLineResources.TestAdapterPathDoesNotExist)
+                );
+            }
+
+            testAdapterPaths[i] = testAdapterPath;
+        }
+
+        _runSettingsManager.UpdateRunSettingsNode(TestAdapterPathArgumentExecutor.RunSettingsPath, string.Join(";", testAdapterPaths));
+    }
+
+    private void SetStrategy(TestAdapterLoadingStrategy strategy)
+    {
+        _commandLineOptions.TestAdapterLoadingStrategy = strategy;
+        _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, strategy.ToString());
+        if (strategy.HasFlag(TestAdapterLoadingStrategy.Explicit))
+        {
+            ForceIsolation();
+        }
+    }
+}
diff --git a/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs b/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
index 120544e1c8..8ae3214634 100644
--- a/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestAdapterPathArgumentProcessor.cs
@@ -1,241 +1,174 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Allows the user to specify a path to load custom adapters from.
+/// </summary>
+internal class TestAdapterPathArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+    /// <summary>
+    /// The name of the command line argument that the ListTestsArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/TestAdapterPath";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
     /// <summary>
-    /// Allows the user to specify a path to load custom adapters from.
+    /// Gets the metadata.
     /// </summary>
-    internal class TestAdapterPathArgumentProcessor : IArgumentProcessor
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestAdapterPathArgumentProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
     {
-        #region Constants
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance,
+                ConsoleOutput.Instance, new FileHelper()));
+
+        set => _executor = value;
+    }
+}
 
-        /// <summary>
-        /// The name of the command line argument that the ListTestsArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/TestAdapterPath";
+/// <summary>
+/// The argument capabilities.
+/// </summary>
+internal class TestAdapterPathArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => TestAdapterPathArgumentProcessor.CommandName;
 
-        #endregion
+    public override bool AllowMultiple => true;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    public override bool IsAction => false;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.TestAdapterPath;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestAdapterPathArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    public override string HelpContentResourceName => CommandLineResources.TestAdapterPathHelp;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, ConsoleOutput.Instance, new FileHelper()));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.TestAdapterPathArgumentProcessorHelpPriority;
+}
 
+/// <summary>
+/// The argument executor.
+/// </summary>
+internal class TestAdapterPathArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// The argument capabilities.
+    /// Used for getting sources.
     /// </summary>
-    internal class TestAdapterPathArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => TestAdapterPathArgumentProcessor.CommandName;
+    private readonly CommandLineOptions _commandLineOptions;
 
-        public override bool AllowMultiple => true;
+    /// <summary>
+    /// Run settings provider.
+    /// </summary>
+    private readonly IRunSettingsProvider _runSettingsManager;
 
-        public override bool IsAction => false;
+    /// <summary>
+    /// Used for sending output.
+    /// </summary>
+    private readonly IOutput _output;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.TestAdapterPath;
+    /// <summary>
+    /// For file related operation
+    /// </summary>
+    private readonly IFileHelper _fileHelper;
 
-        public override string HelpContentResourceName => CommandLineResources.TestAdapterPathHelp;
+    /// <summary>
+    /// Separators for multiple paths in argument.
+    /// </summary>
+    internal readonly static char[] ArgumentSeparators = [';'];
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.TestAdapterPathArgumentProcessorHelpPriority;
-    }
+    public const string RunSettingsPath = "RunConfiguration.TestAdaptersPaths";
 
     /// <summary>
-    /// The argument executor.
+    /// Default constructor.
     /// </summary>
-    internal class TestAdapterPathArgumentExecutor : IArgumentExecutor
+    /// <param name="options"> The options. </param>
+    /// <param name="runSettingsManager">Run setting manager.</param>
+    /// <param name="output">Output such as console.</param>
+    /// <param name="fileHelper">File helper</param>
+    public TestAdapterPathArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager, IOutput output, IFileHelper fileHelper)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
-
-        /// <summary>
-        /// Run settings provider.
-        /// </summary>
-        private IRunSettingsProvider runSettingsManager;
-
-        /// <summary>
-        /// Used for sending output.
-        /// </summary>
-        private IOutput output;
-
-        /// <summary>
-        /// For file related operation
-        /// </summary>
-        private IFileHelper fileHelper;
-
-        /// <summary>
-        /// Separators for multiple paths in argument.
-        /// </summary>
-        private readonly char[] argumentSeparators = new[] { ';' };
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options"> The options. </param>
-        /// <param name="testPlatform">The test platform</param>
-        public TestAdapterPathArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsManager, IOutput output, IFileHelper fileHelper)
-        {
-            Contract.Requires(options != null);
-
-            this.commandLineOptions = options;
-            this.runSettingsManager = runSettingsManager;
-            this.output = output;
-            this.fileHelper = fileHelper;
-        }
-
-        #endregion
+        _commandLineOptions = options ?? throw new ArgumentNullException(nameof(options));
+        _runSettingsManager = runSettingsManager ?? throw new ArgumentNullException(nameof(runSettingsManager));
+        _output = output ?? throw new ArgumentNullException(nameof(output));
+        _fileHelper = fileHelper ?? throw new ArgumentNullException(nameof(fileHelper));
+    }
 
-        #region IArgumentExecutor
+    #region IArgumentExecutor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrWhiteSpace())
         {
-            string invalidAdapterPathArgument = argument;
-
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestAdapterPathValueRequired));
-            }
-
-            string customAdaptersPath;
-
-            try
-            {
-                var testAdapterPaths = new List<string>();
-                var testAdapterFullPaths = new List<string>();
-
-                // VSTS task add double quotes around TestAdapterpath. For example if user has given TestAdapter path C:\temp,
-                // Then VSTS task will add TestAdapterPath as "/TestAdapterPath:\"C:\Temp\"".
-                // Remove leading and trailing ' " ' chars...
-                argument = argument.Trim().Trim(new char[] { '\"' });
-
-                // Get test adapter paths from RunSettings.
-                var testAdapterPathsInRunSettings = this.runSettingsManager.QueryRunSettingsNode("RunConfiguration.TestAdaptersPaths");
-
-                if (!string.IsNullOrWhiteSpace(testAdapterPathsInRunSettings))
-                {
-                    testAdapterPaths.AddRange(SplitPaths(testAdapterPathsInRunSettings));
-                }
-
-                testAdapterPaths.AddRange(SplitPaths(argument));
-
-                foreach (var testadapterPath in testAdapterPaths)
-                {
-                    // TestAdaptersPaths could contain environment variables
-                    var testAdapterFullPath = Path.GetFullPath(Environment.ExpandEnvironmentVariables(testadapterPath));
-
-                    if (!this.fileHelper.DirectoryExists(testAdapterFullPath))
-                    {
-                        invalidAdapterPathArgument = testadapterPath;
-                        throw new DirectoryNotFoundException(CommandLineResources.TestAdapterPathDoesNotExist);
-                    }
+            throw new CommandLineException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestAdapterPathValueRequired));
+        }
 
-                    testAdapterFullPaths.Add(testAdapterFullPath);
-                }
+        var testAdapterPaths = new List<string>();
 
-                customAdaptersPath = string.Join(";", testAdapterFullPaths.Distinct().ToArray());
+        // VSTS task add double quotes around TestAdapterpath. For example if user has given TestAdapter path C:\temp,
+        // Then VSTS task will add TestAdapterPath as "/TestAdapterPath:\"C:\Temp\"".
+        // Remove leading and trailing ' " ' chars...
+        argument = argument.Trim().Trim(['\"']);
 
-                this.runSettingsManager.UpdateRunSettingsNode("RunConfiguration.TestAdaptersPaths", customAdaptersPath);
-            }
-            catch (Exception e)
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidTestAdapterPathCommand, invalidAdapterPathArgument, e.Message));
-            }
+        // Get test adapter paths from RunSettings.
+        var testAdapterPathsInRunSettings = _runSettingsManager.QueryRunSettingsNode(RunSettingsPath);
 
-            this.commandLineOptions.TestAdapterPath = customAdaptersPath;
+        if (!testAdapterPathsInRunSettings.IsNullOrWhiteSpace())
+        {
+            testAdapterPaths.AddRange(SplitPaths(testAdapterPathsInRunSettings));
         }
 
-        /// <summary>
-        /// Splits provided paths into array.
-        /// </summary>
-        /// <param name="paths">Source paths joined by semicolons.</param>
-        /// <returns>Paths.</returns>
-        private string[] SplitPaths(string paths)
-        {
-            if (string.IsNullOrWhiteSpace(paths))
-            {
-                return new string[] { };
-            }
+        testAdapterPaths.AddRange(SplitPaths(argument));
+        var customAdaptersPath = testAdapterPaths.Distinct().ToArray();
 
-            return paths.Split(argumentSeparators, StringSplitOptions.RemoveEmptyEntries);
-        }
+        _runSettingsManager.UpdateRunSettingsNode(RunSettingsPath, string.Join(";", customAdaptersPath));
+        _commandLineOptions.TestAdapterPath = customAdaptersPath;
+    }
 
-        /// <summary>
-        /// Executes the argument processor.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/>. </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do since we updated the parameter during initialize parameter
-            return ArgumentProcessorResult.Success;
-        }
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/>. </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do since we updated the parameter during initialize parameter
+        return ArgumentProcessorResult.Success;
+    }
+    #endregion
 
-        #endregion
+    /// <summary>
+    /// Splits provided paths into array.
+    /// </summary>
+    /// <param name="paths">Source paths joined by semicolons.</param>
+    /// <returns>Paths.</returns>
+    internal static string[] SplitPaths(string? paths)
+    {
+        return paths.IsNullOrWhiteSpace() ? [] : paths.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
     }
-}
\ No newline at end of file
+}
diff --git a/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs b/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
index 8eb75e0f05..1969e06d4e 100644
--- a/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestCaseFilterArgumentProcessor.cs
@@ -1,149 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
-    using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using System;
+using System.Globalization;
 
-    /// <summary>
-    /// Argument Executor for the "/TestCaseFilter" command line argument.
-    /// </summary>
-    internal class TestCaseFilterArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-        /// <summary>
-        /// The name of the command line argument that the TestCaseFilterArgumentExecutor handles.
-        /// </summary>
-        public const string CommandName = "/TestCaseFilter";
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-        #endregion
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+/// <summary>
+/// Argument Executor for the "/TestCaseFilter" command line argument.
+/// </summary>
+internal class TestCaseFilterArgumentProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the TestCaseFilterArgumentExecutor handles.
+    /// </summary>
+    public const string CommandName = "/TestCaseFilter";
 
-        private Lazy<IArgumentExecutor> executor;
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestCaseFilterArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestCaseFilterArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance));
+
+        set => _executor = value;
     }
+}
 
-    internal class TestCaseFilterArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => TestCaseFilterArgumentProcessor.CommandName;
+internal class TestCaseFilterArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => TestCaseFilterArgumentProcessor.CommandName;
 
-        public override bool AllowMultiple => false;
+    public override bool AllowMultiple => false;
 
-        public override bool IsAction => false;
+    public override bool IsAction => false;
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        public override string HelpContentResourceName => CommandLineResources.TestCaseFilterArgumentHelp;
+    public override string HelpContentResourceName => CommandLineResources.TestCaseFilterArgumentHelp;
 
-        public override HelpContentPriority HelpPriority => HelpContentPriority.TestCaseFilterArgumentProcessorHelpPriority;
-    }
+    public override HelpContentPriority HelpPriority => HelpContentPriority.TestCaseFilterArgumentProcessorHelpPriority;
+}
 
+/// <summary>
+/// Argument Executor for the "/TestCaseFilter" command line argument.
+/// </summary>
+internal class TestCaseFilterArgumentExecutor : IArgumentExecutor
+{
     /// <summary>
-    /// Argument Executor for the "/TestCaseFilter" command line argument.
+    /// Used for getting sources.
     /// </summary>
-    internal class TestCaseFilterArgumentExecutor : IArgumentExecutor
-    {
-        #region Fields
+    private readonly CommandLineOptions _commandLineOptions;
 
-        /// <summary>
-        /// Used for getting sources.
-        /// </summary>
-        private CommandLineOptions commandLineOptions;
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    /// <param name="options">
+    /// The options.
+    /// </param>
+    public TestCaseFilterArgumentExecutor(CommandLineOptions options)
+    {
+        ValidateArg.NotNull(options, nameof(options));
+        _commandLineOptions = options;
+    }
 
-        #endregion
+    #region IArgumentExecutor
 
-        #region Constructor
+    /// <summary>
+    /// Initializes with the argument that was provided with the command.
+    /// </summary>
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
+    {
+        var defaultFilter = _commandLineOptions.TestCaseFilterValue;
+        var hasDefaultFilter = !defaultFilter.IsNullOrWhiteSpace();
 
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="options">
-        /// The options.
-        /// </param>
-        public TestCaseFilterArgumentExecutor(CommandLineOptions options)
+        if (!hasDefaultFilter && argument.IsNullOrWhiteSpace())
         {
-            Contract.Requires(options != null);
-            this.commandLineOptions = options;
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestCaseFilterValueRequired));
         }
-        #endregion
-
-        #region IArgumentExecutor
 
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        if (!hasDefaultFilter)
         {
-            var defaultFilter = this.commandLineOptions.TestCaseFilterValue;
-            var hasDefaultFilter = !string.IsNullOrWhiteSpace(defaultFilter);
-            
-            if (!hasDefaultFilter && string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.TestCaseFilterValueRequired));
-            }
-
-            if (!hasDefaultFilter)
-            {
-                this.commandLineOptions.TestCaseFilterValue = argument;
-            }
-            else
-            {
-                // Merge default filter an provided filter by AND operator to have both the default filter and custom filter applied.
-                this.commandLineOptions.TestCaseFilterValue = $"({defaultFilter})&({argument})";
-            }
+            _commandLineOptions.TestCaseFilterValue = argument;
         }
-
-        /// <summary>
-        /// The TestCaseFilter is already set, return success.
-        /// </summary>
-        /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
-        public ArgumentProcessorResult Execute()
+        else
         {
-            return ArgumentProcessorResult.Success;
+            // Merge default filter an provided filter by AND operator to have both the default filter and custom filter applied.
+            _commandLineOptions.TestCaseFilterValue = $"({defaultFilter})&({argument})";
         }
-        #endregion
     }
+
+    /// <summary>
+    /// The TestCaseFilter is already set, return success.
+    /// </summary>
+    /// <returns> The <see cref="ArgumentProcessorResult"/> Success </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
+    }
+    #endregion
 }
diff --git a/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs b/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs
new file mode 100644
index 0000000000..4a154ed560
--- /dev/null
+++ b/src/vstest.console/Processors/TestSessionCorrelationIdProcessor.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Processor for the "--testSessionCorrelationId|/TestSessionCorrelationId" command line argument.
+/// </summary>
+internal class TestSessionCorrelationIdProcessor : IArgumentProcessor
+{
+    /// <summary>
+    /// The name of the command line argument that the TestSessionCorrelationIdProcessor handles.
+    /// </summary>
+    public const string CommandName = "/TestSessionCorrelationId";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+
+    private Lazy<IArgumentExecutor>? _executor;
+
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestSessionCorrelationIdProcessorCapabilities());
+
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestSessionCorrelationIdProcessorModeProcessorExecutor(CommandLineOptions.Instance));
+
+        set => _executor = value;
+    }
+}
+
+internal class TestSessionCorrelationIdProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => TestSessionCorrelationIdProcessor.CommandName;
+
+    public override bool AllowMultiple => false;
+
+    // We put priority at the same level of the argument processor for runsettings passed as argument through cli.
+    // We'll be sure to run before test run or artifact post processing.
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.CliRunSettings;
+
+    public override HelpContentPriority HelpPriority => HelpContentPriority.None;
+
+    // We want to be sure that this command won't show in user help
+    public override string? HelpContentResourceName => null;
+}
+
+/// <summary>
+/// Argument Executor for the "/TestSessionCorrelationId" command line argument.
+/// </summary>
+internal class TestSessionCorrelationIdProcessorModeProcessorExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+
+    public TestSessionCorrelationIdProcessorModeProcessorExecutor(CommandLineOptions options)
+    {
+        _commandLineOptions = options ?? throw new ArgumentNullException(nameof(options));
+    }
+
+    public void Initialize(string? argument)
+    {
+        if (argument.IsNullOrEmpty())
+        {
+            throw new CommandLineException(CommandLineResources.InvalidTestSessionCorrelationId);
+        }
+
+        _commandLineOptions.TestSessionCorrelationId = argument;
+        EqtTrace.Verbose($"TestSessionCorrelationIdProcessorModeProcessorExecutor.Initialize: TestSessionCorrelationId '{argument}'");
+    }
+
+    public ArgumentProcessorResult Execute() => ArgumentProcessorResult.Success;
+}
diff --git a/src/vstest.console/Processors/TestSourceArgumentProcessor.cs b/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
index f5f7fdfce0..a3030d6de7 100644
--- a/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
+++ b/src/vstest.console/Processors/TestSourceArgumentProcessor.cs
@@ -1,133 +1,105 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Argument Executor which handles adding the source provided to the TestManager.
+/// </summary>
+internal class TestSourceArgumentProcessor : IArgumentProcessor
 {
-    using System;
-    using System.Diagnostics.Contracts;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
+    /// <summary>
+    /// The command name.
+    /// </summary>
+    public const string CommandName = "/TestSource";
+
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
     /// <summary>
-    /// Argument Executor which handles adding the source provided to the TestManager.
+    /// Gets the metadata.
     /// </summary>
-    internal class TestSourceArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new TestSourceArgumentProcessorCapabilities());
 
-        /// <summary>
-        /// The command name.
-        /// </summary>
-        public const string CommandName = "/TestSource";
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new TestSourceArgumentExecutor(CommandLineOptions.Instance));
 
-        #endregion
+        set => _executor = value;
+    }
+}
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+/// <summary>
+/// The test source argument processor capabilities.
+/// </summary>
+internal class TestSourceArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => TestSourceArgumentProcessor.CommandName;
 
-        private Lazy<IArgumentExecutor> executor;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new TestSourceArgumentProcessorCapabilities());
-                }
-                return this.metadata;
-            }
-        }
+    public override bool IsSpecialCommand => true;
+}
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new TestSourceArgumentExecutor(CommandLineOptions.Instance));
-                }
-
-                return this.executor;
-            }
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+/// <summary>
+/// Argument Executor which handles adding the source provided to the TestManager.
+/// </summary>
+internal class TestSourceArgumentExecutor : IArgumentExecutor
+{
+    /// <summary>
+    /// Used for adding sources to the test manager.
+    /// </summary>
+    private readonly CommandLineOptions _testSources;
 
     /// <summary>
-    /// The test source argument processor capabilities.
+    /// Default constructor.
     /// </summary>
-    internal class TestSourceArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+    /// <param name="testSources">
+    /// The test Sources.
+    /// </param>
+    public TestSourceArgumentExecutor(CommandLineOptions testSources)
     {
-        public override string CommandName => TestSourceArgumentProcessor.CommandName;
+        ValidateArg.NotNull(testSources, nameof(testSources));
+        _testSources = testSources;
+    }
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 
-        public override bool IsSpecialCommand => true;
-    }
+    #region IArgumentExecutor
 
     /// <summary>
-    /// Argument Executor which handles adding the source provided to the TestManager.
+    /// Initializes with the argument that was provided with the command.
     /// </summary>
-    internal class TestSourceArgumentExecutor : IArgumentExecutor
+    /// <param name="argument">Argument that was provided with the command.</param>
+    public void Initialize(string? argument)
     {
-        #region Fields
-
-        /// <summary>
-        /// Used for adding sources to the test manager.
-        /// </summary>
-        private CommandLineOptions testSources;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        /// <param name="testSources">
-        /// The test Sources.
-        /// </param>
-        public TestSourceArgumentExecutor(CommandLineOptions testSources)
-        {
-            Contract.Requires(testSources != null);
-            this.testSources = testSources;
-        }
-
-        #endregion
-
-        #region IArgumentExecutor
-
-        /// <summary>
-        /// Initializes with the argument that was provided with the command.
-        /// </summary>
-        /// <param name="argument">Argument that was provided with the command.</param>
-        public void Initialize(string argument)
+        if (!argument.IsNullOrEmpty())
         {
-            Contract.Assert(this.testSources != null);
-            this.testSources.AddSource(argument);
+            _testSources.AddSource(argument);
         }
+    }
 
-        /// <summary>
-        /// Executes the argument processor.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="ArgumentProcessorResult"/>.
-        /// </returns>
-        public ArgumentProcessorResult Execute()
-        {
-            // Nothing to do. Our work was done during initialize.
-            return ArgumentProcessorResult.Success;
-        }
+    /// <summary>
+    /// Executes the argument processor.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="ArgumentProcessorResult"/>.
+    /// </returns>
+    public ArgumentProcessorResult Execute()
+    {
+        // Nothing to do. Our work was done during initialize.
+        return ArgumentProcessorResult.Success;
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs b/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
index b3a29e6ee7..ac4cb2055f 100644
--- a/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
+++ b/src/vstest.console/Processors/UseVsixExtensionsArgumentProcessor.cs
@@ -1,138 +1,112 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
-{
-    using System;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 
+/// <summary>
+/// The argument processor for initializing the vsix based adapters.
+/// </summary>
+internal class UseVsixExtensionsArgumentProcessor : IArgumentProcessor
+{
     /// <summary>
-    /// The argument processor for initializing the vsix based adapters.
+    /// The name of command
     /// </summary>
-    internal class UseVsixExtensionsArgumentProcessor : IArgumentProcessor
-    {
-        #region Constants
+    public const string CommandName = "/UseVsixExtensions";
 
-        /// <summary>
-        /// The name of command
-        /// </summary>
-        public const string CommandName = "/UseVsixExtensions";
+    private Lazy<IArgumentProcessorCapabilities>? _metadata;
+    private Lazy<IArgumentExecutor>? _executor;
 
-        #endregion
+    /// <summary>
+    /// Gets the metadata.
+    /// </summary>
+    public Lazy<IArgumentProcessorCapabilities> Metadata
+        => _metadata ??= new Lazy<IArgumentProcessorCapabilities>(() =>
+            new UseVsixExtensionsArgumentProcessorCapabilities());
 
-        private Lazy<IArgumentProcessorCapabilities> metadata;
+    /// <summary>
+    /// Gets or sets the executor.
+    /// </summary>
+    public Lazy<IArgumentExecutor>? Executor
+    {
+        get => _executor ??= new Lazy<IArgumentExecutor>(() =>
+            new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance, new VSExtensionManager(), ConsoleOutput.Instance));
 
-        private Lazy<IArgumentExecutor> executor;
+        set => _executor = value;
+    }
+}
 
-        /// <summary>
-        /// Gets the metadata.
-        /// </summary>
-        public Lazy<IArgumentProcessorCapabilities> Metadata
-        {
-            get
-            {
-                if (this.metadata == null)
-                {
-                    this.metadata = new Lazy<IArgumentProcessorCapabilities>(() => new UseVsixExtensionsArgumentProcessorCapabilities());
-                }
-
-                return this.metadata;
-            }
-        }
+/// <inheritdoc />
+internal class UseVsixExtensionsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
+{
+    public override string CommandName => UseVsixExtensionsArgumentProcessor.CommandName;
 
-        /// <summary>
-        /// Gets or sets the executor.
-        /// </summary>
-        public Lazy<IArgumentExecutor> Executor
-        {
-            get
-            {
-                if (this.executor == null)
-                {
-                    this.executor = new Lazy<IArgumentExecutor>(() => new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, TestRequestManager.Instance, new VSExtensionManager(), ConsoleOutput.Instance));
-                }
-
-                return this.executor;
-            }
-
-            set
-            {
-                this.executor = value;
-            }
-        }
-    }
+    public override bool AllowMultiple => false;
 
-    /// <inheritdoc />
-    internal class UseVsixExtensionsArgumentProcessorCapabilities : BaseArgumentProcessorCapabilities
-    {
-        public override string CommandName => UseVsixExtensionsArgumentProcessor.CommandName;
+    public override bool IsAction => false;
 
-        public override bool AllowMultiple => false;
+    public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
 
-        public override bool IsAction => false;
+    // Commenting out the help for this processor as it on the deprecation path.
+    // public override string HelpContentResourceName => CommandLineResources.UseVsixExtensionsHelp;
+    // public override HelpContentPriority HelpPriority => HelpContentPriority.UseVsixArgumentProcessorHelpPriority;
+}
 
-        public override ArgumentProcessorPriority Priority => ArgumentProcessorPriority.AutoUpdateRunSettings;
+/// <summary>
+/// The use vsix extensions argument executor.
+/// </summary>
+internal class UseVsixExtensionsArgumentExecutor : IArgumentExecutor
+{
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly ITestRequestManager _testRequestManager;
+    private readonly IVSExtensionManager _extensionManager;
+    private readonly IOutput _output;
 
-        // Commenting out the help for this processor as it on the deprecation path.
-        // public override string HelpContentResourceName => CommandLineResources.UseVsixExtensionsHelp;
-        // public override HelpContentPriority HelpPriority => HelpContentPriority.UseVsixArgumentProcessorHelpPriority;
+    internal UseVsixExtensionsArgumentExecutor(CommandLineOptions commandLineOptions, ITestRequestManager testRequestManager, IVSExtensionManager extensionManager, IOutput output)
+    {
+        _commandLineOptions = commandLineOptions;
+        _testRequestManager = testRequestManager;
+        _extensionManager = extensionManager;
+        _output = output;
     }
 
-    /// <summary>
-    /// The use vsix extensions argument executor.
-    /// </summary>
-    internal class UseVsixExtensionsArgumentExecutor : IArgumentExecutor
+    /// <inheritdoc />
+    public void Initialize(string? argument)
     {
-        private CommandLineOptions commandLineOptions;
-        private ITestRequestManager testRequestManager;
-        private IVSExtensionManager extensionManager;
-        private IOutput output;
-
-        internal UseVsixExtensionsArgumentExecutor(CommandLineOptions commandLineOptions, ITestRequestManager testRequestManager, IVSExtensionManager extensionManager, IOutput output)
+        if (argument.IsNullOrWhiteSpace())
         {
-            this.commandLineOptions = commandLineOptions;
-            this.testRequestManager = testRequestManager;
-            this.extensionManager = extensionManager;
-            this.output = output;
+            throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UseVsixExtensionsValueRequired));
         }
 
-        /// <inheritdoc />
-        public void Initialize(string argument)
+        if (!bool.TryParse(argument, out bool value))
         {
-            if (string.IsNullOrWhiteSpace(argument))
-            {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, CommandLineResources.UseVsixExtensionsValueRequired));
-            }
-
-            bool value;
-            if (!bool.TryParse(argument, out value))
-            {
-                throw new CommandLineException(
-                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidUseVsixExtensionsCommand, argument));
-            }
-
-            this.output.Warning(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.UseVsixExtensionsDeprecation));
-            commandLineOptions.UseVsixExtensions = value;
-
-            if (commandLineOptions.UseVsixExtensions)
-            {
-                var vsixExtensions = extensionManager.GetUnitTestExtensions();
-                testRequestManager.InitializeExtensions(vsixExtensions, skipExtensionFilters: true);
-            }
+            throw new CommandLineException(
+                string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidUseVsixExtensionsCommand, argument));
         }
 
-        /// <inheritdoc />
-        public ArgumentProcessorResult Execute()
+        _output.Warning(false, string.Format(CultureInfo.CurrentCulture, CommandLineResources.UseVsixExtensionsDeprecation));
+        _commandLineOptions.UseVsixExtensions = value;
+
+        if (_commandLineOptions.UseVsixExtensions)
         {
-            return ArgumentProcessorResult.Success;
+            var vsixExtensions = _extensionManager.GetUnitTestExtensions();
+            _testRequestManager.InitializeExtensions(vsixExtensions, skipExtensionFilters: true);
         }
     }
+
+    /// <inheritdoc />
+    public ArgumentProcessorResult Execute()
+    {
+        return ArgumentProcessorResult.Success;
+    }
 }
diff --git a/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs b/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs
index 33b9729c6e..81f6123af8 100644
--- a/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs
+++ b/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs
@@ -1,385 +1,336 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Used to create the appropriate instance of an argument processor.
+/// </summary>
+internal class ArgumentProcessorFactory
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.Contracts;
-    using System.Linq;
+    /// <summary>
+    /// Available argument processors.
+    /// </summary>
+    private Dictionary<string, IArgumentProcessor>? _commandToProcessorMap;
+    private Dictionary<string, IArgumentProcessor>? _specialCommandToProcessorMap;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    /// <summary>
+    /// Initializes the argument processor factory.
+    /// </summary>
+    /// <param name="argumentProcessors">
+    /// The argument Processors.
+    /// </param>
+    /// <remarks>
+    /// This is not public because the static Create method should be used to access the instance.
+    /// </remarks>
+    protected ArgumentProcessorFactory(IEnumerable<IArgumentProcessor> argumentProcessors)
+    {
+        ValidateArg.NotNull(argumentProcessors, nameof(argumentProcessors));
+        AllArgumentProcessors = argumentProcessors;
+    }
 
     /// <summary>
-    /// Used to create the appropriate instance of an argument processor.
+    /// Creates ArgumentProcessorFactory.
     /// </summary>
-    internal class ArgumentProcessorFactory
+    /// <param name="featureFlag">
+    /// The feature flag support.
+    /// </param>
+    /// <returns>ArgumentProcessorFactory.</returns>
+    internal static ArgumentProcessorFactory Create(IFeatureFlag? featureFlag = null)
     {
-        #region Constants
-
-        /// <summary>
-        /// The command starter.
-        /// </summary>
-        internal const string CommandStarter = "/";
-
-        /// <summary>
-        /// The xplat command starter.
-        /// </summary>
-        internal const string XplatCommandStarter = "-";
-
-        #endregion
-
-        #region Fields
-
-        /// <summary>
-        /// Available argument processors.
-        /// </summary>
-        private readonly IEnumerable<IArgumentProcessor> argumentProcessors;
-        private Dictionary<string, IArgumentProcessor> commandToProcessorMap;
-        private Dictionary<string, IArgumentProcessor> specialCommandToProcessorMap;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes the argument processor factory.
-        /// </summary>
-        /// <param name="argumentProcessors">
-        /// The argument Processors.
-        /// </param>
-        /// <remarks>
-        /// This is not public because the static Create method should be used to access the instance.
-        /// </remarks>
-        protected ArgumentProcessorFactory(IEnumerable<IArgumentProcessor> argumentProcessors)
+        var defaultArgumentProcessor = DefaultArgumentProcessors;
+
+        if (!(featureFlag ?? FeatureFlag.Instance).IsSet(FeatureFlag.VSTEST_DISABLE_ARTIFACTS_POSTPROCESSING))
         {
-            Contract.Requires(argumentProcessors != null);
-            this.argumentProcessors = argumentProcessors;
+            defaultArgumentProcessor.Add(new ArtifactProcessingCollectModeProcessor());
+            defaultArgumentProcessor.Add(new ArtifactProcessingPostProcessModeProcessor());
+            defaultArgumentProcessor.Add(new TestSessionCorrelationIdProcessor());
         }
 
-        #endregion
+        // Get the ArgumentProcessorFactory
+        return new ArgumentProcessorFactory(defaultArgumentProcessor);
+    }
 
-        #region Static Methods
+    /// <summary>
+    /// Returns all of the available argument processors.
+    /// </summary>
+    public IEnumerable<IArgumentProcessor> AllArgumentProcessors { get; }
 
-        /// <summary>
-        /// Creates ArgumentProcessorFactory.
-        /// </summary>
-        /// <returns>ArgumentProcessorFactory.</returns>
-        internal static ArgumentProcessorFactory Create()
+    /// <summary>
+    /// Gets a mapping between command and Argument Executor.
+    /// </summary>
+    internal Dictionary<string, IArgumentProcessor> CommandToProcessorMap
+    {
+        get
         {
-            // Get the ArgumentProcessorFactory
-            return new ArgumentProcessorFactory(DefaultArgumentProcessors);
+            // Build the mapping if it does not already exist.
+            if (_commandToProcessorMap == null)
+            {
+                BuildCommandMaps();
+            }
+
+            return _commandToProcessorMap;
         }
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets a mapping between special commands and their Argument Processors.
+    /// </summary>
+    internal Dictionary<string, IArgumentProcessor> SpecialCommandToProcessorMap
+    {
+        get
+        {
+            // Build the mapping if it does not already exist.
+            if (_specialCommandToProcessorMap == null)
+            {
+                BuildCommandMaps();
+            }
 
-        #region Properties
+            return _specialCommandToProcessorMap;
+        }
+    }
+
+    /// <summary>
+    /// Creates the argument processor associated with the provided command line argument.
+    /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
+    /// </summary>
+    /// <param name="argument">Command line argument to create the argument processor for.</param>
+    /// <returns>The argument processor or null if one was not found.</returns>
+    public IArgumentProcessor? CreateArgumentProcessor(string argument)
+    {
+        ValidateArg.NotNullOrWhiteSpace(argument, nameof(argument));
+
+        // Parse the input into its command and argument parts.
+        var pair = new CommandArgumentPair(argument);
 
-        /// <summary>
-        /// Returns all of the available argument processors.
-        /// </summary>
-        public IEnumerable<IArgumentProcessor> AllArgumentProcessors
+        // Find the associated argument processor.
+        CommandToProcessorMap.TryGetValue(pair.Command, out IArgumentProcessor? argumentProcessor);
+
+        // If an argument processor was not found for the command, then consider it as a test source argument.
+        if (argumentProcessor == null)
         {
-            get { return argumentProcessors; }
+            // Update the command pair since the command is actually the argument in the case of
+            // a test source.
+            pair = new CommandArgumentPair(TestSourceArgumentProcessor.CommandName, argument);
+
+            argumentProcessor = SpecialCommandToProcessorMap[TestSourceArgumentProcessor.CommandName];
         }
 
-        /// <summary>
-        /// Gets a mapping between command and Argument Executor.
-        /// </summary>
-        internal Dictionary<string, IArgumentProcessor> CommandToProcessorMap
+        if (argumentProcessor != null)
         {
-            get
-            {
-                // Build the mapping if it does not already exist.
-                if (this.commandToProcessorMap == null)
-                {
-                    BuildCommandMaps();
-                }
-
-                return this.commandToProcessorMap;
-            }
+            argumentProcessor = WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor, pair.Argument);
         }
 
-        /// <summary>
-        /// Gets a mapping between special commands and their Argument Processors.
-        /// </summary>
-        internal Dictionary<string, IArgumentProcessor> SpecialCommandToProcessorMap
+        return argumentProcessor;
+    }
+
+    /// <summary>
+    /// Creates the argument processor associated with the provided command line argument.
+    /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
+    /// </summary>
+    /// <param name="command">Command name of the argument processor.</param>
+    /// <param name="arguments">Command line arguments to create the argument processor for.</param>
+    /// <returns>The argument processor or null if one was not found.</returns>
+    public IArgumentProcessor? CreateArgumentProcessor(string command, string[] arguments)
+    {
+        if (arguments == null || arguments.Length == 0)
         {
-            get
-            {
-                // Build the mapping if it does not already exist.
-                if (this.specialCommandToProcessorMap == null)
-                {
-                    BuildCommandMaps();
-                }
+            throw new ArgumentException("Cannot be null or empty", nameof(arguments));
+        }
+        Contract.EndContractBlock();
 
-                return this.specialCommandToProcessorMap;
-            }
+        // Find the associated argument processor.
+        CommandToProcessorMap.TryGetValue(command, out IArgumentProcessor? argumentProcessor);
+
+        if (argumentProcessor != null)
+        {
+            argumentProcessor = WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor, arguments);
         }
 
-        #endregion
+        return argumentProcessor;
+    }
 
-        #region Public Methods
+    /// <summary>
+    /// Creates the default action argument processor.
+    /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
+    /// </summary>
+    /// <returns>The default action argument processor.</returns>
+    public IArgumentProcessor CreateDefaultActionArgumentProcessor()
+    {
+        var argumentProcessor = SpecialCommandToProcessorMap[RunTestsArgumentProcessor.CommandName];
+        return WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor);
+    }
 
-        /// <summary>
-        /// Creates the argument processor associated with the provided command line argument.
-        /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
-        /// </summary>
-        /// <param name="argument">Command line argument to create the argument processor for.</param>
-        /// <returns>The argument processor or null if one was not found.</returns>
-        public IArgumentProcessor CreateArgumentProcessor(string argument)
-        {
-            if (String.IsNullOrWhiteSpace(argument))
-            {
-                throw new ArgumentException("Cannot be null or empty", nameof(argument));
-            }
-            Contract.EndContractBlock();
+    /// <summary>
+    /// Gets the argument processors that are tagged as special and to be always executed.
+    /// The Lazy's that are returned will initialize the underlying argument processor when first accessed.
+    /// </summary>
+    /// <returns>The argument processors that are tagged as special and to be always executed.</returns>
+    public IEnumerable<IArgumentProcessor> GetArgumentProcessorsToAlwaysExecute()
+    {
+        return SpecialCommandToProcessorMap.Values
+            .Where(lazyProcessor => lazyProcessor.Metadata.Value.IsSpecialCommand && lazyProcessor.Metadata.Value.AlwaysExecute);
+    }
 
-            // Parse the input into its command and argument parts.
-            var pair = new CommandArgumentPair(argument);
+    private static IList<IArgumentProcessor> DefaultArgumentProcessors => new List<IArgumentProcessor> {
+        new HelpArgumentProcessor(),
+        new TestSourceArgumentProcessor(),
+        new ListTestsArgumentProcessor(),
+        new RunTestsArgumentProcessor(),
+        new RunSpecificTestsArgumentProcessor(),
+        new TestAdapterPathArgumentProcessor(),
+        new TestAdapterLoadingStrategyArgumentProcessor(),
+        new TestCaseFilterArgumentProcessor(),
+        new ParentProcessIdArgumentProcessor(),
+        new PortArgumentProcessor(),
+        new RunSettingsArgumentProcessor(),
+        new PlatformArgumentProcessor(),
+        new FrameworkArgumentProcessor(),
+        new EnableLoggerArgumentProcessor(),
+        new ParallelArgumentProcessor(),
+        new EnableDiagArgumentProcessor(),
+        new CliRunSettingsArgumentProcessor(),
+        new ResultsDirectoryArgumentProcessor(),
+        new InIsolationArgumentProcessor(),
+        new CollectArgumentProcessor(),
+        new EnableCodeCoverageArgumentProcessor(),
+        new DisableAutoFakesArgumentProcessor(),
+        new ResponseFileArgumentProcessor(),
+        new EnableBlameArgumentProcessor(),
+        new AeDebuggerArgumentProcessor(),
+        new UseVsixExtensionsArgumentProcessor(),
+        new ListDiscoverersArgumentProcessor(),
+        new ListExecutorsArgumentProcessor(),
+        new ListLoggersArgumentProcessor(),
+        new ListSettingsProvidersArgumentProcessor(),
+        new ListFullyQualifiedTestsArgumentProcessor(),
+        new ListTestsTargetPathArgumentProcessor(),
+        new ShowDeprecateDotnetVStestMessageArgumentProcessor(),
+        new EnvironmentArgumentProcessor()
+    };
 
-            // Find the associated argument processor.
-            IArgumentProcessor argumentProcessor;
-            CommandToProcessorMap.TryGetValue(pair.Command, out argumentProcessor);
+    /// <summary>
+    /// Builds the command to processor map and special command to processor map.
+    /// </summary>
+    [MemberNotNull(nameof(_commandToProcessorMap), nameof(_specialCommandToProcessorMap))]
+    private void BuildCommandMaps()
+    {
+        _commandToProcessorMap = new Dictionary<string, IArgumentProcessor>(StringComparer.OrdinalIgnoreCase);
+        _specialCommandToProcessorMap = new Dictionary<string, IArgumentProcessor>(StringComparer.OrdinalIgnoreCase);
 
-            // If an argument processor was not found for the command, then consider it as a test source argument.
-            if (argumentProcessor == null)
-            {
-                // Update the command pair since the command is actually the argument in the case of
-                // a test source.
-                pair = new CommandArgumentPair(TestSourceArgumentProcessor.CommandName, argument);
+        foreach (IArgumentProcessor argumentProcessor in AllArgumentProcessors)
+        {
+            // Add the command to the appropriate dictionary.
+            var processorsMap = argumentProcessor.Metadata.Value.IsSpecialCommand
+                ? _specialCommandToProcessorMap
+                : _commandToProcessorMap;
 
-                argumentProcessor = SpecialCommandToProcessorMap[TestSourceArgumentProcessor.CommandName];
-            }
+            string commandName = argumentProcessor.Metadata.Value.CommandName;
+            processorsMap.Add(commandName, argumentProcessor);
+
+            // Add xplat name for the command name
+            commandName = string.Concat("--", commandName.Remove(0, 1));
+            processorsMap.Add(commandName, argumentProcessor);
 
-            if (argumentProcessor != null)
+            if (!argumentProcessor.Metadata.Value.ShortCommandName.IsNullOrEmpty())
             {
-                argumentProcessor = WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor, pair.Argument);
-            }
+                string shortCommandName = argumentProcessor.Metadata.Value.ShortCommandName;
+                processorsMap.Add(shortCommandName, argumentProcessor);
 
-            return argumentProcessor;
+                // Add xplat short name for the command name
+                shortCommandName = shortCommandName.Replace('/', '-');
+                processorsMap.Add(shortCommandName, argumentProcessor);
+            }
         }
+    }
 
-        /// <summary>
-        /// Creates the argument processor associated with the provided command line argument.
-        /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
-        /// </summary>
-        /// <param name="command">Command name of the argument processor.</param>
-        /// <param name="arguments">Command line arguments to create the argument processor for.</param>
-        /// <returns>The argument processor or null if one was not found.</returns>
-        public IArgumentProcessor CreateArgumentProcessor(string command, string[] arguments)
+    /// <summary>
+    /// Decorates a lazy argument processor so that the real processor is initialized when the lazy value is obtained.
+    /// </summary>
+    /// <param name="processor">The lazy processor.</param>
+    /// <param name="initArg">The argument with which the real processor should be initialized.</param>
+    /// <returns>The decorated lazy processor.</returns>
+    public static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(IArgumentProcessor processor, string? initArg = null)
+    {
+        var processorExecutor = processor.Executor;
+        var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
         {
-            if (arguments == null || arguments.Length == 0)
+            IArgumentExecutor? instance;
+            try
             {
-                throw new ArgumentException("Cannot be null or empty", nameof(arguments));
+                instance = processorExecutor!.Value;
             }
-            Contract.EndContractBlock();
-
-            // Find the associated argument processor.
-            IArgumentProcessor argumentProcessor;
-            CommandToProcessorMap.TryGetValue(command, out argumentProcessor);
-
-            if (argumentProcessor != null)
+            catch (Exception e)
             {
-                argumentProcessor = WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor, arguments);
+                EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception creating argument processor: {0}", e);
+                throw;
             }
 
-            return argumentProcessor;
-        }
+            try
+            {
+                instance.Initialize(initArg);
+            }
+            catch (Exception e)
+            {
+                EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception initializing argument processor: {0}", e);
+                throw;
+            }
 
-        /// <summary>
-        /// Creates the default action argument processor.
-        /// The Lazy that is returned will initialize the underlying argument processor when it is first accessed.
-        /// </summary>
-        /// <returns>The default action argument processor.</returns>
-        public IArgumentProcessor CreateDefaultActionArgumentProcessor()
-        {
-            var argumentProcessor = SpecialCommandToProcessorMap[RunTestsArgumentProcessor.CommandName];
-            return WrapLazyProcessorToInitializeOnInstantiation(argumentProcessor);
-        }
+            return instance;
+        }, System.Threading.LazyThreadSafetyMode.PublicationOnly);
+        processor.Executor = lazyArgumentProcessor;
 
-        /// <summary>
-        /// Gets the argument processors that are tagged as special and to be always executed.
-        /// The Lazy's that are returned will initialize the underlying argument processor when first accessed.
-        /// </summary>
-        /// <returns>The argument processors that are tagged as special and to be always executed.</returns>
-        public IEnumerable<IArgumentProcessor> GetArgumentProcessorsToAlwaysExecute()
-        {
-            return SpecialCommandToProcessorMap.Values
-                .Where(lazyProcessor => lazyProcessor.Metadata.Value.IsSpecialCommand && lazyProcessor.Metadata.Value.AlwaysExecute);
-        }
+        return processor;
+    }
 
-        #endregion
-
-        #region Private Methods
-
-        private static IEnumerable<IArgumentProcessor> DefaultArgumentProcessors => new List<IArgumentProcessor> {
-                new HelpArgumentProcessor(),
-                new TestSourceArgumentProcessor(),
-                new ListTestsArgumentProcessor(),
-                new RunTestsArgumentProcessor(),
-                new RunSpecificTestsArgumentProcessor(),
-                new TestAdapterPathArgumentProcessor(),
-                new TestCaseFilterArgumentProcessor(),
-                new ParentProcessIdArgumentProcessor(),
-                new PortArgumentProcessor(),
-                new RunSettingsArgumentProcessor(),
-                new PlatformArgumentProcessor(),
-                new FrameworkArgumentProcessor(),
-                new EnableLoggerArgumentProcessor(),
-                new ParallelArgumentProcessor(),
-                new EnableDiagArgumentProcessor(),
-                new CLIRunSettingsArgumentProcessor(),
-                new ResultsDirectoryArgumentProcessor(),
-                new InIsolationArgumentProcessor(),
-                new CollectArgumentProcessor(),
-                new EnableCodeCoverageArgumentProcessor(),
-                new DisableAutoFakesArgumentProcessor(),
-                new ResponseFileArgumentProcessor(),
-                new EnableBlameArgumentProcessor(),
-                new UseVsixExtensionsArgumentProcessor(),
-                new ListDiscoverersArgumentProcessor(),
-                new ListExecutorsArgumentProcessor(),
-                new ListLoggersArgumentProcessor(),
-                new ListSettingsProvidersArgumentProcessor(),
-                new ListFullyQualifiedTestsArgumentProcessor(),
-                new ListTestsTargetPathArgumentProcessor(),
-                new EnvironmentArgumentProcessor()
-        };
-
-        /// <summary>
-        /// Builds the command to processor map and special command to processor map.
-        /// </summary>
-        private void BuildCommandMaps()
+    /// <summary>
+    /// Decorates a lazy argument processor so that the real processor is initialized when the lazy value is obtained.
+    /// </summary>
+    /// <param name="processor">The lazy processor.</param>
+    /// <param name="initArgs">The argument with which the real processor should be initialized.</param>
+    /// <returns>The decorated lazy processor.</returns>
+    private static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(
+        IArgumentProcessor processor,
+        string[] initArgs)
+    {
+        var processorExecutor = processor.Executor;
+        var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
         {
-            this.commandToProcessorMap = new Dictionary<string, IArgumentProcessor>(StringComparer.OrdinalIgnoreCase);
-            this.specialCommandToProcessorMap = new Dictionary<string, IArgumentProcessor>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (IArgumentProcessor argumentProcessor in this.argumentProcessors)
+            IArgumentsExecutor? instance;
+            try
             {
-                // Add the command to the appropriate dictionary.
-                var processorsMap = argumentProcessor.Metadata.Value.IsSpecialCommand
-                                      ? this.specialCommandToProcessorMap
-                                      : this.commandToProcessorMap;
-
-                string commandName = argumentProcessor.Metadata.Value.CommandName;
-                processorsMap.Add(commandName, argumentProcessor);
-
-                // Add xplat name for the command name
-                commandName = string.Concat("--", commandName.Remove(0, 1));
-                processorsMap.Add(commandName, argumentProcessor);
-
-                if (!string.IsNullOrEmpty(argumentProcessor.Metadata.Value.ShortCommandName))
-                {
-                    string shortCommandName = argumentProcessor.Metadata.Value.ShortCommandName;
-                    processorsMap.Add(shortCommandName, argumentProcessor);
-
-                    // Add xplat short name for the command name
-                    shortCommandName = shortCommandName.Replace('/', '-');
-                    processorsMap.Add(shortCommandName, argumentProcessor);
-                }
+                instance = (IArgumentsExecutor)processorExecutor!.Value;
             }
-        }
-
-        /// <summary>
-        /// Decorates a lazy argument processor so that the real processor is initialized when the lazy value is obtained.
-        /// </summary>
-        /// <param name="processor">The lazy processor.</param>
-        /// <param name="initArg">The argument with which the real processor should be initialized.</param>
-        /// <returns>The decorated lazy processor.</returns>
-        private static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(
-            IArgumentProcessor processor,
-            string initArg = null)
-        {
-            var processorExecutor = processor.Executor;
-            var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
+            catch (Exception e)
             {
-                IArgumentExecutor instance = null;
-                try
-                {
-                    instance = processorExecutor.Value;
-                }
-                catch (Exception e)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception creating argument processor: {0}", e);
-                    }
-                    throw;
-                }
-
-                if (instance != null)
-                {
-                    try
-                    {
-                        instance.Initialize(initArg);
-                    }
-                    catch (Exception e)
-                    {
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception initializing argument processor: {0}", e);
-                        }
-                        throw;
-                    }
-                }
-
-                return instance;
-            }, System.Threading.LazyThreadSafetyMode.PublicationOnly);
-            processor.Executor = lazyArgumentProcessor;
-
-            return processor;
-        }
+                EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception creating argument processor: {0}", e);
+                throw;
+            }
 
-        /// <summary>
-        /// Decorates a lazy argument processor so that the real processor is initialized when the lazy value is obtained.
-        /// </summary>
-        /// <param name="processor">The lazy processor.</param>
-        /// <param name="initArg">The argument with which the real processor should be initialized.</param>
-        /// <returns>The decorated lazy processor.</returns>
-        private static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(
-            IArgumentProcessor processor,
-            string[] initArgs)
-        {
-            var processorExecutor = processor.Executor;
-            var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
+            try
             {
-                IArgumentsExecutor instance = null;
-                try
-                {
-                    instance = (IArgumentsExecutor)processorExecutor.Value;
-                }
-                catch (Exception e)
-                {
-                    if (EqtTrace.IsErrorEnabled)
-                    {
-                        EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception creating argument processor: {0}", e);
-                    }
-                    throw;
-                }
-
-                if (instance != null)
-                {
-                    try
-                    {
-                        instance.Initialize(initArgs);
-                    }
-                    catch (Exception e)
-                    {
-                        if (EqtTrace.IsErrorEnabled)
-                        {
-                            EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception initializing argument processor: {0}", e);
-                        }
-                        throw;
-                    }
-                }
-                return instance;
-            }, System.Threading.LazyThreadSafetyMode.PublicationOnly);
-            processor.Executor = lazyArgumentProcessor;
-
-            return processor;
-        }
+                instance.Initialize(initArgs);
+            }
+            catch (Exception e)
+            {
+                EqtTrace.Error("ArgumentProcessorFactory.WrapLazyProcessorToInitializeOnInstantiation: Exception initializing argument processor: {0}", e);
+                throw;
+            }
+
+            return instance;
+        }, System.Threading.LazyThreadSafetyMode.PublicationOnly);
+        processor.Executor = lazyArgumentProcessor;
 
-        #endregion
+        return processor;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/vstest.console/Processors/Utilities/ArgumentProcessorPriority.cs b/src/vstest.console/Processors/Utilities/ArgumentProcessorPriority.cs
index eb14b21b87..cb7211bd08 100644
--- a/src/vstest.console/Processors/Utilities/ArgumentProcessorPriority.cs
+++ b/src/vstest.console/Processors/Utilities/ArgumentProcessorPriority.cs
@@ -1,81 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Defines the priority of argument processors.
+/// </summary>
+internal enum ArgumentProcessorPriority
 {
     /// <summary>
-    /// Defines the priority of argument processors.
+    /// Maximum priority for a processor.
     /// </summary>
-    internal enum ArgumentProcessorPriority
-    {
-        /// <summary>
-        /// Maximum priority for a processor.
-        /// </summary>
-        Maximum = 0,
+    Maximum = 0,
 
-        /// <summary>
-        /// Priority of the Help Content argument processor.
-        /// </summary>
-        Help = Maximum,
+    /// <summary>
+    /// Priority of the Help Content argument processor.
+    /// </summary>
+    Help = Maximum,
 
-        /// <summary>
-        /// Priority of the Diag processor.
-        /// </summary>
-        Diag = 1,
+    /// <summary>
+    /// Priority of the Diag processor.
+    /// </summary>
+    Diag = 1,
+
+    /// <summary>
+    /// Priority of processors related to design mode. This needs to be higher priority
+    /// since some of the functionalities (like logger) depend on this.
+    /// </summary>
+    DesignMode = 2,
 
-        /// <summary>
-        /// Priority of processors related to design mode. This needs to be higher priority
-        /// since some of the functionalities (like logger) depend on this.
-        /// </summary>
-        DesignMode = 2,
+    /// <summary>
+    /// Priority of UseVsixArgumentProcessor.
+    /// The priority of useVsix processor is more than the logger because logger initialization
+    /// loads the extensions which are incomplete if vsix processor is enabled
+    /// </summary>
+    VsixExtensions = 5,
 
-        /// <summary>
-        /// Priority of UseVsixArgumentProcessor.
-        /// The priority of useVsix processor is more than the logger because logger initialization
-        /// loads the extensions which are incomplete if vsix processor is enabled
-        /// </summary>
-        VsixExtensions = 5,
+    /// <summary>
+    /// Priority of processors related to Run Settings.
+    /// </summary>
+    RunSettings = 6,
 
-        /// <summary>
-        /// Priority of processors related to Run Settings.
-        /// </summary>
-        RunSettings = 6,
+    /// <summary>
+    /// Priority of TestAdapterPathArgumentProcessor.
+    ///
+    /// The priority of TestAdapterPath processor is more than the logger because logger initialization
+    /// loads the extensions which are incomplete if custom test adapter is enabled
+    /// </summary>
+    TestAdapterPath = 9,
 
-        /// <summary>
-        /// Priority of TestAdapterPathArgumentProcessor.
-        /// The priority of TestAdapterPath processor is more than the logger because logger initialization
-        /// loads the extensions which are incomplete if custom test adapter is enabled
-        /// </summary>
-        TestAdapterPath = 10,
+    /// <summary>
+    /// Priority of TestAdapterLoadingStrategyArgumentProcessor.
+    ///
+    /// This needs to be higher than most of other arguments, because it affects where we look for test adapters.
+    /// </summary>
+    TestAdapterLoadingStrategy = 10,
 
-        /// <summary>
-        /// Priority of processors that needs to update runsettings.
-        /// </summary>
-        AutoUpdateRunSettings = 11,
+    /// <summary>
+    /// Priority of processors that needs to update runsettings.
+    /// </summary>
+    AutoUpdateRunSettings = 11,
 
-        /// <summary>
-        /// Priority of processors related to CLI Run Settings.
-        /// </summary>
-        CLIRunSettings = 12,
+    /// <summary>
+    /// Priority of processors related to CLI Run Settings.
+    /// </summary>
+    CliRunSettings = 12,
 
-        /// <summary>
-        /// Priority of processors related to logging.
-        /// </summary>
-        Logging = 20,
+    /// <summary>
+    /// Priority of processors related to logging.
+    /// </summary>
+    Logging = 20,
 
-        /// <summary>
-        /// Priority of the StartLogging processor.
-        /// </summary>
-        StartLogging = 21,
+    /// <summary>
+    /// Priority of the StartLogging processor.
+    /// </summary>
+    StartLogging = 21,
 
-        /// <summary>
-        /// Priority of a typical processor.
-        /// </summary>
-        Normal = 50,
+    /// <summary>
+    /// Priority of a typical processor.
+    /// </summary>
+    Normal = 50,
 
-        /// <summary>
-        /// Minimum priority for a processor.
-        /// </summary>
-        Minimum = 100
-    }
+    /// <summary>
+    /// Minimum priority for a processor.
+    /// </summary>
+    Minimum = 100
 }
diff --git a/src/vstest.console/Processors/Utilities/ArgumentProcessorResult.cs b/src/vstest.console/Processors/Utilities/ArgumentProcessorResult.cs
index 99b192de76..35bf880f43 100644
--- a/src/vstest.console/Processors/Utilities/ArgumentProcessorResult.cs
+++ b/src/vstest.console/Processors/Utilities/ArgumentProcessorResult.cs
@@ -1,26 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Return values from argument processors.
+/// </summary>
+public enum ArgumentProcessorResult
 {
     /// <summary>
-    /// Return values from argument processors.
+    /// Return value indicating no errors.
     /// </summary>
-    public enum ArgumentProcessorResult
-    {
-        /// <summary>
-        /// Return value indicating no errors.
-        /// </summary>
-        Success = 0,
+    Success = 0,
 
-        /// <summary>
-        /// Return value indicating an error occurred
-        /// </summary>
-        Fail = 1,
+    /// <summary>
+    /// Return value indicating an error occurred
+    /// </summary>
+    Fail = 1,
 
-        /// <summary>
-        /// Return value indicating that the current processor succeeded and subsequent processors should be skipped
-        /// </summary>
-        Abort = 2
-    }
+    /// <summary>
+    /// Return value indicating that the current processor succeeded and subsequent processors should be skipped
+    /// </summary>
+    Abort = 2
 }
diff --git a/src/vstest.console/Processors/Utilities/ArgumentProcessorUtilities.cs b/src/vstest.console/Processors/Utilities/ArgumentProcessorUtilities.cs
index b8ea8c0f9a..99f9130d39 100644
--- a/src/vstest.console/Processors/Utilities/ArgumentProcessorUtilities.cs
+++ b/src/vstest.console/Processors/Utilities/ArgumentProcessorUtilities.cs
@@ -1,65 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
 
-    internal class ArgumentProcessorUtilities
+internal class ArgumentProcessorUtilities
+{
+    public static readonly char[] SemiColonArgumentSeparator = [';'];
+    public static readonly char[] EqualNameValueSeparator = ['='];
+
+    /// <summary>
+    /// Get argument list from raw argument using argument separator.
+    /// </summary>
+    /// <param name="rawArgument">Raw argument.</param>
+    /// <param name="argumentSeparator">Argument separator.</param>
+    /// <param name="exceptionMessage">Exception Message.</param>
+    /// <returns>Argument list.</returns>
+    public static string[] GetArgumentList(string rawArgument, char[] argumentSeparator, string exceptionMessage)
     {
-        public static readonly char[] SemiColonArgumentSeparator = { ';' };
-        public static readonly char[] EqualNameValueSeparator = { '=' };
+        var argumentList = rawArgument.Split(argumentSeparator, StringSplitOptions.RemoveEmptyEntries);
 
-        /// <summary>
-        /// Get argument list from raw argument using argument separator.
-        /// </summary>
-        /// <param name="rawArgument">Raw argument.</param>
-        /// <param name="argumentSeparator">Argument separator.</param>
-        /// <param name="exceptionMessage">Exception Message.</param>
-        /// <returns>Argument list.</returns>
-        public static string[] GetArgumentList(string rawArgument, char[] argumentSeparator, string exceptionMessage)
+        // Throw error in case of invalid argument.
+        if (argumentList.Length <= 0)
+        {
+            throw new CommandLineException(exceptionMessage);
+        }
+        else
         {
-            var argumentList = rawArgument?.Split(argumentSeparator, StringSplitOptions.RemoveEmptyEntries);
-
-            // Throw error in case of invalid argument.
-            if (argumentList == null || argumentList.Length <= 0)
-            {
-                throw new CommandLineException(exceptionMessage);
-            }
-
             return argumentList;
         }
+    }
+
+    /// <summary>
+    /// Get argument parameters.
+    /// </summary>
+    /// <param name="parameterArgs">Parameter args.</param>
+    /// <param name="nameValueSeparator">Name value separator.</param>
+    /// <param name="exceptionMessage">Exception message.</param>
+    /// <returns>Parameters dictionary.</returns>
+    public static Dictionary<string, string> GetArgumentParameters(IEnumerable<string> parameterArgs, char[] nameValueSeparator, string exceptionMessage)
+    {
+        var parameters = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-        /// <summary>
-        /// Get argument parameters.
-        /// </summary>
-        /// <param name="parameterArgs">Parameter args.</param>
-        /// <param name="nameValueSeparator">Name value separator.</param>
-        /// <param name="exceptionMessage">Exception message.</param>
-        /// <returns>Parameters dictionary.</returns>
-        public static Dictionary<string, string> GetArgumentParameters(IEnumerable<string> parameterArgs, char[] nameValueSeparator, string exceptionMessage)
+        // Get parameters from parameterNameValuePairs.
+        // Throw error in case of invalid name value pairs.
+        foreach (string parameterArg in parameterArgs)
         {
-            var parameters = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var nameValuePair = parameterArg?.Split(nameValueSeparator, StringSplitOptions.RemoveEmptyEntries);
 
-            // Get parameters from parameterNameValuePairs.
-            // Throw error in case of invalid name value pairs.
-            foreach (string parameterArg in parameterArgs)
+            if (nameValuePair?.Length != 2)
             {
-                var nameValuePair = parameterArg?.Split(nameValueSeparator, StringSplitOptions.RemoveEmptyEntries);
-
-                if (nameValuePair.Length != 2)
-                {
-                    throw new CommandLineException(exceptionMessage);
-                }
-
-                parameters[nameValuePair[0]] = nameValuePair[1];
+                throw new CommandLineException(exceptionMessage);
             }
 
-            return parameters;
+            parameters[nameValuePair[0]] = nameValuePair[1];
         }
+
+        return parameters;
     }
 }
diff --git a/src/vstest.console/Processors/Utilities/BaseArgumentProcessorCapabilities.cs b/src/vstest.console/Processors/Utilities/BaseArgumentProcessorCapabilities.cs
index 2a892e8168..a7416e421e 100644
--- a/src/vstest.console/Processors/Utilities/BaseArgumentProcessorCapabilities.cs
+++ b/src/vstest.console/Processors/Utilities/BaseArgumentProcessorCapabilities.cs
@@ -1,56 +1,55 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// The base argument processor capabilities.
+/// </summary>
+internal abstract class BaseArgumentProcessorCapabilities : IArgumentProcessorCapabilities
 {
     /// <summary>
-    /// The base argument processor capabilities.
-    /// </summary>
-    internal abstract class BaseArgumentProcessorCapabilities : IArgumentProcessorCapabilities
-    {
-        /// <summary>
-        /// Gets a value indicating whether allow multiple.
-        /// </summary>
-        public virtual bool AllowMultiple => true;
-
-        /// <summary>
-        /// Gets a value indicating whether always execute.
-        /// </summary>
-        public virtual bool AlwaysExecute => false;
-
-        /// <summary>
-        /// Gets the command name.
-        /// </summary>
-        public abstract string CommandName { get; }
-
-        /// <summary>
-        /// Gets the short command name.
-        /// </summary>
-        public virtual string ShortCommandName => null;
-
-        /// <summary>
-        /// Gets the help content resource name.
-        /// </summary>
-        public virtual string HelpContentResourceName => null;
-
-        /// <summary>
-        /// Gets the help priority.
-        /// </summary>
-        public virtual HelpContentPriority HelpPriority => HelpContentPriority.None;
-
-        /// <summary>
-        /// Gets a value indicating whether is action.
-        /// </summary>
-        public virtual bool IsAction => false;
-
-        /// <summary>
-        /// Gets a value indicating whether is special command.
-        /// </summary>
-        public virtual bool IsSpecialCommand => false;
-
-        /// <summary>
-        /// Gets the priority.
-        /// </summary>
-        public virtual ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
-    }
+    /// Gets a value indicating whether allow multiple.
+    /// </summary>
+    public virtual bool AllowMultiple => true;
+
+    /// <summary>
+    /// Gets a value indicating whether always execute.
+    /// </summary>
+    public virtual bool AlwaysExecute => false;
+
+    /// <summary>
+    /// Gets the command name.
+    /// </summary>
+    public abstract string CommandName { get; }
+
+    /// <summary>
+    /// Gets the short command name.
+    /// </summary>
+    public virtual string? ShortCommandName => null;
+
+    /// <summary>
+    /// Gets the help content resource name.
+    /// </summary>
+    public virtual string? HelpContentResourceName => null;
+
+    /// <summary>
+    /// Gets the help priority.
+    /// </summary>
+    public virtual HelpContentPriority HelpPriority => HelpContentPriority.None;
+
+    /// <summary>
+    /// Gets a value indicating whether is action.
+    /// </summary>
+    public virtual bool IsAction => false;
+
+    /// <summary>
+    /// Gets a value indicating whether is special command.
+    /// </summary>
+    public virtual bool IsSpecialCommand => false;
+
+    /// <summary>
+    /// Gets the priority.
+    /// </summary>
+    public virtual ArgumentProcessorPriority Priority => ArgumentProcessorPriority.Normal;
 }
diff --git a/src/vstest.console/Processors/Utilities/HelpContentPriority.cs b/src/vstest.console/Processors/Utilities/HelpContentPriority.cs
index ecd57d18de..b1f0562eae 100644
--- a/src/vstest.console/Processors/Utilities/HelpContentPriority.cs
+++ b/src/vstest.console/Processors/Utilities/HelpContentPriority.cs
@@ -1,180 +1,185 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+/// <summary>
+/// Attribute to be used for displaying the help content in required order.
+///
+/// Order of settings display (based on lifecycle at https://blogs.msdn.microsoft.com/visualstudioalm/2016/07/25/evolving-the-visual-studio-test-platform-part-1/).
+///
+/// Selection
+/// --Tests
+/// --TestCaseFilter
+///
+/// Configure
+/// --Framework
+/// --Platform
+/// --Settings
+/// --CLI runsettings
+///
+/// Run/Discover
+/// --ListTests
+/// --Parallel
+/// --TestAdapterPath
+/// --TestAdapterLoadingStrategy
+///
+/// Diagnose/Report
+/// --Diag
+/// --Logger
+/// --ResultsDirectory
+///
+/// IDE Automation
+/// --ParentProcessId
+/// --Port
+///
+/// Help
+/// --Help
+/// </summary>
+internal enum HelpContentPriority
 {
     /// <summary>
-    /// Attribute to be used for displaying the help content in required order.
-    ///
-    /// Order of settings display (based on lifecycle at https://blogs.msdn.microsoft.com/visualstudioalm/2016/07/25/evolving-the-visual-studio-test-platform-part-1/).
-    ///
-    /// Selection
-    /// --Tests
-    /// --TestCaseFilter
-    ///
-    /// Configure
-    /// --Framework
-    /// --Platform
-    /// --Settings
-    /// --CLI runsettings
-    ///
-    /// Run/Discover
-    /// --ListTests
-    /// --Parallel
-    /// --TestAdapterPath
-    ///
-    /// Diagnose/Report
-    /// --Diag
-    /// --Logger
-    /// --ResultsDirectory
-    ///
-    /// IDE Automation
-    /// --ParentProcessId
-    /// --Port
-    ///
-    /// Help
-    /// -�Help
-    /// </summary>
-    internal enum HelpContentPriority
-    {
-        /// <summary>
-        /// No Content to be shown
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// RunTestsArgumentProcessor Help
-        /// </summary>
-        RunTestsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// RunSpecificTestsArgumentProcessor Help
-        /// </summary>
-        RunSpecificTestsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// TestCaseFilterArgumentProcessor Help
-        /// </summary>
-        TestCaseFilterArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// FrameworkArgumentProcessor Help
-        /// </summary>
-        FrameworkArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// PlatformArgumentProcessor Help
-        /// </summary>
-        PlatformArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// EnvironmentArgumentProcessor Help
-        /// </summary>
-        EnvironmentArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// RunSettingsArgumentProcessor Help
-        /// </summary>
-        RunSettingsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// CLIRunSettingsArgumentProcessor Help
-        /// </summary>
-        CLIRunSettingsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ListTestsArgumentExecutor Help
-        /// </summary>
-        ListTestsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ParallelArgumentProcessor Help
-        /// </summary>
-        ParallelArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// TestAdapterPathArgumentProcessor Help
-        /// </summary>
-        TestAdapterPathArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// EnableDiagArgumentProcessor Help
-        /// </summary>
-        EnableDiagArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// EnableLoggerArgumentProcessor Help
-        /// </summary>
-        EnableLoggerArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ResultsDirectoryArgumentProcessor Help
-        /// </summary>
-        ResultsDirectoryArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// PortArgumentProcessor Help
-        /// </summary>
-        ParentProcessIdArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// PortArgumentProcessor Help
-        /// </summary>
-        PortArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// HelpArgumentExecutor
-        /// </summary>
-        HelpArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// EnableCodeCoverageArgumentProcessor Help
-        /// </summary>
-        EnableCodeCoverageArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// CollectArgumentProcessor Help
-        /// </summary>
-        CollectArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// InIsolationArgumentProcessor Help
-        /// </summary>
-        InIsolationArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// DisableAutoFakesArgumentProcessor Help
-        /// </summary>
-        DisableAutoFakesArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// UseVsixArgumentProcessor Help
-        /// </summary>
-        UseVsixArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ListDiscoverersArgumentProcessor Help
-        /// </summary>
-        ListDiscoverersArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ListExecutorsArgumentProcessor Help
-        /// </summary>
-        ListExecutorsArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ListLoggersArgumentProcessor Help
-        /// </summary>
-        ListLoggersArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ListSettingProviderArgumentProcessor Help
-        /// </summary>
-        ListSettingsProvidersArgumentProcessorHelpPriority,
-
-        /// <summary>
-        /// ResponseFileArgumentProcessor Help
-        /// </summary>
-        ResponseFileArgumentProcessorHelpPriority,
-    }
+    /// No Content to be shown
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// RunTestsArgumentProcessor Help
+    /// </summary>
+    RunTestsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// RunSpecificTestsArgumentProcessor Help
+    /// </summary>
+    RunSpecificTestsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// TestCaseFilterArgumentProcessor Help
+    /// </summary>
+    TestCaseFilterArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// FrameworkArgumentProcessor Help
+    /// </summary>
+    FrameworkArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// PlatformArgumentProcessor Help
+    /// </summary>
+    PlatformArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// EnvironmentArgumentProcessor Help
+    /// </summary>
+    EnvironmentArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// RunSettingsArgumentProcessor Help
+    /// </summary>
+    RunSettingsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// CLIRunSettingsArgumentProcessor Help
+    /// </summary>
+    CliRunSettingsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ListTestsArgumentExecutor Help
+    /// </summary>
+    ListTestsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ParallelArgumentProcessor Help
+    /// </summary>
+    ParallelArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// TestAdapterPathArgumentProcessor Help
+    /// </summary>
+    TestAdapterPathArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// TestAdapterLoadingStrategyArgumentProcessor Help
+    /// </summary>
+    TestAdapterLoadingStrategyArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// EnableDiagArgumentProcessor Help
+    /// </summary>
+    EnableDiagArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// EnableLoggerArgumentProcessor Help
+    /// </summary>
+    EnableLoggerArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ResultsDirectoryArgumentProcessor Help
+    /// </summary>
+    ResultsDirectoryArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// PortArgumentProcessor Help
+    /// </summary>
+    ParentProcessIdArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// PortArgumentProcessor Help
+    /// </summary>
+    PortArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// HelpArgumentExecutor
+    /// </summary>
+    HelpArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// EnableCodeCoverageArgumentProcessor Help
+    /// </summary>
+    EnableCodeCoverageArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// CollectArgumentProcessor Help
+    /// </summary>
+    CollectArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// InIsolationArgumentProcessor Help
+    /// </summary>
+    InIsolationArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// DisableAutoFakesArgumentProcessor Help
+    /// </summary>
+    DisableAutoFakesArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// UseVsixArgumentProcessor Help
+    /// </summary>
+    UseVsixArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ListDiscoverersArgumentProcessor Help
+    /// </summary>
+    ListDiscoverersArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ListExecutorsArgumentProcessor Help
+    /// </summary>
+    ListExecutorsArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ListLoggersArgumentProcessor Help
+    /// </summary>
+    ListLoggersArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ListSettingProviderArgumentProcessor Help
+    /// </summary>
+    ListSettingsProvidersArgumentProcessorHelpPriority,
+
+    /// <summary>
+    /// ResponseFileArgumentProcessor Help
+    /// </summary>
+    ResponseFileArgumentProcessorHelpPriority,
 }
diff --git a/src/vstest.console/Processors/Utilities/LoggerUtilities.cs b/src/vstest.console/Processors/Utilities/LoggerUtilities.cs
index fd778c32d2..2ff6db9904 100644
--- a/src/vstest.console/Processors/Utilities/LoggerUtilities.cs
+++ b/src/vstest.console/Processors/Utilities/LoggerUtilities.cs
@@ -1,83 +1,82 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.Xml;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities
-{
-    using System;
-    using System.Xml;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
 
-    internal class LoggerUtilities
+internal class LoggerUtilities
+{
+    /// <summary>
+    /// Add logger to run settings.
+    /// </summary>
+    /// <param name="loggerIdentifier">Logger Identifier.</param>
+    /// <param name="loggerParameters">Logger parameters.</param>
+    /// <param name="runSettingsManager">Run settings manager.</param>
+    public static void AddLoggerToRunSettings(string loggerIdentifier, Dictionary<string, string>? loggerParameters, IRunSettingsProvider runSettingsManager)
     {
-        /// <summary>
-        /// Add logger to run settings.
-        /// </summary>
-        /// <param name="loggerIdentifier">Logger Identifier.</param>
-        /// <param name="loggerParameters">Logger parameters.</param>
-        /// <param name="runSettingsManager">Run settings manager.</param>
-        public static void AddLoggerToRunSettings(string loggerIdentifier, Dictionary<string, string> loggerParameters, IRunSettingsProvider runSettingsManager)
+        // Creating default run settings if required.
+        var settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
+        if (settings == null)
         {
-            // Creating default run settings if required.
-            var settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
-            if (settings == null)
-            {
-                runSettingsManager.AddDefaultRunSettings();
-                settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
-            }
+            runSettingsManager.AddDefaultRunSettings();
+            settings = runSettingsManager.ActiveRunSettings?.SettingsXml;
+        }
 
-            var logger = default(LoggerSettings);
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(settings) ?? new LoggerRunSettings();
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(settings) ?? new LoggerRunSettings();
 
-            try
-            {
-                // Logger as uri in command line.
-                var loggerUri = new Uri(loggerIdentifier);
-                logger = new LoggerSettings
-                {
-                    Uri = loggerUri,
-                    IsEnabled = true
-                };
-            }
-            catch (UriFormatException)
+        LoggerSettings logger;
+        try
+        {
+            // Logger as uri in command line.
+            var loggerUri = new Uri(loggerIdentifier);
+            logger = new LoggerSettings
             {
-                // Logger as friendlyName in command line.
-                logger = new LoggerSettings
-                {
-                    FriendlyName = loggerIdentifier,
-                    IsEnabled = true
-                };
-            }
-
-            // Converting logger console params to Configuration element
-            if (loggerParameters != null && loggerParameters.Count > 0)
+                Uri = loggerUri,
+                IsEnabled = true
+            };
+        }
+        catch (UriFormatException)
+        {
+            // Logger as friendlyName in command line.
+            logger = new LoggerSettings
             {
-                var XmlDocument = new XmlDocument();
-                var outerNode = XmlDocument.CreateElement("Configuration");
-                foreach (KeyValuePair<string, string> entry in loggerParameters)
-                {
-                    var node = XmlDocument.CreateElement(entry.Key);
-                    node.InnerText = entry.Value;
-                    outerNode.AppendChild(node);
-                }
-
-                logger.Configuration = outerNode;
-            }
+                FriendlyName = loggerIdentifier,
+                IsEnabled = true
+            };
+        }
 
-            // Remove existing logger.
-            var existingLoggerIndex = loggerRunSettings.GetExistingLoggerIndex(logger);
-            if (existingLoggerIndex >= 0)
+        // Converting logger console params to Configuration element
+        if (loggerParameters != null && loggerParameters.Count > 0)
+        {
+            var xmlDocument = new XmlDocument();
+            var outerNode = xmlDocument.CreateElement("Configuration");
+            foreach (KeyValuePair<string, string> entry in loggerParameters)
             {
-                loggerRunSettings.LoggerSettingsList.RemoveAt(existingLoggerIndex);
+                var node = xmlDocument.CreateElement(entry.Key);
+                node.InnerText = entry.Value;
+                outerNode.AppendChild(node);
             }
 
-            loggerRunSettings.LoggerSettingsList.Add(logger);
+            logger.Configuration = outerNode;
+        }
 
-            runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.LoggerRunSettingsName, loggerRunSettings.ToXml().InnerXml);
+        // Remove existing logger.
+        var existingLoggerIndex = loggerRunSettings.GetExistingLoggerIndex(logger);
+        if (existingLoggerIndex >= 0)
+        {
+            loggerRunSettings.LoggerSettingsList.RemoveAt(existingLoggerIndex);
         }
+
+        loggerRunSettings.LoggerSettingsList.Add(logger);
+
+        runSettingsManager.UpdateRunSettingsNodeInnerXml(Constants.LoggerRunSettingsName, loggerRunSettings.ToXml().InnerXml);
     }
 }
diff --git a/src/vstest.console/Program.cs b/src/vstest.console/Program.cs
index d0a041b2ba..2ad1179585 100644
--- a/src/vstest.console/Program.cs
+++ b/src/vstest.console/Program.cs
@@ -1,28 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.Execution;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
+using System.Text;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine;
 
+/// <summary>
+/// Main entry point for the command line runner.
+/// </summary>
+public static class Program
+{
     /// <summary>
-    /// Main entry point for the command line runner.
+    /// Main entry point. Hands off execution to the executor class.
     /// </summary>
-    public static class Program
+    /// <param name="args">Arguments provided on the command line.</param>
+    /// <returns>0 if everything was successful and 1 otherwise.</returns>
+    public static int Main(string[]? args) => Run(args, new());
+
+    internal static int Run(string[]? args, UiLanguageOverride uiLanguageOverride)
     {
-        /// <summary>
-        /// Main entry point. Hands off execution to the executor class.
-        /// </summary>
-        /// <param name="args">Arguments provided on the command line.</param>
-        /// <returns>0 if everything was successful and 1 otherwise.</returns>
-        public static int Main(string[] args)
+        if (!FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_UTF8_CONSOLE_ENCODING))
         {
-            DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_RUNNER_DEBUG_ATTACHVS");
-            DebuggerBreakpoint.WaitForDebugger("VSTEST_RUNNER_DEBUG");
-            UILanguageOverride.SetCultureSpecifiedByUser();
-            return new Executor(ConsoleOutput.Instance).Execute(args);
+            Console.OutputEncoding = Encoding.UTF8;
         }
+        uiLanguageOverride.SetCultureSpecifiedByUser();
+        return new Executor(ConsoleOutput.Instance).Execute(args);
     }
 }
diff --git a/src/vstest.console/Properties/AssemblyInfo.cs b/src/vstest.console/Properties/AssemblyInfo.cs
deleted file mode 100644
index 73f3d9c686..0000000000
--- a/src/vstest.console/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyProduct("vstest.console")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4d89e2f0-2e9d-41ca-a394-322a2e9a2c0b")]
diff --git a/src/vstest.console/PublicAPI/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..6e73611cbf
--- /dev/null
+++ b/src/vstest.console/PublicAPI/PublicAPI.Shipped.txt
@@ -0,0 +1,37 @@
+#nullable enable
+Microsoft.VisualStudio.TestPlatform.CommandLine.CommandLineException
+Microsoft.VisualStudio.TestPlatform.CommandLine.CommandLineException.CommandLineException() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.CommandLineException.CommandLineException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.CommandLineException.CommandLineException(string? message, System.Exception? innerException) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Internal.Product
+Microsoft.VisualStudio.TestPlatform.CommandLine.Internal.Product.Product() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult
+Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult.Abort = 2 -> Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult
+Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult.Fail = 1 -> Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult
+Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult.Success = 0 -> Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.ArgumentProcessorResult
+Microsoft.VisualStudio.TestPlatform.CommandLine.Program
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.IMetricsPublisher
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.IMetricsPublisher.PublishMetrics(string! eventName, System.Collections.Generic.IDictionary<string!, object?>! metrics) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.MetricsPublisherFactory
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.MetricsPublisherFactory.MetricsPublisherFactory() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.NoOpMetricsPublisher
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.NoOpMetricsPublisher.Dispose() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.NoOpMetricsPublisher.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.NoOpMetricsPublisher.NoOpMetricsPublisher() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.NoOpMetricsPublisher.PublishMetrics(string! eventName, System.Collections.Generic.IDictionary<string!, object?>! metrics) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.TextFileTelemetryPublisher
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.TextFileTelemetryPublisher.Dispose() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.TextFileTelemetryPublisher.Dispose(bool disposing) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.TextFileTelemetryPublisher.PublishMetrics(string! eventName, System.Collections.Generic.IDictionary<string!, object?>! metrics) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.TextFileTelemetryPublisher.TextFileTelemetryPublisher() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.TestSourceException
+Microsoft.VisualStudio.TestPlatform.CommandLine.TestSourceException.TestSourceException() -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.TestSourceException.TestSourceException(string? message) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLine.TestSourceException.TestSourceException(string? message, System.Exception? innerException) -> void
+Microsoft.VisualStudio.TestPlatform.CommandLineUtilities.GenerateFakesUtilities
+static Microsoft.VisualStudio.TestPlatform.CommandLine.Program.Main(string![]? args) -> int
+static Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.MetricsPublisherFactory.GetMetricsPublisher(bool isTelemetryOptedIn, bool isDesignMode) -> System.Threading.Tasks.Task<Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher.IMetricsPublisher!>!
+static readonly Microsoft.VisualStudio.TestPlatform.CommandLine.Internal.Product.Version -> string?
+vstest.console.Internal.FilePatternParser
+vstest.console.Internal.FilePatternParser.FilePatternParser() -> void
+vstest.console.Internal.FilePatternParser.GetMatchingFiles(string! filePattern) -> System.Collections.Generic.List<string!>!
diff --git a/src/vstest.console/PublicAPI/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net48/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net48/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net48/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net48/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net48/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net48/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/net9.0/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
new file mode 100644
index 0000000000..7dc5c58110
--- /dev/null
+++ b/src/vstest.console/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/vstest.console/Publisher/IMetricsPublisher.cs b/src/vstest.console/Publisher/IMetricsPublisher.cs
index 045735bedb..30e235bcc7 100644
--- a/src/vstest.console/Publisher/IMetricsPublisher.cs
+++ b/src/vstest.console/Publisher/IMetricsPublisher.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
 
+/// <summary>
+/// Publish the metrics
+/// </summary>
+public interface IMetricsPublisher : IDisposable
+{
     /// <summary>
-    /// Publish the metrics
+    /// Publish the Metrics
     /// </summary>
-    public interface IMetricsPublisher : IDisposable
-    {
-        /// <summary>
-        /// Publish the Metrics
-        /// </summary>
-        /// <param name="eventName">The event Name</param>
-        /// <param name="metrics">Key/Value pair of Properties and Values</param>
-        void PublishMetrics(string eventName, IDictionary<string, object> metrics);
-    }
+    /// <param name="eventName">The event Name</param>
+    /// <param name="metrics">Key/Value pair of Properties and Values</param>
+    void PublishMetrics(string eventName, IDictionary<string, object?> metrics);
 }
diff --git a/src/vstest.console/Publisher/MetricsPublisherFactory.cs b/src/vstest.console/Publisher/MetricsPublisherFactory.cs
index 96d45ddef1..ef2dbd3ae8 100644
--- a/src/vstest.console/Publisher/MetricsPublisherFactory.cs
+++ b/src/vstest.console/Publisher/MetricsPublisherFactory.cs
@@ -1,33 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher
-{
-    using System;
-    using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
 
+/// <summary>
+/// Returns the Instance of <see cref="IMetricsPublisher"/> on basis of given parameters.
+/// </summary>
+public class MetricsPublisherFactory
+{
     /// <summary>
-    /// Returns the Instance of <see cref="IMetricsPublisher"/> on basis of given parameters.
+    /// Gets the Metrics Publisher
     /// </summary>
-    public class MetricsPublisherFactory
+    /// <param name="isTelemetryOptedIn">Is Telemetry opted in or not</param>
+    /// <param name="isDesignMode">Is Design Mode enabled or not</param>
+    /// <returns>Returns Instance of Metrics Publisher</returns>
+    public static async Task<IMetricsPublisher> GetMetricsPublisher(bool isTelemetryOptedIn, bool isDesignMode)
     {
-        /// <summary>
-        /// Gets the Metrics Publisher
-        /// </summary>
-        /// <param name="isTelemetryOptedIn">Is Telemetry opted in or not</param>
-        /// <param name="isDesignMode">Is Design Mode enabled or not</param>
-        /// <returns>Returns Instance of Metrics Publisher</returns>
-        public static async Task<IMetricsPublisher> GetMetricsPublisher(bool isTelemetryOptedIn, bool isDesignMode)
-        {
-            var logEnabled = Environment.GetEnvironmentVariable("VSTEST_LOGTELEMETRY");
-            bool logTelemery = !string.IsNullOrEmpty(logEnabled) && logEnabled.Equals("1", StringComparison.Ordinal);
-
-            if (isTelemetryOptedIn && !isDesignMode && logTelemery)
-            {
-                return await Task.FromResult<IMetricsPublisher>(new TextFileTelemetryPublisher());
-            }
+        var logEnabled = Environment.GetEnvironmentVariable("VSTEST_LOGTELEMETRY");
+        bool logTelemery = string.Equals(logEnabled, "1", StringComparison.Ordinal);
 
-            return await Task.FromResult<IMetricsPublisher>(new NoOpMetricsPublisher());
-        }
+        return isTelemetryOptedIn && !isDesignMode && logTelemery
+            ? await Task.FromResult<IMetricsPublisher>(new TextFileTelemetryPublisher())
+            : await Task.FromResult<IMetricsPublisher>(new NoOpMetricsPublisher());
     }
 }
diff --git a/src/vstest.console/Publisher/NoOpMetricsPublisher.cs b/src/vstest.console/Publisher/NoOpMetricsPublisher.cs
index 6aeaf91569..f9d6cffad5 100644
--- a/src/vstest.console/Publisher/NoOpMetricsPublisher.cs
+++ b/src/vstest.console/Publisher/NoOpMetricsPublisher.cs
@@ -1,31 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+
+/// <summary>
+/// This class will be initialized if Telemetry is opted out.
+/// </summary>
+public class NoOpMetricsPublisher : IMetricsPublisher
 {
-    using System.Collections.Generic;
+    /// <summary>
+    /// Will do NO-OP.
+    /// </summary>
+    /// <param name="eventName"></param>
+    /// <param name="metrics"></param>
+    public void PublishMetrics(string eventName, IDictionary<string, object?> metrics)
+    {
+        // No Operation
+    }
 
     /// <summary>
-    /// This class will be initialized if Telemetry is opted out.
+    /// Will do NO-OP
     /// </summary>
-    public class NoOpMetricsPublisher : IMetricsPublisher
+    public void Dispose()
     {
-        /// <summary>
-        /// Will do NO-OP.
-        /// </summary>
-        /// <param name="eventName"></param>
-        /// <param name="metrics"></param>
-        public void PublishMetrics(string eventName, IDictionary<string, object> metrics)
-        {
-            // No Operation
-        }
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Will do NO-OP
-        /// </summary>
-        public void Dispose()
-        {
-            // No operation
-        }
+    protected virtual void Dispose(bool disposing)
+    {
+        // No operation
     }
 }
diff --git a/src/vstest.console/Publisher/TextFileTelemetryPublisher.cs b/src/vstest.console/Publisher/TextFileTelemetryPublisher.cs
index 1ad375e902..8554578b96 100644
--- a/src/vstest.console/Publisher/TextFileTelemetryPublisher.cs
+++ b/src/vstest.console/Publisher/TextFileTelemetryPublisher.cs
@@ -1,74 +1,77 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+
+/// <summary>
+/// This class will be initialized if Telemetry is opted out.
+/// </summary>
+public class TextFileTelemetryPublisher : IMetricsPublisher
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
+    /// <summary>
+    /// Publishes telemetry to a file.
+    /// </summary>
+    /// <param name="eventName"></param>
+    /// <param name="metrics"></param>
+    public void PublishMetrics(string eventName, IDictionary<string, object?> metrics)
+    {
+        // Log to Text File
+        LogToFile(eventName, metrics, new FileHelper());
+    }
+
+    /// <summary>
+    /// Will do NO-OP
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    protected virtual void Dispose(bool disposing)
+    {
+        // No operation
+    }
 
     /// <summary>
-    /// This class will be initialized if Telemetry is opted out.
+    /// Log the telemetry to file.
+    /// For Testing purposes.
     /// </summary>
-    public class TextFileTelemetryPublisher : IMetricsPublisher
+    /// <param name="eventName">
+    /// The event Name.
+    /// </param>
+    /// <param name="metrics">
+    /// Metrics
+    /// </param>
+    /// <param name="fileHelper">
+    /// The file Helper.
+    /// </param>
+    internal static void LogToFile(string eventName, IDictionary<string, object?> metrics, IFileHelper fileHelper)
     {
-        /// <summary>
-        /// Publishes telemetry to a file.
-        /// </summary>
-        /// <param name="eventName"></param>
-        /// <param name="metrics"></param>
-        public void PublishMetrics(string eventName, IDictionary<string, object> metrics)
-        {
-            // Log to Text File
-            this.LogToFile(eventName, metrics, new FileHelper());
-        }
+        string resultDirectory = Environment.GetEnvironmentVariable("VSTEST_LOGTELEMETRY_PATH")
+            ?? Path.GetTempPath() + "TelemetryLogs";
+        string resultFileName = Guid.NewGuid().ToString();
+        string path = Path.Combine(resultDirectory, resultFileName);
 
-        /// <summary>
-        /// Will do NO-OP
-        /// </summary>
-        public void Dispose()
+        if (!fileHelper.DirectoryExists(resultDirectory))
         {
-            // No operation
+            fileHelper.CreateDirectory(resultDirectory);
         }
 
-        /// <summary>
-        /// Log the telemetry to file.
-        /// For Testing purposes.
-        /// </summary>
-        /// <param name="eventName">
-        /// The event Name.
-        /// </param>
-        /// <param name="metrics">
-        /// Metrics
-        /// </param>
-        /// <param name="fileHelper">
-        /// The file Helper.
-        /// </param>
-        internal void LogToFile(string eventName, IDictionary<string, object> metrics, IFileHelper fileHelper)
-        {
-            string resultDirectory = Path.GetTempPath() + "TelemetryLogs";
-            string resultFileName = Guid.NewGuid().ToString();
-            string path = Path.Combine(resultDirectory, resultFileName);
-
-            if (!fileHelper.DirectoryExists(resultDirectory))
-            {
-                fileHelper.CreateDirectory(resultDirectory);
-            }
+        var telemetryData = string.Join(";", metrics.Select(x => x.Key + "=" + x.Value));
+        var finalData = string.Concat(eventName, ";", telemetryData);
 
-            var telemetryData = string.Join(";", metrics.Select(x => x.Key + "=" + x.Value));
-            var finalData = string.Concat(eventName, ";", telemetryData);
+        EqtTrace.Info("TextFileTelemetryPublisher.LogToFile: Logging telemetry data points to file {0}", path);
 
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("TextFileTelemetryPublisher.LogToFile : Logging telemetry data points to file {0}", path);
-            }
-
-            fileHelper.WriteAllTextToFile(path, finalData);
-        }
+        fileHelper.WriteAllTextToFile(path, finalData);
     }
 }
diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs
index eda555c483..850de3db44 100644
--- a/src/vstest.console/Resources/Resources.Designer.cs
+++ b/src/vstest.console/Resources/Resources.Designer.cs
@@ -318,15 +318,6 @@ internal static string ConfigurationArgumentHelp {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Copyright (c) Microsoft Corporation.  All rights reserved..
-        /// </summary>
-        internal static string CopyrightCommandLineTitle {
-            get {
-                return ResourceManager.GetString("CopyrightCommandLineTitle", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The Data Collector friendly name &apos;{0}&apos; is not valid.  The Data Collector will be ignored..
         /// </summary>
@@ -533,6 +524,15 @@ internal static string EnvironmentVariableXIsOverriden {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error hosting communication channel..
+        /// </summary>
+        internal static string ErrorHostingCommunicationChannel {
+            get {
+                return ResourceManager.GetString("ErrorHostingCommunicationChannel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error Message:.
         /// </summary>
@@ -705,6 +705,15 @@ internal static string InIsolationHelp {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to AeDebugger argument &apos;{0}&apos; is not valid..
+        /// </summary>
+        internal static string InvalidAeDebuggerArgument {
+            get {
+                return ResourceManager.GetString("InvalidAeDebuggerArgument", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The argument {0} is invalid. Please use the /help option to check the list of valid arguments..
         /// </summary>
@@ -831,6 +840,24 @@ internal static string InvalidPortArgument {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The directory specified is not valid: &apos;{0}&apos;.
+        /// </summary>
+        internal static string InvalidProcDumpDirectoryPath {
+            get {
+                return ResourceManager.GetString("InvalidProcDumpDirectoryPath", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH).
+        /// </summary>
+        internal static string InvalidProcDumpToolDirectoryPath {
+            get {
+                return ResourceManager.GetString("InvalidProcDumpToolDirectoryPath", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The path &apos;{0}&apos; specified in the &apos;ResultsDirectory&apos; is invalid. Error: {1}.
         /// </summary>
@@ -868,6 +895,15 @@ internal static string InvalidTestRunParameterArgument {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid testSessionCorrelationId.
+        /// </summary>
+        internal static string InvalidTestSessionCorrelationId {
+            get {
+                return ResourceManager.GetString("InvalidTestSessionCorrelationId", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Argument {0} is not expected in the &apos;UseVsixExtensions&apos; command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again..
         /// </summary>
@@ -991,7 +1027,7 @@ internal static string MalformedRunSettingsKey {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Microsoft (R) Test Execution Command Line Tool Version {0}.
+        ///   Looks up a localized string similar to VSTest version {0}.
         /// </summary>
         internal static string MicrosoftCommandLineTitle {
             get {
@@ -1205,6 +1241,42 @@ internal static string PortArgumentHelp {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Postmortem debugger is not supported in the current OS..
+        /// </summary>
+        internal static string PostmortemDebuggerNotSupportedForCurrentOS {
+            get {
+                return ResourceManager.GetString("PostmortemDebuggerNotSupportedForCurrentOS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to DumpDirectoryPath should be specified to install the post mortem debugger..
+        /// </summary>
+        internal static string ProcDumpDirectoryPathArgumenNotFound {
+            get {
+                return ResourceManager.GetString("ProcDumpDirectoryPathArgumenNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Procdump file name not found: &apos;{0}&apos;.
+        /// </summary>
+        internal static string ProcDumpFileNameNotFound {
+            get {
+                return ResourceManager.GetString("ProcDumpFileNameNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger..
+        /// </summary>
+        internal static string ProcDumpToolDirectoryPathArgumenNotFound {
+            get {
+                return ResourceManager.GetString("ProcDumpToolDirectoryPathArgumenNotFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Test run in progress.
         /// </summary>
@@ -1223,6 +1295,15 @@ internal static string ProjectPathNotFound {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waiting for request handler connection timed out after {0} seconds..
+        /// </summary>
+        internal static string RequestHandlerConnectionTimedOut {
+            get {
+                return ResourceManager.GetString("RequestHandlerConnectionTimedOut", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to @&lt;file&gt;
         ///      Read response file for more options..
@@ -1408,6 +1489,15 @@ internal static string StartingExecution {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waiting for start test session timed out after {0} seconds..
+        /// </summary>
+        internal static string StartTestSessionTimedOut {
+            get {
+                return ResourceManager.GetString("StartTestSessionTimedOut", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Standard Error Messages:.
         /// </summary>
@@ -1426,6 +1516,15 @@ internal static string StdOutMessagesBanner {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waiting for stop test session timed out after {0} seconds..
+        /// </summary>
+        internal static string StopTestSessionTimedOut {
+            get {
+                return ResourceManager.GetString("StopTestSessionTimedOut", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} {1}.
         /// </summary>
@@ -1507,6 +1606,39 @@ internal static string SwitchToNoIsolation {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to --TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+        ///      This affects adapter loading behavior.
+        ///
+        ///      Currently supported behaviors:
+        ///        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+        ///                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+        ///             [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string TestAdapterLoadingStrategyHelp {
+            get {
+                return ResourceManager.GetString("TestAdapterLoadingStrategyHelp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!.
+        /// </summary>
+        internal static string TestAdapterLoadingStrategyValueInvalid {
+            get {
+                return ResourceManager.GetString("TestAdapterLoadingStrategyValueInvalid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}.
+        /// </summary>
+        internal static string TestAdapterLoadingStrategyValueInvalidRecursive {
+            get {
+                return ResourceManager.GetString("TestAdapterLoadingStrategyValueInvalidRecursive", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The custom test adapter search path provided was not found, provide a valid path and try again..
         /// </summary>
@@ -1537,6 +1669,15 @@ internal static string TestAdapterPathValueRequired {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The /TestAdapterPath parameter needs to be provided when &quot;{0}&quot; test adapter loading strategy is specified!.
+        /// </summary>
+        internal static string TestAdapterPathValueRequiredWhenStrategyXIsUsed {
+            get {
+                return ResourceManager.GetString("TestAdapterPathValueRequiredWhenStrategyXIsUsed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to --TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
         ///      Run tests that match the given expression.
@@ -1748,6 +1889,15 @@ internal static string UseVsixExtensionsValueRequired {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test..
+        /// </summary>
+        internal static string VSTestDeprecationMessage {
+            get {
+                return ResourceManager.GetString("VSTestDeprecationMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Logging Vstest Diagnostics in file: {0}.
         /// </summary>
@@ -1756,5 +1906,14 @@ internal static string VstestDiagLogOutputPath {
                 return ResourceManager.GetString("VstestDiagLogOutputPath", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe..
+        /// </summary>
+        internal static string WarningEmulatedOnArm64 {
+            get {
+                return ResourceManager.GetString("WarningEmulatedOnArm64", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx
index d80d990139..337e146fa5 100644
--- a/src/vstest.console/Resources/Resources.resx
+++ b/src/vstest.console/Resources/Resources.resx
@@ -191,9 +191,6 @@
     <value>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
       The configuration the project is built for i.e. Debug/Release</value>
   </data>
-  <data name="CopyrightCommandLineTitle" xml:space="preserve">
-    <value>Copyright (c) Microsoft Corporation.  All rights reserved.</value>
-  </data>
   <data name="Days" xml:space="preserve">
     <value>Days</value>
   </data>
@@ -387,7 +384,7 @@
     <value>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</value>
   </data>
   <data name="MicrosoftCommandLineTitle" xml:space="preserve">
-    <value>Microsoft (R) Test Execution Command Line Tool Version {0}</value>
+    <value>VSTest version {0}</value>
   </data>
   <data name="Minutes" xml:space="preserve">
     <value>Minutes</value>
@@ -560,6 +557,43 @@
   <data name="TestAdapterPathValueRequired" xml:space="preserve">
     <value>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</value>
   </data>
+  <data name="TestAdapterLoadingStrategyHelp" xml:space="preserve">
+    <value>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</value>
+    <comment>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</comment>
+  </data>
+  <data name="TestAdapterLoadingStrategyValueInvalid" xml:space="preserve">
+    <value>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</value>
+  </data>
+  <data name="TestAdapterLoadingStrategyValueInvalidRecursive" xml:space="preserve">
+    <value>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</value>
+    <comment>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </comment>
+  </data>
+  <data name="TestAdapterPathValueRequiredWhenStrategyXIsUsed" xml:space="preserve">
+    <value>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</value>
+    <comment>{0} is the strategy name, "Explicit" for example.</comment>
+  </data>
   <data name="TestCaseFilterArgumentHelp" xml:space="preserve">
     <value>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
       Run tests that match the given expression.
@@ -711,6 +745,27 @@
   <data name="InvalidBlameArgument" xml:space="preserve">
     <value>Blame argument '{0}' is not valid.</value>
   </data>
+  <data name="InvalidAeDebuggerArgument" xml:space="preserve">
+    <value>AeDebugger argument '{0}' is not valid.</value>
+  </data>
+  <data name="ProcDumpToolDirectoryPathArgumenNotFound" xml:space="preserve">
+    <value>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</value>
+  </data>
+  <data name="ProcDumpDirectoryPathArgumenNotFound" xml:space="preserve">
+    <value>DumpDirectoryPath should be specified to install the post mortem debugger.</value>
+  </data>
+  <data name="PostmortemDebuggerNotSupportedForCurrentOS" xml:space="preserve">
+    <value>Postmortem debugger is not supported in the current OS.</value>
+  </data>
+  <data name="InvalidProcDumpToolDirectoryPath" xml:space="preserve">
+    <value>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</value>
+  </data>
+  <data name="InvalidProcDumpDirectoryPath" xml:space="preserve">
+    <value>The directory specified is not valid: '{0}'</value>
+  </data>
+  <data name="ProcDumpFileNameNotFound" xml:space="preserve">
+    <value>Procdump file name not found: '{0}'</value>
+  </data>
   <data name="InvalidDiagArgument" xml:space="preserve">
     <value>Diag argument '{0}' is not valid.</value>
   </data>
@@ -767,4 +822,25 @@
   <data name="TestRunAbortedWithError" xml:space="preserve">
     <value>Test Run Aborted with error {0}.</value>
   </data>
+  <data name="InvalidTestSessionCorrelationId" xml:space="preserve">
+    <value>Invalid testSessionCorrelationId</value>
+  </data>
+  <data name="WarningEmulatedOnArm64" xml:space="preserve">
+    <value>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</value>
+  </data>
+  <data name="RequestHandlerConnectionTimedOut" xml:space="preserve">
+    <value>Waiting for request handler connection timed out after {0} seconds.</value>
+  </data>
+  <data name="StartTestSessionTimedOut" xml:space="preserve">
+    <value>Waiting for start test session timed out after {0} seconds.</value>
+  </data>
+  <data name="StopTestSessionTimedOut" xml:space="preserve">
+    <value>Waiting for stop test session timed out after {0} seconds.</value>
+  </data>
+  <data name="ErrorHostingCommunicationChannel" xml:space="preserve">
+    <value>Error hosting communication channel.</value>
+  </data>
+  <data name="VSTestDeprecationMessage" xml:space="preserve">
+    <value>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf
index 064a9ba62c..adee760c29 100644
--- a/src/vstest.console/Resources/xlf/Resources.cs.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.cs.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">{0} se nenašel.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Jsou k dispozici tyto doplňky zjišťování testů:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Jsou k dispozici tyto doplňky pro provádění testů:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Jsou k dispozici tyto doplňky protokolovače testu:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Chyba: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Parametr {0} by se měl poskytnout jenom jednou.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Při vytváření instance rozšíření {0} došlo k výjimce: {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Jsou k dispozici následující testy:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Nerozpoznaný parametr {0}</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Poskytnutý zdrojový soubor testu {0} se nenašel.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informace: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Upozornění: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Zobrazí tuto zprávu o používání.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Všechna práva vyhrazena.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Test Execution Command Line Tool verze {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;identifikátor URI nebo popisný název protokolovacího nástroje&gt;
-      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba
-      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=&lt;výchozí hodnota je jedinečný název souboru&gt;]
-      Vytvoří soubor v adresáři TestResults s daným LogFileName.
-
-      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
-      Příklad: /logger:console;verbosity=&lt;výchozí hodnota je normal&gt;
-      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed
-
-      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
-      Příklad: /logger:console;prefix=&lt;výchozí hodnota je false&gt;
-      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Popis: Spustí testy ze zadaných souborů.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Možnosti:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Použití: vstest.console.exe [argumenty] [možnosti] [[--] &lt;argumenty RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Nezadaly se žádné zdrojové soubory testů.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Nezadaly se žádné argumenty.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Spusťte testy ze zadaných souborů nebo ze vzoru se zástupnými znaky. Oddělte více názvů nebo vzorů testovacích souborů pomocí mezer.
-      Nastavte úroveň podrobností protokolovacího nástroje konzoly na podrobnou, aby se zobrazily odpovídající testovací soubory.
-      Příklady: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Jsou k dispozici tyto doplňky poskytovatelů nastavení:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;soubor nastavení&gt;
-      Nastavení, která se použijí při testování.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Parametr /Settings vyžaduje, aby se poskytl soubor nastavení.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Soubor nastavení {0} se nenašel.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Testovací běh nebyl úspěšný.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Testovací běh byl úspěšný.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">V příkazu InIsolation se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /InIsolation) a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Parametr /UseVsixExtensions vyžaduje hodnotu. Pokud hodnota bude true, v testovacím běhu se použijí nainstalovaná rozšíření VSIX (pokud nějaká jsou). Pokud je hodnota false, budou se rozšíření ignorovat.   Příklad:  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">V příkazu UseVsixExtensions se argument {0} neočekává. Zadejte příkaz, který určí, jestli se mají rozšíření vsix používat, nebo přeskočit (třeba vstest.console.exe myTests.dll /UseVsixExtensions:true) a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Spustí testy v izolovaném procesu. Díky tomu je méně pravděpodobné,
-      že se proces vstest.console.exe zastaví, pokud se v testech stane chyba,
-      ale testy můžou být pomalejší.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Tato možnost určí, jestli má proces vstest.console.exe v testovacím běhu používat,
-      nebo přeskočit nainstalovaná rozšíření VSIX (pokud nějaká jsou). 
-      Příklad: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Argument /BatchSize vyžaduje velikost dávky.  Příklad:  /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Neplatná velikost dávky {0}. Velikost dávky by měla být větší než nula. Příklad:  /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Pro spuštění testů:
-    &gt;vstest.console.exe tests.dll 
-  Pro spuštění testů s dalšími nastaveními, třeba kolekcemi dat:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Vypíše nainstalované nástroje zjišťování testů.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Vypíše nainstalované prováděcí moduly testů.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Vypíše nainstalované protokolovače testů.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Vypíše nainstalované poskytovatele nastavení testů.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;název souboru&gt;
-      Vypíše všechny zjištěné testy z daného kontejneru testů.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Uplynulý čas:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">Argument /Tests vyžaduje aspoň jeden konkrétní název testu nebo jeho podřetězec.
-       Příklady: /Tests:TestovaciMetoda1, /Tests:TestovaciMetoda1,metoda2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Zjistilo se několik testů (celkem {0}), ale žádný z testů neodpovídá zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;názvy testů&gt;
-      Spustí testy s názvy odpovídajícími zadaným hodnotám. Chcete-li zadat více
-     hodnot, oddělte je čárkami.
-     Příklady: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Ke spouštění testů se používá režim izolace, protože v nastavení Runsettings se povolily adaptéry diagnostických dat. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Ke spouštění testů jednotek pro aplikace pro Windows Store se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Pokud se spouští testy jednotek pro aplikace pro Windows Store, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        PopisnýNázev: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Identifikátor URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        NázevNastavení: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Podporované typy souborů:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Identifikátor URI výchozího prováděcího modulu: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Identifikátor URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Neplatný typ platformy: {0}. Platné typy platformy: {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">Argument /Platform vyžaduje, aby se pro testovací běh poskytl typ platformy.   Příklad:  /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;typ platformy&gt;
-      Cílová architektura platformy, která se použije ke spuštění testu. 
-      Platné hodnoty jsou x86, x64 a ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Pro provádění testů se používá režim izolace tak, jak to vyžaduje nastavení platformy {0} a rozhraní .NET Framework {1} pro testovací běh. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;verze rozhraní&gt;
-      Cílová verze rozhraní .NET Framework, která se použije ke spuštění testu. 
-      Platné hodnoty jsou .NETFramework,Version=v4.5.1, .NETCoreApp,Version=v1.0 apod.
-      Další podporované hodnoty jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">Argument /Framework vyžaduje cílovou verzi rozhraní .NET Framework pro testovací běh. Příklad: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Neplatná verze rozhraní .NET Framework: {0}. Zadejte prosím úplný název cílového rozhraní (příklad: .NETCoreApp,Version=v2.0). Další podporované verze jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se spustit testovací běh pro testy jednotek aplikace pro Windows Store: {0}</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;výraz&gt;
-      Spustí testy, které odpovídají danému výrazu.
-     &lt;výraz&gt; musí být formátu &lt;vlastnost&gt;operátor&lt;hodnota&gt;[|&amp;&lt;výraz&gt;],
-     kde operátor je  =, != nebo ~ (operátor ~ má sémantiku
-     contains a je použitelný na vlastnosti řetězce, jako je DisplayName).
-     Závorky () mohou být použity pro seskupení podvýrazů.
-     Příklady: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">Argument příkazu /TestCaseFilter vyžaduje hodnotu filtru.
-        Hodnota filtru by měla být typu&lt;vlastnost&gt;=&lt;hodnota&gt;.
-        Příklady: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Argument /TestCaseFilter nejde zadat spolu s argumentem /Tests. Když se zadají testy, filtrování testovacích případů nejde použít.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">Projekt {0} je sestavený pro {1}/{2}. Testovací sestavení zadané v běhu by měly mít společné cílové rozhraní .NET Framework a platformu.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Pro spouštění testů se dá zadat jenom jeden balíček aplikace (soubor .appx).</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Začínají se zjišťovat testy, počkejte prosím...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Začínají se provádět testy, počkejte prosím...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">Při čtení nastavení adaptéru diagnostických dat se vyvolala výjimka {0}. Všechny adaptéry diagnostických dat se v tomto běhu přeskočí.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Povolí kolekci dat CodeCoverage pro testovací běh.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">V příkazu EnableCodeCoverage se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /EnableCodeCoverage) a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Store, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Store.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Pro aplikace pro Windows Store není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Zjistilo se několik testů (celkem {0}), ale některé z testů neodpovídají zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Proces vstest.console.exe použije v testovacím běhu vlastní
-      adaptéry testu ze zadané cesty (pokud existují). 
-      Příklad:  /TestAdapterPath:&lt;cesta_k_vlastním_adaptérům&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Parametr /TestAdapterPath vyžaduje hodnotu, která je součástí umístění obsahujícího vlastní adaptéry testů. Příklad:  /TestAdapterPath:c:\MojeVlastniAdaptery</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Cesta {0} zadaná v TestAdapterPath není platná. Chyba: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Zadaná cesta pro vyhledávání vlastních adaptérů testů se nenašla. Zadejte platnou cestu a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Cesta {0} zadaná v TestAdapterPath neobsahuje žádné adaptéry testů. Zadejte platnou cestu a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se spustit testovací běh pro testy aplikace pro Windows Phone: {0}</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Ke spouštění testů jednotek pro aplikace pro Windows Phone se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Pro aplikace pro Windows Phone není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Pokud se spouští testy jednotek pro aplikace pro Windows Phone, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Phone, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Ke spouštění testů se používá rozhraní {0}. Pokud chcete toto upozornění potlačit, zadejte /Framework:{1}.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">V kontejnerech testů se nenašly žádné testy. Navíc Adaptér testování částí aplikací pro Microsoft Windows Store nepodporuje soubory .appxbundle. Při vytváření balíčku aplikace vytvořte soubor appx (nastavte možnost Generovat svazek aplikací na Nikdy) a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Určí, že se testy mají provádět paralelně. Ve výchozím nastavení
-      se můžou použít všechna dostupná jádra počítače.
-      Počet jader, která se můžou použít, se dá nakonfigurovat v souboru nastavení.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">V příkazu Parallel se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /Parallel) a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Nemůže být null nebo prázdné.</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;port&gt;
-      Port pro připojení soketu a přijímání zpráv událostí</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">Argument --Port|/Port vyžaduje celočíselné číslo portu. Zadejte port pro připojení soketu a přijímání zpráv událostí.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít testované sestavení. Ujistěte se prosím, že je projekt sestavený.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Cesta {0} neexistuje.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      Adresář, který obsahuje dočasné výstupy</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;konfigurace&gt;
-      Konfigurace, pro kterou se projekt sestaví, tj. Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">Zadaná konfigurace není platná.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;výstup&gt;
-      Adresář, který obsahuje binární soubory, které se mají spustit</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Cesta k základu sestavení se nenašla, zadejte platnou cestu a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Cesta k výstupu se nenašla, zadejte platnou cestu a zkuste to znovu.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Další informační zprávy:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Dny</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Chybová zpráva:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Celkový čas: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Hodiny</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Nepovedlo se najít protokolovač testu s identifikátorem URI nebo popisným názvem {0}.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minuty</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Sekundy</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Trasování zásobníku:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Zprávy standardních chyb:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Zprávy standardního výstupu:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Přílohy:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">V {0} nejsou dostupné žádné testy. Přesvědčte se, že nainstalované nástroje zjišťování testů, moduly provádění, nastavení verzí platformy a rozhraní jsou vhodné a zkuste to znova.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Neúspěšné</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Úspěšné</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Přeskočeno</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Zjišťování pro dané zdroje selhalo. Výjimka: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      ID nadřazeného procesu, který je odpovědný za spuštění aktuálního procesu</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">Argument --ParentProcessId|/ParentProcessId vyžaduje ID procesu, které je celočíselné. Zadejte ID nadřazeného procesu, který spustil tento proces.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argumenty:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;cesta k protokolu souboru&gt;
-      Povolit protokoly pro testovací platformu
-      Protokoly se zapisují do zadaného souboru.
-
-      Změňte úroveň trasování pro protokoly tak, jak je uvedeno níže.
-      Příklad: /Diag:&lt;cesta k protokolu souboru&gt;;tracelevel=&lt;výchozí hodnota je verbose&gt;
-      Povolené hodnoty pro tracelevel: off, error, warning, info a verbose</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Zadaný soubor {0} je jen pro čtení.</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Časový limit k propojení nebo zpracování žádosti pro DesignModeClient na portu: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Nespuštěno</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Argumenty RunSettings:
-      Argumenty k předání konfigurací runsettings prostřednictvím příkazového řádku. Argumenty je možné zadat jako dvojici název-hodnota ve formě [název]=[hodnota] po -- . Po -- následuje mezera. 
-      K oddělení více dvojic [název]=[hodnota] použijte mezeru.
-      Další informace o podpoře argumentů RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Nejméně jedno z nastavení Runsettings obsahuje neplatný token</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Na zadané cestě se vytvoří adresář pro výsledky testů, pokud ještě neexistuje.
-      Příklad:  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Parametr /ResultsDirectory vyžaduje hodnotu určující, kam se výsledky testů uloží. Příklad:  /ResultsDirectory:c:\MůjAdresářVýsledkůTestů</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Cesta {0} zadaná v ResultsDirectory není platná. Chyba: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">Příznak /InIsolation je zastaralý. Testy se vždy spouští v samostatném procesu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Protokolování diagnostiky Vstest v souboru: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Povolit kolekci dat pro testovací běh. Další informace: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Popisný název kolekce dat {0} není platný. Kolekce dat se bude ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Zprávy trasování ladění:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Spustí test v režimu blame. Tato možnost je užitečná při izolaci problematického testu, který způsobuje jeho chybové ukončení.
-      Vytvoří výstupní soubor v aktuálním adresáři jako Sequence.xml,
-      který zachytí pořadí provádění testu před chybovým ukončením.
-      Volitelně se můžete rozhodnout pro shromáždění výpisu procesu pro hostitele testu.
-      Pokud se rozhodnete pro shromáždění výpisu, shromáždí se ve výchozím nastavení při chybovém ukončení minivýpis.
-      Toto výchozí chování můžete také přepsat pomocí určitých volitelných parametrů:
-      CollectAlways – Pro shromáždění výpisu při ukončení, pokud nedojde k chybovému ukončení (true/false) 
-      DumpType – Pro zadání typu výpisu (mini/full)
-      Příklad: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Testovací běh se přerušil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Testovací běh se zrušil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Chyba při otevírání souboru odpovědí {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      Načte další možnosti ze souboru odpovědí.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Celkový počet testů: neznámý</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Kromě toho se cesta k adaptérům testů dá zadat pomocí příkazu /TestAdapterPath. Příklad:  /TestAdapterPath:&lt;cesta_k_vlastním_adaptérům&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">Příkaz /UseVsixExtensions je zastaralý. Použijte místo něj prosím příkaz /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Příklad: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" není podporován, pokud je testovací běh nakonfigurován pomocí nastavení testů.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Kolekce dat jiné než Pokrytí kódu a Microsoft Fakes konfigurované prostřednictvím nastavení běhu nejsou podporované s vloženým nastavením testů. Další informace viz https://aka.ms/vstest-configure-datacollector. Nastavení běhu: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;identifikátor URI nebo popisný název protokolovacího nástroje&gt;
-      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba
-      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=&lt;výchozí hodnota je jedinečný název souboru&gt;]
-      Vytvoří soubor v adresáři TestResults s daným LogFileName.
-
-      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
-      Příklad: /logger:console;verbosity=&lt;výchozí hodnota je minimal&gt;
-      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed
-
-      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
-      Příklad: /logger:console;prefix=&lt;výchozí hodnota je false&gt;
-      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Shromažďování výpisů stavu systému pomocí možnosti CollectDump pro Blame se pro tuto platformu nepodporuje.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Zadaný parametr blame {0} není platný. Tento parametr se bude ignorovat.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Cesta k souboru diag {0} není platná.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Argument blame {0} není platný.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Argument diag {0} není platný.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Argument logger {0} není platný.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Rozhraní Framework35 není podporováno. Pro projekty, které cílí na rozhraní .Net Framework 3.5, bude test spuštěn v „režimu kompatibility“ CLR 4.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Probíhá testovací běh</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Celkový počet testů: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Neúspěšné: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Úspěšné: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Přeskočené: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">Argument {0} není platný. Pokud si chcete zobrazit seznam platných argumentů, použijte prosím možnost /help.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Celkový počet testovacích souborů, které odpovídají zadanému vzoru: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">Argument parametru testovacího běhu {0} není platný. Použijte prosím formát uvedený níže.
-     Formát: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Shromažďování výpisů stavu systému při zablokování pomocí možnosti CollectDump s TestTimeout pro Blame se pro tuto platformu nepodporuje.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - Neúspěšné: {1}, Úspěšné: {2}, Přeskočeno: {3}, Celkem: {4}, Doba trvání: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Žádné</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NÁZEV&gt;=&lt;HODNOTA&gt;
-      Nastaví hodnotu proměnné prostředí. Pokud proměnná neexistuje, vytvoří ji, a pokud existuje, přepíše ji. Tato možnost bude znamenat, že se použije přepínač /InIsolation a vynutí se spuštění testů v izolovaném procesu.
-      
-      Tento argument se dá zadat vícekrát, může se tak poskytnout více proměnných.
-
-      Příklad: -e:PROMENNA1=HODNOTA1
-               -e:JINA_PROMENNA="HODNOTA S MEZERAMI"
-               -e:JINA_PROMENNA="HODNOTA;oddělená;středníky"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">Proměnná prostředí {0} se už definovala, ale přepsal ji argument -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Testovací běh se přerušil s chybou {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="cs">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">{0} se nenašel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Jsou k dispozici tyto doplňky zjišťování testů:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Jsou k dispozici tyto doplňky pro provádění testů:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Jsou k dispozici tyto doplňky protokolovače testu:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Chyba: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Parametr {0} by se měl poskytnout jenom jednou.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Při vytváření instance rozšíření {0} došlo k výjimce: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Jsou k dispozici následující testy:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Nerozpoznaný parametr {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Poskytnutý zdrojový soubor testu {0} se nenašel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Identifikátor URI {0} protokolovače testu není platný. Protokolovač testu se bude ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informace: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Upozornění: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Zobrazí tuto zprávu o používání.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Verze VSTest {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;identifikátor URI nebo popisný název protokolovacího nástroje&gt;
+      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba
+      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=&lt;výchozí hodnota je jedinečný název souboru&gt;]
+      Vytvoří soubor v adresáři TestResults s daným LogFileName.
+
+      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
+      Příklad: /logger:console;verbosity=&lt;výchozí hodnota je normal&gt;
+      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed
+
+      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
+      Příklad: /logger:console;prefix=&lt;výchozí hodnota je false&gt;
+      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Popis: Spustí testy ze zadaných souborů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Možnosti:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Použití: vstest.console.exe [argumenty] [možnosti] [[--] &lt;argumenty RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Nezadaly se žádné zdrojové soubory testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Nezadaly se žádné argumenty.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Spusťte testy ze zadaných souborů nebo ze vzoru se zástupnými znaky. Oddělte více názvů nebo vzorů testovacích souborů pomocí mezer.
+      Nastavte úroveň podrobností protokolovacího nástroje konzoly na podrobnou, aby se zobrazily odpovídající testovací soubory.
+      Příklady: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Jsou k dispozici tyto doplňky poskytovatelů nastavení:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;soubor nastavení&gt;
+      Nastavení, která se použijí při testování.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Parametr /Settings vyžaduje, aby se poskytl soubor nastavení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Soubor nastavení {0} se nenašel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Testovací běh nebyl úspěšný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Testovací běh byl úspěšný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">V příkazu InIsolation se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /InIsolation) a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Parametr /UseVsixExtensions vyžaduje hodnotu. Pokud hodnota bude true, v testovacím běhu se použijí nainstalovaná rozšíření VSIX (pokud nějaká jsou). Pokud je hodnota false, budou se rozšíření ignorovat.   Příklad:  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">V příkazu UseVsixExtensions se argument {0} neočekává. Zadejte příkaz, který určí, jestli se mají rozšíření vsix používat, nebo přeskočit (třeba vstest.console.exe myTests.dll /UseVsixExtensions:true) a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Spustí testy v izolovaném procesu. Díky tomu je méně pravděpodobné,
+      že se proces vstest.console.exe zastaví, pokud se v testech stane chyba,
+      ale testy můžou být pomalejší.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Tato možnost určí, jestli má proces vstest.console.exe v testovacím běhu používat,
+      nebo přeskočit nainstalovaná rozšíření VSIX (pokud nějaká jsou). 
+      Příklad: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">Argument /BatchSize vyžaduje velikost dávky.  Příklad:  /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Neplatná velikost dávky {0}. Velikost dávky by měla být větší než nula. Příklad:  /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Pro spuštění testů:
+    &gt;vstest.console.exe tests.dll 
+  Pro spuštění testů s dalšími nastaveními, třeba kolekcemi dat:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Vypíše nainstalované nástroje zjišťování testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Vypíše nainstalované prováděcí moduly testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Vypíše nainstalované protokolovače testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Vypíše nainstalované poskytovatele nastavení testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;název souboru&gt;
+      Vypíše všechny zjištěné testy z daného kontejneru testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Uplynulý čas:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">Argument /Tests vyžaduje aspoň jeden konkrétní název testu nebo jeho podřetězec.
+       Příklady: /Tests:TestovaciMetoda1, /Tests:TestovaciMetoda1,metoda2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Zjistilo se několik testů (celkem {0}), ale žádný z testů neodpovídá zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;názvy testů&gt;
+      Spustí testy s názvy odpovídajícími zadaným hodnotám. Chcete-li zadat více
+     hodnot, oddělte je čárkami.
+     Příklady: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Ke spouštění testů se používá režim izolace, protože v nastavení Runsettings se povolily adaptéry diagnostických dat. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Ke spouštění testů jednotek pro aplikace pro Windows Store se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Pokud se spouští testy jednotek pro aplikace pro Windows Store, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        PopisnýNázev: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        Identifikátor URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        NázevNastavení: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Podporované typy souborů:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        Identifikátor URI výchozího prováděcího modulu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        Identifikátor URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Neplatný typ platformy: {0}. Platné typy platformy: {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">Argument /Platform vyžaduje, aby se pro testovací běh poskytl typ platformy.   Příklad:  /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;typ platformy&gt;
+      Cílová architektura platformy, která se použije ke spuštění testu. 
+      Platné hodnoty jsou x86, x64 a ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Pro provádění testů se používá režim izolace tak, jak to vyžaduje nastavení platformy {0} a rozhraní .NET Framework {1} pro testovací běh. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;verze rozhraní&gt;
+      Cílová verze rozhraní .NET Framework, která se použije ke spuštění testu. 
+      Platné hodnoty jsou .NETFramework,Version=v4.5.1, .NETCoreApp,Version=v1.0 apod.
+      Další podporované hodnoty jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">Argument /Framework vyžaduje cílovou verzi rozhraní .NET Framework pro testovací běh. Příklad: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Neplatná verze rozhraní .NET Framework: {0}. Zadejte prosím úplný název cílového rozhraní (příklad: .NETCoreApp,Version=v2.0). Další podporované verze jsou Framework40, Framework45, FrameworkCore10 a FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Nepovedlo se spustit testovací běh pro testy jednotek aplikace pro Windows Store: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;výraz&gt;
+      Spustí testy, které odpovídají danému výrazu.
+     &lt;výraz&gt; musí být formátu &lt;vlastnost&gt;operátor&lt;hodnota&gt;[|&amp;&lt;výraz&gt;],
+     kde operátor je  =, != nebo ~ (operátor ~ má sémantiku
+     contains a je použitelný na vlastnosti řetězce, jako je DisplayName).
+     Závorky () mohou být použity pro seskupení podvýrazů.
+     Příklady: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">Argument příkazu /TestCaseFilter vyžaduje hodnotu filtru.
+        Hodnota filtru by měla být typu&lt;vlastnost&gt;=&lt;hodnota&gt;.
+        Příklady: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Argument /TestCaseFilter nejde zadat spolu s argumentem /Tests. Když se zadají testy, filtrování testovacích případů nejde použít.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">Projekt {0} je sestavený pro {1}/{2}. Testovací sestavení zadané v běhu by měly mít společné cílové rozhraní .NET Framework a platformu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Pro spouštění testů se dá zadat jenom jeden balíček aplikace (soubor .appx).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Začínají se zjišťovat testy, počkejte prosím...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Začínají se provádět testy, počkejte prosím...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">Při čtení nastavení adaptéru diagnostických dat se vyvolala výjimka {0}. Všechny adaptéry diagnostických dat se v tomto běhu přeskočí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Povolí kolekci dat CodeCoverage pro testovací běh.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">V příkazu EnableCodeCoverage se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /EnableCodeCoverage) a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Store, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Store.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Pro aplikace pro Windows Store není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Zjistilo se několik testů (celkem {0}), ale některé z testů neodpovídají zadaným kritériím výběru ({1}). Použijte správné hodnoty a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Proces vstest.console.exe použije v testovacím běhu vlastní
+      adaptéry testu ze zadané cesty (pokud existují). 
+      Příklad:  /TestAdapterPath:&lt;cesta_k_vlastním_adaptérům&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Parametr /TestAdapterPath vyžaduje hodnotu, která je součástí umístění obsahujícího vlastní adaptéry testů. Příklad:  /TestAdapterPath:c:\MojeVlastniAdaptery</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Cesta {0} zadaná v TestAdapterPath není platná. Chyba: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Zadaná cesta pro vyhledávání vlastních adaptérů testů se nenašla. Zadejte platnou cestu a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Cesta {0} zadaná v TestAdapterPath neobsahuje žádné adaptéry testů. Zadejte platnou cestu a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Nepovedlo se spustit testovací běh pro testy aplikace pro Windows Phone: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Ke spouštění testů jednotek pro aplikace pro Windows Phone se používá režim izolace. Pokud chcete toto upozornění potlačit, použijte parametr /InIsolation.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Pro aplikace pro Windows Phone není pokrytí kódu k dispozici. Pro tento testovací běh se analýza pokrytí kódu přeskočí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Pokud se spouští testy jednotek pro aplikace pro Windows Phone, nepodporují se adaptéry diagnostických dat. Odeberte nastavení adaptérů diagnostických dat z nastavení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">Balíček aplikace {0} nemá vstupní bod prováděcího modulu testování. Pokud chcete spouštět testy jednotek pro aplikace pro Windows Phone, vytvořte balíček aplikace pomocí projektu Knihovna testu jednotek pro aplikaci pro Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Ke spouštění testů se používá rozhraní {0}. Pokud chcete toto upozornění potlačit, zadejte /Framework:{1}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">V kontejnerech testů se nenašly žádné testy. Navíc Adaptér testování částí aplikací pro Microsoft Windows Store nepodporuje soubory .appxbundle. Při vytváření balíčku aplikace vytvořte soubor appx (nastavte možnost Generovat svazek aplikací na Nikdy) a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Určí, že se testy mají provádět paralelně. Ve výchozím nastavení
+      se můžou použít všechna dostupná jádra počítače.
+      Počet jader, která se můžou použít, se dá nakonfigurovat v souboru nastavení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">V příkazu Parallel se argument {0} neočekává. Zadejte příkaz bez tohoto argumentu (třeba vstest.console.exe myTests.dll /Parallel) a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Nemůže být null nebo prázdné.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;port&gt;
+      Port pro připojení soketu a přijímání zpráv událostí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">Argument --Port|/Port vyžaduje celočíselné číslo portu. Zadejte port pro připojení soketu a přijímání zpráv událostí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Nepovedlo se najít testované sestavení. Ujistěte se prosím, že je projekt sestavený.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Cesta {0} neexistuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      Adresář, který obsahuje dočasné výstupy</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;konfigurace&gt;
+      Konfigurace, pro kterou se projekt sestaví, tj. Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">Zadaná konfigurace není platná.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;výstup&gt;
+      Adresář, který obsahuje binární soubory, které se mají spustit.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">Cesta k základu sestavení se nenašla, zadejte platnou cestu a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Cesta k výstupu se nenašla, zadejte platnou cestu a zkuste to znovu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Další informační zprávy:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Dny</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Chybová zpráva:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Celkový čas: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Hodiny</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Nepovedlo se najít protokolovač testu s identifikátorem URI nebo popisným názvem {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minuty</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Sekundy</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Trasování zásobníku:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Zprávy standardních chyb:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Zprávy standardního výstupu:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Přílohy:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">V {0} nejsou dostupné žádné testy. Přesvědčte se, že nainstalované nástroje zjišťování testů, moduly provádění, nastavení verzí platformy a rozhraní jsou vhodné a zkuste to znova.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Neúspěšné</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Úspěšné</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Přeskočeno</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Zjišťování pro dané zdroje selhalo. Výjimka: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      ID nadřazeného procesu, který je odpovědný za spuštění aktuálního procesu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">Argument --ParentProcessId|/ParentProcessId vyžaduje ID procesu, které je celočíselné. Zadejte ID nadřazeného procesu, který spustil tento proces.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argumenty:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;cesta k protokolu souboru&gt;
+      Povolit protokoly pro testovací platformu
+      Protokoly se zapisují do zadaného souboru.
+
+      Změňte úroveň trasování pro protokoly tak, jak je uvedeno níže.
+      Příklad: /Diag:&lt;cesta k protokolu souboru&gt;;tracelevel=&lt;výchozí hodnota je verbose&gt;
+      Povolené hodnoty pro tracelevel: off, error, warning, info a verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Zadaný soubor {0} je jen pro čtení.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Časový limit k propojení nebo zpracování žádosti pro DesignModeClient na portu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Nespuštěno</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Argumenty RunSettings:
+      Argumenty k předání konfigurací runsettings prostřednictvím příkazového řádku. Argumenty je možné zadat jako dvojici název-hodnota ve formě [název]=[hodnota] po -- . Po -- následuje mezera. 
+      K oddělení více dvojic [název]=[hodnota] použijte mezeru.
+      Další informace o podpoře argumentů RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Nejméně jedno z nastavení Runsettings obsahuje neplatný token</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Na zadané cestě se vytvoří adresář pro výsledky testů, pokud ještě neexistuje.
+      Příklad:  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Parametr /ResultsDirectory vyžaduje hodnotu určující, kam se výsledky testů uloží. Příklad:  /ResultsDirectory:c:\MůjAdresářVýsledkůTestů</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Cesta {0} zadaná v ResultsDirectory není platná. Chyba: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">Příznak /InIsolation je zastaralý. Testy se vždy spouští v samostatném procesu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Protokolování diagnostiky Vstest v souboru: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Povolit kolekci dat pro testovací běh. Další informace: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Popisný název kolekce dat {0} není platný. Kolekce dat se bude ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Zprávy trasování ladění:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Spustí test v režimu blame. Tato možnost je užitečná při izolaci problematického testu, který způsobuje jeho chybové ukončení.
+      Vytvoří výstupní soubor v aktuálním adresáři jako Sequence.xml,
+      který zachytí pořadí provádění testu před chybovým ukončením.
+      Volitelně se můžete rozhodnout pro shromáždění výpisu procesu pro hostitele testu.
+      Pokud se rozhodnete pro shromáždění výpisu, shromáždí se ve výchozím nastavení při chybovém ukončení minivýpis.
+      Toto výchozí chování můžete také přepsat pomocí určitých volitelných parametrů:
+      CollectAlways – Pro shromáždění výpisu při ukončení, pokud nedojde k chybovému ukončení (true/false) 
+      DumpType – Pro zadání typu výpisu (mini/full)
+      Příklad: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Testovací běh se přerušil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Testovací běh se zrušil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Chyba při otevírání souboru odpovědí {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      Načte další možnosti ze souboru odpovědí.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Celkový počet testů: neznámý</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Kromě toho se cesta k adaptérům testů dá zadat pomocí příkazu /TestAdapterPath. Příklad:  /TestAdapterPath:&lt;cesta_k_vlastním_adaptérům&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">Příkaz /UseVsixExtensions je zastaralý. Použijte místo něj prosím příkaz /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Příklad: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" není podporován, pokud je testovací běh nakonfigurován pomocí nastavení testů.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Kolekce dat jiné než Pokrytí kódu a Microsoft Fakes konfigurované prostřednictvím nastavení běhu nejsou podporované s vloženým nastavením testů. Další informace viz https://aka.ms/vstest-configure-datacollector. Nastavení běhu: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;identifikátor URI nebo popisný název protokolovacího nástroje&gt;
+      Určuje protokolovací nástroj pro výsledky testu. Pokud chcete protokolovat výsledky třeba
+      do souboru výsledků testu sady Visual Studio (TRX), použijte /logger:trx[;LogFileName=&lt;výchozí hodnota je jedinečný název souboru&gt;]
+      Vytvoří soubor v adresáři TestResults s daným LogFileName.
+
+      Změní úroveň podrobností ve zprávách protokolu pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
+      Příklad: /logger:console;verbosity=&lt;výchozí hodnota je minimal&gt;
+      Povolené hodnoty pro verbosity: quiet, minimal, normal a detailed
+
+      Změní předponu úrovně diagnostiky pro protokolovací nástroj konzoly tak, jak je uvedeno níže.
+      Příklad: /logger:console;prefix=&lt;výchozí hodnota je false&gt;
+      Další informace o protokolovacím nástroji konzoly: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Shromažďování výpisů stavu systému pomocí možnosti CollectDump pro Blame se pro tuto platformu nepodporuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Zadaný parametr blame {0} není platný. Tento parametr se bude ignorovat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Cesta k souboru diag {0} není platná.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Argument blame {0} není platný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Argument diag {0} není platný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Argument logger {0} není platný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Rozhraní Framework35 není podporováno. Pro projekty, které cílí na rozhraní .Net Framework 3.5, bude test spuštěn v „režimu kompatibility“ CLR 4.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Probíhá testovací běh</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Celkový počet testů: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Neúspěšné: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Úspěšné: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Přeskočené: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">Argument {0} není platný. Pokud si chcete zobrazit seznam platných argumentů, použijte prosím možnost /help.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Celkový počet testovacích souborů, které odpovídají zadanému vzoru: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">Argument parametru testovacího běhu {0} není platný. Použijte prosím formát uvedený níže.
+     Formát: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Shromažďování výpisů stavu systému při zablokování pomocí možnosti CollectDump s TestTimeout pro Blame se pro tuto platformu nepodporuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - Neúspěšné: {1}, Úspěšné: {2}, Přeskočeno: {3}, Celkem: {4}, Doba trvání: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Žádné</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NÁZEV&gt;=&lt;HODNOTA&gt;
+      Nastaví hodnotu proměnné prostředí. Pokud proměnná neexistuje, vytvoří ji, a pokud existuje, přepíše ji. Tato možnost bude znamenat, že se použije přepínač /InIsolation a vynutí se spuštění testů v izolovaném procesu.
+      
+      Tento argument se dá zadat vícekrát, může se tak poskytnout více proměnných.
+
+      Příklad: -e:PROMENNA1=HODNOTA1
+               -e:JINA_PROMENNA="HODNOTA S MEZERAMI"
+               -e:JINA_PROMENNA="HODNOTA;oddělená;středníky"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">Proměnná prostředí {0} se už definovala, ale přepsal ji argument -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Testovací běh se přerušil s chybou {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">Neplatné testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Toto má dopad na chování při načítání adaptéru.
+
+      Aktuálně podporovaná chování:
+        – Explicit: Testovací platforma načte pouze adaptéry určené přes /TestAdapterPath (nebo uzel RunConfiguration.TestAdaptersPaths). 
+                    Pokud je poskytnuta určená cesta k adaptéru, adaptér se načte; pokud je poskytnuta cesta adresáře, načtou se adaptér přímo v dané složce, pokud není zároveň určená rekurzivní možnost.
+                    Pokud není určena žádná cesta k adaptéru, testovací běh se nezdaří.
+                    To bude znamenat přepnutí na /InIsolation a vynutí spuštění testů v izolovaném procesu.
+        
+        – Výchozí: Testovací platforma načte adaptéry pokud nedošlo k určení tohoto argumentu.
+                   Vyzvedne rozšíření z okolí zdroje, z poskytnutých dodatečných cest k adaptéru a z výchozího adresáře. 
+
+        – DefaultRuntimeProviders: Načte výchozí poskytovatele modulů runtime doručené spolu s Testovací platformou.
+                                   Pokud toto není výslovně určeno, když je nastavena možnost „Explicit“, poskytovatel hostitele testu musí být explicitně určen.
+
+        – ExtensionsDirectory: Načte adaptéry ve složce Rozšíření.
+
+        – NextToSource: Načte adaptéry v okolí zdroje. 
+
+        – Recursive: Rekurzivně prohledá složky při načítání adaptérů. Toto vyžaduje, aby bylo zároveň určeno „Explicit“ a „NextToSource“.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">Určená hodnota ({0}) pro /TestAdapterLoadingStrategy je neplatná!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Strategie načítání rekurzivního adaptéru nemůže být použita samostatně. Zkombinujte ji prosím s jednou nebo několika z: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Při načítání určené strategie načítání adaptéru testu {0}musí být zadaný parametr /TestAdapterPath!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">Nástroj vstest.console.exe je spuštěn v emulovaném režimu jako {0}. Pokud chcete dosáhnout lepšího výkonu, zvažte použití nativního nástroje runner vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Při čekání na připojení obslužné rutiny požadavku vypršel časový limit po {0} s.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Při čekání na spuštění testovací relace vypršel časový limit po {0} s.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Při čekání na ukončení testovací relace vypršel časový limit po {0} s.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Při hostování komunikačního kanálu došlo k chybě.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">Pro instalaci nebo odinstalaci ladicího programu postmortem by se měla zadat cesta ProcDumpToolDirectoryPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Ladicí program postmortem se v aktuálním operačním systému nepodporuje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Adresář zadaný pro spustitelný soubor procdump není platný a nástroj nebyl nalezen v proměnných prostředí (PROCDUMP_PATH, PATH).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Název souboru Procdump se nenašel: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">Pro instalaci ladicího programu postmortem by se měla zadat cesta DumpDirectoryPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Zadaný adresář není platný: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">Argument AeDebugger {0} není platný.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">Příkaz dotnet vstest je nahrazen testem dotnet, který se teď dá použít ke spuštění sestavení. Zobrazit https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf
index 43a89b1e2d..fad0b88263 100644
--- a/src/vstest.console/Resources/xlf/Resources.de.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.de.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">"{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Die folgenden Testermittlungs-Add-Ins sind verfügbar:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Die folgenden Testausführungs-Add-Ins sind verfügbar:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Die folgenden Testprotokollierungs-Add-Ins sind verfügbar:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Fehler: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Der Parameter "{0}" sollte nur ein Mal angegeben werden.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Ausnahme beim Instanziieren der Erweiterung "{0}": {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Die folgenden Tests sind verfügbar:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Unbekannter Parameter "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Die angegebene Testquelldatei "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informationen: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Warnung: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Zeigt diese Syntaxmeldung an.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Alle Rechte vorbehalten.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Testausführungs-Befehlszeilentool Version {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;URI/Anzeigename für Protokollierung&gt;
-      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer
-      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=&lt;Standardmäßig eindeutiger Dateiname&gt;]
-      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.
-
-      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:
-      Beispiel: /logger:console;verbosity=&lt;Standardmäßig "normal"&gt;
-      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.
-
-      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:
-      Beispiel: /logger:console;prefix=&lt;Standardmäßig "false"&gt;
-      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Beschreibung: Führt Tests aus den angegebenen Dateien aus.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Optionen:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Syntax: vstest.console.exe [Argumente] [Optionen] [[--] &lt;RunSettings-Argumente&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Es wurden keine Testquelldateien angegeben.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Es wurden keine Argumente angegeben.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Hiermit führen Sie Tests über die angegebenen Dateien oder das Platzhaltermuster aus. Trennen Sie mehrere Testdateinamen oder Muster
-      durch Leerzeichen. Legen Sie die Ausführlichkeit der Konsolenprotokollierung auf "detailed" fest, um übereinstimmende Testdateien anzuzeigen.
-      Beispiele: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Die folgende Einstellungenanbieter-Add-Ins sind verfügbar:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Einstellungsdatei&gt;
-      Einstellungen für die Ausführung der Tests.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Für den Parameter "/Settings" muss eine Einstellungsdatei angegeben werden.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Die Einstellungsdatei "{0}" wurde nicht gefunden.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Fehler beim Testlauf.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Der Testlauf war erfolgreich.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">Das Argument "{0}" wird im Befehl "InIsolation" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /InIsolation), und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Der /UseVsixExtensions-Parameter erfordert einen Wert. Wenn TRUE, werden die installierten VSIX-Extensions (falls vorhanden) im Testlauf verwendet. Wenn FALSE, werden sie ignoriert. Beispiel: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">Das Argument "{0}" wird im Befehl "UseVsixExtensions" nicht erwartet. Geben Sie den Befehl mit der Angabe an, ob die VSIX-Extensions verwendet oder übersprungen werden sollen (Beispiel: vstest.console.exe myTests.dll /UseVsixExtensions:true), und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">/InIsolation/InIsolation
-      Führt die Tests in einem isolierten Prozess aus. Auf diese Weise ist es unwahrscheinlicher, dass der Prozess
-      "vstest.console.exe" bei einem Fehler in den Tests beendet wird.
-      Tests werden aber ggf. langsamer ausgeführt.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Bewirkt, dass der Prozess "vstest.console.exe" die installierten VSIX-Extensions 
-      (sofern vorhanden) im Testlauf verwendet oder überspringt.
-      Beispiel /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Das Argument "/BatchSize" erfordert die Größe des Batches. Beispiel: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Ungültige Batchgröße {0}. Die Batchgröße muss größer als null sein. Beispiel: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Zum Ausführen von Tests:
-    &gt;vstest.console.exe tests.dll 
-  Zum Ausführen von Tests mit zusätzlichen Einstellungen wie Datensammlern:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ ListDiscoverers
-      Listet die installierten Testdiscoverer auf.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ ListExecutors
-      Listet die installierten Testexecutors auf.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ ListLoggers
-      Listet die installierten Testprotokollierungen auf.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ ListSettingsProviders
-      Listet die installierten Testeinstellungenanbieter auf.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Dateiname&gt;
-      Listet alle gefundenen Tests aus dem angegebenen Testcontainer auf.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Verstrichene Zeit:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">Das /Tests-Argument erfordert mindestens einen bestimmten Testnamen oder seine Teilzeichenfolgen.
-       Beispiele: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Insgesamt {0} Tests wurden ermittelt, aber kein Test stimmt mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Testnamen &gt;
-      Führt Tests aus, die mit den eingegebenen Werten übereinstimmen. Verwenden Sie zum
-      Angeben mehrerer Werte Kommas als Trennzeichen.
-      Beispiele: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Der Isolationsmodus wird zum Ausführen der Tests verwendet, weil Adapter für diagnostische Daten in den "runsettings" aktiviert wurden. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Store-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Store-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Unterstützte Dateitypen:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Standard-Executor-URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Ungültiger Plattformtyp: {0}. Gültige Plattformtypen sind {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">Für das /Platform-Argument muss der Zielplattformtyp für den Testlauf angegeben werden. Beispiel: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Plattformtyp&gt;
-      Zielplattformarchitektur für die Testausführung. 
-      Gültige Werte sind x86, x64 und ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Der Isolationsmodus wird zum Ausführen von Tests gemäß den Einstellungen der effektiven Plattform {0} und von .NET Framework {1} für den Testlauf verwendet. Verwenden Sie den /inIsolation-Parameter, um diese Warnung zu unterdrücken.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Frameworkversion&gt;
-      Die .NET-Framework-Zielversion für die Testausführung. 
-      Gültige Werte sind ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" usw.
-      Weitere unterstützte Werte: Framework40, Framework45, FrameworkCore10, FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">Das /Framework-Argument erfordert die .NET Framework-Zielversion für den Testlauf. Beispiel: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Ungültige .NET Framework-Version: {0}. Geben Sie den vollständigen Namen von TargetFramework an (Beispiel: .NETCoreApp,Version=v2.0). Weitere unterstützte .NET Framework-Versionen sind "Framework40", "Framework45", "FrameworkCore10" und "FrameworkUap10".</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Der Testlauf für Komponententests für die Windows Store-App konnte nicht gestartet werden: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Ausdruck&gt;
-      Führt Tests aus, die mit dem angegebenen Ausdruck übereinstimmen.
-      &lt;Ausdruck&gt; entspricht dem Format &lt;Eigenschaft&gt;Operator&lt;Wert&gt;[|&amp;&lt;Ausdruck&gt;],
-         wobei Operator entweder "=", "!=" oder "~" ist (Der Operator "~" verfügt über eine contains-
-         Semantik und kann auf Zeichenfolgeneigenschaften, z. B. DisplayName, angewendet werden).
-         Zum Gruppieren von Unterausdrücken können Klammern () verwendet werden.
-      Beispiele: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">Für das Argument /TestCaseFilter ist der Filterwert erforderlich.
-        Filterwert kann von folgendem Typ sein: &lt;Eigenschaft&gt;=&lt;Wert&gt;.
-        Beispiele: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Das Argument "/TestCaseFilter" kann nicht mit "/Tests" angegeben werden. Das Filtern von Testfällen ist nicht anwendbar, wenn Tests angegeben werden.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} wurde für {1}/{2} erstellt. Den in einem Testlauf angegebenen Testassemblys muss ein .NET-Zielframework und eine Zielplattform gemeinsam sein.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Zum Ausführen von Tests kann nur ein App-Paket (APPX-Datei) angegeben werden.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Die Testermittlung wird gestartet, bitte warten...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Die Testausführung wird gestartet, bitte warten...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">Das Lesen der Einstellungen des Adapters für diagnostische Daten hat eine ausgeführte "{0}" ausgelöst. Alle Adapter für diagnostische Daten werden in diesem Testlauf übersprungen.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Aktiviert den Datensammler "CodeCoverage" für den Testlauf.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">Das Argument "{0}" wird im Befehl "EnableCodeCoverage" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /EnableCodeCoverage), und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Store-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Store-App.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Code Coverage ist für Windows Store-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Insgesamt {0} Tests wurden ermittelt, aber einige Tests stimmen nicht mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Hierdurch verwendet der Prozess "vstest.console.exe" im Testlauf
-      benutzerdefinierte Testadapter aus einem angegeben Pfad (soweit vorhanden). 
-      Beispiel: /TestAdapterPath:&lt;Pfad_zu_benutzerdefinierten_Adaptern&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Der /TestAdapterPath-Parameter erfordert einen Wert. Dabei handelt es sich um den Pfad eines Speicherorts mit benutzerdefinierten Testadaptern. Beispiel: /TestAdapterPath:c:\MeineBenutzerdefiniertenAdapter</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Der in "TestAdapterPath" angegebene Pfad "{0}" ist ungültig. Fehler: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Der angegebene benutzerdefinierte Testadapter-Suchpfad wurde nicht gefunden. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Der in "TestAdapterPath" angegebene Pfad "{0}" enthält keine Testadapter. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Der Testlauf für die Tests für die Windows Phone-App konnte nicht gestartet werden: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Phone-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Code Coverage ist für Windows Phone-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Phone-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Phone-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Phone-App.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Das Framework {0} wird zum Ausführen der Tests verwendet. Geben Sie /Framework:{1} an, um diese Warnung zu unterdrücken.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Es wurde kein Test in den angegebenen Testcontainern gefunden. Darüber hinaus unterstützt der Microsoft Windows Store-Komponententestadapter keine APPXBUNDLE-Dateien. Erstellen Sie eine APPX-Datei (legen Sie die Option "App-Bundle generieren" auf "Nie" fest), wenn Sie das App-Paket erstellen, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Gibt an, dass die Tests parallel ausgeführt werden. Standardmäßig werden
-      alle verfügbaren Kerne auf dem Computer verwendet.
-      Die Anzahl der zu verwendenden Kerne kann ggf. mithilfe einer Einstellungsdatei konfiguriert werden.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">Das Argument "{0}" wird im Befehl "Parallel" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /Parallel), und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Darf nicht NULL oder leer sein.</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Port&gt;
-      Der Port für die Socketverbindung und das Empfangen von Ereignismeldungen.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">Das Argument "--Port|/Port" erfordert die Portnummer (Integerwert). Geben Sie den Port für die Socketverbindung und den Empfang von Ereignismeldungen an.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Die aktuell getestete Assembly wurde nicht gefunden. Stellen Sie sicher, dass das Projekt erstellt wird.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Der Pfad "{0}" ist nicht vorhanden.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;Buildbasispfad&gt;
-      Das Verzeichnis mit den temporären Ausgaben.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Konfiguration&gt;
-      Die Konfiguration, für die das Projekt erstellt wird, d. h. Debug/Release.</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">Die angegebene Konfiguration ist ungültig.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Ausgabe&gt;
-      Das Verzeichnis mit den auszuführenden Binärdateien.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Der BuildBasePath wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Der Ausgabepfad wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Weitere Informationsmeldungen:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Tage</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Fehlermeldung:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Gesamtzeit: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Stunden</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Es wurde keine Testprotokollierung mit dem URI oder FriendlyName "{0}" gefunden.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minuten</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Sekunden</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Stapelverfolgung:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Standardfehlermeldungen:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Standardausgabemeldungen:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Anlagen:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die installierten Test-Discoverer und -Executor und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Fehler</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Bestanden</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Übersprungen</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Fehler bei der Ermittlung für die angegebenen Quellen. Ausnahme: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ÜbergeordneteProzess-ID&gt;
-      Die Prozess-ID des übergeordneten Prozesses, der für das Starten des aktuellen Prozesses zuständig ist.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">Das Argument "--ParentProcessId|/ParentProcessId" erfordert die Prozess-ID (Integerwert). Geben Sie die Prozess-ID des übergeordneten Prozesses an, der diesen Prozess gestartet hat.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argumente:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Pfad zur Protokolldatei&gt;
-      Aktivieren Sie die Protokolle für die Testplattform.
-      Protokolle werden in die bereitgestellte Datei geschrieben.
-
-      Ändern Sie die Ablaufverfolgungsebene für Protokolle wie folgt:
-      Beispiel: /Diag:&lt;Pfad zur Protokolldatei&gt;;tracelevel=&lt;standardmäßig "verbose"&gt;
-      Zulässige Werte für tracelevel: off, error, warning, info, verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Die angegebene Datei "{0}" ist schreibgeschützt.</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Timeout zum Herstellen einer Verbindung oder zum Verarbeiten von Anfragen für DesignModeClient an Port: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Nicht ausgeführt</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings-Argumente:
-      An die RunSettings-Konfigurationen über die Befehlszeile zu übergebende Argumente. Argumente werden unter Umständen als Name-Wert-Paar der Form [Name]=[Wert] nach "-- " übergeben. Beachten Sie das Leerzeichen nach "--".
-      Trennen Sie mehrere Paare der Form [Name]=[Wert] mithilfe von Leerzeichen.
-      Weitere Informationen zur Unterstützung von RunSettings-Argumenten: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Mindestens eine angegebene RUNSETTINGS-Datei enthält ein ungültiges Token</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Das Testergebnisverzeichnis wird im angegebenen Pfad erstellt, wenn es noch nicht vorhanden ist.
-      Beispiel: /ResultsDirectory:&lt;Pfad_zu_Ergebnisverzeichnis&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Der Parameter "/ResultsDirectory" erfordert einen Wert, wobei die Testergebnisse gespeichert werden müssen. Beispiel: /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Der in "ResultsDirectory" angegebene Pfad "{0}" ist ungültig. Fehler: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">Das Flag "/InIsolation" ist veraltet. Die Tests werden immer in einem separaten Prozess ausgeführt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Die Vstest-Diagnose wird in der Datei {0} protokolliert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;Datensammler-Anzeigename&gt;
-      Aktiviert den Datensammler für den Testlauf. Weitere Informationen finden Sie unter https://aka.ms/vstest-collect.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Der benutzerfreundliche Name des Datensammlers "{0}" ist ungültig. Der Datensammler wird ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Meldungen zu Debugablaufverfolgungen:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Führt den Test im blame-Modus aus. Diese Option ist hilfreich zum Isolieren des problematischen Tests, der einen Absturz des Testhosts verursacht.
-      Im aktuellen Verzeichnis wird eine Ausgabedatei namens "Sequence.xml" erstellt,
-      in der die Reihenfolge der Testausführung vor dem Absturz erfasst wird.
-      Optional können Sie eine Prozesssicherung für den Testhost erfassen.
-      Wenn Sie sich zum Erfassen einer Sicherung entschließen, wird bei einem Absturz standardmäßig eine Minisicherung erfasst.
-      Dieses Standardverhalten können Sie durch einige optionale Parameter außer Kraft setzen:
-      CollectAlways: Zum Erfassen einer Sicherung beim Beenden, selbst wenn kein Absturz eintritt (TRUE/FALSE). 
-      DumpType: Zur Angabe des Sicherungstyps (mini/full).
-      Beispiel: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Testlauf abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Testlauf abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Fehler beim Öffnen der Antwortdatei "{0}".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;Datei&gt;
-      Antwortdatei mit weiteren Optionen lesen</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Gesamtzahl Tests: unbekannt</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Der Pfad zu Testadaptern kann zudem mit dem Befehl /TestAdapterPath angegeben werden. Beispiel: /TestAdapterPath:&lt;Pfad_zu_benutzerdefinierten_Adaptern&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions wird demnächst eingestellt. Verwenden Sie stattdessen /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Beispiel: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" wird nicht unterstützt, wenn der Testlauf mithilfe von "testsettings" konfiguriert wurde.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Eingebettete Testeinstellungen werden – mit Ausnahme von Code Coverage und Microsoft Fakes – nicht für Datensammler unterstützt, die über Ausführungseinstellungen konfiguriert wurden. Weitere Informationen finden Sie unter https://aka.ms/vstest-configure-datacollector. Ausführungseinstellungen: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;URI/Anzeigename für Protokollierung&gt;
-      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer
-      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=&lt;Standardmäßig eindeutiger Dateiname&gt;]
-      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.
-
-      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:
-      Beispiel: /logger:console;verbosity=&lt;Standardmäßig "minimal"&gt;
-      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.
-
-      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:
-      Beispiel: /logger:console;prefix=&lt;Standardmäßig "false"&gt;
-      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Das Sammeln von Absturzabbildern über die Option "CollectDump" für "Blame" wird für diese Plattform nicht unterstützt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Der mit "blame" angegebene blame-Parameter "{0}" ist ungültig. Dieser Parameter wird ignoriert.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Der Diagnosedateipfad "{0}" ist ungültig.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Das blame-Argument "{0}" ist ungültig.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Das diag-Argument "{0}" ist ungültig.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Das logger-Argument "{0}" ist ungültig.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 wird nicht unterstützt. Bei Projekten für Zielversion .NET Framework 3.5 wird der Test im CLR 4.0-Kompatibilitätsmodus ausgeführt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Testlauf wird ausgeführt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Gesamtzahl Tests: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Nicht bestanden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Bestanden: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Übersprungen: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">Das Argument "{0}" ist ungültig. Verwenden Sie die /help-Option, um die Liste gültiger Argumente anzuzeigen.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Insgesamt {0} Testdateien stimmten mit dem angegebenen Muster überein.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">Das Parameterargument "{0}" für den Testlauf ist ungültig. Verwenden Sie das nachstehende Format.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Das Sammeln von Abbildern bei Reaktionsunfähigkeit über die Option "CollectDump" mit "TestTimeout" für "Blame" wird für diese Plattform nicht unterstützt.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0}: Fehler: {1}, erfolgreich: {2}, übersprungen: {3}, gesamt: {4}, Dauer: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Keine</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Legt den Wert einer Umgebungsvariablen fest. Erstellt die Variable, wenn Sie nicht vorhanden ist, und setzt sie andernfalls außer Kraft. Dies impliziert die Option "/InIsolation" und erzwingt die Ausführung der Tests in einem isolierten Prozess.
-      
-      Dieses Argument kann mehrmals angegeben werden, um mehrere Variablen bereitzustellen.
-
-      Beispiel: -e:VARIABLE1=WERT1
-               -e:WEITERE_VARIABLE="WERT MIT LEERZEICHEN"
-               -e:WEITERE_VARIABLE="WERT;getrennt durch;Semikolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">Die Umgebungsvariable "{0}" wurde bereits definiert, sie wird jedoch durch das Argument "-Environment" überschrieben.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Der Testlauf wurde mit dem Fehler {0} abgebrochen.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="de">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">"{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Die folgenden Testermittlungs-Add-Ins sind verfügbar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Die folgenden Testausführungs-Add-Ins sind verfügbar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Die folgenden Testprotokollierungs-Add-Ins sind verfügbar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Fehler: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Der Parameter "{0}" sollte nur ein Mal angegeben werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Ausnahme beim Instanziieren der Erweiterung "{0}": {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Die folgenden Tests sind verfügbar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Unbekannter Parameter "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Die angegebene Testquelldatei "{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Der Testprotokollierungs-URI "{0}" ist ungültig. Die Testprotokollierung wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informationen: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Warnung: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Zeigt diese Syntaxmeldung an.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest-Version {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/Anzeigename für Protokollierung&gt;
+      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer
+      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=&lt;Standardmäßig eindeutiger Dateiname&gt;]
+      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.
+
+      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:
+      Beispiel: /logger:console;verbosity=&lt;Standardmäßig "normal"&gt;
+      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.
+
+      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:
+      Beispiel: /logger:console;prefix=&lt;Standardmäßig "false"&gt;
+      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Beschreibung: Führt Tests aus den angegebenen Dateien aus.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Optionen:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Syntax: vstest.console.exe [Argumente] [Optionen] [[--] &lt;RunSettings-Argumente&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Es wurden keine Testquelldateien angegeben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Es wurden keine Argumente angegeben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Hiermit führen Sie Tests über die angegebenen Dateien oder das Platzhaltermuster aus. Trennen Sie mehrere Testdateinamen oder Muster
+      durch Leerzeichen. Legen Sie die Ausführlichkeit der Konsolenprotokollierung auf "detailed" fest, um übereinstimmende Testdateien anzuzeigen.
+      Beispiele: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Die folgende Einstellungenanbieter-Add-Ins sind verfügbar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Einstellungsdatei&gt;
+      Einstellungen für die Ausführung der Tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Für den Parameter "/Settings" muss eine Einstellungsdatei angegeben werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Die Einstellungsdatei "{0}" wurde nicht gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Fehler beim Testlauf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Der Testlauf war erfolgreich.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">Das Argument "{0}" wird im Befehl "InIsolation" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /InIsolation), und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Der /UseVsixExtensions-Parameter erfordert einen Wert. Wenn TRUE, werden die installierten VSIX-Extensions (falls vorhanden) im Testlauf verwendet. Wenn FALSE, werden sie ignoriert. Beispiel: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">Das Argument "{0}" wird im Befehl "UseVsixExtensions" nicht erwartet. Geben Sie den Befehl mit der Angabe an, ob die VSIX-Extensions verwendet oder übersprungen werden sollen (Beispiel: vstest.console.exe myTests.dll /UseVsixExtensions:true), und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">/InIsolation/InIsolation
+      Führt die Tests in einem isolierten Prozess aus. Auf diese Weise ist es unwahrscheinlicher, dass der Prozess
+      "vstest.console.exe" bei einem Fehler in den Tests beendet wird.
+      Tests werden aber ggf. langsamer ausgeführt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Bewirkt, dass der Prozess "vstest.console.exe" die installierten VSIX-Extensions 
+      (sofern vorhanden) im Testlauf verwendet oder überspringt.
+      Beispiel /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">Das Argument "/BatchSize" erfordert die Größe des Batches. Beispiel: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Ungültige Batchgröße {0}. Die Batchgröße muss größer als null sein. Beispiel: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Zum Ausführen von Tests:
+    &gt;vstest.console.exe tests.dll 
+  Zum Ausführen von Tests mit zusätzlichen Einstellungen wie Datensammlern:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ ListDiscoverers
+      Listet die installierten Testdiscoverer auf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ ListExecutors
+      Listet die installierten Testexecutors auf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ ListLoggers
+      Listet die installierten Testprotokollierungen auf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ ListSettingsProviders
+      Listet die installierten Testeinstellungenanbieter auf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Dateiname&gt;
+      Listet alle gefundenen Tests aus dem angegebenen Testcontainer auf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Verstrichene Zeit:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">Das /Tests-Argument erfordert mindestens einen bestimmten Testnamen oder seine Teilzeichenfolgen.
+       Beispiele: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Insgesamt {0} Tests wurden ermittelt, aber kein Test stimmt mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Testnamen &gt;
+      Führt Tests aus, die mit den eingegebenen Werten übereinstimmen. Verwenden Sie zum
+      Angeben mehrerer Werte Kommas als Trennzeichen.
+      Beispiele: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Der Isolationsmodus wird zum Ausführen der Tests verwendet, weil Adapter für diagnostische Daten in den "runsettings" aktiviert wurden. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Store-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Store-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Unterstützte Dateitypen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        Standard-Executor-URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Ungültiger Plattformtyp: {0}. Gültige Plattformtypen sind {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">Für das /Platform-Argument muss der Zielplattformtyp für den Testlauf angegeben werden. Beispiel: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Plattformtyp&gt;
+      Zielplattformarchitektur für die Testausführung. 
+      Gültige Werte sind x86, x64 und ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Der Isolationsmodus wird zum Ausführen von Tests gemäß den Einstellungen der effektiven Plattform {0} und von .NET Framework {1} für den Testlauf verwendet. Verwenden Sie den /inIsolation-Parameter, um diese Warnung zu unterdrücken.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Frameworkversion&gt;
+      Die .NET-Framework-Zielversion für die Testausführung. 
+      Gültige Werte sind ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" usw.
+      Weitere unterstützte Werte: Framework40, Framework45, FrameworkCore10, FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">Das /Framework-Argument erfordert die .NET Framework-Zielversion für den Testlauf. Beispiel: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Ungültige .NET Framework-Version: {0}. Geben Sie den vollständigen Namen von TargetFramework an (Beispiel: .NETCoreApp,Version=v2.0). Weitere unterstützte .NET Framework-Versionen sind "Framework40", "Framework45", "FrameworkCore10" und "FrameworkUap10".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Der Testlauf für Komponententests für die Windows Store-App konnte nicht gestartet werden: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Ausdruck&gt;
+      Führt Tests aus, die mit dem angegebenen Ausdruck übereinstimmen.
+      &lt;Ausdruck&gt; entspricht dem Format &lt;Eigenschaft&gt;Operator&lt;Wert&gt;[|&amp;&lt;Ausdruck&gt;],
+         wobei Operator entweder "=", "!=" oder "~" ist (Der Operator "~" verfügt über eine contains-
+         Semantik und kann auf Zeichenfolgeneigenschaften, z. B. DisplayName, angewendet werden).
+         Zum Gruppieren von Unterausdrücken können Klammern () verwendet werden.
+      Beispiele: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">Für das Argument /TestCaseFilter ist der Filterwert erforderlich.
+        Filterwert kann von folgendem Typ sein: &lt;Eigenschaft&gt;=&lt;Wert&gt;.
+        Beispiele: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Das Argument "/TestCaseFilter" kann nicht mit "/Tests" angegeben werden. Das Filtern von Testfällen ist nicht anwendbar, wenn Tests angegeben werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} wurde für {1}/{2} erstellt. Den in einem Testlauf angegebenen Testassemblys muss ein .NET-Zielframework und eine Zielplattform gemeinsam sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Zum Ausführen von Tests kann nur ein App-Paket (APPX-Datei) angegeben werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Die Testermittlung wird gestartet, bitte warten...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Die Testausführung wird gestartet, bitte warten...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">Das Lesen der Einstellungen des Adapters für diagnostische Daten hat eine ausgeführte "{0}" ausgelöst. Alle Adapter für diagnostische Daten werden in diesem Testlauf übersprungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Aktiviert den Datensammler "CodeCoverage" für den Testlauf.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">Das Argument "{0}" wird im Befehl "EnableCodeCoverage" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /EnableCodeCoverage), und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Store-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Store-App.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Code Coverage ist für Windows Store-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Insgesamt {0} Tests wurden ermittelt, aber einige Tests stimmen nicht mit den angegebenen Auswahlkriterien ({1}) überein. Verwenden Sie die richtigen Werte, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Hierdurch verwendet der Prozess "vstest.console.exe" im Testlauf
+      benutzerdefinierte Testadapter aus einem angegeben Pfad (soweit vorhanden). 
+      Beispiel: /TestAdapterPath:&lt;Pfad_zu_benutzerdefinierten_Adaptern&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Der /TestAdapterPath-Parameter erfordert einen Wert. Dabei handelt es sich um den Pfad eines Speicherorts mit benutzerdefinierten Testadaptern. Beispiel: /TestAdapterPath:c:\MeineBenutzerdefiniertenAdapter</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Der in "TestAdapterPath" angegebene Pfad "{0}" ist ungültig. Fehler: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Der angegebene benutzerdefinierte Testadapter-Suchpfad wurde nicht gefunden. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Der in "TestAdapterPath" angegebene Pfad "{0}" enthält keine Testadapter. Geben Sie einen gültigen Pfad an, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Der Testlauf für die Tests für die Windows Phone-App konnte nicht gestartet werden: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Der Isolationsmodus wird zum Ausführen der Komponententests für Windows Phone-Apps verwendet. Verwenden Sie den Parameter "/inIsolation", um diese Warnung zu unterdrücken.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Code Coverage ist für Windows Phone-Apps nicht verfügbar. Die Code Coverage-Analyse wird für diesen Testlauf übersprungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Adapter für diagnostische Daten werden beim Ausführen von Komponententests für Windows Phone-Apps nicht unterstützt. Entfernen Sie die Einstellungen für den Adapter für diagnostische Daten aus den Einstellungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">Das App-Paket "{0}" weist keinen Testexecutor-Einstiegspunkt auf. Erstellen Sie zum Ausführen von Komponententests für Windows Phone-Apps ein App-Paket mithilfe des Komponententest-Bibliotheksprojekts der Windows Phone-App.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Das Framework {0} wird zum Ausführen der Tests verwendet. Geben Sie /Framework:{1} an, um diese Warnung zu unterdrücken.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Es wurde kein Test in den angegebenen Testcontainern gefunden. Darüber hinaus unterstützt der Microsoft Windows Store-Komponententestadapter keine APPXBUNDLE-Dateien. Erstellen Sie eine APPX-Datei (legen Sie die Option "App-Bundle generieren" auf "Nie" fest), wenn Sie das App-Paket erstellen, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Gibt an, dass die Tests parallel ausgeführt werden. Standardmäßig werden
+      alle verfügbaren Kerne auf dem Computer verwendet.
+      Die Anzahl der zu verwendenden Kerne kann ggf. mithilfe einer Einstellungsdatei konfiguriert werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">Das Argument "{0}" wird im Befehl "Parallel" nicht erwartet. Geben Sie den Befehl ohne das Argument an (Beispiel: vstest.console.exe myTests.dll /Parallel), und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Darf nicht NULL oder leer sein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Port&gt;
+      Der Port für die Socketverbindung und das Empfangen von Ereignismeldungen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">Das Argument "--Port|/Port" erfordert die Portnummer (Integerwert). Geben Sie den Port für die Socketverbindung und den Empfang von Ereignismeldungen an.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Die aktuell getestete Assembly wurde nicht gefunden. Stellen Sie sicher, dass das Projekt erstellt wird.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Der Pfad "{0}" ist nicht vorhanden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;Buildbasispfad&gt;
+      Das Verzeichnis mit den temporären Ausgaben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Konfiguration&gt;
+      Die Konfiguration, für die das Projekt erstellt wird, d. h. Debug/Release.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">Die angegebene Konfiguration ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Ausgabe&gt;
+      Das Verzeichnis mit den auszuführenden Binärdateien.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">Der BuildBasePath wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Der Ausgabepfad wurde nicht gefunden. Geben Sie einen gültigen Pfad ein, und versuchen Sie es erneut.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Weitere Informationsmeldungen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Tage</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Fehlermeldung:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Gesamtzeit: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Stunden</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Es wurde keine Testprotokollierung mit dem URI oder FriendlyName "{0}" gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minuten</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Sekunden</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Stapelverfolgung:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Standardfehlermeldungen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Standardausgabemeldungen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Anlagen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">In "{0}" ist kein Test verfügbar. Stellen Sie sicher, dass die installierten Test-Discoverer und -Executor und die Versionseinstellungen für Plattform und Framework richtig sind, und wiederholen Sie den Vorgang.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Fehler</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Bestanden</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Übersprungen</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Fehler bei der Ermittlung für die angegebenen Quellen. Ausnahme: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ÜbergeordneteProzess-ID&gt;
+      Die Prozess-ID des übergeordneten Prozesses, der für das Starten des aktuellen Prozesses zuständig ist.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">Das Argument "--ParentProcessId|/ParentProcessId" erfordert die Prozess-ID (Integerwert). Geben Sie die Prozess-ID des übergeordneten Prozesses an, der diesen Prozess gestartet hat.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argumente:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Pfad zur Protokolldatei&gt;
+      Aktivieren Sie die Protokolle für die Testplattform.
+      Protokolle werden in die bereitgestellte Datei geschrieben.
+
+      Ändern Sie die Ablaufverfolgungsebene für Protokolle wie folgt:
+      Beispiel: /Diag:&lt;Pfad zur Protokolldatei&gt;;tracelevel=&lt;standardmäßig "verbose"&gt;
+      Zulässige Werte für tracelevel: off, error, warning, info, verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Die angegebene Datei "{0}" ist schreibgeschützt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Timeout zum Herstellen einer Verbindung oder zum Verarbeiten von Anfragen für DesignModeClient an Port: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Nicht ausgeführt</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings-Argumente:
+      An die RunSettings-Konfigurationen über die Befehlszeile zu übergebende Argumente. Argumente werden unter Umständen als Name-Wert-Paar der Form [Name]=[Wert] nach "-- " übergeben. Beachten Sie das Leerzeichen nach "--".
+      Trennen Sie mehrere Paare der Form [Name]=[Wert] mithilfe von Leerzeichen.
+      Weitere Informationen zur Unterstützung von RunSettings-Argumenten: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Mindestens eine angegebene RUNSETTINGS-Datei enthält ein ungültiges Token</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Das Testergebnisverzeichnis wird im angegebenen Pfad erstellt, wenn es noch nicht vorhanden ist.
+      Beispiel: /ResultsDirectory:&lt;Pfad_zu_Ergebnisverzeichnis&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Der Parameter "/ResultsDirectory" erfordert einen Wert, wobei die Testergebnisse gespeichert werden müssen. Beispiel: /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Der in "ResultsDirectory" angegebene Pfad "{0}" ist ungültig. Fehler: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">Das Flag "/InIsolation" ist veraltet. Die Tests werden immer in einem separaten Prozess ausgeführt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Die Vstest-Diagnose wird in der Datei {0} protokolliert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;Datensammler-Anzeigename&gt;
+      Aktiviert den Datensammler für den Testlauf. Weitere Informationen finden Sie unter https://aka.ms/vstest-collect.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Der benutzerfreundliche Name des Datensammlers "{0}" ist ungültig. Der Datensammler wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Meldungen zu Debugablaufverfolgungen:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Führt den Test im blame-Modus aus. Diese Option ist hilfreich zum Isolieren des problematischen Tests, der einen Absturz des Testhosts verursacht.
+      Im aktuellen Verzeichnis wird eine Ausgabedatei namens "Sequence.xml" erstellt,
+      in der die Reihenfolge der Testausführung vor dem Absturz erfasst wird.
+      Optional können Sie eine Prozesssicherung für den Testhost erfassen.
+      Wenn Sie sich zum Erfassen einer Sicherung entschließen, wird bei einem Absturz standardmäßig eine Minisicherung erfasst.
+      Dieses Standardverhalten können Sie durch einige optionale Parameter außer Kraft setzen:
+      CollectAlways: Zum Erfassen einer Sicherung beim Beenden, selbst wenn kein Absturz eintritt (TRUE/FALSE). 
+      DumpType: Zur Angabe des Sicherungstyps (mini/full).
+      Beispiel: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Testlauf abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Testlauf abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Fehler beim Öffnen der Antwortdatei "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;Datei&gt;
+      Antwortdatei mit weiteren Optionen lesen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Gesamtzahl Tests: unbekannt</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Der Pfad zu Testadaptern kann zudem mit dem Befehl /TestAdapterPath angegeben werden. Beispiel: /TestAdapterPath:&lt;Pfad_zu_benutzerdefinierten_Adaptern&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions wird demnächst eingestellt. Verwenden Sie stattdessen /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Beispiel: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" wird nicht unterstützt, wenn der Testlauf mithilfe von "testsettings" konfiguriert wurde.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Eingebettete Testeinstellungen werden – mit Ausnahme von Code Coverage und Microsoft Fakes – nicht für Datensammler unterstützt, die über Ausführungseinstellungen konfiguriert wurden. Weitere Informationen finden Sie unter https://aka.ms/vstest-configure-datacollector. Ausführungseinstellungen: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/Anzeigename für Protokollierung&gt;
+      Geben Sie eine Protokollierung für Testergebnisse an. Um Ergebnisse beispielsweise in einer
+      Visual Studio-Testergebnisdatei (TRX) zu protokollieren, verwenden Sie /logger:trx[;LogFileName=&lt;Standardmäßig eindeutiger Dateiname&gt;]
+      Erstellt die Datei im TestResults-Verzeichnis mit dem angegebenen LogFileName.
+
+      Ändern Sie den Ausführlichkeitsgrad in den Protokollmeldungen für die Konsolenprotokollierung wie folgt:
+      Beispiel: /logger:console;verbosity=&lt;Standardmäßig "minimal"&gt;
+      Zulässige Werte für den Ausführlichkeitsgrad: quiet, minimal, normal, detailed.
+
+      Ändern Sie das Präfix für die Diagnoseebene für die Konsolenprotokollierung wie folgt:
+      Beispiel: /logger:console;prefix=&lt;Standardmäßig "false"&gt;
+      Weitere Informationen zur Konsolenprotokollierung finden Sie hier: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Das Sammeln von Absturzabbildern über die Option "CollectDump" für "Blame" wird für diese Plattform nicht unterstützt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Der mit "blame" angegebene blame-Parameter "{0}" ist ungültig. Dieser Parameter wird ignoriert.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Der Diagnosedateipfad "{0}" ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Das blame-Argument "{0}" ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Das diag-Argument "{0}" ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Das logger-Argument "{0}" ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 wird nicht unterstützt. Bei Projekten für Zielversion .NET Framework 3.5 wird der Test im CLR 4.0-Kompatibilitätsmodus ausgeführt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Testlauf wird ausgeführt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Gesamtzahl Tests: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Nicht bestanden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Bestanden: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Übersprungen: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">Das Argument "{0}" ist ungültig. Verwenden Sie die /help-Option, um die Liste gültiger Argumente anzuzeigen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Insgesamt {0} Testdateien stimmten mit dem angegebenen Muster überein.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">Das Parameterargument "{0}" für den Testlauf ist ungültig. Verwenden Sie das nachstehende Format.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Das Sammeln von Abbildern bei Reaktionsunfähigkeit über die Option "CollectDump" mit "TestTimeout" für "Blame" wird für diese Plattform nicht unterstützt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0}: Fehler: {1}, erfolgreich: {2}, übersprungen: {3}, gesamt: {4}, Dauer: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Keine</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Legt den Wert einer Umgebungsvariablen fest. Erstellt die Variable, wenn Sie nicht vorhanden ist, und setzt sie andernfalls außer Kraft. Dies impliziert die Option "/InIsolation" und erzwingt die Ausführung der Tests in einem isolierten Prozess.
+      
+      Dieses Argument kann mehrmals angegeben werden, um mehrere Variablen bereitzustellen.
+
+      Beispiel: -e:VARIABLE1=WERT1
+               -e:WEITERE_VARIABLE="WERT MIT LEERZEICHEN"
+               -e:WEITERE_VARIABLE="WERT;getrennt durch;Semikolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">Die Umgebungsvariable "{0}" wurde bereits definiert, sie wird jedoch durch das Argument "-Environment" überschrieben.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Der Testlauf wurde mit dem Fehler {0} abgebrochen.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">Ungültige testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Dies wirkt sich auf das Ladeverhalten des Adapters aus.
+
+      Derzeit unterstützte Verhaltensweisen:
+      – Explicit: Test Platform lädt nur Adapter, die durch /TestAdapterPath (oder runConfiguration.TestAdaptersPaths-Knoten) angegeben sind. 
+      Wenn ein bestimmter Adapterpfad angegeben wird, wird der Adapter geladen. Wenn ein Verzeichnispfad bereitgestellt wird, werden Adapter direkt in diesen Ordner geladen, es sei denn, die Option „Rekursiv“ ist ebenfalls angegeben.
+      Wenn kein Adapterpfad angegeben ist, schlägt der Testlauf fehl.
+      Dies impliziert den Schalter „/InIsolation“, und es wird erzwungen, dass die Tests in einem isolierten Prozess ausgeführt werden.
+
+      – Standard: Die Testplattform lädt Adapter, wenn dieses Argument nicht angegeben wurde. 
+      Werden Erweiterungen von der Quelle aus abgerufen, werden zusätzliche Adapterpfade und das Standardverzeichnis bereitgestellt.
+
+      – DefaultRuntimeProviders: StandardruntimeProvider laden, die im Lieferumfang der Testplattform enthalten sind. 
+      Wenn dies nicht angegeben wird, wenn die Option "Explicit" festgelegt ist, muss ein Testhostanbieter explizit angegeben werden.
+
+      – ExtensionsDirectory: Laden Sie Adapter in den Ordner "Extensions".
+
+      – NextToSource: Laden Sie Adapter neben der Quelle. 
+
+      – Rekursiv: Suchen Sie beim Laden von Adaptern rekursiv nach Ordnern. Hierfür muss auch „Explicit“ oder „NextToSource“ angegeben werden.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">Der angegebene Wert ({0}) für /TestAdapterLoadingStrategy ist ungültig!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Die Rekursive Adapterladestrategie kann nicht allein verwendet werden. Kombinieren Sie dies mit mindestens einem der folgenden Elemente: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Der „/TestAdapterPath“ Parameter muss angegeben werden, wenn die Testadapterladestrategie „{0}“ angegeben wird.</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">„vstest.console.exe“ wird im emulierten Modus als {0} ausgeführt. Um eine bessere Leistung zu erzielen, erwägen Sie die Verwendung der nativen Ausführung von „vstest.console.arm64.exe“.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Zeitüberschreitung beim Warten auf die Anforderungshandlerverbindung nach {0} Sekunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Zeitüberschreitung beim Warten auf das Starten der Testsitzung nach {0} Sekunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Zeitüberschreitung beim Warten auf das Stoppen der Testsitzung nach {0} Sekunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Fehler beim Hosten des Kommunikationskanals.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">ProcDumpToolDirectoryPath muss angegeben werden, um den Postmortemdebugger zu installieren oder zu deinstallieren.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Der Postmortemdebugger wird im aktuellen Betriebssystem nicht unterstützt.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Das für die ausführbare Procdump-Datei angegebene Verzeichnis ist ungültig, und das Tool wurde nicht in Umgebungsvariablen (PROCDUMP_PATH, PATH) gefunden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Der Procdump-Dateiname wurde nicht gefunden: "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">DumpDirectoryPath muss angegeben werden, um den Postmortemdebugger zu installieren.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Das angegebene Verzeichnis ist ungültig: "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">Das AeDebugger-Argument "{0}" ist ungültig.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">Der Befehl "dotnet vstest" wird durch "dotnet test" ersetzt, der jetzt zum Ausführen von Assemblys verwendet werden kann. Siehe https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf
index 4c7e974124..beb1619d0f 100644
--- a/src/vstest.console/Resources/xlf/Resources.es.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.es.xlf
@@ -1,1116 +1,1232 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">No se encuentra '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Los siguientes complementos de detección de pruebas están disponibles:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Los siguientes complementos de ejecución de pruebas están disponibles:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Los siguientes complementos de registrador de pruebas están disponibles:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Error: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">El parámetro "{0}" debe proporcionarse solo una vez.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Se produjo una excepción al crear una instancia de la extensión '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Las siguientes pruebas están disponibles:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">No se reconoce el parámetro "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">No se encuentra el archivo de código fuente de prueba "{0}" proporcionado.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Información: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Advertencia: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Muestra este mensaje de uso.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Todos los derechos reservados.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Herramienta de línea de comandos de ejecución de pruebas de Microsoft(R), versión {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;URI del registrador/Nombre descriptivo&gt;
-      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en 
-      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=&lt;Valor predeterminado: nombre de archivo único&gt;]
-      Crea un archivo en el directorio TestResults con el valor LogFileName dado.
-
-      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación
-      Ejemplo: /logger:console;verbosity=&lt;Valor predeterminado: "normal"&gt;
-      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.
-
-      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación
-      Ejemplo: /logger:console;prefix=&lt;Valor predeterminado: "false"&gt;
-      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Descripción: Ejecuta pruebas de los archivos especificados.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Opciones:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Uso: vstest.console.exe [Argumentos] [Opciones] [[--] &lt;Argumentos de RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">No se han especificado archivos de código fuente de prueba.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">No se han especificado argumentos.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Ejecuta las pruebas del patrón con comodines o los archivos especificados. Separe varios patrones o
-      nombres de archivo de prueba con espacios. Establezca el nivel de detalle del
-      registrador en detallado para ver los archivos de prueba coincidentes.
-      Ejemplos: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Los siguientes complementos de proveedores de configuración están disponibles:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;archivoConfiguración&gt;
-      Configuración que se usará cuando se ejecuten pruebas.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">El parámetro /Settings requiere que se proporcione un archivo de configuración.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">No se encuentra el archivo de configuración '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">No se pudo ejecutar la serie de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">La serie de pruebas se ejecutó correctamente.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">El argumento {0} no se espera en el comando 'InIsolation'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /InIsolation) y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">El parámetro /UseVsixExtensions requiere un valor. Si es “true”, se usarán las extensiones VSIX instaladas (si las hay) en la serie de pruebas. Si es “false”, se omitirá. Ejemplo: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">El argumento {0} no se espera en el comando 'UseVsixExtensions'. Especifique el comando indicando si deben usarse u omitirse las extensiones vsix (ejemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Ejecuta las pruebas en un proceso aislado. De ese modo, es menos probable que el proceso vstest.console.exe se
-      detenga ante un error en las pruebas, pero es posible que
-      las pruebas se ejecuten con más lentitud.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Hace que el proceso vstest.console.exe utilice u omita las 
-      extensiones VSIX instaladas (si las hay) en la serie de
-      pruebas. 
-      Ejemplo: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">El argumento /BatchSize requiere el tamaño del lote. Ejemplo: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Tamaño de lote no válido ({0}). El tamaño de lote debe ser mayor que cero. Ejemplo: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Para ejecutar pruebas:
-    &gt;vstest.console.exe tests.dll 
-  Para ejecutar pruebas con configuración adicional como recolectores de datos:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Enumera los programas de detección de pruebas instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Enumera los ejecutores de pruebas instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Enumera los registradores de pruebas instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Enumera los proveedores de configuración de pruebas instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nombreArchivo
-      Muestra todas las pruebas detectadas del contenedor de pruebas especificado.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Tiempo transcurrido:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">El argumento /Tests requiere uno o varios nombres de pruebas específicas o sus subcadenas.
-       Ejemplos: /Tests:MétodoDePrueba1, /Tests:MétodoDePrueba1,método2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Se ha detectado un total de {0} pruebas, pero ninguna de ellas coincide con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;nombres de pruebas&gt;
-      Ejecuta las pruebas con nombres que coinciden con los valores proporcionados. Para proporcionar varios
-      valores, sepárelos con comas
-      Ejemplos: /Tests:MétodoPrueba1
-                /Tests:MétodoPrueba1,MétodoPrueba2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Se usará el modo de aislamiento para ejecutar las pruebas, ya que los adaptadores de datos de diagnóstico estaban habilitados en RunSettings. Use el parámetro de aislamiento /inIsolation para suprimir esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de la Tienda Windows. Use el parámetro /InIsolation para suprimir esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de la Tienda Windows. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        Nombre descriptivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        Nombre de configuración: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Tipos de archivos admitidos:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI del ejecutor predeterminado: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Tipo de plataforma no válido: {0}. Los tipos de plataforma válidos son {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">El argumento /Platform requiere que se proporcione el tipo de plataforma de destino para la serie de pruebas. Ejemplo: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;tipoPlataforma&gt;
-      Arquitectura de la plataforma de destino que se usará para la ejecución de pruebas. 
-      Los valores válidos son x86, x64 y ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Se usará el modo de aislamiento para ejecutar las pruebas, según requiere la configuración de la plataforma efectiva ({0}) y .Net Framework ({1}) para la serie de pruebas. Use el parámetro /inIsolation para suprimir esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Versión de Framework&gt;
-      Versión de .NET Framework de destino que se usará para la ejecución de pruebas. 
-      Los valores válidos son ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc.
-      Otros valores admitidos son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">El argumento /Framework requiere la versión de .Net Framework de destino para la serie de pruebas. Ejemplo: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Versión de .Net Framework no válida: {0}. Proporcione el nombre completo de TargetFramework (ejemplo: .NETCoreApp,Version=v2.0). Otras versiones de .Net Framework admitidas son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">No se puede iniciar la serie de pruebas unitarias para la aplicación de la Tienda Windows: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expresión&gt;
-      Ejecuta pruebas que coinciden con la expresión dada.
-      &lt;Expresión&gt; tiene el formato &lt;propiedad&gt;Operador&lt;valor&gt;[|&amp;&lt;Expresión&gt;]
-         donde Operador es uno de =, != o ~ (el operador ~ tiene la semántica
-         "contiene" y es aplicable a propiedades de cadena como DisplayName).
-         Se pueden usar paréntesis () para agrupar subexpresiones.
-      Ejemplos: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MiMétodoDePrueba)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">El argumento /TestCaseFilter requiere el valor del filtro.
-        El valor del filtro puede ser del tipo &lt;propiedad&gt;=&lt;valor&gt;.
-        Ejemplos: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">El argumento /TestCaseFilter no se puede especificar con /Tests. El filtrado de casos de prueba no es aplicable cuando se especifican pruebas.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} se ha creado para {1}/{2}. Los ensamblados de prueba especificados en una ejecución deben tener una versión de .Net Framework y una plataforma comunes.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Solo se puede especificar un paquete de aplicación (archivo .appx) para ejecutar pruebas.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Iniciando la detección de pruebas, espere...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Iniciando la ejecución de pruebas, espere...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">Al leer la configuración de adaptador de datos de diagnóstico, se produjo una excepción al ejecutar '{0}'. Se omitirán todos los adaptadores de datos de diagnóstico en esta ejecución.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Habilita el recopilador de datos "CodeCoverage" para la serie de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">El argumento {0} no se espera en el comando 'EnableCodeCoverage'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">El paquete de la aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de la Tienda Windows, cree un paquete de aplicación usando el proyecto Biblioteca de pruebas unitarias para aplicaciones de la Tienda Windows.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">La cobertura de código no está disponible para aplicaciones de la Tienda Windows. Se omitirá el análisis de cobertura de código para esta serie de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Se ha detectado un total de {0} pruebas, pero algunas no coinciden con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Permite que el proceso vstest.console.exe use adaptadores de pruebas personalizados
-      de una ruta de acceso especificada (si existe alguna) en la serie de pruebas. 
-      Ejemplo  /TestAdapterPath:&lt;rutaAAdaptadoresPersonalizados&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">El parámetro /TestAdapterPath requiere un valor, que es la ruta de acceso de una ubicación que contiene adaptadores de prueba personalizados. Ejemplo: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">La ruta de acceso '{0}' especificada en 'TestAdapterPath' no es válida. Error: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">No se encuentra la ruta de búsqueda de adaptadores de prueba personalizados especificada. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">La ruta de acceso '{0}' especificada en 'TestAdapterPath' no contiene ningún adaptador de prueba. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">No se puede iniciar la serie de pruebas para la aplicación de Windows Phone: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de Windows Phone. Use el parámetro /InIsolation para suprimir esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">La cobertura de código no está disponible para aplicaciones de Windows Phone. Se omitirá el análisis de cobertura de código para esta serie de pruebas.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de Windows Phone. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">El paquete de aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de Windows Phone, cree un paquete de aplicación usando el proyecto Aplicación de pruebas unitarias para Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Se usará el marco {0} para ejecutar las pruebas. Especifique /Framework:{1} para suprimir esta advertencia.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">No se han encontrado pruebas en los contenedores de pruebas especificados. Además, el adaptador de pruebas unitarias de la Tienda Microsoft Windows no admite archivos .appxbundle. Cree un archivo .appx (establezca la opción Generar paquete de aplicaciones en Nunca) cuando cree el paquete de la aplicación y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Especifica que las pruebas se ejecuten en paralelo. De forma
-      predeterminada, se pueden usar todos los núcleos disponibles
-      en la máquina. El número de núcleos que debe usarse se puede
-      especificar en el archivo de configuración.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">El argumento {0} no se espera en el comando 'Parallel'. Especifique el comando sin el argumento (ejemplo: vstest.console.exe myTests.dll /Parallel) y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">No puede ser nulo ni estar vacío</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Puerto&gt;
-      Puerto para la conexión de socket y la recepción de mensajes de eventos.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">El argumento --Port|/Port requiere el número de puerto, que es un entero. Especifique el puerto para la conexión de socket y la recepción de mensajes de eventos.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">No se encuentra el ensamblado sometido a pruebas. Asegúrese de que el proyecto se ha compilado.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">La ruta de acceso {0} no existe.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;Ruta de acceso base de la compilación&gt;
-      Directorio que contiene las salidas temporales.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuración&gt;
-      Configuración para la que se ha compilado el proyecto, es decir, Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">La configuración dada no es válida.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Salida&gt;
-      Directorio que contiene los binarios que se van a ejecutar.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">No se encuentra la ruta de acceso base de la compilación. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">No se encuentra la ruta de acceso de salida. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Mensajes con información adicional:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Días</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Mensaje de error:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Tiempo total: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Horas</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">No se encuentra un registrador de pruebas con el URI o el nombre descriptivo '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minutos</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Segundos</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Seguimiento de la pila:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Mensajes de error estándar:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Mensajes de salida estándar:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Datos adjuntos:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">No hay ninguna prueba disponible en {0}. Asegúrese de que la configuración de detectores y ejecutores de pruebas, plataforma y versión de .NET Framework sea correcta e inténtelo de nuevo.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Con error</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Correctas</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Omitidas</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">No se pudo llevar a cabo la detección en los orígenes dados. Excepción: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;idProcesoPrimario&gt;
-      Identificador del proceso primario responsable del inicio del proceso actual.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">El argumento --ParentProcessId|/ParentProcessId requiere el identificador del proceso, que es un entero. Especifique el identificador del proceso principal que inició este proceso.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argumentos:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Ruta al archivo de registro&gt;
-      Habilita los registros para la plataforma de pruebas.
-      Los registros se escriben en el archivo proporcionado.
-
-      Cambie el nivel de seguimiento de los registros tal y como se muestra a continuación
-      Ejemplo: /Diag:&lt;Ruta al archivo de registro&gt;;tracelevel=&lt;Valor predeterminado: "verbose"&gt;
-      Valores permitidos para el nivel de seguimiento: off, error, warning, info y verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">El archivo {0} proporcionado es de solo lectura</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Tiempo de espera para conectar o procesar la solicitud para DesignModeClient en el puerto: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Sin ejecutar</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Argumentos de RunSettings:
-      Argumentos para pasar configuraciones de runsettings a través de la línea de comandos. Los argumentos se pueden especificar como un par nombre-valor en la forma [nombre]=[valor] después de "-- ". Observe que hay un espacio después de --. 
-      Use un espacio para separar varios pares de [nombre]=[valor].
-      Más información sobre la compatibilidad de argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Uno o varios runsettings proporcionados contienen un token no válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      El directorio de resultados de pruebas se creará en la ruta de acceso especificada, si no existe.
-      Ejemplo  /ResultsDirectory:&lt;Ruta al directorio de resultados&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">El parámetro /ResultsDirectory requiere un valor, donde deben guardarse los resultados de la prueba. Ejemplo: /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">La ruta de acceso "{0}" especificada en "ResultsDirectory" no es válida. Error: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">La marca /InIsolation está en desuso. Las pruebas se ejecutan siempre en un proceso independiente</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Registrando diagnósticos de Vstest en el archivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;Nombre descriptivo del recopilador de datos&gt;
-      Habilita el recopilador de datos para la serie de pruebas. Más información aquí: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">El nombre descriptivo del recopilador de datos "{0}" no es válido. El recopilador de datos se ignorará.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Depurar mensajes de trazas:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Ejecuta la prueba en modo blame. Esta opción es útil a la hora de aislar la prueba problemática que provoca el bloqueo del host de prueba.
-      Crea un archivo de salida en el directorio actual como "Sequence.xml",
-      que captura el orden de ejecución de la prueba antes del bloqueo.
-      Tiene la opción de elegir recopilar el volcado de proceso para el host de prueba.
-      Cuando elige recopilar el volcado, de forma predeterminada se recopila un mini volcado en un bloqueo.
-      También puede elegir invalidar este comportamiento predeterminado mediante algunos parámetros opcionales:
-      CollectAlways: para recopilar un volcado al salir incluso aunque no haya un bloqueo (true/false) 
-      DumpType: para especificar el tipo de volcado (mini/completo).
-      Ejemplo: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Serie de pruebas anulada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Serie de pruebas cancelada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Error al abrir el archivo de respuesta "{0}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      Leer el archivo de respuesta para ver más opciones.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Pruebas totales: desconocido</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Además, la ruta de acceso a los adaptadores de pruebas se puede especificar con el comando /TestAdapterPath. Ejemplo  /TestAdapterPath:&lt;rutaAAdaptadoresPersonalizados&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions se está quedando obsoleto. Utilice /TestAdapterPath en su lugar.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Ejemplo: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" no se admite si la serie de pruebas está configurada mediante testsettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Los recopiladores de datos diferentes de Cobertura de código y Microsoft Fakes configurados a través de la configuración de ejecución no se admiten con la configuración de pruebas integrada. Consulte https://aka.ms/vstest-configure-datacollector para obtener más información. Configuración de ejecución: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;URI del registrador/Nombre descriptivo&gt;
-      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en 
-      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=&lt;Valor predeterminado: nombre de archivo único&gt;]
-      Crea un archivo en el directorio TestResults con el valor LogFileName dado.
-
-      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación
-      Ejemplo: /logger:console;verbosity=&lt;Valor predeterminado: "minimal"&gt;
-      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.
-
-      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación
-      Ejemplo: /logger:console;prefix=&lt;Valor predeterminado: "false"&gt;
-      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">La recopilación de volcados de memoria mediante la opción CollectDump para Blame no se admite en esta plataforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">El parámetro blame especificado con blame, {0} no es válido. Se omitirá este parámetro.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">La ruta de acceso al archivo Diag "{0}" no es válida.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">El argumento de Blame "{0}" no es válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">El argumento de Diag "{0}" no es válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">El argumento de Logger "{0}" no es válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">No se admite Framework35. Para los proyectos que tienen como destino .NET Framework 3.5, la prueba se ejecutará en el "modo de compatibilidad" de CLR 4.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Serie de pruebas en curso</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Pruebas totales: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Incorrecto: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Correcto: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Omitido: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">El argumento {0} no es válido. Use la opción /help para comprobar la lista de argumentos válidos.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">{0} archivos de prueba en total coincidieron con el patrón especificado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">El argumento del parámetro de la serie de pruebas "{0}" no es válido. Use el formato siguiente.
-     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">La recopilación de volcados de memoria mediante la opción CollectDump con TestTimeout para Blame no se admite en esta plataforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - Con error: {1}, Superado: {2}, Omitido: {3}, Total: {4}, Duración: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Ninguno</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NOMBRE&gt;=&lt;VALOR&gt;
-      Establece el valor de una variable de entorno. Crea la variable si no existe o la reemplaza en caso de que exista. Esto implica el conmutador /InIsolation y fuerza la ejecución de las pruebas en un proceso aislado.
-      
-      Este argumento se puede especificar varias veces para proporcionar múltiples variables.
-
-      Ejemplo: -e:VARIABLE1=VALOR1
-               -e:OTRA_VARIABLE="VALOR CON ESPACIOS"
-               -e:OTRA_VARIABLE="VALOR;separado por;puntoycoma"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">La variable de entorno "{0}" ya se definió, pero se reemplaza por el argumento -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">La serie de pruebas se ha anulado con el error {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="es">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">No se encuentra '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Los siguientes complementos de detección de pruebas están disponibles:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Los siguientes complementos de ejecución de pruebas están disponibles:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Los siguientes complementos de registrador de pruebas están disponibles:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Error: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">El parámetro "{0}" debe proporcionarse solo una vez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Se produjo una excepción al crear una instancia de la extensión '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Las siguientes pruebas están disponibles:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">No se reconoce el parámetro "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">No se encuentra el archivo de código fuente de prueba "{0}" proporcionado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">El URI de registrador de pruebas '{0}' no es válido. Se omitirá el registrador de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Información: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Advertencia: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Muestra este mensaje de uso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Versión {0} de VSTest</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI del registrador/Nombre descriptivo&gt;
+      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en 
+      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=&lt;Valor predeterminado: nombre de archivo único&gt;]
+      Crea un archivo en el directorio TestResults con el valor LogFileName dado.
+
+      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación
+      Ejemplo: /logger:console;verbosity=&lt;Valor predeterminado: "normal"&gt;
+      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.
+
+      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación
+      Ejemplo: /logger:console;prefix=&lt;Valor predeterminado: "false"&gt;
+      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Descripción: Ejecuta pruebas de los archivos especificados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Opciones:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Uso: vstest.console.exe [Argumentos] [Opciones] [[--] &lt;Argumentos de RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">No se han especificado archivos de código fuente de prueba.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">No se han especificado argumentos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Ejecuta las pruebas del patrón con comodines o los archivos especificados. Separe varios patrones o
+      nombres de archivo de prueba con espacios. Establezca el nivel de detalle del
+      registrador en detallado para ver los archivos de prueba coincidentes.
+      Ejemplos: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Los siguientes complementos de proveedores de configuración están disponibles:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;archivoConfiguración&gt;
+      Configuración que se usará cuando se ejecuten pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">El parámetro /Settings requiere que se proporcione un archivo de configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">No se encuentra el archivo de configuración '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">No se pudo ejecutar la serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">La serie de pruebas se ejecutó correctamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">El argumento {0} no se espera en el comando 'InIsolation'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /InIsolation) y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">El parámetro /UseVsixExtensions requiere un valor. Si es “true”, se usarán las extensiones VSIX instaladas (si las hay) en la serie de pruebas. Si es “false”, se omitirá. Ejemplo: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">El argumento {0} no se espera en el comando 'UseVsixExtensions'. Especifique el comando indicando si deben usarse u omitirse las extensiones vsix (ejemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Ejecuta las pruebas en un proceso aislado. De ese modo, es menos probable que el proceso vstest.console.exe se
+      detenga ante un error en las pruebas, pero es posible que
+      las pruebas se ejecuten con más lentitud.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Hace que el proceso vstest.console.exe utilice u omita las 
+      extensiones VSIX instaladas (si las hay) en la serie de
+      pruebas. 
+      Ejemplo: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">El argumento /BatchSize requiere el tamaño del lote. Ejemplo: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Tamaño de lote no válido ({0}). El tamaño de lote debe ser mayor que cero. Ejemplo: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Para ejecutar pruebas:
+    &gt;vstest.console.exe tests.dll 
+  Para ejecutar pruebas con configuración adicional como recolectores de datos:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Enumera los programas de detección de pruebas instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Enumera los ejecutores de pruebas instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Enumera los registradores de pruebas instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Enumera los proveedores de configuración de pruebas instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nombreArchivo&gt;
+      Muestra todas las pruebas detectadas del contenedor de pruebas especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Tiempo transcurrido:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">El argumento /Tests requiere uno o varios nombres de pruebas específicas o sus subcadenas.
+       Ejemplos: /Tests:MétodoDePrueba1, /Tests:MétodoDePrueba1,método2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Se ha detectado un total de {0} pruebas, pero ninguna de ellas coincide con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;nombres de pruebas&gt;
+      Ejecuta las pruebas con nombres que coinciden con los valores proporcionados. Para proporcionar varios
+      valores, sepárelos con comas
+      Ejemplos: /Tests:MétodoPrueba1
+                /Tests:MétodoPrueba1,MétodoPrueba2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Se usará el modo de aislamiento para ejecutar las pruebas, ya que los adaptadores de datos de diagnóstico estaban habilitados en RunSettings. Use el parámetro de aislamiento /inIsolation para suprimir esta advertencia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de la Tienda Windows. Use el parámetro /InIsolation para suprimir esta advertencia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de la Tienda Windows. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        Nombre descriptivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        Nombre de configuración: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Tipos de archivos admitidos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        URI del ejecutor predeterminado: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Tipo de plataforma no válido: {0}. Los tipos de plataforma válidos son {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">El argumento /Platform requiere que se proporcione el tipo de plataforma de destino para la serie de pruebas. Ejemplo: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;tipoPlataforma&gt;
+      Arquitectura de la plataforma de destino que se usará para la ejecución de pruebas. 
+      Los valores válidos son x86, x64 y ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Se usará el modo de aislamiento para ejecutar las pruebas, según requiere la configuración de la plataforma efectiva ({0}) y .Net Framework ({1}) para la serie de pruebas. Use el parámetro /inIsolation para suprimir esta advertencia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Versión de Framework&gt;
+      Versión de .NET Framework de destino que se usará para la ejecución de pruebas. 
+      Los valores válidos son ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc.
+      Otros valores admitidos son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">El argumento /Framework requiere la versión de .Net Framework de destino para la serie de pruebas. Ejemplo: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Versión de .Net Framework no válida: {0}. Proporcione el nombre completo de TargetFramework (ejemplo: .NETCoreApp,Version=v2.0). Otras versiones de .Net Framework admitidas son Framework40, Framework45, FrameworkCore10 y FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">No se puede iniciar la serie de pruebas unitarias para la aplicación de la Tienda Windows: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expresión&gt;
+      Ejecuta pruebas que coinciden con la expresión dada.
+      &lt;Expresión&gt; tiene el formato &lt;propiedad&gt;Operador&lt;valor&gt;[|&amp;&lt;Expresión&gt;]
+         donde Operador es uno de =, != o ~ (el operador ~ tiene la semántica
+         "contiene" y es aplicable a propiedades de cadena como DisplayName).
+         Se pueden usar paréntesis () para agrupar subexpresiones.
+      Ejemplos: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MiMétodoDePrueba)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">El argumento /TestCaseFilter requiere el valor del filtro.
+        El valor del filtro puede ser del tipo &lt;propiedad&gt;=&lt;valor&gt;.
+        Ejemplos: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">El argumento /TestCaseFilter no se puede especificar con /Tests. El filtrado de casos de prueba no es aplicable cuando se especifican pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} se ha creado para {1}/{2}. Los ensamblados de prueba especificados en una ejecución deben tener una versión de .Net Framework y una plataforma comunes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Solo se puede especificar un paquete de aplicación (archivo .appx) para ejecutar pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Iniciando la detección de pruebas, espere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Iniciando la ejecución de pruebas, espere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">Al leer la configuración de adaptador de datos de diagnóstico, se produjo una excepción al ejecutar '{0}'. Se omitirán todos los adaptadores de datos de diagnóstico en esta ejecución.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Habilita el recopilador de datos "CodeCoverage" para la serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">El argumento {0} no se espera en el comando 'EnableCodeCoverage'. Especifique el comando sin este argumento (por ejemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">El paquete de la aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de la Tienda Windows, cree un paquete de aplicación usando el proyecto Biblioteca de pruebas unitarias para aplicaciones de la Tienda Windows.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">La cobertura de código no está disponible para aplicaciones de la Tienda Windows. Se omitirá el análisis de cobertura de código para esta serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Se ha detectado un total de {0} pruebas, pero algunas no coinciden con los criterios de selección especificados ({1}). Use valores correctos y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Permite que el proceso vstest.console.exe use adaptadores de pruebas personalizados
+      de una ruta de acceso especificada (si existe alguna) en la serie de pruebas. 
+      Ejemplo  /TestAdapterPath:&lt;rutaAAdaptadoresPersonalizados&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">El parámetro /TestAdapterPath requiere un valor, que es la ruta de acceso de una ubicación que contiene adaptadores de prueba personalizados. Ejemplo: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">La ruta de acceso '{0}' especificada en 'TestAdapterPath' no es válida. Error: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">No se encuentra la ruta de búsqueda de adaptadores de prueba personalizados especificada. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">La ruta de acceso '{0}' especificada en 'TestAdapterPath' no contiene ningún adaptador de prueba. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">No se puede iniciar la serie de pruebas para la aplicación de Windows Phone: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Se usará el modo de aislamiento para ejecutar pruebas unitarias para aplicaciones de Windows Phone. Use el parámetro /InIsolation para suprimir esta advertencia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">La cobertura de código no está disponible para aplicaciones de Windows Phone. Se omitirá el análisis de cobertura de código para esta serie de pruebas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">No se admiten adaptadores de datos de diagnóstico cuando se ejecutan pruebas unitarias para aplicaciones de Windows Phone. Quite la configuración de adaptadores de datos de diagnóstico de la configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">El paquete de aplicación '{0}' no tiene un punto de entrada de ejecutor de pruebas. Para ejecutar pruebas unitarias de aplicaciones de Windows Phone, cree un paquete de aplicación usando el proyecto Aplicación de pruebas unitarias para Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Se usará el marco {0} para ejecutar las pruebas. Especifique /Framework:{1} para suprimir esta advertencia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">No se han encontrado pruebas en los contenedores de pruebas especificados. Además, el adaptador de pruebas unitarias de la Tienda Microsoft Windows no admite archivos .appxbundle. Cree un archivo .appx (establezca la opción Generar paquete de aplicaciones en Nunca) cuando cree el paquete de la aplicación y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Especifica que las pruebas se ejecuten en paralelo. De forma
+      predeterminada, se pueden usar todos los núcleos disponibles
+      en la máquina. El número de núcleos que debe usarse se puede
+      especificar en el archivo de configuración.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">El argumento {0} no se espera en el comando 'Parallel'. Especifique el comando sin el argumento (ejemplo: vstest.console.exe myTests.dll /Parallel) y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">No puede ser nulo ni estar vacío</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Puerto&gt;
+      Puerto para la conexión de socket y la recepción de mensajes de eventos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">El argumento --Port|/Port requiere el número de puerto, que es un entero. Especifique el puerto para la conexión de socket y la recepción de mensajes de eventos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">No se encuentra el ensamblado sometido a pruebas. Asegúrese de que el proyecto se ha compilado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">La ruta de acceso {0} no existe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;Ruta de acceso base de la compilación&gt;
+      Directorio que contiene las salidas temporales.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuración&gt;
+      Configuración para la que se ha compilado el proyecto, es decir, Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">La configuración dada no es válida.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Salida&gt;
+      Directorio que contiene los binarios que se van a ejecutar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">No se encuentra la ruta de acceso base de la compilación. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">No se encuentra la ruta de acceso de salida. Proporcione una ruta de acceso válida y vuelva a intentarlo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Mensajes con información adicional:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Días</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Mensaje de error:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Tiempo total: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Horas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">No se encuentra un registrador de pruebas con el URI o el nombre descriptivo '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minutos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Segundos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Seguimiento de la pila:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Mensajes de error estándar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Mensajes de salida estándar:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Datos adjuntos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">No hay ninguna prueba disponible en {0}. Asegúrese de que la configuración de detectores y ejecutores de pruebas, plataforma y versión de .NET Framework sea correcta e inténtelo de nuevo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Con error</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Correctas</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Omitidas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">No se pudo llevar a cabo la detección en los orígenes dados. Excepción: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;idProcesoPrimario&gt;
+      Identificador del proceso primario responsable del inicio del proceso actual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">El argumento --ParentProcessId|/ParentProcessId requiere el identificador del proceso, que es un entero. Especifique el identificador del proceso principal que inició este proceso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argumentos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Ruta al archivo de registro&gt;
+      Habilita los registros para la plataforma de pruebas.
+      Los registros se escriben en el archivo proporcionado.
+
+      Cambie el nivel de seguimiento de los registros tal y como se muestra a continuación
+      Ejemplo: /Diag:&lt;Ruta al archivo de registro&gt;;tracelevel=&lt;Valor predeterminado: "verbose"&gt;
+      Valores permitidos para el nivel de seguimiento: off, error, warning, info y verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">El archivo {0} proporcionado es de solo lectura</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Tiempo de espera para conectar o procesar la solicitud para DesignModeClient en el puerto: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Sin ejecutar</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Argumentos de RunSettings:
+      Argumentos para pasar configuraciones de runsettings a través de la línea de comandos. Los argumentos se pueden especificar como un par nombre-valor en la forma [nombre]=[valor] después de "-- ". Observe que hay un espacio después de --. 
+      Use un espacio para separar varios pares de [nombre]=[valor].
+      Más información sobre la compatibilidad de argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Uno o varios runsettings proporcionados contienen un token no válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      El directorio de resultados de pruebas se creará en la ruta de acceso especificada, si no existe.
+      Ejemplo  /ResultsDirectory:&lt;Ruta al directorio de resultados&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">El parámetro /ResultsDirectory requiere un valor, donde deben guardarse los resultados de la prueba. Ejemplo: /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">La ruta de acceso "{0}" especificada en "ResultsDirectory" no es válida. Error: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">La marca /InIsolation está en desuso. Las pruebas se ejecutan siempre en un proceso independiente</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Registrando diagnósticos de Vstest en el archivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;Nombre descriptivo del recopilador de datos&gt;
+      Habilita el recopilador de datos para la serie de pruebas. Más información aquí: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">El nombre descriptivo del recopilador de datos "{0}" no es válido. El recopilador de datos se ignorará.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Depurar mensajes de trazas:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Ejecuta la prueba en modo blame. Esta opción es útil a la hora de aislar la prueba problemática que provoca el bloqueo del host de prueba.
+      Crea un archivo de salida en el directorio actual como "Sequence.xml",
+      que captura el orden de ejecución de la prueba antes del bloqueo.
+      Tiene la opción de elegir recopilar el volcado de proceso para el host de prueba.
+      Cuando elige recopilar el volcado, de forma predeterminada se recopila un mini volcado en un bloqueo.
+      También puede elegir invalidar este comportamiento predeterminado mediante algunos parámetros opcionales:
+      CollectAlways: para recopilar un volcado al salir incluso aunque no haya un bloqueo (true/false) 
+      DumpType: para especificar el tipo de volcado (mini/completo).
+      Ejemplo: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Serie de pruebas anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Serie de pruebas cancelada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Error al abrir el archivo de respuesta "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      Leer el archivo de respuesta para ver más opciones.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Pruebas totales: desconocido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Además, la ruta de acceso a los adaptadores de pruebas se puede especificar con el comando /TestAdapterPath. Ejemplo  /TestAdapterPath:&lt;rutaAAdaptadoresPersonalizados&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions se está quedando obsoleto. Utilice /TestAdapterPath en su lugar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Ejemplo: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" no se admite si la serie de pruebas está configurada mediante testsettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Los recopiladores de datos diferentes de Cobertura de código y Microsoft Fakes configurados a través de la configuración de ejecución no se admiten con la configuración de pruebas integrada. Consulte https://aka.ms/vstest-configure-datacollector para obtener más información. Configuración de ejecución: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI del registrador/Nombre descriptivo&gt;
+      Especifica un registrador para los resultados de las pruebas. Por ejemplo, para registrar los resultados en 
+      un archivo de resultados de pruebas de Visual Studio (TRX) use /logger:trx[;LogFileName=&lt;Valor predeterminado: nombre de archivo único&gt;]
+      Crea un archivo en el directorio TestResults con el valor LogFileName dado.
+
+      Cambie el nivel de detalle en los mensajes de registro para el registrador de consola tal y como se muestra a continuación
+      Ejemplo: /logger:console;verbosity=&lt;Valor predeterminado: "minimal"&gt;
+      Valores permitidos para el nivel de detalle: quiet, minimal, normal y detailed.
+
+      Cambie el prefijo de nivel de diagnóstico para el registrador de consola tal y como se muestra a continuación
+      Ejemplo: /logger:console;prefix=&lt;Valor predeterminado: "false"&gt;
+      Aquí encontrará más información sobre el registrador de consola: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">La recopilación de volcados de memoria mediante la opción CollectDump para Blame no se admite en esta plataforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">El parámetro blame especificado con blame, {0} no es válido. Se omitirá este parámetro.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">La ruta de acceso al archivo Diag "{0}" no es válida.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">El argumento de Blame "{0}" no es válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">El argumento de Diag "{0}" no es válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">El argumento de Logger "{0}" no es válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">No se admite Framework35. Para los proyectos que tienen como destino .NET Framework 3.5, la prueba se ejecutará en el "modo de compatibilidad" de CLR 4.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Serie de pruebas en curso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Pruebas totales: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Incorrecto: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Correcto: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Omitido: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">El argumento {0} no es válido. Use la opción /help para comprobar la lista de argumentos válidos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">{0} archivos de prueba en total coincidieron con el patrón especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">El argumento del parámetro de la serie de pruebas "{0}" no es válido. Use el formato siguiente.
+     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">La recopilación de volcados de memoria mediante la opción CollectDump con TestTimeout para Blame no se admite en esta plataforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - Con error: {1}, Superado: {2}, Omitido: {3}, Total: {4}, Duración: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Ninguno</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NOMBRE&gt;=&lt;VALOR&gt;
+      Establece el valor de una variable de entorno. Crea la variable si no existe o la reemplaza en caso de que exista. Esto implica el conmutador /InIsolation y fuerza la ejecución de las pruebas en un proceso aislado.
+      
+      Este argumento se puede especificar varias veces para proporcionar múltiples variables.
+
+      Ejemplo: -e:VARIABLE1=VALOR1
+               -e:OTRA_VARIABLE="VALOR CON ESPACIOS"
+               -e:OTRA_VARIABLE="VALOR;separado por;puntoycoma"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">La variable de entorno "{0}" ya se definió, pero se reemplaza por el argumento -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">La serie de pruebas se ha anulado con el error {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">TestSessionCorrelationId no válido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Esto afecta al comportamiento de carga del adaptador.
+
+      Comportamientos admitidos actualmente:
+        - Explícito: la plataforma de pruebas solo cargará los adaptadores especificados por /TestAdapterPath (o el nodo RunConfiguration.TestAdaptersPaths). 
+                    Si se proporciona una ruta de acceso específica del adaptador, se cargará el adaptador; si se proporciona una ruta de acceso del directorio, los adaptadores que se encuentren directamente en esa carpeta se cargarán, a menos que también se especifique la opción Recursiva.
+                    Si no se especifica ninguna ruta de acceso de adaptador, se producirá un error en la serie de pruebas.
+                    Esto implicará el interruptor /InIsolation y forzará la ejecución de las pruebas en un proceso aislado.
+        
+        - Valor predeterminado: la plataforma de pruebas cargará los adaptadores si no se ha especificado este argumento. 
+                   Recogerá las extensiones del lado del origen, rutas de acceso de adaptador adicionales proporcionadas y del directorio predeterminado.
+
+        - DefaultRuntimeProviders: carga los proveedores de tiempo de ejecución predeterminados incluidos en la plataforma de pruebas. 
+                                   Si no se especifica esta opción cuando se establece la opción "Explicito", es necesario especificar explícitamente un proveedor de host de prueba.
+
+        - ExtensionsDirectory: carga los adaptadores en la carpeta Extensiones.
+
+        - NextToSource: cargar los adaptadores junto al origen. 
+
+        - Recursivo: busca carpetas de forma recursiva al cargar los adaptadores. Esto requiere que también se especifique "Explícito" o "NextToSource".</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">El valor especificado ({0}) para /TestAdapterLoadingStrategy no es válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">La estrategia de carga recursiva del adaptador no se puede utilizar sola. Combine con uno o más de los elementos siguientes: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">El parámetro /TestAdapterPath debe proporcionarse cuando se especifica la estrategia de carga del adaptador de prueba "{0}".</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe se está ejecutando en modo emulado como {0}. Para obtener un mejor rendimiento, considere la posibilidad de usar el ejecutor nativo vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Se ha agotado el tiempo de espera de la conexión del controlador de solicitudes después de {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Se ha agotado el tiempo de espera de la sesión de prueba de inicio después de {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Se ha agotado el tiempo de espera para detener la sesión de prueba después de {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Error al hospedar el canal de comunicación.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">Se debe especificar ProcDumpToolDirectoryPath para instalar o desinstalar el depurador post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">El depurador post mortem no se admite en el sistema operativo actual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">El directorio especificado para el ejecutable procdump no es válido y no se encontró la herramienta en las variables de entorno (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">No se encontró el nombre del archivo procdump: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">DumpDirectoryPath debe especificarse para instalar el depurador post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">El directorio especificado no es válido: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">El argumento AeDebugger '{0}' no es válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">El comando dotnet vstest se sustituye por dotnet test, que ahora se puede usar para ejecutar ensamblados. Consulte https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf
index a65a8316ff..69da7bbd42 100644
--- a/src/vstest.console/Resources/xlf/Resources.fr.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.fr.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}' introuvable.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Les compléments de découverte de tests suivants sont disponibles :</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Les compléments d'exécution de tests suivants sont disponibles :</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0} : {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Les compléments suivants de type enregistreur d'événements de tests sont disponibles :</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Erreur : {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Le paramètre "{0}" ne doit être fourni qu'une seule fois.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Une exception s'est produite durant l'instanciation de l'extension '{0}' : {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Les tests suivants sont disponibles :</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Paramètre non reconnu "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Le fichier source de test "{0}" fourni est introuvable.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informations : {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Avertissement : {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Permet d'afficher ce message d'utilisation.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Tous droits réservés.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Outil en ligne de commande d'exécution de tests Microsoft (R), version {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;URI/nom convivial du journaliseur&gt;
-      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un 
-      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=&lt;nom de fichier unique par défaut&gt;]
-      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.
-
-      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous
-      Exemple : /logger:console;verbosity=&lt;"normal" par défaut&gt;
-      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.
-
-      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous
-      Exemple : /logger:console;prefix=&lt;"false" par défaut&gt;
-      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Description : exécute les tests à partir des fichiers spécifiés.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Options :</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Utilisation : vstest.console.exe [Arguments] [Options] [[--] &lt;arguments de RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Aucun fichier source de test n'a été spécifié.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Aucun argument n'a été spécifié.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Exécutez des tests à partir des fichiers ou des modèles de caractères génériques spécifiés. Séparez plusieurs modèles ou noms de fichiers de test
-      par des espaces. Affectez à la verbosité du journaliseur de console la valeur Detailed pour voir les fichiers de test correspondants.
-      Exemples : mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Les compléments suivants de type fournisseurs de paramètres sont disponibles :</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;fichier de paramètres&gt;
-      Paramètres à utiliser durant l'exécution des tests.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Le paramètre /Settings nécessite un fichier de paramètres.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Le fichier de paramètres '{0}' est introuvable.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Échec de la série de tests.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Série de tests réussie.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'InIsolation'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /InIsolation), puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Le paramètre /UseVsixExtensions nécessite une valeur. Si la valeur est 'true', les extensions VSIX installées (le cas échéant) sont utilisées dans la série de tests. Si la valeur est false, elles sont ignorées. Exemple : /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'UseVsixExtensions'. Spécifiez la commande indiquant si les extensions vsix doivent être utilisées ou ignorées (exemple : vstest.console.exe myTests.dll /UseVsixExtensions:true), puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Exécute les tests dans un processus isolé. Le processus vstest.console.exe 
-      est moins susceptible de s'arrêter en cas d'erreur durant les tests, mais ces derniers 
-      risquent de s'exécuter plus lentement.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Le processus vstest.console.exe utilise ou ignore les extensions VSIX 
-      installées (le cas échéant) durant la série de tests. 
-      Exemple : /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">L'argument /BatchSize nécessite la taille du lot. Exemple : /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Taille de lot non valide {0}. La taille du lot doit être supérieure à zéro. Exemple : /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Pour exécuter les tests :
-    &gt;vstest.console.exe tests.dll 
-  Pour exécuter les tests avec des paramètres supplémentaires, par exemple des collecteurs de données :
-    &gt;vstest.console.exe tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Liste les découvreurs de tests installés.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Liste les exécuteurs de tests installés.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Liste les enregistreurs d'événements de tests installés.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Liste les fournisseurs de paramètres de test installés.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nom de fichier&gt;
-      Liste tous les tests découverts dans le conteneur de tests spécifié.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Temps écoulé :</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">L'argument /Tests nécessite un ou plusieurs noms de tests spécifiques ou leurs sous-chaînes.
-       Exemples : /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Au total, {0} tests ont été découverts mais aucun d'entre eux ne correspond aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;noms de tests&gt;
-      Permet d'exécuter les tests dont les noms correspondent aux valeurs fournies. Pour fournir plusieurs
-      valeurs, séparez-les par des virgules.
-      Exemples : /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Utilisation du mode Isolation pour exécuter les tests, car les adaptateurs de données de diagnostic ont été activés dans les paramètres d'exécution. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Utilisation du mode Isolation pour exécuter les tests unitaires des applications du Windows Store. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications du Windows Store. Supprimez les adaptateurs de données de diagnostic des paramètres.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName : {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI : {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName : {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Types de fichier pris en charge :</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI de l'exécuteur par défaut : {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI : {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Type de plate-forme non valide : {0}. Les types de plates-formes valides sont {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">Si vous utilisez l'argument /Platform, le type de plateforme cible de la série de tests doit être fourni. Exemple : /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;type de plateforme&gt;
-      Architecture de plateforme cible à utiliser pour l'exécution des tests. 
-      Les valeurs valides sont x86, x64 et ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Utilisation du mode Isolation pour exécuter les tests, conformément aux paramètres effectifs de la plateforme : {0} et du .Net Framework :{1} de la série de tests. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;version du framework&gt;
-      Version cible du .Net Framework à utiliser pour l'exécution des tests. 
-      Les valeurs valides sont : ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc.
-      Les autres valeurs prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">L'argument /Framework nécessite la version cible du .Net Framework pour la série de tests. Exemple : /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Version non valide du .Net Framework : {0}. Indiquez le nom complet de TargetFramework (exemple : .NETCoreApp,Version=v2.0). Les autres versions du .Net Framework prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Impossible de démarrer la série de tests des tests unitaires pour une application du Windows Store : {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;expression&gt;
-      Permet d'exécuter les tests qui correspondent à l'expression indiquée.
-      &lt;Expression&gt; est au format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         où Operator correspond à =, != ou ~ (Operator ~ utilise la sémantique 'contient'
-         et s'applique aux propriétés de chaîne telles que DisplayName).
-         Vous pouvez utiliser des parenthèses () pour regrouper les sous-expressions.
-      Exemples : /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">L'argument /TestCaseFilter requiert la valeur du filtre.
-        La valeur du filtre peut être de type &lt;property&gt;=&lt;value&gt;.
-        Exemples : "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Impossible de spécifier l'argument /TestCaseFilter avec /Tests. Le filtrage des cas de test est non applicable quand des tests sont spécifiés.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} est généré pour {1}/{2}. Les assemblys de tests spécifiés dans une série doivent avoir une version cible du .Net Framework et une plateforme communes.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Un seul package d'application (fichier .appx) peut être spécifié pour l'exécution de tests.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Démarrage de la découverte de tests, patientez...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Démarrage de l'exécution de tests, patientez...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">La lecture des paramètres de l'adaptateur de données de diagnostic a levé une exception durant l'exécution de '{0}'. Tous les adaptateurs de données de diagnostic seront ignorés dans cette série.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Active le collecteur de données 'CodeCoverage' pour la série de tests.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'EnableCodeCoverage'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /EnableCodeCoverage), puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications du Windows Store, créez un package de l'application à l'aide du projet de bibliothèque de tests unitaires d'applications du Windows Store.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">La couverture du code n'est pas disponible pour les applications du Windows Store. L'analyse de la couverture du code a été ignorée pour cette série de tests.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Au total, {0} tests ont été découverts mais certains d'entre eux ne correspondent pas aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Le processus vstest.console.exe utilise des adaptateurs de tests personnalisés
-      à partir du chemin spécifié (le cas échéant) dans la série de tests. 
-      Exemple : /TestAdapterPath:&lt;chemin d'adaptateurs personnalisés&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Le paramètre /TestAdapterPath nécessite une valeur qui représente le chemin des adaptateurs de tests personnalisés. Exemple : /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Le chemin '{0}' spécifié dans 'TestAdapterPath' est non valide. Erreur : {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Le chemin de recherche fourni pour l'adaptateur de test personnalisé est introuvable. Indiquez un chemin valide, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Le chemin '{0}' spécifié dans 'TestAdapterPath' ne contient aucun adaptateur de test. Indiquez un chemin valide, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Impossible de démarrer la série de tests pour les tests d'une application Windows Phone : {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Utilisation du mode Isolation pour exécuter les tests unitaires des applications Windows Phone. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">La couverture du code n'est pas disponible pour les applications Windows Phone. L'analyse de la couverture du code a été ignorée pour cette série de tests.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications Windows Phone. Supprimez les adaptateurs de données de diagnostic des paramètres.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications Windows Phone, créez un package de l'application à l'aide du projet d'application de tests unitaires Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Utilisation du framework {0} pour exécuter les tests. Spécifiez /Framework:{1} pour supprimer cet avertissement.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Tests introuvables dans les conteneurs de tests spécifiés. De plus, l'Adaptateur de test unitaire Microsoft Windows Store ne prend pas en charge les fichiers .appxbundle. Créez un fichier .appx (affectez la valeur Jamais à l'option Générer l'ensemble d'applications) durant la création du package de l'application, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Spécifie que les tests doivent être exécutés en parallèle. Par défaut, il est
-      possible d'utiliser la totalité des cœurs disponibles sur la machine.
-      Vous pouvez configurer le nombre de cœurs à utiliser à l'aide d'un fichier de paramètres.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'Parallel'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /Parallel), puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Ne peut pas avoir une valeur null ou être vide</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;port&gt;
-      Port de connexion du socket et de réception des messages d'événement.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">L'argument --Port|/Port nécessite le numéro de port, qui doit être indiqué sous forme d'entier. Spécifiez le port de connexion du socket et de réception des messages d'événement.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">L'assembly testé est introuvable. Vérifiez que le projet est généré.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Le chemin {0} n'existe pas.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;chemin de base de la build&gt;
-      Répertoire contenant les sorties temporaires.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;configuration&gt;
-      Configuration pour laquelle le projet est généré. Exemple : Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">La configuration indiquée est non valide.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;sortie&gt;
-      Répertoire contenant les fichiers binaires à exécuter.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">BuildBasePath est introuvable. Fournissez un chemin valide, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Le chemin associé à Output est introuvable. Fournissez un chemin valide, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Messages d'informations supplémentaires :</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Jours</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Message d'erreur :</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Durée totale : {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Heures</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Impossible de localiser un enregistreur d'événements de tests ayant pour URI ou FriendlyName '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minutes</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Secondes</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Arborescence des appels de procédure :</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Messages d'erreur standard :</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Messages de sortie standard :</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Pièces jointes :</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">Aucun test disponible dans {0}. Vérifiez que les paramètres des découvreurs, des exécuteurs, de la plateforme et de la version de Framework installés sont appropriés, puis réessayez.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Échoué</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Réussi</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Ignoré</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Échec de la découverte pour les sources indiquées. Exception : {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;id du processus parent&gt;
-      ID de processus du processus parent chargé de lancer le processus actuel.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">L'argument --ParentProcessId|/ParentProcessId nécessite l'ID de processus, qui doit être indiqué sous forme d'entier. Spécifiez l'ID de processus du processus parent qui a lancé ce processus.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Arguments :</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;chemin du fichier journal&gt;
-      Permet d'activer les journaux pour la plateforme de test.
-      Les journaux sont écrits dans le fichier fourni.
-
-      Change le niveau de trace des journaux comme indiqué ci-dessous
-      Exemple : /Diag:&lt;chemin du fichier journal&gt;;tracelevel=&lt;"verbose" par défaut&gt;
-      Valeurs autorisées pour tracelevel : off, error, warning, info et verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Le fichier {0} fourni est en lecture seule</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Délai expiré pour se connecter ou traiter la requête pour DesignModeClient sur le port : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Pas exécuté</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Arguments RunSettings :
-      Arguments pour passer des configurations runsettings via la ligne de commande. Les arguments peuvent être spécifiés comme paire nom-valeur sous la forme [nom]=[valeur] après "-- ". Notez l'espace après --. 
-      Utilisez un espace pour séparer plusieurs [nom]=[valeur].
-      Plus d'informations sur la prise en charge des arguments RunSettings : https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Un ou plusieurs paramètres d'exécution fournis contiennent un jeton non valide</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Le répertoire des résultats des tests est créé dans le chemin spécifié, s'il n'existe pas.
-      Exemple : /ResultsDirectory:&lt;chemin du répertoire des résultats&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Le paramètre /ResultsDirectory nécessite une valeur, où les résultats des tests doivent être enregistrés. Exemple :  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Le chemin '{0}' spécifié dans 'ResultsDirectory' est non valide. Erreur : {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">L'indicateur /InIsolation est déprécié. Les tests sont toujours exécutés dans un processus distinct</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Journalisation des diagnostics Vstest dans le fichier : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;nom convivial du collecteur de données&gt;
-      Active le collecteur de données pour la série de tests. Plus d'informations ici : https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Le nom convivial du collecteur de données '{0}' n'est pas valide. Le collecteur de données est ignoré.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Déboguer les messages de traces :</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Exécute le test en mode blame. Cette option est utile pour isoler le test problématique qui cause le plantage de l'hôte de test.
-      Il crée un fichier de sortie dans le répertoire actif nommé "Sequence.xml",
-      qui capture l'ordre d'exécution du test avant le plantage.
-      Vous pouvez éventuellement choisir de collecter le fichier dump du processus de l'hôte de test.
-      Quand vous choisissez de collecter le fichier dump, par défaut, un mini-dump est collecté lors du plantage.
-      Vous pouvez aussi choisir de remplacer ce comportement par défaut par des paramètres facultatifs :
-      CollectAlways - Pour collecter le fichier dump à la fermeture, même s'il n'y pas de plantage (true/false) 
-      DumpType - Pour spécifier le type de fichier dump (mini/full).
-      Exemple : /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Série de tests abandonnée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Série de tests annulée.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Erreur au moment de l'ouverture du fichier réponse '{0}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;fichier&gt;
-      Consultez le fichier réponse pour plus d'options.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Nombre total de tests : inconnu</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">De plus, vous pouvez spécifier le chemin des adaptateurs de tests à l'aide de la commande /TestAdapterPath. Exemple : /TestAdapterPath:&lt;chemin d'adaptateurs personnalisés&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions est progressivement déprécié. Utilisez /TestAdapterPath à la place.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Exemple : /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" n'est pas pris en charge si la série de tests est configurée avec testsettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Les collecteurs de données autres que la couverture du code et Microsoft Fakes configurés via les paramètres d'exécution ne sont pas pris en charge avec les paramètres de test incorporés. Pour plus d'informations, consultez https://aka.ms/vstest-configure-datacollector. Paramètres d'exécution : {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;URI/nom convivial du journaliseur&gt;
-      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un 
-      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=&lt;nom de fichier unique par défaut&gt;]
-      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.
-
-      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous
-      Exemple : /logger:console;verbosity=&lt;"minimal" par défaut&gt;
-      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.
-
-      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous
-      Exemple : /logger:console;prefix=&lt;"false" par défaut&gt;
-      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">La collecte des vidages sur incident à l'aide de l'option CollectDump pour Blame n'est pas prise en charge pour cette plateforme.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Le paramètre blame spécifié avec blame, {0} n'est pas valide. Ce paramètre est ignoré.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Le chemin du fichier Diag '{0}' n'est pas valide.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">L'argument blame '{0}' n'est pas valide.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">L'argument diag '{0}' n'est pas valide.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">L'argument logger '{0}' n'est pas valide.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 n'est pas pris en charge. Pour les projets ciblant .NET Framework 3.5, le test s'exécutera dans CLR 4.0 en « mode de compatibilité ».</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Série de tests en cours</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Nombre total de tests : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Non réussi(s) : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Réussi(s) : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Ignoré(s) : {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">L’argument {0} n'est pas valide. Utilisez l'option /help pour vérifier la liste des arguments valides.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Au total, {0} fichiers de test ont correspondu au modèle spécifié.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">L'argument de paramètre de série de tests '{0}' est non valide. Utilisez le format ci-dessous.
-     Format : TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">La collecte des vidages sur blocage par l'option CollectDump avec TestTimeout pour Blame n'est pas prise en charge pour cette plateforme.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - échec : {1}, réussite : {2}, ignorée(s) : {3}, total : {4}, durée : {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Aucun(e)</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NOM&gt;=&lt;VALEUR&gt;
-      Définit la valeur d'une variable d'environnement. Crée la variable si elle n'existe pas, et la remplace si elle existe. Cela implique l'utilisation du commutateur /InIsolation et l'exécution forcée des tests dans un processus isolé.
-      
-      Vous pouvez spécifier cet argument plusieurs fois pour fournir plusieurs variables.
-
-      Exemple : -e:VARIABLE1=VALEUR1
-               -e:AUTRE_VARIABLE="VALEUR AVEC ESPACES"
-               -e:AUTRE_VARIABLE="VALEUR;séparée;par;des;points-virgules"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">La variable d'environnement '{0}' est déjà définie, mais elle est substituée par l'argument -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Désolé... Nous n’avons pas pu procéder à la série de tests, car nous avons rencontré l’erreur suivante : {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="fr">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}' introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Les compléments de découverte de tests suivants sont disponibles :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Les compléments d'exécution de tests suivants sont disponibles :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0} : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Les compléments suivants de type enregistreur d'événements de tests sont disponibles :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Erreur : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Le paramètre "{0}" ne doit être fourni qu'une seule fois.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Une exception s'est produite durant l'instanciation de l'extension '{0}' : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Les tests suivants sont disponibles :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Paramètre non reconnu "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Le fichier source de test "{0}" fourni est introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">L'URI de l'enregistreur d'événements de tests '{0}' est non valide. L'enregistreur d'événements de tests va être ignoré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informations : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Avertissement : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Permet d'afficher ce message d'utilisation.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Version de VSTest {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/nom convivial du journaliseur&gt;
+      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un 
+      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=&lt;nom de fichier unique par défaut&gt;]
+      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.
+
+      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous
+      Exemple : /logger:console;verbosity=&lt;"normal" par défaut&gt;
+      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.
+
+      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous
+      Exemple : /logger:console;prefix=&lt;"false" par défaut&gt;
+      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Description : exécute les tests à partir des fichiers spécifiés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Options :</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Utilisation : vstest.console.exe [Arguments] [Options] [[--] &lt;arguments de RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Aucun fichier source de test n'a été spécifié.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Aucun argument n'a été spécifié.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Exécutez des tests à partir des fichiers ou des modèles de caractères génériques spécifiés. Séparez plusieurs modèles ou noms de fichiers de test
+      par des espaces. Affectez à la verbosité du journaliseur de console la valeur Detailed pour voir les fichiers de test correspondants.
+      Exemples : mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Les compléments suivants de type fournisseurs de paramètres sont disponibles :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;fichier de paramètres&gt;
+      Paramètres à utiliser durant l'exécution des tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Le paramètre /Settings nécessite un fichier de paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Le fichier de paramètres '{0}' est introuvable.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Échec de la série de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Série de tests réussie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'InIsolation'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /InIsolation), puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Le paramètre /UseVsixExtensions nécessite une valeur. Si la valeur est 'true', les extensions VSIX installées (le cas échéant) sont utilisées dans la série de tests. Si la valeur est false, elles sont ignorées. Exemple : /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'UseVsixExtensions'. Spécifiez la commande indiquant si les extensions vsix doivent être utilisées ou ignorées (exemple : vstest.console.exe myTests.dll /UseVsixExtensions:true), puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Exécute les tests dans un processus isolé. Le processus vstest.console.exe 
+      est moins susceptible de s'arrêter en cas d'erreur durant les tests, mais ces derniers 
+      risquent de s'exécuter plus lentement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Le processus vstest.console.exe utilise ou ignore les extensions VSIX 
+      installées (le cas échéant) durant la série de tests. 
+      Exemple : /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">L'argument /BatchSize nécessite la taille du lot. Exemple : /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Taille de lot non valide {0}. La taille du lot doit être supérieure à zéro. Exemple : /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Pour exécuter les tests :
+    &gt;vstest.console.exe tests.dll 
+  Pour exécuter les tests avec des paramètres supplémentaires, par exemple des collecteurs de données :
+    &gt;vstest.console.exe tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Liste les découvreurs de tests installés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Liste les exécuteurs de tests installés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Liste les enregistreurs d'événements de tests installés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Liste les fournisseurs de paramètres de test installés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nom de fichier&gt;
+      Liste tous les tests découverts dans le conteneur de tests spécifié.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Temps écoulé :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">L'argument /Tests nécessite un ou plusieurs noms de tests spécifiques ou leurs sous-chaînes.
+       Exemples : /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Au total, {0} tests ont été découverts mais aucun d'entre eux ne correspond aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;noms de tests&gt;
+      Permet d'exécuter les tests dont les noms correspondent aux valeurs fournies. Pour fournir plusieurs
+      valeurs, séparez-les par des virgules.
+      Exemples : /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Utilisation du mode Isolation pour exécuter les tests, car les adaptateurs de données de diagnostic ont été activés dans les paramètres d'exécution. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Utilisation du mode Isolation pour exécuter les tests unitaires des applications du Windows Store. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications du Windows Store. Supprimez les adaptateurs de données de diagnostic des paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Types de fichier pris en charge :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        URI de l'exécuteur par défaut : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Type de plate-forme non valide : {0}. Les types de plates-formes valides sont {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">Si vous utilisez l'argument /Platform, le type de plateforme cible de la série de tests doit être fourni. Exemple : /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      Architecture de plate-forme cible à utiliser pour l'exécution des tests. 
+      Les valeurs valides sont x86, x64 et ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Utilisation du mode Isolation pour exécuter les tests, conformément aux paramètres effectifs de la plateforme : {0} et du .Net Framework :{1} de la série de tests. Utilisez le paramètre /inIsolation pour supprimer cet avertissement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      Version cible de .Net Framework à utiliser pour l'exécution des tests. 
+      Les valeurs valides sont ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Les autres valeurs prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">L'argument /Framework nécessite la version cible du .Net Framework pour la série de tests. Exemple : /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Version non valide du .Net Framework : {0}. Indiquez le nom complet de TargetFramework (exemple : .NETCoreApp,Version=v2.0). Les autres versions du .Net Framework prises en charge sont Framework40, Framework45, FrameworkCore10 et FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Impossible de démarrer la série de tests des tests unitaires pour une application du Windows Store : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;expression&gt;
+      Permet d'exécuter les tests qui correspondent à l'expression indiquée.
+      &lt;Expression&gt; est au format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         où Operator correspond à =, != ou ~ (Operator ~ utilise la sémantique 'contient'
+         et s'applique aux propriétés de chaîne telles que DisplayName).
+         Vous pouvez utiliser des parenthèses () pour regrouper les sous-expressions.
+      Exemples : /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">L'argument /TestCaseFilter requiert la valeur du filtre.
+        La valeur du filtre peut être de type &lt;property&gt;=&lt;value&gt;.
+        Exemples : "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Impossible de spécifier l'argument /TestCaseFilter avec /Tests. Le filtrage des cas de test est non applicable quand des tests sont spécifiés.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} est généré pour {1}/{2}. Les assemblys de tests spécifiés dans une série doivent avoir une version cible du .Net Framework et une plateforme communes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Un seul package d'application (fichier .appx) peut être spécifié pour l'exécution de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Démarrage de la découverte de tests, patientez...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Démarrage de l'exécution de tests, patientez...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">La lecture des paramètres de l'adaptateur de données de diagnostic a levé une exception durant l'exécution de '{0}'. Tous les adaptateurs de données de diagnostic seront ignorés dans cette série.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Active le collecteur de données 'CodeCoverage' pour la série de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'EnableCodeCoverage'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /EnableCodeCoverage), puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications du Windows Store, créez un package de l'application à l'aide du projet de bibliothèque de tests unitaires d'applications du Windows Store.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">La couverture du code n'est pas disponible pour les applications du Windows Store. L'analyse de la couverture du code a été ignorée pour cette série de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Au total, {0} tests ont été découverts mais certains d'entre eux ne correspondent pas aux critères de sélection spécifiés ({1}). Utilisez les valeurs appropriées, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Cela oblige le processus vstest.console.exe à utiliser des adaptateurs de test personnalisés
+      à partir d'un chemin donné (le cas échéant) dans l'exécution du test. 
+      Exemple /TestAdapterPath : &lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Le paramètre /TestAdapterPath nécessite une valeur qui représente le chemin des adaptateurs de tests personnalisés. Exemple : /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Le chemin '{0}' spécifié dans 'TestAdapterPath' est non valide. Erreur : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Le chemin de recherche fourni pour l'adaptateur de test personnalisé est introuvable. Indiquez un chemin valide, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Le chemin '{0}' spécifié dans 'TestAdapterPath' ne contient aucun adaptateur de test. Indiquez un chemin valide, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Impossible de démarrer la série de tests pour les tests d'une application Windows Phone : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Utilisation du mode Isolation pour exécuter les tests unitaires des applications Windows Phone. Utilisez le paramètre /InIsolation pour supprimer cet avertissement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">La couverture du code n'est pas disponible pour les applications Windows Phone. L'analyse de la couverture du code a été ignorée pour cette série de tests.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Les adaptateurs de données de diagnostic ne sont pas pris en charge durant l'exécution de tests unitaires pour les applications Windows Phone. Supprimez les adaptateurs de données de diagnostic des paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">Le package d'application '{0}' n'a pas de point d'entrée pour l'exécuteur de tests. Pour exécuter les tests unitaires des applications Windows Phone, créez un package de l'application à l'aide du projet d'application de tests unitaires Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Utilisation du framework {0} pour exécuter les tests. Spécifiez /Framework:{1} pour supprimer cet avertissement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Tests introuvables dans les conteneurs de tests spécifiés. De plus, l'Adaptateur de test unitaire Microsoft Windows Store ne prend pas en charge les fichiers .appxbundle. Créez un fichier .appx (affectez la valeur Jamais à l'option Générer l'ensemble d'applications) durant la création du package de l'application, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Spécifie que les tests doivent être exécutés en parallèle. Par défaut, il est
+      possible d'utiliser la totalité des cœurs disponibles sur la machine.
+      Vous pouvez configurer le nombre de cœurs à utiliser à l'aide d'un fichier de paramètres.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">L'argument {0} n'est pas attendu dans la commande 'Parallel'. Spécifiez la commande sans l'argument (exemple : vstest.console.exe myTests.dll /Parallel), puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Ne peut pas avoir une valeur null ou être vide</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;port&gt;
+      Port de connexion du socket et de réception des messages d'événement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">L'argument --Port|/Port nécessite le numéro de port, qui doit être indiqué sous forme d'entier. Spécifiez le port de connexion du socket et de réception des messages d'événement.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">L'assembly testé est introuvable. Vérifiez que le projet est généré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Le chemin {0} n'existe pas.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;chemin de base de la build&gt;
+      Répertoire contenant les sorties temporaires.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;configuration&gt;
+      Configuration pour laquelle le projet est généré. Exemple : Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">La configuration indiquée est non valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;sortie&gt;
+      Répertoire contenant les fichiers binaires à exécuter.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">BuildBasePath est introuvable. Fournissez un chemin valide, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Le chemin associé à Output est introuvable. Fournissez un chemin valide, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Messages d'informations supplémentaires :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Jours</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Message d'erreur :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Durée totale : {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Heures</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Impossible de localiser un enregistreur d'événements de tests ayant pour URI ou FriendlyName '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minutes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Secondes</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Arborescence des appels de procédure :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Messages d'erreur standard :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Messages de sortie standard :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Pièces jointes :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Aucun test disponible dans {0}. Vérifiez que les paramètres des découvreurs, des exécuteurs, de la plateforme et de la version de Framework installés sont appropriés, puis réessayez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Échoué</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Réussi</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Ignoré</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Échec de la découverte pour les sources indiquées. Exception : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;id du processus parent&gt;
+      ID de processus du processus parent chargé de lancer le processus actuel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">L'argument --ParentProcessId|/ParentProcessId nécessite l'ID de processus, qui doit être indiqué sous forme d'entier. Spécifiez l'ID de processus du processus parent qui a lancé ce processus.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Arguments :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;chemin du fichier journal&gt;
+      Permet d'activer les journaux pour la plateforme de test.
+      Les journaux sont écrits dans le fichier fourni.
+
+      Change le niveau de trace des journaux comme indiqué ci-dessous
+      Exemple : /Diag:&lt;chemin du fichier journal&gt;;tracelevel=&lt;"verbose" par défaut&gt;
+      Valeurs autorisées pour tracelevel : off, error, warning, info et verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Le fichier {0} fourni est en lecture seule</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Délai expiré pour se connecter ou traiter la requête pour DesignModeClient sur le port : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Pas exécuté</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Arguments RunSettings :
+      Arguments pour passer des configurations runsettings via la ligne de commande. Les arguments peuvent être spécifiés comme paire nom-valeur sous la forme [nom]=[valeur] après "-- ". Notez l'espace après --. 
+      Utilisez un espace pour séparer plusieurs [nom]=[valeur].
+      Plus d'informations sur la prise en charge des arguments RunSettings : https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Un ou plusieurs paramètres d'exécution fournis contiennent un jeton non valide</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Le répertoire des résultats des tests est créé dans le chemin spécifié, s'il n'existe pas.
+      Exemple : /ResultsDirectory:&lt;chemin du répertoire des résultats&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Le paramètre /ResultsDirectory nécessite une valeur, où les résultats des tests doivent être enregistrés. Exemple :  /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Le chemin '{0}' spécifié dans 'ResultsDirectory' est non valide. Erreur : {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">L'indicateur /InIsolation est déprécié. Les tests sont toujours exécutés dans un processus distinct</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Journalisation des diagnostics Vstest dans le fichier : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;nom convivial du collecteur de données&gt;
+      Active le collecteur de données pour la série de tests. Plus d'informations ici : https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Le nom convivial du collecteur de données '{0}' n'est pas valide. Le collecteur de données est ignoré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Déboguer les messages de traces :</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Exécute le test en mode blame. Cette option est utile pour isoler le test problématique qui cause le plantage de l'hôte de test.
+      Il crée un fichier de sortie dans le répertoire actif nommé "Sequence.xml",
+      qui capture l'ordre d'exécution du test avant le plantage.
+      Vous pouvez éventuellement choisir de collecter le fichier dump du processus de l'hôte de test.
+      Quand vous choisissez de collecter le fichier dump, par défaut, un mini-dump est collecté lors du plantage.
+      Vous pouvez aussi choisir de remplacer ce comportement par défaut par des paramètres facultatifs :
+      CollectAlways - Pour collecter le fichier dump à la fermeture, même s'il n'y pas de plantage (true/false) 
+      DumpType - Pour spécifier le type de fichier dump (mini/full).
+      Exemple : /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Série de tests abandonnée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Série de tests annulée.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Erreur au moment de l'ouverture du fichier réponse '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;fichier&gt;
+      Consultez le fichier réponse pour plus d'options.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Nombre total de tests : inconnu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">De plus, vous pouvez spécifier le chemin des adaptateurs de tests à l'aide de la commande /TestAdapterPath. Exemple : /TestAdapterPath:&lt;chemin d'adaptateurs personnalisés&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions est progressivement déprécié. Utilisez /TestAdapterPath à la place.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Exemple : /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" n'est pas pris en charge si la série de tests est configurée avec testsettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Les collecteurs de données autres que la couverture du code et Microsoft Fakes configurés via les paramètres d'exécution ne sont pas pris en charge avec les paramètres de test incorporés. Pour plus d'informations, consultez https://aka.ms/vstest-configure-datacollector. Paramètres d'exécution : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/nom convivial du journaliseur&gt;
+      Spécifiez un journaliseur pour les résultats des tests. Par exemple, pour journaliser des résultats dans un 
+      fichier de résultats des tests Visual Studio (TRX), utilisez /logger:trx[;LogFileName=&lt;nom de fichier unique par défaut&gt;]
+      Crée un fichier dans le répertoire TestResults avec le LogFileName indiqué.
+
+      Change le niveau de verbosité des messages du journaliseur de la console, comme indiqué ci-dessous
+      Exemple : /logger:console;verbosity=&lt;"minimal" par défaut&gt;
+      Valeurs autorisées pour verbosity : quiet, minimal, normal et detailed.
+
+      Change le préfixe du niveau de diagnostic pour le journaliseur de la console, comme indiqué ci-dessous
+      Exemple : /logger:console;prefix=&lt;"false" par défaut&gt;
+      En savoir plus sur le journaliseur de la console : https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">La collecte des vidages sur incident à l'aide de l'option CollectDump pour Blame n'est pas prise en charge pour cette plateforme.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Le paramètre blame spécifié avec blame, {0} n'est pas valide. Ce paramètre est ignoré.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Le chemin du fichier Diag '{0}' n'est pas valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">L'argument blame '{0}' n'est pas valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">L'argument diag '{0}' n'est pas valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">L'argument logger '{0}' n'est pas valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 n'est pas pris en charge. Pour les projets ciblant .NET Framework 3.5, le test s'exécutera dans CLR 4.0 en « mode de compatibilité ».</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Série de tests en cours</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Nombre total de tests : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Non réussi(s) : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Réussi(s) : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Ignoré(s) : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">L’argument {0} n'est pas valide. Utilisez l'option /help pour vérifier la liste des arguments valides.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Au total, {0} fichiers de test ont correspondu au modèle spécifié.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">L'argument de paramètre de série de tests '{0}' est non valide. Utilisez le format ci-dessous.
+     Format : TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">La collecte des vidages sur blocage par l'option CollectDump avec TestTimeout pour Blame n'est pas prise en charge pour cette plateforme.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - échec : {1}, réussite : {2}, ignorée(s) : {3}, total : {4}, durée : {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Aucun(e)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Définit la valeur d'une variable d'environnement. Crée la variable si elle n'existe pas, remplace si elle existe. Cela impliquera le commutateur /InIsolation et forcera les tests à être exécutés dans un processus isolé.
+      
+      Cet argument peut être spécifié plusieurs fois pour fournir plusieurs variables.
+
+      Exemple: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">La variable d'environnement '{0}' est déjà définie, mais elle est substituée par l'argument -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Désolé... Nous n’avons pas pu procéder à la série de tests, car nous avons rencontré l’erreur suivante : {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">TestSessionCorrelationId non valide</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Cela affecte le comportement de chargement de l'adaptateur.
+
+      Comportements actuellement pris en charge : 
+        – Explicite : la plate-forme de test ne chargera que les adaptateurs spécifiés par /TestAdapterPath (ou le nœud RunConfiguration.TestAdaptersPaths). 
+                    Si un chemin d'adaptateur spécifique est fourni, l'adaptateur sera chargé ; si un chemin de répertoire est fourni, les adaptateurs directement dans ce dossier seront chargés, sauf si l'option Récursif est également spécifiée.
+                    Si aucun chemin d'adaptateur n'est spécifié, l'exécution du test échouera.
+                    Cela impliquera le commutateur /InIsolation et forcera les tests à être exécutés dans un processus isolé.
+        
+        – Par défaut : la plate-forme de test chargera les adaptateurs si cet argument n'a pas été spécifié. 
+                   Il récupérera les extensions à côté de la source, a fourni des chemins d'adaptateur supplémentaires et à partir du répertoire par défaut.
+
+        – DefaultRuntimeProviders : charger les fournisseurs d'exécution par défaut fournis avec la plate-forme de test. 
+                                   Si cela n'est pas spécifié lorsque l'option "Explicit" est définie, un fournisseur d'hôte de test doit être spécifié explicitement.
+
+        – Répertoire des extensions : Charger les adaptateurs et le dossier Extensions.
+
+        – NextToSource : charger les adaptateurs à côté de la source. 
+
+        – Récursif : recherche récursive dans les dossiers lors du chargement des adaptateurs. Cela nécessite que "Explicit" ou "NextToSource" soit également spécifié.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">La valeur spécifiée ({0}) pour /TestAdapterLoadingStrategy n’est pas valide !</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">La stratégie de chargement de carte récursive ne peut pas être utilisée seule. Effectuez une combinaison avec un ou plusieurs des éléments suivants : {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Le paramètre /TestAdapterPath doit être fourni lorsque la stratégie de chargement de l’adaptateur de test «{0}» est spécifiée !</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe s’exécute en mode émulé en tant que {0}. Pour de meilleures performances, utilisez l’exécuteur natif vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">L’attente de la connexion du gestionnaire de demandes a expiré après {0} secondes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">L’attente du démarrage de la session de test a expiré après {0} secondes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">L’attente d’arrêt de la session de test a expiré après {0} secondes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Erreur lors de l’hébergement du canal de communication</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">ProcDumpToolDirectoryPath doit être spécifié pour installer ou annuler l’installation du débogueur post-mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Le débogueur post-mortem n’est pas pris en charge dans le système d’exploitation actuel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Le répertoire spécifié pour l’exécutable procdump n’est pas valide et l’outil est introuvable dans les variables d’environnement (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Nom de fichier procdump introuvable : '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">DumpDirectoryPath doit être spécifié pour installer le débogueur post-mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Le répertoire spécifié n’est pas valide : «{0}»</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">L’argument AeDebugger '{0}' n’est pas valide.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">La commande dotnet vstest est remplacée par le test dotnet, qui peut désormais être utilisé pour exécuter des assemblys. Voir https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf
index 8a179cbcf7..f5c055f7a4 100644
--- a/src/vstest.console/Resources/xlf/Resources.it.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.it.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}' non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Sono disponibili i componenti aggiuntivi di individuazione dei test seguenti:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Sono disponibili i componenti aggiuntivi di esecuzione dei test seguenti:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Sono disponibili i componenti aggiuntivi di logger di test seguenti:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Errore: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Il parametro "{0}" deve essere specificato una sola volta.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Si è verificata un'eccezione durante la creazione dell'istanza dell'estensione '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Sono disponibili i test seguenti:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Il parametro "{0}" non è stato riconosciuto.</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Il file di origine test "{0}" specificato non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informazioni: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Avviso: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Visualizza questo messaggio relativo alla sintassi.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Tutti i diritti sono riservati.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Strumento da riga di comando per l'esecuzione di test Microsoft (R) Versione {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;URI/Nome descrittivo logger&gt;
-      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un 
-      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=&lt;impostazione predefinita: nome file univoco&gt;]
-      Crea nella directory TestResults il file con il valore specificato per LogFileName.
-
-      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:
-      Esempio: /logger:console;verbosity=&lt;impostazione predefinita: "normal"&gt;
-      Valori consentiti per verbosity: quiet, minimal, normal e detailed.
-
-      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:
-      Esempio: /logger:console;prefix=&lt;impostazione predefinita: "false"&gt;
-      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Descrizione: esegue test dai file specificati.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Opzioni:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Utilizzo: vstest.console.exe [Argomenti] [Opzioni] [[--] &lt;argomenti di RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Non sono stati specificati file di origine test.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Non sono stati specificati argomenti.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[NomiFileDiTest]
-      Esegue i test corrispondenti ai file specificati o al carattere jolly. Separare più nomi di file di test o
-       caratteri jolly con uno spazio. Impostare il livello di dettaglio del logger della console su dettagliato per visualizzare i file di test corrispondenti.
-      Esempi: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Sono disponibili i componenti aggiuntivi di provider di impostazioni seguenti:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;FileImpostazioni&gt;
-      Impostazioni da usare per l'esecuzione dei test.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Con il parametro /Settings è necessario specificare un file di impostazioni.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Il file di impostazioni '{0}' non è stato trovato.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">L'esecuzione dei test non è riuscita.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">L'esecuzione dei test è riuscita.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">L'argomento {0} non è previsto nel comando 'InIsolation'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /InIsolation, quindi riprovare.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Con il parametro /UseVsixExtensions è richiesto un valore. Se è 'true', le estensioni VSIX eventualmente installate verranno usate nell'esecuzione dei test. Se è false, verranno ignorate. Esempio: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">L'argomento {0} non è previsto nel comando 'UseVsixExtensions'. Specificare il comando indicando se le estensioni vsix devono essere usate o ignorate, ad esempio vstest.console.exe myTests.dll /UseVsixExtensions:true, quindi riprovare.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Esegue i test in un processo isolato. In questo modo è meno probabile che 
-      il processo vstest.console.exe venga arrestato in caso di errore nei test,
-      che però potrebbero risultare più lenti.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Determina se il processo vstest.console.exe usa o ignora le estensioni VSIX 
-      eventualmente installate nell'esecuzione dei test. 
-      Esempio: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Con l'argomento /BatchSize sono richieste le dimensioni del batch. Esempio: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Le dimensioni {0} del batch non sono valide. Devono essere maggiori di zero. Esempio: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Per eseguire test:
-    &gt;vstest.console.exe tests.dll 
-  Per eseguire test con impostazioni aggiuntive, quali agenti di raccolta dati:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Elenca gli agenti di individuazione test installati.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Elenca gli executor di test installati.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Elenca i logger di test installati.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Elenca i provider di impostazioni test installati.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Nome file&gt;
-      Elenca tutti i test individuati dal contenitore di test specificato.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Tempo trascorso:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">Con l'argomento /Tests sono richiesti uno o più nomi di test specifici o relative sottostringhe.
-       Esempi: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">In totale sono stati individuati {0} test, ma nessuno corrisponde ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Nomi test&gt;
-      Esegue test con nomi corrispondenti ai valori specificati. Per specificare più
-      valori, separarli con virgole.
-      Esempi: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Per eseguire i test, verrà usata la modalità di isolamento perché gli adattatori dati di diagnostica sono stati abilitati in runsettings. Usare il parametro /inIsolation per non visualizzare più questo avviso.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Per eseguire gli unit test per le app di Windows Store, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Store. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        Nome descrittivo: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        Nome impostazione: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Tipi di file supportati:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI executor predefinito: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Tipo di piattaforma non valido: {0}. I tipi di piattaforma validi sono {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">L'argomento /Platform richiede il tipo di piattaforma di destinazione per l'esecuzione dei test. Ad esempio: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Tipo di piattaforma&gt;
-       Architettura della piattaforma di destinazione da usare per l'esecuzione dei test. 
-       Valori validi: x86, x64 e ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Per eseguire i test, verrà usata la modalità di isolamento in base a quanto specificato nelle impostazioni effettive di piattaforma {0} e .NET Framework {1} per l'esecuzione dei test. Usare il parametro /inIsolation per non visualizzare più questo avviso.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Versione framework&gt;
-      Versione di .NET Framework di destinazione da usare per l'esecuzione dei test. 
-      Valori validi: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" e così via.
-      Altri valori supportati: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">Con l'argomento /Framework è richiesta la versione di .NET Framework di destinazione per l'esecuzione dei test. Esempio: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">La versione di .NET Framework {0} non è valida. Specificare il nome completo della versione di .NET Framework di destinazione ad esempio .NETCoreApp,Version=v2.0. Altre versioni di .NET Framework supportate: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Non è stato possibile avviare l'esecuzione dei test per unit test per l'app di Windows Store: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Espressione&gt;
-      Esegue test corrispondenti all'espressione specificata.
-      &lt;Espressione&gt; è nel formato &lt;proprietà&gt;Operatore&lt;valore&gt;[|&amp;&lt;Espressione&gt;]
-         dopo l'operatore è =, != oppure ~  (l'operatore ~ implica semantica 'contains'
-         ed è applicabile solo per proprietà di stringhe quali DisplayName).
-         È possibile usare le parentesi () per raggruppare sottoespressioni.
-      Esempi: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">L'argomento /TestCaseFilter richiede il valore di filtro.
-        Il valore di filtro può essere di tipo &lt;proprietà&gt;=&lt;valore&gt;.
-        Esempi: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Non è possibile specificare l'argomento /TestCaseFilter con /Tests. Il filtro dei test case non è applicabile quando si specificano test.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} è compilato per {1}/{2}. Gli assembly di test specificati in un'esecuzione devono disporre di una piattaforma e di un .NET Framework di destinazione comuni.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Per i test in esecuzione è possibile specificare un solo pacchetto dell'app (file con estensione appx).</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Avvio dell'individuazione dei test in corso. Attendere...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Avvio dell'esecuzione dei test in corso. Attendere...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">La lettura delle impostazioni dell'adattatore dati di diagnostica ha generato un oggetto '{0}' di esecuzione. Tutti gli adattatori dati di diagnostica verranno ignorati durante questa esecuzione.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Abilita l'agente di raccolta dati 'CodeCoverage' per l'esecuzione dei test.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">L'argomento {0} non è previsto nel comando 'EnableCodeCoverage'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /EnableCodeCoverage, quindi riprovare.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Store, creare il pacchetto dell'app usando il progetto Libreria unit test per app di Windows Store.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Il code coverage non è disponibile per le app di Windows Store. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">In totale sono stati individuati {0} test, ma alcuni test non corrispondono ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Determina se il processo vstest.console.exe usa adattatori di test personalizzati
-      da un percorso eventualmente specificato nell'esecuzione dei test. 
-      Esempio  /TestAdapterPath:&lt;percorsoAdattatoriPersonalizzati&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Con il parametro /TestAdapterPath è richiesto un valore, corrispondente al percorso di una posizione contenente adattatori di test personalizzati. Esempio: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Il percorso '{0}' specificato in 'TestAdapterPath' non è valido. Errore: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Il percorso di ricerca dell'adattatore di test personalizzato non è stato trovato. Specificare un percorso valido e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Il percorso '{0}' specificato in 'TestAdapterPath' non contiene alcun adattatore di test. Specificare un percorso valido e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Non è stato possibile avviare l'esecuzione dei test per i test per l'app di Windows Phone: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Per eseguire gli unit test per le app di Windows Phone, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Il code coverage non è disponibile per le app di Windows Phone. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Phone. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Phone, creare il pacchetto dell'app con il progetto App unit test di Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Per eseguire i test, verrà usato il framework {0}. Specificare /Framework:{1} per non visualizzare più questo avviso.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Non è stato trovato alcun test nei contenitori di test specificati. L'adattatore di unit test di Microsoft Windows Store, inoltre, non supporta i file con estensione appxbundle. Durante la creazione di un pacchetto dell'app, creare un file appx impostando l'opzione Genera il bundle dell'app su Mai, quindi riprovare.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Specifica che i test devono essere eseguiti in parallelo. Per impostazione
-       predefinita, è possibile usare al massimo tutti i core disponibili in questo computer.
-       Il numero di core da usare può essere configurato con un file di impostazioni.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">L'argomento {0} non è previsto nel comando 'Parallel'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /Parallel, quindi riprovare.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Non può essere Null o vuoto</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Porta&gt;
-      Porta per la connessione socket e la ricezione dei messaggi dell'evento.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">Con l'argomento --Port|/Port è richiesto un numero di porta che corrisponde a un numero intero. Specificare la porta per la connessione socket e la ricezione dei messaggi dell'evento.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">L'assembly sottoposto a test non è stato trovato. Assicurarsi che il progetto sia compilato.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Il percorso {0} non esiste.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;PercorsoBaseCompilazione&gt;
-      Directory che contiene gli output temporanei.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configurazione&gt;
-      Configurazione per cui viene compilato il progetto, ad esempio Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">La configurazione specificata non è valida.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
-      Directory contenente i file binari da eseguire.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Il percorso di base di compilazione non è stato trovato. Specificare un percorso valido e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Il percorso di output non è stato trovato. Specificare un percorso valido e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Ulteriori messaggi informativi:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Giorni</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Messaggio di errore:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Tempo totale: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Ore</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Non è stato trovato alcun logger di test con URI o nome descrittivo '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minuti</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Secondi</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Analisi dello stack:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Messaggi di errore standard:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Messaggi di output standard:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Allegati:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">Non è disponibile alcun test in {0}. Verificare che le impostazioni delle versioni installate di piattaforma e framework, agenti di individuazione ed executor di test siano appropriate e riprovare.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Non superato</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Superato</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Ignorato</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">L'individuazione non è riuscita per le origini specificate. Eccezione: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      ID del processo padre responsabile dell'avvio del processo corrente.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">Con l'argomento --ParentProcessId|/ParentProcessId è richiesto l'ID processo che corrisponde a un numero intero. Specificare l'ID del processo padre che ha avviato questo processo.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argomenti:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;percorso del file di log&gt;
-      Abilita i log per la piattaforma di test.
-      I log vengono scritti nel file specificato.
-
-      Modifica il livello di traccia per i log come illustrato di seguito:
-      Esempio: /Diag:&lt;percorso del file di logfile&gt;;tracelevel=&lt;impostazione predefinita: "verbose"&gt;
-      Valori consentiti per tracelevel: off, error, warning, info e verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Il file specificato {0} è di sola lettura</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Timeout per la connessione o l'elaborazione della richiesta relativa a DesignModeClient sulla porta: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Non eseguito</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Argomenti di RunSettings:
-      Argomenti per passare le configurazioni di runsettings tramite la riga di comando. È possibile specificare gli argomenti come coppia nome-valore in formato [nome]=[valore] dopo "-- ". Notare lo spazio dopo --. 
-      Usare uno spazio per separare più coppie [nome]=[valore].
-      Per altre informazioni sul supporto degli argomenti di RunSettings, vedere: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Uno o più file runsettings specificati contengono un token non valido</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Se non esiste già, la directory dei risultati dei test verrà creata nel percorso specificato.
-      Esempio: /ResultsDirectory:&lt;percorsoDirectoryRisultati&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Con il parametro /ResultsDirectory è richiesto un valore, corrispondente alla directory in cui verranno salvati i risultati dei test. Esempio: /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Il percorso '{0}' specificato in 'ResultsDirectory' non è valido. Errore: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">Il flag /InIsolation è deprecato. I test verranno sempre eseguiti in un processo separato</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Registrazione della diagnostica di Vstest nel file: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;Nome descrittivo agente di raccolta dati&gt;
-      Abilita l'agente di raccolta dati per l'esecuzione dei test. Per altre informazioni, vedere: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Il nome descrittivo '{0}' dell'agente di raccolta dati non è valido. L'agente di raccolta dati verrà ignorato.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Messaggi delle tracce di debug:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Valore];[DumpType]=[Valore]
-      Esegue il test in modalità di segnalazione errore. Questa opzione è utile per isolare il test problematico che causa l'arresto anomalo di Test Host.
-      Crea nella directory corrente un file di output "Sequence.xml", che
-      acquisisce l'ordine di esecuzione del test prima dell'arresto anomalo.
-      Si può scegliere di raccogliere il dump del processo per Test Host.
-      Quando si sceglie di raccogliere il dump, per impostazione predefinita viene raccolto un minidump in caso di arresto anomalo.
-      Si può anche scegliere di eseguire l'override di questo comportamento predefinito usando alcuni parametri facoltativi:
-      CollectAlways: per raccogliere il dump all'uscita anche in assenza di arresto anomalo (true/false) 
-      DumpType: per specificare il tipo di dump (mini/full).
-      Esempio: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Esecuzione dei test interrotta.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Esecuzione dei test annullata.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Si è verificato un errore durante l'apertura del file di risposta '{0}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      Legge il file di risposta per altre opzioni.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Totale test: sconosciuto</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">È anche possibile specificare il percorso degli adattatori di test con il comando /TestAdapterPath. Esempio: /TestAdapterPath:&lt;percorsoAdattatoriPersonalizzati&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions verrà deprecato. Usare /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Esempio: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" non è supportato se l'esecuzione dei test viene configurata con testsettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Gli agenti di raccolta dati diversi da Code Coverage e Microsoft Fakes configurati tramite le impostazioni esecuzione test non sono supportati con impostazioni di test incorporate. Per altre informazioni, vedere https://aka.ms/vstest-configure-datacollector. Impostazioni esecuzione test: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;URI/Nome descrittivo logger&gt;
-      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un 
-      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=&lt;impostazione predefinita: nome file univoco&gt;]
-      Crea nella directory TestResults il file con il valore specificato per LogFileName.
-
-      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:
-      Esempio: /logger:console;verbosity=&lt;impostazione predefinita: "minimal"&gt;
-      Valori consentiti per verbosity: quiet, minimal, normal e detailed.
-
-      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:
-      Esempio: /logger:console;prefix=&lt;impostazione predefinita: "false"&gt;
-      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">L'opzione CollectDump per Blame non supporta la raccolta dei dump di arresto anomalo del sistema per questa piattaforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Il parametro di Blame specificato con Blame {0} non è valido e verrà ignorato.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Il percorso '{0}' del file di Diag non è valido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">L'argomento '{0}' di Blame non è valido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">L'argomento '{0}' di Diag non è valido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">L'argomento '{0}' di Logger non è valido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, i test verranno eseguiti nella modalità di compatibilità di CLR 4.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Esecuzione dei test in corso</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Totale test: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Non superati: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Superati: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Ignorati: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">L'argomento {0} non è valido. Usare l'opzione/help per verificare l'elenco di argomenti validi.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Un totale di {0} file di test corrisponde al criterio specificato.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">L'argomento '{0}' del parametro di esecuzione dei test non è valido. Usare il formato seguente.
-     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">L'opzione CollectDump con TestTimeout per Blame non supporta la raccolta dei dump di blocco per questa piattaforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - Non superati: {1}. Superati: {2}. Ignorati: {3}. Totale: {4}. Durata: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Nessuno</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NOME&gt;=&lt;VALORE&gt;
-      Imposta il valore di una variabile di ambiente. Crea la variabile se non esiste e la sostituisce se esiste. Implica l'opzione /InIsolation e forza l'esecuzione dei test in un processo isolato.
-      
-      È possibile specificare più volte questo argomento per fornire più variabili.
-
-      Esempio: -e:VARIABILE1=VALORE1
-               -e:ALTRA_VARIABILE="VALORE CON SPAZI"
-               -e:ALTRA_VARIABILE="VALORE;delimitato da;punti e virgola"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">La variabile di ambiente '{0}' è già stata definita, ma viene sostituita dall'argomento -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Esecuzione dei test interrotta con errore {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="it">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}' non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Sono disponibili i componenti aggiuntivi di individuazione dei test seguenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Sono disponibili i componenti aggiuntivi di esecuzione dei test seguenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Sono disponibili i componenti aggiuntivi di logger di test seguenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Errore: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Il parametro "{0}" deve essere specificato una sola volta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Si è verificata un'eccezione durante la creazione dell'istanza dell'estensione '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Sono disponibili i test seguenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Il parametro "{0}" non è stato riconosciuto.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Il file di origine test "{0}" specificato non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">L'URI del logger di test '{0}' non è valido. Il logger di test verrà ignorato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informazioni: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Avviso: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Visualizza questo messaggio relativo alla sintassi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Versione di VSTest {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un 
+      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Crea nella directory TestResults il file con il valore specificato per LogFileName.
+
+      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:
+      Esempio: /logger:console;verbosity=&lt;impostazione predefinita: "normal"&gt;
+      Valori consentiti per verbosity: quiet, minimal, normal e detailed.
+
+      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:
+      Esempio: /logger:console;prefix=&lt;impostazione predefinita: "false"&gt;
+      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Descrizione: esegue test dai file specificati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Opzioni:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Utilizzo: vstest.console.exe [Argomenti] [Opzioni] [[--] &lt;argomenti di RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Non sono stati specificati file di origine test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Non sono stati specificati argomenti.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[NomiFileDiTest]
+      Esegue i test corrispondenti ai file specificati o al carattere jolly. Separare più nomi di file di test o
+       caratteri jolly con uno spazio. Impostare il livello di dettaglio del logger della console su dettagliato per visualizzare i file di test corrispondenti.
+      Esempi: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Sono disponibili i componenti aggiuntivi di provider di impostazioni seguenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;FileImpostazioni&gt;
+      Impostazioni da usare per l'esecuzione dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Con il parametro /Settings è necessario specificare un file di impostazioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Il file di impostazioni '{0}' non è stato trovato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">L'esecuzione dei test non è riuscita.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">L'esecuzione dei test è riuscita.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">L'argomento {0} non è previsto nel comando 'InIsolation'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /InIsolation, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Con il parametro /UseVsixExtensions è richiesto un valore. Se è 'true', le estensioni VSIX eventualmente installate verranno usate nell'esecuzione dei test. Se è false, verranno ignorate. Esempio: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">L'argomento {0} non è previsto nel comando 'UseVsixExtensions'. Specificare il comando indicando se le estensioni vsix devono essere usate o ignorate, ad esempio vstest.console.exe myTests.dll /UseVsixExtensions:true, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Esegue i test in un processo isolato. In questo modo è meno probabile che 
+      il processo vstest.console.exe venga arrestato in caso di errore nei test,
+      che però potrebbero risultare più lenti.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Determina se il processo vstest.console.exe usa o ignora le estensioni VSIX 
+      eventualmente installate nell'esecuzione dei test. 
+      Esempio: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">Con l'argomento /BatchSize sono richieste le dimensioni del batch. Esempio: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Le dimensioni {0} del batch non sono valide. Devono essere maggiori di zero. Esempio: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Per eseguire test:
+    &gt;vstest.console.exe tests.dll 
+  Per eseguire test con impostazioni aggiuntive, quali agenti di raccolta dati:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Elenca gli agenti di individuazione test installati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Elenca gli executor di test installati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Elenca i logger di test installati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Elenca i provider di impostazioni test installati.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Nome file&gt;
+      Elenca tutti i test individuati dal contenitore di test specificato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Tempo trascorso:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">Con l'argomento /Tests sono richiesti uno o più nomi di test specifici o relative sottostringhe.
+       Esempi: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">In totale sono stati individuati {0} test, ma nessuno corrisponde ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Nomi test&gt;
+      Esegue test con nomi corrispondenti ai valori specificati. Per specificare più
+      valori, separarli con virgole.
+      Esempi: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Per eseguire i test, verrà usata la modalità di isolamento perché gli adattatori dati di diagnostica sono stati abilitati in runsettings. Usare il parametro /inIsolation per non visualizzare più questo avviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Per eseguire gli unit test per le app di Windows Store, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Store. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        Nome descrittivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        Nome impostazione: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Tipi di file supportati:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        URI executor predefinito: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Tipo di piattaforma non valido: {0}. I tipi di piattaforma validi sono {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">L'argomento /Platform richiede il tipo di piattaforma di destinazione per l'esecuzione dei test. Ad esempio: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+       Architettura della piattaforma di destinazione da usare per l'esecuzione dei test. 
+       Valori validi: x86, x64 e ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Per eseguire i test, verrà usata la modalità di isolamento in base a quanto specificato nelle impostazioni effettive di piattaforma {0} e .NET Framework {1} per l'esecuzione dei test. Usare il parametro /inIsolation per non visualizzare più questo avviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      Versione di .NET Framework di destinazione da usare per l'esecuzione dei test. 
+      Valori validi: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" e così via.
+      Altri valori supportati: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">Con l'argomento /Framework è richiesta la versione di .NET Framework di destinazione per l'esecuzione dei test. Esempio: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">La versione di .NET Framework {0} non è valida. Specificare il nome completo della versione di .NET Framework di destinazione ad esempio .NETCoreApp,Version=v2.0. Altre versioni di .NET Framework supportate: Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Non è stato possibile avviare l'esecuzione dei test per unit test per l'app di Windows Store: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Espressione&gt;
+      Esegue test corrispondenti all'espressione specificata.
+      &lt;Espressione&gt; è nel formato &lt;proprietà&gt;Operatore&lt;valore&gt;[|&amp;&lt;Espressione&gt;]
+         dopo l'operatore è =, != oppure ~  (l'operatore ~ implica semantica 'contains'
+         ed è applicabile solo per proprietà di stringhe quali DisplayName).
+         È possibile usare le parentesi () per raggruppare sottoespressioni.
+      Esempi: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">L'argomento /TestCaseFilter richiede il valore di filtro.
+        Il valore di filtro può essere di tipo &lt;proprietà&gt;=&lt;valore&gt;.
+        Esempi: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Non è possibile specificare l'argomento /TestCaseFilter con /Tests. Il filtro dei test case non è applicabile quando si specificano test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} è compilato per {1}/{2}. Gli assembly di test specificati in un'esecuzione devono disporre di una piattaforma e di un .NET Framework di destinazione comuni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Per i test in esecuzione è possibile specificare un solo pacchetto dell'app (file con estensione appx).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Avvio dell'individuazione dei test in corso. Attendere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Avvio dell'esecuzione dei test in corso. Attendere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">La lettura delle impostazioni dell'adattatore dati di diagnostica ha generato un oggetto '{0}' di esecuzione. Tutti gli adattatori dati di diagnostica verranno ignorati durante questa esecuzione.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Abilita l'agente di raccolta dati 'CodeCoverage' per l'esecuzione dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">L'argomento {0} non è previsto nel comando 'EnableCodeCoverage'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /EnableCodeCoverage, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Store, creare il pacchetto dell'app usando il progetto Libreria unit test per app di Windows Store.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Il code coverage non è disponibile per le app di Windows Store. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">In totale sono stati individuati {0} test, ma alcuni test non corrispondono ai criteri di selezione specificati ({1}). Usare i valori corretti e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Determina se il processo vstest.console.exe usa adattatori di test personalizzati
+      da un percorso eventualmente specificato nell'esecuzione dei test. 
+      Esempio  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Con il parametro /TestAdapterPath è richiesto un valore, corrispondente al percorso di una posizione contenente adattatori di test personalizzati. Esempio: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Il percorso '{0}' specificato in 'TestAdapterPath' non è valido. Errore: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Il percorso di ricerca dell'adattatore di test personalizzato non è stato trovato. Specificare un percorso valido e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Il percorso '{0}' specificato in 'TestAdapterPath' non contiene alcun adattatore di test. Specificare un percorso valido e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Non è stato possibile avviare l'esecuzione dei test per i test per l'app di Windows Phone: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Per eseguire gli unit test per le app di Windows Phone, verrà usata la modalità di isolamento. Usare il parametro /InIsolation per non visualizzare più questo avviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Il code coverage non è disponibile per le app di Windows Phone. L'analisi del code coverage verrà ignorata per questa esecuzione dei test.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Gli adattatori dati di diagnostica non sono supportati durante l'esecuzione di unit test per app di Windows Phone. Rimuovere le impostazioni degli adattatori dati di diagnostica dalle impostazioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">Il pacchetto dell'app '{0}' non contiene un punto di ingresso dell'executor di test. Per eseguire unit test per le app di Windows Phone, creare il pacchetto dell'app con il progetto App unit test di Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Per eseguire i test, verrà usato il framework {0}. Specificare /Framework:{1} per non visualizzare più questo avviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Non è stato trovato alcun test nei contenitori di test specificati. L'adattatore di unit test di Microsoft Windows Store, inoltre, non supporta i file con estensione appxbundle. Durante la creazione di un pacchetto dell'app, creare un file appx impostando l'opzione Genera il bundle dell'app su Mai, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Specifica che i test devono essere eseguiti in parallelo. Per impostazione
+       predefinita, è possibile usare al massimo tutti i core disponibili in questo computer.
+       Il numero di core da usare può essere configurato con un file di impostazioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">L'argomento {0} non è previsto nel comando 'Parallel'. Specificare il comando senza l'argomento, ad esempio: vstest.console.exe myTests.dll /Parallel, quindi riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Non può essere Null o vuoto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Porta&gt;
+      Porta per la connessione socket e la ricezione dei messaggi dell'evento.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">Con l'argomento --Port|/Port è richiesto un numero di porta che corrisponde a un numero intero. Specificare la porta per la connessione socket e la ricezione dei messaggi dell'evento.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">L'assembly sottoposto a test non è stato trovato. Assicurarsi che il progetto sia compilato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Il percorso {0} non esiste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;PercorsoBaseCompilazione&gt;
+      Directory che contiene gli output temporanei.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configurazione&gt;
+      Configurazione per cui viene compilato il progetto, ad esempio Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">La configurazione specificata non è valida.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
+      Directory contenente i file binari da eseguire.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">Il percorso di base di compilazione non è stato trovato. Specificare un percorso valido e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Il percorso di output non è stato trovato. Specificare un percorso valido e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Ulteriori messaggi informativi:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Giorni</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Messaggio di errore:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Tempo totale: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Ore</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Non è stato trovato alcun logger di test con URI o nome descrittivo '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minuti</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Secondi</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Analisi dello stack:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Messaggi di errore standard:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Messaggi di output standard:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Allegati:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Non è disponibile alcun test in {0}. Verificare che le impostazioni delle versioni installate di piattaforma e framework, agenti di individuazione ed executor di test siano appropriate e riprovare.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Non superato</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Superato</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Ignorato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">L'individuazione non è riuscita per le origini specificate. Eccezione: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      ID del processo padre responsabile dell'avvio del processo corrente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">Con l'argomento --ParentProcessId|/ParentProcessId è richiesto l'ID processo che corrisponde a un numero intero. Specificare l'ID del processo padre che ha avviato questo processo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argomenti:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;percorso del file di log&gt;
+      Abilita i log per la piattaforma di test.
+      I log vengono scritti nel file specificato.
+
+      Modifica il livello di traccia per i log come illustrato di seguito:
+      Esempio: /Diag:&lt;percorso del file di logfile&gt;;tracelevel=&lt;impostazione predefinita: "verbose"&gt;
+      Valori consentiti per tracelevel: off, error, warning, info e verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Il file specificato {0} è di sola lettura</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Timeout per la connessione o l'elaborazione della richiesta relativa a DesignModeClient sulla porta: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Non eseguito</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Argomenti di RunSettings:
+      Argomenti per passare le configurazioni di runsettings tramite la riga di comando. È possibile specificare gli argomenti come coppia nome-valore in formato [nome]=[valore] dopo "-- ". Notare lo spazio dopo --. 
+      Usare uno spazio per separare più coppie [nome]=[valore].
+      Per altre informazioni sul supporto degli argomenti di RunSettings, vedere: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Uno o più file runsettings specificati contengono un token non valido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Se non esiste già, la directory dei risultati dei test verrà creata nel percorso specificato.
+      Esempio: /ResultsDirectory:&lt;percorsoDirectoryRisultati&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Con il parametro /ResultsDirectory è richiesto un valore, corrispondente alla directory in cui verranno salvati i risultati dei test. Esempio: /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Il percorso '{0}' specificato in 'ResultsDirectory' non è valido. Errore: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">Il flag /InIsolation è deprecato. I test verranno sempre eseguiti in un processo separato</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Registrazione della diagnostica di Vstest nel file: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;Nome descrittivo agente di raccolta dati&gt;
+      Abilita l'agente di raccolta dati per l'esecuzione dei test. Per altre informazioni, vedere: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Il nome descrittivo '{0}' dell'agente di raccolta dati non è valido. L'agente di raccolta dati verrà ignorato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Messaggi delle tracce di debug:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Valore];[DumpType]=[Valore]
+      Esegue il test in modalità di segnalazione errore. Questa opzione è utile per isolare il test problematico che causa l'arresto anomalo di Test Host.
+      Crea nella directory corrente un file di output "Sequence.xml", che
+      acquisisce l'ordine di esecuzione del test prima dell'arresto anomalo.
+      Si può scegliere di raccogliere il dump del processo per Test Host.
+      Quando si sceglie di raccogliere il dump, per impostazione predefinita viene raccolto un minidump in caso di arresto anomalo.
+      Si può anche scegliere di eseguire l'override di questo comportamento predefinito usando alcuni parametri facoltativi:
+      CollectAlways: per raccogliere il dump all'uscita anche in assenza di arresto anomalo (true/false) 
+      DumpType: per specificare il tipo di dump (mini/full).
+      Esempio: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Esecuzione dei test interrotta.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Esecuzione dei test annullata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Si è verificato un errore durante l'apertura del file di risposta '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      Legge il file di risposta per altre opzioni.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Totale test: sconosciuto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">È anche possibile specificare il percorso degli adattatori di test con il comando /TestAdapterPath. Esempio: /TestAdapterPath:&lt;percorsoAdattatoriPersonalizzati&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions verrà deprecato. Usare /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Esempio: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" non è supportato se l'esecuzione dei test viene configurata con testsettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Gli agenti di raccolta dati diversi da Code Coverage e Microsoft Fakes configurati tramite le impostazioni esecuzione test non sono supportati con impostazioni di test incorporate. Per altre informazioni, vedere https://aka.ms/vstest-configure-datacollector. Impostazioni esecuzione test: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/Nome descrittivo logger&gt;
+      Specifica un logger per i risultati dei test. Ad esempio, per registrare risultati in un 
+      file di risultati dei test di Visual Studio (TRX), usare /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Crea nella directory TestResults il file con il valore specificato per LogFileName.
+
+      Consente di cambiare il livello di dettaglio nei messaggi del log per il logger di console come illustrato di seguito:
+      Esempio: /logger:console;verbosity=&lt;impostazione predefinita: "minimal"&gt;
+      Valori consentiti per verbosity: quiet, minimal, normal e detailed.
+
+      Consente di cambiare il prefisso del livello di diagnostica per il logger di console come illustrato di seguito:
+      Esempio: /logger:console;prefix=&lt;impostazione predefinita: "false"&gt;
+      Per altre informazioni sul logger di console, vedere: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">L'opzione CollectDump per Blame non supporta la raccolta dei dump di arresto anomalo del sistema per questa piattaforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Il parametro di Blame specificato con Blame {0} non è valido e verrà ignorato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Il percorso '{0}' del file di Diag non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">L'argomento '{0}' di Blame non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">L'argomento '{0}' di Diag non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">L'argomento '{0}' di Logger non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, i test verranno eseguiti nella modalità di compatibilità di CLR 4.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Esecuzione dei test in corso</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Totale test: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Non superati: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Superati: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Ignorati: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">L'argomento {0} non è valido. Usare l'opzione/help per verificare l'elenco di argomenti validi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Un totale di {0} file di test corrisponde al criterio specificato.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">L'argomento '{0}' del parametro di esecuzione dei test non è valido. Usare il formato seguente.
+     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">L'opzione CollectDump con TestTimeout per Blame non supporta la raccolta dei dump di blocco per questa piattaforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - Non superati: {1}. Superati: {2}. Ignorati: {3}. Totale: {4}. Durata: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Nessuno</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Imposta il valore di una variabile di ambiente. Crea la variabile se non esiste e la sostituisce se esiste. Implica l'opzione /InIsolation e forza l'esecuzione dei test in un processo isolato.
+      
+      È possibile specificare più volte questo argomento per fornire più variabili.
+
+      Esempio: -e:VARIABILE1=VALORE1
+               -e:ALTRA_VARIABILE="VALORE CON SPAZI"
+               -e:ALTRA_VARIABILE="VALORE;delimitato da;punti e virgola"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">La variabile di ambiente '{0}' è già stata definita, ma viene sostituita dall'argomento -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Esecuzione dei test interrotta con errore {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">TestSessionCorrelationId non valido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Influisce sul comportamento di caricamento dell'adattatore.
+
+      Comportamenti attualmente supportati:
+        - Explicit: la piattaforma di test caricherà solo gli adattatori specificati da /TestAdapterPath (o dal nodo RunConfiguration.TestAdaptersPaths). 
+                    Se viene specificato un percorso specifico dell'adattatore, verrà caricato l'adattatore; se viene specificato un percorso di directory, verranno caricati direttamente gli adattatori presenti in tale cartella, a meno che non sia specificata anche l'opzione Recursive.
+                    Se non viene specificato alcun percorso dell'adattatore, l'esecuzione dei test non riuscirà.
+                    Implica l'opzione /InIsolation e forza l'esecuzione dei test in un processo isolato.
+        
+        - Default: la piattaforma di test caricherà gli adattatori se questo argomento non è stato specificato. 
+                   Verranno selezionate le estensioni accanto all'origine, specificati percorsi aggiuntivi dell'adattatore e dalla directory predefinita.
+
+        - DefaultRuntimeProviders: carica i provider di runtime predefiniti forniti con la piattaforma di test. 
+                                   Se questa opzione non viene specificata quando viene impostata l'opzione "Explicit", è necessario specificare in modo esplicito un provider host di test.
+
+        - ExtensionsDirectory: carica gli adattatori all'interno della cartella Extensions.
+
+        - NextToSource: caricare gli adattatori accanto all'origine. 
+
+        - Recursive: esegue una ricerca ricorsiva nelle cartelle durante il caricamento degli adattatori. È necessario specificare anche "Explicit" o "NextToSource".</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">Il valore specificato ({0}) per /TestAdapterLoadingStrategy non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">La strategia di caricamento ricorsivo dell'adattatore non può essere usata da sola. Combinare con uno o più di: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">È necessario specificare il parametro /TestAdapterPath quando si specifica la strategia di caricamento dell'adattatore di test "{0}".</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe è in esecuzione in modalità emulata come {0}. Per prestazioni migliori, è consigliabile usare lo strumento di esecuzione nativo vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Timeout dell'attesa della connessione del gestore richieste dopo {0} secondi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Timeout dell'attesa dell'avvio della sessione di test dopo {0} secondi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Timeout dell'attesa di arresto della sessione di test dopo {0} secondi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Errore nell'hosting del canale di comunicazione.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">È necessario specificare ProcDumpToolDirectoryPath per installare o annullare l'installazione del debugger effettuato dopo che l'applicazione è terminata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Il debugger effettuato dopo che l'applicazione è terminata non è supportato nel sistema operativo corrente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">La directory specificata per l'eseguibile procdump non è valida e lo strumento non è stato trovato nelle variabili di ambiente (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Il nome del file Procdump non è stato trovato: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">È necessario specificare DumpDirectoryPath per installare il debugger effettuato dopo che l'applicazione è terminata.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">La directory specificata non è valida: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">L'argomento '{0}' di AeDebugger non è valido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">Il comando dotnet vstest è sostituito da un test dotnet, che può ora essere usato per eseguire gli assembly. Vedi https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf
index 43c67530ab..015706af05 100644
--- a/src/vstest.console/Resources/xlf/Resources.ja.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ja.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}' が見つかりません。</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">次のテスト探索アドインを使用できます:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">次のテスト実行アドインを使用できます:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">次のテスト ロガー アドインを使用できます:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">エラー: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">パラメーター "{0}" は一度しか指定できません。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">拡張をインスタンス化しているときに例外が発生しました: '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">次のテストを使用できます:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">パラメーター "{0}" は認識されていません。</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">指定されたテスト ソース ファイル "{0}" が見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">情報: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      この使用方法に関するメッセージを表示します。</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation.  All rights reserved.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Test Execution Command Line Tool Version {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      テスト結果のロガーを指定します。たとえば、結果のログを
-      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;] を使用します
-      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。
-
-      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します
-      例: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      詳細レベルに使用できる値: quiet、minimal、normal、detailed。
-
-      コンソール ロガーの診断レベルのプレフィックスを次のように変更します
-      例: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">説明: 指定されたファイルからテストを実行します。</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">オプション:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">使用法: vstest.console.exe [引数] [オプション] [[--] &lt;RunSettings arguments&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">テスト ソース ファイルが指定されていません。</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">引数が指定されていません。</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      指定されたファイルまたはワイルド カード パターンからテストを実行します。複数のテスト ファイル名または
-      パターンをスペースで区切ります。一致したテスト ファイルを表示するには、コンソール ロガーの詳細度を detailed に設定します。
-      例: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">次の設定プロバイダー アドインを使用できます:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
-      テストを実行する際に使用する設定です。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">/Settings パラメーターには、設定ファイルを指定する必要があります。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">設定ファイル '{0}' が見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">テストの実行に失敗しました。</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">テストの実行に成功しました。</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">'InIsolation' コマンドでは、引数 {0} は適切ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /InIsolation)、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions パラメーターに値を指定する必要があります。'true' を指定すると、インストール済みの VSIX 拡張機能 (ある場合) がテストの実行で使用されます。false を指定すると、これらは無視されます。例: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">'UseVsixExtensions' コマンドでは、引数 {0} は適切ではありません。vsix 拡張機能を使用するのかスキップするのかを示すコマンドを指定し (例: vstest.console.exe myTests.dll /UseVsixExtensions:true)、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      分離プロセスでテストを実行します。これにより、vstest.console.exe 
-      プロセスがテスト時にエラーで停止する可能性は低くなりますが、
-      テストの速度が遅くなる場合があります。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      これにより、テストの実行で vstest.console.exe プロセスによってインストール済みの
-      VSIX 拡張機能 (ある場合) が使用またはスキップされます。 
-      例 /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">/BatchSize 引数には、バッチのサイズが必要です。例: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">バッチ サイズ {0} は無効です。バッチ サイズには、0 より大きい値を指定してください。例: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  テストを実行する:
-    &gt;vstest.console.exe tests.dll 
-  テストをデータ コレクターなどの追加設定を指定して実行する:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      インストール済みのテスト探索プログラムを一覧表示します。</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      インストール済みのテスト実行プログラムを一覧表示します。</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      インストール済みのテスト ロガーを一覧表示します。</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      インストール済みのテスト設定プロバイダーを一覧表示します。</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;ファイル名&gt;
-      指定されたテスト コンテナーから、すべての探索されたテストを一覧表示します。</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">経過時間:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">/Tests 引数には、1 つ以上の特定のテスト名またはその部分文字列が必要です。
-       例: /Tests:TestsMethod1、/Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致するテストはありません。適切な値を使用して、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
-      指定された値に一致する名前のテストを実行します。複数の値を
-      指定する場合、コンマで区切ります。
-      例: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">診断データ アダプターが実行設定で有効になっていたので、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Windows ストア アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows ストア アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        表示名: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        サポートされているファイルの種類:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        既定の実行プログラムの URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">プラットフォームの種類が無効です: {0}。有効なプラットフォームの種類は {1} です。</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">/Platform 引数には、テストの実行対象とするプラットフォームの種類を指定する必要があります。例: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
-      テストの実行に使用するターゲット プラットフォームのアーキテクチャです。
-      有効な値は、x86、x64、ARM です。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">テスト実行のための効果的なプラットフォーム: {0} および .Net Framework: {1} の設定で必要とされるため、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
-      テストの実行に使用する、.Net Framework のターゲット バージョン。
-      有効な値は ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" などです。
-      サポートされている他の値は、Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">/Framework 引数には、テストの実行対象とする .Net Framework バージョンが必要です。例: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">.Net Framework バージョンが無効です: {0}。TargetFramework の完全な名前を指定してください (例: .NETCoreApp,Version=v2.0)。その他のサポートされる .Net Framework バージョンは Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows ストア アプリの単体テストのテスト実行を開始できません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      指定された式と一致するテストを実行します。
-      &lt;Expression&gt; の形式は &lt;property&gt;演算子&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         で、演算子は =、!=、~ のいずれかです (演算子 ~ には '含む'
-         セマンティクスがあり、DisplayName などの文字列プロパティに適用されます)。
-         かっこ () は、サブ式のグループ化に使用できます。
-      例: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 引数には、フィルター値が必要です。
-        フィルター値は、&lt;プロパティ&gt;=&lt;値&gt; という型で指定できます。
-        例: "Priority=1"、"TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 引数を /Tests と共に指定することはできません。テストが指定されている場合、テスト ケースのフィルター処理は適用できません。</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} は {1}/{2} 用にビルドされています。実行で指定されるテスト アセンブリは、対象とする .NET Framework およびプラットフォームを共通にする必要があります。</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">実行する複数のテストには、1 つのアプリ パッケージ (.appx ファイル) だけを指定できます。</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">テスト探索を開始しています。お待ちください...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">テスト実行を開始しています。お待ちください...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">診断データ アダプターの設定の読み取り中に実行中の '{0}' がスローされました。この実行では、すべての診断データ アダプターがスキップされます。</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      テストの実行用にデータ コレクター 'CodeCoverage' を有効にします。</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">引数 {0} は、'EnableCodeCoverage' コマンドでは必要ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /EnableCodeCoverage)、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows ストア アプリの単体テストを実行する場合は、Windows ストア アプリ単体テスト ライブラリ プロジェクトを使用して、アプリ パッケージを作成してください。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows ストア アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致しないテストがあります。適切な値を使用して、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      テストの実行で、vstest.console.exe プロセスが指定されたパス (ある場合) 
-      からのカスタム テスト アダプターを使用するようにします。
-      例  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">/TestAdapterPath パラメーターには、値として、カスタム テスト アダプターがある場所のパスが必要です。例: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' に指定されているパス '{0}' は無効です。エラー: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">カスタム テスト アダプターの指定された検索パスが見つかりませんでした。有効なパスを指定して、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' に指定されているパス '{0}' には、テスト アダプターがありません。有効なパスを指定して、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows Phone アプリに対するテストのテスト実行を開始できません: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Windows Phone アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows Phone アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows Phone アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows Phone アプリの単体テストを実行する場合は、Windows Phone 単体テスト アプリ プロジェクトを使用して、アプリ パッケージを作成してください。</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">フレームワーク {0} を使用してテストを実行します。この警告を表示しないようにするには、/Framework:{1} を指定します。</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">指定されたテスト コンテナーにテストが見つかりません。さらに、Microsoft Windows ストア単体テスト アダプターで .appxbundle ファイルがサポートされていません。アプリ パッケージの作成時に appx ([アプリ バンドルの生成] オプションを [しない] に設定) し、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      テストを並列で実行するように指定します。既定では、
-      コンピューター上の使用可能なコア数まで使用できます。
-      使用するコアの数は、設定ファイルを使用して構成できます。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">引数 {0} は 'Parallel' コマンド内で使用できません。引数を使用せずにコマンドを指定して (例: vstest.console.exe myTests.dll /Parallel)、もう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">null または空にすることはできません。</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Port&gt;
-      ソケット接続およびイベント メッセージを受信するためのポートです。</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port 引数には、整数であるポート番号を指定する必要があります。ソケット接続およびイベント メッセージ受信用のポートを指定してください。</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">テスト中のアセンブリが見つかりません。プロジェクトがビルドされたことをご確認ください。</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">パス {0} は存在しません。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      一時的な出力を含むディレクトリです。</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      プロジェクトをビルドする構成です。つまり、Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">指定の構成が無効です。</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
-      実行するバイナリを含むディレクトリです。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">BuildBasePath が見つかりませんでした。有効なパスを指定してもう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Output パスが見つかりませんでした。有効なパスを指定してもう一度お試しください。</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">追加情報メッセージ:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">日数</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">エラー メッセージ:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated">合計時間: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">時間</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">分</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">秒</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">スタック トレース:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">標準エラー メッセージ:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">標準出力メッセージ:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">添付ファイル:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">{0} で使用できるテストはありません。インストールされているテスト探索プログラム、実行プログラム、プラットフォーム、およびフレームワークのバージョン設定が適切であることを確認し、再試行してください。</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">成功</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">スキップ</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">指定したソースで検出が失敗しました。例外 : {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      現在のプロセスを起動する親プロセスのプロセス ID です。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId 引数には整数であるプロセス ID を指定する必要があります。このプロセスを開始した親プロセスのプロセス ID を指定してください。</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">引数:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
-      テスト プラットフォームに対してログを有効にします。
-      ログは指定されたファイルに書き込まれます。
-
-      次のようにログのトレース レベルを変更します。
-      例: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      トレース レベルに使用できる値: off、error、warning、info、verbose。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">指定されたファイル {0} は読み取り専用です。</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">ポートで接続または DesignModeClient の要求処理のタイムアウト: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">未実行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings 引数:
-      commandline 経由で runsettings 構成を渡す引数。引数は、"-- " の後に [name]=[value] の形式で名前と値のペアとして指定できます。-- の後のスペースにご注意ください。
-      複数の [name]=[value] を区切るにはスペースを使用します。
-      RunSettings 引数のサポートに関する詳細情報: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">指定の runsettings の 1 つ以上に無効なトークンが含まれています。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      存在しない場合、テスト結果のディレクトリが指定されたパスに作成されます。
-      例: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">/ResultsDirectory パラメーターには値が必要であり、そこにテスト結果が保存されます。例:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">'ResultsDirectory' に指定されているパス '{0}' は無効です。エラー: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">/InIsolation フラグは非推奨です。テストは常に別個のプロセスで実行されます</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">次のファイルで Vstest 診断をログ記録しています: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      テストの実行用のデータ コレクターを有効にします。詳細情報はこちら: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">データ コレクターのフレンドリ名 '{0}' が無効です。データ コレクターは無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">デバッグ トレース メッセージ:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      テストを Blame モードで実行します。このオプションは、テスト ホストのクラッシュを引き起こしているテストを分離するのに役立ちます。
-      現在のディレクトリに "Sequence.xml" という出力ファイルを作成し、
-      そのファイルにクラッシュ前のテストの実行順序をキャプチャします。
-      必要に応じて、テスト ホストのプロセス ダンプを収集することもできます。
-      ダンプを収集するように選択すると、既定ではクラッシュ時にミニ ダンプが収集されます。
-      この既定の動作を次のオプション パラメーターでオーバーライドすることもできます:
-      CollectAlways - クラッシュが発生していなくても終了時にダンプを収集します (true/false) 
-      DumpType - ダンプの種類を指定します (mini/full)。
-      例: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">テスト実行が中止されました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">テスト実行が取り消されました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">応答ファイル '{0}' を開くときにエラーが発生しました</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      その他のオプションについては、応答ファイルを参照してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">テストの合計数: 不明</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">さらに、/TestAdapterPath コマンドを使用してテスト アダプターのパスを指定できます。例: /TestAdapterPath:&lt;pathToCustomAdapters&gt;。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions は非推奨になりました。代わりに /TestAdapterPath を使用してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     例: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" は、testsettings を使用してテストの実行が構成されている場合、サポートされません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">実行設定を経由して構成されているコード カバレッジと Microsoft Fakes 以外のデータ コレクターは、埋め込まれたテストの設定ではサポートされていません。詳細については、https://aka.ms/vstest-configure-datacollector をご覧ください。実行設定: {0}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      テスト結果のロガーを指定します。たとえば、結果のログを
-      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;] を使用します
-      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。
-
-      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します
-      例: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      詳細レベルに使用できる値: quiet、minimal、normal、detailed。
-
-      コンソール ロガーの診断レベルのプレフィックスを次のように変更します
-      例: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">このプラットフォームでは、Blame の CollectDump オプションによるクラッシュ ダンプの収集はサポートされていません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">blame で指定された blame パラメーター {0} は無効です。このパラメーターは無視されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Diag ファイル パス '{0}' は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Blame 引数 '{0}' は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Diag 引数 '{0}' は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Logger 引数 '{0}' は無効です。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 はサポートされていません。.Net Framework 3.5 を対象にしたプロジェクトでは、CLR 4.0 の「互換モード」でテストが実行されます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">テストの実行が処理中</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">テストの合計数: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     失敗: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     成功: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    スキップ: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">引数 {0} が無効です。有効な引数の一覧を確認するには、/help オプションを使用してください。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">合計 {0} 個のテスト ファイルが指定されたパターンと一致しました。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">テストの実行パラメーターの引数 '{0}' が無効です。以下の形式を使用してください。
-     形式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">このプラットフォームでは、Blame の TestTimeout を使用する CollectDump オプションによるハング ダンプの収集はサポートされていません。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} -失敗: {1}、合格: {2}、スキップ: {3}、合計: {4}、期間: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">なし</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      環境変数の値を設定します。変数が存在しない場合は作成され、存在する場合はオーバーライドされます。これにより、/InIsolation スイッチが暗黙に指定されるため、テストは強制的に分離プロセスで実行されます。
-      
-      この引数は、複数の変数を指定するために複数回指定できます。
-
-      例: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">環境変数 '{0}' は既に定義されていますが、-Environment 引数でオーバーライドされます。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">テストの実行がエラー {0} により中止されました。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ja">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}' が見つかりません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">次のテスト探索アドインを使用できます:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">次のテスト実行アドインを使用できます:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">次のテスト ロガー アドインを使用できます:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">エラー: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">パラメーター "{0}" は一度しか指定できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">拡張をインスタンス化しているときに例外が発生しました: '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">次のテストを使用できます:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">パラメーター "{0}" は認識されていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">指定されたテスト ソース ファイル "{0}" が見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">テスト ロガーの URI '{0}' は無効です。テスト ロガーは無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">情報: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      この使用方法に関するメッセージを表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest のバージョン {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      テスト結果のロガーを指定します。たとえば、結果のログを
+      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;] を使用します
+      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。
+
+      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します
+      例: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      詳細レベルに使用できる値: quiet、minimal、normal、detailed。
+
+      コンソール ロガーの診断レベルのプレフィックスを次のように変更します
+      例: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">説明: 指定されたファイルからテストを実行します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">オプション:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">使用法: vstest.console.exe [引数] [オプション] [[--] &lt;RunSettings arguments&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">テスト ソース ファイルが指定されていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">引数が指定されていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      指定されたファイルまたはワイルド カード パターンからテストを実行します。複数のテスト ファイル名または
+      パターンをスペースで区切ります。一致したテスト ファイルを表示するには、コンソール ロガーの詳細度を detailed に設定します。
+      例: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">次の設定プロバイダー アドインを使用できます:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
+      テストを実行する際に使用する設定です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">/Settings パラメーターには、設定ファイルを指定する必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">設定ファイル '{0}' が見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">テストの実行に失敗しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">テストの実行に成功しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">'InIsolation' コマンドでは、引数 {0} は適切ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /InIsolation)、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions パラメーターに値を指定する必要があります。'true' を指定すると、インストール済みの VSIX 拡張機能 (ある場合) がテストの実行で使用されます。false を指定すると、これらは無視されます。例: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">'UseVsixExtensions' コマンドでは、引数 {0} は適切ではありません。vsix 拡張機能を使用するのかスキップするのかを示すコマンドを指定し (例: vstest.console.exe myTests.dll /UseVsixExtensions:true)、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      分離プロセスでテストを実行します。これにより、vstest.console.exe 
+      プロセスがテスト時にエラーで停止する可能性は低くなりますが、
+      テストの速度が遅くなる場合があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      これにより、テストの実行で vstest.console.exe プロセスによってインストール済みの
+      VSIX 拡張機能 (ある場合) が使用またはスキップされます。 
+      例 /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">/BatchSize 引数には、バッチのサイズが必要です。例: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">バッチ サイズ {0} は無効です。バッチ サイズには、0 より大きい値を指定してください。例: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  テストを実行する:
+    &gt;vstest.console.exe tests.dll 
+  テストをデータ コレクターなどの追加設定を指定して実行する:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      インストール済みのテスト探索プログラムを一覧表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      インストール済みのテスト実行プログラムを一覧表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      インストール済みのテスト ロガーを一覧表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      インストール済みのテスト設定プロバイダーを一覧表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;ファイル名&gt;
+      指定されたテスト コンテナーから、すべての探索されたテストを一覧表示します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">経過時間:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">/Tests 引数には、1 つ以上の特定のテスト名またはその部分文字列が必要です。
+       例: /Tests:TestsMethod1、/Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致するテストはありません。適切な値を使用して、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
+      指定された値に一致する名前のテストを実行します。複数の値を
+      指定する場合、コンマで区切ります。
+      例: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">診断データ アダプターが実行設定で有効になっていたので、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Windows ストア アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows ストア アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        表示名: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        サポートされているファイルの種類:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        既定の実行プログラムの URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">プラットフォームの種類が無効です: {0}。有効なプラットフォームの種類は {1} です。</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">/Platform 引数には、テストの実行対象とするプラットフォームの種類を指定する必要があります。例: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      テストの実行に使用するターゲット プラットフォームのアーキテクチャです。
+      有効な値は、x86、x64、ARM です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">テスト実行のための効果的なプラットフォーム: {0} および .Net Framework: {1} の設定で必要とされるため、テストの実行に分離モードを使用しています。この警告が表示されないようにするには、/inIsolation パラメーターを使用します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      テストの実行に使用する、.Net Framework のターゲット バージョン。
+      有効な値は ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" などです。
+      サポートされている他の値は、Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">/Framework 引数には、テストの実行対象とする .Net Framework バージョンが必要です。例: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">.Net Framework バージョンが無効です: {0}。TargetFramework の完全な名前を指定してください (例: .NETCoreApp,Version=v2.0)。その他のサポートされる .Net Framework バージョンは Framework40、Framework45、FrameworkCore10、FrameworkUap10 です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Windows ストア アプリの単体テストのテスト実行を開始できません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      指定された式と一致するテストを実行します。
+      &lt;Expression&gt; の形式は &lt;property&gt;演算子&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         で、演算子は =、!=、~ のいずれかです (演算子 ~ には '含む'
+         セマンティクスがあり、DisplayName などの文字列プロパティに適用されます)。
+         かっこ () は、サブ式のグループ化に使用できます。
+      例: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">/TestCaseFilter 引数には、フィルター値が必要です。
+        フィルター値は、&lt;プロパティ&gt;=&lt;値&gt; という型で指定できます。
+        例: "Priority=1"、"TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">/TestCaseFilter 引数を /Tests と共に指定することはできません。テストが指定されている場合、テスト ケースのフィルター処理は適用できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} は {1}/{2} 用にビルドされています。実行で指定されるテスト アセンブリは、対象とする .NET Framework およびプラットフォームを共通にする必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">実行する複数のテストには、1 つのアプリ パッケージ (.appx ファイル) だけを指定できます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">テスト探索を開始しています。お待ちください...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">テスト実行を開始しています。お待ちください...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">診断データ アダプターの設定の読み取り中に実行中の '{0}' がスローされました。この実行では、すべての診断データ アダプターがスキップされます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      テストの実行用にデータ コレクター 'CodeCoverage' を有効にします。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">引数 {0} は、'EnableCodeCoverage' コマンドでは必要ではありません。引数なしでコマンドを指定し (例: vstest.console.exe myTests.dll /EnableCodeCoverage)、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows ストア アプリの単体テストを実行する場合は、Windows ストア アプリ単体テスト ライブラリ プロジェクトを使用して、アプリ パッケージを作成してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows ストア アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">合計 {0} 個のテストが検出されましたが、指定された選択条件 ({1}) に一致しないテストがあります。適切な値を使用して、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      テストの実行で、vstest.console.exe プロセスが指定されたパス (ある場合) 
+      からのカスタム テスト アダプターを使用するようにします。
+      例  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">/TestAdapterPath パラメーターには、値として、カスタム テスト アダプターがある場所のパスが必要です。例: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">'TestAdapterPath' に指定されているパス '{0}' は無効です。エラー: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">カスタム テスト アダプターの指定された検索パスが見つかりませんでした。有効なパスを指定して、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">'TestAdapterPath' に指定されているパス '{0}' には、テスト アダプターがありません。有効なパスを指定して、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Windows Phone アプリに対するテストのテスト実行を開始できません: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Windows Phone アプリの単体テストを実行するために、分離モードを使用しています。この警告が表示されないようにするには、/InIsolation パラメーターを使用します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows Phone アプリではコード カバレッジを使用できません。このテスト実行ではコード カバレッジ分析はスキップされました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows Phone アプリの単体テストの実行時は、診断データ アダプターはサポートされません。設定から診断データ アダプターの設定を削除してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">アプリ パッケージ '{0}' に、テスト実行プログラムのエントリ ポイントがありません。Windows Phone アプリの単体テストを実行する場合は、Windows Phone 単体テスト アプリ プロジェクトを使用して、アプリ パッケージを作成してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">フレームワーク {0} を使用してテストを実行します。この警告を表示しないようにするには、/Framework:{1} を指定します。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">指定されたテスト コンテナーにテストが見つかりません。さらに、Microsoft Windows ストア単体テスト アダプターで .appxbundle ファイルがサポートされていません。アプリ パッケージの作成時に appx ([アプリ バンドルの生成] オプションを [しない] に設定) し、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      テストを並列で実行するように指定します。既定では、
+      コンピューター上の使用可能なコア数まで使用できます。
+      使用するコアの数は、設定ファイルを使用して構成できます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">引数 {0} は 'Parallel' コマンド内で使用できません。引数を使用せずにコマンドを指定して (例: vstest.console.exe myTests.dll /Parallel)、もう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">null または空にすることはできません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Port&gt;
+      ソケット接続およびイベント メッセージを受信するためのポートです。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port 引数には、整数であるポート番号を指定する必要があります。ソケット接続およびイベント メッセージ受信用のポートを指定してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">テスト中のアセンブリが見つかりません。プロジェクトがビルドされたことをご確認ください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">パス {0} は存在しません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      一時的な出力を含むディレクトリです。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      プロジェクトをビルドする構成です。つまり、Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">指定の構成が無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
+      実行するバイナリを含むディレクトリです。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">BuildBasePath が見つかりませんでした。有効なパスを指定してもう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Output パスが見つかりませんでした。有効なパスを指定してもう一度お試しください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">追加情報メッセージ:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">日数</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">エラー メッセージ:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated">合計時間: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">時間</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">URI または FriendlyName が '{0}' のテスト ロガーは見つかりませんでした。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">分</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">スタック トレース:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">標準エラー メッセージ:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">標準出力メッセージ:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">添付ファイル:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} で使用できるテストはありません。インストールされているテスト探索プログラム、実行プログラム、プラットフォーム、およびフレームワークのバージョン設定が適切であることを確認し、再試行してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">成功</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">スキップ</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">指定したソースで検出が失敗しました。例外 : {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      現在のプロセスを起動する親プロセスのプロセス ID です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId 引数には整数であるプロセス ID を指定する必要があります。このプロセスを開始した親プロセスのプロセス ID を指定してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">引数:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
+      テスト プラットフォームに対してログを有効にします。
+      ログは指定されたファイルに書き込まれます。
+
+      次のようにログのトレース レベルを変更します。
+      例: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      トレース レベルに使用できる値: off、error、warning、info、verbose。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">指定されたファイル {0} は読み取り専用です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">ポートで接続または DesignModeClient の要求処理のタイムアウト: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">未実行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings 引数:
+      commandline 経由で runsettings 構成を渡す引数。引数は、"-- " の後に [name]=[value] の形式で名前と値のペアとして指定できます。-- の後のスペースにご注意ください。
+      複数の [name]=[value] を区切るにはスペースを使用します。
+      RunSettings 引数のサポートに関する詳細情報: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">指定の runsettings の 1 つ以上に無効なトークンが含まれています。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      存在しない場合、テスト結果のディレクトリが指定されたパスに作成されます。
+      例: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">/ResultsDirectory パラメーターには値が必要であり、そこにテスト結果が保存されます。例:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">'ResultsDirectory' に指定されているパス '{0}' は無効です。エラー: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">/InIsolation フラグは非推奨です。テストは常に別個のプロセスで実行されます</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">次のファイルで Vstest 診断をログ記録しています: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      テストの実行用のデータ コレクターを有効にします。詳細情報はこちら: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">データ コレクターのフレンドリ名 '{0}' が無効です。データ コレクターは無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">デバッグ トレース メッセージ:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      テストを Blame モードで実行します。このオプションは、テスト ホストのクラッシュを引き起こしているテストを分離するのに役立ちます。
+      現在のディレクトリに "Sequence.xml" という出力ファイルを作成し、
+      そのファイルにクラッシュ前のテストの実行順序をキャプチャします。
+      必要に応じて、テスト ホストのプロセス ダンプを収集することもできます。
+      ダンプを収集するように選択すると、既定ではクラッシュ時にミニ ダンプが収集されます。
+      この既定の動作を次のオプション パラメーターでオーバーライドすることもできます:
+      CollectAlways - クラッシュが発生していなくても終了時にダンプを収集します (true/false) 
+      DumpType - ダンプの種類を指定します (mini/full)。
+      例: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">テスト実行が中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">テスト実行が取り消されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">応答ファイル '{0}' を開くときにエラーが発生しました</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      その他のオプションについては、応答ファイルを参照してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">テストの合計数: 不明</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">さらに、/TestAdapterPath コマンドを使用してテスト アダプターのパスを指定できます。例: /TestAdapterPath:&lt;pathToCustomAdapters&gt;。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions は非推奨になりました。代わりに /TestAdapterPath を使用してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     例: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" は、testsettings を使用してテストの実行が構成されている場合、サポートされません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">実行設定を経由して構成されているコード カバレッジと Microsoft Fakes 以外のデータ コレクターは、埋め込まれたテストの設定ではサポートされていません。詳細については、https://aka.ms/vstest-configure-datacollector をご覧ください。実行設定: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      テスト結果のロガーを指定します。たとえば、結果のログを
+      Visual Studio のテスト結果ファイル (TRX) に記録するには、/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;] を使用します
+      TestResults ディレクトリに、指定された LogFileName でファイルを作成します。
+
+      コンソール ロガーのログ メッセージの詳細レベルを、次のように変更します
+      例: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      詳細レベルに使用できる値: quiet、minimal、normal、detailed。
+
+      コンソール ロガーの診断レベルのプレフィックスを次のように変更します
+      例: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      コンソール ロガーの詳細についてはこちらをご覧ください: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">このプラットフォームでは、Blame の CollectDump オプションによるクラッシュ ダンプの収集はサポートされていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">blame で指定された blame パラメーター {0} は無効です。このパラメーターは無視されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Diag ファイル パス '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Blame 引数 '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Diag 引数 '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Logger 引数 '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 はサポートされていません。.Net Framework 3.5 を対象にしたプロジェクトでは、CLR 4.0 の「互換モード」でテストが実行されます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">テストの実行が処理中</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">テストの合計数: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     失敗: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     成功: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    スキップ: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">引数 {0} が無効です。有効な引数の一覧を確認するには、/help オプションを使用してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">合計 {0} 個のテスト ファイルが指定されたパターンと一致しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">テストの実行パラメーターの引数 '{0}' が無効です。以下の形式を使用してください。
+     形式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">このプラットフォームでは、Blame の TestTimeout を使用する CollectDump オプションによるハング ダンプの収集はサポートされていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} -失敗: {1}、合格: {2}、スキップ: {3}、合計: {4}、期間: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">なし</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      環境変数の値を設定します。変数が存在しない場合は作成され、存在する場合はオーバーライドされます。これにより、/InIsolation スイッチが暗黙に指定されるため、テストは強制的に分離プロセスで実行されます。
+      
+      この引数は、複数の変数を指定するために複数回指定できます。
+
+      例: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">環境変数 '{0}' は既に定義されていますが、-Environment 引数でオーバーライドされます。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">テストの実行がエラー {0} により中止されました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">無効な testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      これはアダプターの読み込み動作時の振る舞いに影響します。
+
+      現在サポートされている振る舞い:
+        - Explicit: テスト プラットフォームは、/TestAdapterPath (または RunConfiguration.TestAdaptersPaths ノード) で指定されたアダプターのみを読み込みます。
+                    特定のアダプター パスが指定されている場合、アダプターが読み込まれます; ディレクトリ パスが指定されている場合は、Recursive オプションも指定されていない限り、そのフォルダー内のアダプターが直接読み込まれます。
+                    アダプター パスが指定されていない場合、テスト実行は失敗します。
+                    これは /InIsolation スイッチを示し、テストを強制的に分離されたプロセスで実行します。
+        
+        - Default : この引数が指定されていない場合は、アダプターを読み込むテスト プラットフォームが存在します。
+                   追加のアダプター パスを指定し、既定のディレクトリから、ソースの隣から拡張機能を取得します。
+
+        - DefaultRuntimeProviders: テスト プラットフォームに付属の既定のランタイム プロバイダーを読み込みます。
+                                   "Explicit" オプションが設定されている場合に、これが指定されない場合は、テスト ホスト プロバイダーが明示的に指定されている必要があります。
+
+        - ExtensionsDirectory: 拡張機能フォルダー内にアダプターを読み込みます。
+
+        - NextToSource: ソースの隣にアダプターを読み込みます。
+
+        - Recursive: アダプターの読み込み時にフォルダーを再帰的に検索します。これには、"Explicit" または "NextToSource" も指定する必要があります。</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">/TestAdapterLoadingStrategy に指定された値 ({0}) は無効です!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">再帰的アダプターの読み込み方法は、それ自身により利用することはできません。以下を 1 つまたはそれ以上組み合わせて下さい: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">テスト アダプターの読み込み方法 "{0}" が指定されている場合、/TestAdapterPath パラメーターが提供される必要があります。</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe はエミュレート済みモードで {0} として実行されています。パフォーマンスを向上させるに、ネイティブ ランナー vstest.console.arm64.exe の使用を検討してください。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">要求ハンドラー接続の待機が {0} 秒後にタイムアウトしました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">テスト セッション開始の待機が {0} 秒後にタイムアウトしました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">テスト セッション停止の待機が {0} 秒後にタイムアウトしました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">通信チャネルをホスト中にエラーが発生しました。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">事後検証デバッガーをインストールまたはアンインストールするには、ProcDumpToolDirectoryPath を指定する必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">現在の OS では、事後検証デバッガーはサポートされていません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">procdump 実行可能ファイルに指定されたディレクトリが無効であり、ツールが環境変数 (PROCDUMP_PATH、PATH) 内に見つかりませんでした</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Procdump ファイル名が見つかりません: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">事後検証デバッガーをインストールするには、DumpDirectoryPath を指定する必要があります。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">指定されたディレクトリは無効です: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">AeDebugger 引数 '{0}' は無効です。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">dotnet vstest コマンドは dotnet テストに置き換えられ、アセンブリの実行に使用できるようになりました。https://aka.ms/dotnet-test をご覧ください。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf
index 86be769735..5f2ac9aa86 100644
--- a/src/vstest.console/Resources/xlf/Resources.ko.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ko.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}'을(를) 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">다음 테스트 검색 추가 기능을 사용할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">다음 테스트 실행 추가 기능을 사용할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">다음 테스트 로거 추가 기능을 사용할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">오류: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">"{0}" 매개 변수는 한 번만 제공해야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">'{0}' 확장을 인스턴스화할 때 예외가 발생했습니다. {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">다음 테스트를 사용할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">"{0}" 매개 변수를 인식할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">제공된 테스트 소스 파일 "{0}"을(를) 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">정보: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">경고: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      이 사용법 메시지를 표시합니다.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. All rights reserved.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Test Execution Command Line Tool Version {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      테스트 결과의 로거를 지정합니다. 예를 들어 
-      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]를 사용합니다.
-      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.
-
-      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.
-      예: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.
-
-      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.
-      예: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">설명: 지정한 파일에서 테스트를 실행합니다.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">옵션:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">사용법: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">테스트 소스 파일을 지정하지 않았습니다.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">인수를 지정하지 않았습니다.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      지정된 파일 또는 와일드카드 패턴에서 테스트를 실행합니다. 여러 테스트 파일 이름 또는 패턴을
-      공백으로 구분합니다. 일치한 테스트 파일을 보려면 콘솔 로거 세부 정보 표시를 [상세]로 설정합니다.
-      예: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">다음 설정 공급자 추가 기능을 사용할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
-      테스트를 실행할 때 사용할 설정입니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">/Settings 매개 변수에는 설정 파일을 제공해야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">설정 파일 '{0}'을(를) 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">테스트 실행이 실패했습니다.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">테스트를 실행했습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">'InIsolation' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /InIsolation) 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions 매개 변수에는 값이 필요합니다. 'true'인 경우 테스트 실행에서 설치된 VSIX 확장(있는 경우)이 사용됩니다. false인 경우에는 확장이 무시됩니다.   예:  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">'UseVsixExtensions' 명령에는 {0} 인수가 필요하지 않습니다. vstest.console.exe myTests.dll /UseVsixExtensions:true와 같이 vsix 확장을 사용할지 건너뛸지를 나타내는 명령을 지정하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      격리 모드에서 테스트를 실행합니다. 이렇게 하면 테스트에서 오류가 발생해도 
-      vstest.console.exe가 중지될 가능성이 작아지지만 테스트 실행 속도가 
-      느려질 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행에서 설치된 VSIX 확장(있는 경우)을 
-      사용하거나 건너뛸 수 있습니다. 
-      예:  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">/BatchSize 인수에는 일괄 처리 크기가 필요합니다. 예: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">일괄 처리 크기 {0}이(가) 잘못되었습니다. 일괄 처리 크기는 0보다 커야 합니다. 예: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  테스트를 실행하려면:
-    &gt;vstest.console.exe tests.dll 
-  데이터 수집기와 같은 추가 설정을 사용하여 테스트를 실행하려면:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      설치된 테스트 Discoverer를 나열합니다.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      설치된 테스트 Executor를 나열합니다.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      설치된 테스트 로거를 나열합니다.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      설치된 테스트 설정 공급자를 나열합니다.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      지정된 테스트 컨테이너에서 검색된 모든 테스트를 나열합니다.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">경과 시간:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">/Tests 인수에는 하나 이상의 특정 테스트 이름 또는 해당 하위 문자열이 필요합니다.
-       예: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">총 {0}개의 테스트가 검색되었지만 지정된 선택 기준({1})과 일치하는 테스트가 없습니다. 올바른 값을 사용하여 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
-      제공된 값과 일치하는 이름으로 테스트를 실행합니다. 여러 값을 제공하려면 
-      쉼표로 구분합니다.
-      예: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">진단 데이터 어댑터가 runsettings에서 사용하도록 설정되었으므로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">격리 모드를 사용하여 Windows 스토어 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows 스토어 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        지원되는 파일 형식:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        기본 Executor URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">{0} 플랫폼 형식이 잘못되었습니다. 올바른 플랫폼 형식은 {1}입니다.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">/Platform 인수에는 테스트 실행의 대상 플랫폼 형식을 제공해야 합니다. 예: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
-      테스트를 실행하는 데 사용할 대상 플랫폼 아키텍처입니다. 
-      유효한 값은 x86, x64 및 ARM입니다.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">유효 플랫폼 {0} 및 .NET Framework {1} 설정에서 테스트 실행에 요구하는 대로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
-      테스트 실행에 사용할 대상 .NET Framework 버전입니다. 
-      유효한 값은 ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" 등입니다.
-      기타 지원되는 값은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">/Framework 인수에는 테스트 실행의 대상 .NET Framework 버전이 필요합니다. 예: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">.NET Framework 버전 {0}이(가) 잘못되었습니다. TargetFramework의 전체 이름을 지정하세요(예: .NETCoreApp,Version=v2.0). 지원되는 다른 .NET Framework 버전은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows 스토어 앱에 대한 단위 테스트의 테스트 실행을 시작할 수 없습니다. {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      지정된 식과 일치하는 테스트를 실행합니다.
-      &lt;Expression&gt;은 &lt;property&gt;연산자&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         형식이며, 여기서 연산자는 =, !=, ~ 중 하나입니다(~ 연산자는 '포함' 의미 체계를
-         사용하며 DisplayName 같은 문자열 속성에 적용됩니다).
-         괄호 ()를 사용하여 하위 식을 그룹화할 수 있습니다.
-      예: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 인수에는 필터 값이 필요합니다.
-        필터 값은 &lt;property&gt;=&lt;value&gt; 형식이 될 수 있습니다.
-        예: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 인수는 /Tests로 지정할 수 없습니다. 테스트가 지정된 경우 테스트 사례 필터링은 적용할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0}은(는) {1}/{2}에 대해 빌드됩니다. 실행 중에 지정된 테스트 어셈블리는 공통 대상 .NET Framework와 플랫폼을 사용해야 합니다.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">테스트 실행을 위해 하나의 app 패키지(.appx file)만 지정할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">테스트 검색을 시작하는 중입니다. 잠시 기다려 주세요...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">테스트 실행을 시작하는 중입니다. 잠시 기다려 주세요...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">진단 데이터 어댑터 설정을 읽는 중에 실행 중인 '{0}'이(가) throw되었습니다. 이 실행에서 모든 진단 데이터 어댑터를 건너뜁니다.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      테스트 실행에 대해 데이터 수집기 'CodeCoverage'를 사용하도록 설정합니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">'EnableCodeCoverage' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /EnableCodeCoverage) 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows 스토어 앱에 대한 단위 테스트를 실행하려면 Windows 스토어 앱 단위 테스트 라이브러리 프로젝트를 사용하여 앱 패키지를 만드세요.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows 스토어 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">총 {0}개의 테스트가 검색되었지만 일부 테스트는 지정된 선택 기준({1})과 일치하지 않습니다. 올바른 값을 사용하여 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행 시
-      지정된 경로(있는 경우)에서 사용자 지정 테스트 어댑터를 사용합니다. 
-      예:  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">/TestAdapterPath 매개 변수에는 사용자 지정 테스트 어댑터가 포함된 위치의 일부인 값이 필요합니다. 예: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">제공한 사용자 지정 테스트 어댑터 검색 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath'에 지정된 경로 '{0}'에 테스트 어댑터가 포함되지 않습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows Phone 앱 {0}에 대한 테스트를 위해 테스트 실행을 시작할 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">격리 모드를 사용하여 Windows Phone 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows Phone 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows Phone 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows Phone 앱에 대한 단위 테스트를 실행하려면 Windows Phone 앱 단위 테스트 앱 프로젝트를 사용하여 앱 패키지를 만드세요.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">{0} 프레임워크를 사용하여 테스트를 실행합니다. 이 경고가 표시되지 않게 하려면 /Framework:{1}을(를) 지정하세요.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">지정한 테스트 컨테이너에 테스트가 없습니다. 또한 Microsoft Windows 스토어 단위 테스트 어댑터에서 .appxbundle 파일을 지원하지 않습니다. 앱 패키지를 만들 때는 appx를 생성([앱 번들 생성] 옵션을 [사용 안 함]으로 설정)하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      테스트가 병렬로 실행되도록 지정합니다. 기본적으로
-      컴퓨터에서 사용 가능한 모든 코어를 사용할 수 있습니다.
-      사용할 코어 수는 설정 파일을 사용하여 구성할 수 있습니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">'Parallel' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /Parallel) 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">null이거나 비워 둘 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Port&gt;
-      소켓 연결 및 이벤트 메시지 수신용 포트입니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port 인수에는 정수인 포트 번호가 필요합니다. 소켓 연결 및 이벤트 메시지 수신에 사용할 포트를 지정하세요.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">테스트 중인 어셈블리를 찾을 수 없습니다. 프로젝트가 빌드되었는지 확인하세요.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">{0} 경로가 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      임시 출력을 포함하는 디렉터리입니다.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      디버그/릴리스를 위해 프로젝트가 빌드되는 구성입니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">지정된 구성이 잘못되었습니다.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
-      실행할 이진 파일을 포함하는 디렉터리입니다.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">BuildBasePath를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">출력 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">추가 정보 메시지:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">일</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">오류 메시지:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> 총 시간: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">시간</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">분</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">초</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">스택 추적:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">표준 오류 메시지:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">표준 출력 메시지:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">첨부 파일:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">{0}에서 테스트를 사용할 수 없습니다. 설치된 테스트 Discoverer와 Executor, 플랫폼 및 프레임워크 버전 설정이 적절한지 확인한 후에 다시 시도하세요.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">실패</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">통과</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">건너뜀</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">지정한 소스에 대한 검색이 실패했습니다. 예외: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      현재 프로세스를 시작해야 하는 부모 프로세스의 프로세스 ID입니다.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId 인수에는 정수인 프로세스 ID가 필요합니다. 이 프로세스를 시작한 부모 프로세스의 프로세스 ID를 지정하세요.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">인수:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
-      테스트 플랫폼의 로그를 사용하도록 설정합니다.
-      로그는 제공된 파일에 기록됩니다.
-
-      아래 표시된 대로 로그의 추적 수준을 변경합니다.
-      예: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      허용되는 추적 수준 값: off, error, warning, info 및 verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">제공한 {0} 파일은 읽기 전용입니다.</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">포트에서 DesignModeClient에 대한 요청을 연결하거나 처리하는 작업에 대한 시간 제한: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">실행되지 않음</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings 인수:
-      명령줄을 통해 runsettings 구성을 전달하기 위한 인수입니다. 인수는 "--" 뒤에 [name]=[value] 형식의 이름-값 쌍으로 지정할 수 있습니다. -- 뒤의 공백에 주의하세요. 
-      여러 [name]=[value]를 구분하려면 공백을 사용합니다.
-      RunSettings 인수 지원에 대한 자세한 정보: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">제공된 하나 이상의 runsettings에 잘못된 토큰이 포함되어 있습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      테스트 결과 디렉터리가 지정된 경로에 생성됩니다(없는 경우).
-      예: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">/ResultsDirectory 매개 변수에는 테스트 결과가 저장되어야 하는 값이 필요합니다. 예:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">'ResultsDirectory'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">/InIsolation 플래그는 사용되지 않습니다. 테스트는 항상 별도의 프로세스에서 실행됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">파일에 Vstest Diagnostics 로깅 중: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      테스트 실행을 위해 데이터 수집기를 사용하도록 설정합니다. 자세한 내용은 https://aka.ms/vstest-collect를 참조하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">데이터 수집기 이름 '{0}'이(가) 잘못되었습니다. 데이터 수집기가 무시됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">디버그 추적 메시지:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      원인 모드에서 테스트를 실행합니다. 이 옵션은 테스트 호스트 크래시를 유발하는 문제 있는 테스트를 격리하는 데 유용합니다.
-      이 경우 현재 디렉터리에 "Sequence.xml"라는 출력 파일을 만들며,
-      이 파일에는 크래시 이전 테스트 실행 순서가 캡처되어 있습니다.
-      필요에 따라 테스트 호스트에 대한 프로세스 덤프를 수집하도록 선택할 수 있습니다.
-      덤프를 수집하도록 선택하는 경우 기본적으로 크래시에 대한 미니 덤프가 수집됩니다.
-      다음과 같은 몇 가지 선택적 매개 변수로 이 기본 동작을 재정의하도록 선택할 수도 있습니다.
-      CollectAlways - 크래시가 없는 경우에도 종료 시 덤프를 수집함(true/false) 
-      DumpType - 덤프 유형을 지정함(mini/full).
-      예: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">테스트 실행이 중단되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">테스트 실행이 취소되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">지시 파일 '{0}'을(를) 여는 중 오류가 발생했습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      추가 옵션에 대한 지시 파일을 읽습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">총 테스트 수: 알 수 없음</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">또한 테스트 어댑터의 경로는 /TestAdapterPath 명령을 사용하여 지정할 수 있습니다. 예: /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions는 더 이상 사용되지 않습니다. 대신 /TestAdapterPath를 사용하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     예: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:testsettings를 사용하여 테스트 실행을 구성하는 경우 "{0}"은(는) 지원되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">실행 설정을 통해 구성된 코드 검사 및 Microsoft Fakes 이외의 데이터 수집기는 포함된 테스트 설정으로는 지원되지 않습니다. 자세한 내용은 https://aka.ms/vstest-configure-datacollector를 참조하세요. 실행 설정: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      테스트 결과의 로거를 지정합니다. 예를 들어 
-      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]를 사용합니다.
-      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.
-
-      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.
-      예: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.
-
-      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.
-      예: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Blame에 대한 CollectDump 옵션에 의한 크래시 덤프 수집은 이 플랫폼에서 지원되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">blame으로 지정된 blame 매개 변수 {0}이(가) 잘못되었습니다. 이 매개 변수를 무시합니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Diag 파일 경로 '{0}'이(가) 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Blame 인수 '{0}'이(가) 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Diag 인수 '{0}'이(가) 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Logger 인수 '{0}'이(가) 잘못되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35가 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 테스트가 CLR 4.0 "호환 모드"에서 실행됩니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">테스트 실행 중</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">총 테스트 수: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     실패: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     통과: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    건너뜀: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">{0} 인수가 잘못되었습니다. /help 옵션을 사용하여 유효한 인수 목록을 확인하세요.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">지정된 패턴과 일치한 총 테스트 파일 수는 {0}개입니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">테스트 실행 매개 변수 인수 '{0}'이(가) 잘못되었습니다. 아래 형식을 사용하세요.
-     형식: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Blame에 대한 TestTimeout이 있는 CollectDump 옵션에 의한 중단 덤프 수집은 이 플랫폼에서 지원되지 않습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - 실패: {1}, 통과: {2}, 건너뜀: {3}, 전체: {4}, 기간: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">없음</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      환경 변수의 값을 설정합니다. 변수가 없는 경우 변수를 만들고, 변수가 있으면 재정의합니다. 이는 /InIsolation 전환을 의미하며 격리된 프로세스에서 테스트를 강제로 실행합니다.
-      
-      이 인수를 여러 번 지정하여 여러 변수를 제공할 수 있습니다.
-
-      예: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">환경 변수 '{0}'이(가) 이미 정의되어 있지만 -Environment 인수로 재정의되었습니다.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">테스트 실행이 {0} 오류로 인해 중단되었습니다.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ko">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}'을(를) 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">다음 테스트 검색 추가 기능을 사용할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">다음 테스트 실행 추가 기능을 사용할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">다음 테스트 로거 추가 기능을 사용할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">오류: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">"{0}" 매개 변수는 한 번만 제공해야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">'{0}' 확장을 인스턴스화할 때 예외가 발생했습니다. {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">다음 테스트를 사용할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">"{0}" 매개 변수를 인식할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">제공된 테스트 소스 파일 "{0}"을(를) 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">테스트 로거 URI '{0}'이(가) 잘못되었습니다. 테스트 로거를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">정보: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">경고: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      이 사용법 메시지를 표시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest 버전 {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      테스트 결과의 로거를 지정합니다. 예를 들어 
+      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]를 사용합니다.
+      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.
+
+      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.
+      예: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.
+
+      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.
+      예: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">설명: 지정한 파일에서 테스트를 실행합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">옵션:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">사용법: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">테스트 소스 파일을 지정하지 않았습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">인수를 지정하지 않았습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      지정된 파일 또는 와일드카드 패턴에서 테스트를 실행합니다. 여러 테스트 파일 이름 또는 패턴을
+      공백으로 구분합니다. 일치한 테스트 파일을 보려면 콘솔 로거 세부 정보 표시를 [상세]로 설정합니다.
+      예: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">다음 설정 공급자 추가 기능을 사용할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
+      테스트를 실행할 때 사용할 설정입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">/Settings 매개 변수에는 설정 파일을 제공해야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">설정 파일 '{0}'을(를) 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">테스트 실행이 실패했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">테스트를 실행했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">'InIsolation' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /InIsolation) 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions 매개 변수에는 값이 필요합니다. 'true'인 경우 테스트 실행에서 설치된 VSIX 확장(있는 경우)이 사용됩니다. false인 경우에는 확장이 무시됩니다.   예:  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">'UseVsixExtensions' 명령에는 {0} 인수가 필요하지 않습니다. vstest.console.exe myTests.dll /UseVsixExtensions:true와 같이 vsix 확장을 사용할지 건너뛸지를 나타내는 명령을 지정하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      격리 모드에서 테스트를 실행합니다. 이렇게 하면 테스트에서 오류가 발생해도 
+      vstest.console.exe가 중지될 가능성이 작아지지만 테스트 실행 속도가 
+      느려질 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행에서 설치된 VSIX 확장(있는 경우)을 
+      사용하거나 건너뛸 수 있습니다. 
+      예:  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">/BatchSize 인수에는 일괄 처리 크기가 필요합니다. 예: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">일괄 처리 크기 {0}이(가) 잘못되었습니다. 일괄 처리 크기는 0보다 커야 합니다. 예: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  테스트를 실행하려면:
+    &gt;vstest.console.exe tests.dll 
+  데이터 수집기와 같은 추가 설정을 사용하여 테스트를 실행하려면:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      설치된 테스트 Discoverer를 나열합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      설치된 테스트 Executor를 나열합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      설치된 테스트 로거를 나열합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      설치된 테스트 설정 공급자를 나열합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      지정된 테스트 컨테이너에서 검색된 모든 테스트를 나열합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">경과 시간:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">/Tests 인수에는 하나 이상의 특정 테스트 이름 또는 해당 하위 문자열이 필요합니다.
+       예: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">총 {0}개의 테스트가 검색되었지만 지정된 선택 기준({1})과 일치하는 테스트가 없습니다. 올바른 값을 사용하여 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
+      제공된 값과 일치하는 이름으로 테스트를 실행합니다. 여러 값을 제공하려면 
+      쉼표로 구분합니다.
+      예: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">진단 데이터 어댑터가 runsettings에서 사용하도록 설정되었으므로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">격리 모드를 사용하여 Windows 스토어 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows 스토어 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        지원되는 파일 형식:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        기본 Executor URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">{0} 플랫폼 형식이 잘못되었습니다. 올바른 플랫폼 형식은 {1}입니다.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">/Platform 인수에는 테스트 실행의 대상 플랫폼 형식을 제공해야 합니다. 예: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      테스트를 실행하는 데 사용할 대상 플랫폼 아키텍처입니다. 
+      유효한 값은 x86, x64 및 ARM입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">유효 플랫폼 {0} 및 .NET Framework {1} 설정에서 테스트 실행에 요구하는 대로 격리 모드를 사용하여 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /inIsolation 매개 변수를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      테스트 실행에 사용할 대상 .NET Framework 버전입니다. 
+      유효한 값은 ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" 등입니다.
+      기타 지원되는 값은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">/Framework 인수에는 테스트 실행의 대상 .NET Framework 버전이 필요합니다. 예: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">.NET Framework 버전 {0}이(가) 잘못되었습니다. TargetFramework의 전체 이름을 지정하세요(예: .NETCoreApp,Version=v2.0). 지원되는 다른 .NET Framework 버전은 Framework40, Framework45, FrameworkCore10 및 FrameworkUap10입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Windows 스토어 앱에 대한 단위 테스트의 테스트 실행을 시작할 수 없습니다. {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      지정된 식과 일치하는 테스트를 실행합니다.
+      &lt;Expression&gt;은 &lt;property&gt;연산자&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         형식이며, 여기서 연산자는 =, !=, ~ 중 하나입니다(~ 연산자는 '포함' 의미 체계를
+         사용하며 DisplayName 같은 문자열 속성에 적용됩니다).
+         괄호 ()를 사용하여 하위 식을 그룹화할 수 있습니다.
+      예: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">/TestCaseFilter 인수에는 필터 값이 필요합니다.
+        필터 값은 &lt;property&gt;=&lt;value&gt; 형식이 될 수 있습니다.
+        예: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">/TestCaseFilter 인수는 /Tests로 지정할 수 없습니다. 테스트가 지정된 경우 테스트 사례 필터링은 적용할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0}은(는) {1}/{2}에 대해 빌드됩니다. 실행 중에 지정된 테스트 어셈블리는 공통 대상 .NET Framework와 플랫폼을 사용해야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">테스트 실행을 위해 하나의 app 패키지(.appx file)만 지정할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">테스트 검색을 시작하는 중입니다. 잠시 기다려 주세요...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">테스트 실행을 시작하는 중입니다. 잠시 기다려 주세요...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">진단 데이터 어댑터 설정을 읽는 중에 실행 중인 '{0}'이(가) throw되었습니다. 이 실행에서 모든 진단 데이터 어댑터를 건너뜁니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      테스트 실행에 대해 데이터 수집기 'CodeCoverage'를 사용하도록 설정합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">'EnableCodeCoverage' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /EnableCodeCoverage) 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows 스토어 앱에 대한 단위 테스트를 실행하려면 Windows 스토어 앱 단위 테스트 라이브러리 프로젝트를 사용하여 앱 패키지를 만드세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows 스토어 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">총 {0}개의 테스트가 검색되었지만 일부 테스트는 지정된 선택 기준({1})과 일치하지 않습니다. 올바른 값을 사용하여 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      이 옵션을 사용하면 vstest.console.exe 프로세스가 테스트 실행 시
+      지정된 경로(있는 경우)에서 사용자 지정 테스트 어댑터를 사용합니다. 
+      예:  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">/TestAdapterPath 매개 변수에는 사용자 지정 테스트 어댑터가 포함된 위치의 일부인 값이 필요합니다. 예: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">'TestAdapterPath'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">제공한 사용자 지정 테스트 어댑터 검색 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">'TestAdapterPath'에 지정된 경로 '{0}'에 테스트 어댑터가 포함되지 않습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Windows Phone 앱 {0}에 대한 테스트를 위해 테스트 실행을 시작할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">격리 모드를 사용하여 Windows Phone 앱에 대한 단위 테스트를 실행합니다. 이 경고를 표시하지 않으려면 /InIsolation 매개 변수를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows Phone 앱에서는 코드 검사를 사용할 수 없습니다. 이 테스트 실행에 대해 코드 검사 분석을 건너뛰었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows Phone 앱에 대한 단위 테스트를 실행할 때는 진단 데이터 어댑터가 지원되지 않습니다. 설정에서 진단 데이터 어댑터 설정을 제거하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">앱 패키지 '{0}'에 테스트 Executor 진입점이 없습니다. Windows Phone 앱에 대한 단위 테스트를 실행하려면 Windows Phone 앱 단위 테스트 앱 프로젝트를 사용하여 앱 패키지를 만드세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">{0} 프레임워크를 사용하여 테스트를 실행합니다. 이 경고가 표시되지 않게 하려면 /Framework:{1}을(를) 지정하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">지정한 테스트 컨테이너에 테스트가 없습니다. 또한 Microsoft Windows 스토어 단위 테스트 어댑터에서 .appxbundle 파일을 지원하지 않습니다. 앱 패키지를 만들 때는 appx를 생성([앱 번들 생성] 옵션을 [사용 안 함]으로 설정)하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      테스트가 병렬로 실행되도록 지정합니다. 기본적으로
+      컴퓨터에서 사용 가능한 모든 코어를 사용할 수 있습니다.
+      사용할 코어 수는 설정 파일을 사용하여 구성할 수 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">'Parallel' 명령에는 {0} 인수가 필요하지 않습니다. 인수 없이 명령을 지정한 다음(예: vstest.console.exe myTests.dll /Parallel) 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">null이거나 비워 둘 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Port&gt;
+      소켓 연결 및 이벤트 메시지 수신용 포트입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port 인수에는 정수인 포트 번호가 필요합니다. 소켓 연결 및 이벤트 메시지 수신에 사용할 포트를 지정하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">테스트 중인 어셈블리를 찾을 수 없습니다. 프로젝트가 빌드되었는지 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">{0} 경로가 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      임시 출력을 포함하는 디렉터리입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      디버그/릴리스를 위해 프로젝트가 빌드되는 구성입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">지정된 구성이 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
+      실행할 이진 파일을 포함하는 디렉터리입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">BuildBasePath를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">출력 경로를 찾을 수 없습니다. 올바른 경로를 제공하고 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">추가 정보 메시지:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">일</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">오류 메시지:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> 총 시간: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">시간</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">URI 또는 FriendlyName이 '{0}'인 테스트 로거를 찾을 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">분</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">초</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">스택 추적:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">표준 오류 메시지:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">표준 출력 메시지:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">첨부 파일:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0}에서 테스트를 사용할 수 없습니다. 설치된 테스트 Discoverer와 Executor, 플랫폼 및 프레임워크 버전 설정이 적절한지 확인한 후에 다시 시도하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">실패</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">통과</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">건너뜀</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">지정한 소스에 대한 검색이 실패했습니다. 예외: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      현재 프로세스를 시작해야 하는 부모 프로세스의 프로세스 ID입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId 인수에는 정수인 프로세스 ID가 필요합니다. 이 프로세스를 시작한 부모 프로세스의 프로세스 ID를 지정하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">인수:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
+      테스트 플랫폼의 로그를 사용하도록 설정합니다.
+      로그는 제공된 파일에 기록됩니다.
+
+      아래 표시된 대로 로그의 추적 수준을 변경합니다.
+      예: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      허용되는 추적 수준 값: off, error, warning, info 및 verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">제공한 {0} 파일은 읽기 전용입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">포트에서 DesignModeClient에 대한 요청을 연결하거나 처리하는 작업에 대한 시간 제한: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">실행되지 않음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings 인수:
+      명령줄을 통해 runsettings 구성을 전달하기 위한 인수입니다. 인수는 "--" 뒤에 [name]=[value] 형식의 이름-값 쌍으로 지정할 수 있습니다. -- 뒤의 공백에 주의하세요. 
+      여러 [name]=[value]를 구분하려면 공백을 사용합니다.
+      RunSettings 인수 지원에 대한 자세한 정보: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">제공된 하나 이상의 runsettings에 잘못된 토큰이 포함되어 있습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      테스트 결과 디렉터리가 지정된 경로에 생성됩니다(없는 경우).
+      예: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">/ResultsDirectory 매개 변수에는 테스트 결과가 저장되어야 하는 값이 필요합니다. 예:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">'ResultsDirectory'에 지정된 경로 '{0}'이(가) 잘못되었습니다. 오류: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">/InIsolation 플래그는 사용되지 않습니다. 테스트는 항상 별도의 프로세스에서 실행됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">파일에 Vstest Diagnostics 로깅 중: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      테스트 실행을 위해 데이터 수집기를 사용하도록 설정합니다. 자세한 내용은 https://aka.ms/vstest-collect를 참조하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">데이터 수집기 이름 '{0}'이(가) 잘못되었습니다. 데이터 수집기가 무시됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">디버그 추적 메시지:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      원인 모드에서 테스트를 실행합니다. 이 옵션은 테스트 호스트 크래시를 유발하는 문제 있는 테스트를 격리하는 데 유용합니다.
+      이 경우 현재 디렉터리에 "Sequence.xml"라는 출력 파일을 만들며,
+      이 파일에는 크래시 이전 테스트 실행 순서가 캡처되어 있습니다.
+      필요에 따라 테스트 호스트에 대한 프로세스 덤프를 수집하도록 선택할 수 있습니다.
+      덤프를 수집하도록 선택하는 경우 기본적으로 크래시에 대한 미니 덤프가 수집됩니다.
+      다음과 같은 몇 가지 선택적 매개 변수로 이 기본 동작을 재정의하도록 선택할 수도 있습니다.
+      CollectAlways - 크래시가 없는 경우에도 종료 시 덤프를 수집함(true/false) 
+      DumpType - 덤프 유형을 지정함(mini/full).
+      예: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">테스트 실행이 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">테스트 실행이 취소되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">지시 파일 '{0}'을(를) 여는 중 오류가 발생했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      추가 옵션에 대한 지시 파일을 읽습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">총 테스트 수: 알 수 없음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">또한 테스트 어댑터의 경로는 /TestAdapterPath 명령을 사용하여 지정할 수 있습니다. 예: /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions는 더 이상 사용되지 않습니다. 대신 /TestAdapterPath를 사용하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     예: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:testsettings를 사용하여 테스트 실행을 구성하는 경우 "{0}"은(는) 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">실행 설정을 통해 구성된 코드 검사 및 Microsoft Fakes 이외의 데이터 수집기는 포함된 테스트 설정으로는 지원되지 않습니다. 자세한 내용은 https://aka.ms/vstest-configure-datacollector를 참조하세요. 실행 설정: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      테스트 결과의 로거를 지정합니다. 예를 들어 
+      Visual Studio TRX(테스트 결과 파일)에 결과를 기록하려면 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]를 사용합니다.
+      지정된 LogFileName으로 TestResults 디렉터리에서 파일을 만듭니다.
+
+      아래 표시된 대로 콘솔 로거에 대한 로그 메시지에서 세부 정보 표시 수준을 변경합니다.
+      예: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      허용된 세부 정보 표시 값: quiet, minimal, normal 및 detailed.
+
+      아래 표시된 대로 콘솔 로거에 대한 진단 수준 접두사를 변경합니다.
+      예: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      콘솔 로거에 대한 자세한 내용은 https://aka.ms/console-logger를 참조하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Blame에 대한 CollectDump 옵션에 의한 크래시 덤프 수집은 이 플랫폼에서 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">blame으로 지정된 blame 매개 변수 {0}이(가) 잘못되었습니다. 이 매개 변수를 무시합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Diag 파일 경로 '{0}'이(가) 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Blame 인수 '{0}'이(가) 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Diag 인수 '{0}'이(가) 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Logger 인수 '{0}'이(가) 잘못되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35가 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 테스트가 CLR 4.0 "호환 모드"에서 실행됩니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">테스트 실행 중</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">총 테스트 수: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     실패: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     통과: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    건너뜀: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">{0} 인수가 잘못되었습니다. /help 옵션을 사용하여 유효한 인수 목록을 확인하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">지정된 패턴과 일치한 총 테스트 파일 수는 {0}개입니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">테스트 실행 매개 변수 인수 '{0}'이(가) 잘못되었습니다. 아래 형식을 사용하세요.
+     형식: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Blame에 대한 TestTimeout이 있는 CollectDump 옵션에 의한 중단 덤프 수집은 이 플랫폼에서 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - 실패: {1}, 통과: {2}, 건너뜀: {3}, 전체: {4}, 기간: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">없음</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      환경 변수의 값을 설정합니다. 변수가 없는 경우 변수를 만들고, 변수가 있으면 재정의합니다. 이는 /InIsolation 전환을 의미하며 격리된 프로세스에서 테스트를 강제로 실행합니다.
+      
+      이 인수를 여러 번 지정하여 여러 변수를 제공할 수 있습니다.
+
+      예: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">환경 변수 '{0}'이(가) 이미 정의되어 있지만 -Environment 인수로 재정의되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">테스트 실행이 {0} 오류로 인해 중단되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">잘못된 testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      이는 어댑터 로딩 동작에 영향을 미칩니다.
+
+      현재 지원되는 동작:
+      - 명시적: 테스트 플랫폼은 /TestAdapterPath(또는 RunConfiguration.TestAdaptersPaths 노드)에 지정된 어댑터만 로드합니다. 
+      특정 어댑터 경로가 제공되면 어댑터가 로드됩니다. 디렉터리 경로가 제공되면 재귀 옵션도 지정되지 않는 한 해당 폴더에 직접 어댑터가 로드됩니다.
+     어댑터 경로를 지정하지 않으면 테스트 실행이 실패합니다.
+   이는 /InIsolation을 전환을 의미하고 테스트가 격리된 프로세스에서 실행되도록 합니다.
+ 
+ - 기본값: 테스트 플랫폼은 이 인수가 지정되지 않은 경우 어댑터를 로드합니다. 
+        추가 어댑터 경로를 제공하고 기본 디렉터리에서 소스 옆에 있는 확장 프로그램을 선택합니다.
+
+ -      DefaultRuntimeProviders: 테스트 플랫폼과 함께 제공되는 기본 런타임 공급자를 로드합니다. 
+ '명시적' 옵션이 설정되어 있을 때 지정하지 않으면 테스트 호스트 공급자를 명시적으로 지정해야 합니다.
+
+       - ExtensionsDirectory: Extensions 폴더 내부에 어댑터를 로드합니다. 
+
+       - NextToSource: 원본 옆에 어댑터를 로드합니다. 
+
+        - 재귀: 어댑터를 로드할 때 폴더를 재귀적으로 검색합니다. 이렇게 하려면 "명시적" 또는 "NextToSource"도 지정해야 합니다.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">/TestAdapterLoadingStrategy에 대해 지정된 값({0})이 잘못되었습니다!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">재귀 어댑터 로드 전략은 단독으로 사용할 수 없습니다. 다음 중 하나 이상과 결합하세요. {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">"{0}" 테스트 어댑터 로드 전략이 지정된 경우 /TestAdapterPath 매개 변수를 제공해야 합니다!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe가 에뮬레이트 모드에서 {0}(으)로 실행 중입니다. 더 나은 성능을 위해 네이티브 실행기 vstest.console.arm64.exe 사용을 고려하세요.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">{0}초 후에 요청 처리기 연결 대기 시간이 초과되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">{0}초 후에 테스트 시작 세션 대기 시간이 초과되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">{0}초 후에 테스트 중지 세션 대기 시간이 초과되었습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">통신 채널을 호스트하는 동안 오류가 발생했습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">사후 디버거를 설치하거나 제거하려면 ProcDumpToolDirectoryPath를 지정해야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">포스트모템 디버거는 현재 OS에서 지원되지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">procdump 실행 파일에 대해 지정된 디렉터리가 유효하지 않으며 도구가 환경 변수(PROCDUMP_PATH, PATH) 내에서 발견되지 않았습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Procdump 파일 이름을 찾을 수 없음: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">사후 디버거를 설치하려면 DumpDirectoryPath를 지정해야 합니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">지정된 디렉터리가 유효하지 않습니다: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">AeDebugger 인수 '{0}'이(가) 유효하지 않습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">dotnet vstest 명령은 이제 어셈블리를 실행하는 데 사용할 수 있는 dotnet test로 대체되었습니다. https://aka.ms/dotnet-test를 참조하세요.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf
index 4eea286a34..94e33b8912 100644
--- a/src/vstest.console/Resources/xlf/Resources.pl.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.pl.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć elementu „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Dostępne są następujące dodatki służące do wykrywania testów:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Dostępne są następujące dodatki służące do wykonywania testów:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Dostępne są następujące dodatki rejestratora testów:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Błąd: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Parametr „{0}” należy podać tylko raz.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Wystąpił wyjątek podczas tworzenia wystąpienia rozszerzenia „{0}”: {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Dostępne są następujące testy:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Nierozpoznany parametr „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Nie odnaleziono podanego pliku źródłowego testu „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informacje: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Ostrzeżenie: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Wyświetla ten komunikat dotyczący sposobu użycia.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Wszelkie prawa zastrzeżone.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Narzędzie wiersza polecenia firmy Microsoft (R) służące do wykonania testów (wersja {0})</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;identyfikator URI/przyjazna nazwa rejestratora&gt;
-      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu 
-      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=&lt;wartość domyślna to unikatowa nazwa pliku&gt;]
-      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.
-
-      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej
-      Przykład: /logger:console;verbosity=&lt;wartość domyślna to „normal”&gt; 
-      Dozwolone wartości szczegółowości: quiet, minimal i normal.
-
-      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej
-      Przykład: /logger:console;prefix=&lt;wartość domyślna to „false”&gt;
-      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Opis: uruchamia testy z określonych plików.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Opcje:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Sposób użycia: vstest.console.exe [argumenty] [opcje] [[--] &lt;argumenty RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Nie określono żadnych plików źródłowych testów.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Nie określono żadnych argumentów.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Uruchom testy z określonych plików lub wzorca symbolu wieloznacznego. Rozdziel wiele nazw lub wzorców plików testowych
-      spacjami. Ustaw szczegółowość rejestratora konsoli na Szczegółowy, aby wyświetlić dopasowane pliki testowe.
-      Przykłady: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Dostępne są następujące dodatki dostawców ustawień:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;plik ustawień&gt;
-      Ustawienia, które mają być używane podczas uruchamiania testów.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Parametr /Settings wymaga podania pliku ustawień.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć pliku ustawień „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Przebieg testu nie powiódł się.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Przebieg testu zakończony powodzeniem.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „InIsolation”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /InIsolation) i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Parametr /UseVsixExtensions wymaga podania wartości. Jeśli wartość to „true”, zainstalowane rozszerzenia VSIX (jeśli istnieją) zostaną użyte w ramach przebiegu testu. Jeśli wartość to „false”, rozszerzenia zostaną zignorowane. Przykład: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „UseVsixExtensions”. Określ polecenie wskazujące, czy rozszerzenia vsix mają zostać użyte, czy pominięte (przykład: vstest.console.exe mojeTesty.dll /UseVsixExtensions:true), a następnie spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Uruchamia testy w procesie izolowanym. Dzięki temu mniej prawdopodobne jest 
-      zatrzymanie procesu vstest.console.exe po wystąpieniu błędu w testach, ale 
-      testy mogą działać wolniej.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Powoduje to, że proces vstest.console.exe używa lub pomija zainstalowane 
-      rozszerzenia VSIX (jeśli istnieją) w przebiegu testu.
-      Przykład: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Argument /BatchSize wymaga podania wielkości partii. Przykład: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Rozmiar partii {0} jest nieprawidłowy. Rozmiar partii powinien być większy niż zero. Przykład: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Aby uruchomić testy:
-    &gt;vstest.console.exe tests.dll 
-  Aby uruchomić testy z użyciem ustawień dodatkowych, takich jak moduły zbierające dane:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Wyświetla listę zainstalowanych wykrywaczy testów.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Wyświetla listę zainstalowanych modułów wykonywania testów.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Wyświetla listę zainstalowanych rejestratorów testów.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Wyświetla listę zainstalowanych dostawców ustawień testów.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nazwa pliku&gt;
-      Wyświetla listę wszystkich wykrytych testów z danego kontenera testów.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Czas, który upłynął:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">Argument /Tests wymaga co najmniej jednej określonej nazwy testu lub jej podciągu.
-       Przykłady: /Tests:MetodaTestowa1, /Tests:MetodaTestowa1,metoda2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Wykryto łącznie następującą liczbę testów: {0}. Żaden z nich nie jest zgodny z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;nazwy testów&gt;
-      Uruchom testy z nazwami, które są zgodne z podanymi wartościami. Aby
-      podać wiele wartości, oddziel je przecinkami.
-      Przykłady: /Tests:MetodaTestowa1
-                /Tests:MetodaTestowa1,MetodaTestowa2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Używanie trybu izolacji do uruchomienia testów jako adapterów danych diagnostycznych zostało włączone w pliku runsettings. Użyj parametru /inIsolation, aby pominąć to ostrzeżenie.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Używanie trybu izolacji do uruchomienia testów jednostkowych dla aplikacji ze Sklepu Windows. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji ze Sklepu Windows. Usuń ustawienia adapterów danych diagnostycznych z ustawień.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        Przyjazna nazwa: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Identyfikator URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        Nazwa ustawienia: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Obsługiwane typy plików:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Domyślny identyfikator URI modułu wykonywania: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Identyfikator URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Nieprawidłowy typ platformy: {0}. Prawidłowe typy platform to {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">Argument /Platform wymaga podania typu platformy docelowej dla przebiegu testu. Przykład: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;typ platformy&gt;
-      Docelowa architektura platformy, która zostanie użyta do wykonania testu. 
-      Prawidłowe wartości to x86, x64 i ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Używanie trybu izolacji do uruchomienia testów w sposób wymagany przez obowiązujące ustawienia platformy ({0}) i programu .NET Framework ({1}) dla przebiegu testu. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;wersja struktury&gt;
-      Docelowa wersja programu .NET Framework, która zostanie użyta na potrzeby wykonania testu. 
-      Prawidłowe wartości to ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" itp.
-      Inne obsługiwane wartości to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">Argument /Framework wymaga docelowej wersji programu .NET Framework na potrzeby przebiegu testu. Przykład: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Nieprawidłowa wersja programu .NET Framework: {0}. Podaj pełną nazwę struktury docelowej (np. .NETCoreApp,Version=v2.0). Inne obsługiwane wersje programu .NET Framework to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Nie można rozpocząć przebiegu testu dla testów jednostkowych aplikacji ze Sklepu Windows: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;wyrażenie&gt;
-      Uruchamia testy, które są zgodne z danym wyrażeniem.
-      Element &lt;wyrażenie&gt; jest w formacie &lt;właściwość&gt;Operator&lt;wartość&gt;[|&amp;&lt;wyrażenie&gt;]
-         gdzie Operator to =, != lub ~  (operator ~ ma semantykę „zawiera”
-         i jest stosowany dla właściwości ciągów, takich jak nazwa wyświetlana).
-         Nawiasy () mogą służyć do grupowania wyrażeń podrzędnych.
-      Przykłady: /TestCaseFilter:"Priority=1"
-                 /TestCaseFilter:"(FullyQualifiedName~Nocne
-                                  |Name=MojaMetodaTestowa)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">Argument /TestCaseFilter wymaga wartości filtru.
-        Wartość filtru może być typu &lt;property&gt;=&lt;value&gt; .
-        Przykłady: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Nie można określać argumentu /TestCaseFilter z argumentem /Tests. Filtrowanie przypadków testowych nie jest stosowane, gdy testy zostały określone.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">Element {0} jest kompilowany dla elementu {1}/{2}. Zestawy testowe określone w ramach uruchomienia powinny mieć wspólny docelowy program .NET Framework i wspólną docelową platformę.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Na potrzeby uruchamiania testów można określić tylko jeden pakiet aplikacji (plik appx).</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Trwa rozpoczynanie wykrywania testu, czekaj...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Trwa rozpoczynanie wykonywania testu, czekaj...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">Podczas odczytywania ustawień adaptera danych diagnostycznych został zgłoszony uruchomiony element „{0}”. Wszystkie adaptery danych diagnostycznych zostaną pominięte podczas tego uruchomienia.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Włącza moduł zbierający dane „CodeCoverage” dla przebiegu testu.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „EnableCodeCoverage”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /EnableCodeCoverage) i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji ze Sklepu Windows, utwórz pakiet aplikacji za pomocą projektu biblioteki testów jednostkowych aplikacji ze Sklepu Windows.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Pokrycie kodu nie jest dostępne dla aplikacji ze Sklepu Windows. Pominięto analizę pokrycia kodu dla tego przebiegu testu.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Wykryto łącznie następującą liczbę testów: {0}. Niektóre z nich nie są zgodne z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath | / TestAdapterPath
-      Powoduje to, że proces vstest.console.exe używa niestandardowych adapterów
-      testowych z podanej ścieżki (jeśli istnieje) w ramach przebiegu testu. 
-      Przykład: /TestAdapterPath:&lt;ścieżka do adapterów niestandardowych&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Parametr /TestAdapterPath wymaga wartości, którą jest ścieżką do lokalizacji zawierającej niestandardowe adaptery testowe. Przykład: /TestAdapterPath:c:\MojeAdapteryNiestandardowe</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Ścieżka „{0}” określona w parametrze „TestAdapterPath” jest nieprawidłowa. Błąd: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Nie odnaleziono podanej ścieżki wyszukiwania niestandardowego adaptera testowego. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Ścieżka „{0}” określona w parametrze „TestAdapterPath” nie zawiera żadnych adapterów testowych. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Nie można rozpocząć przebiegu testu dla testów dla aplikacji Windows Phone: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Używanie trybu izolacji do uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Pokrycie kodu nie jest dostępne dla aplikacji systemu Windows Phone. Pominięto analizę pokrycia kodu dla tego przebiegu testu.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Usuń ustawienia adapterów danych diagnostycznych z ustawień.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji systemu Windows Phone, utwórz projekt aplikacji testów jednostkowych systemu Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Używanie platformy {0} do uruchamiania testów. Określ parametr /Framework:{1}, aby pominąć to ostrzeżenie.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Nie odnaleziono żadnych testów w określonych kontenerach testów. Ponadto adapter testów jednostkowych Sklepu Windows firmy Microsoft nie obsługuje plików appxbundle. Utwórz plik appx (ustaw opcję generowania zbioru aplikacji na wartość Nigdy) podczas tworzenia pakietu aplikacji, a następnie spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Określa, że testy będą wykonywane równolegle. Domyślnie mogą zostać użyte
-      wszystkie dostępne rdzenie maszyny.
-      Liczbę rdzeni do użycia można skonfigurować za pomocą pliku ustawień.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „Parallel”. Określ polecenie bez tego argumentu (przykład: vstest.console.exe mojeTesty.dll /Parallel), a następnie spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Nie może mieć wartości null ani być pusty</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;port&gt;
-      Port służący do połączenia z gniazdem i odbierania komunikatów zdarzeń.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">Argument --Port|/Port wymaga numeru portu będącego liczbą całkowitą. Określ port na potrzeby połączenia z gniazdem i odbierania komunikatów zdarzeń.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć testowanego zestawu. Upewnij się, że projekt został skompilowany.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Ścieżka {0} nie istnieje.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;podstawowa ścieżka do kompilacji&gt;
-      Katalog zawierający tymczasowe dane wyjściowe.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;konfiguracja&gt;
-      Konfiguracja, na potrzeby której kompilowany jest projekt, na przykład Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">Podana konfiguracja jest nieprawidłowa.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;dane wyjściowe&gt;
-      Katalog zawierający pliki binarne do uruchomienia.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć parametru BuildBasePath. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć ścieżki wyjściowej. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Dodatkowe komunikaty informacyjne:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Dni</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Komunikat o błędzie:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Łączny czas: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Godziny</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Nie można odnaleźć rejestratora testów z identyfikatorem URI lub przyjazną nazwą „{0}”.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minuty</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Sekundy</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Ślad stosu:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Standardowe komunikaty o błędach:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Standardowe komunikaty wyjściowe:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Załączniki:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">Brak dostępnych testów w elemencie {0}. Upewnij się, że ustawienia zainstalowanych wykrywaczy testów, modułów wykonywania, platform i wersji struktur są odpowiednie, i spróbuj ponownie.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Niepowodzenie</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Powodzenie</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Pominięto</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Wykrywanie nie powiodło się dla podanych źródeł. Wyjątek: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;identyfikator procesu nadrzędnego&gt;
-      Identyfikator procesu nadrzędnego odpowiedzialnego za uruchomienie bieżącego procesu.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">Argument --ParentProcessId|/ParentProcessId wymaga identyfikatora procesu będącego liczbą całkowitą. Określ identyfikator procesu nadrzędnego, który uruchomił ten proces.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argumenty:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;ścieżka do pliku dziennika&gt;
-      Włącz dzienniki dla platformy testowej.
-      Dzienniki są zapisywanie w podanym pliku.
-
-      Zmień poziom śledzenia dla dzienników, jak pokazano poniżej
-      Przykład: /Diag:&lt;ścieżka do pliku dziennika&gt;;tracelevel=&lt;wartość domyślna to „verbose”&gt;
-      Dozwolone wartości dla elementu tracelevel: off, error, warning, info i verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Podany plik {0} jest tylko do odczytu</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Przekroczono limit czasu żądania nawiązywania połączenia lub przetwarzania dla elementu DesignModeClient na porcie: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Nie uruchomiono</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Argumenty RunSettings:
-      Argumenty do przekazania konfiguracji runsettings za pośrednictwem wiersza polecenia. Argumenty mogą być określone jako para nazwa-wartość formularza [nazwa]=[wartość] po „-- ”. Pamiętaj o spacji po --. 
-      Oddziel wiele par [nazwa]=[wartość] za pomocą spacji.
-      Więcej informacji na temat obsługi argumentów RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Co najmniej jedne z podanych ustawień uruchamiania zawierają nieprawidłowy token</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Jeśli katalog wyników nie istnieje, zostanie utworzony w określonej ścieżce.
-      Przykład /ResultsDirectory:&lt;ŚcieżkaDoKataloguWyników&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Parametr /ResultsDirectory wymaga wartości określającej miejsce zapisania wyników testu. Przykład: /ResultsDirectory:c:\KatalogWynikówTestu</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Ścieżka „{0}” określona w parametrze „ResultsDirectory” jest nieprawidłowa. Błąd: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">Flaga /InIsolation jest przestarzała. Testy zawsze są uruchamiane w oddzielnym procesie</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Rejestrowanie diagnostyki Vstest w pliku: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;przyjazna nazwa modułu zbierającego dane&gt;
-      Włącza moduł zbierający dane dla przebiegu testu. Więcej informacji: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Przyjazna nazwa modułu zbierającego dane „{0}” jest nieprawidłowa. Moduł zbierający dane będzie ignorowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Komunikaty śledzenia debugowania:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Uruchamia test w trybie Blame. Ta opcja jest pomocna w odizolowaniu problematycznego testu powodującego awarię hosta testów.
-      Tworzy w bieżącym katalogu plik wyjściowy „Sequence.xml”,
-      który przechwytuje kolejność wykonywania testu przed awarią.
-      Opcjonalnie możesz zebrać zrzut procesu dla hosta testów.
-      Gdy zdecydujesz się na zebranie zrzutu, domyślnie w momencie awarii zostanie zebrany minizrzut.
-      Możesz także przesłonić to zachowanie domyślne opcjonalnymi parametrami:
-      CollectAlways — zrzut jest zbierany przy wychodzeniu, nawet jeśli nie ma awarii (true/false) 
-      DumpType — określa typ zrzutu (mini/full).
-      Przykład: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Przebieg testu został przerwany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Przebieg testu został anulowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Błąd podczas otwierania pliku odpowiedzi „{0}”</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      Przeczytaj zawartość pliku odpowiedzi w celu uzyskania dodatkowych opcji.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Łączna liczba testów: nieznana</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Dodatkowo ścieżkę do adapterów testów można określić za pomocą polecenia /TestAdapterPath. Przykład: /TestAdapterPath:&lt;ścieżka_do_adapterów_niestandardowych&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">Polecenie /UseVsixExtensions jest wycofywane. Użyj zamiast niego polecenia /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Przykład: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect: element „{0}” nie jest obsługiwany, jeśli przebieg testu został skonfigurowany za pomocą pliku testsettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Moduły zbierające dane inne niż Pokrycie kodu i Microsoft Fakes skonfigurowane za pośrednictwem ustawień uruchamiania nie są obsługiwane przez osadzone ustawienia testów. Zobacz https://aka.ms/vstest-configure-datacollector w celu uzyskania dalszych informacji. Ustawienia uruchamiania: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;identyfikator URI/przyjazna nazwa rejestratora&gt;
-      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu 
-      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=&lt;wartość domyślna to unikatowa nazwa pliku&gt;]
-      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.
-
-      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej
-      Przykład: /logger:console;verbosity=&lt;wartość domyślna to „minimal”&gt; 
-      Dozwolone wartości szczegółowości: quiet, minimal i normal.
-
-      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej
-      Przykład: /logger:console;prefix=&lt;wartość domyślna to „false”&gt;
-      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Zbieranie zrzutów awaryjnych przez opcję CollectDump programu Blame nie jest obsługiwane w przypadku tej platformy.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Parametr blame określony z argumentem blame, {0} jest nieprawidłowy. Ten parametr jest ignorowany.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Ścieżka pliku Diag „{0}” jest nieprawidłowa.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Argument Blame „{0}” jest nieprawidłowy.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Argument Diag „{0}” jest nieprawidłowy.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Argument Logger „{0}” jest nieprawidłowy.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Program Framework35 nie jest obsługiwany. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 testy zostaną uruchomione w aparacie CLR 4.0 w trybie zgodności.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Uruchomienie testu w toku</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Łączna liczba testów: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Zakończone niepowodzeniem: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Zakończone pomyślnie: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Pominięte: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">Argument {0} jest nieprawidłowy. Użyj opcji /help, aby sprawdzić listę prawidłowych argumentów.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Łączna liczba plików testowych dopasowanych do określonego wzorca: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">Argument parametru przebiegu testu „{0}” jest nieprawidłowy. Użyj poniższego formatu.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Zbieranie zrzutów po zawieszeniu przez opcję CollectDump z opcją TestTimeout programu Blame nie jest obsługiwane w przypadku tej platformy.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} — niepowodzenie: {1}, powodzenie: {2}, pominięto: {3}, łącznie: {4}, czas trwania: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Brak</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Ustawia wartość zmiennej środowiskowej. Jeśli zmienna nie istnieje, tworzy ją, a w przeciwnym wypadku przesłania ją. Powoduje to określenie przełącznika /InIsolation i wymuszenie uruchomienia testów w procesie izolowanym.
-      
-      Ten argument może być określany wielokrotnie w celu dostarczenia wielu zmiennych.
-
-      Przykład: -e:ZMIENNA1=WARTOŚĆ1
-               -e:INNA_ZMIENNA="WARTOŚĆ ZE SPACJAMI"
-               -e:INNA_ZMIENNA="WARTOŚCI;oddzielone;średnikami"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">Zmienna środowiskowa „{0}” została już zdefiniowana, ale została przysłonięta przez argument by-Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Przebieg testowy został przerwany z powodu błędu {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pl">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">Nie można odnaleźć elementu „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Dostępne są następujące dodatki służące do wykrywania testów:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Dostępne są następujące dodatki służące do wykonywania testów:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Dostępne są następujące dodatki rejestratora testów:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Błąd: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Parametr „{0}” należy podać tylko raz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Wystąpił wyjątek podczas tworzenia wystąpienia rozszerzenia „{0}”: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Dostępne są następujące testy:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Nierozpoznany parametr „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Nie odnaleziono podanego pliku źródłowego testu „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Podany identyfikator URI rejestratora testów „{0}” jest nieprawidłowy. Rejestrator testów zostanie zignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informacje: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Ostrzeżenie: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Wyświetla ten komunikat dotyczący sposobu użycia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Wersja {0} VSTest</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;identyfikator URI/przyjazna nazwa rejestratora&gt;
+      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu 
+      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=&lt;Defaults to unique file name&gt;]
+      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.
+
+      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej
+      Przykład: /logger:console;verbosity=&lt;wartość domyślna to „normal”&gt; 
+      Dozwolone wartości szczegółowości: quiet, minimal i normal.
+
+      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej
+      Przykład: /logger:console;prefix=&lt;wartość domyślna to „false”&gt;
+      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Opis: uruchamia testy z określonych plików.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Opcje:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Sposób użycia: vstest.console.exe [argumenty] [opcje] [[--] &lt;argumenty RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Nie określono żadnych plików źródłowych testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Nie określono żadnych argumentów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Uruchom testy z określonych plików lub wzorca symbolu wieloznacznego. Rozdziel wiele nazw lub wzorców plików testowych
+      spacjami. Ustaw szczegółowość rejestratora konsoli na Szczegółowy, aby wyświetlić dopasowane pliki testowe.
+      Przykłady: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Dostępne są następujące dodatki dostawców ustawień:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;plik ustawień&gt;
+      Ustawienia, które mają być używane podczas uruchamiania testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Parametr /Settings wymaga podania pliku ustawień.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Nie można odnaleźć pliku ustawień „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Przebieg testu nie powiódł się.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Przebieg testu zakończony powodzeniem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „InIsolation”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /InIsolation) i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Parametr /UseVsixExtensions wymaga podania wartości. Jeśli wartość to „true”, zainstalowane rozszerzenia VSIX (jeśli istnieją) zostaną użyte w ramach przebiegu testu. Jeśli wartość to „false”, rozszerzenia zostaną zignorowane. Przykład: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „UseVsixExtensions”. Określ polecenie wskazujące, czy rozszerzenia vsix mają zostać użyte, czy pominięte (przykład: vstest.console.exe mojeTesty.dll /UseVsixExtensions:true), a następnie spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Uruchamia testy w procesie izolowanym. Dzięki temu mniej prawdopodobne jest 
+      zatrzymanie procesu vstest.console.exe po wystąpieniu błędu w testach, ale 
+      testy mogą działać wolniej.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Powoduje to, że proces vstest.console.exe używa lub pomija zainstalowane 
+      rozszerzenia VSIX (jeśli istnieją) w przebiegu testu.
+      Przykład: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">Argument /BatchSize wymaga podania wielkości partii. Przykład: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Rozmiar partii {0} jest nieprawidłowy. Rozmiar partii powinien być większy niż zero. Przykład: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Aby uruchomić testy:
+    &gt;vstest.console.exe tests.dll 
+  Aby uruchomić testy z użyciem ustawień dodatkowych, takich jak moduły zbierające dane:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Wyświetla listę zainstalowanych wykrywaczy testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Wyświetla listę zainstalowanych modułów wykonywania testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Wyświetla listę zainstalowanych rejestratorów testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Wyświetla listę zainstalowanych dostawców ustawień testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;nazwa pliku&gt;
+      Wyświetla listę wszystkich wykrytych testów z danego kontenera testów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Czas, który upłynął:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">Argument /Tests wymaga co najmniej jednej określonej nazwy testu lub jej podciągu.
+       Przykłady: /Tests:MetodaTestowa1, /Tests:MetodaTestowa1,metoda2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Wykryto łącznie następującą liczbę testów: {0}. Żaden z nich nie jest zgodny z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;nazwy testów&gt;
+      Uruchom testy z nazwami, które są zgodne z podanymi wartościami. Aby
+      podać wiele wartości, oddziel je przecinkami.
+      Przykłady: /Tests:MetodaTestowa1
+                /Tests:MetodaTestowa1,MetodaTestowa2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Używanie trybu izolacji do uruchomienia testów jako adapterów danych diagnostycznych zostało włączone w pliku runsettings. Użyj parametru /inIsolation, aby pominąć to ostrzeżenie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Używanie trybu izolacji do uruchomienia testów jednostkowych dla aplikacji ze Sklepu Windows. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji ze Sklepu Windows. Usuń ustawienia adapterów danych diagnostycznych z ustawień.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        Przyjazna nazwa: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        Identyfikator URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        Nazwa ustawienia: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Obsługiwane typy plików:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        Domyślny identyfikator URI modułu wykonywania: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        Identyfikator URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Nieprawidłowy typ platformy: {0}. Prawidłowe typy platform to {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">Argument /Platform wymaga podania typu platformy docelowej dla przebiegu testu. Przykład: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      Docelowa architektura platformy, która zostanie użyta do wykonania testu. 
+      Prawidłowe wartości to x86, x64 i ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Używanie trybu izolacji do uruchomienia testów w sposób wymagany przez obowiązujące ustawienia platformy ({0}) i programu .NET Framework ({1}) dla przebiegu testu. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      Docelowa wersja platformy .NET, która zostanie użyta na potrzeby wykonania testu. 
+      Prawidłowe wartości to „.NETFramework,Version=v4.5.1”, „.NETCoreApp,Version=v1.0” itp.
+      Inne obsługiwane wartości to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">Argument /Framework wymaga docelowej wersji programu .NET Framework na potrzeby przebiegu testu. Przykład: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Nieprawidłowa wersja programu .NET Framework: {0}. Podaj pełną nazwę struktury docelowej (np. .NETCoreApp,Version=v2.0). Inne obsługiwane wersje programu .NET Framework to Framework40, Framework45, FrameworkCore10 i FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Nie można rozpocząć przebiegu testu dla testów jednostkowych aplikacji ze Sklepu Windows: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;wyrażenie&gt;
+      Uruchamia testy, które są zgodne z danym wyrażeniem.
+      Element &lt;wyrażenie&gt; jest w formacie &lt;właściwość&gt;Operator&lt;wartość&gt;[|&amp;&lt;wyrażenie&gt;]
+         gdzie Operator to =, != lub ~  (operator ~ ma semantykę „zawiera”
+         i jest stosowany dla właściwości ciągów, takich jak nazwa wyświetlana).
+         Nawiasy () mogą służyć do grupowania wyrażeń podrzędnych.
+      Przykłady: /TestCaseFilter:"Priority=1"
+                 /TestCaseFilter:"(FullyQualifiedName~Nocne
+                                  |Name=MojaMetodaTestowa)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">Argument /TestCaseFilter wymaga wartości filtru.
+        Wartość filtru może być typu &lt;property&gt;=&lt;value&gt; .
+        Przykłady: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Nie można określać argumentu /TestCaseFilter z argumentem /Tests. Filtrowanie przypadków testowych nie jest stosowane, gdy testy zostały określone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">Element {0} jest kompilowany dla elementu {1}/{2}. Zestawy testowe określone w ramach uruchomienia powinny mieć wspólny docelowy program .NET Framework i wspólną docelową platformę.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Na potrzeby uruchamiania testów można określić tylko jeden pakiet aplikacji (plik appx).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Trwa rozpoczynanie wykrywania testu, czekaj...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Trwa rozpoczynanie wykonywania testu, czekaj...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">Podczas odczytywania ustawień adaptera danych diagnostycznych został zgłoszony uruchomiony element „{0}”. Wszystkie adaptery danych diagnostycznych zostaną pominięte podczas tego uruchomienia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Włącza moduł zbierający dane „CodeCoverage” dla przebiegu testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „EnableCodeCoverage”. Określ polecenie bez argumentu (przykład: vstest.console.exe mojeTesty.dll /EnableCodeCoverage) i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji ze Sklepu Windows, utwórz pakiet aplikacji za pomocą projektu biblioteki testów jednostkowych aplikacji ze Sklepu Windows.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Pokrycie kodu nie jest dostępne dla aplikacji ze Sklepu Windows. Pominięto analizę pokrycia kodu dla tego przebiegu testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Wykryto łącznie następującą liczbę testów: {0}. Niektóre z nich nie są zgodne z określonymi kryteriami wyboru ({1}). Użyj prawidłowych wartości i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath | / TestAdapterPath
+      Powoduje to, że proces vstest.console.exe używa niestandardowych adapterów
+      testowych z podanej ścieżki (jeśli istnieje) w ramach przebiegu testu. 
+      Przykład: /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Parametr /TestAdapterPath wymaga wartości, którą jest ścieżką do lokalizacji zawierającej niestandardowe adaptery testowe. Przykład: /TestAdapterPath:c:\MojeAdapteryNiestandardowe</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Ścieżka „{0}” określona w parametrze „TestAdapterPath” jest nieprawidłowa. Błąd: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Nie odnaleziono podanej ścieżki wyszukiwania niestandardowego adaptera testowego. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Ścieżka „{0}” określona w parametrze „TestAdapterPath” nie zawiera żadnych adapterów testowych. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Nie można rozpocząć przebiegu testu dla testów dla aplikacji Windows Phone: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Używanie trybu izolacji do uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Użyj parametru /InIsolation, aby pominąć to ostrzeżenie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Pokrycie kodu nie jest dostępne dla aplikacji systemu Windows Phone. Pominięto analizę pokrycia kodu dla tego przebiegu testu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Adaptery danych diagnostycznych nie są obsługiwane podczas uruchamiania testów jednostkowych dla aplikacji systemu Windows Phone. Usuń ustawienia adapterów danych diagnostycznych z ustawień.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">Pakiet aplikacji „{0}” nie ma punktu wejścia modułu wykonywania testów. Aby uruchamiać testy jednostkowe dla aplikacji systemu Windows Phone, utwórz projekt aplikacji testów jednostkowych systemu Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Używanie platformy {0} do uruchamiania testów. Określ parametr /Framework:{1}, aby pominąć to ostrzeżenie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Nie odnaleziono żadnych testów w określonych kontenerach testów. Ponadto adapter testów jednostkowych Sklepu Windows firmy Microsoft nie obsługuje plików appxbundle. Utwórz plik appx (ustaw opcję generowania zbioru aplikacji na wartość Nigdy) podczas tworzenia pakietu aplikacji, a następnie spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Określa, że testy będą wykonywane równolegle. Domyślnie mogą zostać użyte
+      wszystkie dostępne rdzenie maszyny.
+      Liczbę rdzeni do użycia można skonfigurować za pomocą pliku ustawień.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">Argument {0} nie jest oczekiwany w poleceniu „Parallel”. Określ polecenie bez tego argumentu (przykład: vstest.console.exe mojeTesty.dll /Parallel), a następnie spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Nie może mieć wartości null ani być pusty</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;port&gt;
+      Port służący do połączenia z gniazdem i odbierania komunikatów zdarzeń.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">Argument --Port|/Port wymaga numeru portu będącego liczbą całkowitą. Określ port na potrzeby połączenia z gniazdem i odbierania komunikatów zdarzeń.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Nie można odnaleźć testowanego zestawu. Upewnij się, że projekt został skompilowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Ścieżka {0} nie istnieje.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;podstawowa ścieżka do kompilacji&gt;
+      Katalog zawierający tymczasowe dane wyjściowe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;konfiguracja&gt;
+      Konfiguracja, na potrzeby której kompilowany jest projekt, na przykład Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">Podana konfiguracja jest nieprawidłowa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;dane wyjściowe&gt;
+      Katalog zawierający pliki binarne do uruchomienia.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">Nie można odnaleźć parametru BuildBasePath. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Nie można odnaleźć ścieżki wyjściowej. Podaj prawidłową ścieżkę i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Dodatkowe komunikaty informacyjne:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Dni</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Komunikat o błędzie:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Łączny czas: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Godziny</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Nie można odnaleźć rejestratora testów z identyfikatorem URI lub przyjazną nazwą „{0}”.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minuty</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Sekundy</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Ślad stosu:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Standardowe komunikaty o błędach:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Standardowe komunikaty wyjściowe:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Załączniki:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Brak dostępnych testów w elemencie {0}. Upewnij się, że ustawienia zainstalowanych wykrywaczy testów, modułów wykonywania, platform i wersji struktur są odpowiednie, i spróbuj ponownie.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Niepowodzenie</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Powodzenie</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Pominięto</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Wykrywanie nie powiodło się dla podanych źródeł. Wyjątek: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;identyfikator procesu nadrzędnego&gt;
+      Identyfikator procesu nadrzędnego odpowiedzialnego za uruchomienie bieżącego procesu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">Argument --ParentProcessId|/ParentProcessId wymaga identyfikatora procesu będącego liczbą całkowitą. Określ identyfikator procesu nadrzędnego, który uruchomił ten proces.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argumenty:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;ścieżka do pliku dziennika&gt;
+      Włącz dzienniki dla platformy testowej.
+      Dzienniki są zapisywanie w podanym pliku.
+
+      Zmień poziom śledzenia dla dzienników, jak pokazano poniżej
+      Przykład: /Diag:&lt;ścieżka do pliku dziennika&gt;;tracelevel=&lt;wartość domyślna to „verbose”&gt;
+      Dozwolone wartości dla elementu tracelevel: off, error, warning, info i verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Podany plik {0} jest tylko do odczytu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Przekroczono limit czasu żądania nawiązywania połączenia lub przetwarzania dla elementu DesignModeClient na porcie: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Nie uruchomiono</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Argumenty RunSettings:
+      Argumenty do przekazania konfiguracji runsettings za pośrednictwem wiersza polecenia. Argumenty mogą być określone jako para nazwa-wartość formularza [nazwa]=[wartość] po „-- ”. Pamiętaj o spacji po --. 
+      Oddziel wiele par [nazwa]=[wartość] za pomocą spacji.
+      Więcej informacji na temat obsługi argumentów RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Co najmniej jedne z podanych ustawień uruchamiania zawierają nieprawidłowy token</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Jeśli katalog wyników nie istnieje, zostanie utworzony w określonej ścieżce.
+      Przykład /ResultsDirectory:&lt;ŚcieżkaDoKataloguWyników&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Parametr /ResultsDirectory wymaga wartości określającej miejsce zapisania wyników testu. Przykład: /ResultsDirectory:c:\KatalogWynikówTestu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Ścieżka „{0}” określona w parametrze „ResultsDirectory” jest nieprawidłowa. Błąd: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">Flaga /InIsolation jest przestarzała. Testy zawsze są uruchamiane w oddzielnym procesie</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Rejestrowanie diagnostyki Vstest w pliku: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;przyjazna nazwa modułu zbierającego dane&gt;
+      Włącza moduł zbierający dane dla przebiegu testu. Więcej informacji: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Przyjazna nazwa modułu zbierającego dane „{0}” jest nieprawidłowa. Moduł zbierający dane będzie ignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Komunikaty śledzenia debugowania:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Uruchamia test w trybie Blame. Ta opcja jest pomocna w odizolowaniu problematycznego testu powodującego awarię hosta testów.
+      Tworzy w bieżącym katalogu plik wyjściowy „Sequence.xml”,
+      który przechwytuje kolejność wykonywania testu przed awarią.
+      Opcjonalnie możesz zebrać zrzut procesu dla hosta testów.
+      Gdy zdecydujesz się na zebranie zrzutu, domyślnie w momencie awarii zostanie zebrany minizrzut.
+      Możesz także przesłonić to zachowanie domyślne opcjonalnymi parametrami:
+      CollectAlways — zrzut jest zbierany przy wychodzeniu, nawet jeśli nie ma awarii (true/false) 
+      DumpType — określa typ zrzutu (mini/full).
+      Przykład: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Przebieg testu został przerwany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Przebieg testu został anulowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Błąd podczas otwierania pliku odpowiedzi „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      Przeczytaj zawartość pliku odpowiedzi w celu uzyskania dodatkowych opcji.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Łączna liczba testów: nieznana</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Dodatkowo ścieżkę do adapterów testów można określić za pomocą polecenia /TestAdapterPath. Przykład: /TestAdapterPath:&lt;ścieżka_do_adapterów_niestandardowych&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">Polecenie /UseVsixExtensions jest wycofywane. Użyj zamiast niego polecenia /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Przykład: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect: element „{0}” nie jest obsługiwany, jeśli przebieg testu został skonfigurowany za pomocą pliku testsettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Moduły zbierające dane inne niż Pokrycie kodu i Microsoft Fakes skonfigurowane za pośrednictwem ustawień uruchamiania nie są obsługiwane przez osadzone ustawienia testów. Zobacz https://aka.ms/vstest-configure-datacollector w celu uzyskania dalszych informacji. Ustawienia uruchamiania: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;identyfikator URI/przyjazna nazwa rejestratora&gt;
+      Określa rejestrator dla wyników testu. Aby na przykład rejestrować wyniki testu 
+      do pliku wyników testu (TRX) programu Visual Studio, użyj parametru /logger:trx [;LogFileName=&lt;Defaults to unique file name&gt;]
+      Tworzy w katalogu TestResults plik z podaną nazwą LogFileName.
+
+      Zmień poziom szczegółowości dla rejestratora konsoli, jak pokazano poniżej
+      Przykład: /logger:console;verbosity=&lt;wartość domyślna to „minimal”&gt; 
+      Dozwolone wartości szczegółowości: quiet, minimal i normal.
+
+      Zmień prefiks poziomu diagnostyki dla rejestratora konsoli, jak pokazano poniżej
+      Przykład: /logger:console;prefix=&lt;wartość domyślna to „false”&gt;
+      Więcej informacji o rejestratorze konsoli: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Zbieranie zrzutów awaryjnych przez opcję CollectDump programu Blame nie jest obsługiwane w przypadku tej platformy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Parametr blame określony z argumentem blame, {0} jest nieprawidłowy. Ten parametr jest ignorowany.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Ścieżka pliku Diag „{0}” jest nieprawidłowa.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Argument Blame „{0}” jest nieprawidłowy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Argument Diag „{0}” jest nieprawidłowy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Argument Logger „{0}” jest nieprawidłowy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Program Framework35 nie jest obsługiwany. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 testy zostaną uruchomione w aparacie CLR 4.0 w trybie zgodności.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Uruchomienie testu w toku</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Łączna liczba testów: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Zakończone niepowodzeniem: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Zakończone pomyślnie: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Pominięte: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">Argument {0} jest nieprawidłowy. Użyj opcji /help, aby sprawdzić listę prawidłowych argumentów.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Łączna liczba plików testowych dopasowanych do określonego wzorca: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">Argument parametru przebiegu testu „{0}” jest nieprawidłowy. Użyj poniższego formatu.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Zbieranie zrzutów po zawieszeniu przez opcję CollectDump z opcją TestTimeout programu Blame nie jest obsługiwane w przypadku tej platformy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} — niepowodzenie: {1}, powodzenie: {2}, pominięto: {3}, łącznie: {4}, czas trwania: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Brak</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Ustawia wartość zmiennej środowiskowej. Jeśli zmienna nie istnieje, tworzy ją, a w przeciwnym wypadku przesłania ją. Powoduje to określenie przełącznika /InIsolation i wymuszenie uruchomienia testów w procesie izolowanym.
+      
+      Ten argument może być określany wielokrotnie w celu dostarczenia wielu zmiennych.
+
+      Przykład: -e:ZMIENNA1=WARTOŚĆ1
+               -e:INNA_ZMIENNA="WARTOŚĆ ZE SPACJAMI"
+               -e:INNA_ZMIENNA="WARTOŚCI;oddzielone;średnikami"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">Zmienna środowiskowa „{0}” została już zdefiniowana, ale została przysłonięta przez argument by-Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Przebieg testowy został przerwany z powodu błędu {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">Nieprawidłowy identyfikator testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+ Wpływa to na zachowanie ładowania adaptera.
+
+ Obecnie obsługiwane zachowania: 
+ – Explicit: platforma testowa ładuje tylko adaptery określone przez /TestAdapterPath (lub węzeł RunConfiguration.TestAdaptersPaths). 
+ Jeśli zostanie podana określona ścieżka adaptera, zostanie on załadowany; jeśli ścieżka katalogu jest podana adaptery bezpośrednio w tym folderze zostaną załadowane, o ile nie określono również opcji Recursive.
+ Jeśli nie określono ścieżki adaptera, przebieg testu zakończy się niepowodzeniem.
+ Będzie to uruchamiać przełącznik /InIsolation i wymusi uruchomienie testów w izolowanym procesie.
+ 
+ — Default: platforma testowa ładuje adaptery, tak jakby ten argument nie został określony. 
+ Spowoduje to pobranie rozszerzeń z obszaru Obok źródła, podanie dodatkowych ścieżek adapterów i domyślnego katalogu.
+
+ — DefaultRuntimeProviders: załaduje domyślnych dostawców środowiska uruchomieniowego dostarczanych z platformą testową. 
+ Jeśli nie jest to określone, podczas gdy opcja „Explicit“ jest ustawiona, dostawca hosta testowego musi być wyraźnie określony.
+
+ — ExtensionsDirectory: ładuje adaptery w folderze Rozszerzenia.
+
+ — NextToSource: załaduje adaptery w obszarze Obok źródła. 
+
+ — Recursive: cykliczne wyszukiwanie folderów podczas ładowania adapterów. Wymaga to określenia opcji „Explicit“ lub „NextToSource“.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">Określona wartość ({0}) dla parametru /TestAdapterLoadingStrategy jest nieprawidłowa!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Strategia ładowania rekurencyjnego adaptera nie może być używana samodzielnie. Połącz z co najmniej jednym z następujących elementów: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Parametr /TestAdapterPath musi być podany, gdy określono strategię ładowania adaptera testowego „{0}“.</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">Program vstest.console.exe działa w trybie emulowanym jako {0}. Aby uzyskać lepszą wydajność, rozważ użycie natywnego modułu uruchamiającego vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Upłynął limit czasu oczekiwania na połączenie programu obsługi żądań po {0} s.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Upłynął limit czasu oczekiwania na rozpoczęcie sesji testu po {0} s.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Upłynął limit czasu oczekiwania na zatrzymanie sesji testu po {0} sekund.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Błąd podczas hostowania kanału komunikacji.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">Właściwość ProcDumpToolDirectoryPath powinna być określona w celu zainstalowania lub usunięcia debugera post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Debuger postmortem nie jest obsługiwany w bieżącym systemie operacyjnym.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Katalog określony dla pliku wykonywalnego procdump jest nieprawidłowy i nie znaleziono narzędzia wewnątrz zmiennych środowiskowych (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Nie znaleziono nazwy pliku procdump: „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">Należy określić element DumpDirectoryPath, aby zainstalować debuger post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Określony katalog jest nieprawidłowy: „{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">Argument AeDebugger „{0}” jest nieprawidłowy.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">Polecenie dotnet vstest jest zastępowane przez test dotnet, który może być teraz używany do uruchamiania zestawów. Zobacz https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
index ccc01cb4dd..cce5844933 100644
--- a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}' não encontrado.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Os seguintes Suplementos de Descoberta de Teste estão disponíveis:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Os seguintes Suplementos de Execução de Teste estão disponíveis:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Os seguintes Suplementos de Agente de Teste estão disponíveis:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Erro: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">O parâmetro "{0}" deve ser fornecido apenas uma vez.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">Ocorreu uma exceção ao criar uma instância da extensão '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Os Testes a seguir estão disponíveis:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Parâmetro "{0}" não reconhecido.</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">O arquivo de origem de teste "{0}" fornecido não foi encontrado.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Informações: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Aviso: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Exibe esta mensagem de uso.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (c) Microsoft Corporation. Todos os direitos reservados.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Ferramenta de Linha de Comando de Execução de Teste da Microsoft (R) Versão {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do 
-      Visual Studio use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Cria um arquivo no diretório TestResults com o LogFileName determinado.
-
-      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo
-      Exemplo: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.
-
-Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo
-      Exemplo: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Descrição: executa testes dos arquivos especificados.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Opções:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Uso: vstest.console.exe [Argumentos] [Opções] [[--] &lt;RunSettings arguments&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Nenhum arquivo de origem de teste foi especificado.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Nenhum argumento foi especificado.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Execute testes por meio dos arquivos especificados ou do padrão curinga. Separe vários nomes de arquivos de teste ou padrões
-      por espaços. Defina o detalhamento do agente do console como detalhado para exibir os arquivos de teste correspondentes.
-      Exemplos: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Os seguintes Suplementos de Provedores de Configurações estão disponíveis:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
-      Configurações a serem usadas durante a execução de testes.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">O parâmetro /Settings exige que um arquivo de configurações seja fornecido.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">O arquivo de Configurações '{0}' não pôde ser encontrado.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Falha na Execução de Teste.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Execução de Teste Bem-sucedida.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">O argumento {0} não é esperado no comando 'InIsolation'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /InIsolation) e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">O parâmetro /UseVsixExtensions requer um valor. Se ele for 'true', as extensões VSIX instaladas (caso haja alguma) serão usadas na execução de teste. Se ele for false, elas serão ignoradas. Exemplo: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">O argumento {0} não é esperado no comando 'UseVsixExtensions'. Especifique o comando que indica se as extensões vsix devem ser usadas ou ignoradas (exemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Executa os testes em um processo isolado. Isso diminui a probabilidade de que o processo vstest.console.exe 
-      seja interrompido em um erro nos testes, mas os testes 
-      podem ficar mais lentos.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Faz o processo vstest.console.exe usar ou ignorar as extensões VSIX instaladas 
-      (caso haja alguma) na execução de teste. 
-      Exemplo  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">O argumento /BatchSize requer o tamanho do lote. Exemplo: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Tamanho do lote inválido {0}. O tamanho do lote deve ser maior que zero. Exemplo: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Para executar testes:
-    &gt;vstest.console.exe tests.dll 
-  Para executar testes com configurações adicionais, como coletores de dados:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Lista os discoverers de teste instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Lista os executores de teste instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Lista os agentes de teste instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Lista os provedores de configurações de teste instalados.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lista todos os testes detectados no contêiner de testes especificado.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Tempo decorrido:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">O argumento /Tests requer um ou mais nomes de teste específicos ou suas subcadeias de caracteres.
-       Exemplos: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Foram descobertos {0} testes no total, mas nenhum teste corresponde ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
-      Execute testes com nomes que correspondam aos valores fornecidos. Para fornecer vários
-      valores, separe-os por vírgulas.
-       Exemplos: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Usando o modo de isolamento para executar os testes pois os adaptadores de dados de diagnóstico foram habilitados nas runsettings. Use o parâmetro /inIsolation para suprimir esse aviso.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Usando o modo de isolamento para executar testes de unidade para aplicativos da Windows Store. Use o parâmetro /InIsolation para suprimir esse aviso.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos da Windows Store. Remova as configurações de adaptadores de dados de diagnóstico das configurações.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Tipos de arquivos com suporte:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI do executor padrão: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Tipo de plataforma inválido: {0}. Os tipos de plataforma válidos {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">O argumento /Platform requer que o tipo de plataforma de destino para a execução de teste seja fornecido. Exemplo: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
-      Arquitetura da plataforma destino a ser usada na execução de teste. 
-      Os valores válidos são x86, x64 e ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Usando o modo de isolamento para executar testes conforme o exigido pelas configurações em vigor da Plataforma: {0} e do .Net Framework: {1} para execução de teste. Use o parâmetro /inIsolation para suprimir esse aviso.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Versão do Framework&gt;
-      Versão de destino do .NET Framework a ser usada para execução de teste. 
-      Os valores válidos são ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Outros valores permitidos são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">O argumento /Framework requer a versão do .Net Framework de destino para a execução de teste. Exemplo: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Versão inválida do .Net Framework: {0}. Forneça o nome completo do TargetFramework(Exemplo: .NETCoreApp,Version=v2.0). Outras versões compatíveis do .Net Framework são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Não foi possível iniciar a execução de testes de unidade para o aplicativo da Windows Store: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Executa testes que correspondem à expressão fornecida.
-      &lt;Expression&gt; tem o formato &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         em que Operator é =, != ou ~ (o Operator ~ tem a semântica 'contains'
-         e é aplicável a propriedades de cadeia de caracteres como DisplayName).
-         É possível usar parênteses () para agrupar subexpressões.
-      Exemplos: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">O argumento /TestCaseFilter exige um valor de filtro.
-        O valor de filtro pode ser do tipo &lt;propriedade&gt;=&lt;valor&gt; .
-        Exemplos: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">O argumento /TestCaseFilter não pode ser especificado com /Tests. A filtragem de casos de teste não se aplica quando os testes são especificados.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} é construído para {1}/{2}. Os assemblies de testes especificados em uma execução devem ter um destino comum de do Net. framework e da plataforma.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Somente um pacote do aplicativo (arquivo .appx) pode ser especificado para a execução de testes.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Iniciando descoberta de teste, espere...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Iniciando execução de teste, espere...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">A leitura das configurações do adaptador de dados de diagnóstico emitiu uma execução '{0}'. Todos os adaptadores de dados de diagnóstico serão ignorados nessa execução.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Habilita o coletor de dados 'CodeCoverage' para a execução de teste.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">O argumento {0} não é esperado no comando 'EnableCodeCoverage'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos da Windows Store, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo da Windows Store.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">A cobertura do teste não está disponível para aplicativos da Windows Store. Análise de cobertura de código ignorada nesta execução de teste.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Foram descobertos {0} testes no total, mas alguns testes não correspondem ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Faz com que o processo vstest.console.exe use adaptadores de teste personalizados
-      de um arquivo fornecido (caso haja algum) na execução de teste. 
-      Exemplo:  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">O parâmetro /TestAdapterPath exige um valor, que é o caminho de um local contendo adaptadores de teste personalizados. Exemplo: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">O caminho '{0}' especificado em 'TestAdapterPath' é inválido. Erro: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">O caminho de pesquisa do adaptador de teste personalizado fornecido não foi encontrado, forneça um caminho válido e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">O caminho '{0}' especificado em 'TestAdapterPath' não contém nenhum adaptador de teste, forneça um caminho válido e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Não foi possível iniciar a execução de testes para o aplicativo do Windows Phone: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Usando o modo de isolamento para executar testes de unidade para aplicativos do Windows Phone. Use o parâmetro /InIsolation para suprimir esse aviso.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">A cobertura do teste não está disponível para aplicativos do Windows Phone. Análise de cobertura do teste ignorada nesta execução de teste.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos do Windows Phone. Remova as configurações de adaptadores de dados de diagnóstico das configurações.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos do Windows Phone, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo do Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Usando a estrutura {0} para executar os testes. Especifique /Framework:{1} para suprimir esse aviso.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Nenhum teste foi encontrado nos contêineres de teste especificados. Além disso, o adaptador de teste de unidade da Microsoft Windows Store não dá suporte a arquivos .appxbundle. Crie um appx (defina a opção Gerar Pacote do Aplicativo como nunca) quando criar o Pacote do Aplicativo e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Especifica que os testes sejam executados em paralelo. Por padrão, 
-      podem ser usados todos os núcleos disponíveis no computador.
-      O número de núcleos a serem usados pode ser configurado usando um arquivo de configurações.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">O argumento {0} não é esperado no comando 'Parallel'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /Parallel) e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Não pode ser nulo ou estar vazio</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Port&gt;
-      A Porta para a conexão de soquete e o recebimento de mensagens de eventos.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">O argumento --Port|/Port requer o número da porta que é um número inteiro. Especifique a porta de conexão de soquete e de recebimento de mensagens de evento.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Não é possível localizar o assembly em teste. Verifique se o projeto foi criado.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">O caminho {0} não existe.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      O diretório que contém as saídas temporárias.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      A configuração para a qual o projeto foi compilado, ou seja, Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">A configuração fornecida é inválida.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
-      O diretório que contém os binários a serem executados.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">O BuildBasePath não foi encontrado, forneça um caminho válido e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">O caminho de saída não foi encontrado, forneça um caminho válido e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Mensagens de informações adicionais:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Dias</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Mensagem de erro:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated">Tempo total: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Horas</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Não foi possível localizar um agente de teste com o URI ou o FriendlyName '{0}'.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Minutos</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Segundos</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Rastreamento de pilha:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Mensagens de erro padrão:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Mensagens de saída padrão:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Anexos:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">Nenhum teste está disponível em {0}. Certifique-se de que os detectores de teste e executores, configurações de versão de estrutura da plataforma instalados sejam apropriados e tente novamente.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Com falha</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Aprovado</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Ignorado</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Falha na descoberta para as fontes fornecidas. Exceção: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      ID do Processo Pai responsável pela inicialização do processo atual.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">O argumento --ParentProcessId|/ParentProcessId requer a ID do processo que é um número inteiro. Especifique a ID do processo pai que iniciou esse processo.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Argumentos:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
-      Habilitar os logs para a plataforma de teste.
-      Os logs são gravados no arquivo fornecido.
-
-Alterar o nível de rastreamento dos logs, como mostrado abaixo
-      Exemplo: /Diag:&lt;Path to log file&gt;; tracelevel=&lt;Defaults to "verbose"&gt;
-      Valores permitidos para tracelevel: off, error, warning, info e verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">O arquivo {0} fornecido é somente leitura</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Tempo limite atingido para conectar-se ou processar a solicitação para DesignModeClient na porta: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Não Executado</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Argumentos de RunSettings:
-      Argumentos para transmitir as configurações de runsettings através da commandline. Os argumentos podem ser especificados como um par nome-valor do formulário [name]=[value] após "-- ". Observe o espaço após --. 
-      Use um espaço para separar vários [name]=[value].
-      Mais informações sobre o suporte para os argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Uma ou mais runsettings fornecidas contêm um token inválido</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      O diretório de resultados de teste será criado no caminho especificado, caso ainda não exista.
-      Exemplo: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">O parâmetro /ResultsDirectory exige um valor no qual os resultados de teste deverão ser salvos. Exemplo: /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">O caminho '{0}' especificado em 'ResultsDirectory' é inválido. Erro: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">O sinalizador /InIsolation foi preterido. Os testes sempre são executados em um processo separado</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Registro em log do diagnóstico Vstest no arquivo: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Habilita o coletor de dados para a execução de teste. Mais informações aqui: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">O nome amigável '{0}' do Coletor de Dados não é válido. O Coletor de Dados será ignorado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Depurar Mensagens de Rastreamento:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Executa o teste em modo blame. Essa opção é útil para isolar o teste com problema causando falha no host de teste .
-     Ele cria um arquivo de saída no diretório atual como "Sequence.xml",
-      que captura a ordem de execução do teste antes da falha.
-      Você pode optar por coletar o processo de despejo para o host de teste.
-      Ao optar por coletar despejo, por padrão, um mini despejo será coletado em uma falha.
-     Você também pode optar por sobrescrever este comportamento padrão por alguns parâmetros opcionais:
-      CollectAlways - Para coletar despejo na saída mesmo que não haja falha (true/false) 
-      DumpType - Para especificar o tipo de despejo (mini/full).
-      Exemplo: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Execução de Teste Anulada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Execução de Teste Cancelada.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Erro ao abrir o arquivo de resposta '{0}'</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      Ler o arquivo de resposta para obter mais opções.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Total de testes: desconhecido</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Além disso, o caminho para os adaptadores de teste podem ser especificados usando o comando /TestAdapterPath. Exemplo /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions está sendo preterido. Em vez disso, use /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Exemplo: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" não é compatível se a execução de teste é configurada usando configurações de teste.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Coletores de dados que não sejam a Cobertura de Código e o Microsoft Fakes definidos por meio de configurações de execução não são compatíveis com configurações de teste inseridas. Consulte https://aka.ms/vstest-configure-datacollector para obter mais informações. Configurações de execução: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do 
-      Visual Studio use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Cria um arquivo no diretório TestResults com o LogFileName determinado.
-
-      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo
-      Exemplo: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.
-
-Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo
-      Exemplo: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">A coleta de despejos de memória pela opção CollectDump para Blame não tem suporte nesta plataforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">O parâmetro blame especificado com blame, {0} é inválido. Ignorando este parâmetro.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">O caminho para o arquivo diag '{0}' não é válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">O argumento blame '{0}' não é válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">O argumento diag '{0}' não é válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">O argumento logger '{0}' não é válido.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Não há suporte para Framework35. Para projetos destinados ao .Net Framework 3.5, o teste será executado no "modo de compatibilidade" do CLR 4.0.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Execução de teste em andamento</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Total de testes: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Com falha: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Aprovados: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Ignorados: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">O argumento {0} é inválido. Use a opção /help para verificar a lista de argumentos válidos.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">{0} arquivos de teste no total corresponderam ao padrão especificado.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">O argumento do parâmetro de execução de teste '{0}' é inválido. Use o formato abaixo.
-     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">A coleta de despejos de trava pela opção CollectDump com TestTimeout para Blame não é tem suporte para esta plataforma.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} – Com falha: {1}, Aprovado: {2}, Ignorado: {3}, Total: {4}, Duração: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Nenhum</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Define o valor de uma variável de ambiente. Cria a variável caso ela não exista e substitui caso exista. Isso implicará a opção /InIsolation e forçará a execução dos testes em um processo isolado.
-      
-      Esse argumento pode ser especificado várias vezes para fornecer várias variáveis.
-
-      Exemplo: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperado com;ponto e vírgula"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">A variável de ambiente '{0}' já foi definida, mas foi substituída por um argumento -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Execução de Teste Abortada com Erro {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="pt-BR">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}' não encontrado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Os seguintes Suplementos de Descoberta de Teste estão disponíveis:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Os seguintes Suplementos de Execução de Teste estão disponíveis:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Os seguintes Suplementos de Agente de Teste estão disponíveis:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Erro: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">O parâmetro "{0}" deve ser fornecido apenas uma vez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">Ocorreu uma exceção ao criar uma instância da extensão '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Os Testes a seguir estão disponíveis:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Parâmetro "{0}" não reconhecido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">O arquivo de origem de teste "{0}" fornecido não foi encontrado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">O URI do Agente de Teste '{0}' não é válido. O Agente de Teste será ignorado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Informações: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Aviso: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Exibe esta mensagem de uso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Versão do VSTest {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do 
+      Visual Studio use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Cria um arquivo no diretório TestResults com o LogFileName determinado.
+
+      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo
+      Exemplo: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.
+
+Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo
+      Exemplo: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Descrição: executa testes dos arquivos especificados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Opções:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Uso: vstest.console.exe [Argumentos] [Opções] [[--] &lt;RunSettings arguments&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Nenhum arquivo de origem de teste foi especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Nenhum argumento foi especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Execute testes por meio dos arquivos especificados ou do padrão curinga. Separe vários nomes de arquivos de teste ou padrões
+      por espaços. Defina o detalhamento do agente do console como detalhado para exibir os arquivos de teste correspondentes.
+      Exemplos: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Os seguintes Suplementos de Provedores de Configurações estão disponíveis:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
+      Configurações a serem usadas durante a execução de testes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">O parâmetro /Settings exige que um arquivo de configurações seja fornecido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">O arquivo de Configurações '{0}' não pôde ser encontrado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Falha na Execução de Teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Execução de Teste Bem-sucedida.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">O argumento {0} não é esperado no comando 'InIsolation'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /InIsolation) e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">O parâmetro /UseVsixExtensions requer um valor. Se ele for 'true', as extensões VSIX instaladas (caso haja alguma) serão usadas na execução de teste. Se ele for false, elas serão ignoradas. Exemplo: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">O argumento {0} não é esperado no comando 'UseVsixExtensions'. Especifique o comando que indica se as extensões vsix devem ser usadas ou ignoradas (exemplo: vstest.console.exe myTests.dll /UseVsixExtensions:true) e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Executa os testes em um processo isolado. Isso diminui a probabilidade de que o processo vstest.console.exe 
+      seja interrompido em um erro nos testes, mas os testes 
+      podem ficar mais lentos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Faz o processo vstest.console.exe usar ou ignorar as extensões VSIX instaladas 
+      (caso haja alguma) na execução de teste. 
+      Exemplo  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">O argumento /BatchSize requer o tamanho do lote. Exemplo: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Tamanho do lote inválido {0}. O tamanho do lote deve ser maior que zero. Exemplo: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Para executar testes:
+    &gt;vstest.console.exe tests.dll 
+  Para executar testes com configurações adicionais, como coletores de dados:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Lista os discoverers de teste instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Lista os executores de teste instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Lista os agentes de teste instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Lista os provedores de configurações de teste instalados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lista todos os testes detectados no contêiner de testes especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Tempo decorrido:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">O argumento /Tests requer um ou mais nomes de teste específicos ou suas subcadeias de caracteres.
+       Exemplos: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Foram descobertos {0} testes no total, mas nenhum teste corresponde ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
+      Execute testes com nomes que correspondam aos valores fornecidos. Para fornecer vários
+      valores, separe-os por vírgulas.
+       Exemplos: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Usando o modo de isolamento para executar os testes pois os adaptadores de dados de diagnóstico foram habilitados nas runsettings. Use o parâmetro /inIsolation para suprimir esse aviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Usando o modo de isolamento para executar testes de unidade para aplicativos da Windows Store. Use o parâmetro /InIsolation para suprimir esse aviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos da Windows Store. Remova as configurações de adaptadores de dados de diagnóstico das configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Tipos de arquivos com suporte:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        URI do executor padrão: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Tipo de plataforma inválido: {0}. Os tipos de plataforma válidos {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">O argumento /Platform requer que o tipo de plataforma de destino para a execução de teste seja fornecido. Exemplo: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      Arquitetura da plataforma destino a ser usada na execução de teste. 
+      Os valores válidos são x86, x64 e ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Usando o modo de isolamento para executar testes conforme o exigido pelas configurações em vigor da Plataforma: {0} e do .Net Framework: {1} para execução de teste. Use o parâmetro /inIsolation para suprimir esse aviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Versão do Framework&gt;
+      Versão de destino do .NET Framework a ser usada para execução de teste. 
+      Os valores válidos são ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Outros valores permitidos são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">O argumento /Framework requer a versão do .Net Framework de destino para a execução de teste. Exemplo: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Versão inválida do .Net Framework: {0}. Forneça o nome completo do TargetFramework(Exemplo: .NETCoreApp,Version=v2.0). Outras versões compatíveis do .Net Framework são Framework40, Framework45, FrameworkCore10 e FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Não foi possível iniciar a execução de testes de unidade para o aplicativo da Windows Store: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Executa testes que correspondem à expressão fornecida.
+      &lt;Expression&gt; tem o formato &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         em que Operator é =, != ou ~ (o Operator ~ tem a semântica 'contains'
+         e é aplicável a propriedades de cadeia de caracteres como DisplayName).
+         É possível usar parênteses () para agrupar subexpressões.
+      Exemplos: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">O argumento /TestCaseFilter exige um valor de filtro.
+        O valor de filtro pode ser do tipo &lt;propriedade&gt;=&lt;valor&gt; .
+        Exemplos: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">O argumento /TestCaseFilter não pode ser especificado com /Tests. A filtragem de casos de teste não se aplica quando os testes são especificados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} é construído para {1}/{2}. Os assemblies de testes especificados em uma execução devem ter um destino comum de do Net. framework e da plataforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Somente um pacote do aplicativo (arquivo .appx) pode ser especificado para a execução de testes.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Iniciando descoberta de teste, espere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Iniciando execução de teste, espere...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">A leitura das configurações do adaptador de dados de diagnóstico emitiu uma execução '{0}'. Todos os adaptadores de dados de diagnóstico serão ignorados nessa execução.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Habilita o coletor de dados 'CodeCoverage' para a execução de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">O argumento {0} não é esperado no comando 'EnableCodeCoverage'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /EnableCodeCoverage) e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos da Windows Store, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo da Windows Store.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">A cobertura do teste não está disponível para aplicativos da Windows Store. Análise de cobertura de código ignorada nesta execução de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Foram descobertos {0} testes no total, mas alguns testes não correspondem ao critério de seleção especificado ({1}). Use valores corretos e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Faz com que o processo vstest.console.exe use adaptadores de teste personalizados
+      de um arquivo fornecido (caso haja algum) na execução de teste. 
+      Exemplo:  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">O parâmetro /TestAdapterPath exige um valor, que é o caminho de um local contendo adaptadores de teste personalizados. Exemplo: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">O caminho '{0}' especificado em 'TestAdapterPath' é inválido. Erro: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">O caminho de pesquisa do adaptador de teste personalizado fornecido não foi encontrado, forneça um caminho válido e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">O caminho '{0}' especificado em 'TestAdapterPath' não contém nenhum adaptador de teste, forneça um caminho válido e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Não foi possível iniciar a execução de testes para o aplicativo do Windows Phone: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Usando o modo de isolamento para executar testes de unidade para aplicativos do Windows Phone. Use o parâmetro /InIsolation para suprimir esse aviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">A cobertura do teste não está disponível para aplicativos do Windows Phone. Análise de cobertura do teste ignorada nesta execução de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Não há suporte para adaptadores de dados de diagnóstico ao executar testes de unidade para aplicativos do Windows Phone. Remova as configurações de adaptadores de dados de diagnóstico das configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">O pacote do aplicativo '{0}' não tem o ponto de entrada do executor de teste. Para executar testes de unidade para aplicativos do Windows Phone, crie o pacote do aplicativo usando o projeto de Biblioteca de Teste de Unidade de aplicativo do Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Usando a estrutura {0} para executar os testes. Especifique /Framework:{1} para suprimir esse aviso.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Nenhum teste foi encontrado nos contêineres de teste especificados. Além disso, o adaptador de teste de unidade da Microsoft Windows Store não dá suporte a arquivos .appxbundle. Crie um appx (defina a opção Gerar Pacote do Aplicativo como nunca) quando criar o Pacote do Aplicativo e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Especifica que os testes sejam executados em paralelo. Por padrão, 
+      podem ser usados todos os núcleos disponíveis no computador.
+      O número de núcleos a serem usados pode ser configurado usando um arquivo de configurações.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">O argumento {0} não é esperado no comando 'Parallel'. Especifique o comando sem o argumento (exemplo: vstest.console.exe myTests.dll /Parallel) e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Não pode ser nulo ou estar vazio</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Port&gt;
+      A Porta para a conexão de soquete e o recebimento de mensagens de eventos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">O argumento --Port|/Port requer o número da porta que é um número inteiro. Especifique a porta de conexão de soquete e de recebimento de mensagens de evento.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Não é possível localizar o assembly em teste. Verifique se o projeto foi criado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">O caminho {0} não existe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      O diretório que contém as saídas temporárias.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      A configuração para a qual o projeto foi compilado, ou seja, Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">A configuração fornecida é inválida.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
+      O diretório que contém os binários a serem executados.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">O BuildBasePath não foi encontrado, forneça um caminho válido e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">O caminho de saída não foi encontrado, forneça um caminho válido e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Mensagens de informações adicionais:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Dias</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Mensagem de erro:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated">Tempo total: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Horas</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Não foi possível localizar um agente de teste com o URI ou o FriendlyName '{0}'.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Minutos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Segundos</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Rastreamento de pilha:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Mensagens de erro padrão:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Mensagens de saída padrão:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Anexos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">Nenhum teste está disponível em {0}. Certifique-se de que os detectores de teste e executores, configurações de versão de estrutura da plataforma instalados sejam apropriados e tente novamente.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Com falha</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Aprovado</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Ignorado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Falha na descoberta para as fontes fornecidas. Exceção: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      ID do Processo Pai responsável pela inicialização do processo atual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">O argumento --ParentProcessId|/ParentProcessId requer a ID do processo que é um número inteiro. Especifique a ID do processo pai que iniciou esse processo.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Argumentos:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
+      Habilitar os logs para a plataforma de teste.
+      Os logs são gravados no arquivo fornecido.
+
+Alterar o nível de rastreamento dos logs, como mostrado abaixo
+      Exemplo: /Diag:&lt;Path to log file&gt;; tracelevel=&lt;Defaults to "verbose"&gt;
+      Valores permitidos para tracelevel: off, error, warning, info e verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">O arquivo {0} fornecido é somente leitura</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Tempo limite atingido para conectar-se ou processar a solicitação para DesignModeClient na porta: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Não Executado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Argumentos de RunSettings:
+      Argumentos para transmitir as configurações de runsettings através da commandline. Os argumentos podem ser especificados como um par nome-valor do formulário [name]=[value] após "-- ". Observe o espaço após --. 
+      Use um espaço para separar vários [name]=[value].
+      Mais informações sobre o suporte para os argumentos de RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Uma ou mais runsettings fornecidas contêm um token inválido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      O diretório de resultados de teste será criado no caminho especificado, caso ainda não exista.
+      Exemplo: /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">O parâmetro /ResultsDirectory exige um valor no qual os resultados de teste deverão ser salvos. Exemplo: /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">O caminho '{0}' especificado em 'ResultsDirectory' é inválido. Erro: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">O sinalizador /InIsolation foi preterido. Os testes sempre são executados em um processo separado</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Registro em log do diagnóstico Vstest no arquivo: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Habilita o coletor de dados para a execução de teste. Mais informações aqui: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">O nome amigável '{0}' do Coletor de Dados não é válido. O Coletor de Dados será ignorado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Depurar Mensagens de Rastreamento:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Executa o teste em modo blame. Essa opção é útil para isolar o teste com problema causando falha no host de teste .
+     Ele cria um arquivo de saída no diretório atual como "Sequence.xml",
+      que captura a ordem de execução do teste antes da falha.
+      Você pode optar por coletar o processo de despejo para o host de teste.
+      Ao optar por coletar despejo, por padrão, um mini despejo será coletado em uma falha.
+     Você também pode optar por sobrescrever este comportamento padrão por alguns parâmetros opcionais:
+      CollectAlways - Para coletar despejo na saída mesmo que não haja falha (true/false) 
+      DumpType - Para especificar o tipo de despejo (mini/full).
+      Exemplo: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Execução de Teste Anulada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Execução de Teste Cancelada.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Erro ao abrir o arquivo de resposta '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      Ler o arquivo de resposta para obter mais opções.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Total de testes: desconhecido</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Além disso, o caminho para os adaptadores de teste podem ser especificados usando o comando /TestAdapterPath. Exemplo /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions está sendo preterido. Em vez disso, use /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Exemplo: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" não é compatível se a execução de teste é configurada usando configurações de teste.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Coletores de dados que não sejam a Cobertura de Código e o Microsoft Fakes definidos por meio de configurações de execução não são compatíveis com configurações de teste inseridas. Consulte https://aka.ms/vstest-configure-datacollector para obter mais informações. Configurações de execução: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Especifique um agente para os resultados de teste. Por exemplo, para registrar os resultados em um Arquivo de Resultados de Teste (TRX) do 
+      Visual Studio use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Cria um arquivo no diretório TestResults com o LogFileName determinado.
+
+      Altere o nível de detalhamento nas mensagens de log do agente de console, como mostrado abaixo
+      Exemplo: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Os valores permitidos para o nível de detalhamento são: quiet, minimal, normal e detailed.
+
+Altere o prefixo de nível de diagnóstico do agente de console, como mostrado abaixo
+      Exemplo: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      Veja mais informações sobre o Agente de Console aqui: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">A coleta de despejos de memória pela opção CollectDump para Blame não tem suporte nesta plataforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">O parâmetro blame especificado com blame, {0} é inválido. Ignorando este parâmetro.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">O caminho para o arquivo diag '{0}' não é válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">O argumento blame '{0}' não é válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">O argumento diag '{0}' não é válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">O argumento logger '{0}' não é válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Não há suporte para Framework35. Para projetos destinados ao .Net Framework 3.5, o teste será executado no "modo de compatibilidade" do CLR 4.0.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Execução de teste em andamento</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Total de testes: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Com falha: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Aprovados: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Ignorados: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">O argumento {0} é inválido. Use a opção /help para verificar a lista de argumentos válidos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">{0} arquivos de teste no total corresponderam ao padrão especificado.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">O argumento do parâmetro de execução de teste '{0}' é inválido. Use o formato abaixo.
+     Formato: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">A coleta de despejos de trava pela opção CollectDump com TestTimeout para Blame não é tem suporte para esta plataforma.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} – Com falha: {1}, Aprovado: {2}, Ignorado: {3}, Total: {4}, Duração: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Nenhum</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Define o valor de uma variável de ambiente. Cria a variável caso ela não exista e substitui caso exista. Isso implicará a opção /InIsolation e forçará a execução dos testes em um processo isolado.
+      
+      Esse argumento pode ser especificado várias vezes para fornecer várias variáveis.
+
+      Exemplo: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperado com;ponto e vírgula"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">A variável de ambiente '{0}' já foi definida, mas foi substituída por um argumento -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Execução de Teste Abortada com Erro {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">TestSessionCorrelationId inválida</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Isto afeta o comportamento de carregamento do adaptador.
+
+      Comportamentos suportados atualmente:
+        - Explicito: Plataforma de Teste somente carregará adaptadores especificados por /TestAdapterPath (ou RunConfiguration.TestAdaptersPaths node).
+                    Se um caminho específico do adaptador for fornecido, o adaptador será carregado; se um caminho de diretório for fornecido adaptadores diretamente naquela pasta será carregado, a menos que a opção Recursive também seja especificada.
+                    Se nenhum caminho de adaptador for especificado, a execução do teste falhará.
+                    Isto implicará /InIsolation switch e forçará os testes a serem executados em um processo isolado.
+        
+        - Padrão: Plataforma de teste carregará adaptadores é se este argumento não tiver sido especificado.
+                   Ela captará extensões ao lado da fonte, desde que os caminhos do adaptador adicionais e a partir do diretório padrão.
+
+        - DefaultRuntimeProviders: Carregar os provedores de tempo de execução padrão enviados com a Plataforma de Teste. 
+                                   Se isto não for especificado quando a opção "Explicit" estiver definida, um provedor de host de teste precisa ser especificado explicitamente.
+
+        - ExtensionsDirectory: Carregar adaptadores dentro da pasta Extensões.
+
+        - NextToSource: Adaptadores de carga ao lado da fonte. 
+
+        - Recursivo: Buscar recursivamente as pastas ao carregar adaptadores. Isto requer que "Explicit" ou "NextToSource" seja especificado também.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">O valor especificado ({0}) para /TestAdapterLoadingStrategy é inválido!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">A estratégia de carregamento do adaptador recursivo não pode ser usada por si só. Combine com um ou mais de: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">O parâmetro /TestAdapterPath precisa ser fornecido quando a "{0}" estratégia de carregamento do adaptador de teste for especificada!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe está sendo executado no modo emulado como {0}. Para obter um melhor desempenho, considere usar o executor nativo vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">A espera pela conexão do manipulador de solicitação expirou após {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Aguardando o início da sessão de teste expirou após {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">A espera da sessão de teste de parada expirou após {0} segundos.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Erro ao hospedar o canal de comunicação.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">DocumentDirectoryPath deve ser especificado para instalar ou desinstalar o depurador post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">O depurador postmortem não é compatível com o sistema operacional atual.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">O diretório especificado para o executável procdump não é válido e a ferramenta não foi encontrada dentro das variáveis de ambiente (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Nome do arquivo procdump não encontrado: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">DumpDirectoryPath deve ser especificado para instalar o depurador post mortem.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">O diretório especificado não é válido: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">O argumento do AeDebugger '{0}' não é válido.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">O comando dotnet vstest foi substituído pelo dotnet test, que agora pode ser usado para executar assemblies. Confira https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf
index 0fd2965937..5f72259ef6 100644
--- a/src/vstest.console/Resources/xlf/Resources.ru.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.ru.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">"{0}": не найдено.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Доступны следующие надстройки обнаружения тестов:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Доступны следующие надстройки выполнения тестов:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Доступны следующие надстройки средства ведения журнала тестирования:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Ошибка: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">Параметр "{0}" должен быть указан только один раз.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">При создании экземпляра расширения "{0}" возникло исключение: {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Доступны следующие тесты:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">Нераспознанный параметр "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Указанный исходный файл теста "{0}" не найден.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Сведения: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Предупреждение: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Отображение этого сообщения об использовании.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">(с) Корпорация Майкрософт (Microsoft Corporation). Все права защищены.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Программа Microsoft (R) Test Execution Command Line Tool версии {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;URI/понятное_имя_средства_ведения_журнала&gt;
-      Укажите средство ведения журнала результатов тестирования.  Например, чтобы сохранять результаты в файле
-      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=&lt;по умолчанию уникальное имя файла&gt;]
-      Создает файл в каталоге TestResults с заданным именем LogFileName.
-
-      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом
-      Пример: /logger:console;verbosity=&lt;по умолчанию "normal"&gt;
-      Допустимые значения для verbosity: quiet, minimal, normal и detailed.
-
-      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом
-      Пример: /logger:console;prefix=&lt;по умолчанию "false"&gt;
-      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Описание: выполняет тесты из указанных файлов.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Параметры:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Использование: vstest.console.exe [аргументы] [параметры] [[--] &lt;аргументы RunSettings&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Исходные файлы тестов не указаны.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Аргументы не указаны.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Выполняйте тесты из указанных файлов или шаблона с подстановочными знаками. Разделяйте несколько шаблонов или имен тестовых файлов
-      пробелами. Задайте высокий уровень детализации для средства ведения журнала консоли, чтобы просмотреть соответствующие тестовые файлы.
-      Примеры: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Доступны следующие надстройки поставщиков параметров:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;файл параметров&gt;
-       Параметры, используемые при запуске тестов.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">Для параметра /Settings требуется указать файл параметров.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">Не удалось найти файл параметров "{0}".</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Сбой тестового запуска.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Тестовый запуск выполнен.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">Аргумент {0} не ожидается в команде InIsolation. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /InIsolation) и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">Для параметра /UseVsixExtensions требуется значение. Если задано значение true, установленные расширения VSIX (при наличии) будут использоваться в тестовом запуске. Если задано значение false, то они будут игнорироваться. Пример: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">Аргумент {0} не ожидается в команде UseVsixExtensions. Укажите команду, определяющую, требуется ли использовать или игнорировать расширения VSIX (например, vstest.console.exe myTests.dll /UseVsixExtensions:true), и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Запуск тестов в изолированном процессе. Это снижает вероятность
-      остановки процесса vstest.console.exe из-за ошибки в тестах, но
-      тесты могут выполняться медленнее.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Определяет использование или пропуск процессом vstest.console.exe
-      установленных расширений VSIX (при наличии) в тестовом запуске. 
-      Пример: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Для аргумента /BatchSize требуется указать размер пакета. Пример: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">Недопустимый размер пакета {0}. Размер пакета должен быть больше нуля. Пример: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Запуск тестов:
-    &gt;vstest.console.exe tests.dll 
-  Запуск тестов с дополнительными параметрами, например со сборщиками данных:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Список установленных средств обнаружения тестов.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Список установленных исполнителей тестов.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Список установленных средств ведения журналов тестирования.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Список установленных поставщиков параметров тестирования.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;имя_файла&gt;
-      Перечисление всех обнаруженных тестов из указанного контейнера тестов.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Прошло времени:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">Для аргумента /Tests требуется указать один или несколько конкретных имен тестов или их подстрок.
-       Примеры: /Tests:TestsMethod1, /Tests:TestMethod1, method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Всего обнаружено тестов: {0}, но тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;имена_тестов&gt;
-      Запуск тестов с именами, соответствующими указанным значениям.
-      Несколько значений разделяются запятыми.
-      Примеры: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Используется режим изоляции для запуска тестов, так как в файле параметров запуска RUNSETTINGS включены адаптеры диагностических данных. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Использование режима изоляции для запуска модульных тестов приложений для Магазина Windows. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений для Магазина Windows. Удалите параметры адаптеров диагностических данных из параметров.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        Понятное имя: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        Имя параметра: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Поддерживаемые типы файлов:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI исполнителя по умолчанию: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Неверный тип платформы: {0}. Допустимые типы платформ: {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">Для аргумента /Platform требуется указать тип целевой платформы для тестового запуска. Пример: /Platform:x 86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;тип_платформы&gt;
-      Архитектура целевой платформы, в которой будут выполняться тесты. 
-      Допустимые значения: x86, x64 и ARM.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Для запуска тестов используется изолированный режим в соответствии с параметрами Platform:{0} и .Net Framework:{1} для тестового запуска. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;версия платформы&gt;
-      Целевая версия платформы .NET Framework, используемая для выполнения тестов. 
-      Допустимые значения: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" и т. п.
-      Другие поддерживаемые значения: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">Аргумент /Framework требует указать целевую версию .NET Framework для тестового запуска. Пример: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Недопустимая версия .NET Framework: {0}. Укажите полное имя целевой платформы (например: .NETCoreApp,Version=v2.0). Другие поддерживаемые версии .NET Framework: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Не удалось запустить тестовый запуск для модульных тестов приложений для Магазина Windows: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;выражение&gt;
-      Запуск тестов, соответствующих заданному выражению.
-      &lt;выражение&gt; имеет формат &lt;свойство&gt;оператор&lt;значение&gt;[|&amp;&lt;выражение&gt;]
-         где в качестве оператора может использоваться =, != или ~  (оператор ~ имеет семантику
-         "содержит" и применим к строковым свойствам, таким как DisplayName).
-         Вложенные выражения можно группировать с помощью скобок ().
-      Примеры: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">Для аргумента /TestCaseFilter необходимо указать значение фильтра.
-        Значение фильтра можно задать в формате &lt;свойство&gt;=&lt;значение&gt;.
-        Пример: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">Аргумент /TestCaseFilter нельзя указывать при использовании аргумента /Tests. Если указываются тесты, фильтрация тестовых случаев не применяется.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">Сборка {0} выполняется для {1}/{2}. Заданные в запуске тестовые сборки должны иметь одинаковые значения целевой среды .NET Framework и платформы.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Для выполнения тестов можно указать только один пакет приложения (APPX-файл).</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Запуск обнаружения тестов; подождите...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Запуск выполнения тестов; подождите...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">При чтении параметров адаптера диагностических данных возникло выполнение "{0}". Все адаптеры диагностических данных будут пропущены в этом запуске.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Включает сборщик данных "CodeCoverage" для тестового запуска.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">Аргумент {0} не ожидается в команде EnableCodeCoverage. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /EnableCodeCoverage) и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений для Магазина Windows создайте пакет приложения с помощью проекта библиотеки модульных тестов приложений для Магазина Windows.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Покрытие кода недоступно для приложений для Магазина Windows. Анализ покрытия кода пропущен для этого тестового запуска.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Всего обнаружено тестов: {0}, но некоторые тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Процесс vstest.console.exe будет использовать пользовательские адаптеры тестов
-      по заданному пути (при наличии) в тестовом запуске. 
-      Пример: /TestAdapterPath:&lt;путь_к_пользовательским_адаптерам_тестов&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">Для параметра /TestAdapterPath требуется значение, представляющее собой путь к расположению с пользовательскими адаптерами тестов. Пример: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">Путь {0}, заданный в параметре TestAdapterPath, недопустим. Ошибка: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Указанный путь поиска пользовательского адаптера теста не найден. Укажите допустимый путь и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Путь "{0}", заданный в параметре TestAdapterPath, не содержит адаптеров тестов. Укажите допустимый путь и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Не удалось запустить тестовый запуск для тестов приложений Windows Phone: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Использование режима изоляции для запуска модульных тестов приложений Windows Phone. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Покрытие кода недоступно для приложений Windows Phone. Анализ покрытия кода пропущен для этого тестового запуска.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений Windows Phone. Удалите параметры адаптеров диагностических данных из параметров.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений Windows Phone создайте пакет приложения с помощью проекта приложения модульного тестирования Windows Phone.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Использование платформы {0} для запуска тестов. Укажите /Framework:{1}, чтобы отключить это предупреждение.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">В указанных контейнерах тестов тесты не найдены. Кроме того, адаптер модульных тестов для Магазина Windows (Майкрософт) не поддерживает APPXBUNDLE-файлы. Создайте APPX-файл (установите значение "Никогда" для параметра "Создать набор приложений") при создании пакета приложения и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Указывает, что тесты должны выполняться параллельно. По умолчанию
-      можно использовать любое имеющееся число ядер на компьютере.
-      Число используемых ядер можно настроить с помощью файла параметров.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">Аргумент {0} не ожидается в команде Parallel. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /Parallel) и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Неопределенное или отсутствующее значение недопустимо.</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;порт&gt;
-      Порт для подключения через сокет и получения сообщений о событиях.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">Для аргумента --Port|/Port требуется указать номер порта, который должен быть целым числом. Укажите порт для подключения через сокет и получения событий сообщений.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Не удается найти тестируемую сборку. Убедитесь, что проект создан.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">Путь {0} не существует.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;базовый путь к сборке&gt;
-      Каталог, содержащий временные выходные данные.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;конфигурация&gt;
-      Конфигурация, для которой создан проект, например Debug/Release</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">Данная конфигурация недопустима.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;вывод&gt;
-      Каталог, содержащий двоичные файлы для запуска.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Базовый путь к сборке не найден, укажите допустимый путь и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Выходной путь не найден, укажите допустимый путь и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Дополнительные информационные сообщения:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Дни</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Сообщение об ошибке:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Общее время: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Часы</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">Не удалось найти средство ведения журнала тестирования с URI или понятным именем "{0}".</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Минуты</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Секунды</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Трассировка стека:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Стандартные сообщения об ошибке:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Стандартные выходные сообщения:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Вложения:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">В {0} нет доступных тестов. Проверьте правильность параметров установленного средства обнаружения и выполнения тестов, а также платформы и версии платформы, и повторите попытку.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Не пройден</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Пройден</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Пропущен</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Не удалось выполнить обнаружение для заданных источников. Исключение: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ИД_родительского_процесса&gt;
-      Идентификатор родительского процесса, отвечающего за запуск текущего процесса.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">Для аргумента --ParentProcessId|/ParentProcessId требуется указать ИД процесса, который должен быть целым числом. Укажите идентификатор родительского процесса, ответственного за запуск текущего процесса.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Аргументы:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;путь к файлу журнала&gt;
-      Включение журналов для платформы тестирования.
-      Журналы записываются в предоставленный файл.
-
-      Уровень трассировки для журналов можно изменить описанным ниже способом
-      Пример: /Diag:&lt;путь к файлу журнала&gt;;tracelevel=&lt;по умолчанию "verbose"&gt;
-      Разрешенные значения для tracelevel: off, error, warning, info и verbose.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Указанный файл {0} доступен только для чтения.</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Время ожидания установления подключения или обработки запроса для DesignModeClient на порту {0} истекло.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Не выполнен</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">Аргументы RunSettings:
-      Аргументы для передачи конфигураций runsettings через командную строку. Аргументы могут быть указаны как пара "имя-значение" в формате [имя]=[значение] после "-- ". Обратите внимание на пробел после --. 
-      Используйте пробел для разделения нескольких пар [имя]=[значение].
-      Дополнительные сведения о поддержке аргументов RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Один или несколько файлов RUNSETTINGS включают в себя недопустимый токен</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      По указанному пути будет создан каталог результатов тестов, если он еще не существует.
-      Пример: /ResultsDirectory:&lt;путь_к_каталогу_результатов&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">Для параметра /ResultsDirectory требуется значение, в котором сохраняются результаты тестирования. Пример:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">Путь "{0}", указанный в "ResultsDirectory", недопустим. Ошибка: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">Флаг /InIsolation использовать не рекомендуется. Тесты всегда запускаются в отдельном процессе</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Ведение журналов диагностики Vstest в файле: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;понятное имя сборщика данных&gt;
-      Включает сборщик данных для тестового запуска. Подробнее: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Понятное имя сборщика данных "{0}" недопустимо. Сборщик данных будет пропущен.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Сообщения трассировок отладки:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[значение];[DumpType]=[значение]
-      Выполняет тест в blame-режиме. Этот вариант помогает изолировать проблемный тест, вызывающий сбой хоста для тестов.
-      В текущем каталоге создается выходной файл "Sequence.xml",
-      который записывает порядок выполнения теста перед сбоем.
-      При необходимости вы можете выполнить сбор дампа процессов хоста для тестов.
-      В этом случае по умолчанию при сбое будет собран мини-дамп.
-      Вы также можете переопределить поведение по умолчанию с помощью дополнительных параметров:
-      CollectAlways — собирает дамп по завершении даже при отсутствии сбоев (true/false) 
-      DumpType — задает тип дампа, mini (мини-дамп) или full (полный).
-      Пример: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Тестовый запуск прерван.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Тестовый запуск отменен.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">Произошла ошибка при открытии файла ответа "{0}"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;файл&gt;
-      Считывание файла ответов с дополнительными параметрами.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Всего тестов: неизвестно</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Кроме того, путь к адаптерам тестов можно указать с помощью команды /TestAdapterPath. Пример:  /TestAdapterPath:&lt;путь_к_настраиваемым_адаптерам&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">Параметр /UseVsixExtensions устарел. Используйте /TestAdapterPath.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Пример: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect:"{0}" не поддерживается, если тестовый запуск настроен с использованием testsettings.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Сборщики данных, настроенные в параметрах запуска, кроме покрытия кода и Microsoft Fakes, не поддерживаются со встроенными параметрами тестирования. Дополнительные сведения: https://aka.ms/vstest-configure-datacollector. Параметры запуска: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;URI/понятное_имя_средства_ведения_журнала&gt;
-      Укажите средство ведения журнала результатов тестирования.  Например, чтобы сохранять результаты в файле
-      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=&lt;по умолчанию уникальное имя файла&gt;]
-      Создает файл в каталоге TestResults с заданным именем LogFileName.
-
-      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом
-      Пример: /logger:console;verbosity=&lt;по умолчанию "minimal"&gt;
-      Допустимые значения для verbosity: quiet, minimal, normal и detailed.
-
-      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом
-      Пример: /logger:console;prefix=&lt;по умолчанию "false"&gt;
-      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Сбор аварийных дампов с помощью параметра CollectDump для Blame не поддерживается для этой платформы.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Указанный с Blame параметр {0} недопустим. Он будет пропущен.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Путь к файлу диагностики "{0}" недопустим.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Аргумент Blame "{0}" недопустим.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Аргумент диагностики "{0}" недопустим.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Аргумент средства ведения журнала "{0}" недопустим.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 не поддерживается. Для проектов, предназначенных для .NET Framework 3.5, тест будет выполняться в среде CLR 4.0 в "режиме совместимости".</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Выполняется тестовый запуск</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Всего тестов: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Не пройдено: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Пройдено: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Пропущено: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">Аргумент {0} недопустим. Используйте параметр /help, чтобы просмотреть список допустимых аргументов.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Общее количество тестовых файлов ({0}), соответствующих указанному шаблону.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">Недопустимый аргумент "{0}" для параметра тестового запуска. Используйте указанный ниже формат.
-     Формат: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Сбор дампов зависаний с помощью параметра CollectDump с TestTimeout для Blame не поддерживается для этой платформы.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0}: не пройдено {1}, пройдено {2}, пропущено {3}, всего {4}, длительность {5}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Нет</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Устанавливает значение переменной среды. Если переменной среды не существует, она создается. Если переменная среды существует, она переопределяется. Этот параметр подразумевает использование параметра /InIsolation и принудительно выполняет тесты в изолированном процессе.
-      
-      Этот аргумент может быть указан несколько раз для нескольких переменных среды.
-
-      Пример: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">Переменная среды "{0}" уже определена, но переопределена аргументом -Environment.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Тестовый запуск прерван с ошибкой {0}.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="ru">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">"{0}": не найдено.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Доступны следующие надстройки обнаружения тестов:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Доступны следующие надстройки выполнения тестов:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Доступны следующие надстройки средства ведения журнала тестирования:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Ошибка: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">Параметр "{0}" должен быть указан только один раз.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">При создании экземпляра расширения "{0}" возникло исключение: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Доступны следующие тесты:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">Нераспознанный параметр "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Указанный исходный файл теста "{0}" не найден.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">URI средства ведения журнала тестирования "{0}" недопустимо. Это средство ведения журнала тестирования будет игнорироваться.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Сведения: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Предупреждение: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Отображение этого сообщения об использовании.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">Версия VSTest {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/понятное_имя_средства_ведения_журнала&gt;
+      Укажите средство ведения журнала результатов тестирования. Например, чтобы сохранять результаты в файле
+      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=&lt;по умолчанию уникальное имя файла&gt;]
+      Создает файл в каталоге TestResults с заданным именем LogFileName.
+
+      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом
+      Пример: /logger:console;verbosity=&lt;по умолчанию "normal"&gt;
+      Допустимые значения для verbosity: quiet, minimal, normal и detailed.
+
+      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом
+      Пример: /logger:console;prefix=&lt;по умолчанию "false"&gt;
+      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Описание: выполняет тесты из указанных файлов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Параметры:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Использование: vstest.console.exe [аргументы] [параметры] [[--] &lt;аргументы RunSettings&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Исходные файлы тестов не указаны.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Аргументы не указаны.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Выполняйте тесты из указанных файлов или шаблона с подстановочными знаками. Разделяйте несколько шаблонов или имен тестовых файлов
+      пробелами. Задайте высокий уровень детализации для средства ведения журнала консоли, чтобы просмотреть соответствующие тестовые файлы.
+      Примеры: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Доступны следующие надстройки поставщиков параметров:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;файл параметров&gt;
+       Параметры, используемые при запуске тестов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">Для параметра /Settings требуется указать файл параметров.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">Не удалось найти файл параметров "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Сбой тестового запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Тестовый запуск выполнен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">Аргумент {0} не ожидается в команде InIsolation. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /InIsolation) и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">Для параметра /UseVsixExtensions требуется значение. Если задано значение true, установленные расширения VSIX (при наличии) будут использоваться в тестовом запуске. Если задано значение false, то они будут игнорироваться. Пример: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">Аргумент {0} не ожидается в команде UseVsixExtensions. Укажите команду, определяющую, требуется ли использовать или игнорировать расширения VSIX (например, vstest.console.exe myTests.dll /UseVsixExtensions:true), и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Запуск тестов в изолированном процессе. Это снижает вероятность
+      остановки процесса vstest.console.exe из-за ошибки в тестах, но
+      тесты могут выполняться медленнее.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Определяет использование или пропуск процессом vstest.console.exe
+      установленных расширений VSIX (при наличии) в тестовом запуске. 
+      Пример: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">Для аргумента /BatchSize требуется указать размер пакета. Пример: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">Недопустимый размер пакета {0}. Размер пакета должен быть больше нуля. Пример: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Запуск тестов:
+    &gt;vstest.console.exe tests.dll 
+  Запуск тестов с дополнительными параметрами, например со сборщиками данных:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Список установленных средств обнаружения тестов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Список установленных исполнителей тестов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Список установленных средств ведения журналов тестирования.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Список установленных поставщиков параметров тестирования.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;имя_файла&gt;
+      Перечисление всех обнаруженных тестов из указанного контейнера тестов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Прошло времени:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">Для аргумента /Tests требуется указать один или несколько конкретных имен тестов или их подстрок.
+       Примеры: /Tests:TestsMethod1, /Tests:TestMethod1, method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Всего обнаружено тестов: {0}, но тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;имена_тестов&gt;
+      Запуск тестов с именами, соответствующими указанным значениям.
+      Несколько значений разделяются запятыми.
+      Примеры: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Используется режим изоляции для запуска тестов, так как в файле параметров запуска RUNSETTINGS включены адаптеры диагностических данных. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Использование режима изоляции для запуска модульных тестов приложений для Магазина Windows. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений для Магазина Windows. Удалите параметры адаптеров диагностических данных из параметров.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        Понятное имя: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        Имя параметра: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Поддерживаемые типы файлов:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        URI исполнителя по умолчанию: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Неверный тип платформы: {0}. Допустимые типы платформ: {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">Для аргумента /Platform требуется указать тип целевой платформы для тестового запуска. Пример: /Platform:x 86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;тип_платформы&gt;
+      Архитектура целевой платформы, в которой будут выполняться тесты. 
+      Допустимые значения: x86, x64 и ARM.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Для запуска тестов используется изолированный режим в соответствии с параметрами Platform:{0} и .Net Framework:{1} для тестового запуска. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;версия платформы&gt;
+      Целевая версия платформы .NET Framework, используемая для выполнения тестов. 
+      Допустимые значения: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" и т. п.
+      Другие поддерживаемые значения: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">Аргумент /Framework требует указать целевую версию .NET Framework для тестового запуска. Пример: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Недопустимая версия .NET Framework: {0}. Укажите полное имя целевой платформы (например: .NETCoreApp,Version=v2.0). Другие поддерживаемые версии .NET Framework: Framework40, Framework45, FrameworkCore10 и FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Не удалось запустить тестовый запуск для модульных тестов приложений для Магазина Windows: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;выражение&gt;
+      Запуск тестов, соответствующих заданному выражению.
+      &lt;выражение&gt; имеет формат &lt;свойство&gt;оператор&lt;значение&gt;[|&amp;&lt;выражение&gt;]
+         где в качестве оператора может использоваться =, != или ~  (оператор ~ имеет семантику
+         "содержит" и применим к строковым свойствам, таким как DisplayName).
+         Вложенные выражения можно группировать с помощью скобок ().
+      Примеры: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">Для аргумента /TestCaseFilter необходимо указать значение фильтра.
+        Значение фильтра можно задать в формате &lt;свойство&gt;=&lt;значение&gt;.
+        Пример: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">Аргумент /TestCaseFilter нельзя указывать при использовании аргумента /Tests. Если указываются тесты, фильтрация тестовых случаев не применяется.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">Сборка {0} выполняется для {1}/{2}. Заданные в запуске тестовые сборки должны иметь одинаковые значения целевой среды .NET Framework и платформы.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Для выполнения тестов можно указать только один пакет приложения (APPX-файл).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Запуск обнаружения тестов; подождите...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Запуск выполнения тестов; подождите...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">При чтении параметров адаптера диагностических данных возникло выполнение "{0}". Все адаптеры диагностических данных будут пропущены в этом запуске.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Включает сборщик данных "CodeCoverage" для тестового запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">Аргумент {0} не ожидается в команде EnableCodeCoverage. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /EnableCodeCoverage) и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений для Магазина Windows создайте пакет приложения с помощью проекта библиотеки модульных тестов приложений для Магазина Windows.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Покрытие кода недоступно для приложений для Магазина Windows. Анализ покрытия кода пропущен для этого тестового запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Всего обнаружено тестов: {0}, но некоторые тесты не соответствуют указанному условию выбора ({1}). Задайте правильные значения и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Процесс vstest.console.exe будет использовать пользовательские адаптеры тестов
+      по заданному пути (при наличии) в тестовом запуске. 
+      Пример: /TestAdapterPath:&lt;путь_к_пользовательским_адаптерам_тестов&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">Для параметра /TestAdapterPath требуется значение, представляющее собой путь к расположению с пользовательскими адаптерами тестов. Пример: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">Путь {0}, заданный в параметре TestAdapterPath, недопустим. Ошибка: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Указанный путь поиска пользовательского адаптера теста не найден. Укажите допустимый путь и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">Путь "{0}", заданный в параметре TestAdapterPath, не содержит адаптеров тестов. Укажите допустимый путь и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Не удалось запустить тестовый запуск для тестов приложений Windows Phone: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Использование режима изоляции для запуска модульных тестов приложений Windows Phone. Используйте параметр /InIsolation, чтобы отключить это предупреждение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Покрытие кода недоступно для приложений Windows Phone. Анализ покрытия кода пропущен для этого тестового запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Адаптеры диагностических данных не поддерживаются при запуске модульных тестов для приложений Windows Phone. Удалите параметры адаптеров диагностических данных из параметров.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">У пакета приложения "{0}" нет точки входа исполнителя тестов. Для запуска модульных тестов приложений Windows Phone создайте пакет приложения с помощью проекта приложения модульного тестирования Windows Phone.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Использование платформы {0} для запуска тестов. Укажите /Framework:{1}, чтобы отключить это предупреждение.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">В указанных контейнерах тестов тесты не найдены. Кроме того, адаптер модульных тестов для Магазина Windows (Майкрософт) не поддерживает APPXBUNDLE-файлы. Создайте APPX-файл (установите значение "Никогда" для параметра "Создать набор приложений") при создании пакета приложения и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Указывает, что тесты должны выполняться параллельно. По умолчанию
+      можно использовать любое имеющееся число ядер на компьютере.
+      Число используемых ядер можно настроить с помощью файла параметров.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">Аргумент {0} не ожидается в команде Parallel. Укажите команду без аргумента (например, vstest.console.exe myTests.dll /Parallel) и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Неопределенное или отсутствующее значение недопустимо.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;порт&gt;
+      Порт для подключения через сокет и получения сообщений о событиях.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">Для аргумента --Port|/Port требуется указать номер порта, который должен быть целым числом. Укажите порт для подключения через сокет и получения событий сообщений.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Не удается найти тестируемую сборку. Убедитесь, что проект создан.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">Путь {0} не существует.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;базовый путь к сборке&gt;
+      Каталог, содержащий временные выходные данные.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;конфигурация&gt;
+      Конфигурация, для которой создан проект, например Debug/Release</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">Данная конфигурация недопустима.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;вывод&gt;
+      Каталог, содержащий двоичные файлы для запуска.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">Базовый путь к сборке не найден, укажите допустимый путь и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Выходной путь не найден, укажите допустимый путь и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Дополнительные информационные сообщения:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Дни</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Сообщение об ошибке:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Общее время: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Часы</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">Не удалось найти средство ведения журнала тестирования с URI или понятным именем "{0}".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Минуты</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Секунды</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Трассировка стека:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Стандартные сообщения об ошибке:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Стандартные выходные сообщения:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Вложения:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">В {0} нет доступных тестов. Проверьте правильность параметров установленного средства обнаружения и выполнения тестов, а также платформы и версии платформы, и повторите попытку.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Не пройден</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Пройден</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Пропущен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Не удалось выполнить обнаружение для заданных источников. Исключение: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ИД_родительского_процесса&gt;
+      Идентификатор родительского процесса, отвечающего за запуск текущего процесса.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">Для аргумента --ParentProcessId|/ParentProcessId требуется указать ИД процесса, который должен быть целым числом. Укажите идентификатор родительского процесса, ответственного за запуск текущего процесса.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Аргументы:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;путь к файлу журнала&gt;
+      Включение журналов для платформы тестирования.
+      Журналы записываются в предоставленный файл.
+
+      Уровень трассировки для журналов можно изменить описанным ниже способом
+      Пример: /Diag:&lt;путь к файлу журнала&gt;;tracelevel=&lt;по умолчанию "verbose"&gt;
+      Разрешенные значения для tracelevel: off, error, warning, info и verbose.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Указанный файл {0} доступен только для чтения.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Время ожидания установления подключения или обработки запроса для DesignModeClient на порту {0} истекло.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Не выполнен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">Аргументы RunSettings:
+      Аргументы для передачи конфигураций runsettings через командную строку. Аргументы могут быть указаны как пара "имя-значение" в формате [имя]=[значение] после "-- ". Обратите внимание на пробел после --. 
+      Используйте пробел для разделения нескольких пар [имя]=[значение].
+      Дополнительные сведения о поддержке аргументов RunSettings: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Один или несколько файлов RUNSETTINGS включают в себя недопустимый токен</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      По указанному пути будет создан каталог результатов тестов, если он еще не существует.
+      Пример: /ResultsDirectory:&lt;путь_к_каталогу_результатов&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">Для параметра /ResultsDirectory требуется значение, в котором сохраняются результаты тестирования. Пример:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">Путь "{0}", указанный в "ResultsDirectory", недопустим. Ошибка: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">Флаг /InIsolation использовать не рекомендуется. Тесты всегда запускаются в отдельном процессе</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Ведение журналов диагностики Vstest в файле: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;понятное имя сборщика данных&gt;
+      Включает сборщик данных для тестового запуска. Подробнее: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Понятное имя сборщика данных "{0}" недопустимо. Сборщик данных будет пропущен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Сообщения трассировок отладки:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[значение];[DumpType]=[значение]
+      Выполняет тест в blame-режиме. Этот вариант помогает изолировать проблемный тест, вызывающий сбой хоста для тестов.
+      В текущем каталоге создается выходной файл "Sequence.xml",
+      который записывает порядок выполнения теста перед сбоем.
+      При необходимости вы можете выполнить сбор дампа процессов хоста для тестов.
+      В этом случае по умолчанию при сбое будет собран мини-дамп.
+      Вы также можете переопределить поведение по умолчанию с помощью дополнительных параметров:
+      CollectAlways — собирает дамп по завершении даже при отсутствии сбоев (true/false) 
+      DumpType — задает тип дампа, mini (мини-дамп) или full (полный).
+      Пример: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Тестовый запуск прерван.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Тестовый запуск отменен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">Произошла ошибка при открытии файла ответа "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;файл&gt;
+      Считывание файла ответов с дополнительными параметрами.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Всего тестов: неизвестно</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Кроме того, путь к адаптерам тестов можно указать с помощью команды /TestAdapterPath. Пример:  /TestAdapterPath:&lt;путь_к_настраиваемым_адаптерам&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">Параметр /UseVsixExtensions устарел. Используйте /TestAdapterPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Пример: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect:"{0}" не поддерживается, если тестовый запуск настроен с использованием testsettings.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Сборщики данных, настроенные в параметрах запуска, кроме покрытия кода и Microsoft Fakes, не поддерживаются со встроенными параметрами тестирования. Дополнительные сведения: https://aka.ms/vstest-configure-datacollector. Параметры запуска: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;URI/понятное_имя_средства_ведения_журнала&gt;
+      Укажите средство ведения журнала результатов тестирования. Например, чтобы сохранять результаты в файле
+      результатов тестов Visual Studio (TRX), укажите /logger:trx[;LogFileName=&lt;по умолчанию уникальное имя файла&gt;]
+      Создает файл в каталоге TestResults с заданным именем LogFileName.
+
+      Изменить уровень детализации сообщений журнала для средства ведения журнала консоли можно описанным ниже способом
+      Пример: /logger:console;verbosity=&lt;по умолчанию "minimal"&gt;
+      Допустимые значения для verbosity: quiet, minimal, normal и detailed.
+
+      Изменить префикс уровня диагностики для средства ведения журнала консоли можно описанным ниже способом
+      Пример: /logger:console;prefix=&lt;по умолчанию "false"&gt;
+      Подробнее о средстве ведения журнала консоли: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Сбор аварийных дампов с помощью параметра CollectDump для Blame не поддерживается для этой платформы.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Указанный с Blame параметр {0} недопустим. Он будет пропущен.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Путь к файлу диагностики "{0}" недопустим.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Аргумент Blame "{0}" недопустим.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Аргумент диагностики "{0}" недопустим.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Аргумент средства ведения журнала "{0}" недопустим.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 не поддерживается. Для проектов, предназначенных для .NET Framework 3.5, тест будет выполняться в среде CLR 4.0 в "режиме совместимости".</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Выполняется тестовый запуск</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Всего тестов: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Не пройдено: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Пройдено: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Пропущено: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">Аргумент {0} недопустим. Используйте параметр /help, чтобы просмотреть список допустимых аргументов.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Общее количество тестовых файлов ({0}), соответствующих указанному шаблону.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">Недопустимый аргумент "{0}" для параметра тестового запуска. Используйте указанный ниже формат.
+     Формат: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Сбор дампов зависаний с помощью параметра CollectDump с TestTimeout для Blame не поддерживается для этой платформы.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0}: не пройдено {1}, пройдено {2}, пропущено {3}, всего {4}, длительность {5}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Нет</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Устанавливает значение переменной среды. Если переменной среды не существует, она создается. Если переменная среды существует, она переопределяется. Этот параметр подразумевает использование параметра /InIsolation и принудительно выполняет тесты в изолированном процессе.
+      
+      Этот аргумент может быть указан несколько раз для нескольких переменных среды.
+
+      Пример: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">Переменная среды "{0}" уже определена, но переопределена аргументом -Environment.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Тестовый запуск прерван с ошибкой {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">Недопустимый testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Это влияет на действия адаптера при загрузке.
+
+      Действия, поддерживаемые в настоящее время:
+        – Explicit: платформа тестирования будет загружать только адаптеры, указанные в параметре /TestAdapterPath (или узле RunConfiguration.TestAdaptersPaths). 
+                    Если указан конкретный путь к адаптеру, адаптер будет загружен. Если указан путь к каталогу, будут загружены адаптеры непосредственно из этой папки в случае, когда не указан параметр Recursive.
+                    Если путь к адаптеру не указан, тестовый запуск завершится ошибкой.
+                    Это подразумевает переключение /InIsolation и принудительное выполнение тестов в изолированном процессе.
+        
+        – Default: платформа тестирования будет загружать адаптеры, если этот аргумент не указан. 
+                   Платформа будет выбирать расширения недалеко от источника, при условии наличия дополнительных путей к адаптеру, а также из каталога по умолчанию.
+
+        – DefaultRuntimeProviders: загрузка поставщиков среды выполнения по умолчанию, поставляемых с платформой тестирования. 
+                                   Если это не указано, когда задан параметр "Explicit", поставщик узла тестирования должен быть указан явно.
+
+        – ExtensionsDirectory: загружать адаптеры в папку "Расширения". 
+
+        – NextToSource: загружать параметры рядом с источником. 
+
+        – Recursive: рекурсивный поиск папок при загрузке адаптеров. Для этого также необходимо указать параметры "Explicit" или "NextToSource".</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">Указанное значение ({0}) для /TestAdapterLoadingStrategy недопустимо!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Стратегия загрузки адаптера Recursive не может использоваться самостоятельно. Объедините ее с одним или несколькими из: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Необходимо указать параметр /TestAdapterPath, если указана стратегия загрузки адаптера "{0}"!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe выполняется в режиме эмуляции как {0}. Для повышения производительности рекомендуется использовать собственное средство выполнения тестов vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">Время ожидания подключения обработчика запросов истекло через {0} с.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Время ожидания начала тестового сеанса истекло через {0} с.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Время ожидания остановки тестового сеанса истекло через {0} с.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">Ошибка при размещении коммуникационного канала.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">Для установки или удаления отладчика с разбором итогов необходимо указать ProcDumpToolDirectoryPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Отладчик с разбором итогов не поддерживается в текущей ОС.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Каталог, указанный для исполняемого файла procdump, недействителен, а инструмент не найден в переменных среды (PROCDUMP_PATH, PATH).</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Не найдено имя файла procdump: "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">Для установки отладчика с разбором итогов необходимо указать DumpDirectoryPath.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Указан недопустимый каталог: "{0}"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">Аргумент AeDebugger "{0}" недопустим.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">Команда dotnet vstest заменяется на dotnet test, которую теперь можно использовать для выполнения сборок. Сведения: https://aka.ms/dotnet-test.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf
index ecc7dfdba6..e208e5cb75 100644
--- a/src/vstest.console/Resources/xlf/Resources.tr.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.tr.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">'{0}' bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Şu Test Bulma Eklentileri kullanılabilir:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Şu Test Yürütmesi eklentileri kullanılabilir:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Şu Test Günlükçüsü Eklentileri kullanılabilir:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">Hata: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">, {0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">"{0}" parametresi yalnızca bir kez belirtilmelidir.</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">'{0}' uzantısının örneği oluşturulurken özel durum oluştu: {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">Şu Testler kullanılabilir:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">"{0}" parametresi tanınmıyor.</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">Belirtilen "{0}" test kaynak dosyası bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">Bilgi: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">Uyarı: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      Bu kullanım iletisini görüntüler.</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Telif Hakkı (c) Microsoft Corporation. Tüm hakları saklıdır.</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Test Yürütmesi Komut Satırı Aracı Sürüm {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;Günlükçü URI/FriendlyName&gt;
-      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir 
-      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=&lt;Varsayılan olarak benzersiz dosya adını alır&gt;]
-      İlgili LogFileName ile TestResults dizininde dosya oluşturur.
-
-      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin
-      Örnek: /logger:console;verbosity=&lt;Varsayılan olarak "normal" değerini alır&gt;
-      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.
-
-      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin
-      Örnek: /logger:console;prefix=&lt;Varsayılan olarak "false" değerini alır&gt;
-      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">Açıklama: Belirtilen dosyalardan testleri çalıştırır.</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">Seçenekler:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">Kullanım: vstest.console.exe [Bağımsız Değişkenler] [Seçenekler] [[--] &lt;RunSettings bağımsız değişkenleri&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">Test kaynak dosyası belirtilmedi.</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">Bağımsız değişken belirtilmedi.</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      Belirtilen dosyalardaki veya joker karakter desenindeki testleri çalıştırın. Birden çok test dosyası adını veya desenini
-      boşluklarla ayırın. Eşleşen test dosyalarını görüntülemek için konsol günlükçüsü ayrıntı düzeyini ayrıntılı olarak ayarlayın.
-      Örnekler: testprojem.dll
-                testprojem.dll diğertestprojem.exe
-                testprojem*.dll diğer*projem.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">Şu Ayar Sağlayıcısı Eklentileri kullanılabilir:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Ayarlar Dosyası&gt;
-      Testleri çalıştırırken kullanılacak ayarlar.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">/Settings parametresi bir ayarlar dosyasının belirtilmesini gerektirir.</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">'{0}' Ayarlar dosyası bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">Test Çalıştırması Başarısız.</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">Test Çalıştırması Başarılı.</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">{0} bağımsız değişkeni 'InIsolation' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /InIsolation) ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions parametresi bir değer gerektiriyor. Değer 'true' ise test çalıştırmasında yüklü VSIX uzantıları (varsa) kullanılır. Değer false ise uzantılar yoksayılır. Örnek: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">{0} bağımsız değişkeni 'UseVsixExtensions' komutunda beklenmiyor. Komutta vsix uzantılarının kullanılacağını veya atlanacağını belirtin (Örnek: vstest.console.exe myTests.dll /UseVsixExtensions:true) ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      Testleri yalıtılmış bir işlemde çalıştırır. Bu, vstest.console.exe 
-      işleminin testlerdeki bir hata nedeniyle durdurulması olasılığını azaltır, 
-      ancak testler daha yavaş çalışabilir.</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      Bu işlem vstest.console.exe işleminin test çalıştırmasında yüklü VSIX 
-      uzantılarını (varsa) kullanmasını veya atlamasını sağlar. 
-      Örnek /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">/BatchSize bağımsız değişkeni toplu iş boyutunu gerektirir. Örnek: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">{0} toplu iş boyutu geçersiz. Toplu iş boyutu sıfırdan büyük olmalıdır. Örnek: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  Testleri çalıştırmak için:
-    &gt;vstest.console.exe tests.dll 
-  Testleri veri toplayıcılar gibi ek ayarlarla çalıştırmak için:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      Yüklü test bulucuları listeler.</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      Yüklü test yürütücülerini listeler.</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      Yüklü test günlükçülerini listeler.</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      Yüklü test ayarları sağlayıcılarını listeler.</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Dosya Adı&gt;
-      Verilen test kapsayıcısında bulunan tüm testleri listeler.</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">Geçen süre:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">/Tests bağımsız değişkeni, alt dizelerinde bir veya daha fazla belirli test adının olmasını gerektirir.
-       Örnekler: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Toplam {0} test bulundu, ancak belirtilen ölçütlerle eşleşen test yok({1}). Doğru değerleri kullanın ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">,</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Test Adları&gt;
-      Sağlanan değerlerle eşleşen adlara sahip testleri çalıştırır. Birden çok
-      değer sağlamak için, değerleri virgülle ayırın.
-      Örnekler: /Tests:TestYöntemi1
-                /Tests:TestYöntemi1,testYöntemi2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">runsettings içinde tanılama veri bağdaştırıcıları etkinleştirildiğinden testleri çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Windows Mağazası uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows Mağazası uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        Desteklenen Dosya Türleri:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0},</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        Varsayılan Yürütücü URI’si: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">Geçersiz platform türü: {0}. Geçerli platform türleri şunlardır: {1}.</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">/Platform bağımsız değişkeni, test çalıştırması için hedef platform türünün belirtilmesini gerektirir. Örnek: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Platform türü&gt;
-      Test yürütmesi için kullanılacak hedef platform mimarisi. 
-      Geçerli değerler x86, x64 ve ARM'dir.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Testleri test çalıştırması için etkili Platformun:{0} ve .NET Framework:{1} ayarlarının gerektirdiği şekilde çalıştırmak için Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Framework Sürümü&gt;
-      Test yürütme için kullanılacak hedef .Net Framework sürümü. 
-      Geçerli değerler: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" vb.
-      Diğer desteklenen değerler: Framework40, Framework45, FrameworkCore10 ve FrameworkUap10.</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">/Framework bağımsız değişkeni test çalıştırması için hedef .NET Framework sürümünü gerektirir. Örnek: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">Geçersiz .NET Framework sürümü:{0}. Lütfen TargetFramework tam adını (Örnek: .NETCoreApp,Sürüm=v2.0) belirtin. Desteklenen diğer .NET Framework sürümleri Framework40, Framework45, FrameworkCore10 and FrameworkUap10’dur.</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows Mağazası uygulamalarına yönelik birim testleri için test çalıştırması başlatılamadı: {0}.</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;İfade&gt;
-      Verilen ifadeyle eşleşen testleri çalıştırır.
-      &lt;İfade&gt;, &lt;özellik&gt;İşleç&lt;değer&gt;[|&amp;&lt;İfade&gt;] biçimindedir;
-         burada İşleç =, != veya ~ simgelerinden biridir (~ İşleci 'içerir'
-         anlamına gelir ve DisplayName gibi dize özelliklerine uygulanabilir).
-         Alt ifadeleri gruplandırmak için ayraç () kullanılabilir.
-      Örnekler: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(TamAd~Gece
-                                  |Name=TestYöntemim)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter bağımsız değişkeni filtre değeri gerektirir.
-        Filtre değeri &lt;özellik&gt;=&lt;değer&gt; türünde olabilir.
-        Örnekler: "Priority=1", "TestCategory=Gece"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter bağımsız değişkeni /Tests ile belirtilemez. Testler belirtildiğinde test örneklerinin filtrelemesi geçerli değildir.</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0}, {1}/{2} için derlendi. Bir çalıştırmada belirtilen test bütünleştirilmiş kodu ortak bir hedef .NET framework ve platforma sahip olmalıdır.</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">Testleri çalıştırmak için yalnızca bir uygulama paketi (.appx dosyası) belirtilebilir.</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">Test bulma başlatılıyor, lütfen bekleyin...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">Test yürütmesi başlatılıyor, lütfen bekleyin...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">Tanılama veri bağdaştırıcısı ayarlarının okunması çalışan bir '{0}' oluşturdu. Tüm tanılama veri bağdaştırıcıları bu çalıştırmada atlanacak.</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      Test çalıştırması için 'CodeCoverage' veri toplayıcısını etkinleştirir.</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">{0} bağımsız değişkeni 'EnableCodeCoverage' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /EnableCodeCoverage) ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">'{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Mağazası uygulamalarına yönelik birim testlerini çalıştırmak için Windows Mağazası uygulaması Birim Testi Kitaplığı projesini kullanarak uygulama paketini oluşturun.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Kod kapsamı Windows Mağazası uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">Toplam {0} test bulundu, ancak bazı testler belirtilen ölçütlerle eşleşmiyor({1}). Doğru değerleri kullanın ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      Bu, vstest.console.exe işleminin test çalıştırmasında verilen yoldan
-      (varsa) özel test bağdaştırıcılarını kullanmasını sağlar. 
-      Örnek  /TestAdapterPath:&lt;özelBağdaştırıcılarınYolu&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">/TestAdapterPath parametresi, özel test bağdaştırıcıları içeren bir konumun yolu olan değeri gerektirir. Örnek:  /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Belirtilen özel test bağdaştırıcısı arama yolu bulunamadı; geçerli bir yol belirtin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' içinde belirtilen '{0}' yolu hiçbir test bağdaştırıcısı içermiyor; geçerli bir yol belirtin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">Windows Phone uygulamasına yönelik testler için test çalıştırması başlatılamadı: {0}.</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Windows Phone uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Kod kapsamı Windows Phone uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">Windows Phone uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">'{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Phone uygulamalarına yönelik birim testlerini çalıştırmak için Windows Phone Birim Testi Uygulaması projesini kullanarak uygulama paketini oluşturun.</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">Testleri çalıştırmak için {0} çerçevesi kullanılıyor. Bu uyarıyı kapatmak için /Framework:{1} değerini belirtin.</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">Belirtilen test kapsayıcılarında test bulunamadı. Ayrıca, Microsoft Windows Mağazası Birim testi bağdaştırıcısı .appxbundle dosyalarını desteklemiyor. Uygulama Paketi oluştururken bir appx oluşturun (Uygulama paketi grubu oluştur seçeneğini Hiçbir Zaman olarak ayarlayın) ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      Testlerin paralel olarak yürütülmesini belirtir. Varsayılan olarak
-      makine üzerindeki tüm mevcut çekirdekler kullanılabilir.
-      Kullanılacak çekirdek sayısı bir ayarlar dosyası kullanılarak yapılandırılabilir.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">{0} bağımsız değişkeni 'Parallel' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /Parallel) ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">Null veya boş olamaz</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Bağlantı Noktası&gt;
-      Yuva bağlantısı ve olay iletilerini almaya yönelik Bağlantı Noktası.</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port bağımsız değişkeni tamsayı olan bir bağlantı noktası numarası gerektirir. Yuva bağlantısına ve olay iletilerini almaya yönelik bağlantı noktasını belirtin.</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">Test kapsamındaki bütünleştirilmiş kod bulunamıyor. Lütfen projenin oluşturulduğundan emin olun.</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">{0} Yolu yok.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      Geçici çıkışları içeren dizin.</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      Projenin derleme nedeni olan yapılandırma (Debug/Release)</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">Belirtilen yapılandırma geçersiz.</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Çıkış&gt;
-      Çalıştırılacak ikili dosyaları içeren dizin.</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">BuildBasePath bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">Çıkış yolu bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">Ek Bilgi İletileri:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">Gün</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">Hata İletisi:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> Toplam süre: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">Saat</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">Dakika</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">Saniye</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">Yığın İzleme:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">Standart Hata İletileri:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">Standart Çıkış İletileri:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">Ekler:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">{0} içinde hiç test yok. Yüklü test bulucuları ve yükleyicileri, platform ve çerçeve sürümü ayarlarının uygun olmasına dikkat edin ve yeniden deneyin.</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">Başarısız</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">Başarılı</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">Atlandı</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">Belirtilen kaynaklar için bulma başarısız oldu. Özel durum: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Geçerli işlemi başlatmadan sorumlu Üst İşlemin işlem kimliği.</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId bağımsız değişkeni, işlem kimliğinin tamsayı olmasını gerektirir. Bu işlemi başlatan üst işlemin işlem kimliğini belirtin.</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">Bağımsız değişkenler:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Günlük dosyası yolu&gt;
-      Test platformu için günlükleri sağlayın.
-      Günlükler sağlanan dosyaya yazılır.
-
-Günlükler için izleme düzeyini aşağıda gösterildiği gibi değiştirin
-      Örnek: /Diag:&lt;Günlük dosyası yolu&gt;; tracelevel=&lt;Varsayılan olarak "ayrıntılı" değerini alır&gt;
-      tracelevel için izin verilen değerler: kapalı, hata, uyarı, bilgiler ve ayrıntılı.</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">Belirtilen {0} dosyası salt okunur</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">Şu bağlantı noktası üzerinde DesignModeClient için bağlantı veya işleme isteği zaman aşımı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">Çalıştırılmadı</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings bağımsız değişkenleri:
-      Komut satırı aracılığıyla runsettings yapılandırmalarını geçirmek için kullanılan bağımsız değişkenler. Bağımsız değişkenler "-- " karakterlerinden sonra [ad]=[değer] biçiminde ad-değer çifti olarak belirtilebilir. -- karakterlerinden sonra boşluk olduğuna dikkat edin. 
-      Birden fazla [ad]=[değer] çiftini ayırmak için bir boşluk kullanın.
-      RunSettings bağımsız değişkenleri desteği hakkında daha fazla bilgi: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">Sağlanan bir veya daha fazla runsettings geçersiz belirteç içeriyor</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      Mevcut değilse test sonuçları dizini belirtilen yolda oluşturulacak.
-      Örnek /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">/ResultsDirectory parametresi test sonuçlarının kaydedileceği bir değer gerektirir. Örnek:  /ResultsDirectory:c:\TestSonuçlarıDizinim</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">'ResultsDirectory' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">/InIsolation bayrağı kullanım dışı bırakıldı. Testler her zaman ayrı bir işlem içinde çalıştırılır</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">Vstest Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Test çalıştırması için veri toplayıcıyı etkinleştirir. Daha fazla bilgi: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">Veri Toplayıcı kolay adı '{0}' geçerli değil. Veri Toplayıcı yoksayılacak.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">Hata Ayıklama İzleme İletileri:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Testi blame modunda çalıştırır. Bu seçenek, test ana bilgisayarının kilitlenmesine neden olan sorunlu testin ayrı tutulmasını sağlar.
-      Geçerli dizinde, kilitlenmeden önce testin yürütülme düzenini yakalayan,
-      “Sequence.xml” adlı bir çıkış dosyası oluşturur. 
-      İsteğe bağlı olarak test ana bilgisayarının işlem dökümünü çıkarmayı seçebilirsiniz.
-      Dökümü çıkarmayı seçtiğinizde, kilitlenme durumunda varsayılan olarak bir mini döküm çıkarılır.
-      Dilerseniz bazı isteğe bağlı parametrelerle bu varsayılan davranışı geçersiz kılabilirsiniz:
-      CollectAlways - Kilitlenme olmasa da her çıkışta döküm çıkarma (true/false) 
-      DumpType - Döküm türünü belirtme (mini/full).
-      Örnek: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">Test Çalıştırması Durduruldu.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">Test Çalıştırması İptal Edildi.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">'{0}' yanıt dosyası açılırken hata oluştu</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;dosya&gt;
-      Daha fazla seçenek için yanıt dosyasını okuyun.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">Toplam test sayısı: Bilinmiyor</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">Buna ek olarak, test bağdaştırıcıları yolu /TestAdapterPath komutu kullanılarak belirtilebilir. Örnek /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions kullanımdan kaldırılıyor. Lütfen bunun yerine /TestAdapterPath kullanın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Örnek: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/Collect: Test çalıştırmasını yapılandırmak için test ayarları kullanıldığında "{0}" desteklenmez.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">Çalıştırma ayarları aracılığıyla yapılandırılan Kod Kapsamı ve Microsoft Fakes dışındaki veri toplayıcılar, ekli test ayarlarında desteklenmiyor. Daha fazla bilgi için bkz. https://aka.ms/vstest-configure-datacollector. Çalıştırma ayarları: {0}.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;Günlükçü URI/FriendlyName&gt;
-      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir 
-      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=&lt;Varsayılan olarak benzersiz dosya adını alır&gt;]
-      İlgili LogFileName ile TestResults dizininde dosya oluşturur.
-
-      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin
-      Örnek: /logger:console;verbosity=&lt;Varsayılan olarak "minimal" değerini alır&gt;
-      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.
-
-      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin
-      Örnek: /logger:console;prefix=&lt;Varsayılan olarak "false" değerini alır&gt;
-      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">Blame için CollectDump seçeneğine göre kilitlenme bilgi dökümlerinin toplanması bu platform için desteklenmiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">Blame ile belirtilen blame parametresi {0} geçerli değil. Bu parametre yoksayılıyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">Diag dosya yolu '{0}' geçerli değil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Blame bağımsız değişkeni '{0}' geçerli değil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">Diag bağımsız değişkeni '{0}' geçerli değil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">Logger bağımsız değişkeni '{0}' geçerli değil.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">Framework35 desteklenmiyor. İçin hedefleme .net Framework 3.5, test CLR 4.0 "uyumluluk moduna" çalışacak.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">Test çalıştırması devam ediyor</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">Toplam test sayısı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     Başarısız: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     Geçti: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    Atlandı: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">{0} bağımsız değişkeni geçersiz. Lütfen geçerli bağımsız değişkenlerin listesini denetlemek için /help seçeneğini kullanın.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">Toplam {0} test dosyası belirtilen desenle eşleşti.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">'{0}' test çalıştırması parametre bağımsız değişkeni geçersiz. Lütfen aşağıdaki biçimi kullanın.
-     Biçim: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">Blame için TestTimeout ile CollectDump seçeneğine göre asılı kalma bilgi dökümlerinin toplanması bu platform için desteklenmiyor.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - Başarısız: {1}, Başarılı: {2}, Atlanan: {3}, Toplam: {4}, Süre: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">Hiçbiri</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Bir ortam değişkeninin değerini ayarlar. Değişken mevcut değilse oluşturur, varsa geçersiz kılar. Bu, /InIsolation anahtarını kapsar ve testleri yalıtılmış bir işlemde çalıştırılmaya zorlar.
-      
-      Birden çok değişken sağlamak için bu bağımsız değişken birden çok kez belirtilebilir.
-
-      Örnek: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">'{0}' ortam değişkeni zaten tanımlandı, ancak -Environment bağımsız değişkeni tarafından geçersiz kılındı.</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">Test Çalıştırması {0} hatasıyla durduruldu.</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="tr">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">'{0}' bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">Şu Test Bulma Eklentileri kullanılabilir:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">Şu Test Yürütmesi eklentileri kullanılabilir:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">Şu Test Günlükçüsü Eklentileri kullanılabilir:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">Hata: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">, {0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">"{0}" parametresi yalnızca bir kez belirtilmelidir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">'{0}' uzantısının örneği oluşturulurken özel durum oluştu: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">Şu Testler kullanılabilir:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">"{0}" parametresi tanınmıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">Belirtilen "{0}" test kaynak dosyası bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">Test Günlükçüsünün '{0}' URI’si geçerli değil. Test Günlükçüsü yoksayılacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">Bilgi: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">Uyarı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      Bu kullanım iletisini görüntüler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest sürümü {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Günlükçü URI/FriendlyName&gt;
+      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir 
+      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=&lt;Varsayılan olarak benzersiz dosya adını alır&gt;]
+      İlgili LogFileName ile TestResults dizininde dosya oluşturur.
+
+      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin
+      Örnek: /logger:console;verbosity=&lt;Varsayılan olarak "normal" değerini alır&gt;
+      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.
+
+      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin
+      Örnek: /logger:console;prefix=&lt;Varsayılan olarak "false" değerini alır&gt;
+      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">Açıklama: Belirtilen dosyalardan testleri çalıştırır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">Seçenekler:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">Kullanım: vstest.console.exe [Bağımsız Değişkenler] [Seçenekler] [[--] &lt;RunSettings bağımsız değişkenleri&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">Test kaynak dosyası belirtilmedi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">Bağımsız değişken belirtilmedi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      Belirtilen dosyalardaki veya joker karakter desenindeki testleri çalıştırın. Birden çok test dosyası adını veya desenini
+      boşluklarla ayırın. Eşleşen test dosyalarını görüntülemek için konsol günlükçüsü ayrıntı düzeyini ayrıntılı olarak ayarlayın.
+      Örnekler: testprojem.dll
+                testprojem.dll diğertestprojem.exe
+                testprojem*.dll diğer*projem.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">Şu Ayar Sağlayıcısı Eklentileri kullanılabilir:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Ayarlar Dosyası&gt;
+      Testleri çalıştırırken kullanılacak ayarlar.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">/Settings parametresi bir ayarlar dosyasının belirtilmesini gerektirir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">'{0}' Ayarlar dosyası bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">Test Çalıştırması Başarısız.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">Test Çalıştırması Başarılı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">{0} bağımsız değişkeni 'InIsolation' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /InIsolation) ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions parametresi bir değer gerektiriyor. Değer 'true' ise test çalıştırmasında yüklü VSIX uzantıları (varsa) kullanılır. Değer false ise uzantılar yoksayılır. Örnek: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">{0} bağımsız değişkeni 'UseVsixExtensions' komutunda beklenmiyor. Komutta vsix uzantılarının kullanılacağını veya atlanacağını belirtin (Örnek: vstest.console.exe myTests.dll /UseVsixExtensions:true) ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      Testleri yalıtılmış bir işlemde çalıştırır. Bu, vstest.console.exe 
+      işleminin testlerdeki bir hata nedeniyle durdurulması olasılığını azaltır, 
+      ancak testler daha yavaş çalışabilir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      Bu işlem vstest.console.exe işleminin test çalıştırmasında yüklü VSIX 
+      uzantılarını (varsa) kullanmasını veya atlamasını sağlar. 
+      Örnek /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">/BatchSize bağımsız değişkeni toplu iş boyutunu gerektirir. Örnek: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">{0} toplu iş boyutu geçersiz. Toplu iş boyutu sıfırdan büyük olmalıdır. Örnek: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  Testleri çalıştırmak için:
+    &gt;vstest.console.exe tests.dll 
+  Testleri veri toplayıcılar gibi ek ayarlarla çalıştırmak için:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      Yüklü test bulucuları listeler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      Yüklü test yürütücülerini listeler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      Yüklü test günlükçülerini listeler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      Yüklü test ayarları sağlayıcılarını listeler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;Dosya Adı&gt;
+      Verilen test kapsayıcısında bulunan tüm testleri listeler.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">Geçen süre:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">/Tests bağımsız değişkeni, alt dizelerinde bir veya daha fazla belirli test adının olmasını gerektirir.
+       Örnekler: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Toplam {0} test bulundu, ancak belirtilen ölçütlerle eşleşen test yok({1}). Doğru değerleri kullanın ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">,</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Test Adları&gt;
+      Sağlanan değerlerle eşleşen adlara sahip testleri çalıştırır. Birden çok
+      değer sağlamak için, değerleri virgülle ayırın.
+      Örnekler: /Tests:TestYöntemi1
+                /Tests:TestYöntemi1,testYöntemi2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">runsettings içinde tanılama veri bağdaştırıcıları etkinleştirildiğinden testleri çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Windows Mağazası uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows Mağazası uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        Desteklenen Dosya Türleri:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0},</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        Varsayılan Yürütücü URI’si: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">Geçersiz platform türü: {0}. Geçerli platform türleri şunlardır: {1}.</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">/Platform bağımsız değişkeni, test çalıştırması için hedef platform türünün belirtilmesini gerektirir. Örnek: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform türü&gt;
+      Test yürütmesi için kullanılacak hedef platform mimarisi. 
+      Geçerli değerler x86, x64 ve ARM'dir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">Testleri test çalıştırması için etkili Platformun:{0} ve .NET Framework:{1} ayarlarının gerektirdiği şekilde çalıştırmak için Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /inIsolation parametresini kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Sürümü&gt;
+      Test yürütme için kullanılacak hedef .Net Framework sürümü. 
+      Geçerli değerler: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" vb.
+      Diğer desteklenen değerler: Framework40, Framework45, FrameworkCore10 ve FrameworkUap10.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">/Framework bağımsız değişkeni test çalıştırması için hedef .NET Framework sürümünü gerektirir. Örnek: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">Geçersiz .NET Framework sürümü:{0}. Lütfen TargetFramework tam adını (Örnek: .NETCoreApp,Sürüm=v2.0) belirtin. Desteklenen diğer .NET Framework sürümleri Framework40, Framework45, FrameworkCore10 and FrameworkUap10’dur.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">Windows Mağazası uygulamalarına yönelik birim testleri için test çalıştırması başlatılamadı: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;İfade&gt;
+      Verilen ifadeyle eşleşen testleri çalıştırır.
+      &lt;İfade&gt;, &lt;özellik&gt;İşleç&lt;değer&gt;[|&amp;&lt;İfade&gt;] biçimindedir;
+         burada İşleç =, != veya ~ simgelerinden biridir (~ İşleci 'içerir'
+         anlamına gelir ve DisplayName gibi dize özelliklerine uygulanabilir).
+         Alt ifadeleri gruplandırmak için ayraç () kullanılabilir.
+      Örnekler: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(TamAd~Gece
+                                  |Name=TestYöntemim)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">/TestCaseFilter bağımsız değişkeni filtre değeri gerektirir.
+        Filtre değeri &lt;özellik&gt;=&lt;değer&gt; türünde olabilir.
+        Örnekler: "Priority=1", "TestCategory=Gece"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">/TestCaseFilter bağımsız değişkeni /Tests ile belirtilemez. Testler belirtildiğinde test örneklerinin filtrelemesi geçerli değildir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0}, {1}/{2} için derlendi. Bir çalıştırmada belirtilen test bütünleştirilmiş kodu ortak bir hedef .NET framework ve platforma sahip olmalıdır.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">Testleri çalıştırmak için yalnızca bir uygulama paketi (.appx dosyası) belirtilebilir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">Test bulma başlatılıyor, lütfen bekleyin...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">Test yürütmesi başlatılıyor, lütfen bekleyin...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">Tanılama veri bağdaştırıcısı ayarlarının okunması çalışan bir '{0}' oluşturdu. Tüm tanılama veri bağdaştırıcıları bu çalıştırmada atlanacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      Test çalıştırması için 'CodeCoverage' veri toplayıcısını etkinleştirir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">{0} bağımsız değişkeni 'EnableCodeCoverage' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /EnableCodeCoverage) ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">'{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Mağazası uygulamalarına yönelik birim testlerini çalıştırmak için Windows Mağazası uygulaması Birim Testi Kitaplığı projesini kullanarak uygulama paketini oluşturun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Kod kapsamı Windows Mağazası uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">Toplam {0} test bulundu, ancak bazı testler belirtilen ölçütlerle eşleşmiyor({1}). Doğru değerleri kullanın ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      Bu, vstest.console.exe işleminin test çalıştırmasında verilen yoldan
+      (varsa) özel test bağdaştırıcılarını kullanmasını sağlar. 
+      Örnek  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">/TestAdapterPath parametresi, özel test bağdaştırıcıları içeren bir konumun yolu olan değeri gerektirir. Örnek:  /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">'TestAdapterPath' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">Belirtilen özel test bağdaştırıcısı arama yolu bulunamadı; geçerli bir yol belirtin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">'TestAdapterPath' içinde belirtilen '{0}' yolu hiçbir test bağdaştırıcısı içermiyor; geçerli bir yol belirtin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">Windows Phone uygulamasına yönelik testler için test çalıştırması başlatılamadı: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">Windows Phone uygulamaları için birim testlerini çalıştırmak üzere Yalıtım modu kullanılıyor. Bu uyarıyı kapatmak için /InIsolation parametresini kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Kod kapsamı Windows Phone uygulamaları için kullanılamaz. Bu test çalıştırması için kod kapsamı analizi atlandı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">Windows Phone uygulamaları için birim testleri çalıştırılırken tanılama veri bağdaştırıcıları desteklenmiyor. Ayarlardan tanılama veri bağdaştırıcısı ayarlarını kaldırın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">'{0}' uygulama paketi, test yürütücüsü giriş noktasına sahip değil. Windows Phone uygulamalarına yönelik birim testlerini çalıştırmak için Windows Phone Birim Testi Uygulaması projesini kullanarak uygulama paketini oluşturun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">Testleri çalıştırmak için {0} çerçevesi kullanılıyor. Bu uyarıyı kapatmak için /Framework:{1} değerini belirtin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">Belirtilen test kapsayıcılarında test bulunamadı. Ayrıca, Microsoft Windows Mağazası Birim testi bağdaştırıcısı .appxbundle dosyalarını desteklemiyor. Uygulama Paketi oluştururken bir appx oluşturun (Uygulama paketi grubu oluştur seçeneğini Hiçbir Zaman olarak ayarlayın) ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      Testlerin paralel olarak yürütülmesini belirtir. Varsayılan olarak
+      makine üzerindeki tüm mevcut çekirdekler kullanılabilir.
+      Kullanılacak çekirdek sayısı bir ayarlar dosyası kullanılarak yapılandırılabilir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">{0} bağımsız değişkeni 'Parallel' komutunda beklenmiyor. Komutu bağımsız değişken olmadan belirtin (Örnek: vstest.console.exe myTests.dll /Parallel) ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">Null veya boş olamaz</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Bağlantı Noktası&gt;
+      Yuva bağlantısı ve olay iletilerini almaya yönelik Bağlantı Noktası.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port bağımsız değişkeni tamsayı olan bir bağlantı noktası numarası gerektirir. Yuva bağlantısına ve olay iletilerini almaya yönelik bağlantı noktasını belirtin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">Test kapsamındaki bütünleştirilmiş kod bulunamıyor. Lütfen projenin oluşturulduğundan emin olun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">{0} Yolu yok.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      Geçici çıkışları içeren dizin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      Projenin derleme nedeni olan yapılandırma (Debug/Release)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">Belirtilen yapılandırma geçersiz.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Çıkış&gt;
+      Çalıştırılacak ikili dosyaları içeren dizin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">BuildBasePath bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">Çıkış yolu bulunamadı, geçerli bir yol belirtin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">Ek Bilgi İletileri:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">Gün</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">Hata İletisi:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> Toplam süre: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">Saat</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">URI veya FriendlyName değeri '{0}' olan bir test günlükçüsü bulunamadı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">Dakika</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">Saniye</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">Yığın İzleme:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">Standart Hata İletileri:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">Standart Çıkış İletileri:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">Ekler:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} içinde hiç test yok. Yüklü test bulucuları ve yükleyicileri, platform ve çerçeve sürümü ayarlarının uygun olmasına dikkat edin ve yeniden deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">Başarısız</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">Başarılı</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">Atlandı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">Belirtilen kaynaklar için bulma başarısız oldu. Özel durum: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Geçerli işlemi başlatmadan sorumlu Üst İşlemin işlem kimliği.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId bağımsız değişkeni, işlem kimliğinin tamsayı olmasını gerektirir. Bu işlemi başlatan üst işlemin işlem kimliğini belirtin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">Bağımsız değişkenler:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Günlük dosyası yolu&gt;
+      Test platformu için günlükleri sağlayın.
+      Günlükler sağlanan dosyaya yazılır.
+
+Günlükler için izleme düzeyini aşağıda gösterildiği gibi değiştirin
+      Örnek: /Diag:&lt;Günlük dosyası yolu&gt;; tracelevel=&lt;Varsayılan olarak "ayrıntılı" değerini alır&gt;
+      tracelevel için izin verilen değerler: kapalı, hata, uyarı, bilgiler ve ayrıntılı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">Belirtilen {0} dosyası salt okunur</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">Şu bağlantı noktası üzerinde DesignModeClient için bağlantı veya işleme isteği zaman aşımı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">Çalıştırılmadı</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings bağımsız değişkenleri:
+      Komut satırı aracılığıyla runsettings yapılandırmalarını geçirmek için kullanılan bağımsız değişkenler. Bağımsız değişkenler "-- " karakterlerinden sonra [ad]=[değer] biçiminde ad-değer çifti olarak belirtilebilir. -- karakterlerinden sonra boşluk olduğuna dikkat edin. 
+      Birden fazla [ad]=[değer] çiftini ayırmak için bir boşluk kullanın.
+      RunSettings bağımsız değişkenleri desteği hakkında daha fazla bilgi: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">Sağlanan bir veya daha fazla runsettings geçersiz belirteç içeriyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      Mevcut değilse test sonuçları dizini belirtilen yolda oluşturulacak.
+      Örnek /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">/ResultsDirectory parametresi test sonuçlarının kaydedileceği bir değer gerektirir. Örnek:  /ResultsDirectory:c:\TestSonuçlarıDizinim</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">'ResultsDirectory' içinde belirtilen '{0}' yolu geçersiz. Hata: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">/InIsolation bayrağı kullanım dışı bırakıldı. Testler her zaman ayrı bir işlem içinde çalıştırılır</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">Vstest Tanılamaları şu dosyadaki günlüğe kaydediliyor: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Test çalıştırması için veri toplayıcıyı etkinleştirir. Daha fazla bilgi: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">Veri Toplayıcı kolay adı '{0}' geçerli değil. Veri Toplayıcı yoksayılacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">Hata Ayıklama İzleme İletileri:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Testi blame modunda çalıştırır. Bu seçenek, test ana bilgisayarının kilitlenmesine neden olan sorunlu testin ayrı tutulmasını sağlar.
+      Geçerli dizinde, kilitlenmeden önce testin yürütülme düzenini yakalayan,
+      “Sequence.xml” adlı bir çıkış dosyası oluşturur. 
+      İsteğe bağlı olarak test ana bilgisayarının işlem dökümünü çıkarmayı seçebilirsiniz.
+      Dökümü çıkarmayı seçtiğinizde, kilitlenme durumunda varsayılan olarak bir mini döküm çıkarılır.
+      Dilerseniz bazı isteğe bağlı parametrelerle bu varsayılan davranışı geçersiz kılabilirsiniz:
+      CollectAlways - Kilitlenme olmasa da her çıkışta döküm çıkarma (true/false) 
+      DumpType - Döküm türünü belirtme (mini/full).
+      Örnek: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">Test Çalıştırması Durduruldu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">Test Çalıştırması İptal Edildi.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">'{0}' yanıt dosyası açılırken hata oluştu</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;dosya&gt;
+      Daha fazla seçenek için yanıt dosyasını okuyun.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">Toplam test sayısı: Bilinmiyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">Buna ek olarak, test bağdaştırıcıları yolu /TestAdapterPath komutu kullanılarak belirtilebilir. Örnek /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions kullanımdan kaldırılıyor. Lütfen bunun yerine /TestAdapterPath kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Örnek: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/Collect: Test çalıştırmasını yapılandırmak için test ayarları kullanıldığında "{0}" desteklenmez.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">Çalıştırma ayarları aracılığıyla yapılandırılan Kod Kapsamı ve Microsoft Fakes dışındaki veri toplayıcılar, ekli test ayarlarında desteklenmiyor. Daha fazla bilgi için bkz. https://aka.ms/vstest-configure-datacollector. Çalıştırma ayarları: {0}.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Günlükçü URI/FriendlyName&gt;
+      Test sonuçları için bir günlükçü belirtin. Örneğin, sonuçları bir 
+      Visual Studio Test Sonuçları Dosyası'na (TRX) kaydetmek için şunu kullanın: /logger:trx[;LogFileName=&lt;Varsayılan olarak benzersiz dosya adını alır&gt;]
+      İlgili LogFileName ile TestResults dizininde dosya oluşturur.
+
+      Konsol günlükçüsü için ayrıntı düzeyini günlük iletilerinde aşağıda gösterildiği gibi değiştirin
+      Örnek: /logger:console;verbosity=&lt;Varsayılan olarak "minimal" değerini alır&gt;
+      Ayrıntı için izin verilen değerler: quiet, minimal, normal ve detailed.
+
+      Konsol günlükçüsü için tanılama düzeyi ön ekini aşağıda gösterildiği gibi değiştirin
+      Örnek: /logger:console;prefix=&lt;Varsayılan olarak "false" değerini alır&gt;
+      Konsol Günlükçüsü hakkında daha fazla bilgi: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">Blame için CollectDump seçeneğine göre kilitlenme bilgi dökümlerinin toplanması bu platform için desteklenmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">Blame ile belirtilen blame parametresi {0} geçerli değil. Bu parametre yoksayılıyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">Diag dosya yolu '{0}' geçerli değil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Blame bağımsız değişkeni '{0}' geçerli değil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">Diag bağımsız değişkeni '{0}' geçerli değil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">Logger bağımsız değişkeni '{0}' geçerli değil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">Framework35 desteklenmiyor. İçin hedefleme .net Framework 3.5, test CLR 4.0 "uyumluluk moduna" çalışacak.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">Test çalıştırması devam ediyor</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">Toplam test sayısı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     Başarısız: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     Geçti: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    Atlandı: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">{0} bağımsız değişkeni geçersiz. Lütfen geçerli bağımsız değişkenlerin listesini denetlemek için /help seçeneğini kullanın.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">Toplam {0} test dosyası belirtilen desenle eşleşti.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">'{0}' test çalıştırması parametre bağımsız değişkeni geçersiz. Lütfen aşağıdaki biçimi kullanın.
+     Biçim: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">Blame için TestTimeout ile CollectDump seçeneğine göre asılı kalma bilgi dökümlerinin toplanması bu platform için desteklenmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - Başarısız: {1}, Başarılı: {2}, Atlanan: {3}, Toplam: {4}, Süre: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">Hiçbiri</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Bir ortam değişkeninin değerini ayarlar. Değişken mevcut değilse oluşturur, varsa geçersiz kılar. Bu, /InIsolation anahtarını kapsar ve testleri yalıtılmış bir işlemde çalıştırılmaya zorlar.
+      
+      Birden çok değişken sağlamak için bu bağımsız değişken birden çok kez belirtilebilir.
+
+      Örnek: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">'{0}' ortam değişkeni zaten tanımlandı, ancak -Environment bağımsız değişkeni tarafından geçersiz kılındı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">Test Çalıştırması {0} hatasıyla durduruldu.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">testSessionCorrelationId geçersiz</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      Bu, bağdaştırıcı yükleme davranışını etkiliyor.
+
+      Şu anda desteklenen davranışlar:
+        - Açık: Test Platformu yalnızca /TestAdapterPath (veya RunConfiguration.TestAdaptersPaths düğümü) tarafından belirtilen bağdaştırıcıları yükler. 
+                    Belirli bir bağdaştırıcı yolu sağlanırsa, bağdaştırıcı yüklenir; bir dizin yolu sağlanırsa Özyinelemeli seçeneği de belirtilmediği sürece bağdaştırıcılar doğrudan bu klasörde yüklenir.
+                    Bağdaştırıcı yolu belirtilmezse test çalıştırması başarısız olur.
+                    Bu, /InIsolation geçiş işlemini belirtir ve testleri yalıtılmış bir işlemde çalıştırılmaya zorlar.
+        
+        - Varsayılan: Bu bağımsız değişken belirtilmemişse, Test Platformu bağdaştırıcıları yükler. 
+                   Kaynağın yanında, sağlanan ek bağdaştırıcı yolları ve varsayılan dizinden uzantılar alır.
+
+        - DefaultRuntimeProviders: Test Platformu ile gönderilen varsayılan çalışma zamanı sağlayıcılarını yükleyin. 
+                                   "Explicit" seçeneği ayarlandığında bu belirtilmezse, bir test ana bilgisayar sağlayıcısının açıkça belirtilmesi gerekir.
+
+- ExtensionsDirectory: Bağdaştırıcıları Uzantılar klasörünün içine yükleyin.
+
+        - NextToSource: Bağdaştırıcıları kaynağın yanında yükle. 
+
+        - Özyinelemeli: Bağdaştırıcılar yüklenirken klasörleri özyinelemeli olarak arayın. Bu, "Explicit" veya "NextToSource" öğesinin de belirtilmesini gerektirir.</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">/TestAdapterLoadingStrategy için belirtilen değer ({0}) geçersiz!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Özyinelemeli bağdaştırıcı yükleme stratejisi kendisi tarafından kullanılamaz. Lütfen bir veya daha fazla öğeyle birleştirin: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">Test bağdaştırıcısı yükleme stratejisi "{0}" belirtilirken /TestAdapterPath parametresi belirtilmelidir!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe, öykünülen modda {0} olarak çalışıyor. Daha iyi performans için vstest.console.arm64.exe yerel çalıştırıcısını kullanmayı deneyin.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">İstek işleyicisi bağlantısını bekleme süresi {0} saniye sonra zaman aşımına uğradı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">Test oturumunun başlamasını bekleme süresi {0} saniye sonra zaman aşımına uğradı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">Test oturumunun durdurulmasını bekleme süresi {0} saniye sonra zaman aşımına uğradı.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">İletişim kanalını barındırma hatası.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">İşlem sonrası hata ayıklayıcısını yüklemek veya kaldırmak için ProcDumpToolDirectoryPath belirtilmelidir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">Postmortem hata ayıklayıcısı mevcut işletim sisteminde desteklenmiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">Procdump yürütülebilir dosyası için belirtilen dizin geçerli değil ve araç ortam değişkenleri içinde bulunamadı (PROCDUMP_PATH, PATH)</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">Procdump dosya adı bulunamadı: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">Son mortem hata ayıklayıcısını yüklemek için DumpDirectoryPath belirtilmelidir.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">Belirtilen dizin geçerli değil: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">'{0}' AeDebugger bağımsız değişkeni geçerli değil.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">dotnet vstest komutunun yerine, artık derlemeleri çalıştırmak için kullanılabilecek dotnet test komutu kullanılıyor. Bununla ilgili https://aka.ms/dotnet-test adresini ziyaret edin.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.xlf b/src/vstest.console/Resources/xlf/Resources.xlf
index c289ffcb47..d2960af41a 100644
--- a/src/vstest.console/Resources/xlf/Resources.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.xlf
@@ -4,15 +4,15 @@
     <body>
       <trans-unit id="FileNotFound">
         <source>'{0}' not found.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableDiscoverersHeaderMessage">
         <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableExecutorsHeaderMessage">
         <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableExtensionFormat">
         <source>    {0}</source>
@@ -20,11 +20,11 @@
       </trans-unit>
       <trans-unit id="AvailableExtensionsMetadataFormat">
         <source>        {0}: {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableLoggersHeaderMessage">
         <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableTestsFormat">
         <source>    {0}</source>
@@ -32,7 +32,7 @@
       </trans-unit>
       <trans-unit id="CommandLineError">
         <source>Error: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommaSeparatedFormat">
         <source>, {0}</source>
@@ -40,52 +40,52 @@
       </trans-unit>
       <trans-unit id="DuplicateArgumentError">
         <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExceptionFromExtension">
         <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListTestsHeaderMessage">
         <source>The following Tests are available:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoArgumentProcessorFound">
         <source>Unrecognized parameter "{0}".</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestSourceFileNotFound">
         <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerUriInvalid">
         <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommandLineInformational">
         <source>Information: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CommandLineWarning">
         <source>Warning: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HelpArgumentHelp">
         <source>-?|--Help|/?|/Help
       Display this usage message.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CopyrightCommandLineTitle">
         <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MicrosoftCommandLineTitle">
         <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnableLoggersArgumentHelp">
         <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
+      Specify a logger for test results. For example, to log results into a
       Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
       Creates file in TestResults directory with given LogFileName.
 
@@ -96,11 +96,11 @@
       Change the diagnostic level prefix for console logger as shown below
       Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
       More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HelpDescriptionText">
         <source>Description: Runs tests from the specified files.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HelpOptionsText">
         <source>Options:</source>
@@ -108,15 +108,15 @@
       </trans-unit>
       <trans-unit id="HelpUsageText">
         <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MissingTestSourceFile">
         <source>No test source files were specified.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoArgumentsProvided">
         <source>No arguments were specified.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunTestsArgumentHelp">
         <source>[TestFileNames]
@@ -125,115 +125,115 @@
       Examples: mytestproject.dll
                 mytestproject.dll myothertestproject.exe
                 testproject*.dll my*project.dll</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AvailableSettingsProvidersHeaderMessage">
         <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsArgumentHelp">
         <source>--Settings|/Settings:&lt;Settings File&gt;
       Settings to use when running tests.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsRequired">
         <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSettingsFileNotFound">
         <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunFailed">
         <source>Test Run Failed.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSuccessful">
         <source>Test Run Successful.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidInIsolationCommand">
         <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UseVsixExtensionsValueRequired">
         <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidUseVsixExtensionsCommand">
         <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InIsolationHelp">
         <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
+      Runs the tests in an isolated process. This makes vstest.console.exe
+      process less likely to be stopped on an error in the tests, but tests
       may run slower.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UseVsixExtensionsHelp">
         <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
+      This makes vstest.console.exe process use or skip the VSIX extensions
+      installed(if any) in the test run.
       Example  /UseVsixExtensions:true</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BatchSizeRequired">
         <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidBatchSize">
         <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Examples">
         <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
+    &gt;vstest.console.exe tests.dll
   To run tests with additional settings such as  data collectors:
     &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListDiscoverersHelp">
         <source>/ListDiscoverers
       Lists installed test discoverers.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListExecutorsHelp">
         <source>/ListExecutors
       Lists installed test executors.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListLoggersHelp">
         <source>/ListLoggers
       Lists installed test loggers.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListSettingsProvidersHelp">
         <source>/ListSettingsProviders
       Lists installed test settings providers.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ListTestsHelp">
         <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
       Lists all discovered tests from the given test container.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TimeElapsed">
         <source>Time elapsed :</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SpecificTestsRequired">
         <source>The /Tests argument requires one or more specific test names or their substrings.
        Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestsAvailableAfterFiltering">
         <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SearchStringDelimiter">
         <source>,</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSpecificTestsHelp">
         <source>--Tests|/Tests:&lt;Test Names&gt;
@@ -245,47 +245,47 @@
       </trans-unit>
       <trans-unit id="SwitchToNoIsolation">
         <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SwitchToIsolationInAppContainerMode">
         <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
         <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerFriendlyNameFormat">
         <source>        FriendlyName: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExtensionUriFormat">
         <source>        Uri: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SettingFormat">
         <source>        SettingName: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SupportedFileTypesIndicator">
         <source>        Supported File Types:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SupportedFileWithoutSeparator">
         <source> {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SupportedFileWithSeparator">
         <source> {0},</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UriOfDefaultExecutor">
         <source>        Default Executor Uri: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerUriFormat">
         <source>        Uri: {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidPlatformType">
         <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
@@ -293,36 +293,36 @@
       </trans-unit>
       <trans-unit id="PlatformTypeRequired">
         <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PlatformArgumentHelp">
         <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
+      Target platform architecture to be used for test execution.
       Valid values are x86, x64 and ARM.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SwitchToIsolationInMultiTargetingMode">
         <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FrameworkArgumentHelp">
         <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
+      Target .Net Framework version to be used for test execution.
       Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
       Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FrameworkVersionRequired">
         <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidFrameworkVersion">
         <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AppContainerTestPrerequisiteFail">
         <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCaseFilterArgumentHelp">
         <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
@@ -334,224 +334,224 @@
       Examples: /TestCaseFilter:"Priority=1"
                 /TestCaseFilter:"(FullyQualifiedName~Nightly
                                   |Name=MyTestMethod)"</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestCaseFilterValueRequired">
         <source>The /TestCaseFilter argument requires the filter value.
         Filter value can be &lt;property&gt;=&lt;value&gt; type.
         Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
         <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
         <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunSingleAppContainerSource">
         <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StartingDiscovery">
         <source>Starting test discovery, please wait...</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StartingExecution">
         <source>Starting test execution, please wait...</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
         <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
         <source>/EnableCodeCoverage
       Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidEnableCodeCoverageCommand">
         <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestEntryPoint">
         <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
         <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SomeTestsUnavailableAfterFiltering">
         <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestAdapterPathHelp">
         <source>--TestAdapterPath|/TestAdapterPath
       This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
+      from a given path (if any) in the test run.
       Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestAdapterPathValueRequired">
         <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidTestAdapterPathCommand">
         <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestAdapterPathDoesNotExist">
         <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoAdaptersFoundInTestAdapterPath">
         <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
         <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
         <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
         <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
         <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PhoneNoTestEntryPoint">
         <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestSettingsFrameworkMismatch">
         <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AppxBundleSourceWarning">
         <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ParallelArgumentProcessorHelp">
         <source>--Parallel|/Parallel
       Specifies that the tests be executed in parallel. By default up
       to all available cores on the machine may be used.
       The number of cores to use may be configured using a settings file.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidParallelCommand">
         <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CannotBeNullOrEmpty">
         <source>Cannot be null or empty</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="PortArgumentHelp">
         <source>--Port|/Port:&lt;Port&gt;
       The Port for socket connection and receiving the event messages.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidPortArgument">
         <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AssemblyPathInvalid">
         <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ProjectPathNotFound">
         <source>The Path {0} does not exist.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BuildBasePathArgumentHelp">
         <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
       The directory containing the temporary outputs.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ConfigurationArgumentHelp">
         <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
       The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidConfiguration">
         <source>The given configuration is invalid.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="OutputArgumentHelp">
         <source>-o|--Output|/o|/Output:&lt;Output&gt;
       The directory containing the binaries to run.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BuildBasePathNotFound">
         <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="OutputPathNotFound">
         <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AddnlInfoMessagesBanner">
         <source>Additional Information Messages:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Days">
         <source>Days</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ErrorMessageBanner">
         <source>Error Message:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ExecutionTimeFormatString">
         <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Hours">
         <source>Hours</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerNotFound">
         <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Minutes">
         <source>Minutes</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Seconds">
         <source>Seconds</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StacktraceBanner">
         <source>Stack Trace:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StdErrMessagesBanner">
         <source>Standard Error Messages:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StdOutMessagesBanner">
         <source>Standard Output Messages:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AttachmentsBanner">
         <source>Attachments:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="AttachmentOutputFormat">
         <source>  {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NoTestsAvailableInSources">
         <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="FailedTestIndicator">
         <source>Failed</source>
@@ -563,24 +563,24 @@
       </trans-unit>
       <trans-unit id="SkippedTestIndicator">
         <source>Skipped</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DiscoveryFailed">
         <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ParentProcessIdArgumentHelp">
         <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
       Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidParentProcessIdArgument">
         <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="HelpArgumentsText">
         <source>Arguments:</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnableDiagUsage">
         <source>--Diag|/Diag:&lt;Path to log file&gt;
@@ -590,35 +590,35 @@
       Change the trace level for logs as shown below
       Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
       Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="LoggerFileIsReadOnly">
         <source>The file {0} provided is read only</source>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DesignModeClientTimeoutError">
         <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
         <target state="new">Timeout to connect or process request for DesignModeClient on port: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="NotRunTestIndicator">
         <source>Not Run</source>
         <target state="new">Not Run  {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CLIRunSettingsArgumentHelp">
         <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --.
       Use a space to separate multiple [name]=[value].
       More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
         <target state="new">Args:
       Any extra arguments that should be passed to adapter. Arguments may be specified as name-value pair of the form &lt;n&gt;=&lt;v&gt;, where &lt;n&gt; is the argument name, and &lt;v&gt; is the argument value. Use a space to separate multiple arguments.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="MalformedRunSettingsKey">
         <source>One or more runsettings provided contain invalid token</source>
         <target state="new">One or more runsettings provided contain invalid token</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ResultsDirectoryArgumentHelp">
         <source>--ResultsDirectory|/ResultsDirectory
@@ -627,43 +627,43 @@
         <target state="new">--ResultsDirectory|/ResultsDirectory
       Test results directory will be created in specified path if not exists.
       Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ResultsDirectoryValueRequired">
         <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
         <target state="new">The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidResultsDirectoryPathCommand">
         <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
         <target state="new">The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InIsolationDeprecated">
         <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
         <target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="VstestDiagLogOutputPath">
         <source>Logging Vstest Diagnostics in file: {0}</source>
         <target state="new">Logging Vstest Diagnostics in file: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CollectArgumentHelp">
         <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
       Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
         <target state="new">CollectArgumentHelp</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DataCollectorFriendlyNameInvalid">
         <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
         <target state="new">The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DbgTrcMessagesBanner">
         <source>Debug Traces Messages:</source>
         <target state="new">Debug Traces Messages:</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnableBlameUsage">
         <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
@@ -673,77 +673,77 @@
       You may optionally choose to collect process dump for the test host.
       When you choose to collect dump, by default, a mini dump will be collected on a crash.
       You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      CollectAlways - To collect dump on exit even if there is no crash (true/false)
       DumpType - To specify dump type (mini/full).
       Example: /Blame
                /Blame:CollectDump
                /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
         <target state="new">--Blame|/Blame
       Enable Blame mode to get name of the faulty test case in event of a test host crash.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunAborted">
         <source>Test Run Aborted.</source>
         <target state="new">Test Run Aborted.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunCanceled">
         <source>Test Run Canceled.</source>
         <target state="new">Test Run Canceled.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="OpenResponseFileError">
         <source>Error opening response file '{0}'</source>
         <target state="new">Error opening response file '{0}'</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ResponseFileArgumentHelp">
         <source>@&lt;file&gt;
       Read response file for more options.</source>
         <target state="new">@&lt;file&gt;
       Read response file for more options.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
         <source>Total tests: Unknown</source>
         <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="StringFormatToJoinTwoStrings">
         <source>{0} {1}</source>
         <target state="new">{0} {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
         <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
         <target state="new">Additionally, you can point to location of test executors and discoverers by specifying &amp;apos;/TestAdapterPath&amp;apos; command. Example  /TestAdapterPath:&amp;lt;pathToCustomAdapters&amp;gt;.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="UseVsixExtensionsDeprecation">
         <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
         <target state="new">/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="DisableAutoFakesUsage">
         <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
      Example: /DisableAutoFakes:true</source>
         <target state="new">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
      Example: /DisableAutoFakes:true</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="CollectWithTestSettingErrorMessage">
         <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
         <target state="new">--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="RunsettingsWithDCErrorMessage">
         <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
         <target state="new">DataCollector:"{0}" in runsettings in not supported if test run is configured using testsettings.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnableLoggerArgumentsInNetCore">
         <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
+      Specify a logger for test results. For example, to log results into a
       Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
       Creates file in TestResults directory with given LogFileName.
 
@@ -755,7 +755,7 @@
       Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
       More info on Console Logger here : https://aka.ms/console-logger</source>
         <target state="new">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
+      Specify a logger for test results. For example, to log results into a
       Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
       Creates file in TestResults directory with given LogFileName.
 
@@ -775,109 +775,109 @@
                 [;Platform=&lt;Defaults to "Any CPU"&gt;]
                 [;Flavor=&lt;Defaults to "Debug"&gt;]
                 [;RunTitle=&lt;title&gt;]</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
         <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
         <target state="new">CollectDump option for Blame is not supported for this platform.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BlameIncorrectOption">
         <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
         <target state="new">The option specified with blame, {0} is invalid. This will be ignored.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidDiagFilePath">
         <source>Diag file path '{0}' is not valid.</source>
         <target state="new">Diag file path '{0}' is not valid.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidBlameArgument">
         <source>Blame argument '{0}' is not valid.</source>
         <target state="new">Blame argument '{0}' in invalid.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidDiagArgument">
         <source>Diag argument '{0}' is not valid.</source>
         <target state="new">Diag argument '{0}' is invalid.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidLoggerArgument">
         <source>Logger argument '{0}' is not valid.</source>
         <target state="new">Logger argument '{0}' is invalid.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="Framework35NotSupported">
         <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
         <target state="new">Framework35 not supported. Use Framework40 or above to run tests in CLR 4.0 "compatibly mode".</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="ProgressIndicatorString">
         <source>Test run in progress</source>
         <target state="new">Test run in progress</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummaryTotalTests">
         <source>Total tests: {0}</source>
         <target state="new">Total tests: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummaryFailedTests">
         <source>     Failed: {0}</source>
         <target state="new">     Failed: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummaryPassedTests">
         <source>     Passed: {0}</source>
         <target state="new">     Passed: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummarySkippedTests">
         <source>    Skipped: {0}</source>
         <target state="new">    Skipped: {0}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidArgument">
         <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
         <target state="new">The given argument {0} .Kindly use /help option to know more about the valid args. Know more at : https://docs.microsoft.com/en-us/visualstudio/test/vstest-console-options</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestSourcesDiscovered">
         <source>A total of {0} test files matched the specified pattern.</source>
         <target state="new">A total of {0} test source files are discovered.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="InvalidTestRunParameterArgument">
         <source>The test run parameter argument '{0}' is invalid. Please use the format below.
      Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
         <target state="new">The test run parameter argument '{0}' is invalid. Please use the format below.
 Format : TestRunParameters.Parameter(name="&lt;name&gt;", value="&lt;value&gt;")</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
         <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
         <target state="new">Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummary">
         <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
         <target state="new">{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="None">
         <source>None</source>
         <target state="new">None</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunSummaryAssemblyAndFramework">
         <source> - {0} {1}</source>
         <target state="new">- {0} {1}</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnvironmentArgumentHelp">
         <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
       Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
+
       This argument can be specified multiple times to provide multiple variables.
 
       Example: -e:VARIABLE1=VALUE1
@@ -889,18 +889,150 @@ Format : TestRunParameters.Parameter(name="&lt;name&gt;", value="&lt;value&gt;")
       Example: -e:VARIABLE1=VALUE1
                -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
                -e:ANOTHER_VARIABLE="VALUE;seperated with;semi-columns"</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="EnvironmentVariableXIsOverriden">
         <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
         <target state="new">Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</target>
-        <note></note>
+        <note />
       </trans-unit>
       <trans-unit id="TestRunAbortedWithError">
         <source>Test Run Aborted with error {0}.</source>
         <target state="new">Test Run Aborted with error {0}.</target>
-        <note></note>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="new">Invalid testSessionCorrelationId</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node).
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+
+        - Default: Test Platform will load adapters is if this argument has not been specified.
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform.
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source.
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="new">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviours:
+        - Explicit: Test Plarform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node).
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+
+        - Default: Test Platfrom will load adapters is if this argument has not beed specified.
+                   It will pick up extensions from next to source, provided aditional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform.
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source.
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.
+    </target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="new">Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="new">Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="new">The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="new">vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="new">Waiting for request handler connection timed out after {0} seconds.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="new">Waiting for start test session timed out after {0} seconds.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="new">Waiting for stop test session timed out after {0} seconds.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="new">Error hosting communication channel.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="new">ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="new">Postmortem debugger is not supported in the current OS.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="new">The directory specified is not valid: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="new">Procdump file name not found: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="new">ProcDumpDirectoryPath should be specified to install the post mortem debugger.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="new">The directory specified is not valid: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="new">Blame argument '{0}' is not valid.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="new">The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</target>
+        <note />
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
index d4c3310596..edecedb984 100644
--- a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">未找到“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">以下测试发现外接程序可用:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">以下测试执行外接程序可用:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">以下测试记录器加载项可用:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">错误: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">、{0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">应只提供一次参数“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">实例化扩展“{0}”时出现异常: {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">以下测试可用:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">无法识别的参数“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">找不到提供的测试源文件“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">测试记录器 URI“{0}”无效。将忽略该测试记录器。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">信息: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      显示此用法信息。</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">版权所有 (C) Microsoft Corporation。保留所有权利。</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) 测试执行命令行工具版本 {0}</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      为测试结果指定一个记录器。例如，若要将结果记录到 
-       Visual Studio 测试结果文件(TRX)中，请使用/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      使用给定的  LogFileName 在 TestResults 目录中创建文件。
-
-     更改控制台记录器的日志消息中的详细程度，如下所示
-      示例: /logger:console;verbosity&lt;Defaults to "normal"&gt;
-      允许的详细程度的值: quiet、minimal、normal 和 detailed。
-
-      更改控制台记录器的诊断级别前缀，如下所示
-      示例: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      此处为控制台记录器的详细信息: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">说明: 从指定的文件运行测试。</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">选项:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">用法: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">未指定测试源文件。</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">未指定参数。</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      从指定的文件或通配符模式运行测试。通过空格将多个测试文件或模式分隔开来。
-      将控制台记录器详细程度设置为“详细”以查看匹配的测试文件。
-      示例: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">以下设置提供程序外接程序可用:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
-   运行测试时要使用的设置。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">/Settings 参数要求提供设置文件。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">找不到设置文件“{0}”。</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">测试运行失败。</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">测试运行成功。</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">参数 {0} 不应出现在 "InIsolation" 命令中。指定不带该参数的命令(示例: vstest.console.exe myTests.dll /InIsolation)，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions 参数需要一个值。如果值为 "true"，则安装的 VSIX 扩展(如果有)将用在测试运行中。如果值为 "false"，则将其忽略。示例: /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">参数 {0} 不应出现在 "UseVsixExtensions" 命令中.指定指示是否应使用或跳过 vsix 扩展的命令(示例:vstest.console.exe myTests.dll /UseVsixExtensions:true),然后重试.</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      在独立进程中运行测试。虽然这可使 vstest.console.exe 
-      进程在测试出现错误时停止的可能性较小，但是测试的
-      运行速度会较慢。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/ UseVsixExtensions
-      这可使 vstest.console.exe 进程在测试运行中使用或者跳过
-      安装的 VSIX 扩展(如果有)。
-      示例  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">/BatchSize 参数要求批的大小。示例: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">批大小 {0} 无效。批大小应大于零。示例: /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated"> 运行测试:
-  &gt;vstest.console.exe tests.dll 
- 使用其他设置(如数据收集器)运行测试:
-  &gt;vstest.console.exe tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ ListDiscoverers
-      列出已安装的测试发现器。</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ ListExecutors
-      列出已安装的测试执行器。</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ ListLoggers
-      列出已安装的测试记录器。</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ ListSettingsProviders
-      列出已安装的测试设置提供程序。</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      从给定测试容器中列出所有已发现的测试。</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">已用时间:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">/Tests 参数要求一个或多个特定测试名称或其子字符串。
-       示例: /Tests:TestsMethod1、/Tests:TestMethod1、method2</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">共发现 {0} 个测试，但没有与指定选择条件 ({1}) 匹配的测试。使用正确的值，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">，</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
-      运行其名称与所提供值相匹配的测试。若要提供多个
-   值，请用逗号将这些值分隔开。
-   示例: /Tests:TestMethod1
-        /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔离模式运行测试，因为已在 runsettings 中启用了诊断数据适配器。使用 /inIsolation 参数取消此警告。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔离模式为 Windows 应用商店应用运行单元测试。使用 /InIsolation 参数取消此警告。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">为 Windows 应用商店应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        支持的文件类型:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated">{0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated">{0}，</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        默认执行器 URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">无效的平台类型: {0}。有效的平台类型为 {1}。</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">/Platform 参数要求提供用于测试运行的目标平台类型。示例: /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
-      用于执行测试的目标平台体系结构。
-   有效值为 x86、x64 和 ARM。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">按照针对测试运行有效的 Platform:{0} 和 .Net Framework:{1} 设置要求，使用隔离模式运行测试。使用 /inIsolation 参数取消此警告。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
-      用于执行测试的目标 .Net Framework 版本。
-      有效值为 ".NETFramework,Version=v4.5.1".NETCoreApp,Version=v1.0" 等。
-      其他支持的值为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">/Framework 参数要求用于测试运行的目标 .Net Framework 版本。示例: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">无效的 .Net Framework 版本: {0}。请提供 TargetFramework 的全名(示例: .NETCoreApp,Version=v2.0)。其他支持的 .Net Framework 版本为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">无法启动针对 Windows 应用商店应用的单元测试的测试运行: {0}。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-   运行与给定表达式匹配的测试。
-   &lt;Expression&gt; 的格式为 &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-     其中，Operator 是 =、!= 或 ~ (Operator ~ 具有 "contains"
-     语义且适用于诸如 DisplayName 之类的字符串属性)。
-     括号()可用于对子表达式进行分组。
-   示例: /TestCaseFilter:"Priority=1"
-         /TestCaseFilter:"(FullyQualifiedName~Nightly
-                 |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 参数需要筛选器值。
-    筛选器值可以是“&lt;属性&gt;=&lt;值&gt;”类型。
-    示例: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">不能使用 /Tests 指定 /TestCaseFilter 参数。指定测试时无法筛选测试用例。</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} 为 {1}/{2} 而生成。运行中指定的测试程序集应具有共有的目标.Net Framework 和平台。</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">只能为运行测试指定一个应用包(.appx 文件)。</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">正在启动测试发现，请稍候...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">正在启动测试执行，请稍候...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">读取诊断数据适配器设置引发了“{0}”的运行。将在此运行中跳过所有诊断数据适配器。</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      启动数据收集器“CodeCoverage”以运行测试。</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">参数 {0} 不应出现在 "EnableCodeCoverage" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /EnableCodeCoverage)，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">应用包“{0}”没有测试执行器入口点。为对 Windows 应用商店应用运行单元测试，使用 Windows 应用商店应用单元测试库项目创建应用包。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">代码覆盖率不适用于 Windows 应用商店应用。已对此测试运行跳过代码覆盖率分析。</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">共发现 {0} 个测试，但一些测试与指定选择条件 ({1}) 不匹配。使用正确的值，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      这将使 vstest.console.exe 进程在测试运行中使用
-   给定路径(如果有)中的自定义测试适配器。
-   示例 /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">/TestAdapterPath 参数需要一个值，该值是自定义测试适配器所在位置的路径。示例: /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">"TestAdapterPath" 中指定的路径“{0}”无效。错误: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到提供的自定义测试适配器搜索路径，请提供一个有效路径，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">"TestAdapterPath" 中指定的路径“{0}”不包含任何测试适配器，请提供有效路径，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">无法启动针对 Windows Phone 应用的测试的测试运行: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔离模式为 Windows Phone 应用运行单元测试。使用 /InIsolation 参数取消此警告。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">代码覆盖率不适用于 Windows Phone 应用。已为此测试运行跳过代码覆盖率分析。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">为 Windows Phone 应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">应用包“{0}”没有测试执行器入口点。为对 Windows Phone 应用运行单元测试，使用 Windows Phone 应用单元测试应用项目创建应用包。</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用框架 {0} 运行测试。指定 /Framework:{1} 取消此警告。</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">在指定测试容器中找不到任何测试。此外，Microsoft Windows 应用商店单元测试适配器不支持 .appxbundle 文件。在创建应用包时创建一个 appx (将“生成应用程序包”选项设置为“从不”)并重试。</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      指定并行执行测试。默认情况下，最多
-      可能会使用计算机上所有可用的内核。
-      可使用设置文件配置要使用的内核数。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">参数 {0} 不应出现在 "Parallel" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /Parallel)，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">不能为 NULL 或为空</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;Port&gt;
-      套接字连接和接收事件消息的端口。</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port 参数需要为整数的端口号。指定用于套接字连接以及接收事件消息的端口。</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">测试下找不到程序集。请确保已生成该项目。</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">路径 {0} 不存在。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      包含临时输出的目录。</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      项目为调试/发布等生成的配置</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">给定的配置无效。</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
-      包含要运行的二进制文件的目录。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到 BuildBasePath，请提供有效的路径，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到 Output 路径，请提供有效的路径，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">其他信息性消息:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">天</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">错误消息:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated">总时间: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">小时</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">找不到 URI 或 FriendlyName 为“{0}”的测试记录器。</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">分钟</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">秒</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">堆栈跟踪:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">标准错误消息:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">标准输出消息:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">附件:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">{0} 中没有可用测试。请确保安装了适当的测试发现器和执行器且平台和框架版本设置合适，然后重试。</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">失败</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">已通过</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">已跳过</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">针对给定源的发现失败。异常: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      父进程的进程 ID 负责启动当前进程。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId 参数要求整数形式的进程 ID。指定启动此进程的父进程的进程 ID。</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">参数:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
-      启用测试平台的日志。
-      日志将写入所提供的文件。
-
-      更改日志的跟踪级别，如下所示
-      示例: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      允许的 tracelevel 的值: off、error、 warning、info 和 verbose。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">提供的文件 {0} 是只读文件</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">连接或处理端口 {0} 上 DesignModeClient 的请求超时</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">未运行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings 参数:
-      通过命令行传递 runsettings 配置的参数。参数可以指定为名称-值对，其形式为“-- ”后跟 [名称]=[值]。请注意 -- 后的空格。
-      使用空格分隔多个 [名称]=[值].
-      有关 RunSettings 参数支持的详细信息，请访问: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">所提供的一个或多个 runsettings 包含无效令牌</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">-ResultsDirectory | / ResultsDirectory
-      如果不存在测试结果目录，则将在指定路径中创建。
-      示例 /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">/ResultsDirectory 参数需要一个值，应在其中保存测试结果。例如: /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">“ResultsDirectory”中指定的路径“{0}”无效。错误: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">/InIsolation 标志已弃用。测试始终在单独的进程中运行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">在文件 {0} 中记录 Vstest 诊断</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      启用数据收集器以运行测试。可在此处获取详细信息: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">数据收集器友好名称“{0}”无效。将忽略数据收集器。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">调试跟踪消息:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      在追责模式下运行测试。此选项有助于隔离导致测试主机崩溃的问题测试。
-      它会在当前目录中创建一个输出文件 "Sequence.xml"，
-      用于在崩溃之前捕获测试的执行顺序。
-      可以根据需要选择收集测试主机的进程转储。
-      选择收集转储时，默认情况下，将在崩溃时收集小型转储。
-      还可选择通过一些可选参数覆盖此默认行为:
-      CollectAlways - 若无崩溃则在退出时收集转储(true/false)
-      DumpType - 指定转储类型(小型/完整)。
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">测试运行已中止。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">测试运行已取消。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">打开响应文件“{0}”时出错</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;file&gt;
-      有关更多选项，请阅读响应文件。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">测试总数: 未知</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">此外，还可以使用 /TestAdapterPath 命令指定测试适配器的路径。示例 /TestAdapterPath:&lt;pathToCustomAdapters&gt;。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions 即将被弃用。请改为使用 /TestAdapterPath。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     示例: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">--Collect|/如果使用测试设置配置了测试运行，则不支持收集:“{0}”。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">除通过运行设置配置的代码覆盖率和 Microsoft Fakes 之外，嵌入测试设置不支持其他数据收集器。请参阅 https://aka.ms/vstest-configure-datacollector 了解详细信息。运行测试: {0}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      为测试结果指定一个记录器。例如，若要将结果记录到
-      Visual Studio 测试结果文件(TRX)中，请使用 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      使用给定的  LogFileName 在 TestResults 目录中创建文件。
-
-     更改控制台记录器的日志消息中的详细程度，如下所示
-      示例: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      允许的详细程度的值: quiet、minimal、normal 和 detailed。
-
-      更改控制台记录器的诊断级别前缀，如下所示
-      示例: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      此处为控制台记录器的详细信息: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">此平台不支持通过 CollectDump for Blame 选项收集故障转储。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">追责时指定的追责参数 {0} 无效。忽略此参数。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">诊断文件路径“{0}”无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">追责参数“{0}”无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">诊断参数“{0}”无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">记录器参数“{0}”无效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">不支持 Framework35。对于面向 .Net Framework 3.5 的项目，将在 CLR 4.0“兼容性模式”中运行测试。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">正在运行测试</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">测试总数: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     失败数: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     通过数: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    跳过数: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">参数 {0} 无效。请使用 /help 选项检查有效参数的列表。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">总共 {0} 个测试文件与指定模式相匹配。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">测试运行参数自变量“{0}”无效。请使用以下格式。
-     格式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">此平台不支持通过 CollectDump with TestTimeout for Blame 选项收集挂起转储。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - 失败: {1}，通过: {2}，已跳过: {3}，总计: {4}，持续时间: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">无</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/环境:&lt;NAME&gt;=&lt;VALUE&gt;
-      设置环境变量的值。如果该变量不存在，则创建它；如果它已存在，则替代它。这将表示 /InIsolation 开关并强制在隔离的进程中运行测试。
-      
-      可多次指定此参数来提供多个变量。
-
-      示例: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">环境变量“{0}”已定义，但它被 -Environment 参数替代。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">测试运行已中止，出现错误 {0}。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hans">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">未找到“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">以下测试发现外接程序可用:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">以下测试执行外接程序可用:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">以下测试记录器加载项可用:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">错误: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">、{0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">应只提供一次参数“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">实例化扩展“{0}”时出现异常: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">以下测试可用:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">无法识别的参数“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">找不到提供的测试源文件“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">测试记录器 URI“{0}”无效。将忽略该测试记录器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">信息: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      显示此用法信息。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest 版本 {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      为测试结果指定一个记录器。例如，若要将结果记录到 
+       Visual Studio 测试结果文件(TRX)中，请使用/logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      使用给定的  LogFileName 在 TestResults 目录中创建文件。
+
+     更改控制台记录器的日志消息中的详细程度，如下所示
+      示例: /logger:console;verbosity&lt;Defaults to "normal"&gt;
+      允许的详细程度的值: quiet、minimal、normal 和 detailed。
+
+      更改控制台记录器的诊断级别前缀，如下所示
+      示例: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      此处为控制台记录器的详细信息: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">说明: 从指定的文件运行测试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">选项:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">用法: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">未指定测试源文件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">未指定参数。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      从指定的文件或通配符模式运行测试。通过空格将多个测试文件或模式分隔开来。
+      将控制台记录器详细程度设置为“详细”以查看匹配的测试文件。
+      示例: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">以下设置提供程序外接程序可用:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;Settings File&gt;
+   运行测试时要使用的设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">/Settings 参数要求提供设置文件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">找不到设置文件“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">测试运行失败。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">测试运行成功。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">参数 {0} 不应出现在 "InIsolation" 命令中。指定不带该参数的命令(示例: vstest.console.exe myTests.dll /InIsolation)，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions 参数需要一个值。如果值为 "true"，则安装的 VSIX 扩展(如果有)将用在测试运行中。如果值为 "false"，则将其忽略。示例: /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">参数 {0} 不应出现在 "UseVsixExtensions" 命令中.指定指示是否应使用或跳过 vsix 扩展的命令(示例:vstest.console.exe myTests.dll /UseVsixExtensions:true),然后重试.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      在独立进程中运行测试。虽然这可使 vstest.console.exe 
+      进程在测试出现错误时停止的可能性较小，但是测试的
+      运行速度会较慢。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/ UseVsixExtensions
+      这可使 vstest.console.exe 进程在测试运行中使用或者跳过
+      安装的 VSIX 扩展(如果有)。
+      示例  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">/BatchSize 参数要求批的大小。示例: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">批大小 {0} 无效。批大小应大于零。示例: /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated"> 运行测试:
+  &gt;vstest.console.exe tests.dll 
+ 使用其他设置(如数据收集器)运行测试:
+  &gt;vstest.console.exe tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ ListDiscoverers
+      列出已安装的测试发现器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ ListExecutors
+      列出已安装的测试执行器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ ListLoggers
+      列出已安装的测试记录器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ ListSettingsProviders
+      列出已安装的测试设置提供程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      从给定测试容器中列出所有已发现的测试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">已用时间:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">/Tests 参数要求一个或多个特定测试名称或其子字符串。
+       示例: /Tests:TestsMethod1、/Tests:TestMethod1、method2</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">共发现 {0} 个测试，但没有与指定选择条件 ({1}) 匹配的测试。使用正确的值，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;Test Names&gt;
+      运行其名称与所提供值相匹配的测试。若要提供多个
+   值，请用逗号将这些值分隔开。
+   示例: /Tests:TestMethod1
+        /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔离模式运行测试，因为已在 runsettings 中启用了诊断数据适配器。使用 /inIsolation 参数取消此警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔离模式为 Windows 应用商店应用运行单元测试。使用 /InIsolation 参数取消此警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">为 Windows 应用商店应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        支持的文件类型:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated">{0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated">{0}，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        默认执行器 URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">无效的平台类型: {0}。有效的平台类型为 {1}。</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">/Platform 参数要求提供用于测试运行的目标平台类型。示例: /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;Platform type&gt;
+      用于执行测试的目标平台体系结构。
+   有效值为 x86、x64 和 ARM。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">按照针对测试运行有效的 Platform:{0} 和 .Net Framework:{1} 设置要求，使用隔离模式运行测试。使用 /inIsolation 参数取消此警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework Version&gt;
+      用于执行测试的目标 .Net Framework 版本。
+      有效值为 ".NETFramework,Version=v4.5.1".NETCoreApp,Version=v1.0" 等。
+      其他支持的值为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">/Framework 参数要求用于测试运行的目标 .Net Framework 版本。示例: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">无效的 .Net Framework 版本: {0}。请提供 TargetFramework 的全名(示例: .NETCoreApp,Version=v2.0)。其他支持的 .Net Framework 版本为 Framework40、Framework45、FrameworkCore10 和 FrameworkUap10。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">无法启动针对 Windows 应用商店应用的单元测试的测试运行: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+   运行与给定表达式匹配的测试。
+   &lt;Expression&gt; 的格式为 &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+     其中，Operator 是 =、!= 或 ~ (Operator ~ 具有 "contains"
+     语义且适用于诸如 DisplayName 之类的字符串属性)。
+     括号()可用于对子表达式进行分组。
+   示例: /TestCaseFilter:"Priority=1"
+         /TestCaseFilter:"(FullyQualifiedName~Nightly
+                 |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">/TestCaseFilter 参数需要筛选器值。
+    筛选器值可以是“&lt;属性&gt;=&lt;值&gt;”类型。
+    示例: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">不能使用 /Tests 指定 /TestCaseFilter 参数。指定测试时无法筛选测试用例。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} 为 {1}/{2} 而生成。运行中指定的测试程序集应具有共有的目标.Net Framework 和平台。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">只能为运行测试指定一个应用包(.appx 文件)。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">正在启动测试发现，请稍候...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">正在启动测试执行，请稍候...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">读取诊断数据适配器设置引发了“{0}”的运行。将在此运行中跳过所有诊断数据适配器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      启动数据收集器“CodeCoverage”以运行测试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">参数 {0} 不应出现在 "EnableCodeCoverage" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /EnableCodeCoverage)，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">应用包“{0}”没有测试执行器入口点。为对 Windows 应用商店应用运行单元测试，使用 Windows 应用商店应用单元测试库项目创建应用包。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">代码覆盖率不适用于 Windows 应用商店应用。已对此测试运行跳过代码覆盖率分析。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">共发现 {0} 个测试，但一些测试与指定选择条件 ({1}) 不匹配。使用正确的值，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      这将使 vstest.console.exe 进程在测试运行中使用
+   给定路径(如果有)中的自定义测试适配器。
+   示例 /TestAdapterPath:&lt;pathToCustomAdapters&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">/TestAdapterPath 参数需要一个值，该值是自定义测试适配器所在位置的路径。示例: /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">"TestAdapterPath" 中指定的路径“{0}”无效。错误: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到提供的自定义测试适配器搜索路径，请提供一个有效路径，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">"TestAdapterPath" 中指定的路径“{0}”不包含任何测试适配器，请提供有效路径，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">无法启动针对 Windows Phone 应用的测试的测试运行: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔离模式为 Windows Phone 应用运行单元测试。使用 /InIsolation 参数取消此警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">代码覆盖率不适用于 Windows Phone 应用。已为此测试运行跳过代码覆盖率分析。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">为 Windows Phone 应用运行单元测试时不支持诊断数据适配器。从设置中删除诊断数据适配器设置。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">应用包“{0}”没有测试执行器入口点。为对 Windows Phone 应用运行单元测试，使用 Windows Phone 应用单元测试应用项目创建应用包。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">使用框架 {0} 运行测试。指定 /Framework:{1} 取消此警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">在指定测试容器中找不到任何测试。此外，Microsoft Windows 应用商店单元测试适配器不支持 .appxbundle 文件。在创建应用包时创建一个 appx (将“生成应用程序包”选项设置为“从不”)并重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      指定并行执行测试。默认情况下，最多
+      可能会使用计算机上所有可用的内核。
+      可使用设置文件配置要使用的内核数。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">参数 {0} 不应出现在 "Parallel" 命令中。指定不带参数的命令(示例: vstest.console.exe myTests.dll /Parallel)，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">不能为 NULL 或为空</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;Port&gt;
+      套接字连接和接收事件消息的端口。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port 参数需要为整数的端口号。指定用于套接字连接以及接收事件消息的端口。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">测试下找不到程序集。请确保已生成该项目。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">路径 {0} 不存在。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      包含临时输出的目录。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      项目为调试/发布等生成的配置</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">给定的配置无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;Output&gt;
+      包含要运行的二进制文件的目录。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到 BuildBasePath，请提供有效的路径，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到 Output 路径，请提供有效的路径，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">其他信息性消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">天</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">错误消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated">总时间: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">小时</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">找不到 URI 或 FriendlyName 为“{0}”的测试记录器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">分钟</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">堆栈跟踪:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">标准错误消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">标准输出消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">附件:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} 中没有可用测试。请确保安装了适当的测试发现器和执行器且平台和框架版本设置合适，然后重试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">失败</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">已通过</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">已跳过</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">针对给定源的发现失败。异常: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      父进程的进程 ID 负责启动当前进程。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId 参数要求整数形式的进程 ID。指定启动此进程的父进程的进程 ID。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">参数:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;Path to log file&gt;
+      启用测试平台的日志。
+      日志将写入所提供的文件。
+
+      更改日志的跟踪级别，如下所示
+      示例: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      允许的 tracelevel 的值: off、error、 warning、info 和 verbose。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">提供的文件 {0} 是只读文件</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">连接或处理端口 {0} 上 DesignModeClient 的请求超时</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">未运行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings 参数:
+      通过命令行传递 runsettings 配置的参数。参数可以指定为名称-值对，其形式为“-- ”后跟 [名称]=[值]。请注意 -- 后的空格。
+      使用空格分隔多个 [名称]=[值].
+      有关 RunSettings 参数支持的详细信息，请访问: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">所提供的一个或多个 runsettings 包含无效令牌</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">-ResultsDirectory | / ResultsDirectory
+      如果不存在测试结果目录，则将在指定路径中创建。
+      示例 /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">/ResultsDirectory 参数需要一个值，应在其中保存测试结果。例如: /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">“ResultsDirectory”中指定的路径“{0}”无效。错误: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">/InIsolation 标志已弃用。测试始终在单独的进程中运行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">在文件 {0} 中记录 Vstest 诊断</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      启用数据收集器以运行测试。可在此处获取详细信息: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">数据收集器友好名称“{0}”无效。将忽略数据收集器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">调试跟踪消息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      在追责模式下运行测试。此选项有助于隔离导致测试主机崩溃的问题测试。
+      它会在当前目录中创建一个输出文件 "Sequence.xml"，
+      用于在崩溃之前捕获测试的执行顺序。
+      可以根据需要选择收集测试主机的进程转储。
+      选择收集转储时，默认情况下，将在崩溃时收集小型转储。
+      还可选择通过一些可选参数覆盖此默认行为:
+      CollectAlways - 若无崩溃则在退出时收集转储(true/false)
+      DumpType - 指定转储类型(小型/完整)。
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">测试运行已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">测试运行已取消。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">打开响应文件“{0}”时出错</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;file&gt;
+      有关更多选项，请阅读响应文件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">测试总数: 未知</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">此外，还可以使用 /TestAdapterPath 命令指定测试适配器的路径。示例 /TestAdapterPath:&lt;pathToCustomAdapters&gt;。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions 即将被弃用。请改为使用 /TestAdapterPath。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     示例: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">--Collect|/如果使用测试设置配置了测试运行，则不支持收集:“{0}”。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">除通过运行设置配置的代码覆盖率和 Microsoft Fakes 之外，嵌入测试设置不支持其他数据收集器。请参阅 https://aka.ms/vstest-configure-datacollector 了解详细信息。运行测试: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      为测试结果指定一个记录器。例如，若要将结果记录到
+      Visual Studio 测试结果文件(TRX)中，请使用 /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      使用给定的  LogFileName 在 TestResults 目录中创建文件。
+
+     更改控制台记录器的日志消息中的详细程度，如下所示
+      示例: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      允许的详细程度的值: quiet、minimal、normal 和 detailed。
+
+      更改控制台记录器的诊断级别前缀，如下所示
+      示例: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      此处为控制台记录器的详细信息: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">此平台不支持通过 CollectDump for Blame 选项收集故障转储。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">追责时指定的追责参数 {0} 无效。忽略此参数。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">诊断文件路径“{0}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">追责参数“{0}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">诊断参数“{0}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">记录器参数“{0}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">不支持 Framework35。对于面向 .Net Framework 3.5 的项目，将在 CLR 4.0“兼容性模式”中运行测试。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">正在运行测试</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">测试总数: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     失败数: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     通过数: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    跳过数: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">参数 {0} 无效。请使用 /help 选项检查有效参数的列表。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">总共 {0} 个测试文件与指定模式相匹配。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">测试运行参数自变量“{0}”无效。请使用以下格式。
+     格式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">此平台不支持通过 CollectDump with TestTimeout for Blame 选项收集挂起转储。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - 失败: {1}，通过: {2}，已跳过: {3}，总计: {4}，持续时间: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">无</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/环境:&lt;NAME&gt;=&lt;VALUE&gt;
+      设置环境变量的值。如果该变量不存在，则创建它；如果它已存在，则替代它。这将表示 /InIsolation 开关并强制在隔离的进程中运行测试。
+      
+      可多次指定此参数来提供多个变量。
+
+      示例: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">环境变量“{0}”已定义，但它被 -Environment 参数替代。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">测试运行已中止，出现错误 {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">testSessionCorrelationId 无效</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      这会影响适配器加载行为。
+
+      当前支持的行为:
+        - 显式: 测试平台将仅加载 /TestAdapterPath (或 RunConfiguration.TestAdaptersPaths 节点)指定的适配器。
+                    如果提供了特定适配器路径，则会加载适配器；如果提供了目录路径，则将直接加载该文件夹中的适配器，除非另外指定了“递归”选项。
+                    如果未指定适配器路径，则测试运行将失败。
+                    这将暗示 /InIsolation 开关并强制测试在隔离进程中运行。
+        
+        - 默认: 如果未指定此参数，则测试平台将加载适配器。
+                   它将从源旁边、提供的其他适配器路径和默认目录中选取扩展。
+
+        - DefaultRuntimeProviders: 加载随测试平台一起提供的默认运行时提供程序。
+                                   如果在设置“显式”选项时未指定此项，则需要显式指定测试主机提供程序。
+
+        - ExtensionsDirectory: 加载“扩展”文件夹内的适配器。
+
+        - NextToSource: 加载源旁边的适配器。
+
+        - 递归: 加载适配器时以递归方式搜索文件夹。这也需要指定“显式”或“NextToSource”。</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">为 /TestAdapterLoadingStrategy 指定的值({0})无效!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">递归适配器加载策略不能由自身使用。请与以下一项或多项结合使用: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">指定“{0}”测试适配器加载策略时，需要提供 /TestAdapterPath 参数!</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe 正在模拟模式下运行，因为 {0}。为了获得更好的性能，请考虑使用本机运行程序 vstest.console.arm64.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">等待请求处理程序连接在 {0} 秒后超时。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">等待启动测试会话在 {0} 秒后超时。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">等待停止测试会话在 {0} 秒后超时。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">托管信道时出错。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">应指定 ProcDumpToolDirectoryPath 以安装或卸载事后分析调试程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">当前操作系统不支持事后分析调试程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">为 procdump 可执行文件指定的目录无效，并且在环境变量(PROCDUMP_PATH、PATH)中找不到该工具</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">找不到 Procdump 文件名:“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">应指定 DumpDirectoryPath 以安装事后分析调试程序。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">指定的目录无效:“{0}”</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">AeDebugger 参数“{0}”无效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">dotnet vstest 命令被 dotnet test 取代，后者现在可用于运行程序集。请参阅 https://aka.ms/dotnet-test。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
index f818e20189..a4700c1d75 100644
--- a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
@@ -1,1113 +1,1229 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
-  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
-    <body>
-      <trans-unit id="FileNotFound">
-        <source>'{0}' not found.</source>
-        <note></note>
-        <target state="translated">找不到 '{0}'。</target>
-      </trans-unit>
-      <trans-unit id="AvailableDiscoverersHeaderMessage">
-        <source>The following Test Discovery Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">可使用下列測試探索增益集:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExecutorsHeaderMessage">
-        <source>The following Test Execution Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">可使用下列測試執行增益集:</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="AvailableExtensionsMetadataFormat">
-        <source>        {0}: {1}</source>
-        <note></note>
-        <target state="translated">        {0}: {1}</target>
-      </trans-unit>
-      <trans-unit id="AvailableLoggersHeaderMessage">
-        <source>The following Test Logger Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">可使用下列測試記錄器增益集:</target>
-      </trans-unit>
-      <trans-unit id="AvailableTestsFormat">
-        <source>    {0}</source>
-        <note>{Locked}</note>
-        <target state="new">    {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineError">
-        <source>Error: {0}</source>
-        <note></note>
-        <target state="translated">錯誤: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommaSeparatedFormat">
-        <source>, {0}</source>
-        <note>Format used to comma separate a list of values.</note>
-        <target state="translated">，{0}</target>
-      </trans-unit>
-      <trans-unit id="DuplicateArgumentError">
-        <source>The parameter "{0}" should be provided only once.</source>
-        <note></note>
-        <target state="translated">參數 " {0}" 應該僅提供一次。</target>
-      </trans-unit>
-      <trans-unit id="ExceptionFromExtension">
-        <source>Exception occurred when instantiating extension '{0}': {1}</source>
-        <note></note>
-        <target state="translated">產生延伸模組時發生例外狀況 '{0}': {1}</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHeaderMessage">
-        <source>The following Tests are available:</source>
-        <note></note>
-        <target state="translated">可使用下列測試:</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentProcessorFound">
-        <source>Unrecognized parameter "{0}".</source>
-        <note></note>
-        <target state="translated">無法辨識的參數 "{0}"。</target>
-      </trans-unit>
-      <trans-unit id="TestSourceFileNotFound">
-        <source>The test source file "{0}" provided was not found.</source>
-        <note></note>
-        <target state="translated">找不到提供的測試來源檔案 "{0}"。</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriInvalid">
-        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
-        <note></note>
-        <target state="translated">測試記錄器 URI '{0}' 無效。將忽略測試記錄器。</target>
-      </trans-unit>
-      <trans-unit id="CommandLineInformational">
-        <source>Information: {0}</source>
-        <note></note>
-        <target state="translated">資訊: {0}</target>
-      </trans-unit>
-      <trans-unit id="CommandLineWarning">
-        <source>Warning: {0}</source>
-        <note></note>
-        <target state="translated">警告: {0}</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentHelp">
-        <source>-?|--Help|/?|/Help
-      Display this usage message.</source>
-        <note></note>
-        <target state="translated">-?|--Help|/?|/Help
-      顯示此使用方式訊息。</target>
-      </trans-unit>
-      <trans-unit id="CopyrightCommandLineTitle">
-        <source>Copyright (c) Microsoft Corporation.  All rights reserved.</source>
-        <note></note>
-        <target state="translated">Copyright (C) Microsoft Corporation. 著作權所有，並保留一切權利。</target>
-      </trans-unit>
-      <trans-unit id="MicrosoftCommandLineTitle">
-        <source>Microsoft (R) Test Execution Command Line Tool Version {0}</source>
-        <note></note>
-        <target state="translated">Microsoft (R) Test Execution Command Line Tool {0} 版</target>
-      </trans-unit>
-      <trans-unit id="EnableLoggersArgumentHelp">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <note></note>
-        <target state="translated">--logger|/logger:&lt;記錄器 URI/易記名稱&gt;
-      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=&lt;預設為唯一的檔案名稱&gt;]，
-      將結果記錄至 Visual Studio 測試結果檔案 (TRX)
-      以指定的 LogFileName，在 TestResults 目錄中建立檔案。
-
-      變更主控台記錄器的記錄訊息詳細程度等級，如下所示
-      範例: /logger:console;verbosity=&lt;預設為 "normal"&gt;
-      詳細程度的允許值: quiet、minimal、normal 以及 detailed。
-
-      變更主控台記錄器的診斷等級前置詞，如下所示
-      範例: /logger:console;prefix=&lt;預設為 "false"&gt;
-      主控台記錄器詳細資訊於此: https://aka.ms/console-logger</target>
-      </trans-unit>
-      <trans-unit id="HelpDescriptionText">
-        <source>Description: Runs tests from the specified files.</source>
-        <note></note>
-        <target state="translated">描述: 從指定的檔案執行測試。</target>
-      </trans-unit>
-      <trans-unit id="HelpOptionsText">
-        <source>Options:</source>
-        <note>Section Header for subsequent command help listing</note>
-        <target state="translated">選項:</target>
-      </trans-unit>
-      <trans-unit id="HelpUsageText">
-        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
-        <note></note>
-        <target state="translated">用法: vstest.console.exe [引數] [選項] [[--] &lt;RunSettings 引數&gt;...]]</target>
-      </trans-unit>
-      <trans-unit id="MissingTestSourceFile">
-        <source>No test source files were specified.</source>
-        <note></note>
-        <target state="translated">未指定測試來源檔案。</target>
-      </trans-unit>
-      <trans-unit id="NoArgumentsProvided">
-        <source>No arguments were specified.</source>
-        <note></note>
-        <target state="translated">未指定引數。</target>
-      </trans-unit>
-      <trans-unit id="RunTestsArgumentHelp">
-        <source>[TestFileNames]
-      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
-      by spaces. Set console logger verbosity to detailed to view matched test files.
-      Examples: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</source>
-        <note></note>
-        <target state="translated">[TestFileNames]
-      從指定的檔案或萬用字元模式執行測試。分隔多個測試檔名稱或模式
-      由空格分隔。將主控台記錄器詳細程度設定為詳細來檢視符合的測試檔案。
-      範例: mytestproject.dll
-                mytestproject.dll myothertestproject.exe
-                testproject*.dll my*project.dll</target>
-      </trans-unit>
-      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
-        <source>The following Settings Providers Add-Ins are available:</source>
-        <note></note>
-        <target state="translated">可使用下列設定提供者增益集:</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsArgumentHelp">
-        <source>--Settings|/Settings:&lt;Settings File&gt;
-      Settings to use when running tests.</source>
-        <note></note>
-        <target state="translated">--Settings|/Settings:&lt;設定檔&gt;
-      執行測試時要使用的設定。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsRequired">
-        <source>The /Settings parameter requires a settings file to be provided.</source>
-        <note></note>
-        <target state="translated">/Settings 參數要求必須提供設定檔。</target>
-      </trans-unit>
-      <trans-unit id="RunSettingsFileNotFound">
-        <source>The Settings file '{0}' could not be found.</source>
-        <note></note>
-        <target state="translated">找不到設定檔 '{0}'。</target>
-      </trans-unit>
-      <trans-unit id="TestRunFailed">
-        <source>Test Run Failed.</source>
-        <note></note>
-        <target state="translated">測試回合失敗。</target>
-      </trans-unit>
-      <trans-unit id="TestRunSuccessful">
-        <source>Test Run Successful.</source>
-        <note></note>
-        <target state="translated">測試回合成功。</target>
-      </trans-unit>
-      <trans-unit id="InvalidInIsolationCommand">
-        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
-        <note></note>
-        <target state="translated">'InIsolation' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /InIsolation)，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsValueRequired">
-        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions 參數需要一個值。如果為 'true'，已安裝的 VSIX 延伸模組 (如果有的話) 將用於測試回合。如果為 false，則會加以忽略。範例:  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="InvalidUseVsixExtensionsCommand">
-        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
-        <note></note>
-        <target state="translated">'UseVsixExtensions' 命令中不應該使用引數 {0}。請指定命令指出應該使用或略過 VSIX 延伸模組 (範例: vstest.console.exe myTests.dll /UseVsixExtensions:true) 並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="InIsolationHelp">
-        <source>--InIsolation|/InIsolation
-      Runs the tests in an isolated process. This makes vstest.console.exe 
-      process less likely to be stopped on an error in the tests, but tests 
-      may run slower.</source>
-        <note></note>
-        <target state="translated">--InIsolation|/InIsolation
-      在隔離的處理序中執行測試。這樣會降低 vstest.console.exe 
-      處理序在測試中發生錯誤而停止的可能性，但是測試 
-      可能會執行得較慢。</target>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsHelp">
-        <source>/UseVsixExtensions
-      This makes vstest.console.exe process use or skip the VSIX extensions 
-      installed(if any) in the test run. 
-      Example  /UseVsixExtensions:true</source>
-        <note></note>
-        <target state="translated">/UseVsixExtensions
-      這可讓 vstest.console.exe 處理序使用或略過測試回合中 
-      已安裝的 VSIX 延伸模組 (如果有的話)。
-      範例  /UseVsixExtensions:true</target>
-      </trans-unit>
-      <trans-unit id="BatchSizeRequired">
-        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">/BatchSize 引數必須有批次的大小。範例:  /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="InvalidBatchSize">
-        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
-        <note></note>
-        <target state="translated">批次大小無效 {0}。批次大小應該大於零。範例:  /BatchSize:10</target>
-      </trans-unit>
-      <trans-unit id="Examples">
-        <source>  To run tests:
-    &gt;vstest.console.exe tests.dll 
-  To run tests with additional settings such as  data collectors:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
-        <note></note>
-        <target state="translated">  執行測試:
-    &gt;vstest.console.exe tests.dll 
-  執行測試，同時附上像是資料收集器等其他設定:
-    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
-      </trans-unit>
-      <trans-unit id="ListDiscoverersHelp">
-        <source>/ListDiscoverers
-      Lists installed test discoverers.</source>
-        <note></note>
-        <target state="translated">/ListDiscoverers
-      列出已安裝的測試探索程式。</target>
-      </trans-unit>
-      <trans-unit id="ListExecutorsHelp">
-        <source>/ListExecutors
-      Lists installed test executors.</source>
-        <note></note>
-        <target state="translated">/ListExecutors
-      列出已安裝的測試執行程式。</target>
-      </trans-unit>
-      <trans-unit id="ListLoggersHelp">
-        <source>/ListLoggers
-      Lists installed test loggers.</source>
-        <note></note>
-        <target state="translated">/ListLoggers
-      列出已安裝的測試記錄器。</target>
-      </trans-unit>
-      <trans-unit id="ListSettingsProvidersHelp">
-        <source>/ListSettingsProviders
-      Lists installed test settings providers.</source>
-        <note></note>
-        <target state="translated">/ListSettingsProviders
-      列出已安裝的測試設定提供者。</target>
-      </trans-unit>
-      <trans-unit id="ListTestsHelp">
-        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
-      Lists all discovered tests from the given test container.</source>
-        <note></note>
-        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;檔案名稱&gt;
-      列出所有從指定測試容器探索到的測試。</target>
-      </trans-unit>
-      <trans-unit id="TimeElapsed">
-        <source>Time elapsed :</source>
-        <note></note>
-        <target state="translated">經過時間:</target>
-      </trans-unit>
-      <trans-unit id="SpecificTestsRequired">
-        <source>The /Tests argument requires one or more specific test names or their substrings.
-       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
-        <note></note>
-        <target state="translated">/Tests 引數必須有一或多個特定的測試名稱或它們的子字串。
-       範例: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableAfterFiltering">
-        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">已探索到總計 {0} 個測試，但沒有測試符合指定的選取準則 ({1})。請使用正確的值，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="SearchStringDelimiter">
-        <source>,</source>
-        <note></note>
-        <target state="translated">，</target>
-      </trans-unit>
-      <trans-unit id="RunSpecificTestsHelp">
-        <source>--Tests|/Tests:&lt;Test Names&gt;
-      Run tests with names that match the provided values. To provide multiple
-      values, separate them by commas.
-      Examples: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</source>
-        <note>Please verify if the console output looks good after modifiaction. </note>
-        <target state="translated">--Tests|/Tests:&lt;測試名稱&gt;
-      對名稱符合所提供值的項目執行測試。
-      若要提供多個值，請使用逗號將其分隔。
-      範例: /Tests:TestMethod1
-                /Tests:TestMethod1,testMethod2</target>
-      </trans-unit>
-      <trans-unit id="SwitchToNoIsolation">
-        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔離模式執行測試，因為在 runsettings 中已啟用診斷資料配接器。使用 /inIsolation 參數可隱藏這個警告。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔離模式執行 Windows 市集應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">執行 Windows 市集應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFriendlyNameFormat">
-        <source>        FriendlyName: {0}</source>
-        <note></note>
-        <target state="translated">        FriendlyName: {0}</target>
-      </trans-unit>
-      <trans-unit id="ExtensionUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="SettingFormat">
-        <source>        SettingName: {0}</source>
-        <note></note>
-        <target state="translated">        SettingName: {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileTypesIndicator">
-        <source>        Supported File Types:</source>
-        <note></note>
-        <target state="translated">        支援的檔案類型:</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithoutSeparator">
-        <source> {0}</source>
-        <note></note>
-        <target state="translated"> {0}</target>
-      </trans-unit>
-      <trans-unit id="SupportedFileWithSeparator">
-        <source> {0},</source>
-        <note></note>
-        <target state="translated"> {0}，</target>
-      </trans-unit>
-      <trans-unit id="UriOfDefaultExecutor">
-        <source>        Default Executor Uri: {0}</source>
-        <note></note>
-        <target state="translated">        預設執行程式 URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="LoggerUriFormat">
-        <source>        Uri: {0}</source>
-        <note></note>
-        <target state="translated">        URI: {0}</target>
-      </trans-unit>
-      <trans-unit id="InvalidPlatformType">
-        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
-        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
-        <target state="translated">平台類型無效: {0}。有效的平台類型為{1}。</target>
-      </trans-unit>
-      <trans-unit id="PlatformTypeRequired">
-        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
-        <note></note>
-        <target state="translated">/Platform 引數需要提供測試回合的目標平台類型。範例:  /Platform:x86</target>
-      </trans-unit>
-      <trans-unit id="PlatformArgumentHelp">
-        <source>--Platform|/Platform:&lt;Platform type&gt;
-      Target platform architecture to be used for test execution. 
-      Valid values are x86, x64 and ARM.</source>
-        <note></note>
-        <target state="translated">--Platform|/Platform:&lt;平台類型&gt;
-      用於測試執行的目標平台架構。
-      有效值為 x86、x64 和 ARM。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
-        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">依照測試回合的有效平台 {0} 和 .Net Framework {1} 設定的要求，使用隔離模式執行測試。使用 /inIsolation 參數可隱藏這個警告。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkArgumentHelp">
-        <source>--Framework|/Framework:&lt;Framework Version&gt;
-      Target .Net Framework version to be used for test execution. 
-      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
-      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">--Framework|/Framework:&lt;Framework 版本&gt;
-      用於測試執行的目標.Net Framework 版本。 
-      有效的值為 ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" 等等。
-      其他支援的值為 Framework40、Framework45、FrameworkCore10 與 FrameworkUap10。</target>
-      </trans-unit>
-      <trans-unit id="FrameworkVersionRequired">
-        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
-        <note></note>
-        <target state="translated">/Framework 引數需要測試回合的目標 .NET Framework 版本。   範例: /Framework:".NETFramework,Version=v4.5.1"</target>
-      </trans-unit>
-      <trans-unit id="InvalidFrameworkVersion">
-        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
-        <note></note>
-        <target state="translated">.Net Framework 版本無效:{0}。請提供 TargetFramework 的全名 (例如: .NETCoreApp,Version=v2.0)。其他支援的 .Net Framework 版本為 Framework40、Framework45、FrameworkCore10 以及 FrameworkUap10。</target>
-      </trans-unit>
-      <trans-unit id="AppContainerTestPrerequisiteFail">
-        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
-        <note></note>
-        <target state="translated">無法針對 Windows 市集應用程式的單元測試啟動測試回合: {0}。</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterArgumentHelp">
-        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      Run tests that match the given expression.
-      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         where Operator is one of =, != or ~  (Operator ~ has 'contains'
-         semantics and is applicable for string properties like DisplayName).
-         Parenthesis () can be used to group sub-expressions.
-      Examples: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</source>
-        <note></note>
-        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
-      執行符合指定運算式的測試。
-      &lt;Expression&gt; 的格式為 &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
-         其中 Operator 是 =、!= 或 ~ 的其中之一 (運算子 ~ 具有 'contains'
-         語意，且適用於 DisplayName 之類的字串屬性)。
-         您可以使用括號 () 來分組子運算式。
-      範例: /TestCaseFilter:"Priority=1"
-                /TestCaseFilter:"(FullyQualifiedName~Nightly
-                                  |Name=MyTestMethod)"</target>
-      </trans-unit>
-      <trans-unit id="TestCaseFilterValueRequired">
-        <source>The /TestCaseFilter argument requires the filter value.
-        Filter value can be &lt;property&gt;=&lt;value&gt; type.
-        Examples: "Priority=1", "TestCategory=Nightly"</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 引數需要篩選值。
-        篩選值可以是 &lt;property&gt;=&lt;value&gt; 類型。
-        範例: "Priority=1", "TestCategory=Nightly"</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
-        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
-        <note></note>
-        <target state="translated">/TestCaseFilter 引數無法與 /Tests 一起指定。若已指定測試，則篩選測試案例不適用。</target>
-      </trans-unit>
-      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
-        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
-        <note></note>
-        <target state="translated">{0} 為針對 {1}/{2} 所建置。回合中指定的測試組件應該具有共同的目標 .Net Framework 和平台。</target>
-      </trans-unit>
-      <trans-unit id="RunSingleAppContainerSource">
-        <source>Only one app package (.appx file) can be specified for running tests.</source>
-        <note></note>
-        <target state="translated">您只能為執行測試指定一個應用程式套件 (.appx 檔)。</target>
-      </trans-unit>
-      <trans-unit id="StartingDiscovery">
-        <source>Starting test discovery, please wait...</source>
-        <note></note>
-        <target state="translated">正在啟動測試探索，請稍候...</target>
-      </trans-unit>
-      <trans-unit id="StartingExecution">
-        <source>Starting test execution, please wait...</source>
-        <note></note>
-        <target state="translated">正在啟動測試執行，請稍候...</target>
-      </trans-unit>
-      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
-        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
-        <note></note>
-        <target state="translated">讀取診斷資料配接器設定時擲回執行中的 '{0}'。這個回合中將略過所有診斷資料配接器。</target>
-      </trans-unit>
-      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
-        <source>/EnableCodeCoverage
-      Enables data collector 'CodeCoverage' for the test run.</source>
-        <note></note>
-        <target state="translated">/EnableCodeCoverage
-      為測試回合啟用資料收集器 'CodeCoverage'。</target>
-      </trans-unit>
-      <trans-unit id="InvalidEnableCodeCoverageCommand">
-        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
-        <note></note>
-        <target state="translated">'EnableCodeCoverage' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /EnableCodeCoverage)，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="NoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
-        <note></note>
-        <target state="translated">應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows 市集應用程式的單元測試，請使用 Windows 市集應用程式單元測試程式庫專案建立應用程式套件。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows 市集應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。</target>
-      </trans-unit>
-      <trans-unit id="SomeTestsUnavailableAfterFiltering">
-        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
-        <note></note>
-        <target state="translated">已探索到總計 {0} 個測試，但有些測試不符合指定的選取準則 ({1})。請使用正確的值並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathHelp">
-        <source>--TestAdapterPath|/TestAdapterPath
-      This makes vstest.console.exe process use custom test adapters
-      from a given path (if any) in the test run. 
-      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
-        <note></note>
-        <target state="translated">--TestAdapterPath|/TestAdapterPath
-      這可讓 vstest.console.exe 處理序在測試回合中，
-      使用指定路徑 (如有指定) 中的自訂測試配接器。
-      範例 /TestAdapterPath:&lt;自訂配接器的路徑&gt;</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathValueRequired">
-        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
-        <note></note>
-        <target state="translated">/TestAdapterPath 參數需要一個值，這個值是包含自訂測試配接器之位置的路徑。範例:  /TestAdapterPath:c:\MyCustomAdapters</target>
-      </trans-unit>
-      <trans-unit id="InvalidTestAdapterPathCommand">
-        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' 中指定的路徑 '{0}' 無效。錯誤: {1}</target>
-      </trans-unit>
-      <trans-unit id="TestAdapterPathDoesNotExist">
-        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到提供的自訂測試配接器搜尋路徑。請提供有效的路徑，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
-        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">'TestAdapterPath' 中指定的路徑 '{0}' 不包含任何測試配接器。請提供有效的路徑，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
-        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
-        <note></note>
-        <target state="translated">無法為 Windows Phone 應用程式的測試啟動測試回合: {0}。</target>
-      </trans-unit>
-      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
-        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用隔離模式執行 Windows Phone 應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。</target>
-      </trans-unit>
-      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
-        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
-        <note></note>
-        <target state="translated">Windows Phone 應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。</target>
-      </trans-unit>
-      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
-        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
-        <note></note>
-        <target state="translated">執行 Windows Phone 應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。</target>
-      </trans-unit>
-      <trans-unit id="PhoneNoTestEntryPoint">
-        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
-        <note></note>
-        <target state="translated">應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows Phone 應用程式的單元測試，請使用 Windows Phone 單元測試應用程式專案建立應用程式套件。</target>
-      </trans-unit>
-      <trans-unit id="TestSettingsFrameworkMismatch">
-        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
-        <note></note>
-        <target state="translated">使用架構 {0} 執行測試。指定 /Framework:{1} 可隱藏這個警告。</target>
-      </trans-unit>
-      <trans-unit id="AppxBundleSourceWarning">
-        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
-        <note></note>
-        <target state="translated">在指定的測試容器中找不到測試。此外，Microsoft Windows 市集單元測試配接器不支援 .appxbundle 檔案。請在建立應用程式套件時建立 appx (將 [產生應用程式套件組合] 選項設定為 [永不])，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="ParallelArgumentProcessorHelp">
-        <source>--Parallel|/Parallel
-      Specifies that the tests be executed in parallel. By default up
-      to all available cores on the machine may be used.
-      The number of cores to use may be configured using a settings file.</source>
-        <note></note>
-        <target state="translated">--Parallel|/Parallel
-      指定平行執行測試。根據預設，最多會使用
-      機器上所有的可用核心。可使用設定檔設定
-      要使用的核心數。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParallelCommand">
-        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
-        <note></note>
-        <target state="translated">'Parallel' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /Parallel)，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="CannotBeNullOrEmpty">
-        <source>Cannot be null or empty</source>
-        <note></note>
-        <target state="translated">不可為 null 或空白</target>
-      </trans-unit>
-      <trans-unit id="PortArgumentHelp">
-        <source>--Port|/Port:&lt;Port&gt;
-      The Port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port:&lt;連接埠&gt;
-      通訊端連線以及接收事件訊息的連接埠。</target>
-      </trans-unit>
-      <trans-unit id="InvalidPortArgument">
-        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
-        <note></note>
-        <target state="translated">--Port|/Port 引數需要整數的連接埠號碼。指定用於通訊端連線以及接收事件訊息的連接埠。</target>
-      </trans-unit>
-      <trans-unit id="AssemblyPathInvalid">
-        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
-        <note></note>
-        <target state="translated">找不到正在進行測試的組件。請確定已建置專案。</target>
-      </trans-unit>
-      <trans-unit id="ProjectPathNotFound">
-        <source>The Path {0} does not exist.</source>
-        <note></note>
-        <target state="translated">路徑 {0} 不存在。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathArgumentHelp">
-        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
-      The directory containing the temporary outputs.</source>
-        <note></note>
-        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;建置基底路徑&gt;
-      包含暫存輸出的目錄。</target>
-      </trans-unit>
-      <trans-unit id="ConfigurationArgumentHelp">
-        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
-      The configuration the project is built for i.e. Debug/Release</source>
-        <note></note>
-        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;組態&gt;
-      建置專案標的組態，例如，偵錯/發行</target>
-      </trans-unit>
-      <trans-unit id="InvalidConfiguration">
-        <source>The given configuration is invalid.</source>
-        <note></note>
-        <target state="translated">給定的組態無效。</target>
-      </trans-unit>
-      <trans-unit id="OutputArgumentHelp">
-        <source>-o|--Output|/o|/Output:&lt;Output&gt;
-      The directory containing the binaries to run.</source>
-        <note></note>
-        <target state="translated">-o|--Output|/o|/Output:&lt;輸出&gt;
-      包含要執行的二進位檔案的目錄。</target>
-      </trans-unit>
-      <trans-unit id="BuildBasePathNotFound">
-        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到 BuildBasePath。請提供有效的路徑，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="OutputPathNotFound">
-        <source>The Output path was not found, provide a valid path and try again.</source>
-        <note></note>
-        <target state="translated">找不到輸出路徑。請提供有效的路徑，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="AddnlInfoMessagesBanner">
-        <source>Additional Information Messages:</source>
-        <note></note>
-        <target state="translated">其他資訊訊息:</target>
-      </trans-unit>
-      <trans-unit id="Days">
-        <source>Days</source>
-        <note></note>
-        <target state="translated">日</target>
-      </trans-unit>
-      <trans-unit id="ErrorMessageBanner">
-        <source>Error Message:</source>
-        <note></note>
-        <target state="translated">錯誤訊息:</target>
-      </trans-unit>
-      <trans-unit id="ExecutionTimeFormatString">
-        <source> Total time: {0:0.0000} {1}</source>
-        <note></note>
-        <target state="translated"> 時間總計: {0:0.0000} {1}</target>
-      </trans-unit>
-      <trans-unit id="Hours">
-        <source>Hours</source>
-        <note></note>
-        <target state="translated">小時</target>
-      </trans-unit>
-      <trans-unit id="LoggerNotFound">
-        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
-        <note></note>
-        <target state="translated">找不到具有 URI 或 FriendlyName '{0}' 的測試記錄器。</target>
-      </trans-unit>
-      <trans-unit id="Minutes">
-        <source>Minutes</source>
-        <note></note>
-        <target state="translated">分鐘</target>
-      </trans-unit>
-      <trans-unit id="Seconds">
-        <source>Seconds</source>
-        <note></note>
-        <target state="translated">秒</target>
-      </trans-unit>
-      <trans-unit id="StacktraceBanner">
-        <source>Stack Trace:</source>
-        <note></note>
-        <target state="translated">堆疊追蹤:</target>
-      </trans-unit>
-      <trans-unit id="StdErrMessagesBanner">
-        <source>Standard Error Messages:</source>
-        <note></note>
-        <target state="translated">標準錯誤訊息:</target>
-      </trans-unit>
-      <trans-unit id="StdOutMessagesBanner">
-        <source>Standard Output Messages:</source>
-        <note></note>
-        <target state="translated">標準輸出訊息:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentsBanner">
-        <source>Attachments:</source>
-        <note></note>
-        <target state="translated">附件:</target>
-      </trans-unit>
-      <trans-unit id="AttachmentOutputFormat">
-        <source>  {0}</source>
-        <note></note>
-        <target state="translated">  {0}</target>
-      </trans-unit>
-      <trans-unit id="NoTestsAvailableInSources">
-        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
-        <note></note>
-        <target state="translated">{0} 中沒有可供使用的測試。請確定已安裝適當的測試探索程式及執行程式、平台與 Framework 版本設定，並再試一次。</target>
-      </trans-unit>
-      <trans-unit id="FailedTestIndicator">
-        <source>Failed</source>
-        <note>Message which is written to the console when a test fails.</note>
-        <target state="translated">失敗</target>
-      </trans-unit>
-      <trans-unit id="PassedTestIndicator">
-        <source>Passed</source>
-        <note>Message which is written to the console when a test passes.</note>
-        <target state="translated">已通過</target>
-      </trans-unit>
-      <trans-unit id="SkippedTestIndicator">
-        <source>Skipped</source>
-        <note></note>
-        <target state="translated">已跳過</target>
-      </trans-unit>
-      <trans-unit id="DiscoveryFailed">
-        <source>Discovery failed for given sources. Exception : {0}</source>
-        <note></note>
-        <target state="translated">給定來源的探索失敗。例外狀況: {0}</target>
-      </trans-unit>
-      <trans-unit id="ParentProcessIdArgumentHelp">
-        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
-      Process Id of the Parent Process responsible for launching current process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;父處理序識別碼&gt;
-      負責啟動目前處理序的父處理序之處理序識別碼。</target>
-      </trans-unit>
-      <trans-unit id="InvalidParentProcessIdArgument">
-        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
-        <note></note>
-        <target state="translated">--ParentProcessId|/ParentProcessId 引數需要整數的處理序識別碼。請為已啟動這個處理序的父處理序指定處理序識別碼。</target>
-      </trans-unit>
-      <trans-unit id="HelpArgumentsText">
-        <source>Arguments:</source>
-        <note></note>
-        <target state="translated">引數:</target>
-      </trans-unit>
-      <trans-unit id="EnableDiagUsage">
-        <source>--Diag|/Diag:&lt;Path to log file&gt;
-      Enable logs for test platform.
-      Logs are written to the provided file.
-
-      Change the trace level for logs as shown below
-      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
-      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
-        <note></note>
-        <target state="translated">--Diag|/Diag:&lt;日誌檔路徑&gt;
-      啟用測試平台的記錄檔。
-      記錄會寫入提供的檔案。
-
-      變更記錄檔的追蹤層級，如下所示
-      範例: /Diag:&lt;日誌檔路徑&gt;;tracelevel=&lt;預設為 [詳細資訊]&gt;
-      允許的 tracelevel 值為: 關閉、錯誤、警告、資訊與詳細資訊。</target>
-      </trans-unit>
-      <trans-unit id="LoggerFileIsReadOnly">
-        <source>The file {0} provided is read only</source>
-        <note></note>
-        <target state="translated">提供的檔案 {0} 為唯讀</target>
-      </trans-unit>
-      <trans-unit id="DesignModeClientTimeoutError">
-        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
-        <target state="translated">連線或處理連接埠 {0} 上對於 DesignModeClient 之要求的逾時時間:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="NotRunTestIndicator">
-        <source>Not Run</source>
-        <target state="translated">未執行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CLIRunSettingsArgumentHelp">
-        <source>RunSettings arguments:
-      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
-      Use a space to separate multiple [name]=[value].
-      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
-        <target state="translated">RunSettings 引數:
-      透過命令列傳遞 runsettings 組態的引數。引數可以接在 "-- " 之後，以 [名稱]=[值] 的格式指定名稱/值配對。請注意 -- 之後的空格。
-      使用空格以隔開多個 [名稱]=[值]。
-      RunSettings 引數支援的詳細資訊: https://aka.ms/vstest-runsettings-arguments</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="MalformedRunSettingsKey">
-        <source>One or more runsettings provided contain invalid token</source>
-        <target state="translated">提供的一或多個 runsettings 包含無效的語彙基元</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryArgumentHelp">
-        <source>--ResultsDirectory|/ResultsDirectory
-      Test results directory will be created in specified path if not exists.
-      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
-        <target state="translated">--ResultsDirectory|/ResultsDirectory
-      若不存在，將會於指定路徑中建立測試結果目錄。
-      範例  /ResultsDirectory:&lt;結果目錄路徑&gt;</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResultsDirectoryValueRequired">
-        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
-        <target state="translated">/ResultsDirectory 參數需要值，亦即測試結果的儲存位置。範例:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidResultsDirectoryPathCommand">
-        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
-        <target state="translated">'ResultsDirectory' 中指定的路徑 '{0}' 無效。錯誤: {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InIsolationDeprecated">
-        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
-        <target state="translated">/InIsolation 旗標已標示即將淘汰。測試一律會在個別的處理序中執行</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="VstestDiagLogOutputPath">
-        <source>Logging Vstest Diagnostics in file: {0}</source>
-        <target state="translated">在檔案 {0} 中記錄 Vstest 診斷</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectArgumentHelp">
-        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
-      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
-        <target state="translated">--Collect|/Collect:&lt;資料收集器易記名稱&gt;
-      為測試回合啟用資料收集器。此處有詳細資訊: https://aka.ms/vstest-collect</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DataCollectorFriendlyNameInvalid">
-        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
-        <target state="translated">資料收集器的易記名稱 '{0}' 無效。該資料收集器將予忽略。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DbgTrcMessagesBanner">
-        <source>Debug Traces Messages:</source>
-        <target state="translated">偵錯追蹤訊息:</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableBlameUsage">
-        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
-      It creates an output file in the current directory as "Sequence.xml",
-      that captures the order of execution of test before the crash.
-      You may optionally choose to collect process dump for the test host.
-      When you choose to collect dump, by default, a mini dump will be collected on a crash.
-      You may also choose to override this default behaviour by some optional parameters:
-      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
-      DumpType - To specify dump type (mini/full).
-      Example: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
-        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
-      以 blame 模式執行測試。此選項在隔離造成測試主機當機的問題測試時相當實用。
-      它會在目前的目錄建立輸出檔案 "Sequence.xml"，
-      該檔案會擷取當機前的測試執行順序。
-      您也可以選擇收集測試主機的處理序傾印。
-      當您選擇收集傾印時，預設會在當機時收集迷你傾印／
-      您也可以選擇使用一些選用參數來覆寫此預設行為:
-      CollectAlways - 即使沒有當機，也在離開時收集傾印 (true/false) 
-      DumpType - 指定傾印類型 (mini/full)。
-      範例: /Blame
-               /Blame:CollectDump
-               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAborted">
-        <source>Test Run Aborted.</source>
-        <target state="translated">測試回合已中止。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunCanceled">
-        <source>Test Run Canceled.</source>
-        <target state="translated">測試回合已取消。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="OpenResponseFileError">
-        <source>Error opening response file '{0}'</source>
-        <target state="translated">開啟回應檔案 '{0}' 時發生錯誤</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ResponseFileArgumentHelp">
-        <source>@&lt;file&gt;
-      Read response file for more options.</source>
-        <target state="translated">@&lt;檔案&gt;
-      讀取回應檔以取得更多選項。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
-        <source>Total tests: Unknown</source>
-        <target state="translated">測試數總計: 未知</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="StringFormatToJoinTwoStrings">
-        <source>{0} {1}</source>
-        <target state="translated">{0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
-        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
-        <target state="translated">此外，可使用 /TestAdapterPath 命令，指定要測試配接器的路徑。範例為 /TestAdapterPath:&lt;自訂配接器的路徑&gt;。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="UseVsixExtensionsDeprecation">
-        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
-        <target state="translated">/UseVsixExtensions 即將淘汰。請改用 /TestAdapterPath。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="DisableAutoFakesUsage">
-        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     Example: /DisableAutoFakes:true</source>
-        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
-     範例: /DisableAutoFakes:true</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="CollectWithTestSettingErrorMessage">
-        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
-        <target state="translated">若使用測試設定來設定測試回合，則不支援 --Collect|/Collect:"{0}"。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="RunsettingsWithDCErrorMessage">
-        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
-        <target state="translated">除了程式碼涵蓋範圍與 Microsoft Fakes 以外，內嵌測試設定不支援透過回合設定來設定的資料收集器。如需詳細資訊，請參閱 https://aka.ms/vstest-configure-datacollector。回合設定: {0}。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnableLoggerArgumentsInNetCore">
-        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
-      Specify a logger for test results. For example, to log results into a 
-      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
-      Creates file in TestResults directory with given LogFileName.
-
-      Change the verbosity level in log messages for console logger as shown below
-      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
-      Allowed values for verbosity: quiet, minimal, normal and detailed.
-
-      Change the diagnostic level prefix for console logger as shown below
-      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
-      More info on Console Logger here : https://aka.ms/console-logger</source>
-        <target state="translated">--logger|/logger:&lt;記錄器 URI/易記名稱&gt;
-      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=&lt;預設為唯一的檔案名稱&gt;]，
-      將結果記錄至 Visual Studio 測試結果檔案 (TRX)
-      以指定的 LogFileName，在 TestResults 目錄中建立檔案。
-
-      變更主控台記錄器的記錄訊息詳細程度等級，如下所示
-      範例: /logger:console;verbosity=&lt;預設為 "minimal"&gt;
-      詳細程度的允許值: quiet、minimal、normal 以及 detailed。
-
-      變更主控台記錄器的診斷等級前置詞，如下所示
-      範例: /logger:console;prefix=&lt;預設為 "false"&gt;
-      主控台記錄器詳細資訊於此: https://aka.ms/console-logger</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
-        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
-        <target state="translated">此平台不支援使用 CollectDump for Blame 選項收集損毀傾印。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameIncorrectOption">
-        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
-        <target state="translated">以 blame 指定的 blame 參數 {0} 無效，即將忽略此參數。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagFilePath">
-        <source>Diag file path '{0}' is not valid.</source>
-        <target state="translated">診斷檔案路徑 '{0}' 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidBlameArgument">
-        <source>Blame argument '{0}' is not valid.</source>
-        <target state="translated">Blame 引數 '{0}' 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidDiagArgument">
-        <source>Diag argument '{0}' is not valid.</source>
-        <target state="translated">診斷引數 '{0}' 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidLoggerArgument">
-        <source>Logger argument '{0}' is not valid.</source>
-        <target state="translated">記錄器引數 '{0}' 無效。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="Framework35NotSupported">
-        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
-        <target state="translated">不支援 Framework35。若是目標為 .Net Framework 3.5 的專案，就會在 CLR 4.0「相容模式」中執行測試。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ProgressIndicatorString">
-        <source>Test run in progress</source>
-        <target state="translated">測試回合正在進行中</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryTotalTests">
-        <source>Total tests: {0}</source>
-        <target state="translated">測試數總計: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryFailedTests">
-        <source>     Failed: {0}</source>
-        <target state="translated">     失敗: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryPassedTests">
-        <source>     Passed: {0}</source>
-        <target state="translated">     通過: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummarySkippedTests">
-        <source>    Skipped: {0}</source>
-        <target state="translated">    跳過: {0}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidArgument">
-        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
-        <target state="translated">{0} 的引數無效。請使用 /help 選項查看有效引數的清單。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestSourcesDiscovered">
-        <source>A total of {0} test files matched the specified pattern.</source>
-        <target state="translated">總共有 {0} 個測試檔案與指定的模式相符。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="InvalidTestRunParameterArgument">
-        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
-     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
-        <target state="translated">測試回合參數的引數 '{0}' 無效。請使用下面的格式。
-     格式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
-        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
-        <target state="translated">此平台不支援使用 Blame 的 CollectDump 及 TestTimeout 選項收集懸置傾印。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummary">
-        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
-        <target state="translated">{0} - 失敗: {1}，通過: {2}，略過: {3}，總計: {4}，持續時間: {5}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="None">
-        <source>None</source>
-        <target state="translated">無</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunSummaryAssemblyAndFramework">
-        <source> - {0} {1}</source>
-        <target state="translated"> - {0} {1}</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentArgumentHelp">
-        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
-      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
-      
-      This argument can be specified multiple times to provide multiple variables.
-
-      Example: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
-        <target state="translated">-e|--Environment|/e|/Environment: &lt;NAME&gt;=&lt;VALUE&gt;
-      設定環境變數的值。若變數不存在，則加以建立；若有則予以覆寫。這表示 /InIsolation 會在隔離流程中將測試切換並強制執行。
-      
-      此引數可供多次指定，以提供多項變數。
-
-      範例: -e:VARIABLE1=VALUE1
-               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
-               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="EnvironmentVariableXIsOverriden">
-        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
-        <target state="translated">已定義環境變數 '{0}'，但其已由 -Environment 引數覆寫。</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="TestRunAbortedWithError">
-        <source>Test Run Aborted with error {0}.</source>
-        <target state="translated">測試執行已中止，錯誤 {0}。</target>
-        <note></note>
-      </trans-unit>
-    </body>
-  </file>
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" original="../Resources.resx" target-language="zh-Hant">
+    <body>
+      <trans-unit id="FileNotFound">
+        <source>'{0}' not found.</source>
+        <target state="translated">找不到 '{0}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableDiscoverersHeaderMessage">
+        <source>The following Test Discovery Add-Ins are available:</source>
+        <target state="translated">可使用下列測試探索增益集:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExecutorsHeaderMessage">
+        <source>The following Test Execution Add-Ins are available:</source>
+        <target state="translated">可使用下列測試執行增益集:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableExtensionsMetadataFormat">
+        <source>        {0}: {1}</source>
+        <target state="translated">        {0}: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableLoggersHeaderMessage">
+        <source>The following Test Logger Add-Ins are available:</source>
+        <target state="translated">可使用下列測試記錄器增益集:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineError">
+        <source>Error: {0}</source>
+        <target state="translated">錯誤: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommaSeparatedFormat">
+        <source>, {0}</source>
+        <target state="translated">，{0}</target>
+        <note>Format used to comma separate a list of values.</note>
+      </trans-unit>
+      <trans-unit id="DuplicateArgumentError">
+        <source>The parameter "{0}" should be provided only once.</source>
+        <target state="translated">參數 " {0}" 應該僅提供一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExceptionFromExtension">
+        <source>Exception occurred when instantiating extension '{0}': {1}</source>
+        <target state="translated">產生延伸模組時發生例外狀況 '{0}': {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHeaderMessage">
+        <source>The following Tests are available:</source>
+        <target state="translated">可使用下列測試:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentProcessorFound">
+        <source>Unrecognized parameter "{0}".</source>
+        <target state="translated">無法辨識的參數 "{0}"。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourceFileNotFound">
+        <source>The test source file "{0}" provided was not found.</source>
+        <target state="translated">找不到提供的測試來源檔案 "{0}"。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriInvalid">
+        <source>The Test Logger URI '{0}' is not valid.  The Test Logger will be ignored.</source>
+        <target state="translated">測試記錄器 URI '{0}' 無效。將忽略測試記錄器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineInformational">
+        <source>Information: {0}</source>
+        <target state="translated">資訊: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CommandLineWarning">
+        <source>Warning: {0}</source>
+        <target state="translated">警告: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentHelp">
+        <source>-?|--Help|/?|/Help
+      Display this usage message.</source>
+        <target state="translated">-?|--Help|/?|/Help
+      顯示此使用方式訊息。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MicrosoftCommandLineTitle">
+        <source>VSTest version {0}</source>
+        <target state="translated">VSTest 版本 {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggersArgumentHelp">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "normal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;記錄器 URI/易記名稱&gt;
+      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=&lt;預設為唯一的檔案名稱&gt;]，
+      將結果記錄至 Visual Studio 測試結果檔案 (TRX)
+      以指定的 LogFileName，在 TestResults 目錄中建立檔案。
+
+      變更主控台記錄器的記錄訊息詳細程度等級，如下所示
+      範例: /logger:console;verbosity=&lt;預設為 "normal"&gt;
+      詳細程度的允許值: quiet、minimal、normal 以及 detailed。
+
+      變更主控台記錄器的診斷等級前置詞，如下所示
+      範例: /logger:console;prefix=&lt;預設為 "false"&gt;
+      主控台記錄器詳細資訊於此: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpDescriptionText">
+        <source>Description: Runs tests from the specified files.</source>
+        <target state="translated">描述: 從指定的檔案執行測試。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpOptionsText">
+        <source>Options:</source>
+        <target state="translated">選項:</target>
+        <note>Section Header for subsequent command help listing</note>
+      </trans-unit>
+      <trans-unit id="HelpUsageText">
+        <source>Usage: vstest.console.exe [Arguments] [Options] [[--] &lt;RunSettings arguments&gt;...]]</source>
+        <target state="translated">用法: vstest.console.exe [引數] [選項] [[--] &lt;RunSettings 引數&gt;...]]</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MissingTestSourceFile">
+        <source>No test source files were specified.</source>
+        <target state="translated">未指定測試來源檔案。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoArgumentsProvided">
+        <source>No arguments were specified.</source>
+        <target state="translated">未指定引數。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunTestsArgumentHelp">
+        <source>[TestFileNames]
+      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern
+      by spaces. Set console logger verbosity to detailed to view matched test files.
+      Examples: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</source>
+        <target state="translated">[TestFileNames]
+      從指定的檔案或萬用字元模式執行測試。分隔多個測試檔名稱或模式
+      由空格分隔。將主控台記錄器詳細程度設定為詳細來檢視符合的測試檔案。
+      範例: mytestproject.dll
+                mytestproject.dll myothertestproject.exe
+                testproject*.dll my*project.dll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AvailableSettingsProvidersHeaderMessage">
+        <source>The following Settings Providers Add-Ins are available:</source>
+        <target state="translated">可使用下列設定提供者增益集:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsArgumentHelp">
+        <source>--Settings|/Settings:&lt;Settings File&gt;
+      Settings to use when running tests.</source>
+        <target state="translated">--Settings|/Settings:&lt;設定檔&gt;
+      執行測試時要使用的設定。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsRequired">
+        <source>The /Settings parameter requires a settings file to be provided.</source>
+        <target state="translated">/Settings 參數要求必須提供設定檔。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSettingsFileNotFound">
+        <source>The Settings file '{0}' could not be found.</source>
+        <target state="translated">找不到設定檔 '{0}'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunFailed">
+        <source>Test Run Failed.</source>
+        <target state="translated">測試回合失敗。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSuccessful">
+        <source>Test Run Successful.</source>
+        <target state="translated">測試回合成功。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidInIsolationCommand">
+        <source>Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.</source>
+        <target state="translated">'InIsolation' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /InIsolation)，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsValueRequired">
+        <source>The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions 參數需要一個值。如果為 'true'，已安裝的 VSIX 延伸模組 (如果有的話) 將用於測試回合。如果為 false，則會加以忽略。範例:  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidUseVsixExtensionsCommand">
+        <source>Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.</source>
+        <target state="translated">'UseVsixExtensions' 命令中不應該使用引數 {0}。請指定命令指出應該使用或略過 VSIX 延伸模組 (範例: vstest.console.exe myTests.dll /UseVsixExtensions:true) 並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationHelp">
+        <source>--InIsolation|/InIsolation
+      Runs the tests in an isolated process. This makes vstest.console.exe 
+      process less likely to be stopped on an error in the tests, but tests 
+      may run slower.</source>
+        <target state="translated">--InIsolation|/InIsolation
+      在隔離的處理序中執行測試。這樣會降低 vstest.console.exe 
+      處理序在測試中發生錯誤而停止的可能性，但是測試 
+      可能會執行得較慢。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsHelp">
+        <source>/UseVsixExtensions
+      This makes vstest.console.exe process use or skip the VSIX extensions 
+      installed(if any) in the test run. 
+      Example  /UseVsixExtensions:true</source>
+        <target state="translated">/UseVsixExtensions
+      這可讓 vstest.console.exe 處理序使用或略過測試回合中 
+      已安裝的 VSIX 延伸模組 (如果有的話)。
+      範例  /UseVsixExtensions:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BatchSizeRequired">
+        <source>The /BatchSize argument requires the size of the batch.  Example:  /BatchSize:10</source>
+        <target state="translated">/BatchSize 引數必須有批次的大小。範例:  /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBatchSize">
+        <source>Invalid batch size {0}. The batch size should be greater than zero. Example:  /BatchSize:10</source>
+        <target state="translated">批次大小無效 {0}。批次大小應該大於零。範例:  /BatchSize:10</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Examples">
+        <source>  To run tests:
+    &gt;vstest.console.exe tests.dll 
+  To run tests with additional settings such as  data collectors:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</source>
+        <target state="translated">  執行測試:
+    &gt;vstest.console.exe tests.dll 
+  執行測試，同時附上像是資料收集器等其他設定:
+    &gt;vstest.console.exe  tests.dll /Settings:Local.RunSettings</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListDiscoverersHelp">
+        <source>/ListDiscoverers
+      Lists installed test discoverers.</source>
+        <target state="translated">/ListDiscoverers
+      列出已安裝的測試探索程式。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListExecutorsHelp">
+        <source>/ListExecutors
+      Lists installed test executors.</source>
+        <target state="translated">/ListExecutors
+      列出已安裝的測試執行程式。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListLoggersHelp">
+        <source>/ListLoggers
+      Lists installed test loggers.</source>
+        <target state="translated">/ListLoggers
+      列出已安裝的測試記錄器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListSettingsProvidersHelp">
+        <source>/ListSettingsProviders
+      Lists installed test settings providers.</source>
+        <target state="translated">/ListSettingsProviders
+      列出已安裝的測試設定提供者。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ListTestsHelp">
+        <source>-lt|--ListTests|/lt|/ListTests:&lt;File Name&gt;
+      Lists all discovered tests from the given test container.</source>
+        <target state="translated">-lt|--ListTests|/lt|/ListTests:&lt;檔案名稱&gt;
+      列出所有從指定測試容器探索到的測試。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TimeElapsed">
+        <source>Time elapsed :</source>
+        <target state="translated">經過時間:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SpecificTestsRequired">
+        <source>The /Tests argument requires one or more specific test names or their substrings.
+       Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </source>
+        <target state="translated">/Tests 引數必須有一或多個特定的測試名稱或它們的子字串。
+       範例: /Tests:TestsMethod1, /Tests:TestMethod1,method2 </target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableAfterFiltering">
+        <source>A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">已探索到總計 {0} 個測試，但沒有測試符合指定的選取準則 ({1})。請使用正確的值，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SearchStringDelimiter">
+        <source>,</source>
+        <target state="translated">，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSpecificTestsHelp">
+        <source>--Tests|/Tests:&lt;Test Names&gt;
+      Run tests with names that match the provided values. To provide multiple
+      values, separate them by commas.
+      Examples: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</source>
+        <target state="translated">--Tests|/Tests:&lt;測試名稱&gt;
+      對名稱符合所提供值的項目執行測試。
+      若要提供多個值，請使用逗號將其分隔。
+      範例: /Tests:TestMethod1
+                /Tests:TestMethod1,testMethod2</target>
+        <note>Please verify if the console output looks good after modifiaction. </note>
+      </trans-unit>
+      <trans-unit id="SwitchToNoIsolation">
+        <source>Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔離模式執行測試，因為在 runsettings 中已啟用診斷資料配接器。使用 /inIsolation 參數可隱藏這個警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔離模式執行 Windows 市集應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">執行 Windows 市集應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFriendlyNameFormat">
+        <source>        FriendlyName: {0}</source>
+        <target state="translated">        FriendlyName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExtensionUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SettingFormat">
+        <source>        SettingName: {0}</source>
+        <target state="translated">        SettingName: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileTypesIndicator">
+        <source>        Supported File Types:</source>
+        <target state="translated">        支援的檔案類型:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithoutSeparator">
+        <source> {0}</source>
+        <target state="translated"> {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SupportedFileWithSeparator">
+        <source> {0},</source>
+        <target state="translated"> {0}，</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UriOfDefaultExecutor">
+        <source>        Default Executor Uri: {0}</source>
+        <target state="translated">        預設執行程式 URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerUriFormat">
+        <source>        Uri: {0}</source>
+        <target state="translated">        URI: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPlatformType">
+        <source>Invalid platform type: {0}. Valid platform types are {1}.</source>
+        <target state="translated">平台類型無效: {0}。有效的平台類型為{1}。</target>
+        <note>0 is the platform type e.g. x86, and 1 is a list of the built in platforms, e.g. x86, x64</note>
+      </trans-unit>
+      <trans-unit id="PlatformTypeRequired">
+        <source>The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86</source>
+        <target state="translated">/Platform 引數需要提供測試回合的目標平台類型。範例:  /Platform:x86</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PlatformArgumentHelp">
+        <source>--Platform|/Platform:&lt;Platform type&gt;
+      Target platform architecture to be used for test execution. 
+      Valid values are x86, x64 and ARM.</source>
+        <target state="translated">--Platform|/Platform:&lt;平台類型&gt;
+      用於測試執行的目標平台架構。
+      有效值為 x86、x64 和 ARM。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInMultiTargetingMode">
+        <source>Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.</source>
+        <target state="translated">依照測試回合的有效平台 {0} 和 .Net Framework {1} 設定的要求，使用隔離模式執行測試。使用 /inIsolation 參數可隱藏這個警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkArgumentHelp">
+        <source>--Framework|/Framework:&lt;Framework Version&gt;
+      Target .Net Framework version to be used for test execution. 
+      Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc.
+      Other supported values are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">--Framework|/Framework:&lt;Framework 版本&gt;
+      用於測試執行的目標.Net Framework 版本。 
+      有效的值為 ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" 等等。
+      其他支援的值為 Framework40、Framework45、FrameworkCore10 與 FrameworkUap10。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FrameworkVersionRequired">
+        <source>The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:".NETFramework,Version=v4.5.1"</source>
+        <target state="translated">/Framework 引數需要測試回合的目標 .NET Framework 版本。   範例: /Framework:".NETFramework,Version=v4.5.1"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidFrameworkVersion">
+        <source>Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.</source>
+        <target state="translated">.Net Framework 版本無效:{0}。請提供 TargetFramework 的全名 (例如: .NETCoreApp,Version=v2.0)。其他支援的 .Net Framework 版本為 Framework40、Framework45、FrameworkCore10 以及 FrameworkUap10。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppContainerTestPrerequisiteFail">
+        <source>Could not start test run for unit tests for Windows Store app: {0}.</source>
+        <target state="translated">無法針對 Windows 市集應用程式的單元測試啟動測試回合: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterArgumentHelp">
+        <source>--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      Run tests that match the given expression.
+      &lt;Expression&gt; is of the format &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         where Operator is one of =, != or ~  (Operator ~ has 'contains'
+         semantics and is applicable for string properties like DisplayName).
+         Parenthesis () can be used to group sub-expressions.
+      Examples: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</source>
+        <target state="translated">--TestCaseFilter|/TestCaseFilter:&lt;Expression&gt;
+      執行符合指定運算式的測試。
+      &lt;Expression&gt; 的格式為 &lt;property&gt;Operator&lt;value&gt;[|&amp;&lt;Expression&gt;]
+         其中 Operator 是 =、!= 或 ~ 的其中之一 (運算子 ~ 具有 'contains'
+         語意，且適用於 DisplayName 之類的字串屬性)。
+         您可以使用括號 () 來分組子運算式。
+      範例: /TestCaseFilter:"Priority=1"
+                /TestCaseFilter:"(FullyQualifiedName~Nightly
+                                  |Name=MyTestMethod)"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestCaseFilterValueRequired">
+        <source>The /TestCaseFilter argument requires the filter value.
+        Filter value can be &lt;property&gt;=&lt;value&gt; type.
+        Examples: "Priority=1", "TestCategory=Nightly"</source>
+        <target state="translated">/TestCaseFilter 引數需要篩選值。
+        篩選值可以是 &lt;property&gt;=&lt;value&gt; 類型。
+        範例: "Priority=1", "TestCategory=Nightly"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestCaseFilterValueForSpecificTests">
+        <source>The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.</source>
+        <target state="translated">/TestCaseFilter 引數無法與 /Tests 一起指定。若已指定測試，則篩選測試案例不適用。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NonDefaultFrameworkAndOrArchDetected">
+        <source>{0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.</source>
+        <target state="translated">{0} 為針對 {1}/{2} 所建置。回合中指定的測試組件應該具有共同的目標 .Net Framework 和平台。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunSingleAppContainerSource">
+        <source>Only one app package (.appx file) can be specified for running tests.</source>
+        <target state="translated">您只能為執行測試指定一個應用程式套件 (.appx 檔)。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingDiscovery">
+        <source>Starting test discovery, please wait...</source>
+        <target state="translated">正在啟動測試探索，請稍候...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingExecution">
+        <source>Starting test execution, please wait...</source>
+        <target state="translated">正在啟動測試執行，請稍候...</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDCOnExceptionWhileParsingDCInfo">
+        <source>Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.</source>
+        <target state="translated">讀取診斷資料配接器設定時擲回執行中的 '{0}'。這個回合中將略過所有診斷資料配接器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableCodeCoverageArgumentProcessorHelp">
+        <source>/EnableCodeCoverage
+      Enables data collector 'CodeCoverage' for the test run.</source>
+        <target state="translated">/EnableCodeCoverage
+      為測試回合啟用資料收集器 'CodeCoverage'。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidEnableCodeCoverageCommand">
+        <source>Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.</source>
+        <target state="translated">'EnableCodeCoverage' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /EnableCodeCoverage)，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.</source>
+        <target state="translated">應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows 市集應用程式的單元測試，請使用 Windows 市集應用程式單元測試程式庫專案建立應用程式套件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows 市集應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SomeTestsUnavailableAfterFiltering">
+        <source>A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.</source>
+        <target state="translated">已探索到總計 {0} 個測試，但有些測試不符合指定的選取準則 ({1})。請使用正確的值並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathHelp">
+        <source>--TestAdapterPath|/TestAdapterPath
+      This makes vstest.console.exe process use custom test adapters
+      from a given path (if any) in the test run. 
+      Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;</source>
+        <target state="translated">--TestAdapterPath|/TestAdapterPath
+      這可讓 vstest.console.exe 處理序在測試回合中，
+      使用指定路徑 (如有指定) 中的自訂測試配接器。
+      範例 /TestAdapterPath:&lt;自訂配接器的路徑&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequired">
+        <source>The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters</source>
+        <target state="translated">/TestAdapterPath 參數需要一個值，這個值是包含自訂測試配接器之位置的路徑。範例:  /TestAdapterPath:c:\MyCustomAdapters</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestAdapterPathCommand">
+        <source>The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}</source>
+        <target state="translated">'TestAdapterPath' 中指定的路徑 '{0}' 無效。錯誤: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterPathDoesNotExist">
+        <source>The custom test adapter search path provided was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到提供的自訂測試配接器搜尋路徑。請提供有效的路徑，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoAdaptersFoundInTestAdapterPath">
+        <source>The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.</source>
+        <target state="translated">'TestAdapterPath' 中指定的路徑 '{0}' 不包含任何測試配接器。請提供有效的路徑，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneAppContainerTestPrerequisiteFail">
+        <source>Could not start test run for the tests for Windows Phone app: {0}.</source>
+        <target state="translated">無法為 Windows Phone 應用程式的測試啟動測試回合: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SwitchToIsolationInPhoneAppContainerMode">
+        <source>Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.</source>
+        <target state="translated">使用隔離模式執行 Windows Phone 應用程式的單元測試。使用 /InIsolation 參數可隱藏這個警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingCodeCoverageInPhoneAppContainerTestExecution">
+        <source>Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.</source>
+        <target state="translated">Windows Phone 應用程式無法使用程式碼涵蓋範圍。將略過這個測試回合的程式碼涵蓋範圍分析。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisablingDataCollectionInPhoneAppContainerTestExecution">
+        <source>Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.</source>
+        <target state="translated">執行 Windows Phone 應用程式的單元測試時，不支援診斷資料配接器。請從設定中移除診斷資料配接器設定。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PhoneNoTestEntryPoint">
+        <source>App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.</source>
+        <target state="translated">應用程式套件 '{0}' 沒有測試執行程式進入點。若要執行 Windows Phone 應用程式的單元測試，請使用 Windows Phone 單元測試應用程式專案建立應用程式套件。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSettingsFrameworkMismatch">
+        <source>Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.</source>
+        <target state="translated">使用架構 {0} 執行測試。指定 /Framework:{1} 可隱藏這個警告。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AppxBundleSourceWarning">
+        <source>No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.</source>
+        <target state="translated">在指定的測試容器中找不到測試。此外，Microsoft Windows 市集單元測試配接器不支援 .appxbundle 檔案。請在建立應用程式套件時建立 appx (將 [產生應用程式套件組合] 選項設定為 [永不])，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParallelArgumentProcessorHelp">
+        <source>--Parallel|/Parallel
+      Specifies that the tests be executed in parallel. By default up
+      to all available cores on the machine may be used.
+      The number of cores to use may be configured using a settings file.</source>
+        <target state="translated">--Parallel|/Parallel
+      指定平行執行測試。根據預設，最多會使用
+      機器上所有的可用核心。可使用設定檔設定
+      要使用的核心數。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParallelCommand">
+        <source>Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.</source>
+        <target state="translated">'Parallel' 命令中不應該使用引數 {0}。請指定不加引數的命令 (範例: vstest.console.exe myTests.dll /Parallel)，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CannotBeNullOrEmpty">
+        <source>Cannot be null or empty</source>
+        <target state="translated">不可為 null 或空白</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PortArgumentHelp">
+        <source>--Port|/Port:&lt;Port&gt;
+      The Port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port:&lt;連接埠&gt;
+      通訊端連線以及接收事件訊息的連接埠。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidPortArgument">
+        <source>The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.</source>
+        <target state="translated">--Port|/Port 引數需要整數的連接埠號碼。指定用於通訊端連線以及接收事件訊息的連接埠。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AssemblyPathInvalid">
+        <source>Unable to find the assembly under test. Please make sure that the project is built.</source>
+        <target state="translated">找不到正在進行測試的組件。請確定已建置專案。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProjectPathNotFound">
+        <source>The Path {0} does not exist.</source>
+        <target state="translated">路徑 {0} 不存在。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathArgumentHelp">
+        <source>--BuildBasePath|/BuildBasePath:&lt;BuildBasePath&gt;
+      The directory containing the temporary outputs.</source>
+        <target state="translated">--BuildBasePath|/BuildBasePath:&lt;建置基底路徑&gt;
+      包含暫存輸出的目錄。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ConfigurationArgumentHelp">
+        <source>-c|--Configuration|/c|/Configuration:&lt;Configuration&gt;
+      The configuration the project is built for i.e. Debug/Release</source>
+        <target state="translated">-c|--Configuration|/c|/Configuration:&lt;組態&gt;
+      建置專案標的組態，例如，偵錯/發行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidConfiguration">
+        <source>The given configuration is invalid.</source>
+        <target state="translated">給定的組態無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputArgumentHelp">
+        <source>-o|--Output|/o|/Output:&lt;Output&gt;
+      The directory containing the binaries to run.</source>
+        <target state="translated">-o|--Output|/o|/Output:&lt;輸出&gt;
+      包含要執行的二進位檔案的目錄。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BuildBasePathNotFound">
+        <source>The BuildBasePath was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到 BuildBasePath。請提供有效的路徑，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OutputPathNotFound">
+        <source>The Output path was not found, provide a valid path and try again.</source>
+        <target state="translated">找不到輸出路徑。請提供有效的路徑，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AddnlInfoMessagesBanner">
+        <source>Additional Information Messages:</source>
+        <target state="translated">其他資訊訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Days">
+        <source>Days</source>
+        <target state="translated">日</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorMessageBanner">
+        <source>Error Message:</source>
+        <target state="translated">錯誤訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ExecutionTimeFormatString">
+        <source> Total time: {0:0.0000} {1}</source>
+        <target state="translated"> 時間總計: {0:0.0000} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Hours">
+        <source>Hours</source>
+        <target state="translated">小時</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerNotFound">
+        <source>Could not find a test logger with URI or FriendlyName '{0}'.</source>
+        <target state="translated">找不到具有 URI 或 FriendlyName '{0}' 的測試記錄器。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Minutes">
+        <source>Minutes</source>
+        <target state="translated">分鐘</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Seconds">
+        <source>Seconds</source>
+        <target state="translated">秒</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StacktraceBanner">
+        <source>Stack Trace:</source>
+        <target state="translated">堆疊追蹤:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdErrMessagesBanner">
+        <source>Standard Error Messages:</source>
+        <target state="translated">標準錯誤訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StdOutMessagesBanner">
+        <source>Standard Output Messages:</source>
+        <target state="translated">標準輸出訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentsBanner">
+        <source>Attachments:</source>
+        <target state="translated">附件:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="AttachmentOutputFormat">
+        <source>  {0}</source>
+        <target state="translated">  {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NoTestsAvailableInSources">
+        <source>No test is available in {0}. Make sure that installed test discoverers &amp; executors, platform &amp; framework version settings are appropriate and try again.</source>
+        <target state="translated">{0} 中沒有可供使用的測試。請確定已安裝適當的測試探索程式及執行程式、平台與 Framework 版本設定，並再試一次。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="FailedTestIndicator">
+        <source>Failed</source>
+        <target state="translated">失敗</target>
+        <note>Message which is written to the console when a test fails.</note>
+      </trans-unit>
+      <trans-unit id="PassedTestIndicator">
+        <source>Passed</source>
+        <target state="translated">已通過</target>
+        <note>Message which is written to the console when a test passes.</note>
+      </trans-unit>
+      <trans-unit id="SkippedTestIndicator">
+        <source>Skipped</source>
+        <target state="translated">已跳過</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DiscoveryFailed">
+        <source>Discovery failed for given sources. Exception : {0}</source>
+        <target state="translated">給定來源的探索失敗。例外狀況: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ParentProcessIdArgumentHelp">
+        <source>--ParentProcessId|/ParentProcessId:&lt;ParentProcessId&gt;
+      Process Id of the Parent Process responsible for launching current process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId:&lt;父處理序識別碼&gt;
+      負責啟動目前處理序的父處理序之處理序識別碼。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidParentProcessIdArgument">
+        <source>The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.</source>
+        <target state="translated">--ParentProcessId|/ParentProcessId 引數需要整數的處理序識別碼。請為已啟動這個處理序的父處理序指定處理序識別碼。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="HelpArgumentsText">
+        <source>Arguments:</source>
+        <target state="translated">引數:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableDiagUsage">
+        <source>--Diag|/Diag:&lt;Path to log file&gt;
+      Enable logs for test platform.
+      Logs are written to the provided file.
+
+      Change the trace level for logs as shown below
+      Example: /Diag:&lt;Path to log file&gt;;tracelevel=&lt;Defaults to "verbose"&gt;
+      Allowed values for tracelevel: off, error, warning, info and verbose.</source>
+        <target state="translated">--Diag|/Diag:&lt;日誌檔路徑&gt;
+      啟用測試平台的記錄檔。
+      記錄會寫入提供的檔案。
+
+      變更記錄檔的追蹤層級，如下所示
+      範例: /Diag:&lt;日誌檔路徑&gt;;tracelevel=&lt;預設為 [詳細資訊]&gt;
+      允許的 tracelevel 值為: 關閉、錯誤、警告、資訊與詳細資訊。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="LoggerFileIsReadOnly">
+        <source>The file {0} provided is read only</source>
+        <target state="translated">提供的檔案 {0} 為唯讀</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DesignModeClientTimeoutError">
+        <source>Timeout to connect or process request for DesignModeClient on port: {0}</source>
+        <target state="translated">連線或處理連接埠 {0} 上對於 DesignModeClient 之要求的逾時時間:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="NotRunTestIndicator">
+        <source>Not Run</source>
+        <target state="translated">未執行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CLIRunSettingsArgumentHelp">
+        <source>RunSettings arguments:
+      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after "-- ". Note the space after --. 
+      Use a space to separate multiple [name]=[value].
+      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments</source>
+        <target state="translated">RunSettings 引數:
+      透過命令列傳遞 runsettings 組態的引數。引數可以接在 "-- " 之後，以 [名稱]=[值] 的格式指定名稱/值配對。請注意 -- 之後的空格。
+      使用空格以隔開多個 [名稱]=[值]。
+      RunSettings 引數支援的詳細資訊: https://aka.ms/vstest-runsettings-arguments</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="MalformedRunSettingsKey">
+        <source>One or more runsettings provided contain invalid token</source>
+        <target state="translated">提供的一或多個 runsettings 包含無效的語彙基元</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryArgumentHelp">
+        <source>--ResultsDirectory|/ResultsDirectory
+      Test results directory will be created in specified path if not exists.
+      Example  /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
+        <target state="translated">--ResultsDirectory|/ResultsDirectory
+      若不存在，將會於指定路徑中建立測試結果目錄。
+      範例  /ResultsDirectory:&lt;結果目錄路徑&gt;</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResultsDirectoryValueRequired">
+        <source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory</source>
+        <target state="translated">/ResultsDirectory 參數需要值，亦即測試結果的儲存位置。範例:  /ResultsDirectory:c:\MyTestResultsDirectory</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidResultsDirectoryPathCommand">
+        <source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
+        <target state="translated">'ResultsDirectory' 中指定的路徑 '{0}' 無效。錯誤: {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InIsolationDeprecated">
+        <source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
+        <target state="translated">/InIsolation 旗標已標示即將淘汰。測試一律會在個別的處理序中執行</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VstestDiagLogOutputPath">
+        <source>Logging Vstest Diagnostics in file: {0}</source>
+        <target state="translated">在檔案 {0} 中記錄 Vstest 診斷</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectArgumentHelp">
+        <source>--Collect|/Collect:&lt;DataCollector FriendlyName&gt;
+      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect</source>
+        <target state="translated">--Collect|/Collect:&lt;資料收集器易記名稱&gt;
+      為測試回合啟用資料收集器。此處有詳細資訊: https://aka.ms/vstest-collect</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DataCollectorFriendlyNameInvalid">
+        <source>The Data Collector friendly name '{0}' is not valid.  The Data Collector will be ignored.</source>
+        <target state="translated">資料收集器的易記名稱 '{0}' 無效。該資料收集器將予忽略。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DbgTrcMessagesBanner">
+        <source>Debug Traces Messages:</source>
+        <target state="translated">偵錯追蹤訊息:</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableBlameUsage">
+        <source>--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      Runs the test in blame mode. This option is helpful in isolating the problematic test causing test host crash.
+      It creates an output file in the current directory as "Sequence.xml",
+      that captures the order of execution of test before the crash.
+      You may optionally choose to collect process dump for the test host.
+      When you choose to collect dump, by default, a mini dump will be collected on a crash.
+      You may also choose to override this default behaviour by some optional parameters:
+      CollectAlways - To collect dump on exit even if there is no crash (true/false) 
+      DumpType - To specify dump type (mini/full).
+      Example: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</source>
+        <target state="translated">--Blame|/Blame:[CollectDump];[CollectAlways]=[Value];[DumpType]=[Value]
+      以 blame 模式執行測試。此選項在隔離造成測試主機當機的問題測試時相當實用。
+      它會在目前的目錄建立輸出檔案 "Sequence.xml"，
+      該檔案會擷取當機前的測試執行順序。
+      您也可以選擇收集測試主機的處理序傾印。
+      當您選擇收集傾印時，預設會在當機時收集迷你傾印／
+      您也可以選擇使用一些選用參數來覆寫此預設行為:
+      CollectAlways - 即使沒有當機，也在離開時收集傾印 (true/false) 
+      DumpType - 指定傾印類型 (mini/full)。
+      範例: /Blame
+               /Blame:CollectDump
+               /Blame:CollectDump;CollectAlways=true;DumpType=full</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAborted">
+        <source>Test Run Aborted.</source>
+        <target state="translated">測試回合已中止。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunCanceled">
+        <source>Test Run Canceled.</source>
+        <target state="translated">測試回合已取消。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="OpenResponseFileError">
+        <source>Error opening response file '{0}'</source>
+        <target state="translated">開啟回應檔案 '{0}' 時發生錯誤</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ResponseFileArgumentHelp">
+        <source>@&lt;file&gt;
+      Read response file for more options.</source>
+        <target state="translated">@&lt;檔案&gt;
+      讀取回應檔以取得更多選項。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+        <source>Total tests: Unknown</source>
+        <target state="translated">測試數總計: 未知</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StringFormatToJoinTwoStrings">
+        <source>{0} {1}</source>
+        <target state="translated">{0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="SuggestTestAdapterPathIfNoTestsIsFound">
+        <source>Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:&lt;pathToCustomAdapters&gt;.</source>
+        <target state="translated">此外，可使用 /TestAdapterPath 命令，指定要測試配接器的路徑。範例為 /TestAdapterPath:&lt;自訂配接器的路徑&gt;。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UseVsixExtensionsDeprecation">
+        <source>/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.</source>
+        <target state="translated">/UseVsixExtensions 即將淘汰。請改用 /TestAdapterPath。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="DisableAutoFakesUsage">
+        <source>--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     Example: /DisableAutoFakes:true</source>
+        <target state="translated">--DisableAutoFakes|/DisableAutoFakes:&lt;true/false&gt;
+     範例: /DisableAutoFakes:true</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="CollectWithTestSettingErrorMessage">
+        <source>--Collect|/Collect:"{0}" is not supported if test run is configured using testsettings.</source>
+        <target state="translated">若使用測試設定來設定測試回合，則不支援 --Collect|/Collect:"{0}"。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RunsettingsWithDCErrorMessage">
+        <source>Data collectors other than Code Coverage and Microsoft Fakes configured via run settings are not supported with embedded test settings. Please see https://aka.ms/vstest-configure-datacollector for more information. Run settings: {0}.</source>
+        <target state="translated">除了程式碼涵蓋範圍與 Microsoft Fakes 以外，內嵌測試設定不支援透過回合設定來設定的資料收集器。如需詳細資訊，請參閱 https://aka.ms/vstest-configure-datacollector。回合設定: {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnableLoggerArgumentsInNetCore">
+        <source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
+      Specify a logger for test results. For example, to log results into a 
+      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=&lt;Defaults to unique file name&gt;]
+      Creates file in TestResults directory with given LogFileName.
+
+      Change the verbosity level in log messages for console logger as shown below
+      Example: /logger:console;verbosity=&lt;Defaults to "minimal"&gt;
+      Allowed values for verbosity: quiet, minimal, normal and detailed.
+
+      Change the diagnostic level prefix for console logger as shown below
+      Example: /logger:console;prefix=&lt;Defaults to "false"&gt;
+      More info on Console Logger here : https://aka.ms/console-logger</source>
+        <target state="translated">--logger|/logger:&lt;記錄器 URI/易記名稱&gt;
+      指定測試結果的記錄器。例如，使用 /logger:trx[;LogFileName=&lt;預設為唯一的檔案名稱&gt;]，
+      將結果記錄至 Visual Studio 測試結果檔案 (TRX)
+      以指定的 LogFileName，在 TestResults 目錄中建立檔案。
+
+      變更主控台記錄器的記錄訊息詳細程度等級，如下所示
+      範例: /logger:console;verbosity=&lt;預設為 "minimal"&gt;
+      詳細程度的允許值: quiet、minimal、normal 以及 detailed。
+
+      變更主控台記錄器的診斷等級前置詞，如下所示
+      範例: /logger:console;prefix=&lt;預設為 "false"&gt;
+      主控台記錄器詳細資訊於此: https://aka.ms/console-logger</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpNotSupportedForPlatform">
+        <source>Collecting crash dumps by option CollectDump for Blame is not supported for this platform.</source>
+        <target state="translated">此平台不支援使用 CollectDump for Blame 選項收集損毀傾印。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameIncorrectOption">
+        <source>The blame parameter specified with blame, {0} is invalid. Ignoring this parameter.</source>
+        <target state="translated">以 blame 指定的 blame 參數 {0} 無效，即將忽略此參數。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagFilePath">
+        <source>Diag file path '{0}' is not valid.</source>
+        <target state="translated">診斷檔案路徑 '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidBlameArgument">
+        <source>Blame argument '{0}' is not valid.</source>
+        <target state="translated">Blame 引數 '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidDiagArgument">
+        <source>Diag argument '{0}' is not valid.</source>
+        <target state="translated">診斷引數 '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidLoggerArgument">
+        <source>Logger argument '{0}' is not valid.</source>
+        <target state="translated">記錄器引數 '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Framework35NotSupported">
+        <source>Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode".</source>
+        <target state="translated">不支援 Framework35。若是目標為 .Net Framework 3.5 的專案，就會在 CLR 4.0「相容模式」中執行測試。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProgressIndicatorString">
+        <source>Test run in progress</source>
+        <target state="translated">測試回合正在進行中</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryTotalTests">
+        <source>Total tests: {0}</source>
+        <target state="translated">測試數總計: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryFailedTests">
+        <source>     Failed: {0}</source>
+        <target state="translated">     失敗: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryPassedTests">
+        <source>     Passed: {0}</source>
+        <target state="translated">     通過: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummarySkippedTests">
+        <source>    Skipped: {0}</source>
+        <target state="translated">    跳過: {0}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidArgument">
+        <source>The argument {0} is invalid. Please use the /help option to check the list of valid arguments.</source>
+        <target state="translated">{0} 的引數無效。請使用 /help 選項查看有效引數的清單。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestSourcesDiscovered">
+        <source>A total of {0} test files matched the specified pattern.</source>
+        <target state="translated">總共有 {0} 個測試檔案與指定的模式相符。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestRunParameterArgument">
+        <source>The test run parameter argument '{0}' is invalid. Please use the format below.
+     Format: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</source>
+        <target state="translated">測試回合參數的引數 '{0}' 無效。請使用下面的格式。
+     格式: TestRunParameters.Parameter(name=\"&lt;name&gt;\", value=\"&lt;value&gt;\")</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="BlameCollectDumpTestTimeoutNotSupportedForPlatform">
+        <source>Collecting hang dumps by option CollectDump with TestTimeout for Blame is not supported for this platform.</source>
+        <target state="translated">此平台不支援使用 Blame 的 CollectDump 及 TestTimeout 選項收集懸置傾印。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummary">
+        <source>{0} - Failed: {1}, Passed: {2}, Skipped: {3}, Total: {4}, Duration: {5}</source>
+        <target state="translated">{0} - 失敗: {1}，通過: {2}，略過: {3}，總計: {4}，持續時間: {5}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target state="translated">無</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunSummaryAssemblyAndFramework">
+        <source> - {0} {1}</source>
+        <target state="translated"> - {0} {1}</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentArgumentHelp">
+        <source>-e|--Environment|/e|/Environment:&lt;NAME&gt;=&lt;VALUE&gt;
+      Sets the value of an environment variable. Creates the variable if it does not exist, overrides if it does. This will imply /InIsolation switch and force the tests to be run in an isolated process.
+      
+      This argument can be specified multiple times to provide multiple variables.
+
+      Example: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</source>
+        <target state="translated">-e|--Environment|/e|/Environment: &lt;NAME&gt;=&lt;VALUE&gt;
+      設定環境變數的值。若變數不存在，則加以建立；若有則予以覆寫。這表示 /InIsolation 會在隔離流程中將測試切換並強制執行。
+      
+      此引數可供多次指定，以提供多項變數。
+
+      範例: -e:VARIABLE1=VALUE1
+               -e:ANOTHER_VARIABLE="VALUE WITH SPACES"
+               -e:ANOTHER_VARIABLE="VALUE;seperated with;semicolons"</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EnvironmentVariableXIsOverriden">
+        <source>Environment variable '{0}' was already defined, but it's overridden by -Environment argument.</source>
+        <target state="translated">已定義環境變數 '{0}'，但其已由 -Environment 引數覆寫。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestRunAbortedWithError">
+        <source>Test Run Aborted with error {0}.</source>
+        <target state="translated">測試執行已中止，錯誤 {0}。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidTestSessionCorrelationId">
+        <source>Invalid testSessionCorrelationId</source>
+        <target state="translated">testSessionCorrelationId 無效</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyHelp">
+        <source>--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      This affects adapter loading behavior.
+
+      Currently supported behaviors:
+        - Explicit: Test Platform will only load adapters specified by /TestAdapterPath (or RunConfiguration.TestAdaptersPaths node). 
+                    If a specific adapter path is provided, adapter will be loaded; if a directory path is provided adapters directly in that folder will be loaded, unless Recursive option is also specified.
+                    If no adapter path is specified, test run will fail.
+                    This will imply /InIsolation switch and force the tests to be run in an isolated process.
+        
+        - Default: Test Platform will load adapters is if this argument has not been specified. 
+                   It will pick up extensions from next to source, provided additional adapter paths and from the default directory.
+
+        - DefaultRuntimeProviders: Load default runtime providers shipped with Test Platform. 
+                                   If this is not specified when "Explicit" option is set, a test host provider need to be specified explicitly.
+
+        - ExtensionsDirectory: Load adapters inside Extensions folder.
+
+        - NextToSource: Load adapters next to source. 
+
+        - Recursive: Recursively search folders when loading adapters. This requires "Explicit" or "NextToSource" to be specified too.</source>
+        <target state="translated">--TestAdapterLoadingStrategy|/TestAdapterLoadingStrategy:&lt;strategy&gt;
+      這會影響介面卡載入行為。
+
+      目前支援的行:
+        - 明確: 測試平台只會載入 /TestAdapterPath 指定的介面卡 (或 RunConfiguration.TestAdaptersPaths 節點)。
+                    如果提供特定介面卡路徑，將會載入介面卡; 如果目錄路徑是直接在該資料夾中提供介面卡，則會載入，除非同時指定 [Recursive] 選項。
+                    如果沒有指定介面卡路徑，測試回合將會失敗。
+                    這會隱含 /InIsolation 切換參數，並強制在隔離的處理常式中執行測試。
+        
+        - Default: 如果尚未指定此引數，則測試平台會載入介面卡。
+                   它會從來源旁邊、提供的額外介面卡路徑以及預設目錄中挑選擴充功能。
+
+        - DefaultRuntimeProviders: 載入測試平台隨附的預設執行階段提供者。
+                                   如果設定 [明確] 選項時未指定此項目，則必須明確指定測試主機提供者。
+
+        - ExtensionsDirectory: 在 [擴充功能] 資料夾內載入介面卡。
+
+        - NextToSource: 載入來源旁的介面卡。
+
+       - Recursive: 載入介面卡時，以遞迴方式搜尋資料夾。這需要也指定「明確」或「NextToSource」。</target>
+        <note>Do not translate "Default", "DefaultRuntimeProviders", "ExtensionsDirectory", "NextToSource" or "Recursive".</note>
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalid">
+        <source>Specified value ({0}) for /TestAdapterLoadingStrategy is invalid!</source>
+        <target state="translated">為 /TestAdapterLoadingStrategy 指定的值 ({0}) 無效!</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="TestAdapterLoadingStrategyValueInvalidRecursive">
+        <source>Recursive adapter loading strategy is cannot be used by itself. Please combine with one or more of: {0}</source>
+        <target state="translated">Recursive 介面卡載入策略無法自行使用。請結合一或多個: {0}</target>
+        <note>
+        - Do not translate "Recursive",
+        - {0} is the strategy names, seperated by comma: for example "Explicit, NextToSource"
+    </note>
+      </trans-unit>
+      <trans-unit id="TestAdapterPathValueRequiredWhenStrategyXIsUsed">
+        <source>The /TestAdapterPath parameter needs to be provided when "{0}" test adapter loading strategy is specified!</source>
+        <target state="translated">指定「{0}」測試介面卡載入策略時，必須提供 /TestAdapterPath 參數！</target>
+        <note>{0} is the strategy name, "Explicit" for example.</note>
+      </trans-unit>
+      <trans-unit id="WarningEmulatedOnArm64">
+        <source>vstest.console.exe is running in emulated mode as {0}. For better performance, please consider using the native runner vstest.console.arm64.exe.</source>
+        <target state="translated">vstest.console.exe 正在模擬模式下以 {0} 方式執行。為了獲得較佳效能，請考慮使用原生執行器 vstest.console.arm64.exe。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="RequestHandlerConnectionTimedOut">
+        <source>Waiting for request handler connection timed out after {0} seconds.</source>
+        <target state="translated">等待要求處理常式連線在 {0} 秒後逾時。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartTestSessionTimedOut">
+        <source>Waiting for start test session timed out after {0} seconds.</source>
+        <target state="translated">等待啟動測試工作階段在 {0} 秒後逾時。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StopTestSessionTimedOut">
+        <source>Waiting for stop test session timed out after {0} seconds.</source>
+        <target state="translated">等待停止測試工作階段在 {0} 秒後逾時。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ErrorHostingCommunicationChannel">
+        <source>Error hosting communication channel.</source>
+        <target state="translated">裝載通訊通道時發生錯誤。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpToolDirectoryPathArgumenNotFound">
+        <source>ProcDumpToolDirectoryPath should be specified to install or unistall the post mortem debugger.</source>
+        <target state="translated">應指定 ProcDumpToolDirectoryPath 以安裝或解除安裝事後剖析偵錯工具。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="PostmortemDebuggerNotSupportedForCurrentOS">
+        <source>Postmortem debugger is not supported in the current OS.</source>
+        <target state="translated">目前的作業系統不支援 Postmortem 偵錯工具。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpToolDirectoryPath">
+        <source>The directory specified for the procdump executable is not valid and the tool was not found inside environment variables (PROCDUMP_PATH, PATH)</source>
+        <target state="translated">指定給 procdump 可執行檔的目錄無效，而且在環境變數 (PROCDUMP_PATH, PATH) 中找不到工具</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpFileNameNotFound">
+        <source>Procdump file name not found: '{0}'</source>
+        <target state="translated">找不到 procdump 檔案名稱: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ProcDumpDirectoryPathArgumenNotFound">
+        <source>DumpDirectoryPath should be specified to install the post mortem debugger.</source>
+        <target state="translated">應指定 DumpDirectoryPath 以安裝事後剖析偵錯工具。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidProcDumpDirectoryPath">
+        <source>The directory specified is not valid: '{0}'</source>
+        <target state="translated">指定的目錄無效: '{0}'</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="InvalidAeDebuggerArgument">
+        <source>AeDebugger argument '{0}' is not valid.</source>
+        <target state="translated">AeDebugger 引數 '{0}' 無效。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="VSTestDeprecationMessage">
+        <source>The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.</source>
+        <target state="translated">dotnet vstest 命令已由 dotnet 測試取代，該測試現在可用於執行組件。請參閱 https://aka.ms/dotnet-test。</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
\ No newline at end of file
diff --git a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
index c450e968c9..6cb8de3d70 100644
--- a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
+++ b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
@@ -1,1178 +1,1664 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers
+extern alias Abstraction;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.XPath;
+
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Abstraction::Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+
+/// <summary>
+/// Defines the test request manger which can fire off discovery and test run requests.
+/// </summary>
+internal class TestRequestManager : ITestRequestManager
 {
-    using System;
-    using System.Xml;
-    using System.IO;
-    using System.Linq;
-    using System.Xml.XPath;
-    using System.Threading;
-    using System.Reflection;
-    using System.Threading.Tasks;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Resources;
-    using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+    private static ITestRequestManager? s_testRequestManagerInstance;
+
+    private readonly ITestPlatform _testPlatform;
+    private readonly ITestPlatformEventSource _testPlatformEventSource;
+    // TODO: No idea what is Task supposed to buy us, Tasks start immediately on instantiation
+    // and the work done to produce the metrics publisher is minimal.
+    private readonly Task<IMetricsPublisher> _metricsPublisher;
+    private readonly object _syncObject = new();
+
+    private bool _isDisposed;
+    private bool _telemetryOptedIn;
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly TestRunResultAggregator _testRunResultAggregator;
+    private readonly InferHelper _inferHelper;
+    private readonly IProcessHelper _processHelper;
+    private readonly ITestRunAttachmentsProcessingManager _attachmentsProcessingManager;
+    private readonly IEnvironment _environment;
+    private readonly IEnvironmentVariableHelper _environmentVariableHelper;
 
     /// <summary>
-    /// Defines the test request manger which can fire off discovery and test run requests.
+    /// Maintains the current active execution request.
+    /// Assumption: There can only be one active execution request.
     /// </summary>
-    internal class TestRequestManager : ITestRequestManager
+    private ITestRunRequest? _currentTestRunRequest;
+
+    /// <summary>
+    /// Maintains the current active discovery request.
+    /// Assumption: There can only be one active discovery request.
+    /// </summary>
+    private IDiscoveryRequest? _currentDiscoveryRequest;
+    /// <summary>
+    /// Guards cancellation of the current discovery request, by resetting when the request is received,
+    /// because the request needs time to setup and populate the _currentTestRunRequest. This might take a relatively
+    /// long time when the machine is slow, because the setup is called as an async task, so it needs to be processed by thread pool
+    /// and there might be a queue of existing tasks.
+    /// </summary>
+    private readonly ManualResetEvent _discoveryStarting = new(true);
+
+    /// <summary>
+    /// Maintains the current active test run attachments processing cancellation token source.
+    /// Assumption: There can only be one active attachments processing request.
+    /// </summary>
+    private CancellationTokenSource? _currentAttachmentsProcessingCancellationTokenSource;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestRequestManager"/> class.
+    /// </summary>
+    public TestRequestManager()
+        : this(
+            CommandLineOptions.Instance,
+            TestPlatformFactory.GetTestPlatform(),
+            TestRunResultAggregator.Instance,
+            TestPlatformEventSource.Instance,
+            new InferHelper(AssemblyMetadataProvider.Instance),
+            MetricsPublisherFactory.GetMetricsPublisher(
+                IsTelemetryOptedIn(),
+                CommandLineOptions.Instance.IsDesignMode),
+            new ProcessHelper(),
+            new TestRunAttachmentsProcessingManager(TestPlatformEventSource.Instance, new DataCollectorAttachmentsProcessorsFactory()),
+            new PlatformEnvironment(),
+            new EnvironmentVariableHelper())
     {
-        private static ITestRequestManager testRequestManagerInstance;
-
-        private const int runRequestTimeout = 5000;
-
-        private readonly ITestPlatform testPlatform;
-        private readonly ITestPlatformEventSource testPlatformEventSource;
-        private readonly Task<IMetricsPublisher> metricsPublisher;
-        private readonly object syncObject = new object();
-
-        private bool isDisposed;
-        private bool telemetryOptedIn;
-        private CommandLineOptions commandLineOptions;
-        private TestRunResultAggregator testRunResultAggregator;
-        private InferHelper inferHelper;
-        private IProcessHelper processHelper;
-        private ITestRunAttachmentsProcessingManager attachmentsProcessingManager;
-
-        /// <summary>
-        /// Maintains the current active execution request.
-        /// Assumption: There can only be one active execution request.
-        /// </summary>
-        private ITestRunRequest currentTestRunRequest;
-
-        /// <summary>
-        /// Maintains the current active discovery request.
-        /// Assumption: There can only be one active discovery request.
-        /// </summary>
-        private IDiscoveryRequest currentDiscoveryRequest;
-
-        /// <summary>
-        /// Maintains the current active test run attachments processing cancellation token source.
-        /// Assumption: There can only be one active attachments processing request.
-        /// </summary>
-        private CancellationTokenSource currentAttachmentsProcessingCancellationTokenSource;
-
-        #region Constructor
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestRequestManager"/> class.
-        /// </summary>
-        public TestRequestManager()
-            : this(
-                  CommandLineOptions.Instance,
-                  TestPlatformFactory.GetTestPlatform(),
-                  TestRunResultAggregator.Instance,
-                  TestPlatformEventSource.Instance,
-                  new InferHelper(AssemblyMetadataProvider.Instance),
-                  MetricsPublisherFactory.GetMetricsPublisher(
-                      IsTelemetryOptedIn(),
-                      CommandLineOptions.Instance.IsDesignMode),
-                  new ProcessHelper(),
-                  new TestRunAttachmentsProcessingManager(
-                      TestPlatformEventSource.Instance,
-                      new CodeCoverageDataAttachmentsHandler()))
-        {
-        }
+    }
 
-        internal TestRequestManager(
-            CommandLineOptions commandLineOptions,
-            ITestPlatform testPlatform,
-            TestRunResultAggregator testRunResultAggregator,
-            ITestPlatformEventSource testPlatformEventSource,
-            InferHelper inferHelper,
-            Task<IMetricsPublisher> metricsPublisher,
-            IProcessHelper processHelper,
-            ITestRunAttachmentsProcessingManager attachmentsProcessingManager)
-        {
-            this.testPlatform = testPlatform;
-            this.commandLineOptions = commandLineOptions;
-            this.testRunResultAggregator = testRunResultAggregator;
-            this.testPlatformEventSource = testPlatformEventSource;
-            this.inferHelper = inferHelper;
-            this.metricsPublisher = metricsPublisher;
-            this.processHelper = processHelper;
-            this.attachmentsProcessingManager = attachmentsProcessingManager;
-        }
+    internal TestRequestManager(
+        CommandLineOptions commandLineOptions,
+        ITestPlatform testPlatform,
+        TestRunResultAggregator testRunResultAggregator,
+        ITestPlatformEventSource testPlatformEventSource,
+        InferHelper inferHelper,
+        Task<IMetricsPublisher> metricsPublisher,
+        IProcessHelper processHelper,
+        ITestRunAttachmentsProcessingManager attachmentsProcessingManager,
+        IEnvironment environment,
+        IEnvironmentVariableHelper environmentVariableHelper)
+    {
+        _testPlatform = testPlatform;
+        _commandLineOptions = commandLineOptions;
+        _testRunResultAggregator = testRunResultAggregator;
+        _testPlatformEventSource = testPlatformEventSource;
+        _inferHelper = inferHelper;
+        _metricsPublisher = metricsPublisher;
+        _processHelper = processHelper;
+        _attachmentsProcessingManager = attachmentsProcessingManager;
+        _environment = environment;
+        _environmentVariableHelper = environmentVariableHelper;
+    }
 
-        #endregion
+    /// <summary>
+    /// Gets the test request manager instance.
+    /// </summary>
+    public static ITestRequestManager Instance
+        => s_testRequestManagerInstance ??= new TestRequestManager();
 
-        /// <summary>
-        /// Gets the test request manager instance.
-        /// </summary>
-        public static ITestRequestManager Instance
-        {
-            get
-            {
-                if (testRequestManagerInstance == null)
-                {
-                    testRequestManagerInstance = new TestRequestManager();
-                }
+    #region ITestRequestManager
 
-                return testRequestManagerInstance;
-            }
-        }
+    /// <inheritdoc />
+    public void InitializeExtensions(
+        IEnumerable<string>? pathToAdditionalExtensions,
+        bool skipExtensionFilters)
+    {
+        // It is possible for an Editor/IDE to keep running the runner in design mode for long
+        // duration. We clear the extensions cache to ensure the extensions don't get reused
+        // across discovery/run requests.
+        EqtTrace.Info("TestRequestManager.InitializeExtensions: Initialize extensions started.");
+        _testPlatform.ClearExtensions();
+        _testPlatform.UpdateExtensions(pathToAdditionalExtensions, skipExtensionFilters);
+        EqtTrace.Info("TestRequestManager.InitializeExtensions: Initialize extensions completed.");
+    }
 
-        #region ITestRequestManager
+    /// <inheritdoc />
+    public void ResetOptions()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        /// <inheritdoc />
-        public void InitializeExtensions(
-            IEnumerable<string> pathToAdditionalExtensions,
-            bool skipExtensionFilters)
+    /// <inheritdoc />
+    public void DiscoverTests(
+        DiscoveryRequestPayload discoveryPayload,
+        ITestDiscoveryEventsRegistrar discoveryEventsRegistrar,
+        ProtocolConfig protocolConfig)
+    {
+        try
         {
-            // It is possible for an Editor/IDE to keep running the runner in design mode for long
-            // duration. We clear the extensions cache to ensure the extensions don't get reused
-            // across discovery/run requests.
-            EqtTrace.Info("TestRequestManager.InitializeExtensions: Initialize extensions started.");
-            this.testPlatform.ClearExtensions();
-            this.testPlatform.UpdateExtensions(pathToAdditionalExtensions, skipExtensionFilters);
-            EqtTrace.Info("TestRequestManager.InitializeExtensions: Initialize extensions completed.");
-        }
+            // Flag that that discovery is being initialized, so all requests to cancel discovery will wait till we set the discovery up.
+            _discoveryStarting.Reset();
 
-        /// <inheritdoc />
-        public void ResetOptions()
-        {
-            this.commandLineOptions.Reset();
-        }
+            // Make sure to run the run request inside a lock as the below section is not thread-safe.
+            // There can be only one discovery or execution request at a given point in time.
+            lock (_syncObject)
+            {
+                EqtTrace.Info("TestRequestManager.DiscoverTests: Discovery tests started.");
 
-        /// <inheritdoc />
-        public void DiscoverTests(
-            DiscoveryRequestPayload discoveryPayload,
-            ITestDiscoveryEventsRegistrar discoveryEventsRegistrar,
-            ProtocolConfig protocolConfig)
-        {
-            EqtTrace.Info("TestRequestManager.DiscoverTests: Discovery tests started.");
+                // TODO: Normalize rest of the data on the request as well
+                discoveryPayload.Sources = KnownPlatformSourceFilter.FilterKnownPlatformSources(discoveryPayload.Sources?.Distinct().ToList());
+                discoveryPayload.RunSettings ??= "<RunSettings></RunSettings>";
 
-            var runsettings = discoveryPayload.RunSettings;
+                var runsettings = discoveryPayload.RunSettings;
 
-            if (discoveryPayload.TestPlatformOptions != null)
-            {
-                this.telemetryOptedIn = discoveryPayload.TestPlatformOptions.CollectMetrics;
-            }
+                if (discoveryPayload.TestPlatformOptions != null)
+                {
+                    _telemetryOptedIn = discoveryPayload.TestPlatformOptions.CollectMetrics;
+                }
 
-            var requestData = this.GetRequestData(protocolConfig);
-            if (this.UpdateRunSettingsIfRequired(
-                runsettings,
-                discoveryPayload.Sources?.ToList(),
-                discoveryEventsRegistrar,
-                out string updatedRunsettings))
-            {
-                runsettings = updatedRunsettings;
-            }
+                var requestData = GetRequestData(protocolConfig);
+                if (UpdateRunSettingsIfRequired(
+                        runsettings,
+                        discoveryPayload.Sources.ToList(),
+                        discoveryEventsRegistrar,
+                        isDiscovery: true,
+                        out string updatedRunsettings,
+                        out IDictionary<string, Architecture> sourceToArchitectureMap,
+                        out IDictionary<string, Framework> sourceToFrameworkMap))
+                {
+                    runsettings = updatedRunsettings;
+                }
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
-            var batchSize = runConfiguration.BatchSize;
-            var testCaseFilterFromRunsettings = runConfiguration.TestCaseFilter;
+                var sourceToSourceDetailMap = discoveryPayload.Sources.Select(source => new SourceDetail
+                {
+                    Source = source,
+                    Architecture = sourceToArchitectureMap[source],
+                    Framework = sourceToFrameworkMap[source],
+                }).ToDictionary(k => k.Source!);
 
-            if (requestData.IsTelemetryOptedIn)
-            {
-                // Collect metrics.
-                this.CollectMetrics(requestData, runConfiguration);
+                var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
+                var batchSize = runConfiguration.BatchSize;
+                var testCaseFilterFromRunsettings = runConfiguration.TestCaseFilter;
 
-                // Collect commands.
-                this.LogCommandsTelemetryPoints(requestData);
-            }
+                if (requestData.IsTelemetryOptedIn)
+                {
+                    // Collect metrics.
+                    CollectMetrics(requestData, runConfiguration);
+
+                    // Collect commands.
+                    LogCommandsTelemetryPoints(requestData);
+                }
+
+                // Create discovery request.
+                var criteria = new DiscoveryCriteria(
+                    discoveryPayload.Sources,
+                    batchSize,
+                    _commandLineOptions.TestStatsEventTimeout,
+                    runsettings,
+                    discoveryPayload.TestSessionInfo)
+                {
+                    TestCaseFilter = _commandLineOptions.TestCaseFilterValue
+                                     ?? testCaseFilterFromRunsettings
+                };
 
-            // Create discovery request.
-            var criteria = new DiscoveryCriteria(
-                discoveryPayload.Sources,
-                batchSize,
-                this.commandLineOptions.TestStatsEventTimeout,
-                runsettings,
-                discoveryPayload.TestSessionInfo)
-            {
-                TestCaseFilter = this.commandLineOptions.TestCaseFilterValue
-                    ?? testCaseFilterFromRunsettings
-            };
 
-            // Make sure to run the run request inside a lock as the below section is not thread-safe.
-            // There can be only one discovery or execution request at a given point in time.
-            lock (this.syncObject)
-            {
                 try
                 {
                     EqtTrace.Info("TestRequestManager.DiscoverTests: Synchronization context taken");
 
-                    this.currentDiscoveryRequest = this.testPlatform.CreateDiscoveryRequest(
+                    _currentDiscoveryRequest = _testPlatform.CreateDiscoveryRequest(
                         requestData,
                         criteria,
-                        discoveryPayload.TestPlatformOptions);
-                    discoveryEventsRegistrar?.RegisterDiscoveryEvents(this.currentDiscoveryRequest);
+                        discoveryPayload.TestPlatformOptions,
+                        sourceToSourceDetailMap,
+                        new EventRegistrarToWarningLoggerAdapter(discoveryEventsRegistrar));
+                    // Discovery started, allow cancellations to proceed.
+                    _currentDiscoveryRequest.OnDiscoveryStart += (s, e) => _discoveryStarting.Set();
+                    discoveryEventsRegistrar?.RegisterDiscoveryEvents(_currentDiscoveryRequest);
 
                     // Notify start of discovery start.
-                    this.testPlatformEventSource.DiscoveryRequestStart();
+                    _testPlatformEventSource.DiscoveryRequestStart();
 
                     // Start the discovery of tests and wait for completion.
-                    this.currentDiscoveryRequest.DiscoverAsync();
-                    this.currentDiscoveryRequest.WaitForCompletion();
+                    _currentDiscoveryRequest.DiscoverAsync();
+                    _currentDiscoveryRequest.WaitForCompletion();
                 }
                 finally
                 {
-                    if (this.currentDiscoveryRequest != null)
+                    if (_currentDiscoveryRequest != null)
                     {
                         // Dispose the discovery request and unregister for events.
-                        discoveryEventsRegistrar?.UnregisterDiscoveryEvents(currentDiscoveryRequest);
-                        this.currentDiscoveryRequest.Dispose();
-                        this.currentDiscoveryRequest = null;
+                        discoveryEventsRegistrar?.UnregisterDiscoveryEvents(_currentDiscoveryRequest);
+                        _currentDiscoveryRequest.Dispose();
+                        _currentDiscoveryRequest = null;
                     }
 
                     EqtTrace.Info("TestRequestManager.DiscoverTests: Discovery tests completed.");
-                    this.testPlatformEventSource.DiscoveryRequestStop();
+                    _testPlatformEventSource.DiscoveryRequestStop();
 
                     // Posts the discovery complete event.
-                    this.metricsPublisher.Result.PublishMetrics(
+                    _metricsPublisher.Result.PublishMetrics(
                         TelemetryDataConstants.TestDiscoveryCompleteEvent,
-                        requestData.MetricsCollection.Metrics);
+                        requestData.MetricsCollection.Metrics!);
                 }
             }
         }
+        finally
+        {
+            _discoveryStarting.Set();
+        }
+    }
 
-        /// <inheritdoc />
-        public void RunTests(
-            TestRunRequestPayload testRunRequestPayload,
-            ITestHostLauncher testHostLauncher,
-            ITestRunEventsRegistrar testRunEventsRegistrar,
-            ProtocolConfig protocolConfig)
+    /// <inheritdoc />
+    public void RunTests(
+        TestRunRequestPayload testRunRequestPayload,
+        ITestHostLauncher3? testHostLauncher,
+        ITestRunEventsRegistrar testRunEventsRegistrar,
+        ProtocolConfig protocolConfig)
+    {
+        EqtTrace.Info("TestRequestManager.RunTests: run tests started.");
+        testRunRequestPayload.RunSettings ??= "<RunSettings></RunSettings>";
+        if (testRunRequestPayload.Sources != null)
         {
-            EqtTrace.Info("TestRequestManager.RunTests: run tests started.");
+            testRunRequestPayload.Sources = KnownPlatformSourceFilter.FilterKnownPlatformSources(testRunRequestPayload.Sources);
+        }
 
-            TestRunCriteria runCriteria = null;
-            var runsettings = testRunRequestPayload.RunSettings;
+        var runsettings = testRunRequestPayload.RunSettings;
 
-            if (testRunRequestPayload.TestPlatformOptions != null)
-            {
-                this.telemetryOptedIn = testRunRequestPayload.TestPlatformOptions.CollectMetrics;
-            }
+        if (testRunRequestPayload.TestPlatformOptions != null)
+        {
+            _telemetryOptedIn = testRunRequestPayload.TestPlatformOptions.CollectMetrics;
+        }
 
-            var requestData = this.GetRequestData(protocolConfig);
+        var requestData = GetRequestData(protocolConfig);
 
-            // Get sources to auto detect fx and arch for both run selected or run all scenario.
-            var sources = GetSources(testRunRequestPayload);
+        // Get sources to auto detect fx and arch for both run selected or run all scenario.
+        var sources = GetSources(testRunRequestPayload);
 
-            if (this.UpdateRunSettingsIfRequired(
-                runsettings,
-                sources,
+        if (UpdateRunSettingsIfRequired(
+                runsettings!,
+                sources!,
                 testRunEventsRegistrar,
-                out string updatedRunsettings))
-            {
-                runsettings = updatedRunsettings;
-            }
+                isDiscovery: false,
+                out string updatedRunsettings,
+                out IDictionary<string, Architecture> sourceToArchitectureMap,
+                out IDictionary<string, Framework> sourceToFrameworkMap))
+        {
+            runsettings = updatedRunsettings;
+        }
 
-            if (InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(runsettings))
-            {
-                throw new SettingsException(
-                    string.Format(
-                        Resources.RunsettingsWithDCErrorMessage,
-                        runsettings));
-            }
+        var sourceToSourceDetailMap = sources.Select(source => new SourceDetail
+        {
+            Source = source,
+            Architecture = sourceToArchitectureMap[source!],
+            Framework = sourceToFrameworkMap[source!],
+        }).ToDictionary(k => k.Source!);
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
-            var batchSize = runConfiguration.BatchSize;
+        if (InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(runsettings))
+        {
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.RunsettingsWithDCErrorMessage,
+                    runsettings));
+        }
 
-            if (requestData.IsTelemetryOptedIn)
-            {
-                // Collect metrics.
-                this.CollectMetrics(requestData, runConfiguration);
+        TPDebug.Assert(runsettings is not null, "runSettings is null");
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettings);
+        var batchSize = runConfiguration.BatchSize;
 
-                // Collect commands.
-                this.LogCommandsTelemetryPoints(requestData);
+        if (requestData.IsTelemetryOptedIn)
+        {
+            // Collect metrics.
+            CollectMetrics(requestData, runConfiguration);
 
-                // Collect data for legacy settings.
-                this.LogTelemetryForLegacySettings(requestData, runsettings);
-            }
+            // Collect commands.
+            LogCommandsTelemetryPoints(requestData);
 
-            // Get Fakes data collector settings.
-            if (!string.Equals(Environment.GetEnvironmentVariable("VSTEST_SKIP_FAKES_CONFIGURATION"), "1"))
-            {
-                // The commandline options do not have sources in design time mode,
-                // and so we fall back to using sources instead.
-                if (this.commandLineOptions.Sources.Any())
-                {
-                    GenerateFakesUtilities.GenerateFakesSettings(
-                        this.commandLineOptions,
-                        this.commandLineOptions.Sources.ToList(),
-                        ref runsettings);
-                }
-                else if (sources.Any())
-                {
-                    GenerateFakesUtilities.GenerateFakesSettings(
-                        this.commandLineOptions,
-                        sources,
-                        ref runsettings);
-                }
-            }
+            // Collect data for legacy settings.
+            LogTelemetryForLegacySettings(requestData, runsettings);
+        }
 
-            if (testRunRequestPayload.Sources != null && testRunRequestPayload.Sources.Any())
-            {
-                runCriteria = new TestRunCriteria(
-                                  testRunRequestPayload.Sources,
-                                  batchSize,
-                                  testRunRequestPayload.KeepAlive,
-                                  runsettings,
-                                  this.commandLineOptions.TestStatsEventTimeout,
-                                  testHostLauncher,
-                                  testRunRequestPayload.TestPlatformOptions?.TestCaseFilter,
-                                  testRunRequestPayload.TestPlatformOptions?.FilterOptions,
-                                  testRunRequestPayload.TestSessionInfo,
-                                  debugEnabledForTestSession: testRunRequestPayload.TestSessionInfo != null
-                                      && testRunRequestPayload.DebuggingEnabled);
-            }
-            else
-            {
-                runCriteria = new TestRunCriteria(
-                                  testRunRequestPayload.TestCases,
-                                  batchSize,
-                                  testRunRequestPayload.KeepAlive,
-                                  runsettings,
-                                  this.commandLineOptions.TestStatsEventTimeout,
-                                  testHostLauncher,
-                                  testRunRequestPayload.TestSessionInfo,
-                                  debugEnabledForTestSession: testRunRequestPayload.TestSessionInfo != null
-                                      && testRunRequestPayload.DebuggingEnabled);
-            }
+        // Get Fakes data collector settings.
+        runsettings = AddFakesConfigurationToRunsettings(sources, runsettings);
+
+        // We can have either a run that contains string as test container (usually a DLL), which is later resolved to the actual path
+        // and all tests that match filter are run from that container.
+        //
+        // OR we already did discovery and have a list of TestCases that have concrete test method information
+        // and so we only pass those. TestCase also has the test container path (usually a DLL).
+        TPDebug.Assert(testRunRequestPayload.Sources != null || testRunRequestPayload.TestCases != null, "testRunRequestPayload.Sources or testRunRequestPayload.TestCases is null");
+        TestRunCriteria runCriteria = testRunRequestPayload.Sources != null && testRunRequestPayload.Sources.Count != 0
+            ? new TestRunCriteria(
+                testRunRequestPayload.Sources,
+                batchSize,
+                testRunRequestPayload.KeepAlive,
+                runsettings,
+                _commandLineOptions.TestStatsEventTimeout,
+                testHostLauncher,
+                testRunRequestPayload.TestPlatformOptions?.TestCaseFilter,
+                testRunRequestPayload.TestPlatformOptions?.FilterOptions,
+                testRunRequestPayload.TestSessionInfo,
+                debugEnabledForTestSession: testRunRequestPayload.TestSessionInfo != null
+                                            && testRunRequestPayload.DebuggingEnabled)
+            : new TestRunCriteria(
+                testRunRequestPayload.TestCases!,
+                batchSize,
+                testRunRequestPayload.KeepAlive,
+                runsettings,
+                _commandLineOptions.TestStatsEventTimeout,
+                testHostLauncher,
+                testRunRequestPayload.TestSessionInfo,
+                debugEnabledForTestSession: testRunRequestPayload.TestSessionInfo != null
+                                            && testRunRequestPayload.DebuggingEnabled);
+
+        // Run tests.
+        try
+        {
+            RunTests(
+                requestData,
+                runCriteria,
+                testRunEventsRegistrar,
+                testRunRequestPayload.TestPlatformOptions,
+                sourceToSourceDetailMap);
+            EqtTrace.Info("TestRequestManager.RunTests: run tests completed.");
+        }
+        finally
+        {
+            _testPlatformEventSource.ExecutionRequestStop();
 
-            // Run tests.
+            // Post the run complete event
+            _metricsPublisher.Result.PublishMetrics(
+                TelemetryDataConstants.TestExecutionCompleteEvent,
+                requestData.MetricsCollection.Metrics!);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void ProcessTestRunAttachments(
+        TestRunAttachmentsProcessingPayload attachmentsProcessingPayload,
+        ITestRunAttachmentsProcessingEventsHandler attachmentsProcessingEventsHandler,
+        ProtocolConfig protocolConfig)
+    {
+        EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Test run attachments processing started.");
+
+        _telemetryOptedIn = attachmentsProcessingPayload.CollectMetrics;
+        var requestData = GetRequestData(protocolConfig);
+
+        // Make sure to run the run request inside a lock as the below section is not thread-safe.
+        // There can be only one discovery, execution or attachments processing request at a given
+        // point in time.
+        lock (_syncObject)
+        {
             try
             {
-                this.RunTests(
+                EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Synchronization context taken.");
+                _testPlatformEventSource.TestRunAttachmentsProcessingRequestStart();
+
+                _currentAttachmentsProcessingCancellationTokenSource = new CancellationTokenSource();
+
+                Task task = _attachmentsProcessingManager.ProcessTestRunAttachmentsAsync(
+                    attachmentsProcessingPayload.RunSettings,
                     requestData,
-                    runCriteria,
-                    testRunEventsRegistrar,
-                    testRunRequestPayload.TestPlatformOptions);
-                EqtTrace.Info("TestRequestManager.RunTests: run tests completed.");
+                    attachmentsProcessingPayload.Attachments!,
+                    attachmentsProcessingPayload.InvokedDataCollectors,
+                    attachmentsProcessingEventsHandler,
+                    _currentAttachmentsProcessingCancellationTokenSource.Token);
+                task.Wait();
             }
             finally
             {
-                this.testPlatformEventSource.ExecutionRequestStop();
+                if (_currentAttachmentsProcessingCancellationTokenSource != null)
+                {
+                    _currentAttachmentsProcessingCancellationTokenSource.Dispose();
+                    _currentAttachmentsProcessingCancellationTokenSource = null;
+                }
 
-                // Post the run complete event
-                this.metricsPublisher.Result.PublishMetrics(
-                    TelemetryDataConstants.TestExecutionCompleteEvent,
-                    requestData.MetricsCollection.Metrics);
+                EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Test run attachments processing completed.");
+                _testPlatformEventSource.TestRunAttachmentsProcessingRequestStop();
+
+                // Post the attachments processing complete event.
+                _metricsPublisher.Result.PublishMetrics(
+                    TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
+                    requestData.MetricsCollection.Metrics!);
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public void ProcessTestRunAttachments(
-            TestRunAttachmentsProcessingPayload attachmentsProcessingPayload,
-            ITestRunAttachmentsProcessingEventsHandler attachmentsProcessingEventsHandler,
-            ProtocolConfig protocolConfig)
+    /// <inheritdoc/>
+    public void StartTestSession(
+        StartTestSessionPayload payload,
+        ITestHostLauncher3? testHostLauncher,
+        ITestSessionEventsHandler eventsHandler,
+        ProtocolConfig protocolConfig)
+    {
+        EqtTrace.Info("TestRequestManager.StartTestSession: Starting test session.");
+
+        if (payload.TestPlatformOptions != null)
         {
-            EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Test run attachments processing started.");
+            _telemetryOptedIn = payload.TestPlatformOptions.CollectMetrics;
+        }
 
-            this.telemetryOptedIn = attachmentsProcessingPayload.CollectMetrics;
-            var requestData = this.GetRequestData(protocolConfig);
+        payload.Sources ??= new List<string>();
+        payload.RunSettings ??= "<RunSettings></RunSettings>";
 
-            // Make sure to run the run request inside a lock as the below section is not thread-safe.
-            // There can be only one discovery, execution or attachments processing request at a given
-            // point in time.
-            lock (this.syncObject)
-            {
-                try
-                {
-                    EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Synchronization context taken.");
-                    this.testPlatformEventSource.TestRunAttachmentsProcessingRequestStart();
+        if (UpdateRunSettingsIfRequired(
+                payload.RunSettings,
+                payload.Sources,
+                registrar: null,
+                isDiscovery: false,
+                out string updatedRunsettings,
+                out IDictionary<string, Architecture> sourceToArchitectureMap,
+                out IDictionary<string, Framework> sourceToFrameworkMap))
+        {
+            payload.RunSettings = updatedRunsettings;
+        }
 
-                    this.currentAttachmentsProcessingCancellationTokenSource = new CancellationTokenSource();
+        var sourceToSourceDetailMap = payload.Sources.Select(source => new SourceDetail
+        {
+            Source = source,
+            Architecture = sourceToArchitectureMap[source],
+            Framework = sourceToFrameworkMap[source],
+        }).ToDictionary(k => k.Source!);
 
-                    Task task = this.attachmentsProcessingManager.ProcessTestRunAttachmentsAsync(
-                        requestData,
-                        attachmentsProcessingPayload.Attachments,
-                        attachmentsProcessingEventsHandler,
-                        this.currentAttachmentsProcessingCancellationTokenSource.Token);
-                    task.Wait();
-                }
-                finally
-                {
-                    if (this.currentAttachmentsProcessingCancellationTokenSource != null)
-                    {
-                        this.currentAttachmentsProcessingCancellationTokenSource.Dispose();
-                        this.currentAttachmentsProcessingCancellationTokenSource = null;
-                    }
+        if (InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(payload.RunSettings))
+        {
+            throw new SettingsException(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    Resources.Resources.RunsettingsWithDCErrorMessage,
+                    payload.RunSettings));
+        }
 
-                    EqtTrace.Info("TestRequestManager.ProcessTestRunAttachments: Test run attachments processing completed.");
-                    this.testPlatformEventSource.TestRunAttachmentsProcessingRequestStop();
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(payload.RunSettings);
+        var requestData = GetRequestData(protocolConfig);
 
-                    // Post the attachments processing complete event.
-                    this.metricsPublisher.Result.PublishMetrics(
-                        TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
-                        requestData.MetricsCollection.Metrics);
-                }
-            }
-        }
+        // Collect metrics & commands.
+        CollectMetrics(requestData, runConfiguration);
+        LogCommandsTelemetryPoints(requestData);
 
-        /// <inheritdoc/>
-        public void StartTestSession(
-            StartTestSessionPayload payload,
-            ITestHostLauncher testHostLauncher,
-            ITestSessionEventsHandler eventsHandler,
-            ProtocolConfig protocolConfig)
-        {
-            EqtTrace.Info("TestRequestManager.StartTestSession: Starting test session.");
+        // Get Fakes data collector settings.
+        payload.RunSettings = AddFakesConfigurationToRunsettings(payload.Sources, payload.RunSettings);
 
-            if (payload.TestPlatformOptions != null)
+        // Data collection is not supported yet, so no test session is spawned.
+        if (XmlRunSettingsUtilities.IsDataCollectionEnabled(payload.RunSettings))
+        {
+            eventsHandler.HandleStartTestSessionComplete(new()
             {
-                this.telemetryOptedIn = payload.TestPlatformOptions.CollectMetrics;
-            }
+                TestSessionInfo = null,
+                Metrics = null,
+            });
 
-            var requestData = this.GetRequestData(protocolConfig);
+            return;
+        }
 
-            if (this.UpdateRunSettingsIfRequired(
-                payload.RunSettings,
-                payload.Sources,
-                null,
-                out string updatedRunsettings))
+        lock (_syncObject)
+        {
+            try
             {
-                payload.RunSettings = updatedRunsettings;
-            }
+                EqtTrace.Info("TestRequestManager.StartTestSession: Synchronization context taken.");
+                _testPlatformEventSource.StartTestSessionStart();
+
+                var criteria = new StartTestSessionCriteria()
+                {
+                    Sources = payload.Sources,
+                    RunSettings = payload.RunSettings,
+                    TestHostLauncher = testHostLauncher
+                };
 
-            if (InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(payload.RunSettings))
+                var testSessionStarted = _testPlatform.StartTestSession(requestData, criteria, eventsHandler, sourceToSourceDetailMap, new NullWarningLogger());
+                if (!testSessionStarted)
+                {
+                    // Note: We need to send back a TestSessionComplete event, so that the caller
+                    // completes a session start request.
+                    // StartTestSession will invoke the HandleStartTestSessionComplete event
+                    // if the test session is started successfully. However, if it is not started,
+                    // HandleStartTestSessionComplete will not send an event. That's why we need
+                    // to do it here.
+                    eventsHandler.HandleStartTestSessionComplete(new());
+                    EqtTrace.Warning("TestRequestManager.StartTestSession: Unable to start test session.");
+                }
+            }
+            finally
             {
-                throw new SettingsException(
-                    string.Format(
-                        Resources.RunsettingsWithDCErrorMessage,
-                        payload.RunSettings));
+                EqtTrace.Info("TestRequestManager.StartTestSession: Starting test session completed.");
+                _testPlatformEventSource.StartTestSessionStop();
+
+                // Post the attachments processing complete event.
+                _metricsPublisher.Result.PublishMetrics(
+                    TelemetryDataConstants.StartTestSessionCompleteEvent,
+                    requestData.MetricsCollection.Metrics!);
             }
+        }
+    }
 
-            // TODO (copoiena): Collect metrics ?
+    /// <inheritdoc/>
+    public void StopTestSession(
+        StopTestSessionPayload payload,
+        ITestSessionEventsHandler eventsHandler,
+        ProtocolConfig protocolConfig)
+    {
+        EqtTrace.Info("TestRequestManager.StopTestSession: Stopping test session.");
 
-            lock (this.syncObject)
+        _telemetryOptedIn = payload.CollectMetrics;
+        var requestData = GetRequestData(protocolConfig);
+
+        lock (_syncObject)
+        {
+            try
             {
-                try
-                {
-                    EqtTrace.Info("TestRequestManager.StartTestRunner: Synchronization context taken.");
-                    this.testPlatformEventSource.StartTestSessionStart();
+                EqtTrace.Info("TestRequestManager.StopTestSession: Synchronization context taken.");
+                _testPlatformEventSource.StopTestSessionStart();
 
-                    var criteria = new StartTestSessionCriteria()
+                var stopped = TestSessionPool.Instance.KillSession(payload.TestSessionInfo!, requestData);
+                eventsHandler.HandleStopTestSessionComplete(
+                    new()
                     {
-                        Sources = payload.Sources,
-                        RunSettings = payload.RunSettings,
-                        TestHostLauncher = testHostLauncher
-                    };
+                        TestSessionInfo = payload.TestSessionInfo,
+                        Metrics = stopped ? requestData.MetricsCollection.Metrics : null,
+                        IsStopped = stopped
+                    });
 
-                    if (!this.testPlatform.StartTestSession(requestData, criteria, eventsHandler))
-                    {
-                        EqtTrace.Warning("TestRequestManager.StartTestSession: Unable to start test session.");
-                    }
-                }
-                finally
+                if (!stopped)
                 {
-                    EqtTrace.Info("TestRequestManager.StartTestSession: Starting test session completed.");
-                    this.testPlatformEventSource.StartTestSessionStop();
-
-                    // Post the attachments processing complete event.
-                    this.metricsPublisher.Result.PublishMetrics(
-                        TelemetryDataConstants.StartTestSessionCompleteEvent,
-                        requestData.MetricsCollection.Metrics);
+                    EqtTrace.Warning("TestRequestManager.StopTestSession: Unable to stop test session.");
                 }
             }
+            finally
+            {
+                EqtTrace.Info("TestRequestManager.StopTestSession: Stopping test session completed.");
+                _testPlatformEventSource.StopTestSessionStop();
+
+                // Post the attachments processing complete event.
+                _metricsPublisher.Result.PublishMetrics(
+                    TelemetryDataConstants.StopTestSessionCompleteEvent,
+                    requestData.MetricsCollection.Metrics!);
+            }
         }
+    }
 
-        private void LogTelemetryForLegacySettings(IRequestData requestData, string runsettings)
-        {
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.TestSettingsUsed,
-                InferRunSettingsHelper.IsTestSettingsEnabled(runsettings));
+    private static void LogTelemetryForLegacySettings(IRequestData requestData, string runsettings)
+    {
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.TestSettingsUsed,
+            InferRunSettingsHelper.IsTestSettingsEnabled(runsettings));
 
-            if (InferRunSettingsHelper.TryGetLegacySettingElements(
+        if (InferRunSettingsHelper.TryGetLegacySettingElements(
                 runsettings,
                 out Dictionary<string, string> legacySettingsTelemetry))
+        {
+            foreach (var ciData in legacySettingsTelemetry)
             {
-                foreach (var ciData in legacySettingsTelemetry)
-                {
-                    // We are collecting telemetry for the legacy nodes and attributes used in the runsettings.
-                    requestData.MetricsCollection.Add(
-                        string.Format(
-                            "{0}.{1}",
-                            TelemetryDataConstants.LegacySettingPrefix,
-                            ciData.Key),
-                        ciData.Value);
-                }
+                // We are collecting telemetry for the legacy nodes and attributes used in the runsettings.
+                requestData.MetricsCollection.Add(
+                    $"{TelemetryDataConstants.LegacySettingPrefix}.{ciData.Key}",
+                    ciData.Value);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public void CancelTestRun()
-        {
-            EqtTrace.Info("TestRequestManager.CancelTestRun: Sending cancel request.");
-            this.currentTestRunRequest?.CancelAsync();
-        }
+    /// <inheritdoc />
+    public void CancelTestRun()
+    {
+        EqtTrace.Info("TestRequestManager.CancelTestRun: Sending cancel request.");
+        _currentTestRunRequest?.CancelAsync();
+    }
 
-        /// <inheritdoc />
-        public void CancelDiscovery()
+    /// <inheritdoc />
+    public void CancelDiscovery()
+    {
+        EqtTrace.Info("TestRequestManager.CancelDiscovery: Sending cancel request.");
+
+        // Wait for discovery request to initialize, before cancelling it, otherwise the
+        // _currentDiscoveryRequest might be null, because discovery did not have enough time to
+        // initialize and did not manage to populate _currentDiscoveryRequest yet, leading to hanging run
+        // that "ignores" the cancellation.
+        _discoveryStarting.WaitOne(3000);
+        _currentDiscoveryRequest?.Abort();
+    }
+
+    /// <inheritdoc />
+    public void AbortTestRun()
+    {
+        EqtTrace.Info("TestRequestManager.AbortTestRun: Sending abort request.");
+        _currentTestRunRequest?.Abort();
+    }
+
+    /// <inheritdoc/>
+    public void CancelTestRunAttachmentsProcessing()
+    {
+        EqtTrace.Info("TestRequestManager.CancelTestRunAttachmentsProcessing: Sending cancel request.");
+        _currentAttachmentsProcessingCancellationTokenSource?.Cancel();
+    }
+
+    #endregion
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
         {
-            EqtTrace.Info("TestRequestManager.CancelTestDiscovery: Sending cancel request.");
-            this.currentDiscoveryRequest?.Abort();
+            return;
         }
 
-        /// <inheritdoc />
-        public void AbortTestRun()
+        if (disposing)
         {
-            EqtTrace.Info("TestRequestManager.AbortTestRun: Sending abort request.");
-            this.currentTestRunRequest?.Abort();
+            _metricsPublisher.Result.Dispose();
         }
 
-        /// <inheritdoc/>
-        public void CancelTestRunAttachmentsProcessing()
+        _isDisposed = true;
+    }
+
+    private bool UpdateRunSettingsIfRequired(
+        string runsettingsXml,
+        IList<string>? sources,
+        IBaseTestEventsRegistrar? registrar,
+        bool isDiscovery,
+        out string updatedRunSettingsXml,
+        out IDictionary<string, Architecture> sourceToArchitectureMap,
+        out IDictionary<string, Framework> sourceToFrameworkMap)
+    {
+        bool settingsUpdated = false;
+        updatedRunSettingsXml = runsettingsXml ?? throw new ArgumentNullException(nameof(runsettingsXml));
+
+        // TargetFramework is full CLR. Set DesignMode based on current context.
+        using var stream = new StringReader(runsettingsXml);
+        using var reader = XmlReader.Create(
+            stream,
+            XmlRunSettingsUtilities.ReaderSettings);
+        var document = new XmlDocument();
+        document.Load(reader);
+        var navigator = document.CreateNavigator()!;
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runsettingsXml)
+                                ?? new LoggerRunSettings();
+
+
+        // True when runsettings don't set target framework. False when runsettings force target framework
+        // in both cases the sourceToFrameworkMap is populated with the real frameworks as we inferred them
+        // from dlls. For sources like .js, we return the default framework.
+        var frameworkWasAutodetected = UpdateFrameworkInRunSettingsIfRequired(
+            document,
+            navigator,
+            sources!,
+            registrar,
+            out Framework? chosenFramework,
+            out sourceToFrameworkMap);
+
+        settingsUpdated |= frameworkWasAutodetected;
+        var frameworkSetByRunsettings = !frameworkWasAutodetected;
+
+        // Before MULTI_TFM feature the sourceToArchitectureMap and sourceToFrameworkMap were only used as informational
+        // to be able to do this compatibility check and print warning. And in the later steps only chosenPlatform, chosenFramework
+        // were used, that represented the single architecture and framework to be used.
+        //
+        // After MULTI_TFM  sourceToArchitectureMap and sourceToFrameworkMap are the source of truth, and are propagated forward,
+        // so when we want to revert to the older behavior we need to re-enable the check, and unify all the architecture and
+        // framework entries to the same chosen value.
+        var disableMultiTfm = FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_MULTI_TFM_RUN);
+
+        // Choose default architecture based on the framework.
+        // For a run with mixed tfms enabled, or .NET "Core", the default platform architecture should be based on the process.
+        // This will choose x64 by default for both .NET and .NET Framework, and avoids choosing x86 for a mixed
+        // run, so we will run via .NET testhost.exe, and not via dotnet testhost.dll.
+        Architecture defaultArchitecture = Architecture.X86;
+        if (!disableMultiTfm
+            || chosenFramework!.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
+            || chosenFramework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
+            // This is a special case for 1 version of Nuget.Frameworks that was shipped with using identifier NET5 instead of NETCoreApp5 for .NET 5.
+            || chosenFramework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0)
         {
-            EqtTrace.Info("TestRequestManager.CancelTestRunAttachmentsProcessing: Sending cancel request.");
-            this.currentAttachmentsProcessingCancellationTokenSource?.Cancel();
+            // We are running in vstest.console that is either started via dotnet
+            // or via vstest.console.exe. The architecture of the current process
+            // determines the default architecture to use for AnyCPU dlls
+            // and other sources that don't dictate architecture (e.g. js files).
+            // This way starting 32-bit dotnet will try to run as 32-bit testhost
+            // using the runtime that was installed with that 32-bit dotnet SDK.
+            // Similarly ARM64 vstest.console will start ARM64 testhost, making sure
+            // that we choose the architecture that we already know we can run as.
+            // 64-bit SDK when running from 64-bit dotnet process.
+            // As default architecture we specify the expected test host architecture,
+            // it can be specified by user on the command line with --arch or through runsettings.
+            // If it's not specified by user will be filled by current processor architecture;
+            // should be the same as SDK.
+            defaultArchitecture = GetDefaultArchitecture(runConfiguration);
         }
+        else
+        {
+            if (_environment.Architecture == PlatformArchitecture.ARM64 && _environment.OperatingSystem == PlatformOperatingSystem.Windows)
+            {
+                // For non .NET Core containers only on win ARM64 we want to run AnyCPU using current process architecture as a default
+                // for both vstest.console.exe and design mode scenario.
+                // As default architecture we specify the expected test host architecture,
+                // it can be specified by user on the command line with /Platform or through runsettings.
+                // If it's not specified by user will be filled by current processor architecture.
+                defaultArchitecture = GetDefaultArchitecture(runConfiguration);
+            }
 
-        #endregion
+            // Other scenarios, most notably .NET Framework with MultiTFM disabled, will use the old default X86 architecture.
+        }
 
-        public void Dispose()
+        EqtTrace.Verbose($"TestRequestManager.UpdateRunSettingsIfRequired: Default architecture: {defaultArchitecture} IsDefaultTargetArchitecture: {RunSettingsHelper.Instance.IsDefaultTargetArchitecture}, Current process architecture: {_processHelper.GetCurrentProcessArchitecture()} OperatingSystem: {_environment.OperatingSystem}.");
+
+        // True when runsettings don't set platforml. False when runsettings force platform
+        // in both cases the sourceToArchitectureMap is populated with the real architecture as we inferred it
+        // from dlls. For sources like .js, we return the default architecture.
+        var platformWasAutodetected = UpdatePlatform(
+            document,
+            navigator,
+            sources,
+            defaultArchitecture,
+            out Architecture chosenPlatform,
+            out sourceToArchitectureMap);
+
+        settingsUpdated |= platformWasAutodetected;
+        var platformSetByRunsettings = !platformWasAutodetected;
+
+        // Before MULTI_TFM feature the sourceToArchitectureMap and sourceToFrameworkMap were only used as informational
+        // to be able to do this compatibility check and print warning. And in the later steps only chosenPlatform, chosenFramework
+        // were used, that represented the single architecture and framework to be used.
+        //
+        // After MULTI_TFM  sourceToArchitectureMap and sourceToFrameworkMap are the source of truth, and are propagated forward,
+        // so when we want to revert to the older behavior we need to re-enable the check, and unify all the architecture and
+        // framework entries to the same chosen value.
+
+        // Do the check only when we enable MULTI_TFM and platform or framework are forced by settings, because then we maybe have some sources
+        // that are not compatible with the chosen settings. And do the check always when MULTI_TFM is disabled, because then we want to warn every
+        // time there are multiple tfms or architectures mixed.
+        if (disableMultiTfm || (!disableMultiTfm && (platformSetByRunsettings || frameworkSetByRunsettings)))
         {
-            this.Dispose(true);
-
-            // Use SupressFinalize in case a subclass
-            // of this type implements a finalizer.
-            GC.SuppressFinalize(this);
+            CheckSourcesForCompatibility(
+                chosenFramework!,
+                chosenPlatform,
+                defaultArchitecture,
+                sourceToArchitectureMap,
+                sourceToFrameworkMap,
+                registrar);
         }
 
-        private void Dispose(bool disposing)
+        // The sourceToArchitectureMap contains the real architecture, overwrite it by the value chosen by runsettings, to force one unified platform to be used.
+        if (disableMultiTfm || platformSetByRunsettings)
         {
-            if (!this.isDisposed)
+            // Copy the list of key, otherwise we will get collection changed exception.
+            var keys = sourceToArchitectureMap.Keys.ToList();
+            foreach (var key in keys)
             {
-                if (disposing)
-                {
-                    this.metricsPublisher.Result.Dispose();
-                }
-
-                this.isDisposed = true;
+                sourceToArchitectureMap[key] = chosenPlatform;
             }
         }
 
-        private bool UpdateRunSettingsIfRequired(
-            string runsettingsXml,
-            IList<string> sources,
-            IBaseTestEventsRegistrar registrar,
-            out string updatedRunSettingsXml)
+        // The sourceToFrameworkMap contains the real framework, overwrite it by the value chosen by runsettings, to force one unified framework to be used.
+        if (disableMultiTfm || frameworkSetByRunsettings)
         {
-            bool settingsUpdated = false;
-            updatedRunSettingsXml = runsettingsXml;
-            var sourcePlatforms = new Dictionary<string, Architecture>();
-            var sourceFrameworks = new Dictionary<string, Framework>();
-
-            if (!string.IsNullOrEmpty(runsettingsXml))
+            // Copy the list of key, otherwise we will get collection changed exception.
+            var keys = sourceToFrameworkMap.Keys.ToList();
+            foreach (var key in keys)
             {
-                // TargetFramework is full CLR. Set DesignMode based on current context.
-                using (var stream = new StringReader(runsettingsXml))
-                using (var reader = XmlReader.Create(
-                    stream,
-                    XmlRunSettingsUtilities.ReaderSettings))
-                {
-                    var document = new XmlDocument();
-                    document.Load(reader);
-                    var navigator = document.CreateNavigator();
-                    var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-                    var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runsettingsXml)
-                        ?? new LoggerRunSettings();
-
-                    settingsUpdated |= this.UpdateFramework(
-                        document,
-                        navigator,
-                        sources,
-                        sourceFrameworks,
-                        registrar,
-                        out Framework chosenFramework);
-
-                    // Choose default architecture based on the framework.
-                    // For .NET core, the default platform architecture should be based on the process.	
-                    Architecture defaultArchitecture = Architecture.X86;
-                    if (chosenFramework.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
-                        || chosenFramework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0
-                    // This is a special case for 1 version of Nuget.Frameworks that was shipped with using identifier NET5 instead of NETCoreApp5 for .NET 5.
-                        || chosenFramework.Name.IndexOf("net5", StringComparison.OrdinalIgnoreCase) >= 0)
-                    {
-#if NETCOREAPP
-                        // We are running in vstest.console that is either started via dotnet.exe
-                        // or via vstest.console.exe .NET Core executable. For AnyCPU dlls this
-                        // should resolve 32-bit SDK when running from 32-bit dotnet process and 
-                        // 64-bit SDK when running from 64-bit dotnet process.
-                        // As default architecture we specify the expected test host architecture,
-                        // it can be specified by user on the command line with --arch or through runsettings.
-                        // If it's not specified by user will be filled by current processor architecture;
-                        // should be the same as SDK.
-                        defaultArchitecture = runConfiguration.TargetPlatform;
-                        EqtTrace.Verbose($"Default architecture: {defaultArchitecture}");
-#else
-                        // We are running in vstest.console.exe that was built against .NET
-                        // Framework. This console prefers 32-bit because it needs to run as 32-bit
-                        // to be compatible with QTAgent. It runs as 32-bit both under VS and in
-                        // Developer console. Set the default architecture based on the OS
-                        // architecture, to find 64-bit dotnet SDK when running AnyCPU dll on 64-bit
-                        // system, and 32-bit SDK when running AnyCPU dll on 32-bit OS.
-                        // We want to find 64-bit SDK because it is more likely to be installed.
-                        defaultArchitecture = Environment.Is64BitOperatingSystem ? Architecture.X64 : Architecture.X86;
-#endif
-                    }
-
-                    settingsUpdated |= this.UpdatePlatform(
-                        document,
-                        navigator,
-                        sources,
-                        sourcePlatforms,
-                        defaultArchitecture,
-                        out Architecture chosenPlatform);
-                    this.CheckSourcesForCompatibility(
-                        chosenFramework,
-                        chosenPlatform,
-                        defaultArchitecture,
-                        sourcePlatforms,
-                        sourceFrameworks,
-                        registrar);
-                    settingsUpdated |= this.UpdateDesignMode(document, runConfiguration);
-                    settingsUpdated |= this.UpdateCollectSourceInformation(document, runConfiguration);
-                    settingsUpdated |= this.UpdateTargetDevice(navigator, document, runConfiguration);
-                    settingsUpdated |= this.AddOrUpdateConsoleLogger(document, runConfiguration, loggerRunSettings);
-
-                    updatedRunSettingsXml = navigator.OuterXml;
-                }
+                sourceToFrameworkMap[key] = chosenFramework!;
             }
+        }
 
-            return settingsUpdated;
+        settingsUpdated |= UpdateDesignMode(document, runConfiguration);
+        settingsUpdated |= UpdateCollectSourceInformation(document, runConfiguration);
+        settingsUpdated |= UpdateTargetDevice(navigator, document);
+        settingsUpdated |= AddOrUpdateBuiltInLoggers(document, runConfiguration, loggerRunSettings);
+        settingsUpdated |= AddOrUpdateBatchSize(document, runConfiguration, isDiscovery);
+
+        if (!FeatureFlag.Instance.IsSet(FeatureFlag.VSTEST_DISABLE_DYNAMICNATIVE_CODECOVERAGE_DEFAULT_SETTING))
+        {
+            settingsUpdated |= UpdateCollectCoverageSettings(document, runConfiguration);
         }
 
-        private bool AddOrUpdateConsoleLogger(
-            XmlDocument document,
-            RunConfiguration runConfiguration,
-            LoggerRunSettings loggerRunSettings)
+        updatedRunSettingsXml = navigator.OuterXml;
+
+        return settingsUpdated;
+
+        Architecture GetDefaultArchitecture(RunConfiguration runConfiguration)
         {
-            // Update console logger settings.
-            bool consoleLoggerUpdated = this.UpdateConsoleLoggerIfExists(document, loggerRunSettings);
+            if (!RunSettingsHelper.Instance.IsDefaultTargetArchitecture)
+            {
+                return runConfiguration.TargetPlatform;
+            }
 
-            // In case of CLI, add console logger if not already present.
-            bool designMode = runConfiguration.DesignModeSet
-                ? runConfiguration.DesignMode
-                : this.commandLineOptions.IsDesignMode;
-            if (!designMode && !consoleLoggerUpdated)
+            Architecture? defaultArchitectureFromRunsettings = runConfiguration.DefaultPlatform;
+            if (defaultArchitectureFromRunsettings != null)
             {
-                this.AddConsoleLogger(document, loggerRunSettings);
+                return defaultArchitectureFromRunsettings.Value;
             }
 
-            // Update is required:
-            //     1) in case of CLI;
-            //     2) in case of design mode if console logger is present in runsettings.
-            return !designMode || consoleLoggerUpdated;
+            return TranslateToArchitecture(_processHelper.GetCurrentProcessArchitecture());
         }
 
-        private bool UpdateTargetDevice(
-            XPathNavigator navigator,
-            XmlDocument document,
-            RunConfiguration runConfiguration)
+        static Architecture TranslateToArchitecture(PlatformArchitecture targetArchitecture)
         {
-            bool updateRequired = InferRunSettingsHelper.TryGetDeviceXml(navigator, out string deviceXml);
-            if (updateRequired)
+            switch (targetArchitecture)
             {
-                InferRunSettingsHelper.UpdateTargetDevice(document, deviceXml);
+                case PlatformArchitecture.X86:
+                    return Architecture.X86;
+                case PlatformArchitecture.X64:
+                    return Architecture.X64;
+                case PlatformArchitecture.ARM:
+                    return Architecture.ARM;
+                case PlatformArchitecture.ARM64:
+                    return Architecture.ARM64;
+                case PlatformArchitecture.S390x:
+                    return Architecture.S390x;
+                case PlatformArchitecture.Ppc64le:
+                    return Architecture.Ppc64le;
+                case PlatformArchitecture.RiscV64:
+                    return Architecture.RiscV64;
+                default:
+                    EqtTrace.Error($"TestRequestManager.TranslateToArchitecture: Unhandled architecture '{targetArchitecture}'.");
+                    break;
             }
-            return updateRequired;
+
+            // We prefer to not throw in case of unhandled architecture but return Default,
+            // it should be handled in a correct way by the callers.
+            return Architecture.Default;
         }
+    }
 
-        private bool UpdateCollectSourceInformation(
-            XmlDocument document,
-            RunConfiguration runConfiguration)
+    private string AddFakesConfigurationToRunsettings(IList<string>? sources, string runsettings)
+    {
+        if (string.Equals(_environmentVariableHelper.GetEnvironmentVariable("VSTEST_SKIP_FAKES_CONFIGURATION"), "1"))
         {
-            bool updateRequired = !runConfiguration.CollectSourceInformationSet;
-            if (updateRequired)
-            {
-                InferRunSettingsHelper.UpdateCollectSourceInformation(
-                    document,
-                    this.commandLineOptions.ShouldCollectSourceInformation);
-            }
-            return updateRequired;
+            return runsettings;
         }
 
-        private bool UpdateDesignMode(XmlDocument document, RunConfiguration runConfiguration)
+        TPDebug.Assert(sources is not null, "AddFakesConfigurationToRunsettings: Sources list is null.");
+
+        // TODO: Are the sources in _commandLineOptions any different from the ones we get on the request?
+        // because why would they be? We never pass that forward to the executor, so this probably should
+        // just look at sources anyway.
+        //
+        // The commandline options do not have sources in design time mode,
+        // and so we fall back to using sources instead.
+        if (_commandLineOptions.Sources.Any())
         {
-            // If user is already setting DesignMode via runsettings or CLI args; we skip.
-            bool updateRequired = !runConfiguration.DesignModeSet;
-            if (updateRequired)
-            {
-                InferRunSettingsHelper.UpdateDesignMode(
-                    document,
-                    this.commandLineOptions.IsDesignMode);
-            }
-            return updateRequired;
+            runsettings = GenerateFakesUtilities.GenerateFakesSettings(
+                _commandLineOptions,
+                _commandLineOptions.Sources,
+                runsettings);
         }
+        else if (sources.Count > 0)
+        {
+            runsettings = GenerateFakesUtilities.GenerateFakesSettings(
+                _commandLineOptions,
+                sources,
+                runsettings);
+        }
+
+        return runsettings;
+    }
 
-        private void CheckSourcesForCompatibility(
-            Framework chosenFramework,
-            Architecture chosenPlatform,
-            Architecture defaultArchitecture,
-            IDictionary<string, Architecture> sourcePlatforms,
-            IDictionary<string, Framework> sourceFrameworks,
-            IBaseTestEventsRegistrar registrar)
+    private bool AddOrUpdateBuiltInLoggers(
+        XmlDocument document,
+        RunConfiguration runConfiguration,
+        LoggerRunSettings loggerRunSettings)
+    {
+        // Update built-in logger settings if requested by the user on command line to populate
+        // the default assembly path to those loggers so we can find them.
+        bool consoleLoggerUpdated = UpdateConsoleLoggerIfExists(document, loggerRunSettings);
+        bool msbuildLoggerUpdated = UpdateMSBuildLoggerIfExists(document, loggerRunSettings);
+
+        bool designMode = runConfiguration.DesignModeSet
+            ? runConfiguration.DesignMode
+            : _commandLineOptions.IsDesignMode;
+
+        // In design mode (under IDE) don't add the default logger, we are "logging"
+        // via messages to vstest console wrapper.
+        if (!designMode)
         {
-            // Find compatible sources.
-            var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(
-                chosenPlatform,
-                defaultArchitecture,
-                chosenFramework,
-                sourcePlatforms,
-                sourceFrameworks,
-                out var incompatibleSettingWarning);
+            // When we are not in design mode, add one of the default loggers.
 
-            // Raise warnings for incompatible sources
-            if (!string.IsNullOrEmpty(incompatibleSettingWarning))
+            // If msbuild logger was present on the command line, we are being called from
+            // dotnet sdk via vstest task, and should output to msbuild. If user additionally
+            // specified console logger it is allowed but we won't add automatically.
+            if (!msbuildLoggerUpdated) // msbuild logger is not present on command line
             {
-                EqtTrace.Warning(incompatibleSettingWarning);
-                registrar?.LogWarning(incompatibleSettingWarning);
+                if (!consoleLoggerUpdated) // console logger is not present on commandline
+                {
+                    // Add console logger because that is the default
+                    AddConsoleLogger(document, loggerRunSettings);
+                }
             }
+        }
 
-            // Log compatible sources
-            if (EqtTrace.IsInfoEnabled)
-            {
-                EqtTrace.Info("Compatible sources list : ");
-                EqtTrace.Info(string.Join("\n", compatibleSources.ToArray()));
-            }
+        // Update is required:
+        //     1) in case of CLI;
+        //     2) in case of design mode if console logger is present in runsettings.
+        return !designMode || consoleLoggerUpdated || msbuildLoggerUpdated;
+    }
+
+    private static bool UpdateTargetDevice(
+        XPathNavigator navigator,
+        XmlDocument document)
+    {
+        if (InferRunSettingsHelper.TryGetDeviceXml(navigator, out string? deviceXml))
+        {
+            InferRunSettingsHelper.UpdateTargetDevice(document, deviceXml);
+            return true;
         }
 
-        private bool UpdatePlatform(
-            XmlDocument document,
-            XPathNavigator navigator,
-            IList<string> sources,
-            IDictionary<string, Architecture> sourcePlatforms,
-            Architecture defaultArchitecture,
-            out Architecture chosenPlatform)
+        return false;
+    }
+
+    private bool UpdateCollectSourceInformation(
+        XmlDocument document,
+        RunConfiguration runConfiguration)
+    {
+        bool updateRequired = !runConfiguration.CollectSourceInformationSet;
+        if (updateRequired)
         {
-            // Get platform from sources.
-            var inferedPlatform = inferHelper.AutoDetectArchitecture(
-                sources,
-                sourcePlatforms,
-                defaultArchitecture);
+            InferRunSettingsHelper.UpdateCollectSourceInformation(
+                document,
+                _commandLineOptions.ShouldCollectSourceInformation);
+        }
+        return updateRequired;
+    }
 
-            EqtTrace.Info($"Infered platform '{inferedPlatform}'.");
+    private bool UpdateDesignMode(XmlDocument document, RunConfiguration runConfiguration)
+    {
+        // If user is already setting DesignMode via runsettings or CLI args; we skip.
+        bool updateRequired = !runConfiguration.DesignModeSet;
+        if (updateRequired)
+        {
+            InferRunSettingsHelper.UpdateDesignMode(
+                document,
+                _commandLineOptions.IsDesignMode);
+        }
+        return updateRequired;
+    }
 
-            // Get platform from runsettings.
-            bool updatePlatform = IsAutoPlatformDetectRequired(navigator, out chosenPlatform);
+    internal /* for testing purposes */ static bool AddOrUpdateBatchSize(XmlDocument document, RunConfiguration runConfiguration, bool isDiscovery)
+    {
+        // On run keep it as is to fall back to the current default value (which is 10 right now).
+        if (!isDiscovery)
+        {
+            // We did not update runnsettings.
+            return false;
+        }
 
-            // Update platform if required. For command line scenario update happens in
-            // ArgumentProcessor.
-            if (updatePlatform)
-            {
-                EqtTrace.Info($"Platform update to '{inferedPlatform}' required.");
-                InferRunSettingsHelper.UpdateTargetPlatform(
-                    document,
-                    inferedPlatform.ToString(),
-                    overwrite: true);
-                chosenPlatform = inferedPlatform;
-            }
+        // If user is already setting batch size via runsettings or CLI args; we skip.
+        bool updateRequired = !runConfiguration.BatchSizeSet;
+        if (updateRequired)
+        {
+            InferRunSettingsHelper.UpdateBatchSize(
+                document,
+                CommandLineOptions.DefaultDiscoveryBatchSize);
+        }
 
-            return updatePlatform;
+        return updateRequired;
+    }
+
+    private static void CheckSourcesForCompatibility(
+        Framework chosenFramework,
+        Architecture chosenPlatform,
+        Architecture defaultArchitecture,
+        IDictionary<string, Architecture> sourcePlatforms,
+        IDictionary<string, Framework> sourceFrameworks,
+        IBaseTestEventsRegistrar? registrar)
+    {
+        // Find compatible sources.
+        var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(
+            chosenPlatform,
+            defaultArchitecture,
+            chosenFramework,
+            sourcePlatforms,
+            sourceFrameworks,
+            out var incompatibleSettingWarning);
+
+        // Raise warnings for incompatible sources
+        if (!incompatibleSettingWarning.IsNullOrEmpty())
+        {
+            EqtTrace.Warning(incompatibleSettingWarning);
+            registrar?.LogWarning(incompatibleSettingWarning);
         }
 
-        private bool UpdateFramework(
-            XmlDocument document,
-            XPathNavigator navigator,
-            IList<string> sources,
-            IDictionary<string, Framework> sourceFrameworks,
-            IBaseTestEventsRegistrar registrar,
-            out Framework chosenFramework)
-        {
-            // Get framework from sources. 
-            // This looks like you can optimize it by moving it down to if (updateFramework), but it has a side-effect of 
-            // populating the sourceFrameworks, which is later checked when source compatibility check is done against the value
-            // that we either inferred as the common framework, or that is forced in runsettings.
-            var inferedFramework = inferHelper.AutoDetectFramework(sources, sourceFrameworks);
-
-            // See if framework is forced by runsettings. If not autodetect it.
-            bool updateFramework = IsAutoFrameworkDetectRequired(navigator, out chosenFramework);
-
-            // Update framework if required. For command line scenario update happens in
-            // ArgumentProcessor.
-            if (updateFramework)
-            {
-                InferRunSettingsHelper.UpdateTargetFramework(
-                    document,
-                    inferedFramework.ToString(),
-                    overwrite: true);
-                chosenFramework = inferedFramework;
-            }
+        // Log compatible sources
+        EqtTrace.Info("Compatible sources list: ");
+        EqtTrace.Info(string.Join("\n", compatibleSources.ToArray()));
+    }
 
-            // Raise warnings for unsupported frameworks.
-            if (Constants.DotNetFramework35.Equals(chosenFramework.Name))
-            {
-                EqtTrace.Warning("TestRequestManager.UpdateRunSettingsIfRequired: throw warning on /Framework:Framework35 option.");
-                registrar.LogWarning(Resources.Framework35NotSupported);
-            }
+    private bool UpdatePlatform(
+        XmlDocument document,
+        XPathNavigator navigator,
+        IList<string>? sources,
+        Architecture defaultArchitecture,
+        out Architecture commonPlatform,
+        out IDictionary<string, Architecture> sourceToPlatformMap)
+    {
+        // Get platform from runsettings. If runsettings specify a platform, we don't need to
+        // auto detect it and update it, because it is forced by run settings to be a single given platform
+        // for all the provided sources.
+        bool platformSetByRunsettings = IsPlatformSetByRunSettings(navigator, out commonPlatform);
 
-            return updateFramework;
+        if (platformSetByRunsettings)
+        {
+            EqtTrace.Info($"Platform is set by runsettings to be '{commonPlatform}' for all sources.");
+            // Autodetect platforms from sources, so we can check that they are compatible with the settings, and report
+            // incompatibilities as warnings.
+            //
+            // DO NOT overwrite the common platform, the one forced by runsettings should be used.
+            var _ = _inferHelper.AutoDetectArchitecture(sources, defaultArchitecture, out sourceToPlatformMap);
+
+            // If we would not want to report the incompatibilities later, we would simply return dictionary populated to the
+            // platform that is set by the settings.
+            //
+            // sourceToPlatformMap = new Dictionary<string, Architecture>();
+            // foreach (var source in sources)
+            // {
+            //     sourceToPlatformMap.Add(source, commonPlatform);
+            // }
+
+            // Return false, because we did not update runsettings.
+            return false;
         }
 
-        /// <summary>
-        /// Add console logger in runsettings.
-        /// </summary>
-        /// <param name="document">Runsettings document.</param>
-        /// <param name="loggerRunSettings">Logger run settings.</param>
-        private void AddConsoleLogger(XmlDocument document, LoggerRunSettings loggerRunSettings)
+        // Autodetect platform from sources, and return a single common platform.
+        commonPlatform = _inferHelper.AutoDetectArchitecture(sources, defaultArchitecture, out sourceToPlatformMap);
+        InferRunSettingsHelper.UpdateTargetPlatform(document, commonPlatform.ToString(), overwrite: true);
+
+        EqtTrace.Info($"Platform was updated to '{commonPlatform}'.");
+        // Return true because we updated runsettings.
+        return true;
+    }
+
+    private bool UpdateFrameworkInRunSettingsIfRequired(
+        XmlDocument document,
+        XPathNavigator navigator,
+        IList<string?>? sources,
+        IBaseTestEventsRegistrar? registrar,
+        [NotNullWhen(true)] out Framework? commonFramework,
+        out IDictionary<string, Framework> sourceToFrameworkMap)
+    {
+        bool frameworkSetByRunsettings = IsFrameworkSetByRunSettings(navigator, out commonFramework);
+
+        if (frameworkSetByRunsettings)
         {
-            var consoleLogger = new LoggerSettings
-            {
-                FriendlyName = ConsoleLogger.FriendlyName,
-                Uri = new Uri(ConsoleLogger.ExtensionUri),
-                AssemblyQualifiedName = typeof(ConsoleLogger).AssemblyQualifiedName,
-                CodeBase = typeof(ConsoleLogger).GetTypeInfo().Assembly.Location,
-                IsEnabled = true
-            };
-
-            loggerRunSettings.LoggerSettingsList.Add(consoleLogger);
+            // Autodetect frameworks from sources, so we can check that they are compatible with the settings, and report
+            // incompatibilities as warnings.
+            //
+            // DO NOT overwrite the common framework, the one forced by runsettings should be used.
+            var _ = _inferHelper.AutoDetectFramework(sources, out sourceToFrameworkMap);
+
+            // If we would not want to report the incompatibilities later, we would simply return dictionary populated to the
+            // framework that is set by the settings.
+            //
+            // sourceToFrameworkMap = new Dictionary<string, Framework>();
+            // foreach (var source in sources)
+            // {
+            //     sourceToFrameworkMap.Add(source, commonFramework);
+            // }
+
+            WriteWarningForNetFramework35IsUnsupported(registrar, commonFramework);
+            // Return false because we did not update runsettings.
+            return false;
+        }
+
+        // Autodetect framework from sources, and return a single common platform.
+        commonFramework = _inferHelper.AutoDetectFramework(sources, out sourceToFrameworkMap);
+        InferRunSettingsHelper.UpdateTargetFramework(document, commonFramework.ToString(), overwrite: true);
+
+        WriteWarningForNetFramework35IsUnsupported(registrar, commonFramework);
+
+        // Return true because we updated runsettings.
+        return true;
+    }
+
+    private static void WriteWarningForNetFramework35IsUnsupported(IBaseTestEventsRegistrar? registrar, Framework? commonFramework)
+    {
+        // Raise warnings for unsupported frameworks.
+        // TODO: Look at the sourceToFrameworkMap, and report paths to the sources that use that framework, rather than the chosen framework
+        if (string.Equals(ObjectModel.Constants.DotNetFramework35, commonFramework?.Name))
+        {
+            EqtTrace.Warning("TestRequestManager.UpdateRunSettingsIfRequired: throw warning on /Framework:Framework35 option.");
+            registrar?.LogWarning(Resources.Resources.Framework35NotSupported);
+        }
+    }
+
+    /// <summary>
+    /// Add console logger in runsettings.
+    /// </summary>
+    /// <param name="document">Runsettings document.</param>
+    /// <param name="loggerRunSettings">Logger run settings.</param>
+    private static void AddConsoleLogger(XmlDocument document, LoggerRunSettings loggerRunSettings)
+    {
+        var consoleLogger = new LoggerSettings
+        {
+            FriendlyName = ConsoleLogger.FriendlyName,
+            Uri = new Uri(ConsoleLogger.ExtensionUri),
+            AssemblyQualifiedName = typeof(ConsoleLogger).AssemblyQualifiedName,
+            CodeBase = typeof(ConsoleLogger).Assembly.Location,
+            IsEnabled = true
+        };
+
+        loggerRunSettings.LoggerSettingsList.Add(consoleLogger);
+        RunSettingsProviderExtensions.UpdateRunSettingsXmlDocumentInnerXml(
+            document,
+            ObjectModel.Constants.LoggerRunSettingsName,
+            loggerRunSettings.ToXml().InnerXml);
+    }
+
+    /// <summary>
+    /// Add console logger in runsettings if exists.
+    /// </summary>
+    /// <param name="document">Runsettings document.</param>
+    /// <param name="loggerRunSettings">Logger run settings.</param>
+    /// <returns>True if updated console logger in runsettings successfully.</returns>
+    private static bool UpdateConsoleLoggerIfExists(
+        XmlDocument document,
+        LoggerRunSettings loggerRunSettings)
+    {
+        var logger = new LoggerSettings
+        {
+            FriendlyName = ConsoleLogger.FriendlyName,
+            Uri = new Uri(ConsoleLogger.ExtensionUri)
+        };
+
+        var existingLoggerIndex = loggerRunSettings.GetExistingLoggerIndex(logger);
+
+        // Update assemblyQualifiedName and codeBase of existing logger.
+        if (existingLoggerIndex >= 0)
+        {
+            var consoleLogger = loggerRunSettings.LoggerSettingsList[existingLoggerIndex];
+            consoleLogger.AssemblyQualifiedName = typeof(ConsoleLogger).AssemblyQualifiedName;
+            consoleLogger.CodeBase = typeof(ConsoleLogger).Assembly.Location;
             RunSettingsProviderExtensions.UpdateRunSettingsXmlDocumentInnerXml(
                 document,
-                Constants.LoggerRunSettingsName,
+                ObjectModel.Constants.LoggerRunSettingsName,
                 loggerRunSettings.ToXml().InnerXml);
+
+            return true;
         }
 
-        /// <summary>
-        /// Add console logger in runsettings if exists.
-        /// </summary>
-        /// <param name="document">Runsettings document.</param>
-        /// <param name="loggerRunSettings">Logger run settings.</param>
-        /// <returns>True if updated console logger in runsettings successfully.</returns>
-        private bool UpdateConsoleLoggerIfExists(
-            XmlDocument document,
-            LoggerRunSettings loggerRunSettings)
-        {
-            var defaultConsoleLogger = new LoggerSettings
-            {
-                FriendlyName = ConsoleLogger.FriendlyName,
-                Uri = new Uri(ConsoleLogger.ExtensionUri)
-            };
+        return false;
+    }
 
-            var existingLoggerIndex = loggerRunSettings.GetExistingLoggerIndex(defaultConsoleLogger);
+    /// <summary>
+    /// Add MSBuild console logger in runsettings if exists.
+    /// </summary>
+    /// <param name="document">Runsettings document.</param>
+    /// <param name="loggerRunSettings">Logger run settings.</param>
+    /// <returns>True if updated console logger in runsettings successfully.</returns>
+    private static bool UpdateMSBuildLoggerIfExists(
+        XmlDocument document,
+        LoggerRunSettings loggerRunSettings)
+    {
+        var logger = new LoggerSettings
+        {
+            FriendlyName = MSBuildLogger.FriendlyName,
+            Uri = new Uri(MSBuildLogger.ExtensionUri)
+        };
 
-            // Update assemblyQualifiedName and codeBase of existing logger.
-            if (existingLoggerIndex >= 0)
-            {
-                var consoleLogger = loggerRunSettings.LoggerSettingsList[existingLoggerIndex];
-                consoleLogger.AssemblyQualifiedName = typeof(ConsoleLogger).AssemblyQualifiedName;
-                consoleLogger.CodeBase = typeof(ConsoleLogger).GetTypeInfo().Assembly.Location;
-                RunSettingsProviderExtensions.UpdateRunSettingsXmlDocumentInnerXml(
-                    document,
-                    Constants.LoggerRunSettingsName,
-                    loggerRunSettings.ToXml().InnerXml);
+        var existingLoggerIndex = loggerRunSettings.GetExistingLoggerIndex(logger);
 
-                return true;
-            }
+        // Update assemblyQualifiedName and codeBase of existing logger.
+        if (existingLoggerIndex >= 0)
+        {
+            var msBuildLogger = loggerRunSettings.LoggerSettingsList[existingLoggerIndex];
+            msBuildLogger.AssemblyQualifiedName = typeof(MSBuildLogger).AssemblyQualifiedName;
+            msBuildLogger.CodeBase = typeof(MSBuildLogger).Assembly.Location;
+            RunSettingsProviderExtensions.UpdateRunSettingsXmlDocumentInnerXml(
+                document,
+                ObjectModel.Constants.LoggerRunSettingsName,
+                loggerRunSettings.ToXml().InnerXml);
 
-            return false;
+            return true;
         }
 
-        private void RunTests(
-            IRequestData requestData,
-            TestRunCriteria testRunCriteria,
-            ITestRunEventsRegistrar testRunEventsRegistrar,
-            TestPlatformOptions options)
+        return false;
+    }
+
+    internal static bool UpdateCollectCoverageSettings(XmlDocument xmlDocument, RunConfiguration _)
+    {
+        return InferRunSettingsHelper.UpdateCollectCoverageSettings(xmlDocument);
+    }
+
+    private void RunTests(
+        IRequestData requestData,
+        TestRunCriteria testRunCriteria,
+        ITestRunEventsRegistrar testRunEventsRegistrar,
+        TestPlatformOptions? options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap)
+    {
+        // Make sure to run the run request inside a lock as the below section is not thread-safe.
+        // TranslationLayer can process faster as it directly gets the raw un-serialized messages
+        // whereas below logic needs to deserialize and do some cleanup.
+        // While this section is cleaning up, TranslationLayer can trigger run causing multiple
+        // threads to run the below section at the same time.
+        lock (_syncObject)
         {
-            // Make sure to run the run request inside a lock as the below section is not thread-safe.
-            // TranslationLayer can process faster as it directly gets the raw un-serialized messages
-            // whereas below logic needs to deserialize and do some cleanup.
-            // While this section is cleaning up, TranslationLayer can trigger run causing multiple
-            // threads to run the below section at the same time.
-            lock (this.syncObject)
+            try
             {
-                try
-                {
-                    this.currentTestRunRequest = this.testPlatform.CreateTestRunRequest(
-                        requestData,
-                        testRunCriteria,
-                        options);
+                _currentTestRunRequest = _testPlatform.CreateTestRunRequest(
+                    requestData,
+                    testRunCriteria,
+                    options,
+                    sourceToSourceDetailMap,
+                    new EventRegistrarToWarningLoggerAdapter(testRunEventsRegistrar));
 
-                    this.testRunResultAggregator.RegisterTestRunEvents(this.currentTestRunRequest);
-                    testRunEventsRegistrar?.RegisterTestRunEvents(this.currentTestRunRequest);
+                _testRunResultAggregator.RegisterTestRunEvents(_currentTestRunRequest);
+                testRunEventsRegistrar?.RegisterTestRunEvents(_currentTestRunRequest);
 
-                    this.testPlatformEventSource.ExecutionRequestStart();
+                _testPlatformEventSource.ExecutionRequestStart();
 
-                    this.currentTestRunRequest.ExecuteAsync();
+                _currentTestRunRequest.ExecuteAsync();
 
-                    // Wait for the run completion event
-                    this.currentTestRunRequest.WaitForCompletion();
-                }
-                catch (Exception ex)
-                {
-                    EqtTrace.Error("TestRequestManager.RunTests: failed to run tests: {0}", ex);
-                    testRunResultAggregator.MarkTestRunFailed();
-                    throw;
-                }
-                finally
+                // Wait for the run completion event
+                _currentTestRunRequest.WaitForCompletion();
+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Error("TestRequestManager.RunTests: failed to run tests: {0}", ex);
+                _testRunResultAggregator.MarkTestRunFailed();
+                throw;
+            }
+            finally
+            {
+                if (_currentTestRunRequest != null)
                 {
-                    if (this.currentTestRunRequest != null)
-                    {
-                        this.testRunResultAggregator.UnregisterTestRunEvents(this.currentTestRunRequest);
-                        testRunEventsRegistrar?.UnregisterTestRunEvents(this.currentTestRunRequest);
+                    _testRunResultAggregator.UnregisterTestRunEvents(_currentTestRunRequest);
+                    testRunEventsRegistrar?.UnregisterTestRunEvents(_currentTestRunRequest);
 
-                        this.currentTestRunRequest.Dispose();
-                        this.currentTestRunRequest = null;
-                    }
+                    _currentTestRunRequest.Dispose();
+                    _currentTestRunRequest = null;
                 }
             }
         }
+    }
+
+    /// <summary>
+    /// Check runsettings, to see if framework was specified by the user, if yes then use that for all sources.
+    /// This method either looks at runsettings directly when running as a server (DesignMode / IDE / via VSTestConsoleWrapper, or how you wanna call it)
+    /// or uses the pre-parsed runsettings when in console mode.
+    /// </summary>
+    /// <returns></returns>
+    private bool IsFrameworkSetByRunSettings(
+        XPathNavigator navigator,
+        out Framework? chosenFramework)
+    {
 
-        private bool IsAutoFrameworkDetectRequired(
-            XPathNavigator navigator,
-            out Framework chosenFramework)
+        if (_commandLineOptions.IsDesignMode)
         {
-            bool required = true;
-            chosenFramework = null;
-            if (commandLineOptions.IsDesignMode)
+            bool isValidFrameworkXml = InferRunSettingsHelper.TryGetFrameworkXml(navigator, out var frameworkXml);
+            if (isValidFrameworkXml && !frameworkXml.IsNullOrWhiteSpace())
             {
-                bool isValidFx =
-                    InferRunSettingsHelper.TryGetFrameworkXml(
-                        navigator,
-                        out var frameworkFromrunsettingsXml);
-                required = !isValidFx || string.IsNullOrWhiteSpace(frameworkFromrunsettingsXml);
-                if (!required)
-                {
-                    chosenFramework = Framework.FromString(frameworkFromrunsettingsXml);
-                }
-            }
-            else if (!commandLineOptions.IsDesignMode
-                && commandLineOptions.FrameworkVersionSpecified)
-            {
-                required = false;
-                chosenFramework = commandLineOptions.TargetFrameworkVersion;
+                // TODO: this should just ask the runsettings to give that value so we always parse it the same way
+                chosenFramework = Framework.FromString(frameworkXml);
+                return true;
             }
 
-            return required;
+            chosenFramework = Framework.DefaultFramework;
+            return false;
         }
 
-        private bool IsAutoPlatformDetectRequired(
-            XPathNavigator navigator,
-            out Architecture chosenPlatform)
+        if (_commandLineOptions.FrameworkVersionSpecified)
         {
-            bool required = true;
-            chosenPlatform = Architecture.Default;
-            if (commandLineOptions.IsDesignMode)
-            {
-                bool isValidPlatform = InferRunSettingsHelper.TryGetPlatformXml(
-                    navigator,
-                    out var platformXml);
+            chosenFramework = _commandLineOptions.TargetFrameworkVersion;
+            return true;
+        }
 
-                required = !isValidPlatform || string.IsNullOrWhiteSpace(platformXml);
-                if (!required)
-                {
-                    chosenPlatform = (Architecture)Enum.Parse(
-                        typeof(Architecture),
-                        platformXml, true);
-                }
-            }
-            else if (!commandLineOptions.IsDesignMode && commandLineOptions.ArchitectureSpecified)
+        chosenFramework = Framework.DefaultFramework;
+        return false;
+    }
+
+    /// <summary>
+    /// Check runsettings, to see if platform was specified by the user, if yes then use that for all sources.
+    /// This method either looks at runsettings directly when running as a server (DesignMode / IDE / via VSTestConsoleWrapper, or how you wanna call it)
+    /// or uses the pre-parsed runsettings when in console mode.
+    /// </summary>
+    /// <returns></returns>
+    private bool IsPlatformSetByRunSettings(
+        XPathNavigator navigator, out Architecture chosenPlatform)
+    {
+        if (_commandLineOptions.IsDesignMode)
+        {
+            bool isValidPlatformXml = InferRunSettingsHelper.TryGetPlatformXml(
+                navigator,
+                out var platformXml);
+
+            if (isValidPlatformXml && !platformXml.IsNullOrWhiteSpace())
             {
-                required = false;
-                chosenPlatform = commandLineOptions.TargetArchitecture;
+                // TODO: this should be checking if the enum has the value specified, or ideally just ask the runsettings to give that value
+                // so we parse the same way always
+                chosenPlatform = (Architecture)Enum.Parse(typeof(Architecture), platformXml, ignoreCase: true);
+                return true;
             }
 
-            return required;
+            chosenPlatform = Architecture.Default;
+            return false;
+        }
+
+        if (_commandLineOptions.ArchitectureSpecified)
+        {
+            chosenPlatform = _commandLineOptions.TargetArchitecture;
+            return true;
         }
 
-        /// <summary>
-        /// Collect metrics.
-        /// </summary>
-        /// <param name="requestData">Request data for common Discovery/Execution services.</param>
-        /// <param name="runConfiguration">Run configuration.</param>
-        private void CollectMetrics(IRequestData requestData, RunConfiguration runConfiguration)
+        chosenPlatform = Architecture.Default;
+        return false;
+    }
+
+    /// <summary>
+    /// Collect metrics.
+    /// </summary>
+    /// <param name="requestData">Request data for common Discovery/Execution services.</param>
+    /// <param name="runConfiguration">Run configuration.</param>
+    private static void CollectMetrics(IRequestData requestData, RunConfiguration runConfiguration)
+    {
+        // Collecting Target Framework.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.TargetFramework,
+            runConfiguration.TargetFramework!.Name);
+
+        // Collecting Target Platform.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.TargetPlatform,
+            runConfiguration.TargetPlatform.ToString());
+
+        // Collecting Max CPU count.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.MaxCPUcount,
+            runConfiguration.MaxCpuCount);
+
+        // Collecting Target Device. Here, it will be updated run settings so, target device
+        // will be under run configuration only.
+        var targetDevice = runConfiguration.TargetDevice;
+        if (targetDevice.IsNullOrEmpty())
         {
-            // Collecting Target Framework.
             requestData.MetricsCollection.Add(
-                TelemetryDataConstants.TargetFramework,
-                runConfiguration.TargetFramework.Name);
-
-            // Collecting Target Platform.
+                TelemetryDataConstants.TargetDevice,
+                "Local Machine");
+        }
+        else if (targetDevice.Equals("Device", StringComparison.Ordinal)
+                 || targetDevice.Contains("Emulator"))
+        {
             requestData.MetricsCollection.Add(
-                TelemetryDataConstants.TargetPlatform,
-                runConfiguration.TargetPlatform.ToString());
-
-            // Collecting Max CPU count.
+                TelemetryDataConstants.TargetDevice,
+                targetDevice);
+        }
+        else
+        {
+            // For IOT scenarios.
             requestData.MetricsCollection.Add(
-                TelemetryDataConstants.MaxCPUcount,
-                runConfiguration.MaxCpuCount);
+                TelemetryDataConstants.TargetDevice,
+                "Other");
+        }
 
-            // Collecting Target Device. Here, it will be updated run settings so, target device
-            // will be under run configuration only.
-            var targetDevice = runConfiguration.TargetDevice;
-            if (string.IsNullOrEmpty(targetDevice))
-            {
-                requestData.MetricsCollection.Add(
-                    TelemetryDataConstants.TargetDevice,
-                    "Local Machine");
-            }
-            else if (targetDevice.Equals("Device", StringComparison.Ordinal)
-                || targetDevice.Contains("Emulator"))
-            {
-                requestData.MetricsCollection.Add(
-                    TelemetryDataConstants.TargetDevice,
-                    targetDevice);
-            }
-            else
-            {
-                // For IOT scenarios.
-                requestData.MetricsCollection.Add(
-                    TelemetryDataConstants.TargetDevice,
-                    "Other");
-            }
+        // Collecting TestPlatform version.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.TestPlatformVersion,
+            Product.Version!);
 
-            // Collecting TestPlatform version.
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.TestPlatformVersion,
-                Product.Version);
+        // Collecting TargetOS.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.TargetOS,
+            new PlatformEnvironment().OperatingSystemVersion);
 
-            // Collecting TargetOS.
-            requestData.MetricsCollection.Add(
-               TelemetryDataConstants.TargetOS,
-               new PlatformEnvironment().OperatingSystemVersion);
+        //Collecting DisableAppDomain.
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.DisableAppDomain,
+            runConfiguration.DisableAppDomain);
 
-            //Collecting DisableAppDomain.
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.DisableAppDomain,
-                runConfiguration.DisableAppDomain);
+    }
 
+    /// <summary>
+    /// Checks whether Telemetry opted in or not.
+    /// By Default opting out
+    /// </summary>
+    /// <returns>Returns Telemetry Opted out or not</returns>
+    private static bool IsTelemetryOptedIn()
+        => Environment.GetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN")?.Equals("1", StringComparison.Ordinal) == true;
+
+    /// <summary>
+    /// Log Command Line switches for Telemetry purposes
+    /// </summary>
+    /// <param name="requestData">Request Data providing common discovery/execution services.</param>
+    private void LogCommandsTelemetryPoints(IRequestData requestData)
+    {
+        var commandsUsed = new List<string>();
+
+        var parallel = _commandLineOptions.Parallel;
+        if (parallel)
+        {
+            commandsUsed.Add("/Parallel");
         }
 
-        /// <summary>
-        /// Checks whether Telemetry opted in or not.
-        /// By Default opting out
-        /// </summary>
-        /// <returns>Returns Telemetry Opted out or not</returns>
-        private static bool IsTelemetryOptedIn()
+        var platform = _commandLineOptions.ArchitectureSpecified;
+        if (platform)
         {
-            var telemetryStatus = Environment.GetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN");
-            return !string.IsNullOrEmpty(telemetryStatus)
-                && telemetryStatus.Equals("1", StringComparison.Ordinal);
+            commandsUsed.Add("/Platform");
         }
 
-        /// <summary>
-        /// Log Command Line switches for Telemetry purposes
-        /// </summary>
-        /// <param name="requestData">Request Data providing common discovery/execution services.</param>
-        private void LogCommandsTelemetryPoints(IRequestData requestData)
+        var enableCodeCoverage = _commandLineOptions.EnableCodeCoverage;
+        if (enableCodeCoverage)
         {
-            var commandsUsed = new List<string>();
+            commandsUsed.Add("/EnableCodeCoverage");
+        }
 
-            var parallel = this.commandLineOptions.Parallel;
-            if (parallel)
-            {
-                commandsUsed.Add("/Parallel");
-            }
+        var inIsolation = _commandLineOptions.InIsolation;
+        if (inIsolation)
+        {
+            commandsUsed.Add("/InIsolation");
+        }
 
-            var platform = this.commandLineOptions.ArchitectureSpecified;
-            if (platform)
-            {
-                commandsUsed.Add("/Platform");
-            }
+        var useVsixExtensions = _commandLineOptions.UseVsixExtensions;
+        if (useVsixExtensions)
+        {
+            commandsUsed.Add("/UseVsixExtensions");
+        }
 
-            var enableCodeCoverage = this.commandLineOptions.EnableCodeCoverage;
-            if (enableCodeCoverage)
-            {
-                commandsUsed.Add("/EnableCodeCoverage");
-            }
+        var frameworkVersionSpecified = _commandLineOptions.FrameworkVersionSpecified;
+        if (frameworkVersionSpecified)
+        {
+            commandsUsed.Add("/Framework");
+        }
 
-            var inIsolation = this.commandLineOptions.InIsolation;
-            if (inIsolation)
+        var settings = _commandLineOptions.SettingsFile;
+        if (!settings.IsNullOrEmpty())
+        {
+            var extension = Path.GetExtension(settings);
+            if (string.Equals(extension, ".runsettings", StringComparison.OrdinalIgnoreCase))
             {
-                commandsUsed.Add("/InIsolation");
+                commandsUsed.Add("/settings//.RunSettings");
             }
-
-            var useVsixExtensions = this.commandLineOptions.UseVsixExtensions;
-            if (useVsixExtensions)
+            else if (string.Equals(extension, ".testsettings", StringComparison.OrdinalIgnoreCase))
             {
-                commandsUsed.Add("/UseVsixExtensions");
+                commandsUsed.Add("/settings//.TestSettings");
             }
-
-            var frameworkVersionSpecified = this.commandLineOptions.FrameworkVersionSpecified;
-            if (frameworkVersionSpecified)
+            else if (string.Equals(extension, ".vsmdi", StringComparison.OrdinalIgnoreCase))
             {
-                commandsUsed.Add("/Framework");
+                commandsUsed.Add("/settings//.vsmdi");
             }
-
-            var settings = this.commandLineOptions.SettingsFile;
-            if (!string.IsNullOrEmpty(settings))
+            else if (string.Equals(extension, ".testrunConfig", StringComparison.OrdinalIgnoreCase))
             {
-                var extension = Path.GetExtension(settings);
-                if (string.Equals(extension, ".runsettings", StringComparison.OrdinalIgnoreCase))
-                {
-                    commandsUsed.Add("/settings//.RunSettings");
-                }
-                else if (string.Equals(extension, ".testsettings", StringComparison.OrdinalIgnoreCase))
-                {
-                    commandsUsed.Add("/settings//.TestSettings");
-                }
-                else if (string.Equals(extension, ".vsmdi", StringComparison.OrdinalIgnoreCase))
-                {
-                    commandsUsed.Add("/settings//.vsmdi");
-                }
-                else if (string.Equals(extension, ".testrunConfig", StringComparison.OrdinalIgnoreCase))
-                {
-                    commandsUsed.Add("/settings//.testrunConfig");
-                }
+                commandsUsed.Add("/settings//.testrunConfig");
             }
+        }
 
-            requestData.MetricsCollection.Add(
-                TelemetryDataConstants.CommandLineSwitches,
-                string.Join(",", commandsUsed.ToArray()));
+        requestData.MetricsCollection.Add(
+            TelemetryDataConstants.CommandLineSwitches,
+            string.Join(",", commandsUsed.ToArray()));
+    }
+
+    /// <summary>
+    /// Gets request data.
+    /// </summary>
+    /// <param name="protocolConfig">Protocol config.</param>
+    /// <returns>Request data.</returns>
+    private IRequestData GetRequestData(ProtocolConfig protocolConfig)
+    {
+        return new RequestData
+        {
+            ProtocolConfig = protocolConfig,
+            MetricsCollection =
+                _telemetryOptedIn || IsTelemetryOptedIn()
+                    ? new MetricsCollection()
+                    : new NoOpMetricsCollection(),
+            IsTelemetryOptedIn = _telemetryOptedIn || IsTelemetryOptedIn()
+        };
+    }
+
+    private static List<string> GetSources(TestRunRequestPayload testRunRequestPayload)
+    {
+        // TODO: This should also use hashset to only return distinct sources.
+        if (testRunRequestPayload.Sources is { Count: > 0 })
+        {
+            return testRunRequestPayload.Sources;
         }
 
-        /// <summary>
-        /// Gets request data.
-        /// </summary>
-        /// <param name="protocolConfig">Protocol config.</param>
-        /// <returns>Request data.</returns>
-        private IRequestData GetRequestData(ProtocolConfig protocolConfig)
+        if (testRunRequestPayload.TestCases is { Count: > 0 })
         {
-            return new RequestData
+            var sourcesSet = new HashSet<string>();
+            foreach (var testCase in testRunRequestPayload.TestCases)
             {
-                ProtocolConfig = protocolConfig,
-                MetricsCollection =
-                               this.telemetryOptedIn || IsTelemetryOptedIn()
-                                   ? (IMetricsCollection)new MetricsCollection()
-                                   : new NoOpMetricsCollection(),
-                IsTelemetryOptedIn = this.telemetryOptedIn || IsTelemetryOptedIn()
-            };
+                sourcesSet.Add(testCase.Source);
+            }
+            return sourcesSet.ToList();
+        }
+        return [];
+    }
+}
+
+internal static class KnownPlatformSourceFilter
+{
+    // Running tests on AzureDevops, many projects use the default filter
+    // which includes all *test*.dll, this includes many of the TestPlatform dlls,
+    // which we cannot run, and don't want to attempt to run.
+    // The default filter also filters out !*TestAdapter*.dll but it is easy to forget
+    // so we skip the most used adapters here as well.
+    private static readonly HashSet<string> KnownPlatformSources = new(new string[]
+    {
+        "Microsoft.TestPlatform.AdapterUtilities.dll",
+        "Microsoft.TestPlatform.AdapterUtilities.resources.dll",
+        "Microsoft.TestPlatform.CommunicationUtilities.dll",
+        "Microsoft.TestPlatform.CommunicationUtilities.resources.dll",
+        "Microsoft.TestPlatform.CoreUtilities.dll",
+        "Microsoft.TestPlatform.CoreUtilities.resources.dll",
+        "Microsoft.TestPlatform.CrossPlatEngine.dll",
+        "Microsoft.TestPlatform.CrossPlatEngine.resources.dll",
+        "Microsoft.TestPlatform.PlatformAbstractions.dll",
+        "Microsoft.TestPlatform.Utilities.dll",
+        "Microsoft.TestPlatform.Utilities.resources.dll",
+        "Microsoft.VisualStudio.TestPlatform.Common.dll",
+        "Microsoft.VisualStudio.TestPlatform.Common.resources.dll",
+        "Microsoft.VisualStudio.TestPlatform.ObjectModel.dll",
+        "Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll",
+        "testhost.dll",
+
+        // NUnit
+        "NUnit3.TestAdapter.dll",
+
+        // XUnit
+        "xunit.runner.visualstudio.testadapter.dll",
+        "xunit.runner.visualstudio.dotnetcore.testadapter.dll",
+
+        // MSTest
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll",
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.dll",
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll",
+
+        // Testing platform
+        "Microsoft.Testing.Extensions.CodeCoverage.dll",
+        "Microsoft.Testing.Extensions.CodeCoverage.resources.dll",
+        "Microsoft.Testing.Extensions.CrashDump.dll",
+        "Microsoft.Testing.Extensions.CrashDump.resources.dll",
+        "Microsoft.Testing.Extensions.Experimental.dll",
+        "Microsoft.Testing.Extensions.HangDump.dll",
+        "Microsoft.Testing.Extensions.HangDump.resources.dll",
+        "Microsoft.Testing.Extensions.HotReload.dll",
+        "Microsoft.Testing.Extensions.HotReload.resources.dll",
+        "Microsoft.Testing.Extensions.MSBuild.dll",
+        "Microsoft.Testing.Extensions.Retry.dll",
+        "Microsoft.Testing.Extensions.Retry.resources.dll",
+        "Microsoft.Testing.Extensions.Telemetry.dll",
+        "Microsoft.Testing.Extensions.Telemetry.resources.dll",
+        "Microsoft.Testing.Extensions.TrxReport.Abstractions.dll",
+        "Microsoft.Testing.Extensions.TrxReport.dll",
+        "Microsoft.Testing.Extensions.TrxReport.resources.dll",
+        "Microsoft.Testing.Extensions.VSTestBridge.dll",
+        "Microsoft.Testing.Extensions.VSTestBridge.resources.dll",
+        "Microsoft.Testing.Internal.Framework.dll",
+        "Microsoft.Testing.Internal.Framework.SourceGeneration.dll",
+        "Microsoft.Testing.Internal.VersionSourceGeneration.dll",
+        "Microsoft.Testing.Platform.dll",
+        "Microsoft.Testing.Platform.Extensions.dll",
+        "Microsoft.Testing.Platform.Extensions.VSTestBridge.dll",
+        "Microsoft.Testing.Platform.MSBuild.dll",
+        "Microsoft.Testing.Platform.MSBuild.resources.dll",
+        "Microsoft.Testing.Platform.resources.dll",
+
+        // For MSTest up to v3
+        "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll",
+    }, StringComparer.OrdinalIgnoreCase);
+
+
+    internal static List<string> FilterKnownPlatformSources(List<string>? sources)
+    {
+        if (sources == null)
+        {
+            return new List<string>();
         }
 
-        private List<String> GetSources(TestRunRequestPayload testRunRequestPayload)
+        var filteredSources = new List<string>();
+        foreach (string source in sources)
         {
-            List<string> sources = new List<string>();
-            if (testRunRequestPayload.Sources != null
-                && testRunRequestPayload.Sources.Count > 0)
+            if (KnownPlatformSources.Contains(Path.GetFileName(source)))
             {
-                sources = testRunRequestPayload.Sources;
+                EqtTrace.Info($"TestRequestManager.FilterKnownPlatformSources: Known platform dll was provided in sources, removing it '{source}'");
             }
-            else if (testRunRequestPayload.TestCases != null
-                && testRunRequestPayload.TestCases.Count > 0)
+            else
             {
-                ISet<string> sourcesSet = new HashSet<string>();
-                foreach (var testCase in testRunRequestPayload.TestCases)
-                {
-                    sourcesSet.Add(testCase.Source);
-                }
-                sources = sourcesSet.ToList();
+                filteredSources.Add(source);
             }
-            return sources;
         }
+
+        return filteredSources;
     }
 }
diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config
index e6f209a541..9132c7fde7 100644
--- a/src/vstest.console/app.config
+++ b/src/vstest.console/app.config
@@ -14,11 +14,48 @@
       <!-- Test adapters compiled against version 11-14, need to be redirected to version 15. -->
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
+        <bindingRedirect oldVersion="11.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="10.0.0.0-16.0.0.0" newVersion="17.0.0.0" />
+        <!-- Microsoft.Extensions.DependencyModel depends on version 9.0.0, and newer versions of that nuget don't support all the frameworks we need anymore. -->
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="9.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="1.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
+      
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.11" newVersion="6.0.0.11" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
@@ -32,7 +69,7 @@
           1. Uncomment below system.diagnostics element content.
           2. Replace "c:\tmp\log.txt" with valid filename. Make sure "c:\tmp" folder exists. log.txt file will be created by vstest.console if does not exists.
           3. Restart vstest.console or it's client(VS, any other IDE).
-        More details: https://github.com/Microsoft/vstest-docs/blob/main/docs/diagnose.md#collect-trace-using-config-file
+        More details: https://github.com/Microsoft/vstest/blob/main/docs/diagnose.md#collect-trace-using-config-file
   -->
 
   <!-- <system.diagnostics>
@@ -54,4 +91,4 @@
     </sharedListeners>
   </system.diagnostics> -->
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/vstest.console/app.manifest b/src/vstest.console/app.manifest
index 9952698906..06e64089d4 100644
--- a/src/vstest.console/app.manifest
+++ b/src/vstest.console/app.manifest
@@ -3,10 +3,18 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <!-- Make the application long-path aware (see #5179) -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <ws2:longPathAware>true</ws2:longPathAware>
+    </windowsSettings>
+  </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
@@ -24,4 +32,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 7c55559126..262e80a41a 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -1,28 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
+  <Import Project="$(RepoRoot)src\Microsoft.TestPlatform.Execution.Shared\Microsoft.TestPlatform.Execution.Shared.projitems" Label="Shared" />
+
   <PropertyGroup>
     <AssemblyName>vstest.console</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>$(RunnerTargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
+    <!--
+      Prevent the creation of the ".exe" for .NET Core. This was the default on .NET Core 2.1, behavior changed for .NET Core 3.1.
+      We don't want the exe because we will start datacollector via dotnet exec datacollector.dll, because we don't know on which
+      OS or architecture we will be running. So there is no point in shipping the exe.
+    -->
+    <UseAppHost>false</UseAppHost>
+    <RollForward>Major</RollForward>
     <IsTestProject>false</IsTestProject>
-    <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">AnyCPU</PlatformTarget>
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) AND '$(RuntimeIdentifier)' == '' " >AnyCPU</PlatformTarget>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.CommandLine</RootNamespace>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+    <!--
+      Prevents adding a bunch of binding redirects causing exception
+      (e.g. System.Runtime 4.1.2 instead of 4.0.0)
+    -->
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <DefineConstants>$(DefineConstants);USE_EXTERN_ALIAS</DefineConstants>
+
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Resources.resx" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
     <Reference Include="System" />
     <Reference Include="System.IO" />
     <Reference Include="System.Runtime" />
@@ -31,14 +40,14 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
-    <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
+    <ProjectReference Include="..\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" Aliases="Abstraction" />
     <ProjectReference Include="..\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj">
       <FromP2P>true</FromP2P>
@@ -46,8 +55,14 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj">
       <FromP2P>true</FromP2P>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="NullableHelpers.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NullableHelpers.tt</DependentUpon>
+    </Compile>
     <Compile Update="Resources\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -60,5 +75,23 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+    <!-- API that is common to all frameworks that we build for. -->
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
+    <!-- Framework specific API -->
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
+    <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/temp/testhost/testhost-8.0.runtimeconfig.json b/temp/testhost/testhost-8.0.runtimeconfig.json
new file mode 100644
index 0000000000..15af9f03a0
--- /dev/null
+++ b/temp/testhost/testhost-8.0.runtimeconfig.json
@@ -0,0 +1,9 @@
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0-preview.0"
+    }
+  }
+}
diff --git a/temp/testhost/testhost-9.0.runtimeconfig.json b/temp/testhost/testhost-9.0.runtimeconfig.json
new file mode 100644
index 0000000000..146e13202e
--- /dev/null
+++ b/temp/testhost/testhost-9.0.runtimeconfig.json
@@ -0,0 +1,9 @@
+{
+  "runtimeOptions": {
+    "tfm": "net9.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "9.0.0-preview.0"
+    }
+  }
+}
diff --git a/temp/testhost/testhost.deps.json b/temp/testhost/testhost.deps.json
index e5e7cd107d..8d751253a8 100644
--- a/temp/testhost/testhost.deps.json
+++ b/temp/testhost/testhost.deps.json
@@ -15,8 +15,7 @@
           "Microsoft.TestPlatform.Utilities": "15.0.0.0",
           "Microsoft.VisualStudio.TestPlatform.Common": "15.0.0.0",
           "Microsoft.VisualStudio.TestPlatform.ObjectModel": "15.0.0.0",
-          "Newtonsoft.Json": "9.0.0.0",
-          "NuGet.Frameworks": "5.0.0.6"
+          "Newtonsoft.Json": "13.0.0.0"
         },
         "runtime": {
           "testhost.dll": {}
@@ -78,19 +77,11 @@
           }
         }
       },
-      "Newtonsoft.Json/9.0.0.0": {
+      "Newtonsoft.Json/13.0.0.0": {
         "runtime": {
           "Newtonsoft.Json.dll": {
-            "assemblyVersion": "9.0.0.0",
-            "fileVersion": "9.0.1.19813"
-          }
-        }
-      },
-      "NuGet.Frameworks/5.0.0.6": {
-        "runtime": {
-          "NuGet.Frameworks.dll": {
-            "assemblyVersion": "5.0.0.6",
-            "fileVersion": "5.0.0.5923"
+            "assemblyVersion": "13.0.0.0",
+            "fileVersion": "13.0.3.25517"
           }
         }
       }
@@ -145,13 +136,7 @@
       "sha512": "",
       "path": "/"
     },
-    "Newtonsoft.Json/9.0.0.0": {
-      "type": "reference",
-      "serviceable": false,
-      "sha512": "",
-      "path": "/"
-    },
-    "NuGet.Frameworks/5.0.0.6": {
+    "Newtonsoft.Json/13.0.0.0": {
       "type": "reference",
       "serviceable": false,
       "sha512": "",
diff --git a/test.cmd b/test.cmd
index 24c6a88504..db9e8e061d 100644
--- a/test.cmd
+++ b/test.cmd
@@ -1,6 +1,3 @@
 @echo off
-
-REM Copyright (c) Microsoft. All rights reserved.
-
-powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "%~dp0scripts\test.ps1 %*; exit $LastExitCode;" 
-if %errorlevel% neq 0 exit /b %errorlevel% 
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -test %*"
+exit /b %ErrorLevel%
diff --git a/test.sh b/test.sh
index 4ce51fcafa..637dec3600 100755
--- a/test.sh
+++ b/test.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
-# Copyright (c) Microsoft. All rights reserved.
-# Test script for test platform.
 
-set -e
+source="${BASH_SOURCE[0]}"
 
-source "scripts/test.sh" "$@"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
 
-if [[ $? -ne 0 ]]; then
-    exit 1
-fi
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+"$scriptroot/eng/common/build.sh" --test $@
diff --git a/test/.editorconfig b/test/.editorconfig
new file mode 100644
index 0000000000..f44194a73b
--- /dev/null
+++ b/test/.editorconfig
@@ -0,0 +1,38 @@
+# Tests specific configuration
+# Applies on top of other .editorconfig files
+
+# C# files
+[*.cs]
+
+#### .NET Coding Conventions ####
+
+# CA1825: Avoid zero-length array allocations
+dotnet_diagnostic.CA1825.severity = warning
+
+# IDE0060: Remove unused parameter
+dotnet_diagnostic.IDE0060.severity = warning
+
+# CA1018: Mark attributes with AttributeUsageAttribute
+dotnet_diagnostic.CA1018.severity = warning
+
+# CA1001: Types that own disposable fields should be disposable
+dotnet_diagnostic.CA1001.severity = silent # Disabled on tests as it does not matter
+
+# CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1051.severity = silent # Disabled on tests as it does not matter
+
+#### C# Coding Conventions ####
+
+#### .NET Formatting Rules ####
+
+#### C# Formatting Rules ####
+
+#### .NET Naming styles ####
+
+# CA1710: Identifiers should have correct suffix
+dotnet_diagnostic.CA1710.severity = warning
+
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = silent
+
+#### C# Naming styles ####
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/CollectorNameValueConfigurationManagerTests.cs b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/CollectorNameValueConfigurationManagerTests.cs
index 9ed8187b52..4dcd550c11 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/CollectorNameValueConfigurationManagerTests.cs
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/CollectorNameValueConfigurationManagerTests.cs
@@ -1,55 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests
-{
-    using System.IO;
-    using System.Xml;
+using System.IO;
+using System.Xml;
 
-    using Microsoft.TestPlatform.Extensions.EventLogCollector;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class CollectorNameValueConfigurationManagerTests
-    {
-        private const string ConfigurationString =
-            @"<Configuration><Setting name=""key"" value=""value"" /></Configuration>";
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests;
+
+[TestClass]
+public class CollectorNameValueConfigurationManagerTests
+{
+    private const string ConfigurationString =
+        @"<Configuration><Setting name=""key"" value=""value"" /></Configuration>";
 
-        private const string EmptyConfigurationString =
-            @"<Configuration/>";
+    private const string EmptyConfigurationString =
+        @"<Configuration/>";
 
-        [TestMethod]
-        public void ConstructorShouldInitializeNameValuePairDictionary()
+    [TestMethod]
+    public void ConstructorShouldInitializeNameValuePairDictionary()
+    {
+        XmlDocument xmlDocument = new();
+        using (XmlReader reader = XmlReader.Create(new StringReader(ConfigurationString)))
         {
-            XmlDocument xmlDocument = new XmlDocument();
-            using (XmlReader reader = XmlReader.Create(new StringReader(ConfigurationString)))
-            {
-                xmlDocument.Load(reader);
-            }
+            xmlDocument.Load(reader);
+        }
 
-            var configManager = new CollectorNameValueConfigurationManager(xmlDocument.DocumentElement);
+        var configManager = new CollectorNameValueConfigurationManager(xmlDocument.DocumentElement);
 
-            Assert.AreEqual("value", configManager["key"]);
-        }
+        Assert.AreEqual("value", configManager["key"]);
+    }
 
-        [TestMethod]
-        public void ConstructorShouldNotInitializeNameValuePairIfEmptyXmlElementIsPassed()
+    [TestMethod]
+    public void ConstructorShouldNotInitializeNameValuePairIfEmptyXmlElementIsPassed()
+    {
+        XmlDocument xmlDocument = new();
+        using (XmlReader reader = XmlReader.Create(new StringReader(EmptyConfigurationString)))
         {
-            XmlDocument xmlDocument = new XmlDocument();
-            using (XmlReader reader = XmlReader.Create(new StringReader(EmptyConfigurationString)))
-            {
-                xmlDocument.Load(reader);
-            }
-
-            var configManager = new CollectorNameValueConfigurationManager(xmlDocument.DocumentElement);
-            Assert.AreEqual(0, configManager.NameValuePairs.Count);
+            xmlDocument.Load(reader);
         }
 
-        [TestMethod]
-        public void ConstructorShouldNotInitializeNameValuePairNullIsPassed()
-        {
-            var configManager = new CollectorNameValueConfigurationManager(null);
-            Assert.AreEqual(0, configManager.NameValuePairs.Count);
-        }
+        var configManager = new CollectorNameValueConfigurationManager(xmlDocument.DocumentElement);
+        Assert.AreEqual(0, configManager.NameValuePairs.Count);
+    }
+
+    [TestMethod]
+    public void ConstructorShouldNotInitializeNameValuePairNullIsPassed()
+    {
+        var configManager = new CollectorNameValueConfigurationManager(null);
+        Assert.AreEqual(0, configManager.NameValuePairs.Count);
     }
 }
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogContainerTests.cs b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogContainerTests.cs
index b6d03fbe33..72727cbb4a 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogContainerTests.cs
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogContainerTests.cs
@@ -1,135 +1,129 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using Resource = Microsoft.TestPlatform.Extensions.EventLogCollector.Resources.Resources;
-    using System.Globalization;
-
-    [TestClass]
-    public class EventLogContainerTests
-    {
-        private HashSet<string> eventSources;
-
-        private HashSet<EventLogEntryType> entryTypes;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 
-        private Mock<DataCollectionLogger> logger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private DataCollectionContext dataCollectionContext;
+using Moq;
 
-        private EventLog eventLog;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests;
 
-        private EventLogContainer eventLogContainer;
-
-        private EntryWrittenEventArgs entryWrittenEventArgs;
-
-
-        private string eventLogName = "Application";
+[TestClass]
+[Ignore] // "TODO: Gets stuck when running with other tests."
+public class EventLogContainerTests
+{
+    private readonly HashSet<string> _eventSources;
+    private readonly HashSet<EventLogEntryType> _entryTypes;
+    private readonly Mock<DataCollectionLogger> _logger;
+    private readonly DataCollectionContext _dataCollectionContext;
+    private readonly EventLog _eventLog;
+    private readonly EntryWrittenEventArgs _entryWrittenEventArgs;
+    private readonly string _eventLogName = "Application";
 
+    private EventLogContainer _eventLogContainer;
 
-        public EventLogContainerTests()
+    public EventLogContainerTests()
+    {
+        _eventSources = new HashSet<string>
         {
-            this.eventSources = new HashSet<string>();
-            this.eventSources.Add("Application");
-            this.entryTypes = new HashSet<EventLogEntryType>();
-            this.entryTypes.Add(EventLogEntryType.Error);
-
-            this.logger = new Mock<DataCollectionLogger>();
-            this.eventLog = new EventLog("Application");
-            this.entryWrittenEventArgs = new EntryWrittenEventArgs(this.eventLog.Entries[this.eventLog.Entries.Count - 1]);
-
-            this.dataCollectionContext = new DataCollectionContext(new SessionId(Guid.NewGuid()));
-
-            this.eventLogContainer = new EventLogContainer(
-                this.eventLogName,
-                this.eventSources,
-                this.entryTypes,
-                int.MaxValue,
-                this.logger.Object,
-                this.dataCollectionContext);
-        }
-
-        [TestMethod]
-        [Ignore]
-        public void OnEventLogEntryWrittenShouldAddLogs()
+            "Application"
+        };
+        _entryTypes = new HashSet<EventLogEntryType>
         {
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 234);
-            this.eventLogContainer.OnEventLogEntryWritten(this.eventLog, this.entryWrittenEventArgs);
-            var newCount = this.eventLogContainer.EventLogEntries.Count;
+            EventLogEntryType.Error
+        };
+
+        _logger = new Mock<DataCollectionLogger>();
+        _eventLog = new EventLog("Application");
+        _entryWrittenEventArgs = new EntryWrittenEventArgs(_eventLog.Entries[_eventLog.Entries.Count - 1]);
+
+        _dataCollectionContext = new DataCollectionContext(new SessionId(Guid.NewGuid()));
+
+        _eventLogContainer = new EventLogContainer(
+            _eventLogName,
+            _eventSources,
+            _entryTypes,
+            int.MaxValue,
+            _logger.Object,
+            _dataCollectionContext);
+    }
+
+    [TestMethod]
+    [Ignore]
+    public void OnEventLogEntryWrittenShouldAddLogs()
+    {
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 234);
+        _eventLogContainer.OnEventLogEntryWritten(_eventLog, _entryWrittenEventArgs);
+        var newCount = _eventLogContainer.EventLogEntries.Count;
 
-            Assert.IsTrue(newCount > 0);
-        }
+        Assert.IsTrue(newCount > 0);
+    }
 
-        [TestMethod]
-        public void OnEventLogEntryWrittenShouldNotAddLogsIfNoNewEntryIsPresent()
-        {
-            this.eventLogContainer.OnEventLogEntryWritten(this.eventLog, this.entryWrittenEventArgs);
-            var newCount = this.eventLogContainer.EventLogEntries.Count;
+    [TestMethod]
+    public void OnEventLogEntryWrittenShouldNotAddLogsIfNoNewEntryIsPresent()
+    {
+        _eventLogContainer.OnEventLogEntryWritten(_eventLog, _entryWrittenEventArgs);
+        var newCount = _eventLogContainer.EventLogEntries.Count;
 
-            Assert.AreEqual(0, newCount);
-        }
+        Assert.AreEqual(0, newCount);
+    }
 
-        [TestMethod]
-        public void OnEventLogEntryWrittenShoulFilterLogsBasedOnEventTypeAndEventSource()
-        {
-            this.entryTypes.Add(EventLogEntryType.Warning);
-            this.eventSources.Add("Application");
+    [TestMethod]
+    [Ignore] // "TODO: gets stuck"
+    public void OnEventLogEntryWrittenShouldFilterLogsBasedOnEventTypeAndEventSource()
+    {
+        _entryTypes.Add(EventLogEntryType.Warning);
+        _eventSources.Add("Application");
 
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
-            this.eventLogContainer.OnEventLogEntryWritten(this.eventLog, this.entryWrittenEventArgs);
-            var newCount = this.eventLogContainer.EventLogEntries.Count;
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
+        _eventLogContainer.OnEventLogEntryWritten(_eventLog, _entryWrittenEventArgs);
+        var newCount = _eventLogContainer.EventLogEntries.Count;
 
-            Assert.AreEqual(1, newCount);
-        }
+        Assert.AreEqual(1, newCount);
+    }
 
-        [TestMethod]
-        public void OnEventLogEntryWrittenShoulNotAddLogsIfEventSourceIsDifferent()
-        {
-            this.eventSources.Clear();
-            this.eventSources.Add("Application1");
-            this.eventLogContainer = new EventLogContainer(
-                this.eventLogName,
-                this.eventSources,
-                this.entryTypes,
-                int.MaxValue,
-                this.logger.Object,
-                this.dataCollectionContext);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
-            this.eventLogContainer.OnEventLogEntryWritten(this.eventLog, this.entryWrittenEventArgs);
-            var newCount = this.eventLogContainer.EventLogEntries.Count;
-
-            Assert.AreEqual(0, newCount);
-        }
-
-        [TestMethod]
-        public void OnEventLogEntryWrittenShoulNotAddLogsIfEventTypeIsDifferent()
-        {
-            this.entryTypes.Clear();
-            this.entryTypes.Add(EventLogEntryType.FailureAudit);
-
-            this.eventSources.Add("Application1");
-            this.eventLogContainer = new EventLogContainer(
-                this.eventLogName,
-                this.eventSources,
-                this.entryTypes,
-                int.MaxValue,
-                this.logger.Object,
-                this.dataCollectionContext);
-
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
-            this.eventLogContainer.OnEventLogEntryWritten(this.eventLog, this.entryWrittenEventArgs);
-            var newCount = this.eventLogContainer.EventLogEntries.Count;
-
-            Assert.AreEqual(0, newCount);
-        }
+    [TestMethod]
+    public void OnEventLogEntryWrittenShouldNotAddLogsIfEventSourceIsDifferent()
+    {
+        _eventSources.Clear();
+        _eventSources.Add("Application1");
+        _eventLogContainer = new EventLogContainer(
+            _eventLogName,
+            _eventSources,
+            _entryTypes,
+            int.MaxValue,
+            _logger.Object,
+            _dataCollectionContext);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
+        _eventLogContainer.OnEventLogEntryWritten(_eventLog, _entryWrittenEventArgs);
+        var newCount = _eventLogContainer.EventLogEntries.Count;
+
+        Assert.AreEqual(0, newCount);
+    }
+
+    [TestMethod]
+    public void OnEventLogEntryWrittenShouldNotAddLogsIfEventTypeIsDifferent()
+    {
+        _entryTypes.Clear();
+        _entryTypes.Add(EventLogEntryType.FailureAudit);
+
+        _eventSources.Add("Application1");
+        _eventLogContainer = new EventLogContainer(
+            _eventLogName,
+            _eventSources,
+            _entryTypes,
+            int.MaxValue,
+            _logger.Object,
+            _dataCollectionContext);
+
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Warning, 234);
+        _eventLogContainer.OnEventLogEntryWritten(_eventLog, _entryWrittenEventArgs);
+        var newCount = _eventLogContainer.EventLogEntries.Count;
+
+        Assert.AreEqual(0, newCount);
     }
 }
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogDataCollectorTests.cs b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogDataCollectorTests.cs
index 75099d3c41..43923342e1 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogDataCollectorTests.cs
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogDataCollectorTests.cs
@@ -1,504 +1,481 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class EventLogDataCollectorTests
-    {
-        private const string ConfigurationString =
-            @"<Configuration><Setting name=""key"" value=""value"" /></Configuration>";
-
-        private Mock<DataCollectionEvents> mockDataCollectionEvents;
-
-        private TestableDataCollectionSink mockDataCollectionSink;
-
-        private Mock<DataCollectionLogger> mockDataCollectionLogger;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
 
-        private DataCollectionEnvironmentContext dataCollectionEnvironmentContext;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private EventLogDataCollector eventLogDataCollector;
+using Moq;
 
-        private Mock<IFileHelper> mockFileHelper;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests;
 
-        public EventLogDataCollectorTests()
-        {
-            this.mockDataCollectionEvents = new Mock<DataCollectionEvents>();
-            this.mockDataCollectionSink = new TestableDataCollectionSink();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            TestCase tc = new TestCase();
-            DataCollectionContext dataCollectionContext =
-                new DataCollectionContext(new SessionId(Guid.NewGuid()));
-            this.dataCollectionEnvironmentContext = new DataCollectionEnvironmentContext(dataCollectionContext);
-            this.mockDataCollectionLogger = new Mock<DataCollectionLogger>();
-            this.eventLogDataCollector = new EventLogDataCollector(this.mockFileHelper.Object);
-        }
+[TestClass]
+public class EventLogDataCollectorTests
+{
+    private readonly Mock<DataCollectionEvents> _mockDataCollectionEvents;
+    private readonly TestableDataCollectionSink _mockDataCollectionSink;
+    private readonly Mock<DataCollectionLogger> _mockDataCollectionLogger;
+    private readonly DataCollectionEnvironmentContext _dataCollectionEnvironmentContext;
+    private readonly EventLogDataCollector _eventLogDataCollector;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+
+    public EventLogDataCollectorTests()
+    {
+        _mockDataCollectionEvents = new Mock<DataCollectionEvents>();
+        _mockDataCollectionSink = new TestableDataCollectionSink();
+        _mockFileHelper = new Mock<IFileHelper>();
+        DataCollectionContext dataCollectionContext =
+            new(new SessionId(Guid.NewGuid()));
+        _dataCollectionEnvironmentContext = new DataCollectionEnvironmentContext(dataCollectionContext);
+        _mockDataCollectionLogger = new Mock<DataCollectionLogger>();
+        _eventLogDataCollector = new EventLogDataCollector(_mockFileHelper.Object);
+    }
 
-        [TestMethod]
-        public void EventLoggerLogsErrorForInvalidEventSources()
-        {
-            string configurationString =
+    [TestMethod]
+    public void EventLoggerLogsErrorForInvalidEventSources()
+    {
+        string configurationString =
             @"<Configuration><Setting name=""EventLogs"" value=""MyEventName"" /></Configuration>";
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-            var mockCollector = new Mock<DataCollectionLogger>();
-            mockCollector.Setup(m => m.LogError(It.IsAny<DataCollectionContext>(), It.Is<string>(s => s.Contains(@"The event log 'MyEventName' on computer '.' does not exist.")), It.IsAny<Exception>()));
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+        var mockCollector = new Mock<DataCollectionLogger>();
+        mockCollector.Setup(m => m.LogError(It.IsAny<DataCollectionContext>(), It.Is<string>(s => s.Contains(@"The event log 'MyEventName' on computer '.' does not exist.")), It.IsAny<Exception>()));
 
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, mockCollector.Object, this.dataCollectionEnvironmentContext);
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, mockCollector.Object, _dataCollectionEnvironmentContext);
 
-            mockCollector.Verify(m => m.LogError(It.IsAny<DataCollectionContext>(), It.IsAny<string>(), It.IsAny<Exception>()), Times.Once);
-        }
+        mockCollector.Verify(m => m.LogError(It.IsAny<DataCollectionContext>(), It.IsAny<string>(), It.IsAny<Exception>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfEventsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        this.eventLogDataCollector.Initialize(
-                            null,
-                            null,
-                            this.mockDataCollectionSink,
-                            this.mockDataCollectionLogger.Object,
-                            this.dataCollectionEnvironmentContext);
-                    });
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfEventsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _eventLogDataCollector.Initialize(
+                null,
+                null!,
+                _mockDataCollectionSink,
+                _mockDataCollectionLogger.Object,
+                _dataCollectionEnvironmentContext));
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfCollectionSinkIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        this.eventLogDataCollector.Initialize(
-                            null,
-                            this.mockDataCollectionEvents.Object,
-                            null,
-                            this.mockDataCollectionLogger.Object,
-                            this.dataCollectionEnvironmentContext);
-                    });
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfCollectionSinkIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _eventLogDataCollector.Initialize(
+                null,
+                _mockDataCollectionEvents.Object,
+                null!,
+                _mockDataCollectionLogger.Object,
+                _dataCollectionEnvironmentContext));
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfLoggerIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        this.eventLogDataCollector.Initialize(
-                            null,
-                            this.mockDataCollectionEvents.Object,
-                            this.mockDataCollectionSink,
-                            null,
-                            this.dataCollectionEnvironmentContext);
-                    });
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfLoggerIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _eventLogDataCollector.Initialize(
+                null,
+                _mockDataCollectionEvents.Object,
+                _mockDataCollectionSink,
+                null!,
+                _dataCollectionEnvironmentContext));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeDefaultEventLogNames()
-        {
-            List<string> eventLogNames = new List<string>();
-            eventLogNames.Add("System");
-            eventLogNames.Add("Application");
+    [TestMethod]
+    public void InitializeShouldInitializeDefaultEventLogNames()
+    {
+        List<string> eventLogNames =
+        [
+            "System",
+            "Application"
+        ];
 
-            this.eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        _eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            CollectionAssert.AreEqual(eventLogNames, this.eventLogDataCollector.EventLogNames.ToList());
-        }
+        Assert.IsNotNull(_eventLogDataCollector.EventLogNames);
+        CollectionAssert.AreEqual(eventLogNames, _eventLogDataCollector.EventLogNames.ToList());
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeCustomEventLogNamesIfSpecifiedInConfiguration()
-        {
-            string configurationString =
+    [TestMethod]
+    public void InitializeShouldInitializeCustomEventLogNamesIfSpecifiedInConfiguration()
+    {
+        string configurationString =
             @"<Configuration><Setting name=""EventLogs"" value=""MyEventName,MyEventName2"" /></Configuration>";
 
-            List<string> eventLogNames = new List<string>();
-            eventLogNames.Add("MyEventName");
-            eventLogNames.Add("MyEventName2");
+        List<string> eventLogNames =
+        [
+            "MyEventName",
+            "MyEventName2"
+        ];
 
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
 
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            CollectionAssert.AreEqual(eventLogNames, this.eventLogDataCollector.EventLogNames.ToList());
-        }
+        Assert.IsNotNull(_eventLogDataCollector.EventLogNames);
+        CollectionAssert.AreEqual(eventLogNames, _eventLogDataCollector.EventLogNames.ToList());
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeDefaultLogEntryTypes()
-        {
-            List<EventLogEntryType> entryTypes = new List<EventLogEntryType>();
-            entryTypes.Add(EventLogEntryType.Error);
-            entryTypes.Add(EventLogEntryType.Warning);
-            entryTypes.Add(EventLogEntryType.FailureAudit);
+    [TestMethod]
+    public void InitializeShouldInitializeDefaultLogEntryTypes()
+    {
+        List<EventLogEntryType> entryTypes =
+        [
+            EventLogEntryType.Error,
+            EventLogEntryType.Warning,
+            EventLogEntryType.FailureAudit
+        ];
 
-            this.eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        _eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            CollectionAssert.AreEqual(entryTypes, this.eventLogDataCollector.EntryTypes.ToList());
-        }
+        Assert.IsNotNull(_eventLogDataCollector.EntryTypes);
+        CollectionAssert.AreEqual(entryTypes, _eventLogDataCollector.EntryTypes.ToList());
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeEntryTypesIfSpecifiedInConfiguration()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""EntryTypes"" value=""Error"" /></Configuration>";
+    [TestMethod]
+    public void InitializeShouldInitializeEntryTypesIfSpecifiedInConfiguration()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""EntryTypes"" value=""Error"" /></Configuration>";
 
-            List<EventLogEntryType> entryTypes = new List<EventLogEntryType>();
-            entryTypes.Add(EventLogEntryType.Error);
+        List<EventLogEntryType> entryTypes = [EventLogEntryType.Error];
 
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            CollectionAssert.AreEqual(entryTypes, this.eventLogDataCollector.EntryTypes.ToList());
-        }
+        Assert.IsNotNull(_eventLogDataCollector.EntryTypes);
+        CollectionAssert.AreEqual(entryTypes, _eventLogDataCollector.EntryTypes.ToList());
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeEventSourcesIfSpecifiedInConfiguration()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""EventSources"" value=""MyEventSource"" /></Configuration>";
+    [TestMethod]
+    public void InitializeShouldInitializeEventSourcesIfSpecifiedInConfiguration()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""EventSources"" value=""MyEventSource"" /></Configuration>";
 
-            List<string> eventSources = new List<string>();
-            eventSources.Add("MyEventSource");
+        List<string> eventSources = ["MyEventSource"];
 
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            CollectionAssert.AreEqual(eventSources, this.eventLogDataCollector.EventSources.ToList());
-        }
+        Assert.IsNotNull(_eventLogDataCollector.EventSources);
+        CollectionAssert.AreEqual(eventSources, _eventLogDataCollector.EventSources.ToList());
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeEventSourcesByDefault()
-        {
-            this.eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+    [TestMethod]
+    public void InitializeShouldNotInitializeEventSourcesByDefault()
+    {
+        _eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            Assert.IsNull(this.eventLogDataCollector.EventSources);
-        }
+        Assert.IsNull(_eventLogDataCollector.EventSources);
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeMaxEntriesIfSpecifiedInConfiguration()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /></Configuration>";
+    [TestMethod]
+    public void InitializeShouldInitializeMaxEntriesIfSpecifiedInConfiguration()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /></Configuration>";
 
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            Assert.AreEqual(20, this.eventLogDataCollector.MaxEntries);
-        }
+        Assert.AreEqual(20, _eventLogDataCollector.MaxEntries);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetDefaultMaxEntries()
-        {
-            this.eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+    [TestMethod]
+    public void InitializeShouldSetDefaultMaxEntries()
+    {
+        _eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            Assert.AreEqual(50000, this.eventLogDataCollector.MaxEntries);
-        }
+        Assert.AreEqual(50000, _eventLogDataCollector.MaxEntries);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSubscribeToDataCollectionEvents()
-        {
-            var testableDataCollectionEvents = new TestableDataCollectionEvents();
-            this.eventLogDataCollector.Initialize(null, testableDataCollectionEvents, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            Assert.AreEqual(1, testableDataCollectionEvents.GetTestHostLaunchedInvocationList().Length);
-            Assert.AreEqual(1, testableDataCollectionEvents.GetTestCaseStartInvocationList().Length);
-            Assert.AreEqual(1, testableDataCollectionEvents.GetTestCaseEndInvocationList().Length);
-            Assert.AreEqual(1, testableDataCollectionEvents.GetTestSessionEndInvocationList().Length);
-            Assert.AreEqual(1, testableDataCollectionEvents.GetTestSessionStartInvocationList().Length);
-        }
+    [TestMethod]
+    public void InitializeShouldSubscribeToDataCollectionEvents()
+    {
+        var testableDataCollectionEvents = new TestableDataCollectionEvents();
+        _eventLogDataCollector.Initialize(null, testableDataCollectionEvents, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        Assert.AreEqual(1, testableDataCollectionEvents.GetTestCaseStartInvocationList()?.Length, "GetTestCaseStartInvocationList");
+        Assert.AreEqual(1, testableDataCollectionEvents.GetTestCaseEndInvocationList()?.Length, "GetTestCaseEndInvocationList");
+        Assert.AreEqual(1, testableDataCollectionEvents.GetTestSessionEndInvocationList()?.Length, "GetTestSessionEndInvocationList");
+        Assert.AreEqual(1, testableDataCollectionEvents.GetTestSessionStartInvocationList()?.Length, "GetTestSessionStartInvocationList");
+    }
 
-        [TestMethod]
-        public void TestSessionStartEventShouldCreateEventLogContainer()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            Assert.AreEqual(0, eventLogDataCollector.ContextMap.Count);
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            this.mockDataCollectionEvents.Raise(x => x.SessionStart += null, new SessionStartEventArgs());
-            Assert.AreEqual(1, eventLogDataCollector.ContextMap.Count);
-        }
+    [TestMethod]
+    public void TestSessionStartEventShouldCreateEventLogContainer()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        Assert.AreEqual(0, eventLogDataCollector.ContextMap.Count);
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        _mockDataCollectionEvents.Raise(x => x.SessionStart += null, new SessionStartEventArgs());
+        Assert.AreEqual(1, eventLogDataCollector.ContextMap.Count);
+    }
 
-        [TestMethod]
-        public void TestCaseStartEventShouldCreateEventLogContainer()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            Assert.AreEqual(0, eventLogDataCollector.ContextMap.Count);
+    [TestMethod]
+    public void TestCaseStartEventShouldCreateEventLogContainer()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        Assert.AreEqual(0, eventLogDataCollector.ContextMap.Count);
 
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            this.mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid())), new TestCase()));
-            Assert.AreEqual(1, eventLogDataCollector.ContextMap.Count);
-        }
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        _mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid())), new TestCase()));
+        Assert.AreEqual(1, eventLogDataCollector.ContextMap.Count);
+    }
 
-        [TestMethod]
+    [TestMethod]
 
-        public void TestCaseEndEventShouldWriteEventLogEntriesAndSendFile()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            var tc = new TestCase();
-            var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
-            this.mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(context, tc));
-            this.mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed));
-            Assert.IsTrue(this.mockDataCollectionSink.IsSendFileAsyncInvoked);
-        }
+    public void TestCaseEndEventShouldWriteEventLogEntriesAndSendFile()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        var tc = new TestCase();
+        var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
+        _mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(context, tc));
+        _mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed));
+        Assert.IsTrue(_mockDataCollectionSink.IsSendFileAsyncInvoked);
+    }
 
-        public void TestCaseEndEventShouldInvokeSendFileAsync()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            var tc = new TestCase();
-            var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
-            this.mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(context, tc));
-            this.mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed));
-            Assert.IsTrue(this.mockDataCollectionSink.IsSendFileAsyncInvoked);
-        }
+    public void TestCaseEndEventShouldInvokeSendFileAsync()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        var tc = new TestCase();
+        var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
+        _mockDataCollectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(context, tc));
+        _mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed));
+        Assert.IsTrue(_mockDataCollectionSink.IsSendFileAsyncInvoked);
+    }
 
-        [TestMethod]
-        public void TestCaseEndEventShouldThrowIfTestCaseStartIsNotInvoked()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            var tc = new TestCase();
-            var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
-
-            Assert.ThrowsException<EventLogCollectorException>(() =>
-            {
-                this.mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed));
-            });
-        }
+    [TestMethod]
+    public void TestCaseEndEventShouldThrowIfTestCaseStartIsNotInvoked()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        var tc = new TestCase();
+        var context = new DataCollectionContext(new SessionId(Guid.NewGuid()), new TestExecId(Guid.NewGuid()));
 
-        public void SessionEndEventShouldThrowIfSessionStartEventtIsNotInvoked()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            var tc = new TestCase();
-
-            Assert.ThrowsException<EventLogCollectorException>(() =>
-                {
-                    this.mockDataCollectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionEnvironmentContext.SessionDataCollectionContext));
-                });
-        }
+        Assert.ThrowsException<EventLogCollectorException>(() => _mockDataCollectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(context, tc, TestOutcome.Passed)));
+    }
 
-        [TestMethod]
-        public void TestSessionEndEventShouldWriteEventLogEntriesAndSendFile()
-        {
-            var eventLogDataCollector = new EventLogDataCollector();
-            eventLogDataCollector.Initialize(null, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            var testcase = new TestCase() { Id = Guid.NewGuid() };
-            this.mockDataCollectionEvents.Raise(x => x.SessionStart += null, new SessionStartEventArgs(this.dataCollectionEnvironmentContext.SessionDataCollectionContext, new Dictionary<string, object>()));
-            this.mockDataCollectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionEnvironmentContext.SessionDataCollectionContext));
-            Assert.IsTrue(this.mockDataCollectionSink.IsSendFileAsyncInvoked);
-        }
+    public void SessionEndEventShouldThrowIfSessionStartEventtIsNotInvoked()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        var tc = new TestCase();
 
-        [TestMethod]
-        public void WriteEventLogsShouldCreateXmlFile()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
+        Assert.ThrowsException<EventLogCollectorException>(() => _mockDataCollectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionEnvironmentContext.SessionDataCollectionContext)));
+    }
 
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
+    [TestMethod]
+    public void TestSessionEndEventShouldWriteEventLogEntriesAndSendFile()
+    {
+        var eventLogDataCollector = new EventLogDataCollector();
+        eventLogDataCollector.Initialize(null, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        var testcase = new TestCase() { Id = Guid.NewGuid() };
+        _mockDataCollectionEvents.Raise(x => x.SessionStart += null, new SessionStartEventArgs(_dataCollectionEnvironmentContext.SessionDataCollectionContext, new Dictionary<string, object?>()));
+        _mockDataCollectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionEnvironmentContext.SessionDataCollectionContext));
+        Assert.IsTrue(_mockDataCollectionSink.IsSendFileAsyncInvoked);
+    }
 
-            this.mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-            this.eventLogDataCollector.WriteEventLogs(
+    [TestMethod]
+    public void WriteEventLogsShouldCreateXmlFile()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
+
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+
+        _mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
+        _eventLogDataCollector.WriteEventLogs(
+            new List<EventLogEntry>(),
+            20,
+            _dataCollectionEnvironmentContext.SessionDataCollectionContext,
+            TimeSpan.MaxValue,
+            DateTime.Now);
+
+        _mockFileHelper.Verify(x => x.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void WriteEventLogsShouldThrowExceptionIfThrownByFileHelper()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
+
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
+        _mockFileHelper.Setup(x => x.Exists(It.IsAny<string>())).Throws<Exception>();
+        Assert.ThrowsException<Exception>(
+            () => _eventLogDataCollector.WriteEventLogs(
                 new List<EventLogEntry>(),
                 20,
-                this.dataCollectionEnvironmentContext.SessionDataCollectionContext,
+                _dataCollectionEnvironmentContext.SessionDataCollectionContext,
                 TimeSpan.MaxValue,
-                DateTime.Now);
-
-            this.mockFileHelper.Verify(x => x.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void WriteEventLogsShouldThrowExceptionIfThrownByFileHelper()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
-
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-            this.mockFileHelper.Setup(x => x.Exists(It.IsAny<string>())).Throws<Exception>();
-            Assert.ThrowsException<Exception>(
-                () =>
-                    {
-                        this.eventLogDataCollector.WriteEventLogs(
-                            new List<EventLogEntry>(),
-                            20,
-                            this.dataCollectionEnvironmentContext.SessionDataCollectionContext,
-                            TimeSpan.MaxValue,
-                            DateTime.Now);
-                    });
-        }
-
-        [TestMethod]
-        public void WriteEventLogsShouldFilterTestsBasedOnTimeAndMaxValue()
-        {
-            string configurationString =
-                @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
-
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
+                DateTime.Now));
+    }
 
-            this.mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
+    [TestMethod]
+    public void WriteEventLogsShouldFilterTestsBasedOnTimeAndMaxValue()
+    {
+        string configurationString =
+            @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
 
-            var entries = new List<EventLogEntry>();
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
 
-            var eventLog = new EventLog("Application");
-            int endIndex = eventLog.Entries[eventLog.Entries.Count - 1].Index;
-            int firstIndexInLog = eventLog.Entries[0].Index;
-            for (int i = endIndex; i > endIndex - 10; i--)
-            {
-                entries.Add(eventLog.Entries[i - firstIndexInLog]);
-            }
+        _mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-            var filteredEntries = entries.Where(entry => entry.TimeGenerated > DateTime.MinValue && entry.TimeGenerated < DateTime.MaxValue)
-                .OrderBy(x => x.TimeGenerated).Take(5).ToList();
+        var entries = new List<EventLogEntry>();
 
-            this.eventLogDataCollector.WriteEventLogs(
-                entries,
-                5,
-                this.dataCollectionEnvironmentContext.SessionDataCollectionContext,
-                TimeSpan.MaxValue,
-                DateTime.Now);
-
-            this.mockFileHelper.Verify(
-                x => x.WriteAllTextToFile(
-                    It.IsAny<string>(),
-                    It.Is<string>(
-                        str => str.Contains(filteredEntries[0].InstanceId.ToString())
-                               && str.Contains(filteredEntries[1].InstanceId.ToString())
-                               && str.Contains(filteredEntries[2].InstanceId.ToString())
-                               && str.Contains(filteredEntries[3].InstanceId.ToString())
-                               && str.Contains(filteredEntries[4].InstanceId.ToString()))));
-        }
-
-        [TestMethod]
-        public void WriteEventLogsShouldFilterTestIfMaxValueExceedsEntries()
+        var eventLog = new EventLog("Application");
+        int endIndex = eventLog.Entries[eventLog.Entries.Count - 1].Index;
+        int firstIndexInLog = eventLog.Entries[0].Index;
+        for (int i = endIndex; i > endIndex - 10; i--)
         {
-            string configurationString =
-                @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
-
-            XmlDocument expectedXmlDoc = new XmlDocument();
-            expectedXmlDoc.LoadXml(configurationString);
-
-            this.mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
-            this.eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, this.mockDataCollectionEvents.Object, this.mockDataCollectionSink, this.mockDataCollectionLogger.Object, this.dataCollectionEnvironmentContext);
-
-            var entries = new List<EventLogEntry>();
-
-            var eventLog = new EventLog("Application");
-            int endIndex = eventLog.Entries[eventLog.Entries.Count - 1].Index;
-            int firstIndexInLog = eventLog.Entries[0].Index;
-            for (int i = endIndex; i > endIndex - 5; i--)
-            {
-                entries.Add(eventLog.Entries[i - firstIndexInLog]);
-            }
-
-            var filteredEntries = entries.Where(entry => entry.TimeGenerated > DateTime.MinValue && entry.TimeGenerated < DateTime.MaxValue)
-                .OrderBy(x => x.TimeGenerated).Take(10).ToList();
-
-            this.eventLogDataCollector.WriteEventLogs(
-                entries,
-                5,
-                this.dataCollectionEnvironmentContext.SessionDataCollectionContext,
-                TimeSpan.MaxValue,
-                DateTime.Now);
-
-            this.mockFileHelper.Verify(
-                x => x.WriteAllTextToFile(
-                    It.IsAny<string>(),
-                    It.Is<string>(
-                        str => str.Contains(filteredEntries[0].InstanceId.ToString())
-                               && str.Contains(filteredEntries[1].InstanceId.ToString())
-                               && str.Contains(filteredEntries[2].InstanceId.ToString())
-                               && str.Contains(filteredEntries[3].InstanceId.ToString())
-                               && str.Contains(filteredEntries[4].InstanceId.ToString()))));
+            entries.Add(eventLog.Entries[i - firstIndexInLog]);
         }
+
+        var filteredEntries = entries.Where(entry => entry.TimeGenerated > DateTime.MinValue && entry.TimeGenerated < DateTime.MaxValue)
+            .OrderBy(x => x.TimeGenerated).Take(5).ToList();
+
+        _eventLogDataCollector.WriteEventLogs(
+            entries,
+            5,
+            _dataCollectionEnvironmentContext.SessionDataCollectionContext,
+            TimeSpan.MaxValue,
+            DateTime.Now);
+
+        _mockFileHelper.Verify(
+            x => x.WriteAllTextToFile(
+                It.IsAny<string>(),
+                It.Is<string>(
+                    str => str.Contains(filteredEntries[0].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[1].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[2].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[3].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[4].InstanceId.ToString(CultureInfo.CurrentCulture)))));
     }
 
-    /// <summary>
-    /// The testable data collection events.
-    /// </summary>
-    public class TestableDataCollectionEvents : DataCollectionEvents
+    [TestMethod]
+    public void WriteEventLogsShouldFilterTestIfMaxValueExceedsEntries()
     {
-        public override event EventHandler<TestHostLaunchedEventArgs> TestHostLaunched;
-
-        public override event EventHandler<SessionStartEventArgs> SessionStart;
+        string configurationString =
+            @"<Configuration><Setting name=""MaxEventLogEntriesToCollect"" value=""20"" /><Setting name=""EventLog"" value=""Application"" /><Setting name=""EntryTypes"" value=""Warning"" /></Configuration>";
 
-        public override event EventHandler<SessionEndEventArgs> SessionEnd;
+        XmlDocument expectedXmlDoc = new();
+        expectedXmlDoc.LoadXml(configurationString);
 
-        public override event EventHandler<TestCaseStartEventArgs> TestCaseStart;
+        _mockFileHelper.SetupSequence(x => x.Exists(It.IsAny<string>())).Returns(false).Returns(true);
+        _eventLogDataCollector.Initialize(expectedXmlDoc.DocumentElement, _mockDataCollectionEvents.Object, _mockDataCollectionSink, _mockDataCollectionLogger.Object, _dataCollectionEnvironmentContext);
 
-        public override event EventHandler<TestCaseEndEventArgs> TestCaseEnd;
+        var entries = new List<EventLogEntry>();
 
-        public Delegate[] GetTestHostLaunchedInvocationList()
+        var eventLog = new EventLog("Application");
+        int endIndex = eventLog.Entries[eventLog.Entries.Count - 1].Index;
+        int firstIndexInLog = eventLog.Entries[0].Index;
+        for (int i = endIndex; i > endIndex - 5; i--)
         {
-            return this.TestHostLaunched.GetInvocationList();
+            entries.Add(eventLog.Entries[i - firstIndexInLog]);
         }
 
-        public Delegate[] GetTestCaseStartInvocationList()
-        {
-            return this.TestCaseStart.GetInvocationList();
-        }
+        var filteredEntries = entries.Where(entry => entry.TimeGenerated > DateTime.MinValue && entry.TimeGenerated < DateTime.MaxValue)
+            .OrderBy(x => x.TimeGenerated).Take(10).ToList();
+
+        _eventLogDataCollector.WriteEventLogs(
+            entries,
+            5,
+            _dataCollectionEnvironmentContext.SessionDataCollectionContext,
+            TimeSpan.MaxValue,
+            DateTime.Now);
+
+        _mockFileHelper.Verify(
+            x => x.WriteAllTextToFile(
+                It.IsAny<string>(),
+                It.Is<string>(
+                    str => str.Contains(filteredEntries[0].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[1].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[2].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[3].InstanceId.ToString(CultureInfo.CurrentCulture))
+                           && str.Contains(filteredEntries[4].InstanceId.ToString(CultureInfo.CurrentCulture)))));
+    }
+}
 
-        public Delegate[] GetTestCaseEndInvocationList()
-        {
-            return this.TestCaseEnd.GetInvocationList();
-        }
+/// <summary>
+/// The testable data collection events.
+/// </summary>
+public class TestableDataCollectionEvents : DataCollectionEvents
+{
+    public override event EventHandler<TestHostLaunchedEventArgs>? TestHostLaunched;
+    public override event EventHandler<SessionStartEventArgs>? SessionStart;
+    public override event EventHandler<SessionEndEventArgs>? SessionEnd;
+    public override event EventHandler<TestCaseStartEventArgs>? TestCaseStart;
+    public override event EventHandler<TestCaseEndEventArgs>? TestCaseEnd;
 
-        public Delegate[] GetTestSessionStartInvocationList()
-        {
-            return this.SessionStart.GetInvocationList();
-        }
+    public Delegate[] GetTestHostLaunchedInvocationList()
+    {
+        return TestHostLaunched!.GetInvocationList();
+    }
 
-        public Delegate[] GetTestSessionEndInvocationList()
-        {
-            return this.SessionEnd.GetInvocationList();
-        }
+    public Delegate[] GetTestCaseStartInvocationList()
+    {
+        return TestCaseStart!.GetInvocationList();
+    }
+
+    public Delegate[] GetTestCaseEndInvocationList()
+    {
+        return TestCaseEnd!.GetInvocationList();
+    }
+
+    public Delegate[] GetTestSessionStartInvocationList()
+    {
+        return SessionStart!.GetInvocationList();
     }
 
+    public Delegate[] GetTestSessionEndInvocationList()
+    {
+        return SessionEnd!.GetInvocationList();
+    }
+}
+
+/// <summary>
+/// The testable data collection sink.
+/// </summary>
+public class TestableDataCollectionSink : DataCollectionSink
+{
     /// <summary>
-    /// The testable data collection sink.
+    /// The send file completed.
     /// </summary>
-    public class TestableDataCollectionSink : DataCollectionSink
-    {
-        /// <summary>
-        /// The send file completed.
-        /// </summary>
-        public override event AsyncCompletedEventHandler SendFileCompleted;
+    public override event AsyncCompletedEventHandler? SendFileCompleted;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether is send file async invoked.
-        /// </summary>
-        public bool IsSendFileAsyncInvoked { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether is send file async invoked.
+    /// </summary>
+    public bool IsSendFileAsyncInvoked { get; set; }
 
-        public override void SendFileAsync(FileTransferInformation fileTransferInformation)
+    public override void SendFileAsync(FileTransferInformation fileTransferInformation)
+    {
+        IsSendFileAsyncInvoked = true;
+        if (SendFileCompleted == null)
         {
-            this.IsSendFileAsyncInvoked = true;
-            if (this.SendFileCompleted == null)
-            {
-                return;
-            }
+            return;
         }
     }
 }
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogSessionContextTests.cs b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogSessionContextTests.cs
index 3fedfc1ef2..cb5e7dd4dd 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogSessionContextTests.cs
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogSessionContextTests.cs
@@ -1,96 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests
-{
-    using System.Collections.Generic;
-    using System.Diagnostics;
+using System.Collections.Generic;
+using System.Diagnostics;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class EventLogSessionContextTests
-    {
-        private Dictionary<string, IEventLogContainer> eventLogContainersMap;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests;
 
-        private DummyEventLogContainer mockEventLogContainer;
+[TestClass]
+public class EventLogSessionContextTests
+{
+    private readonly Dictionary<string, IEventLogContainer> _eventLogContainersMap;
+    private readonly DummyEventLogContainer _mockEventLogContainer;
 
-        private EventLogSessionContext eventLogSessionContext;
+    private EventLogSessionContext? _eventLogSessionContext;
 
-        public EventLogSessionContextTests()
+    public EventLogSessionContextTests()
+    {
+        _mockEventLogContainer = new DummyEventLogContainer(true);
+        _eventLogContainersMap = new Dictionary<string, IEventLogContainer>
         {
-            this.mockEventLogContainer = new DummyEventLogContainer(true);
-            this.eventLogContainersMap = new Dictionary<string, IEventLogContainer>();
-            this.eventLogContainersMap.Add("LogName", this.mockEventLogContainer);
-        }
+            { "LogName", _mockEventLogContainer }
+        };
+    }
 
-        [TestMethod]
-        public void CreateEventLogContainerStartIndexMapShouldCreateStartIndexMap()
-        {
-            this.eventLogSessionContext = new EventLogSessionContext(this.eventLogContainersMap);
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerStartIndexMap["LogName"] == 2);
-        }
+    [TestMethod]
+    public void CreateEventLogContainerStartIndexMapShouldCreateStartIndexMap()
+    {
+        _eventLogSessionContext = new EventLogSessionContext(_eventLogContainersMap);
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerStartIndexMap["LogName"] == 2);
+    }
 
-        [TestMethod]
-        public void CreateEventLogContainerEndIndexMapShouldCreateEndIndexMap()
-        {
-            this.eventLogSessionContext = new EventLogSessionContext(this.eventLogContainersMap);
-            this.eventLogSessionContext.CreateEventLogContainerEndIndexMap();
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerEndIndexMap["LogName"] == 1);
-        }
+    [TestMethod]
+    public void CreateEventLogContainerEndIndexMapShouldCreateEndIndexMap()
+    {
+        _eventLogSessionContext = new EventLogSessionContext(_eventLogContainersMap);
+        _eventLogSessionContext.CreateEventLogContainerEndIndexMap();
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerEndIndexMap["LogName"] == 1);
+    }
 
-        [TestMethod]
-        public void CreateEventLogContainerShouldNotAddIndexEntriesIfEventLogContainerMapsIsEmpty()
-        {
-            this.eventLogSessionContext = new EventLogSessionContext(new Dictionary<string, IEventLogContainer>());
-            this.eventLogSessionContext.CreateEventLogContainerStartIndexMap();
-            this.eventLogSessionContext.CreateEventLogContainerEndIndexMap();
+    [TestMethod]
+    public void CreateEventLogContainerShouldNotAddIndexEntriesIfEventLogContainerMapsIsEmpty()
+    {
+        _eventLogSessionContext = new EventLogSessionContext(new Dictionary<string, IEventLogContainer>());
+        _eventLogSessionContext.CreateEventLogContainerStartIndexMap();
+        _eventLogSessionContext.CreateEventLogContainerEndIndexMap();
 
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerStartIndexMap.Count == 0);
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerEndIndexMap.Count == 0);
-        }
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerStartIndexMap.Count == 0);
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerEndIndexMap.Count == 0);
+    }
 
-        [TestMethod]
-        public void CreateEventLogContainerShouldCreateNegativeEndIndexIfLogEntriesAreEmpty()
-        {
-            var dict = new Dictionary<string, IEventLogContainer>();
-            var dummyEventLogContainer = new DummyEventLogContainer(false);
-            dict.Add("DummyEventLog", dummyEventLogContainer);
+    [TestMethod]
+    public void CreateEventLogContainerShouldCreateNegativeEndIndexIfLogEntriesAreEmpty()
+    {
+        var dict = new Dictionary<string, IEventLogContainer>();
+        var dummyEventLogContainer = new DummyEventLogContainer(false);
+        dict.Add("DummyEventLog", dummyEventLogContainer);
 
-            this.eventLogSessionContext = new EventLogSessionContext(dict);
-            this.eventLogSessionContext.CreateEventLogContainerStartIndexMap();
-            this.eventLogSessionContext.CreateEventLogContainerEndIndexMap();
+        _eventLogSessionContext = new EventLogSessionContext(dict);
+        _eventLogSessionContext.CreateEventLogContainerStartIndexMap();
+        _eventLogSessionContext.CreateEventLogContainerEndIndexMap();
 
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerStartIndexMap["DummyEventLog"] == 0);
-            Assert.IsTrue(this.eventLogSessionContext.EventLogContainerEndIndexMap["DummyEventLog"] == -1);
-        }
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerStartIndexMap["DummyEventLog"] == 0);
+        Assert.IsTrue(_eventLogSessionContext.EventLogContainerEndIndexMap["DummyEventLog"] == -1);
     }
+}
 
-    public class DummyEventLogContainer : IEventLogContainer
+public sealed class DummyEventLogContainer : IEventLogContainer
+{
+    public DummyEventLogContainer(bool initialize)
     {
-        public DummyEventLogContainer(bool initialize)
-        {
-            this.EventLogEntries = new List<EventLogEntry>(10);
-            EventLog eventLog = new EventLog("Application");
-
-            if (initialize)
-            {
-                int currentIndex = eventLog.Entries[eventLog.Entries.Count - 1].Index - eventLog.Entries[0].Index;
-                this.EventLogEntries.Add(eventLog.Entries[currentIndex]);
-                this.EventLogEntries.Add(eventLog.Entries[currentIndex - 1]);
-            }
-        }
+        EventLogEntries = new List<EventLogEntry>(10);
+        EventLog = new("Application");
 
-        public void Dispose()
+        if (initialize)
         {
+            int currentIndex = EventLog.Entries[EventLog.Entries.Count - 1].Index - EventLog.Entries[0].Index;
+            EventLogEntries.Add(EventLog.Entries[currentIndex]);
+            EventLogEntries.Add(EventLog.Entries[currentIndex - 1]);
         }
+    }
+
+    public void Dispose()
+    {
+    }
 
-        public EventLog EventLog { get; }
+    public EventLog EventLog { get; }
 
-        public List<EventLogEntry> EventLogEntries { get; set; }
+    public List<EventLogEntry> EventLogEntries { get; set; }
 
-        public void OnEventLogEntryWritten(object source, EntryWrittenEventArgs e)
-        {
-        }
+    public void OnEventLogEntryWritten(object? source, EntryWrittenEventArgs? e)
+    {
     }
 }
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogXmlWriterTests.cs b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogXmlWriterTests.cs
index ea9db1ada7..a9bd34e617 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogXmlWriterTests.cs
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/EventLogXmlWriterTests.cs
@@ -1,59 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests
-{
-    using System.Collections.Generic;
-    using System.Diagnostics;
-
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class EventLogXmlWriterTests
-    {
-        private const string FileName = "Event Log.xml";
-
-        private const string DefaultEventLog = @"<NewDataSet><xs:schema id=""NewDataSet"" xmlns="""" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" xmlns:msdata=""urn:schemas-microsoft-com:xml-msdata"" xmlns:msprop=""urn:schemas-microsoft-com:xml-msprop""><xs:element name=""NewDataSet"" msdata:IsDataSet=""true"" msdata:Locale=""""><xs:complexType><xs:choice minOccurs=""0"" maxOccurs=""unbounded""><xs:element name=""Table1"" msdata:Locale="""" msprop:IndexColumnNames=""Source,Type"" msprop:TimestampColumnName=""DateTime""><xs:complexType><xs:sequence><xs:element name=""Type"" minOccurs=""0""><xs:simpleType><xs:restriction base=""xs:string""><xs:maxLength value=""64"" /></xs:restriction></xs:simpleType></xs:element><xs:element name=""DateTime"" type=""xs:dateTime"" minOccurs=""0"" /><xs:element name=""Source"" minOccurs=""0""><xs:simpleType><xs:restriction base=""xs:string""><xs:maxLength value=""212"" /></xs:restriction></xs:simpleType></xs:element><xs:element name=""Category"" type=""xs:string"" minOccurs=""0"" /><xs:element name=""EventID"" type=""xs:long"" minOccurs=""0"" /><xs:element name=""Description"" type=""xs:string"" minOccurs=""0"" /><xs:element name=""User"" type=""xs:string"" minOccurs=""0"" /><xs:element name=""Computer"" type=""xs:string"" minOccurs=""0"" /></xs:sequence></xs:complexType></xs:element></xs:choice></xs:complexType></xs:element></xs:schema></NewDataSet>";
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Xml.Linq;
 
-        private EventLog eventLog;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private EventLogEntry eventLogEntry;
+using Moq;
 
-        private List<EventLogEntry> eventLogEntries;
+namespace Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests;
 
-        private Mock<IFileHelper> mockFileHelper;
-
-        public EventLogXmlWriterTests()
-        {
-            this.eventLog = new EventLog("Application");
-            var count = this.eventLog.Entries.Count;
-            this.eventLogEntry = this.eventLog.Entries[count - 1];
-            this.eventLogEntries = new List<EventLogEntry>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-        }
+[TestClass]
+public class EventLogXmlWriterTests
+{
+    private const string FileName = "Event Log.xml";
 
-        [TestMethod]
-        public void WriteEventLogEntriesToXmlFileShouldWriteToXMLFile()
-        {
-            EventLogXmlWriter.WriteEventLogEntriesToXmlFile(
-                FileName,
-                this.eventLogEntries,
-                this.mockFileHelper.Object);
+    [TestMethod]
+    public void WriteEventLogEntriesToXmlFileShouldWriteToXmlFile()
+    {
+        var mockFileHelper = new Mock<IFileHelper>();
+        var eventLogEntries = new List<EventLogEntry>();
+        EventLogXmlWriter.WriteEventLogEntriesToXmlFile(
+            FileName,
+            eventLogEntries,
+            mockFileHelper.Object);
+
+        mockFileHelper.Verify(x => x.WriteAllTextToFile(FileName, It.IsAny<string>()), Times.Once);
+    }
 
-            this.mockFileHelper.Verify(x => x.WriteAllTextToFile(FileName, It.IsAny<string>()), Times.Once);
-        }
+    [TestMethod]
+    public void WriteEventLogEntriesToXmlFileShouldWriteLogEntryIfPresent()
+    {
+        var eventLog = new EventLog("Application");
+        var eventLogEntry = eventLog.Entries[eventLog.Entries.Count - 1];
+        var eventLogEntries = new List<EventLogEntry> { eventLogEntry };
 
-        [TestMethod]
-        public void WriteEventLogEntriesToXmlFileShouldWriteLogEntryIfPresent()
-        {
-            this.eventLogEntries.Add(this.eventLogEntry);
+        var mockFileHelper = new Mock<IFileHelper>();
+        EventLogXmlWriter.WriteEventLogEntriesToXmlFile(FileName, eventLogEntries, mockFileHelper.Object);
 
-            EventLogXmlWriter.WriteEventLogEntriesToXmlFile(FileName, this.eventLogEntries, this.mockFileHelper.Object);
+        // Serialize the message in case it contains any special character such as <, >, &, which the XML writer would escape
+        // because otherwise the raw message and the message used to call WriteAllTextToFile won't match. E.g.
+        // api-version=2020-07-01&format=json in raw message, becomes
+        // api-version=2020-07-01&amp;format=json in the xml file.
+        var serializedMessage = new XElement("t", eventLogEntry.Message).LastNode!.ToString();
 
-            this.mockFileHelper.Verify(x => x.WriteAllTextToFile(FileName, It.Is<string>(str => str.Contains(this.eventLogEntry.Message))));
-        }
+        mockFileHelper.Verify(x => x.WriteAllTextToFile(FileName, It.Is<string>(str => str.Contains(serializedMessage))));
     }
 }
diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
index 4a2f963a12..d8d3e66ebf 100644
--- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
+++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
+    <!-- We build this only for net48, and it fails to skip this on Linux in Aracade otherwise. -->
+    <IsTestProject Condition=" '$(OS)' != 'Windows_NT' ">false</IsTestProject>
+    <OutputType Condition=" '$(OS)' == 'Windows_NT' ">Exe</OutputType>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests</RootNamespace>
   </PropertyGroup>
+  
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <!-- TODO: Also for .NET6 ? -->
+    <TargetFrameworks>net48</TargetFrameworks>
+    <AssemblyName>Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests</AssemblyName>
   </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <AssemblyName>Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests</AssemblyName>    
-    <WarningsAsErrors>true</WarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" />
-  </ItemGroup>
+  
   <ItemGroup>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
+    <ProjectReference Include="..\..\..\src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\Microsoft.TestPlatform.Extensions.EventLogCollector.csproj" SetTargetFramework="TargetFramework=$(NetFrameworkRunnerTargetFramework)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" Condition=" '$(OS)' != 'Windows_NT' " />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <!-- We build this only for net48, and it fails to skip this on Linux in Aracade otherwise. -->
+  <Target Name="RunTests" Condition=" '$(OS)' != 'Windows_NT' " />
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000000..b93c6783d2
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,18 @@
+<Project>
+  <Import Project="../Directory.Build.props" />
+
+  <PropertyGroup>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <!--
+      Arcade uses UseMSTestRunner instead of EnableMSTestRunner
+      https://github.com/dotnet/arcade/blob/c9ed073c0a2a828aed8f5c6ecb0a544b0f0fd3f8/src/Microsoft.DotNet.Arcade.Sdk/tools/MSTest/MSTest.targets#L29
+      https://github.com/dotnet/arcade/issues/15875      
+    -->
+    <UseMSTestRunner>true</UseMSTestRunner>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Condition="'$(IsTestProject)'=='true' AND '$(EnableMSTestRunner)'=='true'" Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/test/Intent.Primitives/ExcludeAttribute.cs b/test/Intent.Primitives/ExcludeAttribute.cs
new file mode 100644
index 0000000000..8c538f2e9d
--- /dev/null
+++ b/test/Intent.Primitives/ExcludeAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Intent;
+
+[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+public class ExcludeAttribute : Attribute
+{
+    public ExcludeAttribute(string? reason = null)
+    {
+        Reason = reason;
+    }
+
+    public string? Reason { get; }
+}
diff --git a/test/Intent.Primitives/IRunLogger.cs b/test/Intent.Primitives/IRunLogger.cs
new file mode 100644
index 0000000000..f8f32393bf
--- /dev/null
+++ b/test/Intent.Primitives/IRunLogger.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Intent;
+
+public interface IRunLogger
+{
+    void WriteTestPassed(MethodInfo m, TimeSpan t);
+    void WriteTestFailure(MethodInfo m, Exception ex, TimeSpan t);
+    void WriteFrameworkError(Exception ex);
+    void WriteSummary(int passed, List<(MethodInfo method, Exception exception, TimeSpan time)> failures, TimeSpan duration);
+}
diff --git a/test/Intent.Primitives/Intent.Primitives.csproj b/test/Intent.Primitives/Intent.Primitives.csproj
new file mode 100644
index 0000000000..5529e52d99
--- /dev/null
+++ b/test/Intent.Primitives/Intent.Primitives.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/Intent.Primitives/OnlyAttribute.cs b/test/Intent.Primitives/OnlyAttribute.cs
new file mode 100644
index 0000000000..684bd1142d
--- /dev/null
+++ b/test/Intent.Primitives/OnlyAttribute.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Intent;
+
+[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+public class OnlyAttribute : Attribute
+{
+}
diff --git a/test/Intent.Primitives/TestAttribute.cs b/test/Intent.Primitives/TestAttribute.cs
new file mode 100644
index 0000000000..57144b4239
--- /dev/null
+++ b/test/Intent.Primitives/TestAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Intent;
+
+[AttributeUsage(AttributeTargets.Method)]
+public class TestAttribute : Attribute
+{
+    public TestAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public string Name { get; }
+}
diff --git a/test/Intent.Primitives/TestResult.cs b/test/Intent.Primitives/TestResult.cs
new file mode 100644
index 0000000000..053167718f
--- /dev/null
+++ b/test/Intent.Primitives/TestResult.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Intent;
+
+public enum TestResult
+{
+    None,
+    Passed,
+    Failed,
+    Error,
+}
diff --git a/test/Intent/ConsoleLogger.cs b/test/Intent/ConsoleLogger.cs
new file mode 100644
index 0000000000..b19f46b3c8
--- /dev/null
+++ b/test/Intent/ConsoleLogger.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+using static System.Console;
+using static System.ConsoleColor;
+
+namespace Intent.Console;
+
+internal class ConsoleLogger : IRunLogger
+{
+    public void WriteTestPassed(MethodInfo m, TimeSpan t)
+    {
+        var currentColor = ForegroundColor;
+        ForegroundColor = Green;
+        WriteLine($"[+] {FormatMethodName(m)} {(int)t.TotalMilliseconds} ms");
+        ForegroundColor = currentColor;
+    }
+
+    public void WriteTestFailure(MethodInfo m, Exception ex, TimeSpan t)
+    {
+        var currentColor = ForegroundColor;
+        ForegroundColor = Red;
+        WriteLine($"[-] {FormatMethodName(m)} {(int)t.TotalMilliseconds} ms{Environment.NewLine}{ex}");
+        ForegroundColor = currentColor;
+    }
+
+    public void WriteFrameworkError(Exception ex)
+    {
+        var currentColor = ForegroundColor;
+        ForegroundColor = DarkRed;
+        WriteLine($"[-] framework failed{Environment.NewLine}{ex}{Environment.NewLine}{Environment.NewLine}");
+        ForegroundColor = currentColor;
+    }
+
+    private static string FormatMethodName(MethodInfo method)
+    {
+        var methodName = method.GetCustomAttribute<TestAttribute>() is TestAttribute test ? test.Name : method.Name;
+        if (!methodName.Contains('\n'))
+        {
+            return methodName;
+        }
+
+        var lines = methodName.Split('\n').Select(line => line.Trim());
+        var first = lines.Take(1).ToList();
+        var rest = lines.Skip(1).Select(l => $"{Environment.NewLine}     {l}").ToList();
+
+        return string.Join(null, first.Concat(rest));
+    }
+
+    public void WriteSummary(int passed, List<(MethodInfo method, Exception exception, TimeSpan time)> failures, TimeSpan duration)
+    {
+        WriteLine();
+        WriteLine();
+        if (failures.Count > 0)
+        {
+            WriteLine($"There were {failures.Count} failures:");
+        }
+        failures.ForEach(t => { WriteTestFailure(t.method, t.exception, t.time); WriteLine(); });
+        WriteLine();
+        WriteLine($"Test run finished: Total: {passed + failures.Count} Passed: {passed} Failed: {failures.Count} Duration: {(int)duration.TotalMilliseconds} ms");
+    }
+}
diff --git a/test/Intent/Extensions.cs b/test/Intent/Extensions.cs
new file mode 100644
index 0000000000..35545300aa
--- /dev/null
+++ b/test/Intent/Extensions.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Intent;
+
+public static class Extensions
+{
+    public static bool IsExcluded(this Assembly asm)
+    {
+        return asm.CustomAttributes.Any(a => a.AttributeType == typeof(ExcludeAttribute));
+    }
+
+    public static List<Type> SkipExcluded(this IEnumerable<Type> e)
+    {
+        return e.Where(i => i.GetCustomAttribute<ExcludeAttribute>() == null).ToList();
+    }
+
+    public static List<Type> SkipNonPublic(this IEnumerable<Type> e)
+    {
+        return e.Where(i => i.IsPublic || i.IsNestedPublic).ToList();
+    }
+
+    public static List<MethodInfo> SkipExcluded(this IEnumerable<MethodInfo> e)
+    {
+        return e.Where(i =>
+            i.Name != nameof(object.ToString)
+            && i.Name != nameof(object.GetType)
+            && i.Name != nameof(object.GetHashCode)
+            && i.Name != nameof(object.Equals)
+            && i.GetCustomAttribute<ExcludeAttribute>() == null).ToList();
+    }
+}
diff --git a/test/Intent/Intent.csproj b/test/Intent/Intent.csproj
new file mode 100644
index 0000000000..77abf82a4b
--- /dev/null
+++ b/test/Intent/Intent.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Intent.Primitives\Intent.Primitives.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Intent/Program.cs b/test/Intent/Program.cs
new file mode 100644
index 0000000000..f3cf640679
--- /dev/null
+++ b/test/Intent/Program.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Intent.Console;
+
+public class Program
+{
+    public static void Main(string[] paths)
+    {
+        Runner.Run(paths, new ConsoleLogger());
+    }
+}
diff --git a/test/Intent/Runner.cs b/test/Intent/Runner.cs
new file mode 100644
index 0000000000..fad005b980
--- /dev/null
+++ b/test/Intent/Runner.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Intent;
+
+public class Runner
+{
+    public static void Run(IEnumerable<string> paths, IRunLogger logger)
+    {
+        var assemblies = new List<Assembly>();
+        foreach (var path in paths)
+        {
+            try
+            {
+                var assembly = Assembly.LoadFrom(path);
+                if (assembly.IsExcluded())
+                    continue;
+
+                assemblies.Add(assembly);
+            }
+            catch (Exception ex)
+            {
+                logger.WriteFrameworkError(ex);
+            }
+        }
+
+        var types = assemblies.SelectMany(assembly => assembly.GetTypes().SkipNonPublic().SkipExcluded()).ToList();
+        var typesWithOnly = types.Where(type => type.GetCustomAttribute<OnlyAttribute>() != null).ToList();
+
+        var methods = types.SelectMany(type => type.GetMethods().SkipExcluded()).ToList();
+        var methodsWithOnly = methods.Where(m => m.GetCustomAttribute<OnlyAttribute>() != null).ToList();
+
+        List<MethodInfo> methodsToRun;
+        if (typesWithOnly.Count > 0 || methodsWithOnly.Count > 0)
+        {
+            // Some types or methods are decorated with Only. Putting Only on a type should run all methods in
+            // that type. Putting Only on a method should run that method.
+            //
+            // So we need a list of all distinct methods that match that rule.
+
+            var onlyMethodsFromTypes = typesWithOnly.SelectMany(type => type.GetMethods().SkipExcluded()).ToList();
+            methodsToRun = onlyMethodsFromTypes.Concat(methodsWithOnly).Distinct().ToList();
+        }
+        else
+        {
+            methodsToRun = methods;
+        }
+
+        var failures = new List<(MethodInfo method, Exception exception, TimeSpan duration)>();
+        var passed = 0;
+        var runStopwatch = Stopwatch.StartNew();
+        foreach (var method in methodsToRun)
+        {
+            try
+            {
+                var testStopwatch = Stopwatch.StartNew();
+                try
+                {
+                    // Declaring type cannot be really null for types you define in C#
+                    // without doing any reflection magic.
+                    var instance = Activator.CreateInstance(method.DeclaringType!);
+                    var testResult = method.Invoke(instance, []);
+                    if (testResult is Task task)
+                    {
+                        // When the result is a task we need to await it.
+                        // TODO: this can be improved with await, imho
+                        task.GetAwaiter().GetResult();
+                    }
+
+                    passed++;
+                    logger.WriteTestPassed(method, testStopwatch.Elapsed);
+                }
+                catch (Exception ex)
+                {
+                    if (ex is TargetInvocationException tex && tex.InnerException != null)
+                    {
+                        failures.Add((method, tex.InnerException, testStopwatch.Elapsed));
+                        logger.WriteTestFailure(method, tex.InnerException, testStopwatch.Elapsed);
+                    }
+                    else
+                    {
+                        failures.Add((method, ex, testStopwatch.Elapsed));
+                        logger.WriteTestFailure(method, ex, testStopwatch.Elapsed);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.WriteFrameworkError(ex);
+            }
+        }
+
+        logger.WriteSummary(passed, failures, runStopwatch.Elapsed);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/.runsettings b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/.runsettings
new file mode 100644
index 0000000000..823b5bb2d5
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/.runsettings
@@ -0,0 +1,5 @@
+<RunSettings>
+  <MSTestV2>
+    <ConsiderEmptyDataSourceAsInconclusive>true</ConsiderEmptyDataSourceAsInconclusive>
+  </MSTestV2>
+</RunSettings>
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs
new file mode 100644
index 0000000000..716bab8b38
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AcceptanceTestBase.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public class AcceptanceTestBase : IntegrationTestBase
+{
+    public const string DesktopTargetFramework = Net462TargetFramework;
+    public const string Net462TargetFramework = "net462";
+    public const string Net47TargetFramework = "net47";
+    public const string Net471TargetFramework = "net471";
+    public const string Net472TargetFramework = "net472";
+    public const string Net48TargetFramework = "net48";
+    public const string Core80TargetFramework = "net8.0";
+    public const string Core90TargetFramework = "net9.0";
+    public const string Core10TargetFramework = "net10.0";
+
+    public const string DesktopFrameworkArgValue = Net462FrameworkArgValue;
+    public const string Net462FrameworkArgValue = ".NETFramework,Version=v4.6.2";
+    public const string Net47FrameworkArgValue = ".NETFramework,Version=v4.7";
+    public const string Net471FrameworkArgValue = ".NETFramework,Version=v4.7.1";
+    public const string Net472FrameworkArgValue = ".NETFramework,Version=v4.7.2";
+    public const string Net48FrameworkArgValue = ".NETFramework,Version=v4.8";
+
+    public const string Core80FrameworkArgValue = ".NETCoreApp,Version=v8.0";
+    public const string Core90FrameworkArgValue = ".NETCoreApp,Version=v9.0";
+    public const string Core10FrameworkArgValue = ".NETCoreApp,Version=v10.0";
+
+    public const string DesktopRunnerTargetRuntime = "win7-x64";
+    public const string CoreRunnerTargetRuntime = "";
+    public const string InIsolation = "/InIsolation";
+
+    public const string NETFX462_48 = "net462;net472;net48";
+    public const string NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0";
+    public const string DEFAULT_RUNNER_NETFX = Net462TargetFramework;
+    public const string DEFAULT_HOST_NETFX = Net462TargetFramework;
+    public const string DEFAULT_RUNNER_NETCORE = Core80TargetFramework;
+    public const string DEFAULT_HOST_NETCORE = Core80TargetFramework;
+    /// <summary>
+    /// Our current defaults for .NET and .NET Framework.
+    /// </summary>
+    public const string DEFAULT_HOST_NETFX_AND_NET = "net462;net8.0";
+    public const string LATEST_TO_LEGACY = "Latest;LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
+    public const string LATESTPREVIEW_TO_LEGACY = "LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
+    public const string LATEST = "Latest";
+    public const string LATESTSTABLE = "LatestStable";
+    internal const string MSTEST = "MSTest";
+
+    public static string And(string left, string right)
+    {
+        return string.Join(";", left, right);
+    }
+
+    protected string FrameworkArgValue => DeriveFrameworkArgValue(_testEnvironment);
+
+    protected static void SetTestEnvironment(IntegrationTestEnvironment testEnvironment, RunnerInfo runnerInfo)
+    {
+        testEnvironment.VSTestConsoleInfo = runnerInfo.VSTestConsoleInfo;
+        // The order here matters, it changes how the resulting path is built when we resolve test dlls and other assets.
+        testEnvironment.DllInfos = new[] { runnerInfo.TestHostInfo, runnerInfo.AdapterInfo }.Where(d => d != null).Select(x => x!).ToList();
+        testEnvironment.DebugInfo = runnerInfo.DebugInfo;
+
+        testEnvironment.RunnerFramework = runnerInfo.RunnerFramework!;
+        testEnvironment.TargetFramework = runnerInfo.TargetFramework;
+        testEnvironment.InIsolationValue = runnerInfo.InIsolationValue;
+    }
+
+    protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testEnvironment)
+        => testEnvironment.TargetFramework switch
+        {
+            Core80TargetFramework => Core80FrameworkArgValue,
+            Core90TargetFramework => Core90FrameworkArgValue,
+            Core10TargetFramework => Core10FrameworkArgValue,
+            Net462TargetFramework => Net462FrameworkArgValue,
+            Net47TargetFramework => Net47FrameworkArgValue,
+            Net471TargetFramework => Net471FrameworkArgValue,
+            Net472TargetFramework => Net472FrameworkArgValue,
+            Net48TargetFramework => Net48FrameworkArgValue,
+            _ => throw new NotSupportedException($"{testEnvironment.TargetFramework} is not supported TargetFramework value."),
+        };
+
+    protected bool IsDesktopTargetFramework()
+        => _testEnvironment.TargetFramework == DesktopTargetFramework;
+
+    protected string GetTargetFrameworkForRunsettings()
+    {
+        string targetFramework = _testEnvironment.TargetFramework == DesktopTargetFramework ? "Framework45" : "FrameworkCore10";
+
+        return targetFramework;
+    }
+
+    /// <summary>
+    /// Empty runsettings, just with the RunSettings tag that we require.
+    /// </summary>
+    /// <returns></returns>
+    public static string GetEmptyRunsettings()
+    {
+        return "<RunSettings></RunSettings>";
+    }
+
+    /// <summary>
+    /// Almost empty runsettings, just specifying the target framework from the currently set test environment.
+    /// </summary>
+    public string GetDefaultRunSettings()
+    {
+        return GetRunSettingsWithTargetFramework(FrameworkArgValue);
+    }
+
+    /// <summary>
+    /// Almost empty runsettings, just specifying the given target framework.
+    /// Use the overload without any parameters to get the target framework from the currently set test environment.
+    /// </summary>
+    /// <returns></returns>
+    public static string GetRunSettingsWithTargetFramework(string targetFramework)
+    {
+        string runSettingsXml =
+            $@"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <TargetFrameworkVersion>{targetFramework}</TargetFrameworkVersion>
+                </RunConfiguration>
+            </RunSettings>";
+
+        return runSettingsXml;
+    }
+
+    protected string GetIsolatedTestAsset(string assetName)
+    {
+        var projectPath = GetProjectFullPath(assetName);
+
+        foreach (var file in new FileInfo(projectPath).Directory!.EnumerateFiles())
+        {
+            TempDirectory.CopyFile(file.FullName);
+
+            if (file.Extension.Equals(".csproj", StringComparison.OrdinalIgnoreCase))
+            {
+                string root = IntegrationTestEnvironment.RepoRootDirectory;
+                var testAssetsRoot = Path.GetFullPath(Path.Combine(root, "test", "TestAssets"));
+
+                // Replace $(RepoRoot) with the path to temp directory in which we put the csproj,
+                // and write it into Directory.Build.props
+                var directoryBuildProps = Path.Combine(testAssetsRoot, "Directory.Build.props");
+                var newDirectoryBuildProps = Path.Combine(TempDirectory.Path, "Directory.Build.props");
+                var content = File.ReadAllText(directoryBuildProps).Replace("$(RepoRoot)", TempDirectory.Path + "/");
+                File.WriteAllText(newDirectoryBuildProps, content);
+
+                // Copy Directory.Build.targets
+                TempDirectory.CopyFile(Path.Combine(testAssetsRoot, "Directory.Build.targets"));
+
+                Directory.CreateDirectory(Path.Combine(TempDirectory.Path, "eng"));
+                File.Copy(Path.Combine(root, "eng", "Versions.props"),
+                     Path.Combine(TempDirectory.Path, "eng", "Versions.props"));
+
+                // Copy NuGet.config
+                var nugetContent = File.ReadAllText(Path.Combine(root, "NuGet.config"))
+                    // and make packages folder point to vstest packages folder
+                    .Replace("\".packages\"", "\"" + Path.Combine(root, ".packages") + "\"")
+                    // and add local package source
+                    .Replace("</packageSources>", $"""<add key="localy-built-packages" value="{IntegrationTestEnvironment.LocalPackageSource}" /></packageSources>""");
+                File.WriteAllText(Path.Combine(TempDirectory.Path, "NuGet.config"), nugetContent);
+            }
+        }
+
+        return Path.Combine(TempDirectory.Path, assetName);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AppDomainTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AppDomainTests.cs
new file mode 100644
index 0000000000..140ad1431c
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AppDomainTests.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+#if !NETFRAMEWORK
+using System.Runtime.Loader;
+#else
+using System.Reflection;
+#endif
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class AppDomainTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void RunTestExecutionWithDisableAppDomain(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAppDomainDetailFileName = Path.Combine(TempDirectory.Path, "appdomain_test.txt");
+        var dataCollectorAppDomainDetailFileName = Path.Combine(TempDirectory.Path, "appdomain_datacollector.txt");
+
+        // Delete test output files if already exist
+        File.Delete(testAppDomainDetailFileName);
+        File.Delete(dataCollectorAppDomainDetailFileName);
+
+        var runsettingsFilePath = GetInProcDataCollectionRunsettingsFile(true, TempDirectory);
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            runsettingsFilePath,
+            FrameworkArgValue,
+            runnerInfo.InIsolationValue,
+            TempDirectory.Path);
+
+        // Sets the environment variables used by the test project and test data collector.
+        var env = new Dictionary<string, string?>
+        {
+            ["TEST_ASSET_APPDOMAIN_TEST_PATH"] = testAppDomainDetailFileName,
+            ["TEST_ASSET_APPDOMAIN_COLLECTOR_PATH"] = dataCollectorAppDomainDetailFileName,
+        };
+
+        InvokeVsTest(arguments, env);
+
+        Assert.IsTrue(
+            IsFilesContentEqual(testAppDomainDetailFileName, dataCollectorAppDomainDetailFileName),
+            "Different AppDomains, test: {0} datacollector: {1}",
+            File.ReadAllText(testAppDomainDetailFileName),
+            File.ReadAllText(dataCollectorAppDomainDetailFileName));
+        ValidateSummaryStatus(1, 1, 1);
+        File.Delete(runsettingsFilePath);
+    }
+
+    private static bool IsFilesContentEqual(string filePath1, string filePath2)
+    {
+        Assert.IsTrue(File.Exists(filePath1), "File doesn't exist: {0}.", filePath1);
+        Assert.IsTrue(File.Exists(filePath2), "File doesn't exist: {0}.", filePath2);
+        var content1 = File.ReadAllText(filePath1);
+        var content2 = File.ReadAllText(filePath2);
+        Assert.IsTrue(string.Equals(content1, content2, StringComparison.Ordinal), "Content mismatch{2}- file1 content:{2}{0}{2}- file2 content:{2}{1}{2}", content1, content2, Environment.NewLine);
+        return string.Equals(content1, content2, StringComparison.Ordinal);
+    }
+
+    private string GetInProcDataCollectionRunsettingsFile(bool disableAppDomain, TempDirectory tempDirectory)
+    {
+        var runSettings = Path.Combine(tempDirectory.Path, "test_" + Guid.NewGuid() + ".runsettings");
+        var inprocasm = _testEnvironment.GetTestAsset("SimpleDataCollector.dll");
+#if !NETFRAMEWORK
+        var assemblyName = AssemblyLoadContext.GetAssemblyName(inprocasm);
+#else
+        var assemblyName = AssemblyName.GetAssemblyName(inprocasm);
+#endif
+        var fileContents = @"<RunSettings>
+                                    <InProcDataCollectionRunSettings>
+                                        <InProcDataCollectors>
+                                            <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='SimpleDataCollector.SimpleDataCollector, {0}'  codebase='{1}'>
+                                                <Configuration>
+                                                    <Port>4312</Port>
+                                                </Configuration>
+                                            </InProcDataCollector>
+                                        </InProcDataCollectors>
+                                    </InProcDataCollectionRunSettings>
+                                    <RunConfiguration>
+                                       <DisableAppDomain>" + disableAppDomain + @"</DisableAppDomain>
+                                    </RunConfiguration>
+                                </RunSettings>";
+
+        fileContents = string.Format(CultureInfo.CurrentCulture, fileContents, assemblyName, inprocasm);
+        File.WriteAllText(runSettings, fileContents);
+
+        return runSettings;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ArgumentProcessorTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ArgumentProcessorTests.cs
new file mode 100644
index 0000000000..ad0641ea10
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ArgumentProcessorTests.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class ArgumentProcessorTests : AcceptanceTestBase
+{
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void PassingNoArgumentsToVsTestConsoleShouldPrintHelpMessage(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTest(null);
+
+        //Check for help usage, description and arguments text.
+        StdOutputContains("Usage: vstest.console.exe");
+        StdOutputContains("Description: Runs tests from the specified files.");
+        StdOutputContains("Arguments:");
+
+        //Check for help options text
+        StdOutputContains("Options:");
+
+        //Check for help examples text
+        StdOutputContains("To run tests: >vstest.console.exe tests.dll");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void PassingInvalidArgumentsToVsTestConsoleShouldNotPrintHelpMessage(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /badArgument");
+
+        InvokeVsTest(arguments);
+
+        //Check for help usage, description and arguments text.
+        StdOutputDoesNotContains("Usage: vstest.console.exe");
+        StdOutputDoesNotContains("Description: Runs tests from the specified files.");
+        StdOutputDoesNotContains("Arguments:");
+
+        //Check for help options text
+        StdOutputDoesNotContains("Options:");
+
+        //Check for help examples text
+        StdOutputDoesNotContains("To run tests: >vstest.console.exe tests.dll");
+
+        //Check for message which guides using help option
+        StdErrorContains("Please use the /help option to check the list of valid arguments");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs
new file mode 100644
index 0000000000..9fc136accb
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyMetadataProviderTests.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class AssemblyMetadataProviderTests : AcceptanceTestBase
+{
+    private const int ExpectedTimeForFindingArchForDotNetAssembly = 15; // In milliseconds.
+    private const string PerfAssertMessageFormat = "Expected Elapsed Time: {0} ms, Actual Elapsed Time: {1} ms";
+
+    private readonly IAssemblyMetadataProvider _assemblyMetadataProvider;
+
+    private readonly Mock<IFileHelper> _fileHelperMock;
+
+    private readonly FileHelper _fileHelper;
+
+    private bool _isManagedAssemblyArchitectureTest;
+
+    public AssemblyMetadataProviderTests()
+    {
+        _fileHelper = new FileHelper();
+        _fileHelperMock = new Mock<IFileHelper>();
+        _isManagedAssemblyArchitectureTest = false;
+        _assemblyMetadataProvider = new AssemblyMetadataProvider(_fileHelperMock.Object);
+
+        _fileHelperMock.Setup(f =>
+                f.GetStream(It.IsAny<string>(), FileMode.Open, FileAccess.Read))
+            .Returns<string, FileMode, FileAccess>((filePath, mode, access) => _fileHelper.GetStream(filePath, mode, access));
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        if (!_isManagedAssemblyArchitectureTest)
+        {
+            _fileHelperMock.Verify(
+                f => f.GetStream(It.IsAny<string>(), FileMode.Open, FileAccess.Read), Times.Once);
+        }
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framework)
+    {
+        TestDotnetAssemblyArch("SimpleTestProject3", framework, Architecture.X64, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framework)
+    {
+        TestDotnetAssemblyArch("SimpleTestProjectx86", framework, Architecture.X86, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetArchitectureShouldReturnCorrentArchForAnyCpuAssembly(string framework)
+    {
+        TestDotnetAssemblyArch("SimpleTestProject", framework, Architecture.AnyCPU, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetArchitectureShouldReturnCorrentArchForArm64Assembly(string framework)
+    {
+        TestDotnetAssemblyArch("SimpleTestProjectARM64", framework, Architecture.ARM64, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
+    }
+
+    [TestMethod]
+    [DataRow("x86")]
+    [DataRow("x64")]
+    public void GetArchitectureForNativeDll(string platform)
+    {
+        var expectedElapsedTime = 5;
+        var platformPath = platform.Equals("x64") ? platform : string.Empty;
+        var assemblyPath = $@"{_testEnvironment.PackageDirectory}/microsoft.testplatform.testasset.nativecpp/2.0.0/"
+                           + $@"contentFiles/any/any/{platformPath}/Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
+        LoadAssemblyIntoMemory(assemblyPath);
+        var stopWatch = Stopwatch.StartNew();
+        var arch = _assemblyMetadataProvider.GetArchitecture(assemblyPath);
+        stopWatch.Stop();
+
+        Console.WriteLine("Platform:{0}, {1}", platform, string.Format(CultureInfo.CurrentCulture, PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+        Assert.AreEqual(Enum.Parse(typeof(Architecture), platform, ignoreCase: true), arch);
+
+        // We should not assert on time elapsed, it will vary depending on machine, & their state, commenting below assert
+        // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetFrameWorkForDotNetAssembly(string framework)
+    {
+        var expectedElapsedTime = 5;
+        var assemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
+        LoadAssemblyIntoMemory(assemblyPath);
+        var stopWatch = Stopwatch.StartNew();
+        var actualFx = _assemblyMetadataProvider.GetFrameworkName(assemblyPath);
+        stopWatch.Stop();
+
+        if (framework.Equals("net462"))
+        {
+            // Reason is unknown for why full framework it is taking more time. Need to investigate.
+            expectedElapsedTime = 100;
+            Assert.AreEqual(".NETFramework,Version=v4.6.2", actualFx.FullName);
+        }
+        else
+        {
+            Assert.AreEqual(".NETCoreApp,Version=v8.0", actualFx.FullName);
+        }
+
+        Console.WriteLine("Framework:{0}, {1}", framework, string.Format(CultureInfo.CurrentCulture, PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+
+        // We should not assert on time elapsed, it will vary depending on machine, & their state.
+        // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+    }
+
+    [TestMethod]
+    public void GetFrameworkForNativeDll()
+    {
+        var expectedElapsedTime = 5;
+        var assemblyPath = $@"{_testEnvironment.PackageDirectory}/microsoft.testplatform.testasset.nativecpp/2.0.0/contentFiles/any/any/Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
+        LoadAssemblyIntoMemory(assemblyPath);
+        var stopWatch = Stopwatch.StartNew();
+        var fx = _assemblyMetadataProvider.GetFrameworkName(assemblyPath);
+        stopWatch.Stop();
+
+        Console.WriteLine(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds);
+        Assert.AreEqual(Framework.DefaultFramework.Name, fx.FullName);
+
+        // We should not assert on time elapsed, it will vary depending on machine, & their state.
+        // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+    }
+
+    private void TestDotnetAssemblyArch(string projectName, string framework, Architecture expectedArch, long expectedElapsedTime)
+    {
+        _isManagedAssemblyArchitectureTest = true;
+        var assemblyPath = _testEnvironment.GetTestAsset(projectName + ".dll", framework);
+        LoadAssemblyIntoMemory(assemblyPath);
+        var stopWatch = Stopwatch.StartNew();
+        var arch = _assemblyMetadataProvider.GetArchitecture(assemblyPath);
+        stopWatch.Stop();
+
+        Console.WriteLine("Framework:{0}, {1}", framework, string.Format(CultureInfo.CurrentCulture, PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+        Assert.AreEqual(expectedArch, arch, $"Expected: {expectedArch} Actual: {arch}");
+
+        // We should not assert on time elapsed, it will vary depending on machine, & their state.
+        // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
+    }
+
+    private static void LoadAssemblyIntoMemory(string assemblyPath)
+    {
+        // Load the file into RAM in ahead to avoid performance number(expectedElapsedTime) dependence on disk read time.
+        File.ReadAllBytes(assemblyPath);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs
new file mode 100644
index 0000000000..df63b296d0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/AssemblyPropertiesTests.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class AssemblyPropertiesTests : AcceptanceTestBase
+{
+    private readonly IAssemblyProperties _assemblyProperties;
+
+    public AssemblyPropertiesTests()
+    {
+        _assemblyProperties = new AssemblyProperties();
+    }
+
+    [TestMethod]
+    [DataRow("net462")]
+    [DataRow("net8.0")]
+    public void GetAssemblyTypeForManagedDll(string framework)
+    {
+        var assemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
+        var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath);
+
+        Assert.AreEqual(AssemblyType.Managed, assemblyType);
+    }
+
+    [TestMethod]
+    public void GetAssemblyTypeForNativeDll()
+    {
+        var assemblyPath = $@"{_testEnvironment.PackageDirectory}/microsoft.testplatform.testasset.nativecpp/2.0.0/contentFiles/any/any/Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
+        var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath);
+
+        Assert.AreEqual(AssemblyType.Native, assemblyType);
+    }
+
+    [TestMethod]
+    public void GetAssemblyTypeForManagedExe()
+    {
+        var assemblyPath = _testEnvironment.GetTestAsset("ConsoleManagedApp.exe", "net462");
+        var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath);
+
+        Assert.AreEqual(AssemblyType.Managed, assemblyType);
+    }
+
+    [TestMethod]
+    [DataRow("net8.0")]
+    public void GetAssemblyTypeForNetCoreManagedExe(string framework)
+    {
+        var assemblyPath = _testEnvironment.GetTestAsset("ConsoleManagedApp.dll", framework);
+        var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath);
+
+        Assert.AreEqual(AssemblyType.Managed, assemblyType);
+    }
+
+    [TestMethod]
+    public void GetAssemblyTypeForNativeExe()
+    {
+        var assemblyPath = $@"{_testEnvironment.PackageDirectory}/microsoft.testplatform.testasset.nativecpp/2.0.0/contentFiles/any/any/Microsoft.TestPlatform.TestAsset.ConsoleNativeApp.exe";
+        var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath);
+
+        Assert.AreEqual(AssemblyType.Native, assemblyType);
+    }
+
+    [TestMethod]
+    public void GetAssemblyTypeShouldReturnNoneInCaseOfError()
+    {
+        var assemblyType = _assemblyProperties.GetAssemblyType("invalidFile.dll");
+
+        Assert.AreEqual(AssemblyType.None, assemblyType);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BannedSymbols.txt b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BannedSymbols.txt
new file mode 100644
index 0000000000..c8eaef56e1
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BannedSymbols.txt
@@ -0,0 +1,3 @@
+M:System.IO.Path.GetTempPath(); Use 'IntegrationTestBase.GetTempPath()' instead
+M:System.Environment.SetEnvironmentVariable(System.String,System.String); Use one of the overload accepting a dictionary of environment variables instead
+M:System.Environment.SetEnvironmentVariable(System.String,System.String,System.EnvironmentVariableTarget); Use one of the overload accepting a dictionary of environment variables instead
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs
new file mode 100644
index 0000000000..f61f8939de
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/BlameDataCollectorTests.cs
@@ -0,0 +1,434 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+#if NET
+using System.Globalization;
+#endif
+using System.IO;
+using System.Linq;
+using System.Security.Principal;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+// this whole thing is complicated and depends on versions of OS and the target runtime
+// keeping this for later
+[TestCategory("Windows-Review")]
+public class BlameDataCollectorTests : AcceptanceTestBase
+{
+    public const string NETCOREANDFX = "net462;net472;net8.0";
+    public const string NET60 = "net8.0";
+    private readonly string _procDumpPath;
+
+    public BlameDataCollectorTests()
+    {
+        _procDumpPath = Path.Combine(_testEnvironment.PackageDirectory, @"procdump\0.0.1\bin");
+        var procDumpExePath = Path.Combine(_procDumpPath, "procdump.exe");
+        if (!File.Exists(procDumpExePath))
+        {
+            throw new InvalidOperationException($"Procdump path {procDumpExePath} does not exist. "
+                + "It is possible that antivirus deleted it from your nuget cache. "
+                + "Delete the whole procdump folder in your nuget cache, and run build, or restore");
+        }
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void BlameDataCollectorShouldGiveCorrectTestCaseName(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("BlameUnitTestProject.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /Blame");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $" /diag:logs\\log.txt");
+        InvokeVsTest(arguments);
+
+        VaildateOutput(TempDirectory, "BlameUnitTestProject.UnitTest1.TestMethod2");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void BlameDataCollectorShouldOutputDumpFile(RunnerInfo runnerInfo)
+    {
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /Blame:CollectDump");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, " /testcasefilter:ExitWithStackoverFlow");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath,
+        };
+
+        InvokeVsTest(arguments, env);
+
+        VaildateOutput(TempDirectory, "SampleUnitTestProject3.UnitTest1.ExitWithStackoverFlow", validateDumpFile: true);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void BlameDataCollectorShouldNotOutputDumpFileWhenNoCrashOccurs(RunnerInfo runnerInfo)
+    {
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /Blame:CollectDump");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, " /testcasefilter:PassingTest");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        Assert.IsFalse(StdOut.Contains(".dmp"), "it should not collect a dump, because nothing crashed");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    // This tests .net runner and .net framework runner, together with .net framework testhost
+    [NetFullTargetFrameworkDataSource]
+    // .NET does not support crash dump on exit
+    // [NetCoreTargetFrameworkDataSource]
+    public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlwaysIsEnabled(RunnerInfo runnerInfo)
+    {
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /Blame:CollectDump;CollectAlways=True");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, " /testcasefilter:PassingTest");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        StringAssert.Matches(StdOut, new Regex("\\.dmp"), "it should collect dump, even if nothing crashed");
+    }
+
+    [TestMethod]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
+    // should make no difference, keeping for easy debug
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
+    public void HangDumpOnTimeout(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("timeout.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=3s"" /Diag:{TempDirectory.Path}/log.txt");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateDump();
+    }
+
+    [TestMethod]
+    // net8.0 does not support dump on exit
+    [NetCoreRunner("net462;net472")]
+    // should make no difference, keeping for easy debug
+    // [NetFrameworkRunner("net462;net472")]
+
+    public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("timeout.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true;CollectHangDump""");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateDump();
+    }
+
+    [TestMethod]
+    // .NET tfms do not support dump on exit, but runner does
+    [NetCoreRunner("net462;net472")]
+    // [NetFrameworkRunner("net462;net472")]
+
+    public void CrashDumpOnExit(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("timeout.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true""");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateDump();
+    }
+
+    [TestMethod]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
+    // should make no difference, keeping for easy debug
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
+    public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("crash.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full""");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["PROCDUMP_PATH"] = _procDumpPath
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateDump();
+    }
+
+    [TestMethod]
+    [NetCoreRunner(NET60)]
+    // should make no difference, keeping for easy debug
+    // [NetFrameworkRunner(NET50)]
+    public void CrashDumpChildProcesses(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("child-crash.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full""");
+        InvokeVsTest(arguments);
+
+        ValidateDump(2);
+    }
+
+    [TestMethod]
+    [NetCoreRunner("net462;net472;net8.0;net9.0")]
+    // should make no difference, keeping for easy debug
+    // [NetFrameworkRunner("net462;net472;net8.0;net9.0")]
+    public void HangDumpChildProcesses(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = GetAssetFullPath("child-hang.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=15s""");
+        InvokeVsTest(arguments);
+
+        ValidateDump(2);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void BlameDataCollectorAeDebuggerShouldCollectDump(RunnerInfo runnerInfo)
+    {
+        if (!IsAdministrator())
+        {
+            Assert.Inconclusive("User is not administrator, cannot setup the debugger, and cannot check the functionality.");
+        }
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        // Install AeDebugger
+        string dumpPath = Path.Combine(TempDirectory.Path, "Dumps");
+        Directory.CreateDirectory(dumpPath);
+
+        ExecuteVsTestConsole($"/AeDebugger:Install;ProcDumpToolDirectoryPath={_procDumpPath};DumpDirectoryPath={dumpPath}",
+            out string standardTestOutput,
+            out string standardErrorTestOutput,
+            out int _);
+        Assert.IsTrue(standardErrorTestOutput.Trim().Length == 0);
+
+        // Run test under postmortem monitoring
+        var assemblyPaths = GetAssetFullPath("BlameUnitTestProject.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        arguments = string.Concat(arguments, $" /Blame:MonitorPostmortemDebugger;DumpDirectoryPath={dumpPath}");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+        InvokeVsTest(arguments);
+
+        // Uninstall AeDebugger
+        ExecuteVsTestConsole($"/AeDebugger:Uninstall;ProcDumpToolDirectoryPath={_procDumpPath}",
+            out standardTestOutput,
+            out standardErrorTestOutput,
+            out int _);
+        Assert.IsTrue(standardErrorTestOutput.Trim().Length == 0);
+
+        // We cannot be precise here procdump is at machine level so we can have more than one dump and not only the one for our test
+        // We look for "at least" one dump file, is the best we can do without locking all tests.
+        Assert.IsTrue(Directory.GetFiles(TempDirectory.Path, "*.dmp", SearchOption.AllDirectories)
+            .Where(x => Path.GetFileNameWithoutExtension(x).StartsWith("testhost")).Count() > 0);
+    }
+
+    private static bool IsAdministrator()
+    {
+        return new WindowsPrincipal(WindowsIdentity.GetCurrent())
+                       .IsInRole(WindowsBuiltInRole.Administrator);
+    }
+
+    private void ValidateDump(int expectedDumpCount = 1)
+    {
+        var attachments = StdOutWithWhiteSpace.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries)
+            .SkipWhile(l => !l.Contains("Attachments:")).Skip(1)
+            .Where(l => !string.IsNullOrWhiteSpace(l))
+            .ToList();
+
+        var output = string.Join(Environment.NewLine, attachments);
+        if (!attachments.Any(a => a.Contains("Sequence_")))
+        {
+            // sequence file is pretty flaky, and easily substituted by diag log
+            // throw new AssertFailedException("Expected Sequence file in Attachments, but there was none."
+            //    + Environment.NewLine
+            //    + output);
+        }
+
+        var dumps = attachments
+            .Where(a => a.EndsWith(".dmp"))
+            // On Windows we might collect conhost which tells us nothing
+            // or WerFault in case we would start hanging during crash
+            // we don't want these to make cross-platform checks more difficult
+            // so we filter them out.
+            .Where(a => !a.Contains("WerFault") && !a.Contains("conhost"))
+            .Select(a => a.Trim()).ToList();
+
+        if (dumps.Count < expectedDumpCount)
+        {
+            throw new AssertFailedException($"Expected at least {expectedDumpCount} dump file in Attachments, but there were {dumps.Count}."
+                + Environment.NewLine
+                + string.Join(Environment.NewLine, dumps));
+        }
+
+        var nonExistingDumps = new List<string>();
+        var emptyDumps = new List<string>();
+        foreach (var dump in dumps)
+        {
+            if (!File.Exists(dump))
+            {
+                nonExistingDumps.Add(dump);
+            }
+            else
+            {
+                var file = new FileInfo(dump);
+                if (file.Length == 0)
+                {
+                    emptyDumps.Add(dump);
+                }
+            }
+        }
+
+        // allow some child dumps to be missing, they manage to terminate early from time to time
+        if ((dumps.Count == 1 && nonExistingDumps.Any()) || (dumps.Count > 1 && nonExistingDumps.Count > 1)
+            || emptyDumps.Any())
+        {
+            var err = new StringBuilder();
+            err.AppendLine("Expected all dumps in the list of attachments to exist, and not be empty, but:");
+            if (nonExistingDumps.Any())
+            {
+                err.AppendLine(
+#if NET
+                    CultureInfo.InvariantCulture,
+#endif
+                    $"{nonExistingDumps.Count} don't exist:")
+                .AppendLine(string.Join(Environment.NewLine, nonExistingDumps));
+            }
+
+            if (emptyDumps.Any())
+            {
+                err.AppendLine(
+#if NET
+                    CultureInfo.InvariantCulture,
+#endif
+                    $"{emptyDumps.Count} are empty:")
+                .AppendLine(string.Join(Environment.NewLine, emptyDumps));
+            }
+
+            err.AppendLine("Reported attachments:")
+            .AppendLine(output);
+
+            throw new AssertFailedException(err.ToString());
+        }
+    }
+
+    private void VaildateOutput(TempDirectory tempDirectory, string testName, bool validateDumpFile = false)
+    {
+        bool isSequenceAttachmentReceived = false;
+        bool isDumpAttachmentReceived = false;
+        bool isValid = false;
+        StdErrorContains(testName);
+        StdOutputContains("Sequence_");
+        var resultFiles = Directory.GetFiles(tempDirectory.Path, "*", SearchOption.AllDirectories);
+
+        foreach (var file in resultFiles)
+        {
+            if (file.Contains("Sequence_"))
+            {
+                isSequenceAttachmentReceived = true;
+                isValid = IsValidXml(file);
+            }
+            else if (validateDumpFile && file.Contains(".dmp"))
+            {
+                isDumpAttachmentReceived = true;
+            }
+        }
+
+        Assert.IsTrue(isSequenceAttachmentReceived, "Sequence attachment was not received.");
+        Assert.IsTrue(!validateDumpFile || isDumpAttachmentReceived, "Dump attachment was not received.");
+        Assert.IsTrue(isValid, "Sequence attachment is not valid.");
+    }
+
+    private static bool IsValidXml(string xmlFilePath)
+    {
+        var file = File.OpenRead(xmlFilePath);
+        var reader = XmlReader.Create(file);
+        try
+        {
+            while (reader.Read())
+            {
+            }
+            file.Dispose();
+            return true;
+        }
+        catch (XmlException)
+        {
+            file.Dispose();
+            return false;
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs
new file mode 100644
index 0000000000..8dd581b00f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs
@@ -0,0 +1,379 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Runtime.InteropServices;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
+
+namespace Microsoft.TestPlatform.Acceptance.IntegrationTests;
+
+[TestClass]
+public class Build : IntegrationTestBase
+{
+    private static readonly string Root = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "..", ".."));
+    private static readonly string DotnetDir = Path.GetFullPath(Path.Combine(Root, ".dotnet"));
+    private static readonly string Dotnet = Path.GetFullPath(Path.Combine(Root, ".dotnet", OSUtils.IsWindows ? "dotnet.exe" : "dotnet"));
+
+    [AssemblyInitialize]
+    public static void AssemblyInitialize(TestContext _)
+    {
+        SetDotnetEnvironment();
+        BuildTestAssetsAndUnzipPackages();
+        BuildTestAssetsCompatibility();
+        CopyAndPatchDotnet();
+    }
+
+    private static void SetDotnetEnvironment()
+    {
+        // We need to set this to point to our dotnet, because we cannot guarantee what is installed on the machine in Program Files,
+        // and we install all the required SDKs and runtimes ourselves in Build.cmd.
+#pragma warning disable RS0030 // Do not used banned APIs
+        Environment.SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
+        Environment.SetEnvironmentVariable("DOTNET_ROOT", DotnetDir);
+        Environment.SetEnvironmentVariable("DOTNET_ROOT(x86)", Path.Combine(DotnetDir, "dotnet-sdk-x86"));
+        Environment.SetEnvironmentVariable("PATH", $"{DotnetDir};{Environment.GetEnvironmentVariable("PATH")}");
+#pragma warning restore RS0030 // Do not used banned APIs
+    }
+
+    private static void CopyAndPatchDotnet()
+    {
+        var patchedDotnetDir = Path.GetFullPath(Path.Combine(Root, "artifacts", "tmp", ".dotnet"));
+
+        // Copy dotnet.
+        DirectoryUtils.CopyDirectory(new DirectoryInfo(DotnetDir), new DirectoryInfo(patchedDotnetDir));
+
+        // Copy target file and build task dll into it.
+        var netTestSdkVersion = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+        var packageName = $"Microsoft.TestPlatform.Build.{netTestSdkVersion}.nupkg";
+        var packagePath = Path.GetFullPath(Path.Combine(IntegrationTestEnvironment.PublishDirectory, packageName));
+
+        // e.g. artifacts\tmp\.dotnet\sdk\
+        var sdkDirectory = Path.Combine(patchedDotnetDir, "sdk");
+        // e.g. artifacts\tmp\.dotnet\sdk\8.0.100-preview.6.23330.14
+        var dotnetSdkDirectories = Directory.GetDirectories(sdkDirectory);
+        if (dotnetSdkDirectories.Length == 0)
+        {
+            throw new InvalidOperationException($"No .NET SDK directories found in '{sdkDirectory}'.");
+        }
+        if (dotnetSdkDirectories.Length > 1)
+        {
+            throw new InvalidOperationException($"More than 1 .NET SDK directories found in '{sdkDirectory}': {string.Join(", ", dotnetSdkDirectories)}.");
+        }
+
+        var dotnetSdkDirectory = dotnetSdkDirectories.Single();
+        DirectoryUtils.CopyDirectory(Path.Combine(packagePath, "lib", "netstandard2.0"), dotnetSdkDirectory);
+        DirectoryUtils.CopyDirectory(Path.Combine(packagePath, "runtimes", "any", "native"), dotnetSdkDirectory);
+    }
+
+    private static void BuildTestAssetsCompatibility()
+    {
+        var testAssetsDir = Path.GetFullPath(Path.Combine(Root, "test", "TestAssets"));
+        var nugetCache = Path.GetFullPath(Path.Combine(Root, ".packages"));
+
+        var generated = Path.GetFullPath(Path.Combine(Root, "artifacts", "tmp", "GeneratedTestAssets"));
+        var generatedSln = Path.Combine(generated, "CompatibilityTestAssets.sln");
+
+        var dependenciesPath = Path.Combine(Root, "eng", "Versions.props");
+        var dependenciesXml = XDocument.Load(dependenciesPath);
+        var propsNode = dependenciesXml!.Element("Project")!
+            .Descendants("PropertyGroup")
+            .Where(p => p.Attributes().Any(a => a.Name == "Label" && a.Value == "VSTest test settings"))
+            .Single()!;
+
+        var cacheId = new OrderedDictionary();
+
+        // Restore previous versions of TestPlatform (for vstest.console.exe), and TestPlatform.CLI (for vstest.console.dll).
+        // These properties are coming from TestPlatform.Dependencies.props.
+        var vstestConsoleVersionProperties = new[] {
+            "VSTestConsoleLatestVersion",
+            "VSTestConsoleLatestPreviewVersion",
+            "VSTestConsoleLatestStableVersion",
+            "VSTestConsoleRecentStableVersion",
+            "VSTestConsoleMostDownloadedVersion",
+            "VSTestConsolePreviousStableVersion",
+            "VSTestConsoleLegacyStableVersion",
+        };
+
+        var projects = new[]
+        {
+            Path.Combine(Root, "test", "TestAssets", "MSTestProject1", "MSTestProject1.csproj"),
+            Path.Combine(Root, "test", "TestAssets", "MSTestProject2", "MSTestProject2.csproj"),
+        };
+
+        var msTestVersionProperties = new[] {
+            "MSTestFrameworkLatestPreviewVersion",
+            "MSTestFrameworkLatestStableVersion",
+            "MSTestFrameworkRecentStableVersion",
+            "MSTestFrameworkMostDownloadedVersion",
+            "MSTestFrameworkPreviousStableVersion",
+            "MSTestFrameworkLegacyStableVersion",
+        };
+
+        var nugetFeeds = GetNugetSourceParameters(Root);
+
+        // We use the same version properties for NET.Test.Sdk as for VSTestConsole, for now.
+        foreach (var sdkPropertyName in vstestConsoleVersionProperties)
+        {
+            string? netTestSdkVersion;
+            if (sdkPropertyName == "VSTestConsoleLatestVersion")
+            {
+                netTestSdkVersion = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+            }
+            else
+            {
+                netTestSdkVersion = propsNode.Element(sdkPropertyName!)!.Value;
+            }
+
+            if (netTestSdkVersion.IsNullOrWhiteSpace())
+            {
+                throw new InvalidOperationException($"{nameof(netTestSdkVersion)} should contain version of the package to restore, but it is empty.");
+            }
+
+            cacheId[sdkPropertyName] = netTestSdkVersion;
+
+            var netTestSdkVersionDir = netTestSdkVersion.TrimStart('[').TrimEnd(']');
+            if (Directory.Exists(Path.Combine(nugetCache, "microsoft.testplatform", netTestSdkVersionDir)) && Directory.Exists(Path.Combine(nugetCache, "microsoft.testplatform.cli", netTestSdkVersionDir)))
+            {
+                continue;
+            }
+
+            // We restore this project to download TestPlatform and TestPlatform.CLI nugets, into our package cache.
+            // Using nuget.exe install errors out in various weird ways.
+            var tools = Path.Combine(Root, "test", "TestAssets", "Tools", "Tools.csproj");
+            ExecuteApplication2(Dotnet, $"""restore --packages {nugetCache} {nugetFeeds} --source "{IntegrationTestEnvironment.LocalPackageSource}" "{tools}" -p:PackageVersion={netTestSdkVersionDir} """);
+        }
+
+        foreach (var propertyName in msTestVersionProperties)
+        {
+            var mstestVersion = propsNode.Element(propertyName)!.Value;
+            cacheId[propertyName] = mstestVersion;
+        }
+
+        cacheId["projects"] = projects;
+
+        var cacheIdText = JsonConvert.SerializeObject(cacheId, Formatting.Indented);
+
+        var currentCacheId = File.Exists(Path.Combine(generated, "checksum.json")) ? File.ReadAllText(Path.Combine(generated, "checksum.json")) : null;
+
+        var rebuild = true;
+        if (cacheIdText == currentCacheId)
+        {
+            // Cache is up-to-date, just rebuilding solution.
+            ExecuteApplication2(Dotnet, $"""restore --packages {nugetCache} {nugetFeeds} --source "{IntegrationTestEnvironment.LocalPackageSource}" "{generatedSln}" """);
+            ExecuteApplication2(Dotnet, $"build {generatedSln} --no-restore --configuration {IntegrationTestEnvironment.BuildConfiguration} -v:minimal");
+            rebuild = false;
+        }
+
+        if (rebuild)
+        {
+            if (Directory.Exists(generated))
+            {
+                Directory.Delete(generated, recursive: true);
+            }
+
+            Directory.CreateDirectory(generated);
+
+            // Fix repo root, we are 1 level deeper than in the test/TestAssets location.
+            var buildPropsContent = File.ReadAllText(Path.Combine(testAssetsDir, "Directory.Build.props"));
+            buildPropsContent = Regex.Replace(buildPropsContent, "<RepoRoot.*RepoRoot>", "<RepoRoot>$(MSBuildThisFileDirectory)../../../</RepoRoot>");
+            File.WriteAllText(Path.Combine(generated, "Directory.Build.props"), buildPropsContent);
+
+            File.Copy(Path.Combine(testAssetsDir, "Directory.Build.targets"), Path.Combine(generated, "Directory.Build.targets"));
+
+            ExecuteApplication2(Dotnet, $"""new sln --name CompatibilityTestAssets --output "{generated}""");
+
+            var projectsToAdd = new List<string>();
+            foreach (var project in projects)
+            {
+                var projectName = Path.GetFileName(project);
+                var projectBaseName = Path.GetFileNameWithoutExtension(projectName);
+                var projectDir = Path.GetDirectoryName(project)!;
+                var projectItems = Directory.GetFiles(projectDir, "*", SearchOption.AllDirectories).Where(p =>
+                    !p.Contains($"{Path.DirectorySeparatorChar}obj{Path.DirectorySeparatorChar}")
+                    && !p.Contains($"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}")
+                    // Is a file, and not a directory.
+                    && File.Exists(p)).ToList();
+
+                foreach (var sdkPropertyName in vstestConsoleVersionProperties)
+                {
+                    string netTestSdkVersion;
+                    if (sdkPropertyName == "VSTestConsoleLatestVersion")
+                    {
+                        netTestSdkVersion = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+                    }
+                    else
+                    {
+                        netTestSdkVersion = propsNode.Element(sdkPropertyName!)!.Value;
+                    }
+
+                    var dirNetTestSdkVersion = netTestSdkVersion.TrimStart('[').TrimEnd(']');
+                    var dirNetTestSdkPropertyName = sdkPropertyName
+                        .Replace("Framework", "")
+                        .Replace("Version", "")
+                        .Replace("VSTestConsole", "NETTestSdk");
+
+                    foreach (var propertyName in msTestVersionProperties)
+                    {
+                        var mstestVersion = propsNode.Element(propertyName)!.Value;
+
+                        var dirMSTestVersion = mstestVersion.TrimStart('[').TrimEnd(']');
+                        var dirMSTestPropertyName = propertyName
+                            .Replace("Framework", "")
+                            .Replace("Version", "");
+
+                        // Do not make this a folder structure, it will break the relative reference to scripts\build\TestAssets.props that we have in the project,
+                        // because the relative path will be different.
+                        // It would be nice to use fully descriptive name but it is too long, hash the versions instead.
+                        // $compatibilityProjectDir = "$generated/$projectBaseName--$dirNetTestSdkPropertyName-$dirNetTestSdkVersion--$dirMSTestPropertyName-$dirMSTestVersion"
+
+                        var versions = $"{dirNetTestSdkPropertyName}-{dirNetTestSdkVersion}--{dirMSTestPropertyName}-{dirMSTestVersion}";
+                        var hash = IntegrationTestEnvironment.GetPathHash(versions);
+                        var projectShortName = $"{projectBaseName}--{hash}";
+                        var compatibilityProjectDir = Path.Combine(generated, projectShortName);
+
+                        Directory.CreateDirectory(compatibilityProjectDir);
+
+                        foreach (var projectItem in projectItems)
+                        {
+                            var relativePath = projectItem.Replace(projectDir, "").TrimStart(Path.DirectorySeparatorChar);
+                            var fullPath = Path.Combine(compatibilityProjectDir, relativePath);
+                            File.Copy(projectItem, fullPath);
+                        }
+
+                        var compatibilityCsproj = Directory.GetFiles(compatibilityProjectDir, "*.csproj", SearchOption.AllDirectories);
+
+                        if (!compatibilityCsproj.Any())
+                        {
+                            throw new InvalidOperationException($"No .csproj file was found in directory {compatibilityProjectDir}.");
+                        }
+
+                        if (compatibilityCsproj.Length > 1)
+                        {
+                            throw new InvalidOperationException($"More than 1 .csproj file was found in directory {compatibilityProjectDir}.");
+                        }
+
+                        var csproj = compatibilityCsproj.Single();
+
+                        var content = File.ReadAllText(csproj);
+                        // We replace the content rather than using MSBuild properties, because that allows us to create a solution with
+                        // many versions of the package, and let msbuild figure out how to correctly restore and build in parallel. If we did use
+                        // MSBuild properties we would have to build each combination one by one in sequence.
+                        var newContent = content
+                            .Replace("$(MSTestTestFrameworkVersion)", mstestVersion)
+                            .Replace("$(MSTestTestAdapterVersion)", mstestVersion)
+                            .Replace("$(PackageVersion)", netTestSdkVersion);
+                        File.WriteAllText(csproj, newContent);
+
+                        var uniqueCsprojName = Path.Combine(compatibilityProjectDir, $"{projectShortName}.csproj");
+                        File.Move(csproj, uniqueCsprojName);
+                        projectsToAdd.Add(uniqueCsprojName);
+                    }
+                }
+            }
+
+            ExecuteApplication2(Dotnet, $"""sln {generatedSln} add "{string.Join("\" \"", projectsToAdd)}" """);
+
+            ExecuteApplication2(Dotnet, $"""restore --packages {nugetCache} {nugetFeeds} --source "{IntegrationTestEnvironment.LocalPackageSource}" "{generatedSln}" """);
+            ExecuteApplication2(Dotnet, $"""build --no-restore --configuration {IntegrationTestEnvironment.BuildConfiguration} "{generatedSln}" """);
+
+            File.WriteAllText(Path.Combine(generated, "checksum.json"), cacheIdText);
+        }
+    }
+
+    private static string GetNugetSourceParameters(string root)
+    {
+        string nugetConfigPath = Path.Combine(root, "NuGet.config");
+        var nugetConfig = XDocument.Load(nugetConfigPath);
+
+        var feeds = nugetConfig!
+            .Element("configuration")!
+            .Element("packageSources")!
+            .Descendants("add")
+            .Where(p => p.Attributes().Any(a => a.Name == "key"))
+            .SelectMany(p => p.Attributes())
+            .Where(a => a.Name == "value")
+            .Select(a => a.Value)
+            .ToList();
+
+        if (feeds.Count == 0)
+        {
+            throw new InvalidOperationException($"No feeds were loaded from '{nugetConfigPath}'.");
+        }
+
+        // --source "value1" --source "value2", including quotes
+        var parameters = $"""--source "{string.Join("\" --source \"", feeds)}" """;
+
+        return parameters;
+    }
+
+    protected static void ExecuteApplication2(string path, string? args,
+        Dictionary<string, string?>? environmentVariables = null, string? workingDirectory = null)
+    {
+
+        ExecuteApplication(path, args, out string stdOut, out string stdError, out int exitCode, environmentVariables, workingDirectory);
+        if (exitCode != 0)
+        {
+            throw new InvalidOperationException(
+                $"""
+                Executing '{path} {args}' failed.
+                STDOUT: {stdOut},
+                STDERR: {stdError}
+                """);
+        }
+    }
+
+    private static void BuildTestAssetsAndUnzipPackages()
+    {
+        var testAssets = Path.GetFullPath(Path.Combine(Root, "test", "TestAssets", "TestAssets.sln"));
+
+        var nugetCache = Path.GetFullPath(Path.Combine(Root, ".packages"));
+        var nugetFeeds = GetNugetSourceParameters(Root);
+        var netTestSdkVersion = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+
+        ExecuteApplication2(Dotnet, $"""restore --packages {nugetCache} {nugetFeeds} --source "{IntegrationTestEnvironment.LocalPackageSource}" -p:PackageVersion={netTestSdkVersion} "{testAssets}" """);
+        ExecuteApplication2(Dotnet, $"""build "{testAssets}" --configuration {IntegrationTestEnvironment.BuildConfiguration} --no-restore""");
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            // Build special project written in IL.
+            // This project is used on Windows only Tests. On non-Windows the build fails with: "IlasmToolPath must be set in order to build ilproj's outside of Windows.".
+            var cilProject = Path.Combine(Root, "test", "TestAssets", "CILProject", "CILProject.proj");
+            var binPath = Path.Combine(Root, "artifacts", "bin", "TestAssets", "CILProject", IntegrationTestEnvironment.BuildConfiguration, "net462");
+            ExecuteApplication2(Dotnet, $"""restore --packages {nugetCache} {nugetFeeds} --source "{IntegrationTestEnvironment.LocalPackageSource}" "{cilProject}" """);
+            ExecuteApplication2(Dotnet, $"""build "{cilProject}" --configuration {IntegrationTestEnvironment.BuildConfiguration} --no-restore --output {binPath}""");
+        }
+
+        var packagesToExtract = new[]
+        {
+            $"Microsoft.TestPlatform.{netTestSdkVersion}.nupkg",
+            $"Microsoft.TestPlatform.CLI.{netTestSdkVersion}.nupkg",
+            $"Microsoft.TestPlatform.Build.{netTestSdkVersion}.nupkg",
+            $"Microsoft.CodeCoverage.{netTestSdkVersion}.nupkg",
+            $"Microsoft.TestPlatform.Portable.{netTestSdkVersion}.nupkg",
+        };
+
+        foreach (var packageName in packagesToExtract)
+        {
+            var packagePath = Path.Combine(IntegrationTestEnvironment.LocalPackageSource, packageName);
+            var unzipPath = Path.Combine(IntegrationTestEnvironment.PublishDirectory, packageName);
+            if (Directory.Exists(unzipPath))
+            {
+                Directory.Delete(unzipPath, recursive: true);
+            }
+
+            ZipFile.ExtractToDirectory(packagePath, unzipPath);
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageAcceptanceTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageAcceptanceTestBase.cs
new file mode 100644
index 0000000000..9036785a94
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageAcceptanceTestBase.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.CodeCoverage.Core;
+using Microsoft.CodeCoverage.Core.Reports.Coverage;
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public class CodeCoverageAcceptanceTestBase : AcceptanceTestBase
+{
+    /*
+     * Below value is just safe coverage result for which all tests are passing.
+     * Inspecting this value gives us confidence that there is no big drop in overall coverage.
+     */
+    protected const double ExpectedMinimalModuleCoverage = 30.0;
+
+    protected static string GetNetStandardAdapterPath()
+    {
+        return Path.Combine(IntegrationTestEnvironment.PublishDirectory,
+            $"Microsoft.CodeCoverage.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "build", "netstandard2.0");
+    }
+
+    protected static ModuleData? GetModule(CoverageReport coverageReport, string name)
+    {
+        var module = coverageReport.Modules.FirstOrDefault(m => string.Equals(m.Name, name, StringComparison.OrdinalIgnoreCase));
+        module ??= coverageReport.Modules.FirstOrDefault(m => string.Equals(m.Name, Path.GetFileNameWithoutExtension(name), StringComparison.OrdinalIgnoreCase));
+
+        return module;
+    }
+
+    protected static XmlNode? GetNode(XmlNode node, string type, string name)
+    {
+        return node.SelectSingleNode($"//{type}[@name='{name}']") ?? node.SelectSingleNode($"//{type}[@name='{name.ToLower(CultureInfo.CurrentCulture)}']");
+    }
+
+    protected static CoverageReport GetCoverageReport(string coverageResult)
+    {
+        CoverageFileUtilityV2 utility = new(new TpCoverageFileConfiguration());
+        return utility.ReadCoverageReportAsync(coverageResult, default).Result;
+    }
+
+    protected static void AssertCoverage(ModuleData module, double expectedCoverage)
+    {
+        string coverageData = module.CoverageBuffer.Length == 0 ? module.LineCoverage : module.BlockCoverage;
+        var coverage = double.Parse(coverageData, CultureInfo.InvariantCulture);
+        Console.WriteLine($"Checking coverage for {module.Name}. Expected at least: {expectedCoverage}. Result: {coverage}");
+        Assert.IsTrue(coverage > expectedCoverage, $"Coverage check failed for {module.Name}. Expected at least: {expectedCoverage}. Found: {coverage}");
+    }
+
+    protected static string GetCoverageFileNameFromTrx(string trxFilePath, string resultsDirectory)
+    {
+        Assert.IsTrue(File.Exists(trxFilePath), "Trx file not found: {0}", trxFilePath);
+        XmlDocument doc = new();
+        using var trxStream = new FileStream(trxFilePath, FileMode.Open, FileAccess.Read);
+        doc.Load(trxStream);
+        var deploymentElements = doc.GetElementsByTagName("Deployment");
+        Assert.IsTrue(deploymentElements.Count == 1,
+            "None or more than one Deployment tags found in trx file:{0}", trxFilePath);
+        var deploymentDir = deploymentElements[0]!.Attributes!.GetNamedItem("runDeploymentRoot")?.Value;
+        Assert.IsTrue(string.IsNullOrEmpty(deploymentDir) == false,
+            "runDeploymentRoot attribute not found in trx file:{0}", trxFilePath);
+        var collectors = doc.GetElementsByTagName("Collector");
+
+        string? fileName = string.Empty;
+        for (int i = 0; i < collectors.Count; i++)
+        {
+            if (string.Equals(collectors[i]!.Attributes!.GetNamedItem("collectorDisplayName")!.Value,
+                    "Code Coverage", StringComparison.OrdinalIgnoreCase))
+            {
+                fileName = collectors[i]?.FirstChild?.FirstChild?.FirstChild?.Attributes?.GetNamedItem("href")
+                    ?.Value;
+            }
+        }
+
+        Assert.IsTrue(string.IsNullOrEmpty(fileName) == false, "Coverage file name not found in trx file: {0}",
+            trxFilePath);
+        return Path.Combine(resultsDirectory, deploymentDir, "In", fileName);
+    }
+
+    internal class TpCoverageFileConfiguration : ICoverageFileConfiguration
+    {
+        public bool ReadModules => true;
+
+        public bool ReadSkippedModules => true;
+
+        public bool ReadSkippedFunctions => true;
+
+        public bool ReadSnapshotsData => true;
+
+        public bool GenerateCoverageBufferFiles => false;
+
+        public bool FixCoverageBuffersMismatch => false;
+
+        public int MaxDegreeOfParallelism => 2;
+
+        public bool SkipInvalidData => true;
+
+        public CoverageMergeOperation MergeOperation => CoverageMergeOperation.MergeToCobertura;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageTests.cs
new file mode 100644
index 0000000000..9bad647034
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CodeCoverageTests.cs
@@ -0,0 +1,358 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Microsoft.CodeCoverage.Core;
+using Microsoft.CodeCoverage.Core.Reports.Coverage;
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+internal struct TestParameters
+{
+    public enum SettingsType
+    {
+        None = 0,
+        Default = 1,
+        Custom = 2,
+        XmlOutput = 3,
+        CoberturaOutput = 4
+    }
+
+    public string AssemblyName { get; set; }
+
+    public string TargetPlatform { get; set; }
+
+    public SettingsType RunSettingsType { get; set; }
+
+    public string RunSettingsPath { get; set; }
+
+    public int ExpectedPassedTests { get; set; }
+
+    public int ExpectedSkippedTests { get; set; }
+
+    public int ExpectedFailedTests { get; set; }
+
+    public bool CheckSkipped { get; set; }
+}
+
+[TestClass]
+//Code coverage only supported on windows (based on the message in output)
+[TestCategory("Windows-Review")]
+public class CodeCoverageTests : CodeCoverageAcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageWithCollectOptionForx86(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x86",
+            RunSettingsPath = string.Empty,
+            RunSettingsType = TestParameters.SettingsType.None,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageWithCollectOptionForx64(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x64",
+            RunSettingsPath = string.Empty,
+            RunSettingsType = TestParameters.SettingsType.None,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageX86WithRunSettings(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x86",
+            RunSettingsPath = string.Empty,
+            RunSettingsType = TestParameters.SettingsType.Default,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageX64WithRunSettings(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x64",
+            RunSettingsPath = string.Empty,
+            RunSettingsType = TestParameters.SettingsType.Default,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CodeCoverageShouldAvoidExclusionsX86(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "CodeCoverageTest.dll",
+            TargetPlatform = "x86",
+            RunSettingsPath = Path.Combine(
+                IntegrationTestEnvironment.RepoRootDirectory,
+                @"scripts", "vstest-codecoverage2.runsettings"),
+            RunSettingsType = TestParameters.SettingsType.Custom,
+            ExpectedPassedTests = 3,
+            ExpectedSkippedTests = 0,
+            ExpectedFailedTests = 0,
+            CheckSkipped = true
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CodeCoverageShouldAvoidExclusionsX64(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "CodeCoverageTest.dll",
+            TargetPlatform = "x64",
+            RunSettingsPath = Path.Combine(
+                IntegrationTestEnvironment.RepoRootDirectory,
+                @"scripts", "vstest-codecoverage2.runsettings"),
+            RunSettingsType = TestParameters.SettingsType.Custom,
+            ExpectedPassedTests = 3,
+            ExpectedSkippedTests = 0,
+            ExpectedFailedTests = 0,
+            CheckSkipped = true
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageSpecifyOutputFormatXml(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x64",
+            RunSettingsPath = string.Empty,
+            RunSettingsType = TestParameters.SettingsType.XmlOutput,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void CollectCodeCoverageSpecifyOutputFormatCoberturaOverrideRunSettingsConfiguration(RunnerInfo runnerInfo)
+    {
+        var parameters = new TestParameters()
+        {
+            AssemblyName = "SimpleTestProject.dll",
+            TargetPlatform = "x64",
+            RunSettingsPath = Path.Combine(
+                IntegrationTestEnvironment.RepoRootDirectory,
+                @"scripts", "vstest-codecoverage2.runsettings"),
+            RunSettingsType = TestParameters.SettingsType.CoberturaOutput,
+            ExpectedPassedTests = 1,
+            ExpectedSkippedTests = 1,
+            ExpectedFailedTests = 1
+        };
+
+        CollectCodeCoverage(runnerInfo, parameters);
+    }
+
+    private void CollectCodeCoverage(RunnerInfo runnerInfo, TestParameters testParameters)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = CreateArguments(TempDirectory, runnerInfo, testParameters, out var trxFilePath);
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(
+            testParameters.ExpectedPassedTests,
+            testParameters.ExpectedSkippedTests,
+            testParameters.ExpectedFailedTests);
+
+        var actualCoverageFile = GetCoverageFileNameFromTrx(trxFilePath, TempDirectory.Path);
+        Console.WriteLine($@"Coverage file: {actualCoverageFile}  Results directory: {TempDirectory.Path} trxfile: {trxFilePath}");
+        Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile);
+
+        if (testParameters.RunSettingsType == TestParameters.SettingsType.XmlOutput)
+        {
+            Assert.IsTrue(actualCoverageFile.EndsWith(".xml", StringComparison.InvariantCultureIgnoreCase));
+        }
+        else if (testParameters.RunSettingsType == TestParameters.SettingsType.CoberturaOutput)
+        {
+            Assert.IsTrue(actualCoverageFile.EndsWith(".cobertura.xml", StringComparison.InvariantCultureIgnoreCase));
+        }
+        else
+        {
+            Assert.IsTrue(actualCoverageFile.EndsWith(".coverage", StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        var coverageReport = GetCoverageReport(actualCoverageFile);
+        if (testParameters.CheckSkipped)
+        {
+            AssertSkippedMethod(coverageReport);
+        }
+
+        ValidateCoverageData(coverageReport, testParameters.AssemblyName, testParameters.RunSettingsType != TestParameters.SettingsType.CoberturaOutput);
+    }
+
+    private string CreateArguments(
+        TempDirectory tempDirectory,
+        RunnerInfo runnerInfo,
+        TestParameters testParameters,
+        out string trxFilePath)
+    {
+        var assemblyPaths = GetAssetFullPath(testParameters.AssemblyName);
+
+        string traceDataCollectorDir = Path.Combine(IntegrationTestEnvironment.PublishDirectory,
+            $"Microsoft.CodeCoverage.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "build", "netstandard2.0");
+
+        string diagFileName = Path.Combine(tempDirectory.Path, "diaglog.txt");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty,
+            FrameworkArgValue, runnerInfo.InIsolationValue, tempDirectory.Path);
+        arguments = string.Concat(arguments, $" /Diag:{diagFileName}",
+            $" /TestAdapterPath:{traceDataCollectorDir}");
+        arguments = string.Concat(arguments, $" /Platform:{testParameters.TargetPlatform}");
+
+        trxFilePath = Path.Combine(tempDirectory.Path, Guid.NewGuid() + ".trx");
+        arguments = string.Concat(arguments, " /logger:trx;logfilename=" + trxFilePath);
+
+        var defaultRunSettingsPath = Path.Combine(
+            IntegrationTestEnvironment.RepoRootDirectory,
+            @"scripts", "vstest-codecoverage.runsettings");
+
+        var runSettings = string.Empty;
+        switch (testParameters.RunSettingsType)
+        {
+            case TestParameters.SettingsType.None:
+                runSettings = $" /collect:\"Code Coverage\"";
+                break;
+            case TestParameters.SettingsType.Default:
+                runSettings = $" /settings:{defaultRunSettingsPath}";
+                break;
+            case TestParameters.SettingsType.Custom:
+                runSettings = $" /settings:{testParameters.RunSettingsPath}";
+                break;
+            case TestParameters.SettingsType.XmlOutput:
+                runSettings = $" /collect:\"Code Coverage;Format=Xml\"";
+                if (!string.IsNullOrWhiteSpace(testParameters.RunSettingsPath))
+                {
+                    runSettings += $" /settings:{testParameters.RunSettingsPath}";
+                }
+                break;
+            case TestParameters.SettingsType.CoberturaOutput:
+                runSettings = $" /collect:\"Code Coverage;Format=Cobertura\"";
+                if (!string.IsNullOrWhiteSpace(testParameters.RunSettingsPath))
+                {
+                    runSettings += $" /settings:{testParameters.RunSettingsPath}";
+                }
+                break;
+        }
+
+        arguments = string.Concat(arguments, runSettings);
+
+        return arguments;
+    }
+
+    private static void AssertSkippedMethod(CoverageReport coverageReport)
+    {
+        var module = GetModule(coverageReport, "codecoveragetest.dll");
+        Assert.IsNotNull(module);
+
+        var coverage = double.Parse(module.BlockCoverage, CultureInfo.InvariantCulture);
+        Assert.IsTrue(coverage > ExpectedMinimalModuleCoverage);
+
+        var testSignFunction = module.SkippedFunctions.FirstOrDefault(f => f.Name.Equals("TestSign()"));
+        Assert.IsNotNull(testSignFunction);
+        Assert.AreEqual(FunctionSkipReason.name_excluded, testSignFunction.FunctionSkipReason);
+
+        var skippedTestMethod = module.SkippedFunctions.FirstOrDefault(f => f.Name.Equals("__CxxPureMSILEntry_Test()"));
+        Assert.IsNotNull(skippedTestMethod);
+        Assert.AreEqual(FunctionSkipReason.name_excluded, skippedTestMethod.FunctionSkipReason);
+
+        var testAbsFunction = module.Functions.FirstOrDefault(f => f.Name.Equals("TestAbs()"));
+        Assert.IsNotNull(testAbsFunction);
+    }
+
+    private static void ValidateCoverageData(CoverageReport coverageReport, string moduleName, bool validateSourceFileNames)
+    {
+        var module = GetModule(coverageReport, moduleName.ToLowerInvariant());
+        Assert.IsNotNull(module);
+
+        AssertCoverage(module, ExpectedMinimalModuleCoverage);
+
+        // In case of cobertura report. Cobertura report has different format.
+        if (validateSourceFileNames)
+        {
+            AssertSourceFileName(module);
+        }
+    }
+
+    private static void AssertSourceFileName(ModuleData module)
+    {
+        const string expectedFileName = "UnitTest1.cs";
+
+        var found = false;
+
+        foreach (var sourceFile in module.SourceFiles)
+        {
+            if (sourceFile.Path.Contains(expectedFileName))
+            {
+                found = true;
+                break;
+            }
+        }
+
+        Assert.IsTrue(found);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectionTests.cs
new file mode 100644
index 0000000000..9698a81144
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectionTests.cs
@@ -0,0 +1,244 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DataCollectionTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void ExecuteTestsWithDataCollection(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+        string runSettings = GetRunsettingsFilePath(TempDirectory.Path);
+        string diagFileName = Path.Combine(TempDirectory.Path, "diaglog.txt");
+        var extensionsPath = Path.GetDirectoryName(GetTestDllForFramework("OutOfProcDataCollector.dll", runnerInfo.RunnerFramework));
+        var arguments = PrepareArguments(assemblyPaths, null, runSettings, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /TestAdapterPath:{extensionsPath}");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["TEST_ASSET_SAMPLE_COLLECTOR_PATH"] = TempDirectory.Path,
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateSummaryStatus(1, 1, 1);
+        VaildateDataCollectorOutput(TempDirectory.Path);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void ExecuteTestsWithDataCollectionUsingCollectArgument(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+        string diagFileName = Path.Combine(TempDirectory.Path, "diaglog.txt");
+        var extensionsPath = Path.GetDirectoryName(GetTestDllForFramework("OutOfProcDataCollector.dll", runnerInfo.RunnerFramework));
+
+        var arguments = PrepareArguments(assemblyPaths, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /Collect:SampleDataCollector", $" /TestAdapterPath:{extensionsPath}");
+
+        var env = new Dictionary<string, string?>
+        {
+            ["TEST_ASSET_SAMPLE_COLLECTOR_PATH"] = TempDirectory.Path,
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateSummaryStatus(1, 1, 1);
+        VaildateDataCollectorOutput(TempDirectory.Path);
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    public void DataCollectorAssemblyLoadingShouldNotThrowErrorForNetCore(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetTestDllForFramework("AppDomainGetAssembliesTestProject.dll", DEFAULT_HOST_NETCORE), string.Empty, string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void DataCollectorAssemblyLoadingShouldNotThrowErrorForFullFramework(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetAssetFullPath("AppDomainGetAssembliesTestProject.dll"), string.Empty, string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DataCollectorAttachmentProcessor(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("SimpleTestProject.dll");
+        var secondAssemblyPath = GetAssetFullPath("SimpleTestProject2.dll");
+        string runSettings = GetRunsettingsFilePath(TempDirectory.Path);
+        string diagFileName = Path.Combine(TempDirectory.Path, "diaglog.txt");
+        var extensionsPath = Path.GetDirectoryName(GetTestDllForFramework("AttachmentProcessorDataCollector.dll", "netstandard2.0"));
+        var arguments = PrepareArguments([assemblyPath, secondAssemblyPath], null, runSettings, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /TestAdapterPath:{extensionsPath}");
+
+        XElement runSettingsXml = XElement.Load(runSettings);
+
+        // Today we merge only in the case of ParallelProxyExecutionManager executor, that is chosen if:
+        // (parallelLevel > 1 || !testHostManager.Shared) -> "src\Microsoft.TestPlatform.CrossPlatEngine\TestEngine.cs" line ~248
+        // So we'll merge always in case of DotnetTestHostManager(Shared = false) or in case of DefaultTestHostManager(DisableAppDomain = true) or if MaxCpuCount > 1
+        // For NetFull test we need to have more than one test library and MaxCpuCount > 1
+        runSettingsXml.Add(new XElement("RunConfiguration", new XElement("MaxCpuCount", 2)));
+
+        // Set datacollector parameters
+        runSettingsXml.Element("DataCollectionRunSettings")!
+            .Element("DataCollectors")!
+            .Element("DataCollector")!
+            .Add(new XElement("Configuration", new XElement("MergeFile", "MergedFile.txt")));
+        runSettingsXml.Save(runSettings);
+
+        var env = new Dictionary<string, string?>
+        {
+            ["SampleDataCollectorTempPath"] = TempDirectory.Path,
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateSummaryStatus(2, 2, 2);
+
+        string mergedFile = Directory.GetFiles(TempDirectory.Path, "MergedFile.txt", SearchOption.AllDirectories).Single();
+        var fileContent = new List<string>();
+        using (var streamReader = new StreamReader(mergedFile))
+        {
+            while (!streamReader.EndOfStream)
+            {
+                string? line = streamReader.ReadLine();
+                Assert.IsTrue(line!.StartsWith("SessionEnded_Handler_"));
+                fileContent.Add(line);
+            }
+        }
+
+        Assert.AreEqual(2, fileContent.Distinct().Count());
+
+        var dataCollectorsLogs = Directory.GetFiles(TempDirectory.Path, "*.datacollector.*", SearchOption.TopDirectoryOnly);
+        Assert.AreEqual(2, dataCollectorsLogs.Distinct().Count());
+        foreach (var dataCollectorLogFile in dataCollectorsLogs)
+        {
+            string dataCollectorLog = File.ReadAllText(dataCollectorLogFile);
+            Assert.IsTrue(dataCollectorLog.Contains("MetadataReaderExtensionsHelper: Valid extension found: extension type 'DataCollector' identifier 'my://sample/datacollector' implementation 'AttachmentProcessorDataCollector.SampleDataCollectorV1' version '1'"));
+            Assert.IsTrue(dataCollectorLog.Contains("MetadataReaderExtensionsHelper: Valid extension found: extension type 'DataCollector' identifier 'my://sample/datacollector' implementation 'AttachmentProcessorDataCollector.SampleDataCollectorV2' version '2'"));
+            Assert.IsTrue(Regex.IsMatch(dataCollectorLog, @"GetTestExtensionFromType: Discovered multiple test extensions with identifier data 'my://sample/datacollector' and type 'AttachmentProcessorDataCollector\.SampleDataCollectorV1, AttachmentProcessorDataCollector, Version=.*, Culture=neutral, PublicKeyToken=null' inside file '.*AttachmentProcessorDataCollector\.dll'; keeping the first one 'AttachmentProcessorDataCollector\.SampleDataCollectorV2, AttachmentProcessorDataCollector, Version=.*, Culture=neutral, PublicKeyToken=null'\."));
+        }
+    }
+
+    private static void CreateDataCollectionRunSettingsFile(string destinationRunsettingsPath, Dictionary<string, string> dataCollectionAttributes)
+    {
+        var doc = new XmlDocument();
+        var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+
+        doc.AppendChild(xmlDeclaration);
+        var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
+        doc.AppendChild(runSettingsNode);
+        var dcConfigNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
+        runSettingsNode.AppendChild(dcConfigNode);
+        var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
+        dcConfigNode.AppendChild(dataCollectorsNode);
+        var dataCollectorNode = doc.CreateElement(Constants.DataCollectorSettingName);
+        dataCollectorsNode.AppendChild(dataCollectorNode);
+
+        foreach (var kvp in dataCollectionAttributes)
+        {
+            dataCollectorNode.SetAttribute(kvp.Key, kvp.Value);
+        }
+
+        using var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
+        doc.Save(stream);
+    }
+
+    private void VaildateDataCollectorOutput(string resultsDir)
+    {
+        // Output of datacollection attachment.
+        StdOutputContains("filename.txt");
+        StdOutputContains("TestCaseStarted");
+        StdOutputContains("TestCaseEnded");
+        StdOutputContains("SampleUnitTestProject2.UnitTest1.PassingTest2");
+        StdOutputContains("SampleUnitTestProject2.UnitTest1.FailingTest2");
+        StdOutputContains("Data collector 'SampleDataCollector' message: SessionStarted");
+        StdOutputContains("Data collector 'SampleDataCollector' message: TestHostLaunched");
+        StdOutputContains("Data collector 'SampleDataCollector' message: SessionEnded");
+        StdOutputContains("Data collector 'SampleDataCollector' message: my warning");
+        StdErrorContains("Data collector 'SampleDataCollector' message: Data collector caught an exception of type 'System.Exception': 'my exception'. More details:");
+        StdOutputContains("Data collector 'SampleDataCollector' message: Dispose called.");
+
+        // Verify attachments
+        var isTestRunLevelAttachmentFound = false;
+        var testCaseLevelAttachmentsCount = 0;
+        var diaglogsFileCount = 0;
+
+        var resultFiles = Directory.GetFiles(resultsDir, "*.txt", SearchOption.AllDirectories);
+
+        foreach (var file in resultFiles)
+        {
+            // Test Run level attachments are logged in standard output.
+            if (file.Contains("filename.txt"))
+            {
+                StdOutputContains(file);
+                isTestRunLevelAttachmentFound = true;
+            }
+
+            if (file.Contains("testcasefilename"))
+            {
+                testCaseLevelAttachmentsCount++;
+            }
+
+            if (file.Contains("diaglog"))
+            {
+                diaglogsFileCount++;
+            }
+        }
+
+        Assert.IsTrue(isTestRunLevelAttachmentFound);
+        Assert.AreEqual(3, testCaseLevelAttachmentsCount);
+        Assert.AreEqual(3, diaglogsFileCount);
+    }
+
+    private static string GetRunsettingsFilePath(string resultsDir)
+    {
+        var runsettingsPath = Path.Combine(resultsDir, "test_" + Guid.NewGuid() + ".runsettings");
+        var dataCollectionAttributes = new Dictionary<string, string>
+        {
+            { "friendlyName", "SampleDataCollector" },
+            { "uri", "my://sample/datacollector" }
+        };
+
+        CreateDataCollectionRunSettingsFile(runsettingsPath, dataCollectionAttributes);
+        return runsettingsPath;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorAttachmentsProcessorsFactoryTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorAttachmentsProcessorsFactoryTests.cs
new file mode 100644
index 0000000000..5a7284c7cf
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorAttachmentsProcessorsFactoryTests.cs
@@ -0,0 +1,278 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.DataCollectorAttachmentsProcessorsFactoryTests;
+
+[TestClass]
+public class DataCollectorAttachmentsProcessorsFactoryTests : AcceptanceTestBase
+{
+    private readonly DataCollectorAttachmentsProcessorsFactory _dataCollectorAttachmentsProcessorsFactory = new();
+
+    [TestInitialize]
+    public void Init()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(DataCollectorAttachmentsProcessorsFactoryTests));
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        TestPluginCacheHelper.ResetExtensionsCache();
+    }
+
+    [TestMethod]
+    public void Create_ShouldReturnListOfAttachmentProcessors()
+    {
+        // arrange
+        List<InvokedDataCollector> invokedDataCollectors =
+        [
+            new InvokedDataCollector(new Uri("datacollector://Sample"), "Sample", typeof(SampleDataCollector).AssemblyQualifiedName!, typeof(SampleDataCollector).Assembly.Location, true),
+            new InvokedDataCollector(new Uri("datacollector://SampleData2"), "SampleData2", typeof(SampleData2Collector).AssemblyQualifiedName!, typeof(SampleData2Collector).Assembly.Location, true),
+            new InvokedDataCollector(new Uri("datacollector://SampleData3"), "SampleData3", typeof(SampleData3Collector).AssemblyQualifiedName!, typeof(SampleData3Collector).Assembly.Location, true)
+        ];
+        // act
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollectors.ToArray(), null);
+
+        // assert
+        Assert.AreEqual(3, dataCollectorAttachmentsProcessors.Length);
+
+        Assert.AreEqual(1, dataCollectorAttachmentsProcessors.Count(x => x.FriendlyName == "Sample"));
+        Assert.AreEqual(1, dataCollectorAttachmentsProcessors.Count(x => x.FriendlyName == "SampleData3"));
+        Assert.AreEqual(1, dataCollectorAttachmentsProcessors.Count(x => x.FriendlyName == "Code Coverage"));
+
+        Assert.AreEqual(typeof(DataCollectorAttachmentProcessor).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+        Assert.AreEqual(typeof(DataCollectorAttachmentProcessor2).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[1].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+        Assert.AreEqual(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[2].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void Create_EmptyOrNullInvokedDataCollector_ShouldReturnCodeCoverageDataAttachmentsHandler(bool empty)
+    {
+        // act
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(empty ? [] : null, null);
+
+        //assert
+        Assert.AreEqual(1, dataCollectorAttachmentsProcessors.Length);
+        Assert.AreEqual(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void Create_ShouldNotFailIfWrongDataCollectorAttachmentProcessor()
+    {
+        // arrange
+        List<InvokedDataCollector> invokedDataCollectors =
+        [
+            new InvokedDataCollector(new Uri("datacollector://SampleData4"), "SampleData4",
+                typeof(SampleData4Collector).AssemblyQualifiedName!, typeof(SampleData4Collector).Assembly.Location,
+                true)
+        ];
+
+        // act
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollectors.ToArray(), null);
+
+        // assert
+        Assert.AreEqual(1, dataCollectorAttachmentsProcessors.Length);
+        Assert.AreEqual(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void Create_ShouldAddTwoTimeCodeCoverageDataAttachmentsHandler()
+    {
+        // arrange
+        List<InvokedDataCollector> invokedDataCollectors =
+        [
+            new InvokedDataCollector(new Uri("datacollector://microsoft/CodeCoverage/2.0"), "SampleData5", typeof(SampleData5Collector).AssemblyQualifiedName!, typeof(SampleData5Collector).Assembly.Location, true)
+        ];
+
+        // act
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollectors.ToArray(), null);
+
+        // assert
+        Assert.AreEqual(2, dataCollectorAttachmentsProcessors.Length);
+        Assert.AreEqual(typeof(DataCollectorAttachmentProcessor).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+        Assert.AreEqual(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[1].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void Create_ShouldLoadOrderingByFilePath()
+    {
+        // arrange
+        // We cannot cleanup at the end because assembly will be copied into tmp directory and loaded
+        string testAssetsPath = GetTestAssetsFolder();
+        var dataCollectorFilePath = GetTestDllForFramework("AttachmentProcessorDataCollector.dll", "netstandard2.0");
+#pragma warning disable RS0030 // Do not used banned APIs
+        string tmpDir = Path.Combine(Path.GetTempPath(), nameof(Create_ShouldLoadOrderingByFilePath));
+#pragma warning restore RS0030 // Do not used banned APIs
+        Directory.CreateDirectory(tmpDir);
+        string version1 = Path.Combine(tmpDir, "1.0.0");
+        Directory.CreateDirectory(version1);
+        File.Copy(dataCollectorFilePath, Path.Combine(version1, Path.GetFileName(dataCollectorFilePath)), true);
+        string version2 = Path.Combine(tmpDir, "1.0.1");
+        Directory.CreateDirectory(version2);
+        File.Copy(dataCollectorFilePath, Path.Combine(version2, Path.GetFileName(dataCollectorFilePath)), true);
+
+        List<InvokedDataCollector> invokedDataCollectors =
+        [
+            new InvokedDataCollector(new Uri("my://sample/datacollector"), "sample", "AttachmentProcessorDataCollector.SampleDataCollectorV2", Path.Combine(version1, Path.GetFileName(dataCollectorFilePath)), true),
+            new InvokedDataCollector(new Uri("my://sample/datacollector"), "sample", "AttachmentProcessorDataCollector.SampleDataCollectorV2", Path.Combine(version2, Path.GetFileName(dataCollectorFilePath)), true)
+        ];
+
+        // act
+        var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollectors.ToArray(), null);
+
+        // assert
+        Assert.AreEqual(2, dataCollectorAttachmentsProcessors.Length);
+        Assert.IsTrue(Regex.IsMatch(dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName!, @"AttachmentProcessorDataCollector\.SampleDataCollectorAttachmentProcessor, AttachmentProcessorDataCollector, Version=.*, Culture=neutral, PublicKeyToken=null"));
+        Assert.AreEqual(Path.Combine(version2, Path.GetFileName(dataCollectorFilePath)), dataCollectorAttachmentsProcessors[0].DataCollectorAttachmentProcessorInstance.GetType().Assembly.Location);
+        Assert.AreEqual(typeof(CodeCoverageDataAttachmentsHandler).AssemblyQualifiedName, dataCollectorAttachmentsProcessors[1].DataCollectorAttachmentProcessorInstance.GetType().AssemblyQualifiedName);
+    }
+
+    private static string GetTestAssetsFolder()
+    {
+        string current = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+        while (true)
+        {
+            if (File.Exists(Path.Combine(current, "TestPlatform.sln")))
+            {
+                string testAssetsPath = Path.Combine(current, @"test/TestAssets");
+                Assert.IsTrue(Directory.Exists(testAssetsPath), $"Directory not found '{testAssetsPath}'");
+                return testAssetsPath;
+            }
+            current = Path.GetDirectoryName(current)!;
+            if (current == Path.GetPathRoot(current))
+            {
+                throw new Exception("Repo root path not tound");
+            }
+        }
+    }
+
+    [DataCollectorFriendlyName("Sample")]
+    [DataCollectorTypeUri("datacollector://Sample")]
+    [DataCollectorAttachmentProcessor(typeof(DataCollectorAttachmentProcessor))]
+    public class SampleDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    [DataCollectorFriendlyName("SampleData2")]
+    [DataCollectorTypeUri("datacollector://SampleData2")]
+    [DataCollectorAttachmentProcessor(typeof(DataCollectorAttachmentProcessor))]
+    public class SampleData2Collector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    [DataCollectorFriendlyName("SampleData3")]
+    [DataCollectorTypeUri("datacollector://SampleData3")]
+    [DataCollectorAttachmentProcessor(typeof(DataCollectorAttachmentProcessor2))]
+    public class SampleData3Collector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    [DataCollectorFriendlyName("SampleData4")]
+    [DataCollectorTypeUri("datacollector://SampleData4")]
+    [DataCollectorAttachmentProcessor(typeof(string))]
+    public class SampleData4Collector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    [DataCollectorFriendlyName("SampleData5")]
+    [DataCollectorTypeUri("datacollector://microsoft/CodeCoverage/2.0")]
+    [DataCollectorAttachmentProcessor(typeof(DataCollectorAttachmentProcessor))]
+    public class SampleData5Collector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    public class DataCollectorAttachmentProcessor : IDataCollectorAttachmentProcessor
+    {
+        public bool SupportsIncrementalProcessing => throw new NotImplementedException();
+
+        public IEnumerable<Uri> GetExtensionUris()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class DataCollectorAttachmentProcessor2 : IDataCollectorAttachmentProcessor
+    {
+        public bool SupportsIncrementalProcessing => throw new NotImplementedException();
+
+        public IEnumerable<Uri> GetExtensionUris()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs
new file mode 100644
index 0000000000..9931acf617
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DataCollectorTests.Coverlet.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DataCollectorTestsCoverlets : IntegrationTestBase
+{
+    [TestMethod]
+    public void RunCoverletCoverage()
+    {
+        // REVIEW ME: @Marco do we need to update this test?
+        // Collector is supported only for netcoreapp2.1, is compiled for netcoreapp2.1 and packaged as netstandard
+        if (_testEnvironment.TargetFramework != CoreRunnerFramework)
+        {
+            return;
+        }
+
+        // We use netcoreapp runner
+        // "...\vstest\tools\dotnet\dotnet.exe "...\vstest\artifacts\Debug\net8.0\vstest.console.dll" --collect:"XPlat Code Coverage" ...
+        _testEnvironment.RunnerFramework = CoreRunnerFramework;
+        var resultsDir = new TempDirectory();
+
+        string coverletAdapterPath = Path.GetDirectoryName(Directory.GetFiles(_testEnvironment.GetNugetPackage("coverlet.collector"), "coverlet.collector.dll", SearchOption.AllDirectories).Single())!;
+        string logId = Guid.NewGuid().ToString("N");
+        string assemblyPath = GetAssetFullPath("CoverletCoverageTestProject.dll").Trim('\"');
+        string logPath = Path.Combine(Path.GetDirectoryName(assemblyPath)!, $"coverletcoverage.{logId}.log");
+        string logPathDirectory = Path.GetDirectoryName(logPath)!;
+        string argument = $"--collect:{"XPlat Code Coverage".AddDoubleQuote()} {PrepareArguments(assemblyPath, coverletAdapterPath, "", ".NETCoreApp,Version=v2.1", resultsDirectory: resultsDir.Path)} --diag:{logPath.AddDoubleQuote()}";
+        InvokeVsTest(argument);
+
+        // Verify vstest.console.dll CollectArgumentProcessor fix codeBase for coverlet package
+        // This assert check that we're sure that we've updated collector setting code base with full path,
+        // otherwise without "custom coverlet code" inside ProxyExecutionManager coverlet dll won't be resolved inside testhost.
+        var log = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.log").Single();
+        Assert.IsTrue(File.ReadAllText(log).Contains("CoverletDataCollector in-process codeBase path"));
+
+        // Verify out-of-proc coverlet collector load
+        var dataCollectorLog = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.datacollector*log").Single();
+        Assert.IsTrue(File.ReadAllText(dataCollectorLog).Contains("[coverlet]Initializing CoverletCoverageDataCollector"));
+
+        // Verify in-proc coverlet collector load
+        var hostLog = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.host*log").Single();
+        Assert.IsTrue(File.ReadAllText(hostLog).Contains("[coverlet]Initialize CoverletInProcDataCollector"));
+
+        // Verify default coverage file is generated
+        StdOutputContains("coverage.cobertura.xml");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DebugAssertTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DebugAssertTests.cs
new file mode 100644
index 0000000000..abff214c4a
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DebugAssertTests.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DebugAssertTests : AcceptanceTestBase
+{
+    [TestMethod]
+    // this is core only, there is nothing we can do about TPDebug.Assert crashing the process on framework
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunningTestWithAFailingDebugAssertDoesNotCrashTheHostingProcess(RunnerInfo runnerInfo)
+    {
+        // when debugging this test in case it starts failing, be aware that the default behavior of TPDebug.Assert
+        // is to not crash the process when we are running in debug, and debugger is attached
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("CrashingOnDebugAssertTestProject.dll");
+        var arguments = PrepareArguments(assemblyPath, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+
+        // this will have failed tests when our trace listener works and crash the testhost process when it does not
+        // because crashing processes is what a failed TPDebug.Assert does by default, unless you have a debugger attached
+        ValidateSummaryStatus(passed: 4, failed: 4, 0);
+        StringAssert.Contains(StdOut, "threw exception: Microsoft.VisualStudio.TestPlatform.TestHost.DebugAssertException:");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DeprecateExtensionsPathWarningTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DeprecateExtensionsPathWarningTests.cs
new file mode 100644
index 0000000000..7f0ca13acc
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DeprecateExtensionsPathWarningTests.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class DeprecateExtensionsPathWarningTests : AcceptanceTestBase
+{
+    private readonly IList<string> _adapterDependencies;
+    private readonly IList<string> _copiedFiles;
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        try
+        {
+            foreach (var file in _copiedFiles)
+            {
+                File.Delete(file);
+            }
+        }
+        catch
+        {
+
+        }
+    }
+
+    public DeprecateExtensionsPathWarningTests()
+    {
+        _copiedFiles = new List<string>();
+        var extensionsDir = Path.Combine(Path.GetDirectoryName(GetConsoleRunnerPath())!, "Extensions");
+        _adapterDependencies = Directory.GetFiles(GetTestAdapterPath(), "*.dll", SearchOption.TopDirectoryOnly);
+
+        try
+        {
+            foreach (var file in _adapterDependencies)
+            {
+                var fileCopied = Path.Combine(extensionsDir, Path.GetFileName(file));
+                _copiedFiles.Add(fileCopied);
+                File.Copy(file, fileCopied);
+            }
+        }
+        catch
+        {
+
+        }
+    }
+
+    public override string GetConsoleRunnerPath()
+    {
+        return Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "tools",
+            DEFAULT_RUNNER_NETFX, "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs
new file mode 100644
index 0000000000..debf1e1f3e
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiaSessionTests.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DiaSessionTests : AcceptanceTestBase
+{
+    public static string? GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)
+    {
+        var currentTargetFrameWork = testEnvironment.TargetFramework;
+        testEnvironment.TargetFramework =
+#if NETFRAMEWORK
+            "net462";
+#else
+            "net8.0";
+#endif
+        return currentTargetFrameWork;
+    }
+
+    [TestMethod]
+    public void GetNavigationDataShouldReturnCorrectFileNameAndLineNumber()
+    {
+        var currentTargetFrameWork = GetAndSetTargetFrameWork(_testEnvironment);
+        var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
+
+        var diaSession = new DiaSession(assemblyPath);
+        DiaNavigationData? diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "PassingTest");
+
+        Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
+        StringAssert.EndsWith(diaNavigationData.FileName!.Replace("\\", "/"), @"\SimpleClassLibrary\Class1.cs".Replace("\\", "/"));
+
+        ValidateMinLineNumber(11, diaNavigationData.MinLineNumber);
+        Assert.AreEqual(13, diaNavigationData.MaxLineNumber, "Incorrect max line number");
+
+        _testEnvironment.TargetFramework = currentTargetFrameWork;
+    }
+
+    [TestMethod]
+    public void GetNavigationDataShouldReturnCorrectDataForAsyncMethod()
+    {
+        var currentTargetFrameWork = GetAndSetTargetFrameWork(_testEnvironment);
+        var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
+
+        var diaSession = new DiaSession(assemblyPath);
+        DiaNavigationData? diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1+<AsyncTestMethod>d__1", "MoveNext");
+
+        Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
+        StringAssert.EndsWith(diaNavigationData.FileName!.Replace("\\", "/"), @"\SimpleClassLibrary\Class1.cs".Replace("\\", "/"));
+
+        ValidateMinLineNumber(16, diaNavigationData.MinLineNumber);
+        Assert.AreEqual(18, diaNavigationData.MaxLineNumber, "Incorrect max line number");
+
+        _testEnvironment.TargetFramework = currentTargetFrameWork;
+    }
+
+    [TestMethod]
+    public void GetNavigationDataShouldReturnCorrectDataForOverLoadedMethod()
+    {
+        var currentTargetFrameWork = GetAndSetTargetFrameWork(_testEnvironment);
+        var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
+
+        var diaSession = new DiaSession(assemblyPath);
+        DiaNavigationData? diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "OverLoadedMethod");
+
+        Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
+        StringAssert.EndsWith(diaNavigationData.FileName!.Replace("\\", "/"), @"\SimpleClassLibrary\Class1.cs".Replace("\\", "/"));
+
+        // Weird why DiaSession is now returning the first overloaded method
+        // as compared to before when it used to return second method
+        ValidateLineNumbers(diaNavigationData.MinLineNumber, diaNavigationData.MaxLineNumber);
+
+        _testEnvironment.TargetFramework = currentTargetFrameWork;
+    }
+
+    [TestMethod]
+    public void GetNavigationDataShouldReturnNullForNotExistMethodNameOrNotExistTypeName()
+    {
+        var currentTargetFrameWork = GetAndSetTargetFrameWork(_testEnvironment);
+        var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
+
+        var diaSession = new DiaSession(assemblyPath);
+
+        // Not exist method name
+        DiaNavigationData? diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "NotExistMethod");
+        Assert.IsNull(diaNavigationData);
+
+        // Not Exist Type name
+        diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.NotExistType", "PassingTest");
+        Assert.IsNull(diaNavigationData);
+
+        _testEnvironment.TargetFramework = currentTargetFrameWork;
+    }
+
+    [TestMethod]
+    [Ignore] // TODO: This test tests against a time threshold, which makes it fail on server sometimes.
+    public void DiaSessionPerfTest()
+    {
+        var currentTargetFrameWork = GetAndSetTargetFrameWork(_testEnvironment);
+        var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
+
+        var watch = Stopwatch.StartNew();
+        var diaSession = new DiaSession(assemblyPath);
+        DiaNavigationData? diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.HugeMethodSet", "MSTest_D1_01");
+        watch.Stop();
+
+        Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
+        StringAssert.EndsWith(diaNavigationData.FileName!.Replace("\\", "/"), @"\SimpleClassLibrary\HugeMethodSet.cs".Replace("\\", "/"));
+        ValidateMinLineNumber(9, diaNavigationData.MinLineNumber);
+        Assert.AreEqual(10, diaNavigationData.MaxLineNumber);
+        var expectedTime = 150;
+        Assert.IsTrue(watch.Elapsed.Milliseconds < expectedTime, $"DiaSession Perf test Actual time:{watch.Elapsed.Milliseconds} ms Expected time:{expectedTime} ms");
+
+        _testEnvironment.TargetFramework = currentTargetFrameWork;
+    }
+
+    private static void ValidateLineNumbers(int min, int max)
+    {
+        // Release builds optimize code, hence min line numbers are different.
+        if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.AreEqual(min, max, "Incorrect min line number");
+        }
+        else
+        {
+            if (max == 22)
+            {
+                Assert.AreEqual(min + 1, max, "Incorrect min line number");
+            }
+            else if (max == 26)
+            {
+                Assert.AreEqual(min + 1, max, "Incorrect min line number");
+            }
+            else
+            {
+                Assert.Fail($"Incorrect min/max line number. Expected Max to be 22 or 26. And Min to be 21 or 25. But Min was {min}, and Max was {max}.");
+            }
+        }
+    }
+
+    private static void ValidateMinLineNumber(int expected, int actual)
+    {
+        // Release builds optimize code, hence min line numbers are different.
+        if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.AreEqual(expected + 1, actual, "Incorrect min line number");
+        }
+        else
+        {
+            Assert.AreEqual(expected, actual, "Incorrect min line number");
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DifferentTestFrameworkSimpleTests.cs
new file mode 100644
index 0000000000..cde8909ee8
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DifferentTestFrameworkSimpleTests.cs
@@ -0,0 +1,202 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void NonDllRunAllTestExecution(RunnerInfo runnerInfo)
+    {
+        // This used to test Chutzpah, to prove that we can run tests that are not shipped in dlls.
+        // But that framework is not fixing vulnerable dependencies for a long time, so we use our custom, test adapter
+        // that simply returns 1 discovered test on discovery, and 1 passed test on execution.
+        // We do not really test that we can run JavaScript tests, but we test that we can trigger tests that are not shipped
+        // in a dll, and pick up the provided test adapter.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        string fileName = "test.js";
+        var testJSFileAbsolutePath = Path.Combine(_testEnvironment.TestAssetsPath, fileName);
+        string tempPath = Path.Combine(TempDirectory.Path, fileName);
+        File.Copy(testJSFileAbsolutePath, tempPath);
+        var arguments = PrepareArguments(tempPath, GetTestAdapterPath(UnitTestFramework.NonDll), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    // vstest.console is x64 now, but x86 run "in process" run should still succeed by being run in x86 testhost
+    // Skip .NET (Core) tests because we test them below.
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)]
+    public void CPPRunAllTestExecutionNetFramework(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        CppRunAllTests("x86");
+    }
+
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    // vstest.console is 64-bit now, run in process to test the 64-bit native dll
+    // Skip .NET (Core) tests because we test them below.
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)]
+    public void CPPRunAllTestExecutionPlatformx64NetFramework(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        CppRunAllTests("x64");
+    }
+
+    [TestMethod]
+    [Ignore("TODO: this does not work in already shipped dotnet test either, investigate")]
+    // C++ tests cannot run in .NET Framework host under .NET Core, because we only ship .NET Standard CPP adapter in .NET Core
+    // We also don't test x86 for .NET Core, because the resolver there does not switch between x86 and x64 correctly, it just uses the parent process bitness.
+    // We run this on netcore31 and not the default netcore21 because netcore31 is the minimum tfm that has the runtime features we need, such as additionaldeps.
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false, useCoreRunner: true)]
+    public void CPPRunAllTestExecutionPlatformx64Net(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        CppRunAllTests("x64");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [Ignore("After the bump of TestPlatformRemoteExternalsVersion to 17.6 it doesn't work anymore, it's a test for the legacy platform and fails for wrong Microsoft.VisualStudio.Telemetry version.")]
+    public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
+    {
+        if (!IsCI)
+        {
+            Assert.Inconclusive("This works on server but not locally, because locally it grabs old dll from GAC, but has version 10.0.0 as the one in our package.");
+        }
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var runSettingsFilePath = Path.Combine(TempDirectory.Path, Guid.NewGuid() + ".runsettings");
+
+        //test the iterationCount setting for WebTestRunConfiguration in run settings
+        var runSettingsXml = $@"<?xml version='1.0' encoding='utf-8'?>
+                                <RunSettings>
+                                    <WebTestRunConfiguration iterationCount='5' />
+                                    <RunConfiguration>
+                                        <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
+                                    </RunConfiguration>
+                                </RunSettings>";
+
+        CreateRunSettingsFile(runSettingsFilePath, runSettingsXml);
+
+        //therefore, the test will run for 5 iterations resulting in web test result file size of at least 150 KB
+        var minWebTestResultFileSizeInKB = 150;
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("WebTests tests not supported with .NET Core runner.");
+            return;
+        }
+
+        string assemblyRelativePath =
+            @"microsoft.testplatform.qtools.assets\2.0.0\contentFiles\any\any\WebTestAssets\WebTest1.webtest";
+
+        var assemblyAbsolutePath = Path.Combine(_testEnvironment.PackageDirectory, assemblyRelativePath);
+        using var resultsDirectory = TempDirectory;
+        var arguments = PrepareArguments(
+            assemblyAbsolutePath,
+            string.Empty,
+            runSettingsFilePath, FrameworkArgValue, string.Empty, resultsDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+
+        if (minWebTestResultFileSizeInKB > 0)
+        {
+            var dirInfo = new DirectoryInfo(resultsDirectory.Path);
+            var webtestResultFile = "WebTest1.webtestResult";
+            var files = dirInfo.GetFiles(webtestResultFile, SearchOption.AllDirectories);
+            Assert.IsTrue(files.Length > 0, $"File {webtestResultFile} not found under results directory {resultsDirectory}");
+
+            var fileSizeInKB = files[0].Length / 1024;
+            Assert.IsTrue(fileSizeInKB > minWebTestResultFileSizeInKB, $"Size of the file {webtestResultFile} is {fileSizeInKB} KB. It is not greater than {minWebTestResultFileSizeInKB} KB indicating iterationCount in run settings not honored.");
+        }
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    [Ignore("Test expects .NETFramework,Version=v4.5.2 support but the minimum one is .NETFramework,Version=v4.6.2")]
+    public void CodedWebTestRunAllTests(RunnerInfo runnerInfo)
+    {
+        if (!IsCI)
+        {
+            Assert.Inconclusive("This works on server but not locally, because locally it grabs old dll from GAC, but has version 10.0.0 as the one in our package.");
+        }
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("WebTests tests not supported with .NET Core runner.");
+            return;
+        }
+
+        string assemblyRelativePath = @"microsoft.testplatform.qtools.assets\2.0.0\contentFiles\any\any\WebTestAssets\BingWebTest.dll";
+        var assemblyAbsolutePath = Path.Combine(_testEnvironment.PackageDirectory, assemblyRelativePath);
+        var arguments = PrepareArguments(
+            assemblyAbsolutePath,
+            string.Empty,
+            string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void NUnitRunAllTestExecution(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetAssetFullPath("NUTestProject.dll"),
+            null, // GetTestAdapterPath(UnitTestFramework.NUnit),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void XUnitRunAllTestExecution(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        string testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll");
+        var arguments = PrepareArguments(
+            testAssemblyPath,
+            GetTestAdapterPath(UnitTestFramework.XUnit),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 0);
+    }
+
+    private void CppRunAllTests(string platform)
+    {
+        string assemblyRelativePathFormat = @"microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\{0}\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
+        var assemblyRelativePath = platform.Equals("x64", StringComparison.OrdinalIgnoreCase)
+            ? string.Format(CultureInfo.CurrentCulture, assemblyRelativePathFormat, platform)
+            : string.Format(CultureInfo.CurrentCulture, assemblyRelativePathFormat, "");
+        var assemblyAbsolutePath = Path.Combine(_testEnvironment.PackageDirectory, assemblyRelativePath);
+        var arguments = PrepareArguments(assemblyAbsolutePath, string.Empty, string.Empty, FrameworkArgValue, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DisableAppdomainTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DisableAppdomainTests.cs
new file mode 100644
index 0000000000..ba8b103749
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DisableAppdomainTests.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows")]
+public class DisableAppdomainTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [TestCategory("Windows")]
+    [NetFullTargetFrameworkDataSource]
+    public void DisableAppdomainTest(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var diableAppdomainTest1 = _testEnvironment.GetTestAsset("DisableAppdomainTest1.dll", Net462TargetFramework);
+        var diableAppdomainTest2 = _testEnvironment.GetTestAsset("DisableAppdomainTest2.dll", Net462TargetFramework);
+
+        RunTests(runnerInfo, $"{diableAppdomainTest1}\" \"{diableAppdomainTest2}", 2);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    [NetFullTargetFrameworkDataSource]
+    public void NewtonSoftDependencyWithDisableAppdomainTest(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var newtonSoftDependnecyTest = _testEnvironment.GetTestAsset("NewtonSoftDependency.dll", Net462TargetFramework);
+
+        RunTests(runnerInfo, newtonSoftDependnecyTest, 1);
+    }
+
+    private void RunTests(RunnerInfo runnerInfo, string testAssembly, int passedTestCount)
+    {
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("This test is not meant for .netcore.");
+            return;
+        }
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "DisableAppDomain", "true" }
+        };
+
+        var arguments = PrepareArguments(
+            testAssembly,
+            string.Empty,
+            GetRunsettingsFilePath(TempDirectory, runConfigurationDictionary),
+            FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(passedTestCount, 0, 0);
+    }
+
+    private static string GetRunsettingsFilePath(TempDirectory tempDirectory, Dictionary<string, string> runConfigurationDictionary)
+    {
+        var runsettingsPath = Path.Combine(tempDirectory.Path, $"test_{Guid.NewGuid()}.runsettings");
+        CreateRunSettingsFile(runsettingsPath, runConfigurationDictionary);
+        return runsettingsPath;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiscoveryTests.cs
new file mode 100644
index 0000000000..5fc1cd39a3
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DiscoveryTests.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DiscoveryTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverAllTests(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTestForDiscovery(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue);
+
+        var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
+        ValidateDiscoveredTests(listOfTests);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void MultipleSourcesDiscoverAllTests(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll");
+        var listOfTests = new[] {
+            "SampleUnitTestProject.UnitTest1.PassingTest",
+            "SampleUnitTestProject.UnitTest1.FailingTest",
+            "SampleUnitTestProject.UnitTest1.SkippingTest",
+            "SampleUnitTestProject.UnitTest1.PassingTest2",
+            "SampleUnitTestProject.UnitTest1.FailingTest2",
+            "SampleUnitTestProject.UnitTest1.SkippingTest2"
+        };
+
+        InvokeVsTestForDiscovery(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue);
+
+        ValidateDiscoveredTests(listOfTests);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void DiscoverFullyQualifiedTests(RunnerInfo runnerInfo)
+    {
+        var dummyFilePath = Path.Combine(TempDirectory.Path, $"{Guid.NewGuid()}.txt");
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /ListFullyQualifiedTests", " /ListTestsTargetPath:\"" + dummyFilePath + "\"");
+        InvokeVsTest(arguments);
+
+        ValidateFullyQualifiedDiscoveredTests(dummyFilePath, listOfTests);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsShouldShowProperWarningIfNoTestsOnTestCaseFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assetFullPath = GetAssetFullPath("SimpleTestProject2.dll");
+        var arguments = PrepareArguments(assetFullPath, GetTestAdapterPath(), string.Empty, FrameworkArgValue, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /listtests");
+        arguments = string.Concat(arguments, " /testcasefilter:NonExistTestCaseName");
+        arguments = string.Concat(arguments, " /logger:\"console;prefix=true\"");
+        InvokeVsTest(arguments);
+
+        StringAssert.Contains(StdOut, "Warning: No test matches the given testcase filter `NonExistTestCaseName` in");
+        StringAssert.Contains(StdOut, "SimpleTestProject2.dll");
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    public void TypesToLoadAttributeTests()
+    {
+        var extensionsDirectory = IntegrationTestEnvironment.ExtensionsDirectory;
+        var extensionsToVerify = new Dictionary<string, string[]>
+        {
+            {"Microsoft.TestPlatform.Extensions.EventLogCollector.dll", ["Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector"] },
+            {"Microsoft.TestPlatform.Extensions.BlameDataCollector.dll", ["Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger", "Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector"] },
+            {"Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll", ["Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger"] },
+            {"Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", ["Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger"] },
+            {"Microsoft.TestPlatform.TestHostRuntimeProvider.dll", ["Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager", "Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager"]
+            }
+        };
+
+        foreach (var extension in extensionsToVerify.Keys)
+        {
+            var assemblyFile = Path.Combine(extensionsDirectory, extension);
+            var assembly = Assembly.LoadFrom(assemblyFile);
+
+            var expected = extensionsToVerify[extension];
+            var actual = TypesToLoadUtilities.GetTypesToLoad(assembly).Select(i => i.FullName).ToArray();
+
+            CollectionAssert.AreEquivalent(expected, actual, $"Specified types using TypesToLoadAttribute in \"{extension}\" assembly doesn't match the expected.");
+        }
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void DiscoverTestsShouldSucceedWhenAtLeastOneDllFindsRuntimeProvider(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testDll = GetAssetFullPath("MSTestProject1.dll");
+        var nonTestDll = GetTestDllForFramework("NetStandard2Library.dll", "netstandard2.0");
+
+        var testAndNonTestDll = new[] { testDll, nonTestDll };
+        var quotedDlls = string.Join(" ", testAndNonTestDll.Select(a => a.AddDoubleQuote()));
+
+        var arguments = PrepareArguments(quotedDlls, GetTestAdapterPath(), string.Empty, framework: string.Empty, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /listtests");
+        arguments = string.Concat(arguments, " /logger:\"console;prefix=true\"");
+        InvokeVsTest(arguments);
+
+        StringAssert.Contains(StdOut, $"Skipping source: {nonTestDll} (.NETStandard,Version=v2.0,");
+
+        ExitCodeEquals(0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.Windows.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.Windows.cs
new file mode 100644
index 0000000000..f14d48f54c
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.Windows.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if !NETFRAMEWORK
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class DotnetArchitectureSwitchTestsWindowsOnly : AcceptanceTestBase
+{
+    [TestMethod]
+    [DataRow("X64", "X86")]
+    // TODO: This test does not work on server, it occasionally fails with cryptic message around not being able to load MSBuild.Tasks.
+    // [DataRow("X86", "X64")]
+    public void Use_EnvironmentVariables(string architectureFrom, string architectureTo)
+    {
+        SetTestEnvironment(_testEnvironment, new RunnerInfo { RunnerFramework = DEFAULT_RUNNER_NETCORE });
+        string dotnetPath = GetDownloadedDotnetMuxerFromTools(architectureFrom);
+        string dotnetPathTo = GetDownloadedDotnetMuxerFromTools(architectureTo);
+        var vstestConsolePath = GetDotnetRunnerPath();
+        var dotnetRunnerPath = TempDirectory.CreateDirectory("dotnetrunner");
+        TempDirectory.CopyDirectory(new DirectoryInfo(Path.GetDirectoryName(vstestConsolePath)!), dotnetRunnerPath);
+
+        // Patch the runner
+        string sdkVersion = GetLatestSdkVersion(dotnetPath);
+        string runtimeConfigFile = Path.Combine(dotnetRunnerPath.FullName, "vstest.console.runtimeconfig.json");
+        JObject patchRuntimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigFile));
+        patchRuntimeConfig!["runtimeOptions"]!["framework"]!["version"] = sdkVersion;
+        File.WriteAllText(runtimeConfigFile, patchRuntimeConfig.ToString());
+
+        var environmentVariables = new Dictionary<string, string?>
+        {
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
+            [$"DOTNET_ROOT_{architectureTo}"] = Path.GetDirectoryName(dotnetPathTo)!,
+            ["ExpectedArchitecture"] = architectureTo
+        };
+
+        if (architectureTo == "X86")
+        {
+            environmentVariables.Add("DOTNET_ROOT(x86)", Path.GetDirectoryName(dotnetPathTo)!);
+        }
+        ExecuteApplication(dotnetPath, "new mstest", out _, out string _, out _, environmentVariables, TempDirectory.Path);
+
+        // Patch test file
+        File.WriteAllText(Path.Combine(TempDirectory.Path, "UnitTest1.cs"),
+@"
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace cfebbc5339cf4c22854e79824e938c74;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+        Assert.AreEqual(Environment.GetEnvironmentVariable(""ExpectedArchitecture""), System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString());
+    }
+}");
+
+        ExecuteApplication(dotnetPath, $"test -p:VsTestConsolePath=\"{Path.Combine(dotnetRunnerPath.FullName, Path.GetFileName(vstestConsolePath))}\" --arch {architectureTo.ToLower(CultureInfo.InvariantCulture)} --diag:log.txt", out string stdOut, out _, out int exitCode, environmentVariables, TempDirectory.Path);
+        Assert.AreEqual(0, exitCode, stdOut);
+
+        environmentVariables = new Dictionary<string, string?>
+        {
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
+            ["DOTNET_ROOT"] = Path.GetDirectoryName(dotnetPathTo),
+            ["ExpectedArchitecture"] = architectureTo
+        };
+
+        if (architectureTo == "X86")
+        {
+            environmentVariables.Add("DOTNET_ROOT(x86)", Path.GetDirectoryName(dotnetPathTo)!);
+        }
+        ExecuteApplication(dotnetPath, $"test -p:VsTestConsolePath=\"{Path.Combine(dotnetRunnerPath.FullName, Path.GetFileName(vstestConsolePath))}\" --arch {architectureTo.ToLower(CultureInfo.InvariantCulture)} --diag:log.txt", out stdOut, out _, out exitCode, environmentVariables, TempDirectory.Path);
+        Assert.AreEqual(0, exitCode, stdOut);
+
+        environmentVariables = new Dictionary<string, string?>
+        {
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
+            [$"DOTNET_ROOT_{architectureTo}"] = Path.GetDirectoryName(dotnetPathTo),
+            ["DOTNET_ROOT"] = "WE SHOULD PICK THE ABOVE ONE BEFORE FALLBACK TO DOTNET_ROOT",
+            ["ExpectedArchitecture"] = architectureTo
+        };
+
+        if (architectureTo == "X86")
+        {
+            environmentVariables.Add("DOTNET_ROOT(x86)", Path.GetDirectoryName(dotnetPathTo)!);
+        }
+        ExecuteApplication(dotnetPath, $"test -p:VsTestConsolePath=\"{Path.Combine(dotnetRunnerPath.FullName, Path.GetFileName(vstestConsolePath))}\" --arch {architectureTo.ToLower(CultureInfo.InvariantCulture)} --diag:log.txt", out stdOut, out _, out exitCode, environmentVariables, TempDirectory.Path);
+        Assert.AreEqual(0, exitCode, stdOut);
+    }
+
+    private static string GetLatestSdkVersion(string dotnetPath)
+        => Path.GetFileName(Directory.GetDirectories(Path.Combine(Path.GetDirectoryName(dotnetPath)!, @"shared/Microsoft.NETCore.App")).OrderByDescending(x => x).First());
+}
+
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs
new file mode 100644
index 0000000000..670e4cf715
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetArchitectureSwitchTests.cs
@@ -0,0 +1,332 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if !NETFRAMEWORK
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+// This tests need specific sdks to be installed on arm machine
+// >= ARM 6.0.2xx
+// >= x64 6.0.2xx
+// x64 5.0.4xx for Mac
+// x64 3.1.4XX for Win
+// Manual test './tools/.../dotnet test ./test/Microsoft.TestPlatform.AcceptanceTests/bin/Debug/net8.0/Microsoft.TestPlatform.AcceptanceTests.dll --testcasefilter:"DotnetArchitectureSwitchTests"'
+[TestClass]
+[Ignore("Manual tests(for now). Tests in this class need some .NET SDK global installations")]
+public class DotnetArchitectureSwitchTests : AcceptanceTestBase
+{
+    private static string s_privateX64Installation = string.Empty;
+
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext _)
+    {
+        s_privateX64Installation = Path.Combine(new TempDirectory().Path, "x64");
+        CopyAll(new DirectoryInfo(GetX64InstallationFolder), new DirectoryInfo(s_privateX64Installation));
+    }
+
+    [ClassCleanup]
+    public static void ClassCleanup()
+    {
+        // Remove one level up because we are targeting a sub-folder of the temp directory.
+        TempDirectory.TryRemoveDirectory(new DirectoryInfo(s_privateX64Installation).Parent!.FullName);
+    }
+
+    [TestMethod]
+    public void GlobalInstallation()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return;
+        }
+
+        var projectName = "ArchitectureSwitch.csproj";
+        var projectPath = GetProjectFullPath(projectName);
+        var projectDirectory = Path.GetDirectoryName(projectPath);
+
+        var env = new Dictionary<string, string?>
+            {
+                { "DOTNET_ROOT", null },
+                { "DOTNET_MULTILEVEL_LOOKUP", "0" }
+            };
+
+        // Verify native architecture
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            Assert.IsTrue(stdOut.Contains("Runtime location: /usr/local/share/dotnet/shared/Microsoft.NETCore.App"));
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            Assert.IsTrue(stdOut.Contains($@"Runtime location: {Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\shared\Microsoft.NETCore.App"));
+        }
+        Assert.IsTrue(stdOut.Contains("OSArchitecture: ARM64"));
+        Assert.IsTrue(stdOut.Contains("ProcessArchitecture: ARM64"));
+
+
+        // Verify switch using csproj
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        // Verify switch using test container
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {buildAssemblyPath} --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        static void AssertSwitch(string output)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                Assert.IsTrue(output.Contains("Runtime location: /usr/local/share/dotnet/x64/shared/Microsoft.NETCore.App"));
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                Assert.IsTrue(output.Contains($@"Runtime location: {Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\x64\shared\Microsoft.NETCore.App"));
+            }
+            Assert.IsTrue(output.Contains("OSArchitecture: X64"));
+            Assert.IsTrue(output.Contains("ProcessArchitecture: X64"));
+        }
+    }
+
+    [TestMethod]
+    [DataRow(true, false)]
+    [DataRow(false, true)]
+    public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX64)
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return;
+        }
+
+        var env = new Dictionary<string, string?>
+        {
+            ["DOTNET_ROOT"] = null,
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+        };
+
+        var projectName = "ArchitectureSwitch.csproj";
+        var projectPath = GetProjectFullPath(projectName);
+        var projectDirectory = Path.GetDirectoryName(projectPath);
+
+        // Verify native architecture
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            Assert.IsTrue(stdOut.Contains("Runtime location: /usr/local/share/dotnet/shared/Microsoft.NETCore.App"), "Unexpected runtime location");
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            Assert.IsTrue(stdOut.Contains($@"Runtime location: {Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\shared\Microsoft.NETCore.App"));
+        }
+        Assert.IsTrue(stdOut.Contains("OSArchitecture: ARM64"), "Unexpected OSArchitecture");
+        Assert.IsTrue(stdOut.Contains("ProcessArchitecture: ARM64"), "Unexpected ProcessArchitecture");
+
+        env.Clear();
+        env["DOTNET_ROOT"] = null;
+        env["DOTNET_MULTILEVEL_LOOKUP"] = "0";
+        if (dotnetRoot)
+        {
+            env["DOTNET_ROOT"] = s_privateX64Installation;
+        }
+
+        if (dotnetRootX64)
+        {
+            env.Add("DOTNET_ROOT_X64", s_privateX64Installation);
+        }
+
+        // Verify switch using csproj
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        // Verify switch using test container
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch x64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        void AssertSwitch(string output)
+        {
+            Assert.IsTrue(Regex.IsMatch(output.Replace(@"\", "/"), $"Runtime location: .*{s_privateX64Installation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
+            Assert.IsTrue(output.Contains("OSArchitecture: X64"), "Unexpected OSArchitecture");
+            Assert.IsTrue(output.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
+            Assert.IsTrue(!dotnetRoot || output.Contains($"DOTNET_ROOT: {s_privateX64Installation}"), "Unexpected DOTNET_ROOT var");
+            Assert.IsTrue(!dotnetRootX64 || output.Contains($"DOTNET_ROOT_X64: {s_privateX64Installation}"), "Unexpected DOTNET_ROOT_X64 var");
+        }
+    }
+
+    [TestMethod]
+    public void PrivateX64BuildToGlobalArmInstallation()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return;
+        }
+
+        var env = new Dictionary<string, string?>
+        {
+            ["DOTNET_ROOT"] = null,
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+        };
+        string privateInstallationMuxer = Path.Combine(s_privateX64Installation, GetMuxerName);
+
+        var projectName = "ArchitectureSwitch.csproj";
+        var projectPath = GetProjectFullPath(projectName);
+        var projectDirectory = Path.GetDirectoryName(projectPath);
+
+        // Verify native architecture
+        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
+        Assert.IsTrue(Regex.IsMatch(stdOut.Replace(@"\", "/"), $"Runtime location: .*{s_privateX64Installation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
+        Assert.IsTrue(stdOut.Contains("OSArchitecture: X64"), "Unexpected OSArchitecture");
+        Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
+
+        // Verify switch using csproj
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        // Verify switch using test container
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        static void AssertSwitch(string output)
+        {
+            Assert.IsTrue(Regex.IsMatch(output.Replace(@"\", "/"), $"Runtime location: .*{GetDefaultLocation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
+            Assert.IsTrue(output.Contains("OSArchitecture: ARM64"), "Unexpected OSArchitecture");
+            Assert.IsTrue(output.Contains("ProcessArchitecture: ARM64"), "Unexpected ProcessArchitecture");
+        }
+    }
+
+    [TestMethod]
+    [DataRow(true, false)]
+    [DataRow(false, true)]
+    public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootArm64)
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return;
+        }
+
+        var env = new Dictionary<string, string?>
+        {
+            ["DOTNET_ROOT"] = null,
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+        };
+        string privateInstallationMuxer = Path.Combine(s_privateX64Installation, GetMuxerName);
+
+        var projectName = "ArchitectureSwitch.csproj";
+        var projectPath = GetProjectFullPath(projectName);
+        var projectDirectory = Path.GetDirectoryName(projectPath);
+
+        // Verify native architecture
+        ExecuteApplication(privateInstallationMuxer, $"test {projectPath} --framework net8.0", out string stdOut, out _, out _, env, projectDirectory);
+        Assert.IsTrue(Regex.IsMatch(stdOut.Replace(@"\", "/"), $"Runtime location: .*{s_privateX64Installation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
+        Assert.IsTrue(stdOut.Contains("OSArchitecture: X64"), "Unexpected OSArchitecture");
+        Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
+
+        env.Clear();
+        env["DOTNET_ROOT"] = null;
+        env["DOTNET_MULTILEVEL_LOOKUP"] = "0";
+        if (dotnetRoot)
+        {
+            env["DOTNET_ROOT"] = GetDefaultLocation;
+        }
+
+        if (dotnetRootArm64)
+        {
+            env["DOTNET_ROOT_ARM64"] = GetDefaultLocation;
+        }
+
+        // Verify switch using csproj
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        // Verify switch using test container
+        var buildAssemblyPath = GetTestDllForFramework("ArchitectureSwitch.dll", "net8.0");
+        ExecuteApplication($"{s_privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net8.0 --arch arm64", out stdOut, out _, out _, env, projectDirectory);
+        AssertSwitch(stdOut);
+
+        void AssertSwitch(string output)
+        {
+            Assert.IsTrue(Regex.IsMatch(output.Replace(@"\", "/"), $"Runtime location: .*{GetDefaultLocation.Replace(@"\", "/")}.*shared.*Microsoft.NETCore.App"), "Unexpected runtime location");
+            Assert.IsTrue(output.Contains("OSArchitecture: ARM64"), "Unexpected OSArchitecture");
+            Assert.IsTrue(output.Contains("ProcessArchitecture: ARM64"), "Unexpected ProcessArchitecture");
+            Assert.IsTrue(!dotnetRoot || output.Contains($"DOTNET_ROOT: {GetDefaultLocation}"), "Unexpected DOTNET_ROOT var");
+            Assert.IsTrue(!dotnetRootArm64 || output.Contains($"DOTNET_ROOT_ARM64: {GetDefaultLocation}"), "Unexpected DOTNET_ROOT_ARM64 var");
+        }
+    }
+
+    [TestMethod]
+    public void SilentlyForceX64()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return;
+        }
+
+        var projectName = "ArchitectureSwitch.csproj";
+        var projectPath = GetProjectFullPath(projectName);
+        var projectDirectory = Path.GetDirectoryName(projectPath);
+
+        var env = new Dictionary<string, string?>
+        {
+            ["DOTNET_ROOT"] = null,
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
+        };
+        ExecuteApplication(GetDefaultDotnetMuxerLocation, $"test {projectPath} --framework {GetFrameworkVersionToForceToX64}", out string stdOut, out _, out _, env, projectDirectory);
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            Assert.IsTrue(stdOut.Contains("Runtime location: /usr/local/share/dotnet/x64/shared/Microsoft.NETCore.App"));
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            Assert.IsTrue(stdOut.Contains($@"Runtime location: {Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\x64\shared\Microsoft.NETCore.App"));
+        }
+        Assert.IsTrue(stdOut.Contains("OSArchitecture: X64"));
+        Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"));
+    }
+
+    private static string GetMuxerName => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "dotnet" : "dotnet.exe";
+
+    private static string GetX64InstallationFolder => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+        "/usr/local/share/dotnet/x64" :
+        $@"{Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet\x64";
+
+    private static string GetFrameworkVersionToForceToX64 => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+        "net9.0" :
+        "net8.0";
+
+    private static string GetDefaultLocation => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+        $"/usr/local/share/dotnet" :
+        $@"{Environment.ExpandEnvironmentVariables("%ProgramFiles%")}\dotnet";
+
+    private static string GetDefaultDotnetMuxerLocation => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ?
+        $"{GetDefaultLocation}/{GetMuxerName}" :
+        $@"{GetDefaultLocation}\{GetMuxerName}";
+
+    private static void CopyAll(DirectoryInfo source, DirectoryInfo target)
+    {
+        Directory.CreateDirectory(target.FullName);
+
+        // Copy each file into the new directory.
+        foreach (FileInfo fi in source.GetFiles())
+        {
+            fi.CopyTo(Path.Combine(target.FullName, fi.Name), true);
+        }
+
+        // Copy each subdirectory using recursion.
+        foreach (DirectoryInfo diSourceSubDir in source.GetDirectories())
+        {
+            DirectoryInfo nextTargetSubDir =
+                target.CreateSubdirectory(diSourceSubDir.Name);
+            CopyAll(diSourceSubDir, nextTargetSubDir);
+        }
+    }
+}
+
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs
new file mode 100644
index 0000000000..04e6e08c3f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetHostArchitectureVerifierTests.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+// On Linux/Mac we don't download the same .NET SDK bundles
+[TestCategory("Windows-Review")]
+public class DotnetHostArchitectureVerifierTests : IntegrationTestBase
+{
+    [TestMethod]
+    [DataRow("X64")]
+    // TODO: this test fails with " Determining projects to restore... .error MSB4062: The "CheckIfPackageReferenceShouldBeFrameworkReference" task could not be loaded from the assembly Microsoft.NET.Build.Tasks.dll.Could not load file or assembly. Format of the executable(.exe) or library(.dll) is invalid.Confirm that the<UsingTask> declaration is correct, that the assembly and all its dependencies are available,"
+    // [DataRow("X86")]
+    public void VerifyHostArchitecture(string architecture)
+    {
+        _testEnvironment.RunnerFramework = "net8.0";
+        string dotnetPath = GetDownloadedDotnetMuxerFromTools(architecture);
+        var vstestConsolePath = GetDotnetRunnerPath();
+        var dotnetRunnerPath = TempDirectory.CreateDirectory("dotnetrunner");
+        TempDirectory.CopyDirectory(new DirectoryInfo(Path.GetDirectoryName(vstestConsolePath)!), dotnetRunnerPath);
+
+        // Patch the runner
+        string sdkVersion = GetLatestSdkVersion(dotnetPath);
+        string runtimeConfigFile = Path.Combine(dotnetRunnerPath.FullName, "vstest.console.runtimeconfig.json");
+        JObject patchRuntimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigFile));
+        patchRuntimeConfig!["runtimeOptions"]!["framework"]!["version"] = sdkVersion;
+        File.WriteAllText(runtimeConfigFile, patchRuntimeConfig.ToString());
+
+        var environmentVariables = new Dictionary<string, string?>
+        {
+            ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
+            ["ExpectedArchitecture"] = architecture
+        };
+
+        ExecuteApplication(dotnetPath, "new mstest", out _, out _, out _, environmentVariables, TempDirectory.Path);
+
+        // Patch test file
+        File.WriteAllText(Path.Combine(TempDirectory.Path, "UnitTest1.cs"),
+@"
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace cfebbc5339cf4c22854e79824e938c74;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
+    {
+        Assert.AreEqual(Environment.GetEnvironmentVariable(""ExpectedArchitecture""), System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString());
+    }
+}");
+
+        ExecuteApplication(dotnetPath, $"test -p:VsTestConsolePath=\"{Path.Combine(dotnetRunnerPath.FullName, Path.GetFileName(vstestConsolePath))}\"", out string stdOut, out _, out int exitCode, environmentVariables, TempDirectory.Path);
+        Assert.AreEqual(0, exitCode, stdOut);
+    }
+
+    private static string GetLatestSdkVersion(string dotnetPath)
+        => Path.GetFileName(Directory.GetDirectories(Path.Combine(Path.GetDirectoryName(dotnetPath)!, @"shared/Microsoft.NETCore.App")).OrderByDescending(x => x).First());
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs
new file mode 100644
index 0000000000..995ee1e133
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestMSBuildOutputTests.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// Running dotnet test + csproj and using MSBuild for the output.
+/// </summary>
+[TestClass]
+public class DotnetTestMSBuildOutputTests : AcceptanceTestBase
+{
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void MSBuildLoggerCanBeEnabledByBuildPropertyAndDoesNotEatSpecialChars(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectPath = GetIsolatedTestAsset("TerminalLoggerTestProject.csproj");
+        // Forcing terminal logger so we can see the output when it is redirected
+        InvokeDotnetTest($@"{projectPath} -tl:on -nodereuse:false /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", workingDirectory: Path.GetDirectoryName(projectPath));
+
+        // The output:
+        // Determining projects to restore...
+        //   Restored C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj (in 441 ms).
+        //   SimpleTestProject -> C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\artifacts\bin\TestAssets\SimpleTestProject\Debug\net462\SimpleTestProject.dll
+        //   SimpleTestProject -> C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\artifacts\bin\TestAssets\SimpleTestProject\Debug\net8.0\SimpleTestProject.dll
+        // C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\UnitTest1.cs(41): error VSTEST1: (FailingTest) SampleUnitTestProject.UnitTest1.FailingTest() Assert.AreEqual failed. Expected:<2>. Actual:<3>.  [C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj::TargetFramework=net462]
+        // C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\UnitTest1.cs(41): error VSTEST1: (FailingTest) SampleUnitTestProject.UnitTest1.FailingTest() Assert.AreEqual failed. Expected:<2>. Actual:<3>.  [C:\Users\nohwnd\AppData\Local\Temp\vstest\xvoVt\SimpleTestProject.csproj::TargetFramework=net8.0]
+
+        StdOutputContains("TESTERROR");
+        StdOutputContains("FailingTest (");
+        StdOutputContains("): Error Message: Assert.AreEqual failed. Expected:<ğğğ𦮙我們剛才從𓋴𓅓𓏏𓇏𓇌𓀀>. Actual:<not the same>.");
+        StdOutputContains("at TerminalLoggerUnitTests.UnitTest1.FailingTest() in");
+        // We are sending those as low prio messages, they won't show up on screen but will be in binlog.
+        //StdOutputContains("passed PassingTest");
+        //StdOutputContains("skipped SkippingTest");
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void MSBuildLoggerCanBeDisabledByBuildProperty(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectPath = GetIsolatedTestAsset("TerminalLoggerTestProject.csproj");
+        InvokeDotnetTest($@"{projectPath} -nodereuse:false /p:VsTestUseMSBuildOutput=false /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", workingDirectory: Path.GetDirectoryName(projectPath));
+
+        // Check that we see the summary that is printed from the console logger, meaning the new output is disabled.
+        StdOutputContains("Failed! - Failed: 1, Passed: 1, Skipped: 1, Total: 3, Duration:");
+        // We are sending those as low prio messages, they won't show up on screen but will be in binlog.
+        //StdOutputContains("passed PassingTest");
+        //StdOutputContains("skipped SkippingTest");
+        ExitCodeEquals(1);
+    }
+
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void MSBuildLoggerCanBeDisabledByEnvironmentVariableProperty(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectPath = GetIsolatedTestAsset("TerminalLoggerTestProject.csproj");
+        InvokeDotnetTest($@"{projectPath} -nodereuse:false /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", environmentVariables: new Dictionary<string, string?> { ["MSBUILDENSURESTDOUTFORTASKPROCESSES"] = "1" }, workingDirectory: Path.GetDirectoryName(projectPath));
+
+        // Check that we see the summary that is printed from the console logger, meaning the new output is disabled.
+        StdOutputContains("Failed! - Failed: 1, Passed: 1, Skipped: 1, Total: 3, Duration:");
+
+        ExitCodeEquals(1);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestTests.cs
new file mode 100644
index 0000000000..86f0dd308c
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/DotnetTestTests.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class DotnetTestTests : AcceptanceTestBase
+{
+    private static string GetFinalVersion(string version)
+    {
+        var end = version.IndexOf("-release");
+        return (end >= 0) ? version.Substring(0, end) : version;
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunDotnetTestWithCsproj(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectPath = GetIsolatedTestAsset("SimpleTestProject.csproj");
+        InvokeDotnetTest($@"{projectPath} -p:VSTestUseMSBuildOutput=false --logger:""Console;Verbosity=normal"" /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", workingDirectory: Path.GetDirectoryName(projectPath));
+
+        // ensure our dev version is used
+        StdOutputContains(GetFinalVersion(IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion));
+        ValidateSummaryStatus(1, 1, 1);
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunDotnetTestWithDll(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("SimpleTestProject.dll");
+        InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal""", workingDirectory: Path.GetDirectoryName(assemblyPath));
+
+        // ensure our dev version is used
+        StdOutputContains(GetFinalVersion(IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion));
+        ValidateSummaryStatus(1, 1, 1);
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunDotnetTestWithCsprojPassInlineSettings(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectPath = GetIsolatedTestAsset("ParametrizedTestProject.csproj");
+        InvokeDotnetTest($@"{projectPath} --logger:""Console;Verbosity=normal"" -p:VSTestUseMSBuildOutput=false /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion} -- TestRunParameters.Parameter(name =\""weburl\"", value=\""http://localhost//def\"")", workingDirectory: Path.GetDirectoryName(projectPath));
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunDotnetTestWithDllPassInlineSettings(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("ParametrizedTestProject.dll");
+        InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal"" -- TestRunParameters.Parameter(name=\""weburl\"", value=\""http://localhost//def\"")", workingDirectory: Path.GetDirectoryName(assemblyPath));
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    [Ignore("TODO: This scenario is broken in real environment as well (running with shipped `dotnet test`. Old tests (before arcade) use location of vstest.console that have more dlls in place than what we ship, and they make it work.")]
+    public void RunDotnetTestWithNativeDll(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        string assemblyRelativePath = @"microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\x64\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
+        var assemblyAbsolutePath = Path.Combine(_testEnvironment.PackageDirectory, assemblyRelativePath);
+
+        InvokeDotnetTest($@"{assemblyAbsolutePath} --logger:""Console;Verbosity=normal"" --diag:c:\temp\logscpp\", workingDirectory: Path.GetDirectoryName(assemblyAbsolutePath));
+
+        ValidateSummaryStatus(1, 1, 0);
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunDotnetTestAndSeeOutputFromConsoleWriteLine(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("OutputtingTestProject.dll");
+        InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal"" ", workingDirectory: Path.GetDirectoryName(assemblyPath));
+
+        StdOutputContains("MY OUTPUT FROM TEST");
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/EventLogCollectorTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/EventLogCollectorTests.cs
new file mode 100644
index 0000000000..abadb1e3e5
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/EventLogCollectorTests.cs
@@ -0,0 +1,148 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class EventLogCollectorTests : AcceptanceTestBase
+{
+    // Fails randomly https://ci.dot.net/job/Microsoft_vstest/job/master/job/Windows_NT_Release_prtest/2084/console
+    // https://ci.dot.net/job/Microsoft_vstest/job/master/job/Windows_NT_Debug_prtest/2085/console
+    [Ignore]
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void EventLogDataCollectorShoudCreateLogFileHavingEvents(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = _testEnvironment.GetTestAsset("EventLogUnitTestProject.dll");
+
+        string runSettings = GetRunsettingsFilePath(TempDirectory);
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), runSettings, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(3, 0, 0);
+        VaildateDataCollectorOutput(TempDirectory);
+        StdOutputDoesNotContains("An exception occurred while collecting final entries from the event log");
+        StdErrorDoesNotContains("event log has encountered an exception, some events might get lost");
+        StdOutputDoesNotContains("event log may have been cleared during collection; some events may not have been collected");
+        StdErrorDoesNotContains("Unable to read event log");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void EventLogDataCollectorShoudCreateLogFileWithoutEventsIfEventsAreNotLogged(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var assemblyPaths = _testEnvironment.GetTestAsset("SimpleTestProject.dll");
+
+        string runSettings = GetRunsettingsFilePath(TempDirectory);
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), runSettings, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 1, 1);
+        StdOutputDoesNotContains("An exception occurred while collecting final entries from the event log");
+        StdErrorDoesNotContains("event log has encountered an exception, some events might get lost");
+        StdOutputDoesNotContains("event log may have been cleared during collection; some events may not have been collected");
+        StdErrorDoesNotContains("Unable to read event log");
+    }
+
+    private static string GetRunsettingsFilePath(TempDirectory tempDirectory)
+    {
+        var runsettingsPath = Path.Combine(tempDirectory.Path, "test_" + Guid.NewGuid() + ".runsettings");
+
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    <RunSettings>
+      <RunConfiguration>
+        <MaxCpuCount>0</MaxCpuCount>
+        <TargetPlatform> x64 </TargetPlatform>
+        <TargetFrameworkVersion> Framework45 </TargetFrameworkVersion>
+      </RunConfiguration>
+      <DataCollectionRunSettings>
+        <DataCollectors>
+            <DataCollector friendlyName=""Event Log"" >
+                <Configuration><Setting name = ""EventLogs"" value = ""Application,System"" /><Setting name=""EntryTypes"" value=""Error,Warning"" /></Configuration>
+            </DataCollector>
+        </DataCollectors>
+      </DataCollectionRunSettings>
+    </RunSettings> ";
+
+        File.WriteAllText(runsettingsPath, runSettingsXml);
+        return runsettingsPath;
+    }
+
+    private void VaildateDataCollectorOutput(TempDirectory tempDirectory)
+    {
+        // Verify attachments
+        var di = new DirectoryInfo(tempDirectory.Path);
+        var resultFiles = di.EnumerateFiles("Event Log.xml", SearchOption.AllDirectories)
+            .OrderBy(d => d.CreationTime)
+            .Select(d => d.FullName)
+            .ToList();
+
+        Assert.AreEqual(4, resultFiles.Count);
+        StdOutputContains("Event Log.xml");
+
+        var fileContent1 = File.ReadAllText(resultFiles[0]);
+        var fileContent2 = File.ReadAllText(resultFiles[1]);
+        var fileContent3 = File.ReadAllText(resultFiles[2]);
+        var fileContent4 = File.ReadAllText(resultFiles[3]);
+
+        var eventIdsDics = new Dictionary<string[], bool>
+        {
+            { ["110", "111", "112"], false },
+            { ["220", "221", "222", "223"], false },
+            { ["330", "331", "332"], false }
+        };
+
+        // Since there is no guaranty that test will run in a particular order, we will check file for all available list of ids
+        Assert.IsTrue(VerifyOrder2(fileContent1, eventIdsDics), $"Event log file content: {fileContent1}");
+        Assert.IsTrue(VerifyOrder2(fileContent2, eventIdsDics), $"Event log file content: {fileContent2}");
+        Assert.IsTrue(VerifyOrder2(fileContent3, eventIdsDics), $"Event log file content: {fileContent3}");
+
+        Assert.IsTrue(VerifyOrder(fileContent4, ["110", "111", "112", "220", "221", "222", "223", "330", "331", "332"]), $"Event log file content: {fileContent4}");
+    }
+
+    private static bool VerifyOrder2(string content, Dictionary<string[], bool> eventIdsDics)
+    {
+        foreach (var eventIds in eventIdsDics)
+        {
+            if (eventIds.Value == false)
+            {
+                if (VerifyOrder(content, eventIds.Key))
+                {
+                    eventIdsDics[eventIds.Key] = true;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static bool VerifyOrder(string content, string[] eventIds)
+    {
+        for (int i = 0; i < eventIds.Length; i++)
+        {
+            int currentIndex = 0;
+            currentIndex = content.IndexOf(eventIds[i], currentIndex);
+            if (currentIndex == -1)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs
new file mode 100644
index 0000000000..47761acff0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionTests.cs
@@ -0,0 +1,505 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+
+using TestPlatform.TestUtilities;
+using System.Linq;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using FluentAssertions;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class ExecutionTests : AcceptanceTestBase
+{
+    //TODO: It looks like the first 3 tests would be useful to multiply by all 3 test frameworks, should we make the test even more generic, or duplicate them?
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [MSTestCompatibilityDataSource(InProcess = true)]
+    public void RunMultipleTestAssemblies(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("MSTestProject1.dll", "MSTestProject2.dll");
+
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(2, 2, 2);
+        ExitCodeEquals(1); // failing tests
+        StdErrHasTestRunFailedMessageButNoOtherError();
+        StdOutHasNoWarnings();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [TestPlatformCompatibilityDataSource]
+    public void RunTestsFromMultipleMSTestAssemblies(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("MSTestProject1.dll", "MSTestProject2.dll");
+
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(passed: 2, failed: 2, skipped: 2);
+        ExitCodeEquals(1); // failing tests
+        StdErrHasTestRunFailedMessageButNoOtherError();
+        StdOutHasNoWarnings();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [TestHostCompatibilityDataSource]
+    public void RunMultipleMSTestAssembliesOnVstestConsoleAndTesthostCombinations(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("MSTestProject1.dll", "MSTestProject2.dll");
+
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(2, 2, 2);
+        ExitCodeEquals(1); // failing tests
+        StdErrHasTestRunFailedMessageButNoOtherError();
+        StdOutHasNoWarnings();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource]
+    public void RunMultipleMSTestAssembliesOnVstestConsoleAndTesthostCombinations2(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("MSTestProject1.dll", "MSTestProject2.dll");
+
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
+
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: null, FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(2, 2, 2);
+        ExitCodeEquals(1); // failing tests
+    }
+
+    // TODO: This one mixes different frameworks, I can make it work, but it is worth it? We are going to test
+    // the two respective versions together (e.g. latest xunit and latest mstest), but does using two different test
+    // frameworks have any added value over using 2 mstest dlls?
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunMultipleTestAssembliesWithoutTestAdapterPath(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("SimpleTestProject.dll");
+        var xunitAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll");
+
+        assemblyPath = string.Join(" ", assemblyPath.AddDoubleQuote(), xunitAssemblyPath.AddDoubleQuote());
+        InvokeVsTestForExecution(assemblyPath, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(2, 2, 1);
+        ExitCodeEquals(1); // failing tests
+    }
+
+    // We cannot run this test on Mac/Linux because we're trying to switch the arch between x64 and x86
+    // and after --arch feature implementation we won't find correct muxer on CI.
+    [TestCategory("Windows")]
+    [TestMethod]
+    [MSTestCompatibilityDataSource]
+    public void RunMultipleTestAssembliesInParallel(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("MSTestProject1.dll", "MSTestProject2.dll");
+        var arguments = PrepareArguments(assemblyPaths, testAdapterPath: null, runSettings: null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /Parallel");
+        arguments = string.Concat(arguments, " /Platform:x86");
+        arguments += GetDiagArg(TempDirectory.Path);
+
+        // for the desktop we will run testhost.x86 in two copies, but for core
+        // we will run a combination of testhost.x86 and dotnet, where the dotnet will be
+        // the test console, and sometimes it will be the test host (e.g dotnet, dotnet, testhost.x86, or dotnet, testhost.x86, testhost.x86)
+        // based on the target framework
+        int expectedNumOfProcessCreated = 2;
+        var testHostProcessNames = IsDesktopTargetFramework()
+            ? new[] { "testhost.x86", }
+            : new[] { "testhost.x86", "testhost", };
+
+        InvokeVsTest(arguments);
+
+        AssertExpectedNumberOfHostProcesses(expectedNumOfProcessCreated, TempDirectory.Path, testHostProcessNames);
+        ValidateSummaryStatus(2, 2, 2);
+        ExitCodeEquals(1); // failing tests
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestSessionTimeOutTests(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:TestSessionTimeoutTest");
+
+        // set TestSessionTimeOut = 7 sec
+        arguments = string.Concat(arguments, " -- RunConfiguration.TestSessionTimeout=7000");
+        InvokeVsTest(arguments);
+
+        ExitCodeEquals(1);
+        StdErrorContains("Test Run Aborted.");
+        StdErrorContains("Aborting test run: test run timeout of 7000 milliseconds exceeded.");
+        StdOutputDoesNotContains("Total tests: 6");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void WorkingDirectoryIsSourceDirectory(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /tests:WorkingDirectoryTest");
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase))
+        {
+            // On release, x64 builds, recursive calls may be replaced with loops (tail call optimization)
+            Assert.Inconclusive("On StackOverflowException testhost not exited in release configuration.");
+            return;
+        }
+
+        var diagLogFilePath = Path.Combine(TempDirectory.Path, $"std_error_log_{Guid.NewGuid()}.txt");
+        File.Delete(diagLogFilePath);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:ExitWithStackoverFlow");
+        arguments = string.Concat(arguments, $" /diag:{diagLogFilePath}");
+
+        InvokeVsTest(arguments);
+
+        var errorMessage = "Process is terminated due to StackOverflowException.";
+        if (!runnerInfo.TargetFramework.StartsWith("net4"))
+        {
+            errorMessage = "Test host process crashed : Stack overflow.";
+        }
+
+        ExitCodeEquals(1);
+        FileAssert.Contains(diagLogFilePath, errorMessage);
+        StdErrorContains(errorMessage);
+        File.Delete(diagLogFilePath);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var diagLogFilePath = Path.Combine(TempDirectory.Path, $"std_error_log_{Guid.NewGuid()}.txt");
+        File.Delete(diagLogFilePath);
+
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:ExitwithUnhandleException");
+        arguments = string.Concat(arguments, $" /diag:{diagLogFilePath}");
+
+        InvokeVsTest(arguments);
+
+        var errorFirstLine =
+            !runnerInfo.TargetFramework.StartsWith("net4")
+            ? "Test host standard error line: Unhandled exception. System.InvalidOperationException: Operation is not valid due to the current state of the object."
+            : "Test host standard error line: Unhandled Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.";
+        FileAssert.Contains(diagLogFilePath, errorFirstLine);
+        File.Delete(diagLogFilePath);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleWhenGivenIncompatibleX86andX64Dll(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X64 platform. SimpleTestProjectx86.dll would use Framework .NETFramework,Version=v4.6.2 and Platform X86";
+        var assemblyPaths =
+            BuildMultipleAssemblyPath("SimpleTestProject3.dll", "SimpleTestProjectx86.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:PassingTestx86");
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+
+        // When both x64 & x86 DLL is passed x64 dll will be ignored.
+        StdOutputContains(expectedWarningContains);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsoleWhenGivenSingleX86Dll(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProjectx86 would use Framework .NETFramework,Version=v4.6.2 and Platform X86";
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProjectx86.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments + " /diag:logs\\");
+
+        ValidateSummaryStatus(1, 0, 0);
+        ExitCodeEquals(0);
+
+        StdOutputDoesNotContains(expectedWarningContains);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleOnlyWhenRunningIn32BitOS(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProject2.dll would use Framework .NETFramework,Version=v4.6.2 and Platform X64";
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject2.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 1, 1);
+        ExitCodeEquals(1);
+
+        // If we are running this test on 64 bit OS, it should not output any warning
+        if (Environment.Is64BitOperatingSystem)
+        {
+            StdOutputDoesNotContains(expectedWarningContains);
+        }
+
+        // If we are running this test on 32 bit OS, it should output warning message
+        else
+        {
+            StdOutputContains(expectedWarningContains);
+        }
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void ExitCodeShouldReturnOneWhenTreatNoTestsAsErrorParameterSetToTrueAndNoTestMatchesFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
+        arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
+
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
+        InvokeVsTest(arguments);
+
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void ExitCodeShouldReturnZeroWhenTreatNoTestsAsErrorParameterSetToFalseAndNoTestMatchesFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
+        arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
+
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
+        InvokeVsTest(arguments);
+
+        ExitCodeEquals(0);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    [NetFullTargetFrameworkDataSource]
+    public void ExitCodeShouldNotDependOnTreatNoTestsAsErrorTrueValueWhenThereAreAnyTestsToRun(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
+        InvokeVsTest(arguments);
+
+        // Returning 1 because of failing test in test assembly (SimpleTestProject2.dll)
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    [NetFullTargetFrameworkDataSource]
+    public void ExitCodeShouldNotDependOnFailTreatNoTestsAsErrorFalseValueWhenThereAreAnyTestsToRun(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
+        InvokeVsTest(arguments);
+
+        // Returning 1 because of failing test in test assembly (SimpleTestProject2.dll)
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void ExecuteTestsShouldSucceedWhenAtLeastOneDllFindsRuntimeProvider(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testDll = GetAssetFullPath("MSTestProject1.dll");
+        var nonTestDll = GetTestDllForFramework("NetStandard2Library.dll", "netstandard2.0");
+
+        var testAndNonTestDll = new[] { testDll, nonTestDll };
+        var quotedDlls = string.Join(" ", testAndNonTestDll.Select(a => a.AddDoubleQuote()));
+
+        var arguments = PrepareArguments(quotedDlls, GetTestAdapterPath(), string.Empty, framework: string.Empty, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /logger:\"console;prefix=true\"");
+        InvokeVsTest(arguments);
+
+        StringAssert.Contains(StdOut, $"Skipping source: {nonTestDll} (.NETStandard,Version=v2.0,");
+
+        ExitCodeEquals(1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunXunitTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
+    {
+        // This is the default filter of AzDo VSTest task:
+        //     testAssemblyVer2: |
+        //       **\*test *.dll
+        //       ! * *\*TestAdapter.dll
+        //       ! * *\obj\**
+        // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or deps.json, and fails the run.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll");
+        var allDllsMatchingTestPattern = Directory.GetFiles(Path.GetDirectoryName(testAssemblyPath)!, "*test*.dll");
+
+        string assemblyPaths = string.Join(" ", allDllsMatchingTestPattern.Concat(new[] { testAssemblyPath }).Select(s => s.AddDoubleQuote()));
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty);
+        var fails = StdErrWithWhiteSpace.Split('\n').Where(s => !s.IsNullOrWhiteSpace()).Select(s => s.Trim()).ToList();
+        fails.Should().HaveCount(2, "because there is 1 failed test, and one message that tests failed.");
+        fails.Last().Should().Be("Test Run Failed.");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource()]
+    public void RunMstestTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
+    {
+        // This is the default filter of AzDo VSTest task:
+        //     testAssemblyVer2: |
+        //       **\*test *.dll
+        //       ! * *\*TestAdapter.dll
+        //       ! * *\obj\**
+        // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or deps.json, and fails the run.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject.dll");
+        var allDllsMatchingTestPattern = Directory.GetFiles(Path.GetDirectoryName(testAssemblyPath)!, "*test*.dll");
+
+        string assemblyPaths = string.Join(" ", allDllsMatchingTestPattern.Concat(new[] { testAssemblyPath }).Select(s => s.AddDoubleQuote()));
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty);
+
+        StdErrHasTestRunFailedMessageButNoOtherError();
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource()]
+    public void RunNunitTestsWhenProvidingAllDllsInBin(RunnerInfo runnerInfo)
+    {
+        // This is the default filter of AzDo VSTest task:
+        //     testAssemblyVer2: |
+        //       **\*test *.dll
+        //       ! * *\*TestAdapter.dll
+        //       ! * *\obj\**
+        // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or deps.json, and fails the run.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = _testEnvironment.GetTestAsset("NUTestProject.dll");
+        var allDllsMatchingTestPattern = Directory.GetFiles(Path.GetDirectoryName(testAssemblyPath)!, "*test*.dll");
+
+        string assemblyPaths = string.Join(" ", allDllsMatchingTestPattern.Concat(new[] { testAssemblyPath }).Select(s => s.AddDoubleQuote()));
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty);
+
+        StdErrHasTestRunFailedMessageButNoOtherError();
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
+    public void RunTestsWhenProvidingJustPlatformDllsFailsTheRun(RunnerInfo runnerInfo)
+    {
+        // This is the default filter of AzDo VSTest task:
+        //     testAssemblyVer2: |
+        //       **\*test *.dll
+        //       ! * *\*TestAdapter.dll
+        //       ! * *\obj\**
+        // Because of this in typical run we get a lot of dlls that we are sure don't have tests, like Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+        // or testhost.dll. Those dlls are built for net8.0 tfm, so theoretically they should be tests, but attempting to run them fails to find runtimeconfig.json
+        // or deps.json, and fails the run.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject.dll");
+        var allDllsMatchingTestPattern = Directory.GetFiles(Path.GetDirectoryName(testAssemblyPath)!, "*test*.dll").Where(f => !f.EndsWith("SimpleTestProject.dll"));
+
+        string assemblyPaths = string.Join(" ", allDllsMatchingTestPattern.Select(s => s.AddDoubleQuote()));
+        InvokeVsTestForExecution(assemblyPaths, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty);
+
+        StdErr.Should().Be("No test source files were specified. ", "because all platform files we provided were filtered out");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionThreadApartmentStateTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionThreadApartmentStateTests.cs
new file mode 100644
index 0000000000..2a1c903c4c
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ExecutionThreadApartmentStateTests.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class ExecutionThreadApartmentStateTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void UITestShouldPassIfApartmentStateIsSTA(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:UITestMethod");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    public void WarningShouldBeShownWhenValueIsSTAForNetCore(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject2.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:PassingTest2 -- RunConfiguration.ExecutionThreadApartmentState=STA");
+        InvokeVsTest(arguments);
+        StdOutputContains("ExecutionThreadApartmentState option not supported for framework:");
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void UITestShouldFailWhenDefaultApartmentStateIsMTA(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:UITestMethod -- RunConfiguration.ExecutionThreadApartmentState=MTA");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(0, 1, 0);
+    }
+
+    [Ignore(@"Issue with TestSessionTimeout:  https://github.com/Microsoft/vstest/issues/980")]
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void CancelTestExectionShouldWorkWhenApartmentStateIsSTA(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths =
+            GetAssetFullPath("SimpleTestProject3.dll");
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /tests:UITestWithSleep1,UITestMethod -- RunConfiguration.ExecutionThreadApartmentState=STA RunConfiguration.TestSessionTimeout=2000");
+        InvokeVsTest(arguments);
+        StdOutputContains("Canceling test run: test run timeout of");
+        ValidateSummaryStatus(1, 0, 0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs
new file mode 100644
index 0000000000..01f38e3639
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/CompatibilityRowsBuilder.cs
@@ -0,0 +1,434 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml;
+using NuGet.Versioning;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public class CompatibilityRowsBuilder
+{
+    private static XmlDocument? s_depsXml;
+    private readonly string[] _runnerFrameworks;
+    private readonly string[] _runnerVersions;
+    private readonly string[] _hostFrameworks;
+    private readonly string[] _adapterVersions;
+    private readonly string[] _adapters;
+    private readonly string[] _hostVersions;
+
+    public CompatibilityRowsBuilder(string runnerFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string runnerVersions = AcceptanceTestBase.LATEST_TO_LEGACY,
+        string hostFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string hostVersions = AcceptanceTestBase.LATEST_TO_LEGACY,
+        string adapterVersions = AcceptanceTestBase.LATESTPREVIEW_TO_LEGACY,
+        string adapters = AcceptanceTestBase.MSTEST)
+    {
+        _runnerFrameworks = runnerFrameworks.Split(';');
+        _runnerVersions = runnerVersions.Split(';');
+        _hostFrameworks = hostFrameworks.Split(';');
+        _hostVersions = hostVersions.Split(';');
+        _adapterVersions = adapterVersions.Split(';');
+        _adapters = adapters.Split(';');
+    }
+
+    /// <summary>
+    /// Add run for in-process using the selected .NET Framework runners, and and all selected adapters.
+    /// </summary>
+    public bool WithInProcess { get; set; } = true;
+    public bool WithEveryVersionOfRunner { get; set; } = true;
+    public bool WithEveryVersionOfHost { get; set; } = true;
+    public bool WithEveryVersionOfAdapter { get; set; } = true;
+    public bool WithOlderConfigurations { get; set; } = true;
+
+    public string? BeforeRunnerFeature { get; set; }
+    public string? AfterRunnerFeature { get; set; }
+    public string? BeforeTestHostFeature { get; set; }
+    public string? AfterTestHostFeature { get; set; }
+    public string? BeforeAdapterFeature { get; set; }
+    public string? AfterAdapterFeature { get; set; }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+    public int? JustRow { get; internal set; }
+
+    public List<RunnerInfo> CreateData()
+    {
+        var dataRows = new List<RunnerInfo>();
+
+        if (WithEveryVersionOfRunner)
+            AddEveryVersionOfRunner(dataRows);
+
+        if (WithEveryVersionOfHost)
+            AddEveryVersionOfHost(dataRows);
+
+        if (WithEveryVersionOfAdapter)
+            AddEveryVersionOfAdapter(dataRows);
+
+        if (WithOlderConfigurations)
+            AddOlderConfigurations(dataRows);
+
+        if (WithInProcess)
+            AddInProcess(dataRows);
+
+        var minVersion = ParseAndPatchSemanticVersion("0.0.0-alpha.1");
+        var maxVersion = ParseAndPatchSemanticVersion("9999.0.0");
+        SemanticVersion? beforeRunnerVersion = maxVersion;
+        SemanticVersion? afterRunnerVersion = minVersion;
+        SemanticVersion? beforeTestHostVersion = maxVersion;
+        SemanticVersion? afterTestHostVersion = minVersion;
+        SemanticVersion? beforeAdapterVersion = maxVersion;
+        SemanticVersion? afterAdapterVersion = minVersion;
+
+        if (BeforeRunnerFeature != null)
+        {
+            var feature = Features.TestPlatformFeatures[BeforeRunnerFeature];
+            beforeRunnerVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        if (AfterRunnerFeature != null)
+        {
+            var feature = Features.TestPlatformFeatures[AfterRunnerFeature];
+            afterRunnerVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        if (BeforeTestHostFeature != null)
+        {
+            var feature = Features.TestPlatformFeatures[BeforeTestHostFeature];
+            beforeTestHostVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        if (AfterTestHostFeature != null)
+        {
+            var feature = Features.TestPlatformFeatures[AfterTestHostFeature];
+            afterTestHostVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        if (BeforeAdapterFeature != null)
+        {
+            var feature = Features.AdapterFeatures[BeforeAdapterFeature];
+            beforeAdapterVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        if (AfterAdapterFeature != null)
+        {
+            var feature = Features.AdapterFeatures[AfterAdapterFeature];
+            afterAdapterVersion = ParseAndPatchSemanticVersion(feature.Version);
+        }
+
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        // Run .NET Framework tests only on Windows.
+        Func<string, bool> filter = tfm => isWindows || !tfm.StartsWith("net4");
+
+        // TODO: maybe we should throw if we don't end up generating any data
+        // because none of the versions match, or some other way to identify tests that will never run because they are very outdated.
+        // We probably don't have that need right now, because legacy version is 15.x.x, which is very old, and we are still keeping
+        // compatibility.
+
+        Func<SemanticVersion, SemanticVersion, SemanticVersion, bool> isInRange = (version, before, after) => version < before && after <= version;
+
+        var rows = dataRows.Where(r => r.VSTestConsoleInfo != null
+            && isInRange(ParseAndPatchSemanticVersion(r.VSTestConsoleInfo.Version), beforeRunnerVersion, afterRunnerVersion)
+            && r.TestHostInfo != null && isInRange(ParseAndPatchSemanticVersion(r.TestHostInfo.Version), beforeTestHostVersion, afterTestHostVersion)
+            && r.AdapterInfo != null && isInRange(ParseAndPatchSemanticVersion(r.AdapterInfo.Version), beforeAdapterVersion, afterAdapterVersion)).ToList();
+
+        // We use ToString to determine which values are unique. Not great solution, but works better than using records.
+        var distinctRows = new Dictionary<string, RunnerInfo>();
+        rows.ForEach(r => distinctRows[r.ToString()] = r);
+
+        if (distinctRows.Count == 0)
+        {
+            // TODO: This needs to be way more specific about what happened. And possibly propagate as inconclusive state if we decide to update versions automatically?
+            throw new InvalidOperationException("There were no rows that matched the specified criteria.");
+        }
+
+        var allRows = distinctRows.Values.ToList();
+        for (var i = 0; i < allRows.Count; i++)
+        {
+            allRows[i].Index = i;
+        }
+
+        return JustRow == null ? allRows : [allRows[JustRow.Value]];
+    }
+
+    private static SemanticVersion ParseAndPatchSemanticVersion(string? version)
+    {
+        // Our developer version is 17.2.0-dev, but we release few preview, that are named 17.2.0-preview or 17.2.0-release, yet we still
+        // want 17.2.0-dev to be considered the latest version. So we patch it.
+        var v = version != null && version.EndsWith("-dev") ? version?.Substring(0, version.Length - 4) + "-ZZZZZZZZZZ" : version;
+        return SemanticVersion.Parse(v?.TrimStart('v'));
+    }
+
+    private void AddInProcess(List<RunnerInfo> dataRows)
+    {
+        foreach (var runnerFramework in _runnerFrameworks)
+        {
+            if (!runnerFramework.StartsWith("net4"))
+            {
+                continue;
+            }
+
+            foreach (var runnerVersion in _runnerVersions)
+            {
+                foreach (var adapter in _adapters)
+                {
+                    foreach (var adapterVersion in _adapterVersions)
+                    {
+                        AddRow(dataRows, "In process", runnerVersion, runnerFramework, runnerVersion, runnerFramework, adapterVersion, inIsolation: false);
+                    }
+                }
+            }
+        }
+    }
+
+    private void AddOlderConfigurations(List<RunnerInfo> dataRows)
+    {
+        // Older configurations where the runner, host and adapter version are the same.
+        // We already added the row where all are newest when adding combination with all runners.
+        foreach (var runnerVersion in _runnerVersions)
+        {
+            foreach (var runnerFramework in _runnerFrameworks)
+            {
+                foreach (var hostFramework in _hostFrameworks)
+                {
+                    var isNetFramework = hostFramework.StartsWith("net4");
+                    var hostVersion = runnerVersion;
+                    foreach (var _ in _adapters)
+                    {
+                        var adapterVersion = _adapterVersions[0];
+                        AddRow(dataRows, "Older", runnerVersion, runnerFramework, hostVersion, hostFramework, adapterVersion, inIsolation: true);
+                    }
+                }
+            }
+        }
+    }
+
+    private void AddEveryVersionOfAdapter(List<RunnerInfo> dataRows)
+    {
+        var runnerVersion = _runnerVersions[0];
+        foreach (var runnerFramework in _runnerFrameworks)
+        {
+            foreach (var hostFramework in _hostFrameworks)
+            {
+                var isNetFramework = hostFramework.StartsWith("net4");
+                // .NET Framework testhost ships with the runner, and the version from the
+                // runner directory is always selected, otherwise select the newest version from _hostFrameworks.
+                var hostVersion = isNetFramework ? runnerVersion : _hostVersions[0];
+                foreach (var adapter in _adapters)
+                {
+                    foreach (var adapterVersion in _adapterVersions)
+                    {
+                        AddRow(dataRows, "Every adapter", runnerVersion, runnerFramework, hostVersion, hostFramework, adapterVersion, inIsolation: true);
+                    }
+                }
+            }
+        }
+    }
+
+    private void AddEveryVersionOfHost(List<RunnerInfo> dataRows)
+    {
+        var runnerVersion = _runnerVersions[0];
+
+        foreach (var runnerFramework in _runnerFrameworks)
+        {
+            foreach (var hostFramework in _hostFrameworks)
+            {
+                var isNetFramework = hostFramework.StartsWith("net4");
+                // .NET Framework testhost ships with the runner, and the version from the
+                // runner directory is always the same as the runner. There are no variations
+                // so we just need to add host versions for .NET testhosts.
+                var hostVersions = isNetFramework ? [] : _hostVersions.ToArray();
+                foreach (var hostVersion in hostVersions)
+                {
+                    foreach (var _ in _adapters)
+                    {
+                        // use the newest
+                        var adapterVersion = _adapterVersions[0];
+                        AddRow(dataRows, "Every host", runnerVersion, runnerFramework, hostVersion, hostFramework, adapterVersion, inIsolation: true);
+                    }
+                }
+            }
+        }
+    }
+
+    private void AddEveryVersionOfRunner(List<RunnerInfo> dataRows)
+    {
+        foreach (var runnerVersion in _runnerVersions)
+        {
+            foreach (var runnerFramework in _runnerFrameworks)
+            {
+                foreach (var hostFramework in _hostFrameworks)
+                {
+                    var isNetFramework = hostFramework.StartsWith("net4");
+                    // .NET Framework testhost ships with the runner, and the version from the
+                    // runner directory is always selected, otherwise select the newest version from _hostFrameworks.
+                    var hostVersion = isNetFramework ? runnerVersion : _hostVersions[0];
+                    foreach (var _ in _adapters)
+                    {
+                        // use the newest
+                        var adapterVersion = _adapterVersions[0];
+                        AddRow(dataRows, "Every runner", runnerVersion, runnerFramework, hostVersion, hostFramework, adapterVersion, inIsolation: true);
+                    }
+                }
+            }
+        }
+    }
+
+    private void AddRow(List<RunnerInfo> dataRows, string batch,
+        string runnerVersion, string runnerFramework, string hostVersion, string hostFramework, string adapterVersion, bool inIsolation)
+    {
+        RunnerInfo runnerInfo = GetRunnerInfo(batch, runnerFramework, hostFramework, inIsolation);
+        runnerInfo.DebugInfo = GetDebugInfo();
+        runnerInfo.VSTestConsoleInfo = GetVSTestConsoleInfo(runnerVersion, runnerInfo);
+        runnerInfo.TestHostInfo = GetNetTestSdkInfo(hostVersion);
+        runnerInfo.AdapterInfo = GetMSTestInfo(adapterVersion);
+        dataRows.Add(runnerInfo);
+    }
+
+    private DebugInfo GetDebugInfo()
+    {
+        return new DebugInfo
+        {
+            DebugDataCollector = DebugDataCollector,
+            DebugTestHost = DebugTestHost,
+            DebugVSTestConsole = DebugVSTestConsole,
+            DebugStopAtEntrypoint = DebugStopAtEntrypoint
+        };
+    }
+
+    private static RunnerInfo GetRunnerInfo(string batch, string runnerFramework, string hostFramework, bool inIsolation)
+    {
+        return new RunnerInfo
+        {
+            Batch = batch,
+            RunnerFramework = runnerFramework,
+            TargetFramework = hostFramework,
+            InIsolationValue = inIsolation ? AcceptanceTestBase.InIsolation : null
+        };
+    }
+
+    private static DllInfo GetMSTestInfo(string msTestVersion)
+    {
+        var depsXml = GetDependenciesXml();
+
+        // It is okay when node is null, we check that Version has value when we update paths by using MSTestInfo, and throw.
+        // This way it throws in the body of the test which has better error reporting than throwing in the data source.
+        XmlNode? node = depsXml.DocumentElement?.SelectSingleNode($"PropertyGroup/MSTestFramework{msTestVersion}Version");
+        var version = node?.InnerText.Replace("[", "").Replace("]", "");
+        var versionSpecificPath = $"MSTest{msTestVersion}-{version}";
+
+        return new DllInfo
+        {
+            Name = "MSTest",
+            PropertyName = "MSTest",
+            VersionType = msTestVersion,
+            Version = version,
+            Path = versionSpecificPath,
+        };
+    }
+
+    private static VSTestConsoleInfo GetVSTestConsoleInfo(string vstestConsoleVersion, RunnerInfo runnerInfo)
+    {
+        var depsXml = GetDependenciesXml();
+        var packageName = runnerInfo.IsNetFrameworkRunner
+            ? "microsoft.testplatform"
+            : "microsoft.testplatform.cli";
+
+        string version;
+
+        // When version is Latest, we built it locally, but it gets restored into our nuget cache on build.
+        if (vstestConsoleVersion == AcceptanceTestBase.LATEST)
+        {
+            version = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+        }
+        else
+        {
+            var propertyName = $"VSTestConsole{vstestConsoleVersion}Version";
+
+            // It is okay when node is null, we will fail to find the executable later, and throw.
+            // This way it throws in the body of the test which has better error reporting than throwing in the data source.
+            // And we can easily find out what is going on because --WRONG-VERSION-- sticks out, and is easy to find in the codebase.
+            XmlNode? node = depsXml.DocumentElement?.SelectSingleNode($"PropertyGroup/{propertyName}");
+            version = node?.InnerText.Replace("[", "").Replace("]", "") ?? "--WRONG-VERSION--";
+        }
+        var vstestConsolePath = runnerInfo.IsNetFrameworkRunner switch
+        {
+            true when NuGetVersion.TryParse(version, out var v)
+                && new NuGetVersion(v.Major, v.Minor, v.Patch) < new NuGetVersion("17.3.0") => GetToolsPath("net451"),
+            true => GetToolsPath("net462"),
+            false when version.StartsWith("15.") => GetContentFilesPath("netcoreapp2.0"),
+            false when NuGetVersion.TryParse(version, out var v)
+                && new NuGetVersion(v.Major, v.Minor, v.Patch) < new NuGetVersion("17.4.0") => GetContentFilesPath("netcoreapp2.1"),
+            false when NuGetVersion.TryParse(version, out var v)
+                && new NuGetVersion(v.Major, v.Minor, v.Patch) <= new NuGetVersion("17.12.0") => GetContentFilesPath("netcoreapp3.1"),
+            false => GetContentFilesPath("net9.0"),
+        };
+
+        return new VSTestConsoleInfo
+        {
+            VersionType = vstestConsoleVersion,
+            Version = version,
+            Path = vstestConsolePath,
+        };
+
+        string GetToolsPath(string fwkVersion) => Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, ".packages",
+            packageName, version, "tools", fwkVersion, "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe");
+
+        string GetContentFilesPath(string fwkVersion) => Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, ".packages",
+            packageName, version, "contentFiles", "any", fwkVersion, "vstest.console.dll");
+    }
+
+    private static NetTestSdkInfo GetNetTestSdkInfo(string testhostVersionType)
+    {
+        var depsXml = GetDependenciesXml();
+
+        string version;
+        if (testhostVersionType == AcceptanceTestBase.LATEST)
+        {
+            version = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
+        }
+        else
+        {
+            var propertyName = $"VSTestConsole{testhostVersionType}Version";
+
+            // It is okay when node is null, we check that Version has value when we update paths by using TesthostInfo, and throw.
+            // This way it throws in the body of the test which has better error reporting than throwing in the data source.
+            //
+            // We use the VSTestConsole properties to figure out testhost version, for now.
+            XmlNode? node = depsXml.DocumentElement?.SelectSingleNode($"PropertyGroup/{propertyName}");
+            version = node?.InnerText.Replace("[", "").Replace("]", "")!;
+        }
+
+        var versionSpecificPath = $"NETTestSdk{testhostVersionType}-{version}";
+
+        return new NetTestSdkInfo
+        {
+            VersionType = testhostVersionType,
+            Version = version,
+            Path = versionSpecificPath
+        };
+    }
+
+    private static XmlDocument GetDependenciesXml()
+    {
+        if (s_depsXml != null)
+            return s_depsXml;
+
+        var depsXmlPath = Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, "eng", "Versions.props");
+        var fileStream = File.OpenRead(depsXmlPath);
+        var xmlTextReader = new XmlTextReader(fileStream) { Namespaces = false };
+        var depsXml = new XmlDocument();
+        depsXml.Load(xmlTextReader);
+
+        s_depsXml = depsXml;
+        return depsXml;
+    }
+}
+
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Feature.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Feature.cs
new file mode 100644
index 0000000000..9014349f06
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Feature.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public class Feature
+{
+    public Feature(string version, string issue)
+    {
+        Version = version;
+        Issue = issue;
+    }
+
+    public string Version { get; }
+    public string Issue { get; }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Features.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Features.cs
new file mode 100644
index 0000000000..e5fca8736e
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/Features.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public static class Features
+{
+    public const string ATTACH_DEBUGGER_FLOW = nameof(ATTACH_DEBUGGER_FLOW);
+    public const string MSTEST_EXAMPLE_FEATURE = nameof(MSTEST_EXAMPLE_FEATURE);
+    public const string MULTI_TFM = nameof(MULTI_TFM);
+
+    public static IImmutableDictionary<string, Feature> TestPlatformFeatures { get; } = new Dictionary<string, Feature>
+    {
+        [ATTACH_DEBUGGER_FLOW] = new(version: "v16.7.0-preview-20200519-01", issue: "https://github.com/microsoft/vstest/pull/2325"),
+        [MULTI_TFM] = new(version: "v17.3.0", issue: "https://github.com/microsoft/vstest/pull/3412")
+    }.ToImmutableDictionary();
+
+    public static IImmutableDictionary<string, Feature> AdapterFeatures { get; internal set; } = new Dictionary<string, Feature>
+    {
+        [MSTEST_EXAMPLE_FEATURE] = new("2.2.8", issue: "This feature does not actually exist."),
+    }.ToImmutableDictionary();
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/IsExternalInit.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/IsExternalInit.cs
new file mode 100644
index 0000000000..61d5d4afc0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/IsExternalInit.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if !NET5_0_OR_GREATER
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved for use by the compiler for records.
+/// /!\ Do not use directly. /!\
+/// </summary>
+[ExcludeFromCodeCoverage, DebuggerNonUserCode]
+internal static class IsExternalInit
+{
+}
+
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/MSTestCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/MSTestCompatibilityDataSource.cs
new file mode 100644
index 0000000000..27d41b3401
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/MSTestCompatibilityDataSource.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+public class MSTestCompatibilityDataSource : TestDataSourceAttribute<RunnerInfo>
+{
+    private readonly CompatibilityRowsBuilder _builder;
+
+    public MSTestCompatibilityDataSource(
+        string runnerFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string hostFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string adapterVersions = AcceptanceTestBase.LATESTPREVIEW_TO_LEGACY)
+    {
+        // TODO: We actually don't generate values to use different translation layers, because we don't have a good way to do
+        // that right now. Translation layer is loaded directly into the acceptance test, and so we don't have easy way to substitute it.
+
+        _builder = new CompatibilityRowsBuilder(
+            runnerFrameworks,
+            // runner versions
+            AcceptanceTestBase.LATEST_TO_LEGACY,
+            hostFrameworks,
+            // host versions
+            AcceptanceTestBase.LATEST_TO_LEGACY,
+            adapterVersions,
+            // adapters
+            AcceptanceTestBase.MSTEST);
+
+        // Do not generate the data rows here, properties (e.g. DebugVSTestConsole) are not populated until after constructor is done.
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    /// <summary>
+    /// Add run for in-process using the selected .NET Framework runners, and and all selected adapters.
+    /// </summary>
+    public bool InProcess { get; set; }
+
+    public string? BeforeRunnerFeature { get; set; }
+    public string? AfterRunnerFeature { get; set; }
+
+    public string? BeforeTestHostFeature { get; set; }
+    public string? AfterTestHostFeature { get; set; }
+
+    public string? BeforeAdapterFeature { get; set; }
+    public string? AfterAdapterFeature { get; set; }
+
+    public override void CreateData(MethodInfo methodInfo)
+    {
+        _builder.WithEveryVersionOfRunner = false;
+        _builder.WithEveryVersionOfHost = false;
+        _builder.WithEveryVersionOfAdapter = true;
+        _builder.WithOlderConfigurations = false;
+        _builder.WithInProcess = InProcess;
+
+        _builder.BeforeRunnerFeature = BeforeRunnerFeature;
+        _builder.AfterRunnerFeature = AfterRunnerFeature;
+
+        _builder.BeforeTestHostFeature = BeforeTestHostFeature;
+        _builder.AfterTestHostFeature = AfterTestHostFeature;
+
+        _builder.BeforeAdapterFeature = BeforeAdapterFeature;
+        _builder.AfterAdapterFeature = AfterAdapterFeature;
+
+        _builder.DebugDataCollector = DebugDataCollector;
+        _builder.DebugVSTestConsole = DebugVSTestConsole;
+        _builder.DebugTestHost = DebugTestHost;
+        _builder.DebugStopAtEntrypoint = DebugStopAtEntrypoint;
+
+        var data = _builder.CreateData();
+        data.ForEach(AddData);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs
new file mode 100644
index 0000000000..4b29b27dad
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// Runs tests using the dotnet vstest.console.dll built against .NET Core 3.1.
+/// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as
+/// AcceptanceTestBase.NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0" to determine which target framework of the project
+/// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public class NetCoreRunnerAttribute : Attribute, ITestDataSource
+{
+    private readonly string _targetFrameworks;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NetCoreRunnerAttribute"/> class.
+    /// </summary>
+    /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values.</param>
+    public NetCoreRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET9)
+    {
+        _targetFrameworks = targetFrameworks;
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    public IEnumerable<object[]> GetData(MethodInfo methodInfo)
+    {
+        var dataRows = new List<object[]>();
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        // on non-windows we want to filter down only to netcoreapp runner, and net5.0 and newer.
+        Func<string, bool> filter = tfm => isWindows || !tfm.StartsWith("net4");
+        foreach (var fmw in _targetFrameworks.Split(';').Where(filter))
+        {
+            var runnerInfo = new RunnerInfo
+            {
+                RunnerFramework = IntegrationTestBase.CoreRunnerFramework,
+                TargetFramework = fmw,
+                InIsolationValue = null,
+            };
+            runnerInfo.DebugInfo = new DebugInfo
+            {
+                DebugVSTestConsole = DebugVSTestConsole,
+                DebugTestHost = DebugTestHost,
+                DebugDataCollector = DebugDataCollector,
+                DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+            };
+            dataRows.Add([runnerInfo]);
+        }
+
+        return dataRows;
+    }
+
+    public string GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? []));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
new file mode 100644
index 0000000000..ad85630dbe
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// The attribute defining runner framework, target framework and target runtime for netcoreapp1.*
+/// First Argument (Runner framework) = This decides who will run the tests. If runner framework is netcoreapp then "dotnet vstest.console.dll" will run the tests.
+/// If runner framework is net46 then vstest.console.exe will run the tests.
+/// Second argument (target framework) = The framework for which test will run
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public class NetCoreTargetFrameworkDataSourceAttribute : Attribute, ITestDataSource
+{
+    private readonly bool _useDesktopRunner;
+    private readonly bool _useCoreRunner;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSourceAttribute"/> class.
+    /// </summary>
+    /// <param name="useDesktopRunner">To run tests with desktop runner(vstest.console.exe)</param>
+    /// <param name="useCoreRunner">To run tests with core runner(dotnet vstest.console.dll)</param>
+    public NetCoreTargetFrameworkDataSourceAttribute(
+        bool useDesktopRunner = true,
+        bool useCoreRunner = true)
+    {
+        _useDesktopRunner = useDesktopRunner;
+        _useCoreRunner = useCoreRunner;
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    private void AddRunnerDataRow(List<object[]> dataRows, string runnerFramework, string targetFramework)
+    {
+        var runnerInfo = new RunnerInfo
+        {
+            RunnerFramework = runnerFramework,
+            TargetFramework = targetFramework,
+            InIsolationValue = null
+        };
+        runnerInfo.DebugInfo = new DebugInfo
+        {
+            DebugDataCollector = DebugDataCollector,
+            DebugTestHost = DebugTestHost,
+            DebugVSTestConsole = DebugVSTestConsole,
+            DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+        };
+        dataRows.Add([runnerInfo]);
+    }
+
+    public IEnumerable<object[]> GetData(MethodInfo methodInfo)
+    {
+        var dataRows = new List<object[]>();
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        if (_useDesktopRunner && isWindows)
+        {
+            var runnerFramework = IntegrationTestBase.DesktopRunnerFramework;
+
+            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core80TargetFramework);
+        }
+
+        if (_useCoreRunner)
+        {
+            var runnerFramework = IntegrationTestBase.CoreRunnerFramework;
+
+            AddRunnerDataRow(dataRows, runnerFramework, AcceptanceTestBase.Core80TargetFramework);
+        }
+
+        return dataRows;
+    }
+
+    public string GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? []));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs
new file mode 100644
index 0000000000..2de6985cfe
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// Runs tests using the dotnet vstest.console.dll built against .NET 6.0.
+/// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as
+/// AcceptanceTestBase.NETFX462_NET9 = "net462;net472;net48;net8.0;net9.0" to determine which target framework of the project
+/// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public class NetFrameworkRunnerAttribute : Attribute, ITestDataSource
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSourceAttribute"/> class.
+    /// </summary>
+    /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values.</param>
+    public NetFrameworkRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET9)
+    {
+        _targetFrameworks = targetFrameworks;
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    private readonly string _targetFrameworks;
+
+    public IEnumerable<object[]> GetData(MethodInfo methodInfo)
+    {
+        var dataRows = new List<object[]>();
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        if (!isWindows)
+        {
+            return dataRows;
+        }
+
+        foreach (var fmw in _targetFrameworks.Split(';'))
+        {
+            var runnerInfo = new RunnerInfo
+            {
+                RunnerFramework = IntegrationTestBase.DesktopRunnerFramework,
+                TargetFramework = fmw,
+                InIsolationValue = AcceptanceTestBase.InIsolation
+            };
+            runnerInfo.DebugInfo = new DebugInfo
+            {
+                DebugVSTestConsole = DebugVSTestConsole,
+                DebugTestHost = DebugTestHost,
+                DebugDataCollector = DebugDataCollector,
+                DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+            };
+
+            dataRows.Add([runnerInfo]);
+        }
+
+        return dataRows;
+    }
+
+    public string GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? []));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs
new file mode 100644
index 0000000000..eeec157d7e
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// The attribute defining runner framework and target framework for net462.
+/// First Argument (Runner framework) = This decides who will run the tests. If runner framework is netcoreapp then "dotnet vstest.console.dll" will run the tests.
+/// If runner framework is net46 then vstest.console.exe will run the tests.
+/// Second argument (target framework) = The framework for which test will run
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+public class NetFullTargetFrameworkDataSourceAttribute : Attribute, ITestDataSource
+{
+    private readonly bool _inIsolation;
+    private readonly bool _inProcess;
+    private readonly bool _useDesktopRunner;
+    private readonly bool _useCoreRunner;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NetFullTargetFrameworkDataSourceAttribute"/> class.
+    /// </summary>
+    /// <param name="inIsolation">Run test in isolation</param>
+    /// <param name="inProcess">Run tests in process</param>
+    /// <param name="useDesktopRunner">To run tests with desktop runner(vstest.console.exe)</param>
+    /// <param name="useCoreRunner">To run tests with core runner(dotnet vstest.console.dll)</param>
+    public NetFullTargetFrameworkDataSourceAttribute(bool inIsolation = true, bool inProcess = false, bool useDesktopRunner = true, bool useCoreRunner = true)
+    {
+        _inIsolation = inIsolation;
+        _inProcess = inProcess;
+        _useDesktopRunner = useDesktopRunner;
+        _useCoreRunner = useCoreRunner;
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    public IEnumerable<object[]> GetData(MethodInfo methodInfo)
+    {
+        var dataRows = new List<object[]>();
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        if (_useCoreRunner && isWindows)
+        {
+            var runnerInfo = new RunnerInfo
+            {
+                RunnerFramework = IntegrationTestBase.CoreRunnerFramework,
+                TargetFramework = AcceptanceTestBase.DesktopTargetFramework,
+                InIsolationValue = null
+            };
+            runnerInfo.DebugInfo = new DebugInfo
+            {
+                DebugVSTestConsole = DebugVSTestConsole,
+                DebugTestHost = DebugTestHost,
+                DebugDataCollector = DebugDataCollector,
+                DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+            };
+            dataRows.Add([runnerInfo]);
+        }
+
+        if (_useDesktopRunner && isWindows)
+        {
+            if (_inIsolation)
+            {
+                var runnerInfo = new RunnerInfo
+                {
+                    RunnerFramework = IntegrationTestBase.DesktopRunnerFramework,
+                    TargetFramework = AcceptanceTestBase.DesktopTargetFramework,
+                    InIsolationValue = AcceptanceTestBase.InIsolation
+                };
+                runnerInfo.DebugInfo = new DebugInfo
+                {
+                    DebugVSTestConsole = DebugVSTestConsole,
+                    DebugTestHost = DebugTestHost,
+                    DebugDataCollector = DebugDataCollector,
+                    DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+                };
+                dataRows.Add([runnerInfo]);
+            }
+
+            if (_inProcess)
+            {
+                var runnerInfo = new RunnerInfo
+                {
+                    RunnerFramework = IntegrationTestBase.DesktopRunnerFramework,
+                    TargetFramework = AcceptanceTestBase.DesktopTargetFramework,
+                    InIsolationValue = null
+                };
+                runnerInfo.DebugInfo = new DebugInfo
+                {
+                    DebugVSTestConsole = DebugVSTestConsole,
+                    DebugTestHost = DebugTestHost,
+                    DebugDataCollector = DebugDataCollector,
+                    DebugStopAtEntrypoint = DebugStopAtEntrypoint,
+                };
+                dataRows.Add([runnerInfo]);
+            }
+        }
+
+        return dataRows;
+    }
+
+    public string GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? []));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnerCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnerCompatibilityDataSource.cs
new file mode 100644
index 0000000000..6dc008c732
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnerCompatibilityDataSource.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// A data source that provides every version of runner.
+/// 
+/// When that adds up to no configuration exception is thrown.
+/// </summary>
+public class RunnerCompatibilityDataSource : TestDataSourceAttribute<RunnerInfo>
+{
+    private readonly CompatibilityRowsBuilder _builder;
+
+    public RunnerCompatibilityDataSource(
+        string runnerFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string runnerVersions = AcceptanceTestBase.LATEST_TO_LEGACY,
+        string hostFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET)
+    {
+        // TODO: We actually don't generate values to use different translation layers, because we don't have a good way to do
+        // that right now. Translation layer is loaded directly into the acceptance test, and so we don't have easy way to substitute it.
+
+        _builder = new CompatibilityRowsBuilder(
+            runnerFrameworks,
+            runnerVersions,
+            hostFrameworks,
+            // host versions
+            AcceptanceTestBase.LATEST,
+            // adapter versions
+            AcceptanceTestBase.LATESTSTABLE,
+            // adapters
+            AcceptanceTestBase.MSTEST);
+
+        // Do not generate the data rows here, properties (e.g. DebugVSTestConsole) are not populated until after constructor is done.
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+    public int JustRow { get; set; } = -1;
+
+    /// <summary>
+    /// Add run for in-process using the selected .NET Framework runners, and and all selected adapters.
+    /// </summary>
+    public bool InProcess { get; set; }
+
+    public string? BeforeFeature { get; set; }
+    public string? AfterFeature { get; set; }
+
+    //public string? BeforeTestHostFeature { get; set; }
+    //public string? AfterTestHostFeature { get; set; }
+
+    public string? BeforeAdapterFeature { get; set; }
+    public string? AfterAdapterFeature { get; set; }
+
+    public override void CreateData(MethodInfo methodInfo)
+    {
+        _builder.WithEveryVersionOfRunner = true;
+        _builder.WithEveryVersionOfHost = false;
+        _builder.WithEveryVersionOfAdapter = false;
+        _builder.WithOlderConfigurations = false;
+        _builder.WithInProcess = InProcess;
+
+        _builder.BeforeRunnerFeature = BeforeFeature;
+        _builder.AfterRunnerFeature = AfterFeature;
+
+        //_builder.BeforeTestHostFeature = BeforeTestHostFeature;
+        //_builder.AfterTestHostFeature = AfterTestHostFeature;
+
+        _builder.BeforeAdapterFeature = BeforeAdapterFeature;
+        _builder.AfterAdapterFeature = AfterAdapterFeature;
+
+        _builder.DebugDataCollector = DebugDataCollector;
+        _builder.DebugVSTestConsole = DebugVSTestConsole;
+        _builder.DebugTestHost = DebugTestHost;
+        _builder.DebugStopAtEntrypoint = DebugStopAtEntrypoint;
+
+        _builder.JustRow = JustRow < 0 ? null : JustRow;
+
+        var data = _builder.CreateData();
+        data.ForEach(AddData);
+    }
+}
+
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnnerInfo.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnnerInfo.cs
new file mode 100644
index 0000000000..c25929c04b
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/RunnnerInfo.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[Serializable] // Type should be serializable to allow the tree-view behavior of test discovery in Test Explorer
+public class RunnerInfo
+{
+    public int Index { get; set; }
+    [NotNull] // Marking as NotNull because normal usage ensure this is not null and this helps avoiding bangs everywhere in the tests
+    public string? RunnerFramework { get; set; }
+    public VSTestConsoleInfo? VSTestConsoleInfo { get; set; }
+    [NotNull] // Marking as NotNull because normal usage ensure this is not null and this helps avoiding bangs everywhere in the tests
+    public string? TargetFramework { get; set; }
+    public string? InIsolationValue { get; set; }
+    public DebugInfo? DebugInfo { get; set; }
+    public NetTestSdkInfo? TestHostInfo { get; set; }
+    public DllInfo? AdapterInfo { get; set; }
+
+    public string? Batch { get; set; }
+
+    /// <summary>
+    /// Is running via .NET "Core" vstest.console?
+    /// </summary>
+    public bool IsNetRunner => !IsNetFrameworkRunner;
+
+    /// <summary>
+    /// Is running via .NET Framework vstest.console?
+    /// </summary>
+    public bool IsNetFrameworkRunner => RunnerFramework!.StartsWith("net4", StringComparison.InvariantCultureIgnoreCase);
+
+    /// <summary>
+    /// Is running via .NET "Core" testhost?
+    /// </summary>
+    public bool IsNetTarget => !IsNetFrameworkTarget;
+
+    /// <summary>
+    /// Is running via .NET Framework testhost?
+    /// </summary>
+    public bool IsNetFrameworkTarget => TargetFramework!.StartsWith("net4", StringComparison.InvariantCultureIgnoreCase);
+
+    public override string ToString()
+    {
+        return string.Join(", ", new[]
+        {
+            $"Row: {Index}",
+            Batch != null ? $"{Batch}" : null,
+            $"Runner = {RunnerFramework}",
+            $"TargetFramework = {TargetFramework}",
+            string.IsNullOrEmpty(InIsolationValue) ? "InProcess" : "InIsolation",
+            VSTestConsoleInfo?.ToString(),
+            TestHostInfo == null ? null : string.Join(",", TestHostInfo),
+            AdapterInfo == null ? null : string.Join(",", AdapterInfo)
+        }.Where(s => s != null));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs
new file mode 100644
index 0000000000..d67d02f975
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[AttributeUsage(AttributeTargets.Method)]
+public abstract class TestDataSourceAttribute<T1> : Attribute, ITestDataSource where T1 : notnull
+{
+    private readonly List<object[]> _data = new();
+
+    public abstract void CreateData(MethodInfo methodInfo);
+
+    public void AddData(T1 value1)
+    {
+        _data.Add([value1]);
+    }
+
+    public virtual string GetDisplayName(MethodInfo methodInfo, T1 value1)
+    {
+        return $"{methodInfo.Name} ({value1})";
+    }
+
+    IEnumerable<object[]> ITestDataSource.GetData(MethodInfo methodInfo)
+    {
+        CreateData(methodInfo);
+        return _data;
+    }
+
+    string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return GetDisplayName(methodInfo, (T1)data![0]!);
+    }
+}
+
+[AttributeUsage(AttributeTargets.Method)]
+public abstract class TestDataSourceAttribute<T1, T2> : Attribute, ITestDataSource
+    where T1 : notnull
+    where T2 : notnull
+{
+    private readonly List<object[]> _data = new();
+
+    public abstract void CreateData(MethodInfo methodInfo);
+
+    public void AddData(T1 value1, T2 value2)
+    {
+        _data.Add([value1, value2]);
+    }
+
+    public virtual string GetDisplayName(MethodInfo methodInfo, T1 value1, T2 value2)
+    {
+        return $"{methodInfo.Name} ({value1}, {value2})";
+    }
+
+    IEnumerable<object[]> ITestDataSource.GetData(MethodInfo methodInfo)
+    {
+        CreateData(methodInfo);
+        return _data;
+    }
+
+    string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data![1]!);
+    }
+}
+
+[AttributeUsage(AttributeTargets.Method)]
+public abstract class TestDataSourceAttribute<T1, T2, T3> : Attribute, ITestDataSource
+    where T1 : notnull
+    where T2 : notnull
+    where T3 : notnull
+{
+    private readonly List<object[]> _data = new();
+
+    public abstract void CreateData(MethodInfo methodInfo);
+
+    public void AddData(T1 value1, T2 value2, T3 value3)
+    {
+        _data.Add([value1, value2, value3]);
+    }
+
+    public virtual string GetDisplayName(MethodInfo methodInfo, T1 value1, T2 value2, T3 value3)
+    {
+        return $"{methodInfo.Name} ({value1}, {value2}, {value3})";
+    }
+
+    IEnumerable<object[]> ITestDataSource.GetData(MethodInfo methodInfo)
+    {
+        CreateData(methodInfo);
+        return _data;
+    }
+
+    string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data![1]!, (T3)data![2]!);
+    }
+}
+
+[AttributeUsage(AttributeTargets.Method)]
+public abstract class TestDataSourceAttribute<T1, T2, T3, T4> : Attribute, ITestDataSource
+    where T1 : notnull
+    where T2 : notnull
+    where T3 : notnull
+    where T4 : notnull
+{
+    private readonly List<object[]> _data = [];
+
+    public abstract void CreateData(MethodInfo methodInfo);
+
+    public void AddData(T1 value1, T2 value2, T3 value3, T4 value4)
+    {
+        _data.Add([value1, value2, value3, value4]);
+    }
+
+    public virtual string GetDisplayName(MethodInfo methodInfo, T1 value1, T2 value2, T3 value3, T4 value4)
+    {
+        return $"{methodInfo.Name} ({value1}, {value2}, {value3}, {value4})";
+    }
+
+    IEnumerable<object[]> ITestDataSource.GetData(MethodInfo methodInfo)
+    {
+        CreateData(methodInfo);
+        return _data;
+    }
+
+    string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data)
+    {
+        return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data![1]!, (T3)data![2]!, (T4)data![3]!);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs
new file mode 100644
index 0000000000..58715203fb
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestPlatformCompatibilityDataSource.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// A data source that provides a huge mix of runners, hosts and mstest adapter, to add up >100 tests.
+/// You can control which runner versions, host versions, and adapter versions will be used. This should be
+/// used only to test the most common scenarios, or special configurations that are candidates for their own
+/// specialized source.
+///
+/// By default net462 and net8.0 are used for both runner and host. (4 combinations)
+/// Then run with every version of runner is added.
+/// Then run with every version of test.sdk is added.
+/// Then run with every combination of testhost and adapter is added.
+/// And then run in process is added.
+///
+/// All of those are filtered down to have no duplicates, and to pass the
+/// Before and After platform version filters, and adapter filters.
+///
+/// When that adds up to no configuration exception is thrown.
+/// </summary>
+public class TestPlatformCompatibilityDataSource : TestDataSourceAttribute<RunnerInfo>
+{
+    private readonly CompatibilityRowsBuilder _builder;
+
+    public TestPlatformCompatibilityDataSource(
+        string runnerFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string runnerVersions = AcceptanceTestBase.LATEST_TO_LEGACY,
+        string hostFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string hostVersions = AcceptanceTestBase.LATEST_TO_LEGACY,
+        string adapterVersions = AcceptanceTestBase.LATESTPREVIEW_TO_LEGACY,
+        string adapters = AcceptanceTestBase.MSTEST)
+    {
+        // TODO: We actually don't generate values to use different translation layers, because we don't have a good way to do
+        // that right now. Translation layer is loaded directly into the acceptance test, and so we don't have easy way to substitute it.
+
+        _builder = new CompatibilityRowsBuilder(runnerFrameworks, runnerVersions, hostFrameworks, hostVersions, adapterVersions, adapters);
+        // Do not generate the data rows here, properties (e.g. DebugVSTestConsole) are not populated until after constructor is done.
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    /// <summary>
+    /// Add run for in-process using the selected .NET Framework runners, and and all selected adapters.
+    /// </summary>
+    public bool WithInProcess { get; set; } = true;
+
+    public bool WithEveryVersionOfRunner { get; set; } = true;
+
+    public bool WithEveryVersionOfHost { get; set; } = true;
+
+    public bool WithEveryVersionOfAdapter { get; set; } = true;
+
+    public bool WithOlderConfigurations { get; set; } = true;
+
+    public string? BeforeRunnerFeature { get; set; }
+    public string? AfterRunnerFeature { get; set; }
+
+    public string? BeforeTestHostFeature { get; set; }
+    public string? AfterTestHostFeature { get; set; }
+
+    public string? BeforeAdapterFeature { get; set; }
+    public string? AfterAdapterFeature { get; set; }
+
+    public override void CreateData(MethodInfo methodInfo)
+    {
+        _builder.WithEveryVersionOfRunner = WithEveryVersionOfRunner;
+        _builder.WithEveryVersionOfHost = WithEveryVersionOfHost;
+        _builder.WithEveryVersionOfAdapter = WithEveryVersionOfAdapter;
+        _builder.WithOlderConfigurations = WithOlderConfigurations;
+        _builder.WithInProcess = WithInProcess;
+
+        _builder.BeforeRunnerFeature = BeforeRunnerFeature;
+        _builder.AfterRunnerFeature = AfterRunnerFeature;
+
+        _builder.BeforeTestHostFeature = BeforeTestHostFeature;
+        _builder.AfterTestHostFeature = AfterTestHostFeature;
+
+        _builder.BeforeAdapterFeature = BeforeAdapterFeature;
+        _builder.AfterAdapterFeature = AfterAdapterFeature;
+
+        _builder.DebugDataCollector = DebugDataCollector;
+        _builder.DebugVSTestConsole = DebugVSTestConsole;
+        _builder.DebugTestHost = DebugTestHost;
+        _builder.DebugStopAtEntrypoint = DebugStopAtEntrypoint;
+
+        var data = _builder.CreateData();
+        data.ForEach(AddData);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TesthostCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TesthostCompatibilityDataSource.cs
new file mode 100644
index 0000000000..70db6ca909
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TesthostCompatibilityDataSource.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+/// <summary>
+/// A data source that provides every testhost.
+///
+/// When that adds up to no configuration exception is thrown.
+/// </summary>
+public class TestHostCompatibilityDataSource : TestDataSourceAttribute<RunnerInfo>
+{
+    private readonly CompatibilityRowsBuilder _builder;
+
+    public TestHostCompatibilityDataSource(
+        string runnerFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string hostFrameworks = AcceptanceTestBase.DEFAULT_HOST_NETFX_AND_NET,
+        string hostVersions = AcceptanceTestBase.LATEST_TO_LEGACY)
+    {
+        // TODO: We actually don't generate values to use different translation layers, because we don't have a good way to do
+        // that right now. Translation layer is loaded directly into the acceptance test, and so we don't have easy way to substitute it.
+
+        _builder = new CompatibilityRowsBuilder(
+            runnerFrameworks,
+            // runner versions
+            AcceptanceTestBase.LATEST,
+            hostFrameworks,
+            hostVersions,
+            // adapter versions
+            AcceptanceTestBase.LATESTSTABLE,
+            // adapter
+            AcceptanceTestBase.MSTEST);
+
+        // Do not generate the data rows here, properties (e.g. DebugVSTestConsole) are not populated until after constructor is done.
+    }
+
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+
+    public string? BeforeFeature { get; set; }
+    public string? AfterFeature { get; set; }
+
+    public override void CreateData(MethodInfo methodInfo)
+    {
+        _builder.WithEveryVersionOfRunner = false;
+        _builder.WithEveryVersionOfHost = true;
+        _builder.WithEveryVersionOfAdapter = false;
+        _builder.WithOlderConfigurations = false;
+        _builder.WithInProcess = false;
+
+        _builder.BeforeTestHostFeature = BeforeFeature;
+        _builder.AfterTestHostFeature = AfterFeature;
+
+        _builder.DebugDataCollector = DebugDataCollector;
+        _builder.DebugVSTestConsole = DebugVSTestConsole;
+        _builder.DebugTestHost = DebugTestHost;
+        _builder.DebugStopAtEntrypoint = DebugStopAtEntrypoint;
+
+        var data = _builder.CreateData();
+        data.ForEach(AddData);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FilePatternParserTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FilePatternParserTests.cs
new file mode 100644
index 0000000000..a7f30c2ad9
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FilePatternParserTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class FilePatternParserTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void WildCardPatternShouldCorrectlyWorkOnFiles(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssembly = GetSampleTestAssembly();
+        testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
+
+        var arguments = PrepareArguments(
+           testAssembly,
+           GetTestAdapterPath(),
+           string.Empty, FrameworkArgValue,
+           runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void WildCardPatternShouldCorrectlyWorkOnArbitraryDepthDirectories(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssembly = GetSampleTestAssembly();
+
+        // Add one more directory to the temp path, so we can substitute it with **
+        // and copy then whole directory there.
+        TempDirectory.CopyDirectory(Path.GetDirectoryName(testAssembly)!, Path.Combine(TempDirectory.Path, "dir1"));
+
+        // The path will end up looking like <random temp dir>\**\"*TestProj*.dll".
+        var wildcardedPath = Path.Combine(TempDirectory.Path, "**", "*TestProj*.dll");
+
+        var arguments = PrepareArguments(
+           wildcardedPath,
+           GetTestAdapterPath(),
+           string.Empty, string.Empty,
+           runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void WildCardPatternShouldCorrectlyWorkForRelativeAssemblyPath(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssembly = GetSampleTestAssembly();
+        testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
+
+        var wildCardIndex = testAssembly.IndexOfAny(['*']);
+        var testAssemblyDirectory = testAssembly.Substring(0, wildCardIndex);
+        testAssembly = testAssembly.Substring(wildCardIndex);
+
+        Directory.SetCurrentDirectory(testAssemblyDirectory);
+
+        var arguments = PrepareArguments(
+           testAssembly,
+           GetTestAdapterPath(),
+           string.Empty, string.Empty,
+           runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void WildCardPatternShouldCorrectlyWorkOnMultipleFiles(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssembly = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll");
+        testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
+        testAssembly = testAssembly.Replace("SimpleTestProject2.dll", "*TestProj*.dll");
+
+        var arguments = PrepareArguments(
+           testAssembly,
+           GetTestAdapterPath(),
+           string.Empty, FrameworkArgValue,
+           runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(2, 2, 2);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs
new file mode 100644
index 0000000000..29f2bccb69
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/FrameworkTests.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class FrameworkTests : AcceptanceTestBase
+{
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void FrameworkArgumentShouldWork(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " ", $"/Framework:{FrameworkArgValue}");
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void FrameworkShortNameArgumentShouldWork(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " ", $"/Framework:{_testEnvironment.TargetFramework}");
+
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    // framework runner not available on Linux
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
+    //[NetCoreTargetFrameworkDataSource]
+    public void OnWrongFrameworkPassedTestRunShouldNotRun(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: TempDirectory.Path);
+        if (runnerInfo.TargetFramework.Contains("netcore"))
+        {
+            arguments = string.Concat(arguments, " ", "/Framework:Framework45");
+        }
+        else
+        {
+            arguments = string.Concat(arguments, " ", "/Framework:FrameworkCore10");
+        }
+        InvokeVsTest(arguments);
+
+        if (runnerInfo.TargetFramework.Contains("netcore"))
+        {
+            StdOutputContains("No test is available");
+        }
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    [TestCategory("Windows-Review")]
+    public void RunSpecificTestsShouldWorkWithFrameworkInCompatibleWarning(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " ", "/tests:PassingTest");
+        arguments = string.Concat(arguments, " ", "/Framework:Framework40");
+
+        InvokeVsTest(arguments);
+
+        // When this test runs it provides an incorrect desired framework for the run. E.g. the dll is actually net8.0
+        // but we request to run as .NET Framework 4.0. On windows this has predictable results, for net8.0 dll we fail
+        // to load it into .NET Framework testhost.exe, and fail with "No test is available". For .NET Framework dll, we
+        // just log a warning saying that we provided .NET Framework 472 dlls (or whatever the current tfm for test dlls is),
+        // but the settings requested .NET Framework 4.0. The test will still run because .NET Framework is compatible, and in reality
+        // the system has .NET Framework 472 or newer installed, which runs even if we ask for .NET Framework 4.0 testhost.
+        //
+        // On Linux and Mac we execute only net8.0 tests, and even though we force .NET Framework, we end up running on mono
+        // which is suprisingly able to run the .NET CoreApp 3.1 dll, so we still just see a warning and 1 completed test.
+        var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
+        if (runnerInfo.TargetFramework.Contains("net8") && isWindows)
+        {
+            StdOutputContains("No test is available");
+        }
+        else
+        {
+            StdOutputContains("Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.0 framework and X64 platform.");
+            ValidateSummaryStatus(1, 0, 0);
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs
new file mode 100644
index 0000000000..b268f3e639
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+// this is tested only on .NET Framework
+[TestCategory("Windows-Review")]
+public class ListExtensionsTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
+    public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTest("/listDiscoverers");
+
+        if (IsDesktopRunner())
+        {
+            StdOutputContains("executor://mstestadapter/v1");
+            StdOutputContains("executor://cppunittestexecutor/v1");
+        }
+        else
+        {
+            // There are no inbox adapters for dotnet core
+            StdOutputDoesNotContains("executor://mstestadapter/v1");
+            StdOutputDoesNotContains("executor://cppunittestexecutor/v1");
+        }
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
+    public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTest("/listExecutors");
+
+        if (IsDesktopRunner())
+        {
+            StdOutputContains("executor://MSTestAdapter/v1");
+            StdOutputContains("executor://CppUnitTestExecutor/v1");
+            StdOutputContains("executor://UAPCppExecutorIdentifier");
+        }
+        else
+        {
+            // There are no inbox adapters for dotnet core
+            StdOutputDoesNotContains("executor://MSTestAdapter/v1");
+            StdOutputDoesNotContains("executor://CppUnitTestExecutor/v1");
+            StdOutputDoesNotContains("executor://UAPCppExecutorIdentifier");
+        }
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
+    public void ListLoggersShouldShowInboxLoggers(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTest("/listLoggers");
+
+        StdOutputContains("logger://Microsoft/TestPlatform/Extensions/Blame/v1");
+        StdOutputContains("logger://Microsoft/TestPlatform/TrxLogger/v1");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
+    public void ListSettingsProvidersShouldShowInboxSettingsProviders(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTest("/listSettingsProviders");
+
+        if (IsDesktopRunner())
+        {
+            StdOutputContains("MSTestSettingsProvider");
+        }
+        else
+        {
+            // There are no inbox adapters for dotnet core
+            StdOutputDoesNotContains("MSTestSettingsProvider");
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/LoggerTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/LoggerTests.cs
new file mode 100644
index 0000000000..4bf30e4da6
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/LoggerTests.cs
@@ -0,0 +1,257 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class LoggerTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void TrxLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        var trxFileName = "TestResults.trx";
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
+        InvokeVsTest(arguments);
+
+        arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
+        arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+        InvokeVsTest(arguments);
+
+        var trxFilePath = Path.Combine(TempDirectory.Path, trxFileName);
+        Assert.IsTrue(IsValidXml(trxFilePath), "Invalid content in Trx log file");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        var htmlFileName = "TestResults.html";
+        arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
+        InvokeVsTest(arguments);
+
+        arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
+        arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+        InvokeVsTest(arguments);
+
+        var htmlLogFilePath = Path.Combine(TempDirectory.Path, htmlFileName);
+        IsFileAndContentEqual(htmlLogFilePath);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void HtmlLoggerWithFriendlyNameContainsExpectedContent(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        var htmlFileName = "TestResults.html";
+        arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
+        InvokeVsTest(arguments);
+
+        var htmlLogFilePath = Path.Combine(TempDirectory.Path, htmlFileName);
+        XmlDocument report = LoadReport(htmlLogFilePath);
+
+        AssertExpectedHtml(report.DocumentElement!);
+    }
+
+    private static XmlDocument LoadReport(string htmlLogFilePath)
+    {
+        // XML reader cannot handle <br> tags because they are not closed, and hence are not valid XML.
+        // They are correct HTML though, so we patch it here.
+        var text = File.ReadAllText(htmlLogFilePath).Replace("<br>", "<br/>");
+        var report = new XmlDocument();
+        report.Load(new StringReader(text));
+        return report;
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        var trxFileName = "TestResults.trx";
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFileName={trxFileName}\"");
+        InvokeVsTest(arguments);
+
+        arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFileName={trxFileName}\"");
+        arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+        InvokeVsTest(arguments);
+
+        var trxLogFilePath = Path.Combine(TempDirectory.Path, trxFileName);
+        Assert.IsTrue(IsValidXml(trxLogFilePath), "Invalid content in Trx log file");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    public void TrxLoggerWithLogFilePrefixShouldGenerateMultipleTrx(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var trxFileNamePattern = "TestResults";
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFilePrefix={trxFileNamePattern}\"");
+        InvokeVsTest(arguments);
+
+        arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFilePrefix={trxFileNamePattern}\"");
+        arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+        InvokeVsTest(arguments);
+
+        var trxFilePaths = Directory.EnumerateFiles(TempDirectory.Path, trxFileNamePattern + "_net*.trx");
+        Assert.IsTrue(trxFilePaths.Count() > 1);
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        var htmlFileName = "TestResults.html";
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName={htmlFileName}\"");
+        InvokeVsTest(arguments);
+
+        arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, TempDirectory.Path);
+        arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName={htmlFileName}\"");
+        arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
+        InvokeVsTest(arguments);
+
+        var htmlLogFilePath = Path.Combine(TempDirectory.Path, htmlFileName);
+        IsFileAndContentEqual(htmlLogFilePath);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void TrxLoggerResultSummaryOutcomeValueShouldBeFailedIfNoTestsExecutedAndTreatNoTestsAsErrorIsTrue(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        var trxFilePath = Path.Combine(TempDirectory.Path, "TrxLogger.trx");
+
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFilePath}\"");
+
+        // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
+        arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
+
+        InvokeVsTest(arguments);
+
+        string? outcomeValue = GetElementAttributeValueFromTrx(trxFilePath, "ResultSummary", "outcome");
+
+        Assert.AreEqual("Failed", outcomeValue);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void TrxLoggerResultSummaryOutcomeValueShouldNotChangeIfNoTestsExecutedAndTreatNoTestsAsErrorIsFalse(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        var trxFilePath = Path.Combine(TempDirectory.Path, "TrxLogger.trx");
+
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFilePath}\"");
+
+        // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
+        arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
+        arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
+
+        InvokeVsTest(arguments);
+
+        string? outcomeValue = GetElementAttributeValueFromTrx(trxFilePath, "ResultSummary", "outcome");
+
+        Assert.AreEqual("Completed", outcomeValue);
+    }
+
+    private static void AssertExpectedHtml(XmlElement root)
+    {
+        XmlNodeList elementList = root.GetElementsByTagName("details");
+        Assert.AreEqual(2, elementList.Count);
+
+        foreach (XmlElement element in elementList)
+        {
+            Assert.AreEqual("summary", element.FirstChild?.Name);
+            if (element.HasAttributes)
+            {
+                Assert.AreEqual("open", element.Attributes[0].Name);
+            }
+        }
+    }
+
+    private static bool IsValidXml(string xmlFilePath)
+    {
+        try
+        {
+            using var file = File.OpenRead(xmlFilePath);
+            using var reader = XmlReader.Create(file);
+            while (reader.Read())
+            {
+            }
+
+            return true;
+        }
+        catch (XmlException)
+        {
+            return false;
+        }
+    }
+
+    private static void IsFileAndContentEqual(string filePath)
+    {
+        StringBuilder sb = new();
+        using (var sr = new StreamReader(filePath))
+        {
+            sb.Append(sr.ReadToEnd());
+        }
+
+        string filePathContent = sb.ToString();
+        string[] divs = ["Total tests", "Passed", "Failed", "Skipped", "Run duration", "Pass percentage", "PassingTest"];
+        foreach (string str in divs)
+        {
+            StringAssert.Contains(filePathContent, str);
+        }
+    }
+
+    private static string? GetElementAttributeValueFromTrx(string trxFileName, string fieldName, string attributeName)
+    {
+        using FileStream file = File.OpenRead(trxFileName);
+        using XmlReader reader = XmlReader.Create(file);
+        while (reader.Read())
+        {
+            if (reader.Name.Equals(fieldName) && reader.NodeType == XmlNodeType.Element && reader.HasAttributes)
+            {
+                return reader.GetAttribute(attributeName);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ManagedNameTests/SpecialNameTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ManagedNameTests/SpecialNameTests.cs
new file mode 100644
index 0000000000..4f48256f4f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ManagedNameTests/SpecialNameTests.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.TestPlatform.AcceptanceTests;
+using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Acceptance.IntegrationTests.ManagedNameTests;
+
+[TestClass]
+[TestCategory("Windows")]
+[TestCategory("AcceptanceTests")]
+public class SpecialNameTests : AcceptanceTestBase
+{
+    [TestMethod]
+    public void VerifyThatInvalidIdentifierNamesAreParsed()
+    {
+        var asset = _testEnvironment.GetTestAsset("CILProject.dll", "net462");
+        var assembly = Assembly.LoadFrom(asset);
+        var types = assembly.GetTypes();
+
+        // Some methods can be implemented directly on the module, and are not in any class. This is how we get them.
+        var modules = assembly.GetModules().Select(m => new { Module = m, Type = m.GetType() });
+        var moduleTypes = modules.Select(m =>
+        {
+            var runtimeTypeProperty = m.Type.GetProperty("RuntimeType", BindingFlags.Instance | BindingFlags.NonPublic);
+            var moduleType = (Type?)runtimeTypeProperty!.GetValue(m.Module, null)!;
+
+            return moduleType;
+        });
+
+        foreach (var type in types.Concat(moduleTypes).Where(t => t != null))
+        {
+            var methods = type!.GetMethods();
+
+            foreach (var method in methods)
+            {
+                // Module methods have null Declaring type.
+                if (method.DeclaringType != null && method.DeclaringType != type) continue;
+
+                ManagedNameHelper.GetManagedName(method, out var typeName, out var methodName);
+                var methodInfo = ManagedNameHelper.GetMethod(assembly, typeName, methodName);
+                ManagedNameHelper.GetManagedName(methodInfo, out var typeName2, out var methodName2);
+
+                Assert.IsTrue(method == methodInfo);
+                Assert.AreEqual(typeName, typeName2, $"Type parse roundtrip test failed: {method} ({typeName} != {typeName2})");
+                Assert.AreEqual(methodName, methodName2, $"Method parse roundtrip test failed: {method} ({methodName} != {methodName2})");
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MetadataReaderHelperTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MetadataReaderHelperTests.cs
new file mode 100644
index 0000000000..090009c7e8
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MetadataReaderHelperTests.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class MetadataReaderHelperTests : AcceptanceTestBase
+{
+    [TestMethod]
+    public void MetadataReaderHelper_GetCollectorExtensionTypes()
+    {
+        var dataCollectorFilePath = GetTestDllForFramework("AttachmentProcessorDataCollector.dll", "netstandard2.0");
+        var types = MetadataReaderExtensionsHelper.DiscoverTestExtensionTypesV2Attribute(Assembly.LoadFile(dataCollectorFilePath), dataCollectorFilePath);
+        Assert.IsTrue(types.Any(), $"File {dataCollectorFilePath}");
+        Assert.IsTrue(types[0].AssemblyQualifiedName!.StartsWith("AttachmentProcessorDataCollector.SampleDataCollectorV2"), $"File {dataCollectorFilePath}");
+        Assert.AreEqual(dataCollectorFilePath.Replace("/", @"\"), types[0].Assembly.Location.Replace("/", @"\"), $"File {dataCollectorFilePath}");
+        Assert.IsTrue(types[1].AssemblyQualifiedName!.StartsWith("AttachmentProcessorDataCollector.SampleDataCollectorV1"), $"File {dataCollectorFilePath}");
+        Assert.AreEqual(dataCollectorFilePath.Replace("/", @"\"), types[1].Assembly.Location.Replace("/", @"\"), $"File {dataCollectorFilePath}");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
new file mode 100644
index 0000000000..b675da7454
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --settings "$(MSBuildThisFileDirectory)\.runsettings"</TestRunnerAdditionalArguments>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="TestAssets\**" />
+    <None Remove="TestAssets\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="BannedSymbols.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
+    <ProjectReference Include="$(RepoRoot)test\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\vstest.console\vstest.console.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
+    <PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP" Version="2.0.0" />
+    <PackageReference Include="Microsoft.TestPlatform.QTools.Assets" Version="2.0.0" />
+    <PackageReference Include="Procdump" Version="0.0.1" />
+    <PackageReference Include="NuGet.Versioning" Version="6.1.0" />
+    <PackageReference Include="Microsoft.CodeCoverage.Core" Version="$(MicrosoftInternalCodeCoverageVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
+    <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0-preview2-26406-04" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Performance\" />
+  </ItemGroup>
+  <ItemGroup>
+    <!--
+      Always reference Dia package even if it contains only tools for net451, we then use a content
+      include with copy to output to ensure tests are working correctly for the different TFMs.
+      Also note that depending on your machine architecture, for net48, the package will add
+      'x86' and 'amd64' subfolders but the logic of the code is to look into 'x86', 'x64' or 'arm64'.
+    -->
+    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="all" />
+    <Content Include="..\..\.packages\microsoft.internal.dia\$(TestPlatformMSDiaVersion)\tools\net451\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MultitargetingTestHostTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MultitargetingTestHostTests.cs
new file mode 100644
index 0000000000..aa90fc1833
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/MultitargetingTestHostTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class MultitargetingTestHostTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    // the underlying test is using xUnit to avoid AppDomain enhancements in MSTest that make this pass even without multitargetting
+    // xUnit supports net452 onwards, so that is why this starts at net452, I also don't test all framework versions
+    [NetCoreRunner(NETFX462_48)]
+    [NetFrameworkRunner(NETFX462_48)]
+    public void TestRunInATesthostThatTargetsTheirChosenNETFramework(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("MultitargetedNetFrameworkProject.dll");
+        var arguments = PrepareArguments(assemblyPath, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        // Tell the test project which target framework we are expecting it to run as.
+        // It has this value conditionally compiled, so it can compare it.
+        var env = new Dictionary<string, string?>
+        {
+            ["EXPECTED_TARGET_FRAMEWORK"] = runnerInfo.TargetFramework
+        };
+
+        InvokeVsTest(arguments, env);
+
+        ValidateSummaryStatus(passed: 1, failed: 0, 0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/Constants.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/Constants.cs
new file mode 100644
index 0000000000..0772e8adaa
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/Constants.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+
+/// <summary>
+/// The constants.
+/// </summary>
+public class Constants
+{
+    /// <summary>
+    /// The discovery task.
+    /// </summary>
+    public const string DiscoveryTask = "Discovery";
+
+    /// <summary>
+    /// The execution task.
+    /// </summary>
+    public const string ExecutionTask = "Execution";
+
+    /// <summary>
+    /// The execution request task.
+    /// </summary>
+    public const string ExecutionRequestTask = "ExecutionRequest";
+
+    /// <summary>
+    /// The discovery request task.
+    /// </summary>
+    public const string DiscoveryRequestTask = "DiscoveryRequest";
+
+    /// <summary>
+    /// The test host task.
+    /// </summary>
+    public const string TestHostTask = "TestHost";
+
+    /// <summary>
+    /// The vs test console task.
+    /// </summary>
+    public const string VsTestConsoleTask = "VsTestConsole";
+
+    /// <summary>
+    /// The adapter search task.
+    /// </summary>
+    public const string AdapterSearchTask = "AdapterSearch";
+
+    /// <summary>
+    /// The adapter execution task.
+    /// </summary>
+    public const string AdapterExecutionTask = "AdapterExecution";
+
+    /// <summary>
+    /// The adapter discovery task.
+    /// </summary>
+    public const string AdapterDiscoveryTask = "AdapterDiscovery";
+
+    #region PayLoad Property Names
+
+    /// <summary>
+    /// The execution uri property.
+    /// </summary>
+    public const string ExecutionUriProperty = "executorUri";
+
+    /// <summary>
+    /// The number of tests property.
+    /// </summary>
+    public const string NumberOfTestsProperty = "numberOfTests";
+    #endregion
+
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerfAnalyzer.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerfAnalyzer.cs
new file mode 100644
index 0000000000..3e89d97d85
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerfAnalyzer.cs
@@ -0,0 +1,278 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+using System.Collections.Generic;
+using System.IO;
+
+using System;
+using System.Linq;
+
+using Microsoft.Diagnostics.Tracing;
+using Microsoft.Diagnostics.Tracing.Parsers;
+using Microsoft.Diagnostics.Tracing.Session;
+using System.Globalization;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+
+/// <summary>
+/// The performance analyzer.
+/// </summary>
+public class PerfAnalyzer
+{
+    /// <summary>
+    /// The etw session provider name.
+    /// </summary>
+    private const string EtwSessionProviderName = "TestPlatform";
+
+    private readonly string _perfDataFileName;
+    private readonly TraceEventSession _traceEventSession;
+    private readonly Dictionary<string, List<TestPlatformTask>> _testPlatformTaskMap;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerfAnalyzer"/> class.
+    /// </summary>
+    public PerfAnalyzer()
+    {
+        // It is important to make the file and session name random,
+        // otherwise there are a lot of errors from wmi that are "random".
+        var name = $"TestPlatform{Guid.NewGuid()}";
+        _perfDataFileName = $"{name}.etl";
+        _testPlatformTaskMap = new Dictionary<string, List<TestPlatformTask>>();
+        _traceEventSession = new TraceEventSession(name, _perfDataFileName);
+    }
+
+    /// <summary>
+    /// Returns disposable wrapper that starts and stops performance tracing, and analyzes the data up on dispose.
+    /// </summary>
+    /// <returns></returns>
+    public PerfTracker Start()
+    {
+        return new PerfTracker(this);
+    }
+
+    public List<TestPlatformEvent> Events { get; } = new();
+
+    /// <summary>
+    /// The enable provider.
+    /// </summary>
+    private void EnableProvider()
+    {
+        _traceEventSession.StopOnDispose = true;
+        _traceEventSession.EnableProvider(EtwSessionProviderName);
+    }
+
+    /// <summary>
+    /// The disable provider.
+    /// </summary>
+    private void DisableProvider()
+    {
+        Console.WriteLine($"Lost events: {_traceEventSession.EventsLost}");
+        _traceEventSession.Flush();
+        _traceEventSession.Dispose();
+    }
+
+    /// <summary>
+    /// The analyze events data.
+    /// </summary>
+    private void AnalyzeEventsData()
+    {
+        using var source = new ETWTraceEventSource(_perfDataFileName);
+        // Open the file
+        var parser = new DynamicTraceEventParser(source);
+        parser.All += delegate (TraceEvent data)
+        {
+            try
+            {
+                if (data.ProviderName.Equals("TestPlatform") && !data.EventName.Equals("ManifestData"))
+                {
+                    Console.WriteLine("Received Event : {0}", data.ToString(CultureInfo.CurrentCulture));
+                    var key = $"{data.ProcessID}_{data.ThreadID}_{data.TaskName}";
+                    Events.Add(new TestPlatformEvent(data.EventName, data.TimeStampRelativeMSec));
+
+                    if (!_testPlatformTaskMap.ContainsKey(key))
+                    {
+                        var list = new List<TestPlatformTask> { CreateTestPlatformTask(data) };
+                        _testPlatformTaskMap.Add(key, list);
+                    }
+                    else
+                    {
+                        if (data.Opcode == TraceEventOpcode.Start)
+                        {
+                            _testPlatformTaskMap[key].Add(CreateTestPlatformTask(data));
+                        }
+                        else
+                        {
+                            UpdateTask(_testPlatformTaskMap[key].Last(), data);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.ToString());
+            }
+        };
+        source.Process(); // Read the file, processing the callbacks.
+
+        source.StopProcessing();
+        File.Delete(_perfDataFileName);
+    }
+
+    /// <summary>
+    /// The get elapsed time by task name.
+    /// </summary>
+    /// <param name="taskName">
+    /// The task name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="double"/>.
+    /// </returns>
+    public double GetElapsedTimeByTaskName(string taskName)
+    {
+        var timeTaken = 0.0;
+        var key = GetEventKey(taskName);
+
+        if (key != null)
+        {
+            var task = _testPlatformTaskMap[key].First();
+            timeTaken = task.EventStopped - task.EventStarted;
+        }
+        return timeTaken;
+    }
+
+    /// <summary>
+    /// The get event data by task name.
+    /// </summary>
+    /// <param name="taskName">
+    /// The task name.
+    /// </param>
+    /// <returns>
+    /// The <see cref="IDictionary{TKey,TValue}"/>.
+    /// </returns>
+    public IDictionary<string, string> GetEventDataByTaskName(string taskName)
+    {
+        IDictionary<string, string> properties = new Dictionary<string, string>();
+        var key = GetEventKey(taskName);
+
+        if (key != null)
+        {
+            properties = _testPlatformTaskMap[key].First().PayLoadProperties;
+        }
+
+        return properties;
+    }
+
+    public double GetAdapterExecutionTime(string executorUri)
+    {
+        var timeTaken = 0.0;
+        var key = GetEventKey(Constants.AdapterExecutionTask);
+
+        if (key != null)
+        {
+            var task = _testPlatformTaskMap[key].Find(t => t.PayLoadProperties["executorUri"].Equals(executorUri));
+            timeTaken = task.EventStopped - task.EventStarted;
+        }
+
+        return timeTaken;
+    }
+
+    public long GetAdapterExecutedTests(string executorUri)
+    {
+        long totalTestsExecuted = 0;
+        var key = GetEventKey(Constants.AdapterExecutionTask);
+
+        if (key != null)
+        {
+            var task = _testPlatformTaskMap[key].Find(t => t.PayLoadProperties["executorUri"].Equals(executorUri));
+            _ = long.TryParse(task.PayLoadProperties["numberOfTests"], out totalTestsExecuted);
+        }
+
+        return totalTestsExecuted;
+    }
+
+
+    private string? GetEventKey(string taskName)
+    {
+        string? key = null;
+
+        key = _testPlatformTaskMap.Keys.FirstOrDefault(k => k.Split('_')[2].Equals(taskName));
+
+        return key;
+    }
+
+    private static TestPlatformTask CreateTestPlatformTask(TraceEvent data)
+    {
+        var task = new TestPlatformTask(data.TaskName, data.TimeStampRelativeMSec);
+        task.PayLoadProperties = GetPayloadProperties(data);
+        return task;
+    }
+
+    private static void UpdateTask(TestPlatformTask task, TraceEvent data)
+    {
+        task.EventStopped = data.TimeStampRelativeMSec;
+        var payLoadProperties = GetPayloadProperties(data);
+
+        //Merging dictionaries look for better way
+        foreach (var k in payLoadProperties.Keys)
+        {
+            if (!task.PayLoadProperties.ContainsKey(k))
+            {
+                task.PayLoadProperties.Add(k, payLoadProperties[k]);
+            }
+        }
+    }
+
+    private static IDictionary<string, string> GetPayloadProperties(TraceEvent data)
+    {
+        var payLoadProperties = new Dictionary<string, string>();
+
+        foreach (var payLoad in data.PayloadNames)
+        {
+            var payLoadData = data.PayloadByName(payLoad).ToString();
+            if (!payLoadProperties.ContainsKey(payLoad))
+            {
+                payLoadProperties.Add(payLoad, payLoadData);
+            }
+            else
+            {
+                payLoadProperties[payLoad] = payLoadData;
+            }
+        }
+
+        return payLoadProperties;
+    }
+
+    public class PerfTracker : IDisposable
+    {
+        private readonly PerfAnalyzer _perfAnalyzer;
+        private bool _isDisposed;
+
+        public PerfTracker(PerfAnalyzer perfAnalyzer)
+        {
+            _perfAnalyzer = perfAnalyzer;
+            _perfAnalyzer.EnableProvider();
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing)
+            {
+                _perfAnalyzer.DisableProvider();
+                _perfAnalyzer.AnalyzeEventsData();
+            }
+
+            _isDisposed = true;
+        }
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerformanceTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerformanceTestBase.cs
new file mode 100644
index 0000000000..1d3d54c649
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/PerformanceTestBase.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+
+/// <summary>
+/// The performance test base.
+/// </summary>
+public class PerformanceTestBase : AcceptanceTestBase
+{
+    private readonly PerfAnalyzer _perfAnalyzer;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerformanceTestBase"/> class.
+    /// </summary>
+    public PerformanceTestBase()
+        : base()
+    {
+#if NET
+        throw new InvalidOperationException("Perf tests are not supported on .NET");
+#else
+        _perfAnalyzer = new PerfAnalyzer();
+#endif
+    }
+
+    /// <summary>
+    /// The run execution performance tests.
+    /// </summary>
+    /// <param name="testAsset">
+    /// The test asset.
+    /// </param>
+    /// <param name="testAdapterPath">
+    /// The test adapter path.
+    /// </param>
+    /// <param name="runSettings">
+    /// The run settings.
+    /// </param>
+    public void RunExecutionPerformanceTests(string testAsset, string testAdapterPath, string runSettings)
+    {
+        using (_perfAnalyzer.Start())
+        {
+            InvokeVsTestForExecution(testAsset, testAdapterPath, framework: string.Empty, runSettings);
+        }
+    }
+
+    /// <summary>
+    /// The run discovery performance tests.
+    /// </summary>
+    /// <param name="testAsset">
+    /// The test asset.
+    /// </param>
+    /// <param name="testAdapterPath">
+    /// The test adapter path.
+    /// </param>
+    /// <param name="runSettings">
+    /// The run settings.
+    /// </param>
+    public void RunDiscoveryPerformanceTests(string testAsset, string testAdapterPath, string runSettings)
+    {
+        using (_perfAnalyzer.Start())
+        {
+            InvokeVsTestForDiscovery(testAsset, testAdapterPath, runSettings);
+        }
+    }
+
+    /// <summary>
+    /// The get execution time.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="double"/>.
+    /// </returns>
+    public TimeSpan GetExecutionTime()
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetElapsedTimeByTaskName(Constants.ExecutionTask));
+    }
+
+    public TimeSpan GetDiscoveryTime()
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetElapsedTimeByTaskName(Constants.DiscoveryTask));
+    }
+
+    public TimeSpan GetVsTestTime()
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetElapsedTimeByTaskName(Constants.VsTestConsoleTask));
+    }
+
+    public TimeSpan GetTestHostTime()
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetElapsedTimeByTaskName(Constants.TestHostTask));
+    }
+
+    public TimeSpan GetAdapterSearchTime()
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetElapsedTimeByTaskName(Constants.AdapterSearchTask));
+    }
+
+    public IDictionary<string, string> GetDiscoveryData()
+    {
+        return _perfAnalyzer.GetEventDataByTaskName(Constants.AdapterDiscoveryTask);
+    }
+
+    public IDictionary<string, string> GetExecutionData()
+    {
+        return _perfAnalyzer.GetEventDataByTaskName(Constants.AdapterExecutionTask);
+    }
+
+    public TimeSpan GetAdapterExecutionTime(string executorUri)
+    {
+        return TimeSpan.FromMilliseconds(_perfAnalyzer.GetAdapterExecutionTime(executorUri));
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/TestPlatformTask.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/TestPlatformTask.cs
new file mode 100644
index 0000000000..736d9f2b33
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerfInstrumentation/TestPlatformTask.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+
+/// <summary>
+/// The test platform task.
+/// </summary>
+public class TestPlatformTask
+{
+    public string TaskName { get; set; }
+
+    public double EventStarted { get; set; }
+
+    public double EventStopped { get; set; }
+
+    public IDictionary<string, string> PayLoadProperties { get; set; }
+
+    public TestPlatformTask(string taskName, double eventStarted)
+    {
+        EventStarted = eventStarted;
+        TaskName = taskName;
+        PayLoadProperties = new Dictionary<string, string>();
+    }
+}
+
+public class TestPlatformEvent
+{
+    public TestPlatformEvent(string eventName, double timeSinceStart)
+    {
+        Name = eventName;
+        TimeSinceStart = timeSinceStart;
+    }
+
+    public string Name { get; }
+    public double TimeSinceStart { get; }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
new file mode 100644
index 0000000000..d82084b856
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System.Linq;
+
+using FluentAssertions;
+using FluentAssertions.Extensions;
+
+using Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance;
+
+/// <summary>
+/// The performance tests.
+/// </summary>
+[TestClass]
+[DoNotParallelize]
+[Ignore("The timing can vary significantly based on the system running the test. Convert them to report the results and not fail.")]
+public class PerformanceTests : TelemetryPerfTestBase
+{
+    [TestMethod]
+    [DataRow("MSTest1Passing", 1, 500)]
+    public void ExecutionPerformanceTest(string projectName, int expectedTestCount, int thresholdInMs)
+    {
+        RunExecutionPerformanceTests(GetPerfAssetFullPath(projectName).Single(), GetTestAdapterPath(), string.Empty);
+
+        ValidateSummaryStatus(expectedTestCount, 0, 0);
+
+        var actualExecutionTime = GetExecutionTime();
+
+        actualExecutionTime.Should().BeLessThanOrEqualTo(thresholdInMs.Milliseconds());
+    }
+
+    [TestMethod]
+    public void DiscoveryPerformanceTest()
+    {
+        RunDiscoveryPerformanceTests(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty);
+
+        ValidateDiscoveredTests(
+            "SampleUnitTestProject.UnitTest1.PassingTest",
+            "SampleUnitTestProject.UnitTest1.FailingTest",
+            "SampleUnitTestProject.UnitTest1.SkippingTest");
+
+        var actualDiscoveryTime = GetDiscoveryTime();
+
+        actualDiscoveryTime.Should().BeLessThanOrEqualTo(500.Milliseconds());
+    }
+
+    [TestMethod]
+    public void VsTestConsolePerformanceTest()
+    {
+        RunExecutionPerformanceTests(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty);
+
+        ValidateSummaryStatus(1, 1, 1);
+        ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
+        ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
+        ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
+
+        var actualVsTestTime = GetVsTestTime();
+
+        actualVsTestTime.Should().BeLessThanOrEqualTo(2500.Milliseconds());
+    }
+
+    [TestMethod]
+    public void TestHostPerformanceTest()
+    {
+        RunExecutionPerformanceTests(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty);
+
+        ValidateSummaryStatus(1, 1, 1);
+        ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
+        ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
+        ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
+
+        var actualTestHostTime = GetTestHostTime();
+
+        actualTestHostTime.Should().BeLessThanOrEqualTo(2000.Milliseconds());
+    }
+
+    [TestMethod]
+    public void MsTestV2AdapterPerformanceTest()
+    {
+        RunExecutionPerformanceTests(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty);
+
+        ValidateSummaryStatus(1, 1, 1);
+        ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
+        ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
+        ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
+
+        var actualAdapterTimeTaken = GetAdapterExecutionTime("executor://mstestadapter/v2");
+
+        actualAdapterTimeTaken.Should().BeLessThanOrEqualTo(1500.Milliseconds());
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
new file mode 100644
index 0000000000..5407ab1d94
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System;
+using System.Diagnostics;
+
+using FluentAssertions;
+using FluentAssertions.Extensions;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance;
+
+[TestClass]
+[DoNotParallelize]
+[Ignore("The timing can vary significantly based on the system running the test. Convert them to report the results and not fail.")]
+public class ProtocolV1Tests
+{
+    private static readonly TestCase TestCase = new(
+                                          "sampleTestClass.sampleTestCase",
+                                          new Uri("executor://sampleTestExecutor"),
+                                          "sampleTest.dll")
+    {
+        CodeFilePath = "/user/src/testFile.cs",
+        DisplayName = "sampleTestCase",
+        Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
+        LineNumber = 999,
+        Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
+    };
+
+    private static readonly DateTimeOffset StartTime = new(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
+
+    private static readonly TestResult TestResult = new(TestCase)
+    {
+        // Attachments = ?
+        // Messages = ?
+        // Different text values because they might be cached?
+        Outcome = TestOutcome.Passed,
+        ErrorMessage = "sampleError",
+        ErrorStackTrace = "sampleStackTrace",
+        DisplayName = "sampleTestResult",
+        ComputerName = "sampleComputerName",
+        Duration = TimeSpan.MaxValue,
+        StartTime = StartTime,
+        EndTime = DateTimeOffset.MaxValue
+    };
+
+    [TestMethod]
+    public void TestCaseSerialize()
+    {
+        SerializeV1(TestCase);
+        Stopwatch sw = Stopwatch.StartNew();
+
+        for (int i = 0; i < 10000; i++)
+        {
+            SerializeV1(TestCase);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
+    }
+
+    [TestMethod]
+    public void TestCaseDeserialize()
+    {
+        var json = SerializeV1(TestCase);
+        DeserializeV1<TestCase>(json);
+
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            DeserializeV1<TestCase>(json);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
+    }
+
+    [TestMethod]
+    public void TestResultSerialize()
+    {
+        SerializeV1(TestResult);
+        Stopwatch sw = Stopwatch.StartNew();
+
+        for (int i = 0; i < 10000; i++)
+        {
+            SerializeV1(TestResult);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
+    }
+
+    [TestMethod]
+    public void TestResultDeserialize()
+    {
+        var json = SerializeV1(TestResult);
+        DeserializeV1<TestResult>(json);
+
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            DeserializeV1<TestResult>(json);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(3.5.Seconds(), $"when de-serializing 10k test results");
+    }
+
+    private static string SerializeV1<T>(T data)
+    {
+        return JsonDataSerializer.Instance.Serialize(data, version: 1);
+    }
+
+    private static T DeserializeV1<T>(string json)
+    {
+        return JsonDataSerializer.Instance.Deserialize<T>(json, version: 1)!;
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
new file mode 100644
index 0000000000..9be5bae87f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System;
+using System.Diagnostics;
+
+using FluentAssertions;
+using FluentAssertions.Extensions;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance;
+
+[TestClass]
+[DoNotParallelize]
+[Ignore("The timing can vary significantly based on the system running the test. Convert them to report the results and not fail.")]
+public class ProtocolV2Tests
+{
+    private static readonly TestCase TestCase = new(
+        "sampleTestClass.sampleTestCase",
+        new Uri("executor://sampleTestExecutor"),
+        "sampleTest.dll")
+    {
+        CodeFilePath = "/user/src/testFile.cs",
+        DisplayName = "sampleTestCase",
+        Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
+        LineNumber = 999,
+        Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
+    };
+
+    private static readonly DateTimeOffset StartTime = new(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
+
+    private static readonly TestResult TestResult = new(TestCase)
+    {
+        // Attachments = ?
+        // Messages = ?
+        Outcome = TestOutcome.Passed,
+        ErrorMessage = "sampleError",
+        ErrorStackTrace = "sampleStackTrace",
+        DisplayName = "sampleTestResult",
+        ComputerName = "sampleComputerName",
+        Duration = TimeSpan.MaxValue,
+        StartTime = StartTime,
+        EndTime = DateTimeOffset.MaxValue
+    };
+
+    [TestMethod]
+    public void TestCaseSerialize2()
+    {
+        SerializeV2(TestCase);
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            SerializeV2(TestCase);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
+    }
+
+    [TestMethod]
+    public void TestCaseDeserialize2()
+    {
+        var json = SerializeV2(TestCase);
+        DeserializeV2<TestCase>(json);
+
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            DeserializeV2<TestCase>(json);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
+    }
+
+    [TestMethod]
+    public void TestResultSerialize2()
+    {
+        SerializeV2(TestResult);
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            SerializeV2(TestResult);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
+    }
+
+    [TestMethod]
+    public void TestResultDeserialize2()
+    {
+        var json = SerializeV2(TestResult);
+        DeserializeV2<TestResult>(json);
+
+        Stopwatch sw = Stopwatch.StartNew();
+        for (int i = 0; i < 10000; i++)
+        {
+            DeserializeV2<TestResult>(json);
+        }
+        sw.Stop();
+
+        var actualDuration = sw.Elapsed;
+        actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test results");
+    }
+
+    private static string SerializeV2<T>(T data)
+    {
+        return JsonDataSerializer.Instance.Serialize(data, version: 2);
+    }
+
+    private static T DeserializeV2<T>(string json)
+    {
+        return JsonDataSerializer.Instance.Deserialize<T>(json, version: 2)!;
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
new file mode 100644
index 0000000000..9b92290274
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+
+using FluentAssertions;
+using FluentAssertions.Extensions;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance;
+
+[TestClass]
+[DoNotParallelize]
+[Ignore("The timing can vary significantly based on the system running the test. Convert them to report the results and not fail.")]
+public class SocketTests
+{
+    [TestMethod]
+    public void SocketThroughput2()
+    {
+        // Measure the throughput with socket communication v2 (SocketServer, SocketClient)
+        // implementation.
+        var server = new SocketServer();
+        var client = new SocketClient();
+        ICommunicationChannel? serverChannel = null;
+        ICommunicationChannel? clientChannel = null;
+        ManualResetEventSlim dataTransferred = new(false);
+        ManualResetEventSlim clientConnected = new(false);
+        ManualResetEventSlim serverConnected = new(false);
+        int dataReceived = 0;
+        var watch = new Stopwatch();
+        var thread = new Thread(() => SendData(clientChannel, watch));
+
+        // Setup server
+        server.Connected += (sender, args) =>
+        {
+            serverChannel = args.Channel;
+            serverChannel!.MessageReceived.Subscribe((channel, messageReceived) =>
+            {
+                // Keep count of bytes
+                dataReceived += messageReceived.Data!.Length;
+
+                if (dataReceived >= 65536 * 20000)
+                {
+                    dataTransferred.Set();
+                    watch.Stop();
+                }
+            });
+
+            clientConnected.Set();
+        };
+
+        client.Connected += (sender, args) =>
+        {
+            clientChannel = args.Channel;
+
+            thread.Start();
+
+            serverConnected.Set();
+        };
+
+        var port = server.Start(IPAddress.Loopback.ToString() + ":0")!;
+        client.Start(port);
+
+        clientConnected.Wait();
+        serverConnected.Wait();
+        thread.Join();
+        dataTransferred.Wait();
+
+        watch.Elapsed.Should().BeLessThanOrEqualTo(15.Seconds());
+    }
+
+    [TestMethod]
+    public void SocketThroughput1()
+    {
+        // Measure the throughput with socket communication v1 (SocketCommunicationManager)
+        // implementation.
+        var server = new SocketCommunicationManager();
+        var client = new SocketCommunicationManager();
+        var watch = new Stopwatch();
+
+        int port = server.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+        client.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port)).Wait();
+        server.AcceptClientAsync().Wait();
+
+        server.WaitForClientConnection(1000);
+        client.WaitForServerConnection(1000);
+
+        var clientThread = new Thread(() => SendData2(client, watch));
+        clientThread.Start();
+
+        var dataReceived = 0;
+        while (dataReceived < 65536 * 20000)
+        {
+            dataReceived += server.ReceiveRawMessage()!.Length;
+        }
+
+        watch.Stop();
+        clientThread.Join();
+
+        watch.Elapsed.Should().BeLessThanOrEqualTo(20.Seconds());
+    }
+
+    private static void SendData(ICommunicationChannel? channel, Stopwatch watch)
+    {
+        var dataBytes = new byte[65536];
+        for (int i = 0; i < dataBytes.Length; i++)
+        {
+            dataBytes[i] = 0x65;
+        }
+
+        var dataBytesStr = System.Text.Encoding.UTF8.GetString(dataBytes);
+
+        watch.Start();
+        for (int i = 0; i < 20000; i++)
+        {
+            channel!.Send(dataBytesStr);
+        }
+    }
+
+    private static void SendData2(ICommunicationManager communicationManager, Stopwatch watch)
+    {
+        var dataBytes = new byte[65536];
+        for (int i = 0; i < dataBytes.Length; i++)
+        {
+            dataBytes[i] = 0x65;
+        }
+
+        var dataBytesStr = System.Text.Encoding.UTF8.GetString(dataBytes);
+
+        watch.Start();
+        for (int i = 0; i < 20000; i++)
+        {
+            communicationManager.SendRawMessage(dataBytesStr);
+        }
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/DiscoveryPerfTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/DiscoveryPerfTests.cs
new file mode 100644
index 0000000000..0d20a2c1f0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/DiscoveryPerfTests.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+
+[TestClass]
+[DoNotParallelize]
+public class DiscoveryPerfTests : TelemetryPerfTestBase
+{
+    [TestMethod]
+    [TestCategory("TelemetryPerf")]
+    [DataRow("MSTest1Passing", 1)]
+    [DataRow("MSTest100Passing", 100)]
+    [DataRow("MSTest1000Passing", 1000)]
+    [DataRow("MSTest10kPassing", 10_000)]
+    [DataRow("NUnit1Passing", 1)]
+    [DataRow("NUnit100Passing", 100)]
+    [DataRow("NUnit1000Passing", 1000)]
+    [DataRow("NUnit10kPassing", 10_000)]
+    [DataRow("XUnit1Passing", 1)]
+    [DataRow("XUnit100Passing", 100)]
+    [DataRow("XUnit1000Passing", 1000)]
+    [DataRow("XUnit10kPassing", 10_000)]
+    [DataRow("Perfy.TestAdapter", 1)]
+    [DataRow("Perfy.TestAdapter", 100)]
+    [DataRow("Perfy.TestAdapter", 1000)]
+    [DataRow("Perfy.TestAdapter", 10_000)]
+    public void DiscoverTests(string projectName, double expectedNumberOfTests)
+    {
+        var discoveryEventHandler2 = new DiscoveryEventHandler2();
+        TestPlatformOptions options = new() { CollectMetrics = true, };
+        var perfAnalyzer = new PerfAnalyzer();
+        using (perfAnalyzer.Start())
+        {
+            // This tells to PerfyTestAdapter how many tests it should return, this is our overhead baseline.
+            var perfyTestAdapterEnv = new Dictionary<string, string?> { ["TEST_COUNT"] = expectedNumberOfTests.ToString(CultureInfo.InvariantCulture) };
+            var vstestConsoleWrapper = GetVsTestConsoleWrapper(perfyTestAdapterEnv, traceLevel: System.Diagnostics.TraceLevel.Off);
+            var assetPath = GetPerfAssetFullPath(projectName);
+            vstestConsoleWrapper.DiscoverTests(assetPath, GetDefaultRunSettings(), options, discoveryEventHandler2);
+            vstestConsoleWrapper.EndSession();
+        }
+        Assert.AreEqual(expectedNumberOfTests, discoveryEventHandler2.Metrics![TelemetryDataConstants.TotalTestsDiscovered]);
+        PostTelemetry(discoveryEventHandler2.Metrics, perfAnalyzer, projectName);
+    }
+
+    [TestMethod]
+    [TestCategory("TelemetryPerf")]
+    [TestCategory("TelemetryPerf")]
+    [DataRow("MSTest1Passing", 1)]
+    [DataRow("MSTest100Passing", 100)]
+    [DataRow("MSTest1000Passing", 1000)]
+    [DataRow("MSTest10kPassing", 10_000)]
+    [DataRow("NUnit1Passing", 1)]
+    [DataRow("NUnit100Passing", 100)]
+    [DataRow("NUnit1000Passing", 1000)]
+    [DataRow("NUnit10kPassing", 10_000)]
+    [DataRow("XUnit1Passing", 1)]
+    [DataRow("XUnit100Passing", 100)]
+    [DataRow("XUnit1000Passing", 1000)]
+    [DataRow("XUnit10kPassing", 10_000)]
+    [DataRow("Perfy.TestAdapter", 1)]
+    [DataRow("Perfy.TestAdapter", 100)]
+    [DataRow("Perfy.TestAdapter", 1000)]
+    [DataRow("Perfy.TestAdapter", 10_000)]
+    public void DiscoverTestsWithDefaultAdaptersSkipped(string projectName, double expectedNumberOfTests)
+    {
+
+        var discoveryEventHandler2 = new DiscoveryEventHandler2();
+        TestPlatformOptions options = new()
+        {
+            CollectMetrics = true,
+            SkipDefaultAdapters = true, // <-- skipping adapters
+        };
+
+        var perfAnalyzer = new PerfAnalyzer();
+        using (perfAnalyzer.Start())
+        {
+            // This tells to PerfyTestAdapter how many tests it should return, this is our overhead baseline.
+            var perfyTestAdapterEnv = new Dictionary<string, string?> { ["TEST_COUNT"] = expectedNumberOfTests.ToString(CultureInfo.InvariantCulture) };
+            var vstestConsoleWrapper = GetVsTestConsoleWrapper(perfyTestAdapterEnv, traceLevel: System.Diagnostics.TraceLevel.Off);
+            vstestConsoleWrapper.DiscoverTests(GetPerfAssetFullPath(projectName), GetDefaultRunSettings(), options, discoveryEventHandler2);
+            vstestConsoleWrapper.EndSession();
+        }
+
+        Assert.AreEqual(expectedNumberOfTests, discoveryEventHandler2.Metrics![TelemetryDataConstants.TotalTestsDiscovered]);
+        PostTelemetry(discoveryEventHandler2.Metrics, perfAnalyzer, projectName);
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/DiscoveryEventHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
new file mode 100644
index 0000000000..68f51efebb
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+
+/// <inheritdoc />
+public class DiscoveryEventHandler2 : ITestDiscoveryEventsHandler2
+{
+    /// <summary>
+    /// Gets the discovered test cases.
+    /// </summary>
+    public List<TestCase> DiscoveredTestCases { get; } = new List<TestCase>();
+
+    /// <summary>
+    /// Gets the metrics.
+    /// </summary>
+    public IDictionary<string, object>? Metrics { get; private set; } = new Dictionary<string, object>();
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No Op
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        // No Op
+    }
+
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        if (lastChunk != null)
+        {
+            DiscoveredTestCases.AddRange(lastChunk);
+        }
+
+        Metrics = discoveryCompleteEventArgs.Metrics;
+    }
+
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        if (discoveredTestCases != null)
+        {
+            DiscoveredTestCases.AddRange(discoveredTestCases);
+        }
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/RunEventHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/RunEventHandler.cs
new file mode 100644
index 0000000000..967f92dc26
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/EventHandler/RunEventHandler.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+
+/// <inheritdoc />
+public class RunEventHandler : ITestRunEventsHandler
+{
+    /// <summary>
+    /// Gets the test results.
+    /// </summary>
+    public List<TestResult> TestResults { get; private set; }
+
+    /// <summary>
+    /// Gets the metrics.
+    /// </summary>
+    public IDictionary<string, object>? Metrics { get; private set; } = new Dictionary<string, object>();
+
+    /// <summary>
+    /// Gets the log message.
+    /// </summary>
+    public List<string> LogMessages { get; } = new List<string>();
+
+    public RunEventHandler()
+    {
+        TestResults = new List<TestResult>();
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        LogMessages.Add($"[{level.ToString().ToUpperInvariant()}]: {message}");
+    }
+
+    public void HandleTestRunComplete(
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        if (lastChunkArgs != null && lastChunkArgs.NewTestResults != null)
+        {
+            TestResults.AddRange(lastChunkArgs.NewTestResults);
+        }
+
+        Metrics = testRunCompleteArgs.Metrics;
+        if (testRunCompleteArgs.Error != null)
+        {
+            LogMessages.Add($"[ERROR] {testRunCompleteArgs.Error}");
+        }
+    }
+
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        if (testRunChangedArgs != null && testRunChangedArgs.NewTestResults != null)
+        {
+            TestResults.AddRange(testRunChangedArgs.NewTestResults);
+        }
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No op
+    }
+
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        // No op
+        return -1;
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/ExecutionPerfTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/ExecutionPerfTests.cs
new file mode 100644
index 0000000000..953dc82302
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/ExecutionPerfTests.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+
+[TestClass]
+[DoNotParallelize]
+public class ExecutionPerfTests : TelemetryPerfTestBase
+{
+    [TestMethod]
+    [TestCategory("TelemetryPerf")]
+    [DataRow("MSTest1Passing", 1)]
+    [DataRow("MSTest100Passing", 100)]
+    [DataRow("MSTest1000Passing", 1000)]
+    [DataRow("MSTest10kPassing", 10_000)]
+    [DataRow("NUnit1Passing", 1)]
+    [DataRow("NUnit100Passing", 100)]
+    [DataRow("NUnit1000Passing", 1000)]
+    [DataRow("NUnit10kPassing", 10_000)]
+    [DataRow("XUnit1Passing", 1)]
+    [DataRow("XUnit100Passing", 100)]
+    [DataRow("XUnit1000Passing", 1000)]
+    [DataRow("XUnit10kPassing", 10_000)]
+    [DataRow("Perfy.TestAdapter", 1)]
+    [DataRow("Perfy.TestAdapter", 100)]
+    [DataRow("Perfy.TestAdapter", 1000)]
+    [DataRow("Perfy.TestAdapter", 10_000)]
+    public void RunTests(string projectName, double expectedNumberOfTests)
+    {
+        var runEventHandler = new RunEventHandler();
+        TestPlatformOptions options = new() { CollectMetrics = true };
+
+        var perfAnalyzer = new PerfAnalyzer();
+        using (perfAnalyzer.Start())
+        {
+            // This tells to PerfyTestAdapter how many tests it should return, this is our overhead baseline.
+            var perfyTestAdapterEnv = new Dictionary<string, string?> { ["TEST_COUNT"] = expectedNumberOfTests.ToString(CultureInfo.InvariantCulture) };
+            var vstestConsoleWrapper = GetVsTestConsoleWrapper(perfyTestAdapterEnv, traceLevel: System.Diagnostics.TraceLevel.Off);
+            vstestConsoleWrapper.RunTests(GetPerfAssetFullPath(projectName), GetDefaultRunSettings(), options, runEventHandler);
+            vstestConsoleWrapper.EndSession();
+        }
+
+        Assert.AreEqual(expectedNumberOfTests, runEventHandler.Metrics![TelemetryDataConstants.TotalTestsRun]);
+        PostTelemetry(runEventHandler.Metrics, perfAnalyzer, projectName);
+    }
+
+    [TestMethod]
+    [TestCategory("TelemetryPerf")]
+    [DataRow("MSTest1Passing", 1)]
+    [DataRow("MSTest100Passing", 100)]
+    [DataRow("MSTest1000Passing", 1000)]
+    [DataRow("MSTest10kPassing", 10_000)]
+    [DataRow("NUnit1Passing", 1)]
+    [DataRow("NUnit100Passing", 100)]
+    [DataRow("NUnit1000Passing", 1000)]
+    [DataRow("NUnit10kPassing", 10_000)]
+    [DataRow("XUnit1Passing", 1)]
+    [DataRow("XUnit100Passing", 100)]
+    [DataRow("XUnit1000Passing", 1000)]
+    [DataRow("XUnit10kPassing", 10_000)]
+    [DataRow("Perfy.TestAdapter", 1)]
+    [DataRow("Perfy.TestAdapter", 100)]
+    [DataRow("Perfy.TestAdapter", 1000)]
+    [DataRow("Perfy.TestAdapter", 10_000)]
+    public void RunTestsWithDefaultAdaptersSkipped(string projectName, double expectedNumberOfTests)
+    {
+        var runEventHandler = new RunEventHandler();
+        TestPlatformOptions options = new()
+        {
+            CollectMetrics = true,
+            SkipDefaultAdapters = true, // <-- skipping adapters
+        };
+
+        var perfAnalyzer = new PerfAnalyzer();
+        using (perfAnalyzer.Start())
+        {
+            // This tells to PerfyTestAdapter how many tests it should return, this is our overhead baseline.
+            var perfyTestAdapterEnv = new Dictionary<string, string?> { ["TEST_COUNT"] = expectedNumberOfTests.ToString(CultureInfo.InvariantCulture) };
+            var vstestConsoleWrapper = GetVsTestConsoleWrapper(perfyTestAdapterEnv, traceLevel: System.Diagnostics.TraceLevel.Off);
+            vstestConsoleWrapper.RunTests(GetPerfAssetFullPath(projectName), GetDefaultRunSettings(), options, runEventHandler);
+            vstestConsoleWrapper.EndSession();
+        }
+
+        Assert.AreEqual(expectedNumberOfTests, runEventHandler.Metrics![TelemetryDataConstants.TotalTestsRun]);
+        PostTelemetry(runEventHandler.Metrics, perfAnalyzer, projectName);
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs
new file mode 100644
index 0000000000..31a6e4ad63
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/TranslationLayer/TelemetryPerfTestBase.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if NETFRAMEWORK
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.TestPlatform.AcceptanceTests.Performance.PerfInstrumentation;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer;
+
+[TestClass]
+[DoNotParallelize]
+public class TelemetryPerfTestBase : PerformanceTestBase
+{
+    private const string TelemetryInstrumentationKey = "08de1ac5-2db8-4c30-97c6-2e12695fa610";
+    private readonly TelemetryClient _client;
+
+    public TelemetryPerfTestBase()
+    {
+        var telemetryConfiguration = TelemetryConfiguration.CreateDefault();
+#pragma warning disable CS0618 // Type or member is obsolete
+        telemetryConfiguration.InstrumentationKey = TelemetryInstrumentationKey;
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        _client = new TelemetryClient(telemetryConfiguration);
+    }
+
+    /// <summary>
+    /// Used for posting the telemetry to AppInsights
+    /// </summary>
+    public void PostTelemetry(IDictionary<string, object> handlerMetrics, PerfAnalyzer perfAnalyzer, string projectName, [CallerMemberName] string? scenario = null)
+    {
+        var properties = new Dictionary<string, string?>
+        {
+            // 1.0.1 -first version was called 1.0.1, and has the basic data correct
+            // 2 - changes version naming to just number, and adds adapter,
+            // in version 2 tests also changed from being just 1 class
+            // to be classes that have 20 tests, so e.g. 500 classes with 20 tests each for 10k tests.
+            // This layout does not favor any of the tested frameworks and is close to what we would see in the wild.
+            ["Version"] = "2",
+            ["Project"] = projectName,
+            ["Adapter"] = GetAdapterName(projectName),
+            ["Scenario"] = scenario,
+            ["Configuration"] = BuildConfiguration,
+            // Data are produced from a different setup than before where perf tests run by themselves and not together with acceptance tests,
+            // if this produces significantly different results we want to be able to get rid of this data.
+            ["Arcade"] = "true"
+        };
+
+        var metrics = new Dictionary<string, double>();
+
+        if (handlerMetrics is not null)
+        {
+            foreach (var entry in handlerMetrics)
+            {
+                var stringValue = entry.Value.ToString();
+                if (double.TryParse(stringValue, out var doubleValue))
+                {
+                    metrics.Add(entry.Key, doubleValue);
+                }
+                else
+                {
+                    properties.Add(entry.Key, stringValue);
+                }
+            }
+        }
+
+        foreach (var entry in perfAnalyzer.Events)
+        {
+            // TODO: Jajares: What do we want to do in case of duplicated metric key?
+            // It used to be a metrics.Add() call but it was causing the errors below when running tests in parallel:
+            //  Test method Microsoft.TestPlatform.AcceptanceTests.Performance.TranslationLayer.DiscoveryPerfTests.DiscoverTests threw exception:
+            // System.ArgumentException: An item with the same key has already been added.
+            // Stack Trace:
+            //  ThrowHelper.ThrowArgumentException(ExceptionResource resource)
+            //  Dictionary`2.Insert(TKey key, TValue value, Boolean add)
+            //  TelemetryPerfTestBase.PostTelemetry(IDictionary`2 handlerMetrics, PerfAnalyzer perfAnalyzer, String projectName, String scenario) line 74
+            //  DiscoveryPerfTests.DiscoverTests(String projectName, Double expectedNumberOfTests) line 49
+            // It was both for DiscoveryPerfTests and ExecutionPerfTests.
+            // I am doing a set call instead but that means we would override previous value.
+            metrics[entry.Name] = entry.TimeSinceStart;
+        }
+
+        _client.TrackEvent($"{scenario}{projectName}", properties, metrics);
+        _client.Flush();
+    }
+
+    private static string GetAdapterName(string projectName)
+    {
+        var name = projectName.ToLowerInvariant();
+        if (name.Contains("xunit"))
+            return "xunit";
+
+        if (name.Contains("nunit"))
+            return "nunit";
+
+        if (name.Contains("mstest"))
+            return "mstest";
+
+        if (name.Contains("perfy"))
+            return "perfy";
+
+        throw new InvalidOperationException($"Name of the adapter was not found in the project name {projectName}.");
+    }
+
+    /// <summary>
+    /// Returns the full path to the test asset dll
+    /// </summary>
+    /// <returns></returns>
+    public string[] GetPerfAssetFullPath(string name, string framework = "net48")
+    {
+        // TODO: how was I doing it before? The build is for net48, were we running net8.0 here?
+        var dllPath = GetTestDllForFramework($"{name}.dll", framework);
+        return !File.Exists(dllPath)
+            ? throw new FileNotFoundException(null, dllPath)
+            : new[] { dllPath };
+    }
+}
+#endif
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PlatformTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PlatformTests.cs
new file mode 100644
index 0000000000..ce0d229720
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PlatformTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+// monitoring the processes does not work correctly
+[TestCategory("Windows-Review")]
+public class PlatformTests : AcceptanceTestBase
+{
+    /// <summary>
+    /// The run test execution with platform x64.
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestExecutionWithPlatformx64(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var platformArg = " /Platform:x64";
+        RunTestExecutionWithPlatform(platformArg, "testhost", 1);
+    }
+
+    /// <summary>
+    /// The run test execution with platform x86.
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestExecutionWithPlatformx86(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var platformArg = " /Platform:x86";
+        RunTestExecutionWithPlatform(platformArg, "testhost.x86", 1);
+    }
+
+    private void RunTestExecutionWithPlatform(string platformArg, string testhostProcessName, int expectedNumOfProcessCreated)
+    {
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        arguments = string.Concat(arguments, platformArg, GetDiagArg(TempDirectory.Path));
+        InvokeVsTest(arguments);
+
+        AssertExpectedNumberOfHostProcesses(expectedNumOfProcessCreated, TempDirectory.Path, new[] { testhostProcessName }, arguments, GetConsoleRunnerPath());
+        ValidateSummaryStatus(1, 1, 1);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PortableNugetPackageTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PortableNugetPackageTests.cs
new file mode 100644
index 0000000000..7c14708898
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PortableNugetPackageTests.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class PortableNugetPackageTests : AcceptanceTestBase
+{
+    private static string s_portablePackageFolder = string.Empty;
+
+    [ClassInitialize]
+    public static void ClassInit(TestContext _)
+    {
+        s_portablePackageFolder = Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.Portable.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg");
+        if (!Directory.Exists(s_portablePackageFolder))
+        {
+            throw new DirectoryNotFoundException($"Cannot find '{s_portablePackageFolder}'.");
+        }
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunMultipleTestAssemblies(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll");
+
+        InvokeVsTestForExecution(assemblyPaths, GetTestAdapterPath(), FrameworkArgValue, string.Empty);
+
+        ValidateSummaryStatus(2, 2, 2);
+        ExitCodeEquals(1); // failing tests
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverAllTests(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        InvokeVsTestForDiscovery(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue);
+
+        var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
+        ValidateDiscoveredTests(listOfTests);
+        ExitCodeEquals(0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PostProcessingTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PostProcessingTests.cs
new file mode 100644
index 0000000000..af147a3afc
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/PostProcessingTests.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+# nullable disable
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class PostProcessingTests : AcceptanceTestBase
+{
+    [TestMethod]
+    public void DotnetSDKSimulation_PostProcessing()
+    {
+        var extensionsPath = Path.GetDirectoryName(GetTestDllForFramework("AttachmentProcessorDataCollector.dll", "netstandard2.0"));
+        _testEnvironment.RunnerFramework = CoreRunnerFramework;
+
+        string runSettings = GetRunsettingsFilePath(TempDirectory.Path);
+        string correlationSessionId = Guid.NewGuid().ToString();
+
+        // Set datacollector parameters
+        XElement runSettingsXml = XElement.Load(runSettings);
+        runSettingsXml.Element("DataCollectionRunSettings")
+            .Element("DataCollectors")
+            .Element("DataCollector")
+            .Add(new XElement("Configuration", new XElement("MergeFile", "MergedFile.txt")));
+        runSettingsXml.Save(runSettings);
+
+        // Build and run tests like msbuild
+        Parallel.For(0, 5, i =>
+        {
+            string projectFolder = Path.Combine(TempDirectory.Path, i.ToString(CultureInfo.InvariantCulture));
+            ExecuteApplication(GetConsoleRunnerPath(), $"new mstest -o {projectFolder}", out string stdOut, out string stdError, out int exitCode);
+            Assert.AreEqual(exitCode, 0);
+            ExecuteApplication(GetConsoleRunnerPath(), $"build {projectFolder} -c release", out stdOut, out stdError, out exitCode);
+            Assert.AreEqual(exitCode, 0);
+
+            string testContainer = Directory.GetFiles(Path.Combine(projectFolder, "bin"), $"{i}.dll", SearchOption.AllDirectories).Single();
+
+            ExecuteVsTestConsole($"{testContainer} --Collect:\"SampleDataCollector\" --TestAdapterPath:\"{extensionsPath}\" --ResultsDirectory:\"{Path.GetDirectoryName(testContainer)}\" --Settings:\"{runSettings}\" --ArtifactsProcessingMode-Collect --TestSessionCorrelationId:\"{correlationSessionId}\" --Diag:\"{TempDirectory.Path + '/'}\"", out stdOut, out stdError, out exitCode);
+            Assert.AreEqual(exitCode, 0);
+        });
+
+        // Post process artifacts
+        ExecuteVsTestConsole($"--ArtifactsProcessingMode-PostProcess --TestSessionCorrelationId:\"{correlationSessionId}\" --Diag:\"{TempDirectory.Path + "/mergeLog/"}\"", out string stdOut, out string stdError, out int exitCode);
+        Assert.AreEqual(exitCode, 0);
+
+        using StringReader reader = new(stdOut);
+        Assert.AreEqual(string.Empty, reader.ReadLine().Trim());
+        Assert.AreEqual("Attachments:", reader.ReadLine().Trim());
+        string mergedFile = reader.ReadLine().Trim();
+        Assert.AreEqual(string.Empty, reader.ReadLine().Trim());
+        Assert.IsNull(reader.ReadLine());
+
+        var fileContent = new List<string>();
+        using var streamReader = new StreamReader(mergedFile);
+        while (!streamReader.EndOfStream)
+        {
+            string line = streamReader.ReadLine();
+            Assert.IsTrue(line.StartsWith("SessionEnded_Handler_"));
+            fileContent.Add(line);
+        }
+
+        Assert.AreEqual(5, fileContent.Distinct().Count());
+    }
+
+    private static string GetRunsettingsFilePath(string resultsDir)
+    {
+        var runsettingsPath = Path.Combine(resultsDir, "test_" + Guid.NewGuid() + ".runsettings");
+        var dataCollectionAttributes = new Dictionary<string, string>
+        {
+            { "friendlyName", "SampleDataCollector" },
+            { "uri", "my://sample/datacollector" }
+        };
+
+        CreateDataCollectionRunSettingsFile(runsettingsPath, dataCollectionAttributes);
+        return runsettingsPath;
+    }
+
+    private static void CreateDataCollectionRunSettingsFile(string destinationRunsettingsPath, Dictionary<string, string> dataCollectionAttributes)
+    {
+        var doc = new XmlDocument();
+        var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+
+        doc.AppendChild(xmlDeclaration);
+        var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
+        doc.AppendChild(runSettingsNode);
+        var dcConfigNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
+        runSettingsNode.AppendChild(dcConfigNode);
+        var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
+        dcConfigNode.AppendChild(dataCollectorsNode);
+        var dataCollectorNode = doc.CreateElement(Constants.DataCollectorSettingName);
+        dataCollectorsNode.AppendChild(dataCollectorNode);
+
+        foreach (var kvp in dataCollectionAttributes)
+        {
+            dataCollectorNode.SetAttribute(kvp.Key, kvp.Value);
+        }
+
+        using var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
+        doc.Save(stream);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs
new file mode 100644
index 0000000000..32228f1da8
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ProcessesInteractionTests.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class ProcessesInteractionTests : AcceptanceTestBase
+{
+    /// <summary>
+    /// Having an invalid framework is a way to reproduce an issue we had on Unix, where we were
+    /// not handling correctly the process exit (causing us to not let time to the process to
+    /// flush its output and error streams).See https://github.com/microsoft/vstest/issues/3375
+    /// </summary>
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    public void WhenTestHostProcessExitsBecauseTheTargetedRuntimeIsNoFoundThenTheMessageIsCapturedFromTheErrorOutput(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        const string testAssetProjectName = "SimpleTestProjectMessedUpTargetFramework";
+        var assemblyPath = GetTestDllForFramework(testAssetProjectName + ".dll", Core80TargetFramework);
+        UpdateRuntimeConfigJsonWithInvalidFramework(assemblyPath, testAssetProjectName);
+
+        // Act
+        InvokeVsTest(assemblyPath);
+
+        // Assert
+        ExitCodeEquals(1);
+        StdErrorRegexIsMatch("You must install or update \\.NET to run this application\\. App: .*testhost\\.(exe|dll) Architecture: x64 Framework: 'Microsoft\\.NETCore\\.App', version '0\\.0\\.0' \\(x64\\)");
+
+        static void UpdateRuntimeConfigJsonWithInvalidFramework(string assemblyPath, string testAssetProjectName)
+        {
+            // On the contrary to other tests, we need to modify the test asset we are using to replace
+            // the target framework with an invalid framework. This is why we have a specific test asset
+            // that's only meant to be used by this project.
+            var runtimeConfigJson = Path.Combine(Path.GetDirectoryName(assemblyPath)!, testAssetProjectName + ".runtimeconfig.json");
+            var fileContent = File.ReadAllText(runtimeConfigJson);
+            var updatedContent = fileContent.Replace("\"version\": \"8.0.0\"", "\"version\": \"0.0.0\"");
+            File.WriteAllText(runtimeConfigJson, updatedContent);
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..8f2d401361
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Enable IAP at class level with as many threads as possible based on CPU and core count.
+[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.ClassLevel)]
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RecursiveResourcesLookupTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RecursiveResourcesLookupTests.cs
new file mode 100644
index 0000000000..f18852d87f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RecursiveResourcesLookupTests.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class RecursiveResourcesLookupTests : AcceptanceTestBase
+{
+    [TestMethod]
+    // This only fails on .NET Framework, and it fails in testhost, so no need to double check with
+    // two different runners.
+    [Ignore("Temporarily ignore until solving https://github.com/microsoft/testfx/issues/2692")]
+    [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
+    public void RunsToCompletionWhenJapaneseResourcesAreLookedUpForMSCorLib(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPath = GetAssetFullPath("RecursiveResourceLookupCrash.dll");
+        var arguments = PrepareArguments(assemblyPath, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+
+        // If we don't short-circuit the recursion correctly testhost will crash with StackOverflow.
+        ValidateSummaryStatus(passed: 1, failed: 0, 0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ResultsDirectoryTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ResultsDirectoryTests.cs
new file mode 100644
index 0000000000..e6961f7fb4
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ResultsDirectoryTests.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class ResultsDirectoryTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void TrxFileShouldBeCreatedInResultsDirectory(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        var trxFileName = "TestResults.trx";
+        var trxFilePath = Path.Combine(TempDirectory.Path, trxFileName);
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{TempDirectory.Path}");
+
+        // Delete if already exists
+        TempDirectory.TryRemoveDirectory(TempDirectory.Path);
+
+        InvokeVsTest(arguments);
+
+        Assert.IsTrue(File.Exists(trxFilePath), $"Expected Trx file: {trxFilePath} not created in results directory");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void ResultsDirectoryRelativePathShouldWork(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue);
+        var trxFileName = "TestResults.trx";
+        var relativeDirectory = @$"relative_{Guid.NewGuid()}\directory";
+        var resultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), relativeDirectory);
+
+        var trxFilePath = Path.Combine(resultsDirectory, trxFileName);
+        arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
+        arguments = string.Concat(arguments, $" /ResultsDirectory:{relativeDirectory}");
+
+        if (Directory.Exists(resultsDirectory))
+        {
+            Directory.Delete(resultsDirectory, true);
+        }
+
+        InvokeVsTest(arguments);
+
+        Assert.IsTrue(File.Exists(trxFilePath), $"Expected Trx file: {trxFilePath} not created in results directory");
+        TempDirectory.TryRemoveDirectory(resultsDirectory);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs
new file mode 100644
index 0000000000..4eec7dc7d0
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs
@@ -0,0 +1,577 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+// monitoring the processes does not work correctly
+[TestCategory("Windows-Review")]
+public class RunsettingsTests : AcceptanceTestBase
+{
+    #region Runsettings precedence tests
+    /// <summary>
+    /// Command line run settings should have high precedence among settings file, cli runsettings and cli switches
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void CommandLineRunSettingsShouldWinAmongAllOptions(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x86";
+        var testhostProcessName = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        // passing parallel
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "MaxCpuCount", "0" },
+            { "TargetFrameworkVersion", GetTargetFrameworkForRunsettings() },
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+        // passing different platform
+        var additionalArgs = "/Platform:x64";
+
+        var runSettingsArgs = string.Join(
+            " ",
+            [
+                "RunConfiguration.MaxCpuCount=1",
+                string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
+                string.Concat("RunConfiguration.TargetFrameworkVersion=" , GetTargetFrameworkForRunsettings()),
+                string.Concat("RunConfiguration.TestAdaptersPaths=" , GetTestAdapterPath())
+            ]);
+
+        RunTestWithRunSettings(runConfigurationDictionary, runSettingsArgs, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
+    }
+
+    /// <summary>
+    /// Command line run settings should have high precedence between cli runsettings and cli switches.
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void CLIRunsettingsShouldWinBetweenCLISwitchesAndCLIRunsettings(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x86";
+        var testhostProcessName = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        // Pass parallel
+        var additionalArgs = "/Parallel";
+
+        // Pass non parallel
+        var runSettingsArgs = string.Join(
+            " ",
+            [
+                "RunConfiguration.MaxCpuCount=1",
+                string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
+                string.Concat("RunConfiguration.TargetFrameworkVersion=" , GetTargetFrameworkForRunsettings()),
+                string.Concat("RunConfiguration.TestAdaptersPaths=" , GetTestAdapterPath())
+            ]);
+
+        RunTestWithRunSettings(null, runSettingsArgs, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
+    }
+
+    /// <summary>
+    /// Command line switches should have high precedence if runsetting file and command line switch specified
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void CommandLineSwitchesShouldWinBetweenSettingsFileAndCommandLineSwitches(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testhostProcessName = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        // passing different platform
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "MaxCpuCount", "1" },
+            { "TargetPlatform", "x64" },
+            { "TargetFrameworkVersion", GetTargetFrameworkForRunsettings() },
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+        var additionalArgs = "/Platform:x86";
+
+        RunTestWithRunSettings(runConfigurationDictionary, null, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
+    }
+
+    #endregion
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSettingsWithoutParallelAndPlatformX86(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x86";
+        var testhostProcessNames = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "MaxCpuCount", "1" },
+            { "TargetPlatform", targetPlatform },
+            { "TargetFrameworkVersion", GetTargetFrameworkForRunsettings() },
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+        RunTestWithRunSettings(runConfigurationDictionary, null, null, testhostProcessNames, expectedNumOfProcessCreated);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSettingsParamsAsArguments(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x86";
+        var testhostProcessName = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        var runSettingsArgs = string.Join(
+            " ",
+            [
+                "RunConfiguration.MaxCpuCount=1",
+                string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
+                string.Concat("RunConfiguration.TargetFrameworkVersion=" , GetTargetFrameworkForRunsettings()),
+                string.Concat("RunConfiguration.TestAdaptersPaths=" , GetTestAdapterPath())
+            ]);
+
+        RunTestWithRunSettings(null, runSettingsArgs, null, testhostProcessName, expectedNumOfProcessCreated);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSettingsAndRunSettingsParamsAsArguments(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x86";
+        var testhostProcessName = new[] { "testhost.x86" };
+
+        // We pass 2 dlls in RunTestWithRunSettings, and MaxCpuCount=1 should win,
+        // we should see 1 testhost for .NET Framework (we share the host there),
+        // and 2 testhosts for .NET, because we don't share hosts there for non-parallel run.
+        var expectedNumOfProcessCreated = runnerInfo.IsNetFrameworkTarget ? 1 : 2;
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "MaxCpuCount", "2" },
+            { "TargetPlatform", targetPlatform },
+            { "TargetFrameworkVersion", GetTargetFrameworkForRunsettings() },
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+
+        var runSettingsArgs = string.Join(
+            " ",
+            [
+                "RunConfiguration.MaxCpuCount=1",
+                string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
+                string.Concat("RunConfiguration.TargetFrameworkVersion=" , GetTargetFrameworkForRunsettings()),
+                string.Concat("RunConfiguration.TestAdaptersPaths=" , GetTestAdapterPath())
+            ]);
+
+        RunTestWithRunSettings(runConfigurationDictionary, runSettingsArgs, null, testhostProcessName, expectedNumOfProcessCreated);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSettingsWithParallelAndPlatformX64(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var targetPlatform = "x64";
+        var testhostProcessName = new[] { "testhost" };
+        var expectedProcessCreated = 2;
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "MaxCpuCount", "2" },
+            { "TargetPlatform", targetPlatform },
+            { "TargetFrameworkVersion", GetTargetFrameworkForRunsettings()},
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+        RunTestWithRunSettings(runConfigurationDictionary, null, null, testhostProcessName, expectedProcessCreated);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSettingsWithInvalidValueShouldLogError(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "TargetPlatform", "123" }
+        };
+        var runsettingsFilePath = GetRunsettingsFilePath(runConfigurationDictionary, TempDirectory);
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            string.Empty,
+            runsettingsFilePath, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+        StdErrorContains(@"Settings file provided does not conform to required format. An error occurred while loading the settings. Error: Invalid setting 'RunConfiguration'. Invalid value '123' specified for 'TargetPlatform'.");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestAdapterPathFromRunSettings(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var runConfigurationDictionary = new Dictionary<string, string>
+        {
+            { "TestAdaptersPaths", GetTestAdapterPath() }
+        };
+        var runsettingsFilePath = GetRunsettingsFilePath(runConfigurationDictionary, TempDirectory);
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            string.Empty,
+            runsettingsFilePath, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    #region LegacySettings Tests
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
+    public void LegacySettingsWithPlatform(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll");
+        _ = Path.GetDirectoryName(testAssemblyPath);
+
+        var runsettingsXml = @"<RunSettings>
+                                    <MSTest>
+                                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <LegacySettings>
+                                      <Execution hostProcessPlatform=""x64"">
+                                      </Execution>
+                                    </LegacySettings>
+                                   </RunSettings>";
+
+        var runsettingsFilePath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsFilePath, runsettingsXml);
+
+        var arguments = PrepareArguments(
+           testAssemblyPath,
+           string.Empty,
+           runsettingsFilePath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(0, 0, 0);
+    }
+
+    [TestMethod]
+    [Ignore("Ignore until we have new host available with CUIT removed.")]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
+    public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll");
+
+        // Create the script files
+        var guid = Guid.NewGuid();
+        var setupScriptName = "setupScript_" + guid + ".bat";
+        var setupScriptPath = Path.Combine(TempDirectory.Path, setupScriptName);
+        File.WriteAllText(setupScriptPath, @"echo > %temp%\ScriptTestingFile.txt");
+
+        var cleanupScriptName = "cleanupScript_" + guid + ".bat";
+        var cleanupScriptPath = Path.Combine(TempDirectory.Path, cleanupScriptName);
+        File.WriteAllText(cleanupScriptPath, @"del %temp%\ScriptTestingFile.txt");
+
+        var runsettingsFormat = @"<RunSettings>
+                                    <MSTest>
+                                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <LegacySettings>
+                                         <Scripts setupScript=""{0}"" cleanupScript=""{1}"" />
+                                    </LegacySettings>
+                                   </RunSettings>";
+
+        // Scripts have relative paths to temp directory where the runsettings is created.
+        var runsettingsXml = string.Format(CultureInfo.CurrentCulture, runsettingsFormat, setupScriptName, cleanupScriptName);
+        var runsettingsPath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsPath, runsettingsXml);
+
+        var arguments = PrepareArguments(
+           testAssemblyPath,
+           string.Empty,
+           runsettingsPath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:Name=ScriptsTest");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+
+        // Validate cleanup script ran
+        var scriptPath = Path.Combine(TempDirectory.Path, "ScriptTestingFile.txt");
+        Assert.IsFalse(File.Exists(scriptPath));
+    }
+
+    [TestMethod]
+    [Ignore("Ignore until we have new host available with CUIT removed.")]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
+    public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll");
+        var testAssemblyDirectory = Path.GetDirectoryName(testAssemblyPath);
+        Assert.IsNotNull(testAssemblyDirectory);
+
+        var deploymentItem = Path.Combine(testAssemblyDirectory, "Deployment", "DeploymentFile.xml");
+
+        var runsettingsFormat = @"<RunSettings>
+                                    <MSTest>
+                                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <LegacySettings>
+                                         <Deployment>
+                                            <DeploymentItem filename=""{0}"" />
+                                         </Deployment>
+                                    </LegacySettings>
+                                   </RunSettings>";
+
+        var runsettingsXml = string.Format(CultureInfo.CurrentCulture, runsettingsFormat, deploymentItem);
+        var runsettingsPath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsPath, runsettingsXml);
+
+        var arguments = PrepareArguments(
+           testAssemblyPath,
+           string.Empty,
+           runsettingsPath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:Name=DeploymentItemTest");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [Ignore("Ignore until we have new host available with CUIT removed.")]
+    [TestCategory("Windows")]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
+    public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll");
+        var runsettingsXml = @"<RunSettings>
+                                    <MSTest>
+                                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <LegacySettings>
+                                        <Execution><Timeouts testTimeout=""2000"" />
+                                        </Execution>
+                                    </LegacySettings>
+                                   </RunSettings>";
+        var runsettingsPath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsPath, runsettingsXml);
+        var arguments = PrepareArguments(testAssemblyPath, string.Empty, runsettingsPath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:Name~TimeTest");
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 1, 0);
+    }
+
+    [TestMethod]
+    [Ignore("Ignore until we have new host available with CUIT removed.")]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
+    public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll");
+        var runsettingsFormat = @"<RunSettings>
+                                    <MSTest><ForcedLegacyMode>true</ForcedLegacyMode></MSTest>
+                                    <LegacySettings>
+                                        <Execution>
+                                         <TestTypeSpecific>
+                                          <UnitTestRunConfig testTypeId=""13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b"">
+                                           <AssemblyResolution>
+                                              <TestDirectory useLoadContext=""true"" />
+                                              <RuntimeResolution>
+                                                  <Directory path=""{0}"" includeSubDirectories=""true"" />
+                                              </RuntimeResolution>
+                                           </AssemblyResolution>
+                                          </UnitTestRunConfig>
+                                         </TestTypeSpecific>
+                                        </Execution>
+                                    </LegacySettings>
+                                   </RunSettings>";
+
+        var testAssemblyDirectory = Path.Combine(_testEnvironment.TestAssetsPath, "LegacySettingsUnitTestProject", "DependencyAssembly");
+        var runsettingsXml = string.Format(CultureInfo.CurrentCulture, runsettingsFormat, testAssemblyDirectory);
+        var runsettingsPath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsPath, runsettingsXml);
+        var arguments = PrepareArguments(testAssemblyPath, string.Empty, runsettingsPath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /testcasefilter:Name=DependencyTest");
+
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    #endregion
+
+    #region RunSettings With EnvironmentVariables Settings Tests
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void EnvironmentVariablesSettingsShouldSetEnvironmentVariables(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var testAssemblyPath = GetAssetFullPath("EnvironmentVariablesTestProject.dll");
+
+        var runsettingsXml = @"<RunSettings>
+                                    <RunConfiguration>
+                                      <EnvironmentVariables>
+                                        <RANDOM_PATH>C:\temp</RANDOM_PATH>
+                                      </EnvironmentVariables>
+                                    </RunConfiguration>
+                                   </RunSettings>";
+
+        var runsettingsPath = GetRunsettingsFilePath(null, TempDirectory);
+        File.WriteAllText(runsettingsPath, runsettingsXml);
+
+        var arguments = PrepareArguments(
+           testAssemblyPath,
+           string.Empty,
+           runsettingsPath, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    #endregion
+
+    #region RunSettings defined in project file
+    /// <summary>
+    /// RunSettingsFilePath can be specified in .csproj and should be honored by `dotnet test`, this test
+    /// checks that the settings were honored by translating an inconclusive test to failed "result", instead of the default "skipped".
+    /// This test depends on Microsoft.TestPlatform.Build\Microsoft.TestPlatform.targets being previously copied into the
+    /// artifacts/testArtifacts/dotnet folder. This will allow the local copy of dotnet to pickup the VSTest msbuild task.
+    /// </summary>
+    /// <param name="runnerInfo"></param>
+    [TestMethod]
+    // patched dotnet is not published on non-windows systems
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSourceAttribute(useDesktopRunner: false)]
+    [NetCoreTargetFrameworkDataSourceAttribute(useDesktopRunner: false)]
+    public void RunSettingsAreLoadedFromProject(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var projectName = "ProjectFileRunSettingsTestProject.csproj";
+        var projectPath = GetIsolatedTestAsset(projectName);
+        InvokeDotnetTest($@"{projectPath} /p:VSTestUseMSBuildOutput=false --logger:""Console;Verbosity=normal"" /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", workingDirectory: Path.GetDirectoryName(projectPath));
+        ValidateSummaryStatus(0, 1, 0);
+
+        // make sure that we can revert the project settings back by providing a config from command line
+        // keeping this in the same test, because it is easier to see that we are reverting settings that
+        // are honored by dotnet test, instead of just using the default, which would produce the same
+        // result
+        var settingsPath = GetProjectAssetFullPath(projectName, "inconclusive.runsettings");
+        InvokeDotnetTest($@"{projectPath} --settings {settingsPath} /p:VSTestUseMSBuildOutput=false --logger:""Console;Verbosity=normal"" /p:PackageVersion={IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}", workingDirectory: Path.GetDirectoryName(projectPath));
+        ValidateSummaryStatus(0, 0, 1);
+    }
+
+    #endregion
+
+    private static string GetRunsettingsFilePath(Dictionary<string, string>? runConfigurationDictionary, TempDirectory tempDirectory)
+    {
+        var runsettingsPath = Path.Combine(tempDirectory.Path, "test_" + Guid.NewGuid() + ".runsettings");
+        if (runConfigurationDictionary != null)
+        {
+            CreateRunSettingsFile(runsettingsPath, runConfigurationDictionary);
+        }
+
+        return runsettingsPath;
+    }
+
+    private void RunTestWithRunSettings(Dictionary<string, string>? runConfigurationDictionary,
+        string? runSettingsArgs, string? additionalArgs, IEnumerable<string> testhostProcessNames, int expectedNumOfProcessCreated)
+    {
+
+        var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll");
+
+        var runsettingsPath = string.Empty;
+
+        if (runConfigurationDictionary != null)
+        {
+            runsettingsPath = GetRunsettingsFilePath(runConfigurationDictionary, TempDirectory);
+        }
+
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), runsettingsPath, FrameworkArgValue, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments += GetDiagArg(TempDirectory.Path);
+
+        if (!string.IsNullOrWhiteSpace(additionalArgs))
+        {
+            arguments = string.Concat(arguments, " ", additionalArgs);
+        }
+
+        if (!string.IsNullOrWhiteSpace(runSettingsArgs))
+        {
+            arguments = string.Concat(arguments, " -- ", runSettingsArgs);
+        }
+
+        InvokeVsTest(arguments);
+
+        // assert
+        AssertExpectedNumberOfHostProcesses(expectedNumOfProcessCreated, TempDirectory.Path, testhostProcessNames, arguments, GetConsoleRunnerPath());
+        ValidateSummaryStatus(2, 2, 2);
+
+        //cleanup
+        if (!string.IsNullOrWhiteSpace(runsettingsPath))
+        {
+            File.Delete(runsettingsPath);
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs
new file mode 100644
index 0000000000..531f35c012
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/SelfContainedAppTests.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class SelfContainedAppTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetCoreTargetFrameworkDataSourceAttribute(useDesktopRunner: false)]
+    public void RunningApplicationThatIsBuiltAsSelfContainedWillNotFailToFindHostpolicyDll(RunnerInfo runnerInfo)
+    {
+        // when the application is self-contained which is dictated by the RuntimeIdentifier and OutputType project
+        // properties, the testhost.exe executable is given a runtimeconfig that instructs it to find a hostpolicy.dll and hostfxr.dll next to it
+        // that will fail if we run the testhost.exe from the .nuget location, but will work when we run it from the output folder
+        // see https://github.com/dotnet/runtime/issues/3569#issuecomment-595820524 and below for description of how it works
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        // the app is published to win-x64 because of the runtime identifier in the project
+        var assemblyPath = GetAssetFullPath($@"win-x64{Path.DirectorySeparatorChar}SelfContainedAppTestProject.dll");
+        var arguments = PrepareArguments(assemblyPath, null, null, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments);
+
+        ValidateSummaryStatus(passed: 1, 0, 0);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TelemetryTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TelemetryTests.cs
new file mode 100644
index 0000000000..33efe78895
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TelemetryTests.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class TelemetryTests : AcceptanceTestBase
+{
+    private const string TELEMETRY_OPTEDIN = "VSTEST_TELEMETRY_OPTEDIN";
+    private const string LOG_TELEMETRY = "VSTEST_LOGTELEMETRY";
+    private const string LOG_TELEMETRY_PATH = "VSTEST_LOGTELEMETRY_PATH";
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsShouldPublishMetrics(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        RunTests(runnerInfo);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsShouldPublishMetrics(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        DiscoverTests(runnerInfo);
+    }
+
+    private void RunTests(RunnerInfo runnerInfo)
+    {
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("Telemetry API is not supported for .NetCore runner");
+            return;
+        }
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+
+        var env = new Dictionary<string, string?>
+        {
+            [LOG_TELEMETRY_PATH] = TempDirectory.Path,
+            [TELEMETRY_OPTEDIN] = "1",
+            [LOG_TELEMETRY] = "1",
+        };
+
+        InvokeVsTestForExecution(assemblyPaths, GetTestAdapterPath(), FrameworkArgValue, string.Empty, env);
+        ValidateOutput("Execution", TempDirectory);
+    }
+
+    private void DiscoverTests(RunnerInfo runnerInfo)
+    {
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("Telemetry API is not supported for .NetCore runner");
+            return;
+        }
+
+        var assemblyPaths = GetAssetFullPath("SimpleTestProject2.dll");
+
+        var env = new Dictionary<string, string?>
+        {
+            [LOG_TELEMETRY_PATH] = TempDirectory.Path,
+            [TELEMETRY_OPTEDIN] = "1",
+            [LOG_TELEMETRY] = "1",
+        };
+
+        InvokeVsTestForDiscovery(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, env);
+        ValidateOutput("Discovery", TempDirectory);
+    }
+
+    private static void ValidateOutput(string command, TempDirectory tempDirectory)
+    {
+        if (!Directory.Exists(tempDirectory.Path))
+        {
+            Assert.Fail("Could not find the telemetry logs folder at {0}", tempDirectory.Path);
+        }
+
+        bool isValid = false;
+        var directory = new DirectoryInfo(tempDirectory.Path);
+        var file = directory.GetFiles().OrderByDescending(f => f.CreationTime).First();
+
+        string[] lines = File.ReadAllLines(file.FullName);
+
+        foreach (var line in lines)
+        {
+            if (line.Contains(TelemetryDataConstants.TestExecutionCompleteEvent) && command.Equals("Execution", StringComparison.Ordinal))
+            {
+                var isPresent = line.Contains(
+                                    TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution)
+                                && line.Contains(TelemetryDataConstants.NumberOfAdapterUsedToRunTests)
+                                && line.Contains(TelemetryDataConstants.ParallelEnabledDuringExecution + '=' + "False")
+                                && line.Contains(TelemetryDataConstants.NumberOfSourcesSentForRun + '=' + "1")
+                                && line.Contains(TelemetryDataConstants.RunState + '=' + "Completed")
+                                && line.Contains(TelemetryDataConstants.TimeTakenByAllAdaptersInSec)
+                                && line.Contains(TelemetryDataConstants.TotalTestsRun + '=' + "3")
+                                && line.Contains(TelemetryDataConstants.TotalTestsRanByAdapter)
+                                && line.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter);
+
+                isValid = isPresent;
+                break;
+            }
+            else if (line.Contains(TelemetryDataConstants.TestDiscoveryCompleteEvent) && command.Equals("Discovery", StringComparison.Ordinal))
+            {
+                var isPresent = line.Contains(TelemetryDataConstants.TotalTestsDiscovered + '=' + "3")
+                                && line.Contains(TelemetryDataConstants.ParallelEnabledDuringDiscovery + '=' + "False")
+                                && line.Contains(TelemetryDataConstants.TimeTakenInSecForDiscovery)
+                                && line.Contains(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec)
+                                && line.Contains(TelemetryDataConstants.TimeTakenInSecByAllAdapters)
+                                && line.Contains(TelemetryDataConstants.TotalTestsByAdapter)
+                                && line.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter)
+                                && line.Contains(TelemetryDataConstants.DiscoveryState + "=Completed")
+                                && line.Contains(TelemetryDataConstants.NumberOfSourcesSentForDiscovery + '=' + "1")
+                                && line.Contains(
+                                    TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery)
+                                && line.Contains(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests);
+
+                isValid = isPresent;
+                break;
+            }
+        }
+
+        Assert.IsTrue(isValid);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestCaseFilterTests.cs
new file mode 100644
index 0000000000..e5e451ddd4
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestCaseFilterTests.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class TestCaseFilterTests : AcceptanceTestBase
+{
+    [TestMethod]
+    [NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithAndOperatorTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"(TestCategory=CategoryA&Priority=3)\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(0, 1, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithCategoryTraitInMixCase(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"TestCategory=Categorya\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(0, 1, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithClassNameTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"ClassName=SampleUnitTestProject.UnitTest1\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithFullyQualifiedNameTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(
+            arguments,
+            " /TestCaseFilter:\"FullyQualifiedName=SampleUnitTestProject.UnitTest1.FailingTest\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(0, 1, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithNameTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"Name=PassingTest\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithOrOperatorTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"(TestCategory=CategoryA|Priority=2)\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 0);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithPriorityTrait(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            GetSampleTestAssembly(),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:\"Priority=2\"");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 0, 0);
+    }
+
+    /// <summary>
+    /// In case TestCaseFilter is provide without any property like Name or ClassName. ex. /TestCaseFilter:"UnitTest1"
+    /// this command should provide same results as /TestCaseFilter:"FullyQualifiedName~UnitTest1".
+    /// </summary>
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestCaseFilterShouldWorkIfOnlyPropertyValueGivenInExpression(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            _testEnvironment.GetTestAsset("SimpleTestProject2.dll"),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /TestCaseFilter:UnitTest1");
+        InvokeVsTest(arguments);
+        ValidateSummaryStatus(1, 1, 1);
+    }
+
+    /// <summary>
+    /// Discover tests using mstest v1 adapter with test case filters.
+    /// </summary>
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverMstestV1TestsWithAndOperatorTrait(RunnerInfo runnerInfo)
+    {
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("Mstest v1 tests not supported with .NET Core runner.");
+            return;
+        }
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var arguments = PrepareArguments(
+            _testEnvironment.GetTestAsset("MstestV1UnitTestProject.dll"),
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /listtests /TestCaseFilter:\"(TestCategory!=CategoryA&Priority!=3)\"");
+
+        InvokeVsTest(arguments);
+        var listOfTests = new string[] {"MstestV1UnitTestProject.UnitTest1.PassingTest1", "MstestV1UnitTestProject.UnitTest1.PassingTest2",
+                "MstestV1UnitTestProject.UnitTest1.FailingTest2", "MstestV1UnitTestProject.UnitTest1.SkippingTest" };
+        var listOfNotDiscoveredTests = new string[] { "MstestV1UnitTestProject.UnitTest1.FailingTest1" };
+        ValidateDiscoveredTests(listOfTests);
+        ValidateTestsNotDiscovered(listOfNotDiscoveredTests);
+    }
+
+    /// <summary>
+    /// Discover tests using tmi adapter with test case filters.
+    /// </summary>
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverTmiTestsWithOnlyPropertyValue(RunnerInfo runnerInfo)
+    {
+        if (runnerInfo.IsNetRunner)
+        {
+            Assert.Inconclusive("Tmi tests not supported with .NET Core runner.");
+            return;
+        }
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        string testAssemblyPath = _testEnvironment.GetTestAsset("MstestV1UnitTestProject.dll");
+        var arguments = PrepareArguments(
+            testAssemblyPath,
+            GetTestAdapterPath(),
+            string.Empty, FrameworkArgValue,
+            runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        string testSettingsPath = Path.Combine(Path.GetDirectoryName(testAssemblyPath)!, "MstestV1UnitTestProjectTestSettings.testsettings");
+        arguments = string.Concat(arguments, " /listtests /TestCaseFilter:PassingTest /settings:", testSettingsPath);
+
+        InvokeVsTest(arguments);
+        var listOfTests = new string[] { "MstestV1UnitTestProject.UnitTest1.PassingTest1", "MstestV1UnitTestProject.UnitTest1.PassingTest2" };
+        var listOfNotDiscoveredTests = new string[] { "MstestV1UnitTestProject.UnitTest1.FailingTest1", "MstestV1UnitTestProject.UnitTest1.FailingTest2", "MstestV1UnitTestProject.UnitTest1.SkippingTest" };
+        ValidateDiscoveredTests(listOfTests);
+        ValidateTestsNotDiscovered(listOfNotDiscoveredTests);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs
new file mode 100644
index 0000000000..712e00b6e8
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests;
+
+[TestClass]
+public class TestPlatformNugetPackageTests : CodeCoverageAcceptanceTestBase
+{
+    private static string s_nugetPackageFolder = string.Empty;
+
+    [ClassInitialize]
+    public static void ClassInit(TestContext _)
+    {
+        s_nugetPackageFolder = Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [Ignore("Code Coverage is using 17.x.x dependency, will be solved in other PR. https://github.com/microsoft/vstest/issues/15223")]
+    [NetFullTargetFrameworkDataSourceAttribute(useCoreRunner: false)]
+    [NetCoreTargetFrameworkDataSourceAttribute(useCoreRunner: false)]
+    public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll");
+
+        var arguments = CreateCodeCoverageArguments(runnerInfo, assemblyPaths, out var trxFilePath);
+        InvokeVsTest(arguments);
+
+        ExitCodeEquals(1); // failing tests
+
+        var actualCoverageFile = GetCoverageFileNameFromTrx(trxFilePath, TempDirectory.Path);
+        Console.WriteLine($@"Coverage file: {actualCoverageFile}  Results directory: {TempDirectory} trxfile: {trxFilePath}");
+        Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile);
+    }
+
+    public override string GetConsoleRunnerPath()
+    {
+        string consoleRunnerPath = string.Empty;
+
+        if (IsDesktopRunner())
+        {
+            consoleRunnerPath = Path.Combine(s_nugetPackageFolder, "tools", Net462TargetFramework, "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe");
+        }
+
+        Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: \"{0}\"", consoleRunnerPath);
+        return consoleRunnerPath;
+    }
+
+    private string CreateCodeCoverageArguments(
+        RunnerInfo runnerInfo,
+        string assemblyPaths,
+        out string trxFilePath)
+    {
+        string diagFileName = Path.Combine(TempDirectory.Path, "diaglog.txt");
+
+        var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty,
+            FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path);
+
+        arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /EnableCodeCoverage");
+
+        trxFilePath = Path.Combine(TempDirectory.Path, Guid.NewGuid() + ".trx");
+        arguments = string.Concat(arguments, " /logger:trx;logfilename=" + trxFilePath);
+
+        return arguments;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestResults.html
similarity index 99%
rename from test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
rename to test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestResults.html
index fe5d919771..7b83d5b875 100644
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TestResults.html
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestResults.html
@@ -56,4 +56,4 @@ <h2>Results</h2>
         .duration{float:right;}
 
       </style>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CodeCoverageTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CodeCoverageTests.cs
new file mode 100644
index 0000000000..a5df1f4fcb
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CodeCoverageTests.cs
@@ -0,0 +1,522 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Castle.Core.Internal;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+//Code coverage only supported on windows (based on the message in output)
+[TestCategory("Windows-Review")]
+public class CodeCoverageTests : CodeCoverageAcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+    private TelemetryEventsHandler? _telemetryEventsHandler;
+    private TestRunAttachmentsProcessingEventHandler? _testRunAttachmentsProcessingEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_testRunAttachmentsProcessingEventHandler), nameof(_runEventHandler), nameof(_telemetryEventsHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+        _testRunAttachmentsProcessingEventHandler = new TestRunAttachmentsProcessingEventHandler();
+        _telemetryEventsHandler = new TelemetryEventsHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestRunWithCodeCoverage(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        // act
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), GetCodeCoverageRunSettings(1),
+            new TestPlatformOptions { CollectMetrics = true }, null, _runEventHandler, _telemetryEventsHandler);
+
+        // assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+
+        int expectedNumberOfAttachments = 1;
+        Assert.AreEqual(expectedNumberOfAttachments, _runEventHandler.Attachments.Count);
+        Assert.IsTrue(_telemetryEventsHandler.Events.Any(e => e.Name.StartsWith("vs/codecoverage") && e.Properties.Any()));
+
+        AssertCoverageResults(_runEventHandler.Attachments);
+
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics!["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestRunWithCodeCoverageUsingClrIe(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        // act
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), GetCodeCoverageRunSettings(1, true),
+            new TestPlatformOptions { CollectMetrics = true }, null, _runEventHandler, _telemetryEventsHandler);
+
+        // assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.IsTrue(_telemetryEventsHandler.Events.Any(e => e.Name.StartsWith("vs/codecoverage") && e.Properties.Any()));
+
+        int expectedNumberOfAttachments = 1;
+        Assert.AreEqual(expectedNumberOfAttachments, _runEventHandler.Attachments.Count);
+
+        AssertCoverageResults(_runEventHandler.Attachments);
+
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics!["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void TestRunWithCodeCoverageParallel(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        // act
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), GetCodeCoverageRunSettings(4),
+            new TestPlatformOptions { CollectMetrics = true }, null, _runEventHandler, _telemetryEventsHandler);
+
+        // assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.Attachments.Count);
+        Assert.IsTrue(_telemetryEventsHandler.Events.Any(e => e.Name.StartsWith("vs/codecoverage") && e.Properties.Any()));
+
+        AssertCoverageResults(_runEventHandler.Attachments);
+
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics!["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+        Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", _runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingWithInvokedDataCollectors(RunnerInfo runnerInfo)
+        => await TestRunWithCodeCoverageAndAttachmentsProcessingInternal(runnerInfo, true);
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingWithoutInvokedDataCollectors(RunnerInfo runnerInfo)
+        => await TestRunWithCodeCoverageAndAttachmentsProcessingInternal(runnerInfo, false);
+
+    private async Task TestRunWithCodeCoverageAndAttachmentsProcessingInternal(RunnerInfo runnerInfo, bool withInvokedDataCollectors)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(2, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        // act
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(
+            _runEventHandler.Attachments,
+            withInvokedDataCollectors ? _runEventHandler.InvokedDataCollectors : null,
+            withInvokedDataCollectors ? GetCodeCoverageRunSettings(1) : null,
+            true,
+            true,
+            _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // Assert
+        _testRunAttachmentsProcessingEventHandler.EnsureSuccess();
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments.Count);
+
+        AssertCoverageResults(_testRunAttachmentsProcessingEventHandler.Attachments);
+
+        Assert.IsFalse(_testRunAttachmentsProcessingEventHandler.CompleteArgs!.IsCanceled);
+        Assert.IsNull(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
+
+        for (int i = 0; i < _testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
+        {
+            TestRunAttachmentsProcessingProgressEventArgs progressArgs = _testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
+            Assert.AreEqual(i + 1, progressArgs.CurrentAttachmentProcessorIndex);
+            Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorUris.Count);
+            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+            Assert.AreEqual(withInvokedDataCollectors ? 2 : 1, progressArgs.AttachmentProcessorsCount);
+            if (_testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
+            {
+                Assert.AreEqual(100, progressArgs.CurrentAttachmentProcessorProgress);
+            }
+        }
+
+        Assert.AreEqual("Completed", _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics![TelemetryDataConstants.AttachmentsProcessingState]);
+        Assert.AreEqual(2L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
+        Assert.AreEqual(1L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
+
+        Assert.IsTrue(File.Exists(_runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
+        Assert.IsFalse(File.Exists(_runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingNoMetrics(RunnerInfo runnerInfo)
+    {
+        // System.Environment.SetEnvironmentVariable("VSTEST_RUNNER_DEBUG_ATTACHVS", "1");
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(2, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        // act
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, GetCodeCoverageRunSettings(1), true, false, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.FilePath).Distinct().Count());
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Count());
+        Assert.IsTrue(Regex.IsMatch(_runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Single(),
+            @"Microsoft\.VisualStudio\.Coverage\.DynamicCoverageDataCollectorWithAttachmentProcessorAndTelemetry, Microsoft\.VisualStudio\.TraceDataCollector, Version=.*, Culture=neutral, PublicKeyToken=.*"));
+
+        _testRunAttachmentsProcessingEventHandler.EnsureSuccess();
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments.Count);
+
+        AssertCoverageResults(_testRunAttachmentsProcessingEventHandler.Attachments);
+
+        Assert.IsFalse(_testRunAttachmentsProcessingEventHandler.CompleteArgs!.IsCanceled);
+        Assert.IsNull(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
+
+        for (int i = 0; i < _testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
+        {
+            TestRunAttachmentsProcessingProgressEventArgs progressArgs = _testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
+            Assert.AreEqual(i + 1, progressArgs.CurrentAttachmentProcessorIndex);
+            Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorUris.Count);
+            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+            Assert.AreEqual(2, progressArgs.AttachmentProcessorsCount);
+            if (_testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
+            {
+                Assert.AreEqual(100, progressArgs.CurrentAttachmentProcessorProgress);
+            }
+        }
+
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.IsNullOrEmpty());
+
+        Assert.IsTrue(File.Exists(_runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
+        Assert.IsFalse(File.Exists(_runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingModuleDuplicated(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(9, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(3, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(3, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        // act
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, GetCodeCoverageRunSettings(1), true, true, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.FilePath).Distinct().Count());
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Count());
+        Assert.IsTrue(Regex.IsMatch(_runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Single(),
+            @"Microsoft\.VisualStudio\.Coverage\.DynamicCoverageDataCollectorWithAttachmentProcessorAndTelemetry, Microsoft\.VisualStudio\.TraceDataCollector, Version=.*, Culture=neutral, PublicKeyToken=.*"));
+
+        _testRunAttachmentsProcessingEventHandler.EnsureSuccess();
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments.Count);
+
+        AssertCoverageResults(_testRunAttachmentsProcessingEventHandler.Attachments);
+
+        Assert.IsFalse(_testRunAttachmentsProcessingEventHandler.CompleteArgs!.IsCanceled);
+        Assert.IsNull(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
+
+        for (int i = 0; i < _testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
+        {
+            TestRunAttachmentsProcessingProgressEventArgs progressArgs = _testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
+            Assert.AreEqual(i + 1, progressArgs.CurrentAttachmentProcessorIndex);
+            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+            Assert.AreEqual(2, progressArgs.AttachmentProcessorsCount);
+
+            if (_testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
+            {
+                Assert.AreEqual(100, progressArgs.CurrentAttachmentProcessorProgress);
+            }
+        }
+
+        Assert.AreEqual("Completed", _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics![TelemetryDataConstants.AttachmentsProcessingState]);
+        Assert.AreEqual(3L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
+        Assert.AreEqual(1L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
+
+        Assert.IsTrue(File.Exists(_runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
+        Assert.IsFalse(File.Exists(_runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingSameReportFormat(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1, outputFormat: "Coverage"),
+            null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1, outputFormat: "Coverage"),
+            null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(2, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        // act
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, GetCodeCoverageRunSettings(1), true, true, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.FilePath).Distinct().Count());
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Count());
+        Assert.IsTrue(Regex.IsMatch(_runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Single(),
+            @"Microsoft\.VisualStudio\.Coverage\.DynamicCoverageDataCollectorWithAttachmentProcessorAndTelemetry, Microsoft\.VisualStudio\.TraceDataCollector, Version=.*, Culture=neutral, PublicKeyToken=.*"));
+
+        _testRunAttachmentsProcessingEventHandler.EnsureSuccess();
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments.Count);
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments.Count);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[0].Uri.LocalPath.Contains(".coverage"));
+
+        AssertCoverageResults(_testRunAttachmentsProcessingEventHandler.Attachments);
+
+        Assert.IsFalse(_testRunAttachmentsProcessingEventHandler.CompleteArgs!.IsCanceled);
+        Assert.IsNull(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
+
+        for (int i = 0; i < _testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
+        {
+            TestRunAttachmentsProcessingProgressEventArgs progressArgs = _testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
+            Assert.AreEqual(i + 1, progressArgs.CurrentAttachmentProcessorIndex);
+            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+            Assert.AreEqual(2, progressArgs.AttachmentProcessorsCount);
+
+            if (_testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
+            {
+                Assert.AreEqual(100, progressArgs.CurrentAttachmentProcessorProgress);
+            }
+        }
+
+        Assert.AreEqual("Completed", _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics![TelemetryDataConstants.AttachmentsProcessingState]);
+        Assert.AreEqual(2L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
+        Assert.AreEqual(1L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
+
+        Assert.IsTrue(File.Exists(_runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
+        Assert.IsFalse(File.Exists(_runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task TestRunWithCodeCoverageAndAttachmentsProcessingDifferentReportFormats(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1, outputFormat: "Cobertura"), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1, outputFormat: "Cobertura"), null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(12, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(4, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(4, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        // act
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), true, true, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.FilePath).Distinct().Count());
+        Assert.AreEqual(1, _runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Count());
+        Assert.IsTrue(Regex.IsMatch(_runEventHandler.InvokedDataCollectors.Select(x => x.AssemblyQualifiedName).Distinct().Single(),
+            @"Microsoft\.VisualStudio\.Coverage\.DynamicCoverageDataCollectorWithAttachmentProcessorAndTelemetry, Microsoft\.VisualStudio\.TraceDataCollector, Version=.*, Culture=neutral, PublicKeyToken=.*"));
+
+
+        _testRunAttachmentsProcessingEventHandler.EnsureSuccess();
+        Assert.AreEqual(1, _testRunAttachmentsProcessingEventHandler.Attachments.Count);
+        Assert.AreEqual(2, _testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments.Count);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[0].Uri.LocalPath.Contains(".cobertura.xml"));
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[1].Uri.LocalPath.Contains(".coverage"));
+
+        AssertCoverageResults(_testRunAttachmentsProcessingEventHandler.Attachments);
+
+        Assert.IsFalse(_testRunAttachmentsProcessingEventHandler.CompleteArgs!.IsCanceled);
+        Assert.IsNull(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
+
+        for (int i = 0; i < _testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
+        {
+            TestRunAttachmentsProcessingProgressEventArgs progressArgs = _testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
+            Assert.AreEqual(i + 1, progressArgs.CurrentAttachmentProcessorIndex);
+            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+
+            // We have two processor because we append always CodeCoverage attachment processor shipped with VSTest+Attachment processor shipped from code coverage repo.
+            Assert.AreEqual(2, progressArgs.AttachmentProcessorsCount);
+
+            if (_testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
+            {
+                Assert.AreEqual(100, progressArgs.CurrentAttachmentProcessorProgress);
+            }
+        }
+
+        Assert.AreEqual("Completed", _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics![TelemetryDataConstants.AttachmentsProcessingState]);
+        Assert.AreEqual(4L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
+        Assert.AreEqual(1L, _testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
+        Assert.IsTrue(_testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
+
+        Assert.IsTrue(File.Exists(_runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
+        Assert.IsFalse(File.Exists(_runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    [DoNotParallelize]
+    public async Task EndSessionShouldEnsureVstestConsoleProcessDies(RunnerInfo runnerInfo)
+    {
+        var numOfProcesses = Process.GetProcessesByName("vstest.console").Length;
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Take(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies().Skip(1), GetCodeCoverageRunSettings(1), null, null, _runEventHandler, _telemetryEventsHandler);
+
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.Attachments.Count);
+        Assert.AreEqual(2, _runEventHandler.InvokedDataCollectors.Count);
+        Assert.IsFalse(_telemetryEventsHandler.Events.Any());
+
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, GetCodeCoverageRunSettings(1), true, true, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // act
+        _vstestConsoleWrapper?.EndSession();
+
+        // Assert
+        Assert.AreEqual(numOfProcesses, Process.GetProcessesByName("vstest.console").Length);
+
+        _vstestConsoleWrapper = null;
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        return GetProjects().Select(p => GetAssetFullPath(p)).ToList();
+    }
+
+    private static IList<string> GetProjects()
+    {
+        return new List<string> { "SimpleTestProject.dll", "SimpleTestProject2.dll" };
+    }
+
+    /// <summary>
+    /// Default RunSettings
+    /// </summary>
+    /// <returns></returns>
+    private string GetCodeCoverageRunSettings(int cpuCount, bool useClrIeInstrumentationEngine = false, string outputFormat = "Coverage")
+    {
+        string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                            <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
+                                            <TestAdaptersPaths>{GetNetStandardAdapterPath()}</TestAdaptersPaths>
+                                            <MaxCpuCount>{cpuCount}</MaxCpuCount>
+                                        </RunConfiguration>
+                                        <DataCollectionRunSettings>
+                                            <DataCollectors>
+                                                <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
+                                                    <Configuration>
+                                                      <CLRIEInstrumentationNetFramework>{useClrIeInstrumentationEngine}</CLRIEInstrumentationNetFramework>
+                                                      <Format>{outputFormat}</Format>
+                                                      <TelemetryEnabled>true</TelemetryEnabled>
+                                                      <CodeCoverage>
+                                                        <ModulePaths>
+                                                          <Exclude>
+                                                            <ModulePath>.*CPPUnitTestFramework.*</ModulePath>
+                                                          </Exclude>
+                                                        </ModulePaths>
+
+                                                        <!-- We recommend you do not change the following values: -->
+                                                        <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
+                                                        <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
+                                                        <CollectFromChildProcesses>True</CollectFromChildProcesses>
+                                                        <CollectAspDotNet>False</CollectAspDotNet>
+                                                      </CodeCoverage>
+                                                    </Configuration>
+                                                </DataCollector>
+                                            </DataCollectors>
+                                        </DataCollectionRunSettings>
+                                    </RunSettings>";
+        return runSettingsXml;
+    }
+
+    private static void AssertCoverageResults(IList<AttachmentSet> attachments)
+    {
+        foreach (var attachmentSet in attachments)
+        {
+            foreach (var attachment in attachmentSet.Attachments)
+            {
+                var coverageReport = GetCoverageReport(attachments.First().Attachments.First().Uri.LocalPath);
+
+                foreach (var project in GetProjects())
+                {
+                    var moduleNode = GetModule(coverageReport, project)!;
+                    AssertCoverage(moduleNode, ExpectedMinimalModuleCoverage);
+                }
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs
new file mode 100644
index 0000000000..cdff53add3
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+using FluentAssertions;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <summary>
+/// The Run Tests using VsTestConsoleWrapper API's
+/// </summary>
+[TestClass]
+public class CustomTestHostTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource(BeforeFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    // This does not work with testhosts that are earlier than when the feature was introduced,
+    // when latest runner is used, because the latest runner does not downgrade the messages when
+    // older testhost launcher is used.
+    // [TestHostCompatibilityDataSource(BeforeFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    public void RunTestsWithCustomTestHostLauncherLaunchesTheProcessUsingTheProvidedLauncher(RunnerInfo runnerInfo)
+    {
+        // Pins the existing functionality.
+
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+
+        // Act
+        var customTestHostLauncher = new TestHostLauncherV1();
+        _vstestConsoleWrapper.RunTestsWithCustomTestHost(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), runEventHandler, customTestHostLauncher);
+
+        // Assert
+        EnsureTestsRunWithoutErrors(runEventHandler, passed: 2, failed: 2, skipped: 2);
+
+        // Ensure we tried to launch testhost process.
+        customTestHostLauncher.Should().BeAssignableTo<ITestHostLauncher>();
+        customTestHostLauncher.LaunchProcessProcessId.Should().NotBeNull("we should launch some real process and save the pid of it");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    // [RunnerCompatibilityDataSource(BeforeFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    [TestHostCompatibilityDataSource(DEFAULT_RUNNER_NETFX, DEFAULT_RUNNER_NETCORE, "LegacyStable", BeforeFeature = Features.ATTACH_DEBUGGER_FLOW, DebugVSTestConsole = true)]
+    [Ignore("This is not working for any testhost prior 16.7.0 where the change was introduced. The launch testhost flow was replaced with AttachDebugger in runner, and the new callback to AttachDebugger happens in testhost."
+        + "But any testhost prior 16.7.0 where the change was introduced does not know to call back AttachDebugger, and the call never happens.")]
+    // You can confirm that the functionality broke between runner and testhost, past this point by using newer runners, against older testhosts.
+    // [TestPlatformCompatibilityDataSource(AfterRunnerFeature = Features.ATTACH_DEBUGGER_FLOW, BeforeTestHostFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    public void RunTestsWithCustomTestHostLauncherLaunchesTheProcessUsingTheProvidedLauncherWhenITestHostLauncher2IsProvided(RunnerInfo runnerInfo)
+    {
+        // Ensures compatibility with testhost and runners that were created before 16.3.0. It makes sure that even if user provides
+        // an implementation of the ITestHostLauncher2 interface, then testhost expecting ITestHostLauncher still works correctly.
+
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+
+        // Act
+        var customTestHostLauncher = new TestHostLauncherV2();
+        _vstestConsoleWrapper.RunTestsWithCustomTestHost(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), runEventHandler, customTestHostLauncher);
+
+        // Assert
+        EnsureTestsRunWithoutErrors(runEventHandler, passed: 2, failed: 2, skipped: 2);
+
+        customTestHostLauncher.Should().BeAssignableTo<ITestHostLauncher2>();
+        customTestHostLauncher.LaunchProcessProcessId.Should().NotBeNull("we should launch some real process and save the pid of it");
+        customTestHostLauncher.AttachDebuggerProcessId.Should().BeNull("we should not be asked to attach to a debugger, that flow is not used when vstest.console does not support it yet, even when it is given ITestHostLauncher2");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource(AfterFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    // [TestHostCompatibilityDataSource(AfterFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    public void RunTestsWithCustomTestHostLauncherAttachesToDebuggerUsingTheProvidedLauncher(RunnerInfo runnerInfo)
+    {
+
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+
+        // Act
+        var customTestHostLauncher = new TestHostLauncherV2();
+        _vstestConsoleWrapper.RunTestsWithCustomTestHost(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), runEventHandler, customTestHostLauncher);
+
+        // Assert
+        EnsureTestsRunWithoutErrors(runEventHandler, passed: 2, failed: 2, skipped: 2);
+
+        customTestHostLauncher.Should().BeAssignableTo<ITestHostLauncher2>();
+        customTestHostLauncher.AttachDebuggerProcessId.Should().NotBeNull("we should be asked to attach a debugger to some process and save the pid of the process");
+        customTestHostLauncher.LaunchProcessProcessId.Should().BeNull("we should not be asked to launch some real process, that flow is not used when vstest.console supports it and is given ITestHostLauncher2");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [Ignore("This is not working. The compatibility code only checks the protocol version (in handler), which is dictated by testhost. "
+        + "It sees 6 but does not realize that the provided CustomTesthostLauncher is not supporting the new feature, it ends up calling back to EditoAttachDebugger" +
+        "in translation layer, and that just silently skips the call.")]
+    [RunnerCompatibilityDataSource(AfterFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    [TestHostCompatibilityDataSource(AfterFeature = Features.ATTACH_DEBUGGER_FLOW)]
+    public void RunTestsWithCustomTestHostLauncherUsesLaunchWhenGivenAnOutdatedITestHostLauncher(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+
+        // Act
+        var customTestHostLauncher = new TestHostLauncherV1();
+        _vstestConsoleWrapper.RunTestsWithCustomTestHost(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), runEventHandler, customTestHostLauncher);
+
+        // Assert
+        EnsureTestsRunWithoutErrors(runEventHandler, passed: 2, failed: 2, skipped: 2);
+
+        customTestHostLauncher.Should().NotBeAssignableTo<ITestHostLauncher2>();
+        customTestHostLauncher.LaunchProcessProcessId.Should().NotBeNull("we should launch some real process and save the pid of it");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [TestCategory("Feature")]
+    // "Just row" used here because mstest does not cooperate with older versions of vstest.console correctly, so we test with just the latest version available..
+    [RunnerCompatibilityDataSource(AfterFeature = Features.MULTI_TFM, JustRow = 0)]
+    public void RunAllTestsWithMixedTFMsWillProvideAdditionalInformationToTheDebugger(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+        var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETFX);
+        var netDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETCORE);
+        var testHostLauncher = new TestHostLauncherV3();
+
+        // Act
+        // We have no preference around what TFM is used. It will be autodetected.
+        var runsettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        vstestConsoleWrapper.RunTestsWithCustomTestHost(new[] { netFrameworkDll, netDll }, runsettingsXml, runEventHandler, testHostLauncher);
+
+        // Assert
+        if (runEventHandler.Errors.Any())
+        {
+            var tempPath = TempDirectory.Path;
+            var files = System.IO.Directory.GetFiles(tempPath, "*.txt").ToList();
+            if (files.Count == 0)
+            {
+                throw new InvalidOperationException($"No error files found in {tempPath}. {string.Join("\n", Directory.GetFiles(tempPath))}");
+            }
+
+            var allText = new StringBuilder();
+            foreach (var file in files)
+            {
+#pragma warning disable CA1305 // Specify IFormatProvider
+                allText.AppendLine($"Error file: {file}");
+                allText.AppendLine(File.ReadAllText(file));
+                allText.AppendLine();
+#pragma warning restore CA1305 // Specify IFormatProvider
+            }
+            throw new InvalidOperationException($"Logs: {allText}");
+        }
+
+        runEventHandler.Errors.Should().BeEmpty();
+        testHostLauncher.AttachDebuggerInfos.Should().HaveCount(2);
+        var targetFrameworks = testHostLauncher.AttachDebuggerInfos.Select(i => i.TargetFramework).ToList();
+        targetFrameworks.Should().OnlyContain(tfm => tfm.StartsWith(".NETFramework") || tfm.StartsWith(".NET "));
+
+        runEventHandler.TestResults.Should().HaveCount(6, "we run all tests from both assemblies");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [TestCategory("BackwardCompatibilityWithRunner")]
+    // "Just row" used here because mstest does not cooperate with older versions of vstest.console correctly, so we test with just the single version available
+    // before the multi tfm feature.
+    [RunnerCompatibilityDataSource(BeforeFeature = Features.MULTI_TFM, JustRow = 0)]
+    public void RunAllTestsCallsBackToTestHostLauncherV3EvenWhenRunnerDoesNotSupportMultiTfmOrTheNewAttachDebugger2MessageYet(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+        var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETFX);
+        var netDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETCORE);
+        var testHostLauncher = new TestHostLauncherV3();
+
+        // Act
+        // We have no preference around what TFM is used. It will be autodetected.
+        var runsettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        vstestConsoleWrapper.RunTestsWithCustomTestHost(new[] { netFrameworkDll, netDll }, runsettingsXml, runEventHandler, testHostLauncher);
+
+        // Assert
+        runEventHandler.Errors.Should().BeEmpty();
+        testHostLauncher.AttachDebuggerInfos.Should().HaveCount(1);
+        var pid = testHostLauncher.AttachDebuggerInfos.Select(i => i.ProcessId).Single();
+        pid.Should().NotBe(0);
+
+        runEventHandler.TestResults.Should().HaveCount(3, "we run all tests from just one of the assemblies, because the runner does not support multi tfm");
+    }
+
+    private static void EnsureTestsRunWithoutErrors(RunEventHandler runEventHandler, int passed, int failed, int skipped)
+    {
+        runEventHandler.Errors.Should().BeEmpty();
+        runEventHandler.TestResults.Should().HaveCount(passed + failed + skipped);
+        runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed).Should().Be(passed);
+        runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed).Should().Be(failed);
+        runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped).Should().Be(skipped);
+    }
+
+    /// <summary>
+    /// The custom test host launcher implementing ITestHostLauncher.
+    /// </summary>
+    private class TestHostLauncherV1 : ITestHostLauncher
+    {
+        public int? LaunchProcessProcessId { get; private set; }
+
+        /// <inheritdoc />
+        public bool IsDebug => true;
+
+        /// <inheritdoc />
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+        {
+            return LaunchTestHost(defaultTestHostStartInfo, CancellationToken.None);
+        }
+
+        /// <inheritdoc />
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
+        {
+            var processInfo = new ProcessStartInfo(
+                defaultTestHostStartInfo.FileName!,
+                defaultTestHostStartInfo.Arguments!)
+            {
+                WorkingDirectory = defaultTestHostStartInfo.WorkingDirectory
+            };
+            processInfo.UseShellExecute = false;
+
+            var process = new Process { StartInfo = processInfo };
+            process.Start();
+
+            LaunchProcessProcessId = process?.Id;
+            return LaunchProcessProcessId ?? -1;
+        }
+    }
+
+    /// <summary>
+    /// The custom test host launcher implementing ITestHostLauncher2, and through that also ITestHostLauncher.
+    /// </summary>
+    private class TestHostLauncherV2 : TestHostLauncherV1, ITestHostLauncher2
+    {
+
+        public int? AttachDebuggerProcessId { get; private set; }
+
+        public bool AttachDebuggerToProcess(int pid) => AttachDebuggerToProcess(pid, CancellationToken.None);
+
+        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+        {
+            AttachDebuggerProcessId = pid;
+            return true;
+        }
+    }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+    private class TestHostLauncherV3 : ITestHostLauncher3
+    {
+        public bool IsDebug => true;
+
+        public List<AttachDebuggerInfo> AttachDebuggerInfos { get; } = new();
+
+        public bool AttachDebuggerToProcess(AttachDebuggerInfo attachDebuggerInfo, CancellationToken cancellationToken)
+        {
+            AttachDebuggerInfos.Add(attachDebuggerInfo);
+
+            return true;
+        }
+
+        public bool AttachDebuggerToProcess(int pid)
+        {
+            return AttachDebuggerToProcess(new AttachDebuggerInfo
+            {
+                ProcessId = pid,
+                TargetFramework = null,
+            }, CancellationToken.None);
+        }
+
+        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+        {
+            return AttachDebuggerToProcess(new AttachDebuggerInfo
+            {
+                ProcessId = pid,
+                TargetFramework = null,
+            }, CancellationToken.None);
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+        {
+            return -1;
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
+        {
+            return -1;
+        }
+    }
+}
+#pragma warning restore CS0618 // Type or member is obsolete
+
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DataCollectorAttachmentProcessor.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DataCollectorAttachmentProcessor.cs
new file mode 100644
index 0000000000..0fa571fdf2
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DataCollectorAttachmentProcessor.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class DataCollectorAttachmentProcessor : AcceptanceTestBase
+{
+    private readonly IVsTestConsoleWrapper _vstestConsoleWrapper;
+    private readonly RunEventHandler _runEventHandler;
+    private readonly TestRunAttachmentsProcessingEventHandler _testRunAttachmentsProcessingEventHandler;
+
+    public DataCollectorAttachmentProcessor()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+        _testRunAttachmentsProcessingEventHandler = new TestRunAttachmentsProcessingEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public async Task AttachmentProcessorDataCollector_ExtensionFileNotLocked(RunnerInfo runnerInfo)
+    {
+        // arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        var originalExtensionsPath = Path.GetDirectoryName(GetTestDllForFramework("AttachmentProcessorDataCollector.dll", "netstandard2.0"));
+
+        string extensionPath = Path.Combine(TempDirectory.Path, "AttachmentProcessorDataCollector");
+        Directory.CreateDirectory(extensionPath);
+        TempDirectory.CopyDirectory(new DirectoryInfo(originalExtensionsPath!), new DirectoryInfo(extensionPath));
+
+        string runSettings = GetRunsettingsFilePath(TempDirectory.Path);
+        XElement runSettingsXml = XElement.Load(runSettings);
+        runSettingsXml.Add(new XElement("RunConfiguration", new XElement("TestAdaptersPaths", extensionPath)));
+        // Set datacollector parameters
+        runSettingsXml!.Element("DataCollectionRunSettings")!
+            .Element("DataCollectors")!
+            .Element("DataCollector")!
+            .Add(new XElement("Configuration", new XElement("MergeFile", "MergedFile.txt")));
+        runSettingsXml.Save(runSettings);
+
+        // act
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), File.ReadAllText(runSettings), new TestPlatformOptions(), _runEventHandler);
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), File.ReadAllText(runSettings), new TestPlatformOptions(), _runEventHandler);
+        await _vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(_runEventHandler.Attachments, _runEventHandler.InvokedDataCollectors, File.ReadAllText(runSettings), true, false, _testRunAttachmentsProcessingEventHandler, CancellationToken.None);
+
+        // assert
+        // Extension path is not locked, we can remove it.
+        Directory.Delete(extensionPath, true);
+
+        // Ensure we ran the extension.
+        using var logFile = new FileStream(Path.Combine(TempDirectory.Path, "log.txt"), FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+        using var streamReader = new StreamReader(logFile);
+        string logFileContent = streamReader.ReadToEnd();
+        Assert.IsTrue(Regex.IsMatch(logFileContent, $@"DataCollectorAttachmentsProcessorsFactory: Collector attachment processor 'AttachmentProcessorDataCollector\.SampleDataCollectorAttachmentProcessor, AttachmentProcessorDataCollector, Version=.*, Culture=neutral, PublicKeyToken=null' from file '{extensionPath.Replace(@"\", @"\\")}\\AttachmentProcessorDataCollector.dll' added to the 'run list'"));
+        Assert.IsTrue(Regex.IsMatch(logFileContent, @"Invocation of data collector attachment processor AssemblyQualifiedName: 'Microsoft\.VisualStudio\.TestPlatform\.CrossPlatEngine\.TestRunAttachmentsProcessing\.DataCollectorAttachmentProcessorAppDomain, Microsoft\.TestPlatform\.CrossPlatEngine, Version=.*, Culture=neutral, PublicKeyToken=.*' FriendlyName: 'SampleDataCollector'"));
+    }
+
+    private static string GetRunsettingsFilePath(string resultsDir)
+    {
+        var runsettingsPath = Path.Combine(resultsDir, "test_" + Guid.NewGuid() + ".runsettings");
+        var dataCollectionAttributes = new Dictionary<string, string>
+        {
+            { "friendlyName", "SampleDataCollector" },
+            { "uri", "my://sample/datacollector" }
+        };
+
+        CreateDataCollectionRunSettingsFile(runsettingsPath, dataCollectionAttributes);
+        return runsettingsPath;
+    }
+
+    private static void CreateDataCollectionRunSettingsFile(string destinationRunsettingsPath, Dictionary<string, string> dataCollectionAttributes)
+    {
+        var doc = new XmlDocument();
+        var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+
+        doc.AppendChild(xmlDeclaration);
+        var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
+        doc.AppendChild(runSettingsNode);
+        var dcConfigNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
+        runSettingsNode.AppendChild(dcConfigNode);
+        var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
+        dcConfigNode.AppendChild(dataCollectorsNode);
+        var dataCollectorNode = doc.CreateElement(Constants.DataCollectorSettingName);
+        dataCollectorsNode.AppendChild(dataCollectorNode);
+
+        foreach (var kvp in dataCollectionAttributes)
+        {
+            dataCollectorNode.SetAttribute(kvp.Key, kvp.Value);
+        }
+
+        using var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
+        doc.Save(stream);
+    }
+
+    private IList<string> GetTestAssemblies()
+        => new List<string> { "SimpleTestProject.dll", "SimpleTestProject2.dll" }.Select(p => GetAssetFullPath(p)).ToList();
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
new file mode 100644
index 0000000000..8532a5d229
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+//using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <summary>
+/// The Run Tests using VsTestConsoleWrapper API's
+/// </summary>
+[TestClass]
+public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithNunitAdapter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var sources = new List<string>
+        {
+            GetAssetFullPath("NUTestProject.dll")
+        };
+
+        _vstestConsoleWrapper.RunTests(
+            sources,
+            GetDefaultRunSettings(),
+            _runEventHandler);
+
+        var testCase =
+            _runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("PassTestMethod1"));
+
+        // Assert
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+
+        // Release builds optimize code, hence line numbers are different.
+        if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.AreEqual(14, testCase.First().TestCase.LineNumber);
+        }
+        else
+        {
+            Assert.AreEqual(13, testCase.First().TestCase.LineNumber);
+        }
+    }
+
+    [TestMethod]
+    // there are logs in the diagnostic log, it is failing with NullReferenceException because path is null
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(useCoreRunner: true, useDesktopRunner: false)]
+    // [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        string testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll");
+        var sources = new List<string> { testAssemblyPath };
+        var testAdapterPath = Directory.EnumerateFiles(GetTestAdapterPath(UnitTestFramework.XUnit), "*.TestAdapter.dll").ToList();
+        _vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.First() });
+
+        _vstestConsoleWrapper.RunTests(
+            sources,
+             $@"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <TargetFrameworkVersion>{runnerInfo.TargetFramework}</TargetFrameworkVersion>
+                </RunConfiguration>
+            </RunSettings>",
+            _runEventHandler);
+
+        var testCase =
+            _runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("xUnitTestProject.Class1.PassTestMethod1"));
+
+        // Assert
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+
+        // Release builds optimize code, hence line numbers are different.
+        if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.AreEqual(15, testCase.First().TestCase.LineNumber);
+        }
+        else
+        {
+            Assert.AreEqual(14, testCase.First().TestCase.LineNumber);
+        }
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource]
+    public void RunTestsWithNonDllAdapter(RunnerInfo runnerInfo)
+    {
+        // This used to be test for Chutzpah, but it has long running problem with updating dependencies,
+        // so we test against our own test framework, to ensure that we can run test files that are not using
+        // *.dll as extension.
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var jsSource = Path.Combine(_testEnvironment.TestAssetsPath, "test.js");
+        var jsInTemp = TempDirectory.CopyFile(jsSource);
+
+        var testAdapterPath = Directory.EnumerateFiles(GetTestAdapterPath(UnitTestFramework.NonDll), "*.TestAdapter.dll").ToList();
+        _vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.First() });
+
+        _vstestConsoleWrapper.RunTests(
+            new[] { jsInTemp },
+            GetDefaultRunSettings(),
+            _runEventHandler);
+
+        var testCase = _runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("TestMethod1"));
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(0, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DiscoverTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DiscoverTests.cs
new file mode 100644
index 0000000000..b84914d873
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/DiscoverTests.cs
@@ -0,0 +1,297 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading.Tasks;
+
+using FluentAssertions;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+public class DiscoverTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private DiscoveryEventHandler? _discoveryEventHandler;
+    private DiscoveryEventHandler2? _discoveryEventHandler2;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_discoveryEventHandler), nameof(_discoveryEventHandler2))]
+    public void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _discoveryEventHandler2 = new DiscoveryEventHandler2();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource]
+    public void DiscoverTestsUsingDiscoveryEventHandler1(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        // Setup();
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _discoveryEventHandler2 = new DiscoveryEventHandler2();
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        vstestConsoleWrapper.DiscoverTests(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), _discoveryEventHandler);
+
+        // Assert.
+        Assert.AreEqual(6, _discoveryEventHandler.DiscoveredTestCases.Count);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource]
+    public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedOut(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        // Setup();
+
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _discoveryEventHandler2 = new DiscoveryEventHandler2();
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        vstestConsoleWrapper.DiscoverTests(
+            GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"),
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { CollectMetrics = false },
+            _discoveryEventHandler2);
+
+        // Assert.
+        Assert.AreEqual(6, _discoveryEventHandler2.DiscoveredTestCases.Count);
+        Assert.AreEqual(0, _discoveryEventHandler2.Metrics!.Count);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedIn(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.DiscoverTests(GetTestAssemblies(), GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, _discoveryEventHandler2);
+
+        // Assert.
+        Assert.AreEqual(6, _discoveryEventHandler2.DiscoveredTestCases.Count);
+        Assert.IsTrue(_discoveryEventHandler2.Metrics!.ContainsKey(TelemetryDataConstants.TargetDevice));
+        Assert.IsTrue(_discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests));
+        Assert.IsTrue(_discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecByAllAdapters));
+        Assert.IsTrue(_discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForDiscovery));
+        Assert.IsTrue(_discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.DiscoveryState));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsUsingEventHandler2AndBatchSize(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
+        var batchSize = 2;
+        string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                        <BatchSize>{batchSize}</BatchSize>
+                                        </RunConfiguration>
+                                    </RunSettings>";
+
+        _vstestConsoleWrapper.DiscoverTests(
+            GetTestAssemblies(),
+            runSettingsXml,
+            null,
+            discoveryEventHandlerForBatchSize);
+
+        // Assert.
+        discoveryEventHandlerForBatchSize.DiscoveredTestCases.Should().HaveCount(6, "we found 6 tests in total");
+        // Batching happens based on size and time interva. The middle batch should almost always be 2,
+        // if the discovery is fast enough, but the only requirement we can reliably check and enforce is that no batch is bigger than the expected size.
+        discoveryEventHandlerForBatchSize.Batches.Should().OnlyContain(v => v <= batchSize, "all batches should be the same size or smaller than the batch size");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsUsingEventHandler1AndBatchSize(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
+        var batchSize = 2;
+        string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                        <BatchSize>{batchSize}</BatchSize>
+                                        </RunConfiguration>
+                                    </RunSettings>";
+
+        _vstestConsoleWrapper.DiscoverTests(
+            GetTestAssemblies(),
+            runSettingsXml,
+            discoveryEventHandlerForBatchSize);
+
+        // Assert.
+        discoveryEventHandlerForBatchSize.DiscoveredTestCases.Should().HaveCount(6, "we found 6 tests in total");
+        // Batching happens based on size and time interva. The middle batch should almost always be 2,
+        // if the discovery is fast enough, but the only requirement we can reliably check and enforce is that no batch is bigger than the expected size.
+        discoveryEventHandlerForBatchSize.Batches.Should().OnlyContain(v => v <= batchSize, "all batches should be the same size or smaller than the batch size");
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverTestUsingEventHandler2ShouldContainAllSourcesAsFullyDiscovered(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var eventHandler2 = new DiscoveryEventHandler2();
+
+        _vstestConsoleWrapper.DiscoverTests(
+            GetTestAssemblies(),
+            GetDefaultRunSettings(),
+            null,
+            eventHandler2);
+
+        // Assert.
+        Assert.AreEqual(2, eventHandler2.FullyDiscoveredSources!.Count);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsUsingSourceNavigation(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.DiscoverTests(
+            GetTestAssemblies(),
+            GetDefaultRunSettings(),
+            _discoveryEventHandler);
+
+        // Assert.
+        var testCase =
+            _discoveryEventHandler.DiscoveredTestCases.Where(dt => dt.FullyQualifiedName.Equals("SampleUnitTestProject.UnitTest1.PassingTest"));
+
+        // Release builds optimize code, hence line numbers are different.
+        if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.AreEqual(25, testCase.First().LineNumber);
+        }
+        else
+        {
+            Assert.AreEqual(24, testCase.First().LineNumber);
+        }
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource(inProcess: true)]
+    [NetCoreTargetFrameworkDataSource]
+    [Ignore("Flaky on CI")]
+    public async Task CancelTestDiscovery(RunnerInfo runnerInfo)
+    {
+        var sw = Stopwatch.StartNew();
+        // Setup
+        var testAssemblies = new List<string>
+        {
+            // This is fast to discover.
+            GetAssetFullPath("SimpleTestProject.dll"),
+            // This is slow to discover to keep us discovering while we cancel.
+            GetAssetFullPath("DiscoveryTestProject.dll"),
+        };
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var discoveredTests = new List<TestCase>();
+        var discoveryEvents = new Mock<ITestDiscoveryEventsHandler>();
+        var alreadyCancelled = false;
+        TimeSpan cancellationCalled = TimeSpan.Zero;
+        discoveryEvents.Setup(events => events.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
+            .Callback((IEnumerable<TestCase> testcases) =>
+            {
+                Console.WriteLine($"Received test case {testcases.Single()}");
+                // As soon as we get first test call cancel. That way we know there is discovery in progress.
+                discoveredTests.AddRange(testcases);
+                if (!alreadyCancelled)
+                {
+                    cancellationCalled = sw.Elapsed;
+                    // Calling cancel many times crashes. https://github.com/microsoft/vstest/issues/3526
+                    alreadyCancelled = true;
+                    Console.WriteLine($"Cancelling at {cancellationCalled.TotalMilliseconds} ms.");
+                    _vstestConsoleWrapper.CancelDiscovery();
+                }
+            });
+        var isTestCancelled = false;
+        discoveryEvents.Setup(events => events.HandleDiscoveryComplete(It.IsAny<long>(), It.IsAny<IEnumerable<TestCase>>(), It.IsAny<bool>()))
+            .Callback((long _, IEnumerable<TestCase> testcases, bool isAborted) =>
+            {
+                Console.WriteLine($"Discovery complete at {sw.ElapsedMilliseconds} ms, with isAborted: {isAborted}.");
+                isTestCancelled = isAborted;
+                if (testcases != null)
+                {
+                    discoveredTests.AddRange(testcases);
+                }
+            });
+
+        string runSettingsXml =
+             $@"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
+                    <BatchSize>1</BatchSize>
+                </RunConfiguration>
+            </RunSettings>";
+
+        // Act
+        Console.WriteLine("Starting Discovery.");
+        await Task.Run(() => _vstestConsoleWrapper.DiscoverTests(testAssemblies, runSettingsXml, discoveryEvents.Object));
+        Console.WriteLine("Discovery finished.");
+
+        // Assert
+        Assert.IsTrue(isTestCancelled, "Discovery was not cancelled");
+
+        // TODO: Review how much time it takes to actually cancel. It is not 2s on CI server. Are we waiting for anything?
+        //var done = sw.Elapsed;
+        //var timeTillCancelled = done - cancellationCalled;
+        //timeTillCancelled.Should().BeLessThan(2.Seconds());
+        int discoveredSourcesCount = discoveredTests.Select(testcase => testcase.Source).Distinct().Count();
+        Assert.AreNotEqual(testAssemblies.Count, discoveredSourcesCount, "All test assemblies discovered");
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        var testAssemblies = new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject.dll"),
+            GetAssetFullPath("SimpleTestProject2.dll")
+        };
+
+        return testAssemblies;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs
new file mode 100644
index 0000000000..2efac8896f
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <inheritdoc />
+public class DiscoveryEventHandler : ITestDiscoveryEventsHandler
+{
+    /// <summary>
+    /// Gets the discovered test cases.
+    /// </summary>
+    public List<TestCase> DiscoveredTestCases { get; }
+
+    public DiscoveryEventHandler()
+    {
+        DiscoveredTestCases = new List<TestCase>();
+    }
+
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        if (discoveredTestCases != null)
+        {
+            DiscoveredTestCases.AddRange(discoveredTestCases);
+        }
+    }
+
+    public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase>? lastChunk, bool isAborted)
+    {
+        if (lastChunk != null)
+        {
+            DiscoveredTestCases.AddRange(lastChunk);
+        }
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        // No Op
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No op
+    }
+}
+
+public struct TestMessage
+{
+    public TestMessageLevel TestMessageLevel;
+    public string? Message;
+
+    public TestMessage(TestMessageLevel testMessageLevel, string? message)
+    {
+        TestMessageLevel = testMessageLevel;
+        Message = message;
+    }
+}
+
+/// <inheritdoc />
+public class DiscoveryEventHandler2 : ITestDiscoveryEventsHandler2
+{
+    /// <summary>
+    /// Gets the discovered test cases.
+    /// </summary>
+    public List<TestCase> DiscoveredTestCases { get; }
+
+    public IList<string>? FullyDiscoveredSources { get; private set; }
+    public IList<string>? PartiallyDiscoveredSources { get; private set; }
+    public IList<string>? NotDiscoveredSources { get; private set; }
+    public IList<string>? SkippedDiscoveredSources { get; private set; }
+
+    public List<TestMessage> TestMessages;
+
+    /// <summary>
+    /// Gets the metrics.
+    /// </summary>
+    public IDictionary<string, object>? Metrics { get; private set; }
+
+    public DiscoveryEventHandler2()
+    {
+        DiscoveredTestCases = new List<TestCase>();
+        TestMessages = new List<TestMessage>();
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No Op
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        TestMessages.Add(new TestMessage(level, message));
+    }
+
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        if (lastChunk != null)
+        {
+            DiscoveredTestCases.AddRange(lastChunk);
+        }
+
+        Metrics = discoveryCompleteEventArgs.Metrics;
+        FullyDiscoveredSources = discoveryCompleteEventArgs.FullyDiscoveredSources;
+        PartiallyDiscoveredSources = discoveryCompleteEventArgs.PartiallyDiscoveredSources;
+        NotDiscoveredSources = discoveryCompleteEventArgs.NotDiscoveredSources;
+        SkippedDiscoveredSources = discoveryCompleteEventArgs.SkippedDiscoveredSources;
+    }
+
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        if (discoveredTestCases != null)
+        {
+            DiscoveredTestCases.AddRange(discoveredTestCases);
+        }
+    }
+}
+
+/// Discovery Event Handler for batch size
+public class DiscoveryEventHandlerForBatchSize : ITestDiscoveryEventsHandler2, ITestDiscoveryEventsHandler
+{
+    /// <summary>
+    /// Gets the batch size.
+    /// </summary>
+    public List<int> Batches { get; } = new List<int>();
+
+    /// <summary>
+    /// Gets the discovered test cases.
+    /// </summary>
+    public List<TestCase> DiscoveredTestCases { get; }
+
+    public DiscoveryEventHandlerForBatchSize()
+    {
+        DiscoveredTestCases = new List<TestCase>();
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No Op
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        if (level == TestMessageLevel.Error)
+        {
+            Console.WriteLine($"ERROR:{message}");
+        }
+    }
+
+    public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase>? lastChunk)
+    {
+        if (lastChunk != null)
+        {
+            DiscoveredTestCases.AddRange(lastChunk);
+        }
+    }
+
+    public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase>? lastChunk, bool isAborted)
+    {
+        if (lastChunk != null)
+        {
+            DiscoveredTestCases.AddRange(lastChunk);
+        }
+    }
+
+    public void HandleDiscoveredTests(IEnumerable<TestCase>? discoveredTestCases)
+    {
+        if (discoveredTestCases != null && discoveredTestCases.Any())
+        {
+            DiscoveredTestCases.AddRange(discoveredTestCases);
+            Batches.Add(discoveredTestCases.Count());
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/RunEventHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/RunEventHandler.cs
new file mode 100644
index 0000000000..f61c3e9d94
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/RunEventHandler.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <inheritdoc />
+public class RunEventHandler : ITestRunEventsHandler
+{
+    /// <summary>
+    /// Gets the test results.
+    /// </summary>
+    public List<TestResult> TestResults { get; private set; }
+
+    /// <summary>
+    /// Gets the attachments.
+    /// </summary>
+    public List<AttachmentSet> Attachments { get; private set; }
+
+    /// <summary>
+    /// Gets the list of the invoked data collectors.
+    /// </summary>
+    public List<InvokedDataCollector> InvokedDataCollectors { get; private set; }
+
+    /// <summary>
+    /// Gets the metrics.
+    /// </summary>
+    public IDictionary<string, object>? Metrics { get; private set; }
+
+    /// <summary>
+    /// Gets the log message.
+    /// </summary>
+    public string? LogMessage { get; private set; }
+
+    public List<string?> Errors { get; set; }
+
+    /// <summary>
+    /// Gets the test message level.
+    /// </summary>
+    public TestMessageLevel TestMessageLevel { get; private set; }
+
+    public RunEventHandler()
+    {
+        TestResults = new List<TestResult>();
+        Errors = new List<string?>();
+        Attachments = new List<AttachmentSet>();
+        InvokedDataCollectors = new List<InvokedDataCollector>();
+    }
+
+    public void EnsureSuccess()
+    {
+        if (Errors.Any())
+        {
+            throw new InvalidOperationException($"Test run reported errors:{Environment.NewLine}{string.Join(Environment.NewLine + Environment.NewLine, Errors)}");
+        }
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        LogMessage = message;
+        TestMessageLevel = level;
+        if (level == TestMessageLevel.Error)
+        {
+            Errors.Add(message);
+        }
+    }
+
+    public void HandleTestRunComplete(
+        TestRunCompleteEventArgs testRunCompleteArgs,
+        TestRunChangedEventArgs? lastChunkArgs,
+        ICollection<AttachmentSet>? runContextAttachments,
+        ICollection<string>? executorUris)
+    {
+        if (lastChunkArgs != null && lastChunkArgs.NewTestResults != null)
+        {
+            TestResults.AddRange(lastChunkArgs.NewTestResults);
+        }
+
+        if (testRunCompleteArgs.AttachmentSets != null)
+        {
+            Attachments.AddRange(testRunCompleteArgs.AttachmentSets);
+        }
+
+        if (testRunCompleteArgs.InvokedDataCollectors != null)
+        {
+            InvokedDataCollectors.AddRange(testRunCompleteArgs.InvokedDataCollectors);
+        }
+
+        Metrics = testRunCompleteArgs.Metrics;
+    }
+
+    public void HandleTestRunStatsChange(TestRunChangedEventArgs? testRunChangedArgs)
+    {
+        if (testRunChangedArgs != null && testRunChangedArgs.NewTestResults != null)
+        {
+            TestResults.AddRange(testRunChangedArgs.NewTestResults);
+        }
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No op
+    }
+
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
+    {
+        // No op
+        return -1;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TelemetryEventsHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TelemetryEventsHandler.cs
new file mode 100644
index 0000000000..718c2ef36d
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TelemetryEventsHandler.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Concurrent;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+internal class TelemetryEventsHandler : ITelemetryEventsHandler
+{
+    public ConcurrentBag<TelemetryEvent> Events { get; private set; } = new ConcurrentBag<TelemetryEvent>();
+
+    public void HandleTelemetryEvent(TelemetryEvent telemetryEvent)
+    {
+        Events.Add(telemetryEvent);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs
new file mode 100644
index 0000000000..2dd74862ac
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <inheritdoc />
+public class TestRunAttachmentsProcessingEventHandler : ITestRunAttachmentsProcessingEventsHandler
+{
+    public List<AttachmentSet> Attachments { get; private set; }
+
+    public TestRunAttachmentsProcessingCompleteEventArgs? CompleteArgs { get; private set; }
+
+    public List<TestRunAttachmentsProcessingProgressEventArgs> ProgressArgs { get; private set; }
+
+    /// <summary>
+    /// Gets the log message.
+    /// </summary>
+    public string? LogMessage { get; private set; }
+
+    public List<string?> Errors { get; set; }
+
+    /// <summary>
+    /// Gets the test message level.
+    /// </summary>
+    public TestMessageLevel TestMessageLevel { get; private set; }
+
+    public TestRunAttachmentsProcessingEventHandler()
+    {
+        Errors = new();
+        Attachments = new List<AttachmentSet>();
+        ProgressArgs = new List<TestRunAttachmentsProcessingProgressEventArgs>();
+    }
+
+    public void EnsureSuccess()
+    {
+        if (Errors.Any())
+        {
+            throw new InvalidOperationException($"Test run reported errors:{Environment.NewLine}{string.Join(Environment.NewLine + Environment.NewLine, Errors)}");
+        }
+    }
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        LogMessage = message;
+        TestMessageLevel = level;
+        if (level == TestMessageLevel.Error)
+        {
+            Errors.Add(message);
+        }
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        // No op
+    }
+
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Usage is unclear so keeping as non-static")]
+    public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo _)
+    {
+        // No op
+        return -1;
+    }
+
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Usage is unclear so keeping as non-static")]
+    public bool AttachDebuggerToProcess(int _)
+    {
+        // No op
+        return true;
+    }
+
+    public void HandleTestRunAttachmentsProcessingComplete(ICollection<AttachmentSet> attachments)
+    {
+        if (attachments != null)
+        {
+            Attachments.AddRange(attachments);
+        }
+    }
+
+    public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet>? lastChunk)
+    {
+        if (lastChunk != null)
+        {
+            Attachments.AddRange(lastChunk);
+        }
+
+        if (attachmentsProcessingCompleteEventArgs.Error != null)
+        {
+            Errors.Add(attachmentsProcessingCompleteEventArgs.Error.Message);
+        }
+
+        CompleteArgs = attachmentsProcessingCompleteEventArgs;
+    }
+
+    public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs attachmentsProcessingProgressEventArgs)
+    {
+        ProgressArgs.Add(attachmentsProcessingProgressEventArgs);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/LiveUnitTestingTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/LiveUnitTestingTests.cs
new file mode 100644
index 0000000000..e7e1d5cd40
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/LiveUnitTestingTests.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+public class LiveUnitTestingTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private DiscoveryEventHandler? _discoveryEventHandler;
+    private RunEventHandler? _runEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_discoveryEventHandler), nameof(_runEventHandler))]
+    public void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void DiscoverTestsUsingLiveUnitTesting(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                        <DisableAppDomain>true</DisableAppDomain>
+                                        <DisableParallelization>true</DisableParallelization>
+                                        </RunConfiguration>
+                                    </RunSettings>";
+
+        _vstestConsoleWrapper.DiscoverTests(
+            GetTestAssemblies(),
+            runSettingsXml,
+            _discoveryEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _discoveryEventHandler.DiscoveredTestCases.Count);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithLiveUnitTesting(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                        <DisableAppDomain>true</DisableAppDomain>
+                                        <DisableParallelization>true</DisableParallelization>
+                                        </RunConfiguration>
+                                    </RunSettings>";
+
+        _vstestConsoleWrapper.RunTests(
+            GetTestAssemblies(),
+            runSettingsXml,
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        var testAssemblies = new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject.dll"),
+            GetAssetFullPath("SimpleTestProject2.dll")
+        };
+
+        return testAssemblies;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunSelectedTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunSelectedTests.cs
new file mode 100644
index 0000000000..0ac08c4827
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunSelectedTests.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+public class RunSelectedTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+    private DiscoveryEventHandler? _discoveryEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler), nameof(_discoveryEventHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+        _discoveryEventHandler = new DiscoveryEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithoutTestPlatformOptions(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.DiscoverTests(GetTestAssemblies(), GetDefaultRunSettings(), _discoveryEventHandler);
+        var testCases = _discoveryEventHandler.DiscoveredTestCases;
+
+        _vstestConsoleWrapper.RunTests(testCases, GetDefaultRunSettings(), _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunSelectedTestsWithTestPlatformOptions(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.DiscoverTests(GetTestAssemblies(), GetDefaultRunSettings(), _discoveryEventHandler);
+        var testCases = _discoveryEventHandler.DiscoveredTestCases;
+
+        _vstestConsoleWrapper.RunTests(
+            testCases,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { CollectMetrics = true },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.IsTrue(_runEventHandler.Metrics!.ContainsKey(TelemetryDataConstants.TargetDevice));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetFramework));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetOS));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForRun));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.RunState));
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        var testAssemblies = new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject.dll"),
+            GetAssetFullPath("SimpleTestProject2.dll")
+        };
+
+        return testAssemblies;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTests.cs
new file mode 100644
index 0000000000..7f0b3249c1
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTests.cs
@@ -0,0 +1,273 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+
+using FluentAssertions;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <summary>
+/// The Run Tests using VsTestConsoleWrapper API's
+/// </summary>
+[TestClass]
+public class RunTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource]
+    public void RunAllTests(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+        vstestConsoleWrapper.RunTests(GetTestDlls("MSTestProject1.dll", "MSTestProject2.dll"), GetDefaultRunSettings(), runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(2, runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource(BeforeFeature = Features.MULTI_TFM)]
+    public void RunAllTestsWithMixedTFMsWillFailToRunTestsFromTheIncompatibleTFMDll(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+        var compatibleDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETFX);
+        var incompatibleDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETCORE);
+
+        // Act
+        // We have no preference around what TFM is used. It will be autodetected.
+        var runsettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        vstestConsoleWrapper.RunTests(new[] { compatibleDll, incompatibleDll }, runsettingsXml, runEventHandler);
+
+        // Assert
+        runEventHandler.TestResults.Should().HaveCount(3, "we failed to run those tests because they are not compatible.");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [TestHostCompatibilityDataSource]
+    [RunnerCompatibilityDataSource(AfterFeature = Features.MULTI_TFM)]
+    public void RunAllTestsWithMixedTFMsWillRunTestsFromAllProvidedDllEvenWhenTheyMixTFMs(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var runEventHandler = new RunEventHandler();
+        var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETFX);
+        var netDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_HOST_NETCORE);
+
+        // Act
+        // We have no preference around what TFM is used. It will be autodetected.
+        var runsettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        vstestConsoleWrapper.RunTests(new[] { netFrameworkDll, netDll }, runsettingsXml, runEventHandler);
+
+        // Assert
+        runEventHandler.Errors.Should().BeEmpty();
+        runEventHandler.TestResults.Should().HaveCount(6, "we run all tests from both assemblies");
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    [DoNotParallelize]
+    public void EndSessionShouldEnsureVstestConsoleProcessDies(RunnerInfo runnerInfo)
+    {
+        var numOfProcesses = Process.GetProcessesByName("vstest.console").Length;
+
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(GetTestAssemblies(), GetDefaultRunSettings(), _runEventHandler);
+        _vstestConsoleWrapper?.EndSession();
+
+        // Assert
+        // TODO: This still works reliably, but it is accidental. Correctly we should look at our "tree" of processes
+        // but there is no such thing on Windows. We can still replicate it quite well. There is code for it in blame
+        // hang collector.
+        Assert.AreEqual(numOfProcesses, Process.GetProcessesByName("vstest.console").Length);
+
+        _vstestConsoleWrapper = null;
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithTelemetryOptedIn(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(
+            GetTestAssemblies(),
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { CollectMetrics = true },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.IsTrue(_runEventHandler.Metrics!.ContainsKey(TelemetryDataConstants.TargetDevice));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetFramework));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetOS));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForRun));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution));
+        Assert.IsTrue(_runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.RunState));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithTelemetryOptedOut(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        _vstestConsoleWrapper.RunTests(
+            GetTestAssemblies(),
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { CollectMetrics = false },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(0, _runEventHandler.Metrics!.Count);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsShouldThrowOnStackOverflowException(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase))
+        {
+            // On release, x64 builds, recursive calls may be replaced with loops (tail call optimization)
+            Assert.Inconclusive("On StackOverflowException testhost not exited in release configuration.");
+            return;
+        }
+
+        var source = new[] { GetAssetFullPath("SimpleTestProject3.dll") };
+
+        _vstestConsoleWrapper.RunTests(
+            source,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { TestCaseFilter = "ExitWithStackoverFlow" },
+            _runEventHandler);
+
+        var errorMessage = runnerInfo.TargetFramework == "net462"
+            ? $"The active test run was aborted. Reason: Test host process crashed : Process is terminated due to StackOverflowException.{Environment.NewLine}"
+            : $"The active test run was aborted. Reason: Test host process crashed : Stack overflow.{Environment.NewLine}";
+
+        _runEventHandler.Errors.Should().Contain(errorMessage);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
+    [NetCoreTargetFrameworkDataSource(useCoreRunner: false)]
+    public void RunTestsShouldShowProperWarningOnNoTestsForTestCaseFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var testAssemblyName = "SimpleTestProject2.dll";
+        var source = new List<string>() { GetAssetFullPath(testAssemblyName) };
+
+        var veryLongTestCaseFilter =
+            "FullyQualifiedName=VeryLongTestCaseNameeeeeeeeeeeeee" +
+            "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
+            "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
+            "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
+            "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+
+        _vstestConsoleWrapper.RunTests(
+            source,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { TestCaseFilter = veryLongTestCaseFilter },
+            _runEventHandler);
+
+        var expectedFilter = veryLongTestCaseFilter.Substring(0, 256) + "...";
+
+        // Assert
+        StringAssert.StartsWith(_runEventHandler.LogMessage, $"No test matches the given testcase filter `{expectedFilter}` in");
+        StringAssert.EndsWith(_runEventHandler.LogMessage, testAssemblyName);
+
+        Assert.AreEqual(TestMessageLevel.Warning, _runEventHandler.TestMessageLevel);
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        return new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject.dll"),
+            GetAssetFullPath("SimpleTestProject2.dll")
+        };
+    }
+
+    private class TestHostLauncher : ITestHostLauncher2
+    {
+        public bool IsDebug => true;
+
+        public bool AttachDebuggerToProcess(int pid)
+        {
+            return true;
+        }
+
+        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken)
+        {
+            return true;
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+        {
+            return -1;
+        }
+
+        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
+        {
+            return -1;
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
new file mode 100644
index 0000000000..b1f2757a56
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
@@ -0,0 +1,236 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <summary>
+/// The Run Tests using VsTestConsoleWrapper API's
+/// </summary>
+[TestClass]
+public class RunTestsWithDifferentConfigurationTests : AcceptanceTestBase
+{
+    private const string NetFramework = "net4";
+    private const string Message = "VsTestConsoleWrapper does not support .Net Core Runner";
+
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private TempDirectory? _logsDir;
+    private RunEventHandler? _runEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_logsDir), nameof(_runEventHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _logsDir = TempDirectory;
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+        _logsDir?.Dispose();
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithTestAdapterPath(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var testAdapterPath = Directory.EnumerateFiles(GetTestAdapterPath(), "*.TestAdapter.dll").ToList();
+        _vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.First() });
+
+        _vstestConsoleWrapper.RunTests(
+            GetTestAssemblies(),
+            GetDefaultRunSettings(),
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithRunSettingsWithParallel(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                                    <RunSettings>
+                                        <RunConfiguration>
+                                        <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
+                                        <MaxCpuCount>2</MaxCpuCount>
+                                        </RunConfiguration>
+                                    </RunSettings>";
+
+        var testHostNames = new[] { "testhost", "testhost.x86" };
+        int expectedNumOfProcessCreated = 2;
+
+        _vstestConsoleWrapper.RunTests(
+            GetTestAssemblies(),
+            runSettingsXml,
+            _runEventHandler);
+
+        // Assert
+        _runEventHandler.EnsureSuccess();
+        Assert.AreEqual(6, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+        AssertExpectedNumberOfHostProcesses(expectedNumOfProcessCreated, _logsDir.Path, testHostNames);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource()]
+    public void RunTestsWithTestSettingsInTpv2(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, NetFramework, Message);
+        Setup();
+
+        var testsettingsFile = Path.Combine(TempDirectory.Path, "tempsettings.testsettings");
+        string testSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?><TestSettings></TestSettings>";
+
+        File.WriteAllText(testsettingsFile, testSettingsXml, Encoding.UTF8);
+        var runSettings = $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion></RunConfiguration><MSTest><SettingsFile>" + testsettingsFile + "</SettingsFile></MSTest></RunSettings>";
+        var sources = new List<string>
+        {
+            GetAssetFullPath("MstestV1UnitTestProject.dll")
+        };
+
+        _vstestConsoleWrapper.RunTests(
+            sources,
+            runSettings,
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(5, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [NetFullTargetFrameworkDataSource()]
+    public void RunTestsWithTestSettingsInTpv0(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, NetFramework, Message);
+        Setup();
+
+        var testSettingsXml = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <TestSettings name="VS19 repro." id="9b2f344b-e089-447e-8ed6-5e333b0a0361" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+              <Description>This is a default test run configuration for a local test run.</Description>
+              <Deployment>
+                <DeploymentItem filename="UnitTest1.cs" />
+              </Deployment>
+              <Execution hostProcessPlatform="MSIL">
+                <Hosts skipUnhostableTests="false">
+                  <AspNet name="ASP.NET" executionType="WebDev" />
+                  <VSSDKTestHostRunConfig name="VS IDE" HiveKind="DevEnv" HiveName="10.0" xmlns="http://microsoft.com/schemas/VisualStudio/SDK/Tools/IdeHostAdapter/2006/06" />
+                </Hosts>
+                <Timeouts runTimeout="3540000" testTimeout="2400000" />
+                <TestTypeSpecific>
+                  <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
+                    <Browser name="Internet Explorer 6.0">
+                      <Headers>
+                        <Header name="User-Agent" value="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)" />
+                        <Header name="Accept" value="*/*" />
+                        <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
+                        <Header name="Accept-Encoding" value="GZIP" />
+                      </Headers>
+                    </Browser>
+                  </WebTestRunConfiguration>
+                  <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+                    <AssemblyResolution>
+                      <TestDirectory useLoadContext="true" />
+                      <RuntimeResolution>
+                        <Directory path="%HOMEDRIVE%\t\UnitTestProject5\UnitTestProject5\bin\Debug" includeSubDirectories="true" />
+                      </RuntimeResolution>
+                    </AssemblyResolution>
+                  </UnitTestRunConfig>
+                </TestTypeSpecific>
+                <AgentRule name="LocalMachineDefaultRole">
+                </AgentRule>
+              </Execution>
+              <Properties />
+            </TestSettings>
+            """;
+
+        var testsettingsFile = Path.Combine(TempDirectory.Path, "tempsettings.testsettings");
+
+        File.WriteAllText(testsettingsFile, testSettingsXml, Encoding.UTF8);
+
+        var source = GetAssetFullPath("MstestV1UnitTestProject.dll");
+
+        InvokeVsTestForExecution(source, null, runnerInfo.TargetFramework, runSettings: testsettingsFile, null);
+
+        // Assert
+        // Ensure that we are trying to run via tpv0 and failing because that is no longer allowed.
+        StringAssert.Contains(StdErrWithWhiteSpace, "An exception occurred while invoking executor 'executor://mstestadapter/v1': MSTest v1 run was offloaded to legacy TestPlatform runner");
+
+        ExitCodeEquals(1); // failing tests
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithX64Source(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var sources = new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject3.dll")
+        };
+
+
+        int expectedNumOfProcessCreated = 1;
+        var testhostProcessNames = new[] { "testhost" };
+
+        _vstestConsoleWrapper.RunTests(
+            sources,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName = SampleUnitTestProject3.UnitTest1.WorkingDirectoryTest" },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        AssertExpectedNumberOfHostProcesses(expectedNumOfProcessCreated, _logsDir.Path, testhostProcessNames);
+    }
+
+    private IList<string> GetTestAssemblies()
+    {
+        var testAssemblies = new List<string>
+        {
+            GetAssetFullPath("SimpleTestProject.dll"),
+            GetAssetFullPath("SimpleTestProject2.dll")
+        };
+
+        return testAssemblies;
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithFilterTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithFilterTests.cs
new file mode 100644
index 0000000000..77627b3e3d
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithFilterTests.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+/// <summary>
+/// The Run Tests using VsTestConsoleWrapper API's
+/// </summary>
+[TestClass]
+public class RunTestsWithFilterTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler))]
+    private void Setup()
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    [RunnerCompatibilityDataSource]
+    public void RunTestsWithTestCaseFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+
+        _runEventHandler = new RunEventHandler();
+
+        var vstestConsoleWrapper = GetVsTestConsoleWrapper();
+        var sources = new List<string> { GetAssetFullPath("MSTestProject1.dll") };
+
+        vstestConsoleWrapper.RunTests(
+            sources,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName=MSTestProject1.UnitTest1.PassingTest" },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(TestOutcome.Passed, _runEventHandler.TestResults.First().Outcome);
+    }
+
+    [TestMethod]
+    [NetFullTargetFrameworkDataSource]
+    [NetCoreTargetFrameworkDataSource]
+    public void RunTestsWithFastFilter(RunnerInfo runnerInfo)
+    {
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        var sources = new List<string> { GetAssetFullPath("SimpleTestProject.dll") };
+
+        _vstestConsoleWrapper.RunTests(
+            sources,
+            GetDefaultRunSettings(),
+            new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName=SampleUnitTestProject.UnitTest1.PassingTest | FullyQualifiedName=SampleUnitTestProject.UnitTest1.FailingTest" },
+            _runEventHandler);
+
+        // Assert
+        Assert.AreEqual(2, _runEventHandler.TestResults.Count);
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
+        Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/SerializeTestRunTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/SerializeTestRunTests.cs
new file mode 100644
index 0000000000..f4f71b2a58
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/SerializeTestRunTests.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+// We need to dogfood the package built in this repo *-dev and we pack tha tp only on windows
+[TestCategory("Windows-Review")]
+public class SerialTestRunDecoratorTests : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+    private DiscoveryEventHandler? _discoveryEventHandler;
+    private DiscoveryEventHandler2? _discoveryEventHandler2;
+    private readonly string _runsettings = $$"""
+<RunSettings>
+    <RunConfiguration>
+        <ForceOneTestAtTimePerTestHost>true</ForceOneTestAtTimePerTestHost>
+    </RunConfiguration>
+</RunSettings>
+""";
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler), nameof(_discoveryEventHandler), nameof(_discoveryEventHandler2))]
+    private void Setup(Dictionary<string, string?>? environmentVariables = null)
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper(environmentVariables);
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _discoveryEventHandler2 = new DiscoveryEventHandler2();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverTestsAndRunTestsSequentially(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        // Act
+        var testDll = GetAssetFullPath("SerializeTestRunTestProject.dll");
+        _vstestConsoleWrapper.DiscoverTests(new string[] { testDll }, GetDefaultRunSettings(), _discoveryEventHandler);
+        _vstestConsoleWrapper.RunTests(_discoveryEventHandler.DiscoveredTestCases, _runsettings, _runEventHandler);
+        _runEventHandler.EnsureSuccess();
+
+        // Assert
+        Assert.AreEqual(10, _discoveryEventHandler.DiscoveredTestCases.Count);
+        int failedTests = _runEventHandler.TestResults.Count(x => x.Outcome == TestOutcome.Failed);
+        Assert.IsFalse(failedTests > 0, $"Number of failed tests {failedTests}");
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverTestsAndRunTestsSequentially_DisabledByFeatureFlag(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Dictionary<string, string?>? environmentVariables = new() { { "VSTEST_DISABLE_SERIALTESTRUN_DECORATOR", "1" } };
+        Setup(environmentVariables);
+
+        // Act
+        var testDll = GetAssetFullPath("SerializeTestRunTestProject.dll");
+        _vstestConsoleWrapper.DiscoverTests(new string[] { testDll }, GetDefaultRunSettings(), _discoveryEventHandler);
+        _vstestConsoleWrapper.RunTests(_discoveryEventHandler.DiscoveredTestCases, _runsettings, _runEventHandler);
+        _runEventHandler.EnsureSuccess();
+
+        // Assert
+        Assert.AreEqual(10, _discoveryEventHandler.DiscoveredTestCases.Count);
+        int failedTests = _runEventHandler.TestResults.Count(x => x.Outcome == TestOutcome.Failed);
+        Assert.IsTrue(failedTests > 0, $"Number of failed tests {failedTests}");
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void DiscoverTestsAndRunTestsSequentially_IsNotSupportedForSources(RunnerInfo runnerInfo)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Setup();
+
+        // Act
+        var testDll = GetAssetFullPath("SerializeTestRunTestProject.dll");
+        _vstestConsoleWrapper.RunTests(new string[] { testDll }, _runsettings, _runEventHandler);
+        _ = Assert.ThrowsException<InvalidOperationException>(_runEventHandler.EnsureSuccess);
+
+        StringBuilder builder = new();
+        foreach (string? error in _runEventHandler.Errors)
+        {
+            builder.AppendLine(error);
+        }
+
+        Assert.IsTrue(_runEventHandler.Errors.Count > 0);
+        Assert.IsTrue(_runEventHandler.Errors.Contains(VisualStudio.TestPlatform.Common.Resources.Resources.SerialTestRunInvalidScenario), $"Error messages\n:{builder}");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/TargetFrameworkTestHostDemultiplexer.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/TargetFrameworkTestHostDemultiplexer.cs
new file mode 100644
index 0000000000..a1454a92a3
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/TargetFrameworkTestHostDemultiplexer.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests;
+
+[TestClass]
+// We need to dogfood the package built in this repo *-dev and we pack tha tp only on windows
+[TestCategory("Windows-Review")]
+public class TargetFrameworkTestHostDemultiplexer : AcceptanceTestBase
+{
+    private IVsTestConsoleWrapper? _vstestConsoleWrapper;
+    private RunEventHandler? _runEventHandler;
+    private DiscoveryEventHandler? _discoveryEventHandler;
+
+    [MemberNotNull(nameof(_vstestConsoleWrapper), nameof(_runEventHandler), nameof(_discoveryEventHandler))]
+    private void Setup(Dictionary<string, string?>? environmentVariables = null)
+    {
+        _vstestConsoleWrapper = GetVsTestConsoleWrapper(environmentVariables);
+        _discoveryEventHandler = new DiscoveryEventHandler();
+        _runEventHandler = new RunEventHandler();
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        _vstestConsoleWrapper?.EndSession();
+    }
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void ExecuteContainerInMultiHost(RunnerInfo runnerInfo)
+        => ExecuteContainerInMultiHost(runnerInfo, 3);
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void ExecuteContainerInMultiHost_MoreHostsThanTests(RunnerInfo runnerInfo)
+        => ExecuteContainerInMultiHost(runnerInfo, 20);
+
+    [TestMethod]
+    [NetCoreTargetFrameworkDataSource]
+    [NetFullTargetFrameworkDataSource]
+    public void ExecuteSingleContainerInDefaultSingleHost(RunnerInfo runnerInfo)
+        => ExecuteContainerInMultiHost(runnerInfo, -1);
+
+    private void ExecuteContainerInMultiHost(RunnerInfo runnerInfo, int expectedHost)
+    {
+        // Arrange
+        SetTestEnvironment(_testEnvironment, runnerInfo);
+        Dictionary<string, string?>? environmentVariables = new() { { "VSTEST_LOGFOLDER", TempDirectory.Path } };
+        Setup(environmentVariables);
+        string runsettings = $"""
+<RunSettings>
+    <RunConfiguration>
+        <MaxCpuCount>{expectedHost}</MaxCpuCount>
+        <TargetFrameworkTestHostDemultiplexer>{expectedHost}</TargetFrameworkTestHostDemultiplexer>
+    </RunConfiguration>
+</RunSettings>
+""";
+
+        // Act
+        var testDll = GetAssetFullPath("MultiHostTestExecutionProject.dll");
+        _vstestConsoleWrapper.DiscoverTests(new string[] { testDll }, GetDefaultRunSettings(), _discoveryEventHandler);
+        _vstestConsoleWrapper.RunTests(_discoveryEventHandler.DiscoveredTestCases, expectedHost == -1 ? GetDefaultRunSettings() : runsettings, _runEventHandler);
+        _runEventHandler.EnsureSuccess();
+
+        // Assert
+        Assert.AreEqual(10, _discoveryEventHandler.DiscoveredTestCases.Count);
+        int failedTests = _runEventHandler.TestResults.Count(x => x.Outcome == TestOutcome.Failed);
+        Assert.IsFalse(failedTests > 0, $"Number of failed tests {failedTests}");
+
+        string[] hosts = Directory.GetFiles(TempDirectory.Path, "TestHost*");
+        Assert.AreEqual(expectedHost == -1 ? 1 : expectedHost > 10 ? 10 : expectedHost, hosts.Length);
+
+        List<string> tests = new();
+        int testsRunInsideHost;
+        foreach (var file in hosts)
+        {
+            testsRunInsideHost = 0;
+
+            using StreamReader streamReader = new(file);
+            while (!streamReader.EndOfStream)
+            {
+                string? line = streamReader.ReadLine();
+                if (!string.IsNullOrEmpty(line))
+                {
+                    tests.Add(line);
+                }
+                testsRunInsideHost++;
+            }
+
+
+            if (expectedHost == 3)
+            {
+                Assert.IsTrue(testsRunInsideHost >= 3);
+            }
+        }
+
+        Assert.AreEqual(10, tests.Count);
+        for (int i = 1; i <= 10; i++)
+        {
+            tests.Remove($"TestMethod{i}");
+        }
+        Assert.AreEqual(0, tests.Count);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs
deleted file mode 100644
index 65fdcadc26..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-
-    using Microsoft.TestPlatform.TestUtilities;
-
-    public class AcceptanceTestBase : IntegrationTestBase
-    {
-        public const string Net451TargetFramework = "net451";
-        public const string Net452TargetFramework = "net452";
-        public const string Net46TargetFramework = "net46";
-        public const string Net461TargetFramework = "net461";
-        public const string Net462TargetFramework = "net462";
-        public const string Net47TargetFramework = "net47";
-        public const string Net471TargetFramework = "net471";
-        public const string Net472TargetFramework = "net472";
-        public const string Net48TargetFramework = "net48";
-        public const string DesktopTargetFramework = "net451";
-        public const string Core21TargetFramework = "netcoreapp2.1";
-        public const string Core31TargetFramework = "netcoreapp3.1";
-        public const string Core50TargetFramework = "net5.0";
-        public const string Core60TargetFramework = "net6.0";
-
-        public const string DesktopFrameworkArgValue = ".NETFramework,Version=v4.5.1";
-        public const string Net451FrameworkArgValue = ".NETFramework,Version=v4.5.1";
-        public const string Net452FrameworkArgValue = ".NETFramework,Version=v4.5.2";
-        public const string Net46FrameworkArgValue = ".NETFramework,Version=v4.6";
-        public const string Net461FrameworkArgValue = ".NETFramework,Version=v4.6.1";
-        public const string Net462FrameworkArgValue = ".NETFramework,Version=v4.6.2";
-        public const string Net47FrameworkArgValue = ".NETFramework,Version=v4.7";
-        public const string Net471FrameworkArgValue = ".NETFramework,Version=v4.7.1";
-        public const string Net472FrameworkArgValue = ".NETFramework,Version=v4.7.2";
-        public const string Net48FrameworkArgValue = ".NETFramework,Version=v4.8";
-
-        public const string Core21FrameworkArgValue = ".NETCoreApp,Version=v2.1";
-        public const string Core31FrameworkArgValue = ".NETCoreApp,Version=v3.1";
-        public const string Core50FrameworkArgValue = ".NETCoreApp,Version=v5.0";
-        public const string Core60FrameworkArgValue = ".NETCoreApp,Version=v6.0";
-
-        public const string DesktopRunnerTargetRuntime = "win7-x64";
-        public const string CoreRunnerTargetRuntime = "";
-        public const string InIsolation = "/InIsolation";
-
-        public const string NETFX452_48 = "net452;net461;net472;net48";
-        public const string NETFX451_48 = "net452;net461;net472;net48";
-        public const string NETCORE21_50 = "netcoreapp2.1;netcoreapp3.1;net5.0";
-        public const string NETFX452_NET50 = "net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0";
-        public const string NETFX452_NET31 = "net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1";
-
-        public static string And(string left, string right)
-        {
-            return string.Join(";", left, right);
-        }
-
-        protected string FrameworkArgValue => DeriveFrameworkArgValue(this.testEnvironment);
-
-        protected static void SetTestEnvironment(IntegrationTestEnvironment testEnvironment, RunnerInfo runnerInfo)
-        {
-            testEnvironment.RunnerFramework = runnerInfo.RunnerFramework;
-            testEnvironment.TargetFramework = runnerInfo.TargetFramework;
-            testEnvironment.InIsolationValue = runnerInfo.InIsolationValue;
-        }
-
-        protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testEnvironment)
-        {
-            switch (testEnvironment.TargetFramework)
-            {
-                case Core21TargetFramework:
-                    return Core21FrameworkArgValue;
-                case Core31TargetFramework:
-                    return Core31FrameworkArgValue;
-                case Core50TargetFramework:
-                    return Core50FrameworkArgValue;
-                case Core60TargetFramework:
-                    return Core60FrameworkArgValue;
-                case Net451TargetFramework:
-                    return Net451FrameworkArgValue;
-                case Net452TargetFramework:
-                    return Net452FrameworkArgValue;
-                case Net46TargetFramework:
-                    return Net46FrameworkArgValue;
-                case Net461TargetFramework:
-                    return Net461FrameworkArgValue;
-                case Net462TargetFramework:
-                    return Net462FrameworkArgValue;
-                case Net47TargetFramework:
-                    return Net47FrameworkArgValue;
-                case Net471TargetFramework:
-                    return Net471FrameworkArgValue;
-                case Net472TargetFramework:
-                    return Net472FrameworkArgValue;
-                case Net48TargetFramework:
-                    return Net48FrameworkArgValue;
-                default:
-                    throw new NotSupportedException($"{testEnvironment.TargetFramework} is not supported TargetFramework value.");
-            }
-        }
-
-        protected bool IsDesktopTargetFramework()
-        {
-            return this.testEnvironment.TargetFramework == AcceptanceTestBase.DesktopTargetFramework;
-        }
-
-        protected string GetTargetFramworkForRunsettings()
-        {
-            var targetFramework = string.Empty;
-            if (this.testEnvironment.TargetFramework == DesktopTargetFramework)
-            {
-                targetFramework = "Framework45";
-            }
-            else
-            {
-                targetFramework = "FrameworkCore10";
-            }
-
-            return targetFramework;
-        }
-
-        /// <summary>
-        /// Default RunSettings
-        /// </summary>
-        /// <returns></returns>
-        public string GetDefaultRunSettings()
-        {
-            string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-            return runSettingsXml;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs
deleted file mode 100644
index 0834163df7..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-#if !NET451
-    using System.Runtime.Loader;
-#else
-    using System.Reflection;
-#endif
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class AppDomainTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void RunTestExecutionWithDisableAppDomain(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var testResults = GetResultsDirectory();
-            var testAppDomainDetailFileName = Path.Combine(Path.GetTempPath(), "appdomain_test.txt");
-            var dataCollectorAppDomainDetailFileName = Path.Combine(Path.GetTempPath(), "appdomain_datacollector.txt");
-
-            // Delete test output files if already exist
-            File.Delete(testAppDomainDetailFileName);
-            File.Delete(dataCollectorAppDomainDetailFileName);
-            var runsettingsFilePath = this.GetInProcDataCollectionRunsettingsFile(true);
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                runsettingsFilePath,
-                this.FrameworkArgValue,
-                runnerInfo.InIsolationValue,
-                testResults);
-
-            this.InvokeVsTest(arguments);
-
-            Assert.IsTrue(IsFilesContentEqual(testAppDomainDetailFileName, dataCollectorAppDomainDetailFileName), "Different AppDomains, test: {0} datacollector: {1}", File.ReadAllText(testAppDomainDetailFileName), File.ReadAllText(dataCollectorAppDomainDetailFileName));
-            this.ValidateSummaryStatus(1, 1, 1);
-            File.Delete(runsettingsFilePath);
-            TryRemoveDirectory(testResults);
-        }
-
-        private static bool IsFilesContentEqual(string filePath1, string filePath2)
-        {
-            Assert.IsTrue(File.Exists(filePath1), "File doesn't exist: {0}.", filePath1);
-            Assert.IsTrue(File.Exists(filePath2), "File doesn't exist: {0}.", filePath2);
-            var content1 = File.ReadAllText(filePath1);
-            var content2 = File.ReadAllText(filePath2);
-            Assert.IsTrue(string.Equals(content1, content2, StringComparison.Ordinal), "Content miss match file1 content:{2}{0}{2} file2 content:{2}{1}{2}", content1, content2, Environment.NewLine);
-            return string.Equals(content1, content2, StringComparison.Ordinal);
-        }
-
-        private string GetInProcDataCollectionRunsettingsFile(bool disableAppDomain)
-        {
-            var runSettings = Path.Combine(Path.GetTempPath(), "test_" + Guid.NewGuid() + ".runsettings");
-            var inprocasm = this.testEnvironment.GetTestAsset("SimpleDataCollector.dll");
-#if !NET451
-            var assemblyName = AssemblyLoadContext.GetAssemblyName(inprocasm);
-#else
-            var assemblyName = AssemblyName.GetAssemblyName(inprocasm);
-#endif
-            var fileContents = @"<RunSettings>
-                                    <InProcDataCollectionRunSettings>
-                                        <InProcDataCollectors>
-                                            <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='SimpleDataCollector.SimpleDataCollector, {0}'  codebase='{1}'>
-                                                <Configuration>
-                                                    <Port>4312</Port>
-                                                </Configuration>
-                                            </InProcDataCollector>
-                                        </InProcDataCollectors>
-                                    </InProcDataCollectionRunSettings>
-                                    <RunConfiguration>
-                                       <DisableAppDomain>" + disableAppDomain + @"</DisableAppDomain>
-                                    </RunConfiguration>
-                                </RunSettings>";
-
-            fileContents = string.Format(fileContents, assemblyName, inprocasm);
-            File.WriteAllText(runSettings, fileContents);
-
-            return runSettings;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ArgumentProcessorTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ArgumentProcessorTests.cs
deleted file mode 100644
index d0e39b924f..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/ArgumentProcessorTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class ArgumentProcessorTests : AcceptanceTestBase
-    {
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void PassingNoArgumentsToVsTestConsoleShouldPrintHelpMessage(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTest(null);
-
-            //Check for help usage, description and arguments text.
-            this.StdOutputContains("Usage: vstest.console.exe");
-            this.StdOutputContains("Description: Runs tests from the specified files.");
-            this.StdOutputContains("Arguments:");
-
-            //Check for help options text
-            this.StdOutputContains("Options:");
-
-            //Check for help examples text
-            this.StdOutputContains("To run tests: >vstest.console.exe tests.dll");
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void PassingInvalidArgumentsToVsTestConsoleShouldNotPrintHelpMessage(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var testResults = GetResultsDirectory();
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, resultsDirectory: testResults);
-            arguments = string.Concat(arguments, " /badArgument");
-
-            this.InvokeVsTest(arguments);
-
-            //Check for help usage, description and arguments text.
-            this.StdOutputDoesNotContains("Usage: vstest.console.exe");
-            this.StdOutputDoesNotContains("Description: Runs tests from the specified files.");
-            this.StdOutputDoesNotContains("Arguments:");
-
-            //Check for help options text
-            this.StdOutputDoesNotContains("Options:");
-
-            //Check for help examples text
-            this.StdOutputDoesNotContains("To run tests: >vstest.console.exe tests.dll");
-
-            //Check for message which guides using help option
-            this.StdErrorContains("Please use the /help option to check the list of valid arguments");
-
-            TryRemoveDirectory(testResults);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs
deleted file mode 100644
index 979acae2b2..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Xml;
-
-    [TestClass]
-    // this whole thing is complicated and depends on versions of OS and the target runtime
-    // keeping this for later
-    [TestCategory("Windows-Review")]
-    public class BlameDataCollectorTests : AcceptanceTestBase
-    {
-        private readonly string resultsDir;
-
-        public const string NETCOREANDFX = "net452;net472;netcoreapp3.1";
-        public const string NET50 = "net5.0";
-
-        public BlameDataCollectorTests()
-        {
-            this.resultsDir = GetResultsDirectory();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", null);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        // netcoreapp2.1 dump is not supported on Linux
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void BlameDataCollectorShouldGiveCorrectTestCaseName(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("BlameUnitTestProject.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $" /Blame");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{resultsDir}");
-            this.InvokeVsTest(arguments);
-
-            this.VaildateOutput("BlameUnitTestProject.UnitTest1.TestMethod2");
-        }
-
-        [TestMethod]
-        // netcoreapp2.1 dump is not supported on Linux
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void BlameDataCollectorShouldOutputDumpFile(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $" /Blame:CollectDump");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{resultsDir}");
-            arguments = string.Concat(arguments, " /testcasefilter:ExitWithStackoverFlow");
-            this.InvokeVsTest(arguments);
-
-            this.VaildateOutput("SampleUnitTestProject3.UnitTest1.ExitWithStackoverFlow", validateDumpFile: true);
-        }
-
-        [TestMethod]
-        // netcoreapp2.1 dump is not supported on Linux
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void BlameDataCollectorShouldNotOutputDumpFileWhenNoCrashOccurs(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $" /Blame:CollectDump");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{resultsDir}");
-            arguments = string.Concat(arguments, " /testcasefilter:PassingTest");
-            this.InvokeVsTest(arguments);
-
-            Assert.IsFalse(this.StdOut.Contains(".dmp"), "it should not collect a dump, because nothing crashed");
-        }
-
-        [TestMethod]
-        // netcoreapp2.1 dump is not supported on Linux
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlwaysIsEnabled(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $" /Blame:CollectDump;CollectAlways=True");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{resultsDir}");
-            arguments = string.Concat(arguments, " /testcasefilter:PassingTest");
-            this.InvokeVsTest(arguments);
-
-            Assert.IsTrue(this.StdOut.Contains(".dmp"), "it should collect dump, even if nothing crashed");
-        }
-
-        [TestMethod]
-        [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")]
-        public void HangDumpOnTimeout(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("timeout.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=3s""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump();
-        }
-
-        [TestMethod]
-        // net5.0 does not suppord dump on exit
-        [NetCoreRunner("net452;net472;netcoreapp3.1")]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner("net452;net472;netcoreapp3.1")]
-
-        public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("timeout.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true;CollectHangDump""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump();
-        }
-
-        [TestMethod]
-        // net5.0 does not suppord dump on exit
-        [NetCoreRunner("net452;net472;netcoreapp3.1")]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner("net452;net472;netcoreapp3.1")]
-
-        public void CrashDumpOnExit(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("timeout.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump();
-        }
-
-        [TestMethod]
-        [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")]
-        public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo)
-        {
-            Environment.SetEnvironmentVariable("PROCDUMP_PATH", Path.Combine(this.testEnvironment.PackageDirectory, @"procdump\0.0.1\bin"));
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("crash.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump();
-        }
-
-        [TestMethod]
-        [NetCoreRunner(NET50)]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner(NET50)]
-        public void CrashDumpChildProcesses(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("child-crash.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump(2);
-        }
-
-        [TestMethod]
-        [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")]
-        // should make no difference, keeping for easy debug
-        // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")]
-        public void HangDumpChildProcesses(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.GetAssetFullPath("child-hang.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue);
-            arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=15s""");
-            this.InvokeVsTest(arguments);
-
-            this.ValidateDump(2);
-        }
-
-        private void ValidateDump(int expectedDumpCount = 1)
-        {
-            var attachments = this.StdOutWithWhiteSpace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
-                .SkipWhile(l => !l.Contains("Attachments:")).Skip(1)
-                .Where(l => !string.IsNullOrWhiteSpace(l))
-                .ToList();
-
-            var output = string.Join(Environment.NewLine, attachments);
-            if (!attachments.Any(a => a.Contains("Sequence_")))
-            {
-                // sequence file is pretty flaky, and easily substituted by diag log
-                // throw new AssertFailedException("Expected Sequence file in Attachments, but there was none."
-                //    + Environment.NewLine
-                //    + output);
-            }
-
-            var dumps = attachments
-                .Where(a => a.EndsWith(".dmp"))
-                // On Windows we might collect conhost which tells us nothing
-                // or WerFault in case we would start hanging during crash
-                // we don't want these to make cross-platform checks more difficult
-                // so we filter them out.
-                .Where(a => !a.Contains("WerFault") && !a.Contains("conhost"))
-                .Select(a => a.Trim()).ToList();
-
-            if (dumps.Count < expectedDumpCount)
-            {
-                throw new AssertFailedException($"Expected at least {expectedDumpCount} dump file in Attachments, but there were {dumps.Count}."
-                    + Environment.NewLine
-                    + string.Join(Environment.NewLine, dumps));
-            }
-
-            var nonExistingDumps = new List<string>();
-            var emptyDumps = new List<string>();
-            foreach (var dump in dumps)
-            {
-                if (!File.Exists(dump))
-                {
-                    nonExistingDumps.Add(dump);
-                }
-                else
-                {
-                    var file = new FileInfo(dump);
-                    if (file.Length == 0)
-                    {
-                        emptyDumps.Add(dump);
-                    }
-                }
-            }
-
-            // allow some child dumps to be missing, they manage to terminate early from time to time
-            if ((dumps.Count == 1 && nonExistingDumps.Any()) || (dumps.Count > 1 && nonExistingDumps.Count > 1)
-                || emptyDumps.Any())
-            {
-                var err = new StringBuilder();
-                err.AppendLine("Expected all dumps in the list of attachments to exist, and not be empty, but:");
-                if (nonExistingDumps.Any())
-                {
-                    err.AppendLine($"{nonExistingDumps.Count} don't exist:")
-                    .AppendLine(string.Join(Environment.NewLine, nonExistingDumps));
-                }
-
-                if (emptyDumps.Any())
-                {
-                    err.AppendLine($"{emptyDumps.Count} are empty:")
-                    .AppendLine(string.Join(Environment.NewLine, emptyDumps));
-                }
-
-                err.AppendLine("Reported attachments:")
-                .AppendLine(output);
-
-                throw new AssertFailedException(err.ToString());
-            }
-        }
-
-        private void VaildateOutput(string testName, bool validateDumpFile = false)
-        {
-            bool isSequenceAttachmentReceived = false;
-            bool isDumpAttachmentReceived = false;
-            bool isValid = false;
-            this.StdErrorContains(testName);
-            this.StdOutputContains("Sequence_");
-            var resultFiles = Directory.GetFiles(this.resultsDir, "*", SearchOption.AllDirectories);
-
-            foreach (var file in resultFiles)
-            {
-                if (file.Contains("Sequence_"))
-                {
-                    isSequenceAttachmentReceived = true;
-                    isValid = IsValidXml(file);
-                }
-                else if (validateDumpFile && file.Contains(".dmp"))
-                {
-                    isDumpAttachmentReceived = true;
-                }
-            }
-
-            Assert.IsTrue(isSequenceAttachmentReceived);
-            Assert.IsTrue(!validateDumpFile || isDumpAttachmentReceived);
-            Assert.IsTrue(isValid);
-        }
-
-        private bool IsValidXml(string xmlFilePath)
-        {
-            var file = File.OpenRead(xmlFilePath);
-            var reader = XmlReader.Create(file);
-            try
-            {
-                while (reader.Read())
-                {
-                }
-                file.Dispose();
-                return true;
-            }
-            catch (XmlException)
-            {
-                file.Dispose();
-                return false;
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs
deleted file mode 100644
index 18d5882e26..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class CUITTest : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void CUITRunAllTests(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            CUITRunAll(runnerInfo.RunnerFramework);
-        }
-
-        private void CUITRunAll(string runnerFramework)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("CUIT tests are not supported with .Netcore runner.");
-                return;
-            }
-
-            var assemblyAbsolutePath = testEnvironment.GetTestAsset("CUITTestProject.dll", "net451");
-            var resultsDirectory = GetResultsDirectory();
-            var arguments = PrepareArguments(assemblyAbsolutePath, string.Empty, string.Empty, this.FrameworkArgValue, resultsDirectory: resultsDirectory);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDirectory);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs
deleted file mode 100644
index 9dc0f7baab..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.	
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    public class CodeCoverageAcceptanceTestBase : AcceptanceTestBase
-    {
-        /*
-         * Below value is just safe coverage result for which all tests are passing.
-         * Inspecting this value gives us confidence that there is no big drop in overall coverage.
-         */
-        protected const double ExpectedMinimalModuleCoverage = 30.0;
-
-        protected string GetNetStandardAdapterPath()
-        {
-            return Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "Microsoft.CodeCoverage");
-        }
-
-        protected string GetNetFrameworkAdapterPath()
-        {
-            return Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "net451", "win7-x64", "Extensions");
-        }
-
-        protected string GetCodeCoverageExePath()
-        {
-            return Path.Combine(this.GetNetStandardAdapterPath(), "CodeCoverage", "CodeCoverage.exe");
-        }
-
-        protected XmlNode GetModuleNode(XmlNode node, string name)
-        {
-            var moduleNode = this.GetNode(node, "module", name);
-
-            if (moduleNode == null)
-            {
-                moduleNode = this.GetNode(node, "package", name);
-
-                if (moduleNode == null)
-                {
-                    moduleNode = this.GetNode(node, "package", Path.GetFileNameWithoutExtension(name));
-                }
-            }
-
-            return moduleNode;
-        }
-
-        protected XmlNode GetNode(XmlNode node, string type, string name)
-        {
-            return node.SelectSingleNode($"//{type}[@name='{name}']");
-        }
-
-        protected XmlDocument GetXmlCoverage(string coverageResult)
-        {
-            XmlDocument coverage = new XmlDocument();
-
-            if (coverageResult.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
-            {
-                coverage.Load(coverageResult);
-                return coverage;
-            }
-
-            var codeCoverageExe = this.GetCodeCoverageExePath();
-            var output = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString() + ".xml");
-
-            var watch = new Stopwatch();
-
-            Console.WriteLine($"Starting {codeCoverageExe}");
-            watch.Start();
-            var analyze = Process.Start(new ProcessStartInfo
-            {
-                FileName = codeCoverageExe,
-                Arguments = $"analyze /include_skipped_functions /include_skipped_modules /output:\"{output}\" \"{coverageResult}\"",
-                RedirectStandardOutput = true,
-                UseShellExecute = false
-            });
-
-            string analysisOutput = analyze.StandardOutput.ReadToEnd();
-
-            analyze.WaitForExit();
-            watch.Stop();
-            Console.WriteLine($"Total execution time: {watch.Elapsed.Duration()}");
-
-            Assert.IsTrue(0 == analyze.ExitCode, $"Code Coverage analyze failed: {analysisOutput}");
-
-            coverage.Load(output);
-            return coverage;
-        }
-
-        protected void AssertCoverage(XmlNode node, double expectedCoverage)
-        {
-            var coverage = node.Attributes["block_coverage"] != null
-                ? double.Parse(node.Attributes["block_coverage"].Value)
-                : double.Parse(node.Attributes["line-rate"].Value) * 100;
-            Console.WriteLine($"Checking coverage for {node.Name} {node.Attributes["name"].Value}. Expected at least: {expectedCoverage}. Result: {coverage}");
-            Assert.IsTrue(coverage > expectedCoverage, $"Coverage check failed for {node.Name} {node.Attributes["name"].Value}. Expected at least: {expectedCoverage}. Found: {coverage}");
-        }
-
-        protected static string GetCoverageFileNameFromTrx(string trxFilePath, string resultsDirectory)
-        {
-            Assert.IsTrue(File.Exists(trxFilePath), "Trx file not found: {0}", trxFilePath);
-            XmlDocument doc = new XmlDocument();
-            using (var trxStream = new FileStream(trxFilePath, FileMode.Open, FileAccess.Read))
-            {
-                doc.Load(trxStream);
-                var deploymentElements = doc.GetElementsByTagName("Deployment");
-                Assert.IsTrue(deploymentElements.Count == 1,
-                    "None or more than one Deployment tags found in trx file:{0}", trxFilePath);
-                var deploymentDir = deploymentElements[0].Attributes.GetNamedItem("runDeploymentRoot")?.Value;
-                Assert.IsTrue(string.IsNullOrEmpty(deploymentDir) == false,
-                    "runDeploymentRoot attribute not found in trx file:{0}", trxFilePath);
-                var collectors = doc.GetElementsByTagName("Collector");
-
-                string fileName = string.Empty;
-                for (int i = 0; i < collectors.Count; i++)
-                {
-                    if (string.Equals(collectors[i].Attributes.GetNamedItem("collectorDisplayName").Value,
-                        "Code Coverage", StringComparison.OrdinalIgnoreCase))
-                    {
-                        fileName = collectors[i].FirstChild?.FirstChild?.FirstChild?.Attributes.GetNamedItem("href")
-                            ?.Value;
-                    }
-                }
-
-                Assert.IsTrue(string.IsNullOrEmpty(fileName) == false, "Coverage file name not found in trx file: {0}",
-                    trxFilePath);
-                return Path.Combine(resultsDirectory, deploymentDir, "In", fileName);
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs
deleted file mode 100644
index 37afffe262..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    internal struct TestParameters
-    {
-        public enum SettingsType
-        {
-            None = 0,
-            Default = 1,
-            Custom = 2,
-            XmlOutput = 3,
-            CoberturaOutput = 4
-        }
-
-        public string AssemblyName { get; set; }
-
-        public string TargetPlatform { get; set; }
-
-        public SettingsType RunSettingsType { get; set; }
-
-        public string RunSettingsPath { get; set; }
-
-        public int ExpectedPassedTests { get; set; }
-
-        public int ExpectedSkippedTests { get; set; }
-
-        public int ExpectedFailedTests { get; set; }
-
-        public bool CheckSkipped { get; set; }
-    }
-
-    [TestClass]
-    //Code coverage only supported on windows (based on the message in output)
-    [TestCategory("Windows-Review")]
-    public class CodeCoverageTests : CodeCoverageAcceptanceTestBase
-    {
-        private readonly string resultsDirectory;
-
-        public CodeCoverageTests()
-        {
-            this.resultsDirectory = GetResultsDirectory();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageWithCollectOptionForx86(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x86",
-                RunSettingsPath = string.Empty,
-                RunSettingsType = TestParameters.SettingsType.None,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageWithCollectOptionForx64(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x64",
-                RunSettingsPath = string.Empty,
-                RunSettingsType = TestParameters.SettingsType.None,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageX86WithRunSettings(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x86",
-                RunSettingsPath = string.Empty,
-                RunSettingsType = TestParameters.SettingsType.Default,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageX64WithRunSettings(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x64",
-                RunSettingsPath = string.Empty,
-                RunSettingsType = TestParameters.SettingsType.Default,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CodeCoverageShouldAvoidExclusionsX86(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "CodeCoverageTest.dll",
-                TargetPlatform = "x86",
-                RunSettingsPath = Path.Combine(
-                    IntegrationTestEnvironment.TestPlatformRootDirectory,
-                    @"scripts", "vstest-codecoverage2.runsettings"),
-                RunSettingsType = TestParameters.SettingsType.Custom,
-                ExpectedPassedTests = 3,
-                ExpectedSkippedTests = 0,
-                ExpectedFailedTests = 0,
-                CheckSkipped = true
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CodeCoverageShouldAvoidExclusionsX64(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "CodeCoverageTest.dll",
-                TargetPlatform = "x64",
-                RunSettingsPath = Path.Combine(
-                    IntegrationTestEnvironment.TestPlatformRootDirectory,
-                    @"scripts", "vstest-codecoverage2.runsettings"),
-                RunSettingsType = TestParameters.SettingsType.Custom,
-                ExpectedPassedTests = 3,
-                ExpectedSkippedTests = 0,
-                ExpectedFailedTests = 0,
-                CheckSkipped = true
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageSpecifyOutputFormatXml(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x64",
-                RunSettingsPath = string.Empty,
-                RunSettingsType = TestParameters.SettingsType.XmlOutput,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void CollectCodeCoverageSpecifyOutputFormatCoberturaOverrideRunSettingsConfiguration(RunnerInfo runnerInfo)
-        {
-            var parameters = new TestParameters()
-            {
-                AssemblyName = "SimpleTestProject.dll",
-                TargetPlatform = "x64",
-                RunSettingsPath = Path.Combine(
-                    IntegrationTestEnvironment.TestPlatformRootDirectory,
-                    @"scripts", "vstest-codecoverage2.runsettings"),
-                RunSettingsType = TestParameters.SettingsType.CoberturaOutput,
-                ExpectedPassedTests = 1,
-                ExpectedSkippedTests = 1,
-                ExpectedFailedTests = 1
-            };
-
-            this.CollectCodeCoverage(runnerInfo, parameters);
-        }
-
-        private void CollectCodeCoverage(RunnerInfo runnerInfo, TestParameters testParameters)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var arguments = this.CreateArguments(runnerInfo, testParameters, out var trxFilePath);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(
-                testParameters.ExpectedPassedTests,
-                testParameters.ExpectedSkippedTests,
-                testParameters.ExpectedFailedTests);
-
-            var actualCoverageFile = CodeCoverageTests.GetCoverageFileNameFromTrx(trxFilePath, resultsDirectory);
-            Console.WriteLine($@"Coverage file: {actualCoverageFile}  Results directory: {resultsDirectory} trxfile: {trxFilePath}");
-            Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile);
-
-            if (testParameters.RunSettingsType == TestParameters.SettingsType.XmlOutput)
-            {
-                Assert.IsTrue(actualCoverageFile.EndsWith(".xml", StringComparison.InvariantCultureIgnoreCase));
-            }
-            else if (testParameters.RunSettingsType == TestParameters.SettingsType.CoberturaOutput)
-            {
-                Assert.IsTrue(actualCoverageFile.EndsWith(".cobertura.xml", StringComparison.InvariantCultureIgnoreCase));
-            }
-            else
-            {
-                Assert.IsTrue(actualCoverageFile.EndsWith(".coverage", StringComparison.InvariantCultureIgnoreCase));
-            }
-
-            var coverageDocument = this.GetXmlCoverage(actualCoverageFile);
-            if (testParameters.CheckSkipped)
-            {
-                this.AssertSkippedMethod(coverageDocument);
-            }
-
-            this.ValidateCoverageData(coverageDocument, testParameters.AssemblyName, testParameters.RunSettingsType != TestParameters.SettingsType.CoberturaOutput);
-
-            Directory.Delete(this.resultsDirectory, true);
-        }
-
-        private string CreateArguments(
-            RunnerInfo runnerInfo,
-            TestParameters testParameters,
-            out string trxFilePath)
-        {
-            var assemblyPaths = this.GetAssetFullPath(testParameters.AssemblyName);
-
-            string traceDataCollectorDir = Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory,
-                "artifacts", IntegrationTestEnvironment.BuildConfiguration, "Microsoft.CodeCoverage");
-
-            string diagFileName = Path.Combine(this.resultsDirectory, "diaglog.txt");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty,
-                this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory);
-            arguments = string.Concat(arguments, $" /Diag:{diagFileName}",
-                $" /TestAdapterPath:{traceDataCollectorDir}");
-            arguments = string.Concat(arguments, $" /Platform:{testParameters.TargetPlatform}");
-
-            trxFilePath = Path.Combine(this.resultsDirectory, Guid.NewGuid() + ".trx");
-            arguments = string.Concat(arguments, " /logger:trx;logfilename=" + trxFilePath);
-
-            var defaultRunSettingsPath = Path.Combine(
-                IntegrationTestEnvironment.TestPlatformRootDirectory,
-                @"scripts", "vstest-codecoverage.runsettings");
-
-            var runSettings = string.Empty;
-            switch (testParameters.RunSettingsType)
-            {
-                case TestParameters.SettingsType.None:
-                    runSettings = $" /collect:\"Code Coverage\"";
-                    break;
-                case TestParameters.SettingsType.Default:
-                    runSettings = $" /settings:{defaultRunSettingsPath}";
-                    break;
-                case TestParameters.SettingsType.Custom:
-                    runSettings = $" /settings:{testParameters.RunSettingsPath}";
-                    break;
-                case TestParameters.SettingsType.XmlOutput:
-                    runSettings = $" /collect:\"Code Coverage;Format=Xml\"";
-                    if (!string.IsNullOrWhiteSpace(testParameters.RunSettingsPath))
-                    {
-                        runSettings += $" /settings:{testParameters.RunSettingsPath}";
-                    }
-                    break;
-                case TestParameters.SettingsType.CoberturaOutput:
-                    runSettings = $" /collect:\"Code Coverage;Format=Cobertura\"";
-                    if (!string.IsNullOrWhiteSpace(testParameters.RunSettingsPath))
-                    {
-                        runSettings += $" /settings:{testParameters.RunSettingsPath}";
-                    }
-                    break;
-            }
-
-            arguments = string.Concat(arguments, runSettings);
-
-            return arguments;
-        }
-
-        private void AssertSkippedMethod(XmlDocument document)
-        {
-            var module = this.GetModuleNode(document.DocumentElement, "codecoveragetest.dll");
-            Assert.IsNotNull(module);
-
-            var coverage = double.Parse(module.Attributes["block_coverage"].Value);
-            Assert.IsTrue(coverage > CodeCoverageAcceptanceTestBase.ExpectedMinimalModuleCoverage);
-
-            var testSignFunction = this.GetNode(module, "skipped_function", "TestSign()");
-            Assert.IsNotNull(testSignFunction);
-            Assert.AreEqual("name_excluded", testSignFunction.Attributes["reason"].Value);
-
-            var skippedTestMethod = this.GetNode(module, "skipped_function", "__CxxPureMSILEntry_Test()");
-            Assert.IsNotNull(skippedTestMethod);
-            Assert.AreEqual("name_excluded", skippedTestMethod.Attributes["reason"].Value);
-
-            var testAbsFunction = this.GetNode(module, "function", "TestAbs()");
-            Assert.IsNotNull(testAbsFunction);
-        }
-
-        private void ValidateCoverageData(XmlDocument document, string moduleName, bool validateSourceFileNames)
-        {
-            var module = this.GetModuleNode(document.DocumentElement, moduleName.ToLower());
-
-            if (module == null)
-            {
-                module = this.GetModuleNode(document.DocumentElement, moduleName);
-            }
-            Assert.IsNotNull(module);
-
-            this.AssertCoverage(module, CodeCoverageAcceptanceTestBase.ExpectedMinimalModuleCoverage);
-
-            // In case of cobertura report. Cobertura report has different format.
-            if (validateSourceFileNames)
-            {
-                this.AssertSourceFileName(module);
-            }
-        }
-
-        private void AssertSourceFileName(XmlNode module)
-        {
-            const string ExpectedFileName = "UnitTest1.cs";
-
-            var found = false;
-            var sourcesNode = module.SelectSingleNode("./source_files");
-            foreach (XmlNode node in sourcesNode.ChildNodes)
-            {
-                if (node.Attributes["path"].Value.Contains(ExpectedFileName))
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            Assert.IsTrue(found);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs
deleted file mode 100644
index 9a74582e5c..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DataCollectionTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void ExecuteTestsWithDataCollection(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-            string runSettings = this.GetRunsettingsFilePath(resultsDir);
-            string diagFileName = Path.Combine(resultsDir, "diaglog.txt");
-            var extensionsPath = Path.Combine(
-                this.testEnvironment.TestAssetsPath,
-                Path.GetFileNameWithoutExtension("OutOfProcDataCollector"),
-                "bin",
-                IntegrationTestEnvironment.BuildConfiguration,
-                this.testEnvironment.RunnerFramework);
-            var arguments = PrepareArguments(assemblyPaths, null, runSettings, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /TestAdapterPath:{extensionsPath}");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.VaildateDataCollectorOutput(resultsDir);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void ExecuteTestsWithDataCollectionUsingCollectArgument(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-            string diagFileName = Path.Combine(resultsDir, "diaglog.txt");
-            var extensionsPath = Path.Combine(
-                this.testEnvironment.TestAssetsPath,
-                Path.GetFileNameWithoutExtension("OutOfProcDataCollector"),
-                "bin",
-                IntegrationTestEnvironment.BuildConfiguration,
-                this.testEnvironment.RunnerFramework);
-
-            var arguments = PrepareArguments(assemblyPaths, null, null, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDir);
-            arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /Collect:SampleDataCollector", $" /TestAdapterPath:{extensionsPath}");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.VaildateDataCollectorOutput(resultsDir);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetCoreTargetFrameworkDataSource]
-        public void DataCollectorAssemblyLoadingShouldNotThrowErrorForNetCore(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(GetAssetFullPath("AppDomainGetAssembliesTestProject.dll", "netcoreapp2.1"), string.Empty, string.Empty, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void DataCollectorAssemblyLoadingShouldNotThrowErrorForFullFramework(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(GetAssetFullPath("AppDomainGetAssembliesTestProject.dll"), string.Empty, string.Empty, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        private static void CreateDataCollectionRunSettingsFile(string destinationRunsettingsPath, Dictionary<string, string> dataCollectionAttributes)
-        {
-            var doc = new XmlDocument();
-            var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
-
-            doc.AppendChild(xmlDeclaration);
-            var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
-            doc.AppendChild(runSettingsNode);
-            var dcConfigNode = doc.CreateElement(Constants.DataCollectionRunSettingsName);
-            runSettingsNode.AppendChild(dcConfigNode);
-            var dataCollectorsNode = doc.CreateElement(Constants.DataCollectorsSettingName);
-            dcConfigNode.AppendChild(dataCollectorsNode);
-            var dataCollectorNode = doc.CreateElement(Constants.DataCollectorSettingName);
-            dataCollectorsNode.AppendChild(dataCollectorNode);
-
-            foreach (var kvp in dataCollectionAttributes)
-            {
-                dataCollectorNode.SetAttribute(kvp.Key, kvp.Value);
-            }
-
-            using (var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create))
-            {
-                doc.Save(stream);
-            }
-        }
-
-        private void VaildateDataCollectorOutput(string resultsDir)
-        {
-            // Output of datacollection attachment.
-            this.StdOutputContains("filename.txt");
-            this.StdOutputContains("TestCaseStarted");
-            this.StdOutputContains("TestCaseEnded");
-            this.StdOutputContains("SampleUnitTestProject2.UnitTest1.PassingTest2");
-            this.StdOutputContains("SampleUnitTestProject2.UnitTest1.FailingTest2");
-            this.StdOutputContains("Data collector 'SampleDataCollector' message: SessionStarted");
-            this.StdOutputContains("Data collector 'SampleDataCollector' message: TestHostLaunched");
-            this.StdOutputContains("Data collector 'SampleDataCollector' message: SessionEnded");
-            this.StdOutputContains("Data collector 'SampleDataCollector' message: my warning");
-            this.StdErrorContains("Data collector 'SampleDataCollector' message: Data collector caught an exception of type 'System.Exception': 'my exception'. More details:");
-            this.StdOutputContains("Data collector 'SampleDataCollector' message: Dispose called.");
-
-            // Verify attachments
-            var isTestRunLevelAttachmentFound = false;
-            var testCaseLevelAttachmentsCount = 0;
-            var diaglogsFileCount = 0;
-
-            var resultFiles = Directory.GetFiles(resultsDir, "*.txt", SearchOption.AllDirectories);
-
-            foreach (var file in resultFiles)
-            {
-                // Test Run level attachments are logged in standard output.
-                if (file.Contains("filename.txt"))
-                {
-                    this.StdOutputContains(file);
-                    isTestRunLevelAttachmentFound = true;
-                }
-
-                if (file.Contains("testcasefilename"))
-                {
-                    testCaseLevelAttachmentsCount++;
-                }
-
-                if (file.Contains("diaglog"))
-                {
-                    diaglogsFileCount++;
-                }
-            }
-
-            Assert.IsTrue(isTestRunLevelAttachmentFound);
-            Assert.AreEqual(3, testCaseLevelAttachmentsCount);
-            Assert.AreEqual(3, diaglogsFileCount);
-        }
-
-        private string GetRunsettingsFilePath(string resultsDir)
-        {
-            var runsettingsPath = Path.Combine(resultsDir, "test_" + Guid.NewGuid() + ".runsettings");
-            var dataCollectionAttributes = new Dictionary<string, string>();
-
-            dataCollectionAttributes.Add("friendlyName", "SampleDataCollector");
-            dataCollectionAttributes.Add("uri", "my://sample/datacollector");
-
-            CreateDataCollectionRunSettingsFile(runsettingsPath, dataCollectionAttributes);
-            return runsettingsPath;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs
deleted file mode 100644
index e995a4b272..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-
-    [TestClass]
-    public class DebugAssertTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        // this is core only, there is nothing we can do about Debug.Assert crashing the process on framework
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false)]
-        public void RunningTestWithAFailingDebugAssertDoesNotCrashTheHostingProcess(RunnerInfo runnerInfo)
-        {
-            // when debugging this test in case it starts failing, be aware that the default behavior of Debug.Assert 
-            // is to not crash the process when we are running in debug, and debugger is attached
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var assemblyPath = this.BuildMultipleAssemblyPath("CrashingOnDebugAssertTestProject.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPath, null, null, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-
-            // this will have failed tests when our trace listener works and crash the testhost process when it does not
-            // because crashing processes is what a failed Debug.Assert does by default, unless you have a debugger attached
-            this.ValidateSummaryStatus(passedTestsCount: 4, failedTestsCount: 4, 0);
-            StringAssert.Contains(this.StdOut, "threw exception: Microsoft.VisualStudio.TestPlatform.TestHost.DebugAssertException:");
-
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs
deleted file mode 100644
index a1843bc87c..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class DeprecateExtensionsPathWarningTests : AcceptanceTestBase
-    {
-        private IList<string> adapterDependencies;
-        private IList<string> copiedFiles;
-
-        private string BuildConfiguration
-        {
-            get
-            {
-#if DEBUG
-                return "Debug";
-#else
-                return "Release";
-#endif
-            }
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            try
-            {
-                foreach (var file in this.copiedFiles)
-                {
-                    File.Delete(file);
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        [TestInitialize]
-        public void CopyAdapterToExtensions()
-        {
-            this.copiedFiles = new List<string>();
-            var extensionsDir = Path.Combine(Path.GetDirectoryName(this.GetConsoleRunnerPath()), "Extensions");
-            this.adapterDependencies = Directory.GetFiles(this.GetTestAdapterPath(), "*.dll", SearchOption.TopDirectoryOnly);
-
-            try
-            {
-                foreach (var file in this.adapterDependencies)
-                {
-                    var fileCopied = Path.Combine(extensionsDir, Path.GetFileName(file));
-                    this.copiedFiles.Add(fileCopied);
-                    File.Copy(file, fileCopied);
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        [TestMethod]
-        public void VerifyDeprecatedWarningIsThrownWhenAdaptersPickedFromExtensionDirectory()
-        {
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), null, null, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.StdOutputContains("Adapter lookup is being changed, please follow");
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        public override string GetConsoleRunnerPath()
-        {
-            DirectoryInfo currentDirectory = new DirectoryInfo(typeof(DeprecateExtensionsPathWarningTests).GetTypeInfo().Assembly.GetAssemblyLocation()).Parent.Parent.Parent.Parent.Parent.Parent;
-
-            return Path.Combine(currentDirectory.FullName, "artifacts", BuildConfiguration, "net451", "win7-x64", "vstest.console.exe");
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs
deleted file mode 100644
index 1672ec95c6..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void ChutzpahRunAllTestExecution(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-            var testJSFileAbsolutePath = Path.Combine(this.testEnvironment.TestAssetsPath, "test.js");
-            var arguments = PrepareArguments(testJSFileAbsolutePath, this.GetTestAdapterPath(UnitTestFramework.Chutzpah), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        // vstest.console is x64 now, but x86 run "in process" run should still succeed by being run in x86 testhost
-        // Skip .NET (Core) tests because we test them below.
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)]
-        public void CPPRunAllTestExecutionNetFramework(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            CppRunAllTests(runnerInfo.RunnerFramework, "x86");
-        }
-
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        // vstest.console is 64-bit now, run in process to test the 64-bit native dll
-        // Skip .NET (Core) tests because we test them below.
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)]
-        public void CPPRunAllTestExecutionPlatformx64NetFramework(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            CppRunAllTests(runnerInfo.RunnerFramework, "x64");
-        }
-
-        [TestMethod]
-        // C++ tests cannot run in .NET Framework host under .NET Core, because we only ship .NET Standard CPP adapter in .NET Core
-        // We also don't test x86 for .NET Core, because the resolver there does not switch between x86 and x64 correctly, it just uses the parent process bitness.
-        // We run this on netcore31 and not the default netcore21 because netcore31 is the minimum tfm that has the runtime features we need, such as additionaldeps.
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false, useCoreRunner: true, useNetCore21Target: false, useNetCore31Target: true)]
-        public void CPPRunAllTestExecutionPlatformx64Net(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            CppRunAllTests(runnerInfo.RunnerFramework, "x64");
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var runSettingsFilePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".runsettings");
-
-            //test the iterationCount setting for WebTestRunConfiguration in run settings
-            var runSettingsXml = $@"<?xml version='1.0' encoding='utf-8'?>
-                                <RunSettings>
-                                    <WebTestRunConfiguration iterationCount='5' />
-                                    <RunConfiguration>
-                                        <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
-                                    </RunConfiguration>
-                                </RunSettings>";
-
-            IntegrationTestBase.CreateRunSettingsFile(runSettingsFilePath, runSettingsXml);
-
-            //minWebTestResultFileSizeInKB is set to 150 here as the web test has a iteration count set to 5
-            //therefore, the test will run for 5 iterations resulting in web test result file size of at least 150 KB
-            WebTestRunAllTests(runnerInfo.RunnerFramework, runSettingsFilePath, 150);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void CodedWebTestRunAllTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            CodedWebTestRunAllTests(runnerInfo.RunnerFramework);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void NUnitRunAllTestExecution(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(
-                this.GetAssetFullPath("NUTestProject.dll"),
-                this.GetTestAdapterPath(UnitTestFramework.NUnit),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDir);
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void XUnitRunAllTestExecution(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            string testAssemblyPath;
-            // Xunit >= 2.2 won't support net451, Minimum target framework it supports is net452.
-            if (this.testEnvironment.TargetFramework.Equals("net451"))
-            {
-                testAssemblyPath = testEnvironment.GetTestAsset("XUTestProject.dll", "net46");
-            }
-            else
-            {
-                testAssemblyPath = testEnvironment.GetTestAsset("XUTestProject.dll");
-            }
-
-            var arguments = PrepareArguments(
-                testAssemblyPath,
-                this.GetTestAdapterPath(UnitTestFramework.XUnit),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDir);
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        private void CppRunAllTests(string runnerFramework, string platform)
-        {
-            var resultsDir = GetResultsDirectory();
-            string assemblyRelativePathFormat =
-                @"microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\{0}\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
-            var assemblyRelativePath = platform.Equals("x64", StringComparison.OrdinalIgnoreCase)
-                ? string.Format(assemblyRelativePathFormat, platform)
-                : string.Format(assemblyRelativePathFormat, "");
-            var assemblyAbsolutePath = Path.Combine(this.testEnvironment.PackageDirectory, assemblyRelativePath);
-            var arguments = PrepareArguments(assemblyAbsolutePath, string.Empty, string.Empty, this.FrameworkArgValue, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        private void WebTestRunAllTests(string runnerFramework, string runSettingsFilePath = null, int minWebTestResultFileSizeInKB = 0)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("WebTests tests not supported with .Netcore runner.");
-                return;
-            }
-
-            string assemblyRelativePath =
-                @"microsoft.testplatform.qtools.assets\2.0.0\contentFiles\any\any\WebTestAssets\WebTest1.webtest";
-
-            var assemblyAbsolutePath = Path.Combine(this.testEnvironment.PackageDirectory, assemblyRelativePath);
-            var resultsDirectory = GetResultsDirectory();
-            var arguments = PrepareArguments(
-                assemblyAbsolutePath,
-                string.Empty,
-                runSettingsFilePath, this.FrameworkArgValue, string.Empty, resultsDirectory);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            if (minWebTestResultFileSizeInKB > 0)
-            {
-                var dirInfo = new DirectoryInfo(resultsDirectory);
-                var webtestResultFile = "WebTest1.webtestResult";
-                var files = dirInfo.GetFiles(webtestResultFile, SearchOption.AllDirectories);
-                Assert.IsTrue(files.Length > 0, $"File {webtestResultFile} not found under results directory {resultsDirectory}");
-
-                var fileSizeInKB = files[0].Length / 1024;
-                Assert.IsTrue(fileSizeInKB > minWebTestResultFileSizeInKB, $"Size of the file {webtestResultFile} is {fileSizeInKB} KB. It is not greater than {minWebTestResultFileSizeInKB} KB indicating iterationCount in run settings not honored.");
-            }
-
-            TryRemoveDirectory(resultsDirectory);
-        }
-
-        private void CodedWebTestRunAllTests(string runnerFramework)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("WebTests tests not supported with .Netcore runner.");
-                return;
-            }
-
-            var resultsDir = GetResultsDirectory();
-            string assemblyRelativePath =
-                @"microsoft.testplatform.qtools.assets\2.0.0\contentFiles\any\any\WebTestAssets\BingWebTest.dll";
-            var assemblyAbsolutePath = Path.Combine(this.testEnvironment.PackageDirectory, assemblyRelativePath);
-            var arguments = PrepareArguments(
-                assemblyAbsolutePath,
-                string.Empty,
-                string.Empty, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs
deleted file mode 100644
index 718b30c210..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-
-    [TestClass]
-    [TestCategory("Windows")]
-    public class DisableAppdomainTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows")]
-        [NetFullTargetFrameworkDataSource]
-        public void DisableAppdomainTest(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var diableAppdomainTest1 = testEnvironment.GetTestAsset("DisableAppdomainTest1.dll", "net451");
-            var diableAppdomainTest2 = testEnvironment.GetTestAsset("DisableAppdomainTest2.dll", "net451");
-
-            RunTests(runnerInfo.RunnerFramework, string.Format("{0}\" \"{1}", diableAppdomainTest1, diableAppdomainTest2), 2);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows")]
-        [NetFullTargetFrameworkDataSource]
-        public void NewtonSoftDependencyWithDisableAppdomainTest(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var newtonSoftDependnecyTest = testEnvironment.GetTestAsset("NewtonSoftDependency.dll", "net451");
-
-            RunTests(runnerInfo.RunnerFramework, newtonSoftDependnecyTest, 1);
-        }
-
-        private void RunTests(string runnerFramework, string testAssembly, int passedTestCount)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("This test is not meant for .netcore.");
-                return;
-            }
-
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "DisableAppDomain", "true" }
-                                                 };
-
-            var resultsDir = GetResultsDirectory();
-            var diableAppdomainTest1 = testEnvironment.GetTestAsset("DisableAppdomainTest1.dll", "net451");
-            var diableAppdomainTest2 = testEnvironment.GetTestAsset("DisableAppdomainTest2.dll", "net451");
-            var arguments = PrepareArguments(
-                testAssembly,
-                string.Empty,
-                GetRunsettingsFilePath(runConfigurationDictionary),
-                this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(passedTestCount, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        private string GetRunsettingsFilePath(Dictionary<string, string> runConfigurationDictionary)
-        {
-            var runsettingsPath = Path.Combine(
-                Path.GetTempPath(),
-                "test_" + Guid.NewGuid() + ".runsettings");
-            CreateRunSettingsFile(runsettingsPath, runConfigurationDictionary);
-            return runsettingsPath;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs
deleted file mode 100644
index e372313888..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DiscoveryTests : AcceptanceTestBase
-    {
-        private readonly string dummyFilePath = Path.Combine(Path.GetTempPath(), $"{System.Guid.NewGuid()}.txt");
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverAllTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTestForDiscovery(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue);
-
-            var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
-            this.ValidateDiscoveredTests(listOfTests);
-            this.ExitCodeEquals(0);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void MultipleSourcesDiscoverAllTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-            var listOfTests = new[] {
-                "SampleUnitTestProject.UnitTest1.PassingTest",
-                "SampleUnitTestProject.UnitTest1.FailingTest",
-                "SampleUnitTestProject.UnitTest1.SkippingTest",
-                "SampleUnitTestProject.UnitTest1.PassingTest2",
-                "SampleUnitTestProject.UnitTest1.FailingTest2",
-                "SampleUnitTestProject.UnitTest1.SkippingTest2"
-            };
-
-            this.InvokeVsTestForDiscovery(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue);
-
-            this.ValidateDiscoveredTests(listOfTests);
-            this.ExitCodeEquals(0);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void DiscoverFullyQualifiedTests(RunnerInfo runnerInfo)
-        {
-            var resultsDir = GetResultsDirectory();
-
-            try
-            {
-                AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-                var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
-
-                var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-                arguments = string.Concat(arguments, " /ListFullyQualifiedTests", " /ListTestsTargetPath:\"" + dummyFilePath + "\"");
-                this.InvokeVsTest(arguments);
-
-                this.ValidateFullyQualifiedDiscoveredTests(this.dummyFilePath, listOfTests);
-                this.ExitCodeEquals(0);
-            }
-            finally
-            {
-                File.Delete(this.dummyFilePath);
-                TryRemoveDirectory(resultsDir);
-            }
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsShouldShowProperWarningIfNoTestsOnTestCaseFilter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assetFullPath = this.GetAssetFullPath("SimpleTestProject2.dll");
-            var arguments = PrepareArguments(assetFullPath, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /listtests");
-            arguments = string.Concat(arguments, " /testcasefilter:NonExistTestCaseName");
-            arguments = string.Concat(arguments, " /logger:\"console;prefix=true\"");
-            this.InvokeVsTest(arguments);
-
-            StringAssert.Contains(this.StdOut, "Warning: No test matches the given testcase filter `NonExistTestCaseName` in");
-            StringAssert.Contains(this.StdOut, "SimpleTestProject2.dll");
-            this.ExitCodeEquals(0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        public void TypesToLoadAttributeTests()
-        {
-            var environment = new IntegrationTestEnvironment();
-            var extensionsDirectory = environment.ExtensionsDirectory;
-            var extensionsToVerify = new Dictionary<string, string[]>
-            {
-                {"Microsoft.TestPlatform.Extensions.EventLogCollector.dll", new[] { "Microsoft.TestPlatform.Extensions.EventLogCollector.EventLogDataCollector"} },
-                {"Microsoft.TestPlatform.Extensions.BlameDataCollector.dll", new[] { "Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameLogger", "Microsoft.TestPlatform.Extensions.BlameDataCollector.BlameCollector" } },
-                {"Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll", new[] { "Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger" } },
-                {"Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", new[] { "Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger" } },
-                {"Microsoft.TestPlatform.TestHostRuntimeProvider.dll", new[] { "Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DefaultTestHostManager", "Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting.DotnetTestHostManager" } }
-            };
-
-            foreach (var extension in extensionsToVerify.Keys)
-            {
-                var assemblyFile = Path.Combine(extensionsDirectory, extension);
-                var assembly = Assembly.LoadFrom(assemblyFile);
-
-                var expected = extensionsToVerify[extension];
-                var actual = TypesToLoadUtilities.GetTypesToLoad(assembly).Select(i => i.FullName).ToArray();
-
-                CollectionAssert.AreEquivalent(expected, actual, $"Specified types using TypesToLoadAttribute in \"{extension}\" assembly doesn't match the expected.");
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs
deleted file mode 100644
index 1743a747d5..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DotnetTestTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        // patched dotnet is not published on non-windows systems
-        [TestCategory("Windows-Review")]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunDotnetTestWithCsproj(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var projectName = "SimpleTestProject.csproj";
-            var projectPath = this.GetProjectFullPath(projectName);
-
-            this.InvokeDotnetTest($@"{projectPath} --logger:""Console;Verbosity=normal""");
-            
-            // ensure our dev version is used
-            this.StdOutputContains("-dev");
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ExitCodeEquals(1);
-        }
-
-
-        [TestMethod]
-        // patched dotnet is not published on non-windows systems
-        [TestCategory("Windows-Review")]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunDotnetTestWithDll(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPath = this.BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"');
-            this.InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal""");
-
-            // ensure our dev version is used
-            this.StdOutputContains("-dev");
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ExitCodeEquals(1);
-        }
-
-        [TestMethod]
-        // patched dotnet is not published on non-windows systems
-        [TestCategory("Windows-Review")]
-        [NetCoreTargetFrameworkDataSource]
-        public void PassInlineSettings(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var projectName = "ParametrizedTestProject.csproj";
-            var projectPath = this.GetProjectFullPath(projectName);
-            this.InvokeDotnetTest($@"{projectPath} --logger:""Console;Verbosity=normal"" -- TestRunParameters.Parameter(name =\""weburl\"", value=\""http://localhost//def\"")");
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-        }
-
-        [TestMethod]
-        // patched dotnet is not published on non-windows systems
-        [TestCategory("Windows-Review")]
-        [NetCoreTargetFrameworkDataSource]
-        public void PassInlineSettingsToDll(RunnerInfo runnerInfo)
-        {
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPath = this.BuildMultipleAssemblyPath("ParametrizedTestProject.dll").Trim('\"');
-            this.InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal"" -- TestRunParameters.Parameter(name=\""weburl\"", value=\""http://localhost//def\"")");
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/EventLogCollectorTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/EventLogCollectorTests.cs
deleted file mode 100644
index 5187b01731..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/EventLogCollectorTests.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class EventLogCollectorTests : AcceptanceTestBase
-    {
-        private readonly string resultsDir;
-
-        public EventLogCollectorTests()
-        {
-            this.resultsDir = GetResultsDirectory();
-        }
-
-        // Fails randomly https://ci.dot.net/job/Microsoft_vstest/job/master/job/Windows_NT_Release_prtest/2084/console
-        // https://ci.dot.net/job/Microsoft_vstest/job/master/job/Windows_NT_Debug_prtest/2085/console
-        [Ignore]
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void EventLogDataCollectorShoudCreateLogFileHavingEvents(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.testEnvironment.GetTestAsset("EventLogUnitTestProject.dll");
-
-            string runSettings = this.GetRunsettingsFilePath();
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), runSettings, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(3, 0, 0);
-            this.VaildateDataCollectorOutput();
-            this.StdOutputDoesNotContains("An exception occurred while collecting final entries from the event log");
-            this.StdErrorDoesNotContains("event log has encountered an exception, some events might get lost");
-            this.StdOutputDoesNotContains("event log may have been cleared during collection; some events may not have been collected");
-            this.StdErrorDoesNotContains("Unable to read event log");
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void EventLogDataCollectorShoudCreateLogFileWithoutEventsIfEventsAreNotLogged(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var assemblyPaths = this.testEnvironment.GetTestAsset("SimpleTestProject.dll");
-
-            string runSettings = this.GetRunsettingsFilePath();
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), runSettings, this.FrameworkArgValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.StdOutputDoesNotContains("An exception occurred while collecting final entries from the event log");
-            this.StdErrorDoesNotContains("event log has encountered an exception, some events might get lost");
-            this.StdOutputDoesNotContains("event log may have been cleared during collection; some events may not have been collected");
-            this.StdErrorDoesNotContains("Unable to read event log");
-        }
-
-        private string GetRunsettingsFilePath()
-        {
-            var runsettingsPath = Path.Combine(
-                Path.GetTempPath(),
-                "test_" + Guid.NewGuid() + ".runsettings");
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-    <RunSettings>
-      <RunConfiguration>
-        <MaxCpuCount>0</MaxCpuCount>
-        <TargetPlatform> x64 </TargetPlatform>
-        <TargetFrameworkVersion> Framework45 </TargetFrameworkVersion>
-      </RunConfiguration>
-      <DataCollectionRunSettings>
-        <DataCollectors>
-            <DataCollector friendlyName=""Event Log"" >
-                <Configuration><Setting name = ""EventLogs"" value = ""Application,System"" /><Setting name=""EntryTypes"" value=""Error,Warning"" /></Configuration>
-            </DataCollector>
-        </DataCollectors>
-      </DataCollectionRunSettings>
-    </RunSettings> ";
-
-            File.WriteAllText(runsettingsPath, runSettingsXml);
-            return runsettingsPath;
-        }
-
-        private string GetRunsettingsFilePathWithCustomSource()
-        {
-            var runsettingsPath = Path.Combine(
-                Path.GetTempPath(),
-                "test_" + Guid.NewGuid() + ".runsettings");
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-    <RunSettings>
-      <RunConfiguration>
-        <MaxCpuCount>0</MaxCpuCount>
-        <TargetPlatform> x64 </TargetPlatform>
-        <TargetFrameworkVersion> Framework45 </TargetFrameworkVersion>
-      </RunConfiguration>
-      <DataCollectionRunSettings>
-        <DataCollectors>
-            <DataCollector friendlyName=""Event Log"" >
-                <Configuration><Setting name = ""EventLogs"" value = ""Application,System"" /><Setting name=""EntryTypes"" value=""Error,Warning"" /><Setting name=""EventSources"" value=""CustomEventSource"" /></Configuration>
-            </DataCollector>
-        </DataCollectors>
-      </DataCollectionRunSettings>
-    </RunSettings> ";
-
-            File.WriteAllText(runsettingsPath, runSettingsXml);
-            return runsettingsPath;
-        }
-
-        private void VaildateDataCollectorOutput()
-        {
-            // Verify attachments
-            var di = new DirectoryInfo(this.resultsDir);
-            var resultFiles = di.EnumerateFiles("Event Log.xml", SearchOption.AllDirectories)
-                .OrderBy(d => d.CreationTime)
-                .Select(d => d.FullName)
-                .ToList();
-
-            Assert.AreEqual(4, resultFiles.Count);
-            this.StdOutputContains("Event Log.xml");
-
-            var fileContent1 = File.ReadAllText(resultFiles[0]);
-            var fileContent2 = File.ReadAllText(resultFiles[1]);
-            var fileContent3 = File.ReadAllText(resultFiles[2]);
-            var fileContent4 = File.ReadAllText(resultFiles[3]);
-
-            var eventIdsDics = new Dictionary<string[], bool>();
-            eventIdsDics.Add(new[] { "110", "111", "112" }, false);
-            eventIdsDics.Add(new[] { "220", "221", "222", "223" }, false);
-            eventIdsDics.Add(new[] { "330", "331", "332" }, false);
-
-            // Since there is no guaranty that test will run in a particular order, we will check file for all available list of ids
-            Assert.IsTrue(this.VerifyOrder2(fileContent1, eventIdsDics), string.Format("Event log file content: {0}", fileContent1));
-            Assert.IsTrue(this.VerifyOrder2(fileContent2, eventIdsDics), string.Format("Event log file content: {0}", fileContent2));
-            Assert.IsTrue(this.VerifyOrder2(fileContent3, eventIdsDics), string.Format("Event log file content: {0}", fileContent3));
-
-            Assert.IsTrue(this.VerifyOrder(fileContent4, new[] { "110", "111", "112", "220", "221", "222", "223", "330", "331", "332" }), string.Format("Event log file content: {0}", fileContent4));
-        }
-
-        private bool VerifyOrder2(string content, Dictionary<string[], bool> eventIdsDics)
-        {
-            foreach (var eventIds in eventIdsDics)
-            {
-                if (eventIds.Value == false)
-                {
-                    if (VerifyOrder(content, eventIds.Key))
-                    {
-                        eventIdsDics[eventIds.Key] = true;
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-        private bool VerifyOrder(string content, string[] eventIds)
-        {
-            for (int i = 0; i < eventIds.Length; i++)
-            {
-                int currentIndex = 0;
-                currentIndex = content.IndexOf(eventIds[i], currentIndex);
-                if (currentIndex == -1)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs
deleted file mode 100644
index e09721e8d9..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-    using System.Threading;
-
-    using global::TestPlatform.TestUtilities;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ExecutionTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunMultipleTestAssemblies(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-
-            this.InvokeVsTestForExecution(assemblyPaths, this.GetTestAdapterPath(), this.FrameworkArgValue, string.Empty);
-
-            this.ValidateSummaryStatus(2, 2, 2);
-            this.ExitCodeEquals(1); // failing tests
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunMultipleTestAssembliesWithoutTestAdapterPath(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"');
-            var xunitAssemblyPath = this.testEnvironment.TargetFramework.Equals("net451") ?
-                testEnvironment.GetTestAsset("XUTestProject.dll", "net46") :
-                testEnvironment.GetTestAsset("XUTestProject.dll");
-
-            assemblyPaths = string.Concat(assemblyPaths, "\" \"", xunitAssemblyPath);
-            this.InvokeVsTestForExecution(assemblyPaths, string.Empty, this.FrameworkArgValue, string.Empty);
-
-            this.ValidateSummaryStatus(2, 2, 1);
-            this.ExitCodeEquals(1); // failing tests
-        }
-
-        // We cannot run this test on Mac/Linux because we're trying to switch the arch between x64 and x86
-        // and after --arch feature implementation we won't find correct muxer on CI.
-        [TestCategory("Windows")]
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        [DoNotParallelize]
-        public void RunMultipleTestAssembliesInParallel(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /Parallel");
-            arguments = string.Concat(arguments, " /Platform:x86");
-            string testhostProcessName = string.Empty;
-            // for the desktop we will run testhost.x86 in two copies, but for core 
-            // we will run a combination of testhost.x86 and dotnet, where the dotnet will be 
-            // the test console, and sometimes it will be the test host (e.g dotnet, dotnet, testhost.x86, or dotnet, testhost.x86, testhost.x86)
-            // based on the target framework
-            int expectedNumOfProcessCreated = this.IsDesktopRunner() ? 2 : 3;
-            var testhostProcessNames = new[] { "testhost.x86", "dotnet" };
-
-            var cts = new CancellationTokenSource();
-            var numOfProcessCreatedTask = NumberOfProcessLaunchedUtility.NumberOfProcessCreated(
-                cts,
-                testhostProcessNames);
-
-            this.InvokeVsTest(arguments);
-
-            cts.Cancel();
-            Assert.AreEqual(
-                expectedNumOfProcessCreated,
-                numOfProcessCreatedTask.Result.Count,
-                $"Number of {testhostProcessName} process created, expected: {expectedNumOfProcessCreated} actual: {numOfProcessCreatedTask.Result.Count} ({ string.Join(", ", numOfProcessCreatedTask.Result) })");
-            this.ValidateSummaryStatus(2, 2, 2);
-            this.ExitCodeEquals(1); // failing tests
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestSessionTimeOutTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:TestSessionTimeoutTest");
-
-            // set TestSessionTimeOut = 7 sec
-            arguments = string.Concat(arguments, " -- RunConfiguration.TestSessionTimeout=7000");
-            this.InvokeVsTest(arguments);
-
-            this.ExitCodeEquals(1);
-            this.StdErrorContains("Test Run Aborted.");
-            this.StdErrorContains("Aborting test run: test run timeout of 7000 milliseconds exceeded.");
-            this.StdOutputDoesNotContains("Total tests: 6");
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestPlatformShouldBeCompatibleWithOldTestHost(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo); var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SampleProjectWithOldTestHost.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void WorkingDirectoryIsSourceDirectory(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /tests:WorkingDirectoryTest");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase))
-            {
-                // On release, x64 builds, recursive calls may be replaced with loops (tail call optimization)
-                Assert.Inconclusive("On StackOverflowException testhost not exited in release configuration.");
-                return;
-            }
-
-            var diagLogFilePath = Path.Combine(resultsDir, $"std_error_log_{Guid.NewGuid()}.txt");
-            File.Delete(diagLogFilePath);
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:ExitWithStackoverFlow");
-            arguments = string.Concat(arguments, $" /diag:{diagLogFilePath}");
-
-            this.InvokeVsTest(arguments);
-
-            var errorMessage = "Process is terminated due to StackOverflowException.";
-            if (runnerInfo.TargetFramework.StartsWith("netcoreapp2."))
-            {
-                errorMessage = "Process is terminating due to StackOverflowException.";
-            }
-
-            this.ExitCodeEquals(1);
-            FileAssert.Contains(diagLogFilePath, errorMessage);
-            this.StdErrorContains(errorMessage);
-            File.Delete(diagLogFilePath);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var diagLogFilePath = Path.Combine(resultsDir, $"std_error_log_{Guid.NewGuid()}.txt");
-            File.Delete(diagLogFilePath);
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:ExitwithUnhandleException");
-            arguments = string.Concat(arguments, $" /diag:{diagLogFilePath}");
-
-            this.InvokeVsTest(arguments);
-
-            var errorFirstLine = "Test host standard error line: Unhandled Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.";
-            FileAssert.Contains(diagLogFilePath, errorFirstLine);
-            File.Delete(diagLogFilePath);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProject3.dll is built for Framework .NETFramework,Version=v4.5.1 and Platform X64";
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject3.dll", "SimpleTestProjectx86.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:PassingTestx86");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-
-            // When both x64 & x86 DLL is passed x64 dll will be ignored.
-            this.StdOutputContains(expectedWarningContains);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProjectx86 is built for Framework .NETFramework,Version=v4.5.1 and Platform X86";
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProjectx86.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ExitCodeEquals(0);
-
-            this.StdOutputDoesNotContains(expectedWarningContains);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleOnlyWhenRunningIn32BitOS(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProject2.dll is built for Framework .NETFramework,Version=v4.5.1 and Platform X64";
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject2.dll");
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ExitCodeEquals(1);
-
-            // If we are running this test on 64 bit OS, it should not output any warning
-            if (Environment.Is64BitOperatingSystem)
-            {
-                this.StdOutputDoesNotContains(expectedWarningContains);
-            }
-            // If we are running this test on 32 bit OS, it should output warning message
-            else
-            {
-                this.StdOutputContains(expectedWarningContains);
-            }
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void ExitCodeShouldReturnOneWhenTreatNoTestsAsErrorParameterSetToTrueAndNoTestMatchesFilter(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
-            arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
-
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
-            this.InvokeVsTest(arguments);
-
-            this.ExitCodeEquals(1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void ExitCodeShouldReturnZeroWhenTreatNoTestsAsErrorParameterSetToFalseAndNoTestMatchesFilter(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
-            arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
-
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
-            this.InvokeVsTest(arguments);
-
-            this.ExitCodeEquals(0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows")]
-        [NetFullTargetFrameworkDataSource]
-        public void ExitCodeShouldNotDependOnTreatNoTestsAsErrorTrueValueWhenThereAreAnyTestsToRun(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
-            this.InvokeVsTest(arguments);
-
-            // Returning 1 because of failing test in test assembly (SimpleTestProject2.dll)
-            this.ExitCodeEquals(1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows")]
-        [NetFullTargetFrameworkDataSource]
-        public void ExitCodeShouldNotDependOnFailTreatNoTestsAsErrorFalseValueWhenThereAreAnyTestsToRun(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
-            this.InvokeVsTest(arguments);
-
-            // Returning 1 because of failing test in test assembly (SimpleTestProject2.dll)
-            this.ExitCodeEquals(1);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs
deleted file mode 100644
index 0ea06b97f1..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    [TestCategory("Windows-Review")]
-    public class ExecutionThreadApartmentStateTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void UITestShouldPassIfApartmentStateIsSTA(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:UITestMethod");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetCoreTargetFrameworkDataSource]
-        public void WarningShouldBeShownWhenValueIsSTAForNetCore(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:PassingTest2 -- RunConfiguration.ExecutionThreadApartmentState=STA");
-            this.InvokeVsTest(arguments);
-            this.StdOutputContains("ExecutionThreadApartmentState option not supported for framework:");
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void UITestShouldFailWhenDefaultApartmentStateIsMTA(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:UITestMethod -- RunConfiguration.ExecutionThreadApartmentState=MTA");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(0, 1, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [Ignore(@"Issue with TestSessionTimeout:  https://github.com/Microsoft/vstest/issues/980")]
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void CancelTestExectionShouldWorkWhenApartmentStateIsSTA(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /tests:UITestWithSleep1,UITestMethod -- RunConfiguration.ExecutionThreadApartmentState=STA RunConfiguration.TestSessionTimeout=2000");
-            this.InvokeVsTest(arguments);
-            this.StdOutputContains("Canceling test run: test run timeout of");
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunner.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunner.cs
deleted file mode 100644
index 8a2374b802..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunner.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using TestUtilities;
-    using VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// Runs tests using the dotnet vstest.console.dll built against .NET Core 2.1.
-    /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as 
-    /// AcceptanceTestBase.NETFX452_NET50 = "net452;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project
-    /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
-    /// </summary>
-    public class NetCoreRunner : Attribute, ITestDataSource
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSource"/> class.
-        /// </summary>
-        /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net452TargetFramework or alike values.</param>
-        public NetCoreRunner(string targetFrameworks = AcceptanceTestBase.NETFX452_NET50)
-        {
-            var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
-            // on non-windows we want to filter down only to netcoreapp runner, and net5.0 and newer.
-            Func<string, bool> filter = tfm => isWindows ? true : !tfm.StartsWith("net4");
-            foreach (var fmw in targetFrameworks.Split(';').Where(filter))
-            {
-                this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.CoreRunnerFramework, fmw) });
-            }
-
-        }
-
-        private List<object[]> dataRows = new List<object[]>();
-
-        public IEnumerable<object[]> GetData(MethodInfo methodInfo)
-        {
-            return this.dataRows;
-        }
-
-        public string GetDisplayName(MethodInfo methodInfo, object[] data)
-        {
-            return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreTargetFrameworkDataSource.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreTargetFrameworkDataSource.cs
deleted file mode 100644
index 48242500fc..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreTargetFrameworkDataSource.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Reflection;
-    using TestUtilities;
-    using VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// The attribute defining runner framework, target framework and target runtime for netcoreapp1.*
-    /// First Argument (Runner framework) = This decides who will run the tests. If runner framework is netcoreapp then "dotnet vstest.console.dll" will run the tests.
-    /// If runner framework is net46 then vstest.console.exe will run the tests.
-    /// Second argument (target framework) = The framework for which test will run
-    /// </summary>
-    public class NetCoreTargetFrameworkDataSource : Attribute, ITestDataSource
-    {
-        private List<object[]> dataRows = new List<object[]>();
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSource"/> class.
-        /// </summary>
-        /// <param name="useDesktopRunner">To run tests with desktop runner(vstest.console.exe)</param>
-        /// <param name="useCoreRunner">To run tests with core runner(dotnet vstest.console.dll)</param>
-        public NetCoreTargetFrameworkDataSource(
-            bool useDesktopRunner = true, 
-            // adding another runner is not necessary until we need to start building against another 
-            // sdk, because the netcoreapp2.1 executable is forward compatible
-            bool useCoreRunner = true,
-            bool useNetCore21Target = true, 
-            // laying the ground work here for tests to be able to run against 3.1 but not enabling it for
-            // all tests to avoid changing all acceptance tests right now
-            bool useNetCore31Target = false)
-        {
-            var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
-            if (useDesktopRunner && isWindows)
-            {
-                var runnerFramework = IntegrationTestBase.DesktopRunnerFramework;
-                if (useNetCore21Target)
-                {
-                    this.AddRunnerDataRow(runnerFramework, AcceptanceTestBase.Core21TargetFramework);
-                }
-
-                if (useNetCore31Target)
-                {
-                    this.AddRunnerDataRow(runnerFramework, AcceptanceTestBase.Core31TargetFramework);
-                }
-            }
-
-            if (useCoreRunner)
-            {
-                var runnerFramework = IntegrationTestBase.CoreRunnerFramework;
-                if (useNetCore21Target)
-                {
-                    this.AddRunnerDataRow(runnerFramework, AcceptanceTestBase.Core21TargetFramework);
-                }
-
-                if (useNetCore31Target)
-                {
-                    this.AddRunnerDataRow(runnerFramework, AcceptanceTestBase.Core31TargetFramework);
-                }
-            }
-        }
-
-        private void AddRunnerDataRow(string runnerFramework, string targetFramework)
-        {
-            var runnerInfo = new RunnerInfo(runnerFramework, targetFramework);
-            this.dataRows.Add(new object[] { runnerInfo });
-        }
-
-        public IEnumerable<object[]> GetData(MethodInfo methodInfo)
-        {
-            return this.dataRows;
-        }
-
-        public string GetDisplayName(MethodInfo methodInfo, object[] data)
-        {
-            return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunner.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunner.cs
deleted file mode 100644
index 883a80968f..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunner.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Reflection;
-    using TestUtilities;
-    using VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// Runs tests using the dotnet vstest.console.dll built against .NET Core 2.1.
-    /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as 
-    /// AcceptanceTestBase.NETFX452_NET50 = "net452;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project
-    /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj.
-    /// </summary>
-    public class NetFrameworkRunner : Attribute, ITestDataSource
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSource"/> class.
-        /// </summary>
-        /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net452TargetFramework or alike values.</param>
-        public NetFrameworkRunner(string targetFrameworks = AcceptanceTestBase.NETFX452_NET50)
-        {
-            var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
-            if (!isWindows) 
-            {
-                return;
-            }
-
-            foreach (var fmw in targetFrameworks.Split(';'))
-            {
-                this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.DesktopRunnerFramework, fmw, AcceptanceTestBase.InIsolation) });
-            }
-
-        }
-
-        private List<object[]> dataRows = new List<object[]>();
-
-        public IEnumerable<object[]> GetData(MethodInfo methodInfo)
-        {
-            return this.dataRows;
-        }
-
-        public string GetDisplayName(MethodInfo methodInfo, object[] data)
-        {
-            return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSource.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSource.cs
deleted file mode 100644
index c69101f611..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSource.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Reflection;
-    using TestUtilities;
-    using VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// The attribute defining runner framework and target framework for net451.
-    /// First Argument (Runner framework) = This decides who will run the tests. If runner framework is netcoreapp then "dotnet vstest.console.dll" will run the tests.
-    /// If runner framework is net46 then vstest.console.exe will run the tests.
-    /// Second argument (target framework) = The framework for which test will run
-    /// </summary>
-    public class NetFullTargetFrameworkDataSource : Attribute, ITestDataSource
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NetFullTargetFrameworkDataSource"/> class.
-        /// </summary>
-        /// <param name="inIsolation">Run test in isolation</param>
-        /// <param name="inProcess">Run tests in process</param>
-        /// <param name="useDesktopRunner">To run tests with desktop runner(vstest.console.exe)</param>
-        /// <param name="useCoreRunner">To run tests with core runner(dotnet vstest.console.dll)</param>
-        public NetFullTargetFrameworkDataSource(bool inIsolation = true, bool inProcess = false, bool useDesktopRunner = true, bool useCoreRunner = true)
-        {
-            this.dataRows = new List<object[]>();
-
-            var isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
-            if (useCoreRunner && isWindows)
-            {
-                this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.CoreRunnerFramework, AcceptanceTestBase.DesktopTargetFramework) });
-            }
-
-            if (useDesktopRunner && isWindows)
-            {
-                if (inIsolation)
-                {
-                    this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.DesktopRunnerFramework, AcceptanceTestBase.DesktopTargetFramework, AcceptanceTestBase.InIsolation) });
-                }
-
-                if (inProcess)
-                {
-                    this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.DesktopRunnerFramework, AcceptanceTestBase.DesktopTargetFramework) });
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NetCoreTargetFrameworkDataSource"/> class.
-        /// </summary>
-        /// <param name="targetFrameworks">To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net452TargetFramework or alike values.</param>
-        public NetFullTargetFrameworkDataSource(string[] targetFrameworks, bool inIsolation = true, bool inProcess = false)
-        {
-            if (inIsolation)
-            {
-                foreach (var fmw in targetFrameworks)
-                {
-                    this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.DesktopRunnerFramework, fmw, AcceptanceTestBase.InIsolation) });
-                }
-            }
-
-            if (inProcess)
-            {
-                foreach (var fmw in targetFrameworks)
-                {
-                    this.dataRows.Add(new object[] { new RunnerInfo(IntegrationTestBase.DesktopRunnerFramework, fmw) });
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data rows.
-        /// </summary>
-        private List<object[]> dataRows = new List<object[]>();
-
-        public IEnumerable<object[]> GetData(MethodInfo methodInfo)
-        {
-            return this.dataRows;
-        }
-
-        public string GetDisplayName(MethodInfo methodInfo, object[] data)
-        {
-            return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/RunnnerInfo.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/RunnnerInfo.cs
deleted file mode 100644
index 0b4ba85361..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/RunnnerInfo.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    public class RunnerInfo
-    {
-        public RunnerInfo(string runnerType, string targetFramework): this(runnerType, targetFramework, "")
-        {
-        }
-
-        public RunnerInfo(string runnerType, string targetFramework, string inIsolation)
-        {
-            this.RunnerFramework = runnerType;
-            this.TargetFramework = targetFramework;
-            this.InIsolationValue = inIsolation;
-        }
-        /// <summary>
-        /// Gets the target framework.
-        /// </summary>
-        public string TargetFramework
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets the inIsolation.
-        /// Supported values = <c>/InIsolation</c>.
-        /// </summary>
-        public string InIsolationValue
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets the application type.
-        /// </summary>
-        public string RunnerFramework
-        {
-            get;
-            set;
-        }
-
-        public override string ToString()
-        {
-            return string.Join(",", new[] { "RunnerFramework = " + RunnerFramework, " TargetFramework = " + TargetFramework, string.IsNullOrEmpty(InIsolationValue) ? " InProcess" : " InIsolation" });
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs
deleted file mode 100644
index bfafb9eb36..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System.IO;
-
-    [TestClass]
-    public class FilePatternParserTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void WildCardPatternShouldCorrectlyWorkOnFiles(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssembly = this.GetSampleTestAssembly();
-            testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
-
-            var arguments = PrepareArguments(
-               testAssembly,
-               this.GetTestAdapterPath(),
-               string.Empty, this.FrameworkArgValue,
-               runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void WildCardPatternShouldCorrectlyWorkOnArbitraryDepthDirectories(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssembly = this.GetSampleTestAssembly();
-            var oldAssemblyPath = Path.Combine("Debug", this.testEnvironment.TargetFramework, "SimpleTestProject.dll");
-            var newAssemblyPath = Path.Combine("**", this.testEnvironment.TargetFramework, "*TestProj*.dll");
-            testAssembly = testAssembly.Replace(oldAssemblyPath, newAssemblyPath);
-
-            var arguments = PrepareArguments(
-               testAssembly,
-               this.GetTestAdapterPath(),
-               string.Empty, string.Empty,
-               runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void WildCardPatternShouldCorrectlyWorkForRelativeAssemblyPath(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssembly = this.GetSampleTestAssembly();
-            testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
-
-            var wildCardIndex = testAssembly.IndexOfAny(new char[] { '*' });
-            var testAssemblyDirectory = testAssembly.Substring(0, wildCardIndex);
-            testAssembly = testAssembly.Substring(wildCardIndex);
-
-            Directory.SetCurrentDirectory(testAssemblyDirectory);
-
-            var arguments = PrepareArguments(
-               testAssembly,
-               this.GetTestAdapterPath(),
-               string.Empty, string.Empty,
-               runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void WildCardPatternShouldCorrectlyWorkOnMultipleFiles(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssembly = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-            testAssembly = testAssembly.Replace("SimpleTestProject.dll", "*TestProj*.dll");
-            testAssembly = testAssembly.Replace("SimpleTestProject2.dll", "*TestProj*.dll");
-
-            var arguments = PrepareArguments(
-               testAssembly,
-               this.GetTestAdapterPath(),
-               string.Empty, this.FrameworkArgValue,
-               runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(2, 2, 2);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs
deleted file mode 100644
index 492498d83f..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class FrameworkTests : AcceptanceTestBase
-    {
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void FrameworkArgumentShouldWork(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " ", $"/Framework:{this.FrameworkArgValue}");
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void FrameworkShortNameArgumentShouldWork(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " ", $"/Framework:{this.testEnvironment.TargetFramework}");
-
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        // framework runner not available on Linux
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
-        //[NetCoreTargetFrameworkDataSource]
-        public void OnWrongFrameworkPassedTestRunShouldNotRun(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: resultsDir);
-            if (runnerInfo.TargetFramework.Contains("netcore"))
-            {
-                arguments = string.Concat(arguments, " ", "/Framework:Framework45");
-            }
-            else
-            {
-                arguments = string.Concat(arguments, " ", "/Framework:FrameworkCore10");
-            }
-            this.InvokeVsTest(arguments);
-
-            if (runnerInfo.TargetFramework.Contains("netcore"))
-            {
-                this.StdOutputContains("No test is available");
-            }
-            else
-            {
-                // This test indirectly tests that we abort when incorrect framework is forced on a DLL, the failure message with the new fallback 
-                // is uglier than then one before that suggests (incorrectly) to install Microsoft.NET.Test.Sdk into the project, which would work,
-                // but would not solve the problem. In either cases we should improve the message later.
-                this.StdErrorContains("Test Run Failed.");
-            }
-
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSpecificTestsShouldWorkWithFrameworkInCompatibleWarning(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " ", "/tests:PassingTest");
-            arguments = string.Concat(arguments, " ", "/Framework:Framework40");
-
-            this.InvokeVsTest(arguments);
-
-            if (runnerInfo.TargetFramework.Contains("netcore"))
-            {
-                this.StdOutputContains("No test is available");
-            }
-            else
-            {
-                this.StdOutputContains("Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.0 framework and X86 platform.");
-                this.ValidateSummaryStatus(1, 0, 0);
-            }
-
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs
deleted file mode 100644
index 65e64331bb..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    // this is tested only on .NET Framework
-    [TestCategory("Windows-Review")]
-    public class ListExtensionsTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
-        public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTest("/listDiscoverers");
-
-            if (this.IsDesktopRunner())
-            {
-                this.StdOutputContains("executor://codedwebtestadapter/v1");
-                this.StdOutputContains("executor://mstestadapter/v1");
-                this.StdOutputContains("executor://webtestadapter/v1");
-                this.StdOutputContains(".Webtest");
-                this.StdOutputContains("executor://cppunittestexecutor/v1");
-            }
-            else
-            {
-                // There are no inbox adapters for dotnet core
-                this.StdOutputDoesNotContains("executor://codedwebtestadapter/v1");  
-                this.StdOutputDoesNotContains("executor://mstestadapter/v1");
-                this.StdOutputDoesNotContains("executor://webtestadapter/v1");
-                this.StdOutputDoesNotContains(".Webtest");
-                this.StdOutputDoesNotContains("executor://cppunittestexecutor/v1");
-            }
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
-        public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTest("/listExecutors");
-
-            if (this.IsDesktopRunner())
-            {
-                this.StdOutputContains("executor://CodedWebTestAdapter/v1");               
-                this.StdOutputContains("executor://MSTestAdapter/v1");
-                this.StdOutputContains("executor://WebTestAdapter/v1");
-                this.StdOutputContains("executor://CppUnitTestExecutor/v1");
-                this.StdOutputContains("executor://UAPCppExecutorIdentifier");
-            }
-            else
-            {
-                // There are no inbox adapters for dotnet core
-                this.StdOutputDoesNotContains("executor://CodedWebTestAdapter/v1");
-                this.StdOutputDoesNotContains("executor://MSTestAdapter/v1");
-                this.StdOutputDoesNotContains("executor://WebTestAdapter/v1");
-                this.StdOutputDoesNotContains("executor://CppUnitTestExecutor/v1");
-                this.StdOutputDoesNotContains("executor://UAPCppExecutorIdentifier");
-            }
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
-        public void ListLoggersShouldShowInboxLoggers(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTest("/listLoggers");
-
-            this.StdOutputContains("logger://Microsoft/TestPlatform/Extensions/Blame/v1");
-            this.StdOutputContains("logger://Microsoft/TestPlatform/TrxLogger/v1");
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: false, inProcess: true)]
-        public void ListSettingsProvidersShouldShowInboxSettingsProviders(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTest("/listSettingsProviders");
-
-            if (this.IsDesktopRunner())
-            {
-                this.StdOutputContains("MSTestSettingsProvider");
-            }
-            else
-            {
-                // There are no inbox adapters for dotnet core
-                this.StdOutputDoesNotContains("MSTestSettingsProvider");
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
deleted file mode 100644
index 1d142d3fe2..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Linq;
-    using System.Text;
-    using System.IO;
-    using System.Xml;
-    using System;
-
-    [TestClass]
-    public class LoggerTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void TrxLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var testResultsDirectory = GetResultsDirectory();
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            var trxFileName = "TestResults.trx";
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-            this.InvokeVsTest(arguments);
-
-            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
-            this.InvokeVsTest(arguments);
-
-            var trxFilePath = Path.Combine(testResultsDirectory, trxFileName);
-            Assert.IsTrue(IsValidXml(trxFilePath), "Invalid content in Trx log file");
-
-            TryRemoveDirectory(testResultsDirectory);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var testResultsDirectory = GetResultsDirectory();
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            var htmlFileName = "TestResults.html";
-            arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
-            this.InvokeVsTest(arguments);
-
-            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"html;LogFileName={htmlFileName}\"");
-            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
-            this.InvokeVsTest(arguments);
-
-            var htmlLogFilePath = Path.Combine(testResultsDirectory, htmlFileName);
-            IsFileAndContentEqual(htmlLogFilePath);
-
-            TryRemoveDirectory(testResultsDirectory);
-        }
-
-        [TestMethod]
-        [NetCoreTargetFrameworkDataSource]
-        public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var testResultsDirectory = GetResultsDirectory();
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            var trxFileName = "TestResults.trx";
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFileName={trxFileName}\"");
-            this.InvokeVsTest(arguments);
-
-            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFileName={trxFileName}\"");
-            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
-            this.InvokeVsTest(arguments);
-
-            var trxLogFilePath = Path.Combine(testResultsDirectory, trxFileName);
-            Assert.IsTrue(IsValidXml(trxLogFilePath), "Invalid content in Trx log file");
-
-            TryRemoveDirectory(testResultsDirectory);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        public void TrxLoggerWithLogFilePrefixShouldGenerateMultipleTrx(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var testResultsDirectory = GetResultsDirectory();
-            var trxFileNamePattern = "TestResults";
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFilePrefix={trxFileNamePattern}\"");
-            this.InvokeVsTest(arguments);
-
-            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/TrxLogger/v1;LogFilePrefix={trxFileNamePattern}\"");
-            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
-            this.InvokeVsTest(arguments);
-
-            var trxFilePaths = Directory.EnumerateFiles(testResultsDirectory, trxFileNamePattern + "_net*.trx");
-            Assert.IsTrue(trxFilePaths.Count() > 1);
-
-            TryRemoveDirectory(testResultsDirectory);
-        }
-
-        [TestMethod]
-        [NetCoreTargetFrameworkDataSource]
-        public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var testResultsDirectory = GetResultsDirectory();
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            var htmlFileName = "TestResults.html";
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName{htmlFileName}\"");
-            this.InvokeVsTest(arguments);
-
-            arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue, testResultsDirectory);
-            arguments = string.Concat(arguments, $" /logger:\"logger://Microsoft/TestPlatform/htmlLogger/v1;LogFileName={htmlFileName}\"");
-            arguments = string.Concat(arguments, " /testcasefilter:Name~Pass");
-            this.InvokeVsTest(arguments);
-
-            var htmlLogFilePath = Path.Combine(testResultsDirectory, htmlFileName);
-            IsFileAndContentEqual(htmlLogFilePath);
-
-            TryRemoveDirectory(testResultsDirectory);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void TrxLoggerResultSummaryOutcomeValueShouldBeFailedIfNoTestsExecutedAndTreatNoTestsAsErrorIsTrue(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
-            var trxFileName = "TrxLogger.trx";
-
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-
-            // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
-            arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=true");
-
-            this.InvokeVsTest(arguments);
-
-            var trxLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", trxFileName);
-            string outcomeValue = GetElementAtributeValueFromTrx(trxLogFilePath, "ResultSummary", "outcome");
-
-            Assert.AreEqual("Failed", outcomeValue);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void TrxLoggerResultSummaryOutcomeValueShouldNotChangeIfNoTestsExecutedAndTreatNoTestsAsErrorIsFalse(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
-            var trxFileName = "TrxLogger.trx";
-
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-
-            // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
-            arguments = string.Concat(arguments, " /TestCaseFilter:TestNameThatMatchesNoTestInTheAssembly");
-            arguments = string.Concat(arguments, " -- RunConfiguration.TreatNoTestsAsError=false");
-
-            this.InvokeVsTest(arguments);
-
-            var trxLogFilePath = Path.Combine(Directory.GetCurrentDirectory(), "TestResults", trxFileName);
-            string outcomeValue = GetElementAtributeValueFromTrx(trxLogFilePath, "ResultSummary", "outcome");
-
-            Assert.AreEqual("Completed", outcomeValue);
-        }
-
-        private bool IsValidXml(string xmlFilePath)
-        {
-            try
-            {
-                using (var file = File.OpenRead(xmlFilePath))
-                using (var reader = XmlReader.Create(file))
-                {
-                    while (reader.Read())
-                    {
-                    }
-
-                    return true;
-                }
-            }
-            catch (XmlException)
-            {
-                return false;
-            }
-        }
-
-        private void IsFileAndContentEqual(string filePath)
-        {
-            StringBuilder sb = new StringBuilder();
-            using (var sr = new StreamReader(filePath))
-            {
-                sb.Append(sr.ReadToEnd());
-            }
-
-            string filePathContent = sb.ToString();
-            string[] divs = { "Total tests", "Passed", "Failed", "Skipped", "Run duration", "Pass percentage", "SampleUnitTestProject.UnitTest1.PassingTest" };
-            foreach (string str in divs)
-            {
-                StringAssert.Contains(filePathContent, str);
-            }
-        }
-
-        private static string GetElementAtributeValueFromTrx(string trxFileName, string fieldName, string attributeName)
-        {
-            using (FileStream file = File.OpenRead(trxFileName))
-            using (XmlReader reader = XmlReader.Create(file))
-            {
-                while (reader.Read())
-                {
-                    if (reader.Name.Equals(fieldName) && reader.NodeType == XmlNodeType.Element && reader.HasAttributes)
-                    {
-                        return reader.GetAttribute(attributeName);
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj
deleted file mode 100644
index bbc5b66688..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <AssemblyName>Microsoft.TestPlatform.AcceptanceTests</AssemblyName>
-  </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="TestAssets\CodeCoverageTest\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
-    <ProjectReference Include="$(TestPlatformRoot)test\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Chutzpah" Version="$(ChutzpahAdapterVersion)" />
-    <PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP" Version="2.0.0" />
-    <PackageReference Include="Microsoft.TestPlatform.QTools.Assets" Version="2.0.0" />
-    <PackageReference Include="Procdump" Version="0.0.1" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0-preview2-26406-04" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Reflection" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs
deleted file mode 100644
index 46c67fb526..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-
-    using static AcceptanceTestBase;
-
-    [TestClass]
-    public class MultitargetingTestHostTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        // the underlying test is using xUnit to avoid AppDomain enhancements in MSTest that make this pass even without multitargetting
-        // xUnit supports net452 onwards, so that is why this starts at net452, I also don't test all framework versions
-        [NetCoreRunner(NETFX452_48)]
-        [NetFrameworkRunner(NETFX452_48)]
-        public void RunningTestWithAFailingDebugAssertDoesNotCrashTheHostingProcess(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPath = this.BuildMultipleAssemblyPath("MultitargetedNetFrameworkProject.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPath, null, null, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(passedTestsCount: 1, failedTestsCount: 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs
deleted file mode 100644
index b979a655f9..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System.Threading;
-
-    using global::TestPlatform.TestUtilities;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    // monitoring the processes does not work correctly
-    [TestCategory("Windows-Review")]
-    public class PlatformTests : AcceptanceTestBase
-    {
-        /// <summary>
-        /// The run test execution with platform x64.
-        /// </summary>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestExecutionWithPlatformx64(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var platformArg = " /Platform:x64";
-            this.RunTestExecutionWithPlatform(platformArg, "testhost", 1);
-        }
-
-        /// <summary>
-        /// The run test execution with platform x86.
-        /// </summary>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestExecutionWithPlatformx86(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var platformArg = " /Platform:x86";
-            this.RunTestExecutionWithPlatform(platformArg, "testhost.x86", 1);
-        }
-
-        private void SetExpectedParams(ref int expectedNumOfProcessCreated, ref string testhostProcessName, string desktopHostProcessName)
-        {
-            testhostProcessName = desktopHostProcessName;
-            expectedNumOfProcessCreated = 1;
-        }
-
-        private void RunTestExecutionWithPlatform(string platformArg, string testhostProcessName, int expectedNumOfProcessCreated)
-        {
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, platformArg);
-
-            var cts = new CancellationTokenSource();
-            var numOfProcessCreatedTask = NumberOfProcessLaunchedUtility.NumberOfProcessCreated(
-                cts,
-                testhostProcessName);
-
-            this.InvokeVsTest(arguments);
-
-            cts.Cancel();
-
-            Assert.AreEqual(
-                expectedNumOfProcessCreated,
-                numOfProcessCreatedTask.Result.Count,
-                $"Number of {testhostProcessName} process created, expected: {expectedNumOfProcessCreated} actual: {numOfProcessCreatedTask.Result.Count} ({ string.Join(", ", numOfProcessCreatedTask.Result) }) args: {arguments} runner path: {this.GetConsoleRunnerPath()}");
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs
deleted file mode 100644
index 5daed63d49..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System.IO;
-    using System.IO.Compression;
-    using System.Linq;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class PortableNugetPackageTests : AcceptanceTestBase
-    {
-        private static string portablePackageFolder;
-
-        [ClassInitialize]
-        public static void ClassInit(TestContext testContext)
-        {
-            var packageLocation = Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "packages");
-            var nugetPackage = Directory.EnumerateFiles(packageLocation, "Microsoft.TestPlatform.Portable.*.nupkg").ToList();
-            portablePackageFolder = Path.Combine(packageLocation, Path.GetFileNameWithoutExtension(nugetPackage[0]));
-            if (Directory.Exists(portablePackageFolder))
-            {
-                Directory.Delete(portablePackageFolder, recursive: true);
-            }
-            ZipFile.ExtractToDirectory(nugetPackage[0], portablePackageFolder);
-        }
-
-        [ClassCleanup]
-        public static void ClassCleanup()
-        {
-            Directory.Delete(portablePackageFolder, true);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunMultipleTestAssemblies(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-
-            this.InvokeVsTestForExecution(assemblyPaths, this.GetTestAdapterPath(), this.FrameworkArgValue, string.Empty);
-
-            this.ValidateSummaryStatus(2, 2, 2);
-            this.ExitCodeEquals(1); // failing tests
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverAllTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.InvokeVsTestForDiscovery(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue);
-
-            var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
-            this.ValidateDiscoveredTests(listOfTests);
-            this.ExitCodeEquals(0);
-        }
-
-        public override string GetConsoleRunnerPath()
-        {
-            string consoleRunnerPath = string.Empty;
-
-            if (this.IsDesktopRunner())
-            {
-                consoleRunnerPath = Path.Combine(portablePackageFolder, "tools", "net451", "vstest.console.exe");
-            }
-            else if (this.IsNetCoreRunner())
-            {
-                var executablePath = IsWindows ? @"dotnet\dotnet.exe" : @"dotnet-linux/dotnet";
-                consoleRunnerPath = Path.Combine(this.testEnvironment.ToolsDirectory, executablePath);
-            }
-            else
-            {
-                Assert.Fail("Unknown Runner framework - [{0}]", this.testEnvironment.RunnerFramework);
-            }
-
-            Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: {0}", consoleRunnerPath);
-            return consoleRunnerPath;
-        }
-
-        protected override string SetVSTestConsoleDLLPathInArgs(string args)
-        {
-            var vstestConsoleDll = Path.Combine(portablePackageFolder, "tools", "netcoreapp2.1", "vstest.console.dll");
-            vstestConsoleDll = vstestConsoleDll.AddDoubleQuote();
-            args = string.Concat(
-                vstestConsoleDll,
-                " ",
-                args);
-            return args;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs
deleted file mode 100644
index f51a7b7fe2..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace testhost.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index c55669458b..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestingMSTest")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("755996fa-672a-4272-9776-7f707a520058")]
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ResultsDirectoryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ResultsDirectoryTests.cs
deleted file mode 100644
index 26158e5d6c..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/ResultsDirectoryTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ResultsDirectoryTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void TrxFileShouldBeCreatedInResultsDirectory(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
-            var trxFileName = "TestResults.trx";
-            var resultsDir = GetResultsDirectory();
-            var trxFilePath = Path.Combine(resultsDir, trxFileName);
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{resultsDir}");
-
-            // Delete if already exists
-            TryRemoveDirectory(resultsDir);
-
-            this.InvokeVsTest(arguments);
-
-            Assert.IsTrue(File.Exists(trxFilePath), $"Expected Trx file: {trxFilePath} not created in results directory");
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void ResultsDirectoryRelativePathShouldWork(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
-            var trxFileName = "TestResults.trx";
-            var relativeDirectory = @"relative\directory";
-            var resultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), relativeDirectory);
-
-            var trxFilePath = Path.Combine(resultsDirectory, trxFileName);
-            arguments = string.Concat(arguments, $" /logger:\"trx;LogFileName={trxFileName}\"");
-            arguments = string.Concat(arguments, $" /ResultsDirectory:{relativeDirectory}");
-
-            if (Directory.Exists(resultsDirectory))
-            {
-                Directory.Delete(resultsDirectory, true);
-            }
-
-            this.InvokeVsTest(arguments);
-
-            Assert.IsTrue(File.Exists(trxFilePath), $"Expected Trx file: {trxFilePath} not created in results directory");
-            TryRemoveDirectory(resultsDirectory);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs
deleted file mode 100644
index 93ce21ae97..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Threading;
-
-    using global::TestPlatform.TestUtilities;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    // monitoring the processes does not work correctly
-    [TestCategory("Windows-Review")]
-    public class RunsettingsTests : AcceptanceTestBase
-    {
-        private string runsettingsPath = Path.Combine(Path.GetTempPath(), "test_" + Guid.NewGuid() + ".runsettings");
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            if (File.Exists(runsettingsPath))
-            {
-                File.Delete(runsettingsPath);
-            }
-        }
-
-        #region Runsettings precedence tests
-        /// <summary>
-        /// Command line run settings should have high precedence among settings file, cli runsettings and cli switches
-        /// </summary>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void CommandLineRunSettingsShouldWinAmongAllOptions(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x86";
-            var testhostProcessName = new[] { "testhost.x86", "dotnet" };
-            var expectedNumOfProcessCreated = GetExpectedNumOfProcessCreatedForWithoutParallel();
-
-            // passing parallel
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "MaxCpuCount", "0" },
-                                                         { "TargetFrameworkVersion", this.GetTargetFramworkForRunsettings() },
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-            // passing different platform
-            var additionalArgs = "/Platform:x64";
-
-            var runSettingsArgs = String.Join(
-                " ",
-                new string[]
-                    {
-                        "RunConfiguration.MaxCpuCount=1",
-                        string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
-                        string.Concat("RunConfiguration.TargetFrameworkVersion=" , this.GetTargetFramworkForRunsettings()),
-                        string.Concat("RunConfiguration.TestAdaptersPaths=" , this.GetTestAdapterPath())
-                    });
-
-            this.RunTestWithRunSettings(runConfigurationDictionary, runSettingsArgs, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
-        }
-
-        /// <summary>
-        /// Command line run settings should have high precedence btween cli runsettings and cli switches.
-        /// </summary>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void CLIRunsettingsShouldWinBetweenCLISwitchesAndCLIRunsettings(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x86";
-            var testhostProcessName = new[] { "testhost.x86", "dotnet" };
-            var expectedNumOfProcessCreated = GetExpectedNumOfProcessCreatedForWithoutParallel();
-
-            // Pass parallel
-            var additionalArgs = "/Parallel";
-
-            // Pass non parallel
-            var runSettingsArgs = String.Join(
-                " ",
-                new string[]
-                    {
-                        "RunConfiguration.MaxCpuCount=1",
-                        string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
-                        string.Concat("RunConfiguration.TargetFrameworkVersion=" , this.GetTargetFramworkForRunsettings()),
-                        string.Concat("RunConfiguration.TestAdaptersPaths=" , this.GetTestAdapterPath())
-                    });
-
-            this.RunTestWithRunSettings(null, runSettingsArgs, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
-        }
-
-        /// <summary>
-        /// Command line switches should have high precedence if runsetting file and command line switch specified
-        /// </summary>
-        /// <param name="runnerFramework"></param>
-        /// <param name="targetFramework"></param>
-        /// <param name="targetRuntime"></param>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void CommandLineSwitchesShouldWinBetweenSettingsFileAndCommandLineSwitches(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var testhostProcessName = new[] { "testhost.x86", "dotnet" };
-            var expectedNumOfProcessCreated = GetExpectedNumOfProcessCreatedForWithoutParallel();
-
-            // passing different platform
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "MaxCpuCount", "1" },
-                                                          { "TargetPlatform", "x64" },
-                                                         { "TargetFrameworkVersion", this.GetTargetFramworkForRunsettings() },
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-            var additionalArgs = "/Platform:x86";
-
-            this.RunTestWithRunSettings(runConfigurationDictionary, null, additionalArgs, testhostProcessName, expectedNumOfProcessCreated);
-        }
-
-        #endregion
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsWithoutParallelAndPlatformX86(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x86";
-            var testhostProcessNames = new[] { "testhost.x86" };
-            var expectedNumOfProcessCreated = 1;
-
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "MaxCpuCount", "1" },
-                                                         { "TargetPlatform", targetPlatform },
-                                                         { "TargetFrameworkVersion", this.GetTargetFramworkForRunsettings() },
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-            this.RunTestWithRunSettings(runConfigurationDictionary, null, null, testhostProcessNames, expectedNumOfProcessCreated);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsParamsAsArguments(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x86";
-            var testhostProcessName = new[] { "testhost.x86" };
-            var expectedNumOfProcessCreated = 1;
-
-            var runSettingsArgs = String.Join(
-                " ",
-                new string[]
-                    {
-                        "RunConfiguration.MaxCpuCount=1",
-                        string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
-                        string.Concat("RunConfiguration.TargetFrameworkVersion=" , this.GetTargetFramworkForRunsettings()),
-                        string.Concat("RunConfiguration.TestAdaptersPaths=" , this.GetTestAdapterPath())
-                    });
-
-            this.RunTestWithRunSettings(null, runSettingsArgs, null, testhostProcessName, expectedNumOfProcessCreated);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsAndRunSettingsParamsAsArguments(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x86";
-            var testhostProcessName = new[] { "testhost.x86" };
-            var expectedNumOfProcessCreated = 1;
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "MaxCpuCount", "2" },
-                                                         { "TargetPlatform", targetPlatform },
-                                                         { "TargetFrameworkVersion", this.GetTargetFramworkForRunsettings() },
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-
-            var runSettingsArgs = String.Join(
-                " ",
-                new string[]
-                    {
-                        "RunConfiguration.MaxCpuCount=1",
-                        string.Concat("RunConfiguration.TargetPlatform=",targetPlatform),
-                        string.Concat("RunConfiguration.TargetFrameworkVersion=" , this.GetTargetFramworkForRunsettings()),
-                        string.Concat("RunConfiguration.TestAdaptersPaths=" , this.GetTestAdapterPath())
-                    });
-
-            this.RunTestWithRunSettings(runConfigurationDictionary, runSettingsArgs, null, testhostProcessName, expectedNumOfProcessCreated);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsWithParallelAndPlatformX64(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var targetPlatform = "x64";
-            var testhostProcessName = new[] { "testhost", "dotnet" };
-            var expectedProcessCreated = 2;
-            if (!this.IsDesktopRunner())
-            {
-                // this creates dotnet hosted vstest console and 2 testhosts one of which is hosted 
-                // in dotnet, so we have two dotnet + 1 testhost.exe
-                expectedProcessCreated = 3;
-            }
-
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "MaxCpuCount", "2" },
-                                                         { "TargetPlatform", targetPlatform },
-                                                         { "TargetFrameworkVersion", this.GetTargetFramworkForRunsettings()},
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-            this.RunTestWithRunSettings(runConfigurationDictionary, null, null, testhostProcessName, expectedProcessCreated);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsWithInvalidValueShouldLogError(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "TargetPlatform", "123" }
-                                                 };
-            var runsettingsFilePath = this.GetRunsettingsFilePath(runConfigurationDictionary);
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                string.Empty,
-                runsettingsFilePath, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-            this.StdErrorContains(@"Settings file provided does not conform to required format. An error occurred while loading the settings. Error: Invalid setting 'RunConfiguration'. Invalid value '123' specified for 'TargetPlatform'.");
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestAdapterPathFromRunSettings(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var runConfigurationDictionary = new Dictionary<string, string>
-                                                 {
-                                                         { "TestAdaptersPaths", this.GetTestAdapterPath() }
-                                                 };
-            var runsettingsFilePath = this.GetRunsettingsFilePath(runConfigurationDictionary);
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                string.Empty,
-                runsettingsFilePath, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        #region LegacySettings Tests
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
-        public void LegacySettingsWithPlatform(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("LegacySettingsUnitTestProject.dll");
-            var testAssemblyDirectory = Path.GetDirectoryName(testAssemblyPath);
-
-            var runsettingsXml = @"<RunSettings>
-                                    <MSTest>
-                                    <ForcedLegacyMode>true</ForcedLegacyMode>
-                                    </MSTest>
-                                    <LegacySettings>
-                                      <Execution hostProcessPlatform=""x64"">
-                                      </Execution>
-                                    </LegacySettings>
-                                   </RunSettings>";
-
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-
-            var arguments = PrepareArguments(
-               testAssemblyPath,
-               string.Empty,
-               this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(0, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
-        public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("LegacySettingsUnitTestProject.dll");
-            var testAssemblyDirectory = Path.GetDirectoryName(testAssemblyPath);
-
-            // Create the script files
-            var guid = Guid.NewGuid();
-            var setupScriptName = "setupScript_" + guid + ".bat";
-            var setupScriptPath = Path.Combine(Path.GetTempPath(), setupScriptName);
-            File.WriteAllText(setupScriptPath, @"echo > %temp%\ScriptTestingFile.txt");
-
-            var cleanupScriptName = "cleanupScript_" + guid + ".bat";
-            var cleanupScriptPath = Path.Combine(Path.GetTempPath(), cleanupScriptName);
-            File.WriteAllText(cleanupScriptPath, @"del %temp%\ScriptTestingFile.txt");
-
-            var runsettingsFormat = @"<RunSettings>
-                                    <MSTest>
-                                    <ForcedLegacyMode>true</ForcedLegacyMode>
-                                    </MSTest>
-                                    <LegacySettings>
-                                         <Scripts setupScript=""{0}"" cleanupScript=""{1}"" />
-                                    </LegacySettings>
-                                   </RunSettings>";
-
-            // Scripts have relative paths to temp directory where the runsettings is created.
-            var runsettingsXml = string.Format(runsettingsFormat, setupScriptName, cleanupScriptName);
-
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-
-            var arguments = PrepareArguments(
-               testAssemblyPath,
-               string.Empty,
-               this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:Name=ScriptsTest");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-
-            // Validate cleanup script ran
-            var scriptPath = Path.Combine(Path.GetTempPath(), "ScriptTestingFile.txt");
-            Assert.IsFalse(File.Exists(scriptPath));
-
-            // Cleanup script files
-            File.Delete(setupScriptPath);
-            File.Delete(cleanupScriptPath);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
-        public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("LegacySettingsUnitTestProject.dll");
-            var testAssemblyDirectory = Path.GetDirectoryName(testAssemblyPath);
-
-            var deploymentItem = Path.Combine(testAssemblyDirectory, "Deployment", "DeploymentFile.xml");
-
-            var runsettingsFormat = @"<RunSettings>
-                                    <MSTest>
-                                    <ForcedLegacyMode>true</ForcedLegacyMode>
-                                    </MSTest>
-                                    <LegacySettings>
-                                         <Deployment>
-                                            <DeploymentItem filename=""{0}"" />
-                                         </Deployment>
-                                    </LegacySettings>
-                                   </RunSettings>";
-
-            var runsettingsXml = string.Format(runsettingsFormat, deploymentItem);
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-
-            var arguments = PrepareArguments(
-               testAssemblyPath,
-               string.Empty,
-               this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:Name=DeploymentItemTest");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
-        public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("LegacySettingsUnitTestProject.dll");
-            var runsettingsXml = @"<RunSettings>
-                                    <MSTest>
-                                    <ForcedLegacyMode>true</ForcedLegacyMode>
-                                    </MSTest>
-                                    <LegacySettings>
-                                        <Execution><Timeouts testTimeout=""2000"" />
-                                        </Execution>
-                                    </LegacySettings>
-                                   </RunSettings>";
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-            var arguments = PrepareArguments(testAssemblyPath, string.Empty, this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:Name~TimeTest");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 1, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
-        public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("LegacySettingsUnitTestProject.dll");
-            var runsettingsFormat = @"<RunSettings>
-                                    <MSTest><ForcedLegacyMode>true</ForcedLegacyMode></MSTest>
-                                    <LegacySettings>
-                                        <Execution>
-                                         <TestTypeSpecific>
-                                          <UnitTestRunConfig testTypeId=""13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b"">
-                                           <AssemblyResolution>
-                                              <TestDirectory useLoadContext=""true"" />
-                                              <RuntimeResolution>
-                                                  <Directory path=""{0}"" includeSubDirectories=""true"" />
-                                              </RuntimeResolution>
-                                           </AssemblyResolution>
-                                          </UnitTestRunConfig>
-                                         </TestTypeSpecific>
-                                        </Execution>
-                                    </LegacySettings>
-                                   </RunSettings>";
-
-            var testAssemblyDirectory = Path.Combine(this.testEnvironment.TestAssetsPath, "LegacySettingsUnitTestProject", "DependencyAssembly");
-            var runsettingsXml = string.Format(runsettingsFormat, testAssemblyDirectory);
-
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-            var arguments = PrepareArguments(testAssemblyPath, string.Empty, this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /testcasefilter:Name=DependencyTest");
-
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        #endregion
-
-        #region RunSettings With EnvironmentVariables Settings Tests
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void EnvironmentVariablesSettingsShouldSetEnvironmentVariables(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var testAssemblyPath = this.GetAssetFullPath("EnvironmentVariablesTestProject.dll");
-
-            var runsettingsXml = @"<RunSettings>
-                                    <RunConfiguration>
-                                      <EnvironmentVariables>
-                                        <RANDOM_PATH>C:\temp</RANDOM_PATH>
-                                      </EnvironmentVariables>
-                                    </RunConfiguration>
-                                   </RunSettings>";
-
-            File.WriteAllText(this.runsettingsPath, runsettingsXml);
-
-            var arguments = PrepareArguments(
-               testAssemblyPath,
-               string.Empty,
-               this.runsettingsPath, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        #endregion
-
-        #region RunSettings defined in project file
-        /// <summary>
-        /// RunSettingsFilePath can be specified in .csproj and should be honored by `dotnet test`, this test
-        /// checks that the settings were honored by translating an inconclusive test to failed "result", instead of the default "skipped".
-        /// This test depends on Microsoft.TestPlatform.Build\Microsoft.TestPlatform.targets being previously copied into the
-        /// artifacts/testArtifacts/dotnet folder. This will allow the local copy of dotnet to pickup the VSTest msbuild task.
-        /// </summary>
-        /// <param name="runnerInfo"></param>
-        [TestMethod]
-        // patched dotnet is not published on non-windows systems
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSettingsAreLoadedFromProject(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var projectName = "ProjectFileRunSettingsTestProject.csproj";
-            var projectPath = this.GetProjectFullPath(projectName);
-            this.InvokeDotnetTest($@"{projectPath} --logger:""Console;Verbosity=normal""");
-            this.ValidateSummaryStatus(0, 1, 0);
-
-            // make sure that we can revert the project settings back by providing a config from command line
-            // keeping this in the same test, because it is easier to see that we are reverting settings that
-            // are honored by dotnet test, instead of just using the default, which would produce the same
-            // result
-            var settingsPath = this.GetProjectAssetFullPath(projectName, "inconclusive.runsettings");
-            this.InvokeDotnetTest($@"{projectPath} --settings {settingsPath} --logger:""Console;Verbosity=normal""");
-            this.ValidateSummaryStatus(0, 0, 1);
-        }
-
-        #endregion
-
-        private string GetRunsettingsFilePath(Dictionary<string, string> runConfigurationDictionary)
-        {
-            var runsettingsPath = Path.Combine(
-                Path.GetTempPath(),
-                "test_" + Guid.NewGuid() + ".runsettings");
-            CreateRunSettingsFile(runsettingsPath, runConfigurationDictionary);
-            return runsettingsPath;
-        }
-
-        private void RunTestWithRunSettings(Dictionary<string, string> runConfigurationDictionary,
-            string runSettingsArgs, string additionalArgs, IEnumerable<string> testhostProcessNames, int expectedNumOfProcessCreated)
-        {
-            var resultsDir = GetResultsDirectory();
-
-            var assemblyPaths =
-                this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-
-            var runsettingsPath = string.Empty;
-
-            if (runConfigurationDictionary != null)
-            {
-                runsettingsPath = this.GetRunsettingsFilePath(runConfigurationDictionary);
-            }
-
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), runsettingsPath, this.FrameworkArgValue, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-
-            if (!string.IsNullOrWhiteSpace(additionalArgs))
-            {
-                arguments = string.Concat(arguments, " ", additionalArgs);
-            }
-
-            if (!string.IsNullOrWhiteSpace(runSettingsArgs))
-            {
-                arguments = string.Concat(arguments, " -- ", runSettingsArgs);
-            }
-
-            var cts = new CancellationTokenSource();
-            var numOfProcessCreatedTask = NumberOfProcessLaunchedUtility.NumberOfProcessCreated(
-                cts,
-                testhostProcessNames);
-
-            this.InvokeVsTest(arguments);
-            cts.Cancel();
-
-            var processesCreated = numOfProcessCreatedTask.Result;
-            // assert
-            Assert.AreEqual(
-                expectedNumOfProcessCreated,
-                processesCreated.Count,
-                $"Number of { string.Join(", ", testhostProcessNames) } process created, expected: {expectedNumOfProcessCreated} actual: {processesCreated.Count} ({ string.Join(", ", processesCreated) }) args: {arguments} runner path: {this.GetConsoleRunnerPath()}");
-            this.ValidateSummaryStatus(2, 2, 2);
-
-            //cleanup
-            if (!string.IsNullOrWhiteSpace(runsettingsPath))
-            {
-                File.Delete(runsettingsPath);
-            }
-            TryRemoveDirectory(resultsDir);
-        }
-
-        private int GetExpectedNumOfProcessCreatedForWithoutParallel()
-        {
-            if (this.IsDesktopRunner() && this.IsDesktopTargetFramework())
-            {
-                // we create just testhost.exe
-                return 1;
-            }
-
-            if (this.IsDesktopRunner() && !this.IsDesktopTargetFramework())
-            {
-                // we create dotnet testhost and testhost.exe
-                return 2;
-            }
-
-            if (!this.IsDesktopRunner() && this.IsDesktopTargetFramework())
-            {
-                // we create testhost and testhost
-                return 2;
-            }
-
-            if (!this.IsDesktopRunner() && this.IsDesktopTargetFramework() && this.testEnvironment.InIsolationValue == "InProcess")
-            {
-                // we create just testhost
-                return 1;
-            }
-
-            if (!this.IsDesktopRunner() && !this.IsDesktopTargetFramework())
-            {
-                // we create dotnet vsconsole, and 2 dotnet test hosts 
-                return 3;
-            }
-
-            return -10;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs
deleted file mode 100644
index 9a82fa3e98..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System.IO;
-
-    [TestClass]
-    public class SelfContainedAppTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        // this is core 3.1 only, full framework and netcoreapp2.1 don't "publish" automatically during build
-        // but if you run it on 2.1 it will pass because we execute the test normally
-        [NetCoreTargetFrameworkDataSource(useDesktopRunner: false, useNetCore21Target: false, useNetCore31Target: true)]
-        public void RunningApplicationThatIsBuiltAsSelfContainedWillNotFailToFindHostpolicyDll(RunnerInfo runnerInfo)
-        {
-            // when the application is self-contained which is dictated by the RuntimeIdentifier and OutputType project
-            // properties, the testhost.exe executable is given a runtimeconfig that instructs it to find a hostpolicy.dll and hostfxr.dll next to it
-            // that will fail if we run the testhost.exe from the .nuget location, but will work when we run it from the output folder
-            // see https://github.com/dotnet/runtime/issues/3569#issuecomment-595820524 and below for description of how it works
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            // the app is published to win10-x64 because of the runtime identifier in the project
-            var assemblyPath = this.BuildMultipleAssemblyPath($@"win10-x64{Path.DirectorySeparatorChar}SelfContainedAppTestProject.dll").Trim('\"');
-            var arguments = PrepareArguments(assemblyPath, null, null, this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-
-            this.ValidateSummaryStatus(passedTestsCount: 1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs
deleted file mode 100644
index 28cf73bce7..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TelemetryTests : AcceptanceTestBase
-    {
-        private readonly string resultPath;
-        private string CurrentOptInStatus;
-        private const string TELEMETRY_OPTEDIN = "VSTEST_TELEMETRY_OPTEDIN";
-        private const string LOG_TELEMETRY = "VSTEST_LOGTELEMETRY";
-
-        public TelemetryTests()
-        {
-            this.resultPath = Path.GetTempPath() + "TelemetryLogs";
-
-            // Get Current Opt In Status
-            CurrentOptInStatus = Environment.GetEnvironmentVariable(TELEMETRY_OPTEDIN);
-
-            // Opt in the Telemetry
-            Environment.SetEnvironmentVariable(TELEMETRY_OPTEDIN, "1");
-
-            // Log the telemetry Data to file
-            Environment.SetEnvironmentVariable(LOG_TELEMETRY, "1");
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            // Opt out the Telemetry
-            Environment.SetEnvironmentVariable(TELEMETRY_OPTEDIN, "0");
-
-            // Set Current Opt in Status
-            Environment.SetEnvironmentVariable(TELEMETRY_OPTEDIN, CurrentOptInStatus);
-
-            // Unset the environment variable
-            Environment.SetEnvironmentVariable(LOG_TELEMETRY, "0");
-
-            if (Directory.Exists(this.resultPath))
-            {
-                Directory.Delete(this.resultPath, true);
-            }
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsShouldPublishMetrics(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.RunTests(runnerInfo.RunnerFramework);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsShouldPublishMetrics(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.DiscoverTests(runnerInfo.RunnerFramework);
-        }
-
-        private void RunTests(string runnerFramework)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("Telemetry API is not supported for .NetCore runner");
-                return;
-            }
-
-            var assemblyPaths = this.GetAssetFullPath("SimpleTestProject2.dll");
-
-            this.InvokeVsTestForExecution(assemblyPaths, this.GetTestAdapterPath(), this.FrameworkArgValue, string.Empty);
-            this.ValidateOutput("Execution");
-        }
-
-        private void DiscoverTests(string runnerFramework)
-        {
-            if (runnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("Telemetry API is not supported for .NetCore runner");
-                return;
-            }
-
-            var assemblyPaths = this.GetAssetFullPath("SimpleTestProject2.dll");
-
-            this.InvokeVsTestForDiscovery(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue);
-            this.ValidateOutput("Discovery");
-        }
-
-        private void ValidateOutput(string command)
-        {
-            bool isValid = false;
-
-            if (Directory.Exists(this.resultPath))
-            {
-                var directory = new DirectoryInfo(this.resultPath);
-                var file = directory.GetFiles().OrderByDescending(f => f.CreationTime).First();
-
-                string[] lines = File.ReadAllLines(file.FullName);
-
-                foreach (var line in lines)
-                {
-                    if (line.Contains(TelemetryDataConstants.TestExecutionCompleteEvent) && command.Equals("Execution", StringComparison.Ordinal))
-                    {
-                        var isPresent = line.Contains(
-                                            TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution)
-                                        && line.Contains(TelemetryDataConstants.NumberOfAdapterUsedToRunTests)
-                                        && line.Contains(TelemetryDataConstants.ParallelEnabledDuringExecution + '=' + "False")
-                                        && line.Contains(TelemetryDataConstants.NumberOfSourcesSentForRun + '=' + "1")
-                                        && line.Contains(TelemetryDataConstants.RunState + '=' + "Completed")
-                                        && line.Contains(TelemetryDataConstants.TimeTakenByAllAdaptersInSec)
-                                        && line.Contains(TelemetryDataConstants.TotalTestsRun + '=' + "3")
-                                        && line.Contains(TelemetryDataConstants.TotalTestsRanByAdapter)
-                                        && line.Contains(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter);
-
-                        isValid = isPresent;
-                        break;
-                    }
-                    else if (line.Contains(TelemetryDataConstants.TestDiscoveryCompleteEvent) && command.Equals("Discovery", StringComparison.Ordinal))
-                    {
-                        var isPresent = line.Contains(TelemetryDataConstants.TotalTestsDiscovered + '=' + "3")
-                                        && line.Contains(TelemetryDataConstants.ParallelEnabledDuringDiscovery + '=' + "False")
-                                        && line.Contains(TelemetryDataConstants.TimeTakenInSecForDiscovery)
-                                        && line.Contains(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec)
-                                        && line.Contains(TelemetryDataConstants.TimeTakenInSecByAllAdapters)
-                                        && line.Contains(TelemetryDataConstants.TotalTestsByAdapter)
-                                        && line.Contains(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter)
-                                        && line.Contains(TelemetryDataConstants.DiscoveryState + "=Completed")
-                                        && line.Contains(TelemetryDataConstants.NumberOfSourcesSentForDiscovery + '=' + "1")
-                                        && line.Contains(
-                                            TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery)
-                                        && line.Contains(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests);
-
-                        isValid = isPresent;
-                        break;
-                    }
-                }
-            }
-
-            Assert.IsTrue(isValid);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs
deleted file mode 100644
index 838972687a..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestCaseFilterTests : AcceptanceTestBase
-    {
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithAndOperatorTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"(TestCategory=CategoryA&Priority=3)\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(0, 1, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithCategoryTraitInMixCase(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"TestCategory=Categorya\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(0, 1, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithClassNameTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"ClassName=SampleUnitTestProject.UnitTest1\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithFullyQualifiedNameTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(
-                arguments,
-                " /TestCaseFilter:\"FullyQualifiedName=SampleUnitTestProject.UnitTest1.FailingTest\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(0, 1, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithNameTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"Name=PassingTest\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithOrOperatorTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"(TestCategory=CategoryA|Priority=2)\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithPriorityTrait(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.GetSampleTestAssembly(),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:\"Priority=2\"");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        /// <summary>
-        /// In case TestCaseFilter is provide without any property like Name or ClassName. ex. /TestCaseFilter:"UnitTest1"
-        /// this command should provide same results as /TestCaseFilter:"FullyQualifiedName~UnitTest1".
-        /// </summary>
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestCaseFilterShouldWorkIfOnlyPropertyValueGivenInExpression(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.testEnvironment.GetTestAsset("SimpleTestProject2.dll"),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /TestCaseFilter:UnitTest1");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 1, 1);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        /// <summary>
-        /// Discover tests using mstest v1 adapter with test case filters.
-        /// </summary>
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void DiscoverMstestV1TestsWithAndOperatorTrait(RunnerInfo runnerInfo)
-        {
-            if (runnerInfo.RunnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("Mstest v1 tests not supported with .Netcore runner.");
-                return;
-            }
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(
-                this.testEnvironment.GetTestAsset("MstestV1UnitTestProject.dll"),
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /listtests /TestCaseFilter:\"(TestCategory!=CategoryA&Priority!=3)\"");
-
-            this.InvokeVsTest(arguments);
-            var listOfTests = new string[] {"MstestV1UnitTestProject.UnitTest1.PassingTest1", "MstestV1UnitTestProject.UnitTest1.PassingTest2",
-                "MstestV1UnitTestProject.UnitTest1.FailingTest2", "MstestV1UnitTestProject.UnitTest1.SkippingTest" };
-            var listOfNotDiscoveredTests = new string[] { "MstestV1UnitTestProject.UnitTest1.FailingTest1" };
-            this.ValidateDiscoveredTests(listOfTests);
-            this.ValidateTestsNotDiscovered(listOfNotDiscoveredTests);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        /// <summary>
-        /// Discover tests using tmi adapter with test case filters.
-        /// </summary>
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
-        [NetFullTargetFrameworkDataSource]
-        public void DiscoverTmiTestsWithOnlyPropertyValue(RunnerInfo runnerInfo)
-        {
-            if (runnerInfo.RunnerFramework.StartsWith("netcoreapp"))
-            {
-                Assert.Inconclusive("Tmi tests not supported with .Netcore runner.");
-                return;
-            }
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            var resultsDir = GetResultsDirectory();
-
-            string testAssemblyPath = this.testEnvironment.GetTestAsset("MstestV1UnitTestProject.dll");
-            var arguments = PrepareArguments(
-                testAssemblyPath,
-                this.GetTestAdapterPath(),
-                string.Empty, this.FrameworkArgValue,
-                runnerInfo.InIsolationValue, resultsDirectory: resultsDir);
-            string testSettingsPath = Path.Combine(Path.GetDirectoryName(testAssemblyPath), "MstestV1UnitTestProjectTestSettings.testsettings");
-            arguments = string.Concat(arguments, " /listtests /TestCaseFilter:PassingTest /settings:", testSettingsPath);
-
-            this.InvokeVsTest(arguments);
-            var listOfTests = new string[] { "MstestV1UnitTestProject.UnitTest1.PassingTest1", "MstestV1UnitTestProject.UnitTest1.PassingTest2" };
-            var listOfNotDiscoveredTests = new string[] { "MstestV1UnitTestProject.UnitTest1.FailingTest1", "MstestV1UnitTestProject.UnitTest1.FailingTest2", "MstestV1UnitTestProject.UnitTest1.SkippingTest" };
-            this.ValidateDiscoveredTests(listOfTests);
-            this.ValidateTestsNotDiscovered(listOfNotDiscoveredTests);
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
deleted file mode 100644
index 1df78a08d0..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests
-{
-    using System;
-    using System.IO;
-    using System.IO.Compression;
-    using System.Linq;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestPlatformNugetPackageTests : CodeCoverageAcceptanceTestBase
-    {
-        private static string nugetPackageFolder;
-        private string resultsDirectory;
-
-        [ClassInitialize]
-        public static void ClassInit(TestContext testContext)
-        {
-            var packageLocation = Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "packages");
-            var nugetPackage = Directory.EnumerateFiles(packageLocation, "Microsoft.TestPlatform.*.nupkg").OrderBy(a => a).FirstOrDefault();
-            nugetPackageFolder = Path.Combine(packageLocation, Path.GetFileNameWithoutExtension(nugetPackage));
-            ZipFile.ExtractToDirectory(nugetPackage, nugetPackageFolder);
-
-            TryMoveDirectory(
-                sourceDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team%20Tools"),
-                destDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools")
-            );
-
-            TryMoveDirectory(
-                sourceDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic%20Code%20Coverage%20Tools"),
-                destDirName: Path.Combine(nugetPackageFolder, "tools", "net451", "Team Tools", "Dynamic Code Coverage Tools")
-            );
-        }
-
-        [ClassCleanup]
-        public static void ClassCleanup()
-        {
-            Directory.Delete(nugetPackageFolder, true);
-        }
-
-        [TestInitialize]
-        public void SetUp()
-        {
-            this.resultsDirectory = GetResultsDirectory();
-        }
-
-        [TestCleanup]
-        public void CleanUp()
-        {
-            TryRemoveDirectory(resultsDirectory);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useCoreRunner: false)]
-        public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"');
-
-            var arguments = CreateCodeCoverageArguments(runnerInfo, assemblyPaths, out var trxFilePath);
-            this.InvokeVsTest(arguments);
-
-            this.ExitCodeEquals(1); // failing tests
-
-            var actualCoverageFile = CodeCoverageTests.GetCoverageFileNameFromTrx(trxFilePath, resultsDirectory);
-            Console.WriteLine($@"Coverage file: {actualCoverageFile}  Results directory: {resultsDirectory} trxfile: {trxFilePath}");
-            Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile);
-        }
-
-        public override string GetConsoleRunnerPath()
-        {
-            string consoleRunnerPath = string.Empty;
-
-            if (this.IsDesktopRunner())
-            {
-                consoleRunnerPath = Path.Combine(nugetPackageFolder, "tools", "net451", "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe");
-            }
-
-            Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: {0}", consoleRunnerPath);
-            return consoleRunnerPath;
-        }
-
-        private string CreateCodeCoverageArguments(
-            RunnerInfo runnerInfo,
-            string assemblyPaths,
-            out string trxFilePath)
-        {
-            string diagFileName = Path.Combine(this.resultsDirectory, "diaglog.txt");
-
-            var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty,
-                this.FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: resultsDirectory);
-
-            arguments = string.Concat(arguments, $" /Diag:{diagFileName}", $" /EnableCodeCoverage");
-
-            trxFilePath = Path.Combine(this.resultsDirectory, Guid.NewGuid() + ".trx");
-            arguments = string.Concat(arguments, " /logger:trx;logfilename=" + trxFilePath);
-
-            return arguments;
-        }
-
-        private static void TryMoveDirectory(string sourceDirName, string destDirName)
-        {
-            if (Directory.Exists(sourceDirName))
-            {
-                Directory.Move(sourceDirName, destDirName);
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CodeCoverageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CodeCoverageTests.cs
deleted file mode 100644
index 711e5a5cb0..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CodeCoverageTests.cs
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.	
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Castle.Core.Internal;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    //Code coverage only supported on windows (based on the message in output)
-    [TestCategory("Windows-Review")]
-    public class CodeCoverageTests : CodeCoverageAcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-        private TestRunAttachmentsProcessingEventHandler testRunAttachmentsProcessingEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-            this.testRunAttachmentsProcessingEventHandler = new TestRunAttachmentsProcessingEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestRunWithCodeCoverage(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            // act
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetCodeCoverageRunSettings(1), new TestPlatformOptions { CollectMetrics = true }, this.runEventHandler);
-
-            // assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-
-            int expectedNumberOfAttachments = 1;
-            Assert.AreEqual(expectedNumberOfAttachments, this.runEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.runEventHandler.Attachments);
-
-            Assert.AreEqual("e5f256dc-7959-4dd6-8e4f-c11150ab28e0", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-            Assert.AreEqual("e5f256dc-7959-4dd6-8e4f-c11150ab28e0", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestRunWithCodeCoverageUsingClrIe(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            // act
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetCodeCoverageRunSettings(1, true), new TestPlatformOptions { CollectMetrics = true }, this.runEventHandler);
-
-            // assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-
-            int expectedNumberOfAttachments = 1;
-            Assert.AreEqual(expectedNumberOfAttachments, this.runEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.runEventHandler.Attachments);
-
-            Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-            Assert.AreEqual("324f817a-7420-4e6d-b3c1-143fbed6d855", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void TestRunWithCodeCoverageParallel(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            // act
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetCodeCoverageRunSettings(4), new TestPlatformOptions { CollectMetrics = true }, this.runEventHandler);
-
-            // assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.runEventHandler.Attachments);
-
-            Assert.AreEqual("e5f256dc-7959-4dd6-8e4f-c11150ab28e0", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CorProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-            Assert.AreEqual("e5f256dc-7959-4dd6-8e4f-c11150ab28e0", this.runEventHandler.Metrics["VS.TestPlatform.DataCollector.CoreClrProfiler.datacollector://microsoft/CodeCoverage/2.0"]);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task TestRunWithCodeCoverageAndAttachmentsProcessing(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
-
-            // act
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, true, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // Assert
-            testRunAttachmentsProcessingEventHandler.EnsureSuccess();
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.testRunAttachmentsProcessingEventHandler.Attachments);
-
-            Assert.IsFalse(testRunAttachmentsProcessingEventHandler.CompleteArgs.IsCanceled);
-            Assert.IsNull(testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
-
-            for (int i = 0; i < testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
-            {
-                VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs progressArgs = testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorIndex);
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorUris.Count);
-                Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-                Assert.AreEqual(1, progressArgs.AttachmentProcessorsCount);
-                if (testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
-                {
-                    Assert.AreEqual(i == 0 ? 50 : 100, progressArgs.CurrentAttachmentProcessorProgress);
-                }
-            }
-
-            Assert.AreEqual("Completed", testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.AttachmentsProcessingState]);
-            Assert.AreEqual(2L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
-            Assert.AreEqual(1L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
-            Assert.IsTrue(testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
-
-            Assert.IsTrue(File.Exists(runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
-            Assert.IsFalse(File.Exists(runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task TestRunWithCodeCoverageAndAttachmentsProcessingNoMetrics(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
-
-            // act
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, false, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // Assert
-            testRunAttachmentsProcessingEventHandler.EnsureSuccess();
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.testRunAttachmentsProcessingEventHandler.Attachments);
-
-            Assert.IsFalse(testRunAttachmentsProcessingEventHandler.CompleteArgs.IsCanceled);
-            Assert.IsNull(testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
-
-            for (int i = 0; i < testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
-            {
-                VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs progressArgs = testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorIndex);
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorUris.Count);
-                Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-                Assert.AreEqual(1, progressArgs.AttachmentProcessorsCount);
-                if (testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 2)
-                {
-                    Assert.AreEqual(i == 0 ? 50 : 100, progressArgs.CurrentAttachmentProcessorProgress);
-                }
-            }
-
-            Assert.IsTrue(testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.IsNullOrEmpty());
-
-            Assert.IsTrue(File.Exists(runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
-            Assert.IsFalse(File.Exists(runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task TestRunWithCodeCoverageAndAttachmentsProcessingModuleDuplicated(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-
-            Assert.AreEqual(9, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(3, this.runEventHandler.Attachments.Count);
-
-            // act
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, true, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // Assert
-            testRunAttachmentsProcessingEventHandler.EnsureSuccess();
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments.Count);
-
-            AssertCoverageResults(this.testRunAttachmentsProcessingEventHandler.Attachments);
-
-            Assert.IsFalse(testRunAttachmentsProcessingEventHandler.CompleteArgs.IsCanceled);
-            Assert.IsNull(testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
-
-            for (int i = 0; i < testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
-            {
-                VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs progressArgs = testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorIndex);
-                Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-                Assert.AreEqual(1, progressArgs.AttachmentProcessorsCount);
-
-                if (testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 3)
-                {
-                    Assert.AreEqual(i == 0 ? 33 : i == 1 ? 66 : 100, progressArgs.CurrentAttachmentProcessorProgress);
-                }
-            }
-
-            Assert.AreEqual("Completed", testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.AttachmentsProcessingState]);
-            Assert.AreEqual(3L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
-            Assert.AreEqual(1L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
-            Assert.IsTrue(testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
-
-            Assert.IsTrue(File.Exists(runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
-            Assert.IsFalse(File.Exists(runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task TestRunWithCodeCoverageAndAttachmentsProcessingSameReportFormat(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), this.runEventHandler);
-
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
-
-            // act
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, true, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // Assert
-            testRunAttachmentsProcessingEventHandler.EnsureSuccess();
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments.Count);
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments.Count);
-            Assert.IsTrue(this.testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[0].Uri.LocalPath.Contains(".coverage"));
-
-            AssertCoverageResults(this.testRunAttachmentsProcessingEventHandler.Attachments);
-
-            Assert.IsFalse(testRunAttachmentsProcessingEventHandler.CompleteArgs.IsCanceled);
-            Assert.IsNull(testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
-
-            for (int i = 0; i < testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
-            {
-                VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs progressArgs = testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorIndex);
-                Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-                Assert.AreEqual(1, progressArgs.AttachmentProcessorsCount);
-
-                if (testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 3)
-                {
-                    Assert.AreEqual(i == 0 ? 33 : i == 1 ? 66 : 100, progressArgs.CurrentAttachmentProcessorProgress);
-                }
-            }
-
-            Assert.AreEqual("Completed", testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.AttachmentsProcessingState]);
-            Assert.AreEqual(2L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
-            Assert.AreEqual(1L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
-            Assert.IsTrue(testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
-
-            Assert.IsTrue(File.Exists(runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
-            Assert.IsFalse(File.Exists(runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task TestRunWithCodeCoverageAndAttachmentsProcessingDifferentReportFormats(RunnerInfo runnerInfo)
-        {
-            // arrange
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Coverage"), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Cobertura"), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1, outputFormat: "Cobertura"), this.runEventHandler);
-
-            Assert.AreEqual(12, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(4, this.runEventHandler.Attachments.Count);
-
-            // act
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, true, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // Assert
-            testRunAttachmentsProcessingEventHandler.EnsureSuccess();
-            Assert.AreEqual(1, this.testRunAttachmentsProcessingEventHandler.Attachments.Count);
-            Assert.AreEqual(2, this.testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments.Count);
-            Assert.IsTrue(this.testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[0].Uri.LocalPath.Contains(".cobertura.xml"));
-            Assert.IsTrue(this.testRunAttachmentsProcessingEventHandler.Attachments[0].Attachments[1].Uri.LocalPath.Contains(".coverage"));
-
-            AssertCoverageResults(this.testRunAttachmentsProcessingEventHandler.Attachments);
-
-            Assert.IsFalse(testRunAttachmentsProcessingEventHandler.CompleteArgs.IsCanceled);
-            Assert.IsNull(testRunAttachmentsProcessingEventHandler.CompleteArgs.Error);
-
-            for (int i = 0; i < testRunAttachmentsProcessingEventHandler.ProgressArgs.Count; i++)
-            {
-                VisualStudio.TestPlatform.ObjectModel.Client.TestRunAttachmentsProcessingProgressEventArgs progressArgs = testRunAttachmentsProcessingEventHandler.ProgressArgs[i];
-                Assert.AreEqual(1, progressArgs.CurrentAttachmentProcessorIndex);
-                Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", progressArgs.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-                Assert.AreEqual(1, progressArgs.AttachmentProcessorsCount);
-
-                if (testRunAttachmentsProcessingEventHandler.ProgressArgs.Count == 3)
-                {
-                    Assert.AreEqual(i == 0 ? 33 : i == 1 ? 66 : 100, progressArgs.CurrentAttachmentProcessorProgress);
-                }
-            }
-
-            Assert.AreEqual("Completed", testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.AttachmentsProcessingState]);
-            Assert.AreEqual(4L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]);
-            Assert.AreEqual(1L, testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]);
-            Assert.IsTrue(testRunAttachmentsProcessingEventHandler.CompleteArgs.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing));
-
-            Assert.IsTrue(File.Exists(runEventHandler.Attachments.First().Attachments.First().Uri.LocalPath));
-            Assert.IsFalse(File.Exists(runEventHandler.Attachments.Last().Attachments.First().Uri.LocalPath));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public async Task EndSessionShouldEnsureVstestConsoleProcessDies(RunnerInfo runnerInfo)
-        {
-            var numOfProcesses = Process.GetProcessesByName("vstest.console").Length;
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(1), this.runEventHandler);
-
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
-
-            await this.vstestConsoleWrapper.ProcessTestRunAttachmentsAsync(runEventHandler.Attachments, null, true, true, testRunAttachmentsProcessingEventHandler, CancellationToken.None);
-
-            // act
-            this.vstestConsoleWrapper?.EndSession();
-
-            // Assert
-            Assert.AreEqual(numOfProcesses, Process.GetProcessesByName("vstest.console").Length);
-
-            this.vstestConsoleWrapper = null;
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            return GetProjects().Select(p => this.GetAssetFullPath(p)).ToList();
-        }
-
-        private IList<string> GetProjects()
-        {
-            return new List<string> { "SimpleTestProject.dll", "SimpleTestProject2.dll" };
-        }
-
-        /// <summary>
-        /// Default RunSettings
-        /// </summary>
-        /// <returns></returns>
-        private string GetCodeCoverageRunSettings(int cpuCount, bool useClrIeInstrumentationEngine = false, string outputFormat = "Coverage")
-        {
-            string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                            <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
-                                            <TestAdaptersPaths>{this.GetNetStandardAdapterPath()}</TestAdaptersPaths>
-                                            <MaxCpuCount>{cpuCount}</MaxCpuCount>
-                                        </RunConfiguration>
-                                        <DataCollectionRunSettings>
-                                            <DataCollectors>
-                                                <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
-                                                    <Configuration>
-                                                      <CLRIEInstrumentationNetCore>{useClrIeInstrumentationEngine}</CLRIEInstrumentationNetCore>
-                                                      <CLRIEInstrumentationNetFramework>{useClrIeInstrumentationEngine}</CLRIEInstrumentationNetFramework>
-                                                      <Format>{outputFormat}</Format>
-                                                      <CodeCoverage>
-                                                        <ModulePaths>
-                                                          <Exclude>
-                                                            <ModulePath>.*CPPUnitTestFramework.*</ModulePath>
-                                                          </Exclude>
-                                                        </ModulePaths>
-
-                                                        <!-- We recommend you do not change the following values: -->
-                                                        <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
-                                                        <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
-                                                        <CollectFromChildProcesses>True</CollectFromChildProcesses>
-                                                        <CollectAspDotNet>False</CollectAspDotNet>
-                                                      </CodeCoverage>
-                                                    </Configuration>
-                                                </DataCollector>
-                                            </DataCollectors>
-                                        </DataCollectionRunSettings>
-                                    </RunSettings>";
-            return runSettingsXml;
-        }
-
-        private void AssertCoverageResults(IList<AttachmentSet> attachments)
-        {
-            if (attachments.Count == 1)
-            {
-                var xmlCoverage = this.GetXmlCoverage(attachments.First().Attachments.First().Uri.LocalPath);
-
-                foreach (var project in this.GetProjects())
-                {
-                    var moduleNode = this.GetModuleNode(xmlCoverage.DocumentElement, project.ToLower());
-                    this.AssertCoverage(moduleNode, CodeCoverageAcceptanceTestBase.ExpectedMinimalModuleCoverage);
-                }
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostLauncher.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostLauncher.cs
deleted file mode 100644
index 7712b11c7c..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostLauncher.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System.Diagnostics;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-
-    /// <summary>
-    /// The custom test host launcher.
-    /// </summary>
-    public class CustomTestHostLauncher : ITestHostLauncher2
-    {
-        public int ProcessId
-        {
-            get;
-            private set;
-        }
-
-        /// <inheritdoc />
-        public bool IsDebug => true;
-
-        public bool AttachDebuggerToProcess(int pid) => this.AttachDebuggerToProcess(pid, CancellationToken.None);
-
-        public bool AttachDebuggerToProcess(int pid, CancellationToken cancellationToken) => true;
-
-        /// <inheritdoc />
-        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
-        {
-            return this.LaunchTestHost(defaultTestHostStartInfo, CancellationToken.None);
-        }
-
-        /// <inheritdoc />
-        public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
-        {
-            var processInfo = new ProcessStartInfo(
-                                      defaultTestHostStartInfo.FileName,
-                                      defaultTestHostStartInfo.Arguments)
-            {
-                WorkingDirectory = defaultTestHostStartInfo.WorkingDirectory
-                                      };
-            processInfo.UseShellExecute = false;
-
-            var process = new Process { StartInfo = processInfo };
-            process.Start();
-
-            if (process != null)
-            {
-                return process.Id;
-            }
-
-            return -1;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs
deleted file mode 100644
index b0b96b43cf..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// The Run Tests using VsTestConsoleWrapper API's
-    /// </summary>
-    [TestClass]
-    public class CustomTestHostTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithCustomTestHostLaunch(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var customTestHostLauncher = new CustomTestHostLauncher();
-            this.vstestConsoleWrapper.RunTestsWithCustomTestHost(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.runEventHandler, customTestHostLauncher);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.IsTrue(customTestHostLauncher.ProcessId != -1);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
deleted file mode 100644
index 5269a27ceb..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-
-    /// <summary>
-    /// The Run Tests using VsTestConsoleWrapper API's
-    /// </summary>
-    [TestClass]
-    public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithNunitAdapter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var sources = new List<string>
-                              {
-                                  this.GetAssetFullPath("NUTestProject.dll")
-                              };
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                this.runEventHandler);
-
-            var testCase =
-                this.runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("PassTestMethod1"));
-
-            // Assert
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-
-            // Release builds optimize code, hence line numbers are different.
-            if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
-            {
-                Assert.AreEqual(11, testCase.FirstOrDefault().TestCase.LineNumber);
-            }
-            else
-            {
-                Assert.AreEqual(10, testCase.FirstOrDefault().TestCase.LineNumber);
-            }
-        }
-
-        [TestMethod]
-        // there are logs in the diagnostic log, it is failing with NullReferenceException because path is null
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            // Xunit >= 2.2 won't support net451, Minimum target framework it supports is net452.
-            string testAssemblyPath = null;
-            if (this.testEnvironment.TargetFramework.Equals("net451"))
-            {
-                testAssemblyPath = testEnvironment.GetTestAsset("XUTestProject.dll", "net46");
-            }
-            else
-            {
-                testAssemblyPath = testEnvironment.GetTestAsset("XUTestProject.dll");
-            }
-
-            var sources = new List<string> { testAssemblyPath };
-            var testAdapterPath = Directory.EnumerateFiles(this.GetTestAdapterPath(UnitTestFramework.XUnit), "*.TestAdapter.dll").ToList();
-            this.vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.FirstOrDefault() });
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                this.runEventHandler);
-
-            var testCase =
-                this.runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("xUnitTestProject.Class1.PassTestMethod1"));
-
-            // Assert
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-
-            // Release builds optimize code, hence line numbers are different.
-            if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
-            {
-                Assert.AreEqual(16, testCase.FirstOrDefault().TestCase.LineNumber);
-            }
-            else
-            {
-                Assert.AreEqual(15, testCase.FirstOrDefault().TestCase.LineNumber);
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void RunTestsWithChutzpahAdapter(RunnerInfo runnerInfo)
-        {
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var sources = new List<string>
-                              {
-                                  Path.Combine(this.testEnvironment.TestAssetsPath, "test.js")
-                              };
-
-            var testAdapterPath = Directory.EnumerateFiles(this.GetTestAdapterPath(UnitTestFramework.Chutzpah), "*.TestAdapter.dll").ToList();
-            this.vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.FirstOrDefault() });
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                this.runEventHandler);
-
-            var testCase =
-                this.runEventHandler.TestResults.Where(tr => tr.TestCase.DisplayName.Equals("TestMethod1"));
-
-            // Assert
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(1, testCase.FirstOrDefault().TestCase.LineNumber);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DiscoverTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DiscoverTests.cs
deleted file mode 100644
index 35dfc4181d..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DiscoverTests.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class DiscoverTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private DiscoveryEventHandler discoveryEventHandler;
-        private DiscoveryEventHandler2 discoveryEventHandler2;
-
-        public void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.discoveryEventHandler = new DiscoveryEventHandler();
-            this.discoveryEventHandler2 = new DiscoveryEventHandler2();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingDiscoveryEventHandler1(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.discoveryEventHandler);
-
-            // Assert.
-            Assert.AreEqual(6, this.discoveryEventHandler.DiscoveredTestCases.Count);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedOut(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(
-               this.GetTestAssemblies(),
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { CollectMetrics = false },
-                this.discoveryEventHandler2);
-
-            // Assert.
-            Assert.AreEqual(6, this.discoveryEventHandler2.DiscoveredTestCases.Count);
-            Assert.AreEqual(0, this.discoveryEventHandler2.Metrics.Count);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedIn(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.discoveryEventHandler2);
-
-            // Assert.
-            Assert.AreEqual(6, this.discoveryEventHandler2.DiscoveredTestCases.Count);
-            Assert.IsTrue(this.discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.TargetDevice));
-            Assert.IsTrue(this.discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests));
-            Assert.IsTrue(this.discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecByAllAdapters));
-            Assert.IsTrue(this.discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForDiscovery));
-            Assert.IsTrue(this.discoveryEventHandler2.Metrics.ContainsKey(TelemetryDataConstants.DiscoveryState));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingEventHandler2AndBatchSize(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <BatchSize>3</BatchSize>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-
-            this.vstestConsoleWrapper.DiscoverTests(
-               this.GetTestAssemblies(),
-                runSettingsXml,
-                null,
-                discoveryEventHandlerForBatchSize);
-
-            // Assert.
-            Assert.AreEqual(6, discoveryEventHandlerForBatchSize.DiscoveredTestCases.Count);
-            Assert.AreEqual(3, discoveryEventHandlerForBatchSize.BatchSize);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingEventHandler1AndBatchSize(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <BatchSize>3</BatchSize>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-
-            this.vstestConsoleWrapper.DiscoverTests(
-               this.GetTestAssemblies(),
-                runSettingsXml,
-                discoveryEventHandlerForBatchSize);
-
-            // Assert.
-            Assert.AreEqual(6, discoveryEventHandlerForBatchSize.DiscoveredTestCases.Count);
-            Assert.AreEqual(3, discoveryEventHandlerForBatchSize.BatchSize);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingSourceNavigation(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(
-               this.GetTestAssemblies(),
-                this.GetDefaultRunSettings(),
-                this.discoveryEventHandler);
-
-            // Assert.
-            var testCase =
-                this.discoveryEventHandler.DiscoveredTestCases.Where(dt => dt.FullyQualifiedName.Equals("SampleUnitTestProject.UnitTest1.PassingTest"));
-
-            // Release builds optimize code, hence line numbers are different.
-            if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
-            {
-                Assert.AreEqual(23, testCase.FirstOrDefault().LineNumber);
-            }
-            else
-            {
-                Assert.AreEqual(22, testCase.FirstOrDefault().LineNumber);
-            }
-        }
-
-        [TestMethod]
-        // flaky on the desktop runner, desktop framework combo
-        [NetFullTargetFrameworkDataSource(useDesktopRunner: false)]
-        [NetCoreTargetFrameworkDataSource]
-        public void CancelTestDiscovery(RunnerInfo runnerInfo)
-        {
-            // Setup
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("DiscoveryTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var discoveredTests = new List<TestCase>();
-            var discoveryEvents = new Mock<ITestDiscoveryEventsHandler>();
-            discoveryEvents.Setup((events) => events.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback
-                ((IEnumerable<TestCase> testcases) => { discoveredTests.AddRange(testcases); });
-
-            // Act
-            var discoveryTask = Task.Run(() =>
-            {
-                this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), discoveryEvents.Object);
-            });
-
-            Task.Delay(2000).Wait();
-            vstestConsoleWrapper.CancelDiscovery();
-            discoveryTask.Wait();
-
-            // Assert.
-            int discoveredSources = discoveredTests.Select((testcase) => testcase.Source).Distinct().Count();
-            Assert.AreNotEqual(testAssemblies.Count, discoveredSources, "All test assemblies discovered");
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs
deleted file mode 100644
index e6e72e7a24..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <inheritdoc />
-    public class DiscoveryEventHandler : ITestDiscoveryEventsHandler
-    {
-        /// <summary>
-        /// Gets the discovered test cases.
-        /// </summary>
-        public List<TestCase> DiscoveredTestCases { get;}
-
-        public DiscoveryEventHandler()
-        {
-            this.DiscoveredTestCases = new List<TestCase>();
-        }
-
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            if (discoveredTestCases != null)
-            {
-                this.DiscoveredTestCases.AddRange(discoveredTestCases);
-            }
-        }
-
-        public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase> lastChunk, bool isAborted)
-        {
-            if (lastChunk != null)
-            {
-                this.DiscoveredTestCases.AddRange(lastChunk);
-            }
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            // No Op
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No op
-        }
-    }
-
-    public struct TestMessage
-    {
-        public TestMessageLevel testMessageLevel;
-        public string message;
-
-        public TestMessage(TestMessageLevel testMessageLevel, string message)
-        {
-            this.testMessageLevel = testMessageLevel;
-            this.message = message;
-        }
-    }
-
-    /// <inheritdoc />
-    public class DiscoveryEventHandler2 : ITestDiscoveryEventsHandler2
-    {
-        /// <summary>
-        /// Gets the discovered test cases.
-        /// </summary>
-        public List<TestCase> DiscoveredTestCases { get; }
-
-        public List<TestMessage> testMessages;
-
-        /// <summary>
-        /// Gets the metrics.
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; private set; }
-
-        public DiscoveryEventHandler2()
-        {
-            this.DiscoveredTestCases = new List<TestCase>();
-            this.testMessages = new List<TestMessage>();
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No Op
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.testMessages.Add(new TestMessage(level, message));
-        }
-
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            if (lastChunk != null)
-            {
-                this.DiscoveredTestCases.AddRange(lastChunk);
-            }
-
-            this.Metrics = discoveryCompleteEventArgs.Metrics;
-        }
-
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            if (discoveredTestCases != null)
-            {
-                this.DiscoveredTestCases.AddRange(discoveredTestCases);
-            }
-        }
-    }
-
-    /// Discovery Event Handler for batch size
-    public class DiscoveryEventHandlerForBatchSize : ITestDiscoveryEventsHandler2, ITestDiscoveryEventsHandler
-    {
-        /// <summary>
-        /// Gets the batch size.
-        /// </summary>
-        public long BatchSize { get; private set; }
-
-        /// <summary>
-        /// Gets the discovered test cases.
-        /// </summary>
-        public List<TestCase> DiscoveredTestCases { get; }
-
-        public DiscoveryEventHandlerForBatchSize()
-        {
-            this.DiscoveredTestCases = new List<TestCase>();
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No Op
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            // No Op
-        }
-
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            if (lastChunk != null)
-            {
-                this.DiscoveredTestCases.AddRange(lastChunk);
-            }
-        }
-
-        public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase> lastChunk, bool isAborted)
-        {
-            if (lastChunk != null)
-            {
-                this.DiscoveredTestCases.AddRange(lastChunk);
-            }
-        }
-
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            if (discoveredTestCases != null && discoveredTestCases.Any())
-            {
-                this.DiscoveredTestCases.AddRange(discoveredTestCases);
-                this.BatchSize = discoveredTestCases.Count();
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/RunEventHandler.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/RunEventHandler.cs
deleted file mode 100644
index c4bd80e385..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/RunEventHandler.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <inheritdoc />
-    public class RunEventHandler : ITestRunEventsHandler2
-    {
-        /// <summary>
-        /// Gets the test results.
-        /// </summary>
-        public List<TestResult> TestResults { get; private set; }
-
-        /// <summary>
-        /// Gets the attachments.
-        /// </summary>
-        public List<AttachmentSet> Attachments { get; private set; }
-
-        /// <summary>
-        /// Gets the metrics.
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; private set; }
-
-        /// <summary>
-        /// Gets the log message.
-        /// </summary>
-        public string LogMessage { get; private set; }
-
-        public List<string> Errors { get; set; }
-
-        /// <summary>
-        /// Gets the test message level.
-        /// </summary>
-        public TestMessageLevel TestMessageLevel { get; private set; }
-
-        public RunEventHandler()
-        {
-            this.TestResults = new List<TestResult>();
-            this.Errors = new List<string>();
-            this.Attachments = new List<AttachmentSet>();
-        }
-
-        public void EnsureSuccess()
-        {
-            if (this.Errors.Any())
-            {
-                throw new InvalidOperationException($"Test run reported errors:{Environment.NewLine}{string.Join(Environment.NewLine + Environment.NewLine, this.Errors)}");
-            }
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.LogMessage = message;
-            this.TestMessageLevel = level;
-            if (level == TestMessageLevel.Error) {
-                this.Errors.Add(message);
-            }
-        }
-
-        public void HandleTestRunComplete(
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
-        {
-            if (lastChunkArgs != null && lastChunkArgs.NewTestResults != null)
-            {
-                this.TestResults.AddRange(lastChunkArgs.NewTestResults);
-            }
-
-            if (testRunCompleteArgs.AttachmentSets != null)
-            {
-                this.Attachments.AddRange(testRunCompleteArgs.AttachmentSets);
-            }
-
-            this.Metrics = testRunCompleteArgs.Metrics;
-        }
-
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
-        {
-            if (testRunChangedArgs != null && testRunChangedArgs.NewTestResults != null)
-            {
-                this.TestResults.AddRange(testRunChangedArgs.NewTestResults);
-            }
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No op
-        }
-
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
-        {
-            // No op
-            return -1;
-        }
-
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            // No op
-            return true;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs
deleted file mode 100644
index 8a0b6513c6..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/TestRunAttachmentsProcessingEventHandler.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <inheritdoc />
-    public class TestRunAttachmentsProcessingEventHandler : ITestRunAttachmentsProcessingEventsHandler
-    {
-        public List<AttachmentSet> Attachments { get; private set; }
-
-        public TestRunAttachmentsProcessingCompleteEventArgs CompleteArgs { get; private set; }
-
-        public List<TestRunAttachmentsProcessingProgressEventArgs> ProgressArgs { get; private set; }
-
-        /// <summary>
-        /// Gets the log message.
-        /// </summary>
-        public string LogMessage { get; private set; }
-
-        public List<string> Errors { get; set; }
-
-        /// <summary>
-        /// Gets the test message level.
-        /// </summary>
-        public TestMessageLevel TestMessageLevel { get; private set; }
-
-        public TestRunAttachmentsProcessingEventHandler()
-        {
-            this.Errors = new List<string>();
-            this.Attachments = new List<AttachmentSet>();
-            this.ProgressArgs = new List<TestRunAttachmentsProcessingProgressEventArgs>();
-        }
-
-        public void EnsureSuccess()
-        {
-            if (this.Errors.Any())
-            {
-                throw new InvalidOperationException($"Test run reported errors:{Environment.NewLine}{string.Join(Environment.NewLine + Environment.NewLine, this.Errors)}");
-            }
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.LogMessage = message;
-            this.TestMessageLevel = level;
-            if (level == TestMessageLevel.Error) 
-            {
-                this.Errors.Add(message);
-            }
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No op
-        }
-
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
-        {
-            // No op
-            return -1;
-        }
-
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            // No op
-            return true;
-        }
-
-        public void HandleTestRunAttachmentsProcessingComplete(ICollection<AttachmentSet> attachments)
-        {
-            if(attachments != null)
-            {
-                this.Attachments.AddRange(attachments);
-            }
-        }
-
-        public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk)
-        {
-            if (lastChunk != null)
-            {
-                this.Attachments.AddRange(lastChunk);
-            }
-
-            if (attachmentsProcessingCompleteEventArgs.Error != null)
-            {
-                Errors.Add(attachmentsProcessingCompleteEventArgs.Error.Message);
-            }
-
-            CompleteArgs = attachmentsProcessingCompleteEventArgs;
-        }
-
-        public void HandleProcessedAttachmentsChunk(IEnumerable<AttachmentSet> attachments)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs)
-        {
-            ProgressArgs.Add(AttachmentsProcessingProgressEventArgs);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/LiveUnitTestingTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/LiveUnitTestingTests.cs
deleted file mode 100644
index f6f1e97cab..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/LiveUnitTestingTests.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    [TestClass]
-    public class LiveUnitTestingTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private DiscoveryEventHandler discoveryEventHandler;
-        private DiscoveryEventHandler2 discoveryEventHandler2;
-        private RunEventHandler runEventHandler;
-
-        public void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.discoveryEventHandler = new DiscoveryEventHandler();
-            this.discoveryEventHandler2 = new DiscoveryEventHandler2();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void DiscoverTestsUsingLiveUnitTesting(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <DisableAppDomain>true</DisableAppDomain>
-                                        <DisableParallelization>true</DisableParallelization>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-
-            this.vstestConsoleWrapper.DiscoverTests(
-               this.GetTestAssemblies(),
-                runSettingsXml,
-                this.discoveryEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.discoveryEventHandler.DiscoveredTestCases.Count);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithLiveUnitTesting(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <DisableAppDomain>true</DisableAppDomain>
-                                        <DisableParallelization>true</DisableParallelization>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-
-            this.vstestConsoleWrapper.RunTests(
-                this.GetTestAssemblies(),
-                runSettingsXml,
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunSelectedTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunSelectedTests.cs
deleted file mode 100644
index eea46f5c9c..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunSelectedTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class RunSelectedTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-        private DiscoveryEventHandler discoveryEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-            this.discoveryEventHandler = new DiscoveryEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithoutTestPlatformOptions(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.discoveryEventHandler);
-            var testCases = this.discoveryEventHandler.DiscoveredTestCases;
-
-            this.vstestConsoleWrapper.RunTests(testCases, this.GetDefaultRunSettings(), this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunSelectedTestsWithTestPlatformOptions(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.discoveryEventHandler);
-            var testCases = this.discoveryEventHandler.DiscoveredTestCases;
-
-            this.vstestConsoleWrapper.RunTests(
-                testCases,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { CollectMetrics = true },
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetDevice));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetFramework));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetOS));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForRun));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.RunState));
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs
deleted file mode 100644
index 485eddef3b..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <summary>
-    /// The Run Tests using VsTestConsoleWrapper API's
-    /// </summary>
-    [TestClass]
-    public class RunTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunAllTests(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void EndSessionShouldEnsureVstestConsoleProcessDies(RunnerInfo runnerInfo)
-        {
-            var numOfProcesses = Process.GetProcessesByName("vstest.console").Length;
-
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.runEventHandler);
-            this.vstestConsoleWrapper?.EndSession();
-
-            // Assert
-            Assert.AreEqual(numOfProcesses, Process.GetProcessesByName("vstest.console").Length);
-
-            this.vstestConsoleWrapper = null;
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithTelemetryOptedIn(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(
-                this.GetTestAssemblies(),
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { CollectMetrics = true },
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetDevice));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetFramework));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TargetOS));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.TimeTakenInSecForRun));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution));
-            Assert.IsTrue(this.runEventHandler.Metrics.ContainsKey(TelemetryDataConstants.RunState));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithTelemetryOptedOut(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            this.vstestConsoleWrapper.RunTests(
-                this.GetTestAssemblies(),
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { CollectMetrics = false },
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(0, this.runEventHandler.Metrics.Count);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsShouldThrowOnStackOverflowException(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase))
-            {
-                // On release, x64 builds, recursive calls may be replaced with loops (tail call optimization)
-                Assert.Inconclusive("On StackOverflowException testhost not exited in release configuration.");
-                return;
-            }
-
-            var source = new[] { this.GetAssetFullPath("SimpleTestProject3.dll") };
-
-            this.vstestConsoleWrapper.RunTests(
-                source,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { TestCaseFilter = "ExitWithStackoverFlow" },
-                this.runEventHandler);
-
-            var errorMessage = runnerInfo.TargetFramework == "net451"
-                ? $"The active test run was aborted. Reason: Test host process crashed : Process is terminated due to StackOverflowException.{Environment.NewLine}"
-                : $"The active test run was aborted. Reason: Test host process crashed : Process is terminating due to StackOverflowException.{Environment.NewLine}";
-
-            Assert.AreEqual(errorMessage, this.runEventHandler.LogMessage);
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
-        [NetCoreTargetFrameworkDataSource(useCoreRunner: false)]
-        public void RunTestsShouldShowProperWarningOnNoTestsForTestCaseFilter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var testAssemblyName = "SimpleTestProject2.dll";
-            var source = new List<string>() { this.GetAssetFullPath(testAssemblyName) };
-
-            var veryLongTestCaseFilter =
-                "FullyQualifiedName=VeryLongTestCaseNameeeeeeeeeeeeee" +
-                "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
-                "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
-                "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" +
-                "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-
-            this.vstestConsoleWrapper.RunTests(
-                source,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { TestCaseFilter = veryLongTestCaseFilter },
-                this.runEventHandler);
-
-            var expectedFilter = veryLongTestCaseFilter.Substring(0, 256) + "...";
-
-            // Assert
-            StringAssert.StartsWith(this.runEventHandler.LogMessage, $"No test matches the given testcase filter `{expectedFilter}` in");
-            StringAssert.EndsWith(this.runEventHandler.LogMessage, testAssemblyName);
-
-            Assert.AreEqual(TestMessageLevel.Warning, this.runEventHandler.TestMessageLevel);
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
deleted file mode 100644
index f432c4a160..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using global::TestPlatform.TestUtilities;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Threading;
-
-    /// <summary>
-    /// The Run Tests using VsTestConsoleWrapper API's
-    /// </summary>
-    [TestClass]
-    public class RunTestsWithDifferentConfigurationTests : AcceptanceTestBase
-    {
-        private const string Netcoreapp = "netcoreapp";
-        private const string Message = "VsTestConsoleWrapper does not support .Net Core Runner";
-
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithTestAdapterPath(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var testAdapterPath = Directory.EnumerateFiles(this.GetTestAdapterPath(), "*.TestAdapter.dll").ToList();
-            this.vstestConsoleWrapper.InitializeExtensions(new List<string>() { testAdapterPath.FirstOrDefault() });
-
-            this.vstestConsoleWrapper.RunTests(
-                this.GetTestAssemblies(),
-                this.GetDefaultRunSettings(),
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithRunSettingsWithParallel(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion>
-                                        <MaxCpuCount>2</MaxCpuCount>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-
-            var testHostNames = new[] { "testhost", "testhost.x86", "dotnet" };
-            int expectedNumOfProcessCreated = 2;
-
-            var cts = new CancellationTokenSource();
-            var numOfProcessCreatedTask = NumberOfProcessLaunchedUtility.NumberOfProcessCreated(
-                cts,
-                testHostNames);
-
-            this.vstestConsoleWrapper.RunTests(
-                this.GetTestAssemblies(),
-                runSettingsXml,
-                this.runEventHandler);
-
-            cts.Cancel();
-
-            // Assert
-            this.runEventHandler.EnsureSuccess();
-            Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-            Assert.AreEqual(
-                expectedNumOfProcessCreated,
-                numOfProcessCreatedTask.Result.Count,
-                $"Number of '{ string.Join(", ", testHostNames) }' process created, expected: {expectedNumOfProcessCreated} actual: {numOfProcessCreatedTask.Result.Count} ({ string.Join(", ", numOfProcessCreatedTask.Result) })");
-        }
-
-        [TestMethod]
-        [TestCategory("Windows-Review")]
-        [NetFullTargetFrameworkDataSource]
-        public void RunTestsWithTestSettings(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
-            this.Setup();
-
-            var testsettingsFile = Path.Combine(Path.GetTempPath(), "tempsettings.testsettings");
-            string testSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?><TestSettings></TestSettings>";
-
-            File.WriteAllText(testsettingsFile, testSettingsXml, Encoding.UTF8);
-            var runSettings = $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{FrameworkArgValue}</TargetFrameworkVersion></RunConfiguration><MSTest><SettingsFile>" + testsettingsFile + "</SettingsFile></MSTest></RunSettings>";
-            var sources = new List<string>
-                              {
-                                  this.GetAssetFullPath("MstestV1UnitTestProject.dll")
-                              };
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                runSettings,
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(5, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
-
-            File.Delete(testsettingsFile);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithX64Source(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var sources = new List<string>
-                              {
-                                  this.GetAssetFullPath("SimpleTestProject3.dll")
-                              };
-
-
-            int expectedNumOfProcessCreated = 1;
-            var testhostProcessNames = new[] { "testhost", "dotnet" };
-
-            var cts = new CancellationTokenSource();
-            var numOfProcessCreatedTask = NumberOfProcessLaunchedUtility.NumberOfProcessCreated(
-                cts, testhostProcessNames);
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName = SampleUnitTestProject3.UnitTest1.WorkingDirectoryTest" },
-                this.runEventHandler);
-
-            cts.Cancel();
-
-            // Assert
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            var numberOfProcessCreated = numOfProcessCreatedTask.Result;
-            Assert.AreEqual(
-                expectedNumOfProcessCreated,
-                numberOfProcessCreated.Count,
-                $"Number of { string.Join(" ,", testhostProcessNames) } process created, expected: {expectedNumOfProcessCreated} actual: {numberOfProcessCreated.Count} ({ string.Join(", ", numberOfProcessCreated) })");
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs
deleted file mode 100644
index cc3c782561..0000000000
--- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
-{
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// The Run Tests using VsTestConsoleWrapper API's
-    /// </summary>
-    [TestClass]
-    public class RunTestsWithFilterTests : AcceptanceTestBase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        private void Setup()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.vstestConsoleWrapper?.EndSession();
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithTestCaseFilter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var sources = new List<string>
-                              {
-                                  this.GetAssetFullPath("SimpleTestProject.dll")
-                              };
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName=SampleUnitTestProject.UnitTest1.PassingTest" },
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(TestOutcome.Passed, this.runEventHandler.TestResults.FirstOrDefault().Outcome);
-        }
-
-        [TestMethod]
-        [NetFullTargetFrameworkDataSource]
-        [NetCoreTargetFrameworkDataSource]
-        public void RunTestsWithFastFilter(RunnerInfo runnerInfo)
-        {
-            AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.Setup();
-
-            var sources = new List<string>
-                              {
-                                  this.GetAssetFullPath("SimpleTestProject.dll")
-                              };
-
-            this.vstestConsoleWrapper.RunTests(
-                sources,
-                this.GetDefaultRunSettings(),
-                new TestPlatformOptions() { TestCaseFilter = "FullyQualifiedName=SampleUnitTestProject.UnitTest1.PassingTest | FullyQualifiedName=SampleUnitTestProject.UnitTest1.FailingTest" },
-                this.runEventHandler);
-
-            // Assert
-            Assert.AreEqual(2, this.runEventHandler.TestResults.Count);
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
-            Assert.AreEqual(1, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
-        }
-
-        private IList<string> GetTestAssemblies()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         this.GetAssetFullPath("SimpleTestProject.dll"),
-                                         this.GetAssetFullPath("SimpleTestProject2.dll")
-                                     };
-
-            return testAssemblies;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/FindMethodExtensions.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/FindMethodExtensions.cs
index 8455bcb5f2..d20d4f2ef0 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/FindMethodExtensions.cs
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/FindMethodExtensions.cs
@@ -1,101 +1,99 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
+
+internal static class FindMethodExtensions
 {
-    using Microsoft.CodeAnalysis;
+    private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Reflection;
+    internal static MethodInfo? FindMethod(this Type type, string signature)
+        => type.FindMembers(MemberTypes.Method, PrivateBindingFlags,
+            (mbr, sig) => mbr.ToString() == (string?)sig, signature).FirstOrDefault() as MethodInfo;
 
-    internal static class FindMethodExtensions
+    internal static IMethodSymbol FindMethod(
+        this INamedTypeSymbol type,
+        string methodName,
+        int methodGenericArity = -1,
+        params ITypeSymbol[] methodParameterTypes)
     {
-        private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
-        internal static MethodInfo FindMethod(this Type type, string signature)
-            => type.FindMembers(MemberTypes.Method, PrivateBindingFlags,
-                    (mbr, sig) => mbr.ToString() == (string)sig, signature).FirstOrDefault() as MethodInfo;
+        var candidates = GetCandidateMethods(type, methodName);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
 
-        internal static IMethodSymbol FindMethod(
-            this INamedTypeSymbol type,
-            string methodName,
-            int methodGenericArity = -1,
-            params ITypeSymbol[] methodParameterTypes)
+        if (methodGenericArity != -1)
         {
-            var candidates = GetCandidateMethods(type, methodName);
+            candidates = candidates.Where(m => m.Arity == methodGenericArity);
             if (candidates.Any() && !candidates.Skip(1).Any())
             {
                 return candidates.Single();
             }
-
-            if (methodGenericArity != -1)
-            {
-                candidates = candidates.Where(m => m.Arity == methodGenericArity);
-                if (candidates.Any() && !candidates.Skip(1).Any())
-                {
-                    return candidates.Single();
-                }
-            }
-
-            if (methodParameterTypes != null && methodParameterTypes.Length >= 0)
-            {
-                candidates = candidates.Where(m => m.Parameters.Length == methodParameterTypes.Length);
-                if (candidates.Any() && !candidates.Skip(1).Any())
-                {
-                    return candidates.Single();
-                }
-
-                candidates = candidates.Where(m => m.Parameters.Select(p => p.Type).SequenceEqual(methodParameterTypes));
-            }
-
-            Debug.Assert(candidates.Any() && !candidates.Skip(1).Any());
-            return candidates.SingleOrDefault();
         }
 
-        internal static IMethodSymbol FindMethod(
-            this INamedTypeSymbol type,
-            string methodName,
-            int methodGenericArity,
-            int methodParameterCount,
-            Func<IMethodSymbol, bool> selector)
+        if (methodParameterTypes != null && methodParameterTypes.Length >= 0)
         {
-            var candidates = GetCandidateMethods(type, methodName);
+            candidates = candidates.Where(m => m.Parameters.Length == methodParameterTypes.Length);
             if (candidates.Any() && !candidates.Skip(1).Any())
             {
                 return candidates.Single();
             }
 
-            candidates = candidates.Where(m => m.Arity == methodGenericArity);
-            if (candidates.Any() && !candidates.Skip(1).Any())
-            {
-                return candidates.Single();
-            }
+            candidates = candidates.Where(m => m.Parameters.Select(p => p.Type).SequenceEqual(methodParameterTypes));
+        }
 
-            candidates = candidates.Where(m => m.Parameters.Length == methodParameterCount);
-            if (candidates.Any() && !candidates.Skip(1).Any())
-            {
-                return candidates.Single();
-            }
+        TPDebug.Assert(candidates.Any() && !candidates.Skip(1).Any());
+        return candidates.Single();
+    }
 
-            candidates = candidates.Where(selector);
+    internal static IMethodSymbol FindMethod(
+        this INamedTypeSymbol type,
+        string methodName,
+        int methodGenericArity,
+        int methodParameterCount,
+        Func<IMethodSymbol, bool> selector)
+    {
+        var candidates = GetCandidateMethods(type, methodName);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
+        }
 
-            Debug.Assert(candidates.Any() && !candidates.Skip(1).Any());
-            return candidates.SingleOrDefault();
+        candidates = candidates.Where(m => m.Arity == methodGenericArity);
+        if (candidates.Any() && !candidates.Skip(1).Any())
+        {
+            return candidates.Single();
         }
 
-        private static IEnumerable<IMethodSymbol> GetCandidateMethods(INamedTypeSymbol type, string methodName)
+        candidates = candidates.Where(m => m.Parameters.Length == methodParameterCount);
+        if (candidates.Any() && !candidates.Skip(1).Any())
         {
-            var candidates = type.GetMembers(methodName).OfType<IMethodSymbol>();
+            return candidates.Single();
+        }
 
-            if (type.BaseType != null && type.BaseType.SpecialType != SpecialType.System_Object)
-            {
-                candidates = candidates.Union(GetCandidateMethods(type.BaseType, methodName));
-            }
+        candidates = candidates.Where(selector);
+
+        TPDebug.Assert(candidates.Any() && !candidates.Skip(1).Any());
+        return candidates.Single();
+    }
 
-            return candidates;
+    private static IEnumerable<IMethodSymbol> GetCandidateMethods(INamedTypeSymbol type, string methodName)
+    {
+        var candidates = type.GetMembers(methodName).OfType<IMethodSymbol>();
+
+        if (type.BaseType != null && type.BaseType.SpecialType != SpecialType.System_Object)
+        {
+            candidates = candidates.Union(GetCandidateMethods(type.BaseType, methodName));
         }
+
+        return candidates;
     }
 }
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameGeneratorTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameGeneratorTests.cs
new file mode 100644
index 0000000000..20abdbedab
--- /dev/null
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameGeneratorTests.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using TestClasses;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
+
+[TestClass]
+public class ManagedNameGeneratorTests
+{
+    [TestMethod]
+    public void Namespaceless_ClassMembers_ShouldNotReportANamespace()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessClass).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName);
+
+        // Assert
+        Assert.AreEqual("NamespacelessClass", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+    }
+
+    [TestMethod]
+    public void Namespaceless_RecordMembers_ShouldNotReportANamespace()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessRecord).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName);
+
+        // Assert
+        Assert.AreEqual("NamespacelessRecord", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+    }
+
+    [TestMethod]
+    public void Namespaceless_InnerClassMembers_ShouldNotReportANamespace()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessClass.Inner).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName);
+
+        // Assert
+        Assert.AreEqual("NamespacelessClass+Inner", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+    }
+
+    [TestMethod]
+    public void Namespaceless_InnerRecordMembers_ShouldNotReportANamespace()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessRecord.Inner).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName);
+
+        // Assert
+        Assert.AreEqual("NamespacelessRecord+Inner", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+    }
+
+    [TestMethod]
+    public void Namespaceless_ClassMembers_ShouldNotReportANamespace_InHierarchy()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessClass).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName, out var hierarchyValues);
+
+        // Assert
+        Assert.AreEqual("NamespacelessClass", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+        Assert.IsNull(hierarchyValues[HierarchyConstants.Levels.NamespaceIndex]);
+    }
+
+    [TestMethod]
+    public void Namespaceless_RecordMembers_ShouldNotReportANamespace_InHierarch()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessRecord).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName, out var hierarchyValues);
+
+        // Assert
+        Assert.AreEqual("NamespacelessRecord", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+        Assert.IsNull(hierarchyValues[HierarchyConstants.Levels.NamespaceIndex]);
+    }
+
+    [TestMethod]
+    public void Namespaceless_InnerClassMembers_ShouldNotReportANamespace_InHierarchy()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessClass.Inner).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName, out var hierarchyValues);
+
+        // Assert
+        Assert.AreEqual("NamespacelessClass+Inner", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+        Assert.IsNull(hierarchyValues[HierarchyConstants.Levels.NamespaceIndex]);
+    }
+
+    [TestMethod]
+    public void Namespaceless_InnerRecordMembers_ShouldNotReportANamespace_InHierarchy()
+    {
+        // Arrange
+        var methodBase = typeof(global::NamespacelessRecord.Inner).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName, out var hierarchyValues);
+
+        // Assert
+        Assert.AreEqual("NamespacelessRecord+Inner", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+        Assert.IsNull(hierarchyValues[HierarchyConstants.Levels.NamespaceIndex]);
+    }
+
+    [TestMethod]
+    public void SpecialCharacters_HierarchyShouldNotWrapMembersWithSpecialCharactersInSingleQuotes()
+    {
+        var methodBase = typeof(Class狧麱狵錋狾龍龪啊阿埃挨哎唉0u㐀㐁㐂㐃㐄㐅㐆㐇6ⅶ０ǒoU1U2U38丂丄丅丆丏丒丟).GetMethod("Method0")!;
+
+        // Act
+        ManagedNameHelper.GetManagedName(methodBase, out var managedTypeName, out var managedMethodName, out var _);
+
+        // Assert
+        Assert.AreEqual("TestClasses.Class狧麱狵錋狾龍龪啊阿埃挨哎唉0u㐀㐁㐂㐃㐄㐅㐆㐇6ⅶ０ǒoU1U2U38丂丄丅丆丏丒丟", managedTypeName);
+        Assert.AreEqual("Method0", managedMethodName);
+    }
+
+}
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameParserTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameParserTests.cs
index 289d9d604a..826de8e0d1 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameParserTests.cs
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameParserTests.cs
@@ -1,74 +1,81 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests
-{
-    using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
 
-    [TestClass]
-    public class ManagedNameParserTests
+[TestClass]
+public class ManagedNameParserTests
+{
+    [TestMethod]
+    public void ParseTypeName()
     {
-        [TestMethod]
-        public void ParseTypeName()
+        static (string, string) Parse(string managedTypeName)
         {
-            (string, string) Parse(string managedTypeName)
-            {
-                ManagedNameParser.ParseManagedTypeName(managedTypeName, out var namespaceName, out var typeName);
-                return (namespaceName, typeName);
-            }
+            ManagedNameParser.ParseManagedTypeName(managedTypeName, out var namespaceName, out var typeName);
+            return (namespaceName, typeName);
+        }
 
-            Assert.AreEqual(("NS", "Class"), Parse("NS.Class"));
-            Assert.AreEqual(("NS.NS", "Class"), Parse("NS.NS.Class"));
-            Assert.AreEqual(("NS.NS", "Class`2"), Parse("NS.NS.Class`2"));
-            Assert.AreEqual(("NS.NS", "ClassA`2+ClassInner"), Parse("NS.NS.ClassA`2+ClassInner"));
-            Assert.AreEqual(("NS.NS", "ClassA`2+ClassInner`1"), Parse("NS.NS.ClassA`2+ClassInner`1"));
-            Assert.AreEqual(("", "ClassA`2+ClassInner`1"), Parse("ClassA`2+ClassInner`1"));
+        Assert.AreEqual(("NS", "Class"), Parse("NS.Class"));
+        Assert.AreEqual(("NS.NS", "Class"), Parse("NS.NS.Class"));
+        Assert.AreEqual(("NS.NS", "Class`2"), Parse("NS.NS.Class`2"));
+        Assert.AreEqual(("NS.NS", "ClassA`2+ClassInner"), Parse("NS.NS.ClassA`2+ClassInner"));
+        Assert.AreEqual(("NS.NS", "ClassA`2+ClassInner`1"), Parse("NS.NS.ClassA`2+ClassInner`1"));
+        Assert.AreEqual(("", "ClassA`2+ClassInner`1"), Parse("ClassA`2+ClassInner`1"));
+    }
+
+    [TestMethod]
+    public void ParseMethodName()
+    {
+        (string, int, string[]?) Parse(string managedMethodName)
+        {
+            ManagedNameParser.ParseManagedMethodName(managedMethodName, out var method, out var arity, out var parameterTypes);
+            return (method, arity, parameterTypes);
         }
 
-        [TestMethod]
-        public void ParseMethodName()
+        void AssertParse(string expectedMethod, int expectedArity, string[] expectedParams, string expression)
         {
-            (string, int, string[]) Parse(string managedMethodName)
-            {
-                ManagedNameParser.ParseManagedMethodName(managedMethodName, out var method, out var arity, out var parameterTypes);
-                return (method, arity, parameterTypes);
-            }
+            var (method, arity, parameters) = Parse(expression);
+            Assert.AreEqual(expectedMethod, method);
+            Assert.AreEqual(expectedArity, arity);
+            CollectionAssert.AreEqual(expectedParams, parameters, "parameter comparison");
+        }
 
-            void AssertParse(string expectedMethod, int expectedArity, string[] expectedParams, string expression)
-            {
-                var (method, arity, parameters) = Parse(expression);
-                Assert.AreEqual(expectedMethod, method);
-                Assert.AreEqual(expectedArity, arity);
-                CollectionAssert.AreEqual(expectedParams, parameters, "parameter comparison");
-            }
+        Assert.AreEqual(("Method", 0, null), Parse("Method"));
+        Assert.AreEqual(("Method", 0, null), Parse("Method()"));
+        Assert.AreEqual(("Method<A,B>", 2, null), Parse("Method<A,B>`2()"));
+        AssertParse("Method", 0, ["System.Int32"], "Method(System.Int32)");
+        AssertParse("Method", 0, ["TypeA", "List<B>"], "Method(TypeA,List<B>)");
+        AssertParse("Method", 1, ["B", "List<B>"], "Method`1(B,List<B>)");
+        AssertParse("Method", 0, ["B[]"], "Method(B[])");
+        AssertParse("Method", 0, ["A[,]", "B[,,][]"], "Method(A[,],B[,,][])");
 
-            Assert.AreEqual(("Method", 0, null), Parse("Method"));
-            Assert.AreEqual(("Method", 0, null), Parse("Method()"));
-            Assert.AreEqual(("Method<A,B>", 2, null), Parse("Method<A,B>`2()"));
-            AssertParse("Method", 0, new string[] { "System.Int32" }, "Method(System.Int32)");
-            AssertParse("Method", 0, new string[] { "TypeA", "List<B>" }, "Method(TypeA,List<B>)");
-            AssertParse("Method", 1, new string[] { "B", "List<B>" }, "Method`1(B,List<B>)");
-            AssertParse("Method", 0, new string[] { "B[]" }, "Method(B[])");
-            AssertParse("Method", 0, new string[] { "A[,]", "B[,,][]" }, "Method(A[,],B[,,][])");
-        }
+        // An F# method that would look like this in code: member _.``method that does not pass`` () =
+        // And like this in CIL: instance void 'method that does not pass' () cil managed
+        Assert.AreEqual(("Method that does not pass", 0, null), Parse("'Method that does not pass'()"));
+
+        // An F# method that would look like this in code: member _.``method that doesn't pass`` () =
+        // And like this in CIL: instance void 'method that doesn\'t pass' () cil managed
+        // Notice the ' escaped by \.
+        Assert.AreEqual(("Method that doesn't pass", 0, null), Parse(@"'Method that doesn\'t pass'()"));
+    }
 
-        [TestMethod]
-        public void ParseInvalidMethodName()
+    [TestMethod]
+    public void ParseInvalidMethodName()
+    {
+        static (string, int, string[]?) Parse(string methodName)
         {
-            (string, int, string[]) Parse(string methodName)
-            {
-                ManagedNameParser.ParseManagedMethodName(methodName, out var method, out var arity, out var parameterTypes);
-                return (method, arity, parameterTypes);
-            }
+            ManagedNameParser.ParseManagedMethodName(methodName, out var method, out var arity, out var parameterTypes);
+            return (method, arity, parameterTypes);
+        }
 
-            Assert.ThrowsException<InvalidManagedNameException>(() => Parse(" Method"), "Whitespace is not valid in a ManagedName (pos: 0)");
-            Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method( List)"), "Whitespace is not valid in a ManagedName (pos: 7)");
+        Assert.ThrowsException<InvalidManagedNameException>(() => Parse(" Method"), "Whitespace is not valid in a ManagedName (pos: 0)");
+        Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method( List)"), "Whitespace is not valid in a ManagedName (pos: 7)");
 
-            Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method(List)xa"), "Unexpected characters after the end of the ManagedName (pos: 7)");
+        Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method(List)xa"), "Unexpected characters after the end of the ManagedName (pos: 7)");
 
-            Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method("), "ManagedName is incomplete");
-            Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method`4a"), "Method arity must be numeric");
-        }
+        Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method("), "ManagedName is incomplete");
+        Assert.ThrowsException<InvalidManagedNameException>(() => Parse("Method`4a"), "Method arity must be numeric");
     }
 }
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameRoundTripTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameRoundTripTests.cs
index c6bfc854fa..4a2789e234 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameRoundTripTests.cs
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/ManagedNameRoundTripTests.cs
@@ -1,938 +1,938 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests;
+
+[TestClass]
+[DeploymentItem("TestClasses.cs")]
+public partial class ManagedNameRoundTripTests
 {
-    using Microsoft.CodeAnalysis;
-    using Microsoft.CodeAnalysis.CSharp;
-    using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    [TestClass]
-    [DeploymentItem("TestClasses.cs")]
-    public partial class ManagedNameRoundTripTests
-    {
-        private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-        private Compilation _compilation;
-
-        [TestInitialize]
-        public void Initialize()
-            => _compilation = CSharpCompilation.Create(
-                    "Test.dll",
-                    new[] { CSharpSyntaxTree.ParseText(File.ReadAllText("TestClasses.cs")) },
-                    new[] { MetadataReference.CreateFromFile(typeof(object).Assembly.Location) });
-
-        [TestMethod]
-        public void Simple1()
-        {
-            var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer).GetMethod("Method0"),
-                containingTypeSymbol: outer,
-                methodSymbol: outer.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void Simple2()
-        {
-            var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer).GetMethod("Method1"),
-                containingTypeSymbol: outer,
-                methodSymbol: outer.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer",
-                managedMethodName: "Method1(System.Int32)");
-        }
-
-        [TestMethod]
-        public void Simple3()
-        {
-            var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer).GetMethod("Method2"),
-                containingTypeSymbol: outer,
-                methodSymbol: outer.FindMethod("Method2"),
-                managedTypeName: "TestClasses.Outer",
-                managedMethodName: "Method2(System.Collections.Generic.List`1<System.String>)");
-        }
-
-        [TestMethod]
-        public void Simple4()
-        {
-            var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer).GetMethod("Method3"),
-                containingTypeSymbol: outer,
-                methodSymbol: outer.FindMethod("Method3"),
-                managedTypeName: "TestClasses.Outer",
-                managedMethodName: "Method3(System.String,System.Int32)");
-        }
-
-        [TestMethod]
-        public void Nested1()
-        {
-            var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method0"),
-                containingTypeSymbol: outerInner,
-                methodSymbol: outerInner.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer+Inner",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void Nested2()
-        {
-            var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method1"),
-                containingTypeSymbol: outerInner,
-                methodSymbol: outerInner.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer+Inner",
-                managedMethodName: "Method1(System.Int32)");
-        }
-
-        [TestMethod]
-        public void OpenGeneric1()
-        {
-            var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method0"),
-                containingTypeSymbol: outerT,
-                methodSymbol: outerT.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void OpenGeneric2()
-        {
-            var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method1"),
-                containingTypeSymbol: outerT,
-                methodSymbol: outerT.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method1(!0)");
-        }
-
-        [TestMethod]
-        public void OpenGeneric3()
-        {
-            var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method2"),
-                containingTypeSymbol: outerT,
-                methodSymbol: outerT.FindMethod("Method2"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method2`1(!!0[])");
-        }
-
-        [TestMethod]
-        public void OpenGeneric4()
-        {
-            var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method3"),
-                containingTypeSymbol: outerT,
-                methodSymbol: outerT.FindMethod("Method3"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method3`1(!0,!!0)");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested1()
-        {
-            var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method0"),
-                containingTypeSymbol: outerTInnterV,
-                methodSymbol: outerTInnterV.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested2()
-        {
-            var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method1"),
-                containingTypeSymbol: outerTInnterV,
-                methodSymbol: outerTInnterV.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method1(!0)");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested3()
-        {
-            var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method2"),
-                containingTypeSymbol: outerTInnterV,
-                methodSymbol: outerTInnterV.FindMethod("Method2"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method2(!1)");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested4()
-        {
-            var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method3"),
-                containingTypeSymbol: outerTInnterV,
-                methodSymbol: outerTInnterV.FindMethod("Method3"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method3`1(!0,!!0,!1)");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested5()
-        {
-            var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method4"),
-                containingTypeSymbol: outerTInnterV,
-                methodSymbol: outerTInnterV.FindMethod("Method4"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method4`2(!!1,!!0)");
-        }
-
-        [TestMethod]
-        public void OpenGenericNested6()
-        {
-            var outerTInnerVMoreInnerI = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1+MoreInner`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<>.Inner<>.MoreInner<>).GetMethod("Method0"),
-                containingTypeSymbol: outerTInnerVMoreInnerI,
-                methodSymbol: outerTInnerVMoreInnerI.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1+MoreInner`1",
-                managedMethodName: "Method0`1(!0,!1,!2,!!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGeneric1()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method0"),
-                containingTypeSymbol: outerTInt,
-                methodSymbol: outerTInt.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void ClosedGeneric2()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method1"),
-                containingTypeSymbol: outerTInt,
-                methodSymbol: outerTInt.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method1(!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGeneric3()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method2"),
-                containingTypeSymbol: outerTInt,
-                methodSymbol: outerTInt.FindMethod("Method2"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method2`1(!!0[])");
-        }
-
-        [TestMethod]
-        public void ClosedGeneric4()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method3"),
-                containingTypeSymbol: outerTInt,
-                methodSymbol: outerTInt.FindMethod("Method3"),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method3`1(!0,!!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericNested1()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-            var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method0"),
-                containingTypeSymbol: outerTIntInnerVString,
-                methodSymbol: outerTIntInnerVString.FindMethod("Method0"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method0");
-        }
-
-        [TestMethod]
-        public void ClosedGenericNested2()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-            var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method1"),
-                containingTypeSymbol: outerTIntInnerVString,
-                methodSymbol: outerTIntInnerVString.FindMethod("Method1"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method1(!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericNested3()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-            var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method2"),
-                containingTypeSymbol: outerTIntInnerVString,
-                methodSymbol: outerTIntInnerVString.FindMethod("Method2"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method2(!1)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericNested4()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-            var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method3"),
-                containingTypeSymbol: outerTIntInnerVString,
-                methodSymbol: outerTIntInnerVString.FindMethod("Method3"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method3`1(!0,!!0,!1)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericNested5()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-            var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method4"),
-                containingTypeSymbol: outerTIntInnerVString,
-                methodSymbol: outerTIntInnerVString.FindMethod("Method4"),
-                managedTypeName: "TestClasses.Outer`1+Inner`1",
-                managedMethodName: "Method4`2(!!1,!!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericMethod1()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method3").MakeGenericMethod(typeof(string)),
-                containingTypeSymbol: outerTInt,
-                methodSymbol: outerTInt.FindMethod("Method3").Construct(@string),
-                managedTypeName: "TestClasses.Outer`1",
-                managedMethodName: "Method3`1(!0,!!0)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericMethod2()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method2").MakeGenericMethod(typeof(int)),
-                containingTypeSymbol: outerInner,
-                methodSymbol: outerInner.FindMethod("Method2").Construct(@int),
-                managedTypeName: "TestClasses.Outer+Inner",
-                managedMethodName: "Method2`1(System.Int32)");
-        }
-
-        [TestMethod]
-        public void ClosedGenericMethod3()
-        {
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var @float = _compilation.GetSpecialType(SpecialType.System_Single);
-            var @string = _compilation.GetSpecialType(SpecialType.System_String);
-            var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method3").MakeGenericMethod(typeof(float), typeof(string)),
-                containingTypeSymbol: outerInner,
-                methodSymbol: outerInner.FindMethod("Method3").Construct(@float, @string),
-                managedTypeName: "TestClasses.Outer+Inner",
-                managedMethodName: "Method3`2(System.Int32)");
-        }
-
-        [TestMethod]
-        public void ExplicitInterfaceImplementation1()
-        {
-            var impl = _compilation.GetTypeByMetadataName("TestClasses.Impl");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Impl).GetMethod("TestClasses.IImplementation.ImplMethod0", PrivateBindingFlags),
-                containingTypeSymbol: impl,
-                methodSymbol: impl.FindMethod("TestClasses.IImplementation.ImplMethod0"),
-                managedTypeName: "TestClasses.Impl",
-                managedMethodName: "TestClasses.IImplementation.ImplMethod0");
-        }
-
-        [TestMethod]
-        public void ExplicitInterfaceImplementation2()
-        {
-            var impl = _compilation.GetTypeByMetadataName("TestClasses.Impl");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Impl).GetMethod("TestClasses.IImplementation.ImplMethod1", PrivateBindingFlags),
-                containingTypeSymbol: impl,
-                methodSymbol: impl.FindMethod("TestClasses.IImplementation.ImplMethod1"),
-                managedTypeName: "TestClasses.Impl",
-                managedMethodName: "TestClasses.IImplementation.ImplMethod1(System.Int32)");
-        }
-
-        [TestMethod]
-        public void GenericExplicitInterfaceImplementation1()
-        {
-            var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod0", PrivateBindingFlags),
-                containingTypeSymbol: implT,
-                methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod0"),
-                managedTypeName: "TestClasses.Impl`1",
-                managedMethodName: "'TestClasses.IImplementation<T>.ImplMethod0'");
-        }
-
-        [TestMethod]
-        public void GenericExplicitInterfaceImplementation2()
-        {
-            var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod1", PrivateBindingFlags),
-                containingTypeSymbol: implT,
-                methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod1"),
-                managedTypeName: "TestClasses.Impl`1",
-                managedMethodName: "'TestClasses.IImplementation<T>.ImplMethod1'(!0)");
-        }
-
-        [TestMethod]
-        public void GenericExplicitInterfaceImplementation3()
-        {
-            var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod2", PrivateBindingFlags),
-                containingTypeSymbol: implT,
-                methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod2"),
-                managedTypeName: "TestClasses.Impl`1",
-                managedMethodName: "'TestClasses.IImplementation<T>.ImplMethod2'`1(!0,!!0,System.String)");
-        }
-
-        [TestMethod]
-        public void Inheritance1()
-        {
-            var outerPrime = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.OuterPrime).GetMethod("Method3"),
-                containingTypeSymbol: outerPrime,
-                methodSymbol: outerPrime.FindMethod("Method3"),
-                managedTypeName: "TestClasses.OuterPrime",
-                managedMethodName: "Method3(System.String,System.Int32)");
-        }
-
-        [TestMethod]
-        public void Inheritance2()
-        {
-            var outerPrimeZ = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.OuterPrime<>).GetMethod("Method3"),
-                containingTypeSymbol: outerPrimeZ,
-                methodSymbol: outerPrimeZ.FindMethod("Method3"),
-                managedTypeName: "TestClasses.OuterPrime`1",
-                managedMethodName: "Method3`1(!0,!!0)");
-        }
-
-        [TestMethod]
-        public void Inheritance3()
-        {
-            var outerPrimeYZ = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime`2");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.OuterPrime<,>).GetMethod("Method3"),
-                containingTypeSymbol: outerPrimeYZ,
-                methodSymbol: outerPrimeYZ.FindMethod("Method3"),
-                managedTypeName: "TestClasses.OuterPrime`2",
-                managedMethodName: "Method3`1(!1,!!0)");
-        }
-
-        [TestMethod]
-        public void Inheritance4()
-        {
-            var outerString = _compilation.GetTypeByMetadataName("TestClasses.OuterString");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.OuterString).GetMethod("Method3"),
-                containingTypeSymbol: outerString,
-                methodSymbol: outerString.FindMethod("Method3"),
-                managedTypeName: "TestClasses.OuterString",
-                managedMethodName: "Method3`1(System.String,!!0)");
-        }
-
-        [TestMethod]
-        public void Overloads1()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0()"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0");
-        }
-
-        [TestMethod]
-        public void Overloads2()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32)"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, @int),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Int32)");
-        }
-
-        [TestMethod]
-        public void Overloads3()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32, TestClasses.Overloads)"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, @int, overloads),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Int32,TestClasses.Overloads)");
-        }
-
-        [TestMethod]
-        public void Overloads4()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var intptr = _compilation.CreatePointerTypeSymbol(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32*)"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, intptr),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Int32*)");
-        }
-
-        [TestMethod]
-        public void Overloads5()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var dynamic = _compilation.DynamicType;
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Object)"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, dynamic),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Object)");
-        }
-
-        [TestMethod]
-        public void Overloads6()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U)"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1, m => m.Parameters.Single().Type == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(!!0)");
-        }
-
-        [TestMethod]
-        public void Overloads7()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U]()"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1");
-        }
-
-        [TestMethod]
-        public void Overloads8()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U,T]()"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 2),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`2");
-        }
-
-        [TestMethod]
-        public void Overloads9()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
-                         arrayType.Rank == 1 &&
-                         arrayType.ElementType == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(!!0[])");
-        }
-
-        [TestMethod]
-        public void Overloads10()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[][])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
-                         arrayType.Rank == 1 &&
-                         arrayType.ElementType is IArrayTypeSymbol innerArrayType &&
-                         innerArrayType.Rank == 1 &&
-                         innerArrayType.ElementType == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(!!0[][])");
-        }
-
-        [TestMethod]
-        public void Overloads11()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[,])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
-                         arrayType.Rank == 2 &&
-                         arrayType.ElementType == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(!!0[,])");
-        }
-
-        [TestMethod]
-        public void Overloads12()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[,,])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
-                         arrayType.Rank == 3 &&
-                         arrayType.ElementType == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(!!0[,,])");
-        }
-
-        [TestMethod]
-        public void Overloads13()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
-            var listInt = _compilation.GetTypeByMetadataName("System.Collections.Generic.List`1").Construct(@int);
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Collections.Generic.List`1[System.Int32])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, listInt),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(System.Collections.Generic.List`1<System.Int32>)");
-        }
-
-        [TestMethod]
-        public void Overloads14()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var list = _compilation.GetTypeByMetadataName("System.Collections.Generic.List`1");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Collections.Generic.List`1[U])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m =>
-                        m.Parameters.Single().Type is INamedTypeSymbol p &&
-                        p.OriginalDefinition == list &&
-                        p.TypeArguments.Single() == m.TypeParameters.Single()),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(System.Collections.Generic.List`1<!!0>)");
-        }
-
-        [TestMethod]
-        public void Overloads15()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U,V](System.Tuple`2[U,V], System.Tuple`2[V,U])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 2, 2,
-                    m =>
-                        m.Parameters.First() is INamedTypeSymbol p1 &&
-                        p1.OriginalDefinition == tuple2 &&
-                        p1.TypeArguments.SequenceEqual(m.TypeParameters) &&
-                        m.Parameters.Last() is INamedTypeSymbol p2 &&
-                        p2.OriginalDefinition == tuple2 &&
-                        p2.TypeArguments.SequenceEqual(m.TypeParameters.Reverse())),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`2(System.Tuple`2<!!0,!!1>,System.Tuple`2<!!1,!!0>)");
-        }
-
-        [TestMethod]
-        public void Overloads16()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1");
-            var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Tuple`1[System.Tuple`2[System.String[,],System.Int32]])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, 1,
-                    m =>
-                        m.Parameters.Single().Type is INamedTypeSymbol p &&
-                        p.OriginalDefinition == tuple1 &&
-                        p.TypeArguments.Single() is INamedTypeSymbol t &&
-                        t.OriginalDefinition == tuple2),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Tuple`1<System.Tuple`2<System.String[,],System.Int32>>)");
-        }
-
-        [TestMethod]
-        public void Overloads17()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1");
-            var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2");
-
-            VerifyRoundTrip(
-                methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Tuple`2[System.Tuple`1[System.String],System.Tuple`1[System.Int32]])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 0, 1,
-                    m =>
-                        m.Parameters.Single().Type is INamedTypeSymbol p &&
-                        p.OriginalDefinition == tuple2 &&
-                        p.TypeArguments.All(t => t.OriginalDefinition == tuple1)),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0(System.Tuple`2<System.Tuple`1<System.String>,System.Tuple`1<System.Int32>>)");
-        }
-
-        [TestMethod]
-        public void Overloads18()
-        {
-            var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads");
-            var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1");
-
-            VerifyRoundTrip(
-               methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Tuple`1[System.Tuple`1[TestClasses.Outer`1+Inner`1[U,U]]])"),
-                containingTypeSymbol: overloads,
-                methodSymbol: overloads.FindMethod("Overload0", 1, 1,
-                    m =>
-                        m.Parameters.Single().Type is INamedTypeSymbol p &&
-                        p.OriginalDefinition == tuple1 &&
-                        p.TypeArguments.Single() is INamedTypeSymbol t &&
-                        t.OriginalDefinition == tuple1),
-                managedTypeName: "TestClasses.Overloads",
-                managedMethodName: "Overload0`1(System.Tuple`1<System.Tuple`1<TestClasses.Outer`1+Inner`1<!!0,!!0>>>)");
-        }
-
-        #region Helpers
-        private void VerifyRoundTrip(
-            MethodInfo methodInfo,
-            INamedTypeSymbol containingTypeSymbol,
-            IMethodSymbol methodSymbol,
-            string managedTypeName,
-            string managedMethodName)
-        {
-            VerifyRoundTripFromMethodInfo(methodInfo, managedTypeName, managedMethodName);
-            VerifyRoundTripFromName(managedTypeName, managedMethodName, methodInfo);
-            // VerifyRoundTripFromMethodSymbol(containingTypeSymbol, methodSymbol, managedTypeName, managedMethodName);
-            // VerifyRoundTripFromName(managedTypeName, managedMethodName, containingTypeSymbol, methodSymbol);
-        }
-
-        private void VerifyRoundTripFromMethodInfo(
-            MethodInfo methodInfo,
-            string expectedManagedTypeName,
-            string expectedManagedMethodName)
-        {
-            // Generate the fqn for the Reflection MethodInfo
-            ManagedNameHelper.GetManagedName(methodInfo, out var managedTypeName, out var managedMethodName, out var hierarchyValues);
-
-            Assert.AreEqual(expectedManagedTypeName, managedTypeName);
-            Assert.AreEqual(expectedManagedMethodName, managedMethodName);
-
-            // Lookup the Reflection MethodInfo using fullTypeName and fullMethodName
-            var roundTrippedMethodInfo = ManagedNameHelper.GetMethod(
-                Assembly.GetExecutingAssembly(),
-                managedTypeName,
-                managedMethodName);
-
-            Assert.AreEqual(methodInfo.MetadataToken, roundTrippedMethodInfo.MetadataToken);
-        }
-
-        private void VerifyRoundTripFromName(
-            string managedTypeName,
-            string managedMethodName,
-            MethodInfo expectedMethodInfo)
-        {
-            // Lookup the Reflection MethodInfo using fullTypeName and fullMethodName
-            var methodInfo = ManagedNameHelper.GetMethod(
-                Assembly.GetExecutingAssembly(),
-                managedTypeName,
-                managedMethodName);
-
-            Assert.AreEqual(expectedMethodInfo.MetadataToken, methodInfo.MetadataToken);
-
-            // Generate the fqn for the Reflection MethodInfo
-            ManagedNameHelper.GetManagedName(
-                methodInfo,
-                out var roundTrippedFullTypeName,
-                out var roundTrippedFullMethodName);
-
-            Assert.AreEqual(managedTypeName, roundTrippedFullTypeName);
-            Assert.AreEqual(managedMethodName, roundTrippedFullMethodName);
-        }
-
-        // private void VerifyRoundTripFromMethodSymbol(
-        //     INamedTypeSymbol containingTypeSymbol,
-        //     IMethodSymbol methodSymbol,
-        //     string expectedFullTypeName,
-        //     string expectedFullMethodName)
-        // {
-        //     // Generate the fqn for the Roslyn IMethodSymbol
-        //     FullyQualifiedNameHelper.GetFullyQualifiedName(
-        //         containingTypeSymbol,
-        //         methodSymbol,
-        //         out var fullTypeName,
-        //         out var fullMethodName);
-
-        //     Assert.AreEqual(expectedFullTypeName, fullTypeName);
-        //     Assert.AreEqual(expectedFullMethodName, fullMethodName);
-
-        //     // Lookup the Roslyn ITypeSymbol and IMethodSymbol using fullTypeName and fullMethodName
-        //     var roundTrippedContainingTypeSymbol = _compilation.GetTypeByMetadataName(fullTypeName);
-
-        //     Assert.AreEqual(containingTypeSymbol.OriginalDefinition, roundTrippedContainingTypeSymbol.OriginalDefinition);
-
-        //     var roundTrippedMethodSymbol = FullyQualifiedNameHelper.GetMethodFromFullyQualifiedName(
-        //         _compilation,
-        //         fullTypeName,
-        //         fullMethodName);
-
-        //     Assert.AreEqual(methodSymbol.OriginalDefinition, roundTrippedMethodSymbol.OriginalDefinition);
-        // }
-
-        // private void VerifyRoundTripFromName(
-        //     string fullTypeName,
-        //     string fullMethodName,
-        //     INamedTypeSymbol expectedContainingTypeSymbol,
-        //     IMethodSymbol expectedMethodSymbol)
-        // {
-        //     // Lookup the Roslyn ITypeSymbol and IMethodSymbol using fullTypeName and fullMethodName
-        //     var containingTypeSymbol = _compilation.GetTypeByMetadataName(fullTypeName);
-        // 
-        //     Assert.AreEqual(expectedContainingTypeSymbol.OriginalDefinition, containingTypeSymbol.OriginalDefinition);
-        // 
-        //     var methodSymbol = FullyQualifiedNameHelper.GetMethodFromFullyQualifiedName(
-        //         _compilation,
-        //         fullTypeName,
-        //         fullMethodName);
-        // 
-        //     Assert.AreEqual(expectedMethodSymbol.OriginalDefinition, methodSymbol.OriginalDefinition);
-        // 
-        //     // Generate the fqn for the Roslyn IMethodSymbol
-        //     FullyQualifiedNameHelper.GetFullyQualifiedName(
-        //         containingTypeSymbol,
-        //         methodSymbol,
-        //         out var roundTrippedFullTypeName,
-        //         out var roundTrippedFullMethodName);
-        // 
-        //     Assert.AreEqual(fullTypeName, roundTrippedFullTypeName);
-        //     Assert.AreEqual(fullMethodName, roundTrippedFullMethodName);
-        // }
-        #endregion
+    private const BindingFlags PrivateBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+    private readonly Compilation _compilation;
+
+    public ManagedNameRoundTripTests()
+        => _compilation = CSharpCompilation.Create(
+            "Test.dll",
+            new[] { CSharpSyntaxTree.ParseText(File.ReadAllText("TestClasses.cs")) },
+            new[] { MetadataReference.CreateFromFile(typeof(object).Assembly.Location) });
+
+    [TestMethod]
+    public void Simple1()
+    {
+        var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer).GetMethod("Method0")!,
+            containingTypeSymbol: outer,
+            methodSymbol: outer.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void Simple2()
+    {
+        var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer).GetMethod("Method1")!,
+            containingTypeSymbol: outer,
+            methodSymbol: outer.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer",
+            managedMethodName: "Method1(System.Int32)");
+    }
+
+    [TestMethod]
+    public void Simple3()
+    {
+        var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer).GetMethod("Method2")!,
+            containingTypeSymbol: outer,
+            methodSymbol: outer.FindMethod("Method2")!,
+            managedTypeName: "TestClasses.Outer",
+            managedMethodName: "Method2(System.Collections.Generic.List`1<System.String>)");
+    }
+
+    [TestMethod]
+    public void Simple4()
+    {
+        var outer = _compilation.GetTypeByMetadataName("TestClasses.Outer")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer).GetMethod("Method3")!,
+            containingTypeSymbol: outer,
+            methodSymbol: outer.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.Outer",
+            managedMethodName: "Method3(System.String,System.Int32)");
+    }
+
+    [TestMethod]
+    public void Nested1()
+    {
+        var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method0")!,
+            containingTypeSymbol: outerInner,
+            methodSymbol: outerInner.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer+Inner",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void Nested2()
+    {
+        var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method1")!,
+            containingTypeSymbol: outerInner,
+            methodSymbol: outerInner.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer+Inner",
+            managedMethodName: "Method1(System.Int32)");
+    }
+
+    [TestMethod]
+    public void OpenGeneric1()
+    {
+        var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method0")!,
+            containingTypeSymbol: outerT,
+            methodSymbol: outerT.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void OpenGeneric2()
+    {
+        var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method1")!,
+            containingTypeSymbol: outerT,
+            methodSymbol: outerT.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method1(!0)");
+    }
+
+    [TestMethod]
+    public void OpenGeneric3()
+    {
+        var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method2")!,
+            containingTypeSymbol: outerT,
+            methodSymbol: outerT.FindMethod("Method2")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method2`1(!!0[])");
+    }
+
+    [TestMethod]
+    public void OpenGeneric4()
+    {
+        var outerT = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>).GetMethod("Method3")!,
+            containingTypeSymbol: outerT,
+            methodSymbol: outerT.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method3`1(!0,!!0)");
     }
+
+    [TestMethod]
+    public void OpenGenericNested1()
+    {
+        var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method0")!,
+            containingTypeSymbol: outerTInnterV,
+            methodSymbol: outerTInnterV.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void OpenGenericNested2()
+    {
+        var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method1")!,
+            containingTypeSymbol: outerTInnterV,
+            methodSymbol: outerTInnterV.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method1(!0)");
+    }
+
+    [TestMethod]
+    public void OpenGenericNested3()
+    {
+        var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method2")!,
+            containingTypeSymbol: outerTInnterV,
+            methodSymbol: outerTInnterV.FindMethod("Method2")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method2(!1)");
+    }
+
+    [TestMethod]
+    public void OpenGenericNested4()
+    {
+        var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method3")!,
+            containingTypeSymbol: outerTInnterV,
+            methodSymbol: outerTInnterV.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method3`1(!0,!!0,!1)");
+    }
+
+    [TestMethod]
+    public void OpenGenericNested5()
+    {
+        var outerTInnterV = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>).GetMethod("Method4")!,
+            containingTypeSymbol: outerTInnterV,
+            methodSymbol: outerTInnterV.FindMethod("Method4")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method4`2(!!1,!!0)");
+    }
+
+    [TestMethod]
+    public void OpenGenericNested6()
+    {
+        var outerTInnerVMoreInnerI = _compilation.GetTypeByMetadataName("TestClasses.Outer`1+Inner`1+MoreInner`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<>.Inner<>.MoreInner<>).GetMethod("Method0")!,
+            containingTypeSymbol: outerTInnerVMoreInnerI,
+            methodSymbol: outerTInnerVMoreInnerI.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1+MoreInner`1",
+            managedMethodName: "Method0`1(!0,!1,!2,!!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGeneric1()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method0")!,
+            containingTypeSymbol: outerTInt,
+            methodSymbol: outerTInt.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void ClosedGeneric2()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method1")!,
+            containingTypeSymbol: outerTInt,
+            methodSymbol: outerTInt.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method1(!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGeneric3()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method2")!,
+            containingTypeSymbol: outerTInt,
+            methodSymbol: outerTInt.FindMethod("Method2")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method2`1(!!0[])");
+    }
+
+    [TestMethod]
+    public void ClosedGeneric4()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method3")!,
+            containingTypeSymbol: outerTInt,
+            methodSymbol: outerTInt.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method3`1(!0,!!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericNested1()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+        var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method0")!,
+            containingTypeSymbol: outerTIntInnerVString,
+            methodSymbol: outerTIntInnerVString.FindMethod("Method0")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method0");
+    }
+
+    [TestMethod]
+    public void ClosedGenericNested2()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+        var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method1")!,
+            containingTypeSymbol: outerTIntInnerVString,
+            methodSymbol: outerTIntInnerVString.FindMethod("Method1")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method1(!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericNested3()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+        var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method2")!,
+            containingTypeSymbol: outerTIntInnerVString,
+            methodSymbol: outerTIntInnerVString.FindMethod("Method2")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method2(!1)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericNested4()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+        var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method3")!,
+            containingTypeSymbol: outerTIntInnerVString,
+            methodSymbol: outerTIntInnerVString.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method3`1(!0,!!0,!1)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericNested5()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+        var outerTIntInnerVString = outerTInt.GetTypeMembers().Single().Construct(@string);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>.Inner<string>).GetMethod("Method4")!,
+            containingTypeSymbol: outerTIntInnerVString,
+            methodSymbol: outerTIntInnerVString.FindMethod("Method4")!,
+            managedTypeName: "TestClasses.Outer`1+Inner`1",
+            managedMethodName: "Method4`2(!!1,!!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericMethod1()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerTInt = _compilation.GetTypeByMetadataName("TestClasses.Outer`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer<int>).GetMethod("Method3")!.MakeGenericMethod(typeof(string)),
+            containingTypeSymbol: outerTInt,
+            methodSymbol: outerTInt.FindMethod("Method3")!.Construct(@string),
+            managedTypeName: "TestClasses.Outer`1",
+            managedMethodName: "Method3`1(!0,!!0)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericMethod2()
+    {
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method2")!.MakeGenericMethod(typeof(int)),
+            containingTypeSymbol: outerInner,
+            methodSymbol: outerInner.FindMethod("Method2")!.Construct(@int),
+            managedTypeName: "TestClasses.Outer+Inner",
+            managedMethodName: "Method2`1(System.Int32)");
+    }
+
+    [TestMethod]
+    public void ClosedGenericMethod3()
+    {
+        _ = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var @float = _compilation.GetSpecialType(SpecialType.System_Single);
+        var @string = _compilation.GetSpecialType(SpecialType.System_String);
+        var outerInner = _compilation.GetTypeByMetadataName("TestClasses.Outer+Inner")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Outer.Inner).GetMethod("Method3")!.MakeGenericMethod(typeof(float), typeof(string)),
+            containingTypeSymbol: outerInner,
+            methodSymbol: outerInner.FindMethod("Method3")!.Construct(@float, @string),
+            managedTypeName: "TestClasses.Outer+Inner",
+            managedMethodName: "Method3`2(System.Int32)");
+    }
+
+    [TestMethod]
+    public void ExplicitInterfaceImplementation1()
+    {
+        var impl = _compilation.GetTypeByMetadataName("TestClasses.Impl")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Impl).GetMethod("TestClasses.IImplementation.ImplMethod0", PrivateBindingFlags)!,
+            containingTypeSymbol: impl,
+            methodSymbol: impl.FindMethod("TestClasses.IImplementation.ImplMethod0")!,
+            managedTypeName: "TestClasses.Impl",
+            managedMethodName: "TestClasses.IImplementation.ImplMethod0");
+    }
+
+    [TestMethod]
+    public void ExplicitInterfaceImplementation2()
+    {
+        var impl = _compilation.GetTypeByMetadataName("TestClasses.Impl")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Impl).GetMethod("TestClasses.IImplementation.ImplMethod1", PrivateBindingFlags)!,
+            containingTypeSymbol: impl,
+            methodSymbol: impl.FindMethod("TestClasses.IImplementation.ImplMethod1")!,
+            managedTypeName: "TestClasses.Impl",
+            managedMethodName: "TestClasses.IImplementation.ImplMethod1(System.Int32)");
+    }
+
+    [TestMethod]
+    public void GenericExplicitInterfaceImplementation1()
+    {
+        var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod0", PrivateBindingFlags)!,
+            containingTypeSymbol: implT,
+            methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod0")!,
+            managedTypeName: "TestClasses.Impl`1",
+            managedMethodName: "TestClasses.IImplementation<T>.ImplMethod0");
+    }
+
+    [TestMethod]
+    public void GenericExplicitInterfaceImplementation2()
+    {
+        var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod1", PrivateBindingFlags)!,
+            containingTypeSymbol: implT,
+            methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod1")!,
+            managedTypeName: "TestClasses.Impl`1",
+            managedMethodName: "TestClasses.IImplementation<T>.ImplMethod1(!0)");
+    }
+
+    [TestMethod]
+    public void GenericExplicitInterfaceImplementation3()
+    {
+        var implT = _compilation.GetTypeByMetadataName("TestClasses.Impl`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Impl<>).GetMethod("TestClasses.IImplementation<T>.ImplMethod2", PrivateBindingFlags)!,
+            containingTypeSymbol: implT,
+            methodSymbol: implT.FindMethod("TestClasses.IImplementation<T>.ImplMethod2")!,
+            managedTypeName: "TestClasses.Impl`1",
+            managedMethodName: "TestClasses.IImplementation<T>.ImplMethod2`1(!0,!!0,System.String)");
+    }
+
+    [TestMethod]
+    public void Inheritance1()
+    {
+        var outerPrime = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.OuterPrime).GetMethod("Method3")!,
+            containingTypeSymbol: outerPrime,
+            methodSymbol: outerPrime.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.OuterPrime",
+            managedMethodName: "Method3(System.String,System.Int32)");
+    }
+
+    [TestMethod]
+    public void Inheritance2()
+    {
+        var outerPrimeZ = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.OuterPrime<>).GetMethod("Method3")!,
+            containingTypeSymbol: outerPrimeZ,
+            methodSymbol: outerPrimeZ.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.OuterPrime`1",
+            managedMethodName: "Method3`1(!0,!!0)");
+    }
+
+    [TestMethod]
+    public void Inheritance3()
+    {
+        var outerPrimeYz = _compilation.GetTypeByMetadataName("TestClasses.OuterPrime`2")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.OuterPrime<,>).GetMethod("Method3")!,
+            containingTypeSymbol: outerPrimeYz,
+            methodSymbol: outerPrimeYz.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.OuterPrime`2",
+            managedMethodName: "Method3`1(!1,!!0)");
+    }
+
+    [TestMethod]
+    public void Inheritance4()
+    {
+        var outerString = _compilation.GetTypeByMetadataName("TestClasses.OuterString")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.OuterString).GetMethod("Method3")!,
+            containingTypeSymbol: outerString,
+            methodSymbol: outerString.FindMethod("Method3")!,
+            managedTypeName: "TestClasses.OuterString",
+            managedMethodName: "Method3`1(System.String,!!0)");
+    }
+
+    [TestMethod]
+    public void Overloads1()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0()")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0");
+    }
+
+    [TestMethod]
+    public void Overloads2()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32)")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, @int),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Int32)");
+    }
+
+    [TestMethod]
+    public void Overloads3()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32, TestClasses.Overloads)")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, @int, overloads),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Int32,TestClasses.Overloads)");
+    }
+
+    [TestMethod]
+    public void Overloads4()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var intptr = _compilation.CreatePointerTypeSymbol(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(Int32*)")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, intptr),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Int32*)");
+    }
+
+    [TestMethod]
+    public void Overloads5()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var dynamic = _compilation.DynamicType;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Object)")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, dynamic),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Object)");
+    }
+
+    [TestMethod]
+    public void Overloads6()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U)")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1, m => m.Parameters.Single().Type == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(!!0)");
+    }
+
+    [TestMethod]
+    public void Overloads7()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U]()")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1");
+    }
+
+    [TestMethod]
+    public void Overloads8()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U,T]()")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 2),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`2");
+    }
+
+    [TestMethod]
+    public void Overloads9()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
+                     arrayType.Rank == 1 &&
+                     arrayType.ElementType == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(!!0[])");
+    }
+
+    [TestMethod]
+    public void Overloads10()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[][])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
+                     arrayType.Rank == 1 &&
+                     arrayType.ElementType is IArrayTypeSymbol innerArrayType &&
+                     innerArrayType.Rank == 1 &&
+                     innerArrayType.ElementType == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(!!0[][])");
+    }
+
+    [TestMethod]
+    public void Overloads11()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[,])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
+                     arrayType.Rank == 2 &&
+                     arrayType.ElementType == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(!!0[,])");
+    }
+
+    [TestMethod]
+    public void Overloads12()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](U[,,])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m => m.Parameters.Single().Type is IArrayTypeSymbol arrayType &&
+                     arrayType.Rank == 3 &&
+                     arrayType.ElementType == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(!!0[,,])");
+    }
+
+    [TestMethod]
+    public void Overloads13()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var @int = _compilation.GetSpecialType(SpecialType.System_Int32);
+        var listInt = _compilation.GetTypeByMetadataName("System.Collections.Generic.List`1")!.Construct(@int);
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Collections.Generic.List`1[System.Int32])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, listInt),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(System.Collections.Generic.List`1<System.Int32>)");
+    }
+
+    [TestMethod]
+    public void Overloads14()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var list = _compilation.GetTypeByMetadataName("System.Collections.Generic.List`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Collections.Generic.List`1[U])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m =>
+                    m.Parameters.Single().Type is INamedTypeSymbol p &&
+                    p.OriginalDefinition == list &&
+                    p.TypeArguments.Single() == m.TypeParameters.Single()),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(System.Collections.Generic.List`1<!!0>)");
+    }
+
+    [TestMethod]
+    public void Overloads15()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U,V](System.Tuple`2[U,V], System.Tuple`2[V,U])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 2, 2,
+                m =>
+                    m.Parameters.First() is INamedTypeSymbol p1 &&
+                    p1.OriginalDefinition == tuple2 &&
+                    p1.TypeArguments.SequenceEqual(m.TypeParameters) &&
+                    m.Parameters.Last() is INamedTypeSymbol p2 &&
+                    p2.OriginalDefinition == tuple2 &&
+                    p2.TypeArguments.SequenceEqual(m.TypeParameters.Reverse())),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`2(System.Tuple`2<!!0,!!1>,System.Tuple`2<!!1,!!0>)");
+    }
+
+    [TestMethod]
+    public void Overloads16()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1")!;
+        var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Tuple`1[System.Tuple`2[System.String[,],System.Int32]])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, 1,
+                m =>
+                    m.Parameters.Single().Type is INamedTypeSymbol p &&
+                    p.OriginalDefinition == tuple1 &&
+                    p.TypeArguments.Single() is INamedTypeSymbol t &&
+                    t.OriginalDefinition == tuple2),
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Tuple`1<System.Tuple`2<System.String[,],System.Int32>>)");
+    }
+
+    [TestMethod]
+    public void Overloads17()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1")!;
+        var tuple2 = _compilation.GetTypeByMetadataName("System.Tuple`2")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0(System.Tuple`2[System.Tuple`1[System.String],System.Tuple`1[System.Int32]])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 0, 1,
+                m =>
+                    m.Parameters.Single().Type is INamedTypeSymbol p &&
+                    p.OriginalDefinition == tuple2 &&
+                    p.TypeArguments.All(t => t.OriginalDefinition == tuple1))!,
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0(System.Tuple`2<System.Tuple`1<System.String>,System.Tuple`1<System.Int32>>)");
+    }
+
+    [TestMethod]
+    public void Overloads18()
+    {
+        var overloads = _compilation.GetTypeByMetadataName("TestClasses.Overloads")!;
+        var tuple1 = _compilation.GetTypeByMetadataName("System.Tuple`1")!;
+
+        VerifyRoundTrip(
+            methodInfo: typeof(TestClasses.Overloads).FindMethod("Void Overload0[U](System.Tuple`1[System.Tuple`1[TestClasses.Outer`1+Inner`1[U,U]]])")!,
+            containingTypeSymbol: overloads,
+            methodSymbol: overloads.FindMethod("Overload0", 1, 1,
+                m =>
+                    m.Parameters.Single().Type is INamedTypeSymbol p &&
+                    p.OriginalDefinition == tuple1 &&
+                    p.TypeArguments.Single() is INamedTypeSymbol t &&
+                    t.OriginalDefinition == tuple1)!,
+            managedTypeName: "TestClasses.Overloads",
+            managedMethodName: "Overload0`1(System.Tuple`1<System.Tuple`1<TestClasses.Outer`1+Inner`1<!!0,!!0>>>)");
+    }
+
+    #region Helpers
+    [SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Code using the parameters is commented out temporarly.")]
+    private static void VerifyRoundTrip(
+        MethodInfo methodInfo,
+        INamedTypeSymbol containingTypeSymbol,
+        IMethodSymbol methodSymbol,
+        string managedTypeName,
+        string managedMethodName)
+    {
+        VerifyRoundTripFromMethodInfo(methodInfo, managedTypeName, managedMethodName);
+        VerifyRoundTripFromName(managedTypeName, managedMethodName, methodInfo);
+        // TODO: Enable these checks and remove attributes on method
+        // VerifyRoundTripFromMethodSymbol(containingTypeSymbol, methodSymbol, managedTypeName, managedMethodName);
+        // VerifyRoundTripFromName(managedTypeName, managedMethodName, containingTypeSymbol, methodSymbol);
+    }
+
+    private static void VerifyRoundTripFromMethodInfo(
+        MethodInfo methodInfo,
+        string expectedManagedTypeName,
+        string expectedManagedMethodName)
+    {
+        // Generate the fqn for the Reflection MethodInfo
+        ManagedNameHelper.GetManagedName(methodInfo, out var managedTypeName, out var managedMethodName, out _);
+
+        Assert.AreEqual(expectedManagedTypeName, managedTypeName);
+        Assert.AreEqual(expectedManagedMethodName, managedMethodName);
+
+        // Lookup the Reflection MethodInfo using fullTypeName and fullMethodName
+        var roundTrippedMethodInfo = ManagedNameHelper.GetMethod(
+            Assembly.GetExecutingAssembly(),
+            managedTypeName,
+            managedMethodName);
+
+        Assert.AreEqual(methodInfo.MetadataToken, roundTrippedMethodInfo.MetadataToken);
+    }
+
+    private static void VerifyRoundTripFromName(
+        string managedTypeName,
+        string managedMethodName,
+        MethodInfo expectedMethodInfo)
+    {
+        // Lookup the Reflection MethodInfo using fullTypeName and fullMethodName
+        var methodInfo = ManagedNameHelper.GetMethod(
+            Assembly.GetExecutingAssembly(),
+            managedTypeName,
+            managedMethodName);
+
+        Assert.AreEqual(expectedMethodInfo.MetadataToken, methodInfo.MetadataToken);
+
+        // Generate the fqn for the Reflection MethodInfo
+        ManagedNameHelper.GetManagedName(
+            methodInfo,
+            out var roundTrippedFullTypeName,
+            out var roundTrippedFullMethodName);
+
+        Assert.AreEqual(managedTypeName, roundTrippedFullTypeName);
+        Assert.AreEqual(managedMethodName, roundTrippedFullMethodName);
+    }
+
+    // private void VerifyRoundTripFromMethodSymbol(
+    //     INamedTypeSymbol containingTypeSymbol,
+    //     IMethodSymbol methodSymbol,
+    //     string expectedFullTypeName,
+    //     string expectedFullMethodName)
+    // {
+    //     // Generate the fqn for the Roslyn IMethodSymbol
+    //     FullyQualifiedNameHelper.GetFullyQualifiedName(
+    //         containingTypeSymbol,
+    //         methodSymbol,
+    //         out var fullTypeName,
+    //         out var fullMethodName);
+
+    //     Assert.AreEqual(expectedFullTypeName, fullTypeName);
+    //     Assert.AreEqual(expectedFullMethodName, fullMethodName);
+
+    //     // Lookup the Roslyn ITypeSymbol and IMethodSymbol using fullTypeName and fullMethodName
+    //     var roundTrippedContainingTypeSymbol = _compilation.GetTypeByMetadataName(fullTypeName);
+
+    //     Assert.AreEqual(containingTypeSymbol.OriginalDefinition, roundTrippedContainingTypeSymbol.OriginalDefinition);
+
+    //     var roundTrippedMethodSymbol = FullyQualifiedNameHelper.GetMethodFromFullyQualifiedName(
+    //         _compilation,
+    //         fullTypeName,
+    //         fullMethodName);
+
+    //     Assert.AreEqual(methodSymbol.OriginalDefinition, roundTrippedMethodSymbol.OriginalDefinition);
+    // }
+
+    // private void VerifyRoundTripFromName(
+    //     string fullTypeName,
+    //     string fullMethodName,
+    //     INamedTypeSymbol expectedContainingTypeSymbol,
+    //     IMethodSymbol expectedMethodSymbol)
+    // {
+    //     // Lookup the Roslyn ITypeSymbol and IMethodSymbol using fullTypeName and fullMethodName
+    //     var containingTypeSymbol = _compilation.GetTypeByMetadataName(fullTypeName);
+    //
+    //     Assert.AreEqual(expectedContainingTypeSymbol.OriginalDefinition, containingTypeSymbol.OriginalDefinition);
+    //
+    //     var methodSymbol = FullyQualifiedNameHelper.GetMethodFromFullyQualifiedName(
+    //         _compilation,
+    //         fullTypeName,
+    //         fullMethodName);
+    //
+    //     Assert.AreEqual(expectedMethodSymbol.OriginalDefinition, methodSymbol.OriginalDefinition);
+    //
+    //     // Generate the fqn for the Roslyn IMethodSymbol
+    //     FullyQualifiedNameHelper.GetFullyQualifiedName(
+    //         containingTypeSymbol,
+    //         methodSymbol,
+    //         out var roundTrippedFullTypeName,
+    //         out var roundTrippedFullMethodName);
+    //
+    //     Assert.AreEqual(fullTypeName, roundTrippedFullTypeName);
+    //     Assert.AreEqual(fullMethodName, roundTrippedFullMethodName);
+    // }
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs
deleted file mode 100644
index 01e97719e4..0000000000
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities.UnitTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System.Reflection;
-
-    [TestClass]
-    [TestCategory("Windows")]
-    [TestCategory("AcceptanceTests")]
-    public class SpecialNameTests
-    {
-        [TestMethod]
-        public void VerifyThatInvalidIdentifierNamesAreParsed()
-        {
-            var environment = new IntegrationTestEnvironment();
-            var asset = environment.GetTestAsset("CILProject.dll", "net451");
-            var assembly = Assembly.LoadFrom(asset);
-            var types = assembly.GetTypes();
-
-            foreach (var type in types)
-            {
-                var methods = type.GetMethods();
-
-                foreach (var method in methods)
-                {
-                    if (method.DeclaringType != type) continue;
-
-                    ManagedNameHelper.GetManagedName(method, out var typeName, out var methodName);
-                    var methodInfo = ManagedNameHelper.GetMethod(assembly, typeName, methodName);
-                    ManagedNameHelper.GetManagedName(methodInfo, out var typeName2, out var methodName2);
-
-                    Assert.IsTrue(method == methodInfo);
-                    Assert.AreEqual(typeName, typeName2, $"Type parse roundtrip test failed: {method} ({typeName} != {typeName2})");
-                    Assert.AreEqual(methodName, methodName2, $"Method parse roundtrip test failed: {method} ({methodName} != {methodName2})");
-                }
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
index 0e9bc56646..6fc895e272 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
@@ -1,36 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.AdapterUtilities.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <MicrosoftCodeAnalysisVersion Condition="$(MicrosoftCodeAnalysisVersion) == ''">3.8.0-3.20427.2</MicrosoftCodeAnalysisVersion>
     <NoWarn>$(NoWarn);RS1024</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <ProjectReference Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Update="TestClasses.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
   </ItemGroup>
-  
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <ItemGroup>
+    <None Update="NullableHelpers.tt">
+      <LastGenOutput>NullableHelpers.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Program.cs
deleted file mode 100644
index e6fb5d296f..0000000000
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AdapterUtilities.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestClasses.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestClasses.cs
index f40b044ec0..a138475319 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestClasses.cs
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestClasses.cs
@@ -1,11 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestClasses
+using System;
+using System.Collections.Generic;
+
+#pragma warning disable IDE0060 // Remove unused parameter
+#pragma warning disable CA1822 // Mark members as static
+#pragma warning disable IDE0161 // Convert to file-scoped namespace
+
+internal class NamespacelessClass
 {
-    using System;
-    using System.Collections.Generic;
+    public void Method0() { }
+    public void Method1(int i) { }
+    public void Method2(List<string> ls) { }
+    public void Method3(string p, int l) { }
+    internal class Inner
+    {
+        public void Method0() { }
+        public void Method1(int i) { }
+        public void Method2<U>(int i) { }
+        public void Method3<U, T>(int i) { }
+    }
+}
 
+internal record NamespacelessRecord
+{
+    public void Method0() { }
+    public void Method1(int i) { }
+    public void Method2(List<string> ls) { }
+    public void Method3(string p, int l) { }
+    internal record Inner
+    {
+        public void Method0() { }
+        public void Method1(int i) { }
+        public void Method2<U>(int i) { }
+        public void Method3<U, T>(int i) { }
+    }
+}
+
+namespace TestClasses
+{
     internal class Outer
     {
         public void Method0() { }
@@ -99,4 +133,17 @@ public void Overload0(Tuple<Tuple<string[,], int>> t0) { }
         public void Overload0(Tuple<Tuple<string>, Tuple<int>> t) { }
         public void Overload0<U>(Tuple<Tuple<Outer<U>.Inner<U>>> t) { }
     }
+
+    public class Class狧麱狵錋狾龍龪啊阿埃挨哎唉0u㐀㐁㐂㐃㐄㐅㐆㐇6ⅶ０ǒoU1U2U38丂丄丅丆丏丒丟
+    {
+        public void Method0()
+        {
+
+        }
+    }
 }
+
+
+#pragma warning restore IDE0161 // Convert to file-scoped namespace
+#pragma warning restore IDE0060 // Remove unused parameter
+#pragma warning restore CA1822 // Mark members as static
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/CompatibilityTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/CompatibilityTests.cs
index 06220dc920..175ea9bcb2 100644
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/CompatibilityTests.cs
+++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/CompatibilityTests.cs
@@ -1,139 +1,138 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.AdapterUtilities.UnitTests.TestIdProvider
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
 
-    using System;
-    using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class CompatibilityTests
-    {
-        [TestMethod]
-        [DataRow(new[] { "eea339da-6b5e-0d4b-3255-bfef95601890", "" })]
-        [DataRow(new[] { "740b9afc-3350-4257-ca01-5bd47799147d", "adapter://", "name1" })]                                      // less than one block
-        [DataRow(new[] { "119c5b31-c0fb-1c12-6d1a-d617bb2bd996", "adapter://namesamplenam.testname" })]                         // 1 full block
-        [DataRow(new[] { "2a4c33ec-6115-4bd7-2e94-71f2fd3a5ee3", "adapter://namesamplenamespace.testname" })]                   // 1 full block and extra
-        [DataRow(new[] { "119c5b31-c0fb-1c12-6d1a-d617bb2bd996", "adapter://", "name", "samplenam", ".", "testname" })]         // 1 full block
-        [DataRow(new[] { "2a4c33ec-6115-4bd7-2e94-71f2fd3a5ee3", "adapter://", "name", "samplenamespace", ".", "testname" })]   // 1 full block and extra
-        [DataRow(new[] { "1fc07043-3d2d-1401-c732-3b507feec548", "adapter://namesamplenam.testnameaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" })]                              // 2 full blocks
-        [DataRow(new[] { "24e8a50b-2766-6a12-f461-9f8e4fa1cbb5", "adapter://namesamplenamespace.testnameaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" })]                        // 2 full blocks and extra
-        [DataRow(new[] { "1fc07043-3d2d-1401-c732-3b507feec548", "adapter://", "name", "samplenam", ".", "testname", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" })]          // 2 full blocks
-        [DataRow(new[] { "24e8a50b-2766-6a12-f461-9f8e4fa1cbb5", "adapter://", "name", "samplenamespace", ".", "testname", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" })]    // 2 full blocks and extra
-        public void IdCompatibilityTests(string[] data)
-        {
-            // Arrange
-            var expectedId = new Guid(data[0]);
-
-            // Act
-            var idProvider = new AdapterUtilities.TestIdProvider();
-            foreach (var d in data.Skip(1))
-            {
-                idProvider.AppendString(d);
-            }
-            var id = idProvider.GetId();
-
-            // Assert
-            Assert.AreEqual(expectedId, id);
-        }
+namespace Microsoft.TestPlatform.AdapterUtilities.UnitTests.TestIdProvider;
 
+[TestClass]
+public class CompatibilityTests
+{
+    [TestMethod]
+    [DataRow(["eea339da-6b5e-0d4b-3255-bfef95601890", ""])]
+    [DataRow(["740b9afc-3350-4257-ca01-5bd47799147d", "adapter://", "name1"])]                                                                          // less than one block
+    [DataRow(["119c5b31-c0fb-1c12-6d1a-d617bb2bd996", "adapter://namesamplenam.testname"])]                                                             // 1 full block
+    [DataRow(["2a4c33ec-6115-4bd7-2e94-71f2fd3a5ee3", "adapter://namesamplenamespace.testname"])]                                                       // 1 full block and extra
+    [DataRow(["119c5b31-c0fb-1c12-6d1a-d617bb2bd996", "adapter://", "name", "samplenam", ".", "testname"])]                                             // 1 full block
+    [DataRow(["2a4c33ec-6115-4bd7-2e94-71f2fd3a5ee3", "adapter://", "name", "samplenamespace", ".", "testname"])]                                       // 1 full block and extra
+    [DataRow(["1fc07043-3d2d-1401-c732-3b507feec548", "adapter://namesamplenam.testnameaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"])]                             // 2 full blocks
+    [DataRow(["24e8a50b-2766-6a12-f461-9f8e4fa1cbb5", "adapter://namesamplenamespace.testnameaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"])]                       // 2 full blocks and extra
+    [DataRow(["1fc07043-3d2d-1401-c732-3b507feec548", "adapter://", "name", "samplenam", ".", "testname", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"])]         // 2 full blocks
+    [DataRow(["24e8a50b-2766-6a12-f461-9f8e4fa1cbb5", "adapter://", "name", "samplenamespace", ".", "testname", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"])]   // 2 full blocks and extra
+    public void IdCompatibilityTests(string[] data)
+    {
+        // Arrange
+        var expectedId = new Guid(data[0]);
 
-        [TestMethod]
-        public void IdGeneration_TestVectors_EmptyString()
+        // Act
+        var idProvider = new AdapterUtilities.TestIdProvider();
+        foreach (var d in data.Skip(1))
         {
-            IdGeneration_TestVector(
-                string.Empty,
-                "eea339da-6b5e-0d4b-3255-bfef95601890"
-            );
+            idProvider.AppendString(d);
         }
+        var id = idProvider.GetId();
 
+        // Assert
+        Assert.AreEqual(expectedId, id);
+    }
 
-        [TestMethod]
-        public void IdGeneration_TestVectors_abc()
-        {
-            IdGeneration_TestVector(
-                "abc",
-                "1af4049f-8584-1614-2050-e3d68c1a7abb"
-            );
-        }
 
-        [TestMethod]
-        public void IdGeneration_TestVectors_448Bits()
-        {
-            IdGeneration_TestVector(
-                "abcdbcdecdefdefgefghfghighij",
-                "7610f6db-8808-4bb7-b076-96871a96329c"
-            );
-        }
+    [TestMethod]
+    public void IdGeneration_TestVectors_EmptyString()
+    {
+        IdGeneration_TestVector(
+            string.Empty,
+            "eea339da-6b5e-0d4b-3255-bfef95601890"
+        );
+    }
 
-        [TestMethod]
-        public void IdGeneration_TestVectors_896Bits()
-        {
-            IdGeneration_TestVector(
-                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                "76d8d751-c79a-402c-9c5b-0e3f69c60adc"
-            );
-        }
 
-        [TestMethod]
-        public void IdGeneration_TestVectors_1Block()
-        {
-            IdGeneration_TestRepetitionVector(
-                 "a", 512 / 16,
-                 "99b1aec7-ff50-5229-a378-70ca37914c90"
-             );
-        }
+    [TestMethod]
+    public void IdGeneration_TestVectors_abc()
+    {
+        IdGeneration_TestVector(
+            "abc",
+            "1af4049f-8584-1614-2050-e3d68c1a7abb"
+        );
+    }
 
-        [TestMethod]
-        public void IdGeneration_ExtremelyLarge_TestVectors_100k_abc()
-        {
-            IdGeneration_TestRepetitionVector(
-                "abc", 100_000,
-                "11dbfc20-b34a-eef6-158e-ea8c201dfff9"
-            );
-        }
+    [TestMethod]
+    public void IdGeneration_TestVectors_448Bits()
+    {
+        IdGeneration_TestVector(
+            "abcdbcdecdefdefgefghfghighij",
+            "7610f6db-8808-4bb7-b076-96871a96329c"
+        );
+    }
 
-        [TestMethod]
-        public void IdGeneration_ExtremelyLarge_TestVectors_10M_abc()
-        {
-            IdGeneration_TestRepetitionVector(
-                "abc", 10_000_000,
-                "78640f07-8041-71bd-6461-3a7e4db52389"
-            );
-        }
+    [TestMethod]
+    public void IdGeneration_TestVectors_896Bits()
+    {
+        IdGeneration_TestVector(
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+            "76d8d751-c79a-402c-9c5b-0e3f69c60adc"
+        );
+    }
 
-        private void IdGeneration_TestVector(string testName, string expected)
-        {
-            // Arrange
-            expected = expected.Replace(" ", "").ToLowerInvariant();
-            var idProvider = new AdapterUtilities.TestIdProvider();
+    [TestMethod]
+    public void IdGeneration_TestVectors_1Block()
+    {
+        IdGeneration_TestRepetitionVector(
+            "a", 512 / 16,
+            "99b1aec7-ff50-5229-a378-70ca37914c90"
+        );
+    }
 
-            // Act
-            idProvider.AppendString(testName);
-            var actual = idProvider.GetId().ToString();
+    [TestMethod]
+    public void IdGeneration_ExtremelyLarge_TestVectors_100k_abc()
+    {
+        IdGeneration_TestRepetitionVector(
+            "abc", 100_000,
+            "11dbfc20-b34a-eef6-158e-ea8c201dfff9"
+        );
+    }
 
-            // Assert
-            Assert.AreEqual(expected, actual, $"Test Id for '{testName}' is invalid!");
-        }
+    [TestMethod]
+    public void IdGeneration_ExtremelyLarge_TestVectors_10M_abc()
+    {
+        IdGeneration_TestRepetitionVector(
+            "abc", 10_000_000,
+            "78640f07-8041-71bd-6461-3a7e4db52389"
+        );
+    }
 
-        private void IdGeneration_TestRepetitionVector(string input, int repetition, string expected)
-        {
-            // Arrange
-            var idProvider = new AdapterUtilities.TestIdProvider();
+    private static void IdGeneration_TestVector(string testName, string expected)
+    {
+        // Arrange
+        expected = expected.Replace(" ", "").ToLowerInvariant();
+        var idProvider = new AdapterUtilities.TestIdProvider();
+
+        // Act
+        idProvider.AppendString(testName);
+        var actual = idProvider.GetId().ToString();
 
-            // Act
-            for (int i = 0; i < repetition; i++)
-            {
-                idProvider.AppendString(input);
-            }
+        // Assert
+        Assert.AreEqual(expected, actual, $"Test Id for '{testName}' is invalid!");
+    }
 
-            var id = idProvider.GetId().ToString();
+    private static void IdGeneration_TestRepetitionVector(string input, int repetition, string expected)
+    {
+        // Arrange
+        var idProvider = new AdapterUtilities.TestIdProvider();
 
-            // Assert
-            Assert.AreEqual(expected, id, $"Test id generation for vector '{input}'*{repetition} failed! (normal path)");
+        // Act
+        for (int i = 0; i < repetition; i++)
+        {
+            idProvider.AppendString(input);
         }
 
+        var id = idProvider.GetId().ToString();
+
+        // Assert
+        Assert.AreEqual(expected, id, $"Test id generation for vector '{input}'*{repetition} failed! (normal path)");
     }
+
 }
diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/SHA1ImplTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/SHA1ImplTests.cs
deleted file mode 100644
index 23bb10bef8..0000000000
--- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/TestIdProvider/SHA1ImplTests.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.AdapterUtilities.UnitTests.TestIdProvider
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-    using System.Linq;
-    using System.Text;
-
-    [TestClass]
-    public class SHA1ImplTests
-    {
-        [TestMethod]
-        public void SHA1_TestVectors_EmptyString()
-        {
-            SHA1_TestVector(
-                string.Empty,
-                "da39a3ee5e6b4b0d3255bfef95601890afd80709"
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_TestVectors_abc()
-        {
-            SHA1_TestVector(
-                "abc",
-                "a9993e364706816aba3e25717850c26c9cd0d89d"
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_TestVectors_448Bits()
-        {
-            SHA1_TestVector(
-                "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                "84983e441c3bd26ebaae4aa1f95129e5e54670f1"
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_TestVectors_896Bits()
-        {
-            SHA1_TestVector(
-                "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
-                "a49b2446a02c645bf419f995b67091253a04a259"
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_TestVectors_1Block()
-        {
-            SHA1_TestRepetitionVector(
-                 'a',
-                 512 / 8
-             );
-        }
-
-        [TestMethod]
-        public void SHA1_ExtremelyLarge_TestVectors_500k_a()
-        {
-            SHA1_TestRepetitionVector(
-                'a',
-                500_000
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_ExtremelyLarge_TestVectors_900k_a()
-        {
-            SHA1_TestRepetitionVector(
-                'a',
-                900_000
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_ExtremelyLarge_TestVectors_999999_a()
-        {
-            SHA1_TestRepetitionVector(
-                'a',
-                999_999
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_ExtremelyLarge_TestVectors_1M_a()
-        {
-            SHA1_TestRepetitionVector(
-                'a',
-                1_000_000,
-                "34aa973c d4c4daa4 f61eeb2b dbad2731 6534016f"
-            );
-        }
-
-        [TestMethod]
-        public void SHA1_ExtremelyLarge_TestVectors_10M_a()
-        {
-            SHA1_TestRepetitionVector(
-                'a',
-                10_000_000
-            );
-        }
-
-        private void SHA1_TestVector(string message, string expected)
-        {
-            // Arrange
-            expected = expected.Replace(" ", "").ToLowerInvariant();
-            var shaHasher1 = new AdapterUtilities.TestIdProvider.Sha1Implementation();
-
-            // Act
-            var bytes = UTF8Encoding.UTF8.GetBytes(message);
-            var digest1 = ToHex(shaHasher1.ComputeHash(bytes));
-
-            // Assert
-            Assert.AreEqual(expected, digest1, $"Test vector '{message}' failed!");
-        }
-
-        private void SHA1_TestRepetitionVector(char input, int repetition, string expected = null)
-        {
-            // Arrange
-            var shaHasher1 = new AdapterUtilities.TestIdProvider.Sha1Implementation();
-            var shaHasher2 = new AdapterUtilities.TestIdProvider.Sha1Implementation();
-
-            var bytes = new byte[repetition];
-            for (int i = 0; i < repetition; i++)
-            {
-                bytes[i] = (byte)input;
-            }
-
-            if (string.IsNullOrEmpty(expected))
-            {
-                using (var hasher = System.Security.Cryptography.SHA1.Create())
-                {
-                    expected = ToHex(hasher.ComputeHash(bytes));
-                }
-            }
-            else
-            {
-                expected = expected.Replace(" ", "").ToLowerInvariant();
-            }
-
-            // Act
-            var digest1 = ToHex(shaHasher1.ComputeHash(bytes));
-            var blocks = bytes.Length / AdapterUtilities.TestIdProvider.BlockBytes;
-            byte[] block;
-            for (var i = 0; i < blocks; i += 1)
-            {
-                block = new byte[AdapterUtilities.TestIdProvider.BlockBytes];
-                Buffer.BlockCopy(bytes, i * block.Length, block, 0, block.Length);
-                shaHasher2.ProcessBlock(block, 0, block.Length);
-            }
-
-            var rest = bytes.Length - blocks * AdapterUtilities.TestIdProvider.BlockBytes;
-            if (rest != 0)
-            {
-                block = new byte[rest];
-                Buffer.BlockCopy(bytes, blocks * block.Length, block, 0, block.Length);
-                shaHasher2.PadMessage(ref block, block.Length);
-                shaHasher2.ProcessBlock(block, 0, block.Length);
-            }
-
-            var digest2 = ToHex(shaHasher2.ProcessFinalBlock());
-
-            // Assert
-            Assert.AreEqual(expected, digest1, $"Test vector '{input}'*{repetition} failed! (normal path)");
-            Assert.AreEqual(expected, digest2, $"Test vector '{input}'*{repetition} failed! (padding path)");
-        }
-
-        private static string ToHex(byte[] digest) => string.Concat(digest.Select(i => i.ToString("x2")));
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs b/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs
deleted file mode 100644
index e71cb67c55..0000000000
--- a/test/Microsoft.TestPlatform.Build.UnitTests/ArgumentEscaperTests.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Build.Utils.UnitTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ArgumentEscaperTests
-    {
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldAddDoubleQuoteIfThereIsSpace()
-        {
-            string stringWithSpace = "Some string";
-
-            string expected = "\"Some string\"";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSpace);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldAddDoubleQuoteIfThereIsSpaceAtEnd()
-        {
-            string stringWithSpaceAtEnd = "Some string  ";
-
-            string expected = "\"Some string  \"";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSpaceAtEnd);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldHandleForwardSlash()
-        {
-            string stringWithForwardSlash = "Some/string";
-
-            string expected = "Some/string";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithForwardSlash);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldPreserveDoubleQuote()
-        {
-            string stringWithDoubleQuote = "Some\"string";
-
-            string expected = "Some\\\"string";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithDoubleQuote);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldPreserveSingleQuote()
-        {
-            string stringWithSingleQuote = "Some'string";
-
-            string expected = "Some'string";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithSingleQuote);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldPreserveBackSlash()
-        {
-            string stringWithBackSlash = @"Some\\string";
-
-            string expected = "Some\\\\string";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithBackSlash);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void EscapeArgForProcessStartShouldPreserveBackSlashIfStringHasWhiteSpace()
-        {
-            string stringWithBackSlash = @"Some string With Space\\";
-
-            string expected = @"""Some string With Space\\\\""";
-            string result = ArgumentEscaper.HandleEscapeSequenceInArgForProcessStart(stringWithBackSlash);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestMethod]
-        public void ShouldSurroundWithQuotesShouldReturnFalseIfAlreadySurroundWithQuotes()
-        {
-            string stringSurroundWithQuotes = "\"some string\"";
-
-            Assert.IsFalse(ArgumentEscaper.ShouldSurroundWithQuotes(stringSurroundWithQuotes));
-        }
-
-        [TestMethod]
-        public void ShouldSurroundWithQuotesShouldReturnFalseIfItIsNotSurroundWithQuotesAndHasNoWhiteSpace()
-        {
-            string stringWithoutSpace = "someStringWithNoWhiteSpace";
-
-            Assert.IsFalse(ArgumentEscaper.ShouldSurroundWithQuotes(stringWithoutSpace));
-        }
-
-        [TestMethod]
-        public void ShouldSurroundWithQuotesShouldReturnTrueIfItIsNotSurroundWithQuotesAndHasWhiteSpace()
-        {
-            string stringWithSpace = "some String With WhiteSpace";
-
-            Assert.IsTrue(ArgumentEscaper.ShouldSurroundWithQuotes(stringWithSpace));
-        }
-
-        [TestMethod]
-        public void IsSurroundedWithQuotesShouldReturnTrueIfStringIsSurrondedByQuotes()
-        {
-            string stringSurroundWithQuotes = "\"some string\"";
-
-            Assert.IsTrue(ArgumentEscaper.IsSurroundedWithQuotes(stringSurroundWithQuotes));
-        }
-
-        [TestMethod]
-        public void IsSurroundedWithQuotesShouldReturnFalseIfStringIsNotSurrondedByQuotes()
-        {
-            string stringNotSurroundWithQuotes = "some string";
-
-            Assert.IsFalse(ArgumentEscaper.IsSurroundedWithQuotes(stringNotSurroundWithQuotes));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/FakeBuildEngine.cs b/test/Microsoft.TestPlatform.Build.UnitTests/FakeBuildEngine.cs
new file mode 100644
index 0000000000..c0d077d74e
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Build.UnitTests/FakeBuildEngine.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections;
+
+using Microsoft.Build.Framework;
+
+namespace Microsoft.TestPlatform.Build.UnitTests;
+
+public class FakeBuildEngine : IBuildEngine
+{
+    public bool ContinueOnError => false;
+
+    public int LineNumberOfTaskNode => 0;
+
+    public int ColumnNumberOfTaskNode => 0;
+
+    public string ProjectFileOfTaskNode => string.Empty;
+
+    public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs)
+    {
+        return false;
+    }
+
+    public void LogCustomEvent(CustomBuildEventArgs e)
+    {
+    }
+
+    public void LogErrorEvent(BuildErrorEventArgs e)
+    {
+    }
+
+    public void LogMessageEvent(BuildMessageEventArgs e)
+    {
+    }
+
+    public void LogWarningEvent(BuildWarningEventArgs e)
+    {
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj
index b8922d576d..a1197a8308 100644
--- a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Build.UnitTests</AssemblyName>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.csproj">
@@ -22,6 +18,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <!-- To solve potential vulnerability in Microsoft.Build.Utilities.Core 17.8.3, if the version is updated we can remove this direct dependency. -->
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Build.UnitTests/Program.cs
deleted file mode 100644
index 6b68a1b2ad..0000000000
--- a/test/Microsoft.TestPlatform.Build.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Build.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/TestTaskUtilsTests.cs b/test/Microsoft.TestPlatform.Build.UnitTests/TestTaskUtilsTests.cs
new file mode 100644
index 0000000000..a8ed80b8f1
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Build.UnitTests/TestTaskUtilsTests.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Text.RegularExpressions;
+
+using Microsoft.Build.Utilities;
+using Microsoft.TestPlatform.Build.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Build.UnitTests;
+
+[TestClass]
+public class TestTaskUtilsTests
+{
+    private readonly ITestTask _vsTestTask;
+
+    public TestTaskUtilsTests()
+    {
+        _vsTestTask = new VSTestTask
+        {
+            BuildEngine = new FakeBuildEngine(),
+            TestFileFullPath = new TaskItem(@"C:\path\to\test-assembly.dll"),
+            VSTestFramework = ".NETCoreapp,Version2.0"
+        };
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddOneEntryForCLIRunSettings()
+    {
+        const string arg1 = "RunConfiguration.ResultsDirectory=Path having Space";
+        const string arg2 = "MSTest.DeploymentEnabled";
+
+        _vsTestTask.VSTestCLIRunSettings = new string[2];
+        _vsTestTask.VSTestCLIRunSettings[0] = arg1;
+        _vsTestTask.VSTestCLIRunSettings[1] = arg2;
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, " -- ");
+        StringAssert.Contains(commandline, $"\"{arg1}\"");
+        StringAssert.Contains(commandline, $"{arg2}");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddCLIRunSettingsArgAtEnd()
+    {
+        const string codeCoverageOption = "Code Coverage";
+
+        _vsTestTask.VSTestCollect = [codeCoverageOption];
+        _vsTestTask.VSTestBlame = true;
+
+        const string arg1 = "RunConfiguration.ResultsDirectory=Path having Space";
+        const string arg2 = "MSTest.DeploymentEnabled";
+
+        _vsTestTask.VSTestCLIRunSettings = new string[2];
+        _vsTestTask.VSTestCLIRunSettings[0] = arg1;
+        _vsTestTask.VSTestCLIRunSettings[1] = arg2;
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, " -- ");
+        StringAssert.Contains(commandline, $"\"{arg1}\"");
+        StringAssert.Contains(commandline, $"{arg2}");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldPassResultsDirectoryCorrectly()
+    {
+        const string resultsDirectoryValue = @"C:\tmp\Results Directory";
+        _vsTestTask.VSTestResultsDirectory = new TaskItem(resultsDirectoryValue);
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, $"--resultsDirectory:\"{_vsTestTask.VSTestResultsDirectory?.ItemSpec}\"");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldNotSetConsoleLoggerVerbosityIfConsoleLoggerIsGivenInArgs()
+    {
+        _vsTestTask.VSTestVerbosity = "diag";
+        _vsTestTask.VSTestLogger = ["Console;Verbosity=quiet"];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.DoesNotMatch(commandline, new Regex("(--logger:\"Console;Verbosity=normal\")"));
+        StringAssert.Contains(commandline, "--logger:\"Console;Verbosity=quiet\"");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsn()
+    {
+        _vsTestTask.VSTestVerbosity = "n";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsnormal()
+    {
+        _vsTestTask.VSTestVerbosity = "normal";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsd()
+    {
+        _vsTestTask.VSTestVerbosity = "d";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdetailed()
+    {
+        _vsTestTask.VSTestVerbosity = "detailed";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdiag()
+    {
+        _vsTestTask.VSTestVerbosity = "diag";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdiagnostic()
+    {
+        _vsTestTask.VSTestVerbosity = "diagnostic";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsq()
+    {
+        _vsTestTask.VSTestVerbosity = "q";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsquiet()
+    {
+        _vsTestTask.VSTestVerbosity = "quiet";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsm()
+    {
+        _vsTestTask.VSTestVerbosity = "m";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=minimal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsminimal()
+    {
+        _vsTestTask.VSTestVerbosity = "minimal";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=minimal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsNormalWithCapitalN()
+    {
+        _vsTestTask.VSTestVerbosity = "Normal";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=normal");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsQuietWithCapitalQ()
+    {
+        _vsTestTask.VSTestVerbosity = "Quiet";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:Console;Verbosity=quiet");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldPreserveWhiteSpaceInLogger()
+    {
+        _vsTestTask.VSTestLogger = ["trx;LogFileName=foo bar.trx"];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:\"trx;LogFileName=foo bar.trx\"");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddOneCollectArgumentForEachCollect()
+    {
+        _vsTestTask.VSTestCollect = new string[2];
+
+        _vsTestTask.VSTestCollect[0] = "name1";
+        _vsTestTask.VSTestCollect[1] = "name 2";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--collect:name1");
+        StringAssert.Contains(commandline, "--collect:\"name 2\"");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddMultipleTestAdapterPaths()
+    {
+        _vsTestTask.VSTestTestAdapterPath = [new TaskItem("path1"), new TaskItem("path2")];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--testAdapterPath:path1");
+        StringAssert.Contains(commandline, "--testAdapterPath:path2");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddMultipleLoggers()
+    {
+        _vsTestTask.VSTestLogger = ["trx;LogFileName=foo bar.trx", "console"];
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--logger:\"trx;LogFileName=foo bar.trx\"");
+        StringAssert.Contains(commandline, "--logger:console");
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollect()
+    {
+        const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
+        _vsTestTask.VSTestCollect = ["code coverage"];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        string expectedArg = $"--testAdapterPath:\"{_vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}\"";
+        StringAssert.Contains(commandline, expectedArg);
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldNotAddTraceCollectorDirectoryPathAsTestAdapterForNonCodeCoverageCollect()
+    {
+        const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
+        _vsTestTask.VSTestCollect = ["not code coverage"];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        string notExpectedArg = $"--testAdapterPath:\"{_vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}\"";
+        StringAssert.DoesNotMatch(commandline, new Regex(Regex.Escape(notExpectedArg)));
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterIfSettingsGiven()
+    {
+        const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedatacollector\";
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = new TaskItem(traceDataCollectorDirectoryPath);
+        _vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        string expectedArg = $"--testAdapterPath:{_vsTestTask.VSTestTraceDataCollectorDirectoryPath?.ItemSpec}";
+        StringAssert.Contains(commandline, expectedArg);
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldNotAddTestAdapterPathIfVSTestTraceDataCollectorDirectoryPathIsEmpty()
+    {
+        _vsTestTask.VSTestTraceDataCollectorDirectoryPath = null;
+        _vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
+        _vsTestTask.VSTestCollect = ["code coverage"];
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.DoesNotMatch(commandline, new Regex(@"(--testAdapterPath:)"));
+    }
+
+    [TestMethod]
+    public void CreateArgumentShouldAddNoLogoOptionIfSpecifiedByUser()
+    {
+        _vsTestTask.VSTestNoLogo = true;
+
+        var commandline = TestTaskUtils.CreateCommandLineArguments(_vsTestTask);
+
+        StringAssert.Contains(commandline, "--nologo");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs b/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
deleted file mode 100644
index c61451ec9a..0000000000
--- a/test/Microsoft.TestPlatform.Build.UnitTests/VsTestTaskTests.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Build.UnitTests
-{
-    using System;
-    using System.Linq;
-
-    using Microsoft.TestPlatform.Build.Tasks;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class VSTestTaskTests
-    {
-        private readonly VSTestTask vsTestTask;
-
-        public VSTestTaskTests()
-        {
-            this.vsTestTask = new VSTestTask
-            {
-                TestFileFullPath = @"C:\path\to\test-assembly.dll",
-                VSTestFramework = ".NETCoreapp,Version2.0"
-            };
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddOneEntryForCLIRunSettings()
-        {
-            const string arg1 = "RunConfiguration.ResultsDirectory=Path having Space";
-            const string arg2 = "MSTest.DeploymentEnabled";
-
-            this.vsTestTask.VSTestCLIRunSettings = new string[2];
-            this.vsTestTask.VSTestCLIRunSettings[0] = arg1;
-            this.vsTestTask.VSTestCLIRunSettings[1] = arg2;
-
-            var result = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.AreEqual(5, result.Length);
-
-            // First, second and third args would be framework:".NETCoreapp,Version2.0", testfilepath and -- respectively.
-            Assert.AreEqual($"\"{arg1}\"", result[3]);
-            Assert.AreEqual($"{arg2}", result[4]);
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddCLIRunSettingsArgAtEnd()
-        {
-            const string codeCoverageOption = "Code Coverage";
-
-            this.vsTestTask.VSTestCollect = new string[] { codeCoverageOption };
-            this.vsTestTask.VSTestBlame = "Blame";
-
-            const string arg1 = "RunConfiguration.ResultsDirectory=Path having Space";
-            const string arg2 = "MSTest.DeploymentEnabled";
-
-            this.vsTestTask.VSTestCLIRunSettings = new string[2];
-            this.vsTestTask.VSTestCLIRunSettings[0] = arg1;
-            this.vsTestTask.VSTestCLIRunSettings[1] = arg2;
-
-            var result = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.AreEqual(7, result.Length);
-
-            // Following are expected  --framework:".NETCoreapp,Version2.0", testfilepath, blame, collect:"Code coverage" -- respectively.
-            Assert.AreEqual($"\"{arg1}\"", result[5]);
-            Assert.AreEqual($"{arg2}", result[6]);
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldPassResultsDirectoryCorrectly()
-        {
-            const string resultsDirectoryValue = @"C:\tmp\Results Directory";
-            this.vsTestTask.VSTestResultsDirectory = resultsDirectoryValue;
-
-            var result = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.AreEqual($"--resultsDirectory:\"{resultsDirectoryValue}\"", result[1]);
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldNotSetConsoleLoggerVerbosityIfConsoleLoggerIsGivenInArgs()
-        {
-            this.vsTestTask.VSTestVerbosity = "diag";
-            this.vsTestTask.VSTestLogger = new string[] { "Console;Verbosity=quiet" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsn()
-        {
-            this.vsTestTask.VSTestVerbosity = "n";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsnormal()
-        {
-            this.vsTestTask.VSTestVerbosity = "normal";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsd()
-        {
-            this.vsTestTask.VSTestVerbosity = "d";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdetailed()
-        {
-            this.vsTestTask.VSTestVerbosity = "detailed";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdiag()
-        {
-            this.vsTestTask.VSTestVerbosity = "diag";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsdiagnostic()
-        {
-            this.vsTestTask.VSTestVerbosity = "diagnostic";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsq()
-        {
-            this.vsTestTask.VSTestVerbosity = "q";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsquiet()
-        {
-            this.vsTestTask.VSTestVerbosity = "quiet";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsm()
-        {
-            this.vsTestTask.VSTestVerbosity = "m";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=minimal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToMinimalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsminimal()
-        {
-            this.vsTestTask.VSTestVerbosity = "minimal";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=minimal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToNormalIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsNormalWithCapitalN()
-        {
-            this.vsTestTask.VSTestVerbosity = "Normal";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=normal")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldSetConsoleLoggerVerbosityToQuietIfConsoleLoggerIsNotGivenInArgsAndVerbosityIsQuietWithCapitalQ()
-        {
-            this.vsTestTask.VSTestVerbosity = "Quiet";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:Console;Verbosity=quiet")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldPreserveWhiteSpaceInLogger()
-        {
-            this.vsTestTask.VSTestLogger = new string[] { "trx;LogFileName=foo bar.trx" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:\"trx;LogFileName=foo bar.trx\"")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddOneCollectArgumentForEachCollect()
-        {
-            this.vsTestTask.VSTestCollect = new string[2];
-
-            this.vsTestTask.VSTestCollect[0] = "name1";
-            this.vsTestTask.VSTestCollect[1] = "name 2";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--collect:name1")));
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--collect:\"name 2\"")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddMultipleTestAdapterPaths()
-        {
-            this.vsTestTask.VSTestTestAdapterPath = new string[] { "path1", "path2" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:path1")));
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:path2")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddMultipleLoggers()
-        {
-            this.vsTestTask.VSTestLogger = new string[] { "trx;LogFileName=foo bar.trx", "console" };
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:\"trx;LogFileName=foo bar.trx\"")));
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--logger:console")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollect()
-        {
-            const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-            this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
-            this.vsTestTask.VSTestCollect = new string[] { "code coverage" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            const string expectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-            CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterForCodeCoverageCollectWithExtraConfigurations()
-        {
-            const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-            this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
-            this.vsTestTask.VSTestCollect = new string[] { "code coverage;someParameter=someValue" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            const string expectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-            CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldNotAddTraceCollectorDirectoryPathAsTestAdapterForNonCodeCoverageCollect()
-        {
-            const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedata collector";
-            this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
-            this.vsTestTask.VSTestCollect = new string[] { "not code coverage" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            const string notExpectedArg = "--testAdapterPath:\"c:\\path\\to\\tracedata collector\"";
-            CollectionAssert.DoesNotContain(allArguments, notExpectedArg, $"Not expected argument: '''{notExpectedArg}''' present in [{string.Join(", ", allArguments)}]");
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddTraceCollectorDirectoryPathAsTestAdapterIfSettingsGiven()
-        {
-            const string traceDataCollectorDirectoryPath = @"c:\path\to\tracedatacollector\";
-            this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = traceDataCollectorDirectoryPath;
-            this.vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            const string expectedArg = "--testAdapterPath:c:\\path\\to\\tracedatacollector\\";
-            CollectionAssert.Contains(allArguments, expectedArg, $"Expected argument: '''{expectedArg}''' not present in [{string.Join(", ", allArguments)}]");
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldNotAddTestAdapterPathIfVSTestTraceDataCollectorDirectoryPathIsEmpty()
-        {
-            this.vsTestTask.VSTestTraceDataCollectorDirectoryPath = string.Empty;
-            this.vsTestTask.VSTestSetting = @"c:\path\to\sample.runsettings";
-            this.vsTestTask.VSTestCollect = new string[] { "code coverage" };
-
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNull(Array.Find(allArguments, arg => arg.Contains("--testAdapterPath:")));
-        }
-
-        [TestMethod]
-        public void CreateArgumentShouldAddNoLogoOptionIfSpecifiedByUser()
-        {
-            this.vsTestTask.VSTestNoLogo = "--nologo";
-            var allArguments = this.vsTestTask.CreateArgument().ToArray();
-
-            Assert.IsNotNull(Array.Find(allArguments, arg => arg.Contains("--nologo")));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandlerTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandlerTests.cs
index 2988e594c6..8cf76418d2 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandlerTests.cs
@@ -1,67 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
-namespace Microsoft.TestPlatform.Client.UnitTests.TestRunAttachmentsProcessing
+
+using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Client.UnitTests.TestRunAttachmentsProcessing;
+
+[TestClass]
+public class TestRunAttachmentsProcessingEventsHandlerTests
 {
-    using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class TestRunAttachmentsProcessingEventsHandlerTests
-    {
-        private readonly Mock<ICommunicationManager> mockCommunicationManager;
-        private readonly ITestRunAttachmentsProcessingEventsHandler handler;
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly ITestRunAttachmentsProcessingEventsHandler _handler;
 
-        public TestRunAttachmentsProcessingEventsHandlerTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.handler = new TestRunAttachmentsProcessingEventsHandler(mockCommunicationManager.Object);
-        }
+    public TestRunAttachmentsProcessingEventsHandlerTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _handler = new TestRunAttachmentsProcessingEventsHandler(_mockCommunicationManager.Object);
+    }
 
-        [TestMethod]
-        public void EventsHandlerHandleLogMessageShouldSendTestMessage()
-        {
-            string message = "error message";
+    [TestMethod]
+    public void EventsHandlerHandleLogMessageShouldSendTestMessage()
+    {
+        string message = "error message";
 
-            handler.HandleLogMessage(TestMessageLevel.Error, message);
+        _handler.HandleLogMessage(TestMessageLevel.Error, message);
 
-            mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.MessageLevel == TestMessageLevel.Error && p.Message == message)));
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.MessageLevel == TestMessageLevel.Error && p.Message == message)));
+    }
 
-        [TestMethod]
-        public void EventsHandlerHandleTestRunAttachmentsProcessingCompleteShouldSendAttachmentsProcessingCompleteMessage()
-        {
-            var attachments = new[] { new AttachmentSet(new System.Uri("http://www.bing.com/"), "code coverage") };
-            var args = new TestRunAttachmentsProcessingCompleteEventArgs(false, null);
+    [TestMethod]
+    public void EventsHandlerHandleTestRunAttachmentsProcessingCompleteShouldSendAttachmentsProcessingCompleteMessage()
+    {
+        var attachments = new[] { new AttachmentSet(new System.Uri("http://www.bing.com/"), "code coverage") };
+        var args = new TestRunAttachmentsProcessingCompleteEventArgs(false, null);
 
-            handler.HandleTestRunAttachmentsProcessingComplete(args, attachments);
+        _handler.HandleTestRunAttachmentsProcessingComplete(args, attachments);
 
-            mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == attachments && p.AttachmentsProcessingCompleteEventArgs == args)));
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == attachments && p.AttachmentsProcessingCompleteEventArgs == args)));
+    }
 
-        [TestMethod]
-        public void EventsHandlerHandleTestRunAttachmentsProcessingProgressShouldSendAttachmentsProcessingProgressMessage()
-        {
-            var args = new TestRunAttachmentsProcessingProgressEventArgs(1, new[] { new System.Uri("http://www.bing.com/") }, 90, 2);
+    [TestMethod]
+    public void EventsHandlerHandleTestRunAttachmentsProcessingProgressShouldSendAttachmentsProcessingProgressMessage()
+    {
+        var args = new TestRunAttachmentsProcessingProgressEventArgs(1, new[] { new System.Uri("http://www.bing.com/") }, 90, 2);
 
-            handler.HandleTestRunAttachmentsProcessingProgress(args);
+        _handler.HandleTestRunAttachmentsProcessingProgress(args);
 
-            mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingProgress, It.Is<TestRunAttachmentsProcessingProgressPayload>(p => p.AttachmentsProcessingProgressEventArgs == args)));
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingProgress, It.Is<TestRunAttachmentsProcessingProgressPayload>(p => p.AttachmentsProcessingProgressEventArgs == args)));
+    }
 
-        [TestMethod]
-        public void EventsHandlerHandleRawMessageShouldDoNothing()
-        {
-            handler.HandleRawMessage("any");
+    [TestMethod]
+    public void EventsHandlerHandleRawMessageShouldDoNothing()
+    {
+        _handler.HandleRawMessage("any");
 
-            mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>()), Times.Never);
-            mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>()), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs
index 9cf49fb843..84acf7765a 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs
@@ -1,748 +1,651 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode
-{
-    using System;
-    using System.Linq;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
-    using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using Newtonsoft.Json.Linq;
-
-    [TestClass]
-    public class DesignModeClientTests
-    {
-        private const int Timeout = 15 * 1000;
 
-        private const int PortNumber = 123;
+using System;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode;
+
+[TestClass]
+public class DesignModeClientTests
+{
+    private const int Timeout = 15 * 1000;
+    private const int PortNumber = 123;
 
-        private readonly Mock<ITestRequestManager> mockTestRequestManager;
+    private readonly Mock<ITestRequestManager> _mockTestRequestManager;
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly DesignModeClient _designModeClient;
+    private readonly int _protocolVersion = 7;
+    private readonly AutoResetEvent _completeEvent;
+    private readonly Mock<IEnvironment> _mockPlatformEnvironment;
 
-        private readonly Mock<ICommunicationManager> mockCommunicationManager;
+    public DesignModeClientTests()
+    {
+        _mockTestRequestManager = new Mock<ITestRequestManager>();
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _mockPlatformEnvironment = new Mock<IEnvironment>();
+        _designModeClient = new DesignModeClient(_mockCommunicationManager.Object, JsonDataSerializer.Instance, _mockPlatformEnvironment.Object);
+        _completeEvent = new AutoResetEvent(false);
+    }
 
-        private readonly DesignModeClient designModeClient;
+    [TestMethod]
+    public void DesignModeClientBeforeConnectInstanceShouldReturnNull()
+    {
+        Assert.IsNull(DesignModeClient.Instance);
+    }
 
-        private readonly int protocolVersion = 5;
+    [TestMethod]
+    public void DesignModeClientInitializeShouldInstantiateClassAndCreateClient()
+    {
+        DesignModeClient.Initialize();
+        Assert.IsNotNull(DesignModeClient.Instance);
+    }
 
-        private readonly AutoResetEvent completeEvent;
+    [TestMethod]
+    public void TestRunMessageHandlerShouldCallCommunicationManagerIfMessageIsError()
+    {
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>()));
 
-        private readonly Mock<IEnvironment> mockPlatformEnvrironment;
+        _designModeClient.TestRunMessageHandler(new object(), new TestRunMessageEventArgs(TestMessageLevel.Error, "message"));
 
-        public DesignModeClientTests()
-        {
-            this.mockTestRequestManager = new Mock<ITestRequestManager>();
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.mockPlatformEnvrironment = new Mock<IEnvironment>();
-            this.designModeClient = new DesignModeClient(this.mockCommunicationManager.Object, JsonDataSerializer.Instance, this.mockPlatformEnvrironment.Object);
-            this.completeEvent = new AutoResetEvent(false);
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<TestMessagePayload>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void DesignModeClientBeforeConnectInstanceShouldReturnNull()
-        {
-            Assert.IsNull(DesignModeClient.Instance);
-        }
+    [TestMethod]
+    public void TestRunMessageHandlerShouldCallCommunicationManagerIfMessageIsWarning()
+    {
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>()));
 
-        [TestMethod]
-        public void DesignModeClientInitializeShouldInstantiateClassAndCreateClient()
-        {
-            DesignModeClient.Initialize();
-            Assert.IsNotNull(DesignModeClient.Instance);
-        }
+        _designModeClient.TestRunMessageHandler(new object(), new TestRunMessageEventArgs(TestMessageLevel.Warning, "message"));
 
-        [TestMethod]
-        public void TestRunMessageHandlerShouldCallCommmunicationManagerIfMessageisError()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>()));
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<TestMessagePayload>()), Times.Once());
+    }
 
-            this.designModeClient.TestRunMessageHandler(new object(), new TestRunMessageEventArgs(TestMessageLevel.Error, "message"));
+    [TestMethod]
+    public void DesignModeClientConnectShouldSetupChannel()
+    {
+        var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = _protocolVersion };
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
 
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(),It.IsAny<TestMessagePayload>()), Times.Once());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void TestRunMessageHandlerShouldCallCommmunicationManagerIfMessageisWarning()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>()));
+        _mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.SessionConnected), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once());
+    }
 
-            this.designModeClient.TestRunMessageHandler(new object(), new TestRunMessageEventArgs(TestMessageLevel.Warning, "message"));
+    [TestMethod]
+    public void DesignModeClientConnectShouldNotSendConnectedIfServerConnectionTimesOut()
+    {
+        var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = _protocolVersion };
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(false);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
 
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<TestMessagePayload>()), Times.Once());
-        }
+        Assert.ThrowsException<TimeoutException>(() => _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object));
 
-        [TestMethod]
-        public void TestRunMessageHandlerShouldNotCallCommmunicationManagerIfMessageisInformational()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>()));
+        _mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.SessionConnected), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>()), Times.Never);
+    }
 
-            this.designModeClient.TestRunMessageHandler(new object(), new TestRunMessageEventArgs(TestMessageLevel.Informational, "message"));
+    [TestMethod]
+    public void DesignModeClientDuringConnectShouldHighestCommonVersionWhenReceivedVersionIsGreaterThanSupportedVersion()
+    {
+        var reallyHighProtocolVersion = 10000;
+        var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = reallyHighProtocolVersion };
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
 
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<TestMessagePayload>()), Times.Never());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSetupChannel()
-        {
-            var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = this.protocolVersion };
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once());
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientDuringConnectShouldHighestCommonVersionWhenReceivedVersionIsSmallerThanSupportedVersion()
+    {
+        var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
 
-            this.mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.SessionConnected), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldNotSendConnectedIfServerConnectionTimesOut()
-        {
-            var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = this.protocolVersion };
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(false);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, 1), Times.Once());
+    }
 
-            Assert.ThrowsException<TimeoutException>(() => this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object));
+    [TestMethod]
+    public void DesignModeClientWithGetTestRunnerProcessStartInfoShouldDeserializeTestsWithTraitsCorrectly()
+    {
+        // Arrange.
+        var testCase = new TestCase("A.C.M", new Uri("d:\\executor"), "A.dll");
+        testCase.Traits.Add(new Trait("foo", "bar"));
 
-            this.mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.SessionConnected), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>()), Times.Never);
-        }
+        var testList = new System.Collections.Generic.List<TestCase> { testCase };
+        var testRunPayload = new TestRunRequestPayload { RunSettings = null, TestCases = testList };
 
-        [TestMethod]
-        public void DesignModeClientDuringConnectShouldHighestCommonVersionWhenReceivedVersionIsGreaterThanSupportedVersion()
+        var getProcessStartInfoMessage = new Message
         {
-            var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = 5 };
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
+            MessageType = MessageType.GetTestRunnerProcessStartInfoForRunSelected,
+            Payload = JToken.FromObject("random")
+        };
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        TestRunRequestPayload? receivedTestRunPayload = null;
+        var allTasksComplete = new ManualResetEvent(false);
 
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once());
-        }
+        // Setup mocks.
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.Setup(cm => cm.DeserializePayload<TestRunRequestPayload>(getProcessStartInfoMessage))
+            .Returns(testRunPayload);
 
-        [TestMethod]
-        public void DesignModeClientDuringConnectShouldHighestCommonVersionWhenReceivedVersionIsSmallerThanSupportedVersion()
-        {
-            var verCheck = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(verCheck).Returns(sessionEnd);
-
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
-
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, 1), Times.Once());
-        }
+        _mockTestRequestManager.Setup(
+                trm =>
+                    trm.RunTests(
+                        It.IsAny<TestRunRequestPayload>(),
+                        It.IsAny<ITestHostLauncher3>(),
+                        It.IsAny<ITestRunEventsRegistrar>(),
+                        It.IsAny<ProtocolConfig>()))
+            .Callback(
+                (TestRunRequestPayload trp,
+                    ITestHostLauncher testHostManager,
+                    ITestRunEventsRegistrar testRunEventsRegistrar,
+                    ProtocolConfig config) =>
+                {
+                    receivedTestRunPayload = trp;
+                    allTasksComplete.Set();
+                });
 
-        [TestMethod]
-        public void DesignModeClientWithGetTestRunnerProcessStartInfoShouldDeserializeTestsWithTraitsCorrectly()
-        {
-            // Arrange.
-            var testCase = new TestCase("A.C.M", new Uri("d:\\executor"), "A.dll");
-            testCase.Traits.Add(new Trait("foo", "bar"));
-
-            var testList = new System.Collections.Generic.List<TestCase> { testCase };
-            var testRunPayload = new TestRunRequestPayload { RunSettings = null, TestCases = testList };
-
-            var getProcessStartInfoMessage = new Message
-                                                 {
-                                                     MessageType = MessageType.GetTestRunnerProcessStartInfoForRunSelected,
-                                                     Payload = JToken.FromObject("random")
-                                                 };
-
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            TestRunRequestPayload receivedTestRunPayload = null;
-            var allTasksComplete = new ManualResetEvent(false);
-
-            // Setup mocks.
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.Setup(cm => cm.DeserializePayload<TestRunRequestPayload>(getProcessStartInfoMessage))
-                .Returns(testRunPayload);
-
-            this.mockTestRequestManager.Setup(
-                    trm =>
-                        trm.RunTests(
-                            It.IsAny<TestRunRequestPayload>(),
-                            It.IsAny<ITestHostLauncher>(),
-                            It.IsAny<ITestRunEventsRegistrar>(),
-                            It.IsAny<ProtocolConfig>()))
-                .Callback(
-                    (TestRunRequestPayload trp,
-                     ITestHostLauncher testHostManager,
-                     ITestRunEventsRegistrar testRunEventsRegistrar,
-                     ProtocolConfig config) =>
-                        {
-                            receivedTestRunPayload = trp;
-                            allTasksComplete.Set();
-                        });
-
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage())
-                .Returns(getProcessStartInfoMessage)
-                .Returns(sessionEnd);
-
-            // Act.
-            this.designModeClient.ConnectToClientAndProcessRequests(0, this.mockTestRequestManager.Object);
-
-            // wait for the internal spawned of tasks to complete.
-            Assert.IsTrue(allTasksComplete.WaitOne(1000), "Timed out waiting for mock request manager.");
-
-            // Assert.
-            Assert.IsNotNull(receivedTestRunPayload);
-            Assert.IsNotNull(receivedTestRunPayload.TestCases);
-            Assert.AreEqual(1, receivedTestRunPayload.TestCases.Count);
-
-            // Validate traits
-            var traits = receivedTestRunPayload.TestCases.ToArray()[0].Traits;
-            Assert.AreEqual("foo", traits.ToArray()[0].Name);
-            Assert.AreEqual("bar", traits.ToArray()[0].Value);
-        }
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage())
+            .Returns(getProcessStartInfoMessage)
+            .Returns(sessionEnd);
 
-        [TestMethod]
-        public void DesignModeClientWithRunSelectedTestCasesShouldDeserializeTestsWithTraitsCorrectly()
-        {
-            // Arrange.
-            var testCase = new TestCase("A.C.M", new Uri("d:\\executor"), "A.dll");
-            testCase.Traits.Add(new Trait("foo", "bar"));
-
-            var testList = new System.Collections.Generic.List<TestCase> { testCase };
-            var testRunPayload = new TestRunRequestPayload { RunSettings = null, TestCases = testList };
-
-            var getProcessStartInfoMessage = new Message
-                                                 {
-                                                     MessageType = MessageType.TestRunSelectedTestCasesDefaultHost,
-                                                     Payload = JToken.FromObject("random")
-                                                 };
-
-            var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
-            TestRunRequestPayload receivedTestRunPayload = null;
-            var allTasksComplete = new ManualResetEvent(false);
-
-            // Setup mocks.
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.Setup(cm => cm.DeserializePayload<TestRunRequestPayload>(getProcessStartInfoMessage))
-                .Returns(testRunPayload);
-            this.mockTestRequestManager.Setup(
-                trm =>
-                trm.RunTests(
-                    It.IsAny<TestRunRequestPayload>(),
-                    It.IsAny<ITestHostLauncher>(),
-                    It.IsAny<ITestRunEventsRegistrar>(),
-                    It.IsAny<ProtocolConfig>()))
-                .Callback(
-                    (TestRunRequestPayload trp,
-                     ITestHostLauncher testHostManager,
-                     ITestRunEventsRegistrar testRunEventsRegistrar,
-                     ProtocolConfig config) =>
-                    {
-                        receivedTestRunPayload = trp;
-                        allTasksComplete.Set();
-                    });
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage())
-                .Returns(getProcessStartInfoMessage)
-                .Returns(sessionEnd);
-
-            // Act.
-            this.designModeClient.ConnectToClientAndProcessRequests(0, this.mockTestRequestManager.Object);
-
-            // wait for the internal spawned of tasks to complete.
-            allTasksComplete.WaitOne(1000);
-
-            // Assert.
-            Assert.IsNotNull(receivedTestRunPayload);
-            Assert.IsNotNull(receivedTestRunPayload.TestCases);
-            Assert.AreEqual(1, receivedTestRunPayload.TestCases.Count);
-
-            // Validate traits
-            var traits = receivedTestRunPayload.TestCases.ToArray()[0].Traits;
-            Assert.AreEqual("foo", traits.ToArray()[0].Name);
-            Assert.AreEqual("bar", traits.ToArray()[0].Value);
-        }
+        // Act.
+        _designModeClient.ConnectToClientAndProcessRequests(0, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientOnBadConnectionShouldStopServerAndThrowTimeoutException()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(false);
+        // wait for the internal spawned of tasks to complete.
+        Assert.IsTrue(allTasksComplete.WaitOne(1000), "Timed out waiting for mock request manager.");
 
-            var ex = Assert.ThrowsException<TimeoutException>(() => this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object));
-            Assert.AreEqual("vstest.console process failed to connect to translation layer process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", ex.Message);
+        // Assert.
+        Assert.IsNotNull(receivedTestRunPayload);
+        Assert.IsNotNull(receivedTestRunPayload.TestCases);
+        Assert.AreEqual(1, receivedTestRunPayload.TestCases.Count);
 
-            this.mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.StopClient(), Times.Once);
-        }
+        // Validate traits
+        var traits = receivedTestRunPayload.TestCases.ToArray()[0].Traits;
+        Assert.AreEqual("foo", traits.ToArray()[0].Name);
+        Assert.AreEqual("bar", traits.ToArray()[0].Value);
+    }
 
-        [TestMethod]
-        public void DesignModeClientShouldStopCommunicationOnParentProcessExit()
-        {
-            this.mockPlatformEnvrironment.Setup(pe => pe.Exit(It.IsAny<int>()));
-            this.designModeClient.HandleParentProcessExit();
+    [TestMethod]
+    public void DesignModeClientWithRunSelectedTestCasesShouldDeserializeTestsWithTraitsCorrectly()
+    {
+        // Arrange.
+        var testCase = new TestCase("A.C.M", new Uri("d:\\executor"), "A.dll");
+        testCase.Traits.Add(new Trait("foo", "bar"));
 
-            this.mockCommunicationManager.Verify(cm => cm.StopClient(), Times.Once);
-        }
+        var testList = new System.Collections.Generic.List<TestCase> { testCase };
+        var testRunPayload = new TestRunRequestPayload { RunSettings = null, TestCases = testList };
 
-        [TestMethod]
-        public void DesignModeClientLaunchCustomHostMustReturnIfAckComes()
+        var getProcessStartInfoMessage = new Message
         {
-            var testableDesignModeClient = new TestableDesignModeClient(this.mockCommunicationManager.Object, JsonDataSerializer.Instance, this.mockPlatformEnvrironment.Object);
+            MessageType = MessageType.TestRunSelectedTestCasesDefaultHost,
+            Payload = JToken.FromObject("random")
+        };
+
+        var sessionEnd = new Message { MessageType = MessageType.SessionEnd };
+        TestRunRequestPayload? receivedTestRunPayload = null;
+        var allTasksComplete = new ManualResetEvent(false);
+
+        // Setup mocks.
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.Setup(cm => cm.DeserializePayload<TestRunRequestPayload>(getProcessStartInfoMessage))
+            .Returns(testRunPayload);
+        _mockTestRequestManager.Setup(
+                trm =>
+                    trm.RunTests(
+                        It.IsAny<TestRunRequestPayload>(),
+                        It.IsAny<ITestHostLauncher3>(),
+                        It.IsAny<ITestRunEventsRegistrar>(),
+                        It.IsAny<ProtocolConfig>()))
+            .Callback(
+                (TestRunRequestPayload trp,
+                    ITestHostLauncher testHostManager,
+                    ITestRunEventsRegistrar testRunEventsRegistrar,
+                    ProtocolConfig config) =>
+                {
+                    receivedTestRunPayload = trp;
+                    allTasksComplete.Set();
+                });
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage())
+            .Returns(getProcessStartInfoMessage)
+            .Returns(sessionEnd);
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        // Act.
+        _designModeClient.ConnectToClientAndProcessRequests(0, _mockTestRequestManager.Object);
 
-            var expectedProcessId = 1234;
-            Action sendMessageAction = () =>
-            {
-                testableDesignModeClient.InvokeCustomHostLaunchAckCallback(expectedProcessId, null);
-            };
+        // wait for the internal spawned of tasks to complete.
+        allTasksComplete.WaitOne(1000);
 
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.CustomTestHostLaunch, It.IsAny<object>())).
-                Callback(() => Task.Run(sendMessageAction));
+        // Assert.
+        Assert.IsNotNull(receivedTestRunPayload);
+        Assert.IsNotNull(receivedTestRunPayload.TestCases);
+        Assert.AreEqual(1, receivedTestRunPayload.TestCases.Count);
 
-            var info = new TestProcessStartInfo();
-            var processId = testableDesignModeClient.LaunchCustomHost(info, CancellationToken.None);
+        // Validate traits
+        var traits = receivedTestRunPayload.TestCases.ToArray()[0].Traits;
+        Assert.AreEqual("foo", traits.ToArray()[0].Name);
+        Assert.AreEqual("bar", traits.ToArray()[0].Value);
+    }
 
-            Assert.AreEqual(expectedProcessId, processId);
-        }
+    [TestMethod]
+    public void DesignModeClientOnBadConnectionShouldStopServerAndThrowTimeoutException()
+    {
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(false);
 
-        [TestMethod]
-        [ExpectedException(typeof(TestPlatformException))]
-        public void DesignModeClientLaunchCustomHostMustThrowIfInvalidAckComes()
-        {
-            var testableDesignModeClient = new TestableDesignModeClient(this.mockCommunicationManager.Object, JsonDataSerializer.Instance, this.mockPlatformEnvrironment.Object);
+        var ex = Assert.ThrowsException<TimeoutException>(() => _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object));
+        Assert.AreEqual("vstest.console process failed to connect to translation layer process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", ex.Message);
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.Verify(cm => cm.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, PortNumber)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForServerConnection(It.IsAny<int>()), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.StopClient(), Times.Once);
+    }
 
-            var expectedProcessId = -1;
-            Action sendMessageAction = () =>
-            {
-                testableDesignModeClient.InvokeCustomHostLaunchAckCallback(expectedProcessId, "Dummy");
-            };
+    [TestMethod]
+    public void DesignModeClientShouldStopCommunicationOnParentProcessExit()
+    {
+        _mockPlatformEnvironment.Setup(pe => pe.Exit(It.IsAny<int>()));
+        _designModeClient.HandleParentProcessExit();
 
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.CustomTestHostLaunch, It.IsAny<object>()))
-                .Callback(() => Task.Run(sendMessageAction));
+        _mockCommunicationManager.Verify(cm => cm.StopClient(), Times.Once);
+    }
 
-            var info = new TestProcessStartInfo();
-            testableDesignModeClient.LaunchCustomHost(info, CancellationToken.None);
-        }
+    [TestMethod]
+    public void DesignModeClientLaunchCustomHostMustReturnIfAckComes()
+    {
+        var testableDesignModeClient = new TestableDesignModeClient(_mockCommunicationManager.Object, JsonDataSerializer.Instance, _mockPlatformEnvironment.Object);
 
-        [TestMethod]
-        [ExpectedException(typeof(TestPlatformException))]
-        public void DesignModeClientLaunchCustomHostMustThrowIfCancellationOccursBeforeHostLaunch()
-        {
-            var testableDesignModeClient = new TestableDesignModeClient(this.mockCommunicationManager.Object, JsonDataSerializer.Instance, this.mockPlatformEnvrironment.Object);
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
 
-            var info = new TestProcessStartInfo();
-            var cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
+        var expectedProcessId = 1234;
+        Action sendMessageAction = () => testableDesignModeClient.InvokeCustomHostLaunchAckCallback(expectedProcessId, null);
 
-            testableDesignModeClient.LaunchCustomHost(info, cancellationTokenSource.Token);
-        }
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.CustomTestHostLaunch, It.IsAny<object>())).
+            Callback(() => Task.Run(sendMessageAction));
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnExceptionInDiscovery()
-        {
-            var payload = new DiscoveryRequestPayload();
-            var startDiscovery = new Message { MessageType = MessageType.StartDiscovery, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startDiscovery);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()))
-                .Callback(() => completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                    rm => rm.DiscoverTests(
-                        It.IsAny<DiscoveryRequestPayload>(),
-                        It.IsAny<ITestDiscoveryEventsRegistrar>(),
-                        It.IsAny<ProtocolConfig>()))
-                .Throws(new Exception());
+        var info = new TestProcessStartInfo();
+        var processId = testableDesignModeClient.LaunchCustomHost(info, CancellationToken.None);
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+        Assert.AreEqual(expectedProcessId, processId);
+    }
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Discovery not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()), Times.Once());
-        }
+    [TestMethod]
+    [ExpectedException(typeof(TestPlatformException))]
+    public void DesignModeClientLaunchCustomHostMustThrowIfInvalidAckComes()
+    {
+        var testableDesignModeClient = new TestableDesignModeClient(_mockCommunicationManager.Object, JsonDataSerializer.Instance, _mockPlatformEnvironment.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnTestPlatformExceptionInDiscovery()
-        {
-            var payload = new DiscoveryRequestPayload();
-            var startDiscovery = new Message { MessageType = MessageType.StartDiscovery, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startDiscovery);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()))
-                .Callback(() => completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                    rm => rm.DiscoverTests(
-                        It.IsAny<DiscoveryRequestPayload>(),
-                        It.IsAny<ITestDiscoveryEventsRegistrar>(),
-                        It.IsAny<ProtocolConfig>()))
-                .Throws(new TestPlatformException("Hello world"));
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+        var expectedProcessId = -1;
+        Action sendMessageAction = () => testableDesignModeClient.InvokeCustomHostLaunchAckCallback(expectedProcessId, "Dummy");
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Discovery not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()), Times.Once());
-        }
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.CustomTestHostLaunch, It.IsAny<object>()))
+            .Callback(() => Task.Run(sendMessageAction));
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndAttachmentsProcessingCompleteOnExceptionInAttachmentsProcessing()
-        {
-            var payload = new TestRunAttachmentsProcessingPayload();
-            var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()))
-                .Callback(() => completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                    rm => rm.ProcessTestRunAttachments(
-                        It.IsAny<TestRunAttachmentsProcessingPayload>(),
-                        It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
-                        It.IsAny<ProtocolConfig>()))
-                .Throws(new Exception());
+        var info = new TestProcessStartInfo();
+        testableDesignModeClient.LaunchCustomHost(info, CancellationToken.None);
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    [ExpectedException(typeof(TestPlatformException))]
+    public void DesignModeClientLaunchCustomHostMustThrowIfCancellationOccursBeforeHostLaunch()
+    {
+        var testableDesignModeClient = new TestableDesignModeClient(_mockCommunicationManager.Object, JsonDataSerializer.Instance, _mockPlatformEnvironment.Object);
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == null)), Times.Once());
-        }
+        var info = new TestProcessStartInfo();
+        var cancellationTokenSource = new CancellationTokenSource();
+        cancellationTokenSource.Cancel();
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnTestPlatformExceptionInAttachmentsProcessing()
-        {
-            var payload = new TestRunAttachmentsProcessingPayload();
-            var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()))
-                .Callback(() => completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                    rm => rm.ProcessTestRunAttachments(
-                        It.IsAny<TestRunAttachmentsProcessingPayload>(),
-                        It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
-                        It.IsAny<ProtocolConfig>()))
-                .Throws(new TestPlatformException("Hello world"));
+        testableDesignModeClient.LaunchCustomHost(info, cancellationTokenSource.Token);
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnExceptionInDiscovery()
+    {
+        var payload = new DiscoveryRequestPayload();
+        var startDiscovery = new Message { MessageType = MessageType.StartDiscovery, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startDiscovery);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+                rm => rm.DiscoverTests(
+                    It.IsAny<DiscoveryRequestPayload>(),
+                    It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                    It.IsAny<ProtocolConfig>()))
+            .Throws(new Exception());
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == null)), Times.Once());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldCallRequestManagerForAttachmentsProcessingStart()
-        {
-            var payload = new TestRunAttachmentsProcessingPayload();
-            var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
-
-            this.mockTestRequestManager
-                .Setup(
-                    rm => rm.ProcessTestRunAttachments(
-                        It.IsAny<TestRunAttachmentsProcessingPayload>(),
-                        It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
-                        It.IsAny<ProtocolConfig>()))
-                .Callback(() => completeEvent.Set());
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Discovery not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()), Times.Once());
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnTestPlatformExceptionInDiscovery()
+    {
+        var payload = new DiscoveryRequestPayload();
+        var startDiscovery = new Message { MessageType = MessageType.StartDiscovery, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startDiscovery);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+                rm => rm.DiscoverTests(
+                    It.IsAny<DiscoveryRequestPayload>(),
+                    It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                    It.IsAny<ProtocolConfig>()))
+            .Throws(new TestPlatformException("Hello world"));
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()), Times.Never);
-            this.mockTestRequestManager.Verify(rm => rm.ProcessTestRunAttachments(It.IsAny<TestRunAttachmentsProcessingPayload>(), It.IsAny<TestRunAttachmentsProcessingEventsHandler>(), It.IsAny<ProtocolConfig>()));
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldCallRequestManagerForAttachmentsProcessingCancel()
-        {
-            var cancelAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingCancel };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(cancelAttachmentsProcessing);
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Discovery not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>()), Times.Once());
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndAttachmentsProcessingCompleteOnExceptionInAttachmentsProcessing()
+    {
+        var payload = new TestRunAttachmentsProcessingPayload();
+        var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+                rm => rm.ProcessTestRunAttachments(
+                    It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                    It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                    It.IsAny<ProtocolConfig>()))
+            .Throws(new Exception());
 
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()), Times.Never);
-            this.mockTestRequestManager.Verify(rm => rm.CancelTestRunAttachmentsProcessing());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndExecutionCompleteOnExceptionInTestRun()
-        {
-            var payload = new TestRunRequestPayload();
-            var testRunAll = new Message { MessageType = MessageType.TestRunAllSourcesWithDefaultHost, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(testRunAll);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()))
-                .Callback(() => this.completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                rm => rm.RunTests(
-                    It.IsAny<TestRunRequestPayload>(),
-                    null,
-                    It.IsAny<DesignModeTestEventsRegistrar>(),
-                It.IsAny<ProtocolConfig>())).Throws(new Exception());
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == null)), Times.Once());
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndDiscoverCompleteOnTestPlatformExceptionInAttachmentsProcessing()
+    {
+        var payload = new TestRunAttachmentsProcessingPayload();
+        var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+                rm => rm.ProcessTestRunAttachments(
+                    It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                    It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                    It.IsAny<ProtocolConfig>()))
+            .Throws(new TestPlatformException("Hello world"));
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Execution not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()), Times.Once());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldSendTestMessageAndExecutionCompleteOnTestPlatformExceptionInTestRun()
-        {
-            var payload = new TestRunRequestPayload();
-            var testRunAll = new Message { MessageType = MessageType.TestRunAllSourcesWithDefaultHost, Payload = JToken.FromObject(payload) };
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(testRunAll);
-            this.mockCommunicationManager
-                .Setup(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()))
-                .Callback(() => this.completeEvent.Set());
-            this.mockTestRequestManager.Setup(
-                rm => rm.RunTests(
-                    It.IsAny<TestRunRequestPayload>(),
-                    null,
-                    It.IsAny<DesignModeTestEventsRegistrar>(),
-                It.IsAny<ProtocolConfig>())).Throws(new TestPlatformException("Hello world"));
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.Is<TestRunAttachmentsProcessingCompletePayload>(p => p.Attachments == null)), Times.Once());
+    }
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+    [TestMethod]
+    public void DesignModeClientConnectShouldCallRequestManagerForAttachmentsProcessingStart()
+    {
+        var payload = new TestRunAttachmentsProcessingPayload();
+        var startAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingStart, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startAttachmentsProcessing);
+        _mockCommunicationManager.Setup(cm => cm.DeserializePayload<TestRunAttachmentsProcessingPayload>(It.IsAny<Message>())).Returns(payload);
+
+        _mockTestRequestManager
+            .Setup(
+                rm => rm.ProcessTestRunAttachments(
+                    It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                    It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                    It.IsAny<ProtocolConfig>()))
+            .Callback(() => _completeEvent.Set());
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Execution not completed.");
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()), Times.Once());
-        }
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldReturnNullSessionWhenStartTestSessionThrows()
-        {
-            var payload = new StartTestSessionPayload();
-            var startTestSessionMessage = new Message()
-            {
-                MessageType = MessageType.StartTestSession,
-                Payload = JToken.FromObject(payload)
-            };
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "AttachmentsProcessing not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()), Times.Never);
+        _mockTestRequestManager.Verify(rm => rm.ProcessTestRunAttachments(It.IsAny<TestRunAttachmentsProcessingPayload>(), It.IsAny<TestRunAttachmentsProcessingEventsHandler>(), It.IsAny<ProtocolConfig>()));
+    }
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startTestSessionMessage);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.StartTestSessionCallback,
-                    It.IsAny<StartTestSessionAckPayload>()))
-                .Callback((string _, object actualPayload) =>
-                {
-                    this.completeEvent.Set();
-                    Assert.IsNull(((StartTestSessionAckPayload)actualPayload).TestSessionInfo);
-                });
-            this.mockCommunicationManager.Setup(
-                cm => cm.DeserializePayload<StartTestSessionPayload>(
-                    startTestSessionMessage))
-                .Returns(payload);
-
-            this.mockTestRequestManager.Setup(
-                rm => rm.StartTestSession(
-                    It.IsAny<StartTestSessionPayload>(),
-                    It.IsAny<ITestHostLauncher>(),
-                    It.IsAny<ITestSessionEventsHandler>(),
-                    It.IsAny<ProtocolConfig>())).Throws(new SettingsException("DummyException"));
-
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
-
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Start test session not completed.");
-            this.mockCommunicationManager.Verify(
-                cm => cm.SendMessage(
-                    MessageType.StartTestSessionCallback,
-                    It.IsAny<StartTestSessionAckPayload>()),
-                Times.Once());
-        }
+    [TestMethod]
+    public void DesignModeClientConnectShouldCallRequestManagerForAttachmentsProcessingCancel()
+    {
+        var cancelAttachmentsProcessing = new Message { MessageType = MessageType.TestRunAttachmentsProcessingCancel };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(cancelAttachmentsProcessing);
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldReturnFalseWhenStopTestSessionThrows()
-        {
-            var mockTestPool = new Mock<TestSessionPool>();
-            TestSessionPool.Instance = mockTestPool.Object;
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-            var testSessionInfo = new TestSessionInfo();
-            var stopTestSessionMessage = new Message()
-            {
-                MessageType = MessageType.StopTestSession,
-                Payload = JToken.FromObject(testSessionInfo)
-            };
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, It.IsAny<TestRunAttachmentsProcessingCompletePayload>()), Times.Never);
+        _mockTestRequestManager.Verify(rm => rm.CancelTestRunAttachmentsProcessing());
+    }
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(stopTestSessionMessage);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()))
-                .Callback((string _, object actualPayload) =>
-                {
-                    this.completeEvent.Set();
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndExecutionCompleteOnExceptionInTestRun()
+    {
+        var payload = new TestRunRequestPayload();
+        var testRunAll = new Message { MessageType = MessageType.TestRunAllSourcesWithDefaultHost, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(testRunAll);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+            rm => rm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                null,
+                It.IsAny<DesignModeTestEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>())).Throws(new Exception());
 
-                    Assert.AreEqual(((StopTestSessionAckPayload)actualPayload).TestSessionInfo, testSessionInfo);
-                    Assert.IsFalse(((StopTestSessionAckPayload)actualPayload).IsStopped);
-                });
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-            this.mockCommunicationManager.Setup(
-                cm => cm.DeserializePayload<TestSessionInfo>(
-                    stopTestSessionMessage))
-                .Returns(testSessionInfo);
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Execution not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()), Times.Once());
+    }
 
-            mockTestPool.Setup(tp => tp.KillSession(testSessionInfo)).Throws(new Exception("DummyException"));
+    [TestMethod]
+    public void DesignModeClientConnectShouldSendTestMessageAndExecutionCompleteOnTestPlatformExceptionInTestRun()
+    {
+        var payload = new TestRunRequestPayload();
+        var testRunAll = new Message { MessageType = MessageType.TestRunAllSourcesWithDefaultHost, Payload = JToken.FromObject(payload) };
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(testRunAll);
+        _mockCommunicationManager
+            .Setup(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()))
+            .Callback(() => _completeEvent.Set());
+        _mockTestRequestManager.Setup(
+            rm => rm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                null,
+                It.IsAny<DesignModeTestEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>())).Throws(new TestPlatformException("Hello world"));
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Start test session not completed.");
-            this.mockCommunicationManager.Verify(
-                cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()),
-                Times.Once());
-        }
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Execution not completed.");
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldReturnFalseWhenStopTestSessionReturnsFalse()
+    [TestMethod]
+    public void DesignModeClientConnectShouldReturnNullSessionWhenStartTestSessionThrows()
+    {
+        var payload = new StartTestSessionPayload();
+        var startTestSessionMessage = new Message()
         {
-            var mockTestPool = new Mock<TestSessionPool>();
-            TestSessionPool.Instance = mockTestPool.Object;
-
-            var testSessionInfo = new TestSessionInfo();
-            var stopTestSessionMessage = new Message()
+            MessageType = MessageType.StartTestSession,
+            Payload = JToken.FromObject(payload)
+        };
+
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(startTestSessionMessage);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.StartTestSessionCallback,
+                It.IsAny<StartTestSessionAckPayload>()))
+            .Callback((string _, object actualPayload) =>
             {
-                MessageType = MessageType.StopTestSession,
-                Payload = JToken.FromObject(testSessionInfo)
-            };
-
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(stopTestSessionMessage);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()))
-                .Callback((string _, object actualPayload) =>
-                {
-                    this.completeEvent.Set();
-
-                    Assert.AreEqual(((StopTestSessionAckPayload)actualPayload).TestSessionInfo, testSessionInfo);
-                    Assert.IsFalse(((StopTestSessionAckPayload)actualPayload).IsStopped);
-                });
-
-            this.mockCommunicationManager.Setup(
-                cm => cm.DeserializePayload<TestSessionInfo>(
-                    stopTestSessionMessage))
-                .Returns(testSessionInfo);
-
-            mockTestPool.Setup(tp => tp.KillSession(testSessionInfo)).Returns(false);
-
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+                _completeEvent.Set();
+                Assert.IsNull(((StartTestSessionAckPayload)actualPayload).EventArgs!.TestSessionInfo);
+            });
+        _mockCommunicationManager.Setup(
+                cm => cm.DeserializePayload<StartTestSessionPayload>(
+                    startTestSessionMessage))
+            .Returns(payload);
+
+        _mockTestRequestManager.Setup(
+            rm => rm.StartTestSession(
+                It.IsAny<StartTestSessionPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestSessionEventsHandler>(),
+                It.IsAny<ProtocolConfig>())).Throws(new SettingsException("DummyException"));
+
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
+
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Start test session not completed.");
+        _mockCommunicationManager.Verify(
+            cm => cm.SendMessage(
+                MessageType.StartTestSessionCallback,
+                It.IsAny<StartTestSessionAckPayload>()),
+            Times.Once());
+    }
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Start test session not completed.");
-            this.mockCommunicationManager.Verify(
-                cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()),
-                Times.Once());
-        }
+    [TestMethod]
+    public void DesignModeClientConnectShouldReturnFalseWhenStopTestSessionThrows()
+    {
+        var mockTestPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestPool.Object;
 
-        [TestMethod]
-        public void DesignModeClientConnectShouldReturnTruenWhenStopTestSessionReturnsTrue()
+        var testSessionInfo = new TestSessionInfo();
+        var stopTestSessionPayload = new StopTestSessionPayload
         {
-            var mockTestPool = new Mock<TestSessionPool>();
-            TestSessionPool.Instance = mockTestPool.Object;
-
-            var testSessionInfo = new TestSessionInfo();
-            var stopTestSessionMessage = new Message()
+            TestSessionInfo = testSessionInfo,
+            CollectMetrics = true
+        };
+        var stopTestSessionMessage = new Message()
+        {
+            MessageType = MessageType.StopTestSession,
+            Payload = JToken.FromObject(stopTestSessionPayload)
+        };
+
+        _mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
+        _mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(stopTestSessionMessage);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.StopTestSessionCallback,
+                It.IsAny<StopTestSessionAckPayload>()))
+            .Callback((string _, object actualPayload) =>
             {
-                MessageType = MessageType.StopTestSession,
-                Payload = JToken.FromObject(testSessionInfo)
-            };
+                _completeEvent.Set();
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForServerConnection(It.IsAny<int>())).Returns(true);
-            this.mockCommunicationManager.SetupSequence(cm => cm.ReceiveMessage()).Returns(stopTestSessionMessage);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()))
-                .Callback((string _, object actualPayload) =>
-                {
-                    this.completeEvent.Set();
-
-                    Assert.AreEqual(((StopTestSessionAckPayload)actualPayload).TestSessionInfo, testSessionInfo);
-                    Assert.IsTrue(((StopTestSessionAckPayload)actualPayload).IsStopped);
-                });
+                Assert.AreEqual(((StopTestSessionAckPayload)actualPayload).EventArgs!.TestSessionInfo, testSessionInfo);
+                Assert.IsFalse(((StopTestSessionAckPayload)actualPayload).EventArgs!.IsStopped);
+            });
 
-            this.mockCommunicationManager.Setup(
-                cm => cm.DeserializePayload<TestSessionInfo>(
+        _mockCommunicationManager.Setup(
+                cm => cm.DeserializePayload<StopTestSessionPayload>(
                     stopTestSessionMessage))
-                .Returns(testSessionInfo);
+            .Returns(stopTestSessionPayload);
+
+        _mockTestRequestManager.Setup(
+            rm => rm.StopTestSession(
+                It.IsAny<StopTestSessionPayload>(),
+                It.IsAny<ITestSessionEventsHandler>(),
+                It.IsAny<ProtocolConfig>())).Throws(new Exception("DummyException"));
+
+        _designModeClient.ConnectToClientAndProcessRequests(PortNumber, _mockTestRequestManager.Object);
+
+        Assert.IsTrue(_completeEvent.WaitOne(Timeout), "Start test session not completed.");
+        _mockCommunicationManager.Verify(
+            cm => cm.SendMessage(
+                MessageType.StopTestSessionCallback,
+                It.IsAny<StopTestSessionAckPayload>()),
+            Times.Once());
+    }
 
-            mockTestPool.Setup(tp => tp.KillSession(testSessionInfo)).Returns(true);
+    [TestMethod]
+    public void DesignModeClientSendTestMessageShouldSendTestMessage()
+    {
+        var testPayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "DummyMessage" };
 
-            this.designModeClient.ConnectToClientAndProcessRequests(PortNumber, this.mockTestRequestManager.Object);
+        _designModeClient.SendTestMessage(testPayload.MessageLevel, testPayload.Message);
 
-            Assert.IsTrue(this.completeEvent.WaitOne(Timeout), "Start test session not completed.");
-            this.mockCommunicationManager.Verify(
-                cm => cm.SendMessage(
-                    MessageType.StopTestSessionCallback,
-                    It.IsAny<StopTestSessionAckPayload>()),
-                Times.Once());
-        }
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void DesignModeClientSendTestMessageShouldSendTestMessage()
+    private class TestableDesignModeClient : DesignModeClient
+    {
+        internal TestableDesignModeClient(
+            ICommunicationManager communicationManager,
+            IDataSerializer dataSerializer,
+            IEnvironment platformEnvironment)
+            : base(communicationManager, dataSerializer, platformEnvironment)
         {
-            var testPayload = new TestMessagePayload { MessageLevel = ObjectModel.Logging.TestMessageLevel.Error, Message = "DummyMessage" };
-
-            this.designModeClient.SendTestMessage(testPayload.MessageLevel, testPayload.Message);
-
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.TestMessage, It.IsAny<TestMessagePayload>()), Times.Once());
         }
 
-        private class TestableDesignModeClient : DesignModeClient
+        public void InvokeCustomHostLaunchAckCallback(int processId, string? errorMessage)
         {
-            internal TestableDesignModeClient(
-                ICommunicationManager communicationManager,
-                IDataSerializer dataSerializer,
-                IEnvironment platformEnvironment)
-                : base(communicationManager, dataSerializer, platformEnvironment)
-            {
-            }
-
-            public void InvokeCustomHostLaunchAckCallback(int processId, string errorMessage)
+            var payload = new CustomHostLaunchAckPayload()
             {
-                var payload = new CustomHostLaunchAckPayload()
-                {
-                    HostProcessId = processId,
-                    ErrorMessage = errorMessage
-                };
-                this.onCustomTestHostLaunchAckReceived?.Invoke(
-                    new Message() { MessageType = MessageType.CustomTestHostLaunchCallback, Payload = JToken.FromObject(payload) });
-            }
+                HostProcessId = processId,
+                ErrorMessage = errorMessage
+            };
+            onCustomTestHostLaunchAckReceived?.Invoke(
+                new Message() { MessageType = MessageType.CustomTestHostLaunchCallback, Payload = JToken.FromObject(payload) });
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherFactoryTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherFactoryTests.cs
index 177d73d5f1..4f595713ba 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherFactoryTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherFactoryTests.cs
@@ -1,35 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode
-{
-    using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
 
-    using Moq;
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode;
 
-    [TestClass]
-    public class DesignModeTestHostLauncherFactoryTests
+[TestClass]
+public class DesignModeTestHostLauncherFactoryTests
+{
+    [TestMethod]
+    public void DesignModeTestHostFactoryShouldReturnNonDebugLauncherIfDebuggingDisabled()
     {
-        [TestMethod]
-        public void DesignModeTestHostFactoryShouldReturnNonDebugLauncherIfDebuggingDisabled()
-        {
-            var mockDesignModeClient = new Mock<IDesignModeClient>();
-            var testRunRequestPayload = new TestRunRequestPayload { DebuggingEnabled = false };
-            var launcher = DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(mockDesignModeClient.Object, testRunRequestPayload.DebuggingEnabled);
+        var mockDesignModeClient = new Mock<IDesignModeClient>();
+        var testRunRequestPayload = new TestRunRequestPayload { DebuggingEnabled = false };
+        var launcher = DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(mockDesignModeClient.Object, testRunRequestPayload.DebuggingEnabled);
 
-            Assert.IsFalse(launcher.IsDebug, "Factory must not return debug launcher if debugging is disabled.");
-        }
+        Assert.IsFalse(launcher.IsDebug, "Factory must not return debug launcher if debugging is disabled.");
+    }
 
-        [TestMethod]
-        public void DesignModeTestHostFactoryShouldReturnDebugLauncherIfDebuggingEnabled()
-        {
-            var mockDesignModeClient = new Mock<IDesignModeClient>();
-            var testRunRequestPayload = new TestRunRequestPayload { DebuggingEnabled = true };
-            var launcher = DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(mockDesignModeClient.Object, testRunRequestPayload.DebuggingEnabled);
+    [TestMethod]
+    public void DesignModeTestHostFactoryShouldReturnDebugLauncherIfDebuggingEnabled()
+    {
+        var mockDesignModeClient = new Mock<IDesignModeClient>();
+        var testRunRequestPayload = new TestRunRequestPayload { DebuggingEnabled = true };
+        var launcher = DesignModeTestHostLauncherFactory.GetCustomHostLauncherForTestRun(mockDesignModeClient.Object, testRunRequestPayload.DebuggingEnabled);
 
-            Assert.IsTrue(launcher.IsDebug, "Factory must return non-debug launcher if debugging is enabled.");
-        }
+        Assert.IsTrue(launcher.IsDebug, "Factory must return non-debug launcher if debugging is enabled.");
     }
 }
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherTests.cs
index 01f98448fb..22c33b59bc 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeTestHostLauncherTests.cs
@@ -1,44 +1,44 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Threading;
+
 using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using Moq;
-using System.Threading;
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.DesignMode;
+
+[TestClass]
+public class DesignModeTestHostLauncherTests
 {
-    [TestClass]
-    public class DesignModeTestHostLauncherTests
+    [TestMethod]
+    public void DesignModeTestHostLauncherLaunchTestHostShouldCallDesignModeClientToLaunchCustomHost()
     {
-        [TestMethod]
-        public void DesignModeTestHostLauncherLaunchTestHostShouldCallDesignModeClientToLaunchCustomHost()
-        {
-            var mockDesignModeClient = new Mock<IDesignModeClient>();
-            var launcher = new DesignModeTestHostLauncher(mockDesignModeClient.Object);
-            Assert.IsFalse(launcher.IsDebug, "Default launcher must not implement debug launcher interface.");
+        var mockDesignModeClient = new Mock<IDesignModeClient>();
+        var launcher = new DesignModeTestHostLauncher(mockDesignModeClient.Object);
+        Assert.IsFalse(launcher.IsDebug, "Default launcher must not implement debug launcher interface.");
 
-            var testProcessStartInfo = new TestProcessStartInfo();
+        var testProcessStartInfo = new TestProcessStartInfo();
 
-            launcher.LaunchTestHost(testProcessStartInfo);
+        launcher.LaunchTestHost(testProcessStartInfo);
 
-            mockDesignModeClient.Verify(md => md.LaunchCustomHost(testProcessStartInfo, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        mockDesignModeClient.Verify(md => md.LaunchCustomHost(testProcessStartInfo, It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void DesignModeDebugTestHostLauncherLaunchTestHostShouldCallDesignModeClientToLaunchCustomHost()
-        {
-            var mockDesignModeClient = new Mock<IDesignModeClient>();
-            var launcher = new DesignModeDebugTestHostLauncher(mockDesignModeClient.Object);
-            Assert.IsTrue(launcher.IsDebug, "Debug launcher must implement debug launcher interface.");
+    [TestMethod]
+    public void DesignModeDebugTestHostLauncherLaunchTestHostShouldCallDesignModeClientToLaunchCustomHost()
+    {
+        var mockDesignModeClient = new Mock<IDesignModeClient>();
+        var launcher = new DesignModeDebugTestHostLauncher(mockDesignModeClient.Object);
+        Assert.IsTrue(launcher.IsDebug, "Debug launcher must implement debug launcher interface.");
 
-            var testProcessStartInfo = new TestProcessStartInfo();
+        var testProcessStartInfo = new TestProcessStartInfo();
 
-            launcher.LaunchTestHost(testProcessStartInfo);
+        launcher.LaunchTestHost(testProcessStartInfo);
 
-            mockDesignModeClient.Verify(md => md.LaunchCustomHost(testProcessStartInfo, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        mockDesignModeClient.Verify(md => md.LaunchCustomHost(testProcessStartInfo, It.IsAny<CancellationToken>()), Times.Once);
     }
 }
-
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs
index 3b80962f7b..1a64538b9a 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs
@@ -1,291 +1,303 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.Discovery
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Client.Discovery;
 
-    using Client.Discovery;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 
-    using Moq;
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.Discovery;
 
-    [TestClass]
-    public class DiscoveryRequestTests
+[TestClass]
+public class DiscoveryRequestTests
+{
+    readonly DiscoveryRequest _discoveryRequest;
+    readonly Mock<IProxyDiscoveryManager> _discoveryManager;
+    private readonly Mock<ITestLoggerManager> _loggerManager;
+    readonly DiscoveryCriteria _discoveryCriteria;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+
+    public DiscoveryRequestTests()
     {
-        DiscoveryRequest discoveryRequest;
-        Mock<IProxyDiscoveryManager> discoveryManager;
-        private readonly Mock<ITestLoggerManager> loggerManager;
-        DiscoveryCriteria discoveryCriteria;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IDataSerializer> mockDataSerializer;
-
-        public DiscoveryRequestTests()
-        {
-            this.discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
-            this.discoveryManager = new Mock<IProxyDiscoveryManager>();
-            this.loggerManager = new Mock<ITestLoggerManager>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.discoveryRequest = new DiscoveryRequest(this.mockRequestData.Object, this.discoveryCriteria, this.discoveryManager.Object, loggerManager.Object, this.mockDataSerializer.Object);
-        }
+        _discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
+        _discoveryManager = new Mock<IProxyDiscoveryManager>();
+        _loggerManager = new Mock<ITestLoggerManager>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _discoveryRequest = new DiscoveryRequest(_mockRequestData.Object, _discoveryCriteria, _discoveryManager.Object, _loggerManager.Object, _mockDataSerializer.Object);
+    }
 
-        [TestMethod]
-        public void ConstructorSetsDiscoveryCriteriaAndDiscoveryManager()
-        {
-            Assert.AreEqual(this.discoveryCriteria, this.discoveryRequest.DiscoveryCriteria);
-            Assert.AreEqual(this.discoveryManager.Object, (this.discoveryRequest as DiscoveryRequest).DiscoveryManager);
-        }
+    public static IEnumerable<object[]> ProtocolConfigVersionProvider
+        => Enumerable.Range(0, Constants.DefaultProtocolConfig.Version + 1)
+            .Select(x => new object[] { x });
 
-        [TestMethod]
-        public void DiscoveryAsycIfDiscoveryRequestIsDisposedThrowsObjectDisposedException()
-        {
-            this.discoveryRequest.Dispose();
+    [TestMethod]
+    public void ConstructorSetsDiscoveryCriteriaAndDiscoveryManager()
+    {
+        Assert.AreEqual(_discoveryCriteria, _discoveryRequest.DiscoveryCriteria);
+        Assert.AreEqual(_discoveryManager.Object, (_discoveryRequest as DiscoveryRequest).DiscoveryManager);
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() => this.discoveryRequest.DiscoverAsync());
-        }
+    [TestMethod]
+    public void DiscoveryAsycIfDiscoveryRequestIsDisposedThrowsObjectDisposedException()
+    {
+        _discoveryRequest.Dispose();
 
-        [TestMethod]
-        public void DiscoverAsyncSetsDiscoveryInProgressAndCallManagerToDiscoverTests()
-        {
-            this.discoveryRequest.DiscoverAsync();
+        Assert.ThrowsException<ObjectDisposedException>(() => _discoveryRequest.DiscoverAsync());
+    }
 
-            Assert.IsTrue((this.discoveryRequest as DiscoveryRequest).DiscoveryInProgress);
-            this.discoveryManager.Verify(dm => dm.DiscoverTests(this.discoveryCriteria, this.discoveryRequest as DiscoveryRequest), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverAsyncSetsDiscoveryInProgressAndCallManagerToDiscoverTests()
+    {
+        _discoveryRequest.DiscoverAsync();
 
-        [TestMethod]
-        public void DiscoveryAsyncIfDiscoverTestsThrowsExceptionSetsDiscoveryInProgressToFalseAndThrowsThatException()
+        Assert.IsTrue((_discoveryRequest as DiscoveryRequest).DiscoveryInProgress);
+        _discoveryManager.Verify(dm => dm.DiscoverTests(_discoveryCriteria, _discoveryRequest as DiscoveryRequest), Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoveryAsyncIfDiscoverTestsThrowsExceptionSetsDiscoveryInProgressToFalseAndThrowsThatException()
+    {
+        _discoveryManager.Setup(dm => dm.DiscoverTests(_discoveryCriteria, _discoveryRequest as DiscoveryRequest)).Throws(new Exception("DummyException"));
+        try
         {
-            this.discoveryManager.Setup(dm => dm.DiscoverTests(this.discoveryCriteria, this.discoveryRequest as DiscoveryRequest)).Throws(new Exception("DummyException"));
-            try
-            {
-                this.discoveryRequest.DiscoverAsync();
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is Exception);
-                Assert.AreEqual("DummyException", ex.Message);
-                Assert.IsFalse((this.discoveryRequest as DiscoveryRequest).DiscoveryInProgress);
-            }
+            _discoveryRequest.DiscoverAsync();
         }
-
-        [TestMethod]
-        public void AbortIfDiscoveryRequestDisposedShouldThrowObjectDisposedException()
+        catch (Exception ex)
         {
-            this.discoveryRequest.Dispose();
-            Assert.ThrowsException<ObjectDisposedException>(() => this.discoveryRequest.Abort());
+            Assert.IsTrue(ex is Exception);
+            Assert.AreEqual("DummyException", ex.Message);
+            Assert.IsFalse((_discoveryRequest as DiscoveryRequest).DiscoveryInProgress);
         }
+    }
 
-        [TestMethod]
-        public void AbortIfDiscoveryIsinProgressShouldCallDiscoveryManagerAbort()
-        {
-            // Just to set the IsDiscoveryInProgress flag
-            this.discoveryRequest.DiscoverAsync();
+    [TestMethod]
+    public void AbortIfDiscoveryRequestDisposedShouldThrowObjectDisposedException()
+    {
+        _discoveryRequest.Dispose();
+        Assert.ThrowsException<ObjectDisposedException>(() => _discoveryRequest.Abort());
+    }
 
-            this.discoveryRequest.Abort();
-            this.discoveryManager.Verify(dm => dm.Abort(), Times.Once);
-        }
+    [DataTestMethod]
+    [DynamicData(nameof(ProtocolConfigVersionProvider))]
+    public void AbortIfDiscoveryIsinProgressShouldCallDiscoveryManagerAbort(int version)
+    {
+        // Just to set the IsDiscoveryInProgress flag
+        _discoveryRequest.DiscoverAsync();
+        // Set the protocol version to a version not supporting new abort overload.
+        Constants.DefaultProtocolConfig.Version = version;
+
+        _discoveryRequest.Abort();
 
-        [TestMethod]
-        public void AbortIfDiscoveryIsNotInProgressShouldNotCallDiscoveryManagerAbort()
+        if (version < Constants.MinimumProtocolVersionWithCancelDiscoveryEventHandlerSupport)
         {
-            // DiscoveryAsync has not been called, discoveryInProgress should be false
-            this.discoveryRequest.Abort();
-            this.discoveryManager.Verify(dm => dm.Abort(), Times.Never);
+            _discoveryManager.Verify(dm => dm.Abort(), Times.Once);
+            _discoveryManager.Verify(dm => dm.Abort(_discoveryRequest), Times.Never);
         }
-
-        [TestMethod]
-        public void WaitForCompletionIfDiscoveryRequestDisposedShouldThrowObjectDisposedException()
+        else
         {
-            this.discoveryRequest.Dispose();
-            Assert.ThrowsException<ObjectDisposedException>(() => this.discoveryRequest.WaitForCompletion());
+            _discoveryManager.Verify(dm => dm.Abort(), Times.Never);
+            _discoveryManager.Verify(dm => dm.Abort(_discoveryRequest), Times.Once);
         }
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCloseDiscoveryManager()
-        {
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
+    [TestMethod]
+    public void AbortIfDiscoveryIsNotInProgressShouldNotCallDiscoveryManagerAbort()
+    {
+        // DiscoveryAsync has not been called, discoveryInProgress should be false
+        _discoveryRequest.Abort();
+        _discoveryManager.Verify(dm => dm.Abort(), Times.Never);
+    }
 
-            eventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(1, false), Enumerable.Empty<TestCase>());
-            this.discoveryManager.Verify(dm => dm.Close(), Times.Once);
-        }
+    [TestMethod]
+    public void WaitForCompletionIfDiscoveryRequestDisposedShouldThrowObjectDisposedException()
+    {
+        _discoveryRequest.Dispose();
+        Assert.ThrowsException<ObjectDisposedException>(() => _discoveryRequest.WaitForCompletion());
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCloseDiscoveryManagerBeforeRaiseDiscoveryComplete()
-        {
-            var events = new List<string>();
-            this.discoveryManager.Setup(dm => dm.Close()).Callback(() => events.Add("close"));
-            this.discoveryRequest.OnDiscoveryComplete += (s, e) => events.Add("complete");
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCloseDiscoveryManager()
+    {
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
 
-            eventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(1, false), Enumerable.Empty<TestCase>());
+        eventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(1, false), []);
+        _discoveryManager.Verify(dm => dm.Close(), Times.Once);
+    }
 
-            Assert.AreEqual(2, events.Count);
-            Assert.AreEqual("close", events[0]);
-            Assert.AreEqual("complete", events[1]);
-        }
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCloseDiscoveryManagerBeforeRaiseDiscoveryComplete()
+    {
+        var events = new List<string>();
+        _discoveryManager.Setup(dm => dm.Close()).Callback(() => events.Add("close"));
+        _discoveryRequest.OnDiscoveryComplete += (s, e) => events.Add("complete");
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
 
-        /// <summary>
-        /// DiscoverAsync should invoke OnDiscoveryStart event.
-        /// </summary>
-        [TestMethod]
-        public void DiscoverAsyncShouldInvokeOnDiscoveryStart()
-        {
-            bool onDiscoveryStartHandlerCalled = false;
-            this.discoveryRequest.OnDiscoveryStart += (s, e) => onDiscoveryStartHandlerCalled = true;
+        eventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(1, false), []);
 
-            // Action
-            this.discoveryRequest.DiscoverAsync();
+        Assert.AreEqual(2, events.Count);
+        Assert.AreEqual("close", events[0]);
+        Assert.AreEqual("complete", events[1]);
+    }
 
-            // Assert
-            Assert.IsTrue(onDiscoveryStartHandlerCalled, "DiscoverAsync should invoke OnDiscoveryStart event");
-        }
+    /// <summary>
+    /// DiscoverAsync should invoke OnDiscoveryStart event.
+    /// </summary>
+    [TestMethod]
+    public void DiscoverAsyncShouldInvokeOnDiscoveryStart()
+    {
+        bool onDiscoveryStartHandlerCalled = false;
+        _discoveryRequest.OnDiscoveryStart += (s, e) => onDiscoveryStartHandlerCalled = true;
 
-        [TestMethod]
-        public void DiscoverAsyncShouldInvokeHandleDiscoveryStartofLoggerManager()
-        {
-            // Action
-            this.discoveryRequest.DiscoverAsync();
+        // Action
+        _discoveryRequest.DiscoverAsync();
 
-            // Assert
-            loggerManager.Verify(lm => lm.HandleDiscoveryStart(It.IsAny<DiscoveryStartEventArgs>()), Times.Once);
-        }
+        // Assert
+        Assert.IsTrue(onDiscoveryStartHandlerCalled, "DiscoverAsync should invoke OnDiscoveryStart event");
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCollectMetrics()
+    [TestMethod]
+    public void DiscoverAsyncShouldInvokeHandleDiscoveryStartofLoggerManager()
+    {
+        // Action
+        _discoveryRequest.DiscoverAsync();
+
+        // Assert
+        _loggerManager.Verify(lm => lm.HandleDiscoveryStart(It.IsAny<DiscoveryStartEventArgs>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        var dict = new Dictionary<string, object>
         {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
+            { "DummyMessage", "DummyValue" }
+        };
 
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
 
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
-            discoveryCompleteEventArgs.Metrics = dict;
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
+        discoveryCompleteEventArgs.Metrics = dict;
 
-            // Act
-            eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, Enumerable.Empty<TestCase>());
+        // Act
+        eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, []);
 
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecForDiscovery, It.IsAny<double>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add("DummyMessage", "DummyValue"), Times.Once);
-        }
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecForDiscovery, It.IsAny<double>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add("DummyMessage", "DummyValue"), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldHandleRawMessage()
-        {
-            bool onDiscoveryCompleteInvoked = false;
-            this.discoveryRequest.OnRawMessageReceived += (object sender, string e) =>
-                {
-                    onDiscoveryCompleteInvoked = true;
-                };
+    [TestMethod]
+    public void HandleRawMessageShouldHandleRawMessage()
+    {
+        bool onDiscoveryCompleteInvoked = false;
+        _discoveryRequest.OnRawMessageReceived += (object? sender, string e) => onDiscoveryCompleteInvoked = true;
 
-            this.discoveryRequest.HandleRawMessage(string.Empty);
+        _discoveryRequest.HandleRawMessage(string.Empty);
 
-            Assert.IsTrue(onDiscoveryCompleteInvoked);
-        }
+        Assert.IsTrue(onDiscoveryCompleteInvoked);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldAddVSTestDataPointsIfTelemetryOptedIn()
-        {
-            bool onDiscoveryCompleteInvoked = true;
-            this.mockRequestData.Setup(x => x.IsTelemetryOptedIn).Returns(true);
-            this.discoveryRequest.OnRawMessageReceived += (object sender, string e) =>
-                {
-                    onDiscoveryCompleteInvoked = true;
-                };
+    [TestMethod]
+    public void HandleRawMessageShouldAddVsTestDataPointsIfTelemetryOptedIn()
+    {
+        bool onDiscoveryCompleteInvoked = true;
+        _mockRequestData.Setup(x => x.IsTelemetryOptedIn).Returns(true);
+        _discoveryRequest.OnRawMessageReceived += (object? sender, string e) => onDiscoveryCompleteInvoked = true;
 
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.DiscoveryComplete });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.DiscoveryComplete });
 
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<DiscoveryCompletePayload>(It.IsAny<Message>()))
-                .Returns(new DiscoveryCompletePayload());
+        _mockDataSerializer.Setup(x => x.DeserializePayload<DiscoveryCompletePayload>(It.IsAny<Message>()))
+            .Returns(new DiscoveryCompletePayload());
 
-            this.discoveryRequest.HandleRawMessage(string.Empty);
+        _discoveryRequest.HandleRawMessage(string.Empty);
 
-            this.mockDataSerializer.Verify(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<DiscoveryCompletePayload>()), Times.Once);
-            this.mockRequestData.Verify(x => x.MetricsCollection, Times.AtLeastOnce);
-            Assert.IsTrue(onDiscoveryCompleteInvoked);
-        }
+        _mockDataSerializer.Verify(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<DiscoveryCompletePayload>()), Times.Once);
+        _mockRequestData.Verify(x => x.MetricsCollection, Times.AtLeastOnce);
+        Assert.IsTrue(onDiscoveryCompleteInvoked);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldInvokeHandleDiscoveryCompleteOfLoggerManager()
-        {
-            this.loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.DiscoveryComplete });
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<DiscoveryCompletePayload>(It.IsAny<Message>()))
-                .Returns(new DiscoveryCompletePayload()
-                {
-                    TotalTests = 1,
-                    IsAborted = false,
-                    LastDiscoveredTests = Enumerable.Empty<TestCase>()
-                });
-
-            this.discoveryRequest.HandleRawMessage(string.Empty);
-
-            this.loggerManager.Verify(lm => lm.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>()), Times.Once);
-        }
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeHandleDiscoveryCompleteOfLoggerManager()
+    {
+        _loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.DiscoveryComplete });
+        _mockDataSerializer.Setup(x => x.DeserializePayload<DiscoveryCompletePayload>(It.IsAny<Message>()))
+            .Returns(new DiscoveryCompletePayload()
+            {
+                TotalTests = 1,
+                IsAborted = false,
+                LastDiscoveredTests = []
+            });
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldInvokeHandleDiscoveryCompleteOfLoggerManager()
-        {
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
-            eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, Enumerable.Empty<TestCase>());
+        _discoveryRequest.HandleRawMessage(string.Empty);
 
-            loggerManager.Verify(lm => lm.HandleDiscoveryComplete(discoveryCompleteEventArgs), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldNotInvokeHandleDiscoveredTestsIfLastChunkNotPresent()
-        {
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
-            eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, Enumerable.Empty<TestCase>());
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldInvokeHandleDiscoveryCompleteOfLoggerManager()
+    {
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
+        eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, []);
 
-            loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Never);
-        }
+        _loggerManager.Verify(lm => lm.HandleDiscoveryComplete(discoveryCompleteEventArgs), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldInvokeHandleDiscoveredTestsIfLastChunkPresent()
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldNotInvokeHandleDiscoveredTestsIfLastChunkNotPresent()
+    {
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
+        eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, []);
+
+        _loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldInvokeHandleDiscoveredTestsIfLastChunkPresent()
+    {
+        var activeTestCases = new List<TestCase>
         {
-            var activeTestCases = new List<ObjectModel.TestCase>
-            {
-                new ObjectModel.TestCase(
-                    "A.C.M2",
-                    new Uri("executor://dummy"),
-                    "A")
-            };
+            new(
+                "A.C.M2",
+                new Uri("executor://dummy"),
+                "A")
+        };
 
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
-            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler2;
-            eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, activeTestCases);
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(1, false);
+        var eventsHandler = _discoveryRequest as ITestDiscoveryEventsHandler2;
+        eventsHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, activeTestCases);
 
-            loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveredTestsShouldInvokeHandleDiscoveredTestsOfLoggerManager()
-        {
-            discoveryRequest.HandleDiscoveredTests(null);
+    [TestMethod]
+    public void HandleDiscoveredTestsShouldInvokeHandleDiscoveredTestsOfLoggerManager()
+    {
+        _discoveryRequest.HandleDiscoveredTests(null);
 
-            loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleDiscoveredTests(It.IsAny<DiscoveredTestsEventArgs>()), Times.Once);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Execution/TestRunRequestTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Execution/TestRunRequestTests.cs
index 55745d4e82..d77e39fda6 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Execution/TestRunRequestTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/Execution/TestRunRequestTests.cs
@@ -1,678 +1,663 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Client.Execution;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.Execution;
+
+[TestClass]
+public class TestRunRequestTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
+    private TestRunRequest _testRunRequest;
+    private Mock<IProxyExecutionManager> _executionManager;
+    private readonly Mock<ITestLoggerManager> _loggerManager;
+    private TestRunCriteria _testRunCriteria;
+    private readonly Mock<IRequestData> _mockRequestData;
 
-    using Client.Execution;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using ObjectModel;
-    using ObjectModel.Client;
-    using ObjectModel.Engine;
-    using System.Collections.ObjectModel;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+    public TestRunRequestTests()
+    {
+        _testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1);
+        _executionManager = new Mock<IProxyExecutionManager>();
+        _loggerManager = new Mock<ITestLoggerManager>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _testRunRequest = new TestRunRequest(_mockRequestData.Object, _testRunCriteria, _executionManager.Object, _loggerManager.Object, _mockDataSerializer.Object);
+    }
 
-    [TestClass]
-    public class TestRunRequestTests
+    [TestMethod]
+    public void ConstructorSetsTestRunCriteriaExecutionManagerAndState()
     {
-        TestRunRequest testRunRequest;
-        Mock<IProxyExecutionManager> executionManager;
-        private readonly Mock<ITestLoggerManager> loggerManager;
-        TestRunCriteria testRunCriteria;
-        private Mock<IRequestData> mockRequestData;
+        Assert.AreEqual(TestRunState.Pending, _testRunRequest.State);
+        Assert.AreEqual(_testRunCriteria, _testRunRequest.TestRunConfiguration);
+        Assert.AreEqual(_executionManager.Object, _testRunRequest.ExecutionManager);
+    }
 
-        private Mock<IDataSerializer> mockDataSerializer;
+    [TestMethod]
+    public void ExecuteAsycIfTestRunRequestIsDisposedThrowsObjectDisposedException()
+    {
+        _testRunRequest.Dispose();
 
-        public TestRunRequestTests()
-        {
-            testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1);
-            executionManager = new Mock<IProxyExecutionManager>();
-            this.loggerManager = new Mock<ITestLoggerManager>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object, this.mockDataSerializer.Object);
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => _testRunRequest.ExecuteAsync());
+    }
 
-        [TestMethod]
-        public void ConstructorSetsTestRunCriteriaExecutionManagerAndState()
-        {
-            Assert.AreEqual(TestRunState.Pending, testRunRequest.State);
-            Assert.AreEqual(testRunCriteria, testRunRequest.TestRunConfiguration);
-            Assert.AreEqual(executionManager.Object, testRunRequest.ExecutionManager);
-        }
+    [TestMethod]
+    public void ExecuteAsycIfStateIsNotPendingThrowsInvalidOperationException()
+    {
+        _testRunRequest.ExecuteAsync();
+        Assert.ThrowsException<InvalidOperationException>(() => _testRunRequest.ExecuteAsync());
+    }
 
-        [TestMethod]
-        public void ExecuteAsycIfTestRunRequestIsDisposedThrowsObjectDisposedException()
-        {
-            testRunRequest.Dispose();
+    [TestMethod]
+    public void ExecuteAsyncSetsStateToInProgressAndCallManagerToStartTestRun()
+    {
+        _testRunRequest.ExecuteAsync();
 
-            Assert.ThrowsException<ObjectDisposedException>(() => testRunRequest.ExecuteAsync());
-        }
+        Assert.AreEqual(TestRunState.InProgress, _testRunRequest.State);
+        _executionManager.Verify(em => em.StartTestRun(_testRunCriteria, _testRunRequest), Times.Once);
+    }
 
-        [TestMethod]
-        public void ExecuteAsycIfStateIsNotPendingThrowsInvalidOperationException()
+    [TestMethod]
+    public void ExecuteAsyncIfStartTestRunThrowsExceptionSetsStateToPendingAndThrowsThatException()
+    {
+        _executionManager.Setup(em => em.StartTestRun(_testRunCriteria, _testRunRequest)).Throws(new Exception("DummyException"));
+        try
         {
-            testRunRequest.ExecuteAsync();
-            Assert.ThrowsException<InvalidOperationException>(() => testRunRequest.ExecuteAsync());
+            _testRunRequest.ExecuteAsync();
         }
-
-        [TestMethod]
-        public void ExecuteAsyncSetsStateToInProgressAndCallManagerToStartTestRun()
+        catch (Exception ex)
         {
-            testRunRequest.ExecuteAsync();
-
-            Assert.AreEqual(TestRunState.InProgress, testRunRequest.State);
-            executionManager.Verify(em => em.StartTestRun(testRunCriteria, testRunRequest), Times.Once);
+            Assert.IsTrue(ex is not null);
+            Assert.AreEqual("DummyException", ex.Message);
+            Assert.AreEqual(TestRunState.Pending, _testRunRequest.State);
         }
+    }
 
-        [TestMethod]
-        public void ExecuteAsyncIfStartTestRunThrowsExceptionSetsStateToPendingAndThrowsThatException()
-        {
-            executionManager.Setup(em => em.StartTestRun(testRunCriteria, testRunRequest)).Throws(new Exception("DummyException"));
-            try
-            {
-                testRunRequest.ExecuteAsync();
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is Exception);
-                Assert.AreEqual("DummyException", ex.Message);
-                Assert.AreEqual(TestRunState.Pending, testRunRequest.State);
-            }
-        }
+    [TestMethod]
+    public void AbortIfTestRunRequestDisposedShouldNotThrowException()
+    {
+        _testRunRequest.Dispose();
+        _testRunRequest.Abort();
+    }
 
-        [TestMethod]
-        public void AbortIfTestRunRequestDisposedShouldNotThrowException()
-        {
-            testRunRequest.Dispose();
-            testRunRequest.Abort();
-        }
+    [TestMethod]
+    public void AbortIfTestRunStateIsNotInProgressShouldNotCallExecutionManagerAbort()
+    {
+        //ExecuteAsync has not been called, so State is not InProgress
+        _testRunRequest.Abort();
+        _executionManager.Verify(dm => dm.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void AbortIfTestRunStateIsNotInProgressShouldNotCallExecutionManagerAbort()
-        {
-            //ExecuteAsync has not been called, so State is not InProgress
-            testRunRequest.Abort();
-            executionManager.Verify(dm => dm.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Never);
-        }
+    [TestMethod]
+    public void AbortIfDiscoveryIsinProgressShouldCallDiscoveryManagerAbort()
+    {
+        // Set the State to InProgress
+        _testRunRequest.ExecuteAsync();
 
-        [TestMethod]
-        public void AbortIfDiscoveryIsinProgressShouldCallDiscoveryManagerAbort()
-        {
-            // Set the State to InProgress
-            testRunRequest.ExecuteAsync();
+        _testRunRequest.Abort();
+        _executionManager.Verify(dm => dm.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once);
+    }
 
-            testRunRequest.Abort();
-            executionManager.Verify(dm => dm.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
+    [TestMethod]
+    public void WaitForCompletionIfTestRunRequestDisposedShouldThrowObjectDisposedException()
+    {
+        _testRunRequest.Dispose();
+        Assert.ThrowsException<ObjectDisposedException>(() => _testRunRequest.WaitForCompletion());
+    }
 
-        [TestMethod]
-        public void WaitForCompletionIfTestRunRequestDisposedShouldThrowObjectDisposedException()
-        {
-            testRunRequest.Dispose();
-            Assert.ThrowsException<ObjectDisposedException>(() => testRunRequest.WaitForCompletion());
-        }
+    [TestMethod]
+    public void WaitForCompletionIfTestRunStatePendingShouldThrowInvalidOperationException()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => _testRunRequest.WaitForCompletion());
+    }
 
-        [TestMethod]
-        public void WaitForCompletionIfTestRunStatePendingShouldThrowInvalidOperationException()
-        {
-            Assert.ThrowsException<InvalidOperationException>(() => testRunRequest.WaitForCompletion());
-        }
+    [TestMethod]
+    public void CancelAsyncIfTestRunRequestDisposedShouldNotThrowException()
+    {
+        _testRunRequest.Dispose();
+        _testRunRequest.CancelAsync();
+    }
 
-        [TestMethod]
-        public void CancelAsyncIfTestRunRequestDisposedShouldNotThrowException()
-        {
-            testRunRequest.Dispose();
-            testRunRequest.CancelAsync();
-        }
+    [TestMethod]
+    public void CancelAsyncIfTestRunStateNotInProgressWillNotCallExecutionManagerCancel()
+    {
+        _testRunRequest.CancelAsync();
+        _executionManager.Verify(dm => dm.Cancel(It.IsAny<IInternalTestRunEventsHandler>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void CancelAsyncIfTestRunStateNotInProgressWillNotCallExecutionManagerCancel()
-        {
-            testRunRequest.CancelAsync();
-            executionManager.Verify(dm => dm.Cancel(It.IsAny<ITestRunEventsHandler>()), Times.Never);
-        }
+    [TestMethod]
+    public void CancelAsyncIfTestRunStateInProgressCallsExecutionManagerCancel()
+    {
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.CancelAsync();
+        _executionManager.Verify(dm => dm.Cancel(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void CancelAsyncIfTestRunStateInProgressCallsExecutionManagerCancel()
-        {
-            testRunRequest.ExecuteAsync();
-            testRunRequest.CancelAsync();
-            executionManager.Verify(dm => dm.Cancel(It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
+    [TestMethod]
+    public void OnTestSessionTimeoutShouldCallAbort()
+    {
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.OnTestSessionTimeout(null);
+        _executionManager.Verify(o => o.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void OnTestSessionTimeoutShouldCallAbort()
-        {
-            this.testRunRequest.ExecuteAsync();
-            this.testRunRequest.OnTestSessionTimeout(null);
-            this.executionManager.Verify(o => o.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
+    [TestMethod]
+    public void OnTestSessionTimeoutShouldLogMessage()
+    {
+        bool handleLogMessageCalled = false;
+        bool handleRawMessageCalled = false;
 
-        [TestMethod]
-        public void OnTestSessionTimeoutShouldLogMessage()
-        {
-            bool handleLogMessageCalled = false;
-            bool handleRawMessageCalled = false;
+        _mockDataSerializer
+            .Setup(s => s.SerializePayload(It.IsAny<string>(), It.IsAny<Object>()))
+            .Returns("non-empty rawMessage");
 
-            this.testRunRequest.TestRunMessage += (object sender, TestRunMessageEventArgs e) =>
-                {
-                    handleLogMessageCalled = true;
-                };
+        _testRunRequest.TestRunMessage += (object? sender, TestRunMessageEventArgs e) => handleLogMessageCalled = true;
 
-            this.testRunRequest.OnRawMessageReceived += (object sender, string message) =>
-                {
-                    handleRawMessageCalled = true;
-                };
+        _testRunRequest.OnRawMessageReceived += (object? sender, string message) => handleRawMessageCalled = true;
 
-            this.testRunRequest.OnTestSessionTimeout(null);
+        _testRunRequest.OnTestSessionTimeout(null);
 
-            Assert.IsTrue(handleLogMessageCalled, "OnTestSessionTimeout should call HandleLogMessage");
-            Assert.IsTrue(handleRawMessageCalled, "OnTestSessionTimeout should call HandleRawMessage");
-        }
+        Assert.IsTrue(handleLogMessageCalled, "OnTestSessionTimeout should call HandleLogMessage");
+        Assert.IsTrue(handleRawMessageCalled, "OnTestSessionTimeout should call HandleRawMessage");
+    }
 
-        [TestMethod]
-        public void OnTestSessionTimeoutShouldGetCalledWhenExecutionCrossedTestSessionTimeout()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void OnTestSessionTimeoutShouldGetCalledWhenExecutionCrossedTestSessionTimeout()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TestSessionTimeout>1000</TestSessionTimeout>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, true, settingsXml);
-            var executionManager = new Mock<IProxyExecutionManager>();
-            var testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, true, settingsXml);
+        var executionManager = new Mock<IProxyExecutionManager>();
+        var testRunRequest = new TestRunRequest(_mockRequestData.Object, testRunCriteria, executionManager.Object, _loggerManager.Object);
 
-            ManualResetEvent onTestSessionTimeoutCalled = new ManualResetEvent(true);
-            onTestSessionTimeoutCalled.Reset();
-            executionManager.Setup(o => o.Abort(It.IsAny<ITestRunEventsHandler>())).Callback(() => onTestSessionTimeoutCalled.Set());
+        ManualResetEvent onTestSessionTimeoutCalled = new(true);
+        onTestSessionTimeoutCalled.Reset();
+        executionManager.Setup(o => o.Abort(It.IsAny<IInternalTestRunEventsHandler>())).Callback(() => onTestSessionTimeoutCalled.Set());
 
-            testRunRequest.ExecuteAsync();
-            onTestSessionTimeoutCalled.WaitOne(20 * 1000);
+        testRunRequest.ExecuteAsync();
+        onTestSessionTimeoutCalled.WaitOne(20 * 1000);
 
-            executionManager.Verify(o => o.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
+        executionManager.Verify(o => o.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once);
+    }
 
-        /// <summary>
-        /// Test session timeout should be infinity if TestSessionTimeout is 0.
-        /// </summary>
-        [TestMethod]
-        public void OnTestSessionTimeoutShouldNotGetCalledWhenTestSessionTimeoutIsZero()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    /// <summary>
+    /// Test session timeout should be infinity if TestSessionTimeout is 0.
+    /// </summary>
+    [TestMethod]
+    public void OnTestSessionTimeoutShouldNotGetCalledWhenTestSessionTimeoutIsZero()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TestSessionTimeout>0</TestSessionTimeout>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, true, settingsXml);
-            var executionManager = new Mock<IProxyExecutionManager>();
-            var testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, true, settingsXml);
+        var executionManager = new Mock<IProxyExecutionManager>();
+        var testRunRequest = new TestRunRequest(_mockRequestData.Object, testRunCriteria, executionManager.Object, _loggerManager.Object);
 
-            executionManager.Setup(o => o.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>())).Callback(() => System.Threading.Thread.Sleep(5 * 1000));
+        executionManager.Setup(o => o.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>())).Callback(() => Thread.Sleep(5 * 1000));
 
-            testRunRequest.ExecuteAsync();
+        testRunRequest.ExecuteAsync();
 
-            executionManager.Verify(o => o.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Never);
-        }
+        executionManager.Verify(o => o.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void HandleTestRunStatsChangeShouldInvokeListenersWithTestRunChangedEventArgs()
-        {
-            var mockStats = new Mock<ITestRunStatistics>();
-
-            var testResults = new List<ObjectModel.TestResult>
-                                  {
-                                      new ObjectModel.TestResult(
-                                          new ObjectModel.TestCase(
-                                          "A.C.M",
-                                          new Uri("executor://dummy"),
-                                          "A"))
-                                  };
-            var activeTestCases = new List<ObjectModel.TestCase>
-                                      {
-                                          new ObjectModel.TestCase(
-                                              "A.C.M2",
-                                              new Uri("executor://dummy"),
-                                              "A")
-                                      };
-            var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
-            TestRunChangedEventArgs receivedArgs = null;
-
-            testRunRequest.OnRunStatsChange += (object sender, TestRunChangedEventArgs e) =>
-                {
-                    receivedArgs = e;
-                };
-
-            // Act.
-            testRunRequest.HandleTestRunStatsChange(testRunChangedEventArgs);
-
-            // Assert.
-            Assert.IsNotNull(receivedArgs);
-            Assert.AreEqual(testRunChangedEventArgs.TestRunStatistics, receivedArgs.TestRunStatistics);
-            CollectionAssert.AreEqual(
-                testRunChangedEventArgs.NewTestResults.ToList(),
-                receivedArgs.NewTestResults.ToList());
-            CollectionAssert.AreEqual(testRunChangedEventArgs.ActiveTests.ToList(), receivedArgs.ActiveTests.ToList());
-        }
+    [TestMethod]
+    public void HandleTestRunStatsChangeShouldInvokeListenersWithTestRunChangedEventArgs()
+    {
+        var mockStats = new Mock<ITestRunStatistics>();
 
-        [TestMethod]
-        public void HandleRawMessageShouldCallOnRawMessageReceived()
+        var testResults = new List<ObjectModel.TestResult>
         {
-            string rawMessage = "HelloWorld";
-            string messageReceived = null;
-
-            // Call should NOT fail even if on raw message received is not registered.
-            testRunRequest.HandleRawMessage(rawMessage);
+            new(
+                new TestCase(
+                    "A.C.M",
+                    new Uri("executor://dummy"),
+                    "A"))
+        };
+        var activeTestCases = new List<TestCase>
+        {
+            new(
+                "A.C.M2",
+                new Uri("executor://dummy"),
+                "A")
+        };
+        var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
+        TestRunChangedEventArgs? receivedArgs = null;
+
+        _testRunRequest.OnRunStatsChange += (object? sender, TestRunChangedEventArgs e) => receivedArgs = e;
+
+        // Act.
+        _testRunRequest.HandleTestRunStatsChange(testRunChangedEventArgs);
+
+        // Assert.
+        Assert.IsNotNull(receivedArgs);
+        Assert.AreEqual(testRunChangedEventArgs.TestRunStatistics, receivedArgs.TestRunStatistics);
+        CollectionAssert.AreEqual(
+            testRunChangedEventArgs.NewTestResults!.ToList(),
+            receivedArgs.NewTestResults!.ToList());
+        CollectionAssert.AreEqual(testRunChangedEventArgs.ActiveTests!.ToList(), receivedArgs.ActiveTests!.ToList());
+    }
 
-            EventHandler<string> handler = (sender, e) => { messageReceived = e; };
-            testRunRequest.OnRawMessageReceived += handler;
+    [TestMethod]
+    public void HandleRawMessageShouldCallOnRawMessageReceived()
+    {
+        string rawMessage = "HelloWorld";
+        string? messageReceived = null;
 
-            testRunRequest.HandleRawMessage(rawMessage);
+        // Call should NOT fail even if on raw message received is not registered.
+        _testRunRequest.HandleRawMessage(rawMessage);
 
-            Assert.AreEqual(rawMessage, messageReceived, "RunRequest should just pass the message as is.");
-            testRunRequest.OnRawMessageReceived -= handler;
-        }
+        EventHandler<string> handler = (sender, e) => messageReceived = e;
+        _testRunRequest.OnRawMessageReceived += handler;
 
-        [TestMethod]
-        public void HandleRawMessageShouldAddVSTestDataPointsIfTelemetryOptedIn()
-        {
-            bool onDiscoveryCompleteInvoked = true;
-            this.mockRequestData.Setup(x => x.IsTelemetryOptedIn).Returns(true);
-            this.testRunRequest.OnRawMessageReceived += (object sender, string e) =>
-                {
-                    onDiscoveryCompleteInvoked = true;
-                };
-
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload()
-                {
-                    TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.MinValue)
-                });
-
-            this.testRunRequest.HandleRawMessage(string.Empty);
-
-            this.mockDataSerializer.Verify(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<TestRunCompletePayload>()), Times.Once);
-            this.mockRequestData.Verify(x => x.MetricsCollection, Times.AtLeastOnce);
-            Assert.IsTrue(onDiscoveryCompleteInvoked);
-        }
+        _testRunRequest.HandleRawMessage(rawMessage);
 
-        [TestMethod]
-        public void HandleRawMessageShouldInvokeHandleTestRunCompleteOfLoggerManager()
-        {
-            this.loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-
-            var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null,
-                null, TimeSpan.FromSeconds(0));
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload()
-                {
-                    TestRunCompleteArgs = testRunCompleteEvent
-                });
-
-            this.testRunRequest.ExecuteAsync();
-            this.testRunRequest.HandleRawMessage(string.Empty);
-
-            this.loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
-        }
+        Assert.AreEqual(rawMessage, messageReceived, "RunRequest should just pass the message as is.");
+        _testRunRequest.OnRawMessageReceived -= handler;
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldNotInvokeHandleTestRunCompleteOfLoggerManagerWhenNoLoggersInitiailized()
-        {
-            this.loggerManager.Setup(x => x.LoggersInitialized).Returns(false);
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-
-            var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null,
-                null, TimeSpan.FromSeconds(0));
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload()
-                {
-                    TestRunCompleteArgs = testRunCompleteEvent
-                });
-
-            this.testRunRequest.ExecuteAsync();
-            this.testRunRequest.HandleRawMessage(string.Empty);
-
-            this.loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Never);
-        }
+    [TestMethod]
+    public void HandleRawMessageShouldAddVsTestDataPointsIfTelemetryOptedIn()
+    {
+        bool onDiscoveryCompleteInvoked = true;
+        _mockRequestData.Setup(x => x.IsTelemetryOptedIn).Returns(true);
+        _testRunRequest.OnRawMessageReceived += (object? sender, string e) => onDiscoveryCompleteInvoked = true;
 
-        [TestMethod]
-        public void HandleRawMessageShouldInvokeShouldInvokeHandleTestRunStatsChangeOfLoggerManagerWhenLastChunkAvailable()
-        {
-            var mockStats = new Mock<ITestRunStatistics>();
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
 
-            var testResults = new List<ObjectModel.TestResult>
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload()
             {
-                new ObjectModel.TestResult(
-                    new ObjectModel.TestCase(
-                        "A.C.M",
-                        new Uri("executor://dummy"),
-                        "A"))
-            };
-            var activeTestCases = new List<ObjectModel.TestCase>
-            {
-                new ObjectModel.TestCase(
-                    "A.C.M2",
-                    new Uri("executor://dummy"),
-                    "A")
-            };
-
-            this.loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+                TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.MinValue)
+            });
 
-            var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
-            var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null,
-                null, TimeSpan.FromSeconds(0));
+        _testRunRequest.HandleRawMessage(string.Empty);
 
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload()
-                {
-                    TestRunCompleteArgs = testRunCompleteEvent,
-                    LastRunTests = testRunChangedEventArgs
-                });
+        _mockDataSerializer.Verify(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<TestRunCompletePayload>()), Times.Once);
+        _mockRequestData.Verify(x => x.MetricsCollection, Times.AtLeastOnce);
+        Assert.IsTrue(onDiscoveryCompleteInvoked);
+    }
 
-            this.testRunRequest.ExecuteAsync();
-            this.testRunRequest.HandleRawMessage(string.Empty);
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeHandleTestRunCompleteOfLoggerManager()
+    {
+        _loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+
+        var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null,
+            null, TimeSpan.FromSeconds(0));
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload()
+            {
+                TestRunCompleteArgs = testRunCompleteEvent
+            });
 
-            loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
-            loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
-        }
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.HandleRawMessage(string.Empty);
 
-        [TestMethod]
-        public void HandleTestRunStatsChangeShouldInvokeHandleTestRunStatsChangeOfLoggerManager()
-        {
-            var mockStats = new Mock<ITestRunStatistics>();
+        _loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
+    }
 
-            var testResults = new List<ObjectModel.TestResult>
-            {
-                new ObjectModel.TestResult(
-                    new ObjectModel.TestCase(
-                        "A.C.M",
-                        new Uri("executor://dummy"),
-                        "A"))
-            };
-            var activeTestCases = new List<ObjectModel.TestCase>
+    [TestMethod]
+    public void HandleRawMessageShouldNotInvokeHandleTestRunCompleteOfLoggerManagerWhenNoLoggersInitiailized()
+    {
+        _loggerManager.Setup(x => x.LoggersInitialized).Returns(false);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+
+        var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null,
+            null, TimeSpan.FromSeconds(0));
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload()
             {
-                new ObjectModel.TestCase(
-                    "A.C.M2",
-                    new Uri("executor://dummy"),
-                    "A")
-            };
+                TestRunCompleteArgs = testRunCompleteEvent
+            });
 
-            var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
-            testRunRequest.HandleTestRunStatsChange(testRunChangedEventArgs);
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.HandleRawMessage(string.Empty);
 
-            loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldInvokeHandleTestRunStatsChangeOfLoggerManagerWhenLastChunkAvailable()
-        {
-            var mockStats = new Mock<ITestRunStatistics>();
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeShouldInvokeHandleTestRunStatsChangeOfLoggerManagerWhenLastChunkAvailable()
+    {
+        var mockStats = new Mock<ITestRunStatistics>();
 
-            var testResults = new List<ObjectModel.TestResult>
-            {
-                new ObjectModel.TestResult(
-                    new ObjectModel.TestCase(
-                        "A.C.M",
-                        new Uri("executor://dummy"),
-                        "A"))
-            };
-            var activeTestCases = new List<ObjectModel.TestCase>
-            {
-                new ObjectModel.TestCase(
-                    "A.C.M2",
+        var testResults = new List<ObjectModel.TestResult>
+        {
+            new(
+                new TestCase(
+                    "A.C.M",
                     new Uri("executor://dummy"),
-                    "A")
-            };
-            var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
-            var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null,
-                null, TimeSpan.FromSeconds(0));
+                    "A"))
+        };
+        var activeTestCases = new List<TestCase>
+        {
+            new(
+                "A.C.M2",
+                new Uri("executor://dummy"),
+                "A")
+        };
+
+        _loggerManager.Setup(x => x.LoggersInitialized).Returns(true);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+
+        var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
+        var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null,
+            null, TimeSpan.FromSeconds(0));
+
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload()
+            {
+                TestRunCompleteArgs = testRunCompleteEvent,
+                LastRunTests = testRunChangedEventArgs
+            });
 
-            testRunRequest.ExecuteAsync();
-            testRunRequest.HandleTestRunComplete(testRunCompleteEvent, testRunChangedEventArgs, null, null);
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.HandleRawMessage(string.Empty);
 
-            loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
-            loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
+        _loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void HandleTestRunStatsChangeShouldInvokeHandleTestRunStatsChangeOfLoggerManager()
+    {
+        var mockStats = new Mock<ITestRunStatistics>();
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldInvokeHandleTestRunCompleteOfLoggerManager()
+        var testResults = new List<ObjectModel.TestResult>
+        {
+            new(
+                new TestCase(
+                    "A.C.M",
+                    new Uri("executor://dummy"),
+                    "A"))
+        };
+        var activeTestCases = new List<TestCase>
         {
-            var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null,
-                null, TimeSpan.FromSeconds(0));
+            new(
+                "A.C.M2",
+                new Uri("executor://dummy"),
+                "A")
+        };
 
-            testRunRequest.ExecuteAsync();
-            testRunRequest.HandleTestRunComplete(testRunCompleteEvent, null, null, null);
+        var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
+        _testRunRequest.HandleTestRunStatsChange(testRunChangedEventArgs);
 
-            loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
-        }
+        _loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleLogMessageShouldInvokeHandleLogMessageOfLoggerManager()
-        {
-            testRunRequest.HandleLogMessage(TestMessageLevel.Error, "hello");
-            loggerManager.Verify(lm => lm.HandleTestRunMessage(It.IsAny<TestRunMessageEventArgs>()), Times.Once);
-        }
+    [TestMethod]
+    public void HandleTestRunCompleteShouldInvokeHandleTestRunStatsChangeOfLoggerManagerWhenLastChunkAvailable()
+    {
+        var mockStats = new Mock<ITestRunStatistics>();
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldCollectMetrics()
+        var testResults = new List<ObjectModel.TestResult>
         {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
-
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
-
-            this.testRunRequest.ExecuteAsync();
-            var testRunCompeleteEventsArgs = new TestRunCompleteEventArgs(
-                new TestRunStatistics(1, null),
-                false,
-                false,
-                null,
-                null,
-                TimeSpan.FromSeconds(0));
-            testRunCompeleteEventsArgs.Metrics = dict;
-
-            // Act
-            this.testRunRequest.HandleTestRunComplete(testRunCompeleteEventsArgs, null, null, null);
-
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecForRun, It.IsAny<double>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add("DummyMessage", "DummyValue"), Times.Once);
-        }
+            new(
+                new TestCase(
+                    "A.C.M",
+                    new Uri("executor://dummy"),
+                    "A"))
+        };
+        var activeTestCases = new List<TestCase>
+        {
+            new(
+                "A.C.M2",
+                new Uri("executor://dummy"),
+                "A")
+        };
+        var testRunChangedEventArgs = new TestRunChangedEventArgs(mockStats.Object, testResults, activeTestCases);
+        var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null,
+            null, TimeSpan.FromSeconds(0));
+
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEvent, testRunChangedEventArgs, null, null);
+
+        _loggerManager.Verify(lm => lm.HandleTestRunStatsChange(testRunChangedEventArgs), Times.Once);
+        _loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldHandleListAttachments()
-        {
-            bool attachmentsFound = false;
-            this.testRunRequest.OnRunCompletion += (s, e) =>
-             {
-                 attachmentsFound = e.AttachmentSets != null && e.AttachmentSets.Count == 1;
-             };
-
-            List<AttachmentSet> attachmentSets = new List<AttachmentSet> { new AttachmentSet(new Uri("datacollector://attachment"), "datacollectorAttachment") };
-
-            this.testRunRequest.ExecuteAsync();
-            var testRunCompeleteEventsArgs = new TestRunCompleteEventArgs(
-                new TestRunStatistics(1, null),
-                false,
-                false,
-                null,
-                null,
-                TimeSpan.FromSeconds(0));
-
-            // Act
-            this.testRunRequest.HandleTestRunComplete(testRunCompeleteEventsArgs, null, attachmentSets, null);
-
-            // Verify.
-            Assert.IsTrue(attachmentsFound);
-        }
+    [TestMethod]
+    public void HandleTestRunCompleteShouldInvokeHandleTestRunCompleteOfLoggerManager()
+    {
+        var testRunCompleteEvent = new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null,
+            null, TimeSpan.FromSeconds(0));
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldHandleCollectionAttachments()
-        {
-            bool attachmentsFound = false;
-            this.testRunRequest.OnRunCompletion += (s, e) =>
-            {
-                attachmentsFound = e.AttachmentSets != null && e.AttachmentSets.Count == 1;
-            };
+        _testRunRequest.ExecuteAsync();
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEvent, null, null, null);
 
-            Collection<AttachmentSet> attachmentSets = new Collection<AttachmentSet>(new List<AttachmentSet> { new AttachmentSet(new Uri("datacollector://attachment"), "datacollectorAttachment") });
+        _loggerManager.Verify(lm => lm.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
+    }
 
-            this.testRunRequest.ExecuteAsync();
-            var testRunCompeleteEventsArgs = new TestRunCompleteEventArgs(
-                new TestRunStatistics(1, null),
-                false,
-                false,
-                null,
-                null,
-                TimeSpan.FromSeconds(0));
+    [TestMethod]
+    public void HandleLogMessageShouldInvokeHandleLogMessageOfLoggerManager()
+    {
+        _testRunRequest.HandleLogMessage(TestMessageLevel.Error, "hello");
+        _loggerManager.Verify(lm => lm.HandleTestRunMessage(It.IsAny<TestRunMessageEventArgs>()), Times.Once);
+    }
 
-            // Act
-            this.testRunRequest.HandleTestRunComplete(testRunCompeleteEventsArgs, null, attachmentSets, null);
+    [TestMethod]
+    public void HandleTestRunCompleteShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        var dict = new Dictionary<string, object>
+        {
+            { "DummyMessage", "DummyValue" }
+        };
+
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+
+        _testRunRequest.ExecuteAsync();
+        var testRunCompleteEventsArgs = new TestRunCompleteEventArgs(
+            new TestRunStatistics(1, null),
+            false,
+            false,
+            null,
+            null,
+            null,
+            TimeSpan.FromSeconds(0));
+        testRunCompleteEventsArgs.Metrics = dict;
+
+        // Act
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEventsArgs, null, null, null);
+
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecForRun, It.IsAny<double>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add("DummyMessage", "DummyValue"), Times.Once);
+    }
 
-            // Verify.
-            Assert.IsTrue(attachmentsFound);
-        }
+    [TestMethod]
+    public void HandleTestRunCompleteShouldHandleListAttachments()
+    {
+        bool attachmentsFound = false;
+        _testRunRequest.OnRunCompletion += (s, e) => attachmentsFound = e.AttachmentSets != null && e.AttachmentSets.Count == 1;
+
+        List<AttachmentSet> attachmentSets = [new AttachmentSet(new Uri("datacollector://attachment"), "datacollectorAttachment")];
+
+        _testRunRequest.ExecuteAsync();
+        var testRunCompleteEventsArgs = new TestRunCompleteEventArgs(
+            new TestRunStatistics(1, null),
+            false,
+            false,
+            null,
+            null,
+            null,
+            TimeSpan.FromSeconds(0));
+
+        // Act
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEventsArgs, null, attachmentSets, null);
+
+        // Verify.
+        Assert.IsTrue(attachmentsFound);
+    }
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldHandleEmptyAttachments()
-        {
-            bool attachmentsFound = false;
-            this.testRunRequest.OnRunCompletion += (s, e) =>
-            {
-                attachmentsFound = (e.AttachmentSets.Count == 0);
-            };
-
-            this.testRunRequest.ExecuteAsync();
-            var testRunCompeleteEventsArgs = new TestRunCompleteEventArgs(
-                new TestRunStatistics(1, null),
-                false,
-                false,
-                null,
-                null,
-                TimeSpan.FromSeconds(0));
-
-            // Act
-            this.testRunRequest.HandleTestRunComplete(testRunCompeleteEventsArgs, null, null, null);
-
-            // Verify.
-            Assert.IsTrue(attachmentsFound);
-        }
+    [TestMethod]
+    public void HandleTestRunCompleteShouldHandleCollectionAttachments()
+    {
+        bool attachmentsFound = false;
+        _testRunRequest.OnRunCompletion += (s, e) => attachmentsFound = e.AttachmentSets != null && e.AttachmentSets.Count == 1;
+
+        Collection<AttachmentSet> attachmentSets = new(new List<AttachmentSet> { new(new Uri("datacollector://attachment"), "datacollectorAttachment") });
+
+        _testRunRequest.ExecuteAsync();
+        var testRunCompleteEventsArgs = new TestRunCompleteEventArgs(
+            new TestRunStatistics(1, null),
+            false,
+            false,
+            null,
+            null,
+            null,
+            TimeSpan.FromSeconds(0));
+
+        // Act
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEventsArgs, null, attachmentSets, null);
+
+        // Verify.
+        Assert.IsTrue(attachmentsFound);
+    }
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldCloseExecutionManager()
-        {
-            var events = new List<string>();
-            this.executionManager.Setup(em => em.Close()).Callback(() => events.Add("close"));
-            this.testRunRequest.OnRunCompletion += (s, e) => events.Add("complete");
-            this.testRunRequest.ExecuteAsync();
+    [TestMethod]
+    public void HandleTestRunCompleteShouldHandleEmptyAttachments()
+    {
+        bool attachmentsFound = false;
+        _testRunRequest.OnRunCompletion += (s, e) => attachmentsFound = (e.AttachmentSets.Count == 0);
+
+        _testRunRequest.ExecuteAsync();
+        var testRunCompleteEventsArgs = new TestRunCompleteEventArgs(
+            new TestRunStatistics(1, null),
+            false,
+            false,
+            null,
+            null,
+            null,
+            TimeSpan.FromSeconds(0));
+
+        // Act
+        _testRunRequest.HandleTestRunComplete(testRunCompleteEventsArgs, null, null, null);
+
+        // Verify.
+        Assert.IsTrue(attachmentsFound);
+    }
 
-            this.testRunRequest.HandleTestRunComplete(new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null, TimeSpan.FromSeconds(0)), null, null, null);
+    [TestMethod]
+    public void HandleTestRunCompleteShouldCloseExecutionManager()
+    {
+        var events = new List<string>();
+        _executionManager.Setup(em => em.Close()).Callback(() => events.Add("close"));
+        _testRunRequest.OnRunCompletion += (s, e) => events.Add("complete");
+        _testRunRequest.ExecuteAsync();
 
-            Assert.AreEqual(2, events.Count);
-            Assert.AreEqual("close", events[0]);
-            Assert.AreEqual("complete", events[1]);
-        }
+        _testRunRequest.HandleTestRunComplete(new TestRunCompleteEventArgs(new TestRunStatistics(1, null), false, false, null, null, null, TimeSpan.FromSeconds(0)), null, null, null);
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldNotCallCustomLauncherIfTestRunIsNotInProgress()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
-            executionManager = new Mock<IProxyExecutionManager>();
-            testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object);
+        Assert.AreEqual(2, events.Count);
+        Assert.AreEqual("close", events[0]);
+        Assert.AreEqual("complete", events[1]);
+    }
 
-            var testProcessStartInfo = new TestProcessStartInfo();
-            testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldNotCallCustomLauncherIfTestRunIsNotInProgress()
+    {
+        var mockCustomLauncher = new Mock<ITestHostLauncher>();
+        _testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
+        _executionManager = new Mock<IProxyExecutionManager>();
+        _testRunRequest = new TestRunRequest(_mockRequestData.Object, _testRunCriteria, _executionManager.Object, _loggerManager.Object);
 
-            mockCustomLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Never);
-        }
+        var testProcessStartInfo = new TestProcessStartInfo();
+        _testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldNotCallCustomLauncherIfLauncherIsNotDebug()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
-            executionManager = new Mock<IProxyExecutionManager>();
-            testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object);
+        mockCustomLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Never);
+    }
 
-            testRunRequest.ExecuteAsync();
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldNotCallCustomLauncherIfLauncherIsNotDebug()
+    {
+        var mockCustomLauncher = new Mock<ITestHostLauncher>();
+        _testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
+        _executionManager = new Mock<IProxyExecutionManager>();
+        _testRunRequest = new TestRunRequest(_mockRequestData.Object, _testRunCriteria, _executionManager.Object, _loggerManager.Object);
 
-            var testProcessStartInfo = new TestProcessStartInfo();
-            testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+        _testRunRequest.ExecuteAsync();
 
-            mockCustomLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Never);
-        }
+        var testProcessStartInfo = new TestProcessStartInfo();
+        _testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldCallCustomLauncherIfLauncherIsDebugAndRunInProgress()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
-            executionManager = new Mock<IProxyExecutionManager>();
-            testRunRequest = new TestRunRequest(this.mockRequestData.Object, testRunCriteria, executionManager.Object, loggerManager.Object);
+        mockCustomLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Never);
+    }
 
-            testRunRequest.ExecuteAsync();
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldCallCustomLauncherIfLauncherIsDebugAndRunInProgress()
+    {
+        var mockCustomLauncher = new Mock<ITestHostLauncher>();
+        _testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 1, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
+        _executionManager = new Mock<IProxyExecutionManager>();
+        _testRunRequest = new TestRunRequest(_mockRequestData.Object, _testRunCriteria, _executionManager.Object, _loggerManager.Object);
 
-            var testProcessStartInfo = new TestProcessStartInfo();
-            mockCustomLauncher.Setup(ml => ml.IsDebug).Returns(true);
-            testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+        _testRunRequest.ExecuteAsync();
 
-            mockCustomLauncher.Verify(ml => ml.LaunchTestHost(testProcessStartInfo), Times.Once);
-        }
+        var testProcessStartInfo = new TestProcessStartInfo();
+        mockCustomLauncher.Setup(ml => ml.IsDebug).Returns(true);
+        _testRunRequest.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
 
-        /// <summary>
-        /// ExecuteAsync should invoke OnRunStart event.
-        /// </summary>
-        [TestMethod]
-        public void ExecuteAsyncShouldInvokeOnRunStart()
-        {
-            bool onRunStartHandlerCalled = false;
-            this.testRunRequest.OnRunStart += (s, e) => onRunStartHandlerCalled = true;
+        mockCustomLauncher.Verify(ml => ml.LaunchTestHost(testProcessStartInfo), Times.Once);
+    }
 
-            // Action
-            this.testRunRequest.ExecuteAsync();
+    /// <summary>
+    /// ExecuteAsync should invoke OnRunStart event.
+    /// </summary>
+    [TestMethod]
+    public void ExecuteAsyncShouldInvokeOnRunStart()
+    {
+        bool onRunStartHandlerCalled = false;
+        _testRunRequest.OnRunStart += (s, e) => onRunStartHandlerCalled = true;
 
-            // Assert
-            Assert.IsTrue(onRunStartHandlerCalled, "ExecuteAsync should invoke OnRunstart event");
-        }
+        // Action
+        _testRunRequest.ExecuteAsync();
 
-        [TestMethod]
-        public void ExecuteAsyncShouldInvokeHandleTestRunStartOfLoggerManager()
-        {
-            this.testRunRequest.ExecuteAsync();
+        // Assert
+        Assert.IsTrue(onRunStartHandlerCalled, "ExecuteAsync should invoke OnRunstart event");
+    }
 
-            loggerManager.Verify(lm => lm.HandleTestRunStart(It.IsAny<TestRunStartEventArgs>()), Times.Once);
-        }
+    [TestMethod]
+    public void ExecuteAsyncShouldInvokeHandleTestRunStartOfLoggerManager()
+    {
+        _testRunRequest.ExecuteAsync();
+
+        _loggerManager.Verify(lm => lm.HandleTestRunStart(It.IsAny<TestRunStartEventArgs>()), Times.Once);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj
index 29dcd973cd..890481f977 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj
@@ -1,24 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Client.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs
deleted file mode 100644
index 220caa36c3..0000000000
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests
-{
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 00ddea45ca..0000000000
--- a/test/Microsoft.TestPlatform.Client.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.Client.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("342ac5e0-6fb2-4fa3-97ba-268e42a4487c")]
diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/TestPlatformTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/TestPlatformTests.cs
index a0402eaa98..b2a1cf8b2f 100644
--- a/test/Microsoft.TestPlatform.Client.UnitTests/TestPlatformTests.cs
+++ b/test/Microsoft.TestPlatform.Client.UnitTests/TestPlatformTests.cs
@@ -1,704 +1,641 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Client.Execution;
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests;
+
+[TestClass]
+public class TestPlatformTests
 {
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Client.Execution;
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class TestPlatformTests
+    private readonly Mock<ITestEngine> _testEngine;
+    private readonly Mock<IProxyDiscoveryManager> _discoveryManager;
+    private readonly Mock<ITestExtensionManager> _extensionManager;
+    private readonly Mock<ITestRuntimeProvider> _hostManager;
+    private readonly Mock<IProxyExecutionManager> _executionManager;
+    private readonly Mock<ITestLoggerManager> _loggerManager;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+
+    public TestPlatformTests()
     {
-        private readonly Mock<ITestEngine> testEngine;
-        private readonly Mock<IProxyDiscoveryManager> discoveryManager;
-        private readonly Mock<ITestExtensionManager> extensionManager;
-        private readonly Mock<ITestRuntimeProvider> hostManager;
-        private readonly Mock<IProxyExecutionManager> executionManager;
-        private readonly Mock<ITestLoggerManager> loggerManager;
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-
-        public TestPlatformTests()
-        {
-            this.testEngine = new Mock<ITestEngine>();
-            this.discoveryManager = new Mock<IProxyDiscoveryManager>();
-            this.extensionManager = new Mock<ITestExtensionManager>();
-            this.executionManager = new Mock<IProxyExecutionManager>();
-            this.loggerManager = new Mock<ITestLoggerManager>();
-            this.hostManager = new Mock<ITestRuntimeProvider>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-        }
-
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeManagersAndCreateDiscoveryRequestWithGivenCriteriaAndReturnIt()
-        {
-            this.discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
-            this.hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
-                .Returns(discoveryCriteria.Sources);
-
-            this.testEngine.Setup(te => te.GetDiscoveryManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<DiscoveryCriteria>())).Returns(this.discoveryManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-
-            var discoveryRequest = tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, new TestPlatformOptions());
+        _testEngine = new Mock<ITestEngine>();
+        _discoveryManager = new Mock<IProxyDiscoveryManager>();
+        _extensionManager = new Mock<ITestExtensionManager>();
+        _executionManager = new Mock<IProxyExecutionManager>();
+        _loggerManager = new Mock<ITestLoggerManager>();
+        _hostManager = new Mock<ITestRuntimeProvider>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+    }
 
-            this.hostManager.Verify(hm => hm.Initialize(It.IsAny<TestSessionMessageLogger>(), It.IsAny<string>()), Times.Once);
-            this.discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
-            Assert.AreEqual(discoveryCriteria, discoveryRequest.DiscoveryCriteria);
-        }
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeDiscoveryManagerAndCreateDiscoveryRequestWithGivenCriteriaAndReturnIt()
+    {
+        _discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
+        _hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
+            .Returns(discoveryCriteria.Sources);
 
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeManagersWithFalseFlagWhenSkipDefaultAdaptersIsFalse()
-        {
-            var options = new TestPlatformOptions()
-            {
-                SkipDefaultAdapters = false
-            };
+        _testEngine.Setup(te => te.GetDiscoveryManager(_mockRequestData.Object, It.IsAny<DiscoveryCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_discoveryManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-            InvokeCreateDiscoveryRequest(options);
+        var discoveryRequest = tp.CreateDiscoveryRequest(_mockRequestData.Object, discoveryCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            this.discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
-        }
+        _discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
+        Assert.AreEqual(discoveryCriteria, discoveryRequest.DiscoveryCriteria);
+    }
 
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeManagersWithTrueFlagWhenSkipDefaultAdaptersIsTrue()
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeManagersWithFalseFlagWhenSkipDefaultAdaptersIsFalse()
+    {
+        var options = new TestPlatformOptions()
         {
-            var options = new TestPlatformOptions()
-            {
-                SkipDefaultAdapters = true
-            };
+            SkipDefaultAdapters = false
+        };
 
-            InvokeCreateDiscoveryRequest(options);
+        InvokeCreateDiscoveryRequest(options);
 
-            this.discoveryManager.Verify(dm => dm.Initialize(true), Times.Once);
-        }
+        _discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
+    }
 
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeManagersWithFalseFlagWhenTestPlatformOptionsIsNull()
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeManagersWithTrueFlagWhenSkipDefaultAdaptersIsTrue()
+    {
+        var options = new TestPlatformOptions()
         {
-            InvokeCreateDiscoveryRequest();
+            SkipDefaultAdapters = true
+        };
 
-            this.discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
-        }
-
-        [TestMethod]
-        public void CreateDiscoveryRequestThrowsIfDiscoveryCriteriaIsNull()
-        {
-            TestPlatform tp = new TestPlatform();
+        InvokeCreateDiscoveryRequest(options);
 
-            Assert.ThrowsException<ArgumentNullException>(() => tp.CreateDiscoveryRequest(this.mockRequestData.Object, null, new TestPlatformOptions()));
-        }
+        _discoveryManager.Verify(dm => dm.Initialize(true), Times.Once);
+    }
 
-        [TestMethod]
-        public void UpdateExtensionsShouldUpdateTheEngineWithAdditionalExtensions()
-        {
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            var additionalExtensions = new List<string> { "e1.dll", "e2.dll" };
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeManagersWithFalseFlagWhenTestPlatformOptionsIsNull()
+    {
+        InvokeCreateDiscoveryRequest();
 
-            tp.UpdateExtensions(additionalExtensions, skipExtensionFilters: true);
+        _discoveryManager.Verify(dm => dm.Initialize(false), Times.Once);
+    }
 
-            this.extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, true));
-        }
+    [TestMethod]
+    public void CreateDiscoveryRequestThrowsIfDiscoveryCriteriaIsNull()
+    {
+        TestPlatform tp = new();
 
-        [TestMethod]
-        public void ClearExtensionsShouldClearTheExtensionsCachedInEngine()
-        {
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
+        Assert.ThrowsException<ArgumentNullException>(() => tp.CreateDiscoveryRequest(_mockRequestData.Object, null!, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
 
-            tp.ClearExtensions();
+    [TestMethod]
+    public void UpdateExtensionsShouldUpdateTheEngineWithAdditionalExtensions()
+    {
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        var additionalExtensions = new List<string> { "e1.dll", "e2.dll" };
 
-            this.extensionManager.Verify(em => em.ClearExtensions());
-        }
+        tp.UpdateExtensions(additionalExtensions, skipExtensionFilters: true);
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldThrowExceptionIfNoTestHostproviderFound()
-        {
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+        _extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, true));
+    }
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
-                <RunSettings>
-                     <RunConfiguration>
-                       <TargetFrameworkVersion>.NETPortable,Version=v4.5</TargetFrameworkVersion>
-                     </RunConfiguration>
-                </RunSettings>";
+    [TestMethod]
+    public void ClearExtensionsShouldClearTheExtensionsCachedInEngine()
+    {
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-            var testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, settingsXml, TimeSpan.Zero);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, null);
-            bool exceptionThrown = false;
+        tp.ClearExtensions();
 
-            try
-            {
-                tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
-            }
-            catch(TestPlatformException ex)
-            {
-                exceptionThrown = true;
-                Assert.AreEqual("No suitable test runtime provider found for this run.", ex.Message);
-            }
-
-            Assert.IsTrue(exceptionThrown, "TestPlatformException should get thrown");
-        }
+        _extensionManager.Verify(em => em.ClearExtensions());
+    }
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldUpdateLoggerExtensionWhenDesingModeIsFalseForRunAll()
-        {
-            var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), System.IO.SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
+    [TestMethod]
+    public void CreateTestRunRequestShouldUpdateLoggerExtensionWhenDesingModeIsFalseForRunAll()
+    {
+        var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
+        _executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>false</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var temp = Path.GetTempPath();
-            var testRunCriteria = new TestRunCriteria(new List<string> { $@"{temp}foo.dll" }, 10, false, settingsXml, TimeSpan.Zero);
-            this.hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources))
-                .Returns(testRunCriteria.Sources);
+        var temp = Path.GetTempPath();
+        var testRunCriteria = new TestRunCriteria(new List<string> { $@"{temp}foo.dll" }, 10, false, settingsXml, TimeSpan.Zero);
+        _hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources!))
+            .Returns(testRunCriteria.Sources!);
 
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, this.hostManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _mockFileHelper.Object, _hostManager.Object);
 
-            var testRunRequest = tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
-            this.extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
-        }
+        var testRunRequest = tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
+        _extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
+    }
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldUpdateLoggerExtensionWhenDesignModeIsFalseForRunSelected()
-        {
-            var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), System.IO.SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
+    [TestMethod]
+    public void CreateTestRunRequestShouldUpdateLoggerExtensionWhenDesignModeIsFalseForRunSelected()
+    {
+        var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
 
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        _executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>false</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var testRunCriteria = new TestRunCriteria(new List<TestCase> { new TestCase("dll1.class1.test1", new Uri("hello://x/"), $"xyz{Path.DirectorySeparatorChar}1.dll") }, 10, false, settingsXml);
+        var testRunCriteria = new TestRunCriteria(new List<TestCase> { new("dll1.class1.test1", new Uri("hello://x/"), $"xyz{Path.DirectorySeparatorChar}1.dll") }, 10, false, settingsXml);
 
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, this.hostManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _mockFileHelper.Object, _hostManager.Object);
 
-            var testRunRequest = tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
-            this.extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
-        }
+        var testRunRequest = tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
+        _extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
+    }
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldNotUpdateTestSourcesIfSelectedTestAreRun()
-        {
-            var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), System.IO.SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
+    [TestMethod]
+    public void CreateTestRunRequestShouldNotUpdateTestSourcesIfSelectedTestAreRun()
+    {
+        var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
 
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        _executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>false</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var testRunCriteria = new TestRunCriteria(new List<TestCase> { new TestCase("dll1.class1.test1", new Uri("hello://x/"), $"xyz{Path.DirectorySeparatorChar}1.dll") }, 10, false, settingsXml);
-            this.hostManager.Setup(hm => hm.GetTestSources(It.IsAny<IEnumerable<string>>()))
-                .Returns(new List<string> { $"xyz{Path.DirectorySeparatorChar}1.dll" });
-
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, this.hostManager.Object);
-
-            tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
-            this.extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
-            this.hostManager.Verify(hm => hm.GetTestSources(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
-
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeManagersAndCreateTestRunRequestWithSpecifiedCriteria()
-        {
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10);
-            this.hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources))
-                .Returns(testRunCriteria.Sources);
+        var testRunCriteria = new TestRunCriteria(new List<TestCase> { new("dll1.class1.test1", new Uri("hello://x/"), $"xyz{Path.DirectorySeparatorChar}1.dll") }, 10, false, settingsXml);
+        _hostManager.Setup(hm => hm.GetTestSources(It.IsAny<IEnumerable<string>>()))
+            .Returns(new List<string> { $"xyz{Path.DirectorySeparatorChar}1.dll" });
 
-            var testRunRequest = tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            var actualTestRunRequest = testRunRequest as TestRunRequest;
+        var tp = new TestableTestPlatform(_testEngine.Object, _mockFileHelper.Object, _hostManager.Object);
 
-            this.hostManager.Verify(hm => hm.Initialize(It.IsAny<TestSessionMessageLogger>(), It.IsAny<string>()), Times.Once);
-            this.executionManager.Verify(em => em.Initialize(false), Times.Once);
-            Assert.AreEqual(testRunCriteria, actualTestRunRequest.TestRunCriteria);
-        }
-
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeManagersWithFalseFlagWhenSkipDefaultAdaptersIsFalse()
-        {
-            var options = new TestPlatformOptions()
-            {
-                SkipDefaultAdapters = false
-            };
+        tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
+        _extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
+        _hostManager.Verify(hm => hm.GetTestSources(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-            InvokeCreateTestRunRequest(options);
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeManagersAndCreateTestRunRequestWithSpecifiedCriteria()
+    {
+        _executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            this.executionManager.Verify(dm => dm.Initialize(false), Times.Once);
-        }
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10);
+        _hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources!))
+            .Returns(testRunCriteria.Sources!);
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeManagersWithTrueFlagWhenSkipDefaultAdaptersIsTrue()
-        {
-            var options = new TestPlatformOptions()
-            {
-                SkipDefaultAdapters = true
-            };
+        var testRunRequest = tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            InvokeCreateTestRunRequest(options);
+        var actualTestRunRequest = testRunRequest as TestRunRequest;
 
-            this.executionManager.Verify(dm => dm.Initialize(true), Times.Once);
-        }
+        _executionManager.Verify(em => em.Initialize(false), Times.Once);
+        Assert.AreEqual(testRunCriteria, actualTestRunRequest?.TestRunCriteria);
+    }
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeManagersWithFalseFlagWhenTestPlatformOptionsIsNull()
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeManagersWithFalseFlagWhenSkipDefaultAdaptersIsFalse()
+    {
+        var options = new TestPlatformOptions()
         {
-            InvokeCreateTestRunRequest();
+            SkipDefaultAdapters = false
+        };
 
-            this.executionManager.Verify(dm => dm.Initialize(false), Times.Once);
-        }
+        InvokeCreateTestRunRequest(options);
 
-        [TestMethod]
-        public void CreateTestRunRequestShouldSetCustomHostLauncherOnEngineDefaultLauncherIfSpecified()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10, false, null, TimeSpan.Zero, mockCustomLauncher.Object);
-            this.hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources))
-                .Returns(testRunCriteria.Sources);
-
-            var testRunRequest = tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
-
-            var actualTestRunRequest = testRunRequest as TestRunRequest;
-            Assert.AreEqual(testRunCriteria, actualTestRunRequest.TestRunCriteria);
-            this.hostManager.Verify(hl => hl.SetCustomLauncher(mockCustomLauncher.Object), Times.Once);
-        }
+        _executionManager.Verify(dm => dm.Initialize(false), Times.Once);
+    }
 
-        [TestMethod]
-        public void CreateTestRunRequestThrowsIfTestRunCriteriaIsNull()
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeManagersWithTrueFlagWhenSkipDefaultAdaptersIsTrue()
+    {
+        var options = new TestPlatformOptions()
         {
-            var tp = new TestPlatform();
+            SkipDefaultAdapters = true
+        };
 
-            Assert.ThrowsException<ArgumentNullException>(() => tp.CreateTestRunRequest(this.mockRequestData.Object, null, new TestPlatformOptions()));
-        }
+        InvokeCreateTestRunRequest(options);
 
+        _executionManager.Verify(dm => dm.Initialize(true), Times.Once);
+    }
 
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldThrowExceptionIfNoTestHostproviderFound()
-        {
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object))
-                .Returns(this.loggerManager.Object);
-
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
-                <RunSettings>
-                     <RunConfiguration>
-                       <TargetFrameworkVersion>.NETPortable,Version=v4.5</TargetFrameworkVersion>
-                     </RunConfiguration>
-                </RunSettings>";
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeManagersWithFalseFlagWhenTestPlatformOptionsIsNull()
+    {
+        InvokeCreateTestRunRequest();
 
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { @"x:dummy\foo.dll" }, 1, settingsXml);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, null);
-            bool exceptionThrown = false;
+        _executionManager.Verify(dm => dm.Initialize(false), Times.Once);
+    }
 
-            try
-            {
-                tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, new TestPlatformOptions());
-            }
-            catch (TestPlatformException ex)
-            {
-                exceptionThrown = true;
-                Assert.AreEqual("No suitable test runtime provider found for this run.", ex.Message);
-            }
+    [TestMethod]
+    public void CreateTestRunRequestThrowsIfTestRunCriteriaIsNull()
+    {
+        var tp = new TestPlatform();
 
-            Assert.IsTrue(exceptionThrown, "TestPlatformException should get thrown");
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => tp.CreateTestRunRequest(_mockRequestData.Object, null!, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
 
-        /// <summary>
-        /// Logger extensions should be updated when design mode is false.
-        /// </summary>
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldUpdateLoggerExtensionWhenDesignModeIsFalse()
-        {
-            var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), System.IO.SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
+    /// <summary>
+    /// Logger extensions should be updated when design mode is false.
+    /// </summary>
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldUpdateLoggerExtensionWhenDesignModeIsFalse()
+    {
+        var additionalExtensions = new List<string> { "foo.TestLogger.dll", "Joo.TestLogger.dll" };
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(additionalExtensions);
 
-            this.discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        _discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>false</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var temp = Path.GetTempPath();
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { $@"{temp}foo.dll" }, 1, settingsXml);
-            this.hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
-                .Returns(discoveryCriteria.Sources);
+        var temp = Path.GetTempPath();
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { $@"{temp}foo.dll" }, 1, settingsXml);
+        _hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
+            .Returns(discoveryCriteria.Sources);
 
-            this.testEngine.Setup(te => te.GetDiscoveryManager(It.IsAny<IRequestData>(), this.hostManager.Object, It.IsAny<DiscoveryCriteria>())).Returns(this.discoveryManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.mockFileHelper.Object, this.hostManager.Object);
+        _testEngine.Setup(te => te.GetDiscoveryManager(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_discoveryManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _mockFileHelper.Object, _hostManager.Object);
 
-            // Action
-            var discoveryRequest = tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, new TestPlatformOptions());
+        // Action
+        var discoveryRequest = tp.CreateDiscoveryRequest(_mockRequestData.Object, discoveryCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            // Verify
-            this.extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
-        }
+        // Verify
+        _extensionManager.Verify(em => em.UseAdditionalExtensions(additionalExtensions, false));
+    }
 
-        /// <summary>
-        /// Create test run request should initialize logger manager for design mode.
-        /// </summary>
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeLoggerManagerForDesignMode()
-        {
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+    /// <summary>
+    /// Create test run request should initialize logger manager for design mode.
+    /// </summary>
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeLoggerManagerForDesignMode()
+    {
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>True</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, settingsXml);
+        var testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, settingsXml);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            this.loggerManager.Verify(lm => lm.Initialize(settingsXml));
-        }
+        _loggerManager.Verify(lm => lm.Initialize(settingsXml));
+    }
 
-        /// <summary>
-        /// Create discovery request should initialize logger manager for design mode.
-        /// </summary>
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeLoggerManagerForDesignMode()
-        {
-            this.testEngine.Setup(te => te.GetDiscoveryManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<DiscoveryCriteria>())).Returns(this.discoveryManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+    /// <summary>
+    /// Create discovery request should initialize logger manager for design mode.
+    /// </summary>
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeLoggerManagerForDesignMode()
+    {
+        _testEngine.Setup(te => te.GetDiscoveryManager(_mockRequestData.Object, It.IsAny<DiscoveryCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_discoveryManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>True</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, settingsXml);
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, settingsXml);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, new TestPlatformOptions());
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        tp.CreateDiscoveryRequest(_mockRequestData.Object, discoveryCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            this.loggerManager.Verify(lm => lm.Initialize(settingsXml));
-        }
+        _loggerManager.Verify(lm => lm.Initialize(settingsXml));
+    }
 
-        /// <summary>
-        /// Create test run request should initialize logger manager for design mode.
-        /// </summary>
-        [TestMethod]
-        public void CreateTestRunRequestShouldInitializeLoggerManagerForNonDesignMode()
-        {
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+    /// <summary>
+    /// Create test run request should initialize logger manager for design mode.
+    /// </summary>
+    [TestMethod]
+    public void CreateTestRunRequestShouldInitializeLoggerManagerForNonDesignMode()
+    {
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>False</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10, false, settingsXml);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10, false, settingsXml);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, new TestPlatformOptions());
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            this.loggerManager.Verify(lm => lm.Initialize(settingsXml));
-        }
+        _loggerManager.Verify(lm => lm.Initialize(settingsXml));
+    }
 
-        /// <summary>
-        /// Create discovery request should initialize logger manager for design mode.
-        /// </summary>
-        [TestMethod]
-        public void CreateDiscoveryRequestShouldInitializeLoggerManagerForNonDesignMode()
-        {
-            this.testEngine.Setup(te => te.GetDiscoveryManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<DiscoveryCriteria>())).Returns(this.discoveryManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+    /// <summary>
+    /// Create discovery request should initialize logger manager for design mode.
+    /// </summary>
+    [TestMethod]
+    public void CreateDiscoveryRequestShouldInitializeLoggerManagerForNonDesignMode()
+    {
+        _testEngine.Setup(te => te.GetDiscoveryManager(_mockRequestData.Object, It.IsAny<DiscoveryCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_discoveryManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>False</DesignMode>
                      </RunConfiguration>
                 </RunSettings>";
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 10, settingsXml);
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 10, settingsXml);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, new TestPlatformOptions());
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        tp.CreateDiscoveryRequest(_mockRequestData.Object, discoveryCriteria, new TestPlatformOptions(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>());
 
-            this.loggerManager.Verify(lm => lm.Initialize(settingsXml));
-        }
+        _loggerManager.Verify(lm => lm.Initialize(settingsXml));
+    }
 
-        [TestMethod]
-        public void StartTestSessionShouldThrowExceptionIfTestSessionCriteriaIsNull()
-        {
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
+    [TestMethod]
+    public void StartTestSessionShouldThrowExceptionIfTestSessionCriteriaIsNull()
+    {
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            tp.StartTestSession(
+                new Mock<IRequestData>().Object,
+                null!,
+                new Mock<ITestSessionEventsHandler>().Object,
+                new Dictionary<string, SourceDetail>(),
+                new Mock<IWarningLogger>().Object));
+    }
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                tp.StartTestSession(
-                    new Mock<IRequestData>().Object,
-                    null,
-                    new Mock<ITestSessionEventsHandler>().Object));
-        }
+    [TestMethod]
+    public void StartTestSessionShouldReturnFalseIfDesignModeIsDisabled()
+    {
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-        [TestMethod]
-        public void StartTestSessionShouldReturnFalseIfDesignModeIsDisabled()
+        var testSessionCriteria = new StartTestSessionCriteria()
         {
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
                     <RunSettings>
                          <RunConfiguration>
                            <DesignMode>false</DesignMode>
                          </RunConfiguration>
                     </RunSettings>"
-            };
-
-            Assert.IsFalse(
-                tp.StartTestSession(
-                    new Mock<IRequestData>().Object,
-                    testSessionCriteria,
-                    new Mock<ITestSessionEventsHandler>().Object));
-        }
+        };
+
+        Assert.IsFalse(
+            tp.StartTestSession(
+                new Mock<IRequestData>().Object,
+                testSessionCriteria,
+                new Mock<ITestSessionEventsHandler>().Object,
+                It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
 
-        [TestMethod]
-        public void StartTestSessionShouldReturnFalseIfTestSessionManagerIsNull()
-        {
-            this.testEngine.Setup(
+    [TestMethod]
+    public void StartTestSessionShouldReturnFalseIfTestSessionManagerIsNull()
+    {
+        _testEngine.Setup(
                 te => te.GetTestSessionManager(
                     It.IsAny<IRequestData>(),
-                    It.IsAny<StartTestSessionCriteria>()))
-                .Returns((IProxyTestSessionManager)null);
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns((IProxyTestSessionManager)null!);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
 
-            var testSessionCriteria = new StartTestSessionCriteria()
+        mockEventsHandler.Setup(
+            eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
             {
-                RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
+                Assert.IsNull(eventArgs.TestSessionInfo);
+                Assert.IsNull(eventArgs.Metrics);
+            });
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
                     <RunSettings>
                          <RunConfiguration>
                            <DesignMode>true</DesignMode>
                          </RunConfiguration>
                     </RunSettings>"
-            };
-
-            Assert.IsFalse(
-                tp.StartTestSession(
-                    new Mock<IRequestData>().Object,
-                    testSessionCriteria,
-                    mockEventsHandler.Object));
+        };
+
+        Assert.IsFalse(
+            tp.StartTestSession(
+                new Mock<IRequestData>().Object,
+                testSessionCriteria,
+                mockEventsHandler.Object,
+                It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
 
-            mockEventsHandler.Verify(
-                eh => eh.HandleStartTestSessionComplete(null),
-                Times.Once);
-        }
+    [TestMethod]
+    public void StartTestSessionShouldReturnTrueIfTestSessionManagerStartSessionReturnsTrue()
+    {
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-        [TestMethod]
-        public void StartTestSessionShouldReturnTrueIfTestSessionManagerStartSessionReturnsTrue()
+        var testSessionCriteria = new StartTestSessionCriteria()
         {
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
                     <RunSettings>
                          <RunConfiguration>
                            <DesignMode>true</DesignMode>
                          </RunConfiguration>
                     </RunSettings>"
-            };
-
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-            var mockTestSessionManager = new Mock<IProxyTestSessionManager>();
-            mockTestSessionManager.Setup(
-                tsm => tsm.StartSession(It.IsAny<ITestSessionEventsHandler>()))
-                .Returns(true);
-            this.testEngine.Setup(
+        };
+
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockTestSessionManager = new Mock<IProxyTestSessionManager>();
+        mockTestSessionManager.Setup(
+                tsm => tsm.StartSession(
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<IRequestData>()))
+            .Returns(true);
+        _testEngine.Setup(
                 te => te.GetTestSessionManager(
                     It.IsAny<IRequestData>(),
-                    It.IsAny<StartTestSessionCriteria>()))
-                .Returns(mockTestSessionManager.Object);
-
-            Assert.IsTrue(
-               tp.StartTestSession(
-                   new Mock<IRequestData>().Object,
-                   testSessionCriteria,
-                   mockEventsHandler.Object));
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(mockTestSessionManager.Object);
+
+        Assert.IsTrue(
+            tp.StartTestSession(
+                new Mock<IRequestData>().Object,
+                testSessionCriteria,
+                mockEventsHandler.Object,
+                It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+
+        mockTestSessionManager.Verify(
+            tsm => tsm.StartSession(mockEventsHandler.Object, It.IsAny<IRequestData>()),
+            Times.Once);
+    }
 
-            mockTestSessionManager.Verify(
-                tsm => tsm.StartSession(mockEventsHandler.Object));
-        }
+    [TestMethod]
+    public void StartTestSessionShouldReturnFalseIfTestSessionManagerStartSessionReturnsFalse()
+    {
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-        [TestMethod]
-        public void StartTestSessionShouldReturnFalseIfTestSessionManagerStartSessionReturnsFalse()
+        var testSessionCriteria = new StartTestSessionCriteria()
         {
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            RunSettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
                     <RunSettings>
                          <RunConfiguration>
                            <DesignMode>true</DesignMode>
                          </RunConfiguration>
                     </RunSettings>"
-            };
-
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-            var mockTestSessionManager = new Mock<IProxyTestSessionManager>();
-            mockTestSessionManager.Setup(
-                tsm => tsm.StartSession(It.IsAny<ITestSessionEventsHandler>()))
-                .Returns(false);
-            this.testEngine.Setup(
+        };
+
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockTestSessionManager = new Mock<IProxyTestSessionManager>();
+        mockTestSessionManager.Setup(
+                tsm => tsm.StartSession(
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<IRequestData>()))
+            .Returns(false);
+        _testEngine.Setup(
                 te => te.GetTestSessionManager(
                     It.IsAny<IRequestData>(),
-                    It.IsAny<StartTestSessionCriteria>()))
-                .Returns(mockTestSessionManager.Object);
-
-            Assert.IsFalse(
-               tp.StartTestSession(
-                   new Mock<IRequestData>().Object,
-                   testSessionCriteria,
-                   mockEventsHandler.Object));
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(mockTestSessionManager.Object);
+
+        Assert.IsFalse(
+            tp.StartTestSession(
+                mockRequestData.Object,
+                testSessionCriteria,
+                mockEventsHandler.Object,
+                It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+
+        mockTestSessionManager.Verify(
+            tsm => tsm.StartSession(mockEventsHandler.Object, mockRequestData.Object),
+            Times.Once);
+    }
 
-            mockTestSessionManager.Verify(
-                tsm => tsm.StartSession(mockEventsHandler.Object));
-        }
+    private void InvokeCreateDiscoveryRequest(TestPlatformOptions? options = null)
+    {
+        _discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
+        _hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
+            .Returns(discoveryCriteria.Sources);
 
-        private void InvokeCreateDiscoveryRequest(TestPlatformOptions options = null)
-        {
-            this.discoveryManager.Setup(dm => dm.Initialize(false)).Verifiable();
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "foo" }, 1, null);
-            this.hostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources))
-                .Returns(discoveryCriteria.Sources);
+        _testEngine.Setup(te => te.GetDiscoveryManager(_mockRequestData.Object, It.IsAny<DiscoveryCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_discoveryManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
 
-            this.testEngine.Setup(te => te.GetDiscoveryManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<DiscoveryCriteria>())).Returns(this.discoveryManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
+        tp.CreateDiscoveryRequest(_mockRequestData.Object, discoveryCriteria, options, new Dictionary<string, SourceDetail>(), new Mock<IWarningLogger>().Object);
+    }
 
-            tp.CreateDiscoveryRequest(this.mockRequestData.Object, discoveryCriteria, options);
-        }
+    private void InvokeCreateTestRunRequest(TestPlatformOptions? options = null)
+    {
+        _executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
+        _testEngine.Setup(te => te.GetExecutionManager(_mockRequestData.Object, It.IsAny<TestRunCriteria>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(_executionManager.Object);
+        _testEngine.Setup(te => te.GetExtensionManager()).Returns(_extensionManager.Object);
+        _testEngine.Setup(te => te.GetLoggerManager(_mockRequestData.Object)).Returns(_loggerManager.Object);
 
-        private void InvokeCreateTestRunRequest(TestPlatformOptions options = null)
-        {
-            this.executionManager.Setup(dm => dm.Initialize(false)).Verifiable();
-            this.testEngine.Setup(te => te.GetExecutionManager(this.mockRequestData.Object, this.hostManager.Object, It.IsAny<TestRunCriteria>())).Returns(this.executionManager.Object);
-            this.testEngine.Setup(te => te.GetExtensionManager()).Returns(this.extensionManager.Object);
-            this.testEngine.Setup(te => te.GetLoggerManager(this.mockRequestData.Object)).Returns(this.loggerManager.Object);
+        var tp = new TestableTestPlatform(_testEngine.Object, _hostManager.Object);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10);
+        _hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources!))
+            .Returns(testRunCriteria.Sources!);
 
-            var tp = new TestableTestPlatform(this.testEngine.Object, this.hostManager.Object);
-            var testRunCriteria = new TestRunCriteria(new List<string> { "foo" }, 10);
-            this.hostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources))
-                .Returns(testRunCriteria.Sources);
+        tp.CreateTestRunRequest(_mockRequestData.Object, testRunCriteria, options, new Dictionary<string, SourceDetail>(), new Mock<IWarningLogger>().Object);
+    }
 
-            tp.CreateTestRunRequest(this.mockRequestData.Object, testRunCriteria, options);
+    private class TestableTestPlatform : TestPlatform
+    {
+        public TestableTestPlatform(ITestEngine testEngine, ITestRuntimeProvider hostProvider)
+            : base(testEngine, new FileHelper(), new TestableTestRuntimeProviderManager(hostProvider))
+        {
         }
 
-        private class TestableTestPlatform : TestPlatform
+        public TestableTestPlatform(ITestEngine testEngine, IFileHelper fileHelper, ITestRuntimeProvider hostProvider)
+            : base(testEngine, fileHelper, new TestableTestRuntimeProviderManager(hostProvider))
         {
-            public TestableTestPlatform(ITestEngine testEngine, ITestRuntimeProvider hostProvider) : base(testEngine, new FileHelper(), new TestableTestRuntimeProviderManager(hostProvider))
-            {
-            }
-
-            public TestableTestPlatform(ITestEngine testEngine, IFileHelper fileHelper, ITestRuntimeProvider hostProvider) : base(testEngine, fileHelper, new TestableTestRuntimeProviderManager(hostProvider))
-            {
-            }
         }
+    }
 
-        private class TestableTestRuntimeProviderManager : TestRuntimeProviderManager
-        {
-            private readonly ITestRuntimeProvider hostProvider;
+    private class TestableTestRuntimeProviderManager : TestRuntimeProviderManager
+    {
+        private readonly ITestRuntimeProvider _hostProvider;
 
-            public TestableTestRuntimeProviderManager(ITestRuntimeProvider hostProvider)
-                : base(TestSessionMessageLogger.Instance)
-            {
-                this.hostProvider = hostProvider;
-            }
+        public TestableTestRuntimeProviderManager(ITestRuntimeProvider hostProvider)
+            : base(TestSessionMessageLogger.Instance)
+        {
+            _hostProvider = hostProvider;
+        }
 
-            public override ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration)
-            {
-                return this.hostProvider;
-            }
+        public override ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string? runConfiguration, List<string>? _)
+        {
+            return _hostProvider;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs b/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs
deleted file mode 100644
index 15d97f4c96..0000000000
--- a/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace TestPlatform.Common.UnitTests.Utilities
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class AssemblyPropertiesTests : IntegrationTestBase
-    {
-        private IAssemblyProperties assemblyProperties;
-
-        public AssemblyPropertiesTests()
-        {
-            this.assemblyProperties = new AssemblyProperties();
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetAssemblyTypeForManagedDll(string framework)
-        {
-            var assemblyPath = this.testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
-            var assemblyType = this.assemblyProperties.GetAssemblyType(assemblyPath);
-
-            Assert.AreEqual(AssemblyType.Managed, assemblyType);
-        }
-
-        [TestMethod]
-        public void GetAssemblyTypeForNativeDll()
-        {
-            var assemblyPath = $@"{this.testEnvironment.PackageDirectory}\microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
-            var assemblyType = this.assemblyProperties.GetAssemblyType(assemblyPath);
-
-            Assert.AreEqual(AssemblyType.Native, assemblyType);
-        }
-
-        [TestMethod]
-        public void GetAssemblyTypeForManagedExe()
-        {
-            var assemblyPath = this.testEnvironment.GetTestAsset("ConsoleManagedApp.exe", "net451");
-            var assemblyType = this.assemblyProperties.GetAssemblyType(assemblyPath);
-
-            Assert.AreEqual(AssemblyType.Managed, assemblyType);
-        }
-
-        [TestMethod]
-        [DataRow("netcoreapp2.1")]
-        public void GetAssemblyTypeForNetCoreManagedExe(string framework)
-        {
-            var assemblyPath = this.testEnvironment.GetTestAsset("ConsoleManagedApp.dll", framework);
-            var assemblyType = this.assemblyProperties.GetAssemblyType(assemblyPath);
-
-            Assert.AreEqual(AssemblyType.Managed, assemblyType);
-        }
-
-        [TestMethod]
-        public void GetAssemblyTypeForNativeExe()
-        {
-            var assemblyPath = $@"{this.testEnvironment.PackageDirectory}\microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\Microsoft.TestPlatform.TestAsset.ConsoleNativeApp.exe";
-            var assemblyType = this.assemblyProperties.GetAssemblyType(assemblyPath);
-
-            Assert.AreEqual(AssemblyType.Native, assemblyType);
-        }
-
-        [TestMethod]
-        public void GetAssemblyTypeShouldReturnNoneInCaseOfError()
-        {
-            var assemblyType = this.assemblyProperties.GetAssemblyType("invalidFile.dll");
-
-            Assert.AreEqual(AssemblyType.None, assemblyType);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj b/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj
deleted file mode 100644
index 63e3b0c9f6..0000000000
--- a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <AssemblyName>Microsoft.TestPlatform.Common.PlatformTests</AssemblyName>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
-    <PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP">
-      <Version>2.0.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/Program.cs b/test/Microsoft.TestPlatform.Common.PlatformTests/Program.cs
deleted file mode 100644
index c14da13e69..0000000000
--- a/test/Microsoft.TestPlatform.Common.PlatformTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.Common.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/DataCollectorExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/DataCollectorExtensionManagerTests.cs
index 00e193f6f7..4422bceb8e 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/DataCollectorExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/DataCollectorExtensionManagerTests.cs
@@ -1,46 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.ExtensionFramework
-{
-    using System;
+using System;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.ExtensionFramework;
 
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+[TestClass]
+public class DataCollectorExtensionManagerTests
+{
+    [TestInitialize]
+    public void Initialize()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(DataCollectorExtensionManagerTests));
+    }
 
-    [TestClass]
-    public class DataCollectorExtensionManagerTests
+    [TestMethod]
+    public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
     {
-        [TestInitialize]
-        public void Initialize()
+        Assert.ThrowsException<ArgumentNullException>(() =>
         {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(DataCollectorExtensionManagerTests));
-        }
+            var dataCollectionExtensionManager = DataCollectorExtensionManager.Create(null!);
+        });
+    }
 
-        [TestMethod]
-        public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
+    [TestMethod]
+    public void CreateShouldReturnInstanceOfDataCollectorExtensionManager()
+    {
+        try
         {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                var dataCollectionExtensionManager = DataCollectorExtensionManager.Create(null);
-            });
+            var dataCollectorExtensionManager = DataCollectorExtensionManager.Create(TestSessionMessageLogger.Instance);
+            Assert.IsNotNull(dataCollectorExtensionManager);
+            Assert.IsInstanceOfType(dataCollectorExtensionManager, typeof(DataCollectorExtensionManager));
         }
-
-        [TestMethod]
-        public void CreateShouldReturnInstanceOfDataCollectorExtensionManager()
+        finally
         {
-            try
-            {
-                var dataCollectorExtensionManager = DataCollectorExtensionManager.Create(TestSessionMessageLogger.Instance);
-                Assert.IsNotNull(dataCollectorExtensionManager);
-                Assert.IsInstanceOfType(dataCollectorExtensionManager, typeof(DataCollectorExtensionManager));
-            }
-            finally
-            {
-                TestSessionMessageLogger.Instance = null;
-            }
+            TestSessionMessageLogger.Instance = null;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/ExtensionDecoratorTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/ExtensionDecoratorTests.cs
new file mode 100644
index 0000000000..a44997fd80
--- /dev/null
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/ExtensionDecoratorTests.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+using Microsoft.VisualStudio.TestPlatform.Common.Resources;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class ExtensionDecoratorTests
+{
+    private readonly Mock<IFeatureFlag> _featureFlagMock = new();
+    private readonly Mock<ITestExecutor2> _testExecutorMock = new();
+    private readonly Mock<IRunContext> _contextMock = new();
+    private readonly Mock<IFrameworkHandle> _frameworkWorkHandleMock = new();
+    private readonly Mock<IRunSettings> _settingsMock = new();
+    private readonly string _runsettings = @"
+    <RunSettings>
+        <RunConfiguration>
+            <ForceOneTestAtTimePerTestHost>true</ForceOneTestAtTimePerTestHost>
+        </RunConfiguration>
+    </RunSettings>";
+
+    [TestMethod]
+    public void ExtensionDecoratorFactory_DisabledByFlag()
+    {
+        // Arrange
+        _featureFlagMock.Setup(x => x.IsSet(FeatureFlag.VSTEST_DISABLE_SERIALTESTRUN_DECORATOR)).Returns(true);
+
+        // Run test and assert
+        ExtensionDecoratorFactory extensionDecoratorFactory = new(_featureFlagMock.Object);
+        Mock<ITestExecutor> featureFlagMock = new();
+        Assert.AreEqual(featureFlagMock.Object, extensionDecoratorFactory.Decorate(featureFlagMock.Object));
+    }
+
+    [TestMethod]
+    public void SerialTestRunDecorator_ShouldSerializeTests()
+    {
+        // Arrange
+        List<TestCase> testCases = new();
+        for (int i = 0; i < 50; i++)
+        {
+            testCases.Add(new TestCase() { Id = Guid.NewGuid() });
+        }
+
+        long currentCount = 0;
+        List<TestCase> testCasesRan = new();
+        _settingsMock.Setup(x => x.SettingsXml).Returns(_runsettings);
+        _contextMock.Setup(x => x.RunSettings).Returns(_settingsMock.Object);
+        _testExecutorMock.Setup(x => x.RunTests(It.IsAny<IEnumerable<TestCase>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()))
+        .Callback((IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle) =>
+        {
+            Assert.AreEqual(0, Interlocked.Read(ref currentCount));
+            currentCount = Interlocked.Increment(ref currentCount);
+            TestCase tc = tests!.First();
+            Task.Run(() =>
+            {
+                Thread.Sleep(100);
+                currentCount = Interlocked.Decrement(ref currentCount);
+                frameworkHandle!.RecordEnd(tc, TestOutcome.Passed);
+            });
+            testCasesRan.Add(tc);
+        });
+
+        // Run test
+        SerialTestRunDecorator serialTestRunDecorator = new(_testExecutorMock.Object);
+        serialTestRunDecorator.RunTests(testCases, _contextMock.Object, _frameworkWorkHandleMock.Object);
+
+        // Assert
+        Assert.AreEqual(0, testCases.Except(testCasesRan).Count());
+    }
+
+    [TestMethod]
+    public void SerialTestRunDecorator_DoesNotSupportSources()
+    {
+        // Arrange
+        _settingsMock.Setup(x => x.SettingsXml).Returns(_runsettings);
+        _contextMock.Setup(x => x.RunSettings).Returns(_settingsMock.Object);
+
+        // Run test
+        SerialTestRunDecorator serialTestRunDecorator = new(_testExecutorMock.Object);
+        serialTestRunDecorator.RunTests(new List<string>() { "samplesource.dll" }, _contextMock.Object, _frameworkWorkHandleMock.Object);
+
+        // Assert
+        _testExecutorMock.Verify(x => x.RunTests(It.IsAny<IEnumerable<string>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()), Times.Never());
+        _frameworkWorkHandleMock.Verify(x => x.SendMessage(TestMessageLevel.Error, Resources.SerialTestRunInvalidScenario), Times.Once());
+    }
+
+
+    [TestMethod]
+    [DataRow("FaLsE", false)]
+    [DataRow("false", false)]
+    [DataRow("FALSE", false)]
+    [DataRow(null, true)]
+    public void SerialTestRunDecorator_Disabled(string falseValue, bool nullRunSettings)
+    {
+        // Arrange
+        string runsettings = $@"
+        <RunSettings>
+            <RunConfiguration>
+                <ForceOneTestAtTimePerTestHost>{falseValue}</ForceOneTestAtTimePerTestHost>
+            </RunConfiguration>
+        </RunSettings>";
+
+        List<TestCase> testCases = new();
+        for (int i = 0; i < 50; i++)
+        {
+            testCases.Add(new TestCase() { Id = Guid.NewGuid() });
+        }
+
+        string[] sourcesName = ["testSource.dll"];
+
+        _settingsMock.Setup(x => x.SettingsXml).Returns(nullRunSettings ? null : runsettings);
+        _contextMock.Setup(x => x.RunSettings).Returns(_settingsMock.Object);
+        _testExecutorMock.Setup(x => x.RunTests(It.IsAny<IEnumerable<TestCase>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()))
+        .Callback((IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle) => Assert.AreEqual(testCases, tests));
+        _testExecutorMock.Setup(x => x.RunTests(It.IsAny<IEnumerable<string>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()))
+        .Callback((IEnumerable<string>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle) => Assert.AreEqual(sourcesName, tests));
+
+        // Run test
+        SerialTestRunDecorator serialTestRunDecorator = new(_testExecutorMock.Object);
+        serialTestRunDecorator.RunTests(testCases, _contextMock.Object, _frameworkWorkHandleMock.Object);
+        serialTestRunDecorator.RunTests(sourcesName, _contextMock.Object, _frameworkWorkHandleMock.Object);
+
+        // Assert
+        _testExecutorMock.Verify(x => x.RunTests(It.IsAny<IEnumerable<TestCase>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()), Times.Once());
+        _testExecutorMock.Verify(x => x.RunTests(It.IsAny<IEnumerable<string>?>(), It.IsAny<IRunContext?>(), It.IsAny<IFrameworkHandle?>()), Times.Once());
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestDiscoveryExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestDiscoveryExtensionManagerTests.cs
index 7c69dfd0a1..89631f1b85 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestDiscoveryExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestDiscoveryExtensionManagerTests.cs
@@ -1,138 +1,151 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestDiscoveryExtensionManagerTests
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.TestPlatform.Common;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestDiscoveryExtensionManagerTests
+    [TestCleanup]
+    public void TestCleanup()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestDiscoveryExtensionManager.Destroy();
-        }
+        TestDiscoveryExtensionManager.Destroy();
+    }
 
-        [TestMethod]
-        public void CreateShouldDiscoverDiscovererExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests));
+    [TestMethod]
+    public void CreateShouldDiscoverDiscovererExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests));
 
-            var extensionManager = TestDiscoveryExtensionManager.Create();
+        var extensionManager = TestDiscoveryExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.Discoverers);
-            Assert.IsTrue(extensionManager.Discoverers.Any());
-        }
+        Assert.IsNotNull(extensionManager.Discoverers);
+        Assert.IsTrue(extensionManager.Discoverers.Any());
+    }
 
-        [TestMethod]
-        public void CreateShouldCacheDiscoveredExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests), () => { });
+    [TestMethod]
+    public void CreateShouldCacheDiscoveredExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests), () => { });
 
-            var extensionManager = TestDiscoveryExtensionManager.Create();
-            TestDiscoveryExtensionManager.Create();
+        var extensionManager = TestDiscoveryExtensionManager.Create();
+        TestDiscoveryExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.Discoverers);
-            Assert.IsTrue(extensionManager.Discoverers.Any());
-        }
+        Assert.IsNotNull(extensionManager.Discoverers);
+        Assert.IsTrue(extensionManager.Discoverers.Any());
+    }
 
-        [TestMethod]
-        public void GetDiscoveryExtensionManagerShouldReturnADiscoveryManagerWithExtensions()
-        {
-            var extensionManager =
-                TestDiscoveryExtensionManager.GetDiscoveryExtensionManager(
-                    typeof(TestDiscoveryExtensionManagerTests).GetTypeInfo().Assembly.Location);
+    [TestMethod]
+    public void GetDiscoveryExtensionManagerShouldReturnADiscoveryManagerWithExtensions()
+    {
+        var extensionManager =
+            TestDiscoveryExtensionManager.GetDiscoveryExtensionManager(
+                typeof(TestDiscoveryExtensionManagerTests).Assembly.Location);
 
-            Assert.IsNotNull(extensionManager.Discoverers);
-            Assert.IsTrue(extensionManager.Discoverers.Any());
-        }
+        Assert.IsNotNull(extensionManager.Discoverers);
+        Assert.IsTrue(extensionManager.Discoverers.Any());
+    }
 
-        #region LoadAndInitialize tests
+    #region LoadAndInitialize tests
 
-        [TestMethod]
-        public void LoadAndInitializeShouldInitializeAllExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests));
+    [TestMethod]
+    public void LoadAndInitializeShouldInitializeAllExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestDiscoveryExtensionManagerTests));
 
-            TestDiscoveryExtensionManager.LoadAndInitializeAllExtensions(false);
+        TestDiscoveryExtensionManager.LoadAndInitializeAllExtensions(false);
 
-            var allDiscoverers = TestDiscoveryExtensionManager.Create().Discoverers;
+        var allDiscoverers = TestDiscoveryExtensionManager.Create().Discoverers;
 
-            foreach (var discoverer in allDiscoverers)
-            {
-                Assert.IsTrue(discoverer.IsExtensionCreated);
-            }
+        foreach (var discoverer in allDiscoverers)
+        {
+            Assert.IsTrue(discoverer.IsExtensionCreated);
         }
+    }
+
+    #endregion
+}
+
+[TestClass]
+public class TestDiscovererMetadataTests
+{
+    [TestMethod]
+    public void TestDiscovererMetadataCtorDoesNotThrowWhenFileExtensionsIsNull()
+    {
+        var metadata = new TestDiscovererMetadata(null, null);
 
-        #endregion
+        Assert.IsNull(metadata.FileExtension);
+        Assert.IsFalse(metadata.IsDirectoryBased);
     }
 
-    [TestClass]
-    public class TestDiscovererMetadataTests
+    [TestMethod]
+    public void TestDiscovererMetadataCtorDoesNotThrowWhenFileExtensionsIsEmpty()
     {
-        [TestMethod]
-        public void TestDiscovererMetadataCtorDoesNotThrowWhenFileExtensionsIsNull()
-        {
-            var metadata = new TestDiscovererMetadata(null, null);
+        var metadata = new TestDiscovererMetadata(new List<string>(), null);
 
-            Assert.IsNull(metadata.FileExtension);
-        }
+        Assert.IsNull(metadata.FileExtension);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorDoesNotThrowWhenFileExtensionsIsEmpty()
-        {
-            var metadata = new TestDiscovererMetadata(new List<string>(), null);
+    [TestMethod]
+    public void TestDiscovererMetadataCtorDoesNotThrowWhenDefaultUriIsNull()
+    {
+        var metadata = new TestDiscovererMetadata(new List<string>(), null);
 
-            Assert.IsNull(metadata.FileExtension);
-        }
+        Assert.IsNull(metadata.DefaultExecutorUri);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorDoesNotThrowWhenDefaultUriIsNull()
-        {
-            var metadata = new TestDiscovererMetadata(new List<string>(), null);
+    [TestMethod]
+    public void TestDiscovererMetadataCtorDoesNotThrowWhenDefaultUriIsEmpty()
+    {
+        var metadata = new TestDiscovererMetadata(new List<string>(), " ");
 
-            Assert.IsNull(metadata.DefaultExecutorUri);
-        }
+        Assert.IsNull(metadata.DefaultExecutorUri);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorDoesNotThrowWhenDefaultUriIsEmpty()
-        {
-            var metadata = new TestDiscovererMetadata(new List<string>(), " ");
+    [TestMethod]
+    public void TestDiscovererMetadataCtorSetsFileExtensions()
+    {
+        var extensions = new List<string> { "csv", "dll" };
+        var metadata = new TestDiscovererMetadata(extensions, null);
 
-            Assert.IsNull(metadata.DefaultExecutorUri);
-        }
+        CollectionAssert.AreEqual(extensions, metadata.FileExtension!.ToList());
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorSetsFileExtensions()
-        {
-            var extensions = new List<string> { "csv", "dll" };
-            var metadata = new TestDiscovererMetadata(extensions, null);
+    [TestMethod]
+    public void TestDiscovererMetadataCtorSetsDefaultUri()
+    {
+        var metadata = new TestDiscovererMetadata(null, "executor://helloworld");
 
-            CollectionAssert.AreEqual(extensions, metadata.FileExtension.ToList());
-        }
+        Assert.AreEqual("executor://helloworld/", metadata.DefaultExecutorUri!.AbsoluteUri);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorSetsDefaultUri()
-        {
-            var metadata = new TestDiscovererMetadata(null, "executor://helloworld");
+    [TestMethod]
+    public void TestDiscovererMetadataCtorSetsAssemblyType()
+    {
+        var metadata = new TestDiscovererMetadata(null, "executor://helloworld", AssemblyType.Native);
 
-            Assert.AreEqual("executor://helloworld/", metadata.DefaultExecutorUri.AbsoluteUri);
-        }
+        Assert.AreEqual(AssemblyType.Native, metadata.AssemblyType);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void TestDiscovererMetadataCtorSetsAssemblyType()
-        {
-            var metadata = new TestDiscovererMetadata(null, "executor://helloworld", AssemblyType.Native);
+    [TestMethod]
+    public void TestDiscovererMetadataCtorSetsIsDirectoryBased()
+    {
+        var metadata = new TestDiscovererMetadata(null, "executor://helloworld", isDirectoryBased: true);
 
-            Assert.AreEqual(AssemblyType.Native, metadata.AssemblyType);
-        }
+        Assert.IsTrue(metadata.IsDirectoryBased);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExecutorExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExecutorExtensionManagerTests.cs
index 76c8142970..6f0b810351 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExecutorExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExecutorExtensionManagerTests.cs
@@ -1,87 +1,85 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
-{
-    using System.Linq;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Reflection;
-    using Microsoft.TestPlatform.TestUtilities;
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
 
-    [TestClass]
-    public class TestExecutorExtensionManagerTests
+[TestClass]
+public class TestExecutorExtensionManagerTests
+{
+    [TestCleanup]
+    public void TestCleanup()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestExecutorExtensionManager.Destroy();
-        }
+        TestExecutorExtensionManager.Destroy();
+    }
 
-        [TestMethod]
-        public void CreateShouldDiscoverExecutorExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests));
+    [TestMethod]
+    public void CreateShouldDiscoverExecutorExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests));
 
-            var extensionManager = TestExecutorExtensionManager.Create();
+        var extensionManager = TestExecutorExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.TestExtensions);
-            Assert.IsTrue(extensionManager.TestExtensions.Any());
-        }
+        Assert.IsNotNull(extensionManager.TestExtensions);
+        Assert.IsTrue(extensionManager.TestExtensions.Any());
+    }
 
-        [TestMethod]
-        public void CreateShouldCacheDiscoveredExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests), () => { });
+    [TestMethod]
+    public void CreateShouldCacheDiscoveredExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests), () => { });
 
-            var extensionManager = TestExecutorExtensionManager.Create();
-            TestExecutorExtensionManager.Create();
+        var extensionManager = TestExecutorExtensionManager.Create();
+        TestExecutorExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.TestExtensions);
-            Assert.IsTrue(extensionManager.TestExtensions.Any());
-        }
+        Assert.IsNotNull(extensionManager.TestExtensions);
+        Assert.IsTrue(extensionManager.TestExtensions.Any());
+    }
 
-        [TestMethod]
-        public void GetExecutorExtensionManagerShouldReturnAnExecutionManagerWithExtensions()
-        {
-            var extensionManager =
-                TestExecutorExtensionManager.GetExecutionExtensionManager(
-                    typeof(TestExecutorExtensionManagerTests).GetTypeInfo().Assembly.Location);
+    [TestMethod]
+    public void GetExecutorExtensionManagerShouldReturnAnExecutionManagerWithExtensions()
+    {
+        var extensionManager =
+            TestExecutorExtensionManager.GetExecutionExtensionManager(
+                typeof(TestExecutorExtensionManagerTests).Assembly.Location);
 
-            Assert.IsNotNull(extensionManager.TestExtensions);
-            Assert.IsTrue(extensionManager.TestExtensions.Any());
-        }
+        Assert.IsNotNull(extensionManager.TestExtensions);
+        Assert.IsTrue(extensionManager.TestExtensions.Any());
+    }
 
-        #region LoadAndInitialize tests
+    #region LoadAndInitialize tests
 
-        [TestMethod]
-        public void LoadAndInitializeShouldInitializeAllExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests));
+    [TestMethod]
+    public void LoadAndInitializeShouldInitializeAllExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestExecutorExtensionManagerTests));
 
-            TestExecutorExtensionManager.LoadAndInitializeAllExtensions(false);
+        TestExecutorExtensionManager.LoadAndInitializeAllExtensions(false);
 
-            var allExecutors = TestExecutorExtensionManager.Create().TestExtensions;
+        var allExecutors = TestExecutorExtensionManager.Create().TestExtensions;
 
-            foreach (var executor in allExecutors)
-            {
-                Assert.IsTrue(executor.IsExtensionCreated);
-            }
+        foreach (var executor in allExecutors)
+        {
+            Assert.IsTrue(executor.IsExtensionCreated);
         }
-
-        #endregion
     }
 
-    [TestClass]
-    public class TestExecutorMetadataTests
+    #endregion
+}
+
+[TestClass]
+public class TestExecutorMetadataTests
+{
+    [TestMethod]
+    public void TestExecutorMetadataCtorShouldSetExtensionUri()
     {
-        [TestMethod]
-        public void TestExecutorMetadataCtorShouldSetExtensionUri()
-        {
-            var metadata = new TestExecutorMetadata("random");
+        var metadata = new TestExecutorMetadata("random");
 
-            Assert.AreEqual("random", metadata.ExtensionUri);
-        }
+        Assert.AreEqual("random", metadata.ExtensionUri);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExtensionManagerTests.cs
index 4a940c523b..f31173f945 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestExtensionManagerTests.cs
@@ -1,122 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System;
+using System.Collections.Generic;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestExtensionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestExtensionManagerTests
+    private readonly IMessageLogger _messageLogger;
+    private TestExtensionManager<ITestLogger, ITestLoggerCapabilities>? _testExtensionManager;
+    private readonly IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> _filteredTestExtensions;
+    private readonly IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> _unfilteredTestExtensions;
+
+    public TestExtensionManagerTests()
     {
-        private IMessageLogger messageLogger;
-        private TestExtensionManager<ITestLogger, ITestLoggerCapabilities> testExtensionManager;
-        private IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> filteredTestExtensions;
-        private IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions;
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestExtensionManagerTests));
+        _messageLogger = TestSessionMessageLogger.Instance;
+        TestPluginManager.GetSpecificTestExtensions<TestLoggerPluginInformation, ITestLogger, ITestLoggerCapabilities, TestLoggerMetadata>
+            (TestPlatformConstants.TestLoggerEndsWithPattern, out _unfilteredTestExtensions, out _filteredTestExtensions);
+    }
 
-        public TestExtensionManagerTests()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestExtensionManagerTests));
-            messageLogger = TestSessionMessageLogger.Instance;
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestLoggerPluginInformation, ITestLogger, ITestLoggerCapabilities, TestLoggerMetadata>
-                (TestPlatformConstants.TestLoggerEndsWithPattern, out unfilteredTestExtensions, out filteredTestExtensions);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        TestSessionMessageLogger.Instance = null;
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            TestSessionMessageLogger.Instance = null;
-        }
+    [TestMethod]
+    public void TestExtensionManagerConstructorShouldThrowExceptionIfMessageLoggerIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _testExtensionManager = new DummyTestExtensionManager(_unfilteredTestExtensions, _filteredTestExtensions, null!));
+    }
 
-        [TestMethod]
-        public void TestExtensionManagerConstructorShouldThrowExceptionIfMessageLoggerIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                {
-                    testExtensionManager = new DummyTestExtensionManager(unfilteredTestExtensions, filteredTestExtensions, null);
-                }
-            );
-        }
+    [TestMethod]
+    public void TryGetTestExtensionShouldReturnExtensionWithCorrectUri()
+    {
+        _testExtensionManager = new DummyTestExtensionManager(_unfilteredTestExtensions, _filteredTestExtensions, _messageLogger);
+        var result = _testExtensionManager.TryGetTestExtension(new Uri("testlogger://logger"));
 
-        [TestMethod]
-        public void TryGetTestExtensionShouldReturnExtensionWithCorrectUri()
-        {
-            testExtensionManager = new DummyTestExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-            var result = testExtensionManager.TryGetTestExtension(new Uri("testlogger://logger"));
+        Assert.IsNotNull(result);
+        Assert.IsInstanceOfType(result.Value, typeof(ITestLogger));
+    }
 
-            Assert.IsNotNull(result);
-            Assert.IsInstanceOfType(result.Value, typeof(ITestLogger));
-        }
+    [TestMethod]
+    public void TryGetTestExtensionShouldThrowExceptionWithNullUri()
+    {
+        _testExtensionManager = new DummyTestExtensionManager(_unfilteredTestExtensions, _filteredTestExtensions, _messageLogger);
+        TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestExtensionManagerTests));
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            {
+                var result = _testExtensionManager.TryGetTestExtension(default(Uri)!);
+            }
+        );
+    }
+
+    [TestMethod]
+    public void TryGetTestExtensionShouldNotReturnExtensionWithIncorrectlUri()
+    {
+        _testExtensionManager = new DummyTestExtensionManager(_unfilteredTestExtensions, _filteredTestExtensions, _messageLogger);
+        var result = _testExtensionManager.TryGetTestExtension("");
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    public void TryGetTestExtensionWithStringUriUnitTest()
+    {
+        _testExtensionManager = new DummyTestExtensionManager(_unfilteredTestExtensions, _filteredTestExtensions, _messageLogger);
+        var result = _testExtensionManager.TryGetTestExtension(new Uri("testlogger://logger").AbsoluteUri);
 
-        [TestMethod]
-        public void TryGetTestExtensionShouldThrowExceptionWithNullUri()
+        Assert.IsNotNull(result);
+        Assert.IsInstanceOfType(result.Value, typeof(ITestLogger));
+    }
+
+    [ExtensionUri("testlogger://logger")]
+    [FriendlyName("TestLoggerExtension")]
+    private class ValidLogger3 : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            testExtensionManager = new DummyTestExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestExtensionManagerTests));
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                    {
-                        var result = testExtensionManager.TryGetTestExtension(default(Uri));
-                    }
-            );
+            events.TestRunMessage += TestMessageHandler;
+            events.TestRunComplete += Events_TestRunComplete;
+            events.TestResult += Events_TestResult;
         }
 
-        [TestMethod]
-        public void TryGetTestExtensionShouldNotReturnExtensionWithIncorrectlUri()
+        private void Events_TestResult(object? sender, TestResultEventArgs e)
         {
-            testExtensionManager = new DummyTestExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-            var result = testExtensionManager.TryGetTestExtension("");
-            Assert.IsNull(result);
         }
 
-        [TestMethod]
-        public void TryGetTestExtensionWithStringUriUnitTest()
+        private void Events_TestRunComplete(object? sender, TestRunCompleteEventArgs e)
         {
-            testExtensionManager = new DummyTestExtensionManager(unfilteredTestExtensions, filteredTestExtensions, messageLogger);
-            var result = testExtensionManager.TryGetTestExtension(new Uri("testlogger://logger").AbsoluteUri);
-
-            Assert.IsNotNull(result);
-            Assert.IsInstanceOfType(result.Value, typeof(ITestLogger));
         }
 
-        [ExtensionUri("testlogger://logger")]
-        [FriendlyName("TestLoggerExtension")]
-        private class ValidLogger3 : ITestLogger
+        private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                events.TestRunMessage += TestMessageHandler;
-                events.TestRunComplete += Events_TestRunComplete;
-                events.TestResult += Events_TestResult;
-            }
-
-            private void Events_TestResult(object sender, TestResultEventArgs e)
-            {
-            }
-
-            private void Events_TestRunComplete(object sender, TestRunCompleteEventArgs e)
-            {
-            }
-
-            private void TestMessageHandler(object sender, TestRunMessageEventArgs e)
-            {
-            }
         }
     }
+}
 
-    internal class DummyTestExtensionManager : TestExtensionManager<ITestLogger, ITestLoggerCapabilities>
+internal class DummyTestExtensionManager : TestExtensionManager<ITestLogger, ITestLoggerCapabilities>
+{
+    public DummyTestExtensionManager(IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions, IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> testExtensions, IMessageLogger logger) : base(unfilteredTestExtensions, testExtensions, logger)
     {
-        public DummyTestExtensionManager(IEnumerable<LazyExtension<ITestLogger, Dictionary<string, object>>> unfilteredTestExtensions, IEnumerable<LazyExtension<ITestLogger, ITestLoggerCapabilities>> testExtensions, IMessageLogger logger) : base(unfilteredTestExtensions, testExtensions, logger)
-        {
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestLoggerExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestLoggerExtensionManagerTests.cs
index 6a8f749dba..e6990a0641 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestLoggerExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestLoggerExtensionManagerTests.cs
@@ -1,45 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestLoggerExtensionManagerTests
 {
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
+    [TestInitialize]
+    public void Initialize()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestLoggerExtensionManagerTests));
+    }
 
-    [TestClass]
-    public class TestLoggerExtensionManagerTests
+    [TestMethod]
+    public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
     {
-        [TestInitialize]
-        public void Initialize()
+        Assert.ThrowsException<ArgumentNullException>(() =>
         {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestLoggerExtensionManagerTests));
-        }
+            var testLoggerExtensionManager = TestLoggerExtensionManager.Create(null!);
+        });
+    }
 
-        [TestMethod]
-        public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
+    [TestMethod]
+    public void CreateShouldReturnInstanceOfTestLoggerExtensionManager()
+    {
+        try
         {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                var testLoggerExtensionManager = TestLoggerExtensionManager.Create(null);
-            });
+            var testLoggerExtensionManager = TestLoggerExtensionManager.Create(TestSessionMessageLogger.Instance);
+            Assert.IsNotNull(testLoggerExtensionManager);
+            Assert.IsInstanceOfType(testLoggerExtensionManager, typeof(TestLoggerExtensionManager));
         }
-
-        [TestMethod]
-        public void CreateShouldReturnInstanceOfTestLoggerExtensionManager()
+        finally
         {
-            try
-            {
-                var testLoggerExtensionManager = TestLoggerExtensionManager.Create(TestSessionMessageLogger.Instance);
-                Assert.IsNotNull(testLoggerExtensionManager);
-                Assert.IsInstanceOfType(testLoggerExtensionManager, typeof(TestLoggerExtensionManager));
-            }
-            finally
-            {
-                TestSessionMessageLogger.Instance = null;
-            }
+            TestSessionMessageLogger.Instance = null;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginCacheTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginCacheTests.cs
index aee7e48b94..30612dfc6e 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginCacheTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginCacheTests.cs
@@ -1,383 +1,381 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestPluginCacheTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class TestPluginCacheTests
+    private readonly Mock<IFileHelper> _mockFileHelper;
+
+    private readonly TestableTestPluginCache _testablePluginCache;
+
+    public TestPluginCacheTests()
     {
-        private readonly Mock<IFileHelper> mockFileHelper;
+        // Reset the singleton.
+        TestPluginCache.Instance = null;
+        _mockFileHelper = new Mock<IFileHelper>();
+        _testablePluginCache = new TestableTestPluginCache([typeof(TestPluginCacheTests).Assembly.Location]);
 
-        private readonly TestableTestPluginCache testablePluginCache;
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+    }
 
-        public TestPluginCacheTests()
-        {
-            // Reset the singleton.
-            TestPluginCache.Instance = null;
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.testablePluginCache = new TestableTestPluginCache(new List<string> { typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location });
+    #region Properties tests
 
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-        }
+    [TestMethod]
+    public void InstanceShouldNotReturnANull()
+    {
+        Assert.IsNotNull(TestPluginCache.Instance);
+    }
 
-        #region Properties tests
+    [TestMethod]
+    public void TestExtensionsShouldBeNullByDefault()
+    {
+        Assert.IsNull(TestPluginCache.Instance.TestExtensions);
+    }
 
-        [TestMethod]
-        public void InstanceShouldNotReturnANull()
-        {
-            Assert.IsNotNull(TestPluginCache.Instance);
-        }
+    #endregion
 
-        [TestMethod]
-        public void TestExtensionsShouldBeNullByDefault()
-        {
-            Assert.IsNull(TestPluginCache.Instance.TestExtensions);
-        }
+    #region UpdateAdditionalExtensions tests
 
-        #endregion
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldNotThrowIfExtensionPathIsNull()
+    {
+        TestPluginCache.Instance.UpdateExtensions(null, true);
+        Assert.IsFalse(TestPluginCache.Instance.GetExtensionPaths(string.Empty).Any());
+    }
 
-        #region UpdateAdditionalExtensions tests
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldNotThrowIfExtensionPathIsEmpty()
+    {
+        TestPluginCache.Instance.UpdateExtensions(new List<string>(), true);
+        Assert.IsFalse(TestPluginCache.Instance.GetExtensionPaths(string.Empty).Any());
+    }
 
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldNotThrowIfExtensionPathIsNull()
-        {
-            TestPluginCache.Instance.UpdateExtensions(null, true);
-            Assert.IsFalse(TestPluginCache.Instance.GetExtensionPaths(string.Empty).Any());
-        }
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldUpdateAdditionalExtensions()
+    {
+        var additionalExtensions = new List<string> { typeof(TestPluginCacheTests).Assembly.Location };
+        TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
+        var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
 
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldNotThrowIfExtensionPathIsEmpty()
-        {
-            TestPluginCache.Instance.UpdateExtensions(new List<string>(), true);
-            Assert.IsFalse(TestPluginCache.Instance.GetExtensionPaths(string.Empty).Any());
-        }
+        Assert.IsNotNull(updatedExtensions);
+        CollectionAssert.AreEqual(additionalExtensions, updatedExtensions.ToList());
+    }
 
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldUpdateAdditionalExtensions()
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldOnlyAddUniqueExtensionPaths()
+    {
+        var additionalExtensions = new List<string>
         {
-            var additionalExtensions = new List<string> { typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location };
-            TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
-            var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+            typeof(TestPluginCacheTests).Assembly.Location,
+            typeof(TestPluginCacheTests).Assembly.Location
+        };
+        TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
+        var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+
+        Assert.IsNotNull(updatedExtensions);
+        Assert.AreEqual(1, updatedExtensions.Count);
+        CollectionAssert.AreEqual(new List<string> { additionalExtensions.First() }, updatedExtensions);
+    }
 
-            Assert.IsNotNull(updatedExtensions);
-            CollectionAssert.AreEqual(additionalExtensions, updatedExtensions.ToList());
-        }
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldUpdatePathsThatDoNotExist()
+    {
+        var additionalExtensions = new List<string> { "foo.dll" };
+        TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
+        var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
 
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldOnlyAddUniqueExtensionPaths()
-        {
-            var additionalExtensions = new List<string>
-                                           {
-                                               typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location,
-                                               typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location
-                                           };
-            TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
-            var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
-
-            Assert.IsNotNull(updatedExtensions);
-            Assert.AreEqual(1, updatedExtensions.Count);
-            CollectionAssert.AreEqual(new List<string> { additionalExtensions.First() }, updatedExtensions);
-        }
-
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldUpdatePathsThatDoNotExist()
-        {
-            var additionalExtensions = new List<string> { "foo.dll" };
-            TestPluginCache.Instance.UpdateExtensions(additionalExtensions, false);
-            var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+        Assert.IsNotNull(updatedExtensions);
+        Assert.AreEqual(1, updatedExtensions.Count);
+    }
 
-            Assert.IsNotNull(updatedExtensions);
-            Assert.AreEqual(1, updatedExtensions.Count);
-        }
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldUpdateUnfilteredExtensionsListWhenSkipFilteringIsTrue()
+    {
+        var additionalExtensions = new List<string> { "foo.dll" };
+        TestPluginCache.Instance.UpdateExtensions(additionalExtensions, true);
+        var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths("testadapter.dll");
 
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldUpdateUnfilteredExtensionsListWhenSkipFilteringIsTrue()
-        {
-            var additionalExtensions = new List<string> { "foo.dll" };
-            TestPluginCache.Instance.UpdateExtensions(additionalExtensions, true);
-            var updatedExtensions = TestPluginCache.Instance.GetExtensionPaths("testadapter.dll");
-
-            // Since the extension is unfiltered, above filter criteria doesn't filter it
-            Assert.IsNotNull(updatedExtensions);
-            Assert.AreEqual(1, updatedExtensions.Count);
-        }
-
-        [Ignore]
-        [TestMethod]
-        public void UpdateAdditionalExtensionsShouldResetExtensionsDiscoveredFlag()
-        {
-        }
+        // Since the extension is unfiltered, above filter criteria doesn't filter it
+        Assert.IsNotNull(updatedExtensions);
+        Assert.AreEqual(1, updatedExtensions.Count);
+    }
 
-        #endregion
+    [Ignore]
+    [TestMethod]
+    public void UpdateAdditionalExtensionsShouldResetExtensionsDiscoveredFlag()
+    {
+    }
 
-        #region ClearExtensions
+    #endregion
 
-        [TestMethod]
-        public void ClearExtensionsShouldClearPathToExtensions()
-        {
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { @"oldExtension.dll" }, false);
+    #region ClearExtensions
 
-            TestPluginCache.Instance.ClearExtensions();
+    [TestMethod]
+    public void ClearExtensionsShouldClearPathToExtensions()
+    {
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { @"oldExtension.dll" }, false);
 
-            Assert.AreEqual(0, TestPluginCache.Instance.GetExtensionPaths(string.Empty).Count);
-        }
+        TestPluginCache.Instance.ClearExtensions();
 
-        #endregion
+        Assert.AreEqual(0, TestPluginCache.Instance.GetExtensionPaths(string.Empty).Count);
+    }
 
-        #region GetExtensionPaths
+    #endregion
 
-        [TestMethod]
-        public void GetExtensionPathsShouldConsolidateAllExtensions()
-        {
-            var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
-            expectedExtensions.Add("default.dll");
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
-            TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
+    #region GetExtensionPaths
 
-            var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll");
+    [TestMethod]
+    public void GetExtensionPathsShouldConsolidateAllExtensions()
+    {
+        var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
+        expectedExtensions.Add("default.dll");
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
+        TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
 
-            CollectionAssert.AreEquivalent(expectedExtensions, extensions);
-        }
+        var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll");
 
-        [TestMethod]
-        public void GetExtensionPathsShouldFilterFilterableExtensions()
-        {
-            var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
-            expectedExtensions.Add("default.dll");
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
-            TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
+        CollectionAssert.AreEquivalent(expectedExtensions, extensions);
+    }
 
-            var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll");
+    [TestMethod]
+    public void GetExtensionPathsShouldFilterFilterableExtensions()
+    {
+        var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
+        expectedExtensions.Add("default.dll");
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
+        TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
 
-            CollectionAssert.AreEquivalent(expectedExtensions, extensions);
-        }
+        var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll");
 
-        [TestMethod]
-        public void GetExtensionPathsShouldNotFilterIfEndsWithPatternIsNullOrEmpty()
-        {
-            var expectedExtensions = new[] { "filter.dll", "other.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
-            expectedExtensions.Add("default.dll");
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
-            TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
+        CollectionAssert.AreEquivalent(expectedExtensions, extensions);
+    }
 
-            var extensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+    [TestMethod]
+    public void GetExtensionPathsShouldNotFilterIfEndsWithPatternIsNullOrEmpty()
+    {
+        var expectedExtensions = new[] { "filter.dll", "other.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
+        expectedExtensions.Add("default.dll");
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
+        TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
 
-            CollectionAssert.AreEquivalent(expectedExtensions, extensions);
-        }
+        var extensions = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
 
-        [TestMethod]
-        public void GetExtensionPathsShouldSkipDefaultExtensionsIfSetTrue()
-        {
-            var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
-            InvokeGetExtensionPaths(expectedExtensions, true);
-        }
+        CollectionAssert.AreEquivalent(expectedExtensions, extensions);
+    }
 
-        [TestMethod]
-        public void GetExtensionPathsShouldNotSkipDefaultExtensionsIfSetFalse()
-        {
-            var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
-            expectedExtensions.Add("default.dll");
-            InvokeGetExtensionPaths(expectedExtensions, false);
-        }
+    [TestMethod]
+    public void GetExtensionPathsShouldSkipDefaultExtensionsIfSetTrue()
+    {
+        var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
+        InvokeGetExtensionPaths(expectedExtensions, true);
+    }
 
-        #endregion
+    [TestMethod]
+    public void GetExtensionPathsShouldNotSkipDefaultExtensionsIfSetFalse()
+    {
+        var expectedExtensions = new[] { "filter.dll", "unfilter.dll" }.Select(Path.GetFullPath).ToList();
+        expectedExtensions.Add("default.dll");
+        InvokeGetExtensionPaths(expectedExtensions, false);
+    }
 
-        #region GetDefaultResolutionPaths tests
+    #endregion
 
-        [TestMethod]
-        public void GetDefaultResolutionPathsShouldReturnCurrentDirectoryByDefault()
-        {
-            var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).GetTypeInfo().Assembly.Location);
-            var expectedDirectories = new List<string> { currentDirectory };
+    #region GetDefaultResolutionPaths tests
 
-            var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
+    [TestMethod]
+    public void GetDefaultResolutionPathsShouldReturnCurrentDirectoryByDefault()
+    {
+        var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).Assembly.Location);
+        var expectedDirectories = new List<string> { currentDirectory! };
 
-            Assert.IsNotNull(resolutionPaths);
-            CollectionAssert.AreEqual(expectedDirectories, resolutionPaths.ToList());
-        }
+        var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
 
-        [TestMethod]
-        public void GetDefaultResolutionPathsShouldReturnAdditionalExtensionPathsDirectories()
-        {
-            var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).GetTypeInfo().Assembly.Location);
-            var candidateDirectory = Directory.GetParent(currentDirectory).FullName;
-            var extensionPaths = new List<string> { Path.Combine(candidateDirectory, "foo.dll") };
+        Assert.IsNotNull(resolutionPaths);
+        CollectionAssert.AreEqual(expectedDirectories, resolutionPaths.ToList());
+    }
 
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
-            var testableTestPluginCache = new TestableTestPluginCache();
+    [TestMethod]
+    public void GetDefaultResolutionPathsShouldReturnAdditionalExtensionPathsDirectories()
+    {
+        var currentDirectory = Path.GetDirectoryName(typeof(TestPluginCache).Assembly.Location)!;
+        var candidateDirectory = Directory.GetParent(currentDirectory)!.FullName;
+        var extensionPaths = new List<string> { Path.Combine(candidateDirectory, "foo.dll") };
 
-            TestPluginCache.Instance = testableTestPluginCache;
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
+        var testableTestPluginCache = new TestableTestPluginCache();
 
-            TestPluginCache.Instance.UpdateExtensions(extensionPaths, true);
-            var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
+        TestPluginCache.Instance = testableTestPluginCache;
 
-            var expectedExtensions = new List<string> { candidateDirectory, currentDirectory };
+        TestPluginCache.Instance.UpdateExtensions(extensionPaths, true);
+        var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
 
-            Assert.IsNotNull(resolutionPaths);
-            CollectionAssert.AreEqual(expectedExtensions, resolutionPaths.ToList());
-        }
+        var expectedExtensions = new List<string> { candidateDirectory, currentDirectory };
 
-        [TestMethod]
-        public void GetDefaultResolutionPathsShouldReturnDirectoryFromDefaultExtensionsPath()
-        {
-            // Setup the testable instance.
-            TestPluginCache.Instance = this.testablePluginCache;
+        Assert.IsNotNull(resolutionPaths);
+        CollectionAssert.AreEqual(expectedExtensions, resolutionPaths.ToList());
+    }
 
-            var defaultExtensionsFile = typeof(TestPluginCache).GetTypeInfo().Assembly.Location;
-            this.testablePluginCache.DefaultExtensionPaths = new List<string>() { defaultExtensionsFile };
+    [TestMethod]
+    public void GetDefaultResolutionPathsShouldReturnDirectoryFromDefaultExtensionsPath()
+    {
+        // Setup the testable instance.
+        TestPluginCache.Instance = _testablePluginCache;
 
-            var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
+        var defaultExtensionsFile = typeof(TestPluginCache).Assembly.Location;
+        _testablePluginCache.DefaultExtensionPaths = new List<string>() { defaultExtensionsFile };
 
-            Assert.IsNotNull(resolutionPaths);
-            Assert.IsTrue(resolutionPaths.Contains(Path.GetDirectoryName(defaultExtensionsFile)));
-        }
+        var resolutionPaths = TestPluginCache.Instance.GetDefaultResolutionPaths();
 
-        #endregion
+        Assert.IsNotNull(resolutionPaths);
+        Assert.IsTrue(resolutionPaths.Contains(Path.GetDirectoryName(defaultExtensionsFile)!));
+    }
 
-        #region GetResolutionPaths tests
+    #endregion
 
-        [TestMethod]
-        public void GetResolutionPathsShouldThrowIfExtensionAssemblyIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => TestPluginCache.Instance.GetResolutionPaths(null));
-        }
+    #region GetResolutionPaths tests
 
-        [TestMethod]
-        public void GetResolutionPathsShouldReturnExtensionAssemblyDirectoryAndTPCommonDirectory()
-        {
-            var temp = Path.GetTempPath();
-            var resolutionPaths = TestPluginCache.Instance.GetResolutionPaths($@"{temp}{Path.DirectorySeparatorChar}Idonotexist.dll").Select(p => p.Replace("/", "\\")).ToList();
+    [TestMethod]
+    public void GetResolutionPathsShouldThrowIfExtensionAssemblyIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => TestPluginCache.GetResolutionPaths(null!));
+    }
 
-            var tpCommonDirectory = Path.GetDirectoryName(typeof(TestPluginCache).GetTypeInfo().Assembly.Location);
-            var expectedPaths = new List<string> { temp, tpCommonDirectory }.ConvertAll(p => p.Replace("/", "\\").TrimEnd('\\'));
+    [TestMethod]
+    public void GetResolutionPathsShouldReturnExtensionAssemblyDirectoryAndTpCommonDirectory()
+    {
+        var temp = Path.GetTempPath();
+        var resolutionPaths = TestPluginCache.GetResolutionPaths($@"{temp}{Path.DirectorySeparatorChar}Idonotexist.dll").Select(p => p.Replace("/", "\\")).ToList();
 
-            CollectionAssert.AreEqual(expectedPaths, resolutionPaths, $"Collection {string.Join(", ", resolutionPaths)}, is not equal to the expected collection {string.Join(", ", expectedPaths)}.");
-        }
+        var tpCommonDirectory = Path.GetDirectoryName(typeof(TestPluginCache).Assembly.Location)!;
+        var expectedPaths = new List<string> { temp, tpCommonDirectory }.ConvertAll(p => p.Replace("/", "\\").TrimEnd('\\'));
 
-        [TestMethod]
-        public void GetResolutionPathsShouldNotHaveDuplicatePathsIfExtensionIsInSameDirectory()
-        {
-            var tpCommonlocation = typeof(TestPluginCache).GetTypeInfo().Assembly.Location;
+        CollectionAssert.AreEqual(expectedPaths, resolutionPaths, $"Collection {string.Join(", ", resolutionPaths)}, is not equal to the expected collection {string.Join(", ", expectedPaths)}.");
+    }
+
+    [TestMethod]
+    public void GetResolutionPathsShouldNotHaveDuplicatePathsIfExtensionIsInSameDirectory()
+    {
+        var tpCommonlocation = typeof(TestPluginCache).Assembly.Location;
 
-            var resolutionPaths = TestPluginCache.Instance.GetResolutionPaths(tpCommonlocation);
+        var resolutionPaths = TestPluginCache.GetResolutionPaths(tpCommonlocation);
 
-            var expectedPaths = new List<string> { Path.GetDirectoryName(tpCommonlocation) };
+        var expectedPaths = new List<string> { Path.GetDirectoryName(tpCommonlocation)! };
 
-            CollectionAssert.AreEqual(expectedPaths, resolutionPaths.ToList());
-        }
+        CollectionAssert.AreEqual(expectedPaths, resolutionPaths.ToList());
+    }
 
-        #endregion
+    #endregion
 
-        #region GetTestExtensions tests
+    #region GetTestExtensions tests
 
-        [TestMethod]
-        public void GetTestExtensionsShouldReturnExtensionsInAssembly()
-        {
-            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
+    [TestMethod]
+    public void GetTestExtensionsShouldReturnExtensionsInAssembly()
+    {
+        TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
 
-            TestPluginCache.Instance.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location);
+        TestPluginCache.Instance.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(typeof(TestPluginCacheTests).Assembly.Location);
 
-            Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestDiscoverers.Count > 0);
-        }
+        Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestDiscoverers!.Count > 0);
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsShouldAddTestExtensionsDiscoveredToCache()
-        {
-            var extensionAssembly = typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location;
+    [TestMethod]
+    public void GetTestExtensionsShouldAddTestExtensionsDiscoveredToCache()
+    {
+        var extensionAssembly = typeof(TestPluginCacheTests).Assembly.Location;
 
-            var testDiscovererPluginInfos = this.testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
+        var testDiscovererPluginInfos = _testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
 
-            CollectionAssert.AreEqual(
-                this.testablePluginCache.TestExtensions.TestDiscoverers.Keys,
-                testDiscovererPluginInfos.Keys);
-        }
+        Assert.IsNotNull(_testablePluginCache.TestExtensions);
+        CollectionAssert.AreEqual(
+            _testablePluginCache.TestExtensions.TestDiscoverers!.Keys,
+            testDiscovererPluginInfos.Keys);
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsShouldGetTestExtensionsFromCache()
-        {
-            var extensionAssembly = typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location;
-            var testDiscovererPluginInfos = this.testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
-            Assert.IsFalse(testDiscovererPluginInfos.ContainsKey("td"));
+    [TestMethod]
+    public void GetTestExtensionsShouldGetTestExtensionsFromCache()
+    {
+        var extensionAssembly = typeof(TestPluginCacheTests).Assembly.Location;
+        var testDiscovererPluginInfos = _testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
+        Assert.IsFalse(testDiscovererPluginInfos.ContainsKey("td"));
 
-            // Set the cache.
-            this.testablePluginCache.TestExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestPluginCacheTests)));
+        // Set the cache.
+        _testablePluginCache.TestExtensions!.TestDiscoverers!.Add("td", new TestDiscovererPluginInformation(typeof(TestPluginCacheTests)));
 
-            testDiscovererPluginInfos = this.testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
-            Assert.IsTrue(testDiscovererPluginInfos.ContainsKey("td"));
-        }
+        testDiscovererPluginInfos = _testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly);
+        Assert.IsTrue(testDiscovererPluginInfos.ContainsKey("td"));
+    }
 
-        [Ignore]
-        [TestMethod]
-        public void GetTestExtensionsShouldShouldThrowIfDiscovererThrows()
-        {
-            //TODO : make ITestDiscoverer interface and then mock it in order to make this test case pass.
+    [Ignore]
+    [TestMethod]
+    public void GetTestExtensionsShouldShouldThrowIfDiscovererThrows()
+    {
+        //TODO : make ITestDiscoverer interface and then mock it in order to make this test case pass.
 
-            var extensionAssembly = typeof(TestPluginCacheTests).GetTypeInfo().Assembly.Location;
-            Assert.ThrowsException<Exception>(() => this.testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly));
-        }
+        var extensionAssembly = typeof(TestPluginCacheTests).Assembly.Location;
+        Assert.ThrowsException<Exception>(() => _testablePluginCache.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(extensionAssembly));
+    }
 
-        #endregion
+    #endregion
 
-        #region DiscoverTestExtensions tests
+    #region DiscoverTestExtensions tests
 
-        [TestMethod]
-        public void DiscoverTestExtensionsShouldDiscoverExtensionsFromExtensionsFolder()
-        {
-            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
+    [TestMethod]
+    public void DiscoverTestExtensionsShouldDiscoverExtensionsFromExtensionsFolder()
+    {
+        TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
 
-            TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
+        TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
 
-            Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
+        Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
 
-            // Validate the discoverers to be absolutely certain.
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestDiscoverers.Count > 0);
-        }
+        // Validate the discoverers to be absolutely certain.
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestDiscoverers!.Count > 0);
+    }
 
-        [TestMethod]
-        public void DiscoverTestExtensionsShouldSetCachedBoolToTrue()
-        {
-            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
+    [TestMethod]
+    public void DiscoverTestExtensionsShouldSetCachedBoolToTrue()
+    {
+        TestPluginCacheHelper.SetupMockAdditionalPathExtensions(typeof(TestPluginCacheTests));
 
-            TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
+        TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
 
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.AreTestDiscoverersCached);
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.AreTestExtensionsCached<TestDiscovererPluginInformation>());
-        }
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions!.AreTestDiscoverersCached);
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions.AreTestExtensionsCached<TestDiscovererPluginInformation>());
+    }
 
-        #endregion
+    #endregion
 
-        private void InvokeGetExtensionPaths(List<string> expectedExtensions, bool skipDefaultExtensions)
-        {
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
-            TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
+    private static void InvokeGetExtensionPaths(List<string> expectedExtensions, bool skipDefaultExtensions)
+    {
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"filter.dll", @"other.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new[] { @"unfilter.dll" }, true);
+        TestPluginCache.Instance.DefaultExtensionPaths = new[] { "default.dll" };
 
-            var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll", skipDefaultExtensions);
+        var extensions = TestPluginCache.Instance.GetExtensionPaths("filter.dll", skipDefaultExtensions);
 
-            CollectionAssert.AreEquivalent(expectedExtensions, extensions);
-        }
+        CollectionAssert.AreEquivalent(expectedExtensions, extensions);
     }
 }
-
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs
index 55f20f3543..de46d6098c 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs
@@ -1,349 +1,355 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestPluginDiscovererTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using MSTest.TestFramework.AssertExtensions;
-
-    [TestClass]
-    public class TestPluginDiscovererTests
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldNotThrowOnALoadException()
     {
-        private TestPluginDiscoverer testPluginDiscoverer;
+        var pathToExtensions = new List<string> { "foo.dll" };
 
-        public TestPluginDiscovererTests()
-        {
-            this.testPluginDiscoverer = new TestPluginDiscoverer();
-        }
+        // The below should not throw an exception.
+        Assert.IsNotNull(TestPluginDiscoverer.GetTestExtensionsInformation<TestLoggerPluginInformation, ITestLogger>(pathToExtensions));
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldNotThrowOnALoadException()
-        {
-            var pathToExtensions = new List<string> { "foo.dll" };
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldNotConsiderAbstractClasses()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            // The below should not throw an exception.
-            Assert.IsNotNull(this.testPluginDiscoverer.GetTestExtensionsInformation<TestLoggerPluginInformation, ITestLogger>(pathToExtensions));
-        }
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<TestDiscovererPluginInformation, ITestDiscoverer>(pathToExtensions);
+        var discovererPluginInformation = new TestDiscovererPluginInformation(typeof(AbstractTestDiscoverer));
+        Assert.IsFalse(testExtensions.ContainsKey(discovererPluginInformation.IdentifierData!));
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldNotConsiderAbstractClasses()
-        {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldReturnDiscovererExtensions()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<TestDiscovererPluginInformation, ITestDiscoverer>(pathToExtensions);
-            var discovererPluginInformation = new TestDiscovererPluginInformation(typeof(AbstractTestDiscoverer));
-            Assert.IsFalse(testExtensions.ContainsKey(discovererPluginInformation.IdentifierData));
-        }
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<TestDiscovererPluginInformation, ITestDiscoverer>(pathToExtensions);
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldReturnDiscovererExtensions()
-        {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+        var discovererPluginInformation = new TestDiscovererPluginInformation(typeof(ValidDiscoverer));
+        var discovererPluginInformation2 = new TestDiscovererPluginInformation(typeof(ValidDiscoverer2));
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<TestDiscovererPluginInformation, ITestDiscoverer>(pathToExtensions);
+        Assert.IsTrue(testExtensions.ContainsKey(discovererPluginInformation.IdentifierData!));
+        Assert.IsTrue(testExtensions.ContainsKey(discovererPluginInformation2.IdentifierData!));
+    }
 
-            var discovererPluginInformation = new TestDiscovererPluginInformation(typeof(ValidDiscoverer));
-            var discovererPluginInformation2 = new TestDiscovererPluginInformation(typeof(ValidDiscoverer2));
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldReturnExecutorExtensions()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            Assert.IsTrue(testExtensions.ContainsKey(discovererPluginInformation.IdentifierData));
-            Assert.IsTrue(testExtensions.ContainsKey(discovererPluginInformation2.IdentifierData));
-        }
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<TestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldReturnExecutorExtensions()
-        {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+        var pluginInformation = new TestExecutorPluginInformation(typeof(ValidExecutor));
+        var pluginInformation2 = new TestExecutorPluginInformation(typeof(ValidExecutor2));
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<TestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
+        Assert.AreEqual(2, testExtensions.Keys.Count(k => k.Contains("ValidExecutor")));
+        Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData!));
+        Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData!));
+    }
 
-            var pluginInformation = new TestExecutorPluginInformation(typeof(ValidExecutor));
-            var pluginInformation2 = new TestExecutorPluginInformation(typeof(ValidExecutor2));
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldReturnLoggerExtensions()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            Assert.AreEqual(2, testExtensions.Keys.Count(k => k.Contains("ValidExecutor")));
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData));
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData));
-        }
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<TestLoggerPluginInformation, ITestLogger>(pathToExtensions);
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldReturnLoggerExtensions()
-        {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+        var pluginInformation = new TestLoggerPluginInformation(typeof(ValidLogger));
+        var pluginInformation2 = new TestLoggerPluginInformation(typeof(ValidLogger2));
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<TestLoggerPluginInformation, ITestLogger>(pathToExtensions);
+        Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Contains("csv")));
+        Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData!));
+    }
 
-            var pluginInformation = new TestLoggerPluginInformation(typeof(ValidLogger));
-            var pluginInformation2 = new TestLoggerPluginInformation(typeof(ValidLogger2));
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldReturnDataCollectorExtensionsAndIgnoresInvalidDataCollectors()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Contains("csv")));
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData));
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData));
-        }
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<DataCollectorConfig, DataCollector>(pathToExtensions);
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldReturnDataCollectorExtensionsAndIgnoresInvalidDataCollectors()
-        {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+        var pluginInformation = new DataCollectorConfig(typeof(ValidDataCollector));
+
+        Assert.AreEqual(2, testExtensions.Keys.Count);
+        Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Equals("datacollector://foo/bar")));
+        Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Equals("datacollector://foo/bar1")));
+    }
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<DataCollectorConfig, DataCollector>(pathToExtensions);
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldReturnSettingsProviderExtensions()
+    {
+        var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).Assembly.Location };
 
-            var pluginInformation = new DataCollectorConfig(typeof(ValidDataCollector));
+        // The below should not throw an exception.
+        var testExtensions = TestPluginDiscoverer.GetTestExtensionsInformation<TestSettingsProviderPluginInformation, ISettingsProvider>(pathToExtensions);
 
-            Assert.AreEqual(2, testExtensions.Keys.Count);
-            Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Equals("datacollector://foo/bar")));
-            Assert.AreEqual(1, testExtensions.Keys.Count(k => k.Equals("datacollector://foo/bar1")));
-        }
+        var pluginInformation = new TestSettingsProviderPluginInformation(typeof(ValidSettingsProvider));
+        var pluginInformation2 = new TestSettingsProviderPluginInformation(typeof(ValidSettingsProvider2));
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldReturnSettingsProviderExtensions()
+        Assert.IsTrue(testExtensions.Keys.Select(k => k.Contains("ValidSettingsProvider")).Count() >= 3);
+        Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData!));
+        Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData!));
+    }
+
+    [TestMethod]
+    public void GetTestExtensionsInformationShouldNotAbortOnFaultyExtensions()
+    {
+        var pathToExtensions = new List<string>
         {
-            var pathToExtensions = new List<string> { typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location };
+            typeof(TestPluginDiscovererTests).Assembly.Location,
+        };
 
-            // The below should not throw an exception.
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<TestSettingsProviderPluginInformation, ISettingsProvider>(pathToExtensions);
+        _ = TestPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
 
-            var pluginInformation = new TestSettingsProviderPluginInformation(typeof(ValidSettingsProvider));
-            var pluginInformation2 = new TestSettingsProviderPluginInformation(typeof(ValidSettingsProvider2));
+        _ = TestPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
+    }
 
-            Assert.IsTrue(testExtensions.Keys.Select(k => k.Contains("ValidSettingsProvider")).Count() >= 3);
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation.IdentifierData));
-            Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData));
-        }
+    #region Implementations
+
+    #region Discoverers
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldNotAbortOnFaultyExtensions()
+    private abstract class AbstractTestDiscoverer : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            var pathToExtensions = new List<string>
-            {
-                typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location,
-            };
+            throw new NotImplementedException();
+        }
+    }
 
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
+    private class ValidDiscoverer : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+            throw new NotImplementedException();
+        }
+    }
 
-            Assert.That.DoesNotThrow(() =>this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions));
+    private class ValidDiscoverer2 : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+            throw new NotImplementedException();
         }
+    }
 
-        #region Implementations
+    #endregion
 
-        #region Discoverers
+    #region Executors
 
-        private abstract class AbstractTestDiscoverer : ITestDiscoverer
+    [ExtensionUri("ValidExecutor")]
+    private class ValidExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        private class ValidDiscoverer : ITestDiscoverer
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        private class ValidDiscoverer2 : ITestDiscoverer
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    [ExtensionUri("ValidExecutor2")]
+    private class ValidExecutor2 : ITestExecutor
+    {
+        public void Cancel()
+        {
+            throw new NotImplementedException();
+        }
 
-        #region Executors
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
+    }
 
-        [ExtensionUri("ValidExecutor")]
-        private class ValidExecutor : ITestExecutor
+    [ExtensionUri("ValidExecutor")]
+    private class DuplicateExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("ValidExecutor2")]
-        private class ValidExecutor2 : ITestExecutor
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("ValidExecutor")]
-        private class DuplicateExecutor : ITestExecutor
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region Loggers
+    #region Loggers
 
-        [ExtensionUri("csv")]
-        private class ValidLogger : ITestLogger
+    [ExtensionUri("csv")]
+    private class ValidLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [ExtensionUri("docx")]
-        private class ValidLogger2 : ITestLogger
+    [ExtensionUri("docx")]
+    private class ValidLogger2 : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [ExtensionUri("csv")]
-        private class DuplicateLogger : ITestLogger
+    [ExtensionUri("csv")]
+    private class DuplicateLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region Settings Providers
+    #region Settings Providers
 
-        [SettingsName("ValidSettingsProvider")]
-        private class ValidSettingsProvider : ISettingsProvider
+    [SettingsName("ValidSettingsProvider")]
+    private class ValidSettingsProvider : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [SettingsName("ValidSettingsProvider2")]
-        private class ValidSettingsProvider2 : ISettingsProvider
+    [SettingsName("ValidSettingsProvider2")]
+    private class ValidSettingsProvider2 : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [SettingsName("ValidSettingsProvider")]
-        private class DuplicateSettingsProvider : ISettingsProvider
+    [SettingsName("ValidSettingsProvider")]
+    private class DuplicateSettingsProvider : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region  DataCollectors
+    #region  DataCollectors
 
-        public class InvalidDataCollector : DataCollector
+    public class InvalidDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
         {
-            public override void Initialize(
-                XmlElement configurationElement,
-                DataCollectionEvents events,
-                DataCollectionSink dataSink,
-                DataCollectionLogger logger,
-                DataCollectionEnvironmentContext environmentContext)
-            {
-            }
         }
+    }
 
-        /// <summary>
-        /// The a data collector inheriting from another data collector.
-        /// </summary>
-        [DataCollectorFriendlyName("Foo1")]
-        [DataCollectorTypeUri("datacollector://foo/bar1")]
-        public class ADataCollectorInheritingFromAnotherDataCollector : InvalidDataCollector
+    /// <summary>
+    /// The a data collector inheriting from another data collector.
+    /// </summary>
+    [DataCollectorFriendlyName("Foo1")]
+    [DataCollectorTypeUri("datacollector://foo/bar1")]
+    public class ADataCollectorInheritingFromAnotherDataCollector : InvalidDataCollector
+    {
+    }
+
+    [DataCollectorFriendlyName("Foo")]
+    [DataCollectorTypeUri("datacollector://foo/bar")]
+    [DataCollectorAttachmentProcessor(typeof(DataCollectorAttachmentProcessor))]
+    public class ValidDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
         {
         }
+    }
+
+    public class DataCollectorAttachmentProcessor : IDataCollectorAttachmentProcessor
+    {
+        public bool SupportsIncrementalProcessing => throw new NotImplementedException();
+
+        public IEnumerable<Uri> GetExtensionUris()
+        {
+            throw new NotImplementedException();
+        }
 
-        [DataCollectorFriendlyName("Foo")]
-        [DataCollectorTypeUri("datacollector://foo/bar")]
-        public class ValidDataCollector : DataCollector
+        public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
         {
-            public override void Initialize(
-                XmlElement configurationElement,
-                DataCollectionEvents events,
-                DataCollectionSink dataSink,
-                DataCollectionLogger logger,
-                DataCollectionEnvironmentContext environmentContext)
-            {
-            }
+            throw new NotImplementedException();
         }
-        #endregion
+    }
+    #endregion
 
-        internal class FaultyTestExecutorPluginInformation : TestExtensionPluginInformation
+    internal class FaultyTestExecutorPluginInformation : TestExtensionPluginInformation
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="type"> The Type. </param>
+        public FaultyTestExecutorPluginInformation(Type type) : base(type)
         {
-            /// <summary>
-            /// Default constructor
-            /// </summary>
-            /// <param name="type"> The Type. </param>
-            public FaultyTestExecutorPluginInformation(Type type): base(type)
-            {
-                throw new Exception();
-            }
+            throw new Exception();
         }
-        #endregion
     }
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginManagerTests.cs
index 6684ecde72..62682571f6 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginManagerTests.cs
@@ -1,155 +1,153 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework;
+
+[TestClass]
+public class TestPluginManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestPluginManagerTests
+    [TestMethod]
+    public void GetTestExtensionTypeShouldReturnExtensionType()
     {
-        [TestMethod]
-        public void GetTestExtensionTypeShouldReturnExtensionType()
-        {
-            var type = TestPluginManager.GetTestExtensionType(typeof(TestPluginManagerTests).AssemblyQualifiedName);
+        var type = TestPluginManager.GetTestExtensionType(typeof(TestPluginManagerTests).AssemblyQualifiedName!);
 
-            Assert.AreEqual(typeof(TestPluginManagerTests), type);
-        }
+        Assert.AreEqual(typeof(TestPluginManagerTests), type);
+    }
 
-        [TestMethod]
-        public void GetTestExtensionTypeShouldThrowIfTypeNotFound()
-        {
-            Assert.ThrowsException<TypeLoadException>(() => TestPluginManager.GetTestExtensionType("randomassemblyname.random"));
-        }
+    [TestMethod]
+    public void GetTestExtensionTypeShouldThrowIfTypeNotFound()
+    {
+        Assert.ThrowsException<TypeLoadException>(() => TestPluginManager.GetTestExtensionType("randomassemblyname.random"));
+    }
 
-        [TestMethod]
-        public void CreateTestExtensionShouldCreateExtensionTypeInstance()
-        {
-            var instance = TestPluginManager.CreateTestExtension<ITestDiscoverer>(typeof(DummyTestDiscoverer));
+    [TestMethod]
+    public void CreateTestExtensionShouldCreateExtensionTypeInstance()
+    {
+        var instance = TestPluginManager.CreateTestExtension<ITestDiscoverer>(typeof(DummyTestDiscoverer));
 
-            Assert.IsNotNull(instance);
-        }
+        Assert.IsNotNull(instance);
+    }
 
-        [TestMethod]
-        public void CreateTestExtensionShouldThrowIfInstanceCannotBeCreated()
-        {
-            Assert.ThrowsException<MissingMethodException>(() => TestPluginManager.CreateTestExtension<ITestLogger>(typeof(AbstractDummyLogger)));
-        }
+    [TestMethod]
+    public void CreateTestExtensionShouldThrowIfInstanceCannotBeCreated()
+    {
+        Assert.ThrowsException<MissingMethodException>(() => TestPluginManager.CreateTestExtension<ITestLogger>(typeof(AbstractDummyLogger)));
+    }
 
-        [TestMethod]
-        public void InstanceShouldReturnTestPluginManagerInstance()
-        {
-            var instance = TestPluginManager.Instance;
+    [TestMethod]
+    public void InstanceShouldReturnTestPluginManagerInstance()
+    {
+        var instance = TestPluginManager.Instance;
 
-            Assert.IsNotNull(instance);
-            Assert.IsTrue(instance is TestPluginManager);
-        }
+        Assert.IsNotNull(instance);
+        Assert.IsTrue(instance is TestPluginManager);
+    }
 
-        [TestMethod]
-        public void InstanceShouldReturnCachedTestPluginManagerInstance()
-        {
-            var instance = TestPluginManager.Instance;
+    [TestMethod]
+    public void InstanceShouldReturnCachedTestPluginManagerInstance()
+    {
+        var instance = TestPluginManager.Instance;
 
-            Assert.AreEqual(instance, TestPluginManager.Instance);
-        }
+        Assert.AreEqual(instance, TestPluginManager.Instance);
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsShouldReturnTestDiscovererExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestPluginManagerTests));
+    [TestMethod]
+    public void GetTestExtensionsShouldReturnTestDiscovererExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestPluginManagerTests));
 
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                TestPlatformConstants.TestAdapterEndsWithPattern,
-                out var unfilteredTestExtensions,
-                out var testExtensions);
+        TestPluginManager.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+            TestPlatformConstants.TestAdapterEndsWithPattern,
+            out var unfilteredTestExtensions,
+            out var testExtensions);
 
-            Assert.IsNotNull(unfilteredTestExtensions);
-            Assert.IsNotNull(testExtensions);
-            Assert.IsTrue(testExtensions.Any());
-        }
+        Assert.IsNotNull(unfilteredTestExtensions);
+        Assert.IsNotNull(testExtensions);
+        Assert.IsTrue(testExtensions.Any());
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsShouldDiscoverExtensionsOnlyOnce()
-        {
-            var discoveryCount = 0;
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestPluginManagerTests), () => { discoveryCount++; });
+    [TestMethod]
+    public void GetTestExtensionsShouldDiscoverExtensionsOnlyOnce()
+    {
+        var discoveryCount = 0;
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestPluginManagerTests), () => discoveryCount++);
+
+        TestPluginManager.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+            TestPlatformConstants.TestAdapterEndsWithPattern,
+            out var unfilteredTestExtensions,
+            out var testExtensions);
+
+        // Call this again to verify that discovery is not called again.
+        TestPluginManager.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+            TestPlatformConstants.TestAdapterEndsWithPattern,
+            out unfilteredTestExtensions,
+            out testExtensions);
+
+        Assert.IsNotNull(testExtensions);
+        Assert.IsTrue(testExtensions.Any());
+
+        Assert.AreEqual(2, discoveryCount);
+    }
 
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                TestPlatformConstants.TestAdapterEndsWithPattern,
-                out var unfilteredTestExtensions,
+    [TestMethod]
+    public void GetTestExtensionsForAnExtensionAssemblyShouldReturnExtensionsInThatAssembly()
+    {
+        TestPluginManager.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                typeof(TestPluginManagerTests).Assembly.Location,
+                out _,
                 out var testExtensions);
 
-            // Call this again to verify that discovery is not called again.
-            TestPluginManager.Instance.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                TestPlatformConstants.TestAdapterEndsWithPattern,
-                out unfilteredTestExtensions,
-                out testExtensions);
+        Assert.IsNotNull(testExtensions);
+        Assert.IsTrue(testExtensions.Any());
+    }
 
-            Assert.IsNotNull(testExtensions);
-            Assert.IsTrue(testExtensions.Any());
+    #region Implementations
 
-            Assert.AreEqual(2, discoveryCount);
+    private abstract class AbstractDummyLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
+        {
+            throw new NotImplementedException();
         }
+    }
 
-        [TestMethod]
-        public void GetTestExtensionsForAnExtensionAssemblyShouldReturnExtensionsInThatAssembly()
+    private class DummyTestDiscoverer : ITestDiscoverer, ITestExecutor
+    {
+        public void Cancel()
         {
-            TestPluginManager.Instance
-                .GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
-                    typeof(TestPluginManagerTests).GetTypeInfo().Assembly.Location,
-                    out var unfilteredTestExtensions,
-                    out var testExtensions);
-
-            Assert.IsNotNull(testExtensions);
-            Assert.IsTrue(testExtensions.Any());
+            throw new NotImplementedException();
         }
 
-        #region Implementations
-
-        private abstract class AbstractDummyLogger : ITestLogger
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        private class DummyTestDiscoverer : ITestDiscoverer, ITestExecutor
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        #endregion
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/LazyExtensionTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/LazyExtensionTests.cs
index c4eba8d2fd..97a1a975b2 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/LazyExtensionTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/LazyExtensionTests.cs
@@ -1,149 +1,150 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
+
+[TestClass]
+public class LazyExtensionTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class LazyExtensionTests
+    #region Value tests
+
+    [TestMethod]
+    public void ValueShouldCreateExtensionViaTheCallback()
     {
-        #region Value tests
+        var mockExtension = new Mock<ITestDiscoverer>();
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
+            new(
+                () => mockExtension.Object,
+                new Mock<ITestDiscovererCapabilities>().Object);
 
-        [TestMethod]
-        public void ValueShouldCreateExtensionViaTheCallback()
-        {
-            var mockExtension = new Mock<ITestDiscoverer>();
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
-                new LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>(
-                    () => { return mockExtension.Object; },
-                    new Mock<ITestDiscovererCapabilities>().Object);
+        Assert.AreEqual(mockExtension.Object, extension.Value);
+    }
 
-            Assert.AreEqual(mockExtension.Object, extension.Value);
-        }
+    [TestMethod]
+    public void ValueShouldCreateExtensionViaTestPluginManager()
+    {
+        var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
+            new(
+                testDiscovererPluginInfo,
+                new Mock<ITestDiscovererCapabilities>().Object);
+
+        Assert.IsNotNull(extension.Value);
+        Assert.AreEqual(typeof(DummyExtension), extension.Value.GetType());
+    }
 
-        [TestMethod]
-        public void ValueShouldCreateExtensionViaTestPluginManager()
-        {
-            var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
-                new LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>(
-                    testDiscovererPluginInfo,
-                    new Mock<ITestDiscovererCapabilities>().Object);
-
-            Assert.IsNotNull(extension.Value);
-            Assert.AreEqual(typeof(DummyExtension), extension.Value.GetType());
-        }
+    [TestMethod]
+    public void ValueShouldNotCreateExtensionIfAlreadyCreated()
+    {
+        var numberOfTimesExtensionCreated = 0;
+        var mockExtension = new Mock<ITestDiscoverer>();
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
+            new(
+                () =>
+                {
+                    numberOfTimesExtensionCreated++;
+                    return mockExtension.Object;
+                },
+                new Mock<ITestDiscovererCapabilities>().Object);
+
+        var temp = extension.Value;
+        temp = extension.Value;
+
+        Assert.AreEqual(1, numberOfTimesExtensionCreated);
+    }
 
-        [TestMethod]
-        public void ValueShouldNotCreateExtensionIfAlreadyCreated()
-        {
-            var numberOfTimesExtensionCreated = 0;
-            var mockExtension = new Mock<ITestDiscoverer>();
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
-                new LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>(
-                    () =>
-                        {
-                            numberOfTimesExtensionCreated++;
-                            return mockExtension.Object;
-                        },
-                    new Mock<ITestDiscovererCapabilities>().Object);
-
-            var temp = extension.Value;
-            temp = extension.Value;
-
-            Assert.AreEqual(1, numberOfTimesExtensionCreated);
-        }
+    #endregion
+
+    #region metadata tests
 
-        #endregion
+    [TestMethod]
+    public void MetadataShouldReturnMetadataSpecified()
+    {
+        var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
+        var mockMetadata = new Mock<ITestDiscovererCapabilities>();
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension = new(testDiscovererPluginInfo, mockMetadata.Object);
+
+        Assert.AreEqual(mockMetadata.Object, extension.Metadata);
+    }
 
-        #region metadata tests
+    [TestMethod]
+    public void MetadataShouldCreateMetadataFromMetadataType()
+    {
+        var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
+        LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension = new(testDiscovererPluginInfo, typeof(DummyDiscovererCapability));
+
+        var metadata = extension.Metadata;
+        Assert.IsNotNull(metadata);
+        Assert.AreEqual(typeof(DummyDiscovererCapability), metadata.GetType());
+        CollectionAssert.AreEqual(new List<string> { "csv" }, metadata.FileExtension!.ToArray());
+        Assert.AreEqual("executor://unittestexecutor/", metadata.DefaultExecutorUri!.AbsoluteUri);
+        Assert.AreEqual(AssemblyType.Native, metadata.AssemblyType);
+        Assert.IsFalse(metadata.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void MetadataShouldReturnMetadataSpecified()
+    #endregion
+
+    #region Implementation
+
+    private class DummyDiscovererCapability : ITestDiscovererCapabilities
+    {
+        public IEnumerable<string> FileExtension
         {
-            var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
-            var mockMetadata = new Mock<ITestDiscovererCapabilities>();
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
-                new LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>(
-                    testDiscovererPluginInfo,
-                    mockMetadata.Object);
-
-            Assert.AreEqual(mockMetadata.Object, extension.Metadata);
+            get;
+            private set;
         }
 
-        [TestMethod]
-        public void MetadataShouldCreateMetadataFromMetadataType()
+        public Uri DefaultExecutorUri
         {
-            var testDiscovererPluginInfo = new TestDiscovererPluginInformation(typeof(DummyExtension));
-            LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities> extension =
-                new LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>(
-                    testDiscovererPluginInfo,
-                    typeof(DummyDiscovererCapability));
-
-            var metadata = extension.Metadata;
-            Assert.IsNotNull(metadata);
-            Assert.AreEqual(typeof(DummyDiscovererCapability), metadata.GetType());
-            CollectionAssert.AreEqual(new List<string> { "csv" }, (metadata as ITestDiscovererCapabilities).FileExtension.ToArray());
-            Assert.AreEqual("executor://unittestexecutor/", (metadata as ITestDiscovererCapabilities).DefaultExecutorUri.AbsoluteUri);
-            Assert.AreEqual(AssemblyType.Native, (metadata as ITestDiscovererCapabilities).AssemblyType);
+            get;
+            private set;
         }
 
-        #endregion
-
-        #region Implementation
-
-        private class DummyDiscovererCapability : ITestDiscovererCapabilities
+        public AssemblyType AssemblyType
         {
-            public IEnumerable<string> FileExtension
-            {
-                get;
-                private set;
-            }
-
-            public Uri DefaultExecutorUri
-            {
-                get;
-                private set;
-            }
-
-            public AssemblyType AssemblyType
-            {
-                get;
-                private set;
-            }
-
-            public DummyDiscovererCapability(List<string> fileExtensions, string executorURI, AssemblyType assemblyType)
-            {
-                this.FileExtension = fileExtensions;
-                this.DefaultExecutorUri = new Uri(executorURI);
-                this.AssemblyType = assemblyType;
-            }
+            get;
+            private set;
         }
 
+        public bool IsDirectoryBased
+        {
+            get;
+            private set;
+        }
 
-        [FileExtension("csv")]
-        [DefaultExecutorUri("executor://unittestexecutor")]
-        [Category("native")]
-        private class DummyExtension : ITestDiscoverer
+        public DummyDiscovererCapability(List<string> fileExtensions, string executorUri, AssemblyType assemblyType, bool isDirectoryBased)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-            }
+            FileExtension = fileExtensions;
+            DefaultExecutorUri = new Uri(executorUri);
+            AssemblyType = assemblyType;
+            IsDirectoryBased = isDirectoryBased;
         }
+    }
 
-        #endregion
+    [FileExtension("csv")]
+    [DefaultExecutorUri("executor://unittestexecutor")]
+    [Category("native")]
+    private class DummyExtension : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+        }
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/RunSettingsProviderExtensionsTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/RunSettingsProviderExtensionsTests.cs
index 114bcf4b7b..e6831cf97b 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/RunSettingsProviderExtensionsTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/RunSettingsProviderExtensionsTests.cs
@@ -1,315 +1,313 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities;
+
+[TestClass]
+public class RunSettingsProviderExtensionsTests
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using System.Text.RegularExpressions;
-
-    [TestClass]
-    public class RunSettingsProviderExtensionsTests
-    {
-        private IRunSettingsProvider runSettingsProvider;
-
-        [TestInitialize]
-        public void Init()
-        {
-            runSettingsProvider = new TestableRunSettingsProvider();
-        }
+    private readonly IRunSettingsProvider _runSettingsProvider;
 
-        [TestMethod]
-        public void UpdateRunSettingsShouldUpdateGivenSettingsXml()
-        {
-            string runSettingsXml = string.Join(Environment.NewLine,
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TargetPlatform>X86</TargetPlatform>",
-                "  </RunConfiguration>",
-                "</RunSettings>");
+    public RunSettingsProviderExtensionsTests()
+    {
+        _runSettingsProvider = new TestableRunSettingsProvider();
+    }
 
-            this.runSettingsProvider.UpdateRunSettings(runSettingsXml);
+    [TestMethod]
+    public void UpdateRunSettingsShouldUpdateGivenSettingsXml()
+    {
+        string runSettingsXml = string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TargetPlatform>X86</TargetPlatform>",
+            "  </RunConfiguration>",
+            "</RunSettings>");
 
-            StringAssert.Contains(this.runSettingsProvider.ActiveRunSettings.SettingsXml, runSettingsXml);
-        }
+        _runSettingsProvider.UpdateRunSettings(runSettingsXml);
 
-        [TestMethod]
-        public void UpdateRunSettingsShouldThrownExceptionIfRunSettingsProviderIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () => RunSettingsProviderExtensions.UpdateRunSettings(null, "<RunSettings></RunSettings>"));
-        }
+        StringAssert.Contains(_runSettingsProvider.ActiveRunSettings!.SettingsXml, runSettingsXml);
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsShouldThrownExceptionIfSettingsXmlIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () => this.runSettingsProvider.UpdateRunSettings(null));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrownExceptionIfRunSettingsProviderIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => RunSettingsProviderExtensions.UpdateRunSettings(null!, "<RunSettings></RunSettings>"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsShouldThrownExceptionIfSettingsXmlIsEmptyOrWhiteSpace()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () => this.runSettingsProvider.UpdateRunSettings("  "));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrownExceptionIfSettingsXmlIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _runSettingsProvider.UpdateRunSettings(null!));
+    }
 
-        [TestMethod]
-        public void AddDefaultRunSettingsShouldSetDefaultSettingsForEmptySettings()
-        {
-            this.runSettingsProvider.AddDefaultRunSettings();
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrownExceptionIfSettingsXmlIsEmptyOrWhiteSpace()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _runSettingsProvider.UpdateRunSettings("  "));
+    }
 
-            var runConfiguration =
-                XmlRunSettingsUtilities.GetRunConfigurationNode(this.runSettingsProvider.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
-            Assert.AreEqual(runConfiguration.TargetFramework.ToString(), Framework.DefaultFramework.ToString());
-            Assert.AreEqual(runConfiguration.TargetPlatform, Constants.DefaultPlatform);
-        }
+    [TestMethod]
+    public void AddDefaultRunSettingsShouldSetDefaultSettingsForEmptySettings()
+    {
+        _runSettingsProvider.AddDefaultRunSettings();
 
-        [TestMethod]
-        public void AddDefaultRunSettingsShouldAddUnspecifiedSettings()
-        {
-            this.runSettingsProvider.UpdateRunSettings(string.Join(Environment.NewLine,
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TargetPlatform>X86</TargetPlatform>",
-                "  </RunConfiguration>",
-                "</RunSettings>"));
-
-            this.runSettingsProvider.AddDefaultRunSettings();
-
-            var runConfiguration =
-                XmlRunSettingsUtilities.GetRunConfigurationNode(this.runSettingsProvider.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
-            Assert.AreEqual(runConfiguration.TargetFramework.ToString(), Framework.DefaultFramework.ToString());
-        }
+        var runConfiguration =
+            XmlRunSettingsUtilities.GetRunConfigurationNode(_runSettingsProvider.ActiveRunSettings!.SettingsXml);
+        Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
+        Assert.AreEqual(runConfiguration.TargetFramework!.ToString(), Framework.DefaultFramework.ToString());
+        Assert.AreEqual(runConfiguration.TargetPlatform, Constants.DefaultPlatform);
+    }
 
-        [TestMethod]
-        public void AddDefaultRunSettingsShouldNotChangeSpecifiedSettings()
-        {
-            this.runSettingsProvider.UpdateRunSettings(string.Join(Environment.NewLine,
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TargetPlatform>X64</TargetPlatform> </RunConfiguration>",
-                "</RunSettings>"));
+    [TestMethod]
+    public void AddDefaultRunSettingsShouldAddUnspecifiedSettings()
+    {
+        _runSettingsProvider.UpdateRunSettings(string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TargetPlatform>X86</TargetPlatform>",
+            "  </RunConfiguration>",
+            "</RunSettings>"));
+
+        _runSettingsProvider.AddDefaultRunSettings();
+
+        var runConfiguration =
+            XmlRunSettingsUtilities.GetRunConfigurationNode(_runSettingsProvider.ActiveRunSettings!.SettingsXml);
+        Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
+        Assert.AreEqual(runConfiguration.TargetFramework!.ToString(), Framework.DefaultFramework.ToString());
+    }
 
-            this.runSettingsProvider.AddDefaultRunSettings();
+    [TestMethod]
+    public void AddDefaultRunSettingsShouldNotChangeSpecifiedSettings()
+    {
+        _runSettingsProvider.UpdateRunSettings(string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TargetPlatform>X64</TargetPlatform> </RunConfiguration>",
+            "</RunSettings>"));
 
-            var runConfiguration =
-                XmlRunSettingsUtilities.GetRunConfigurationNode(this.runSettingsProvider.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(runConfiguration.TargetPlatform, Architecture.X64);
-        }
+        _runSettingsProvider.AddDefaultRunSettings();
 
-        [TestMethod]
-        public void AddDefaultRunSettingsShouldThrowExceptionIfArgumentIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                RunSettingsProviderExtensions.AddDefaultRunSettings(null));
-        }
+        var runConfiguration =
+            XmlRunSettingsUtilities.GetRunConfigurationNode(_runSettingsProvider.ActiveRunSettings!.SettingsXml);
+        Assert.AreEqual(runConfiguration.TargetPlatform, Architecture.X64);
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldThrowExceptionIfKeyIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNode(null, "data"));
-        }
+    [TestMethod]
+    public void AddDefaultRunSettingsShouldThrowExceptionIfArgumentIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            RunSettingsProviderExtensions.AddDefaultRunSettings(null!));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldThrowExceptionIfKeyIsEmptyOrWhiteSpace()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNode("  ", "data"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldThrowExceptionIfKeyIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNode(null!, "data"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldThrowExceptionIfDataIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNode("Key", null));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldThrowExceptionIfKeyIsEmptyOrWhiteSpace()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNode("  ", "data"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldThrowExceptionIfRunSettingsProviderIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                RunSettingsProviderExtensions.UpdateRunSettingsNode(null, "Key", "data"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldThrowExceptionIfDataIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNode("Key", null!));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldAddNewKeyIfNotPresent()
-        {
-            this.runSettingsProvider.UpdateRunSettings(
-                "<RunSettings>  <RunConfiguration> </RunConfiguration>  </RunSettings>");
-            this.runSettingsProvider.UpdateRunSettingsNode("Key.Path", "data");
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldThrowExceptionIfRunSettingsProviderIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            RunSettingsProviderExtensions.UpdateRunSettingsNode(null!, "Key", "data"));
+    }
 
-            Assert.AreEqual("data", this.runSettingsProvider.QueryRunSettingsNode("Key.Path"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldAddNewKeyIfNotPresent()
+    {
+        _runSettingsProvider.UpdateRunSettings(
+            "<RunSettings>  <RunConfiguration> </RunConfiguration>  </RunSettings>");
+        _runSettingsProvider.UpdateRunSettingsNode("Key.Path", "data");
 
-        [TestMethod]
-        public void UpdateTestRunParameterSettingsNodeShouldAddNewKeyIfNotPresent()
-        {
-            this.CheckRunSettingsAreUpdated("weburl", @"http://localhost//abc");
-        }
+        Assert.AreEqual("data", _runSettingsProvider.QueryRunSettingsNode("Key.Path"));
+    }
 
-        [TestMethod]
-        public void UpdateTetsRunParameterSettingsNodeShouldOverrideValueIfKeyIsAlreadyPresent()
-        {
-            var runSettingsWithTestRunParameters = string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <TestRunParameters>",
-                "    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
-                "  </TestRunParameters>",
-                "</RunSettings>");
-            var runSettingsWithTestRunParametersOverrode = string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <TestRunParameters>",
-                "    <Parameter name=\"weburl\" value=\"http://localhost//def\" />",
-                "  </TestRunParameters>",
-                "</RunSettings>");
-
-            this.runSettingsProvider.UpdateRunSettings(runSettingsWithTestRunParameters);
-            var match = this.runSettingsProvider.GetTestRunParameterNodeMatch(
-                "TestRunParameters.Parameter(name=\"weburl\",value=\"http://localhost//def\")");
-            this.runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
-
-            Assert.AreEqual(runSettingsWithTestRunParametersOverrode,
-                this.runSettingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void UpdateTestRunParameterSettingsNodeShouldAddNewKeyIfNotPresent()
+    {
+        CheckRunSettingsAreUpdated("weburl", @"http://localhost//abc");
+    }
 
-        [TestMethod]
-        public void TestRunParameterSettingsNodeCanContainSpecialCharacters()
-        {
-            this.CheckRunSettingsAreUpdated("weburl:name", @"http://localhost//abc");
-        }
+    [TestMethod]
+    public void UpdateTetsRunParameterSettingsNodeShouldOverrideValueIfKeyIsAlreadyPresent()
+    {
+        var runSettingsWithTestRunParameters = string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <TestRunParameters>",
+            "    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
+            "  </TestRunParameters>",
+            "</RunSettings>");
+        var runSettingsWithTestRunParametersOverrode = string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <TestRunParameters>",
+            "    <Parameter name=\"weburl\" value=\"http://localhost//def\" />",
+            "  </TestRunParameters>",
+            "</RunSettings>");
+
+        _runSettingsProvider.UpdateRunSettings(runSettingsWithTestRunParameters);
+        var match = _runSettingsProvider.GetTestRunParameterNodeMatch(
+            "TestRunParameters.Parameter(name=\"weburl\",value=\"http://localhost//def\")");
+        _runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
+
+        Assert.AreEqual(runSettingsWithTestRunParametersOverrode,
+            _runSettingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void TestRunParameterSettingsNodeCanBeJustASingleCharacter()
-        {
-            this.CheckRunSettingsAreUpdated("a", @"http://localhost//abc");
-        }
+    [TestMethod]
+    public void TestRunParameterSettingsNodeCanContainSpecialCharacters()
+    {
+        CheckRunSettingsAreUpdated("weburl:name", @"http://localhost//abc");
+    }
 
-        [TestMethod]
-        public void TestRunParameterSettingsNodeCanMixSpecialCharacters()
-        {
-            this.CheckRunSettingsAreUpdated("___this_Should:be-valid.2", @"http://localhost//abc");
-        }
+    [TestMethod]
+    public void TestRunParameterSettingsNodeCanBeJustASingleCharacter()
+    {
+        CheckRunSettingsAreUpdated("a", @"http://localhost//abc");
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeShouldUpdateKeyIfAlreadyPresent()
-        {
-            this.runSettingsProvider.UpdateRunSettings(
-                "<RunSettings>  <RunConfiguration> <MaxCpuCount>1</MaxCpuCount></RunConfiguration>  </RunSettings>");
-            this.runSettingsProvider.UpdateRunSettingsNode("RunConfiguration.MaxCpuCount", "0");
-            Assert.AreEqual("0", this.runSettingsProvider.QueryRunSettingsNode("RunConfiguration.MaxCpuCount"));
-        }
+    [TestMethod]
+    public void TestRunParameterSettingsNodeCanMixSpecialCharacters()
+    {
+        CheckRunSettingsAreUpdated("___this_Should:be-valid.2", @"http://localhost//abc");
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfKeyIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNodeInnerXml(null, "<myxml/>"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeShouldUpdateKeyIfAlreadyPresent()
+    {
+        _runSettingsProvider.UpdateRunSettings(
+            "<RunSettings>  <RunConfiguration> <MaxCpuCount>1</MaxCpuCount></RunConfiguration>  </RunSettings>");
+        _runSettingsProvider.UpdateRunSettingsNode("RunConfiguration.MaxCpuCount", "0");
+        Assert.AreEqual("0", _runSettingsProvider.QueryRunSettingsNode("RunConfiguration.MaxCpuCount"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfKeyIsEmptyOrWhiteSpace()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNodeInnerXml("  ", "<myxml/>"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfKeyIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNodeInnerXml(null!, "<myxml/>"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfXmlIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                this.runSettingsProvider.UpdateRunSettingsNodeInnerXml("Key", null));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfKeyIsEmptyOrWhiteSpace()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNodeInnerXml("  ", "<myxml/>"));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfRunSettingsProviderIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-                RunSettingsProviderExtensions.UpdateRunSettingsNodeInnerXml(null, "Key", "<myxml/>"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfXmlIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            _runSettingsProvider.UpdateRunSettingsNodeInnerXml("Key", null!));
+    }
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldAddNewKeyIfNotPresent()
-        {
-            this.runSettingsProvider.UpdateRunSettings(
-                "<RunSettings>  <RunConfiguration> </RunConfiguration>  </RunSettings>");
-            this.runSettingsProvider.UpdateRunSettingsNodeInnerXml("Key.Path", "<myxml>myxml</myxml>");
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldThrowExceptionIfRunSettingsProviderIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() =>
+            RunSettingsProviderExtensions.UpdateRunSettingsNodeInnerXml(null!, "Key", "<myxml/>"));
+    }
 
-            Assert.AreEqual("myxml", this.runSettingsProvider.QueryRunSettingsNode("Key.Path"));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldAddNewKeyIfNotPresent()
+    {
+        _runSettingsProvider.UpdateRunSettings(
+            "<RunSettings>  <RunConfiguration> </RunConfiguration>  </RunSettings>");
+        _runSettingsProvider.UpdateRunSettingsNodeInnerXml("Key.Path", "<myxml>myxml</myxml>");
 
-        [TestMethod]
-        public void UpdateRunSettingsNodeInnerXmlShouldUpdateKeyIfAlreadyPresent()
-        {
-            this.runSettingsProvider.UpdateRunSettings(
-                "<RunSettings>  <RunConfiguration> <MaxCpuCount>1</MaxCpuCount></RunConfiguration>  </RunSettings>");
-            this.runSettingsProvider.UpdateRunSettingsNodeInnerXml("RunConfiguration", "<MaxCpuCount>0</MaxCpuCount>");
-            Assert.AreEqual("0", this.runSettingsProvider.QueryRunSettingsNode("RunConfiguration.MaxCpuCount"));
-        }
+        Assert.AreEqual("myxml", _runSettingsProvider.QueryRunSettingsNode("Key.Path"));
+    }
 
-        [TestMethod]
-        public void QueryRunSettingsNodeShouldThrowIfKeyIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => this.runSettingsProvider.QueryRunSettingsNode(null));
-        }
+    [TestMethod]
+    public void UpdateRunSettingsNodeInnerXmlShouldUpdateKeyIfAlreadyPresent()
+    {
+        _runSettingsProvider.UpdateRunSettings(
+            "<RunSettings>  <RunConfiguration> <MaxCpuCount>1</MaxCpuCount></RunConfiguration>  </RunSettings>");
+        _runSettingsProvider.UpdateRunSettingsNodeInnerXml("RunConfiguration", "<MaxCpuCount>0</MaxCpuCount>");
+        Assert.AreEqual("0", _runSettingsProvider.QueryRunSettingsNode("RunConfiguration.MaxCpuCount"));
+    }
 
-        [TestMethod]
-        public void QueryRunSettingsNodeShouldThrowIfKeyIsEmptyOrWhiteSpace()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => this.runSettingsProvider.QueryRunSettingsNode("  "));
-        }
+    [TestMethod]
+    public void QueryRunSettingsNodeShouldThrowIfKeyIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _runSettingsProvider.QueryRunSettingsNode(null!));
+    }
 
-        [TestMethod]
-        public void QueryRunSettingsNodeShouldReturnNullForNotExistKey()
-        {
-            Assert.IsNull(this.runSettingsProvider.QueryRunSettingsNode("RunConfiguration.TargetPlatform"));
-        }
+    [TestMethod]
+    public void QueryRunSettingsNodeShouldThrowIfKeyIsEmptyOrWhiteSpace()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _runSettingsProvider.QueryRunSettingsNode("  "));
+    }
 
-        [TestMethod]
-        public void QueryRunSettingsNodeShouldReturnCorrectValue()
-        {
-            this.runSettingsProvider.UpdateRunSettings(
-                "<RunSettings>  <RunConfiguration> <TargetPlatform>x86</TargetPlatform></RunConfiguration>  </RunSettings>");
-            Assert.AreEqual("x86", this.runSettingsProvider.QueryRunSettingsNode("RunConfiguration.TargetPlatform"));
-        }
+    [TestMethod]
+    public void QueryRunSettingsNodeShouldReturnNullForNotExistKey()
+    {
+        Assert.IsNull(_runSettingsProvider.QueryRunSettingsNode("RunConfiguration.TargetPlatform"));
+    }
 
-        private void CheckRunSettingsAreUpdated(string parameterName, string parameterValue)
-        {
-            var match = this.runSettingsProvider.GetTestRunParameterNodeMatch(
-                $@"TestRunParameters.Parameter(name=""{parameterName}"",value=""{parameterValue}"")");
-            var runSettingsWithTestRunParameters = string.Join(
-                Environment.NewLine,
-                $@"<?xml version=""1.0"" encoding=""utf-16""?>",
-                $@"<RunSettings>",
-                $@"  <TestRunParameters>",
-                $@"    <Parameter name=""{parameterName}"" value=""{parameterValue}"" />",
-                $@"  </TestRunParameters>",
-                $@"</RunSettings>");
-
-            this.runSettingsProvider.UpdateRunSettings("<RunSettings>\r\n  </RunSettings>");
-            this.runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
-
-            Assert.AreEqual(runSettingsWithTestRunParameters, this.runSettingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void QueryRunSettingsNodeShouldReturnCorrectValue()
+    {
+        _runSettingsProvider.UpdateRunSettings(
+            "<RunSettings>  <RunConfiguration> <TargetPlatform>x86</TargetPlatform></RunConfiguration>  </RunSettings>");
+        Assert.AreEqual("x86", _runSettingsProvider.QueryRunSettingsNode("RunConfiguration.TargetPlatform"));
+    }
 
-        private class TestableRunSettingsProvider : IRunSettingsProvider
-        {
-            public RunSettings ActiveRunSettings { get; set; }
+    private void CheckRunSettingsAreUpdated(string parameterName, string parameterValue)
+    {
+        var match = _runSettingsProvider.GetTestRunParameterNodeMatch(
+            $@"TestRunParameters.Parameter(name=""{parameterName}"",value=""{parameterValue}"")");
+        var runSettingsWithTestRunParameters = string.Join(
+            Environment.NewLine,
+            $@"<?xml version=""1.0"" encoding=""utf-16""?>",
+            $@"<RunSettings>",
+            $@"  <TestRunParameters>",
+            $@"    <Parameter name=""{parameterName}"" value=""{parameterValue}"" />",
+            $@"  </TestRunParameters>",
+            $@"</RunSettings>");
+
+        _runSettingsProvider.UpdateRunSettings("<RunSettings>\r\n  </RunSettings>");
+        _runSettingsProvider.UpdateTestRunParameterSettingsNode(match);
+
+        Assert.AreEqual(runSettingsWithTestRunParameters, _runSettingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    private class TestableRunSettingsProvider : IRunSettingsProvider
+    {
+        public RunSettings? ActiveRunSettings { get; set; }
 
-            public void SetActiveRunSettings(RunSettings runSettings)
-            {
-                this.ActiveRunSettings = runSettings;
-            }
+        public void SetActiveRunSettings(RunSettings runSettings)
+        {
+            ActiveRunSettings = runSettings;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
index 2ff6af44c3..6b61aa6568 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
@@ -1,197 +1,240 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestDiscovererPluginInformationTests
-    {
-        private TestDiscovererPluginInformation testPluginInformation;
-
-        [TestMethod]
-        public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
-            Assert.AreEqual(typeof(DummyTestDiscovererWithNoFileExtensions).AssemblyQualifiedName, this.testPluginInformation.AssemblyQualifiedName);
-        }
-
-        [TestMethod]
-        public void IdentifierDataShouldReturnTestExtensionTypesName()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
-            Assert.AreEqual(typeof(DummyTestDiscovererWithNoFileExtensions).AssemblyQualifiedName, this.testPluginInformation.IdentifierData);
-        }
-
-        [TestMethod]
-        public void FileExtensionsShouldReturnEmptyListIfADiscovererSupportsNoFileExtensions()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
-            Assert.IsNotNull(this.testPluginInformation.FileExtensions);
-            Assert.AreEqual(0, this.testPluginInformation.FileExtensions.Count);
-        }
-
-        [TestMethod]
-        public void FileExtensionsShouldReturnAFileExtensionForADiscoverer()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithOneFileExtensions));
-            CollectionAssert.AreEqual(new List<string> { "csv"}, this.testPluginInformation.FileExtensions);
-        }
-
-        [TestMethod]
-        public void FileExtensionsShouldReturnSupportedFileExtensionsForADiscoverer()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithTwoFileExtensions));
-            CollectionAssert.AreEqual(new List<string> {"csv", "docx"}, this.testPluginInformation.FileExtensions);
-        }
-
-        [TestMethod]
-        public void AssemblyTypeShouldReturnNoneIfDiscovererHasNoCategory()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithNoCategory));
-            Assert.AreEqual(AssemblyType.None, this.testPluginInformation.AssemblyType);
-        }
-
-        [TestMethod]
-        public void AssemblyTypeShouldReturnNoneIfDiscovererHasCategoryWithNoValue()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithCategoryHavingNoValue));
-            Assert.AreEqual(AssemblyType.None, this.testPluginInformation.AssemblyType);
-        }
-
-        [TestMethod]
-        public void AssemblyTypeShouldReturnNoneIfDiscovererHasCategoryWithEmptyValue()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithCategoryHavingEmptyValue));
-            Assert.AreEqual(AssemblyType.None, this.testPluginInformation.AssemblyType);
-        }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 
-        [TestMethod]
-        public void AssemblyTypeShouldReturnNativeIfDiscovererHasNativeCategory()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithNativeCategory));
-            Assert.AreEqual(AssemblyType.Native, this.testPluginInformation.AssemblyType);
-        }
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        [TestMethod]
-        public void AssemblyTypeShouldReturnManagedIfDiscovererHasManagedCategory()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithManagedCategory));
-            Assert.AreEqual(AssemblyType.Managed, this.testPluginInformation.AssemblyType);
-        }
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
 
-        [TestMethod]
-        public void AssemblyTypeShouldReturnNoneIfDiscovererHasUnknownCategory()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithUnknownCategory));
-            Assert.AreEqual(AssemblyType.None, this.testPluginInformation.AssemblyType);
-        }
+[TestClass]
+public class TestDiscovererPluginInformationTests
+{
+    private TestDiscovererPluginInformation? _testPluginInformation;
 
-        [TestMethod]
-        public void AssemblyTypeShouldReturnAssemblyTypeIfDiscovererHasCategoryInArbitCasing()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithArbitCasedCategory));
-            Assert.AreEqual(AssemblyType.Native, this.testPluginInformation.AssemblyType);
-        }
+    [TestMethod]
+    public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
+        Assert.AreEqual(typeof(DummyTestDiscovererWithNoFileExtensions).AssemblyQualifiedName, _testPluginInformation.AssemblyQualifiedName);
+    }
 
-        [TestMethod]
-        public void DefaultExecutorUriShouldReturnEmptyListIfADiscovererDoesNotHaveOne()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
-            Assert.IsNotNull(this.testPluginInformation.DefaultExecutorUri);
-            Assert.AreEqual(string.Empty, this.testPluginInformation.DefaultExecutorUri);
-        }
+    [TestMethod]
+    public void IdentifierDataShouldReturnTestExtensionTypesName()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
+        Assert.AreEqual(typeof(DummyTestDiscovererWithNoFileExtensions).AssemblyQualifiedName, _testPluginInformation.IdentifierData);
+    }
 
-        [TestMethod]
-        public void DefaultExecutorUriShouldReturnDefaultExecutorUriOfADiscoverer()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithOneFileExtensions));
-            Assert.AreEqual("csvexecutor", this.testPluginInformation.DefaultExecutorUri);
-        }
+    [TestMethod]
+    public void FileExtensionsShouldReturnEmptyListIfADiscovererSupportsNoFileExtensions()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
+        Assert.IsNotNull(_testPluginInformation.FileExtensions);
+        Assert.AreEqual(0, _testPluginInformation.FileExtensions.Count);
+        Assert.IsFalse(_testPluginInformation.IsDirectoryBased);
+    }
 
-        [TestMethod]
-        public void MetadataShouldReturnFileExtensionsAndDefaultExecutorUriAndAssemblyType()
-        {
-            this.testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithTwoFileExtensions));
+    [TestMethod]
+    public void FileExtensionsShouldReturnAFileExtensionForADiscoverer()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithOneFileExtensions));
+        CollectionAssert.AreEqual(new List<string> { "csv" }, _testPluginInformation.FileExtensions);
+        Assert.IsFalse(_testPluginInformation.IsDirectoryBased);
+    }
 
-            var expectedFileExtensions = new List<string> { "csv", "docx" };
-            var testPluginMetada = this.testPluginInformation.Metadata.ToArray();
+    [TestMethod]
+    public void FileExtensionsShouldReturnSupportedFileExtensionsForADiscoverer()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithTwoFileExtensions));
+        CollectionAssert.AreEqual(new List<string> { "csv", "docx" }, _testPluginInformation.FileExtensions);
+        Assert.IsFalse(_testPluginInformation.IsDirectoryBased);
+    }
 
-            CollectionAssert.AreEqual(expectedFileExtensions, (testPluginMetada[0] as List<string>).ToArray());
-            Assert.AreEqual("csvexecutor", testPluginMetada[1] as string);
-            Assert.AreEqual(AssemblyType.Managed, Enum.Parse(typeof(AssemblyType), testPluginMetada[2].ToString()));
-        }
+    [TestMethod]
+    public void AssemblyTypeShouldReturnNoneIfDiscovererHasNoCategory()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithNoCategory));
+        Assert.AreEqual(AssemblyType.None, _testPluginInformation.AssemblyType);
     }
 
-    #region Implementation
+    [TestMethod]
+    public void AssemblyTypeShouldReturnNoneIfDiscovererHasCategoryWithNoValue()
+    {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithCategoryHavingNoValue));
+        Assert.AreEqual(AssemblyType.None, _testPluginInformation.AssemblyType);
+    }
 
-    public class DummyTestDiscovererWithNoFileExtensions
+    [TestMethod]
+    public void AssemblyTypeShouldReturnNoneIfDiscovererHasCategoryWithEmptyValue()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithCategoryHavingEmptyValue));
+        Assert.AreEqual(AssemblyType.None, _testPluginInformation.AssemblyType);
     }
 
-    [FileExtension(".dll")]
-    public class DummyTestDiscovereWithNoCategory
+    [TestMethod]
+    public void AssemblyTypeShouldReturnNativeIfDiscovererHasNativeCategory()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithNativeCategory));
+        Assert.AreEqual(AssemblyType.Native, _testPluginInformation.AssemblyType);
     }
 
-    [FileExtension(".dll")]
-    [Category]
-    public class DummyTestDiscovereWithCategoryHavingNoValue
+    [TestMethod]
+    public void AssemblyTypeShouldReturnManagedIfDiscovererHasManagedCategory()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithManagedCategory));
+        Assert.AreEqual(AssemblyType.Managed, _testPluginInformation.AssemblyType);
     }
 
-    [FileExtension(".dll")]
-    [Category]
-    public class DummyTestDiscovereWithCategoryHavingEmptyValue
+    [TestMethod]
+    public void AssemblyTypeShouldReturnNoneIfDiscovererHasUnknownCategory()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithUnknownCategory));
+        Assert.AreEqual(AssemblyType.None, _testPluginInformation.AssemblyType);
     }
 
-    [FileExtension(".js")]
-    [Category("native")]
-    public class DummyTestDiscovereWithNativeCategory
+    [TestMethod]
+    public void AssemblyTypeShouldReturnAssemblyTypeIfDiscovererHasCategoryInArbitCasing()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovereWithArbitCasedCategory));
+        Assert.AreEqual(AssemblyType.Native, _testPluginInformation.AssemblyType);
     }
 
-    [FileExtension(".dll")]
-    [Category("managed")]
-    public class DummyTestDiscovereWithManagedCategory
+    [TestMethod]
+    public void DefaultExecutorUriShouldReturnEmptyListIfADiscovererDoesNotHaveOne()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithNoFileExtensions));
+        Assert.IsNotNull(_testPluginInformation.DefaultExecutorUri);
+        Assert.AreEqual(string.Empty, _testPluginInformation.DefaultExecutorUri);
     }
 
-    [FileExtension(".dll")]
-    [Category("arbitValue")]
-    public class DummyTestDiscovereWithUnknownCategory
+    [TestMethod]
+    public void DefaultExecutorUriShouldReturnDefaultExecutorUriOfADiscoverer()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithOneFileExtensions));
+        Assert.AreEqual("csvexecutor", _testPluginInformation.DefaultExecutorUri);
     }
 
-    [FileExtension(".dll")]
-    [Category("NatIVe")]
-    public class DummyTestDiscovereWithArbitCasedCategory
+    [TestMethod]
+    public void MetadataShouldReturnFileExtensionsAndDefaultExecutorUriAndAssemblyType()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyTestDiscovererWithTwoFileExtensions));
+
+        var expectedFileExtensions = new List<string> { "csv", "docx" };
+        var testPluginMetada = _testPluginInformation.Metadata.ToArray();
+
+        CollectionAssert.AreEqual(expectedFileExtensions, ((List<string>)testPluginMetada[0]!).ToArray());
+        Assert.AreEqual("csvexecutor", testPluginMetada[1] as string);
+        Assert.AreEqual(AssemblyType.Managed, Enum.Parse(typeof(AssemblyType), testPluginMetada[2]!.ToString()!));
+        Assert.IsFalse(bool.Parse(testPluginMetada[3]!.ToString()!));
     }
 
-    [FileExtension("csv")]
-    [DefaultExecutorUri("csvexecutor")]
-    public class DummyTestDiscovererWithOneFileExtensions
+    [TestMethod]
+    public void IsDirectoryBasedShouldReturnTrueIfDiscovererIsDirectoryBased()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyDirectoryBasedTestDiscoverer));
+        var testPluginMetada = _testPluginInformation.Metadata.ToArray();
+
+        Assert.IsNotNull(_testPluginInformation.FileExtensions);
+        Assert.AreEqual(0, _testPluginInformation.FileExtensions.Count);
+        Assert.IsNotNull(testPluginMetada[0]);
+        Assert.AreEqual(0, ((List<string>)testPluginMetada[0]!).Count);
+
+        Assert.IsTrue(_testPluginInformation.IsDirectoryBased);
+        Assert.IsTrue(bool.Parse(testPluginMetada[3]!.ToString()!));
     }
 
-    [FileExtension("csv")]
-    [FileExtension("docx")]
-    [Category("managed")]
-    [DefaultExecutorUri("csvexecutor")]
-    public class DummyTestDiscovererWithTwoFileExtensions
+    [TestMethod]
+    public void FileExtensionsAndIsDirectroyBasedShouldReturnCorrectValuesWhenBothAreSupported()
     {
+        _testPluginInformation = new TestDiscovererPluginInformation(typeof(DummyDirectoryBasedTestDiscovererWithFileExtensions));
+        var testPluginMetada = _testPluginInformation.Metadata.ToArray();
+        var expectedFileExtensions = new List<string> { "csv", "docx" };
+
+        CollectionAssert.AreEqual(expectedFileExtensions, _testPluginInformation.FileExtensions);
+        CollectionAssert.AreEqual(expectedFileExtensions, ((List<string>)testPluginMetada[0]!));
+
+        Assert.IsTrue(_testPluginInformation.IsDirectoryBased);
+        Assert.IsTrue(bool.Parse(testPluginMetada[3]!.ToString()!));
     }
+}
+
+#region Implementation
+
+public class DummyTestDiscovererWithNoFileExtensions
+{
+}
+
+[FileExtension(".dll")]
+public class DummyTestDiscovereWithNoCategory
+{
+}
+
+[FileExtension(".dll")]
+[Category]
+public class DummyTestDiscovereWithCategoryHavingNoValue
+{
+}
 
-    #endregion
+[FileExtension(".dll")]
+[Category]
+public class DummyTestDiscovereWithCategoryHavingEmptyValue
+{
+}
+
+[FileExtension(".js")]
+[Category("native")]
+public class DummyTestDiscovereWithNativeCategory
+{
+}
+
+[FileExtension(".dll")]
+[Category("managed")]
+public class DummyTestDiscovereWithManagedCategory
+{
+}
+
+[FileExtension(".dll")]
+[Category("arbitValue")]
+public class DummyTestDiscovereWithUnknownCategory
+{
+}
+
+[FileExtension(".dll")]
+[Category("NatIVe")]
+public class DummyTestDiscovereWithArbitCasedCategory
+{
+}
+
+[FileExtension("csv")]
+[DefaultExecutorUri("csvexecutor")]
+public class DummyTestDiscovererWithOneFileExtensions
+{
+}
+
+[FileExtension("csv")]
+[FileExtension("docx")]
+[Category("managed")]
+[DefaultExecutorUri("csvexecutor")]
+public class DummyTestDiscovererWithTwoFileExtensions
+{
+}
+
+[DirectoryBasedTestDiscoverer]
+public class DummyDirectoryBasedTestDiscoverer
+{
+}
+
+[DirectoryBasedTestDiscoverer]
+[FileExtension("csv")]
+[FileExtension("docx")]
+public class DummyDirectoryBasedTestDiscovererWithFileExtensions
+{
 }
+#endregion
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionPluginInformationTests.cs
index 357f6c2f23..f2d4bb849c 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionPluginInformationTests.cs
@@ -1,77 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Linq;
+using System;
+using System.Linq;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class TestExtensionPluginInformationTests
-    {
-        private TestableTestExtensionPluginInformation testPluginInformation;
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
 
-        internal const string DefaultExtensionURI = "executor://unittest";
+[TestClass]
+public class TestExtensionPluginInformationTests
+{
+    private TestableTestExtensionPluginInformation? _testPluginInformation;
 
-        [TestMethod]
-        public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
-        {
-            this.testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithNoExtensionUri));
-            Assert.AreEqual(typeof(DummyTestExtensionWithNoExtensionUri).AssemblyQualifiedName, this.testPluginInformation.AssemblyQualifiedName);
-        }
+    internal const string DefaultExtensionUri = "executor://unittest";
 
-        [TestMethod]
-        public void IdentifierDataShouldReturnExtensionUri()
-        {
-            this.testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
-            Assert.AreEqual(DefaultExtensionURI, this.testPluginInformation.IdentifierData);
-        }
+    [TestMethod]
+    public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
+    {
+        _testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithNoExtensionUri));
+        Assert.AreEqual(typeof(DummyTestExtensionWithNoExtensionUri).AssemblyQualifiedName, _testPluginInformation.AssemblyQualifiedName);
+    }
 
-        [TestMethod]
-        public void ExtensionUriShouldReturnEmptyIfAnExtensionDoesNotHaveOne()
-        {
-            this.testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithNoExtensionUri));
-            Assert.IsNotNull(this.testPluginInformation.ExtensionUri);
-            Assert.AreEqual(string.Empty, this.testPluginInformation.ExtensionUri);
-        }
+    [TestMethod]
+    public void IdentifierDataShouldReturnExtensionUri()
+    {
+        _testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
+        Assert.AreEqual(DefaultExtensionUri, _testPluginInformation.IdentifierData);
+    }
 
-        [TestMethod]
-        public void ExtensionUriShouldReturnExtensionUriOfAnExtension()
-        {
-            this.testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
-            Assert.AreEqual(DefaultExtensionURI, this.testPluginInformation.ExtensionUri);
-        }
+    [TestMethod]
+    public void ExtensionUriShouldReturnEmptyIfAnExtensionDoesNotHaveOne()
+    {
+        _testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithNoExtensionUri));
+        Assert.IsNotNull(_testPluginInformation.ExtensionUri);
+        Assert.AreEqual(string.Empty, _testPluginInformation.ExtensionUri);
+    }
 
-        [TestMethod]
-        public void MetadataShouldReturnExtensionUri()
-        {
-            this.testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
+    [TestMethod]
+    public void ExtensionUriShouldReturnExtensionUriOfAnExtension()
+    {
+        _testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
+        Assert.AreEqual(DefaultExtensionUri, _testPluginInformation.ExtensionUri);
+    }
 
-            CollectionAssert.AreEqual(new object[] { DefaultExtensionURI }, this.testPluginInformation.Metadata.ToArray());
-        }
+    [TestMethod]
+    public void MetadataShouldReturnExtensionUri()
+    {
+        _testPluginInformation = new TestableTestExtensionPluginInformation(typeof(DummyTestExtensionWithExtensionUri));
 
-        #region Implementation
+        CollectionAssert.AreEqual(new object[] { DefaultExtensionUri }, _testPluginInformation.Metadata.ToArray());
+    }
 
-        private class TestableTestExtensionPluginInformation : TestExtensionPluginInformation
-        {
-            public TestableTestExtensionPluginInformation(Type testExtensionType) : base(testExtensionType)
-            {
-            }
-        }
+    #region Implementation
 
-        private class DummyTestExtensionWithNoExtensionUri
+    private class TestableTestExtensionPluginInformation : TestExtensionPluginInformation
+    {
+        public TestableTestExtensionPluginInformation(Type testExtensionType) : base(testExtensionType)
         {
         }
+    }
 
-        [ExtensionUri(TestExtensionPluginInformationTests.DefaultExtensionURI)]
-        private class DummyTestExtensionWithExtensionUri
-        {
-        }
+    private class DummyTestExtensionWithNoExtensionUri
+    {
+    }
 
-        #endregion
+    [ExtensionUri(DefaultExtensionUri)]
+    private class DummyTestExtensionWithExtensionUri
+    {
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionsTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionsTests.cs
index 4525781aca..aed57338cf 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionsTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestExtensionsTests.cs
@@ -1,207 +1,347 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using FluentAssertions;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
+
+[TestClass]
+public class TestExtensionsTests
 {
-    using System.Collections.Generic;
+    private readonly TestExtensions _testExtensions;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Reflection;
+    public TestExtensionsTests()
+    {
+        _testExtensions = new TestExtensions();
+    }
 
-    [TestClass]
-    public class TestExtensionsTests
+    [TestMethod]
+    public void AddExtensionsShouldNotThrowIfExtensionsIsNull()
     {
-        private TestExtensions testExtensions;
+        _testExtensions.AddExtension<TestPluginInformation>(null);
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.testExtensions = new TestExtensions();
-        }
+        // Validate that the default state does not change.
+        Assert.IsNull(_testExtensions.TestDiscoverers);
+    }
 
-        [TestMethod]
-        public void AddExtensionsShouldNotThrowIfExtensionsIsNull()
+    [TestMethod]
+    public void AddExtensionsShouldNotThrowIfExistingExtensionCollectionIsNull()
+    {
+        var testDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
         {
-            this.testExtensions.AddExtension<TestPluginInformation>(null);
+            {
+                "td",
+                new TestDiscovererPluginInformation(typeof(TestExtensionsTests))
+            }
+        };
 
-            // Validate that the default state does not change.
-            Assert.IsNull(this.testExtensions.TestDiscoverers);
-        }
+        _testExtensions.AddExtension(testDiscoverers);
 
-        [TestMethod]
-        public void AddExtensionsShouldNotThrowIfExistingExtensionCollectionIsNull()
+        Assert.IsNotNull(_testExtensions.TestDiscoverers);
+        CollectionAssert.AreEqual(_testExtensions.TestDiscoverers, testDiscoverers);
+
+        // Validate that the others remain same.
+        Assert.IsNull(_testExtensions.TestExecutors);
+        Assert.IsNull(_testExtensions.TestSettingsProviders);
+        Assert.IsNull(_testExtensions.TestLoggers);
+    }
+
+    [TestMethod]
+    public void AddExtensionsShouldAddToExistingExtensionCollection()
+    {
+        var testDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
         {
-            var testDiscoverers = new System.Collections.Generic.Dictionary<string, TestDiscovererPluginInformation>();
+            { "td1", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) },
+            { "td2", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            testDiscoverers.Add(
-                "td",
-                new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        _testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
+
+        // Act.
+        _testExtensions.AddExtension(testDiscoverers);
 
-            this.testExtensions.AddExtension<TestDiscovererPluginInformation>(testDiscoverers);
+        // Validate.
+        var expectedTestExtensions = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) },
+            { "td1", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) },
+            { "td2", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            Assert.IsNotNull(this.testExtensions.TestDiscoverers);
-            CollectionAssert.AreEqual(this.testExtensions.TestDiscoverers, testDiscoverers);
+        CollectionAssert.AreEqual(_testExtensions.TestDiscoverers.Keys, expectedTestExtensions.Keys);
 
-            // Validate that the others remain same.
-            Assert.IsNull(this.testExtensions.TestExecutors);
-            Assert.IsNull(this.testExtensions.TestSettingsProviders);
-            Assert.IsNull(this.testExtensions.TestLoggers);
-        }
+        // Validate that the others remain same.
+        Assert.IsNull(_testExtensions.TestExecutors);
+        Assert.IsNull(_testExtensions.TestSettingsProviders);
+        Assert.IsNull(_testExtensions.TestLoggers);
+    }
 
-        [TestMethod]
-        public void AddExtensionsShouldAddToExistingExtensionCollection()
+    [TestMethod]
+    public void AddExtensionsShouldNotAddAnAlreadyExistingExtensionToTheCollection()
+    {
+        var testDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
         {
-            var testDiscoverers = new System.Collections.Generic.Dictionary<string, TestDiscovererPluginInformation>();
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            testDiscoverers.Add("td1", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            testDiscoverers.Add("td2", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        _testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            this.testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>();
-            this.testExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        // Act.
+        _testExtensions.AddExtension(testDiscoverers);
 
-            // Act.
-            this.testExtensions.AddExtension<TestDiscovererPluginInformation>(testDiscoverers);
+        // Validate.
+        CollectionAssert.AreEqual(_testExtensions.TestDiscoverers.Keys, testDiscoverers.Keys);
 
-            // Validate.
-            var expectedTestExtensions = new Dictionary<string, TestDiscovererPluginInformation>();
-            expectedTestExtensions.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            expectedTestExtensions.Add("td1", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            expectedTestExtensions.Add("td2", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        // Validate that the others remain same.
+        Assert.IsNull(_testExtensions.TestExecutors);
+        Assert.IsNull(_testExtensions.TestSettingsProviders);
+        Assert.IsNull(_testExtensions.TestLoggers);
+    }
 
-            CollectionAssert.AreEqual(this.testExtensions.TestDiscoverers.Keys, expectedTestExtensions.Keys);
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnNullIfNoExtensionsPresent()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-            // Validate that the others remain same.
-            Assert.IsNull(this.testExtensions.TestExecutors);
-            Assert.IsNull(this.testExtensions.TestSettingsProviders);
-            Assert.IsNull(this.testExtensions.TestLoggers);
-        }
+        Assert.IsNull(_testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation));
+    }
 
-        [TestMethod]
-        public void AddExtensionsShouldNotAddAnAlreadyExistingExtensionToTheCollection()
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldNotThrowIfExtensionAssemblyIsNull()
+    {
+        _testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
         {
-            var testDiscoverers = new System.Collections.Generic.Dictionary<string, TestDiscovererPluginInformation>();
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            testDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        Assert.IsNull(_testExtensions.GetExtensionsDiscoveredFromAssembly(null));
+    }
 
-            this.testExtensions.TestDiscoverers = new System.Collections.Generic.Dictionary<string, TestDiscovererPluginInformation>();
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestDiscoverers()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-            this.testExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        _testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) },
+            { "td1", new TestDiscovererPluginInformation(typeof(TestExtensions)) }
+        };
 
-            // Act.
-            this.testExtensions.AddExtension<TestDiscovererPluginInformation>(testDiscoverers);
+        var extensions = _testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
 
-            // Validate.
-            CollectionAssert.AreEqual(this.testExtensions.TestDiscoverers.Keys, testDiscoverers.Keys);
+        var expectedExtensions = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedExtensions.Keys, extensions!.TestDiscoverers!.Keys);
+    }
 
-            // Validate that the others remain same.
-            Assert.IsNull(this.testExtensions.TestExecutors);
-            Assert.IsNull(this.testExtensions.TestSettingsProviders);
-            Assert.IsNull(this.testExtensions.TestLoggers);
-        }
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestExecutors()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnNullIfNoExtensionsPresent()
+        _testExtensions.TestExecutors = new Dictionary<string, TestExecutorPluginInformation>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            { "te", new TestExecutorPluginInformation(typeof(TestExtensionsTests)) },
+            { "te1", new TestExecutorPluginInformation(typeof(TestExtensions)) }
+        };
 
-            Assert.IsNull(this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation));
-        }
+        var extensions = _testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldNotThrowIfExtensionAssemblyIsNull()
+        var expectedExtensions = new Dictionary<string, TestExecutorPluginInformation>
         {
-            this.testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>();
-
-            this.testExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+            { "te", new TestExecutorPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedExtensions.Keys, extensions!.TestExecutors!.Keys);
+    }
 
-            Assert.IsNull(this.testExtensions.GetExtensionsDiscoveredFromAssembly(null));
-        }
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestSettingsProviders()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestDiscoverers()
+        _testExtensions.TestSettingsProviders = new Dictionary<string, TestSettingsProviderPluginInformation>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            { "tsp", new TestSettingsProviderPluginInformation(typeof(TestExtensionsTests)) },
+            { "tsp1", new TestSettingsProviderPluginInformation(typeof(TestExtensions)) }
+        };
 
-            this.testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>();
-            this.testExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            this.testExtensions.TestDiscoverers.Add("td1", new TestDiscovererPluginInformation(typeof(TestExtensions)));
+        var extensions = _testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
 
-            var extensions = this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
+        var expectedExtensions = new Dictionary<string, TestSettingsProviderPluginInformation>
+        {
+            { "tsp", new TestSettingsProviderPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedExtensions.Keys, extensions!.TestSettingsProviders!.Keys);
+    }
 
-            var expectedExtensions = new Dictionary<string, TestDiscovererPluginInformation>();
-            expectedExtensions.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedExtensions.Keys, extensions.TestDiscoverers.Keys);
-        }
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestLoggers()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestExecutors()
+        _testExtensions.TestLoggers = new Dictionary<string, TestLoggerPluginInformation>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            { "tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)) },
+            { "tl1", new TestLoggerPluginInformation(typeof(TestExtensions)) }
+        };
 
-            this.testExtensions.TestExecutors = new Dictionary<string, TestExecutorPluginInformation>();
-            this.testExtensions.TestExecutors.Add("te", new TestExecutorPluginInformation(typeof(TestExtensionsTests)));
-            this.testExtensions.TestExecutors.Add("te1", new TestExecutorPluginInformation(typeof(TestExtensions)));
+        var extensions = _testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
 
-            var extensions = this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
+        var expectedExtensions = new Dictionary<string, TestLoggerPluginInformation>
+        {
+            { "tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedExtensions.Keys, extensions!.TestLoggers!.Keys);
+    }
 
-            var expectedExtensions = new Dictionary<string, TestExecutorPluginInformation>();
-            expectedExtensions.Add("te", new TestExecutorPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedExtensions.Keys, extensions.TestExecutors.Keys);
-        }
+    [TestMethod]
+    public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestDiscoveresAndLoggers()
+    {
+        var assemblyLocation = typeof(TestExtensionsTests).Assembly.Location;
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestSettingsProviders()
+        _testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            this.testExtensions.TestSettingsProviders = new Dictionary<string, TestSettingsProviderPluginInformation>();
-            this.testExtensions.TestSettingsProviders.Add("tsp", new TestSettingsProviderPluginInformation(typeof(TestExtensionsTests)));
-            this.testExtensions.TestSettingsProviders.Add("tsp1", new TestSettingsProviderPluginInformation(typeof(TestExtensions)));
+        _testExtensions.TestLoggers = new Dictionary<string, TestLoggerPluginInformation>
+        {
+            { "tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)) }
+        };
 
-            var extensions = this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
+        var extensions = _testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
 
-            var expectedExtensions = new Dictionary<string, TestSettingsProviderPluginInformation>();
-            expectedExtensions.Add("tsp", new TestSettingsProviderPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedExtensions.Keys, extensions.TestSettingsProviders.Keys);
-        }
+        var expectedDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>
+        {
+            { "td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedDiscoverers.Keys, extensions!.TestDiscoverers!.Keys);
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestLoggers()
+        var expectedLoggers = new Dictionary<string, TestLoggerPluginInformation>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            { "tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)) }
+        };
+        CollectionAssert.AreEqual(expectedLoggers.Keys, extensions.TestLoggers!.Keys);
+    }
 
-            this.testExtensions.TestLoggers = new Dictionary<string, TestLoggerPluginInformation>();
-            this.testExtensions.TestLoggers.Add("tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)));
-            this.testExtensions.TestLoggers.Add("tl1", new TestLoggerPluginInformation(typeof(TestExtensions)));
+    [TestMethod]
+    public void MergedDictionaryOfEmptyDictionariesShouldBeAnEmptyDictionary()
+    {
+        var first = new Dictionary<string, HashSet<string>>();
+        var second = new Dictionary<string, HashSet<string>>();
+        var merged = TestExtensions.CreateMergedDictionary(first, second);
 
-            var extensions = this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
+        // Merging two empty dictionaries should result in an empty dictionary.
+        merged.Should().HaveCount(0);
 
-            var expectedExtensions = new Dictionary<string, TestLoggerPluginInformation>();
-            expectedExtensions.Add("tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedExtensions.Keys, extensions.TestLoggers.Keys);
-        }
+        // Make sure the method is "pure" and returns a new reference.
+        merged.Should().NotBeSameAs(first);
+        merged.Should().NotBeSameAs(second);
+    }
 
-        [TestMethod]
-        public void GetExtensionsDiscoveredFromAssemblyShouldReturnTestDiscoveresAndLoggers()
+    [TestMethod]
+    public void MergedDictionaryOfOneEmptyAndOneNonEmptyDictionaryShouldContainAllTheItemsOfTheNonEmptyDictionary()
+    {
+        var first = new Dictionary<string, HashSet<string>>();
+        var second = new Dictionary<string, HashSet<string>>
+        {
+            { "aaa", new HashSet<string>() }
+        };
+
+        var merged1 = TestExtensions.CreateMergedDictionary(first, second);
+        var merged2 = TestExtensions.CreateMergedDictionary(second, first);
+
+        // Merging one empty dictionary with a not empty one should result in a not empty
+        // dictionary.
+        merged1.Should().HaveCount(1);
+        merged2.Should().HaveCount(1);
+        merged1.Should().ContainKey("aaa");
+        merged2.Should().ContainKey("aaa");
+
+        // Make sure the method stays "pure" and returns a new reference regardless of the input.
+        merged1.Should().NotBeSameAs(first);
+        merged1.Should().NotBeSameAs(second);
+        merged2.Should().NotBeSameAs(first);
+        merged2.Should().NotBeSameAs(second);
+        merged1.Should().NotBeSameAs(merged2);
+    }
+
+    [TestMethod]
+    public void MergedDictionaryShouldBeEquivalentToTheExpectedDictionary()
+    {
+        var first = new Dictionary<string, HashSet<string>>
         {
-            var assemblyLocation = typeof(TestExtensionsTests).GetTypeInfo().Assembly.Location;
+            // Merged with "key1" from the next set.
+            { "key1", ["ext1", "ext2", "ext3"] },
+            // Empty hashset, will be removed from the result.
+            { "key2", [] },
+            // Added as is.
+            { "key5", ["ext1", "ext2"] }
+        };
+        var second = new Dictionary<string, HashSet<string>>
+        {
+            // Merged with "key1" from the previous set.
+            { "key1", ["ext2", "ext3", "ext3", "ext4", "ext5"] },
+            // Empty hashset, will be removed from the result.
+            { "key2", [] },
+            // Empty hashset, will be removed from the result.
+            { "key3", [] },
+            // Added as is.
+            { "key4", ["ext1"] }
+        };
+        var expected = new Dictionary<string, HashSet<string>>
+        {
+            { "key1", ["ext1", "ext2", "ext3", "ext4", "ext5"] },
+            { "key4", ["ext1"] },
+            { "key5", ["ext1", "ext2"] }
+        };
 
-            this.testExtensions.TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>();
-            this.testExtensions.TestDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
+        // Merge the two dictionaries.
+        var merged = TestExtensions.CreateMergedDictionary(first, second);
 
-            this.testExtensions.TestLoggers = new Dictionary<string, TestLoggerPluginInformation>();
-            this.testExtensions.TestLoggers.Add("tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)));
+        // Make sure the merged dictionary has the exact same keys as the expected dictionary.
+        merged.Should().HaveCount(expected.Count);
+        merged.Should().ContainKeys(expected.Keys);
+        expected.Should().ContainKeys(merged.Keys);
+
+        // Make sure the hashsets for each key are equal.
+        merged.Values.Should().BeEquivalentTo(expected.Values);
+    }
+
+    [TestMethod]
+    public void AddExtensionTelemetryShouldAddJsonFormattedDiscoveredExtensionsTelemetry()
+    {
+        var telemetryData = new Dictionary<string, object>();
+        var extensions = new Dictionary<string, HashSet<string>>
+        {
+            { "key1", ["ext1", "ext2", "ext3", "ext4", "ext5"] },
+            { "key4", ["ext1"] },
+            { "key5", ["ext1", "ext2"] }
+        };
 
-            var extensions = this.testExtensions.GetExtensionsDiscoveredFromAssembly(assemblyLocation);
+        var expectedTelemetry =
+            @"{""key1"":[""ext1"",""ext2"",""ext3"",""ext4"",""ext5""],"
+            + @"""key4"":[""ext1""],"
+            + @"""key5"":[""ext1"",""ext2""]}";
 
-            var expectedDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>();
-            expectedDiscoverers.Add("td", new TestDiscovererPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedDiscoverers.Keys, extensions.TestDiscoverers.Keys);
+        TestExtensions.AddExtensionTelemetry(telemetryData, extensions);
 
-            var expectedLoggers = new Dictionary<string, TestLoggerPluginInformation>();
-            expectedLoggers.Add("tl", new TestLoggerPluginInformation(typeof(TestExtensionsTests)));
-            CollectionAssert.AreEqual(expectedLoggers.Keys, extensions.TestLoggers.Keys);
-        }
+        telemetryData.Should().ContainKey(TelemetryDataConstants.DiscoveredExtensions);
+        telemetryData[TelemetryDataConstants.DiscoveredExtensions].Should().BeEquivalentTo(expectedTelemetry);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestLoggerPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestLoggerPluginInformationTests.cs
index 4bd1640354..ea02bdc988 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestLoggerPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestLoggerPluginInformationTests.cs
@@ -1,73 +1,71 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
+
+[TestClass]
+public class TestLoggerPluginInformationTests
 {
-    using System;
-    using System.Linq;
+    private TestLoggerPluginInformation? _testPluginInformation;
+
+    internal const string DefaultExtensionUri = "executor://unittest";
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    internal const string DefaultFriendlyName = "excel";
+
+    [TestMethod]
+    public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
+    {
+        _testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithNoFriendlyName));
+        Assert.AreEqual(typeof(DummyTestExtensionWithNoFriendlyName).AssemblyQualifiedName, _testPluginInformation.AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void IdentifierDataShouldReturnExtensionUri()
+    {
+        _testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
+        Assert.AreEqual(DefaultExtensionUri, _testPluginInformation.IdentifierData);
+    }
+
+    [TestMethod]
+    public void FriendlyNameShouldReturnEmptyIfALoggerDoesNotHaveOne()
+    {
+        _testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithNoFriendlyName));
+        Assert.IsNotNull(_testPluginInformation.FriendlyName);
+        Assert.AreEqual(string.Empty, _testPluginInformation.FriendlyName);
+    }
 
-    [TestClass]
-    public class TestLoggerPluginInformationTests
+    [TestMethod]
+    public void FriendlyNameShouldReturnFriendlyNameOfALogger()
     {
-        private TestLoggerPluginInformation testPluginInformation;
-
-        internal const string DefaultExtensionURI = "executor://unittest";
-
-        internal const string DefaultFriendlyName = "excel";
-
-        [TestMethod]
-        public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
-        {
-            this.testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithNoFriendlyName));
-            Assert.AreEqual(typeof(DummyTestExtensionWithNoFriendlyName).AssemblyQualifiedName, this.testPluginInformation.AssemblyQualifiedName);
-        }
-
-        [TestMethod]
-        public void IdentifierDataShouldReturnExtensionUri()
-        {
-            this.testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
-            Assert.AreEqual(DefaultExtensionURI, this.testPluginInformation.IdentifierData);
-        }
-
-        [TestMethod]
-        public void FriendlyNameShouldReturnEmptyIfALoggerDoesNotHaveOne()
-        {
-            this.testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithNoFriendlyName));
-            Assert.IsNotNull(this.testPluginInformation.FriendlyName);
-            Assert.AreEqual(string.Empty, this.testPluginInformation.FriendlyName);
-        }
-
-        [TestMethod]
-        public void FriendlyNameShouldReturnFriendlyNameOfALogger()
-        {
-            this.testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
-            Assert.AreEqual(DefaultFriendlyName, this.testPluginInformation.FriendlyName);
-        }
-
-        [TestMethod]
-        public void MetadataShouldReturnExtensionUriAndFriendlyName()
-        {
-            this.testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
-
-            CollectionAssert.AreEqual(new object[] { DefaultExtensionURI, DefaultFriendlyName }, this.testPluginInformation.Metadata.ToArray());
-        }
-
-        #region Implementation
-
-        private class DummyTestExtensionWithNoFriendlyName
-        {
-        }
-
-        [FriendlyName(TestLoggerPluginInformationTests.DefaultFriendlyName)]
-        [ExtensionUri(TestLoggerPluginInformationTests.DefaultExtensionURI)]
-        private class DummyTestExtensionWithFriendlyName
-        {
-        }
-
-        #endregion
+        _testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
+        Assert.AreEqual(DefaultFriendlyName, _testPluginInformation.FriendlyName);
     }
+
+    [TestMethod]
+    public void MetadataShouldReturnExtensionUriAndFriendlyName()
+    {
+        _testPluginInformation = new TestLoggerPluginInformation(typeof(DummyTestExtensionWithFriendlyName));
+
+        CollectionAssert.AreEqual(new object[] { DefaultExtensionUri, DefaultFriendlyName }, _testPluginInformation.Metadata.ToArray());
+    }
+
+    #region Implementation
+
+    private class DummyTestExtensionWithNoFriendlyName
+    {
+    }
+
+    [FriendlyName(DefaultFriendlyName)]
+    [ExtensionUri(DefaultExtensionUri)]
+    private class DummyTestExtensionWithFriendlyName
+    {
+    }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestPluginInformationTests.cs
index 4b398259ef..21623b39ef 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestPluginInformationTests.cs
@@ -1,50 +1,50 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
+
+[TestClass]
+public class TestPluginInformationTests
 {
-    using System;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly TestableTestPluginInformation _testPluginInformation;
 
-    [TestClass]
-    public class TestPluginInformationTests
+    public TestPluginInformationTests()
     {
-        private TestableTestPluginInformation testPluginInformation;
-
-        public TestPluginInformationTests()
-        {
-            this.testPluginInformation = new TestableTestPluginInformation(typeof(TestPluginInformationTests));
-        }
-
-        [TestMethod]
-        public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
-        {
-            Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, this.testPluginInformation.AssemblyQualifiedName);
-        }
-
-        [TestMethod]
-        public void IdentifierDataShouldReturnTestExtensionTypesName()
-        {
-            Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, this.testPluginInformation.IdentifierData);
-        }
-
-        [TestMethod]
-        public void MetadataShouldReturnTestExtensionTypesAssemblyQualifiedName()
-        {
-            CollectionAssert.AreEqual(new object[] { typeof(TestPluginInformationTests).AssemblyQualifiedName }, this.testPluginInformation.Metadata.ToArray());
-        }
+        _testPluginInformation = new TestableTestPluginInformation(typeof(TestPluginInformationTests));
     }
 
-    #region Implementation
+    [TestMethod]
+    public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
+    {
+        Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, _testPluginInformation.AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void IdentifierDataShouldReturnTestExtensionTypesName()
+    {
+        Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, _testPluginInformation.IdentifierData);
+    }
 
-    public class TestableTestPluginInformation : TestPluginInformation
+    [TestMethod]
+    public void MetadataShouldReturnTestExtensionTypesAssemblyQualifiedName()
     {
-        public TestableTestPluginInformation(Type testExtensionType) : base(testExtensionType)
-        {
-        }
+        CollectionAssert.AreEqual(new object[] { typeof(TestPluginInformationTests).AssemblyQualifiedName! }, _testPluginInformation.Metadata.ToArray());
     }
+}
 
-    #endregion
+#region Implementation
+
+public class TestableTestPluginInformation : TestPluginInformation
+{
+    public TestableTestPluginInformation(Type testExtensionType) : base(testExtensionType)
+    {
+    }
 }
+
+#endregion
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestSettingsProviderPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestSettingsProviderPluginInformationTests.cs
index c200738a70..dad5365f98 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestSettingsProviderPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestSettingsProviderPluginInformationTests.cs
@@ -1,69 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities
-{
-    using System;
-    using System.Linq;
+using System.Linq;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class TestSettingsProviderPluginInformationTests
-    {
-        private TestSettingsProviderPluginInformation testPluginInformation;
+namespace TestPlatform.Common.UnitTests.ExtensionFramework.Utilities;
 
-        private const string DefaultSettingsName = "mstestsettings";
+[TestClass]
+public class TestSettingsProviderPluginInformationTests
+{
+    private TestSettingsProviderPluginInformation? _testPluginInformation;
 
-        [TestMethod]
-        public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
-        {
-            this.testPluginInformation = new TestSettingsProviderPluginInformation(typeof(TestPluginInformationTests));
-            Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, this.testPluginInformation.AssemblyQualifiedName);
-        }
+    private const string DefaultSettingsName = "mstestsettings";
 
-        [TestMethod]
-        public void IdentifierDataShouldReturnSettingsName()
-        {
-            this.testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
-            Assert.AreEqual(DefaultSettingsName, this.testPluginInformation.IdentifierData);
-        }
+    [TestMethod]
+    public void AssemblyQualifiedNameShouldReturnTestExtensionTypesName()
+    {
+        _testPluginInformation = new TestSettingsProviderPluginInformation(typeof(TestPluginInformationTests));
+        Assert.AreEqual(typeof(TestPluginInformationTests).AssemblyQualifiedName, _testPluginInformation.AssemblyQualifiedName);
+    }
 
-        [TestMethod]
-        public void MetadataShouldReturnSettingsProviderName()
-        {
-            this.testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
-            CollectionAssert.AreEqual(new object[] { DefaultSettingsName }, this.testPluginInformation.Metadata.ToArray());
-        }
+    [TestMethod]
+    public void IdentifierDataShouldReturnSettingsName()
+    {
+        _testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
+        Assert.AreEqual(DefaultSettingsName, _testPluginInformation.IdentifierData);
+    }
 
-        [TestMethod]
-        public void SettingsNameShouldReturnEmptyIfASettingsProviderDoesNotHaveOne()
-        {
-            this.testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithoutSettingsName));
-            Assert.IsNotNull(this.testPluginInformation.SettingsName);
-            Assert.AreEqual(string.Empty, this.testPluginInformation.SettingsName);
-        }
+    [TestMethod]
+    public void MetadataShouldReturnSettingsProviderName()
+    {
+        _testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
+        CollectionAssert.AreEqual(new object[] { DefaultSettingsName }, _testPluginInformation.Metadata.ToArray());
+    }
 
-        [TestMethod]
-        public void SettingsNameShouldReturnExtensionUriOfAnExtension()
-        {
-            this.testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
-            Assert.AreEqual(DefaultSettingsName, this.testPluginInformation.SettingsName);
-        }
+    [TestMethod]
+    public void SettingsNameShouldReturnEmptyIfASettingsProviderDoesNotHaveOne()
+    {
+        _testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithoutSettingsName));
+        Assert.IsNotNull(_testPluginInformation.SettingsName);
+        Assert.AreEqual(string.Empty, _testPluginInformation.SettingsName);
+    }
 
-        #region Implementation
+    [TestMethod]
+    public void SettingsNameShouldReturnExtensionUriOfAnExtension()
+    {
+        _testPluginInformation = new TestSettingsProviderPluginInformation(typeof(DummySettingProviderWithSettingsName));
+        Assert.AreEqual(DefaultSettingsName, _testPluginInformation.SettingsName);
+    }
 
-        private class DummySettingProviderWithoutSettingsName
-        {
-        }
+    #region Implementation
 
-        [SettingsName(DefaultSettingsName)]
-        private class DummySettingProviderWithSettingsName
-        {
-        }
+    private class DummySettingProviderWithoutSettingsName
+    {
+    }
 
-        #endregion
+    [SettingsName(DefaultSettingsName)]
+    private class DummySettingProviderWithSettingsName
+    {
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/ConditionTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/ConditionTests.cs
index d28627c0c2..ab7d08c6fc 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/ConditionTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/ConditionTests.cs
@@ -1,237 +1,238 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Filtering
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Filtering;
+
+[TestClass]
+public class ConditionTests
 {
-    using System;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ConditionTests
-    {
-        [TestMethod]
-        public void ParseShouldThrownFormatExceptionOnNullConditionString()
-        {
-            string conditionString = null;
-            Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
-        }
-
-        [TestMethod]
-        public void ParseShouldThrownFormatExceptionOnEmptyConditionString()
-        {
-            var conditionString = "";
-            Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
-        }
-
-        [TestMethod]
-        public void ParseShouldThrownFormatExceptionOnIncompleteConditionString()
-        {
-            var conditionString = "PropertyName=";
-            Assert.ThrowsException<FormatException>( () => Condition.Parse(conditionString));
-        }
-
-        [TestMethod]
-        public void ParseShouldCreateDefaultConditionWhenOnlyPropertyValuePassed()
-        {
-            var conditionString = "ABC";
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual(Condition.DefaultPropertyName, condition.Name);
-            Assert.AreEqual(Operation.Contains, condition.Operation);
-            Assert.AreEqual(conditionString, condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldCreateProperConditionOnValidConditionString()
-        {
-            var conditionString = "PropertyName=PropertyValue";
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("PropertyName", condition.Name);
-            Assert.AreEqual(Operation.Equal, condition.Operation);
-            Assert.AreEqual("PropertyValue", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldHandleEscapedString()
-        {
-            var conditionString = @"FullyQualifiedName=TestClass1\(""hello""\).TestMethod\(1.5\)";
-
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("FullyQualifiedName", condition.Name);
-            Assert.AreEqual(Operation.Equal, condition.Operation);
-            Assert.AreEqual(@"TestClass1(""hello"").TestMethod(1.5)", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldHandleEscapedBang()
-        {
-            var conditionString = @"FullyQualifiedName!=TestClass1\(""\!""\).TestMethod\(1.5\)";
-
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("FullyQualifiedName", condition.Name);
-            Assert.AreEqual(Operation.NotEqual, condition.Operation);
-            Assert.AreEqual(@"TestClass1(""!"").TestMethod(1.5)", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldHandleEscapedNotEqual()
-        {
-            var conditionString = @"FullyQualifiedName!=TestClass1\(""\!\=""\).TestMethod\(1.5\)";
-
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("FullyQualifiedName", condition.Name);
-            Assert.AreEqual(Operation.NotEqual, condition.Operation);
-            Assert.AreEqual(@"TestClass1(""!="").TestMethod(1.5)", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldHandleEscapedTilde()
-        {
-            var conditionString = @"FullyQualifiedName~TestClass1\(""\~""\).TestMethod\(1.5\)";
-
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("FullyQualifiedName", condition.Name);
-            Assert.AreEqual(Operation.Contains, condition.Operation);
-            Assert.AreEqual(@"TestClass1(""~"").TestMethod(1.5)", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseShouldHandleEscapedNotTilde()
-        {
-            var conditionString = @"FullyQualifiedName!~TestClass1\(""\!\~""\).TestMethod\(1.5\)";
-
-            Condition condition = Condition.Parse(conditionString);
-            Assert.AreEqual("FullyQualifiedName", condition.Name);
-            Assert.AreEqual(Operation.NotContains, condition.Operation);
-            Assert.AreEqual(@"TestClass1(""!~"").TestMethod(1.5)", condition.Value);
-        }
-
-        [TestMethod]
-        public void ParseStringWithSingleUnescapedBangThrowsFormatException1()
-        {
-            var conditionString = @"FullyQualifiedName=Test1(""!"")";
-
-            Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
-        }
-
-        [TestMethod]
-        public void ParseStringWithSingleUnescapedBangThrowsFormatException2()
-        {
-            var conditionString = @"FullyQualifiedName!Test1()";
-
-            Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
-        }
-
-        [TestMethod]
-        public void TokenizeNullThrowsArgumentNullException()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => Condition.TokenizeFilterConditionString(null), "str");
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedBang()
-        {
-            var conditionString = @"FullyQualifiedName=TestMethod\(""\!""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("=", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\!""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedNotEqual1()
-        {
-            var conditionString = @"FullyQualifiedName=TestMethod\(""\!\=""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("=", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\!\=""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedNotEqual2()
-        {
-            var conditionString = @"FullyQualifiedName!=TestMethod\(""\!\=""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("!=", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\!\=""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedBackslash()
-        {
-            var conditionString = @"FullyQualifiedName=TestMethod\(""\\""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("=", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\\""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedTilde()
-        {
-            var conditionString = @"FullyQualifiedName~TestMethod\(""\~""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("~", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\~""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleEscapedNotTilde()
-        {
-            var conditionString = @"FullyQualifiedName!~TestMethod\(""\!\~""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(3, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("!~", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""\!\~""\)", tokens[2]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleSingleUnescapedBang()
-        {
-            var conditionString = @"FullyQualifiedName!=TestMethod\(""!""\)";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(5, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("!=", tokens[1]);
-            Assert.AreEqual(@"TestMethod\(""", tokens[2]);
-            Assert.AreEqual("!", tokens[3]);
-            Assert.AreEqual(@"""\)", tokens[4]);
-        }
-
-        [TestMethod]
-        public void TokenizeConditionShouldHandleSingleBangAtEnd()
-        {
-            var conditionString = "FullyQualifiedName!";
-
-            var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
-
-            Assert.AreEqual(2, tokens.Length);
-            Assert.AreEqual("FullyQualifiedName", tokens[0]);
-            Assert.AreEqual("!", tokens[1]);
-        }
+    [TestMethod]
+    public void ParseShouldThrownFormatExceptionOnNullConditionString()
+    {
+        string? conditionString = null;
+        Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
+    }
+
+    [TestMethod]
+    public void ParseShouldThrownFormatExceptionOnEmptyConditionString()
+    {
+        var conditionString = "";
+        Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
+    }
+
+    [TestMethod]
+    public void ParseShouldThrownFormatExceptionOnIncompleteConditionString()
+    {
+        var conditionString = "PropertyName=";
+        Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
+    }
+
+    [TestMethod]
+    public void ParseShouldCreateDefaultConditionWhenOnlyPropertyValuePassed()
+    {
+        var conditionString = "ABC";
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual(Condition.DefaultPropertyName, condition.Name);
+        Assert.AreEqual(Operation.Contains, condition.Operation);
+        Assert.AreEqual(conditionString, condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldCreateProperConditionOnValidConditionString()
+    {
+        var conditionString = "PropertyName=PropertyValue";
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("PropertyName", condition.Name);
+        Assert.AreEqual(Operation.Equal, condition.Operation);
+        Assert.AreEqual("PropertyValue", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldHandleEscapedString()
+    {
+        var conditionString = @"FullyQualifiedName=TestClass1\(""hello""\).TestMethod\(1.5\)";
+
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("FullyQualifiedName", condition.Name);
+        Assert.AreEqual(Operation.Equal, condition.Operation);
+        Assert.AreEqual(@"TestClass1(""hello"").TestMethod(1.5)", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldHandleEscapedBang()
+    {
+        var conditionString = @"FullyQualifiedName!=TestClass1\(""\!""\).TestMethod\(1.5\)";
+
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("FullyQualifiedName", condition.Name);
+        Assert.AreEqual(Operation.NotEqual, condition.Operation);
+        Assert.AreEqual(@"TestClass1(""!"").TestMethod(1.5)", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldHandleEscapedNotEqual()
+    {
+        var conditionString = @"FullyQualifiedName!=TestClass1\(""\!\=""\).TestMethod\(1.5\)";
+
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("FullyQualifiedName", condition.Name);
+        Assert.AreEqual(Operation.NotEqual, condition.Operation);
+        Assert.AreEqual(@"TestClass1(""!="").TestMethod(1.5)", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldHandleEscapedTilde()
+    {
+        var conditionString = @"FullyQualifiedName~TestClass1\(""\~""\).TestMethod\(1.5\)";
+
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("FullyQualifiedName", condition.Name);
+        Assert.AreEqual(Operation.Contains, condition.Operation);
+        Assert.AreEqual(@"TestClass1(""~"").TestMethod(1.5)", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseShouldHandleEscapedNotTilde()
+    {
+        var conditionString = @"FullyQualifiedName!~TestClass1\(""\!\~""\).TestMethod\(1.5\)";
+
+        Condition condition = Condition.Parse(conditionString);
+        Assert.AreEqual("FullyQualifiedName", condition.Name);
+        Assert.AreEqual(Operation.NotContains, condition.Operation);
+        Assert.AreEqual(@"TestClass1(""!~"").TestMethod(1.5)", condition.Value);
+    }
+
+    [TestMethod]
+    public void ParseStringWithSingleUnescapedBangThrowsFormatException1()
+    {
+        var conditionString = @"FullyQualifiedName=Test1(""!"")";
+
+        Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
+    }
+
+    [TestMethod]
+    public void ParseStringWithSingleUnescapedBangThrowsFormatException2()
+    {
+        var conditionString = @"FullyQualifiedName!Test1()";
+
+        Assert.ThrowsException<FormatException>(() => Condition.Parse(conditionString));
+    }
+
+    [TestMethod]
+    public void TokenizeNullThrowsArgumentNullException()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => Condition.TokenizeFilterConditionString(null!), "str");
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedBang()
+    {
+        var conditionString = @"FullyQualifiedName=TestMethod\(""\!""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("=", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\!""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedNotEqual1()
+    {
+        var conditionString = @"FullyQualifiedName=TestMethod\(""\!\=""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("=", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\!\=""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedNotEqual2()
+    {
+        var conditionString = @"FullyQualifiedName!=TestMethod\(""\!\=""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("!=", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\!\=""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedBackslash()
+    {
+        var conditionString = @"FullyQualifiedName=TestMethod\(""\\""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("=", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\\""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedTilde()
+    {
+        var conditionString = @"FullyQualifiedName~TestMethod\(""\~""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("~", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\~""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleEscapedNotTilde()
+    {
+        var conditionString = @"FullyQualifiedName!~TestMethod\(""\!\~""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(3, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("!~", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""\!\~""\)", tokens[2]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleSingleUnescapedBang()
+    {
+        var conditionString = @"FullyQualifiedName!=TestMethod\(""!""\)";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(5, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("!=", tokens[1]);
+        Assert.AreEqual(@"TestMethod\(""", tokens[2]);
+        Assert.AreEqual("!", tokens[3]);
+        Assert.AreEqual(@"""\)", tokens[4]);
+    }
+
+    [TestMethod]
+    public void TokenizeConditionShouldHandleSingleBangAtEnd()
+    {
+        var conditionString = "FullyQualifiedName!";
+
+        var tokens = Condition.TokenizeFilterConditionString(conditionString).ToArray();
+
+        Assert.AreEqual(2, tokens.Length);
+        Assert.AreEqual("FullyQualifiedName", tokens[0]);
+        Assert.AreEqual("!", tokens[1]);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs
index 3ee70eb7b5..4608a2d494 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FastFilterTests.cs
@@ -1,453 +1,452 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Filtering
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Filtering;
+
+[TestClass]
+public class FastFilterTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using System.Collections.Immutable;
-
-    [TestClass]
-    public class FastFilterTests
+    [TestMethod]
+    public void MultipleOperatorKindsShouldNotCreateFastFilter()
     {
-        [TestMethod]
-        public void MultipleOperatorKindsShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name=Test1&(Name=Test2|NameTest3)");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name=Test1&(Name=Test2|NameTest3)");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-        }
+        Assert.IsTrue(fastFilter == null);
+    }
 
-        [TestMethod]
-        public void MultipleOperationKindsShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name!=TestClass1&Category=Nightly");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void MultipleOperationKindsShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name!=TestClass1&Category=Nightly");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-        }
+        Assert.IsTrue(fastFilter == null);
+    }
 
-        [TestMethod]
-        public void ContainsOperationShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name~TestClass1");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void ContainsOperationShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name~TestClass1");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-        }
+        Assert.IsTrue(fastFilter == null);
+    }
 
-        [TestMethod]
-        public void NotContainsOperationShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name!~TestClass1");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void NotContainsOperationShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name!~TestClass1");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-        }
+        Assert.IsTrue(fastFilter == null);
+    }
 
-        [TestMethod]
-        public void AndOperatorAndEqualsOperationShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name=Test1&Name=Test2");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void AndOperatorAndEqualsOperationShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name=Test1&Name=Test2");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
-        }
+        Assert.IsTrue(fastFilter == null);
+        Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
+    }
 
-        [TestMethod]
-        public void OrOperatorAndNotEqualsOperationShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Name!=Test1|Name!=Test2");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void OrOperatorAndNotEqualsOperationShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Name!=Test1|Name!=Test2");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsTrue(fastFilter == null);
-            Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
-        }
+        Assert.IsTrue(fastFilter == null);
+        Assert.IsTrue(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
+    }
 
-        [TestMethod]
-        public void FastFilterWithSingleEqualsClause()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void FastFilterWithSingleEqualsClause()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1" };
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1" };
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test2"));
+    }
 
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test2"));
+    [TestMethod]
+    public void ValidForPropertiesHandlesBigFilteringExpressions()
+    {
+        StringBuilder testCaseFilter = new("Category=Test1");
+
+        for (int i = 0; i < 1e5; i++)  // creating a 100k filter cases string
+        {
+            testCaseFilter.Append("|Test2");
         }
 
-        [TestMethod]
-        public void FastFilterWithMultipleEqualsClause()
+        var filterExpressionWrapper = new FilterExpressionWrapper(testCaseFilter.ToString());
+        string[]? invalidProperties = filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null);
+
+        Assert.IsNotNull(invalidProperties);
+        Assert.AreEqual(invalidProperties.Length, 1);
+        Assert.AreEqual(invalidProperties[0], "Category");
+    }
+
+    [TestMethod]
+    public void EvaluateHandlesBigFilteringExpressions()
+    {
+        StringBuilder testCaseFilter = new("Test1");
+        // Create filter with 100k conditions.
+        for (int i = 0; i < 1e5; i++)
         {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|FullyQualifiedName=Test2|FullyQualifiedName=Test3");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+            testCaseFilter.Append("|Test2");
+        }
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
+        var filterExpressionWrapper = new FilterExpressionWrapper(testCaseFilter.ToString());
+        Assert.IsTrue(filterExpressionWrapper.Evaluate(s => "Test1"));
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    [TestMethod]
+    public void FastFilterWithMultipleEqualsClause()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|FullyQualifiedName=Test2|FullyQualifiedName=Test3");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
 
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "test2"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "test3"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test4"));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithMultipleEqualsClauseAndParentheses()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|(FullyQualifiedName=Test2|FullyQualifiedName=Test3)");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "test2"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "test3"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test4"));
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    [TestMethod]
+    public void FastFilterWithMultipleEqualsClauseAndParentheses()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|(FullyQualifiedName=Test2|FullyQualifiedName=Test3)");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
 
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test2"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test3"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test4"));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithMultipleEqualsClauseAndRegex()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|FullyQualifiedName=Test2|FullyQualifiedName=Test3", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
-            var fastFilter = filterExpressionWrapper.fastFilter;
-
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
-
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
-
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
-
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test2"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test3"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test1 (123)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test2(123)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test3  (123)"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test4"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test4 ()"));
-        }
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
 
-        [TestMethod]
-        public void FastFilterWithMultipleEqualsClauseForMultiplePropertyValues()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Category=UnitTest|Category=PerfTest", null);
-            var fastFilter = filterExpressionWrapper.fastFilter;
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test2"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test3"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test4"));
+    }
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "unittest", "perftest" };
+    [TestMethod]
+    public void FastFilterWithMultipleEqualsClauseAndRegex()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|FullyQualifiedName=Test2|FullyQualifiedName=Test3", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
+        var fastFilter = filterExpressionWrapper.FastFilter;
+
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
+
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test2"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test3"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test1 (123)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test2(123)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test3  (123)"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test4"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test4 ()"));
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("Category", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    [TestMethod]
+    public void FastFilterWithMultipleEqualsClauseForMultiplePropertyValues()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Category=UnitTest|Category=PerfTest", null);
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "unittest", "perftest" };
 
-            Assert.IsTrue(fastFilter.Evaluate((s) => new[] { "UnitTest" }));
-            Assert.IsTrue(fastFilter.Evaluate((s) => new[] { "PerfTest" }));
-            Assert.IsTrue(fastFilter.Evaluate((s) => new[] { "UnitTest", "PerfTest" }));
-            Assert.IsTrue(fastFilter.Evaluate((s) => new[] { "UnitTest", "IntegrationTest" }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => new[] { "IntegrationTest" }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => null));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("Category", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithMultipleEqualsClauseAndRegexReplacement()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=TestClass.Test1|FullyQualifiedName=TestClass.Test2|FullyQualifiedName=TestClass.Test3", new FilterOptions() { FilterRegEx = @"\s*\([^\)]*\)", FilterRegExReplacement = "" });
-            var fastFilter = filterExpressionWrapper.fastFilter;
-
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "testclass.test1", "testclass.test2", "testclass.test3" };
-
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
-
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
-
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass(1).Test1"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass().Test1()"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass(1, 2).Test2"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass.Test3 (abcd1234)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass(1).Test1(123)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass(1, 2).Test2(x:1, y:2, z:3)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "TestClass(1, 2,3).Test3(1)  (123)"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "TestClass1.Test1"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "TestClass1(1).Test1"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "TestClass((1, 2, 3)).Test1"));
-        }
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null));
 
-        [TestMethod]
-        public void FastFilterWithSingleNotEqualsClause()
-        {
-            var filterString = "FullyQualifiedName!=Test1";
-            CheckFastFailureWithNotEqualClause(filterString);
-        }
+        Assert.IsTrue(fastFilter.Evaluate(s => new[] { "UnitTest" }));
+        Assert.IsTrue(fastFilter.Evaluate(s => new[] { "PerfTest" }));
+        Assert.IsTrue(fastFilter.Evaluate(s => new[] { "UnitTest", "PerfTest" }));
+        Assert.IsTrue(fastFilter.Evaluate(s => new[] { "UnitTest", "IntegrationTest" }));
+        Assert.IsFalse(fastFilter.Evaluate(s => new[] { "IntegrationTest" }));
+        Assert.IsFalse(fastFilter.Evaluate(s => null));
+    }
 
-        [TestMethod]
-        public void FastFilterWithNotEqualsClauseAndDifferentCase()
-        {
-            var filterString = "FullyQualifiedName!=Test1&FullyQualifiedName!=test1";
-            CheckFastFailureWithNotEqualClause(filterString);
-        }
+    [TestMethod]
+    public void FastFilterWithMultipleEqualsClauseAndRegexReplacement()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=TestClass.Test1|FullyQualifiedName=TestClass.Test2|FullyQualifiedName=TestClass.Test3", new FilterOptions() { FilterRegEx = @"\s*\([^\)]*\)", FilterRegExReplacement = "" });
+        var fastFilter = filterExpressionWrapper.FastFilter;
+
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "testclass.test1", "testclass.test2", "testclass.test3" };
+
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass(1).Test1"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass().Test1()"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass(1, 2).Test2"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass.Test3 (abcd1234)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass(1).Test1(123)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass(1, 2).Test2(x:1, y:2, z:3)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "TestClass(1, 2,3).Test3(1)  (123)"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "TestClass1.Test1"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "TestClass1(1).Test1"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "TestClass((1, 2, 3)).Test1"));
+    }
 
-        private void CheckFastFailureWithNotEqualClause(string filterString)
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper(filterString);
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void FastFilterWithSingleNotEqualsClause()
+    {
+        var filterString = "FullyQualifiedName!=Test1";
+        CheckFastFailureWithNotEqualClause(filterString);
+    }
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1" };
+    [TestMethod]
+    public void FastFilterWithNotEqualsClauseAndDifferentCase()
+    {
+        var filterString = "FullyQualifiedName!=Test1&FullyQualifiedName!=test1";
+        CheckFastFailureWithNotEqualClause(filterString);
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    private static void CheckFastFailureWithNotEqualClause(string filterString)
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper(filterString);
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1" };
 
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test2"));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithMultipleNotEqualsClause()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&FullyQualifiedName!=Test2&FullyQualifiedName!=Test3");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test2"));
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    [TestMethod]
+    public void FastFilterWithMultipleNotEqualsClause()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&FullyQualifiedName!=Test2&FullyQualifiedName!=Test3");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
 
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test2"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test3"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test4"));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithMultipleNotEqualsClauseAndRegex()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&FullyQualifiedName!=Test2&FullyQualifiedName!=Test3", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
-            var fastFilter = filterExpressionWrapper.fastFilter;
-
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
-
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
-
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
-
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test1"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test2"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test3"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test1 (123)"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test2(123)"));
-            Assert.IsFalse(fastFilter.Evaluate((s) => "Test3  (123)"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test4"));
-            Assert.IsTrue(fastFilter.Evaluate((s) => "Test4 (123)"));
-        }
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
 
-        [TestMethod]
-        public void FastFilterWithMultipleNotEqualsClauseForMultiplePropertyValues()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("Category!=UnitTest&Category!=PerfTest", null);
-            var fastFilter = filterExpressionWrapper.fastFilter;
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test2"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test3"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test4"));
+    }
 
-            var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "unittest", "perftest" };
+    [TestMethod]
+    public void FastFilterWithMultipleNotEqualsClauseAndRegex()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&FullyQualifiedName!=Test2&FullyQualifiedName!=Test3", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
+        var fastFilter = filterExpressionWrapper.FastFilter;
+
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "test1", "test2", "test3" };
+
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("FullyQualifiedName", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null));
+
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test1"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test2"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test3"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test1 (123)"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test2(123)"));
+        Assert.IsFalse(fastFilter.Evaluate(s => "Test3  (123)"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test4"));
+        Assert.IsTrue(fastFilter.Evaluate(s => "Test4 (123)"));
+    }
 
-            Assert.IsTrue(fastFilter != null);
-            Assert.AreEqual("Category", fastFilter.FilterProperties.Keys.Single());
-            Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
+    [TestMethod]
+    public void FastFilterWithMultipleNotEqualsClauseForMultiplePropertyValues()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("Category!=UnitTest&Category!=PerfTest", null);
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null));
+        var expectedFilterValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "unittest", "perftest" };
 
-            Assert.IsFalse(fastFilter.Evaluate((s) => new[] { "UnitTest" }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => new[] { "PerfTest" }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => new[] { "UnitTest", "PerfTest" }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => new[] { "UnitTest", "IntegrationTest" }));
-            Assert.IsTrue(fastFilter.Evaluate((s) => new[] { "IntegrationTest" }));
-            Assert.IsTrue(fastFilter.Evaluate((s) => null));
-        }
+        Assert.IsTrue(fastFilter != null);
+        Assert.AreEqual("Category", fastFilter.FilterProperties.Keys.Single());
+        Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(expectedFilterValues.SetEquals(fastFilter.FilterProperties.Values.Single()));
 
-        [TestMethod]
-        public void FastFilterWithWithRegexParseErrorShouldNotCreateFastFilter()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test", new FilterOptions() { FilterRegEx = @"^[^\s\(]+\1" });
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null));
 
-            Assert.IsNull(filterExpressionWrapper.fastFilter);
-            Assert.IsFalse(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
-        }
+        Assert.IsFalse(fastFilter.Evaluate(s => new[] { "UnitTest" }));
+        Assert.IsFalse(fastFilter.Evaluate(s => new[] { "PerfTest" }));
+        Assert.IsFalse(fastFilter.Evaluate(s => new[] { "UnitTest", "PerfTest" }));
+        Assert.IsFalse(fastFilter.Evaluate(s => new[] { "UnitTest", "IntegrationTest" }));
+        Assert.IsTrue(fastFilter.Evaluate(s => new[] { "IntegrationTest" }));
+        Assert.IsTrue(fastFilter.Evaluate(s => null));
+    }
+
+    [TestMethod]
+    public void FastFilterWithWithRegexParseErrorShouldNotCreateFastFilter()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test", new FilterOptions() { FilterRegEx = @"^[^\s\(]+\1" });
 
-        [TestMethod]
-        public void FastFilterShouldThrowExceptionForUnsupportedOperatorOperationCombination()
+        Assert.IsNull(filterExpressionWrapper.FastFilter);
+        Assert.IsFalse(string.IsNullOrEmpty(filterExpressionWrapper.ParseError));
+    }
+
+    [TestMethod]
+    public void FastFilterShouldThrowExceptionForUnsupportedOperatorOperationCombination()
+    {
+        ImmutableHashSet<string>.Builder filterHashSetBuilder = ImmutableHashSet.CreateBuilder<string>();
+        try
         {
-            ImmutableHashSet<string>.Builder filterHashSetBuilder = ImmutableHashSet.CreateBuilder<string>();
-            try
-            {
-                var filter = new FastFilter(ImmutableDictionary.CreateRange(new[] { new KeyValuePair<string, ISet<string>>("dummyName", filterHashSetBuilder.ToImmutableHashSet()) }), Operation.Equal, Operator.And);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is ArgumentException);
-                Assert.AreEqual("An error occurred while creating Fast filter.", ex.Message);
-            }
+            var filter = new FastFilter(ImmutableDictionary.CreateRange(new[] { new KeyValuePair<string, ISet<string>>("dummyName", filterHashSetBuilder.ToImmutableHashSet()) }), Operation.Equal, Operator.And);
         }
-
-        [TestMethod]
-        public void MultiplePropertyNamesEqualOr()
+        catch (Exception ex)
         {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|Category=IntegrationTest");
-            var fastFilter = filterExpressionWrapper.fastFilter;
-
-            var expectedFilterKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Category", "FullyQualifiedName" };
-
-            Assert.IsNotNull(fastFilter);
-            Assert.IsTrue(expectedFilterKeys.SetEquals(fastFilter.FilterProperties.Keys));
-            Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(fastFilter.FilterProperties["FullyQualifiedName"].SequenceEqual(new[] { "Test1" }));
-            Assert.IsTrue(fastFilter.FilterProperties["Category"].SequenceEqual(new[] { "IntegrationTest" }));
-
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName", "Category" }, null));
-            Assert.AreEqual("FullyQualifiedName", filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null).Single());
-
-            Assert.IsFalse(fastFilter.Evaluate((s) => s == "Category" ? new[] { "UnitTest" } : null));
-            Assert.IsFalse(fastFilter.Evaluate((s) => s == "Category" ? new[] { "PerfTest" } : null));
-            Assert.IsFalse(fastFilter.Evaluate((s) => s == "Category" ? new[] { "UnitTest", "PerfTest" } : null));
-            Assert.IsTrue(fastFilter.Evaluate((s) => s == "Category" ? new[] { "UnitTest", "IntegrationTest" } : null));
-            Assert.IsTrue(fastFilter.Evaluate((s) => s == "Category" ? new[] { "IntegrationTest" } : null));
-            Assert.IsTrue(fastFilter.Evaluate((s) =>
+            Assert.IsTrue(ex is ArgumentException);
+            Assert.AreEqual("An error occurred while creating Fast filter.", ex.Message);
+        }
+    }
+
+    [TestMethod]
+    public void MultiplePropertyNamesEqualOr()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName=Test1|Category=IntegrationTest");
+        var fastFilter = filterExpressionWrapper.FastFilter;
+
+        var expectedFilterKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Category", "FullyQualifiedName" };
+
+        Assert.IsNotNull(fastFilter);
+        Assert.IsTrue(expectedFilterKeys.SetEquals(fastFilter.FilterProperties.Keys));
+        Assert.IsFalse(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(fastFilter.FilterProperties["FullyQualifiedName"].SequenceEqual(new[] { "Test1" }));
+        Assert.IsTrue(fastFilter.FilterProperties["Category"].SequenceEqual(new[] { "IntegrationTest" }));
+
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName", "Category" }, null));
+        Assert.AreEqual("FullyQualifiedName",
+            filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null)!.Single());
+
+        Assert.IsFalse(fastFilter.Evaluate(s => s == "Category" ? new[] { "UnitTest" } : null));
+        Assert.IsFalse(fastFilter.Evaluate(s => s == "Category" ? new[] { "PerfTest" } : null));
+        Assert.IsFalse(fastFilter.Evaluate(s => s == "Category" ? new[] { "UnitTest", "PerfTest" } : null));
+        Assert.IsTrue(fastFilter.Evaluate(s => s == "Category" ? new[] { "UnitTest", "IntegrationTest" } : null));
+        Assert.IsTrue(fastFilter.Evaluate(s => s == "Category" ? new[] { "IntegrationTest" } : null));
+        Assert.IsTrue(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return new[] { "UnitTest" };
-                    case "FullyQualifiedName":
-                        return new[] { "Test1" };
-                    default:
-                        return null;
-                }
+                "Category" => new[] { "UnitTest" },
+                "FullyQualifiedName" => new[] { "Test1" },
+                _ => null,
             }));
-            Assert.IsFalse(fastFilter.Evaluate((s) =>
+        Assert.IsFalse(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return "UnitTest";
-                    case "FullyQualifiedName":
-                        return "Test2";
-                    default:
-                        return null;
-                }
+                "Category" => "UnitTest",
+                "FullyQualifiedName" => "Test2",
+                _ => null,
             }));
-            Assert.IsTrue(fastFilter.Evaluate((s) =>
+        Assert.IsTrue(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return new[] { "IntegrationTest" };
-                    case "FullyQualifiedName":
-                        return new[] { "Test2" };
-                    default:
-                        return null;
-                }
+                "Category" => new[] { "IntegrationTest" },
+                "FullyQualifiedName" => new[] { "Test2" },
+                _ => null,
             }));
-            Assert.IsFalse(fastFilter.Evaluate((s) => null));
-        }
+        Assert.IsFalse(fastFilter.Evaluate(s => null));
+    }
 
-        [TestMethod]
-        public void MultiplePropertyNamesNotEqualAnd()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&Category!=IntegrationTest");
-            var fastFilter = filterExpressionWrapper.fastFilter;
+    [TestMethod]
+    public void MultiplePropertyNamesNotEqualAnd()
+    {
+        var filterExpressionWrapper = new FilterExpressionWrapper("FullyQualifiedName!=Test1&Category!=IntegrationTest");
+        var fastFilter = filterExpressionWrapper.FastFilter;
 
-            var expectedFilterKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Category", "FullyQualifiedName" };
+        var expectedFilterKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Category", "FullyQualifiedName" };
 
-            Assert.IsNotNull(fastFilter);
-            Assert.IsTrue(expectedFilterKeys.SetEquals(fastFilter.FilterProperties.Keys));
-            Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
-            Assert.IsTrue(fastFilter.FilterProperties["FullyQualifiedName"].SequenceEqual(new[] { "Test1" }));
-            Assert.IsTrue(fastFilter.FilterProperties["Category"].SequenceEqual(new[] { "IntegrationTest" }));
+        Assert.IsNotNull(fastFilter);
+        Assert.IsTrue(expectedFilterKeys.SetEquals(fastFilter.FilterProperties.Keys));
+        Assert.IsTrue(fastFilter.IsFilteredOutWhenMatched);
+        Assert.IsTrue(fastFilter.FilterProperties["FullyQualifiedName"].SequenceEqual(new[] { "Test1" }));
+        Assert.IsTrue(fastFilter.FilterProperties["Category"].SequenceEqual(new[] { "IntegrationTest" }));
 
-            Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName", "Category" }, null));
-            Assert.AreEqual("FullyQualifiedName", filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null).Single());
+        Assert.IsNull(filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName", "Category" }, null));
+        Assert.AreEqual("FullyQualifiedName",
+            filterExpressionWrapper.ValidForProperties(new List<string>() { "Category" }, null)!.Single());
 
-            Assert.IsTrue(fastFilter.Evaluate((s) => s == "Category" ? new[] { "UnitTest" } : null));
-            Assert.IsFalse(fastFilter.Evaluate((s) => s == "Category" ? new[] { "UnitTest", "IntegrationTest" } : null));
-            Assert.IsFalse(fastFilter.Evaluate((s) => s == "Category" ? new[] { "IntegrationTest" } : null));
-            Assert.IsFalse(fastFilter.Evaluate((s) =>
+        Assert.IsTrue(fastFilter.Evaluate(s => s == "Category" ? new[] { "UnitTest" } : null));
+        Assert.IsFalse(fastFilter.Evaluate(s => s == "Category" ? new[] { "UnitTest", "IntegrationTest" } : null));
+        Assert.IsFalse(fastFilter.Evaluate(s => s == "Category" ? new[] { "IntegrationTest" } : null));
+        Assert.IsFalse(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return new[] { "UnitTest" };
-                    case "FullyQualifiedName":
-                        return new[] { "Test1" };
-                    default:
-                        return null;
-                }
+                "Category" => new[] { "UnitTest" },
+                "FullyQualifiedName" => new[] { "Test1" },
+                _ => null,
             }));
-            Assert.IsFalse(fastFilter.Evaluate((s) =>
+        Assert.IsFalse(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return new[] { "IntegrationTest" };
-                    case "FullyQualifiedName":
-                        return new[] { "Test2" };
-                    default:
-                        return null;
-                }
+                "Category" => new[] { "IntegrationTest" },
+                "FullyQualifiedName" => new[] { "Test2" },
+                _ => null,
             }));
-            Assert.IsTrue(fastFilter.Evaluate((s) =>
+        Assert.IsTrue(fastFilter.Evaluate(s => s switch
             {
-                switch (s)
-                {
-                    case "Category":
-                        return new[] { "UnitTest" };
-                    case "FullyQualifiedName":
-                        return new[] { "Test2" };
-                    default:
-                        return null;
-                }
+                "Category" => new[] { "UnitTest" },
+                "FullyQualifiedName" => new[] { "Test2" },
+                _ => null,
             }));
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FilterExpressionTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FilterExpressionTests.cs
index 5d53fcefbf..99a5f7964e 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FilterExpressionTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/FilterExpressionTests.cs
@@ -1,101 +1,102 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Filtering
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Filtering;
+
+[TestClass]
+public class FilterExpressionTests
 {
-    using System;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void TokenizeNullThrowsArgumentNullException()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => FilterExpression.TokenizeFilterExpressionString(null!), "str");
+    }
+
+    [TestMethod]
+    public void TokenizeFilterShouldHandleEscapedParenthesis()
+    {
+        var conditionString = @"(T1\(\) | T2\(\))";
+
+        var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
+
+        Assert.AreEqual(5, tokens.Length);
+        Assert.AreEqual("(", tokens[0]);
+        Assert.AreEqual(@"T1\(\) ", tokens[1]);
+        Assert.AreEqual(@"|", tokens[2]);
+        Assert.AreEqual(@" T2\(\)", tokens[3]);
+        Assert.AreEqual(")", tokens[4]);
+    }
+
+    [TestMethod]
+    public void TokenizeFilterShouldHandleEmptyParenthesis()
+    {
+        var conditionString = @"  (  )  ";
 
-    [TestClass]
-    public class FilterExpressionTests
+        var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
+
+        Assert.AreEqual(5, tokens.Length);
+        Assert.AreEqual("  ", tokens[0]);
+        Assert.AreEqual("(", tokens[1]);
+        Assert.AreEqual("  ", tokens[2]);
+        Assert.AreEqual(")", tokens[3]);
+        Assert.AreEqual("  ", tokens[4]);
+    }
+
+    [TestMethod]
+    public void TokenizeFilterShouldHandleEscapedBackslash()
     {
-        [TestMethod]
-        public void TokenizeNullThrowsArgumentNullException()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => FilterExpression.TokenizeFilterExpressionString(null), "str");
-        }
-
-        [TestMethod]
-        public void TokenizeFilterShouldHandleEscapedParenthesis()
-        {
-            var conditionString = @"(T1\(\) | T2\(\))";
-
-            var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
-
-            Assert.AreEqual(5, tokens.Length);
-            Assert.AreEqual("(", tokens[0]);
-            Assert.AreEqual(@"T1\(\) ", tokens[1]);
-            Assert.AreEqual(@"|", tokens[2]);
-            Assert.AreEqual(@" T2\(\)", tokens[3]);
-            Assert.AreEqual(")", tokens[4]);
-        }
-
-        [TestMethod]
-        public void TokenizeFilterShouldHandleEmptyParenthesis()
-        {
-            var conditionString = @"  (  )  ";
-
-            var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
-
-            Assert.AreEqual(5, tokens.Length);
-            Assert.AreEqual("  ", tokens[0]);
-            Assert.AreEqual("(", tokens[1]);
-            Assert.AreEqual("  ", tokens[2]);
-            Assert.AreEqual(")", tokens[3]);
-            Assert.AreEqual("  ", tokens[4]);
-        }
-
-        [TestMethod]
-        public void TokenizeFilterShouldHandleEscapedBackslash()
-        {
-            var conditionString = @"(FQN!=T1\(""\\""\) | FQN!=T2\(\))";
-
-            var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
-
-            Assert.AreEqual(5, tokens.Length);
-            Assert.AreEqual("(", tokens[0]);
-            Assert.AreEqual(@"FQN!=T1\(""\\""\) ", tokens[1]);
-            Assert.AreEqual(@"|", tokens[2]);
-            Assert.AreEqual(@" FQN!=T2\(\)", tokens[3]);
-            Assert.AreEqual(")", tokens[4]);
-        }
-
-        [TestMethod]
-        public void TokenizeFilterShouldHandleNestedParenthesis()
-        {
-            var conditionString = @"((FQN!=T1|FQN!=T2)&(Category=Foo\(\)))";
-
-            var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
-
-            Assert.AreEqual(11, tokens.Length);
-            Assert.AreEqual("(", tokens[0]);
-            Assert.AreEqual("(", tokens[1]);
-            Assert.AreEqual(@"FQN!=T1", tokens[2]);
-            Assert.AreEqual(@"|", tokens[3]);
-            Assert.AreEqual(@"FQN!=T2", tokens[4]);
-            Assert.AreEqual(")", tokens[5]);
-            Assert.AreEqual("&", tokens[6]);
-            Assert.AreEqual("(", tokens[7]);
-            Assert.AreEqual(@"Category=Foo\(\)", tokens[8]);
-            Assert.AreEqual(")", tokens[9]);
-            Assert.AreEqual(")", tokens[10]);
-        }
-
-        [TestMethod]
-        public void TokenizeFilterShouldHandleInvalidEscapeSequence()
-        {
-            var conditionString = @"(T1\#\#)|T2\)";
-
-            var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
-
-            Assert.AreEqual(5, tokens.Length);
-            Assert.AreEqual("(", tokens[0]);
-            Assert.AreEqual(@"T1\#\#", tokens[1]);
-            Assert.AreEqual(@")", tokens[2]);
-            Assert.AreEqual(@"|", tokens[3]);
-            Assert.AreEqual(@"T2\)", tokens[4]);
-        }
+        var conditionString = @"(FQN!=T1\(""\\""\) | FQN!=T2\(\))";
+
+        var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
+
+        Assert.AreEqual(5, tokens.Length);
+        Assert.AreEqual("(", tokens[0]);
+        Assert.AreEqual(@"FQN!=T1\(""\\""\) ", tokens[1]);
+        Assert.AreEqual(@"|", tokens[2]);
+        Assert.AreEqual(@" FQN!=T2\(\)", tokens[3]);
+        Assert.AreEqual(")", tokens[4]);
+    }
+
+    [TestMethod]
+    public void TokenizeFilterShouldHandleNestedParenthesis()
+    {
+        var conditionString = @"((FQN!=T1|FQN!=T2)&(Category=Foo\(\)))";
+
+        var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
+
+        Assert.AreEqual(11, tokens.Length);
+        Assert.AreEqual("(", tokens[0]);
+        Assert.AreEqual("(", tokens[1]);
+        Assert.AreEqual(@"FQN!=T1", tokens[2]);
+        Assert.AreEqual(@"|", tokens[3]);
+        Assert.AreEqual(@"FQN!=T2", tokens[4]);
+        Assert.AreEqual(")", tokens[5]);
+        Assert.AreEqual("&", tokens[6]);
+        Assert.AreEqual("(", tokens[7]);
+        Assert.AreEqual(@"Category=Foo\(\)", tokens[8]);
+        Assert.AreEqual(")", tokens[9]);
+        Assert.AreEqual(")", tokens[10]);
+    }
+
+    [TestMethod]
+    public void TokenizeFilterShouldHandleInvalidEscapeSequence()
+    {
+        var conditionString = @"(T1\#\#)|T2\)";
+
+        var tokens = FilterExpression.TokenizeFilterExpressionString(conditionString).ToArray();
+
+        Assert.AreEqual(5, tokens.Length);
+        Assert.AreEqual("(", tokens[0]);
+        Assert.AreEqual(@"T1\#\#", tokens[1]);
+        Assert.AreEqual(@")", tokens[2]);
+        Assert.AreEqual(@"|", tokens[3]);
+        Assert.AreEqual(@"T2\)", tokens[4]);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/TestCaseFilterExpressionTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/TestCaseFilterExpressionTests.cs
index 521ea6a9a0..35afc403bb 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/TestCaseFilterExpressionTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Filtering/TestCaseFilterExpressionTests.cs
@@ -1,30 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Collections.Generic;
+using System.Linq;
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Filtering
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Filtering;
+
+[TestClass]
+public class TestCaseFilterExpressionTests
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestCaseFilterExpressionTests
+    [TestMethod]
+    public void ValidForPropertiesShouldNotSetvalidForMatchVariableTofalseIfFilterIsInvalid()
     {
-        [TestMethod]
-        public void ValidForPropertiesShouldNotSetvalidForMatchVariableTofalseIfFilterIsInvalid()
-        {
-            var filterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
-            var testCaseFilterExpression = new TestCaseFilterExpression(filterExpressionWrapper);
+        var filterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
+        var testCaseFilterExpression = new TestCaseFilterExpression(filterExpressionWrapper);
 
-            Assert.AreEqual("highlyunlikelyproperty", testCaseFilterExpression.ValidForProperties(new List<string>() { "TestCategory" }, (s) => { return null; }).Single());
+        Assert.AreEqual("highlyunlikelyproperty",
+            testCaseFilterExpression.ValidForProperties(new List<string>() { "TestCategory" }, s => null)!.Single());
 
-            TestCase dummyTestCase = new TestCase();
-            bool result = testCaseFilterExpression.MatchTestCase(dummyTestCase, (s) => { return "unused"; });
+        TestCase dummyTestCase = new();
+        bool result = testCaseFilterExpression.MatchTestCase(dummyTestCase, s => "unused");
 
-            Assert.IsTrue(result);
-        }
+        Assert.IsTrue(result);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostExtensionManagerTests.cs
index 01c5030094..f693fe887a 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostExtensionManagerTests.cs
@@ -1,44 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.Logging
+using System;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.Logging;
+
+[TestClass]
+public class TestHostExtensionManagerTests
 {
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
+    [TestInitialize]
+    public void Initialize()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestHostExtensionManagerTests));
+    }
 
-    [TestClass]
-    public class TestHostExtensionManagerTests
+    [TestMethod]
+    public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
     {
-        [TestInitialize]
-        public void Initialize()
+        Assert.ThrowsException<ArgumentNullException>(() =>
         {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestHostExtensionManagerTests));
-        }
-        [TestMethod]
-        public void CreateShouldThrowExceptionIfMessageLoggerIsNull()
+            var testLoggerExtensionManager = TestRuntimeExtensionManager.Create(null!);
+        });
+    }
+
+    [TestMethod]
+    public void CreateShouldReturnInstanceOfTestLoggerExtensionManager()
+    {
+        try
         {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                var testLoggerExtensionManager = TestRuntimeExtensionManager.Create(null);
-            });
+            var testLoggerExtensionManager = TestRuntimeExtensionManager.Create(TestSessionMessageLogger.Instance);
+            Assert.IsNotNull(testLoggerExtensionManager);
+            Assert.IsInstanceOfType(testLoggerExtensionManager, typeof(TestRuntimeExtensionManager));
         }
-
-        [TestMethod]
-        public void CreateShouldReturnInstanceOfTestLoggerExtensionManager()
+        finally
         {
-            try
-            {
-                var testLoggerExtensionManager = TestRuntimeExtensionManager.Create(TestSessionMessageLogger.Instance);
-                Assert.IsNotNull(testLoggerExtensionManager);
-                Assert.IsInstanceOfType(testLoggerExtensionManager, typeof(TestRuntimeExtensionManager));
-            }
-            finally
-            {
-                TestSessionMessageLogger.Instance = null;
-            }
+            TestSessionMessageLogger.Instance = null;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs
index d8e1ce85b6..18b43def79 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs
@@ -1,50 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.Logging
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.Logging;
+
+/// <summary>
+/// Tests the behaviors of the TestLoggerManager class.
+/// </summary>
+[TestClass]
+public class TestHostProviderManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// Tests the behaviors of the TestLoggerManager class.
-    /// </summary>
-    [TestClass]
-    public class TestHostProviderManagerTests
+    public TestHostProviderManagerTests()
     {
-        public TestHostProviderManagerTests()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(TestHostProviderManagerTests));
-        }
+        TestPluginCacheHelper.SetupMockExtensions(typeof(TestHostProviderManagerTests));
+    }
 
-        [TestMethod]
-        public void TestHostProviderManagerShouldReturnTestHostWhenAppropriateCustomUriProvided()
-        {
-            var manager = TestRuntimeProviderManager.Instance;
-            Assert.IsNotNull(manager.GetTestHostManagerByUri("executor://DesktopTestHost/"));
-        }
+    [TestMethod]
+    public void TestHostProviderManagerShouldReturnTestHostWhenAppropriateCustomUriProvided()
+    {
+        var manager = TestRuntimeProviderManager.Instance;
+        Assert.IsNotNull(manager.GetTestHostManagerByUri("executor://DesktopTestHost/"));
+    }
 
-        [TestMethod]
-        public void TestHostProviderManagerShouldReturnNullWhenInvalidCustomUriProvided()
-        {
-            var manager = TestRuntimeProviderManager.Instance;
-            Assert.IsNull(manager.GetTestHostManagerByUri("executor://InvalidHost/"));
-        }
+    [TestMethod]
+    public void TestHostProviderManagerShouldReturnNullWhenInvalidCustomUriProvided()
+    {
+        var manager = TestRuntimeProviderManager.Instance;
+        Assert.IsNull(manager.GetTestHostManagerByUri("executor://InvalidHost/"));
+    }
 
-        [TestMethod]
-        public void TestHostProviderManagerShouldReturnTestHostBasedOnRunConfiguration()
-        {
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void TestHostProviderManagerShouldReturnTestHostBasedOnRunConfiguration()
+    {
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
     <RunSettings>
       <RunConfiguration>
         <MaxCpuCount>0</MaxCpuCount>
@@ -53,87 +54,104 @@ public void TestHostProviderManagerShouldReturnTestHostBasedOnRunConfiguration()
       </RunConfiguration>
     </RunSettings>";
 
-            var manager = TestRuntimeProviderManager.Instance;
-            Assert.IsNotNull(manager.GetTestHostManagerByRunConfiguration(runSettingsXml));
-        }
+        var manager = TestRuntimeProviderManager.Instance;
+        Assert.IsNotNull(manager.GetTestHostManagerByRunConfiguration(runSettingsXml, null));
+    }
 
-        [TestMethod]
-        public void GetDefaultTestHostManagerReturnsANonNullInstance()
-        {
-            string runSettingsXml = string.Concat(
-                @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
+    [TestMethod]
+    public void GetDefaultTestHostManagerReturnsANonNullInstance()
+    {
+        string runSettingsXml = string.Concat(
+            @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
 <RunConfiguration><MaxCpuCount>0</MaxCpuCount><TargetPlatform> x86 </TargetPlatform><TargetFrameworkVersion>",
-                Framework.DefaultFramework.Name,
-                "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
+            Framework.DefaultFramework.Name,
+            "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
 
-            Assert.IsNotNull(TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml));
-        }
+        Assert.IsNotNull(TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null));
+    }
 
-        [TestMethod]
-        public void GetDefaultTestHostManagerReturnsANewInstanceEverytime()
-        {
-            string runSettingsXml = string.Concat(
-                @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
+    [TestMethod]
+    public void GetDefaultTestHostManagerReturnsANewInstanceEverytime()
+    {
+        string runSettingsXml = string.Concat(
+            @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
 <RunConfiguration><MaxCpuCount>0</MaxCpuCount><TargetPlatform> x86 </TargetPlatform><TargetFrameworkVersion>",
-                Framework.DefaultFramework.Name,
-                "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
+            Framework.DefaultFramework.Name,
+            "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
 
-            var instance1 = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml);
-            var instance2 = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml);
+        var instance1 = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null);
+        var instance2 = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null);
 
-            Assert.AreNotEqual(instance1, instance2);
-        }
+        Assert.AreNotEqual(instance1, instance2);
+    }
 
-        [TestMethod]
-        public void GetDefaultTestHostManagerReturnsDotnetCoreHostManagerIfFrameworkIsNetCore()
-        {
-            string runSettingsXml = string.Concat(
-                @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
+    [TestMethod]
+    public void GetDefaultTestHostManagerReturnsDotnetCoreHostManagerIfFrameworkIsNetCore()
+    {
+        string runSettingsXml = string.Concat(
+            @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
 <RunConfiguration><MaxCpuCount>0</MaxCpuCount><TargetPlatform> x64 </TargetPlatform><TargetFrameworkVersion>",
-                ".NETCoreApp,Version=v1.0",
-                "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
+            ".NETCoreApp,Version=v1.0",
+            "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
 
-            var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml);
+        var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null);
 
-            Assert.AreEqual(typeof(TestableTestHostManager), testHostManager.GetType());
-        }
+        Assert.AreEqual(typeof(TestableTestHostManager), testHostManager!.GetType());
+    }
 
-        [TestMethod]
-        public void GetDefaultTestHostManagerReturnsASharedManagerIfDisableAppDomainIsFalse()
-        {
-            string runSettingsXml = string.Concat(
-                @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
+    [TestMethod]
+    public void GetDefaultTestHostManagerReturnsASharedManagerIfDisableAppDomainIsFalse()
+    {
+        string runSettingsXml = string.Concat(
+            @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
 <RunConfiguration><MaxCpuCount>0</MaxCpuCount><TargetPlatform> x86 </TargetPlatform><TargetFrameworkVersion>",
-                ".NETFramework,Version=v4.5.1",
-                "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
+            ".NETFramework,Version=v4.5.1",
+            "</TargetFrameworkVersion></RunConfiguration></RunSettings> ");
 
-            var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml);
-            testHostManager.Initialize(null, runSettingsXml);
-            Assert.IsNotNull(testHostManager);
+        var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null);
+        testHostManager!.Initialize(null, runSettingsXml);
+        Assert.IsNotNull(testHostManager);
 
-            Assert.IsTrue(testHostManager.Shared, "Default TestHostManager must be shared if DisableAppDomain is false");
-        }
+        Assert.IsTrue(testHostManager.Shared, "Default TestHostManager must be shared if DisableAppDomain is false");
+    }
 
-        [TestMethod]
-        public void GetDefaultTestHostManagerReturnsANonSharedManagerIfDisableAppDomainIsTrue()
-        {
-            string runSettingsXml = string.Concat(
-                @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
+    [TestMethod]
+    public void GetDefaultTestHostManagerReturnsANonSharedManagerIfDisableAppDomainIsTrue()
+    {
+        string runSettingsXml = string.Concat(
+            @"<?xml version=""1.0"" encoding=""utf-8""?><RunSettings>
 <RunConfiguration><MaxCpuCount>0</MaxCpuCount><TargetPlatform> x86 </TargetPlatform><TargetFrameworkVersion>",
-                ".NETFramework,Version=v4.5.1",
-                "</TargetFrameworkVersion><DisableAppDomain>true</DisableAppDomain></RunConfiguration></RunSettings> ");
+            ".NETFramework,Version=v4.5.1",
+            "</TargetFrameworkVersion><DisableAppDomain>true</DisableAppDomain></RunConfiguration></RunSettings> ");
 
-            var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml);
-            testHostManager.Initialize(null, runSettingsXml);
-            Assert.IsNotNull(testHostManager);
+        var testHostManager = TestRuntimeProviderManager.Instance.GetTestHostManagerByRunConfiguration(runSettingsXml, null);
+        testHostManager!.Initialize(null, runSettingsXml);
+        Assert.IsNotNull(testHostManager);
 
-            Assert.IsFalse(testHostManager.Shared, "Default TestHostManager must NOT be shared if DisableAppDomain is true");
-        }
+        Assert.IsFalse(testHostManager.Shared, "Default TestHostManager must NOT be shared if DisableAppDomain is true");
+    }
 
-        [TestMethod]
-        public void TestHostProviderManagerShouldReturnNullIfTargetFrameworkIsPortable()
-        {
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void TestHostProviderManagerShouldReturnNullIfTargetFrameworkIsPortable()
+    {
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    <RunSettings>
+      <RunConfiguration>
+        <MaxCpuCount>0</MaxCpuCount>
+        <TargetPlatform>x64</TargetPlatform>
+        <TargetFrameworkVersion>.NETPortable,Version=v4.5,Profile=Profile44</TargetFrameworkVersion>
+      </RunConfiguration>
+    </RunSettings> ";
+
+        var manager = TestRuntimeProviderManager.Instance;
+        Assert.IsNull(manager.GetTestHostManagerByRunConfiguration(runSettingsXml, null));
+    }
+
+    [TestMethod]
+    public void TestHostProviderManagerShouldReturnNullIfTargetFrameworkIsInvalidFramework()
+    {
+        // Portable 4.5 is not valid when it does not mention which profile it is.
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
     <RunSettings>
       <RunConfiguration>
         <MaxCpuCount>0</MaxCpuCount>
@@ -142,169 +160,157 @@ public void TestHostProviderManagerShouldReturnNullIfTargetFrameworkIsPortable()
       </RunConfiguration>
     </RunSettings> ";
 
-            var manager = TestRuntimeProviderManager.Instance;
-            Assert.IsNull(manager.GetTestHostManagerByRunConfiguration(runSettingsXml));
+        var manager = TestRuntimeProviderManager.Instance;
+        Assert.IsNull(manager.GetTestHostManagerByRunConfiguration(runSettingsXml, null));
+    }
+
+    #region Implementations
+
+    [ExtensionUri("executor://DesktopTestHost")]
+    [FriendlyName("DesktopTestHost")]
+    private class CustomTestHost : ITestRuntimeProvider
+    {
+        public event EventHandler<HostProviderEventArgs>? HostLaunched;
+
+        public event EventHandler<HostProviderEventArgs>? HostExited;
+
+        public bool Shared { get; private set; }
+
+
+        public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+        {
+            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+            var framework = config.TargetFramework;
+            Shared = !config.DisableAppDomain;
+
+            // This is expected to be called once every run so returning a new instance every time.
+            return framework!.Name.IndexOf("netframework", StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        public TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string?>? environmentVariables, TestRunnerConnectionInfo connectionInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+        {
+            return sources;
+        }
+
+        public void Initialize(IMessageLogger? logger, string runsettingsXml)
+        {
+            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+            Shared = !config.DisableAppDomain;
+        }
+
+        public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void OnHostExited(HostProviderEventArgs _)
+        {
+            HostExited?.Invoke(this, new HostProviderEventArgs("Error"));
         }
 
-        #region Implementations
+        public void OnHostLaunched(HostProviderEventArgs _)
+        {
+            HostLaunched?.Invoke(this, new HostProviderEventArgs("Error"));
+        }
 
-        [ExtensionUri("executor://DesktopTestHost")]
-        [FriendlyName("DesktopTestHost")]
-        private class CustomTestHost : ITestRuntimeProvider
+        public void SetCustomLauncher(ITestHostLauncher customLauncher)
         {
-            public event EventHandler<HostProviderEventArgs> HostLaunched;
-
-            public event EventHandler<HostProviderEventArgs> HostExited;
-
-            public bool Shared { get; private set; }
-
-
-            public bool CanExecuteCurrentRunConfiguration(string runsettingsXml)
-            {
-                var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-                var framework = config.TargetFramework;
-                this.Shared = !config.DisableAppDomain;
-
-                // This is expected to be called once every run so returning a new instance every time.
-                if (framework.Name.IndexOf("netframework", StringComparison.OrdinalIgnoreCase) >= 0)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            public TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string> environmentVariables, TestRunnerConnectionInfo connectionInfo)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
-            {
-                return sources;
-            }
-
-            public void Initialize(IMessageLogger logger, string runsettingsXml)
-            {
-                var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-                this.Shared = !config.DisableAppDomain;
-            }
-
-            public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnHostExited(HostProviderEventArgs e)
-            {
-                this.HostExited.Invoke(this, new HostProviderEventArgs("Error"));
-            }
-
-            public void OnHostLaunched(HostProviderEventArgs e)
-            {
-                this.HostLaunched.Invoke(this, new HostProviderEventArgs("Error"));
-            }
-
-            public void SetCustomLauncher(ITestHostLauncher customLauncher)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task CleanTestHostAsync(CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public TestHostConnectionInfo GetTestHostConnectionInfo()
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("executor://NetCoreTestHost")]
-        [FriendlyName("NetCoreTestHost")]
-        private class TestableTestHostManager : ITestRuntimeProvider
+        public Task CleanTestHostAsync(CancellationToken cancellationToken)
         {
-            public event EventHandler<HostProviderEventArgs> HostLaunched;
-
-            public event EventHandler<HostProviderEventArgs> HostExited;
-
-            public bool Shared { get; private set; }
-
-            public bool CanExecuteCurrentRunConfiguration(string runsettingsXml)
-            {
-                var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-                var framework = config.TargetFramework;
-                this.Shared = !config.DisableAppDomain;
-
-                // This is expected to be called once every run so returning a new instance every time.
-                if (framework.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
-                    || framework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            public TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string> environmentVariables, TestRunnerConnectionInfo connectionInfo)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void Initialize(IMessageLogger logger, string runsettingsXml)
-            {
-                var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
-                this.Shared = !config.DisableAppDomain;
-            }
-
-            public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnHostExited(HostProviderEventArgs e)
-            {
-                this.HostExited.Invoke(this, new HostProviderEventArgs("Error"));
-            }
-
-            public void OnHostLaunched(HostProviderEventArgs e)
-            {
-                this.HostLaunched.Invoke(this, new HostProviderEventArgs("Error"));
-            }
-
-            public void SetCustomLauncher(ITestHostLauncher customLauncher)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task CleanTestHostAsync(CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public TestHostConnectionInfo GetTestHostConnectionInfo()
-            {
-                throw new NotImplementedException();
-            }
-
-            public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
-            {
-                return sources;
-            }
+            throw new NotImplementedException();
         }
 
-        #endregion
+        public TestHostConnectionInfo GetTestHostConnectionInfo()
+        {
+            throw new NotImplementedException();
+        }
     }
-}
 
+    [ExtensionUri("executor://NetCoreTestHost")]
+    [FriendlyName("NetCoreTestHost")]
+    private class TestableTestHostManager : ITestRuntimeProvider
+    {
+        public event EventHandler<HostProviderEventArgs>? HostLaunched;
+
+        public event EventHandler<HostProviderEventArgs>? HostExited;
+
+        public bool Shared { get; private set; }
+
+        public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+        {
+            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+            var framework = config.TargetFramework;
+            Shared = !config.DisableAppDomain;
+
+            // This is expected to be called once every run so returning a new instance every time.
+            return framework!.Name.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0
+                   || framework.Name.IndexOf("netcoreapp", StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        public TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string?>? environmentVariables, TestRunnerConnectionInfo connectionInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Initialize(IMessageLogger? logger, string runsettingsXml)
+        {
+            var config = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
+            Shared = !config.DisableAppDomain;
+        }
+
+        public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void OnHostExited(HostProviderEventArgs _)
+        {
+            HostExited?.Invoke(this, new HostProviderEventArgs("Error"));
+        }
+
+        public void OnHostLaunched(HostProviderEventArgs _)
+        {
+            HostLaunched?.Invoke(this, new HostProviderEventArgs("Error"));
+        }
+
+        public void SetCustomLauncher(ITestHostLauncher customLauncher)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task CleanTestHostAsync(CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public TestHostConnectionInfo GetTestHostConnectionInfo()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+        {
+            return sources;
+        }
+    }
+
+    #endregion
+}
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Logging/InternalTestLoggerEventsTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Logging/InternalTestLoggerEventsTests.cs
index 0cd28995da..5077e68760 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Logging/InternalTestLoggerEventsTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Logging/InternalTestLoggerEventsTests.cs
@@ -1,571 +1,511 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Logging
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Logging;
+
+[TestClass]
+public class InternalTestLoggerEventsBehaviors
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly TestSessionMessageLogger _testSessionMessageLogger;
+    private readonly InternalTestLoggerEvents _loggerEvents;
 
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+    public InternalTestLoggerEventsBehaviors()
+    {
+        _testSessionMessageLogger = TestSessionMessageLogger.Instance;
+        _loggerEvents = new InternalTestLoggerEvents(_testSessionMessageLogger);
+    }
 
-    [TestClass]
-    public class InternalTestLoggerEventsBehaviors
+    [TestCleanup]
+    public void Dispose()
     {
-        private TestSessionMessageLogger testSessionMessageLogger;
-        private InternalTestLoggerEvents loggerEvents;
+        _loggerEvents.Dispose();
+        TestSessionMessageLogger.Instance = null;
+    }
 
-        [TestInitialize]
-        public void Initialize()
-        {
-            testSessionMessageLogger = TestSessionMessageLogger.Instance;
-            loggerEvents = new InternalTestLoggerEvents(testSessionMessageLogger);
-        }
+    [TestMethod]
+    public void RaiseTestRunMessageShouldNotThrowExceptionIfNoEventHandlersAreRegistered()
+    {
+        // Send the test message event.
+        _loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "This is a string."));
+    }
 
-        [TestCleanup]
-        public void Dispose()
-        {
-            loggerEvents.Dispose();
-            TestSessionMessageLogger.Instance = null;
-        }
+    [TestMethod]
+    public void RaiseTestRunMessageShouldInvokeRegisteredEventHandlerIfTestRunMessageEventArgsIsPassed()
+    {
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+        bool testMessageReceived = false;
+        TestRunMessageEventArgs? eventArgs = null;
+        var message = "This is the test message";
+
+        // Register for the test message event.
+        _loggerEvents.TestRunMessage += (sender, e) =>
+        {
+            testMessageReceived = true;
+            eventArgs = e;
+            waitHandle.Set();
+        };
+
+        _loggerEvents.EnableEvents();
+        // Send the test message event.
+        _loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, message));
+
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+
+        Assert.IsTrue(testMessageReceived);
+        Assert.IsNotNull(eventArgs);
+        Assert.AreEqual(message, eventArgs.Message);
+        Assert.AreEqual(TestMessageLevel.Informational, eventArgs.Level);
+    }
 
-        [TestMethod]
-        public void RaiseTestRunMessageShouldNotThrowExceptionIfNoEventHandlersAreRegistered()
-        {
-            // Send the test message event.
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational,"This is a string."));
-        }
+    [TestMethod]
+    public void RaiseTestResultShouldInvokeRegisteredEventHandlerIfTestResultEventArgsIsPassed()
+    {
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+        bool testResultReceived = false;
+        TestResultEventArgs? eventArgs = null;
+        var result = new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName"));
 
-        [TestMethod]
-        public void RaiseTestRunMessageShouldInvokeRegisteredEventHandlerIfTestRunMessageEventArgsIsPassed()
+        // Register for the test result event.
+        _loggerEvents.TestResult += (sender, e) =>
         {
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-            bool testMessageReceived = false;
-            TestRunMessageEventArgs eventArgs = null;
-            var message = "This is the test message";
-
-            // Register for the test message event.
-            loggerEvents.TestRunMessage += (sender, e) =>
-            {
-                testMessageReceived = true;
-                eventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the test message event.
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, message));
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-
-            Assert.IsTrue(testMessageReceived);
-            Assert.IsNotNull(eventArgs);
-            Assert.AreEqual(message, eventArgs.Message);
-            Assert.AreEqual(TestMessageLevel.Informational, eventArgs.Level);
-        }
+            testResultReceived = true;
+            eventArgs = e;
+            waitHandle.Set();
+        };
 
-        [TestMethod]
-        public void RaiseTestResultShouldInvokeRegisteredEventHandlerIfTestResultEventArgsIsPassed()
-        {
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-            bool testResultReceived = false;
-            TestResultEventArgs eventArgs = null;
-            var result =new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName"));
-
-            // Register for the test result event.
-            loggerEvents.TestResult += (sender, e) =>
-            {
-                testResultReceived = true;
-                eventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the test result event.
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(result));
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-
-            Assert.IsTrue(testResultReceived);
-            Assert.IsNotNull(eventArgs);
-            Assert.AreEqual(result, eventArgs.Result);
-        }
+        _loggerEvents.EnableEvents();
+        // Send the test result event.
+        _loggerEvents.RaiseTestResult(new TestResultEventArgs(result));
 
-        [TestMethod]
-        public void RaiseTestResultShouldThrowExceptionIfNullTestResultEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseTestResult(null);
-            });
-        }
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
 
-        [TestMethod]
-        public void RaiseTestRunMessageShouldThrowExceptioIfNullTestRunMessageEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseTestRunMessage(null);
-            });
-        }
+        Assert.IsTrue(testResultReceived);
+        Assert.IsNotNull(eventArgs);
+        Assert.AreEqual(result, eventArgs.Result);
+    }
 
-        [TestMethod]
-        public void CompleteTestRunShouldInvokeRegisteredEventHandler()
-        {
-            bool testRunCompleteReceived = false;
-            TestRunCompleteEventArgs eventArgs = null;
-
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            // Register for the test run complete event.
-            loggerEvents.TestRunComplete += (sender, e) =>
-            {
-                testRunCompleteReceived = true;
-                eventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the test run complete event.
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan());
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(testRunCompleteReceived);
-            Assert.IsNotNull(eventArgs);
-        }
+    [TestMethod]
+    public void RaiseTestResultShouldThrowExceptionIfNullTestResultEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseTestResult(null!));
+    }
+
+    [TestMethod]
+    public void RaiseTestRunMessageShouldThrowExceptioIfNullTestRunMessageEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseTestRunMessage(null!));
+    }
+
+    [TestMethod]
+    public void CompleteTestRunShouldInvokeRegisteredEventHandler()
+    {
+        bool testRunCompleteReceived = false;
+        TestRunCompleteEventArgs? eventArgs = null;
 
-        [TestMethod]
-        public void EnableEventsShouldSendEventsAlreadyPresentInQueueToRegisteredEventHandlers()
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+
+        // Register for the test run complete event.
+        _loggerEvents.TestRunComplete += (sender, e) =>
         {
-            bool testResultReceived = false;
-            bool testMessageReceived = false;
+            testRunCompleteReceived = true;
+            eventArgs = e;
+            waitHandle.Set();
+        };
 
-            // Send the events.
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error,"This is a string."));
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName"))));
+        _loggerEvents.EnableEvents();
+        // Send the test run complete event.
+        _loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan());
 
-            // Register for the events.
-            loggerEvents.TestResult += (sender, e) =>
-            {
-                testResultReceived = true;
-            };
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(testRunCompleteReceived);
+        Assert.IsNotNull(eventArgs);
+    }
 
-            loggerEvents.TestRunMessage += (sender, e) =>
-            {
-                testMessageReceived = true;
-            };
+    [TestMethod]
+    public void EnableEventsShouldSendEventsAlreadyPresentInQueueToRegisteredEventHandlers()
+    {
+        bool testResultReceived = false;
+        bool testMessageReceived = false;
 
-            // Enable events and verify that the events are received.
-            loggerEvents.EnableEvents();
+        // Send the events.
+        _loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "This is a string."));
+        _loggerEvents.RaiseTestResult(new TestResultEventArgs(new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName"))));
 
-            Assert.IsTrue(testResultReceived);
-            Assert.IsTrue(testMessageReceived);
-        }
+        // Register for the events.
+        _loggerEvents.TestResult += (sender, e) => testResultReceived = true;
 
-        [TestMethod]
-        public void DisposeShouldNotThrowExceptionIfCalledMultipleTimes()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            loggerEvents.Dispose();
-        }
+        _loggerEvents.TestRunMessage += (sender, e) => testMessageReceived = true;
 
-        [TestMethod]
-        public void RaiseTestResultShouldThrowExceptionIfDisposedIsAlreadyCalled()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
+        // Enable events and verify that the events are received.
+        _loggerEvents.EnableEvents();
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName"))));
-            });
-        }
+        Assert.IsTrue(testResultReceived);
+        Assert.IsTrue(testMessageReceived);
+    }
 
-        [TestMethod]
-        public void RaiseTestRunMessageShouldThrowExceptionIfDisposeIsAlreadyCalled()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
+    [TestMethod]
+    public void DisposeShouldNotThrowExceptionIfCalledMultipleTimes()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        loggerEvents.Dispose();
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error,"This is a string."));
-            });
-        }
+    [TestMethod]
+    public void RaiseTestResultShouldThrowExceptionIfDisposedIsAlreadyCalled()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
 
-        [TestMethod]
-        public void CompleteTestRunShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseTestResult(new TestResultEventArgs(new TestResult(new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName")))));
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.CompleteTestRun(null, true, false, null, null, new TimeSpan());
-            });
-        }
+    [TestMethod]
+    public void RaiseTestRunMessageShouldThrowExceptionIfDisposeIsAlreadyCalled()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
 
-        [TestMethod]
-        public void EnableEventsShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "This is a string.")));
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.EnableEvents();
-            });
-        }
+    [TestMethod]
+    public void CompleteTestRunShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
 
-        [TestMethod]
-        public void TestRunMessageLoggerProxySendMessageShouldInvokeRegisteredEventHandler()
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.CompleteTestRun(null, true, false, null, null, null, new TimeSpan()));
+    }
+
+    [TestMethod]
+    public void EnableEventsShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.EnableEvents());
+    }
+
+    [TestMethod]
+    public void TestRunMessageLoggerProxySendMessageShouldInvokeRegisteredEventHandler()
+    {
+        var receivedRunMessage = false;
+        using (_loggerEvents)
         {
-            var receivedRunMessage = false;
-            using (loggerEvents)
-            {
-                loggerEvents.TestRunMessage += (sender, e) =>
-                {
-                    receivedRunMessage = true;
-                };
-
-                testSessionMessageLogger.SendMessage(TestMessageLevel.Error,"This is a string.");
-            }
-
-            Assert.IsTrue(receivedRunMessage);
+            _loggerEvents.TestRunMessage += (sender, e) => receivedRunMessage = true;
+
+            _testSessionMessageLogger.SendMessage(TestMessageLevel.Error, "This is a string.");
         }
 
-        [TestMethod]
-        public void TestLoggerProxySendMessageShouldNotInvokeRegisterdEventHandlerIfAlreadyDisposed()
-        {
-            var receivedRunMessage = false;
-            loggerEvents.TestRunMessage += (sender, e) =>
-            {
-                receivedRunMessage = true;
-            };
+        Assert.IsTrue(receivedRunMessage);
+    }
 
-            // Dispose the logger events, send a message, and verify it is not received.
-            loggerEvents.Dispose();
-            testSessionMessageLogger.SendMessage(TestMessageLevel.Error,"This is a string.");
+    [TestMethod]
+    public void TestLoggerProxySendMessageShouldNotInvokeRegisterdEventHandlerIfAlreadyDisposed()
+    {
+        var receivedRunMessage = false;
+        _loggerEvents.TestRunMessage += (sender, e) => receivedRunMessage = true;
 
-            Assert.IsFalse(receivedRunMessage);
-        }
+        // Dispose the logger events, send a message, and verify it is not received.
+        _loggerEvents.Dispose();
+        _testSessionMessageLogger.SendMessage(TestMessageLevel.Error, "This is a string.");
 
-        /// <summary>
-        /// Exception should be thrown if event args passed is null.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryStartShouldThrowExceptionIfNullDiscoveryStartEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryStart(null);
-            });
-        }
+        Assert.IsFalse(receivedRunMessage);
+    }
 
-        /// <summary>
-        /// Exception should be thrown if discovered tests event args is null.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveredTestsShouldThrowExceptionIfNullDiscoveredTestsEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseDiscoveredTests(null);
-            });
-        }
+    /// <summary>
+    /// Exception should be thrown if event args passed is null.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryStartShouldThrowExceptionIfNullDiscoveryStartEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseDiscoveryStart(null!));
+    }
 
-        /// <summary>
-        /// Exception should be thrown if logger events are already disposed.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveredTestsShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            List<TestCase> testCases = new List<TestCase> { new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName") };
-            DiscoveredTestsEventArgs discoveredTestsEventArgs = new DiscoveredTestsEventArgs(testCases);
-
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseDiscoveredTests(discoveredTestsEventArgs);
-            });
-        }
+    /// <summary>
+    /// Exception should be thrown if discovered tests event args is null.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveredTestsShouldThrowExceptionIfNullDiscoveredTestsEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseDiscoveredTests(null!));
+    }
 
-        /// <summary>
-        /// Check for invocation to registered event handlers.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveredTestsShouldInvokeRegisteredEventHandler()
-        {
-            bool discoveredTestsReceived = false;
-            DiscoveredTestsEventArgs receivedEventArgs = null;
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            List<TestCase> testCases = new List<TestCase> { new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName") };
-            DiscoveredTestsEventArgs discoveredTestsEventArgs = new DiscoveredTestsEventArgs(testCases);
-
-            // Register for the discovered tests event.
-            loggerEvents.DiscoveredTests += (sender, e) =>
-            {
-                discoveredTestsReceived = true;
-                receivedEventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the discovered tests event.
-            loggerEvents.RaiseDiscoveredTests(discoveredTestsEventArgs);
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(discoveredTestsReceived);
-            Assert.IsNotNull(receivedEventArgs);
-            Assert.AreEqual(receivedEventArgs, discoveredTestsEventArgs);
-        }
+    /// <summary>
+    /// Exception should be thrown if logger events are already disposed.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveredTestsShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        List<TestCase> testCases = [new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName")];
+        DiscoveredTestsEventArgs discoveredTestsEventArgs = new(testCases);
 
-        /// <summary>
-        /// Exception should be thrown if event args passed is null.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryCompleteShouldThrowExceptionIfNullDiscoveryCompleteEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryComplete(null);
-            });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseDiscoveredTests(discoveredTestsEventArgs));
+    }
 
-        /// <summary>
-        /// Exception should be thrown if logger events are already disposed.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryStartShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            DiscoveryCriteria discoveryCriteria = new DiscoveryCriteria() { TestCaseFilter = "Name=Test1" };
-            DiscoveryStartEventArgs discoveryStartEventArgs = new DiscoveryStartEventArgs(discoveryCriteria);
-
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryStart(discoveryStartEventArgs);
-            });
-        }
+    /// <summary>
+    /// Check for invocation to registered event handlers.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveredTestsShouldInvokeRegisteredEventHandler()
+    {
+        bool discoveredTestsReceived = false;
+        DiscoveredTestsEventArgs? receivedEventArgs = null;
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+
+        List<TestCase> testCases = [new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName")];
+        DiscoveredTestsEventArgs discoveredTestsEventArgs = new(testCases);
+
+        // Register for the discovered tests event.
+        _loggerEvents.DiscoveredTests += (sender, e) =>
+        {
+            discoveredTestsReceived = true;
+            receivedEventArgs = e;
+            waitHandle.Set();
+        };
+
+        _loggerEvents.EnableEvents();
+        // Send the discovered tests event.
+        _loggerEvents.RaiseDiscoveredTests(discoveredTestsEventArgs);
+
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(discoveredTestsReceived);
+        Assert.IsNotNull(receivedEventArgs);
+        Assert.AreEqual(receivedEventArgs, discoveredTestsEventArgs);
+    }
 
-        /// <summary>
-        /// Exception should be thrown if logger events are already disposed.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryCompleteShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
+    /// <summary>
+    /// Exception should be thrown if event args passed is null.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryCompleteShouldThrowExceptionIfNullDiscoveryCompleteEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseDiscoveryComplete(null!));
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryComplete(discoveryCompleteEventArgs);
-            });
-        }
+    /// <summary>
+    /// Exception should be thrown if logger events are already disposed.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryStartShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        DiscoveryCriteria discoveryCriteria = new() { TestCaseFilter = "Name=Test1" };
+        DiscoveryStartEventArgs discoveryStartEventArgs = new(discoveryCriteria);
 
-        /// <summary>
-        /// Check for invocation to registered event handlers.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryStartShouldInvokeRegisteredEventHandler()
-        {
-            bool discoveryStartReceived = false;
-            DiscoveryStartEventArgs receivedEventArgs = null;
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            DiscoveryCriteria discoveryCriteria = new DiscoveryCriteria() { TestCaseFilter = "Name=Test1" };
-            DiscoveryStartEventArgs discoveryStartEventArgs = new DiscoveryStartEventArgs(discoveryCriteria);
-
-            // Register for the discovery start event.
-            loggerEvents.DiscoveryStart += (sender, e) =>
-            {
-                discoveryStartReceived = true;
-                receivedEventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the discovery start event.
-            loggerEvents.RaiseDiscoveryStart(discoveryStartEventArgs);
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(discoveryStartReceived);
-            Assert.IsNotNull(receivedEventArgs);
-            Assert.AreEqual(receivedEventArgs, discoveryStartEventArgs);
-            Assert.AreEqual("Name=Test1", receivedEventArgs.DiscoveryCriteria.TestCaseFilter);
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseDiscoveryStart(discoveryStartEventArgs));
+    }
 
-        /// <summary>
-        /// Check for invocation to registered event handlers.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryCompleteShouldInvokeRegisteredEventHandler()
-        {
-            bool discoveryCompleteReceived = false;
-            DiscoveryCompleteEventArgs receivedEventArgs = null;
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
-
-            // Register for the discovery complete event.
-            loggerEvents.DiscoveryComplete += (sender, e) =>
-            {
-                discoveryCompleteReceived = true;
-                receivedEventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the discovery complete event.
-            loggerEvents.RaiseDiscoveryComplete(discoveryCompleteEventArgs);
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(discoveryCompleteReceived);
-            Assert.IsNotNull(receivedEventArgs);
-            Assert.AreEqual(receivedEventArgs, discoveryCompleteEventArgs);
-        }
+    /// <summary>
+    /// Exception should be thrown if logger events are already disposed.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryCompleteShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new(2, false);
 
-        /// <summary>
-        /// Exception should be thrown if event args passed is null.
-        /// </summary>
-        [TestMethod]
-        public void RaiseTestRunStartShouldThrowExceptionIfNullTestRunStartEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseTestRunStart(null);
-            });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseDiscoveryComplete(discoveryCompleteEventArgs));
+    }
 
-        /// <summary>
-        /// Exception should be thrown if event args passed is null.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryMessageShouldThrowExceptionIfNullTestRunMessageEventArgsIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryMessage(null);
-            });
-        }
+    /// <summary>
+    /// Check for invocation to registered event handlers.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryStartShouldInvokeRegisteredEventHandler()
+    {
+        bool discoveryStartReceived = false;
+        DiscoveryStartEventArgs? receivedEventArgs = null;
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+
+        DiscoveryCriteria discoveryCriteria = new() { TestCaseFilter = "Name=Test1" };
+        DiscoveryStartEventArgs discoveryStartEventArgs = new(discoveryCriteria);
+
+        // Register for the discovery start event.
+        _loggerEvents.DiscoveryStart += (sender, e) =>
+        {
+            discoveryStartReceived = true;
+            receivedEventArgs = e;
+            waitHandle.Set();
+        };
+
+        _loggerEvents.EnableEvents();
+        // Send the discovery start event.
+        _loggerEvents.RaiseDiscoveryStart(discoveryStartEventArgs);
+
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(discoveryStartReceived);
+        Assert.IsNotNull(receivedEventArgs);
+        Assert.AreEqual(receivedEventArgs, discoveryStartEventArgs);
+        Assert.AreEqual("Name=Test1", receivedEventArgs.DiscoveryCriteria.TestCaseFilter);
+    }
 
-        /// <summary>
-        /// Exception should be thrown if logger events are already disposed.
-        /// </summary>
-        [TestMethod]
-        public void RaiseTestRunStartShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            TestRunCriteria testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
-            TestRunStartEventArgs testRunStartEventArgs = new TestRunStartEventArgs(testRunCriteria);
-
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
-            });
-        }
+    /// <summary>
+    /// Check for invocation to registered event handlers.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryCompleteShouldInvokeRegisteredEventHandler()
+    {
+        bool discoveryCompleteReceived = false;
+        DiscoveryCompleteEventArgs? receivedEventArgs = null;
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
 
-        /// <summary>
-        /// Exception should be thrown if logger events are already disposed.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryMessageShouldThrowExceptionIfAlreadyDisposed()
-        {
-            var loggerEvents = GetDisposedLoggerEvents();
-            string message = "This is the test message";
-            TestRunMessageEventArgs testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
-
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                loggerEvents.RaiseDiscoveryMessage(testRunMessageEventArgs);
-            });
-        }
+        DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new(2, false);
 
-        /// <summary>
-        /// Check for invocation to registered event handlers.
-        /// </summary>
-        [TestMethod]
-        public void RaiseTestRunStartShouldInvokeRegisteredEventHandler()
+        // Register for the discovery complete event.
+        _loggerEvents.DiscoveryComplete += (sender, e) =>
         {
-            bool testRunStartReceived = false;
-            TestRunStartEventArgs receivedEventArgs = null;
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            TestRunCriteria testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
-            TestRunStartEventArgs testRunStartEventArgs = new TestRunStartEventArgs(testRunCriteria);
-
-            // Register for the test run start event.
-            loggerEvents.TestRunStart += (sender, e) =>
-            {
-                testRunStartReceived = true;
-                receivedEventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the test run start event.
-            loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(testRunStartReceived);
-            Assert.IsNotNull(receivedEventArgs);
-            Assert.AreEqual(receivedEventArgs, testRunStartEventArgs);
-            Assert.AreEqual("Name=Test1", receivedEventArgs.TestRunCriteria.TestCaseFilter);
-        }
+            discoveryCompleteReceived = true;
+            receivedEventArgs = e;
+            waitHandle.Set();
+        };
 
-        /// <summary>
-        /// Check for invocation to registered event handlers.
-        /// </summary>
-        [TestMethod]
-        public void RaiseDiscoveryMessageShouldInvokeRegisteredEventHandler()
-        {
-            bool discoveryMessageReceived = false;
-            TestRunMessageEventArgs receivedEventArgs = null;
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-
-            string message = "This is the test message";
-            TestRunMessageEventArgs testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
-
-            // Register for the discovery message event.
-            loggerEvents.DiscoveryMessage += (sender, e) =>
-            {
-                discoveryMessageReceived = true;
-                receivedEventArgs = e;
-                waitHandle.Set();
-            };
-
-            loggerEvents.EnableEvents();
-            // Send the discovery message event.
-            loggerEvents.RaiseDiscoveryMessage(testRunMessageEventArgs);
-
-            var waitSuccess = waitHandle.WaitOne(500);
-            Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
-            Assert.IsTrue(discoveryMessageReceived);
-            Assert.IsNotNull(receivedEventArgs);
-            Assert.AreEqual(receivedEventArgs, testRunMessageEventArgs);
-            Assert.AreEqual(message, receivedEventArgs.Message);
-            Assert.AreEqual(TestMessageLevel.Informational, receivedEventArgs.Level);
-        }
+        _loggerEvents.EnableEvents();
+        // Send the discovery complete event.
+        _loggerEvents.RaiseDiscoveryComplete(discoveryCompleteEventArgs);
 
-        /// <summary>
-        /// Gets a disposed instance of the logger events.
-        /// </summary>
-        /// <returns>Disposed instance.</returns>
-        private InternalTestLoggerEvents GetDisposedLoggerEvents()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(testSessionMessageLogger);
-            loggerEvents.Dispose();
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(discoveryCompleteReceived);
+        Assert.IsNotNull(receivedEventArgs);
+        Assert.AreEqual(receivedEventArgs, discoveryCompleteEventArgs);
+    }
 
-            return loggerEvents;
-        }
+    /// <summary>
+    /// Exception should be thrown if event args passed is null.
+    /// </summary>
+    [TestMethod]
+    public void RaiseTestRunStartShouldThrowExceptionIfNullTestRunStartEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseTestRunStart(null!));
+    }
+
+    /// <summary>
+    /// Exception should be thrown if event args passed is null.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryMessageShouldThrowExceptionIfNullTestRunMessageEventArgsIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _loggerEvents.RaiseDiscoveryMessage(null!));
+    }
+
+    /// <summary>
+    /// Exception should be thrown if logger events are already disposed.
+    /// </summary>
+    [TestMethod]
+    public void RaiseTestRunStartShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        TestRunCriteria testRunCriteria = new(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
+        TestRunStartEventArgs testRunStartEventArgs = new(testRunCriteria);
+
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseTestRunStart(testRunStartEventArgs));
+    }
+
+    /// <summary>
+    /// Exception should be thrown if logger events are already disposed.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryMessageShouldThrowExceptionIfAlreadyDisposed()
+    {
+        var loggerEvents = GetDisposedLoggerEvents();
+        string message = "This is the test message";
+        TestRunMessageEventArgs testRunMessageEventArgs = new(TestMessageLevel.Informational, message);
+
+        Assert.ThrowsException<ObjectDisposedException>(() => loggerEvents.RaiseDiscoveryMessage(testRunMessageEventArgs));
+    }
+
+    /// <summary>
+    /// Check for invocation to registered event handlers.
+    /// </summary>
+    [TestMethod]
+    public void RaiseTestRunStartShouldInvokeRegisteredEventHandler()
+    {
+        bool testRunStartReceived = false;
+        TestRunStartEventArgs? receivedEventArgs = null;
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+
+        TestRunCriteria testRunCriteria = new(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
+        TestRunStartEventArgs testRunStartEventArgs = new(testRunCriteria);
+
+        // Register for the test run start event.
+        _loggerEvents.TestRunStart += (sender, e) =>
+        {
+            testRunStartReceived = true;
+            receivedEventArgs = e;
+            waitHandle.Set();
+        };
+
+        _loggerEvents.EnableEvents();
+        // Send the test run start event.
+        _loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
+
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(testRunStartReceived);
+        Assert.IsNotNull(receivedEventArgs);
+        Assert.AreEqual(receivedEventArgs, testRunStartEventArgs);
+        Assert.AreEqual("Name=Test1", receivedEventArgs.TestRunCriteria.TestCaseFilter);
+    }
+
+    /// <summary>
+    /// Check for invocation to registered event handlers.
+    /// </summary>
+    [TestMethod]
+    public void RaiseDiscoveryMessageShouldInvokeRegisteredEventHandler()
+    {
+        bool discoveryMessageReceived = false;
+        TestRunMessageEventArgs? receivedEventArgs = null;
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+
+        string message = "This is the test message";
+        TestRunMessageEventArgs testRunMessageEventArgs = new(TestMessageLevel.Informational, message);
+
+        // Register for the discovery message event.
+        _loggerEvents.DiscoveryMessage += (sender, e) =>
+        {
+            discoveryMessageReceived = true;
+            receivedEventArgs = e;
+            waitHandle.Set();
+        };
+
+        _loggerEvents.EnableEvents();
+        // Send the discovery message event.
+        _loggerEvents.RaiseDiscoveryMessage(testRunMessageEventArgs);
+
+        var waitSuccess = waitHandle.WaitOne(500);
+        Assert.IsTrue(waitSuccess, "Event must be raised within timeout.");
+        Assert.IsTrue(discoveryMessageReceived);
+        Assert.IsNotNull(receivedEventArgs);
+        Assert.AreEqual(receivedEventArgs, testRunMessageEventArgs);
+        Assert.AreEqual(message, receivedEventArgs.Message);
+        Assert.AreEqual(TestMessageLevel.Informational, receivedEventArgs.Level);
+    }
+
+    /// <summary>
+    /// Gets a disposed instance of the logger events.
+    /// </summary>
+    /// <returns>Disposed instance.</returns>
+    private InternalTestLoggerEvents GetDisposedLoggerEvents()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(_testSessionMessageLogger);
+        loggerEvents.Dispose();
+
+        return loggerEvents;
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Logging/TestSessionMessageLoggerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Logging/TestSessionMessageLoggerTests.cs
index 13d32e095d..12fa395398 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Logging/TestSessionMessageLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Logging/TestSessionMessageLoggerTests.cs
@@ -1,66 +1,63 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Logging
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    [TestClass]
-    public class TestSessionMessageLoggerTests
-    {
-        private TestSessionMessageLogger testSessionMessageLogger;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private TestRunMessageEventArgs currentEventArgs;
+namespace Microsoft.TestPlatform.Common.UnitTests.Logging;
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.testSessionMessageLogger = TestSessionMessageLogger.Instance;
-        }
+[TestClass]
+public class TestSessionMessageLoggerTests
+{
+    private readonly TestSessionMessageLogger _testSessionMessageLogger;
+    private TestRunMessageEventArgs? _currentEventArgs;
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestSessionMessageLogger.Instance = null;
-        }
+    public TestSessionMessageLoggerTests()
+    {
+        _testSessionMessageLogger = TestSessionMessageLogger.Instance;
+    }
 
-        [TestMethod]
-        public void InstanceShouldReturnALoggerInstance()
-        {
-            Assert.IsNotNull(this.testSessionMessageLogger);
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        TestSessionMessageLogger.Instance = null;
+    }
 
-        [TestMethod]
-        public void SendMessageShouldLogErrorMessages()
-        {
-            this.testSessionMessageLogger.TestRunMessage += OnMessage;
+    [TestMethod]
+    public void InstanceShouldReturnALoggerInstance()
+    {
+        Assert.IsNotNull(_testSessionMessageLogger);
+    }
 
-            var message = "Alert";
-            this.testSessionMessageLogger.SendMessage(TestMessageLevel.Error, message);
+    [TestMethod]
+    public void SendMessageShouldLogErrorMessages()
+    {
+        _testSessionMessageLogger.TestRunMessage += OnMessage;
 
-            Assert.AreEqual(TestMessageLevel.Error, this.currentEventArgs.Level);
-            Assert.AreEqual(message, this.currentEventArgs.Message);
-        }
+        var message = "Alert";
+        _testSessionMessageLogger.SendMessage(TestMessageLevel.Error, message);
 
-        [TestMethod]
-        public void SendMessageShouldLogErrorAsWarningIfSpecifiedSo()
-        {
-            this.testSessionMessageLogger.TestRunMessage += OnMessage;
-            this.testSessionMessageLogger.TreatTestAdapterErrorsAsWarnings = true;
+        Assert.AreEqual(TestMessageLevel.Error, _currentEventArgs!.Level);
+        Assert.AreEqual(message, _currentEventArgs.Message);
+    }
 
-            var message = "Alert";
-            this.testSessionMessageLogger.SendMessage(TestMessageLevel.Error, message);
+    [TestMethod]
+    public void SendMessageShouldLogErrorAsWarningIfSpecifiedSo()
+    {
+        _testSessionMessageLogger.TestRunMessage += OnMessage;
+        _testSessionMessageLogger.TreatTestAdapterErrorsAsWarnings = true;
 
-            Assert.AreEqual(TestMessageLevel.Warning, this.currentEventArgs.Level);
-            Assert.AreEqual(message, this.currentEventArgs.Message);
-        }
+        var message = "Alert";
+        _testSessionMessageLogger.SendMessage(TestMessageLevel.Error, message);
 
-        private void OnMessage(object sender, TestRunMessageEventArgs e)
-        {
-            this.currentEventArgs = e;
-        }
+        Assert.AreEqual(TestMessageLevel.Warning, _currentEventArgs!.Level);
+        Assert.AreEqual(message, _currentEventArgs.Message);
+    }
+
+    private void OnMessage(object? sender, TestRunMessageEventArgs e)
+    {
+        _currentEventArgs = e;
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj
index 463037ec3e..85a7135592 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj
@@ -1,23 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Common.UnitTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
@@ -27,5 +19,5 @@
       <ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'%(ResolvedCompileFileDefinitions.Filename)' == 'Microsoft.TestPlatform.CoreUtilities' Or '%(ResolvedCompileFileDefinitions.Filename)' == 'Microsoft.TestPlatform.Common'" />
     </ItemGroup>
   </Target>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs
deleted file mode 100644
index c14da13e69..0000000000
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.Common.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5f434531b6..0000000000
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.Common.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8a00286a-d8ea-4331-a5f5-cf76c6b7461c")]
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/RequestDataTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/RequestDataTests.cs
index 7ed99a3a89..3767137f3e 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/RequestDataTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/RequestDataTests.cs
@@ -1,69 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests
-{
-    using System;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class RequestDataTests
+namespace Microsoft.TestPlatform.Common.UnitTests;
+
+[TestClass]
+public class RequestDataTests
+{
+    [TestMethod]
+    public void RequestDataShouldReturnValidMetricsCollector()
     {
-        [TestMethod]
-        public void RequestDataShouldReturnValidMetricsCollector()
-        {
-            var requestData = new RequestData();
-            var metricsCollection = new MetricsCollection();
-            requestData.MetricsCollection = metricsCollection;
+        var requestData = new RequestData();
+        var metricsCollection = new MetricsCollection();
+        requestData.MetricsCollection = metricsCollection;
 
-            Assert.AreEqual(metricsCollection, requestData.MetricsCollection);
-        }
+        Assert.AreEqual(metricsCollection, requestData.MetricsCollection);
+    }
 
-        [TestMethod]
-        public void RequestDataShouldReturnValidProtocolConfig()
-        {
-            var requestData = new RequestData();
-            requestData.ProtocolConfig = new ProtocolConfig { Version = 2 };
+    [TestMethod]
+    public void RequestDataShouldReturnValidProtocolConfig()
+    {
+        var requestData = new RequestData();
+        requestData.ProtocolConfig = new ProtocolConfig { Version = 2 };
 
-            Assert.AreEqual(2, requestData.ProtocolConfig.Version);
-        }
+        Assert.AreEqual(2, requestData.ProtocolConfig.Version);
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RequestDataShouldThrowArgumentNullExpectionOnNullMetricsCollection()
-        {
-            var requestData = new RequestData();
-            requestData.MetricsCollection = null;
-        }
+    [TestMethod]
+    [ExpectedException(typeof(ArgumentNullException))]
+    public void RequestDataShouldThrowArgumentNullExpectionOnNullMetricsCollection()
+    {
+        var requestData = new RequestData();
+        requestData.MetricsCollection = null!;
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void RequestDataShouldThrowArgumentNullExpectionOnNullProtocolConfig()
-        {
-            var requestData = new RequestData();
-            requestData.ProtocolConfig = null;
-        }
+    [TestMethod]
+    [ExpectedException(typeof(ArgumentNullException))]
+    public void RequestDataShouldThrowArgumentNullExpectionOnNullProtocolConfig()
+    {
+        var requestData = new RequestData();
+        requestData.ProtocolConfig = null;
+    }
 
-        [TestMethod]
-        public void RequestDataShouldReturnIsTelemetryOptedInTrueIfTelemetryOptedIn()
-        {
-            var requestData = new RequestData();
-            requestData.IsTelemetryOptedIn = true;
+    [TestMethod]
+    public void RequestDataShouldReturnIsTelemetryOptedInTrueIfTelemetryOptedIn()
+    {
+        var requestData = new RequestData();
+        requestData.IsTelemetryOptedIn = true;
 
-            Assert.IsTrue(requestData.IsTelemetryOptedIn);
-        }
+        Assert.IsTrue(requestData.IsTelemetryOptedIn);
+    }
 
-        [TestMethod]
-        public void RequestDataShouldReturnIsTelemetryOptedInFalseIfTelemetryOptedOut()
-        {
-            var requestData = new RequestData();
-            requestData.IsTelemetryOptedIn = false;
+    [TestMethod]
+    public void RequestDataShouldReturnIsTelemetryOptedInFalseIfTelemetryOptedOut()
+    {
+        var requestData = new RequestData();
+        requestData.IsTelemetryOptedIn = false;
 
-            Assert.IsFalse(requestData.IsTelemetryOptedIn);
-        }
+        Assert.IsFalse(requestData.IsTelemetryOptedIn);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsManagerTests.cs
index ef3b64032b..75bf473528 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsManagerTests.cs
@@ -1,67 +1,66 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests;
+
+[TestClass]
+public class RunSettingsManagerTests
 {
-    using System;
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        RunSettingsManager.Instance = null;
+    }
+
+    [TestMethod]
+    public void InstanceShouldReturnARunSettingsManagerInstance()
+    {
+        var instance = RunSettingsManager.Instance;
+
+        Assert.IsNotNull(instance);
+        Assert.AreEqual(typeof(RunSettingsManager), instance.GetType());
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void InstanceShouldReturnACachedValue()
+    {
+        var instance = RunSettingsManager.Instance;
+        var instance2 = RunSettingsManager.Instance;
+
+        Assert.AreEqual(instance, instance2);
+    }
 
-    [TestClass]
-    public class RunSettingsManagerTests
+    [TestMethod]
+    public void ActiveRunSettingsShouldBeNonNullByDefault()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            RunSettingsManager.Instance = null;
-        }
-
-        [TestMethod]
-        public void InstanceShouldReturnARunSettingsManagerInstance()
-        {
-            var instance = RunSettingsManager.Instance;
-
-            Assert.IsNotNull(instance);
-            Assert.AreEqual(typeof(RunSettingsManager), instance.GetType());
-        }
-
-        [TestMethod]
-        public void InstanceShouldReturnACachedValue()
-        {
-            var instance = RunSettingsManager.Instance;
-            var instance2 = RunSettingsManager.Instance;
-
-            Assert.AreEqual(instance, instance2);
-        }
-
-        [TestMethod]
-        public void ActiveRunSettingsShouldBeNonNullByDefault()
-        {
-            var instance = RunSettingsManager.Instance;
-
-            Assert.IsNotNull(instance.ActiveRunSettings);
-        }
-
-        [TestMethod]
-        public void SetActiveRunSettingsShouldThrowIfRunSettingsPassedIsNull()
-        {
-            var instance = RunSettingsManager.Instance;
-
-            Assert.ThrowsException<ArgumentNullException>(() => instance.SetActiveRunSettings(null));
-        }
-
-        [TestMethod]
-        public void SetActiveRunSettingsShouldSetTheActiveRunSettingsProperty()
-        {
-            var instance = RunSettingsManager.Instance;
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml("<RunSettings></RunSettings>");
-
-            instance.SetActiveRunSettings(runSettings);
-
-            Assert.AreEqual(runSettings, instance.ActiveRunSettings);
-        }
+        var instance = RunSettingsManager.Instance;
+
+        Assert.IsNotNull(instance.ActiveRunSettings);
+    }
+
+    [TestMethod]
+    public void SetActiveRunSettingsShouldThrowIfRunSettingsPassedIsNull()
+    {
+        var instance = RunSettingsManager.Instance;
+
+        Assert.ThrowsException<ArgumentNullException>(() => instance.SetActiveRunSettings(null!));
+    }
+
+    [TestMethod]
+    public void SetActiveRunSettingsShouldSetTheActiveRunSettingsProperty()
+    {
+        var instance = RunSettingsManager.Instance;
+
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml("<RunSettings></RunSettings>");
+
+        instance.SetActiveRunSettings(runSettings);
+
+        Assert.AreEqual(runSettings, instance.ActiveRunSettings);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsTests.cs
index 8688f16b7f..a21b3d16b4 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/RunSettingsTests.cs
@@ -1,276 +1,272 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests
+using System;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests;
+
+[TestClass]
+public class RunSettingsTests
 {
-    using System;
-    using System.Xml;
-
-    using ExtensionFramework;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class RunSettingsTests
+    [TestCleanup]
+    public void TestCleanup()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestPluginCacheHelper.ResetExtensionsCache();
-            TestSessionMessageLogger.Instance = null;
-        }
+        TestPluginCacheHelper.ResetExtensionsCache();
+        TestSessionMessageLogger.Instance = null;
+    }
 
-        #region LoadSettingsXML Tests
+    #region LoadSettingsXML Tests
 
-        [TestMethod]
-        public void LoadSettingsXmlShouldThrowOnNullSettings()
-        {
-            var runSettings = new RunSettings();
-            Assert.ThrowsException<ArgumentException>(() => runSettings.LoadSettingsXml(null));
-        }
+    [TestMethod]
+    public void LoadSettingsXmlShouldThrowOnNullSettings()
+    {
+        var runSettings = new RunSettings();
+        Assert.ThrowsException<ArgumentException>(() => runSettings.LoadSettingsXml(null!));
+    }
 
-        [TestMethod]
-        public void LoadSettingsXmlShouldThrowOnEmptySettings()
-        {
-            var runSettings = new RunSettings();
-            Assert.ThrowsException<ArgumentException>(() => runSettings.LoadSettingsXml("  "));
-        }
+    [TestMethod]
+    public void LoadSettingsXmlShouldThrowOnEmptySettings()
+    {
+        var runSettings = new RunSettings();
+        Assert.ThrowsException<ArgumentException>(() => runSettings.LoadSettingsXml("  "));
+    }
 
-        [TestMethod]
-        public void LoadSettingsXmlShoulLoadAndInitializeSettingsXml()
-        {
-            var runSettings = new RunSettings();
-            var emptyRunSettings = this.GetEmptyRunSettings();
+    [TestMethod]
+    public void LoadSettingsXmlShoulLoadAndInitializeSettingsXml()
+    {
+        var runSettings = new RunSettings();
+        var emptyRunSettings = GetEmptyRunSettings();
 
-            runSettings.LoadSettingsXml(emptyRunSettings);
+        runSettings.LoadSettingsXml(emptyRunSettings);
 
-            // Not doing this because when we load the xml and write to string it converts it to a utf-16 format.
-            // So they do not exactly match.
-            // Assert.AreEqual(emptyRunSettings, runSettings.SettingsXml);
+        // Not doing this because when we load the xml and write to string it converts it to a utf-16 format.
+        // So they do not exactly match.
+        // Assert.AreEqual(emptyRunSettings, runSettings.SettingsXml);
 
-            var expectedRunSettings = "<RunSettings>" + Environment.NewLine
-                                      + "</RunSettings>";
-            StringAssert.Contains(runSettings.SettingsXml, expectedRunSettings);
-        }
+        var expectedRunSettings = "<RunSettings>" + Environment.NewLine
+                                                  + "</RunSettings>";
+        StringAssert.Contains(runSettings.SettingsXml, expectedRunSettings);
+    }
 
-        [TestMethod]
-        public void LoadSettingsXmlShouldThrowOnInvalidSettings()
-        {
-            var runSettings = new RunSettings();
-            var invalidSettings = this.GetInvalidRunSettings();
+    [TestMethod]
+    public void LoadSettingsXmlShouldThrowOnInvalidSettings()
+    {
+        var runSettings = new RunSettings();
+        var invalidSettings = GetInvalidRunSettings();
 
-            Assert.ThrowsException<SettingsException>(
-                () => runSettings.LoadSettingsXml(invalidSettings),
-                "An error occurred while loading the run settings.");
-        }
+        Assert.ThrowsException<SettingsException>(
+            () => runSettings.LoadSettingsXml(invalidSettings),
+            "An error occurred while loading the run settings.");
+    }
 
-        #endregion
+    #endregion
 
-        #region InitializeSettingsProviders and GetSettings tests
+    #region InitializeSettingsProviders and GetSettings tests
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldThrowOnNullSettings()
-        {
-            var runSettings = new RunSettings();
-            Assert.ThrowsException<ArgumentNullException>(() => runSettings.InitializeSettingsProviders(null));
-        }
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldThrowOnNullSettings()
+    {
+        var runSettings = new RunSettings();
+        Assert.ThrowsException<ArgumentNullException>(() => runSettings.InitializeSettingsProviders(null!));
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldWorkForEmptyRunSettings()
-        {
-            var runSettings = new RunSettings();
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldWorkForEmptyRunSettings()
+    {
+        var runSettings = new RunSettings();
 
-            runSettings.InitializeSettingsProviders(this.GetEmptyRunSettings());
+        runSettings.InitializeSettingsProviders(GetEmptyRunSettings());
 
-            Assert.IsNull(runSettings.GetSettings("RunSettings"));
-        }
+        Assert.IsNull(runSettings.GetSettings("RunSettings"));
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldThrowIfNodeInRunSettingsDoesNotHaveAProvider()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldThrowIfNodeInRunSettingsDoesNotHaveAProvider()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
 
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetRunSettingsWithUndefinedSettingsNodes());
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetRunSettingsWithUndefinedSettingsNodes());
 
-            Action action =
-                () => runSettings.GetSettings("OrphanNode");
+        Action action =
+            () => runSettings.GetSettings("OrphanNode");
 
-            Assert.ThrowsException<SettingsException>(
-                action,
-                "Settings Provider named '{0}' was not found.  The settings can not be loaded.",
-                "OrphanNode");
-        }
+        Assert.ThrowsException<SettingsException>(
+            action,
+            "Settings Provider named '{0}' was not found.  The settings can not be loaded.",
+            "OrphanNode");
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldThrowIfSettingsProviderLoadThrows()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldThrowIfSettingsProviderLoadThrows()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
 
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetRunSettingsWithBadSettingsNodes());
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetRunSettingsWithBadSettingsNodes());
 
-            Action action =
-                () => runSettings.GetSettings("BadSettings");
+        Action action =
+            () => runSettings.GetSettings("BadSettings");
 
-            Assert.ThrowsException<SettingsException>(
-                action,
-                "An error occurred while initializing the settings provider named '{0}'",
-                "BadSettings");
-        }
+        Assert.ThrowsException<SettingsException>(
+            action,
+            "An error occurred while initializing the settings provider named '{0}'",
+            "BadSettings");
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldThrowIfInvalidRunSettingsIsPassed()
-        {
-            var runSettings = new RunSettings();
-            Assert.ThrowsException<SettingsException>(
-                () => runSettings.InitializeSettingsProviders(this.GetInvalidRunSettings()),
-                "An error occurred while loading the run settings.");
-        }
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldThrowIfInvalidRunSettingsIsPassed()
+    {
+        var runSettings = new RunSettings();
+        Assert.ThrowsException<SettingsException>(
+            () => runSettings.InitializeSettingsProviders(GetInvalidRunSettings()),
+            "An error occurred while loading the run settings.");
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersMultipleTimesShouldThrowInvalidOperationException()
-        {
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetEmptyRunSettings());
-            Assert.ThrowsException<InvalidOperationException>(
-                () => runSettings.InitializeSettingsProviders(this.GetEmptyRunSettings()),
-                "The Run Settings have already been loaded.");
-        }
+    [TestMethod]
+    public void InitializeSettingsProvidersMultipleTimesShouldThrowInvalidOperationException()
+    {
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetEmptyRunSettings());
+        Assert.ThrowsException<InvalidOperationException>(
+            () => runSettings.InitializeSettingsProviders(GetEmptyRunSettings()),
+            "The Run Settings have already been loaded.");
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldLoadSettingsIntoASettingsProvider()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldLoadSettingsIntoASettingsProvider()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
 
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetRunSettingsWithRunConfigurationNode());
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetRunSettingsWithRunConfigurationNode());
 
-            var settingsProvider = runSettings.GetSettings("RunConfiguration");
+        var settingsProvider = runSettings.GetSettings("RunConfiguration");
 
-            Assert.IsNotNull(settingsProvider);
-            Assert.IsTrue(settingsProvider is RunConfigurationSettingsProvider);
+        Assert.IsNotNull(settingsProvider);
+        Assert.IsTrue(settingsProvider is RunConfigurationSettingsProvider);
 
-            // Also validate that the settings provider gets the right subtree.
-            Assert.AreEqual(
-                "<RunConfiguration><Architecture>x86</Architecture></RunConfiguration>",
-                (settingsProvider as RunConfigurationSettingsProvider).SettingsTree);
-        }
+        // Also validate that the settings provider gets the right subtree.
+        Assert.AreEqual(
+            "<RunConfiguration><Architecture>x86</Architecture></RunConfiguration>",
+            ((RunConfigurationSettingsProvider)settingsProvider).SettingsTree);
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldLoadSettingsIntoMultipleSettingsProviders()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldLoadSettingsIntoMultipleSettingsProviders()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
 
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetRunSettingsWithRunConfigurationAndMSTestNode());
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetRunSettingsWithRunConfigurationAndMsTestNode());
 
-            var rcSettingsProvider = runSettings.GetSettings("RunConfiguration");
-            var mstestSettingsProvider = runSettings.GetSettings("MSTest");
+        var rcSettingsProvider = runSettings.GetSettings("RunConfiguration");
+        var mstestSettingsProvider = runSettings.GetSettings("MSTest");
 
-            Assert.IsNotNull(rcSettingsProvider);
-            Assert.IsTrue(rcSettingsProvider is RunConfigurationSettingsProvider);
-            Assert.AreEqual(
-                "<RunConfiguration><Architecture>x86</Architecture></RunConfiguration>",
-                (rcSettingsProvider as RunConfigurationSettingsProvider).SettingsTree);
+        Assert.IsNotNull(rcSettingsProvider);
+        Assert.IsTrue(rcSettingsProvider is RunConfigurationSettingsProvider);
+        Assert.AreEqual(
+            "<RunConfiguration><Architecture>x86</Architecture></RunConfiguration>",
+            ((RunConfigurationSettingsProvider)rcSettingsProvider).SettingsTree);
 
-            Assert.IsNotNull(mstestSettingsProvider);
-            Assert.IsTrue(mstestSettingsProvider is MSTestSettingsProvider);
-            Assert.AreEqual(
-                "<MSTest><NoAppDomain>true</NoAppDomain></MSTest>",
-                (mstestSettingsProvider as MSTestSettingsProvider).SettingsTree);
-        }
+        Assert.IsNotNull(mstestSettingsProvider);
+        Assert.IsTrue(mstestSettingsProvider is MsTestSettingsProvider);
+        Assert.AreEqual(
+            "<MSTest><NoAppDomain>true</NoAppDomain></MSTest>",
+            ((MsTestSettingsProvider)mstestSettingsProvider).SettingsTree);
+    }
 
-        [TestMethod]
-        public void InitializeSettingsProvidersShouldWarnOfDuplicateSettings()
-        {
-            string receivedWarningMessage = null;
+    [TestMethod]
+    public void InitializeSettingsProvidersShouldWarnOfDuplicateSettings()
+    {
+        string? receivedWarningMessage = null;
 
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
-            TestSessionMessageLogger.Instance.TestRunMessage += (object sender, TestRunMessageEventArgs e) =>
-            {
-                receivedWarningMessage = e.Message;
-            };
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsTests));
+        TestSessionMessageLogger.Instance.TestRunMessage += (object? sender, TestRunMessageEventArgs e) => receivedWarningMessage = e.Message;
 
-            var runSettings = new RunSettings();
-            runSettings.InitializeSettingsProviders(this.GetRunSettingsWithDuplicateSettingsNodes());
+        var runSettings = new RunSettings();
+        runSettings.InitializeSettingsProviders(GetRunSettingsWithDuplicateSettingsNodes());
 
-            Assert.IsNotNull(receivedWarningMessage);
-            Assert.AreEqual(
-                "Duplicate run settings section named 'RunConfiguration' found.  Ignoring the duplicate settings.",
-                receivedWarningMessage);
-        }
+        Assert.IsNotNull(receivedWarningMessage);
+        Assert.AreEqual(
+            "Duplicate run settings section named 'RunConfiguration' found.  Ignoring the duplicate settings.",
+            receivedWarningMessage);
+    }
 
-        #endregion
+    #endregion
 
-        #region GetSettings tests
+    #region GetSettings tests
 
-        [TestMethod]
-        public void GetSettingsShouldThrowIfSettingsNameIsNull()
-        {
-            var runSettings = new RunSettings();
+    [TestMethod]
+    public void GetSettingsShouldThrowIfSettingsNameIsNull()
+    {
+        var runSettings = new RunSettings();
 
-            Assert.ThrowsException<ArgumentException>(() => runSettings.GetSettings(null));
-        }
+        Assert.ThrowsException<ArgumentException>(() => runSettings.GetSettings(null!));
+    }
 
-        [TestMethod]
-        public void GetSettingsShouldThrowIfSettingsNameIsEmpty()
-        {
-            var runSettings = new RunSettings();
+    [TestMethod]
+    public void GetSettingsShouldThrowIfSettingsNameIsEmpty()
+    {
+        var runSettings = new RunSettings();
 
-            Assert.ThrowsException<ArgumentException>(() => runSettings.GetSettings("  "));
-        }
+        Assert.ThrowsException<ArgumentException>(() => runSettings.GetSettings("  "));
+    }
 
-        // The remaining GetSettings tests are covered in the InitializeSettingsProviders tests above.
-        #endregion
+    // The remaining GetSettings tests are covered in the InitializeSettingsProviders tests above.
+    #endregion
 
-        #region Private methods
+    #region Private methods
 
-        private string GetEmptyRunSettings()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetEmptyRunSettings()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 </RunSettings>";
-        }
+    }
 
-        private string GetRunSettingsWithUndefinedSettingsNodes()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetRunSettingsWithUndefinedSettingsNodes()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 <OrphanNode>
 <o> </o>
 </OrphanNode>
 </RunSettings>";
-        }
+    }
 
-        private string GetRunSettingsWithBadSettingsNodes()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetRunSettingsWithBadSettingsNodes()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 <BadSettings>
 <o> </o>
 </BadSettings>
 </RunSettings>";
-        }
+    }
 
-        private string GetRunSettingsWithRunConfigurationNode()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetRunSettingsWithRunConfigurationNode()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 <RunConfiguration>
 <Architecture>x86</Architecture>
 </RunConfiguration>
 </RunSettings>";
-        }
+    }
 
-        private string GetRunSettingsWithRunConfigurationAndMSTestNode()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetRunSettingsWithRunConfigurationAndMsTestNode()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 <RunConfiguration>
 <Architecture>x86</Architecture>
@@ -279,63 +275,62 @@ private string GetRunSettingsWithRunConfigurationAndMSTestNode()
 <NoAppDomain>true</NoAppDomain>
 </MSTest>
 </RunSettings>";
-        }
+    }
 
-        private string GetRunSettingsWithDuplicateSettingsNodes()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetRunSettingsWithDuplicateSettingsNodes()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 <RunConfiguration>
 </RunConfiguration>
 <RunConfiguration>
 </RunConfiguration>
 </RunSettings>";
-        }
+    }
 
-        private string GetInvalidRunSettings()
-        {
-            return @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private static string GetInvalidRunSettings()
+    {
+        return @"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
 </RunSettingsInvalid>";
-        }
+    }
 
-        #endregion
+    #endregion
 
-        #region Testable Implementations
+    #region Testable Implementations
 
-        [SettingsName("RunConfiguration")]
-        private class RunConfigurationSettingsProvider : ISettingsProvider
-        {
-            public string SettingsTree { get; set; }
+    [SettingsName("RunConfiguration")]
+    private class RunConfigurationSettingsProvider : ISettingsProvider
+    {
+        public string? SettingsTree { get; set; }
 
-            public void Load(XmlReader reader)
-            {
-                reader.Read();
-                this.SettingsTree = reader.ReadOuterXml();
-            }
+        public void Load(XmlReader reader)
+        {
+            reader.Read();
+            SettingsTree = reader.ReadOuterXml();
         }
+    }
 
-        [SettingsName("MSTest")]
-        private class MSTestSettingsProvider : ISettingsProvider
-        {
-            public string SettingsTree { get; set; }
+    [SettingsName("MSTest")]
+    private class MsTestSettingsProvider : ISettingsProvider
+    {
+        public string? SettingsTree { get; set; }
 
-            public void Load(XmlReader reader)
-            {
-                reader.Read();
-                this.SettingsTree = reader.ReadOuterXml();
-            }
+        public void Load(XmlReader reader)
+        {
+            reader.Read();
+            SettingsTree = reader.ReadOuterXml();
         }
+    }
 
-        [SettingsName("BadSettings")]
-        private class BadSettingsProvider : ISettingsProvider
+    [SettingsName("BadSettings")]
+    private class BadSettingsProvider : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new Exception();
-            }
+            throw new Exception();
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/SettingsProvider/SettingsProviderExtensionManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/SettingsProvider/SettingsProviderExtensionManagerTests.cs
index 8269bd5cc1..bfb5225bc8 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/SettingsProvider/SettingsProviderExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/SettingsProvider/SettingsProviderExtensionManagerTests.cs
@@ -1,240 +1,233 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.SettingsProvider
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.Common.UnitTests.SettingsProvider;
+
+[TestClass]
+public class SettingsProviderExtensionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Xml;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using TestPlatform.Common.UnitTests.ExtensionFramework;
-
-    [TestClass]
-    public class SettingsProviderExtensionManagerTests
+    [TestCleanup]
+    public void TestCleanup()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            SettingsProviderExtensionManager.Destroy();
-        }
+        SettingsProviderExtensionManager.Destroy();
+    }
 
-        #region Constructor tests
+    #region Constructor tests
 
-        [TestMethod]
-        public void ConstructorShouldPopulateSettingsProviderMap()
+    [TestMethod]
+    public void ConstructorShouldPopulateSettingsProviderMap()
+    {
+        var extensions = GetMockExtensions("TestableSettings");
+        var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
         {
-            var extensions = this.GetMockExtensions("TestableSettings");
-            var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
-                                           {
-                                               new LazyExtension<ISettingsProvider,Dictionary<string,object>>
-                                                   (
-                                                   new Mock<ISettingsProvider>().Object,
-                                                   new Dictionary<string,object>())
-                                           };
-            var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
-
-            Assert.IsNotNull(spm.SettingsProvidersMap);
-            Assert.AreEqual("TestableSettings", spm.SettingsProvidersMap.Keys.FirstOrDefault());
-        }
+            new            (
+                new Mock<ISettingsProvider>().Object,
+                new Dictionary<string,object>())
+        };
+        var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
+
+        Assert.IsNotNull(spm.SettingsProvidersMap);
+        Assert.AreEqual("TestableSettings", spm.SettingsProvidersMap.Keys.FirstOrDefault());
+    }
 
-        [TestMethod]
-        public void ConstructorShouldLogWarningOnDuplicateSettingsProviderNames()
+    [TestMethod]
+    public void ConstructorShouldLogWarningOnDuplicateSettingsProviderNames()
+    {
+        var extensions = GetMockExtensions("TestableSettings", "TestableSettings");
+        var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
         {
-            var extensions = this.GetMockExtensions("TestableSettings", "TestableSettings");
-            var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
-                                           {
-                                               new LazyExtension<ISettingsProvider,Dictionary<string,object>>
-                                                   (
-                                                   new Mock<ISettingsProvider>().Object,
-                                                   new Dictionary<string,object>())
-                                           };
-            var mockLogger = new Mock<IMessageLogger>();
-            var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, mockLogger.Object);
-
-            mockLogger.Verify(
-                l =>
+            new            (
+                new Mock<ISettingsProvider>().Object,
+                new Dictionary<string,object>())
+        };
+        var mockLogger = new Mock<IMessageLogger>();
+        var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, mockLogger.Object);
+
+        mockLogger.Verify(
+            l =>
                 l.SendMessage(
                     TestMessageLevel.Error,
                     "Duplicate settings provider named 'TestableSettings'.  Ignoring the duplicate provider."));
 
-            // Also validate the below.
-            Assert.IsNotNull(spm.SettingsProvidersMap);
-            Assert.AreEqual("TestableSettings", spm.SettingsProvidersMap.Keys.FirstOrDefault());
-        }
+        // Also validate the below.
+        Assert.IsNotNull(spm.SettingsProvidersMap);
+        Assert.AreEqual("TestableSettings", spm.SettingsProvidersMap.Keys.FirstOrDefault());
+    }
 
-        #endregion
+    #endregion
 
-        #region Create tests
+    #region Create tests
 
-        [TestMethod]
-        public void CreateShouldDiscoverSettingsProviderExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests));
+    [TestMethod]
+    public void CreateShouldDiscoverSettingsProviderExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests));
 
-            var extensionManager = SettingsProviderExtensionManager.Create();
+        var extensionManager = SettingsProviderExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.SettingsProvidersMap);
-            Assert.IsTrue(extensionManager.SettingsProvidersMap.Count > 0);
-        }
+        Assert.IsNotNull(extensionManager.SettingsProvidersMap);
+        Assert.IsTrue(extensionManager.SettingsProvidersMap.Count > 0);
+    }
 
-        [TestMethod]
-        public void CreateShouldCacheDiscoveredExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests), () => { });
+    [TestMethod]
+    public void CreateShouldCacheDiscoveredExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests), () => { });
 
-            var extensionManager = SettingsProviderExtensionManager.Create();
-            SettingsProviderExtensionManager.Create();
+        var extensionManager = SettingsProviderExtensionManager.Create();
+        SettingsProviderExtensionManager.Create();
 
-            Assert.IsNotNull(extensionManager.SettingsProvidersMap);
-            Assert.IsTrue(extensionManager.SettingsProvidersMap.Count > 0);
-        }
+        Assert.IsNotNull(extensionManager.SettingsProvidersMap);
+        Assert.IsTrue(extensionManager.SettingsProvidersMap.Count > 0);
+    }
 
-        #endregion
+    #endregion
 
-        #region LoadAndInitialize tests
+    #region LoadAndInitialize tests
 
-        [TestMethod]
-        public void LoadAndInitializeShouldInitializeAllExtensions()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests));
+    [TestMethod]
+    public void LoadAndInitializeShouldInitializeAllExtensions()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(SettingsProviderExtensionManagerTests));
 
-            SettingsProviderExtensionManager.LoadAndInitializeAllExtensions(false);
+        SettingsProviderExtensionManager.LoadAndInitializeAllExtensions(false);
 
-            var settingsProviders = SettingsProviderExtensionManager.Create().SettingsProvidersMap.Values;
+        var settingsProviders = SettingsProviderExtensionManager.Create().SettingsProvidersMap.Values;
 
-            foreach (var provider in settingsProviders)
-            {
-                Assert.IsTrue(provider.IsExtensionCreated);
-            }
+        foreach (var provider in settingsProviders)
+        {
+            Assert.IsTrue(provider.IsExtensionCreated);
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region GetSettingsProvider tests
+    #region GetSettingsProvider tests
 
-        [TestMethod]
-        public void GetSettingsProviderShouldThrowIfSettingsNameIsNullOrEmpty()
+    [TestMethod]
+    public void GetSettingsProviderShouldThrowIfSettingsNameIsNullOrEmpty()
+    {
+        var extensions = GetMockExtensions("TestableSettings");
+        var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
         {
-            var extensions = this.GetMockExtensions("TestableSettings");
-            var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
-                                           {
-                                               new LazyExtension<ISettingsProvider,Dictionary<string,object>>
-                                                   (
-                                                   new Mock<ISettingsProvider>().Object,
-                                                   new Dictionary<string,object>())
-                                           };
-            var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
-
-            Assert.ThrowsException<ArgumentException>(() => spm.GetSettingsProvider(null));
-            Assert.ThrowsException<ArgumentException>(() => spm.GetSettingsProvider(string.Empty));
-        }
+            new            (
+                new Mock<ISettingsProvider>().Object,
+                new Dictionary<string,object>())
+        };
+        var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
+
+        Assert.ThrowsException<ArgumentException>(() => spm.GetSettingsProvider(null!));
+        Assert.ThrowsException<ArgumentException>(() => spm.GetSettingsProvider(string.Empty));
+    }
 
-        [TestMethod]
-        public void GetSettingsProviderShouldReturnNullIfSettingsProviderWithSpecifiedNameIsNotFound()
+    [TestMethod]
+    public void GetSettingsProviderShouldReturnNullIfSettingsProviderWithSpecifiedNameIsNotFound()
+    {
+        var extensions = GetMockExtensions("TestableSettings");
+        var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
         {
-            var extensions = this.GetMockExtensions("TestableSettings");
-            var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
-                                           {
-                                               new LazyExtension<ISettingsProvider,Dictionary<string,object>>
-                                                   (
-                                                   new Mock<ISettingsProvider>().Object,
-                                                   new Dictionary<string,object>())
-                                           };
-            var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
-
-            var sp = spm.GetSettingsProvider("RandomSettingsWhichDoesNotExist");
-
-            Assert.IsNull(sp);
-        }
+            new            (
+                new Mock<ISettingsProvider>().Object,
+                new Dictionary<string,object>())
+        };
+        var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
+
+        var sp = spm.GetSettingsProvider("RandomSettingsWhichDoesNotExist");
 
-        [TestMethod]
-        public void GetSettingsProviderShouldReturnSettingsProviderInstance()
+        Assert.IsNull(sp);
+    }
+
+    [TestMethod]
+    public void GetSettingsProviderShouldReturnSettingsProviderInstance()
+    {
+        var extensions = GetMockExtensions("TestableSettings");
+        var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
         {
-            var extensions = this.GetMockExtensions("TestableSettings");
-            var unfilteredExtensions = new List<LazyExtension<ISettingsProvider, Dictionary<string, object>>>
-                                           {
-                                               new LazyExtension<ISettingsProvider,Dictionary<string,object>>
-                                                   (
-                                                   new Mock<ISettingsProvider>().Object,
-                                                   new Dictionary<string,object>())
-                                           };
-            var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
-
-            var sp = spm.GetSettingsProvider("TestableSettings");
-
-            Assert.IsNotNull(sp);
-            Assert.IsNotNull(sp.Value);
-        }
+            new            (
+                new Mock<ISettingsProvider>().Object,
+                new Dictionary<string,object>())
+        };
+        var spm = new TestableSettingsProviderManager(extensions, unfilteredExtensions, new Mock<IMessageLogger>().Object);
 
-        #endregion
+        var sp = spm.GetSettingsProvider("TestableSettings");
 
-        #region private methods
+        Assert.IsNotNull(sp);
+        Assert.IsNotNull(sp.Value);
+    }
 
-        private IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> GetMockExtensions(params string[] settingNames)
-        {
-            var settingsList = new List<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
+    #endregion
 
-            foreach (var settingName in settingNames)
-            {
-                var mockSettingsProvider = new Mock<ISettingsProvider>();
-                var metadata = new TestSettingsProviderMetadata(settingName);
+    #region private methods
 
-                var extension =
-                    new LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>(
-                        mockSettingsProvider.Object,
-                        metadata);
+    private static IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> GetMockExtensions(params string[] settingNames)
+    {
+        var settingsList = new List<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>>();
+
+        foreach (var settingName in settingNames)
+        {
+            var mockSettingsProvider = new Mock<ISettingsProvider>();
+            var metadata = new TestSettingsProviderMetadata(settingName);
 
-                settingsList.Add(extension);
-            }
+            var extension =
+                new LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>(
+                    mockSettingsProvider.Object,
+                    metadata);
 
-            return  settingsList;
+            settingsList.Add(extension);
         }
 
-        #endregion
+        return settingsList;
+    }
 
-        #region Testable Implementations
+    #endregion
 
-        private class TestableSettingsProviderManager : SettingsProviderExtensionManager
-        {
-            public TestableSettingsProviderManager(
-                IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProviders,
-                IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> unfilteredSettingsProviders,
-                IMessageLogger logger)
-                : base(settingsProviders, unfilteredSettingsProviders, logger)
-            {
-            }
-        }
+    #region Testable Implementations
 
-        [SettingsName("Random")]
-        private class RandomSettingsProvider : ISettingsProvider
+    private class TestableSettingsProviderManager : SettingsProviderExtensionManager
+    {
+        public TestableSettingsProviderManager(
+            IEnumerable<LazyExtension<ISettingsProvider, ISettingsProviderCapabilities>> settingsProviders,
+            IEnumerable<LazyExtension<ISettingsProvider, Dictionary<string, object>>> unfilteredSettingsProviders,
+            IMessageLogger logger)
+            : base(settingsProviders, unfilteredSettingsProviders, logger)
         {
-            public void Load(XmlReader reader)
-            {
-            }
         }
-
-        #endregion
     }
 
-    [TestClass]
-    public class TestSettingsProviderMetadataTests
+    [SettingsName("Random")]
+    private class RandomSettingsProvider : ISettingsProvider
     {
-        [TestMethod]
-        public void ConstructorShouldSetSettingsName()
+        public void Load(XmlReader reader)
         {
-            var metadata = new TestSettingsProviderMetadata("sample");
-            Assert.AreEqual("sample", metadata.SettingsName);
         }
     }
+
+    #endregion
+}
+
+[TestClass]
+public class TestSettingsProviderMetadataTests
+{
+    [TestMethod]
+    public void ConstructorShouldSetSettingsName()
+    {
+        var metadata = new TestSettingsProviderMetadata("sample");
+        Assert.AreEqual("sample", metadata.SettingsName);
+    }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Telemetry/MetricsCollectionTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Telemetry/MetricsCollectionTests.cs
index b66c2b355d..2f0e02dfed 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Telemetry/MetricsCollectionTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Telemetry/MetricsCollectionTests.cs
@@ -1,60 +1,60 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Telemetry
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Telemetry;
+
+[TestClass]
+public class MetricsCollectionTests
 {
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly IMetricsCollection _metricsCollection;
+
+    public MetricsCollectionTests()
+    {
+        _metricsCollection = new MetricsCollection();
+    }
+
+    [TestMethod]
+    public void AddShouldAddMetric()
+    {
+        _metricsCollection.Add("DummyMessage", "DummyValue");
+
+        Assert.IsTrue(_metricsCollection.Metrics.TryGetValue("DummyMessage", out var value));
+        Assert.AreEqual("DummyValue", value);
+    }
+
+    [TestMethod]
+    public void AddShouldUpdateMetricIfSameKeyIsPresentAlready()
+    {
+        _metricsCollection.Add("DummyMessage", "DummyValue");
+
+        Assert.IsTrue(_metricsCollection.Metrics.TryGetValue("DummyMessage", out var value));
+        Assert.AreEqual("DummyValue", value);
+
+        _metricsCollection.Add("DummyMessage", "newValue");
+
+        Assert.IsTrue(_metricsCollection.Metrics.TryGetValue("DummyMessage", out var newValue));
+        Assert.AreEqual("newValue", newValue);
+    }
+
+    [TestMethod]
+    public void MetricsShouldReturnValidMetricsIfValidItemsAreThere()
+    {
+        _metricsCollection.Add("DummyMessage", "DummyValue");
+        _metricsCollection.Add("DummyMessage2", "DummyValue");
+
+        Assert.AreEqual(2, _metricsCollection.Metrics.Count);
+        Assert.IsTrue(_metricsCollection.Metrics.ContainsKey("DummyMessage"));
+        Assert.IsTrue(_metricsCollection.Metrics.ContainsKey("DummyMessage2"));
+    }
 
-    [TestClass]
-    public class MetricsCollectionTests
+    [TestMethod]
+    public void MetricsShouldReturnEmptyDictionaryIfMetricsIsEmpty()
     {
-        private IMetricsCollection metricsCollection;
-
-        public MetricsCollectionTests()
-        {
-            this.metricsCollection = new MetricsCollection();
-        }
-
-        [TestMethod]
-        public void AddShouldAddMetric()
-        {
-            this.metricsCollection.Add("DummyMessage", "DummyValue");
-
-            Assert.IsTrue(this.metricsCollection.Metrics.TryGetValue("DummyMessage", out var value));
-            Assert.AreEqual("DummyValue", value);
-        }
-
-        [TestMethod]
-        public void AddShouldUpdateMetricIfSameKeyIsPresentAlready()
-        {
-            this.metricsCollection.Add("DummyMessage", "DummyValue");
-
-            Assert.IsTrue(this.metricsCollection.Metrics.TryGetValue("DummyMessage", out var value));
-            Assert.AreEqual("DummyValue", value);
-
-            this.metricsCollection.Add("DummyMessage", "newValue");
-
-            Assert.IsTrue(this.metricsCollection.Metrics.TryGetValue("DummyMessage", out var newValue));
-            Assert.AreEqual("newValue", newValue);
-        }
-
-        [TestMethod]
-        public void MetricsShouldReturnValidMetricsIfValidItemsAreThere()
-        {
-            this.metricsCollection.Add("DummyMessage", "DummyValue");
-            this.metricsCollection.Add("DummyMessage2", "DummyValue");
-
-            Assert.AreEqual(2, this.metricsCollection.Metrics.Count);
-            Assert.IsTrue(this.metricsCollection.Metrics.ContainsKey("DummyMessage"));
-            Assert.IsTrue(this.metricsCollection.Metrics.ContainsKey("DummyMessage2"));
-        }
-
-        [TestMethod]
-        public void MetricsShouldReturnEmptyDictionaryIfMetricsIsEmpty()
-        {
-            Assert.AreEqual(0, this.metricsCollection.Metrics.Count);
-        }
+        Assert.AreEqual(0, _metricsCollection.Metrics.Count);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/ExceptionUtilitiesTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/ExceptionUtilitiesTests.cs
index bc4164e94b..13864a9ab4 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/ExceptionUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/ExceptionUtilitiesTests.cs
@@ -1,63 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.Utilities
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.Utilities;
+
+[TestClass]
+public class ExceptionUtilitiesTests
 {
-    using System;
+    [TestMethod]
+    public void GetExceptionMessageShouldReturnEmptyIfExceptionIsNull()
+    {
+        Assert.AreEqual(string.Empty, ExceptionUtilities.GetExceptionMessage(null));
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void GetExceptionMessageShouldReturnExceptionMessage()
+    {
+        var exception = new ArgumentException("Some bad stuff");
+        Assert.AreEqual(exception.Message, ExceptionUtilities.GetExceptionMessage(exception));
+    }
 
-    [TestClass]
-    public class ExceptionUtilitiesTests
+    [TestMethod]
+    public void GetExceptionMessageShouldReturnExceptionMessageContainingAllExceptionMessages()
     {
-        [TestMethod]
-        public void GetExceptionMessageShouldReturnEmptyIfExceptionIsNull()
-        {
-            Assert.AreEqual(string.Empty, ExceptionUtilities.GetExceptionMessage(null));
-        }
+        var innerException = new Exception("Bad stuff internally");
+        var innerException2 = new Exception("Bad stuff internally 2", innerException);
+        var exception = new ArgumentException("Some bad stuff", innerException2);
 
-        [TestMethod]
-        public void GetExceptionMessageShouldReturnExceptionMessage()
-        {
-            var exception = new ArgumentException("Some bad stuff");
-            Assert.AreEqual(exception.Message, ExceptionUtilities.GetExceptionMessage(exception));
-        }
+        var message = ExceptionUtilities.GetExceptionMessage(exception);
+        StringAssert.Contains(message, exception.Message);
+        StringAssert.Contains(message, innerException.Message);
+        StringAssert.Contains(message, innerException.Message);
+    }
+
+    [TestMethod]
+    public void GetExceptionMessageShouldReturnExceptionMessageContainingStackTrace()
+    {
+        var message = ExceptionUtilities.GetExceptionMessage(GetExceptionWithStackTrace());
+        StringAssert.Contains(message, "Stack trace:");
+        // this test is where it or
+        StringAssert.Contains(message, "ExceptionUtilitiesTests.GetExceptionWithStackTrace");
+    }
 
-        [TestMethod]
-        public void GetExceptionMessageShouldReturnExceptionMessageContainingAllExceptionMessages()
+    private static Exception GetExceptionWithStackTrace()
+    {
+        try
         {
             var innerException = new Exception("Bad stuff internally");
             var innerException2 = new Exception("Bad stuff internally 2", innerException);
-            var exception = new ArgumentException("Some bad stuff", innerException2);
-            
-            var message = ExceptionUtilities.GetExceptionMessage(exception);
-            StringAssert.Contains(message, exception.Message);
-            StringAssert.Contains(message, innerException.Message);
-            StringAssert.Contains(message, innerException.Message);
+            throw new ArgumentException("Some bad stuff", innerException2);
         }
-
-        [TestMethod]
-        public void GetExceptionMessageShouldReturnExceptionMessageContainingStackTrace()
-        {
-            var message = ExceptionUtilities.GetExceptionMessage(GetExceptionWithStackTrace());
-            StringAssert.Contains(message, "Stack trace:");
-            // this test is where it or
-            StringAssert.Contains(message, "ExceptionUtilitiesTests.GetExceptionWithStackTrace");
-        }
-
-        private Exception GetExceptionWithStackTrace()
+        catch (Exception e)
         {
-            try
-            {
-                var innerException = new Exception("Bad stuff internally");
-                var innerException2 = new Exception("Bad stuff internally 2", innerException);
-                throw new ArgumentException("Some bad stuff", innerException2);
-            }
-            catch (Exception e)
-            {
-                return e;
-            }
+            return e;
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/FakesUtilitiesTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/FakesUtilitiesTests.cs
index 4f86da5191..a26dbdcdc1 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/FakesUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/FakesUtilitiesTests.cs
@@ -1,124 +1,124 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.Utilities
+using System;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.Utilities;
+
+[TestClass]
+public class FakesUtilitiesTests
 {
-    using System;
-    using System.IO;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void FakesSettingsShouldThrowExceptionIfSourcesArePassedAsNull()
+    {
+        string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
+        Assert.ThrowsException<ArgumentNullException>(() => FakesUtilities.GenerateFakesSettingsForRunConfiguration(null!, runSettingsXml));
+    }
 
-    [TestClass]
-    public class FakesUtilitiesTests
+    [TestMethod]
+    public void FakesSettingsShouldThrowExceptionIfRunSettingsIsPassedAsNull()
     {
-        [TestMethod]
-        public void FakesSettingsShouldThrowExceptionIfSourcesArePassedAsNull()
-        {
-            string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
-            Assert.ThrowsException<ArgumentNullException>(() => FakesUtilities.GenerateFakesSettingsForRunConfiguration(null, runSettingsXml));
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => FakesUtilities.GenerateFakesSettingsForRunConfiguration([], null!));
+    }
 
-        [TestMethod]
-        public void FakesSettingsShouldThrowExceptionIfRunSettingsIsPassedAsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => FakesUtilities.GenerateFakesSettingsForRunConfiguration(new string[] { }, null));
-        }
+    [TestMethod]
+    public void FakesSettingsShouldBeNotGeneratedIfFakeConfiguratorAssemblyIsNotPresent()
+    {
+        string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var generatedRunSettings = FakesUtilities.GenerateFakesSettingsForRunConfiguration([@"C:\temp\UT.dll"], runSettingsXml);
+        Assert.AreEqual(generatedRunSettings, runSettingsXml);
+    }
 
-        [TestMethod]
-        public void FakesSettingsShouldBeNotGeneratedIfFakeConfiguratorAssemblyIsNotPresent()
+    [TestMethod]
+    public void FakesDataCollectorSettingsShouldBeOverridden()
+    {
+        string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var doc = new XmlDocument();
+        using (var xmlReader = XmlReader.Create(
+                   new StringReader(runSettingsXml),
+                   new XmlReaderSettings() { CloseInput = true }))
         {
-            string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-            var generatedRunSettings = FakesUtilities.GenerateFakesSettingsForRunConfiguration(new string[] {@"C:\temp\UT.dll" }, runSettingsXml);
-            Assert.AreEqual(generatedRunSettings, runSettingsXml);
+            doc.Load(xmlReader);
         }
 
-        [TestMethod]
-        public void FakesDataCollectorSettingsShouldBeOverridden()
+        var dataCollectorNode = new DataCollectorSettings()
         {
-            string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-            var doc = new XmlDocument();
-            using (var xmlReader = XmlReader.Create(
-                new StringReader(runSettingsXml),
-                new XmlReaderSettings() { CloseInput = true }))
-            {
-                doc.Load(xmlReader);
-            }
+            AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
+            Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV1),
+            FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
+            IsEnabled = true,
+            Configuration = doc.FirstChild as XmlElement
+        };
+        XmlRunSettingsUtilities.InsertDataCollectorsNode(doc.CreateNavigator()!, dataCollectorNode);
 
-            var dataCollectorNode = new DataCollectorSettings()
-            {
-                AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
-                Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV1),
-                FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
-                IsEnabled = true,
-                Configuration = doc.FirstChild as XmlElement
-            };
-            XmlRunSettingsUtilities.InsertDataCollectorsNode(doc.CreateNavigator(), dataCollectorNode);
+        var dataCollectorNode2 = new DataCollectorSettings()
+        {
+            AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
+            Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
+            FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
+            IsEnabled = true,
+            Configuration = doc.FirstChild as XmlElement
+        };
+        FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
 
-            var dataCollectorNode2 = new DataCollectorSettings()
-            {
-                AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
-                Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
-                FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
-                IsEnabled = true,
-                Configuration = doc.FirstChild as XmlElement
-            };
-            FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
+        Assert.IsFalse(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV1));
+        Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
+    }
 
-            Assert.IsFalse(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV1));
-            Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
+    [TestMethod]
+    public void FakesDataCollectorSettingsShouldBeInserted()
+    {
+        string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var doc = new XmlDocument();
+        using (var xmlReader = XmlReader.Create(
+                   new StringReader(runSettingsXml),
+                   new XmlReaderSettings() { CloseInput = true }))
+        {
+            doc.Load(xmlReader);
         }
 
-        [TestMethod]
-        public void FakesDataCollectorSettingsShouldBeInserted()
+        var dataCollectorNode2 = new DataCollectorSettings()
         {
-            string runSettingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-            var doc = new XmlDocument();
-            using (var xmlReader = XmlReader.Create(
-                new StringReader(runSettingsXml),
-                new XmlReaderSettings() { CloseInput = true }))
-            {
-                doc.Load(xmlReader);
-            }
+            AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
+            Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
+            FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
+            IsEnabled = true,
+            Configuration = doc.FirstChild as XmlElement
+        };
+        FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
+        Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
+    }
 
-            var dataCollectorNode2 = new DataCollectorSettings()
-            {
-                AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
-                Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
-                FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
-                IsEnabled = true,
-                Configuration = doc.FirstChild as XmlElement
-            };
-            FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
-            Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
+    [TestMethod]
+    public void OtherRunsettingsShouldNotBeChanged()
+    {
+        string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>FrameworkCore10</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var doc = new XmlDocument();
+        using (var xmlReader = XmlReader.Create(
+                   new StringReader(runSettingsXml),
+                   new XmlReaderSettings() { CloseInput = true }))
+        {
+            doc.Load(xmlReader);
         }
 
-        [TestMethod]
-        public void OtherRunsettingsShouldNotBeChanged()
+        var dataCollectorNode2 = new DataCollectorSettings()
         {
-            string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>FrameworkCore10</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-            var doc = new XmlDocument();
-            using (var xmlReader = XmlReader.Create(
-                new StringReader(runSettingsXml),
-                new XmlReaderSettings() { CloseInput = true }))
-            {
-                doc.Load(xmlReader);
-            }
-
-            var dataCollectorNode2 = new DataCollectorSettings()
-            {
-                AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
-                Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
-                FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
-                IsEnabled = true,
-                Configuration = doc.CreateElement("Configuration")
-            };
-            FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
-            Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
-            XmlNodeList nodes = doc.SelectNodes("//RunSettings/RunConfiguration/TargetFrameworkVersion");
-            Assert.AreEqual("FrameworkCore10", nodes[0].InnerText);
-        }
+            AssemblyQualifiedName = FakesUtilities.FakesMetadata.DataCollectorAssemblyQualifiedName,
+            Uri = new Uri(FakesUtilities.FakesMetadata.DataCollectorUriV2),
+            FriendlyName = FakesUtilities.FakesMetadata.FriendlyName,
+            IsEnabled = true,
+            Configuration = doc.CreateElement("Configuration")
+        };
+        FakesUtilities.InsertOrReplaceFakesDataCollectorNode(doc, dataCollectorNode2);
+        Assert.IsTrue(XmlRunSettingsUtilities.ContainsDataCollector(doc, FakesUtilities.FakesMetadata.DataCollectorUriV2));
+        XmlNodeList nodes = doc.SelectNodes("//RunSettings/RunConfiguration/TargetFrameworkVersion")!;
+        Assert.AreEqual("FrameworkCore10", nodes[0]!.InnerText);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/InstallationContextTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/InstallationContextTests.cs
index b952f86484..feff45ec63 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/InstallationContextTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/InstallationContextTests.cs
@@ -1,69 +1,70 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Common.UnitTests.Utilities
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Common.UnitTests.Utilities;
+
+[TestClass]
+public class InstallationContextTests
 {
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System.Linq;
-
-    [TestClass]
-    public class InstallationContextTests
-    {
-        private Mock<IFileHelper> mockFileHelper;
-        private InstallationContext installationContext;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly InstallationContext _installationContext;
 
-        public InstallationContextTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.installationContext = new InstallationContext(this.mockFileHelper.Object);
-        }
+    public InstallationContextTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _installationContext = new InstallationContext(_mockFileHelper.Object);
+    }
 
-        [TestMethod]
-        public void TryGetVisualStudioDirectoryShouldReturnTrueIfVSIsFound()
-        {
-            this.mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
+    [TestMethod]
+    public void TryGetVisualStudioDirectoryShouldReturnTrueIfVsIsFound()
+    {
+        _mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
 
-            Assert.IsTrue(this.installationContext.TryGetVisualStudioDirectory(out string visualStudioDirectory), "VS Install Directory returned false");
+        Assert.IsTrue(_installationContext.TryGetVisualStudioDirectory(out string visualStudioDirectory), "VS Install Directory returned false");
 
-            Assert.IsTrue(Directory.Exists(visualStudioDirectory), "VS Install Directory doesn't exist");
-        }
+        Assert.IsTrue(Directory.Exists(visualStudioDirectory), "VS Install Directory doesn't exist");
+    }
 
-        [TestMethod]
-        public void TryGetVisualStudioDirectoryShouldReturnFalseIfVSIsNotFound()
-        {
-            this.mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(false);
+    [TestMethod]
+    public void TryGetVisualStudioDirectoryShouldReturnFalseIfVsIsNotFound()
+    {
+        _mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(false);
 
-            Assert.IsFalse(this.installationContext.TryGetVisualStudioDirectory(out string visualStudioDirectory), "VS Install Directory returned true");
+        Assert.IsFalse(_installationContext.TryGetVisualStudioDirectory(out string visualStudioDirectory), "VS Install Directory returned true");
 
-            Assert.IsTrue(string.IsNullOrEmpty(visualStudioDirectory), "VS Install Directory is not empty");
-        }
+        Assert.IsTrue(string.IsNullOrEmpty(visualStudioDirectory), "VS Install Directory is not empty");
+    }
 
-        [TestMethod]
-        public void GetVisualStudioPathShouldReturnPathToDevenvExecutable()
-        {
-            var devenvPath = this.installationContext.GetVisualStudioPath(@"C:\temp");
+    [TestMethod]
+    public void GetVisualStudioPathShouldReturnPathToDevenvExecutable()
+    {
+        var devenvPath = _installationContext.GetVisualStudioPath(@"C:\temp");
 
-            Assert.AreEqual(@"C:\temp\devenv.exe", devenvPath.Replace("/", "\\"));
-        }
+        Assert.AreEqual(@"C:\temp\devenv.exe", devenvPath.Replace("/", "\\"));
+    }
 
-        [TestMethod]
-        public void GetVisualStudioCommonLocationShouldReturnWellKnownLocations()
+    [TestMethod]
+    public void GetVisualStudioCommonLocationShouldReturnWellKnownLocations()
+    {
+        var expectedLocations = new[]
         {
-            var expectedLocations = new[]
-            {
-                @"C:\temp\PrivateAssemblies",
-                @"C:\temp\PublicAssemblies",
-                @"C:\temp\CommonExtensions\Microsoft\TestWindow",
-                @"C:\temp\CommonExtensions\Microsoft\TeamFoundation\Team Explorer",
-                @"C:\temp"
-            };
-            var commonLocations = this.installationContext.GetVisualStudioCommonLocations(@"C:\temp").Select(p => p.Replace("/", "\\")).ToArray();
-
-            CollectionAssert.AreEquivalent(expectedLocations, commonLocations);
-        }
+            @"C:\temp\PrivateAssemblies",
+            @"C:\temp\PublicAssemblies",
+            @"C:\temp\CommonExtensions\Microsoft\TestWindow",
+            @"C:\temp\CommonExtensions\Microsoft\TeamFoundation\Team Explorer",
+            @"C:\temp"
+        };
+        var commonLocations = _installationContext.GetVisualStudioCommonLocations(@"C:\temp").Select(p => p.Replace("/", "\\")).ToArray();
+
+        CollectionAssert.AreEquivalent(expectedLocations, commonLocations);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs
index 8b4a40cf10..f0b1133c56 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs
@@ -1,124 +1,118 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.Common.UnitTests.Utilities
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.Common.UnitTests.Utilities;
+
+[TestClass]
+public class RunSettingsUtilitiesTests
 {
-    using System;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using System.Xml;
-    using ExtensionFramework;
-    using System.Collections.Generic;
-    using Microsoft.TestPlatform.TestUtilities;
-
-    [TestClass]
-    public class RunSettingsUtilitiesTests
+    [TestMethod]
+    public void CreateRunSettingsShouldReturnNullIfSettingsXmlIsNullorEmpty()
+    {
+        Assert.IsNull(RunSettingsUtilities.CreateAndInitializeRunSettings(null));
+    }
+
+    [TestMethod]
+    public void CreateRunSettingsShouldThrowExceptionWhenInvalidXmlStringIsPassed()
+    {
+        Assert.ThrowsException<SettingsException>(() => RunSettingsUtilities.CreateAndInitializeRunSettings("abc"));
+    }
+
+    [TestMethod]
+    public void CreateRunSettingsShouldReturnValidRunSettings()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsUtilitiesTests));
+        string runsettings = @"<RunSettings><RunConfiguration><ResultsDirectory>.\TestResults</ResultsDirectory></RunConfiguration ><DummyMSTest><FORCEDLEGACYMODE>true</FORCEDLEGACYMODE></DummyMSTest></RunSettings>";
+        _ = RunSettingsUtilities.CreateAndInitializeRunSettings(runsettings);
+        Assert.AreEqual("<DummyMSTest><FORCEDLEGACYMODE>true</FORCEDLEGACYMODE></DummyMSTest>", DummyMsTestSetingsProvider.StringToVerify);
+        TestPluginCacheHelper.ResetExtensionsCache();
+    }
+
+    [TestMethod]
+    public void GetMaxCpuCountWithNullSettingXmlShouldReturnDefaultCpuCount()
     {
-        [TestMethod]
-        public void CreateRunSettingsShouldReturnNullIfSettingsXmlIsNullorEmpty()
-        {
-            Assert.IsNull(RunSettingsUtilities.CreateAndInitializeRunSettings(null));
-        }
-
-        [TestMethod]
-        public void CreateRunSettingsShouldThrowExceptionWhenInvalidXmlStringIsPassed()
-        {
-            Assert.ThrowsException<SettingsException>(() =>
-            {
-                RunSettingsUtilities.CreateAndInitializeRunSettings("abc");
-            }
-            );
-        }
-
-        [TestMethod]
-        public void CreateRunSettingsShouldReturnValidRunSettings()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(typeof(RunSettingsUtilitiesTests));
-            string runsettings = @"<RunSettings><RunConfiguration><ResultsDirectory>.\TestResults</ResultsDirectory></RunConfiguration ><DummyMSTest><FORCEDLEGACYMODE>true</FORCEDLEGACYMODE></DummyMSTest></RunSettings>";
-            var result= RunSettingsUtilities.CreateAndInitializeRunSettings(runsettings);
-            Assert.AreEqual("<DummyMSTest><FORCEDLEGACYMODE>true</FORCEDLEGACYMODE></DummyMSTest>", DummyMsTestSetingsProvider.StringToVerify);
-            TestPluginCacheHelper.ResetExtensionsCache();
-        }
-
-        [TestMethod]
-        public void GetMaxCpuCountWithNullSettingXmlShouldReturnDefaultCpuCount()
-        {
-            string settingXml = null;
-            int expectedResult = Constants.DefaultCpuCount;
-
-            int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
-
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [TestMethod]
-        public void GetMaxCpuCountWithEmptySettingXmlShouldReturnDefaultCpuCount()
-        {
-            string settingXml = "";
-            int expectedResult = Constants.DefaultCpuCount;
-
-            int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
-
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [TestMethod]
-        public void GetMaxCpuCountWithSettingXmlNotHavingCpuCountShouldReturnDefaultCpuCount()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration></RunConfiguration ></RunSettings>";
-            int expectedResult = Constants.DefaultCpuCount;
-
-            int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
-
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [TestMethod]
-        public void GetMaxCpuCountWithSettingXmlCpuCountShouldReturnCorrectCpuCount()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>5</MaxCpuCount></RunConfiguration ></RunSettings>";
-            int expectedResult = 5;
-
-            int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
-
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [TestMethod]
-        public void GetMaxCpuCountWithInvalidCpuCountShouldReturnDefaultCpuCount()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>-10</MaxCpuCount></RunConfiguration ></RunSettings>";
-            int expectedResult = Constants.DefaultCpuCount;
-
-            int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
-
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [TestMethod]
-        public void GetTestAdaptersPaths()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><TestAdaptersPaths>C:\testadapterpath;D:\secondtestadapterpath</TestAdaptersPaths></RunConfiguration ></RunSettings>";
-            string[] expectedResult = new string[] { @"C:\testadapterpath", @"D:\secondtestadapterpath" };
-
-            string[] result = (string[])RunSettingsUtilities.GetTestAdaptersPaths(settingXml);
-
-            CollectionAssert.AreEqual(expectedResult, result);
-        }
+        string? settingXml = null;
+        int expectedResult = Constants.DefaultCpuCount;
+
+        int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
+
+        Assert.AreEqual(expectedResult, result);
     }
 
-    [SettingsName("DummyMSTest")]
-    public class DummyMsTestSetingsProvider : ISettingsProvider
+    [TestMethod]
+    public void GetMaxCpuCountWithEmptySettingXmlShouldReturnDefaultCpuCount()
     {
-        public void Load(XmlReader reader)
-        {
-            ValidateArg.NotNull<XmlReader>(reader, nameof(reader));
-            reader.Read();
-            StringToVerify = reader.ReadOuterXml();
-        }
-
-        public static string StringToVerify = string.Empty;
+        string settingXml = "";
+        int expectedResult = Constants.DefaultCpuCount;
+
+        int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
+
+        Assert.AreEqual(expectedResult, result);
     }
+
+    [TestMethod]
+    public void GetMaxCpuCountWithSettingXmlNotHavingCpuCountShouldReturnDefaultCpuCount()
+    {
+        string settingXml = @"<RunSettings><RunConfiguration></RunConfiguration ></RunSettings>";
+        int expectedResult = Constants.DefaultCpuCount;
+
+        int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
+
+        Assert.AreEqual(expectedResult, result);
+    }
+
+    [TestMethod]
+    public void GetMaxCpuCountWithSettingXmlCpuCountShouldReturnCorrectCpuCount()
+    {
+        string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>5</MaxCpuCount></RunConfiguration ></RunSettings>";
+        int expectedResult = 5;
+
+        int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
+
+        Assert.AreEqual(expectedResult, result);
+    }
+
+    [TestMethod]
+    public void GetMaxCpuCountWithInvalidCpuCountShouldReturnDefaultCpuCount()
+    {
+        string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>-10</MaxCpuCount></RunConfiguration ></RunSettings>";
+        int expectedResult = Constants.DefaultCpuCount;
+
+        int result = RunSettingsUtilities.GetMaxCpuCount(settingXml);
+
+        Assert.AreEqual(expectedResult, result);
+    }
+
+    [TestMethod]
+    public void GetTestAdaptersPaths()
+    {
+        string settingXml = @"<RunSettings><RunConfiguration><TestAdaptersPaths>C:\testadapterpath;D:\secondtestadapterpath</TestAdaptersPaths></RunConfiguration ></RunSettings>";
+        string[] expectedResult = [@"C:\testadapterpath", @"D:\secondtestadapterpath"];
+
+        string[] result = (string[])RunSettingsUtilities.GetTestAdaptersPaths(settingXml);
+
+        CollectionAssert.AreEqual(expectedResult, result);
+    }
+}
+
+[SettingsName("DummyMSTest")]
+public class DummyMsTestSetingsProvider : ISettingsProvider
+{
+    public void Load(XmlReader reader)
+    {
+        ValidateArg.NotNull(reader, nameof(reader));
+
+        reader.Read();
+        StringToVerify = reader.ReadOuterXml();
+    }
+
+    public static string StringToVerify { get; private set; } = string.Empty;
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj
new file mode 100644
index 0000000000..2e7b972557
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests.csproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities.PlatformTests</AssemblyName>
+  </PropertyGroup>
+</Project>
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs
new file mode 100644
index 0000000000..e899a02567
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests;
+
+[TestClass]
+[Ignore("Flaky tests")]
+public class SocketClientTests : SocketTestsBase, IDisposable
+{
+    private readonly TcpListener _tcpListener;
+
+    private readonly ICommunicationEndPoint _socketClient;
+
+    private TcpClient? _tcpClient;
+
+    public SocketClientTests()
+    {
+        _socketClient = new SocketClient();
+
+        var endpoint = new IPEndPoint(IPAddress.Loopback, 0);
+        _tcpListener = new TcpListener(endpoint);
+    }
+
+    protected override TcpClient? Client => _tcpClient;
+
+    public void Dispose()
+    {
+        _socketClient.Stop();
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        GC.SuppressFinalize(this);
+    }
+
+    [TestMethod]
+    public void SocketClientStartShouldConnectToLoopbackOnGivenPort()
+    {
+        var connectionInfo = StartLocalServer();
+
+        _socketClient.Start(connectionInfo);
+
+        var acceptClientTask = _tcpListener.AcceptTcpClientAsync();
+        Assert.IsTrue(acceptClientTask.Wait(Timeout));
+        Assert.IsTrue(acceptClientTask.Result.Connected);
+    }
+
+    [TestMethod]
+    [Ignore]
+    public void SocketClientStartShouldThrowIfServerIsNotListening()
+    {
+        var dummyConnectionInfo = "5345";
+
+        _socketClient.Start(dummyConnectionInfo);
+
+        var exceptionThrown = false;
+        try
+        {
+            _socketClient.Start(dummyConnectionInfo);
+        }
+        catch (PlatformNotSupportedException)
+        {
+            // Thrown on unix
+            exceptionThrown = true;
+        }
+        catch (SocketException)
+        {
+            exceptionThrown = true;
+        }
+
+        Assert.IsTrue(exceptionThrown);
+    }
+
+    [TestMethod]
+    public void SocketClientStopShouldRaiseClientDisconnectedEventOnClientDisconnection()
+    {
+        var waitEvent = SetupClientDisconnect(out ICommunicationChannel? _);
+
+        // Close the communication from client side
+        _socketClient.Stop();
+
+        Assert.IsTrue(waitEvent.WaitOne(Timeout));
+    }
+
+    [TestMethod]
+    public void SocketClientShouldRaiseClientDisconnectedEventIfConnectionIsBroken()
+    {
+        var waitEvent = SetupClientDisconnect(out ICommunicationChannel? _);
+
+        // Close the communication from server side
+        _tcpClient?.GetStream().Dispose();
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        Assert.IsTrue(waitEvent.WaitOne(Timeout));
+    }
+
+    [TestMethod]
+    public void SocketClientStopShouldStopCommunication()
+    {
+        var waitEvent = SetupClientDisconnect(out ICommunicationChannel? _);
+
+        // Close the communication from socket client side
+        _socketClient.Stop();
+
+        // Validate that write on server side fails
+        waitEvent.WaitOne(Timeout);
+        Assert.ThrowsException<IOException>(() => WriteData(Client!));
+    }
+
+    [TestMethod]
+    public void SocketClientStopShouldCloseChannel()
+    {
+        var waitEvent = SetupClientDisconnect(out ICommunicationChannel? channel);
+
+        _socketClient.Stop();
+
+        waitEvent.WaitOne(Timeout);
+        Assert.ThrowsException<CommunicationException>(() => channel!.Send(Dummydata));
+    }
+
+    protected override ICommunicationChannel? SetupChannel(out ConnectedEventArgs? connectedEvent)
+    {
+        ICommunicationChannel? channel = null;
+        ConnectedEventArgs? serverConnectedEvent = null;
+        ManualResetEvent waitEvent = new(false);
+        _socketClient.Connected += (sender, eventArgs) =>
+        {
+            serverConnectedEvent = eventArgs;
+            channel = eventArgs.Channel;
+            waitEvent.Set();
+        };
+
+        var connectionInfo = StartLocalServer();
+        _socketClient.Start(connectionInfo);
+
+        var acceptClientTask = _tcpListener.AcceptTcpClientAsync();
+        if (acceptClientTask.Wait(TimeSpan.FromMilliseconds(1000)))
+        {
+            _tcpClient = acceptClientTask.Result;
+            waitEvent.WaitOne(1000);
+        }
+
+        connectedEvent = serverConnectedEvent;
+        return channel;
+    }
+
+    private ManualResetEvent SetupClientDisconnect(out ICommunicationChannel? channel)
+    {
+        var waitEvent = new ManualResetEvent(false);
+        _socketClient.Disconnected += (s, e) => waitEvent.Set();
+        channel = SetupChannel(out ConnectedEventArgs? _);
+        channel!.MessageReceived.Subscribe((sender, args) =>
+        {
+        });
+        return waitEvent;
+    }
+
+    private string StartLocalServer()
+    {
+        _tcpListener.Start();
+
+        return ((IPEndPoint)_tcpListener.LocalEndpoint).ToString();
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketCommunicationManagerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketCommunicationManagerTests.cs
new file mode 100644
index 0000000000..7d352a6327
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketCommunicationManagerTests.cs
@@ -0,0 +1,377 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests;
+
+[TestClass]
+public class SocketCommunicationManagerTests : IDisposable
+{
+    private const string TestDiscoveryStartMessageWithNullPayload = "{\"MessageType\":\"TestDiscovery.Start\",\"Payload\":null}";
+
+    private const string TestDiscoveryStartMessageWithDummyPayload = "{\"MessageType\":\"TestDiscovery.Start\",\"Payload\":\"Dummy Payload\"}";
+
+    private const string TestDiscoveryStartMessageWithVersionAndPayload = "{\"Version\":2,\"MessageType\":\"TestDiscovery.Start\",\"Payload\":\"Dummy Payload\"}";
+
+    private const string DummyPayload = "Dummy Payload";
+
+    private readonly SocketCommunicationManager _communicationManager;
+    private readonly TcpClient _tcpClient;
+    private readonly TcpListener _tcpListener;
+
+    public SocketCommunicationManagerTests()
+    {
+        _communicationManager = new SocketCommunicationManager();
+        _tcpClient = new TcpClient();
+        _tcpListener = new TcpListener(IPAddress.Loopback, 0);
+    }
+
+    public void Dispose()
+    {
+        _tcpListener.Stop();
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        _communicationManager.StopServer();
+        _communicationManager.StopClient();
+        GC.SuppressFinalize(this);
+    }
+
+    #region Server tests
+
+    [TestMethod]
+    public async Task HostServerShouldStartServerAndReturnPortNumber()
+    {
+        var port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+
+        Assert.IsTrue(port > 0);
+        await _tcpClient.ConnectAsync(IPAddress.Loopback, port);
+        Assert.IsTrue(_tcpClient.Connected);
+    }
+
+    [TestMethod]
+    public async Task AcceptClientAsyncShouldWaitForClientConnection()
+    {
+        var clientConnected = false;
+        var waitEvent = new ManualResetEvent(false);
+        var port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+
+        var acceptClientTask = _communicationManager.AcceptClientAsync().ContinueWith(
+            (continuationTask, state) =>
+            {
+                clientConnected = true;
+                waitEvent.Set();
+            },
+            null);
+
+        await _tcpClient.ConnectAsync(IPAddress.Loopback, port);
+        Assert.IsTrue(_tcpClient.Connected);
+        Assert.IsTrue(waitEvent.WaitOne(1000) && clientConnected);
+    }
+
+    [TestMethod]
+    public async Task WaitForClientConnectionShouldWaitUntilClientIsConnected()
+    {
+        var port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+        _ = _communicationManager.AcceptClientAsync();
+        await _tcpClient.ConnectAsync(IPAddress.Loopback, port);
+
+        var clientConnected = _communicationManager.WaitForClientConnection(1000);
+
+        Assert.IsTrue(_tcpClient.Connected);
+        Assert.IsTrue(clientConnected);
+    }
+
+    [TestMethod]
+    public void WaitForClientConnectionShouldReturnFalseIfClientIsNotConnected()
+    {
+        _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
+        _ = _communicationManager.AcceptClientAsync();
+
+        // Do not attempt the client to connect to server. Directly wait until timeout.
+        var clientConnected = _communicationManager.WaitForClientConnection(100);
+
+        Assert.IsFalse(clientConnected);
+    }
+
+    [TestMethod]
+    public void StopServerShouldCloseServer()
+    {
+        var port = _communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+        var acceptClientTask = _communicationManager.AcceptClientAsync();
+
+        _communicationManager.StopServer();
+
+        Assert.ThrowsException<AggregateException>(() => _tcpClient.ConnectAsync(IPAddress.Loopback, port).Wait());
+    }
+
+    #endregion
+
+    #region Client tests
+
+    [TestMethod]
+    public async Task SetupClientAsyncShouldConnectToServer()
+    {
+        var port = StartServer();
+        _ = _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+
+        var client = await _tcpListener.AcceptTcpClientAsync();
+        Assert.IsTrue(client.Connected);
+    }
+
+    [TestMethod]
+    public async Task WaitForServerConnectionShouldWaitUntilClientIsConnected()
+    {
+        var port = StartServer();
+        _ = _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+        await _tcpListener.AcceptTcpClientAsync();
+
+        var serverConnected = _communicationManager.WaitForServerConnection(1000);
+
+        Assert.IsTrue(serverConnected);
+    }
+
+    [TestMethod]
+    public void WaitForServerConnectionShouldReturnFalseIfClientIsNotConnected()
+    {
+        // There is no server listening on port 20000.
+        _ = _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 20000));
+
+        var serverConnected = _communicationManager.WaitForServerConnection(100);
+
+        Assert.IsFalse(serverConnected);
+    }
+
+    [TestMethod]
+    public async Task StopClientShouldDisconnectClient()
+    {
+        // TODO: This won't throw on MacOS? No way to try it.
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            return;
+        }
+
+        var client = await StartServerAndWaitForConnection();
+
+        _communicationManager.StopClient();
+
+        // Attempt to write on client socket should throw since it should have disconnected.
+        Assert.ThrowsException<SocketException>(() => WriteOnSocket(client.Client));
+    }
+
+    #endregion
+
+    #region Message sender tests
+
+    [TestMethod]
+    public async Task SendMessageShouldSendMessageWithoutAnyPayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+
+        _communicationManager.SendMessage(MessageType.StartDiscovery);
+
+        Assert.AreEqual(TestDiscoveryStartMessageWithNullPayload, ReadFromStream(client.GetStream()));
+    }
+
+    [TestMethod]
+    public async Task SendMessageWithPayloadShouldSerializeAndSendThePayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+
+        _communicationManager.SendMessage(MessageType.StartDiscovery, DummyPayload);
+
+        Assert.AreEqual(TestDiscoveryStartMessageWithDummyPayload, ReadFromStream(client.GetStream()));
+    }
+
+    [TestMethod]
+    public async Task SendMessageWithPayloadShouldSerializeAndSendThePayloadWithVersionStamped()
+    {
+        var client = await StartServerAndWaitForConnection();
+
+        _communicationManager.SendMessage(MessageType.StartDiscovery, DummyPayload, 2);
+
+        Assert.AreEqual(TestDiscoveryStartMessageWithVersionAndPayload, ReadFromStream(client.GetStream()));
+    }
+
+    [TestMethod]
+    public async Task SendMessageWithRawMessageShouldNotSerializeThePayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+
+        _communicationManager.SendRawMessage(DummyPayload);
+
+        Assert.AreEqual(DummyPayload, ReadFromStream(client.GetStream()));
+    }
+
+    #endregion
+
+    #region Message receiver tests
+
+    [TestMethod]
+    public async Task ReceiveMessageShouldReadMessageTypeButNotDeserializeThePayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+        WriteToStream(client.GetStream(), TestDiscoveryStartMessageWithDummyPayload);
+
+        var message = _communicationManager.ReceiveMessage();
+
+        Assert.AreEqual(MessageType.StartDiscovery, message?.MessageType);
+        // Payload property is present on the Message, but we don't populate it in the newer versions,
+        // instead we populate internal field with the rawMessage, and wait until Serializer.DeserializePayload<T>(message)
+        // is called by the message consumer. This avoids deserializing the payload when we just want to route the message.
+        Assert.IsNull(message!.Payload);
+    }
+
+    [TestMethod]
+    public async Task ReceiveMessageAsyncShouldReceiveDeserializedMessage()
+    {
+        var client = await StartServerAndWaitForConnection();
+        WriteToStream(client.GetStream(), TestDiscoveryStartMessageWithVersionAndPayload);
+
+        var message = await _communicationManager.ReceiveMessageAsync(CancellationToken.None);
+        var versionedMessage = (VersionedMessage)message!;
+        Assert.AreEqual(MessageType.StartDiscovery, versionedMessage.MessageType);
+        Assert.AreEqual(2, versionedMessage.Version);
+        // Payload property is present on the Message, but we don't populate it in the newer versions,
+        // instead we populate internal field with the rawMessage, and wait until Serializer.DeserializePayload<T>(message)
+        // is called by the message consumer. This avoids deserializing the payload when we just want to route the message.
+        Assert.IsNull(versionedMessage.Payload);
+    }
+
+    [TestMethod]
+    public async Task ReceiveRawMessageShouldNotDeserializeThePayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+        WriteToStream(client.GetStream(), DummyPayload);
+
+        var message = _communicationManager.ReceiveRawMessage();
+
+        Assert.AreEqual(DummyPayload, message);
+    }
+
+    [TestMethod]
+    public async Task ReceiveRawMessageAsyncShouldNotDeserializeThePayload()
+    {
+        var client = await StartServerAndWaitForConnection();
+        WriteToStream(client.GetStream(), DummyPayload);
+
+        var message = await _communicationManager.ReceiveRawMessageAsync(CancellationToken.None);
+
+        Assert.AreEqual(DummyPayload, message);
+    }
+    #endregion
+
+    [TestMethod]
+    public void SocketPollShouldNotHangServerClientCommunication()
+    {
+        // Measure the throughput with socket communication v1 (SocketCommunicationManager)
+        // implementation.
+        var server = new SocketCommunicationManager();
+        var client = new SocketCommunicationManager();
+
+        int port = server.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
+        client.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port)).Wait();
+        server.AcceptClientAsync().Wait();
+
+        server.WaitForClientConnection(1000);
+        client.WaitForServerConnection(1000);
+
+        var clientThread = new Thread(() => SendData(client));
+        clientThread.Start();
+
+        var dataReceived = 0;
+        while (dataReceived < 2048 * 5)
+        {
+            dataReceived += server.ReceiveRawMessageAsync(CancellationToken.None).Result!.Length;
+            Task.Delay(1000).Wait();
+        }
+
+        clientThread.Join();
+
+        Assert.IsTrue(true);
+    }
+
+    [TestMethod]
+    public async Task ReceiveRawMessageNotConnectedSocketShouldReturnNull()
+    {
+        var peer = new SocketCommunicationManager();
+        Assert.IsNull(peer.ReceiveRawMessage());
+        Assert.IsNull(await peer.ReceiveRawMessageAsync(CancellationToken.None));
+    }
+
+    [TestMethod]
+    public async Task ReceiveMessageNotConnectedSocketShouldReturnNull()
+    {
+        var peer = new SocketCommunicationManager();
+        Assert.IsNull(peer.ReceiveMessage());
+        Assert.IsNull(await peer.ReceiveMessageAsync(CancellationToken.None));
+    }
+
+    private static void SendData(ICommunicationManager communicationManager)
+    {
+        // Having less than the buffer size in SocketConstants.BUFFERSIZE.
+        var dataBytes = new byte[2048];
+        for (int i = 0; i < dataBytes.Length; i++)
+        {
+            dataBytes[i] = 0x65;
+        }
+
+        var dataBytesStr = Encoding.UTF8.GetString(dataBytes);
+
+        for (int i = 0; i < 5; i++)
+        {
+            communicationManager.SendRawMessage(dataBytesStr);
+        }
+    }
+
+    private int StartServer()
+    {
+        _tcpListener.Start();
+
+        return ((IPEndPoint)_tcpListener.LocalEndpoint).Port;
+    }
+
+    private async Task<TcpClient> StartServerAndWaitForConnection()
+    {
+        var port = StartServer();
+        _ = _communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
+        var client = await _tcpListener.AcceptTcpClientAsync();
+        _communicationManager.WaitForServerConnection(1000);
+
+        return client;
+    }
+
+    private static void WriteOnSocket(Socket socket)
+    {
+        for (int i = 0; i < 10; i++)
+        {
+            socket.Send([0x1, 0x0]);
+        }
+    }
+
+    private static string ReadFromStream(Stream stream)
+    {
+        using var reader = new BinaryReader(stream, Encoding.UTF8, true);
+        return reader.ReadString();
+    }
+
+    private static void WriteToStream(Stream stream, string data)
+    {
+        using var writer = new BinaryWriter(stream, Encoding.UTF8, true);
+        writer.Write(data);
+        writer.Flush();
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs
new file mode 100644
index 0000000000..1c392218f3
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests;
+
+[TestClass]
+[Ignore("Flaky")]
+public class SocketServerTests : SocketTestsBase, IDisposable
+{
+    private readonly TcpClient _tcpClient;
+    private readonly string _defaultConnection = IPAddress.Loopback.ToString() + ":0";
+    private readonly ICommunicationEndPoint _socketServer;
+
+    public SocketServerTests()
+    {
+        _socketServer = new SocketServer();
+
+        _tcpClient = new TcpClient();
+    }
+
+    protected override TcpClient Client => _tcpClient;
+
+    public void Dispose()
+    {
+        _socketServer.Stop();
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+        GC.SuppressFinalize(this);
+    }
+
+    [TestMethod]
+    public async Task SocketServerStartShouldHostServer()
+    {
+        var connectionInfo = _socketServer.Start(_defaultConnection);
+
+        Assert.IsFalse(string.IsNullOrEmpty(connectionInfo));
+        await ConnectToServer(connectionInfo.GetIpEndPoint().Port);
+        Assert.IsTrue(_tcpClient.Connected);
+    }
+
+    [TestMethod]
+    public void SocketServerStopShouldStopListening()
+    {
+        var connectionInfo = _socketServer.Start(_defaultConnection);
+
+        _socketServer.Stop();
+
+        try
+        {
+            // This method throws ExtendedSocketException (which is private). It is not possible
+            // to use Assert.ThrowsException in this case.
+            ConnectToServer(connectionInfo.GetIpEndPoint().Port).GetAwaiter().GetResult();
+        }
+        catch (SocketException)
+        {
+        }
+    }
+
+    [TestMethod]
+    public void SocketServerStopShouldCloseClient()
+    {
+        ManualResetEvent waitEvent = new(false);
+        _socketServer.Disconnected += (s, e) => waitEvent.Set();
+        SetupChannel(out ConnectedEventArgs? clientConnected);
+
+        _socketServer.Stop();
+
+        waitEvent.WaitOne();
+        Assert.ThrowsException<IOException>(() => WriteData(_tcpClient));
+    }
+
+    [TestMethod]
+    public void SocketServerStopShouldRaiseClientDisconnectedEventOnClientDisconnection()
+    {
+        DisconnectedEventArgs? disconnected = null;
+        ManualResetEvent waitEvent = new(false);
+        _socketServer.Disconnected += (s, e) =>
+        {
+            disconnected = e;
+            waitEvent.Set();
+        };
+        SetupChannel(out ConnectedEventArgs? clientConnected);
+
+        _socketServer.Stop();
+
+        waitEvent.WaitOne();
+        Assert.IsNotNull(disconnected);
+        Assert.IsNull(disconnected.Error);
+    }
+
+    [TestMethod]
+    public void SocketServerStopShouldCloseChannel()
+    {
+        var waitEvent = new ManualResetEventSlim(false);
+        var channel = SetupChannel(out ConnectedEventArgs? clientConnected);
+        _socketServer.Disconnected += (s, e) => waitEvent.Set();
+
+        _socketServer.Stop();
+
+        waitEvent.Wait();
+        Assert.ThrowsException<CommunicationException>(() => channel!.Send(Dummydata));
+    }
+
+    [TestMethod]
+    public void SocketServerShouldRaiseClientDisconnectedEventIfConnectionIsBroken()
+    {
+        DisconnectedEventArgs? clientDisconnected = null;
+        ManualResetEvent waitEvent = new(false);
+        _socketServer.Disconnected += (sender, eventArgs) =>
+        {
+            clientDisconnected = eventArgs;
+            waitEvent.Set();
+        };
+        var channel = SetupChannel(out ConnectedEventArgs? clientConnected);
+
+        channel!.MessageReceived.Subscribe((sender, args) =>
+        {
+        });
+
+        // Close the client channel. Message loop should stop.
+        // tcpClient.Close() calls tcpClient.Dispose().
+        _tcpClient?.Close();
+
+        Assert.IsTrue(waitEvent.WaitOne(1000));
+        Assert.IsTrue(clientDisconnected!.Error is IOException);
+    }
+
+    [TestMethod]
+    public async Task SocketEndpointShouldInitializeChannelOnServerConnection()
+    {
+        var channel = SetupChannel(out ConnectedEventArgs? _);
+
+        await channel!.Send(Dummydata);
+
+        Assert.AreEqual(Dummydata, ReadData(Client));
+    }
+
+    protected override ICommunicationChannel? SetupChannel(out ConnectedEventArgs? connectedEvent)
+    {
+        ICommunicationChannel? channel = null;
+        ConnectedEventArgs? clientConnectedEvent = null;
+        ManualResetEvent waitEvent = new(false);
+        _socketServer.Connected += (sender, eventArgs) =>
+        {
+            clientConnectedEvent = eventArgs;
+            channel = eventArgs.Channel;
+            waitEvent.Set();
+        };
+
+        var connectionInfo = _socketServer.Start(_defaultConnection);
+        var port = connectionInfo.GetIpEndPoint().Port;
+        ConnectToServer(port).GetAwaiter().GetResult();
+        waitEvent.WaitOne();
+
+        connectedEvent = clientConnectedEvent;
+        return channel;
+    }
+
+    private async Task ConnectToServer(int port)
+    {
+        await _tcpClient.ConnectAsync(IPAddress.Loopback, port);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs
new file mode 100644
index 0000000000..22fb46e655
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using System.Net.Sockets;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests;
+
+[TestClass]
+public abstract class SocketTestsBase
+{
+    protected const string Dummydata = "Dummy Data";
+    protected const int Timeout = 10 * 1000;
+
+    protected abstract TcpClient? Client { get; }
+
+    [TestMethod]
+    public void SocketEndpointStartShouldRaiseServerConnectedEventOnServerConnection()
+    {
+        SetupChannel(out ConnectedEventArgs? connectedEventArgs);
+
+        Assert.IsNotNull(connectedEventArgs);
+    }
+
+    [TestMethod]
+    public void SocketEndpointShouldNotifyChannelOnDataAvailable()
+    {
+        var message = string.Empty;
+        ManualResetEvent waitForMessage = new(false);
+        SetupChannel(out ConnectedEventArgs? _)!.MessageReceived.Subscribe((s, e) =>
+        {
+            message = e.Data;
+            waitForMessage.Set();
+        });
+
+        WriteData(Client!);
+
+        waitForMessage.WaitOne();
+        Assert.AreEqual(Dummydata, message);
+    }
+
+    protected static string ReadData(TcpClient client)
+    {
+        using BinaryReader reader = new(client.GetStream());
+        return reader.ReadString();
+    }
+
+    protected static void WriteData(TcpClient client)
+    {
+        using BinaryWriter writer = new(client.GetStream());
+        writer.Write(Dummydata);
+    }
+
+    protected abstract ICommunicationChannel? SetupChannel(out ConnectedEventArgs? connectedEventArgs);
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj
deleted file mode 100644
index b2ddb8c50a..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities.PlatformTests</AssemblyName>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Program.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Program.cs
deleted file mode 100644
index a0ee0a2eb5..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketClientTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketClientTests.cs
deleted file mode 100644
index 35f3907d41..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketClientTests.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class SocketClientTests : SocketTestsBase, IDisposable
-    {
-        private readonly TcpListener tcpListener;
-
-        private readonly ICommunicationEndPoint socketClient;
-
-        private TcpClient tcpClient;
-
-        public SocketClientTests()
-        {
-            this.socketClient = new SocketClient();
-
-            var endpoint = new IPEndPoint(IPAddress.Loopback, 0);
-            this.tcpListener = new TcpListener(endpoint);
-        }
-
-        protected override TcpClient Client => this.tcpClient;
-
-        public void Dispose()
-        {
-            this.socketClient.Stop();
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netcoreapp1.0
-            this.tcpClient?.Dispose();
-#endif
-            GC.SuppressFinalize(this);
-        }
-
-        [TestMethod]
-        public void SocketClientStartShouldConnectToLoopbackOnGivenPort()
-        {
-            var connectionInfo = this.StartLocalServer();
-
-            this.socketClient.Start(connectionInfo);
-
-            var acceptClientTask = this.tcpListener.AcceptTcpClientAsync();
-            Assert.IsTrue(acceptClientTask.Wait(TIMEOUT));
-            Assert.IsTrue(acceptClientTask.Result.Connected);
-        }
-
-        [TestMethod]
-        [Ignore]
-        public void SocketClientStartShouldThrowIfServerIsNotListening()
-        {
-            var dummyConnectionInfo = "5345";
-
-            this.socketClient.Start(dummyConnectionInfo);
-
-            var exceptionThrown = false;
-            try
-            {
-                this.socketClient.Start(dummyConnectionInfo);
-            }
-            catch (PlatformNotSupportedException)
-            {
-                // Thrown on unix
-                exceptionThrown = true;
-            }
-            catch (SocketException)
-            {
-                exceptionThrown = true;
-            }
-
-            Assert.IsTrue(exceptionThrown);
-        }
-
-        [TestMethod]
-        public void SocketClientStopShouldRaiseClientDisconnectedEventOnClientDisconnection()
-        {
-            var waitEvent = this.SetupClientDisconnect(out ICommunicationChannel _);
-
-            // Close the communication from client side
-            this.socketClient.Stop();
-
-            Assert.IsTrue(waitEvent.WaitOne(TIMEOUT));
-        }
-
-        [TestMethod]
-        public void SocketClientShouldRaiseClientDisconnectedEventIfConnectionIsBroken()
-        {
-            var waitEvent = this.SetupClientDisconnect(out ICommunicationChannel _);
-
-            // Close the communication from server side
-            this.tcpClient.GetStream().Dispose();
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netcoreapp1.0
-            this.tcpClient?.Dispose();
-#endif
-            Assert.IsTrue(waitEvent.WaitOne(TIMEOUT));
-        }
-
-        [TestMethod]
-        public void SocketClientStopShouldStopCommunication()
-        {
-            var waitEvent = this.SetupClientDisconnect(out ICommunicationChannel _);
-
-            // Close the communication from socket client side
-            this.socketClient.Stop();
-
-            // Validate that write on server side fails
-            waitEvent.WaitOne(TIMEOUT);
-            Assert.ThrowsException<IOException>(() => WriteData(this.Client));
-        }
-
-        [TestMethod]
-        public void SocketClientStopShouldCloseChannel()
-        {
-            var waitEvent = this.SetupClientDisconnect(out ICommunicationChannel channel);
-
-            this.socketClient.Stop();
-
-            waitEvent.WaitOne(TIMEOUT);
-            Assert.ThrowsException<CommunicationException>(() => channel.Send(DUMMYDATA));
-        }
-
-        protected override ICommunicationChannel SetupChannel(out ConnectedEventArgs connectedEvent)
-        {
-            ICommunicationChannel channel = null;
-            ConnectedEventArgs serverConnectedEvent = null;
-            ManualResetEvent waitEvent = new ManualResetEvent(false);
-            this.socketClient.Connected += (sender, eventArgs) =>
-            {
-                serverConnectedEvent = eventArgs;
-                channel = eventArgs.Channel;
-                waitEvent.Set();
-            };
-
-            var connectionInfo = this.StartLocalServer();
-            this.socketClient.Start(connectionInfo);
-
-            var acceptClientTask = this.tcpListener.AcceptTcpClientAsync();
-            if (acceptClientTask.Wait(TimeSpan.FromMilliseconds(1000)))
-            {
-                this.tcpClient = acceptClientTask.Result;
-                waitEvent.WaitOne(1000);
-            }
-
-            connectedEvent = serverConnectedEvent;
-            return channel;
-        }
-
-        private ManualResetEvent SetupClientDisconnect(out ICommunicationChannel channel)
-        {
-            var waitEvent = new ManualResetEvent(false);
-            this.socketClient.Disconnected += (s, e) => { waitEvent.Set(); };
-            channel = this.SetupChannel(out ConnectedEventArgs _);
-            channel.MessageReceived += (sender, args) =>
-            {
-            };
-            return waitEvent;
-        }
-
-        private string StartLocalServer()
-        {
-            this.tcpListener.Start();
-
-            return ((IPEndPoint)this.tcpListener.LocalEndpoint).ToString();
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketCommunicationManagerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketCommunicationManagerTests.cs
deleted file mode 100644
index 2f39dd1f73..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketCommunicationManagerTests.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class SocketCommunicationManagerTests : IDisposable
-    {
-        private const string TestDiscoveryStartMessageWithNullPayload = "{\"MessageType\":\"TestDiscovery.Start\",\"Payload\":null}";
-
-        private const string TestDiscoveryStartMessageWithDummyPayload = "{\"MessageType\":\"TestDiscovery.Start\",\"Payload\":\"Dummy Payload\"}";
-
-        private const string TestDiscoveryStartMessageWithVersionAndPayload = "{\"Version\":2,\"MessageType\":\"TestDiscovery.Start\",\"Payload\":\"Dummy Payload\"}";
-
-        private const string DummyPayload = "Dummy Payload";
-
-        private readonly SocketCommunicationManager communicationManager;
-
-        private readonly TcpClient tcpClient;
-
-        private readonly TcpListener tcpListener;
-
-        public SocketCommunicationManagerTests()
-        {
-            this.communicationManager = new SocketCommunicationManager();
-            this.tcpClient = new TcpClient();
-            this.tcpListener = new TcpListener(IPAddress.Loopback, 0);
-        }
-
-        public void Dispose()
-        {
-            this.tcpListener.Stop();
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netcoreapp1.0
-            this.tcpClient?.Dispose();
-#endif
-            this.communicationManager.StopServer();
-            this.communicationManager.StopClient();
-            GC.SuppressFinalize(this);
-        }
-
-        #region Server tests
-
-        [TestMethod]
-        public async Task HostServerShouldStartServerAndReturnPortNumber()
-        {
-            var port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-
-            Assert.IsTrue(port > 0);
-            await this.tcpClient.ConnectAsync(IPAddress.Loopback, port);
-            Assert.IsTrue(this.tcpClient.Connected);
-        }
-
-        [TestMethod]
-        public async Task AcceptClientAsyncShouldWaitForClientConnection()
-        {
-            var clientConnected = false;
-            var waitEvent = new ManualResetEvent(false);
-            var port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-
-            var acceptClientTask = this.communicationManager.AcceptClientAsync().ContinueWith(
-                (continuationTask, state) =>
-                    {
-                        clientConnected = true;
-                        waitEvent.Set();
-                    },
-                null);
-
-            await this.tcpClient.ConnectAsync(IPAddress.Loopback, port);
-            Assert.IsTrue(this.tcpClient.Connected);
-            Assert.IsTrue(waitEvent.WaitOne(1000) && clientConnected);
-        }
-
-        [TestMethod]
-        public async Task WaitForClientConnectionShouldWaitUntilClientIsConnected()
-        {
-            var port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-            var acceptClientTask = this.communicationManager.AcceptClientAsync();
-            await this.tcpClient.ConnectAsync(IPAddress.Loopback, port);
-
-            var clientConnected = this.communicationManager.WaitForClientConnection(1000);
-
-            Assert.IsTrue(this.tcpClient.Connected);
-            Assert.IsTrue(clientConnected);
-        }
-
-        [TestMethod]
-        public void WaitForClientConnectionShouldReturnFalseIfClientIsNotConnected()
-        {
-            this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0));
-            var acceptClientTask = this.communicationManager.AcceptClientAsync();
-
-            // Do not attempt the client to connect to server. Directly wait until timeout.
-            var clientConnected = this.communicationManager.WaitForClientConnection(100);
-
-            Assert.IsFalse(clientConnected);
-        }
-
-        [TestMethod]
-        public void StopServerShouldCloseServer()
-        {
-            var port = this.communicationManager.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-            var acceptClientTask = this.communicationManager.AcceptClientAsync();
-
-            this.communicationManager.StopServer();
-
-            Assert.ThrowsException<AggregateException>(() => this.tcpClient.ConnectAsync(IPAddress.Loopback, port).Wait());
-        }
-
-        #endregion
-
-        #region Client tests
-
-        [TestMethod]
-        public async Task SetupClientAsyncShouldConnectToServer()
-        {
-            var port = this.StartServer();
-
-            var setupClientTask = this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
-
-            var client = await this.tcpListener.AcceptTcpClientAsync();
-            Assert.IsTrue(client.Connected);
-        }
-
-        [TestMethod]
-        public async Task WaitForServerConnectionShouldWaitUntilClientIsConnected()
-        {
-            var port = this.StartServer();
-            var setupClientTask = this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
-            await this.tcpListener.AcceptTcpClientAsync();
-
-            var serverConnected = this.communicationManager.WaitForServerConnection(1000);
-
-            Assert.IsTrue(serverConnected);
-        }
-
-        [TestMethod]
-        public void WaitForServerConnectionShouldReturnFalseIfClientIsNotConnected()
-        {
-            // There is no server listening on port 20000.
-            var setupClientTask = this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 20000));
-
-            var serverConnected = this.communicationManager.WaitForServerConnection(100);
-
-            Assert.IsFalse(serverConnected);
-        }
-
-        [TestMethod]
-        public async Task StopClientShouldDisconnectClient()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-
-            this.communicationManager.StopClient();
-
-            // Attempt to write on client socket should throw since it should have disconnected.
-            Assert.ThrowsException<SocketException>(() => this.WriteOnSocket(client.Client));
-        }
-
-        #endregion
-
-        #region Message sender tests
-
-        [TestMethod]
-        public async Task SendMessageShouldSendMessageWithoutAnyPayload()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-
-            this.communicationManager.SendMessage(MessageType.StartDiscovery);
-
-            Assert.AreEqual(TestDiscoveryStartMessageWithNullPayload, this.ReadFromStream(client.GetStream()));
-        }
-
-        [TestMethod]
-        public async Task SendMessageWithPayloadShouldSerializeAndSendThePayload()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-
-            this.communicationManager.SendMessage(MessageType.StartDiscovery, DummyPayload);
-
-            Assert.AreEqual(TestDiscoveryStartMessageWithDummyPayload, this.ReadFromStream(client.GetStream()));
-        }
-
-        [TestMethod]
-        public async Task SendMessageWithPayloadShouldSerializeAndSendThePayloadWithVersionStamped()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-
-            this.communicationManager.SendMessage(MessageType.StartDiscovery, DummyPayload, 2);
-
-            Assert.AreEqual(TestDiscoveryStartMessageWithVersionAndPayload, this.ReadFromStream(client.GetStream()));
-        }
-
-        [TestMethod]
-        public async Task SendMessageWithRawMessageShouldNotSerializeThePayload()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-
-            this.communicationManager.SendRawMessage(DummyPayload);
-
-            Assert.AreEqual(DummyPayload, this.ReadFromStream(client.GetStream()));
-        }
-
-        #endregion
-
-        #region Message receiver tests
-
-        [TestMethod]
-        public async Task ReceiveMessageShouldReceiveDeserializedMessage()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-            this.WriteToStream(client.GetStream(), TestDiscoveryStartMessageWithDummyPayload);
-
-            var message = this.communicationManager.ReceiveMessage();
-
-            Assert.AreEqual(MessageType.StartDiscovery, message.MessageType);
-            Assert.AreEqual(DummyPayload, message.Payload);
-        }
-
-        [TestMethod]
-        public async Task ReceiveMessageAsyncShouldReceiveDeserializedMessage()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-            this.WriteToStream(client.GetStream(), TestDiscoveryStartMessageWithVersionAndPayload);
-
-            var message = await this.communicationManager.ReceiveMessageAsync(CancellationToken.None);
-            var versionedMessage = message as VersionedMessage;
-            Assert.AreEqual(MessageType.StartDiscovery, versionedMessage.MessageType);
-            Assert.AreEqual(DummyPayload, versionedMessage.Payload);
-            Assert.AreEqual(2, versionedMessage.Version);
-        }
-
-        [TestMethod]
-        public async Task ReceiveRawMessageShouldNotDeserializeThePayload()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-            this.WriteToStream(client.GetStream(), DummyPayload);
-
-            var message = this.communicationManager.ReceiveRawMessage();
-
-            Assert.AreEqual(DummyPayload, message);
-        }
-
-        [TestMethod]
-        public async Task ReceiveRawMessageAsyncShouldNotDeserializeThePayload()
-        {
-            var client = await this.StartServerAndWaitForConnection();
-            this.WriteToStream(client.GetStream(), DummyPayload);
-
-            var message = await this.communicationManager.ReceiveRawMessageAsync(CancellationToken.None);
-
-            Assert.AreEqual(DummyPayload, message);
-        }
-        #endregion
-
-        [TestMethod]
-        public void SocketPollShouldNotHangServerClientCommunication()
-        {
-            // Measure the throughput with socket communication v1 (SocketCommunicationManager)
-            // implementation.
-            var server = new SocketCommunicationManager();
-            var client = new SocketCommunicationManager();
-
-            int port = server.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-            client.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port)).Wait();
-            server.AcceptClientAsync().Wait();
-
-            server.WaitForClientConnection(1000);
-            client.WaitForServerConnection(1000);
-
-            var clientThread = new Thread(() => SendData(client));
-            clientThread.Start();
-
-            var dataReceived = 0;
-            while (dataReceived < 2048 * 5)
-            {
-                dataReceived += server.ReceiveRawMessageAsync(CancellationToken.None).Result.Length;
-                Task.Delay(1000).Wait();
-            }
-
-            clientThread.Join();
-
-            Assert.IsTrue(true);
-        }
-
-        [TestMethod]
-        public async Task ReceiveRawMessageNotConnectedSocketShouldReturnNull()
-        {
-            var peer = new SocketCommunicationManager();
-            Assert.IsNull(peer.ReceiveRawMessage());
-            Assert.IsNull(await peer.ReceiveRawMessageAsync(CancellationToken.None));
-        }
-
-        [TestMethod]
-        public async Task ReceiveMessageNotConnectedSocketShouldReturnNull()
-        {
-            var peer = new SocketCommunicationManager();
-            Assert.IsNull(peer.ReceiveMessage());
-            Assert.IsNull(await peer.ReceiveMessageAsync(CancellationToken.None));
-        }
-
-        private static void SendData(ICommunicationManager communicationManager)
-        {
-            // Having less than the buffer size in SocketConstants.BUFFERSIZE.
-            var dataBytes = new byte[2048];
-            for (int i = 0; i < dataBytes.Length; i++)
-            {
-                dataBytes[i] = 0x65;
-            }
-
-            var dataBytesStr = Encoding.UTF8.GetString(dataBytes);
-
-            for (int i = 0; i < 5; i++)
-            {
-                communicationManager.SendRawMessage(dataBytesStr);
-            }
-        }
-
-        private int StartServer()
-        {
-            this.tcpListener.Start();
-
-            return ((IPEndPoint)this.tcpListener.LocalEndpoint).Port;
-        }
-
-        private async Task<TcpClient> StartServerAndWaitForConnection()
-        {
-            var port = this.StartServer();
-            var setupClientTask = this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
-            var client = await this.tcpListener.AcceptTcpClientAsync();
-            this.communicationManager.WaitForServerConnection(1000);
-
-            return client;
-        }
-
-        private void WriteOnSocket(Socket socket)
-        {
-            for (int i = 0; i < 10; i++)
-            {
-                socket.Send(new byte[2] { 0x1, 0x0 });
-            }
-        }
-
-        private string ReadFromStream(Stream stream)
-        {
-            using (var reader = new BinaryReader(stream, Encoding.UTF8, true))
-            {
-                return reader.ReadString();
-            }
-        }
-
-        private void WriteToStream(Stream stream, string data)
-        {
-            using (var writer = new BinaryWriter(stream, Encoding.UTF8, true))
-            {
-                writer.Write(data);
-                writer.Flush();
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketServerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketServerTests.cs
deleted file mode 100644
index d6ed36f694..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketServerTests.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests
-{
-    using System;
-    using System.IO;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class SocketServerTests : SocketTestsBase, IDisposable
-    {
-        private readonly TcpClient tcpClient;
-        private readonly string defaultConnection = IPAddress.Loopback.ToString() + ":0";
-        private readonly ICommunicationEndPoint socketServer;
-
-        public SocketServerTests()
-        {
-            this.socketServer = new SocketServer();
-
-            this.tcpClient = new TcpClient();
-        }
-
-        protected override TcpClient Client => this.tcpClient;
-
-        public void Dispose()
-        {
-            this.socketServer.Stop();
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netcoreapp1.0
-            this.tcpClient?.Dispose();
-#endif
-            GC.SuppressFinalize(this);
-        }
-
-        [TestMethod]
-        public async Task SocketServerStartShouldHostServer()
-        {
-            var connectionInfo = this.socketServer.Start(this.defaultConnection);
-
-            Assert.IsFalse(string.IsNullOrEmpty(connectionInfo));
-            await this.ConnectToServer(connectionInfo.GetIPEndPoint().Port);
-            Assert.IsTrue(this.tcpClient.Connected);
-        }
-
-        [TestMethod]
-        public void SocketServerStopShouldStopListening()
-        {
-            var connectionInfo = this.socketServer.Start(this.defaultConnection);
-
-            this.socketServer.Stop();
-
-            try
-            {
-                // This method throws ExtendedSocketException (which is private). It is not possible
-                // to use Assert.ThrowsException in this case.
-                this.ConnectToServer(connectionInfo.GetIPEndPoint().Port).GetAwaiter().GetResult();
-            }
-            catch (SocketException)
-            {
-            }
-        }
-
-        [TestMethod]
-        public void SocketServerStopShouldCloseClient()
-        {
-            ManualResetEvent waitEvent = new ManualResetEvent(false);
-            this.socketServer.Disconnected += (s, e) => { waitEvent.Set(); };
-            this.SetupChannel(out ConnectedEventArgs clientConnected);
-
-            this.socketServer.Stop();
-
-            waitEvent.WaitOne();
-            Assert.ThrowsException<IOException>(() => WriteData(this.tcpClient));
-        }
-
-        [TestMethod]
-        public void SocketServerStopShouldRaiseClientDisconnectedEventOnClientDisconnection()
-        {
-            DisconnectedEventArgs disconnected = null;
-            ManualResetEvent waitEvent = new ManualResetEvent(false);
-            this.socketServer.Disconnected += (s, e) =>
-            {
-                disconnected = e;
-                waitEvent.Set();
-            };
-            this.SetupChannel(out ConnectedEventArgs clientConnected);
-
-            this.socketServer.Stop();
-
-            waitEvent.WaitOne();
-            Assert.IsNotNull(disconnected);
-            Assert.IsNull(disconnected.Error);
-        }
-
-        [TestMethod]
-        public void SocketServerStopShouldCloseChannel()
-        {
-            var waitEvent = new ManualResetEventSlim(false);
-            var channel = this.SetupChannel(out ConnectedEventArgs clientConnected);
-            this.socketServer.Disconnected += (s, e) => { waitEvent.Set(); };
-
-            this.socketServer.Stop();
-
-            waitEvent.Wait();
-            Assert.ThrowsException<CommunicationException>(() => channel.Send(DUMMYDATA));
-        }
-
-        [TestMethod]
-        public void SocketServerShouldRaiseClientDisconnectedEventIfConnectionIsBroken()
-        {
-            DisconnectedEventArgs clientDisconnected = null;
-            ManualResetEvent waitEvent = new ManualResetEvent(false);
-            this.socketServer.Disconnected += (sender, eventArgs) =>
-            {
-                clientDisconnected = eventArgs;
-                waitEvent.Set();
-            };
-            var channel = this.SetupChannel(out ConnectedEventArgs clientConnected);
-
-            channel.MessageReceived += (sender, args) =>
-            {
-            };
-
-            // Close the client channel. Message loop should stop.
-#if NETFRAMEWORK
-            // tcpClient.Close() calls tcpClient.Dispose().
-            this.tcpClient?.Close();
-#else
-            // tcpClient.Close() not available for netcoreapp1.0
-            this.tcpClient?.Dispose();
-#endif
-            Assert.IsTrue(waitEvent.WaitOne(1000));
-            Assert.IsTrue(clientDisconnected.Error is IOException);
-        }
-
-        [TestMethod]
-        public async Task SocketEndpointShouldInitializeChannelOnServerConnection()
-        {
-            var channel = this.SetupChannel(out ConnectedEventArgs _);
-
-            await channel.Send(DUMMYDATA);
-
-            Assert.AreEqual(DUMMYDATA, ReadData(this.Client));
-        }
-
-        protected override ICommunicationChannel SetupChannel(out ConnectedEventArgs connectedEvent)
-        {
-            ICommunicationChannel channel = null;
-            ConnectedEventArgs clientConnectedEvent = null;
-            ManualResetEvent waitEvent = new ManualResetEvent(false);
-            this.socketServer.Connected += (sender, eventArgs) =>
-            {
-                clientConnectedEvent = eventArgs;
-                channel = eventArgs.Channel;
-                waitEvent.Set();
-            };
-
-            var connectionInfo = this.socketServer.Start(this.defaultConnection);
-            var port = connectionInfo.GetIPEndPoint().Port;
-            this.ConnectToServer(port).GetAwaiter().GetResult();
-            waitEvent.WaitOne();
-
-            connectedEvent = clientConnectedEvent;
-            return channel;
-        }
-
-        private async Task ConnectToServer(int port)
-        {
-            await this.tcpClient.ConnectAsync(IPAddress.Loopback, port);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketTestsBase.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketTestsBase.cs
deleted file mode 100644
index 575b1e3100..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/SocketTestsBase.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.PlatformTests
-{
-    using System.IO;
-    using System.Net.Sockets;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public abstract class SocketTestsBase
-    {
-        protected const string DUMMYDATA = "Dummy Data";
-        protected const int TIMEOUT = 10 * 1000;
-
-        protected abstract TcpClient Client { get; }
-
-        [TestMethod]
-        public void SocketEndpointStartShouldRaiseServerConnectedEventOnServerConnection()
-        {
-            this.SetupChannel(out ConnectedEventArgs connectedEventArgs);
-
-            Assert.IsNotNull(connectedEventArgs);
-        }
-
-        [TestMethod]
-        public void SocketEndpointShouldNotifyChannelOnDataAvailable()
-        {
-            var message = string.Empty;
-            ManualResetEvent waitForMessage = new ManualResetEvent(false);
-            this.SetupChannel(out ConnectedEventArgs _).MessageReceived += (s, e) =>
-            {
-                message = e.Data;
-                waitForMessage.Set();
-            };
-
-            WriteData(this.Client);
-
-            waitForMessage.WaitOne();
-            Assert.AreEqual(DUMMYDATA, message);
-        }
-
-        protected static string ReadData(TcpClient client)
-        {
-            using (BinaryReader reader = new BinaryReader(client.GetStream()))
-            {
-                return reader.ReadString();
-            }
-        }
-
-        protected static void WriteData(TcpClient client)
-        {
-            using (BinaryWriter writer = new BinaryWriter(client.GetStream()))
-            {
-                writer.Write(DUMMYDATA);
-            }
-        }
-
-        protected abstract ICommunicationChannel SetupChannel(out ConnectedEventArgs connectedEventArgs);
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestHandlerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestHandlerTests.cs
index 98c6473770..ee056f0d9d 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestHandlerTests.cs
@@ -1,427 +1,404 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+
+using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class DataCollectionRequestHandlerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-
-    using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Serialization;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-    using Newtonsoft.Json.Linq;
-    using VisualStudio.TestPlatform.CoreUtilities.Helpers;
-
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-
-    [TestClass]
-    public class DataCollectionRequestHandlerTests
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly Mock<IMessageSink> _mockMessageSink;
+    private readonly Mock<IDataCollectionManager> _mockDataCollectionManager;
+    private readonly Mock<IDataCollectionTestCaseEventHandler> _mockDataCollectionTestCaseEventHandler;
+    private readonly TestableDataCollectionRequestHandler _requestHandler;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Message _afterTestRunEnd = new() { MessageType = MessageType.AfterTestRunEnd, Payload = "false" };
+    private readonly Message _beforeTestRunStart = new()
     {
-        private Mock<ICommunicationManager> mockCommunicationManager;
-        private Mock<IMessageSink> mockMessageSink;
-        private Mock<IDataCollectionManager> mockDataCollectionManager;
-        private Mock<IDataCollectionTestCaseEventHandler> mockDataCollectionTestCaseEventHandler;
-        private TestableDataCollectionRequestHandler requestHandler;
-        private Mock<IDataSerializer> mockDataSerializer;
-        private Mock<IFileHelper> mockFileHelper;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private Message afterTestRunEnd = new Message() { MessageType = MessageType.AfterTestRunEnd, Payload = "false" };
-        private Message beforeTestRunStart = new Message()
-        {
-            MessageType = MessageType.BeforeTestRunStart,
-            Payload = JToken.FromObject(new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } })
-        };
+        MessageType = MessageType.BeforeTestRunStart,
+        Payload = JToken.FromObject(new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } })
+    };
 
-        public DataCollectionRequestHandlerTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.mockMessageSink = new Mock<IMessageSink>();
-            this.mockDataCollectionManager = new Mock<IDataCollectionManager>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockDataCollectionTestCaseEventHandler = new Mock<IDataCollectionTestCaseEventHandler>();
-            this.mockDataCollectionTestCaseEventHandler.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(r => r.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.requestHandler = new TestableDataCollectionRequestHandler(this.mockCommunicationManager.Object, this.mockMessageSink.Object, this.mockDataCollectionManager.Object, this.mockDataCollectionTestCaseEventHandler.Object, this.mockDataSerializer.Object, this.mockFileHelper.Object, this.mockRequestData.Object);
-
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(this.beforeTestRunStart).Returns(this.afterTestRunEnd);
-
-            this.mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-        }
+    public DataCollectionRequestHandlerTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _mockMessageSink = new Mock<IMessageSink>();
+        _mockDataCollectionManager = new Mock<IDataCollectionManager>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockDataCollectionTestCaseEventHandler = new Mock<IDataCollectionTestCaseEventHandler>();
+        _mockDataCollectionTestCaseEventHandler.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(r => r.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _requestHandler = new TestableDataCollectionRequestHandler(_mockCommunicationManager.Object, _mockMessageSink.Object, _mockDataCollectionManager.Object, _mockDataCollectionTestCaseEventHandler.Object, _mockDataSerializer.Object, _mockFileHelper.Object, _mockRequestData.Object);
+
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(_beforeTestRunStart).Returns(_afterTestRunEnd);
+
+        _mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
+    }
 
-        [TestMethod]
-        public void CreateInstanceShouldThrowExceptionIfInstanceCommunicationManagerIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                DataCollectionRequestHandler.Create(null, this.mockMessageSink.Object);
-            });
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+    }
 
-        [TestMethod]
-        public void CreateInstanceShouldThrowExceptinIfInstanceMessageSinkIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                DataCollectionRequestHandler.Create(this.mockCommunicationManager.Object, null);
-            });
-        }
+    [TestMethod]
+    public void CreateInstanceShouldThrowExceptionIfInstanceCommunicationManagerIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => DataCollectionRequestHandler.Create(null!, _mockMessageSink.Object));
+    }
 
-        [TestMethod]
-        public void CreateInstanceShouldCreateInstance()
-        {
-            var result = DataCollectionRequestHandler.Create(this.mockCommunicationManager.Object, this.mockMessageSink.Object);
+    [TestMethod]
+    public void CreateInstanceShouldThrowExceptinIfInstanceMessageSinkIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => DataCollectionRequestHandler.Create(_mockCommunicationManager.Object, null!));
+    }
 
-            Assert.AreEqual(result, DataCollectionRequestHandler.Instance);
-        }
+    [TestMethod]
+    public void CreateInstanceShouldCreateInstance()
+    {
+        var result = DataCollectionRequestHandler.Create(_mockCommunicationManager.Object, _mockMessageSink.Object);
 
-        [TestMethod]
-        public void InitializeCommunicationShouldInitializeCommunication()
-        {
-            this.requestHandler.InitializeCommunication(123);
+        Assert.AreEqual(result, DataCollectionRequestHandler.Instance);
+    }
 
-            this.mockCommunicationManager.Verify(x => x.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 123)), Times.Once);
-        }
+    [TestMethod]
+    public void InitializeCommunicationShouldInitializeCommunication()
+    {
+        _requestHandler.InitializeCommunication(123);
 
-        [TestMethod]
-        public void InitializeCommunicationShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.SetupClientAsync(It.IsAny<IPEndPoint>())).Throws<Exception>();
+        _mockCommunicationManager.Verify(x => x.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 123)), Times.Once);
+    }
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.InitializeCommunication(123);
-            });
-        }
+    [TestMethod]
+    public void InitializeCommunicationShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.SetupClientAsync(It.IsAny<IPEndPoint>())).Throws<Exception>();
 
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldInvokeCommunicationManager()
-        {
-            this.requestHandler.WaitForRequestSenderConnection(0);
+        Assert.ThrowsException<Exception>(() => _requestHandler.InitializeCommunication(123));
+    }
 
-            this.mockCommunicationManager.Verify(x => x.WaitForServerConnection(It.IsAny<int>()), Times.Once);
-        }
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldInvokeCommunicationManager()
+    {
+        _requestHandler.WaitForRequestSenderConnection(0);
 
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.WaitForServerConnection(It.IsAny<int>())).Throws<Exception>();
+        _mockCommunicationManager.Verify(x => x.WaitForServerConnection(It.IsAny<int>()), Times.Once);
+    }
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.WaitForRequestSenderConnection(0);
-            });
-        }
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.WaitForServerConnection(It.IsAny<int>())).Throws<Exception>();
 
-        [TestMethod]
-        public void SendDataCollectionMessageShouldSendMessageToCommunicationManager()
-        {
-            var message = new DataCollectionMessageEventArgs(TestMessageLevel.Error, "message");
+        Assert.ThrowsException<Exception>(() => _requestHandler.WaitForRequestSenderConnection(0));
+    }
 
-            this.requestHandler.SendDataCollectionMessage(message);
+    [TestMethod]
+    public void SendDataCollectionMessageShouldSendMessageToCommunicationManager()
+    {
+        var message = new DataCollectionMessageEventArgs(TestMessageLevel.Error, "message");
 
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionMessage, message), Times.Once);
-        }
+        _requestHandler.SendDataCollectionMessage(message);
 
-        [TestMethod]
-        public void SendDataCollectionMessageShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionMessage, It.IsAny<DataCollectionMessageEventArgs>())).Throws<Exception>();
-            var message = new DataCollectionMessageEventArgs(TestMessageLevel.Error, "message");
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionMessage, message), Times.Once);
+    }
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.SendDataCollectionMessage(message);
-            });
-        }
+    [TestMethod]
+    public void SendDataCollectionMessageShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionMessage, It.IsAny<DataCollectionMessageEventArgs>())).Throws<Exception>();
+        var message = new DataCollectionMessageEventArgs(TestMessageLevel.Error, "message");
 
-        [TestMethod]
-        public void CloseShouldCloseCommunicationChannel()
-        {
-            this.requestHandler.Close();
+        Assert.ThrowsException<Exception>(() => _requestHandler.SendDataCollectionMessage(message));
+    }
 
-            this.mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
-        }
+    [TestMethod]
+    public void CloseShouldCloseCommunicationChannel()
+    {
+        _requestHandler.Close();
 
-        [TestMethod]
-        public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.StopClient()).Throws<Exception>();
+        _mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
+    }
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.Close();
-            });
-        }
+    [TestMethod]
+    public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.StopClient()).Throws<Exception>();
 
-        [TestMethod]
-        public void DisposeShouldCloseCommunicationChannel()
-        {
-            this.requestHandler.Dispose();
+        Assert.ThrowsException<Exception>(() => _requestHandler.Close());
+    }
 
-            this.mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
-        }
+    [TestMethod]
+    public void DisposeShouldCloseCommunicationChannel()
+    {
+        _requestHandler.Dispose();
 
-        [TestMethod]
-        public void ProcessRequestsShouldProcessRequests()
-        {
-            var testHostLaunchedPayload = new TestHostLaunchedPayload();
-            testHostLaunchedPayload.ProcessId = 1234;
+        _mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
+    }
 
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(this.beforeTestRunStart)
-                                                                                .Returns(new Message() { MessageType = MessageType.TestHostLaunched, Payload = JToken.FromObject(testHostLaunchedPayload) })
-                                                                                .Returns(this.afterTestRunEnd);
+    [TestMethod]
+    public void ProcessRequestsShouldProcessRequests()
+    {
+        var testHostLaunchedPayload = new TestHostLaunchedPayload();
+        testHostLaunchedPayload.ProcessId = 1234;
 
-            this.mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
-            this.mockDataCollectionManager.Setup(x => x.TestHostLaunched(It.IsAny<int>()));
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestHostLaunchedPayload>(It.Is<Message>(y => y.MessageType == MessageType.TestHostLaunched)))
-                                   .Returns(testHostLaunchedPayload);
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(_beforeTestRunStart)
+            .Returns(new Message() { MessageType = MessageType.TestHostLaunched, Payload = JToken.FromObject(testHostLaunchedPayload) })
+            .Returns(_afterTestRunEnd);
 
-            this.requestHandler.ProcessRequests();
+        _mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
+        _mockDataCollectionManager.Setup(x => x.TestHostLaunched(It.IsAny<int>()));
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestHostLaunchedPayload>(It.Is<Message>(y => y.MessageType == MessageType.TestHostLaunched)))
+            .Returns(testHostLaunchedPayload);
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
 
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Once);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Once);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Once);
+        _requestHandler.ProcessRequests();
 
-            // Verify SessionStarted events
-            this.mockDataCollectionManager.Verify(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>()), Times.Once);
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStartResult, It.IsAny<BeforeTestRunStartResult>()), Times.Once);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Once);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Once);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Once);
 
-            // Verify TestHostLaunched events
-            this.mockDataCollectionManager.Verify(x => x.TestHostLaunched(1234), Times.Once);
+        // Verify SessionStarted events
+        _mockDataCollectionManager.Verify(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>()), Times.Once);
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStartResult, It.IsAny<BeforeTestRunStartResult>()), Times.Once);
 
-            // Verify AfterTestRun events.
-            this.mockDataCollectionManager.Verify(x => x.SessionEnded(It.IsAny<bool>()), Times.Once);
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.AfterTestRunEndResult, It.IsAny<AfterTestRunEndResult>()), Times.Once);
-        }
+        // Verify TestHostLaunched events
+        _mockDataCollectionManager.Verify(x => x.TestHostLaunched(1234), Times.Once);
 
-        [TestMethod]
-        public void ProcessRequestsShouldDisposeDataCollectorsOnAfterTestRunEnd()
-        {
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.AfterTestRunEnd, Payload = "false" });
+        // Verify AfterTestRun events.
+        _mockDataCollectionManager.Verify(x => x.SessionEnded(It.IsAny<bool>()), Times.Once);
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.AfterTestRunEndResult, It.IsAny<AfterTestRunEndResult>()), Times.Once);
+    }
 
-            this.requestHandler.ProcessRequests();
+    [TestMethod]
+    public void ProcessRequestsShouldDisposeDataCollectorsOnAfterTestRunEnd()
+    {
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.AfterTestRunEnd, Payload = "false" });
 
-            this.mockDataCollectionManager.Verify(x => x.Dispose());
-        }
+        _requestHandler.ProcessRequests();
 
-        [TestMethod]
-        public void ProcessRequestsShouldAddSourceDirectoryToTestPluginCache()
-        {
-            var testHostLaunchedPayload = new TestHostLaunchedPayload();
-            testHostLaunchedPayload.ProcessId = 1234;
+        _mockDataCollectionManager.Verify(x => x.Dispose());
+    }
 
-            var temp = Path.GetTempPath();
-            string runSettings = "<RunSettings><RunConfiguration><TestAdaptersPaths></TestAdaptersPaths></RunConfiguration></RunSettings>";
+    [TestMethod]
+    public void ProcessRequestsShouldAddSourceDirectoryToTestPluginCache()
+    {
+        var testHostLaunchedPayload = new TestHostLaunchedPayload();
+        testHostLaunchedPayload.ProcessId = 1234;
 
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(this.beforeTestRunStart)
-                                                                                .Returns(new Message() { MessageType = MessageType.TestHostLaunched, Payload = JToken.FromObject(testHostLaunchedPayload) })
-                                                                                .Returns(this.afterTestRunEnd);
+        var temp = Path.GetTempPath();
+        string runSettings = "<RunSettings><RunConfiguration><TestAdaptersPaths></TestAdaptersPaths></RunConfiguration></RunSettings>";
 
-            this.mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
-            this.mockDataCollectionManager.Setup(x => x.TestHostLaunched(It.IsAny<int>()));
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestHostLaunchedPayload>(It.Is<Message>(y => y.MessageType == MessageType.TestHostLaunched)))
-                                   .Returns(testHostLaunchedPayload);
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload
-            {
-                SettingsXml = runSettings,
-                Sources = new List<string>
-                {
-                    Path.Combine(temp, "dir1", "test1.dll"),
-                    Path.Combine(temp, "dir2", "test2.dll"),
-                    Path.Combine(temp, "dir3", "test3.dll")
-                }
-            };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
-            this.mockFileHelper.Setup(x => x.DirectoryExists($@"{temp}dir1")).Returns(true);
-            this.mockFileHelper.Setup(x => x.EnumerateFiles($@"{temp}dir1", SearchOption.AllDirectories, @"Collector.dll")).Returns(new List<string> { Path.Combine(temp, "dir1", "abc.DataCollector.dll") });
-
-            this.requestHandler.ProcessRequests();
-
-            this.mockFileHelper.Verify(x => x.EnumerateFiles($@"{temp}dir1", SearchOption.AllDirectories, @"Collector.dll"), Times.Once);
-            Assert.IsTrue(TestPluginCache.Instance.GetExtensionPaths(@"Collector.dll").Contains(Path.Combine(temp, "dir1", "abc.DataCollector.dll")));
-        }
-
-        [TestMethod]
-        public void ProcessRequestsShouldThrowExceptionIfThrownByCommunicationManager()
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(_beforeTestRunStart)
+            .Returns(new Message() { MessageType = MessageType.TestHostLaunched, Payload = JToken.FromObject(testHostLaunchedPayload) })
+            .Returns(_afterTestRunEnd);
+
+        _mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(true);
+        _mockDataCollectionManager.Setup(x => x.TestHostLaunched(It.IsAny<int>()));
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestHostLaunchedPayload>(It.Is<Message>(y => y.MessageType == MessageType.TestHostLaunched)))
+            .Returns(testHostLaunchedPayload);
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload
         {
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Throws<Exception>();
+            SettingsXml = runSettings,
+            Sources = new List<string>
+            {
+                Path.Combine(temp, "dir1", "test1.dll"),
+                Path.Combine(temp, "dir2", "test2.dll"),
+                Path.Combine(temp, "dir3", "test3.dll")
+            }
+        };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
+        _mockFileHelper.Setup(x => x.DirectoryExists($@"{temp}dir1")).Returns(true);
+        _mockFileHelper.Setup(x => x.EnumerateFiles($@"{temp}dir1", SearchOption.AllDirectories, @"Collector.dll")).Returns(new List<string> { Path.Combine(temp, "dir1", "abc.DataCollector.dll") });
 
-            Assert.ThrowsException<Exception>(() => { this.requestHandler.ProcessRequests(); });
-        }
+        _requestHandler.ProcessRequests();
 
-        [TestMethod]
-        public void ProcessRequestsShouldInitializeTestCaseEventHandlerIfTestCaseLevelEventsAreEnabled()
-        {
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
+        _mockFileHelper.Verify(x => x.EnumerateFiles($@"{temp}dir1", SearchOption.AllDirectories, @"Collector.dll"), Times.Once);
+        Assert.IsTrue(TestPluginCache.Instance.GetExtensionPaths(@"Collector.dll").Contains(Path.Combine(temp, "dir1", "abc.DataCollector.dll")));
+    }
 
-            this.requestHandler.ProcessRequests();
+    [TestMethod]
+    public void ProcessRequestsShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.ReceiveMessage()).Throws<Exception>();
 
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Once);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Once);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Once);
-        }
+        Assert.ThrowsException<Exception>(() => _requestHandler.ProcessRequests());
+    }
 
-        [TestMethod]
-        public void ProcessRequestsShouldSetDefaultTimeoutIfNoEnvVarialbeSet()
-        {
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
+    [TestMethod]
+    public void ProcessRequestsShouldInitializeTestCaseEventHandlerIfTestCaseLevelEventsAreEnabled()
+    {
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
 
-            this.requestHandler.ProcessRequests();
+        _requestHandler.ProcessRequests();
 
-            this.mockDataCollectionTestCaseEventHandler.Verify(h => h.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
-        }
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Once);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Once);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void ProcessRequestsShouldSetTimeoutBasedOnEnvVariable()
-        {
-            var timeout = 10;
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString());
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
+    [TestMethod]
+    public void ProcessRequestsShouldSetDefaultTimeoutIfNoEnvVarialbeSet()
+    {
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
 
-            this.requestHandler.ProcessRequests();
+        _requestHandler.ProcessRequests();
 
-            this.mockDataCollectionTestCaseEventHandler.Verify(h => h.WaitForRequestHandlerConnection(timeout * 1000));
-        }
+        _mockDataCollectionTestCaseEventHandler.Verify(h => h.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
+    }
 
-        [TestMethod]
-        public void ProcessRequestsShouldNotInitializeTestCaseEventHandlerIfTestCaseLevelEventsAreNotEnabled()
-        {
-            this.mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(false);
-            var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunSTartPayload);
+    [TestMethod]
+    public void ProcessRequestsShouldSetTimeoutBasedOnEnvVariable()
+    {
+        var timeout = 10;
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString(CultureInfo.InvariantCulture));
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
 
-            this.requestHandler.ProcessRequests();
+        _requestHandler.ProcessRequests();
 
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Never);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Never);
-            this.mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Never);
-        }
+        _mockDataCollectionTestCaseEventHandler.Verify(h => h.WaitForRequestHandlerConnection(timeout * 1000));
+    }
 
-        [TestMethod]
-        public void ProcessRequestsShouldReceiveCorrectPayloadInBeforeTestRunStart()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockDataSerializer.Verify(x => x.DeserializePayload<BeforeTestRunStartPayload>(message), Times.Once);
-        }
-
-        [TestMethod]
-        public void ProcessRequestShouldInitializeDataCollectorsWithCorrectSettings()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockDataCollectionManager.Verify(x => x.InitializeDataCollectors("settingsxml"), Times.Once);
-        }
-
-        [TestMethod]
-        public void ProcessRequestShouldCallSessionStartWithCorrectTestSources()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" } };
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockDataCollectionManager.Verify(x => x.SessionStarted(It.Is<SessionStartEventArgs>(
-                y => y.GetPropertyValue<IEnumerable<string>>("TestSources").Contains("test1.dll") &&
-                y.GetPropertyValue<IEnumerable<string>>("TestSources").Contains("test2.dll"))));
-        }
-
-        [TestMethod]
-        public void ProcessRequestShouldEnableTelemetry()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = true };
-            this.mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(false);
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = true);
-            this.mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<MetricsCollection>());
-        }
-
-        [TestMethod]
-        public void ProcessRequestShouldNotEnableTelemetryIfTelemetryEnabled()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = true };
-            this.mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(true);
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = It.IsAny<bool>(), Times.Never);
-            this.mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<IMetricsCollection>(), Times.Never);
-        }
-
-        [TestMethod]
-        public void ProcessRequestShouldNotEnableTelemetryIfTelemetryEnablingNotRequested()
-        {
-            var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = false };
-            this.mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(false);
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
-                                   .Returns(beforeTestRunStartPayload);
-            var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(this.afterTestRunEnd);
-            this.requestHandler.ProcessRequests();
-
-            this.mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = It.IsAny<bool>(), Times.Never);
-            this.mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<IMetricsCollection>(), Times.Never);
-        }
+    [TestMethod]
+    public void ProcessRequestsShouldNotInitializeTestCaseEventHandlerIfTestCaseLevelEventsAreNotEnabled()
+    {
+        _mockDataCollectionManager.Setup(x => x.SessionStarted(It.IsAny<SessionStartEventArgs>())).Returns(false);
+        var beforeTestRunSTartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunSTartPayload);
+
+        _requestHandler.ProcessRequests();
+
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.InitializeCommunication(), Times.Never);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.ProcessRequests(), Times.Never);
+        _mockDataCollectionTestCaseEventHandler.Verify(x => x.WaitForRequestHandlerConnection(It.IsAny<int>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void ProcessRequestsShouldReceiveCorrectPayloadInBeforeTestRunStart()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockDataSerializer.Verify(x => x.DeserializePayload<BeforeTestRunStartPayload>(message), Times.Once);
+    }
+
+    [TestMethod]
+    public void ProcessRequestShouldInitializeDataCollectorsWithCorrectSettings()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockDataCollectionManager.Verify(x => x.InitializeDataCollectors("settingsxml"), Times.Once);
+    }
+
+    [TestMethod]
+    public void ProcessRequestShouldCallSessionStartWithCorrectTestSources()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" } };
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockDataCollectionManager.Verify(x => x.SessionStarted(It.Is<SessionStartEventArgs>(
+            y => y.GetPropertyValue<IEnumerable<string>>("TestSources")!.Contains("test1.dll") &&
+                 y.GetPropertyValue<IEnumerable<string>>("TestSources")!.Contains("test2.dll"))));
+    }
+
+    [TestMethod]
+    public void ProcessRequestShouldEnableTelemetry()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = true };
+        _mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(false);
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = true);
+        _mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<MetricsCollection>());
+    }
+
+    [TestMethod]
+    public void ProcessRequestShouldNotEnableTelemetryIfTelemetryEnabled()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = true };
+        _mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(true);
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = It.IsAny<bool>(), Times.Never);
+        _mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<IMetricsCollection>(), Times.Never);
+    }
+
+    [TestMethod]
+    public void ProcessRequestShouldNotEnableTelemetryIfTelemetryEnablingNotRequested()
+    {
+        var beforeTestRunStartPayload = new BeforeTestRunStartPayload { SettingsXml = "settingsxml", Sources = new List<string> { "test1.dll", "test2.dll" }, IsTelemetryOptedIn = false };
+        _mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(false);
+        _mockDataSerializer.Setup(x => x.DeserializePayload<BeforeTestRunStartPayload>(It.Is<Message>(y => y.MessageType == MessageType.BeforeTestRunStart)))
+            .Returns(beforeTestRunStartPayload);
+        var message = new Message() { MessageType = MessageType.BeforeTestRunStart, Payload = JToken.FromObject(beforeTestRunStartPayload) };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(_afterTestRunEnd);
+        _requestHandler.ProcessRequests();
+
+        _mockRequestData.VerifySet(r => r.IsTelemetryOptedIn = It.IsAny<bool>(), Times.Never);
+        _mockRequestData.VerifySet(r => r.MetricsCollection = It.IsAny<IMetricsCollection>(), Times.Never);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestSenderTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestSenderTests.cs
index 1e1c9cca49..311230f716 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestSenderTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionRequestSenderTests.cs
@@ -1,77 +1,159 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class DataCollectionRequestSenderTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class DataCollectionRequestSenderTests
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly DataCollectionRequestSender _requestSender;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+
+    public DataCollectionRequestSenderTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _requestSender = new DataCollectionRequestSender(_mockCommunicationManager.Object, _mockDataSerializer.Object);
+    }
+
+    [TestMethod]
+    public void SendAfterTestRunEndAndGetResultShouldReturnAttachments()
+    {
+        var datacollectorUri = new Uri("my://custom/datacollector");
+        var attachmentUri = new Uri("my://filename.txt");
+        var displayName = "CustomDataCollector";
+        var rawMessage1 = "rawMessage1";
+        var rawMessage2 = "rawMessage2";
+        var attachment = new AttachmentSet(datacollectorUri, displayName);
+        attachment.Attachments.Add(new UriDataAttachment(attachmentUri, "filename.txt"));
+        var invokedDataCollector = new InvokedDataCollector(datacollectorUri, displayName, typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false);
+        _mockDataSerializer.Setup(x => x.DeserializePayload<AfterTestRunEndResult>(It.IsAny<Message>())).Returns(
+            new AfterTestRunEndResult([attachment], new Collection<InvokedDataCollector>() { invokedDataCollector }, new Dictionary<string, object>()));
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveRawMessage()).Returns(rawMessage1).Returns(rawMessage2);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage1)).Returns(new Message() { MessageType = MessageType.TelemetryEventMessage, Payload = null });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage2)).Returns(new Message() { MessageType = MessageType.AfterTestRunEndResult, Payload = null });
+
+        var result = _requestSender.SendAfterTestRunEndAndGetResult(null, false);
+
+        Assert.IsNotNull(result);
+        Assert.IsNotNull(result.AttachmentSets);
+        Assert.IsNotNull(result.AttachmentSets);
+        Assert.IsNotNull(result.Metrics);
+        Assert.AreEqual(1, result.AttachmentSets.Count);
+        Assert.AreEqual(1, result.InvokedDataCollectors!.Count);
+        Assert.AreEqual(0, result.Metrics.Count);
+        Assert.IsNotNull(result.AttachmentSets[0]);
+        Assert.AreEqual(displayName, result.AttachmentSets[0].DisplayName);
+        Assert.AreEqual(datacollectorUri, result.AttachmentSets[0].Uri);
+        Assert.AreEqual(attachmentUri, result.AttachmentSets[0].Attachments[0].Uri);
+        Assert.IsNotNull(result.InvokedDataCollectors[0]);
+        Assert.AreEqual(datacollectorUri, result.InvokedDataCollectors[0].Uri);
+        Assert.AreEqual(invokedDataCollector.FilePath, result.InvokedDataCollectors[0].FilePath);
+        Assert.AreEqual(invokedDataCollector.AssemblyQualifiedName, result.InvokedDataCollectors[0].AssemblyQualifiedName);
+    }
+
+    [TestMethod]
+    public void SendAfterTestRunEndAndGetResultShouldReturnAttachmentsAndPropagateTelemetry()
+    {
+        var datacollectorUri = new Uri("my://custom/datacollector");
+        var attachmentUri = new Uri("my://filename.txt");
+        var displayName = "CustomDataCollector";
+        var rawMessage1 = "rawMessage1";
+        var rawMessage2 = "rawMessage2";
+        var attachment = new AttachmentSet(datacollectorUri, displayName);
+        attachment.Attachments.Add(new UriDataAttachment(attachmentUri, "filename.txt"));
+        var invokedDataCollector = new InvokedDataCollector(datacollectorUri, displayName, typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false);
+        _mockDataSerializer.Setup(x => x.DeserializePayload<AfterTestRunEndResult>(It.IsAny<Message>())).Returns(
+            new AfterTestRunEndResult([attachment], new Collection<InvokedDataCollector>() { invokedDataCollector }, new Dictionary<string, object>()));
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveRawMessage()).Returns(rawMessage1).Returns(rawMessage2);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage1)).Returns(new Message() { MessageType = MessageType.TelemetryEventMessage, Payload = null });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage2)).Returns(new Message() { MessageType = MessageType.AfterTestRunEndResult, Payload = null });
+        var handlerMock = new Mock<ITestMessageEventHandler>();
+
+        var result = _requestSender.SendAfterTestRunEndAndGetResult(handlerMock.Object, false);
+
+        Assert.IsNotNull(result);
+        Assert.IsNotNull(result.AttachmentSets);
+        Assert.IsNotNull(result.AttachmentSets);
+        Assert.IsNotNull(result.Metrics);
+        Assert.AreEqual(1, result.AttachmentSets.Count);
+        Assert.AreEqual(1, result.InvokedDataCollectors!.Count);
+        Assert.AreEqual(0, result.Metrics.Count);
+        Assert.IsNotNull(result.AttachmentSets[0]);
+        Assert.AreEqual(displayName, result.AttachmentSets[0].DisplayName);
+        Assert.AreEqual(datacollectorUri, result.AttachmentSets[0].Uri);
+        Assert.AreEqual(attachmentUri, result.AttachmentSets[0].Attachments[0].Uri);
+        Assert.IsNotNull(result.InvokedDataCollectors[0]);
+        Assert.AreEqual(datacollectorUri, result.InvokedDataCollectors[0].Uri);
+        Assert.AreEqual(invokedDataCollector.FilePath, result.InvokedDataCollectors[0].FilePath);
+        Assert.AreEqual(invokedDataCollector.AssemblyQualifiedName, result.InvokedDataCollectors[0].AssemblyQualifiedName);
+
+        handlerMock.Verify(h => h.HandleRawMessage(rawMessage1));
+    }
+
+    [TestMethod]
+    public void SendAfterTestRunEndAndGetResultShouldNotReturnAttachmentsWhenRequestCancelled()
+    {
+        var attachmentSets = _requestSender.SendAfterTestRunEndAndGetResult(null, true);
+
+        Assert.IsNull(attachmentSets);
+    }
+
+    [TestMethod]
+    public void SendBeforeTestRunStartAndGetResultShouldSendBeforeTestRunStartMessageAndPayload()
+    {
+        var rawMessage = "rawMessage";
+        var testSources = new List<string>() { "test1.dll" };
+        _mockCommunicationManager.Setup(x => x.ReceiveRawMessage()).Returns(rawMessage);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage)).Returns(new Message() { MessageType = MessageType.BeforeTestRunStartResult, Payload = null });
+        _requestSender.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, true, null);
+
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStart, It.Is<BeforeTestRunStartPayload>(p => p.SettingsXml == string.Empty && p.IsTelemetryOptedIn)));
+    }
+
+    [TestMethod]
+    public void SendBeforeTestRunStartAndGetResultShouldSendRawMessageIfTelemetry()
+    {
+        var rawMessage1 = "rawMessage1";
+        var rawMessage2 = "rawMessage2";
+        var testSources = new List<string>() { "test1.dll" };
+        var handlerMock = new Mock<ITestMessageEventHandler>();
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveRawMessage()).Returns(rawMessage1).Returns(rawMessage2);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage1)).Returns(new Message() { MessageType = MessageType.TelemetryEventMessage, Payload = null });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage2)).Returns(new Message() { MessageType = MessageType.BeforeTestRunStartResult, Payload = null });
+        _requestSender.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, true, handlerMock.Object);
+
+        handlerMock.Verify(x => x.HandleRawMessage(rawMessage1));
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStart, It.Is<BeforeTestRunStartPayload>(p => p.SettingsXml == string.Empty && p.IsTelemetryOptedIn)));
+    }
+
+    [TestMethod]
+    public void SendBeforeTestRunStartAndGetResultShouldNotSendRawMessageIfTelemetryAndNoHandler()
     {
-        private Mock<ICommunicationManager> mockCommunicationManager;
-        private DataCollectionRequestSender requestSender;
-        private Mock<IDataSerializer> mockDataSerializer;
-
-        public DataCollectionRequestSenderTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.requestSender = new DataCollectionRequestSender(this.mockCommunicationManager.Object, this.mockDataSerializer.Object);
-        }
-
-        [TestMethod]
-        public void SendAfterTestRunEndAndGetResultShouldReturnAttachments()
-        {
-            var datacollectorUri = new Uri("my://custom/datacollector");
-            var attachmentUri = new Uri("my://filename.txt");
-            var displayName = "CustomDataCollector";
-            var attachment = new AttachmentSet(datacollectorUri, displayName);
-            attachment.Attachments.Add(new UriDataAttachment(attachmentUri, "filename.txt"));
-
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<AfterTestRunEndResult>(It.IsAny<Message>())).Returns(
-                new AfterTestRunEndResult(new Collection<AttachmentSet>() { attachment }, new Dictionary<string, object>()));
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.AfterTestRunEndResult, Payload = null });
-
-            var result = this.requestSender.SendAfterTestRunEndAndGetResult(null, false);
-
-            Assert.IsNotNull(result);
-            Assert.IsNotNull(result.AttachmentSets);
-            Assert.IsNotNull(result.Metrics);
-            Assert.AreEqual(1, result.AttachmentSets.Count);
-            Assert.AreEqual(0, result.Metrics.Count);
-            Assert.IsNotNull(result.AttachmentSets[0]);
-            Assert.AreEqual(displayName, result.AttachmentSets[0].DisplayName);
-            Assert.AreEqual(datacollectorUri, result.AttachmentSets[0].Uri);
-            Assert.AreEqual(attachmentUri, result.AttachmentSets[0].Attachments[0].Uri);
-        }
-
-        [TestMethod]
-        public void SendAfterTestRunEndAndGetResultShouldNotReturnAttachmentsWhenRequestCancelled()
-        {
-            var attachmentSets = this.requestSender.SendAfterTestRunEndAndGetResult(null, true);
-
-            Assert.IsNull(attachmentSets);
-        }
-
-        [TestMethod]
-        public void SendBeforeTestRunStartAndGetResultShouldSendBeforeTestRunStartMessageAndPayload()
-        {
-            var testSources = new List<string>() { "test1.dll" };
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.BeforeTestRunStartResult, Payload = null });
-            this.requestSender.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, true, null);
-
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStart, It.Is<BeforeTestRunStartPayload>(p => p.SettingsXml == string.Empty && p.IsTelemetryOptedIn)));
-        }
+        var rawMessage1 = "rawMessage1";
+        var rawMessage2 = "rawMessage2";
+        var testSources = new List<string>() { "test1.dll" };
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveRawMessage()).Returns(rawMessage1).Returns(rawMessage2);
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage1)).Returns(new Message() { MessageType = MessageType.TelemetryEventMessage, Payload = null });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(rawMessage2)).Returns(new Message() { MessageType = MessageType.BeforeTestRunStartResult, Payload = null });
+        _requestSender.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, true, null);
+
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.BeforeTestRunStart, It.Is<BeforeTestRunStartPayload>(p => p.SettingsXml == string.Empty && p.IsTelemetryOptedIn)));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventHandlerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventHandlerTests.cs
index 9955ae315b..15db3a0b47 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventHandlerTests.cs
@@ -1,152 +1,146 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Collections.ObjectModel;
+using System.Net;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class DataCollectionTestCaseEventHandlerTests
 {
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Net;
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly Mock<IDataCollectionManager> _mockDataCollectionManager;
+    private readonly DataCollectionTestCaseEventHandler _requestHandler;
+    private readonly Mock<IDataSerializer> _dataSerializer;
+    private readonly Mock<IMessageSink> _messageSink;
+
+    public DataCollectionTestCaseEventHandlerTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _mockDataCollectionManager = new Mock<IDataCollectionManager>();
+        _dataSerializer = new Mock<IDataSerializer>();
+        _messageSink = new Mock<IMessageSink>();
+        _requestHandler = new DataCollectionTestCaseEventHandler(_messageSink.Object, _mockCommunicationManager.Object, new Mock<IDataCollectionManager>().Object, _dataSerializer.Object);
+    }
+
+    [TestMethod]
+    public void InitializeShouldInitializeConnection()
+    {
+        _mockCommunicationManager.Setup(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, 1));
+        _requestHandler.InitializeCommunication();
+
+        _mockCommunicationManager.Verify(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(x => x.AcceptClientAsync(), Times.Once);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfExceptionIsThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws<Exception>();
+        Assert.ThrowsException<Exception>(() => _requestHandler.InitializeCommunication());
+    }
+
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionShouldWaitForConnectionToBeCompleted()
+    {
+        _mockCommunicationManager.Setup(x => x.WaitForClientConnection(It.IsAny<int>())).Returns(true);
+
+        var result = _requestHandler.WaitForRequestHandlerConnection(10);
+
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionShouldThrowExceptionIfThrownByConnectionManager()
+    {
+        _mockCommunicationManager.Setup(x => x.WaitForClientConnection(It.IsAny<int>())).Throws<Exception>();
+
+        Assert.ThrowsException<Exception>(() => _requestHandler.WaitForRequestHandlerConnection(10));
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void CloseShouldStopServer()
+    {
+        _requestHandler.Close();
+
+        _mockCommunicationManager.Verify(x => x.StopServer(), Times.Once);
+    }
+
+    [TestMethod]
+    public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.StopServer()).Throws<Exception>();
+
+        Assert.ThrowsException<Exception>(
+            () => _requestHandler.Close());
+    }
+
+    [TestMethod]
+    public void CloseShouldNotThrowExceptionIfCommunicationManagerIsNull()
+    {
+        var requestHandler = new DataCollectionTestCaseEventHandler(_messageSink.Object, null!, new Mock<IDataCollectionManager>().Object, _dataSerializer.Object);
+
+        requestHandler.Close();
+
+        _mockCommunicationManager.Verify(x => x.StopServer(), Times.Never);
+    }
 
-    using Moq;
+    [TestMethod]
+    public void ProcessRequestsShouldProcessBeforeTestCaseStartEvent()
+    {
+        var message = new Message();
+        message.MessageType = MessageType.DataCollectionTestStart;
+        message.Payload = JToken.FromObject(new TestCaseEndEventArgs());
+
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(new Message() { MessageType = MessageType.SessionEnd, Payload = "false" });
+
+        var requestHandler = new DataCollectionTestCaseEventHandler(_messageSink.Object, _mockCommunicationManager.Object, _mockDataCollectionManager.Object, _dataSerializer.Object);
+        _dataSerializer.Setup(x => x.DeserializePayload<TestCaseStartEventArgs>(message)).Returns(new TestCaseStartEventArgs());
+
+        requestHandler.ProcessRequests();
+
+        _mockDataCollectionManager.Verify(x => x.TestCaseStarted(It.IsAny<TestCaseStartEventArgs>()), Times.Once);
+    }
 
-    using Newtonsoft.Json.Linq;
+    [TestMethod]
+    public void ProcessRequestsShouldProcessAfterTestCaseCompleteEvent()
+    {
+        var message = new Message();
+        message.MessageType = MessageType.DataCollectionTestEnd;
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        message.Payload = JToken.FromObject(new TestResultEventArgs(new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase)));
+
+        _mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(new Message() { MessageType = MessageType.SessionEnd, Payload = "false" });
+
+        var requestHandler = new DataCollectionTestCaseEventHandler(_messageSink.Object, _mockCommunicationManager.Object, _mockDataCollectionManager.Object, _dataSerializer.Object);
+        _dataSerializer.Setup(x => x.DeserializePayload<TestCaseEndEventArgs>(message)).Returns(new TestCaseEndEventArgs());
+
+        requestHandler.ProcessRequests();
+
+        _mockDataCollectionManager.Verify(x => x.TestCaseEnded(It.IsAny<TestCaseEndEventArgs>()), Times.Once);
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionTestEndResult, It.IsAny<Collection<AttachmentSet>>()));
+    }
 
-    [TestClass]
-    public class DataCollectionTestCaseEventHandlerTests
+    [TestMethod]
+    public void ProcessRequestsShouldThrowExceptionIfThrownByCommunicationManager()
     {
-        private Mock<ICommunicationManager> mockCommunicationManager;
-        private Mock<IDataCollectionManager> mockDataCollectionManager;
-        private DataCollectionTestCaseEventHandler requestHandler;
-        private Mock<IDataSerializer> dataSerializer;
-
-        public DataCollectionTestCaseEventHandlerTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.mockDataCollectionManager = new Mock<IDataCollectionManager>();
-            this.dataSerializer = new Mock<IDataSerializer>();
-            this.requestHandler = new DataCollectionTestCaseEventHandler(this.mockCommunicationManager.Object, new Mock<IDataCollectionManager>().Object, this.dataSerializer.Object);
-        }
-
-        [TestMethod]
-        public void InitializeShouldInitializeConnection()
-        {
-            this.mockCommunicationManager.Setup(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, 1));
-            this.requestHandler.InitializeCommunication();
-
-            this.mockCommunicationManager.Verify(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(x => x.AcceptClientAsync(), Times.Once);
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfExceptionIsThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws<Exception>();
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.InitializeCommunication();
-            });
-        }
-
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionShouldWaitForConnectionToBeCompleted()
-        {
-            this.mockCommunicationManager.Setup(x => x.WaitForClientConnection(It.IsAny<int>())).Returns(true);
-
-            var result = this.requestHandler.WaitForRequestHandlerConnection(10);
-
-            Assert.IsTrue(result);
-        }
-
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionShouldThrowExceptionIfThrownByConnectionManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.WaitForClientConnection(It.IsAny<int>())).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.requestHandler.WaitForRequestHandlerConnection(10);
-            });
-        }
-
-        [TestMethod]
-        public void CloseShouldStopServer()
-        {
-            this.requestHandler.Close();
-
-            this.mockCommunicationManager.Verify(x => x.StopServer(), Times.Once);
-        }
-
-        [TestMethod]
-        public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.StopServer()).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(
-                () =>
-                {
-                    this.requestHandler.Close();
-                });
-        }
-
-        [TestMethod]
-        public void CloseShouldNotThrowExceptionIfCommunicationManagerIsNull()
-        {
-            var requestHandler = new DataCollectionTestCaseEventHandler(null, new Mock<IDataCollectionManager>().Object, this.dataSerializer.Object);
-
-            requestHandler.Close();
-
-            this.mockCommunicationManager.Verify(x => x.StopServer(), Times.Never);
-        }
-
-        [TestMethod]
-        public void ProcessRequestsShouldProcessBeforeTestCaseStartEvent()
-        {
-            var message = new Message();
-            message.MessageType = MessageType.DataCollectionTestStart;
-            message.Payload = JToken.FromObject(new TestCaseEndEventArgs());
-
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(new Message() { MessageType = MessageType.SessionEnd, Payload = "false" });
-
-            var requestHandler = new DataCollectionTestCaseEventHandler(this.mockCommunicationManager.Object, this.mockDataCollectionManager.Object, this.dataSerializer.Object);
-
-            requestHandler.ProcessRequests();
-
-            this.mockDataCollectionManager.Verify(x => x.TestCaseStarted(It.IsAny<TestCaseStartEventArgs>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void ProcessRequestsShouldProcessAfterTestCaseCompleteEvent()
-        {
-            var message = new Message();
-            message.MessageType = MessageType.DataCollectionTestEnd;
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            message.Payload = JToken.FromObject(new TestResultEventArgs(new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase)));
-
-            this.mockCommunicationManager.SetupSequence(x => x.ReceiveMessage()).Returns(message).Returns(new Message() { MessageType = MessageType.SessionEnd, Payload = "false" });
-
-            var requestHandler = new DataCollectionTestCaseEventHandler(this.mockCommunicationManager.Object, this.mockDataCollectionManager.Object, this.dataSerializer.Object);
-
-            requestHandler.ProcessRequests();
-
-            this.mockDataCollectionManager.Verify(x => x.TestCaseEnded(It.IsAny<TestCaseEndEventArgs>()), Times.Once);
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionTestEndResult, It.IsAny<Collection<AttachmentSet>>()));
-        }
-
-        [TestMethod]
-        public void ProcessRequestsShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Throws<Exception>();
+        _mockCommunicationManager.Setup(x => x.ReceiveMessage()).Throws<Exception>();
 
-            Assert.ThrowsException<Exception>(() => { this.requestHandler.ProcessRequests(); });
-        }
+        Assert.ThrowsException<Exception>(() => _requestHandler.ProcessRequests());
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventSenderTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventSenderTests.cs
index 3dbba20aef..7d1808ecc9 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventSenderTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/DataCollectionTestCaseEventSenderTests.cs
@@ -1,141 +1,125 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Collections.ObjectModel;
+using System.Net;
+
+using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class DataCollectionTestCaseEventSenderTests
 {
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Net;
+    private readonly DataCollectionTestCaseEventSender _dataCollectionTestCaseEventSender;
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly TestCase _testCase = new("hello", new Uri("world://how"), "1.dll");
+
+    public DataCollectionTestCaseEventSenderTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _dataCollectionTestCaseEventSender = new TestableDataCollectionTestCaseEventSender(_mockCommunicationManager.Object, JsonDataSerializer.Instance);
+    }
+
+    [TestMethod]
+    public void InitializeShouldInitializeCommunicationManager()
+    {
+        _dataCollectionTestCaseEventSender.InitializeCommunication(123);
+
+        _mockCommunicationManager.Verify(x => x.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 123)), Times.Once);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.SetupClientAsync(It.IsAny<IPEndPoint>())).Throws<Exception>();
+
+        Assert.ThrowsException<Exception>(() => _dataCollectionTestCaseEventSender.InitializeCommunication(123));
+    }
+
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldInvokeWaitForServerConnection()
+    {
+        _dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(123);
+
+        _mockCommunicationManager.Verify(x => x.WaitForServerConnection(It.IsAny<int>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.WaitForServerConnection(It.IsAny<int>())).Throws<Exception>();
 
-    using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+        Assert.ThrowsException<Exception>(() => _dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(123));
+    }
+
+    [TestMethod]
+    public void CloseShouldDisposeCommunicationManager()
+    {
+        _dataCollectionTestCaseEventSender.Close();
+
+        _mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
+    }
+
+    [TestMethod]
+    public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.StopClient()).Throws<Exception>();
+
+        Assert.ThrowsException<Exception>(() => _dataCollectionTestCaseEventSender.Close());
+    }
+
+    [TestMethod]
+    public void SendTestCaseStartShouldSendMessageThroughCommunicationManager()
+    {
+        _mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.DataCollectionTestStartAck });
+        var testcaseStartEventArgs = new TestCaseStartEventArgs(_testCase);
+        _dataCollectionTestCaseEventSender.SendTestCaseStart(testcaseStartEventArgs);
 
-    using Moq;
+        _mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionTestStart, testcaseStartEventArgs), Times.Once);
+        _mockCommunicationManager.Verify(x => x.ReceiveMessage(), Times.Once);
+    }
+
+    [TestMethod]
+    public void SendTestCaseStartShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        var testcaseStartEventArgs = new TestCaseStartEventArgs(_testCase);
+        _mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionTestStart, testcaseStartEventArgs)).Throws<Exception>();
 
-    using Newtonsoft.Json.Linq;
+        Assert.ThrowsException<Exception>(() => _dataCollectionTestCaseEventSender.SendTestCaseStart(testcaseStartEventArgs));
+    }
 
-    [TestClass]
-    public class DataCollectionTestCaseEventSenderTests
+    [TestMethod]
+    public void SendTestCaseEndShouldReturnAttachments()
     {
-        private DataCollectionTestCaseEventSender dataCollectionTestCaseEventSender;
-        private Mock<ICommunicationManager> mockCommunicationManager;
-        private TestCase testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-
-        public DataCollectionTestCaseEventSenderTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.dataCollectionTestCaseEventSender = new TestableDataCollectionTestCaseEventSender(this.mockCommunicationManager.Object, JsonDataSerializer.Instance);
-        }
-
-        [TestMethod]
-        public void InitializeShouldInitializeCommunicationManager()
-        {
-            this.dataCollectionTestCaseEventSender.InitializeCommunication(123);
-
-            this.mockCommunicationManager.Verify(x => x.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, 123)), Times.Once);
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.SetupClientAsync(It.IsAny<IPEndPoint>())).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-                {
-                    this.dataCollectionTestCaseEventSender.InitializeCommunication(123);
-                });
-        }
-
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldInvokeWaitForServerConnection()
-        {
-            this.dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(123);
-
-            this.mockCommunicationManager.Verify(x => x.WaitForServerConnection(It.IsAny<int>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.WaitForServerConnection(It.IsAny<int>())).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-                {
-                    this.dataCollectionTestCaseEventSender.WaitForRequestSenderConnection(123);
-                });
-        }
-
-        [TestMethod]
-        public void CloseShouldDisposeCommunicationManager()
-        {
-            this.dataCollectionTestCaseEventSender.Close();
-
-            this.mockCommunicationManager.Verify(x => x.StopClient(), Times.Once);
-        }
-
-        [TestMethod]
-        public void CloseShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.StopClient()).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-                {
-                    this.dataCollectionTestCaseEventSender.Close();
-                });
-        }
-
-        [TestMethod]
-        public void SendTestCaseStartShouldSendMessageThroughCommunicationManager()
-        {
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.DataCollectionTestStartAck });
-            var testcaseStartEventArgs = new TestCaseStartEventArgs(this.testCase);
-            this.dataCollectionTestCaseEventSender.SendTestCaseStart(testcaseStartEventArgs);
-
-            this.mockCommunicationManager.Verify(x => x.SendMessage(MessageType.DataCollectionTestStart, testcaseStartEventArgs), Times.Once);
-            this.mockCommunicationManager.Verify(x => x.ReceiveMessage(), Times.Once);
-        }
-
-        [TestMethod]
-        public void SendTestCaseStartShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            var testcaseStartEventArgs = new TestCaseStartEventArgs(this.testCase);
-            this.mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionTestStart, testcaseStartEventArgs)).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-                {
-                    this.dataCollectionTestCaseEventSender.SendTestCaseStart(testcaseStartEventArgs);
-                });
-        }
-
-        [TestMethod]
-        public void SendTestCaseEndShouldReturnAttachments()
-        {
-            var testCaseEndEventArgs = new TestCaseEndEventArgs();
-
-            var attachmentSet = new AttachmentSet(new Uri("my://attachment"), "displayname");
-            this.mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.DataCollectionTestEndResult, Payload = JToken.FromObject(new Collection<AttachmentSet>() { attachmentSet }) });
-            var attachments = this.dataCollectionTestCaseEventSender.SendTestCaseEnd(testCaseEndEventArgs);
-
-            Assert.AreEqual(attachments[0].Uri, attachmentSet.Uri);
-            Assert.AreEqual(attachments[0].DisplayName, attachmentSet.DisplayName);
-        }
-
-        [TestMethod]
-        public void SendTestCaseCompletedShouldThrowExceptionIfThrownByCommunicationManager()
-        {
-            var testCaseEndEventArgs = new TestCaseEndEventArgs();
-
-            this.mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionTestEnd, It.IsAny<TestCaseEndEventArgs>())).Throws<Exception>();
-
-            Assert.ThrowsException<Exception>(() =>
-                {
-                    this.dataCollectionTestCaseEventSender.SendTestCaseEnd(testCaseEndEventArgs);
-                });
-        }
+        var testCaseEndEventArgs = new TestCaseEndEventArgs();
+
+        var attachmentSet = new AttachmentSet(new Uri("my://attachment"), "displayname");
+        _mockCommunicationManager.Setup(x => x.ReceiveMessage()).Returns(new Message() { MessageType = MessageType.DataCollectionTestEndResult, Payload = JToken.FromObject(new Collection<AttachmentSet>() { attachmentSet }) });
+        var attachments = _dataCollectionTestCaseEventSender.SendTestCaseEnd(testCaseEndEventArgs)!;
+
+        Assert.AreEqual(attachments[0].Uri, attachmentSet.Uri);
+        Assert.AreEqual(attachments[0].DisplayName, attachmentSet.DisplayName);
+    }
+
+    [TestMethod]
+    public void SendTestCaseCompletedShouldThrowExceptionIfThrownByCommunicationManager()
+    {
+        var testCaseEndEventArgs = new TestCaseEndEventArgs();
+
+        _mockCommunicationManager.Setup(x => x.SendMessage(MessageType.DataCollectionTestEnd, It.IsAny<TestCaseEndEventArgs>())).Throws<Exception>();
+
+        Assert.ThrowsException<Exception>(() => _dataCollectionTestCaseEventSender.SendTestCaseEnd(testCaseEndEventArgs));
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/JsonDataSerializerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/JsonDataSerializerTests.cs
index ee44f8eefa..fed8fb3d84 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/JsonDataSerializerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/JsonDataSerializerTests.cs
@@ -1,179 +1,263 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class JsonDataSerializerTests
 {
-    using System;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Serialization;
-    using VisualStudio.TestPlatform.ObjectModel;
-    using TestResult = VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    [TestClass]
-    public class JsonDataSerializerTests
+    private readonly JsonDataSerializer _jsonDataSerializer;
+
+    public JsonDataSerializerTests()
     {
-        private JsonDataSerializer jsonDataSerializer;
+        _jsonDataSerializer = JsonDataSerializer.Instance;
+    }
 
-        public JsonDataSerializerTests()
+    [TestMethod]
+    [DataRow(0)]
+    [DataRow(1)]
+    [DataRow(2)]
+    [DataRow(3)]
+    [DataRow(4)]
+    [DataRow(5)]
+    [DataRow(6)]
+    [DataRow(7)]
+    public void SerializePayloadShouldNotPickDefaultSettings(int version)
+    {
+        JsonConvert.DefaultSettings = () => new JsonSerializerSettings
         {
-            this.jsonDataSerializer = JsonDataSerializer.Instance;
-        }
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new SnakeCaseNamingStrategy()
+            },
+            PreserveReferencesHandling = PreserveReferencesHandling.All,
+        };
 
-        [TestMethod]
-        public void SerializePayloadShouldNotPickDefaultSettings()
+        var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
+        classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
+        classWithSelfReferencingLoop.InfiniteReference!.InfiniteReference = classWithSelfReferencingLoop;
+
+        string serializedPayload = _jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop, version);
+        if (version <= 1)
         {
-            JsonConvert.DefaultSettings = () => new JsonSerializerSettings
-            {
-                ContractResolver = new DefaultContractResolver
-                {
-                    NamingStrategy = new SnakeCaseNamingStrategy()
-                }
-            };
-
-            var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
-            classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
-            classWithSelfReferencingLoop.InfiniteRefernce.InfiniteRefernce = classWithSelfReferencingLoop;
-
-            string serializedPayload = this.jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop);
-            Assert.AreEqual("{\"MessageType\":\"dummy\",\"Payload\":{\"InfiniteRefernce\":{}}}", serializedPayload);
+            Assert.AreEqual("{\"MessageType\":\"dummy\",\"Payload\":{\"InfiniteReference\":{}}}", serializedPayload);
         }
-
-        [TestMethod]
-        public void DeserializeMessageShouldNotPickDefaultSettings()
+        else
         {
-            JsonConvert.DefaultSettings = () => new JsonSerializerSettings
-            {
-                ContractResolver = new DefaultContractResolver
-                {
-                    NamingStrategy = new SnakeCaseNamingStrategy()
-                }
-            };
-
-            Message message = this.jsonDataSerializer.DeserializeMessage("{\"MessageType\":\"dummy\",\"Payload\":{\"InfiniteRefernce\":{}}}");
-            Assert.AreEqual("dummy", message?.MessageType);
+            Assert.AreEqual($"{{\"Version\":{version},\"MessageType\":\"dummy\",\"Payload\":{{\"InfiniteReference\":{{}}}}}}", serializedPayload);
         }
 
-        [TestMethod]
-        public void SerializePayloadShouldSerializeAnObjectWithSelfReferencingLoop()
+        JsonConvert.DefaultSettings = null;
+    }
+
+    [TestMethod]
+    public void DeserializeMessageShouldNotPickDefaultSettings()
+    {
+        JsonConvert.DefaultSettings = () => new JsonSerializerSettings
         {
-            var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
-            classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
-            classWithSelfReferencingLoop.InfiniteRefernce.InfiniteRefernce = classWithSelfReferencingLoop;
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new SnakeCaseNamingStrategy()
+            },
+            PreserveReferencesHandling = PreserveReferencesHandling.All,
+        };
+
+        Message message = _jsonDataSerializer.DeserializeMessage("{\"MessageType\":\"dummy\",\"Payload\":{\"InfiniteReference\":{}}}");
+        Assert.AreEqual("dummy", message?.MessageType);
+        JsonConvert.DefaultSettings = null;
+    }
 
-            // This line should not throw exception
-            this.jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop);
-        }
 
-        [TestMethod]
-        public void DeserializeShouldDeserializeAnObjectWhichHadSelfReferencingLoopBeforeSerialization()
+    [TestMethod]
+    [DataRow(0)]
+    [DataRow(1)]
+    [DataRow(2)]
+    [DataRow(3)]
+    [DataRow(4)]
+    [DataRow(5)]
+    [DataRow(6)]
+    [DataRow(7)]
+
+    public void SerializePayloadIsUnaffectedByJsonConverterDefaultSettings(int version)
+    {
+
+        Assert.IsNull(JsonConvert.DefaultSettings);
+        //todo: how to check feature flag
+        var completeArgs = new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero);
+        var payload = new TestRunCompletePayload { TestRunCompleteArgs = completeArgs };
+
+        JsonConvert.DefaultSettings = () =>
         {
-            var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
-            classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
-            classWithSelfReferencingLoop.InfiniteRefernce.InfiniteRefernce = classWithSelfReferencingLoop;
+            //restore the default settings to null
+            JsonConvert.DefaultSettings = null;
+            Assert.Fail("Should Not Access DefaultSettings");
+            return new();
+        };
 
-            var json = this.jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop);
+        var withDefaultSettingUpdated = JsonDataSerializer.Instance.SerializePayload(MessageType.ExecutionComplete, payload, version);
 
-            // This line should deserialize properly
-            var result = this.jsonDataSerializer.Deserialize<ClassWithSelfReferencingLoop>(json, 1);
+        //restore the default settings to null
+        JsonConvert.DefaultSettings = null;
+    }
 
-            Assert.AreEqual(typeof(ClassWithSelfReferencingLoop), result.GetType());
-            Assert.IsNull(result.InfiniteRefernce);
-        }
+    [TestMethod]
+    [DataRow(0)]
+    [DataRow(1)]
+    [DataRow(2)]
+    [DataRow(3)]
+    [DataRow(4)]
+    [DataRow(5)]
+    [DataRow(6)]
+    [DataRow(7)]
+    public void DeserializePayloadIsUnaffectedByJsonConverterDefaultSettings(int version)
+    {
+
+        Assert.IsNull(JsonConvert.DefaultSettings, "If this is not null some other test didn't clean up its default setti0ngs");
 
-        [TestMethod]
-        public void CloneShouldReturnNullForNull()
+        JsonConvert.DefaultSettings = () =>
         {
-            var clonedTestCase = this.jsonDataSerializer.Clone<TestCase>(null);
+            //restore the default settings to null
+            JsonConvert.DefaultSettings = null;
+            Assert.Fail("Should Not Access DefaultSettings");
+            return new();
+        };
 
-            Assert.IsNull(clonedTestCase);
-        }
+        // This line should deserialize properly
+        Message message = _jsonDataSerializer.DeserializeMessage($"{{\"Version\":\"{version}\",\"MessageType\":\"dummy\",\"Payload\":{{\"InfiniteReference\":{{}}}}}}");
 
-        [TestMethod]
-        public void CloneShouldWorkForValueType()
-        {
-            var i = 2;
-            var clonedI = this.jsonDataSerializer.Clone<int>(i);
 
-            Assert.AreEqual(clonedI, i);
-        }
+        //restore the default settings to null
+        JsonConvert.DefaultSettings = null;
+    }
 
-        [TestMethod]
-        public void CloneShouldCloneTestCaseObject()
-        {
-            var testCase = JsonDataSerializerTests.GetSampleTestCase(out var expectedTrait);
 
-            var clonedTestCase = this.jsonDataSerializer.Clone<TestCase>(testCase);
+    [TestMethod]
+    public void SerializePayloadShouldSerializeAnObjectWithSelfReferencingLoop()
+    {
+        var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
+        classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
+        classWithSelfReferencingLoop.InfiniteReference!.InfiniteReference = classWithSelfReferencingLoop;
 
-            VerifyTestCaseClone(clonedTestCase, testCase, expectedTrait);
-        }
+        // This line should not throw exception
+        _jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop);
+    }
 
-        [TestMethod]
-        public void CloneShouldCloneTestResultsObject()
-        {
-            var testCase = JsonDataSerializerTests.GetSampleTestCase(out var expectedTrait);
+    [TestMethod]
+    public void DeserializeShouldDeserializeAnObjectWhichHadSelfReferencingLoopBeforeSerialization()
+    {
+        var classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(null);
+        classWithSelfReferencingLoop = new ClassWithSelfReferencingLoop(classWithSelfReferencingLoop);
+        classWithSelfReferencingLoop.InfiniteReference!.InfiniteReference = classWithSelfReferencingLoop;
 
-            var testResult = new TestResult(testCase);
+        var json = _jsonDataSerializer.SerializePayload("dummy", classWithSelfReferencingLoop);
 
-            var startTime = DateTimeOffset.UtcNow;
-            testResult.StartTime = startTime;
+        // This line should deserialize properly
+        var result = _jsonDataSerializer.Deserialize<ClassWithSelfReferencingLoop>(json, 1)!;
 
-            var clonedTestResult = this.jsonDataSerializer.Clone<TestResult>(testResult);
+        Assert.AreEqual(typeof(ClassWithSelfReferencingLoop), result.GetType());
+        Assert.IsNull(result.InfiniteReference);
+    }
 
-            Assert.IsFalse(ReferenceEquals(testResult, clonedTestResult));
+    [TestMethod]
+    public void CloneShouldReturnNullForNull()
+    {
+        var clonedTestCase = _jsonDataSerializer.Clone<TestCase>(null!);
 
-            Assert.AreEqual(testResult.StartTime, clonedTestResult.StartTime);
+        Assert.IsNull(clonedTestCase);
+    }
 
-            VerifyTestCaseClone(testResult.TestCase, clonedTestResult.TestCase, expectedTrait);
-        }
+    [TestMethod]
+    public void CloneShouldWorkForValueType()
+    {
+        var i = 2;
+        var clonedI = _jsonDataSerializer.Clone(i);
 
-        private static TestCase GetSampleTestCase(out Trait expectedTrait)
-        {
-            var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+        Assert.AreEqual(clonedI, i);
+    }
+
+    [TestMethod]
+    public void CloneShouldCloneTestCaseObject()
+    {
+        var testCase = GetSampleTestCase(out var expectedTrait);
 
-            expectedTrait = new Trait("TraitName1", "TraitValue1");
+        var clonedTestCase = _jsonDataSerializer.Clone(testCase)!;
 
-            testCase.Traits.Add(expectedTrait);
-            return testCase;
-        }
+        VerifyTestCaseClone(clonedTestCase, testCase, expectedTrait);
+    }
 
-        private static void VerifyTestCaseClone(TestCase clonedTestCase, TestCase testCase, Trait expectedTrait)
-        {
-            Assert.IsFalse(ReferenceEquals(clonedTestCase, testCase));
+    [TestMethod]
+    public void CloneShouldCloneTestResultsObject()
+    {
+        var testCase = GetSampleTestCase(out var expectedTrait);
 
-            Assert.AreEqual(testCase.FullyQualifiedName, clonedTestCase.FullyQualifiedName);
-            Assert.IsFalse(ReferenceEquals(testCase.FullyQualifiedName, clonedTestCase.FullyQualifiedName));
+        var testResult = new TestResult(testCase);
 
-            Assert.AreEqual(testCase.ExecutorUri, clonedTestCase.ExecutorUri);
-            Assert.IsFalse(ReferenceEquals(testCase.ExecutorUri, clonedTestCase.ExecutorUri));
+        var startTime = DateTimeOffset.UtcNow;
+        testResult.StartTime = startTime;
 
-            Assert.AreEqual(testCase.Source, clonedTestCase.Source);
-            Assert.IsFalse(ReferenceEquals(testCase.Source, clonedTestCase.Source));
+        var clonedTestResult = _jsonDataSerializer.Clone(testResult)!;
 
-            Assert.AreEqual(1, clonedTestCase.Traits.Count());
+        Assert.IsFalse(ReferenceEquals(testResult, clonedTestResult));
 
-            foreach (var trait in clonedTestCase.Traits)
-            {
-                Assert.IsFalse(ReferenceEquals(expectedTrait, trait));
-                Assert.AreEqual(expectedTrait.Name, trait.Name);
-                Assert.AreEqual(expectedTrait.Value, trait.Value);
-            }
-        }
+        Assert.AreEqual(testResult.StartTime, clonedTestResult.StartTime);
+
+        VerifyTestCaseClone(testResult.TestCase, clonedTestResult.TestCase, expectedTrait);
+    }
 
-        public class ClassWithSelfReferencingLoop
+    private static TestCase GetSampleTestCase(out Trait expectedTrait)
+    {
+        var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+
+        expectedTrait = new Trait("TraitName1", "TraitValue1");
+
+        testCase.Traits.Add(expectedTrait);
+        return testCase;
+    }
+
+    private static void VerifyTestCaseClone(TestCase clonedTestCase, TestCase testCase, Trait expectedTrait)
+    {
+        Assert.IsFalse(ReferenceEquals(clonedTestCase, testCase));
+
+        Assert.AreEqual(testCase.FullyQualifiedName, clonedTestCase.FullyQualifiedName);
+        Assert.IsFalse(ReferenceEquals(testCase.FullyQualifiedName, clonedTestCase.FullyQualifiedName));
+
+        Assert.AreEqual(testCase.ExecutorUri, clonedTestCase.ExecutorUri);
+        Assert.IsFalse(ReferenceEquals(testCase.ExecutorUri, clonedTestCase.ExecutorUri));
+
+        Assert.AreEqual(testCase.Source, clonedTestCase.Source);
+        Assert.IsFalse(ReferenceEquals(testCase.Source, clonedTestCase.Source));
+
+        Assert.AreEqual(1, clonedTestCase.Traits.Count());
+
+        foreach (var trait in clonedTestCase.Traits)
         {
-            public ClassWithSelfReferencingLoop(ClassWithSelfReferencingLoop ir)
-            {
-                this.InfiniteRefernce = ir;
-            }
+            Assert.IsFalse(ReferenceEquals(expectedTrait, trait));
+            Assert.AreEqual(expectedTrait.Name, trait.Name);
+            Assert.AreEqual(expectedTrait.Value, trait.Value);
+        }
+    }
 
-            public ClassWithSelfReferencingLoop InfiniteRefernce
-            {
-                get;
-                set;
-            }
+    public class ClassWithSelfReferencingLoop
+    {
+        public ClassWithSelfReferencingLoop(ClassWithSelfReferencingLoop? ir)
+        {
+            InfiniteReference = ir;
         }
+
+        public ClassWithSelfReferencingLoop? InfiniteReference { get; set; }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
index 21c23451cc..92d65f9115 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
@@ -1,170 +1,176 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.UnitTests
-{
-    using System;
-    using System.IO;
-    using System.Threading.Tasks;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
-    [TestClass]
-    public class LengthPrefixCommunicationChannelTests : IDisposable
-    {
-        private const string DUMMYDATA = "Dummy Data";
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private readonly ICommunicationChannel channel;
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.UnitTests;
 
-        private readonly MemoryStream stream;
+[TestClass]
+public class LengthPrefixCommunicationChannelTests : IDisposable
+{
+    private const string Dummydata = "Dummy Data";
 
-        private readonly BinaryReader reader;
+    private readonly ICommunicationChannel _channel;
 
-        private readonly BinaryWriter writer;
+    private readonly MemoryStream _stream;
 
-        public LengthPrefixCommunicationChannelTests()
-        {
-            this.stream = new MemoryStream();
-            this.channel = new LengthPrefixCommunicationChannel(this.stream);
+    private readonly BinaryReader _reader;
 
-            this.reader = new BinaryReader(this.stream);
-            this.writer = new BinaryWriter(this.stream);
-        }
+    private readonly BinaryWriter _writer;
 
-        public void Dispose()
-        {
-            this.stream.Dispose();
+    public LengthPrefixCommunicationChannelTests()
+    {
+        _stream = new MemoryStream();
+        _channel = new LengthPrefixCommunicationChannel(_stream);
 
-            this.reader.Dispose();
-            this.writer.Dispose();
-            GC.SuppressFinalize(this);
-        }
+        _reader = new BinaryReader(_stream);
+        _writer = new BinaryWriter(_stream);
+    }
 
-        [TestMethod]
-        public async Task SendShouldWriteTheDataOnStream()
-        {
-            await this.channel.Send(DUMMYDATA);
+    public void Dispose()
+    {
+        _stream.Dispose();
 
-            SeekToBeginning(this.stream);
-            Assert.AreEqual(DUMMYDATA, this.reader.ReadString());
-        }
+        _reader.Dispose();
+        _writer.Dispose();
+        GC.SuppressFinalize(this);
+    }
 
-        [TestMethod]
-        public async Task SendShouldWriteInLengthPrefixedFormat()
-        {
-            await this.channel.Send(DUMMYDATA);
+    [TestMethod]
+    public async Task SendShouldWriteTheDataOnStream()
+    {
+        await _channel.Send(Dummydata);
 
-            SeekToBeginning(this.stream);
-            Assert.AreEqual(DUMMYDATA.Length, Read7BitEncodedInt(this.reader));
-        }
+        SeekToBeginning(_stream);
+        Assert.AreEqual(Dummydata, _reader.ReadString());
+    }
 
-        [TestMethod]
-        public async Task SendShouldBeAbleToWriteUnicodeData()
-        {
-            // Every day is a good day
-            var utf8Data = "日日是好日";
-            await this.channel.Send(utf8Data);
+    [TestMethod]
+    public async Task SendShouldWriteInLengthPrefixedFormat()
+    {
+        await _channel.Send(Dummydata);
 
-            SeekToBeginning(this.stream);
-            Assert.AreEqual(utf8Data, this.reader.ReadString());
-        }
+        SeekToBeginning(_stream);
+        Assert.AreEqual(Dummydata.Length, Read7BitEncodedInt(_reader));
+    }
 
-        [TestMethod]
-        public async Task SendShouldFlushTheStream()
-        {
-            // A buffered stream doesn't immediately flush, it waits until buffer is filled in
-            using (var bufferedStream = new BufferedStream(this.stream, 2048))
-            {
-                var communicationChannel = new LengthPrefixCommunicationChannel(bufferedStream);
+    [TestMethod]
+    public async Task SendShouldBeAbleToWriteUnicodeData()
+    {
+        // Every day is a good day
+        var utf8Data = "日日是好日";
+        await _channel.Send(utf8Data);
 
-                await communicationChannel.Send("a");
+        SeekToBeginning(_stream);
+        Assert.AreEqual(utf8Data, _reader.ReadString());
+    }
 
-                SeekToBeginning(this.stream);
-                Assert.AreEqual("a", this.reader.ReadString());
-            }
-        }
+    [TestMethod]
+    public async Task SendShouldFlushTheStream()
+    {
+        // A buffered stream doesn't immediately flush, it waits until buffer is filled in
+        using var bufferedStream = new BufferedStream(_stream, 2048);
+        var communicationChannel = new LengthPrefixCommunicationChannel(bufferedStream);
 
-        [TestMethod]
-        public void SendShouldThrowIfChannelIsDisconnected()
-        {
-            this.stream.Dispose();
+        await communicationChannel.Send("a");
 
-            Assert.ThrowsException<CommunicationException>(() => this.channel.Send(DUMMYDATA).Wait());
-        }
+        SeekToBeginning(_stream);
+        Assert.AreEqual("a", _reader.ReadString());
+    }
 
-        [TestMethod]
-        public async Task MessageReceivedShouldProvideDataOverStream()
-        {
-            var data = string.Empty;
-            this.channel.MessageReceived += (sender, messageEventArgs) =>
-            {
-                data = messageEventArgs.Data;
-            };
-            this.writer.Write(DUMMYDATA);
-            SeekToBeginning(this.stream);
+    [TestMethod]
+    public async Task MessageReceivedShouldProvideDataOverStream()
+    {
+        var data = string.Empty;
+        _channel.MessageReceived.Subscribe((sender, messageEventArgs) => data = messageEventArgs.Data);
+        _writer.Write(Dummydata);
+        SeekToBeginning(_stream);
 
-            await this.channel.NotifyDataAvailable();
+        await _channel.NotifyDataAvailable(new CancellationToken());
 
-            Assert.AreEqual(DUMMYDATA, data);
-        }
+        Assert.AreEqual(Dummydata, data);
+    }
 
-        [TestMethod]
-        public async Task NotifyDataAvailableShouldNotReadStreamIfNoListenersAreRegistered()
-        {
-            this.writer.Write(DUMMYDATA);
-            SeekToBeginning(this.stream);
+    [TestMethod]
+    public async Task NotifyDataAvailableShouldNotReadStreamIfNoListenersAreRegistered()
+    {
+        _writer.Write(Dummydata);
+        SeekToBeginning(_stream);
 
-            await this.channel.NotifyDataAvailable();
+        await _channel.NotifyDataAvailable(new CancellationToken());
 
-            // Data is read irrespective of listeners. See note in NotifyDataAvailable
-            // implementation.
-            Assert.AreEqual(0, this.stream.Position);
-        }
+        // Data is read irrespective of listeners. See note in NotifyDataAvailable
+        // implementation.
+        Assert.AreEqual(0, _stream.Position);
+    }
 
-        [TestMethod]
-        public void DisposeShouldNotCloseTheStream()
-        {
-            this.channel.Dispose();
+    [TestMethod]
+    public void DisposeShouldNotCloseTheStream()
+    {
+        _channel.Dispose();
 
-            // Should throw if stream is disposed.
-            Assert.IsTrue(this.stream.CanWrite);
-        }
+        // Should throw if stream is disposed.
+        Assert.IsTrue(_stream.CanWrite);
+    }
 
-        // TODO
-        // WriteFromMultilpleThreadShouldBeInSequence
-        private static void SeekToBeginning(Stream stream)
-        {
-            stream.Seek(0, SeekOrigin.Begin);
-        }
+    [TestMethod]
+    public async Task DoNotFailWhenWritingOnADisposedBaseStream()
+    {
+        // Dispose base stream
+        _stream.Dispose();
+        await _channel.Send(Dummydata);
+    }
+
+    [TestMethod]
+    public async Task DoNotFailWhenReadingFromADisposedBaseStream()
+    {
+        var data = string.Empty;
+        _channel.MessageReceived.Subscribe((sender, messageEventArgs) => data = messageEventArgs.Data);
+        // Dispose base stream
+        _stream.Dispose();
+        await _channel.NotifyDataAvailable(new CancellationToken());
+    }
 
-        private static int Read7BitEncodedInt(BinaryReader reader)
+    // TODO
+    // WriteFromMultilpleThreadShouldBeInSequence
+    private static void SeekToBeginning(Stream stream)
+    {
+        stream.Seek(0, SeekOrigin.Begin);
+    }
+
+    private static int Read7BitEncodedInt(BinaryReader reader)
+    {
+        // Copied from BinaryReader.Read7BitEncodedInt
+        // https://referencesource.microsoft.com/#mscorlib/system/io/binaryreader.cs,f30b8b6e8ca06e0f
+        // Read out an Int32 7 bits at a time.  The high bit
+        // of the byte when on means to continue reading more bytes.
+        int count = 0;
+        int shift = 0;
+        byte b;
+        do
         {
-            // Copied from BinaryReader.Read7BitEncodedInt
-            // https://referencesource.microsoft.com/#mscorlib/system/io/binaryreader.cs,f30b8b6e8ca06e0f
-            // Read out an Int32 7 bits at a time.  The high bit
-            // of the byte when on means to continue reading more bytes.
-            int count = 0;
-            int shift = 0;
-            byte b;
-            do
+            // Check for a corrupted stream.  Read a max of 5 bytes.
+            // In a future version, add a DataFormatException.
+            // 5 bytes max per Int32, shift += 7
+            if (shift == 5 * 7)
             {
-                // Check for a corrupted stream.  Read a max of 5 bytes.
-                // In a future version, add a DataFormatException.
-                // 5 bytes max per Int32, shift += 7
-                if (shift == 5 * 7)
-                {
-                    throw new FormatException("Format_Bad7BitInt32");
-                }
-
-                // ReadByte handles end of stream cases for us.
-                b = reader.ReadByte();
-                count |= (b & 0x7F) << shift;
-                shift += 7;
+                throw new FormatException("Format_Bad7BitInt32");
             }
-            while ((b & 0x80) != 0);
 
-            return count;
+            // ReadByte handles end of stream cases for us.
+            b = reader.ReadByte();
+            count |= (b & 0x7F) << shift;
+            shift += 7;
         }
+        while ((b & 0x80) != 0);
+
+        return count;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj
index 77cbe1b6c6..5d883492d2 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.CommunicationUtilities.UnitTests</AssemblyName>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestDiscoveryEventHandlerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestDiscoveryEventHandlerTests.cs
index a80953beb7..05a8daa530 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestDiscoveryEventHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestDiscoveryEventHandlerTests.cs
@@ -1,58 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.ObjectModel;
+
+[TestClass]
+public class TestDiscoveryEventHandlerTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class TestDiscoveryEventHandlerTests
+    private readonly Mock<ITestRequestHandler> _mockClient;
+    private readonly TestDiscoveryEventHandler _testDiscoveryEventHandler;
+
+    public TestDiscoveryEventHandlerTests()
+    {
+        _mockClient = new Mock<ITestRequestHandler>();
+        _testDiscoveryEventHandler = new TestDiscoveryEventHandler(_mockClient.Object);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveredTestShouldSendTestCasesToClient()
+    {
+        _testDiscoveryEventHandler.HandleDiscoveredTests(null!);
+        _mockClient.Verify(th => th.SendTestCases(null!), Times.Once);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldInformClient()
     {
-        private Mock<ITestRequestHandler> mockClient;
-        private TestDiscoveryEventHandler testDiscoveryEventHandler;
-
-        [TestInitialize]
-        public void InitializeTests()
-        {
-            this.mockClient = new Mock<ITestRequestHandler>();
-            this.testDiscoveryEventHandler = new TestDiscoveryEventHandler(this.mockClient.Object);
-        }
-
-        [TestMethod]
-        public void HandleDiscoveredTestShouldSendTestCasesToClient()
-        {
-            this.testDiscoveryEventHandler.HandleDiscoveredTests(null);
-            this.mockClient.Verify(th => th.SendTestCases(null), Times.Once);
-        }
-
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldInformClient()
-        {
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(0, false);
-
-            this.testDiscoveryEventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
-            this.mockClient.Verify(th => th.DiscoveryComplete(discoveryCompleteEventArgs, null), Times.Once);
-        }
-
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldNotSendASeparateTestFoundMessageToClient()
-        {
-            this.testDiscoveryEventHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(0, false), null);
-
-            this.mockClient.Verify(th => th.SendTestCases(null), Times.Never);
-        }
-
-        [TestMethod]
-        public void HandleDiscoveryMessageShouldSendMessageToClient()
-        {
-            this.testDiscoveryEventHandler.HandleLogMessage(TestMessageLevel.Informational, string.Empty);
-
-            this.mockClient.Verify(th => th.SendLog(TestMessageLevel.Informational, string.Empty), Times.AtLeast(1));
-        }
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(0, false);
+
+        _testDiscoveryEventHandler.HandleDiscoveryComplete(discoveryCompleteEventArgs, null);
+        _mockClient.Verify(th => th.DiscoveryComplete(discoveryCompleteEventArgs, null), Times.Once);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldNotSendASeparateTestFoundMessageToClient()
+    {
+        _testDiscoveryEventHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(0, false), null);
+
+        _mockClient.Verify(th => th.SendTestCases(null!), Times.Never);
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryMessageShouldSendMessageToClient()
+    {
+        _testDiscoveryEventHandler.HandleLogMessage(TestMessageLevel.Informational, string.Empty);
+
+        _mockClient.Verify(th => th.SendLog(TestMessageLevel.Informational, string.Empty), Times.AtLeast(1));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestRunEventsHandlerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestRunEventsHandlerTests.cs
index cb3bff2154..58ba0c3bfd 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestRunEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/ObjectModel/TestRunEventsHandlerTests.cs
@@ -1,48 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.ObjectModel
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.ObjectModel;
+
+[TestClass]
+public class TestRunEventsHandlerTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly Mock<ITestRequestHandler> _mockClient;
+    private readonly TestRunEventsHandler _testRunEventHandler;
+
+    public TestRunEventsHandlerTests()
+    {
+        _mockClient = new Mock<ITestRequestHandler>();
+        _testRunEventHandler = new TestRunEventsHandler(_mockClient.Object);
+    }
 
-    using Moq;
+    [TestMethod]
+    public void HandleTestRunStatsChangeShouldSendTestRunStatisticsToClient()
+    {
+        _testRunEventHandler.HandleTestRunStatsChange(null!);
+        _mockClient.Verify(th => th.SendTestRunStatistics(null!), Times.Once);
+    }
+
+    [TestMethod]
+    public void HandleTestRunCompleteShouldInformClient()
+    {
+        _testRunEventHandler.HandleTestRunComplete(null!, null!, null!, null!);
+        _mockClient.Verify(th => th.SendExecutionComplete(null!, null!, null!, null!), Times.Once);
+    }
 
-    [TestClass]
-    public class TestRunEventsHandlerTests
+    [TestMethod]
+    public void HandleTestRunMessageShouldSendMessageToClient()
     {
-        private Mock<ITestRequestHandler> mockClient;
-        private TestRunEventsHandler testRunEventHandler;
-
-        [TestInitialize]
-        public void InitializeTests()
-        {
-            this.mockClient = new Mock<ITestRequestHandler>();
-            this.testRunEventHandler = new TestRunEventsHandler(this.mockClient.Object);
-        }
-
-        [TestMethod]
-        public void HandleTestRunStatsChangeShouldSendTestRunStatisticsToClient()
-        {
-            this.testRunEventHandler.HandleTestRunStatsChange(null);
-            this.mockClient.Verify(th => th.SendTestRunStatistics(null), Times.Once);
-        }
-
-        [TestMethod]
-        public void HandleTestRunCompleteShouldInformClient()
-        {
-            this.testRunEventHandler.HandleTestRunComplete(null, null, null, null);
-            this.mockClient.Verify(th => th.SendExecutionComplete(null, null, null, null), Times.Once);
-        }
-
-        [TestMethod]
-        public void HandleTestRunMessageShouldSendMessageToClient()
-        {
-            this.testRunEventHandler.HandleLogMessage(TestMessageLevel.Informational, string.Empty);
-
-            this.mockClient.Verify(th => th.SendLog(TestMessageLevel.Informational, string.Empty), Times.AtLeast(1));
-        }
+        _testRunEventHandler.HandleLogMessage(TestMessageLevel.Informational, string.Empty);
+
+        _mockClient.Verify(th => th.SendLog(TestMessageLevel.Informational, string.Empty), Times.AtLeast(1));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs
deleted file mode 100644
index f480e8b5e2..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index cbcdde9cd4..0000000000
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.CommunicationUtilities.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5e3cbec8-e52e-4fb1-a0d2-01f75e33721d")]
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestCaseSerializationTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestCaseSerializationTests.cs
index 7a276ea487..6205d5b415 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestCaseSerializationTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestCaseSerializationTests.cs
@@ -1,277 +1,274 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization;
+
+[TestClass]
+public class TestCaseSerializationTests
 {
-    using System;
-    using System.Linq;
+    private static readonly TestCase TestCase = new(
+        "sampleTestClass.sampleTestCase",
+        new Uri("executor://sampleTestExecutor"),
+        "sampleTest.dll")
+    {
+        CodeFilePath = "/user/src/testFile.cs",
+        DisplayName = "sampleTestCase",
+        Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
+        LineNumber = 999,
+        Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
+    };
+
+    #region v1 Tests
+
+    [TestMethod]
+    public void TestCaseJsonShouldContainAllPropertiesOnSerialization()
+    {
+        var json = Serialize(TestCase);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+
+        Assert.AreEqual("TestCase.FullyQualifiedName", properties[0]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleTestClass.sampleTestCase", properties[0]["Value"].Value);
+        Assert.AreEqual("TestCase.ExecutorUri", properties[1]["Key"]["Id"].Value);
+        Assert.AreEqual("executor://sampleTestExecutor", properties[1]["Value"].Value);
+        Assert.AreEqual("TestCase.Source", properties[2]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleTest.dll", properties[2]["Value"].Value);
+        Assert.AreEqual("TestCase.CodeFilePath", properties[3]["Key"]["Id"].Value);
+        Assert.AreEqual("/user/src/testFile.cs", properties[3]["Value"].Value);
+        Assert.AreEqual("TestCase.DisplayName", properties[4]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleTestCase", properties[4]["Value"].Value);
+        Assert.AreEqual("TestCase.Id", properties[5]["Key"]["Id"].Value);
+        Assert.AreEqual("be78d6fc-61b0-4882-9d07-40d796fd96ce", properties[5]["Value"].Value);
+        Assert.AreEqual("TestCase.LineNumber", properties[6]["Key"]["Id"].Value);
+        Assert.AreEqual(999, properties[6]["Value"].Value);
+
+        // Traits require special handling with TestPlatformContract resolver. It should be null without it.
+        Assert.AreEqual("TestObject.Traits", properties[7]["Key"]["Id"].Value);
+        Assert.IsNotNull(properties[7]["Value"]);
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void TestCaseObjectShouldContainAllPropertiesOnDeserialization()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/user/src/testFile.cs\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestCase\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"be78d6fc-61b0-4882-9d07-40d796fd96ce\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":999},"
+                   + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"Priority\",\"Value\":\"0\"},{\"Key\":\"Category\",\"Value\":\"unit\"}]}]}";
+        var test = Deserialize<TestCase>(json);
+
+        Assert.AreEqual(TestCase.CodeFilePath, test.CodeFilePath);
+        Assert.AreEqual(TestCase.DisplayName, test.DisplayName);
+        Assert.AreEqual(TestCase.ExecutorUri, test.ExecutorUri);
+        Assert.AreEqual(TestCase.FullyQualifiedName, test.FullyQualifiedName);
+        Assert.AreEqual(TestCase.LineNumber, test.LineNumber);
+        Assert.AreEqual(TestCase.Source, test.Source);
+        Assert.AreEqual(TestCase.Traits.First().Name, test.Traits.First().Name);
+        Assert.AreEqual(TestCase.Id, test.Id);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldSerializeWindowsPathWithEscaping()
+    {
+        var test = new TestCase("a.b", new Uri("uri://x"), @"C:\Test\TestAssembly.dll");
+
+        var json = Serialize(test);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+        Assert.AreEqual(@"TestCase.Source", properties[2]["Key"]["Id"].Value);
+        Assert.AreEqual(@"C:\Test\TestAssembly.dll", properties[2]["Value"].Value);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldDeserializeEscapedWindowsPath()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"C:\\\\Test\\\\TestAssembly.dll\"}]}";
 
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Linq;
+        var test = Deserialize<TestCase>(json);
+
+        Assert.AreEqual(@"C:\Test\TestAssembly.dll", test.Source);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldSerializeTraitsWithSpecialCharacters()
+    {
+        var test = new TestCase("a.b", new Uri("uri://x"), @"/tmp/a.b.dll");
+        test.Traits.Add("t", @"SDJDDHW>,:&^%//\\\\");
+
+        var json = Serialize(test);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+        Assert.AreEqual(@"TestObject.Traits", properties[7]["Key"]["Id"].Value);
+        Assert.AreEqual("[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]", properties[7]["Value"].ToString(Formatting.None));
+    }
+
+    [TestMethod]
+    public void TestCasePropertiesShouldGetRegisteredAsPartOfDeserialization()
+    {
+        TestProperty.TryUnregister("DummyProperty", out var _);
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/tmp/a.b.dll\"},"
+                   + "{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},"
+                   + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]}]}";
+        _ = Deserialize<TestCase>(json);
+
+        VerifyDummyPropertyIsRegistered();
+    }
+
+    #endregion
+
+    #region v2 Tests
+
+    [TestMethod]
+    public void TestCaseJsonShouldContainAllPropertiesOnSerializationV2()
+    {
+        var json = Serialize(TestCase, 2);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+
+        // Traits require special handling with TestPlatformContract resolver. It should be null without it.
+        Assert.AreEqual("TestObject.Traits", properties[0]["Key"]["Id"].Value);
+        Assert.IsNotNull(properties[0]["Value"]);
+
+        Assert.AreEqual("be78d6fc-61b0-4882-9d07-40d796fd96ce", data["Id"].Value);
+        Assert.AreEqual("sampleTestClass.sampleTestCase", data["FullyQualifiedName"].Value);
+        Assert.AreEqual("sampleTestCase", data["DisplayName"].Value);
+        Assert.AreEqual("sampleTest.dll", data["Source"].Value);
+        Assert.AreEqual("executor://sampleTestExecutor", data["ExecutorUri"].Value);
+        Assert.AreEqual("/user/src/testFile.cs", data["CodeFilePath"].Value);
+        Assert.AreEqual(999, data["LineNumber"].Value);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldContainAllPropertiesOnDeserializationV2()
+    {
+        var json = "{\"Id\": \"be78d6fc-61b0-4882-9d07-40d796fd96ce\",\"FullyQualifiedName\": \"sampleTestClass.sampleTestCase\",\"DisplayName\": \"sampleTestCase\",\"ExecutorUri\": \"executor://sampleTestExecutor\",\"Source\": \"sampleTest.dll\",\"CodeFilePath\": \"/user/src/testFile.cs\", \"LineNumber\": 999,"
+                   + "\"Properties\": [{ \"Key\": { \"Id\": \"TestObject.Traits\", \"Label\": \"Traits\", \"Category\": \"\", \"Description\": \"\", \"Attributes\": 5, \"ValueType\": \"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"}, \"Value\": [{\"Key\": \"Priority\",\"Value\": \"0\"}, {\"Key\": \"Category\",\"Value\": \"unit\"}]}]}";
+
+        var test = Deserialize<TestCase>(json, 2);
+
+        Assert.AreEqual(TestCase.CodeFilePath, test.CodeFilePath);
+        Assert.AreEqual(TestCase.DisplayName, test.DisplayName);
+        Assert.AreEqual(TestCase.ExecutorUri, test.ExecutorUri);
+        Assert.AreEqual(TestCase.FullyQualifiedName, test.FullyQualifiedName);
+        Assert.AreEqual(TestCase.LineNumber, test.LineNumber);
+        Assert.AreEqual(TestCase.Source, test.Source);
+        Assert.AreEqual(TestCase.Traits.First().Name, test.Traits.First().Name);
+        Assert.AreEqual(TestCase.Id, test.Id);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldSerializeTraitsWithSpecialCharactersV2()
+    {
+        var test = new TestCase("a.b", new Uri("uri://x"), @"/tmp/a.b.dll");
+        test.Traits.Add("t", @"SDJDDHW>,:&^%//\\\\");
+
+        var json = Serialize(test, 2);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+        Assert.AreEqual(@"TestObject.Traits", properties[0]["Key"]["Id"].Value);
+        Assert.AreEqual("[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]", properties[0]["Value"].ToString(Formatting.None));
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldSerializeWindowsPathWithEscapingV2()
+    {
+        var test = new TestCase("a.b", new Uri("uri://x"), @"C:\Test\TestAssembly.dll");
+
+        var json = Serialize(test, 2);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        Assert.AreEqual(@"C:\Test\TestAssembly.dll", data["Source"].Value);
+    }
+
+    [TestMethod]
+    public void TestCaseObjectShouldDeserializeEscapedWindowsPathV2()
+    {
+        var json = "{\"Id\":\"4e35ed85-a5e8-946e-fb14-0d3de2304e74\",\"FullyQualifiedName\":\"a.b\",\"DisplayName\":\"a.b\",\"ExecutorUri\":\"uri://x\",\"Source\":\"C:\\\\Test\\\\TestAssembly.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]}";
+
+        var test = Deserialize<TestCase>(json, 2);
+
+        Assert.AreEqual(@"C:\Test\TestAssembly.dll", test.Source);
+    }
+
+    [TestMethod]
+    public void TestCasePropertiesShouldGetRegisteredAsPartOfDeserializationV2()
+    {
+        TestProperty.TryUnregister("DummyProperty", out var _);
+        var json = "{\"Id\": \"be78d6fc-61b0-4882-9d07-40d796fd96ce\",\"FullyQualifiedName\": \"sampleTestClass.sampleTestCase\",\"DisplayName\": \"sampleTestCase\",\"ExecutorUri\": \"executor://sampleTestExecutor\",\"Source\": \"sampleTest.dll\",\"CodeFilePath\": \"/user/src/testFile.cs\", \"LineNumber\": 999,"
+                   + "\"Properties\": [{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},"
+                   + "{ \"Key\": { \"Id\": \"TestObject.Traits\", \"Label\": \"Traits\", \"Category\": \"\", \"Description\": \"\", \"Attributes\": 5, \"ValueType\": \"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"}, \"Value\": [{\"Key\": \"Priority\",\"Value\": \"0\"}, {\"Key\": \"Category\",\"Value\": \"unit\"}]}]}";
+        _ = Deserialize<TestCase>(json, 2);
+
+        VerifyDummyPropertyIsRegistered();
+    }
+
+    #endregion
+
+    #region Common Tests
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(2)]
+    public void TestCaseObjectShouldDeserializeTraitsWithSpecialCharacters(int version)
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
+                   + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/tmp/a.b.dll\"},"
+                   + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]}]}";
+
+        var test = Deserialize<TestCase>(json, version);
+
+        var traits = test.Traits.ToArray();
+        Assert.AreEqual(1, traits.Length);
+        Assert.AreEqual(@"SDJDDHW>,:&^%//\\\\", traits[0].Value);
+    }
+
+    #endregion
+
+    private static string Serialize<T>(T data, int version = 1)
+    {
+        return JsonDataSerializer.Instance.Serialize(data, version);
+    }
+
+    private static T Deserialize<T>(string json, int version = 1)
+    {
+        return JsonDataSerializer.Instance.Deserialize<T>(json, version)!;
+    }
 
-    [TestClass]
-    public class TestCaseSerializationTests
+    private static void VerifyDummyPropertyIsRegistered()
     {
-        private static TestCase testCase = new TestCase(
-                                               "sampleTestClass.sampleTestCase",
-                                               new Uri("executor://sampleTestExecutor"),
-                                               "sampleTest.dll")
-                                               {
-                                                   CodeFilePath = "/user/src/testFile.cs",
-                                                   DisplayName = "sampleTestCase",
-                                                   Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
-                                                   LineNumber = 999,
-                                                   Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
-                                               };
-
-        #region v1 Tests
-
-        [TestMethod]
-        public void TestCaseJsonShouldContainAllPropertiesOnSerialization()
-        {
-            var json = Serialize(testCase);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-
-            Assert.AreEqual("TestCase.FullyQualifiedName", properties[0]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleTestClass.sampleTestCase", properties[0]["Value"].Value);
-            Assert.AreEqual("TestCase.ExecutorUri", properties[1]["Key"]["Id"].Value);
-            Assert.AreEqual("executor://sampleTestExecutor", properties[1]["Value"].Value);
-            Assert.AreEqual("TestCase.Source", properties[2]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleTest.dll", properties[2]["Value"].Value);
-            Assert.AreEqual("TestCase.CodeFilePath", properties[3]["Key"]["Id"].Value);
-            Assert.AreEqual("/user/src/testFile.cs", properties[3]["Value"].Value);
-            Assert.AreEqual("TestCase.DisplayName", properties[4]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleTestCase", properties[4]["Value"].Value);
-            Assert.AreEqual("TestCase.Id", properties[5]["Key"]["Id"].Value);
-            Assert.AreEqual("be78d6fc-61b0-4882-9d07-40d796fd96ce", properties[5]["Value"].Value);
-            Assert.AreEqual("TestCase.LineNumber", properties[6]["Key"]["Id"].Value);
-            Assert.AreEqual(999, properties[6]["Value"].Value);
-
-            // Traits require special handling with TestPlatformContract resolver. It should be null without it.
-            Assert.AreEqual("TestObject.Traits", properties[7]["Key"]["Id"].Value);
-            Assert.IsNotNull(properties[7]["Value"]);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldContainAllPropertiesOnDeserialization()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/user/src/testFile.cs\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestCase\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"be78d6fc-61b0-4882-9d07-40d796fd96ce\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":999},"
-                + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"Priority\",\"Value\":\"0\"},{\"Key\":\"Category\",\"Value\":\"unit\"}]}]}";
-            var test = Deserialize<TestCase>(json);
-
-            Assert.AreEqual(testCase.CodeFilePath, test.CodeFilePath);
-            Assert.AreEqual(testCase.DisplayName, test.DisplayName);
-            Assert.AreEqual(testCase.ExecutorUri, test.ExecutorUri);
-            Assert.AreEqual(testCase.FullyQualifiedName, test.FullyQualifiedName);
-            Assert.AreEqual(testCase.LineNumber, test.LineNumber);
-            Assert.AreEqual(testCase.Source, test.Source);
-            Assert.AreEqual(testCase.Traits.First().Name, test.Traits.First().Name);
-            Assert.AreEqual(testCase.Id, test.Id);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldSerializeWindowsPathWithEscaping()
-        {
-            var test = new TestCase("a.b", new Uri("uri://x"), @"C:\Test\TestAssembly.dll");
-
-            var json = Serialize(test);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-            Assert.AreEqual(@"TestCase.Source", properties[2]["Key"]["Id"].Value);
-            Assert.AreEqual(@"C:\Test\TestAssembly.dll", properties[2]["Value"].Value);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldDeserializeEscapedWindowsPath()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"C:\\\\Test\\\\TestAssembly.dll\"}]}";
-
-            var test = Deserialize<TestCase>(json);
-
-            Assert.AreEqual(@"C:\Test\TestAssembly.dll", test.Source);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldSerializeTraitsWithSpecialCharacters()
-        {
-            var test = new TestCase("a.b", new Uri("uri://x"), @"/tmp/a.b.dll");
-            test.Traits.Add("t", @"SDJDDHW>,:&^%//\\\\");
-
-            var json = Serialize(test);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-            Assert.AreEqual(@"TestObject.Traits", properties[7]["Key"]["Id"].Value);
-            Assert.AreEqual("[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]", properties[7]["Value"].ToString(Formatting.None));
-        }
-
-        [TestMethod]
-        public void TestCasePropertiesShouldGetRegisteredAsPartOfDeserialization()
-        {
-            TestProperty.TryUnregister("DummyProperty", out var property);
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/tmp/a.b.dll\"},"
-                + "{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},"
-                + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]}]}";
-
-            var test = Deserialize<TestCase>(json);
-
-            this.VerifyDummyPropertyIsRegistered();
-        }
-
-        #endregion
-
-        #region v2 Tests
-
-        [TestMethod]
-        public void TestCaseJsonShouldContainAllPropertiesOnSerializationV2()
-        {
-            var json = Serialize(testCase, 2);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-
-            // Traits require special handling with TestPlatformContract resolver. It should be null without it.
-            Assert.AreEqual("TestObject.Traits", properties[0]["Key"]["Id"].Value);
-            Assert.IsNotNull(properties[0]["Value"]);
-
-            Assert.AreEqual("be78d6fc-61b0-4882-9d07-40d796fd96ce", data["Id"].Value);
-            Assert.AreEqual("sampleTestClass.sampleTestCase", data["FullyQualifiedName"].Value);
-            Assert.AreEqual("sampleTestCase", data["DisplayName"].Value);
-            Assert.AreEqual("sampleTest.dll", data["Source"].Value);
-            Assert.AreEqual("executor://sampleTestExecutor", data["ExecutorUri"].Value);
-            Assert.AreEqual("/user/src/testFile.cs", data["CodeFilePath"].Value);
-            Assert.AreEqual(999, data["LineNumber"].Value);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldContainAllPropertiesOnDeserializationV2()
-        {
-            var json = "{\"Id\": \"be78d6fc-61b0-4882-9d07-40d796fd96ce\",\"FullyQualifiedName\": \"sampleTestClass.sampleTestCase\",\"DisplayName\": \"sampleTestCase\",\"ExecutorUri\": \"executor://sampleTestExecutor\",\"Source\": \"sampleTest.dll\",\"CodeFilePath\": \"/user/src/testFile.cs\", \"LineNumber\": 999,"
-                + "\"Properties\": [{ \"Key\": { \"Id\": \"TestObject.Traits\", \"Label\": \"Traits\", \"Category\": \"\", \"Description\": \"\", \"Attributes\": 5, \"ValueType\": \"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"}, \"Value\": [{\"Key\": \"Priority\",\"Value\": \"0\"}, {\"Key\": \"Category\",\"Value\": \"unit\"}]}]}";
-
-            var test = Deserialize<TestCase>(json, 2);
-
-            Assert.AreEqual(testCase.CodeFilePath, test.CodeFilePath);
-            Assert.AreEqual(testCase.DisplayName, test.DisplayName);
-            Assert.AreEqual(testCase.ExecutorUri, test.ExecutorUri);
-            Assert.AreEqual(testCase.FullyQualifiedName, test.FullyQualifiedName);
-            Assert.AreEqual(testCase.LineNumber, test.LineNumber);
-            Assert.AreEqual(testCase.Source, test.Source);
-            Assert.AreEqual(testCase.Traits.First().Name, test.Traits.First().Name);
-            Assert.AreEqual(testCase.Id, test.Id);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldSerializeTraitsWithSpecialCharactersV2()
-        {
-            var test = new TestCase("a.b", new Uri("uri://x"), @"/tmp/a.b.dll");
-            test.Traits.Add("t", @"SDJDDHW>,:&^%//\\\\");
-
-            var json = Serialize(test, 2);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-            Assert.AreEqual(@"TestObject.Traits", properties[0]["Key"]["Id"].Value);
-            Assert.AreEqual("[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]", properties[0]["Value"].ToString(Formatting.None));
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldSerializeWindowsPathWithEscapingV2()
-        {
-            var test = new TestCase("a.b", new Uri("uri://x"), @"C:\Test\TestAssembly.dll");
-
-            var json = Serialize(test, 2);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            Assert.AreEqual(@"C:\Test\TestAssembly.dll", data["Source"].Value);
-        }
-
-        [TestMethod]
-        public void TestCaseObjectShouldDeserializeEscapedWindowsPathV2()
-        {
-            var json = "{\"Id\":\"4e35ed85-a5e8-946e-fb14-0d3de2304e74\",\"FullyQualifiedName\":\"a.b\",\"DisplayName\":\"a.b\",\"ExecutorUri\":\"uri://x\",\"Source\":\"C:\\\\Test\\\\TestAssembly.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]}";
-
-            var test = Deserialize<TestCase>(json, 2);
-
-            Assert.AreEqual(@"C:\Test\TestAssembly.dll", test.Source);
-        }
-
-        [TestMethod]
-        public void TestCasePropertiesShouldGetRegisteredAsPartOfDeserializationV2()
-        {
-            TestProperty.TryUnregister("DummyProperty", out var property);
-            var json = "{\"Id\": \"be78d6fc-61b0-4882-9d07-40d796fd96ce\",\"FullyQualifiedName\": \"sampleTestClass.sampleTestCase\",\"DisplayName\": \"sampleTestCase\",\"ExecutorUri\": \"executor://sampleTestExecutor\",\"Source\": \"sampleTest.dll\",\"CodeFilePath\": \"/user/src/testFile.cs\", \"LineNumber\": 999,"
-                + "\"Properties\": [{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},"
-                + "{ \"Key\": { \"Id\": \"TestObject.Traits\", \"Label\": \"Traits\", \"Category\": \"\", \"Description\": \"\", \"Attributes\": 5, \"ValueType\": \"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"}, \"Value\": [{\"Key\": \"Priority\",\"Value\": \"0\"}, {\"Key\": \"Category\",\"Value\": \"unit\"}]}]}";
-
-            var test = Deserialize<TestCase>(json, 2);
-
-            this.VerifyDummyPropertyIsRegistered();
-        }
-
-        #endregion
-
-        #region Common Tests
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(2)]
-        public void TestCaseObjectShouldDeserializeTraitsWithSpecialCharacters(int version)
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"a.b\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"uri://x\"},"
-                + "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"/tmp/a.b.dll\"},"
-                + "{\"Key\":{\"Id\":\"TestObject.Traits\",\"Label\":\"Traits\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.Collections.Generic.KeyValuePair`2[[System.String],[System.String]][]\"},\"Value\":[{\"Key\":\"t\",\"Value\":\"SDJDDHW>,:&^%//\\\\\\\\\\\\\\\\\"}]}]}";
-
-            var test = Deserialize<TestCase>(json, version);
-
-            var traits = test.Traits.ToArray();
-            Assert.AreEqual(1, traits.Length);
-            Assert.AreEqual(@"SDJDDHW>,:&^%//\\\\", traits[0].Value);
-        }
-
-        #endregion
-
-        private static string Serialize<T>(T data, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Serialize(data, version);
-        }
-
-        private static T Deserialize<T>(string json, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Deserialize<T>(json, version);
-        }
-
-        private void VerifyDummyPropertyIsRegistered()
-        {
-            var dummyProperty = TestProperty.Find("DummyProperty");
-            Assert.IsNotNull(dummyProperty);
-            Assert.AreEqual("DummyPropertyLabel", dummyProperty.Label);
-            Assert.AreEqual("System.String", dummyProperty.ValueType);
-            Assert.AreEqual(5, (int)dummyProperty.Attributes);
-        }
+        var dummyProperty = TestProperty.Find("DummyProperty");
+        Assert.IsNotNull(dummyProperty);
+        Assert.AreEqual("DummyPropertyLabel", dummyProperty.Label);
+        Assert.AreEqual("System.String", dummyProperty.ValueType);
+        Assert.AreEqual(5, (int)dummyProperty.Attributes);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestObjectConverterTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestObjectConverterTests.cs
index 097c25d9d8..90b10ef588 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestObjectConverterTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestObjectConverterTests.cs
@@ -1,170 +1,175 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization
-{
-    using System;
-    using System.Linq;
+using System;
+using System.Linq;
+
+using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization;
 
-    [TestClass]
-    public class TestObjectConverterTests
+[TestClass]
+public class TestObjectConverterTests
+{
+    [TestMethod]
+    public void TestObjectJsonShouldContainOnlyProperties()
     {
-        [TestMethod]
-        public void TestObjectJsonShouldContainOnlyProperties()
-        {
-            var json = Serialize(new TestableTestObject());
+        var json = Serialize(new TestableTestObject());
 
-            Assert.AreEqual("{\"Properties\":[]}", json);
-        }
+        Assert.AreEqual("{\"Properties\":[]}", json);
+    }
 
-        [TestMethod]
-        public void TestObjectShouldCreateDefaultObjectOnDeserializationOfJsonWithEmptyProperties()
-        {
-            var test = Deserialize<TestableTestObject>("{\"Properties\":[]}");
+    [TestMethod]
+    public void TestObjectShouldCreateDefaultObjectOnDeserializationOfJsonWithEmptyProperties()
+    {
+        var test = Deserialize<TestableTestObject>("{\"Properties\":[]}");
 
-            Assert.IsNotNull(test);
-            Assert.AreEqual(0, test.Properties.Count());
-        }
+        Assert.IsNotNull(test);
+        Assert.AreEqual(0, test.Properties.Count());
+    }
 
-        [TestMethod]
-        public void TestCaseObjectShouldSerializeCustomProperties()
+    [TestMethod]
+    public void TestCaseObjectShouldSerializeCustomProperties()
+    {
+        var test = new TestableTestObject();
+        var testProperty1 = TestProperty.Register("1", "label1", typeof(Guid), typeof(TestableTestObject));
+        var testPropertyData1 = Guid.Parse("02048dfd-3da7-475d-a011-8dd1121855ec");
+        var testProperty2 = TestProperty.Register("2", "label2", typeof(int), typeof(TestableTestObject));
+        var testPropertyData2 = 29;
+        test.SetPropertyValue(testProperty1, testPropertyData1);
+        test.SetPropertyValue(testProperty2, testPropertyData2);
+
+        var json = Serialize(test);
+
+        // Use raw deserialization to validate basic properties
+        // Because properties are backed up by a ConcurrentDictionary we don't have control over the order of serialization
+        var expectedJsonWithKey1First = "{\"Properties\":[{\"Key\":{\"Id\":\"1\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Guid\"},\"Value\":\"02048dfd-3da7-475d-a011-8dd1121855ec\"},{\"Key\":{\"Id\":\"2\",\"Label\":\"label2\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Int32\"},\"Value\":29}]}";
+        var expectedJsonWithKey2First = "{\"Properties\":[{\"Key\":{\"Id\":\"2\",\"Label\":\"label2\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Int32\"},\"Value\":29},{\"Key\":{\"Id\":\"1\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Guid\"},\"Value\":\"02048dfd-3da7-475d-a011-8dd1121855ec\"}]}";
+
+        if (json != expectedJsonWithKey1First && json != expectedJsonWithKey2First)
         {
-            var test = new TestableTestObject();
-            var testProperty1 = TestProperty.Register("1", "label1", typeof(Guid), typeof(TestableTestObject));
-            var testPropertyData1 = Guid.Parse("02048dfd-3da7-475d-a011-8dd1121855ec");
-            var testProperty2 = TestProperty.Register("2", "label2", typeof(int), typeof(TestableTestObject));
-            var testPropertyData2 = 29;
-            test.SetPropertyValue(testProperty1, testPropertyData1);
-            test.SetPropertyValue(testProperty2, testPropertyData2);
-
-            var json = Serialize(test);
-
-            // Use raw deserialization to validate basic properties
-            var expectedJson = "{\"Properties\":[{\"Key\":{\"Id\":\"1\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Guid\"},\"Value\":\"02048dfd-3da7-475d-a011-8dd1121855ec\"},{\"Key\":{\"Id\":\"2\",\"Label\":\"label2\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Int32\"},\"Value\":29}]}";
-            Assert.AreEqual(expectedJson, json);
+            Assert.Fail($"Was expecting <{json}> to be either <{expectedJsonWithKey1First}> or <{expectedJsonWithKey2First}>.");
         }
+    }
 
-        [TestMethod]
-        public void TestObjectShouldSerializeStringArrayValueForProperty()
-        {
-            var test = new TestableTestObject();
-            var testProperty1 = TestProperty.Register("11", "label1", typeof(string[]), typeof(TestableTestObject));
-            var testPropertyData1 = new[] { "val1", "val2" };
-            test.SetPropertyValue(testProperty1, testPropertyData1);
+    [TestMethod]
+    public void TestObjectShouldSerializeStringArrayValueForProperty()
+    {
+        var test = new TestableTestObject();
+        var testProperty1 = TestProperty.Register("11", "label1", typeof(string[]), typeof(TestableTestObject));
+        var testPropertyData1 = new[] { "val1", "val2" };
+        test.SetPropertyValue(testProperty1, testPropertyData1);
 
-            var json = Serialize(test);
+        var json = Serialize(test);
 
-            var expectedJson = "{\"Properties\":[{\"Key\":{\"Id\":\"11\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String[]\"},\"Value\":[\"val1\",\"val2\"]}]}";
-            Assert.AreEqual(expectedJson, json);
-        }
+        var expectedJson = "{\"Properties\":[{\"Key\":{\"Id\":\"11\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String[]\"},\"Value\":[\"val1\",\"val2\"]}]}";
+        Assert.AreEqual(expectedJson, json);
+    }
 
-        [TestMethod]
-        public void TestObjectShouldSerializeDateTimeOffsetForProperty()
-        {
-            var test = new TestableTestObject();
-            var testProperty1 = TestProperty.Register("12", "label1", typeof(DateTimeOffset), typeof(TestableTestObject));
-            var testPropertyData1 = DateTimeOffset.MaxValue;
-            test.SetPropertyValue(testProperty1, testPropertyData1);
+    [TestMethod]
+    public void TestObjectShouldSerializeDateTimeOffsetForProperty()
+    {
+        var test = new TestableTestObject();
+        var testProperty1 = TestProperty.Register("12", "label1", typeof(DateTimeOffset), typeof(TestableTestObject));
+        var testPropertyData1 = DateTimeOffset.MaxValue;
+        test.SetPropertyValue(testProperty1, testPropertyData1);
 
-            var json = Serialize(test);
+        var json = Serialize(test);
 
-            var expectedJson = "{\"Properties\":[{\"Key\":{\"Id\":\"12\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
-            Assert.AreEqual(expectedJson, json);
-        }
+        var expectedJson = "{\"Properties\":[{\"Key\":{\"Id\":\"12\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
+        Assert.AreEqual(expectedJson, json);
+    }
 
-        [TestMethod]
-        public void TestObjectShouldDeserializeCustomProperties()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"13\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Guid\"},\"Value\":\"02048dfd-3da7-475d-a011-8dd1121855ec\"},{\"Key\":{\"Id\":\"2\",\"Label\":\"label2\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Int32\"},\"Value\":29}]}";
+    [TestMethod]
+    public void TestObjectShouldDeserializeCustomProperties()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"13\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Guid\"},\"Value\":\"02048dfd-3da7-475d-a011-8dd1121855ec\"},{\"Key\":{\"Id\":\"2\",\"Label\":\"label2\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.Int32\"},\"Value\":29}]}";
 
-            var test = Deserialize<TestableTestObject>(json);
+        var test = Deserialize<TestableTestObject>(json);
 
-            var properties = test.Properties.ToArray();
-            Assert.AreEqual(2, properties.Length);
-            Assert.AreEqual(Guid.Parse("02048dfd-3da7-475d-a011-8dd1121855ec"), test.GetPropertyValue(properties[0]));
-            Assert.AreEqual(29, test.GetPropertyValue(properties[1]));
-        }
+        var properties = test.Properties.ToArray();
+        Assert.AreEqual(2, properties.Length);
+        Assert.AreEqual(Guid.Parse("02048dfd-3da7-475d-a011-8dd1121855ec"), test.GetPropertyValue(properties.First(x => x.Label == "label1")));
+        Assert.AreEqual(29, test.GetPropertyValue(properties.First(x => x.Label == "label2")));
+    }
 
-        [TestMethod]
-        public void TestObjectShouldDeserializeNullValueForProperty()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"14\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}]}";
+    [TestMethod]
+    public void TestObjectShouldDeserializeNullValueForProperty()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"14\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}]}";
 
-            var test = Deserialize<TestableTestObject>(json);
+        var test = Deserialize<TestableTestObject>(json);
 
-            var properties = test.Properties.ToArray();
-            Assert.AreEqual(1, properties.Length);
-            Assert.IsTrue(string.IsNullOrEmpty(test.GetPropertyValue(properties[0]).ToString()));
-        }
+        var properties = test.Properties.ToArray();
+        Assert.AreEqual(1, properties.Length);
+        Assert.IsTrue(string.IsNullOrEmpty(test.GetPropertyValue(properties[0])!.ToString()));
+    }
 
-        [TestMethod]
-        public void TestObjectShouldDeserializeStringArrayValueForProperty()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"15\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String[]\"},\"Value\":[\"val1\", \"val2\"]}]}";
+    [TestMethod]
+    public void TestObjectShouldDeserializeStringArrayValueForProperty()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"15\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String[]\"},\"Value\":[\"val1\", \"val2\"]}]}";
 
-            var test = Deserialize<TestableTestObject>(json);
+        var test = Deserialize<TestableTestObject>(json);
 
-            var properties = test.Properties.ToArray();
-            Assert.AreEqual(1, properties.Length);
-            CollectionAssert.AreEqual(new[] { "val1", "val2" }, (string[])test.GetPropertyValue(properties[0]));
-        }
+        var properties = test.Properties.ToArray();
+        Assert.AreEqual(1, properties.Length);
+        CollectionAssert.AreEqual(new[] { "val1", "val2" }, (string[])test.GetPropertyValue(properties[0])!);
+    }
 
-        [TestMethod]
-        public void TestObjectShouldDeserializeDatetimeOffset()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"16\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
+    [TestMethod]
+    public void TestObjectShouldDeserializeDatetimeOffset()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"16\",\"Label\":\"label1\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
 
-            var test = Deserialize<TestableTestObject>(json);
+        var test = Deserialize<TestableTestObject>(json);
 
-            var properties = test.Properties.ToArray();
-            Assert.AreEqual(1, properties.Length);
-            Assert.AreEqual(DateTimeOffset.MaxValue, test.GetPropertyValue(properties[0]));
-        }
+        var properties = test.Properties.ToArray();
+        Assert.AreEqual(1, properties.Length);
+        Assert.AreEqual(DateTimeOffset.MaxValue, test.GetPropertyValue(properties[0]));
+    }
 
-        [TestMethod]
-        public void TestObjectShouldAddPropertyToTestPropertyStoreOnDeserialize()
-        {
-            var json = "{\"Properties\":[{\"Key\":{\"Id\":\"17\",\"Label\":\"label1\",\"Category\":\"c\",\"Description\":\"d\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"DummyValue\"}]}";
-
-            var test = Deserialize<TestableTestObject>(json);
-
-            var property = TestProperty.Find("17");
-            Assert.IsNotNull(property);
-            Assert.AreEqual("17", property.Id);
-            Assert.AreEqual("label1", property.Label);
-            Assert.AreEqual("c", property.Category);
-            Assert.AreEqual("d", property.Description);
-            Assert.AreEqual(typeof(string), property.GetValueType());
-            Assert.AreEqual(TestPropertyAttributes.None, property.Attributes);
-            Assert.AreEqual("DummyValue", test.GetPropertyValue(property));
-        }
+    [TestMethod]
+    public void TestObjectShouldAddPropertyToTestPropertyStoreOnDeserialize()
+    {
+        var json = "{\"Properties\":[{\"Key\":{\"Id\":\"17\",\"Label\":\"label1\",\"Category\":\"c\",\"Description\":\"d\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"DummyValue\"}]}";
+
+        var test = Deserialize<TestableTestObject>(json);
+
+        var property = TestProperty.Find("17");
+        Assert.IsNotNull(property);
+        Assert.AreEqual("17", property.Id);
+        Assert.AreEqual("label1", property.Label);
+        Assert.AreEqual("c", property.Category);
+        Assert.AreEqual("d", property.Description);
+        Assert.AreEqual(typeof(string), property.GetValueType());
+        Assert.AreEqual(TestPropertyAttributes.None, property.Attributes);
+        Assert.AreEqual("DummyValue", test.GetPropertyValue(property));
+    }
 
-        [TestMethod]
-        public void TestObjectSetPropertyValueShouldNotConvertIfValueMatchesPropertyDataType()
-        {
-            var property = TestProperty.Register("98", "p1", typeof(bool), typeof(TestObject));
-            var testobj = new TestableTestObject();
+    [TestMethod]
+    public void TestObjectSetPropertyValueShouldNotConvertIfValueMatchesPropertyDataType()
+    {
+        var property = TestProperty.Register("98", "p1", typeof(bool), typeof(TestObject));
+        var testobj = new TestableTestObject();
 
-            // This should not throw even if the runtime type of boolean where as specified
-            // type is object
-            testobj.SetPropertyValue<object>(property, false);
+        // This should not throw even if the runtime type of boolean where as specified
+        // type is object
+        testobj.SetPropertyValue<object>(property, false);
 
-            Assert.AreEqual(false, testobj.GetPropertyValue(property));
-        }
+        Assert.AreEqual(false, testobj.GetPropertyValue(property));
+    }
 
-        private static string Serialize<T>(T data)
-        {
-            return JsonDataSerializer.Instance.Serialize(data);
-        }
+    private static string Serialize<T>(T data)
+    {
+        return JsonDataSerializer.Instance.Serialize(data);
+    }
 
-        private static T Deserialize<T>(string json)
-        {
-            return JsonDataSerializer.Instance.Deserialize<T>(json);
-        }
+    private static T Deserialize<T>(string json)
+    {
+        return JsonDataSerializer.Instance.Deserialize<T>(json)!;
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestResultSerializationTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestResultSerializationTests.cs
index 8f811846e5..087c01c46e 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestResultSerializationTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Serialization/TestResultSerializationTests.cs
@@ -1,312 +1,310 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json.Linq;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.Serialization;
+
+[TestClass]
+public class TestResultSerializationTests
 {
-    using System;
+    private static readonly TestCase TestCase = new(
+        "sampleTestClass.sampleTestCase",
+        new Uri("executor://sampleTestExecutor"),
+        "sampleTest.dll");
+
+    private static readonly DateTimeOffset StartTime = new(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
+    private static readonly TestResult TestResult = new(TestCase)
+    {
+        // Attachments = ?
+        // Messages = ?
+        Outcome = TestOutcome.Passed,
+        ErrorMessage = "sampleError",
+        ErrorStackTrace = "sampleStackTrace",
+        DisplayName = "sampleTestResult",
+        ComputerName = "sampleComputerName",
+        Duration = TimeSpan.MaxValue,
+        StartTime = StartTime,
+        EndTime = DateTimeOffset.MaxValue
+    };
+
+    #region v1 serializer Tests (used with protocol 1 and accidentally with 3)
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultJsonShouldContainAllPropertiesOnSerialization(int version)
+    {
+        var json = Serialize(TestResult, version);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+        dynamic properties = data["Properties"];
+        Assert.AreEqual("TestResult.Outcome", properties[0]["Key"]["Id"].Value);
+        Assert.AreEqual(1, properties[0]["Value"].Value);
+        Assert.AreEqual("TestResult.ErrorMessage", properties[1]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleError", properties[1]["Value"].Value);
+        Assert.AreEqual("TestResult.ErrorStackTrace", properties[2]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleStackTrace", properties[2]["Value"].Value);
+        Assert.AreEqual("TestResult.DisplayName", properties[3]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleTestResult", properties[3]["Value"].Value);
+        Assert.AreEqual("TestResult.ComputerName", properties[4]["Key"]["Id"].Value);
+        Assert.AreEqual("sampleComputerName", properties[4]["Value"].Value);
+        Assert.AreEqual("TestResult.Duration", properties[5]["Key"]["Id"].Value);
+        Assert.AreEqual("10675199.02:48:05.4775807", properties[5]["Value"].Value);
+
+        // By default json.net converts DateTimes to current time zone
+        Assert.AreEqual("TestResult.StartTime", properties[6]["Key"]["Id"].Value);
+        Assert.AreEqual(StartTime.Year, ((DateTimeOffset)properties[6]["Value"].Value).Year);
+        Assert.AreEqual("TestResult.EndTime", properties[7]["Key"]["Id"].Value);
+        Assert.AreEqual(DateTimeOffset.MaxValue.Year, ((DateTimeOffset)properties[7]["Value"].Value).Year);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultObjectShouldContainAllPropertiesOnDeserialization(int version)
+    {
+        var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome\"},\"Value\":1},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleError\"},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleStackTrace\"},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestResult\"},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleComputerName\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"10675199.02:48:05.4775807\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"2007-03-10T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
+
+        var test = Deserialize<TestResult>(json, version);
+
+        Assert.AreEqual(TestResult.TestCase.Id, test.TestCase.Id);
+        Assert.AreEqual(TestResult.Attachments.Count, test.Attachments.Count);
+        Assert.AreEqual(TestResult.Messages.Count, test.Messages.Count);
+
+        Assert.AreEqual(TestResult.ComputerName, test.ComputerName);
+        Assert.AreEqual(TestResult.DisplayName, test.DisplayName);
+        Assert.AreEqual(TestResult.Duration, test.Duration);
+        Assert.AreEqual(TestResult.EndTime, test.EndTime);
+        Assert.AreEqual(TestResult.ErrorMessage, test.ErrorMessage);
+        Assert.AreEqual(TestResult.ErrorStackTrace, test.ErrorStackTrace);
+        Assert.AreEqual(TestResult.Outcome, test.Outcome);
+        Assert.AreEqual(TestResult.StartTime, test.StartTime);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultObjectShouldSerializeAttachments(int version)
+    {
+        var result = new TestResult(TestCase);
+        result.StartTime = default;
+        result.EndTime = default;
+        result.Attachments.Add(new AttachmentSet(new Uri("http://dummyUri"), "sampleAttachment"));
+        var expectedJson = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
+
+        var json = Serialize(result, version);
+
+        Assert.AreEqual(expectedJson, json);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultObjectShouldDeserializeAttachments(int version)
+    {
+        var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[]}";
+
+        var result = Deserialize<TestResult>(json, version);
+
+        Assert.AreEqual(1, result.Attachments.Count);
+        Assert.AreEqual(new Uri("http://dummyUri"), result.Attachments[0].Uri);
+        Assert.AreEqual("sampleAttachment", result.Attachments[0].DisplayName);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultObjectShouldSerializeDefaultValues(int version)
+    {
+        var result = new TestResult(TestCase);
+        result.StartTime = default;
+        result.EndTime = default;
+        var expectedJson = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
+
+        var json = Serialize(result, version);
+
+        // Values that should be null: DisplayName, ErrorMessage, ErrorStackTrace
+        // Values that should be empty: ComputerName
+        Assert.AreEqual(expectedJson, json);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultObjectShouldDeserializeDefaultValues(int version)
+    {
+        var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
+
+        var result = Deserialize<TestResult>(json, version);
+
+        Assert.AreEqual(0, result.Attachments.Count);
+        Assert.AreEqual(0, result.Messages.Count);
+        Assert.IsNull(result.DisplayName);
+        Assert.IsNull(result.ErrorMessage);
+        Assert.IsNull(result.ErrorStackTrace);
+        Assert.AreEqual(string.Empty, result.ComputerName);
+    }
+
+    [TestMethod]
+    [DataRow(1)]
+    [DataRow(3)]
+    public void TestResultPropertiesShouldGetRegisteredAsPartOfDeserialization(int version)
+    {
+        TestProperty.TryUnregister("DummyProperty", out var _);
+        var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"}," +
+                   "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"}," +
+                   "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}," +
+                   "{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}," +
+                   "{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"}," +
+                   "{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"}," +
+                   "{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]}," +
+                   "\"Attachments\":[],\"Messages\":[]," +
+                   "\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0}," +
+                   "{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}," +
+                   "{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"}," +
+                   "{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}," +
+                   "{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"}," +
+                   "{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
+        _ = Deserialize<TestResult>(json, version);
+
+        VerifyDummyPropertyIsRegistered();
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    #endregion
 
-    using Newtonsoft.Json.Linq;
+    #region v2 serializer Tests (used with protocol 2 and 4)
 
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+    [TestMethod]
+    [DataRow(2)]
+    [DataRow(4)]
+    public void TestResultJsonShouldContainAllPropertiesOnSerializationV2(int version)
+    {
+        var json = Serialize(TestResult, version);
+
+        // Use raw deserialization to validate basic properties
+        dynamic data = JObject.Parse(json);
+
+        Assert.AreEqual(1, data["Outcome"].Value);
+        Assert.AreEqual("sampleError", data["ErrorMessage"].Value);
+        Assert.AreEqual("sampleStackTrace", data["ErrorStackTrace"].Value);
+        Assert.AreEqual("sampleTestResult", data["DisplayName"].Value);
+        Assert.AreEqual("sampleComputerName", data["ComputerName"].Value);
+        Assert.AreEqual("10675199.02:48:05.4775807", data["Duration"].Value);
+
+        // By default json.net converts DateTimes to current time zone
+        Assert.AreEqual(StartTime.Year, ((DateTimeOffset)data["StartTime"].Value).Year);
+        Assert.AreEqual(DateTimeOffset.MaxValue.Year, ((DateTimeOffset)data["EndTime"].Value).Year);
+    }
+
+    [TestMethod]
+    [DataRow(2)]
+    [DataRow(4)]
+    public void TestResultObjectShouldContainAllPropertiesOnDeserializationV2(int version)
+    {
+        var json = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[],\"Outcome\":1,\"ErrorMessage\":\"sampleError\",\"ErrorStackTrace\":\"sampleStackTrace\",\"DisplayName\":\"sampleTestResult\",\"Messages\":[],\"ComputerName\":\"sampleComputerName\",\"Duration\":\"10675199.02:48:05.4775807\",\"StartTime\":\"2007-03-10T00:00:00+00:00\",\"EndTime\":\"9999-12-31T23:59:59.9999999+00:00\",\"Properties\":[]}";
+
+        var test = Deserialize<TestResult>(json, version);
+
+        Assert.AreEqual(TestResult.TestCase.Id, test.TestCase.Id);
+        Assert.AreEqual(TestResult.Attachments.Count, test.Attachments.Count);
+        Assert.AreEqual(TestResult.Messages.Count, test.Messages.Count);
+
+        Assert.AreEqual(TestResult.ComputerName, test.ComputerName);
+        Assert.AreEqual(TestResult.DisplayName, test.DisplayName);
+        Assert.AreEqual(TestResult.Duration, test.Duration);
+        Assert.AreEqual(TestResult.EndTime, test.EndTime);
+        Assert.AreEqual(TestResult.ErrorMessage, test.ErrorMessage);
+        Assert.AreEqual(TestResult.ErrorStackTrace, test.ErrorStackTrace);
+        Assert.AreEqual(TestResult.Outcome, test.Outcome);
+        Assert.AreEqual(TestResult.StartTime, test.StartTime);
+    }
+
+    [TestMethod]
+    [DataRow(2)]
+    [DataRow(4)]
+    public void TestResultObjectShouldSerializeAttachmentsV2(int version)
+    {
+        var result = new TestResult(TestCase);
+        result.StartTime = default;
+        result.EndTime = default;
+        result.Attachments.Add(new AttachmentSet(new Uri("http://dummyUri"), "sampleAttachment"));
+        var expectedJson = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Outcome\":0,\"ErrorMessage\":null,\"ErrorStackTrace\":null,\"DisplayName\":null,\"Messages\":[],\"ComputerName\":null,\"Duration\":\"00:00:00\",\"StartTime\":\"0001-01-01T00:00:00+00:00\",\"EndTime\":\"0001-01-01T00:00:00+00:00\",\"Properties\":[]}";
+
+        var json = Serialize(result, version);
+
+        Assert.AreEqual(expectedJson, json);
+    }
+
+    [TestMethod]
+    [DataRow(2)]
+    [DataRow(4)]
+    public void TestResultObjectShouldDeserializeAttachmentsV2(int version)
+    {
+        var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[]}";
+
+        var result = Deserialize<TestResult>(json, version);
+
+        Assert.AreEqual(1, result.Attachments.Count);
+        Assert.AreEqual(new Uri("http://dummyUri"), result.Attachments[0].Uri);
+        Assert.AreEqual("sampleAttachment", result.Attachments[0].DisplayName);
+    }
+
+    [TestMethod]
+    [DataRow(2)]
+    [DataRow(4)]
+    public void TestResultPropertiesShouldGetRegisteredAsPartOfDeserializationV2(int version)
+    {
+        TestProperty.TryUnregister("DummyProperty", out var _);
+        var json = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[],\"Outcome\":1,\"ErrorMessage\":\"sampleError\",\"ErrorStackTrace\":\"sampleStackTrace\",\"DisplayName\":\"sampleTestResult\",\"Messages\":[],\"ComputerName\":\"sampleComputerName\",\"Duration\":\"10675199.02:48:05.4775807\",\"StartTime\":\"2007-03-10T00:00:00+00:00\",\"EndTime\":\"9999-12-31T23:59:59.9999999+00:00\"," +
+                   "\"Properties\":[{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},]}";
+        _ = Deserialize<TestResult>(json, version);
+
+        VerifyDummyPropertyIsRegistered();
+    }
+
+    #endregion
+
+    #region future
+
+    [TestMethod]
+    public void TestResultSerializationShouldThrowWhenProvidedProtocolVersionDoesNotExist()
+    {
+        // this is to ensure that introducing a new version is a conscious choice and
+        // and that we don't fallback to version 1 as it happened with version 3, because the serializer
+        // only checked for version 2
+        var version = int.MaxValue;
+
+        Assert.ThrowsException<NotSupportedException>(() => Serialize(TestResult, version));
+    }
+
+    #endregion
+
+    private static string Serialize<T>(T data, int version)
+    {
+        return JsonDataSerializer.Instance.Serialize(data, version);
+    }
+
+    private static T Deserialize<T>(string json, int version)
+    {
+        return JsonDataSerializer.Instance.Deserialize<T>(json, version)!;
+    }
 
-    [TestClass]
-    public class TestResultSerializationTests
+    private static void VerifyDummyPropertyIsRegistered()
     {
-        private static TestCase testCase = new TestCase(
-            "sampleTestClass.sampleTestCase",
-            new Uri("executor://sampleTestExecutor"),
-            "sampleTest.dll");
-
-        private static DateTimeOffset startTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
-        private static TestResult testResult = new TestResult(testCase)
-        {
-            // Attachments = ?
-            // Messages = ?
-            Outcome = TestOutcome.Passed,
-            ErrorMessage = "sampleError",
-            ErrorStackTrace = "sampleStackTrace",
-            DisplayName = "sampleTestResult",
-            ComputerName = "sampleComputerName",
-            Duration = TimeSpan.MaxValue,
-            StartTime = startTime,
-            EndTime = DateTimeOffset.MaxValue
-        };
-
-        #region v1 serializer Tests (used with protocol 1 and accidentally with 3)
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultJsonShouldContainAllPropertiesOnSerialization(int version)
-        {
-            var json = Serialize(testResult, version);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-            dynamic properties = data["Properties"];
-            Assert.AreEqual("TestResult.Outcome", properties[0]["Key"]["Id"].Value);
-            Assert.AreEqual(1, properties[0]["Value"].Value);
-            Assert.AreEqual("TestResult.ErrorMessage", properties[1]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleError", properties[1]["Value"].Value);
-            Assert.AreEqual("TestResult.ErrorStackTrace", properties[2]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleStackTrace", properties[2]["Value"].Value);
-            Assert.AreEqual("TestResult.DisplayName", properties[3]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleTestResult", properties[3]["Value"].Value);
-            Assert.AreEqual("TestResult.ComputerName", properties[4]["Key"]["Id"].Value);
-            Assert.AreEqual("sampleComputerName", properties[4]["Value"].Value);
-            Assert.AreEqual("TestResult.Duration", properties[5]["Key"]["Id"].Value);
-            Assert.AreEqual("10675199.02:48:05.4775807", properties[5]["Value"].Value);
-
-            // By default json.net converts DateTimes to current time zone
-            Assert.AreEqual("TestResult.StartTime", properties[6]["Key"]["Id"].Value);
-            Assert.AreEqual(startTime.Year, ((DateTimeOffset)properties[6]["Value"].Value).Year);
-            Assert.AreEqual("TestResult.EndTime", properties[7]["Key"]["Id"].Value);
-            Assert.AreEqual(DateTimeOffset.MaxValue.Year, ((DateTimeOffset)properties[7]["Value"].Value).Year);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultObjectShouldContainAllPropertiesOnDeserialization(int version)
-        {
-            var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome\"},\"Value\":1},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleError\"},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleStackTrace\"},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestResult\"},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleComputerName\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"10675199.02:48:05.4775807\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"2007-03-10T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"9999-12-31T23:59:59.9999999+00:00\"}]}";
-
-            var test = Deserialize<TestResult>(json, version);
-
-            Assert.AreEqual(testResult.TestCase.Id, test.TestCase.Id);
-            Assert.AreEqual(testResult.Attachments.Count, test.Attachments.Count);
-            Assert.AreEqual(testResult.Messages.Count, test.Messages.Count);
-
-            Assert.AreEqual(testResult.ComputerName, test.ComputerName);
-            Assert.AreEqual(testResult.DisplayName, test.DisplayName);
-            Assert.AreEqual(testResult.Duration, test.Duration);
-            Assert.AreEqual(testResult.EndTime, test.EndTime);
-            Assert.AreEqual(testResult.ErrorMessage, test.ErrorMessage);
-            Assert.AreEqual(testResult.ErrorStackTrace, test.ErrorStackTrace);
-            Assert.AreEqual(testResult.Outcome, test.Outcome);
-            Assert.AreEqual(testResult.StartTime, test.StartTime);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultObjectShouldSerializeAttachments(int version)
-        {
-            var result = new TestResult(testCase);
-            result.StartTime = default;
-            result.EndTime = default;
-            result.Attachments.Add(new AttachmentSet(new Uri("http://dummyUri"), "sampleAttachment"));
-            var expectedJson = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
-
-            var json = Serialize(result, version);
-
-            Assert.AreEqual(expectedJson, json);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultObjectShouldDeserializeAttachments(int version)
-        {
-            var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[]}";
-
-            var result = Deserialize<TestResult>(json, version);
-
-            Assert.AreEqual(1, result.Attachments.Count);
-            Assert.AreEqual(new Uri("http://dummyUri"), result.Attachments[0].Uri);
-            Assert.AreEqual("sampleAttachment", result.Attachments[0].DisplayName);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultObjectShouldSerializeDefaultValues(int version)
-        {
-            var result = new TestResult(testCase);
-            result.StartTime = default;
-            result.EndTime = default;
-            var expectedJson = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
-
-            var json = Serialize(result, version);
-
-            // Values that should be null: DisplayName, ErrorMessage, ErrorStackTrace
-            // Values that should be empty: ComputerName
-            Assert.AreEqual(expectedJson, json);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultObjectShouldDeserializeDefaultValues(int version)
-        {
-            var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"},{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]},\"Attachments\":[],\"Messages\":[],\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0},{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"},{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"},{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
-
-            var result = Deserialize<TestResult>(json, version);
-
-            Assert.AreEqual(0, result.Attachments.Count);
-            Assert.AreEqual(0, result.Messages.Count);
-            Assert.IsNull(result.DisplayName);
-            Assert.IsNull(result.ErrorMessage);
-            Assert.IsNull(result.ErrorStackTrace);
-            Assert.AreEqual(string.Empty, result.ComputerName);
-        }
-
-        [TestMethod]
-        [DataRow(1)]
-        [DataRow(3)]
-        public void TestResultPropertiesShouldGetRegisteredAsPartOfDeserialization(int version)
-        {
-            TestProperty.TryUnregister("DummyProperty", out var property);
-            var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"}," +
-                "{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"}," +
-                "{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"}," +
-                "{\"Key\":{\"Id\":\"TestCase.CodeFilePath\",\"Label\":\"File Path\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}," +
-                "{\"Key\":{\"Id\":\"TestCase.DisplayName\",\"Label\":\"Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"}," +
-                "{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"}," +
-                "{\"Key\":{\"Id\":\"TestCase.LineNumber\",\"Label\":\"Line Number\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Int32\"},\"Value\":-1}]}," +
-                "\"Attachments\":[],\"Messages\":[]," +
-                "\"Properties\":[{\"Key\":{\"Id\":\"TestResult.Outcome\",\"Label\":\"Outcome\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome, Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"},\"Value\":0}," +
-                "{\"Key\":{\"Id\":\"TestResult.ErrorMessage\",\"Label\":\"Error Message\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ErrorStackTrace\",\"Label\":\"Error Stack Trace\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":null}," +
-                "{\"Key\":{\"Id\":\"TestResult.DisplayName\",\"Label\":\"TestResult Display Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":null},{\"Key\":{\"Id\":\"TestResult.ComputerName\",\"Label\":\"Computer Name\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"\"}," +
-                "{\"Key\":{\"Id\":\"TestResult.Duration\",\"Label\":\"Duration\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.TimeSpan\"},\"Value\":\"00:00:00\"},{\"Key\":{\"Id\":\"TestResult.StartTime\",\"Label\":\"Start Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}," +
-                "{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"}," +
-                "{\"Key\":{\"Id\":\"TestResult.EndTime\",\"Label\":\"End Time\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.DateTimeOffset\"},\"Value\":\"0001-01-01T00:00:00+00:00\"}]}";
-            var test = Deserialize<TestResult>(json, version);
-
-            this.VerifyDummyPropertyIsRegistered();
-        }
-
-        #endregion
-
-        #region v2 serializer Tests (used with protocol 2 and 4)
-
-        [TestMethod]
-        [DataRow(2)]
-        [DataRow(4)]
-        public void TestResultJsonShouldContainAllPropertiesOnSerializationV2(int version)
-        {
-            var json = Serialize(testResult, version);
-
-            // Use raw deserialization to validate basic properties
-            dynamic data = JObject.Parse(json);
-
-            Assert.AreEqual(1, data["Outcome"].Value);
-            Assert.AreEqual("sampleError", data["ErrorMessage"].Value);
-            Assert.AreEqual("sampleStackTrace", data["ErrorStackTrace"].Value);
-            Assert.AreEqual("sampleTestResult", data["DisplayName"].Value);
-            Assert.AreEqual("sampleComputerName", data["ComputerName"].Value);
-            Assert.AreEqual("10675199.02:48:05.4775807", data["Duration"].Value);
-
-            // By default json.net converts DateTimes to current time zone
-            Assert.AreEqual(startTime.Year, ((DateTimeOffset)data["StartTime"].Value).Year);
-            Assert.AreEqual(DateTimeOffset.MaxValue.Year, ((DateTimeOffset)data["EndTime"].Value).Year);
-        }
-
-        [TestMethod]
-        [DataRow(2)]
-        [DataRow(4)]
-        public void TestResultObjectShouldContainAllPropertiesOnDeserializationV2(int version)
-        {
-            var json = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[],\"Outcome\":1,\"ErrorMessage\":\"sampleError\",\"ErrorStackTrace\":\"sampleStackTrace\",\"DisplayName\":\"sampleTestResult\",\"Messages\":[],\"ComputerName\":\"sampleComputerName\",\"Duration\":\"10675199.02:48:05.4775807\",\"StartTime\":\"2007-03-10T00:00:00+00:00\",\"EndTime\":\"9999-12-31T23:59:59.9999999+00:00\",\"Properties\":[]}";
-
-            var test = Deserialize<TestResult>(json, version);
-
-            Assert.AreEqual(testResult.TestCase.Id, test.TestCase.Id);
-            Assert.AreEqual(testResult.Attachments.Count, test.Attachments.Count);
-            Assert.AreEqual(testResult.Messages.Count, test.Messages.Count);
-
-            Assert.AreEqual(testResult.ComputerName, test.ComputerName);
-            Assert.AreEqual(testResult.DisplayName, test.DisplayName);
-            Assert.AreEqual(testResult.Duration, test.Duration);
-            Assert.AreEqual(testResult.EndTime, test.EndTime);
-            Assert.AreEqual(testResult.ErrorMessage, test.ErrorMessage);
-            Assert.AreEqual(testResult.ErrorStackTrace, test.ErrorStackTrace);
-            Assert.AreEqual(testResult.Outcome, test.Outcome);
-            Assert.AreEqual(testResult.StartTime, test.StartTime);
-        }
-
-        [TestMethod]
-        [DataRow(2)]
-        [DataRow(4)]
-        public void TestResultObjectShouldSerializeAttachmentsV2(int version)
-        {
-            var result = new TestResult(testCase);
-            result.StartTime = default;
-            result.EndTime = default;
-            result.Attachments.Add(new AttachmentSet(new Uri("http://dummyUri"), "sampleAttachment"));
-            var expectedJson = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Outcome\":0,\"ErrorMessage\":null,\"ErrorStackTrace\":null,\"DisplayName\":null,\"Messages\":[],\"ComputerName\":null,\"Duration\":\"00:00:00\",\"StartTime\":\"0001-01-01T00:00:00+00:00\",\"EndTime\":\"0001-01-01T00:00:00+00:00\",\"Properties\":[]}";
-
-            var json = Serialize(result, version);
-
-            Assert.AreEqual(expectedJson, json);
-        }
-
-        [TestMethod]
-        [DataRow(2)]
-        [DataRow(4)]
-        public void TestResultObjectShouldDeserializeAttachmentsV2(int version)
-        {
-            var json = "{\"TestCase\":{\"Properties\":[{\"Key\":{\"Id\":\"TestCase.FullyQualifiedName\",\"Label\":\"FullyQualifiedName\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.String\"},\"Value\":\"sampleTestClass.sampleTestCase\"},{\"Key\":{\"Id\":\"TestCase.ExecutorUri\",\"Label\":\"Executor Uri\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Uri\"},\"Value\":\"executor://sampleTestExecutor\"},{\"Key\":{\"Id\":\"TestCase.Source\",\"Label\":\"Source\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":0,\"ValueType\":\"System.String\"},\"Value\":\"sampleTest.dll\"},{\"Key\":{\"Id\":\"TestCase.Id\",\"Label\":\"Id\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":1,\"ValueType\":\"System.Guid\"},\"Value\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\"}]},\"Attachments\":[{\"Uri\":\"http://dummyUri\",\"DisplayName\":\"sampleAttachment\",\"Attachments\":[]}],\"Messages\":[],\"Properties\":[]}";
-
-            var result = Deserialize<TestResult>(json, version);
-
-            Assert.AreEqual(1, result.Attachments.Count);
-            Assert.AreEqual(new Uri("http://dummyUri"), result.Attachments[0].Uri);
-            Assert.AreEqual("sampleAttachment", result.Attachments[0].DisplayName);
-        }
-
-        [TestMethod]
-        [DataRow(2)]
-        [DataRow(4)]
-        public void TestResultPropertiesShouldGetRegisteredAsPartOfDeserializationV2(int version)
-        {
-            TestProperty.TryUnregister("DummyProperty", out var property);
-            var json = "{\"TestCase\":{\"Id\":\"28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b\",\"FullyQualifiedName\":\"sampleTestClass.sampleTestCase\",\"DisplayName\":\"sampleTestClass.sampleTestCase\",\"ExecutorUri\":\"executor://sampleTestExecutor\",\"Source\":\"sampleTest.dll\",\"CodeFilePath\":null,\"LineNumber\":-1,\"Properties\":[]},\"Attachments\":[],\"Outcome\":1,\"ErrorMessage\":\"sampleError\",\"ErrorStackTrace\":\"sampleStackTrace\",\"DisplayName\":\"sampleTestResult\",\"Messages\":[],\"ComputerName\":\"sampleComputerName\",\"Duration\":\"10675199.02:48:05.4775807\",\"StartTime\":\"2007-03-10T00:00:00+00:00\",\"EndTime\":\"9999-12-31T23:59:59.9999999+00:00\"," +
-                "\"Properties\":[{\"Key\":{\"Id\":\"DummyProperty\",\"Label\":\"DummyPropertyLabel\",\"Category\":\"\",\"Description\":\"\",\"Attributes\":5,\"ValueType\":\"System.String\"},\"Value\":\"dummyString\"},]}";
-
-            var test = Deserialize<TestResult>(json, version);
-
-            this.VerifyDummyPropertyIsRegistered();
-        }
-
-        #endregion
-
-        #region future
-
-        [TestMethod]
-        public void TestResultSerializationShouldThrowWhenProvidedProtocolVersionDoesNotExist()
-        {
-            // this is to ensure that introducing a new version is a conscious choice and
-            // and that we don't fallback to version 1 as it happened with version 3, because the serializer
-            // only checked for version 2
-            var version = int.MaxValue;
-
-            Assert.ThrowsException<NotSupportedException>(() => Serialize(testResult, version));
-        }
-
-        #endregion
-
-        private static string Serialize<T>(T data, int version)
-        {
-            return JsonDataSerializer.Instance.Serialize(data, version);
-        }
-
-        private static T Deserialize<T>(string json, int version)
-        {
-            return JsonDataSerializer.Instance.Deserialize<T>(json, version);
-        }
-
-        private void VerifyDummyPropertyIsRegistered()
-        {
-            var dummyProperty = TestProperty.Find("DummyProperty");
-            Assert.IsNotNull(dummyProperty);
-            Assert.AreEqual("DummyPropertyLabel", dummyProperty.Label);
-            Assert.AreEqual("System.String", dummyProperty.ValueType);
-            Assert.AreEqual(5, (int)dummyProperty.Attributes);
-        }
+        var dummyProperty = TestProperty.Find("DummyProperty");
+        Assert.IsNotNull(dummyProperty);
+        Assert.AreEqual("DummyPropertyLabel", dummyProperty.Label);
+        Assert.AreEqual("System.String", dummyProperty.ValueType);
+        Assert.AreEqual(5, (int)dummyProperty.Attributes);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/SocketCommunicationManagerTest.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/SocketCommunicationManagerTest.cs
index 8fe31dca87..c8faff459a 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/SocketCommunicationManagerTest.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/SocketCommunicationManagerTest.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
 
-    [TestClass]
-    public class SocketCommunicationManagerTest
-    {
-    }
-}
\ No newline at end of file
+[TestClass]
+public class SocketCommunicationManagerTest
+{
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TelemetryReporterTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TelemetryReporterTests.cs
new file mode 100644
index 0000000000..4ed30047ee
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TelemetryReporterTests.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class TelemetryReporterTests
+{
+    private readonly Mock<IRequestData> _requestData;
+    private readonly Mock<ICommunicationManager> _communicationManager;
+    private readonly Mock<IDataSerializer> _dataSerializer;
+    private readonly ITelemetryReporter _telemetryReporter;
+
+    public TelemetryReporterTests()
+    {
+        _requestData = new();
+        _communicationManager = new();
+        _dataSerializer = new();
+        _telemetryReporter = new TelemetryReporter(_requestData.Object, _communicationManager.Object, _dataSerializer.Object);
+    }
+
+    [TestMethod]
+    public void Report_ShouldDoNothing_IfTelemetryDisabled()
+    {
+        _requestData.Setup(r => r.IsTelemetryOptedIn).Returns(false);
+        TelemetryEvent telemetryEvent = new("name", new Dictionary<string, object>());
+
+        _telemetryReporter.Report(telemetryEvent);
+
+        _requestData.VerifyAll();
+        _requestData.VerifyNoOtherCalls();
+        _dataSerializer.VerifyAll();
+        _dataSerializer.VerifyNoOtherCalls();
+        _communicationManager.VerifyAll();
+        _communicationManager.VerifyNoOtherCalls();
+    }
+
+    [TestMethod]
+    public void Report_ShouldSendMessage_IfTelemetryEnabled()
+    {
+        _requestData.Setup(r => r.IsTelemetryOptedIn).Returns(true);
+        TelemetryEvent telemetryEvent = new("name", new Dictionary<string, object>());
+        var rawMessage = "rawMessage";
+        _dataSerializer.Setup(d => d.SerializePayload(MessageType.TelemetryEventMessage, telemetryEvent)).Returns(rawMessage);
+
+        _telemetryReporter.Report(telemetryEvent);
+
+        _communicationManager.Verify(c => c.SendRawMessage(rawMessage));
+        _requestData.VerifyAll();
+        _requestData.VerifyNoOtherCalls();
+        _dataSerializer.VerifyAll();
+        _dataSerializer.VerifyNoOtherCalls();
+        _communicationManager.VerifyAll();
+        _communicationManager.VerifyNoOtherCalls();
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionRequestHandler.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionRequestHandler.cs
index b613e78c21..acb0050e1b 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionRequestHandler.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionRequestHandler.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
 
-    /// <summary>
-    /// Testable class for DataCollectionRequestHandler since all constructors of DataCollectionRequestHandler are protected.
-    /// </summary>
-    internal class TestableDataCollectionRequestHandler : DataCollectionRequestHandler
+/// <summary>
+/// Testable class for DataCollectionRequestHandler since all constructors of DataCollectionRequestHandler are protected.
+/// </summary>
+internal class TestableDataCollectionRequestHandler : DataCollectionRequestHandler
+{
+    public TestableDataCollectionRequestHandler(ICommunicationManager communicationManager, IMessageSink messageSink, IDataCollectionManager dataCollectionManager, IDataCollectionTestCaseEventHandler dataCollectionTestCaseEventHandler, IDataSerializer dataSerializer, IFileHelper fIleHelper, IRequestData requestData)
+        : base(communicationManager, messageSink, dataCollectionManager, dataCollectionTestCaseEventHandler, dataSerializer, fIleHelper, requestData)
     {
-        public TestableDataCollectionRequestHandler(ICommunicationManager communicationManager, IMessageSink messageSink, IDataCollectionManager dataCollectionManager, IDataCollectionTestCaseEventHandler dataCollectionTestCaseEventHandler, IDataSerializer dataSerializer, IFileHelper fIleHelper, IRequestData requestData)
-            : base(communicationManager, messageSink, dataCollectionManager, dataCollectionTestCaseEventHandler, dataSerializer, fIleHelper, requestData)
-        {
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionTestCaseEventSender.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionTestCaseEventSender.cs
index ce8b0cc4c8..3af9de7c98 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionTestCaseEventSender.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableDataCollectionTestCaseEventSender.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
 
-    internal class TestableDataCollectionTestCaseEventSender : DataCollectionTestCaseEventSender
+internal class TestableDataCollectionTestCaseEventSender : DataCollectionTestCaseEventSender
+{
+    public TestableDataCollectionTestCaseEventSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
+        : base(communicationManager, dataSerializer)
     {
-        public TestableDataCollectionTestCaseEventSender(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
-            : base(communicationManager, dataSerializer)
-        {
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableTestObject.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableTestObject.cs
index 2127043154..9f7bfb5a62 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableTestObject.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestDoubles/TestableTestObject.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles
-{
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests.TestDoubles;
 
-    [DataContract]
-    internal class TestableTestObject : TestObject
-    {
-    }
-}
\ No newline at end of file
+[DataContract]
+internal class TestableTestObject : TestObject
+{
+}
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
index 5b40d4d776..8cdeb06831 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
@@ -1,880 +1,940 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CommunicationUtilities.UnitTests;
+
+[TestClass]
+public class TestRequestSenderTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Sockets;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-
-    [TestClass]
-    public class TestRequestSenderTests
-    {
-        private const int DUMMYPROTOCOLVERSION = 42;
-        private const int DEFAULTPROTOCOLVERSION = 1;
-        private const int DUMMYNEGOTIATEDPROTOCOLVERSION = 41;
-        private static readonly string TimoutErrorMessage = "Failed to negotiate protocol, waiting for response timed out after 0 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
-
-        private readonly Mock<ICommunicationEndPoint> mockServer;
-        private readonly Mock<IDataSerializer> mockDataSerializer;
-        private readonly Mock<ICommunicationChannel> mockChannel;
-
-        private readonly List<string> pathToAdditionalExtensions = new List<string> { "Hello", "World" };
-        private readonly Mock<ITestDiscoveryEventsHandler2> mockDiscoveryEventsHandler;
-        private readonly Mock<ITestRunEventsHandler> mockExecutionEventsHandler;
-        private readonly TestRunCriteriaWithSources testRunCriteriaWithSources;
-        private TestHostConnectionInfo connectionInfo;
-        private ITestRequestSender testRequestSender;
-        private ConnectedEventArgs connectedEventArgs;
-
-        public TestRequestSenderTests()
-        {
-            this.connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":123",
-                Role = ConnectionRole.Client,
-                Transport = Transport.Sockets
-            };
-            this.mockChannel = new Mock<ICommunicationChannel>();
-            this.mockServer = new Mock<ICommunicationEndPoint>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.testRequestSender = new TestableTestRequestSender(this.mockServer.Object, this.connectionInfo, this.mockDataSerializer.Object, new ProtocolConfig { Version = DUMMYPROTOCOLVERSION });
-
-            this.connectedEventArgs = new ConnectedEventArgs(this.mockChannel.Object);
-            this.mockDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockExecutionEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.testRunCriteriaWithSources = new TestRunCriteriaWithSources(new Dictionary<string, IEnumerable<string>>(), "runsettings", null, null);
-        }
+    private const int Dummyprotocolversion = 42;
+    private const int Defaultprotocolversion = 1;
+    private const int Dummynegotiatedprotocolversion = 41;
+    private static readonly string TimoutErrorMessage = "Failed to negotiate protocol, waiting for response timed out after 0 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
+
+    private readonly Mock<ICommunicationEndPoint> _mockServer;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+    private readonly Mock<ICommunicationChannel> _mockChannel;
+
+    private readonly List<string> _pathToAdditionalExtensions = ["Hello", "World"];
+    private readonly Mock<ITestDiscoveryEventsHandler2> _mockDiscoveryEventsHandler;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockExecutionEventsHandler;
+    private readonly TestRunCriteriaWithSources _testRunCriteriaWithSources;
+    private TestHostConnectionInfo _connectionInfo;
+    private readonly ITestRequestSender _testRequestSender;
+    private ConnectedEventArgs _connectedEventArgs;
+
+    public TestRequestSenderTests()
+    {
+        _connectionInfo = new TestHostConnectionInfo
+        {
+            Endpoint = IPAddress.Loopback + ":123",
+            Role = ConnectionRole.Client,
+            Transport = Transport.Sockets
+        };
+        _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
+        _mockServer = new Mock<ICommunicationEndPoint>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _testRequestSender = new TestableTestRequestSender(_mockServer.Object, _connectionInfo, _mockDataSerializer.Object, new ProtocolConfig { Version = Dummyprotocolversion });
+
+        _connectedEventArgs = new ConnectedEventArgs(_mockChannel.Object);
+        _mockDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _mockExecutionEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _testRunCriteriaWithSources = new TestRunCriteriaWithSources(new Dictionary<string, IEnumerable<string>>(), "runsettings", null, null!);
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+    }
 
-        [TestMethod]
-        public void InitializeCommunicationShouldHostServerAndAcceptClient()
-        {
-            var port = this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void InitializeCommunicationShouldHostServerAndAcceptClient()
+    {
+        var port = SetupFakeCommunicationChannel();
 
-            Assert.AreEqual("123", port, "Correct port must be returned.");
-        }
+        Assert.AreEqual("123", port, "Correct port must be returned.");
+    }
 
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionShouldWaitForClientToConnect()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionShouldWaitForClientToConnect()
+    {
+        SetupFakeCommunicationChannel();
 
-            var connected = this.testRequestSender.WaitForRequestHandlerConnection(1, It.IsAny<CancellationToken>());
+        var connected = _testRequestSender.WaitForRequestHandlerConnection(1, It.IsAny<CancellationToken>());
 
-            Assert.IsTrue(connected);
-        }
+        Assert.IsTrue(connected);
+    }
 
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionShouldNotConnectIfExceptionWasThrownByTcpLayer()
-        {
-            this.connectedEventArgs = new ConnectedEventArgs(new SocketException());
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionShouldNotConnectIfExceptionWasThrownByTcpLayer()
+    {
+        _connectedEventArgs = new ConnectedEventArgs(new SocketException());
+        SetupFakeCommunicationChannel();
 
-            var connected = this.testRequestSender.WaitForRequestHandlerConnection(1, It.IsAny<CancellationToken>());
+        var connected = _testRequestSender.WaitForRequestHandlerConnection(1, It.IsAny<CancellationToken>());
 
-            Assert.IsFalse(connected);
-        }
+        Assert.IsFalse(connected);
+    }
 
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionWithTimeoutShouldReturnImmediatelyWhenCancellationRequested()
-        {
-            var cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionWithTimeoutShouldReturnImmediatelyWhenCancellationRequested()
+    {
+        var cancellationTokenSource = new CancellationTokenSource();
+        cancellationTokenSource.Cancel();
 
-            var connectionTimeout = 5000;
-            var watch = System.Diagnostics.Stopwatch.StartNew();
-            var connected = this.testRequestSender.WaitForRequestHandlerConnection(connectionTimeout, cancellationTokenSource.Token);
-            watch.Stop();
+        var connectionTimeout = 5000;
+        var watch = System.Diagnostics.Stopwatch.StartNew();
+        var connected = _testRequestSender.WaitForRequestHandlerConnection(connectionTimeout, cancellationTokenSource.Token);
+        watch.Stop();
 
-            Assert.IsFalse(connected);
-            Assert.IsTrue(watch.ElapsedMilliseconds < connectionTimeout);
-        }
+        Assert.IsFalse(connected);
+        Assert.IsTrue(watch.ElapsedMilliseconds < connectionTimeout);
+    }
 
-        [TestMethod]
-        public void WaitForRequestHandlerConnectionWithTimeoutShouldReturnImmediatelyIfHostExitedUnexpectedly()
-        {
-            var cancellationTokenSource = new CancellationTokenSource();
-            this.testRequestSender.OnClientProcessExit("DummyError");
+    [TestMethod]
+    public void WaitForRequestHandlerConnectionWithTimeoutShouldReturnImmediatelyIfHostExitedUnexpectedly()
+    {
+        var cancellationTokenSource = new CancellationTokenSource();
+        _testRequestSender.OnClientProcessExit("DummyError");
 
-            var connectionTimeout = 5000;
-            var watch = System.Diagnostics.Stopwatch.StartNew();
-            var connected = this.testRequestSender.WaitForRequestHandlerConnection(connectionTimeout, cancellationTokenSource.Token);
-            watch.Stop();
+        var connectionTimeout = 5000;
+        var watch = System.Diagnostics.Stopwatch.StartNew();
+        var connected = _testRequestSender.WaitForRequestHandlerConnection(connectionTimeout, cancellationTokenSource.Token);
+        watch.Stop();
 
-            Assert.IsFalse(connected);
-            Assert.IsTrue(watch.ElapsedMilliseconds < connectionTimeout);
-        }
+        Assert.IsFalse(connected);
+        Assert.IsTrue(watch.ElapsedMilliseconds < connectionTimeout);
+    }
 
-        [TestMethod]
-        public void CloseShouldCallStopServerOnCommunicationManager()
-        {
-            this.testRequestSender.Close();
+    [TestMethod]
+    public void CloseShouldCallStopServerOnCommunicationManager()
+    {
+        _testRequestSender.Close();
 
-            this.mockServer.Verify(mc => mc.Stop(), Times.Once);
-        }
+        _mockServer.Verify(mc => mc.Stop(), Times.Once);
+    }
 
-        [TestMethod]
-        public void DisposeShouldCallStopServerOnCommunicationManager()
-        {
-            this.testRequestSender.Dispose();
+    [TestMethod]
+    public void DisposeShouldCallStopServerOnCommunicationManager()
+    {
+        _testRequestSender.Dispose();
 
-            this.mockServer.Verify(mc => mc.Stop(), Times.Once);
-        }
+        _mockServer.Verify(mc => mc.Stop(), Times.Once);
+    }
 
-        [TestMethod]
-        public void EndSessionShouldSendSessionEndMessage()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void EndSessionShouldSendSessionEndMessage()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.EndSession();
+        _testRequestSender.EndSession();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Once);
-            this.mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
-        }
+        _mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Once);
+        _mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void EndSessionShouldNotSendSessionEndMessageIfClientDisconnected()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
-            this.RaiseClientDisconnectedEvent();
+    [TestMethod]
+    public void EndSessionShouldNotSendSessionEndMessageIfClientDisconnected()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
+        RaiseClientDisconnectedEvent();
 
-            this.testRequestSender.EndSession();
+        _testRequestSender.EndSession();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Never);
-        }
+        _mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Never);
+    }
 
-        [TestMethod]
-        public void EndSessionShouldNotSendSessionEndMessageIfTestHostProcessExited()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
-            this.testRequestSender.OnClientProcessExit("Dummy Message");
+    [TestMethod]
+    public void EndSessionShouldNotSendSessionEndMessageIfTestHostProcessExited()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
+        _testRequestSender.OnClientProcessExit("Dummy Message");
 
-            this.testRequestSender.EndSession();
+        _testRequestSender.EndSession();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Once);
-        }
+        _mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.SessionEnd), Times.Once);
+    }
 
-        [TestMethod]
-        public void EndSessionShouldNotSendTestRunCancelMessageIfClientDisconnected()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
-            this.RaiseClientDisconnectedEvent();
+    [TestMethod]
+    public void EndSessionShouldNotSendTestRunCancelMessageIfClientDisconnected()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
+        RaiseClientDisconnectedEvent();
 
-            this.testRequestSender.SendTestRunCancel();
+        _testRequestSender.SendTestRunCancel();
 
-            this.mockChannel.Verify(mockChannel => mockChannel.Send(MessageType.CancelTestRun), Times.Never);
-        }
+        _mockChannel.Verify(mockChannel => mockChannel.Send(MessageType.CancelTestRun), Times.Never);
+    }
 
-        [TestMethod]
-        public void EndSessionShouldNotSendTestRunAbortMessageIfClientDisconnected()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
-            this.RaiseClientDisconnectedEvent();
+    [TestMethod]
+    public void EndSessionShouldNotSendTestRunAbortMessageIfClientDisconnected()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
+        RaiseClientDisconnectedEvent();
 
-            this.testRequestSender.SendTestRunAbort();
+        _testRequestSender.SendTestRunAbort();
 
-            this.mockChannel.Verify(mockChannel => mockChannel.Send(MessageType.CancelTestRun), Times.Never);
-        }
+        _mockChannel.Verify(mockChannel => mockChannel.Send(MessageType.CancelTestRun), Times.Never);
+    }
 
-        [DataTestMethod]
-        [DataRow("")]
-        [DataRow(" ")]
-        [DataRow(null)]
-        public void OnClientProcessExitShouldSendErrorMessageIfStdErrIsEmpty(string stderr)
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+    [DataTestMethod]
+    [DataRow("")]
+    [DataRow(" ")]
+    [DataRow(null)]
+    public void OnClientProcessExitShouldSendErrorMessageIfStdErrIsEmpty(string stderr)
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.testRequestSender.OnClientProcessExit(stderr);
+        _testRequestSender.OnClientProcessExit(stderr);
 
-            var expectedErrorMessage = "Reason: Test host process crashed";
-            this.RaiseClientDisconnectedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.EndsWith(expectedErrorMessage))), Times.Once);
-        }
+        var expectedErrorMessage = "Reason: Test host process crashed";
+        RaiseClientDisconnectedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.EndsWith(expectedErrorMessage))), Times.Once);
+    }
 
-        [TestMethod]
-        public void OnClientProcessExitShouldNotSendErrorMessageIfOperationNotStarted()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.OnClientProcessExit("Dummy Stderr");
+    [TestMethod]
+    public void OnClientProcessExitShouldNotSendErrorMessageIfOperationNotStarted()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.OnClientProcessExit("Dummy Stderr");
 
-            this.RaiseClientDisconnectedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Stderr"))), Times.Never);
-        }
+        RaiseClientDisconnectedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Stderr"))), Times.Never);
+    }
 
-        [TestMethod]
-        public void OnClientProcessExitShouldNotSendRawMessageIfOperationNotStarted()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void OnClientProcessExitShouldNotSendRawMessageIfOperationNotStarted()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.OnClientProcessExit("Dummy Stderr");
+        _testRequestSender.OnClientProcessExit("Dummy Stderr");
 
-            this.RaiseClientDisconnectedEvent();
-            this.mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message.Contains("Dummy Stderr"))), Times.Never);
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage(It.IsAny<string>()), Times.Never);
-        }
+        RaiseClientDisconnectedEvent();
+        _mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message!.Contains("Dummy Stderr"))), Times.Never);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage(It.IsAny<string>()), Times.Never);
+    }
 
-        #region Version Check Tests
+    #region Version Check Tests
 
-        [TestMethod]
-        public void CheckVersionWithTestHostShouldSendHighestSupportedVersion()
-        {
-            this.SetupDeserializeMessage(MessageType.VersionCheck, 99);
-            this.SetupRaiseMessageReceivedOnCheckVersion();
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void CheckVersionWithTestHostShouldSendHighestSupportedVersion()
+    {
+        SetupDeserializeMessage(MessageType.VersionCheck, 99);
+        SetupRaiseMessageReceivedOnCheckVersion();
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.CheckVersionWithTestHost();
+        _testRequestSender.CheckVersionWithTestHost();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.VersionCheck, DUMMYPROTOCOLVERSION), Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+        _mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.VersionCheck, Dummyprotocolversion), Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void CheckVersionWithTestHostShouldThrowIfTestHostVersionDoesNotMatch()
-        {
-            this.SetupDeserializeMessage(MessageType.ProtocolError, string.Empty);
-            this.SetupRaiseMessageReceivedOnCheckVersion();
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void CheckVersionWithTestHostShouldThrowIfTestHostVersionDoesNotMatch()
+    {
+        SetupDeserializeMessage(MessageType.ProtocolError, string.Empty);
+        SetupRaiseMessageReceivedOnCheckVersion();
+        SetupFakeCommunicationChannel();
 
-            Assert.ThrowsException<TestPlatformException>(() => this.testRequestSender.CheckVersionWithTestHost());
-        }
+        Assert.ThrowsException<TestPlatformException>(() => _testRequestSender.CheckVersionWithTestHost());
+    }
 
-        [TestMethod]
-        public void CheckVersionWithTestHostShouldThrowIfUnexpectedResponseIsReceived()
-        {
-            this.SetupDeserializeMessage(MessageType.TestCasesFound, string.Empty);
-            this.SetupRaiseMessageReceivedOnCheckVersion();
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void CheckVersionWithTestHostShouldThrowIfUnexpectedResponseIsReceived()
+    {
+        SetupDeserializeMessage(MessageType.TestCasesFound, string.Empty);
+        SetupRaiseMessageReceivedOnCheckVersion();
+        SetupFakeCommunicationChannel();
 
-            Assert.ThrowsException<TestPlatformException>(() => this.testRequestSender.CheckVersionWithTestHost());
-        }
+        Assert.ThrowsException<TestPlatformException>(() => _testRequestSender.CheckVersionWithTestHost());
+    }
 
-        [TestMethod]
-        public void CheckVersionWithTestHostShouldThrowIfProtocolNegotiationTimeouts()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "0");
+    [TestMethod]
+    public void CheckVersionWithTestHostShouldThrowIfProtocolNegotiationTimeouts()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "0");
 
-            this.SetupFakeCommunicationChannel();
+        SetupFakeCommunicationChannel();
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => this.testRequestSender.CheckVersionWithTestHost()).Message;
+        var message = Assert.ThrowsException<TestPlatformException>(() => _testRequestSender.CheckVersionWithTestHost()).Message;
 
-            Assert.AreEqual(message, TestRequestSenderTests.TimoutErrorMessage);
-        }
+        Assert.AreEqual(message, TimoutErrorMessage);
+    }
 
-        #endregion
+    #endregion
 
-        #region Discovery Protocol Tests
-        [TestMethod]
-        public void InitializeDiscoveryShouldSendCommunicationMessageWithCorrectParameters()
-        {
-            this.SetupFakeCommunicationChannel();
+    #region Discovery Protocol Tests
+    [TestMethod]
+    public void InitializeDiscoveryShouldSendCommunicationMessageWithCorrectParameters()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.InitializeDiscovery(this.pathToAdditionalExtensions);
+        _testRequestSender.InitializeDiscovery(_pathToAdditionalExtensions);
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.DiscoveryInitialize, this.pathToAdditionalExtensions, 1), Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.DiscoveryInitialize, _pathToAdditionalExtensions, 1), Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeDiscoveryShouldSendCommunicationMessageWithCorrectParametersWithVersion()
-        {
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
+    [TestMethod]
+    public void InitializeDiscoveryShouldSendCommunicationMessageWithCorrectParametersWithVersion()
+    {
+        SetupFakeChannelWithVersionNegotiation();
 
-            this.testRequestSender.InitializeDiscovery(this.pathToAdditionalExtensions);
+        _testRequestSender.InitializeDiscovery(_pathToAdditionalExtensions);
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.DiscoveryInitialize, this.pathToAdditionalExtensions, DUMMYNEGOTIATEDPROTOCOLVERSION), Times.Once);
-        }
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.DiscoveryInitialize, _pathToAdditionalExtensions, Dummynegotiatedprotocolversion), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldSendStartDiscoveryMessageOnChannel()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestsShouldSendStartDiscoveryMessageOnChannel()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.mockDataSerializer.Verify(
-                s => s.SerializePayload(MessageType.StartDiscovery, It.IsAny<DiscoveryCriteria>(), DEFAULTPROTOCOLVERSION),
-                Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+        _mockDataSerializer.Verify(
+            s => s.SerializePayload(MessageType.StartDiscovery, It.IsAny<DiscoveryCriteria>(), Defaultprotocolversion),
+            Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldSendStartDiscoveryMessageOnChannelWithVersion()
-        {
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
+    [TestMethod]
+    public void DiscoverTestsShouldSendStartDiscoveryMessageOnChannelWithVersion()
+    {
+        SetupFakeChannelWithVersionNegotiation();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.mockDataSerializer.Verify(
-                s => s.SerializePayload(MessageType.StartDiscovery, It.IsAny<DiscoveryCriteria>(), DUMMYNEGOTIATEDPROTOCOLVERSION),
-                Times.Once);
-        }
+        _mockDataSerializer.Verify(
+            s => s.SerializePayload(MessageType.StartDiscovery, It.IsAny<DiscoveryCriteria>(), Dummynegotiatedprotocolversion),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotifyRawMessageOnMessageReceived()
-        {
-            this.SetupDeserializeMessage(MessageType.TestMessage, new TestMessagePayload());
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestsShouldNotifyRawMessageOnMessageReceived()
+    {
+        SetupDeserializeMessage(MessageType.TestMessage, new TestMessagePayload());
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage("DummyData"), Times.Once);
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage("DummyData"), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotifyDiscoveredTestsOnTestCasesFoundMessageReceived()
-        {
-            this.SetupDeserializeMessage<IEnumerable<TestCase>>(MessageType.TestCasesFound, new TestCase[2]);
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestsShouldNotifyDiscoveredTestsOnTestCasesFoundMessageReceived()
+    {
+        SetupDeserializeMessage<IEnumerable<TestCase>>(MessageType.TestCasesFound, new TestCase[2]);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveredTests(It.Is<IEnumerable<TestCase>>(t => t.Count() == 2)));
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveredTests(It.Is<IEnumerable<TestCase>>(t => t.Count() == 2)));
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotifyDiscoveryCompleteOnCompleteMessageReceived()
-        {
-            var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
-            this.SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestsShouldNotifyDiscoveryCompleteOnCompleteMessageReceived()
+    {
+        var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
+        SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == false && dc.TotalCount == 10), null));
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == false && dc.TotalCount == 10), null));
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldStopServerOnCompleteMessageReceived()
-        {
-            var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
-            this.SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestsShouldStopServerOnCompleteMessageReceived()
+    {
+        var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
+        SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
+        RaiseMessageReceivedEvent();
 
-            this.mockServer.Verify(ms => ms.Stop());
-        }
+        _mockServer.Verify(ms => ms.Stop());
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyLogMessageOnTestMessageReceived()
-        {
-            var message = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Message1" };
-            this.SetupDeserializeMessage(MessageType.TestMessage, message);
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestShouldNotifyLogMessageOnTestMessageReceived()
+    {
+        var message = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Message1" };
+        SetupDeserializeMessage(MessageType.TestMessage, message);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, "Message1"));
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, "Message1"));
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyLogMessageIfExceptionThrownOnMessageReceived()
-        {
-            this.SetupExceptionOnMessageReceived();
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestShouldNotifyLogMessageIfExceptionThrownOnMessageReceived()
+    {
+        SetupExceptionOnMessageReceived();
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Message"))));
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedMessage"), Times.Once);
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Message"))));
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedMessage"), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyDiscoveryCompleteIfExceptionThrownOnMessageReceived()
-        {
-            this.SetupExceptionOnMessageReceived();
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void DiscoverTestShouldNotifyDiscoveryCompleteIfExceptionThrownOnMessageReceived()
+    {
+        SetupExceptionOnMessageReceived();
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == true && dc.TotalCount == -1), null));
-        }
+        RaiseMessageReceivedEvent();
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == true && dc.TotalCount == -1), null));
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotAbortDiscoveryIfClientDisconnectedAndOperationIsComplete()
-        {
-            var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
-            this.SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
-            this.RaiseMessageReceivedEvent();   // Raise discovery complete
+    [TestMethod]
+    public void DiscoverTestsShouldNotAbortDiscoveryIfClientDisconnectedAndOperationIsComplete()
+    {
+        var completePayload = new DiscoveryCompletePayload { TotalTests = 10, IsAborted = false };
+        SetupDeserializeMessage(MessageType.DiscoveryComplete, completePayload);
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
+        RaiseMessageReceivedEvent();   // Raise discovery complete
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Never);
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(-1, true), null), Times.Never);
-        }
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Never);
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(-1, true), null), Times.Never);
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyLogMessageIfClientDisconnected()
-        {
-            // Expect default error message since we've not set any client exit message
-            var expectedErrorMessage = "Reason: Unable to communicate";
-            this.SetupFakeCommunicationChannel();
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message.Contains(expectedErrorMessage))))
-                .Returns("Serialized error");
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void DiscoverTestShouldNotifyLogMessageIfClientDisconnected()
+    {
+        // Expect default error message since we've not set any client exit message
+        var expectedErrorMessage = "Reason: Unable to communicate";
+        SetupFakeCommunicationChannel();
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message!.Contains(expectedErrorMessage))))
+            .Returns("Serialized error");
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))));
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage(It.Is<string>(s => !string.IsNullOrEmpty(s) && s.Equals("Serialized error"))), Times.Once);
-        }
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))));
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage(It.Is<string>(s => !string.IsNullOrEmpty(s) && s.Equals("Serialized error"))), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyLogMessageIfClientDisconnectedWithClientExit()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message.Contains("Dummy Stderr"))))
-                .Returns("Serialized Stderr");
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
-            this.testRequestSender.OnClientProcessExit("Dummy Stderr");
+    [TestMethod]
+    public void DiscoverTestShouldNotifyLogMessageIfClientDisconnectedWithClientExit()
+    {
+        SetupFakeCommunicationChannel();
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message!.Contains("Dummy Stderr"))))
+            .Returns("Serialized Stderr");
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
+        _testRequestSender.OnClientProcessExit("Dummy Stderr");
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Stderr"))), Times.Once);
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage(It.Is<string>(s => !string.IsNullOrEmpty(s) && s.Equals("Serialized Stderr"))), Times.Once);
-        }
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Stderr"))), Times.Once);
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleRawMessage(It.Is<string>(s => !string.IsNullOrEmpty(s) && s.Equals("Serialized Stderr"))), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestShouldNotifyDiscoveryCompleteIfClientDisconnected()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.DiscoverTests(new DiscoveryCriteria(), this.mockDiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void DiscoverTestShouldNotifyDiscoveryCompleteIfClientDisconnectedBeforeDiscovery()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == true && dc.TotalCount == -1), null));
-        }
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-        #endregion
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == true && dc.TotalCount == -1), null));
+    }
 
-        #region Execution Protocol Tests
+    [TestMethod]
+    public void DiscoverTestShouldNotifyDiscoveryCompleteIfClientDisconnected()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.DiscoverTests(new DiscoveryCriteria(), _mockDiscoveryEventsHandler.Object);
 
-        [TestMethod]
-        public void InitializeExecutionShouldSendCommunicationMessageWithCorrectParameters()
-        {
-            this.SetupFakeCommunicationChannel();
+        RaiseClientDisconnectedEvent();
 
-            this.testRequestSender.InitializeExecution(this.pathToAdditionalExtensions);
+        _mockDiscoveryEventsHandler.Verify(eh => eh.HandleDiscoveryComplete(It.Is<DiscoveryCompleteEventArgs>(dc => dc.IsAborted == true && dc.TotalCount == -1), null));
+    }
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.ExecutionInitialize, this.pathToAdditionalExtensions, 1), Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+    #endregion
 
-        [TestMethod]
-        public void InitializeExecutionShouldSendCommunicationMessageWithCorrectParametersWithVersion()
-        {
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
+    #region Execution Protocol Tests
 
-            this.testRequestSender.InitializeExecution(this.pathToAdditionalExtensions);
+    [TestMethod]
+    public void InitializeExecutionShouldSendCommunicationMessageWithCorrectParameters()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.ExecutionInitialize, this.pathToAdditionalExtensions, DUMMYNEGOTIATEDPROTOCOLVERSION), Times.Once);
-        }
+        _testRequestSender.InitializeExecution(_pathToAdditionalExtensions);
 
-        [TestMethod]
-        public void StartTestRunShouldSendStartTestExecutionWithSourcesOnChannel()
-        {
-            this.SetupFakeCommunicationChannel();
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.ExecutionInitialize, _pathToAdditionalExtensions, 1), Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void InitializeExecutionShouldSendCommunicationMessageWithCorrectParametersWithVersion()
+    {
+        SetupFakeChannelWithVersionNegotiation();
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithSources, this.testRunCriteriaWithSources, DEFAULTPROTOCOLVERSION), Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+        _testRequestSender.InitializeExecution(_pathToAdditionalExtensions);
 
-        [TestMethod]
-        public void StartTestRunShouldSendStartTestExecutionWithSourcesOnChannelWithVersion()
-        {
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.ExecutionInitialize, _pathToAdditionalExtensions, Dummynegotiatedprotocolversion), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldSendStartTestExecutionWithSourcesOnChannel()
+    {
+        SetupFakeCommunicationChannel();
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithSources, this.testRunCriteriaWithSources, DUMMYNEGOTIATEDPROTOCOLVERSION), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunWithTestsShouldSendStartTestExecutionWithTestsOnChannel()
-        {
-            var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null);
-            this.SetupFakeCommunicationChannel();
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithSources, _testRunCriteriaWithSources, Defaultprotocolversion), Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(runCriteria, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldSendStartTestExecutionWithSourcesOnChannelWithVersion()
+    {
+        SetupFakeChannelWithVersionNegotiation();
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithTests, runCriteria, DEFAULTPROTOCOLVERSION), Times.Once);
-            this.mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunWithTestsShouldSendStartTestExecutionWithTestsOnChannelWithVersion()
-        {
-            var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null);
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithSources, _testRunCriteriaWithSources, Dummynegotiatedprotocolversion), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(runCriteria, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunWithTestsShouldSendStartTestExecutionWithTestsOnChannel()
+    {
+        var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null!);
+        SetupFakeCommunicationChannel();
 
-            this.mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithTests, runCriteria, DUMMYNEGOTIATEDPROTOCOLVERSION), Times.Once);
-        }
+        _testRequestSender.StartTestRun(runCriteria, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyRawMessageOnMessageReceived()
-        {
-            this.SetupDeserializeMessage(MessageType.TestMessage, new TestMessagePayload());
-            this.SetupFakeCommunicationChannel();
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithTests, runCriteria, Defaultprotocolversion), Times.Once);
+        _mockChannel.Verify(mc => mc.Send(It.IsAny<string>()), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunWithTestsShouldSendStartTestExecutionWithTestsOnChannelWithVersion()
+    {
+        var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null!);
+        SetupFakeChannelWithVersionNegotiation();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("DummyData"), Times.Once);
-        }
+        _testRequestSender.StartTestRun(runCriteria, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyTestRunStatsChangeOnRunStatsMessageReceived()
-        {
-            var testRunChangedArgs = new TestRunChangedEventArgs(
-                null,
-                new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult[2],
-                new TestCase[2]);
-            this.SetupDeserializeMessage(MessageType.TestRunStatsChange, testRunChangedArgs);
-            this.SetupFakeCommunicationChannel();
+        _mockDataSerializer.Verify(d => d.SerializePayload(MessageType.StartTestExecutionWithTests, runCriteria, Dummynegotiatedprotocolversion), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyRawMessageOnMessageReceived()
+    {
+        SetupDeserializeMessage(MessageType.TestMessage, new TestMessagePayload());
+        SetupFakeCommunicationChannel();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunStatsChange(testRunChangedArgs), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyExecutionCompleteOnRunCompleteMessageReceived()
-        {
-            var testRunCompletePayload = new TestRunCompletePayload
-            {
-                TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.MaxValue),
-                LastRunTests = new TestRunChangedEventArgs(null, null, null),
-                RunAttachments = new List<AttachmentSet>()
-            };
-            this.SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
-            this.SetupFakeCommunicationChannel();
-
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
-
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(
-                eh => eh.HandleTestRunComplete(
-                    testRunCompletePayload.TestRunCompleteArgs,
-                    testRunCompletePayload.LastRunTests,
-                    testRunCompletePayload.RunAttachments,
-                    It.IsAny<ICollection<string>>()),
-                Times.Once);
-        }
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("DummyData"), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldStopServerOnRunCompleteMessageReceived()
-        {
-            var testRunCompletePayload = new TestRunCompletePayload
-            {
-                TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.MaxValue),
-                LastRunTests = new TestRunChangedEventArgs(null, null, null),
-                RunAttachments = new List<AttachmentSet>()
-            };
-            this.SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void StartTestRunShouldNotifyTestRunStatsChangeOnRunStatsMessageReceived()
+    {
+        var testRunChangedArgs = new TestRunChangedEventArgs(
+            null,
+            new VisualStudio.TestPlatform.ObjectModel.TestResult[2],
+            new TestCase[2]);
+        SetupDeserializeMessage(MessageType.TestRunStatsChange, testRunChangedArgs);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunStatsChange(testRunChangedArgs), Times.Once);
+    }
 
-            this.mockServer.Verify(ms => ms.Stop());
-        }
+    [TestMethod]
+    public void StartTestRunShouldNotifyExecutionCompleteOnRunCompleteMessageReceived()
+    {
+        var testRunCompletePayload = new TestRunCompletePayload
+        {
+            TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.MaxValue),
+            LastRunTests = new TestRunChangedEventArgs(null, null, null),
+            RunAttachments = new List<AttachmentSet>()
+        };
+        SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
+        SetupFakeCommunicationChannel();
+
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
+
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(
+            eh => eh.HandleTestRunComplete(
+                testRunCompletePayload.TestRunCompleteArgs,
+                testRunCompletePayload.LastRunTests,
+                testRunCompletePayload.RunAttachments,
+                It.IsAny<ICollection<string>>()),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyLogMessageOnTestMessageReceived()
+    [TestMethod]
+    public void StartTestRunShouldStopServerOnRunCompleteMessageReceived()
+    {
+        var testRunCompletePayload = new TestRunCompletePayload
         {
-            var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Dummy" };
-            this.SetupDeserializeMessage(MessageType.TestMessage, testMessagePayload);
-            this.SetupFakeCommunicationChannel();
+            TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.MaxValue),
+            LastRunTests = new TestRunChangedEventArgs(null, null, null),
+            RunAttachments = new List<AttachmentSet>()
+        };
+        SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, "Dummy"), Times.Once);
-        }
+        RaiseMessageReceivedEvent();
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyLaunchWithDebuggerOnMessageReceived()
-        {
-            var launchMessagePayload = new TestProcessStartInfo();
-            this.SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
-            this.SetupFakeCommunicationChannel();
+        _mockServer.Verify(ms => ms.Stop());
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyLogMessageOnTestMessageReceived()
+    {
+        var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Dummy" };
+        SetupDeserializeMessage(MessageType.TestMessage, testMessagePayload);
+        SetupFakeCommunicationChannel();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.LaunchProcessWithDebuggerAttached(launchMessagePayload), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldSendLaunchDebuggerAttachedCallbackOnMessageReceived()
-        {
-            var launchMessagePayload = new TestProcessStartInfo();
-            this.SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
-            this.SetupFakeCommunicationChannel();
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, "Dummy"), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyLaunchWithDebuggerOnMessageReceived()
+    {
+        var launchMessagePayload = new TestProcessStartInfo();
+        SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
+        SetupFakeCommunicationChannel();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, It.IsAny<int>(), 1), Times.Once);
-            this.mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.AtLeastOnce);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldSendLaunchDebuggerAttachedCallbackOnMessageReceivedWithVersion()
-        {
-            var launchMessagePayload = new TestProcessStartInfo();
-            this.SetupFakeChannelWithVersionNegotiation(DUMMYNEGOTIATEDPROTOCOLVERSION);
-            this.SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.LaunchProcessWithDebuggerAttached(launchMessagePayload), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldSendLaunchDebuggerAttachedCallbackOnMessageReceived()
+    {
+        var launchMessagePayload = new TestProcessStartInfo();
+        SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
+        SetupFakeCommunicationChannel();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, It.IsAny<int>(), DUMMYNEGOTIATEDPROTOCOLVERSION), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyLogMessageIfExceptionIsThrownOnMessageReceived()
-        {
-            this.SetupExceptionOnMessageReceived();
-            this.SetupFakeCommunicationChannel();
+        RaiseMessageReceivedEvent();
+        _mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, It.IsAny<int>(), 1), Times.Once);
+        _mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.AtLeastOnce);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldSendLaunchDebuggerAttachedCallbackOnMessageReceivedWithVersion()
+    {
+        var launchMessagePayload = new TestProcessStartInfo();
+        SetupFakeChannelWithVersionNegotiation();
+        SetupDeserializeMessage(MessageType.LaunchAdapterProcessWithDebuggerAttached, launchMessagePayload);
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Message"))), Times.Once);
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedMessage"), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyExecutionCompleteIfExceptionIsThrownOnMessageReceived()
-        {
-            this.SetupExceptionOnMessageReceived();
-            this.SetupFakeCommunicationChannel();
+        RaiseMessageReceivedEvent();
+        _mockDataSerializer.Verify(ds => ds.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, It.IsAny<int>(), Dummynegotiatedprotocolversion), Times.Once);
+    }
 
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyLogMessageIfExceptionIsThrownOnMessageReceived()
+    {
+        SetupExceptionOnMessageReceived();
+        SetupFakeCommunicationChannel();
 
-            this.RaiseMessageReceivedEvent();
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotNotifyExecutionCompleteIfClientDisconnectedAndOperationComplete()
-        {
-            var testRunCompletePayload = new TestRunCompletePayload
-            {
-                TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.MaxValue),
-                LastRunTests = new TestRunChangedEventArgs(null, null, null),
-                RunAttachments = new List<AttachmentSet>()
-            };
-            this.SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
-            this.RaiseMessageReceivedEvent();   // Raise test run complete
-
-            this.RaiseClientDisconnectedEvent();
-
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Never);
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Never);
-        }
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains("Dummy Message"))), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedMessage"), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyErrorLogMessageIfClientDisconnected()
-        {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyExecutionCompleteIfExceptionIsThrownOnMessageReceived()
+    {
+        SetupExceptionOnMessageReceived();
+        SetupFakeCommunicationChannel();
 
-            this.RaiseClientDisconnectedEvent();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-            // Expect default error message since we've not set any client exit message
-            var expectedErrorMessage = "Reason: Unable to communicate";
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))), Times.Once);
-        }
+        RaiseMessageReceivedEvent();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyErrorLogMessageIfClientDisconnectedWithClientExit()
+    [TestMethod]
+    public void StartTestRunShouldNotNotifyExecutionCompleteIfClientDisconnectedAndOperationComplete()
+    {
+        var testRunCompletePayload = new TestRunCompletePayload
         {
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
-            this.testRequestSender.OnClientProcessExit("Dummy Stderr");
+            TestRunCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.MaxValue),
+            LastRunTests = new TestRunChangedEventArgs(null, null, null),
+            RunAttachments = new List<AttachmentSet>()
+        };
+        SetupDeserializeMessage(MessageType.ExecutionComplete, testRunCompletePayload);
+        SetupFakeCommunicationChannel();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
+        RaiseMessageReceivedEvent();   // Raise test run complete
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            var expectedErrorMessage = "Reason: Test host process crashed : Dummy Stderr";
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))), Times.Once);
-        }
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Never);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Never);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotifyExecutionCompleteIfClientDisconnected()
-        {
-            this.SetupOperationAbortedPayload();
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.StartTestRun(this.testRunCriteriaWithSources, this.mockExecutionEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotifyErrorLogMessageIfClientDisconnected()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-            this.RaiseClientDisconnectedEvent();
+        RaiseClientDisconnectedEvent();
 
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
-            this.mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
-        }
+        // Expect default error message since we've not set any client exit message
+        var expectedErrorMessage = "Reason: Unable to communicate";
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))), Times.Once);
+    }
 
-        [TestMethod]
-        public void SendTestRunCancelShouldSendCancelTestRunMessage()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void StartTestRunShouldNotifyErrorLogMessageIfClientDisconnectedWithClientExit()
+    {
+        SetupFakeCommunicationChannel();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
+        _testRequestSender.OnClientProcessExit("Dummy Stderr");
 
-            this.testRequestSender.SendTestRunCancel();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.CancelTestRun), Times.Once);
-            this.mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
-        }
+        var expectedErrorMessage = "Reason: Test host process crashed : Dummy Stderr";
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.Contains(expectedErrorMessage))), Times.Once);
+    }
 
-        [TestMethod]
-        public void SendTestRunAbortShouldSendAbortTestRunMessage()
-        {
-            this.SetupFakeCommunicationChannel();
+    [TestMethod]
+    public void StartTestRunShouldNotifyExecutionCompleteIfClientDisconnectedBeforeRun()
+    {
+        SetupOperationAbortedPayload();
+        SetupFakeCommunicationChannel();
 
-            this.testRequestSender.SendTestRunAbort();
+        RaiseClientDisconnectedEvent();
 
-            this.mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.AbortTestRun), Times.Once);
-            this.mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
-        }
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        #endregion
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
+    }
 
-        private string SetupFakeCommunicationChannel(string connectionArgs = "123")
-        {
-            this.connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":" + connectionArgs,
-                Role = ConnectionRole.Client,
-                Transport = Transport.Sockets
-            };
-
-            // Setup mock connected event and initialize communication channel
-            this.mockServer.Setup(mc => mc.Start(this.connectionInfo.Endpoint))
-                .Returns(this.connectionInfo.Endpoint)
-                .Callback(() => this.mockServer.Raise(s => s.Connected += null, this.mockServer.Object, this.connectedEventArgs));
-
-            return this.testRequestSender.InitializeCommunication().ToString();
-        }
+    [TestMethod]
+    public void StartTestRunWithTestsShouldNotifyExecutionCompleteIfClientDisconnectedBeforeRun()
+    {
+        var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null!);
+        SetupOperationAbortedPayload();
+        SetupFakeCommunicationChannel();
 
-        private void SetupFakeChannelWithVersionNegotiation(int protocolVersion)
-        {
-            // Sends a check version message to setup the negotiated protocol version.
-            // This method is only required in specific tests.
-            this.SetupDeserializeMessage(MessageType.VersionCheck, DUMMYNEGOTIATEDPROTOCOLVERSION);
-            this.SetupRaiseMessageReceivedOnCheckVersion();
-            this.SetupFakeCommunicationChannel();
-            this.testRequestSender.CheckVersionWithTestHost();
-            this.ResetRaiseMessageReceivedOnCheckVersion();
-        }
+        RaiseClientDisconnectedEvent();
 
-        private void RaiseMessageReceivedEvent()
-        {
-            this.mockChannel.Raise(
-                c => c.MessageReceived += null,
-                this.mockChannel.Object,
-                new MessageReceivedEventArgs { Data = "DummyData" });
-        }
+        _testRequestSender.StartTestRun(runCriteria, _mockExecutionEventsHandler.Object);
 
-        private void RaiseClientDisconnectedEvent()
-        {
-            this.mockServer.Raise(
-                s => s.Disconnected += null,
-                this.mockServer.Object,
-                new DisconnectedEventArgs { Error = new Exception("Dummy Message") });
-        }
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
+    }
 
-        private void SetupDeserializeMessage<TPayload>(string messageType, TPayload payload)
-        {
-            this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message { MessageType = messageType });
-            this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.IsAny<Message>()))
-                .Returns(payload);
-        }
+    [TestMethod]
+    public async Task StartTestRunWithTestsShouldNotifyExecutionCompleteIfClientDisconnectedBeforeRunInAThreadSafeWay()
+    {
+        var runCriteria = new TestRunCriteriaWithTests(new TestCase[2], "runsettings", null, null!);
+        SetupOperationAbortedPayload();
+        SetupFakeCommunicationChannel();
 
-        private void SetupExceptionMessageSerialize()
-        {
-            // Serialize the exception message
-            this.mockDataSerializer
-                .Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message.Contains("Dummy Message"))))
-                .Returns("SerializedMessage");
-        }
+        // Note: Even if the calls get invoked on separate threads, the request sender should send back the complete message just once.
+        var t1 = Task.Run(RaiseClientDisconnectedEvent);
+        var t2 = Task.Run(() => _testRequestSender.StartTestRun(runCriteria, _mockExecutionEventsHandler.Object));
 
-        private void SetupOperationAbortedPayload()
-        {
-            // Serialize the execution aborted
-            this.mockDataSerializer
-                .Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.Is<TestRunCompletePayload>(p => p.TestRunCompleteArgs.IsAborted)))
-                .Returns("SerializedAbortedPayload");
-        }
+        await Task.WhenAll(t1, t2);
 
-        private void SetupExceptionOnMessageReceived()
-        {
-            this.SetupExceptionMessageSerialize();
-            this.SetupOperationAbortedPayload();
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
+    }
 
-            this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>()))
-                .Callback(() => throw new Exception("Dummy Message"));
-        }
+    [TestMethod]
+    public void StartTestRunShouldNotifyExecutionCompleteIfClientDisconnected()
+    {
+        SetupOperationAbortedPayload();
+        SetupFakeCommunicationChannel();
+        _testRequestSender.StartTestRun(_testRunCriteriaWithSources, _mockExecutionEventsHandler.Object);
 
-        private void SetupRaiseMessageReceivedOnCheckVersion()
-        {
-            this.mockChannel.Setup(mc => mc.Send(It.IsAny<string>())).Callback(this.RaiseMessageReceivedEvent);
-        }
+        RaiseClientDisconnectedEvent();
+
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted), null, null, null), Times.Once);
+        _mockExecutionEventsHandler.Verify(eh => eh.HandleRawMessage("SerializedAbortedPayload"), Times.Once);
+    }
+
+    [TestMethod]
+    public void SendTestRunCancelShouldSendCancelTestRunMessage()
+    {
+        SetupFakeCommunicationChannel();
+
+        _testRequestSender.SendTestRunCancel();
+
+        _mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.CancelTestRun), Times.Once);
+        _mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void SendTestRunAbortShouldSendAbortTestRunMessage()
+    {
+        SetupFakeCommunicationChannel();
+
+        _testRequestSender.SendTestRunAbort();
 
-        private void ResetRaiseMessageReceivedOnCheckVersion()
+        _mockDataSerializer.Verify(ds => ds.SerializeMessage(MessageType.AbortTestRun), Times.Once);
+        _mockChannel.Verify(c => c.Send(It.IsAny<string>()), Times.Once);
+    }
+
+    #endregion
+
+    private string SetupFakeCommunicationChannel(string connectionArgs = "123")
+    {
+        _connectionInfo = new TestHostConnectionInfo
         {
-            this.mockChannel.Reset();
-        }
+            Endpoint = IPAddress.Loopback + ":" + connectionArgs,
+            Role = ConnectionRole.Client,
+            Transport = Transport.Sockets
+        };
 
-        private class TestableTestRequestSender : TestRequestSender
+        // Setup mock connected event and initialize communication channel
+        _mockServer.Setup(mc => mc.Start(_connectionInfo.Endpoint))
+            .Returns(_connectionInfo.Endpoint)
+            .Callback(() => _mockServer.Raise(s => s.Connected += null, _mockServer.Object, _connectedEventArgs));
+
+        return _testRequestSender.InitializeCommunication().ToString(CultureInfo.CurrentCulture);
+    }
+
+    private void SetupFakeChannelWithVersionNegotiation()
+    {
+        // Sends a check version message to setup the negotiated protocol version.
+        // This method is only required in specific tests.
+        SetupDeserializeMessage(MessageType.VersionCheck, Dummynegotiatedprotocolversion);
+        SetupRaiseMessageReceivedOnCheckVersion();
+        SetupFakeCommunicationChannel();
+        _testRequestSender.CheckVersionWithTestHost();
+        ResetRaiseMessageReceivedOnCheckVersion();
+
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
+    }
+
+    private void RaiseMessageReceivedEvent()
+    {
+        var eventArgs = new MessageReceivedEventArgs { Data = "DummyData" };
+        _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object, eventArgs, "TestRequestSenderTests.RaiseMessageReceivedEvent()");
+    }
+
+    private void RaiseClientDisconnectedEvent()
+    {
+        _mockServer.Raise(
+            s => s.Disconnected += null,
+            _mockServer.Object,
+            new DisconnectedEventArgs { Error = new Exception("Dummy Message") });
+    }
+
+    private void SetupDeserializeMessage<TPayload>(string messageType, TPayload payload)
+    {
+        _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message { MessageType = messageType });
+        _mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.IsAny<Message>()))
+            .Returns(payload);
+    }
+
+    private void SetupExceptionMessageSerialize()
+    {
+        // Serialize the exception message
+        _mockDataSerializer
+            .Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.Is<TestMessagePayload>(p => p.Message!.Contains("Dummy Message"))))
+            .Returns("SerializedMessage");
+    }
+
+    private void SetupOperationAbortedPayload()
+    {
+        // Serialize the execution aborted
+        _mockDataSerializer
+            .Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.Is<TestRunCompletePayload>(p => p.TestRunCompleteArgs!.IsAborted)))
+            .Returns("SerializedAbortedPayload");
+    }
+
+    private void SetupExceptionOnMessageReceived()
+    {
+        SetupExceptionMessageSerialize();
+        SetupOperationAbortedPayload();
+
+        _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>()))
+            .Callback(() => throw new Exception("Dummy Message"));
+    }
+
+    private void SetupRaiseMessageReceivedOnCheckVersion()
+    {
+        _mockChannel.Setup(mc => mc.Send(It.IsAny<string>())).Callback(RaiseMessageReceivedEvent);
+    }
+
+    private void ResetRaiseMessageReceivedOnCheckVersion()
+    {
+        _mockChannel.Reset();
+    }
+
+    private class TestableTestRequestSender : TestRequestSender
+    {
+        public TestableTestRequestSender(ICommunicationEndPoint commEndpoint, TestHostConnectionInfo connectionInfo, IDataSerializer serializer, ProtocolConfig protocolConfig)
+            : base(commEndpoint, connectionInfo, serializer, protocolConfig, 0)
         {
-            public TestableTestRequestSender(ICommunicationEndPoint commEndpoint, TestHostConnectionInfo connectionInfo, IDataSerializer serializer, ProtocolConfig protocolConfig)
-                : base(commEndpoint, connectionInfo, serializer, protocolConfig, 0)
-            {
-            }
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/FeatureFlag/FeatureFlagTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/FeatureFlag/FeatureFlagTests.cs
new file mode 100644
index 0000000000..0ed6cce62a
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/FeatureFlag/FeatureFlagTests.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests;
+
+[TestClass]
+public class FeatureFlagTests
+{
+    [TestMethod]
+    public void SingletonAlwaysReturnsTheSameInstance()
+    {
+        Assert.IsTrue(ReferenceEquals(FeatureFlag.Instance, FeatureFlag.Instance));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/CommandLineArgumentsHelperTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/CommandLineArgumentsHelperTests.cs
index d8b7e460f5..1b7ec113d6 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/CommandLineArgumentsHelperTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/CommandLineArgumentsHelperTests.cs
@@ -1,143 +1,142 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers;
+
+[TestClass]
+public class CommandLineArgumentsHelperTests
 {
-    using System.Collections.Generic;
+    [TestMethod]
+    public void GetArgumentsDictionaryShouldReturnDictionary()
+    {
+        var args = new List<string>() { "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        Assert.AreEqual("12312", argsDictionary["--port"]);
+        Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
+        Assert.AreEqual(@"C:\temp\1.dll", argsDictionary["--testsourcepath"]);
+    }
+
+    [TestMethod]
+    public void GetArgumentsDictionaryShouldIgnoreValuesWithoutPreceedingHypen()
+    {
+        var args = new List<string>() { "port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        Assert.IsTrue(argsDictionary.Count == 2);
+        Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
+        Assert.AreEqual(@"C:\temp\1.dll", argsDictionary["--testsourcepath"]);
+
+        args = ["--port", "12312", "--parentprocessid", "2312", "testsourcepath", @"C:\temp\1.dll"];
+        argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        Assert.IsTrue(argsDictionary.Count == 2);
+        Assert.AreEqual("12312", argsDictionary["--port"]);
+        Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
+    }
+
+    [TestMethod]
+    public void GetStringArgFromDictShouldReturnStringValueOrEmpty()
+    {
+        var args = new List<string>() { "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        string? data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--port");
+        Assert.AreEqual("12312", data);
+    }
+
+    [TestMethod]
+    public void GetStringArgFromDictShouldReturnNullIfValueIsNotPresent()
+    {
+        var args = new List<string>() { "--hello", "--world" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        string? data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--hello");
+
+        Assert.IsTrue(argsDictionary.Count == 2);
+        Assert.IsNull(data);
+    }
+
+    [TestMethod]
+    public void GetStringArgFromDictShouldReturnEmptyStringIfKeyIsNotPresent()
+    {
+        var args = new List<string>() { "--hello", "--world" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        string? data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--port");
 
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+        Assert.IsTrue(argsDictionary.Count == 2);
+        Assert.AreEqual(string.Empty, data);
+    }
 
-    [TestClass]
-    public class CommandLineArgumentsHelperTests
+    [TestMethod]
+    public void GetArgumentsDictionaryShouldReturnEmptyDictionaryIfEmptyArgIsPassed()
     {
-        [TestMethod]
-        public void GetArgumentsDictionaryShouldReturnDictionary()
-        {
-            var args = new List<string>() { "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            Assert.AreEqual("12312", argsDictionary["--port"]);
-            Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
-            Assert.AreEqual(@"C:\temp\1.dll", argsDictionary["--testsourcepath"]);
-        }
-
-        [TestMethod]
-        public void GetArgumentsDictionaryShouldIgnoreValuesWithoutPreceedingHypen()
-        {
-            var args = new List<string>() { "port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            Assert.IsTrue(argsDictionary.Count == 2);
-            Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
-            Assert.AreEqual(@"C:\temp\1.dll", argsDictionary["--testsourcepath"]);
-
-            args = new List<string>() { "--port", "12312", "--parentprocessid", "2312", "testsourcepath", @"C:\temp\1.dll" };
-            argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            Assert.IsTrue(argsDictionary.Count == 2);
-            Assert.AreEqual("12312", argsDictionary["--port"]);
-            Assert.AreEqual("2312", argsDictionary["--parentprocessid"]);
-        }
-
-        [TestMethod]
-        public void GetStringArgFromDictShouldReturnStringValueOrEmpty()
-        {
-            var args = new List<string>() { "--port", "12312", "--parentprocessid", "2312", "--testsourcepath", @"C:\temp\1.dll" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            string data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--port");
-            Assert.AreEqual("12312", data);
-        }
-
-        [TestMethod]
-        public void GetStringArgFromDictShouldReturnNullIfValueIsNotPresent()
-        {
-            var args = new List<string>() { "--hello", "--world" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            string data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--hello");
-
-            Assert.IsTrue(argsDictionary.Count == 2);
-            Assert.IsNull(data);
-        }
-
-        [TestMethod]
-        public void GetStringArgFromDictShouldReturnEmptyStringIfKeyIsNotPresent()
-        {
-            var args = new List<string>() { "--hello", "--world" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            string data = CommandLineArgumentsHelper.GetStringArgFromDict(argsDictionary, "--port");
-
-            Assert.IsTrue(argsDictionary.Count == 2);
-            Assert.AreEqual(string.Empty, data);
-        }
-
-        [TestMethod]
-        public void GetArgumentsDictionaryShouldReturnEmptyDictionaryIfEmptyArgIsPassed()
-        {
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(null);
-            Assert.IsTrue(argsDictionary.Count == 0);
-
-            argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(new string[] { });
-            Assert.IsTrue(argsDictionary.Count == 0);
-        }
-
-        [TestMethod]
-        public void GetArgumentsDictionaryShouldTreatValueAsNullIfTwoConsecutiveKeysArePassed()
-        {
-            var args = new List<string>() { "--hello", "--world" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            Assert.IsTrue(argsDictionary.Count == 2);
-            Assert.IsNull(argsDictionary["--hello"]);
-            Assert.IsNull(argsDictionary["--world"]);
-        }
-
-        [TestMethod]
-        public void GetIntArgFromDictShouldReturnZeroIfKeyIsNotPresent()
-        {
-            var args = new List<string>() { "--hello", "--world" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            int data = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
-
-            Assert.AreEqual(0, data);
-        }
-
-        [TestMethod]
-        public void GetIntArgFromDictShouldReturnTheValueIfKeyIsPresent()
-        {
-            var args = new List<string>() { "--port", "1000" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            int data = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
-
-            Assert.AreEqual(1000, data);
-        }
-
-        [TestMethod]
-        public void TryGetIntArgFromDictShouldReturnTrueIfKeyIsPresentAndTheValue()
-        {
-            var args = new List<string>() { "--port", "59870" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            bool found = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, "--port", out var data);
-
-            Assert.IsTrue(found);
-            Assert.AreEqual(59870, data);
-        }
-
-        [TestMethod]
-        public void TryGetIntArgFromDictShouldReturnFalseIfKeyIsNotPresent()
-        {
-            var args = new List<string>() { "--hello", "--world" };
-            var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
-
-            bool found = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, "--port", out var data);
-
-            Assert.IsFalse(found);
-        }
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(null);
+        Assert.IsTrue(argsDictionary.Count == 0);
+
+        argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary([]);
+        Assert.IsTrue(argsDictionary.Count == 0);
+    }
+
+    [TestMethod]
+    public void GetArgumentsDictionaryShouldTreatValueAsNullIfTwoConsecutiveKeysArePassed()
+    {
+        var args = new List<string>() { "--hello", "--world" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        Assert.IsTrue(argsDictionary.Count == 2);
+        Assert.IsNull(argsDictionary["--hello"]);
+        Assert.IsNull(argsDictionary["--world"]);
+    }
+
+    [TestMethod]
+    public void GetIntArgFromDictShouldReturnZeroIfKeyIsNotPresent()
+    {
+        var args = new List<string>() { "--hello", "--world" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        int data = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
+
+        Assert.AreEqual(0, data);
+    }
+
+    [TestMethod]
+    public void GetIntArgFromDictShouldReturnTheValueIfKeyIsPresent()
+    {
+        var args = new List<string>() { "--port", "1000" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        int data = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, "--port");
+
+        Assert.AreEqual(1000, data);
+    }
+
+    [TestMethod]
+    public void TryGetIntArgFromDictShouldReturnTrueIfKeyIsPresentAndTheValue()
+    {
+        var args = new List<string>() { "--port", "59870" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+
+        bool found = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, "--port", out var data);
+
+        Assert.IsTrue(found);
+        Assert.AreEqual(59870, data);
+    }
+
+    [TestMethod]
+    public void TryGetIntArgFromDictShouldReturnFalseIfKeyIsNotPresent()
+    {
+        var args = new List<string>() { "--hello", "--world" };
+        var argsDictionary = CommandLineArgumentsHelper.GetArgumentsDictionary(args.ToArray());
+        bool found = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, "--port", out _);
+
+        Assert.IsFalse(found);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/DotnetHostHelperTest.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/DotnetHostHelperTest.cs
index 10e27fa429..39ca505872 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/DotnetHostHelperTest.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/DotnetHostHelperTest.cs
@@ -1,353 +1,525 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Win32;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers;
+
+[TestClass]
+public sealed class DotnetHostHelperTest : IDisposable
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Text;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.Win32;
-    using Moq;
-
-    [TestClass]
-    public class DotnetHostHelperTest : IDisposable
+    private readonly Mock<IFileHelper> _fileHelper = new();
+    private readonly Mock<IProcessHelper> _processHelper = new();
+    private readonly Mock<IEnvironment> _environmentHelper = new();
+    private readonly Mock<IWindowsRegistryHelper> _windowsRegistrytHelper = new();
+    private readonly Mock<IEnvironmentVariableHelper> _environmentVariableHelper = new();
+    private readonly MockMuxerHelper _muxerHelper = new();
+
+    [TestMethod]
+    public void GetDotnetPathByArchitecture_SameArchitecture()
     {
-        private readonly Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
-        private readonly Mock<IProcessHelper> processHelper = new Mock<IProcessHelper>();
-        private readonly Mock<IEnvironment> environmentHelper = new Mock<IEnvironment>();
-        private readonly Mock<IWindowsRegistryHelper> windowsRegistrytHelper = new Mock<IWindowsRegistryHelper>();
-        private readonly Mock<IEnvironmentVariableHelper> environmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
-        private readonly MockMuxerHelper muxerHelper = new MockMuxerHelper();
-
-        [TestMethod]
-        public void GetDotnetPathByArchitecture_SameArchitecture()
+        // Arrange
+        string finalMuxerPath = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X64);
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        _environmentHelper.SetupGet(x => x.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        _environmentHelper.SetupGet(x => x.Architecture).Returns(PlatformArchitecture.X64);
+        _processHelper.Setup(x => x.GetCurrentProcessFileName()).Returns(finalMuxerPath);
+        _processHelper.Setup(x => x.GetCurrentProcessArchitecture()).Returns(PlatformArchitecture.X64);
+
+        // Act & Assert
+        Assert.IsTrue(dotnetHostHelper.TryGetDotnetPathByArchitecture(PlatformArchitecture.X64, DotnetMuxerResolutionStrategy.Default, out string? muxerPath));
+        Assert.AreEqual(finalMuxerPath, muxerPath);
+    }
+
+    [DataTestMethod]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)")]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_ARM64")]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_ARM64", true, DotnetMuxerResolutionStrategy.DotnetRootArchitecture)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_X64")]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_X64", true, DotnetMuxerResolutionStrategy.DotnetRootArchitecture)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_ARM64")]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT")]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_ARM64", true, DotnetMuxerResolutionStrategy.DotnetRootArchitecture)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_X64")]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT")]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_X64", true, DotnetMuxerResolutionStrategy.DotnetRootArchitecture)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT", true, DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    public void GetDotnetPathByArchitecture_EnvVars(PlatformArchitecture targetArchitecture,
+        PlatformArchitecture platformArchitecture,
+        PlatformOperatingSystem platformSystem,
+        string envVar,
+        bool found = true,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetRootX64 = _muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.X64);
+        string dotnetRootArm64 = _muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.ARM64);
+        string? dotnetRootX86 = platformSystem == PlatformOperatingSystem.Windows
+            ? _muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.X86)
+            : null;
+        string dotnetRoot = _muxerHelper.RenameMuxerAndReturnPath(platformSystem, targetArchitecture);
+        Dictionary<string, string?> envVars = new()
         {
-            // Arrange
-            string finalMuxerPath = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X64);
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            environmentHelper.SetupGet(x => x.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            environmentHelper.SetupGet(x => x.Architecture).Returns(PlatformArchitecture.X64);
-            processHelper.Setup(x => x.GetCurrentProcessFileName()).Returns(finalMuxerPath);
-
-            // Act & Assert
-            Assert.IsTrue(dotnetHostHelper.TryGetDotnetPathByArchitecture(PlatformArchitecture.X64, out string muxerPath));
-            Assert.AreEqual(finalMuxerPath, muxerPath);
+            { "DOTNET_ROOT_X64", dotnetRootX64 },
+            { "DOTNET_ROOT_ARM64", dotnetRootArm64 },
+            { "DOTNET_ROOT(x86)", dotnetRootX86 },
+            { "DOTNET_ROOT", dotnetRoot },
+        };
+
+        _environmentHelper.SetupGet(x => x.Architecture).Returns(platformArchitecture);
+        _environmentHelper.SetupGet(x => x.OperatingSystem).Returns(platformSystem);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(envVar)).Returns(Path.GetDirectoryName(envVars[envVar])!);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable("ProgramFiles")).Returns("notfound");
+        _fileHelper.Setup(x => x.DirectoryExists(Path.GetDirectoryName(envVars[envVar])!)).Returns(true);
+        _fileHelper.Setup(x => x.Exists(envVars[envVar])).Returns(true);
+        if (found)
+        {
+            _fileHelper.Setup(x => x.GetStream(envVars[envVar]!, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(envVars[envVar]!));
         }
 
-        [DataTestMethod]
-        [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)")]
-        [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+        // Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(found ? envVars[envVar] : null, muxerPath);
+    }
 
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false)]
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_ARM64")]
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+    [DataTestMethod]
+    [DataRow("DOTNET_ROOT_ARM64", "DOTNET_ROOT", PlatformArchitecture.ARM64, PlatformArchitecture.X64)]
+    [DataRow("DOTNET_ROOT(x86)", "DOTNET_ROOT", PlatformArchitecture.X86, PlatformArchitecture.X64)]
+    [DataRow("DOTNET_ROOT_ARM64", "DOTNET_ROOT", PlatformArchitecture.ARM64, PlatformArchitecture.X64, DotnetMuxerResolutionStrategy.DotnetRootArchitecture | DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    [DataRow("DOTNET_ROOT(x86)", "DOTNET_ROOT", PlatformArchitecture.X86, PlatformArchitecture.X64, DotnetMuxerResolutionStrategy.DotnetRootArchitecture | DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess)]
+    public void GetDotnetPathByArchitecture_EnvVars_DirectoryNotExists_TryNext(
+        string notExists,
+        string nextEnv,
+        PlatformArchitecture targetAchitecture,
+        PlatformArchitecture platformArchitecture,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetRootX64 = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X64);
+        string dotnetRootArm64 = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.ARM64);
+        string dotnetRootX86 = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X86);
+        string dotnetRoot = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, targetAchitecture);
+        Dictionary<string, string> envVars = new()
+        {
+            { "DOTNET_ROOT_X64", dotnetRootX64 },
+            { "DOTNET_ROOT_ARM64", dotnetRootArm64 },
+            { "DOTNET_ROOT(x86)", dotnetRootX86 },
+            { "DOTNET_ROOT", dotnetRoot },
+        };
+
+        _environmentHelper.SetupGet(x => x.Architecture).Returns(platformArchitecture);
+        _environmentHelper.SetupGet(x => x.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(notExists)).Returns(Path.GetDirectoryName(envVars[notExists])!);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(nextEnv)).Returns(Path.GetDirectoryName(envVars[nextEnv])!);
+        _fileHelper.Setup(x => x.DirectoryExists(Path.GetDirectoryName(envVars[nextEnv])!)).Returns(true);
+        _fileHelper.Setup(x => x.Exists(envVars[nextEnv])).Returns(true);
+        _fileHelper.Setup(x => x.GetStream(envVars[nextEnv], FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(envVars[nextEnv]));
+
+        //Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.IsTrue(dotnetHostHelper.TryGetDotnetPathByArchitecture(targetAchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(envVars[nextEnv], muxerPath);
+    }
 
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, PlatformOperatingSystem.Windows, "DOTNET_ROOT(x86)", false)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT_X64")]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.Windows, "DOTNET_ROOT")]
+    [DataTestMethod]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, true)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X86, false)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, true, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X86, false, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    public void GetDotnetPathByArchitecture_GlobalInstallation_Windows(
+        PlatformArchitecture muxerArchitecture,
+        PlatformArchitecture targetArchitecture,
+        bool found,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetMuxer = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, muxerArchitecture);
+        Mock<IRegistryKey> installedVersionKey = new();
+        Mock<IRegistryKey> architectureSubKey = new();
+        Mock<IRegistryKey> nativeArchSubKey = new();
+        installedVersionKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(architectureSubKey.Object);
+        architectureSubKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(nativeArchSubKey.Object);
+        nativeArchSubKey.Setup(x => x.GetValue(It.IsAny<string>())).Returns(Path.GetDirectoryName(dotnetMuxer)!);
+        _windowsRegistrytHelper.Setup(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32)).Returns(installedVersionKey.Object);
+        _fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
+        _fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
+
+        //Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
+    }
 
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_ARM64")]
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, PlatformOperatingSystem.OSX, "DOTNET_ROOT")]
+    [DataTestMethod]
+    [DataRow(true, false, false, false)]
+    [DataRow(false, true, false, false)]
+    [DataRow(false, false, true, false)]
+    [DataRow(false, false, false, true)]
+    [DataRow(true, false, false, false, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(false, true, false, false, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(false, false, true, false, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(false, false, false, true, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    public void GetDotnetPathByArchitecture_GlobalInstallation_NullSubkeys(
+        bool nullInstalledVersion,
+        bool nullArchitecture,
+        bool nullNative,
+        bool nullInstallLocation,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        Mock<IRegistryKey> installedVersionKey = new();
+        Mock<IRegistryKey> architectureSubKey = new();
+        Mock<IRegistryKey> nativeArchSubKey = new();
+        installedVersionKey.Setup(x => x.OpenSubKey(It.IsAny<string>()))
+            .Returns(nullArchitecture ? null! : architectureSubKey.Object);
+        architectureSubKey.Setup(x => x.OpenSubKey(It.IsAny<string>()))
+            .Returns(nullNative ? null! : nativeArchSubKey.Object);
+        nativeArchSubKey.Setup(x => x.GetValue(It.IsAny<string>()))
+            .Returns(nullInstallLocation ? null! : "");
+        _windowsRegistrytHelper.Setup(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
+            .Returns(nullInstalledVersion ? null! : installedVersionKey.Object);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable("ProgramFiles")).Returns("notfound");
+
+        // Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.IsFalse(dotnetHostHelper.TryGetDotnetPathByArchitecture(PlatformArchitecture.X64, strategy, out string? muxerPath));
+    }
 
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT_X64")]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, PlatformOperatingSystem.OSX, "DOTNET_ROOT")]
-        public void GetDotnetPathByArchitecture_EnvVars(PlatformArchitecture targetArchitecture,
-            PlatformArchitecture platformArchitecture,
-            PlatformOperatingSystem platformSystem,
-            string envVar,
-            bool found = true)
+    [DataTestMethod]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.GlobalInstallationLocation)]
+    public void GetDotnetPathByArchitecture_GlobalInstallation_Unix(
+        PlatformArchitecture targetArchitecture,
+        string installLocation,
+        bool found,
+        PlatformOperatingSystem os,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetMuxer = _muxerHelper.RenameMuxerAndReturnPath(os, targetArchitecture);
+        _environmentHelper.SetupGet(x => x.OperatingSystem).Returns(os);
+        _fileHelper.Setup(x => x.Exists(installLocation)).Returns(true);
+        _fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
+        _fileHelper.Setup(x => x.GetStream(installLocation, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer)!)));
+        if (found)
         {
-            // Arrange
-            string DOTNET_ROOT_X64 = muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.X64);
-            string DOTNET_ROOT_ARM64 = muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.ARM64);
-            string DOTNET_ROOT_X86 = null;
-            if (platformSystem == PlatformOperatingSystem.Windows)
-            {
-                DOTNET_ROOT_X86 = muxerHelper.RenameMuxerAndReturnPath(platformSystem, PlatformArchitecture.X86);
-            }
-            string DOTNET_ROOT = muxerHelper.RenameMuxerAndReturnPath(platformSystem, targetArchitecture);
-            Dictionary<string, string> envVars = new Dictionary<string, string>()
-            {
-                { "DOTNET_ROOT_X64" , DOTNET_ROOT_X64},
-                { "DOTNET_ROOT_ARM64" , DOTNET_ROOT_ARM64},
-                { "DOTNET_ROOT(x86)" , DOTNET_ROOT_X86},
-                { "DOTNET_ROOT" , DOTNET_ROOT},
-            };
-
-            environmentHelper.SetupGet(x => x.Architecture).Returns(platformArchitecture);
-            environmentHelper.SetupGet(x => x.OperatingSystem).Returns(platformSystem);
-            environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(envVar)).Returns(Path.GetDirectoryName(envVars[envVar]));
-            environmentVariableHelper.Setup(x => x.GetEnvironmentVariable("ProgramFiles")).Returns("notfound");
-            fileHelper.Setup(x => x.DirectoryExists(Path.GetDirectoryName(envVars[envVar]))).Returns(true);
-            fileHelper.Setup(x => x.Exists(envVars[envVar])).Returns(true);
-            if (found)
-            {
-                fileHelper.Setup(x => x.GetStream(envVars[envVar], FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(envVars[envVar]));
-            }
-
-            // Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, out string muxerPath));
-            Assert.AreEqual(found ? envVars[envVar] : null, muxerPath);
+            _fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
         }
 
-        [DataTestMethod]
-        [DataRow("DOTNET_ROOT_ARM64", "DOTNET_ROOT", PlatformArchitecture.ARM64, PlatformArchitecture.X64)]
-        [DataRow("DOTNET_ROOT(x86)", "DOTNET_ROOT", PlatformArchitecture.X86, PlatformArchitecture.X64)]
-        public void GetDotnetPathByArchitecture_EnvVars_DirectoryNotExists_TryNext(string notExists, string nextEnv, PlatformArchitecture targetAchitecture, PlatformArchitecture platformArchitecture)
-        {
-            // Arrange
-            string DOTNET_ROOT_X64 = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X64);
-            string DOTNET_ROOT_ARM64 = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.ARM64);
-            string DOTNET_ROOT_X86 = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, PlatformArchitecture.X86);
-            string DOTNET_ROOT = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, targetAchitecture);
-            Dictionary<string, string> envVars = new Dictionary<string, string>()
-            {
-                { "DOTNET_ROOT_X64" , DOTNET_ROOT_X64},
-                { "DOTNET_ROOT_ARM64" , DOTNET_ROOT_ARM64},
-                { "DOTNET_ROOT(x86)" , DOTNET_ROOT_X86},
-                { "DOTNET_ROOT" , DOTNET_ROOT},
-            };
-
-            environmentHelper.SetupGet(x => x.Architecture).Returns(platformArchitecture);
-            environmentHelper.SetupGet(x => x.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(notExists)).Returns(Path.GetDirectoryName(envVars[notExists]));
-            environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(nextEnv)).Returns(Path.GetDirectoryName(envVars[nextEnv]));
-            fileHelper.Setup(x => x.DirectoryExists(Path.GetDirectoryName(envVars[nextEnv]))).Returns(true);
-            fileHelper.Setup(x => x.Exists(envVars[nextEnv])).Returns(true);
-            fileHelper.Setup(x => x.GetStream(envVars[nextEnv], FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(envVars[nextEnv]));
-
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.IsTrue(dotnetHostHelper.TryGetDotnetPathByArchitecture(targetAchitecture, out string muxerPath));
-            Assert.AreEqual(envVars[nextEnv], muxerPath);
-        }
+        //Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
+    }
 
-        [DataTestMethod]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, true)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X86, false)]
-        public void GetDotnetPathByArchitecture_GlobalInstallation_Windows(PlatformArchitecture muxerArchitecture, PlatformArchitecture targetArchitecture, bool found)
+    [DataTestMethod]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, "ProgramFiles(x86)", "dotnet", true)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "ProgramFiles", @"dotnet\x64", true)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", true)]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X86, "ProgramFiles", "dotnet", true)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", false)]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, "ProgramFiles(x86)", "dotnet", true, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "ProgramFiles", @"dotnet\x64", true, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", true, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X86, "ProgramFiles", "dotnet", true, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", false, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [TestCategory("Windows")]
+    public void GetDotnetPathByArchitecture_DefaultInstallation_Win(
+        PlatformArchitecture targetArchitecture,
+        PlatformArchitecture platformArchitecture,
+        string envVar,
+        string subfolder,
+        bool found,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetMuxer = _muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, targetArchitecture, subfolder);
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(envVar)).Returns(dotnetMuxer.Replace(Path.Combine(subfolder, "dotnet.exe"), string.Empty));
+        _environmentHelper.Setup(x => x.Architecture).Returns(platformArchitecture);
+        if (found)
         {
-            // Arrange
-            string dotnetMuxer = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, muxerArchitecture);
-            Mock<IRegistryKey> installedVersionKey = new Mock<IRegistryKey>();
-            Mock<IRegistryKey> architectureSubKey = new Mock<IRegistryKey>();
-            Mock<IRegistryKey> nativeArchSubKey = new Mock<IRegistryKey>();
-            installedVersionKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(architectureSubKey.Object);
-            architectureSubKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(nativeArchSubKey.Object);
-            nativeArchSubKey.Setup(x => x.GetValue(It.IsAny<string>())).Returns(Path.GetDirectoryName(dotnetMuxer));
-            this.windowsRegistrytHelper.Setup(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32)).Returns(installedVersionKey.Object);
-            this.fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
-            this.fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
-
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, out string muxerPath));
-            Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
+            _fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
+            _fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer)!)));
+            _fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
         }
 
-        [DataTestMethod]
-        [DataRow(true, false, false, false)]
-        [DataRow(false, true, false, false)]
-        [DataRow(false, false, true, false)]
-        [DataRow(false, false, false, true)]
-        public void GetDotnetPathByArchitecture_GlobalInstallation_NullSubkeys(bool nullInstalledVersion, bool nullArchitecture, bool nullNative, bool nullInstallLocation)
+        //Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
+    }
+
+#pragma warning disable MSTEST0042 // duplicate data row - TODO: Look more into it
+    [DataTestMethod]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/local/share/dotnet/x64", "", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", false, PlatformOperatingSystem.OSX)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/local/share/dotnet/x64", "", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", false, PlatformOperatingSystem.OSX, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/share/dotnet/x64", "", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/share/dotnet/x64", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+    [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+#pragma warning restore MSTEST0042
+    public void GetDotnetPathByArchitecture_DefaultInstallation_Unix(
+        PlatformArchitecture targetArchitecture,
+        PlatformArchitecture platformArchitecture,
+        string expectedFolder,
+        string subfolder,
+        bool found,
+        PlatformOperatingSystem os,
+        DotnetMuxerResolutionStrategy strategy = DotnetMuxerResolutionStrategy.Default)
+    {
+        // Arrange
+        string dotnetMuxer = _muxerHelper.RenameMuxerAndReturnPath(os, targetArchitecture, subfolder);
+        _environmentHelper.SetupGet(x => x.OperatingSystem).Returns(os);
+        _environmentHelper.Setup(x => x.Architecture).Returns(platformArchitecture);
+        string expectedMuxerPath = Path.Combine(expectedFolder, "dotnet");
+        _fileHelper.Setup(x => x.Exists(expectedMuxerPath)).Returns(true);
+        _fileHelper.Setup(x => x.GetStream(expectedMuxerPath, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer)!)));
+        if (found)
         {
-            // Arrange
-            Mock<IRegistryKey> installedVersionKey = new Mock<IRegistryKey>();
-            Mock<IRegistryKey> architectureSubKey = new Mock<IRegistryKey>();
-            Mock<IRegistryKey> nativeArchSubKey = new Mock<IRegistryKey>();
-            installedVersionKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(nullArchitecture ? null : architectureSubKey.Object);
-            architectureSubKey.Setup(x => x.OpenSubKey(It.IsAny<string>())).Returns(nullNative ? null : nativeArchSubKey.Object);
-            nativeArchSubKey.Setup(x => x.GetValue(It.IsAny<string>())).Returns(nullInstallLocation ? null : "");
-            this.windowsRegistrytHelper.Setup(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32)).Returns(nullInstalledVersion ? null : installedVersionKey.Object);
-            this.environmentVariableHelper.Setup(x => x.GetEnvironmentVariable("ProgramFiles")).Returns("notfound");
-
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.IsFalse(dotnetHostHelper.TryGetDotnetPathByArchitecture(PlatformArchitecture.X64, out string muxerPath));
+            _fileHelper.Setup(x => x.GetStream(expectedMuxerPath, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
         }
 
-        [DataTestMethod]
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.OSX)]
-
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_arm64", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.X64, "/etc/dotnet/install_location", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.ARM64, "/etc/dotnet/install_location_x64", false, PlatformOperatingSystem.Unix)]
-        public void GetDotnetPathByArchitecture_GlobalInstallation_Unix(PlatformArchitecture targetArchitecture, string install_location, bool found, PlatformOperatingSystem os)
+        //Act & Assert
+        var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+        Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, strategy, out string? muxerPath));
+        Assert.AreEqual(found ? expectedMuxerPath : null, muxerPath);
+    }
+
+    [TestMethod]
+    public void GetDotnetPathByArchitecture_Strategies()
+    {
+        foreach (DotnetMuxerResolutionStrategy strategy in Enum.GetValues(typeof(DotnetMuxerResolutionStrategy)))
         {
             // Arrange
-            string dotnetMuxer = muxerHelper.RenameMuxerAndReturnPath(os, targetArchitecture);
-            this.environmentHelper.SetupGet(x => x.OperatingSystem).Returns(os);
-            this.fileHelper.Setup(x => x.Exists(install_location)).Returns(true);
-            this.fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
-            this.fileHelper.Setup(x => x.GetStream(install_location, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer))));
-            if (found)
+            _environmentHelper.Reset();
+            _fileHelper.Reset();
+            _windowsRegistrytHelper.Reset();
+            _environmentVariableHelper.Reset();
+            _processHelper.Reset();
+
+            _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable("ProgramFiles")).Returns("notfound");
+            var dotnetHostHelper = new DotnetHostHelper(_fileHelper.Object, _environmentHelper.Object, _windowsRegistrytHelper.Object, _environmentVariableHelper.Object, _processHelper.Object);
+            dotnetHostHelper.TryGetDotnetPathByArchitecture(PlatformArchitecture.X64, strategy, out string? _);
+
+            // Assert
+            switch (strategy)
             {
-                this.fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
-            }
+                case DotnetMuxerResolutionStrategy.DotnetRootArchitecture:
+                    // Assert env vars
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT_X64"), Times.Once);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT"), Times.Never);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable(It.IsAny<string>()), Times.Once);
 
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, out string muxerPath));
-            Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
-        }
+                    // Assert local installation
+                    _windowsRegistrytHelper.Verify(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32), Times.Never);
 
-        [DataTestMethod]
-        [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X64, "ProgramFiles(x86)", "dotnet", true)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "ProgramFiles", @"dotnet\x64", true)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", true)]
-        [DataRow(PlatformArchitecture.X86, PlatformArchitecture.X86, "ProgramFiles", "dotnet", true)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "ProgramFiles", "dotnet", false)]
-        [TestCategory("Windows")]
-        public void GetDotnetPathByArchitecture_DefaultInstallation_Win(PlatformArchitecture targetArchitecture, PlatformArchitecture platformArchitecture, string envVar, string subfolder, bool found)
-        {
-            // Arrange
-            string dotnetMuxer = muxerHelper.RenameMuxerAndReturnPath(PlatformOperatingSystem.Windows, targetArchitecture, subfolder);
-            this.environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(envVar)).Returns(dotnetMuxer.Replace(Path.Combine(subfolder, "dotnet.exe"), string.Empty));
-            this.environmentHelper.Setup(x => x.Architecture).Returns(platformArchitecture);
-            if (found)
-            {
-                this.fileHelper.Setup(x => x.Exists(dotnetMuxer)).Returns(true);
-                this.fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer))));
-                this.fileHelper.Setup(x => x.GetStream(dotnetMuxer, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
-            }
+                    // Assert default installation folder
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("ProgramFiles"), Times.Never);
 
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, out string muxerPath));
-            Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
-        }
+                    break;
+                case DotnetMuxerResolutionStrategy.DotnetRootArchitectureLess:
+                    // Assert env vars
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT_X64"), Times.Never);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT"), Times.Once);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable(It.IsAny<string>()), Times.Once);
 
-        [DataTestMethod]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/local/share/dotnet/x64", "", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", false, PlatformOperatingSystem.OSX)]
-
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/share/dotnet/x64", "", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
-        [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix)]
-        public void GetDotnetPathByArchitecture_DefaultInstallation_Unix(PlatformArchitecture targetArchitecture, PlatformArchitecture platformArchitecture, string expectedFolder, string subfolder, bool found, PlatformOperatingSystem os)
-        {
-            // Arrange
-            string dotnetMuxer = muxerHelper.RenameMuxerAndReturnPath(os, targetArchitecture, subfolder);
-            this.environmentHelper.SetupGet(x => x.OperatingSystem).Returns(os);
-            this.environmentHelper.Setup(x => x.Architecture).Returns(platformArchitecture);
-            string expectedMuxerPath = Path.Combine(expectedFolder, "dotnet");
-            this.fileHelper.Setup(x => x.Exists(expectedMuxerPath)).Returns(true);
-            this.fileHelper.Setup(x => x.GetStream(expectedMuxerPath, FileMode.Open, FileAccess.Read)).Returns(new MemoryStream(Encoding.UTF8.GetBytes(Path.GetDirectoryName(dotnetMuxer))));
-            if (found)
-            {
-                this.fileHelper.Setup(x => x.GetStream(expectedMuxerPath, FileMode.Open, FileAccess.Read)).Returns(File.OpenRead(dotnetMuxer));
-            }
+                    // Assert local installation
+                    _windowsRegistrytHelper.Verify(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32), Times.Never);
 
-            //Act & Assert
-            var dotnetHostHelper = new DotnetHostHelper(fileHelper.Object, environmentHelper.Object, windowsRegistrytHelper.Object, environmentVariableHelper.Object, processHelper.Object);
-            Assert.AreEqual(found, dotnetHostHelper.TryGetDotnetPathByArchitecture(targetArchitecture, out string muxerPath));
-            Assert.AreEqual(found ? expectedMuxerPath : null, muxerPath);
-        }
+                    // Assert default installation folder
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("ProgramFiles"), Times.Never);
 
-        public void Dispose() => this.muxerHelper.Dispose();
+                    break;
+                case DotnetMuxerResolutionStrategy.GlobalInstallationLocation:
+                    // Assert env vars
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT_X64"), Times.Never);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT"), Times.Never);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable(It.IsAny<string>()), Times.Never);
 
+                    // Assert local installation
+                    _windowsRegistrytHelper.Verify(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32), Times.Once);
 
-        class MockMuxerHelper : IDisposable
-        {
-            private static string DotnetMuxerWinX86 = "TestAssets/dotnetWinX86.exe";
-            private static string DotnetMuxerWinX64 = "TestAssets/dotnetWinX64.exe";
-            private static string DotnetMuxerWinArm64 = "TestAssets/dotnetWinArm64.exe";
-            private static string DotnetMuxerMacArm64 = "TestAssets/dotnetMacArm64";
-            private static string DotnetMuxerMacX64 = "TestAssets/dotnetMacX64";
-            private readonly List<string> muxers = new List<string>();
-
-            public MockMuxerHelper()
-            {
-                Assert.IsTrue(File.Exists(DotnetMuxerWinX86));
-                Assert.IsTrue(File.Exists(DotnetMuxerWinX64));
-                Assert.IsTrue(File.Exists(DotnetMuxerWinArm64));
-                Assert.IsTrue(File.Exists(DotnetMuxerMacArm64));
-                Assert.IsTrue(File.Exists(DotnetMuxerMacX64));
+                    // Assert default installation folder
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("ProgramFiles"), Times.Never);
+
+                    break;
+                case DotnetMuxerResolutionStrategy.DefaultInstallationLocation:
+                    // Assert env vars
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT_X64"), Times.Never);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT"), Times.Never);
+
+                    // Assert local installation
+                    _windowsRegistrytHelper.Verify(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32), Times.Never);
+
+                    // Assert default installation folder
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("ProgramFiles"), Times.Once);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable(It.IsAny<string>()), Times.Once);
+
+                    break;
+                case DotnetMuxerResolutionStrategy.Default:
+
+                    // Assert env vars
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT_X64"), Times.Once);
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_ROOT"), Times.Once);
+
+                    // Assert local installation
+                    _windowsRegistrytHelper.Verify(x => x.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32), Times.Once);
+
+                    // Assert default installation folder
+                    _environmentVariableHelper.Verify(x => x.GetEnvironmentVariable("ProgramFiles"), Times.Once);
+
+                    break;
+                default:
+                    throw new NotImplementedException();
             }
+        }
+    }
+
+    public void Dispose() => _muxerHelper.Dispose();
+
+    private class MockMuxerHelper : IDisposable
+    {
+        private static readonly string DotnetMuxerWinX86 = "TestAssets/dotnetWinX86.exe";
+        private static readonly string DotnetMuxerWinX64 = "TestAssets/dotnetWinX64.exe";
+        private static readonly string DotnetMuxerWinArm64 = "TestAssets/dotnetWinArm64.exe";
+        private static readonly string DotnetMuxerMacArm64 = "TestAssets/dotnetMacArm64";
+        private static readonly string DotnetMuxerMacX64 = "TestAssets/dotnetMacX64";
+        private readonly List<string> _muxers = new();
+
+        public MockMuxerHelper()
+        {
+            Assert.IsTrue(File.Exists(DotnetMuxerWinX86));
+            Assert.IsTrue(File.Exists(DotnetMuxerWinX64));
+            Assert.IsTrue(File.Exists(DotnetMuxerWinArm64));
+            Assert.IsTrue(File.Exists(DotnetMuxerMacArm64));
+            Assert.IsTrue(File.Exists(DotnetMuxerMacX64));
+        }
 
-            public string RenameMuxerAndReturnPath(PlatformOperatingSystem platform, PlatformArchitecture architecture, string subfolder = "")
+        public string RenameMuxerAndReturnPath(PlatformOperatingSystem platform, PlatformArchitecture architecture, string subfolder = "")
+        {
+            string tmpDirectory = Path.GetTempPath();
+            string muxerPath;
+            switch (platform)
             {
-                string tmpDirectory = Path.GetTempPath();
-                string muxerPath;
-                switch (platform)
-                {
-                    case PlatformOperatingSystem.Windows:
+                case PlatformOperatingSystem.Windows:
+                    {
+                        muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet.exe");
+                        Directory.CreateDirectory(Path.GetDirectoryName(muxerPath)!);
+                        if (architecture == PlatformArchitecture.ARM64)
+                        {
+                            File.Copy(DotnetMuxerWinArm64, muxerPath);
+                            break;
+                        }
+                        else if (architecture == PlatformArchitecture.X64)
                         {
-                            muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet.exe");
-                            Directory.CreateDirectory(Path.GetDirectoryName(muxerPath));
-                            if (architecture == PlatformArchitecture.ARM64)
-                            {
-                                File.Copy(DotnetMuxerWinArm64, muxerPath);
-                                break;
-                            }
-                            else if (architecture == PlatformArchitecture.X64)
-                            {
-                                File.Copy(DotnetMuxerWinX64, muxerPath);
-                                break;
-                            }
-                            else if (architecture == PlatformArchitecture.X86)
-                            {
-                                File.Copy(DotnetMuxerWinX86, muxerPath);
-                                break;
-                            }
-
-                            throw new NotSupportedException($"Unsupported architecture '{architecture}'");
+                            File.Copy(DotnetMuxerWinX64, muxerPath);
+                            break;
+                        }
+                        else if (architecture == PlatformArchitecture.X86)
+                        {
+                            File.Copy(DotnetMuxerWinX86, muxerPath);
+                            break;
                         }
-                    case PlatformOperatingSystem.OSX:
+
+                        throw new NotSupportedException($"Unsupported architecture '{architecture}'");
+                    }
+                case PlatformOperatingSystem.OSX:
+                    {
+                        muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet");
+                        Directory.CreateDirectory(Path.GetDirectoryName(muxerPath)!);
+                        if (architecture == PlatformArchitecture.ARM64)
                         {
-                            muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet");
-                            Directory.CreateDirectory(Path.GetDirectoryName(muxerPath));
-                            if (architecture == PlatformArchitecture.ARM64)
-                            {
-                                File.Copy(DotnetMuxerMacArm64, muxerPath);
-                                break;
-                            }
-                            else if (architecture == PlatformArchitecture.X64)
-                            {
-                                File.Copy(DotnetMuxerMacX64, muxerPath);
-                                break;
-                            }
-
-                            throw new NotSupportedException($"Unsupported architecture '{architecture}'");
+                            File.Copy(DotnetMuxerMacArm64, muxerPath);
+                            break;
                         }
-                    case PlatformOperatingSystem.Unix:
+                        else if (architecture == PlatformArchitecture.X64)
                         {
-                            muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet");
-                            Directory.CreateDirectory(Path.GetDirectoryName(muxerPath));
-                            File.WriteAllText(muxerPath, "not supported");
+                            File.Copy(DotnetMuxerMacX64, muxerPath);
                             break;
                         }
-                    default:
-                        throw new NotSupportedException($"Unsupported OS '{platform}'");
-                }
 
-                muxers.Add(muxerPath);
-                return muxerPath;
+                        throw new NotSupportedException($"Unsupported architecture '{architecture}'");
+                    }
+                case PlatformOperatingSystem.Unix:
+                    {
+                        muxerPath = Path.Combine(tmpDirectory, Guid.NewGuid().ToString("N"), subfolder, "dotnet");
+                        Directory.CreateDirectory(Path.GetDirectoryName(muxerPath)!);
+                        File.WriteAllText(muxerPath, "not supported");
+                        break;
+                    }
+                default:
+                    throw new NotSupportedException($"Unsupported OS '{platform}'");
             }
 
-            public void Dispose()
+            _muxers.Add(muxerPath);
+            return muxerPath;
+        }
+
+        public void Dispose()
+        {
+            foreach (var muxer in _muxers)
             {
-                foreach (var muxer in muxers)
-                {
-                    Directory.Delete(Path.GetDirectoryName(muxer), true);
-                }
+                Directory.Delete(Path.GetDirectoryName(muxer)!, true);
             }
         }
     }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/EnvironmentHelperTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/EnvironmentHelperTests.cs
index 35124678e4..b5fe8e8b27 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/EnvironmentHelperTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/EnvironmentHelperTests.cs
@@ -1,63 +1,64 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers;
+
+[TestClass]
+public class EnvironmentHelperTests
 {
-    using System;
+    private static readonly int DefaultTimeout = 90;
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+    }
+
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnDefaultValue()
+    {
+        Assert.AreEqual(DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
+    }
+
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnEnvVariableValueIfSet()
+    {
+        var val = 100;
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, val.ToString(CultureInfo.CurrentCulture));
+        Assert.AreEqual(val, EnvironmentHelper.GetConnectionTimeout());
+    }
+
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnDefaultOnNegativeValue()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "-1");
+        Assert.AreEqual(DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnZeroOnEnvVariableValueZero()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "0");
+        Assert.AreEqual(0, EnvironmentHelper.GetConnectionTimeout());
+    }
+
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnDefaultOnEnvVariableValueDecimal()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "10.4");
+        Assert.AreEqual(DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
+    }
 
-    [TestClass]
-    public class EnvironmentHelperTests
+    [TestMethod]
+    public void GetConnectionTimeoutShouldReturnDefaultOnInvalidValue()
     {
-        private static readonly int DefaultTimeout = 90;
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnDefaultValue()
-        {
-            Assert.AreEqual(EnvironmentHelperTests.DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnEnvVariableValueIfSet()
-        {
-            var val = 100;
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, val.ToString());
-            Assert.AreEqual(val, EnvironmentHelper.GetConnectionTimeout());
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnDefaultOnNegativeValue()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "-1");
-            Assert.AreEqual(EnvironmentHelperTests.DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnZeroOnEnvVariableValueZero()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "0");
-            Assert.AreEqual(0, EnvironmentHelper.GetConnectionTimeout());
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnDefaultOnEnvVariableValueDecimal()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "10.4");
-            Assert.AreEqual(EnvironmentHelperTests.DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
-        }
-
-        [TestMethod]
-        public void GetConnectionTimeoutShouldReturnDefaultOnInvalidValue()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "InvalidValue");
-            Assert.AreEqual(EnvironmentHelperTests.DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
-        }
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "InvalidValue");
+        Assert.AreEqual(DefaultTimeout, EnvironmentHelper.GetConnectionTimeout());
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/FileHelperTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/FileHelperTests.cs
index a7660bb127..5a80646144 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/FileHelperTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/FileHelperTests.cs
@@ -1,41 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Helpers;
+
+[TestClass]
+public class FileHelperTests
 {
-    using System.IO;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using VisualStudio.TestPlatform.Utilities.Helpers;
+    private readonly FileHelper _fileHelper;
+    private readonly string _tempFile;
 
-    [TestClass]
-    public class FileHelperTests
+    public FileHelperTests()
     {
-        private readonly FileHelper fileHelper;
-        private readonly string tempFile;
-
-        public FileHelperTests()
-        {
-            this.tempFile = Path.GetTempFileName();
-            File.AppendAllText(this.tempFile, "Some content..");
-            this.fileHelper = new FileHelper();
-        }
+        _tempFile = Path.GetTempFileName();
+        File.AppendAllText(_tempFile, "Some content..");
+        _fileHelper = new FileHelper();
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            File.Delete(this.tempFile);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        File.Delete(_tempFile);
+    }
 
-        [TestMethod]
-        public void GetStreamShouldAbleToGetTwoStreamSimultanouslyIfFileAccessIsRead()
-        {
-            using (var stream1 = this.fileHelper.GetStream(this.tempFile, FileMode.Open, FileAccess.Read))
-            {
-                using (var stream2 =
-                    this.fileHelper.GetStream(this.tempFile, FileMode.Open, FileAccess.Read))
-                {
-                }
-            }
-        }
+    [TestMethod]
+    public void GetStreamShouldAbleToGetTwoStreamSimultanouslyIfFileAccessIsRead()
+    {
+        using var stream1 = _fileHelper.GetStream(_tempFile, FileMode.Open, FileAccess.Read);
+        using var stream2 =
+            _fileHelper.GetStream(_tempFile, FileMode.Open, FileAccess.Read);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
index 04479c1fae..c0f492aed2 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
@@ -1,37 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities.UnitTests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Diagnostics.Process">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.TraceSource">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Thread">
-      <Version>4.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Globalization" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="TestAssets\" />
   </ItemGroup>
@@ -40,5 +18,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Output/OutputExtensionsTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Output/OutputExtensionsTests.cs
index 3e73efdfcb..59a8006b64 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Output/OutputExtensionsTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Output/OutputExtensionsTests.cs
@@ -1,159 +1,154 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Output
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CoreUtilities.UnitTests.Output;
+
+[TestClass]
+public class OutputExtensionsTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Moq;
-    using System;
+    private readonly Mock<IOutput> _mockOutput;
+    private ConsoleColor _color;
+    private readonly ConsoleColor _previousColor;
+    private readonly ConsoleColor _newColor;
 
-    [TestClass]
-    public class OutputExtensionsTests
+    public OutputExtensionsTests()
     {
-        private Mock<IOutput> mockOutput;
-        private ConsoleColor color;
-        private ConsoleColor previousColor;
-        private ConsoleColor newColor;
+        // Setting Console.ForegroundColor to newColor which will be used to determine whether
+        // test command output is redirecting to file or writing to console.
+        // If command output is redirecting to file, then Console.ForegroundColor can't be modified.
+        // So that tests which assert Console.ForegroundColor should not run.
+        _previousColor = Console.ForegroundColor;
+        _newColor = _previousColor == ConsoleColor.Gray
+            ? ConsoleColor.Black
+            : ConsoleColor.Blue;
+        Console.ForegroundColor = _newColor;
+
+        _mockOutput = new Mock<IOutput>();
+        _color = Console.ForegroundColor;
+        _mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback(() => _color = Console.ForegroundColor);
+    }
 
-        public OutputExtensionsTests()
-        {
-            // Setting Console.ForegroundColor to newColor which will be used to determine whether
-            // test command output is redirecting to file or writing to console.
-            // If command output is redirecting to file, then Console.ForegroundColor can't be modified.
-            // So that tests which assert Console.ForegroundColor should not run.
-            this.previousColor = Console.ForegroundColor;
-            this.newColor = previousColor == ConsoleColor.Gray
-                ? ConsoleColor.Black
-                : ConsoleColor.Blue;
-            Console.ForegroundColor = this.newColor;
-
-            this.mockOutput = new Mock<IOutput>();
-            this.color = Console.ForegroundColor;
-            this.mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback(() =>
-            {
-                this.color = Console.ForegroundColor;
-            });
-        }
+    [TestCleanup]
+    public void CleanUp()
+    {
+        Console.ForegroundColor = _previousColor;
+    }
 
-        [TestCleanup]
-        public void CleanUp()
-        {
-            Console.ForegroundColor = previousColor;
-        }
+    [TestMethod]
+    public void OutputErrorForSimpleMessageShouldOutputTheMessageString()
+    {
+        _mockOutput.Object.Error(false, "HelloError", null);
+        _mockOutput.Verify(o => o.WriteLine("HelloError", OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputErrorForSimpleMessageShouldOutputTheMessageString()
-        {
-            this.mockOutput.Object.Error(false, "HelloError", null);
-            this.mockOutput.Verify(o => o.WriteLine("HelloError", OutputLevel.Error), Times.Once());
-        }
+    [TestMethod]
+    public void OutputErrorForSimpleMessageShouldOutputTheMessageStringWithPrefixIfSet()
+    {
+        _mockOutput.Object.Error(true, "HelloError", null);
+        _mockOutput.Verify(o => o.WriteLine("Error: HelloError", OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputErrorForSimpleMessageShouldOutputTheMessageStringWithPrefixIfSet()
+    [TestMethod]
+    public void OutputErrorForSimpleMessageShouldSetConsoleColorToRed()
+    {
+        if (CanNotSetConsoleForegroundColor())
         {
-            this.mockOutput.Object.Error(true, "HelloError", null);
-            this.mockOutput.Verify(o => o.WriteLine("Error: HelloError", OutputLevel.Error), Times.Once());
+            return;
         }
 
-        [TestMethod]
-        public void OutputErrorForSimpleMessageShouldSetConsoleColorToRed()
-        {
-            if (CanNotSetConsoleForegroundColor())
-            {
-                return;
-            }
+        _mockOutput.Object.Error(false, "HelloError", null);
+        Assert.IsTrue(_color == ConsoleColor.Red, "Console color not set.");
+    }
 
-            this.mockOutput.Object.Error(false, "HelloError", null);
-            Assert.IsTrue(this.color == ConsoleColor.Red, "Console color not set.");
-        }
+    [TestMethod]
+    public void OutputErrorForMessageWithParamsShouldOutputFormattedMessage()
+    {
+        _mockOutput.Object.Error(false, "HelloError {0} {1}", "Foo", "Bar");
+        _mockOutput.Verify(o => o.WriteLine("HelloError Foo Bar", OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputErrorForMessageWithParamsShouldOutputFormattedMessage()
-        {
-            this.mockOutput.Object.Error(false, "HelloError {0} {1}", "Foo", "Bar");
-            this.mockOutput.Verify(o => o.WriteLine("HelloError Foo Bar", OutputLevel.Error), Times.Once());
-        }
+    [TestMethod]
+    public void OutputWarningForSimpleMessageShouldOutputTheMessageString()
+    {
+        _mockOutput.Object.Warning(false, "HelloWarning", null);
+        _mockOutput.Verify(o => o.WriteLine("HelloWarning", OutputLevel.Warning), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputWarningForSimpleMessageShouldOutputTheMessageString()
+    [TestMethod]
+    public void OutputWarningForSimpleMessageShouldSetConsoleColorToYellow()
+    {
+        if (CanNotSetConsoleForegroundColor())
         {
-            this.mockOutput.Object.Warning(false, "HelloWarning", null);
-            this.mockOutput.Verify(o => o.WriteLine("HelloWarning", OutputLevel.Warning), Times.Once());
+            return;
         }
 
-        [TestMethod]
-        public void OutputWarningForSimpleMessageShouldSetConsoleColorToYellow()
-        {
-            if (CanNotSetConsoleForegroundColor())
-            {
-                return;
-            }
+        _mockOutput.Object.Warning(false, "HelloWarning", null);
+        Assert.IsTrue(_color == ConsoleColor.Yellow);
+    }
 
-            this.mockOutput.Object.Warning(false, "HelloWarning", null);
-            Assert.IsTrue(this.color == ConsoleColor.Yellow);
-        }
+    [TestMethod]
+    public void OutputWarningForMessageWithParamsShouldOutputFormattedMessage()
+    {
+        _mockOutput.Object.Warning(false, "HelloWarning {0} {1}", "Foo", "Bar");
+        _mockOutput.Verify(o => o.WriteLine("HelloWarning Foo Bar", OutputLevel.Warning), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputWarningForMessageWithParamsShouldOutputFormattedMessage()
-        {
-            this.mockOutput.Object.Warning(false, "HelloWarning {0} {1}", "Foo", "Bar");
-            this.mockOutput.Verify(o => o.WriteLine("HelloWarning Foo Bar", OutputLevel.Warning), Times.Once());
-        }
+    [TestMethod]
+    public void OutputInformationForSimpleMessageShouldOutputTheMessageString()
+    {
+        _mockOutput.Object.Information(false, ConsoleColor.Green, "HelloInformation", null);
+        _mockOutput.Verify(o => o.WriteLine("HelloInformation", OutputLevel.Information), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputInformationForSimpleMessageShouldOutputTheMessageString()
+    [TestMethod]
+    public void OutputInformationForSimpleMessageShouldSetConsoleColorToGivenColor()
+    {
+        if (CanNotSetConsoleForegroundColor())
         {
-            this.mockOutput.Object.Information(false, ConsoleColor.Green, "HelloInformation", null);
-            this.mockOutput.Verify(o => o.WriteLine("HelloInformation", OutputLevel.Information), Times.Once());
+            return;
         }
 
-        [TestMethod]
-        public void OutputInformationForSimpleMessageShouldSetConsoleColorToGivenColor()
-        {
-            if (CanNotSetConsoleForegroundColor())
-            {
-                return;
-            }
+        _mockOutput.Object.Information(false, ConsoleColor.Green, "HelloInformation", null);
+        Assert.IsTrue(_color == ConsoleColor.Green);
+    }
 
-            this.mockOutput.Object.Information(false, ConsoleColor.Green, "HelloInformation", null);
-            Assert.IsTrue(this.color == ConsoleColor.Green);
-        }
+    [TestMethod]
+    public void OutputInformationForMessageWithParamsShouldOutputFormattedMessage()
+    {
+        _mockOutput.Object.Information(false, "HelloInformation {0} {1}", "Foo", "Bar");
+        _mockOutput.Verify(o => o.WriteLine("HelloInformation Foo Bar", OutputLevel.Information), Times.Once());
+    }
 
-        [TestMethod]
-        public void OutputInformationForMessageWithParamsShouldOutputFormattedMessage()
+    [TestMethod]
+    public void OutputInformationShouldNotChangeConsoleOutputColor()
+    {
+        if (CanNotSetConsoleForegroundColor())
         {
-            this.mockOutput.Object.Information(false, "HelloInformation {0} {1}", "Foo", "Bar");
-            this.mockOutput.Verify(o => o.WriteLine("HelloInformation Foo Bar", OutputLevel.Information), Times.Once());
+            return;
         }
 
-        [TestMethod]
-        public void OutputInformationShouldNotChangeConsoleOutputColor()
-        {
-            if (CanNotSetConsoleForegroundColor())
-            {
-                return;
-            }
-
-            ConsoleColor color1 = Console.ForegroundColor, color2 = Console.ForegroundColor == ConsoleColor.Red ? ConsoleColor.Black : ConsoleColor.Red;
-            this.mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback(() =>
-            {
-                color2 = Console.ForegroundColor;
-            });
-
-            this.mockOutput.Object.Information(false, "HelloInformation {0} {1}", "Foo", "Bar");
-            this.mockOutput.Verify(o => o.WriteLine("HelloInformation Foo Bar", OutputLevel.Information), Times.Once());
-            Assert.IsTrue(color1 == color2);
-        }
+        ConsoleColor color1 = Console.ForegroundColor, color2 = Console.ForegroundColor == ConsoleColor.Red ? ConsoleColor.Black : ConsoleColor.Red;
+        _mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback(() => color2 = Console.ForegroundColor);
 
-        private bool CanNotSetConsoleForegroundColor()
+        _mockOutput.Object.Information(false, "HelloInformation {0} {1}", "Foo", "Bar");
+        _mockOutput.Verify(o => o.WriteLine("HelloInformation Foo Bar", OutputLevel.Information), Times.Once());
+        Assert.IsTrue(color1 == color2);
+    }
+
+    private bool CanNotSetConsoleForegroundColor()
+    {
+        if (Console.ForegroundColor != _newColor)
         {
-            if (Console.ForegroundColor != this.newColor)
-            {
-                Assert.Inconclusive("Can't set Console foreground color. Might be because process output redirect to file.");
-                return true;
-            }
-            return false;
+            Assert.Inconclusive("Can't set Console foreground color. Might be because process output redirect to file.");
+            return true;
         }
+        return false;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs
deleted file mode 100644
index 8383a433b0..0000000000
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace TestPlatform.CoreUtilities.UnitTests
-{
-    /// <summary>
-    /// Main entry point for the command line runner.
-    /// </summary>
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3b803ea111..0000000000
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.CoreUtilities.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("83eaf11c-3fd7-49da-8673-9e81cc2bac66")]
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Tracing/EqtTraceTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Tracing/EqtTraceTests.cs
index 825c8ad96f..f9e38311d2 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Tracing/EqtTraceTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Tracing/EqtTraceTests.cs
@@ -1,187 +1,185 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CoreUtilities.UnitTests
-{
+using System;
 #if NETFRAMEWORK
-    using System.Diagnostics;
+using System.Diagnostics;
 #endif
-    using System.IO;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System;
+using System.IO;
 
-    [TestClass]
-    public class EqtTraceTests
-    {
-        private static string dirPath = null;
-        private static string logFile = null;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CoreUtilities.UnitTests;
 
-        [ClassInitialize]
-        public static void Init(TestContext testContext)
+[TestClass]
+public class EqtTraceTests
+{
+    private static string? s_dirPath;
+    private static string? s_logFile;
+
+    [ClassInitialize]
+    public static void Init(TestContext _)
+    {
+        // Set DoNotInitailize to false.
+        EqtTrace.DoNotInitailize = false;
+        s_dirPath = Path.Combine(Path.GetTempPath(), "TraceUT");
+        try
         {
-            // Set DoNotInitailize to false.
-            EqtTrace.DoNotInitailize = false;
-            dirPath = Path.Combine(Path.GetTempPath(), "TraceUT");
-            try
-            {
-                Directory.CreateDirectory(dirPath);
-                logFile = Path.Combine(dirPath, "trace.log");
-            }
-            catch(Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-
-            EqtTrace.InitializeTrace(logFile, PlatformTraceLevel.Off);
+            Directory.CreateDirectory(s_dirPath);
+            s_logFile = Path.Combine(s_dirPath, "trace.log");
         }
-
-        [TestMethod]
-        public void CheckInitializeLogFileTest()
+        catch (Exception ex)
         {
-            Assert.AreEqual<string>(logFile, EqtTrace.LogFile, "Expected log file to be {0}", logFile);
+            Console.WriteLine(ex.Message);
         }
 
-        [TestMethod]
-        public void CheckIfTraceStateIsVerboseEnabled()
-        {
+        EqtTrace.InitializeTrace(s_logFile, PlatformTraceLevel.Off);
+    }
+
+    [TestMethod]
+    public void CheckInitializeLogFileTest()
+    {
+        Assert.AreEqual(s_logFile, EqtTrace.LogFile, "Expected log file to be {0}", s_logFile);
+    }
+
+    [TestMethod]
+    public void CheckIfTraceStateIsVerboseEnabled()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
-            Assert.IsTrue(EqtTrace.IsVerboseEnabled, "Expected trace state to be verbose actual state {0}", EqtTrace.IsVerboseEnabled);
-        }
+        Assert.IsTrue(EqtTrace.IsVerboseEnabled, "Expected trace state to be verbose actual state {0}", EqtTrace.IsVerboseEnabled);
+    }
 
-        [TestMethod]
-        public void CheckIfTraceStateIsErrorEnabled()
-        {
+    [TestMethod]
+    public void CheckIfTraceStateIsErrorEnabled()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Error;
+        EqtTrace.TraceLevel = TraceLevel.Error;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Error;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Error;
 #endif
-            Assert.IsTrue(EqtTrace.IsErrorEnabled, "Expected trace state to be error actual state {0}", EqtTrace.IsErrorEnabled);
-        }
+        Assert.IsTrue(EqtTrace.IsErrorEnabled, "Expected trace state to be error actual state {0}", EqtTrace.IsErrorEnabled);
+    }
 
-        [TestMethod]
-        public void CheckIfTraceStateIsInfoEnabled()
-        {
+    [TestMethod]
+    public void CheckIfTraceStateIsInfoEnabled()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
+        EqtTrace.TraceLevel = TraceLevel.Info;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
 #endif
-            Assert.IsTrue(EqtTrace.IsInfoEnabled, "Expected trace state to be info actual state {0}", EqtTrace.IsInfoEnabled);
-        }
+        Assert.IsTrue(EqtTrace.IsInfoEnabled, "Expected trace state to be info actual state {0}", EqtTrace.IsInfoEnabled);
+    }
 
-        [TestMethod]
-        public void CheckIfTraceStateIsWarningEnabled()
-        {
+    [TestMethod]
+    public void CheckIfTraceStateIsWarningEnabled()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Warning;
+        EqtTrace.TraceLevel = TraceLevel.Warning;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
 #endif
-            Assert.IsTrue(EqtTrace.IsWarningEnabled, "Expected trace state to be warning actual state {0}", EqtTrace.IsWarningEnabled);
-        }
+        Assert.IsTrue(EqtTrace.IsWarningEnabled, "Expected trace state to be warning actual state {0}", EqtTrace.IsWarningEnabled);
+    }
 
-        [TestMethod]
-        public void TraceShouldWriteError()
-        {
+    [TestMethod]
+    public void TraceShouldWriteError()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Error;
+        EqtTrace.TraceLevel = TraceLevel.Error;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Error;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Error;
 #endif
-            EqtTrace.Error(new NotImplementedException());
-            Assert.IsNotNull(ReadLogFile(), "Expected error message");
-        }
+        EqtTrace.Error(new NotImplementedException());
+        Assert.IsNotNull(ReadLogFile(), "Expected error message");
+    }
 
-        [TestMethod]
-        public void TraceShouldWriteWarning()
-        {
+    [TestMethod]
+    public void TraceShouldWriteWarning()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Warning;
+        EqtTrace.TraceLevel = TraceLevel.Warning;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
 #endif
-            EqtTrace.Warning("Dummy Warning Message");
-            Assert.IsTrue(ReadLogFile().Contains("Dummy Warning Message"), "Expected Warning message");
-        }
+        EqtTrace.Warning("Dummy Warning Message");
+        Assert.IsTrue(ReadLogFile().Contains("Dummy Warning Message"), "Expected Warning message");
+    }
 
-        [TestMethod]
-        public void TraceShouldWriteVerbose()
-        {
+    [TestMethod]
+    public void TraceShouldWriteVerbose()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
-            EqtTrace.Verbose("Dummy Verbose Message");
-            Assert.IsTrue(ReadLogFile().Contains("Dummy Verbose Message"), "Expected Verbose message");
-        }
+        EqtTrace.Verbose("Dummy Verbose Message");
+        Assert.IsTrue(ReadLogFile().Contains("Dummy Verbose Message"), "Expected Verbose message");
+    }
 
-        [TestMethod]
-        public void TraceShouldWriteInfo()
-        {
+    [TestMethod]
+    public void TraceShouldWriteInfo()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
+        EqtTrace.TraceLevel = TraceLevel.Info;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
 #endif
-            EqtTrace.Info("Dummy Info Message");
-            Assert.IsTrue(ReadLogFile().Contains("Dummy Info Message"), "Expected Info message");
-        }
+        EqtTrace.Info("Dummy Info Message");
+        Assert.IsTrue(ReadLogFile().Contains("Dummy Info Message"), "Expected Info message");
+    }
 
-        [TestMethod]
-        public void TraceShouldNotWriteVerboseIfTraceLevelIsInfo()
-        {
+    [TestMethod]
+    public void TraceShouldNotWriteVerboseIfTraceLevelIsInfo()
+    {
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
+        EqtTrace.TraceLevel = TraceLevel.Info;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
 #endif
-            EqtTrace.Info("Dummy Info Message");
-            EqtTrace.Verbose("Unexpected Dummy Verbose Message");
+        EqtTrace.Info("Dummy Info Message");
+        EqtTrace.Verbose("Unexpected Dummy Verbose Message");
 
-            var logFileContent = ReadLogFile();
-            Assert.IsFalse(logFileContent.Contains("Unexpected Dummy Verbose Message"), "Verbose message not expected");
-            Assert.IsTrue(logFileContent.Contains("Dummy Info Message"), "Expected Info message");
-        }
+        var logFileContent = ReadLogFile();
+        Assert.IsFalse(logFileContent.Contains("Unexpected Dummy Verbose Message"), "Verbose message not expected");
+        Assert.IsTrue(logFileContent.Contains("Dummy Info Message"), "Expected Info message");
+    }
 
-        [TestMethod]
-        public void TraceShouldNotWriteIfDoNotInitializationIsSetToTrue()
-        {
-            EqtTrace.DoNotInitailize = true;
+    [TestMethod]
+    public void TraceShouldNotWriteIfDoNotInitializationIsSetToTrue()
+    {
+        EqtTrace.DoNotInitailize = true;
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
+        EqtTrace.TraceLevel = TraceLevel.Info;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
 #endif
-            EqtTrace.Info("Dummy Info Message: TraceShouldNotWriteIfDoNotInitializationIsSetToTrue");
-            Assert.IsFalse(ReadLogFile().Contains("Dummy Info Message: TraceShouldNotWriteIfDoNotInitializationIsSetToTrue"), "Did not expect Dummy Info message");
-        }
+        EqtTrace.Info("Dummy Info Message: TraceShouldNotWriteIfDoNotInitializationIsSetToTrue");
+        Assert.IsFalse(ReadLogFile().Contains("Dummy Info Message: TraceShouldNotWriteIfDoNotInitializationIsSetToTrue"), "Did not expect Dummy Info message");
+    }
 
-        private string ReadLogFile()
+    private static string ReadLogFile()
+    {
+        string? log = null;
+        try
         {
-            string log = null;
-            try
-            {
-                using (var fs = new FileStream(logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                {
-                    using (var sr = new StreamReader(fs))
-                    {
-                        log = sr.ReadToEnd();
-                    }
-                }
-            }
-            catch(Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-
-            return log;
+            using var fs = new FileStream(s_logFile!, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+            using var sr = new StreamReader(fs);
+            log = sr.ReadToEnd();
         }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+        }
+
+        Assert.IsNotNull(log);
+        return log;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/JobQueueTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/JobQueueTests.cs
index 5cb90ddbcb..b986d94fcc 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/JobQueueTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/JobQueueTests.cs
@@ -1,536 +1,477 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CoreUtilities.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Threading;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+namespace TestPlatform.CoreUtilities.UnitTests;
 
-    [TestClass]
-    public class JobQueueTests
+[TestClass]
+public class JobQueueTests
+{
+    [TestMethod]
+    public void ConstructorThrowsWhenNullProcessHandlerIsProvided()
     {
-        [TestMethod]
-        public void ConstructorThrowsWhenNullProcessHandlerIsProvided()
-        {
-            JobQueue<string> jobQueue = null;
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                jobQueue = new JobQueue<string>(null, "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            });
+        JobQueue<string>? jobQueue = null;
+        Assert.ThrowsException<ArgumentNullException>(() => jobQueue = new JobQueue<string>(null!, "dp", int.MaxValue, int.MaxValue, false, (message) => { }));
 
-            if (jobQueue != null)
-            {
-                jobQueue.Dispose();
-            }
+        if (jobQueue != null)
+        {
+            jobQueue.Dispose();
         }
+    }
 
-        [TestMethod]
-        public void ThrowsWhenNullEmptyOrWhiteSpaceDisplayNameIsProvided()
-        {
-            JobQueue<string> jobQueue = null;
-            Assert.ThrowsException<ArgumentException>(() =>
-            {
-                jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), null, int.MaxValue, int.MaxValue, false, (message) => { });
-            });
-            Assert.ThrowsException<ArgumentException>(() =>
-            {
-                jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "", int.MaxValue, int.MaxValue, false, (message) => { });
-            });
-            Assert.ThrowsException<ArgumentException>(() =>
-            {
-                jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "    ", int.MaxValue, int.MaxValue, false, (message) => { });
-            });
+    [TestMethod]
+    public void ThrowsWhenNullEmptyOrWhiteSpaceDisplayNameIsProvided()
+    {
+        JobQueue<string>? jobQueue = null;
+        Assert.ThrowsException<ArgumentException>(() => jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), null!, int.MaxValue, int.MaxValue, false, (message) => { }));
+        Assert.ThrowsException<ArgumentException>(() => jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "", int.MaxValue, int.MaxValue, false, (message) => { }));
+        Assert.ThrowsException<ArgumentException>(() => jobQueue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "    ", int.MaxValue, int.MaxValue, false, (message) => { }));
 
-            if (jobQueue != null)
-            {
-                jobQueue.Dispose();
-            }
+        if (jobQueue != null)
+        {
+            jobQueue.Dispose();
         }
+    }
+
+    [TestMethod]
+    public void JobsCanBeAddedToTheQueueAndAreProcessedInTheOrderReceived()
+    {
+        // Setup the job process handler to keep track of the jobs.
+        var jobsProcessed = new List<int>();
+        Action<int> processHandler = (job) => jobsProcessed.Add(job);
+
+        // Setup Test Data.
+        var job1 = 1;
+        var job2 = 2;
+        var job3 = 3;
 
-        [TestMethod]
-        public void JobsCanBeAddedToTheQueueAndAreProcessedInTheOrderReceived()
+        // Queue the jobs and verify they are processed in the order added.
+        using (var queue = new JobQueue<int>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
         {
-            // Setup the job process handler to keep track of the jobs.
-            var jobsProcessed = new List<int>();
-            Action<int> processHandler = (job) =>
-            {
-                jobsProcessed.Add(job);
-            };
+            queue.QueueJob(job1, 0);
+            queue.QueueJob(job2, 0);
+            queue.QueueJob(job3, 0);
+        }
 
-            // Setup Test Data.
-            var job1 = 1;
-            var job2 = 2;
-            var job3 = 3;
+        Assert.AreEqual(job1, jobsProcessed[0]);
+        Assert.AreEqual(job2, jobsProcessed[1]);
+        Assert.AreEqual(job3, jobsProcessed[2]);
+    }
 
-            // Queue the jobs and verify they are processed in the order added.
-            using (var queue = new JobQueue<int>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
-            {
-                queue.QueueJob(job1, 0);
-                queue.QueueJob(job2, 0);
-                queue.QueueJob(job3, 0);
-            }
+    [TestMethod]
+    public void JobsAreProcessedOnABackgroundThread()
+    {
+        // Setup the job process handler to keep track of the jobs.
+        var jobsProcessed = new List<int>();
+        Action<string?> processHandler = job => jobsProcessed.Add(Environment.CurrentManagedThreadId);
 
-            Assert.AreEqual(job1, jobsProcessed[0]);
-            Assert.AreEqual(job2, jobsProcessed[1]);
-            Assert.AreEqual(job3, jobsProcessed[2]);
+        // Queue the jobs and verify they are processed on a background thread.
+        using (var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
+        {
+            queue.QueueJob("dp", 0);
         }
 
-        [TestMethod]
-        public void JobsAreProcessedOnABackgroundThread()
-        {
-            // Setup the job process handler to keep track of the jobs.
-            var jobsProcessed = new List<int>();
-            Action<string> processHandler = (job) =>
-            {
-                jobsProcessed.Add(Thread.CurrentThread.ManagedThreadId);
-            };
+        Assert.AreNotEqual(Environment.CurrentManagedThreadId, jobsProcessed[0]);
+    }
 
-            // Queue the jobs and verify they are processed on a background thread.
-            using (var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
-            {
-                queue.QueueJob("dp", 0);
-            }
+    [TestMethod]
+    public void ThrowsWhenQueuingAfterDisposed()
+    {
+        var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Dispose();
 
-            Assert.AreNotEqual(Thread.CurrentThread.ManagedThreadId, jobsProcessed[0]);
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => queue.QueueJob("dp", 0));
+    }
 
-        [TestMethod]
-        public void ThrowsWhenQueuingAfterDisposed()
-        {
-            var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            queue.Dispose();
+    [TestMethod]
+    public void ThrowsWhenResumingAfterDisposed()
+    {
+        var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Dispose();
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                queue.QueueJob("dp", 0);
-            });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => queue.Resume());
+    }
 
-        [TestMethod]
-        public void ThrowsWhenResumingAfterDisposed()
-        {
-            var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            queue.Dispose();
+    [TestMethod]
+    public void ThrowsWhenPausingAfterDisposed()
+    {
+        var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Dispose();
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                queue.Resume();
-            });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => queue.Pause());
+    }
 
-        [TestMethod]
-        public void ThrowsWhenPausingAfterDisposed()
-        {
-            var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            queue.Dispose();
+    [TestMethod]
+    public void ThrowsWhenFlushingAfterDisposed()
+    {
+        var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Dispose();
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                queue.Pause();
-            });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => queue.Flush());
+    }
 
-        [TestMethod]
-        public void ThrowsWhenFlushingAfterDisposed()
-        {
-            var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            queue.Dispose();
+    [TestMethod]
+    public void DisposeDoesNotThrowWhenCalledTwice()
+    {
+        var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Dispose();
+        queue.Dispose();
+    }
 
-            Assert.ThrowsException<ObjectDisposedException>(() =>
-            {
-                queue.Flush();
-            });
-        }
+    [TestMethod]
+    public void OncePausedNoFurtherJobsAreProcessedUntilResumeIsCalled()
+    {
+        // Setup the job process handler to keep track of the jobs it is called with.
+        List<string?> processedJobs = new();
+        Action<string?> processHandler = job => processedJobs.Add(job);
 
-        [TestMethod]
-        [SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "queue is required to be disposed twice.")]
-        public void DisposeDoesNotThrowWhenCalledTwice()
+        // Queue the jobs after paused and verify they are not processed until resumed.
+        using (var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
         {
-            var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
-            queue.Dispose();
-            queue.Dispose();
-        }
+            queue.Pause();
+            queue.QueueJob("dp", 0);
+            queue.QueueJob("dp", 0);
+            queue.QueueJob("dp", 0);
 
-        [TestMethod]
-        public void OncePausedNoFurtherJobsAreProcessedUntilResumeIsCalled()
-        {
-            // Setup the job process handler to keep track of the jobs it is called with.
-            List<string> processedJobs = new List<string>();
-            Action<string> processHandler = (job) =>
-            {
-                processedJobs.Add(job);
-            };
+            // Allow other threads to execute and verify no jobs processed because the queue is paused.
+            Thread.Sleep(0);
+            Assert.AreEqual(0, processedJobs.Count);
 
-            // Queue the jobs after paused and verify they are not processed until resumed.
-            using (var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
-            {
-                queue.Pause();
-                queue.QueueJob("dp", 0);
-                queue.QueueJob("dp", 0);
-                queue.QueueJob("dp", 0);
+            queue.Resume();
+        }
 
-                // Allow other threads to execute and verify no jobs processed because the queue is paused.
-                Thread.Sleep(0);
-                Assert.AreEqual(0, processedJobs.Count);
+        Assert.AreEqual(3, processedJobs.Count);
+    }
 
-                queue.Resume();
-            }
+    [TestMethod]
+    public void ThrowsWhenBeingDisposedWhileQueueIsPaused()
+    {
+        using var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.Pause();
 
-            Assert.AreEqual(3, processedJobs.Count);
-        }
+        Assert.ThrowsException<InvalidOperationException>(() => queue.Dispose());
 
-        [TestMethod]
-        public void ThrowsWhenBeingDisposedWhileQueueIsPaused()
-        {
-            using (var queue = new JobQueue<string>(GetEmptyProcessHandler<string>(), "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
-            {
-                queue.Pause();
+        queue.Resume();
+    }
 
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                {
-                    queue.Dispose();
-                });
+    [TestMethod]
+    public void FlushMethodWaitsForAllJobsToBeProcessedBeforeReturning()
+    {
+        // Setup the job process handler to keep track of the jobs it has processed.
+        var jobsProcessed = 0;
+        Action<string?> processHandler = job => jobsProcessed++;
 
-                queue.Resume();
-            }
-        }
+        // Queue several jobs and verify they have been processed when wait returns.
+        using var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { });
+        queue.QueueJob("dp", 0);
+        queue.QueueJob("dp", 0);
+        queue.QueueJob("dp", 0);
 
-        [TestMethod]
-        public void FlushMethodWaitsForAllJobsToBeProcessedBeforeReturning()
-        {
-            // Setup the job process handler to keep track of the jobs it has processed.
-            var jobsProcessed = 0;
-            Action<string> processHandler = (job) =>
-            {
-                jobsProcessed++;
-            };
+        queue.Flush();
 
-            // Queue several jobs and verify they have been processed when wait returns.
-            using (var queue = new JobQueue<string>(processHandler, "dp", int.MaxValue, int.MaxValue, false, (message) => { }))
-            {
-                queue.QueueJob("dp", 0);
-                queue.QueueJob("dp", 0);
-                queue.QueueJob("dp", 0);
+        Assert.AreEqual(3, jobsProcessed);
+    }
 
-                queue.Flush();
+    [TestMethod]
+    public void TestBlockAtEnqueueDueToLength()
+    {
+        ManualResetEvent allowJobProcessingHandlerToProceed = new(false);
+        AutoResetEvent jobProcessed = new(false);
 
-                Assert.AreEqual(3, jobsProcessed);
+        // process handler for the jobs in queue. It blocks on a job till the queue gets full and the handler sets the
+        // event allowHandlerToProceed.
+        Action<string?> processHandler = job =>
+        {
+            allowJobProcessingHandlerToProceed.WaitOne();
+            if (string.Equals(job, "job11", StringComparison.OrdinalIgnoreCase))
+            {
+                jobProcessed.Set();
             }
-        }
+        };
 
-        [TestMethod]
-        public void TestBlockAtEnqueueDueToLength()
+        using JobQueueWrapper queue = new(processHandler, 5, int.MaxValue, true, allowJobProcessingHandlerToProceed);
+        // run the same thing multiple times to ensure that the queue isn't in a erroneous state after being blocked.
+        for (int i = 0; i < 10; i++)
         {
-            ManualResetEvent allowJobProcessingHandlerToProceed = new ManualResetEvent(false);
-            AutoResetEvent jobProcessed = new AutoResetEvent(false);
+            queue.QueueJob("job1", 0);
+            queue.QueueJob("job2", 0);
+            queue.QueueJob("job3", 0);
+            queue.QueueJob("job4", 0);
+            queue.QueueJob("job5", 0);
+
+            // At this point only 5 jobs have been queued. Even if all are still in queue, still the need to block shouldn't have
+            // risen. So queue.enteredBlockingMethod would be false.
+            Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
+
+            queue.QueueJob("job6", 0);
+            queue.QueueJob("job7", 0);
+            queue.QueueJob("job8", 0);
+            queue.QueueJob("job9", 0);
+            queue.QueueJob("job10", 0);
+            queue.QueueJob("job11", 0);
+
+            // By this point surely the queue would have blocked at least once, hence setting queue.enteredBlockingMethod true.
+            Assert.IsTrue(queue.IsEnqueueBlocked, "Did not enter the over-ridden blocking method");
+
+            // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
+            jobProcessed.WaitOne();
+
+            // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
+            // allowJobProcessingHandlerToProceed is reset to block the handler again in next iteration.
+            queue.IsEnqueueBlocked = false;
+            allowJobProcessingHandlerToProceed.Reset();
+
+            // if we reach here it means that the queue was successfully blocked at some point in between job6 and job11
+            // and subsequently unblocked.
+        }
+    }
 
-            // process handler for the jobs in queue. It blocks on a job till the queue gets full and the handler sets the
-            // event allowHandlerToProceed.
-            Action<string> processHandler = (job) =>
-            {
-                allowJobProcessingHandlerToProceed.WaitOne();
-                if (job.Equals("job11", StringComparison.OrdinalIgnoreCase))
-                {
-                    jobProcessed.Set();
-                }
-            };
-
-            using (JobQueueWrapper queue = new JobQueueWrapper(processHandler, 5, int.MaxValue, true, allowJobProcessingHandlerToProceed))
+    [TestMethod]
+    public void TestBlockAtEnqueueDueToSize()
+    {
+        ManualResetEvent allowJobProcessingHandlerToProceed = new(false);
+        AutoResetEvent jobProcessed = new(false);
+
+        // process handler for the jobs in queue. It blocks on a job till the queue gets full and the handler sets the
+        // event allowHandlerToProceed.
+        Action<string?> processHandler = job =>
+        {
+            allowJobProcessingHandlerToProceed.WaitOne();
+            if (string.Equals(job, "job11", StringComparison.OrdinalIgnoreCase))
             {
-                // run the same thing multiple times to ensure that the queue isn't in a erroneous state after being blocked.
-                for (int i = 0; i < 10; i++)
-                {
-                    queue.QueueJob("job1", 0);
-                    queue.QueueJob("job2", 0);
-                    queue.QueueJob("job3", 0);
-                    queue.QueueJob("job4", 0);
-                    queue.QueueJob("job5", 0);
-
-                    // At this point only 5 jobs have been queued. Even if all are still in queue, still the need to block shouldn't have
-                    // risen. So queue.enteredBlockingMethod would be false.
-                    Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
-
-                    queue.QueueJob("job6", 0);
-                    queue.QueueJob("job7", 0);
-                    queue.QueueJob("job8", 0);
-                    queue.QueueJob("job9", 0);
-                    queue.QueueJob("job10", 0);
-                    queue.QueueJob("job11", 0);
-
-                    // By this point surely the queue would have blocked at least once, hence setting queue.enteredBlockingMethod true.
-                    Assert.IsTrue(queue.IsEnqueueBlocked, "Did not enter the over-ridden blocking method");
-
-                    // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
-                    jobProcessed.WaitOne();
-
-                    // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
-                    // allowJobProcessingHandlerToProceed is reset to block the handler again in next iteration.
-                    queue.IsEnqueueBlocked = false;
-                    allowJobProcessingHandlerToProceed.Reset();
-
-                    // if we reach here it means that the queue was successfully blocked at some point in between job6 and job11
-                    // and subsequently unblocked.
-                }
+                jobProcessed.Set();
             }
-        }
+        };
 
-        [TestMethod]
-        public void TestBlockAtEnqueueDueToSize()
+        using JobQueueWrapper queue = new(processHandler, int.MaxValue, 40, true, allowJobProcessingHandlerToProceed);
+        // run the same thing multiple times to ensure that the queue isn't in a erroneous state after being blocked.
+        for (int i = 0; i < 10; i++)
         {
-            ManualResetEvent allowJobProcessingHandlerToProceed = new ManualResetEvent(false);
-            AutoResetEvent jobProcessed = new AutoResetEvent(false);
+            queue.QueueJob("job1", 8);
+            queue.QueueJob("job2", 8);
+            queue.QueueJob("job3", 8);
+            queue.QueueJob("job4", 8);
+            queue.QueueJob("job5", 8);
+
+            // At this point exactly 80 bytes have been queued. Even if all are still in queue, still the need to block shouldn't
+            // have risen. So queue.enteredBlockingMethod would be false.
+            Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
+
+            queue.QueueJob("job6", 8);
+            queue.QueueJob("job7", 8);
+            queue.QueueJob("job8", 8);
+            queue.QueueJob("job9", 8);
+            queue.QueueJob("job10", 10);
+            queue.QueueJob("job11", 10);
+
+            // By this point surely the queue would have blocked at least once, hence setting queue.enteredBlockingMethod true.
+            Assert.IsTrue(queue.IsEnqueueBlocked, "Did not enter the over-ridden blocking method");
+
+            // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
+            jobProcessed.WaitOne();
+
+            // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
+            // allowJobProcessingHandlerToProceed is reset to block the handler again in next iteration.
+            queue.IsEnqueueBlocked = false;
+            allowJobProcessingHandlerToProceed.Reset();
+
+            // if we reach here it means that the queue was successfully blocked at some point in between job6 and job11
+            // and subsequently unblocked.
+        }
+    }
 
-            // process handler for the jobs in queue. It blocks on a job till the queue gets full and the handler sets the
-            // event allowHandlerToProceed.
-            Action<string> processHandler = (job) =>
-            {
-                allowJobProcessingHandlerToProceed.WaitOne();
-                if (job.Equals("job11", StringComparison.OrdinalIgnoreCase))
-                {
-                    jobProcessed.Set();
-                }
-            };
-
-            using (JobQueueWrapper queue = new JobQueueWrapper(processHandler, int.MaxValue, 40, true, allowJobProcessingHandlerToProceed))
+    [TestMethod]
+    public void TestBlockingDisabled()
+    {
+        ManualResetEvent allowJobProcessingHandlerToProceed = new(false);
+        AutoResetEvent jobProcessed = new(false);
+
+        // process handler for the jobs in queue. It blocks on a job till the test method sets the
+        // event allowHandlerToProceed.
+        Action<string?> processHandler = job =>
+        {
+            allowJobProcessingHandlerToProceed.WaitOne();
+            if (string.Equals(job, "job5", StringComparison.OrdinalIgnoreCase))
             {
-                // run the same thing multiple times to ensure that the queue isn't in a erroneous state after being blocked.
-                for (int i = 0; i < 10; i++)
-                {
-                    queue.QueueJob("job1", 8);
-                    queue.QueueJob("job2", 8);
-                    queue.QueueJob("job3", 8);
-                    queue.QueueJob("job4", 8);
-                    queue.QueueJob("job5", 8);
-
-                    // At this point exactly 80 bytes have been queued. Even if all are still in queue, still the need to block shouldn't
-                    // have risen. So queue.enteredBlockingMethod would be false.
-                    Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
-
-                    queue.QueueJob("job6", 8);
-                    queue.QueueJob("job7", 8);
-                    queue.QueueJob("job8", 8);
-                    queue.QueueJob("job9", 8);
-                    queue.QueueJob("job10", 10);
-                    queue.QueueJob("job11", 10);
-
-                    // By this point surely the queue would have blocked at least once, hence setting queue.enteredBlockingMethod true.
-                    Assert.IsTrue(queue.IsEnqueueBlocked, "Did not enter the over-ridden blocking method");
-
-                    // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
-                    jobProcessed.WaitOne();
-
-                    // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
-                    // allowJobProcessingHandlerToProceed is reset to block the handler again in next iteration.
-                    queue.IsEnqueueBlocked = false;
-                    allowJobProcessingHandlerToProceed.Reset();
-
-                    // if we reach here it means that the queue was successfully blocked at some point in between job6 and job11
-                    // and subsequently unblocked.
-                }
+                jobProcessed.Set();
             }
-        }
+        };
 
-        [TestMethod]
-        public void TestBlockingDisabled()
+        using JobQueueWrapper queue = new(processHandler, 2, int.MaxValue, false, allowJobProcessingHandlerToProceed);
+        // run the same thing multiple times to ensure that the queue isn't in a erroneous state after first run.
+        for (int i = 0; i < 10; i++)
         {
-            ManualResetEvent allowJobProcessingHandlerToProceed = new ManualResetEvent(false);
-            AutoResetEvent jobProcessed = new AutoResetEvent(false);
+            queue.QueueJob("job1", 0);
+            queue.QueueJob("job2", 0);
 
-            // process handler for the jobs in queue. It blocks on a job till the test method sets the
-            // event allowHandlerToProceed.
-            Action<string> processHandler = (job) =>
-            {
-                allowJobProcessingHandlerToProceed.WaitOne();
-                if (job.Equals("job5", StringComparison.OrdinalIgnoreCase))
-                {
-                    jobProcessed.Set();
-                }
-            };
-
-            using (JobQueueWrapper queue = new JobQueueWrapper(processHandler, 2, int.MaxValue, false, allowJobProcessingHandlerToProceed))
-            {
-                // run the same thing multiple times to ensure that the queue isn't in a erroneous state after first run.
-                for (int i = 0; i < 10; i++)
-                {
-                    queue.QueueJob("job1", 0);
-                    queue.QueueJob("job2", 0);
-
-                    // At this point only 2 jobs have been queued. Even if all are still in queue, still the need to block shouldn't have
-                    // risen. So queue.enteredBlockingMethod would be false regardless of the blocking disabled or not.
-                    Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
+            // At this point only 2 jobs have been queued. Even if all are still in queue, still the need to block shouldn't have
+            // risen. So queue.enteredBlockingMethod would be false regardless of the blocking disabled or not.
+            Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method at a wrong time.");
 
-                    queue.QueueJob("job3", 0);
-                    queue.QueueJob("job4", 0);
-                    queue.QueueJob("job5", 0);
+            queue.QueueJob("job3", 0);
+            queue.QueueJob("job4", 0);
+            queue.QueueJob("job5", 0);
 
-                    // queue.enteredBlockingMethod should still be false as the queue should not have blocked.
-                    Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method though blocking is disabled.");
+            // queue.enteredBlockingMethod should still be false as the queue should not have blocked.
+            Assert.IsFalse(queue.IsEnqueueBlocked, "Entered the over-ridden blocking method though blocking is disabled.");
 
-                    // allow handlers to proceed.
-                    allowJobProcessingHandlerToProceed.Set();
+            // allow handlers to proceed.
+            allowJobProcessingHandlerToProceed.Set();
 
-                    // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
-                    jobProcessed.WaitOne();
+            // We wait till all jobs are finished, so that for the next iteration the queue is in a deterministic state.
+            jobProcessed.WaitOne();
 
-                    // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
-                    // allowJobProcessingHandlerToProceed is reset to allow blocking the handler again in next iteration.
-                    queue.IsEnqueueBlocked = false;
-                    allowJobProcessingHandlerToProceed.Reset();
+            // queue.enteredBlockingMethod is set to false to check it again in next iteration. Also
+            // allowJobProcessingHandlerToProceed is reset to allow blocking the handler again in next iteration.
+            queue.IsEnqueueBlocked = false;
+            allowJobProcessingHandlerToProceed.Reset();
 
-                    // if we reach here it means that the queue was never blocked.
-                }
-            }
+            // if we reach here it means that the queue was never blocked.
         }
+    }
 
-        [TestMethod]
-        public void TestLargeTestResultCanBeLoadedWithBlockingEnabled()
-        {
-            var jobProcessed = new AutoResetEvent(false);
+    [TestMethod]
+    public void TestLargeTestResultCanBeLoadedWithBlockingEnabled()
+    {
+        var jobProcessed = new AutoResetEvent(false);
 
-            // process handler for the jobs in queue.
-            Action<string> processHandler = (job) =>
-            {
-                jobProcessed.Set();
-            };
+        // process handler for the jobs in queue.
+        Action<string?> processHandler = (job) => jobProcessed.Set();
 
-            using (JobQueueNonBlocking queue = new JobQueueNonBlocking(processHandler))
-            {
-                // run the same thing multiple times to ensure that the queue isn't in a erroneous state after first run.
-                for (var i = 0; i < 10; i++)
-                {
-                    // we try to enqueue a job of size greater than bound on the queue. It should be queued without blocking as
-                    // we check whether or not the queue size has exceeded the limit before actually queuing.
-                    queue.QueueJob("job1", 8);
-
-                    // if queue.EnteredBlockingMethod is true, the enqueuing entered the overridden blocking method. This was not
-                    // intended.
-                    Assert.IsFalse(queue.EnteredBlockingMethod, "Entered the over-ridden blocking method.");
-                    jobProcessed.WaitOne();
-                }
-            }
+        using JobQueueNonBlocking queue = new(processHandler);
+        // run the same thing multiple times to ensure that the queue isn't in a erroneous state after first run.
+        for (var i = 0; i < 10; i++)
+        {
+            // we try to enqueue a job of size greater than bound on the queue. It should be queued without blocking as
+            // we check whether or not the queue size has exceeded the limit before actually queuing.
+            queue.QueueJob("job1", 8);
+
+            // if queue.EnteredBlockingMethod is true, the enqueuing entered the overridden blocking method. This was not
+            // intended.
+            Assert.IsFalse(queue.EnteredBlockingMethod, "Entered the over-ridden blocking method.");
+            jobProcessed.WaitOne();
         }
+    }
+
+    [TestMethod]
+    [Timeout(60000)]
+    public void TestDisposeUnblocksBlockedThreads()
+    {
+        var allowJobProcessingHandlerToProceed = new ManualResetEvent(false);
 
-        [TestMethod]
-        [Timeout(60000)]
-        public void TestDisposeUnblocksBlockedThreads()
+        using var gotBlocked = new ManualResetEvent(false);
+        var job1Running = new ManualResetEvent(false);
+
+        // process handler for the jobs in queue. It blocks on a job till the test method sets the
+        // event allowHandlerToProceed.
+        Action<string?> processHandler = job =>
         {
-            var allowJobProcessingHandlerToProceed = new ManualResetEvent(false);
+            if (string.Equals(job, "job1", StringComparison.OrdinalIgnoreCase))
+                job1Running.Set();
 
-            using (var gotBlocked = new ManualResetEvent(false))
-            {
-                var job1Running = new ManualResetEvent(false);
-
-                // process handler for the jobs in queue. It blocks on a job till the test method sets the
-                // event allowHandlerToProceed.
-                Action<string> processHandler = (job) =>
-                {
-                    if (job.Equals("job1", StringComparison.OrdinalIgnoreCase))
-                        job1Running.Set();
-
-                    allowJobProcessingHandlerToProceed.WaitOne();
-                };
-
-                var jobQueue = new JobQueueWrapper(processHandler, 1, int.MaxValue, true, gotBlocked);
-
-                var queueThread = new Thread(
-                    source =>
-                        {
-                            jobQueue.QueueJob("job1", 0);
-                            job1Running.WaitOne();
-                            jobQueue.QueueJob("job2", 0);
-                            jobQueue.QueueJob("job3", 0);
-                            allowJobProcessingHandlerToProceed.Set();
-                        });
-                queueThread.Start();
-
-                gotBlocked.WaitOne();
-                jobQueue.Dispose();
-                queueThread.Join();
-            }
-        }
+            allowJobProcessingHandlerToProceed.WaitOne();
+        };
 
-        #region Implementation
+        var jobQueue = new JobQueueWrapper(processHandler, 1, int.MaxValue, true, gotBlocked);
 
-        /// <summary>
-        /// a class that inherits from job queue and over rides the WaitForQueueToEmpty to allow for checking that blocking and
-        /// unblocking work as expected.
-        /// </summary>
-        internal class JobQueueWrapper : JobQueue<String>
-        {
-            public JobQueueWrapper(Action<String> processJob,
-                                    int maxNoOfStringsQueueCanHold,
-                                    int maxNoOfBytesQueueCanHold,
-                                    bool isBoundsEnabled,
-                                    ManualResetEvent queueGotBlocked)
-                : base(processJob, "foo", maxNoOfStringsQueueCanHold, maxNoOfBytesQueueCanHold, isBoundsEnabled, (message) => { })
+        var queueThread = new Thread(
+            source =>
             {
-                this.IsEnqueueBlocked = false;
-                this.queueGotBlocked = queueGotBlocked;
-            }
+                jobQueue.QueueJob("job1", 0);
+                job1Running.WaitOne();
+                jobQueue.QueueJob("job2", 0);
+                jobQueue.QueueJob("job3", 0);
+                allowJobProcessingHandlerToProceed.Set();
+            });
+        queueThread.Start();
 
-            protected override bool WaitForQueueToGetEmpty()
-            {
-                this.IsEnqueueBlocked = true;
-                this.queueGotBlocked.Set();
-                return base.WaitForQueueToGetEmpty();
-            }
+        gotBlocked.WaitOne();
+        jobQueue.Dispose();
+        queueThread.Join();
+    }
 
-            /// <summary>
-            /// Specifies whether enQueue was blocked or not.
-            /// </summary>
-            public bool IsEnqueueBlocked
-            {
-                get;
-                set;
-            }
+    #region Implementation
+
+    /// <summary>
+    /// a class that inherits from job queue and over rides the WaitForQueueToEmpty to allow for checking that blocking and
+    /// unblocking work as expected.
+    /// </summary>
+    internal class JobQueueWrapper : JobQueue<string>
+    {
+        public JobQueueWrapper(Action<string?> processJob,
+            int maxNoOfStringsQueueCanHold,
+            int maxNoOfBytesQueueCanHold,
+            bool isBoundsEnabled,
+            ManualResetEvent queueGotBlocked)
+            : base(processJob, "foo", maxNoOfStringsQueueCanHold, maxNoOfBytesQueueCanHold, isBoundsEnabled, (message) => { })
+        {
+            IsEnqueueBlocked = false;
+            _queueGotBlocked = queueGotBlocked;
+        }
 
-            private ManualResetEvent queueGotBlocked;
+        protected override bool WaitForQueueToGetEmpty()
+        {
+            IsEnqueueBlocked = true;
+            _queueGotBlocked.Set();
+            return base.WaitForQueueToGetEmpty();
         }
 
         /// <summary>
-        /// a class that inherits from job queue and over rides the WaitForQueueToEmpty to simply setting a boolean to tell
-        /// whether or not the queue entered the blocking method during the enqueue process.
+        /// Specifies whether enQueue was blocked or not.
         /// </summary>
-        internal class JobQueueNonBlocking : JobQueue<String>
+        public bool IsEnqueueBlocked
         {
-            public JobQueueNonBlocking(Action<String> processHandler)
-                : base(processHandler, "foo", 1, 5, true, (message) => { })
-            {
-                EnteredBlockingMethod = false;
-            }
+            get;
+            set;
+        }
 
-            public bool EnteredBlockingMethod { get; private set; }
+        private readonly ManualResetEvent _queueGotBlocked;
+    }
 
-            protected override bool WaitForQueueToGetEmpty()
-            {
-                EnteredBlockingMethod = true;
-                return true;
-            }
+    /// <summary>
+    /// a class that inherits from job queue and over rides the WaitForQueueToEmpty to simply setting a boolean to tell
+    /// whether or not the queue entered the blocking method during the enqueue process.
+    /// </summary>
+    internal class JobQueueNonBlocking : JobQueue<string>
+    {
+        public JobQueueNonBlocking(Action<string?> processHandler)
+            : base(processHandler, "foo", 1, 5, true, (message) => { })
+        {
+            EnteredBlockingMethod = false;
         }
 
-        #endregion
-
-        #region Utility Methods
+        public bool EnteredBlockingMethod { get; private set; }
 
-        /// <summary>
-        /// Returns a job processing handler which does nothing.
-        /// </summary>
-        /// <typeparam name="T">Type of job the handler processes.</typeparam>
-        /// <returns>Job processing handler which does nothing.</returns>
-        private static Action<T> GetEmptyProcessHandler<T>()
+        protected override bool WaitForQueueToGetEmpty()
         {
-            Action<T> handler = (job) =>
-            {
-            };
-
-            return handler;
+            EnteredBlockingMethod = true;
+            return true;
         }
+    }
+
+    #endregion
+
+    #region Utility Methods
 
-        #endregion
+    /// <summary>
+    /// Returns a job processing handler which does nothing.
+    /// </summary>
+    /// <typeparam name="T">Type of job the handler processes.</typeparam>
+    /// <returns>Job processing handler which does nothing.</returns>
+    private static Action<T?> GetEmptyProcessHandler<T>()
+    {
+        Action<T?> handler = (job) =>
+        {
+        };
+
+        return handler;
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/TimeSpanParserTests.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/TimeSpanParserTests.cs
index 471a0bbe69..7b145b99d6 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/TimeSpanParserTests.cs
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Utilities/TimeSpanParserTests.cs
@@ -1,87 +1,87 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CoreUtilities.UnitTests
-{
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
+using System;
 
-    [TestClass]
-    public class TimeSpanParserTests
-    {
-        [TestMethod]
-        // core use cases
-        [DataRow("5400000")]
-        [DataRow("5400000ms")]
-        [DataRow("5400s")]
-        [DataRow("90m")]
-        [DataRow("1.5h")]
-        [DataRow("0.0625d")]
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CoreUtilities.UnitTests;
+
+[TestClass]
+public class TimeSpanParserTests
+{
+    [TestMethod]
+    // core use cases
+    [DataRow("5400000")]
+    [DataRow("5400000ms")]
+    [DataRow("5400s")]
+    [DataRow("90m")]
+    [DataRow("1.5h")]
+    [DataRow("0.0625d")]
 
-        // with space for parsing from xml
-        [DataRow("5400000 ms")]
-        [DataRow("5400 s")]
-        [DataRow("90 m")]
-        [DataRow("1.5 h")]
-        [DataRow("0.0625 d")]
+    // with space for parsing from xml
+    [DataRow("5400000 ms")]
+    [DataRow("5400 s")]
+    [DataRow("90 m")]
+    [DataRow("1.5 h")]
+    [DataRow("0.0625 d")]
 
-        // nice to haves
-        [DataRow("5400000MS")]
-        [DataRow("5400000millisecond")]
-        [DataRow("5400000milliseconds")]
-        [DataRow("5400000mil")]
-        [DataRow("5400000milisecond")]
-        [DataRow("5400000miliseconds")]
-        [DataRow("5400000mils")]
-        [DataRow("5400000millis")]
-        [DataRow("5400000millisecs")]
-        [DataRow("5400000milisecs")]
-        [DataRow("5400S")]
-        [DataRow("5400second")]
-        [DataRow("5400seconds")]
-        [DataRow("5400sec")]
-        [DataRow("5400secs")]
-        [DataRow("90M")]
-        [DataRow("90minute")]
-        [DataRow("90minutes")]
-        [DataRow("90min")]
-        [DataRow("90mins")]
-        [DataRow("1.5H")]
-        [DataRow("1.5hour")]
-        [DataRow("1.5hours")]
-        [DataRow("1.5hrs")]
-        [DataRow("1.5hr")]
-        [DataRow("0.0625D")]
-        [DataRow("0.0625day")]
-        [DataRow("0.0625days")]
-        public void Parses90Minutes(string time)
-        {
-            Assert.IsTrue(TimeSpanParser.TryParse(time, out var t));
-            Assert.AreEqual(TimeSpan.FromMinutes(90), t);
-        }
+    // nice to haves
+    [DataRow("5400000MS")]
+    [DataRow("5400000millisecond")]
+    [DataRow("5400000milliseconds")]
+    [DataRow("5400000mil")]
+    [DataRow("5400000milisecond")]
+    [DataRow("5400000miliseconds")]
+    [DataRow("5400000mils")]
+    [DataRow("5400000millis")]
+    [DataRow("5400000millisecs")]
+    [DataRow("5400000milisecs")]
+    [DataRow("5400S")]
+    [DataRow("5400second")]
+    [DataRow("5400seconds")]
+    [DataRow("5400sec")]
+    [DataRow("5400secs")]
+    [DataRow("90M")]
+    [DataRow("90minute")]
+    [DataRow("90minutes")]
+    [DataRow("90min")]
+    [DataRow("90mins")]
+    [DataRow("1.5H")]
+    [DataRow("1.5hour")]
+    [DataRow("1.5hours")]
+    [DataRow("1.5hrs")]
+    [DataRow("1.5hr")]
+    [DataRow("0.0625D")]
+    [DataRow("0.0625day")]
+    [DataRow("0.0625days")]
+    public void Parses90Minutes(string time)
+    {
+        Assert.IsTrue(TimeSpanParser.TryParse(time, out var t));
+        Assert.AreEqual(TimeSpan.FromMinutes(90), t);
+    }
 
-        [TestMethod]
-        [DataRow(null)]
-        [DataRow("")]
-        [DataRow(" ")]
-        [DataRow("\n")]
-        [DataRow("\t")]
-        public void ReturnsEmptyTimeSpanOnNullOrWhiteSpace(string time)
-        {
-            Assert.IsTrue(TimeSpanParser.TryParse(time, out var t));
-            Assert.AreEqual(TimeSpan.Zero, t);
-        }
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    [DataRow(" ")]
+    [DataRow("\n")]
+    [DataRow("\t")]
+    public void ReturnsEmptyTimeSpanOnNullOrWhiteSpace(string time)
+    {
+        Assert.IsTrue(TimeSpanParser.TryParse(time, out var t));
+        Assert.AreEqual(TimeSpan.Zero, t);
+    }
 
-        [TestMethod]
-        [DataRow("09808asf")]
-        [DataRow("asfsadf")]
-        [DataRow("min")]
-        [DataRow("ms")]
-        [DataRow("1.1.1")]
-        public void ReturnsFalseForInvalidInput(string time)
-        {
-            Assert.IsFalse(TimeSpanParser.TryParse(time, out var _));
-        }
+    [TestMethod]
+    [DataRow("09808asf")]
+    [DataRow("asfsadf")]
+    [DataRow("min")]
+    [DataRow("ms")]
+    [DataRow("1.1.1")]
+    public void ReturnsFalseForInvalidInput(string time)
+    {
+        Assert.IsFalse(TimeSpanParser.TryParse(time, out var _));
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/FrameworkHandleTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/FrameworkHandleTests.cs
index 033c571c21..cf3eb8bb4f 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/FrameworkHandleTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/FrameworkHandleTests.cs
@@ -1,106 +1,156 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter
-{
-    using System;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 
-    using Moq;
+namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter;
 
-    [TestClass]
-    public class FrameworkHandleTests
+[TestClass]
+public class FrameworkHandleTests
+{
+    [TestMethod]
+    public void EnableShutdownAfterTestRunShoudBeFalseByDefault()
     {
-        [TestMethod]
-        public void EnableShutdownAfterTestRunShoudBeFalseByDefault()
-        {
-            var tec = GetTestExecutionContext();
-            var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null);
+        var tec = GetTestExecutionContext();
+        var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null!);
 
-            Assert.IsFalse(frameworkHandle.EnableShutdownAfterTestRun);
-        }
+        Assert.IsFalse(frameworkHandle.EnableShutdownAfterTestRun);
+    }
 
-        [TestMethod]
-        public void EnableShutdownAfterTestRunShoudBeSetAppropriately()
-        {
-            var tec = GetTestExecutionContext();
-            var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null);
+    [TestMethod]
+    public void EnableShutdownAfterTestRunShoudBeSetAppropriately()
+    {
+        var tec = GetTestExecutionContext();
+        var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null!);
 
-            frameworkHandle.EnableShutdownAfterTestRun = true;
+        frameworkHandle.EnableShutdownAfterTestRun = true;
 
-            Assert.IsTrue(frameworkHandle.EnableShutdownAfterTestRun);
-        }
+        Assert.IsTrue(frameworkHandle.EnableShutdownAfterTestRun);
+    }
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldThrowIfObjectIsDisposed()
-        {
-            var tec = GetTestExecutionContext();
-            var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null);
-            frameworkHandle.Dispose();
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldThrowIfObjectIsDisposed()
+    {
+        var tec = GetTestExecutionContext();
+        var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null!);
+        frameworkHandle.Dispose();
 
-            Assert.ThrowsException<ObjectDisposedException>(() => frameworkHandle.LaunchProcessWithDebuggerAttached(null, null, null, null));
-        }
+        Assert.ThrowsException<ObjectDisposedException>(() => frameworkHandle.LaunchProcessWithDebuggerAttached(null!, null!, null!, null!));
+    }
+
+    [TestMethod]
+    [Ignore("TODO: Enable method once we fix the \"IsDebug\" in TestExecutionContext")]
+    public void LaunchProcessWithDebuggerAttachedShouldThrowIfNotInDebugContext()
+    {
+        var tec = GetTestExecutionContext();
+        var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null!);
 
-        // TODO: Enable method once we fix the "IsDebug" in TestExecutionContext
-        // [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldThrowIfNotInDebugContext()
+        var isExceptionThrown = false;
+        try
         {
-            var tec = GetTestExecutionContext();
-            var frameworkHandle = new FrameworkHandle(null, new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }), tec, null);
-
-            var isExceptionThrown = false;
-            try
-            {
-                frameworkHandle.LaunchProcessWithDebuggerAttached(null, null, null, null);
-            }
-            catch (InvalidOperationException exception)
-            {
-                isExceptionThrown = true;
-                Assert.AreEqual("This operation is not allowed in the context of a non-debug run.", exception.Message);
-            }
-
-            Assert.IsTrue(isExceptionThrown);
+            frameworkHandle.LaunchProcessWithDebuggerAttached(null!, null, null, null);
         }
-
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldCallRunEventsHandler()
+        catch (InvalidOperationException exception)
         {
-            var tec = GetTestExecutionContext();
-            tec.IsDebug = true;
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+            isExceptionThrown = true;
+            Assert.AreEqual("This operation is not allowed in the context of a non-debug run.", exception.Message);
+        }
 
-            var frameworkHandle = new FrameworkHandle(
-                                      null,
-                                      new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }),
-                                      tec,
-                                      mockTestRunEventsHandler.Object);
+        Assert.IsTrue(isExceptionThrown);
+    }
 
-            frameworkHandle.LaunchProcessWithDebuggerAttached(null, null, null, null);
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldCallRunEventsHandler()
+    {
+        var tec = GetTestExecutionContext();
+        tec.IsDebug = true;
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
 
-            mockTestRunEventsHandler.Verify(mt =>
-                mt.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()), Times.Once);
-        }
+        var frameworkHandle = new FrameworkHandle(
+            null,
+            new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }),
+            tec,
+            mockTestRunEventsHandler.Object);
 
-        private static TestExecutionContext GetTestExecutionContext()
-        {
-            var tec = new TestExecutionContext(
-                          frequencyOfRunStatsChangeEvent: 100,
-                          runStatsChangeEventTimeout: TimeSpan.MaxValue,
-                          inIsolation: false,
-                          keepAlive: false,
-                          isDataCollectionEnabled: false,
-                          areTestCaseLevelEventsRequired: false,
-                          hasTestRun: false,
-                          isDebug: false,
-                          testCaseFilter: string.Empty,
-                          filterOptions: null);
-            return tec;
-        }
+        frameworkHandle.LaunchProcessWithDebuggerAttached(null!, null, null, null);
+
+        mockTestRunEventsHandler.Verify(mt =>
+            mt.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldSetCurrentDirectoryWhenWorkingDirectoryIsNull()
+    {
+        var tec = GetTestExecutionContext();
+        tec.IsDebug = true;
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        TestProcessStartInfo? capturedProcessInfo = null;
+
+        mockTestRunEventsHandler
+            .Setup(mt => mt.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()))
+            .Callback<TestProcessStartInfo>(info => capturedProcessInfo = info)
+            .Returns(1234);
+
+        var frameworkHandle = new FrameworkHandle(
+            null,
+            new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }),
+            tec,
+            mockTestRunEventsHandler.Object);
+
+        frameworkHandle.LaunchProcessWithDebuggerAttached("test.exe", null, null, null);
+
+        Assert.IsNotNull(capturedProcessInfo);
+        Assert.AreEqual(Environment.CurrentDirectory, capturedProcessInfo.WorkingDirectory);
+    }
+
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldUseProvidedWorkingDirectory()
+    {
+        var tec = GetTestExecutionContext();
+        tec.IsDebug = true;
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        TestProcessStartInfo? capturedProcessInfo = null;
+        var expectedWorkingDirectory = "/custom/path";
+
+        mockTestRunEventsHandler
+            .Setup(mt => mt.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()))
+            .Callback<TestProcessStartInfo>(info => capturedProcessInfo = info)
+            .Returns(1234);
+
+        var frameworkHandle = new FrameworkHandle(
+            null,
+            new TestRunCache(100, TimeSpan.MaxValue, (s, r, ip) => { }),
+            tec,
+            mockTestRunEventsHandler.Object);
+
+        frameworkHandle.LaunchProcessWithDebuggerAttached("test.exe", expectedWorkingDirectory, null, null);
+
+        Assert.IsNotNull(capturedProcessInfo);
+        Assert.AreEqual(expectedWorkingDirectory, capturedProcessInfo.WorkingDirectory);
+    }
+
+    private static TestExecutionContext GetTestExecutionContext()
+    {
+        var tec = new TestExecutionContext(
+            frequencyOfRunStatsChangeEvent: 100,
+            runStatsChangeEventTimeout: TimeSpan.MaxValue,
+            inIsolation: false,
+            keepAlive: false,
+            isDataCollectionEnabled: false,
+            areTestCaseLevelEventsRequired: false,
+            hasTestRun: false,
+            isDebug: false,
+            testCaseFilter: string.Empty,
+            filterOptions: null);
+        return tec;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/RunContextTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/RunContextTests.cs
index 88a2b62a5c..8f9e3a1a42 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/RunContextTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/RunContextTests.cs
@@ -1,66 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using MSTest.TestFramework.AssertExtensions;
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class RunContextTests
-    {
-        private RunContext runContext;
+namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter;
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.runContext = new RunContext();
-        }
+[TestClass]
+public class RunContextTests
+{
+    private readonly RunContext _runContext;
 
-        [TestMethod]
-        public void GetTestCaseFilterShouldReturnNullIfFilterExpressionIsNull()
-        {
-            this.runContext.FilterExpressionWrapper = null;
+    public RunContextTests()
+    {
+        _runContext = new RunContext();
+    }
 
-            Assert.IsNull(this.runContext.GetTestCaseFilter(null, (s) => { return null; }));
-        }
+    [TestMethod]
+    public void GetTestCaseFilterShouldReturnNullIfFilterExpressionIsNull()
+    {
+        _runContext.FilterExpressionWrapper = null;
 
-        /// <summary>
-        /// If only property value passed, consider property key and operation defaults.
-        /// </summary>
-        [TestMethod]
-        public void GetTestCaseFilterShouldNotThrowIfPropertyValueOnlyPassed()
-        {
-            this.runContext.FilterExpressionWrapper = new FilterExpressionWrapper("Infinity");
+        Assert.IsNull(_runContext.GetTestCaseFilter(null, s => null));
+    }
 
-            var filter = this.runContext.GetTestCaseFilter(new List<string>{ "FullyQualifiedName" }, (s) => { return null; });
+    /// <summary>
+    /// If only property value passed, consider property key and operation defaults.
+    /// </summary>
+    [TestMethod]
+    public void GetTestCaseFilterShouldNotThrowIfPropertyValueOnlyPassed()
+    {
+        _runContext.FilterExpressionWrapper = new FilterExpressionWrapper("Infinity");
+
+        var filter = _runContext.GetTestCaseFilter(new List<string> { "FullyQualifiedName" }, s => null);
 
-            Assert.IsNotNull(filter);
-        }
+        Assert.IsNotNull(filter);
+    }
 
-        [TestMethod]
-        public void GetTestCaseFilterShouldNotThrowOnInvalidProperties()
-        {
-            this.runContext.FilterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
+    [TestMethod]
+    public void GetTestCaseFilterShouldNotThrowOnInvalidProperties()
+    {
+        _runContext.FilterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
 
-            var filter = this.runContext.GetTestCaseFilter(new List<string> { "TestCategory" }, (s) => { return null; });
+        var filter = _runContext.GetTestCaseFilter(new List<string> { "TestCategory" }, s => null);
 
-            Assert.IsNotNull(filter);
-        }
+        Assert.IsNotNull(filter);
+    }
 
-        [TestMethod]
-        public void GetTestCaseFilterShouldReturnTestCaseFilter()
-        {
-            this.runContext.FilterExpressionWrapper = new FilterExpressionWrapper("TestCategory=Important");
-            var filter = this.runContext.GetTestCaseFilter(new List<string> { "TestCategory" }, (s) => { return null; });
+    [TestMethod]
+    public void GetTestCaseFilterShouldReturnTestCaseFilter()
+    {
+        _runContext.FilterExpressionWrapper = new FilterExpressionWrapper("TestCategory=Important");
+        var filter = _runContext.GetTestCaseFilter(new List<string> { "TestCategory" }, s => null);
 
-            Assert.IsNotNull(filter);
-            Assert.AreEqual("TestCategory=Important", filter.TestCaseFilterValue);
-        }
+        Assert.IsNotNull(filter);
+        Assert.AreEqual("TestCategory=Important", filter.TestCaseFilterValue);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/TestExecutionRecorderTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/TestExecutionRecorderTests.cs
index 1754bf621d..be223b219a 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/TestExecutionRecorderTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Adapter/TestExecutionRecorderTests.cs
@@ -1,227 +1,223 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter
-{
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Moq;
+using Moq;
 
-    using TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
+using TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
 
-    [TestClass]
-    public class TestExecutionRecorderTests
-    {
-        private TestableTestRunCache testableTestRunCache;
-        private Mock<ITestCaseEventsHandler> mockTestCaseEventsHandler;
-        private TestExecutionRecorder testRecorder, testRecorderWithTestEventsHandler;
-        private TestCase testCase;
-        private Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult testResult;
+namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter;
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.testableTestRunCache = new TestableTestRunCache();
-            this.testRecorder = new TestExecutionRecorder(null, this.testableTestRunCache);
+[TestClass]
+public class TestExecutionRecorderTests
+{
+    private readonly TestableTestRunCache _testableTestRunCache;
+    private readonly Mock<ITestCaseEventsHandler> _mockTestCaseEventsHandler;
+    private readonly TestExecutionRecorder _testRecorder, _testRecorderWithTestEventsHandler;
+    private readonly TestCase _testCase;
+    private readonly Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult _testResult;
 
-            this.testCase = new TestCase("A.C.M", new Uri("executor://dummy"), "A");
-            this.testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(this.testCase);
+    public TestExecutionRecorderTests()
+    {
+        _testableTestRunCache = new TestableTestRunCache();
+        _testRecorder = new TestExecutionRecorder(null, _testableTestRunCache);
 
-            this.mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
-            testRecorderWithTestEventsHandler = new TestExecutionRecorder(this.mockTestCaseEventsHandler.Object, this.testableTestRunCache);
+        _testCase = new TestCase("A.C.M", new Uri("executor://dummy"), "A");
+        _testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(_testCase);
 
-        }
+        _mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+        _testRecorderWithTestEventsHandler = new TestExecutionRecorder(_mockTestCaseEventsHandler.Object, _testableTestRunCache);
 
-        [TestMethod]
-        public void AttachmentsShouldReturnEmptyListByDefault()
-        {
-            var attachments = this.testRecorder.Attachments;
+    }
 
-            Assert.IsNotNull(attachments);
-            Assert.AreEqual(0, attachments.Count);
-        }
+    [TestMethod]
+    public void AttachmentsShouldReturnEmptyListByDefault()
+    {
+        var attachments = _testRecorder.Attachments;
 
-        [TestMethod]
-        public void RecordStartShouldUpdateTestRunCache()
-        {
-            this.testRecorder.RecordStart(this.testCase);
-            Assert.IsTrue(this.testableTestRunCache.TestStartedList.Contains(this.testCase));
-        }
+        Assert.IsNotNull(attachments);
+        Assert.AreEqual(0, attachments.Count);
+    }
 
-        [TestMethod]
-        public void RecordResultShouldUpdateTestRunCache()
-        {
-            this.testRecorder.RecordResult(this.testResult);
-            Assert.IsTrue(this.testableTestRunCache.TestResultList.Contains(this.testResult));
-        }
+    [TestMethod]
+    public void RecordStartShouldUpdateTestRunCache()
+    {
+        _testRecorder.RecordStart(_testCase);
+        Assert.IsTrue(_testableTestRunCache.TestStartedList.Contains(_testCase));
+    }
 
-        [TestMethod]
-        public void RecordEndShouldUpdateTestRunCache()
-        {
-            this.testRecorder.RecordEnd(this.testCase, TestOutcome.Passed);
-            Assert.IsTrue(this.testableTestRunCache.TestCompletedList.Contains(this.testCase));
-        }
+    [TestMethod]
+    public void RecordResultShouldUpdateTestRunCache()
+    {
+        _testRecorder.RecordResult(_testResult);
+        Assert.IsTrue(_testableTestRunCache.TestResultList.Contains(_testResult));
+    }
 
-        [TestMethod]
-        public void RecordAttachmentsShouldAddToAttachmentSet()
-        {
-            var attachmentSet = new List<AttachmentSet> { new AttachmentSet(new Uri("attachment://dummy"), "attachment") };
+    [TestMethod]
+    public void RecordEndShouldUpdateTestRunCache()
+    {
+        _testRecorder.RecordEnd(_testCase, TestOutcome.Passed);
+        Assert.IsTrue(_testableTestRunCache.TestCompletedList.Contains(_testCase));
+    }
 
-            this.testRecorder.RecordAttachments(attachmentSet);
+    [TestMethod]
+    public void RecordAttachmentsShouldAddToAttachmentSet()
+    {
+        var attachmentSet = new List<AttachmentSet> { new(new Uri("attachment://dummy"), "attachment") };
 
-            var attachments = testRecorder.Attachments;
+        _testRecorder.RecordAttachments(attachmentSet);
 
-            Assert.IsNotNull(attachments);
-            CollectionAssert.AreEqual(attachmentSet, attachments);
-        }
+        var attachments = _testRecorder.Attachments;
 
-        [TestMethod]
-        public void RecordAttachmentsShouldAddToAttachmentSetForMultipleAttachments()
-        {
-            var attachmentSet = new List<AttachmentSet>
-                                    {
-                                        new AttachmentSet(new Uri("attachment://dummy"), "attachment"),
-                                        new AttachmentSet(new Uri("attachment://infinite"), "infinity")
-                                    };
+        Assert.IsNotNull(attachments);
+        CollectionAssert.AreEqual(attachmentSet, attachments);
+    }
 
-            this.testRecorder.RecordAttachments(attachmentSet);
+    [TestMethod]
+    public void RecordAttachmentsShouldAddToAttachmentSetForMultipleAttachments()
+    {
+        var attachmentSet = new List<AttachmentSet>
+        {
+            new(new Uri("attachment://dummy"), "attachment"),
+            new(new Uri("attachment://infinite"), "infinity")
+        };
 
-            var attachments = this.testRecorder.Attachments;
+        _testRecorder.RecordAttachments(attachmentSet);
 
-            Assert.IsNotNull(attachments);
-            CollectionAssert.AreEqual(attachmentSet, attachments);
+        var attachments = _testRecorder.Attachments;
 
-            var newAttachmentSet = new AttachmentSet(new Uri("attachment://median"), "mid");
-            attachmentSet.Add(newAttachmentSet);
+        Assert.IsNotNull(attachments);
+        CollectionAssert.AreEqual(attachmentSet, attachments);
 
-            this.testRecorder.RecordAttachments(new List<AttachmentSet> { newAttachmentSet });
+        var newAttachmentSet = new AttachmentSet(new Uri("attachment://median"), "mid");
+        attachmentSet.Add(newAttachmentSet);
 
-            attachments = this.testRecorder.Attachments;
+        _testRecorder.RecordAttachments(new List<AttachmentSet> { newAttachmentSet });
 
-            Assert.IsNotNull(attachments);
-            CollectionAssert.AreEqual(attachmentSet, attachments);
-        }
+        attachments = _testRecorder.Attachments;
 
-        #region TestCaseResult caching tests.
-        [TestMethod]
-        public void RecordStartShouldInvokeSendTestCaseStart()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
+        Assert.IsNotNull(attachments);
+        CollectionAssert.AreEqual(attachmentSet, attachments);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseStart(this.testCase), Times.Once);
-        }
+    #region TestCaseResult caching tests.
+    [TestMethod]
+    public void RecordStartShouldInvokeSendTestCaseStart()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
 
-        [TestMethod]
-        public void RecordEndShouldInovkeTestCaseEndEventOnlyIfTestCaseStartWasCalledBefore()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseStart(_testCase), Times.Once);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Once);
-        }
+    [TestMethod]
+    public void RecordEndShouldInovkeTestCaseEndEventOnlyIfTestCaseStartWasCalledBefore()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
 
-        [TestMethod]
-        public void RecordEndShouldNotInovkeTestCaseEndEventIfTestCaseStartWasNotCalledBefore()
-        {
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Once);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Never);
-        }
+    [TestMethod]
+    public void RecordEndShouldNotInovkeTestCaseEndEventIfTestCaseStartWasNotCalledBefore()
+    {
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
 
-        [TestMethod]
-        public void RecordEndShouldNotInvokeTestCaseEndEventInCaseOfAMissingTestCaseStartInDataDrivenScenario()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Failed);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Never);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Once);
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Failed), Times.Never);
-        }
+    [TestMethod]
+    public void RecordEndShouldNotInvokeTestCaseEndEventInCaseOfAMissingTestCaseStartInDataDrivenScenario()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Failed);
 
-        [TestMethod]
-        public void RecordEndShouldInvokeSendTestCaseEndMultipleTimesInDataDrivenScenario()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Once);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Failed), Times.Never);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Exactly(2));
-        }
+    [TestMethod]
+    public void RecordEndShouldInvokeSendTestCaseEndMultipleTimesInDataDrivenScenario()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
 
-        [TestMethod]
-        public void RecordStartAndRecordEndShouldIgnoreRedundantTestCaseStartAndTestCaseEnd()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Exactly(2));
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseStart(this.testCase), Times.Exactly(1));
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Exactly(1));
-        }
+    [TestMethod]
+    public void RecordStartAndRecordEndShouldIgnoreRedundantTestCaseStartAndTestCaseEnd()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
 
-        [TestMethod]
-        public void RecordResultShouldPublishTestResultIfRecordStartAndRecordEndEventsAreNotPublished()
-        {
-            this.testRecorderWithTestEventsHandler.RecordResult(this.testResult);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseStart(_testCase), Times.Exactly(1));
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Exactly(1));
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestResult(this.testResult), Times.Once);
-        }
+    [TestMethod]
+    public void RecordResultShouldPublishTestResultIfRecordStartAndRecordEndEventsAreNotPublished()
+    {
+        _testRecorderWithTestEventsHandler.RecordResult(_testResult);
 
-        [TestMethod]
-        public void RecordResultShouldPublishTestCaseResultEventIfTestCaseStartAndTestCaseEndEventsArePublished()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
-            this.testRecorderWithTestEventsHandler.RecordResult(this.testResult);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestResult(_testResult), Times.Once);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestResult(testResult), Times.Once);
-        }
+    [TestMethod]
+    public void RecordResultShouldPublishTestCaseResultEventIfTestCaseStartAndTestCaseEndEventsArePublished()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
+        _testRecorderWithTestEventsHandler.RecordResult(_testResult);
 
-        [TestMethod]
-        public void RecordResultShouldFlushIfRecordEndWasCalledBefore()
-        {
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, TestOutcome.Passed);
-            this.testRecorderWithTestEventsHandler.RecordResult(this.testResult);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestResult(_testResult), Times.Once);
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Once);
-            Assert.IsTrue(this.testableTestRunCache.TestResultList.Contains(this.testResult));
-        }
+    [TestMethod]
+    public void RecordResultShouldFlushIfRecordEndWasCalledBefore()
+    {
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, TestOutcome.Passed);
+        _testRecorderWithTestEventsHandler.RecordResult(_testResult);
 
-        [TestMethod]
-        public void RecordResultShouldSendTestCaseEndEventAndFlushIfRecordEndWasCalledAfterRecordResult()
-        {
-            this.testResult.Outcome = TestOutcome.Passed;
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordResult(this.testResult);
-            this.testRecorderWithTestEventsHandler.RecordEnd(this.testCase, this.testResult.Outcome);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Once);
+        Assert.IsTrue(_testableTestRunCache.TestResultList.Contains(_testResult));
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Once);
-            Assert.IsTrue(this.testableTestRunCache.TestResultList.Contains(this.testResult));
-        }
+    [TestMethod]
+    public void RecordResultShouldSendTestCaseEndEventAndFlushIfRecordEndWasCalledAfterRecordResult()
+    {
+        _testResult.Outcome = TestOutcome.Passed;
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordResult(_testResult);
+        _testRecorderWithTestEventsHandler.RecordEnd(_testCase, _testResult.Outcome);
 
-        [TestMethod]
-        public void RecordResultShouldSendTestCaseEndEventIfRecordEndWasNotCalled()
-        {
-            this.testResult.Outcome = TestOutcome.Passed;
-            this.testRecorderWithTestEventsHandler.RecordStart(this.testCase);
-            this.testRecorderWithTestEventsHandler.RecordResult(this.testResult);
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Once);
+        Assert.IsTrue(_testableTestRunCache.TestResultList.Contains(_testResult));
+    }
 
-            this.mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(this.testCase, TestOutcome.Passed), Times.Once);
-            Assert.IsTrue(this.testableTestRunCache.TestResultList.Contains(this.testResult));
-        }
+    [TestMethod]
+    public void RecordResultShouldSendTestCaseEndEventIfRecordEndWasNotCalled()
+    {
+        _testResult.Outcome = TestOutcome.Passed;
+        _testRecorderWithTestEventsHandler.RecordStart(_testCase);
+        _testRecorderWithTestEventsHandler.RecordResult(_testResult);
 
-        #endregion
+        _mockTestCaseEventsHandler.Verify(x => x.SendTestCaseEnd(_testCase, TestOutcome.Passed), Times.Once);
+        Assert.IsTrue(_testableTestRunCache.TestResultList.Contains(_testResult));
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs
new file mode 100644
index 0000000000..ca3ebea968
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs
@@ -0,0 +1,300 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollectorAttachmentProcessorAppDomainTests;
+
+[TestClass]
+public class DataCollectorAttachmentProcessorAppDomainTests
+{
+    private readonly Mock<IMessageLogger> _loggerMock = new();
+    internal static string SomeState = "deafultState";
+
+    [TestMethod]
+    public async Task DataCollectorAttachmentProcessorAppDomain_ShouldBeIsolated()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSample"), "AppDomainSample", typeof(AppDomainSampleDataCollector).AssemblyQualifiedName, typeof(AppDomainSampleDataCollector).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSample"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+
+        // act
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+        Assert.IsTrue(dcap.LoadSucceded);
+        await dcap.ProcessAttachmentSetsAsync(doc.DocumentElement, attachments, new Progress<int>((int report) => { }), _loggerMock.Object, CancellationToken.None);
+
+        //Assert
+        // If the processor runs in another AppDomain the static state is not shared and should not change.
+        Assert.AreEqual("deafultState", SomeState);
+    }
+
+    [TestMethod]
+    public async Task DataCollectorAttachmentProcessorAppDomain_ShouldCancel()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSample"), "AppDomainSample", typeof(AppDomainSampleDataCollector).AssemblyQualifiedName, typeof(AppDomainSampleDataCollector).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSample"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement>5000</configurationElement>");
+        CancellationTokenSource cts = new();
+
+        // act
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+        Assert.IsTrue(dcap.LoadSucceded);
+
+        Task runProcessing = dcap.ProcessAttachmentSetsAsync(doc.DocumentElement, attachments, new Progress<int>((int report) => cts.Cancel()), _loggerMock.Object, cts.Token);
+
+        //assert
+        await Assert.ThrowsExceptionAsync<OperationCanceledException>(async () => await runProcessing);
+    }
+
+    [TestMethod]
+    public async Task DataCollectorAttachmentProcessorAppDomain_ShouldReturnCorrectAttachments()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSample"), "AppDomainSample", typeof(AppDomainSampleDataCollector).AssemblyQualifiedName, typeof(AppDomainSampleDataCollector).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSample"), "AppDomainSample");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+
+        // act
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+        Assert.IsTrue(dcap.LoadSucceded);
+
+        var attachmentsResult = await dcap.ProcessAttachmentSetsAsync(doc.DocumentElement, attachments, new Progress<int>(), _loggerMock.Object, CancellationToken.None);
+        var firstAttachmentSet = attachmentsResult.First();
+
+        // assert
+        // We return same instance but we're marshaling so we expected different pointers
+        Assert.AreNotSame(attachmentSet, firstAttachmentSet);
+
+        Assert.AreEqual(attachmentSet.DisplayName, firstAttachmentSet.DisplayName);
+        Assert.AreEqual(attachmentSet.Uri, firstAttachmentSet.Uri);
+        Assert.AreEqual(attachmentSet.Attachments.Count, attachmentsResult.Count);
+        Assert.AreEqual(attachmentSet.Attachments[0].Description, firstAttachmentSet.Attachments[0].Description);
+        Assert.AreEqual(attachmentSet.Attachments[0].Uri, firstAttachmentSet.Attachments[0].Uri);
+        Assert.AreEqual(attachmentSet.Attachments[0].Uri, firstAttachmentSet.Attachments[0].Uri);
+    }
+
+    [TestMethod]
+    public async Task DataCollectorAttachmentProcessorAppDomain_ShouldReportProgressCorrectly()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSample"), "AppDomainSample", typeof(AppDomainSampleDataCollector).AssemblyQualifiedName, typeof(AppDomainSampleDataCollector).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSample"), "AppDomainSample");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+
+        // act
+        var progress = new CustomProgress();
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+        Assert.IsTrue(dcap.LoadSucceded);
+
+        var attachmentsResult = await dcap.ProcessAttachmentSetsAsync(
+            doc.DocumentElement,
+            attachments,
+            progress,
+            _loggerMock.Object,
+            CancellationToken.None);
+
+        // assert
+        progress.CountdownEvent.Wait(new CancellationTokenSource(10000).Token);
+        Assert.AreEqual(10, progress.Progress[0]);
+        Assert.AreEqual(50, progress.Progress[1]);
+        Assert.AreEqual(100, progress.Progress[2]);
+    }
+
+    [TestMethod]
+    public async Task DataCollectorAttachmentProcessorAppDomain_ShouldLogCorrectly()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSample"), "AppDomainSample", typeof(AppDomainSampleDataCollector).AssemblyQualifiedName, typeof(AppDomainSampleDataCollector).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSample"), "AppDomainSample");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+        CountdownEvent countdownEvent = new(3);
+        List<Tuple<TestMessageLevel, string>> messages = new();
+        _loggerMock.Setup(x => x.SendMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback((TestMessageLevel messageLevel, string message)
+            =>
+        {
+            countdownEvent.Signal();
+            messages.Add(new Tuple<TestMessageLevel, string>(messageLevel, message));
+        });
+
+        // act
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+        Assert.IsTrue(dcap.LoadSucceded);
+
+        var attachmentsResult = await dcap.ProcessAttachmentSetsAsync(doc.DocumentElement, attachments, new Progress<int>(), _loggerMock.Object, CancellationToken.None);
+
+        // assert
+        countdownEvent.Wait(new CancellationTokenSource(10000).Token);
+        Assert.AreEqual(3, messages.Count);
+        Assert.AreEqual(TestMessageLevel.Informational, messages[0].Item1);
+        Assert.AreEqual("Info", messages[0].Item2);
+        Assert.AreEqual(TestMessageLevel.Warning, messages[1].Item1);
+        Assert.AreEqual("Warning", messages[1].Item2);
+        Assert.AreEqual(TestMessageLevel.Error, messages[2].Item1);
+        Assert.AreEqual($"line1{Environment.NewLine}line2{Environment.NewLine}line3", messages[2].Item2);
+    }
+
+    [TestMethod]
+    public void DataCollectorAttachmentProcessorAppDomain_ShouldReportFailureDuringExtensionCreation()
+    {
+        // arrange
+        var invokedDataCollector = new InvokedDataCollector(new Uri("datacollector://AppDomainSampleFailure"), "AppDomainSampleFailure", typeof(AppDomainSampleDataCollectorFailure).AssemblyQualifiedName, typeof(AppDomainSampleDataCollectorFailure).Assembly.Location, true);
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://AppDomainSampleFailure"), "AppDomainSampleFailure");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\sample"), "sample"));
+        Collection<AttachmentSet> attachments = new() { attachmentSet };
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+        using ManualResetEventSlim errorReportEvent = new();
+        _loggerMock.Setup(x => x.SendMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback((TestMessageLevel messageLevel, string message)
+            =>
+        {
+            if (messageLevel == TestMessageLevel.Error)
+            {
+                Assert.IsTrue(message.Contains("System.Exception: Failed to create the extension"));
+                errorReportEvent.Set();
+            }
+        });
+
+        // act
+        using DataCollectorAttachmentProcessorAppDomain dcap = new(invokedDataCollector, _loggerMock.Object);
+
+        //assert
+        errorReportEvent.Wait(new CancellationTokenSource(10000).Token);
+        Assert.IsFalse(dcap.LoadSucceded);
+    }
+
+    [DataCollectorFriendlyName("AppDomainSample")]
+    [DataCollectorTypeUri("datacollector://AppDomainSample")]
+    [DataCollectorAttachmentProcessor(typeof(AppDomainDataCollectorAttachmentProcessor))]
+    public class AppDomainSampleDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    public class AppDomainDataCollectorAttachmentProcessor : IDataCollectorAttachmentProcessor
+    {
+        public bool SupportsIncrementalProcessing => false;
+
+        public IEnumerable<Uri> GetExtensionUris() => new[] { new Uri("datacollector://AppDomainSample") };
+
+        public async Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+        {
+            SomeState = "Updated shared state";
+
+            var timeout = configurationElement.InnerText;
+            if (!string.IsNullOrEmpty(timeout))
+            {
+                progressReporter.Report(100);
+
+                DateTime expire = DateTime.UtcNow + TimeSpan.FromMilliseconds(int.Parse(timeout, CultureInfo.CurrentCulture));
+                while (true)
+                {
+                    if (DateTime.UtcNow > expire)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                    }
+
+#pragma warning disable CA2016 // Forward the 'CancellationToken' parameter to methods
+                    await Task.Delay(1000);
+#pragma warning restore CA2016 // Forward the 'CancellationToken' parameter to methods
+                }
+            }
+
+            progressReporter.Report(10);
+            progressReporter.Report(50);
+            progressReporter.Report(100);
+
+            logger.SendMessage(TestMessageLevel.Informational, "Info");
+            logger.SendMessage(TestMessageLevel.Warning, "Warning");
+            logger.SendMessage(TestMessageLevel.Error, $"line1{Environment.NewLine}line2\nline3");
+
+            return attachments;
+        }
+    }
+
+    [DataCollectorFriendlyName("AppDomainSampleFailure")]
+    [DataCollectorTypeUri("datacollector://AppDomainSampleFailure")]
+    [DataCollectorAttachmentProcessor(typeof(AppDomainDataCollectorAttachmentProcessorFailure))]
+    public class AppDomainSampleDataCollectorFailure : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+
+    public class AppDomainDataCollectorAttachmentProcessorFailure : IDataCollectorAttachmentProcessor
+    {
+        public AppDomainDataCollectorAttachmentProcessorFailure()
+        {
+            throw new Exception("Failed to create the extension");
+        }
+
+        public bool SupportsIncrementalProcessing => false;
+
+        public IEnumerable<Uri> GetExtensionUris() => throw new NotImplementedException();
+
+        public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
+    }
+
+    public class CustomProgress : IProgress<int>
+    {
+        public List<int> Progress { get; set; } = new List<int>();
+        public CountdownEvent CountdownEvent { get; set; } = new CountdownEvent(3);
+
+        public void Report(int value)
+        {
+            Progress.Add(value);
+            CountdownEvent.Signal();
+        }
+    }
+}
+
+#endif
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingManagerTests.cs
index a51adcc7d6..54bb5e48e6 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/TestRunAttachmentsProcessingManagerTests.cs
@@ -1,416 +1,388 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestRunAttachmentsProcessing
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestRunAttachmentsProcessing;
+
+[TestClass]
+public class TestRunAttachmentsProcessingManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class TestRunAttachmentsProcessingManagerTests
+    private const string Uri1 = "datacollector://microsoft/some1/1.0";
+    private const string Uri2 = "datacollector://microsoft/some2/2.0";
+    private const string Uri3 = "datacollector://microsoft/some3/2.0";
+
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<ITestPlatformEventSource> _mockEventSource;
+    private readonly Mock<IDataCollectorAttachmentProcessor> _mockAttachmentHandler1;
+    private readonly Mock<IDataCollectorAttachmentProcessor> _mockAttachmentHandler2;
+    private readonly Mock<IDataCollectorAttachmentsProcessorsFactory> _mockDataCollectorAttachmentsProcessorsFactory;
+    private readonly Mock<ITestRunAttachmentsProcessingEventsHandler> _mockEventsHandler;
+    private readonly TestRunAttachmentsProcessingManager _manager;
+    private readonly CancellationTokenSource _cancellationTokenSource;
+
+    public TestRunAttachmentsProcessingManagerTests()
     {
-        private const string uri1 = "datacollector://microsoft/some1/1.0";
-        private const string uri2 = "datacollector://microsoft/some2/2.0";
-        private const string uri3 = "datacollector://microsoft/some3/2.0";
-
-        private readonly Mock<IRequestData> mockRequestData;
-        private readonly Mock<IMetricsCollection> mockMetricsCollection;
-        private readonly Mock<ITestPlatformEventSource> mockEventSource;
-        private readonly Mock<IDataCollectorAttachmentProcessor> mockAttachmentHandler1;
-        private readonly Mock<IDataCollectorAttachmentProcessor> mockAttachmentHandler2;
-        private readonly Mock<ITestRunAttachmentsProcessingEventsHandler> mockEventsHandler;
-        private readonly TestRunAttachmentsProcessingManager manager;
-        private readonly CancellationTokenSource cancellationTokenSource;
-
-        public TestRunAttachmentsProcessingManagerTests()
-        {
-            mockRequestData = new Mock<IRequestData>();
-            mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(r => r.MetricsCollection).Returns(mockMetricsCollection.Object);
-
-            mockEventSource = new Mock<ITestPlatformEventSource>();
-            mockAttachmentHandler1 = new Mock<IDataCollectorAttachmentProcessor>();
-            mockAttachmentHandler2 = new Mock<IDataCollectorAttachmentProcessor>();
-            mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
-
-            mockAttachmentHandler1.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(uri1) });
-            mockAttachmentHandler2.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(uri2) });
-
-            manager = new TestRunAttachmentsProcessingManager(mockEventSource.Object, mockAttachmentHandler1.Object, mockAttachmentHandler2.Object);
-
-            cancellationTokenSource = new CancellationTokenSource();
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfNoAttachmentsOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>();
-
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
-
-            // assert
-            VerifyCompleteEvent(false, false);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled), It.Is<ICollection<AttachmentSet>>(c => c.Count == 0)));
-            mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(0));
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(0));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 0, outputCount: 0);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnNoAttachments_IfNoAttachmentsOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>();
-
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
-
-            // assert
-            Assert.AreEqual(0, result.Count);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 0, outputCount: 0);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1NotProcessedAttachmentThroughEventsHandler_If1NotRelatedAttachmentOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri3), "uri3_input")
-            };
-
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
-
-            // assert
-            VerifyCompleteEvent(false, false, inputAttachments[0]);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 1, outputCount: 1);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1NotProcessedAttachment_If1NotRelatedAttachmentOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri3), "uri3_input")
-            };
-
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
-
-            // assert
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.Contains(inputAttachments[0]));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 1, outputCount: 1);
-        }
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(r => r.MetricsCollection).Returns(_mockMetricsCollection.Object);
+
+        _mockEventSource = new Mock<ITestPlatformEventSource>();
+        _mockAttachmentHandler1 = new Mock<IDataCollectorAttachmentProcessor>();
+        _mockAttachmentHandler1.Setup(x => x.SupportsIncrementalProcessing).Returns(true);
+        _mockAttachmentHandler2 = new Mock<IDataCollectorAttachmentProcessor>();
+        _mockAttachmentHandler2.Setup(x => x.SupportsIncrementalProcessing).Returns(true);
+        _mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockDataCollectorAttachmentsProcessorsFactory = new Mock<IDataCollectorAttachmentsProcessorsFactory>();
+
+        _mockAttachmentHandler1.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri1) });
+        _mockAttachmentHandler2.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri2) });
+        _mockDataCollectorAttachmentsProcessorsFactory.Setup(p => p.Create(It.IsAny<InvokedDataCollector[]>(), It.IsAny<IMessageLogger>()))
+            .Returns([
+                new( "friendlyNameA", _mockAttachmentHandler1.Object ),
+                new( "friendlyNameB"  ,_mockAttachmentHandler2.Object )
+            ]);
+
+        _manager = new TestRunAttachmentsProcessingManager(_mockEventSource.Object, _mockDataCollectorAttachmentsProcessorsFactory.Object);
+
+        _cancellationTokenSource = new CancellationTokenSource();
+    }
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1ProcessedAttachmentThroughEventsHandler_IfRelatedAttachmentOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfNoAttachmentsOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = new();
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        VerifyCompleteEvent(false, false);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled), It.Is<ICollection<AttachmentSet>>(c => c.Count == 0)));
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(0));
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(0));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 0, outputCount: 0);
+    }
 
-            List<AttachmentSet> outputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnNoAttachments_IfNoAttachmentsOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = new();
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachments);
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
+        // assert
+        Assert.AreEqual(0, result.Count);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-            // assert
-            VerifyCompleteEvent(false, false, outputAttachments[0]);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        VerifyMetrics(inputCount: 0, outputCount: 0);
+    }
 
-            VerifyMetrics(inputCount: 1, outputCount: 1);
-        }
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1NotProcessedAttachmentThroughEventsHandler_If1NotRelatedAttachmentOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri3), "uri3_input")];
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        VerifyCompleteEvent(false, false, inputAttachments[0]);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1ProcessedAttachment_IfRelatedAttachmentOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1NotProcessedAttachment_If1NotRelatedAttachmentOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri3), "uri3_input")];
 
-            List<AttachmentSet> outputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachments);
+        // assert
+        Assert.AreEqual(1, result.Count);
+        Assert.IsTrue(result.Contains(inputAttachments[0]));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-            // assert
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.Contains(outputAttachments[0]));
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(1));
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(1));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1ProcessedAttachmentThroughEventsHandler_IfRelatedAttachmentOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-            VerifyMetrics(inputCount: 1, outputCount: 1);
-        }
+        List<AttachmentSet> outputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_output")];
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfRelatedAttachmentOnInputButHandlerThrowsException()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachments);
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Throws(new Exception("exception message"));
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
+        // assert
+        VerifyCompleteEvent(false, false, outputAttachments[0]);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-            // assert
-            VerifyCompleteEvent(false, true, inputAttachments[0]);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Error, "exception message"), Times.Once);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Failed");
-        }
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturn1ProcessedAttachment_IfRelatedAttachmentOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfRelatedAttachmentOnInputButHandlerThrowsException()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+        List<AttachmentSet> outputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_output")];
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Throws(new Exception("exception message"));
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachments);
 
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
 
-            // assert
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.Contains(inputAttachments[0]));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        // assert
+        Assert.AreEqual(1, result.Count);
+        Assert.IsTrue(result.Contains(outputAttachments[0]));
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(1));
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(1));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Failed");
-        }
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfOperationIsCancelled()
-        {
-            // arrange
-            cancellationTokenSource.Cancel();
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfRelatedAttachmentOnInputButHandlerThrowsException()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
+        var exceptionToThrow = new Exception("exception message");
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Throws(exceptionToThrow);
 
-            // assert
-            VerifyCompleteEvent(true, false, inputAttachments[0]);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
 
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
-        }
+        // assert
+        VerifyCompleteEvent(false, false, inputAttachments[0]);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Error, exceptionToThrow.ToString()), Times.Once);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Once);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfOperationIsCancelled()
-        {
-            // arrange
-            cancellationTokenSource.Cancel();
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfRelatedAttachmentOnInputButHandlerThrowsException()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-            // assert
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.Contains(inputAttachments[0]));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Throws(new Exception("exception message"));
 
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
-        }
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProcessedAttachmentsThroughEventsHandler_IfRelatedAttachmentsOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input1"),
-                new AttachmentSet(new Uri(uri1), "uri1_input2"),
-                new AttachmentSet(new Uri(uri2), "uri2_input1"),
-                new AttachmentSet(new Uri(uri2), "uri2_input2"),
-                new AttachmentSet(new Uri(uri3), "uri3_input1"),
-            };
-
-            List<AttachmentSet> outputAttachmentsForHandler1 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+        // assert
+        Assert.AreEqual(1, result.Count);
+        Assert.IsTrue(result.Contains(inputAttachments[0]));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Once);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
 
-            List<AttachmentSet> outputAttachmentsForHandler2 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri2), "uri2_output")
-            };
+        VerifyMetrics(inputCount: 1, outputCount: 1);
+    }
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler1);
-            mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler2);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfOperationIsCancelled()
+    {
+        // arrange
+        _cancellationTokenSource.Cancel();
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        VerifyCompleteEvent(true, false, inputAttachments[0]);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
+    }
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfOperationIsCancelled()
+    {
+        // arrange
+        _cancellationTokenSource.Cancel();
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
+
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
+
+        // assert
+        Assert.AreEqual(1, result.Count);
+        Assert.IsTrue(result.Contains(inputAttachments[0]));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
+    }
 
-            // assert
-            VerifyCompleteEvent(false, false, inputAttachments[4], outputAttachmentsForHandler1.First(), outputAttachmentsForHandler2.First());
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
-            mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[0]) && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[2]) && c.Contains(inputAttachments[3])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProcessedAttachmentsThroughEventsHandler_IfRelatedAttachmentsOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input1"),
+            new AttachmentSet(new Uri(Uri1), "uri1_input2"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input1"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input2"),
+            new AttachmentSet(new Uri(Uri3), "uri3_input1")
+        ];
+
+        List<AttachmentSet> outputAttachmentsForHandler1 = [new AttachmentSet(new Uri(Uri1), "uri1_output")];
+
+        List<AttachmentSet> outputAttachmentsForHandler2 = [new AttachmentSet(new Uri(Uri2), "uri2_output")];
+
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(null!, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler1);
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(null!, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler2);
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        VerifyCompleteEvent(false, false, inputAttachments[4], outputAttachmentsForHandler1.First(), outputAttachmentsForHandler2.First());
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Never);
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[0]) && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[2]) && c.Contains(inputAttachments[3])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+
+        VerifyMetrics(inputCount: 5, outputCount: 3);
+    }
 
-            VerifyMetrics(inputCount: 5, outputCount: 3);
-        }
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProcessedAttachments_IfRelatedAttachmentsOnInput()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input1"),
+            new AttachmentSet(new Uri(Uri1), "uri1_input2"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input1"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input2"),
+            new AttachmentSet(new Uri(Uri3), "uri3_input1")
+        ];
+
+        List<AttachmentSet> outputAttachmentsForHandler1 = [new AttachmentSet(new Uri(Uri1), "uri1_output")];
+
+        List<AttachmentSet> outputAttachmentsForHandler2 = [new AttachmentSet(new Uri(Uri2), "uri2_output")];
+
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler1);
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler2);
+
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
+
+        // assert
+        Assert.AreEqual(3, result.Count);
+        Assert.IsTrue(result.Contains(inputAttachments[4]));
+        Assert.IsTrue(result.Contains(outputAttachmentsForHandler1[0]));
+        Assert.IsTrue(result.Contains(outputAttachmentsForHandler2[0]));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[0]) && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[2]) && c.Contains(inputAttachments[3])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+
+        VerifyMetrics(inputCount: 5, outputCount: 3);
+    }
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProcessedAttachments_IfRelatedAttachmentsOnInput()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input1"),
-                new AttachmentSet(new Uri(uri1), "uri1_input2"),
-                new AttachmentSet(new Uri(uri2), "uri2_input1"),
-                new AttachmentSet(new Uri(uri2), "uri2_input2"),
-                new AttachmentSet(new Uri(uri3), "uri3_input1"),
-            };
-
-            List<AttachmentSet> outputAttachmentsForHandler1 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfOperationCancelled()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-            List<AttachmentSet> outputAttachmentsForHandler2 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri2), "uri2_output")
-            };
-
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler1);
-            mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).ReturnsAsync(outputAttachmentsForHandler2);
-
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
-
-            // assert
-            Assert.AreEqual(3, result.Count);
-            Assert.IsTrue(result.Contains(inputAttachments[4]));
-            Assert.IsTrue(result.Contains(outputAttachmentsForHandler1[0]));
-            Assert.IsTrue(result.Contains(outputAttachmentsForHandler2[0]));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[0]) && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 2 && c.Contains(inputAttachments[2]) && c.Contains(inputAttachments[3])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-
-            VerifyMetrics(inputCount: 5, outputCount: 3);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsThroughEventsHandler_IfOperationCancelled()
+        ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
         {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+            new(new Uri(Uri1), "uri1_output")
+        };
 
-            ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+        var innerTaskCompletionSource = new TaskCompletionSource<object?>();
 
-            var innerTaskCompletionSource = new TaskCompletionSource<object>();
+        CountdownEvent expectedProgress = new(4);
+        _mockEventsHandler.Setup(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>())).Callback((TestRunAttachmentsProcessingProgressEventArgs _) => expectedProgress.Signal());
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Returns((ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((string configElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
             {
                 try
                 {
                     for (int i = 0; i < 100; ++i)
                     {
-                        Task.Delay(100).Wait();
                         Console.WriteLine($"Iteration: {i}");
                         logger.SendMessage(TestMessageLevel.Informational, $"Iteration: {i}");
 
@@ -419,8 +391,7 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsT
 
                         if (i == 3)
                         {
-                            cancellationTokenSource.Cancel();
-                            Task.Delay(500).Wait();
+                            _cancellationTokenSource.Cancel();
                         }
                     }
                 }
@@ -432,50 +403,65 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachmentsT
                 return Task.FromResult(outputAttachments);
             });
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, cancellationTokenSource.Token);
-            Console.WriteLine("Attachments processing done");
-            await innerTaskCompletionSource.Task;
-
-            // assert
-            VerifyCompleteEvent(true, false, inputAttachments[0]);
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Exactly(4));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 1))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 2))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 3))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 4))));
-            mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled."));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfOperationCancelled()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input")
-            };
+        ManualResetEventSlim attachmentProcessingComplete = new(false);
+        _mockEventsHandler.Setup(h => h.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.IsAny<IEnumerable<AttachmentSet>>()))
+            .Callback((TestRunAttachmentsProcessingCompleteEventArgs _, IEnumerable<AttachmentSet> _) => attachmentProcessingComplete.Set());
+
+        ManualResetEventSlim handleLogMessage = new(false);
+        _mockEventsHandler.Setup(h => h.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled."))
+            .Callback((TestMessageLevel _, string _) => handleLogMessage.Set());
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+        Console.WriteLine("Attachments processing done");
+        await innerTaskCompletionSource.Task;
+
+        // Wait to drain all progress events
+        Assert.IsTrue(expectedProgress.Wait(TimeSpan.FromMinutes(1)), "expectedProgress not signaled");
+
+        // Wait for the HandleTestRunAttachmentsProcessingComplete
+        Assert.IsTrue(attachmentProcessingComplete.Wait(TimeSpan.FromMinutes(1)), "attachmentProcessingComplete not signaled");
+
+        // Wait for the HandleLogMessage
+        Assert.IsTrue(handleLogMessage.Wait(TimeSpan.FromMinutes(1)), "handleLogMessage not signaled");
+
+        // assert
+        VerifyCompleteEvent(true, false, inputAttachments[0]);
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Exactly(4));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 1))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 2))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 3))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgs(a, 4))));
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Informational, "Attachments processing was cancelled."));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
+    }
 
-            ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_IfOperationCancelled()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input")];
 
-            var innerTaskCompletionSource = new TaskCompletionSource<object>();
+        ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
+        {
+            new(new Uri(Uri1), "uri1_output")
+        };
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Returns((ICollection<AttachmentSet> i1, IProgress<int> p, IMessageLogger logger, CancellationToken cancellation) =>
+        var innerTaskCompletionSource = new TaskCompletionSource<object?>();
+
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> p, IMessageLogger logger, CancellationToken cancellation) =>
             {
                 try
                 {
                     for (int i = 0; i < 1000; ++i)
                     {
-                        Task.Delay(100).Wait();
+                        Task.Delay(200, cancellation).Wait(cancellation);
                         Console.WriteLine($"Iteration: {i}");
                         logger.SendMessage(TestMessageLevel.Informational, $"Iteration: {i}");
 
@@ -483,8 +469,8 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_
 
                         if (i == 3)
                         {
-                            cancellationTokenSource.Cancel();
-                            Task.Delay(500).Wait();
+                            _cancellationTokenSource.Cancel();
+                            Task.Delay(1000, cancellation).Wait(cancellation);
                         }
                     }
                 }
@@ -496,56 +482,57 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnInitialAttachments_
                 return Task.FromResult(outputAttachments);
             });
 
-            // act
-            var result = await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, cancellationTokenSource.Token);
-            Console.WriteLine("Attachments processing done");
-            await innerTaskCompletionSource.Task;
-
-            // assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual(1, result.Count);
-            Assert.IsTrue(result.Contains(inputAttachments[0]));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), cancellationTokenSource.Token));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
-
-            VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProperlySendProgressEvents_IfHandlersPropagesEvents()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input"),
-                new AttachmentSet(new Uri(uri2), "uri2_input")
-            };
+        // act
+        var result = await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _cancellationTokenSource.Token);
+        Console.WriteLine("Attachments processing done");
+        await innerTaskCompletionSource.Task;
+
+        // assert
+        Assert.IsNotNull(result);
+        Assert.AreEqual(1, result.Count);
+        Assert.IsTrue(result.Contains(inputAttachments[0]));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), _cancellationTokenSource.Token));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        VerifyMetrics(inputCount: 1, outputCount: 1, status: "Canceled");
+    }
 
-            ICollection<AttachmentSet> outputAttachments1 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_output")
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProperlySendProgressEvents_IfHandlersPropagesEvents()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input")
+        ];
+
+        ICollection<AttachmentSet> outputAttachments1 = new List<AttachmentSet>
+        {
+            new(new Uri(Uri1), "uri1_output")
+        };
 
-            ICollection<AttachmentSet> outputAttachments2 = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri2), "uri2_output")
-            };
+        ICollection<AttachmentSet> outputAttachments2 = new List<AttachmentSet>
+        {
+            new(new Uri(Uri2), "uri2_output")
+        };
 
-            var innerTaskCompletionSource = new TaskCompletionSource<object>();
+        var innerTaskCompletionSource = new TaskCompletionSource<object?>();
 
-            int counter = 0;
-            mockEventsHandler.Setup(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>())).Callback(() => 
-            { 
-                counter++;
-                if(counter == 6)
-                {
-                    innerTaskCompletionSource.TrySetResult(null);
-                }
-            });
+        int counter = 0;
+        _mockEventsHandler.Setup(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>())).Callback(() =>
+        {
+            counter++;
+            if (counter == 6)
+            {
+                innerTaskCompletionSource.TrySetResult(null);
+            }
+        });
 
-            mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Returns((ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(null!, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
             {
                 progress.Report(25);
                 progress.Report(50);
@@ -555,7 +542,8 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProperlySendProgres
                 return Task.FromResult(outputAttachments1);
             });
 
-            mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>())).Returns((ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(null!, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
             {
                 progress.Report(50);
                 logger.SendMessage(TestMessageLevel.Informational, "info");
@@ -563,63 +551,299 @@ public async Task ProcessTestRunAttachmentsAsync_ShouldReturnProperlySendProgres
                 return Task.FromResult(outputAttachments2);
             });
 
-            // act
-            await manager.ProcessTestRunAttachmentsAsync(mockRequestData.Object, inputAttachments, mockEventsHandler.Object, CancellationToken.None);
-
-            // assert
-            await innerTaskCompletionSource.Task;
-            VerifyCompleteEvent(false, false, outputAttachments1.First(), outputAttachments2.First());
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Exactly(6));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 25, uri1))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 50, uri1))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 75, uri1))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 100, uri1))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 2, 50, uri2))));
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 2, 100, uri2))));
-            mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
-            mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), CancellationToken.None));
-            mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), CancellationToken.None));
-
-            mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Informational, "info"));
-            mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Error, "error"));
-
-            VerifyMetrics(inputCount: 2, outputCount: 2);
-        }
-
-        private void VerifyMetrics(int inputCount, int outputCount, string status = "Completed")
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, CancellationToken.None);
+
+        // assert
+        await innerTaskCompletionSource.Task;
+        VerifyCompleteEvent(false, false, outputAttachments1.First(), outputAttachments2.First());
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>()), Times.Exactly(6));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 25, Uri1))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 50, Uri1))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 75, Uri1))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 1, 100, Uri1))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 2, 50, Uri2))));
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => VerifyProgressArgsForTwoHandlers(a, 2, 100, Uri2))));
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris());
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[0])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), CancellationToken.None));
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(inputAttachments[1])), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), CancellationToken.None));
+
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Informational, "info"));
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Error, "error"));
+
+        VerifyMetrics(inputCount: 2, outputCount: 2);
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldNotFailIfRunsettingsIsNull()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input")
+        ];
+        ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
         {
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(inputCount));
-            mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(outputCount));
+            new(new Uri(Uri2), "uri2_output")
+        };
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                // assert
+                Assert.IsNull(configurationElement);
+                return Task.FromResult(outputAttachments);
+            });
 
-            mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, inputCount));
-            mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, outputCount));
-            mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.AttachmentsProcessingState, status));
-            mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing, It.IsAny<double>()));
-        }
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(null, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
 
-        private void VerifyCompleteEvent(bool isCanceled, bool containsError, params AttachmentSet[] expectedSets)
-        {
-            mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingComplete(
-                It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => a.IsCanceled == isCanceled && (a.Error != null) == containsError),
-                It.Is<ICollection<AttachmentSet>>(c => c.Count == expectedSets.Length && expectedSets.All(e => c.Contains(e)))));
-        }
+        // assert
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()));
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldFlowCorrectDataCollectorConfiguration(bool withConfig)
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input")
+        ];
+
+        List<InvokedDataCollector> invokedDataCollectors =
+        [
+            new InvokedDataCollector(new Uri(Uri1), withConfig ? "friendlyNameA" : "friendlyNameB", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false)
+        ];
+
+        string runSettingsXml =
+            $@"
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName=""{(withConfig ? "friendlyNameA" : "friendlyNameB")}"">
+        <Configuration>
+          <ConfigSample>Value</ConfigSample>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
+";
+
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                // assert
+                if (withConfig)
+                {
+                    Assert.IsNotNull(configurationElement);
+                    Assert.AreEqual("<ConfigSample>Value</ConfigSample>", configurationElement.InnerXml);
+                }
+                else
+                {
+                    Assert.IsNull(configurationElement);
+                }
+
+                ICollection<AttachmentSet> outputAttachments = new List<AttachmentSet>
+                {
+                    new(new Uri(Uri2), "uri2_output")
+                };
+                return Task.FromResult(outputAttachments);
+            });
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(runSettingsXml, _mockRequestData.Object, inputAttachments, invokedDataCollectors, _mockEventsHandler.Object, _cancellationTokenSource.Token);
 
-        private bool VerifyProgressArgs(TestRunAttachmentsProcessingProgressEventArgs args, int progress)
+        // assert
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()));
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldNotConsumeAttachmentsIfProcessorFails()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input_1")];
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file1", "Sample1"));
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file2", "Sample2"));
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file3", "Sample3"));
+
+
+        _mockAttachmentHandler1.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri1) });
+        _mockAttachmentHandler2.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri1) });
+
+        bool firstProcessorFailed = false;
+
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                try
+                {
+                    throw new Exception("Processor exception");
+                }
+                catch
+                {
+                    firstProcessorFailed = true;
+                    throw;
+                }
+            });
+
+        ICollection<AttachmentSet> output = new List<AttachmentSet>
         {
-            Assert.AreEqual(1, args.CurrentAttachmentProcessorIndex);
-            Assert.AreEqual(2, args.AttachmentProcessorsCount);
-            Assert.AreEqual(1, args.CurrentAttachmentProcessorUris.Count);
-            Assert.AreEqual(uri1, args.CurrentAttachmentProcessorUris.First().AbsoluteUri);
-            return progress == args.CurrentAttachmentProcessorProgress;
-        }
-
-        private bool VerifyProgressArgsForTwoHandlers(TestRunAttachmentsProcessingProgressEventArgs args, long handlerIndex, long progress, string uri)
+            new(new Uri(Uri1), "uri1_input_1")
+        };
+        output.Single().Attachments.Add(UriDataAttachment.CreateFrom("file4", "Merged"));
+
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                // assert
+                Assert.IsTrue(firstProcessorFailed);
+                Assert.AreEqual(1, i1.Count);
+                Assert.AreEqual(3, i1.Single().Attachments.Count);
+                for (int i = 0; i < i1.Single().Attachments.Count; i++)
+                {
+                    Assert.AreEqual(inputAttachments.Single().Attachments[i], i1.Single().Attachments[i]);
+                }
+
+                return Task.FromResult(output);
+            });
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(null, _mockRequestData.Object, inputAttachments, new List<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Once());
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Once());
+        VerifyCompleteEvent(false, false, output.ToArray());
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldNotConsumeAttachmentsIfAllProcessorsFail()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input_1")
+        ];
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file1", "Sample1"));
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file2", "Sample2"));
+        inputAttachments[0].Attachments.Add(UriDataAttachment.CreateFrom("file3", "Sample3"));
+
+
+        _mockAttachmentHandler1.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri1) });
+        _mockAttachmentHandler2.Setup(h => h.GetExtensionUris()).Returns(new[] { new Uri(Uri1) });
+
+        bool firstProcessorFailed = false;
+        _mockAttachmentHandler1.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                try
+                {
+                    throw new Exception("Processor exception");
+                }
+                catch
+                {
+                    firstProcessorFailed = true;
+                    throw;
+                }
+            });
+
+        bool secondProcessorFailed = false;
+        _mockAttachmentHandler2.Setup(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()))
+            .Returns((XmlElement configurationElement, ICollection<AttachmentSet> i1, IProgress<int> progress, IMessageLogger logger, CancellationToken cancellation) =>
+            {
+                try
+                {
+                    // assert
+                    Assert.IsTrue(firstProcessorFailed);
+                    Assert.AreEqual(1, i1.Count);
+                    Assert.AreEqual(3, i1.Single().Attachments.Count);
+                    for (int i = 0; i < i1.Single().Attachments.Count; i++)
+                    {
+                        Assert.AreEqual(inputAttachments.Single().Attachments[i], i1.Single().Attachments[i]);
+                    }
+                    throw new Exception("Processor exception");
+                }
+                catch
+                {
+                    secondProcessorFailed = true;
+                    throw;
+                }
+            });
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(null, _mockRequestData.Object, inputAttachments, new List<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        Assert.IsTrue(firstProcessorFailed && secondProcessorFailed);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Once());
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Once());
+        VerifyCompleteEvent(false, false, inputAttachments.ToArray());
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsync_ShouldSkipAttachmentProcessorIfDoesNotSupportIncrementalProcessing()
+    {
+        // arrange
+        var inputAttachments = new List<AttachmentSet>
         {
-            return progress == args.CurrentAttachmentProcessorProgress && 
-                args.CurrentAttachmentProcessorIndex == handlerIndex && 
-                args.CurrentAttachmentProcessorUris.First().AbsoluteUri == uri && 
-                args.AttachmentProcessorsCount == 2;
-        }
+            new(new Uri(Uri1), "uri1_input"),
+            new(new Uri(Uri2), "uri2_input")
+        };
+        _mockAttachmentHandler1.Setup(x => x.SupportsIncrementalProcessing).Returns(false);
+
+        // act
+        await _manager.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, inputAttachments, Array.Empty<InvokedDataCollector>(), _mockEventsHandler.Object, _cancellationTokenSource.Token);
+
+        // assert
+        // We expect that first attachment is still returned as-is because not processed.
+        VerifyCompleteEvent(false, false, inputAttachments.First());
+        _mockAttachmentHandler1.Verify(h => h.GetExtensionUris(), Times.Never);
+        _mockAttachmentHandler1.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Never);
+
+        _mockAttachmentHandler2.Verify(h => h.GetExtensionUris(), Times.Once);
+        _mockAttachmentHandler2.Verify(h => h.ProcessAttachmentSetsAsync(It.IsAny<XmlElement>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<IProgress<int>>(), It.IsAny<IMessageLogger>(), It.IsAny<CancellationToken>()), Times.Once);
+
+        _mockEventsHandler.Verify(h => h.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
+
+    private void VerifyMetrics(int inputCount, int outputCount, string status = "Completed")
+    {
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStart(inputCount));
+        _mockEventSource.Verify(s => s.TestRunAttachmentsProcessingStop(outputCount));
+
+        _mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, inputCount));
+        _mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, outputCount));
+        _mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.AttachmentsProcessingState, status));
+        _mockMetricsCollection.Verify(m => m.Add(TelemetryDataConstants.TimeTakenInSecForAttachmentsProcessing, It.IsAny<double>()));
+    }
+
+    private void VerifyCompleteEvent(bool isCanceled, bool containsError, params AttachmentSet[] expectedSets)
+    {
+        _mockEventsHandler.Verify(h => h.HandleTestRunAttachmentsProcessingComplete(
+            It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => a.IsCanceled == isCanceled && a.Error != null == containsError),
+            It.Is<ICollection<AttachmentSet>>(c => c.Count == expectedSets.Length && expectedSets.All(e => c.Contains(e)))));
+    }
+
+    private static bool VerifyProgressArgs(TestRunAttachmentsProcessingProgressEventArgs args, int progress)
+    {
+        Assert.AreEqual(1, args.CurrentAttachmentProcessorIndex);
+        Assert.AreEqual(2, args.AttachmentProcessorsCount);
+        Assert.AreEqual(1, args.CurrentAttachmentProcessorUris.Count);
+        Assert.AreEqual(Uri1, args.CurrentAttachmentProcessorUris.First().AbsoluteUri);
+        return progress == args.CurrentAttachmentProcessorProgress;
+    }
+
+    private static bool VerifyProgressArgsForTwoHandlers(TestRunAttachmentsProcessingProgressEventArgs args, long handlerIndex, long progress, string uri)
+    {
+        return progress == args.CurrentAttachmentProcessorProgress &&
+               args.CurrentAttachmentProcessorIndex == handlerIndex &&
+               args.CurrentAttachmentProcessorUris.First().AbsoluteUri == uri &&
+               args.AttachmentProcessorsCount == 2;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyDiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyDiscoveryManagerTests.cs
index 667147dd02..4e0c03058d 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyDiscoveryManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyDiscoveryManagerTests.cs
@@ -1,169 +1,159 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class InProcessProxyDiscoveryManagerTests
 {
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class InProcessProxyDiscoveryManagerTests
+    private readonly Mock<ITestHostManagerFactory> _mockTestHostManagerFactory;
+    private InProcessProxyDiscoveryManager _inProcessProxyDiscoveryManager;
+    private readonly Mock<IDiscoveryManager> _mockDiscoveryManager;
+    private readonly Mock<ITestRuntimeProvider> _mockTestHostManager;
+
+    public InProcessProxyDiscoveryManagerTests()
+    {
+        _mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
+        _mockDiscoveryManager = new Mock<IDiscoveryManager>();
+        _mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        _mockTestHostManagerFactory.Setup(o => o.GetDiscoveryManager()).Returns(_mockDiscoveryManager.Object);
+        _inProcessProxyDiscoveryManager = new InProcessProxyDiscoveryManager(_mockTestHostManager.Object, _mockTestHostManagerFactory.Object);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCallInitialize()
+    {
+        var manualResetEvent = new ManualResetEvent(false);
+        _mockDiscoveryManager.Setup(o => o.Initialize(Array.Empty<string>(), null)).Callback(
+            () => manualResetEvent.Set());
+
+        var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, null!);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "DiscoverTests should call Initialize");
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldUpdateTestPluginCacheWithExtensionsReturnByTestHost()
+    {
+        var manualResetEvent = new ManualResetEvent(false);
+        _mockDiscoveryManager.Setup(o => o.Initialize(Array.Empty<string>(), null)).Callback(
+            () => manualResetEvent.Set());
+
+        var path = Path.Combine(Path.GetTempPath(), "DiscoveryDummy.dll");
+        _mockTestHostManager.Setup(o => o.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string> { path });
+        var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+        expectedResult.Add(path);
+        var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
+
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, null!);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "DiscoverTests should call Initialize");
+        CollectionAssert.AreEquivalent(expectedResult, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCallDiscoveryManagerDiscoverTests()
+    {
+        var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var manualResetEvent = new ManualResetEvent(false);
+
+        _mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
+            () => manualResetEvent.Set());
+
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCatchExceptionAndCallHandleDiscoveryComplete()
+    {
+        var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var manualResetEvent = new ManualResetEvent(false);
+
+        _mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
+            () => throw new Exception());
+
+        mockTestDiscoveryEventsHandler.Setup(o => o.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () => manualResetEvent.Set());
+
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "ITestDiscoveryEventsHandler.HandleDiscoveryComplete should get called");
+    }
+
+    [TestMethod]
+    public void AbortShouldCallDiscoveryManagerAbort()
     {
-        private Mock<ITestHostManagerFactory> mockTestHostManagerFactory;
-        private InProcessProxyDiscoveryManager inProcessProxyDiscoveryManager;
-        private Mock<IDiscoveryManager> mockDiscoveryManager;
-        private Mock<ITestRuntimeProvider> mockTestHostManager;
-
-        public InProcessProxyDiscoveryManagerTests()
-        {
-            this.mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
-            this.mockDiscoveryManager = new Mock<IDiscoveryManager>();
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockTestHostManagerFactory.Setup(o => o.GetDiscoveryManager()).Returns(this.mockDiscoveryManager.Object);
-            this.inProcessProxyDiscoveryManager = new InProcessProxyDiscoveryManager(this.mockTestHostManager.Object, this.mockTestHostManagerFactory.Object);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.mockDiscoveryManager = null;
-            this.mockTestHostManagerFactory = null;
-            this.inProcessProxyDiscoveryManager = null;
-            this.mockTestHostManager = null;
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldCallInitialize()
-        {
-            var manualResetEvent = new ManualResetEvent(false);
-            this.mockDiscoveryManager.Setup(o => o.Initialize(Enumerable.Empty<string>(), null)).Callback(
-                () => manualResetEvent.Set());
-
-            var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, null);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "DiscoverTests should call Initialize");
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldUpdateTestPluginCacheWithExtensionsReturnByTestHost()
-        {
-            var manualResetEvent = new ManualResetEvent(false);
-            this.mockDiscoveryManager.Setup(o => o.Initialize(Enumerable.Empty<string>(), null)).Callback(
-                () => manualResetEvent.Set());
-
-            var path = Path.Combine(Path.GetTempPath(), "DiscoveryDummy.dll");
-            this.mockTestHostManager.Setup(o => o.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string> { path });
-            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
-            expectedResult.Add(path);
-            var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
-
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, null);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "DiscoverTests should call Initialize");
-            CollectionAssert.AreEquivalent(expectedResult, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldCallDiscoveryManagerDiscoverTests()
-        {
-            var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var manualResetEvent = new ManualResetEvent(false);
-
-            this.mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
-                () => manualResetEvent.Set());
-
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldCatchExceptionAndCallHandleDiscoveryComplete()
-        {
-            var discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var manualResetEvent = new ManualResetEvent(false);
-
-            this.mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
-                () => throw new Exception());
-
-            mockTestDiscoveryEventsHandler.Setup(o => o.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () => manualResetEvent.Set());
-
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "ITestDiscoveryEventsHandler.HandleDiscoveryComplete should get called");
-        }
-
-        [TestMethod]
-        public void AbortShouldCallDiscoveryManagerAbort()
-        {
-            var manualResetEvent = new ManualResetEvent(false);
-
-            this.mockDiscoveryManager.Setup(o => o.Abort()).Callback(
-                () => manualResetEvent.Set());
-
-            this.inProcessProxyDiscoveryManager.Abort();
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.Abort should get called");
-        }
-
-        [TestMethod]
-        public void DiscoverTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
-        {
-            var inputSources = new List<string> { "test.dll" };
-            var discoveryCriteria = new DiscoveryCriteria(inputSources, 1, string.Empty);
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var manualResetEvent = new ManualResetEvent(false);
-
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources)).Returns(discoveryCriteria.Sources);
-            this.mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
-                () => manualResetEvent.Set());
+        var manualResetEvent = new ManualResetEvent(false);
+
+        _mockDiscoveryManager.Setup(o => o.Abort()).Callback(
+            () => manualResetEvent.Set());
 
-            this.inProcessProxyDiscoveryManager = new InProcessProxyDiscoveryManager(this.mockTestHostManager.Object, this.mockTestHostManagerFactory.Object);
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(inputSources), Times.Once);
-        }
+        _inProcessProxyDiscoveryManager.Abort();
 
-        [TestMethod]
-        public void DiscoverTestRunShouldUpdateTestSourcesIfSourceDiffersFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource =  new List<string> { "inputPackage.appxrecipe" };
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.Abort should get called");
+    }
+
+    [TestMethod]
+    public void DiscoverTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
+    {
+        var inputSources = new List<string> { "test.dll" };
+        var discoveryCriteria = new DiscoveryCriteria(inputSources, 1, string.Empty);
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var manualResetEvent = new ManualResetEvent(false);
+
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources)).Returns(discoveryCriteria.Sources);
+        _mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
+            () => manualResetEvent.Set());
+
+        _inProcessProxyDiscoveryManager = new InProcessProxyDiscoveryManager(_mockTestHostManager.Object, _mockTestHostManagerFactory.Object);
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(inputSources), Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoverTestRunShouldUpdateTestSourcesIfSourceDiffersFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "inputPackage.appxrecipe" };
 
-            var discoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var manualResetEvent = new ManualResetEvent(false);
+        var discoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var manualResetEvent = new ManualResetEvent(false);
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources)).Returns(actualSources);
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(discoveryCriteria.Sources)).Returns(actualSources);
 
-            this.mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
-                () => manualResetEvent.Set());
+        _mockDiscoveryManager.Setup(o => o.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object)).Callback(
+            () => manualResetEvent.Set());
 
-            this.inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        _inProcessProxyDiscoveryManager.DiscoverTests(discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IDiscoveryManager.DiscoverTests should get called");
 
-            // AdapterSourceMap should contain updated testSources.
-            Assert.AreEqual(actualSources.FirstOrDefault(), discoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
-            Assert.AreEqual(inputSource.FirstOrDefault(), discoveryCriteria.Package);
-        }
+        // AdapterSourceMap should contain updated testSources.
+        Assert.AreEqual(actualSources.FirstOrDefault(), discoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
+        Assert.AreEqual(inputSource.FirstOrDefault(), discoveryCriteria.Package);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyexecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyexecutionManagerTests.cs
index f4f2ad00ff..4122e2cbdc 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyexecutionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/InProcessProxyexecutionManagerTests.cs
@@ -1,206 +1,197 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class InProcessProxyExecutionManagerTests
 {
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class InProcessProxyExecutionManagerTests
+    private readonly Mock<ITestHostManagerFactory> _mockTestHostManagerFactory;
+    private InProcessProxyExecutionManager _inProcessProxyExecutionManager;
+    private readonly Mock<IExecutionManager> _mockExecutionManager;
+    private readonly Mock<ITestRuntimeProvider> _mockTestHostManager;
+
+    public InProcessProxyExecutionManagerTests()
     {
-        private Mock<ITestHostManagerFactory> mockTestHostManagerFactory;
-        private InProcessProxyExecutionManager inProcessProxyExecutionManager;
-        private Mock<IExecutionManager> mockExecutionManager;
-        private Mock<ITestRuntimeProvider> mockTestHostManager;
-
-        public InProcessProxyExecutionManagerTests()
-        {
-            this.mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
-            this.mockExecutionManager = new Mock<IExecutionManager>();
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockTestHostManagerFactory.Setup(o => o.GetExecutionManager()).Returns(this.mockExecutionManager.Object);
-            this.inProcessProxyExecutionManager = new InProcessProxyExecutionManager(this.mockTestHostManager.Object, this.mockTestHostManagerFactory.Object);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            this.mockExecutionManager = null;
-            this.mockTestHostManagerFactory = null;
-            this.inProcessProxyExecutionManager = null;
-            this.mockTestHostManager = null;
-        }
-
-
-        [TestMethod]
-        public void StartTestRunShouldCallInitialize()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
-            var mockTestMessageEventHandler = new Mock<ITestMessageEventHandler>();
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
-
-            this.mockExecutionManager.Verify(o => o.Initialize(Enumerable.Empty<string>(), It.IsAny<ITestMessageEventHandler>()), Times.Once, "StartTestRun should call Initialize if not already initialized");
-        }
-
-        [TestMethod]
-        public void StartTestRunShouldUpdateTestPlauginCacheWithExtensionsReturnByTestHost()
-        {
-            var path = Path.Combine(Path.GetTempPath(), "dummy.dll");
-            this.mockTestHostManager.Setup(o => o.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string> { path });
-            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
-            expectedResult.Add(path);
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
-
-            CollectionAssert.AreEquivalent(expectedResult, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
-        }
-
-        [TestMethod]
-        public void StartTestRunShouldCallExecutionManagerStartTestRunWithAdapterSourceMap()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
-            var manualResetEvent = new ManualResetEvent(true);
-
-            this.mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.AdapterSourceMap, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null)).Callback(
-                () => manualResetEvent.Set());
-
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
-
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
-        }
-
-        [TestMethod]
-        public void StartTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
+        _mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
+        _mockExecutionManager = new Mock<IExecutionManager>();
+        _mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        _mockTestHostManagerFactory.Setup(o => o.GetExecutionManager()).Returns(_mockExecutionManager.Object);
+        _inProcessProxyExecutionManager = new InProcessProxyExecutionManager(_mockTestHostManager.Object, _mockTestHostManagerFactory.Object);
+    }
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources)).Returns(testRunCriteria.Sources);
+    [TestMethod]
+    public void StartTestRunShouldCallInitialize()
+    {
+        var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
+        var mockTestMessageEventHandler = new Mock<ITestMessageEventHandler>();
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
+        _mockExecutionManager.Verify(o => o.Initialize(Array.Empty<string>(), It.IsAny<ITestMessageEventHandler>()), Times.Once, "StartTestRun should call Initialize if not already initialized");
+    }
 
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(testRunCriteria.Sources), Times.Once);
-        }
+    [TestMethod]
+    public void StartTestRunShouldUpdateTestPlauginCacheWithExtensionsReturnByTestHost()
+    {
+        var path = Path.Combine(Path.GetTempPath(), "dummy.dll");
+        _mockTestHostManager.Setup(o => o.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string> { path });
+        var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+        expectedResult.Add(path);
 
-        [TestMethod]
-        public void StartTestRunShouldCallExecutionManagerStartTestRunWithTestCase()
-        {
-            var testRunCriteria = new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), "s.dll") },
-                    frequencyOfRunStatsChangeEvent: 10);
-            var manualResetEvent = new ManualResetEvent(true);
+        var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            this.mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null)).Callback(
-                () => manualResetEvent.Set());
+        CollectionAssert.AreEquivalent(expectedResult, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
+    }
 
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
+    [TestMethod]
+    public void StartTestRunShouldCallExecutionManagerStartTestRunWithAdapterSourceMap()
+    {
+        var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
+        var manualResetEvent = new ManualResetEvent(true);
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
-        }
+        _mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.AdapterSourceMap!, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!)).Callback(
+            () => manualResetEvent.Set());
 
-        [TestMethod]
-        public void StartTestRunShouldUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource = new List<string> { "inputPackage.appxrecipe" };
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            var testRunCriteria = new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), inputSource.FirstOrDefault()) },
-                    frequencyOfRunStatsChangeEvent: 10);
-            var manualResetEvent = new ManualResetEvent(false);
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
+    }
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
+    [TestMethod]
+    public void StartTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
+    {
+        var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
 
-            this.mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests, inputSource.FirstOrDefault(), testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null))
-                .Callback(() => manualResetEvent.Set());
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(testRunCriteria.Sources!)).Returns(testRunCriteria.Sources!);
 
-            this.inProcessProxyExecutionManager = new InProcessProxyExecutionManager(this.mockTestHostManager.Object, this.mockTestHostManagerFactory.Object);
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(testRunCriteria.Sources!), Times.Once);
+    }
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
-            this.mockExecutionManager.Verify(o => o.StartTestRun(testRunCriteria.Tests, inputSource.FirstOrDefault(), testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null));
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
-            Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests.FirstOrDefault().Source);
-        }
+    [TestMethod]
+    public void StartTestRunShouldCallExecutionManagerStartTestRunWithTestCase()
+    {
+        var testRunCriteria = new TestRunCriteria(
+            new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), "s.dll") },
+            frequencyOfRunStatsChangeEvent: 10);
+        var manualResetEvent = new ManualResetEvent(true);
 
-        [TestMethod]
-        public void StartTestRunShouldNotUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var testRunCriteria = new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), actualSources.FirstOrDefault()) },
-                    frequencyOfRunStatsChangeEvent: 10);
-            var manualResetEvent = new ManualResetEvent(false);
+        _mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests!, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!)).Callback(
+            () => manualResetEvent.Set());
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(actualSources)).Returns(actualSources);
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            this.mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null))
-                .Callback(() => manualResetEvent.Set());
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
+    }
 
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null);
+    [TestMethod]
+    public void StartTestRunShouldUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "inputPackage.appxrecipe" };
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
-            this.mockExecutionManager.Verify(o => o.StartTestRun(testRunCriteria.Tests, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null));
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(actualSources));
-            Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests.FirstOrDefault().Source);
-        }
+        var testRunCriteria = new TestRunCriteria(
+            new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), inputSource.First()) },
+            frequencyOfRunStatsChangeEvent: 10);
+        var manualResetEvent = new ManualResetEvent(false);
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleRunComplete()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var manualResetEvent = new ManualResetEvent(true);
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
 
-            this.mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.AdapterSourceMap, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, mockTestRunEventsHandler.Object)).Callback(
-                () => throw new Exception());
+        _mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests!, inputSource.FirstOrDefault(), testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!))
+            .Callback(() => manualResetEvent.Set());
 
-            mockTestRunEventsHandler.Setup(o => o.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null)).Callback(
-                () => manualResetEvent.Set());
+        _inProcessProxyExecutionManager = new InProcessProxyExecutionManager(_mockTestHostManager.Object, _mockTestHostManagerFactory.Object);
 
-            this.inProcessProxyExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "ITestRunEventsHandler.HandleTestRunComplete should get called");
-        }
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
+        _mockExecutionManager.Verify(o => o.StartTestRun(testRunCriteria.Tests!, inputSource.FirstOrDefault(), testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!));
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
+        Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests!.FirstOrDefault()?.Source);
+    }
 
-        [TestMethod]
-        public void AbortShouldCallExecutionManagerAbort()
-        {
-            var manualResetEvent = new ManualResetEvent(true);
+    [TestMethod]
+    public void StartTestRunShouldNotUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var testRunCriteria = new TestRunCriteria(
+            new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), actualSources.First()) },
+            frequencyOfRunStatsChangeEvent: 10);
+        var manualResetEvent = new ManualResetEvent(false);
 
-            this.mockExecutionManager.Setup(o => o.Abort(It.IsAny<ITestRunEventsHandler>())).Callback(
-                () => manualResetEvent.Set());
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(actualSources)).Returns(actualSources);
 
-            this.inProcessProxyExecutionManager.Abort(It.IsAny<ITestRunEventsHandler>());
+        _mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.Tests!, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!))
+            .Callback(() => manualResetEvent.Set());
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.Abort should get called");
-        }
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, null!);
 
-        [TestMethod]
-        public void CancelShouldCallExecutionManagerCancel()
-        {
-            var manualResetEvent = new ManualResetEvent(true);
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.StartTestRun should get called");
+        _mockExecutionManager.Verify(o => o.StartTestRun(testRunCriteria.Tests!, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, null!));
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(actualSources));
+        Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests!.FirstOrDefault()?.Source);
+    }
+
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleRunComplete()
+    {
+        var testRunCriteria = new TestRunCriteria(new List<string> { "source.dll" }, 10);
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        var manualResetEvent = new ManualResetEvent(true);
+
+        _mockExecutionManager.Setup(o => o.StartTestRun(testRunCriteria.AdapterSourceMap!, null, testRunCriteria.TestRunSettings, It.IsAny<TestExecutionContext>(), null, mockTestRunEventsHandler.Object)).Callback(
+            () => throw new Exception());
+
+        mockTestRunEventsHandler.Setup(o => o.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null)).Callback(
+            () => manualResetEvent.Set());
+
+        _inProcessProxyExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IInternalTestRunEventsHandler.HandleTestRunComplete should get called");
+    }
+
+    [TestMethod]
+    public void AbortShouldCallExecutionManagerAbort()
+    {
+        var manualResetEvent = new ManualResetEvent(true);
+
+        _mockExecutionManager.Setup(o => o.Abort(It.IsAny<IInternalTestRunEventsHandler>())).Callback(
+            () => manualResetEvent.Set());
+
+        _inProcessProxyExecutionManager.Abort(It.IsAny<IInternalTestRunEventsHandler>());
+
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.Abort should get called");
+    }
+
+    [TestMethod]
+    public void CancelShouldCallExecutionManagerCancel()
+    {
+        var manualResetEvent = new ManualResetEvent(true);
 
-            this.mockExecutionManager.Setup(o => o.Cancel(It.IsAny<ITestRunEventsHandler>())).Callback(
-                () => manualResetEvent.Set());
+        _mockExecutionManager.Setup(o => o.Cancel(It.IsAny<IInternalTestRunEventsHandler>())).Callback(
+            () => manualResetEvent.Set());
 
-            this.inProcessProxyExecutionManager.Cancel(It.IsAny<ITestRunEventsHandler>());
+        _inProcessProxyExecutionManager.Cancel(It.IsAny<IInternalTestRunEventsHandler>());
 
-            Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.Abort should get called");
-        }
+        Assert.IsTrue(manualResetEvent.WaitOne(5000), "IExecutionManager.Abort should get called");
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/DiscoveryDataAggregatorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/DiscoveryDataAggregatorTests.cs
new file mode 100644
index 0000000000..9b466e9a54
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/DiscoveryDataAggregatorTests.cs
@@ -0,0 +1,428 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client.Parallel;
+
+[TestClass]
+public class DiscoveryDataAggregatorTests
+{
+    [TestMethod]
+    public void AggregateShouldAggregateAbortedCorrectly()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.Aggregate(new(totalTests: 5, isAborted: false));
+        Assert.IsFalse(aggregator.IsAborted, "Aborted must be false");
+
+        aggregator.Aggregate(new(totalTests: 5, isAborted: true));
+        Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
+
+        aggregator.Aggregate(new(totalTests: 5, isAborted: false));
+        Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
+
+        Assert.AreEqual(-1, aggregator.TotalTests, "Aggregator shouldn't count tests if one host aborts");
+    }
+
+    [TestMethod]
+    public void AggregateShouldAggregateTotalTestsCorrectly()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+        aggregator.Aggregate(new(totalTests: 2, isAborted: false));
+        Assert.AreEqual(2, aggregator.TotalTests, "Aggregated totalTests count does not match");
+
+        aggregator.Aggregate(new(totalTests: 5, isAborted: false));
+        Assert.AreEqual(7, aggregator.TotalTests, "Aggregated totalTests count does not match");
+
+        aggregator.Aggregate(new(totalTests: 3, isAborted: false));
+        Assert.AreEqual(10, aggregator.TotalTests, "Aggregated totalTests count does not match");
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldAggregateMetricsCorrectly()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.AggregateMetrics(null);
+
+        var runMetrics = aggregator.GetMetrics();
+        Assert.AreEqual(0, runMetrics.Count);
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldAddTotalTestsDiscovered()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TotalTestsDiscovered] = 2,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TotalTestsDiscovered, out var value));
+        Assert.AreEqual(4, Convert.ToInt32(value, CultureInfo.CurrentCulture));
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldAddTimeTakenToDiscoverTests()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter] = .02091,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter, out var value));
+        Assert.AreEqual(.04182, value);
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldAddTimeTakenByAllAdapters()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TimeTakenInSecByAllAdapters] = .02091,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenInSecByAllAdapters, out var value));
+        Assert.AreEqual(.04182, value);
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldAddTimeTakenToLoadAdapters()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TimeTakenToLoadAdaptersInSec] = .02091,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, out var value));
+        Assert.AreEqual(.04182, value);
+    }
+
+    [TestMethod]
+    public void AggregateDiscoveryDataMetricsShouldNotAggregateDiscoveryState()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.DiscoveryState] = "Completed",
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.DiscoveryState, out _));
+    }
+
+    [TestMethod]
+    public void GetAggregatedDiscoveryDataMetricsShouldReturnEmptyIfMetricAggregatorIsEmpty()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.AggregateMetrics(new Dictionary<string, object>());
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.AreEqual(0, runMetrics.Count);
+    }
+
+    [TestMethod]
+    public void GetAggregatedDiscoveryDataMetricsShouldReturnEmptyIfMetricsIsNull()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.AggregateMetrics(null);
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.AreEqual(0, runMetrics.Count);
+    }
+
+    [TestMethod]
+    public void GetDiscoveryDataMetricsShouldAddTotalAdaptersUsedIfMetricsIsNotEmpty()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TotalTestsByAdapter] = 2,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, out var value));
+        Assert.AreEqual(1, value);
+    }
+
+    [TestMethod]
+    public void GetDiscoveryDataMetricsShouldAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        var metrics = new Dictionary<string, object>
+        {
+            [TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + "executor:MSTestV1"] = .02091,
+            [TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + "executor:MSTestV2"] = .02091,
+        };
+
+        aggregator.AggregateMetrics(metrics);
+
+        var runMetrics = aggregator.GetMetrics();
+
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, out var value));
+        Assert.AreEqual(2, value);
+    }
+
+    [TestMethod]
+    public void GetDiscoveryDataMetricsShouldNotAddTotalAdaptersUsedIfMetricsIsEmpty()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.AggregateMetrics(new Dictionary<string, object>());
+
+        var runMetrics = aggregator.GetMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, out _));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryDataMetricsShouldNotAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
+    {
+        var aggregator = new DiscoveryDataAggregator();
+
+        aggregator.AggregateMetrics(new Dictionary<string, object>());
+
+        var runMetrics = aggregator.GetMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, out _));
+    }
+
+    [DataTestMethod]
+    [DataRow(DiscoveryStatus.FullyDiscovered)]
+    [DataRow(DiscoveryStatus.PartiallyDiscovered)]
+    [DataRow(DiscoveryStatus.NotDiscovered)]
+    public void MarkSourcesWithStatusWhenSourcesIsNullDoesNothing(DiscoveryStatus discoveryStatus)
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+
+        // Act
+        dataAggregator.MarkSourcesWithStatus(null, discoveryStatus);
+
+        // Assert
+        Assert.AreEqual(0, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count);
+        Assert.AreEqual(0, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count);
+        Assert.AreEqual(0, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count);
+    }
+
+    [DataTestMethod]
+    [DataRow(DiscoveryStatus.FullyDiscovered)]
+    [DataRow(DiscoveryStatus.PartiallyDiscovered)]
+    [DataRow(DiscoveryStatus.NotDiscovered)]
+    public void MarkSourcesWithStatusIgnoresNullSources(DiscoveryStatus discoveryStatus)
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        var sources = new[] { "a", null, "b" };
+
+        // Sanity check
+        Assert.AreEqual(0, dataAggregator.GetSourcesWithStatus(discoveryStatus).Count);
+
+        // Act
+        dataAggregator.MarkSourcesWithStatus(sources, discoveryStatus);
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a", "b" }, dataAggregator.GetSourcesWithStatus(discoveryStatus));
+    }
+
+    [DataTestMethod]
+    [DataRow(DiscoveryStatus.FullyDiscovered)]
+    [DataRow(DiscoveryStatus.PartiallyDiscovered)]
+    public void MarkSourcesWithStatusWhenSourceAddedAndStatusDifferentFromNotDiscoveredLogsWarning(DiscoveryStatus discoveryStatus)
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+
+        // Act
+        dataAggregator.MarkSourcesWithStatus(new[] { "a" }, discoveryStatus);
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a" }, dataAggregator.GetSourcesWithStatus(discoveryStatus));
+    }
+
+    [DataTestMethod]
+    [DataRow(DiscoveryStatus.NotDiscovered)]
+    [DataRow(DiscoveryStatus.PartiallyDiscovered)]
+    public void MarkSourcesWithStatusWhenSourceStatusWasFullyDiscoveredAndIsDowngradedLogsWarning(DiscoveryStatus discoveryStatus)
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        dataAggregator.MarkSourcesWithStatus(new[] { "a" }, DiscoveryStatus.FullyDiscovered);
+
+        // Act
+        dataAggregator.MarkSourcesWithStatus(new[] { "a" }, discoveryStatus);
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a" }, dataAggregator.GetSourcesWithStatus(discoveryStatus));
+    }
+
+    [TestMethod]
+    public void MarkSourcesWithStatusWhenSourceStatusWasPartiallyDiscoveredAndIsDowngradedLogsWarning()
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        dataAggregator.MarkSourcesWithStatus(new[] { "a" }, DiscoveryStatus.PartiallyDiscovered);
+
+        // Act
+        dataAggregator.MarkSourcesWithStatus(new[] { "a" }, DiscoveryStatus.NotDiscovered);
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a" }, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered));
+    }
+
+    [TestMethod]
+    public void MarkSourcesBasedOnDiscoveredTestCasesHandlesTestCasesFromMultipleSources()
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        var testCases = new TestCase[]
+        {
+            new() { Source = "a" },
+            new() { Source = "a" },
+            new() { Source = "a" },
+            new() { Source = "b" },
+            new() { Source = "c" },
+        };
+
+        // Act
+        dataAggregator.MarkSourcesBasedOnDiscoveredTestCases(null, testCases);
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a", "b" }, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        CollectionAssert.AreEquivalent(new[] { "c" }, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+    }
+
+    [TestMethod]
+    public void MarkSourcesBasedOnDiscoveredTestCasesReuseLastDiscoveredSource()
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        string? previousSource = null;
+        previousSource = dataAggregator.MarkSourcesBasedOnDiscoveredTestCases(previousSource, new TestCase[] { new() { Source = "a" } });
+
+        // Act
+        _ = dataAggregator.MarkSourcesBasedOnDiscoveredTestCases(previousSource, new TestCase[] { new() { Source = "b" }, });
+
+        // Assert
+        CollectionAssert.AreEquivalent(new[] { "a" }, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        CollectionAssert.AreEquivalent(new[] { "b" }, dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+    }
+
+    [DataTestMethod]
+    [DataRow(DiscoveryStatus.FullyDiscovered)]
+    [DataRow(DiscoveryStatus.PartiallyDiscovered)]
+    [DataRow(DiscoveryStatus.NotDiscovered)]
+    public void GetSourcesWithStatusWhenEmptyDictionaryReturnsEmptyList(DiscoveryStatus discoveryStatus)
+    {
+        var instanceSources = new DiscoveryDataAggregator().GetSourcesWithStatus(discoveryStatus);
+        Assert.AreEqual(0, instanceSources.Count);
+    }
+
+    [TestMethod]
+    public void GetSourcesWithStatusCorrectlyFiltersSources()
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        var notDiscoveredSources = new[]
+        {
+            "not1",
+            "not2",
+            "not3",
+        };
+        var partiallyDiscoveredSources = new[]
+        {
+            "partially1",
+            "partially2",
+            "partially3",
+            "partially4",
+        };
+        var fullyDiscoveredSources = new[]
+        {
+            "fully1",
+            "fully2",
+            "fully3",
+            "fully4",
+            "fully5",
+        };
+
+        dataAggregator.MarkSourcesWithStatus(notDiscoveredSources, DiscoveryStatus.NotDiscovered);
+
+        dataAggregator.MarkSourcesWithStatus(partiallyDiscoveredSources, DiscoveryStatus.NotDiscovered);
+        dataAggregator.MarkSourcesWithStatus(partiallyDiscoveredSources, DiscoveryStatus.PartiallyDiscovered);
+
+        dataAggregator.MarkSourcesWithStatus(fullyDiscoveredSources, DiscoveryStatus.NotDiscovered);
+        dataAggregator.MarkSourcesWithStatus(fullyDiscoveredSources, DiscoveryStatus.FullyDiscovered);
+
+        // Act
+        var actualFullyDiscovered = dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered);
+        var actualPartiallyDiscovered = dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered);
+        var actualNotDiscovered = dataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered);
+
+        // Assert
+        CollectionAssert.AreEquivalent(fullyDiscoveredSources, actualFullyDiscovered);
+        CollectionAssert.AreEquivalent(partiallyDiscoveredSources, actualPartiallyDiscovered);
+        CollectionAssert.AreEquivalent(notDiscoveredSources, actualNotDiscovered);
+    }
+
+    [TestMethod]
+    public void TryAggregateIsMessageSentOnlyReportsOnceEvenWhenRunningInParallel()
+    {
+        // Arrange
+        var dataAggregator = new DiscoveryDataAggregator();
+        var concurrentBag = new ConcurrentBag<bool>();
+
+        // Act
+        System.Threading.Tasks.Parallel.For(0, 100, _ => concurrentBag.Add(dataAggregator.TryAggregateIsMessageSent()));
+
+        // Assert
+        Assert.AreEqual(1, concurrentBag.Count(b => b));
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryDataAggregatorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryDataAggregatorTests.cs
deleted file mode 100644
index c8d1e1ec8a..0000000000
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryDataAggregatorTests.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client.Parallel
-{
-    using System;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ParallelDiscoveryDataAggregatorTests
-    {
-        [TestMethod]
-        public void AggregateShouldAggregateAbortedCorrectly()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            aggregator.Aggregate(totalTests: 5, isAborted: false);
-            Assert.IsFalse(aggregator.IsAborted, "Aborted must be false");
-
-            aggregator.Aggregate(totalTests: 5, isAborted: true);
-            Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
-
-            aggregator.Aggregate(totalTests: 5, isAborted: false);
-            Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
-
-            Assert.AreEqual(-1, aggregator.TotalTests, "Aggregator shouldn't count tests if one host aborts");
-        }
-
-        [TestMethod]
-        public void AggregateShouldAggregateTotalTestsCorrectly()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-            aggregator.Aggregate(totalTests: 2, isAborted: false);
-            Assert.AreEqual(2, aggregator.TotalTests, "Aggregated totalTests count does not match");
-
-            aggregator.Aggregate(totalTests: 5, isAborted: false);
-            Assert.AreEqual(7, aggregator.TotalTests, "Aggregated totalTests count does not match");
-
-            aggregator.Aggregate(totalTests: 3, isAborted: false);
-            Assert.AreEqual(10, aggregator.TotalTests, "Aggregated totalTests count does not match");
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldAggregateMetricsCorrectly()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            aggregator.AggregateDiscoveryDataMetrics(null);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-            Assert.AreEqual(0, runMetrics.Count);
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldAddTotalTestsDiscovered()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TotalTestsDiscovered, 2);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TotalTestsDiscovered, out var value));
-            Assert.AreEqual(4, Convert.ToInt32(value));
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldAddTimeTakenToDiscoverTests()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter, .02091);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter, out var value));
-            Assert.AreEqual(.04182, value);
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldAddTimeTakenByAllAdapters()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenInSecByAllAdapters, .02091);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenInSecByAllAdapters, out var value));
-            Assert.AreEqual(.04182, value);
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldAddTimeTakenToLoadAdapters()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, .02091);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, out var value));
-            Assert.AreEqual(.04182, value);
-        }
-
-        [TestMethod]
-        public void AggregateDiscoveryDataMetricsShouldNotAggregateDiscoveryState()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.DiscoveryState, "Completed");
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.DiscoveryState, out var value));
-        }
-
-        [TestMethod]
-        public void GetAggregatedDiscoveryDataMetricsShouldReturnEmptyIfMetricAggregatorIsEmpty()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.AreEqual(0, runMetrics.Count);
-        }
-
-        [TestMethod]
-        public void GetAggregatedDiscoveryDataMetricsShouldReturnEmptyIfMetricsIsNull()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-
-            aggregator.AggregateDiscoveryDataMetrics(null);
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.AreEqual(0, runMetrics.Count);
-        }
-
-        [TestMethod]
-        public void GetDiscoveryDataMetricsShouldAddTotalAdaptersUsedIfMetricsIsNotEmpty()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TotalTestsByAdapter, 2);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, out var value));
-            Assert.AreEqual(1, value);
-        }
-
-        [TestMethod]
-        public void GetDiscoveryDataMetricsShouldAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + "executor:MSTestV1", .02091);
-            dict.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + "executor:MSTestV2", .02091);
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, out var value));
-            Assert.AreEqual(2, value);
-        }
-
-        [TestMethod]
-        public void GetDiscoveryDataMetricsShouldNotAddTotalAdaptersUsedIfMetricsIsEmpty()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-            var dict = new Dictionary<string, object>();
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, out var value));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryDataMetricsShouldNotAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
-        {
-            var aggregator = new ParallelDiscoveryDataAggregator();
-            var dict = new Dictionary<string, object>();
-
-            aggregator.AggregateDiscoveryDataMetrics(dict);
-
-            var runMetrics = aggregator.GetAggregatedDiscoveryDataMetrics();
-
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, out var value));
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryEventsHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryEventsHandlerTests.cs
index 4ba1536d27..7baa430ab8 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryEventsHandlerTests.cs
@@ -1,206 +1,222 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
-{
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class ParallelDiscoveryEventsHandlerTests
-    {
-        private ParallelDiscoveryEventsHandler parallelDiscoveryEventsHandler;
+using System.Collections.Generic;
 
-        private Mock<IProxyDiscoveryManager> mockProxyDiscoveryManager;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler;
+using Moq;
 
-        private Mock<IParallelProxyDiscoveryManager> mockParallelProxyDiscoveryManager;
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
 
-        private Mock<IDataSerializer> mockDataSerializer;
+[TestClass]
+public class ParallelDiscoveryEventsHandlerTests
+{
+    private readonly ParallelDiscoveryEventsHandler _parallelDiscoveryEventsHandler;
+    private readonly Mock<IProxyDiscoveryManager> _mockProxyDiscoveryManager;
+    private readonly Mock<ITestDiscoveryEventsHandler2> _mockTestDiscoveryEventsHandler;
+    private readonly Mock<IParallelProxyDiscoveryManager> _mockParallelProxyDiscoveryManager;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly int _protocolVersion = 1;
+
+    public ParallelDiscoveryEventsHandlerTests()
+    {
+        _mockProxyDiscoveryManager = new Mock<IProxyDiscoveryManager>();
+        _mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _mockParallelProxyDiscoveryManager = new Mock<IParallelProxyDiscoveryManager>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(new ProtocolConfig { Version = _protocolVersion });
+
+        _parallelDiscoveryEventsHandler = new ParallelDiscoveryEventsHandler(_mockRequestData.Object, _mockProxyDiscoveryManager.Object,
+            _mockTestDiscoveryEventsHandler.Object, _mockParallelProxyDiscoveryManager.Object,
+            new DiscoveryDataAggregator(), _mockDataSerializer.Object);
+    }
 
-        private Mock<IRequestData> mockRequestData;
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldNotCallLastChunkResultsIfNotPresent()
+    {
+        int totalTests = 10;
+        bool aborted = false;
+        _mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(false);
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockProxyDiscoveryManager = new Mock<IProxyDiscoveryManager>();
-            this.mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockParallelProxyDiscoveryManager = new Mock<IParallelProxyDiscoveryManager>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
 
-            this.parallelDiscoveryEventsHandler = new ParallelDiscoveryEventsHandler(this.mockRequestData.Object, mockProxyDiscoveryManager.Object,
-                this.mockTestDiscoveryEventsHandler.Object, this.mockParallelProxyDiscoveryManager.Object,
-                new ParallelDiscoveryDataAggregator(), this.mockDataSerializer.Object);
-        }
+        _parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldNotCallLastChunkResultsIfNotPresent()
-        {
-            int totalTests = 10;
-            bool aborted = false;
-            this.mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
-                   this.mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(false);
+        // Raw message must be sent
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
 
-            var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(null), Times.Never);
 
-            this.parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
+        _mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
+    }
 
-            // Raw message must be sent 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCallLastChunkResultsIfPresent()
+    {
+        string payload = "Tests";
+        int totalTests = 10;
+        bool aborted = false;
+        var lastChunk = new List<TestCase>();
+
+        _mockDataSerializer.Setup(mds => mds.SerializePayload(MessageType.TestCasesFound, lastChunk, _protocolVersion))
+            .Returns(payload);
+
+        _mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, lastChunk, aborted)).Returns(false);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(null), Times.Never);
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
 
-            this.mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
-                this.mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
-        }
+        _parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, lastChunk);
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCallLastChunkResultsIfPresent()
-        {
-            string payload = "Tests";
-            int totalTests = 10;
-            bool aborted = false;
-            var lastChunk = new List<TestCase>();
+        // Raw message must be sent
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
 
-            this.mockDataSerializer.Setup(mds => mds.SerializePayload(MessageType.TestCasesFound, lastChunk))
-                .Returns(payload);
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(lastChunk), Times.Once);
 
-            this.mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
-                    this.mockProxyDiscoveryManager.Object, totalTests, lastChunk, aborted)).Returns(false);
+        _mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
+    }
 
-            var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCollectMetrics()
+    {
+        string payload = "DiscoveryComplete";
+        int totalTests = 10;
+        bool aborted = false;
 
-            this.parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, lastChunk);
+        _mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(true);
 
-            // Raw message must be sent
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+        _mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.DiscoveryComplete)).Returns(payload);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(lastChunk), Times.Once);
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
 
-            this.mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
-                this.mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
-        }
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCollectMetrics()
-        {
-            string payload = "DiscoveryComplete";
-            int totalTests = 10;
-            bool aborted = false;
+        // Act.
+        _parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
 
-            this.mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
-                this.mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(true);
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.DiscoveryState, It.IsAny<string>()), Times.Once);
+    }
 
-            this.mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.DiscoveryComplete)).Returns(payload);
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCallTestDiscoveryCompleteOnActualHandlerIfParallelManagerReturnsCompleteAsTrue()
+    {
+        string payload = "DiscoveryComplete";
+        int totalTests = 10;
+        bool aborted = false;
 
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+        _mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(true);
 
-            var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
+        _mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.DiscoveryComplete)).Returns(payload);
 
-            // Act.
-            this.parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
+        // Act
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
 
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.DiscoveryState, It.IsAny<string>()), Times.Once);
-        }
+        _parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCallTestDiscoveryCompleteOnActualHandlerIfParallelManagerReturnsCompleteAsTrue()
-        {
-            string payload = "DiscoveryComplete";
-            int totalTests = 10;
-            bool aborted = false;
+        // Verify
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(null), Times.Never);
 
-            this.mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
-                    this.mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(true);
+        _mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
 
-            this.mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.DiscoveryComplete)).Returns(payload);
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Once);
 
-            // Act
-            var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once);
+    }
 
-            this.parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCallConvertToRawMessageAndSendOnceIfDiscoveryIsComplete()
+    {
+        string payload = "DiscoveryComplete";
+        int totalTests = 10;
+        bool aborted = false;
 
-            // Verify
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(null), Times.Never);
+        _mockParallelProxyDiscoveryManager.Setup(mp => mp.HandlePartialDiscoveryComplete(
+            _mockProxyDiscoveryManager.Object, totalTests, null, aborted)).Returns(true);
 
-            this.mockParallelProxyDiscoveryManager.Verify(mp => mp.HandlePartialDiscoveryComplete(
-                this.mockProxyDiscoveryManager.Object, totalTests, null, aborted), Times.Once);
+        _mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.DiscoveryComplete)).Returns(payload);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Once);
+        // Act
+        var discoveryCompleteEventsArgs = new DiscoveryCompleteEventArgs(totalTests, aborted);
+        _parallelDiscoveryEventsHandler.HandleDiscoveryComplete(discoveryCompleteEventsArgs, null);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once);
-        }
+        // Verify
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Once);
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryTestsShouldJustPassOnTheEventToDiscoveryEventsHandler()
-        {
-            var tests = new List<TestCase>();
-            this.parallelDiscoveryEventsHandler.HandleDiscoveredTests(tests);
+    [TestMethod]
+    public void HandleDiscoveryTestsShouldJustPassOnTheEventToDiscoveryEventsHandler()
+    {
+        var tests = new List<TestCase>();
+        _parallelDiscoveryEventsHandler.HandleDiscoveredTests(tests);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(tests), Times.Once);
-        }
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleDiscoveredTests(tests), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldSendTestCasesFoundRawMessageToDiscoveryEventsHandler()
-        {
-            string payload = "Tests";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.TestCasesFound, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldSendTestCasesFoundRawMessageToDiscoveryEventsHandler()
+    {
+        string payload = "Tests";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.TestCasesFound, Payload = payload });
 
-            this.parallelDiscoveryEventsHandler.HandleRawMessage(payload);
+        _parallelDiscoveryEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
-        }
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldNotSendDiscoveryCompleteEventRawMessageToDiscoveryEventsHandler()
-        {
-            string payload = "DiscoveryComplete";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.DiscoveryComplete, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldNotSendDiscoveryCompleteEventRawMessageToDiscoveryEventsHandler()
+    {
+        string payload = "DiscoveryComplete";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.DiscoveryComplete, Payload = payload });
 
-            this.parallelDiscoveryEventsHandler.HandleRawMessage(payload);
+        _parallelDiscoveryEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
-        }
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldSendLoggerRawMessageToDiscoveryEventsHandler()
-        {
-            string payload = "LogMessage";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.TestMessage, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldSendLoggerRawMessageToDiscoveryEventsHandler()
+    {
+        string payload = "LogMessage";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.TestMessage, Payload = payload });
 
-            this.parallelDiscoveryEventsHandler.HandleRawMessage(payload);
+        _parallelDiscoveryEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
-        }
+        _mockTestDiscoveryEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleLogMessageShouldJustPassOnTheEventToDiscoveryEventsHandler()
-        {
-            string log = "Hello";
-            this.parallelDiscoveryEventsHandler.HandleLogMessage(TestMessageLevel.Error, log);
+    [TestMethod]
+    public void HandleLogMessageShouldJustPassOnTheEventToDiscoveryEventsHandler()
+    {
+        string log = "Hello";
+        _parallelDiscoveryEventsHandler.HandleLogMessage(TestMessageLevel.Error, log);
 
-            this.mockTestDiscoveryEventsHandler.Verify(mt =>
-                mt.HandleLogMessage(TestMessageLevel.Error, log), Times.Once);
-        }
+        _mockTestDiscoveryEventsHandler.Verify(mt =>
+            mt.HandleLogMessage(TestMessageLevel.Error, log), Times.Once);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelOperationManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelOperationManagerTests.cs
index 2f0ce2fc4e..42cd47010f 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelOperationManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelOperationManagerTests.cs
@@ -1,188 +1,277 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
-{
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    [TestClass]
-    public class ParallelOperationManagerTests
-    {
-        private MockParallelOperationManager proxyParallelManager;
-
-        [TestInitialize]
-        public void InitializeTests()
-        {
-            Func<SampleConcurrentClass> sampleCreator =
-                () =>
-                {
-                    return new SampleConcurrentClass();
-                };
-
-            this.proxyParallelManager = new MockParallelOperationManager(sampleCreator, 2, true);
-        }
-
-        [TestMethod]
-        public void AbstractProxyParallelManagerShouldCreateCorrectNumberOfConcurrentObjects()
-        {
-            var createdSampleClasses = new List<SampleConcurrentClass>();
-            Func<SampleConcurrentClass> sampleCreator =
-                () =>
-                {
-                    var sample = new SampleConcurrentClass();
-                    createdSampleClasses.Add(sample);
-                    return sample;
-                };
-
-            this.proxyParallelManager = new MockParallelOperationManager(sampleCreator, 3, true);
-
-            Assert.AreEqual(3, createdSampleClasses.Count, "Number of Concurrent Objects created should be 3");
-        }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
-        [TestMethod]
-        public void AbstractProxyParallelManagerShouldUpdateToCorrectNumberOfConcurrentObjects()
-        {
-            var createdSampleClasses = new List<SampleConcurrentClass>();
-            Func<SampleConcurrentClass> sampleCreator =
-                () =>
-                {
-                    var sample = new SampleConcurrentClass();
-                    createdSampleClasses.Add(sample);
-                    return sample;
-                };
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using FluentAssertions;
 
-            this.proxyParallelManager = new MockParallelOperationManager(sampleCreator, 1, true);
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
 
-            Assert.AreEqual(1, createdSampleClasses.Count, "Number of Concurrent Objects created should be 1");
+[TestClass]
+public class ParallelOperationManagerTests
+{
+    [TestMethod]
+    public void OperationManagerShouldRunOnlyMaximumParallelLevelOfWorkInParallelEvenWhenThereAreMoreWorkloads()
+    {
+        // Arrange
+        Func<TestRuntimeProviderInfo, SampleWorkload, SampleManager> createNewManager = (_, _2) => new SampleManager();
+        var maxParallelLevel = 3;
+        var parallelOperationManager = new ParallelOperationManager<SampleManager, SampleHandler, SampleWorkload>(createNewManager, maxParallelLevel);
 
-            this.proxyParallelManager.UpdateParallelLevel(4);
+        // Create more workloads than our parallel level so we can observe that the maximum parallel level is reached but not more
+        var workloads = Enumerable.Range(1, maxParallelLevel + 2)
+            .Select(i => new ProviderSpecificWorkload<SampleWorkload>(new SampleWorkload { Id = i }, provider: null!))
+            .ToList();
+        var eventHandler = new SampleHandler();
 
-            Assert.AreEqual(4, createdSampleClasses.Count, "Number of Concurrent Objects created should be 4");
-        }
+        List<int> workerCounts = new();
 
-        [TestMethod]
-        public void DoActionOnConcurrentObjectsShouldCallAllObjects()
+        Func<SampleHandler, SampleManager, SampleHandler> getEventHandler = (handler, _) => handler;
+        Action<SampleManager, SampleHandler, SampleWorkload, bool, Task?> runWorkload = (manager, _, _, _, _) =>
         {
-            var createdSampleClasses = new List<SampleConcurrentClass>();
-            Func<SampleConcurrentClass> sampleCreator =
-                () =>
-                {
-                    var sample = new SampleConcurrentClass();
-                    createdSampleClasses.Add(sample);
-                    return sample;
-                };
-
-            this.proxyParallelManager = new MockParallelOperationManager(sampleCreator, 4, true);
-
-            Assert.AreEqual(4, createdSampleClasses.Count, "Number of Concurrent Objects created should be 4");
-
-            int count = 0;
-            this.proxyParallelManager.DoActionOnAllConcurrentObjects(
-                (sample) =>
-                {
-                    count++;
-                    Assert.IsTrue(createdSampleClasses.Contains(sample), "Called object must be in the created list.");
-                    // Make sure action is not called on same object multiple times
-                    createdSampleClasses.Remove(sample);
-                });
-
-            Assert.AreEqual(4, count, "Number of Concurrent Objects called should be 4");
-
-            Assert.AreEqual(0, createdSampleClasses.Count, "All concurrent objects must be called.");
-        }
+            // Every time we run a workload check how many slots are occupied,
+            // we should see 3 slots at max, because that is our max parallel level, we should NOT see 4 or more:
+            // This is what the data should be:
+            // - At the start we schedule as much work as we can, workloads 1, 2, 3
+            //   are started and grab a slot.
+            //   We only update the slot count after scheduling all the work up to the max parallel level,
+            //   so when we reach this method, all the slots are already occupied, so for workloads 1, 2, 3 we record 3, 3, 3.
+            // - Workload 1 finishes and leaves the slot, 4 starts and grabs a slot, 2, 3, 4 are now running we record 3.
+            // - workload 2 finishes and leaves the slot, 5 starts and grabs a slot, 3, 4, 5 are now running we record 3.
+            // - workload 2 finishes and leaves the slot, 5 starts and grabs a slot, 3, 4, 5 are now running we record 3.
+            // - workload 3 finishes and leaves the slot, there is no more work to do so we don't grab any additional slot. Just 4, 5 are now running we record 2.
+            // - workload 4 finishes and leaves the slot, there is no more work to do so we don't grab any additional slot. Just 5 is now running we record 1.
+
+            workerCounts.Add(parallelOperationManager.OccupiedSlotCount);
+
+            System.Threading.Thread.Sleep(100);
+
+            // Tell the operation manager that we are done, and it should move to the next piece of work.
+            // Normally the operation manager would get this notification via the handler because the work we do
+            // is asynchronous, but here we know that we are already done so we just tell the operation manager directly
+            // and pass on the current manager that is done.
+            parallelOperationManager.RunNextWork(manager);
+        };
+        Func<SampleManager, SampleHandler, SampleWorkload, Task> initializeWorkload = (_, _, _) =>
+            Task.Run(() => System.Threading.Thread.Sleep(100));
+
+        // Act
+        parallelOperationManager.StartWork(workloads, eventHandler, getEventHandler, initializeWorkload, runWorkload);
+
+        // Assert
+        workerCounts.Should().BeEquivalentTo(new[] { 3, 3, 3, 2, 1 });
+    }
 
-        [TestMethod]
-        public void AddManagerShouldAddAManagerWithHandlerInConcurrentManagerList()
-        {
-            // At the beginning it should be equal to parallel level
-            Assert.AreEqual(2, this.proxyParallelManager.GetConcurrentManagersCount());
+    [TestMethod]
+    public void OperationManagerShouldCreateOnlyAsManyParallelWorkersAsThereAreWorkloadsWhenTheAmountOfWorkloadsIsSmallerThanMaxParallelLevel()
+    {
+        // Arrange
+        Func<TestRuntimeProviderInfo, SampleWorkload, SampleManager> createNewManager = (_, _2) => new SampleManager();
+        var maxParallelLevel = 10;
+        var parallelOperationManager = new ParallelOperationManager<SampleManager, SampleHandler, SampleWorkload>(createNewManager, maxParallelLevel);
 
-            this.proxyParallelManager.AddManager(new SampleConcurrentClass(true), new SampleHandlerClass());
+        // Create less workloads than our parallel level so we can observe that only as many slots are created as there are workloads.
+        var workloads = Enumerable.Range(1, 2)
+            .Select(i => new ProviderSpecificWorkload<SampleWorkload>(new SampleWorkload { Id = i }, provider: null!))
+            .ToList();
+        var eventHandler = new SampleHandler();
 
-            Assert.AreEqual(3, this.proxyParallelManager.GetConcurrentManagersCount());
-            Assert.AreEqual(1, this.proxyParallelManager.GetConcurrentManagerInstances().Count(m => m.CheckValue));
-        }
+        List<int> workerCounts = new();
 
-        [TestMethod]
-        public void RemoveManagerShouldRemoveAManagerFromConcurrentManagerList()
+        Func<SampleHandler, SampleManager, SampleHandler> getEventHandler = (handler, _) => handler;
+        Action<SampleManager, SampleHandler, SampleWorkload, bool, Task?> runWorkload = (manager, _, _, _, _) =>
         {
-            var manager = new SampleConcurrentClass(true);
-            this.proxyParallelManager.AddManager(manager, new SampleHandlerClass());
+            // See comments in test above for explanation.
+            workerCounts.Add(parallelOperationManager.OccupiedSlotCount);
+            System.Threading.Thread.Sleep(100);
 
-            Assert.AreEqual(3, this.proxyParallelManager.GetConcurrentManagersCount());
+            parallelOperationManager.RunNextWork(manager);
+        };
+        Func<SampleManager, SampleHandler, SampleWorkload, Task> initializeWorkload = (_, _, _) =>
+            Task.Run(() => System.Threading.Thread.Sleep(100));
 
-            this.proxyParallelManager.RemoveManager(manager);
+        // Act
+        parallelOperationManager.StartWork(workloads, eventHandler, getEventHandler, initializeWorkload, runWorkload);
 
-            Assert.AreEqual(2, this.proxyParallelManager.GetConcurrentManagersCount());
-            Assert.AreEqual(0, this.proxyParallelManager.GetConcurrentManagerInstances().Count(m => m.CheckValue));
-        }
-
-        [TestMethod]
-        public void UpdateHandlerForManagerShouldAddNewHandlerIfNotexist()
-        {
-            var manager = new SampleConcurrentClass(true);
-            this.proxyParallelManager.UpdateHandlerForManager(manager, new SampleHandlerClass());
+        // Assert
+        workerCounts.Should().BeEquivalentTo(new[] { 2, 1 });
+    }
 
-            Assert.AreEqual(3, this.proxyParallelManager.GetConcurrentManagersCount());
-            Assert.AreEqual(1, this.proxyParallelManager.GetConcurrentManagerInstances().Count(m => m.CheckValue));
-        }
 
-        [TestMethod]
-        public void UpdateHandlerForManagerShouldUpdateHandlerForGivenManager()
+    [TestMethod]
+    public void OperationManagerShouldCreateAsManyMaxParallelLevel()
+    {
+        // Arrange
+        Func<TestRuntimeProviderInfo, SampleWorkload, SampleManager> createNewManager = (_, _2) => new SampleManager();
+        var maxParallelLevel = 10;
+        var parallelOperationManager = new ParallelOperationManager<SampleManager, SampleHandler, SampleWorkload>(createNewManager, maxParallelLevel);
+
+        // Create less workloads than our parallel level so we can observe that only as many slots are created as there are workloads.
+        var workloads = Enumerable.Range(1, 2)
+            .Select(i => new ProviderSpecificWorkload<SampleWorkload>(new SampleWorkload { Id = i }, provider: null!))
+            .ToList();
+        var eventHandler = new SampleHandler();
+
+        List<int> workerCounts = new();
+        List<int> availableWorkerCounts = new();
+
+        Func<SampleHandler, SampleManager, SampleHandler> getEventHandler = (handler, _) => handler;
+        Action<SampleManager, SampleHandler, SampleWorkload, bool, Task?> runWorkload = (manager, _, _, _, _) =>
         {
-            var manager = new SampleConcurrentClass(true);
-            this.proxyParallelManager.AddManager(manager, new SampleHandlerClass());
-
-            // For current handler the value of variable CheckValue should be false;
-            Assert.IsFalse(this.proxyParallelManager.GetHandlerForGivenManager(manager).CheckValue);
-
-            var newHandler = new SampleHandlerClass(true);
-
-            // Update manager with new handler
-            this.proxyParallelManager.UpdateHandlerForManager(manager, newHandler);
-
-            // It should not add new manager but update the current one
-            Assert.AreEqual(3, this.proxyParallelManager.GetConcurrentManagersCount());
-            Assert.IsTrue(this.proxyParallelManager.GetHandlerForGivenManager(manager).CheckValue);
-        }
+            // See comments in test above for explanation.
+            workerCounts.Add(parallelOperationManager.OccupiedSlotCount);
+            availableWorkerCounts.Add(parallelOperationManager.AvailableSlotCount);
+            System.Threading.Thread.Sleep(100);
+
+            parallelOperationManager.RunNextWork(manager);
+        };
+        Func<SampleManager, SampleHandler, SampleWorkload, Task> initializeWorkload = (_, _, _) =>
+            Task.Run(() => System.Threading.Thread.Sleep(100));
+
+        // Act
+        parallelOperationManager.StartWork(workloads, eventHandler, getEventHandler, initializeWorkload, runWorkload);
+
+        // Assert
+        workerCounts.Should().BeEquivalentTo(new[] { 2, 1 });
+        // We create 10 slots, because that is the max parallel level, when we observe, there are 2 workloads running,
+        // and then 1 workload running, so we see 8 and 9 (10 - 2, and 10 - 1).
+        availableWorkerCounts.Should().BeEquivalentTo(new[] { 8, 9 });
+    }
 
-        private class MockParallelOperationManager : ParallelOperationManager<SampleConcurrentClass, SampleHandlerClass>
+    [TestMethod]
+    public void OperationManagerMovesToTheNextWorkloadOnlyWhenRunNextWorkIsCalled()
+    {
+        // Arrange
+        Func<TestRuntimeProviderInfo, SampleWorkload, SampleManager> createNewManager = (_, _2) => new SampleManager();
+        var maxParallelLevel = 2;
+        var parallelOperationManager = new ParallelOperationManager<SampleManager, SampleHandler, SampleWorkload>(createNewManager, maxParallelLevel);
+
+        // Create more workloads than our parallel level so we can observe that when one workload is finished, calling RunNextWork will move on
+        // to the next workload.
+        var workloads = Enumerable.Range(1, maxParallelLevel + 3)
+            .Select(i => new ProviderSpecificWorkload<SampleWorkload>(new SampleWorkload { Id = i }, provider: null!))
+            .ToList();
+        var eventHandler = new SampleHandler();
+
+        List<int> workloadsProcessed = new();
+
+        Func<SampleHandler, SampleManager, SampleHandler> getEventHandler = (handler, _) => handler;
+        Action<SampleManager, SampleHandler, SampleWorkload, bool, Task?> runWorkload = (manager, _, workload, _, _) =>
         {
-            public MockParallelOperationManager(Func<SampleConcurrentClass> createNewClient, int parallelLevel, bool sharedHosts) :
-                base(createNewClient, parallelLevel, sharedHosts)
-            {
-            }
+            // See comments in test above for explanation.
+            System.Threading.Thread.Sleep(100);
 
-            public void DoActionOnAllConcurrentObjects(Action<SampleConcurrentClass> action)
+            workloadsProcessed.Add(workload.Id);
+            // Only move to next when we run the first workload. Meaning we process 1, 2, and then 3, but not 4 and 5.
+            if (workload.Id == 1)
             {
-                this.DoActionOnAllManagers(action, false);
+                parallelOperationManager.RunNextWork(manager);
             }
-        }
+        };
+        Func<SampleManager, SampleHandler, SampleWorkload, Task> initializeWorkload = (_, _, _) =>
+            Task.Run(() => System.Threading.Thread.Sleep(100));
+
+        // Act
+        parallelOperationManager.StartWork(workloads, eventHandler, getEventHandler, initializeWorkload, runWorkload);
+
+        // Assert
+        // We start by scheduling 2 workloads (1 and 2) becuase that is the max parallel level.
+        // Then we call next and go to 3. After that, we don't call next anymore which means we are done,
+        // even though we did not process workloads 4 and 5.
+        // (e.g. In real life Abort was called so the handler won't call RunNextWork, because we don't want to run the remaining sources,
+        // and all the sources that are currently running be aborted by calling Abort on each manager via DoActionOnAllManagers.)
+        workloadsProcessed.Should().BeEquivalentTo(new[] { 1, 2, 3 });
+    }
 
-        private class SampleConcurrentClass
+    [TestMethod]
+    public void OperationManagerRunsAnOperationOnAllActiveManagersWhenDoActionOnAllManagersIsCalled()
+    {
+        // Arrange
+        var createdManagers = new List<SampleManager>();
+        // Store the managers we created so we can inspect them later and see if Abort was called on them.
+        Func<TestRuntimeProviderInfo, SampleWorkload, SampleManager> createNewManager = (_, _2) =>
         {
-            public bool IsDisposeCalled = false;
-            public bool CheckValue;
-            public SampleConcurrentClass(bool value=false)
+            var manager = new SampleManager();
+            createdManagers.Add(manager);
+            return manager;
+        };
+
+        var maxParallelLevel = 2;
+        // Create more workloads than the parallel level so we can go past max parallel level of active workers and simulate that we
+        // are aborting in the middle of a run.
+        var workloads = Enumerable.Range(1, maxParallelLevel + 3)
+            .Select(i => new ProviderSpecificWorkload<SampleWorkload>(new SampleWorkload { Id = i }, provider: null!))
+            .ToList();
+
+        var parallelOperationManager = new ParallelOperationManager<SampleManager, SampleHandler, SampleWorkload>(createNewManager, maxParallelLevel);
+        var eventHandler = new SampleHandler();
+
+        Func<SampleHandler, SampleManager, SampleHandler> getEventHandler = (handler, _) => handler;
+        Action<SampleManager, SampleHandler, SampleWorkload, bool, Task?> runWorkload = (manager, _, workload, _, _) =>
+        {
+            // See comments in test above for explanation.
+
+            // Make workload 1 fast, we want to put this in state where 2 and 3 are running and we call abort on them.
+            if (workload.Id != 1)
             {
-                this.CheckValue = value;
+                System.Threading.Thread.Sleep(100);
             }
-        }
 
-        private class SampleHandlerClass
-        {
-            public bool CheckValue;
-            public SampleHandlerClass(bool value=false)
+            // Only move to next when we run the first workload. Meaning we process 1, 2, and then 3, but not 4 and 5.
+            if (workload.Id == 1)
             {
-                this.CheckValue = value;
+                parallelOperationManager.RunNextWork(manager);
             }
+        };
+        Func<SampleManager, SampleHandler, SampleWorkload, Task> initializeWorkload = (_, _, _) =>
+            Task.Run(() => System.Threading.Thread.Sleep(100));
+
+        // Start the work, so we process workload 1 and then move to 2.
+        parallelOperationManager.StartWork(workloads, eventHandler, getEventHandler, initializeWorkload, runWorkload);
 
+        // Act
+        parallelOperationManager.DoActionOnAllManagers(manager => manager.Abort(), doActionsInParallel: true);
+
+        // Assert
+        // When we aborted workload 1 was already processed, and 2, and 3 were active.
+        // We should see that the first manager did not call abort, but second and third called abort,
+        // and there were no more managers created because we stopped calling next after 1 was done.
+        createdManagers.Select(manager => manager.AbortCalled).Should().BeEquivalentTo(new[] { false, true, true });
+    }
+
+    /// <summary>
+    /// Represents a manager that is responsible for processing a single given workload. Normally this would be a testhost.
+    /// </summary>
+    private class SampleManager
+    {
+        public bool AbortCalled { get; private set; }
+
+        public void Abort()
+        {
+            AbortCalled = true;
         }
     }
+
+    /// <summary>
+    /// Represents a handler, in our tests it does nothing, because we are not running any "async" work
+    /// so we don't need a handler to call us back when processing one workload is done and we can progress to next
+    /// workload.
+    /// </summary>
+    private class SampleHandler
+    {
+
+    }
+
+    // Represents a workload, normally this would be a test dll, or a collection of testcases from a single dll that
+    // are supposed to run on 1 testhost.
+    private class SampleWorkload
+    {
+        public int Id { get; set; }
+    }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyDiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyDiscoveryManagerTests.cs
index d9f85b420b..37cfb2764d 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyDiscoveryManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyDiscoveryManagerTests.cs
@@ -1,295 +1,407 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ParallelProxyDiscoveryManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class ParallelProxyDiscoveryManagerTests
+    private const int Timeout10Seconds = 10 * 1000;
+    private readonly Queue<Mock<IProxyDiscoveryManager>> _preCreatedMockManagers;
+    private readonly List<Mock<IProxyDiscoveryManager>> _usedMockManagers;
+    private readonly Func<TestRuntimeProviderInfo, DiscoveryCriteria, IProxyDiscoveryManager> _createMockManager;
+    private readonly Mock<ITestDiscoveryEventsHandler2> _mockEventHandler;
+    private readonly List<string> _sources = ["1.dll", "2.dll"];
+    private readonly DiscoveryCriteria _discoveryCriteriaWith2Sources;
+    private readonly List<TestRuntimeProviderInfo> _runtimeProviders;
+    private int _createMockManagerCalled;
+    private readonly List<string> _processedSources;
+    private readonly ManualResetEventSlim _discoveryCompleted;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly DiscoveryDataAggregator _dataAggregator;
+
+    public ParallelProxyDiscoveryManagerTests()
     {
-        private const int taskTimeout = 15 * 1000; // In milliseconds.
-        private List<Mock<IProxyDiscoveryManager>> createdMockManagers;
-        private Func<IProxyDiscoveryManager> proxyManagerFunc;
-        private Mock<ITestDiscoveryEventsHandler2> mockHandler;
-        private List<string> sources = new List<string>() { "1.dll", "2.dll" };
-        private DiscoveryCriteria testDiscoveryCriteria;
-        private bool proxyManagerFuncCalled;
-        private List<string> processedSources;
-        private ManualResetEventSlim discoveryCompleted;
-        private Mock<IRequestData> mockRequestData;
-
-        public ParallelProxyDiscoveryManagerTests()
+        _processedSources = new List<string>();
+        _preCreatedMockManagers = new Queue<Mock<IProxyDiscoveryManager>>(
+            new List<Mock<IProxyDiscoveryManager>>{
+                // have at least as many of them as you have test dlls
+                // they will be dequeued when we "create" a non-parallel
+                // manager. The setup adds callback for handler to complete
+                // the discovery.
+                new(),
+                new(),
+                new(),
+                new(),
+                new(),
+            });
+        _usedMockManagers = new List<Mock<IProxyDiscoveryManager>>();
+        _createMockManager = (_, _2) =>
         {
-            this.processedSources = new List<string>();
-            this.createdMockManagers = new List<Mock<IProxyDiscoveryManager>>();
-            this.proxyManagerFunc = () =>
-            {
-                this.proxyManagerFuncCalled = true;
-                var manager = new Mock<IProxyDiscoveryManager>();
-                this.createdMockManagers.Add(manager);
-                return manager.Object;
-            };
-            this.mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.testDiscoveryCriteria = new DiscoveryCriteria(sources, 100, null);
-            this.discoveryCompleted = new ManualResetEventSlim(false);
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-        }
+            // We create the manager at the last possible
+            // moment now, not when we create the parallel proxy manager class
+            // so rather than creating the class here, and adding the mock setup
+            // that allows the tests to complete. We instead pre-create a bunch of managers
+            // and then grab and setup the ones we need, and only assert on the used ones.
+            _createMockManagerCalled++;
+            var manager = _preCreatedMockManagers.Dequeue();
+            _usedMockManagers.Add(manager);
+            return manager.Object;
+        };
+        _mockEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryCriteriaWith2Sources = new DiscoveryCriteria(_sources, 100, null);
+        _runtimeProviders = new List<TestRuntimeProviderInfo> {
+            new(typeof(ITestRuntimeProvider), false, "<RunSettings></RunSettings>", [
+                new() { Source = _sources[0], Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+                new() { Source = _sources[1], Architecture = Architecture.X86, Framework = Framework.DefaultFramework }
+            ])
+        };
+
+        // This event is Set by callback from _mockEventHandler in SetupDiscoveryManager
+        _discoveryCompleted = new ManualResetEventSlim(false);
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(new ProtocolConfig());
+        _dataAggregator = new();
+    }
+
+    [TestMethod]
+    public void CreatingAndInitializingProxyExecutionManagerDoesNothingUntilThereIsActualWorkToDo()
+    {
+        InvokeAndVerifyInitialize(3);
+    }
+
+    [TestMethod]
+    public void CreatingAndInitializingProxyExecutionManagerDoesNothingUntilThereIsActualWorkToDoButItKeepsSkipDefaultAdaptersValueFalse()
+    {
+        InvokeAndVerifyInitialize(3, skipDefaultAdapters: false);
+    }
+
+
+    [TestMethod]
+    public void CreatingAndInitializingProxyExecutionManagerDoesNothingUntilThereIsActualWorkToDoButItKeepsSkipDefaultAdaptersValueTrue()
+    {
+        InvokeAndVerifyInitialize(3, skipDefaultAdapters: true);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersOnce()
+    [TestMethod]
+    public void AbortShouldCallAllConcurrentManagersOnce()
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, _createMockManager, dataAggregator: new(), parallelLevel: 1000, _runtimeProviders);
+
+        // Starting parallel discovery will create 2 proxy managers, which we will then promptly abort.
+        parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, new Mock<ITestDiscoveryEventsHandler2>().Object);
+
+        parallelDiscoveryManager.Abort();
+
+        Assert.AreEqual(2, _usedMockManagers.Count, "Number of Concurrent Managers created should be equal to the number of sources that should run");
+        _usedMockManagers.ForEach(dm => dm.Verify(m => m.Abort(), Times.Once));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldProcessAllSources()
+    {
+        // Testcase filter should be passed to all parallel discovery criteria.
+        _discoveryCriteriaWith2Sources.TestCaseFilter = "Name~Test";
+        var parallelDiscoveryManager = SetupDiscoveryManager(_createMockManager, 2, false);
+
+        var task = Task.Run(() => parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object));
+        var discoveryCompleted = _discoveryCompleted.Wait(Timeout10Seconds);
+
+        if (task.IsCompleted)
         {
-            InvokeAndVerifyInitialize(3);
+            // If the work is done, either there is output,
+            // or an exception that we want to "receive" to
+            // fail our test.
+            task.GetAwaiter().GetResult();
         }
-
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersWithFalseFlagIfSkipDefaultAdaptersIsFalse()
+        else
         {
-            InvokeAndVerifyInitialize(3, false);
+            // We don't want to await the result because we
+            // completed or timed out on the event above.
         }
 
+        Assert.IsTrue(discoveryCompleted, "Test discovery not completed.");
+        Assert.AreEqual(_sources.Count, _processedSources.Count, "All Sources must be processed.");
+        AssertMissingAndDuplicateSources(_processedSources);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersWithTrueFlagIfSkipDefaultAdaptersIsTrue()
-        {
-            InvokeAndVerifyInitialize(3, true);
-        }
+    [TestMethod]
+    public void HandlePartialDiscoveryCompleteShouldReturnTrueIfDiscoveryWasAbortedBeforeBeingStartedWithEventHandler()
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, _createMockManager, dataAggregator: new(), parallelLevel: 1, new List<TestRuntimeProviderInfo>());
+        var proxyDiscovermanager = new ProxyDiscoveryManager(_mockRequestData.Object, new Mock<ITestRequestSender>().Object, new Mock<ITestRuntimeProvider>().Object);
 
-        [TestMethod]
-        public void AbortShouldCallAllConcurrentManagersOnce()
-        {
-            var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(this.mockRequestData.Object, this.proxyManagerFunc, 4, false);
+        parallelDiscoveryManager.Abort(_mockEventHandler.Object);
+        bool isPartialDiscoveryComplete = parallelDiscoveryManager.HandlePartialDiscoveryComplete(proxyDiscovermanager, 20, new List<TestCase>(), isAborted: false);
 
-            parallelDiscoveryManager.Abort();
+        Assert.IsTrue(isPartialDiscoveryComplete);
+    }
 
-            Assert.AreEqual(4, createdMockManagers.Count, "Number of Concurrent Managers created should be 4");
-            createdMockManagers.ForEach(dm => dm.Verify(m => m.Abort(), Times.Once));
-        }
+    [TestMethod]
+    public void HandlePartialDiscoveryCompleteShouldReturnTrueIfDiscoveryWasAbortedAfterBeingStartedWithEventHandler()
+    {
+        var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
+        _preCreatedMockManagers.Enqueue(discoveryManagerMock);
+        var parallelDiscoveryManager = SetupDiscoveryManager((_, _2) => discoveryManagerMock.Object, 1, true);
+        var proxyDiscovermanager = new ProxyDiscoveryManager(_mockRequestData.Object, new Mock<ITestRequestSender>().Object, new Mock<ITestRuntimeProvider>().Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldProcessAllSources()
-        {
-            // Testcase filter should be passed to all parallel discovery criteria.
-            this.testDiscoveryCriteria.TestCaseFilter = "Name~Test";
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(this.proxyManagerFunc, 2, false);
+        parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object);
+        parallelDiscoveryManager.Abort(_mockEventHandler.Object);
+        bool isPartialDiscoveryComplete = parallelDiscoveryManager.HandlePartialDiscoveryComplete(proxyDiscovermanager, 20, new List<TestCase>(), isAborted: false);
 
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-            });
+        Assert.IsTrue(isPartialDiscoveryComplete);
+    }
 
-            Assert.IsTrue(this.discoveryCompleted.Wait(ParallelProxyDiscoveryManagerTests.taskTimeout), "Test discovery not completed.");
-            Assert.AreEqual(sources.Count, processedSources.Count, "All Sources must be processed.");
-            AssertMissingAndDuplicateSources(processedSources);
-        }
+    [TestMethod]
+    public void HandlePartialDiscoveryCompleteShouldReturnTrueIfDiscoveryWasAbortedBeforeBeingStarted()
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, _createMockManager, dataAggregator: new(), parallelLevel: 1, new List<TestRuntimeProviderInfo>());
+        var proxyDiscovermanager = new ProxyDiscoveryManager(_mockRequestData.Object, new Mock<ITestRequestSender>().Object, new Mock<ITestRuntimeProvider>().Object);
 
-        /// <summary>
-        ///  Create ParallelProxyDiscoveryManager with parallel level 1 and two source,
-        ///  Abort in any source should not stop discovery for other sources.
-        /// </summary>
-        [TestMethod]
-        public void DiscoveryTestsShouldProcessAllSourcesOnDiscoveryAbortsForAnySource()
-        {
-            // Since the hosts are aborted, total aggregated tests sent across will be -1
-            var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
-            this.createdMockManagers.Add(discoveryManagerMock);
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(() => discoveryManagerMock.Object, 1, true, totalTests: -1);
+        parallelDiscoveryManager.Abort();
+        bool isPartialDiscoveryComplete = parallelDiscoveryManager.HandlePartialDiscoveryComplete(proxyDiscovermanager, 20, new List<TestCase>(), isAborted: false);
 
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-            });
+        Assert.IsTrue(isPartialDiscoveryComplete);
+    }
 
-            Assert.IsTrue(this.discoveryCompleted.Wait(ParallelProxyDiscoveryManagerTests.taskTimeout), "Test discovery not completed.");
-            Assert.AreEqual(2, processedSources.Count, "All Sources must be processed.");
-        }
+    [TestMethod]
+    public void HandlePartialDiscoveryCompleteShouldReturnTrueIfDiscoveryWasAbortedAfterBeingStarted()
+    {
+        var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
+        _preCreatedMockManagers.Enqueue(discoveryManagerMock);
+        var parallelDiscoveryManager = SetupDiscoveryManager((_, _2) => discoveryManagerMock.Object, 1, true);
+        var proxyDiscovermanager = new ProxyDiscoveryManager(_mockRequestData.Object, new Mock<ITestRequestSender>().Object, new Mock<ITestRuntimeProvider>().Object);
 
-        /// <summary>
-        ///  Create ParallelProxyDiscoveryManager with parallel level 1 and two sources,
-        ///  Overall discovery should stop, if aborting was requested
-        /// </summary>
-        [TestMethod]
-        public void DiscoveryTestsShouldStopDiscoveryIfAbortionWasRequested()
-        {
-            // Since the hosts are aborted, total aggregated tests sent across will be -1
-            var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
-            this.createdMockManagers.Add(discoveryManagerMock);
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(() => discoveryManagerMock.Object, 1, true, totalTests: -1);
+        parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object);
+        parallelDiscoveryManager.Abort();
+        bool isPartialDiscoveryComplete = parallelDiscoveryManager.HandlePartialDiscoveryComplete(proxyDiscovermanager, 20, new List<TestCase>(), isAborted: false);
 
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-                parallelDiscoveryManager.Abort();
-            });
+        Assert.IsTrue(isPartialDiscoveryComplete);
+    }
 
-            Assert.IsTrue(this.discoveryCompleted.Wait(taskTimeout), "Test discovery not completed.");
-            Assert.AreEqual(1, processedSources.Count, "One source should be processed.");
-        }
+    [TestMethod]
+    public void DiscoveryTestsShouldStopDiscoveryIfAbortionWasRequested()
+    {
+        // Since the hosts are aborted, total aggregated tests sent across will be -1
+        var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
+        _preCreatedMockManagers.Enqueue(discoveryManagerMock);
+        var parallelDiscoveryManager = SetupDiscoveryManager((_, _2) => discoveryManagerMock.Object, 1, true);
 
-        [TestMethod]
-        public void DiscoveryTestsShouldProcessAllSourceIfOneDiscoveryManagerIsStarved()
+        Task.Run(() =>
         {
-            // Ensure that second discovery manager never starts. Expect 10 total tests.
-            // Override DiscoveryComplete since overall aborted should be true
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(this.proxyManagerFunc, 2, false, totalTests: 10);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
-                .Throws<NotImplementedException>();
-            this.mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
-                .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => { this.discoveryCompleted.Set(); });
-
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-            });
+            parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object);
+            parallelDiscoveryManager.Abort();
+        });
 
-            // Processed sources should be 1 since the 2nd source is never discovered
-            Assert.IsTrue(this.discoveryCompleted.Wait(ParallelProxyDiscoveryManagerTests.taskTimeout), "Test discovery not completed.");
-            Assert.AreEqual(1, processedSources.Count, "All Sources must be processed.");
-        }
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "One source should be processed.");
+    }
+
+    [TestMethod]
+    public void DiscoveryTestsShouldStopDiscoveryIfAbortionWithEventHandlerWasRequested()
+    {
+        // Since the hosts are aborted, total aggregated tests sent across will be -1
+        var discoveryManagerMock = new Mock<IProxyDiscoveryManager>();
+        _preCreatedMockManagers.Enqueue(discoveryManagerMock);
+        var parallelDiscoveryManager = SetupDiscoveryManager((_, _2) => discoveryManagerMock.Object, 1, true);
 
-        [TestMethod]
-        public void DiscoveryTestsShouldCatchExceptionAndHandleLogMessageOfError()
+        Task.Run(() =>
         {
-            // Ensure that second discovery manager never starts. Expect 10 total tests.
-            // Override DiscoveryComplete since overall aborted should be true
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(this.proxyManagerFunc, 2, false, totalTests: 10);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
-                .Throws<NotImplementedException>();
-            this.mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
-                .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => { this.discoveryCompleted.Set(); });
-
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-            });
+            parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object);
+            parallelDiscoveryManager.Abort(_mockEventHandler.Object);
+        });
 
-            // Processed sources should be 1 since the 2nd source is never discovered
-            Assert.IsTrue(this.discoveryCompleted.Wait(ParallelProxyDiscoveryManagerTests.taskTimeout), "Test discovery not completed.");
-            mockHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "One source should be processed.");
+    }
 
-        [TestMethod]
-        public void DiscoveryTestsShouldCatchExceptionAndHandleRawMessageOfTestMessage()
-        {
-            // Ensure that second discovery manager never starts. Expect 10 total tests.
-            // Override DiscoveryComplete since overall aborted should be true
-            var parallelDiscoveryManager = this.SetupDiscoveryManager(this.proxyManagerFunc, 2, false, totalTests: 10);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
-                .Throws<NotImplementedException>();
-            this.mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
-                .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => { this.discoveryCompleted.Set(); });
-
-            Task.Run(() =>
-            {
-                parallelDiscoveryManager.DiscoverTests(this.testDiscoveryCriteria, this.mockHandler.Object);
-            });
+    [TestMethod]
+    public void DiscoveryTestsShouldProcessAllSourceIfOneDiscoveryManagerIsStarved()
+    {
+        // Ensure that second discovery manager never starts. Expect 10 total tests.
+        // Override DiscoveryComplete since overall aborted should be true
+        var parallelDiscoveryManager = SetupDiscoveryManager(_createMockManager, 2, false);
+        var secondMockManager = _preCreatedMockManagers.ToArray()[1];
+        secondMockManager.Reset();
+        secondMockManager.Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
+            .Throws<NotImplementedException>();
+        _mockEventHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
+            .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => _discoveryCompleted.Set());
+
+        Task.Run(() => parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object));
+
+        // Processed sources should be 1 since the 2nd source is never discovered
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "All Sources must be processed.");
+    }
 
-            // Processed sources should be 1 since the 2nd source is never discovered
-            Assert.IsTrue(this.discoveryCompleted.Wait(ParallelProxyDiscoveryManagerTests.taskTimeout), "Test discovery not completed.");
-            mockHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
-        }
+    [TestMethod]
+    public void DiscoveryTestsShouldCatchExceptionAndHandleLogMessageOfError()
+    {
+        // Ensure that second discovery manager never starts. Expect 10 total tests.
+        // Override DiscoveryComplete since overall aborted should be true
+        var parallelDiscoveryManager = SetupDiscoveryManager(_createMockManager, 2, false);
+        var secondMockManager = _preCreatedMockManagers.ToArray()[1];
+        secondMockManager.Reset();
+        secondMockManager.Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
+            .Throws<NotImplementedException>();
+        _mockEventHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
+            .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => _discoveryCompleted.Set());
+
+        Task.Run(() => parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object));
+
+        // Processed sources should be 1 since the 2nd source is never discovered
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        _mockEventHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandlePartialDiscoveryCompleteShouldCreateANewProxyDiscoveryManagerIfIsAbortedIsTrue()
-        {
-            this.proxyManagerFuncCalled = false;
-            var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(this.mockRequestData.Object, this.proxyManagerFunc, 1, false);
-            var proxyDiscovermanager = new ProxyDiscoveryManager(this.mockRequestData.Object, new Mock<ITestRequestSender>().Object, new Mock<ITestRuntimeProvider>().Object);
+    [TestMethod]
+    public void DiscoveryTestsShouldCatchExceptionAndHandleRawMessageOfTestMessage()
+    {
+        // Ensure that second discovery manager never starts. Expect 10 total tests.
+        // Override DiscoveryComplete since overall aborted should be true
+        var parallelDiscoveryManager = SetupDiscoveryManager(_createMockManager, 2, false);
+        var secondMockManager = _preCreatedMockManagers.ToArray()[1];
+        secondMockManager.Reset();
+        secondMockManager.Setup(dm => dm.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()))
+            .Throws<NotImplementedException>();
+        _mockEventHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
+            .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>((t, l) => _discoveryCompleted.Set());
+
+        Task.Run(() => parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object));
+
+        // Processed sources should be 1 since the 2nd source is never discovered
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        _mockEventHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
+    }
 
-            parallelDiscoveryManager.HandlePartialDiscoveryComplete(proxyDiscovermanager, 20, new List<TestCase>(), isAborted: true);
+    [TestMethod]
+    public void HandlePartialDiscoveryCompleteShouldCreateANewProxyDiscoveryManagerIfIsAbortedIsTrue()
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, _createMockManager, dataAggregator: new(), parallelLevel: 1, _runtimeProviders);
 
-            Assert.IsTrue(this.proxyManagerFuncCalled);
-        }
+        // Trigger discover tests, this will create a manager by calling the _createMockManager func
+        // which dequeues it to _usedMockManagers.
+        parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object);
+        var completedManager = _usedMockManagers[0];
 
-        private IParallelProxyDiscoveryManager SetupDiscoveryManager(Func<IProxyDiscoveryManager> getProxyManager, int parallelLevel, bool abortDiscovery, int totalTests = 20)
-        {
-            var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(this.mockRequestData.Object, getProxyManager, parallelLevel, false);
-            this.SetupDiscoveryTests(this.processedSources, abortDiscovery);
+        // act
+        // Tell the manager that completedManager finished work, and that it should progress to next work
+        parallelDiscoveryManager.HandlePartialDiscoveryComplete(completedManager.Object, 20, new List<TestCase>(), isAborted: true);
 
-            // Setup a complete handler for parallel discovery manager
-            this.mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
-                .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>(
-                    (discoveryCompleteEventArgs, lastChunk) => { this.discoveryCompleted.Set(); });
+        // assert
+        // We created 2 managers 1 for the original work and another one
+        // when we called HandlePartialDiscoveryComplete and it moved on to the next piece of work.
+        Assert.AreEqual(2, _createMockManagerCalled);
+    }
 
-            return parallelDiscoveryManager;
-        }
+    [TestMethod]
+    public void DiscoveryTestsWithCompletionMarksAllSourcesAsFullyDiscovered()
+    {
+        _discoveryCriteriaWith2Sources.TestCaseFilter = "Name~Test";
+        var parallelDiscoveryManager = SetupDiscoveryManager(_createMockManager, 2, false);
+
+        Task.Run(() => parallelDiscoveryManager.DiscoverTests(_discoveryCriteriaWith2Sources, _mockEventHandler.Object));
 
-        private void SetupDiscoveryTests(List<string> processedSources, bool isAbort)
+        Assert.IsTrue(_discoveryCompleted.Wait(Timeout10Seconds), "Test discovery not completed.");
+        Assert.AreEqual(_sources.Count, _processedSources.Count, "All Sources must be processed.");
+        CollectionAssert.AreEquivalent(_sources, _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        Assert.AreEqual(0, _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count);
+        Assert.AreEqual(0, _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count);
+    }
+
+    private ParallelProxyDiscoveryManager SetupDiscoveryManager(Func<TestRuntimeProviderInfo, DiscoveryCriteria, IProxyDiscoveryManager> getProxyManager, int parallelLevel, bool abortDiscovery)
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, getProxyManager, dataAggregator: new(), parallelLevel, _runtimeProviders);
+        SetupDiscoveryTests(_processedSources, abortDiscovery);
+
+        // Setup a complete handler for parallel discovery manager
+        _mockEventHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null))
+            .Callback<DiscoveryCompleteEventArgs, IEnumerable<TestCase>>(
+                (discoveryCompleteEventArgs, lastChunk) => _discoveryCompleted.Set());
+
+        return parallelDiscoveryManager;
+    }
+
+    private void SetupDiscoveryTests(List<string> processedSources, bool isAbort)
+    {
+        var syncObject = new object();
+        // This setups callbacks for the handler the we pass through.
+        // We pick up those managers in the _createMockManager func,
+        // and return them.
+        foreach (var manager in _preCreatedMockManagers.ToArray())
         {
-            var syncObject = new object();
-            foreach (var manager in this.createdMockManagers)
-            {
-                manager.Setup(m => m.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>())).
-                    Callback<DiscoveryCriteria, ITestDiscoveryEventsHandler2>(
-                        (criteria, handler) =>
+            manager.Setup(m => m.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>())).
+                Callback<DiscoveryCriteria, ITestDiscoveryEventsHandler2>(
+                    (criteria, handler) =>
+                    {
+                        lock (syncObject)
                         {
-                            lock (syncObject)
-                            {
-                                processedSources.AddRange(criteria.Sources);
-                            }
+                            processedSources.AddRange(criteria.Sources);
+                        }
 
-                            Task.Delay(100).Wait();
+                        _dataAggregator.MarkSourcesWithStatus(criteria.Sources, DiscoveryStatus.FullyDiscovered);
 
-                            Assert.AreEqual(this.testDiscoveryCriteria.TestCaseFilter, criteria.TestCaseFilter);
-                            handler.HandleDiscoveryComplete(isAbort ? new DiscoveryCompleteEventArgs(-1, isAbort) : new DiscoveryCompleteEventArgs(10, isAbort), null);
-                        });
-            }
+                        Task.Delay(100).Wait();
+
+                        Assert.AreEqual(_discoveryCriteriaWith2Sources.TestCaseFilter, criteria.TestCaseFilter);
+                        handler.HandleDiscoveryComplete(isAbort ? new DiscoveryCompleteEventArgs(-1, isAbort) : new DiscoveryCompleteEventArgs(10, isAbort), null);
+                    });
         }
+    }
 
-        private void AssertMissingAndDuplicateSources(List<string> processedSources)
+    private void AssertMissingAndDuplicateSources(List<string> processedSources)
+    {
+        foreach (var source in _sources)
         {
-            foreach (var source in this.sources)
-            {
-                bool matchFound = false;
+            bool matchFound = false;
 
-                foreach (var processedSrc in processedSources)
+            foreach (var processedSrc in processedSources)
+            {
+                if (processedSrc.Equals(source))
                 {
-                    if (processedSrc.Equals(source))
+                    if (matchFound)
                     {
-                        if (matchFound)
-                        {
-                            Assert.Fail("Concurrency issue detected: Source['{0}'] got processed twice", processedSrc);
-                        }
-
-                        matchFound = true;
+                        Assert.Fail("Concurrency issue detected: Source['{0}'] got processed twice", processedSrc);
                     }
-                }
 
-                Assert.IsTrue(matchFound, "Concurrency issue detected: Source['{0}'] did NOT get processed at all", source);
+                    matchFound = true;
+                }
             }
+
+            Assert.IsTrue(matchFound, "Concurrency issue detected: Source['{0}'] did NOT get processed at all", source);
         }
+    }
 
-        private void InvokeAndVerifyInitialize(int concurrentManagersCount, bool skipDefaultAdapters = false)
-        {
-            var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(this.mockRequestData.Object, this.proxyManagerFunc, concurrentManagersCount, false);
+    private void InvokeAndVerifyInitialize(int maxParallelLevel, bool skipDefaultAdapters = false)
+    {
+        var parallelDiscoveryManager = new ParallelProxyDiscoveryManager(_mockRequestData.Object, _createMockManager, dataAggregator: new(), maxParallelLevel, new List<TestRuntimeProviderInfo>());
 
-            // Action
-            parallelDiscoveryManager.Initialize(skipDefaultAdapters);
+        // Action
+        parallelDiscoveryManager.Initialize(skipDefaultAdapters);
 
-            // Verify
-            Assert.AreEqual(concurrentManagersCount, createdMockManagers.Count, $"Number of Concurrent Managers created should be {concurrentManagersCount}");
-            createdMockManagers.ForEach(dm => dm.Verify(m => m.Initialize(skipDefaultAdapters), Times.Once));
-        }
+        // Verify
+        Assert.AreEqual(0, _usedMockManagers.Count, $"No managers are pre-created until there is work for them.");
+        _usedMockManagers.ForEach(dm => dm.Verify(m => m.Initialize(skipDefaultAdapters), Times.Once));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
index 78b7376bcf..2ac3486f2f 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
@@ -1,379 +1,391 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ParallelProxyExecutionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class ParallelProxyExecutionManagerTests
+    private static readonly int Timeout3Seconds = 3 * 1000; // In milliseconds
+
+    private readonly List<Mock<IProxyExecutionManager>> _usedMockManagers;
+    private readonly Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> _createMockManager;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockEventHandler;
+
+    private readonly List<string> _sources;
+    private readonly List<string> _processedSources;
+    private readonly TestRunCriteria _testRunCriteriaWith2Sources;
+    private readonly List<TestRuntimeProviderInfo> _runtimeProviders;
+    private readonly List<TestCase> _testCases;
+    private readonly List<TestCase> _processedTestCases;
+    private readonly TestRunCriteria _testRunCriteriaWithTestsFrom3Dlls;
+
+    private int _createMockManagerCalled;
+    private readonly ManualResetEventSlim _executionCompleted;
+    private readonly Queue<Mock<IProxyExecutionManager>> _preCreatedMockManagers;
+    private readonly Mock<IRequestData> _mockRequestData;
+
+    public ParallelProxyExecutionManagerTests()
     {
-        private static readonly int taskTimeout = 15 * 1000; // In milliseconds
-
-        private List<Mock<IProxyExecutionManager>> createdMockManagers;
-        private Func<IProxyExecutionManager> proxyManagerFunc;
-        private Mock<ITestRunEventsHandler> mockHandler;
-        private Mock<ITestRuntimeProvider> mockTestHostManager;
+        _executionCompleted = new ManualResetEventSlim(false);
+        _preCreatedMockManagers = new Queue<Mock<IProxyExecutionManager>>(
+            new List<Mock<IProxyExecutionManager>>
+            {
+                new(),
+                new(),
+                new(),
+                new(),
+            });
+        _usedMockManagers = new List<Mock<IProxyExecutionManager>>();
+        _createMockManager = (_, _2) =>
+        {
+            _createMockManagerCalled++;
+            var manager = _preCreatedMockManagers.Dequeue();
+            _usedMockManagers.Add(manager);
+            return manager.Object;
+        };
+        _mockEventHandler = new Mock<IInternalTestRunEventsHandler>();
+
+        // Configure sources
+        _sources = new List<string>() { "1.dll", "2.dll" };
+        _processedSources = new List<string>();
+        _testRunCriteriaWith2Sources = new TestRunCriteria(_sources, 100, false, string.Empty, TimeSpan.MaxValue, null, "Name~Test", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
+        _runtimeProviders = new List<TestRuntimeProviderInfo> {
+            new(typeof(ITestRuntimeProvider), false, "<RunSettings></RunSettings>", [
+                new() { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+                new() { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+                // For testcases on the bottom.
+                new() { Source = "3.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework }
+            ])
+        };
+
+        // Configure testcases
+        _testCases = CreateTestCases();
+        _processedTestCases = new List<TestCase>();
+        _testRunCriteriaWithTestsFrom3Dlls = new TestRunCriteria(_testCases, 100);
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(new ProtocolConfig());
+    }
 
-        private Mock<ITestRequestSender> mockRequestSender;
+    [TestMethod]
+    public void NoManagersArePreCreatedUntilThereIsWorkForThem()
+    {
+        InvokeAndVerifyInitialize(3);
+    }
 
-        private Mock<IProxyDataCollectionManager> mockDataCollectionManager;
-        private List<string> sources;
-        private List<string> processedSources;
-        private TestRunCriteria testRunCriteriaWithSources;
-        private List<TestCase> testCases;
-        private List<TestCase> processedTestCases;
-        private TestRunCriteria testRunCriteriaWithTests;
+    [TestMethod]
+    public void NoManagersArePreCreatedUntilThereIsWorkForThemButSkipDefaultAdaptersValueFalseIsKept()
+    {
+        InvokeAndVerifyInitialize(3, skipDefaultAdapters: false);
+    }
 
-        private bool proxyManagerFuncCalled;
-        private ManualResetEventSlim executionCompleted;
-        private Mock<IRequestData> mockRequestData;
+    [TestMethod]
+    public void NoManagersArePreCreatedUntilThereIsWorkForThemButSkipDefaultAdaptersValueTrueIsKept()
+    {
+        InvokeAndVerifyInitialize(3, skipDefaultAdapters: true);
+    }
 
-        public ParallelProxyExecutionManagerTests()
-        {
-            this.executionCompleted = new ManualResetEventSlim(false);
-            this.createdMockManagers = new List<Mock<IProxyExecutionManager>>();
-            this.proxyManagerFunc = () =>
-                {
-                    this.proxyManagerFuncCalled = true;
-                    var manager = new Mock<IProxyExecutionManager>();
-                    createdMockManagers.Add(manager);
-                    return manager.Object;
-                };
-            this.mockHandler = new Mock<ITestRunEventsHandler>();
-
-            // Configure sources
-            this.sources = new List<string>() { "1.dll", "2.dll" };
-            this.processedSources = new List<string>();
-            this.testRunCriteriaWithSources = new TestRunCriteria(sources, 100, false, string.Empty, TimeSpan.MaxValue, null, "Name~Test", new FilterOptions() { FilterRegEx = @"^[^\s\(]+" });
-
-            // Configure testcases
-            this.testCases = CreateTestCases();
-            this.processedTestCases = new List<TestCase>();
-            this.testRunCriteriaWithTests = new TestRunCriteria(this.testCases, 100);
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-        }
+    [TestMethod]
+    public void AbortShouldCallAllConcurrentManagersOnce()
+    {
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, _createMockManager, parallelLevel: 1000, _runtimeProviders);
 
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersOnce()
-        {
-            InvokeAndVerifyInitialize(3);
-        }
+        // Starting parallel run will create 2 proxy managers, which we will then promptly abort.
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, new Mock<IInternalTestRunEventsHandler>().Object);
+        parallelExecutionManager.Abort(It.IsAny<IInternalTestRunEventsHandler>());
 
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersWithFalseFlagIfSkipDefaultAdaptersIsFalse()
-        {
-            InvokeAndVerifyInitialize(3, false);
-        }
+        Assert.AreEqual(2, _usedMockManagers.Count, "Number of Concurrent Managers created should be equal to the amount of dlls that run");
+        _usedMockManagers.ForEach(em => em.Verify(m => m.Abort(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once));
+    }
 
-        [TestMethod]
-        public void InitializeShouldCallAllConcurrentManagersWithTrueFlagIfSkipDefaultAdaptersIsTrue()
-        {
-            InvokeAndVerifyInitialize(3, true);
-        }
+    [TestMethod]
+    public void CancelShouldCallAllConcurrentManagersOnce()
+    {
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, _createMockManager, 4, _runtimeProviders);
 
-        [TestMethod]
-        public void AbortShouldCallAllConcurrentManagersOnce()
-        {
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, this.proxyManagerFunc, 4);
+        // Starting parallel run will create 2 proxy managers, which we will then promptly cancel.
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, new Mock<IInternalTestRunEventsHandler>().Object);
+        parallelExecutionManager.Cancel(It.IsAny<IInternalTestRunEventsHandler>());
 
-            parallelExecutionManager.Abort(It.IsAny<ITestRunEventsHandler>());
+        Assert.AreEqual(2, _usedMockManagers.Count, "Number of Concurrent Managers created should be equal to the amount of dlls that run");
+        _usedMockManagers.ForEach(em => em.Verify(m => m.Cancel(It.IsAny<IInternalTestRunEventsHandler>()), Times.Once));
+    }
 
-            Assert.AreEqual(4, createdMockManagers.Count, "Number of Concurrent Managers created should be 4");
-            createdMockManagers.ForEach(em => em.Verify(m => m.Abort(It.IsAny<ITestRunEventsHandler>()), Times.Once));
-        }
+    [TestMethod]
+    public void StartTestRunShouldProcessAllSources()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2);
 
-        [TestMethod]
-        public void CancelShouldCallAllConcurrentManagersOnce()
-        {
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, this.proxyManagerFunc, 4);
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object);
 
-            parallelExecutionManager.Cancel(It.IsAny<ITestRunEventsHandler>());
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(_sources.Count, _processedSources.Count, "All Sources must be processed.");
+        AssertMissingAndDuplicateSources(_processedSources);
+    }
 
-            Assert.AreEqual(4, createdMockManagers.Count, "Number of Concurrent Managers created should be 4");
-            createdMockManagers.ForEach(em => em.Verify(m => m.Cancel(It.IsAny<ITestRunEventsHandler>()), Times.Once));
-        }
 
-        [TestMethod]
-        public void StartTestRunShouldProcessAllSources()
-        {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2);
 
-            parallelExecutionManager.StartTestRun(testRunCriteriaWithSources, this.mockHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldProcessAllTestCases()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 3, setupTestCases: true);
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(this.sources.Count, processedSources.Count, "All Sources must be processed.");
-            AssertMissingAndDuplicateSources(processedSources);
-        }
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWithTestsFrom3Dlls, _mockEventHandler.Object);
 
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(_testCases.Count, _processedTestCases.Count, "All Tests must be processed.");
+        AssertMissingAndDuplicateTestCases(_testCases, _processedTestCases);
+    }
 
+    [TestMethod]
+    public void StartTestRunWithSourcesShouldNotSendCompleteUntilAllSourcesAreProcessed()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2);
 
-        [TestMethod]
-        public void StartTestRunShouldProcessAllTestCases()
-        {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 3, setupTestCases: true);
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            parallelExecutionManager.StartTestRun(this.testRunCriteriaWithTests, this.mockHandler.Object);
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(_sources.Count, _processedSources.Count, "All Sources must be processed.");
+        AssertMissingAndDuplicateSources(_processedSources);
+    }
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(this.testCases.Count, processedTestCases.Count, "All Tests must be processed.");
-            AssertMissingAndDuplicateTestCases(this.testCases, processedTestCases);
-        }
+    [TestMethod]
+    public void HandlePartialRunCompleteShouldCreateNewProxyExecutionManagerIfDataCollectionEnabled()
+    {
+        var completeArgs = new TestRunCompleteEventArgs(null, isCanceled: false, isAborted: false, null, null, null, TimeSpan.Zero);
+        var mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        var mockRequestSender = new Mock<ITestRequestSender>();
+        var mockDataCollectionManager = new Mock<IProxyDataCollectionManager>();
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2, setupTestCases: true);
+
+        // Trigger discover tests, this will create a manager by calling the _createMockManager func
+        // which dequeues it to _usedMockManagers.
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object);
+        var completedManager = _usedMockManagers[0];
+
+        // act
+        // Tell the manager that completedManager finished work, and that it should progress to next work
+        parallelExecutionManager.HandlePartialRunComplete(completedManager.Object, completeArgs, null!, null!, null!);
+
+        // assert
+        // We created 2 managers 1 for the original work and another one
+        // when we called HandlePartialDiscoveryComplete and it moved on to the next piece of work.
+        Assert.AreEqual(2, _createMockManagerCalled);
+    }
 
-        [TestMethod]
-        public void StartTestRunWithSourcesShouldNotSendCompleteUntilAllSourcesAreProcessed()
-        {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2);
+    [TestMethod]
+    public void HandlePartialRunCompleteShouldCreateNewProxyExecutionManagerIfIsAbortedIsTrue()
+    {
+        var completeArgs = new TestRunCompleteEventArgs(null, true, true, null, null, null, TimeSpan.Zero);
+        var mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        var mockRequestSender = new Mock<ITestRequestSender>();
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2, setupTestCases: true);
+
+        // Trigger discover tests, this will create a manager by calling the _createMockManager func
+        // which dequeues it to _usedMockManagers.
+        parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object);
+        var completedManager = _usedMockManagers[0];
+
+        // act
+        // Tell the manager that completedManager finished work, and that it should progress to next work
+        parallelExecutionManager.HandlePartialRunComplete(completedManager.Object, completeArgs, null, null, null);
+
+        // assert
+        // We created 2 managers 1 for the original work and another one
+        // when we called HandlePartialDiscoveryComplete and it moved on to the next piece of work.
+        Assert.AreEqual(2, _createMockManagerCalled);
+    }
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(testRunCriteriaWithSources, this.mockHandler.Object);
-            });
+    [TestMethod]
+    public void StartTestRunWithTestsShouldNotSendCompleteUntilAllTestsAreProcessed()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 3, setupTestCases: true);
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(this.sources.Count, this.processedSources.Count, "All Sources must be processed.");
-            AssertMissingAndDuplicateSources(this.processedSources);
-        }
+        var task = Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWithTestsFrom3Dlls, _mockEventHandler.Object));
 
-        [TestMethod]
-        public void HandlePartialRunCompleteShouldCreateNewProxyExecutionManagerIfDataCollectionEnabled()
-        {
-            var completeArgs = new TestRunCompleteEventArgs(null, true, true, null, null, TimeSpan.Zero);
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockDataCollectionManager = new Mock<IProxyDataCollectionManager>();
-            var proxyDataCollectionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2, setupTestCases: true);
-
-            this.proxyManagerFuncCalled = false;
-            parallelExecutionManager.HandlePartialRunComplete(proxyDataCollectionManager, completeArgs, null, null, null);
-            Assert.IsTrue(this.proxyManagerFuncCalled);
-        }
+        bool executionCompleted = _executionCompleted.Wait(Timeout3Seconds);
 
-        [TestMethod]
-        public void HandlePartialRunCompleteShouldCreateNewProxyExecutionManagerIfDataCollectionEnabledAndCreatorWithDataCollection()
+        if (task.IsCompleted)
         {
-            var completeArgs = new TestRunCompleteEventArgs(null, true, true, null, null, TimeSpan.Zero);
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockDataCollectionManager = new Mock<IProxyDataCollectionManager>();
-            var proxyDataCollectionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-            var managers = new List<Mock<ProxyExecutionManagerWithDataCollection>>();            
-            this.proxyManagerFunc = () =>
-            {
-                this.proxyManagerFuncCalled = true;
-                var manager = new Mock<ProxyExecutionManagerWithDataCollection>(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-                managers.Add(manager);
-                return manager.Object;
-            };
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2, setupTestCases: true);
-
-            this.proxyManagerFuncCalled = false;
-            parallelExecutionManager.HandlePartialRunComplete(proxyDataCollectionManager, completeArgs, null, null, null);
-            Assert.IsTrue(this.proxyManagerFuncCalled);
-
-            var handler = parallelExecutionManager.GetHandlerForGivenManager(managers.Last().Object);
-            Assert.IsTrue(handler is ParallelDataCollectionEventsHandler);            
+            // Receive any exception if some happened
+            // Don't await if not completed, to avoid hanging the test.
+            task.GetAwaiter().GetResult();
         }
 
-        [TestMethod]
-        public void HandlePartialRunCompleteShouldCreateNewProxyExecutionManagerIfIsAbortedIsTrue()
-        {
-            var completeArgs = new TestRunCompleteEventArgs(null, true, true, null, null, TimeSpan.Zero);
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2, setupTestCases: true);
-
-            this.proxyManagerFuncCalled = false;
-            var proxyExecutionManagerManager = new ProxyExecutionManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
-            parallelExecutionManager.HandlePartialRunComplete(proxyExecutionManagerManager, completeArgs, null, null, null);
-            Assert.IsTrue(this.proxyManagerFuncCalled);
-        }
+        Assert.IsTrue(executionCompleted, "Test run not completed.");
+        Assert.AreEqual(_testCases.Count, _processedTestCases.Count, "All Tests must be processed.");
+        AssertMissingAndDuplicateTestCases(_testCases, _processedTestCases);
+    }
 
-        [TestMethod]
-        public void StartTestRunWithTestsShouldNotSendCompleteUntilAllTestsAreProcessed()
-        {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 3, setupTestCases: true);
+    [TestMethod]
+    public void StartTestRunShouldNotProcessAllSourcesOnExecutionCancelsForAnySource()
+    {
+        var executionManagerMock = new Mock<IProxyExecutionManager>();
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, (_, _2) => executionManagerMock.Object, 1, _runtimeProviders);
+        _preCreatedMockManagers.Enqueue(executionManagerMock);
+        SetupMockManagers(_processedSources, isCanceled: true, isAborted: false);
+        SetupHandleTestRunComplete(_executionCompleted);
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(this.testRunCriteriaWithTests, this.mockHandler.Object);
-            });
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(this.testCases.Count, processedTestCases.Count, "All Tests must be processed.");
-            AssertMissingAndDuplicateTestCases(this.testCases, processedTestCases);
-        }
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "Abort should stop all sources execution.");
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotProcessAllSourcesOnExecutionCancelsForAnySource()
-        {
-            var executionManagerMock = new Mock<IProxyExecutionManager>();
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, () => executionManagerMock.Object, 1);
-            this.createdMockManagers.Add(executionManagerMock);
-            this.SetupMockManagers(this.processedSources, isCanceled: true, isAborted: false);
-            SetupHandleTestRunComplete(this.executionCompleted);
+    [TestMethod]
+    public void StartTestRunShouldNotProcessAllSourcesOnExecutionAborted()
+    {
+        var executionManagerMock = new Mock<IProxyExecutionManager>();
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, (_, _2) => executionManagerMock.Object, 1, _runtimeProviders);
+        _preCreatedMockManagers.Enqueue(executionManagerMock);
+        SetupMockManagers(_processedSources, isCanceled: false, isAborted: false);
+        SetupHandleTestRunComplete(_executionCompleted);
 
-            Task.Run(() => { parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object); });
+        parallelExecutionManager.Abort(It.IsAny<IInternalTestRunEventsHandler>());
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(1, this.processedSources.Count, "Abort should stop all sources execution.");
-        }
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "Abort should stop all sources execution.");
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldNotProcessAllSourcesOnExecutionAborted()
-        {
-            var executionManagerMock = new Mock<IProxyExecutionManager>();
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, () => executionManagerMock.Object, 1);
-            this.createdMockManagers.Add(executionManagerMock);
-            this.SetupMockManagers(this.processedSources, isCanceled: false, isAborted: false);
-            SetupHandleTestRunComplete(this.executionCompleted);
+    [TestMethod]
+    public void StartTestRunShouldProcessAllSourcesOnExecutionAbortsForAnySource()
+    {
+        var executionManagerMock = new Mock<IProxyExecutionManager>();
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, (_, _2) => executionManagerMock.Object, 1, _runtimeProviders);
+        _preCreatedMockManagers.Enqueue(executionManagerMock);
+        SetupMockManagers(_processedSources, isCanceled: false, isAborted: true);
+        SetupHandleTestRunComplete(_executionCompleted);
 
-            parallelExecutionManager.Abort(It.IsAny<ITestRunEventsHandler>());
-            Task.Run(() => { parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object); });
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(1, this.processedSources.Count, "Abort should stop all sources execution.");
-        }
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
 
-        [TestMethod]
-        public void StartTestRunShouldProcessAllSourcesOnExecutionAbortsForAnySource()
-        {
-            var executionManagerMock = new Mock<IProxyExecutionManager>();
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, () => executionManagerMock.Object, 1);
-            this.createdMockManagers.Add(executionManagerMock);
-            this.SetupMockManagers(processedSources, isCanceled: false, isAborted: true);
-            SetupHandleTestRunComplete(this.executionCompleted);
+        Assert.AreEqual(2, _processedSources.Count, "Abort should stop all sources execution.");
+    }
 
-            Task.Run(() => { parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object); });
+    [TestMethod]
+    public void StartTestRunShouldProcessAllSourceIfOneDiscoveryManagerIsStarved()
+    {
+        // Ensure that second discovery manager never starts. Expect 10 total tests.
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2);
+        var mockManagers = _preCreatedMockManagers.ToArray();
+        mockManagers[1].Reset();
+        mockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>()))
+            .Throws<NotImplementedException>();
+
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
+
+        // Processed sources should be 1 since the 2nd source is never discovered
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        Assert.AreEqual(1, _processedSources.Count, "All Sources must be processed.");
+    }
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(2, this.processedSources.Count, "Abort should stop all sources execution.");
-        }
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndHandleLogMessageOfError()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2);
+        var mockManagers = _preCreatedMockManagers.ToArray();
+        mockManagers[1].Reset();
+        mockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>()))
+            .Throws<NotImplementedException>();
 
-        [TestMethod]
-        public void StartTestRunShouldProcessAllSourceIfOneDiscoveryManagerIsStarved()
-        {
-            // Ensure that second discovery manager never starts. Expect 10 total tests.
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>()))
-                .Throws<NotImplementedException>();
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object);
-            });
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        _mockEventHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-            // Processed sources should be 1 since the 2nd source is never discovered
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            Assert.AreEqual(1, this.processedSources.Count, "All Sources must be processed.");
-        }
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndHandleRawMessageOfTestMessage()
+    {
+        var parallelExecutionManager = SetupExecutionManager(_createMockManager, 2);
+        var mockManagers = _preCreatedMockManagers.ToArray();
+        mockManagers[1].Reset();
+        mockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>()))
+            .Throws<NotImplementedException>();
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndHandleLogMessageOfError()
-        {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>()))
-                .Throws<NotImplementedException>();
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object);
-            });
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
+        _mockEventHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
+    }
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            mockHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+    [TestMethod]
+    public void StartTestRunShouldAggregateRunData()
+    {
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, _createMockManager, 2, _runtimeProviders);
+        var syncObject = new object();
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndHandleRawMessageOfTestMessage()
+        foreach (var manager in _preCreatedMockManagers)
         {
-            var parallelExecutionManager = this.SetupExecutionManager(this.proxyManagerFunc, 2);
-            this.createdMockManagers[1].Reset();
-            this.createdMockManagers[1].Setup(em => em.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>()))
-                .Throws<NotImplementedException>();
+            manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>())).
+                Callback<TestRunCriteria, IInternalTestRunEventsHandler>(
+                    (criteria, handler) =>
+                    {
+                        lock (syncObject)
+                        {
+                            _processedSources.AddRange(criteria.Sources!);
+                        }
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(this.testRunCriteriaWithSources, this.mockHandler.Object);
-            });
+                        Task.Delay(100).Wait();
+                        var stats = new Dictionary<TestOutcome, long>
+                        {
+                            { TestOutcome.Passed, 3 },
+                            { TestOutcome.Failed, 2 }
+                        };
+                        var runAttachments = new Collection<AttachmentSet>
+                        {
+                            new(new Uri("hello://x/"), "Hello")
+                        };
+                        var executorUris = new List<string>() { "hello1" };
+                        bool isCanceled = false;
+                        bool isAborted = false;
+                        TimeSpan timespan = TimeSpan.FromMilliseconds(100);
+
+                        if (string.Equals(criteria.Sources?.FirstOrDefault(), "2.dll"))
+                        {
+                            isCanceled = true;
+                            isAborted = true;
+                            timespan = TimeSpan.FromMilliseconds(200);
+                        }
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
-            mockHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
+                        var completeArgs = new TestRunCompleteEventArgs(new
+                            TestRunStatistics(5, stats), isCanceled, isAborted, null, runAttachments, new Collection<InvokedDataCollector>(), timespan);
+                        handler.HandleTestRunComplete(completeArgs, null, runAttachments, executorUris);
+                    });
         }
 
-        [TestMethod]
-        public void StartTestRunShouldAggregateRunData()
-        {
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, this.proxyManagerFunc, 2);
-            var syncObject = new object();
-
-            foreach (var manager in createdMockManagers)
-            {
-                manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>())).
-                    Callback<TestRunCriteria, ITestRunEventsHandler>(
-                        (criteria, handler) =>
-                        {
-                            lock (syncObject)
-                            {
-                                this.processedSources.AddRange(criteria.Sources);
-                            }
-
-                            Task.Delay(100).Wait();
-                            var stats = new Dictionary<TestOutcome, long>();
-                            stats.Add(TestOutcome.Passed, 3);
-                            stats.Add(TestOutcome.Failed, 2);
-                            var runAttachments = new Collection<AttachmentSet>();
-                            runAttachments.Add(new AttachmentSet(new Uri("hello://x/"), "Hello"));
-                            var executorUris = new List<string>() { "hello1" };
-                            bool isCanceled = false;
-                            bool isAborted = false;
-                            TimeSpan timespan = TimeSpan.FromMilliseconds(100);
-
-                            if (string.Equals(criteria.Sources?.FirstOrDefault(), "2.dll"))
-                            {
-                                isCanceled = true;
-                                isAborted = true;
-                                timespan = TimeSpan.FromMilliseconds(200);
-                            }
-
-                            var completeArgs = new TestRunCompleteEventArgs(new
-                                TestRunStatistics(5, stats), isCanceled, isAborted, null, runAttachments, timespan);
-                            handler.HandleTestRunComplete(completeArgs, null, runAttachments, executorUris);
-                        });
-            }
-
-            Exception assertException = null;
-            this.mockHandler.Setup(m => m.HandleTestRunComplete(
-                It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(),
-                It.IsAny<ICollection<AttachmentSet>>(),
-                It.IsAny<ICollection<string>>())).Callback
-                <TestRunCompleteEventArgs, TestRunChangedEventArgs, ICollection<AttachmentSet>, ICollection<string>>(
+        Exception? assertException = null;
+        _mockEventHandler.Setup(m => m.HandleTestRunComplete(
+            It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(),
+            It.IsAny<ICollection<AttachmentSet>>(),
+            It.IsAny<ICollection<string>>())).Callback
+            <TestRunCompleteEventArgs, TestRunChangedEventArgs, ICollection<AttachmentSet>, ICollection<string>>(
                 (completeArgs, runChangedArgs, runAttachments, executorUris) =>
                 {
                     try
@@ -387,10 +399,10 @@ public void StartTestRunShouldAggregateRunData()
                         Assert.IsTrue(completeArgs.IsAborted, "Aborted value must be OR of all values");
                         Assert.IsTrue(completeArgs.IsCanceled, "Canceled value must be OR of all values");
 
-                        Assert.AreEqual(10, completeArgs.TestRunStatistics.ExecutedTests,
+                        Assert.AreEqual(10, completeArgs.TestRunStatistics!.ExecutedTests,
                             "Stats must be aggregated properly");
 
-                        Assert.AreEqual(6, completeArgs.TestRunStatistics.Stats[TestOutcome.Passed],
+                        Assert.AreEqual(6, completeArgs.TestRunStatistics.Stats![TestOutcome.Passed],
                             "Stats must be aggregated properly");
                         Assert.AreEqual(4, completeArgs.TestRunStatistics.Stats[TestOutcome.Failed],
                             "Stats must be aggregated properly");
@@ -401,174 +413,170 @@ public void StartTestRunShouldAggregateRunData()
                     }
                     finally
                     {
-                        this.executionCompleted.Set();
+                        _executionCompleted.Set();
                     }
                 });
 
-            Task.Run(() =>
-            {
-                parallelExecutionManager.StartTestRun(testRunCriteriaWithSources, this.mockHandler.Object);
-            });
+        Task.Run(() => parallelExecutionManager.StartTestRun(_testRunCriteriaWith2Sources, _mockEventHandler.Object));
 
-            Assert.IsTrue(this.executionCompleted.Wait(taskTimeout), "Test run not completed.");
+        // If you are debugging this, maybe it is good idea to set this timeout higher.
+        Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
 
-            Assert.IsNull(assertException, assertException?.ToString());
-            Assert.AreEqual(sources.Count, this.processedSources.Count, "All Sources must be processed.");
-            AssertMissingAndDuplicateSources(this.processedSources);
-        }
+        Assert.IsNull(assertException, assertException?.ToString());
+        Assert.AreEqual(_sources.Count, _processedSources.Count, "All Sources must be processed.");
+        AssertMissingAndDuplicateSources(_processedSources);
+    }
+
+    private ParallelProxyExecutionManager SetupExecutionManager(Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> proxyManagerFunc, int parallelLevel)
+    {
+        return SetupExecutionManager(proxyManagerFunc, parallelLevel, false);
+    }
+
+    private ParallelProxyExecutionManager SetupExecutionManager(Func<TestRuntimeProviderInfo, TestRunCriteria, IProxyExecutionManager> proxyManagerFunc, int parallelLevel, bool setupTestCases)
+    {
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, proxyManagerFunc, parallelLevel, _runtimeProviders);
 
-        private ParallelProxyExecutionManager SetupExecutionManager(Func<IProxyExecutionManager> proxyManagerFunc, int parallelLevel)
+        if (setupTestCases)
         {
-            return this.SetupExecutionManager(proxyManagerFunc, parallelLevel, false);
+            SetupMockManagersForTestCase(_processedTestCases, _testRunCriteriaWithTestsFrom3Dlls);
         }
-
-        private ParallelProxyExecutionManager SetupExecutionManager(Func<IProxyExecutionManager> proxyManagerFunc, int parallelLevel, bool setupTestCases)
+        else
         {
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, proxyManagerFunc, parallelLevel);
+            SetupMockManagers(_processedSources);
+        }
 
-            if (setupTestCases)
-            {
-                SetupMockManagersForTestCase(this.processedTestCases, this.testRunCriteriaWithTests);
-            }
-            else
-            {
-                this.SetupMockManagers(this.processedSources);
-            }
+        SetupHandleTestRunComplete(_executionCompleted);
+        return parallelExecutionManager;
+    }
 
-            this.SetupHandleTestRunComplete(this.executionCompleted);
-            return parallelExecutionManager;
-        }
+    private void SetupHandleTestRunComplete(ManualResetEventSlim completeEvent)
+    {
+        _mockEventHandler.Setup(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()))
+            .Callback<TestRunCompleteEventArgs, TestRunChangedEventArgs, ICollection<AttachmentSet>, ICollection<string>>(
+                (testRunCompleteArgs, testRunChangedEventArgs, attachmentSets, executorUris) => completeEvent.Set());
+    }
 
-        private void SetupHandleTestRunComplete(ManualResetEventSlim completeEvent)
+    private void AssertMissingAndDuplicateSources(List<string> processedSources)
+    {
+        foreach (var source in _sources)
         {
-            this.mockHandler.Setup(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback<TestRunCompleteEventArgs, TestRunChangedEventArgs, ICollection<AttachmentSet>, ICollection<string>>(
-                    (testRunCompleteArgs, testRunChangedEventArgs, attachmentSets, executorUris) => { completeEvent.Set(); });
-        }
+            var matchFound = false;
 
-        private void AssertMissingAndDuplicateSources(List<string> processedSources)
-        {
-            foreach (var source in this.sources)
+            foreach (var processedSrc in processedSources)
             {
-                var matchFound = false;
-
-                foreach (var processedSrc in processedSources)
+                if (processedSrc.Equals(source))
                 {
-                    if (processedSrc.Equals(source))
+                    if (matchFound)
                     {
-                        if (matchFound)
-                        {
-                            Assert.Fail("Concurrreny issue detected: Source['{0}'] got processed twice", processedSrc);
-                        }
-
-                        matchFound = true;
+                        Assert.Fail("Concurrreny issue detected: Source['{0}'] got processed twice", processedSrc);
                     }
-                }
 
-                Assert.IsTrue(matchFound, "Concurrency issue detected: Source['{0}'] did NOT get processed at all", source);
+                    matchFound = true;
+                }
             }
-        }
 
-        private static TestRunCompleteEventArgs CreateTestRunCompleteArgs(bool isCanceled = false, bool isAborted = false)
-        {
-            return new TestRunCompleteEventArgs(
-                new TestRunStatistics(new Dictionary<TestOutcome, long>()),
-                isCanceled,
-                isAborted,
-                null,
-                null,
-                TimeSpan.FromMilliseconds(1));
+            Assert.IsTrue(matchFound, "Concurrency issue detected: Source['{0}'] did NOT get processed at all", source);
         }
+    }
 
-        private static void AssertMissingAndDuplicateTestCases(List<TestCase> tests, List<TestCase> processedTestCases)
+    private static TestRunCompleteEventArgs CreateTestRunCompleteArgs(bool isCanceled = false, bool isAborted = false)
+    {
+        return new TestRunCompleteEventArgs(
+            new TestRunStatistics(new Dictionary<TestOutcome, long>()),
+            isCanceled,
+            isAborted,
+            null,
+            null,
+            null,
+            TimeSpan.FromMilliseconds(1));
+    }
+
+    private static void AssertMissingAndDuplicateTestCases(List<TestCase> tests, List<TestCase> processedTestCases)
+    {
+        foreach (var test in tests)
         {
-            foreach (var test in tests)
-            {
-                bool matchFound = false;
+            bool matchFound = false;
 
-                foreach (var processedTest in processedTestCases)
+            foreach (var processedTest in processedTestCases)
+            {
+                if (processedTest.FullyQualifiedName.Equals(test.FullyQualifiedName))
                 {
-                    if (processedTest.FullyQualifiedName.Equals(test.FullyQualifiedName))
-                    {
-                        if (matchFound)
-                            Assert.Fail("Concurrency issue detected: Test['{0}'] got processed twice", test.FullyQualifiedName);
-                        matchFound = true;
-                    }
+                    if (matchFound)
+                        Assert.Fail("Concurrency issue detected: Test['{0}'] got processed twice", test.FullyQualifiedName);
+                    matchFound = true;
                 }
-
-                Assert.IsTrue(matchFound, "Concurrency issue detected: Test['{0}'] did NOT get processed at all",
-                    test.FullyQualifiedName);
             }
+
+            Assert.IsTrue(matchFound, "Concurrency issue detected: Test['{0}'] did NOT get processed at all",
+                test.FullyQualifiedName);
         }
+    }
 
-        private void SetupMockManagersForTestCase(List<TestCase> processedTestCases, TestRunCriteria testRunCriteria)
+    private void SetupMockManagersForTestCase(List<TestCase> processedTestCases, TestRunCriteria testRunCriteria)
+    {
+        var syncObject = new object();
+        foreach (var manager in _preCreatedMockManagers)
         {
-            var syncObject = new object();
-            foreach (var manager in createdMockManagers)
-            {
-                manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>())).
-                    Callback<TestRunCriteria, ITestRunEventsHandler>(
-                        (criteria, handler) =>
+            manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>())).
+                Callback<TestRunCriteria, IInternalTestRunEventsHandler>(
+                    (criteria, handler) =>
+                    {
+                        lock (syncObject)
                         {
-                            lock (syncObject)
-                            {
-                                processedTestCases.AddRange(criteria.Tests);
-                            }
+                            processedTestCases.AddRange(criteria.Tests!);
+                        }
 
-                            Task.Delay(100).Wait();
+                        Task.Delay(100).Wait();
 
-                            // Duplicated testRunCriteria should match the actual one.
-                            Assert.AreEqual(testRunCriteria, criteria, "Mismatch in testRunCriteria");
-                            handler.HandleTestRunComplete(CreateTestRunCompleteArgs(), null, null, null);
-                        });
-            }
+                        // Duplicated testRunCriteria should match the actual one.
+                        Assert.AreEqual(testRunCriteria, criteria, "Mismatch in testRunCriteria");
+                        handler.HandleTestRunComplete(CreateTestRunCompleteArgs(), null, null, null);
+                    });
         }
+    }
 
-        private static List<TestCase> CreateTestCases()
-        {
-            TestCase tc1 = new TestCase("dll1.class1.test1", new Uri("hello://x/"), "1.dll");
-            TestCase tc21 = new TestCase("dll2.class21.test21", new Uri("hello://x/"), "2.dll");
-            TestCase tc22 = new TestCase("dll2.class21.test22", new Uri("hello://x/"), "2.dll");
-            TestCase tc31 = new TestCase("dll3.class31.test31", new Uri("hello://x/"), "3.dll");
-            TestCase tc32 = new TestCase("dll3.class31.test32", new Uri("hello://x/"), "3.dll");
-
-            var tests = new List<TestCase>() { tc1, tc21, tc22, tc31, tc32 };
-            return tests;
-        }
+    private static List<TestCase> CreateTestCases()
+    {
+        TestCase tc1 = new("dll1.class1.test1", new Uri("hello://x/"), "1.dll");
+        TestCase tc21 = new("dll2.class21.test21", new Uri("hello://x/"), "2.dll");
+        TestCase tc22 = new("dll2.class21.test22", new Uri("hello://x/"), "2.dll");
+        TestCase tc31 = new("dll3.class31.test31", new Uri("hello://x/"), "3.dll");
+        TestCase tc32 = new("dll3.class31.test32", new Uri("hello://x/"), "3.dll");
+
+        var tests = new List<TestCase>() { tc1, tc21, tc22, tc31, tc32 };
+        return tests;
+    }
 
-        private void SetupMockManagers(List<string> processedSources, bool isCanceled = false, bool isAborted = false)
+    private void SetupMockManagers(List<string> processedSources, bool isCanceled = false, bool isAborted = false)
+    {
+        var syncObject = new object();
+        foreach (var manager in _preCreatedMockManagers)
         {
-            var syncObject = new object();
-            foreach (var manager in createdMockManagers)
-            {
-                manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<ITestRunEventsHandler>())).
-                    Callback<TestRunCriteria, ITestRunEventsHandler>(
-                        (criteria, handler) =>
+            manager.Setup(m => m.StartTestRun(It.IsAny<TestRunCriteria>(), It.IsAny<IInternalTestRunEventsHandler>())).
+                Callback<TestRunCriteria, IInternalTestRunEventsHandler>(
+                    (criteria, handler) =>
+                    {
+                        lock (syncObject)
                         {
-                            lock (syncObject)
-                            {
-                                processedSources.AddRange(criteria.Sources);
-                            }
-                            Task.Delay(100).Wait();
-
-                            // Duplicated testRunCriteria should match the actual one.
-                            Assert.AreEqual(testRunCriteriaWithSources, criteria, "Mismatch in testRunCriteria");
-                            handler.HandleTestRunComplete(CreateTestRunCompleteArgs(isCanceled, isAborted), null, null, null);
-                        });
-            }
+                            processedSources.AddRange(criteria.Sources!);
+                        }
+                        Task.Delay(100).Wait();
+
+                        handler.HandleTestRunComplete(CreateTestRunCompleteArgs(isCanceled, isAborted), null, null, null);
+                    });
         }
+    }
 
-        private void InvokeAndVerifyInitialize(int concurrentManagersCount, bool skipDefaultAdapters = false)
-        {
-            var parallelExecutionManager = new ParallelProxyExecutionManager(this.mockRequestData.Object, proxyManagerFunc, concurrentManagersCount);
+    private void InvokeAndVerifyInitialize(int parallelLevel, bool skipDefaultAdapters = false)
+    {
+        var parallelExecutionManager = new ParallelProxyExecutionManager(_mockRequestData.Object, _createMockManager, parallelLevel, _runtimeProviders);
 
-            parallelExecutionManager.Initialize(skipDefaultAdapters);
+        parallelExecutionManager.Initialize(skipDefaultAdapters);
 
-            Assert.AreEqual(concurrentManagersCount, createdMockManagers.Count, $"Number of Concurrent Managers created should be {concurrentManagersCount}");
-            createdMockManagers.ForEach(em => em.Verify(m => m.Initialize(skipDefaultAdapters), Times.Once));
-        }
+        Assert.AreEqual(0, _usedMockManagers.Count, $"No concurrent managers should be pre-created, until there is work for them");
+        _usedMockManagers.ForEach(em => em.Verify(m => m.Initialize(skipDefaultAdapters), Times.Once));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunDataAggregatorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunDataAggregatorTests.cs
index 75be8e2a8c..61d6b8b17c 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunDataAggregatorTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunDataAggregatorTests.cs
@@ -1,407 +1,458 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client.Parallel
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client.Parallel;
+
+[TestClass]
+public class ParallelRunDataAggregatorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ParallelRunDataAggregatorTests
+    [TestMethod]
+    public void ParallelRunDataAggregatorConstructorShouldInitializeAggregatorVars()
     {
-        [TestMethod]
-        public void ParallelRunDataAggregatorConstructorShouldInitializeAggregatorVars()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            Assert.AreEqual(aggregator.ElapsedTime, TimeSpan.Zero, "Timespan must be initialized to zero.");
+        Assert.AreEqual(aggregator.ElapsedTime, TimeSpan.Zero, "Timespan must be initialized to zero.");
 
-            Assert.IsNotNull(aggregator.Exceptions, "Exceptions list must not be null");
-            Assert.IsNotNull(aggregator.ExecutorUris, "ExecutorUris list must not be null");
-            Assert.IsNotNull(aggregator.RunCompleteArgsAttachments, "RunCompleteArgsAttachments list must not be null");
-            Assert.IsNotNull(aggregator.RunContextAttachments, "RunContextAttachments list must not be null");
+        Assert.IsNotNull(aggregator.Exceptions, "Exceptions list must not be null");
+        Assert.IsNotNull(aggregator.ExecutorUris, "ExecutorUris list must not be null");
+        Assert.IsNotNull(aggregator.RunCompleteArgsAttachments, "RunCompleteArgsAttachments list must not be null");
+        Assert.IsNotNull(aggregator.RunContextAttachments, "RunContextAttachments list must not be null");
 
-            Assert.AreEqual(0, aggregator.Exceptions.Count, "Exceptions List must be initialized as empty list.");
-            Assert.AreEqual(0, aggregator.ExecutorUris.Count, "Exceptions List must be initialized as empty list.");
-            Assert.AreEqual(0, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must be initialized as empty list.");
-            Assert.AreEqual(0, aggregator.RunContextAttachments.Count, "RunContextAttachments List must be initialized as empty list");
+        Assert.AreEqual(0, aggregator.Exceptions.Count, "Exceptions List must be initialized as empty list.");
+        Assert.AreEqual(0, aggregator.ExecutorUris.Count, "Exceptions List must be initialized as empty list.");
+        Assert.AreEqual(0, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must be initialized as empty list.");
+        Assert.AreEqual(0, aggregator.RunContextAttachments.Count, "RunContextAttachments List must be initialized as empty list");
 
-            Assert.IsFalse(aggregator.IsAborted, "Aborted must be false by default");
+        Assert.IsFalse(aggregator.IsAborted, "Aborted must be false by default");
 
-            Assert.IsFalse(aggregator.IsCanceled, "Canceled must be false by default");
-        }
+        Assert.IsFalse(aggregator.IsCanceled, "Canceled must be false by default");
+    }
+
+    [TestMethod]
+    public void AggregateShouldAggregateRunCompleteAttachmentsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateShouldAggregateRunCompleteAttachmentsCorrectly()
+        var attachmentSet1 = new Collection<AttachmentSet>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            new(new Uri("x://hello1"), "hello1")
+        };
 
-            var attachmentSet1 = new Collection<AttachmentSet>();
-            attachmentSet1.Add(new AttachmentSet(new Uri("x://hello1"), "hello1"));
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, attachmentSet1, null, null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, attachmentSet1);
 
+        Assert.AreEqual(1, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must have data.");
 
-            Assert.AreEqual(1, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must have data.");
+        var attachmentSet2 = new Collection<AttachmentSet>
+        {
+            new(new Uri("x://hello2"), "hello2")
+        };
 
-            var attachmentSet2 = new Collection<AttachmentSet>();
-            attachmentSet2.Add(new AttachmentSet(new Uri("x://hello2"), "hello2"));
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, attachmentSet2, null, null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, attachmentSet2);
+        Assert.AreEqual(2, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must have aggregated data.");
+    }
 
-            Assert.AreEqual(2, aggregator.RunCompleteArgsAttachments.Count, "RunCompleteArgsAttachments List must have aggregated data.");
-        }
+    [TestMethod]
+    public void AggregateShouldAggregateRunContextAttachmentsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateShouldAggregateRunContextAttachmentsCorrectly()
+        var attachmentSet1 = new Collection<AttachmentSet>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            new(new Uri("x://hello1"), "hello1")
+        };
 
-            var attachmentSet1 = new Collection<AttachmentSet>();
-            attachmentSet1.Add(new AttachmentSet(new Uri("x://hello1"), "hello1"));
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, attachmentSet1, null, null, null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, attachmentSet1, null);
+        Assert.AreEqual(1, aggregator.RunContextAttachments.Count, "RunContextAttachments List must have data.");
 
-            Assert.AreEqual(1, aggregator.RunContextAttachments.Count, "RunContextAttachments List must have data.");
+        var attachmentSet2 = new Collection<AttachmentSet>
+        {
+            new(new Uri("x://hello2"), "hello2")
+        };
 
-            var attachmentSet2 = new Collection<AttachmentSet>();
-            attachmentSet2.Add(new AttachmentSet(new Uri("x://hello2"), "hello2"));
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, attachmentSet2, null, null, null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, attachmentSet2, null);
+        Assert.AreEqual(2, aggregator.RunContextAttachments.Count, "RunContextAttachments List must have aggregated data.");
+    }
 
-            Assert.AreEqual(2, aggregator.RunContextAttachments.Count, "RunContextAttachments List must have aggregated data.");
-        }
+    [TestMethod]
+    public void AggregateShouldAggregateInvokedCollectorsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateShouldAggregateAbortedAndCanceledCorrectly()
+        var invokedDataCollectors = new Collection<InvokedDataCollector>()
         {
-            var aggregator = new ParallelRunDataAggregator();
+            new(new Uri("datacollector://sample"),"sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location,false)
+        };
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, invokedDataCollectors, null);
+        Assert.AreEqual(1, aggregator.InvokedDataCollectors.Count, "InvokedDataCollectors List must have data.");
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        var invokedDataCollectors2 = new Collection<InvokedDataCollector>()
+        {
+            new(new Uri("datacollector://sample2"),"sample2", typeof(int).AssemblyQualifiedName!, typeof(int).Assembly.Location,false)
+        };
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, invokedDataCollectors2, null);
+        Assert.AreEqual(2, aggregator.InvokedDataCollectors.Count, "InvokedDataCollectors List must have aggregated data.");
+
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, invokedDataCollectors, null);
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, invokedDataCollectors2, null);
+
+        Assert.AreEqual(2, aggregator.InvokedDataCollectors.Count, "InvokedDataCollectors List must have aggregated data.");
+        Assert.AreEqual(invokedDataCollectors[0].AssemblyQualifiedName, aggregator.InvokedDataCollectors[0].AssemblyQualifiedName);
+        Assert.AreEqual(invokedDataCollectors[0].FilePath, aggregator.InvokedDataCollectors[0].FilePath);
+        Assert.AreEqual(invokedDataCollectors[0].Uri, aggregator.InvokedDataCollectors[0].Uri);
+        Assert.AreEqual(invokedDataCollectors2[0].AssemblyQualifiedName, aggregator.InvokedDataCollectors[1].AssemblyQualifiedName);
+        Assert.AreEqual(invokedDataCollectors2[0].FilePath, aggregator.InvokedDataCollectors[1].FilePath);
+        Assert.AreEqual(invokedDataCollectors2[0].Uri, aggregator.InvokedDataCollectors[1].Uri);
+    }
 
-            Assert.IsFalse(aggregator.IsAborted, "Aborted must be false");
+    [TestMethod]
+    public void AggregateShouldAggregateAbortedAndCanceledCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            Assert.IsFalse(aggregator.IsCanceled, "Canceled must be false");
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: true, isCanceled: false, runContextAttachments: null,
-                 runCompleteArgsAttachments: null);
+        Assert.IsFalse(aggregator.IsAborted, "Aborted must be false");
 
-            Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
+        Assert.IsFalse(aggregator.IsCanceled, "Canceled must be false");
 
-            Assert.IsFalse(aggregator.IsCanceled, "Canceled must still be false");
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: true, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: true, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        Assert.IsTrue(aggregator.IsAborted, "Aborted must be true");
 
-            Assert.IsTrue(aggregator.IsAborted, "Aborted must continue be true");
+        Assert.IsFalse(aggregator.IsCanceled, "Canceled must still be false");
 
-            Assert.IsTrue(aggregator.IsCanceled, "Canceled must be true");
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: true, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        Assert.IsTrue(aggregator.IsAborted, "Aborted must continue be true");
 
-            Assert.IsTrue(aggregator.IsAborted, "Aborted must continue be true");
+        Assert.IsTrue(aggregator.IsCanceled, "Canceled must be true");
 
-            Assert.IsTrue(aggregator.IsCanceled, "Canceled must continue be true");
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-        }
+        Assert.IsTrue(aggregator.IsAborted, "Aborted must continue be true");
 
-        [TestMethod]
-        public void AggregateShouldAggregateTimeSpanCorrectly()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        Assert.IsTrue(aggregator.IsCanceled, "Canceled must continue be true");
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+    }
 
-            Assert.AreEqual(TimeSpan.Zero, aggregator.ElapsedTime, "Timespan must be zero");
+    [TestMethod]
+    public void AggregateShouldAggregateTimeSpanCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(100), isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            Assert.AreEqual(TimeSpan.FromMilliseconds(100), aggregator.ElapsedTime, "Timespan must be 100ms");
+        Assert.AreEqual(TimeSpan.Zero, aggregator.ElapsedTime, "Timespan must be zero");
 
+        aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(100), isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(200), isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        Assert.AreEqual(TimeSpan.FromMilliseconds(100), aggregator.ElapsedTime, "Timespan must be 100ms");
 
-            Assert.AreEqual(TimeSpan.FromMilliseconds(200), aggregator.ElapsedTime, "Timespan should be Max of all 200ms");
 
-            aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(150), isAborted: false, isCanceled: false, runContextAttachments: null,
-             runCompleteArgsAttachments: null);
+        aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(200), isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            Assert.AreEqual(TimeSpan.FromMilliseconds(200), aggregator.ElapsedTime, "Timespan should be Max of all i.e. 200ms");
-        }
+        Assert.AreEqual(TimeSpan.FromMilliseconds(200), aggregator.ElapsedTime, "Timespan should be Max of all 200ms");
 
-        [TestMethod]
-        public void AggregateShouldAggregateExceptionsCorrectly()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        aggregator.Aggregate(null, null, null, TimeSpan.FromMilliseconds(150), isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, exception: null, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        Assert.AreEqual(TimeSpan.FromMilliseconds(200), aggregator.ElapsedTime, "Timespan should be Max of all i.e. 200ms");
+    }
 
-            Assert.IsNull(aggregator.GetAggregatedException(), "Aggregated exception must be null");
+    [TestMethod]
+    public void AggregateShouldAggregateExceptionsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            var exception1 = new NotImplementedException();
-            aggregator.Aggregate(null, null, exception: exception1, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        aggregator.Aggregate(null, null, exception: null, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            var aggregatedException = aggregator.GetAggregatedException() as AggregateException;
-            Assert.IsNotNull(aggregatedException, "Aggregated exception must NOT be null");
-            Assert.IsNotNull(aggregatedException.InnerExceptions, "Inner exception list must NOT be null");
-            Assert.AreEqual(1, aggregatedException.InnerExceptions.Count, "Inner exception list must have one element");
-            Assert.AreEqual(exception1, aggregatedException.InnerExceptions[0], "Inner exception must be the one set.");
+        Assert.IsNull(aggregator.GetAggregatedException(), "Aggregated exception must be null");
 
-            var exception2 = new NotSupportedException();
-            aggregator.Aggregate(null, null, exception: exception2, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
-                runCompleteArgsAttachments: null);
+        var exception1 = new NotImplementedException();
+        aggregator.Aggregate(null, null, exception: exception1, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregatedException = aggregator.GetAggregatedException() as AggregateException;
-            Assert.IsNotNull(aggregatedException, "Aggregated exception must NOT be null");
-            Assert.IsNotNull(aggregatedException.InnerExceptions, "Inner exception list must NOT be null");
-            Assert.AreEqual(2, aggregatedException.InnerExceptions.Count, "Inner exception list must have one element");
-            Assert.AreEqual(exception2, aggregatedException.InnerExceptions[1], "Inner exception must be the one set.");
-        }
+        var aggregatedException = aggregator.GetAggregatedException() as AggregateException;
+        Assert.IsNotNull(aggregatedException, "Aggregated exception must NOT be null");
+        Assert.IsNotNull(aggregatedException.InnerExceptions, "Inner exception list must NOT be null");
+        Assert.AreEqual(1, aggregatedException.InnerExceptions.Count, "Inner exception list must have one element");
+        Assert.AreEqual(exception1, aggregatedException.InnerExceptions[0], "Inner exception must be the one set.");
 
-        [TestMethod]
-        public void AggregateShouldAggregateExecutorUrisCorrectly()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        var exception2 = new NotSupportedException();
+        aggregator.Aggregate(null, null, exception: exception2, elapsedTime: TimeSpan.Zero, isAborted: false, isCanceled: false, runContextAttachments: null,
+            runCompleteArgsAttachments: null, invokedDataCollectors: null, discoveredExtensions: null);
 
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null);
+        aggregatedException = aggregator.GetAggregatedException() as AggregateException;
+        Assert.IsNotNull(aggregatedException, "Aggregated exception must NOT be null");
+        Assert.IsNotNull(aggregatedException.InnerExceptions, "Inner exception list must NOT be null");
+        Assert.AreEqual(2, aggregatedException.InnerExceptions.Count, "Inner exception list must have one element");
+        Assert.AreEqual(exception2, aggregatedException.InnerExceptions[1], "Inner exception must be the one set.");
+    }
 
-            Assert.AreEqual(0, aggregator.ExecutorUris.Count, "ExecutorUris List must not have data.");
+    [TestMethod]
+    public void AggregateShouldAggregateExecutorUrisCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            var uri1 = "x://hello1";
-            aggregator.Aggregate(null, new List<string>() { uri1 }, null, TimeSpan.Zero, false, false, null, null);
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, null, null);
 
-            Assert.AreEqual(1, aggregator.ExecutorUris.Count, "ExecutorUris List must have data.");
-            Assert.IsTrue(aggregator.ExecutorUris.Contains(uri1), "ExecutorUris List must have correct data.");
+        Assert.AreEqual(0, aggregator.ExecutorUris.Count, "ExecutorUris List must not have data.");
 
-            var uri2 = "x://hello2";
-            aggregator.Aggregate(null, new List<string>() { uri2 }, null, TimeSpan.Zero, false, false, null, null);
+        var uri1 = "x://hello1";
+        aggregator.Aggregate(null, new List<string>() { uri1 }, null, TimeSpan.Zero, false, false, null, null, null, null);
 
-            Assert.AreEqual(2, aggregator.ExecutorUris.Count, "ExecutorUris List must have aggregated data.");
-            Assert.IsTrue(aggregator.ExecutorUris.Contains(uri2), "ExecutorUris List must have correct data.");
-        }
+        Assert.AreEqual(1, aggregator.ExecutorUris.Count, "ExecutorUris List must have data.");
+        Assert.IsTrue(aggregator.ExecutorUris.Contains(uri1), "ExecutorUris List must have correct data.");
 
-        [TestMethod]
-        public void AggregateShouldAggregateRunStatsCorrectly()
-        {
-            var aggregator = new ParallelRunDataAggregator();
-
-            aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null);
-
-            var runStats = aggregator.GetAggregatedRunStats();
-            Assert.AreEqual(0, runStats.ExecutedTests, "RunStats must not have data.");
-
-            var stats1 = new Dictionary<TestOutcome, long>();
-            stats1.Add(TestOutcome.Passed, 2);
-            stats1.Add(TestOutcome.Failed, 3);
-            stats1.Add(TestOutcome.Skipped, 1);
-            stats1.Add(TestOutcome.NotFound, 4);
-            stats1.Add(TestOutcome.None, 2);
-
-            aggregator.Aggregate(new TestRunStatistics(12, stats1), null, null, TimeSpan.Zero, false, false, null, null);
-
-            runStats = aggregator.GetAggregatedRunStats();
-            Assert.AreEqual(12, runStats.ExecutedTests, "RunStats must have aggregated data.");
-            Assert.AreEqual(2, runStats.Stats[TestOutcome.Passed], "RunStats must have aggregated data.");
-            Assert.AreEqual(3, runStats.Stats[TestOutcome.Failed], "RunStats must have aggregated data.");
-            Assert.AreEqual(1, runStats.Stats[TestOutcome.Skipped], "RunStats must have aggregated data.");
-            Assert.AreEqual(4, runStats.Stats[TestOutcome.NotFound], "RunStats must have aggregated data.");
-            Assert.AreEqual(2, runStats.Stats[TestOutcome.None], "RunStats must have aggregated data.");
-
-
-            var stats2 = new Dictionary<TestOutcome, long>();
-            stats2.Add(TestOutcome.Passed, 3);
-            stats2.Add(TestOutcome.Failed, 2);
-            stats2.Add(TestOutcome.Skipped, 2);
-            stats2.Add(TestOutcome.NotFound, 1);
-            stats2.Add(TestOutcome.None, 3);
-
-            aggregator.Aggregate(new TestRunStatistics(11, stats2), null, null, TimeSpan.Zero, false, false, null, null);
-
-            runStats = aggregator.GetAggregatedRunStats();
-            Assert.AreEqual(23, runStats.ExecutedTests, "RunStats must have aggregated data.");
-            Assert.AreEqual(5, runStats.Stats[TestOutcome.Passed], "RunStats must have aggregated data.");
-            Assert.AreEqual(5, runStats.Stats[TestOutcome.Failed], "RunStats must have aggregated data.");
-            Assert.AreEqual(3, runStats.Stats[TestOutcome.Skipped], "RunStats must have aggregated data.");
-            Assert.AreEqual(5, runStats.Stats[TestOutcome.NotFound], "RunStats must have aggregated data.");
-            Assert.AreEqual(5, runStats.Stats[TestOutcome.None], "RunStats must have aggregated data.");
-        }
-
-        [TestMethod]
-        public void AggregateRunDataMetricsShouldAggregateMetricsCorrectly()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        var uri2 = "x://hello2";
+        aggregator.Aggregate(null, new List<string>() { uri2 }, null, TimeSpan.Zero, false, false, null, null, null, null);
 
-            aggregator.AggregateRunDataMetrics(null);
+        Assert.AreEqual(2, aggregator.ExecutorUris.Count, "ExecutorUris List must have aggregated data.");
+        Assert.IsTrue(aggregator.ExecutorUris.Contains(uri2), "ExecutorUris List must have correct data.");
+    }
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
-            Assert.AreEqual(0, runMetrics.Count);
-        }
+    [TestMethod]
+    public void AggregateShouldAggregateRunStatsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateRunDataMetricsShouldAddTotalTestsRun()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        aggregator.Aggregate(null, null, null, TimeSpan.Zero, false, false, null, null, null, null);
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TotalTestsRanByAdapter, 2);
+        var runStats = aggregator.GetAggregatedRunStats();
+        Assert.AreEqual(0, runStats.ExecutedTests, "RunStats must not have data.");
 
-            aggregator.AggregateRunDataMetrics(dict);
-            aggregator.AggregateRunDataMetrics(dict);
+        var stats1 = new Dictionary<TestOutcome, long>
+        {
+            { TestOutcome.Passed, 2 },
+            { TestOutcome.Failed, 3 },
+            { TestOutcome.Skipped, 1 },
+            { TestOutcome.NotFound, 4 },
+            { TestOutcome.None, 2 }
+        };
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        aggregator.Aggregate(new TestRunStatistics(12, stats1), null, null, TimeSpan.Zero, false, false, null, null, null, null);
 
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TotalTestsRanByAdapter, out var value));
-            Assert.AreEqual(4, Convert.ToInt32(value));
-        }
+        runStats = aggregator.GetAggregatedRunStats();
+        Assert.AreEqual(12, runStats.ExecutedTests, "RunStats must have aggregated data.");
+        Assert.AreEqual(2, runStats.Stats![TestOutcome.Passed], "RunStats must have aggregated data.");
+        Assert.AreEqual(3, runStats.Stats[TestOutcome.Failed], "RunStats must have aggregated data.");
+        Assert.AreEqual(1, runStats.Stats[TestOutcome.Skipped], "RunStats must have aggregated data.");
+        Assert.AreEqual(4, runStats.Stats[TestOutcome.NotFound], "RunStats must have aggregated data.");
+        Assert.AreEqual(2, runStats.Stats[TestOutcome.None], "RunStats must have aggregated data.");
 
-        [TestMethod]
-        public void AggregateRunDataMetricsShouldAddTimeTakenToRunTests()
+
+        var stats2 = new Dictionary<TestOutcome, long>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TestOutcome.Passed, 3 },
+            { TestOutcome.Failed, 2 },
+            { TestOutcome.Skipped, 2 },
+            { TestOutcome.NotFound, 1 },
+            { TestOutcome.None, 3 }
+        };
+
+        aggregator.Aggregate(new TestRunStatistics(11, stats2), null, null, TimeSpan.Zero, false, false, null, null, null, null);
+
+        runStats = aggregator.GetAggregatedRunStats();
+        Assert.AreEqual(23, runStats.ExecutedTests, "RunStats must have aggregated data.");
+        Assert.AreEqual(5, runStats.Stats![TestOutcome.Passed], "RunStats must have aggregated data.");
+        Assert.AreEqual(5, runStats.Stats[TestOutcome.Failed], "RunStats must have aggregated data.");
+        Assert.AreEqual(3, runStats.Stats[TestOutcome.Skipped], "RunStats must have aggregated data.");
+        Assert.AreEqual(5, runStats.Stats[TestOutcome.NotFound], "RunStats must have aggregated data.");
+        Assert.AreEqual(5, runStats.Stats[TestOutcome.None], "RunStats must have aggregated data.");
+    }
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, .02091);
+    [TestMethod]
+    public void AggregateRunDataMetricsShouldAggregateMetricsCorrectly()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-            aggregator.AggregateRunDataMetrics(dict);
-            aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(null);
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.AreEqual(0, runMetrics.Count);
+    }
 
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, out var value));
-            Assert.AreEqual(.04182, value);
-        }
+    [TestMethod]
+    public void AggregateRunDataMetricsShouldAddTotalTestsRun()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateRunDataMetricsShouldAddTimeTakenByAllAdapters()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TelemetryDataConstants.TotalTestsRanByAdapter, 2 }
+        };
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, .02091);
+        aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            aggregator.AggregateRunDataMetrics(dict);
-            aggregator.AggregateRunDataMetrics(dict);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TotalTestsRanByAdapter, out var value));
+        Assert.AreEqual(4, Convert.ToInt32(value, CultureInfo.InvariantCulture));
+    }
 
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, out var value));
-            Assert.AreEqual(.04182, value);
-        }
+    [TestMethod]
+    public void AggregateRunDataMetricsShouldAddTimeTakenToRunTests()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void AggregateRunDataMetricsShouldNotAggregateRunState()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, .02091 }
+        };
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.RunState, "Completed");
+        aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            aggregator.AggregateRunDataMetrics(dict);
-            aggregator.AggregateRunDataMetrics(dict);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, out var value));
+        Assert.AreEqual(.04182, value);
+    }
 
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.RunState, out var value));
-        }
+    [TestMethod]
+    public void AggregateRunDataMetricsShouldAddTimeTakenByAllAdapters()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void GetAggregatedRunDataMetricsShouldReturnEmptyIfMetricAggregatorIsEmpty()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TelemetryDataConstants.TimeTakenByAllAdaptersInSec, .02091 }
+        };
+
+        aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            var dict = new Dictionary<string, object>();
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            aggregator.AggregateRunDataMetrics(dict);
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, out var value));
+        Assert.AreEqual(.04182, value);
+    }
 
-            Assert.AreEqual(0, runMetrics.Count);
-        }
+    [TestMethod]
+    public void AggregateRunDataMetricsShouldNotAggregateRunState()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void GetAggregatedRunDataMetricsShouldReturnEmptyIfMetricsIsNull()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TelemetryDataConstants.RunState, "Completed" }
+        };
 
-            var dict = new Dictionary<string, string>();
+        aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            aggregator.AggregateRunDataMetrics(null);
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.RunState, out _));
+    }
 
-            Assert.AreEqual(0, runMetrics.Count);
-        }
+    [TestMethod]
+    public void GetAggregatedRunDataMetricsShouldReturnEmptyIfMetricAggregatorIsEmpty()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void GetRunDataMetricsShouldAddTotalAdaptersUsedIfMetricsIsNotEmpty()
-        {
-            var aggregator = new ParallelRunDataAggregator();
+        var dict = new Dictionary<string, object>();
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TotalTestsRanByAdapter, 2);
+        aggregator.AggregateRunDataMetrics(dict);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            aggregator.AggregateRunDataMetrics(dict);
-            aggregator.AggregateRunDataMetrics(dict);
+        Assert.AreEqual(0, runMetrics.Count);
+    }
+
+    [TestMethod]
+    public void GetAggregatedRunDataMetricsShouldReturnEmptyIfMetricsIsNull()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
+        _ = new Dictionary<string, string>();
+
+        aggregator.AggregateRunDataMetrics(null);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.AreEqual(0, runMetrics.Count);
+    }
 
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, out var value));
-            Assert.AreEqual(1, value);
-        }
+    [TestMethod]
+    public void GetRunDataMetricsShouldAddTotalAdaptersUsedIfMetricsIsNotEmpty()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void GetRunDataMetricsShouldAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
+            { TelemetryDataConstants.TotalTestsRanByAdapter, 2 }
+        };
 
-            var dict = new Dictionary<string, object>();
-            dict.Add(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter + "executor:MSTestV1", .02091);
-            dict.Add(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter + "executor:MSTestV2", .02091);
+        aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            aggregator.AggregateRunDataMetrics(dict);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, out var value));
+        Assert.AreEqual(1, value);
+    }
 
-            Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, out var value));
-            Assert.AreEqual(2, value);
-        }
+    [TestMethod]
+    public void GetRunDataMetricsShouldAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
 
-        [TestMethod]
-        public void GetRunDataMetricsShouldNotAddTotalAdaptersUsedIfMetricsIsEmpty()
+        var dict = new Dictionary<string, object>
         {
-            var aggregator = new ParallelRunDataAggregator();
-            var dict = new Dictionary<string, object>();
+            { TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter + "executor:MSTestV1", .02091 },
+            { TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter + "executor:MSTestV2", .02091 }
+        };
 
-            aggregator.AggregateRunDataMetrics(dict);
+        aggregator.AggregateRunDataMetrics(dict);
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
 
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, out var value));
-        }
+        Assert.IsTrue(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, out var value));
+        Assert.AreEqual(2, value);
+    }
 
-        [TestMethod]
-        public void GetRunDataMetricsShouldNotAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
-        {
-            var aggregator = new ParallelRunDataAggregator();
-            var dict = new Dictionary<string, object>();
+    [TestMethod]
+    public void GetRunDataMetricsShouldNotAddTotalAdaptersUsedIfMetricsIsEmpty()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
+        var dict = new Dictionary<string, object>();
+
+        aggregator.AggregateRunDataMetrics(dict);
 
-            aggregator.AggregateRunDataMetrics(dict);
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, out _));
+    }
+
+    [TestMethod]
+    public void GetRunDataMetricsShouldNotAddNumberOfAdapterDiscoveredIfMetricsIsEmpty()
+    {
+        var aggregator = new ParallelRunDataAggregator(Constants.EmptyRunSettings);
+        var dict = new Dictionary<string, object>();
 
-            var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        aggregator.AggregateRunDataMetrics(dict);
 
-            Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, out var value));
-        }
+        var runMetrics = aggregator.GetAggregatedRunDataMetrics();
+        Assert.IsFalse(runMetrics.TryGetValue(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, out _));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunEventsHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunEventsHandlerTests.cs
index 11e65f0c84..8fead4e48b 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelRunEventsHandlerTests.cs
@@ -1,204 +1,200 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ParallelRunEventsHandlerTests
 {
-    using System;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class ParallelRunEventsHandlerTests
+    private readonly ParallelRunEventsHandler _parallelRunEventsHandler;
+    private readonly Mock<IProxyExecutionManager> _mockProxyExecutionManager;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockTestRunEventsHandler;
+    private readonly Mock<IParallelProxyExecutionManager> _mockParallelProxyExecutionManager;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly int _protocolVersion;
+
+    public ParallelRunEventsHandlerTests()
     {
-        private ParallelRunEventsHandler parallelRunEventsHandler;
-
-        private Mock<IProxyExecutionManager> mockProxyExecutionManager;
-
-        private Mock<ITestRunEventsHandler> mockTestRunEventsHandler;
-
-        private Mock<IParallelProxyExecutionManager> mockParallelProxyExecutionManager;
-
-        private Mock<IDataSerializer> mockDataSerializer;
-
-        private Mock<IRequestData> mockRequestData;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockProxyExecutionManager = new Mock<IProxyExecutionManager>();
-            this.mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.mockParallelProxyExecutionManager = new Mock<IParallelProxyExecutionManager>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-
-            this.parallelRunEventsHandler = new ParallelRunEventsHandler(this.mockRequestData.Object, this.mockProxyExecutionManager.Object,
-                this.mockTestRunEventsHandler.Object, this.mockParallelProxyExecutionManager.Object,
-                new ParallelRunDataAggregator(), this.mockDataSerializer.Object);
-        }
+        _mockProxyExecutionManager = new Mock<IProxyExecutionManager>();
+        _mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _mockParallelProxyExecutionManager = new Mock<IParallelProxyExecutionManager>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _protocolVersion = 0;
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(new ProtocolConfig { Version = _protocolVersion });
+
+        _parallelRunEventsHandler = new ParallelRunEventsHandler(_mockRequestData.Object, _mockProxyExecutionManager.Object,
+            _mockTestRunEventsHandler.Object, _mockParallelProxyExecutionManager.Object,
+            new ParallelRunDataAggregator(Constants.EmptyRunSettings), _mockDataSerializer.Object);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldSendStatsChangeRawMessageToRunEventsHandler()
-        {
-            string payload = "RunStats";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.TestRunStatsChange, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldSendStatsChangeRawMessageToRunEventsHandler()
+    {
+        string payload = "RunStats";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.TestRunStatsChange, Payload = payload });
 
-            this.parallelRunEventsHandler.HandleRawMessage(payload);
+        _parallelRunEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldSendLoggerRawMessageToRunEventsHandler()
-        {
-            string payload = "LogMessage";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.TestMessage, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldSendLoggerRawMessageToRunEventsHandler()
+    {
+        string payload = "LogMessage";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.TestMessage, Payload = payload });
 
-            this.parallelRunEventsHandler.HandleRawMessage(payload);
+        _parallelRunEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldNotSendRunCompleteEventRawMessageToRunEventsHandler()
-        {
-            string payload = "ExecComplete";
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
-                .Returns(new Message() { MessageType = MessageType.ExecutionComplete, Payload = payload });
+    [TestMethod]
+    public void HandleRawMessageShouldNotSendRunCompleteEventRawMessageToRunEventsHandler()
+    {
+        string payload = "ExecComplete";
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>()))
+            .Returns(new Message() { MessageType = MessageType.ExecutionComplete, Payload = payload });
 
-            this.parallelRunEventsHandler.HandleRawMessage(payload);
+        _parallelRunEventsHandler.HandleRawMessage(payload);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void HandleLogMessageShouldJustPassOnTheEventToRunEventsHandler()
-        {
-            string log = "Hello";
-            this.parallelRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, log);
+    [TestMethod]
+    public void HandleLogMessageShouldJustPassOnTheEventToRunEventsHandler()
+    {
+        string log = "Hello";
+        _parallelRunEventsHandler.HandleLogMessage(TestMessageLevel.Error, log);
 
-            this.mockTestRunEventsHandler.Verify(mt =>
-                mt.HandleLogMessage(TestMessageLevel.Error, log), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt =>
+            mt.HandleLogMessage(TestMessageLevel.Error, log), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRunStatsChangeShouldJustPassOnTheEventToRunEventsHandler()
-        {
-            var eventArgs = new TestRunChangedEventArgs(null, null, null);
-            this.parallelRunEventsHandler.HandleTestRunStatsChange(eventArgs);
+    [TestMethod]
+    public void HandleRunStatsChangeShouldJustPassOnTheEventToRunEventsHandler()
+    {
+        var eventArgs = new TestRunChangedEventArgs(null, null, null);
+        _parallelRunEventsHandler.HandleTestRunStatsChange(eventArgs);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(eventArgs), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(eventArgs), Times.Once);
+    }
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldJustPassOnTheEventToRunEventsHandler()
-        {
-            var testProcessStartInfo = new TestProcessStartInfo();
-            this.parallelRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldJustPassOnTheEventToRunEventsHandler()
+    {
+        var testProcessStartInfo = new TestProcessStartInfo();
+        _parallelRunEventsHandler.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.LaunchProcessWithDebuggerAttached(testProcessStartInfo), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.LaunchProcessWithDebuggerAttached(testProcessStartInfo), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRunCompleteShouldNotCallLastChunkResultsIfNotPresent()
-        {
-            var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.Zero);
+    [TestMethod]
+    public void HandleRunCompleteShouldNotCallLastChunkResultsIfNotPresent()
+    {
+        var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.Zero);
 
-             this.mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
-                    this.mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(false);
+        _mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(false);
 
-            this.parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
+        _parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
 
-            // Raw message must be sent
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
+        // Raw message must be sent
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Never);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(null), Times.Never);
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(null), Times.Never);
 
-            this.mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
-                this.mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
-        }
+        _mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRunCompleteShouldCallLastChunkResultsIfPresent()
-        {
-            string payload = "RunStats";
-            var lastChunk = new TestRunChangedEventArgs(null, null, null);
-            var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.Zero);
+    [TestMethod]
+    public void HandleRunCompleteShouldCallLastChunkResultsIfPresent()
+    {
+        string payload = "RunStats";
+        var lastChunk = new TestRunChangedEventArgs(null, null, null);
+        var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.Zero);
 
-            this.mockDataSerializer.Setup(mds => mds.SerializePayload(MessageType.TestRunStatsChange, lastChunk))
-                .Returns(payload);
+        _mockDataSerializer.Setup(mds => mds.SerializePayload(MessageType.TestRunStatsChange, lastChunk, _protocolVersion))
+            .Returns(payload);
 
-            this.mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
-                    this.mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(false);
+        _mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(false);
 
-            this.parallelRunEventsHandler.HandleTestRunComplete(completeArgs, lastChunk, null, null);
+        _parallelRunEventsHandler.HandleTestRunComplete(completeArgs, lastChunk, null, null);
 
-            // Raw message must be sent
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
+        // Raw message must be sent
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(payload), Times.Once);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(lastChunk), Times.Once);
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(lastChunk), Times.Once);
 
-            this.mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
-                this.mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
-        }
+        _mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRunCompleteShouldCallTestRunCompleteOnActualHandlerIfParallelMaangerReturnsCompleteAsTrue()
-        {
-            string payload = "ExecComplete";
-            var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.Zero);
+    [TestMethod]
+    public void HandleRunCompleteShouldCallTestRunCompleteOnActualHandlerIfParallelMaangerReturnsCompleteAsTrue()
+    {
+        string payload = "ExecComplete";
+        var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.Zero);
 
-            this.mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
-                    this.mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(true);
+        _mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(true);
 
-            this.mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.ExecutionComplete)).Returns(payload);
+        _mockDataSerializer.Setup(mds => mds.SerializeMessage(MessageType.ExecutionComplete)).Returns(payload);
 
-            this.parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
+        _parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(null), Times.Never);
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunStatsChange(null), Times.Never);
 
-            this.mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
-                this.mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
+        _mockParallelProxyExecutionManager.Verify(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null), Times.Once);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Once);
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleRawMessage(It.IsAny<string>()), Times.Once);
 
-            this.mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunComplete(
-                It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(),
-                It.IsAny<ICollection<AttachmentSet>>(),
-                It.IsAny<ICollection<string>>()), Times.Once);
-        }
+        _mockTestRunEventsHandler.Verify(mt => mt.HandleTestRunComplete(
+            It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(),
+            It.IsAny<ICollection<AttachmentSet>>(),
+            It.IsAny<ICollection<string>>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRunCompleteShouldCollectMetrics()
-        {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+    [TestMethod]
+    public void HandleRunCompleteShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
 
-            var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.Zero);
+        var completeArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.Zero);
 
-            this.mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
-                this.mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(true);
+        _mockParallelProxyExecutionManager.Setup(mp => mp.HandlePartialRunComplete(
+            _mockProxyExecutionManager.Object, completeArgs, null, null, null)).Returns(true);
 
-            // Act
-            this.parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
+        // Act
+        _parallelRunEventsHandler.HandleTestRunComplete(completeArgs, null, null, null);
 
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.RunState, It.IsAny<string>()), Times.Once);
-        }
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.RunState, It.IsAny<string>()), Times.Once);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
index 64f5ace172..f9483d82bb 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
@@ -1,125 +1,130 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyBaseManagerTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System.Collections.Generic;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    [TestClass]
-    public class ProxyBaseManagerTests
+    private const int Clientprocessexitwait = 10 * 1000;
+    private readonly ProtocolConfig _protocolConfig = new() { Version = 2 };
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly DiscoveryDataAggregator _discoveryDataAggregator;
+
+    protected readonly Mock<ITestRuntimeProvider> _mockTestHostManager;
+
+    private Mock<ICommunicationEndPoint>? _mockCommunicationEndpoint;
+    private ITestRequestSender? _testRequestSender;
+
+    protected Mock<IDataSerializer> _mockDataSerializer;
+    protected Mock<ICommunicationChannel> _mockChannel;
+
+    public ProxyBaseManagerTests()
     {
-        private const int CLIENTPROCESSEXITWAIT = 10 * 1000;
-        private Mock<ICommunicationEndPoint> mockCommunicationEndpoint;
-        private ITestRequestSender testRequestSender;
-
-        ProtocolConfig protocolConfig = new ProtocolConfig { Version = 2 };
-        private readonly Mock<IRequestData> mockRequestData;
-        protected readonly Mock<ITestRuntimeProvider> mockTestHostManager;
-        protected Mock<IDataSerializer> mockDataSerializer;
-        protected Mock<ICommunicationChannel> mockChannel;
-        private Mock<IFileHelper> mockFileHelper;
-
-        public ProxyBaseManagerTests()
-        {
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockChannel = new Mock<ICommunicationChannel>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new Mock<IMetricsCollection>().Object);
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(null)).Returns(new Message());
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(string.Empty)).Returns(new Message());
-            this.mockTestHostManager.SetupGet(th => th.Shared).Returns(true);
-            this.mockTestHostManager.Setup(
-                    m => m.GetTestHostProcessStartInfo(
-                        It.IsAny<IEnumerable<string>>(),
-                        It.IsAny<IDictionary<string, string>>(),
-                        It.IsAny<TestRunnerConnectionInfo>()))
-                .Returns(new TestProcessStartInfo());
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback(
-                    () =>
-                    {
-                        this.mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty));
-                    })
-                .Returns(Task.FromResult(true));
-        }
-
-        private void SetupAndInitializeTestRequestSender()
-        {
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":0",
-                Role = ConnectionRole.Client,
-                Transport = Transport.Sockets
-            };
-            this.mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.testRequestSender = new TestRequestSender(this.mockCommunicationEndpoint.Object, connectionInfo, this.mockDataSerializer.Object, this.protocolConfig, CLIENTPROCESSEXITWAIT);
-            this.mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() =>
-            {
-                this.mockCommunicationEndpoint.Raise(
-                    s => s.Connected += null,
-                    this.mockCommunicationEndpoint.Object,
-                    new ConnectedEventArgs(this.mockChannel.Object));
-            });
-            this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, this.protocolConfig.Version);
-
-            this.testRequestSender.InitializeCommunication();
-        }
-
-        public void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
-        {
-            this.mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
-                .Callback(() => this.mockChannel.Raise(c => c.MessageReceived += null, this.mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }));
+        _mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
+        _mockFileHelper = new Mock<IFileHelper>();
+        _discoveryDataAggregator = new();
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
-            this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.Is<string>(s => s.Equals(messageType)))).Returns(new Message { MessageType = returnMessageType });
-            this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.Is<Message>(m => m.MessageType.Equals(messageType)))).Returns(returnPayload);
-        }
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new Mock<IMetricsCollection>().Object);
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(null!)).Returns(new Message());
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(string.Empty)).Returns(new Message());
+        _mockTestHostManager.SetupGet(th => th.Shared).Returns(true);
+        _mockTestHostManager.Setup(
+                m => m.GetTestHostProcessStartInfo(
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<IDictionary<string, string?>>(),
+                    It.IsAny<TestRunnerConnectionInfo>()))
+            .Returns(new TestProcessStartInfo());
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback(
+                () => _mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty)))
+            .Returns(Task.FromResult(true));
+    }
 
-        public void RaiseMessageReceived(string data)
+    [MemberNotNull(nameof(_testRequestSender), nameof(_testRequestSender))]
+    private void SetupAndInitializeTestRequestSender()
+    {
+        var connectionInfo = new TestHostConnectionInfo
         {
-            this.mockChannel.Raise(c => c.MessageReceived += null, this.mockChannel.Object,
-                new MessageReceivedEventArgs { Data = data });
-        }
+            Endpoint = IPAddress.Loopback + ":0",
+            Role = ConnectionRole.Client,
+            Transport = Transport.Sockets
+        };
+        _mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
+        _testRequestSender = new TestRequestSender(_mockCommunicationEndpoint.Object, connectionInfo, _mockDataSerializer.Object, _protocolConfig, Clientprocessexitwait);
+        _mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() => _mockCommunicationEndpoint.Raise(
+            s => s.Connected += null,
+            _mockCommunicationEndpoint.Object,
+            new ConnectedEventArgs(_mockChannel.Object)));
+        SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, _protocolConfig.Version);
 
-        protected ProxyDiscoveryManager GetProxyDiscoveryManager()
-        {
-            this.SetupAndInitializeTestRequestSender();
-            var testDiscoveryManager = new ProxyDiscoveryManager(
-                mockRequestData.Object,
-                testRequestSender,
-                mockTestHostManager.Object,
-                mockDataSerializer.Object,
-                this.mockFileHelper.Object);
-
-            return testDiscoveryManager;
-        }
-
-        internal ProxyExecutionManager GetProxyExecutionManager()
-        {
-            this.SetupAndInitializeTestRequestSender();
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            var testExecutionManager = new ProxyExecutionManager(mockRequestData.Object, testRequestSender,
-                mockTestHostManager.Object, mockDataSerializer.Object, this.mockFileHelper.Object);
+        _testRequestSender.InitializeCommunication();
+    }
+
+    public void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
+    {
+        _mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
+            .Callback(() => _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }, "ProxyBaseManagerTests.SetupChannelMessage()"));
+
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
+        _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.Is<string>(s => s.Equals(messageType)))).Returns(new Message { MessageType = returnMessageType });
+        _mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.Is<Message>(m => string.Equals(m.MessageType, messageType)))).Returns(returnPayload);
+    }
+
+    public void RaiseMessageReceived(string data)
+    {
+        _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object,
+            new MessageReceivedEventArgs { Data = data },
+            "ProxyBaseManagerTests.RaiseMessageReceived()");
+    }
+
+    protected ProxyDiscoveryManager GetProxyDiscoveryManager()
+    {
+        SetupAndInitializeTestRequestSender();
+        var testDiscoveryManager = new ProxyDiscoveryManager(
+            _mockRequestData.Object,
+            _testRequestSender,
+            _mockTestHostManager.Object,
+            Framework.DefaultFramework,
+            _discoveryDataAggregator,
+            _mockDataSerializer.Object,
+            _mockFileHelper.Object);
+
+        return testDiscoveryManager;
+    }
+
+    internal ProxyExecutionManager GetProxyExecutionManager()
+    {
+        SetupAndInitializeTestRequestSender();
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        var testExecutionManager = new ProxyExecutionManager(_mockRequestData.Object, _testRequestSender,
+            _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataSerializer.Object, _mockFileHelper.Object);
 
-            return testExecutionManager;
-        }
+        return testExecutionManager;
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs
index 5133483580..b78ab647f8 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs
@@ -1,519 +1,529 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyDiscoveryManagerTests : ProxyBaseManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class ProxyDiscoveryManagerTests : ProxyBaseManagerTests
+    private readonly DiscoveryCriteria _discoveryCriteria;
+    private readonly DiscoveryDataAggregator _discoveryDataAggregator;
+    private readonly Mock<ITestRequestSender> _mockRequestSender;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly ProxyDiscoveryManager _discoveryManager;
+
+    public ProxyDiscoveryManagerTests()
     {
-        //private const int CLIENTPROCESSEXITWAIT = 10 * 1000;
-
-        private readonly DiscoveryCriteria discoveryCriteria;
+        _mockRequestSender = new Mock<ITestRequestSender>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _discoveryDataAggregator = new();
+        _discoveryManager = new ProxyDiscoveryManager(
+            _mockRequestData.Object,
+            _mockRequestSender.Object,
+            _mockTestHostManager.Object,
+            Framework.DefaultFramework,
+            _discoveryDataAggregator,
+            _mockDataSerializer.Object,
+            _mockFileHelper.Object);
+        _discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
+    }
 
-        private ProxyDiscoveryManager testDiscoveryManager;
+    [TestMethod]
+    public void DiscoverTestsShouldNotInitializeExtensionsOnNoExtensions()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-        private Mock<ITestRequestSender> mockRequestSender;
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-        //private Mock<IDataSerializer> mockDataSerializer;
+        _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-        private Mock<IRequestData> mockRequestData;
+        _mockRequestSender.Verify(s => s.InitializeDiscovery(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private Mock<IFileHelper> mockFileHelper;
+    [TestMethod]
+    public void DiscoverTestsShouldNotInitializeExtensionsOnCommunicationFailure()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-        public ProxyDiscoveryManagerTests()
-        {
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.testDiscoveryManager = new ProxyDiscoveryManager(
-                                            this.mockRequestData.Object,
-                                            this.mockRequestSender.Object,
-                                            this.mockTestHostManager.Object,
-                                            this.mockDataSerializer.Object,
-                                            this.mockFileHelper.Object);
-            this.discoveryCriteria = new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty);
-        }
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new();
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotInitializeExtensionsOnNoExtensions()
-        {
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+    [TestMethod]
+    public void DiscoverTestsShouldAllowRuntimeProviderToUpdateAdapterSource()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-            this.mockRequestSender.Verify(s => s.InitializeDiscovery(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(_discoveryCriteria.Sources)).Returns(_discoveryCriteria.Sources);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotInitializeExtensionsOnCommunicationFailure()
-        {
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new();
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(_discoveryCriteria.Sources), Times.Once);
+    }
 
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventHandler.Object);
+    [TestMethod]
+    public void DiscoverTestsShouldUpdateTestSourcesIfSourceDiffersFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "inputPackage.appxrecipe" };
 
-            this.mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
+        var localDiscoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
 
-        [TestMethod]
-        public void DiscoverTestsShouldAllowRuntimeProviderToUpdateAdapterSource()
-        {
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(localDiscoveryCriteria.Sources)).Returns(actualSources);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(this.discoveryCriteria.Sources)).Returns(this.discoveryCriteria.Sources);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new();
 
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventHandler.Object);
+        Assert.IsNotNull(localDiscoveryCriteria.Package);
+        // AdapterSourceMap should contain updated testSources.
+        Assert.AreEqual(actualSources.FirstOrDefault(), localDiscoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
+        Assert.AreEqual(inputSource.FirstOrDefault(), localDiscoveryCriteria.Package);
+    }
 
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(this.discoveryCriteria.Sources), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldNotUpdateTestSourcesIfSourceDoNotDifferFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "actualSource.dll" };
 
-        [TestMethod]
-        public void DiscoverTestsShouldUpdateTestSourcesIfSourceDiffersFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource = new List<string> { "inputPackage.appxrecipe" };
+        var localDiscoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
 
-            var localDiscoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(localDiscoveryCriteria.Sources)).Returns(actualSources);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(localDiscoveryCriteria.Sources)).Returns(actualSources);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new();
 
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            this.testDiscoveryManager.DiscoverTests(localDiscoveryCriteria, mockTestDiscoveryEventHandler.Object);
+        Assert.IsNull(localDiscoveryCriteria.Package);
+        // AdapterSourceMap should contain updated testSources.
+        Assert.AreEqual(actualSources.FirstOrDefault(), localDiscoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
+    }
 
-            Assert.IsNotNull(localDiscoveryCriteria.Package);
-            // AdapterSourceMap should contain updated testSources.
-            Assert.AreEqual(actualSources.FirstOrDefault(), localDiscoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
-            Assert.AreEqual(inputSource.FirstOrDefault(), localDiscoveryCriteria.Package);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldNotSendDiscoveryRequestIfCommunicationFails()
+    {
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback(
+                () => _mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty)))
+            .Returns(Task.FromResult(false));
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotUpdateTestSourcesIfSourceDoNotDifferFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource = new List<string> { "actualSource.dll" };
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            var localDiscoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(localDiscoveryCriteria.Sources)).Returns(actualSources);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new();
 
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            this.testDiscoveryManager.DiscoverTests(localDiscoveryCriteria, mockTestDiscoveryEventHandler.Object);
+        _mockRequestSender.Verify(s => s.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Never);
+    }
 
-            Assert.IsNull(localDiscoveryCriteria.Package);
-            // AdapterSourceMap should contain updated testSources.
-            Assert.AreEqual(actualSources.FirstOrDefault(), localDiscoveryCriteria.AdapterSourceMap.FirstOrDefault().Value.FirstOrDefault());
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldInitializeExtensionsIfPresent()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotSendDiscoveryRequestIfCommunicationFails()
+        try
         {
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback(
-                    () =>
-                        {
-                            this.mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty));
-                        })
-                .Returns(Task.FromResult(false));
-
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+            var extensions = new[] { "c:\\e1.dll", "c:\\e2.dll" };
 
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+            // Setup Mocks.
+            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(extensions);
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "c:\\e1.dll", "c:\\e2.dll" });
 
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventHandler.Object);
+            _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-            this.mockRequestSender.Verify(s => s.DiscoverTests(It.IsAny<DiscoveryCriteria>(), It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Never);
+            // Also verify that we have waited for client connection.
+            _mockRequestSender.Verify(s => s.InitializeDiscovery(extensions), Times.Once);
         }
-
-        [TestMethod]
-        public void DiscoverTestsShouldInitializeExtensionsIfPresent()
+        finally
         {
-            // Make sure TestPlugincache is refreshed.
             TestPluginCache.Instance = null;
+        }
+    }
 
-            try
-            {
-                var extensions = new[] { "c:\\e1.dll", "c:\\e2.dll" };
-
-                // Setup Mocks.
-                TestPluginCacheHelper.SetupMockAdditionalPathExtensions(extensions);
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "c:\\e1.dll", "c:\\e2.dll" });
+    [TestMethod]
+    public void DiscoverTestsShouldInitializeExtensionsWithExistingExtensionsOnly()
+    {
+        var inputExtensions = new[] { "abc.TestAdapter.dll", "def.TestAdapter.dll", "xyz.TestAdapter.dll" };
+        var expectedOutputPaths = new[] { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" };
 
-                this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+        TestPluginCacheHelper.SetupMockAdditionalPathExtensions(inputExtensions);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions.Select(extension => Path.GetFileName(extension)));
 
-                // Also verify that we have waited for client connection.
-                this.mockRequestSender.Verify(s => s.InitializeDiscovery(extensions), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
-        }
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns((string extensionPath) => !extensionPath.Contains("def.TestAdapter.dll"));
 
-        [TestMethod]
-        public void DiscoverTestsShouldInitializeExtensionsWithExistingExtensionsOnly()
-        {
-            var inputExtensions = new[] { "abc.TestAdapter.dll", "def.TestAdapter.dll", "xyz.TestAdapter.dll" };
-            var expectedOutputPaths = new[] { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" };
+        _mockFileHelper.Setup(fh => fh.Exists("def.TestAdapter.dll")).Returns(false);
+        _mockFileHelper.Setup(fh => fh.Exists("xyz.TestAdapter.dll")).Returns(true);
 
-            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(inputExtensions);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) =>
-            {
-                return extensions.Select(extension => { return Path.GetFileName(extension); });
-            });
+        var mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventHandler.Object);
 
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns((string extensionPath) =>
-            {
-                return !extensionPath.Contains("def.TestAdapter.dll");
-            });
+        _mockRequestSender.Verify(s => s.InitializeDiscovery(expectedOutputPaths), Times.Once);
+    }
 
-            this.mockFileHelper.Setup(fh => fh.Exists("def.TestAdapter.dll")).Returns(false);
-            this.mockFileHelper.Setup(fh => fh.Exists("xyz.TestAdapter.dll")).Returns(true);
+    [TestMethod]
+    public void DiscoverTestsShouldQueryTestHostManagerForExtensions()
+    {
+        TestPluginCache.Instance = null;
+        try
+        {
+            TestPluginCacheHelper.SetupMockAdditionalPathExtensions(["c:\\e1.dll"]);
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "he1.dll", "c:\\e1.dll" });
 
-            var mockTestDiscoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventHandler.Object);
+            _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-            this.mockRequestSender.Verify(s => s.InitializeDiscovery(expectedOutputPaths), Times.Once);
+            _mockRequestSender.Verify(s => s.InitializeDiscovery(new[] { "he1.dll", "c:\\e1.dll" }), Times.Once);
         }
-
-        [TestMethod]
-        public void DiscoverTestsShouldQueryTestHostManagerForExtensions()
+        finally
         {
             TestPluginCache.Instance = null;
-            try
-            {
-                TestPluginCacheHelper.SetupMockAdditionalPathExtensions(new[] { "c:\\e1.dll" });
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "he1.dll", "c:\\e1.dll" });
-
-                this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
-
-                this.mockRequestSender.Verify(s => s.InitializeDiscovery(new[] { "he1.dll", "c:\\e1.dll" }), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
         }
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldPassAdapterToTestHostManagerFromTestPluginCacheExtensions()
+    [TestMethod]
+    public void DiscoverTestsShouldPassAdapterToTestHostManagerFromTestPluginCacheExtensions()
+    {
+        // We are updating extension with test adapter only to make it easy to test.
+        // In product code it filter out test adapter from extension
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
+        try
         {
-            // We are updating extension with test adapter only to make it easy to test.
-            // In product code it filter out test adapter from extension
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
-            try
-            {
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
 
-                this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+            _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-                this.mockTestHostManager.Verify(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), expectedResult), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
+            _mockTestHostManager.Verify(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), expectedResult), Times.Once);
         }
-
-        [TestMethod]
-        public void DiscoverTestsShouldNotInitializeDefaultAdaptersIfSkipDefaultAdaptersIsTrue()
+        finally
         {
-            InvokeAndVerifyDiscoverTests(true);
+            TestPluginCache.Instance = null;
         }
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldInitializeDefaultAdaptersIfSkipDefaultAdaptersIsFalse()
-        {
-            InvokeAndVerifyDiscoverTests(false);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldNotInitializeDefaultAdaptersIfSkipDefaultAdaptersIsTrue()
+    {
+        InvokeAndVerifyDiscoverTests(true);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotIntializeTestHost()
-        {
-            // Setup mocks.
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void DiscoverTestsShouldInitializeDefaultAdaptersIfSkipDefaultAdaptersIsFalse()
+    {
+        InvokeAndVerifyDiscoverTests(false);
+    }
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+    [TestMethod]
+    public void DiscoverTestsShouldNotIntializeTestHost()
+    {
+        // Setup mocks.
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
-            this.mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-        [TestMethod]
-        public void DiscoverTestsShouldCatchExceptionAndCallHandleDiscoveryComplete()
-        {
-            // Setup mocks.
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+        _mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
+        _mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void DiscoverTestsShouldCatchExceptionAndCallHandleDiscoveryComplete()
+    {
+        // Setup mocks.
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()));
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.IsAny<string>()));
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()));
-        }
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldCatchExceptionAndCallHandleRawMessageOfDiscoveryComplete()
-        {
-            // Setup mocks.
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()));
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.IsAny<string>()));
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()));
+    }
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
+    [TestMethod]
+    public void DiscoverTestsShouldCatchExceptionAndCallHandleRawMessageOfDiscoveryComplete()
+    {
+        // Setup mocks.
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.DiscoveryComplete))), Times.Once);
-        }
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.DiscoveryComplete))), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldCatchExceptionAndCallHandleRawMessageOfTestMessage()
-        {
-            // Setup mocks.
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void DiscoverTestsShouldCatchExceptionAndCallHandleRawMessageOfTestMessage()
+    {
+        // Setup mocks.
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))), Times.Once);
-        }
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldCatchExceptionAndCallHandleLogMessageOfError()
-        {
-            // Setup mocks.
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void DiscoverTestsShouldCatchExceptionAndCallHandleLogMessageOfError()
+    {
+        // Setup mocks.
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldInitiateServerDiscoveryLoop()
-        {
-            // Setup mocks.
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void DiscoverTestsShouldInitiateServerDiscoveryLoop()
+    {
+        // Setup mocks.
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
 
-            // Assert.
-            this.mockRequestSender.Verify(s => s.DiscoverTests(It.IsAny<DiscoveryCriteria>(), this.testDiscoveryManager), Times.Once);
-        }
+        // Assert.
+        _mockRequestSender.Verify(s => s.DiscoverTests(It.IsAny<DiscoveryCriteria>(), _discoveryManager), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsCloseTestHostIfRawMessageIsOfTypeDiscoveryComplete()
-        {
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+    [TestMethod]
+    public void DiscoverTestsCloseTestHostIfRawMessageIsOfTypeDiscoveryComplete()
+    {
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.DiscoveryComplete, It.IsAny<DiscoveryCompletePayload>())).Returns(MessageType.DiscoveryComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.DiscoveryComplete) ? MessageType.DiscoveryComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            this.mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Verify
+        _mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldNotCloseTestHostIfRawMessageIsNotOfTypeDiscoveryComplete()
-        {
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+    [TestMethod]
+    public void DiscoverTestsShouldNotCloseTestHostIfRawMessageIsNotOfTypeDiscoveryComplete()
+    {
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
+        {
+            var message = new Message
             {
-                var message = new Message
-                {
-                    MessageType = MessageType.DiscoveryInitialize
-                };
+                MessageType = MessageType.DiscoveryInitialize
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            this.mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Never);
-        }
+        // Verify
+        _mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void DiscoveryManagerShouldPassOnHandleDiscoveredTests()
-        {
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var testCases = new List<TestCase>() { new TestCase("x.y.z", new Uri("x://y"), "x.dll") };
+    [TestMethod]
+    public void DiscoveryTestsMarksAllSourcesAsNotDiscovered()
+    {
+        // Arrange
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        var inputSource = new List<string> { "source1.dll", "source2.dll", "source3.dll" };
 
-            this.testDiscoveryManager = this.GetProxyDiscoveryManager();
-            this.SetupChannelMessage(MessageType.StartDiscovery, MessageType.TestCasesFound, testCases);
+        var localDiscoveryCriteria = new DiscoveryCriteria(inputSource, 1, string.Empty);
 
-            var completePayload = new DiscoveryCompletePayload()
-            {
-                IsAborted = false,
-                LastDiscoveredTests = null,
-                TotalTests = 1
-            };
-            var completeMessage = new Message() { MessageType = MessageType.DiscoveryComplete, Payload = null };
-            mockTestDiscoveryEventsHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () =>
-                {
-                    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
-                    this.mockDataSerializer.Setup(ds => ds.DeserializePayload<DiscoveryCompletePayload>(completeMessage)).Returns(completePayload);
-                });
-
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
-
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(mtdeh => mtdeh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.AtLeastOnce);
-        }
+        // Act
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-        [TestMethod]
-        public void DiscoveryManagerShouldPassOnHandleLogMessage()
-        {
-            Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        // Assert
+        CollectionAssert.AreEquivalent(inputSource, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered));
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count);
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count);
+    }
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
-            {
-                var message = new Message
-                {
-                    MessageType = MessageType.TestMessage
-                };
+    [TestMethod]
+    public void DiscoveryManagerShouldPassOnHandleDiscoveredTests()
+    {
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+        var testCases = new List<TestCase>() { new("eventHandler.y.z", new Uri("eventHandler://y"), "eventHandler.dll") };
+
+        var discoveryManager = GetProxyDiscoveryManager();
+        SetupChannelMessage(MessageType.StartDiscovery, MessageType.TestCasesFound, testCases);
+        SetupChannelMessage(MessageType.TestMessage, MessageType.TestMessage, string.Empty);
 
-                return message;
+        var completePayload = new DiscoveryCompletePayload()
+        {
+            IsAborted = false,
+            LastDiscoveredTests = null,
+            TotalTests = 1
+        };
+        var completeMessage = new Message() { MessageType = MessageType.DiscoveryComplete, Payload = null };
+        mockTestDiscoveryEventsHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () =>
+            {
+                _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
+                _mockDataSerializer.Setup(ds => ds.DeserializePayload<DiscoveryCompletePayload>(completeMessage)).Returns(completePayload);
             });
 
-            // Act.
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            // Verify
-            mockTestDiscoveryEventsHandler.Verify(mtdeh => mtdeh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once);
-        }
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(mtdeh => mtdeh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.AtLeastOnce);
+    }
 
-        [TestMethod]
-        public void AbortShouldSendTestDiscoveryCancelIfCommunicationSuccessful()
+    [TestMethod]
+    public void DiscoveryManagerShouldPassOnHandleLogMessage()
+    {
+        Mock<ITestDiscoveryEventsHandler2> mockTestDiscoveryEventsHandler = new();
+
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
         {
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            var message = new Message
+            {
+                MessageType = MessageType.TestMessage
+            };
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+            return message;
+        });
 
-            this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
 
-            this.testDiscoveryManager.Abort();
+        // Verify
+        mockTestDiscoveryEventsHandler.Verify(mtdeh => mtdeh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once);
+    }
 
-            this.mockRequestSender.Verify(s => s.EndSession(), Times.Once);
-        }
+    [TestMethod]
+    public void AbortShouldSendTestDiscoveryCancelIfCommunicationSuccessful()
+    {
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-        [TestMethod]
-        public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
-        {
-            var testSessionInfo = new TestSessionInfo();
+        Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new();
+
+        _discoveryManager.DiscoverTests(_discoveryCriteria, mockTestDiscoveryEventsHandler.Object);
+
+        _discoveryManager.Abort();
+
+        _mockRequestSender.Verify(s => s.EndSession(), Times.Once);
+    }
+
+    [TestMethod]
+    public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
+    {
+        var testSessionInfo = new TestSessionInfo();
 
-            Func<string, ProxyDiscoveryManager, ProxyOperationManager>
+        Func<string, ProxyDiscoveryManager, ProxyOperationManager>
             proxyOperationManagerCreator = (
                 string source,
                 ProxyDiscoveryManager proxyDiscoveryManager) =>
@@ -521,115 +531,268 @@ public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
                 var proxyOperationManager = TestSessionPool.Instance.TryTakeProxy(
                     testSessionInfo,
                     source,
-                    discoveryCriteria.RunSettings);
+                    _discoveryCriteria.RunSettings,
+                    _mockRequestData.Object);
 
-                return proxyOperationManager;
+                return proxyOperationManager!;
             };
 
-            var testDiscoveryManager = new ProxyDiscoveryManager(
-                testSessionInfo,
-                proxyOperationManagerCreator);
+        var testDiscoveryManager = new ProxyDiscoveryManager(
+            testSessionInfo,
+            proxyOperationManagerCreator);
 
-            var mockTestSessionPool = new Mock<TestSessionPool>();
-            TestSessionPool.Instance = mockTestSessionPool.Object;
+        var mockTestSessionPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestSessionPool.Object;
 
-            try
-            {
-                var mockProxyOperationManager = new Mock<ProxyOperationManager>(
-                    this.mockRequestData.Object,
-                    this.mockRequestSender.Object,
-                    this.mockTestHostManager.Object);
-                mockTestSessionPool.Setup(
+        try
+        {
+            var mockProxyOperationManager = new Mock<ProxyOperationManager>(
+                _mockRequestData.Object,
+                _mockRequestSender.Object,
+                _mockTestHostManager.Object,
+                null);
+            mockTestSessionPool.Setup(
                     tsp => tsp.TryTakeProxy(
                         testSessionInfo,
                         It.IsAny<string>(),
-                        It.IsAny<string>()))
-                    .Returns(mockProxyOperationManager.Object);
+                        It.IsAny<string>(),
+                        _mockRequestData.Object))
+                .Returns(mockProxyOperationManager.Object);
 
-                testDiscoveryManager.Initialize(true);
-                testDiscoveryManager.DiscoverTests(
-                    discoveryCriteria,
-                    new Mock<ITestDiscoveryEventsHandler2>().Object);
+            testDiscoveryManager.Initialize(true);
+            testDiscoveryManager.DiscoverTests(
+                _discoveryCriteria,
+                new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-                mockTestSessionPool.Verify(
-                    tsp => tsp.TryTakeProxy(
-                        testSessionInfo,
-                        It.IsAny<string>(),
-                        It.IsAny<string>()),
-                    Times.Once);
-            }
-            finally
-            {
-                TestSessionPool.Instance = null;
-            }
+            mockTestSessionPool.Verify(
+                tsp => tsp.TryTakeProxy(
+                    testSessionInfo,
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    _mockRequestData.Object),
+                Times.Once);
+        }
+        finally
+        {
+            TestSessionPool.Instance = null;
         }
+    }
+
+    [TestMethod]
+    public void HandleDiscoveredTestsMarksDiscoveryStatus()
+    {
+        // Arrange
+        var localDiscoveryCriteria = new DiscoveryCriteria(new[] { "a" }, 1, string.Empty);
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-        private void InvokeAndVerifyDiscoverTests(bool skipDefaultAdapters)
+        // Marks 'a' as partially discovered
+        _discoveryManager.HandleDiscoveredTests(new TestCase[]
         {
-            TestPluginCache.Instance = null;
-            TestPluginCache.Instance.DefaultExtensionPaths = new List<string> { "default1.dll", "default2.dll" };
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "filterTestAdapter.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "unfilter.dll" }, true);
+            new() { Source = "a" },
+        });
 
-            try
-            {
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                var expectedResult = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, skipDefaultAdapters);
+        // Act
+        _discoveryManager.HandleDiscoveredTests(new TestCase[]
+        {
+            new() { Source = "b" },
+            new() { Source = "c" },
+            new() { Source = "c" },
+            new() { Source = "d" },
+        });
+
+        // Assert
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count);
+        CollectionAssert.AreEquivalent(
+            new List<string> { "d" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+        CollectionAssert.AreEquivalent(
+            new List<string> { "a", "b", "c" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+    }
 
-                this.testDiscoveryManager.Initialize(skipDefaultAdapters);
-                this.testDiscoveryManager.DiscoverTests(this.discoveryCriteria, null);
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void HandleDiscoveryCompleteWhenAbortedNoPastDiscoveryAndNoLastCunkNotifiesWithCorrectDiscovery(bool trueIsEmptyFalseIsNull)
+    {
+        // Arrange
+        var localDiscoveryCriteria = new DiscoveryCriteria(new[] { "a", "b" }, 1, string.Empty);
+        var eventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, eventHandler.Object);
+
+        var lastChunk = trueIsEmptyFalseIsNull
+            ? Enumerable.Empty<TestCase>()
+            : null;
+
+        // Act
+        _discoveryManager.HandleDiscoveryComplete(new(-1, true), lastChunk);
+
+        // Assert
+        CollectionAssert.AreEquivalent(
+            new[] { "a", "b" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered));
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count);
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count);
+    }
 
-                this.mockRequestSender.Verify(s => s.InitializeDiscovery(expectedResult), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
-        }
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void HandleDiscoveryCompleteWhenAbortedPastDiscoveryAndNoLastCunkNotifiesWithCorrectDiscovery(bool trueIsEmptyFalseIsNull)
+    {
+        // Arrange
+        var localDiscoveryCriteria = new DiscoveryCriteria(new[] { "a" }, 1, string.Empty);
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-        //private void SetupAndInitializeTestRequestSender()
-        //{
-        //    var connectionInfo = new TestHostConnectionInfo
-        //    {
-        //        Endpoint = IPAddress.Loopback + ":0",
-        //        Role = ConnectionRole.Client,
-        //        Transport = Transport.Sockets
-        //    };
-
-        //    this.mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
-        //    this.mockDataSerializer = new Mock<IDataSerializer>();
-        //    this.testRequestSender = new TestRequestSender(this.mockCommunicationEndpoint.Object, connectionInfo, this.mockDataSerializer.Object, this.protocolConfig, CLIENTPROCESSEXITWAIT);
-        //    this.mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() =>
-        //        {
-        //            this.mockCommunicationEndpoint.Raise(
-        //                s => s.Connected += null,
-        //                this.mockCommunicationEndpoint.Object,
-        //                new ConnectedEventArgs(this.mockChannel.Object));
-        //        });
-        //    this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, this.protocolConfig.Version);
-        //    this.testRequestSender.InitializeCommunication();
-
-        //    this.testDiscoveryManager = new ProxyDiscoveryManager(
-        //                                    this.mockRequestData.Object,
-        //                                    this.testRequestSender,
-        //                                    this.mockTestHostManager.Object,
-        //                                    this.mockDataSerializer.Object,
-        //                                    this.testableClientConnectionTimeout);
-        //}
-
-        //private void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
-        //{
-        //    this.mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
-        //                    .Callback(() => this.mockChannel.Raise(c => c.MessageReceived += null,  this.mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }));
-
-        //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
-        //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
-        //    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.Is<string>(s => s.Equals(messageType))))
-        //        .Returns(new Message { MessageType = returnMessageType });
-        //        this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.Is<Message>(m => m.MessageType.Equals(messageType))))
-        //        .Returns(returnPayload);
-        //}
+        _discoveryManager.HandleDiscoveredTests(new TestCase[]
+        {
+            new() { Source = "a" },
+            new() { Source = "b" },
+        });
+
+        var lastChunk = trueIsEmptyFalseIsNull
+            ? Enumerable.Empty<TestCase>()
+            : null;
+
+        // Act
+        _discoveryManager.HandleDiscoveryComplete(new(-1, true), lastChunk);
+
+        // Assert
+        CollectionAssert.AreEquivalent(
+            new[] { "a" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        CollectionAssert.AreEquivalent(
+            new[] { "b" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count);
     }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteWhenAbortedNoPastDiscoveryAndLastCunkNotifiesWithCorrectDiscovery()
+    {
+        // Arrange
+        var localDiscoveryCriteria = new DiscoveryCriteria(new[] { "a", "b" }, 1, string.Empty);
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, new Mock<ITestDiscoveryEventsHandler2>().Object);
+
+        var lastChunk = new TestCase[]
+        {
+            new() { Source = "c" },
+            new() { Source = "d" },
+        };
+
+        // Act
+        _discoveryManager.HandleDiscoveryComplete(new(-1, true), lastChunk);
+
+        // Assert
+        CollectionAssert.AreEquivalent(
+            new[] { "c" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        CollectionAssert.AreEquivalent(
+            new[] { "d" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+        CollectionAssert.AreEquivalent(
+            new[] { "a", "b" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered));
+    }
+
+    [TestMethod]
+    public void HandleDiscoveryCompleteWhenAbortedPastDiscoveryAndLastCunkNotifiesWithCorrectDiscovery()
+    {
+        // Arrange
+        var localDiscoveryCriteria = new DiscoveryCriteria(new[] { "a" }, 1, string.Empty);
+        _discoveryManager.DiscoverTests(localDiscoveryCriteria, new Mock<ITestDiscoveryEventsHandler2>().Object);
+
+        _discoveryManager.HandleDiscoveredTests(new TestCase[]
+        {
+            new() { Source = "a" },
+            new() { Source = "b" },
+        });
+
+        var lastChunk = new TestCase[]
+        {
+            new() { Source = "c" },
+            new() { Source = "d" },
+        };
+
+        // Act
+        _discoveryManager.HandleDiscoveryComplete(new(-1, true), lastChunk);
+
+        // Assert
+        CollectionAssert.AreEquivalent(
+            new[] { "a", "b", "c" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered));
+        CollectionAssert.AreEquivalent(
+            new[] { "d" },
+            _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered));
+        Assert.AreEqual(0, _discoveryDataAggregator.GetSourcesWithStatus(DiscoveryStatus.NotDiscovered).Count);
+    }
+
+    private void InvokeAndVerifyDiscoverTests(bool skipDefaultAdapters)
+    {
+        TestPluginCache.Instance = null;
+        // It's ok to use Instance. because on nulls, instance is re-instantiated.
+        TestPluginCache.Instance!.DefaultExtensionPaths = new List<string> { "default1.dll", "default2.dll" };
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "filterTestAdapter.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "unfilter.dll" }, true);
+
+        try
+        {
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, skipDefaultAdapters);
+
+            _discoveryManager.Initialize(skipDefaultAdapters);
+            _discoveryManager.DiscoverTests(_discoveryCriteria, null!);
+
+            _mockRequestSender.Verify(s => s.InitializeDiscovery(expectedResult), Times.Once);
+        }
+        finally
+        {
+            TestPluginCache.Instance = null;
+        }
+    }
+
+    //private void SetupAndInitializeTestRequestSender()
+    //{
+    //    var connectionInfo = new TestHostConnectionInfo
+    //    {
+    //        Endpoint = IPAddress.Loopback + ":0",
+    //        Role = ConnectionRole.Client,
+    //        Transport = Transport.Sockets
+    //    };
+
+    //    this.mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
+    //    this.mockDataSerializer = new Mock<IDataSerializer>();
+    //    this.testRequestSender = new TestRequestSender(this.mockCommunicationEndpoint.Object, connectionInfo, this.mockDataSerializer.Object, this.protocolConfig, CLIENTPROCESSEXITWAIT);
+    //    this.mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() =>
+    //        {
+    //            this.mockCommunicationEndpoint.Raise(
+    //                s => s.Connected += null,
+    //                this.mockCommunicationEndpoint.Object,
+    //                new ConnectedEventArgs(this.mockChannel.Object));
+    //        });
+    //    this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, this.protocolConfig.Version);
+    //    this.testRequestSender.InitializeCommunication();
+
+    //    this.testDiscoveryManager = new ProxyDiscoveryManager(
+    //                                    this.mockRequestData.Object,
+    //                                    this.testRequestSender,
+    //                                    this.mockTestHostManager.Object,
+    //                                    this.mockDataSerializer.Object,
+    //                                    this.testableClientConnectionTimeout);
+    //}
+
+    //private void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
+    //{
+    //    this.mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
+    //                    .Callback(() => this.mockChannel.Raise(c => c.MessageReceived += null,  this.mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }));
+
+    //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
+    //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
+    //    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.Is<string>(s => s.Equals(messageType))))
+    //        .Returns(new Message { MessageType = returnMessageType });
+    //        this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.Is<Message>(m => m.MessageType.Equals(messageType))))
+    //        .Returns(returnPayload);
+    //}
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerTests.cs
index dfe854a27e..286c193f53 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerTests.cs
@@ -1,754 +1,746 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyExecutionManagerTests : ProxyBaseManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
+    private readonly Mock<ITestRequestSender> _mockRequestSender;
+    private readonly Mock<TestRunCriteria> _mockTestRunCriteria;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IFileHelper> _mockFileHelper;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private ProxyExecutionManager _testExecutionManager;
 
-    using Moq;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+    //private Mock<IDataSerializer> mockDataSerializer;
 
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+    public ProxyExecutionManagerTests()
+    {
+        _mockRequestSender = new Mock<ITestRequestSender>();
+        _mockTestRunCriteria = new Mock<TestRunCriteria>(new List<string> { "source.dll" }, 10);
+        //this.mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+
+        _testExecutionManager = new ProxyExecutionManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataSerializer.Object, _mockFileHelper.Object);
+
+        //this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(null)).Returns(new Message());
+        //this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(string.Empty)).Returns(new Message());
+    }
 
-    [TestClass]
-    public class ProxyExecutionManagerTests : ProxyBaseManagerTests
+    [TestMethod]
+    public void StartTestRunShouldNotInitializeExtensionsOnNoExtensions()
     {
-        private readonly Mock<ITestRequestSender> mockRequestSender;
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-        private readonly Mock<TestRunCriteria> mockTestRunCriteria;
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-        private readonly Mock<IRequestData> mockRequestData;
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-        private Mock<IMetricsCollection> mockMetricsCollection;
+        _mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-        private Mock<IFileHelper> mockFileHelper;
+    [TestMethod]
+    public void StartTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-        private ProxyExecutionManager testExecutionManager;
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(_mockTestRunCriteria.Object.Sources!)).Returns(_mockTestRunCriteria.Object.Sources!);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-        //private Mock<IDataSerializer> mockDataSerializer;
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-        public ProxyExecutionManagerTests()
-        {
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockTestRunCriteria = new Mock<TestRunCriteria>(new List<string> { "source.dll" }, 10);
-            //this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-
-            this.testExecutionManager = new ProxyExecutionManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataSerializer.Object, this.mockFileHelper.Object);
-
-            //this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(null)).Returns(new Message());
-            //this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(string.Empty)).Returns(new Message());
-        }
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotInitializeExtensionsOnNoExtensions()
-        {
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(_mockTestRunCriteria.Object.Sources!), Times.Once);
+    }
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void StartTestRunShouldUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "inputPackage.appxrecipe" };
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+        var testRunCriteria = new TestRunCriteria(
+            new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), inputSource.First()) },
+            frequencyOfRunStatsChangeEvent: 10);
 
-            this.mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-        [TestMethod]
-        public void StartTestRunShouldAllowRuntimeProviderToUpdateAdapterSource()
-        {
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        _testExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
+
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
+        Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests!.FirstOrDefault()?.Source);
+    }
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(this.mockTestRunCriteria.Object.Sources)).Returns(this.mockTestRunCriteria.Object.Sources);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void StartTestRunShouldNotUpdateTestCaseSourceIfTestCaseSourceDoNotDifferFromTestHostManagerSource()
+    {
+        var actualSources = new List<string> { "actualSource.dll" };
+        var inputSource = new List<string> { "actualSource.dll" };
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var testRunCriteria = new TestRunCriteria(
+            new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), inputSource.First()) },
+            frequencyOfRunStatsChangeEvent: 10);
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(this.mockTestRunCriteria.Object.Sources), Times.Once);
-        }
+        _testExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldUpdateTestCaseSourceIfTestCaseSourceDiffersFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource = new List<string> { "inputPackage.appxrecipe" };
+        _mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
+        Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests!.FirstOrDefault()?.Source);
+    }
 
-            var testRunCriteria = new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), inputSource.FirstOrDefault()) },
-                    frequencyOfRunStatsChangeEvent: 10);
+    [TestMethod]
+    public void StartTestRunShouldNotInitializeExtensionsOnCommunicationFailure()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            this.testExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
-            Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests.FirstOrDefault().Source);
-        }
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-        [TestMethod]
-        public void StartTestRunShouldNotUpdateTestCaseSourceIfTestCaseSourceDoNotDifferFromTestHostManagerSource()
-        {
-            var actualSources = new List<string> { "actualSource.dll" };
-            var inputSource = new List<string> { "actualSource.dll" };
+        _mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-            var testRunCriteria = new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), inputSource.FirstOrDefault()) },
-                    frequencyOfRunStatsChangeEvent: 10);
+    [TestMethod]
+    public void StartTestRunShouldInitializeExtensionsIfPresent()
+    {
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-            this.mockTestHostManager.Setup(hm => hm.GetTestSources(inputSource)).Returns(actualSources);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true));
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new List<string>());
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        try
+        {
+            var extensions = new List<string>() { "C:\\foo.dll" };
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            _mockTestHostManager.Setup(x => x.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>()))
+                .Returns(extensions);
 
-            this.testExecutionManager.StartTestRun(testRunCriteria, mockTestRunEventsHandler.Object);
+            _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-            this.mockTestHostManager.Verify(hm => hm.GetTestSources(inputSource), Times.Once);
-            Assert.AreEqual(actualSources.FirstOrDefault(), testRunCriteria.Tests.FirstOrDefault().Source);
+            // Also verify that we have waited for client connection.
+            _mockRequestSender.Verify(s => s.InitializeExecution(extensions), Times.Once);
         }
-
-        [TestMethod]
-        public void StartTestRunShouldNotInitializeExtensionsOnCommunicationFailure()
+        finally
         {
-            // Make sure TestPlugincache is refreshed.
             TestPluginCache.Instance = null;
+        }
+    }
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+    [TestMethod]
+    public void StartTestRunShouldQueryTestHostManagerForExtensions()
+    {
+        TestPluginCache.Instance = null;
+        try
+        {
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "he1.dll", "c:\\e1.dll" });
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+            _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-            this.mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Never);
+            _mockRequestSender.Verify(s => s.InitializeExecution(new[] { "he1.dll", "c:\\e1.dll" }), Times.Once);
         }
-
-        [TestMethod]
-        public void StartTestRunShouldInitializeExtensionsIfPresent()
+        finally
         {
-            // Make sure TestPlugincache is refreshed.
             TestPluginCache.Instance = null;
+        }
+    }
 
-            try
-            {
-                var extensions = new List<string>() { "C:\\foo.dll" };
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                this.mockTestHostManager.Setup(x => x.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>()))
-                    .Returns(extensions);
+    [TestMethod]
+    public void StartTestRunShouldPassAdapterToTestHostManagerFromTestPluginCacheExtensions()
+    {
+        // We are updating extension with testadapter only to make it easy to test.
+        // In product code it filter out testadapter from extension
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
+        try
+        {
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
 
-                this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+            _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-                // Also verify that we have waited for client connection.
-                this.mockRequestSender.Verify(s => s.InitializeExecution(extensions), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
+            _mockTestHostManager.Verify(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), expectedResult), Times.Once);
         }
-
-        [TestMethod]
-        public void StartTestRunShouldQueryTestHostManagerForExtensions()
+        finally
         {
             TestPluginCache.Instance = null;
-            try
-            {
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "he1.dll", "c:\\e1.dll" });
-
-                this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
-
-                this.mockRequestSender.Verify(s => s.InitializeExecution(new[] { "he1.dll", "c:\\e1.dll" }), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
         }
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldPassAdapterToTestHostManagerFromTestPluginCacheExtensions()
-        {
-            // We are updating extension with testadapter only to make it easy to test.
-            // In product code it filter out testadapter from extension
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
-            try
-            {
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                var expectedResult = TestPluginCache.Instance.GetExtensionPaths(string.Empty);
+    [TestMethod]
+    public void StartTestRunShouldNotInitializeDefaultAdaptersIfSkipDefaultAdaptersIsTrue()
+    {
+        InvokeAndVerifyStartTestRun(true);
+    }
 
-                this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+    [TestMethod]
+    public void StartTestRunShouldInitializeDefaultAdaptersIfSkipDefaultAdaptersIsFalse()
+    {
+        InvokeAndVerifyStartTestRun(false);
+    }
 
-                this.mockTestHostManager.Verify(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), expectedResult), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
-        }
+    [TestMethod]
+    public void StartTestRunShouldIntializeTestHost()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
 
-        [TestMethod]
-        public void StartTestRunShouldNotInitializeDefaultAdaptersIfSkipDefaultAdaptersIsTrue()
-        {
-            InvokeAndVerifyStartTestRun(true);
-        }
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-        [TestMethod]
-        public void StartTestRunShouldInitializeDefaultAdaptersIfSkipDefaultAdaptersIsFalse()
-        {
-            InvokeAndVerifyStartTestRun(false);
-        }
+        _mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
+        _mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldIntializeTestHost()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void StartTestRunShouldNotSendStartTestRunRequestIfCommunicationFails()
+    {
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback(
+                () => _mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty)))
+            .Returns(Task.FromResult(false));
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
-            this.mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Make sure TestPlugincache is refreshed.
+        TestPluginCache.Instance = null;
 
-        [TestMethod]
-        public void StartTestRunShouldNotSendStartTestRunRequestIfCommunicationFails()
-        {
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback(
-                    () =>
-                        {
-                            this.mockTestHostManager.Raise(thm => thm.HostLaunched += null, new HostProviderEventArgs(string.Empty));
-                        })
-                .Returns(Task.FromResult(false));
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            // Make sure TestPlugincache is refreshed.
-            TestPluginCache.Instance = null;
+        _mockRequestSender.Verify(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithSources>(), It.IsAny<IInternalTestRunEventsHandler>()), Times.Never);
+    }
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+    [TestMethod]
+    public void StartTestRunShouldInitializeExtensionsIfTestHostIsNotShared()
+    {
+        TestPluginCache.Instance = null;
+        _mockTestHostManager.SetupGet(th => th.Shared).Returns(false);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "x.dll" });
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-            this.mockRequestSender.Verify(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithSources>(), It.IsAny<ITestRunEventsHandler>()), Times.Never);
-        }
+        _mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldInitializeExtensionsIfTestHostIsNotShared()
-        {
-            TestPluginCache.Instance = null;
-            this.mockTestHostManager.SetupGet(th => th.Shared).Returns(false);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns(new[] { "x.dll" });
+    [TestMethod]
+    public void StartTestRunShouldInitializeExtensionsWithExistingExtensionsOnly()
+    {
+        TestPluginCache.Instance = null;
+        TestPluginCache.Instance!.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "def.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
+        var expectedOutputPaths = new[] { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" };
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+        _mockTestHostManager.SetupGet(th => th.Shared).Returns(false);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions.Select(extension => Path.GetFileName(extension)));
 
-            this.mockRequestSender.Verify(s => s.InitializeExecution(It.IsAny<IEnumerable<string>>()), Times.Once);
-        }
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns((string extensionPath) => !extensionPath.Contains("def.TestAdapter.dll"));
 
-        [TestMethod]
-        public void StartTestRunShouldInitializeExtensionsWithExistingExtensionsOnly()
-        {
-            TestPluginCache.Instance = null;
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "abc.TestAdapter.dll", "def.TestAdapter.dll", "xyz.TestAdapter.dll" }, false);
-            var expectedOutputPaths = new[] { "abc.TestAdapter.dll", "xyz.TestAdapter.dll" };
+        _mockFileHelper.Setup(fh => fh.Exists("def.TestAdapter.dll")).Returns(false);
+        _mockFileHelper.Setup(fh => fh.Exists("xyz.TestAdapter.dll")).Returns(true);
 
-            this.mockTestHostManager.SetupGet(th => th.Shared).Returns(false);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) =>
-            {
-                return extensions.Select(extension => { return Path.GetFileName(extension); });
-            });
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns((string extensionPath) =>
-            {
-                return !extensionPath.Contains("def.TestAdapter.dll");
-            });
+        _mockRequestSender.Verify(s => s.InitializeExecution(expectedOutputPaths), Times.Once);
+    }
 
-            this.mockFileHelper.Setup(fh => fh.Exists("def.TestAdapter.dll")).Returns(false);
-            this.mockFileHelper.Setup(fh => fh.Exists("xyz.TestAdapter.dll")).Returns(true);
+    [TestMethod]
+    public void SetupChannelShouldThrowExceptionIfClientConnectionTimeout()
+    {
+        string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
 
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            this.mockRequestSender.Verify(s => s.InitializeExecution(expectedOutputPaths), Times.Once);
-        }
+        Assert.ThrowsException<TestPlatformException>(() => _testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings));
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldThrowExceptionIfClientConnectionTimeout()
-        {
-            string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    [TestMethod]
+    public void SetupChannelShouldThrowExceptionWithOneSourceIfTestHostExitedBeforeConnectionIsEstablished()
+    {
+        string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true)).Callback(() => _mockTestHostManager.Raise(t => t.HostExited += null, new HostProviderEventArgs("I crashed!")));
 
-            Assert.ThrowsException<TestPlatformException>(() => this.testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings));
-        }
+        Assert.AreEqual(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.Resources.TestHostExitedWithError, "source.dll", "I crashed!"), Assert.ThrowsException<TestPlatformException>(() => _testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings)).Message);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldThrowExceptionIfTestHostExitedBeforeConnectionIsEstablished()
-        {
-            string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    [TestMethod]
+    public void SetupChannelShouldThrowExceptionWithAllSourcesIfTestHostExitedBeforeConnectionIsEstablished()
+    {
+        string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true)).Callback(() => { this.mockTestHostManager.Raise(t => t.HostExited += null, new HostProviderEventArgs("I crashed!")); });
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(true)).Callback(() => _mockTestHostManager.Raise(t => t.HostExited += null, new HostProviderEventArgs("I crashed!")));
 
-            Assert.AreEqual(string.Format(CrossPlatEngineResources.Resources.TestHostExitedWithError, "I crashed!"), Assert.ThrowsException<TestPlatformException>(() => this.testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings)).Message);
-        }
+        Assert.AreEqual(string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.Resources.TestHostExitedWithError, string.Join("', '", ["source1.dll", "source2.dll"]), "I crashed!"), Assert.ThrowsException<TestPlatformException>(() => _testExecutionManager.SetupChannel(new List<string> { "source1.dll", "source2.dll" }, runsettings)).Message);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleTestRunComplete()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleTestRunComplete()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted == true), null, null, null));
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleTestRunComplete(It.Is<TestRunCompleteEventArgs>(t => t.IsAborted == true), null, null, null));
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageOfTestRunComplete()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageOfTestRunComplete()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.ExecutionComplete))), Times.Once);
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.ExecutionComplete))), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageOfTestMessage()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageOfTestMessage()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.Is<string>(str => str.Contains(MessageType.TestMessage))));
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleLogMessageOfError()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleLogMessageOfError()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageAndHandleLogMessage()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+    [TestMethod]
+    public void StartTestRunShouldCatchExceptionAndCallHandleRawMessageAndHandleLogMessage()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.IsAny<string>()));
-            mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()));
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleRawMessage(It.IsAny<string>()));
+        mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()));
+    }
 
-        [TestMethod]
-        public void StartTestRunForCancelRequestShouldHandleLogMessageWithProperErrorMessage()
-        {
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.testExecutionManager.Cancel(mockTestRunEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunForCancelRequestShouldHandleLogMessageWithProperErrorMessage()
+    {
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        _testExecutionManager.Cancel(mockTestRunEventsHandler.Object);
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, "Cancelling the operation as requested."));
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, "Cancelling the operation as requested."));
+    }
 
-        [TestMethod]
-        public void StartTestRunForAnExceptionDuringLaunchOfTestShouldHandleLogMessageWithProperErrorMessage()
-        {
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Throws(new Exception("DummyException"));
+    [TestMethod]
+    public void StartTestRunForAnExceptionDuringLaunchOfTestShouldHandleLogMessageWithProperErrorMessage()
+    {
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Throws(new Exception("DummyException"));
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(str => str.StartsWith("Failed to launch testhost with error: System.Exception: DummyException"))));
-        }
+        mockTestRunEventsHandler.Verify(s => s.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(str => str.StartsWith("Failed to launch testhost with error: System.Exception: DummyException"))));
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldInitiateTestRunForSourcesThroughTheServer()
-        {
-            TestRunCriteriaWithSources testRunCriteriaPassed = null;
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            this.mockRequestSender.Setup(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithSources>(), this.testExecutionManager))
-                .Callback(
-                    (TestRunCriteriaWithSources criteria, ITestRunEventsHandler sink) =>
-                        {
-                            testRunCriteriaPassed = criteria;
-                        });
-
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
-
-            Assert.IsNotNull(testRunCriteriaPassed);
-            CollectionAssert.AreEqual(this.mockTestRunCriteria.Object.AdapterSourceMap.Keys, testRunCriteriaPassed.AdapterSourceMap.Keys);
-            CollectionAssert.AreEqual(this.mockTestRunCriteria.Object.AdapterSourceMap.Values, testRunCriteriaPassed.AdapterSourceMap.Values);
-            Assert.AreEqual(this.mockTestRunCriteria.Object.FrequencyOfRunStatsChangeEvent, testRunCriteriaPassed.TestExecutionContext.FrequencyOfRunStatsChangeEvent);
-            Assert.AreEqual(this.mockTestRunCriteria.Object.RunStatsChangeEventTimeout, testRunCriteriaPassed.TestExecutionContext.RunStatsChangeEventTimeout);
-            Assert.AreEqual(this.mockTestRunCriteria.Object.TestRunSettings, testRunCriteriaPassed.RunSettings);
-        }
+    [TestMethod]
+    public void StartTestRunShouldInitiateTestRunForSourcesThroughTheServer()
+    {
+        TestRunCriteriaWithSources? testRunCriteriaPassed = null;
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestSender.Setup(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithSources>(), _testExecutionManager))
+            .Callback(
+                (TestRunCriteriaWithSources criteria, IInternalTestRunEventsHandler sink) => testRunCriteriaPassed = criteria);
+
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
+
+        Assert.IsNotNull(testRunCriteriaPassed);
+        CollectionAssert.AreEqual(_mockTestRunCriteria.Object.AdapterSourceMap!.Keys, testRunCriteriaPassed.AdapterSourceMap.Keys);
+        CollectionAssert.AreEqual(_mockTestRunCriteria.Object.AdapterSourceMap.Values, testRunCriteriaPassed.AdapterSourceMap.Values);
+        Assert.AreEqual(_mockTestRunCriteria.Object.FrequencyOfRunStatsChangeEvent, testRunCriteriaPassed.TestExecutionContext!.FrequencyOfRunStatsChangeEvent);
+        Assert.AreEqual(_mockTestRunCriteria.Object.RunStatsChangeEventTimeout, testRunCriteriaPassed.TestExecutionContext.RunStatsChangeEventTimeout);
+        Assert.AreEqual(_mockTestRunCriteria.Object.TestRunSettings, testRunCriteriaPassed.RunSettings);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldInitiateTestRunForTestsThroughTheServer()
-        {
-            TestRunCriteriaWithTests testRunCriteriaPassed = null;
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-            this.mockRequestSender.Setup(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithTests>(), this.testExecutionManager))
-                .Callback(
-                    (TestRunCriteriaWithTests criteria, ITestRunEventsHandler sink) =>
-                    {
-                        testRunCriteriaPassed = criteria;
-                    });
-            var runCriteria = new Mock<TestRunCriteria>(
-                                            new List<TestCase> { new TestCase("A.C.M", new System.Uri("executor://dummy"), "source.dll") },
-                                            10);
-
-            this.testExecutionManager.StartTestRun(runCriteria.Object, null);
-
-            Assert.IsNotNull(testRunCriteriaPassed);
-            CollectionAssert.AreEqual(runCriteria.Object.Tests.ToList(), testRunCriteriaPassed.Tests.ToList());
-            Assert.AreEqual(
-                runCriteria.Object.FrequencyOfRunStatsChangeEvent,
-                testRunCriteriaPassed.TestExecutionContext.FrequencyOfRunStatsChangeEvent);
-            Assert.AreEqual(
-                runCriteria.Object.RunStatsChangeEventTimeout,
-                testRunCriteriaPassed.TestExecutionContext.RunStatsChangeEventTimeout);
-            Assert.AreEqual(
-                runCriteria.Object.TestRunSettings,
-                testRunCriteriaPassed.RunSettings);
-        }
+    [TestMethod]
+    public void StartTestRunShouldInitiateTestRunForTestsThroughTheServer()
+    {
+        TestRunCriteriaWithTests? testRunCriteriaPassed = null;
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestSender.Setup(s => s.StartTestRun(It.IsAny<TestRunCriteriaWithTests>(), _testExecutionManager))
+            .Callback(
+                (TestRunCriteriaWithTests criteria, IInternalTestRunEventsHandler sink) => testRunCriteriaPassed = criteria);
+        var runCriteria = new Mock<TestRunCriteria>(
+            new List<TestCase> { new("A.C.M", new Uri("executor://dummy"), "source.dll") },
+            10);
+
+        _testExecutionManager.StartTestRun(runCriteria.Object, null!);
+
+        Assert.IsNotNull(testRunCriteriaPassed);
+        CollectionAssert.AreEqual(runCriteria.Object.Tests!.ToList(), testRunCriteriaPassed.Tests.ToList());
+        Assert.AreEqual(
+            runCriteria.Object.FrequencyOfRunStatsChangeEvent,
+            testRunCriteriaPassed.TestExecutionContext!.FrequencyOfRunStatsChangeEvent);
+        Assert.AreEqual(
+            runCriteria.Object.RunStatsChangeEventTimeout,
+            testRunCriteriaPassed.TestExecutionContext.RunStatsChangeEventTimeout);
+        Assert.AreEqual(
+            runCriteria.Object.TestRunSettings,
+            testRunCriteriaPassed.RunSettings);
+    }
 
-        [TestMethod]
-        public void CloseShouldSignalToServerSessionEndIfTestHostWasLaunched()
-        {
-            string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    [TestMethod]
+    public void CloseShouldSignalToServerSessionEndIfTestHostWasLaunched()
+    {
+        string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings);
+        _testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings);
 
-            this.testExecutionManager.Close();
+        _testExecutionManager.Close();
 
-            this.mockRequestSender.Verify(s => s.EndSession(), Times.Once);
-        }
+        _mockRequestSender.Verify(s => s.EndSession(), Times.Once);
+    }
 
-        [TestMethod]
-        public void CloseShouldNotSendSignalToServerSessionEndIfTestHostWasNotLaunched()
-        {
-            this.testExecutionManager.Close();
+    [TestMethod]
+    public void CloseShouldNotSendSignalToServerSessionEndIfTestHostWasNotLaunched()
+    {
+        _testExecutionManager.Close();
 
-            this.mockRequestSender.Verify(s => s.EndSession(), Times.Never);
-        }
+        _mockRequestSender.Verify(s => s.EndSession(), Times.Never);
+    }
 
-        [TestMethod]
-        public void CloseShouldSignalServerSessionEndEachTime()
-        {
-            string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    [TestMethod]
+    public void CloseShouldSignalServerSessionEndEachTime()
+    {
+        string runsettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            this.testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings);
+        _testExecutionManager.SetupChannel(new List<string> { "source.dll" }, runsettings);
 
-            this.testExecutionManager.Close();
-            this.testExecutionManager.Close();
+        _testExecutionManager.Close();
+        _testExecutionManager.Close();
 
-            this.mockRequestSender.Verify(s => s.EndSession(), Times.Exactly(2));
-        }
+        _mockRequestSender.Verify(s => s.EndSession(), Times.Exactly(2));
+    }
 
-        [TestMethod]
-        public void CancelShouldNotSendSendTestRunCancelIfCommunicationFails()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+    [TestMethod]
+    public void CancelShouldNotSendSendTestRunCancelIfCommunicationFails()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            this.testExecutionManager.Cancel(It.IsAny<ITestRunEventsHandler>());
+        _testExecutionManager.Cancel(It.IsAny<IInternalTestRunEventsHandler>());
 
-            this.mockRequestSender.Verify(s => s.SendTestRunCancel(), Times.Never);
-        }
+        _mockRequestSender.Verify(s => s.SendTestRunCancel(), Times.Never);
+    }
 
-        [TestMethod]
-        public void AbortShouldSendTestRunAbortIfCommunicationSuccessful()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void AbortShouldSendTestRunAbortIfCommunicationSuccessful()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            this.testExecutionManager.Abort(It.IsAny<ITestRunEventsHandler>());
+        _testExecutionManager.Abort(It.IsAny<IInternalTestRunEventsHandler>());
 
-            this.mockRequestSender.Verify(s => s.SendTestRunAbort(), Times.Once);
-        }
+        _mockRequestSender.Verify(s => s.SendTestRunAbort(), Times.Once);
+    }
 
-        [TestMethod]
-        public void AbortShouldNotSendTestRunAbortIfCommunicationFails()
-        {
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+    [TestMethod]
+    public void AbortShouldNotSendTestRunAbortIfCommunicationFails()
+    {
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            this.testExecutionManager.Abort(It.IsAny<ITestRunEventsHandler>());
+        _testExecutionManager.Abort(It.IsAny<IInternalTestRunEventsHandler>());
 
-            this.mockRequestSender.Verify(s => s.SendTestRunAbort(), Times.Never);
-        }
+        _mockRequestSender.Verify(s => s.SendTestRunAbort(), Times.Never);
+    }
 
-        [TestMethod]
-        public void ExecuteTestsCloseTestHostIfRawMessageIfOfTypeExecutionComplete()
-        {
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+    [TestMethod]
+    public void ExecuteTestsCloseTestHostIfRawMessageIfOfTypeExecutionComplete()
+    {
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
 
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
-            this.mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.TestMessage, It.IsAny<TestMessagePayload>())).Returns(MessageType.TestMessage);
+        _mockDataSerializer.Setup(ds => ds.SerializePayload(MessageType.ExecutionComplete, It.IsAny<TestRunCompletePayload>())).Returns(MessageType.ExecutionComplete);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) =>
+        {
+            var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
+            var message = new Message
             {
-                var messageType = rawMessage.Contains(MessageType.ExecutionComplete) ? MessageType.ExecutionComplete : MessageType.TestMessage;
-                var message = new Message
-                {
-                    MessageType = messageType
-                };
+                MessageType = messageType
+            };
 
-                return message;
-            });
+            return message;
+        });
 
-            // Act.
-            this.testExecutionManager.StartTestRun(mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        // Act.
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-            // Verify
-            this.mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Verify
+        _mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void ExecuteTestsShouldNotCloseTestHostIfRawMessageIsNotOfTypeExecutionComplete()
-        {
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+    [TestMethod]
+    public void ExecuteTestsShouldNotCloseTestHostIfRawMessageIsNotOfTypeExecutionComplete()
+    {
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
+        {
+            var message = new Message
             {
-                var message = new Message
-                {
-                    MessageType = MessageType.ExecutionInitialize
-                };
+                MessageType = MessageType.ExecutionInitialize
+            };
+
+            return message;
+        });
+
+        // Act.
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
 
-                return message;
+        // Verify
+        _mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void ExecutionManagerShouldPassOnTestRunStatsChange()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        var runCriteria = new Mock<TestRunCriteria>(
+            new List<TestCase> { new("A.C.M", new Uri("executor://dummy"), "source.dll") },
+            10);
+        var testRunChangedArgs = new TestRunChangedEventArgs(null, null, null);
+
+        _testExecutionManager = GetProxyExecutionManager();
+
+        var completePayload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = null,
+            RunAttachments = null,
+            TestRunCompleteArgs = null
+        };
+        var completeMessage = new Message() { MessageType = MessageType.ExecutionComplete, Payload = null };
+        SetupChannelMessage(MessageType.StartTestExecutionWithTests, MessageType.TestRunStatsChange, testRunChangedArgs);
+
+        mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback(
+            () =>
+            {
+                _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
+                _mockDataSerializer.Setup(ds => ds.DeserializePayload<TestRunCompletePayload>(completeMessage)).Returns(completePayload);
+                _mockDataSerializer.Setup(ds => ds.SerializeMessage(It.IsAny<string>()))
+                    .Returns(MessageType.SessionEnd);
+                RaiseMessageReceived(MessageType.ExecutionComplete);
             });
 
-            // Act.
-            this.testExecutionManager.StartTestRun(mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        var waitHandle = new AutoResetEvent(false);
+        mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunComplete(
+            It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(),
+            It.IsAny<ICollection<AttachmentSet>>(),
+            It.IsAny<ICollection<string>>())).Callback(() => waitHandle.Set());
 
-            // Verify
-            this.mockTestHostManager.Verify(mthm => mthm.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Never);
-        }
+        // Act.
+        _testExecutionManager.StartTestRun(runCriteria.Object, mockTestRunEventsHandler.Object);
+        waitHandle.WaitOne();
 
-        [TestMethod]
-        public void ExecutionManagerShouldPassOnTestRunStatsChange()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var runCriteria = new Mock<TestRunCriteria>(
-                new List<TestCase> { new TestCase("A.C.M", new System.Uri("executor://dummy"), "source.dll") },
-                10);
-            var testRunChangedArgs = new TestRunChangedEventArgs(null, null, null);
+        // Verify
+        mockTestRunEventsHandler.Verify(mtdeh => mtdeh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
+    }
 
-            this.testExecutionManager = this.GetProxyExecutionManager();
+    [TestMethod]
+    public void ExecutionManagerShouldPassOnHandleLogMessage()
+    {
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
 
-            var completePayload = new TestRunCompletePayload()
+        _mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
+        {
+            var message = new Message
             {
-                ExecutorUris = null,
-                LastRunTests = null,
-                RunAttachments = null,
-                TestRunCompleteArgs = null
+                MessageType = MessageType.TestMessage
             };
-            var completeMessage = new Message() { MessageType = MessageType.ExecutionComplete, Payload = null };
-            this.SetupChannelMessage(MessageType.StartTestExecutionWithTests, MessageType.TestRunStatsChange, testRunChangedArgs);
-
-            mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback(
-                () =>
-                {
-                    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
-                    this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TestRunCompletePayload>(completeMessage)).Returns(completePayload);
-                    this.mockDataSerializer.Setup(ds => ds.SerializeMessage(It.IsAny<string>()))
-                        .Returns(MessageType.SessionEnd);
-                    this.RaiseMessageReceived(MessageType.ExecutionComplete);
-                });
-
-            var waitHandle = new AutoResetEvent(false);
-            mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunComplete(
-                It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(),
-                It.IsAny<ICollection<AttachmentSet>>(),
-                It.IsAny<ICollection<string>>())).Callback(() => waitHandle.Set());
-
-            // Act.
-            this.testExecutionManager.StartTestRun(runCriteria.Object, mockTestRunEventsHandler.Object);
-            waitHandle.WaitOne();
-
-            // Verify
-            mockTestRunEventsHandler.Verify(mtdeh => mtdeh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
-        }
 
-        [TestMethod]
-        public void ExecutionManagerShouldPassOnHandleLogMessage()
-        {
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(false);
+            return message;
+        });
 
-            this.mockDataSerializer.Setup(mds => mds.DeserializeMessage(It.IsAny<string>())).Returns(() =>
-            {
-                var message = new Message
-                {
-                    MessageType = MessageType.TestMessage
-                };
+        // Act.
+        _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+
+        // Verify
+        mockTestRunEventsHandler.Verify(mtdeh => mtdeh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once);
+    }
 
-                return message;
+    [TestMethod]
+    public void ExecutionManagerShouldPassOnLaunchProcessWithDebuggerAttached()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        Mock<IInternalTestRunEventsHandler> mockTestRunEventsHandler = new();
+        var runCriteria = new Mock<TestRunCriteria>(
+            new List<TestCase> { new("A.C.M", new Uri("executor://dummy"), "source.dll") },
+            10);
+        var payload = new TestProcessStartInfo();
+
+        _testExecutionManager = GetProxyExecutionManager();
+
+        var completePayload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = null,
+            RunAttachments = null,
+            TestRunCompleteArgs = null
+        };
+        var completeMessage = new Message() { MessageType = MessageType.ExecutionComplete, Payload = null };
+        SetupChannelMessage(MessageType.StartTestExecutionWithTests,
+            MessageType.LaunchAdapterProcessWithDebuggerAttached, payload);
+
+        mockTestRunEventsHandler.Setup(mh => mh.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>())).Callback(
+            () =>
+            {
+                _mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
+                _mockDataSerializer.Setup(ds => ds.DeserializePayload<TestRunCompletePayload>(completeMessage)).Returns(completePayload);
+                _mockDataSerializer.Setup(ds => ds.SerializeMessage(It.IsAny<string>()))
+                    .Returns(MessageType.SessionEnd);
+                RaiseMessageReceived(MessageType.ExecutionComplete);
             });
 
-            // Act.
-            this.testExecutionManager.StartTestRun(mockTestRunCriteria.Object, mockTestRunEventsHandler.Object);
+        var waitHandle = new AutoResetEvent(false);
+        mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunComplete(
+            It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(),
+            It.IsAny<ICollection<AttachmentSet>>(),
+            It.IsAny<ICollection<string>>())).Callback(() => waitHandle.Set());
 
-            // Verify
-            mockTestRunEventsHandler.Verify(mtdeh => mtdeh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once);
-        }
+        _testExecutionManager.StartTestRun(runCriteria.Object, mockTestRunEventsHandler.Object);
 
-        [TestMethod]
-        public void ExecutionManagerShouldPassOnLaunchProcessWithDebuggerAttached()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            Mock<ITestRunEventsHandler> mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var runCriteria = new Mock<TestRunCriteria>(
-                new List<TestCase> { new TestCase("A.C.M", new System.Uri("executor://dummy"), "source.dll") },
-                10);
-            var payload = new TestProcessStartInfo();
-
-            this.testExecutionManager = this.GetProxyExecutionManager();
+        waitHandle.WaitOne();
 
-            var completePayload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = null,
-                RunAttachments = null,
-                TestRunCompleteArgs = null
-            };
-            var completeMessage = new Message() { MessageType = MessageType.ExecutionComplete, Payload = null };
-            this.SetupChannelMessage(MessageType.StartTestExecutionWithTests,
-                MessageType.LaunchAdapterProcessWithDebuggerAttached, payload);
-
-            mockTestRunEventsHandler.Setup(mh => mh.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>())).Callback(
-                () =>
-                {
-                    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
-                    this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TestRunCompletePayload>(completeMessage)).Returns(completePayload);
-                    this.mockDataSerializer.Setup(ds => ds.SerializeMessage(It.IsAny<string>()))
-                        .Returns(MessageType.SessionEnd);
-                    this.RaiseMessageReceived(MessageType.ExecutionComplete);
-                });
-
-            var waitHandle = new AutoResetEvent(false);
-            mockTestRunEventsHandler.Setup(mh => mh.HandleTestRunComplete(
-                It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(),
-                It.IsAny<ICollection<AttachmentSet>>(),
-                It.IsAny<ICollection<string>>())).Callback(() => waitHandle.Set());
-
-            this.testExecutionManager.StartTestRun(runCriteria.Object, mockTestRunEventsHandler.Object);
-
-            waitHandle.WaitOne();
-
-            // Verify
-            mockTestRunEventsHandler.Verify(mtdeh => mtdeh.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()), Times.Once);
-        }
+        // Verify
+        mockTestRunEventsHandler.Verify(mtdeh => mtdeh.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
-        {
-            var testSessionInfo = new TestSessionInfo();
+    [TestMethod]
+    public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
+    {
+        var testSessionInfo = new TestSessionInfo();
 
-            Func<string, ProxyExecutionManager, ProxyOperationManager>
+        Func<string, ProxyExecutionManager, ProxyOperationManager>
             proxyOperationManagerCreator = (
                 string source,
                 ProxyExecutionManager proxyExecutionManager) =>
@@ -756,117 +748,84 @@ public void StartTestRunShouldAttemptToTakeProxyFromPoolIfProxyIsNull()
                 var proxyOperationManager = TestSessionPool.Instance.TryTakeProxy(
                     testSessionInfo,
                     source,
-                    string.Empty);
+                    string.Empty,
+                    _mockRequestData.Object);
 
-                return proxyOperationManager;
+                return proxyOperationManager!;
             };
 
-            var testExecutionManager = new ProxyExecutionManager(
-                testSessionInfo,
-                proxyOperationManagerCreator,
-                false);
+        var testExecutionManager = new ProxyExecutionManager(
+            testSessionInfo,
+            proxyOperationManagerCreator,
+            false);
 
-            var mockTestSessionPool = new Mock<TestSessionPool>();
-            TestSessionPool.Instance = mockTestSessionPool.Object;
+        var mockTestSessionPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestSessionPool.Object;
 
-            try
-            {
-                var mockProxyOperationManager = new Mock<ProxyOperationManager>(
-                    this.mockRequestData.Object,
-                    this.mockRequestSender.Object,
-                    this.mockTestHostManager.Object);
-                mockTestSessionPool.Setup(
+        try
+        {
+            var mockProxyOperationManager = new Mock<ProxyOperationManager>(
+                _mockRequestData.Object,
+                _mockRequestSender.Object,
+                _mockTestHostManager.Object,
+                null);
+            mockTestSessionPool.Setup(
                     tsp => tsp.TryTakeProxy(
                         testSessionInfo,
                         It.IsAny<string>(),
-                        It.IsAny<string>()))
-                    .Returns(mockProxyOperationManager.Object);
+                        It.IsAny<string>(),
+                        _mockRequestData.Object))
+                .Returns(mockProxyOperationManager.Object);
 
-                testExecutionManager.Initialize(true);
-                testExecutionManager.StartTestRun(
-                    this.mockTestRunCriteria.Object,
-                    new Mock<ITestRunEventsHandler>().Object);
+            testExecutionManager.Initialize(true);
+            testExecutionManager.StartTestRun(
+                _mockTestRunCriteria.Object,
+                new Mock<IInternalTestRunEventsHandler>().Object);
 
-                mockTestSessionPool.Verify(
-                    tsp => tsp.TryTakeProxy(
-                        testSessionInfo,
-                        It.IsAny<string>(),
-                        It.IsAny<string>()),
-                    Times.Once);
-            }
-            finally
-            {
-                TestSessionPool.Instance = null;
-            }
+            mockTestSessionPool.Verify(
+                tsp => tsp.TryTakeProxy(
+                    testSessionInfo,
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    _mockRequestData.Object),
+                Times.Once);
         }
-
-        private void SignalEvent(ManualResetEvent manualResetEvent)
+        finally
         {
-            // Wait for the 100 ms.
-            Task.Delay(200).Wait();
-
-            manualResetEvent.Set();
+            TestSessionPool.Instance = null;
         }
+    }
 
-        private void InvokeAndVerifyStartTestRun(bool skipDefaultAdapters)
-        {
-            TestPluginCache.Instance = null;
-            TestPluginCache.Instance.DefaultExtensionPaths = new List<string> { "default1.dll", "default2.dll" };
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "filterTestAdapter.dll" }, false);
-            TestPluginCache.Instance.UpdateExtensions(new List<string> { "unfilter.dll" }, true);
+    private static void SignalEvent(ManualResetEvent manualResetEvent)
+    {
+        // Wait for the 100 ms.
+        Task.Delay(200).Wait();
 
-            try
-            {
-                this.mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-                this.mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions);
-                this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
-                var expectedResult = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, skipDefaultAdapters);
+        manualResetEvent.Set();
+    }
 
-                this.testExecutionManager.Initialize(skipDefaultAdapters);
-                this.testExecutionManager.StartTestRun(this.mockTestRunCriteria.Object, null);
+    private void InvokeAndVerifyStartTestRun(bool skipDefaultAdapters)
+    {
+        TestPluginCache.Instance = null;
+        TestPluginCache.Instance!.DefaultExtensionPaths = new List<string> { "default1.dll", "default2.dll" };
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "filterTestAdapter.dll" }, false);
+        TestPluginCache.Instance.UpdateExtensions(new List<string> { "unfilter.dll" }, true);
 
-                this.mockRequestSender.Verify(s => s.InitializeExecution(expectedResult), Times.Once);
-            }
-            finally
-            {
-                TestPluginCache.Instance = null;
-            }
-        }
+        try
+        {
+            _mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+            _mockTestHostManager.Setup(th => th.GetTestPlatformExtensions(It.IsAny<IEnumerable<string>>(), It.IsAny<IEnumerable<string>>())).Returns((IEnumerable<string> sources, IEnumerable<string> extensions) => extensions);
+            _mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(true);
+            var expectedResult = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, skipDefaultAdapters);
+
+            _testExecutionManager.Initialize(skipDefaultAdapters);
+            _testExecutionManager.StartTestRun(_mockTestRunCriteria.Object, null!);
 
-        //private void SetupReceiveRawMessageAsyncAndDeserializeMessageAndInitialize()
-        //{
-        //    var connectionInfo = new TestHostConnectionInfo
-        //    {
-        //        Endpoint = IPAddress.Loopback + ":0",
-        //        Role = ConnectionRole.Client,
-        //        Transport = Transport.Sockets
-        //    };
-        //    this.mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
-        //    this.mockDataSerializer = new Mock<IDataSerializer>();
-        //    this.testRequestSender = new TestRequestSender(this.mockCommunicationEndpoint.Object, connectionInfo, this.mockDataSerializer.Object, this.protocolConfig, CLIENTPROCESSEXITWAIT);
-        //    this.mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() =>
-        //    {
-        //        this.mockCommunicationEndpoint.Raise(
-        //            s => s.Connected += null,
-        //            this.mockCommunicationEndpoint.Object,
-        //            new ConnectedEventArgs(this.mockChannel.Object));
-        //    });
-        //    this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, this.protocolConfig.Version);
-
-        //    this.testRequestSender.InitializeCommunication();
-
-        //    this.testExecutionManager = new ProxyExecutionManager(this.mockRequestData.Object, this.testRequestSender, this.mockTestHostManager.Object, this.mockDataSerializer.Object, this.clientConnectionTimeout);
-        //}
-
-        //private void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
-        //{
-        //    this.mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
-        //                    .Callback(() => this.mockChannel.Raise(c => c.MessageReceived += null, this.mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }));
-
-        //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
-        //    this.mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
-        //    this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.Is<string>(s => s.Equals(messageType)))).Returns(new Message { MessageType = returnMessageType });
-        //    this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TPayload>(It.Is<Message>(m => m.MessageType.Equals(messageType)))).Returns(returnPayload);
-        //}
+            _mockRequestSender.Verify(s => s.InitializeExecution(expectedResult), Times.Once);
+        }
+        finally
+        {
+            TestPluginCache.Instance = null;
+        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerWithDataCollectionTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerWithDataCollectionTests.cs
index b8e2819084..eaf3784085 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerWithDataCollectionTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyExecutionManagerWithDataCollectionTests.cs
@@ -1,232 +1,228 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyExecutionManagerWithDataCollectionTests
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class ProxyExecutionManagerWithDataCollectionTests
+    private readonly ProxyExecutionManager _testExecutionManager;
+    private readonly Mock<ITestRuntimeProvider> _mockTestHostManager;
+    private readonly Mock<ITestRequestSender> _mockRequestSender;
+    private readonly Mock<IProxyDataCollectionManager> _mockDataCollectionManager;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly ProxyExecutionManagerWithDataCollection _proxyExecutionManager;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+
+    public ProxyExecutionManagerWithDataCollectionTests()
     {
-        private ProxyExecutionManager testExecutionManager;
-
-        private Mock<ITestRuntimeProvider> mockTestHostManager;
-
-        private Mock<ITestRequestSender> mockRequestSender;
-
-        private Mock<IProxyDataCollectionManager> mockDataCollectionManager;
-
-        private Mock<IProcessHelper> mockProcessHelper;
+        _mockTestHostManager = new Mock<ITestRuntimeProvider>();
+        _mockRequestSender = new Mock<ITestRequestSender>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _testExecutionManager = new ProxyExecutionManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataSerializer.Object, _mockFileHelper.Object);
+        _mockDataCollectionManager = new Mock<IProxyDataCollectionManager>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataCollectionManager.Object);
+    }
 
-        private ProxyExecutionManagerWithDataCollection proxyExecutionManager;
+    [TestMethod]
+    public void InitializeShouldInitializeDataCollectionProcessIfDataCollectionIsEnabled()
+    {
+        _proxyExecutionManager.Initialize(false);
 
-        private Mock<IDataSerializer> mockDataSerializer;
+        _mockDataCollectionManager.Verify(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
+    }
 
-        private Mock<IRequestData> mockRequestData;
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfThrownByDataCollectionManager()
+    {
+        _mockDataCollectionManager.Setup(x => x.Initialize()).Throws<Exception>();
 
-        private Mock<IMetricsCollection> mockMetricsCollection;
+        Assert.ThrowsException<Exception>(() => _proxyExecutionManager.Initialize(false));
+    }
 
-        private Mock<IFileHelper> mockFileHelper;
+    [TestMethod]
+    public void InitializeShouldCallAfterTestRunIfExceptionIsThrownWhileCreatingDataCollectionProcess()
+    {
+        _mockDataCollectionManager.Setup(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Throws(new Exception("MyException"));
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockTestHostManager = new Mock<ITestRuntimeProvider>();
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.testExecutionManager = new ProxyExecutionManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataSerializer.Object, this.mockFileHelper.Object);
-            this.mockDataCollectionManager = new Mock<IProxyDataCollectionManager>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-        }
+        Assert.ThrowsException<Exception>(() => _proxyExecutionManager.Initialize(false));
 
-        [TestMethod]
-        public void InitializeShouldInitializeDataCollectionProcessIfDataCollectionIsEnabled()
-        {
-            this.proxyExecutionManager.Initialize(false);
+        _mockDataCollectionManager.Verify(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
+        _mockDataCollectionManager.Verify(dc => dc.AfterTestRunEnd(It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
+    }
 
-            mockDataCollectionManager.Verify(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
-        }
+    [TestMethod]
+    public void InitializeShouldSaveExceptionMessagesIfThrownByDataCollectionProcess()
+    {
+        var mockRequestSender = new Mock<IDataCollectionRequestSender>();
+        var testSources = new List<string>() { "abc.dll", "efg.dll" };
+        mockRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Throws(new Exception("MyException"));
+        mockRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
+
+        var mockDataCollectionLauncher = new Mock<IDataCollectionLauncher>();
+        var proxyDataCollectonManager = new ProxyDataCollectionManager(_mockRequestData.Object, string.Empty, testSources, mockRequestSender.Object, _mockProcessHelper.Object, mockDataCollectionLauncher.Object);
+
+        var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, proxyDataCollectonManager);
+        proxyExecutionManager.Initialize(false);
+        Assert.IsNotNull(proxyExecutionManager.DataCollectionRunEventsHandler.Messages);
+        Assert.AreEqual(TestMessageLevel.Error, proxyExecutionManager.DataCollectionRunEventsHandler.Messages[0].Item1);
+        StringAssert.Contains(proxyExecutionManager.DataCollectionRunEventsHandler.Messages[0].Item2, "MyException");
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfThrownByDataCollectionManager()
-        {
-            this.mockDataCollectionManager.Setup(x => x.Initialize()).Throws<Exception>();
+    [TestMethod]
+    public void UpdateTestProcessStartInfoShouldUpdateDataCollectionPortArg()
+    {
+        _mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.proxyExecutionManager.Initialize(false);
-            });
-        }
+        var testProcessStartInfo = new TestProcessStartInfo();
+        testProcessStartInfo.Arguments = string.Empty;
 
-        [TestMethod]
-        public void InitializeShouldCallAfterTestRunIfExceptionIsThrownWhileCreatingDataCollectionProcess()
-        {
-            mockDataCollectionManager.Setup(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Throws(new Exception("MyException"));
+        var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(_mockRequestSender.Object, _mockTestHostManager.Object, _mockDataCollectionManager.Object);
+        proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
 
-            Assert.ThrowsException<Exception>(() =>
-            {
-                this.proxyExecutionManager.Initialize(false);
-            });
+        Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--datacollectionport 0"));
+    }
 
-            mockDataCollectionManager.Verify(dc => dc.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
-            mockDataCollectionManager.Verify(dc => dc.AfterTestRunEnd(It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()), Times.Once);
-        }
+    [TestMethod]
+    public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgTrueIfTelemetryOptedIn()
+    {
+        var mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
 
-        [TestMethod]
-        public void InitializeShouldSaveExceptionMessagesIfThrownByDataCollectionProcess()
-        {
-            var mockRequestSender = new Mock<IDataCollectionRequestSender>();
-            var testSources = new List<string>() { "abc.dll", "efg.dll" };
-            mockRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Throws(new Exception("MyException"));
-            mockRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
-
-            var mockDataCollectionLauncher = new Mock<IDataCollectionLauncher>();
-            var proxyDataCollectonManager = new ProxyDataCollectionManager(this.mockRequestData.Object, string.Empty, testSources, mockRequestSender.Object, this.mockProcessHelper.Object, mockDataCollectionLauncher.Object);
-
-            var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, proxyDataCollectonManager);
-            proxyExecutionManager.Initialize(false);
-            Assert.IsNotNull(proxyExecutionManager.DataCollectionRunEventsHandler.Messages);
-            Assert.AreEqual(TestMessageLevel.Error, proxyExecutionManager.DataCollectionRunEventsHandler.Messages[0].Item1);
-            StringAssert.Contains(proxyExecutionManager.DataCollectionRunEventsHandler.Messages[0].Item2, "MyException");
-        }
+        _mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
 
-        [TestMethod]
-        public void UpdateTestProcessStartInfoShouldUpdateDataCollectionPortArg()
-        {
-            this.mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
+        var testProcessStartInfo = new TestProcessStartInfo();
+        testProcessStartInfo.Arguments = string.Empty;
 
-            var testProcessStartInfo = new TestProcessStartInfo();
-            testProcessStartInfo.Arguments = string.Empty;
+        var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, _mockDataCollectionManager.Object);
 
-            var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-            proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
+        // Act.
+        proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
 
-            Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--datacollectionport 0"));
-        }
+        // Verify.
+        Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--telemetryoptedin true"));
+    }
 
-        [TestMethod]
-        public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgTrueIfTelemetryOptedIn()
-        {
-            var mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
+    [TestMethod]
+    public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgFalseIfTelemetryOptedOut()
+    {
+        var mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(false);
 
-            this.mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
+        _mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
 
-            var testProcessStartInfo = new TestProcessStartInfo();
-            testProcessStartInfo.Arguments = string.Empty;
+        var testProcessStartInfo = new TestProcessStartInfo();
+        testProcessStartInfo.Arguments = string.Empty;
 
-            var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
+        var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, _mockDataCollectionManager.Object);
 
-            // Act.
-            proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
+        // Act.
+        proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
 
-            // Verify.
-            Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--telemetryoptedin true"));
-        }
+        // Verify.
+        Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--telemetryoptedin false"));
+    }
 
-        [TestMethod]
-        public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgFalseIfTelemetryOptedOut()
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldUpdateEnvironmentVariables()
+    {
+        // Setup
+        var mockRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        TestProcessStartInfo? launchedStartInfo = null;
+        mockRunEventsHandler.Setup(runHandler => runHandler.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>())).Callback
+            ((TestProcessStartInfo startInfo) => launchedStartInfo = startInfo);
+        var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataCollectionManager.Object);
+        var mockTestRunCriteria = new Mock<TestRunCriteria>(new List<string> { "source.dll" }, 10);
+        var testProcessStartInfo = new TestProcessStartInfo
         {
-            var mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(false);
-
-            this.mockDataCollectionManager.Setup(x => x.BeforeTestRunStart(It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(DataCollectionParameters.CreateDefaultParameterInstance());
-
-            var testProcessStartInfo = new TestProcessStartInfo();
-            testProcessStartInfo.Arguments = string.Empty;
+            Arguments = string.Empty,
+            EnvironmentVariables = new Dictionary<string, string?>
+            {
+                {"variable1", "value1" },
+                {"variable2", "value2" }
+            }
+        };
 
-            var proxyExecutionManager = new TestableProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
+        string raw1 = JsonDataSerializer.Instance.SerializePayload(MessageType.TelemetryEventMessage, new TelemetryEvent("aaa", new Dictionary<string, object>()));
+        string raw2 = JsonDataSerializer.Instance.SerializePayload(MessageType.TelemetryEventMessage, new TelemetryEvent("aaa", new Dictionary<string, object>()));
 
-            // Act.
-            proxyExecutionManager.UpdateTestProcessStartInfoWrapper(testProcessStartInfo);
+        proxyExecutionManager.DataCollectionRunEventsHandler.HandleRawMessage(raw1);
+        proxyExecutionManager.DataCollectionRunEventsHandler.HandleRawMessage(raw2);
 
-            // Verify.
-            Assert.IsTrue(testProcessStartInfo.Arguments.Contains("--telemetryoptedin false"));
-        }
+        // Act.
+        proxyExecutionManager.StartTestRun(mockTestRunCriteria.Object, mockRunEventsHandler.Object);
+        proxyExecutionManager.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldUpdateEnvironmentVariables()
+        // Verify.
+        Assert.IsTrue(launchedStartInfo != null, "Failed to get the start info");
+        foreach (var envVaribale in testProcessStartInfo.EnvironmentVariables)
         {
-            // Setup
-            var mockRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            TestProcessStartInfo launchedStartInfo = null;
-            mockRunEventsHandler.Setup(runHandler => runHandler.LaunchProcessWithDebuggerAttached(It.IsAny<TestProcessStartInfo>())).Callback
-                ((TestProcessStartInfo startInfo) => { launchedStartInfo = startInfo; });
-            var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
-            var mockTestRunCriteria = new Mock<TestRunCriteria>(new List<string> { "source.dll" }, 10);
-            var testProcessStartInfo = new TestProcessStartInfo
-            {
-                Arguments = string.Empty,
-                EnvironmentVariables = new Dictionary<string, string>
-                {
-                    {"variable1", "value1" },
-                    {"variable2", "value2" }
-                }
-            };
-
-            // Act.
-            proxyExecutionManager.StartTestRun(mockTestRunCriteria.Object, mockRunEventsHandler.Object);
-            proxyExecutionManager.LaunchProcessWithDebuggerAttached(testProcessStartInfo);
-
-            // Verify.
-            Assert.IsTrue(launchedStartInfo != null, "Failed to get the start info");
-            foreach (var envVaribale in testProcessStartInfo.EnvironmentVariables)
-            {
-                Assert.AreEqual(envVaribale.Value, launchedStartInfo.EnvironmentVariables[envVaribale.Key], $"Expected environment variable {envVaribale.Key} : {envVaribale.Value} not found");
-            }
+            Assert.AreEqual(envVaribale.Value, launchedStartInfo.EnvironmentVariables![envVaribale.Key], $"Expected environment variable {envVaribale.Key} : {envVaribale.Value} not found");
         }
 
-        [TestMethod]
-        public void TestHostManagerHostLaunchedTriggerShouldSendTestHostLaunchedEvent()
-        {
-            var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, this.mockDataCollectionManager.Object);
+        mockRunEventsHandler.Verify(r => r.HandleRawMessage(raw1));
+        mockRunEventsHandler.Verify(r => r.HandleRawMessage(raw2));
+        Assert.AreEqual(0, proxyExecutionManager.DataCollectionRunEventsHandler.RawMessages.Count);
+    }
 
-            this.mockTestHostManager.Raise(x => x.HostLaunched += null, new HostProviderEventArgs("launched", 0, 1234));
+    [TestMethod]
+    public void TestHostManagerHostLaunchedTriggerShouldSendTestHostLaunchedEvent()
+    {
+        var proxyExecutionManager = new ProxyExecutionManagerWithDataCollection(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, Framework.DefaultFramework, _mockDataCollectionManager.Object);
 
-            this.mockDataCollectionManager.Verify(x => x.TestHostLaunched(It.IsAny<int>()));
-        }
+        _mockTestHostManager.Raise(x => x.HostLaunched += null, new HostProviderEventArgs("launched", 0, 1234));
+
+        _mockDataCollectionManager.Verify(x => x.TestHostLaunched(It.IsAny<int>()));
     }
+}
 
-    internal class TestableProxyExecutionManagerWithDataCollection : ProxyExecutionManagerWithDataCollection
+internal class TestableProxyExecutionManagerWithDataCollection : ProxyExecutionManagerWithDataCollection
+{
+    public TestableProxyExecutionManagerWithDataCollection(ITestRequestSender testRequestSender, ITestRuntimeProvider testHostManager, IProxyDataCollectionManager proxyDataCollectionManager) : base(new RequestData { MetricsCollection = new NoOpMetricsCollection() }, testRequestSender, testHostManager, Framework.DefaultFramework, proxyDataCollectionManager)
     {
-        public TestableProxyExecutionManagerWithDataCollection(ITestRequestSender testRequestSender, ITestRuntimeProvider testHostManager, IProxyDataCollectionManager proxyDataCollectionManager) : base(new RequestData { MetricsCollection = new NoOpMetricsCollection() }, testRequestSender, testHostManager, proxyDataCollectionManager)
-        {
-        }
+    }
 
-        public TestableProxyExecutionManagerWithDataCollection(IRequestData requestData, ITestRequestSender testRequestSender, ITestRuntimeProvider testHostManager, IProxyDataCollectionManager proxyDataCollectionManager) : base(requestData, testRequestSender, testHostManager, proxyDataCollectionManager)
-        {
-        }
+    public TestableProxyExecutionManagerWithDataCollection(IRequestData requestData, ITestRequestSender testRequestSender, ITestRuntimeProvider testHostManager, IProxyDataCollectionManager proxyDataCollectionManager) : base(requestData, testRequestSender, testHostManager, Framework.DefaultFramework, proxyDataCollectionManager)
+    {
+    }
 
-        public TestProcessStartInfo UpdateTestProcessStartInfoWrapper(TestProcessStartInfo testProcessStartInfo)
-        {
-            return this.UpdateTestProcessStartInfo(testProcessStartInfo);
-        }
+    public TestProcessStartInfo UpdateTestProcessStartInfoWrapper(TestProcessStartInfo testProcessStartInfo)
+    {
+        return UpdateTestProcessStartInfo(testProcessStartInfo);
+    }
 
-        public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
-        {
-            return base.UpdateTestProcessStartInfo(testProcessStartInfo);
-        }
+    public override TestProcessStartInfo UpdateTestProcessStartInfo(TestProcessStartInfo testProcessStartInfo)
+    {
+        return base.UpdateTestProcessStartInfo(testProcessStartInfo);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs
index c1d95923f2..a38583a79e 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs
@@ -1,566 +1,599 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Client
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyOperationManagerTests : ProxyBaseManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.Linq;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
+    private const int Clientprocessexitwait = 10 * 1000;
 
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private static readonly int ConnectionTimeout = EnvironmentHelper.DefaultConnectionTimeout * 1000;
+    private static readonly string DefaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    private static readonly string TimoutErrorMessage =
+        "vstest.console process failed to connect to testhost process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
 
-    using Moq;
+    private readonly ProxyOperationManager _testOperationManager;
+    private readonly Mock<ITestRequestSender> _mockRequestSender;
+    private readonly Mock<IRequestData> _mockRequestData;
 
-    [TestClass]
-    public class ProxyOperationManagerTests : ProxyBaseManagerTests
+    private Mock<IProcessHelper>? _mockProcessHelper;
+    private Mock<IRunSettingsHelper>? _mockRunsettingHelper;
+    private Mock<IWindowsRegistryHelper>? _mockWindowsRegistry;
+    private Mock<IEnvironmentVariableHelper>? _mockEnvironmentVariableHelper;
+    private Mock<IFileHelper>? _mockFileHelper;
+    private Mock<IEnvironment>? _mockEnvironment;
+
+    public ProxyOperationManagerTests()
     {
-        private const int CLIENTPROCESSEXITWAIT = 10 * 1000;
+        _mockRequestSender = new Mock<ITestRequestSender>();
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new Mock<IMetricsCollection>().Object);
+        _testOperationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object);
+    }
 
-        private readonly ProxyOperationManager testOperationManager;
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+    }
 
-        private readonly Mock<ITestRequestSender> mockRequestSender;
+    [TestMethod]
+    public void SetupChannelShouldLaunchTestHost()
+    {
+        var expectedStartInfo = new TestProcessStartInfo();
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
+        _mockTestHostManager.Setup(
+                th => th.GetTestHostProcessStartInfo(Array.Empty<string>(), It.IsAny<Dictionary<string, string?>>(), It.IsAny<TestRunnerConnectionInfo>()))
+            .Returns(expectedStartInfo);
 
-        private Mock<IProcessHelper> mockProcessHelper;
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        private Mock<IRunSettingsHelper> mockRunsettingHelper;
+        _mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.Is<TestProcessStartInfo>(si => si == expectedStartInfo), It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        private Mock<IWindowsRegistryHelper> mockWindowsRegistry;
+    [TestMethod]
+    public void SetupChannelShouldCreateTimestampedLogFileForHost()
+    {
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
+        EqtTrace.InitializeTrace("log.txt", PlatformTraceLevel.Verbose);
+
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
+
+        _mockTestHostManager.Verify(
+            th =>
+                th.GetTestHostProcessStartInfo(
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<Dictionary<string, string?>>(),
+                    It.Is<TestRunnerConnectionInfo>(
+                        t => t.LogFile!.Contains("log.host." + DateTime.Now.ToString("yy-MM-dd", CultureInfo.CurrentCulture))
+                             && t.LogFile.Contains("_" + Environment.CurrentManagedThreadId + ".txt"))));
+#if NETFRAMEWORK
+        EqtTrace.TraceLevel = TraceLevel.Off;
+#else
+        EqtTrace.TraceLevel = PlatformTraceLevel.Off;
+#endif
+    }
 
-        private Mock<IEnvironmentVariableHelper> mockEnvironmentVariableHelper;
+    [TestMethod]
+    [DataRow("Dummy", true, false, false)]
+    [DataRow(ProxyOperationManager.DefaultTesthostFriendlyName, true, true, true)]
+    [DataRow(ProxyOperationManager.DotnetTesthostFriendlyName, true, true, true)]
+    public void SetupChannelOutcomeShouldTakeTesthostSessionSupportIntoAccount(
+        string testhostFriendlyName,
+        bool isTestSessionEnabled,
+        bool expectedCompatibilityCheckResult,
+        bool expectedSetupResult)
+    {
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
 
-        private Mock<IFileHelper> mockFileHelper;
+        var testOperationManager = new TestableProxyOperationManager(
+            _mockRequestData.Object,
+            _mockRequestSender.Object,
+            _mockTestHostManager.Object)
+        {
+            IsTestSessionEnabled = isTestSessionEnabled,
+            TesthostFriendlyName = testhostFriendlyName
+        };
 
-        private Mock<IEnvironment> mockEnvironment;
+        Assert.IsTrue(testOperationManager.IsTesthostCompatibleWithTestSessions() == expectedCompatibilityCheckResult);
+        Assert.IsTrue(testOperationManager.SetupChannel([], DefaultRunSettings) == expectedSetupResult);
+    }
 
-        private Mock<IRequestData> mockRequestData;
+    [TestMethod]
+    public void SetupChannelShouldAddRunnerProcessIdForTestHost()
+    {
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
 
-        private int connectionTimeout = EnvironmentHelper.DefaultConnectionTimeout * 1000;
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        private string defaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
 
-        private static readonly string TimoutErrorMessage =
-            "vstest.console process failed to connect to testhost process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
+        _mockTestHostManager.Verify(
+            th =>
+                th.GetTestHostProcessStartInfo(
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<Dictionary<string, string?>>(),
+                    It.Is<TestRunnerConnectionInfo>(t => t.RunnerProcessId.Equals(pid))));
+    }
 
-        public ProxyOperationManagerTests()
-        {
-            this.mockRequestSender = new Mock<ITestRequestSender>();
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(connectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new Mock<IMetricsCollection>().Object);
-            this.testOperationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
-        }
+    [TestMethod]
+    public void SetupChannelShouldAddCorrectTraceLevelForTestHost()
+    {
+#if NETFRAMEWORK
+        EqtTrace.TraceLevel = TraceLevel.Info;
+#else
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+#endif
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-        }
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        [TestMethod]
-        public void SetupChannelShouldLaunchTestHost()
-        {
-            var expectedStartInfo = new TestProcessStartInfo();
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
-            this.mockTestHostManager.Setup(
-                    th => th.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), It.IsAny<Dictionary<string, string>>(), It.IsAny<TestRunnerConnectionInfo>()))
-                .Returns(expectedStartInfo);
+        _mockTestHostManager.Verify(
+            th =>
+                th.GetTestHostProcessStartInfo(
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<Dictionary<string, string?>>(),
+                    It.Is<TestRunnerConnectionInfo>(t => t.TraceLevel == (int)PlatformTraceLevel.Info)));
+    }
 
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void SetupChannelShouldSetupServerForCommunication()
+    {
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            this.mockTestHostManager.Verify(thl => thl.LaunchTestHostAsync(It.Is<TestProcessStartInfo>(si => si == expectedStartInfo), It.IsAny<CancellationToken>()), Times.Once);
-        }
+        _mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldCreateTimestampedLogFileForHost()
+    [TestMethod]
+    public void SetupChannelShouldCallHostServerIfRunnerIsServer()
+    {
+        var connectionInfo = new TestHostConnectionInfo
         {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
-            EqtTrace.InitializeTrace("log.txt", PlatformTraceLevel.Verbose);
-
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-
-            this.mockTestHostManager.Verify(
-                th =>
-                    th.GetTestHostProcessStartInfo(
-                        It.IsAny<IEnumerable<string>>(),
-                        It.IsAny<Dictionary<string, string>>(),
-                        It.Is<TestRunnerConnectionInfo>(
-                            t => t.LogFile.Contains("log.host." + DateTime.Now.ToString("yy-MM-dd"))
-                                 && t.LogFile.Contains("_" + Thread.CurrentThread.ManagedThreadId + ".txt"))));
-#if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Off;
-#else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Off;
-#endif
-        }
+            Endpoint = IPAddress.Loopback + ":0",
+            Role = ConnectionRole.Host,
+            Transport = Transport.Sockets
+        };
+        ProtocolConfig protocolConfig = new() { Version = 2 };
+        var mockCommunicationServer = new Mock<ICommunicationEndPoint>();
 
-        [TestMethod]
-        public void SetupChannelShouldAddRunnerProcessIdForTestHost()
-        {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
+        mockCommunicationServer.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(IPAddress.Loopback + ":123").Callback(
+            () => mockCommunicationServer.Raise(s => s.Connected += null, mockCommunicationServer.Object, new ConnectedEventArgs(_mockChannel.Object)));
 
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        var testRequestSender = new TestRequestSender(mockCommunicationServer.Object, connectionInfo, _mockDataSerializer.Object, protocolConfig, Clientprocessexitwait);
+        SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, protocolConfig.Version);
 
-            this.mockTestHostManager.Verify(
-                th =>
-                    th.GetTestHostProcessStartInfo(
-                        It.IsAny<IEnumerable<string>>(),
-                        It.IsAny<Dictionary<string, string>>(),
-                        It.Is<TestRunnerConnectionInfo>(t => t.RunnerProcessId.Equals(Process.GetCurrentProcess().Id))));
-        }
+        _mockTestHostManager.Setup(thm => thm.GetTestHostConnectionInfo()).Returns(connectionInfo);
 
-        [TestMethod]
-        public void SetupChannelShouldAddCorrectTraceLevelForTestHost()
-        {
-#if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
-#else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
-#endif
+        var localTestOperationManager = new TestableProxyOperationManager(_mockRequestData.Object, testRequestSender, _mockTestHostManager.Object);
 
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(123);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        localTestOperationManager.SetupChannel([], DefaultRunSettings);
 
-            this.mockTestHostManager.Verify(
-                th =>
-                    th.GetTestHostProcessStartInfo(
-                        It.IsAny<IEnumerable<string>>(),
-                        It.IsAny<Dictionary<string, string>>(),
-                        It.Is<TestRunnerConnectionInfo>(t => t.TraceLevel == (int)PlatformTraceLevel.Info)));
-        }
+        mockCommunicationServer.Verify(s => s.Start(IPAddress.Loopback.ToString() + ":0"), Times.Once);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldSetupServerForCommunication()
+    [TestMethod]
+    public void SetupChannelShouldCallSetupClientIfRunnerIsClient()
+    {
+        var connectionInfo = new TestHostConnectionInfo
         {
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+            Endpoint = IPAddress.Loopback + ":124",
+            Role = ConnectionRole.Host,
+            Transport = Transport.Sockets
+        };
+        ProtocolConfig protocolConfig = new() { Version = 2 };
+        var mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
+        mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() => mockCommunicationEndpoint.Raise(
+            s => s.Connected += null,
+            mockCommunicationEndpoint.Object,
+            new ConnectedEventArgs(_mockChannel.Object)));
 
-            this.mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
-        }
+        SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, protocolConfig.Version);
+        var testRequestSender = new TestRequestSender(mockCommunicationEndpoint.Object, connectionInfo, _mockDataSerializer.Object, new ProtocolConfig { Version = 2 }, Clientprocessexitwait);
 
-        [TestMethod]
-        public void SetupChannelShouldCallHostServerIfRunnerIsServer()
-        {
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":0",
-                Role = ConnectionRole.Host,
-                Transport = Transport.Sockets
-            };
-            ProtocolConfig protocolConfig = new ProtocolConfig { Version = 2 };
-            var mockCommunicationServer = new Mock<ICommunicationEndPoint>();
+        _mockTestHostManager.Setup(thm => thm.GetTestHostConnectionInfo()).Returns(connectionInfo);
 
-            mockCommunicationServer.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(IPAddress.Loopback + ":123").Callback(
-                () => { mockCommunicationServer.Raise(s => s.Connected += null, mockCommunicationServer.Object, new ConnectedEventArgs(this.mockChannel.Object)); });
+        var localTestOperationManager = new TestableProxyOperationManager(_mockRequestData.Object, testRequestSender, _mockTestHostManager.Object);
 
-            var testRequestSender = new TestRequestSender(mockCommunicationServer.Object, connectionInfo, mockDataSerializer.Object, protocolConfig, CLIENTPROCESSEXITWAIT);
-            this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, protocolConfig.Version);
+        localTestOperationManager.SetupChannel([], DefaultRunSettings);
 
-            this.mockTestHostManager.Setup(thm => thm.GetTestHostConnectionInfo()).Returns(connectionInfo);
+        mockCommunicationEndpoint.Verify(s => s.Start(It.IsAny<string>()), Times.Once);
+    }
 
-            var localTestOperationManager = new TestableProxyOperationManager(this.mockRequestData.Object, testRequestSender, this.mockTestHostManager.Object);
+    [TestMethod]
+    public void SetupChannelShouldNotInitializeIfConnectionIsAlreadyInitialized()
+    {
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            localTestOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        _mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
+    }
 
-            mockCommunicationServer.Verify(s => s.Start(IPAddress.Loopback.ToString() + ":0"), Times.Once);
-        }
+    [TestMethod]
+    public void SetupChannelShouldWaitForTestHostConnection()
+    {
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        [TestMethod]
-        public void SetupChannelShouldCallSetupClientIfRunnerIsClient()
-        {
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":124",
-                Role = ConnectionRole.Host,
-                Transport = Transport.Sockets
-            };
-            ProtocolConfig protocolConfig = new ProtocolConfig { Version = 2 };
-            var mockCommunicationEndpoint = new Mock<ICommunicationEndPoint>();
-            mockCommunicationEndpoint.Setup(mc => mc.Start(connectionInfo.Endpoint)).Returns(connectionInfo.Endpoint).Callback(() =>
-            {
-                mockCommunicationEndpoint.Raise(
-                    s => s.Connected += null,
-                    mockCommunicationEndpoint.Object,
-                    new ConnectedEventArgs(this.mockChannel.Object));
-            });
-
-            this.SetupChannelMessage(MessageType.VersionCheck, MessageType.VersionCheck, protocolConfig.Version);
-            var testRequestSender = new TestRequestSender(mockCommunicationEndpoint.Object, connectionInfo, mockDataSerializer.Object, new ProtocolConfig { Version = 2 }, CLIENTPROCESSEXITWAIT);
-
-            this.mockTestHostManager.Setup(thm => thm.GetTestHostConnectionInfo()).Returns(connectionInfo);
-
-            var localTestOperationManager = new TestableProxyOperationManager(this.mockRequestData.Object, testRequestSender, this.mockTestHostManager.Object);
-
-            localTestOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-
-            mockCommunicationEndpoint.Verify(s => s.Start(It.IsAny<string>()), Times.Once);
-        }
+        _mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldNotInitializeIfConnectionIsAlreadyInitialized()
-        {
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void SetupChannelShouldNotWaitForTestHostConnectionIfConnectionIsInitialized()
+    {
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            this.mockRequestSender.Verify(s => s.InitializeCommunication(), Times.Once);
-        }
+        _mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>()), Times.Exactly(1));
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldWaitForTestHostConnection()
-        {
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void SetupChannelShouldHonorTimeOutSetByUser()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "100");
 
-            this.mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(100000, It.IsAny<CancellationToken>())).Returns(true);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        [TestMethod]
-        public void SetupChannelShouldNotWaitForTestHostConnectionIfConnectionIsInitialized()
-        {
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        _mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(100000, It.IsAny<CancellationToken>()), Times.Exactly(1));
+    }
 
-            this.mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>()), Times.Exactly(1));
-        }
+    [TestMethod]
+    public void SetupChannelShouldThrowIfWaitForTestHostConnectionTimesOut()
+    {
+        SetupTestHostLaunched(true);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
 
-        [TestMethod]
-        public void SetupChannelShouldHonorTimeOutSetByUser()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "100");
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object);
 
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(100000, It.IsAny<CancellationToken>())).Returns(true);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel([], DefaultRunSettings)).Message;
+        Assert.AreEqual(message, TimoutErrorMessage);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.WaitForRequestHandlerConnection(100000, It.IsAny<CancellationToken>()), Times.Exactly(1));
-        }
+    [TestMethod]
+    public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelled()
+    {
+        SetupTestHostLaunched(true);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
 
-        [TestMethod]
-        public void SetupChannelShouldThrowIfWaitForTestHostConnectionTimesOut()
-        {
-            SetupTestHostLaunched(true);
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
+        var cancellationTokenSource = new CancellationTokenSource();
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, cancellationTokenSource);
 
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
+        cancellationTokenSource.Cancel();
+        var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel([], DefaultRunSettings)).Message;
+        Equals("Canceling the operation as requested.", message);
+    }
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings)).Message;
-            Assert.AreEqual(message, ProxyOperationManagerTests.TimoutErrorMessage);
-        }
+    [TestMethod]
+    public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelledDuringLaunchOfTestHost()
+    {
+        SetupTestHostLaunched(true);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
 
-        [TestMethod]
-        public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelled()
-        {
-            SetupTestHostLaunched(true);
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
+        _mockTestHostManager.Setup(rs => rs.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Callback(() => Task.Run(() => throw new OperationCanceledException()));
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, cancellationTokenSource);
+        var cancellationTokenSource = new CancellationTokenSource();
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, cancellationTokenSource);
 
-            cancellationTokenSource.Cancel();
-            var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings)).Message;
-            StringAssert.Equals("Canceling the operation as requested.", message);
-        }
+        var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel([], DefaultRunSettings)).Message;
+        Equals("Canceling the operation as requested.", message);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelledDuringLaunchOfTestHost()
-        {
-            SetupTestHostLaunched(true);
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
+    [TestMethod]
+    public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelledPostHostLaunchDuringWaitForHandlerConnection()
+    {
+        SetupTestHostLaunched(true);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
 
-            this.mockTestHostManager.Setup(rs => rs.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Callback(() => Task.Run(() => { throw new OperationCanceledException(); }));
+        var cancellationTokenSource = new CancellationTokenSource();
+        _mockTestHostManager.Setup(rs => rs.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Callback(() => cancellationTokenSource.Cancel());
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object, cancellationTokenSource);
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, cancellationTokenSource);
+        var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel([], DefaultRunSettings)).Message;
+        Equals("Canceling the operation as requested.", message);
+    }
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings)).Message;
-            StringAssert.Equals("Canceling the operation as requested.", message);
-        }
+    [TestMethod]
+    public void SetupChannelShouldThrowIfLaunchTestHostFails()
+    {
+        SetupTestHostLaunched(false);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
 
-        [TestMethod]
-        public void SetupChannelShouldThrowTestPlatformExceptionIfRequestCancelledPostHostLaunchDuringWaitForHandlerConnection()
-        {
-            SetupTestHostLaunched(true);
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(false);
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object);
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            this.mockTestHostManager.Setup(rs => rs.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Callback(() => cancellationTokenSource.Cancel());
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object, cancellationTokenSource);
+        var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel([], DefaultRunSettings)).Message;
+        Assert.AreEqual(message, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources.InitializationFailed);
+    }
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings)).Message;
-            StringAssert.Equals("Canceling the operation as requested.", message);
-        }
+    [TestMethod]
+    public void SetupChannelShouldCheckVersionWithTestHost()
+    {
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
+        _mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Once);
+    }
 
-        [TestMethod]
-        public void SetupChannelShouldThrowIfLaunchTestHostFails()
-        {
-            SetupTestHostLaunched(false);
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
+    [TestMethod]
+    public void SetupChannelShouldThrowExceptionIfVersionCheckFails()
+    {
+        // Make the version check fail
+        _mockRequestSender.Setup(rs => rs.CheckVersionWithTestHost()).Throws(new TestPlatformException("Version check failed"));
+        Assert.ThrowsException<TestPlatformException>(() => _testOperationManager.SetupChannel([], DefaultRunSettings));
+    }
 
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
+    [TestMethod]
+    public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredFalseShouldNotCheckVersionWithTestHost()
+    {
+        SetUpMocksForDotNetTestHost();
+        var testHostManager = new TestableDotnetTestHostManager(false, _mockProcessHelper.Object, _mockFileHelper.Object, _mockEnvironment.Object, _mockRunsettingHelper.Object, _mockWindowsRegistry.Object, _mockEnvironmentVariableHelper.Object);
+        testHostManager.Initialize(new NullMessageLogger(), DefaultRunSettings);
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings)).Message;
-            Assert.AreEqual(message, string.Format(CultureInfo.CurrentUICulture, Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources.InitializationFailed));
-        }
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, testHostManager);
 
-        [TestMethod]
-        public void SetupChannelShouldCheckVersionWithTestHost()
-        {
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-            this.mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Once);
-        }
+        operationManager.SetupChannel([], DefaultRunSettings);
 
-        [TestMethod]
-        public void SetupChannelShouldThrowExceptionIfVersionCheckFails()
-        {
-            // Make the version check fail
-            this.mockRequestSender.Setup(rs => rs.CheckVersionWithTestHost()).Throws(new TestPlatformException("Version check failed"));
-            Assert.ThrowsException<TestPlatformException>(() => this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings));
-        }
+        _mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Never);
+    }
 
-        [TestMethod]
-        public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredFalseShouldNotCheckVersionWithTestHost()
-        {
-            this.SetUpMocksForDotNetTestHost();
-            var testHostManager = new TestableDotnetTestHostManager(false, this.mockProcessHelper.Object, this.mockFileHelper.Object, this.mockEnvironment.Object, this.mockRunsettingHelper.Object, this.mockWindowsRegistry.Object, this.mockEnvironmentVariableHelper.Object);
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, testHostManager);
+    [TestMethod]
+    public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredTrueShouldCheckVersionWithTestHost()
+    {
+        SetUpMocksForDotNetTestHost();
+        var testHostManager = new TestableDotnetTestHostManager(true, _mockProcessHelper.Object, _mockFileHelper.Object, _mockEnvironment.Object, _mockRunsettingHelper.Object, _mockWindowsRegistry.Object, _mockEnvironmentVariableHelper.Object);
+        testHostManager.Initialize(new NullMessageLogger(), DefaultRunSettings);
+        var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, testHostManager);
 
-            operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        operationManager.SetupChannel([], DefaultRunSettings);
 
-            this.mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Never);
-        }
+        _mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Once);
+    }
 
-        [TestMethod]
-        public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredTrueShouldCheckVersionWithTestHost()
-        {
-            this.SetUpMocksForDotNetTestHost();
-            var testHostManager = new TestableDotnetTestHostManager(true, this.mockProcessHelper.Object, this.mockFileHelper.Object, this.mockEnvironment.Object, this.mockRunsettingHelper.Object, this.mockWindowsRegistry.Object, this.mockEnvironmentVariableHelper.Object);
-            var operationManager = new TestableProxyOperationManager(this.mockRequestData.Object, this.mockRequestSender.Object, testHostManager);
+    [TestMethod]
+    public void CloseShouldEndSessionIfHostWasLaunched()
+    {
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            operationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        _testOperationManager.Close();
 
-            this.mockRequestSender.Verify(rs => rs.CheckVersionWithTestHost(), Times.Once);
-        }
+        _mockRequestSender.Verify(rs => rs.EndSession(), Times.Once);
+    }
 
-        [TestMethod]
-        public void CloseShouldEndSessionIfHostWasLaunched()
-        {
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void CloseShouldNotEndSessionIfHostLaucnhedFailed()
+    {
+        _testOperationManager.Close();
 
-            this.testOperationManager.Close();
+        _mockRequestSender.Verify(rs => rs.EndSession(), Times.Never);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.EndSession(), Times.Once);
-        }
+    [TestMethod]
+    public void CloseShouldAlwaysCleanTestHost()
+    {
+        _testOperationManager.Close();
 
-        [TestMethod]
-        public void CloseShouldNotEndSessionIfHostLaucnhedFailed()
-        {
-            this.testOperationManager.Close();
+        _mockTestHostManager.Verify(th => th.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.EndSession(), Times.Never);
-        }
+    [TestMethod]
+    public void CloseShouldResetChannelInitialization()
+    {
+        SetupWaitForTestHostExit();
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-        [TestMethod]
-        public void CloseShouldAlwaysCleanTestHost()
-        {
-            this.testOperationManager.Close();
+        _testOperationManager.Close();
 
-            this.mockTestHostManager.Verify(th => th.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
-        }
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
+        _mockTestHostManager.Verify(th => th.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Exactly(2));
+    }
 
-        [TestMethod]
-        public void CloseShouldResetChannelInitialization()
-        {
-            this.SetupWaitForTestHostExit();
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void CloseShouldTerminateTesthostProcessIfWaitTimesout()
+    {
+        // Ensure testhost start returns a dummy process id
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(ConnectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
+        _testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            this.testOperationManager.Close();
+        _testOperationManager.Close();
 
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
-            this.mockTestHostManager.Verify(th => th.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Exactly(2));
-        }
+        _mockTestHostManager.Verify(th => th.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void CloseShouldTerminateTesthostProcessIfWaitTimesout()
-        {
-            // Ensure testhost start returns a dummy process id
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(this.connectionTimeout, It.IsAny<CancellationToken>())).Returns(true);
-            this.testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    [TestMethod]
+    public void CloseShouldNotThrowIfEndSessionFails()
+    {
+        _mockRequestSender.Setup(rs => rs.EndSession()).Throws<Exception>();
 
-            this.testOperationManager.Close();
+        _testOperationManager.Close();
+    }
 
-            this.mockTestHostManager.Verify(th => th.CleanTestHostAsync(It.IsAny<CancellationToken>()), Times.Once);
-        }
+    private void SetupWaitForTestHostExit()
+    {
+        // Raise host exited when end session is called
+        _mockRequestSender.Setup(rs => rs.EndSession())
+            .Callback(() => _mockTestHostManager.Raise(t => t.HostExited += null, new HostProviderEventArgs(string.Empty)));
+    }
 
-        [TestMethod]
-        public void CloseShouldNotThrowIfEndSessionFails()
-        {
-            this.mockRequestSender.Setup(rs => rs.EndSession()).Throws<Exception>();
+    private void SetupTestHostLaunched(bool launchStatus)
+    {
+        // Raise host exited when end session is called
+        _mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback(() => _mockTestHostManager.Raise(t => t.HostLaunched += null, new HostProviderEventArgs(string.Empty)))
+            .Returns(Task.FromResult(launchStatus));
+    }
 
-            this.testOperationManager.Close();
-        }
+    [TestMethod]
+    public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgTrueIfTelemetryOptedIn()
+    {
+        TestProcessStartInfo receivedTestProcessInfo = new();
+        var mockRequestData = new Mock<IRequestData>();
 
-        private void SetupWaitForTestHostExit()
-        {
-            // Raise host exited when end session is called
-            this.mockRequestSender.Setup(rs => rs.EndSession())
-                .Callback(() => this.mockTestHostManager.Raise(t => t.HostExited += null, new HostProviderEventArgs(string.Empty)));
-        }
+        mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
 
-        private void SetupTestHostLaunched(bool launchStatus)
-        {
-            // Raise host exited when end session is called
-            this.mockTestHostManager.Setup(tmh => tmh.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback(() => this.mockTestHostManager.Raise(t => t.HostLaunched += null, new HostProviderEventArgs(string.Empty)))
-                .Returns(Task.FromResult(launchStatus));
-        }
+        var testOperationManager = new TestableProxyOperationManager(mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object);
 
-        [TestMethod]
-        public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgTrueIfTelemetryOptedIn()
-        {
-            TestProcessStartInfo receivedTestProcessInfo = new TestProcessStartInfo();
-            var mockRequestData = new Mock<IRequestData>();
+        _mockTestHostManager
+            .Setup(tm => tm.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback<TestProcessStartInfo, CancellationToken>(
+                (testProcessStartInfo, cancellationToken) => receivedTestProcessInfo = testProcessStartInfo)
+            .Returns(Task.FromResult(true));
 
-            mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
+        // Act.
+        testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            var testOperationManager = new TestableProxyOperationManager(mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
+        // Verify.
+        Assert.IsTrue(receivedTestProcessInfo.Arguments!.Contains("--telemetryoptedin true"));
+    }
 
-            this.mockTestHostManager
-                .Setup(tm => tm.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback<TestProcessStartInfo, CancellationToken>(
-                    (testProcessStartInfo, cancellationToken) =>
-                        {
-                            receivedTestProcessInfo = testProcessStartInfo;
-                        })
-                        .Returns(Task.FromResult(true));
+    [TestMethod]
+    public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgFalseIfTelemetryOptedOut()
+    {
+        TestProcessStartInfo receivedTestProcessInfo = new();
+        var mockRequestData = new Mock<IRequestData>();
 
-            // Act.
-            testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+        mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(false);
 
-            // Verify.
-            Assert.IsTrue(receivedTestProcessInfo.Arguments.Contains("--telemetryoptedin true"));
-        }
+        var testOperationManager = new TestableProxyOperationManager(mockRequestData.Object, _mockRequestSender.Object, _mockTestHostManager.Object);
 
-        [TestMethod]
-        public void UpdateTestProcessStartInfoShouldUpdateTelemetryOptedInArgFalseIfTelemetryOptedOut()
-        {
-            TestProcessStartInfo receivedTestProcessInfo = new TestProcessStartInfo();
-            var mockRequestData = new Mock<IRequestData>();
+        _mockTestHostManager
+            .Setup(tm => tm.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Callback<TestProcessStartInfo, CancellationToken>(
+                (testProcessStartInfo, cancellationToken) => receivedTestProcessInfo = testProcessStartInfo)
+            .Returns(Task.FromResult(true));
 
-            mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(false);
+        // Act.
+        testOperationManager.SetupChannel([], DefaultRunSettings);
 
-            var testOperationManager = new TestableProxyOperationManager(mockRequestData.Object, this.mockRequestSender.Object, this.mockTestHostManager.Object);
+        // Verify.
+        Assert.IsTrue(receivedTestProcessInfo.Arguments!.Contains("--telemetryoptedin false"));
+    }
 
-            this.mockTestHostManager
-                .Setup(tm => tm.LaunchTestHostAsync(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Callback<TestProcessStartInfo, CancellationToken>(
-                    (testProcessStartInfo, cancellationToken) =>
-                        {
-                            receivedTestProcessInfo = testProcessStartInfo;
-                        })
-                .Returns(Task.FromResult(true));
+    [MemberNotNull(nameof(_mockProcessHelper), nameof(_mockFileHelper), nameof(_mockEnvironment), nameof(_mockRunsettingHelper), nameof(_mockWindowsRegistry), nameof(_mockEnvironmentVariableHelper))]
+    private void SetUpMocksForDotNetTestHost()
+    {
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockRunsettingHelper = new Mock<IRunSettingsHelper>();
+        _mockWindowsRegistry = new Mock<IWindowsRegistryHelper>();
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+
+        _mockRunsettingHelper.SetupGet(r => r.IsDefaultTargetArchitecture).Returns(true);
+        _mockProcessHelper.Setup(
+                ph =>
+                    ph.LaunchProcess(
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.IsAny<Action<object?, string?>>(),
+                        It.IsAny<Action<object?>>(),
+                        It.IsAny<Action<object?, string?>>()))
+            .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
+                (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
+                {
+                    var process = Process.GetCurrentProcess();
+
+                    errorCallback(process, string.Empty);
+                    exitCallback(process);
+                }).Returns(Process.GetCurrentProcess());
+    }
 
-            // Act.
-            testOperationManager.SetupChannel(Enumerable.Empty<string>(), this.defaultRunSettings);
+    private class TestableProxyOperationManager : ProxyOperationManager
+    {
+        public TestableProxyOperationManager(IRequestData requestData,
+            ITestRequestSender requestSender,
+            ITestRuntimeProvider testHostManager) : base(requestData, requestSender, testHostManager, Framework.DefaultFramework)
+        {
+        }
 
-            // Verify.
-            Assert.IsTrue(receivedTestProcessInfo.Arguments.Contains("--telemetryoptedin false"));
+        public TestableProxyOperationManager(
+            IRequestData requestData,
+            ITestRequestSender requestSender,
+            ITestRuntimeProvider testHostManager,
+            CancellationTokenSource cancellationTokenSource) : base(requestData, requestSender, testHostManager, Framework.DefaultFramework)
+        {
+            CancellationTokenSource = cancellationTokenSource;
         }
 
-        private void SetUpMocksForDotNetTestHost()
+        public string TesthostFriendlyName { get; set; } = "Dummy";
+
+        internal override string ReadTesthostFriendlyName()
         {
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockEnvironment = new Mock<IEnvironment>();
-            this.mockRunsettingHelper = new Mock<IRunSettingsHelper>();
-            this.mockWindowsRegistry = new Mock<IWindowsRegistryHelper>();
-            this.mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
-
-            this.mockRunsettingHelper.SetupGet(r => r.IsDefaultTargetArchitecture).Returns(true);
-            this.mockProcessHelper.Setup(
-                    ph =>
-                        ph.LaunchProcess(
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.IsAny<Action<object, string>>(),
-                            It.IsAny<Action<object>>(),
-                            It.IsAny<Action<object, string>>()))
-                .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
-                    (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
-                        {
-                            var process = Process.GetCurrentProcess();
-
-                            errorCallback(process, string.Empty);
-                            exitCallback(process);
-                        }).Returns(Process.GetCurrentProcess());
+            return TesthostFriendlyName;
         }
+    }
+
+    private class TestableDotnetTestHostManager : DotnetTestHostManager
+    {
+        private readonly bool _isVersionCheckRequired;
 
-        private class TestableProxyOperationManager : ProxyOperationManager
+        public TestableDotnetTestHostManager(
+            bool checkRequired,
+            IProcessHelper processHelper,
+            IFileHelper fileHelper,
+            IEnvironment environment,
+            IRunSettingsHelper runsettingHelper,
+            IWindowsRegistryHelper windowsRegistryHelper,
+            IEnvironmentVariableHelper environmentVariableHelper) : base(
+            processHelper,
+            fileHelper,
+            new DotnetHostHelper(fileHelper, environment, windowsRegistryHelper, environmentVariableHelper, processHelper),
+            environment,
+            runsettingHelper,
+            windowsRegistryHelper,
+            environmentVariableHelper)
         {
-            public TestableProxyOperationManager(IRequestData requestData,
-                ITestRequestSender requestSender,
-                ITestRuntimeProvider testHostManager) : base(requestData, requestSender, testHostManager)
-            {
-            }
-
-            public TestableProxyOperationManager(
-                IRequestData requestData,
-                ITestRequestSender requestSender,
-                ITestRuntimeProvider testHostManager,
-                CancellationTokenSource cancellationTokenSource) : base(requestData, requestSender, testHostManager)
-            {
-                this.CancellationTokenSource = cancellationTokenSource;
-            }
+            _isVersionCheckRequired = checkRequired;
         }
 
-        private class TestableDotnetTestHostManager : DotnetTestHostManager
+        internal override bool IsVersionCheckRequired => _isVersionCheckRequired;
+
+        public override TestProcessStartInfo GetTestHostProcessStartInfo(
+            IEnumerable<string> sources,
+            IDictionary<string, string?>? environmentVariables,
+            TestRunnerConnectionInfo connectionInfo)
         {
-            private bool isVersionCheckRequired;
-
-            public TestableDotnetTestHostManager(
-                bool checkRequired,
-                IProcessHelper processHelper,
-                IFileHelper fileHelper,
-                IEnvironment environment,
-                IRunSettingsHelper runsettingHelper,
-                IWindowsRegistryHelper windowsRegistryHelper,
-                IEnvironmentVariableHelper environmentVariableHelper) : base(
-                    processHelper,
-                    fileHelper,
-                    new DotnetHostHelper(fileHelper, environment, windowsRegistryHelper, environmentVariableHelper, processHelper),
-                    environment,
-                    runsettingHelper,
-                    windowsRegistryHelper,
-                    environmentVariableHelper)
-            {
-                this.isVersionCheckRequired = checkRequired;
-            }
-
-            internal override bool IsVersionCheckRequired => this.isVersionCheckRequired;
-
-            public override TestProcessStartInfo GetTestHostProcessStartInfo(
-                IEnumerable<string> sources,
-                IDictionary<string, string> environmentVariables,
-                TestRunnerConnectionInfo connectionInfo)
-            {
-                return new TestProcessStartInfo();
-            }
+            return new TestProcessStartInfo();
         }
     }
 }
+
+internal class NullMessageLogger : IMessageLogger
+{
+    public void SendMessage(TestMessageLevel testMessageLevel, string message)
+    {
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyTestSessionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyTestSessionManagerTests.cs
index d8764eb2c3..853bfa8486 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyTestSessionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyTestSessionManagerTests.cs
@@ -1,335 +1,612 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.Client
-{   
-    using System;
-    using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.Client;
+
+[TestClass]
+public class ProxyTestSessionManagerTests
+{
+    private readonly IList<string> _fakeTestSources = new List<string>() { @"C:\temp\FakeTestAsset.dll" };
+    private readonly Dictionary<string, TestRuntimeProviderInfo> _fakeTestSourcesToRuntimeProviderMap;
+    private readonly IList<string> _fakeTestMultipleSources = new List<string>() {
+        @"C:\temp\FakeTestAsset1.dll",
+        @"C:\temp\FakeTestAsset2.dll",
+        @"C:\temp\FakeTestAsset3.dll",
+        @"C:\temp\FakeTestAsset4.dll",
+        @"C:\temp\FakeTestAsset5.dll",
+        @"C:\temp\FakeTestAsset6.dll",
+        @"C:\temp\FakeTestAsset7.dll",
+        @"C:\temp\FakeTestAsset8.dll",
+    };
+    private readonly string _runSettingsNoEnvVars = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                </RunConfiguration>
+            </RunSettings>";
+    private readonly string _runSettingsOneEnvVar = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <EnvironmentVariables>
+                        <AAA>Test1</AAA>
+                    </EnvironmentVariables>
+                </RunConfiguration>
+            </RunSettings>";
+    private readonly string _runSettingsTwoEnvVars = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <EnvironmentVariables>
+                        <AAA>Test1</AAA>
+                        <BBB>Test2</BBB>
+                    </EnvironmentVariables>
+                </RunConfiguration>
+            </RunSettings>";
+    private readonly string _runSettingsTwoEnvVarsAndDataCollectors = @"<?xml version=""1.0"" encoding=""utf-8""?>
+            <RunSettings>
+                <RunConfiguration>
+                    <EnvironmentVariables>
+                        <AAA>Test1</AAA>
+                        <BBB>Test2</BBB>
+                    </EnvironmentVariables>
+                </RunConfiguration>
+                <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""blame"" enabled=""True""></DataCollector>
+                    </DataCollectors>
+                </DataCollectionRunSettings>
+            </RunSettings>";
+    private readonly string _fakeRunSettings = "FakeRunSettings";
+    private readonly ProtocolConfig _protocolConfig = new() { Version = 1 };
+    private readonly Mock<ITestSessionEventsHandler> _mockEventsHandler;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+
+    public ProxyTestSessionManagerTests()
+    {
+        TestSessionPool.Instance = null;
+
+        var metrics = new Dictionary<string, object>();
+
+        _mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+
+        _mockEventsHandler.Setup(
+            e => e.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
+             {
+                 Assert.IsNotNull(eventArgs.TestSessionInfo);
+                 Assert.IsNotNull(eventArgs.Metrics);
+
+                 Assert.IsTrue(eventArgs.Metrics.ContainsKey(TelemetryDataConstants.TestSessionId));
+                 Assert.IsTrue(eventArgs.Metrics.ContainsKey(TelemetryDataConstants.TestSessionState));
+                 Assert.IsTrue(
+                     eventArgs.Metrics.ContainsKey(TelemetryDataConstants.TestSessionSpawnedTesthostCount)
+                     && (int)eventArgs.Metrics[TelemetryDataConstants.TestSessionSpawnedTesthostCount] > 0);
+                 Assert.IsTrue(eventArgs.Metrics.ContainsKey(TelemetryDataConstants.TestSessionTesthostSpawnTimeInSec));
+             });
+
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(_protocolConfig);
+        _mockMetricsCollection.Setup(mc => mc.Metrics).Returns(metrics);
+        _mockMetricsCollection.Setup(mc => mc.Add(It.IsAny<string>(), It.IsAny<object>()))
+            .Callback((string metric, object value) => metrics.Add(metric, value));
+
+        _fakeTestSourcesToRuntimeProviderMap = new Dictionary<string, TestRuntimeProviderInfo>
+        {
+            [_fakeTestSources[0]] = new TestRuntimeProviderInfo(typeof(ITestRuntimeProvider), false, _fakeRunSettings, [
+                new()
+                {
+                    Source = _fakeTestSources[0],
+                    Architecture = Architecture.X86,
+                    Framework = Framework.DefaultFramework
+                }
+            ])
+        };
+    }
+
+    [TestMethod]
+    public void StartSessionShouldSucceedIfCalledOnlyOnce()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // First call to StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                testSessionCriteria.Sources!,
+                testSessionCriteria.RunSettings),
+            Times.Once);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // Second call to StartSession should fail.
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                testSessionCriteria.Sources!,
+                testSessionCriteria.RunSettings),
+            Times.Once);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldSucceedWhenCalledWithMultipleSources()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestMultipleSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // First call to StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(_fakeTestMultipleSources.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldFailIfProxyCreatorIsNull()
+    {
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, null!);
+
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Never);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldFailIfSetupChannelReturnsFalse()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(false);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // Call fails because SetupChannel returns false.
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                It.IsAny<string>()),
+            Times.Once);
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Never);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldNotFailIfSetupChannelReturnsFalseButTheProxyDisposalPolicyAllowsFailures()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.SetupSequence(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true)
+            .Returns(false)
+            .Returns(false)
+            .Returns(false)
+            .Returns(false)
+            .Returns(false)
+            .Returns(false)
+            .Returns(false);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestMultipleSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+        proxyManager.DisposalPolicy = ProxyDisposalOnCreationFailPolicy.AllowProxySetupFailures;
+
+        // Call fails because SetupChannel returns false.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                It.IsAny<string>()),
+            Times.Exactly(_fakeTestMultipleSources.Count));
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldStillFailIfSetupChannelReturnsFalseAndTheProxyDisposalPolicyAllowsFailuresButNoTesthostIsSpawned()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(false);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+        proxyManager.DisposalPolicy = ProxyDisposalOnCreationFailPolicy.AllowProxySetupFailures;
+
+        // Call fails because SetupChannel returns false.
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                It.IsAny<string>()),
+            Times.Exactly(_fakeTestSources.Count));
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Never);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldFailIfSetupChannelThrowsException()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Throws(new TestPlatformException("Dummy exception."));
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // Call fails because SetupChannel returns false.
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                It.IsAny<string>()),
+            Times.Once);
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Never);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldFailIfAddSessionFails()
+    {
+        var mockTestSessionPool = new Mock<TestSessionPool>();
+        mockTestSessionPool.Setup(tsp => tsp.AddSession(It.IsAny<TestSessionInfo>(), It.IsAny<ProxyTestSessionManager>()))
+            .Returns(false);
+        TestSessionPool.Instance = mockTestSessionPool.Object;
+
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // Call to StartSession should fail because AddSession fails.
+        Assert.IsFalse(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                testSessionCriteria.Sources!,
+                testSessionCriteria.RunSettings),
+            Times.Once);
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Never);
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void StopSessionShouldSucceedIfCalledOnlyOnce()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                testSessionCriteria.Sources!,
+                testSessionCriteria.RunSettings),
+            Times.Once);
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // First call to StopSession should succeed.
+        _mockMetricsCollection.Object.Metrics.Clear();
+        Assert.IsTrue(proxyManager.StopSession(_mockRequestData.Object));
+
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
+        CheckStopSessionTelemetry(true);
+
+        // Second call to StopSession should fail.
+        _mockMetricsCollection.Object.Metrics.Clear();
+        Assert.IsFalse(proxyManager.StopSession(_mockRequestData.Object));
+
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
+        CheckStopSessionTelemetry(false);
+    }
 
-    using Moq;
+    [TestMethod]
+    public void StopSessionShouldSucceedWhenCalledWithMultipleSources()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+        mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
+
+        var testSessionCriteria = CreateTestSession(_fakeTestMultipleSources, _fakeRunSettings);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // First call to StopSession should succeed.
+        _mockMetricsCollection.Object.Metrics.Clear();
+        Assert.IsTrue(proxyManager.StopSession(_mockRequestData.Object));
+
+        mockProxyOperationManager.Verify(pom => pom.Close(), Times.Exactly(testSessionCriteria.Sources.Count));
+        CheckStopSessionTelemetry(true);
+    }
 
-    [TestClass]
-    public class ProxyTestSessionManagerTests
+    [TestMethod]
+    public void DequeueProxyShouldSucceedIfIdentificationCriteriaAreMet()
     {
-        private readonly IList<string> fakeTestSources = new List<string>() { @"C:\temp\FakeTestAsset.dll" };
-        private readonly IList<string> fakeTestMultipleSources = new List<string>() {
-            @"C:\temp\FakeTestAsset1.dll",
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsNoEnvVars);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // First call to DequeueProxy fails because of source mismatch.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
             @"C:\temp\FakeTestAsset2.dll",
-            @"C:\temp\FakeTestAsset3.dll",
-            @"C:\temp\FakeTestAsset4.dll",
-            @"C:\temp\FakeTestAsset5.dll",
-            @"C:\temp\FakeTestAsset6.dll",
-            @"C:\temp\FakeTestAsset7.dll",
-            @"C:\temp\FakeTestAsset8.dll",
-        };
-        private readonly string fakeRunSettings = "FakeRunSettings";
-        private Mock<ITestSessionEventsHandler> mockEventsHandler;
+            testSessionCriteria.RunSettings));
 
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            TestSessionPool.Instance = null;
+        // Second call to DequeueProxy fails because of runsettings mismatch.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+            testSessionCriteria.Sources[0],
+            _runSettingsOneEnvVar));
 
-            this.mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        // Third call to DequeueProxy succeeds.
+        Assert.AreEqual(proxyManager.DequeueProxy(
+                testSessionCriteria.Sources[0],
+                testSessionCriteria.RunSettings),
+            mockProxyOperationManager.Object);
 
-            this.mockEventsHandler.Setup(e => e.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>()))
-                .Callback((TestSessionInfo tsi) => { });
-        }
+        // Fourth call to DequeueProxy fails because proxy became unavailable following successful deque.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+            testSessionCriteria.Sources[0],
+            testSessionCriteria.RunSettings));
+    }
 
-        [TestMethod]
-        public void StartSessionShouldSucceedIfCalledOnlyOnce()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // First call to StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    testSessionCriteria.Sources,
-                    testSessionCriteria.RunSettings),
-                Times.Once);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-
-            // Second call to StartSession should fail.
-            Assert.IsFalse(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    testSessionCriteria.Sources,
-                    testSessionCriteria.RunSettings),
-                Times.Once);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void StartSessionShouldSucceedWhenCalledWithMultipleSources()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestMultipleSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // First call to StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    testSessionCriteria.RunSettings),
-                Times.Exactly(this.fakeTestMultipleSources.Count));
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void StartSessionShouldFailIfProxyCreatorIsNull()
-        {
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, null);
+    [TestMethod]
+    public void DequeueProxyTwoConsecutiveTimesWithEnqueueShouldBeSuccessful()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsTwoEnvVars);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // Call to DequeueProxy succeeds.
+        Assert.AreEqual(proxyManager.DequeueProxy(
+                testSessionCriteria.Sources[0],
+                testSessionCriteria.RunSettings),
+            mockProxyOperationManager.Object);
 
-            Assert.IsFalse(proxyManager.StartSession(this.mockEventsHandler.Object));
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Never);
-        }
+        Assert.AreEqual(proxyManager.EnqueueProxy(mockProxyOperationManager.Object.Id), true);
 
-        [TestMethod]
-        public void StartSessionShouldFailIfSetupChannelReturnsFalse()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(false);
-            mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // Call fails because SetupChannel returns false.
-            Assert.IsFalse(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    It.IsAny<string>()),
-                Times.Once);
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Never);
-        }
-
-        [TestMethod]
-        public void StartSessionShouldFailIfSetupChannelThrowsException()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Throws(new TestPlatformException("Dummy exception."));
-            mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // Call fails because SetupChannel returns false.
-            Assert.IsFalse(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    It.IsAny<string>()),
-                Times.Once);
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Never);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Never);
-        }
-
-        [TestMethod]
-        public void StartSessionShouldFailIfAddSessionFails()
-        {
-            var mockTestSessionPool = new Mock<TestSessionPool>();
-            mockTestSessionPool.Setup(tsp => tsp.AddSession(It.IsAny<TestSessionInfo>(), It.IsAny<ProxyTestSessionManager>()))
-                .Returns(false);
-            TestSessionPool.Instance = mockTestSessionPool.Object;
-
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-            mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // Call to StartSession should fail because AddSession fails.
-            Assert.IsFalse(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    testSessionCriteria.Sources,
-                    testSessionCriteria.RunSettings),
-                Times.Once);
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Never);
-        }
-
-        [TestMethod]
-        public void StopSessionShouldSucceedIfCalledOnlyOnce()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-            mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    testSessionCriteria.Sources,
-                    testSessionCriteria.RunSettings),
-                Times.Once);
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-
-            // First call to StopSession should succeed.
-            Assert.IsTrue(proxyManager.StopSession());
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
-
-            // Second call to StopSession should fail.
-            Assert.IsFalse(proxyManager.StopSession());
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Once);
-        }
-
-        [TestMethod]
-        public void StopSessionShouldSucceedWhenCalledWithMultipleSources()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-            mockProxyOperationManager.Setup(pom => pom.Close()).Callback(() => { });
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestMultipleSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    testSessionCriteria.RunSettings),
-                Times.Exactly(testSessionCriteria.Sources.Count));
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-
-            // First call to StopSession should succeed.
-            Assert.IsTrue(proxyManager.StopSession());
-            mockProxyOperationManager.Verify(pom => pom.Close(), Times.Exactly(testSessionCriteria.Sources.Count));
-        }
-
-        [TestMethod]
-        public void DequeueProxyShouldSucceedIfIdentificationCriteriaAreMet()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    testSessionCriteria.RunSettings),
-                Times.Exactly(testSessionCriteria.Sources.Count));
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-
-            // First call to DequeueProxy fails because of source mismatch.
-            Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
-                @"C:\temp\FakeTestAsset2.dll",
-                testSessionCriteria.RunSettings));
-
-            // Second call to DequeueProxy fails because of runsettings mismatch.
-            Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+        // Call to DequeueProxy succeeds when called with the same runsettings as before.
+        Assert.AreEqual(proxyManager.DequeueProxy(
                 testSessionCriteria.Sources[0],
-                "DummyRunSettings"));
-            
-            // Third call to DequeueProxy succeeds.
-            Assert.AreEqual(proxyManager.DequeueProxy(
-                    testSessionCriteria.Sources[0],
-                    testSessionCriteria.RunSettings),
-                mockProxyOperationManager.Object);
-
-            // Fourth call to DequeueProxy fails because proxy became unavailable following successful deque.
-            Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+                testSessionCriteria.RunSettings),
+            mockProxyOperationManager.Object);
+    }
+
+    [TestMethod]
+    public void DequeueProxyShouldFailIfRunSettingsMatchingFails()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsOneEnvVar);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // This call to DequeueProxy fails because of runsettings mismatch.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+            testSessionCriteria.Sources[0],
+            _runSettingsTwoEnvVars));
+    }
+
+    [TestMethod]
+    public void DequeueProxyShouldFailIfRunSettingsMatchingFailsFor2EnvVariables()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsTwoEnvVars);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // This call to DequeueProxy fails because of runsettings mismatch.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+            testSessionCriteria.Sources[0],
+            _runSettingsOneEnvVar));
+    }
+
+    [TestMethod]
+    public void DequeueProxyShouldFailIfRunSettingsMatchingFailsForDataCollectors()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsTwoEnvVars);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // This call to DequeueProxy fails because of runsettings mismatch.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.DequeueProxy(
+            testSessionCriteria.Sources[0],
+            _runSettingsTwoEnvVarsAndDataCollectors));
+    }
+
+    [TestMethod]
+    public void EnqueueProxyShouldSucceedIfIdentificationCriteriaAreMet()
+    {
+        var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null, null);
+        mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
+            .Returns(true);
+
+        var testSessionCriteria = CreateTestSession(_fakeTestSources, _runSettingsNoEnvVars);
+        var proxyManager = CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
+
+        // Validate sanity checks.
+        Assert.ThrowsException<ArgumentException>(() => proxyManager.EnqueueProxy(-1));
+        Assert.ThrowsException<ArgumentException>(() => proxyManager.EnqueueProxy(1));
+
+        // StartSession should succeed.
+        Assert.IsTrue(proxyManager.StartSession(_mockEventsHandler.Object, _mockRequestData.Object));
+        mockProxyOperationManager.Verify(pom => pom.SetupChannel(
+                It.IsAny<IEnumerable<string>>(),
+                testSessionCriteria.RunSettings),
+            Times.Exactly(testSessionCriteria.Sources!.Count));
+        _mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        // Call throws exception because proxy is already available.
+        Assert.ThrowsException<InvalidOperationException>(() => proxyManager.EnqueueProxy(0));
+
+        // Call succeeds.
+        Assert.AreEqual(proxyManager.DequeueProxy(
                 testSessionCriteria.Sources[0],
-                testSessionCriteria.RunSettings));
-        }
+                testSessionCriteria.RunSettings),
+            mockProxyOperationManager.Object);
+        Assert.IsTrue(proxyManager.EnqueueProxy(0));
+    }
 
-        [TestMethod]
-        public void EnqueueProxyShouldSucceedIfIdentificationCriteriaAreMet()
-        {
-            var mockProxyOperationManager = new Mock<ProxyOperationManager>(null, null, null);
-            mockProxyOperationManager.Setup(pom => pom.SetupChannel(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()))
-                .Returns(true);
-
-            var testSessionCriteria = this.CreateTestSession(this.fakeTestSources, this.fakeRunSettings);
-            var proxyManager = this.CreateProxy(testSessionCriteria, mockProxyOperationManager.Object);
-
-            // Validate sanity checks.
-            Assert.ThrowsException<ArgumentException>(() => proxyManager.EnqueueProxy(-1));
-            Assert.ThrowsException<ArgumentException>(() => proxyManager.EnqueueProxy(1));
-
-            // StartSession should succeed.
-            Assert.IsTrue(proxyManager.StartSession(this.mockEventsHandler.Object));
-            mockProxyOperationManager.Verify(pom => pom.SetupChannel(
-                    It.IsAny<IEnumerable<string>>(),
-                    testSessionCriteria.RunSettings),
-                Times.Exactly(testSessionCriteria.Sources.Count));
-            this.mockEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(
-                    It.IsAny<TestSessionInfo>()),
-                Times.Once);
-
-            // Call throws exception because proxy is already available.
-            Assert.ThrowsException<InvalidOperationException>(() => proxyManager.EnqueueProxy(0));
-
-            // Call succeeds.
-            Assert.AreEqual(proxyManager.DequeueProxy(
-                    testSessionCriteria.Sources[0],
-                    testSessionCriteria.RunSettings),
-                mockProxyOperationManager.Object);
-            Assert.IsTrue(proxyManager.EnqueueProxy(0));
-        }
-
-        private StartTestSessionCriteria CreateTestSession(IList<string> sources, string runSettings)
+    private static StartTestSessionCriteria CreateTestSession(IList<string> sources, string runSettings)
+    {
+        return new StartTestSessionCriteria()
         {
-            return new StartTestSessionCriteria()
+            Sources = sources,
+            RunSettings = runSettings
+        };
+    }
+
+    private ProxyTestSessionManager CreateProxy(
+        StartTestSessionCriteria testSessionCriteria,
+        ProxyOperationManager proxyOperationManager)
+    {
+        var runSettings = testSessionCriteria.RunSettings ?? _fakeRunSettings;
+        var runtimeProviderInfo = new TestRuntimeProviderInfo
+        (
+            typeof(ITestRuntimeProvider),
+            shared: false,
+            runSettings,
+            testSessionCriteria.Sources!.Select(s => new SourceDetail
             {
-                Sources = sources,
-                RunSettings = runSettings
-            };
-        }
-
-        private ProxyTestSessionManager CreateProxy(
-            StartTestSessionCriteria testSessionCriteria,
-            ProxyOperationManager proxyOperationManager)
-        {
-            return new ProxyTestSessionManager(
-                testSessionCriteria,
-                testSessionCriteria.Sources.Count,
-                () => { return proxyOperationManager; });
-        }
+                Source = s,
+                Architecture = Architecture.X86,
+                Framework = Framework.DefaultFramework
+            }).ToList()
+        );
+
+        var runtimeProviders = new List<TestRuntimeProviderInfo> { runtimeProviderInfo };
+        return new ProxyTestSessionManager(
+            testSessionCriteria,
+            testSessionCriteria.Sources!.Count,
+            _ => proxyOperationManager,
+            runtimeProviders
+            );
+    }
+
+    private void CheckStopSessionTelemetry(bool exists)
+    {
+        Assert.AreEqual(_mockMetricsCollection.Object.Metrics.ContainsKey(TelemetryDataConstants.TestSessionId), exists);
+        Assert.AreEqual(_mockMetricsCollection.Object.Metrics.ContainsKey(TelemetryDataConstants.TestSessionState), exists);
+        Assert.AreEqual(_mockMetricsCollection.Object.Metrics.ContainsKey(TelemetryDataConstants.TestSessionTotalSessionTimeInSec), exists);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionLauncherFactoryTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionLauncherFactoryTests.cs
index 50ce45cbf1..938f7e513c 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionLauncherFactoryTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionLauncherFactoryTests.cs
@@ -1,49 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class DataCollectionLauncherFactoryTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+
+    private readonly string _dummyRunSettings =
+        "<RunSettings><DataCollectionRunSettings><DataCollectors><DataCollector friendlyName=\"dummy\"></DataCollector></DataCollectors></DataCollectionRunSettings></RunSettings>";
+
+    public DataCollectionLauncherFactoryTests()
+    {
+        _mockProcessHelper = new Mock<IProcessHelper>();
+    }
+
+    [TestMethod]
+    public void GetDataCollectorLauncherShouldReturnDefaultDataCollectionLauncherWithFullClrRunner()
+    {
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("vstest.console.exe");
+        var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(_mockProcessHelper.Object, _dummyRunSettings);
+        Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DefaultDataCollectionLauncher));
+    }
 
-    using Moq;
+    [TestMethod]
+    public void GetDataCollectorLauncherShouldReturnDotnetDataCollectionLauncherWithDotnetCore()
+    {
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("dotnet");
+        var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(_mockProcessHelper.Object, _dummyRunSettings);
+        Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DotnetDataCollectionLauncher));
+    }
 
-    [TestClass]
-    public class DataCollectionLauncherFactoryTests
+    [TestMethod]
+    public void GetDataCollectorLauncherShouldBeInsensitiveToCaseOfCurrentProcess()
     {
-        private Mock<IProcessHelper> mockProcessHelper;
-
-        private string dummyRunSettings =
-            "<RunSettings><DataCollectionRunSettings><DataCollectors><DataCollector friendlyName=\"dummy\"></DataCollector></DataCollectors></DataCollectionRunSettings></RunSettings>";
-
-        public DataCollectionLauncherFactoryTests()
-        {
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-        }
-
-        [TestMethod]
-        public void GetDataCollectorLauncherShouldReturnDefaultDataCollectionLauncherWithFullCLRRunner()
-        {
-            mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("vstest.console.exe");
-            var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(mockProcessHelper.Object, this.dummyRunSettings);
-            Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DefaultDataCollectionLauncher));
-        }
-
-        [TestMethod]
-        public void GetDataCollectorLauncherShouldReturnDotnetDataCollectionLauncherWithDotnetCore()
-        {
-            mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("dotnet");
-            var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(mockProcessHelper.Object, this.dummyRunSettings);
-            Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DotnetDataCollectionLauncher));
-        }
-
-        [TestMethod]
-        public void GetDataCollectorLauncherShouldBeInsensitiveToCaseOfCurrentProcess()
-        {
-            mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DOTNET");
-            var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(mockProcessHelper.Object, this.dummyRunSettings);
-            Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DotnetDataCollectionLauncher));
-        }
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DOTNET");
+        var dataCollectorLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(_mockProcessHelper.Object, _dummyRunSettings);
+        Assert.IsInstanceOfType(dataCollectorLauncher, typeof(DotnetDataCollectionLauncher));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionTestRunEventsHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionTestRunEventsHandlerTests.cs
index 00e439873a..465ce2effa 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionTestRunEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DataCollectionTestRunEventsHandlerTests.cs
@@ -1,152 +1,186 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class DataCollectionTestRunEventsHandlerTests
 {
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class DataCollectionTestRunEventsHandlerTests
+    private readonly Mock<IInternalTestRunEventsHandler> _baseTestRunEventsHandler;
+    private DataCollectionTestRunEventsHandler _testRunEventHandler;
+    private readonly Mock<IProxyDataCollectionManager> _proxyDataCollectionManager;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+
+    public DataCollectionTestRunEventsHandlerTests()
     {
-        private Mock<ITestRunEventsHandler> baseTestRunEventsHandler;
-        private DataCollectionTestRunEventsHandler testRunEventHandler;
-        private Mock<IProxyDataCollectionManager> proxyDataCollectionManager;
-        private Mock<IDataSerializer> mockDataSerializer;
+        _baseTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _proxyDataCollectionManager = new Mock<IProxyDataCollectionManager>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _testRunEventHandler = new DataCollectionTestRunEventsHandler(_baseTestRunEventsHandler.Object, _proxyDataCollectionManager.Object, _mockDataSerializer.Object, CancellationToken.None);
+    }
 
-        [TestInitialize]
-        public void InitializeTests()
-        {
-            this.baseTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.proxyDataCollectionManager = new Mock<IProxyDataCollectionManager>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.testRunEventHandler = new DataCollectionTestRunEventsHandler(this.baseTestRunEventsHandler.Object, this.proxyDataCollectionManager.Object, this.mockDataSerializer.Object, CancellationToken.None);
-        }
-
-        [TestMethod]
-        public void HandleLogMessageShouldSendMessageToBaseTestRunEventsHandler()
-        {
-            this.testRunEventHandler.HandleLogMessage(TestMessageLevel.Informational, null);
-            this.baseTestRunEventsHandler.Verify(th => th.HandleLogMessage(0, null), Times.AtLeast(1));
-        }
+    [TestMethod]
+    public void HandleLogMessageShouldSendMessageToBaseTestRunEventsHandler()
+    {
+        _testRunEventHandler.HandleLogMessage(TestMessageLevel.Informational, null);
+        _baseTestRunEventsHandler.Verify(th => th.HandleLogMessage(0, null), Times.AtLeast(1));
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldSendMessageToBaseTestRunEventsHandler()
-        {
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.BeforeTestRunStart });
-            this.testRunEventHandler.HandleRawMessage(null);
-            this.baseTestRunEventsHandler.Verify(th => th.HandleRawMessage(null), Times.AtLeast(1));
-        }
+    [TestMethod]
+    public void HandleRawMessageShouldSendMessageToBaseTestRunEventsHandler()
+    {
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.BeforeTestRunStart });
+        _testRunEventHandler.HandleRawMessage(null!);
+        _baseTestRunEventsHandler.Verify(th => th.HandleRawMessage(null!), Times.AtLeast(1));
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldGetDataCollectorAttachments()
-        {
-            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new TimeSpan());
+    [TestMethod]
+    public void HandleRawMessageShouldGetDataCollectorAttachments()
+    {
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan());
 
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
 
-            this.testRunEventHandler.HandleRawMessage(string.Empty);
-            this.proxyDataCollectionManager.Verify(
-                dcm => dcm.AfterTestRunEnd(false, It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
+        _testRunEventHandler.HandleRawMessage(string.Empty);
+        _proxyDataCollectionManager.Verify(
+            dcm => dcm.AfterTestRunEnd(false, It.IsAny<IInternalTestRunEventsHandler>()),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldInvokeAfterTestRunEndPassingFalseIfRequestNotCancelled()
-        {
-            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new TimeSpan());
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeAfterTestRunEndPassingFalseIfRequestNotCancelled()
+    {
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan());
 
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            testRunEventHandler = new DataCollectionTestRunEventsHandler(this.baseTestRunEventsHandler.Object, this.proxyDataCollectionManager.Object, this.mockDataSerializer.Object, cancellationTokenSource.Token);
+        var cancellationTokenSource = new CancellationTokenSource();
+        _testRunEventHandler = new DataCollectionTestRunEventsHandler(_baseTestRunEventsHandler.Object, _proxyDataCollectionManager.Object, _mockDataSerializer.Object, cancellationTokenSource.Token);
 
-            testRunEventHandler.HandleRawMessage(string.Empty);
+        _testRunEventHandler.HandleRawMessage(string.Empty);
 
-            this.proxyDataCollectionManager.Verify(
-                dcm => dcm.AfterTestRunEnd(false, It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
+        _proxyDataCollectionManager.Verify(
+            dcm => dcm.AfterTestRunEnd(false, It.IsAny<IInternalTestRunEventsHandler>()),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldInvokeAfterTestRunEndPassingTrueIfRequestCancelled()
-        {
-            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new TimeSpan());
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeAfterTestRunEndPassingTrueIfRequestCancelled()
+    {
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan());
 
-            this.mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
-            this.mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
-                .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
 
-            var cancellationTokenSource = new CancellationTokenSource();
-            testRunEventHandler = new DataCollectionTestRunEventsHandler(this.baseTestRunEventsHandler.Object, this.proxyDataCollectionManager.Object, this.mockDataSerializer.Object, cancellationTokenSource.Token);
-            cancellationTokenSource.Cancel();
+        var cancellationTokenSource = new CancellationTokenSource();
+        _testRunEventHandler = new DataCollectionTestRunEventsHandler(_baseTestRunEventsHandler.Object, _proxyDataCollectionManager.Object, _mockDataSerializer.Object, cancellationTokenSource.Token);
+        cancellationTokenSource.Cancel();
 
-            testRunEventHandler.HandleRawMessage(string.Empty);
+        _testRunEventHandler.HandleRawMessage(string.Empty);
 
-            this.proxyDataCollectionManager.Verify(
-                dcm => dcm.AfterTestRunEnd(true, It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
+        _proxyDataCollectionManager.Verify(
+            dcm => dcm.AfterTestRunEnd(true, It.IsAny<IInternalTestRunEventsHandler>()),
+            Times.Once);
+    }
 
-        #region Get Combined Attachments
-        [TestMethod]
-        public void GetCombinedAttachmentSetsShouldReturnCombinedAttachments()
+    [TestMethod]
+    public void HandleRawMessageShouldInvokeAfterTestRunEndAndReturnInvokedDataCollectors()
+    {
+        var invokedDataCollectors = new Collection<InvokedDataCollector>
         {
-            Collection<AttachmentSet> Attachments1 = new Collection<AttachmentSet>();
-            AttachmentSet attachmentset1 = new AttachmentSet(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
-            attachmentset1.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v11"), "AttachmentV1-Attachment1"));
-            Attachments1.Add(attachmentset1);
+            new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, true)
+        };
+
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan());
+        _mockDataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns(new Message() { MessageType = MessageType.ExecutionComplete });
+        _mockDataSerializer.Setup(x => x.DeserializePayload<TestRunCompletePayload>(It.IsAny<Message>()))
+            .Returns(new TestRunCompletePayload() { TestRunCompleteArgs = testRunCompleteEventArgs });
+        _proxyDataCollectionManager.Setup(p => p.AfterTestRunEnd(It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>()))
+            .Returns(new DataCollectionResult(null, invokedDataCollectors));
+        _mockDataSerializer.Setup(r => r.SerializePayload(It.IsAny<string>(), It.IsAny<object>())).Callback((string message, object o) =>
+        {
+            var testRunCompleteArgs = o as TestRunCompletePayload;
+            Assert.IsNotNull(testRunCompleteArgs);
+            Assert.AreEqual(1, testRunCompleteArgs.TestRunCompleteArgs!.InvokedDataCollectors.Count);
+            Assert.AreEqual(invokedDataCollectors[0], testRunCompleteArgs.TestRunCompleteArgs.InvokedDataCollectors[0]);
+        });
+
+        _testRunEventHandler = new DataCollectionTestRunEventsHandler(_baseTestRunEventsHandler.Object, _proxyDataCollectionManager.Object, _mockDataSerializer.Object, CancellationToken.None);
+        _testRunEventHandler.HandleRawMessage(string.Empty);
+
+        var testRunCompleteEventArgs2 = new TestRunCompleteEventArgs(null, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan());
+        _testRunEventHandler.HandleTestRunComplete(testRunCompleteEventArgs2, null, null, null);
+        Assert.AreEqual(1, testRunCompleteEventArgs2.InvokedDataCollectors.Count);
+        Assert.AreEqual(invokedDataCollectors[0], testRunCompleteEventArgs2.InvokedDataCollectors[0]);
+
+        _proxyDataCollectionManager.Verify(
+            dcm => dcm.AfterTestRunEnd(false, It.IsAny<IInternalTestRunEventsHandler>()),
+            Times.Once);
+    }
 
-            Collection<AttachmentSet> Attachments2 = new Collection<AttachmentSet>();
-            AttachmentSet attachmentset2 = new AttachmentSet(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
-            attachmentset2.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v12"), "AttachmentV1-Attachment2"));
+    #region Get Combined Attachments
+    [TestMethod]
+    public void GetCombinedAttachmentSetsShouldReturnCombinedAttachments()
+    {
+        Collection<AttachmentSet> attachments1 = new();
+        AttachmentSet attachmentset1 = new(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
+        attachmentset1.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v11"), "AttachmentV1-Attachment1"));
+        attachments1.Add(attachmentset1);
 
-            Attachments2.Add(attachmentset2);
+        Collection<AttachmentSet> attachments2 = new();
+        AttachmentSet attachmentset2 = new(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
+        attachmentset2.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v12"), "AttachmentV1-Attachment2"));
 
-            var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(Attachments1, Attachments2);
+        attachments2.Add(attachmentset2);
 
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual(2, result.First().Attachments.Count);
-        }
+        var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(attachments1, attachments2);
 
-        [TestMethod]
-        public void GetCombinedAttachmentSetsShouldReturnFirstArgumentIfSecondArgumentIsNull()
-        {
-            Collection<AttachmentSet> Attachments1 = new Collection<AttachmentSet>();
-            AttachmentSet attachmentset1 = new AttachmentSet(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
-            attachmentset1.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v11"), "AttachmentV1-Attachment1"));
-            Attachments1.Add(attachmentset1);
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual(2, result.First().Attachments.Count);
+    }
 
-            var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(Attachments1, null);
+    [TestMethod]
+    public void GetCombinedAttachmentSetsShouldReturnFirstArgumentIfSecondArgumentIsNull()
+    {
+        Collection<AttachmentSet> attachments1 = new();
+        AttachmentSet attachmentset1 = new(new Uri("DataCollection://Attachment/v1"), "AttachmentV1");
+        attachmentset1.Attachments.Add(new UriDataAttachment(new Uri("DataCollection://Attachment/v11"), "AttachmentV1-Attachment1"));
+        attachments1.Add(attachmentset1);
 
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual(1, result.First().Attachments.Count);
-        }
+        var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(attachments1, null);
 
-        [TestMethod]
-        public void GetCombinedAttachmentSetsShouldReturnNullIfFirstArgumentIsNull()
-        {
-            var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(null, null);
-            Assert.IsNull(result);
-        }
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual(1, result.First().Attachments.Count);
+    }
 
-        #endregion
+    [TestMethod]
+    public void GetCombinedAttachmentSetsShouldReturnNullIfFirstArgumentIsNull()
+    {
+        var result = DataCollectionTestRunEventsHandler.GetCombinedAttachmentSets(null, null);
+        Assert.IsNull(result);
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DotnetDataCollectionLauncherTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DotnetDataCollectionLauncherTests.cs
index 337e267ff4..205553eec3 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DotnetDataCollectionLauncherTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/DotnetDataCollectionLauncherTests.cs
@@ -1,72 +1,69 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 
-    [TestClass]
-    public class DotnetDataCollectionLauncherTests
-    {
-        private Mock<IFileHelper> mockFileHelper;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private Mock<IProcessHelper> mockProcessHelper;
+using Moq;
 
-        private Mock<IMessageLogger> mockMessageLogger;
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
 
-        private DotnetDataCollectionLauncher dataCollectionLauncher;
+[TestClass]
+public class DotnetDataCollectionLauncherTests
+{
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IMessageLogger> _mockMessageLogger;
+    private readonly DotnetDataCollectionLauncher _dataCollectionLauncher;
 
-        public DotnetDataCollectionLauncherTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockMessageLogger = new Mock<IMessageLogger>();
+    public DotnetDataCollectionLauncherTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("dotnet");
+        _mockMessageLogger = new Mock<IMessageLogger>();
 
-            this.dataCollectionLauncher = new DotnetDataCollectionLauncher(this.mockProcessHelper.Object, this.mockFileHelper.Object, this.mockMessageLogger.Object);
-        }
+        _dataCollectionLauncher = new DotnetDataCollectionLauncher(_mockProcessHelper.Object, _mockFileHelper.Object, _mockMessageLogger.Object);
+    }
 
-        [TestMethod]
-        public void LaunchDataCollectorShouldLaunchDataCollectorProcess()
-        {
-            List<string> arguments = new List<string>();
-            this.dataCollectionLauncher.LaunchDataCollector(null, arguments);
+    [TestMethod]
+    public void LaunchDataCollectorShouldLaunchDataCollectorProcess()
+    {
+        List<string> arguments = new();
+        _dataCollectionLauncher.LaunchDataCollector(null, arguments);
 
-            this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
-        }
+        _mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IDictionary<string, string?>>(), It.IsAny<Action<object?, string?>>(), It.IsAny<Action<object?>>(), It.IsAny<Action<object?, string?>>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void LaunchDataCollectorShouldAppendDoubleQuoteForDataCollectorDllPath()
-        {
-            var currentWorkingDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).GetTypeInfo().Assembly.GetAssemblyLocation());
-            var dataCollectorAssemblyPath = Path.Combine(currentWorkingDirectory, "datacollector.dll");
+    [TestMethod]
+    public void LaunchDataCollectorShouldAppendDoubleQuoteForDataCollectorDllPath()
+    {
+        var currentWorkingDirectory = Path.GetDirectoryName(typeof(DefaultDataCollectionLauncher).Assembly.GetAssemblyLocation())!;
+        var dataCollectorAssemblyPath = Path.Combine(currentWorkingDirectory, "datacollector.dll");
 
-            List<string> arguments = new List<string>();
-            this.dataCollectionLauncher.LaunchDataCollector(null, arguments);
+        List<string> arguments = new();
+        _dataCollectionLauncher.LaunchDataCollector(null, arguments);
 
-            this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), string.Format("{0} \"{1}\" {2} ", "exec", dataCollectorAssemblyPath, string.Join(" ", arguments)), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
-        }
+        _mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), string.Format(CultureInfo.InvariantCulture, "{0} \"{1}\" {2} ", "exec", dataCollectorAssemblyPath, string.Join(" ", arguments)), It.IsAny<string>(), It.IsAny<IDictionary<string, string?>>(), It.IsAny<Action<object?, string?>>(), It.IsAny<Action<object?>>(), It.IsAny<Action<object?, string?>>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void LaunchDataCollectorShouldLaunchDataCollectorProcessWithCurrecntWorkingDirectory()
-        {
-            List<string> arguments = new List<string>();
-            this.dataCollectionLauncher.LaunchDataCollector(null, arguments);
+    [TestMethod]
+    public void LaunchDataCollectorShouldLaunchDataCollectorProcessWithCurrecntWorkingDirectory()
+    {
+        List<string> arguments = new();
+        _dataCollectionLauncher.LaunchDataCollector(null, arguments);
 
-            string currentWorkingDirectory = Directory.GetCurrentDirectory();
+        string currentWorkingDirectory = Directory.GetCurrentDirectory();
 
-            this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), currentWorkingDirectory, It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
-        }
+        _mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), currentWorkingDirectory, It.IsAny<IDictionary<string, string?>>(), It.IsAny<Action<object?, string?>>(), It.IsAny<Action<object?>>(), It.IsAny<Action<object?, string?>>()), Times.Once());
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
index 0b439bff1a..87c3f5dfb6 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionExtensionManagerTests.cs
@@ -1,32 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Constants = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Constants;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class InProcDataCollectionExtensionManagerTests
 {
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using Constants = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Constants;
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    [TestClass]
-    public class InProcDataCollectionExtensionManagerTests
-    {
-        private string settingsXml = @"<RunSettings>
+    private static readonly string Temp = Path.GetTempPath();
+    private readonly string _settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\repos\MSTest\src\managed\TestPlatform\TestImpactListener.Tests\bin\Debug\TestImpactListener.Tests.dll'>
@@ -37,39 +38,58 @@ public class InProcDataCollectionExtensionManagerTests
                                         </InProcDataCollectors>
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
-        private Mock<ITestEventsPublisher> mockTestEventsPublisher;
-        private TestableInProcDataCollectionExtensionManager inProcDataCollectionManager;
-        private static string temp = Path.GetTempPath();
-        private string defaultCodebase = Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug");
-        private Mock<IFileHelper> mockFileHelper;
-        private TestPluginCache testPluginCache;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockTestEventsPublisher = new Mock<ITestEventsPublisher>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.testPluginCache = TestPluginCache.Instance;
-            this.inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(this.settingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache, this.mockFileHelper.Object);
-        }
+    private readonly Mock<ITestEventsPublisher> _mockTestEventsPublisher;
+    private readonly string _defaultCodebase = Path.Combine(Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug");
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly TestPluginCache _testPluginCache;
 
-        [TestMethod]
-        public void InProcDataCollectionExtensionManagerShouldLoadsDataCollectorsFromRunSettings()
-        {
-            var dataCollector = inProcDataCollectionManager.InProcDataCollectors.First().Value as MockDataCollector;
+    private TestableInProcDataCollectionExtensionManager _inProcDataCollectionManager;
+
+    public InProcDataCollectionExtensionManagerTests()
+    {
+        _mockTestEventsPublisher = new Mock<ITestEventsPublisher>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _testPluginCache = TestPluginCache.Instance;
+        _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(_settingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
+    }
 
-            Assert.IsTrue(inProcDataCollectionManager.IsInProcDataCollectionEnabled, "InProcDataCollection must be enabled if runsettings contains inproc datacollectors.");
-            Assert.AreEqual(1, inProcDataCollectionManager.InProcDataCollectors.Count, "One Datacollector must be registered");
+    [TestMethod]
+    public void CodeBasePathsAreDeduplicatedWithCaseIgnoring()
+    {
+        var testPluginCache = new TestableTestPluginCache();
+        // the boolean argument refers to adding the paths to which list(we have two lists)and the duplicate happened when we merged the two lists and they had the same path
+        testPluginCache.UpdateExtensions(new List<string> { Path.Combine(Temp, "DEDUPLICATINGWITHCASEIGNORING1", "Collector.dll") }, false);
+        var directory1 = Path.Combine(Temp, "DeduplicatingWithCaseIgnoring1");
+        var directory2 = Path.Combine(Temp, "DeduplicatingWithCaseIgnoring2");
+        testPluginCache.UpdateExtensions(new List<string> { Path.Combine(directory1, "Collector.dll"), Path.Combine(directory2, "Collector.dll") }, true);
 
-            StringAssert.Equals(dataCollector.AssemblyQualifiedName, "TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a");
-            StringAssert.Equals(dataCollector.CodeBase, Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"));
-            StringAssert.Equals(dataCollector.Configuration.OuterXml, @"<Configuration><Port>4312</Port></Configuration>");
-        }
+        var inProcDataCollectionExtensionManager = new TestableInProcDataCollectionExtensionManager(_settingsXml, _mockTestEventsPublisher.Object, null, testPluginCache, _mockFileHelper.Object);
 
-        [TestMethod]
-        public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromDefaultCodebaseIfExistsAndCodebaseIsRelative()
-        {
-            string settingsXml = @"<RunSettings>
+        Assert.AreEqual(3, inProcDataCollectionExtensionManager.CodeBasePaths.Count); // "CodeBasePaths" contains the two extensions(after removing duplicates) and the "_defaultCodebase"
+
+        Assert.IsTrue(inProcDataCollectionExtensionManager.CodeBasePaths.Contains(null));
+        Assert.IsTrue(inProcDataCollectionExtensionManager.CodeBasePaths.Contains(directory1));
+        Assert.IsTrue(inProcDataCollectionExtensionManager.CodeBasePaths.Contains(directory2));
+    }
+
+
+    [TestMethod]
+    public void InProcDataCollectionExtensionManagerShouldLoadsDataCollectorsFromRunSettings()
+    {
+        var dataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.First().Value;
+
+        Assert.IsTrue(_inProcDataCollectionManager.IsInProcDataCollectionEnabled, "InProcDataCollection must be enabled if runsettings contains inproc datacollectors.");
+        Assert.AreEqual(1, _inProcDataCollectionManager.InProcDataCollectors.Count, "One Datacollector must be registered");
+
+        Equals(dataCollector.AssemblyQualifiedName, "TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a");
+        Equals(dataCollector.CodeBase, Path.Combine(Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"));
+        Equals(dataCollector.Configuration.OuterXml, @"<Configuration><Port>4312</Port></Configuration>");
+    }
+
+    [TestMethod]
+    public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromDefaultCodebaseIfExistsAndCodebaseIsRelative()
+    {
+        string settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='TestImpactListener.Tests.dll'>
@@ -81,17 +101,17 @@ public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromDefaultCod
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-            this.mockFileHelper.Setup(fh => fh.Exists(Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"))).Returns(true);
-            this.inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache, this.mockFileHelper.Object);
+        _mockFileHelper.Setup(fh => fh.Exists(Path.Combine(new[] { Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll" }))).Returns(true);
+        _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
 
-            var codebase = (inProcDataCollectionManager.InProcDataCollectors.Values.First() as MockDataCollector).CodeBase;
-            Assert.AreEqual(Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"), codebase);
-        }
+        var codebase = ((MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First()).CodeBase;
+        Assert.AreEqual(Path.Combine(Temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests.dll"), codebase);
+    }
 
-        [TestMethod]
-        public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromTestPluginCacheIfExistsAndCodebaseIsRelative()
-        {
-            string settingsXml = @"<RunSettings>
+    [TestMethod]
+    public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromTestPluginCacheIfExistsAndCodebaseIsRelative()
+    {
+        string settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='TestImpactListenerDataCollector.dll'>
@@ -103,19 +123,19 @@ public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromTestPlugin
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-            this.testPluginCache.UpdateExtensions(new List<string> { Path.Combine(temp, "source", ".nuget", "TestImpactListenerDataCollector.dll") }, true);
-            this.mockFileHelper.Setup(fh => fh.Exists(Path.Combine(temp, "source", ".nuget", "TestImpactListenerDataCollector.dll"))).Returns(true);
+        _testPluginCache.UpdateExtensions(new List<string> { Path.Combine(Temp, "source", ".nuget", "TestImpactListenerDataCollector.dll") }, true);
+        _mockFileHelper.Setup(fh => fh.Exists(Path.Combine(Temp, "source", ".nuget", "TestImpactListenerDataCollector.dll"))).Returns(true);
 
-            this.inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache, this.mockFileHelper.Object);
+        _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
 
-            var codebase = (inProcDataCollectionManager.InProcDataCollectors.Values.First() as MockDataCollector).CodeBase;
-            Assert.AreEqual(Path.Combine(temp,"source", ".nuget", "TestImpactListenerDataCollector.dll"), codebase);
-        }
+        var codebase = ((MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First()).CodeBase;
+        Assert.AreEqual(Path.Combine(Temp, "source", ".nuget", "TestImpactListenerDataCollector.dll"), codebase);
+    }
 
-        [TestMethod]
-        public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromGivenCodebaseIfCodebaseIsAbsolute()
-        {
-            string settingsXml = @"<RunSettings>
+    [TestMethod]
+    public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromGivenCodebaseIfCodebaseIsAbsolute()
+    {
+        string settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='\\DummyPath\TestImpactListener.Tests.dll'>
@@ -126,19 +146,19 @@ public void InProcDataCollectionExtensionManagerLoadsDataCollectorFromGivenCodeb
                                         </InProcDataCollectors>
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
-            this.inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache, this.mockFileHelper.Object);
+        _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(settingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
 
-            var codebase = (inProcDataCollectionManager.InProcDataCollectors.Values.First() as MockDataCollector).CodeBase;
-            Assert.AreEqual("\\\\DummyPath\\TestImpactListener.Tests.dll", codebase);
-        }
+        var codebase = ((MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First()).CodeBase;
+        Assert.AreEqual("\\\\DummyPath\\TestImpactListener.Tests.dll", codebase);
+    }
 
-        [TestMethod]
-        public void InProcDataCollectorIsReadingMultipleDataCollector()
-        {
-            var temp = Path.GetTempPath();
-            var path1 = Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests1.dll");
-            var path2 = Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests2.dll");
-            var multiSettingsXml = $@"<RunSettings>
+    [TestMethod]
+    public void InProcDataCollectorIsReadingMultipleDataCollector()
+    {
+        var temp = Path.GetTempPath();
+        var path1 = Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests1.dll");
+        var path2 = Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests2.dll");
+        var multiSettingsXml = $@"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='{path1}'>
@@ -155,37 +175,37 @@ public void InProcDataCollectorIsReadingMultipleDataCollector()
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-            this.inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(multiSettingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache, this.mockFileHelper.Object);
-            bool secondOne = false;
-            MockDataCollector dataCollector1 = null;
-            MockDataCollector dataCollector2 = null;
+        _inProcDataCollectionManager = new TestableInProcDataCollectionExtensionManager(multiSettingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache, _mockFileHelper.Object);
+        bool secondOne = false;
+        MockDataCollector? dataCollector1 = null;
+        MockDataCollector? dataCollector2 = null;
 
-            foreach (var inProcDC in inProcDataCollectionManager.InProcDataCollectors.Values)
+        foreach (var inProcDc in _inProcDataCollectionManager.InProcDataCollectors.Values)
+        {
+            if (secondOne)
+            {
+                dataCollector2 = inProcDc as MockDataCollector;
+            }
+            else
             {
-                if (secondOne)
-                {
-                    dataCollector2 = inProcDC as MockDataCollector;
-                }
-                else
-                {
-                    dataCollector1 = inProcDC as MockDataCollector;
-                    secondOne = true;
-                }
+                dataCollector1 = inProcDc as MockDataCollector;
+                secondOne = true;
             }
+        }
 
-            Assert.IsTrue(string.Equals(dataCollector1.AssemblyQualifiedName, "TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a", StringComparison.OrdinalIgnoreCase));
-            Assert.IsTrue(string.Equals(dataCollector1.CodeBase, Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests1.dll"), StringComparison.OrdinalIgnoreCase));
-            Assert.IsTrue(string.Equals(dataCollector1.Configuration.OuterXml, @"<Configuration><Port>4312</Port></Configuration>", StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(string.Equals(dataCollector1!.AssemblyQualifiedName, "TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a", StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(string.Equals(dataCollector1.CodeBase, Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests1.dll"), StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(string.Equals(dataCollector1.Configuration.OuterXml, @"<Configuration><Port>4312</Port></Configuration>", StringComparison.OrdinalIgnoreCase));
 
-            Assert.IsTrue(string.Equals(dataCollector2.AssemblyQualifiedName, "TestImpactListener.Tests, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a", StringComparison.OrdinalIgnoreCase));
-            Assert.IsTrue(string.Equals(dataCollector2.CodeBase, Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests2.dll"), StringComparison.OrdinalIgnoreCase));
-            Assert.IsTrue(string.Equals(dataCollector2.Configuration.OuterXml, @"<Configuration><Port>4313</Port></Configuration>", StringComparison.OrdinalIgnoreCase));
-        }
+        Assert.IsTrue(string.Equals(dataCollector2!.AssemblyQualifiedName, "TestImpactListener.Tests, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a", StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(string.Equals(dataCollector2.CodeBase, Path.Combine(temp, "repos", "MSTest", "src", "managed", "TestPlatform", "TestImpactListener.Tests", "bin", "Debug", "TestImpactListener.Tests2.dll"), StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(string.Equals(dataCollector2.Configuration.OuterXml, @"<Configuration><Port>4313</Port></Configuration>", StringComparison.OrdinalIgnoreCase));
+    }
 
-        [TestMethod]
-        public void InProcDataCollectionExtensionManagerWillNotEnableDataCollectionForInavlidSettingsXml()
-        {
-            var invalidSettingsXml = @"<RunSettings>
+    [TestMethod]
+    public void InProcDataCollectionExtensionManagerWillNotEnableDataCollectionForInavlidSettingsXml()
+    {
+        var invalidSettingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\repos\MSTest\src\managed\TestPlatform\TestImpactListener.Tests\bin\Debug\TestImpactListener.Tests.dll' value='Invalid'>
@@ -197,151 +217,134 @@ public void InProcDataCollectionExtensionManagerWillNotEnableDataCollectionForIn
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-            var manager = new InProcDataCollectionExtensionManager(invalidSettingsXml, this.mockTestEventsPublisher.Object, this.defaultCodebase, this.testPluginCache);
-            Assert.IsFalse(manager.IsInProcDataCollectionEnabled, "InProcDataCollection must be disabled on invalid settings.");
-        }
-        [TestMethod]
-        public void TriggerSessionStartShouldBeCalledWithCorrectTestSources()
+        var manager = new InProcDataCollectionExtensionManager(invalidSettingsXml, _mockTestEventsPublisher.Object, _defaultCodebase, _testPluginCache);
+        Assert.IsFalse(manager.IsInProcDataCollectionEnabled, "InProcDataCollection must be disabled on invalid settings.");
+    }
+    [TestMethod]
+    public void TriggerSessionStartShouldBeCalledWithCorrectTestSources()
+    {
+        var properties = new Dictionary<string, object?>
         {
-            var properties = new Dictionary<string, object>();
-            properties.Add("TestSources", new List<string>() { "testsource1.dll", "testsource2.dll" });
+            { "TestSources", new List<string>() { "testsource1.dll", "testsource2.dll" } }
+        };
 
-            var mockDataCollector = inProcDataCollectionManager.InProcDataCollectors.Values.FirstOrDefault() as MockDataCollector;
+        var mockDataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First();
 
-            this.mockTestEventsPublisher.Raise(x => x.SessionStart += null, new SessionStartEventArgs(properties));
-            Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 1), "TestSessionStart must be called on datacollector");
+        _mockTestEventsPublisher.Raise(x => x.SessionStart += null, new SessionStartEventArgs(properties));
+        Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 1), "TestSessionStart must be called on datacollector");
 
-            Assert.IsTrue(mockDataCollector.TestSources.Contains("testsource1.dll"));
-            Assert.IsTrue(mockDataCollector.TestSources.Contains("testsource2.dll"));
-        }
+        Assert.IsNotNull(mockDataCollector.TestSources);
+        Assert.IsTrue(mockDataCollector.TestSources.Contains("testsource1.dll"));
+        Assert.IsTrue(mockDataCollector.TestSources.Contains("testsource2.dll"));
+    }
 
 
-        [TestMethod]
-        public void TriggerSessionStartShouldCallInProcDataCollector()
-        {
-            this.mockTestEventsPublisher.Raise(x => x.SessionStart += null, new SessionStartEventArgs());
+    [TestMethod]
+    public void TriggerSessionStartShouldCallInProcDataCollector()
+    {
+        _mockTestEventsPublisher.Raise(x => x.SessionStart += null, new SessionStartEventArgs());
 
-            var mockDataCollector = inProcDataCollectionManager.InProcDataCollectors.Values.FirstOrDefault() as MockDataCollector;
-            Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 1), "TestSessionStart must be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestSessionEndCalled == 0), "TestSessionEnd must NOT be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 0), "TestCaseStart must NOT be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
-        }
+        var mockDataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First();
+        Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 1), "TestSessionStart must be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestSessionEndCalled == 0), "TestSessionEnd must NOT be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 0), "TestCaseStart must NOT be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
+    }
 
-        [TestMethod]
-        public void TriggerSessionEndShouldCallInProcDataCollector()
-        {
-            this.mockTestEventsPublisher.Raise(x => x.SessionEnd += null, new SessionEndEventArgs());
+    [TestMethod]
+    public void TriggerSessionEndShouldCallInProcDataCollector()
+    {
+        _mockTestEventsPublisher.Raise(x => x.SessionEnd += null, new SessionEndEventArgs());
 
-            var mockDataCollector = inProcDataCollectionManager.InProcDataCollectors.Values.FirstOrDefault() as MockDataCollector;
-            Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 0), "TestSessionEnd must NOT be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestSessionEndCalled == 1), "TestSessionStart must be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 0), "TestCaseStart must NOT be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
-        }
+        var mockDataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First();
+        Assert.IsTrue((mockDataCollector.TestSessionStartCalled == 0), "TestSessionEnd must NOT be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestSessionEndCalled == 1), "TestSessionStart must be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 0), "TestCaseStart must NOT be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
+    }
 
-        [TestMethod]
-        public void TriggerTestCaseStartShouldCallInProcDataCollector()
-        {
-            var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-            // random guid
-            testCase.Id = new Guid("3871B3B0-2853-406B-BB61-1FE1764116FD");
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
+    [TestMethod]
+    public void TriggerTestCaseStartShouldCallInProcDataCollector()
+    {
+        var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+        // random guid
+        testCase.Id = new Guid("3871B3B0-2853-406B-BB61-1FE1764116FD");
+        _mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
 
-            var mockDataCollector = inProcDataCollectionManager.InProcDataCollectors.Values.FirstOrDefault() as MockDataCollector;
+        var mockDataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First();
 
-            Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 1), "TestCaseStart must be called on datacollector");
-            Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
-        }
+        Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 1), "TestCaseStart must be called on datacollector");
+        Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 0), "TestCaseEnd must NOT be called on datacollector");
+    }
 
-        [TestMethod]
-        public void TriggerTestCaseEndShouldtBeCalledMultipleTimesInDataDrivenScenario()
+    [TestMethod]
+    public void TriggerTestCaseEndShouldtBeCalledMultipleTimesInDataDrivenScenario()
+    {
+        var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+        // random guid
+        testCase.Id = new Guid("3871B3B0-2853-406B-BB61-1FE1764116FD");
+        _mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
+        _mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testCase, TestOutcome.Passed));
+        _mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
+        _mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testCase, TestOutcome.Failed));
+
+        var mockDataCollector = (MockDataCollector)_inProcDataCollectionManager.InProcDataCollectors.Values.First();
+        Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 2), "TestCaseStart must only be called once");
+        Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 2), "TestCaseEnd must only be called once");
+    }
+
+    internal class TestableInProcDataCollectionExtensionManager : InProcDataCollectionExtensionManager
+    {
+        public TestableInProcDataCollectionExtensionManager(string runSettings, ITestEventsPublisher mockTestEventsPublisher, string? defaultCodebase, TestPluginCache testPluginCache, IFileHelper fileHelper)
+            : base(runSettings, mockTestEventsPublisher, defaultCodebase, testPluginCache, fileHelper)
         {
-            var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-            // random guid
-            testCase.Id = new Guid("3871B3B0-2853-406B-BB61-1FE1764116FD");
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testCase, TestOutcome.Passed));
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testCase));
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testCase, TestOutcome.Failed));
-
-            var mockDataCollector = inProcDataCollectionManager.InProcDataCollectors.Values.FirstOrDefault() as MockDataCollector;
-            Assert.IsTrue((mockDataCollector.TestCaseStartCalled == 2), "TestCaseStart must only be called once");
-            Assert.IsTrue((mockDataCollector.TestCaseEndCalled == 2), "TestCaseEnd must only be called once");
         }
 
-        internal class TestableInProcDataCollectionExtensionManager : InProcDataCollectionExtensionManager
+        protected override IInProcDataCollector CreateDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration, Type interfaceType)
         {
-            public TestableInProcDataCollectionExtensionManager(string runSettings, ITestEventsPublisher mockTestEventsPublisher, string defaultCodebase, TestPluginCache testPluginCache, IFileHelper fileHelper) 
-                : base(runSettings, mockTestEventsPublisher, defaultCodebase, testPluginCache, fileHelper)
-            {
-            }
-
-            protected override IInProcDataCollector CreateDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration, TypeInfo interfaceTypeInfo)
-            {
-                return new MockDataCollector(assemblyQualifiedName, codebase,configuration);
-            }
+            return new MockDataCollector(assemblyQualifiedName, codebase, configuration);
         }
+    }
 
-        public class MockDataCollector : IInProcDataCollector
+    public class MockDataCollector : IInProcDataCollector
+    {
+        public MockDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration)
         {
-            public MockDataCollector(string assemblyQualifiedName, string codebase, XmlElement configuration)
-            {
-                this.AssemblyQualifiedName = assemblyQualifiedName;
-                this.CodeBase = codebase;
-                this.Configuration = configuration;
-            }
-
-            public string AssemblyQualifiedName
-            {
-                get;
-                private set;
-            }
-
-            public string CodeBase
-            {
-                get;
-                private set;
-            }
-
-            public XmlElement Configuration
-            {
-                get;
-                private set;
-            }
+            AssemblyQualifiedName = assemblyQualifiedName;
+            CodeBase = codebase;
+            Configuration = configuration;
+        }
 
-            public int TestSessionStartCalled { get; private set; }
-            public int TestSessionEndCalled { get; private set; }
-            public int TestCaseStartCalled { get; private set; }
-            public int TestCaseEndCalled { get; private set; }
-            public IEnumerable<string> TestSources
-            {
-                get;
-                private set;
-            }
+        public string AssemblyQualifiedName { get; private set; }
+        public string CodeBase { get; private set; }
+        public XmlElement Configuration { get; private set; }
+        public int TestSessionStartCalled { get; private set; }
+        public int TestSessionEndCalled { get; private set; }
+        public int TestCaseStartCalled { get; private set; }
+        public int TestCaseEndCalled { get; private set; }
+        public IEnumerable<string>? TestSources { get; private set; }
 
-            public void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink)
-            {
-                // Do Nothing
-            }
+        public void LoadDataCollector(IDataCollectionSink inProcDataCollectionSink)
+        {
+            // Do Nothing
+        }
 
-            public void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg)
+        public void TriggerInProcDataCollectionMethod(string methodName, InProcDataCollectionArgs methodArg)
+        {
+            switch (methodName)
             {
-                switch (methodName)
-                {
-                    case Constants.TestSessionStartMethodName: this.TestSessionStartMethodCalled(methodArg as TestSessionStartArgs); break;
-                    case Constants.TestSessionEndMethodName: TestSessionEndCalled++; break;
-                    case Constants.TestCaseStartMethodName: TestCaseStartCalled++; break;
-                    case Constants.TestCaseEndMethodName: TestCaseEndCalled++; break;
-                    default: break;
-                }
+                case Constants.TestSessionStartMethodName: TestSessionStartMethodCalled((TestSessionStartArgs)methodArg); break;
+                case Constants.TestSessionEndMethodName: TestSessionEndCalled++; break;
+                case Constants.TestCaseStartMethodName: TestCaseStartCalled++; break;
+                case Constants.TestCaseEndMethodName: TestCaseEndCalled++; break;
+                default: break;
             }
+        }
 
-            private void TestSessionStartMethodCalled(TestSessionStartArgs testSessionStartArgs)
-            {
-                TestSessionStartCalled++;
-                this.TestSources = testSessionStartArgs.GetPropertyValue<IEnumerable<string>>("TestSources");
-            }
+        private void TestSessionStartMethodCalled(TestSessionStartArgs testSessionStartArgs)
+        {
+            TestSessionStartCalled++;
+            TestSources = testSessionStartArgs.GetPropertyValue<IEnumerable<string>>("TestSources");
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionSinkTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionSinkTests.cs
index 83fba0bd1e..d3b85388af 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionSinkTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectionSinkTests.cs
@@ -1,68 +1,64 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection
-{
-    using System;
-
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 
-    [TestClass]
-    public class InProcDataCollectionSinkTests
-    {
-        private IDataCollectionSink dataCollectionSink;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        private DataCollectionContext dataCollectionContext;
+namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
 
-        private TestCase testCase;
+[TestClass]
+public class InProcDataCollectionSinkTests
+{
+    private readonly IDataCollectionSink _dataCollectionSink;
+    private readonly DataCollectionContext _dataCollectionContext;
+    private readonly TestCase _testCase;
 
-        [TestInitialize]
-        public void InitializeTest()
-        {
-            this.dataCollectionSink = new InProcDataCollectionSink();
-            this.testCase = new TestCase("DummyNS.DummyC.DummyM", new Uri("executor://mstest/v1"), "Dummy.dll");
-            this.dataCollectionContext = new DataCollectionContext(this.testCase);
-        }
+    public InProcDataCollectionSinkTests()
+    {
+        _dataCollectionSink = new InProcDataCollectionSink();
+        _testCase = new TestCase("DummyNS.DummyC.DummyM", new Uri("executor://mstest/v1"), "Dummy.dll");
+        _dataCollectionContext = new DataCollectionContext(_testCase);
+    }
 
-        [TestMethod]
-        public void SendDataShouldAddKeyValueToDictionaryInSink()
-        {
-            this.testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
-            this.dataCollectionSink.SendData(this.dataCollectionContext, "DummyKey", "DummyValue");
+    [TestMethod]
+    public void SendDataShouldAddKeyValueToDictionaryInSink()
+    {
+        _testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
+        _dataCollectionSink.SendData(_dataCollectionContext, "DummyKey", "DummyValue");
 
-            var dict = ((InProcDataCollectionSink)this.dataCollectionSink).GetDataCollectionDataSetForTestCase(this.testCase.Id);
+        var dict = ((InProcDataCollectionSink)_dataCollectionSink).GetDataCollectionDataSetForTestCase(_testCase.Id);
 
-            Assert.AreEqual<string>("DummyValue", dict["DummyKey"]);
-        }
+        Assert.AreEqual("DummyValue", dict["DummyKey"]);
+    }
 
-        [TestMethod]
+    [TestMethod]
 
-        public void SendDataShouldThrowArgumentExceptionIfKeyIsNull()
-        {
-            this.testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
+    public void SendDataShouldThrowArgumentExceptionIfKeyIsNull()
+    {
+        _testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
 
-            Assert.ThrowsException<ArgumentNullException>(
-                () => this.dataCollectionSink.SendData(this.dataCollectionContext, null, "DummyValue"));
-        }
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _dataCollectionSink.SendData(_dataCollectionContext, null!, "DummyValue"));
+    }
 
-        [TestMethod]
-        public void SendDataShouldThrowArgumentExceptionIfValueIsNull()
-        {
-            this.testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
+    [TestMethod]
+    public void SendDataShouldThrowArgumentExceptionIfValueIsNull()
+    {
+        _testCase.SetPropertyValue(TestCaseProperties.Id, Guid.NewGuid());
 
-            Assert.ThrowsException<ArgumentNullException>(
-                () => this.dataCollectionSink.SendData(this.dataCollectionContext, "DummyKey", null));
-        }
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _dataCollectionSink.SendData(_dataCollectionContext, "DummyKey", null!));
+    }
 
-        //[TestMethod]
-        // TODO : Currently this code hits when test case id is null for core projects. For that we don't have algorithm to generate the guid. It's not implemented exception now (Source Code : EqtHash.cs).
-        public void SendDataShouldThrowArgumentExceptionIfTestCaseIdIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () => this.dataCollectionSink.SendData(this.dataCollectionContext, "DummyKey", "DummyValue"));
-        }
+    //[TestMethod]
+    // TODO : Currently this code hits when test case id is null for core projects. For that we don't have algorithm to generate the guid. It's not implemented exception now (Source Code : EqtHash.cs).
+    public void SendDataShouldThrowArgumentExceptionIfTestCaseIdIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _dataCollectionSink.SendData(_dataCollectionContext, "DummyKey", "DummyValue"));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectorTests.cs
index 2f34e29ae0..0baec50dbd 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectorTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/InProcDataCollectorTests.cs
@@ -1,143 +1,144 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using System.IO;
+using System.Reflection;
+
+using Coverlet.Collector.DataCollection;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class InProcDataCollectorTests
 {
-    using System.IO;
-    using System.Reflection;
-    using Coverlet.Collector.DataCollection;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class InProcDataCollectorTests
+    private readonly Mock<IAssemblyLoadContext> _assemblyLoadContext;
+
+    private IInProcDataCollector? _inProcDataCollector;
+
+    public InProcDataCollectorTests()
     {
-        private Mock<IAssemblyLoadContext> assemblyLoadContext;
+        _assemblyLoadContext = new Mock<IAssemblyLoadContext>();
+    }
 
-        private IInProcDataCollector inProcDataCollector;
+    [TestMethod]
+    public void InProcDataCollectorShouldNotThrowExceptionIfInvalidAssemblyIsProvided()
+    {
+        _assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
+            .Throws<FileNotFoundException>();
+
+        _inProcDataCollector = new InProcDataCollector(
+            string.Empty,
+            string.Empty,
+            null!,
+            string.Empty,
+            _assemblyLoadContext.Object,
+            TestPluginCache.Instance);
+
+        Assert.IsNull(_inProcDataCollector.AssemblyQualifiedName);
+    }
 
-        public InProcDataCollectorTests()
-        {
-            this.assemblyLoadContext = new Mock<IAssemblyLoadContext>();
-        }
+    [TestMethod]
+    public void InProcDataCollectorShouldNotThrowExceptionIfAssemblyDoesNotContainAnyInProcDataCollector()
+    {
+        _assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
+            .Returns(Assembly.GetEntryAssembly()!);
+
+        _inProcDataCollector = new InProcDataCollector(
+            string.Empty,
+            string.Empty,
+            null!,
+            string.Empty,
+            _assemblyLoadContext.Object,
+            TestPluginCache.Instance);
+
+        Assert.IsNull(_inProcDataCollector.AssemblyQualifiedName);
+    }
 
-        [TestMethod]
-        public void InProcDataCollectorShouldNotThrowExceptionIfInvalidAssemblyIsProvided()
-        {
-            this.assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
-                .Throws<FileNotFoundException>();
-
-            this.inProcDataCollector = new InProcDataCollector(
-                string.Empty,
-                string.Empty,
-                null,
-                string.Empty,
-                this.assemblyLoadContext.Object,
-                TestPluginCache.Instance);
-
-            Assert.IsNull(this.inProcDataCollector.AssemblyQualifiedName);
-        }
+    [TestMethod]
+    public void InProcDataCollectorShouldInitializeIfAssemblyContainsAnyInProcDataCollector()
+    {
+        var type = typeof(TestableInProcDataCollector);
 
-        [TestMethod]
-        public void InProcDataCollectorShouldNotThrowExceptionIfAssemblyDoesNotContainAnyInProcDataCollector()
-        {
-            this.assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
-                .Returns(Assembly.GetEntryAssembly());
-
-            this.inProcDataCollector = new InProcDataCollector(
-                string.Empty,
-                string.Empty,
-                null,
-                string.Empty,
-                this.assemblyLoadContext.Object,
-                TestPluginCache.Instance);
-
-            Assert.IsNull(this.inProcDataCollector.AssemblyQualifiedName);
-        }
+        _assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
+            .Returns(type.Assembly);
 
-        [TestMethod]
-        public void InProcDataCollectorShouldInitializeIfAssemblyContainsAnyInProcDataCollector()
-        {
-            var typeInfo = typeof(TestableInProcDataCollector).GetTypeInfo();
+        _inProcDataCollector = new InProcDataCollector(
+            string.Empty,
+            type.AssemblyQualifiedName!,
+            type,
+            string.Empty,
+            _assemblyLoadContext.Object,
+            TestPluginCache.Instance);
 
-            this.assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
-                .Returns(typeInfo.Assembly);
+        Assert.IsNotNull(_inProcDataCollector.AssemblyQualifiedName);
+        Assert.AreEqual(_inProcDataCollector.AssemblyQualifiedName, type.AssemblyQualifiedName);
+    }
 
-            this.inProcDataCollector = new InProcDataCollector(
-                string.Empty,
-                typeInfo.AssemblyQualifiedName,
-                typeInfo,
-                string.Empty,
-                this.assemblyLoadContext.Object,
-                TestPluginCache.Instance);
+    [TestMethod]
+    public void InProcDataCollectorLoadCoverlet()
+    {
+        var type = typeof(CoverletInProcDataCollector);
 
-            Assert.IsNotNull(this.inProcDataCollector.AssemblyQualifiedName);
-            Assert.AreEqual(this.inProcDataCollector.AssemblyQualifiedName, typeInfo.AssemblyQualifiedName);
-        }
+        Assert.AreEqual("9.9.9.9", type.Assembly.GetName().Version!.ToString());
 
-        [TestMethod]
-        public void InProcDataCollectorLoadCoverlet()
-        {
-            var typeInfo = typeof(CoverletInProcDataCollector).GetTypeInfo();
+        _assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
+            .Returns(type.Assembly);
 
-            Assert.AreEqual("9.9.9.9", typeInfo.Assembly.GetName().Version.ToString());
+        // We need to mock TestPluginCache because we have to create assembly resolver instance
+        // using SetupAssemblyResolver method, we don't use any other method of class(like DiscoverTestExtensions etc...)
+        // that fire creation
+        TestableTestPluginCache testablePlugin = new();
+        testablePlugin.SetupAssemblyResolver(type.Assembly.Location);
 
-            this.assemblyLoadContext.Setup(alc => alc.LoadAssemblyFromPath(It.IsAny<string>()))
-                .Returns(typeInfo.Assembly);
+        _inProcDataCollector = new InProcDataCollector(
+            type.Assembly.Location,
+            "Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null",
+            typeof(InProcDataCollection),
+            string.Empty,
+            _assemblyLoadContext.Object,
+            testablePlugin);
 
-            // We need to mock TestPluginCache because we have to create assembly resolver instance
-            // using SetupAssemblyResolver method, we don't use any other method of class(like DiscoverTestExtensions etc...)
-            // that fire creation
-            TestableTestPluginCache testablePlugin = new TestableTestPluginCache();
-            testablePlugin.SetupAssemblyResolver(typeInfo.Assembly.Location);
+        Assert.IsNotNull(_inProcDataCollector.AssemblyQualifiedName);
+        Assert.AreEqual(_inProcDataCollector.AssemblyQualifiedName, type.AssemblyQualifiedName);
+    }
 
-            this.inProcDataCollector = new InProcDataCollector(
-                typeInfo.Assembly.Location,
-                "Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null",
-                typeof(InProcDataCollection).GetTypeInfo(),
-                string.Empty,
-                this.assemblyLoadContext.Object,
-                testablePlugin);
+    private class TestableInProcDataCollector : InProcDataCollection
+    {
+        public void Initialize(IDataCollectionSink dataCollectionSink)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void TestSessionStart(TestSessionStartArgs testSessionStartArgs)
+        {
+            throw new System.NotImplementedException();
+        }
 
-            Assert.IsNotNull(this.inProcDataCollector.AssemblyQualifiedName);
-            Assert.AreEqual(this.inProcDataCollector.AssemblyQualifiedName, typeInfo.AssemblyQualifiedName);
+        public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
+        {
+            throw new System.NotImplementedException();
         }
 
-        private class TestableInProcDataCollector : InProcDataCollection
+        public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
         {
-            public void Initialize(IDataCollectionSink dataCollectionSink)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public void TestSessionStart(TestSessionStartArgs testSessionStartArgs)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
-            {
-                throw new System.NotImplementedException();
-            }
+            throw new System.NotImplementedException();
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ParallelDataCollectionEventsHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ParallelDataCollectionEventsHandlerTests.cs
index 6823e8efc1..bb923e63bb 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ParallelDataCollectionEventsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ParallelDataCollectionEventsHandlerTests.cs
@@ -1,95 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Constants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class ParallelDataCollectionEventsHandlerTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    [TestClass]
-    public class ParallelDataCollectionEventsHandlerTests
+    private const string Uri1 = "datacollector://microsoft/some1/1.0";
+    private const string Uri2 = "datacollector://microsoft/some2/2.0";
+    private const string Uri3 = "datacollector://microsoft/some3/2.0";
+
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IProxyExecutionManager> _mockProxyExecutionManager;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockTestRunEventsHandler;
+    private readonly Mock<IParallelProxyExecutionManager> _mockParallelProxyExecutionManager;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockTestRunAttachmentsProcessingManager;
+    private readonly CancellationTokenSource _cancellationTokenSource;
+    private readonly ParallelDataCollectionEventsHandler _parallelDataCollectionEventsHandler;
+
+    public ParallelDataCollectionEventsHandlerTests()
+    {
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(r => r.ProtocolConfig).Returns(new ProtocolConfig());
+        _mockProxyExecutionManager = new Mock<IProxyExecutionManager>();
+        _mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _mockParallelProxyExecutionManager = new Mock<IParallelProxyExecutionManager>();
+        _mockTestRunAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _cancellationTokenSource = new CancellationTokenSource();
+        _parallelDataCollectionEventsHandler = new ParallelDataCollectionEventsHandler(_mockRequestData.Object, _mockProxyExecutionManager.Object, _mockTestRunEventsHandler.Object,
+            _mockParallelProxyExecutionManager.Object, new ParallelRunDataAggregator(Constants.EmptyRunSettings), _mockTestRunAttachmentsProcessingManager.Object, _cancellationTokenSource.Token);
+
+        _mockParallelProxyExecutionManager.Setup(m => m.HandlePartialRunComplete(It.IsAny<IProxyExecutionManager>(), It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<string>>())).Returns(true);
+    }
+
+    [TestMethod]
+    public void HandleTestRunComplete_ShouldCallProcessTestRunAttachmentsAsyncWithAttachmentsAndUseResults()
     {
-        private const string uri1 = "datacollector://microsoft/some1/1.0";
-        private const string uri2 = "datacollector://microsoft/some2/2.0";
-        private const string uri3 = "datacollector://microsoft/some3/2.0";
-
-        private readonly Mock<IRequestData> mockRequestData;
-        private readonly Mock<IProxyExecutionManager> mockProxyExecutionManager;
-        private readonly Mock<ITestRunEventsHandler> mockTestRunEventsHandler;
-        private readonly Mock<IParallelProxyExecutionManager> mockParallelProxyExecutionManager;
-        private readonly Mock<ITestRunAttachmentsProcessingManager> mockTestRunAttachmentsProcessingManager;
-        private readonly CancellationTokenSource cancellationTokenSource;
-        private readonly ParallelDataCollectionEventsHandler parallelDataCollectionEventsHandler;
-
-        public ParallelDataCollectionEventsHandlerTests()
-        {
-            mockRequestData = new Mock<IRequestData>();
-            mockProxyExecutionManager = new Mock<IProxyExecutionManager>();
-            mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            mockParallelProxyExecutionManager = new Mock<IParallelProxyExecutionManager>();
-            mockTestRunAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-            cancellationTokenSource = new CancellationTokenSource();
-            parallelDataCollectionEventsHandler = new ParallelDataCollectionEventsHandler(mockRequestData.Object, mockProxyExecutionManager.Object, mockTestRunEventsHandler.Object,
-                mockParallelProxyExecutionManager.Object, new ParallelRunDataAggregator(), mockTestRunAttachmentsProcessingManager.Object, cancellationTokenSource.Token);
-
-            mockParallelProxyExecutionManager.Setup(m => m.HandlePartialRunComplete(It.IsAny<IProxyExecutionManager>(), It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<string>>())).Returns(true);
-        }
-
-        [TestMethod]
-        public void HandleTestRunComplete_ShouldCallProcessTestRunAttachmentsAsyncWithAttachmentsAndUseResults()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input1"),
-                new AttachmentSet(new Uri(uri2), "uri2_input1"),
-                new AttachmentSet(new Uri(uri3), "uri3_input1")
-            };
-
-            Collection<AttachmentSet> outputAttachments = new Collection<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input1")
-            };
-
-            mockTestRunAttachmentsProcessingManager.Setup(f => f.ProcessTestRunAttachmentsAsync(mockRequestData.Object, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(outputAttachments));
-
-            // act
-            parallelDataCollectionEventsHandler.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromSeconds(1)), null, inputAttachments, null);
-
-            // assert
-            mockTestRunEventsHandler.Verify(h => h.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(outputAttachments[0])), It.IsAny<ICollection<string>>()));
-            mockTestRunAttachmentsProcessingManager.Verify(f => f.ProcessTestRunAttachmentsAsync(mockRequestData.Object, It.Is<ICollection<AttachmentSet>>(a => a.Count == 3), cancellationTokenSource.Token));
-        }
-
-        [TestMethod]
-        public void HandleTestRunComplete_ShouldCallProcessTestRunAttachmentsAsyncWithAttachmentsAndNotUserResults_IfManagerReturnsNull()
-        {
-            // arrange
-            List<AttachmentSet> inputAttachments = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri(uri1), "uri1_input1"),
-                new AttachmentSet(new Uri(uri2), "uri2_input1"),
-                new AttachmentSet(new Uri(uri3), "uri3_input1")
-            };
-
-            mockTestRunAttachmentsProcessingManager.Setup(f => f.ProcessTestRunAttachmentsAsync(mockRequestData.Object, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult((Collection<AttachmentSet>)null));
-
-            // act
-            parallelDataCollectionEventsHandler.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromSeconds(1)), null, inputAttachments, null);
-
-            // assert
-            mockTestRunEventsHandler.Verify(h => h.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 3), It.IsAny<ICollection<string>>()));
-            mockTestRunAttachmentsProcessingManager.Verify(f => f.ProcessTestRunAttachmentsAsync(mockRequestData.Object, It.Is<ICollection<AttachmentSet>>(a => a.Count == 3), cancellationTokenSource.Token));
-        }
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input1"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input1"),
+            new AttachmentSet(new Uri(Uri3), "uri3_input1")
+        ];
+
+        Collection<AttachmentSet> outputAttachments = [new AttachmentSet(new Uri(Uri1), "uri1_input1")];
+
+        _mockTestRunAttachmentsProcessingManager.Setup(f => f.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<InvokedDataCollector>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(outputAttachments));
+
+        // act
+        _parallelDataCollectionEventsHandler.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromSeconds(1)), null, inputAttachments, null);
+
+        // assert
+        _mockTestRunEventsHandler.Verify(h => h.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 1 && c.Contains(outputAttachments[0])), It.IsAny<ICollection<string>>()));
+        _mockTestRunAttachmentsProcessingManager.Verify(f => f.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, It.Is<ICollection<AttachmentSet>>(a => a.Count == 3), It.IsAny<ICollection<InvokedDataCollector>>(), _cancellationTokenSource.Token));
+    }
+
+    [TestMethod]
+    public void HandleTestRunComplete_ShouldCallProcessTestRunAttachmentsAsyncWithAttachmentsAndNotUserResults_IfManagerReturnsNull()
+    {
+        // arrange
+        List<AttachmentSet> inputAttachments =
+        [
+            new AttachmentSet(new Uri(Uri1), "uri1_input1"),
+            new AttachmentSet(new Uri(Uri2), "uri2_input1"),
+            new AttachmentSet(new Uri(Uri3), "uri3_input1")
+        ];
+
+        _mockTestRunAttachmentsProcessingManager.Setup(f => f.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<InvokedDataCollector>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult((Collection<AttachmentSet>)null!));
+
+        // act
+        _parallelDataCollectionEventsHandler.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromSeconds(1)), null, inputAttachments, null);
+
+        // assert
+        _mockTestRunEventsHandler.Verify(h => h.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.Is<ICollection<AttachmentSet>>(c => c.Count == 3), It.IsAny<ICollection<string>>()));
+        _mockTestRunAttachmentsProcessingManager.Verify(f => f.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, _mockRequestData.Object, It.Is<ICollection<AttachmentSet>>(a => a.Count == 3), It.IsAny<ICollection<InvokedDataCollector>>(), _cancellationTokenSource.Token));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyDataCollectionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyDataCollectionManagerTests.cs
index e69707fd9c..6ed0c20b60 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyDataCollectionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyDataCollectionManagerTests.cs
@@ -1,279 +1,276 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
+
+[TestClass]
+public class ProxyDataCollectionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-
-    using Moq;
-
-    [TestClass]
-    public class ProxyDataCollectionManagerTests
+    private readonly Mock<IDataCollectionRequestSender> _mockDataCollectionRequestSender;
+    private ProxyDataCollectionManager _proxyDataCollectionManager;
+    private readonly Mock<IDataCollectionLauncher> _mockDataCollectionLauncher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private static readonly string TimoutErrorMessage =
+        "vstest.console process failed to connect to datacollector process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
+
+    public ProxyDataCollectionManagerTests()
     {
-        private Mock<IDataCollectionRequestSender> mockDataCollectionRequestSender;
-        private ProxyDataCollectionManager proxyDataCollectionManager;
-        private Mock<IDataCollectionLauncher> mockDataCollectionLauncher;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private static readonly string TimoutErrorMessage =
-            "vstest.console process failed to connect to datacollector process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
-
-        [TestInitialize]
-        public void Initialize()
-        {
-            this.mockDataCollectionRequestSender = new Mock<IDataCollectionRequestSender>();
-            this.mockDataCollectionLauncher = new Mock<IDataCollectionLauncher>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, string.Empty, new List<string>() { "testsource1.dll" }, this.mockDataCollectionRequestSender.Object, this.mockProcessHelper.Object, this.mockDataCollectionLauncher.Object);
-        }
+        _mockDataCollectionRequestSender = new Mock<IDataCollectionRequestSender>();
+        _mockDataCollectionLauncher = new Mock<IDataCollectionLauncher>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, string.Empty, new List<string>() { "testsource1.dll" }, _mockDataCollectionRequestSender.Object, _mockProcessHelper.Object, _mockDataCollectionLauncher.Object);
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-            Environment.SetEnvironmentVariable(ProxyDataCollectionManager.DebugEnvironmentVaribleName, string.Empty);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+        Environment.SetEnvironmentVariable(ProxyDataCollectionManager.DebugEnvironmentVaribleName, string.Empty);
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeCommunication()
-        {
-            this.mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000)).Returns(true);
-            this.proxyDataCollectionManager.Initialize();
+    [TestMethod]
+    public void InitializeShouldInitializeCommunication()
+    {
+        _mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000)).Returns(true);
+        _proxyDataCollectionManager.Initialize();
 
-            this.mockDataCollectionLauncher.Verify(x => x.LaunchDataCollector(It.IsAny<IDictionary<string, string>>(), It.IsAny<IList<string>>()), Times.Once);
-            this.mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000), Times.Once);
-        }
+        _mockDataCollectionLauncher.Verify(x => x.LaunchDataCollector(It.IsAny<IDictionary<string, string?>>(), It.IsAny<IList<string>>()), Times.Once);
+        _mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfConnectionTimeouts()
-        {
-            this.mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfConnectionTimeouts()
+    {
+        _mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
 
-            var message = Assert.ThrowsException<TestPlatformException>(() => this.proxyDataCollectionManager.Initialize()).Message;
-            Assert.AreEqual(message, ProxyDataCollectionManagerTests.TimoutErrorMessage);
-        }
+        var message = Assert.ThrowsException<TestPlatformException>(() => _proxyDataCollectionManager.Initialize()).Message;
+        Assert.AreEqual(message, TimoutErrorMessage);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetTimeoutBasedOnTimeoutEnvironmentVarible()
-        {
-            var timeout = 10;
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString());
-            this.mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(timeout * 1000)).Returns(true);
+    [TestMethod]
+    public void InitializeShouldSetTimeoutBasedOnTimeoutEnvironmentVarible()
+    {
+        var timeout = 10;
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString(CultureInfo.CurrentCulture));
+        _mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(timeout * 1000)).Returns(true);
 
-            this.proxyDataCollectionManager.Initialize();
+        _proxyDataCollectionManager.Initialize();
 
-            this.mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(timeout * 1000), Times.Once);
-        }
+        _mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(timeout * 1000), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetTimeoutBasedOnDebugEnvironmentVaribleName()
-        {
-            Environment.SetEnvironmentVariable(ProxyDataCollectionManager.DebugEnvironmentVaribleName, "1");
-            var expectedTimeout = EnvironmentHelper.DefaultConnectionTimeout * 1000 * 5;
-            this.mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(expectedTimeout)).Returns(true);
+    [TestMethod]
+    public void InitializeShouldSetTimeoutBasedOnDebugEnvironmentVaribleName()
+    {
+        Environment.SetEnvironmentVariable(ProxyDataCollectionManager.DebugEnvironmentVaribleName, "1");
+        var expectedTimeout = EnvironmentHelper.DefaultConnectionTimeout * 1000 * 5;
+        _mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(expectedTimeout)).Returns(true);
 
-            this.proxyDataCollectionManager.Initialize();
+        _proxyDataCollectionManager.Initialize();
 
-            this.mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(expectedTimeout), Times.Once);
-        }
+        _mockDataCollectionRequestSender.Verify(x => x.WaitForRequestHandlerConnection(expectedTimeout), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeShouldPassDiagArgumentsIfDiagIsEnabled()
-        {
-            // Saving the EqtTrace state
+    [TestMethod]
+    public void InitializeShouldPassDiagArgumentsIfDiagIsEnabled()
+    {
+        // Saving the EqtTrace state
 #if NETFRAMEWORK
-            var traceLevel = EqtTrace.TraceLevel;
-            EqtTrace.TraceLevel = TraceLevel.Off;
+        var traceLevel = EqtTrace.TraceLevel;
+        EqtTrace.TraceLevel = TraceLevel.Off;
 #else
-            var traceLevel = (TraceLevel)EqtTrace.TraceLevel;
-            EqtTrace.TraceLevel = (PlatformTraceLevel)TraceLevel.Off;
+        var traceLevel = (TraceLevel)EqtTrace.TraceLevel;
+        EqtTrace.TraceLevel = (PlatformTraceLevel)TraceLevel.Off;
 #endif
-            var traceFileName = EqtTrace.LogFile;
-
-            try
-            {
-                EqtTrace.InitializeTrace("mylog.txt", PlatformTraceLevel.Info);
-                this.mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
-
-                this.proxyDataCollectionManager.Initialize();
-
-                var expectedTraceLevel = (int)PlatformTraceLevel.Info;
-                this.mockDataCollectionLauncher.Verify(
-                    x =>
-                        x.LaunchDataCollector(
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.Is<IList<string>>(list => list.Contains("--diag") && list.Contains("--tracelevel") && list.Contains(expectedTraceLevel.ToString()))),
-                    Times.Once);
-            }
-            finally
-            {
-                // Restoring to initial state for EqtTrace
-                EqtTrace.InitializeTrace(traceFileName, PlatformTraceLevel.Verbose);
+        var traceFileName = EqtTrace.LogFile;
+
+        try
+        {
+            EqtTrace.InitializeTrace("mylog.txt", PlatformTraceLevel.Info);
+            _mockDataCollectionRequestSender.Setup(x => x.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
+
+            _proxyDataCollectionManager.Initialize();
+
+            var expectedTraceLevel = (int)PlatformTraceLevel.Info;
+            _mockDataCollectionLauncher.Verify(
+                x =>
+                    x.LaunchDataCollector(
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.Is<IList<string>>(list => list.Contains("--diag") && list.Contains("--tracelevel") && list.Contains(expectedTraceLevel.ToString(CultureInfo.CurrentCulture)))),
+                Times.Once);
+        }
+        finally
+        {
+            // Restoring to initial state for EqtTrace
+            EqtTrace.InitializeTrace(traceFileName, PlatformTraceLevel.Verbose);
 #if NETFRAMEWORK
-                EqtTrace.TraceLevel = traceLevel;
+            EqtTrace.TraceLevel = traceLevel;
 #else
-                EqtTrace.TraceLevel = (PlatformTraceLevel)traceLevel;
+            EqtTrace.TraceLevel = (PlatformTraceLevel)traceLevel;
 #endif
-            }
         }
+    }
 
-        [TestMethod]
-        public void SendTestHostInitiazliedShouldPassProcessIdToRequestSender()
-        {
-            this.proxyDataCollectionManager.TestHostLaunched(1234);
+    [TestMethod]
+    public void SendTestHostInitiazliedShouldPassProcessIdToRequestSender()
+    {
+        _proxyDataCollectionManager.TestHostLaunched(1234);
 
-            this.mockDataCollectionRequestSender.Verify(x => x.SendTestHostLaunched(It.Is<TestHostLaunchedPayload>(y => y.ProcessId == 1234)));
-        }
+        _mockDataCollectionRequestSender.Verify(x => x.SendTestHostLaunched(It.Is<TestHostLaunchedPayload>(y => y.ProcessId == 1234)));
+    }
 
-        [TestMethod]
-        public void BeforeTestRunStartShouldPassRunSettingsWithExtensionsFolderUpdatedAsTestAdapterPath()
-        {
-            string runsettings = $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-            var sourceList = new List<string>() { "testsource1.dll" };
-            this.proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, runsettings, sourceList, this.mockDataCollectionRequestSender.Object, this.mockProcessHelper.Object, this.mockDataCollectionLauncher.Object);
-            this.mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(true);
+    [TestMethod]
+    public void BeforeTestRunStartShouldPassRunSettingsWithExtensionsFolderUpdatedAsTestAdapterPath()
+    {
+        string runsettings = $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var sourceList = new List<string>() { "testsource1.dll" };
+        _proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, runsettings, sourceList, _mockDataCollectionRequestSender.Object, _mockProcessHelper.Object, _mockDataCollectionLauncher.Object);
+        _mockRequestData.Setup(r => r.IsTelemetryOptedIn).Returns(true);
 
-            BeforeTestRunStartResult res = new BeforeTestRunStartResult(new Dictionary<string, string>(), 123);
-            this.mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), It.IsAny<List<string>>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
+        BeforeTestRunStartResult res = new(new Dictionary<string, string?>(), 123);
+        _mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), It.IsAny<List<string>>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
 
-            var result = this.proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
+        var result = _proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
 
-            var extensionsFolderPath = Path.Combine(Path.GetDirectoryName(typeof(ITestPlatform).GetTypeInfo().Assembly.Location), "Extensions");
-            var expectedSettingsXML = $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings><RunConfiguration><TestAdaptersPaths>{extensionsFolderPath}</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            this.mockDataCollectionRequestSender.Verify(
-                x => x.SendBeforeTestRunStartAndGetResult(expectedSettingsXML, sourceList, true, It.IsAny<ITestMessageEventHandler>()), Times.Once);
-        }
+        var extensionsFolderPath = Path.Combine(Path.GetDirectoryName(typeof(ITestPlatform).Assembly.Location)!, "Extensions");
+        var expectedSettingsXml = $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings><RunConfiguration><TestAdaptersPaths>{extensionsFolderPath}</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        _mockDataCollectionRequestSender.Verify(
+            x => x.SendBeforeTestRunStartAndGetResult(expectedSettingsXml, sourceList, true, It.IsAny<ITestMessageEventHandler>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void BeforeTestRunStartShouldReturnDataCollectorParameters()
-        {
-            BeforeTestRunStartResult res = new BeforeTestRunStartResult(new Dictionary<string, string>(), 123);
-            var sourceList = new List<string>() { "testsource1.dll" };
-            this.mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), It.IsAny<List<string>>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
+    [TestMethod]
+    public void BeforeTestRunStartShouldReturnDataCollectorParameters()
+    {
+        BeforeTestRunStartResult res = new(new Dictionary<string, string?>(), 123);
+        var sourceList = new List<string>() { "testsource1.dll" };
+        _mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), It.IsAny<List<string>>(), It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
 
-            var result = this.proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
+        var result = _proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
 
-            this.mockDataCollectionRequestSender.Verify(
-                x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), sourceList, false, It.IsAny<ITestMessageEventHandler>()), Times.Once);
-            Assert.IsNotNull(result);
-            Assert.AreEqual(res.DataCollectionEventsPort, result.DataCollectionEventsPort);
-            Assert.AreEqual(res.EnvironmentVariables.Count, result.EnvironmentVariables.Count);
-        }
+        _mockDataCollectionRequestSender.Verify(
+            x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), sourceList, false, It.IsAny<ITestMessageEventHandler>()), Times.Once);
+        Assert.IsNotNull(result);
+        Assert.AreEqual(res.DataCollectionEventsPort, result.DataCollectionEventsPort);
+        Assert.AreEqual(res.EnvironmentVariables.Count, result.EnvironmentVariables!.Count);
+    }
 
-        [TestMethod]
-        public void BeforeTestRunStartsShouldInvokeRunEventsHandlerIfExceptionIsThrown()
-        {
-            var mockRunEventsHandler = new Mock<ITestMessageEventHandler>();
-            this.mockDataCollectionRequestSender.Setup(
-                    x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), new List<string>() { "testsource1.dll" }, false, It.IsAny<ITestMessageEventHandler>()))
-                .Throws<Exception>();
+    [TestMethod]
+    public void BeforeTestRunStartsShouldInvokeRunEventsHandlerIfExceptionIsThrown()
+    {
+        var mockRunEventsHandler = new Mock<ITestMessageEventHandler>();
+        _mockDataCollectionRequestSender.Setup(
+                x => x.SendBeforeTestRunStartAndGetResult(It.IsAny<string>(), new List<string>() { "testsource1.dll" }, false, It.IsAny<ITestMessageEventHandler>()))
+            .Throws<Exception>();
 
-            var result = this.proxyDataCollectionManager.BeforeTestRunStart(true, true, mockRunEventsHandler.Object);
+        var result = _proxyDataCollectionManager.BeforeTestRunStart(true, true, mockRunEventsHandler.Object);
 
-            mockRunEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsRegex("Exception of type 'System.Exception' was thrown..*")), Times.Once);
-            Assert.AreEqual(0, result.EnvironmentVariables.Count);
-            Assert.IsFalse(result.AreTestCaseLevelEventsRequired);
-            Assert.AreEqual(0, result.DataCollectionEventsPort);
-        }
+        mockRunEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsRegex("Exception of type 'System.Exception' was thrown..*")), Times.Once);
+        Assert.AreEqual(0, result.EnvironmentVariables!.Count);
+        Assert.IsFalse(result.AreTestCaseLevelEventsRequired);
+        Assert.AreEqual(0, result.DataCollectionEventsPort);
+    }
+
+    [TestMethod]
+    public void SendBeforeTestRunStartAndGetResultShouldBeInvokedWithCorrectTestSources()
+    {
+        var testSources = new List<string>() { "abc.dll", "efg.dll" };
+        _proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, string.Empty, testSources, _mockDataCollectionRequestSender.Object, _mockProcessHelper.Object, _mockDataCollectionLauncher.Object);
 
-        [TestMethod]
-        public void SendBeforeTestRunStartAndGetResultShouldBeInvokedWithCorrectTestSources()
+        BeforeTestRunStartResult res = new(new Dictionary<string, string?>(), 123);
+        _mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
+
+        var result = _proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
+
+        _mockDataCollectionRequestSender.Verify(
+            x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, false, It.IsAny<ITestMessageEventHandler>()), Times.Once);
+        Assert.IsNotNull(result);
+        Assert.AreEqual(res.DataCollectionEventsPort, result.DataCollectionEventsPort);
+        Assert.AreEqual(res.EnvironmentVariables.Count, result.EnvironmentVariables!.Count);
+    }
+
+    [TestMethod]
+    [DataRow(false)]
+    [DataRow(true)]
+    public void AfterTestRunEndShouldReturnAttachments(bool telemetryOptedIn)
+    {
+        var attachments = new Collection<AttachmentSet>();
+        var invokedDataCollectors = new Collection<InvokedDataCollector>();
+        var dispName = "MockAttachments";
+        var uri = new Uri("Mock://Attachments");
+        var attachmentSet = new AttachmentSet(uri, dispName);
+        attachments.Add(attachmentSet);
+        _mockRequestData.Setup(m => m.IsTelemetryOptedIn).Returns(telemetryOptedIn);
+
+        var metrics = new Dictionary<string, object>()
         {
-            var testSources = new List<string>() { "abc.dll", "efg.dll" };
-            this.proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, string.Empty, testSources, this.mockDataCollectionRequestSender.Object, this.mockProcessHelper.Object, this.mockDataCollectionLauncher.Object);
+            {"key", "value"}
+        };
 
-            BeforeTestRunStartResult res = new BeforeTestRunStartResult(new Dictionary<string, string>(), 123);
-            this.mockDataCollectionRequestSender.Setup(x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, It.IsAny<bool>(), It.IsAny<ITestMessageEventHandler>())).Returns(res);
+        _mockDataCollectionRequestSender.Setup(x => x.SendAfterTestRunEndAndGetResult(It.IsAny<ITestRunEventsHandler>(), It.IsAny<bool>())).Returns(new AfterTestRunEndResult(attachments, invokedDataCollectors, metrics));
 
-            var result = this.proxyDataCollectionManager.BeforeTestRunStart(true, true, null);
+        var result = _proxyDataCollectionManager.AfterTestRunEnd(false, null);
 
-            this.mockDataCollectionRequestSender.Verify(
-                x => x.SendBeforeTestRunStartAndGetResult(string.Empty, testSources, false, It.IsAny<ITestMessageEventHandler>()), Times.Once);
-            Assert.IsNotNull(result);
-            Assert.AreEqual(res.DataCollectionEventsPort, result.DataCollectionEventsPort);
-            Assert.AreEqual(res.EnvironmentVariables.Count, result.EnvironmentVariables.Count);
-        }
+        Assert.IsNotNull(result);
+        Assert.AreEqual(1, result.Attachments!.Count);
+        Assert.IsNotNull(result.Attachments[0]);
+        Assert.AreEqual(dispName, result.Attachments[0].DisplayName);
+        Assert.AreEqual(uri, result.Attachments[0].Uri);
 
-        [TestMethod]
-        [DataRow(false)]
-        [DataRow(true)]
-        public void AfterTestRunEndShouldReturnAttachments(bool telemetryOptedIn)
+        if (telemetryOptedIn)
         {
-            var attachments = new Collection<AttachmentSet>();
-            var dispName = "MockAttachments";
-            var uri = new Uri("Mock://Attachments");
-            var attachmentSet = new AttachmentSet(uri, dispName);
-            attachments.Add(attachmentSet);
-            this.mockRequestData.Setup(m => m.IsTelemetryOptedIn).Returns(telemetryOptedIn);
-
-            var metrics = new Dictionary<string, object>() 
-            {
-                {"key", "value"}
-            };
-
-            this.mockDataCollectionRequestSender.Setup(x => x.SendAfterTestRunEndAndGetResult(It.IsAny<ITestRunEventsHandler>(), It.IsAny<bool>())).Returns(new AfterTestRunEndResult(attachments, metrics));
-
-            var result = this.proxyDataCollectionManager.AfterTestRunEnd(false, null);
-
-            Assert.IsNotNull(result);
-            Assert.AreEqual(1, result.Count);
-            Assert.IsNotNull(result[0]);
-            Assert.AreEqual(dispName, result[0].DisplayName);
-            Assert.AreEqual(uri, result[0].Uri);
-
-            if (telemetryOptedIn)
-            {
-                mockMetricsCollection.Verify(m => m.Add("key", "value"), Times.Once);
-            }
-            else
-            {
-                mockMetricsCollection.Verify(m => m.Add(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
-            }
+            _mockMetricsCollection.Verify(m => m.Add("key", "value"), Times.Once);
         }
-
-        [TestMethod]
-        public void AfterTestRunEndShouldInvokeRunEventsHandlerIfExceptionIsThrown()
+        else
         {
-            var mockRunEventsHandler = new Mock<ITestMessageEventHandler>();
-            this.mockDataCollectionRequestSender.Setup(
-                    x => x.SendAfterTestRunEndAndGetResult(It.IsAny<ITestMessageEventHandler>(), It.IsAny<bool>()))
-                .Throws<Exception>();
+            _mockMetricsCollection.Verify(m => m.Add(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+        }
+    }
+
+    [TestMethod]
+    public void AfterTestRunEndShouldInvokeRunEventsHandlerIfExceptionIsThrown()
+    {
+        var mockRunEventsHandler = new Mock<ITestMessageEventHandler>();
+        _mockDataCollectionRequestSender.Setup(
+                x => x.SendAfterTestRunEndAndGetResult(It.IsAny<ITestMessageEventHandler>(), It.IsAny<bool>()))
+            .Throws<Exception>();
 
-            var result = this.proxyDataCollectionManager.AfterTestRunEnd(false, mockRunEventsHandler.Object);
+        var result = _proxyDataCollectionManager.AfterTestRunEnd(false, mockRunEventsHandler.Object);
 
-            mockRunEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsRegex("Exception of type 'System.Exception' was thrown..*")), Times.Once);
-        }
+        mockRunEventsHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsRegex("Exception of type 'System.Exception' was thrown..*")), Times.Once);
+    }
 
 
-        [TestMethod]
-        public void ProxyDataCollectionShouldLogEnabledDataCollectors()
-        {
-            string settings = @"<RunSettings>
+    [TestMethod]
+    public void ProxyDataCollectionShouldLogEnabledDataCollectors()
+    {
+        string settings = @"<RunSettings>
               <DataCollectionRunSettings>
                 <DataCollectors>
                     <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
@@ -282,13 +279,12 @@ public void ProxyDataCollectionShouldLogEnabledDataCollectors()
              </DataCollectionRunSettings>
            </RunSettings>";
 
-            var testSources = new List<string>() { "abc.dll", "efg.dll" };
-            this.mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
+        var testSources = new List<string>() { "abc.dll", "efg.dll" };
+        _mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
 
-            var proxyExecutionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, settings, testSources, this.mockDataCollectionRequestSender.Object, this.mockProcessHelper.Object, this.mockDataCollectionLauncher.Object);
+        var proxyExecutionManager = new ProxyDataCollectionManager(_mockRequestData.Object, settings, testSources, _mockDataCollectionRequestSender.Object, _mockProcessHelper.Object, _mockDataCollectionLauncher.Object);
 
-            var resultString = "{ FriendlyName = Code Coverage, Uri = datacollector://microsoft/CodeCoverage/2.0 }";
-            this.mockMetricsCollection.Verify(rd => rd.Add(TelemetryDataConstants.DataCollectorsEnabled, resultString), Times.Once);
-        }
+        var resultString = "{ FriendlyName = Code Coverage, Uri = datacollector://microsoft/CodeCoverage/2.0 }";
+        _mockMetricsCollection.Verify(rd => rd.Add(TelemetryDataConstants.DataCollectorsEnabled, resultString), Times.Once);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyOutOfProcDataCollectionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyOutOfProcDataCollectionManagerTests.cs
index b4bc2403fe..23b888d436 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyOutOfProcDataCollectionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/DataCollection/ProxyOutOfProcDataCollectionManagerTests.cs
@@ -1,65 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.ObjectModel;
 
-    using Moq;
-    using System;
-    using System.Collections.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class ProxyOutOfProcDataCollectionManagerTests
-    {
-        private Mock<ITestEventsPublisher> mockTestEventsPublisher;
-        private Mock<IDataCollectionTestCaseEventSender> mockDataCollectionTestCaseEventSender;
-        private Collection<AttachmentSet> attachmentSets;
-        private TestCase testcase;
-        private VisualStudio.TestPlatform.ObjectModel.TestResult testResult;
+using Moq;
 
-        private ProxyOutOfProcDataCollectionManager proxyOutOfProcDataCollectionManager;
-        public ProxyOutOfProcDataCollectionManagerTests()
-        {
-            this.mockTestEventsPublisher = new Mock<ITestEventsPublisher>();
-            this.mockDataCollectionTestCaseEventSender = new Mock<IDataCollectionTestCaseEventSender>();
-            this.proxyOutOfProcDataCollectionManager = new ProxyOutOfProcDataCollectionManager(this.mockDataCollectionTestCaseEventSender.Object, this.mockTestEventsPublisher.Object);
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.DataCollection;
 
-            var attachmentSet = new AttachmentSet(new Uri("my://datacollector"), "mydatacollector");
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("my://attachment.txt"), string.Empty));
-            this.attachmentSets = new Collection<AttachmentSet>();
-            this.attachmentSets.Add(attachmentSet);
+[TestClass]
+public class ProxyOutOfProcDataCollectionManagerTests
+{
+    private readonly Mock<ITestEventsPublisher> _mockTestEventsPublisher;
+    private readonly Mock<IDataCollectionTestCaseEventSender> _mockDataCollectionTestCaseEventSender;
+    private readonly Collection<AttachmentSet> _attachmentSets;
+    private readonly TestCase _testcase;
+    private VisualStudio.TestPlatform.ObjectModel.TestResult _testResult;
 
-            this.testcase = new TestCase();
-            this.testcase.Id = Guid.NewGuid();
-            this.mockDataCollectionTestCaseEventSender.Setup(x => x.SendTestCaseEnd(It.IsAny<TestCaseEndEventArgs>())).Returns(this.attachmentSets);
-            this.mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(this.testcase, TestOutcome.Passed));
-            this.testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(this.testcase);
-        }
+    private readonly ProxyOutOfProcDataCollectionManager _proxyOutOfProcDataCollectionManager;
+    public ProxyOutOfProcDataCollectionManagerTests()
+    {
+        _mockTestEventsPublisher = new Mock<ITestEventsPublisher>();
+        _mockDataCollectionTestCaseEventSender = new Mock<IDataCollectionTestCaseEventSender>();
+        _proxyOutOfProcDataCollectionManager = new ProxyOutOfProcDataCollectionManager(_mockDataCollectionTestCaseEventSender.Object, _mockTestEventsPublisher.Object);
 
-        [TestMethod]
-        public void TriggerTestCaseEndShouldReturnCacheAttachmentsAndAssociateWithTestResultWhenTriggerSendTestResultIsInvoked()
+        var attachmentSet = new AttachmentSet(new Uri("my://datacollector"), "mydatacollector");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("my://attachment.txt"), string.Empty));
+        _attachmentSets = new Collection<AttachmentSet>
         {
-            this.mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(this.testResult));
+            attachmentSet
+        };
+
+        _testcase = new TestCase();
+        _testcase.Id = Guid.NewGuid();
+        _mockDataCollectionTestCaseEventSender.Setup(x => x.SendTestCaseEnd(It.IsAny<TestCaseEndEventArgs>())).Returns(_attachmentSets);
+        _mockTestEventsPublisher.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(_testcase, TestOutcome.Passed));
+        _testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(_testcase);
+    }
 
-            Assert.AreEqual(1, this.testResult.Attachments.Count);
-            Assert.IsTrue(this.testResult.Attachments[0].Attachments[0].Uri.OriginalString.Contains("attachment.txt"));
-        }
+    [TestMethod]
+    public void TriggerTestCaseEndShouldReturnCacheAttachmentsAndAssociateWithTestResultWhenTriggerSendTestResultIsInvoked()
+    {
+        _mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(_testResult));
 
-        [TestMethod]
-        public void TriggerSendTestResultShouldDeleteTheAttachmentsFromCache()
-        {
-            this.mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(this.testResult));
+        Assert.AreEqual(1, _testResult.Attachments.Count);
+        Assert.IsTrue(_testResult.Attachments[0].Attachments[0].Uri.OriginalString.Contains("attachment.txt"));
+    }
+
+    [TestMethod]
+    public void TriggerSendTestResultShouldDeleteTheAttachmentsFromCache()
+    {
+        _mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(_testResult));
 
-            this.testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(this.testcase);
-            this.mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(this.testResult));
+        _testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(_testcase);
+        _mockTestEventsPublisher.Raise(x => x.TestResult += null, new TestResultEventArgs(_testResult));
 
-            Assert.AreEqual(0, this.testResult.Attachments.Count);
-        }
+        Assert.AreEqual(0, _testResult.Attachments.Count);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs
index 16f4749e9b..802f7de7bd 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscovererEnumeratorTests.cs
@@ -1,750 +1,973 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery;
+
+[TestClass]
+public class DiscovererEnumeratorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Globalization;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class DiscovererEnumeratorTests
-    {
-        private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-        private readonly DiscovererEnumerator discovererEnumerator;
-        private readonly Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private readonly DiscoveryResultCache discoveryResultCache;
-        private readonly Mock<IRequestData> mockRequestData;
-        private readonly Mock<IMetricsCollection> mockMetricsCollection;
-        private readonly Mock<IAssemblyProperties> mockAssemblyProperties;
-        private readonly Mock<IRunSettings> runSettingsMock;
-        private readonly Mock<IMessageLogger> messageLoggerMock;
-
-        public DiscovererEnumeratorTests()
-        {
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-            this.discoveryResultCache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockAssemblyProperties = new Mock<IAssemblyProperties>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.discovererEnumerator = new DiscovererEnumerator(this.mockRequestData.Object, this.discoveryResultCache, this.mockTestPlatformEventSource.Object, this.mockAssemblyProperties.Object, this.cancellationTokenSource.Token);
-            this.runSettingsMock = new Mock<IRunSettings>();
-            this.messageLoggerMock = new Mock<IMessageLogger>();
-            TestPluginCacheHelper.SetupMockExtensions( new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
-            TestDiscoveryExtensionManager.Destroy();
-        }
+    private readonly CancellationTokenSource _cancellationTokenSource = new();
+    private readonly DiscovererEnumerator _discovererEnumerator;
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly DiscoveryResultCache _discoveryResultCache;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IAssemblyProperties> _mockAssemblyProperties;
+    private readonly Mock<IRunSettings> _runSettingsMock;
+    private readonly Mock<IMessageLogger> _messageLoggerMock;
+
+    public DiscovererEnumeratorTests()
+    {
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _discoveryResultCache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockAssemblyProperties = new Mock<IAssemblyProperties>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _discovererEnumerator = new DiscovererEnumerator(_mockRequestData.Object, _discoveryResultCache, _mockTestPlatformEventSource.Object, _mockAssemblyProperties.Object, _cancellationTokenSource.Token);
+        _runSettingsMock = new Mock<IRunSettings>();
+        _messageLoggerMock = new Mock<IMessageLogger>();
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
+        TestDiscoveryExtensionManager.Destroy();
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            ManagedDllTestDiscoverer.Reset();
-            NativeDllTestDiscoverer.Reset();
-            JsonTestDiscoverer.Reset();
-            NotImplementedTestDiscoverer.Reset();
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        ManagedDllTestDiscoverer.Reset();
+        NativeDllTestDiscoverer.Reset();
+        JsonTestDiscoverer.Reset();
+        NotImplementedTestDiscoverer.Reset();
+        EverythingTestDiscoverer.Reset();
+        DirectoryTestDiscoverer.Reset();
+        DirectoryAndFileTestDiscoverer.Reset();
+    }
 
-        [TestMethod]
-        public void LoadTestsShouldReportWarningOnNoDiscoverers()
+    [TestMethod]
+    public void LoadTestsShouldReportWarningOnNoDiscoverers()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(TestPluginCache).Assembly.Location],
+            () => { });
+        var sources = new List<string> { typeof(DiscoveryResultCacheTests).Assembly.Location };
+
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(TestPluginCache).GetTypeInfo().Assembly.Location },
-                () => { });
-            var sources = new List<string> { typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location };
+            { "_none_", sources }
+        };
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, null, _messageLoggerMock.Object);
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, null, this.messageLoggerMock.Object);
+        var message = $"No test is available in {string.Join(" ", sources)}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
 
-            var messageFormat =
-                "No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
-            var message = string.Format(messageFormat, string.Join(" ", sources));
+        _messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, message), Times.Once);
+    }
 
-            this.messageLoggerMock.Verify(
-                l =>
-                l.SendMessage(TestMessageLevel.Warning, message), Times.Once);
-        }
+    [TestMethod]
+    public void LoadTestsShouldNotCallIntoDiscoverersIfNoneMatchesSources()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
+        var sources = new List<string> { "temp.jpeg" };
 
-        [TestMethod]
-        public void LoadTestsShouldNotCallIntoDiscoverersIfNoneMatchesSources()
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
-            var sources = new List<string> { "temp.jpeg" };
+            { "_none_", sources }
+        };
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, null, _messageLoggerMock.Object);
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, null, this.messageLoggerMock.Object);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        CollectionAssert.AreEqual(sources, EverythingTestDiscoverer.Sources!.ToList());
 
-            Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsFalse(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
-        }
+        Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsFalse(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldCallOnlyNativeDiscovererIfNativeAssembliesPassed()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
+
+        _mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("native.dll")).Returns(AssemblyType.Native);
 
-        [TestMethod]
-        public void LoadTestsShouldCallOnlyNativeDiscovererIfNativeAssembliesPassed()
+        var sources = new List<string>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            "native.dll"
+        };
 
-            this.mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("native.dll")).Returns(AssemblyType.Native);
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
 
-            var sources = new List<string>
-                              {
-                                  "native.dll"
-                              };
+        string testCaseFilter = "TestFilter";
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
 
-            string testCaseFilter = "TestFilter";
+        Assert.IsTrue(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
+        CollectionAssert.AreEqual(sources, NativeDllTestDiscoverer.Sources!.ToList());
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        CollectionAssert.AreEqual(sources, EverythingTestDiscoverer.Sources!.ToList());
 
-            Assert.IsTrue(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
-            CollectionAssert.AreEqual(sources, NativeDllTestDiscoverer.Sources.ToList());
+        Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+    }
 
-            Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
-        }
+    [TestMethod]
+    public void LoadTestsShouldCallOnlyManagedDiscovererIfManagedAssembliesPassed()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
+
+        _mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("managed.dll")).Returns(AssemblyType.Managed);
 
-        [TestMethod]
-        public void LoadTestsShouldCallOnlyManagedDiscovererIfManagedAssembliesPassed()
+        var sources = new List<string>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            "managed.dll"
+        };
 
-            this.mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("managed.dll")).Returns(AssemblyType.Managed);
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
 
-            var sources = new List<string>
-                              {
-                                  "managed.dll"
-                              };
+        string testCaseFilter = "TestFilter";
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
 
-            string testCaseFilter = "TestFilter";
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        CollectionAssert.AreEqual(sources, ManagedDllTestDiscoverer.Sources!.ToList());
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        CollectionAssert.AreEqual(sources, EverythingTestDiscoverer.Sources!.ToList());
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            CollectionAssert.AreEqual(sources, ManagedDllTestDiscoverer.Sources.ToList());
+        Assert.IsFalse(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+    }
 
-            Assert.IsFalse(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
-            Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
-        }
+    [TestMethod]
+    public void LoadTestsShouldCallBothNativeAndManagedDiscoverersWithCorrectSources()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void LoadTestsShouldCallBothNativeAndManagedDiscoverersWithCorrectSources()
+        _mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("native.dll")).Returns(AssemblyType.Native);
+        _mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("managed.dll")).Returns(AssemblyType.Managed);
+
+        var nativeSources = new List<string>
+        {
+            "native.dll"
+        };
+        var managedSources = new List<string>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            "managed.dll"
+        };
 
-            this.mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("native.dll")).Returns(AssemblyType.Native);
-            this.mockAssemblyProperties.Setup(pe => pe.GetAssemblyType("managed.dll")).Returns(AssemblyType.Managed);
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", nativeSources.Concat(managedSources) }
+        };
 
-            var nativeSources = new List<string>
-                              {
-                                  "native.dll"
-                              };
-            var managedSources = new List<string>
-                              {
-                                  "managed.dll"
-                              };
+        string testCaseFilter = "TestFilter";
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", nativeSources.Concat(managedSources));
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
 
-            string testCaseFilter = "TestFilter";
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        CollectionAssert.AreEqual(managedSources, ManagedDllTestDiscoverer.Sources!.ToList());
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
+        Assert.IsTrue(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
+        CollectionAssert.AreEqual(nativeSources, NativeDllTestDiscoverer.Sources!.ToList());
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            CollectionAssert.AreEqual(managedSources, ManagedDllTestDiscoverer.Sources.ToList());
+        var allSources = nativeSources.Concat(managedSources).OrderBy(source => source).ToList();
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        CollectionAssert.AreEqual(allSources, EverythingTestDiscoverer.Sources!.OrderBy(source => source).ToList());
 
-            Assert.IsTrue(NativeDllTestDiscoverer.IsNativeDiscoverTestCalled);
-            CollectionAssert.AreEqual(nativeSources, NativeDllTestDiscoverer.Sources.ToList());
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+    }
 
-            Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
-        }
+    [TestMethod]
+    public void LoadTestsShouldCallIntoADiscovererThatMatchesTheSources()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void LoadTestsShouldCallIntoADiscovererThatMatchesTheSources()
+        var sources = new List<string>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            typeof(DiscoveryResultCacheTests).Assembly.Location,
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            var sources = new List<string>
-                              {
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
+        string testCaseFilter = "TestFilter";
+
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
+
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+
+        // Also validate that the right set of arguments were passed on to the discoverer.
+        CollectionAssert.AreEqual(sources.Distinct().ToList(), ManagedDllTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(_runSettingsMock.Object, DllTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DllTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DllTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DllTestDiscoverer.DiscoverySink);
+
+        CollectionAssert.AreEqual(sources.Distinct().ToList(), EverythingTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(_runSettingsMock.Object, EverythingTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)EverythingTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, EverythingTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(EverythingTestDiscoverer.DiscoverySink);
+    }
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
-            string testCaseFilter = "TestFilter";
+    [TestMethod]
+    public void LoadTestsShouldCallIntoMultipleDiscoverersThatMatchesTheSources()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
+        var dllsources = new List<string>
+        {
+            typeof(DiscoveryResultCacheTests).Assembly.Location,
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        var jsonsources = new List<string>
+        {
+            "test1.json",
+            "test2.json"
+        };
 
-            // Also validate that the right set of arguments were passed on to the discoverer.
-            CollectionAssert.AreEqual(sources, ManagedDllTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(this.runSettingsMock.Object, ManagedDllTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (ManagedDllTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, ManagedDllTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(ManagedDllTestDiscoverer.DiscoverySink);
-        }
+        var currentDirectory = Directory.GetCurrentDirectory();
+        var directorySources = new List<string>
+        {
+            currentDirectory,
+            Path.GetDirectoryName(currentDirectory)!
+        };
 
-        [TestMethod]
-        public void LoadTestsShouldCallIntoMultipleDiscoverersThatMatchesTheSources()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
-
-            var dllsources = new List<string>
-                              {
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
-            var jsonsources = new List<string>
-                              {
-                                  "test1.json",
-                                  "test2.json"
-                              };
-            var sources = new List<string>(dllsources);
-            sources.AddRange(jsonsources);
-
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
-
-            var runSettings = this.runSettingsMock.Object;
-
-            string testCaseFilter = "TestFilter";
-
-            this.discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, this.messageLoggerMock.Object);
-
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsTrue(JsonTestDiscoverer.IsDiscoverTestCalled);
-
-            // Also validate that the right set of arguments were passed on to the discoverer.
-            CollectionAssert.AreEqual(dllsources, ManagedDllTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, ManagedDllTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (ManagedDllTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, ManagedDllTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(ManagedDllTestDiscoverer.DiscoverySink);
-
-            CollectionAssert.AreEqual(jsonsources, JsonTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, JsonTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (JsonTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, JsonTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(JsonTestDiscoverer.DiscoverySink);
-        }
+        var sources = new List<string>(dllsources);
+        sources.AddRange(jsonsources);
+        sources.AddRange(directorySources);
 
-        [TestMethod]
-        public void LoadTestsShouldCallIntoOtherDiscoverersWhenCreatingOneFails()
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            { "_none_", sources }
+        };
+
+        var runSettings = _runSettingsMock.Object;
+
+        string testCaseFilter = "TestFilter";
+
+        _discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, _messageLoggerMock.Object);
+
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsTrue(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+
+        // Also validate that the right set of arguments were passed on to the discoverer.
+        CollectionAssert.AreEqual(dllsources.Distinct().ToList(), ManagedDllTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DllTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DllTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DllTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DllTestDiscoverer.DiscoverySink);
+
+        CollectionAssert.AreEqual(jsonsources, JsonTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, JsonTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)JsonTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, JsonTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(JsonTestDiscoverer.DiscoverySink);
+
+        var allSources = sources.Distinct().OrderBy(source => source).ToList();
+        CollectionAssert.AreEqual(allSources, EverythingTestDiscoverer.Sources!.OrderBy(source => source).ToList());
+        Assert.AreEqual(runSettings, EverythingTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)EverythingTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, EverythingTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(EverythingTestDiscoverer.DiscoverySink);
+
+        CollectionAssert.AreEqual(directorySources, DirectoryTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DirectoryTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DirectoryTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DirectoryTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DirectoryTestDiscoverer.DiscoverySink);
+
+        var jsonAndDirectorySources = jsonsources.Concat(directorySources).OrderBy(source => source).ToList();
+        CollectionAssert.AreEqual(jsonAndDirectorySources, DirectoryAndFileTestDiscoverer.Sources!.OrderBy(source => source).ToList());
+        Assert.AreEqual(runSettings, DirectoryAndFileTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DirectoryAndFileTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DirectoryAndFileTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DirectoryAndFileTestDiscoverer.DiscoverySink);
+    }
 
-            var sources = new List<string>
-                              {
-                                  "test1.csv",
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
+    [TestMethod]
+    public void LoadTestsShouldCallIntoOtherDiscoverersWhenCreatingOneFails()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        var sources = new List<string>
+        {
+            "test1.csv",
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            var runSettings = this.runSettingsMock.Object;
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
 
-            string testCaseFilter = "TestFilter";
+        var runSettings = _runSettingsMock.Object;
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, this.messageLoggerMock.Object);
+        string testCaseFilter = "TestFilter";
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsFalse(SingletonTestDiscoverer.IsDiscoverTestCalled);
+        _discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, _messageLoggerMock.Object);
 
-            // Also validate that the right set of arguments were passed on to the discoverer.
-            CollectionAssert.AreEqual(new List<string> { sources[1] }, ManagedDllTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, ManagedDllTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (ManagedDllTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, ManagedDllTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(ManagedDllTestDiscoverer.DiscoverySink);
-        }
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsFalse(SingletonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
 
-        [TestMethod]
-        public void LoadTestsShouldCallIntoOtherDiscoverersEvenIfDiscoveryInOneFails()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+        // Also validate that the right set of arguments were passed on to the discoverer.
+        CollectionAssert.AreEqual(new List<string> { sources[1] }, ManagedDllTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DllTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DllTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DllTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DllTestDiscoverer.DiscoverySink);
 
-            var sources = new List<string>
-                              {
-                                  "test1.cs",
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
+        CollectionAssert.AreEqual(sources.ToList(), EverythingTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, EverythingTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)EverythingTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, EverythingTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(EverythingTestDiscoverer.DiscoverySink);
+    }
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+    [TestMethod]
+    public void LoadTestsShouldCallIntoOtherDiscoverersEvenIfDiscoveryInOneFails()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-            var runSettings = this.runSettingsMock.Object;
+        var sources = new List<string>
+        {
+            "test1.cs",
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            string testCaseFilter = "TestFilter";
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, this.messageLoggerMock.Object);
+        var runSettings = _runSettingsMock.Object;
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsTrue(NotImplementedTestDiscoverer.IsDiscoverTestCalled);
+        string testCaseFilter = "TestFilter";
 
-            // Also validate that the right set of arguments were passed on to the discoverer.
-            CollectionAssert.AreEqual(new List<string> { sources[1] }, ManagedDllTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, ManagedDllTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (ManagedDllTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, ManagedDllTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(ManagedDllTestDiscoverer.DiscoverySink);
+        _discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, _messageLoggerMock.Object);
 
-            // Check if we log the failure.
-            var message = string.Format(
-                    CultureInfo.CurrentUICulture,
-                    "An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}",
-                    typeof(NotImplementedTestDiscoverer).Name,
-                    "The method or operation is not implemented.");
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsTrue(NotImplementedTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
 
-            this.messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Error, message), Times.Once);
-        }
+        // Also validate that the right set of arguments were passed on to the discoverer.
+        CollectionAssert.AreEqual(new List<string> { sources[1] }, ManagedDllTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DllTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DllTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DllTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DllTestDiscoverer.DiscoverySink);
 
-        [TestMethod]
-        public void LoadTestsShouldCollectMetrics()
-        {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
-
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
-
-            var sources = new List<string>
-                              {
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
-
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
-
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
-
-            string testCaseFilter = "TestFilter";
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
-
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecByAllAdapters, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsByAdapter + ".discoverer://manageddlldiscoverer/", It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + ".discoverer://manageddlldiscoverer/", It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsByAdapter + ".discoverer://nativedlldiscoverer/", It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + ".discoverer://nativedlldiscoverer/", It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, It.IsAny<object>()), Times.Once);
-        }
+        CollectionAssert.AreEqual(sources.ToList(), EverythingTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, EverythingTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)EverythingTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, EverythingTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(EverythingTestDiscoverer.DiscoverySink);
 
-        [TestMethod]
-        public void LoadTestsShouldNotCallIntoDiscoverersWhenCancelled()
-        {
-            // Setup
-            string[] extensions = new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location };
-            TestPluginCacheHelper.SetupMockExtensions(extensions, () => { });
-
-            var dllsources = new List<string>
-                              {
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
-            var jsonsources = new List<string>
-                              {
-                                  "test1.json",
-                                  "test2.json"
-                              };
-            var sources = new List<string>(dllsources);
-            sources.AddRange(jsonsources);
-
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
-            {
-                { "_none_", sources }
-            };
-
-            // Act
-            this.cancellationTokenSource.Cancel();
-            var runSettings = this.runSettingsMock.Object;
-            string testCaseFilter = "TestFilter";
-            this.discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, this.messageLoggerMock.Object);
-
-            // Validate
-            Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
-            this.messageLoggerMock.Verify(logger => logger.SendMessage(TestMessageLevel.Warning, "Discovery of tests cancelled."), Times.Once);
-        }
+        // Check if we log the failure.
+        var message = $"An exception occurred while test discoverer '{typeof(NotImplementedTestDiscoverer).Name}' was loading tests. Exception: The method or operation is not implemented.";
 
-        [TestMethod]
-        public void LoadTestsShouldCallIntoTheAdapterWithTheRightTestCaseSink()
+        _messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Error, message), Times.Once);
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        var dict = new Dictionary<string, object>
         {
-            this.InvokeLoadTestWithMockSetup();
+            { "DummyMessage", "DummyValue" }
+        };
 
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.AreEqual(2, this.discoveryResultCache.Tests.Count);
-        }
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void LoadTestsShouldNotShowAnyWarningOnTestsDiscovered()
+        var sources = new List<string>
         {
-            this.InvokeLoadTestWithMockSetup();
+            typeof(DiscoveryResultCacheTests).Assembly.Location,
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            Assert.AreEqual(2, this.discoveryResultCache.Tests.Count);
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
+
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+
+        string testCaseFilter = "TestFilter";
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
+
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenInSecByAllAdapters, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterUsedToDiscoverTests, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringDiscovery, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsByAdapter + ".discoverer://manageddlldiscoverer/", It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + ".discoverer://manageddlldiscoverer/", It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsByAdapter + ".discoverer://nativedlldiscoverer/", It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToDiscoverTestsByAnAdapter + ".discoverer://nativedlldiscoverer/", It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenToLoadAdaptersInSec, It.IsAny<object>()), Times.Once);
+    }
 
-            this.messageLoggerMock.Verify(m => m.SendMessage(TestMessageLevel.Warning, It.IsAny<string>()), Times.Never);
-        }
+    [TestMethod]
+    public void LoadTestsShouldNotCallIntoDiscoverersWhenCancelled()
+    {
+        // Setup
+        string[] extensions = [typeof(DiscovererEnumeratorTests).Assembly.Location];
+        TestPluginCacheHelper.SetupMockExtensions(extensions, () => { });
 
-        [TestMethod]
-        public void LoadTestShouldInstrumentDiscoveryStart()
+        var dllsources = new List<string>
         {
-            this.InvokeLoadTestWithMockSetup();
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryStart(), Times.Once);
-        }
+            typeof(DiscoveryResultCacheTests).Assembly.Location,
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
+        var jsonsources = new List<string>
+        {
+            "test1.json",
+            "test2.json"
+        };
+        var sources = new List<string>(dllsources);
+        sources.AddRange(jsonsources);
 
-        [TestMethod]
-        public void LoadTestShouldInstrumentDiscoveryStop()
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            this.InvokeLoadTestWithMockSetup();
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryStop(It.IsAny<long>()), Times.Once);
-        }
+            { "_none_", sources }
+        };
+
+        // Act
+        _cancellationTokenSource.Cancel();
+        var runSettings = _runSettingsMock.Object;
+        string testCaseFilter = "TestFilter";
+        _discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, _messageLoggerMock.Object);
+
+        // Validate
+        Assert.IsFalse(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsFalse(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+
+        _messageLoggerMock.Verify(logger => logger.SendMessage(TestMessageLevel.Warning, "Discovery of tests cancelled."), Times.Once);
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldCallIntoTheAdapterWithTheRightTestCaseSink()
+    {
+        InvokeLoadTestWithMockSetup();
+
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.AreEqual(2, _discoveryResultCache.Tests.Count);
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldNotShowAnyWarningOnTestsDiscovered()
+    {
+        InvokeLoadTestWithMockSetup();
+
+        Assert.AreEqual(2, _discoveryResultCache.Tests.Count);
+
+        _messageLoggerMock.Verify(m => m.SendMessage(TestMessageLevel.Warning, It.IsAny<string>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void LoadTestShouldInstrumentDiscoveryStart()
+    {
+        InvokeLoadTestWithMockSetup();
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryStart(), Times.Once);
+    }
+
+    [TestMethod]
+    public void LoadTestShouldInstrumentDiscoveryStop()
+    {
+        InvokeLoadTestWithMockSetup();
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryStop(It.IsAny<long>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void LoadTestShouldInstrumentAdapterDiscoveryStart()
+    {
+        InvokeLoadTestWithMockSetup();
+        _mockTestPlatformEventSource.Verify(x => x.AdapterDiscoveryStart(It.IsAny<string>()), Times.AtLeastOnce);
+    }
+
+    [TestMethod]
+    public void LoadTestShouldInstrumentAdapterDiscoveryStop()
+    {
+        InvokeLoadTestWithMockSetup();
+        _mockTestPlatformEventSource.Verify(x => x.AdapterDiscoveryStop(It.IsAny<long>()), Times.AtLeastOnce);
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldIterateOverAllExtensionsInTheMapAndDiscoverTests()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void LoadTestShouldInstrumentAdapterDiscoveryStart()
+        var dllsources = new List<string>
         {
-            this.InvokeLoadTestWithMockSetup();
-            this.mockTestPlatformEventSource.Verify(x => x.AdapterDiscoveryStart(It.IsAny<string>()), Times.AtLeastOnce);
-        }
+            typeof(DiscoveryResultCacheTests).Assembly.Location,
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
+        var jsonsources = new List<string>
+        {
+            "test1.json",
+            "test2.json"
+        };
 
-        [TestMethod]
-        public void LoadTestShouldInstrumentAdapterDiscoveryStop()
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            this.InvokeLoadTestWithMockSetup();
-            this.mockTestPlatformEventSource.Verify(x => x.AdapterDiscoveryStop(It.IsAny<long>()), Times.AtLeastOnce);
-        }
+            { typeof(DiscovererEnumeratorTests).Assembly.Location, jsonsources },
+            { "_none_", dllsources }
+        };
+
+        var runSettings = _runSettingsMock.Object;
+
+        string testCaseFilter = "TestFilter";
+
+        _discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, _messageLoggerMock.Object);
+
+        Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
+        Assert.IsTrue(JsonTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(EverythingTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsTrue(DirectoryAndFileTestDiscoverer.IsDiscoverTestCalled);
+        Assert.IsFalse(DirectoryTestDiscoverer.IsDiscoverTestCalled);
+
+        // Also validate that the right set of arguments were passed on to the discoverer.
+        CollectionAssert.AreEqual(dllsources.Distinct().ToList(), ManagedDllTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DllTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DllTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DllTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DllTestDiscoverer.DiscoverySink);
+
+        CollectionAssert.AreEqual(jsonsources, JsonTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, JsonTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)JsonTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, JsonTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(JsonTestDiscoverer.DiscoverySink);
+
+        var allSources = jsonsources.Concat(dllsources).Distinct().OrderBy(source => source).ToList();
+        CollectionAssert.AreEqual(allSources, EverythingTestDiscoverer.Sources!.OrderBy(source => source).ToList());
+        Assert.AreEqual(runSettings, EverythingTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)EverythingTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, EverythingTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(EverythingTestDiscoverer.DiscoverySink);
+
+        CollectionAssert.AreEqual(jsonsources, DirectoryAndFileTestDiscoverer.Sources!.ToList());
+        Assert.AreEqual(runSettings, DirectoryAndFileTestDiscoverer.DiscoveryContext!.RunSettings);
+        Assert.AreEqual(testCaseFilter, ((DiscoveryContext)DirectoryAndFileTestDiscoverer.DiscoveryContext).FilterExpressionWrapper!.FilterString);
+        Assert.AreEqual(_messageLoggerMock.Object, DirectoryAndFileTestDiscoverer.MessageLogger);
+        Assert.IsNotNull(DirectoryAndFileTestDiscoverer.DiscoverySink);
+    }
 
-        [TestMethod]
-        public void LoadTestsShouldIterateOverAllExtensionsInTheMapAndDiscoverTests()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
-
-            var dllsources = new List<string>
-                              {
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                              };
-            var jsonsources = new List<string>
-                              {
-                                  "test1.json",
-                                  "test2.json"
-                              };
-
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add(typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location, jsonsources);
-            extensionSourceMap.Add("_none_", dllsources);
-
-            var runSettings = this.runSettingsMock.Object;
-
-            string testCaseFilter = "TestFilter";
-
-            this.discovererEnumerator.LoadTests(extensionSourceMap, runSettings, testCaseFilter, this.messageLoggerMock.Object);
-
-            Assert.IsTrue(ManagedDllTestDiscoverer.IsManagedDiscoverTestCalled);
-            Assert.IsTrue(JsonTestDiscoverer.IsDiscoverTestCalled);
-
-            // Also validate that the right set of arguments were passed on to the discoverer.
-            CollectionAssert.AreEqual(dllsources, ManagedDllTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, ManagedDllTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (ManagedDllTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, ManagedDllTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(ManagedDllTestDiscoverer.DiscoverySink);
-
-            CollectionAssert.AreEqual(jsonsources, JsonTestDiscoverer.Sources.ToList());
-            Assert.AreEqual(runSettings, JsonTestDiscoverer.DiscoveryContext.RunSettings);
-            Assert.AreEqual(testCaseFilter, (JsonTestDiscoverer.DiscoveryContext as DiscoveryContext).FilterExpressionWrapper.FilterString);
-            Assert.AreEqual(this.messageLoggerMock.Object, JsonTestDiscoverer.MessageLogger);
-            Assert.IsNotNull(JsonTestDiscoverer.DiscoverySink);
-        }
+    [TestMethod]
+    public void LoadTestsShouldLogWarningMessageOnNoTestsInAssemblies()
+    {
+        SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
 
-        [TestMethod]
-        public void LoadTestsShouldLogWarningMessageOnNoTestsInAssemblies()
-        {
-            DiscovererEnumeratorTests.SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, null, _messageLoggerMock.Object);
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, null, this.messageLoggerMock.Object);
+        var expectedMessage =
+            $"No test is available in {sourcesString}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
 
-            var expectedMessage =
-                $"No test is available in {sourcesString}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
+        _messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
+    }
 
-            this.messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
-        }
+    [TestMethod]
+    public void LoadTestsShouldLogWarningMessageOnNoTestsInAssembliesWithTestCaseFilter()
+    {
+        SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
 
-        [TestMethod]
-        public void LoadTestsShouldLogWarningMessageOnNoTestsInAssembliesWithTestCaseFilter()
-        {
-            DiscovererEnumeratorTests.SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
+        var testCaseFilter = "Name~TestMethod1";
+
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, testCaseFilter, _messageLoggerMock.Object);
 
-            var testCaseFilter = "Name~TestMethod1";
+        var expectedMessage =
+            $"No test matches the given testcase filter `{testCaseFilter}` in {sourcesString}";
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, testCaseFilter, this.messageLoggerMock.Object);
+        _messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
+    }
+
+    [TestMethod]
+    public void LoadTestsShouldShortenTheLongTestCaseFilterWhenNoTestsDiscovered()
+    {
+        SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
 
-            var expectedMessage =
-                $"No test matches the given testcase filter `{testCaseFilter}` in {sourcesString}";
+        var veryLengthyTestCaseFilter = "FullyQualifiedName=TestPlatform.CrossPlatEngine" +
+                                        ".UnitTests.Discovery.DiscovererEnumeratorTests." +
+                                        "LoadTestsShouldShortenTheLongTestCaseFilterWhenNoTestsDiscovered" +
+                                        "TestCaseFilterWithVeryLengthTestCaseNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 
-            this.messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
-        }
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, veryLengthyTestCaseFilter, _messageLoggerMock.Object);
+
+        var expectedTestCaseFilter = veryLengthyTestCaseFilter.Substring(0, 256) + "...";
+        var expectedMessage =
+            $"No test matches the given testcase filter `{expectedTestCaseFilter}` in {sourcesString}";
+
+        _messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
+    }
+
+    private static void SetupForNoTestsAvailableInGivenAssemblies(
+        out Dictionary<string, IEnumerable<string>> extensionSourceMap,
+        out string sourcesString)
+    {
+        var crossPlatEngineAssemblyLocation = typeof(DiscovererEnumerator).Assembly.Location;
+        var objectModelAseeAssemblyLocation = typeof(TestCase).Assembly.Location;
+        var sources = new string[] { crossPlatEngineAssemblyLocation, objectModelAseeAssemblyLocation };
+
+        extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
+        sourcesString = string.Join(" ", crossPlatEngineAssemblyLocation, objectModelAseeAssemblyLocation);
+    }
+
+    private void InvokeLoadTestWithMockSetup()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void LoadTestsShouldShortenTheLongTestCaseFilterWhenNoTestsDiscovered()
+        var sources = new List<string>
         {
-            DiscovererEnumeratorTests.SetupForNoTestsAvailableInGivenAssemblies(out var extensionSourceMap, out var sourcesString);
+            typeof(DiscoveryResultCacheTests).Assembly.Location
+        };
 
-            var veryLengthyTestCaseFilter = "FullyQualifiedName=TestPlatform.CrossPlatEngine" +
-                                            ".UnitTests.Discovery.DiscovererEnumeratorTests." +
-                                            "LoadTestsShouldShortenTheLongTestCaseFilterWhenNoTestsDiscovered" +
-                                            "TestCaseFilterWithVeryLengthTestCaseNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+        var extensionSourceMap = new Dictionary<string, IEnumerable<string>>
+        {
+            { "_none_", sources }
+        };
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, veryLengthyTestCaseFilter, this.messageLoggerMock.Object);
+        _discovererEnumerator.LoadTests(extensionSourceMap, _runSettingsMock.Object, null, _messageLoggerMock.Object);
+    }
 
-            var expectedTestCaseFilter = veryLengthyTestCaseFilter.Substring(0, 256) + "...";
-            var expectedMessage =
-                $"No test matches the given testcase filter `{expectedTestCaseFilter}` in {sourcesString}";
+    #region Implementation
 
-            this.messageLoggerMock.Verify(l => l.SendMessage(TestMessageLevel.Warning, expectedMessage));
+    /// <summary>
+    /// Placing this before others so that at runtime this would be the first to be discovered as a discoverer.
+    /// </summary>
+    [FileExtension(".csv")]
+    [DefaultExecutorUri("discoverer://csvdiscoverer")]
+    private class SingletonTestDiscoverer : ITestDiscoverer
+    {
+        private SingletonTestDiscoverer()
+        {
         }
 
-        private static void SetupForNoTestsAvailableInGivenAssemblies(
-            out Dictionary<string, IEnumerable<string>> extensionSourceMap,
-            out string sourcesString)
-        {
-            var crossPlatEngineAssemblyLocation = typeof(DiscovererEnumerator).GetTypeInfo().Assembly.Location;
-            var objectModelAseeAssemblyLocation = typeof(TestCase).GetTypeInfo().Assembly.Location;
-            var sources = new string[] { crossPlatEngineAssemblyLocation, objectModelAseeAssemblyLocation };
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
-            sourcesString = string.Join(" ", crossPlatEngineAssemblyLocation, objectModelAseeAssemblyLocation);
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+            IsDiscoverTestCalled = true;
         }
 
-        private void InvokeLoadTestWithMockSetup()
+        public static void Reset()
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                    new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                    () => { });
+            IsDiscoverTestCalled = false;
+        }
+    }
 
-            var sources = new List<string>
-                                  {
-                                      typeof(DiscoveryResultCacheTests).GetTypeInfo().Assembly.Location
-                                  };
+    [FileExtension(".cs")]
+    [DefaultExecutorUri("discoverer://csvdiscoverer")]
+    private class NotImplementedTestDiscoverer : ITestDiscoverer
+    {
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            var extensionSourceMap = new Dictionary<string, IEnumerable<string>>();
-            extensionSourceMap.Add("_none_", sources);
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        {
+            IsDiscoverTestCalled = true;
+            throw new NotImplementedException();
+        }
 
-            this.discovererEnumerator.LoadTests(extensionSourceMap, this.runSettingsMock.Object, null, this.messageLoggerMock.Object);
+        public static void Reset()
+        {
+            IsDiscoverTestCalled = false;
         }
+    }
+
+    [FileExtension(".dll")]
+    [FileExtension(".exe")]
+    [DefaultExecutorUri("discoverer://manageddlldiscoverer")]
+    [Category("managed")]
+    private class ManagedDllTestDiscoverer : DllTestDiscoverer
+    {
+        public static bool IsManagedDiscoverTestCalled { get; private set; }
 
-        #region Implementation
+        public static IEnumerable<string>? Sources { get; set; }
 
-        /// <summary>
-        /// Placing this before others so that at runtime this would be the first to be discovered as a discoverer.
-        /// </summary>
-        [FileExtension(".csv")]
-        [DefaultExecutorUri("discoverer://csvdiscoverer")]
-        private class SingletonTestDiscoverer : ITestDiscoverer
+        public override void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            private SingletonTestDiscoverer()
-            {
-            }
+            Sources = sources;
+            IsManagedDiscoverTestCalled = true;
+            base.DiscoverTests(sources, discoveryContext, logger, discoverySink);
+        }
 
-            public static bool IsDiscoverTestCalled { get; private set; }
+        public static void Reset()
+        {
+            IsManagedDiscoverTestCalled = false;
+            Sources = null;
+        }
+    }
 
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                IsDiscoverTestCalled = true;
-            }
+    [FileExtension(".dll")]
+    [FileExtension(".exe")]
+    [DefaultExecutorUri("discoverer://nativedlldiscoverer")]
+    [Category("native")]
+    private class NativeDllTestDiscoverer : DllTestDiscoverer
+    {
+        public static bool IsNativeDiscoverTestCalled { get; private set; }
 
-            public static void Reset()
-            {
-                IsDiscoverTestCalled = false;
-            }
+        public static IEnumerable<string>? Sources { get; set; }
+
+        public override void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            Sources = sources;
+            IsNativeDiscoverTestCalled = true;
+            base.DiscoverTests(sources, discoveryContext, logger, discoverySink);
         }
 
-        [FileExtension(".cs")]
-        [DefaultExecutorUri("discoverer://csvdiscoverer")]
-        private class NotImplementedTestDiscoverer : ITestDiscoverer
+        public static void Reset()
         {
-            public static bool IsDiscoverTestCalled { get; private set; }
+            IsNativeDiscoverTestCalled = false;
+            Sources = null;
+        }
+    }
+
+    private class DllTestDiscoverer : ITestDiscoverer
+    {
+        public static IDiscoveryContext? DiscoveryContext { get; private set; }
+
+        public static IMessageLogger? MessageLogger { get; private set; }
+
+        public static ITestCaseDiscoverySink? DiscoverySink { get; private set; }
 
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+        public virtual void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            if (ShouldTestDiscovered(sources) == false)
             {
-                IsDiscoverTestCalled = true;
-                throw new NotImplementedException();
+                return;
             }
 
-            public static void Reset()
+            DiscoveryContext = discoveryContext;
+            MessageLogger = logger;
+            DiscoverySink = discoverySink;
+
+            var testCase = new TestCase("A.C.M", new Uri("executor://dllexecutor"), "A");
+            discoverySink.SendTestCase(testCase);
+        }
+
+        private static bool ShouldTestDiscovered(IEnumerable<string> sources)
+        {
+            var shouldTestDiscovered = false;
+            foreach (var source in sources)
             {
-                IsDiscoverTestCalled = false;
+                if (source.Equals("native.dll") || source.Equals("managed.dll") || source.EndsWith("CrossPlatEngine.UnitTests.dll") || source.EndsWith("CrossPlatEngine.UnitTests.exe"))
+                {
+                    shouldTestDiscovered = true;
+                    break;
+                }
             }
+
+            return shouldTestDiscovered;
         }
+    }
 
-        [FileExtension(".dll")]
-        [DefaultExecutorUri("discoverer://manageddlldiscoverer")]
-        [Category("managed")]
-        private class ManagedDllTestDiscoverer : DllTestDiscoverer
-        {
-            public static bool IsManagedDiscoverTestCalled { get; private set; }
+    [FileExtension(".json")]
+    [DefaultExecutorUri("discoverer://jsondiscoverer")]
+    private class JsonTestDiscoverer : ITestDiscoverer
+    {
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            public static IEnumerable<string> Sources { get; set; }
+        public static IEnumerable<string>? Sources { get; private set; }
 
-            public override void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                Sources = sources;
-                IsManagedDiscoverTestCalled = true;
-                base.DiscoverTests(sources, discoveryContext, logger, discoverySink);
-            }
+        public static IDiscoveryContext? DiscoveryContext { get; private set; }
 
-            public static void Reset()
-            {
-                IsManagedDiscoverTestCalled = false;
-                Sources = null;
-            }
+        public static IMessageLogger? MessageLogger { get; private set; }
+
+        public static ITestCaseDiscoverySink? DiscoverySink { get; private set; }
+
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            IsDiscoverTestCalled = true;
+            Sources = sources;
+            DiscoveryContext = discoveryContext;
+            MessageLogger = logger;
+            DiscoverySink = discoverySink;
         }
 
-        [FileExtension(".dll")]
-        [DefaultExecutorUri("discoverer://nativedlldiscoverer")]
-        [Category("native")]
-        private class NativeDllTestDiscoverer : DllTestDiscoverer
+        public static void Reset()
         {
-            public static bool IsNativeDiscoverTestCalled { get; private set; }
+            IsDiscoverTestCalled = false;
+        }
+    }
 
-            public static IEnumerable<string> Sources { get; set; }
+    [DefaultExecutorUri("discoverer://everythingdiscoverer")]
+    private class EverythingTestDiscoverer : ITestDiscoverer
+    {
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            public override void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                Sources = sources;
-                IsNativeDiscoverTestCalled = true;
-                base.DiscoverTests(sources, discoveryContext, logger, discoverySink);
-            }
+        public static IEnumerable<string>? Sources { get; private set; }
 
-            public static void Reset()
-            {
-                IsNativeDiscoverTestCalled = false;
-                Sources = null;
-            }
-        }
+        public static IDiscoveryContext? DiscoveryContext { get; private set; }
+
+        public static IMessageLogger? MessageLogger { get; private set; }
+
+        public static ITestCaseDiscoverySink? DiscoverySink { get; private set; }
 
-        private class DllTestDiscoverer : ITestDiscoverer
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
         {
-            public static IDiscoveryContext DiscoveryContext { get; private set; }
+            IsDiscoverTestCalled = true;
+            Sources = Sources is null ? sources : Sources.Concat(sources);
+            DiscoveryContext = discoveryContext;
+            MessageLogger = logger;
+            DiscoverySink = discoverySink;
+        }
 
-            public static IMessageLogger MessageLogger { get; private set; }
+        public static void Reset()
+        {
+            IsDiscoverTestCalled = false;
+            Sources = null;
+        }
+    }
 
-            public static ITestCaseDiscoverySink DiscoverySink { get; private set; }
+    [DirectoryBasedTestDiscoverer]
+    [DefaultExecutorUri("discoverer://dirdiscoverer")]
+    private class DirectoryTestDiscoverer : ITestDiscoverer
+    {
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            public virtual void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                if (DllTestDiscoverer.ShouldTestDiscovered(sources) == false)
-                {
-                    return;
-                }
+        public static IEnumerable<string>? Sources { get; private set; }
 
-                DiscoveryContext = discoveryContext;
-                MessageLogger = logger;
-                DiscoverySink = discoverySink;
+        public static IDiscoveryContext? DiscoveryContext { get; private set; }
 
-                var testCase = new TestCase("A.C.M", new Uri("executor://dllexecutor"), "A");
-                discoverySink.SendTestCase(testCase);
-            }
+        public static IMessageLogger? MessageLogger { get; private set; }
 
-            private static bool ShouldTestDiscovered(IEnumerable<string> sources)
-            {
-                var shouldTestDiscovered = false;
-                foreach (var source in sources)
-                {
-                    if (source.Equals("native.dll") || source.Equals("managed.dll") || source.EndsWith("CrossPlatEngine.UnitTests.dll"))
-                    {
-                        shouldTestDiscovered = true;
-                        break;
-                    }
-                }
+        public static ITestCaseDiscoverySink? DiscoverySink { get; private set; }
 
-                return shouldTestDiscovered;
-            }
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            IsDiscoverTestCalled = true;
+            Sources = Sources is null ? sources : Sources.Concat(sources);
+            DiscoveryContext = discoveryContext;
+            MessageLogger = logger;
+            DiscoverySink = discoverySink;
         }
 
-        [FileExtension(".json")]
-        [DefaultExecutorUri("discoverer://jsondiscoverer")]
-        private class JsonTestDiscoverer : ITestDiscoverer
+        public static void Reset()
         {
-            public static bool IsDiscoverTestCalled { get; private set; }
+            IsDiscoverTestCalled = false;
+            Sources = null;
+        }
+    }
 
-            public static IEnumerable<string> Sources { get; private set; }
+    [DirectoryBasedTestDiscoverer]
+    [FileExtension(".json")]
+    [DefaultExecutorUri("discoverer://dirandfilediscoverer")]
+    private class DirectoryAndFileTestDiscoverer : ITestDiscoverer
+    {
+        public static bool IsDiscoverTestCalled { get; private set; }
 
-            public static IDiscoveryContext DiscoveryContext { get; private set; }
+        public static IEnumerable<string>? Sources { get; private set; }
 
-            public static IMessageLogger MessageLogger { get; private set; }
+        public static IDiscoveryContext? DiscoveryContext { get; private set; }
 
-            public static ITestCaseDiscoverySink DiscoverySink { get; private set; }
+        public static IMessageLogger? MessageLogger { get; private set; }
 
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                IsDiscoverTestCalled = true;
-                Sources = sources;
-                DiscoveryContext = discoveryContext;
-                MessageLogger = logger;
-                DiscoverySink = discoverySink;
-            }
+        public static ITestCaseDiscoverySink? DiscoverySink { get; private set; }
 
-            public static void Reset()
-            {
-                IsDiscoverTestCalled = false;
-            }
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            IsDiscoverTestCalled = true;
+            Sources = Sources is null ? sources : Sources.Concat(sources);
+            DiscoveryContext = discoveryContext;
+            MessageLogger = logger;
+            DiscoverySink = discoverySink;
         }
 
-        #endregion
+        public static void Reset()
+        {
+            IsDiscoverTestCalled = false;
+            Sources = null;
+        }
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryContextTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryContextTests.cs
index 88a170084d..174ae2b1d5 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryContextTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryContextTests.cs
@@ -1,76 +1,72 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery;
+
+[TestClass]
+public class DiscoveryContextTests
 {
-    using System.Collections.Generic;
+    private readonly DiscoveryContext _discoveryContext;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using MSTest.TestFramework.AssertExtensions;
+    public DiscoveryContextTests()
+    {
+        _discoveryContext = new DiscoveryContext();
+    }
 
-    [TestClass]
-    public class DiscoveryContextTests
+    /// <summary>
+    /// GetTestCaseFilter should return null in case filter expression is null
+    /// </summary>
+    [TestMethod]
+    public void GetTestCaseFilterShouldReturnNullIfFilterExpressionIsNull()
     {
-        private DiscoveryContext discoveryContext;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.discoveryContext = new DiscoveryContext();
-        }
-
-        /// <summary>
-        /// GetTestCaseFilter should return null in case filter expression is null
-        /// </summary>
-        [TestMethod]
-        public void GetTestCaseFilterShouldReturnNullIfFilterExpressionIsNull()
-        {
-            this.discoveryContext.FilterExpressionWrapper = null;
-
-            Assert.IsNull(this.discoveryContext.GetTestCaseFilter(null, (s) => { return null; }));
-        }
-
-        /// <summary>
-        /// If only property value passed, consider property key and operation defaults.
-        /// </summary>
-        [TestMethod]
-        public void GetTestCaseFilterShouldNotThrowIfPropertyValueOnlyPassed()
-        {
-            this.discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("Infinity");
-
-            var filter = this.discoveryContext.GetTestCaseFilter(new List<string>{ "FullyQualifiedName" }, (s) => { return null; });
-
-            Assert.IsNotNull(filter);
-        }
-
-        /// <summary>
-        /// Exception should not be thrown in case invalid properties passed in filter expression.
-        /// </summary>
-        [TestMethod]
-        public void GetTestCaseFilterShouldNotThrowOnInvalidProperties()
-        {
-            this.discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
-
-            var filter = this.discoveryContext.GetTestCaseFilter(new List<string> { "TestCategory" }, (s) => { return null; });
-
-            Assert.IsNotNull(filter);
-        }
-
-        /// <summary>
-        /// GetTestCaseFilter should return correct filter as present in filter expression.
-        /// </summary>
-        [TestMethod]
-        public void GetTestCaseFilterShouldReturnTestCaseFilter()
-        {
-            this.discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("TestCategory=Important");
-
-            var filter = this.discoveryContext.GetTestCaseFilter(new List<string> { "TestCategory" }, (s) => { return null; });
-
-            Assert.IsNotNull(filter);
-            Assert.AreEqual("TestCategory=Important", filter.TestCaseFilterValue);
-        }
+        _discoveryContext.FilterExpressionWrapper = null;
+
+        Assert.IsNull(_discoveryContext.GetTestCaseFilter(null, s => null));
+    }
+
+    /// <summary>
+    /// If only property value passed, consider property key and operation defaults.
+    /// </summary>
+    [TestMethod]
+    public void GetTestCaseFilterShouldNotThrowIfPropertyValueOnlyPassed()
+    {
+        _discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("Infinity");
+
+        var filter = _discoveryContext.GetTestCaseFilter(new List<string> { "FullyQualifiedName" }, s => null);
+
+        Assert.IsNotNull(filter);
+    }
+
+    /// <summary>
+    /// Exception should not be thrown in case invalid properties passed in filter expression.
+    /// </summary>
+    [TestMethod]
+    public void GetTestCaseFilterShouldNotThrowOnInvalidProperties()
+    {
+        _discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("highlyunlikelyproperty=unused");
+
+        var filter = _discoveryContext.GetTestCaseFilter(new List<string> { "TestCategory" }, s => null);
+
+        Assert.IsNotNull(filter);
+    }
+
+    /// <summary>
+    /// GetTestCaseFilter should return correct filter as present in filter expression.
+    /// </summary>
+    [TestMethod]
+    public void GetTestCaseFilterShouldReturnTestCaseFilter()
+    {
+        _discoveryContext.FilterExpressionWrapper = new FilterExpressionWrapper("TestCategory=Important");
+
+        var filter = _discoveryContext.GetTestCaseFilter(new List<string> { "TestCategory" }, s => null);
+
+        Assert.IsNotNull(filter);
+        Assert.AreEqual("TestCategory=Important", filter.TestCaseFilterValue);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs
index d7d956b4be..86fee2b8d9 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs
@@ -1,271 +1,317 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+using FluentAssertions;
+
+using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery;
+
+[TestClass]
+public class DiscoveryManagerTests
 {
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using CrossPlatEngineResources = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources;
-
-    [TestClass]
-    public class DiscoveryManagerTests
+    private readonly DiscoveryManager _discoveryManager;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly TestSessionMessageLogger _sessionLogger;
+
+    public DiscoveryManagerTests()
     {
-        private DiscoveryManager discoveryManager;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private TestSessionMessageLogger sessionLogger;
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _sessionLogger = TestSessionMessageLogger.Instance;
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _discoveryManager = new DiscoveryManager(_mockRequestData.Object);
+    }
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.sessionLogger = TestSessionMessageLogger.Instance;
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.discoveryManager = new DiscoveryManager(this.mockRequestData.Object);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestDiscoveryExtensionManager.Destroy();
-            TestPluginCache.Instance = null;
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        TestDiscoveryExtensionManager.Destroy();
+        TestPluginCache.Instance = null;
+    }
 
-        #region Initialize tests
+    #region Initialize tests
 
-        [TestMethod]
-        public void InitializeShouldUpdateAdditionalExtenions()
-        {
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
-            TestPluginCache.Instance = new TestableTestPluginCache();
+    [TestMethod]
+    public void InitializeShouldUpdateAdditionalExtenions()
+    {
+        var mockFileHelper = new Mock<IFileHelper>();
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
+        TestPluginCache.Instance = new TestableTestPluginCache();
 
-            this.discoveryManager.Initialize(
-                new string[] { typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location }, mockLogger.Object);
+        _discoveryManager.Initialize(
+            new string[] { typeof(DiscoveryManagerTests).Assembly.Location }, mockLogger.Object);
 
-            var allDiscoverers = TestDiscoveryExtensionManager.Create().Discoverers;
+        var allDiscoverers = TestDiscoveryExtensionManager.Create().Discoverers;
 
-            Assert.IsNotNull(allDiscoverers);
-            Assert.IsTrue(allDiscoverers.Any());
-        }
+        Assert.IsNotNull(allDiscoverers);
+        Assert.IsTrue(allDiscoverers.Any());
+    }
 
-        #endregion
+    [TestMethod]
+    public void InitializeShouldClearMetricsCollection()
+    {
+        var metricsCollection = new MetricsCollection();
 
-        #region DiscoverTests tests
+        metricsCollection.Add("metric", "value");
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(metricsCollection);
+        _mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
 
-        [TestMethod]
-        public void DiscoverTestsShouldLogIfTheSourceDoesNotExist()
-        {
-            var criteria = new DiscoveryCriteria(new List<string> { "imaginary.dll" }, 100, null);
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        var discoveryManager = new DiscoveryManager(_mockRequestData.Object);
 
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        metricsCollection.Metrics.Should().ContainKey("metric");
+        discoveryManager.Initialize(null, new Mock<ITestDiscoveryEventsHandler2>().Object);
+        metricsCollection.Metrics.Should().BeEmpty();
+    }
 
-            var errorMessage = string.Format(CultureInfo.CurrentCulture, "Could not find file {0}.", Path.Combine(Directory.GetCurrentDirectory(), "imaginary.dll"));
-            mockLogger.Verify(
-                l =>
+    [TestMethod]
+    public void InitializeShouldNotFailIfMetricsFieldIsNull()
+    {
+        _mockRequestData.Object.MetricsCollection.Metrics.Should().BeNull();
+
+        var action = () => (new DiscoveryManager(_mockRequestData.Object))
+            .Initialize(null, new Mock<ITestDiscoveryEventsHandler2>().Object);
+
+        action.Should().NotThrow();
+    }
+    #endregion
+
+    #region DiscoverTests tests
+
+    [TestMethod]
+    public void DiscoverTestsShouldLogIfTheSourceDoesNotExist()
+    {
+        var criteria = new DiscoveryCriteria(new List<string> { "imaginary.dll" }, 100, null);
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+
+        var errorMessage = string.Format(CultureInfo.CurrentCulture, "Could not find file {0}.", Path.Combine(Directory.GetCurrentDirectory(), "imaginary.dll"));
+        mockLogger.Verify(
+            l =>
                 l.HandleLogMessage(
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning,
+                    TestMessageLevel.Warning,
                     errorMessage),
-                Times.Once);
-        }
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldLogIfTheSourceDoesNotExistIfItHasAPackage()
-        {
-            var criteria = new DiscoveryCriteria(new List<string> { "imaginary.exe" }, 100, null);
+    [TestMethod]
+    public void DiscoverTestsShouldLogIfTheSourceDoesNotExistIfItHasAPackage()
+    {
+        var criteria = new DiscoveryCriteria(new List<string> { "imaginary.exe" }, 100, null);
 
-            var packageName = "recipe.AppxRecipe";
+        var packageName = "recipe.AppxRecipe";
 
-            var fakeDirectory = Directory.GetDirectoryRoot(typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location);
+        var fakeDirectory = Directory.GetDirectoryRoot(typeof(DiscoveryManagerTests).Assembly.Location);
 
-            criteria.Package = Path.Combine(fakeDirectory, Path.Combine(packageName));
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        criteria.Package = Path.Combine(fakeDirectory, Path.Combine(packageName));
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            var errorMessage = string.Format(CultureInfo.CurrentCulture, "Could not find file {0}.", Path.Combine(fakeDirectory, "imaginary.exe"));
-            mockLogger.Verify(
-                l =>
+        var errorMessage = string.Format(CultureInfo.CurrentCulture, "Could not find file {0}.", Path.Combine(fakeDirectory, "imaginary.exe"));
+        mockLogger.Verify(
+            l =>
                 l.HandleLogMessage(
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning,
+                    TestMessageLevel.Warning,
                     errorMessage),
-                Times.Once);
-        }
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldLogIfThereAreNoValidSources()
-        {
-            var sources = new List<string> { "imaginary.dll" };
-            var criteria = new DiscoveryCriteria(sources, 100, null);
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+    [TestMethod]
+    public void DiscoverTestsShouldLogIfThereAreNoValidSources()
+    {
+        var sources = new List<string> { "imaginary.dll" };
+        var criteria = new DiscoveryCriteria(sources, 100, null);
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            var sourcesString = string.Join(",", sources.ToArray());
-            var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoValidSourceFoundForDiscovery, sourcesString);
-            mockLogger.Verify(
-                l =>
+        var sourcesString = string.Join(",", sources.ToArray());
+        var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.NoValidSourceFoundForDiscovery, sourcesString);
+        mockLogger.Verify(
+            l =>
                 l.HandleLogMessage(
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning,
+                    TestMessageLevel.Warning,
                     errorMessage),
-                Times.Once);
-        }
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldLogIfTheSameSourceIsSpecifiedTwice()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+    [TestMethod]
+    public void DiscoverTestsShouldLogIfTheSameSourceIsSpecifiedTwice()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-            var sources = new List<string>
-                              {
-                                  typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location,
-                                  typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location
-                              };
+        var sources = new List<string>
+        {
+            typeof(DiscoveryManagerTests).Assembly.Location,
+            typeof(DiscoveryManagerTests).Assembly.Location
+        };
 
-            var criteria = new DiscoveryCriteria(sources, 100, null);
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        var criteria = new DiscoveryCriteria(sources, 100, null);
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DuplicateSource, sources[0]);
-            mockLogger.Verify(
-                l =>
+        var errorMessage = string.Format(CultureInfo.CurrentCulture, CrossPlatEngineResources.DuplicateSource, sources[0]);
+        mockLogger.Verify(
+            l =>
                 l.HandleLogMessage(
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging.TestMessageLevel.Warning,
+                    TestMessageLevel.Warning,
                     errorMessage),
-                Times.Once);
-        }
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldDiscoverTestsInTheSpecifiedSource()
+    [TestMethod]
+    public void DiscoverTestsShouldDiscoverTestsInTheSpecifiedSource()
+    {
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
+
+        var sources = new List<string>
         {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+            typeof(DiscoveryManagerTests).Assembly.Location
+        };
 
-            var sources = new List<string>
-                              {
-                                  typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location
-                              };
+        var criteria = new DiscoveryCriteria(sources, 1, null);
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var criteria = new DiscoveryCriteria(sources, 1, null);
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        // Assert that the tests are passed on via the handletestruncomplete event.
+        mockLogger.Verify(l => l.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()), Times.Once);
+    }
 
-            // Assert that the tests are passed on via the handletestruncomplete event.
-            mockLogger.Verify(l => l.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldSendMetricsOnDiscoveryComplete()
+    {
+        var metricsCollector = new MetricsCollection();
+        metricsCollector.Add("DummyMessage", "DummyValue");
 
-        [TestMethod]
-        public void DiscoverTestsShouldSendMetricsOnDiscoveryComplete()
-        {
-            var metricsCollector = new MetricsCollection();
-            metricsCollector.Add("DummyMessage", "DummyValue");
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(metricsCollector);
 
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(metricsCollector);
+        DiscoveryCompleteEventArgs? receivedDiscoveryCompleteEventArgs = null;
 
-            DiscoveryCompleteEventArgs receivedDiscoveryCompleteEventArgs = null;
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+        var sources = new List<string>
+        {
+            typeof(DiscoveryManagerTests).Assembly.Location
+        };
 
-            var sources = new List<string>
-            {
-                typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location
-            };
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        var criteria = new DiscoveryCriteria(sources, 1, null);
 
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
-            var criteria = new DiscoveryCriteria(sources, 1, null);
+        mockLogger.Setup(ml => ml.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(
+                (DiscoveryCompleteEventArgs complete,
+                    IEnumerable<TestCase> tests) => receivedDiscoveryCompleteEventArgs = complete);
 
-            mockLogger.Setup(ml => ml.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
-                .Callback(
-                    (DiscoveryCompleteEventArgs complete,
-                        IEnumerable<TestCase> tests) =>
-                    {
-                        receivedDiscoveryCompleteEventArgs = complete;
-                    });
+        // Act.
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            // Act.
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        // Assert
+        Assert.IsNotNull(receivedDiscoveryCompleteEventArgs!.Metrics);
+        Assert.IsTrue(receivedDiscoveryCompleteEventArgs.Metrics.Any());
+        Assert.IsTrue(receivedDiscoveryCompleteEventArgs.Metrics.ContainsKey("DummyMessage"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        var dict = new Dictionary<string, object>
+        {
+            { "DummyMessage", "DummyValue" }
+        };
+
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
 
-            // Assert
-            Assert.IsNotNull(receivedDiscoveryCompleteEventArgs.Metrics);
-            Assert.IsTrue(receivedDiscoveryCompleteEventArgs.Metrics.Any());
-            Assert.IsTrue(receivedDiscoveryCompleteEventArgs.Metrics.ContainsKey("DummyMessage"));
-        }
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(DiscovererEnumeratorTests).Assembly.Location],
+            () => { });
 
-        [TestMethod]
-        public void DiscoverTestsShouldCollectMetrics()
+        var sources = new List<string>
         {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
+            typeof(DiscoveryManagerTests).Assembly.Location
+        };
+
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        var criteria = new DiscoveryCriteria(sources, 1, null);
 
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+        // Act.
+        _discoveryManager.DiscoverTests(criteria, mockLogger.Object);
 
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(DiscovererEnumeratorTests).GetTypeInfo().Assembly.Location },
-                () => { });
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.DiscoveryState, It.IsAny<string>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsDiscovered, It.IsAny<object>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoveryInitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
+    {
+        var assemblyLocation = typeof(DiscoveryManagerTests).Assembly.Location;
+        var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+        TestPluginCacheHelper.SetupMockExtensions(
+            [assemblyLocation],
+            () => { });
 
-            var sources = new List<string>
-                              {
-                                  typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location
-                              };
+        //Act
+        _discoveryManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);
 
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
-            var criteria = new DiscoveryCriteria(sources, 1, null);
+        //when handler instance returns warning
+        _sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that the HandleLogMessage method getting invoked at least once");
 
-            // Act.
-            this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
+        // Verify.
+        mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that the HandleLogMessage method getting invoked at least once"), Times.Once);
+    }
 
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.DiscoveryState, It.IsAny<string>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsDiscovered, It.IsAny<object>()), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoveryTestsShouldSendAbortValuesCorrectlyIfAbortionHappened()
+    {
+        // Arrange
+        var sources = new List<string> { typeof(DiscoveryManagerTests).Assembly.Location };
 
-        [TestMethod]
-        public void DiscoveryInitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
-        {
-            var assemblyLocation = typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location;
-            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { assemblyLocation },
-                () => { });
+        var criteria = new DiscoveryCriteria(sources, 100, null);
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            //Act
-            this.discoveryManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);
+        DiscoveryCompleteEventArgs? receivedDiscoveryCompleteEventArgs = null;
 
-            //when handler instance returns warning
-            sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that the HandleLogMessage method getting invoked at least once");
+        mockHandler.Setup(ml => ml.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback((DiscoveryCompleteEventArgs complete, IEnumerable<TestCase> tests) => receivedDiscoveryCompleteEventArgs = complete);
 
-            // Verify.
-            mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that the HandleLogMessage method getting invoked at least once"), Times.Once);
-        }
+        // Act
+        _discoveryManager.DiscoverTests(criteria, mockHandler.Object);
+        _discoveryManager.Abort(mockHandler.Object);
 
-        #endregion
+        // Assert
+        Assert.AreEqual(true, receivedDiscoveryCompleteEventArgs!.IsAborted);
+        Assert.AreEqual(-1, receivedDiscoveryCompleteEventArgs.TotalCount);
     }
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryResultCacheTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryResultCacheTests.cs
index 06b907f708..c8e2a92c6d 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryResultCacheTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryResultCacheTests.cs
@@ -1,124 +1,122 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery;
+
+[TestClass]
+public class DiscoveryResultCacheTests
 {
-    using System;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using System.Collections;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    [TestClass]
-    public class DiscoveryResultCacheTests
+    [TestMethod]
+    public void DiscoveryResultCacheConstructorShouldInitializeDiscoveredTestsList()
+    {
+        var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+
+        Assert.IsNotNull(cache.Tests);
+        Assert.AreEqual(0, cache.Tests.Count);
+    }
+
+    [TestMethod]
+    public void DiscoveryResultCacheConstructorShouldInitializeTotalDiscoveredTests()
+    {
+        var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+
+        Assert.AreEqual(0, cache.TotalDiscoveredTests);
+    }
+
+    [TestMethod]
+    public void AddTestShouldAddATestCaseToTheList()
+    {
+        var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        cache.AddTest(testCase);
+
+        Assert.AreEqual(1, cache.Tests.Count);
+        Assert.AreEqual(testCase, cache.Tests[0]);
+    }
+
+    [TestMethod]
+    public void AddTestShouldIncreaseDiscoveredTestsCount()
+    {
+        var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        cache.AddTest(testCase);
+
+        Assert.AreEqual(1, cache.TotalDiscoveredTests);
+    }
+
+    [TestMethod]
+    public void AddTestShouldReportTestCasesIfMaxCacheSizeIsMet()
+    {
+        ICollection<TestCase>? reportedTestCases = null;
+        var cache = new DiscoveryResultCache(2, TimeSpan.FromHours(1), (tests) => reportedTestCases = tests);
+
+        var testCase1 = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        var testCase2 = new TestCase("A.C.M2", new Uri("executor://unittest"), "A");
+        cache.AddTest(testCase1);
+        cache.AddTest(testCase2);
+
+        Assert.IsNotNull(reportedTestCases);
+        Assert.AreEqual(2, reportedTestCases.Count);
+        CollectionAssert.AreEqual(new List<TestCase> { testCase1, testCase2 }, reportedTestCases.ToList());
+    }
+
+    [TestMethod]
+    public void AddTestShouldResetTestListOnceCacheSizeIsMet()
+    {
+        var cache = new DiscoveryResultCache(2, TimeSpan.FromHours(1), (tests) => { });
+
+        var testCase1 = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        var testCase2 = new TestCase("A.C.M2", new Uri("executor://unittest"), "A");
+        cache.AddTest(testCase1);
+        cache.AddTest(testCase2);
+
+        Assert.IsNotNull(cache.Tests);
+        Assert.AreEqual(0, cache.Tests.Count);
+
+        // Validate that total tests is no reset though.
+        Assert.AreEqual(2, cache.TotalDiscoveredTests);
+    }
+
+    [TestMethod]
+    public void AddTestShouldReportTestCasesIfCacheTimeoutIsMet()
+    {
+        ICollection<TestCase>? reportedTestCases = null;
+        var cache = new DiscoveryResultCache(100, TimeSpan.FromMilliseconds(10), (tests) => reportedTestCases = tests);
+
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        Task.Delay(20).Wait();
+        cache.AddTest(testCase);
+
+        Assert.IsNotNull(reportedTestCases);
+        Assert.AreEqual(1, reportedTestCases.Count);
+        Assert.AreEqual(testCase, reportedTestCases.ToArray()[0]);
+    }
+
+    [TestMethod]
+    public void AddTestShouldResetTestListIfCacheTimeoutIsMet()
     {
-        [TestMethod]
-        public void DiscoveryResultCacheConstructorShouldInitializeDiscoveredTestsList()
-        {
-            var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-
-            Assert.IsNotNull(cache.Tests);
-            Assert.AreEqual(0, cache.Tests.Count);
-        }
-
-        [TestMethod]
-        public void DiscoveryResultCacheConstructorShouldInitializeTotalDiscoveredTests()
-        {
-            var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-
-            Assert.AreEqual(0, cache.TotalDiscoveredTests);
-        }
-
-        [TestMethod]
-        public void AddTestShouldAddATestCaseToTheList()
-        {
-            var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            cache.AddTest(testCase);
-
-            Assert.AreEqual(1, cache.Tests.Count);
-            Assert.AreEqual(testCase, cache.Tests[0]);
-        }
-
-        [TestMethod]
-        public void AddTestShouldIncreaseDiscoveredTestsCount()
-        {
-            var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            cache.AddTest(testCase);
-
-            Assert.AreEqual(1, cache.TotalDiscoveredTests);
-        }
-
-        [TestMethod]
-        public void AddTestShouldReportTestCasesIfMaxCacheSizeIsMet()
-        {
-            ICollection<TestCase> reportedTestCases = null;
-            var cache = new DiscoveryResultCache(2, TimeSpan.FromHours(1), (tests) => { reportedTestCases = tests; });
-
-            var testCase1 = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            var testCase2 = new TestCase("A.C.M2", new Uri("executor://unittest"), "A");
-            cache.AddTest(testCase1);
-            cache.AddTest(testCase2);
-
-            Assert.IsNotNull(reportedTestCases);
-            Assert.AreEqual(2, reportedTestCases.Count);
-            CollectionAssert.AreEqual(new List<TestCase> { testCase1, testCase2 }, reportedTestCases.ToList());
-        }
-
-        [TestMethod]
-        public void AddTestShouldResetTestListOnceCacheSizeIsMet()
-        {
-            var cache = new DiscoveryResultCache(2, TimeSpan.FromHours(1), (tests) => { });
-
-            var testCase1 = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            var testCase2 = new TestCase("A.C.M2", new Uri("executor://unittest"), "A");
-            cache.AddTest(testCase1);
-            cache.AddTest(testCase2);
-
-            Assert.IsNotNull(cache.Tests);
-            Assert.AreEqual(0, cache.Tests.Count);
-
-            // Validate that total tests is no reset though.
-            Assert.AreEqual(2, cache.TotalDiscoveredTests);
-        }
-
-        [TestMethod]
-        public void AddTestShouldReportTestCasesIfCacheTimeoutIsMet()
-        {
-            ICollection<TestCase> reportedTestCases = null;
-            var cache = new DiscoveryResultCache(100, TimeSpan.FromMilliseconds(10), (tests) => { reportedTestCases = tests; });
-
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            Task.Delay(20).Wait();
-            cache.AddTest(testCase);
-
-            Assert.IsNotNull(reportedTestCases);
-            Assert.AreEqual(1, reportedTestCases.Count);
-            Assert.AreEqual(testCase, reportedTestCases.ToArray()[0]);
-        }
-
-        [TestMethod]
-        public void AddTestShouldResetTestListIfCacheTimeoutIsMet()
-        {
-            ICollection<TestCase> reportedTestCases = null;
-            var cache = new DiscoveryResultCache(100, TimeSpan.FromMilliseconds(10), (tests) => { reportedTestCases = tests; });
-
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
-            Task.Delay(20).Wait();
-            cache.AddTest(testCase);
-
-            Assert.IsNotNull(cache.Tests);
-            Assert.AreEqual(0, cache.Tests.Count);
-
-            // Validate that total tests is no reset though.
-            Assert.AreEqual(1, cache.TotalDiscoveredTests);
-        }
+        ICollection<TestCase>? reportedTestCases = null;
+        var cache = new DiscoveryResultCache(100, TimeSpan.FromMilliseconds(10), (tests) => reportedTestCases = tests);
+
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        Task.Delay(20).Wait();
+        cache.AddTest(testCase);
+
+        Assert.IsNotNull(cache.Tests);
+        Assert.AreEqual(0, cache.Tests.Count);
+
+        // Validate that total tests is no reset though.
+        Assert.AreEqual(1, cache.TotalDiscoveredTests);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/TestCaseDiscoverySinkTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/TestCaseDiscoverySinkTests.cs
index 417977fc22..aca9334005 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/TestCaseDiscoverySinkTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/TestCaseDiscoverySinkTests.cs
@@ -1,44 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Moq;
+namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery;
 
-    [TestClass]
-    public class TestCaseDiscoverySinkTests
+[TestClass]
+public class TestCaseDiscoverySinkTests
+{
+    [TestMethod]
+    public void SendTestCaseShouldNotThrowIfCacheIsNull()
     {
-        [TestMethod]
-        public void SendTestCaseShouldNotThrowIfCacheIsNull()
-        {
-            var sink = new TestCaseDiscoverySink(null);
+        var sink = new TestCaseDiscoverySink(null);
 
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
 
-            // This should not throw.
-            sink.SendTestCase(testCase);
-        }
+        // This should not throw.
+        sink.SendTestCase(testCase);
+    }
 
-        [TestMethod]
-        public void SendTestCaseShouldSendTestCasesToCache()
-        {
-            var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
-            var sink = new TestCaseDiscoverySink(cache);
+    [TestMethod]
+    public void SendTestCaseShouldSendTestCasesToCache()
+    {
+        var cache = new DiscoveryResultCache(1000, TimeSpan.FromHours(1), (tests) => { });
+        var sink = new TestCaseDiscoverySink(cache);
 
-            var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
+        var testCase = new TestCase("A.C.M", new Uri("executor://unittest"), "A");
 
-            sink.SendTestCase(testCase);
+        sink.SendTestCase(testCase);
 
-            // Assert that the cache has the test case.
-            Assert.IsNotNull(cache.Tests);
-            Assert.AreEqual(1, cache.Tests.Count);
-            Assert.AreEqual(testCase, cache.Tests[0]);
-        }
+        // Assert that the cache has the test case.
+        Assert.IsNotNull(cache.Tests);
+        Assert.AreEqual(1, cache.Tests.Count);
+        Assert.AreEqual(testCase, cache.Tests[0]);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
index a85aec8b51..f57cf09db5 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
@@ -2,542 +2,543 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Net.Sockets;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
+[TestClass]
+public class TestRequestHandlerTests
 {
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-
-    [TestClass]
-    public class TestRequestHandlerTests
-    {
-        private readonly Mock<ICommunicationEndPoint> mockCommunicationClient;
-        private readonly Mock<ICommunicationEndpointFactory> mockCommunicationEndpointFactory;
-        private readonly Mock<ICommunicationChannel> mockChannel;
-        private readonly Mock<ITestHostManagerFactory> mockTestHostManagerFactory;
-        private readonly Mock<IDiscoveryManager> mockDiscoveryManager;
-        private readonly Mock<IExecutionManager> mockExecutionManager;
-
-        private readonly JsonDataSerializer dataSerializer;
-        private ITestRequestHandler requestHandler;
-        private readonly TestHostConnectionInfo testHostConnectionInfo;
-        private readonly JobQueue<Action> jobQueue;
-
-        public TestRequestHandlerTests()
-        {
-            this.mockCommunicationClient = new Mock<ICommunicationEndPoint>();
-            this.mockCommunicationEndpointFactory = new Mock<ICommunicationEndpointFactory>();
-            this.mockChannel = new Mock<ICommunicationChannel>();
-            this.dataSerializer = JsonDataSerializer.Instance;
-            this.testHostConnectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":123",
-                Role = ConnectionRole.Client
-            };
-
-            this.jobQueue = new JobQueue<Action>(
-                action => { action(); },
-                "TestHostOperationQueue",
-                500,
-                25000000,
-                true,
-                message => EqtTrace.Error(message));
-
-            // Setup mock discovery and execution managers
-            this.mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
-            this.mockDiscoveryManager = new Mock<IDiscoveryManager>();
-            this.mockExecutionManager = new Mock<IExecutionManager>();
-            this.mockTestHostManagerFactory.Setup(mf => mf.GetDiscoveryManager()).Returns(this.mockDiscoveryManager.Object);
-            this.mockTestHostManagerFactory.Setup(mf => mf.GetExecutionManager()).Returns(this.mockExecutionManager.Object);
-            this.mockCommunicationEndpointFactory.Setup(f => f.Create(ConnectionRole.Client))
-                .Returns(this.mockCommunicationClient.Object);
-
-            this.requestHandler = new TestableTestRequestHandler(
-                this.testHostConnectionInfo,
-                this.mockCommunicationEndpointFactory.Object,
-                JsonDataSerializer.Instance,
-                jobQueue);
-            this.requestHandler.InitializeCommunication();
-            this.mockCommunicationClient.Raise(e => e.Connected += null, new ConnectedEventArgs(this.mockChannel.Object));
-        }
+    private readonly Mock<ICommunicationEndPoint> _mockCommunicationClient;
+    private readonly Mock<ICommunicationEndpointFactory> _mockCommunicationEndpointFactory;
+    private readonly Mock<ICommunicationChannel> _mockChannel;
+    private readonly Mock<ITestHostManagerFactory> _mockTestHostManagerFactory;
+    private readonly Mock<IDiscoveryManager> _mockDiscoveryManager;
+    private readonly Mock<IExecutionManager> _mockExecutionManager;
+
+    private readonly JsonDataSerializer _dataSerializer;
+    private ITestRequestHandler _requestHandler;
+    private readonly TestHostConnectionInfo _testHostConnectionInfo;
+    private readonly JobQueue<Action> _jobQueue;
+
+    public TestRequestHandlerTests()
+    {
+        _mockCommunicationClient = new Mock<ICommunicationEndPoint>();
+        _mockCommunicationEndpointFactory = new Mock<ICommunicationEndpointFactory>();
+        _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
+        _dataSerializer = JsonDataSerializer.Instance;
+        _testHostConnectionInfo = new TestHostConnectionInfo
+        {
+            Endpoint = IPAddress.Loopback + ":123",
+            Role = ConnectionRole.Client
+        };
+
+        _jobQueue = new JobQueue<Action>(
+            action => action?.Invoke(),
+            "TestHostOperationQueue",
+            500,
+            25000000,
+            true,
+            message => EqtTrace.Error(message));
+
+        // Setup mock discovery and execution managers
+        _mockTestHostManagerFactory = new Mock<ITestHostManagerFactory>();
+        _mockDiscoveryManager = new Mock<IDiscoveryManager>();
+        _mockExecutionManager = new Mock<IExecutionManager>();
+        _mockTestHostManagerFactory.Setup(mf => mf.GetDiscoveryManager()).Returns(_mockDiscoveryManager.Object);
+        _mockTestHostManagerFactory.Setup(mf => mf.GetExecutionManager()).Returns(_mockExecutionManager.Object);
+        _mockCommunicationEndpointFactory.Setup(f => f.Create(ConnectionRole.Client))
+            .Returns(_mockCommunicationClient.Object);
+
+        _requestHandler = new TestableTestRequestHandler(
+            _testHostConnectionInfo,
+            _mockCommunicationEndpointFactory.Object,
+            JsonDataSerializer.Instance,
+            _jobQueue);
+        _requestHandler.InitializeCommunication();
+
+        _mockCommunicationClient.Raise(e => e.Connected += null, new ConnectedEventArgs(_mockChannel.Object));
+    }
 
-        [TestMethod]
-        public void InitializeCommunicationShouldConnectToServerAsynchronously()
-        {
-            this.mockCommunicationClient.Verify(c => c.Start(this.testHostConnectionInfo.Endpoint), Times.Once);
-        }
+    [TestMethod]
+    public void InitializeCommunicationShouldConnectToServerAsynchronously()
+    {
+        _mockCommunicationClient.Verify(c => c.Start(_testHostConnectionInfo.Endpoint), Times.Once);
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeCommunicationShouldThrowIfServerIsNotAccessible()
-        {
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = IPAddress.Loopback + ":123",
-                Role = ConnectionRole.Client
-            };
-            var socketClient = new SocketClient();
-            socketClient.Connected += (sender, connectedEventArgs) =>
-            {
-                Assert.IsFalse(connectedEventArgs.Connected);
-                Assert.AreEqual(typeof(SocketException), connectedEventArgs.Fault.InnerException.GetType());
-            };
-            this.mockCommunicationEndpointFactory.Setup(f => f.Create(ConnectionRole.Client))
-                .Returns(socketClient);
-            var rh = new TestableTestRequestHandler(connectionInfo, this.mockCommunicationEndpointFactory.Object, this.dataSerializer, this.jobQueue);
-
-            rh.InitializeCommunication();
-            this.requestHandler.WaitForRequestSenderConnection(1000);
-        }
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void InitializeCommunicationShouldThrowIfServerIsNotAccessible()
+    {
+        var connectionInfo = new TestHostConnectionInfo
+        {
+            Endpoint = IPAddress.Loopback + ":123",
+            Role = ConnectionRole.Client
+        };
+        var socketClient = new SocketClient();
+        socketClient.Connected += (sender, connectedEventArgs) =>
+        {
+            Assert.IsFalse(connectedEventArgs.Connected);
+            Assert.AreEqual(typeof(SocketException), connectedEventArgs.Fault!.InnerException!.GetType());
+        };
+        _mockCommunicationEndpointFactory.Setup(f => f.Create(ConnectionRole.Client))
+            .Returns(socketClient);
+        var rh = new TestableTestRequestHandler(connectionInfo, _mockCommunicationEndpointFactory.Object, _dataSerializer, _jobQueue);
+
+        rh.InitializeCommunication();
+        _requestHandler.WaitForRequestSenderConnection(1000);
+    }
 
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldWaitUntilConnectionIsSetup()
-        {
-            Assert.IsTrue(this.requestHandler.WaitForRequestSenderConnection(1000));
-        }
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldWaitUntilConnectionIsSetup()
+    {
+        Assert.IsTrue(_requestHandler.WaitForRequestSenderConnection(1000));
+    }
 
-        [TestMethod]
-        public void WaitForRequestSenderConnectionShouldReturnFalseIfConnectionSetupTimesout()
-        {
-            this.requestHandler = new TestableTestRequestHandler(
-                this.testHostConnectionInfo,
-                this.mockCommunicationEndpointFactory.Object,
-                JsonDataSerializer.Instance,
-                jobQueue);
-            this.requestHandler.InitializeCommunication();
-
-            Assert.IsFalse(this.requestHandler.WaitForRequestSenderConnection(1));
-        }
+    [TestMethod]
+    public void WaitForRequestSenderConnectionShouldReturnFalseIfConnectionSetupTimesout()
+    {
+        _requestHandler = new TestableTestRequestHandler(
+            _testHostConnectionInfo,
+            _mockCommunicationEndpointFactory.Object,
+            JsonDataSerializer.Instance,
+            _jobQueue);
+        _requestHandler.InitializeCommunication();
+
+        Assert.IsFalse(_requestHandler.WaitForRequestSenderConnection(1));
+    }
 
-        [TestMethod]
-        public void ProcessRequestsShouldProcessMessagesUntilSessionCompleted()
-        {
-            var task = this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+    [TestMethod]
+    public void ProcessRequestsShouldProcessMessagesUntilSessionCompleted()
+    {
+        var task = ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-            this.SendSessionEnd();
-            Assert.IsTrue(task.Wait(2000));
-        }
+        SendSessionEnd();
+        Assert.IsTrue(task.Wait(2000));
+    }
 
-        #region Version Check Protocol
+    #region Version Check Protocol
 
-        [TestMethod]
-        public void ProcessRequestsVersionCheckShouldAckMinimumOfGivenAndHighestSupportedVersion()
-        {
-            var message = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+    [TestMethod]
+    public void ProcessRequestsVersionCheckShouldAckMinimumOfGivenAndHighestSupportedVersion()
+    {
+        var message = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-            this.SendMessageOnChannel(message);
+        SendMessageOnChannel(message);
 
-            this.VerifyResponseMessageEquals(this.Serialize(message));
-            this.SendSessionEnd();
-        }
+        VerifyResponseMessageEquals(Serialize(message));
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void ProcessRequestsVersionCheckShouldLogErrorIfDiagnosticsEnableFails()
+    [TestMethod]
+    public void ProcessRequestsVersionCheckShouldLogErrorIfDiagnosticsEnableFails()
+    {
+        if (!string.IsNullOrEmpty(EqtTrace.LogFile))
         {
-            if (!string.IsNullOrEmpty(EqtTrace.LogFile))
-            {
-                // This test is no-op if diagnostics session is enabled
-                return;
-            }
-            EqtTrace.ErrorOnInitialization = "non-existent-error";
-            var message = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-
-            this.SendMessageOnChannel(message);
-
-            this.VerifyResponseMessageContains(EqtTrace.ErrorOnInitialization);
-            this.SendSessionEnd();
+            // This test is no-op if diagnostics session is enabled
+            return;
         }
+        EqtTrace.ErrorOnInitialization = "non-existent-error";
+        var message = new Message { MessageType = MessageType.VersionCheck, Payload = 1 };
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-        #endregion
+        SendMessageOnChannel(message);
 
-        #region Discovery Protocol
+        VerifyResponseMessageContains(EqtTrace.ErrorOnInitialization);
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void ProcessRequestsDiscoveryInitializeShouldSetExtensionPaths()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.DiscoveryInitialize, new[] { "testadapter.dll" });
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+    #endregion
 
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
+    #region Discovery Protocol
 
-            this.mockDiscoveryManager.Verify(d => d.Initialize(It.Is<IEnumerable<string>>(paths => paths.Any(p => p.Equals("testadapter.dll"))), It.IsAny<ITestDiscoveryEventsHandler2>()));
-            this.SendSessionEnd();
-        }
+    [TestMethod]
+    public void ProcessRequestsDiscoveryInitializeShouldSetExtensionPaths()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.DiscoveryInitialize, new[] { "testadapter.dll" });
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-        [TestMethod]
-        public void ProcessRequestsDiscoveryStartShouldStartDiscoveryWithGivenCriteria()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.StartDiscovery, new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty));
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
 
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
+        _mockDiscoveryManager.Verify(d => d.Initialize(It.Is<IEnumerable<string>>(paths => paths.Any(p => p.Equals("testadapter.dll"))), It.IsAny<ITestDiscoveryEventsHandler2>()));
+        SendSessionEnd();
+    }
 
-            this.mockDiscoveryManager.Verify(d => d.DiscoverTests(It.Is<DiscoveryCriteria>(dc => dc.Sources.Contains("test.dll")), It.IsAny<ITestDiscoveryEventsHandler2>()));
-            this.SendSessionEnd();
-        }
+    [TestMethod]
+    public void ProcessRequestsDiscoveryStartShouldStartDiscoveryWithGivenCriteria()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.StartDiscovery, new DiscoveryCriteria(new[] { "test.dll" }, 1, string.Empty));
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-        [TestMethod]
-        public void DiscoveryCompleteShouldSendDiscoveryCompletePayloadOnChannel()
-        {
-            var discoveryComplete = new DiscoveryCompletePayload { TotalTests = 1, LastDiscoveredTests = Enumerable.Empty<TestCase>(), IsAborted = false };
-            var message = this.dataSerializer.SerializePayload(MessageType.DiscoveryComplete, discoveryComplete);
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+        _mockDiscoveryManager.Verify(d => d.DiscoverTests(It.Is<DiscoveryCriteria>(dc => dc.Sources.Contains("test.dll")), It.IsAny<ITestDiscoveryEventsHandler2>()));
+        SendSessionEnd();
+    }
 
-            this.requestHandler.DiscoveryComplete(new DiscoveryCompleteEventArgs(discoveryComplete.TotalTests, discoveryComplete.IsAborted), discoveryComplete.LastDiscoveredTests);
+    [TestMethod]
+    public void DiscoveryCompleteShouldSendDiscoveryCompletePayloadOnChannel()
+    {
+        var discoveryComplete = new DiscoveryCompletePayload { TotalTests = 1, LastDiscoveredTests = [], IsAborted = false };
+        var message = _dataSerializer.SerializePayload(MessageType.DiscoveryComplete, discoveryComplete);
 
-            this.VerifyResponseMessageEquals(message);
-            this.SendSessionEnd();
-        }
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-        #endregion
+        _requestHandler.DiscoveryComplete(new DiscoveryCompleteEventArgs(discoveryComplete.TotalTests, discoveryComplete.IsAborted), discoveryComplete.LastDiscoveredTests);
 
-        #region Execution Protocol
+        VerifyResponseMessageEquals(message);
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void ProcessRequestsExecutionInitializeShouldSetExtensionPaths()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.ExecutionInitialize, new[] { "testadapter.dll" });
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
+    #endregion
 
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
+    #region Execution Protocol
 
-            this.mockExecutionManager.Verify(e => e.Initialize(It.Is<IEnumerable<string>>(paths => paths.Any(p => p.Equals("testadapter.dll"))), It.IsAny<ITestMessageEventHandler>()));
-            this.SendSessionEnd();
-        }
+    [TestMethod]
+    public void ProcessRequestsExecutionInitializeShouldSetExtensionPaths()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.ExecutionInitialize, new[] { "testadapter.dll" });
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-        [TestMethod]
-        public void ProcessRequestsExecutionStartShouldStartExecutionWithGivenSources()
-        {
-            var asm = new Dictionary<string, IEnumerable<string>>();
-            asm["mstestv2"] = new[] {"test1.dll", "test2.dll"};
-            var testRunCriteriaWithSources = new TestRunCriteriaWithSources(asm, "runsettings", null, null);
-            var message = this.dataSerializer.SerializePayload(MessageType.StartTestExecutionWithSources, testRunCriteriaWithSources);
-
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
-
-            mockExecutionManager.Verify(e =>
-                e.StartTestRun(
-                    It.Is<Dictionary<string, IEnumerable<string>>>(d => d.ContainsKey("mstestv2")), It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
-                    It.IsAny<ITestRunEventsHandler>()));
-            this.SendSessionEnd();
-        }
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
 
-        [TestMethod]
-        public void ProcessRequestsExecutionStartShouldStartExecutionWithGivenTests()
-        {
-            var t1 = new TestCase("N.C.M1", new Uri("executor://mstest/v2"), "test1.dll");
-            var t2 = new TestCase("N.C.M2", new Uri("executor://mstest/v2"), "test1.dll");
-            var testCases = new [] { t1, t2 };
-            var testRunCriteriaWithTests = new TestRunCriteriaWithTests(testCases, "runsettings", null, null);
-            var message = this.dataSerializer.SerializePayload(MessageType.StartTestExecutionWithTests, testRunCriteriaWithTests);
-
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
-
-            mockExecutionManager.Verify(e =>
-                e.StartTestRun(
-                    It.Is<IEnumerable<TestCase>>(tcs =>
-                        tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M1")) &&
-                        tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M2"))), It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
-                    It.IsAny<ITestRunEventsHandler>()));
-            this.SendSessionEnd();
-        }
+        _mockExecutionManager.Verify(e => e.Initialize(It.Is<IEnumerable<string>>(paths => paths.Any(p => p.Equals("testadapter.dll"))), It.IsAny<ITestMessageEventHandler>()));
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void ProcessRequestsExecutionCancelShouldCancelTestRun()
+    [TestMethod]
+    public void ProcessRequestsExecutionStartShouldStartExecutionWithGivenSources()
+    {
+        var asm = new Dictionary<string, IEnumerable<string>>
         {
-            var message = this.dataSerializer.SerializePayload(MessageType.CancelTestRun, string.Empty);
+            ["mstestv2"] = new[] { "test1.dll", "test2.dll" }
+        };
+        var testRunCriteriaWithSources = new TestRunCriteriaWithSources(asm, "runsettings", null, null!);
+        var message = _dataSerializer.SerializePayload(MessageType.StartTestExecutionWithSources, testRunCriteriaWithSources);
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
 
-            mockExecutionManager.Verify(e => e.Cancel(It.IsAny<ITestRunEventsHandler>()));
-            this.SendSessionEnd();
-        }
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
 
-        [TestMethod]
-        public void ProcessRequestsExecutionLaunchAdapterProcessWithDebuggerShouldSendAckMessage()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, string.Empty);
+        _mockExecutionManager.Verify(e =>
+            e.StartTestRun(
+                It.Is<Dictionary<string, IEnumerable<string>>>(d => d.ContainsKey("mstestv2")), It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
+                It.IsAny<IInternalTestRunEventsHandler>()));
+        SendSessionEnd();
+    }
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
+    [TestMethod]
+    public void ProcessRequestsExecutionStartShouldStartExecutionWithGivenTests()
+    {
+        var t1 = new TestCase("N.C.M1", new Uri("executor://mstest/v2"), "test1.dll");
+        var t2 = new TestCase("N.C.M2", new Uri("executor://mstest/v2"), "test1.dll");
+        var testCases = new[] { t1, t2 };
+        var testRunCriteriaWithTests = new TestRunCriteriaWithTests(testCases, "runsettings", null, null!);
+        var message = _dataSerializer.SerializePayload(MessageType.StartTestExecutionWithTests, testRunCriteriaWithTests);
+
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
+
+        _mockExecutionManager.Verify(e =>
+            e.StartTestRun(
+                It.Is<IEnumerable<TestCase>>(tcs =>
+                    tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M1")) &&
+                    tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M2"))), It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
+                It.IsAny<IInternalTestRunEventsHandler>()));
+        SendSessionEnd();
+    }
 
-            this.SendSessionEnd();
-        }
+    [TestMethod]
+    public void ProcessRequestsExecutionCancelShouldCancelTestRun()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.CancelTestRun, string.Empty);
 
-        [TestMethod]
-        public void ProcessRequestsExecutionAbortShouldStopTestRun()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.AbortTestRun, string.Empty);
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
+        _mockExecutionManager.Verify(e => e.Cancel(It.IsAny<IInternalTestRunEventsHandler>()));
+        SendSessionEnd();
+    }
 
-            mockExecutionManager.Verify(e => e.Abort(It.IsAny<ITestRunEventsHandler>()));
-            this.SendSessionEnd();
-        }
+    [TestMethod]
+    public void ProcessRequestsExecutionLaunchAdapterProcessWithDebuggerShouldSendAckMessage()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, string.Empty);
 
-        [TestMethod]
-        public void SendExecutionCompleteShouldSendTestRunCompletePayloadOnChannel()
-        {
-            var t1 = new TestCase("N.C.M1", new Uri("executor://mstest/v2"), "test1.dll");
-            var t2 = new TestCase("N.C.M2", new Uri("executor://mstest/v2"), "test1.dll");
-            var testCases = new[] { t1, t2 };
-            var testRunCriteriaWithTests = new TestRunCriteriaWithTests(testCases, "runsettings", null, null);
-            var message = this.dataSerializer.SerializePayload(MessageType.StartTestExecutionWithTests, testRunCriteriaWithTests);
-            this.mockExecutionManager.Setup(em => em.StartTestRun(It.IsAny<IEnumerable<TestCase>>(), It.IsAny<string>(),
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
+
+        SendSessionEnd();
+    }
+
+    [TestMethod]
+    public void ProcessRequestsExecutionAbortShouldStopTestRun()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.AbortTestRun, string.Empty);
+
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
+
+        _mockExecutionManager.Verify(e => e.Abort(It.IsAny<IInternalTestRunEventsHandler>()));
+        SendSessionEnd();
+    }
+
+    [TestMethod]
+    public void SendExecutionCompleteShouldSendTestRunCompletePayloadOnChannel()
+    {
+        var t1 = new TestCase("N.C.M1", new Uri("executor://mstest/v2"), "test1.dll");
+        var t2 = new TestCase("N.C.M2", new Uri("executor://mstest/v2"), "test1.dll");
+        var testCases = new[] { t1, t2 };
+        var testRunCriteriaWithTests = new TestRunCriteriaWithTests(testCases, "runsettings", null, null!);
+        var message = _dataSerializer.SerializePayload(MessageType.StartTestExecutionWithTests, testRunCriteriaWithTests);
+        _mockExecutionManager.Setup(em => em.StartTestRun(It.IsAny<IEnumerable<TestCase>>(), It.IsAny<string>(),
+            It.IsAny<string>(),
+            It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
+            It.IsAny<IInternalTestRunEventsHandler>())).Callback(() => _requestHandler.SendExecutionComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<string>>()));
+
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        _mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.ExecutionComplete))))
+            .Callback<string>(
+                (d) =>
+                {
+                    var msg = _dataSerializer.DeserializeMessage(d);
+                    var payload = _dataSerializer.DeserializePayload<TestRunCompletePayload>(msg);
+                    Assert.IsNotNull(payload);
+                });
+        SendMessageOnChannel(message);
+        _jobQueue.Flush();
+
+        _mockExecutionManager.Verify(e =>
+            e.StartTestRun(
+                It.Is<IEnumerable<TestCase>>(tcs =>
+                    tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M1")) &&
+                    tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M2"))), It.IsAny<string>(),
                 It.IsAny<string>(),
                 It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
-                It.IsAny<ITestRunEventsHandler>())).Callback(() =>
-            {
-                this.requestHandler.SendExecutionComplete(It.IsAny<TestRunCompleteEventArgs>(), It.IsAny<TestRunChangedEventArgs>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<string>>());
-            });
-
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.ExecutionComplete))))
-                .Callback<string>(
-                    (d) =>
-                    {
-                        var msg = this.dataSerializer.DeserializeMessage(d);
-                        var payload = this.dataSerializer.DeserializePayload<TestRunCompletePayload>(msg);
-                        Assert.IsNotNull(payload);
-                    });
-            this.SendMessageOnChannel(message);
-            this.jobQueue.Flush();
-
-            mockExecutionManager.Verify(e =>
-                e.StartTestRun(
-                    It.Is<IEnumerable<TestCase>>(tcs =>
-                        tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M1")) &&
-                        tcs.Any(t => t.FullyQualifiedName.Equals("N.C.M2"))), It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<TestExecutionContext>(), It.IsAny<ITestCaseEventsHandler>(),
-                    It.IsAny<ITestRunEventsHandler>()));
-            this.SendSessionEnd();
-        }
+                It.IsAny<IInternalTestRunEventsHandler>()));
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldSendProcessInformationOnChannel()
-        {
-            var message = this.dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, "123");
-
-            this.mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.LaunchAdapterProcessWithDebuggerAttached))))
-                .Callback<string>(
-                    (d) =>
-                    {
-                        var msg = this.dataSerializer.DeserializeMessage(d);
-                        var payload = this.dataSerializer.DeserializePayload<TestProcessStartInfo>(msg);
-                        Assert.IsNotNull(payload);
-                        this.SendMessageOnChannel(message);
-                        this.SendSessionEnd();
-                    });
-
-            var task = Task.Run(() => this.requestHandler.LaunchProcessWithDebuggerAttached(new TestProcessStartInfo()));
-        }
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldSendProcessInformationOnChannel()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, "123");
+
+        _mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.LaunchAdapterProcessWithDebuggerAttached))))
+            .Callback<string>(
+                (d) =>
+                {
+                    var msg = _dataSerializer.DeserializeMessage(d);
+                    var payload = _dataSerializer.DeserializePayload<TestProcessStartInfo>(msg);
+                    Assert.IsNotNull(payload);
+                    SendMessageOnChannel(message);
+                    SendSessionEnd();
+                });
+
+        var task = Task.Run(() => _requestHandler.LaunchProcessWithDebuggerAttached(new TestProcessStartInfo()));
+    }
 
-        [TestMethod]
-        public void LaunchProcessWithDebuggerAttachedShouldWaitForProcessIdFromRunner()
-        {
-            var message = dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, "123");
-
-            this.mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.LaunchAdapterProcessWithDebuggerAttached))))
-                .Callback<string>(
-                    (d) =>
-                    {
-                        var msg = this.dataSerializer.DeserializeMessage(d);
-                        var payload = this.dataSerializer.DeserializePayload<TestProcessStartInfo>(msg);
-                        Assert.IsNotNull(payload);
-                        this.SendMessageOnChannel(message);
-                        this.SendSessionEnd();
-                    });
-
-            var task = Task.Run(() => this.requestHandler.LaunchProcessWithDebuggerAttached(new TestProcessStartInfo()));
-
-            Assert.AreEqual(123, task.Result);
-        }
-        #endregion
+    [TestMethod]
+    public void LaunchProcessWithDebuggerAttachedShouldWaitForProcessIdFromRunner()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback, "123");
+
+        _mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.LaunchAdapterProcessWithDebuggerAttached))))
+            .Callback<string>(
+                (d) =>
+                {
+                    var msg = _dataSerializer.DeserializeMessage(d);
+                    var payload = _dataSerializer.DeserializePayload<TestProcessStartInfo>(msg);
+                    Assert.IsNotNull(payload);
+                    SendMessageOnChannel(message);
+                    SendSessionEnd();
+                });
+
+        var task = Task.Run(() => _requestHandler.LaunchProcessWithDebuggerAttached(new TestProcessStartInfo()));
+
+        Assert.AreEqual(123, task.Result);
+    }
+    #endregion
 
-        #region Logging Protocol
-        [TestMethod]
-        public void SendLogShouldSendTestMessageWithLevelOnChannel()
-        {
-            var logMsg = "Testing log message on channel";
+    #region Logging Protocol
+    [TestMethod]
+    public void SendLogShouldSendTestMessageWithLevelOnChannel()
+    {
+        var logMsg = "Testing log message on channel";
 
-            this.mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.TestMessage))))
-                .Callback<string>(
-                    (d) =>
-                    {
-                        var msg = this.dataSerializer.DeserializeMessage(d);
-                        var payload = this.dataSerializer.DeserializePayload<TestMessagePayload>(msg);
-                        Assert.IsNotNull(payload);
-                        Assert.AreEqual(payload.Message, logMsg);
-                    });
+        _mockChannel.Setup(mc => mc.Send(It.Is<string>(d => d.Contains(MessageType.TestMessage))))
+            .Callback<string>(
+                (d) =>
+                {
+                    var msg = _dataSerializer.DeserializeMessage(d);
+                    var payload = _dataSerializer.DeserializePayload<TestMessagePayload>(msg);
+                    Assert.IsNotNull(payload);
+                    Assert.AreEqual(payload.Message, logMsg);
+                });
 
-            this.requestHandler.SendLog(TestMessageLevel.Informational, "Testing log message on channel");
+        _requestHandler.SendLog(TestMessageLevel.Informational, "Testing log message on channel");
 
-            this.SendSessionEnd();
-        }
-        #endregion
+        SendSessionEnd();
+    }
+    #endregion
 
-        [TestMethod]
-        public void ProcessRequestsEndSessionShouldCloseRequestHandler()
-        {
+    [TestMethod]
+    public void ProcessRequestsEndSessionShouldCloseRequestHandler()
+    {
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendSessionEnd();
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendSessionEnd();
 
-            this.mockCommunicationClient.Verify(mc=>mc.Stop(), Times.Once);
-        }
+        _mockCommunicationClient.Verify(mc => mc.Stop(), Times.Once);
+    }
 
-        [TestMethod]
-        public void ProcessRequestsAbortSessionShouldBeNoOp()
-        {
-            var message = dataSerializer.SerializePayload(MessageType.SessionAbort, string.Empty);
+    [TestMethod]
+    public void ProcessRequestsAbortSessionShouldBeNoOp()
+    {
+        var message = _dataSerializer.SerializePayload(MessageType.SessionAbort, string.Empty);
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
 
-            // Session abort should not close the client
-            this.mockCommunicationClient.Verify(mc => mc.Stop(), Times.Never);
-        }
+        // Session abort should not close the client
+        _mockCommunicationClient.Verify(mc => mc.Stop(), Times.Never);
+    }
 
-        [TestMethod]
-        public void ProcessRequestsInvalidMessageTypeShouldNotThrow()
-        {
-            var message = dataSerializer.SerializePayload("DummyMessage", string.Empty);
+    [TestMethod]
+    public void ProcessRequestsInvalidMessageTypeShouldNotThrow()
+    {
+        var message = _dataSerializer.SerializePayload("DummyMessage", string.Empty);
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
 
-            this.SendSessionEnd();
-        }
+        SendSessionEnd();
+    }
 
-        [TestMethod]
-        public void ProcessRequestsInvalidMessageTypeShouldProcessFutureMessages()
-        {
-            var message = dataSerializer.SerializePayload("DummyMessage", string.Empty);
+    [TestMethod]
+    public void ProcessRequestsInvalidMessageTypeShouldProcessFutureMessages()
+    {
+        var message = _dataSerializer.SerializePayload("DummyMessage", string.Empty);
 
-            this.ProcessRequestsAsync(this.mockTestHostManagerFactory.Object);
-            this.SendMessageOnChannel(message);
+        ProcessRequestsAsync(_mockTestHostManagerFactory.Object);
+        SendMessageOnChannel(message);
 
-            // Should process this message, after the invalid message
-            this.SendSessionEnd();
-            this.mockCommunicationClient.Verify(mc => mc.Stop(), Times.Once);
-        }
+        // Should process this message, after the invalid message
+        SendSessionEnd();
+        _mockCommunicationClient.Verify(mc => mc.Stop(), Times.Once);
+    }
 
-        [TestMethod]
-        public void DisposeShouldStopCommunicationChannel()
-        {
-            var testRequestHandler = this.requestHandler as TestRequestHandler;
-            Assert.IsNotNull(testRequestHandler);
+    [TestMethod]
+    public void DisposeShouldStopCommunicationChannel()
+    {
+        var testRequestHandler = _requestHandler as TestRequestHandler;
+        Assert.IsNotNull(testRequestHandler);
 
-            testRequestHandler.Dispose();
+        testRequestHandler.Dispose();
 
-            this.mockCommunicationClient.Verify(mc => mc.Stop(), Times.Once);
-        }
+        _mockCommunicationClient.Verify(mc => mc.Stop(), Times.Once);
+    }
 
-        private void SendMessageOnChannel(Message message)
-        {
-            // Setup message to be returned on deserialization of data
-            var data = this.Serialize(message);
-            this.SendMessageOnChannel(data);
-        }
+    private void SendMessageOnChannel(Message message)
+    {
+        // Setup message to be returned on deserialization of data
+        var data = Serialize(message);
+        SendMessageOnChannel(data);
+    }
 
-        private void SendMessageOnChannel(string data)
-        {
-            this.mockChannel.Raise(c => c.MessageReceived += null, new MessageReceivedEventArgs { Data = data });
-        }
+    private void SendMessageOnChannel(string data)
+    {
+        _mockChannel.Object.MessageReceived.Notify(
+            _mockChannel.Object,
+            new MessageReceivedEventArgs { Data = data },
+            "TestRequestHandlerTests.SendMessageOnChannel()");
+    }
 
-        private void SendSessionEnd()
-        {
-            this.SendMessageOnChannel(new Message { MessageType = MessageType.SessionEnd, Payload = string.Empty });
-        }
+    private void SendSessionEnd()
+    {
+        SendMessageOnChannel(new Message { MessageType = MessageType.SessionEnd, Payload = string.Empty });
+    }
 
-        private Task ProcessRequestsAsync()
-        {
-            return Task.Run(() => this.requestHandler.ProcessRequests(new Mock<ITestHostManagerFactory>().Object));
-        }
+    private Task ProcessRequestsAsync()
+    {
+        return Task.Run(() => _requestHandler.ProcessRequests(new Mock<ITestHostManagerFactory>().Object));
+    }
 
-        private Task ProcessRequestsAsync(ITestHostManagerFactory testHostManagerFactory)
-        {
-            return Task.Run(() => this.requestHandler.ProcessRequests(testHostManagerFactory));
-        }
+    private Task ProcessRequestsAsync(ITestHostManagerFactory testHostManagerFactory)
+    {
+        return Task.Run(() => _requestHandler.ProcessRequests(testHostManagerFactory));
+    }
 
-        private string Serialize(Message message)
-        {
-            return this.dataSerializer.SerializePayload(message.MessageType, message.Payload);
-        }
+    private string Serialize(Message message)
+    {
+        return _dataSerializer.SerializePayload(message.MessageType, message.Payload);
+    }
 
-        private void VerifyResponseMessageEquals(string message)
-        {
-            this.mockChannel.Verify(mc => mc.Send(It.Is<string>(s => s.Equals(message))));
-        }
+    private void VerifyResponseMessageEquals(string message)
+    {
+        _mockChannel.Verify(mc => mc.Send(It.Is<string>(s => s.Equals(message))));
+    }
 
-        private void VerifyResponseMessageContains(string message)
-        {
-            this.mockChannel.Verify(mc => mc.Send(It.Is<string>(s => s.Contains(message))));
-        }
+    private void VerifyResponseMessageContains(string message)
+    {
+        _mockChannel.Verify(mc => mc.Send(It.Is<string>(s => s.Contains(message))));
     }
+}
 
-    public class TestableTestRequestHandler : TestRequestHandler
-    {
-        public TestableTestRequestHandler(
-            TestHostConnectionInfo testHostConnectionInfo,
-            ICommunicationEndpointFactory communicationEndpointFactory,
-            IDataSerializer dataSerializer,
-            JobQueue<Action> jobQueue)
-            : base(
-                  testHostConnectionInfo,
-                  communicationEndpointFactory,
-                  dataSerializer,
-                  jobQueue,
-                  OnLaunchAdapterProcessWithDebuggerAttachedAckReceived,
-                  OnAttachDebuggerAckRecieved)
-        {
-        }
+public class TestableTestRequestHandler : TestRequestHandler
+{
+    public TestableTestRequestHandler(
+        TestHostConnectionInfo testHostConnectionInfo,
+        ICommunicationEndpointFactory communicationEndpointFactory,
+        IDataSerializer dataSerializer,
+        JobQueue<Action> jobQueue)
+        : base(
+            testHostConnectionInfo,
+            communicationEndpointFactory,
+            dataSerializer,
+            jobQueue,
+            OnLaunchAdapterProcessWithDebuggerAttachedAckReceived,
+            OnAttachDebuggerAckRecieved)
+    {
+    }
 
-        private static void OnLaunchAdapterProcessWithDebuggerAttachedAckReceived(Message message)
-        {
-            Assert.AreEqual(message.MessageType, MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback);
-        }
+    private static void OnLaunchAdapterProcessWithDebuggerAttachedAckReceived(Message message)
+    {
+        Assert.AreEqual(message.MessageType, MessageType.LaunchAdapterProcessWithDebuggerAttachedCallback);
+    }
 
-        private static void OnAttachDebuggerAckRecieved(Message message)
-        {
-            Assert.AreEqual(message.MessageType, MessageType.AttachDebuggerCallback);
-        }
+    private static void OnAttachDebuggerAckRecieved(Message message)
+    {
+        Assert.AreEqual(message.MessageType, MessageType.AttachDebuggerCallback);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs
index c93cdf16e3..4f7194fd83 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs
@@ -1,1093 +1,1052 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using OMTestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Execution;
+
+[TestClass]
+public class BaseRunTestsTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using OMTestResult =  Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    using Moq;
-    using Microsoft.TestPlatform.TestUtilities;
-
-    [TestClass]
-    public class BaseRunTestsTests
+    private const string BaseRunTestsExecutorUri = "executor://BaseRunTestsExecutor/";
+    private const string BadBaseRunTestsExecutorUri = "executor://BadBaseRunTestsExecutor/";
+
+    private readonly TestExecutionContext _testExecutionContext;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockTestRunEventsHandler;
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IDataSerializer> _mockDataSerializer;
+
+    private Mock<IThread> _mockThread;
+    private TestableBaseRunTests _runTestsInstance;
+    private TestRunChangedEventArgs? _receivedRunStatusArgs;
+    private TestRunCompleteEventArgs? _receivedRunCompleteArgs;
+    private ICollection<AttachmentSet>? _receivedattachments;
+    private ICollection<string>? _receivedExecutorUris;
+    private TestCase? _inProgressTestCase;
+
+    public BaseRunTestsTests()
     {
-        private const string BaseRunTestsExecutorUri = "executor://BaseRunTestsExecutor/";
-        private const string BadBaseRunTestsExecutorUri = "executor://BadBaseRunTestsExecutor/";
-
-        private TestExecutionContext testExecutionContext;
-        private Mock<ITestRunEventsHandler> mockTestRunEventsHandler;
-
-        private TestableBaseRunTests runTestsInstance;
-
-        private Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private Mock<IThread> mockThread;
-
-        private Mock<IRequestData> mockRequestData;
-
-        private Mock<IMetricsCollection> mockMetricsCollection;
-
-        private Mock<IDataSerializer> mockDataSerializer;
-
-        private TestRunChangedEventArgs receivedRunStatusArgs;
-        private TestRunCompleteEventArgs receivedRunCompleteArgs;
-        private ICollection<AttachmentSet> receivedattachments;
-        private ICollection<string> receivedExecutorUris;
-        private TestCase inProgressTestCase;
-
-        public BaseRunTestsTests()
-        {
-            this.testExecutionContext = new TestExecutionContext(
-                          frequencyOfRunStatsChangeEvent: 100,
-                          runStatsChangeEventTimeout: TimeSpan.MaxValue,
-                          inIsolation: false,
-                          keepAlive: false,
-                          isDataCollectionEnabled: false,
-                          areTestCaseLevelEventsRequired: false,
-                          hasTestRun: false,
-                          isDebug: false,
-                          testCaseFilter: string.Empty,
-                          filterOptions: null);
-            this.mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockThread = new Mock<IThread>();
-            this.mockDataSerializer = new Mock<IDataSerializer>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-
-            this.runTestsInstance = new TestableBaseRunTests(
-                this.mockRequestData.Object,
-                null,
-                null,
-                this.testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockTestPlatformEventSource.Object,
-                null,
-                new PlatformThread(),
-                this.mockDataSerializer.Object);
-
-            TestPluginCacheHelper.SetupMockExtensions(new string[] { typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location }, () => { });
-        }
+        _testExecutionContext = new TestExecutionContext(
+            frequencyOfRunStatsChangeEvent: 100,
+            runStatsChangeEventTimeout: TimeSpan.MaxValue,
+            inIsolation: false,
+            keepAlive: false,
+            isDataCollectionEnabled: false,
+            areTestCaseLevelEventsRequired: false,
+            hasTestRun: false,
+            isDebug: false,
+            testCaseFilter: string.Empty,
+            filterOptions: null);
+        _mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockThread = new Mock<IThread>();
+        _mockDataSerializer = new Mock<IDataSerializer>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+
+        _runTestsInstance = new TestableBaseRunTests(
+            _mockRequestData.Object,
+            null,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockTestPlatformEventSource.Object,
+            null,
+            new PlatformThread(),
+            _mockDataSerializer.Object);
+
+        TestPluginCacheHelper.SetupMockExtensions([typeof(BaseRunTestsTests).Assembly.Location], () => { });
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            TestExecutorExtensionManager.Destroy();
-            TestPluginCacheHelper.ResetExtensionsCache();
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        TestExecutorExtensionManager.Destroy();
+        TestPluginCacheHelper.ResetExtensionsCache();
+    }
 
-        #region Constructor tests
+    #region Constructor tests
 
-        [TestMethod]
-        public void ConstructorShouldInitializeRunContext()
-        {
-            var runContext = this.runTestsInstance.GetRunContext;
-            Assert.IsNotNull(runContext);
-            Assert.IsFalse(runContext.KeepAlive);
-            Assert.IsFalse(runContext.InIsolation);
-            Assert.IsFalse(runContext.IsDataCollectionEnabled);
-            Assert.IsFalse(runContext.IsBeingDebugged);
-        }
+    [TestMethod]
+    public void ConstructorShouldInitializeRunContext()
+    {
+        var runContext = _runTestsInstance.GetRunContext;
+        Assert.IsNotNull(runContext);
+        Assert.IsFalse(runContext.KeepAlive);
+        Assert.IsFalse(runContext.InIsolation);
+        Assert.IsFalse(runContext.IsDataCollectionEnabled);
+        Assert.IsFalse(runContext.IsBeingDebugged);
+    }
 
-        [TestMethod]
-        public void ConstructorShouldInitializeFrameworkHandle()
-        {
-            var frameworkHandle = this.runTestsInstance.GetFrameworkHandle;
-            Assert.IsNotNull(frameworkHandle);
-        }
+    [TestMethod]
+    public void ConstructorShouldInitializeFrameworkHandle()
+    {
+        var frameworkHandle = _runTestsInstance.GetFrameworkHandle;
+        Assert.IsNotNull(frameworkHandle);
+    }
 
-        [TestMethod]
-        public void ConstructorShouldInitializeExecutorUrisThatRanTests()
-        {
-            var executorUris = this.runTestsInstance.GetExecutorUrisThatRanTests;
-            Assert.IsNotNull(executorUris);
-        }
+    [TestMethod]
+    public void ConstructorShouldInitializeExecutorUrisThatRanTests()
+    {
+        var executorUris = _runTestsInstance.GetExecutorUrisThatRanTests;
+        Assert.IsNotNull(executorUris);
+    }
 
-        #endregion
+    #endregion
 
-        #region RunTests tests
+    #region RunTests tests
 
-        [TestMethod]
-        public void RunTestsShouldRaiseTestRunCompleteWithAbortedAsTrueOnException()
-        {
-            TestRunCompleteEventArgs receivedCompleteArgs = null;
+    [TestMethod]
+    public void RunTestsShouldRaiseTestRunCompleteWithAbortedAsTrueOnException()
+    {
+        TestRunCompleteEventArgs? receivedCompleteArgs = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { throw new NotImplementedException(); };
-            this.mockTestRunEventsHandler.Setup(
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => throw new NotImplementedException();
+        _mockTestRunEventsHandler.Setup(
                 treh =>
-                treh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                     TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                        {
-                            receivedCompleteArgs = complete;
-                        });
-
-            this.runTestsInstance.RunTests();
-
-            Assert.IsNotNull(receivedCompleteArgs);
-            Assert.IsTrue(receivedCompleteArgs.IsAborted);
-        }
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedCompleteArgs = complete);
+
+        _runTestsInstance.RunTests();
+
+        Assert.IsNotNull(receivedCompleteArgs);
+        Assert.IsTrue(receivedCompleteArgs.IsAborted);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldNotThrowIfExceptionIsAFileNotFoundException()
-        {
-            TestRunCompleteEventArgs receivedCompleteArgs = null;
+    [TestMethod]
+    public void RunTestsShouldNotThrowIfExceptionIsAFileNotFoundException()
+    {
+        TestRunCompleteEventArgs? receivedCompleteArgs = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { throw new FileNotFoundException(); };
-            this.mockTestRunEventsHandler.Setup(
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => throw new FileNotFoundException();
+        _mockTestRunEventsHandler.Setup(
                 treh =>
-                treh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                     TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                    {
-                        receivedCompleteArgs = complete;
-                    });
-
-            // This should not throw.
-            this.runTestsInstance.RunTests();
-
-            Assert.IsNotNull(receivedCompleteArgs);
-            Assert.IsTrue(receivedCompleteArgs.IsAborted);
-        }
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedCompleteArgs = complete);
+
+        // This should not throw.
+        _runTestsInstance.RunTests();
+
+        Assert.IsNotNull(receivedCompleteArgs);
+        Assert.IsTrue(receivedCompleteArgs.IsAborted);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldNotThrowIfExceptionIsAnArgumentException()
-        {
-            TestRunCompleteEventArgs receivedCompleteArgs = null;
+    [TestMethod]
+    public void RunTestsShouldNotThrowIfExceptionIsAnArgumentException()
+    {
+        TestRunCompleteEventArgs? receivedCompleteArgs = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { throw new ArgumentException(); };
-            this.mockTestRunEventsHandler.Setup(
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => throw new ArgumentException();
+        _mockTestRunEventsHandler.Setup(
                 treh =>
-                treh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                     TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                    {
-                        receivedCompleteArgs = complete;
-                    });
-
-            // This should not throw.
-            this.runTestsInstance.RunTests();
-
-            Assert.IsNotNull(receivedCompleteArgs);
-            Assert.IsTrue(receivedCompleteArgs.IsAborted);
-        }
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedCompleteArgs = complete);
+
+        // This should not throw.
+        _runTestsInstance.RunTests();
+
+        Assert.IsNotNull(receivedCompleteArgs);
+        Assert.IsTrue(receivedCompleteArgs.IsAborted);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldAbortIfExecutorUriExtensionMapIsNull()
-        {
-            TestRunCompleteEventArgs receivedCompleteArgs = null;
+    [TestMethod]
+    public void RunTestsShouldAbortIfExecutorUriExtensionMapIsNull()
+    {
+        TestRunCompleteEventArgs? receivedCompleteArgs = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return null; };
-            this.mockTestRunEventsHandler.Setup(
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => null;
+        _mockTestRunEventsHandler.Setup(
                 treh =>
-                treh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                     TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                    {
-                        receivedCompleteArgs = complete;
-                    });
-
-            // This should not throw.
-            this.runTestsInstance.RunTests();
-
-            Assert.IsNotNull(receivedCompleteArgs);
-            Assert.IsTrue(receivedCompleteArgs.IsAborted);
-        }
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedCompleteArgs = complete);
+
+        // This should not throw.
+        _runTestsInstance.RunTests();
+
+        Assert.IsNotNull(receivedCompleteArgs);
+        Assert.IsTrue(receivedCompleteArgs.IsAborted);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInvokeTheTestExecutorIfAdapterAssemblyIsKnown()
+    [TestMethod]
+    public void RunTestsShouldInvokeTheTestExecutorIfAdapterAssemblyIsKnown()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> receivedExecutor = null;
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities>? receivedExecutor = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    receivedExecutor = executor;
-                };
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => receivedExecutor = executor;
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            Assert.IsNotNull(receivedExecutor);
-            Assert.AreEqual(BaseRunTestsExecutorUri, receivedExecutor.Metadata.ExtensionUri);
-        }
+        Assert.IsNotNull(receivedExecutor);
+        Assert.AreEqual(BaseRunTestsExecutorUri, receivedExecutor.Metadata.ExtensionUri);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInvokeTheTestExecutorIfAdapterAssemblyIsUnknown()
+    [TestMethod]
+    public void RunTestsShouldInvokeTheTestExecutorIfAdapterAssemblyIsUnknown()
+    {
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath)
-            };
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> receivedExecutor = null;
+            new(new Uri(BaseRunTestsExecutorUri), Constants.UnspecifiedAdapterPath)
+        };
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities>? receivedExecutor = null;
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    receivedExecutor = executor;
-                };
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => receivedExecutor = executor;
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            Assert.IsNotNull(receivedExecutor);
-            Assert.AreEqual(BaseRunTestsExecutorUri, receivedExecutor.Metadata.ExtensionUri);
-        }
+        Assert.IsNotNull(receivedExecutor);
+        Assert.AreEqual(BaseRunTestsExecutorUri, receivedExecutor.Metadata.ExtensionUri);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInstrumentExecutionStart()
-        {
-            this.runTestsInstance.RunTests();
+    [TestMethod]
+    public void RunTestsShouldInstrumentExecutionStart()
+    {
+        _runTestsInstance.RunTests();
 
-            this.mockTestPlatformEventSource.Verify(x => x.ExecutionStart(), Times.Once);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.ExecutionStart(), Times.Once);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInstrumentExecutionStop()
-        {
-            this.SetupExecutorUriMock();
+    [TestMethod]
+    public void RunTestsShouldInstrumentExecutionStop()
+    {
+        SetupExecutorUriMock();
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            this.mockTestPlatformEventSource.Verify(x => x.ExecutionStop(It.IsAny<long>()), Times.Once);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.ExecutionStop(It.IsAny<long>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInstrumentAdapterExecutionStart()
-        {
-            this.SetupExecutorUriMock();
+    [TestMethod]
+    public void RunTestsShouldInstrumentAdapterExecutionStart()
+    {
+        SetupExecutorUriMock();
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            this.mockTestPlatformEventSource.Verify(x => x.AdapterExecutionStart(It.IsAny<string>()), Times.AtLeastOnce);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.AdapterExecutionStart(It.IsAny<string>()), Times.AtLeastOnce);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldInstrumentAdapterExecutionStop()
-        {
-            this.SetupExecutorUriMock();
+    [TestMethod]
+    public void RunTestsShouldInstrumentAdapterExecutionStop()
+    {
+        SetupExecutorUriMock();
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            this.mockTestPlatformEventSource.Verify(x => x.AdapterExecutionStop(It.IsAny<long>()), Times.AtLeastOnce);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.AdapterExecutionStop(It.IsAny<long>()), Times.AtLeastOnce);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldReportAWarningIfExecutorUriIsNotDefinedInExtensionAssembly()
+    [TestMethod]
+    public void RunTestsShouldReportAWarningIfExecutorUriIsNotDefinedInExtensionAssembly()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri("executor://nonexistent/"), assemblyLocation)
-            };
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> receivedExecutor = null;
-
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    receivedExecutor = executor;
-                };
-
-            this.runTestsInstance.RunTests();
+            new(new Uri("executor://nonexistent/"), assemblyLocation)
+        };
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities>? receivedExecutor = null;
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => receivedExecutor = executor;
+
+        _runTestsInstance.RunTests();
+
+        var expectedWarningMessageFormat =
+            "Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.";
+
+        // var runtimeVersion = string.Concat(PlatformServices.Default.Runtime.RuntimeType, " ",
+        //            PlatformServices.Default.Runtime.RuntimeVersion);
+        var runtimeVersion = " ";
+
+        var expectedWarningMessage = string.Format(
+            CultureInfo.InvariantCulture,
+            expectedWarningMessageFormat,
+            "executor://nonexistent/",
+            runtimeVersion);
+        _mockTestRunEventsHandler.Verify(
+            treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedWarningMessage), Times.Once);
+
+        // Should not have been called.
+        Assert.IsNull(receivedExecutor);
+    }
 
-            var expectedWarningMessageFormat =
-                "Could not find test executor with URI '{0}'.  Make sure that the test executor is installed and supports .net runtime version {1}.";
+    [TestMethod]
+    public void RunTestsShouldNotAddExecutorUriToExecutorUriListIfNoTestsAreRun()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
+        {
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
 
-            // var runtimeVersion = string.Concat(PlatformServices.Default.Runtime.RuntimeType, " ",
-            //            PlatformServices.Default.Runtime.RuntimeVersion);
-            var runtimeVersion = " ";
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
 
-            var expectedWarningMessage = string.Format(
-                expectedWarningMessageFormat,
-                "executor://nonexistent/",
-                runtimeVersion);
-            this.mockTestRunEventsHandler.Verify(
-                treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedWarningMessage), Times.Once);
+        _runTestsInstance.RunTests();
 
-            // Should not have been called.
-            Assert.IsNull(receivedExecutor);
-        }
+        Assert.AreEqual(0, _runTestsInstance.GetExecutorUrisThatRanTests.Count);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldNotAddExecutorUriToExecutorUriListIfNoTestsAreRun()
+    [TestMethod]
+    public void RunTestsShouldAddExecutorUriToExecutorUriListIfExecutorHasRunTests()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
             {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+                var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+                var testResult = new OMTestResult(testCase);
+                _runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
             };
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
+        _runTestsInstance.RunTests();
 
-            this.runTestsInstance.RunTests();
+        var expectedUris = new string[] { BaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture) };
+        CollectionAssert.AreEqual(expectedUris, _runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
+    }
 
-            Assert.AreEqual(0, this.runTestsInstance.GetExecutorUrisThatRanTests.Count);
-        }
+    [TestMethod]
+    public void RunTestsShouldReportWarningIfExecutorThrowsAnException()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
+        {
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => throw new ArgumentException("Test influenced.");
+
+        _runTestsInstance.RunTests();
+
+        var messageFormat = "An exception occurred while invoking executor '{0}': {1}";
+        var message = string.Format(CultureInfo.InvariantCulture, messageFormat, BaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture), "Test influenced.");
+        _mockTestRunEventsHandler.Verify(
+            treh => treh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.StartsWith(message))),
+            Times.Once);
+
+        // Also validate that a test run complete is called.
+        _mockTestRunEventsHandler.Verify(
+            treh => treh.HandleTestRunComplete(
+                It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldAddExecutorUriToExecutorUriListIfExecutorHasRunTests()
+    [TestMethod]
+    public void RunTestsShouldNotFailOtherExecutorsRunIfOneExecutorThrowsAnException()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
+            new(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
             {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
-
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
+                if (string.Equals(BadBaseRunTestsExecutorUri, executor.Metadata.ExtensionUri))
+                {
+                    throw new Exception();
+                }
+                else
                 {
                     var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-                    var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-                    this.runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
-                };
-
-            this.runTestsInstance.RunTests();
-
-            var expectedUris = new string[] { BaseRunTestsExecutorUri.ToLower() };
-            CollectionAssert.AreEqual(expectedUris, this.runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
-        }
-
-        [TestMethod]
-        public void RunTestsShouldReportWarningIfExecutorThrowsAnException()
-        {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+                    var testResult = new OMTestResult(testCase);
+                    _runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
+                }
             };
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    throw new ArgumentException("Test influenced.");
-                };
-
-            this.runTestsInstance.RunTests();
-
-            var messageFormat = "An exception occurred while invoking executor '{0}': {1}";
-            var message = string.Format(messageFormat, BaseRunTestsExecutorUri.ToLower(), "Test influenced.");
-            this.mockTestRunEventsHandler.Verify(
-                treh => treh.HandleLogMessage(TestMessageLevel.Error, It.Is<string>(s => s.StartsWith(message))),
-                Times.Once);
-
-            // Also validate that a test run complete is called.
-            this.mockTestRunEventsHandler.Verify(
-                treh => treh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsShouldNotFailOtherExecutorsRunIfOneExecutorThrowsAnException()
-        {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
+        _runTestsInstance.RunTests();
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    if (string.Equals(BadBaseRunTestsExecutorUri, executor.Metadata.ExtensionUri))
-                    {
-                        throw new Exception();
-                    }
-                    else
-                    {
-                        var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-                        var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-                        this.runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
-                    }
-                };
-
-            this.runTestsInstance.RunTests();
-
-            var expectedUris = new string[] { BaseRunTestsExecutorUri.ToLower() };
-            CollectionAssert.AreEqual(expectedUris, this.runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
-        }
+        var expectedUris = new string[] { BaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture) };
+        CollectionAssert.AreEqual(expectedUris, _runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
+    }
 
-        [TestMethod]
-        public void RunTestsShouldIterateThroughAllExecutors()
+    [TestMethod]
+    public void RunTestsShouldIterateThroughAllExecutors()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
+            new(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
             {
-                new Tuple<Uri, string>(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+                var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+                var testResult = new OMTestResult(testCase);
+                _runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
             };
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-                    var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-                    this.runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
-                };
-
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            var expectedUris = new string[] { BadBaseRunTestsExecutorUri.ToLower(), BaseRunTestsExecutorUri.ToLower() };
-            CollectionAssert.AreEqual(expectedUris, this.runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
-        }
+        var expectedUris = new string[] { BadBaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture), BaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture) };
+        CollectionAssert.AreEqual(expectedUris, _runTestsInstance.GetExecutorUrisThatRanTests.ToArray());
+    }
 
-        [TestMethod]
-        public void RunTestsShouldRaiseTestRunComplete()
-        {
-            this.SetUpTestRunEvents();
-
-            // Act.
-            this.runTestsInstance.RunTests();
-
-            // Test run complete assertions.
-            Assert.IsNotNull(receivedRunCompleteArgs);
-            Assert.IsNull(receivedRunCompleteArgs.Error);
-            Assert.IsFalse(receivedRunCompleteArgs.IsAborted);
-            Assert.AreEqual(this.runTestsInstance.GetTestRunCache.TestRunStatistics.ExecutedTests, receivedRunCompleteArgs.TestRunStatistics.ExecutedTests);
-
-            // Test run changed event assertions
-            Assert.IsNotNull(receivedRunStatusArgs);
-            Assert.AreEqual(this.runTestsInstance.GetTestRunCache.TestRunStatistics.ExecutedTests, receivedRunStatusArgs.TestRunStatistics.ExecutedTests);
-            Assert.IsNotNull(receivedRunStatusArgs.NewTestResults);
-            Assert.IsTrue(receivedRunStatusArgs.NewTestResults.Any());
-            Assert.IsTrue(receivedRunStatusArgs.ActiveTests == null || !receivedRunStatusArgs.ActiveTests.Any());
-
-            // Attachments
-            Assert.IsNotNull(receivedattachments);
-
-            // Executor Uris
-            var expectedUris = new string[] { BadBaseRunTestsExecutorUri.ToLower(), BaseRunTestsExecutorUri.ToLower() };
-            CollectionAssert.AreEqual(expectedUris, receivedExecutorUris.ToArray());
-        }
+    [TestMethod]
+    public void RunTestsShouldRaiseTestRunComplete()
+    {
+        SetUpTestRunEvents();
+
+        // Act.
+        _runTestsInstance.RunTests();
+
+        // Test run complete assertions.
+        Assert.IsNotNull(_receivedRunCompleteArgs);
+        Assert.IsNull(_receivedRunCompleteArgs.Error);
+        Assert.IsFalse(_receivedRunCompleteArgs.IsAborted);
+        Assert.AreEqual(_runTestsInstance.GetTestRunCache.TestRunStatistics.ExecutedTests, _receivedRunCompleteArgs.TestRunStatistics!.ExecutedTests);
+
+        // Test run changed event assertions
+        Assert.IsNotNull(_receivedRunStatusArgs);
+        Assert.AreEqual(_runTestsInstance.GetTestRunCache.TestRunStatistics.ExecutedTests, _receivedRunStatusArgs.TestRunStatistics!.ExecutedTests);
+        Assert.IsNotNull(_receivedRunStatusArgs.NewTestResults);
+        Assert.IsTrue(_receivedRunStatusArgs.NewTestResults.Any());
+        Assert.IsTrue(_receivedRunStatusArgs.ActiveTests == null || !_receivedRunStatusArgs.ActiveTests.Any());
+
+        // Attachments
+        Assert.IsNotNull(_receivedattachments);
+
+        // Executor Uris
+        var expectedUris = new string[] { BadBaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture), BaseRunTestsExecutorUri.ToLower(CultureInfo.InvariantCulture) };
+        CollectionAssert.AreEqual(expectedUris, _receivedExecutorUris!.ToArray());
+    }
 
-        [TestMethod]
-        public void RunTestsShouldNotCloneTestCaseAndTestResultsObjectForNonPackageSource()
-        {
-            this.SetUpTestRunEvents();
+    [TestMethod]
+    public void RunTestsShouldNotCloneTestCaseAndTestResultsObjectForNonPackageSource()
+    {
+        SetUpTestRunEvents();
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            this.mockDataSerializer.Verify(d => d.Clone<TestCase>(It.IsAny<TestCase>()), Times.Never);
-            this.mockDataSerializer.Verify(d => d.Clone<OMTestResult>(It.IsAny<OMTestResult>()), Times.Never);
-        }
+        _mockDataSerializer.Verify(d => d.Clone(It.IsAny<TestCase>()), Times.Never);
+        _mockDataSerializer.Verify(d => d.Clone(It.IsAny<OMTestResult>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldUpdateTestResultsTestCaseSourceWithPackageIfTestSourceIsPackage()
-        {
-            const string package = @"C:\Projects\UnitTestApp1\AppPackages\UnitTestApp1\UnitTestApp1_1.0.0.0_Win32_Debug_Test\UnitTestApp1_1.0.0.0_Win32_Debug.appx";
-            this.SetUpTestRunEvents(package);
+    [TestMethod]
+    public void RunTestsShouldUpdateTestResultsTestCaseSourceWithPackageIfTestSourceIsPackage()
+    {
+        const string package = @"C:\Projects\UnitTestApp1\AppPackages\UnitTestApp1\UnitTestApp1_1.0.0.0_Win32_Debug_Test\UnitTestApp1_1.0.0.0_Win32_Debug.appx";
+        SetUpTestRunEvents(package);
 
-            // Act.
-            this.runTestsInstance.RunTests();
+        // Act.
+        _runTestsInstance.RunTests();
 
-            // Test run changed event assertions
-            Assert.IsNotNull(receivedRunStatusArgs.NewTestResults);
-            Assert.IsTrue(receivedRunStatusArgs.NewTestResults.Any());
+        // Test run changed event assertions
+        Assert.IsNotNull(_receivedRunStatusArgs?.NewTestResults);
+        Assert.IsTrue(_receivedRunStatusArgs.NewTestResults.Any());
 
-            // verify TC.Source is updated with package
-            foreach (var tr in receivedRunStatusArgs.NewTestResults)
-            {
-                Assert.AreEqual(tr.TestCase.Source, package);
-            }
+        // verify TC.Source is updated with package
+        foreach (var tr in _receivedRunStatusArgs.NewTestResults)
+        {
+            Assert.AreEqual(tr.TestCase.Source, package);
         }
+    }
 
-        [TestMethod]
-        public void RunTestsShouldUpdateActiveTestCasesSourceWithPackageIfTestSourceIsPackage()
-        {
-            const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
-            this.mockDataSerializer.Setup(d => d.Clone<TestCase>(It.IsAny<TestCase>()))
-                .Returns<TestCase>(t => JsonDataSerializer.Instance.Clone<TestCase>(t));
-            this.SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
+    [TestMethod]
+    public void RunTestsShouldUpdateActiveTestCasesSourceWithPackageIfTestSourceIsPackage()
+    {
+        const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
+        _mockDataSerializer.Setup(d => d.Clone(It.IsAny<TestCase>()))
+            .Returns<TestCase>(t => JsonDataSerializer.Instance.Clone(t));
+        SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
 
-            // Act.
-            this.runTestsInstance.RunTests();
+        // Act.
+        _runTestsInstance.RunTests();
 
-            Assert.IsNotNull(receivedRunStatusArgs.ActiveTests);
-            Assert.AreEqual(1, receivedRunStatusArgs.ActiveTests.Count());
+        Assert.IsNotNull(_receivedRunStatusArgs?.ActiveTests);
+        Assert.AreEqual(1, _receivedRunStatusArgs.ActiveTests.Count());
 
-            foreach (var tc in receivedRunStatusArgs.ActiveTests)
-            {
-                Assert.AreEqual(tc.Source, package);
-            }
+        foreach (var tc in _receivedRunStatusArgs.ActiveTests)
+        {
+            Assert.AreEqual(tc.Source, package);
         }
+    }
 
-        [TestMethod]
-        public void RunTestsShouldCloneTheActiveTestCaseObjectsIfTestSourceIsPackage()
-        {
-            const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
+    [TestMethod]
+    public void RunTestsShouldCloneTheActiveTestCaseObjectsIfTestSourceIsPackage()
+    {
+        const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
 
-            this.SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
+        SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
 
-            // Act.
-            this.runTestsInstance.RunTests();
+        // Act.
+        _runTestsInstance.RunTests();
 
-            Assert.IsNotNull(receivedRunStatusArgs.ActiveTests);
-            Assert.AreEqual(1, receivedRunStatusArgs.ActiveTests.Count());
+        Assert.IsNotNull(_receivedRunStatusArgs?.ActiveTests);
+        Assert.AreEqual(1, _receivedRunStatusArgs.ActiveTests.Count());
 
-            this.mockDataSerializer.Verify(d => d.Clone<TestCase>(It.IsAny<TestCase>()), Times.Exactly(2));
-        }
+        _mockDataSerializer.Verify(d => d.Clone(It.IsAny<TestCase>()), Times.Exactly(2));
+    }
 
-        [TestMethod]
-        public void RunTestsShouldCloneTheTestResultsObjectsIfTestSourceIsPackage()
-        {
-            const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
+    [TestMethod]
+    public void RunTestsShouldCloneTheTestResultsObjectsIfTestSourceIsPackage()
+    {
+        const string package = @"C:\Porjects\UnitTestApp3\Debug\UnitTestApp3\UnitTestApp3.build.appxrecipe";
 
-            this.SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
+        SetUpTestRunEvents(package, setupHandleTestRunComplete: false);
 
-            // Act.
-            this.runTestsInstance.RunTests();
+        // Act.
+        _runTestsInstance.RunTests();
 
-            Assert.IsNotNull(receivedRunStatusArgs.NewTestResults);
-            Assert.AreEqual(1, receivedRunStatusArgs.ActiveTests.Count());
+        Assert.IsNotNull(_receivedRunStatusArgs?.NewTestResults);
+        Assert.AreEqual(1, _receivedRunStatusArgs.ActiveTests!.Count());
 
-            this.mockDataSerializer.Verify(d => d.Clone<OMTestResult>(It.IsAny<OMTestResult>()), Times.Exactly(2));
-        }
+        _mockDataSerializer.Verify(d => d.Clone(It.IsAny<OMTestResult>()), Times.Exactly(2));
+    }
 
-        [TestMethod]
-        public void RunTestsShouldNotifyItsImplementersOfAnyExceptionThrownByTheExecutors()
+    [TestMethod]
+    public void RunTestsShouldNotifyItsImplementersOfAnyExceptionThrownByTheExecutors()
+    {
+        bool? isExceptionThrown = null;
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            bool? isExceptionThrown = null;
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
 
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    throw new Exception();
-                };
-            this.runTestsInstance.BeforeRaisingTestRunCompleteCallback = (isEx) => { isExceptionThrown = isEx; };
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => throw new Exception();
+        _runTestsInstance.BeforeRaisingTestRunCompleteCallback = (isEx) => isExceptionThrown = isEx;
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            Assert.IsTrue(isExceptionThrown.HasValue && isExceptionThrown.Value);
-        }
+        Assert.IsTrue(isExceptionThrown.HasValue && isExceptionThrown.Value);
+    }
 
-        [TestMethod]
-        public void RunTestsShouldReportLogMessagesFromExecutors()
+    [TestMethod]
+    public void RunTestsShouldReportLogMessagesFromExecutors()
+    {
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriTuple, runcontext, frameworkHandle) =>
-                {
-                    frameworkHandle.SendMessage(TestMessageLevel.Error, "DummyMessage");
-                };
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriTuple, runcontext, frameworkHandle) => frameworkHandle.SendMessage(TestMessageLevel.Error, "DummyMessage");
 
-            this.runTestsInstance.RunTests();
+        _runTestsInstance.RunTests();
 
-            this.mockTestRunEventsHandler.Verify(re => re.HandleLogMessage(TestMessageLevel.Error, "DummyMessage"));
-        }
+        _mockTestRunEventsHandler.Verify(re => re.HandleLogMessage(TestMessageLevel.Error, "DummyMessage"));
+    }
 
-        [TestMethod]
-        public void RunTestsShouldCreateSTAThreadIfExecutionThreadApartmentStateIsSTA()
-        {
-            this.SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
-            this.runTestsInstance.RunTests();
-            this.mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true));
-        }
+    [TestMethod]
+    public void RunTestsShouldCreateStaThreadIfExecutionThreadApartmentStateIsSta()
+    {
+        SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
+        _runTestsInstance.RunTests();
+        _mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true));
+    }
 
-        [TestMethod]
-        public void RunTestsShouldSendMetricsOnTestRunComplete()
-        {
-            TestRunCompleteEventArgs receivedRunCompleteArgs = null;
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
-
-            // Setup mocks.
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
-
-            this.mockTestRunEventsHandler.Setup(
-                    treh =>
-                        treh.HandleTestRunComplete(
-                            It.IsAny<TestRunCompleteEventArgs>(),
-                            It.IsAny<TestRunChangedEventArgs>(),
-                            It.IsAny<ICollection<AttachmentSet>>(),
-                            It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                        TestRunCompleteEventArgs complete,
-                        TestRunChangedEventArgs stats,
-                        ICollection<AttachmentSet> attachments,
-                        ICollection<string> executorUris) =>
-                    {
-                        receivedRunCompleteArgs = complete;
-                    });
-
-            // Act.
-            this.runTestsInstance.RunTests();
-
-            // Assert.
-            Assert.IsNotNull(receivedRunCompleteArgs.Metrics);
-            Assert.IsTrue(receivedRunCompleteArgs.Metrics.Any());
-            Assert.IsTrue(receivedRunCompleteArgs.Metrics.ContainsKey("DummyMessage"));
-        }
+    [TestMethod]
+    public void RunTestsShouldSendMetricsOnTestRunComplete()
+    {
+        TestRunCompleteEventArgs? receivedRunCompleteArgs = null;
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
 
-        [TestMethod]
-        public void RunTestsShouldCollectMetrics()
+        var dict = new Dictionary<string, object>
         {
-            var mockMetricsCollector = new Mock<IMetricsCollection>();
-            var dict = new Dictionary<string, object>();
-            dict.Add("DummyMessage", "DummyValue");
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-                                              {
-                                                  new Tuple<Uri, string>(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
-                                                  new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-                                              };
-
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                    {
-                        var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-                        var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-                        this.runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
-                    };
-            mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
-
-            // Act.
-            this.runTestsInstance.RunTests();
-
-            // Verify.
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsRun, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.RunState, It.IsAny<string>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(string.Concat(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, ".", new Uri(BadBaseRunTestsExecutorUri)), It.IsAny<object>()), Times.Once);
-            mockMetricsCollector.Verify(rd => rd.Add(string.Concat(TelemetryDataConstants.TotalTestsRanByAdapter, ".", new Uri(BadBaseRunTestsExecutorUri)), It.IsAny<object>()), Times.Once);
-        }
+            { "DummyMessage", "DummyValue" }
+        };
 
-        [TestMethod]
-        public void RunTestsShouldNotCreateThreadIfExecutionThreadApartmentStateIsMTA()
-        {
-            this.SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.MTA);
-            this.runTestsInstance.RunTests();
+        // Setup mocks.
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
 
-            this.mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true), Times.Never);
-        }
+        _mockTestRunEventsHandler.Setup(
+                treh =>
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedRunCompleteArgs = complete);
+
+        // Act.
+        _runTestsInstance.RunTests();
+
+        // Assert.
+        Assert.IsNotNull(receivedRunCompleteArgs?.Metrics);
+        Assert.IsTrue(receivedRunCompleteArgs.Metrics.Any());
+        Assert.IsTrue(receivedRunCompleteArgs.Metrics.ContainsKey("DummyMessage"));
+    }
 
-        [TestMethod]
-        public void RunTestsShouldRunTestsInMTAThreadWhenRunningInSTAThreadFails()
+    [TestMethod]
+    public void RunTestsShouldCollectMetrics()
+    {
+        var mockMetricsCollector = new Mock<IMetricsCollection>();
+        var dict = new Dictionary<string, object>
         {
-            this.SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
-            this.mockThread.Setup(
-                mt => mt.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>())).Throws<ThreadApartmentStateNotSupportedException>();
-            bool isInvokeExecutorCalled = false;
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriTuple, runcontext, frameworkHandle) =>
-                {
-                    isInvokeExecutorCalled = true;
-                };
-            this.runTestsInstance.RunTests();
-
-            Assert.IsTrue(isInvokeExecutorCalled, "InvokeExecutor() should be called when STA thread creation fails.");
-            this.mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true), Times.Once);
-        }
-
-        [TestMethod]
-        public void CancelShouldCreateSTAThreadIfExecutionThreadApartmentStateIsSTA()
+            { "DummyMessage", "DummyValue" }
+        };
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            this.SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
-            this.mockThread.Setup(mt => mt.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>()))
-                .Callback<Action, PlatformApartmentState, bool>((action, start, waitForCompletion) =>
-                {
-                    if (waitForCompletion)
-                    {
-                        // Callback for RunTests().
-                        this.runTestsInstance.Cancel();
-                    }
-                });
+            new(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
+            {
+                var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+                var testResult = new OMTestResult(testCase);
+                _runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
+            };
+        mockMetricsCollector.Setup(mc => mc.Metrics).Returns(dict);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollector.Object);
+
+        // Act.
+        _runTestsInstance.RunTests();
+
+        // Verify.
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsRun, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.RunState, It.IsAny<string>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterUsedToRunTests, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.NumberOfAdapterDiscoveredDuringExecution, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TimeTakenByAllAdaptersInSec, It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(string.Concat(TelemetryDataConstants.TimeTakenToRunTestsByAnAdapter, ".", new Uri(BadBaseRunTestsExecutorUri)), It.IsAny<object>()), Times.Once);
+        mockMetricsCollector.Verify(rd => rd.Add(string.Concat(TelemetryDataConstants.TotalTestsRanByAdapter, ".", new Uri(BadBaseRunTestsExecutorUri)), It.IsAny<object>()), Times.Once);
+    }
 
-            this.runTestsInstance.RunTests();
-            this.mockThread.Verify(
-                t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>()),
-                Times.Exactly(2),
-                "Both RunTests() and Cancel() should create STA thread.");
-        }
+    [TestMethod]
+    public void RunTestsShouldNotCreateThreadIfExecutionThreadApartmentStateIsMta()
+    {
+        SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.MTA);
+        _runTestsInstance.RunTests();
 
-        #endregion
+        _mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true), Times.Never);
+    }
 
-        #region Private Methods
+    [TestMethod]
+    public void RunTestsShouldRunTestsInMtaThreadWhenRunningInStaThreadFails()
+    {
+        SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
+        _mockThread.Setup(
+            mt => mt.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>())).Throws<ThreadApartmentStateNotSupportedException>();
+        bool isInvokeExecutorCalled = false;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriTuple, runcontext, frameworkHandle) => isInvokeExecutorCalled = true;
+        _runTestsInstance.RunTests();
+
+        Assert.IsTrue(isInvokeExecutorCalled, "InvokeExecutor() should be called when STA thread creation fails.");
+        _mockThread.Verify(t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, true), Times.Once);
+    }
 
-        private void SetupExecutorUriMock()
-        {
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
+    [TestMethod]
+    public void CancelShouldCreateStaThreadIfExecutionThreadApartmentStateIsSta()
+    {
+        SetupForExecutionThreadApartmentStateTests(PlatformApartmentState.STA);
+        _mockThread.Setup(mt => mt.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>()))
+            .Callback<Action, PlatformApartmentState, bool>((action, start, waitForCompletion) =>
             {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath)
-            };
-            LazyExtension<ITestExecutor, ITestExecutorCapabilities> receivedExecutor = null;
-
-            // Setup mocks.
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
+                if (waitForCompletion)
                 {
-                    receivedExecutor = executor;
-                };
-        }
+                    // Callback for RunTests().
+                    _runTestsInstance.Cancel();
+                }
+            });
+
+        _runTestsInstance.RunTests();
+        _mockThread.Verify(
+            t => t.Run(It.IsAny<Action>(), PlatformApartmentState.STA, It.IsAny<bool>()),
+            Times.Exactly(2),
+            "Both RunTests() and Cancel() should create STA thread.");
+    }
 
-        private void SetupForExecutionThreadApartmentStateTests(PlatformApartmentState apartmentState)
+    #endregion
+
+    #region Private Methods
+
+    private void SetupExecutorUriMock()
+    {
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            this.mockThread = new Mock<IThread>();
+            new(new Uri(BaseRunTestsExecutorUri), Constants.UnspecifiedAdapterPath)
+        };
+        LazyExtension<ITestExecutor, ITestExecutorCapabilities>? receivedExecutor = null;
+
+        // Setup mocks.
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) => receivedExecutor = executor;
+    }
 
-            this.runTestsInstance = new TestableBaseRunTests(
-                this.mockRequestData.Object,
-                null,
-                $@"<RunSettings>
+    private void SetupForExecutionThreadApartmentStateTests(PlatformApartmentState apartmentState)
+    {
+        _mockThread = new Mock<IThread>();
+
+        _runTestsInstance = new TestableBaseRunTests(
+            _mockRequestData.Object,
+            null,
+            $@"<RunSettings>
                   <RunConfiguration>
                      <ExecutionThreadApartmentState>{apartmentState}</ExecutionThreadApartmentState>
                    </RunConfiguration>
                 </RunSettings>",
-                this.testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockTestPlatformEventSource.Object,
-                null,
-                this.mockThread.Object,
-                this.mockDataSerializer.Object);
-
-            TestPluginCacheHelper.SetupMockExtensions(new string[] { typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location }, () => { });
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
-            };
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockTestPlatformEventSource.Object,
+            null,
+            _mockThread.Object,
+            _mockDataSerializer.Object);
+
+        TestPluginCacheHelper.SetupMockExtensions([typeof(BaseRunTestsTests).Assembly.Location], () => { });
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
+        {
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+    }
+
+    [MemberNotNull(nameof(_runTestsInstance))]
+    private void SetUpTestRunEvents(string? package = null, bool setupHandleTestRunComplete = true)
+    {
+        if (setupHandleTestRunComplete)
+        {
+            SetupHandleTestRunComplete();
+        }
+        else
+        {
+            SetupHandleTestRunStatsChange();
         }
 
-        private void SetUpTestRunEvents(string package = null, bool setupHandleTestRunComplete = true)
+        SetupDataSerializer();
+
+        _runTestsInstance = _runTestsInstance = new TestableBaseRunTests(
+            _mockRequestData.Object,
+            package,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockTestPlatformEventSource.Object,
+            null,
+            new PlatformThread(),
+            _mockDataSerializer.Object);
+
+        var assemblyLocation = typeof(BaseRunTestsTests).Assembly.Location;
+        var executorUriExtensionMap = new List<Tuple<Uri, string>>
         {
-            if (setupHandleTestRunComplete)
-            {
-                this.SetupHandleTestRunComplete();
-            }
-            else
-            {
-                this.SetupHandleTestRunStatsChange();
-            }
+            new(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
+            new(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+        };
 
-            this.SetupDataSerializer();
+        // Setup mocks.
+        SetupExecutorCallback(executorUriExtensionMap);
+    }
 
-            this.runTestsInstance = this.runTestsInstance = new TestableBaseRunTests(
-                this.mockRequestData.Object,
-                package,
-                null,
-                this.testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockTestPlatformEventSource.Object,
-                null,
-                new PlatformThread(),
-                this.mockDataSerializer.Object);
-
-            var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location;
-            var executorUriExtensionMap = new List<Tuple<Uri, string>>
+    private void SetupExecutorCallback(List<Tuple<Uri, string>> executorUriExtensionMap)
+    {
+        _runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => executorUriExtensionMap;
+        _runTestsInstance.InvokeExecutorCallback =
+            (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
             {
-                new Tuple<Uri, string>(new Uri(BadBaseRunTestsExecutorUri), assemblyLocation),
-                new Tuple<Uri, string>(new Uri(BaseRunTestsExecutorUri), assemblyLocation)
+                var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
+                var testResult = new OMTestResult(testCase);
+                _inProgressTestCase = new TestCase("x.y.z2", new Uri("uri://dummy"), "x.dll");
+
+                _runTestsInstance.GetTestRunCache.OnTestStarted(_inProgressTestCase);
+                _runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
             };
+    }
 
-            // Setup mocks.
-            this.SetupExecutorCallback(executorUriExtensionMap);
-        }
+    private void SetupDataSerializer()
+    {
+        _mockDataSerializer.Setup(d => d.Clone(It.IsAny<TestCase>()))
+            .Returns<TestCase>(t => JsonDataSerializer.Instance.Clone(t));
 
-        private void SetupExecutorCallback(List<Tuple<Uri, string>> executorUriExtensionMap)
-        {
-            this.runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => { return executorUriExtensionMap; };
-            this.runTestsInstance.InvokeExecutorCallback =
-                (executor, executorUriExtensionTuple, runContext, frameworkHandle) =>
-                {
-                    var testCase = new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll");
-                    var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-                    this.inProgressTestCase = new TestCase("x.y.z2", new Uri("uri://dummy"), "x.dll");
+        _mockDataSerializer.Setup(d => d.Clone(It.IsAny<OMTestResult>()))
+            .Returns<OMTestResult>(t => JsonDataSerializer.Instance.Clone(t));
+    }
 
-                    this.runTestsInstance.GetTestRunCache.OnTestStarted(inProgressTestCase);
-                    this.runTestsInstance.GetTestRunCache.OnNewTestResult(testResult);
-                };
-        }
+    private void SetupHandleTestRunStatsChange()
+    {
+        _testExecutionContext.FrequencyOfRunStatsChangeEvent = 2;
+        _mockTestRunEventsHandler
+            .Setup(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()))
+            .Callback((TestRunChangedEventArgs stats) => _receivedRunStatusArgs = stats);
+    }
 
-        private void SetupDataSerializer()
-        {
-            this.mockDataSerializer.Setup(d => d.Clone<TestCase>(It.IsAny<TestCase>()))
-                .Returns<TestCase>(t => JsonDataSerializer.Instance.Clone<TestCase>(t));
+    private void SetupHandleTestRunComplete()
+    {
+        _mockTestRunEventsHandler.Setup(
+                treh =>
+                    treh.HandleTestRunComplete(
+                        It.IsAny<TestRunCompleteEventArgs>(),
+                        It.IsAny<TestRunChangedEventArgs>(),
+                        It.IsAny<ICollection<AttachmentSet>>(),
+                        It.IsAny<ICollection<string>>()))
+            .Callback(
+                (
+                    TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) =>
+                {
+                    _receivedRunCompleteArgs = complete;
+                    _receivedRunStatusArgs = stats;
+                    _receivedattachments = attachments;
+                    _receivedExecutorUris = executorUris;
+                });
+    }
 
-            this.mockDataSerializer.Setup(d => d.Clone<OMTestResult>(It.IsAny<OMTestResult>()))
-                .Returns<OMTestResult>(t => JsonDataSerializer.Instance.Clone<OMTestResult>(t));
-        }
+    #endregion
 
-        private void SetupHandleTestRunStatsChange()
-        {
-            this.testExecutionContext.FrequencyOfRunStatsChangeEvent = 2;
-            this.mockTestRunEventsHandler
-                .Setup(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()))
-                .Callback((TestRunChangedEventArgs stats) => { receivedRunStatusArgs = stats; });
-        }
+    #region Testable Implementation
 
-        private void SetupHandleTestRunComplete()
+    private class TestableBaseRunTests : BaseRunTests
+    {
+        public TestableBaseRunTests(
+            IRequestData requestData,
+            string? package,
+            string? runSettings,
+            TestExecutionContext testExecutionContext,
+            ITestCaseEventsHandler? testCaseEventsHandler,
+            IInternalTestRunEventsHandler testRunEventsHandler,
+            ITestPlatformEventSource testPlatformEventSource,
+            ITestEventsPublisher? testEventsPublisher,
+            IThread platformThread,
+            IDataSerializer dataSerializer)
+            : base(
+                requestData,
+                package,
+                runSettings,
+                testExecutionContext,
+                testCaseEventsHandler,
+                testRunEventsHandler,
+                testPlatformEventSource,
+                testEventsPublisher,
+                platformThread,
+                dataSerializer)
         {
-            this.mockTestRunEventsHandler.Setup(
-                    treh =>
-                        treh.HandleTestRunComplete(
-                            It.IsAny<TestRunCompleteEventArgs>(),
-                            It.IsAny<TestRunChangedEventArgs>(),
-                            It.IsAny<ICollection<AttachmentSet>>(),
-                            It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (
-                        TestRunCompleteEventArgs complete,
-                        TestRunChangedEventArgs stats,
-                        ICollection<AttachmentSet> attachments,
-                        ICollection<string> executorUris) =>
-                    {
-                        receivedRunCompleteArgs = complete;
-                        this.receivedRunStatusArgs = stats;
-                        receivedattachments = attachments;
-                        receivedExecutorUris = executorUris;
-                    });
+            _testCaseEventsHandler = testCaseEventsHandler;
         }
 
-        #endregion
+        private readonly ITestCaseEventsHandler? _testCaseEventsHandler;
 
-        #region Testable Implementation
+        public Action<bool>? BeforeRaisingTestRunCompleteCallback { get; set; }
 
-        private class TestableBaseRunTests : BaseRunTests
-        {
-            public TestableBaseRunTests(
-                IRequestData requestData,
-                string package,
-                string runSettings,
-                TestExecutionContext testExecutionContext,
-                ITestCaseEventsHandler testCaseEventsHandler,
-                ITestRunEventsHandler testRunEventsHandler,
-                ITestPlatformEventSource testPlatformEventSource,
-                ITestEventsPublisher testEventsPublisher,
-                IThread platformThread,
-                IDataSerializer dataSerializer)
-                : base(
-                    requestData,
-                    package,
-                    runSettings,
-                    testExecutionContext,
-                    testCaseEventsHandler,
-                    testRunEventsHandler,
-                    testPlatformEventSource,
-                    testEventsPublisher,
-                    platformThread,
-                    dataSerializer)
-            {
-                this.testCaseEventsHandler = testCaseEventsHandler;
-            }
-
-            private ITestCaseEventsHandler testCaseEventsHandler;
-
-            public Action<bool> BeforeRaisingTestRunCompleteCallback { get; set; }
-
-            public Func<IFrameworkHandle, RunContext, IEnumerable<Tuple<Uri, string>>> GetExecutorUriExtensionMapCallback { get; set; }
+        public Func<IFrameworkHandle, RunContext, IEnumerable<Tuple<Uri, string>>?>? GetExecutorUriExtensionMapCallback { get; set; }
 
-            public
-                Action
-                    <LazyExtension<ITestExecutor, ITestExecutorCapabilities>, Tuple<Uri, string>, RunContext,
-                        IFrameworkHandle> InvokeExecutorCallback
-            { get; set; }
+        public Action<LazyExtension<ITestExecutor, ITestExecutorCapabilities>, Tuple<Uri, string>, RunContext, IFrameworkHandle>? InvokeExecutorCallback { get; set; }
 
-            /// <summary>
-            /// Gets the run settings.
-            /// </summary>
-            public string GetRunSettings => this.RunSettings;
+        /// <summary>
+        /// Gets the run settings.
+        /// </summary>
+        public string? GetRunSettings => RunSettings;
 
-            /// <summary>
-            /// Gets the test execution context.
-            /// </summary>
-            public TestExecutionContext GetTestExecutionContext => this.TestExecutionContext;
+        /// <summary>
+        /// Gets the test execution context.
+        /// </summary>
+        public TestExecutionContext GetTestExecutionContext => TestExecutionContext;
 
-            /// <summary>
-            /// Gets the test run events handler.
-            /// </summary>
-            public ITestRunEventsHandler GetTestRunEventsHandler => this.TestRunEventsHandler;
+        /// <summary>
+        /// Gets the test run events handler.
+        /// </summary>
+        public IInternalTestRunEventsHandler GetTestRunEventsHandler => TestRunEventsHandler;
 
-            /// <summary>
-            /// Gets the test run cache.
-            /// </summary>
-            public ITestRunCache GetTestRunCache => this.TestRunCache;
+        /// <summary>
+        /// Gets the test run cache.
+        /// </summary>
+        public ITestRunCache GetTestRunCache => TestRunCache;
 
-            public bool GetIsCancellationRequested => this.IsCancellationRequested;
+        public bool GetIsCancellationRequested => IsCancellationRequested;
 
-            public RunContext GetRunContext => this.RunContext;
+        public RunContext GetRunContext => RunContext;
 
-            public FrameworkHandle GetFrameworkHandle => this.FrameworkHandle;
+        public FrameworkHandle GetFrameworkHandle => FrameworkHandle;
 
-            public ICollection<string> GetExecutorUrisThatRanTests => this.ExecutorUrisThatRanTests;
+        public ICollection<string> GetExecutorUrisThatRanTests => ExecutorUrisThatRanTests;
 
-            protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
-            {
-                this.BeforeRaisingTestRunCompleteCallback?.Invoke(exceptionsHitDuringRunTests);
-            }
+        protected override void BeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
+        {
+            BeforeRaisingTestRunCompleteCallback?.Invoke(exceptionsHitDuringRunTests);
+        }
 
-            protected override IEnumerable<Tuple<Uri, string>> GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
-            {
-                return this.GetExecutorUriExtensionMapCallback?.Invoke(testExecutorFrameworkHandle, runContext);
-            }
+        protected override IEnumerable<Tuple<Uri, string>>? GetExecutorUriExtensionMap(IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
+        {
+            return GetExecutorUriExtensionMapCallback?.Invoke(testExecutorFrameworkHandle, runContext);
+        }
 
-            protected override void InvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor, Tuple<Uri, string> executorUriExtensionTuple, RunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                this.InvokeExecutorCallback?.Invoke(executor, executorUriExtensionTuple, runContext, frameworkHandle);
-            }
+        protected override void InvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor, Tuple<Uri, string> executorUriExtensionTuple, RunContext runContext, IFrameworkHandle frameworkHandle)
+        {
+            InvokeExecutorCallback?.Invoke(executor, executorUriExtensionTuple, runContext, frameworkHandle);
+        }
 
-            protected override void SendSessionEnd()
-            {
-                this.testCaseEventsHandler?.SendSessionEnd();
-            }
+        protected override void SendSessionEnd()
+        {
+            _testCaseEventsHandler?.SendSessionEnd();
+        }
 
-            protected override void SendSessionStart()
-            {
-                this.testCaseEventsHandler?.SendSessionStart(new Dictionary<string, object> { { "TestSources", new List<string>() { "1.dll" } } });
-            }
+        protected override void SendSessionStart()
+        {
+            _testCaseEventsHandler?.SendSessionStart(new Dictionary<string, object?> { { "TestSources", new List<string>() { "1.dll" } } });
+        }
 
-            protected override bool ShouldAttachDebuggerToTestHost(
-                LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-                Tuple<Uri, string> executorUri,
-                RunContext runContext)
-            {
-                return false;
-            }
+        protected override bool ShouldAttachDebuggerToTestHost(
+            LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+            Tuple<Uri, string> executorUri,
+            RunContext runContext)
+        {
+            return false;
         }
+    }
 
-        [ExtensionUri(BaseRunTestsExecutorUri)]
-        private class TestExecutor : ITestExecutor
+    [ExtensionUri(BaseRunTestsExecutorUri)]
+    private class TestExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void Cancel()
-            {
-            }
+        }
 
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-            }
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+        }
 
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-            }
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
         }
+    }
 
-        [ExtensionUri(BadBaseRunTestsExecutorUri)]
-        private class BadTestExecutor : ITestExecutor
+    [ExtensionUri(BadBaseRunTestsExecutorUri)]
+    private class BadTestExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
+        }
 
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
 
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs
index ce5d24ea30..bea628a470 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs
@@ -1,455 +1,485 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+using FluentAssertions;
+
+using static TestPlatform.CrossPlatEngine.UnitTests.Execution.RunTestsWithSourcesTests;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Execution;
+
+[TestClass]
+public class ExecutionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Xml;
-
-    using Microsoft.TestPlatform.TestUtilities;
-
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using static RunTestsWithSourcesTests;
-
-    [TestClass]
-    public class ExecutionManagerTests
+    private readonly ExecutionManager _executionManager;
+    private readonly TestExecutionContext _testExecutionContext;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly TestSessionMessageLogger _sessionLogger;
+
+    public ExecutionManagerTests()
     {
-        private ExecutionManager executionManager;
-        private TestExecutionContext testExecutionContext;
-        private Mock<IRequestData> mockRequestData;
-        private TestSessionMessageLogger sessionLogger;
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+        _sessionLogger = TestSessionMessageLogger.Instance;
+        _executionManager = new ExecutionManager(new RequestData
+        {
+            MetricsCollection = new NoOpMetricsCollection()
+        });
+
+        TestPluginCache.Instance = null;
+
+        _testExecutionContext = new TestExecutionContext(
+            frequencyOfRunStatsChangeEvent: 1,
+            runStatsChangeEventTimeout: TimeSpan.MaxValue,
+            inIsolation: false,
+            keepAlive: false,
+            isDataCollectionEnabled: false,
+            areTestCaseLevelEventsRequired: false,
+            hasTestRun: false,
+            isDebug: false,
+            testCaseFilter: null,
+            filterOptions: null);
+    }
+
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = null;
+        RunTestWithSourcesExecutor.RunTestsWithTestsCallback = null;
+
+        TestDiscoveryExtensionManager.Destroy();
+        TestExecutorExtensionManager.Destroy();
+        SettingsProviderExtensionManager.Destroy();
+    }
+
+    [TestMethod]
+    public void InitializeShouldLoadAndInitializeAllExtensions()
+    {
+        var commonAssemblyLocation = typeof(ExecutionManagerTests).Assembly.Location;
+        var mockTestMessageEventHandler = new Mock<ITestMessageEventHandler>();
+        TestPluginCacheHelper.SetupMockExtensions(
+            [commonAssemblyLocation],
+            () => { });
+
+
+        _executionManager.Initialize(new List<string> { commonAssemblyLocation }, mockTestMessageEventHandler.Object);
+
+        Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
+
+        // Executors
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestExecutors!.Count > 0);
+        var allExecutors = TestExecutorExtensionManager.Create().TestExtensions;
 
-        [TestInitialize]
-        public void TestInit()
+        foreach (var executor in allExecutors)
         {
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
-            this.sessionLogger = TestSessionMessageLogger.Instance;
-            this.executionManager = new ExecutionManager(new RequestData
-            {
-                MetricsCollection = new NoOpMetricsCollection()
-            });
-
-            TestPluginCache.Instance = null;
-
-            testExecutionContext = new TestExecutionContext(
-                                           frequencyOfRunStatsChangeEvent: 1,
-                                           runStatsChangeEventTimeout: TimeSpan.MaxValue,
-                                           inIsolation: false,
-                                           keepAlive: false,
-                                           isDataCollectionEnabled: false,
-                                           areTestCaseLevelEventsRequired: false,
-                                           hasTestRun: false,
-                                           isDebug: false,
-                                           testCaseFilter: null,
-                                           filterOptions: null);
+            Assert.IsTrue(executor.IsExtensionCreated);
         }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = null;
-            RunTestWithSourcesExecutor.RunTestsWithTestsCallback = null;
+        // Settings Providers
+        Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestSettingsProviders!.Count > 0);
+        var settingsProviders = SettingsProviderExtensionManager.Create().SettingsProvidersMap.Values;
 
-            TestDiscoveryExtensionManager.Destroy();
-            TestExecutorExtensionManager.Destroy();
-            SettingsProviderExtensionManager.Destroy();
+        foreach (var provider in settingsProviders)
+        {
+            Assert.IsTrue(provider.IsExtensionCreated);
         }
+    }
 
-        [TestMethod]
-        public void InitializeShouldLoadAndInitializeAllExtensions()
-        {
-            var commonAssemblyLocation = typeof(ExecutionManagerTests).GetTypeInfo().Assembly.Location;
-            var mockTestMessageEventHandler = new Mock<ITestMessageEventHandler>();
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { commonAssemblyLocation },
-                () => { });
+    [TestMethod]
+    public void InitializeShouldClearMetricsCollection()
+    {
+        var metricsCollection = new MetricsCollection();
 
+        metricsCollection.Add("metric", "value");
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(metricsCollection);
+        _mockRequestData.Setup(rd => rd.IsTelemetryOptedIn).Returns(true);
 
-            this.executionManager.Initialize(new List<string> { commonAssemblyLocation }, mockTestMessageEventHandler.Object);
+        var discoveryManager = new ExecutionManager(_mockRequestData.Object);
 
-            Assert.IsNotNull(TestPluginCache.Instance.TestExtensions);
+        metricsCollection.Metrics.Should().ContainKey("metric");
+        discoveryManager.Initialize(null, new Mock<ITestDiscoveryEventsHandler2>().Object);
+        metricsCollection.Metrics.Should().BeEmpty();
+    }
 
-            // Executors
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestExecutors.Count > 0);
-            var allExecutors = TestExecutorExtensionManager.Create().TestExtensions;
+    [TestMethod]
+    public void InitializeShouldNotFailIfMetricsFieldIsNull()
+    {
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
 
-            foreach (var executor in allExecutors)
-            {
-                Assert.IsTrue(executor.IsExtensionCreated);
-            }
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            // Settings Providers
-            Assert.IsTrue(TestPluginCache.Instance.TestExtensions.TestSettingsProviders.Count > 0);
-            var settingsProviders = SettingsProviderExtensionManager.Create().SettingsProvidersMap.Values;
+        mockRequestData.Object.MetricsCollection.Metrics.Should().BeNull();
 
-            foreach (var provider in settingsProviders)
-            {
-                Assert.IsTrue(provider.IsExtensionCreated);
-            }
-        }
+        var action = () => (new ExecutionManager(mockRequestData.Object))
+            .Initialize(null, new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-        [TestMethod]
-        public void StartTestRunShouldRunTestsInTheProvidedSources()
-        {
-            var assemblyLocation = typeof(ExecutionManagerTests).GetTypeInfo().Assembly.Location;
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { assemblyLocation },
-                () => { });
-            TestPluginCache.Instance.DiscoverTestExtensions<TestExecutorPluginInformation, ITestExecutor>(TestPlatformConstants.TestAdapterEndsWithPattern);
-            TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
-
-
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add(assemblyLocation, new List<string> { assemblyLocation });
-
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            var isExecutorCalled = false;
-            RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (s, rc, fh) =>
-                {
-                    isExecutorCalled = true;
-                    var tr =
-                        new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(
-                            new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase(
-                                "A.C.M",
-                                new Uri("e://d/"),
-                                "A.dll"));
-                    fh.RecordResult(tr);
-                };
-
-            this.executionManager.StartTestRun(adapterSourceMap, null, null, testExecutionContext, null, mockTestRunEventsHandler.Object);
-
-            Assert.IsTrue(isExecutorCalled);
-            mockTestRunEventsHandler.Verify(
-                treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()), Times.Once);
-
-            // Also verify that run stats are passed through.
-            mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
-        }
+        action.Should().NotThrow();
+    }
+
+    [TestMethod]
+    public void StartTestRunShouldRunTestsInTheProvidedSources()
+    {
+        var assemblyLocation = typeof(ExecutionManagerTests).Assembly.Location;
+        TestPluginCacheHelper.SetupMockExtensions(
+            [assemblyLocation],
+            () => { });
+        TestPluginCache.Instance.DiscoverTestExtensions<TestExecutorPluginInformation, ITestExecutor>(TestPlatformConstants.TestAdapterEndsWithPattern);
+        TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
 
-        [TestMethod]
-        public void StartTestRunShouldRunTestsForTheProvidedTests()
+
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var assemblyLocation = typeof(ExecutionManagerTests).GetTypeInfo().Assembly.Location;
-
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri(RunTestsWithSourcesTestsExecutorUri), assemblyLocation)
-            };
-
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            var isExecutorCalled = false;
-            RunTestWithSourcesExecutor.RunTestsWithTestsCallback = (s, rc, fh) =>
-            {
-                isExecutorCalled = true;
-                var tr =
-                    new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(
-                        new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase(
-                            "A.C.M",
-                            new Uri(RunTestsWithSourcesTestsExecutorUri),
-                            "A.dll"));
-                fh.RecordResult(tr);
-            };
-            TestPluginCacheHelper.SetupMockExtensions(new string[] { assemblyLocation }, () => { });
-
-
-            this.executionManager.StartTestRun(tests, null, null, testExecutionContext, null, mockTestRunEventsHandler.Object);
-
-            Assert.IsTrue(isExecutorCalled);
-            mockTestRunEventsHandler.Verify(
-                treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()), Times.Once);
-
-            // Also verify that run stats are passed through.
-            mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
-        }
+            { assemblyLocation, new List<string> { assemblyLocation } }
+        };
 
-        [TestMethod]
-        public void StartTestRunShouldAbortTheRunIfAnyExceptionComesForTheProvidedTests()
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+
+        var isExecutorCalled = false;
+        RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (s, rc, fh) =>
         {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+            isExecutorCalled = true;
+            var tr =
+                new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(
+                    new TestCase(
+                        "A.C.M",
+                        new Uri("e://d/"),
+                        "A.dll"));
+            fh!.RecordResult(tr);
+        };
+
+        _executionManager.StartTestRun(adapterSourceMap, null, null, _testExecutionContext, null, mockTestRunEventsHandler.Object);
+
+        Assert.IsTrue(isExecutorCalled);
+        mockTestRunEventsHandler.Verify(
+            treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()), Times.Once);
+
+        // Also verify that run stats are passed through.
+        mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
+    }
 
-            // Call StartTestRun with faulty runsettings so that it will throw exception
-            this.executionManager.StartTestRun(new List<TestCase>(), null, @"<RunSettings><RunConfiguration><TestSessionTimeout>-1</TestSessionTimeout></RunConfiguration></RunSettings>", testExecutionContext, null, mockTestRunEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldRunTestsForTheProvidedTests()
+    {
+        var assemblyLocation = typeof(ExecutionManagerTests).Assembly.Location;
 
-            // Verify that TestRunComplete get called and error message are getting logged
-            mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once);
-            mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri(RunTestsWithSourcesTestsExecutorUri), assemblyLocation)
+        };
 
-        [TestMethod]
-        public void StartTestRunShouldAbortTheRunIfAnyExceptionComesForTheProvidedSources()
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+
+        var isExecutorCalled = false;
+        RunTestWithSourcesExecutor.RunTestsWithTestsCallback = (s, rc, fh) =>
         {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+            isExecutorCalled = true;
+            var tr =
+                new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(
+                    new TestCase(
+                        "A.C.M",
+                        new Uri(RunTestsWithSourcesTestsExecutorUri),
+                        "A.dll"));
+            fh!.RecordResult(tr);
+        };
+        TestPluginCacheHelper.SetupMockExtensions([assemblyLocation], () => { });
+
+
+        _executionManager.StartTestRun(tests, null, null, _testExecutionContext, null, mockTestRunEventsHandler.Object);
+
+        Assert.IsTrue(isExecutorCalled);
+        mockTestRunEventsHandler.Verify(
+            treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()), Times.Once);
+
+        // Also verify that run stats are passed through.
+        mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once);
+    }
 
-            // Call StartTestRun with faulty runsettings so that it will throw exception
-            this.executionManager.StartTestRun(new Dictionary<string, IEnumerable<string>>(), null, @"<RunSettings><RunConfiguration><TestSessionTimeout>-1</TestSessionTimeout></RunConfiguration></RunSettings>", testExecutionContext, null, mockTestRunEventsHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldAbortTheRunIfAnyExceptionComesForTheProvidedTests()
+    {
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
 
-            // Verify that TestRunComplete get called and error message are getting logged
-            mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once);
-            mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        // Call StartTestRun with faulty runsettings so that it will throw exception
+        _executionManager.StartTestRun(new List<TestCase>(), null, @"<RunSettings><RunConfiguration><TestSessionTimeout>-1</TestSessionTimeout></RunConfiguration></RunSettings>", _testExecutionContext, null, mockTestRunEventsHandler.Object);
 
-        //[TestMethod]
-        //public void InitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
-        //{
-        //    var assemblyLocation = typeof(ExecutionManagerTests).GetTypeInfo().Assembly.Location;
-        //    var mockLogger = new Mock<ITestMessageEventHandler>();
-        //    TestPluginCacheHelper.SetupMockExtensions(
-        //       new string[] { assemblyLocation },
-        //       () => { });
-        //    //Act
-        //    this.executionManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);
-
-        //    //when handler instance returns warning
-        //    sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning");
-
-        //    // Verify.
-        //    mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning"), Times.Once);
-        //}
-
-        [TestMethod]
-        public void InitializeShouldVerifyTheHandlerInitializationWhenAdapterIsFailedToLoad()
-        {
-            var mockLogger = new Mock<ITestMessageEventHandler>();
+        // Verify that TestRunComplete get called and error message are getting logged
+        mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once);
+        mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-            //when handler instance is null
-            sessionLogger.SendMessage(It.IsAny<TestMessageLevel>(), "verify that the HandleLogMessage method will not be invoked when handler is not initialized");
+    [TestMethod]
+    public void StartTestRunShouldAbortTheRunIfAnyExceptionComesForTheProvidedSources()
+    {
+        var mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
 
-            // Verify.
-            mockLogger.Verify(rd => rd.HandleLogMessage(It.IsAny<TestMessageLevel>(), "verify that the HandleLogMessage method will not be invoked when handler is not initialized"), Times.Never);
-        }
+        // Call StartTestRun with faulty runsettings so that it will throw exception
+        _executionManager.StartTestRun(new Dictionary<string, IEnumerable<string>>(), null, @"<RunSettings><RunConfiguration><TestSessionTimeout>-1</TestSessionTimeout></RunConfiguration></RunSettings>", _testExecutionContext, null, mockTestRunEventsHandler.Object);
+
+        // Verify that TestRunComplete get called and error message are getting logged
+        mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once);
+        mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
+
+    //[TestMethod]
+    //public void InitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
+    //{
+    //    var assemblyLocation = typeof(ExecutionManagerTests).Assembly.Location;
+    //    var mockLogger = new Mock<ITestMessageEventHandler>();
+    //    TestPluginCacheHelper.SetupMockExtensions(
+    //       new string[] { assemblyLocation },
+    //       () => { });
+    //    //Act
+    //    this.executionManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);
+
+    //    //when handler instance returns warning
+    //    sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning");
+
+    //    // Verify.
+    //    mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning"), Times.Once);
+    //}
+
+    [TestMethod]
+    public void InitializeShouldVerifyTheHandlerInitializationWhenAdapterIsFailedToLoad()
+    {
+        var mockLogger = new Mock<ITestMessageEventHandler>();
 
-        #region Implementations
+        //when handler instance is null
+        _sessionLogger.SendMessage(It.IsAny<TestMessageLevel>(), "verify that the HandleLogMessage method will not be invoked when handler is not initialized");
 
-        #region Discoverers
+        // Verify.
+        mockLogger.Verify(rd => rd.HandleLogMessage(It.IsAny<TestMessageLevel>(), "verify that the HandleLogMessage method will not be invoked when handler is not initialized"), Times.Never);
+    }
+
+    #region Implementations
+
+    #region Discoverers
 
-        private abstract class AbstractTestDiscoverer : ITestDiscoverer
+    private abstract class AbstractTestDiscoverer : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        private class ValidDiscoverer : ITestDiscoverer
+    private class ValidDiscoverer : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        private class ValidDiscoverer2 : ITestDiscoverer
+    private class ValidDiscoverer2 : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region Executors
+    #region Executors
 
-        [ExtensionUri("ValidExecutor")]
-        private class ValidExecutor : ITestExecutor
+    [ExtensionUri("ValidExecutor")]
+    private class ValidExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("ValidExecutor2")]
-        private class ValidExecutor2 : ITestExecutor
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("ValidExecutor")]
-        private class DuplicateExecutor : ITestExecutor
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    [ExtensionUri("ValidExecutor2")]
+    private class ValidExecutor2 : ITestExecutor
+    {
+        public void Cancel()
+        {
+            throw new NotImplementedException();
+        }
 
-        #region Loggers
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
 
-        [ExtensionUri("csv")]
-        private class ValidLogger : ITestLogger
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [ExtensionUri("docx")]
-        private class ValidLogger2 : ITestLogger
+    [ExtensionUri("ValidExecutor")]
+    private class DuplicateExecutor : ITestExecutor
+    {
+        public void Cancel()
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        [ExtensionUri("csv")]
-        private class DuplicateLogger : ITestLogger
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        #endregion
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    #endregion
 
-        #region Settings Providers
+    #region Loggers
 
-        [SettingsName("ValidSettingsProvider")]
-        private class ValidSettingsProvider : ISettingsProvider
+    [ExtensionUri("csv")]
+    private class ValidLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [SettingsName("ValidSettingsProvider2")]
-        private class ValidSettingsProvider2 : ISettingsProvider
+    [ExtensionUri("docx")]
+    private class ValidLogger2 : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        [SettingsName("ValidSettingsProvider")]
-        private class DuplicateSettingsProvider : ISettingsProvider
+    [ExtensionUri("csv")]
+    private class DuplicateLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Load(XmlReader reader)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        #endregion
+    #endregion
 
-        #region  DataCollectors
+    #region Settings Providers
 
-        public class InvalidDataCollector : DataCollector
+    [SettingsName("ValidSettingsProvider")]
+    private class ValidSettingsProvider : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public override void Initialize(
-                XmlElement configurationElement,
-                DataCollectionEvents events,
-                DataCollectionSink dataSink,
-                DataCollectionLogger logger,
-                DataCollectionEnvironmentContext environmentContext)
-            {
-
-            }
+            throw new NotImplementedException();
         }
+    }
 
-        /// <summary>
-        /// The a data collector inheriting from another data collector.
-        /// </summary>
-        [DataCollectorFriendlyName("Foo1")]
-        [DataCollectorTypeUri("datacollector://foo/bar1")]
-        public class ADataCollectorInheritingFromAnotherDataCollector : InvalidDataCollector
+    [SettingsName("ValidSettingsProvider2")]
+    private class ValidSettingsProvider2 : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
+            throw new NotImplementedException();
         }
+    }
 
-        [DataCollectorFriendlyName("Foo")]
-        [DataCollectorTypeUri("datacollector://foo/bar")]
-        public class ValidDataCollector : DataCollector
+    [SettingsName("ValidSettingsProvider")]
+    private class DuplicateSettingsProvider : ISettingsProvider
+    {
+        public void Load(XmlReader reader)
         {
-            public override void Initialize(
-                XmlElement configurationElement,
-                DataCollectionEvents events,
-                DataCollectionSink dataSink,
-                DataCollectionLogger logger,
-                DataCollectionEnvironmentContext environmentContext)
-            {
-
-            }
+            throw new NotImplementedException();
         }
-        #endregion
+    }
+
+    #endregion
+
+    #region  DataCollectors
+
+    public class InvalidDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
 
-        internal class FaultyTestExecutorPluginInformation : TestExtensionPluginInformation
+    /// <summary>
+    /// The a data collector inheriting from another data collector.
+    /// </summary>
+    [DataCollectorFriendlyName("Foo1")]
+    [DataCollectorTypeUri("datacollector://foo/bar1")]
+    public class ADataCollectorInheritingFromAnotherDataCollector : InvalidDataCollector
+    {
+    }
+
+    [DataCollectorFriendlyName("Foo")]
+    [DataCollectorTypeUri("datacollector://foo/bar")]
+    public class ValidDataCollector : DataCollector
+    {
+        public override void Initialize(
+            XmlElement? configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext? environmentContext)
+        {
+
+        }
+    }
+    #endregion
+
+    internal class FaultyTestExecutorPluginInformation : TestExtensionPluginInformation
+    {
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="type"> The Type. </param>
+        public FaultyTestExecutorPluginInformation(Type type) : base(type)
         {
-            /// <summary>
-            /// Default constructor
-            /// </summary>
-            /// <param name="type"> The Type. </param>
-            public FaultyTestExecutorPluginInformation(Type type) : base(type)
-            {
-                throw new Exception();
-            }
+            throw new Exception();
         }
-        #endregion
     }
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithSourcesTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithSourcesTests.cs
index b8754f6582..89a81acd47 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithSourcesTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithSourcesTests.cs
@@ -1,401 +1,419 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Execution;
+
+[TestClass]
+public class RunTestsWithSourcesTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using TestableImplementations;
-
-    [TestClass]
-    public class RunTestsWithSourcesTests
+    private readonly TestExecutionContext _testExecutionContext;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockTestRunEventsHandler;
+    private TestableRunTestsWithSources? _runTestsInstance;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+
+    internal const string RunTestsWithSourcesTestsExecutorUri = "executor://RunTestWithSourcesDiscoverer/";
+
+    public RunTestsWithSourcesTests()
     {
-        private TestableTestRunCache testableTestRunCache;
-        private TestExecutionContext testExecutionContext;
-        private Mock<ITestRunEventsHandler> mockTestRunEventsHandler;
-        private TestableRunTestsWithSources runTestsInstance;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
+        _testExecutionContext = new TestExecutionContext(
+            frequencyOfRunStatsChangeEvent: 100,
+            runStatsChangeEventTimeout: TimeSpan.MaxValue,
+            inIsolation: false,
+            keepAlive: false,
+            isDataCollectionEnabled: false,
+            areTestCaseLevelEventsRequired: false,
+            hasTestRun: false,
+            isDebug: false,
+            testCaseFilter: null,
+            filterOptions: null);
+        _mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(RunTestsWithSourcesTests).Assembly.Location],
+            () => { });
+
+        TestPluginCache.Instance.DiscoverTestExtensions<TestExecutorPluginInformation, ITestExecutor>(TestPlatformConstants.TestAdapterEndsWithPattern);
+        TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
+    }
 
-        internal const string RunTestsWithSourcesTestsExecutorUri = "executor://RunTestWithSourcesDiscoverer/";
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = null;
+        TestPluginCacheHelper.ResetExtensionsCache();
+    }
 
-        [TestInitialize]
-        public void TestInit()
+    [TestMethod]
+    public void BeforeRaisingTestRunCompleteShouldWarnIfNoTestsAreRun()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            this.testableTestRunCache = new TestableTestRunCache();
-            this.testExecutionContext = new TestExecutionContext(
-                                            frequencyOfRunStatsChangeEvent: 100,
-                                            runStatsChangeEventTimeout: TimeSpan.MaxValue,
-                                            inIsolation: false,
-                                            keepAlive: false,
-                                            isDataCollectionEnabled: false,
-                                            areTestCaseLevelEventsRequired: false,
-                                            hasTestRun: false,
-                                            isDebug: false,
-                                            testCaseFilter: null,
-                                            filterOptions: null);
-            this.mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(RunTestsWithSourcesTests).GetTypeInfo().Assembly.Location },
-                () => { });
-
-            TestPluginCache.Instance.DiscoverTestExtensions<TestExecutorPluginInformation, ITestExecutor>(TestPlatformConstants.TestAdapterEndsWithPattern);
-            TestPluginCache.Instance.DiscoverTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer>(TestPlatformConstants.TestAdapterEndsWithPattern);
-        }
+            { "a", new List<string> { "a", "aa" } },
+            { "b", new List<string> { "b", "ab" } }
+        };
 
-        [TestCleanup]
-        public void TestCleanup()
+        var executorUriVsSourceList = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>
         {
-            RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = null;
-            TestPluginCacheHelper.ResetExtensionsCache();
-        }
+            { new Tuple<Uri, string>(new Uri("e://d/"), "A.dll"), new List<string> { "s1.dll " } }
+        };
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            executorUriVsSourceList,
+            _mockRequestData.Object);
+
+        _runTestsInstance.CallBeforeRaisingTestRunComplete(false);
+
+        var messageFormat =
+            "No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
+        var message = string.Format(CultureInfo.CurrentCulture, messageFormat, "a aa b ab");
+        _mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, message),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void BeforeRaisingTestRunCompleteShouldWarnIfNoTestsAreRun()
+    [TestMethod]
+    public void GetExecutorUriExtensionMapShouldReturnEmptyOnInvalidSources()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> {"a", "aa"});
-            adapterSourceMap.Add("b", new List<string> { "b", "ab" });
-
-            var executorUriVsSourceList = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>();
-            executorUriVsSourceList.Add(new Tuple<Uri, string>(new Uri("e://d/"), "A.dll"), new List<string> {"s1.dll "});
-
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                executorUriVsSourceList,
-                this.mockRequestData.Object);
-
-            this.runTestsInstance.CallBeforeRaisingTestRunComplete(false);
-
-            var messageFormat =
-                "No test is available in {0}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
-            var message = string.Format(messageFormat, "a aa b ab");
-            this.mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, message),
-                Times.Once);
-        }
+            { "a", new List<string> { "a", "aa" } }
+        };
 
-        [TestMethod]
-        public void GetExecutorUriExtensionMapShouldReturnEmptyOnInvalidSources()
-        {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> { "a", "aa" });
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
 
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
+        var executorUris = _runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
 
-            var executorUris = this.runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
+        Assert.IsNotNull(executorUris);
+        Assert.AreEqual(0, executorUris.Count());
+    }
 
-            Assert.IsNotNull(executorUris);
-            Assert.AreEqual(0, executorUris.Count());
-        }
+    [TestMethod]
+    public void GetExecutorUriExtensionMapShouldReturnDefaultExecutorUrisForTheDiscoverersDefined()
+    {
+        var assemblyLocation = typeof(RunTestsWithSourcesTests).Assembly.Location;
 
-        [TestMethod]
-        public void GetExecutorUriExtensionMapShouldReturnDefaultExecutorUrisForTheDiscoverersDefined()
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var assemblyLocation = typeof (RunTestsWithSourcesTests).GetTypeInfo().Assembly.Location;
-
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> {"a", "aa"});
-            adapterSourceMap.Add(assemblyLocation, new List<string> {assemblyLocation});
-
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            var executorUris = this.runTestsInstance.CallGetExecutorUriExtensionMap(
-                new Mock<IFrameworkHandle>().Object, new RunContext());
-
-            Assert.IsNotNull(executorUris);
-            CollectionAssert.Contains(executorUris.ToArray(),
-                new Tuple<Uri, string>(new Uri("executor://RunTestWithSourcesDiscoverer"), assemblyLocation));
-        }
+            { "a", new List<string> { "a", "aa" } },
+            { assemblyLocation, new List<string> { assemblyLocation } }
+        };
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        var executorUris = _runTestsInstance.CallGetExecutorUriExtensionMap(
+            new Mock<IFrameworkHandle>().Object, new RunContext());
+
+        Assert.IsNotNull(executorUris);
+        CollectionAssert.Contains(executorUris.ToArray(),
+            new Tuple<Uri, string>(new Uri("executor://RunTestWithSourcesDiscoverer"), assemblyLocation));
+    }
 
-        [TestMethod]
-        public void InvokeExecutorShouldInvokeTestExecutorWithTheSources()
+    [TestMethod]
+    public void InvokeExecutorShouldInvokeTestExecutorWithTheSources()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> { "a", "aa" });
-            adapterSourceMap.Add("b", new List<string> { "b", "ab" });
-
-            var executorUriVsSourceList = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>();
-            var executorUriExtensionTuple = new Tuple<Uri, string>(new Uri("e://d/"), "A.dll");
-            executorUriVsSourceList.Add(executorUriExtensionTuple, new List<string> { "s1.dll " });
-
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                executorUriVsSourceList,
-                this.mockRequestData.Object);
-
-            var testExecutor = new RunTestWithSourcesExecutor();
-            var extension = new LazyExtension<ITestExecutor, ITestExecutorCapabilities>(testExecutor, new TestExecutorMetadata("e://d/"));
-            IEnumerable<string> receivedSources = null;
-            RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (sources, rc, fh) => { receivedSources = sources; };
-
-            this.runTestsInstance.CallInvokeExecutor(extension, executorUriExtensionTuple, null, null);
-
-            Assert.IsNotNull(receivedSources);
-            CollectionAssert.AreEqual(new List<string> {"s1.dll "}, receivedSources.ToList());
-        }
+            { "a", new List<string> { "a", "aa" } },
+            { "b", new List<string> { "b", "ab" } }
+        };
+
+        var executorUriVsSourceList = new Dictionary<Tuple<Uri, string>, IEnumerable<string>>();
+        var executorUriExtensionTuple = new Tuple<Uri, string>(new Uri("e://d/"), "A.dll");
+        executorUriVsSourceList.Add(executorUriExtensionTuple, new List<string> { "s1.dll " });
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            executorUriVsSourceList,
+            _mockRequestData.Object);
+
+        var testExecutor = new RunTestWithSourcesExecutor();
+        var extension = new LazyExtension<ITestExecutor, ITestExecutorCapabilities>(testExecutor, new TestExecutorMetadata("e://d/"));
+        IEnumerable<string>? receivedSources = null;
+        RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (sources, rc, fh) => receivedSources = sources;
+
+        _runTestsInstance.CallInvokeExecutor(extension, executorUriExtensionTuple, null, null);
+
+        Assert.IsNotNull(receivedSources);
+        CollectionAssert.AreEqual(new List<string> { "s1.dll " }, receivedSources.ToList());
+    }
 
-        [TestMethod]
-        public void RunTestsShouldRunTestsForTheSourcesSpecified()
-        {
-            var assemblyLocation = typeof(RunTestsWithSourcesTests).GetTypeInfo().Assembly.Location;
-
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> { "a", "aa" });
-            adapterSourceMap.Add(assemblyLocation, new List<string> { assemblyLocation });
-
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            bool isExecutorCalled = false;
-            RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (s, rc, fh) => { isExecutorCalled = true; };
-
-            this.runTestsInstance.RunTests();
-
-            Assert.IsTrue(isExecutorCalled);
-            this.mockTestRunEventsHandler.Verify(
-                treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()), Times.Once);
-        }
+    [TestMethod]
+    public void RunTestsShouldRunTestsForTheSourcesSpecified()
+    {
+        var assemblyLocation = typeof(RunTestsWithSourcesTests).Assembly.Location;
 
-        [TestMethod]
-        public void RunTestsShouldLogWarningOnNoTestsAvailableInAssembly()
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            string testCaseFilter = null;
-            this.SetupForNoTestsAvailable(testCaseFilter, out var sourcesString);
+            { "a", new List<string> { "a", "aa" } },
+            { assemblyLocation, new List<string> { assemblyLocation } }
+        };
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        bool isExecutorCalled = false;
+        RunTestWithSourcesExecutor.RunTestsWithSourcesCallback = (s, rc, fh) => isExecutorCalled = true;
+
+        _runTestsInstance.RunTests();
+
+        Assert.IsTrue(isExecutorCalled);
+        _mockTestRunEventsHandler.Verify(
+            treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()), Times.Once);
+    }
 
-            this.runTestsInstance.RunTests();
+    [TestMethod]
+    public void RunTestsShouldLogWarningOnNoTestsAvailableInAssembly()
+    {
+        string? testCaseFilter = null;
+        SetupForNoTestsAvailable(testCaseFilter, out var sourcesString);
 
-            var expectedMessage =
-                $"No test is available in {sourcesString}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
-            this.mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
-        }
+        _runTestsInstance.RunTests();
 
-        [TestMethod]
-        public void RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithTestCaseFilter()
-        {
-            var testCaseFilter = "Name~TestMethod1";
-            this.SetupForNoTestsAvailable(testCaseFilter, out var sourcesString);
+        var expectedMessage =
+            $"No test is available in {sourcesString}. Make sure that test discoverer & executors are registered and platform & framework version settings are appropriate and try again.";
+        _mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
+    }
 
-            this.runTestsInstance.RunTests();
+    [TestMethod]
+    public void RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithTestCaseFilter()
+    {
+        var testCaseFilter = "Name~TestMethod1";
+        SetupForNoTestsAvailable(testCaseFilter, out var sourcesString);
 
-            var expectedMessage =
-                $"No test matches the given testcase filter `{testCaseFilter}` in {sourcesString}";
-            this.mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
-        }
+        _runTestsInstance.RunTests();
 
-        [TestMethod]
-        public void RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithLongTestCaseFilter()
-        {
-            var veryLengthyTestCaseFilter = "FullyQualifiedName=TestPlatform.CrossPlatEngine" +
-                                 ".UnitTests.Execution.RunTestsWithSourcesTests." +
-                                 "RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithLongTestCaseFilter" +
-                                 "WithVeryLengthTestCaseNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-            this.SetupForNoTestsAvailable(veryLengthyTestCaseFilter, out var sourcesString);
+        var expectedMessage =
+            $"No test matches the given testcase filter `{testCaseFilter}` in {sourcesString}";
+        _mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
+    }
 
-            this.runTestsInstance.RunTests();
+    [TestMethod]
+    public void RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithLongTestCaseFilter()
+    {
+        var veryLengthyTestCaseFilter = "FullyQualifiedName=TestPlatform.CrossPlatEngine" +
+                                        ".UnitTests.Execution.RunTestsWithSourcesTests." +
+                                        "RunTestsShouldLogWarningOnNoTestsAvailableInAssemblyWithLongTestCaseFilter" +
+                                        "WithVeryLengthTestCaseNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+        SetupForNoTestsAvailable(veryLengthyTestCaseFilter, out var sourcesString);
 
-            var expectedTestCaseFilter = veryLengthyTestCaseFilter.Substring(0, 256)+ "...";
+        _runTestsInstance.RunTests();
 
-            var expectedMessage =
-                $"No test matches the given testcase filter `{expectedTestCaseFilter}` in {sourcesString}";
-            this.mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
-        }
+        var expectedTestCaseFilter = veryLengthyTestCaseFilter.Substring(0, 256) + "...";
+
+        var expectedMessage =
+            $"No test matches the given testcase filter `{expectedTestCaseFilter}` in {sourcesString}";
+        _mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Warning, expectedMessage), Times.Once);
+    }
 
-        [TestMethod]
-        public void SendSessionStartShouldCallSessionStartWithCorrectTestSources()
+    [TestMethod]
+    public void SendSessionStartShouldCallSessionStartWithCorrectTestSources()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> { "1.dll", "2.dll" });
-            var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
-
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                mockTestCaseEventsHandler.Object,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            this.runTestsInstance.CallSendSessionStart();
-
-            mockTestCaseEventsHandler.Verify(x => x.SendSessionStart(It.Is<IDictionary<String, object>>(
-                y => y.ContainsKey("TestSources") 
-                && ((IEnumerable<string>)y["TestSources"]).Contains("1.dll")
-                && ((IEnumerable<string>)y["TestSources"]).Contains("2.dll")
-            )));
-        }
+            { "a", new List<string> { "1.dll", "2.dll" } }
+        };
+        var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            mockTestCaseEventsHandler.Object,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        _runTestsInstance.CallSendSessionStart();
+
+        mockTestCaseEventsHandler.Verify(x => x.SendSessionStart(It.Is<IDictionary<string, object?>>(
+            y => y.ContainsKey("TestSources")
+                 && ((IEnumerable<string>)y["TestSources"]!).Contains("1.dll")
+                 && ((IEnumerable<string>)y["TestSources"]!).Contains("2.dll")
+        )));
+    }
 
-        [TestMethod]
-        public void SendSessionEndShouldCallSessionEnd()
+    [TestMethod]
+    public void SendSessionEndShouldCallSessionEnd()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>
         {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("a", new List<string> { "1.dll", "2.dll" });
-            var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+            { "a", new List<string> { "1.dll", "2.dll" } }
+        };
+        var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            mockTestCaseEventsHandler.Object,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        _runTestsInstance.CallSendSessionEnd();
+
+        mockTestCaseEventsHandler.Verify(x => x.SendSessionEnd());
+    }
+
+    [MemberNotNull(nameof(_runTestsInstance))]
+    private void SetupForNoTestsAvailable(string? testCaseFilter, out string sourcesString)
+    {
+        var testAssemblyLocation = typeof(TestCase).Assembly.Location;
+
+        var adapterAssemblyLocation = typeof(RunTestsWithSourcesTests).Assembly.Location;
+
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
 
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                mockTestCaseEventsHandler.Object,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
+        var sources = new[] { testAssemblyLocation, "a" };
+        sourcesString = string.Join(" ", sources);
 
-            this.runTestsInstance.CallSendSessionEnd();
+        adapterSourceMap.Add(adapterAssemblyLocation, sources);
 
-            mockTestCaseEventsHandler.Verify(x => x.SendSessionEnd());
+        _testExecutionContext.TestCaseFilter = testCaseFilter;
+
+        _runTestsInstance = new TestableRunTestsWithSources(
+            adapterSourceMap,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+    }
+
+    #region Testable Implementations
+
+    private class TestableRunTestsWithSources : RunTestsWithSources
+    {
+        public TestableRunTestsWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string? runSettings,
+            TestExecutionContext testExecutionContext, ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler,
+            IRequestData requestData)
+            : base(requestData, adapterSourceMap, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler)
+        {
         }
 
-        private void SetupForNoTestsAvailable(string testCaseFilter, out string sourcesString)
+        internal TestableRunTestsWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string? runSettings,
+            TestExecutionContext testExecutionContext,
+            ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>,
+            IEnumerable<string>> executorUriVsSourceList, IRequestData requestData)
+            : base(requestData, adapterSourceMap, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler,
+                  executorUriVsSourceList)
         {
-            var testAssemblyLocation = typeof(TestCase).GetTypeInfo().Assembly.Location;
+        }
 
-            var adapterAssemblyLocation = typeof(RunTestsWithSourcesTests).GetTypeInfo().Assembly.Location;
+        public void CallBeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
+        {
+            BeforeRaisingTestRunComplete(exceptionsHitDuringRunTests);
+        }
 
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
+        public IEnumerable<Tuple<Uri, string>> CallGetExecutorUriExtensionMap(
+            IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
+        {
+            return GetExecutorUriExtensionMap(testExecutorFrameworkHandle, runContext);
+        }
 
-            var sources = new[] {testAssemblyLocation, "a"};
-            sourcesString = string.Join(" ", sources);
+        public void CallSendSessionStart()
+        {
+            SendSessionStart();
+        }
 
-            adapterSourceMap.Add(adapterAssemblyLocation, sources);
+        public void CallSendSessionEnd()
+        {
+            SendSessionEnd();
+        }
 
-            this.testExecutionContext.TestCaseFilter = testCaseFilter;
+        public void CallInvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+            Tuple<Uri, string> executorUriExtensionTuple, RunContext? runContext, IFrameworkHandle? frameworkHandle)
+        {
+            InvokeExecutor(executor, executorUriExtensionTuple, runContext, frameworkHandle);
+        }
+    }
 
-            this.runTestsInstance = new TestableRunTestsWithSources(
-                adapterSourceMap,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
+    [FileExtension(".dll")]
+    [FileExtension(".exe")]
+    [DefaultExecutorUri(RunTestsWithSourcesTestsExecutorUri)]
+    private class RunTestWithSourcesDiscoverer : ITestDiscoverer
+    {
+        public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger,
+            ITestCaseDiscoverySink discoverySink)
+        {
+            throw new NotImplementedException();
         }
+    }
 
-        #region Testable Implementations
+    [ExtensionUri(RunTestsWithSourcesTestsExecutorUri)]
+    internal class RunTestWithSourcesExecutor : ITestExecutor
+    {
+        public static Action<IEnumerable<string>?, IRunContext?, IFrameworkHandle?>? RunTestsWithSourcesCallback { get; set; }
+        public static Action<IEnumerable<TestCase>?, IRunContext?, IFrameworkHandle?>? RunTestsWithTestsCallback { get; set; }
 
-        private class TestableRunTestsWithSources : RunTestsWithSources
+        public void Cancel()
         {
-            public TestableRunTestsWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string runSettings,
-                TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler, IRequestData requestData)
-                : base(requestData, adapterSourceMap, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler)
-            {
-            }
-
-            internal TestableRunTestsWithSources(Dictionary<string, IEnumerable<string>> adapterSourceMap, string runSettings,
-                TestExecutionContext testExecutionContext,
-                ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, IEnumerable<string>> executorUriVsSourceList, IRequestData requestData)
-                : base(requestData, adapterSourceMap, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler, executorUriVsSourceList)
-            {
-            }
-
-            public void CallBeforeRaisingTestRunComplete(bool exceptionsHitDuringRunTests)
-            {
-                this.BeforeRaisingTestRunComplete(exceptionsHitDuringRunTests);
-            }
-
-            public IEnumerable<Tuple<Uri, string>> CallGetExecutorUriExtensionMap(
-                IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
-            {
-                return this.GetExecutorUriExtensionMap(testExecutorFrameworkHandle, runContext);
-            }
-
-            public void CallSendSessionStart()
-            {
-                this.SendSessionStart();
-            }
-
-            public void CallSendSessionEnd()
-            {
-                this.SendSessionEnd();
-            }
-
-            public void CallInvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-                Tuple<Uri, string> executorUriExtensionTuple, RunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                this.InvokeExecutor(executor, executorUriExtensionTuple, runContext, frameworkHandle);
-            }
+            throw new NotImplementedException();
         }
 
-        [FileExtension(".dll")]
-        [DefaultExecutorUri(RunTestsWithSourcesTestsExecutorUri)]
-        private class RunTestWithSourcesDiscoverer : ITestDiscoverer
+        public void RunTests(IEnumerable<string>? sources, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext, IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
-            {
-                throw new NotImplementedException();
-            }
+            RunTestsWithSourcesCallback?.Invoke(sources, runContext, frameworkHandle);
         }
 
-        [ExtensionUri(RunTestsWithSourcesTestsExecutorUri)]
-        internal class RunTestWithSourcesExecutor : ITestExecutor
+        public void RunTests(IEnumerable<TestCase>? tests, IRunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            public static Action<IEnumerable<string>, IRunContext, IFrameworkHandle> RunTestsWithSourcesCallback { get; set; }
-            public static Action<IEnumerable<TestCase>, IRunContext, IFrameworkHandle> RunTestsWithTestsCallback { get; set; }
-
-            public void Cancel()
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                RunTestsWithSourcesCallback?.Invoke(sources, runContext, frameworkHandle);
-            }
-
-            public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                RunTestsWithTestsCallback?.Invoke(tests, runContext, frameworkHandle);
-            }
+            RunTestsWithTestsCallback?.Invoke(tests, runContext, frameworkHandle);
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithTestsTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithTestsTests.cs
index c8cf6f182b..8051ca2965 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithTestsTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/RunTestsWithTestsTests.cs
@@ -1,242 +1,236 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Execution;
+
+[TestClass]
+public class RunTestsWithTestsTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.ClientProtocol;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
-
-    [TestClass]
-    public class RunTestsWithTestsTests
+    private readonly TestExecutionContext _testExecutionContext;
+    private readonly Mock<IInternalTestRunEventsHandler> _mockTestRunEventsHandler;
+    private TestableRunTestsWithTests? _runTestsInstance;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+
+    public RunTestsWithTestsTests()
     {
-        private TestableTestRunCache testableTestRunCache;
-        private TestExecutionContext testExecutionContext;
-        private Mock<ITestRunEventsHandler> mockTestRunEventsHandler;
-        private TestableRunTestsWithTests runTestsInstance;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _testExecutionContext = new TestExecutionContext(
+            frequencyOfRunStatsChangeEvent: 100,
+            runStatsChangeEventTimeout: TimeSpan.MaxValue,
+            inIsolation: false,
+            keepAlive: false,
+            isDataCollectionEnabled: false,
+            areTestCaseLevelEventsRequired: false,
+            hasTestRun: false,
+            isDebug: false,
+            testCaseFilter: null,
+            filterOptions: null);
+        _mockTestRunEventsHandler = new Mock<IInternalTestRunEventsHandler>();
+    }
+
+    [TestMethod]
+    public void GetExecutorUriExtensionMapShouldReturnExecutorUrisMapForTestCasesWithSameExecutorUri()
+    {
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri("e://d"), "s.dll"),
+            new("A.C.M2", new Uri("e://d"), "s.dll")
+        };
 
-        private const string RunTestsWithSourcesTestsExecutorUri = "executor://RunTestWithSourcesDiscoverer/";
+        _runTestsInstance = new TestableRunTestsWithTests(
+            tests,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
 
-        [TestInitialize]
-        public void TestInit()
+        var map = _runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
+
+        var expectedMap = new List<Tuple<Uri, string>>
         {
-            this.testableTestRunCache = new TestableTestRunCache();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.testExecutionContext = new TestExecutionContext(
-                                frequencyOfRunStatsChangeEvent: 100,
-                                runStatsChangeEventTimeout: TimeSpan.MaxValue,
-                                inIsolation: false,
-                                keepAlive: false,
-                                isDataCollectionEnabled: false,
-                                areTestCaseLevelEventsRequired: false,
-                                hasTestRun: false,
-                                isDebug: false,
-                                testCaseFilter: null,
-                                filterOptions: null);
-            this.mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-        }
+            new(new Uri("e://d"),
+                Constants.UnspecifiedAdapterPath)
+        };
+
+        CollectionAssert.AreEqual(expectedMap, map.ToList());
+    }
+
+    [TestMethod]
+    public void GetExecutorUriExtensionMapShouldReturnExecutorUrisMapForTestCasesWithDifferentExecutorUri()
+    {
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri("e://d"), "s.dll"),
+            new("A.C.M2", new Uri("e://d2"), "s.dll")
+        };
+
+        _runTestsInstance = new TestableRunTestsWithTests(
+            tests,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
 
-        [TestMethod]
-        public void GetExecutorUriExtensionMapShouldReturnExecutorUrisMapForTestCasesWithSameExecutorUri()
+        var map = _runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
+
+        var expectedMap = new List<Tuple<Uri, string>>
         {
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri("e://d"), "s.dll"),
-                new TestCase("A.C.M2", new Uri("e://d"), "s.dll")
-            };
-
-            this.runTestsInstance = new TestableRunTestsWithTests(
-                tests,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            var map = this.runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
-
-            var expectedMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri("e://d"),
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath)
-            };
-
-            CollectionAssert.AreEqual(expectedMap, map.ToList());
-        }
+            new(new Uri("e://d"),
+                Constants.UnspecifiedAdapterPath),
+            new(new Uri("e://d2"),
+                Constants.UnspecifiedAdapterPath)
+        };
 
-        [TestMethod]
-        public void GetExecutorUriExtensionMapShouldReturnExecutorUrisMapForTestCasesWithDifferentExecutorUri()
+        CollectionAssert.AreEqual(expectedMap, map.ToList());
+    }
+
+    [TestMethod]
+    public void InvokeExecutorShouldInvokeTestExecutorWithTheTests()
+    {
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri("e://d"), "s.dll")
+        };
+
+        var executorUriVsTestList = new Dictionary<Tuple<Uri, string>, List<TestCase>>();
+        var executorUriExtensionTuple = new Tuple<Uri, string>(new Uri("e://d/"), "A.dll");
+        executorUriVsTestList.Add(executorUriExtensionTuple, tests);
+
+        _runTestsInstance = new TestableRunTestsWithTests(
+            tests,
+            null,
+            _testExecutionContext,
+            null,
+            _mockTestRunEventsHandler.Object,
+            executorUriVsTestList,
+            _mockRequestData.Object);
+
+        var testExecutor = new RunTestsWithSourcesTests.RunTestWithSourcesExecutor();
+        var extension = new LazyExtension<ITestExecutor, ITestExecutorCapabilities>(testExecutor, new TestExecutorMetadata("e://d/"));
+        IEnumerable<TestCase>? receivedTests = null;
+        RunTestsWithSourcesTests.RunTestWithSourcesExecutor.RunTestsWithTestsCallback = (t, rc, fh) => receivedTests = t;
+
+        _runTestsInstance.CallInvokeExecutor(extension, executorUriExtensionTuple, null, null);
+
+        Assert.IsNotNull(receivedTests);
+        CollectionAssert.AreEqual(tests, receivedTests.ToList());
+    }
+
+    [TestMethod]
+    public void SendSessionStartShouldCallSessionStartWithCorrectTestSources()
+    {
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri("e://d"), "s.dll")
+        };
+        var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+
+        _runTestsInstance = new TestableRunTestsWithTests(
+            tests,
+            null,
+            _testExecutionContext,
+            mockTestCaseEventsHandler.Object,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        _runTestsInstance.CallSendSessionStart();
+
+        mockTestCaseEventsHandler.Verify(x => x.SendSessionStart(It.Is<IDictionary<string, object?>>(
+            y => y.ContainsKey("TestSources")
+                 && ((IEnumerable<string>)y["TestSources"]!).Contains("s.dll")
+        )));
+    }
+
+    [TestMethod]
+    public void SendSessionEndShouldCallSessionEnd()
+    {
+        var tests = new List<TestCase>
+        {
+            new("A.C.M1", new Uri("e://d"), "s.dll")
+        };
+        var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
+
+        _runTestsInstance = new TestableRunTestsWithTests(
+            tests,
+            null,
+            _testExecutionContext,
+            mockTestCaseEventsHandler.Object,
+            _mockTestRunEventsHandler.Object,
+            _mockRequestData.Object);
+
+        _runTestsInstance.CallSendSessionEnd();
+
+        mockTestCaseEventsHandler.Verify(x => x.SendSessionEnd());
+    }
+
+    #region Testable Implementations
+
+    private class TestableRunTestsWithTests : RunTestsWithTests
+    {
+        public TestableRunTestsWithTests(IEnumerable<TestCase> testCases,
+            string? runSettings, TestExecutionContext testExecutionContext,
+            ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler,
+            IRequestData requestData)
+            : base(requestData, testCases, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler)
         {
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri("e://d"), "s.dll"),
-                new TestCase("A.C.M2", new Uri("e://d2"), "s.dll")
-            };
-
-            this.runTestsInstance = new TestableRunTestsWithTests(
-                tests,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            var map = this.runTestsInstance.CallGetExecutorUriExtensionMap(new Mock<IFrameworkHandle>().Object, new RunContext());
-
-            var expectedMap = new List<Tuple<Uri, string>>
-            {
-                new Tuple<Uri, string>(new Uri("e://d"),
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath),
-                new Tuple<Uri, string>(new Uri("e://d2"),
-                    Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants.UnspecifiedAdapterPath)
-            };
-
-            CollectionAssert.AreEqual(expectedMap, map.ToList());
         }
 
-        [TestMethod]
-        public void InvokeExecutorShouldInvokeTestExecutorWithTheTests()
+
+        internal TestableRunTestsWithTests(IEnumerable<TestCase> testCases, string? runSettings, TestExecutionContext testExecutionContext,
+            ITestCaseEventsHandler? testCaseEventsHandler, IInternalTestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>,
+                List<TestCase>> executorUriVsTestList, IRequestData requestData)
+            : base(
+                requestData, testCases, null, runSettings, testExecutionContext,
+                testCaseEventsHandler, testRunEventsHandler, executorUriVsTestList)
         {
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri("e://d"), "s.dll")
-            };
-
-            var executorUriVsTestList = new Dictionary<Tuple<Uri, string>, List<TestCase>>();
-            var executorUriExtensionTuple = new Tuple<Uri, string>(new Uri("e://d/"), "A.dll");
-            executorUriVsTestList.Add(executorUriExtensionTuple, tests);
-
-            this.runTestsInstance = new TestableRunTestsWithTests(
-                tests,
-                null,
-                testExecutionContext,
-                null,
-                this.mockTestRunEventsHandler.Object,
-                executorUriVsTestList,
-                this.mockRequestData.Object);
-
-            var testExecutor = new RunTestsWithSourcesTests.RunTestWithSourcesExecutor();
-            var extension = new LazyExtension<ITestExecutor, ITestExecutorCapabilities>(testExecutor, new TestExecutorMetadata("e://d/"));
-            IEnumerable<TestCase> receivedTests = null;
-            RunTestsWithSourcesTests.RunTestWithSourcesExecutor.RunTestsWithTestsCallback = (t, rc, fh) => { receivedTests = t; };
-
-            this.runTestsInstance.CallInvokeExecutor(extension, executorUriExtensionTuple, null, null);
-
-            Assert.IsNotNull(receivedTests);
-            CollectionAssert.AreEqual(tests, receivedTests.ToList());
         }
 
-        [TestMethod]
-        public void SendSessionStartShouldCallSessionStartWithCorrectTestSources()
+        public IEnumerable<Tuple<Uri, string>> CallGetExecutorUriExtensionMap(
+            IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
         {
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri("e://d"), "s.dll")
-            };
-            var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
-
-            this.runTestsInstance = new TestableRunTestsWithTests(
-                tests,
-                null,
-                testExecutionContext,
-                mockTestCaseEventsHandler.Object,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            this.runTestsInstance.CallSendSessionStart();
-
-            mockTestCaseEventsHandler.Verify(x => x.SendSessionStart(It.Is<IDictionary<String, object>>(
-                y => y.ContainsKey("TestSources")
-                && ((IEnumerable<string>)y["TestSources"]).Contains("s.dll")
-            )));
+            return GetExecutorUriExtensionMap(testExecutorFrameworkHandle, runContext);
         }
 
-        [TestMethod]
-        public void SendSessionEndShouldCallSessionEnd()
+        public void CallInvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
+            Tuple<Uri, string> executorUriExtensionTuple, RunContext? runContext, IFrameworkHandle? frameworkHandle)
         {
-            var tests = new List<TestCase>
-            {
-                new TestCase("A.C.M1", new Uri("e://d"), "s.dll")
-            };
-            var mockTestCaseEventsHandler = new Mock<ITestCaseEventsHandler>();
-
-            this.runTestsInstance = new TestableRunTestsWithTests(
-                tests,
-                null,
-                testExecutionContext,
-                mockTestCaseEventsHandler.Object,
-                this.mockTestRunEventsHandler.Object,
-                this.mockRequestData.Object);
-
-            this.runTestsInstance.CallSendSessionEnd();
-
-            mockTestCaseEventsHandler.Verify(x => x.SendSessionEnd());
+            InvokeExecutor(executor, executorUriExtensionTuple, runContext, frameworkHandle);
         }
 
-        #region Testable Implementations
+        public void CallSendSessionStart()
+        {
+            SendSessionStart();
+        }
 
-        private class TestableRunTestsWithTests : RunTestsWithTests
+        public void CallSendSessionEnd()
         {
-            public TestableRunTestsWithTests(IEnumerable<TestCase> testCases,
-                string runSettings, TestExecutionContext testExecutionContext,
-                ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler,
-                IRequestData requestData)
-                : base(requestData, testCases, null, runSettings, testExecutionContext, testCaseEventsHandler, testRunEventsHandler)
-            {
-            }
-
-
-            internal TestableRunTestsWithTests(IEnumerable<TestCase> testCases, string runSettings, TestExecutionContext testExecutionContext, ITestCaseEventsHandler testCaseEventsHandler, ITestRunEventsHandler testRunEventsHandler, Dictionary<Tuple<Uri, string>, List<TestCase>> executorUriVsTestList, IRequestData requestData)
-                : base(
-requestData, testCases, null, runSettings, testExecutionContext,
-                    testCaseEventsHandler, testRunEventsHandler, executorUriVsTestList)
-            {
-            }
-
-            public IEnumerable<Tuple<Uri, string>> CallGetExecutorUriExtensionMap(
-                IFrameworkHandle testExecutorFrameworkHandle, RunContext runContext)
-            {
-                return this.GetExecutorUriExtensionMap(testExecutorFrameworkHandle, runContext);
-            }
-
-            public void CallInvokeExecutor(LazyExtension<ITestExecutor, ITestExecutorCapabilities> executor,
-                Tuple<Uri, string> executorUriExtensionTuple, RunContext runContext, IFrameworkHandle frameworkHandle)
-            {
-                this.InvokeExecutor(executor, executorUriExtensionTuple, runContext, frameworkHandle);
-            }
-
-            public void CallSendSessionStart()
-            {
-                this.SendSessionStart();
-            }
-
-            public void CallSendSessionEnd()
-            {
-                this.SendSessionEnd();
-            }
+            SendSessionEnd();
         }
+    }
 
-        #endregion
+    #endregion
 
-    }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/TestRunCacheTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/TestRunCacheTests.cs
index 19938f825b..4292a53b3d 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/TestRunCacheTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/TestRunCacheTests.cs
@@ -1,408 +1,401 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Execution;
+
+[TestClass]
+public class TestRunCacheBehaviors
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    [TestClass]
-    public class TestRunCacheBehaviors
+    #region OnTestStarted tests
+
+    [TestMethod]
+    public void OnTestStartedShouldAddToInProgressTests()
     {
-        #region OnTestStarted tests
+        var tester = new TestCacheTester { ExpectedCacheSize = int.MaxValue };
 
-        [TestMethod]
-        public void OnTestStartedShouldAddToInProgressTests()
-        {
-            var tester = new TestCacheTester { ExpectedCacheSize = int.MaxValue };
+        var cache = new TestRunCache(int.MaxValue, TimeSpan.MaxValue, tester.CacheHitOnSize);
 
-            var cache = new TestRunCache(int.MaxValue, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        var tr = GetTestResult(0);
+        cache.OnTestStarted(tr.TestCase);
 
-            var tr = this.GetTestResult(0);
-            cache.OnTestStarted(tr.TestCase);
+        CollectionAssert.Contains(cache.InProgressTests.ToList(), tr.TestCase);
+    }
 
-            CollectionAssert.Contains(cache.InProgressTests.ToList(), tr.TestCase);
-        }
+    [TestMethod]
+    public void OnTestStartedShouldAddMultipleInProgressTestsTillCacheHit()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-        [TestMethod]
-        public void OnTestStartedShouldAddMultipleInProgressTestsTillCacheHit()
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < (cacheSize - 1); i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < (cacheSize - 1); i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnTestStarted(tr.TestCase);
+            var tr = GetTestResult(i);
+            cache.OnTestStarted(tr.TestCase);
 
-                Assert.AreEqual(i, cache.InProgressTests.Count - 1);
-            }
+            Assert.AreEqual(i, cache.InProgressTests.Count - 1);
         }
+    }
 
-        //[TestMethod]
-        //public void OnTestStartedShouldReportInProgressTestsForLongRunningUnitTest()
-        //{
-        //    var cacheTimeout = new TimeSpan(0, 0, 0, 3, 0);
-        //    var tester = new TestCacheTester { ExpectedCacheSize = int.MaxValue };
+    //[TestMethod]
+    //public void OnTestStartedShouldReportInProgressTestsForLongRunningUnitTest()
+    //{
+    //    var cacheTimeout = new TimeSpan(0, 0, 0, 3, 0);
+    //    var tester = new TestCacheTester { ExpectedCacheSize = int.MaxValue };
 
-        //    var cache = new TestRunCache(int.MaxValue, cacheTimeout, tester.CacheHitOnTimerLimit);
+    //    var cache = new TestRunCache(int.MaxValue, cacheTimeout, tester.CacheHitOnTimerLimit);
 
-        //    var tr = this.GetTestResult(0);
-        //    cache.OnTestStarted(tr.TestCase);
+    //    var tr = this.GetTestResult(0);
+    //    cache.OnTestStarted(tr.TestCase);
 
-        //    Assert.AreEqual(0, tester.TotalInProgressTestsReceived);
+    //    Assert.AreEqual(0, tester.TotalInProgressTestsReceived);
 
-        //    Assert.AreEqual(1, tester.TotalInProgressTestsReceived);
-        //}
+    //    Assert.AreEqual(1, tester.TotalInProgressTestsReceived);
+    //}
 
-        [TestMethod]
-        public void OnTestStartedShouldReportResultsOnCacheHit()
+    [TestMethod]
+    public void OnTestStartedShouldReportResultsOnCacheHit()
+    {
+        long cacheSize = 2;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < cacheSize; i++)
         {
-            long cacheSize = 2;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < cacheSize; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnTestStarted(tr.TestCase);
-            }
-
-            Assert.AreEqual(1, tester.CacheHitCount);
-            Assert.AreEqual(0, cache.TotalExecutedTests);
-            Assert.AreEqual(0, cache.TestResults.Count);
-            Assert.AreEqual(0, cache.InProgressTests.Count);
-            Assert.AreEqual(2, tester.TotalInProgressTestsReceived);
+            var tr = GetTestResult(i);
+            cache.OnTestStarted(tr.TestCase);
         }
 
-        #endregion
+        Assert.AreEqual(1, tester.CacheHitCount);
+        Assert.AreEqual(0, cache.TotalExecutedTests);
+        Assert.AreEqual(0, cache.TestResults.Count);
+        Assert.AreEqual(0, cache.InProgressTests.Count);
+        Assert.AreEqual(2, tester.TotalInProgressTestsReceived);
+    }
 
-        #region OnNewTestResult tests
+    #endregion
 
-        [TestMethod]
-        public void OnNewTestResultShouldAddToTotalExecutedTests()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+    #region OnNewTestResult tests
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-            }
+    [TestMethod]
+    public void OnNewTestResultShouldAddToTotalExecutedTests()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            Assert.AreEqual(2, cache.TotalExecutedTests);
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < 2; i++)
+        {
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
         }
 
-        [TestMethod]
-        public void OnNewTestResultShouldAddToTestResultCache()
+        Assert.AreEqual(2, cache.TotalExecutedTests);
+    }
+
+    [TestMethod]
+    public void OnNewTestResultShouldAddToTestResultCache()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < 2; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-                CollectionAssert.Contains(cache.TestResults.ToList(), tr);
-            }
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
+            CollectionAssert.Contains(cache.TestResults.ToList(), tr);
         }
+    }
+
+    [TestMethod]
+    public void OnNewTestResultShouldUpdateRunStats()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-        [TestMethod]
-        public void OnNewTestResultShouldUpdateRunStats()
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < 2; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                tr.Outcome = TestOutcome.Passed;
-                cache.OnNewTestResult(tr);
-            }
-
-            Assert.AreEqual(2, cache.TestRunStatistics.ExecutedTests);
-            Assert.AreEqual(2, cache.TestRunStatistics.Stats[TestOutcome.Passed]);
+            var tr = GetTestResult(i);
+            tr.Outcome = TestOutcome.Passed;
+            cache.OnNewTestResult(tr);
         }
 
-        [TestMethod]
-        public void OnNewTestResultShouldRemoveTestCaseFromInProgressList()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+        Assert.AreEqual(2, cache.TestRunStatistics.ExecutedTests);
+        Assert.AreEqual(2, cache.TestRunStatistics.Stats![TestOutcome.Passed]);
+    }
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnTestStarted(tr.TestCase);
-                cache.OnNewTestResult(tr);
-            }
+    [TestMethod]
+    public void OnNewTestResultShouldRemoveTestCaseFromInProgressList()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            Assert.AreEqual(0, cache.InProgressTests.Count);
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < 2; i++)
+        {
+            var tr = GetTestResult(i);
+            cache.OnTestStarted(tr.TestCase);
+            cache.OnNewTestResult(tr);
         }
 
-        [TestMethod]
-        public void OnNewTestResultShouldReportTestResultsWhenMaxCacheSizeIsHit()
+        Assert.AreEqual(0, cache.InProgressTests.Count);
+    }
+
+    [TestMethod]
+    public void OnNewTestResultShouldReportTestResultsWhenMaxCacheSizeIsHit()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < cacheSize; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < cacheSize; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-            }
-
-            Assert.AreEqual(1, tester.CacheHitCount);
-            Assert.AreEqual(cacheSize, cache.TotalExecutedTests);
-            Assert.AreEqual(0, cache.TestResults.Count);
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
         }
 
-        [TestMethod]
-        public void OnNewTestResultShouldNotFireIfMaxCacheSizeIsNotHit()
+        Assert.AreEqual(1, tester.CacheHitCount);
+        Assert.AreEqual(cacheSize, cache.TotalExecutedTests);
+        Assert.AreEqual(0, cache.TestResults.Count);
+    }
+
+    [TestMethod]
+    public void OnNewTestResultShouldNotFireIfMaxCacheSizeIsNotHit()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        var executedTests = cacheSize - 1;
+        for (var i = 0; i < executedTests; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            var executedTests = cacheSize - 1;
-            for (var i = 0; i < executedTests; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-            }
-
-            Assert.AreEqual(0, tester.CacheHitCount);
-            Assert.AreEqual(executedTests, cache.TotalExecutedTests);
-            Assert.AreEqual(executedTests, cache.TestResults.Count);
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
         }
 
-        [TestMethod]
-        public void OnNewTestResultShouldReportResultsMultipleTimes()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+        Assert.AreEqual(0, tester.CacheHitCount);
+        Assert.AreEqual(executedTests, cache.TotalExecutedTests);
+        Assert.AreEqual(executedTests, cache.TestResults.Count);
+    }
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            long executedTests = 45;
+    [TestMethod]
+    public void OnNewTestResultShouldReportResultsMultipleTimes()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            for (var i = 0; i < executedTests; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-            }
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        long executedTests = 45;
 
-            Assert.AreEqual(4, tester.CacheHitCount);
-            Assert.AreEqual(executedTests, cache.TotalExecutedTests);
-            Assert.AreEqual(5, cache.TestResults.Count);
+        for (var i = 0; i < executedTests; i++)
+        {
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
         }
 
-        #endregion
+        Assert.AreEqual(4, tester.CacheHitCount);
+        Assert.AreEqual(executedTests, cache.TotalExecutedTests);
+        Assert.AreEqual(5, cache.TestResults.Count);
+    }
 
-        #region OnTestCompletion tests
+    #endregion
 
-        [TestMethod]
-        public void OnTestCompletionShouldNotThrowIfCompletedTestIsNull()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+    #region OnTestCompletion tests
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+    [TestMethod]
+    public void OnTestCompletionShouldNotThrowIfCompletedTestIsNull()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            Assert.IsFalse(cache.OnTestCompletion(null));
-        }
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
 
-        [TestMethod]
-        public void OnTestCompletionShouldReturnFalseIfInProgressTestsIsEmpty()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+        Assert.IsFalse(cache.OnTestCompletion(null));
+    }
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+    [TestMethod]
+    public void OnTestCompletionShouldReturnFalseIfInProgressTestsIsEmpty()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            Assert.IsFalse(cache.OnTestCompletion(this.GetTestResult(0).TestCase));
-        }
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+
+        Assert.IsFalse(cache.OnTestCompletion(GetTestResult(0).TestCase));
+    }
+
+    [TestMethod]
+    public void OnTestCompletionShouldUpdateInProgressList()
+    {
+        long cacheSize = 2;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-        [TestMethod]
-        public void OnTestCompletionShouldUpdateInProgressList()
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (int i = 0; i < cacheSize; i++)
         {
-            long cacheSize = 2;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (int i = 0; i < cacheSize; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnTestStarted(tr.TestCase);
-                Assert.IsTrue(cache.OnTestCompletion(tr.TestCase));
-
-                Assert.AreEqual(0, cache.InProgressTests.Count);
-            }
+            var tr = GetTestResult(i);
+            cache.OnTestStarted(tr.TestCase);
+            Assert.IsTrue(cache.OnTestCompletion(tr.TestCase));
+
+            Assert.AreEqual(0, cache.InProgressTests.Count);
         }
+    }
 
-        [TestMethod]
-        public void OnTestCompletionShouldUpdateInProgressListWhenTestHasSameId()
-        {
-            long cacheSize = 2;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+    [TestMethod]
+    public void OnTestCompletionShouldUpdateInProgressListWhenTestHasSameId()
+    {
+        long cacheSize = 2;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            for (var i = 0; i < cacheSize; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnTestStarted(tr.TestCase);
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        for (var i = 0; i < cacheSize; i++)
+        {
+            var tr = GetTestResult(i);
+            cache.OnTestStarted(tr.TestCase);
 
-                var clone = new TestCase(
-                    tr.TestCase.FullyQualifiedName,
-                    tr.TestCase.ExecutorUri,
-                    tr.TestCase.Source);
-                clone.Id = tr.TestCase.Id;
+            var clone = new TestCase(
+                tr.TestCase.FullyQualifiedName,
+                tr.TestCase.ExecutorUri,
+                tr.TestCase.Source);
+            clone.Id = tr.TestCase.Id;
 
-                Assert.IsTrue(cache.OnTestCompletion(clone));
+            Assert.IsTrue(cache.OnTestCompletion(clone));
 
-                Assert.AreEqual(0, cache.InProgressTests.Count);
-            }
+            Assert.AreEqual(0, cache.InProgressTests.Count);
         }
+    }
 
-        [TestMethod]
-        public void OnTestCompleteShouldNotRemoveTestCaseFromInProgressListForUnrelatedTestResult()
-        {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+    [TestMethod]
+    public void OnTestCompleteShouldNotRemoveTestCaseFromInProgressListForUnrelatedTestResult()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
 
-            var tr1 = this.GetTestResult(0);
-            cache.OnTestStarted(tr1.TestCase);
+        var tr1 = GetTestResult(0);
+        cache.OnTestStarted(tr1.TestCase);
 
-            var tr2 = this.GetTestResult(1);
-            Assert.IsFalse(cache.OnTestCompletion(tr2.TestCase));
+        var tr2 = GetTestResult(1);
+        Assert.IsFalse(cache.OnTestCompletion(tr2.TestCase));
 
-            Assert.AreEqual(1, cache.InProgressTests.Count);
-        }
+        Assert.AreEqual(1, cache.InProgressTests.Count);
+    }
 
-        #endregion
+    #endregion
 
-        #region GetLastChunk tests
+    #region GetLastChunk tests
 
-        [TestMethod]
-        public void GetLastChunkShouldReturnTestResultsInCache()
+    [TestMethod]
+    public void GetLastChunkShouldReturnTestResultsInCache()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        List<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> pushedTestResults = new();
+
+        for (var i = 0; i < 2; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
+            pushedTestResults.Add(tr);
+        }
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-            List<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> pushedTestResults = new List<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult>();
+        var testResultsInCache = cache.GetLastChunk();
+        CollectionAssert.AreEqual(pushedTestResults, testResultsInCache.ToList());
+    }
 
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-                pushedTestResults.Add(tr);
-            }
+    [TestMethod]
+    public void GetLastChunkShouldResetTestResultsInCache()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-            var testResultsInCache = cache.GetLastChunk();
-            CollectionAssert.AreEqual(pushedTestResults, testResultsInCache.ToList());
-        }
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
 
-        [TestMethod]
-        public void GetLastChunkShouldResetTestResultsInCache()
+        for (var i = 0; i < 2; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
+            var tr = GetTestResult(i);
+            cache.OnNewTestResult(tr);
+        }
 
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
+        cache.GetLastChunk();
+        Assert.AreEqual(0, cache.TestResults.Count);
+    }
 
-            for (var i = 0; i < 2; i++)
-            {
-                var tr = this.GetTestResult(i);
-                cache.OnNewTestResult(tr);
-            }
+    #endregion
 
-            cache.GetLastChunk();
-            Assert.AreEqual(0, cache.TestResults.Count);
-        }
+    #region TestRunStasts tests
 
-        #endregion
+    [TestMethod]
+    public void TestRunStatsShouldReturnCurrentStats()
+    {
+        long cacheSize = 10;
+        var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
 
-        #region TestRunStasts tests
+        var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
 
-        [TestMethod]
-        public void TestRunStatsShouldReturnCurrentStats()
+        for (var i = 0; i < cacheSize; i++)
         {
-            long cacheSize = 10;
-            var tester = new TestCacheTester { ExpectedCacheSize = cacheSize };
-
-            var cache = new TestRunCache(cacheSize, TimeSpan.MaxValue, tester.CacheHitOnSize);
-
-            for (var i = 0; i < cacheSize; i++)
-            {
-                var tr = this.GetTestResult(i);
-                if (i < 5)
-                {
-                    tr.Outcome = TestOutcome.Passed;
-                }
-                else
-                {
-                    tr.Outcome = TestOutcome.Failed;
-                }
-
-                cache.OnNewTestResult(tr);
-            }
-
-            var stats = cache.TestRunStatistics;
-
-            Assert.AreEqual(cacheSize, stats.ExecutedTests);
-            Assert.AreEqual(5, stats.Stats[TestOutcome.Passed]);
-            Assert.AreEqual(5, stats.Stats[TestOutcome.Failed]);
+            var tr = GetTestResult(i);
+            tr.Outcome = i < 5 ? TestOutcome.Passed : TestOutcome.Failed;
+
+            cache.OnNewTestResult(tr);
         }
 
-        #endregion
+        var stats = cache.TestRunStatistics;
 
-        #region Helpers
+        Assert.AreEqual(cacheSize, stats.ExecutedTests);
+        Assert.AreEqual(5, stats.Stats![TestOutcome.Passed]);
+        Assert.AreEqual(5, stats.Stats[TestOutcome.Failed]);
+    }
 
-        private Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult GetTestResult(int index)
-        {
-            var tc = new TestCase("Test" + index, new Uri("executor://dummy"), "DummySourceFileName");
-            var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(tc);
-            testResult.TestCase.Id = Guid.NewGuid();
+    #endregion
 
-            return testResult;
-        }
+    #region Helpers
 
-        private class TestCacheTester
-        {
-            public long ExpectedCacheSize { get; set; }
+    private static Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult GetTestResult(int index)
+    {
+        var tc = new TestCase("Test" + index, new Uri("executor://dummy"), "DummySourceFileName");
+        var testResult = new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(tc);
+        testResult.TestCase.Id = Guid.NewGuid();
 
-            public int CacheHitCount { get; set; }
+        return testResult;
+    }
 
-            public int TotalInProgressTestsReceived { get; set; }
+    private class TestCacheTester
+    {
+        public long ExpectedCacheSize { get; set; }
 
-            public void CacheHitOnSize(TestRunStatistics stats, ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> results, ICollection<TestCase> tests)
-            {
-                Assert.AreEqual(this.ExpectedCacheSize, results.Count + tests.Count);
-                this.CacheHitCount++;
-                this.TotalInProgressTestsReceived += tests.Count;
-            }
+        public int CacheHitCount { get; set; }
 
-            public void CacheHitOnTimerLimit(ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> results, ICollection<TestCase> tests)
-            {
-                this.CacheHitCount++;
-                this.TotalInProgressTestsReceived += tests.Count;
-            }
+        public int TotalInProgressTestsReceived { get; set; }
+
+        public void CacheHitOnSize(TestRunStatistics _, ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> results, ICollection<TestCase> tests)
+        {
+            Assert.AreEqual(ExpectedCacheSize, results.Count + tests.Count);
+            CacheHitCount++;
+            TotalInProgressTestsReceived += tests.Count;
         }
 
-        #endregion
+        public void CacheHitOnTimerLimit(ICollection<Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult> _, ICollection<TestCase> tests)
+        {
+            CacheHitCount++;
+            TotalInProgressTestsReceived += tests.Count;
+        }
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj
index 34239e46b1..66186d5c45 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CrossPlatEngine.UnitTests</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <!--<WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis> -->
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
@@ -22,11 +18,4 @@
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/PostProcessing/ArtifactProcessingTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/PostProcessing/ArtifactProcessingTests.cs
new file mode 100644
index 0000000000..909ac63b15
--- /dev/null
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/PostProcessing/ArtifactProcessingTests.cs
@@ -0,0 +1,302 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.ArtifactProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests;
+
+[TestClass]
+public class ArtifactProcessingTests
+{
+    private readonly Mock<IFileHelper> _fileHelperMock = new();
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _testRunAttachmentsProcessingManagerMock = new();
+    private readonly Mock<ITestRunAttachmentsProcessingEventsHandler> _testRunAttachmentsProcessingEventsHandlerMock = new();
+    private readonly Mock<IFeatureFlag> _featureFlagMock = new();
+    private readonly Mock<IDataSerializer> _dataSerializer = new();
+    private readonly Mock<ITestRunStatistics> _testRunStatistics = new();
+    private ArtifactProcessingManager _artifactProcessingManager;
+
+    public ArtifactProcessingTests()
+    {
+        _featureFlagMock.Setup(x => x.IsSet(It.IsAny<string>())).Returns(false);
+        _fileHelperMock.Setup(x => x.GetTempPath()).Returns("/tmp");
+
+        _artifactProcessingManager =
+            new ArtifactProcessingManager(Guid.NewGuid().ToString(),
+            _fileHelperMock.Object,
+            _testRunAttachmentsProcessingManagerMock.Object,
+            _dataSerializer.Object,
+            _testRunAttachmentsProcessingEventsHandlerMock.Object,
+            _featureFlagMock.Object);
+    }
+
+    [TestMethod]
+    public void CollectArtifacts_NullSessionIdShouldReturn()
+    {
+        // arrange
+        _artifactProcessingManager =
+            new ArtifactProcessingManager(null,
+            _fileHelperMock.Object,
+            _testRunAttachmentsProcessingManagerMock.Object,
+            _dataSerializer.Object,
+            _testRunAttachmentsProcessingEventsHandlerMock.Object,
+            _featureFlagMock.Object);
+
+        // act
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(_testRunStatistics.Object,
+            false,
+            false,
+            null,
+            new Collection<AttachmentSet>()
+            {
+               new(new Uri("//sample"),"")
+            },
+            TimeSpan.Zero);
+
+        _artifactProcessingManager.CollectArtifacts(testRunCompleteEventArgs, string.Empty);
+
+        //assert
+        _fileHelperMock.Verify(x => x.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void CollectArtifacts_ShouldSerializeToDisk()
+    {
+        // arrange
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(_testRunStatistics.Object,
+            false,
+            false,
+            null,
+            new Collection<AttachmentSet>()
+            {
+               new(new Uri("//sample"),"")
+            },
+            TimeSpan.Zero);
+
+        // act
+        _artifactProcessingManager.CollectArtifacts(testRunCompleteEventArgs, string.Empty);
+
+        // assert
+        _fileHelperMock.Verify(x => x.CreateDirectory(It.IsAny<string>()), Times.Once);
+        _fileHelperMock.Verify(x => x.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+        _dataSerializer.Verify(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<TestRunCompleteEventArgs>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_NullSessionIdShouldReturn()
+    {
+        // arrange
+        _artifactProcessingManager =
+            new ArtifactProcessingManager(null,
+            _fileHelperMock.Object,
+            _testRunAttachmentsProcessingManagerMock.Object,
+            _dataSerializer.Object,
+            _testRunAttachmentsProcessingEventsHandlerMock.Object,
+            _featureFlagMock.Object);
+
+        // act
+        await _artifactProcessingManager.PostProcessArtifactsAsync();
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_NoArtifactsShouldReturn()
+    {
+        // arrange
+        _fileHelperMock.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(false);
+
+        // act
+        await _artifactProcessingManager.PostProcessArtifactsAsync();
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_ShouldRunPostProcessing()
+    {
+        // arrange
+        _fileHelperMock.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _fileHelperMock.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
+            .Returns((string path, string pattern, SearchOption so) => ["/tmp/sessionId/runsettings.xml", "/tmp/sessionId/executionComplete.json"]);
+        _fileHelperMock.Setup(x => x.GetStream(It.IsAny<string>(), It.IsAny<FileMode>(), It.IsAny<FileAccess>()))
+            .Returns((string path, FileMode mode, FileAccess access) =>
+            {
+                if (path.EndsWith("runsettings.xml"))
+                {
+                    return new MemoryStream(Encoding.UTF8.GetBytes(RunSettingsProviderExtensions.EmptyRunSettings));
+                }
+
+                if (path.EndsWith("executionComplete.json"))
+                {
+                    var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null,
+                    false,
+                    false,
+                    null,
+                    new Collection<AttachmentSet>() { new(new Uri("attachment://dummy"), "attachment") },
+                    TimeSpan.Zero);
+
+                    string serializedEventArgs = JsonDataSerializer.Instance.SerializePayload(MessageType.ExecutionComplete, testRunCompleteEventArgs);
+                    return new MemoryStream(Encoding.UTF8.GetBytes(serializedEventArgs));
+                }
+
+                Assert.Fail();
+                throw new Exception("Unexpected");
+            });
+        _dataSerializer.Setup(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<object>())).Returns((string message, object payload)
+            => JsonDataSerializer.Instance.SerializePayload(message, payload));
+        _dataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage)
+            => JsonDataSerializer.Instance.DeserializeMessage(rawMessage));
+        _dataSerializer.Setup(x => x.DeserializePayload<TestRunCompleteEventArgs>(It.IsAny<Message>())).Returns((Message message)
+            => JsonDataSerializer.Instance.DeserializePayload<TestRunCompleteEventArgs>(message));
+
+        // act
+        await _artifactProcessingManager.PostProcessArtifactsAsync();
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+        _testRunAttachmentsProcessingManagerMock.Verify(x => x.ProcessTestRunAttachmentsAsync(It.IsAny<string>(),
+            It.IsAny<IRequestData>(), It.IsAny<IEnumerable<AttachmentSet>>(), It.IsAny<IEnumerable<InvokedDataCollector>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+            It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_NullRunSettings_ShouldRunPostProcessing()
+    {
+        // arrange
+        _fileHelperMock.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _fileHelperMock.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
+            .Returns((string path, string pattern, SearchOption so) => ["/tmp/sessionId/executionComplete.json"]);
+        _fileHelperMock.Setup(x => x.GetStream(It.IsAny<string>(), It.IsAny<FileMode>(), It.IsAny<FileAccess>()))
+            .Returns((string path, FileMode mode, FileAccess access) =>
+            {
+                if (path.EndsWith("executionComplete.json"))
+                {
+                    var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null,
+                    false,
+                    false,
+                    null,
+                    new Collection<AttachmentSet>() { new(new Uri("attachment://dummy"), "attachment") },
+                    TimeSpan.Zero);
+
+                    string serializedEventArgs = JsonDataSerializer.Instance.SerializePayload(MessageType.ExecutionComplete, testRunCompleteEventArgs);
+                    return new MemoryStream(Encoding.UTF8.GetBytes(serializedEventArgs));
+                }
+
+                Assert.Fail();
+                throw new Exception("Unexpected");
+            });
+        _dataSerializer.Setup(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<object>())).Returns((string message, object payload)
+            => JsonDataSerializer.Instance.SerializePayload(message, payload));
+        _dataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage)
+            => JsonDataSerializer.Instance.DeserializeMessage(rawMessage));
+        _dataSerializer.Setup(x => x.DeserializePayload<TestRunCompleteEventArgs>(It.IsAny<Message>())).Returns((Message message)
+            => JsonDataSerializer.Instance.DeserializePayload<TestRunCompleteEventArgs>(message));
+
+        // act
+        await _artifactProcessingManager.PostProcessArtifactsAsync();
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+        _testRunAttachmentsProcessingManagerMock.Verify(x => x.ProcessTestRunAttachmentsAsync(It.IsAny<string>(),
+            It.IsAny<IRequestData>(), It.IsAny<IEnumerable<AttachmentSet>>(), It.IsAny<IEnumerable<InvokedDataCollector>>(),
+            It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_EmptyInvokedDataCollectors_ShouldRunPostProcessing()
+    {
+        // arrange
+        _fileHelperMock.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _fileHelperMock.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
+            .Returns((string path, string pattern, SearchOption so) => ["/tmp/sessionId/runsettings.xml"]);
+        _fileHelperMock.Setup(x => x.GetStream(It.IsAny<string>(), It.IsAny<FileMode>(), It.IsAny<FileAccess>()))
+            .Returns((string path, FileMode mode, FileAccess access) =>
+            {
+                if (path.EndsWith("runsettings.xml"))
+                {
+                    return new MemoryStream(Encoding.UTF8.GetBytes(RunSettingsProviderExtensions.EmptyRunSettings));
+                }
+
+                Assert.Fail();
+                throw new Exception("Unexpected");
+            });
+        _dataSerializer.Setup(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<object>())).Returns((string message, object payload)
+            => JsonDataSerializer.Instance.SerializePayload(message, payload));
+        _dataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage)
+            => JsonDataSerializer.Instance.DeserializeMessage(rawMessage));
+        _dataSerializer.Setup(x => x.DeserializePayload<TestRunCompleteEventArgs>(It.IsAny<Message>())).Returns((Message message)
+            => JsonDataSerializer.Instance.DeserializePayload<TestRunCompleteEventArgs>(message));
+
+        // act
+        await _artifactProcessingManager.PostProcessArtifactsAsync();
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+        _testRunAttachmentsProcessingManagerMock.Verify(x => x.ProcessTestRunAttachmentsAsync(It.IsAny<string>(),
+            It.IsAny<IRequestData>(), It.IsAny<IEnumerable<AttachmentSet>>(), It.IsAny<IEnumerable<InvokedDataCollector>>(),
+            It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task PostProcessArtifactsAsync_DeserializationException_ShouldStopPostProcessing()
+    {
+        // arrange
+        _fileHelperMock.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _fileHelperMock.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
+            .Returns((string path, string pattern, SearchOption so) => ["/tmp/sessionId/executionComplete.json"]);
+        _fileHelperMock.Setup(x => x.GetStream(It.IsAny<string>(), It.IsAny<FileMode>(), It.IsAny<FileAccess>()))
+            .Returns((string path, FileMode mode, FileAccess access) =>
+            {
+                if (path.EndsWith("executionComplete.json"))
+                {
+                    var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null,
+                    false,
+                    false,
+                    null,
+                    new Collection<AttachmentSet>() { new(new Uri("attachment://dummy"), "attachment") },
+                    TimeSpan.Zero);
+
+                    string serializedEventArgs = JsonDataSerializer.Instance.SerializePayload(MessageType.ExecutionComplete, testRunCompleteEventArgs);
+                    return new MemoryStream(Encoding.UTF8.GetBytes(serializedEventArgs));
+                }
+
+                Assert.Fail();
+                throw new Exception("Unexpected");
+            });
+        _dataSerializer.Setup(x => x.SerializePayload(It.IsAny<string>(), It.IsAny<object>())).Returns((string message, object payload)
+            => JsonDataSerializer.Instance.SerializePayload(message, payload));
+        _dataSerializer.Setup(x => x.DeserializeMessage(It.IsAny<string>())).Returns((string rawMessage) => throw new Exception("Malformed json"));
+
+        // act
+        await Assert.ThrowsExceptionAsync<Exception>(() => _artifactProcessingManager.PostProcessArtifactsAsync());
+
+        // assert
+        _fileHelperMock.Verify(x => x.DeleteDirectory(It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
+        _testRunAttachmentsProcessingManagerMock.Verify(x => x.ProcessTestRunAttachmentsAsync(It.IsAny<string>(),
+            It.IsAny<IRequestData>(), It.IsAny<IEnumerable<AttachmentSet>>(), It.IsAny<IEnumerable<InvokedDataCollector>>(),
+            It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()), Times.Never);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs
deleted file mode 100644
index 939e1bde54..0000000000
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.UnitTests
-{
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 69cb64748c..0000000000
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.CrossPlatEngine.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("48c34b69-c0ff-4b10-b8d3-47c9a539b109")]
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs
index 87ee90db47..420f2ab44c 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs
@@ -1,882 +1,1081 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.TestPlatform.TestUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests;
+
+[TestClass]
+public class TestEngineTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-
-    using Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class TestEngineTests
-    {
-        private ITestEngine testEngine;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private ProtocolConfig protocolConfig = new ProtocolConfig { Version = 1 };
-        private ITestRuntimeProvider testableTestRuntimeProvider;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-
-        public TestEngineTests()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(new[] { typeof(TestEngineTests).GetTypeInfo().Assembly.Location }, () => { });
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.testableTestRuntimeProvider = new TestableRuntimeProvider(true);
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(this.protocolConfig);
-        }
-
-        [TestInitialize]
-        public void Init()
-        {
-            this.mockProcessHelper.Setup(o => o.GetCurrentProcessFileName()).Returns("vstest.console");
-            this.testEngine = new TestableTestEngine(this.mockProcessHelper.Object);
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnANonNullInstance()
-        {
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, null);
-            Assert.IsNotNull(this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnsNewInstanceOfProxyDiscoveryManagerIfTestHostIsShared()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                 </RunSettings>";
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-
-            Assert.AreNotSame(discoveryManager, this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria), typeof(ProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnsParallelDiscoveryManagerIfTestHostIsNotShared()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                 </RunSettings>";
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-            this.testableTestRuntimeProvider = new TestableRuntimeProvider(false);
-
-            Assert.IsNotNull(this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria), typeof(ParallelProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagerIfCurrentProcessIsDotnet()
-        {
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, null);
-            this.mockProcessHelper.Setup(o => o.GetCurrentProcessFileName()).Returns("dotnet.exe");
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagerIfDisableAppDomainIsSet()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>true</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagerIfDesignModeIsTrue()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>true</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagereIfTargetFrameworkIsNetcoreApp()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETCoreApp, Version=v1.1</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagereIfTargetFrameworkIsNetStandard()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagereIfTargetPlatformIsX64()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x64</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldNotReturnsInProcessProxyDiscoveryManagereIfrunsettingsHasTestSettingsInIt()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration>
-                    <MSTest>
-                        <SettingsFile>C:\temp.testsettings</SettingsFile>
-                    </MSTest>
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnsInProcessProxyDiscoveryManager()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x64</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration>
-                 </RunSettings>";
-
-            var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
-
-            var discoveryManager = this.testEngine.GetDiscoveryManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, discoveryCriteria);
-            Assert.IsNotNull(discoveryManager);
-            Assert.IsInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnANonNullInstance()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100);
-
-            Assert.IsNotNull(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnNewInstance()
-        {
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100);
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.AreNotSame(executionManager, this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnDefaultExecutionManagerIfParallelDisabled()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingXml);
-
-            Assert.IsNotNull(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria), typeof(ProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerWithSingleSourceShouldReturnDefaultExecutionManagerEvenIfParallelEnabled()
-        {
-            string settingXml = 
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <MaxCpuCount>2</MaxCpuCount>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                </RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingXml);
-
-            Assert.IsNotNull(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria), typeof(ProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnParallelExecutionManagerIfParallelEnabled()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>2</MaxCpuCount></RunConfiguration></RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            Assert.IsNotNull(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria), typeof(ParallelProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnParallelExecutionManagerIfHostIsNotShared()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                </RunSettings>";
-            this.testableTestRuntimeProvider = new TestableRuntimeProvider(false);
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            Assert.IsNotNull(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria));
-            Assert.IsInstanceOfType(this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria), typeof(ParallelProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExcecutionManagerShouldReturnExectuionManagerWithDataCollectionIfDataCollectionIsEnabled()
-        {
-            var settingXml = @"<RunSettings><DataCollectionRunSettings><DataCollectors><DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector></DataCollectors></DataCollectionRunSettings></RunSettings>";
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingXml);
-            var result = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(result);
-            Assert.IsInstanceOfType(result, typeof(ProxyExecutionManagerWithDataCollection));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfInIsolationIsTrue()
-        {
-            string settingXml =
-               @"<RunSettings>
-                    <RunConfiguration>
-                        <InIsolation>true</InIsolation>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfParallelEnabled()
-        {
-            string settingXml =
-               @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>2</MaxCpuCount>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfDataCollectorIsEnabled()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>1</MaxCpuCount>
-                    </RunConfiguration >
-                    <DataCollectionRunSettings>
-                        <DataCollectors>
-                            <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
-                            </DataCollector>
-                        </DataCollectors>
-                    </DataCollectionRunSettings>
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfInProcDataCollectorIsEnabled()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>1</MaxCpuCount>
-                    </RunConfiguration >
-                    <InProcDataCollectionRunSettings>
-                        <InProcDataCollectors>
-                            <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='SimpleDataCollector.SimpleDataCollector, SimpleDataCollector, Version=15.6.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\Enlistments\vstest\test\TestAssets\SimpleDataCollector\bin\Debug\net451\SimpleDataCollector.dll'>
-                                <Configuration>
-                                    <Port>4312</Port>
-                                </Configuration>
-                            </InProcDataCollector>
-                        </InProcDataCollectors>
-                    </InProcDataCollectionRunSettings>
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfrunsettingsHasTestSettingsInIt()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>1</MaxCpuCount>
-                    </RunConfiguration >
-                    <MSTest>
-                        <SettingsFile>C:\temp.testsettings</SettingsFile>
-                    </MSTest>
-                 </RunSettings>";
+    private readonly TestableTestEngine _testEngine;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly ProtocolConfig _protocolConfig = new() { Version = 1 };
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
 
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+    public TestEngineTests()
+    {
+        TestPluginCacheHelper.SetupMockExtensions([typeof(TestEngineTests).Assembly.Location], () => { });
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _mockRequestData.Setup(rd => rd.ProtocolConfig).Returns(_protocolConfig);
+        _mockProcessHelper.Setup(o => o.GetCurrentProcessFileName()).Returns("vstest.console");
+        _testEngine = new TestableTestEngine(_mockProcessHelper.Object);
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldReturnANonNullInstance()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNotNull(_testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object));
+    }
+
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldReturnParallelProxyDiscoveryManagerIfNotRunningInProcess()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsInstanceOfType(discoveryManager, typeof(ParallelProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagerIfCurrentProcessIsDotnet()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        _mockProcessHelper.Setup(o => o.GetCurrentProcessFileName()).Returns("dotnet.exe");
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagerIfDisableAppDomainIsSet()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>true</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagerIfDesignModeIsTrue()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>true</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagereIfTargetFrameworkIsNetcoreApp()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETCoreApp, Version=v1.1</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagereIfTargetFrameworkIsNetStandard()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagereIfTargetPlatformIsX64()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x64</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldNotReturnInProcessProxyDiscoveryManagereIfrunsettingsHasTestSettingsInIt()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration>
+                <MSTest>
+                    <SettingsFile>C:\temp.testsettings</SettingsFile>
+                </MSTest>
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsNotInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldReturnsInProcessProxyDiscoveryManager()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x64</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var discoveryCriteria = new DiscoveryCriteria(new List<string> { "1.dll" }, 100, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var discoveryManager = _testEngine.GetDiscoveryManager(_mockRequestData.Object, discoveryCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+        Assert.IsNotNull(discoveryManager);
+        Assert.IsInstanceOfType(discoveryManager, typeof(InProcessProxyDiscoveryManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldReturnANonNullInstance()
+    {
+        string settingsXml = @"<RunSettings></RunSettings>";
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingsXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNotNull(_testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object));
+    }
 
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-
-        [TestMethod]
-        public void GetExecutionManagerShouldReturnInProcessProxyexecutionManager()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>1</MaxCpuCount>
-                    </RunConfiguration>
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsNotNull(executionManager);
-            Assert.IsInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
-        }
-
-        [TestMethod]
-        public void GetExtensionManagerShouldReturnANonNullInstance()
-        {
-            Assert.IsNotNull(this.testEngine.GetExtensionManager());
-        }
-
-        [TestMethod]
-        public void GetExtensionManagerShouldCollectMetrics()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                        <MaxCpuCount>1</MaxCpuCount>
-                    </RunConfiguration>
-                 </RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            this.mockMetricsCollection.Verify(mc => mc.Add(TelemetryDataConstants.ParallelEnabledDuringExecution, It.IsAny<object>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void ProxyDataCollectionManagerShouldBeInitialzedWithCorrectTestSourcesWhenTestRunCriteriaContainsSourceList()
-        {
-            var settingXml = @"<RunSettings><DataCollectionRunSettings><DataCollectors><DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector></DataCollectors></DataCollectionRunSettings></RunSettings>";
-
-            var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
-
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
-
-            Assert.IsTrue((executionManager as ProxyExecutionManagerWithDataCollection).ProxyDataCollectionManager.Sources.Contains("1.dll"));
-        }
-
-        [TestMethod]
-        public void ProxyDataCollectionManagerShouldBeInitialzedWithCorrectTestSourcesWhenTestRunCriteriaContainsTestCaseList()
-        {
-            var settingXml = @"<RunSettings><DataCollectionRunSettings><DataCollectors><DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector></DataCollectors></DataCollectionRunSettings></RunSettings>";
+    [TestMethod]
+    public void GetExecutionManagerShouldReturnNewInstance()
+    {
+        string settingsXml = @"<RunSettings></RunSettings>";
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingsXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.AreNotSame(executionManager, _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldReturnParallelExecutionManagerIfParallelEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <MaxCpuCount>2</MaxCpuCount>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNotNull(_testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object));
+        Assert.IsInstanceOfType(_testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object), typeof(ParallelProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldReturnParallelExecutionManagerIfHostIsNotShared()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNotNull(_testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object));
+        Assert.IsInstanceOfType(_testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object), typeof(ParallelProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfInIsolationIsTrue()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
 
-            var testCaseList = new List<TestCase> { new TestCase("x.y.z", new Uri("uri://dummy"), "x.dll") };
-            var testRunCriteria = new TestRunCriteria(testCaseList, 100, false, settingXml);
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
 
-            var executionManager = this.testEngine.GetExecutionManager(this.mockRequestData.Object, this.testableTestRuntimeProvider, testRunCriteria);
+        Assert.IsNotNull(executionManager);
+        Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
 
-            Assert.IsTrue((executionManager as ProxyExecutionManagerWithDataCollection).ProxyDataCollectionManager.Sources.Contains("x.dll"));
-        }
-
-        /// <summary>
-        /// GetLoggerManager should return a non null instance.
-        /// </summary>
-        [TestMethod]
-        public void GetLoggerManagerShouldReturnNonNullInstance()
-        {
-            Assert.IsNotNull(this.testEngine.GetLoggerManager(mockRequestData.Object));
-        }
-
-        /// <summary>
-        /// GetLoggerManager should always return new instance of logger manager.
-        /// </summary>
-        [TestMethod]
-        public void GetLoggerManagerShouldAlwaysReturnNewInstance()
+    [TestMethod]
+    public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfParallelEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                    <MaxCpuCount>2</MaxCpuCount>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
         {
-            Assert.AreNotSame(this.testEngine.GetLoggerManager(mockRequestData.Object), this.testEngine.GetLoggerManager(mockRequestData.Object));
-        }
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
 
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnAValidInstance()
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(executionManager);
+        Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfDataCollectorIsEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                    <MaxCpuCount>1</MaxCpuCount>
+                </RunConfiguration >
+                <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
+                        </DataCollector>
+                    </DataCollectors>
+                </DataCollectionRunSettings>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
         {
-            var settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            Assert.IsNotNull(this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNewInstance()
-        {
-            var settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager1 = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.AreNotSame(
-                this.testEngine.GetTestSessionManager(
-                    this.mockRequestData.Object,
-                    testSessionCriteria),
-                testSessionManager1);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfParallelDisabled()
-        {
-            var settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-            Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerEvenIfParallelEnabled()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <MaxCpuCount>2</MaxCpuCount>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                </RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-            Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfParallelEnabled()
-        {
-            string settingXml = @"<RunSettings><RunConfiguration><MaxCpuCount>2</MaxCpuCount></RunConfiguration></RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll", "2.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-            Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfHostIsNotShared()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <InIsolation>true</InIsolation>
-                    </RunConfiguration >
-                </RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll", "2.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-            Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfDataCollectionIsEnabled()
-        {
-            var settingXml = 
-                @"<RunSettings>
-                    <DataCollectionRunSettings>
-                        <DataCollectors>
-                            <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
-                            </DataCollector>
-                        </DataCollectors>
-                    </DataCollectionRunSettings>
-                </RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-            Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNullWhenTargetFrameworkIsNetFramework()
-        {
-            var settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration>
-                 </RunSettings>";
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            Assert.IsNull(this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria));
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfCurrentProcessIsDotnet()
-        {
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = null
-            };
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("dotnet.exe");
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfDisableAppDomainIsSet()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>true</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfDesignModeIsTrue()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>true</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfTargetFrameworkIsNetcoreApp()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETCoreApp, Version=v1.1</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfTargetFrameworkIsNetStandard()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfTargetPlatformIsX64()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x64</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
-                    </RunConfiguration >
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
-
-        [TestMethod]
-        public void GetTestSessionManagerShouldReturnNotNullIfRunSettingsHasTestSettingsInIt()
-        {
-            string settingXml =
-                @"<RunSettings>
-                    <RunConfiguration>
-                        <TargetPlatform>x86</TargetPlatform>
-                        <DisableAppDomain>false</DisableAppDomain>
-                        <DesignMode>false</DesignMode>
-                        <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
-                    </RunConfiguration>
-                    <MSTest>
-                        <SettingsFile>C:\temp.testsettings</SettingsFile>
-                    </MSTest>
-                 </RunSettings>";
-
-            var testSessionCriteria = new StartTestSessionCriteria()
-            {
-                Sources = new List<string> { "1.dll" },
-                RunSettings = settingXml
-            };
-
-            var testSessionManager = this.testEngine.GetTestSessionManager(
-                this.mockRequestData.Object,
-                testSessionCriteria);
-
-            Assert.IsNotNull(testSessionManager);
-        }
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(executionManager);
+        Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfInProcDataCollectorIsEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.6.2</TargetFrameworkVersion>
+                    <MaxCpuCount>1</MaxCpuCount>
+                </RunConfiguration >
+                <InProcDataCollectionRunSettings>
+                    <InProcDataCollectors>
+                        <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='SimpleDataCollector.SimpleDataCollector, SimpleDataCollector, Version=15.6.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\Enlistments\vstest\test\TestAssets\SimpleDataCollector\bin\Debug\net451\SimpleDataCollector.dll'>
+                            <Configuration>
+                                <Port>4312</Port>
+                            </Configuration>
+                        </InProcDataCollector>
+                    </InProcDataCollectors>
+                </InProcDataCollectionRunSettings>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(executionManager);
+        Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfrunsettingsHasTestSettingsInIt()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.6.2</TargetFrameworkVersion>
+                    <MaxCpuCount>1</MaxCpuCount>
+                </RunConfiguration >
+                <MSTest>
+                    <SettingsFile>C:\temp.testsettings</SettingsFile>
+                </MSTest>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(executionManager);
+        Assert.IsNotInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
+
+
+    [TestMethod]
+    public void GetExecutionManagerShouldReturnInProcessProxyexecutionManager()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.6.2</TargetFrameworkVersion>
+                    <MaxCpuCount>1</MaxCpuCount>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(executionManager);
+        Assert.IsInstanceOfType(executionManager, typeof(InProcessProxyExecutionManager));
+    }
+
+    [TestMethod]
+    public void GetExtensionManagerShouldReturnANonNullInstance()
+    {
+        Assert.IsNotNull(_testEngine.GetExtensionManager());
+    }
+
+    [TestMethod]
+    public void GetExtensionManagerShouldCollectMetrics()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.6.2</TargetFrameworkVersion>
+                    <MaxCpuCount>1</MaxCpuCount>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll", "2.dll" }, 100, false, settingXml);
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var executionManager = _testEngine.GetExecutionManager(_mockRequestData.Object, testRunCriteria, sourceToSourceDetailMap, new Mock<IWarningLogger>().Object);
+
+        _mockMetricsCollection.Verify(mc => mc.Add(TelemetryDataConstants.ParallelEnabledDuringExecution, It.IsAny<object>()), Times.Once);
+    }
+
+    /// <summary>
+    /// GetLoggerManager should return a non null instance.
+    /// </summary>
+    [TestMethod]
+    public void GetLoggerManagerShouldReturnNonNullInstance()
+    {
+        Assert.IsNotNull(_testEngine.GetLoggerManager(_mockRequestData.Object));
+    }
+
+    /// <summary>
+    /// GetLoggerManager should always return new instance of logger manager.
+    /// </summary>
+    [TestMethod]
+    public void GetLoggerManagerShouldAlwaysReturnNewInstance()
+    {
+        Assert.AreNotSame(_testEngine.GetLoggerManager(_mockRequestData.Object), _testEngine.GetLoggerManager(_mockRequestData.Object));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnAValidInstance()
+    {
+        var settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNotNull(_testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNewInstance()
+    {
+        var settingXml = @"<RunSettings><RunConfiguration><InIsolation>true</InIsolation></RunConfiguration></RunSettings>";
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager1 = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.AreNotSame(
+            _testEngine.GetTestSessionManager(
+                _mockRequestData.Object,
+                testSessionCriteria,
+                sourceToSourceDetailMap,
+                new Mock<IWarningLogger>().Object),
+            testSessionManager1);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfParallelDisabled()
+    {
+        var settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+        Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerEvenIfParallelEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <MaxCpuCount>2</MaxCpuCount>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+        Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfParallelEnabled()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <MaxCpuCount>2</MaxCpuCount>
+                </RunConfiguration>
+            </RunSettings>";
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll", "2.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+        Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfHostIsNotShared()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <InIsolation>true</InIsolation>
+                </RunConfiguration >
+            </RunSettings>";
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll", "2.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            ["2.dll"] = new SourceDetail { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+        Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnDefaultTestSessionManagerIfDataCollectionIsEnabled()
+    {
+        var settingXml =
+            @"<RunSettings>
+                <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector>
+                    </DataCollectors>
+                </DataCollectionRunSettings>
+            </RunSettings>";
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+        Assert.IsInstanceOfType(testSessionManager, typeof(ProxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNullWhenTargetFrameworkIsNetFramework()
+    {
+        var settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        Assert.IsNull(_testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object));
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfCurrentProcessIsDotnet()
+    {
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = @"<RunSettings></RunSettings>"
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("dotnet.exe");
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfDisableAppDomainIsSet()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>true</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfDesignModeIsTrue()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>true</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfTargetFrameworkIsNetcoreApp()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETCoreApp, Version=v1.1</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfTargetFrameworkIsNetStandard()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfTargetPlatformIsX64()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x64</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETStandard, Version=v1.4</TargetFrameworkVersion>
+                </RunConfiguration >
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void GetTestSessionManagerShouldReturnNotNullIfRunSettingsHasTestSettingsInIt()
+    {
+        string settingXml =
+            @"<RunSettings>
+                <RunConfiguration>
+                    <TargetPlatform>x86</TargetPlatform>
+                    <DisableAppDomain>false</DisableAppDomain>
+                    <DesignMode>false</DesignMode>
+                    <TargetFrameworkVersion>.NETFramework, Version=v4.5</TargetFrameworkVersion>
+                </RunConfiguration>
+                <MSTest>
+                    <SettingsFile>C:\temp.testsettings</SettingsFile>
+                </MSTest>
+            </RunSettings>";
+
+        var testSessionCriteria = new StartTestSessionCriteria()
+        {
+            Sources = new List<string> { "1.dll" },
+            RunSettings = settingXml
+        };
+
+        var sourceToSourceDetailMap = new Dictionary<string, SourceDetail>
+        {
+            ["1.dll"] = new SourceDetail { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+        };
+
+        var testSessionManager = _testEngine.GetTestSessionManager(
+            _mockRequestData.Object,
+            testSessionCriteria,
+            sourceToSourceDetailMap,
+            new Mock<IWarningLogger>().Object);
+
+        Assert.IsNotNull(testSessionManager);
+    }
+
+    [TestMethod]
+    public void CreatingNonParallelExecutionManagerShouldReturnExecutionManagerWithDataCollectionIfDataCollectionIsEnabled()
+    {
+        var settingXml =
+            @"<RunSettings>
+                <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector>
+                    </DataCollectors>
+                </DataCollectionRunSettings>
+            </RunSettings>";
+        var testRunCriteria = new TestRunCriteria(new List<string> { "1.dll" }, 100, false, settingXml);
+
+        var runtimeProviderInfo = new TestRuntimeProviderInfo(typeof(ITestRuntimeProvider), false, settingXml,
+            [new() { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework }]);
+        var nonParallelExecutionManager = _testEngine.CreateNonParallelExecutionManager(_mockRequestData.Object, testRunCriteria, true, runtimeProviderInfo);
+
+        Assert.IsNotNull(nonParallelExecutionManager);
+        Assert.IsInstanceOfType(nonParallelExecutionManager, typeof(ProxyExecutionManagerWithDataCollection));
+    }
+
+
+    [TestMethod]
+    public void CreatedNonParallelExecutionManagerShouldBeInitialzedWithCorrectTestSourcesWhenTestRunCriteriaContainsSourceList()
+    {
+        // Test run criteria are NOT used to get sources or settings
+        // those are taken from the runtimeProviderInfo, because we've split the
+        // test run criteria into smaller pieces to run them on each non-parallel execution manager.
+        var testRunCriteria = new TestRunCriteria(new List<string> { "none.dll" }, 100, false, testSettings: null);
+
+        var settingXml =
+            @"<RunSettings>
+                <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a""></DataCollector>
+                    </DataCollectors>
+                </DataCollectionRunSettings>
+            </RunSettings>";
+
+        var runtimeProviderInfo = new TestRuntimeProviderInfo(typeof(ITestRuntimeProvider), false, settingXml,
+        [
+            new() { Source = "1.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework },
+            new() { Source = "2.dll", Architecture = Architecture.X86, Framework = Framework.DefaultFramework }
+        ]);
+        var nonParallelExecutionManager = _testEngine.CreateNonParallelExecutionManager(_mockRequestData.Object, testRunCriteria, true, runtimeProviderInfo);
+
+        Assert.IsInstanceOfType(nonParallelExecutionManager, typeof(ProxyExecutionManagerWithDataCollection));
+        Assert.IsTrue(((ProxyExecutionManagerWithDataCollection)nonParallelExecutionManager).ProxyDataCollectionManager.Sources.Contains("1.dll"));
+        Assert.IsTrue(((ProxyExecutionManagerWithDataCollection)nonParallelExecutionManager).ProxyDataCollectionManager.Sources.Contains("2.dll"));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestExtensionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestExtensionManagerTests.cs
index f964f88853..c4c8293cd2 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestExtensionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestExtensionManagerTests.cs
@@ -1,54 +1,52 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests
-{
-    using System.Collections.Generic;
-    using System.Reflection;
+using System.Collections.Generic;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class TestExtensionManagerTests
-    {
-        private ITestExtensionManager testExtensionManager;
+namespace TestPlatform.CrossPlatEngine.UnitTests;
 
-        public TestExtensionManagerTests()
-        {
-            this.testExtensionManager = new TestExtensionManager();
+[TestClass]
+public class TestExtensionManagerTests
+{
+    private readonly ITestExtensionManager _testExtensionManager;
 
-            // Reset the singleton
-            TestPluginCache.Instance = null;
-        }
+    public TestExtensionManagerTests()
+    {
+        _testExtensionManager = new TestExtensionManager();
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestPluginCache.Instance = null;
-        }
+        // Reset the singleton
+        TestPluginCache.Instance = null;
+    }
 
-        [TestMethod]
-        public void UseAdditionalExtensionsShouldUpdateAdditionalExtensionsInCache()
-        {
-            var extensions = new List<string> { typeof(TestExtensionManagerTests).GetTypeInfo().Assembly.Location };
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        TestPluginCache.Instance = null;
+    }
 
-            this.testExtensionManager.UseAdditionalExtensions(extensions, true);
+    [TestMethod]
+    public void UseAdditionalExtensionsShouldUpdateAdditionalExtensionsInCache()
+    {
+        var extensions = new List<string> { typeof(TestExtensionManagerTests).Assembly.Location };
 
-            CollectionAssert.AreEquivalent(extensions, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
-        }
+        _testExtensionManager.UseAdditionalExtensions(extensions, true);
 
-        [TestMethod]
-        public void ClearExtensionsShouldClearExtensionsInCache()
-        {
-            var extensions = new List<string> { @"Foo.dll" };
-            this.testExtensionManager.UseAdditionalExtensions(extensions, false);
+        CollectionAssert.AreEquivalent(extensions, TestPluginCache.Instance.GetExtensionPaths(string.Empty));
+    }
+
+    [TestMethod]
+    public void ClearExtensionsShouldClearExtensionsInCache()
+    {
+        var extensions = new List<string> { @"Foo.dll" };
+        _testExtensionManager.UseAdditionalExtensions(extensions, false);
 
-            this.testExtensionManager.ClearExtensions();
+        _testExtensionManager.ClearExtensions();
 
-            Assert.AreEqual(0, TestPluginCache.Instance.GetExtensionPaths(string.Empty).Count);
-        }
+        Assert.AreEqual(0, TestPluginCache.Instance.GetExtensionPaths(string.Empty).Count);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestHostManagerFactoryTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestHostManagerFactoryTests.cs
index d277598365..5a96419a44 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestHostManagerFactoryTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestHostManagerFactoryTests.cs
@@ -1,59 +1,50 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests;
+
+[TestClass]
+public class TestHostManagerFactoryTests
 {
-    using System;
+    private readonly TestHostManagerFactory _testHostManagerFactory;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
 
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public TestHostManagerFactoryTests()
+    {
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _testHostManagerFactory = new TestHostManagerFactory(false);
+    }
 
-    using Moq;
+    [TestMethod]
+    public void GetDiscoveryManagerShouldReturnADiscoveryManagerInstance()
+    {
+        Assert.IsNotNull(_testHostManagerFactory.GetDiscoveryManager());
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldCacheTheDiscoveryManagerInstance()
+    {
+        Assert.AreEqual(_testHostManagerFactory.GetDiscoveryManager(), _testHostManagerFactory.GetDiscoveryManager());
+    }
+
+    [TestMethod]
+    public void GetDiscoveryManagerShouldReturnAnExecutionManagerInstance()
+    {
+        Assert.IsNotNull(_testHostManagerFactory.GetExecutionManager());
+    }
 
-    [TestClass]
-    public class TestHostManagerFactoryTests
+    [TestMethod]
+    public void GetDiscoveryManagerShouldCacheTheExecutionManagerInstance()
     {
-        private TestHostManagerFactory testHostManagerFactory;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-
-        public TestHostManagerFactoryTests()
-        {
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.testHostManagerFactory = new TestHostManagerFactory(this.mockRequestData.Object);
-        }
-
-        [TestMethod]
-        public void ConstructorShouldThrowIfRequestDataIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => new TestHostManagerFactory(null));
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnADiscoveryManagerInstance()
-        {
-            Assert.IsNotNull(this.testHostManagerFactory.GetDiscoveryManager());
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldCacheTheDiscoveryManagerInstance()
-        {
-            Assert.AreEqual(this.testHostManagerFactory.GetDiscoveryManager(), this.testHostManagerFactory.GetDiscoveryManager());
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldReturnAnExecutionManagerInstance()
-        {
-            Assert.IsNotNull(this.testHostManagerFactory.GetExecutionManager());
-        }
-
-        [TestMethod]
-        public void GetDiscoveryManagerShouldCacheTheExecutionManagerInstance()
-        {
-            Assert.AreEqual(this.testHostManagerFactory.GetExecutionManager(), this.testHostManagerFactory.GetExecutionManager());
-        }
+        Assert.AreEqual(_testHostManagerFactory.GetExecutionManager(), _testHostManagerFactory.GetExecutionManager());
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestLoggerManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestLoggerManagerTests.cs
index 9221db7145..7510928451 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestLoggerManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestLoggerManagerTests.cs
@@ -1,80 +1,79 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+
+using Microsoft.TestPlatform.TestUtilities;
 using Microsoft.VisualStudio.TestPlatform.Common.Exceptions;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-namespace TestPlatform.CrossPlatEngine.UnitTests
+namespace TestPlatform.CrossPlatEngine.UnitTests;
+
+/// <summary>
+/// Tests the behaviors of the TestLoggerManager class.
+/// </summary>
+[TestClass]
+public class TestLoggerManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Threading;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    private static int s_counter;
+    private static readonly EventWaitHandle WaitHandle = new AutoResetEvent(false);
+    private readonly string _loggerUri = "testlogger://logger";
 
-    /// <summary>
-    /// Tests the behaviors of the TestLoggerManager class.
-    /// </summary>
-    [TestClass]
-    public class TestLoggerManagerTests
+    [TestInitialize]
+    public void Initialize()
     {
-        private static int counter = 0;
-        private static EventWaitHandle waitHandle = new AutoResetEvent(false);
-        private string loggerUri = "testlogger://logger";
-
-        [TestInitialize]
-        public void Initialize()
-        {
-            TestPluginCacheHelper.SetupMockExtensions(
-                new string[] { typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location },
-                () => { });
-        }
+        TestPluginCacheHelper.SetupMockExtensions(
+            [typeof(TestLoggerManagerTests).Assembly.Location],
+            () => { });
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestPluginCacheHelper.ResetExtensionsCache();
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        TestPluginCacheHelper.ResetExtensionsCache();
+    }
 
-        [TestMethod]
-        public void TryGetUriFromFriendlyNameShouldReturnUriIfLoggerIsAdded()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.TryGetUriFromFriendlyName("TestLoggerExtension", out var uri);
-            Assert.AreEqual(uri.ToString(), new Uri(loggerUri).ToString());
-        }
+    [TestMethod]
+    public void TryGetUriFromFriendlyNameShouldReturnUriIfLoggerIsAdded()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.TryGetUriFromFriendlyName("TestLoggerExtension", out var uri);
+        Assert.AreEqual(uri?.ToString(), new Uri(_loggerUri).ToString());
+    }
 
-        [TestMethod]
-        public void TryGetUriFromFriendlyNameShouldNotReturnUriIfLoggerIsNotAdded()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.TryGetUriFromFriendlyName("TestLoggerExtension1", out var uri);
-            Assert.IsNull(uri);
-        }
+    [TestMethod]
+    public void TryGetUriFromFriendlyNameShouldNotReturnUriIfLoggerIsNotAdded()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.TryGetUriFromFriendlyName("TestLoggerExtension1", out var uri);
+        Assert.IsNull(uri);
+    }
 
-        [TestMethod]
-        public void GetResultsDirectoryShouldReturnNullIfRunSettingsIsNull()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            string result = testLoggerManager.GetResultsDirectory(null);
-            Assert.IsNull(result);
-        }
+    [TestMethod]
+    public void GetResultsDirectoryShouldReturnNullIfRunSettingsIsNull()
+    {
+        var result = TestLoggerManager.GetResultsDirectory(null);
+        Assert.IsNull(result);
+    }
 
-        [TestMethod]
-        public void GetResultsDirectoryShouldReadResultsDirectoryFromSettingsIfSpecified()
-        {
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetResultsDirectoryShouldReadResultsDirectoryFromSettingsIfSpecified()
+    {
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
     <RunSettings>
       <RunConfiguration>
         <MaxCpuCount>0</MaxCpuCount>
@@ -84,15 +83,14 @@ public void GetResultsDirectoryShouldReadResultsDirectoryFromSettingsIfSpecified
       </RunConfiguration>
     </RunSettings> ";
 
-            var testLoggerManager = new DummyTestLoggerManager();
-            string result = testLoggerManager.GetResultsDirectory(runSettingsXml);
-            Assert.AreEqual(0, string.Compare("DummyTestResultsFolder", result));
-        }
+        var result = TestLoggerManager.GetResultsDirectory(runSettingsXml);
+        Assert.AreEqual(0, string.Compare("DummyTestResultsFolder", result));
+    }
 
-        [TestMethod]
-        public void GetResultsDirectoryShouldReturnDefaultPathIfResultsDirectoryIsNotProvidedInRunSettings()
-        {
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetResultsDirectoryShouldReturnDefaultPathIfResultsDirectoryIsNotProvidedInRunSettings()
+    {
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
     <RunSettings>
       <RunConfiguration>
         <MaxCpuCount>0</MaxCpuCount>
@@ -101,16 +99,15 @@ public void GetResultsDirectoryShouldReturnDefaultPathIfResultsDirectoryIsNotPro
       </RunConfiguration>
     </RunSettings> ";
 
-            var testLoggerManager = new DummyTestLoggerManager();
-            string result = testLoggerManager.GetResultsDirectory(runSettingsXml);
+        var result = TestLoggerManager.GetResultsDirectory(runSettingsXml);
 
-            Assert.AreEqual(0, string.Compare(Constants.DefaultResultsDirectory, result));
-        }
+        Assert.AreEqual(0, string.Compare(Constants.DefaultResultsDirectory, result));
+    }
 
-        [TestMethod]
-        public void GetTargetFrameworkShouldReturnFrameworkProvidedInRunSettings()
-        {
-            string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTargetFrameworkShouldReturnFrameworkProvidedInRunSettings()
+    {
+        string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
                                         <RunSettings>
                                           <RunConfiguration>
                                             <MaxCpuCount>0</MaxCpuCount>
@@ -119,174 +116,168 @@ public void GetTargetFrameworkShouldReturnFrameworkProvidedInRunSettings()
                                           </RunConfiguration>
                                         </RunSettings> ";
 
-            var testLoggerManager = new DummyTestLoggerManager();
-            var framework = testLoggerManager.GetTargetFramework(runSettingsXml);
+        var framework = TestLoggerManager.GetTargetFramework(runSettingsXml);
 
-            Assert.AreEqual(".NETFramework,Version=v4.5", framework.Name);
-        }
-
-        [TestMethod]
-        public void HandleTestRunMessageShouldInvokeTestRunMessageHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        Assert.AreEqual(".NETFramework,Version=v4.5", framework?.Name);
+    }
 
-            testLoggerManager.HandleTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "TestRunMessage"));
+    [TestMethod]
+    public void HandleTestRunMessageShouldInvokeTestRunMessageHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        testLoggerManager.HandleTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "TestRunMessage"));
 
-        [TestMethod]
-        public void HandleTestRunMessageShouldNotInvokeTestRunMessageHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "TestRunMessage"));
+    [TestMethod]
+    public void HandleTestRunMessageShouldNotInvokeTestRunMessageHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            Assert.AreEqual(0, counter);
-        }
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "TestRunMessage"));
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldInvokeTestRunCompleteHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        Assert.AreEqual(0, s_counter);
+    }
 
-            testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, new TimeSpan()));
+    [TestMethod]
+    public void HandleTestRunCompleteShouldInvokeTestRunCompleteHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, new TimeSpan()));
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldNotInvokeTestRunCompleteHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, new TimeSpan()));
+    [TestMethod]
+    public void HandleTestRunCompleteShouldNotInvokeTestRunCompleteHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            Assert.AreEqual(0, counter);
-        }
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, new TimeSpan()));
 
-        [TestMethod]
-        public void HandleTestRunCompleteShouldDisposeLoggerManager()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        Assert.AreEqual(0, s_counter);
+    }
 
-            testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, new TimeSpan()));
-            testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, new TimeSpan())); // count should not increase because of second call.
+    [TestMethod]
+    public void HandleTestRunCompleteShouldDisposeLoggerManager()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            Assert.AreEqual(1, counter);
-        }
+        testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, new TimeSpan()));
+        testLoggerManager.HandleTestRunComplete(new TestRunCompleteEventArgs(null, false, false, null, null, null, new TimeSpan())); // count should not increase because of second call.
 
-        [TestMethod]
-        public void HandleTestRunStatsChangeShouldInvokeTestRunChangedHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
-
-            testLoggerManager.HandleTestRunStatsChange(
-                new TestRunChangedEventArgs(
-                    null,
-                    new List<ObjectModel.TestResult>()
-                    {
-                        new ObjectModel.TestResult(
-                            new TestCase(
-                                "This is a string.",
-                                new Uri("some://uri"),
-                                "This is a string."))
-                    },
-                    null));
-
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        Assert.AreEqual(1, s_counter);
+    }
 
-        [TestMethod]
-        public void HandleTestRunStatsChangeShouldNotInvokeTestRunChangedHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
-
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleTestRunStatsChange(
-                new TestRunChangedEventArgs(
-                    null,
-                    new List<ObjectModel.TestResult>()
-                    {
-                        new ObjectModel.TestResult(
-                            new TestCase(
-                                "This is a string.",
-                                new Uri("some://uri"),
-                                "This is a string."))
-                    },
-                    null));
-
-            Assert.AreEqual(0, counter);
-        }
+    [TestMethod]
+    public void HandleTestRunStatsChangeShouldInvokeTestRunChangedHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
+
+        testLoggerManager.HandleTestRunStatsChange(
+            new TestRunChangedEventArgs(
+                null,
+                new List<ObjectModel.TestResult>()
+                {
+                    new(
+                        new TestCase(
+                            "This is a string.",
+                            new Uri("some://uri"),
+                            "This is a string."))
+                },
+                null));
+
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        [TestMethod]
-        public void AddLoggerShouldNotThrowExceptionIfUriIsNull()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
+    [TestMethod]
+    public void HandleTestRunStatsChangeShouldNotInvokeTestRunChangedHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
+
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleTestRunStatsChange(
+            new TestRunChangedEventArgs(
+                null,
+                new List<ObjectModel.TestResult>()
                 {
-                    testLoggerManager.InitializeLoggerByUri(null, null);
-                });
-        }
+                    new(
+                        new TestCase(
+                            "This is a string.",
+                            new Uri("some://uri"),
+                            "This is a string."))
+                },
+                null));
+
+        Assert.AreEqual(0, s_counter);
+    }
 
-        [TestMethod]
-        public void AddLoggerShouldNotThrowExceptionIfUriIsNonExistent()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            Assert.IsFalse(testLoggerManager.InitializeLoggerByUri(new Uri("logger://NotALogger"), null));
-        }
+    [TestMethod]
+    public void AddLoggerShouldNotThrowExceptionIfUriIsNull()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        Assert.ThrowsException<ArgumentNullException>(
+            () => testLoggerManager.InitializeLoggerByUri(null!, null));
+    }
 
-        [TestMethod]
-        public void AddLoggerShouldAddDefaultLoggerParameterForTestLoggerWithParameters()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void AddLoggerShouldNotThrowExceptionIfUriIsNonExistent()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        Assert.IsFalse(testLoggerManager.InitializeLoggerByUri(new Uri("logger://NotALogger"), null));
+    }
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+    [TestMethod]
+    public void AddLoggerShouldAddDefaultLoggerParameterForTestLoggerWithParameters()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                     <MaxCpuCount>0</MaxCpuCount>
@@ -301,333 +292,327 @@ public void AddLoggerShouldAddDefaultLoggerParameterForTestLoggerWithParameters(
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
-
-            Assert.IsNotNull(ValidLoggerWithParameters.parameters, "parameters not getting passed");
-            Assert.IsTrue(
-                ValidLoggerWithParameters.parameters.ContainsKey(DefaultLoggerParameterNames.TestRunDirectory),
-                $"{DefaultLoggerParameterNames.TestRunDirectory} not added to parameters");
-            Assert.IsFalse(
-                string.IsNullOrWhiteSpace(
-                    ValidLoggerWithParameters.parameters[DefaultLoggerParameterNames.TestRunDirectory]),
-                $"parameter {DefaultLoggerParameterNames.TestRunDirectory} should not be null, empty or whitespace");
-        }
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
+
+        Assert.IsNotNull(ValidLoggerWithParameters.Parameters, "parameters not getting passed");
+        Assert.IsTrue(
+            ValidLoggerWithParameters.Parameters.ContainsKey(DefaultLoggerParameterNames.TestRunDirectory),
+            $"{DefaultLoggerParameterNames.TestRunDirectory} not added to parameters");
+        Assert.IsFalse(
+            string.IsNullOrWhiteSpace(
+                ValidLoggerWithParameters.Parameters[DefaultLoggerParameterNames.TestRunDirectory]),
+            $"parameter {DefaultLoggerParameterNames.TestRunDirectory} should not be null, empty or whitespace");
+    }
 
-        [TestMethod]
-        public void DisposeShouldNotThrowExceptionIfCalledMultipleTimes()
-        {
-            // Dispose the logger manager multiple times and verify that no exception is thrown.
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.Dispose();
-            testLoggerManager.Dispose();
-        }
+    [TestMethod]
+    public void DisposeShouldNotThrowExceptionIfCalledMultipleTimes()
+    {
+        // Dispose the logger manager multiple times and verify that no exception is thrown.
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.Dispose();
+        testLoggerManager.Dispose();
+    }
 
-        [TestMethod]
-        public void AddLoggerShouldThrowObjectDisposedExceptionAfterDisposedIsCalled()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.Dispose();
+    [TestMethod]
+    public void AddLoggerShouldThrowObjectDisposedExceptionAfterDisposedIsCalled()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.Dispose();
 
-            Assert.ThrowsException<ObjectDisposedException>(
-                () =>
-                {
-                    testLoggerManager.InitializeLoggerByUri(new Uri("some://uri"), null);
-                });
-        }
+        Assert.ThrowsException<ObjectDisposedException>(
+            () => testLoggerManager.InitializeLoggerByUri(new Uri("some://uri"), null));
+    }
 
 
-        [TestMethod]
-        public void EnableLoggingShouldThrowObjectDisposedExceptionAfterDisposedIsCalled()
-        {
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.Dispose();
-            Assert.ThrowsException<ObjectDisposedException>(
-                () =>
-                {
-                    testLoggerManager.EnableLogging();
-                });
-        }
+    [TestMethod]
+    public void EnableLoggingShouldThrowObjectDisposedExceptionAfterDisposedIsCalled()
+    {
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.Dispose();
+        Assert.ThrowsException<ObjectDisposedException>(
+            () => testLoggerManager.EnableLogging());
+    }
 
-        [TestMethod]
-        public void LoggerInitialzeShouldCollectLoggersForTelemetry()
-        {
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void LoggerInitialzeShouldCollectLoggersForTelemetry()
+    {
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.InitializeLoggerByUri(new Uri(this.loggerUri), new Dictionary<string, string>());
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
 
-            // Act.
-            testLoggerManager.Initialize(null);
+        // Act.
+        testLoggerManager.Initialize(null);
 
-            // Verify
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger"));
-        }
+        // Verify
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger"));
+    }
 
-        /// <summary>
-        /// DiscoveryStart event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryStartShouldInvokeDiscoveryStartHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryStart event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryStartShouldInvokeDiscoveryStartHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            DiscoveryCriteria discoveryCriteria = new DiscoveryCriteria() { TestCaseFilter = "Name=Test1" };
-            DiscoveryStartEventArgs discoveryStartEventArgs = new DiscoveryStartEventArgs(discoveryCriteria);
+        DiscoveryCriteria discoveryCriteria = new() { TestCaseFilter = "Name=Test1" };
+        DiscoveryStartEventArgs discoveryStartEventArgs = new(discoveryCriteria);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.HandleDiscoveryStart(discoveryStartEventArgs);
+        testLoggerManager.HandleDiscoveryStart(discoveryStartEventArgs);
 
-            // Assertions when discovery events registered
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        // Assertions when discovery events registered
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveryStart event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryStartShouldNotInvokeDiscoveryStartHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryStart event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryStartShouldNotInvokeDiscoveryStartHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            DiscoveryCriteria discoveryCriteria = new DiscoveryCriteria() { TestCaseFilter = "Name=Test1" };
-            DiscoveryStartEventArgs discoveryStartEventArgs = new DiscoveryStartEventArgs(discoveryCriteria);
+        DiscoveryCriteria discoveryCriteria = new() { TestCaseFilter = "Name=Test1" };
+        DiscoveryStartEventArgs discoveryStartEventArgs = new(discoveryCriteria);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleDiscoveryStart(discoveryStartEventArgs);
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleDiscoveryStart(discoveryStartEventArgs);
 
-            // Assertions when discovery events registered
-            Assert.AreEqual(0, counter);
-        }
+        // Assertions when discovery events registered
+        Assert.AreEqual(0, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveredTests event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveredTestsShouldInvokeDiscoveredTestsHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveredTests event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveredTestsShouldInvokeDiscoveredTestsHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            List<TestCase> testCases = new List<TestCase> { new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName") };
-            DiscoveredTestsEventArgs discoveredTestsEventArgs = new DiscoveredTestsEventArgs(testCases);
+        List<TestCase> testCases = [new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName")];
+        DiscoveredTestsEventArgs discoveredTestsEventArgs = new(testCases);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
+        testLoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
 
-            // Assertions when discovery events registered
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        // Assertions when discovery events registered
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveredTestsShouldNotInvokeDiscoveredTestsHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    [TestMethod]
+    public void HandleDiscoveredTestsShouldNotInvokeDiscoveredTestsHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            List<TestCase> testCases = new List<TestCase> { new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName") };
-            DiscoveredTestsEventArgs discoveredTestsEventArgs = new DiscoveredTestsEventArgs(testCases);
+        List<TestCase> testCases = [new TestCase("This is a string.", new Uri("some://uri"), "DummySourceFileName")];
+        DiscoveredTestsEventArgs discoveredTestsEventArgs = new(testCases);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleDiscoveredTests(discoveredTestsEventArgs);
 
-            // Assertions when discovery events registered
-            Assert.AreEqual(0, counter);
-        }
+        // Assertions when discovery events registered
+        Assert.AreEqual(0, s_counter);
+    }
 
-        /// <summary>
-        /// TestRunStart event handler of loggers should be called only if test run events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleTestRunStartShouldInvokeTestRunStartHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// TestRunStart event handler of loggers should be called only if test run events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleTestRunStartShouldInvokeTestRunStartHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            TestRunCriteria testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
-            TestRunStartEventArgs testRunStartEventArgs = new TestRunStartEventArgs(testRunCriteria);
+        TestRunCriteria testRunCriteria = new(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
+        TestRunStartEventArgs testRunStartEventArgs = new(testRunCriteria);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.HandleTestRunStart(testRunStartEventArgs);
+        testLoggerManager.HandleTestRunStart(testRunStartEventArgs);
 
-            // Assertions when test run events registered
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        // Assertions when test run events registered
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        /// <summary>
-        /// TestRunStart event handler of loggers should be called only if test run events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleTestRunStartShouldNotInvokeTestRunStartHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// TestRunStart event handler of loggers should be called only if test run events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleTestRunStartShouldNotInvokeTestRunStartHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            TestRunCriteria testRunCriteria = new TestRunCriteria(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
-            TestRunStartEventArgs testRunStartEventArgs = new TestRunStartEventArgs(testRunCriteria);
+        TestRunCriteria testRunCriteria = new(new List<string> { @"x:dummy\foo.dll" }, 10, false, string.Empty, TimeSpan.MaxValue, null, "Name=Test1", null);
+        TestRunStartEventArgs testRunStartEventArgs = new(testRunCriteria);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleTestRunStart(testRunStartEventArgs);
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleTestRunStart(testRunStartEventArgs);
 
-            // Assertions when test run events registered
-            Assert.AreEqual(0, counter);
-        }
+        // Assertions when test run events registered
+        Assert.AreEqual(0, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveryComplete event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldInvokeDiscoveryCompleteHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryComplete event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldInvokeDiscoveryCompleteHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
+        DiscoveryCompleteEventArgs discoveryCompleteEventArgs = new(2, false);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
+        testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
 
-            // Assertions when discovery events registered
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        // Assertions when discovery events registered
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveryComplete event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldNotInvokeDiscoveryCompleteHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryComplete event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldNotInvokeDiscoveryCompleteHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
 
-            // Assertions when discovery events registered
-            Assert.AreEqual(0, counter);
-        }
+        // Assertions when discovery events registered
+        Assert.AreEqual(0, s_counter);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldDisposeLoggerManager()
-        {
-            counter = 0;
-            waitHandle.Reset();
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
-
-            var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
-            testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
-            testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs); // count should not increase because of second call.
-
-            Assert.AreEqual(1, counter);
-        }
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldDisposeLoggerManager()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
+
+        var discoveryCompleteEventArgs = new DiscoveryCompleteEventArgs(2, false);
+        testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs);
+        testLoggerManager.HandleDiscoveryComplete(discoveryCompleteEventArgs); // count should not increase because of second call.
+
+        Assert.AreEqual(1, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveryMessage event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryMessageShouldInvokeDiscoveryMessageHandlerOfLoggers()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryMessage event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryMessageShouldInvokeDiscoveryMessageHandlerOfLoggers()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            string message = "This is the test message";
-            TestRunMessageEventArgs testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
+        string message = "This is the test message";
+        TestRunMessageEventArgs testRunMessageEventArgs = new(TestMessageLevel.Informational, message);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.HandleDiscoveryMessage(testRunMessageEventArgs);
+        testLoggerManager.HandleDiscoveryMessage(testRunMessageEventArgs);
 
-            // Assertions when discovery events registered
-            waitHandle.WaitOne();
-            Assert.AreEqual(1, counter);
-        }
+        // Assertions when discovery events registered
+        WaitHandle.WaitOne();
+        Assert.AreEqual(1, s_counter);
+    }
 
-        /// <summary>
-        /// DiscoveryMessage event handler of loggers should be called only if discovery events are registered.
-        /// </summary>
-        [TestMethod]
-        public void HandleDiscoveryMessageShouldNotInvokeDiscoveryMessageHandlerOfLoggersIfDisposed()
-        {
-            counter = 0;
-            waitHandle.Reset();
+    /// <summary>
+    /// DiscoveryMessage event handler of loggers should be called only if discovery events are registered.
+    /// </summary>
+    [TestMethod]
+    public void HandleDiscoveryMessageShouldNotInvokeDiscoveryMessageHandlerOfLoggersIfDisposed()
+    {
+        s_counter = 0;
+        WaitHandle.Reset();
 
-            string message = "This is the test message";
-            TestRunMessageEventArgs testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
+        string message = "This is the test message";
+        TestRunMessageEventArgs testRunMessageEventArgs = new(TestMessageLevel.Informational, message);
 
-            // setup TestLogger
-            var testLoggerManager = new DummyTestLoggerManager();
-            testLoggerManager.InitializeLoggerByUri(new Uri(loggerUri), new Dictionary<string, string>());
-            testLoggerManager.EnableLogging();
+        // setup TestLogger
+        var testLoggerManager = new DummyTestLoggerManager();
+        testLoggerManager.InitializeLoggerByUri(new Uri(_loggerUri), new());
+        testLoggerManager.EnableLogging();
 
-            testLoggerManager.Dispose();
-            testLoggerManager.HandleDiscoveryMessage(testRunMessageEventArgs);
+        testLoggerManager.Dispose();
+        testLoggerManager.HandleDiscoveryMessage(testRunMessageEventArgs);
 
-            Assert.AreEqual(0, counter);
-        }
+        Assert.AreEqual(0, s_counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggerFromFriendlyNameWhenOnlyFriendlyNamePresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggerFromFriendlyNameWhenOnlyFriendlyNamePresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -636,24 +621,24 @@ public void InitializeShouldInitializeLoggerFromFriendlyNameWhenOnlyFriendlyName
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggerFromUriWhenOnlyUriPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggerFromUriWhenOnlyUriPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -662,27 +647,27 @@ public void InitializeShouldInitializeLoggerFromUriWhenOnlyUriPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggerFromAssemblyNameWhenAssemblyNameAndCodeBasePresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggerFromAssemblyNameWhenAssemblyNameAndCodeBasePresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -691,26 +676,26 @@ public void InitializeShouldInitializeLoggerFromAssemblyNameWhenAssemblyNameAndC
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeLoggersWhenOnlyAssemblyNameIsPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeLoggersWhenOnlyAssemblyNameIsPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -719,28 +704,25 @@ public void InitializeShouldNotInitializeLoggersWhenOnlyAssemblyNameIsPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-        }
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeLoggersFromAssemblyNameWhenInterfaceDoesNotMatch()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeLoggersFromAssemblyNameWhenInterfaceDoesNotMatch()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(InvalidLogger).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(InvalidLogger).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -749,27 +731,24 @@ public void InitializeShouldNotInitializeLoggersFromAssemblyNameWhenInterfaceDoe
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-            Assert.AreEqual(0, InvalidLogger.counter);
-        }
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+        Assert.AreEqual(0, InvalidLogger.Counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeLoggersWhenAssemblyNameInvalid()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeLoggersWhenAssemblyNameInvalid()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = "invalid";
+        var assemblyQualifiedName = "invalid";
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -778,27 +757,24 @@ public void InitializeShouldNotInitializeLoggersWhenAssemblyNameInvalid()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-        }
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeLoggersWhenCodeBaseInvalid()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeLoggersWhenCodeBaseInvalid()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(InvalidLogger).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(InvalidLogger).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -807,29 +783,26 @@ public void InitializeShouldNotInitializeLoggersWhenCodeBaseInvalid()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-        }
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggerOnceWhenMultipleLoggersWithSameAssemblyNamePresent()
-        {
-            // Duplicate loggers should be ignored
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggerOnceWhenMultipleLoggersWithSameAssemblyNamePresent()
+    {
+        // Duplicate loggers should be ignored
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -839,28 +812,28 @@ public void InitializeShouldInitializeLoggerOnceWhenMultipleLoggersWithSameAssem
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggerOnce()
-        {
-            // Duplicate loggers should be ignored
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggerOnce()
+    {
+        // Duplicate loggers should be ignored
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -872,27 +845,27 @@ public void InitializeShouldInitializeLoggerOnce()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotConsiderLoggerAsInitializedWhenInitializationErrorOccurs()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotConsiderLoggerAsInitializedWhenInitializationErrorOccurs()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(LoggerWithInitializationError).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(LoggerWithInitializationError).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -901,27 +874,24 @@ public void InitializeShouldNotConsiderLoggerAsInitializedWhenInitializationErro
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-        }
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowWhenLoggerManagerAlreadyDisposed()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldThrowWhenLoggerManagerAlreadyDisposed()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -930,24 +900,24 @@ public void InitializeShouldThrowWhenLoggerManagerAlreadyDisposed()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Dispose();
-            Assert.ThrowsException<ObjectDisposedException>(() => testLoggerManager.Initialize(settingsXml));
-        }
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Dispose();
+        Assert.ThrowsException<ObjectDisposedException>(() => testLoggerManager.Initialize(settingsXml));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitilaizeMultipleLoggersIfPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitilaizeMultipleLoggersIfPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -958,27 +928,27 @@ public void InitializeShouldInitilaizeMultipleLoggersIfPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void AreLoggersInitializedShouldReturnTrueWhenLoggersInitialized()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void AreLoggersInitializedShouldReturnTrueWhenLoggersInitialized()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -989,53 +959,35 @@ public void AreLoggersInitializedShouldReturnTrueWhenLoggersInitialized()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
-
-            Assert.IsTrue(testLoggerManager.LoggersInitialized);
-        }
-
-        [TestMethod]
-        public void AreLoggersInitializedShouldReturnFalseWhenLoggersNotInitialized()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
-
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
-                <RunSettings>
-                  <LoggerRunSettings>
-                    <Loggers>
-                      <Logger friendlyName=""TestLoggerExtension"" />
-                      <Logger uri=""testlogger://logger2""></Logger>
-                      <Logger assemblyQualifiedName=""" + assemblyQualifiedName + @""" codeBase=""" + codeBase + @"""></Logger>
-                    </Loggers>
-                  </LoggerRunSettings>
-                </RunSettings>";
+        Assert.IsTrue(testLoggerManager.LoggersInitialized);
+    }
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+    [TestMethod]
+    public void AreLoggersInitializedShouldReturnFalseWhenLoggersNotInitialized()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            Assert.IsFalse(testLoggerManager.LoggersInitialized);
-        }
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-        [TestMethod]
-        public void AreLoggersInitializedShouldReturnFalseWhenNoLoggersPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+        Assert.IsFalse(testLoggerManager.LoggersInitialized);
+    }
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+    [TestMethod]
+    public void AreLoggersInitializedShouldReturnFalseWhenNoLoggersPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1043,25 +995,25 @@ public void AreLoggersInitializedShouldReturnFalseWhenNoLoggersPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.IsFalse(testLoggerManager.LoggersInitialized);
-        }
+        Assert.IsFalse(testLoggerManager.LoggersInitialized);
+    }
 
-        [TestMethod]
-        public void InitializeShouldPassConfigurationElementAsParameters()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldPassConfigurationElementAsParameters()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1077,31 +1029,31 @@ public void InitializeShouldPassConfigurationElementAsParameters()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
 
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldSkipEmptyConfigurationValueInParameters()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldSkipEmptyConfigurationValueInParameters()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1117,31 +1069,31 @@ public void InitializeShouldSkipEmptyConfigurationValueInParameters()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(3, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.IsFalse(ValidLoggerWithParameters.parameters.TryGetValue("Key1", out var key1Value));
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(3, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.IsFalse(ValidLoggerWithParameters.Parameters.TryGetValue("Key1", out var key1Value));
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
 
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldUseLastValueInParametersForDuplicateConfigurationValue()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldUseLastValueInParametersForDuplicateConfigurationValue()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1158,31 +1110,31 @@ public void InitializeShouldUseLastValueInParametersForDuplicateConfigurationVal
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value3", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value3", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
 
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeDisabledLoggers()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeDisabledLoggers()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1193,27 +1145,27 @@ public void InitializeShouldNotInitializeDisabledLoggers()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2"));
-        }
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeFromAssemblyNameIfAllAttributesPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeFromAssemblyNameIfAllAttributesPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var assemblyQualifiedName = typeof(ValidLoggerWithParameters).AssemblyQualifiedName;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1229,29 +1181,29 @@ public void InitializeShouldInitializeFromAssemblyNameIfAllAttributesPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeFromUriIfUriAndNamePresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeFromUriIfUriAndNamePresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1267,29 +1219,29 @@ public void InitializeShouldInitializeFromUriIfUriAndNamePresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeFromUriIfUnableToFromAssemblyName()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeFromUriIfUnableToFromAssemblyName()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1305,29 +1257,29 @@ public void InitializeShouldInitializeFromUriIfUnableToFromAssemblyName()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeFromNameIfUnableToFromUri()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeFromNameIfUnableToFromUri()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1343,29 +1295,29 @@ public void InitializeShouldInitializeFromNameIfUnableToFromUri()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggersWithTestRunDirectoryIfPresentInRunSettings()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggersWithTestRunDirectoryIfPresentInRunSettings()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                     <MaxCpuCount>0</MaxCpuCount>
@@ -1387,30 +1339,30 @@ public void InitializeShouldInitializeLoggersWithTestRunDirectoryIfPresentInRunS
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual("DummyTestResultsFolder", ValidLoggerWithParameters.parameters["testRunDirectory"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual("DummyTestResultsFolder", ValidLoggerWithParameters.Parameters["testRunDirectory"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldInitializeLoggersWithDefaultTestRunDirectoryIfNotPresentInRunSettings()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldInitializeLoggersWithDefaultTestRunDirectoryIfNotPresentInRunSettings()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                     <MaxCpuCount>0</MaxCpuCount>
@@ -1431,30 +1383,30 @@ public void InitializeShouldInitializeLoggersWithDefaultTestRunDirectoryIfNotPre
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(1, ValidLoggerWithParameters.counter);
-            Assert.AreEqual(4, ValidLoggerWithParameters.parameters.Count); // Two additional because of testRunDirectory and targetFramework
-            Assert.AreEqual("Value1", ValidLoggerWithParameters.parameters["Key1"]);
-            Assert.AreEqual(Constants.DefaultResultsDirectory, ValidLoggerWithParameters.parameters["testRunDirectory"]);
-            Assert.AreEqual("Value2", ValidLoggerWithParameters.parameters["Key2"]);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
-        }
+        Assert.AreEqual(1, ValidLoggerWithParameters.Counter);
+        Assert.AreEqual(4, ValidLoggerWithParameters.Parameters!.Count); // Two additional because of testRunDirectory and targetFramework
+        Assert.AreEqual("Value1", ValidLoggerWithParameters.Parameters["Key1"]);
+        Assert.AreEqual(Constants.DefaultResultsDirectory, ValidLoggerWithParameters.Parameters["testRunDirectory"]);
+        Assert.AreEqual("Value2", ValidLoggerWithParameters.Parameters["Key2"]);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, "TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLogger2,TestPlatform.CrossPlatEngine.UnitTests.TestLoggerManagerTests+ValidLoggerWithParameters"));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeIfUnableToFromName()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeIfUnableToFromName()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            var codeBase = typeof(TestLoggerManagerTests).GetTypeInfo().Assembly.Location;
+        var codeBase = typeof(TestLoggerManagerTests).Assembly.Location;
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1470,90 +1422,87 @@ public void InitializeShouldNotInitializeIfUnableToFromName()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
 
-            Assert.ThrowsException<InvalidLoggerException>(() =>
-            {
-                testLoggerManager.Initialize(settingsXml);
-            });
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-        }
+        Assert.ThrowsException<InvalidLoggerException>(() => testLoggerManager.Initialize(settingsXml));
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeAnyLoggerIfNoLoggerPresent()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeAnyLoggerIfNoLoggerPresent()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
-        }
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeAnyLoggerIfEmptyLoggerRunSettings()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeAnyLoggerIfEmptyLoggerRunSettings()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
-        }
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotThrowWhenLoggersNotPresentInRunSettings()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotThrowWhenLoggersNotPresentInRunSettings()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
-        }
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotInitializeAnyLoggerIfEmptyLoggersNode()
-        {
-            ValidLoggerWithParameters.Reset();
-            var mockRequestData = new Mock<IRequestData>();
-            var mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+    [TestMethod]
+    public void InitializeShouldNotInitializeAnyLoggerIfEmptyLoggersNode()
+    {
+        ValidLoggerWithParameters.Reset();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockMetricsCollection = new Mock<IMetricsCollection>();
+        mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
 
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <LoggerRunSettings>
                     <Loggers>
@@ -1561,157 +1510,156 @@ public void InitializeShouldNotInitializeAnyLoggerIfEmptyLoggersNode()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
-            testLoggerManager.Initialize(settingsXml);
+        var testLoggerManager = new DummyTestLoggerManager(mockRequestData.Object);
+        testLoggerManager.Initialize(settingsXml);
 
-            Assert.AreEqual(0, ValidLoggerWithParameters.counter);
-            mockMetricsCollection.Verify(
-                rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
-        }
+        Assert.AreEqual(0, ValidLoggerWithParameters.Counter);
+        mockMetricsCollection.Verify(
+            rd => rd.Add(TelemetryDataConstants.LoggerUsed, ""));
+    }
 
-        [ExtensionUri("testlogger://logger")]
-        [FriendlyName("TestLoggerExtension")]
-        private class ValidLogger : ITestLogger
+    [ExtensionUri("testlogger://logger")]
+    [FriendlyName("TestLoggerExtension")]
+    private class ValidLogger : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                events.TestRunMessage += TestMessageHandler;
-                events.TestRunComplete += Events_TestRunComplete;
-                events.TestResult += Events_TestResult;
-                events.TestRunStart += TestRunStartHandler;
-
-                events.DiscoveryStart += DiscoveryStartHandler;
-                events.DiscoveryMessage += DiscoveryMessageHandler;
-                events.DiscoveredTests += DiscoveredTestsHandler;
-                events.DiscoveryComplete += DiscoveryCompleteHandler;
-            }
+            events.TestRunMessage += TestMessageHandler;
+            events.TestRunComplete += Events_TestRunComplete;
+            events.TestResult += Events_TestResult;
+            events.TestRunStart += TestRunStartHandler;
 
-            private void Events_TestResult(object sender, TestResultEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
-            }
-
-            private void Events_TestRunComplete(object sender, TestRunCompleteEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
+            events.DiscoveryStart += DiscoveryStartHandler;
+            events.DiscoveryMessage += DiscoveryMessageHandler;
+            events.DiscoveredTests += DiscoveredTestsHandler;
+            events.DiscoveryComplete += DiscoveryCompleteHandler;
+        }
 
-            }
+        private void Events_TestResult(object? sender, TestResultEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
+        }
 
-            private void TestMessageHandler(object sender, TestRunMessageEventArgs e)
-            {
-                if (e.Message.Equals("TestRunMessage"))
-                {
-                    TestLoggerManagerTests.counter++;
-                    TestLoggerManagerTests.waitHandle.Set();
+        private void Events_TestRunComplete(object? sender, TestRunCompleteEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
 
-                }
-            }
+        }
 
-            private void TestRunStartHandler(object sender, TestRunStartEventArgs e)
+        private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
+        {
+            if (e.Message.Equals("TestRunMessage"))
             {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
-            }
+                s_counter++;
+                WaitHandle.Set();
 
-            private void DiscoveryMessageHandler(object sender, TestRunMessageEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
             }
+        }
 
-            private void DiscoveryStartHandler(object sender, DiscoveryStartEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
-            }
+        private void TestRunStartHandler(object? sender, TestRunStartEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
+        }
 
-            private void DiscoveredTestsHandler(object sender, DiscoveredTestsEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
-            }
+        private void DiscoveryMessageHandler(object? sender, TestRunMessageEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
+        }
 
-            private void DiscoveryCompleteHandler(object sender, DiscoveryCompleteEventArgs e)
-            {
-                TestLoggerManagerTests.counter++;
-                TestLoggerManagerTests.waitHandle.Set();
-            }
+        private void DiscoveryStartHandler(object? sender, DiscoveryStartEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
         }
 
-        [ExtensionUri("testlogger://logger2")]
-        [FriendlyName("TestLoggerExtension2")]
-        private class ValidLogger2 : ITestLogger
+        private void DiscoveredTestsHandler(object? sender, DiscoveredTestsEventArgs e)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-            }
+            s_counter++;
+            WaitHandle.Set();
+        }
 
+        private void DiscoveryCompleteHandler(object? sender, DiscoveryCompleteEventArgs e)
+        {
+            s_counter++;
+            WaitHandle.Set();
         }
+    }
 
-        [ExtensionUri("testlogger://invalidLogger")]
-        [FriendlyName("InvalidTestLoggerExtension")]
-        private class InvalidLogger
+    [ExtensionUri("testlogger://logger2")]
+    [FriendlyName("TestLoggerExtension2")]
+    private class ValidLogger2 : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public static int counter = 0;
+        }
 
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                counter++;
-            }
+    }
 
-        }
+    [ExtensionUri("testlogger://invalidLogger")]
+    [FriendlyName("InvalidTestLoggerExtension")]
+    private class InvalidLogger
+    {
+        public static int Counter;
 
-        [ExtensionUri("testlogger://loggerWithError")]
-        [FriendlyName("ErroredTestLoggerExtension")]
-        private class LoggerWithInitializationError : ITestLogger
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Usage is unclear so keeping as non-static")]
+        public void Initialize(TestLoggerEvents _, string _2)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                throw new Exception();
-            }
+            Counter++;
         }
 
-        [ExtensionUri("test-logger-with-parameter://logger")]
-        [FriendlyName("TestLoggerWithParameterExtension")]
-        private class ValidLoggerWithParameters : ITestLoggerWithParameters
+    }
+
+    [ExtensionUri("testlogger://loggerWithError")]
+    [FriendlyName("ErroredTestLoggerExtension")]
+    private class LoggerWithInitializationError : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            public static Dictionary<string, string> parameters;
-            public static int counter = 0;
+            throw new Exception();
+        }
+    }
 
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                counter += 2;
-            }
+    [ExtensionUri("test-logger-with-parameter://logger")]
+    [FriendlyName("TestLoggerWithParameterExtension")]
+    private class ValidLoggerWithParameters : ITestLoggerWithParameters
+    {
+        public static Dictionary<string, string?>? Parameters;
+        public static int Counter;
 
-            public void Initialize(TestLoggerEvents events, Dictionary<string, string> parameters)
-            {
-                counter++;
-                ValidLoggerWithParameters.parameters = parameters;
-            }
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
+        {
+            Counter += 2;
+        }
 
-            public static void Reset()
-            {
-                counter = 0;
-                ValidLoggerWithParameters.parameters = null;
-            }
+        public void Initialize(TestLoggerEvents events, Dictionary<string, string?> parameters)
+        {
+            Counter++;
+            Parameters = parameters;
         }
 
-        internal class DummyTestLoggerManager : TestLoggerManager
+        public static void Reset()
         {
-            public DummyTestLoggerManager() : base(null, TestSessionMessageLogger.Instance, new InternalTestLoggerEvents(TestSessionMessageLogger.Instance))
-            {
+            Counter = 0;
+            Parameters = null;
+        }
+    }
 
-            }
+    internal class DummyTestLoggerManager : TestLoggerManager
+    {
+        public DummyTestLoggerManager()
+            : base(null!, TestSessionMessageLogger.Instance, new InternalTestLoggerEvents(TestSessionMessageLogger.Instance))
+        {
 
-            public DummyTestLoggerManager(IRequestData requestData) : base(requestData, TestSessionMessageLogger.Instance, new InternalTestLoggerEvents(TestSessionMessageLogger.Instance))
-            {
+        }
+
+        public DummyTestLoggerManager(IRequestData requestData)
+            : base(requestData, TestSessionMessageLogger.Instance, new InternalTestLoggerEvents(TestSessionMessageLogger.Instance))
+        {
 
-            }
         }
     }
 }
-
-
-
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestSession/TestSessionPoolTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestSession/TestSessionPoolTests.cs
index ab3c47ebe0..42c8da22f6 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestSession/TestSessionPoolTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestSession/TestSessionPoolTests.cs
@@ -1,124 +1,135 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestSession
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestSession;
+
+[TestClass]
+public class TestSessionPoolTests
 {
-    using System;
-    
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void AddSessionShouldSucceedIfTestSessionInfoIsUnique()
+    {
+        TestSessionPool.Instance = null;
+
+        var testSessionInfo = new TestSessionInfo();
+        var proxyTestSessionManager = new ProxyTestSessionManager(
+            new StartTestSessionCriteria(),
+            1,
+            _ => null,
+            new List<TestRuntimeProviderInfo>());
+
+        Assert.IsNotNull(TestSessionPool.Instance);
+        Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, proxyTestSessionManager));
+        Assert.IsFalse(TestSessionPool.Instance.AddSession(testSessionInfo, proxyTestSessionManager));
+    }
+
+    [TestMethod]
+    public void KillSessionShouldSucceedIfTestSessionExists()
+    {
+        TestSessionPool.Instance = null;
+
+        var testSessionInfo = new TestSessionInfo();
+        var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
+            new StartTestSessionCriteria(),
+            1,
+            (Func<TestRuntimeProviderInfo, ProxyOperationManager>)(_ => null!),
+            new List<TestRuntimeProviderInfo>());
+        var mockRequestData = new Mock<IRequestData>();
+
+        mockProxyTestSessionManager.SetupSequence(tsm => tsm.StopSession(It.IsAny<IRequestData>()))
+            .Returns(true)
+            .Returns(false);
+
+        Assert.IsNotNull(TestSessionPool.Instance);
+        Assert.IsFalse(TestSessionPool.Instance.KillSession(testSessionInfo, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(It.IsAny<IRequestData>()), Times.Never);
+
+        Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
+        Assert.IsTrue(TestSessionPool.Instance.KillSession(testSessionInfo, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(mockRequestData.Object), Times.Once);
+
+        Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
+        Assert.IsFalse(TestSessionPool.Instance.KillSession(testSessionInfo, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(mockRequestData.Object), Times.Exactly(2));
+    }
 
-    using Moq;
+    [TestMethod]
+    public void TakeProxyShouldSucceedIfMatchingCriteriaAreCorrect()
+    {
+        TestSessionPool.Instance = null;
+
+        var testSessionInfo = new TestSessionInfo();
+        var mockRequestData = new Mock<IRequestData>();
+        var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
+            new StartTestSessionCriteria(),
+            1,
+            (Func<TestRuntimeProviderInfo, ProxyOperationManager>)(_ => null!),
+            new List<TestRuntimeProviderInfo>());
+
+        mockProxyTestSessionManager.SetupSequence(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()))
+            .Throws(new InvalidOperationException("Test Exception"))
+            .Returns(new ProxyOperationManager(null, null!, null!, Framework.DefaultFramework));
+
+        Assert.IsNotNull(TestSessionPool.Instance);
+        // Take proxy fails because test session is invalid.
+        Assert.IsNull(TestSessionPool.Instance.TryTakeProxy(new TestSessionInfo(), string.Empty, string.Empty, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+
+        Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
+
+        // First TakeProxy fails because of throwing, see setup sequence.
+        Assert.IsNull(TestSessionPool.Instance.TryTakeProxy(testSessionInfo, string.Empty, string.Empty, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+
+        // Second TakeProxy succeeds, see setup sequence.
+        Assert.IsNotNull(TestSessionPool.Instance.TryTakeProxy(testSessionInfo, string.Empty, string.Empty, mockRequestData.Object));
+        mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
+    }
 
-    [TestClass]
-    public class TestSessionPoolTests
+    [TestMethod]
+    public void ReturnProxyShouldSucceedIfProxyIdIsValid()
     {
-        [TestMethod]
-        public void AddSessionShouldSucceedIfTestSessionInfoIsUnique()
-        {
-            TestSessionPool.Instance = null;
-
-            var testSessionInfo = new TestSessionInfo();
-            var proxyTestSessionManager = new ProxyTestSessionManager(
-                new StartTestSessionCriteria(),
-                1,
-                () => { return null; });
-
-            Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, proxyTestSessionManager));
-            Assert.IsFalse(TestSessionPool.Instance.AddSession(testSessionInfo, proxyTestSessionManager));
-        }
-
-        [TestMethod]
-        public void KillSessionShouldSucceedIfTestSessionExists()
-        {
-            TestSessionPool.Instance = null;
-
-            var testSessionInfo = new TestSessionInfo();
-            var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
-                new StartTestSessionCriteria(),
-                1,
-                (Func<ProxyOperationManager>)(() => { return null; }));
-
-            mockProxyTestSessionManager.SetupSequence(tsm => tsm.StopSession())
-                .Returns(true)
-                .Returns(false);
-
-            Assert.IsFalse(TestSessionPool.Instance.KillSession(testSessionInfo));
-            mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(), Times.Never);
-
-            Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
-            Assert.IsTrue(TestSessionPool.Instance.KillSession(testSessionInfo));
-            mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(), Times.Once);
-
-            Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
-            Assert.IsFalse(TestSessionPool.Instance.KillSession(testSessionInfo));
-            mockProxyTestSessionManager.Verify(tsm => tsm.StopSession(), Times.Exactly(2));
-        }
-
-        [TestMethod]
-        public void TakeProxyShouldSucceedIfMatchingCriteriaAreCorrect()
-        {
-            TestSessionPool.Instance = null;
-
-            var testSessionInfo = new TestSessionInfo();
-            var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
-                new StartTestSessionCriteria(),
-                1,
-                (Func<ProxyOperationManager>)(() => { return null; }));
-
-            mockProxyTestSessionManager.SetupSequence(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()))
-                .Throws(new InvalidOperationException("Test Exception"))
-                .Returns(new ProxyOperationManager(null, null, null));
-
-            // Take proxy fails because test session is invalid.
-            Assert.IsNull(TestSessionPool.Instance.TryTakeProxy(new TestSessionInfo(), string.Empty, string.Empty));
-            mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
-
-            Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
-
-            // First TakeProxy fails because of throwing, see setup sequence.
-            Assert.IsNull(TestSessionPool.Instance.TryTakeProxy(testSessionInfo, string.Empty, string.Empty));
-            mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-
-            // Second TakeProxy succeeds, see setup sequence.
-            Assert.IsNotNull(TestSessionPool.Instance.TryTakeProxy(testSessionInfo, string.Empty, string.Empty));
-            mockProxyTestSessionManager.Verify(tsm => tsm.DequeueProxy(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(2));
-        }
-
-        [TestMethod]
-        public void ReturnProxyShouldSucceedIfProxyIdIsValid()
-        {
-            TestSessionPool.Instance = null;
-
-            var testSessionInfo = new TestSessionInfo();
-            var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
-                new StartTestSessionCriteria(),
-                1,
-                (Func<ProxyOperationManager>)(() => { return null; }));
-
-            mockProxyTestSessionManager.SetupSequence(tsm => tsm.EnqueueProxy(It.IsAny<int>()))
-                .Throws(new ArgumentException("Test Exception"))
-                .Throws(new InvalidOperationException("Test Exception"))
-                .Returns(true);
-
-            Assert.IsFalse(TestSessionPool.Instance.ReturnProxy(new TestSessionInfo(), 0));
-            mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Never);
-
-            Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
-
-            // Simulates proxy id not found (see setup sequence).
-            Assert.ThrowsException<ArgumentException>(() => TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
-            mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Once);
-
-            // Simulates proxy already available (see setup sequence).
-            Assert.IsFalse(TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
-            mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Exactly(2));
-
-            // EnqueueProxy call succeeds.
-            Assert.IsTrue(TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
-            mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Exactly(3));
-        }
+        TestSessionPool.Instance = null;
+
+        var testSessionInfo = new TestSessionInfo();
+        var mockProxyTestSessionManager = new Mock<ProxyTestSessionManager>(
+            new StartTestSessionCriteria(),
+            1,
+            (Func<TestRuntimeProviderInfo, ProxyOperationManager>)(_ => null!),
+            new List<TestRuntimeProviderInfo>());
+
+        mockProxyTestSessionManager.SetupSequence(tsm => tsm.EnqueueProxy(It.IsAny<int>()))
+            .Throws(new ArgumentException("Test Exception"))
+            .Throws(new InvalidOperationException("Test Exception"))
+            .Returns(true);
+
+        Assert.IsNotNull(TestSessionPool.Instance);
+        Assert.IsFalse(TestSessionPool.Instance.ReturnProxy(new TestSessionInfo(), 0));
+        mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Never);
+
+        Assert.IsTrue(TestSessionPool.Instance.AddSession(testSessionInfo, mockProxyTestSessionManager.Object));
+
+        // Simulates proxy id not found (see setup sequence).
+        Assert.IsFalse(TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
+        mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Once);
+
+        // Simulates proxy already available (see setup sequence).
+        Assert.IsFalse(TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
+        mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Exactly(2));
+
+        // EnqueueProxy call succeeds.
+        Assert.IsTrue(TestSessionPool.Instance.ReturnProxy(testSessionInfo, 0));
+        mockProxyTestSessionManager.Verify(tsm => tsm.EnqueueProxy(It.IsAny<int>()), Times.Exactly(3));
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableRuntimeProvider.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableRuntimeProvider.cs
index de7089630c..6d11d7673c 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableRuntimeProvider.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableRuntimeProvider.cs
@@ -1,83 +1,82 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
+
+[ExtensionUri("executor://TestableTestHost")]
+[FriendlyName("TestableTestHost")]
+public class TestableRuntimeProvider : ITestRuntimeProvider
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    [ExtensionUri("executor://TestableTestHost")]
-    [FriendlyName("TestableTestHost")]
-    public class TestableRuntimeProvider : ITestRuntimeProvider
+    public TestableRuntimeProvider()
+    {
+    }
+
+    public TestableRuntimeProvider(bool shared)
+    {
+        Shared = shared;
+    }
+
+    public event EventHandler<HostProviderEventArgs>? HostLaunched;
+
+    public event EventHandler<HostProviderEventArgs>? HostExited;
+
+    public bool Shared { get; }
+
+    public void Initialize(IMessageLogger? logger, string runsettingsXml)
+    {
+    }
+
+    public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+    {
+        return true;
+    }
+
+    public void SetCustomLauncher(ITestHostLauncher customLauncher)
+    {
+    }
+
+    public TestHostConnectionInfo GetTestHostConnectionInfo()
+    {
+        return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+    }
+
+    public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        HostLaunched?.Invoke(this, null!);
+        return Task.FromResult(true);
+    }
+
+    public TestProcessStartInfo GetTestHostProcessStartInfo(
+        IEnumerable<string> sources,
+        IDictionary<string, string?>? environmentVariables,
+        TestRunnerConnectionInfo connectionInfo)
+    {
+        return default!;
+    }
+
+    public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+    {
+        return extensions;
+    }
+
+    public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+    {
+        return sources;
+    }
+
+    public Task CleanTestHostAsync(CancellationToken cancellationToken)
     {
-        public TestableRuntimeProvider()
-        {
-        }
-
-        public TestableRuntimeProvider(bool shared)
-        {
-            Shared = shared;
-        }
-
-        public event EventHandler<HostProviderEventArgs> HostLaunched;
-
-        public event EventHandler<HostProviderEventArgs> HostExited;
-
-        public bool Shared { get; }
-
-        public void Initialize(IMessageLogger logger, string runsettingsXml)
-        {
-        }
-
-        public bool CanExecuteCurrentRunConfiguration(string runsettingsXml)
-        {
-            return true;
-        }
-
-        public void SetCustomLauncher(ITestHostLauncher customLauncher)
-        {
-        }
-
-        public TestHostConnectionInfo GetTestHostConnectionInfo()
-        {
-            return new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
-        }
-
-        public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
-        {
-            HostLaunched(this, null);
-            return Task.FromResult(true);
-        }
-
-        public TestProcessStartInfo GetTestHostProcessStartInfo(
-            IEnumerable<string> sources,
-            IDictionary<string, string> environmentVariables,
-            TestRunnerConnectionInfo connectionInfo)
-        {
-            return default;
-        }
-
-        public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
-        {
-            return extensions;
-        }
-
-        public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
-        {
-            return sources;
-        }
-
-        public Task CleanTestHostAsync(CancellationToken cancellationToken)
-        {
-            HostExited(this, null);
-            return Task.FromResult(true);
-        }
+        HostExited?.Invoke(this, null!);
+        return Task.FromResult(true);
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestEngine.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestEngine.cs
index f850fb8f6f..7d4af066fa 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestEngine.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestEngine.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests
-{
-    using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests;
 
-    public class TestableTestEngine : TestEngine
+public class TestableTestEngine : TestEngine
+{
+    public TestableTestEngine(IProcessHelper processHelper)
+        : base(TestRuntimeProviderManager.Instance, processHelper)
     {
-        public TestableTestEngine(IProcessHelper processHelper)
-            : base(TestRuntimeProviderManager.Instance, processHelper)
-        {
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestRunCache.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestRunCache.cs
index f7521b97b2..641e04e281 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestRunCache.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestableImplementations/TestableTestRunCache.cs
@@ -1,66 +1,68 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations
-{
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
-    public class TestableTestRunCache : ITestRunCache
+namespace TestPlatform.CrossPlatEngine.UnitTests.TestableImplementations;
+
+public sealed class TestableTestRunCache : ITestRunCache
+{
+    public TestableTestRunCache()
     {
-        public TestableTestRunCache()
-        {
-            this.TestStartedList = new List<TestCase>();
-            this.TestCompletedList = new List<TestCase>();
-            this.TestResultList = new List<TestResult>();
-        }
+        TestStartedList = new List<TestCase>();
+        TestCompletedList = new List<TestCase>();
+        TestResultList = new List<TestResult>();
+        TestResults = null!;
+        InProgressTests = null!;
+        TestRunStatistics = null!;
+    }
 
-        // use the below three to fill in data to the testable cache.
-        public List<TestCase> TestStartedList { get; private set; }
+    // use the below three to fill in data to the testable cache.
+    public List<TestCase> TestStartedList { get; private set; }
 
-        public List<TestCase> TestCompletedList { get; private set; }
+    public List<TestCase> TestCompletedList { get; private set; }
 
-        public List<TestResult> TestResultList { get; private set; }
+    public List<TestResult> TestResultList { get; private set; }
 
-        public ICollection<TestCase> InProgressTests { get; set; }
+    public ICollection<TestCase> InProgressTests { get; set; }
 
 
-        // Use the TestResultList instead to fill in data. This is just to avoid confusion.
-        public ICollection<TestResult> TestResults { get; set; }
+    // Use the TestResultList instead to fill in data. This is just to avoid confusion.
+    public ICollection<TestResult> TestResults { get; set; }
 
-        public TestRunStatistics TestRunStatistics { get; set; }
+    public TestRunStatistics TestRunStatistics { get; set; }
 
-        public long TotalExecutedTests { get; set; }
+    public long TotalExecutedTests { get; set; }
 
-        public IDictionary<string, int> AdapterTelemetry => new Dictionary<string, int>();
+    public IDictionary<string, int> AdapterTelemetry => new Dictionary<string, int>();
 
-        public ICollection<TestResult> GetLastChunk()
-        {
-            return this.TestResultList;
-        }
+    public ICollection<TestResult> GetLastChunk()
+    {
+        return TestResultList;
+    }
 
-        public void OnNewTestResult(TestResult testResult)
-        {
-            this.TestResultList.Add(testResult);
-        }
+    public void OnNewTestResult(TestResult testResult)
+    {
+        TestResultList.Add(testResult);
+    }
 
-        public bool OnTestCompletion(TestCase testCase)
-        {
-            this.TestCompletedList.Add(testCase);
+    public bool OnTestCompletion(TestCase testCase)
+    {
+        TestCompletedList.Add(testCase);
 
-            return false;
-        }
+        return false;
+    }
 
-        public void OnTestStarted(TestCase testCase)
-        {
-            this.TestStartedList.Add(testCase);
-        }
+    public void OnTestStarted(TestCase testCase)
+    {
+        TestStartedList.Add(testCase);
+    }
 
-        public void Dispose()
-        {
-        }
+    public void Dispose()
+    {
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Utilities/TestSourcesUtilityTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Utilities/TestSourcesUtilityTests.cs
index 5eaf9d64de..ad0932b0f8 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Utilities/TestSourcesUtilityTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Utilities/TestSourcesUtilityTests.cs
@@ -1,85 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.CrossPlatEngine.UnitTests.Adapter;
+
+[TestClass]
+public class TestSourcesUtilityTests
 {
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestSourcesUtilityTests
-    {
-        private static string temp = Path.GetTempPath();
+    private static readonly string Temp = Path.GetTempPath();
 
-        [TestMethod]
-        public void GetSourcesShouldAggregateSourcesIfMultiplePresentInAdapterSourceMap()
-        {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("adapter1", new List<string>() { "source1.dll", "source2.dll" });
-            adapterSourceMap.Add("adapter2", new List<string>() { "source1.dll", "source3.dll" });
-            adapterSourceMap.Add("adapter3", new List<string>() { "source1.dll"});
-
-            var sources = TestSourcesUtility.GetSources(adapterSourceMap);
-            Assert.AreEqual(5, sources.Count());
-            Assert.IsTrue(sources.Contains("source1.dll"));
-            Assert.IsTrue(sources.Contains("source2.dll"));
-            Assert.IsTrue(sources.Contains("source3.dll"));
-        }
-
-        [TestMethod]
-        public void GetSourcesShouldGetDistinctSourcesFromTestCases()
-        {
-            var path = Path.Combine(temp, "d");
-            var tests = new List<TestCase>() { new TestCase("test1", new Uri(path), "source1.dll"),
-                                               new TestCase("test2", new Uri(path), "source2.dll"),
-                                               new TestCase("test3", new Uri(path), "source1.dll")};
-
-            var sources = TestSourcesUtility.GetSources(tests);
-            Assert.AreEqual(2, sources.Count());
-            Assert.IsTrue(sources.Contains("source1.dll"));
-            Assert.IsTrue(sources.Contains("source2.dll"));
-        }
-
-        [TestMethod]
-        public void GetDefaultCodeBasePathShouldReturnNullIfAdapterSourceMapIsEmpty()
+    [TestMethod]
+    public void GetSourcesShouldAggregateSourcesIfMultiplePresentInAdapterSourceMap()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>?>
         {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
+            { "adapter1", new List<string>() { "source1.dll", "source2.dll" } },
+            { "adapter2", new List<string>() { "source1.dll", "source3.dll" } },
+            { "adapter3", new List<string>() { "source1.dll" } }
+        };
 
-            var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap);
-            Assert.IsNull(defaultCodeBase);
-        }
+        var sources = TestSourcesUtility.GetSources(adapterSourceMap)!;
+        Assert.AreEqual(5, sources.Count());
+        Assert.IsTrue(sources.Contains("source1.dll"));
+        Assert.IsTrue(sources.Contains("source2.dll"));
+        Assert.IsTrue(sources.Contains("source3.dll"));
+    }
 
-        [TestMethod]
-        public void GetDefaultCodeBasePathShouldReturnNullIfTestCaseListIsEmpty()
-        {
-            var tests = new List<TestCase>();
+    [TestMethod]
+    public void GetSourcesShouldGetDistinctSourcesFromTestCases()
+    {
+        var path = Path.Combine(Temp, "d");
+        var tests = new List<TestCase>() { new("test1", new Uri(path), "source1.dll"),
+            new("test2", new Uri(path), "source2.dll"),
+            new("test3", new Uri(path), "source1.dll")};
 
-            var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(tests);
-            Assert.IsNull(defaultCodeBase);
-        }
+        var sources = TestSourcesUtility.GetSources(tests);
+        Assert.AreEqual(2, sources.Count());
+        Assert.IsTrue(sources.Contains("source1.dll"));
+        Assert.IsTrue(sources.Contains("source2.dll"));
+    }
 
-        [TestMethod]
-        public void GetDefaultCodeBasePathShouldReturnDefaultDirectoryPathForAdapterSourceMap()
-        {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            adapterSourceMap.Add("adapter1", new List<string>() { Path.Combine(temp, "folder1", "source1.dll"), Path.Combine(temp, "folder2", "source2.dll") });
+    [TestMethod]
+    public void GetDefaultCodeBasePathShouldReturnNullIfAdapterSourceMapIsEmpty()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>?>();
+
+        var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap);
+        Assert.IsNull(defaultCodeBase);
+    }
 
-            var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap);
-            Assert.AreEqual(Path.Combine(temp, "folder1"), defaultCodeBase);
-        }
+    [TestMethod]
+    public void GetDefaultCodeBasePathShouldReturnNullIfTestCaseListIsEmpty()
+    {
+        var tests = new List<TestCase>();
+
+        var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(tests);
+        Assert.IsNull(defaultCodeBase);
+    }
 
-        [TestMethod]
-        public void GetDefaultCodeBasePathShouldReturnDefaultDirectoryPathForTestCaseList()
+    [TestMethod]
+    public void GetDefaultCodeBasePathShouldReturnDefaultDirectoryPathForAdapterSourceMap()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>?>
         {
-            var tests = new List<TestCase>() { new TestCase("test1", new Uri(Path.Combine(temp, "d")), Path.Combine(temp, "folder1", "source1.dll")) };
+            { "adapter1", new List<string>() { Path.Combine(Temp, "folder1", "source1.dll"), Path.Combine(Temp, "folder2", "source2.dll") } }
+        };
+
+        var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(adapterSourceMap);
+        Assert.AreEqual(Path.Combine(Temp, "folder1"), defaultCodeBase);
+    }
+
+    [TestMethod]
+    public void GetDefaultCodeBasePathShouldReturnDefaultDirectoryPathForTestCaseList()
+    {
+        var tests = new List<TestCase>() { new("test1", new Uri(Path.Combine(Temp, "d")), Path.Combine(Temp, "folder1", "source1.dll")) };
 
-            var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(tests);
-            Assert.AreEqual(Path.Combine(temp, "folder1"), defaultCodeBase);
-        }
+        var defaultCodeBase = TestSourcesUtility.GetDefaultCodebasePath(tests);
+        Assert.AreEqual(Path.Combine(Temp, "folder1"), defaultCodeBase);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs
index ea8e9a983c..e2d3e41e48 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameCollectorTests.cs
@@ -1,764 +1,771 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+/// <summary>
+/// The blame collector tests.
+/// </summary>
+[TestClass]
+[TestCategory("Windows")]
+public class BlameCollectorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
+    private readonly DataCollectionEnvironmentContext _context;
+    private readonly DataCollectionContext _dataCollectionContext;
+    private BlameCollector _blameDataCollector;
+    private readonly Mock<DataCollectionLogger> _mockLogger;
+    private readonly Mock<DataCollectionEvents> _mockDataColectionEvents;
+    private readonly Mock<DataCollectionSink> _mockDataCollectionSink;
+    private readonly Mock<IBlameReaderWriter> _mockBlameReaderWriter;
+    private readonly Mock<IProcessDumpUtility> _mockProcessDumpUtility;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IInactivityTimer> _mockInactivityTimer;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly XmlElement? _configurationElement;
+    private readonly string _filepath;
 
     /// <summary>
-    /// The blame collector tests.
+    /// Initializes a new instance of the <see cref="BlameCollectorTests"/> class.
     /// </summary>
-    [TestClass]
-    [TestCategory("Windows")]
-    public class BlameCollectorTests
+    public BlameCollectorTests()
     {
-        private DataCollectionEnvironmentContext context;
-        private DataCollectionContext dataCollectionContext;
-        private BlameCollector blameDataCollector;
-        private Mock<DataCollectionLogger> mockLogger;
-        private Mock<DataCollectionEvents> mockDataColectionEvents;
-        private Mock<DataCollectionSink> mockDataCollectionSink;
-        private Mock<IBlameReaderWriter> mockBlameReaderWriter;
-        private Mock<IProcessDumpUtility> mockProcessDumpUtility;
-        private Mock<IInactivityTimer> mockInactivityTimer;
-        private Mock<IFileHelper> mockFileHelper;
-        private XmlElement configurationElement;
-        private string filepath;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameCollectorTests"/> class.
-        /// </summary>
-        public BlameCollectorTests()
-        {
-            // Initializing mocks
-            this.mockLogger = new Mock<DataCollectionLogger>();
-            this.mockDataColectionEvents = new Mock<DataCollectionEvents>();
-            this.mockDataCollectionSink = new Mock<DataCollectionSink>();
-            this.mockBlameReaderWriter = new Mock<IBlameReaderWriter>();
-            this.mockProcessDumpUtility = new Mock<IProcessDumpUtility>();
-            this.mockInactivityTimer = new Mock<IInactivityTimer>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.blameDataCollector = new TestableBlameCollector(
-                this.mockBlameReaderWriter.Object,
-                this.mockProcessDumpUtility.Object,
-                this.mockInactivityTimer.Object,
-                this.mockFileHelper.Object);
-
-            // Initializing members
-            TestCase testcase = new TestCase { Id = Guid.NewGuid() };
-            this.dataCollectionContext = new DataCollectionContext(testcase);
-            this.configurationElement = null;
-            this.context = new DataCollectionEnvironmentContext(this.dataCollectionContext);
-
-            this.filepath = Path.Combine(Path.GetTempPath(), "Test");
-            FileStream stream = File.Create(this.filepath);
-            stream.Dispose();
-        }
+        // Initializing mocks
+        _mockLogger = new Mock<DataCollectionLogger>();
+        _mockDataColectionEvents = new Mock<DataCollectionEvents>();
+        _mockDataCollectionSink = new Mock<DataCollectionSink>();
+        _mockBlameReaderWriter = new Mock<IBlameReaderWriter>();
+        _mockProcessDumpUtility = new Mock<IProcessDumpUtility>();
+        _mockInactivityTimer = new Mock<IInactivityTimer>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _blameDataCollector = new TestableBlameCollector(
+            _mockBlameReaderWriter.Object,
+            _mockProcessDumpUtility.Object,
+            _mockInactivityTimer.Object,
+            _mockFileHelper.Object,
+            _mockProcessHelper.Object);
+
+        // Initializing members
+        TestCase testcase = new() { Id = Guid.NewGuid() };
+        _dataCollectionContext = new DataCollectionContext(testcase);
+        _configurationElement = null;
+        _context = new DataCollectionEnvironmentContext(_dataCollectionContext);
+
+        _filepath = Path.Combine(Path.GetTempPath(), "Test");
+        FileStream stream = File.Create(_filepath);
+        stream.Dispose();
+    }
 
-        /// <summary>
-        /// The initialize should throw exception if data collection logger is null.
-        /// </summary>
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfDataCollectionLoggerIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.blameDataCollector.Initialize(
-                    this.configurationElement,
-                    this.mockDataColectionEvents.Object,
-                    this.mockDataCollectionSink.Object,
-                    null,
-                    null);
-            });
-        }
+    /// <summary>
+    /// The initialize should throw exception if data collection logger is null.
+    /// </summary>
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfDataCollectionLoggerIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _blameDataCollector.Initialize(
+            _configurationElement,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            null!,
+            null!));
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang disabled should ensure InativityTimer is never initialized or reset
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangDisabledShouldNotInitializeInactivityTimerOrCallReset()
-        {
-            int resetCalledCount = 0;
+    /// <summary>
+    /// Initializing with collect dump for hang disabled should ensure InativityTimer is never initialized or reset
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangDisabledShouldNotInitializeInactivityTimerOrCallReset()
+    {
+        int resetCalledCount = 0;
 
-            this.mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMinutes == 1.0))).Callback(() => { resetCalledCount++; });
+        _mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMinutes == 1.0))).Callback(() => resetCalledCount++);
 
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, false),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, false),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
 
-            Assert.AreEqual(0, resetCalledCount, "Should not have called InactivityTimer.Reset since no collect dump on hang is disabled.");
-        }
+        Assert.AreEqual(0, resetCalledCount, "Should not have called InactivityTimer.Reset since no collect dump on hang is disabled.");
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang should configure the timer with the right values and should
-        /// not call the reset method if no events are received.
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangShouldInitializeInactivityTimerAndCallResetOnce()
-        {
-            int resetCalledCount = 0;
+    /// <summary>
+    /// Initializing with collect dump for hang should configure the timer with the right values and should
+    /// not call the reset method if no events are received.
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangShouldInitializeInactivityTimerAndCallResetOnce()
+    {
+        int resetCalledCount = 0;
 
-            this.mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMilliseconds == 1.0))).Callback(() => { resetCalledCount++; });
+        _mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMilliseconds == 1.0))).Callback(() => resetCalledCount++);
 
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, true, 1),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, true, 1),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
 
-            Assert.AreEqual(1, resetCalledCount, "Should have called InactivityTimer.Reset exactly once since no events were received");
-        }
+        Assert.AreEqual(1, resetCalledCount, "Should have called InactivityTimer.Reset exactly once since no events were received");
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang should configure the timer with the right values and should
-        /// reset for each event received
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangShouldInitializeInactivityTimerAndResetForEachEventReceived()
-        {
-            int resetCalledCount = 0;
+    /// <summary>
+    /// Initializing with collect dump for hang should configure the timer with the right values and should
+    /// reset for each event received
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangShouldInitializeInactivityTimerAndResetForEachEventReceived()
+    {
+        int resetCalledCount = 0;
 
-            this.mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMilliseconds == 1.0))).Callback(() => { resetCalledCount++; });
+        _mockInactivityTimer.Setup(x => x.ResetTimer(It.Is<TimeSpan>(y => y.TotalMilliseconds == 1.0))).Callback(() => resetCalledCount++);
 
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
-                .Returns(this.filepath);
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
+            .Returns(_filepath);
 
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, true, 1),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, true, 1),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
 
-            TestCase testcase = new TestCase("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
+        TestCase testcase = new("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
 
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
 
-            Assert.AreEqual(3, resetCalledCount, "Should have called InactivityTimer.Reset exactly 3 times");
-        }
+        Assert.AreEqual(3, resetCalledCount, "Should have called InactivityTimer.Reset exactly 3 times");
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang should capture a dump on timeout
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangShouldCaptureADumpOnTimeout()
-        {
-            this.blameDataCollector = new TestableBlameCollector(
-                this.mockBlameReaderWriter.Object,
-                this.mockProcessDumpUtility.Object,
-                null,
-                this.mockFileHelper.Object);
-
-            var dumpFile = "abc_hang.dmp";
-            var hangBasedDumpcollected = new ManualResetEventSlim();
-
-            this.mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
-            this.mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, false)).Returns(new[] { dumpFile });
-            this.mockDataCollectionSink.Setup(x => x.SendFileAsync(It.IsAny<FileTransferInformation>())).Callback(() => hangBasedDumpcollected.Set());
-
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, true, 0),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            hangBasedDumpcollected.Wait(1000);
-            this.mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
-            this.mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, false), Times.Once);
-            this.mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
-        }
+    /// <summary>
+    /// Initializing with collect dump for hang should capture a dump on timeout
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangShouldCaptureADumpOnTimeout()
+    {
+        _blameDataCollector = new TestableBlameCollector(
+            _mockBlameReaderWriter.Object,
+            _mockProcessDumpUtility.Object,
+            null,
+            _mockFileHelper.Object,
+            _mockProcessHelper.Object);
+
+        var dumpFile = "abc_hang.dmp";
+        var hangBasedDumpcollected = new ManualResetEventSlim();
+
+        _mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
+        _mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
+        _mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, It.IsAny<bool>())).Returns(new[] { dumpFile });
+        _mockDataCollectionSink.Setup(x => x.SendFileAsync(It.IsAny<FileTransferInformation>())).Callback(() => hangBasedDumpcollected.Set());
+
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, true, 0),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        hangBasedDumpcollected.Wait(1000);
+        _mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
+        _mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, It.IsAny<bool>()), Times.Once);
+        _mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang should kill test host process even if an error
-        /// occurs during capturing the dump. Basically it should not throw.
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfGetDumpFileFails()
-        {
-            this.blameDataCollector = new TestableBlameCollector(
-                this.mockBlameReaderWriter.Object,
-                this.mockProcessDumpUtility.Object,
-                null,
-                this.mockFileHelper.Object);
-
-            var hangBasedDumpcollected = new ManualResetEventSlim();
-
-            this.mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
-            this.mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, false)).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some exception"));
-
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, true, 0),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            hangBasedDumpcollected.Wait(1000);
-            this.mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
-            this.mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, false), Times.Once);
-        }
+    /// <summary>
+    /// Initializing with collect dump for hang should kill test host process even if an error
+    /// occurs during capturing the dump. Basically it should not throw.
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfGetDumpFileFails()
+    {
+        _blameDataCollector = new TestableBlameCollector(
+            _mockBlameReaderWriter.Object,
+            _mockProcessDumpUtility.Object,
+            null,
+            _mockFileHelper.Object,
+            _mockProcessHelper.Object);
+
+        var hangBasedDumpcollected = new ManualResetEventSlim();
+
+        _mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
+        _mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
+        _mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, It.IsAny<bool>())).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some exception"));
+
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, true, 0),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        hangBasedDumpcollected.Wait(1000);
+        _mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
+        _mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, It.IsAny<bool>()), Times.Once);
+    }
 
-        /// <summary>
-        /// Initializing with collect dump for hang should kill test host process even if an error
-        /// occurs during attaching it as a datacollector attachment. Basically it should not throw.
-        /// </summary>
-        [TestMethod]
-        public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfAttachingDumpFails()
-        {
-            this.blameDataCollector = new TestableBlameCollector(
-                this.mockBlameReaderWriter.Object,
-                this.mockProcessDumpUtility.Object,
-                null,
-                this.mockFileHelper.Object);
-
-            var dumpFile = "abc_hang.dmp";
-            var hangBasedDumpcollected = new ManualResetEventSlim();
-
-            this.mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
-            this.mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, false)).Returns(new[] { dumpFile });
-            this.mockDataCollectionSink.Setup(x => x.SendFileAsync(It.IsAny<FileTransferInformation>())).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some other exception"));
-
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, false, true, 0),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            hangBasedDumpcollected.Wait(1000);
-            this.mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
-            this.mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, false), Times.Once);
-            this.mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
-        }
+    /// <summary>
+    /// Initializing with collect dump for hang should kill test host process even if an error
+    /// occurs during attaching it as a datacollector attachment. Basically it should not throw.
+    /// </summary>
+    [TestMethod]
+    public void InitializeWithDumpForHangShouldCaptureKillTestHostOnTimeoutEvenIfAttachingDumpFails()
+    {
+        _blameDataCollector = new TestableBlameCollector(
+            _mockBlameReaderWriter.Object,
+            _mockProcessDumpUtility.Object,
+            null,
+            _mockFileHelper.Object,
+            _mockProcessHelper.Object);
+
+        var dumpFile = "abc_hang.dmp";
+        var hangBasedDumpcollected = new ManualResetEventSlim();
+
+        _mockFileHelper.Setup(x => x.Exists(It.Is<string>(y => y == "abc_hang.dmp"))).Returns(true);
+        _mockFileHelper.Setup(x => x.GetFullPath(It.Is<string>(y => y == "abc_hang.dmp"))).Returns("abc_hang.dmp");
+        _mockProcessDumpUtility.Setup(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()));
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, It.IsAny<bool>())).Returns(new[] { dumpFile });
+        _mockDataCollectionSink.Setup(x => x.SendFileAsync(It.IsAny<FileTransferInformation>())).Callback(() => hangBasedDumpcollected.Set()).Throws(new Exception("Some other exception"));
+
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, false, true, 0),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        hangBasedDumpcollected.Wait(1000);
+        _mockProcessDumpUtility.Verify(x => x.StartHangBasedProcessDump(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<Action<string>>()), Times.Once);
+        _mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, It.IsAny<bool>()), Times.Once);
+        _mockDataCollectionSink.Verify(x => x.SendFileAsync(It.Is<FileTransferInformation>(y => y.Path == dumpFile)), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should write to file if test start count is greater.
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldWriteToFileIfTestHostCrash()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.configurationElement,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
+    /// <summary>
+    /// The trigger session ended handler should write to file if test start count is greater.
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldWriteToFileIfTestHostCrash()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            _configurationElement,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
 
-            TestCase testcase = new TestCase("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
+        TestCase testcase = new("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
 
-            // Setup and Raise TestCaseStart and Session End Event
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
-                .Returns(this.filepath);
+        // Setup and Raise TestCaseStart and Session End Event
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
+            .Returns(_filepath);
 
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
 
-            // Verify WriteTestSequence Call
-            this.mockBlameReaderWriter.Verify(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()), Times.Once);
-        }
+        // Verify WriteTestSequence Call
+        _mockBlameReaderWriter.Verify(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should not write to file if test start count is same as test end count.
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldNotWriteToFileIfNoTestHostCrash()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.configurationElement,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            TestCase testcase = new TestCase("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
-
-            // Setup and Raise TestCaseStart and Session End Event
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>())).Returns(this.filepath);
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
-            this.mockDataColectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testcase, TestOutcome.Passed));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify WriteTestSequence Call
-            this.mockBlameReaderWriter.Verify(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), this.filepath), Times.Never);
-        }
+    /// <summary>
+    /// The trigger session ended handler should not write to file if test start count is same as test end count.
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldNotWriteToFileIfNoTestHostCrash()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            _configurationElement,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        TestCase testcase = new("TestProject.UnitTest.TestMethod", new Uri("test:/abc"), "abc.dll");
+
+        // Setup and Raise TestCaseStart and Session End Event
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>())).Returns(_filepath);
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase));
+        _mockDataColectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testcase, TestOutcome.Passed));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify WriteTestSequence Call
+        _mockBlameReaderWriter.Verify(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), _filepath), Times.Never);
+    }
 
-        /// <summary>
-        /// The event handlers should generate correct test sequence and testObjectDictionary for both completed and not completed tests
-        /// </summary>
-        [TestMethod]
-        public void EventHandlersShouldGenerateCorrectTestSequenceAndTestObjectDictionaryForBothCompletedAndNotCompletedTests()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.configurationElement,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            TestCase testcase1 = new TestCase("TestProject.UnitTest.TestMethod1", new Uri("test:/abc"), "abc.dll");
-            TestCase testcase2 = new TestCase("TestProject.UnitTest.TestMethod2", new Uri("test:/abc"), "abc.dll");
-            testcase1.DisplayName = "TestMethod1";
-            testcase2.DisplayName = "TestMethod2";
-            var blameTestObject1 = new BlameTestObject(testcase1);
-            var blameTestObject2 = new BlameTestObject(testcase2);
-
-            // Setup and Raise TestCaseStart and Session End Event
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>())).Returns(this.filepath);
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase1));
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase2));
-            this.mockDataColectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testcase1, TestOutcome.Passed));
-            blameTestObject1.IsCompleted = true;
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify call to mockBlameReaderWriter
-            this.mockBlameReaderWriter.Verify(
-                x => x.WriteTestSequence(
+    /// <summary>
+    /// The event handlers should generate correct test sequence and testObjectDictionary for both completed and not completed tests
+    /// </summary>
+    [TestMethod]
+    public void EventHandlersShouldGenerateCorrectTestSequenceAndTestObjectDictionaryForBothCompletedAndNotCompletedTests()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            _configurationElement,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        TestCase testcase1 = new("TestProject.UnitTest.TestMethod1", new Uri("test:/abc"), "abc.dll");
+        TestCase testcase2 = new("TestProject.UnitTest.TestMethod2", new Uri("test:/abc"), "abc.dll");
+        testcase1.DisplayName = "TestMethod1";
+        testcase2.DisplayName = "TestMethod2";
+        var blameTestObject1 = new BlameTestObject(testcase1);
+        var blameTestObject2 = new BlameTestObject(testcase2);
+
+        // Setup and Raise TestCaseStart and Session End Event
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>())).Returns(_filepath);
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase1));
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(testcase2));
+        _mockDataColectionEvents.Raise(x => x.TestCaseEnd += null, new TestCaseEndEventArgs(testcase1, TestOutcome.Passed));
+        blameTestObject1.IsCompleted = true;
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify call to mockBlameReaderWriter
+        _mockBlameReaderWriter.Verify(
+            x => x.WriteTestSequence(
                 It.Is<List<Guid>>(y => y.Count == 2 && y.First() == blameTestObject1.Id && y.Last() == blameTestObject2.Id),
                 It.Is<Dictionary<Guid, BlameTestObject>>(
                     y => y.Count == 2 &&
-                    y[blameTestObject1.Id].IsCompleted == true && y[blameTestObject2.Id].IsCompleted == false &&
-                    y[blameTestObject1.Id].FullyQualifiedName == "TestProject.UnitTest.TestMethod1" && y[blameTestObject2.Id].FullyQualifiedName == "TestProject.UnitTest.TestMethod2" &&
-                    y[blameTestObject1.Id].Source == "abc.dll" && y[blameTestObject2.Id].Source == "abc.dll" &&
-                    y[blameTestObject1.Id].DisplayName == "TestMethod1" && y[blameTestObject2.Id].DisplayName == "TestMethod2"),
+                         y[blameTestObject1.Id].IsCompleted == true && y[blameTestObject2.Id].IsCompleted == false &&
+                         y[blameTestObject1.Id].FullyQualifiedName == "TestProject.UnitTest.TestMethod1" && y[blameTestObject2.Id].FullyQualifiedName == "TestProject.UnitTest.TestMethod2" &&
+                         y[blameTestObject1.Id].Source == "abc.dll" && y[blameTestObject2.Id].Source == "abc.dll" &&
+                         y[blameTestObject1.Id].DisplayName == "TestMethod1" && y[blameTestObject2.Id].DisplayName == "TestMethod2"),
                 It.IsAny<string>()),
-                Times.Once);
-        }
+            Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should get dump files if proc dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldGetDumpFileIfProcDumpEnabled()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Setup
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(It.IsAny<bool>(), It.IsAny<bool>())).Returns(new[] { this.filepath });
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
-                .Returns(this.filepath);
-
-            // Raise
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new TestCase()));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify GetDumpFiles Call
-            this.mockProcessDumpUtility.Verify(x => x.GetDumpFiles(It.IsAny<bool>(), It.IsAny<bool>()), Times.Once);
-        }
+    /// <summary>
+    /// The trigger session ended handler should get dump files if proc dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldGetDumpFileIfProcDumpEnabled()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Setup
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(It.IsAny<bool>(), It.IsAny<bool>())).Returns(new[] { _filepath });
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
+            .Returns(_filepath);
+
+        // Raise
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new TestCase()));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify GetDumpFiles Call
+        _mockProcessDumpUtility.Verify(x => x.GetDumpFiles(It.IsAny<bool>(), It.IsAny<bool>()), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should ensure proc dump process is terminated when no crash is detected
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldEnsureProcDumpProcessIsTerminated()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Mock proc dump utility terminate process call
-            this.mockProcessDumpUtility.Setup(x => x.DetachFromTargetProcess(It.IsAny<int>()));
-
-            // Raise
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify GetDumpFiles Call
-            this.mockProcessDumpUtility.Verify(x => x.DetachFromTargetProcess(It.IsAny<int>()), Times.Once);
-        }
+    /// <summary>
+    /// The trigger session ended handler should ensure proc dump process is terminated when no crash is detected
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldEnsureProcDumpProcessIsTerminated()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Mock proc dump utility terminate process call
+        _mockProcessDumpUtility.Setup(x => x.DetachFromTargetProcess(It.IsAny<int>()));
+
+        // Raise
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify GetDumpFiles Call
+        _mockProcessDumpUtility.Verify(x => x.DetachFromTargetProcess(It.IsAny<int>()), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should get dump files if collect dump on exit was enabled irrespective of completed test case count
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldGetDumpFileIfCollectDumpOnExitIsEnabled()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(collectDumpOnExit: true),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Setup
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, false)).Returns(new[] { this.filepath });
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
-                .Returns(this.filepath);
-
-            // Raise
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify GetDumpFiles Call
-            this.mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, false), Times.Once);
-        }
+    /// <summary>
+    /// The trigger session ended handler should get dump files if collect dump on exit was enabled irrespective of completed test case count
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldGetDumpFileIfCollectDumpOnExitIsEnabled()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(collectDumpOnExit: true),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Setup
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, false)).Returns(new[] { _filepath });
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
+            .Returns(_filepath);
+
+        // Raise
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify GetDumpFiles Call
+        _mockProcessDumpUtility.Verify(x => x.GetDumpFiles(true, false), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger session ended handler should log exception if GetDumpfile throws FileNotFound Exception
-        /// </summary>
-        [TestMethod]
-        public void TriggerSessionEndedHandlerShouldLogWarningIfGetDumpFileThrowsFileNotFound()
-        {
-            // Initializing Blame Data Collector
-            // force it to collect dump on exit, which won't happen and we should see a warning
-            // but we should not see warning if we tell it to create dump and there is no crash
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(false, collectDumpOnExit: true),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Setup and raise events
-            this.mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
-                .Returns(this.filepath);
-            this.mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, It.IsAny<bool>())).Throws(new FileNotFoundException());
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-            this.mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new TestCase()));
-            this.mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(this.dataCollectionContext));
-
-            // Verify GetDumpFiles Call
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.IsAny<string>()), Times.Once);
-        }
+    /// <summary>
+    /// The trigger session ended handler should log exception if GetDumpfile throws FileNotFound Exception
+    /// </summary>
+    [TestMethod]
+    public void TriggerSessionEndedHandlerShouldLogWarningIfGetDumpFileThrowsFileNotFound()
+    {
+        // Initializing Blame Data Collector
+        // force it to collect dump on exit, which won't happen and we should see a warning
+        // but we should not see warning if we tell it to create dump and there is no crash
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(false, collectDumpOnExit: true),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Setup and raise events
+        _mockBlameReaderWriter.Setup(x => x.WriteTestSequence(It.IsAny<List<Guid>>(), It.IsAny<Dictionary<Guid, BlameTestObject>>(), It.IsAny<string>()))
+            .Returns(_filepath);
+        _mockProcessDumpUtility.Setup(x => x.GetDumpFiles(true, It.IsAny<bool>())).Throws(new FileNotFoundException());
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+        _mockDataColectionEvents.Raise(x => x.TestCaseStart += null, new TestCaseStartEventArgs(new TestCase()));
+        _mockDataColectionEvents.Raise(x => x.SessionEnd += null, new SessionEndEventArgs(_dataCollectionContext));
+
+        // Verify GetDumpFiles Call
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.IsAny<string>()), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility if proc dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityIfProcDumpEnabled()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify StartProcessDumpCall
-            this.mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false));
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility if proc dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityIfProcDumpEnabled()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify StartProcessDumpCall
+        _mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false, It.IsAny<Action<string>>()));
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityForFullDumpIfFullDumpEnabled()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(isFullDump: true),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify StartProcessDumpCall
-            this.mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), true, It.IsAny<string>(), false));
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityForFullDumpIfFullDumpEnabled()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(isFullDump: true),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify StartProcessDumpCall
+        _mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), true, It.IsAny<string>(), false, It.IsAny<Action<string>>()));
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityForFullDumpIfFullDumpEnabledCaseSensitivity()
-        {
-            var dumpConfig = this.GetDumpConfigurationElement();
-            var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("DuMpType");
-            dumpTypeAttribute.Value = "FuLl";
-            dumpConfig[BlameDataCollector.Constants.DumpModeKey].Attributes.Append(dumpTypeAttribute);
-            var dumpOnExitAttribute = dumpConfig.OwnerDocument.CreateAttribute("CollEctAlways");
-            dumpOnExitAttribute.Value = "FaLSe";
-            dumpConfig[BlameDataCollector.Constants.DumpModeKey].Attributes.Append(dumpOnExitAttribute);
-
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                dumpConfig,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify StartProcessDumpCall
-            this.mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), true, It.IsAny<string>(), false));
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldStartProcDumpUtilityForFullDumpIfFullDumpEnabledCaseSensitivity()
+    {
+        var dumpConfig = GetDumpConfigurationElement();
+        var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("DuMpType");
+        dumpTypeAttribute.Value = "FuLl";
+        dumpConfig[Constants.DumpModeKey]!.Attributes.Append(dumpTypeAttribute);
+        var dumpOnExitAttribute = dumpConfig.OwnerDocument.CreateAttribute("CollEctAlways");
+        dumpOnExitAttribute.Value = "FaLSe";
+        dumpConfig[Constants.DumpModeKey]!.Attributes.Append(dumpOnExitAttribute);
+
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            dumpConfig,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify StartProcessDumpCall
+        _mockProcessDumpUtility.Verify(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), true, It.IsAny<string>(), false, It.IsAny<Action<string>>()));
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldLogWarningForWrongCollectDumpKey()
-        {
-            var dumpConfig = this.GetDumpConfigurationElement();
-            var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("Xyz");
-            dumpTypeAttribute.Value = "FuLl";
-            dumpConfig[BlameDataCollector.Constants.DumpModeKey].Attributes.Append(dumpTypeAttribute);
-
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                dumpConfig,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterKeyIncorrect, "Xyz"))), Times.Once);
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldLogWarningForWrongCollectDumpKey()
+    {
+        var dumpConfig = GetDumpConfigurationElement();
+        var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("Xyz");
+        dumpTypeAttribute.Value = "FuLl";
+        dumpConfig[Constants.DumpModeKey]!.Attributes.Append(dumpTypeAttribute);
+
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            dumpConfig,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterKeyIncorrect, "Xyz"))), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldLogWarningForWrongDumpType()
-        {
-            var dumpConfig = this.GetDumpConfigurationElement();
-            var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("DumpType");
-            dumpTypeAttribute.Value = "random";
-            dumpConfig[BlameDataCollector.Constants.DumpModeKey].Attributes.Append(dumpTypeAttribute);
-
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                dumpConfig,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, "DumpType", BlameDataCollector.Constants.FullConfigurationValue, BlameDataCollector.Constants.MiniConfigurationValue))), Times.Once);
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldLogWarningForWrongDumpType()
+    {
+        var dumpConfig = GetDumpConfigurationElement();
+        var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("DumpType");
+        dumpTypeAttribute.Value = "random";
+        dumpConfig[Constants.DumpModeKey]!.Attributes.Append(dumpTypeAttribute);
+
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            dumpConfig,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify
+        var expectedMessage = string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterValueIncorrect, "DumpType", "random", string.Join(", ", Enum.GetNames(typeof(CrashDumpType))));
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == expectedMessage)), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldLogWarningForNonBooleanCollectAlwaysValue()
-        {
-            var dumpConfig = this.GetDumpConfigurationElement();
-            var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("DumpType");
-            dumpTypeAttribute.Value = "random";
-            dumpConfig[BlameDataCollector.Constants.DumpModeKey].Attributes.Append(dumpTypeAttribute);
-
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                dumpConfig,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, "DumpType", BlameDataCollector.Constants.FullConfigurationValue, BlameDataCollector.Constants.MiniConfigurationValue))), Times.Once);
-        }
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldLogWarningForNonBooleanCollectAlwaysValue()
+    {
+        var dumpConfig = GetDumpConfigurationElement();
+        var dumpTypeAttribute = dumpConfig.OwnerDocument.CreateAttribute("CollectAlways");
+        dumpTypeAttribute.Value = "random";
+        dumpConfig[Constants.DumpModeKey]!.Attributes.Append(dumpTypeAttribute);
+
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            dumpConfig,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify
+        var expectedMessage = string.Format(CultureInfo.CurrentCulture, Resources.Resources.BlameParameterValueIncorrect, "CollectAlways", "random", string.Join(", ", new object[] { Constants.TrueConfigurationValue, Constants.FalseConfigurationValue }));
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == expectedMessage)), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldLogNoWarningWhenDumpTypeIsUsedWithHangDumpBecauseEitherHangDumpTypeOrDumpTypeCanBeSpecified()
-        {
-            var dumpConfig = this.GetDumpConfigurationElement(isFullDump: true, false, colectDumpOnHang: true, 1800000);
+    /// <summary>
+    /// The trigger test host launched handler should start process dump utility for full dump if full dump was enabled
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldLogNoWarningWhenDumpTypeIsUsedWithHangDumpBecauseEitherHangDumpTypeOrDumpTypeCanBeSpecified()
+    {
+        var dumpConfig = GetDumpConfigurationElement(isFullDump: true, false, collectDumpOnHang: true, 1800000);
 
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                dumpConfig,
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            dumpConfig,
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
 
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
 
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.IsAny<string>()), Times.Never);
-        }
+        // Verify
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.IsAny<string>()), Times.Never);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should not break if start process dump throws TestPlatFormExceptions and log error message
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldCatchTestPlatFormExceptionsAndReportMessage()
-        {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Make StartProcessDump throw exception
-            var tpex = new TestPlatformException("env var exception");
-            this.mockProcessDumpUtility.Setup(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false))
-                                       .Throws(tpex);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentUICulture, Resources.Resources.ProcDumpCouldNotStart, tpex.Message))), Times.Once);
-        }
+    /// <summary>
+    /// The trigger test host launched handler should not break if start process dump throws TestPlatFormExceptions and log error message
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldCatchTestPlatFormExceptionsAndReportMessage()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Make StartProcessDump throw exception
+        var tpex = new TestPlatformException("env var exception");
+        _mockProcessDumpUtility.Setup(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false, It.IsAny<Action<string>>()))
+            .Throws(tpex);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentCulture, Resources.Resources.ProcDumpCouldNotStart, tpex.Message))), Times.Once);
+    }
 
-        /// <summary>
-        /// The trigger test host launched handler should not break if start process dump throws unknown exceptions and report message with stack trace
-        /// </summary>
-        [TestMethod]
-        public void TriggerTestHostLaunchedHandlerShouldCatchAllUnexpectedExceptionsAndReportMessageWithStackTrace()
+    /// <summary>
+    /// The trigger test host launched handler should not break if start process dump throws unknown exceptions and report message with stack trace
+    /// </summary>
+    [TestMethod]
+    public void TriggerTestHostLaunchedHandlerShouldCatchAllUnexpectedExceptionsAndReportMessageWithStackTrace()
+    {
+        // Initializing Blame Data Collector
+        _blameDataCollector.Initialize(
+            GetDumpConfigurationElement(),
+            _mockDataColectionEvents.Object,
+            _mockDataCollectionSink.Object,
+            _mockLogger.Object,
+            _context);
+
+        // Make StartProcessDump throw exception
+        var ex = new Exception("start process failed");
+        _mockProcessDumpUtility.Setup(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false, It.IsAny<Action<string>>()))
+            .Throws(ex);
+
+        // Raise TestHostLaunched
+        _mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(_dataCollectionContext, 1234));
+
+        // Verify
+        _mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentCulture, Resources.Resources.ProcDumpCouldNotStart, ex.ToString()))), Times.Once);
+    }
+
+    [TestCleanup]
+    public void CleanUp()
+    {
+        File.Delete(_filepath);
+    }
+
+    private static XmlElement GetDumpConfigurationElement(
+        bool isFullDump = false,
+        bool collectDumpOnExit = false,
+        bool collectDumpOnHang = false,
+        int inactivityTimeInMilliseconds = 0)
+    {
+        var xmldoc = new XmlDocument();
+        var outernode = xmldoc.CreateElement("Configuration");
+        var node = xmldoc.CreateElement(Constants.DumpModeKey);
+        outernode.AppendChild(node);
+        node.InnerText = "Text";
+
+        if (isFullDump)
         {
-            // Initializing Blame Data Collector
-            this.blameDataCollector.Initialize(
-                this.GetDumpConfigurationElement(),
-                this.mockDataColectionEvents.Object,
-                this.mockDataCollectionSink.Object,
-                this.mockLogger.Object,
-                this.context);
-
-            // Make StartProcessDump throw exception
-            var ex = new Exception("start process failed");
-            this.mockProcessDumpUtility.Setup(x => x.StartTriggerBasedProcessDump(1234, It.IsAny<string>(), false, It.IsAny<string>(), false))
-                                       .Throws(ex);
-
-            // Raise TestHostLaunched
-            this.mockDataColectionEvents.Raise(x => x.TestHostLaunched += null, new TestHostLaunchedEventArgs(this.dataCollectionContext, 1234));
-
-            // Verify
-            this.mockLogger.Verify(x => x.LogWarning(It.IsAny<DataCollectionContext>(), It.Is<string>(str => str == string.Format(CultureInfo.CurrentUICulture, Resources.Resources.ProcDumpCouldNotStart, ex.ToString()))), Times.Once);
+            var fulldumpAttribute = xmldoc.CreateAttribute(Constants.DumpTypeKey);
+            fulldumpAttribute.Value = "full";
+            node.Attributes.Append(fulldumpAttribute);
         }
 
-        [TestCleanup]
-        public void CleanUp()
+        if (collectDumpOnExit)
         {
-            File.Delete(this.filepath);
+            var collectDumpOnExitAttribute = xmldoc.CreateAttribute(Constants.CollectDumpAlwaysKey);
+            collectDumpOnExitAttribute.Value = "true";
+            node.Attributes.Append(collectDumpOnExitAttribute);
         }
 
-        private XmlElement GetDumpConfigurationElement(
-            bool isFullDump = false,
-            bool collectDumpOnExit = false,
-            bool colectDumpOnHang = false,
-            int inactivityTimeInMilliseconds = 0)
+        if (collectDumpOnHang)
         {
-            var xmldoc = new XmlDocument();
-            var outernode = xmldoc.CreateElement("Configuration");
-            var node = xmldoc.CreateElement(BlameDataCollector.Constants.DumpModeKey);
-            outernode.AppendChild(node);
-            node.InnerText = "Text";
+            var hangDumpNode = xmldoc.CreateElement(Constants.CollectDumpOnTestSessionHang);
+            outernode.AppendChild(hangDumpNode);
+
+            var inactivityTimeAttribute = xmldoc.CreateAttribute(Constants.TestTimeout);
+            inactivityTimeAttribute.Value = $"{inactivityTimeInMilliseconds}";
+            hangDumpNode.Attributes.Append(inactivityTimeAttribute);
 
             if (isFullDump)
             {
-                var fulldumpAttribute = xmldoc.CreateAttribute(BlameDataCollector.Constants.DumpTypeKey);
+                var fulldumpAttribute = xmldoc.CreateAttribute(Constants.DumpTypeKey);
                 fulldumpAttribute.Value = "full";
-                node.Attributes.Append(fulldumpAttribute);
-            }
-
-            if (collectDumpOnExit)
-            {
-                var collectDumpOnExitAttribute = xmldoc.CreateAttribute(BlameDataCollector.Constants.CollectDumpAlwaysKey);
-                collectDumpOnExitAttribute.Value = "true";
-                node.Attributes.Append(collectDumpOnExitAttribute);
+                hangDumpNode.Attributes.Append(fulldumpAttribute);
             }
-
-            if (colectDumpOnHang)
-            {
-                var hangDumpNode = xmldoc.CreateElement(BlameDataCollector.Constants.CollectDumpOnTestSessionHang);
-                outernode.AppendChild(hangDumpNode);
-
-                var inactivityTimeAttribute = xmldoc.CreateAttribute(BlameDataCollector.Constants.TestTimeout);
-                inactivityTimeAttribute.Value = $"{inactivityTimeInMilliseconds}";
-                hangDumpNode.Attributes.Append(inactivityTimeAttribute);
-
-                if (isFullDump)
-                {
-                    var fulldumpAttribute = xmldoc.CreateAttribute(BlameDataCollector.Constants.DumpTypeKey);
-                    fulldumpAttribute.Value = "full";
-                    hangDumpNode.Attributes.Append(fulldumpAttribute);
-                }
-            }
-
-            return outernode;
         }
 
+        return outernode;
+    }
+
+    /// <summary>
+    /// The testable blame collector.
+    /// </summary>
+    internal class TestableBlameCollector : BlameCollector
+    {
         /// <summary>
-        /// The testable blame collector.
+        /// Initializes a new instance of the <see cref="TestableBlameCollector"/> class.
         /// </summary>
-        internal class TestableBlameCollector : BlameCollector
+        /// <param name="blameReaderWriter">
+        /// The blame reader writer.
+        /// </param>
+        /// <param name="processDumpUtility">
+        /// ProcessDumpUtility instance.
+        /// </param>
+        /// <param name="inactivityTimer">
+        /// InactivityTimer instance.
+        /// </param>
+        /// <param name="mockFileHelper">
+        /// MockFileHelper instance.
+        /// </param>
+        /// <param name="mockProcessHelper">Mockd process helper</param>
+        internal TestableBlameCollector(IBlameReaderWriter blameReaderWriter, IProcessDumpUtility processDumpUtility, IInactivityTimer? inactivityTimer,
+            IFileHelper mockFileHelper, IProcessHelper mockProcessHelper)
+            : base(blameReaderWriter, processDumpUtility, inactivityTimer, mockFileHelper, mockProcessHelper)
         {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TestableBlameCollector"/> class.
-            /// </summary>
-            /// <param name="blameReaderWriter">
-            /// The blame reader writer.
-            /// </param>
-            /// <param name="processDumpUtility">
-            /// ProcessDumpUtility instance.
-            /// </param>
-            /// <param name="inactivityTimer">
-            /// InactivityTimer instance.
-            /// </param>
-            /// <param name="mockFileHelper">
-            /// MockFileHelper instance.
-            /// </param>
-            internal TestableBlameCollector(IBlameReaderWriter blameReaderWriter, IProcessDumpUtility processDumpUtility, IInactivityTimer inactivityTimer, IFileHelper mockFileHelper)
-                : base(blameReaderWriter, processDumpUtility, inactivityTimer, mockFileHelper)
-            {
-            }
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameLoggerTests.cs
index 958763d7c3..347173a11c 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/BlameLoggerTests.cs
@@ -1,173 +1,163 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+/// <summary>
+/// The blame logger tests.
+/// </summary>
+[TestClass]
+public class BlameLoggerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly Mock<IBlameReaderWriter> _mockBlameReaderWriter;
+    private readonly BlameLogger _blameLogger;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BlameLoggerTests"/> class.
+    /// </summary>
+    public BlameLoggerTests()
+    {
+        // Mock for ITestRunRequest
+        _mockOutput = new Mock<IOutput>();
+        _mockBlameReaderWriter = new Mock<IBlameReaderWriter>();
+        _blameLogger = new TestableBlameLogger(_mockOutput.Object, _mockBlameReaderWriter.Object);
+    }
 
-    using Moq;
+    /// <summary>
+    /// The initialize should throw exception if events is null.
+    /// </summary>
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfEventsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _blameLogger.Initialize(null!, string.Empty));
+    }
 
     /// <summary>
-    /// The blame logger tests.
+    /// The test run complete handler should get faulty test run if test run aborted.
     /// </summary>
-    [TestClass]
-    public class BlameLoggerTests
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldGetFaultyTestRunIfTestRunAborted()
     {
-        private Mock<ITestRunRequest> testRunRequest;
-        private Mock<TestLoggerEvents> events;
-        private Mock<IOutput> mockOutput;
-        private Mock<IBlameReaderWriter> mockBlameReaderWriter;
-        private BlameLogger blameLogger;
+        InitializeAndVerify(1);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlameLoggerTests"/> class.
-        /// </summary>
-        public BlameLoggerTests()
-        {
-            // Mock for ITestRunRequest
-            this.testRunRequest = new Mock<ITestRunRequest>();
-            this.events = new Mock<TestLoggerEvents>();
-            this.mockOutput = new Mock<IOutput>();
-            this.mockBlameReaderWriter = new Mock<IBlameReaderWriter>();
-            this.blameLogger = new TestableBlameLogger(this.mockOutput.Object, this.mockBlameReaderWriter.Object);
-        }
+    /// <summary>
+    /// The test run complete handler should get faulty test run if test run aborted for multiple test project.
+    /// </summary>
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldGetFaultyTestRunIfTestRunAbortedForMultipleProjects()
+    {
+        InitializeAndVerify(2);
+    }
 
-        /// <summary>
-        /// The initialize should throw exception if events is null.
-        /// </summary>
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfEventsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.blameLogger.Initialize(null, string.Empty);
-            });
-        }
+    /// <summary>
+    /// The test run complete handler should not read file if test run not aborted.
+    /// </summary>
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldNotReadFileIfTestRunNotAborted()
+    {
+        // Initialize Blame Logger
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        _blameLogger.Initialize(loggerEvents, null);
 
-        /// <summary>
-        /// The test run complete handler should get faulty test run if test run aborted.
-        /// </summary>
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldGetFaultyTestRunIfTestRunAborted()
-        {
-            this.InitializeAndVerify(1);
-        }
+        // Setup and Raise event
+        _mockBlameReaderWriter.Setup(x => x.ReadTestSequence(It.IsAny<string>()));
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-        /// <summary>
-        /// The test run complete handler should get faulty test run if test run aborted for multiple test project.
-        /// </summary>
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldGetFaultyTestRunIfTestRunAbortedForMultipleProjects()
-        {
-            this.InitializeAndVerify(2);
-        }
+        // Verify Call
+        _mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.IsAny<string>()), Times.Never);
+    }
 
-        /// <summary>
-        /// The test run complete handler should not read file if test run not aborted.
-        /// </summary>
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldNotReadFileIfTestRunNotAborted()
-        {
-            // Initialize Blame Logger
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            this.blameLogger.Initialize(loggerEvents, (string)null);
+    /// <summary>
+    /// The test run complete handler should return if uri attachment is null.
+    /// </summary>
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldReturnIfUriAttachmentIsNull()
+    {
+        // Initialize
+        var attachmentSet = new AttachmentSet(new Uri("test://uri"), "Blame");
+        var attachmentSetList = new List<AttachmentSet> { attachmentSet };
 
-            // Setup and Raise event
-            this.mockBlameReaderWriter.Setup(x => x.ReadTestSequence(It.IsAny<string>()));
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(1, 0, 0, 0));
+        // Initialize Blame Logger
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        _blameLogger.Initialize(loggerEvents, null);
 
-            // Verify Call
-            this.mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.IsAny<string>()), Times.Never);
-        }
+        // Setup and Raise event
+        loggerEvents.CompleteTestRun(null, false, true, null, new Collection<AttachmentSet>(attachmentSetList), new Collection<InvokedDataCollector>(), new TimeSpan(1, 0, 0, 0));
 
-        /// <summary>
-        /// The test run complete handler should return if uri attachment is null.
-        /// </summary>
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldReturnIfUriAttachmentIsNull()
-        {
-            // Initialize
-            var attachmentSet = new AttachmentSet(new Uri("test://uri"), "Blame");
-            var attachmentSetList = new List<AttachmentSet> { attachmentSet };
+        // Verify Call
+        _mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.IsAny<string>()), Times.Never);
+    }
 
-            // Initialize Blame Logger
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            this.blameLogger.Initialize(loggerEvents, (string)null);
+    private static AttachmentSet GetAttachmentSet()
+    {
+        var attachmentSet = new AttachmentSet(new Uri("test://uri"), "Blame");
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:/folder1/sequence.xml"), "description"));
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:/folder1/dump.dmp"), "description"));
 
-            // Setup and Raise event
-            loggerEvents.CompleteTestRun(null, false, true, null, new Collection<AttachmentSet>(attachmentSetList), new TimeSpan(1, 0, 0, 0));
+        return attachmentSet;
+    }
 
-            // Verify Call
-            this.mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.IsAny<string>()), Times.Never);
-        }
+    private void InitializeAndVerify(int count)
+    {
+        // Initialize
+        var attachmentSetList = new List<AttachmentSet>();
 
-        private AttachmentSet GetAttachmentSet()
+        for (int i = 0; i < count; i++)
         {
-            var attachmentSet = new AttachmentSet(new Uri("test://uri"), "Blame");
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:/folder1/sequence.xml"), "description"));
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:/folder1/dump.dmp"), "description"));
-
-            return attachmentSet;
+            attachmentSetList.Add(GetAttachmentSet());
         }
 
-        private void InitializeAndVerify(int count)
+        // Initialize Blame Logger
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        _blameLogger.Initialize(loggerEvents, null);
+
+        var testCaseList = new List<BlameTestObject>
         {
-            // Initialize
-            var attachmentSetList = new List<AttachmentSet>();
-
-            for (int i = 0; i < count; i++)
-            {
-                attachmentSetList.Add(this.GetAttachmentSet());
-            }
-
-            // Initialize Blame Logger
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            this.blameLogger.Initialize(loggerEvents, (string)null);
-
-            var testCaseList =
-                    new List<BlameTestObject>
-                        {
-                        new BlameTestObject(new TestCase("ABC.UnitTestMethod1", new Uri("test://uri"), "C://test/filepath")),
-                        new BlameTestObject(new TestCase("ABC.UnitTestMethod2", new Uri("test://uri"), "C://test/filepath"))
-                        };
-
-            // Setup and Raise event
-            this.mockBlameReaderWriter.Setup(x => x.ReadTestSequence(It.IsAny<string>())).Returns(testCaseList);
-            loggerEvents.CompleteTestRun(null, false, true, null, new Collection<AttachmentSet>(attachmentSetList), new TimeSpan(1, 0, 0, 0));
-
-            // Verify Call
-            this.mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.Is<string>(str => str.EndsWith(".xml"))), Times.Exactly(count));
-        }
+            new(new TestCase("ABC.UnitTestMethod1", new Uri("test://uri"), "C://test/filepath")),
+            new(new TestCase("ABC.UnitTestMethod2", new Uri("test://uri"), "C://test/filepath"))
+        };
+
+        // Setup and Raise event
+        _mockBlameReaderWriter.Setup(x => x.ReadTestSequence(It.IsAny<string>())).Returns(testCaseList);
+        loggerEvents.CompleteTestRun(null, false, true, null, new Collection<AttachmentSet>(attachmentSetList), new Collection<InvokedDataCollector>(), new TimeSpan(1, 0, 0, 0));
+
+        // Verify Call
+        _mockBlameReaderWriter.Verify(x => x.ReadTestSequence(It.Is<string>(str => str.EndsWith(".xml"))), Times.Exactly(count));
+    }
 
+    /// <summary>
+    /// The testable blame logger.
+    /// </summary>
+    internal class TestableBlameLogger : BlameLogger
+    {
         /// <summary>
-        /// The testable blame logger.
+        /// Initializes a new instance of the <see cref="TestableBlameLogger"/> class.
         /// </summary>
-        internal class TestableBlameLogger : BlameLogger
+        /// <param name="output">
+        /// The output.
+        /// </param>
+        /// <param name="blameReaderWriter">
+        /// The blame Reader Writer.
+        /// </param>
+        internal TestableBlameLogger(IOutput output, IBlameReaderWriter blameReaderWriter)
+            : base(output, blameReaderWriter)
         {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TestableBlameLogger"/> class.
-            /// </summary>
-            /// <param name="output">
-            /// The output.
-            /// </param>
-            /// <param name="blameReaderWriter">
-            /// The blame Reader Writer.
-            /// </param>
-            internal TestableBlameLogger(IOutput output, IBlameReaderWriter blameReaderWriter)
-                : base(output, blameReaderWriter)
-            {
-            }
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/InactivityTimerTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/InactivityTimerTests.cs
index 7897eb1f2e..2014f39a7d 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/InactivityTimerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/InactivityTimerTests.cs
@@ -1,31 +1,31 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
+using System;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+[TestClass]
+public class InactivityTimerTests
 {
-    using System;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private int _callBackCount;
+    private readonly ManualResetEventSlim _timerEvent = new();
 
-    [TestClass]
-    public class InactivityTimerTests
+    [TestMethod]
+    public void InactivityTimerShouldResetAndCallbackWhenResetIsCalled()
     {
-        private int callBackCount = 0;
-        private ManualResetEventSlim timerEvent = new ManualResetEventSlim();
-
-        [TestMethod]
-        public void InactivityTimerShouldResetAndCallbackWhenResetIsCalled()
-        {
-            var timer = new InactivityTimer(this.TimerCallback);
-            timer.ResetTimer(TimeSpan.FromMilliseconds(1));
-            this.timerEvent.Wait(1000);
-            Assert.AreEqual(1, this.callBackCount, "Should have fired once.");
-        }
+        var timer = new InactivityTimer(TimerCallback);
+        timer.ResetTimer(TimeSpan.FromMilliseconds(1));
+        _timerEvent.Wait(1000);
+        Assert.AreEqual(1, _callBackCount, "Should have fired once.");
+    }
 
-        private void TimerCallback()
-        {
-            this.callBackCount++;
-            this.timerEvent.Set();
-        }
+    private void TimerCallback()
+    {
+        _callBackCount++;
+        _timerEvent.Set();
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj
index 09bce9beb6..81efd08aad 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj
@@ -1,35 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
+    <!-- NU1702 suppresses warning about testhost being .NET Framework reference imported to a .NET project.
+    Unfortunately this can't be suppressed at single ProjectReference. Neither completely suppressed by using NoWarn.
+    Workaround is documented here: https://github.com/NuGet/Home/issues/8093, but this syntax and placement would be preferred:
+    https://github.com/dotnet/core/issues/869
+    -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NU1702</MSBuildWarningsAsMessages>
+    <!-- MSB3270 Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) projects. -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <!-- MSB3276 Suppress warnings about conflicts between different versions of the same dependent assembly -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3276</MSBuildWarningsAsMessages>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests</AssemblyName>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
-    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="netstandard" /> 
+    <Compile Remove="Properties\**" />
+    <None Remove="Properties\**" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.BlameDataCollector\Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.3" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcDumpArgsBuilderTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcDumpArgsBuilderTests.cs
index eb1d7114ee..424f25074c 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcDumpArgsBuilderTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcDumpArgsBuilderTests.cs
@@ -1,57 +1,71 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+[TestClass]
+public class ProcDumpArgsBuilderTests
 {
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly int _defaultProcId = 1234;
+    private readonly string _defaultDumpFileName = "dump";
 
-    [TestClass]
-    public class ProcDumpArgsBuilderTests
+    [TestMethod]
+    public void BuildHangBasedProcDumpArgsShouldCreateCorrectArgString()
     {
-        private int defaultProcId = 1234;
-        private string defaultDumpFileName = "dump";
-
-        [TestMethod]
-        public void BuildHangBasedProcDumpArgsShouldCreateCorrectArgString()
-        {
-            var procDumpArgsBuilder = new ProcDumpArgsBuilder();
-            var argString = procDumpArgsBuilder.BuildHangBasedProcDumpArgs(this.defaultProcId, this.defaultDumpFileName, false);
-            Assert.AreEqual("-accepteula -n 1 1234 dump.dmp", argString);
-        }
-
-        [TestMethod]
-        public void BuildHangBasedProcDumpArgsWithFullDumpEnabledShouldCreateCorrectArgString()
-        {
-            var procDumpArgsBuilder = new ProcDumpArgsBuilder();
-            var argString = procDumpArgsBuilder.BuildHangBasedProcDumpArgs(this.defaultProcId, this.defaultDumpFileName, true);
-            Assert.AreEqual("-accepteula -n 1 -ma 1234 dump.dmp", argString);
-        }
-
-        [TestMethod]
-        public void BuildTriggerBasedProcDumpArgsShouldCreateCorrectArgString()
-        {
-            var procDumpArgsBuilder = new ProcDumpArgsBuilder();
-            var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(this.defaultProcId, this.defaultDumpFileName, new List<string> { "a", "b" }, false);
-            Assert.AreEqual("-accepteula -e 1 -g -t -f a -f b 1234 dump.dmp", argString);
-        }
-
-        [TestMethod]
-        public void BuildTriggerProcDumpArgsWithFullDumpEnabledShouldCreateCorrectArgString()
-        {
-            var procDumpArgsBuilder = new ProcDumpArgsBuilder();
-            var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(this.defaultProcId, this.defaultDumpFileName, new List<string> { "a", "b" }, true);
-            Assert.AreEqual("-accepteula -e 1 -g -t -ma -f a -f b 1234 dump.dmp", argString);
-        }
-
-        [TestMethod]
-        public void BuildTriggerProcDumpArgsWithAlwaysCollectShouldCreateCorrectArgString()
-        {
-            var procDumpArgsBuilder = new ProcDumpArgsBuilder();
-            var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(this.defaultProcId, this.defaultDumpFileName, new List<string> { "a", "b" }, true);
-
-            // adds -t for collect on every process exit
-            Assert.AreEqual("-accepteula -e 1 -g -t -ma -f a -f b 1234 dump.dmp", argString);
-        }
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder();
+        var argString = procDumpArgsBuilder.BuildHangBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, false);
+        Assert.AreEqual("-accepteula -n 1 1234 dump.dmp", argString);
+    }
+
+    [TestMethod]
+    public void BuildHangBasedProcDumpArgsWithFullDumpEnabledShouldCreateCorrectArgString()
+    {
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder();
+        var argString = procDumpArgsBuilder.BuildHangBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, true);
+        Assert.AreEqual("-accepteula -n 1 -ma 1234 dump.dmp", argString);
+    }
+
+    [TestMethod]
+    public void BuildTriggerBasedProcDumpArgsShouldCreateCorrectArgString()
+    {
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder();
+        var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, new List<string> { "a", "b" }, false);
+        Assert.AreEqual("-accepteula -e 1 -g -t -f a -f b 1234 dump.dmp", argString);
+    }
+
+    [TestMethod]
+    public void BuildTriggerProcDumpArgsWithFullDumpEnabledShouldCreateCorrectArgString()
+    {
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder();
+        var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, new List<string> { "a", "b" }, true);
+        Assert.AreEqual("-accepteula -e 1 -g -t -ma -f a -f b 1234 dump.dmp", argString);
+    }
+
+    [TestMethod]
+    public void BuildTriggerProcDumpArgsWithAlwaysCollectShouldCreateCorrectArgString()
+    {
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder();
+        var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, new List<string> { "a", "b" }, true);
+
+        // adds -t for collect on every process exit
+        Assert.AreEqual("-accepteula -e 1 -g -t -ma -f a -f b 1234 dump.dmp", argString);
+    }
+
+    [TestMethod]
+    public void BuildTriggerProcDumpArgsWith_VSTEST_DUMP_PROCDUMPARGUMENTS_EnvironmentVariable()
+    {
+        Mock<IEnvironmentVariableHelper> environmentVariableHelper = new();
+        environmentVariableHelper.Setup(e => e.GetEnvironmentVariable("VSTEST_DUMP_PROCDUMPARGUMENTS")).Returns("-e 1 -g -t -ma");
+
+        var procDumpArgsBuilder = new ProcDumpArgsBuilder(environmentVariableHelper.Object);
+        var argString = procDumpArgsBuilder.BuildTriggerBasedProcDumpArgs(_defaultProcId, _defaultDumpFileName, new List<string> { "a", "b" }, true);
+        Assert.AreEqual("-accepteula -e 1 -g -t -ma 1234 dump.dmp", argString);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcessDumpUtilityTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcessDumpUtilityTests.cs
index 82dbe72e70..03e9c234ac 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcessDumpUtilityTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/ProcessDumpUtilityTests.cs
@@ -1,70 +1,68 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
 
-    using Moq;
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+/// <summary>
+/// The blame collector tests.
+/// </summary>
+[TestClass]
+public class ProcessDumpUtilityTests
+{
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IHangDumperFactory> _mockHangDumperFactory;
+    private readonly Mock<ICrashDumperFactory> _mockCrashDumperFactory;
 
     /// <summary>
-    /// The blame collector tests.
+    /// Initializes a new instance of the <see cref="ProcessDumpUtilityTests"/> class.
     /// </summary>
-    [TestClass]
-    public class ProcessDumpUtilityTests
+    public ProcessDumpUtilityTests()
     {
-        private Mock<IFileHelper> mockFileHelper;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<IHangDumperFactory> mockHangDumperFactory;
-        private Mock<ICrashDumperFactory> mockCrashDumperFactory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProcessDumpUtilityTests"/> class.
-        /// </summary>
-        public ProcessDumpUtilityTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockHangDumperFactory = new Mock<IHangDumperFactory>();
-            this.mockCrashDumperFactory = new Mock<ICrashDumperFactory>();
-        }
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockHangDumperFactory = new Mock<IHangDumperFactory>();
+        _mockCrashDumperFactory = new Mock<ICrashDumperFactory>();
+    }
 
-        /// <summary>
-        /// GetDumpFile will return empty list of strings if no dump files found
-        /// </summary>
-        [TestMethod]
-        public void GetDumpFileWillThrowExceptionIfNoDumpfile()
-        {
-            var process = "process";
-            var processId = 12345;
-            var testResultsDirectory = "D:\\TestResults";
+    /// <summary>
+    /// GetDumpFile will return empty list of strings if no dump files found
+    /// </summary>
+    [TestMethod]
+    public void GetDumpFileWillThrowExceptionIfNoDumpfile()
+    {
+        var process = "process";
+        var processId = 12345;
+        var testResultsDirectory = "D:\\TestResults";
 
-            this.mockFileHelper.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
-                .Returns(new string[] { });
-            this.mockProcessHelper.Setup(x => x.GetProcessName(processId))
-                .Returns(process);
+        _mockFileHelper.Setup(x => x.GetFiles(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<SearchOption>()))
+            .Returns([]);
+        _mockProcessHelper.Setup(x => x.GetProcessName(processId))
+            .Returns(process);
 
-            this.mockHangDumperFactory.Setup(x => x.Create(It.IsAny<string>()))
-                .Returns(new Mock<IHangDumper>().Object);
+        _mockHangDumperFactory.Setup(x => x.Create(It.IsAny<string>()))
+            .Returns(new Mock<IHangDumper>().Object);
 
-            this.mockCrashDumperFactory.Setup(x => x.Create(It.IsAny<string>()))
-                .Returns(new Mock<ICrashDumper>().Object);
+        _mockCrashDumperFactory.Setup(x => x.Create(It.IsAny<string>()))
+            .Returns(new Mock<ICrashDumper>().Object);
 
-            var processDumpUtility = new ProcessDumpUtility(
-                this.mockProcessHelper.Object,
-                this.mockFileHelper.Object,
-                this.mockHangDumperFactory.Object,
-                this.mockCrashDumperFactory.Object);
+        var processDumpUtility = new ProcessDumpUtility(
+            _mockProcessHelper.Object,
+            _mockFileHelper.Object,
+            _mockHangDumperFactory.Object,
+            _mockCrashDumperFactory.Object);
 
-            processDumpUtility.StartTriggerBasedProcessDump(processId, testResultsDirectory, false, ".NETCoreApp,Version=v5.0", false);
+        processDumpUtility.StartTriggerBasedProcessDump(processId, testResultsDirectory, false, ".NETCoreApp,Version=v5.0", false, _ => { });
 
-            var ex = Assert.ThrowsException<FileNotFoundException>(() => processDumpUtility.GetDumpFiles(true, false));
-            Assert.AreEqual(ex.Message, Resources.Resources.DumpFileNotGeneratedErrorMessage);
-        }
+        var ex = Assert.ThrowsException<FileNotFoundException>(() => processDumpUtility.GetDumpFiles(true, false));
+        Assert.AreEqual(ex.Message, Resources.Resources.DumpFileNotGeneratedErrorMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Program.cs
deleted file mode 100644
index 43205ef72e..0000000000
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
index c8b7b5f689..e23dc5a040 100644
--- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/XmlReaderWriterTests.cs
@@ -1,219 +1,190 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
 
-    using Moq;
+namespace Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests;
+
+/// <summary>
+/// The xml reader writer tests.
+/// </summary>
+[TestClass]
+public class XmlReaderWriterTests
+{
+    private readonly TestableXmlReaderWriter _xmlReaderWriter;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<Stream> _mockStream;
+    private readonly List<Guid> _testCaseList;
+    private readonly Dictionary<Guid, BlameTestObject> _testObjectDictionary;
+    private readonly BlameTestObject _blameTestObject;
 
     /// <summary>
-    /// The xml reader writer tests.
+    /// Initializes a new instance of the <see cref="XmlReaderWriterTests"/> class.
     /// </summary>
-    [TestClass]
-    public class XmlReaderWriterTests
+    public XmlReaderWriterTests()
     {
-        private TestableXmlReaderWriter xmlReaderWriter;
-        private Mock<IFileHelper> mockFileHelper;
-        private Mock<Stream> mockStream;
-        private List<Guid> testCaseList;
-        private Dictionary<Guid, BlameTestObject> testObjectDictionary;
-        private BlameTestObject blameTestObject;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlReaderWriterTests"/> class.
-        /// </summary>
-        public XmlReaderWriterTests()
+        _mockFileHelper = new Mock<IFileHelper>();
+        _xmlReaderWriter = new TestableXmlReaderWriter(_mockFileHelper.Object);
+        _mockStream = new Mock<Stream>();
+        _testCaseList = new List<Guid>();
+        _testObjectDictionary = new Dictionary<Guid, BlameTestObject>();
+        var testcase = new TestCase
         {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.xmlReaderWriter = new TestableXmlReaderWriter(this.mockFileHelper.Object);
-            this.mockStream = new Mock<Stream>();
-            this.testCaseList = new List<Guid>();
-            this.testObjectDictionary = new Dictionary<Guid, BlameTestObject>();
-            var testcase = new TestCase
-            {
-                ExecutorUri = new Uri("test:/abc"),
-                FullyQualifiedName = "TestProject.UnitTest.TestMethod",
-                Source = "abc.dll"
-            };
-            this.blameTestObject = new BlameTestObject(testcase);
-        }
+            ExecutorUri = new Uri("test:/abc"),
+            FullyQualifiedName = "TestProject.UnitTest.TestMethod",
+            Source = "abc.dll"
+        };
+        _blameTestObject = new BlameTestObject(testcase);
+    }
 
-        /// <summary>
-        /// The write test sequence should throw exception if file path is null.
-        /// </summary>
-        [TestMethod]
-        public void WriteTestSequenceShouldThrowExceptionIfFilePathIsNull()
-        {
-            this.testCaseList.Add(this.blameTestObject.Id);
-            this.testObjectDictionary.Add(this.blameTestObject.Id, this.blameTestObject);
+    /// <summary>
+    /// The write test sequence should throw exception if file path is null.
+    /// </summary>
+    [TestMethod]
+    public void WriteTestSequenceShouldThrowExceptionIfFilePathIsNull()
+    {
+        _testCaseList.Add(_blameTestObject.Id);
+        _testObjectDictionary.Add(_blameTestObject.Id, _blameTestObject);
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.xmlReaderWriter.WriteTestSequence(this.testCaseList, this.testObjectDictionary, null);
-            });
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => _xmlReaderWriter.WriteTestSequence(_testCaseList, _testObjectDictionary, null!));
+    }
 
-        /// <summary>
-        /// The write test sequence should throw exception if file path is empty.
-        /// </summary>
-        [TestMethod]
-        public void WriteTestSequenceShouldThrowExceptionIfFilePathIsEmpty()
-        {
-            this.testCaseList.Add(this.blameTestObject.Id);
-            this.testObjectDictionary.Add(this.blameTestObject.Id, this.blameTestObject);
+    /// <summary>
+    /// The write test sequence should throw exception if file path is empty.
+    /// </summary>
+    [TestMethod]
+    public void WriteTestSequenceShouldThrowExceptionIfFilePathIsEmpty()
+    {
+        _testCaseList.Add(_blameTestObject.Id);
+        _testObjectDictionary.Add(_blameTestObject.Id, _blameTestObject);
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.xmlReaderWriter.WriteTestSequence(this.testCaseList, this.testObjectDictionary, string.Empty);
-            });
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => _xmlReaderWriter.WriteTestSequence(_testCaseList, _testObjectDictionary, string.Empty));
+    }
 
-        /// <summary>
-        /// The read test sequence should throw exception if file path is null.
-        /// </summary>
-        [TestMethod]
-        public void ReadTestSequenceShouldThrowExceptionIfFilePathIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.xmlReaderWriter.ReadTestSequence(null);
-            });
-        }
+    /// <summary>
+    /// The read test sequence should throw exception if file path is null.
+    /// </summary>
+    [TestMethod]
+    public void ReadTestSequenceShouldThrowExceptionIfFilePathIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _xmlReaderWriter.ReadTestSequence(null!));
+    }
 
-        /// <summary>
-        /// The read test sequence should throw exception if file not found.
-        /// </summary>
-        [TestMethod]
-        public void ReadTestSequenceShouldThrowExceptionIfFileNotFound()
-        {
-            this.mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(false);
+    /// <summary>
+    /// The read test sequence should throw exception if file not found.
+    /// </summary>
+    [TestMethod]
+    public void ReadTestSequenceShouldThrowExceptionIfFileNotFound()
+    {
+        _mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(false);
 
-            Assert.ThrowsException<FileNotFoundException>(() =>
-            {
-                this.xmlReaderWriter.ReadTestSequence(string.Empty);
-            });
-        }
+        Assert.ThrowsException<FileNotFoundException>(() => _xmlReaderWriter.ReadTestSequence(string.Empty));
+    }
 
-        /// <summary>
-        /// The read test sequence should read file stream.
-        /// </summary>
-        [TestMethod]
-        public void ReadTestSequenceShouldReadFileStream()
-        {
-            // Setup
-            this.mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(m => m.GetStream("path.xml", FileMode.Open, FileAccess.ReadWrite)).Returns(this.mockStream.Object);
+    /// <summary>
+    /// The write test sequence should write file stream.
+    /// </summary>
+    [TestMethod]
+    public void WriteTestSequenceShouldWriteFileStream()
+    {
+        // Setup
+        _mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
+        using var stream = new MemoryStream();
+        _mockFileHelper.Setup(m => m.GetStream("path.xml", FileMode.Create, FileAccess.ReadWrite)).Returns(stream);
+        _mockStream.Setup(x => x.CanWrite).Returns(true);
+        _mockStream.Setup(x => x.Write(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()));
 
-            // Call to Read Test Sequence
-            this.xmlReaderWriter.ReadTestSequence("path.xml");
+        _xmlReaderWriter.WriteTestSequence(_testCaseList, _testObjectDictionary, "path");
 
-            // Verify Call to fileHelper
-            this.mockFileHelper.Verify(x => x.GetStream("path.xml", FileMode.Open, FileAccess.ReadWrite));
+        // Verify Call to fileHelper
+        _mockFileHelper.Verify(x => x.GetStream("path.xml", FileMode.Create, FileAccess.ReadWrite));
 
-            // Verify Call to stream read
-            this.mockStream.Verify(x => x.Read(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()));
-        }
+        // Assert it has some data
+        var data = Encoding.UTF8.GetString(stream.ToArray());
+        Assert.IsTrue(data.Length > 0, "Stream should have some data.");
+    }
 
-        /// <summary>
-        /// The write test sequence should write file stream.
-        /// </summary>
-        [TestMethod]
-        public void WriteTestSequenceShouldWriteFileStream()
+    /// <summary>
+    /// Verify Write and Read test sequence to check file contents if test completed is false.
+    /// </summary>
+    [TestMethod]
+    public void WriteTestSequenceShouldWriteCorrectFileContentsIfTestCompletedIsFalse()
+    {
+        var xmlReaderWriter = new XmlReaderWriter();
+        var testObject = new BlameTestObject(new TestCase("Abc.UnitTest1", new Uri("test:/abc"), "Abc.dll"));
+        testObject.DisplayName = "UnitTest1";
+        var testSequence = new List<Guid>
         {
-            // Setup
-            this.mockFileHelper.Setup(m => m.Exists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(m => m.GetStream("path.xml", FileMode.Create, FileAccess.ReadWrite)).Returns(this.mockStream.Object);
-            this.mockStream.Setup(x => x.CanWrite).Returns(true);
-            this.mockStream.Setup(x => x.Write(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()));
-
-            this.xmlReaderWriter.WriteTestSequence(this.testCaseList, this.testObjectDictionary, "path");
+            testObject.Id
+        };
+        var testObjectDictionary = new Dictionary<Guid, BlameTestObject>
+        {
+            { testObject.Id, testObject }
+        };
 
-            // Verify Call to fileHelper
-            this.mockFileHelper.Verify(x => x.GetStream("path.xml", FileMode.Create, FileAccess.ReadWrite));
+        var filePath = xmlReaderWriter.WriteTestSequence(testSequence, testObjectDictionary, Path.GetTempPath());
+        var testCaseList = xmlReaderWriter.ReadTestSequence(filePath);
+        File.Delete(filePath);
 
-            // Verify Call to stream write
-            this.mockStream.Verify(x => x.Write(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()));
-        }
+        Assert.AreEqual("Abc.UnitTest1", testCaseList.First().FullyQualifiedName);
+        Assert.AreEqual("UnitTest1", testCaseList.First().DisplayName);
+        Assert.AreEqual("Abc.dll", testCaseList.First().Source);
+        Assert.IsFalse(testCaseList.First().IsCompleted);
+    }
 
-        /// <summary>
-        /// Verify Write and Read test sequence to check file contents if test completed is false.
-        /// </summary>
-        [TestMethod]
-        public void WriteTestSequenceShouldWriteCorrectFileContentsIfTestCompletedIsFalse()
+    /// <summary>
+    /// Verify Write and Read test sequence to check file contents if test completed is true.
+    /// </summary>
+    [TestMethod]
+    public void WriteTestSequenceShouldWriteCorrectFileContentsIfTestCompletedIsTrue()
+    {
+        var xmlReaderWriter = new XmlReaderWriter();
+        var testObject = new BlameTestObject(new TestCase("Abc.UnitTest1", new Uri("test:/abc"), "Abc.dll"));
+        testObject.DisplayName = "UnitTest1";
+        var testSequence = new List<Guid>
         {
-            var xmlReaderWriter = new XmlReaderWriter();
-            var testObject = new BlameTestObject(new TestCase("Abc.UnitTest1", new Uri("test:/abc"), "Abc.dll"));
-            testObject.DisplayName = "UnitTest1";
-            var testSequence = new List<Guid>
-            {
-                testObject.Id
-            };
-            var testObjectDictionary = new Dictionary<Guid, BlameTestObject>
-            {
-                { testObject.Id, testObject }
-            };
-
-            var filePath = xmlReaderWriter.WriteTestSequence(testSequence, testObjectDictionary, Path.GetTempPath());
-            var testCaseList = xmlReaderWriter.ReadTestSequence(filePath);
-            File.Delete(filePath);
-
-            Assert.AreEqual("Abc.UnitTest1", testCaseList.First().FullyQualifiedName);
-            Assert.AreEqual("UnitTest1", testCaseList.First().DisplayName);
-            Assert.AreEqual("Abc.dll", testCaseList.First().Source);
-            Assert.IsFalse(testCaseList.First().IsCompleted);
-        }
-
-        /// <summary>
-        /// Verify Write and Read test sequence to check file contents if test completed is true.
-        /// </summary>
-        [TestMethod]
-        public void WriteTestSequenceShouldWriteCorrectFileContentsIfTestCompletedIsTrue()
+            testObject.Id
+        };
+        var testObjectDictionary = new Dictionary<Guid, BlameTestObject>
         {
-            var xmlReaderWriter = new XmlReaderWriter();
-            var testObject = new BlameTestObject(new TestCase("Abc.UnitTest1", new Uri("test:/abc"), "Abc.dll"));
-            testObject.DisplayName = "UnitTest1";
-            var testSequence = new List<Guid>
-            {
-                testObject.Id
-            };
-            var testObjectDictionary = new Dictionary<Guid, BlameTestObject>
-            {
-                { testObject.Id, testObject }
-            };
-
-            testObjectDictionary[testObject.Id].IsCompleted = true;
-            var filePath = xmlReaderWriter.WriteTestSequence(testSequence, testObjectDictionary, Path.GetTempPath());
-            var testCaseList = xmlReaderWriter.ReadTestSequence(filePath);
-            File.Delete(filePath);
-
-            Assert.AreEqual("Abc.UnitTest1", testCaseList.First().FullyQualifiedName);
-            Assert.AreEqual("UnitTest1", testCaseList.First().DisplayName);
-            Assert.AreEqual("Abc.dll", testCaseList.First().Source);
-            Assert.IsTrue(testCaseList.First().IsCompleted);
-        }
+            { testObject.Id, testObject }
+        };
+
+        testObjectDictionary[testObject.Id].IsCompleted = true;
+        var filePath = xmlReaderWriter.WriteTestSequence(testSequence, testObjectDictionary, Path.GetTempPath());
+        var testCaseList = xmlReaderWriter.ReadTestSequence(filePath);
+        File.Delete(filePath);
+
+        Assert.AreEqual("Abc.UnitTest1", testCaseList.First().FullyQualifiedName);
+        Assert.AreEqual("UnitTest1", testCaseList.First().DisplayName);
+        Assert.AreEqual("Abc.dll", testCaseList.First().Source);
+        Assert.IsTrue(testCaseList.First().IsCompleted);
+    }
 
+    /// <summary>
+    /// The testable xml reader writer.
+    /// </summary>
+    internal class TestableXmlReaderWriter : XmlReaderWriter
+    {
         /// <summary>
-        /// The testable xml reader writer.
+        /// Initializes a new instance of the <see cref="TestableXmlReaderWriter"/> class.
         /// </summary>
-        internal class TestableXmlReaderWriter : XmlReaderWriter
+        /// <param name="fileHelper">
+        /// The file helper.
+        /// </param>
+        internal TestableXmlReaderWriter(IFileHelper fileHelper)
+            : base(fileHelper)
         {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TestableXmlReaderWriter"/> class.
-            /// </summary>
-            /// <param name="fileHelper">
-            /// The file helper.
-            /// </param>
-            internal TestableXmlReaderWriter(IFileHelper fileHelper)
-                : base(fileHelper)
-            {
-            }
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
index 7458ba6098..821093aa91 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/HtmlLoggerTests.cs
@@ -1,597 +1,598 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
+using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using HtmlLoggerConstants = Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants;
+using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests;
+
+[TestClass]
+public class HtmlLoggerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using ObjectModel = VisualStudio.TestPlatform.ObjectModel;
-    using VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using HtmlLoggerConstants = VisualStudio.TestPlatform.Extensions.HtmlLogger.Constants;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using HtmlLogger = VisualStudio.TestPlatform.Extensions.HtmlLogger;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using System.Runtime.Serialization;
-    using Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger.ObjectModel;
-
-    [TestClass]
-    public class HtmlLoggerTests
-    {
-        private Mock<TestLoggerEvents> events;
-        private HtmlLogger.HtmlLogger htmlLogger;
-        private Dictionary<string, string> parameters;
-        private static readonly string DefaultTestRunDirectory = Path.GetTempPath();
-        private static readonly string DefaultLogFileNameParameterValue = "logfilevalue.html";
-        private Mock<IFileHelper> mockFileHelper;
-        private Mock<XmlObjectSerializer> mockXmlSerializer;
-        private Mock<IHtmlTransformer> mockHtmlTransformer;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.events = new Mock<TestLoggerEvents>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockHtmlTransformer = new Mock<IHtmlTransformer>();
-            this.mockXmlSerializer = new Mock<XmlObjectSerializer>();
-            this.htmlLogger = new HtmlLogger.HtmlLogger(this.mockFileHelper.Object, this.mockHtmlTransformer.Object, this.mockXmlSerializer.Object);
-            this.parameters = new Dictionary<string, string>(2)
-            {
-                [DefaultLoggerParameterNames.TestRunDirectory] = HtmlLoggerTests.DefaultTestRunDirectory,
-                [HtmlLoggerConstants.LogFileNameKey] = HtmlLoggerTests.DefaultLogFileNameParameterValue
-            };
-            this.htmlLogger.Initialize(this.events.Object, this.parameters);
-        }
+    private static readonly string DefaultTestRunDirectory = Path.GetTempPath();
+    private static readonly string DefaultLogFileNameParameterValue = "logfilevalue.html";
 
-        #region Initialize Method
+    private Mock<TestLoggerEvents> _events;
+    private readonly VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger _htmlLogger;
+    private readonly Dictionary<string, string?> _parameters;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<XmlObjectSerializer> _mockXmlSerializer;
+    private readonly Mock<IHtmlTransformer> _mockHtmlTransformer;
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfEventsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                {
-                    this.htmlLogger.Initialize(null, this.parameters);
-                });
-        }
-
-        [TestMethod]
-        public void InitializeShouldInitializeAllProperties()
-        {
-            const string testResultDir = @"C:\Code\abc";
-            var events = new Mock<TestLoggerEvents>();
+    public HtmlLoggerTests()
+    {
+        _events = new Mock<TestLoggerEvents>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockHtmlTransformer = new Mock<IHtmlTransformer>();
+        _mockXmlSerializer = new Mock<XmlObjectSerializer>();
+        _htmlLogger = new VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger(_mockFileHelper.Object, _mockHtmlTransformer.Object, _mockXmlSerializer.Object);
+        _parameters = new Dictionary<string, string?>(2)
+        {
+            [DefaultLoggerParameterNames.TestRunDirectory] = DefaultTestRunDirectory,
+            [HtmlLoggerConstants.LogFileNameKey] = DefaultLogFileNameParameterValue
+        };
+        _htmlLogger.Initialize(_events.Object, _parameters);
+    }
 
-            this.htmlLogger.Initialize(events.Object, testResultDir);
+    #region Initialize Method
 
-            Assert.AreEqual(this.htmlLogger.TestResultsDirPath, testResultDir);
-            Assert.IsNotNull(this.htmlLogger.TestRunDetails);
-            Assert.IsNotNull(this.htmlLogger.Results);
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfEventsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _htmlLogger.Initialize(null!, _parameters));
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                {
-                    this.events = new Mock<TestLoggerEvents>();
-                    this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = null;
-                    this.htmlLogger.Initialize(events.Object, parameters);
-                });
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfParametersAreEmpty()
-        {
-            var events = new Mock<TestLoggerEvents>();
-            Assert.ThrowsException<ArgumentException>(() => this.htmlLogger.Initialize(events.Object, new Dictionary<string, string>()));
-        }
+    [TestMethod]
+    public void InitializeShouldInitializeAllProperties()
+    {
+        const string testResultDir = @"C:\Code\abc";
+        var events = new Mock<TestLoggerEvents>();
 
-        [TestMethod]
-        public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
+        _htmlLogger.Initialize(events.Object, testResultDir);
+
+        Assert.AreEqual(_htmlLogger.TestResultsDirPath, testResultDir);
+        Assert.IsNotNull(_htmlLogger.TestRunDetails);
+        Assert.IsNotNull(_htmlLogger.Results);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () =>
             {
-                this.htmlLogger.TestMessageHandler(new object(), default);
+                _events = new Mock<TestLoggerEvents>();
+                _parameters[DefaultLoggerParameterNames.TestRunDirectory] = null!;
+                _htmlLogger.Initialize(_events.Object, _parameters);
             });
-        }
+    }
 
-        #endregion
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfParametersAreEmpty()
+    {
+        var events = new Mock<TestLoggerEvents>();
+        Assert.ThrowsException<ArgumentException>(() => _htmlLogger.Initialize(events.Object, new Dictionary<string, string?>()));
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
-        {
-            const string message = "First message";
-            var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
+    [TestMethod]
+    public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _htmlLogger.TestMessageHandler(new object(), default!));
+    }
 
-            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
+    #endregion
 
-            var actualMessage = this.htmlLogger.TestRunDetails.RunLevelMessageInformational.First();
-            Assert.AreEqual(message, actualMessage);
-        }
+    [TestMethod]
+    public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
+    {
+        const string message = "First message";
+        var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
 
-        [TestMethod]
-        public void TestMessageHandlerShouldNotInitializelistForInformationErrorAndWarningMessages()
-        {
-            Assert.IsNull(this.htmlLogger.TestRunDetails.RunLevelMessageInformational);
-            Assert.IsNull(this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning);
-        }
+        _htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldThrowExceptionIfParametersAreNull()
-        {
-            Dictionary<string, string> parameters = null;
-            var events = new Mock<TestLoggerEvents>();
-            Assert.ThrowsException<ArgumentNullException>(() => this.htmlLogger.Initialize(events.Object, parameters));
-        }
+        var actualMessage = _htmlLogger.TestRunDetails!.RunLevelMessageInformational!.First();
+        Assert.AreEqual(message, actualMessage);
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
-        {
-            const string message = "error message";
-            const string message2 = "warning message";
+    [TestMethod]
+    public void TestMessageHandlerShouldNotInitializelistForInformationErrorAndWarningMessages()
+    {
+        Assert.IsNull(_htmlLogger.TestRunDetails!.RunLevelMessageInformational);
+        Assert.IsNull(_htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning);
+    }
 
-            var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
-            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
-            var testRunMessageEventArgs2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
-            this.htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs2);
+    [TestMethod]
+    public void TestCompleteHandlerShouldThrowExceptionIfParametersAreNull()
+    {
+        Dictionary<string, string?>? parameters = null;
+        var events = new Mock<TestLoggerEvents>();
+        Assert.ThrowsException<ArgumentNullException>(() => _htmlLogger.Initialize(events.Object, parameters!));
+    }
 
-            Assert.AreEqual(message, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.First());
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.RunLevelMessageErrorAndWarning.Count);
-        }
+    [TestMethod]
+    public void TestMessageHandlerShouldAddMessageInListIfItIsWarningAndError()
+    {
+        const string message = "error message";
+        const string message2 = "warning message";
 
-        [TestMethod]
-        public void TestResultHandlerShouldKeepTrackOfFailedResult()
-        {
-            var failTestCase1 = CreateTestCase("Fail1");
+        var testRunMessageEventArgs = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
+        _htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs);
+        var testRunMessageEventArgs2 = new TestRunMessageEventArgs(TestMessageLevel.Warning, message2);
+        _htmlLogger.TestMessageHandler(new object(), testRunMessageEventArgs2);
 
-            var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
+        var runLevelMessageErrorAndWarning = _htmlLogger.TestRunDetails!.RunLevelMessageErrorAndWarning!;
+        Assert.AreEqual(2, runLevelMessageErrorAndWarning.Count);
+        Assert.AreEqual(message, runLevelMessageErrorAndWarning.First());
+    }
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
+    [TestMethod]
+    public void TestResultHandlerShouldKeepTrackOfFailedResult()
+    {
+        var failTestCase1 = CreateTestCase("Fail1");
 
-            Assert.AreEqual(1, this.htmlLogger.FailedTests, "Failed Tests");
-        }
+        var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
 
-        [TestMethod]
-        public void TestResultHandlerShouldKeepTrackOfTotalResult()
-        {
-            var passTestCase1 = CreateTestCase("Pass1");
-            var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
+        Assert.AreEqual(1, _htmlLogger.FailedTests, "Failed Tests");
+    }
 
-            Assert.AreEqual(1, this.htmlLogger.TotalTests, "Total Tests");
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldKeepTrackOfTotalResult()
+    {
+        var passTestCase1 = CreateTestCase("Pass1");
+        var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
 
-        [TestMethod]
-        public void TestResultHandlerShouldKeepTrackOfPassedResult()
-        {
-            var passTestCase2 = CreateTestCase("Pass2");
-            var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
+        Assert.AreEqual(1, _htmlLogger.TotalTests, "Total Tests");
+    }
 
-            Assert.AreEqual(1, this.htmlLogger.PassedTests, "Passed Tests");
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldKeepTrackOfPassedResult()
+    {
+        var passTestCase2 = CreateTestCase("Pass2");
+        var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
 
-        [TestMethod]
-        public void TestResultHandlerShouldKeepTrackOfSkippedResult()
-        {
-            var skipTestCase1 = CreateTestCase("Skip1");
-            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
+        Assert.AreEqual(1, _htmlLogger.PassedTests, "Passed Tests");
+    }
+
+    [TestMethod]
+    public void TestResultHandlerShouldKeepTrackOfSkippedResult()
+    {
+        var skipTestCase1 = CreateTestCase("Skip1");
+        var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
+
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
 
-            Assert.AreEqual(1, this.htmlLogger.SkippedTests, "Skipped Tests");
-        }
+        Assert.AreEqual(1, _htmlLogger.SkippedTests, "Skipped Tests");
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNull()
+    [TestMethod]
+    public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNull()
+    {
+        //this assert is for checking result display name equals to null
+        var passTestCase1 = CreateTestCase("Pass1");
+        var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
         {
-            //this assert is for checking result display name equals to null
-            var passTestCase1 = CreateTestCase("Pass1");
-            var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
-            {
-                DisplayName = null,
-                TestCase = { FullyQualifiedName = "abc" }
-            };
+            DisplayName = null,
+            TestCase = { FullyQualifiedName = "abc" }
+        };
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passTestResultExpected).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passTestResultExpected).Object);
 
-            Assert.AreEqual("abc", this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().DisplayName);
-        }
+        Assert.AreEqual("abc", _htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.First().DisplayName);
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNotNull()
+    [TestMethod]
+    public void TestResultHandlerShouldSetDisplayNameIfDisplayNameIsNotNull()
+    {
+        //this assert is for checking result display name not equals to null
+        var passTestCase1 = CreateTestCase("Pass1");
+        var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
         {
-            //this assert is for checking result display name not equals to null
-            var passTestCase1 = CreateTestCase("Pass1");
-            var passTestResultExpected = new ObjectModel.TestResult(passTestCase1)
-            {
-                DisplayName = "def",
-                TestCase = { FullyQualifiedName = "abc" }
-            };
+            DisplayName = "def",
+            TestCase = { FullyQualifiedName = "abc" }
+        };
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passTestResultExpected).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passTestResultExpected).Object);
 
-            Assert.AreEqual("def", this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Last().DisplayName);
-        }
+        Assert.AreEqual("def", _htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.Last().DisplayName);
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldCreateTestResultProperly()
-        {
-            var passTestCase = CreateTestCase("Pass1");
-            passTestCase.DisplayName = "abc";
-            passTestCase.FullyQualifiedName = "fully";
-            passTestCase.Source = "abc/def.dll";
-            TimeSpan ts1 = new TimeSpan(0, 0, 0, 1, 0);
+    [TestMethod]
+    public void TestResultHandlerShouldCreateTestResultProperly()
+    {
+        var passTestCase = CreateTestCase("Pass1");
+        passTestCase.DisplayName = "abc";
+        passTestCase.FullyQualifiedName = "fully";
+        passTestCase.Source = "abc/def.dll";
+        TimeSpan ts1 = new(0, 0, 0, 1, 0);
+
+        var passTestResultExpected = new ObjectModel.TestResult(passTestCase)
+        {
+            DisplayName = "def",
+            ErrorMessage = "error message",
+            ErrorStackTrace = "Error stack trace",
+            Duration = ts1
+        };
+
+        var eventArg = new Mock<TestResultEventArgs>(passTestResultExpected);
+        // Act
+        _htmlLogger.TestResultHandler(new object(), eventArg.Object);
+
+        var resultCollectionList = _htmlLogger.TestRunDetails!.ResultCollectionList!;
+        var result = resultCollectionList.First().ResultList!.First();
+
+        Assert.AreEqual("def", result.DisplayName);
+        Assert.AreEqual("error message", result.ErrorMessage);
+        Assert.AreEqual("Error stack trace", result.ErrorStackTrace);
+        Assert.AreEqual("fully", result.FullyQualifiedName);
+        Assert.AreEqual("abc/def.dll", resultCollectionList.First().Source);
+        Assert.AreEqual("1s", result.Duration);
+    }
 
-            var passTestResultExpected = new ObjectModel.TestResult(passTestCase)
-            {
-                DisplayName = "def",
-                ErrorMessage = "error message",
-                ErrorStackTrace = "Error stack trace",
-                Duration = ts1
-            };
-
-            var eventArg = new Mock<TestResultEventArgs>(passTestResultExpected);
-            // Act
-            this.htmlLogger.TestResultHandler(new object(), eventArg.Object);
-
-            var result = this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First();
-
-            Assert.AreEqual("def", result.DisplayName);
-            Assert.AreEqual("error message", result.ErrorMessage);
-            Assert.AreEqual("Error stack trace", result.ErrorStackTrace);
-            Assert.AreEqual("fully", result.FullyQualifiedName);
-            Assert.AreEqual("abc/def.dll", this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source);
-            Assert.AreEqual("1s", result.Duration);
-        }
-
-        [TestMethod]
-        public void GetFormattedDurationStringShouldGiveCorrectFormat()
-        {
-            TimeSpan ts1 = new TimeSpan(0, 0, 0, 0, 1);
-            Assert.AreEqual("1ms", htmlLogger.GetFormattedDurationString(ts1));
+    [TestMethod]
+    public void GetFormattedDurationStringShouldGiveCorrectFormat()
+    {
+        TimeSpan ts1 = new(0, 0, 0, 0, 1);
+        Assert.AreEqual("1ms", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts1));
 
-            TimeSpan ts2 = new TimeSpan(0, 0, 0, 1, 0);
-            Assert.AreEqual("1s", htmlLogger.GetFormattedDurationString(ts2));
+        TimeSpan ts2 = new(0, 0, 0, 1, 0);
+        Assert.AreEqual("1s", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts2));
 
-            TimeSpan ts3 = new TimeSpan(0, 0, 1, 0, 1);
-            Assert.AreEqual("1m", htmlLogger.GetFormattedDurationString(ts3));
+        TimeSpan ts3 = new(0, 0, 1, 0, 1);
+        Assert.AreEqual("1m", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts3));
 
-            TimeSpan ts4 = new TimeSpan(0, 1, 0, 2, 3);
-            Assert.AreEqual("1h", htmlLogger.GetFormattedDurationString(ts4));
+        TimeSpan ts4 = new(0, 1, 0, 2, 3);
+        Assert.AreEqual("1h", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts4));
 
-            TimeSpan ts5 = new TimeSpan(0, 1, 2, 3, 4);
-            Assert.AreEqual("1h 2m", htmlLogger.GetFormattedDurationString(ts5));
+        TimeSpan ts5 = new(0, 1, 2, 3, 4);
+        Assert.AreEqual("1h 2m", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts5));
 
-            TimeSpan ts6 = new TimeSpan(0, 0, 1, 2, 3);
-            Assert.AreEqual("1m 2s", htmlLogger.GetFormattedDurationString(ts6));
+        TimeSpan ts6 = new(0, 0, 1, 2, 3);
+        Assert.AreEqual("1m 2s", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts6));
 
-            TimeSpan ts7 = new TimeSpan(0, 0, 0, 1, 3);
-            Assert.AreEqual("1s 3ms", htmlLogger.GetFormattedDurationString(ts7));
+        TimeSpan ts7 = new(0, 0, 0, 1, 3);
+        Assert.AreEqual("1s 3ms", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts7));
 
-            TimeSpan ts8 = new TimeSpan(2);
-            Assert.AreEqual("< 1ms", htmlLogger.GetFormattedDurationString(ts8));
+        TimeSpan ts8 = new(2);
+        Assert.AreEqual("< 1ms", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts8));
 
-            TimeSpan ts10 = new TimeSpan(1, 0, 0, 1, 3);
-            Assert.AreEqual("> 1d", htmlLogger.GetFormattedDurationString(ts10));
+        TimeSpan ts10 = new(1, 0, 0, 1, 3);
+        Assert.AreEqual("> 1d", VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts10));
 
-            TimeSpan ts9 = new TimeSpan(0, 0, 0, 0, 0);
-            Assert.IsNull(htmlLogger.GetFormattedDurationString(ts9));
-        }
+        TimeSpan ts9 = new(0, 0, 0, 0, 0);
+        Assert.IsNull(VisualStudio.TestPlatform.Extensions.HtmlLogger.HtmlLogger.GetFormattedDurationString(ts9));
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
-        {
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            TestCase testCase2 = CreateTestCase("TestCase2");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-
-            // Act
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
-
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, "TestResultHandler is not creating test result entry for each test case");
-        }
-
-        [TestMethod]
-        public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
-        {
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            testCase1.Source = "abc.dll";
+    [TestMethod]
+    public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        ObjectModel.TestResult result1 = new(testCase1) { Outcome = TestOutcome.Failed };
+        ObjectModel.TestResult result2 = new(testCase2) { Outcome = TestOutcome.Passed };
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+
+        // Act
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg2.Object);
+
+        Assert.AreEqual(2, _htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.Count, "TestResultHandler is not creating test result entry for each test case");
+    }
 
-            TestCase testCase2 = CreateTestCase("TestCase2");
-            testCase2.Source = "def.dll";
+    [TestMethod]
+    public void TestResultHandlerShouldCreateOneTestResultCollectionForOneSource()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        testCase1.Source = "abc.dll";
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        testCase2.Source = "def.dll";
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
+        ObjectModel.TestResult result1 = new(testCase1) { Outcome = TestOutcome.Failed };
+        ObjectModel.TestResult result2 = new(testCase2) { Outcome = TestOutcome.Passed };
 
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.ResultCollectionList.Count);
-            Assert.AreEqual("abc.dll", this.htmlLogger.TestRunDetails.ResultCollectionList.First().Source);
-            Assert.AreEqual("def.dll", this.htmlLogger.TestRunDetails.ResultCollectionList.Last().Source);
-        }
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddFailedResultToFailedResultListInTestResultCollection()
-        {
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        Assert.AreEqual(2, _htmlLogger.TestRunDetails!.ResultCollectionList!.Count);
+        Assert.AreEqual("abc.dll", _htmlLogger.TestRunDetails.ResultCollectionList.First().Source);
+        Assert.AreEqual("def.dll", _htmlLogger.TestRunDetails.ResultCollectionList.Last().Source);
+    }
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
+    [TestMethod]
+    public void TestResultHandlerShouldAddFailedResultToFailedResultListInTestResultCollection()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        ObjectModel.TestResult result1 = new(testCase1) { Outcome = TestOutcome.Failed };
 
-            Assert.AreEqual(1, this.htmlLogger.TestRunDetails.ResultCollectionList.First().FailedResultList.Count);
-        }
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
-        {
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            TestCase testCase2 = CreateTestCase("TestCase2");
-            TestCase testCase3 = CreateTestCase("TestCase3");
+        Assert.AreEqual(1, _htmlLogger.TestRunDetails!.ResultCollectionList!.First().FailedResultList!.Count);
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        TestCase testCase3 = CreateTestCase("TestCase3");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
-            result1.SetPropertyValue(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
+        ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, parentExecutionId);
+        result1.SetPropertyValue(HtmlLoggerConstants.TestTypeProperty, HtmlLoggerConstants.OrderedTestTypeGuid);
 
-            Assert.AreEqual(1, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, "test handler is adding parent result correctly");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults, "test handler is adding child result correctly");
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result1).Object);
 
-            var result2 = new ObjectModel.TestResult(testCase2);
-            result2.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        Assert.AreEqual(1, _htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.Count, "test handler is adding parent result correctly");
+        Assert.IsNull(_htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.First().InnerTestResults, "test handler is adding child result correctly");
 
-            var result3 = new ObjectModel.TestResult(testCase3) { Outcome = TestOutcome.Failed };
-            result3.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        var result2 = new ObjectModel.TestResult(testCase2);
+        result2.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result3).Object);
+        var result3 = new ObjectModel.TestResult(testCase3) { Outcome = TestOutcome.Failed };
+        result3.SetPropertyValue(HtmlLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(HtmlLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Assert.AreEqual(1, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.Count, "test handler is adding parent result correctly");
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.ResultCollectionList.First().ResultList.First().InnerTestResults.Count, "test handler is adding child result correctly");
-        }
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result2).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(result3).Object);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldKeepTackOfSummary()
-        {
-            TestCase passTestCase1 = CreateTestCase("Pass1");
-            TestCase passTestCase2 = CreateTestCase("Pass2");
-            TestCase failTestCase1 = CreateTestCase("Fail1");
-            TestCase skipTestCase1 = CreateTestCase("Skip1");
-            var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
-            var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
-            var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
-            var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
-
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
-            this.htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
-
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-                {
-                }).Returns(new Mock<Stream>().Object);
-
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
-
-            Assert.AreEqual(4, this.htmlLogger.TestRunDetails.Summary.TotalTests, "summary should keep track of total tests");
-            Assert.AreEqual(1, this.htmlLogger.TestRunDetails.Summary.FailedTests, "summary should keep track of failed tests");
-            Assert.AreEqual(2, this.htmlLogger.TestRunDetails.Summary.PassedTests, "summary should keep track of passed tests");
-            Assert.AreEqual(1, this.htmlLogger.TestRunDetails.Summary.SkippedTests, "summary should keep track of passed tests");
-            Assert.AreEqual(50, this.htmlLogger.TestRunDetails.Summary.PassPercentage, "summary should keep track of passed tests");
-            Assert.IsNull(this.htmlLogger.TestRunDetails.Summary.TotalRunTime, "summary should keep track of passed tests");
-        }
-
-        [TestMethod]
-        public void TestCompleteHandlerShouldCreateCustumHtmlFileNamewithLogFileNameKey()
-        {
-            var parameters = new Dictionary<string, string>();
-            parameters[HtmlLoggerConstants.LogFileNameKey] = null;
-            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
-
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-
-            this.htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
-            Assert.IsTrue(this.htmlLogger.HtmlFilePath.Contains("TestResult"));
-        }
-
-        [TestMethod]
-        public void TestCompleteHandlerShouldCreateCustumHtmlFileNameWithLogPrefix()
+        Assert.AreEqual(1, _htmlLogger.TestRunDetails!.ResultCollectionList!.First().ResultList!.Count, "test handler is adding parent result correctly");
+        Assert.AreEqual(2, _htmlLogger.TestRunDetails.ResultCollectionList!.First().ResultList!.First().InnerTestResults!.Count, "test handler is adding child result correctly");
+    }
+
+    [TestMethod]
+    public void TestCompleteHandlerShouldKeepTackOfSummary()
+    {
+        TestCase passTestCase1 = CreateTestCase("Pass1");
+        TestCase passTestCase2 = CreateTestCase("Pass2");
+        TestCase failTestCase1 = CreateTestCase("Fail1");
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
+        var passResult1 = new ObjectModel.TestResult(passTestCase1) { Outcome = TestOutcome.Passed };
+        var passResult2 = new ObjectModel.TestResult(passTestCase2) { Outcome = TestOutcome.Passed };
+        var failResult1 = new ObjectModel.TestResult(failTestCase1) { Outcome = TestOutcome.Failed };
+        var skipResult1 = new ObjectModel.TestResult(skipTestCase1) { Outcome = TestOutcome.Skipped };
+
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult1).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(passResult2).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(failResult1).Object);
+        _htmlLogger.TestResultHandler(new object(), new Mock<TestResultEventArgs>(skipResult1).Object);
+
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+        {
+        }).Returns(new Mock<Stream>().Object);
+
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
+
+        Assert.AreEqual(4, _htmlLogger.TestRunDetails!.Summary!.TotalTests, "summary should keep track of total tests");
+        Assert.AreEqual(1, _htmlLogger.TestRunDetails.Summary.FailedTests, "summary should keep track of failed tests");
+        Assert.AreEqual(2, _htmlLogger.TestRunDetails.Summary.PassedTests, "summary should keep track of passed tests");
+        Assert.AreEqual(1, _htmlLogger.TestRunDetails.Summary.SkippedTests, "summary should keep track of passed tests");
+        Assert.AreEqual(50, _htmlLogger.TestRunDetails.Summary.PassPercentage, "summary should keep track of passed tests");
+        Assert.IsNull(_htmlLogger.TestRunDetails.Summary.TotalRunTime, "summary should keep track of passed tests");
+    }
+
+    [TestMethod]
+    public void TestCompleteHandlerShouldCreateCustomHtmlFileNamewithLogFileNameKey()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>();
-            parameters[HtmlLoggerConstants.LogFilePrefixKey] = "sample";
-            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
-            parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
-
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-
-            this.htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
-            Assert.IsFalse(this.htmlLogger.HtmlFilePath.Contains("__"));
-        }
-
-        [TestMethod]
-        public void TestCompleteHandlerShouldCreateCustumHtmlFileNameWithLogPrefixIfTargetFrameworkIsNull()
+            [HtmlLoggerConstants.LogFileNameKey] = null,
+            [DefaultLoggerParameterNames.TestRunDirectory] = "dsa"
+        };
+
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+
+        _htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
+        Assert.IsTrue(_htmlLogger.HtmlFilePath!.Contains("TestResult"));
+    }
+
+    [TestMethod]
+    public void TestCompleteHandlerShouldCreateCustomHtmlFileNameWithLogPrefix()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>();
-            parameters[HtmlLoggerConstants.LogFilePrefixKey] = "sample";
-            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
-            parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
-
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-
-            this.htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
-            Assert.IsTrue(this.htmlLogger.HtmlFilePath.Contains("sample_net451"));
-        }
-
-        [TestMethod]
-        public void TestCompleteHandlerShouldCreateCustumHtmlFileNameWithLogPrefixNull()
+            [HtmlLoggerConstants.LogFilePrefixKey] = "sample",
+            [DefaultLoggerParameterNames.TestRunDirectory] = "dsa",
+            [DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1"
+        };
+
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+
+        _htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
+        Assert.IsFalse(_htmlLogger.HtmlFilePath!.Contains("__"));
+    }
+
+    [TestMethod]
+    public void TestCompleteHandlerShouldCreateCustomHtmlFileNameWithLogPrefixIfTargetFrameworkIsNull()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>();
-            parameters[HtmlLoggerConstants.LogFilePrefixKey] = null;
-            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
-            parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
+            [HtmlLoggerConstants.LogFilePrefixKey] = "sample",
+            [DefaultLoggerParameterNames.TestRunDirectory] = "dsa",
+            [DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1"
+        };
 
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-            {
-            }).Returns(new Mock<Stream>().Object);
+        _htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
+        Assert.IsTrue(_htmlLogger.HtmlFilePath!.Contains("sample_net451"));
+    }
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+    [TestMethod]
+    public void TestCompleteHandlerShouldCreateCustomHtmlFileNameWithLogPrefixNull()
+    {
+        var parameters = new Dictionary<string, string?>
+        {
+            [HtmlLoggerConstants.LogFilePrefixKey] = null,
+            [DefaultLoggerParameterNames.TestRunDirectory] = "dsa",
+            [DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1"
+        };
 
-            this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
-        }
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldThrowExceptionWithLogPrefixIfTargetFrameworkKeyIsNotPresent()
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
         {
-            var parameters = new Dictionary<string, string>();
-            parameters[HtmlLoggerConstants.LogFilePrefixKey] = "sample.html";
-            parameters[DefaultLoggerParameterNames.TestRunDirectory] = "dsa";
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        }).Returns(new Mock<Stream>().Object);
 
-            this.htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
-            Assert.ThrowsException<KeyNotFoundException>(() => this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero)));
-        }
+        _mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite), Times.Once);
+    }
 
-        [TestMethod]
-        public void IntializeShouldThrowExceptionIfBothPrefixAndNameProvided()
+    [TestMethod]
+    public void TestCompleteHandlerShouldThrowExceptionWithLogPrefixIfTargetFrameworkKeyIsNotPresent()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            this.parameters[HtmlLoggerConstants.LogFileNameKey] = "results.html";
-            var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
-            this.parameters[HtmlLoggerConstants.LogFilePrefixKey] = "HtmlPrefix";
-            this.parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
+            [HtmlLoggerConstants.LogFilePrefixKey] = "sample.html",
+            [DefaultLoggerParameterNames.TestRunDirectory] = "dsa"
+        };
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
 
-            Assert.ThrowsException<ArgumentException>(() => this.htmlLogger.Initialize(events.Object, this.parameters));
-        }
+        _htmlLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldCreateFileCorrectly()
-        {
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        Assert.ThrowsException<KeyNotFoundException>(() => _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero)));
+    }
 
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-                {
-                }).Returns(new Mock<Stream>().Object);
+    [TestMethod]
+    public void IntializeShouldThrowExceptionIfBothPrefixAndNameProvided()
+    {
+        _parameters[HtmlLoggerConstants.LogFileNameKey] = "results.html";
+        var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
+        _parameters[HtmlLoggerConstants.LogFilePrefixKey] = "HtmlPrefix";
+        _parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+        Assert.ThrowsException<ArgumentException>(() => _htmlLogger.Initialize(_events.Object, _parameters));
+    }
 
-            this.mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite), Times.Once);
-        }
+    [TestMethod]
+    public void TestCompleteHandlerShouldCreateFileCorrectly()
+    {
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldDeleteFileCorrectly()
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
         {
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        }).Returns(new Mock<Stream>().Object);
 
-            this.mockFileHelper.Setup(x => x.Delete(It.IsAny<string>())).Callback<string>((x) =>
-            {
-            });
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+        _mockFileHelper.Verify(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite), Times.Once);
+    }
 
-            this.mockFileHelper.Verify(x => x.Delete(It.IsAny<string>()), Times.Once);
-        }
+    [TestMethod]
+    public void TestCompleteHandlerShouldDeleteFileCorrectly()
+    {
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
+        _mockFileHelper.Setup(x => x.Delete(It.IsAny<string>())).Callback<string>((x) =>
         {
-            var testCase1 = CreateTestCase("TestCase1");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        });
 
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-                {
-                }).Returns(new Mock<Stream>().Object);
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+        _mockFileHelper.Verify(x => x.Delete(It.IsAny<string>()), Times.Once);
+    }
 
-            this.mockHtmlTransformer.Verify(x => x.Transform(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-        }
+    [TestMethod]
+    public void TestCompleteHandlerShouldCallHtmlTransformerCorrectly()
+    {
+        var testCase1 = CreateTestCase("TestCase1");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
 
-        [TestMethod]
-        public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
         {
-            var testCase1 = CreateTestCase("TestCase1") ?? throw new ArgumentNullException($"CreateTestCase(\"TestCase1\")");
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-                {
-                }).Returns(new Mock<Stream>().Object);
-
-            this.htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
-
-            this.mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestRunDetails>()), Times.Once);
-            Assert.IsTrue(htmlLogger.XmlFilePath.Contains(".xml"));
-            Assert.IsTrue(htmlLogger.HtmlFilePath.Contains(".html"));
-        }
-
-        [TestMethod]
-        public void TestCompleteHandlerShouldNotDivideByZeroWhenThereAre0TestResults()
-        {
-            this.mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.Create, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
-            {
-            }).Returns(new Mock<Stream>().Object);
+        }).Returns(new Mock<Stream>().Object);
 
-            this.htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
-            Assert.AreEqual(0, this.htmlLogger.TestRunDetails.Summary.TotalTests);
-            Assert.AreEqual(0, this.htmlLogger.TestRunDetails.Summary.PassPercentage);
-        }
+        _mockHtmlTransformer.Verify(x => x.Transform(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+    }
 
-        private static TestCase CreateTestCase(string testCaseName)
+    [TestMethod]
+    public void TestCompleteHandlerShouldWriteToXmlSerializerCorrectly()
+    {
+        var testCase1 = CreateTestCase("TestCase1") ?? throw new ArgumentNullException($"CreateTestCase(\"TestCase1\")");
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        var resultEventArg1 = new Mock<TestResultEventArgs>(result1);
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
         {
-            return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
-        }
-    }
-}
+        }).Returns(new Mock<Stream>().Object);
 
+        _htmlLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
+        _mockXmlSerializer.Verify(x => x.WriteObject(It.IsAny<Stream>(), It.IsAny<TestRunDetails>()), Times.Once);
+        Assert.IsTrue(_htmlLogger.XmlFilePath!.Contains(".xml"));
+        Assert.IsTrue(_htmlLogger.HtmlFilePath!.Contains(".html"));
+    }
 
+    [TestMethod]
+    public void TestCompleteHandlerShouldNotDivideByZeroWhenThereAre0TestResults()
+    {
+        _mockFileHelper.Setup(x => x.GetStream(It.IsAny<string>(), FileMode.OpenOrCreate, FileAccess.ReadWrite)).Callback<string, FileMode, FileAccess>((x, y, z) =>
+        {
+        }).Returns(new Mock<Stream>().Object);
 
+        _htmlLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
+        Assert.AreEqual(0, _htmlLogger.TestRunDetails!.Summary!.TotalTests);
+        Assert.AreEqual(0, _htmlLogger.TestRunDetails.Summary.PassPercentage);
+    }
 
+    private static TestCase CreateTestCase(string testCaseName)
+    {
+        return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
+    }
+}
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
index c4f3325d64..7708ce4b17 100644
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj
@@ -1,26 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.HtmlLogger\Microsoft.TestPlatform.Extensions.HtmlLogger.csproj" />
-  </ItemGroup> 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs
deleted file mode 100644
index a67797b97c..0000000000
--- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Program.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj
index 2984bca87b..3df4825d3e 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj
@@ -1,27 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
-    <WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-	<Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs
deleted file mode 100644
index 7642a15003..0000000000
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests
-{
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 157b4a32ca..0000000000
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ab12d4b6-bbe7-4a69-9839-3fcd0c77a04f")]
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
index 4b9aacccbf..9c1cc94e27 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
@@ -1,988 +1,970 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
+using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests;
+
+[TestClass]
+public class TrxLoggerTests
 {
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.CompilerServices;
-    using System.Xml;
-    using System.Xml.Linq;
-    using VisualStudio.TestPlatform.ObjectModel;
-    using VisualStudio.TestPlatform.ObjectModel.Client;
-    using VisualStudio.TestPlatform.ObjectModel.Logging;
-    using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
-    using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
-    using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
-
-    [TestClass]
-    public class TrxLoggerTests
-    {
-        private Mock<TestLoggerEvents> events;
-        private TestableTrxLogger testableTrxLogger;
-        private Dictionary<string, string> parameters;
-        private static string DefaultTestRunDirectory = Path.GetTempPath();
-        private static string DefaultLogFileNameParameterValue = "logfilevalue.trx";
-        private const string DefaultLogFilePrefixParameterValue = "log_prefix";
-
-        private const int MultipleLoggerInstanceCount = 2;
-
-        [TestInitialize]
-        public void Initialize()
-        {
-            this.events = new Mock<TestLoggerEvents>();
+    private const string DefaultLogFilePrefixParameterValue = "log_prefix";
+    private const int MultipleLoggerInstanceCount = 2;
 
-            this.testableTrxLogger = new TestableTrxLogger();
-            this.parameters = new Dictionary<string, string>(2);
-            this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = TrxLoggerTests.DefaultTestRunDirectory;
-            this.parameters[TrxLoggerConstants.LogFileNameKey] = TrxLoggerTests.DefaultLogFileNameParameterValue;
-            this.testableTrxLogger.Initialize(this.events.Object, this.parameters);
-        }
+    private static readonly string DefaultTestRunDirectory = Path.GetTempPath();
+    private static readonly string DefaultLogFileNameParameterValue = "logfilevalue.trx";
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (!string.IsNullOrEmpty(this.testableTrxLogger?.trxFile) && File.Exists(this.testableTrxLogger.trxFile))
-            {
-                File.Delete(this.testableTrxLogger.trxFile);
-            }
-        }
+    private readonly Mock<TestLoggerEvents> _events;
+    private readonly Dictionary<string, string?> _parameters;
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfEventsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        this.testableTrxLogger.Initialize(null, this.parameters);
-                    });
-        }
+    private TestableTrxLogger _testableTrxLogger;
 
-        [TestMethod]
-        public void InitializeShouldNotThrowExceptionIfEventsIsNotNull()
-        {
-            var events = new Mock<TestLoggerEvents>();
-            this.testableTrxLogger.Initialize(events.Object, this.parameters);
-        }
+    public TrxLoggerTests()
+    {
+        _events = new Mock<TestLoggerEvents>();
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
+        _testableTrxLogger = new TestableTrxLogger();
+        _parameters = new Dictionary<string, string?>(2)
         {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                {
-                    var events = new Mock<TestLoggerEvents>();
-                    this.parameters[DefaultLoggerParameterNames.TestRunDirectory] = null;
-                    this.testableTrxLogger.Initialize(events.Object, parameters);
-                });
-        }
+            [DefaultLoggerParameterNames.TestRunDirectory] = DefaultTestRunDirectory,
+            [TrxLoggerConstants.LogFileNameKey] = DefaultLogFileNameParameterValue
+        };
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotThrowExceptionIfTestRunDirectoryIsNeitherEmptyNorNull()
+    [TestCleanup]
+    public void Cleanup()
+    {
+        if (!string.IsNullOrEmpty(_testableTrxLogger?.TrxFile) && File.Exists(_testableTrxLogger!.TrxFile))
         {
-            var events = new Mock<TestLoggerEvents>();
-            this.testableTrxLogger.Initialize(events.Object, this.parameters);
+            File.Delete(_testableTrxLogger.TrxFile);
         }
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfParametersAreEmpty()
-        {
-            var events = new Mock<TestLoggerEvents>();
-            Assert.ThrowsException<ArgumentException>(() => this.testableTrxLogger.Initialize(events.Object, new Dictionary<string, string>()));
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfEventsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => _testableTrxLogger.Initialize(null!, _parameters));
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
+    [TestMethod]
+    public void InitializeShouldNotThrowExceptionIfEventsIsNotNull()
+    {
+        var events = new Mock<TestLoggerEvents>();
+        _testableTrxLogger.Initialize(events.Object, _parameters);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfTestRunDirectoryIsEmptyOrNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () =>
             {
-                this.testableTrxLogger.TestMessageHandler(new object(), default);
+                var events = new Mock<TestLoggerEvents>();
+                _parameters[DefaultLoggerParameterNames.TestRunDirectory] = null!;
+                _testableTrxLogger.Initialize(events.Object, _parameters);
             });
-        }
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
-        {
-            string message = "First message";
-            string message2 = "Second message";
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Informational, message);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme);
+    [TestMethod]
+    public void InitializeShouldNotThrowExceptionIfTestRunDirectoryIsNeitherEmptyNorNull()
+    {
+        var events = new Mock<TestLoggerEvents>();
+        _testableTrxLogger.Initialize(events.Object, _parameters);
+    }
 
-            TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Informational, message2);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme2);
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfParametersAreEmpty()
+    {
+        var events = new Mock<TestLoggerEvents>();
+        Assert.ThrowsException<ArgumentException>(() => _testableTrxLogger.Initialize(events.Object, new Dictionary<string, string?>()));
+    }
 
-            string expectedMessage = message + Environment.NewLine + message2 + Environment.NewLine;
-            Assert.AreEqual(expectedMessage, this.testableTrxLogger.GetRunLevelInformationalMessage());
-        }
+    [TestMethod]
+    public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _testableTrxLogger.TestMessageHandler(new object(), default!));
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldAddMessageInListIfItIsWarning()
-        {
-            string message = "The information to test";
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Warning, message);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme);
+    [TestMethod]
+    public void TestMessageHandlerShouldAddMessageWhenItIsInformation()
+    {
+        string message = "First message";
+        string message2 = "Second message";
+        TestRunMessageEventArgs trme = new(TestMessageLevel.Informational, message);
+        _testableTrxLogger.TestMessageHandler(new object(), trme);
 
-            Assert.AreEqual(2, this.testableTrxLogger.GetRunLevelErrorsAndWarnings().Count);
-        }
+        TestRunMessageEventArgs trme2 = new(TestMessageLevel.Informational, message2);
+        _testableTrxLogger.TestMessageHandler(new object(), trme2);
 
-        [TestMethod]
-        public void TestMessageHandlerShouldAddMessageInListIfItIsError()
-        {
-            string message = "The information to test";
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme);
+        string expectedMessage = message + Environment.NewLine + message2 + Environment.NewLine;
+        Assert.AreEqual(expectedMessage, _testableTrxLogger.GetRunLevelInformationalMessage());
+    }
 
-            Assert.AreEqual(1, this.testableTrxLogger.GetRunLevelErrorsAndWarnings().Count);
-        }
+    [TestMethod]
+    public void TestMessageHandlerShouldAddMessageInListIfItIsWarning()
+    {
+        string message = "The information to test";
+        TestRunMessageEventArgs trme = new(TestMessageLevel.Warning, message);
+        _testableTrxLogger.TestMessageHandler(new object(), trme);
+        _testableTrxLogger.TestMessageHandler(new object(), trme);
 
-        [TestMethod]
-        public void TestResultHandlerShouldCaptureStartTimeInSummaryWithTimeStampDuringIntialize()
-        {
-            ObjectModel.TestCase testCase = CreateTestCase("dummy string");
-            ObjectModel.TestResult testResult = new ObjectModel.TestResult(testCase);
-            Mock<TestResultEventArgs> e = new Mock<TestResultEventArgs>(testResult);
+        Assert.AreEqual(2, _testableTrxLogger.GetRunLevelErrorsAndWarnings().Count);
+    }
 
-            this.testableTrxLogger.TestResultHandler(new object(), e.Object);
+    [TestMethod]
+    public void TestMessageHandlerShouldAddMessageInListIfItIsError()
+    {
+        string message = "The information to test";
+        TestRunMessageEventArgs trme = new(TestMessageLevel.Error, message);
+        _testableTrxLogger.TestMessageHandler(new object(), trme);
 
-            Assert.AreEqual(this.testableTrxLogger.TestRunStartTime, this.testableTrxLogger.LoggerTestRun.Started);
-        }
+        Assert.AreEqual(1, _testableTrxLogger.GetRunLevelErrorsAndWarnings().Count);
+    }
 
-        [TestMethod]
-        public void TestResultHandlerKeepingTheTrackOfPassedAndFailedTests()
-        {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+    [TestMethod]
+    public void TestResultHandlerShouldCaptureStartTimeInSummaryWithTimeStampDuringIntialize()
+    {
+        TestCase testCase = CreateTestCase("dummy string");
+        VisualStudio.TestPlatform.ObjectModel.TestResult testResult = new(testCase);
+        Mock<TestResultEventArgs> e = new(testResult);
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+        _testableTrxLogger.TestResultHandler(new object(), e.Object);
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+        Assert.AreEqual(_testableTrxLogger.TestRunStartTime, _testableTrxLogger.LoggerTestRun?.Started);
+    }
 
-            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+    [TestMethod]
+    public void TestResultHandlerKeepingTheTrackOfPassedAndFailedTests()
+    {
+        TestCase passTestCase1 = CreateTestCase("Pass1");
+        TestCase passTestCase2 = CreateTestCase("Pass2");
+        TestCase failTestCase1 = CreateTestCase("Fail1");
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult1 = new(passTestCase1);
+        passResult1.Outcome = TestOutcome.Passed;
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult2 = new(passTestCase2);
+        passResult2.Outcome = TestOutcome.Passed;
 
-            this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), fail1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult failResult1 = new(failTestCase1);
+        failResult1.Outcome = TestOutcome.Failed;
 
-            Assert.AreEqual(2, this.testableTrxLogger.PassedTestCount, "Passed Tests");
-            Assert.AreEqual(1, this.testableTrxLogger.FailedTestCount, "Failed Tests");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult skipResult1 = new(skipTestCase1);
+        skipResult1.Outcome = TestOutcome.Skipped;
 
-        [TestMethod]
-        public void TestResultHandlerKeepingTheTrackOfTotalTests()
-        {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+        Mock<TestResultEventArgs> pass1 = new(passResult1);
+        Mock<TestResultEventArgs> pass2 = new(passResult2);
+        Mock<TestResultEventArgs> fail1 = new(failResult1);
+        Mock<TestResultEventArgs> skip1 = new(skipResult1);
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+        _testableTrxLogger.TestResultHandler(new object(), pass1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), pass2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), fail1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+        Assert.AreEqual(2, _testableTrxLogger.PassedTestCount, "Passed Tests");
+        Assert.AreEqual(1, _testableTrxLogger.FailedTestCount, "Failed Tests");
+    }
 
-            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+    [TestMethod]
+    public void TestResultHandlerKeepingTheTrackOfTotalTests()
+    {
+        TestCase passTestCase1 = CreateTestCase("Pass1");
+        TestCase passTestCase2 = CreateTestCase("Pass2");
+        TestCase failTestCase1 = CreateTestCase("Fail1");
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult1 = new(passTestCase1);
+        passResult1.Outcome = TestOutcome.Passed;
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult2 = new(passTestCase2);
+        passResult2.Outcome = TestOutcome.Passed;
 
-            this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), fail1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult failResult1 = new(failTestCase1);
+        failResult1.Outcome = TestOutcome.Failed;
 
-            Assert.AreEqual(4, this.testableTrxLogger.TotalTestCount, "Passed Tests");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult skipResult1 = new(skipTestCase1);
+        skipResult1.Outcome = TestOutcome.Skipped;
 
-        [TestMethod]
-        public void TestResultHandlerLockingAMessageForSkipTest()
-        {
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+        Mock<TestResultEventArgs> pass1 = new(passResult1);
+        Mock<TestResultEventArgs> pass2 = new(passResult2);
+        Mock<TestResultEventArgs> fail1 = new(failResult1);
+        Mock<TestResultEventArgs> skip1 = new(skipResult1);
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+        _testableTrxLogger.TestResultHandler(new object(), pass1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), pass2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), fail1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+        Assert.AreEqual(4, _testableTrxLogger.TotalTestCount, "Passed Tests");
+    }
 
-            this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
+    [TestMethod]
+    public void TestResultHandlerLockingAMessageForSkipTest()
+    {
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            string expectedMessage = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.MessageForSkippedTests, "Skip1");
+        VisualStudio.TestPlatform.ObjectModel.TestResult skipResult1 = new(skipTestCase1);
+        skipResult1.Outcome = TestOutcome.Skipped;
 
-            Assert.AreEqual(expectedMessage + Environment.NewLine, this.testableTrxLogger.GetRunLevelInformationalMessage());
-        }
+        Mock<TestResultEventArgs> skip1 = new(skipResult1);
 
-        [TestMethod]
-        public void TestResultHandlerShouldCreateOneTestResultForEachTestCase()
-        {
-            var testCase1 = CreateTestCase("testCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("testCase2");
+        _testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = ObjectModel.TestOutcome.Skipped;
+        string expectedMessage = string.Format(CultureInfo.CurrentCulture, TrxLoggerResources.MessageForSkippedTests, "Skip1");
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = ObjectModel.TestOutcome.Failed;
+        Assert.AreEqual(expectedMessage + Environment.NewLine, _testableTrxLogger.GetRunLevelInformationalMessage());
+    }
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+    [TestMethod]
+    public void TestResultHandlerShouldCreateOneTestResultForEachTestCase()
+    {
+        var testCase1 = CreateTestCase("testCase1");
+        TestCase testCase2 = CreateTestCase("testCase2");
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.Outcome = TestOutcome.Skipped;
 
-            Assert.AreEqual(2, this.testableTrxLogger.TestResultCount, "TestResultHandler is not creating test result entry for each test case");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.Outcome = TestOutcome.Failed;
 
-        [TestMethod]
-        public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.Outcome = ObjectModel.TestOutcome.Skipped;
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = ObjectModel.TestOutcome.Passed;
+        Assert.AreEqual(2, _testableTrxLogger.TestResultCount, "TestResultHandler is not creating test result entry for each test case");
+    }
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+    [TestMethod]
+    public void TestResultHandlerShouldCreateOneTestEntryForEachTestCase()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.Outcome = TestOutcome.Skipped;
 
-            Assert.AreEqual(2, this.testableTrxLogger.TestEntryCount, "TestResultHandler is not creating test result entry for each test case");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.Outcome = TestOutcome.Passed;
 
-        [TestMethod]
-        public void TestResultHandlerShouldCreateOneUnitTestElementForEachTestCase()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.Outcome = ObjectModel.TestOutcome.Failed;
+        Assert.AreEqual(2, _testableTrxLogger.TestEntryCount, "TestResultHandler is not creating test result entry for each test case");
+    }
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+    [TestMethod]
+    public void TestResultHandlerShouldCreateOneUnitTestElementForEachTestCase()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
 
-            Assert.AreEqual(2, this.testableTrxLogger.UnitTestElementCount, "TestResultHandler is not creating test result entry for each test case");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.Outcome = TestOutcome.Failed;
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddFlatResultsIfParentTestResultIsNotPresent()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
 
-            Guid parentExecutionId = Guid.NewGuid();
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        Assert.AreEqual(2, _testableTrxLogger.UnitTestElementCount, "TestResultHandler is not creating test result entry for each test case");
+    }
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase1);
-            result2.Outcome = ObjectModel.TestOutcome.Failed;
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+    [TestMethod]
+    public void TestResultHandlerShouldAddFlatResultsIfParentTestResultIsNotPresent()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result1.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Assert.AreEqual(2, this.testableTrxLogger.TestResultCount, "TestResultHandler is not creating flat results when parent result is not present.");
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase1);
+        result2.Outcome = TestOutcome.Failed;
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-        [TestMethod]
-        public void TestResultHandlerShouldChangeGuidAndDisplayNameForMsTestResultIfParentNotPresentButTestResultNamePresent()
-        {
-            this.ValidateTestIdAndNameInTrx(true);
-        }
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotChangeGuidAndDisplayNameForNonMsTestResultIfParentNotPresentButTestResultNamePresent()
-        {
-            this.ValidateTestIdAndNameInTrx(false);
-        }
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddHierarchicalResultsIfParentTestResultIsPresent()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+        Assert.AreEqual(2, _testableTrxLogger.TestResultCount, "TestResultHandler is not creating flat results when parent result is not present.");
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldNotChangeGuidAndDisplayNameForTestResultIfParentNotPresentButTestResultNamePresent()
+    {
+        ValidateTestIdAndNameInTrx();
+    }
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+    [TestMethod]
+    public void TestResultHandlerShouldAddHierarchicalResultsIfParentTestResultIsPresent()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase1);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase1);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase1);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase1);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Assert.AreEqual(1, this.testableTrxLogger.TestResultCount, "TestResultHandler is not creating hierarchical results when parent result is present.");
-            Assert.AreEqual(3, this.testableTrxLogger.TotalTestCount, "TestResultHandler is not adding all inner results in parent test result.");
-        }
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddSingleTestElementForDataDrivenTests()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-            Guid parentExecutionId = Guid.NewGuid();
+        Assert.AreEqual(1, _testableTrxLogger.TestResultCount, "TestResultHandler is not creating hierarchical results when parent result is present.");
+        Assert.AreEqual(3, _testableTrxLogger.TotalTestCount, "TestResultHandler is not adding all inner results in parent test result.");
+    }
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+    [TestMethod]
+    public void TestResultHandlerShouldAddSingleTestElementForDataDrivenTests()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase1);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase1);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase1);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase1);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Assert.AreEqual(1, this.testableTrxLogger.UnitTestElementCount, "TestResultHandler is adding multiple test elements for data driven tests.");
-        }
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddSingleTestEntryForDataDrivenTests()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+
+        Assert.AreEqual(1, _testableTrxLogger.UnitTestElementCount, "TestResultHandler is adding multiple test elements for data driven tests.");
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldAddSingleTestEntryForDataDrivenTests()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase1);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase1);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase1);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase1);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-            Assert.AreEqual(1, this.testableTrxLogger.TestEntryCount, "TestResultHandler is adding multiple test entries for data driven tests.");
-        }
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
-            ObjectModel.TestCase testCase3 = CreateTestCase("TestCase3");
+        Assert.AreEqual(1, _testableTrxLogger.TestEntryCount, "TestResultHandler is adding multiple test entries for data driven tests.");
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldAddHierarchicalResultsForOrderedTest()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        TestCase testCase3 = CreateTestCase("TestCase3");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+        result1.SetPropertyValue(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase3);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-            Assert.AreEqual(1, this.testableTrxLogger.TestResultCount, "TestResultHandler is not creating hierarchical results for ordered test.");
-            Assert.AreEqual(3, this.testableTrxLogger.TotalTestCount, "TestResultHandler is not adding all inner results in ordered test.");
-        }
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddMultipleTestElementsForOrderedTest()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
-            ObjectModel.TestCase testCase3 = CreateTestCase("TestCase3");
+        Assert.AreEqual(1, _testableTrxLogger.TestResultCount, "TestResultHandler is not creating hierarchical results for ordered test.");
+        Assert.AreEqual(3, _testableTrxLogger.TotalTestCount, "TestResultHandler is not adding all inner results in ordered test.");
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldAddMultipleTestElementsForOrderedTest()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        TestCase testCase3 = CreateTestCase("TestCase3");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+        result1.SetPropertyValue(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase3);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-            Assert.AreEqual(3, this.testableTrxLogger.UnitTestElementCount, "TestResultHandler is not adding multiple test elements for ordered test.");
-        }
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-        [TestMethod]
-        public void TestResultHandlerShouldAddSingleTestEntryForOrderedTest()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            ObjectModel.TestCase testCase2 = CreateTestCase("TestCase2");
-            ObjectModel.TestCase testCase3 = CreateTestCase("TestCase3");
+        Assert.AreEqual(3, _testableTrxLogger.UnitTestElementCount, "TestResultHandler is not adding multiple test elements for ordered test.");
+    }
 
-            Guid parentExecutionId = Guid.NewGuid();
+    [TestMethod]
+    public void TestResultHandlerShouldAddSingleTestEntryForOrderedTest()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        TestCase testCase3 = CreateTestCase("TestCase3");
 
-            ObjectModel.TestResult result1 = new ObjectModel.TestResult(testCase1);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
-            result1.SetPropertyValue<Guid>(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
+        Guid parentExecutionId = Guid.NewGuid();
 
-            ObjectModel.TestResult result2 = new ObjectModel.TestResult(testCase2);
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result1 = new(testCase1);
+        result1.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, parentExecutionId);
+        result1.SetPropertyValue(TrxLoggerConstants.TestTypeProperty, TrxLoggerConstants.OrderedTestTypeGuid);
 
-            ObjectModel.TestResult result3 = new ObjectModel.TestResult(testCase3);
-            result3.Outcome = ObjectModel.TestOutcome.Failed;
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue<Guid>(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result2 = new(testCase2);
+        result2.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            Mock<TestResultEventArgs> resultEventArg1 = new Mock<TestResultEventArgs>(result1);
-            Mock<TestResultEventArgs> resultEventArg2 = new Mock<TestResultEventArgs>(result2);
-            Mock<TestResultEventArgs> resultEventArg3 = new Mock<TestResultEventArgs>(result3);
+        VisualStudio.TestPlatform.ObjectModel.TestResult result3 = new(testCase3);
+        result3.Outcome = TestOutcome.Failed;
+        result3.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(TrxLoggerConstants.ParentExecIdProperty, parentExecutionId);
 
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
+        Mock<TestResultEventArgs> resultEventArg1 = new(result1);
+        Mock<TestResultEventArgs> resultEventArg2 = new(result2);
+        Mock<TestResultEventArgs> resultEventArg3 = new(result3);
 
-            Assert.AreEqual(1, this.testableTrxLogger.TestEntryCount, "TestResultHandler is adding multiple test entries for ordered test.");
-        }
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg3.Object);
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldReportFailedOutcomeIfTestRunIsAborted()
-        {
-            string message = "The information to test";
-            TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Error, message);
-            this.testableTrxLogger.TestMessageHandler(new object(), trme);
+        Assert.AreEqual(1, _testableTrxLogger.TestEntryCount, "TestResultHandler is adding multiple test entries for ordered test.");
+    }
 
-            this.testableTrxLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldReportFailedOutcomeIfTestRunIsAborted()
+    {
+        string message = "The information to test";
+        TestRunMessageEventArgs trme = new(TestMessageLevel.Error, message);
+        _testableTrxLogger.TestMessageHandler(new object(), trme);
 
-            Assert.AreEqual(this.testableTrxLogger.TestResultOutcome, TrxLoggerObjectModel.TestOutcome.Failed);
-        }
+        _testableTrxLogger.TestRunCompleteHandler(new object(), new TestRunCompleteEventArgs(null, false, true, null, null, null, TimeSpan.Zero));
 
-        [TestMethod]
-        public void OutcomeOfRunWillBeFailIfAnyTestsFails()
-        {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase failTestCase1 = CreateTestCase("Fail1");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+        Assert.AreEqual(_testableTrxLogger.TestResultOutcome, TrxLoggerObjectModel.TestOutcome.Failed);
+    }
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+    [TestMethod]
+    public void OutcomeOfRunWillBeFailIfAnyTestsFails()
+    {
+        TestCase passTestCase1 = CreateTestCase("Pass1");
+        TestCase passTestCase2 = CreateTestCase("Pass2");
+        TestCase failTestCase1 = CreateTestCase("Fail1");
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult1 = new(passTestCase1);
+        passResult1.Outcome = TestOutcome.Passed;
 
-            ObjectModel.TestResult failResult1 = new ObjectModel.TestResult(failTestCase1);
-            failResult1.Outcome = ObjectModel.TestOutcome.Failed;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult2 = new(passTestCase2);
+        passResult2.Outcome = TestOutcome.Passed;
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+        VisualStudio.TestPlatform.ObjectModel.TestResult failResult1 = new(failTestCase1);
+        failResult1.Outcome = TestOutcome.Failed;
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> fail1 = new Mock<TestResultEventArgs>(failResult1);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+        VisualStudio.TestPlatform.ObjectModel.TestResult skipResult1 = new(skipTestCase1);
+        skipResult1.Outcome = TestOutcome.Skipped;
 
-            this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), fail1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
+        Mock<TestResultEventArgs> pass1 = new(passResult1);
+        Mock<TestResultEventArgs> pass2 = new(passResult2);
+        Mock<TestResultEventArgs> fail1 = new(failResult1);
+        Mock<TestResultEventArgs> skip1 = new(skipResult1);
 
-            var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        _testableTrxLogger.TestResultHandler(new object(), pass1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), pass2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), fail1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-            this.testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
 
-            Assert.AreEqual(TrxLoggerObjectModel.TestOutcome.Failed, this.testableTrxLogger.TestResultOutcome);
-        }
+        _testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
 
-        [TestMethod]
-        public void OutcomeOfRunWillBeCompletedIfNoTestsFails()
-        {
-            ObjectModel.TestCase passTestCase1 = CreateTestCase("Pass1");
-            ObjectModel.TestCase passTestCase2 = CreateTestCase("Pass2");
-            ObjectModel.TestCase skipTestCase1 = CreateTestCase("Skip1");
+        Assert.AreEqual(TrxLoggerObjectModel.TestOutcome.Failed, _testableTrxLogger.TestResultOutcome);
+    }
 
-            ObjectModel.TestResult passResult1 = new ObjectModel.TestResult(passTestCase1);
-            passResult1.Outcome = ObjectModel.TestOutcome.Passed;
+    [TestMethod]
+    public void OutcomeOfRunWillBeCompletedIfNoTestsFails()
+    {
+        TestCase passTestCase1 = CreateTestCase("Pass1");
+        TestCase passTestCase2 = CreateTestCase("Pass2");
+        TestCase skipTestCase1 = CreateTestCase("Skip1");
 
-            ObjectModel.TestResult passResult2 = new ObjectModel.TestResult(passTestCase2);
-            passResult2.Outcome = ObjectModel.TestOutcome.Passed;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult1 = new(passTestCase1);
+        passResult1.Outcome = TestOutcome.Passed;
 
-            ObjectModel.TestResult skipResult1 = new ObjectModel.TestResult(skipTestCase1);
-            skipResult1.Outcome = ObjectModel.TestOutcome.Skipped;
+        VisualStudio.TestPlatform.ObjectModel.TestResult passResult2 = new(passTestCase2);
+        passResult2.Outcome = TestOutcome.Passed;
 
-            Mock<TestResultEventArgs> pass1 = new Mock<TestResultEventArgs>(passResult1);
-            Mock<TestResultEventArgs> pass2 = new Mock<TestResultEventArgs>(passResult2);
-            Mock<TestResultEventArgs> skip1 = new Mock<TestResultEventArgs>(skipResult1);
+        VisualStudio.TestPlatform.ObjectModel.TestResult skipResult1 = new(skipTestCase1);
+        skipResult1.Outcome = TestOutcome.Skipped;
 
-            this.testableTrxLogger.TestResultHandler(new object(), pass1.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), pass2.Object);
-            this.testableTrxLogger.TestResultHandler(new object(), skip1.Object);
+        Mock<TestResultEventArgs> pass1 = new(passResult1);
+        Mock<TestResultEventArgs> pass2 = new(passResult2);
+        Mock<TestResultEventArgs> skip1 = new(skipResult1);
 
-            var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        _testableTrxLogger.TestResultHandler(new object(), pass1.Object);
+        _testableTrxLogger.TestResultHandler(new object(), pass2.Object);
+        _testableTrxLogger.TestResultHandler(new object(), skip1.Object);
 
-            this.testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
 
-            Assert.AreEqual(TrxLoggerObjectModel.TestOutcome.Completed, this.testableTrxLogger.TestResultOutcome);
-        }
+        _testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
 
-        [TestMethod]
-        public void TheDefaultTrxFileNameShouldNotHaveWhiteSpace()
-        {
-            // To create default trx file, log file parameter should be null.
-            this.parameters[TrxLoggerConstants.LogFileNameKey] = null;
-            this.testableTrxLogger.Initialize(this.events.Object, this.parameters);
+        Assert.AreEqual(TrxLoggerObjectModel.TestOutcome.Completed, _testableTrxLogger.TestResultOutcome);
+    }
 
-            this.MakeTestRunComplete();
+    [TestMethod]
+    public void TheDefaultTrxFileNameShouldNotHaveWhiteSpace()
+    {
+        // To create default trx file, log file parameter should be null.
+        _parameters[TrxLoggerConstants.LogFileNameKey] = null!;
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            bool trxFileNameContainsWhiteSpace = Path.GetFileName(this.testableTrxLogger.trxFile).Contains(' ');
-            Assert.IsFalse(trxFileNameContainsWhiteSpace, $"\"{this.testableTrxLogger.trxFile}\": Trx file name should not have white spaces");
-        }
+        MakeTestRunComplete();
 
-        [TestMethod]
-        public void DefaultTrxFileShouldCreateIfLogFileNameParameterNotPassed()
-        {
-            // To create default trx file, If LogFileName parameter not passed
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            this.testableTrxLogger.Initialize(this.events.Object, this.parameters);
+        bool trxFileNameContainsWhiteSpace = Path.GetFileName(_testableTrxLogger.TrxFile)!.Contains(' ');
+        Assert.IsFalse(trxFileNameContainsWhiteSpace, $"\"{_testableTrxLogger.TrxFile}\": Trx file name should not have white spaces");
+    }
 
-            this.MakeTestRunComplete();
+    [TestMethod]
+    public void DefaultTrxFileShouldCreateIfLogFileNameParameterNotPassed()
+    {
+        // To create default trx file, If LogFileName parameter not passed
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            Assert.IsFalse(string.IsNullOrWhiteSpace(this.testableTrxLogger.trxFile));
-        }
+        MakeTestRunComplete();
 
-        [TestMethod]
-        public void DefaultTrxFileNameVerification()
-        {
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            this.parameters[TrxLoggerConstants.LogFilePrefixKey] = DefaultLogFilePrefixParameterValue;
+        Assert.IsFalse(string.IsNullOrWhiteSpace(_testableTrxLogger.TrxFile));
+    }
 
-            var time = DateTime.Now;
-            var trxFileHelper = new TrxFileHelper(() => time);
+    [TestMethod]
+    public void DefaultTrxFileNameVerification()
+    {
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        _parameters[TrxLoggerConstants.LogFilePrefixKey] = DefaultLogFilePrefixParameterValue;
 
-            testableTrxLogger = new TestableTrxLogger(new FileHelper(), trxFileHelper);
-            testableTrxLogger.Initialize(this.events.Object, this.parameters);
+        var time = DateTime.Now;
+        var trxFileHelper = new TrxFileHelper(() => time);
 
-            MakeTestRunComplete();
+        _testableTrxLogger = new TestableTrxLogger(new FileHelper(), trxFileHelper);
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            var fileName = Path.GetFileName(testableTrxLogger.trxFile);
-            var expectedName = $"{DefaultLogFilePrefixParameterValue}{time:_yyyyMMddHHmmss}.trx";
+        MakeTestRunComplete();
 
-            Assert.AreEqual(expectedName, fileName, "Trx file name pattern has changed. It should be in the form of prefix_yyyyMMddHHmmss.trx, Azure Devops VSTest task depends on this naming.");
-        }
+        var fileName = Path.GetFileName(_testableTrxLogger.TrxFile);
+        var expectedName = $"{DefaultLogFilePrefixParameterValue}{time:_yyyyMMddHHmmss}.trx";
 
-        [TestMethod]
-        public void DefaultTrxFileShouldIterateIfLogFileNameParameterNotPassed()
-        {
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        Assert.AreEqual(expectedName, fileName, "Trx file name pattern has changed. It should be in the form of prefix_yyyyMMddHHmmss.trx, Azure Devops VSTest task depends on this naming.");
+    }
 
-            var files = TestMultipleTrxLoggers();
+    [TestMethod]
+    public void DefaultTrxFileShouldIterateIfLogFileNameParameterNotPassed()
+    {
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
 
-            Assert.AreEqual(MultipleLoggerInstanceCount, files.Length, "All logger instances should get different file names!");
-        }
+        var files = TestMultipleTrxLoggers();
 
-        [TestMethod]
-        public void TrxFileNameShouldNotIterate()
-        {
-            var files = TestMultipleTrxLoggers();
+        Assert.AreEqual(MultipleLoggerInstanceCount, files.Length, "All logger instances should get different file names!");
+    }
 
-            Assert.AreEqual(1, files.Length, "All logger instances should get the same file name!");
-        }
+    [TestMethod]
+    public void TrxFileNameShouldNotIterate()
+    {
+        var files = TestMultipleTrxLoggers();
 
-        [TestMethod]
-        public void TrxPrefixFileNameShouldIterate()
-        {
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            this.parameters[TrxLoggerConstants.LogFilePrefixKey] = DefaultLogFilePrefixParameterValue;
+        Assert.AreEqual(1, files.Length, "All logger instances should get the same file name!");
+    }
 
-            var files = TestMultipleTrxLoggers();
+    [TestMethod]
+    public void TrxPrefixFileNameShouldIterate()
+    {
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        _parameters[TrxLoggerConstants.LogFilePrefixKey] = DefaultLogFilePrefixParameterValue;
 
-            Assert.AreEqual(MultipleLoggerInstanceCount, files.Length, "All logger instances should get different file names!");
-        }
+        var files = TestMultipleTrxLoggers();
+
+        Assert.AreEqual(MultipleLoggerInstanceCount, files.Length, "All logger instances should get different file names!");
+    }
+
+    private string?[] TestMultipleTrxLoggers()
+    {
+        var files = new string?[2];
 
-        private string[] TestMultipleTrxLoggers()
+        try
         {
-            var files = new string[2];
+            var time = new DateTime(2020, 1, 1, 0, 0, 0);
 
-            try
-            {
-                var time = new DateTime(2020, 1, 1, 0, 0, 0);
+            var trxFileHelper = new TrxFileHelper(() => time);
+            var trxLogger1 = new TestableTrxLogger(new FileHelper(), trxFileHelper);
+            var trxLogger2 = new TestableTrxLogger(new FileHelper(), trxFileHelper);
 
-                var trxFileHelper = new TrxFileHelper(() => time);
-                var trxLogger1 = new TestableTrxLogger(new FileHelper(), trxFileHelper);
-                var trxLogger2 = new TestableTrxLogger(new FileHelper(), trxFileHelper);
+            trxLogger1.Initialize(_events.Object, _parameters);
+            trxLogger2.Initialize(_events.Object, _parameters);
 
-                trxLogger1.Initialize(this.events.Object, this.parameters);
-                trxLogger2.Initialize(this.events.Object, this.parameters);
+            MakeTestRunComplete(trxLogger1);
+            files[0] = trxLogger1.TrxFile;
 
-                MakeTestRunComplete(trxLogger1);
-                files[0] = trxLogger1.trxFile;
+            MakeTestRunComplete(trxLogger2);
+            files[1] = trxLogger2.TrxFile;
+        }
+        finally
+        {
+            files = files
+                .Where(i => !string.IsNullOrWhiteSpace(i))
+                .Distinct()
+                .ToArray();
 
-                MakeTestRunComplete(trxLogger2);
-                files[1] = trxLogger2.trxFile;
-            }
-            finally
+            foreach (var file in files)
             {
-                files = files
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
-                    .Distinct()
-                    .ToArray();
-
-                foreach (var file in files)
+                if (!string.IsNullOrEmpty(file) && File.Exists(file))
                 {
-                    if (!string.IsNullOrEmpty(file) && File.Exists(file))
-                    {
-                        File.Delete(file);
-                    }
+                    File.Delete(file);
                 }
             }
-
-            return files;
         }
 
-        [TestMethod]
-        public void CustomTrxFileNameShouldConstructFromLogFileParameter()
-        {
-            this.MakeTestRunComplete();
+        return files;
+    }
 
-            Assert.AreEqual(Path.Combine(TrxLoggerTests.DefaultTestRunDirectory, TrxLoggerTests.DefaultLogFileNameParameterValue), this.testableTrxLogger.trxFile, "Wrong Trx file name");
-        }
+    [TestMethod]
+    public void CustomTrxFileNameShouldConstructFromLogFileParameter()
+    {
+        MakeTestRunComplete();
 
-        /// <summary>
-        /// Unit test for reading TestCategories from the TestCase which is part of test result.
-        /// </summary>
-        [TestMethod]
-        public void GetCustomPropertyValueFromTestCaseShouldReadCategoryAttributesFromTestCase()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            TestProperty testProperty = TestProperty.Register("MSTestDiscoverer.TestCategory", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
+        Assert.AreEqual(Path.Combine(DefaultTestRunDirectory, DefaultLogFileNameParameterValue), _testableTrxLogger.TrxFile, "Wrong Trx file name");
+    }
 
-            testCase1.SetPropertyValue(testProperty, new[] { "ClassLevel", "AsmLevel" });
+    /// <summary>
+    /// Unit test for reading TestCategories from the TestCase which is part of test result.
+    /// </summary>
+    [TestMethod]
+    public void GetCustomPropertyValueFromTestCaseShouldReadCategoryAttributesFromTestCase()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestProperty testProperty = TestProperty.Register("MSTestDiscoverer.TestCategory", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
 
-            var converter = new Converter(new Mock<IFileHelper>().Object, new TrxFileHelper());
-            List<String> listCategoriesActual = converter.GetCustomPropertyValueFromTestCase(testCase1, "MSTestDiscoverer.TestCategory");
+        testCase1.SetPropertyValue(testProperty, new[] { "ClassLevel", "AsmLevel" });
 
-            List<String> listCategoriesExpected = new List<string>();
-            listCategoriesExpected.Add("ClassLevel");
-            listCategoriesExpected.Add("AsmLevel");
+        List<string> listCategoriesActual = Converter.GetCustomPropertyValueFromTestCase(testCase1, "MSTestDiscoverer.TestCategory");
 
-            CollectionAssert.AreEqual(listCategoriesExpected, listCategoriesActual);
-        }
+        List<string> listCategoriesExpected =
+        [
+            "ClassLevel",
+            "AsmLevel"
+        ];
 
-        [TestMethod]
-        public void GetCustomPropertyValueFromTestCaseShouldReadWorkItemAttributesFromTestCase()
-        {
-            ObjectModel.TestCase testCase1 = CreateTestCase("TestCase1");
-            TestProperty testProperty = TestProperty.Register("WorkItemIds", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
+        CollectionAssert.AreEqual(listCategoriesExpected, listCategoriesActual);
+    }
 
-            testCase1.SetPropertyValue(testProperty, new[] { "99999", "0" });
+    [TestMethod]
+    public void GetCustomPropertyValueFromTestCaseShouldReadWorkItemAttributesFromTestCase()
+    {
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestProperty testProperty = TestProperty.Register("WorkItemIds", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
 
-            var converter = new Converter(new Mock<IFileHelper>().Object, new TrxFileHelper());
-            List<string> listWorkItemsActual = converter.GetCustomPropertyValueFromTestCase(testCase1, "WorkItemIds");
+        testCase1.SetPropertyValue(testProperty, new[] { "99999", "0" });
 
-            List<string> listWorkItemsExpected = new List<string>();
-            listWorkItemsExpected.Add("99999");
-            listWorkItemsExpected.Add("0");
+        List<string> listWorkItemsActual = Converter.GetCustomPropertyValueFromTestCase(testCase1, "WorkItemIds");
 
-            CollectionAssert.AreEqual(listWorkItemsExpected, listWorkItemsActual);
-        }
+        List<string> listWorkItemsExpected =
+        [
+            "99999",
+            "0"
+        ];
 
-        [TestMethod]
-        public void CRLFCharactersShouldGetRetainedInTrx()
-        {
-            // To create default trx file, If LogFileName parameter not passed
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            this.testableTrxLogger.Initialize(this.events.Object, this.parameters);
+        CollectionAssert.AreEqual(listWorkItemsExpected, listWorkItemsActual);
+    }
 
-            string message = $"one line{ Environment.NewLine }second line\r\nthird line";
-            var pass = TrxLoggerTests.CreatePassTestResultEventArgsMock("Pass1", new List<TestResultMessage> { new TestResultMessage(TestResultMessage.StandardOutCategory, message) });
+    [TestMethod]
+    public void CrlfCharactersShouldGetRetainedInTrx()
+    {
+        // To create default trx file, If LogFileName parameter not passed
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            this.testableTrxLogger.TestResultHandler(new object(), pass.Object);
+        string message = $"one line{Environment.NewLine}second line\r\nthird line";
+        var pass = CreatePassTestResultEventArgsMock("Pass1", new List<TestResultMessage> { new(TestResultMessage.StandardOutCategory, message) });
 
-            var testRunCompleteEventArgs = TrxLoggerTests.CreateTestRunCompleteEventArgs();
-            this.testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+        _testableTrxLogger.TestResultHandler(new object(), pass.Object);
 
-            Assert.IsTrue(File.Exists(this.testableTrxLogger.trxFile), string.Format("TRX file: {0}, should have got created.", this.testableTrxLogger.trxFile));
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        _testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
 
-            string actualMessage = GetElementValueFromTrx(this.testableTrxLogger.trxFile, "StdOut");
+        Assert.IsTrue(File.Exists(_testableTrxLogger.TrxFile), $"TRX file: {_testableTrxLogger.TrxFile}, should have got created.");
 
-            Assert.IsNotNull(actualMessage);
-            Assert.IsTrue(string.Equals(message, actualMessage), string.Format("StdOut messages do not match. Expected:{0}, Actual:{1}", message, actualMessage));
-        }
+        string? actualMessage = GetElementValueFromTrx(_testableTrxLogger.TrxFile!, "StdOut");
 
-        [TestMethod]
-        public void TestRunInformationShouldContainUtcDateTime()
-        {
-            this.MakeTestRunComplete();
-            this.ValidateDateTimeInTrx(this.testableTrxLogger.trxFile);
-        }
+        Assert.IsNotNull(actualMessage);
+        Assert.IsTrue(string.Equals(message, actualMessage), $"StdOut messages do not match. Expected:{message}, Actual:{actualMessage}");
+    }
 
-        private void ValidateDateTimeInTrx(string trxFileName)
-        {
-            using (FileStream file = File.OpenRead(trxFileName))
-            {
-                using (XmlReader reader = XmlReader.Create(file))
-                {
-                    XDocument document = XDocument.Load(reader);
-                    var timesNode = document.Descendants(document.Root.GetDefaultNamespace() + "Times").FirstOrDefault();
-                    ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("creation").FirstOrDefault().Value));
-                    ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("start").FirstOrDefault().Value));
-                    var resultNode = document.Descendants(document.Root.GetDefaultNamespace() + "UnitTestResult").FirstOrDefault();
-                    ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("endTime").FirstOrDefault().Value));
-                    ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("startTime").FirstOrDefault().Value));
-                }
-            }
-        }
+    [TestMethod]
+    public void TestRunInformationShouldContainUtcDateTime()
+    {
+        MakeTestRunComplete();
+        ValidateDateTimeInTrx(_testableTrxLogger.TrxFile!);
+    }
 
-        [TestMethod]
-        [DataRow("results")]
-        public void CustomTrxFileNameShouldBeConstructedFromRelativeLogFilePrefixParameter(string prefixName)
-        {
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            this.parameters[TrxLoggerConstants.LogFilePrefixKey] = prefixName;
-            this.parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
-            this.testableTrxLogger.Initialize(events.Object, this.parameters);
+    private static void ValidateDateTimeInTrx(string trxFileName)
+    {
+        using FileStream file = File.OpenRead(trxFileName);
+        using XmlReader reader = XmlReader.Create(file);
+        XDocument document = XDocument.Load(reader);
+        var timesNode = document.Descendants(document.Root!.GetDefaultNamespace() + "Times").First();
+        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("creation").First().Value, CultureInfo.CurrentCulture));
+        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(timesNode.Attributes("start").First().Value, CultureInfo.CurrentCulture));
+        var resultNode = document.Descendants(document.Root.GetDefaultNamespace() + "UnitTestResult").First();
+        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("endTime").First().Value, CultureInfo.CurrentCulture));
+        ValidateTimeWithinUtcLimits(DateTimeOffset.Parse(resultNode.Attributes("startTime").First().Value, CultureInfo.CurrentCulture));
+    }
 
-            this.MakeTestRunComplete();
+    [TestMethod]
+    [DataRow("results")]
+    public void CustomTrxFileNameShouldBeConstructedFromRelativeLogFilePrefixParameter(string prefixName)
+    {
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        _parameters[TrxLoggerConstants.LogFilePrefixKey] = prefixName;
+        _parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            string actualFileNameWithoutTimestamp = this.testableTrxLogger.trxFile.Substring(0, this.testableTrxLogger.trxFile.LastIndexOf('_'));
+        MakeTestRunComplete();
 
-            Assert.AreNotEqual(Path.Combine(TrxLoggerTests.DefaultTestRunDirectory, "results.trx"), this.testableTrxLogger.trxFile, "Expected framework name to appear in file name");
-            Assert.AreNotEqual(Path.Combine(TrxLoggerTests.DefaultTestRunDirectory, "results_net451.trx"), this.testableTrxLogger.trxFile, "Expected time stamp to appear in file name");
-            Assert.AreEqual(Path.Combine(TrxLoggerTests.DefaultTestRunDirectory, "results_net451"), actualFileNameWithoutTimestamp);
-        }
+        string actualFileNameWithoutTimestamp = _testableTrxLogger.TrxFile!.Substring(0, _testableTrxLogger.TrxFile.LastIndexOf('_'));
 
-        [TestMethod]
-        public void CustomTrxFileNameShouldBeConstructedFromAbsoluteLogFilePrefixParameter()
-        {
-            this.parameters.Remove(TrxLoggerConstants.LogFileNameKey);
-            var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
-            this.parameters[TrxLoggerConstants.LogFilePrefixKey] = trxPrefix;
-            this.parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
-            this.testableTrxLogger.Initialize(events.Object, this.parameters);
+        Assert.AreNotEqual(Path.Combine(DefaultTestRunDirectory, "results.trx"), _testableTrxLogger.TrxFile, "Expected framework name to appear in file name");
+        Assert.AreNotEqual(Path.Combine(DefaultTestRunDirectory, "results_net451.trx"), _testableTrxLogger.TrxFile, "Expected time stamp to appear in file name");
+        Assert.AreEqual(Path.Combine(DefaultTestRunDirectory, "results_net451"), actualFileNameWithoutTimestamp);
+    }
 
-            this.MakeTestRunComplete();
+    [TestMethod]
+    public void CustomTrxFileNameShouldBeConstructedFromAbsoluteLogFilePrefixParameter()
+    {
+        _parameters.Remove(TrxLoggerConstants.LogFileNameKey);
+        var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
+        _parameters[TrxLoggerConstants.LogFilePrefixKey] = trxPrefix;
+        _parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
+        _testableTrxLogger.Initialize(_events.Object, _parameters);
 
-            string actualFileNameWithoutTimestamp = this.testableTrxLogger.trxFile.Substring(0, this.testableTrxLogger.trxFile.LastIndexOf('_'));
+        MakeTestRunComplete();
 
-            Assert.AreEqual(trxPrefix + "_net451", actualFileNameWithoutTimestamp);
+        string actualFileNameWithoutTimestamp = _testableTrxLogger.TrxFile!.Substring(0, _testableTrxLogger.TrxFile.LastIndexOf('_'));
 
-            File.Delete(this.testableTrxLogger.trxFile);
-        }
+        Assert.AreEqual(trxPrefix + "_net451", actualFileNameWithoutTimestamp);
 
-        [TestMethod]
-        public void IntializeShouldThrowExceptionIfBothPrefixAndNameProvided()
-        {
-            this.parameters[TrxLoggerConstants.LogFileNameKey] = "results.trx";
-            var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
-            this.parameters[TrxLoggerConstants.LogFilePrefixKey] = trxPrefix;
-            this.parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
+        File.Delete(_testableTrxLogger.TrxFile);
+    }
 
-            Assert.ThrowsException<ArgumentException>(() => this.testableTrxLogger.Initialize(events.Object, this.parameters));
-        }
+    [TestMethod]
+    public void IntializeShouldThrowExceptionIfBothPrefixAndNameProvided()
+    {
+        _parameters[TrxLoggerConstants.LogFileNameKey] = "results.trx";
+        var trxPrefix = Path.Combine(Path.GetTempPath(), "results");
+        _parameters[TrxLoggerConstants.LogFilePrefixKey] = trxPrefix;
+        _parameters[DefaultLoggerParameterNames.TargetFramework] = ".NETFramework,Version=4.5.1";
 
-        private void ValidateTestIdAndNameInTrx(bool isMstestAdapter)
-        {
-            ObjectModel.TestCase testCase = CreateTestCase("TestCase");
-            testCase.ExecutorUri = isMstestAdapter ? new Uri("some://mstestadapteruri") : new Uri("some://uri");
+        Assert.ThrowsException<ArgumentException>(() => _testableTrxLogger.Initialize(_events.Object, _parameters));
+    }
 
-            ObjectModel.TestResult result = new ObjectModel.TestResult(testCase);
-            result.SetPropertyValue<Guid>(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
-            if (isMstestAdapter)
-            {
-                result.DisplayName = "testDisplayName";
-            }
+    [TestMethod]
+    public void SkipInitializeDictionaryShouldNotFail()
+    {
+        var logger = new TestableTrxLogger();
+        logger.Initialize(_events.Object, Path.GetTempPath());
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        logger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+        Assert.IsTrue(File.Exists(logger.TrxFile));
+        File.Delete(logger.TrxFile);
+    }
 
-            Mock<TestResultEventArgs> resultEventArg = new Mock<TestResultEventArgs>(result);
-            this.testableTrxLogger.TestResultHandler(new object(), resultEventArg.Object);
-            var testRunCompleteEventArgs = TrxLoggerTests.CreateTestRunCompleteEventArgs();
-            this.testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+    private void ValidateTestIdAndNameInTrx()
+    {
+        TestCase testCase = CreateTestCase("TestCase");
+        testCase.ExecutorUri = new Uri("some://uri");
 
-            this.ValidateResultAttributesInTrx(this.testableTrxLogger.trxFile, testCase.Id, testCase.DisplayName, isMstestAdapter);
-        }
+        VisualStudio.TestPlatform.ObjectModel.TestResult result = new(testCase);
+        result.SetPropertyValue(TrxLoggerConstants.ExecutionIdProperty, Guid.NewGuid());
 
-        private void ValidateResultAttributesInTrx(string trxFileName, Guid testId, string testName, bool isMstestAdapter)
-        {
-            using (FileStream file = File.OpenRead(trxFileName))
-            {
-                using (XmlReader reader = XmlReader.Create(file))
-                {
-                    XDocument document = XDocument.Load(reader);
-                    var resultNode = document.Descendants(document.Root.GetDefaultNamespace() + "UnitTestResult").FirstOrDefault();
-                    if (isMstestAdapter)
-                    {
-                        Assert.AreNotEqual(resultNode.Attributes("testId").FirstOrDefault().Value, testId.ToString());
-                        Assert.AreNotEqual(resultNode.Attributes("testName").FirstOrDefault().Value, testName);
-                    }
-                    else
-                    {
-                        Assert.AreEqual(resultNode.Attributes("testId").FirstOrDefault().Value, testId.ToString());
-                        Assert.AreEqual(resultNode.Attributes("testName").FirstOrDefault().Value, testName);
-                    }
-                }
-            }
-        }
+        Mock<TestResultEventArgs> resultEventArg = new(result);
+        _testableTrxLogger.TestResultHandler(new object(), resultEventArg.Object);
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        _testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
 
-        private void ValidateTimeWithinUtcLimits(DateTimeOffset dateTime)
-        {
-            Assert.IsTrue(dateTime.UtcDateTime.Subtract(DateTime.UtcNow) < new TimeSpan(0, 0, 0, 60));
-        }
+        ValidateResultAttributesInTrx(_testableTrxLogger.TrxFile!, testCase.Id, testCase.DisplayName);
+    }
+
+    private static void ValidateResultAttributesInTrx(string trxFileName, Guid testId, string testName)
+    {
+        using FileStream file = File.OpenRead(trxFileName);
+        using XmlReader reader = XmlReader.Create(file);
+        XDocument document = XDocument.Load(reader);
+        var resultNode = document.Descendants(document.Root!.GetDefaultNamespace() + "UnitTestResult").First();
+        Assert.AreEqual(resultNode.Attributes("testId").First().Value, testId.ToString());
+        Assert.AreEqual(resultNode.Attributes("testName").First().Value, testName);
+    }
+
+    private static void ValidateTimeWithinUtcLimits(DateTimeOffset dateTime)
+    {
+        Assert.IsTrue(dateTime.UtcDateTime.Subtract(DateTime.UtcNow) < new TimeSpan(0, 0, 0, 60));
+    }
 
-        private string GetElementValueFromTrx(string trxFileName, string fieldName)
+    private static string? GetElementValueFromTrx(string trxFileName, string fieldName)
+    {
+        using FileStream file = File.OpenRead(trxFileName);
+        using XmlReader reader = XmlReader.Create(file);
+        while (reader.Read())
         {
-            using (FileStream file = File.OpenRead(trxFileName))
-            using (XmlReader reader = XmlReader.Create(file))
+            if (reader.Name.Equals(fieldName) && reader.NodeType == XmlNodeType.Element)
             {
-                while (reader.Read())
-                {
-                    if (reader.Name.Equals(fieldName) && reader.NodeType == XmlNodeType.Element)
-                    {
-                        return reader.ReadElementContentAsString();
-                    }
-                }
+                return reader.ReadElementContentAsString();
             }
-
-            return null;
         }
 
-        private static TestCase CreateTestCase(string testCaseName)
-        {
-            return new ObjectModel.TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
-        }
+        return null;
+    }
 
-        private static TestRunCompleteEventArgs CreateTestRunCompleteEventArgs()
-        {
-            var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null,
-                new Collection<AttachmentSet>(), new TimeSpan(1, 0, 0, 0));
-            return testRunCompleteEventArgs;
-        }
+    private static TestCase CreateTestCase(string testCaseName)
+    {
+        return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
+    }
 
-        private static Mock<TestResultEventArgs> CreatePassTestResultEventArgsMock(string testCaseName = "Pass1", List<TestResultMessage> testResultMessages = null)
-        {
-            TestCase passTestCase = CreateTestCase(testCaseName);
-            var passResult = new ObjectModel.TestResult(passTestCase);
-            passResult.Outcome = TestOutcome.Passed;
+    private static TestRunCompleteEventArgs CreateTestRunCompleteEventArgs()
+    {
+        var testRunCompleteEventArgs = new TestRunCompleteEventArgs(null, false, false, null,
+            new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), new TimeSpan(1, 0, 0, 0));
+        return testRunCompleteEventArgs;
+    }
+
+    private static Mock<TestResultEventArgs> CreatePassTestResultEventArgsMock(string testCaseName = "Pass1", List<TestResultMessage>? testResultMessages = null)
+    {
+        TestCase passTestCase = CreateTestCase(testCaseName);
+        var passResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(passTestCase);
+        passResult.Outcome = TestOutcome.Passed;
 
-            if (testResultMessages != null && testResultMessages.Any())
+        if (testResultMessages != null && testResultMessages.Any())
+        {
+            foreach (var message in testResultMessages)
             {
-                foreach (var message in testResultMessages)
-                {
-                    passResult.Messages.Add(message);
-                }
+                passResult.Messages.Add(message);
             }
-
-            return new Mock<TestResultEventArgs>(passResult);
         }
 
-        private void MakeTestRunComplete() => this.MakeTestRunComplete(this.testableTrxLogger);
-
-        private void MakeTestRunComplete(TestableTrxLogger testableTrxLogger)
-        {
-            var pass = TrxLoggerTests.CreatePassTestResultEventArgsMock();
-            testableTrxLogger.TestResultHandler(new object(), pass.Object);
-            var testRunCompleteEventArgs = TrxLoggerTests.CreateTestRunCompleteEventArgs();
-            testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
-        }
+        return new Mock<TestResultEventArgs>(passResult);
     }
 
-    internal class TestableTrxLogger : TrxLogger
+    private void MakeTestRunComplete() => MakeTestRunComplete(_testableTrxLogger);
+
+    private static void MakeTestRunComplete(TestableTrxLogger testableTrxLogger)
     {
-        public TestableTrxLogger() : base() { }
-        public TestableTrxLogger(IFileHelper fileHelper, TrxFileHelper trxFileHelper) : base(fileHelper, trxFileHelper) { }
+        var pass = CreatePassTestResultEventArgsMock();
+        testableTrxLogger.TestResultHandler(new object(), pass.Object);
+        var testRunCompleteEventArgs = CreateTestRunCompleteEventArgs();
+        testableTrxLogger.TestRunCompleteHandler(new object(), testRunCompleteEventArgs);
+    }
+}
 
-        public string trxFile;
-        internal override void PopulateTrxFile(string trxFileName, XmlElement rootElement)
-        {
-            this.trxFile = trxFileName;
-            base.PopulateTrxFile(trxFile, rootElement);
-        }
+internal class TestableTrxLogger : VisualStudio.TestPlatform.Extensions.TrxLogger.TrxLogger
+{
+    public TestableTrxLogger()
+        : base() { }
+    public TestableTrxLogger(IFileHelper fileHelper, TrxFileHelper trxFileHelper)
+        : base(fileHelper, trxFileHelper) { }
+
+    public string? TrxFile;
+    internal override void PopulateTrxFile(string trxFileName, XmlElement rootElement)
+    {
+        TrxFile = trxFileName;
+        base.PopulateTrxFile(TrxFile, rootElement);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
index 3630e668bb..a459932bfc 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
@@ -1,260 +1,256 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.Utility
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using TestOutcome = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome;
+using TestPlatformObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
+using TrxLoggerOutcome = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel.TestOutcome;
+using UriDataAttachment = Microsoft.VisualStudio.TestPlatform.ObjectModel.UriDataAttachment;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.Utility;
+
+[TestClass]
+public class ConverterTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using ObjectModel;
-    using TestPlatformObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using TestOutcome = VisualStudio.TestPlatform.ObjectModel.TestOutcome;
-    using TrxLoggerConstants = Microsoft.TestPlatform.Extensions.TrxLogger.Utility.Constants;
-    using TrxLoggerOutcome = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel.TestOutcome;
-    using UriDataAttachment = VisualStudio.TestPlatform.ObjectModel.UriDataAttachment;
-    using Moq;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-
-    [TestClass]
-    public class ConverterTests
+    private Converter _converter;
+    private readonly Mock<IFileHelper> _fileHelper;
+    private readonly TrxFileHelper _trxFileHelper;
+
+    public ConverterTests()
     {
-        private Converter converter;
-        private Mock<IFileHelper> fileHelper;
-        private readonly TrxFileHelper trxFileHelper;
+        _fileHelper = new Mock<IFileHelper>();
+        _trxFileHelper = new TrxFileHelper();
+        _converter = new Converter(_fileHelper.Object, _trxFileHelper);
+    }
 
-        public ConverterTests()
-        {
-            this.fileHelper = new Mock<IFileHelper>();
-            this.trxFileHelper = new TrxFileHelper();
-            this.converter = new Converter(this.fileHelper.Object, trxFileHelper);
-        }
+    [TestMethod]
+    public void ToOutcomeShouldMapFailedToFailed()
+    {
+        Assert.AreEqual(TrxLoggerOutcome.Failed, Converter.ToOutcome(TestOutcome.Failed));
+    }
 
-        [TestMethod]
-        public void ToOutcomeShouldMapFailedToFailed()
-        {
-            Assert.AreEqual(TrxLoggerOutcome.Failed, this.converter.ToOutcome(TestOutcome.Failed));
-        }
+    [TestMethod]
+    public void ToOutcomeShouldMapPassedToPassed()
+    {
+        Assert.AreEqual(TrxLoggerOutcome.Passed, Converter.ToOutcome(TestOutcome.Passed));
+    }
 
-        [TestMethod]
-        public void ToOutcomeShouldMapPassedToPassed()
-        {
-            Assert.AreEqual(TrxLoggerOutcome.Passed, this.converter.ToOutcome(TestOutcome.Passed));
-        }
+    [TestMethod]
+    public void ToOutcomeShouldMapSkippedToNotExecuted()
+    {
+        Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.Skipped));
+    }
 
-        [TestMethod]
-        public void ToOutcomeShouldMapSkippedToNotExecuted()
-        {
-            Assert.AreEqual(TrxLoggerOutcome.NotExecuted, this.converter.ToOutcome(TestOutcome.Skipped));
-        }
+    [TestMethod]
+    public void ToOutcomeShouldMapNoneToNotExecuted()
+    {
+        Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.None));
+    }
 
-        [TestMethod]
-        public void ToOutcomeShouldMapNoneToNotExecuted()
-        {
-            Assert.AreEqual(TrxLoggerOutcome.NotExecuted, this.converter.ToOutcome(TestOutcome.None));
-        }
+    [TestMethod]
+    public void ToOutcomeShouldMapNotFoundToNotExecuted()
+    {
+        Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.NotFound));
+    }
 
-        [TestMethod]
-        public void ToOutcomeShouldMapNotFoundToNotExecuted()
-        {
-            Assert.AreEqual(TrxLoggerOutcome.NotExecuted, this.converter.ToOutcome(TestOutcome.NotFound));
-        }
+    [TestMethod]
+    public void ToCollectionEntriesShouldRenameAttachmentUriIfTheAttachmentNameIsSame()
+    {
+        SetupForToCollectionEntries(out var tempDir, out var attachmentSets, out var testRun, out var testResultsDirectory);
 
-        [TestMethod]
-        public void ToCollectionEntriesShouldRenameAttachmentUriIfTheAttachmentNameIsSame()
-        {
-            ConverterTests.SetupForToCollectionEntries(out var tempDir, out var attachmentSets, out var testRun, out var testResultsDirectory);
+        _converter = new Converter(new FileHelper(), _trxFileHelper);
+        List<CollectorDataEntry> collectorDataEntries = _converter.ToCollectionEntries(attachmentSets, testRun, testResultsDirectory);
 
-            this.converter = new Converter(new FileHelper(), trxFileHelper);
-            List<CollectorDataEntry> collectorDataEntries = this.converter.ToCollectionEntries(attachmentSets, testRun, testResultsDirectory);
+        Assert.AreEqual(2, collectorDataEntries[0].Attachments.Count);
+        Assert.AreEqual($@"{Environment.MachineName}{Path.DirectorySeparatorChar}123.coverage", ((ObjectModel.UriDataAttachment)collectorDataEntries[0].Attachments[0]).Uri.OriginalString);
+        Assert.AreEqual($@"{Environment.MachineName}{Path.DirectorySeparatorChar}123[1].coverage", ((ObjectModel.UriDataAttachment)collectorDataEntries[0].Attachments[1]).Uri.OriginalString);
 
-            Assert.AreEqual(2, collectorDataEntries[0].Attachments.Count);
-            Assert.AreEqual($@"{Environment.MachineName}{Path.DirectorySeparatorChar}123.coverage", ((ObjectModel.UriDataAttachment) collectorDataEntries[0].Attachments[0]).Uri.OriginalString);
-            Assert.AreEqual($@"{Environment.MachineName}{Path.DirectorySeparatorChar}123[1].coverage", ((ObjectModel.UriDataAttachment)collectorDataEntries[0].Attachments[1]).Uri.OriginalString);
+        Directory.Delete(tempDir, true);
+    }
 
-            Directory.Delete(tempDir, true);
-        }
+    /// <summary>
+    /// Unit test for assigning or populating test categories read to the unit test element.
+    /// </summary>
+    [TestMethod]
+    public void ToTestElementShouldAssignTestCategoryOfUnitTestElement()
+    {
+        TestCase testCase = CreateTestCase("TestCase1");
+        TestPlatformObjectModel.TestResult result = new(testCase);
+        TestProperty testProperty = TestProperty.Register("MSTestDiscoverer.TestCategory", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
 
-        /// <summary>
-        /// Unit test for assigning or populating test categories read to the unit test element.
-        /// </summary>
-        [TestMethod]
-        public void ToTestElementShouldAssignTestCategoryOfUnitTestElement()
-        {
-            TestPlatformObjectModel.TestCase testCase = CreateTestCase("TestCase1");
-            TestPlatformObjectModel.TestResult result = new TestPlatformObjectModel.TestResult(testCase);
-            TestProperty testProperty = TestProperty.Register("MSTestDiscoverer.TestCategory", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
+        testCase.SetPropertyValue(testProperty, new[] { "AsmLevel", "ClassLevel", "MethodLevel" });
 
-            testCase.SetPropertyValue(testProperty, new[] { "AsmLevel", "ClassLevel", "MethodLevel" });
+        var unitTestElement = Converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
 
-            var unitTestElement = this.converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
+        object[] expected = ["MethodLevel", "ClassLevel", "AsmLevel"];
 
-            object[] expected = new[] { "MethodLevel", "ClassLevel", "AsmLevel" };
+        CollectionAssert.AreEqual(expected, unitTestElement.TestCategories.ToArray().OrderByDescending(x => x).ToArray());
+    }
 
-            CollectionAssert.AreEqual(expected, unitTestElement.TestCategories.ToArray().OrderByDescending(x => x).ToArray());
-        }
+    [TestMethod]
+    public void ToTestElementShouldAssignWorkItemOfUnitTestElement()
+    {
+        TestCase testCase = CreateTestCase("TestCase1");
+        TestPlatformObjectModel.TestResult result = new(testCase);
+        TestProperty testProperty = TestProperty.Register("WorkItemIds", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
 
-        [TestMethod]
-        public void ToTestElementShouldAssignWorkitemOfUnitTestElement()
-        {
-            TestPlatformObjectModel.TestCase testCase = CreateTestCase("TestCase1");
-            TestPlatformObjectModel.TestResult result = new TestPlatformObjectModel.TestResult(testCase);
-            TestProperty testProperty = TestProperty.Register("WorkItemIds", "String array property", string.Empty, string.Empty, typeof(string[]), null, TestPropertyAttributes.Hidden, typeof(TestObject));
+        testCase.SetPropertyValue(testProperty, new[] { "3", "99999", "0" });
 
-            testCase.SetPropertyValue(testProperty, new[] { "3", "99999", "0" });
+        var unitTestElement = Converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
 
-            var unitTestElement = this.converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
+        int[] expected = [0, 3, 99999];
 
-            int[] expected = new[] { 0, 3, 99999 };
+        CollectionAssert.AreEquivalent(expected, unitTestElement.WorkItems.ToArray());
+    }
 
-            CollectionAssert.AreEquivalent(expected, unitTestElement.WorkItems.ToArray());
-        }
+    /// <summary>
+    /// Unit test for regression when there's no test categories.
+    /// </summary>
+    [TestMethod]
+    public void ToTestElementShouldNotFailWhenThereIsNoTestCategories()
+    {
+        TestCase testCase = CreateTestCase("TestCase1");
 
-        /// <summary>
-        /// Unit test for regression when there's no test categories.
-        /// </summary>
-        [TestMethod]
-        public void ToTestElementShouldNotFailWhenThereIsNoTestCategoreis()
-        {
-            TestPlatformObjectModel.TestCase testCase = CreateTestCase("TestCase1");
-            TestPlatformObjectModel.TestResult result = new TestPlatformObjectModel.TestResult(testCase);
+        var unitTestElement = Converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
 
-            var unitTestElement = this.converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testCase.DisplayName, TrxLoggerConstants.UnitTestType, testCase);
+        object[] expected = Enumerable.Empty<Object>().ToArray();
 
-            object[] expected = Enumerable.Empty<Object>().ToArray();
+        CollectionAssert.AreEqual(expected, unitTestElement.TestCategories.ToArray());
+    }
 
-            CollectionAssert.AreEqual(expected, unitTestElement.TestCategories.ToArray());
-        }
+    [TestMethod]
+    public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnIsSameAsTestName()
+    {
+        var expectedClassName = "TestProject1.Class1";
+        var expectedTestName = "TestMethod1";
+        var fullyQualifiedName = expectedClassName + "." + expectedTestName;
+        var testName = "TestProject1.Class1.TestMethod1";
 
-        [TestMethod]
-        public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnIsSameAsTestName()
-        {
-            var expectedClassName = "TestProject1.Class1";
-            var expectedTestName = "TestMethod1";
-            var fullyQualifiedName = expectedClassName + "." + expectedTestName;
-            var testName = "TestProject1.Class1.TestMethod1";
+        ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
+    }
 
-            ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
-        }
+    [TestMethod]
+    public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnEndsWithTestName()
+    {
+        var expectedClassName = "TestProject1.Class1";
+        var expectedTestName = "TestMethod1(2, 3, 4.0d)";
+        var fullyQualifiedName = expectedClassName + "." + expectedTestName;
+        var testName = "TestMethod1(2, 3, 4.0d)";
 
-        [TestMethod]
-        public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnEndsWithTestName()
-        {
-            var expectedClassName = "TestProject1.Class1";
-            var expectedTestName = "TestMethod1(2, 3, 4.0d)";
-            var fullyQualifiedName = expectedClassName + "." + expectedTestName;
-            var testName = "TestMethod1(2, 3, 4.0d)";
+        ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
+    }
 
-            ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
-        }
+    [TestMethod]
+    public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnDoesNotEndsWithTestName()
+    {
+        var expectedClassName = "TestProject1.Class1.TestMethod1(2, 3, 4";
+        var expectedTestName = "0d)";
+        var fullyQualifiedName = "TestProject1.Class1.TestMethod1(2, 3, 4." + expectedTestName;
+        var testName = "TestMethod1";
 
-        [TestMethod]
-        public void ToTestElementShouldContainExpectedTestMethodPropertiesIfFqnDoesNotEndsWithTestName()
-        {
-            var expectedClassName = "TestProject1.Class1.TestMethod1(2, 3, 4";
-            var expectedTestName = "0d)";
-            var fullyQualifiedName = "TestProject1.Class1.TestMethod1(2, 3, 4." + expectedTestName;
-            var testName = "TestMethod1";
+        ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
+    }
 
-            ValidateTestMethodProperties(testName, fullyQualifiedName, expectedClassName, expectedTestName);
-        }
+    [TestMethod]
+    public void ToResultFilesShouldAddAttachmentsWithRelativeUri()
+    {
+        UriDataAttachment uriDataAttachment1 =
+            new(new Uri($"/mnt/c/abc.txt", UriKind.Relative), "Description 1");
 
-        [TestMethod]
-        public void ToResultFilesShouldAddAttachmentsWithRelativeURI()
+        var attachmentSets = new List<AttachmentSet>
         {
-            UriDataAttachment uriDataAttachment1 =
-                new UriDataAttachment(new Uri($"/mnt/c/abc.txt", UriKind.Relative), "Description 1");
+            new(new Uri("xyz://microsoft/random/2.0"), "XPlat test run")
+        };
 
-            var attachmentSets = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri("xyz://microsoft/random/2.0"), "XPlat test run")
-            };
+        var testRun = new TestRun(Guid.NewGuid());
+        testRun.RunConfiguration = new TestRunConfiguration("Testrun 1", _trxFileHelper);
+        attachmentSets[0].Attachments.Add(uriDataAttachment1);
 
-            var testRun = new TestRun(Guid.NewGuid());
-            testRun.RunConfiguration = new TestRunConfiguration("Testrun 1", trxFileHelper);
-            attachmentSets[0].Attachments.Add(uriDataAttachment1);
+        var resultFiles = _converter.ToResultFiles(attachmentSets, testRun, @"c:\temp", null!);
+        Assert.IsTrue(resultFiles[0].Contains("abc.txt"));
+    }
 
-            var resultFiles = this.converter.ToResultFiles(attachmentSets, testRun, @"c:\temp", null);
-            Assert.IsTrue(resultFiles[0].Contains("abc.txt"));
-        }
+    [TestMethod]
+    public void ToTestElementShouldNotFailWhenClassNameIsTheSameAsFullyQualifiedName()
+    {
+        // the converter assumed to find 'classname' in the fqn and split it on 'classname.'
+        // but that threw an exception because 'classname.' is not contained in 'classname'
+        // (notice the . at the end)
+        // we should not be assuming that the fqn will have '.' in them
+        // seen it for example with qtest
 
-        [TestMethod]
-        public void ToTestElementShouldNotFailWhenClassNameIsTheSameAsFullyQualifiedName()
-        {
-            // the converter assumed to find 'classname' in the fqn and split it on 'classname.'
-            // but that threw an exception because 'classname.' is not contained in 'classname' 
-            // (notice the . at the end)
-            // we should not be assuming that the fqn will have '.' in them
-            // seen it for example with qtest
-
-            string expectedClassName, expectedTestName, fullyQualifiedName, source, testName;
-            expectedClassName = expectedTestName = fullyQualifiedName = source = testName = "test1";
-            
-            TestPlatformObjectModel.TestCase testCase = new TestPlatformObjectModel.TestCase(fullyQualifiedName, new Uri("some://uri"), source);
-            TestPlatformObjectModel.TestResult result = new TestPlatformObjectModel.TestResult(testCase);
-            var unitTestElement = this.converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testName, TrxLoggerConstants.UnitTestType, testCase) as UnitTestElement;
-
-            Assert.AreEqual(expectedClassName, unitTestElement.TestMethod.ClassName);
-            Assert.AreEqual(expectedTestName, unitTestElement.TestMethod.Name);
-        }
-
-        private void ValidateTestMethodProperties(string testName, string fullyQualifiedName, string expectedClassName, string expectedTestName)
-        {
-            TestPlatformObjectModel.TestCase testCase = CreateTestCase(fullyQualifiedName);
-            TestPlatformObjectModel.TestResult result = new TestPlatformObjectModel.TestResult(testCase);
+        string expectedClassName, expectedTestName, fullyQualifiedName, source, testName;
+        expectedClassName = expectedTestName = fullyQualifiedName = source = testName = "test1";
 
-            var unitTestElement = this.converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testName, TrxLoggerConstants.UnitTestType, testCase) as UnitTestElement;
+        TestCase testCase = new(fullyQualifiedName, new Uri("some://uri"), source);
+        var unitTestElement = (UnitTestElement)Converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testName, TrxLoggerConstants.UnitTestType, testCase);
 
-            Assert.AreEqual(expectedClassName, unitTestElement.TestMethod.ClassName);
-            Assert.AreEqual(expectedTestName, unitTestElement.TestMethod.Name);
-        }
+        Assert.AreEqual(expectedClassName, unitTestElement.TestMethod.ClassName);
+        Assert.AreEqual(expectedTestName, unitTestElement.TestMethod.Name);
+    }
 
-        private static TestCase CreateTestCase(string fullyQualifiedName)
-        {
-            return new TestPlatformObjectModel.TestCase(fullyQualifiedName, new Uri("some://uri"), "DummySourceFileName");
-        }
+    private static void ValidateTestMethodProperties(string testName, string fullyQualifiedName, string expectedClassName, string expectedTestName)
+    {
+        TestCase testCase = CreateTestCase(fullyQualifiedName);
 
-        private static void SetupForToCollectionEntries(out string tempDir, out List<AttachmentSet> attachmentSets, out TestRun testRun,
-            out string testResultsDirectory)
-        {
-            ConverterTests.CreateTempCoverageFiles(out tempDir, out var coverageFilePath1, out var coverageFilePath2);
-
-            UriDataAttachment uriDataAttachment1 =
-                new UriDataAttachment(new Uri(new Uri("file://"), coverageFilePath1), "Description 1");
-            UriDataAttachment uriDataAttachment2 =
-                new UriDataAttachment(new Uri(new Uri("file://"), coverageFilePath2), "Description 2");
-            attachmentSets = new List<AttachmentSet>
-            {
-                new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), "Code Coverage")
-            };
-
-            testRun = new TestRun(Guid.NewGuid());
-            testRun.RunConfiguration = new TestRunConfiguration("Testrun 1", new TrxFileHelper());
-            attachmentSets[0].Attachments.Add(uriDataAttachment1);
-            attachmentSets[0].Attachments.Add(uriDataAttachment2);
-            testResultsDirectory = Path.Combine(tempDir, "TestResults");
-        }
-
-        private static void CreateTempCoverageFiles(out string tempDir, out string coverageFilePath1,
-            out string coverageFilePath2)
-        {
-            tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        var unitTestElement = (UnitTestElement)Converter.ToTestElement(testCase.Id, Guid.Empty, Guid.Empty, testName, TrxLoggerConstants.UnitTestType, testCase);
+
+        Assert.AreEqual(expectedClassName, unitTestElement.TestMethod.ClassName);
+        Assert.AreEqual(expectedTestName, unitTestElement.TestMethod.Name);
+    }
+
+    private static TestCase CreateTestCase(string fullyQualifiedName)
+    {
+        return new TestCase(fullyQualifiedName, new Uri("some://uri"), "DummySourceFileName");
+    }
+
+    private static void SetupForToCollectionEntries(out string tempDir, out List<AttachmentSet> attachmentSets, out TestRun testRun,
+        out string testResultsDirectory)
+    {
+        CreateTempCoverageFiles(out tempDir, out var coverageFilePath1, out var coverageFilePath2);
+
+        UriDataAttachment uriDataAttachment1 =
+            new(new Uri(new Uri("file://"), coverageFilePath1), "Description 1");
+        UriDataAttachment uriDataAttachment2 =
+            new(new Uri(new Uri("file://"), coverageFilePath2), "Description 2");
+        attachmentSets = [new(new Uri("datacollector://microsoft/CodeCoverage/2.0"), "Code Coverage")];
+
+        testRun = new TestRun(Guid.NewGuid());
+        testRun.RunConfiguration = new TestRunConfiguration("Testrun 1", new TrxFileHelper());
+        attachmentSets[0].Attachments.Add(uriDataAttachment1);
+        attachmentSets[0].Attachments.Add(uriDataAttachment2);
+        testResultsDirectory = Path.Combine(tempDir, "TestResults");
+    }
+
+    private static void CreateTempCoverageFiles(out string tempDir, out string coverageFilePath1,
+        out string coverageFilePath2)
+    {
+        tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
 
-            var covDir1 = Path.Combine(tempDir, Guid.NewGuid().ToString());
-            var covDir2 = Path.Combine(tempDir, Guid.NewGuid().ToString());
+        var covDir1 = Path.Combine(tempDir, Guid.NewGuid().ToString());
+        var covDir2 = Path.Combine(tempDir, Guid.NewGuid().ToString());
 
-            Directory.CreateDirectory(covDir1);
-            Directory.CreateDirectory(covDir2);
+        Directory.CreateDirectory(covDir1);
+        Directory.CreateDirectory(covDir2);
 
-            coverageFilePath1 = Path.Combine(covDir1, "123.coverage");
-            coverageFilePath2 = Path.Combine(covDir2, "123.coverage");
+        coverageFilePath1 = Path.Combine(covDir1, "123.coverage");
+        coverageFilePath2 = Path.Combine(covDir2, "123.coverage");
 
-            File.WriteAllText(coverageFilePath1, string.Empty);
-            File.WriteAllText(coverageFilePath2, string.Empty);
-        }
+        File.WriteAllText(coverageFilePath1, string.Empty);
+        File.WriteAllText(coverageFilePath2, string.Empty);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/TrxFileHelperTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/TrxFileHelperTests.cs
index 50797dd0b7..914f864432 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/TrxFileHelperTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/TrxFileHelperTests.cs
@@ -1,20 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.Utility
-{
-    using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
 
-    [TestClass]
-    public class TrxFileHelperTests
-    {
-        [TestMethod]
-        public void ReplaceInvalidFileNameCharsShouldReplaceSpace()
-        {
-            var fileHelper = new TrxFileHelper();
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.Utility;
 
-            Assert.AreEqual("samadala_SAMADALA_2017-10-13_18_33_17", fileHelper.ReplaceInvalidFileNameChars("samadala_SAMADALA 2017-10-13 18_33_17"));
-        }
+[TestClass]
+public class TrxFileHelperTests
+{
+    [TestMethod]
+    public void ReplaceInvalidFileNameCharsShouldReplaceSpace()
+    {
+        Assert.AreEqual("samadala_SAMADALA_2017-10-13_18_33_17", TrxFileHelper.ReplaceInvalidFileNameChars("samadala_SAMADALA 2017-10-13 18_33_17"));
     }
 }
diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/XmlPersistenceTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/XmlPersistenceTests.cs
index 49a0ce11b9..3ef35906c5 100644
--- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/XmlPersistenceTests.cs
+++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/XmlPersistenceTests.cs
@@ -1,71 +1,70 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests
-{
-    using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests;
 
-    [TestClass]
-    public class XmlPersistenceTests
+[TestClass]
+public class XmlPersistenceTests
+{
+    [TestMethod]
+    public void SaveObjectShouldReplaceInvalidCharacter()
     {
-        [TestMethod]
-        public void SaveObjectShouldReplaceInvalidCharacter()
-        {
-            XmlPersistence xmlPersistence = new XmlPersistence();
-            var node = xmlPersistence.CreateRootElement("TestRun");
+        XmlPersistence xmlPersistence = new();
+        var node = xmlPersistence.CreateRootElement("TestRun");
 
-            // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
-            char[] invalidXmlCharacterArray = new char[7];
-            invalidXmlCharacterArray[0] = (char)0x5;
-            invalidXmlCharacterArray[1] = (char)0xb;
-            invalidXmlCharacterArray[2] = (char)0xf;
-            invalidXmlCharacterArray[3] = (char)0xd800;
-            invalidXmlCharacterArray[4] = (char)0xdc00;
-            invalidXmlCharacterArray[5] = (char)0xfffe;
-            invalidXmlCharacterArray[6] = (char)0x0;
+        // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+        char[] invalidXmlCharacterArray = new char[7];
+        invalidXmlCharacterArray[0] = (char)0x5;
+        invalidXmlCharacterArray[1] = (char)0xb;
+        invalidXmlCharacterArray[2] = (char)0xf;
+        invalidXmlCharacterArray[3] = (char)0xd800;
+        invalidXmlCharacterArray[4] = (char)0xdc00;
+        invalidXmlCharacterArray[5] = (char)0xfffe;
+        invalidXmlCharacterArray[6] = (char)0x0;
 
-            string strWithInvalidCharForXml = new string(invalidXmlCharacterArray);
-            xmlPersistence.SaveObject(strWithInvalidCharForXml, node, null, "dummy");
+        string strWithInvalidCharForXml = new(invalidXmlCharacterArray);
+        XmlPersistence.SaveObject(strWithInvalidCharForXml, node, null, "dummy");
 
-            string expectedResult = "\\u0005\\u000b\\u000f\\ud800\\udc00\\ufffe\\u0000";
-            Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
-        }
+        string expectedResult = "\\u0005\\u000b\\u000f\\ud800\\udc00\\ufffe\\u0000";
+        Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
+    }
 
-        [TestMethod]
-        public void SaveObjectShouldNotReplaceValidCharacter()
-        {
-            XmlPersistence xmlPersistence = new XmlPersistence();
-            var node = xmlPersistence.CreateRootElement("TestRun");
+    [TestMethod]
+    public void SaveObjectShouldNotReplaceValidCharacter()
+    {
+        XmlPersistence xmlPersistence = new();
+        var node = xmlPersistence.CreateRootElement("TestRun");
 
-            // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
-            char[] validXmlCharacterArray = new char[8];
-            validXmlCharacterArray[0] = (char)0x9;
-            validXmlCharacterArray[1] = (char)0xa;
-            validXmlCharacterArray[2] = (char)0xd;
-            validXmlCharacterArray[3] = (char)0x20;
-            validXmlCharacterArray[4] = (char)0xc123;
-            validXmlCharacterArray[5] = (char)0xe000;
-            validXmlCharacterArray[6] = (char)0xea12;
-            validXmlCharacterArray[7] = (char)0xfffd;
+        // we are handling only #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+        char[] validXmlCharacterArray = new char[8];
+        validXmlCharacterArray[0] = (char)0x9;
+        validXmlCharacterArray[1] = (char)0xa;
+        validXmlCharacterArray[2] = (char)0xd;
+        validXmlCharacterArray[3] = (char)0x20;
+        validXmlCharacterArray[4] = (char)0xc123;
+        validXmlCharacterArray[5] = (char)0xe000;
+        validXmlCharacterArray[6] = (char)0xea12;
+        validXmlCharacterArray[7] = (char)0xfffd;
 
-            string strWithValidCharForXml = new string(validXmlCharacterArray);
+        string strWithValidCharForXml = new(validXmlCharacterArray);
 
-            xmlPersistence.SaveObject(strWithValidCharForXml, node, null, "dummy");
+        XmlPersistence.SaveObject(strWithValidCharForXml, node, null, "dummy");
 
-            string expectedResult = "\t\n\r 섣�";
-            Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
-        }
+        string expectedResult = "\t\n\r 섣�";
+        Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
+    }
 
-        [TestMethod]
-        public void SaveObjectShouldReplaceOnlyInvalidCharacter()
-        {
-            XmlPersistence xmlPersistence = new XmlPersistence();
-            var node = xmlPersistence.CreateRootElement("TestRun");
-            string strWithInvalidCharForXml = "This string has these \0 \v invalid characters";
-            xmlPersistence.SaveObject(strWithInvalidCharForXml, node, null, "dummy");
-            string expectedResult = "This string has these \\u0000 \\u000b invalid characters";
-            Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
-        }
+    [TestMethod]
+    public void SaveObjectShouldReplaceOnlyInvalidCharacter()
+    {
+        XmlPersistence xmlPersistence = new();
+        var node = xmlPersistence.CreateRootElement("TestRun");
+        string strWithInvalidCharForXml = "This string has these \0 \v invalid characters";
+        XmlPersistence.SaveObject(strWithInvalidCharForXml, node, null, "dummy");
+        string expectedResult = "This string has these \\u0000 \\u000b invalid characters";
+        Assert.AreEqual(0, string.Compare(expectedResult, node.InnerXml));
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs
deleted file mode 100644
index fcda7cb429..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.ObjectModel.PlatformTests
-{
-    using System;
-    using System.Diagnostics;
-
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DiaSessionTests : IntegrationTestBase
-    {
-        private const string NET451 = "net451";
-        private const string NETCOREAPP21 = "netcoreapp2.1";
-
-        public static string GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment)
-        {
-            var currentTargetFrameWork = testEnvironment.TargetFramework;
-#if NETFRAMEWORK
-            testEnvironment.TargetFramework = NET451;
-#else
-            testEnvironment.TargetFramework = NETCOREAPP21;
-#endif
-            return currentTargetFrameWork;
-        }
-
-        [TestMethod]
-        public void GetNavigationDataShouldReturnCorrectFileNameAndLineNumber()
-        {
-            var currentTargetFrameWork = GetAndSetTargetFrameWork(this.testEnvironment);
-            var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
-
-            DiaSession diaSession = new DiaSession(assemblyPath);
-            DiaNavigationData diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "PassingTest");
-
-            Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
-            StringAssert.EndsWith(diaNavigationData.FileName, @"\SimpleClassLibrary\Class1.cs");
-
-            this.ValidateMinLineNumber(12, diaNavigationData.MinLineNumber);
-            Assert.AreEqual(14, diaNavigationData.MaxLineNumber, "Incorrect max line number");
-
-            this.testEnvironment.TargetFramework = currentTargetFrameWork;
-        }
-
-        [TestMethod]
-        public void GetNavigationDataShouldReturnCorrectDataForAsyncMethod()
-        {
-            var currentTargetFrameWork = GetAndSetTargetFrameWork(this.testEnvironment);
-            var assemblyPath = this.GetAssetFullPath("SimpleClassLibrary.dll");
-
-            DiaSession diaSession = new DiaSession(assemblyPath);
-            DiaNavigationData diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1+<AsyncTestMethod>d__1", "MoveNext");
-
-            Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
-            StringAssert.EndsWith(diaNavigationData.FileName, @"\SimpleClassLibrary\Class1.cs");
-
-            this.ValidateMinLineNumber(17, diaNavigationData.MinLineNumber);
-            Assert.AreEqual(19, diaNavigationData.MaxLineNumber, "Incorrect max line number");
-
-            this.testEnvironment.TargetFramework = currentTargetFrameWork;
-        }
-
-        [TestMethod]
-        public void GetNavigationDataShouldReturnCorrectDataForOverLoadedMethod()
-        {
-            var currentTargetFrameWork = GetAndSetTargetFrameWork(this.testEnvironment);
-            var assemblyPath = this.GetAssetFullPath("SimpleClassLibrary.dll");
-
-            DiaSession diaSession = new DiaSession(assemblyPath);
-            DiaNavigationData diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "OverLoadedMethod");
-
-            Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
-            StringAssert.EndsWith(diaNavigationData.FileName, @"\SimpleClassLibrary\Class1.cs");
-
-            // Weird why DiaSession is now returning the first overloaded method
-            // as compared to before when it used to return second method
-            this.ValidateLineNumbers(diaNavigationData.MinLineNumber, diaNavigationData.MaxLineNumber);
-
-            this.testEnvironment.TargetFramework = currentTargetFrameWork;
-        }
-
-        [TestMethod]
-        public void GetNavigationDataShouldReturnNullForNotExistMethodNameOrNotExistTypeName()
-        {
-            var currentTargetFrameWork = GetAndSetTargetFrameWork(this.testEnvironment);
-            var assemblyPath = GetAssetFullPath("SimpleClassLibrary.dll");
-
-            DiaSession diaSession = new DiaSession(assemblyPath);
-
-            // Not exist method name
-            DiaNavigationData diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.Class1", "NotExistMethod");
-            Assert.IsNull(diaNavigationData);
-
-            // Not Exist Type name
-            diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.NotExistType", "PassingTest");
-            Assert.IsNull(diaNavigationData);
-
-            this.testEnvironment.TargetFramework = currentTargetFrameWork;
-        }
-
-        [TestMethod]
-        public void DiaSessionPerfTest()
-        {
-            var currentTargetFrameWork = GetAndSetTargetFrameWork(this.testEnvironment);
-            var assemblyPath = this.GetAssetFullPath("SimpleClassLibrary.dll");
-
-            var watch = Stopwatch.StartNew();
-            DiaSession diaSession = new DiaSession(assemblyPath);
-            DiaNavigationData diaNavigationData = diaSession.GetNavigationData("SimpleClassLibrary.HugeMethodSet", "MSTest_D1_01");
-            watch.Stop();
-
-            Assert.IsNotNull(diaNavigationData, "Failed to get navigation data");
-            StringAssert.EndsWith(diaNavigationData.FileName, @"\SimpleClassLibrary\HugeMethodSet.cs");
-            this.ValidateMinLineNumber(9, diaNavigationData.MinLineNumber);
-            Assert.AreEqual(10, diaNavigationData.MaxLineNumber);
-            var expectedTime = 150;
-            Assert.IsTrue(watch.Elapsed.Milliseconds < expectedTime, string.Format("DiaSession Perf test Actual time:{0} ms Expected time:{1} ms", watch.Elapsed.Milliseconds, expectedTime));
-
-            this.testEnvironment.TargetFramework = currentTargetFrameWork;
-        }
-
-        private void ValidateLineNumbers(int min, int max)
-        {
-            // Release builds optimize code, hence min line numbers are different.
-            if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
-            {
-                Assert.AreEqual(min, max, "Incorrect min line number");
-            }
-            else
-            {
-                if (max == 23)
-                {
-                    Assert.AreEqual(min + 1, max, "Incorrect min line number");
-                }
-                else if (max == 27)
-                {
-                    Assert.AreEqual(min + 1, max, "Incorrect min line number");
-                }
-                else
-                {
-                    Assert.Fail("Incorrect min/max line number");
-                }
-            }
-        }
-
-        private void ValidateMinLineNumber(int expected, int actual)
-        {
-            // Release builds optimize code, hence min line numbers are different.
-            if (IntegrationTestEnvironment.BuildConfiguration.StartsWith("release", StringComparison.OrdinalIgnoreCase))
-            {
-                Assert.AreEqual(expected + 1, actual, "Incorrect min line number");
-            }
-            else
-            {
-                Assert.AreEqual(expected, actual, "Incorrect min line number");
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
deleted file mode 100644
index 129135fbe7..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <AssemblyName>Microsoft.TestPlatform.ObjectModel.PlatformTests</AssemblyName>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />    
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-
-    <PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\packages\microsoft.internal.dia\$(TestPlatformMSDiaVersion)\tools\net451\**\*">
-    </Content>
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs
deleted file mode 100644
index b60b16a4a8..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
-{
-    /// <summary>
-    /// Main entry point for the command line runner.
-    /// </summary>
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0051c9c7aa..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.ObjectModel.PlatformTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("da1b5c6f-cd2b-4995-b883-0aafcd6671ab")]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs
index 36560f786b..cead712f27 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/BaseTestRunCriteriaTests.cs
@@ -1,67 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using VisualStudio.TestPlatform.ObjectModel.Client;
-    [TestClass]
-    public class BaseTestRunCriteriaTests
-    {
-        [TestMethod]
-        public void ConstructorShouldThrowIfFrequencyOfRunStatsChangeIsZero()
-        {
-            var isExceptionThrown = false;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-            try
-            {
-                var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: 0);
-            }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                isExceptionThrown = true;
-                StringAssert.Contains(ex.Message, "Notification frequency need to be a positive value.");
-            }
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client;
 
-            Assert.IsTrue(isExceptionThrown);
-        }
+[TestClass]
+public class BaseTestRunCriteriaTests
+{
+    [TestMethod]
+    public void ConstructorShouldThrowIfFrequencyOfRunStatsChangeIsZero()
+    {
+        var isExceptionThrown = false;
 
-        [TestMethod]
-        public void ConstructorShouldThrowIfFrequencyOfRunStatsChangeIsLesssThanZero()
+        try
         {
-            var isExceptionThrown = false;
+            var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: 0);
+        }
+        catch (ArgumentOutOfRangeException ex)
+        {
+            isExceptionThrown = true;
+            StringAssert.Contains(ex.Message, "Notification frequency need to be a positive value.");
+        }
 
-            try
-            {
-                var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: -10);
-            }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                isExceptionThrown = true;
-                StringAssert.Contains(ex.Message, "Notification frequency need to be a positive value.");
-            }
+        Assert.IsTrue(isExceptionThrown);
+    }
 
-            Assert.IsTrue(isExceptionThrown);
-        }
+    [TestMethod]
+    public void ConstructorShouldThrowIfFrequencyOfRunStatsChangeIsLesssThanZero()
+    {
+        var isExceptionThrown = false;
 
-        [TestMethod]
-        public void ConstructorShouldThrowIfRunStatsChangeEventTimeoutIsMinimumTimeSpanValue()
+        try
+        {
+            var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: -10);
+        }
+        catch (ArgumentOutOfRangeException ex)
         {
-            var isExceptionThrown = false;
+            isExceptionThrown = true;
+            StringAssert.Contains(ex.Message, "Notification frequency need to be a positive value.");
+        }
 
-            try
-            {
-                var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: 1, keepAlive: false, testSettings: null, runStatsChangeEventTimeout: TimeSpan.MinValue);
-            }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                isExceptionThrown = true;
-                StringAssert.Contains(ex.Message, "Notification timeout must be greater than zero.");
-            }
+        Assert.IsTrue(isExceptionThrown);
+    }
 
-            Assert.IsTrue(isExceptionThrown);
+    [TestMethod]
+    public void ConstructorShouldThrowIfRunStatsChangeEventTimeoutIsMinimumTimeSpanValue()
+    {
+        var isExceptionThrown = false;
+
+        try
+        {
+            var criteria = new BaseTestRunCriteria(frequencyOfRunStatsChangeEvent: 1, keepAlive: false, testSettings: null, runStatsChangeEventTimeout: TimeSpan.MinValue);
         }
+        catch (ArgumentOutOfRangeException ex)
+        {
+            isExceptionThrown = true;
+            StringAssert.Contains(ex.Message, "Notification timeout must be greater than zero.");
+        }
+
+        Assert.IsTrue(isExceptionThrown);
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs
index 5b309a92d1..7041273030 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/DiscoveryCriteriaTests.cs
@@ -1,57 +1,56 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client
+using System;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Client;
+
+[TestClass]
+public class DiscoveryCriteriaTests
 {
-    using System;
-    using System.Linq;
+    private readonly DiscoveryCriteria _discoveryCriteria;
+    private static readonly JsonSerializerSettings Settings = new()
+    {
+        TypeNameHandling = TypeNameHandling.None
+    };
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public DiscoveryCriteriaTests()
+    {
+        _discoveryCriteria = new DiscoveryCriteria(
+            new[] { "sampleTest.dll" },
+            100,
+            "<RunConfiguration></RunConfiguration>");
+        _discoveryCriteria.TestCaseFilter = "TestFilter";
+    }
 
-    using Newtonsoft.Json;
+    [TestMethod]
+    public void DiscoveryCriteriaSerializesToExpectedJson()
+    {
+        var expectedJson = "{\"Package\":null,\"AdapterSourceMap\":{\"_none_\":[\"sampleTest.dll\"]},\"FrequencyOfDiscoveredTestsEvent\":100,\"DiscoveredTestEventTimeout\":\"10675199.02:48:05.4775807\",\"RunSettings\":\"<RunConfiguration></RunConfiguration>\",\"TestCaseFilter\":\"TestFilter\",\"TestSessionInfo\":null}";
+
+        var json = JsonConvert.SerializeObject(_discoveryCriteria, Settings);
+
+        Assert.AreEqual(expectedJson, json);
+    }
 
-    [TestClass]
-    public class DiscoveryCriteriaTests
+    [TestMethod]
+    public void DiscoveryCriteriaShouldBeDeserializable()
     {
-        private readonly DiscoveryCriteria discoveryCriteria;
-        private static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
-                                                                      {
-                                                                          TypeNameHandling = TypeNameHandling.None
-                                                                      };
-
-        public DiscoveryCriteriaTests()
-        {
-            this.discoveryCriteria = new DiscoveryCriteria(
-                                         new[] { "sampleTest.dll" },
-                                         100,
-                                         "<RunConfiguration></RunConfiguration>");
-            this.discoveryCriteria.TestCaseFilter = "TestFilter";
-        }
-
-        [TestMethod]
-        public void DiscoveryCriteriaSerializesToExpectedJson()
-        {
-            var expectedJson = "{\"Package\":null,\"AdapterSourceMap\":{\"_none_\":[\"sampleTest.dll\"]},\"FrequencyOfDiscoveredTestsEvent\":100,\"DiscoveredTestEventTimeout\":\"10675199.02:48:05.4775807\",\"RunSettings\":\"<RunConfiguration></RunConfiguration>\",\"TestCaseFilter\":\"TestFilter\",\"TestSessionInfo\":null}";
-
-            var json = JsonConvert.SerializeObject(this.discoveryCriteria, Settings);
-
-            Assert.AreEqual(expectedJson, json);
-        }
-
-        [TestMethod]
-        public void DiscoveryCriteriaShouldBeDeserializable()
-        {
-            var json = "{\"Sources\":[\"sampleTest.dll\"],\"AdapterSourceMap\":{\"_none_\":[\"sampleTest.dll\"]},\"FrequencyOfDiscoveredTestsEvent\":100,\"DiscoveredTestEventTimeout\":\"10675199.02:48:05.4775807\",\"RunSettings\":\"<RunConfiguration></RunConfiguration>\",\"TestCaseFilter\":\"TestFilter\"}";
-
-            var criteria = JsonConvert.DeserializeObject<DiscoveryCriteria>(json, Settings);
-
-            Assert.AreEqual(TimeSpan.MaxValue, criteria.DiscoveredTestEventTimeout);
-            Assert.AreEqual(100, criteria.FrequencyOfDiscoveredTestsEvent);
-            Assert.AreEqual("<RunConfiguration></RunConfiguration>", criteria.RunSettings);
-            Assert.AreEqual("TestFilter", criteria.TestCaseFilter);
-            Assert.AreEqual("sampleTest.dll", criteria.AdapterSourceMap["_none_"].Single());
-            CollectionAssert.AreEqual(new[] { "sampleTest.dll" }, criteria.Sources.ToArray());
-        }
+        var json = "{\"Sources\":[\"sampleTest.dll\"],\"AdapterSourceMap\":{\"_none_\":[\"sampleTest.dll\"]},\"FrequencyOfDiscoveredTestsEvent\":100,\"DiscoveredTestEventTimeout\":\"10675199.02:48:05.4775807\",\"RunSettings\":\"<RunConfiguration></RunConfiguration>\",\"TestCaseFilter\":\"TestFilter\"}";
+
+        var criteria = JsonConvert.DeserializeObject<DiscoveryCriteria>(json, Settings)!;
+
+        Assert.AreEqual(TimeSpan.MaxValue, criteria.DiscoveredTestEventTimeout);
+        Assert.AreEqual(100, criteria.FrequencyOfDiscoveredTestsEvent);
+        Assert.AreEqual("<RunConfiguration></RunConfiguration>", criteria.RunSettings);
+        Assert.AreEqual("TestFilter", criteria.TestCaseFilter);
+        Assert.AreEqual("sampleTest.dll", criteria.AdapterSourceMap["_none_"].Single());
+        CollectionAssert.AreEqual(new[] { "sampleTest.dll" }, criteria.Sources.ToArray());
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs
index b6d50cc2b0..6af705e562 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Client/TestRunCriteriaTests.cs
@@ -1,153 +1,151 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class TestRunCriteriaTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
+    #region Constructor tests.
+
+    [TestMethod]
+    public void ConstructorForSourcesShouldInitializeAdapterSourceMap()
+    {
+        var sources = new List<string> { "s1.dll", "s2.dll" };
+        var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
+
+        Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
+        CollectionAssert.AreEqual(new List<string> { "_none_" }, testRunCriteria.AdapterSourceMap.Keys);
+        CollectionAssert.AreEqual(sources, testRunCriteria.AdapterSourceMap.Values.First().ToList());
+    }
+
+    [TestMethod]
+    public void ConstructorForSourcesWithBaseTestRunCriteriaShouldInitializeAdapterSourceMap()
+    {
+        var sources = new List<string> { "s1.dll", "s2.dll" };
+        var testRunCriteria = new TestRunCriteria(sources, new TestRunCriteria(new List<string> { "temp.dll" }, 10));
+
+        Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
+        CollectionAssert.AreEqual(new List<string> { "_none_" }, testRunCriteria.AdapterSourceMap.Keys);
+        CollectionAssert.AreEqual(sources, testRunCriteria.AdapterSourceMap.Values.First().ToList());
+    }
+
+    [TestMethod]
+    public void ConstructorForSourcesWithAdapterSourceMapShouldInitializeSourceMap()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
+        var sourceSet1 = new List<string> { "s1.dll", "s2.dll" };
+        var sourceSet2 = new List<string> { "s1.json", "s2.json" };
+        adapterSourceMap.Add("dummyadapter1", sourceSet1);
+        adapterSourceMap.Add("dummyadapter2", sourceSet2);
+
+        var testRunCriteria = new TestRunCriteria(adapterSourceMap, 10, false, null, TimeSpan.MaxValue, null);
+
+        Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
+        CollectionAssert.AreEqual(new List<string> { "dummyadapter1", "dummyadapter2" }, testRunCriteria.AdapterSourceMap.Keys);
+        CollectionAssert.AreEqual(sourceSet1, testRunCriteria.AdapterSourceMap.Values.First().ToList());
+        CollectionAssert.AreEqual(sourceSet2, testRunCriteria.AdapterSourceMap.Values.ToArray()[1].ToList());
+    }
+
+    #endregion
+
+    #region Sources tests.
+
+    [TestMethod]
+    public void SourcesShouldEnumerateThroughAllSourcesInTheAdapterSourceMap()
+    {
+        var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
+        var sourceSet1 = new List<string> { "s1.dll", "s2.dll" };
+        var sourceSet2 = new List<string> { "s1.json", "s2.json" };
+        adapterSourceMap.Add("dummyadapter1", sourceSet1);
+        adapterSourceMap.Add("dummyadapter2", sourceSet2);
+
+        var testRunCriteria = new TestRunCriteria(adapterSourceMap, 10, false, null, TimeSpan.MaxValue, null);
+
+        var expectedSourceSet = new List<string>(sourceSet1);
+        expectedSourceSet.AddRange(sourceSet2);
+        CollectionAssert.AreEqual(expectedSourceSet, testRunCriteria.Sources!.ToList());
+    }
+
+    [TestMethod]
+    public void SourcesShouldReturnNullIfAdapterSourceMapIsNull()
+    {
+        var testRunCriteria =
+            new TestRunCriteria(
+                new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), "s.dll") },
+                frequencyOfRunStatsChangeEvent: 10);
+
+        Assert.IsNull(testRunCriteria.Sources);
+    }
+
+    #endregion
+
+    #region HasSpecificSources tests
+
+    [TestMethod]
+    public void HasSpecificSourcesReturnsFalseIfSourcesAreNotSpecified()
+    {
+        var testRunCriteria =
+            new TestRunCriteria(
+                new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), "s.dll") },
+                frequencyOfRunStatsChangeEvent: 10);
+
+        Assert.IsFalse(testRunCriteria.HasSpecificSources);
+    }
+
+    [TestMethod]
+    public void HasSpecificSourcesReturnsTrueIfSourcesAreSpecified()
+    {
+        var sources = new List<string> { "s1.dll", "s2.dll" };
+        var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+        Assert.IsTrue(testRunCriteria.HasSpecificSources);
+    }
+
+    #endregion
 
-    using VisualStudio.TestPlatform.ObjectModel;
-    using VisualStudio.TestPlatform.ObjectModel.Client;
+    #region HasSpecificTests tests
 
-    [TestClass]
-    public class TestRunCriteriaTests
+    [TestMethod]
+    public void HasSpecificTestsReturnsTrueIfTestsAreSpecified()
     {
-        #region Constructor tests.
-
-        [TestMethod]
-        public void ConstructorForSourcesShouldInitializeAdapterSourceMap()
-        {
-            var sources = new List<string> { "s1.dll", "s2.dll" };
-            var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
-            CollectionAssert.AreEqual(new List<string> { "_none_" }, testRunCriteria.AdapterSourceMap.Keys);
-            CollectionAssert.AreEqual(sources, testRunCriteria.AdapterSourceMap.Values.First().ToList());
-        }
-
-        [TestMethod]
-        public void ConstructorForSourcesWithBaseTestRunCriteriaShouldInitializeAdapterSourceMap()
-        {
-            var sources = new List<string> { "s1.dll", "s2.dll" };
-            var testRunCriteria = new TestRunCriteria(sources, new TestRunCriteria(new List<String> { "temp.dll" }, 10));
-
-            Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
-            CollectionAssert.AreEqual(new List<string> { "_none_" }, testRunCriteria.AdapterSourceMap.Keys);
-            CollectionAssert.AreEqual(sources, testRunCriteria.AdapterSourceMap.Values.First().ToList());
-        }
-
-        [TestMethod]
-        public void ConstructorForSourcesWithAdapterSourceMapShouldInitializeSourceMap()
-        {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            var sourceSet1 = new List<string> { "s1.dll", "s2.dll" };
-            var sourceSet2 = new List<string> { "s1.json", "s2.json" };
-            adapterSourceMap.Add("dummyadapter1", sourceSet1);
-            adapterSourceMap.Add("dummyadapter2", sourceSet2);
-
-            var testRunCriteria = new TestRunCriteria(adapterSourceMap, 10, false, null, TimeSpan.MaxValue, null);
-
-            Assert.IsNotNull(testRunCriteria.AdapterSourceMap);
-            CollectionAssert.AreEqual(new List<string> { "dummyadapter1", "dummyadapter2" }, testRunCriteria.AdapterSourceMap.Keys);
-            CollectionAssert.AreEqual(sourceSet1, testRunCriteria.AdapterSourceMap.Values.First().ToList());
-            CollectionAssert.AreEqual(sourceSet2, testRunCriteria.AdapterSourceMap.Values.ToArray()[1].ToList());
-        }
-
-        #endregion
-
-        #region Sources tests.
-
-        [TestMethod]
-        public void SourcesShouldEnumerateThroughAllSourcesInTheAdapterSourceMap()
-        {
-            var adapterSourceMap = new Dictionary<string, IEnumerable<string>>();
-            var sourceSet1 = new List<string> { "s1.dll", "s2.dll" };
-            var sourceSet2 = new List<string> { "s1.json", "s2.json" };
-            adapterSourceMap.Add("dummyadapter1", sourceSet1);
-            adapterSourceMap.Add("dummyadapter2", sourceSet2);
-
-            var testRunCriteria = new TestRunCriteria(adapterSourceMap, 10, false, null, TimeSpan.MaxValue, null);
-
-            var expectedSourceSet = new List<string>(sourceSet1);
-            expectedSourceSet.AddRange(sourceSet2);
-            CollectionAssert.AreEqual(expectedSourceSet, testRunCriteria.Sources.ToList());
-        }
-
-        [TestMethod]
-        public void SourcesShouldReturnNullIfAdapterSourceMapIsNull()
-        {
-            var testRunCriteria =
-                new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), "s.dll") },
-                    frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsNull(testRunCriteria.Sources);
-        }
-
-        #endregion
-
-        #region HasSpecificSources tests
-
-        [TestMethod]
-        public void HasSpecificSourcesReturnsFalseIfSourcesAreNotSpecified()
-        {
-            var testRunCriteria =
-                new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), "s.dll") },
-                    frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsFalse(testRunCriteria.HasSpecificSources);
-        }
-
-        [TestMethod]
-        public void HasSpecificSourcesReturnsTrueIfSourcesAreSpecified()
-        {
-            var sources = new List<string> { "s1.dll", "s2.dll" };
-            var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsTrue(testRunCriteria.HasSpecificSources);
-        }
-
-        #endregion
-
-        #region HasSpecificTests tests
-
-        [TestMethod]
-        public void HasSpecificTestsReturnsTrueIfTestsAreSpecified()
-        {
-            var testRunCriteria =
-                new TestRunCriteria(
-                    new List<TestCase> { new TestCase("A.C.M", new Uri("excutor://dummy"), "s.dll") },
-                    frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsTrue(testRunCriteria.HasSpecificTests);
-        }
-
-        [TestMethod]
-        public void HasSpecificTestsReturnsFalseIfSourcesAreSpecified()
-        {
-            var sources = new List<string> { "s1.dll", "s2.dll" };
-            var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
-
-            Assert.IsFalse(testRunCriteria.HasSpecificTests);
-        }
-
-        #endregion
-
-        #region TestCaseFilter tests
+        var testRunCriteria =
+            new TestRunCriteria(
+                new List<TestCase> { new("A.C.M", new Uri("excutor://dummy"), "s.dll") },
+                frequencyOfRunStatsChangeEvent: 10);
 
-        [TestMethod]
-        public void TestCaseFilterSetterShouldSetFilterCriteriaForSources()
-        {
-            var sources = new List<string> { "s1.dll", "s2.dll" };
-            var testRunCriteria = new TestRunCriteria(sources, 10, false, string.Empty, TimeSpan.MaxValue, null, "foo", null);
+        Assert.IsTrue(testRunCriteria.HasSpecificTests);
+    }
 
-            Assert.AreEqual("foo", testRunCriteria.TestCaseFilter);
-        }
+    [TestMethod]
+    public void HasSpecificTestsReturnsFalseIfSourcesAreSpecified()
+    {
+        var sources = new List<string> { "s1.dll", "s2.dll" };
+        var testRunCriteria = new TestRunCriteria(sources, frequencyOfRunStatsChangeEvent: 10);
 
-        #endregion 
+        Assert.IsFalse(testRunCriteria.HasSpecificTests);
     }
+
+    #endregion
+
+    #region TestCaseFilter tests
+
+    [TestMethod]
+    public void TestCaseFilterSetterShouldSetFilterCriteriaForSources()
+    {
+        var sources = new List<string> { "s1.dll", "s2.dll" };
+        var testRunCriteria = new TestRunCriteria(sources, 10, false, string.Empty, TimeSpan.MaxValue, null, "foo", null);
+
+        Assert.AreEqual("foo", testRunCriteria.TestCaseFilter);
+    }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs
index 36d82f47d9..804cf98ce2 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomKeyValueConverterTests.cs
@@ -1,97 +1,97 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class CustomKeyValueConverterTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
+    private readonly CustomKeyValueConverter _customKeyValueConverter;
+
+    public CustomKeyValueConverterTests()
+    {
+        _customKeyValueConverter = new CustomKeyValueConverter();
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeWellformedJson()
+    {
+        var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }]";
+
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
+
+        Assert.IsNotNull(data);
+        Assert.AreEqual(1, data.Length);
+        Assert.AreEqual("key1", data[0].Key);
+        Assert.AreEqual("val1", data[0].Value);
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeKeyValuePairArray()
+    {
+        var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }, { \"Key\": \"key2\", \"Value\": \"val2\" }]";
+
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
+
+        Assert.IsNotNull(data);
+        Assert.AreEqual(2, data.Length);
+        Assert.AreEqual("key1", data[0].Key);
+        Assert.AreEqual("val1", data[0].Value);
+        Assert.AreEqual("key2", data[1].Key);
+        Assert.AreEqual("val2", data[1].Value);
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeEmptyArray()
+    {
+        var json = "[]";
+
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
+
+        Assert.IsNotNull(data);
+        Assert.AreEqual(0, data.Length);
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeEmptyKeyOrValue()
+    {
+        var json = "[{ \"Key\": \"\", \"Value\": \"\" }]";
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
 
-    [TestClass]
-    public class CustomKeyValueConverterTests
+        Assert.IsNotNull(data);
+        Assert.AreEqual(1, data.Length);
+        Assert.AreEqual(string.Empty, data[0].Key);
+        Assert.AreEqual(string.Empty, data[0].Value);
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeDuplicateKeysKvps()
+    {
+        var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }, { \"Key\": \"key1\", \"Value\": \"val2\" }]";
+
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
+
+        Assert.IsNotNull(data);
+        Assert.AreEqual(2, data.Length);
+        Assert.AreEqual("key1", data[0].Key);
+        Assert.AreEqual("val1", data[0].Value);
+        Assert.AreEqual("key1", data[1].Key);
+        Assert.AreEqual("val2", data[1].Value);
+    }
+
+    [TestMethod]
+    public void CustomKeyValueConverterShouldDeserializeNullValue()
     {
-        private readonly CustomKeyValueConverter customKeyValueConverter;
-
-        public CustomKeyValueConverterTests()
-        {
-            this.customKeyValueConverter = new CustomKeyValueConverter();
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeWellformedJson()
-        {
-            var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }]";
-
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
-
-            Assert.IsNotNull(data);
-            Assert.AreEqual(1, data.Length);
-            Assert.AreEqual("key1", data[0].Key);
-            Assert.AreEqual("val1", data[0].Value);
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeKeyValuePairArray()
-        {
-            var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }, { \"Key\": \"key2\", \"Value\": \"val2\" }]";
-
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
-
-            Assert.IsNotNull(data);
-            Assert.AreEqual(2, data.Length);
-            Assert.AreEqual("key1", data[0].Key);
-            Assert.AreEqual("val1", data[0].Value);
-            Assert.AreEqual("key2", data[1].Key);
-            Assert.AreEqual("val2", data[1].Value);
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeEmptyArray()
-        {
-            var json = "[]";
-
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
-
-            Assert.IsNotNull(data);
-            Assert.AreEqual(0, data.Length);
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeEmptyKeyOrValue()
-        {
-            var json = "[{ \"Key\": \"\", \"Value\": \"\" }]";
-
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
-
-            Assert.AreEqual(1, data.Length);
-            Assert.AreEqual(string.Empty, data[0].Key);
-            Assert.AreEqual(string.Empty, data[0].Value);
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeDuplicateKeysKvps()
-        {
-            var json = "[{ \"Key\": \"key1\", \"Value\": \"val1\" }, { \"Key\": \"key1\", \"Value\": \"val2\" }]";
-
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as KeyValuePair<string, string>[];
-
-            Assert.IsNotNull(data);
-            Assert.AreEqual(2, data.Length);
-            Assert.AreEqual("key1", data[0].Key);
-            Assert.AreEqual("val1", data[0].Value);
-            Assert.AreEqual("key1", data[1].Key);
-            Assert.AreEqual("val2", data[1].Value);
-        }
-
-        [TestMethod]
-        public void CustomKeyValueConverterShouldDeserializeNullValue()
-        {
-            var data = this.customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as KeyValuePair<string, string>[];
-
-            Assert.IsNull(data);
-        }
+        var data = _customKeyValueConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as KeyValuePair<string, string>[];
+
+        Assert.IsNull(data);
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs
index 7b7b4802c5..3e235f3792 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/CustomStringArrayConverterTests.cs
@@ -1,76 +1,78 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
-{
-    using System.Globalization;
+using System.Globalization;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-    [TestClass]
-    public class CustomStringArrayConverterTests
-    {
-        private readonly CustomStringArrayConverter customStringArrayConverter;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class CustomStringArrayConverterTests
+{
+    private readonly CustomStringArrayConverter _customStringArrayConverter;
 
-        public CustomStringArrayConverterTests()
-        {
-            this.customStringArrayConverter = new CustomStringArrayConverter();
-        }
+    public CustomStringArrayConverterTests()
+    {
+        _customStringArrayConverter = new CustomStringArrayConverter();
+    }
 
-        [TestMethod]
-        public void CustomStringArrayConverterShouldDeserializeWellformedJson()
-        {
-            var json = "[ \"val2\", \"val1\" ]";
+    [TestMethod]
+    public void CustomStringArrayConverterShouldDeserializeWellformedJson()
+    {
+        var json = "[ \"val2\", \"val1\" ]";
 
-            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
+        var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
-            Assert.IsNotNull(data);
-            Assert.AreEqual(2, data.Length);
-            CollectionAssert.AreEqual(new[] { "val2", "val1" }, data);
-        }
+        Assert.IsNotNull(data);
+        Assert.AreEqual(2, data.Length);
+        CollectionAssert.AreEqual(new[] { "val2", "val1" }, data);
+    }
 
-        [TestMethod]
-        public void CustomStringArrayConverterShouldDeserializeEmptyArray()
-        {
-            var json = "[]";
+    [TestMethod]
+    public void CustomStringArrayConverterShouldDeserializeEmptyArray()
+    {
+        var json = "[]";
 
-            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
+        var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
-            Assert.IsNotNull(data);
-            Assert.AreEqual(0, data.Length);
-        }
+        Assert.IsNotNull(data);
+        Assert.AreEqual(0, data.Length);
+    }
 
-        [TestMethod]
-        public void CustomStringArrayConverterShouldDeserializeNullKeyOrValue()
-        {
-            var json = "[null, \"val\"]";
+    [TestMethod]
+    public void CustomStringArrayConverterShouldDeserializeNullKeyOrValue()
+    {
+        var json = "[null, \"val\"]";
 
-            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
+        var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
-            Assert.AreEqual(2, data.Length);
-            Assert.IsNull(data[0]);
-            Assert.AreEqual("val", data[1]);
-        }
+        Assert.IsNotNull(data);
+        Assert.AreEqual(2, data.Length);
+        Assert.IsNull(data[0]);
+        Assert.AreEqual("val", data[1]);
+    }
 
-        [TestMethod]
-        public void CustomStringArrayConverterShouldDeserializeEmptyKeyOrValue()
-        {
-            var json = "[\"\", \"\"]";
+    [TestMethod]
+    public void CustomStringArrayConverterShouldDeserializeEmptyKeyOrValue()
+    {
+        var json = "[\"\", \"\"]";
 
-            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
+        var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, json) as string[];
 
-            Assert.AreEqual(2, data.Length);
-            Assert.AreEqual(string.Empty, data[0]);
-            Assert.AreEqual(string.Empty, data[1]);
-        }
+        Assert.IsNotNull(data);
+        Assert.AreEqual(2, data.Length);
+        Assert.AreEqual(string.Empty, data[0]);
+        Assert.AreEqual(string.Empty, data[1]);
+    }
 
-        [TestMethod]
-        public void CustomStringArrayConverterShouldDeserializeNullValue()
-        {
-            var data = this.customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as string[];
+    [TestMethod]
+    public void CustomStringArrayConverterShouldDeserializeNullValue()
+    {
+        var data = _customStringArrayConverter.ConvertFrom(null, CultureInfo.InvariantCulture, null) as string[];
 
-            Assert.IsNull(data);
-        }
+        Assert.IsNull(data);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs
index c02f0db37a..ac0fec5c8a 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/DataCollector/Events/SessionEventsTests.cs
@@ -1,53 +1,55 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class SessionEventsTests
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
+    private readonly SessionStartEventArgs _sessionStartEventArgs;
 
-    [TestClass]
-    public class SessionEventsTests
+    public SessionEventsTests()
     {
-        private SessionStartEventArgs sessionStartEventArgs;
-
-        public SessionEventsTests()
+        var properties = new Dictionary<string, object?>
         {
-            var properties = new Dictionary<string, object>();
-            properties.Add("property1", 1);
-            properties.Add("property2", 2);
+            { "property1", 1 },
+            { "property2", 2 }
+        };
 
-            this.sessionStartEventArgs = new SessionStartEventArgs(properties);
-        }
+        _sessionStartEventArgs = new SessionStartEventArgs(properties);
+    }
 
-        [TestMethod]
-        public void SessionStartEventArgsGetPropertiesShouldGetPropertiesEnumerator()
+    [TestMethod]
+    public void SessionStartEventArgsGetPropertiesShouldGetPropertiesEnumerator()
+    {
+        var properties = _sessionStartEventArgs.GetProperties();
+        int propertiesCount = 0;
+        while (properties.MoveNext())
         {
-            var properties = this.sessionStartEventArgs.GetProperties();
-            int propertiesCount = 0;
-            while (properties.MoveNext())
-            {
-                propertiesCount++;
-            }
-
-            Assert.AreEqual(2, propertiesCount);
+            propertiesCount++;
         }
 
-        [TestMethod]
-        public void SessionStartEventArgsGetPropertyValueShouldGetPropertyValue()
-        {
-            var value = this.sessionStartEventArgs.GetPropertyValue<int>("property1");
+        Assert.AreEqual(2, propertiesCount);
+    }
 
-            Assert.AreEqual(1, value);
-        }
+    [TestMethod]
+    public void SessionStartEventArgsGetPropertyValueShouldGetPropertyValue()
+    {
+        var value = _sessionStartEventArgs.GetPropertyValue<int>("property1");
 
-        [TestMethod]
-        public void SessionStartEventArgsGetPropertyValueShouldGetPropertyValueInObject()
-        {
-            var value = this.sessionStartEventArgs.GetPropertyValue("property1");
+        Assert.AreEqual(1, value);
+    }
 
-            Assert.AreEqual(1, value);
-        }
+    [TestMethod]
+    public void SessionStartEventArgsGetPropertyValueShouldGetPropertyValueInObject()
+    {
+        var value = _sessionStartEventArgs.GetPropertyValue("property1");
+
+        Assert.AreEqual(1, value);
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs
index 78c0b2857a..813ec85988 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs
@@ -1,86 +1,86 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class FrameworkTests
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void FrameworkFromStringShouldReturnNullForNull()
+    {
+        Assert.IsNull(Framework.FromString(null));
+    }
+
+    [TestMethod]
+    public void FrameworkFromStringShouldReturnNullForEmptyString()
+    {
+        Assert.IsNull(Framework.FromString(string.Empty));
+    }
+
+    [TestMethod]
+    public void FrameworkFromStringShouldReturnNullForInvalidString()
+    {
+        Assert.IsNull(Framework.FromString("InvalidFramework"));
+    }
+
+    [TestMethod]
+    public void FrameworkFromStringShouldIgnoreCase()
+    {
+        var fx = Framework.FromString("framework35")!;
+        Assert.AreEqual(".NETFramework,Version=v3.5", fx.Name);
+
+        fx = Framework.FromString("FRAMEWORK40")!;
+        Assert.AreEqual(".NETFramework,Version=v4.0", fx.Name);
 
-    [TestClass]
-    public class FrameworkTests
+        fx = Framework.FromString("Framework45")!;
+        Assert.AreEqual(".NETFramework,Version=v4.5", fx.Name);
+
+        fx = Framework.FromString("frameworKcore10")!;
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", fx.Name);
+
+        fx = Framework.FromString("frameworkUAP10")!;
+        Assert.AreEqual("UAP,Version=v10.0", fx.Name);
+    }
+
+    [TestMethod]
+    public void FrameworkFromStringShouldTrimSpacesAroundFrameworkString()
+    {
+        var fx = Framework.FromString("  Framework35")!;
+
+        Assert.AreEqual(".NETFramework,Version=v3.5", fx.Name);
+        Assert.AreEqual("3.5.0.0", fx.Version);
+    }
+
+    [TestMethod]
+    public void FrameworkFromStringShouldWorkForShortNames()
+    {
+        var fx = Framework.FromString("net462")!;
+        Assert.AreEqual(".NETFramework,Version=v4.6.2", fx.Name);
+        Assert.AreEqual("4.6.2.0", fx.Version);
+
+        var corefx = Framework.FromString("netcoreapp2.0")!;
+        Assert.AreEqual(".NETCoreApp,Version=v2.0", corefx.Name);
+        Assert.AreEqual("2.0.0.0", corefx.Version);
+    }
+
+    [TestMethod]
+    public void DefaultFrameworkShouldBeNet40OnDesktop()
     {
-        [TestMethod]
-        public void FrameworkFromStringShouldReturnNullForNull()
-        {
-            Assert.IsNull(Framework.FromString(null));
-        }
-
-        [TestMethod]
-        public void FrameworkFromStringShouldReturnNullForEmptyString()
-        {
-            Assert.IsNull(Framework.FromString(string.Empty));
-        }
-
-        [TestMethod]
-        public void FrameworkFromStringShouldReturnNullForInvalidString()
-        {
-            Assert.IsNull(Framework.FromString("InvalidFramework"));
-        }
-
-        [TestMethod]
-        public void FrameworkFromStringShouldIgnoreCase()
-        {
-            var fx = Framework.FromString("framework35");
-            Assert.AreEqual(".NETFramework,Version=v3.5", fx.Name);
-
-            fx = Framework.FromString("FRAMEWORK40");
-            Assert.AreEqual(".NETFramework,Version=v4.0", fx.Name);
-
-            fx = Framework.FromString("Framework45");
-            Assert.AreEqual(".NETFramework,Version=v4.5", fx.Name);
-
-            fx = Framework.FromString("frameworKcore10");
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", fx.Name);
-
-            fx = Framework.FromString("frameworkUAP10");
-            Assert.AreEqual("UAP,Version=v10.0", fx.Name);
-        }
-
-        [TestMethod]
-        public void FrameworkFromStringShouldTrimSpacesAroundFrameworkString()
-        {
-            var fx = Framework.FromString("  Framework35");
-
-            Assert.AreEqual(".NETFramework,Version=v3.5", fx.Name);
-            Assert.AreEqual("3.5.0.0", fx.Version);
-        }
-
-        [TestMethod]
-        public void FrameworkFromStringShouldWorkForShortNames()
-        {
-            var fx = Framework.FromString("net451");
-            Assert.AreEqual(".NETFramework,Version=v4.5.1", fx.Name);
-            Assert.AreEqual("4.5.1.0", fx.Version);
-
-            var corefx = Framework.FromString("netcoreapp2.0");
-            Assert.AreEqual(".NETCoreApp,Version=v2.0", corefx.Name);
-            Assert.AreEqual("2.0.0.0", corefx.Version);
-        }
-
-        [TestMethod]
-        public void DefaultFrameworkShouldBeNet40OnDesktop()
-        {
 #if NETFRAMEWORK
-            Assert.AreEqual(".NETFramework,Version=v4.0", Framework.DefaultFramework.Name);
+        Assert.AreEqual(".NETFramework,Version=v4.0", Framework.DefaultFramework.Name);
 #endif
-        }
+    }
 
-        [TestMethod]
-        public void DefaultFrameworkShouldBeNetCoreApp10OnNonDesktop()
-        {
-#if !NET451
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", Framework.DefaultFramework.Name);
+    [TestMethod]
+    public void DefaultFrameworkShouldBeNetCoreApp10OnNonDesktop()
+    {
+#if !NETFRAMEWORK
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", Framework.DefaultFramework.Name);
 #endif
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs
index a2fa14f682..abdc716457 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Hosting/TestRunnerConnectionInfoExtensionsTests.cs
@@ -1,75 +1,73 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.TestHostProvider.UnitTests.Hosting
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-#pragma warning disable SA1600
-    [TestClass]
-    public class TestRunnerConnectionInfoExtensionsTests
+namespace TestPlatform.TestHostProvider.UnitTests.Hosting;
+
+[TestClass]
+public class TestRunnerConnectionInfoExtensionsTests
+{
+    [TestMethod]
+    public void ToCommandLineOptionsShouldIncludePort()
     {
-        [TestMethod]
-        public void ToCommandLineOptionsShouldIncludePort()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            StringAssert.StartsWith(options, "--port 123 --endpoint 127.0.0.0:123 --role client");
-        }
+        StringAssert.StartsWith(options, "--port 123 --endpoint 127.0.0.0:123 --role client");
+    }
 
-        [TestMethod]
-        public void ToCommandLineOptionsShouldIncludeEndpoint()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
+    [TestMethod]
+    public void ToCommandLineOptionsShouldIncludeEndpoint()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            StringAssert.Contains(options, "--endpoint 127.0.0.0:123");
-        }
+        StringAssert.Contains(options, "--endpoint 127.0.0.0:123");
+    }
 
-        [TestMethod]
-        public void ToCommandLineOptionsShouldIncludeRole()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
+    [TestMethod]
+    public void ToCommandLineOptionsShouldIncludeRole()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets } };
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            StringAssert.Contains(options, "--role client");
-        }
+        StringAssert.Contains(options, "--role client");
+    }
 
-        [TestMethod]
-        public void ToCommandLineOptionsShouldIncludeParentProcessId()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { RunnerProcessId = 123 };
+    [TestMethod]
+    public void ToCommandLineOptionsShouldIncludeParentProcessId()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { RunnerProcessId = 123 };
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            Assert.IsTrue(options.IndexOf("--parentprocessid 123", StringComparison.OrdinalIgnoreCase) >= 0);
-        }
+        Assert.IsTrue(options.IndexOf("--parentprocessid 123", StringComparison.OrdinalIgnoreCase) >= 0);
+    }
 
-        [TestMethod]
-        public void ToCommandLineOptionsShouldNotIncludeDiagnosticsOptionIfNotEnabled()
-        {
-            var connectionInfo = default(TestRunnerConnectionInfo);
+    [TestMethod]
+    public void ToCommandLineOptionsShouldNotIncludeDiagnosticsOptionIfNotEnabled()
+    {
+        var connectionInfo = default(TestRunnerConnectionInfo);
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            Assert.IsFalse(options.IndexOf("--diag", StringComparison.OrdinalIgnoreCase) >= 0);
-        }
+        Assert.IsFalse(options.IndexOf("--diag", StringComparison.OrdinalIgnoreCase) >= 0);
+    }
 
-        [TestMethod]
-        public void ToCommandLineOptionsShouldIncludeDiagnosticsOptionIfEnabled()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { LogFile = "log.txt", TraceLevel = 3 };
+    [TestMethod]
+    public void ToCommandLineOptionsShouldIncludeDiagnosticsOptionIfEnabled()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { LogFile = "log.txt", TraceLevel = 3 };
 
-            var options = connectionInfo.ToCommandLineOptions();
+        var options = connectionInfo.ToCommandLineOptions();
 
-            StringAssert.EndsWith(options, "--diag log.txt --tracelevel 3");
-        }
+        StringAssert.EndsWith(options, "--diag log.txt --tracelevel 3");
     }
-#pragma warning restore SA1600
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
index 0081392c81..744ca8bb29 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
@@ -1,27 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>Microsoft.TestPlatform.ObjectModel.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>$(JsonNetVersion)</Version>
+      <Version>$(NewtonsoftJsonVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs
deleted file mode 100644
index ac2135a417..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
-{
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index a28b900e2c..0000000000
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.ObjectModel.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fc30d066-c891-40c0-b94a-d7dbb50ebf8f")]
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs
index cb14ddbb71..8194ebae03 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunConfigurationTests.cs
@@ -1,48 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
-{
-    using System;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using MSTest.TestFramework.AssertExtensions;
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class RunConfigurationTests
+{
+    [TestMethod]
+    public void RunConfigurationDefaultValuesMustBeUsedOnCreation()
+    {
+        var runConfiguration = new RunConfiguration();
+
+        // Verify Default
+        Assert.AreEqual(Constants.DefaultPlatform, runConfiguration.TargetPlatform);
+        Assert.AreEqual(Framework.DefaultFramework, runConfiguration.TargetFramework);
+        Assert.AreEqual(Constants.DefaultBatchSize, runConfiguration.BatchSize);
+        Assert.AreEqual(0, runConfiguration.TestSessionTimeout);
+        Assert.AreEqual(Constants.DefaultResultsDirectory, runConfiguration.ResultsDirectory);
+        Assert.IsNull(runConfiguration.SolutionDirectory);
+        Assert.AreEqual(Constants.DefaultTreatTestAdapterErrorsAsWarnings, runConfiguration.TreatTestAdapterErrorsAsWarnings);
+        Assert.IsNull(runConfiguration.BinariesRoot);
+        Assert.IsNull(runConfiguration.TestAdaptersPaths);
+        Assert.AreEqual(Constants.DefaultCpuCount, runConfiguration.MaxCpuCount);
+        Assert.IsFalse(runConfiguration.DisableAppDomain);
+        Assert.IsFalse(runConfiguration.DisableParallelization);
+        Assert.IsFalse(runConfiguration.DesignMode);
+        Assert.IsFalse(runConfiguration.InIsolation);
+        Assert.AreEqual(runConfiguration.DesignMode, runConfiguration.ShouldCollectSourceInformation);
+        Assert.AreEqual(Constants.DefaultExecutionThreadApartmentState, runConfiguration.ExecutionThreadApartmentState);
+    }
 
-    [TestClass]
-    public class RunConfigurationTests
+    [TestMethod]
+    public void RunConfigurationShouldNotThrowExceptionOnUnknownElements()
     {
-        [TestMethod]
-        public void RunConfigurationDefaultValuesMustBeUsedOnCreation()
-        {
-            var runConfiguration = new RunConfiguration();
-
-            // Verify Default
-            Assert.AreEqual(Constants.DefaultPlatform, runConfiguration.TargetPlatform);
-            Assert.AreEqual(Framework.DefaultFramework, runConfiguration.TargetFramework);
-            Assert.AreEqual(Constants.DefaultBatchSize, runConfiguration.BatchSize);
-            Assert.AreEqual(0, runConfiguration.TestSessionTimeout);
-            Assert.AreEqual(Constants.DefaultResultsDirectory, runConfiguration.ResultsDirectory);
-            Assert.IsNull(runConfiguration.SolutionDirectory);
-            Assert.AreEqual(Constants.DefaultTreatTestAdapterErrorsAsWarnings, runConfiguration.TreatTestAdapterErrorsAsWarnings);
-            Assert.IsNull(runConfiguration.BinariesRoot);
-            Assert.IsNull(runConfiguration.TestAdaptersPaths);
-            Assert.AreEqual(Constants.DefaultCpuCount, runConfiguration.MaxCpuCount);
-            Assert.IsFalse(runConfiguration.DisableAppDomain);
-            Assert.IsFalse(runConfiguration.DisableParallelization);
-            Assert.IsFalse(runConfiguration.DesignMode);
-            Assert.IsFalse(runConfiguration.InIsolation);
-            Assert.AreEqual(runConfiguration.DesignMode, runConfiguration.ShouldCollectSourceInformation);
-            Assert.AreEqual(Constants.DefaultExecutionThreadApartmentState, runConfiguration.ExecutionThreadApartmentState);
-        }
-
-        [TestMethod]
-        public void RunConfigurationShouldNotThrowExceptionOnUnknownElements()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <BadElement>TestResults</BadElement>
@@ -50,17 +50,17 @@ public void RunConfigurationShouldNotThrowExceptionOnUnknownElements()
                      </RunConfiguration>
                 </RunSettings>";
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
 
-            Assert.IsNotNull(runConfiguration);
-            Assert.IsTrue(runConfiguration.DesignMode);
-        }
+        Assert.IsNotNull(runConfiguration);
+        Assert.IsTrue(runConfiguration.DesignMode);
+    }
 
-        [TestMethod]
-        public void RunConfigurationReadsValuesCorrectlyFromXml()
-        {
-            string settingsXml =
-              @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationReadsValuesCorrectlyFromXml()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>TestResults</ResultsDirectory>
@@ -82,94 +82,87 @@ public void RunConfigurationReadsValuesCorrectlyFromXml()
                      </RunConfiguration>
                 </RunSettings>";
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
-
-            // Verify Default
-            Assert.AreEqual(Architecture.X64, runConfiguration.TargetPlatform);
-
-            var expectedFramework = Framework.FromString("FrameworkCore10");
-            var actualFramework = runConfiguration.TargetFramework;
-            Assert.AreEqual(expectedFramework.Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(expectedFramework.Version, runConfiguration.TargetFramework.Version);
-
-            Assert.AreEqual("TestResults", runConfiguration.ResultsDirectory);
-
-            var expectedSolutionPath = Environment.GetEnvironmentVariable("temp");
-            Assert.AreEqual(expectedSolutionPath, runConfiguration.SolutionDirectory);
-
-            Assert.IsTrue(runConfiguration.TreatTestAdapterErrorsAsWarnings);
-            Assert.AreEqual(@"E:\x\z", runConfiguration.BinariesRoot);
-            Assert.AreEqual(@"C:\a\b;D:\x\y", runConfiguration.TestAdaptersPaths);
-            Assert.AreEqual(2, runConfiguration.MaxCpuCount);
-            Assert.AreEqual(5, runConfiguration.BatchSize);
-            Assert.AreEqual(10000, runConfiguration.TestSessionTimeout);
-            Assert.IsTrue(runConfiguration.DisableAppDomain);
-            Assert.IsTrue(runConfiguration.DisableParallelization);
-            Assert.IsTrue(runConfiguration.DesignMode);
-            Assert.IsTrue(runConfiguration.InIsolation);
-            Assert.IsFalse(runConfiguration.ShouldCollectSourceInformation);
-            Assert.AreEqual(PlatformApartmentState.STA, runConfiguration.ExecutionThreadApartmentState);
-        }
-
-        [TestMethod]
-        public void SetTargetFrameworkVersionShouldSetTargetFramework()
-        {
-#pragma warning disable 612, 618
-
-            var runConfiguration = new RunConfiguration();
-            runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework35;
-            StringAssert.Equals(Framework.FromString("Framework35").Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(FrameworkVersion.Framework35, runConfiguration.TargetFrameworkVersion);
-
-            runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework40;
-            StringAssert.Equals(Framework.FromString("Framework40").Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(FrameworkVersion.Framework40, runConfiguration.TargetFrameworkVersion);
-
-            runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework45;
-            StringAssert.Equals(Framework.FromString("Framework45").Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(FrameworkVersion.Framework45, runConfiguration.TargetFrameworkVersion);
-
-            runConfiguration.TargetFrameworkVersion = FrameworkVersion.FrameworkCore10;
-            StringAssert.Equals(Framework.FromString("FrameworkCore10").Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(FrameworkVersion.FrameworkCore10, runConfiguration.TargetFrameworkVersion);
-
-            runConfiguration.TargetFrameworkVersion = FrameworkVersion.FrameworkUap10;
-            StringAssert.Equals(Framework.FromString("FrameworkUap10").Name, runConfiguration.TargetFramework.Name);
-            Assert.AreEqual(FrameworkVersion.FrameworkUap10, runConfiguration.TargetFrameworkVersion);
-
-#pragma warning restore 612, 618
-        }
-
-        [TestMethod]
-        public void SetTargetFrameworkShouldSetTargetFrameworkVersion()
-        {
-            var runConfiguration = new RunConfiguration();
-
-#pragma warning disable 612, 618
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+
+        // Verify Default
+        Assert.AreEqual(Architecture.X64, runConfiguration.TargetPlatform);
+
+        var expectedFramework = Framework.FromString("FrameworkCore10")!;
+        _ = runConfiguration.TargetFramework;
+        Assert.AreEqual(expectedFramework.Name, runConfiguration.TargetFramework!.Name);
+        Assert.AreEqual(expectedFramework.Version, runConfiguration.TargetFramework.Version);
+
+        Assert.AreEqual("TestResults", runConfiguration.ResultsDirectory);
+
+        var expectedSolutionPath = Environment.GetEnvironmentVariable("temp");
+        Assert.AreEqual(expectedSolutionPath, runConfiguration.SolutionDirectory);
+
+        Assert.IsTrue(runConfiguration.TreatTestAdapterErrorsAsWarnings);
+        Assert.AreEqual(@"E:\x\z", runConfiguration.BinariesRoot);
+        Assert.AreEqual(@"C:\a\b;D:\x\y", runConfiguration.TestAdaptersPaths);
+        Assert.AreEqual(2, runConfiguration.MaxCpuCount);
+        Assert.AreEqual(5, runConfiguration.BatchSize);
+        Assert.AreEqual(10000, runConfiguration.TestSessionTimeout);
+        Assert.IsTrue(runConfiguration.DisableAppDomain);
+        Assert.IsTrue(runConfiguration.DisableParallelization);
+        Assert.IsTrue(runConfiguration.DesignMode);
+        Assert.IsTrue(runConfiguration.InIsolation);
+        Assert.IsFalse(runConfiguration.ShouldCollectSourceInformation);
+        Assert.AreEqual(PlatformApartmentState.STA, runConfiguration.ExecutionThreadApartmentState);
+    }
 
-            runConfiguration.TargetFramework = Framework.FromString("Framework35");
-            Assert.AreEqual(FrameworkVersion.Framework35, runConfiguration.TargetFrameworkVersion);
+    [TestMethod]
+    [Obsolete("TargetFrameworkVersion is Obsolete but we want to test its behavior")]
+    public void SetTargetFrameworkVersionShouldSetTargetFramework()
+    {
+        var runConfiguration = new RunConfiguration();
+        runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework35;
+        Assert.AreEqual(Framework.FromString("Framework35")!.Name, runConfiguration.TargetFramework!.Name);
+        Assert.AreEqual(FrameworkVersion.Framework35, runConfiguration.TargetFrameworkVersion);
+
+        runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework40;
+        Assert.AreEqual(Framework.FromString("Framework40")!.Name, runConfiguration.TargetFramework.Name);
+        Assert.AreEqual(FrameworkVersion.Framework40, runConfiguration.TargetFrameworkVersion);
+
+        runConfiguration.TargetFrameworkVersion = FrameworkVersion.Framework45;
+        Assert.AreEqual(Framework.FromString("Framework45")!.Name, runConfiguration.TargetFramework.Name);
+        Assert.AreEqual(FrameworkVersion.Framework45, runConfiguration.TargetFrameworkVersion);
+
+        runConfiguration.TargetFrameworkVersion = FrameworkVersion.FrameworkCore10;
+        Assert.AreEqual(Framework.FromString("FrameworkCore10")!.Name, runConfiguration.TargetFramework.Name);
+        Assert.AreEqual(FrameworkVersion.FrameworkCore10, runConfiguration.TargetFrameworkVersion);
+
+        runConfiguration.TargetFrameworkVersion = FrameworkVersion.FrameworkUap10;
+        Assert.AreEqual(Framework.FromString("FrameworkUap10")!.Name, runConfiguration.TargetFramework.Name);
+        Assert.AreEqual(FrameworkVersion.FrameworkUap10, runConfiguration.TargetFrameworkVersion);
+    }
 
-            runConfiguration.TargetFramework = Framework.FromString("Framework40");
-            Assert.AreEqual(FrameworkVersion.Framework40, runConfiguration.TargetFrameworkVersion);
+    [TestMethod]
+    [Obsolete("TargetFrameworkVersion is Obsolete but we want to test its behavior")]
+    public void SetTargetFrameworkShouldSetTargetFrameworkVersion()
+    {
+        var runConfiguration = new RunConfiguration();
+        runConfiguration.TargetFramework = Framework.FromString("Framework35");
+        Assert.AreEqual(FrameworkVersion.Framework35, runConfiguration.TargetFrameworkVersion);
 
-            runConfiguration.TargetFramework = Framework.FromString("Framework45");
-            Assert.AreEqual(FrameworkVersion.Framework45, runConfiguration.TargetFrameworkVersion);
+        runConfiguration.TargetFramework = Framework.FromString("Framework40");
+        Assert.AreEqual(FrameworkVersion.Framework40, runConfiguration.TargetFrameworkVersion);
 
-            runConfiguration.TargetFramework = Framework.FromString("FrameworkCore10");
-            Assert.AreEqual(FrameworkVersion.FrameworkCore10, runConfiguration.TargetFrameworkVersion);
+        runConfiguration.TargetFramework = Framework.FromString("Framework45");
+        Assert.AreEqual(FrameworkVersion.Framework45, runConfiguration.TargetFrameworkVersion);
 
-            runConfiguration.TargetFramework = Framework.FromString("FrameworkUap10");
-            Assert.AreEqual(FrameworkVersion.FrameworkUap10, runConfiguration.TargetFrameworkVersion);
+        runConfiguration.TargetFramework = Framework.FromString("FrameworkCore10");
+        Assert.AreEqual(FrameworkVersion.FrameworkCore10, runConfiguration.TargetFrameworkVersion);
 
-#pragma warning restore 612, 618
-        }
+        runConfiguration.TargetFramework = Framework.FromString("FrameworkUap10");
+        Assert.AreEqual(FrameworkVersion.FrameworkUap10, runConfiguration.TargetFrameworkVersion);
+    }
 
-        [TestMethod]
-        public void RunConfigurationFromXmlThrowsSettingsExceptionIfBatchSizeIsInvalid()
-        {
-            string settingsXml =
-             @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationFromXmlThrowsSettingsExceptionIfBatchSizeIsInvalid()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <BatchSize>Foo</BatchSize>
@@ -177,16 +170,16 @@ public void RunConfigurationFromXmlThrowsSettingsExceptionIfBatchSizeIsInvalid()
                 </RunSettings>";
 
 
-            Assert.That.Throws<SettingsException>(
-                    () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml))
-                    .WithExactMessage("Invalid settings 'RunConfiguration'.  Invalid value 'Foo' specified for 'BatchSize'.");
-        }
+        var exception = Assert.ThrowsExactly<SettingsException>(
+                () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml));
+        Assert.AreEqual("Invalid settings 'RunConfiguration'.  Invalid value 'Foo' specified for 'BatchSize'.", exception.Message);
+    }
 
-        [TestMethod]
-        public void RunConfigurationFromXmlThrowsSettingsExceptionIfTestSessionTimeoutIsInvalid()
-        {
-            string settingsXml =
-             @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationFromXmlThrowsSettingsExceptionIfTestSessionTimeoutIsInvalid()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TestSessionTimeout>-1</TestSessionTimeout>
@@ -194,16 +187,16 @@ public void RunConfigurationFromXmlThrowsSettingsExceptionIfTestSessionTimeoutIs
                 </RunSettings>";
 
 
-            Assert.That.Throws<SettingsException>(
-                    () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml))
-                    .WithExactMessage("Invalid settings 'RunConfiguration'.  Invalid value '-1' specified for 'TestSessionTimeout'.");
-        }
+        var exception = Assert.ThrowsExactly<SettingsException>(
+                () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml));
+        Assert.AreEqual("Invalid settings 'RunConfiguration'.  Invalid value '-1' specified for 'TestSessionTimeout'.", exception.Message);
+    }
 
-        [TestMethod]
-        public void RunConfigurationFromXmlShouldNotThrowsSettingsExceptionIfTestSessionTimeoutIsZero()
-        {
-            string settingsXml =
-             @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationFromXmlShouldNotThrowsSettingsExceptionIfTestSessionTimeoutIsZero()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TestSessionTimeout>0</TestSessionTimeout>
@@ -211,14 +204,14 @@ public void RunConfigurationFromXmlShouldNotThrowsSettingsExceptionIfTestSession
                 </RunSettings>";
 
 
-            XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
-        }
+        XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+    }
 
-        [TestMethod]
-        public void RunConfigurationFromXmlThrowsSettingsExceptionIfExecutionThreadApartmentStateIsInvalid()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationFromXmlThrowsSettingsExceptionIfExecutionThreadApartmentStateIsInvalid()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ExecutionThreadApartmentState>RandomValue</ExecutionThreadApartmentState>
@@ -226,134 +219,135 @@ public void RunConfigurationFromXmlThrowsSettingsExceptionIfExecutionThreadApart
                 </RunSettings>";
 
 
-            Assert.That.Throws<SettingsException>(
-                    () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml))
-                .WithExactMessage("Invalid settings 'RunConfiguration'.  Invalid value 'RandomValue' specified for 'ExecutionThreadApartmentState'.");
-        }
+        var exception = Assert.ThrowsExactly<SettingsException>(
+                () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml));
+        Assert.AreEqual("Invalid settings 'RunConfiguration'.  Invalid value 'RandomValue' specified for 'ExecutionThreadApartmentState'.", exception.Message);
+    }
 
-        [TestMethod]
-        public void RunConfigurationFromXmlThrowsSettingsExceptionIfBatchSizeIsNegativeInteger()
-        {
-            string settingsXml =
-             @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationFromXmlThrowsSettingsExceptionIfBatchSizeIsNegativeInteger()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <BatchSize>-10</BatchSize>
                      </RunConfiguration>
                 </RunSettings>";
 
-            Assert.That.Throws<SettingsException>(
-              () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml))
-              .WithExactMessage("Invalid settings 'RunConfiguration'.  Invalid value '-10' specified for 'BatchSize'.");
-        }
-
-        [DataRow(true)]
-        [DataRow(false)]
-        [DataTestMethod]
-        public void RunConfigurationShouldReadValueForDesignMode(bool designModeValue)
-        {
-            string settingsXml = string.Format(
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+        var exception = Assert.ThrowsExactly<SettingsException>(
+                () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml));
+        Assert.AreEqual("Invalid settings 'RunConfiguration'.  Invalid value '-10' specified for 'BatchSize'.", exception.Message);
+    }
+
+    [DataRow(true)]
+    [DataRow(false)]
+    [DataTestMethod]
+    public void RunConfigurationShouldReadValueForDesignMode(bool designModeValue)
+    {
+        string settingsXml = string.Format(
+            CultureInfo.CurrentCulture,
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <DesignMode>{0}</DesignMode>
                      </RunConfiguration>
                 </RunSettings>", designModeValue);
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
 
-            Assert.AreEqual(designModeValue, runConfiguration.DesignMode);
-        }
+        Assert.AreEqual(designModeValue, runConfiguration.DesignMode);
+    }
 
-        [TestMethod]
-        public void RunConfigurationShouldSetDesignModeAsFalseByDefault()
-        {
-            string settingsXml =
-              @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationShouldSetDesignModeAsFalseByDefault()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TargetPlatform>x64</TargetPlatform>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
 
-            Assert.IsFalse(runConfiguration.DesignMode);
-        }
+        Assert.IsFalse(runConfiguration.DesignMode);
+    }
 
-        [TestMethod]
-        public void RunConfigurationToXmlShouldProvideDesignMode()
-        {
-            var runConfiguration = new RunConfiguration { DesignMode = true };
+    [TestMethod]
+    public void RunConfigurationToXmlShouldProvideDesignMode()
+    {
+        var runConfiguration = new RunConfiguration { DesignMode = true };
 
-            StringAssert.Contains(runConfiguration.ToXml().InnerXml, "<DesignMode>True</DesignMode>");
-        }
+        StringAssert.Contains(runConfiguration.ToXml().InnerXml, "<DesignMode>True</DesignMode>");
+    }
 
-        [DataRow(true)]
-        [DataRow(false)]
-        [DataTestMethod]
-        public void RunConfigurationShouldReadValueForCollectSourceInformation(bool val)
-        {
-            string settingsXml = string.Format(
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [DataRow(true)]
+    [DataRow(false)]
+    [DataTestMethod]
+    public void RunConfigurationShouldReadValueForCollectSourceInformation(bool val)
+    {
+        string settingsXml = string.Format(
+            CultureInfo.CurrentCulture,
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <CollectSourceInformation>{0}</CollectSourceInformation>
                      </RunConfiguration>
                 </RunSettings>", val);
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
 
-            Assert.AreEqual(val, runConfiguration.ShouldCollectSourceInformation);
-        }
+        Assert.AreEqual(val, runConfiguration.ShouldCollectSourceInformation);
+    }
 
-        [TestMethod]
-        public void RunConfigurationShouldSetCollectSourceInformationSameAsDesignModeByDefault()
-        {
-            string settingsXml =
-              @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void RunConfigurationShouldSetCollectSourceInformationSameAsDesignModeByDefault()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <TargetPlatform>x64</TargetPlatform>
                      </RunConfiguration>
                 </RunSettings>";
 
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
-
-            Assert.AreEqual(runConfiguration.DesignMode, runConfiguration.ShouldCollectSourceInformation);
-        }
-
-        [DataTestMethod]
-        [DataRow(true)]
-        [DataRow(false)]
-        public void RunConfigurationToXmlShouldProvideCollectSourceInformationSameAsDesignMode(bool val)
-        {
-            var runConfiguration = new RunConfiguration { DesignMode = val };
-            StringAssert.Contains(runConfiguration.ToXml().InnerXml.ToUpperInvariant(), $"<CollectSourceInformation>{val}</CollectSourceInformation>".ToUpperInvariant());
-        }
-
-        [TestMethod]
-        public void RunConfigurationToXmlShouldProvideExecutionThreadApartmentState()
-        {
-            var runConfiguration = new RunConfiguration { ExecutionThreadApartmentState = PlatformApartmentState.STA };
-
-            StringAssert.Contains(runConfiguration.ToXml().InnerXml, "<ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>");
-        }
-
-        [TestMethod]
-        public void RunConfigurationShouldThrowSettingsExceptionIfResultsirectoryIsEmpty()
-        {
-            string settingsXml =
-             @"<?xml version=""1.0"" encoding=""utf-8""?>
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml);
+
+        Assert.AreEqual(runConfiguration.DesignMode, runConfiguration.ShouldCollectSourceInformation);
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void RunConfigurationToXmlShouldProvideCollectSourceInformationSameAsDesignMode(bool val)
+    {
+        var runConfiguration = new RunConfiguration { DesignMode = val };
+        StringAssert.Contains(runConfiguration.ToXml().InnerXml.ToUpperInvariant(), $"<CollectSourceInformation>{val}</CollectSourceInformation>".ToUpperInvariant());
+    }
+
+    [TestMethod]
+    public void RunConfigurationToXmlShouldProvideExecutionThreadApartmentState()
+    {
+        var runConfiguration = new RunConfiguration { ExecutionThreadApartmentState = PlatformApartmentState.STA };
+
+        StringAssert.Contains(runConfiguration.ToXml().InnerXml, "<ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>");
+    }
+
+    [TestMethod]
+    public void RunConfigurationShouldThrowSettingsExceptionIfResultsirectoryIsEmpty()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory/>
                      </RunConfiguration>
                 </RunSettings>";
 
-            Assert.That.Throws<SettingsException>(
-              () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml))
-              .WithExactMessage("Invalid settings 'RunConfiguration'.  Invalid value '' specified for 'ResultsDirectory'.");
-        }
+        var exception = Assert.ThrowsExactly<SettingsException>(
+                () => XmlRunSettingsUtilities.GetRunConfigurationNode(settingsXml));
+        Assert.AreEqual("Invalid settings 'RunConfiguration'.  Invalid value '' specified for 'ResultsDirectory'.", exception.Message);
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunSettingsTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunSettingsTests.cs
new file mode 100644
index 0000000000..3477a0d302
--- /dev/null
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/RunSettings/RunSettingsTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Xml;
+using System.Xml.Serialization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class RunSettingsTests
+{
+    [TestMethod]
+    public void RunSettingsNameSerialization()
+    {
+        var chilRunSettings = new ChildRunSettings();
+        var xml = chilRunSettings.ToXml();
+        Assert.IsNotNull(xml);
+    }
+
+    public class ChildRunSettings : TestRunSettings
+    {
+        public ChildRunSettings() : base("SomeName")
+        {
+        }
+
+        public override XmlElement ToXml()
+        {
+            var document = new XmlDocument();
+            using (XmlWriter writer = document.CreateNavigator()!.AppendChild())
+            {
+                new XmlSerializer(typeof(ChildRunSettings)).Serialize(writer, this);
+            }
+            return document.DocumentElement!;
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs
index f61dfcd2d7..3d6140bdb5 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestCaseTests.cs
@@ -1,194 +1,193 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class TestCaseTests
 {
-    using System;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestCaseTests
-    {
-        private TestCase testCase;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            testCase = new TestCase("sampleTestClass.sampleTestCase", new Uri("executor://sampleTestExecutor"), "sampleTest.dll");
-        }
-
-        [TestMethod]
-        public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndName()
-        {
-            Assert.AreEqual("28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b", testCase.Id.ToString());
-        }
-
-        [TestMethod]
-        public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndNameIfNameIsChanged()
-        {
-            testCase.FullyQualifiedName = "sampleTestClass1.sampleTestCase1";
-
-            Assert.AreEqual("6f86dd1c-7130-a1ae-8e7f-02e7de898a43", testCase.Id.ToString());
-        }
-
-        [TestMethod]
-        public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndNameIfSourceIsChanged()
-        {
-            testCase.Source = "sampleTest1.dll";
-
-            Assert.AreEqual("22843fee-70ea-4cf4-37cd-5061b4c47a8a", testCase.Id.ToString());
-        }
-
-        [TestMethod]
-        public void TestCaseIdShouldReturnIdSetExplicitlyEvenIfNameOrSourceInfoChanges()
-        {
-            var testGuid = new Guid("{8167845C-9CDB-476F-9F2B-1B1C1FE01B7D}");
-            testCase.Id = testGuid;
-
-            testCase.FullyQualifiedName = "sampleTestClass1.sampleTestCase1";
-            testCase.Source = "sampleTest1.dll";
-
-            Assert.AreEqual(testGuid, testCase.Id);
-        }
-
-        [TestMethod]
-        public void TestCaseLocalExtensionDataIsPubliclySettableGettableProperty()
-        {
-            var dummyData = "foo";
-            this.testCase.LocalExtensionData = dummyData;
-            Assert.AreEqual("foo", this.testCase.LocalExtensionData);
-        }
-
-        #region GetSetPropertyValue Tests
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForCodeFilePathShouldReturnCorrectValue()
-        {
-            var testCodeFilePath = "C:\\temp\foo.cs";
-            this.testCase.CodeFilePath = testCodeFilePath;
-
-            Assert.AreEqual(testCodeFilePath, this.testCase.GetPropertyValue(TestCaseProperties.CodeFilePath));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForDisplayNameShouldReturnCorrectValue()
-        {
-            var testDisplayName = "testCaseDisplayName";
-            this.testCase.DisplayName = testDisplayName;
-
-            Assert.AreEqual(testDisplayName, this.testCase.GetPropertyValue(TestCaseProperties.DisplayName));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForExecutorUriShouldReturnCorrectValue()
-        {
-            var testExecutorUri = new Uri("http://foo");
-            this.testCase.ExecutorUri = testExecutorUri;
-
-            Assert.AreEqual(testExecutorUri, this.testCase.GetPropertyValue(TestCaseProperties.ExecutorUri));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForFullyQualifiedNameShouldReturnCorrectValue()
-        {
-            var testFullyQualifiedName = "fullyQualifiedName.Test1";
-            this.testCase.FullyQualifiedName = testFullyQualifiedName;
-
-            Assert.AreEqual(testFullyQualifiedName, this.testCase.GetPropertyValue(TestCaseProperties.FullyQualifiedName));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForIdShouldReturnCorrectValue()
-        {
-            var testId = new Guid("{7845816C-9CDB-37DA-9ADF-1B1C1FE01B7D}");
-            this.testCase.Id = testId;
-
-            Assert.AreEqual(testId, this.testCase.GetPropertyValue(TestCaseProperties.Id));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForLineNumberShouldReturnCorrectValue()
-        {
-            var testLineNumber = 34;
-            this.testCase.LineNumber = testLineNumber;
-
-            Assert.AreEqual(testLineNumber, this.testCase.GetPropertyValue(TestCaseProperties.LineNumber));
-        }
-
-        [TestMethod]
-        public void TestCaseGetPropertyValueForSourceShouldReturnCorrectValue()
-        {
-            var testSource = "C://temp/foobar.dll";
-            this.testCase.Source = testSource;
-
-            Assert.AreEqual(testSource, this.testCase.GetPropertyValue(TestCaseProperties.Source));
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForCodeFilePathShouldSetValue()
-        {
-            var testCodeFilePath = "C:\\temp\foo.cs";
-            this.testCase.SetPropertyValue(TestCaseProperties.CodeFilePath, testCodeFilePath);
-
-            Assert.AreEqual(testCodeFilePath, this.testCase.CodeFilePath);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForDisplayNameShouldSetValue()
-        {
-            var testDisplayName = "testCaseDisplayName";
-            this.testCase.SetPropertyValue(TestCaseProperties.DisplayName, testDisplayName);
-
-            Assert.AreEqual(testDisplayName, this.testCase.DisplayName);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForExecutorUriShouldSetValue()
-        {
-            var testExecutorUri = new Uri("http://foo");
-            this.testCase.SetPropertyValue(TestCaseProperties.ExecutorUri, testExecutorUri);
-
-            Assert.AreEqual(testExecutorUri, this.testCase.ExecutorUri);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForFullyQualifiedNameShouldSetValue()
-        {
-            var testFullyQualifiedName = "fullyQualifiedName.Test1";
-            this.testCase.SetPropertyValue(TestCaseProperties.FullyQualifiedName, testFullyQualifiedName);
-
-            Assert.AreEqual(testFullyQualifiedName, this.testCase.FullyQualifiedName);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForIdShouldSetValue()
-        {
-            var testId = new Guid("{7845816C-9CDB-37DA-9ADF-1B1C1FE01B7D}");
-            this.testCase.SetPropertyValue(TestCaseProperties.Id, testId);
-
-            Assert.AreEqual(testId, this.testCase.Id);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForLineNumberShouldSetValue()
-        {
-            var testLineNumber = 34;
-            this.testCase.SetPropertyValue(TestCaseProperties.LineNumber, testLineNumber);
-
-            Assert.AreEqual(testLineNumber, this.testCase.LineNumber);
-        }
-
-        [TestMethod]
-        public void TestCaseSetPropertyValueForSourceShouldSetValue()
-        {
-            var testSource = "C://temp/foobar.dll";
-            this.testCase.SetPropertyValue(TestCaseProperties.Source, testSource);
-
-            Assert.AreEqual(testSource, this.testCase.Source);
-        }
-
-        #endregion
+    private readonly TestCase _testCase;
+
+    public TestCaseTests()
+    {
+        _testCase = new TestCase("sampleTestClass.sampleTestCase", new Uri("executor://sampleTestExecutor"), "sampleTest.dll");
+    }
+
+    [TestMethod]
+    public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndName()
+    {
+        Assert.AreEqual("28e7a7ed-8fb9-05b7-5e90-4a8c52f32b5b", _testCase.Id.ToString());
+    }
+
+    [TestMethod]
+    public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndNameIfNameIsChanged()
+    {
+        _testCase.FullyQualifiedName = "sampleTestClass1.sampleTestCase1";
+
+        Assert.AreEqual("6f86dd1c-7130-a1ae-8e7f-02e7de898a43", _testCase.Id.ToString());
+    }
+
+    [TestMethod]
+    public void TestCaseIdIfNotSetExplicitlyShouldReturnGuidBasedOnSourceAndNameIfSourceIsChanged()
+    {
+        _testCase.Source = "sampleTest1.dll";
+
+        Assert.AreEqual("22843fee-70ea-4cf4-37cd-5061b4c47a8a", _testCase.Id.ToString());
+    }
+
+    [TestMethod]
+    public void TestCaseIdShouldReturnIdSetExplicitlyEvenIfNameOrSourceInfoChanges()
+    {
+        var testGuid = new Guid("{8167845C-9CDB-476F-9F2B-1B1C1FE01B7D}");
+        _testCase.Id = testGuid;
+
+        _testCase.FullyQualifiedName = "sampleTestClass1.sampleTestCase1";
+        _testCase.Source = "sampleTest1.dll";
+
+        Assert.AreEqual(testGuid, _testCase.Id);
+    }
+
+    [TestMethod]
+    public void TestCaseLocalExtensionDataIsPubliclySettableGettableProperty()
+    {
+        var dummyData = "foo";
+        _testCase.LocalExtensionData = dummyData;
+        Assert.AreEqual("foo", _testCase.LocalExtensionData);
+    }
+
+    #region GetSetPropertyValue Tests
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForCodeFilePathShouldReturnCorrectValue()
+    {
+        var testCodeFilePath = "C:\\temp\foo.cs";
+        _testCase.CodeFilePath = testCodeFilePath;
+
+        Assert.AreEqual(testCodeFilePath, _testCase.GetPropertyValue(TestCaseProperties.CodeFilePath));
+    }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForDisplayNameShouldReturnCorrectValue()
+    {
+        var testDisplayName = "testCaseDisplayName";
+        _testCase.DisplayName = testDisplayName;
+
+        Assert.AreEqual(testDisplayName, _testCase.GetPropertyValue(TestCaseProperties.DisplayName));
+    }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForExecutorUriShouldReturnCorrectValue()
+    {
+        var testExecutorUri = new Uri("http://foo");
+        _testCase.ExecutorUri = testExecutorUri;
+
+        Assert.AreEqual(testExecutorUri, _testCase.GetPropertyValue(TestCaseProperties.ExecutorUri));
+    }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForFullyQualifiedNameShouldReturnCorrectValue()
+    {
+        var testFullyQualifiedName = "fullyQualifiedName.Test1";
+        _testCase.FullyQualifiedName = testFullyQualifiedName;
+
+        Assert.AreEqual(testFullyQualifiedName, _testCase.GetPropertyValue(TestCaseProperties.FullyQualifiedName));
     }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForIdShouldReturnCorrectValue()
+    {
+        var testId = new Guid("{7845816C-9CDB-37DA-9ADF-1B1C1FE01B7D}");
+        _testCase.Id = testId;
+
+        Assert.AreEqual(testId, _testCase.GetPropertyValue(TestCaseProperties.Id));
+    }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForLineNumberShouldReturnCorrectValue()
+    {
+        var testLineNumber = 34;
+        _testCase.LineNumber = testLineNumber;
+
+        Assert.AreEqual(testLineNumber, _testCase.GetPropertyValue(TestCaseProperties.LineNumber));
+    }
+
+    [TestMethod]
+    public void TestCaseGetPropertyValueForSourceShouldReturnCorrectValue()
+    {
+        var testSource = "C://temp/foobar.dll";
+        _testCase.Source = testSource;
+
+        Assert.AreEqual(testSource, _testCase.GetPropertyValue(TestCaseProperties.Source));
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForCodeFilePathShouldSetValue()
+    {
+        var testCodeFilePath = "C:\\temp\foo.cs";
+        _testCase.SetPropertyValue(TestCaseProperties.CodeFilePath, testCodeFilePath);
+
+        Assert.AreEqual(testCodeFilePath, _testCase.CodeFilePath);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForDisplayNameShouldSetValue()
+    {
+        var testDisplayName = "testCaseDisplayName";
+        _testCase.SetPropertyValue(TestCaseProperties.DisplayName, testDisplayName);
+
+        Assert.AreEqual(testDisplayName, _testCase.DisplayName);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForExecutorUriShouldSetValue()
+    {
+        var testExecutorUri = new Uri("http://foo");
+        _testCase.SetPropertyValue(TestCaseProperties.ExecutorUri, testExecutorUri);
+
+        Assert.AreEqual(testExecutorUri, _testCase.ExecutorUri);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForFullyQualifiedNameShouldSetValue()
+    {
+        var testFullyQualifiedName = "fullyQualifiedName.Test1";
+        _testCase.SetPropertyValue(TestCaseProperties.FullyQualifiedName, testFullyQualifiedName);
+
+        Assert.AreEqual(testFullyQualifiedName, _testCase.FullyQualifiedName);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForIdShouldSetValue()
+    {
+        var testId = new Guid("{7845816C-9CDB-37DA-9ADF-1B1C1FE01B7D}");
+        _testCase.SetPropertyValue(TestCaseProperties.Id, testId);
+
+        Assert.AreEqual(testId, _testCase.Id);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForLineNumberShouldSetValue()
+    {
+        var testLineNumber = 34;
+        _testCase.SetPropertyValue(TestCaseProperties.LineNumber, testLineNumber);
+
+        Assert.AreEqual(testLineNumber, _testCase.LineNumber);
+    }
+
+    [TestMethod]
+    public void TestCaseSetPropertyValueForSourceShouldSetValue()
+    {
+        var testSource = "C://temp/foobar.dll";
+        _testCase.SetPropertyValue(TestCaseProperties.Source, testSource);
+
+        Assert.AreEqual(testSource, _testCase.Source);
+    }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs
index e910b4ad26..51278d94ea 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestObjectTests.cs
@@ -1,47 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
-{
-    using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.Linq;
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
 
-    [TestClass]
-    public class TestObjectTests
+[TestClass]
+public class TestObjectTests
+{
+    private static readonly TestCase TestCase = new(
+        "sampleTestClass.sampleTestCase",
+        new Uri("executor://sampleTestExecutor"),
+        "sampleTest.dll")
     {
-        private static TestCase testCase = new TestCase(
-                                               "sampleTestClass.sampleTestCase",
-                                               new Uri("executor://sampleTestExecutor"),
-                                               "sampleTest.dll")
-        {
-            CodeFilePath = "/user/src/testFile.cs",
-            DisplayName = "sampleTestCase",
-            Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
-            Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
-        };
+        CodeFilePath = "/user/src/testFile.cs",
+        DisplayName = "sampleTestCase",
+        Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
+        Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
+    };
 
-        [TestMethod]
-        public void TestCaseIdShouldReturnGuidWhenTestPropertiesIdIsSet()
-        {
-            Guid expected = new Guid("{8167845C-9CDB-476F-9F2B-1B1C1FE01B7D}");
-            testCase.Id = expected;
-            var actual = testCase.Id;
-            Assert.AreEqual(expected, actual);
-        }
+    [TestMethod]
+    public void TestCaseIdShouldReturnGuidWhenTestPropertiesIdIsSet()
+    {
+        Guid expected = new("{8167845C-9CDB-476F-9F2B-1B1C1FE01B7D}");
+        TestCase.Id = expected;
+        var actual = TestCase.Id;
+        Assert.AreEqual(expected, actual);
+    }
 
-        [TestMethod]
-        public void GetPropertiesShouldReturnListOfPropertiesInStore()
-        {
-            TestProperty tp = TestProperty.Register("dummyId", "dummyLabel", typeof(int), typeof(TestObjectTests));
-            var kvp = new KeyValuePair<TestProperty, object>(tp, 123);
-            testCase.SetPropertyValue(kvp.Key, kvp.Value);
+    [TestMethod]
+    public void GetPropertiesShouldReturnListOfPropertiesInStore()
+    {
+        TestProperty tp = TestProperty.Register("dummyId", "dummyLabel", typeof(int), typeof(TestObjectTests));
+        var kvp = new KeyValuePair<TestProperty, object?>(tp, 123);
+        TestCase.SetPropertyValue(kvp.Key, kvp.Value);
 
-            var properties = testCase.GetProperties().ToList();
-            Assert.IsTrue(properties.Contains(kvp));
-        }
+        var properties = TestCase.GetProperties().ToList();
+        Assert.IsTrue(properties.Contains(kvp));
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs
index b60b15ca8e..a6219cc386 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/TestResultTests.cs
@@ -1,192 +1,192 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests;
+
+[TestClass]
+public class TestResultTests
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestResultTests
-    {
-        private readonly TestCase testcase;
-        private readonly TestResult result;
-
-        public TestResultTests()
-        {
-            this.testcase = new TestCase("FQN", new Uri("http://dummyUri"), "dummySource");
-            this.result = new TestResult(testcase);
-        }
-
-        [TestMethod]
-        public void TestResultShouldInitializeEmptyAttachments()
-        {
-            Assert.AreEqual(0, this.result.Attachments.Count);
-        }
-
-        [TestMethod]
-        public void TestResultShouldInitializeEmptyMessages()
-        {
-            Assert.AreEqual(0, this.result.Messages.Count);
-        }
-
-        [TestMethod]
-        public void TestResultShouldInitializeStartAndEndTimeToCurrent()
-        {
-            Assert.IsTrue(this.result.StartTime.Subtract(DateTimeOffset.UtcNow) < new TimeSpan(0, 0, 0, 10));
-            Assert.IsTrue(this.result.EndTime.Subtract(DateTimeOffset.UtcNow) < new TimeSpan(0, 0, 0, 10));
-        }
-
-        #region GetSetPropertyValue Tests
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForComputerNameShouldReturnCorrectValue()
-        {
-            var testComputerName = "computerName";
-            this.result.ComputerName = testComputerName;
-
-            Assert.AreEqual(testComputerName, this.result.GetPropertyValue(TestResultProperties.ComputerName));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForDisplayNameShouldReturnCorrectValue()
-        {
-            var testDisplayName = "displayName";
-            this.result.DisplayName = testDisplayName;
-
-            Assert.AreEqual(testDisplayName, this.result.GetPropertyValue(TestResultProperties.DisplayName));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForDurationShouldReturnCorrectValue()
-        {
-            var testDuration = new TimeSpan(0, 0, 0, 10);
-            this.result.Duration = testDuration;
-
-            Assert.AreEqual(testDuration, this.result.GetPropertyValue(TestResultProperties.Duration));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForEndTimeShouldReturnCorrectValue()
-        {
-            var testEndTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 10, DateTimeKind.Utc));
-            this.result.EndTime = testEndTime;
-
-            Assert.AreEqual(testEndTime, this.result.GetPropertyValue(TestResultProperties.EndTime));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForErrorMessageShouldReturnCorrectValue()
-        {
-            var testErrorMessage = "error123";
-            this.result.ErrorMessage = testErrorMessage;
-
-            Assert.AreEqual(testErrorMessage, this.result.GetPropertyValue(TestResultProperties.ErrorMessage));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForErrorStackTraceShouldReturnCorrectValue()
-        {
-            var testErrorStackTrace = "errorStack";
-            this.result.ErrorStackTrace = testErrorStackTrace;
-
-            Assert.AreEqual(testErrorStackTrace, this.result.GetPropertyValue(TestResultProperties.ErrorStackTrace));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForTestOutcomeShouldReturnCorrectValue()
-        {
-            var testOutcome = TestOutcome.Passed;
-            this.result.Outcome = testOutcome;
-
-            Assert.AreEqual(testOutcome, this.result.GetPropertyValue(TestResultProperties.Outcome));
-        }
-
-        [TestMethod]
-        public void TestResultGetPropertyValueForStartTimeShouldReturnCorrectValue()
-        {
-            var testStartTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
-            this.result.StartTime = testStartTime;
-
-            Assert.AreEqual(testStartTime, this.result.GetPropertyValue(TestResultProperties.StartTime));
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForComputerNameShouldSetValue()
-        {
-            var testComputerName = "computerNameSet";
-            this.result.SetPropertyValue(TestResultProperties.ComputerName, testComputerName);
-
-            Assert.AreEqual(testComputerName, this.result.ComputerName);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForDisplayNameShouldSetValue()
-        {
-            var testDisplayName = "displayNameSet";
-            this.result.SetPropertyValue(TestResultProperties.DisplayName, testDisplayName);
-
-            Assert.AreEqual(testDisplayName, this.result.DisplayName);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForDurationShouldSetValue()
-        {
-            var testDuration = new TimeSpan(0, 0, 0, 20);
-            this.result.SetPropertyValue(TestResultProperties.Duration, testDuration);
-
-            Assert.AreEqual(testDuration, this.result.Duration);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForEndTimeShouldSetValue()
-        {
-            var testEndTime = new DateTimeOffset(new DateTime(2007, 5, 10, 0, 0, 10, DateTimeKind.Utc));
-            this.result.SetPropertyValue(TestResultProperties.EndTime, testEndTime);
-
-            Assert.AreEqual(testEndTime, this.result.EndTime);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForErrorMessageShouldSetValue()
-        {
-            var testErrorMessage = "error123Set";
-            this.result.SetPropertyValue(TestResultProperties.ErrorMessage, testErrorMessage);
-
-            Assert.AreEqual(testErrorMessage, this.result.ErrorMessage);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForErrorStackTraceShouldSetValue()
-        {
-            var testErrorStackTrace = "errorStackSet";
-            this.result.SetPropertyValue(TestResultProperties.ErrorStackTrace, testErrorStackTrace);
-
-            Assert.AreEqual(testErrorStackTrace, this.result.ErrorStackTrace);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForTestOutcomeShouldSetValue()
-        {
-            var testOutcome = TestOutcome.Failed;
-            this.result.SetPropertyValue(TestResultProperties.Outcome, testOutcome);
-
-            Assert.AreEqual(testOutcome, this.result.Outcome);
-        }
-
-        [TestMethod]
-        public void TestResultSetPropertyValueForStartTimeShouldSetValue()
-        {
-            var testStartTime = new DateTimeOffset(new DateTime(2007, 5, 10, 0, 0, 0, DateTimeKind.Utc));
-            this.result.SetPropertyValue(TestResultProperties.StartTime, testStartTime);
+    private readonly TestCase _testcase;
+    private readonly TestResult _result;
+
+    public TestResultTests()
+    {
+        _testcase = new TestCase("FQN", new Uri("http://dummyUri"), "dummySource");
+        _result = new TestResult(_testcase);
+    }
+
+    [TestMethod]
+    public void TestResultShouldInitializeEmptyAttachments()
+    {
+        Assert.AreEqual(0, _result.Attachments.Count);
+    }
+
+    [TestMethod]
+    public void TestResultShouldInitializeEmptyMessages()
+    {
+        Assert.AreEqual(0, _result.Messages.Count);
+    }
+
+    [TestMethod]
+    public void TestResultShouldInitializeStartAndEndTimeToCurrent()
+    {
+        Assert.IsTrue(_result.StartTime.Subtract(DateTimeOffset.UtcNow) < new TimeSpan(0, 0, 0, 10));
+        Assert.IsTrue(_result.EndTime.Subtract(DateTimeOffset.UtcNow) < new TimeSpan(0, 0, 0, 10));
+    }
+
+    #region GetSetPropertyValue Tests
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForComputerNameShouldReturnCorrectValue()
+    {
+        var testComputerName = "computerName";
+        _result.ComputerName = testComputerName;
+
+        Assert.AreEqual(testComputerName, _result.GetPropertyValue(TestResultProperties.ComputerName));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForDisplayNameShouldReturnCorrectValue()
+    {
+        var testDisplayName = "displayName";
+        _result.DisplayName = testDisplayName;
+
+        Assert.AreEqual(testDisplayName, _result.GetPropertyValue(TestResultProperties.DisplayName));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForDurationShouldReturnCorrectValue()
+    {
+        var testDuration = new TimeSpan(0, 0, 0, 10);
+        _result.Duration = testDuration;
+
+        Assert.AreEqual(testDuration, _result.GetPropertyValue(TestResultProperties.Duration));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForEndTimeShouldReturnCorrectValue()
+    {
+        var testEndTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 10, DateTimeKind.Utc));
+        _result.EndTime = testEndTime;
+
+        Assert.AreEqual(testEndTime, _result.GetPropertyValue(TestResultProperties.EndTime));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForErrorMessageShouldReturnCorrectValue()
+    {
+        var testErrorMessage = "error123";
+        _result.ErrorMessage = testErrorMessage;
+
+        Assert.AreEqual(testErrorMessage, _result.GetPropertyValue(TestResultProperties.ErrorMessage));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForErrorStackTraceShouldReturnCorrectValue()
+    {
+        var testErrorStackTrace = "errorStack";
+        _result.ErrorStackTrace = testErrorStackTrace;
+
+        Assert.AreEqual(testErrorStackTrace, _result.GetPropertyValue(TestResultProperties.ErrorStackTrace));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForTestOutcomeShouldReturnCorrectValue()
+    {
+        var testOutcome = TestOutcome.Passed;
+        _result.Outcome = testOutcome;
+
+        Assert.AreEqual(testOutcome, _result.GetPropertyValue(TestResultProperties.Outcome));
+    }
+
+    [TestMethod]
+    public void TestResultGetPropertyValueForStartTimeShouldReturnCorrectValue()
+    {
+        var testStartTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
+        _result.StartTime = testStartTime;
+
+        Assert.AreEqual(testStartTime, _result.GetPropertyValue(TestResultProperties.StartTime));
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForComputerNameShouldSetValue()
+    {
+        var testComputerName = "computerNameSet";
+        _result.SetPropertyValue(TestResultProperties.ComputerName, testComputerName);
+
+        Assert.AreEqual(testComputerName, _result.ComputerName);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForDisplayNameShouldSetValue()
+    {
+        var testDisplayName = "displayNameSet";
+        _result.SetPropertyValue(TestResultProperties.DisplayName, testDisplayName);
+
+        Assert.AreEqual(testDisplayName, _result.DisplayName);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForDurationShouldSetValue()
+    {
+        var testDuration = new TimeSpan(0, 0, 0, 20);
+        _result.SetPropertyValue(TestResultProperties.Duration, testDuration);
+
+        Assert.AreEqual(testDuration, _result.Duration);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForEndTimeShouldSetValue()
+    {
+        var testEndTime = new DateTimeOffset(new DateTime(2007, 5, 10, 0, 0, 10, DateTimeKind.Utc));
+        _result.SetPropertyValue(TestResultProperties.EndTime, testEndTime);
+
+        Assert.AreEqual(testEndTime, _result.EndTime);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForErrorMessageShouldSetValue()
+    {
+        var testErrorMessage = "error123Set";
+        _result.SetPropertyValue(TestResultProperties.ErrorMessage, testErrorMessage);
+
+        Assert.AreEqual(testErrorMessage, _result.ErrorMessage);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForErrorStackTraceShouldSetValue()
+    {
+        var testErrorStackTrace = "errorStackSet";
+        _result.SetPropertyValue(TestResultProperties.ErrorStackTrace, testErrorStackTrace);
+
+        Assert.AreEqual(testErrorStackTrace, _result.ErrorStackTrace);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForTestOutcomeShouldSetValue()
+    {
+        var testOutcome = TestOutcome.Failed;
+        _result.SetPropertyValue(TestResultProperties.Outcome, testOutcome);
 
-            Assert.AreEqual(testStartTime, this.result.StartTime);
-        }
-
-        #endregion
+        Assert.AreEqual(testOutcome, _result.Outcome);
+    }
+
+    [TestMethod]
+    public void TestResultSetPropertyValueForStartTimeShouldSetValue()
+    {
+        var testStartTime = new DateTimeOffset(new DateTime(2007, 5, 10, 0, 0, 0, DateTimeKind.Utc));
+        _result.SetPropertyValue(TestResultProperties.StartTime, testStartTime);
 
+        Assert.AreEqual(testStartTime, _result.StartTime);
     }
+
+    #endregion
+
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs
index bee3795169..5e4524e87a 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/AssemblyHelperTests.cs
@@ -3,75 +3,91 @@
 
 #if NETFRAMEWORK
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities
+using System;
+using System.Reflection;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
+
+[TestClass]
+public class AssemblyHelperTests
 {
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System;
-
-    [TestClass]
-    public class AssemblyHelperTests
+    private readonly Mock<IRunContext> _runContext;
+    private readonly Mock<IRunSettings> _runSettings;
+
+    public AssemblyHelperTests()
+    {
+        _runContext = new Mock<IRunContext>();
+        _runSettings = new Mock<IRunSettings>();
+    }
+
+    [TestMethod]
+    public void SetNetFrameworkCompatiblityModeShouldSetAppDomainTargetFrameWorkWhenFramework40()
+    {
+        _runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>Framework40</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
+        _runContext.Setup(rc => rc.RunSettings).Returns(_runSettings.Object);
+        AppDomainSetup appDomainSetup = new();
+
+        AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, _runContext.Object);
+
+        Assert.AreEqual(".NETFramework,Version=v4.0", appDomainSetup.TargetFrameworkName);
+    }
+
+    [TestMethod]
+    public void SetNetFrameworkCompatiblityModeShouldSetAppDomainTargetFrameWorkWhenNetFrameworkVersionv40()
+    {
+        _runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
+        _runContext.Setup(rc => rc.RunSettings).Returns(_runSettings.Object);
+        AppDomainSetup appDomainSetup = new();
+
+        AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, _runContext.Object);
+
+        Assert.AreEqual(".NETFramework,Version=v4.0", appDomainSetup.TargetFrameworkName);
+    }
+
+    [TestMethod]
+    public void SetNetFrameworkCompatiblityModeShouldNotSetAppDomainTargetFrameWorkWhenFramework45()
+    {
+        _runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>Framework45</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
+        _runContext.Setup(rc => rc.RunSettings).Returns(_runSettings.Object);
+        AppDomainSetup appDomainSetup = new();
+
+        AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, _runContext.Object);
+
+        Assert.IsNull(appDomainSetup.TargetFrameworkName);
+    }
+
+    [TestMethod]
+    public void SetNetFrameworkCompatiblityModeShouldNotSetAppDomainTargetFrameWorkWhenNetFrameworkVersionv45()
+    {
+        Mock<IRunContext> runContext = new();
+        Mock<IRunSettings> runSettings = new();
+        runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
+        runContext.Setup(rc => rc.RunSettings).Returns(runSettings.Object);
+        AppDomainSetup appDomainSetup = new();
+
+        AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, runContext.Object);
+
+        Assert.IsNull(appDomainSetup.TargetFrameworkName);
+    }
+
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    public void DoesReferencesAssemblyWhenSourceIsNullOrEmptyReturnsNull(string source)
+    {
+        Assert.IsNull(AssemblyHelper.DoesReferencesAssembly(source, AssemblyName.GetAssemblyName(Assembly.GetExecutingAssembly().Location)));
+    }
+
+    [TestMethod]
+    public void DoesReferencesAssemblyWhenReferenceAssemblyIsNullReturnsNull()
     {
-        private Mock<IRunContext> runContext;
-        private Mock<IRunSettings> runSettings;
-
-        public AssemblyHelperTests()
-        {
-            this.runContext = new Mock<IRunContext>();
-            this.runSettings = new Mock<IRunSettings>();
-        }
-
-        [TestMethod]
-        public void SetNETFrameworkCompatiblityModeShouldSetAppDomainTargetFrameWorkWhenFramework40()
-        {
-            this.runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>Framework40</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
-            this.runContext.Setup(rc => rc.RunSettings).Returns(runSettings.Object);
-            AppDomainSetup appDomainSetup = new AppDomainSetup();
-
-            AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, runContext.Object);
-
-            Assert.AreEqual(".NETFramework,Version=v4.0", appDomainSetup.TargetFrameworkName);
-        }
-
-        [TestMethod]
-        public void SetNETFrameworkCompatiblityModeShouldSetAppDomainTargetFrameWorkWhenNETFrameworkVersionv40()
-        {
-            this.runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
-            this.runContext.Setup(rc => rc.RunSettings).Returns(runSettings.Object);
-            AppDomainSetup appDomainSetup = new AppDomainSetup();
-
-            AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, runContext.Object);
-
-            Assert.AreEqual(".NETFramework,Version=v4.0", appDomainSetup.TargetFrameworkName);
-        }
-
-        [TestMethod]
-        public void SetNETFrameworkCompatiblityModeShouldNotSetAppDomainTargetFrameWorkWhenFramework45()
-        {
-            this.runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>Framework45</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
-            this.runContext.Setup(rc => rc.RunSettings).Returns(runSettings.Object);
-            AppDomainSetup appDomainSetup = new AppDomainSetup();
-
-            AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, runContext.Object);
-
-            Assert.IsNull(appDomainSetup.TargetFrameworkName);
-        }
-
-        [TestMethod]
-        public void SetNETFrameworkCompatiblityModeShouldNotSetAppDomainTargetFrameWorkWhenNETFrameworkVersionv45()
-        {
-            Mock<IRunContext> runContext = new Mock<IRunContext>();
-            Mock<IRunSettings> runSettings = new Mock<IRunSettings>();
-            runSettings.Setup(rs => rs.SettingsXml).Returns(@"<RunSettings> <RunConfiguration> <TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion> </RunConfiguration> </RunSettings>");
-            runContext.Setup(rc => rc.RunSettings).Returns(runSettings.Object);
-            AppDomainSetup appDomainSetup = new AppDomainSetup();
-
-            AssemblyHelper.SetNETFrameworkCompatiblityMode(appDomainSetup, runContext.Object);
-
-            Assert.IsNull(appDomainSetup.TargetFrameworkName);
-        }
+        Assert.IsNull(AssemblyHelper.DoesReferencesAssembly("C:\\some.dll", null!));
     }
 }
 #endif
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs
index a6a9e2b452..b167362632 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/FilterHelperTests.cs
@@ -1,81 +1,82 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities
-{
-    using System;
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class FilterHelpersTests
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
+
+[TestClass]
+public class FilterHelpersTests
+{
+    [TestMethod]
+    public void EscapeUnescapeNullThrowsArgumentNullException()
     {
-        [TestMethod]
-        public void EscapeUnescapeNullThrowsArgumentNullException()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => FilterHelper.Escape(null));
-            Assert.ThrowsException<ArgumentNullException>(() => FilterHelper.Unescape(null));
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => FilterHelper.Escape(null!));
+        Assert.ThrowsException<ArgumentNullException>(() => FilterHelper.Unescape(null!));
+    }
 
-        [TestMethod]
-        public void EscapeUnescapeEmptyString()
-        {
-            Assert.AreEqual(string.Empty, FilterHelper.Escape(string.Empty));
-            Assert.AreEqual(string.Empty, FilterHelper.Unescape(string.Empty));
-        }
+    [TestMethod]
+    public void EscapeUnescapeEmptyString()
+    {
+        Assert.AreEqual(string.Empty, FilterHelper.Escape(string.Empty));
+        Assert.AreEqual(string.Empty, FilterHelper.Unescape(string.Empty));
+    }
 
-        [TestMethod]
-        public void EscapeUnescapeStringWithoutSpecialCharacters()
-        {
-            var str = "TestNamespace.TestClass.TestMethod";
-            Assert.AreEqual(str, FilterHelper.Escape(str));
-            Assert.AreEqual(str, FilterHelper.Unescape(str));
-        }
+    [TestMethod]
+    public void EscapeUnescapeStringWithoutSpecialCharacters()
+    {
+        var str = "TestNamespace.TestClass.TestMethod";
+        Assert.AreEqual(str, FilterHelper.Escape(str));
+        Assert.AreEqual(str, FilterHelper.Unescape(str));
+    }
 
-        [TestMethod]
-        public void EscapeUnescapeStringWithParenthesis()
-        {
-            var value = "TestClass(1).TestMethod(2)";
-            var escapedValue = FilterHelper.Escape(value);
+    [TestMethod]
+    public void EscapeUnescapeStringWithParenthesis()
+    {
+        var value = "TestClass(1).TestMethod(2)";
+        var escapedValue = FilterHelper.Escape(value);
 
-            Assert.AreEqual(@"TestClass\(1\).TestMethod\(2\)", escapedValue);
-            Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
-        }
+        Assert.AreEqual(@"TestClass\(1\).TestMethod\(2\)", escapedValue);
+        Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
+    }
 
-        [TestMethod]
-        public void EscapeUnescapeStringWithSpecialCharacters()
-        {
-            var value = @"TestClass(""a | b"").TestMethod(""x != y"")";
-            var escapedValue = @"TestClass\(""a \| b""\).TestMethod\(""x \!\= y""\)";
+    [TestMethod]
+    public void EscapeUnescapeStringWithSpecialCharacters()
+    {
+        var value = @"TestClass(""a | b"").TestMethod(""x != y"")";
+        var escapedValue = @"TestClass\(""a \| b""\).TestMethod\(""x \!\= y""\)";
 
-            Assert.AreEqual(escapedValue, FilterHelper.Escape(value));
-            Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
-        }
+        Assert.AreEqual(escapedValue, FilterHelper.Escape(value));
+        Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
+    }
 
-        [TestMethod]
-        public void EscapeUnescapeStringWithPrefix()
-        {
-            var value = @"printf(""\r\n"")";
-            var escapedValue = @"printf\(""\\r\\n""\)";
+    [TestMethod]
+    public void EscapeUnescapeStringWithPrefix()
+    {
+        var value = @"printf(""\r\n"")";
+        var escapedValue = @"printf\(""\\r\\n""\)";
 
-            Assert.AreEqual(escapedValue, FilterHelper.Escape(value));
-            Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
-        }
+        Assert.AreEqual(escapedValue, FilterHelper.Escape(value));
+        Assert.AreEqual(value, FilterHelper.Unescape(escapedValue));
+    }
 
-        [TestMethod]
-        public void UnescapeForInvalidStringThrowsArgumentException1()
-        {
-            var invalidString = @"TestClass\$""a %4 b""%2.TestMethod";
-            Assert.ThrowsException<ArgumentException>(() => FilterHelper.Unescape(invalidString), string.Format(CultureInfo.CurrentCulture, Resources.TestCaseFilterEscapeException, invalidString));
-        }
+    [TestMethod]
+    public void UnescapeForInvalidStringThrowsArgumentException1()
+    {
+        var invalidString = @"TestClass\$""a %4 b""%2.TestMethod";
+        Assert.ThrowsException<ArgumentException>(() => FilterHelper.Unescape(invalidString), string.Format(CultureInfo.CurrentCulture, Resources.TestCaseFilterEscapeException, invalidString));
+    }
 
-        [TestMethod]
-        public void UnescapeForInvalidStringThrowsArgumentException2()
-        {
-            var invalidString = @"TestClass\";
-            Assert.ThrowsException<ArgumentException>(() => FilterHelper.Unescape(invalidString), string.Format(CultureInfo.CurrentCulture, Resources.TestCaseFilterEscapeException, invalidString));
-        }
+    [TestMethod]
+    public void UnescapeForInvalidStringThrowsArgumentException2()
+    {
+        var invalidString = @"TestClass\";
+        Assert.ThrowsException<ArgumentException>(() => FilterHelper.Unescape(invalidString), string.Format(CultureInfo.CurrentCulture, Resources.TestCaseFilterEscapeException, invalidString));
     }
 }
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs
index 835354ade6..11e62c213a 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Utilities/XmlRunSettingsUtilitiesTests.cs
@@ -2,23 +2,24 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Xml;
 
-namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.ObjectModel.UnitTests.Utilities;
+
+[TestClass]
+public class XmlRunSettingsUtilitiesTests
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class XmlRunSettingsUtilitiesTests
-    {
-        #region Private Variables
+    #region Private Variables
 
-        private readonly string runSettingsXmlWithDataCollectors = @"<RunSettings>
+    private readonly string _runSettingsXmlWithDataCollectors = @"<RunSettings>
 <RunConfiguration>
 </RunConfiguration>
   <DataCollectionRunSettings>
@@ -38,7 +39,7 @@ public class XmlRunSettingsUtilitiesTests
   </DataCollectionRunSettings>
 </RunSettings>";
 
-        private readonly string runSettingsXmlWithDataCollectorsDisabled = @"<RunSettings>
+    private readonly string _runSettingsXmlWithDataCollectorsDisabled = @"<RunSettings>
 <RunConfiguration>
 </RunConfiguration>
   <DataCollectionRunSettings>
@@ -58,7 +59,7 @@ public class XmlRunSettingsUtilitiesTests
   </DataCollectionRunSettings>
 </RunSettings>";
 
-        private readonly string runSettingsXmlWithIncorrectDataCollectorSettings = @"<RunSettings>
+    private readonly string _runSettingsXmlWithIncorrectDataCollectorSettings = @"<RunSettings>
 <RunConfiguration>
 </RunConfiguration>
   <DataCollectionRunSettings>
@@ -78,25 +79,25 @@ public class XmlRunSettingsUtilitiesTests
   </DataCollectionRunSettings>
 </RunSettings>";
 
-        private readonly string EmptyRunSettings = "<RunSettings></RunSettings>";
+    private readonly string _emptyRunSettings = "<RunSettings></RunSettings>";
 
-        #endregion
+    #endregion
 
-        #region GetTestRunParameters tests
+    #region GetTestRunParameters tests
 
-        [TestMethod]
-        public void GetTestRunParametersReturnsEmptyDictionaryOnNullRunSettings()
-        {
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(null);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(0, trp.Count);
-        }
+    [TestMethod]
+    public void GetTestRunParametersReturnsEmptyDictionaryOnNullRunSettings()
+    {
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(null);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(0, trp.Count);
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersReturnsEmptyDictionaryWhenNoTestRunParameters()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersReturnsEmptyDictionaryWhenNoTestRunParameters()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -105,16 +106,16 @@ public void GetTestRunParametersReturnsEmptyDictionaryWhenNoTestRunParameters()
                      </RunConfiguration>
                 </RunSettings>";
 
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(0, trp.Count);
-        }
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(0, trp.Count);
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersReturnsEmptyDictionaryForEmptyTestRunParametersNode()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersReturnsEmptyDictionaryForEmptyTestRunParametersNode()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -125,16 +126,16 @@ public void GetTestRunParametersReturnsEmptyDictionaryForEmptyTestRunParametersN
                      </TestRunParameters>
                 </RunSettings>";
 
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(0, trp.Count);
-        }
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(0, trp.Count);
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersReturns1EntryOn1TestRunParameter()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersReturns1EntryOn1TestRunParameter()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -146,20 +147,20 @@ public void GetTestRunParametersReturns1EntryOn1TestRunParameter()
                      </TestRunParameters>
                 </RunSettings>";
 
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(1, trp.Count);
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(1, trp.Count);
 
-            // Verify Parameter Values.
-            Assert.IsTrue(trp.ContainsKey("webAppUrl"));
-            Assert.AreEqual("http://localhost", trp["webAppUrl"]);
-        }
+        // Verify Parameter Values.
+        Assert.IsTrue(trp.ContainsKey("webAppUrl"));
+        Assert.AreEqual("http://localhost", trp["webAppUrl"]);
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersReturns3EntryOn3TestRunParameter()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersReturns3EntryOn3TestRunParameter()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -173,24 +174,24 @@ public void GetTestRunParametersReturns3EntryOn3TestRunParameter()
                      </TestRunParameters>
                 </RunSettings>";
 
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(3, trp.Count);
-
-            // Verify Parameter Values.
-            Assert.IsTrue(trp.ContainsKey("webAppUrl"));
-            Assert.AreEqual("http://localhost", trp["webAppUrl"]);
-            Assert.IsTrue(trp.ContainsKey("webAppUserName"));
-            Assert.AreEqual("Admin", trp["webAppUserName"]);
-            Assert.IsTrue(trp.ContainsKey("webAppPassword"));
-            Assert.AreEqual("Password",trp["webAppPassword"]);
-        }
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(3, trp.Count);
+
+        // Verify Parameter Values.
+        Assert.IsTrue(trp.ContainsKey("webAppUrl"));
+        Assert.AreEqual("http://localhost", trp["webAppUrl"]);
+        Assert.IsTrue(trp.ContainsKey("webAppUserName"));
+        Assert.AreEqual("Admin", trp["webAppUserName"]);
+        Assert.IsTrue(trp.ContainsKey("webAppPassword"));
+        Assert.AreEqual("Password", trp["webAppPassword"]);
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersThrowsWhenTRPNodeHasAttributes()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersThrowsWhenTrpNodeHasAttributes()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -202,14 +203,14 @@ public void GetTestRunParametersThrowsWhenTRPNodeHasAttributes()
                      </TestRunParameters>
                 </RunSettings>";
 
-            Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetTestRunParameters(settingsXml));
-        }
+        Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetTestRunParameters(settingsXml));
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersThrowsWhenTRPNodeHasNonParameterTypeChildNodes()
-        {
-            string settingsXml =
-               @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersThrowsWhenTrpNodeHasNonParameterTypeChildNodes()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -222,14 +223,14 @@ public void GetTestRunParametersThrowsWhenTRPNodeHasNonParameterTypeChildNodes()
                      </TestRunParameters>
                 </RunSettings>";
 
-            Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetTestRunParameters(settingsXml));
-        }
+        Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetTestRunParameters(settingsXml));
+    }
 
-        [TestMethod]
-        public void GetTestRunParametersIgnoresMalformedKeyValues()
-        {
-            string settingsXml =
-               @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetTestRunParametersIgnoresMalformedKeyValues()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                      <RunConfiguration>
                        <ResultsDirectory>.\TestResults</ResultsDirectory>
@@ -241,15 +242,15 @@ public void GetTestRunParametersIgnoresMalformedKeyValues()
                      </TestRunParameters>
                 </RunSettings>";
 
-            Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
-            Assert.IsNotNull(trp);
-            Assert.AreEqual(0, trp.Count);
-        }
+        Dictionary<string, object> trp = XmlRunSettingsUtilities.GetTestRunParameters(settingsXml);
+        Assert.IsNotNull(trp);
+        Assert.AreEqual(0, trp.Count);
+    }
 
-        [TestMethod]
-        public void GetInProcDataCollectionRunSettingsFromSettings()
-        {
-            string settingsXml= @"<RunSettings>
+    [TestMethod]
+    public void GetInProcDataCollectionRunSettingsFromSettings()
+    {
+        string settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\repos\MSTest\src\managed\TestPlatform\TestImpactListener.Tests\bin\Debug\TestImpactListener.Tests.dll'>
@@ -260,15 +261,15 @@ public void GetInProcDataCollectionRunSettingsFromSettings()
                                         </InProcDataCollectors>
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
-            var inProcDCRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settingsXml);
-            Assert.IsNotNull(inProcDCRunSettings);
-            Assert.AreEqual(1, inProcDCRunSettings.DataCollectorSettingsList.Count);
-        }
+        var inProcDcRunSettings = XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settingsXml);
+        Assert.IsNotNull(inProcDcRunSettings);
+        Assert.AreEqual(1, inProcDcRunSettings.DataCollectorSettingsList.Count);
+    }
 
-        [TestMethod]
-        public void GetInProcDataCollectionRunSettingsThrowsExceptionWhenXMLNotValid()
-        {
-            string settingsXml = @"<RunSettings>
+    [TestMethod]
+    public void GetInProcDataCollectionRunSettingsThrowsExceptionWhenXmlNotValid()
+    {
+        string settingsXml = @"<RunSettings>
                                     <InProcDataCollectionRunSettings>
                                         <InProcDataCollectors>
                                             <InProcDataCollector friendlyNames='Test Impact' uris='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='TestImpactListener.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7ccb7239ffde675a'  codebase='E:\repos\MSTest\src\managed\TestPlatform\TestImpactListener.Tests\bin\Debug\TestImpactListener.Tests.dll'>
@@ -280,100 +281,100 @@ public void GetInProcDataCollectionRunSettingsThrowsExceptionWhenXMLNotValid()
                                     </InProcDataCollectionRunSettings>
                                 </RunSettings>";
 
-            Assert.ThrowsException<SettingsException>(
-                () => XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settingsXml));
-        }
-        #endregion
+        Assert.ThrowsException<SettingsException>(
+            () => XmlRunSettingsUtilities.GetInProcDataCollectionRunSettings(settingsXml));
+    }
+    #endregion
 
-        #region CreateDefaultRunSettings tests
+    #region CreateDefaultRunSettings tests
 
-        [TestMethod]
-        public void CreateDefaultRunSettingsShouldReturnABasicRunSettings()
-        {
-            var defaultRunSettings = XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator().OuterXml;
-            var expectedRunSettings = string.Join(Environment.NewLine, 
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors />",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"
-            );
-
-            Assert.AreEqual(expectedRunSettings, defaultRunSettings);
-        }
+    [TestMethod]
+    public void CreateDefaultRunSettingsShouldReturnABasicRunSettings()
+    {
+        var defaultRunSettings = XmlRunSettingsUtilities.CreateDefaultRunSettings().CreateNavigator()!.OuterXml;
+        var expectedRunSettings = string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors />",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"
+        );
+
+        Assert.AreEqual(expectedRunSettings, defaultRunSettings);
+    }
 
-        #endregion
+    #endregion
 
-        #region IsDataCollectionEnabled tests
+    #region IsDataCollectionEnabled tests
 
-        [TestMethod]
-        public void IsDataCollectionEnabledShouldReturnFalseIfRunSettingsIsNull()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(null));
-        }
+    [TestMethod]
+    public void IsDataCollectionEnabledShouldReturnFalseIfRunSettingsIsNull()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(null));
+    }
 
-        [TestMethod]
-        public void IsDataCollectionEnabledShouldReturnFalseIfDataCollectionNodeIsNotPresent()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(EmptyRunSettings));
-        }
+    [TestMethod]
+    public void IsDataCollectionEnabledShouldReturnFalseIfDataCollectionNodeIsNotPresent()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(_emptyRunSettings));
+    }
 
-        [TestMethod]
-        public void IsDataCollectionEnabledShouldReturnFalseIfDataCollectionIsDisabled()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(this.runSettingsXmlWithDataCollectorsDisabled));
-        }
+    [TestMethod]
+    public void IsDataCollectionEnabledShouldReturnFalseIfDataCollectionIsDisabled()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsDataCollectionEnabled(_runSettingsXmlWithDataCollectorsDisabled));
+    }
 
 
-        [TestMethod]
-        public void IsDataCollectionEnabledShouldReturnTrueIfDataCollectionIsEnabled()
-        {
-            Assert.IsTrue(XmlRunSettingsUtilities.IsDataCollectionEnabled(this.runSettingsXmlWithDataCollectors));
-        }
+    [TestMethod]
+    public void IsDataCollectionEnabledShouldReturnTrueIfDataCollectionIsEnabled()
+    {
+        Assert.IsTrue(XmlRunSettingsUtilities.IsDataCollectionEnabled(_runSettingsXmlWithDataCollectors));
+    }
 
-        #endregion
+    #endregion
 
-        #region IsInProcDataCollectionEnabled tests.
+    #region IsInProcDataCollectionEnabled tests.
 
-        [TestMethod]
-        public void IsInProcDataCollectionEnabledShouldReturnFalseIfRunSettingsIsNull()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(null));
-        }
+    [TestMethod]
+    public void IsInProcDataCollectionEnabledShouldReturnFalseIfRunSettingsIsNull()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(null));
+    }
 
-        [TestMethod]
-        public void IsInProcDataCollectionEnabledShouldReturnFalseIfDataCollectionNodeIsNotPresent()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(EmptyRunSettings));
-        }
+    [TestMethod]
+    public void IsInProcDataCollectionEnabledShouldReturnFalseIfDataCollectionNodeIsNotPresent()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(_emptyRunSettings));
+    }
 
-        [TestMethod]
-        public void IsInProcDataCollectionEnabledShouldReturnFalseIfDataCollectionIsDisabled()
-        {
-            Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(this.ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(this.runSettingsXmlWithDataCollectorsDisabled)));
-        }
+    [TestMethod]
+    public void IsInProcDataCollectionEnabledShouldReturnFalseIfDataCollectionIsDisabled()
+    {
+        Assert.IsFalse(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(_runSettingsXmlWithDataCollectorsDisabled)));
+    }
 
-        [TestMethod]
-        public void IsInProcDataCollectionEnabledShouldReturnTrueIfDataCollectionIsEnabled()
-        {
-            Assert.IsTrue(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(this.ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(this.runSettingsXmlWithDataCollectors)));
-        }
+    [TestMethod]
+    public void IsInProcDataCollectionEnabledShouldReturnTrueIfDataCollectionIsEnabled()
+    {
+        Assert.IsTrue(XmlRunSettingsUtilities.IsInProcDataCollectionEnabled(ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(_runSettingsXmlWithDataCollectors)));
+    }
 
-        #endregion
+    #endregion
 
-        #region GetLoggerRunsettings tests
+    #region GetLoggerRunsettings tests
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnNullWhenSettingsIsnull()
-        {
-            Assert.IsNull(XmlRunSettingsUtilities.GetLoggerRunSettings(null));
-        }
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnNullWhenSettingsIsnull()
+    {
+        Assert.IsNull(XmlRunSettingsUtilities.GetLoggerRunSettings(null));
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingShouldReturnNullWhenNoLoggersPresent()
-        {
-            string runSettingsXmlWithNoLoggers =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingShouldReturnNullWhenNoLoggersPresent()
+    {
+        string runSettingsXmlWithNoLoggers =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -394,14 +395,14 @@ public void GetLoggerRunSettingShouldReturnNullWhenNoLoggersPresent()
                   </DataCollectionRunSettings>
                 </RunSettings>";
 
-            Assert.IsNull(XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsXmlWithNoLoggers));
-        }
+        Assert.IsNull(XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsXmlWithNoLoggers));
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldNotReturnNullWhenLoggersPresent()
-        {
-            string runSettingsWithLoggerHavingFriendlyName =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldNotReturnNullWhenLoggersPresent()
+    {
+        string runSettingsWithLoggerHavingFriendlyName =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -412,14 +413,14 @@ public void GetLoggerRunSettingsShouldNotReturnNullWhenLoggersPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            Assert.IsNotNull(XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingFriendlyName));
-        }
+        Assert.IsNotNull(XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingFriendlyName));
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectFriendlyName()
-        {
-            string runSettingsWithLoggerHavingFriendlyName =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectFriendlyName()
+    {
+        string runSettingsWithLoggerHavingFriendlyName =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -430,15 +431,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectFriendlyName()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingFriendlyName);
-            Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingFriendlyName)!;
+        Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectUri()
-        {
-            string runSettingsWithLoggerHavingUri =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectUri()
+    {
+        string runSettingsWithLoggerHavingUri =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -449,15 +450,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectUri()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingUri);
-            Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingUri)!;
+        Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenInvalidUri()
-        {
-            string runSettingsWithInvalidUri =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenInvalidUri()
+    {
+        string runSettingsWithInvalidUri =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -468,29 +469,30 @@ public void GetLoggerRunSettingsShouldThrowWhenInvalidUri()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidUri);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(
-                string.Format(
-                    Resources.InvalidUriInSettings,
-                    "invalidUri",
-                    "Logger")));
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectAssemblyQualifiedName()
+        try
         {
-            string runSettingsWithLoggerHavingAssemblyQualifiedName =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidUri);
+        }
+        catch (SettingsException ex)
+        {
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(
+            string.Format(
+                CultureInfo.CurrentCulture,
+                Resources.InvalidUriInSettings,
+                "invalidUri",
+                "Logger")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectAssemblyQualifiedName()
+    {
+        string runSettingsWithLoggerHavingAssemblyQualifiedName =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -501,15 +503,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectAssemblyQualifiedNa
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAssemblyQualifiedName);
-            Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAssemblyQualifiedName)!;
+        Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectCodeBase()
-        {
-            string runSettingsWithLoggerHavingAssemblyQualifiedName =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectCodeBase()
+    {
+        string runSettingsWithLoggerHavingAssemblyQualifiedName =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -520,15 +522,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectCodeBase()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAssemblyQualifiedName);
-            Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAssemblyQualifiedName)!;
+        Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectEnabledAttributeValue()
-        {
-            string runSettingsWithLoggerHavingEnabledAttribute =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectEnabledAttributeValue()
+    {
+        string runSettingsWithLoggerHavingEnabledAttribute =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -539,15 +541,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectEnabledAttributeVal
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingEnabledAttribute);
-            Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingEnabledAttribute)!;
+        Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithEnabledFalseIfInvalidEnabledValue()
-        {
-            string runSettingsWithLoggerHavingInvalidEnabledValue =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithEnabledFalseIfInvalidEnabledValue()
+    {
+        string runSettingsWithLoggerHavingInvalidEnabledValue =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -558,15 +560,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithEnabledFalseIfInvalidEnabl
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingInvalidEnabledValue);
-            Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingInvalidEnabledValue)!;
+        Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerAsEnabledWhenEnabledAttributeNotPresent()
-        {
-            string runSettingsWithLoggerHavingEnabledAttribute =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerAsEnabledWhenEnabledAttributeNotPresent()
+    {
+        string runSettingsWithLoggerHavingEnabledAttribute =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -577,15 +579,15 @@ public void GetLoggerRunSettingsShouldReturnLoggerAsEnabledWhenEnabledAttributeN
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingEnabledAttribute);
-            Assert.IsTrue(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingEnabledAttribute)!;
+        Assert.IsTrue(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowIfDuplicateAttributesPresent()
-        {
-            string runSettingsWithLoggerHavingDuplicateAttributes =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowIfDuplicateAttributesPresent()
+    {
+        string runSettingsWithLoggerHavingDuplicateAttributes =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -596,25 +598,25 @@ public void GetLoggerRunSettingsShouldThrowIfDuplicateAttributesPresent()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
+        var exceptionMessage = string.Empty;
 
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingDuplicateAttributes);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(CommonResources.MalformedRunSettingsFile));
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingDuplicateAttributes);
         }
-
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenMultipleAttributesPresent()
+        catch (SettingsException ex)
         {
-            string runSettingsWithLoggerHavingMultipleAttributes =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(CommonResources.MalformedRunSettingsFile));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenMultipleAttributesPresent()
+    {
+        string runSettingsWithLoggerHavingMultipleAttributes =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -625,19 +627,19 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenMultipleA
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingMultipleAttributes);
-            Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
-            Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
-            Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
-            Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
-            Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingMultipleAttributes)!;
+        Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
+        Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
+        Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
+        Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
+        Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenCaseSensitivityNotMaintained()
-        {
-            string runSettingsWithLoggerHavingAttributesWithRandomCasing =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenCaseSensitivityNotMaintained()
+    {
+        string runSettingsWithLoggerHavingAttributesWithRandomCasing =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -648,19 +650,19 @@ public void GetLoggerRunSettingsShouldReturnLoggerWithCorrectValuesWhenCaseSensi
                   </loGGerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAttributesWithRandomCasing);
-            Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
-            Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
-            Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
-            Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
-            Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithLoggerHavingAttributesWithRandomCasing)!;
+        Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList.First().FriendlyName);
+        Assert.IsTrue(new Uri("testlogger://logger").Equals(loggerRunSettings.LoggerSettingsList.First().Uri));
+        Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerRunSettings.LoggerSettingsList.First().AssemblyQualifiedName);
+        Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerRunSettings.LoggerSettingsList.First().CodeBase);
+        Assert.IsFalse(loggerRunSettings.LoggerSettingsList.First().IsEnabled);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowShouldThrowOnMalformedLoggerSettings()
-        {
-            string runSettingsXmlWithMalformedLoggerSettings =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowShouldThrowOnMalformedLoggerSettings()
+    {
+        string runSettingsXmlWithMalformedLoggerSettings =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -671,25 +673,25 @@ public void GetLoggerRunSettingsShouldThrowShouldThrowOnMalformedLoggerSettings(
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsXmlWithMalformedLoggerSettings);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
+        var exceptionMessage = string.Empty;
 
-            Assert.IsTrue(exceptionMessage.Contains(CommonResources.MalformedRunSettingsFile));
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsXmlWithMalformedLoggerSettings);
         }
-
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggerRunSettingsNode()
+        catch (SettingsException ex)
         {
-            string runSettingsWithAttributesPresentInLoggerRunSettingsNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(CommonResources.MalformedRunSettingsFile));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggerRunSettingsNode()
+    {
+        string runSettingsWithAttributesPresentInLoggerRunSettingsNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -700,28 +702,29 @@ public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggerRunSetti
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithAttributesPresentInLoggerRunSettingsNode);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(string.Format(
-                Resources.InvalidSettingsXmlAttribute,
-                "LoggerRunSettings",
-                "name")));
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnEmptyLoggerRunSettingsWhenLoggerRunSettingsNodeIsEmpty()
+        try
         {
-            string runSettingsWithEmptyLoggerRunSettingsNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithAttributesPresentInLoggerRunSettingsNode);
+        }
+        catch (SettingsException ex)
+        {
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlAttribute,
+            "LoggerRunSettings",
+            "name")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnEmptyLoggerRunSettingsWhenLoggerRunSettingsNodeIsEmpty()
+    {
+        string runSettingsWithEmptyLoggerRunSettingsNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -729,30 +732,30 @@ public void GetLoggerRunSettingsShouldReturnEmptyLoggerRunSettingsWhenLoggerRunS
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggerRunSettingsNode);
-            Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggerRunSettingsNode)!;
+        Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnEmptyLoggerRunSettingsWhenLoggerRunSettingsNodeIsSelfEnding()
-        {
-            string runSettingsWithEmptyLoggerRunSettingsNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnEmptyLoggerRunSettingsWhenLoggerRunSettingsNodeIsSelfEnding()
+    {
+        string runSettingsWithEmptyLoggerRunSettingsNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
                   <LoggerRunSettings />
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggerRunSettingsNode);
-            Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggerRunSettingsNode)!;
+        Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggersPresentInLoggerRunSettings()
-        {
-            string runSettingsWithNodeOtherLoggers =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggersPresentInLoggerRunSettings()
+    {
+        string runSettingsWithNodeOtherLoggers =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -763,28 +766,29 @@ public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggersPresentInLogg
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNodeOtherLoggers);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(string.Format(
-                Resources.InvalidSettingsXmlElement,
-                "LoggerRUNSettings",
-                "LoggersInvalid")));
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggersNode()
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNodeOtherLoggers);
+        }
+        catch (SettingsException ex)
         {
-            string runSettingsWithAttributesPresentInLoggersNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlElement,
+            "LoggerRUNSettings",
+            "LoggersInvalid")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggersNode()
+    {
+        string runSettingsWithAttributesPresentInLoggersNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -795,28 +799,29 @@ public void GetLoggerRunSettingsShouldThrowWhenAttribtuesPresentInLoggersNode()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithAttributesPresentInLoggersNode);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(string.Format(
-                Resources.InvalidSettingsXmlAttribute,
-                "Loggers",
-                "nameAttr")));
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsEmpty()
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithAttributesPresentInLoggersNode);
+        }
+        catch (SettingsException ex)
         {
-            string runSettingsWithEmptyLoggersNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlAttribute,
+            "Loggers",
+            "nameAttr")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsEmpty()
+    {
+        string runSettingsWithEmptyLoggersNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -826,15 +831,15 @@ public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsEmpty()
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggersNode);
-            Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggersNode)!;
+        Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsSelfEnding()
-        {
-            string runSettingsWithEmptyLoggersNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsSelfEnding()
+    {
+        string runSettingsWithEmptyLoggersNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -843,15 +848,15 @@ public void GetLoggerRunSettingsShouldReturnEmptyLoggersWhenLoggersIsSelfEnding(
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggersNode);
-            Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
-        }
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithEmptyLoggersNode)!;
+        Assert.AreEqual(0, loggerRunSettings.LoggerSettingsList.Count);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggerPresentInLoggers()
-        {
-            string runSettingsWithNodeOtherLoggers =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggerPresentInLoggers()
+    {
+        string runSettingsWithNodeOtherLoggers =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -862,29 +867,30 @@ public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanLoggerPresentInLogge
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNodeOtherLoggers);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.IsTrue(exceptionMessage.Contains(string.Format(
-                Resources.InvalidSettingsXmlElement,
-                "Loggers",
-                "LoggerInvalid")));
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenRequiredAttributesNotPresentInLoggerNode()
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNodeOtherLoggers);
+        }
+        catch (SettingsException ex)
         {
-            // One among friendlyName, uri and assemblyQualifiedName should be present.
-            string runSettingsWithNoneOfRequiredAttributes =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlElement,
+            "Loggers",
+            "LoggerInvalid")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenRequiredAttributesNotPresentInLoggerNode()
+    {
+        // One among friendlyName, uri and assemblyQualifiedName should be present.
+        string runSettingsWithNoneOfRequiredAttributes =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -895,27 +901,25 @@ public void GetLoggerRunSettingsShouldThrowWhenRequiredAttributesNotPresentInLog
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNoneOfRequiredAttributes);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
+        var exceptionMessage = string.Empty;
 
-            Assert.IsTrue(exceptionMessage.Contains(string.Format(
-                Resources.MissingLoggerAttributes,
-                "LogGer")));
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithNoneOfRequiredAttributes);
         }
-
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnConfigurationElementIfPresentInLoggerNode()
+        catch (SettingsException ex)
         {
-            string runSettingsWithConfigurationElementInLoggerNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.IsTrue(exceptionMessage.Contains(string.Format(CultureInfo.CurrentCulture, Resources.MissingLoggerAttributes, "LogGer")));
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnConfigurationElementIfPresentInLoggerNode()
+    {
+        string runSettingsWithConfigurationElementInLoggerNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -931,21 +935,21 @@ public void GetLoggerRunSettingsShouldReturnConfigurationElementIfPresentInLogge
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithConfigurationElementInLoggerNode);
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithConfigurationElementInLoggerNode)!;
 
-            var expectedConfigurationElement = new XmlDocument().CreateElement("ConfiGUration");
-            expectedConfigurationElement.InnerXml = "<Key1>Value1</Key1><Key2>Value2</Key2>";
-            Assert.AreEqual(expectedConfigurationElement.Name,
-                loggerRunSettings.LoggerSettingsList.First().Configuration.Name);
-            Assert.AreEqual(expectedConfigurationElement.InnerXml,
-                loggerRunSettings.LoggerSettingsList.First().Configuration.InnerXml);
-        }
+        var expectedConfigurationElement = new XmlDocument().CreateElement("ConfiGUration");
+        expectedConfigurationElement.InnerXml = "<Key1>Value1</Key1><Key2>Value2</Key2>";
+        Assert.AreEqual(expectedConfigurationElement.Name,
+            loggerRunSettings.LoggerSettingsList.First().Configuration!.Name);
+        Assert.AreEqual(expectedConfigurationElement.InnerXml,
+            loggerRunSettings.LoggerSettingsList.First().Configuration!.InnerXml);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanConfigurationPresentInLogger()
-        {
-            string runSettingsWithInvalidConfigurationElement =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanConfigurationPresentInLogger()
+    {
+        string runSettingsWithInvalidConfigurationElement =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -961,28 +965,29 @@ public void GetLoggerRunSettingsShouldThrowWhenNodeOtherThanConfigurationPresent
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidConfigurationElement);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.AreEqual(string.Format(
-                Resources.InvalidSettingsXmlElement,
-                "Logger",
-                "ConfiGUrationInvalid"), exceptionMessage);
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldThrowOnInvalidAttributeInLoggerNode()
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidConfigurationElement);
+        }
+        catch (SettingsException ex)
         {
-            string runSettingsWithInvalidAttributeInLoggerNode =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.AreEqual(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlElement,
+            "Logger",
+            "ConfiGUrationInvalid"), exceptionMessage);
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldThrowOnInvalidAttributeInLoggerNode()
+    {
+        string runSettingsWithInvalidAttributeInLoggerNode =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -998,28 +1003,29 @@ public void GetLoggerRunSettingsShouldThrowOnInvalidAttributeInLoggerNode()
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var exceptionMessage = string.Empty;
-
-            try
-            {
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidAttributeInLoggerNode);
-            }
-            catch (SettingsException ex)
-            {
-                exceptionMessage = ex.Message;
-            }
-
-            Assert.AreEqual(string.Format(
-                Resources.InvalidSettingsXmlAttribute,
-                "Logger",
-                "invalidAttr"), exceptionMessage);
-        }
+        var exceptionMessage = string.Empty;
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnMultipleLoggersIfPresent()
+        try
+        {
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithInvalidAttributeInLoggerNode);
+        }
+        catch (SettingsException ex)
         {
-            string runSettingsWithMultipleLoggers =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+            exceptionMessage = ex.Message;
+        }
+
+        Assert.AreEqual(string.Format(
+            CultureInfo.CurrentCulture,
+            Resources.InvalidSettingsXmlAttribute,
+            "Logger",
+            "invalidAttr"), exceptionMessage);
+    }
+
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnMultipleLoggersIfPresent()
+    {
+        string runSettingsWithMultipleLoggers =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -1042,44 +1048,44 @@ public void GetLoggerRunSettingsShouldReturnMultipleLoggersIfPresent()
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var loggerRunSettings =
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithMultipleLoggers);
-
-            Assert.AreEqual(3, loggerRunSettings.LoggerSettingsList.Count);
-
-            // 1st logger
-            var loggerFirst = loggerRunSettings.LoggerSettingsList[0];
-            Assert.AreEqual("TestLoggerWithParameterExtension", loggerFirst.FriendlyName);
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.Uri?.ToString()));
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.AssemblyQualifiedName));
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.CodeBase));
-            Assert.IsTrue(loggerFirst.IsEnabled);
-            Assert.AreEqual("<Key1>Value1</Key1><Key2>Value2</Key2>", loggerFirst.Configuration.InnerXml);
-
-            // 2nd logger
-            var loggerSecond = loggerRunSettings.LoggerSettingsList[1];
-            Assert.AreEqual("TestLogger", loggerSecond.FriendlyName);
-            Assert.AreEqual(new Uri("testlogger://logger").ToString(), loggerSecond.Uri.ToString());
-            Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerSecond.AssemblyQualifiedName);
-            Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerSecond.CodeBase);
-            Assert.IsFalse(loggerSecond.IsEnabled);
-            Assert.IsNull(loggerSecond.Configuration);
-
-            // 3rd logger
-            var loggerThird = loggerRunSettings.LoggerSettingsList[2];
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.FriendlyName));
-            Assert.AreEqual(new Uri("testlogger://loggerTemp").ToString(), loggerThird.Uri.ToString());
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.AssemblyQualifiedName));
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.CodeBase));
-            Assert.IsTrue(loggerThird.IsEnabled);
-            Assert.AreEqual("<Key3>Value3</Key3><Key4>Value4</Key4>", loggerThird.Configuration.InnerXml);
-        }
+        var loggerRunSettings =
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithMultipleLoggers)!;
+
+        Assert.AreEqual(3, loggerRunSettings.LoggerSettingsList.Count);
+
+        // 1st logger
+        var loggerFirst = loggerRunSettings.LoggerSettingsList[0];
+        Assert.AreEqual("TestLoggerWithParameterExtension", loggerFirst.FriendlyName);
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.Uri?.ToString()));
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.AssemblyQualifiedName));
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerFirst.CodeBase));
+        Assert.IsTrue(loggerFirst.IsEnabled);
+        Assert.AreEqual("<Key1>Value1</Key1><Key2>Value2</Key2>", loggerFirst.Configuration!.InnerXml);
+
+        // 2nd logger
+        var loggerSecond = loggerRunSettings.LoggerSettingsList[1];
+        Assert.AreEqual("TestLogger", loggerSecond.FriendlyName);
+        Assert.AreEqual(new Uri("testlogger://logger").ToString(), loggerSecond.Uri!.ToString());
+        Assert.AreEqual("Sample.Sample.Sample.SampleLogger, Sample.Sample.Logger, Version=0.0.0.0, Culture=neutral, PublicKeyToken=xxxxxxxxxxxxxxxx", loggerSecond.AssemblyQualifiedName);
+        Assert.AreEqual(@"C:\Sample\Sample.TestLogger.dll", loggerSecond.CodeBase);
+        Assert.IsFalse(loggerSecond.IsEnabled);
+        Assert.IsNull(loggerSecond.Configuration);
+
+        // 3rd logger
+        var loggerThird = loggerRunSettings.LoggerSettingsList[2];
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.FriendlyName));
+        Assert.AreEqual(new Uri("testlogger://loggerTemp").ToString(), loggerThird.Uri!.ToString());
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.AssemblyQualifiedName));
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerThird.CodeBase));
+        Assert.IsTrue(loggerThird.IsEnabled);
+        Assert.AreEqual("<Key3>Value3</Key3><Key4>Value4</Key4>", loggerThird.Configuration!.InnerXml);
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLoggersWhenLoggerHasSelfEndingTag()
-        {
-            string runSettingsWithSelfEndingLoggers =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLoggersWhenLoggerHasSelfEndingTag()
+    {
+        string runSettingsWithSelfEndingLoggers =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -1093,21 +1099,21 @@ public void GetLoggerRunSettingsShouldReturnLoggersWhenLoggerHasSelfEndingTag()
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var loggerRunSettings =
-                XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithSelfEndingLoggers);
+        var loggerRunSettings =
+            XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithSelfEndingLoggers)!;
 
-            Assert.AreEqual(3, loggerRunSettings.LoggerSettingsList.Count);
-            Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList[0].FriendlyName);
-            Assert.AreEqual("TestLogger", loggerRunSettings.LoggerSettingsList[1].FriendlyName);
-            Assert.AreEqual("TestLogger", loggerRunSettings.LoggerSettingsList[1].FriendlyName);
-            Assert.IsTrue(string.IsNullOrWhiteSpace(loggerRunSettings.LoggerSettingsList[2].FriendlyName));
-        }
+        Assert.AreEqual(3, loggerRunSettings.LoggerSettingsList.Count);
+        Assert.AreEqual("TestLoggerWithParameterExtension", loggerRunSettings.LoggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("TestLogger", loggerRunSettings.LoggerSettingsList[1].FriendlyName);
+        Assert.AreEqual("TestLogger", loggerRunSettings.LoggerSettingsList[1].FriendlyName);
+        Assert.IsTrue(string.IsNullOrWhiteSpace(loggerRunSettings.LoggerSettingsList[2].FriendlyName));
+    }
 
-        [TestMethod]
-        public void GetLoggerRunSettingsShouldReturnLastConfigurationElementIfMultiplePresent()
-        {
-            string runSettingsWithMultipleConfigurationElements =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void GetLoggerRunSettingsShouldReturnLastConfigurationElementIfMultiplePresent()
+    {
+        string runSettingsWithMultipleConfigurationElements =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -1127,56 +1133,56 @@ public void GetLoggerRunSettingsShouldReturnLastConfigurationElementIfMultiplePr
                   </LoggerRUNSettings>
                 </RunSettings>";
 
-            var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithMultipleConfigurationElements);
+        var loggerRunSettings = XmlRunSettingsUtilities.GetLoggerRunSettings(runSettingsWithMultipleConfigurationElements)!;
 
-            var expectedConfigurationElement = new XmlDocument().CreateElement("ConfiGUration");
-            expectedConfigurationElement.InnerXml = "<Key3>Value3</Key3><Key4>Value4</Key4>";
-            Assert.AreEqual(expectedConfigurationElement.Name,
-                loggerRunSettings.LoggerSettingsList.First().Configuration.Name);
-            Assert.AreEqual(expectedConfigurationElement.InnerXml,
-                loggerRunSettings.LoggerSettingsList.First().Configuration.InnerXml);
-        }
+        var expectedConfigurationElement = new XmlDocument().CreateElement("ConfiGUration");
+        expectedConfigurationElement.InnerXml = "<Key3>Value3</Key3><Key4>Value4</Key4>";
+        Assert.AreEqual(expectedConfigurationElement.Name,
+            loggerRunSettings.LoggerSettingsList.First().Configuration!.Name);
+        Assert.AreEqual(expectedConfigurationElement.InnerXml,
+            loggerRunSettings.LoggerSettingsList.First().Configuration!.InnerXml);
+    }
 
-        #endregion
+    #endregion
 
-        #region GetDataCollectionRunSettings tests
+    #region GetDataCollectionRunSettings tests
 
-        [TestMethod]
-        public void GetDataCollectionRunSettingsShouldReturnNullIfSettingsIsNull()
-        {
-            Assert.IsNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(null));
-        }
+    [TestMethod]
+    public void GetDataCollectionRunSettingsShouldReturnNullIfSettingsIsNull()
+    {
+        Assert.IsNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(null));
+    }
 
-        [TestMethod]
-        public void GetDataCollectionRunSettingsShouldReturnNullOnNoDataCollectorSettings()
-        {
-            Assert.IsNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(EmptyRunSettings));
-        }
+    [TestMethod]
+    public void GetDataCollectionRunSettingsShouldReturnNullOnNoDataCollectorSettings()
+    {
+        Assert.IsNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(_emptyRunSettings));
+    }
 
-        [TestMethod]
-        public void GetDataCollectionRunSettingsShouldReturnDataCollectorRunSettings()
-        {
-            Assert.IsNotNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(this.runSettingsXmlWithDataCollectors));
-        }
+    [TestMethod]
+    public void GetDataCollectionRunSettingsShouldReturnDataCollectorRunSettings()
+    {
+        Assert.IsNotNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(_runSettingsXmlWithDataCollectors));
+    }
 
-        [TestMethod]
-        public void GetDataCollectionRunSettingsShouldReturnDataCollectorRunSettingsEvenIfDisabled()
-        {
-            Assert.IsNotNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(this.runSettingsXmlWithDataCollectorsDisabled));
-        }
+    [TestMethod]
+    public void GetDataCollectionRunSettingsShouldReturnDataCollectorRunSettingsEvenIfDisabled()
+    {
+        Assert.IsNotNull(XmlRunSettingsUtilities.GetDataCollectionRunSettings(_runSettingsXmlWithDataCollectorsDisabled));
+    }
 
-        [TestMethod]
-        public void GetDataCollectionRunSettingsShouldThrowOnMalformedDataCollectorSettings()
-        {
-            Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetDataCollectionRunSettings(this.runSettingsXmlWithIncorrectDataCollectorSettings));
-        }
+    [TestMethod]
+    public void GetDataCollectionRunSettingsShouldThrowOnMalformedDataCollectorSettings()
+    {
+        Assert.ThrowsException<SettingsException>(() => XmlRunSettingsUtilities.GetDataCollectionRunSettings(_runSettingsXmlWithIncorrectDataCollectorSettings));
+    }
 
-        #endregion
+    #endregion
 
-        [TestMethod]
-        public void GetDataCollectorsFriendlyNameShouldReturnListOfFriendlyName()
-        {
-            var settingsXml = @"<RunSettings>
+    [TestMethod]
+    public void GetDataCollectorsFriendlyNameShouldReturnListOfFriendlyName()
+    {
+        var settingsXml = @"<RunSettings>
                                     <DataCollectionRunSettings>
                                         <DataCollectors>
                                             <DataCollector friendlyName=""DummyDataCollector1"">
@@ -1187,20 +1193,19 @@ public void GetDataCollectorsFriendlyNameShouldReturnListOfFriendlyName()
                                     </DataCollectionRunSettings>
                                 </RunSettings>";
 
-            var friendlyNameList = XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(settingsXml).ToList<string>();
+        var friendlyNameList = XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(settingsXml).ToList();
 
-            Assert.AreEqual(2, friendlyNameList.Count, "There should be two friendly name");
-            CollectionAssert.AreEqual(friendlyNameList, new List<string> { "DummyDataCollector1", "DummyDataCollector2" });
-        }
+        Assert.AreEqual(2, friendlyNameList.Count, "There should be two friendly name");
+        CollectionAssert.AreEqual(friendlyNameList, new List<string> { "DummyDataCollector1", "DummyDataCollector2" });
+    }
 
-        private string ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(string settings)
-        {
-            return
-                settings.Replace("DataCollectionRunSettings", "InProcDataCollectionRunSettings")
-                    .Replace("<DataCollectors>", "<InProcDataCollectors>")
-                    .Replace("</DataCollectors>", "</InProcDataCollectors>")
-                    .Replace("<DataCollector ", "<InProcDataCollector ")
-                    .Replace("</DataCollector>", "</InProcDataCollector>");
-        }
+    private static string ConvertOutOfProcDataCollectionSettingsToInProcDataCollectionSettings(string settings)
+    {
+        return
+            settings.Replace("DataCollectionRunSettings", "InProcDataCollectionRunSettings")
+                .Replace("<DataCollectors>", "<InProcDataCollectors>")
+                .Replace("</DataCollectors>", "</InProcDataCollectors>")
+                .Replace("<DataCollector ", "<InProcDataCollector ")
+                .Replace("</DataCollector>", "</InProcDataCollector>");
     }
 }
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj b/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj
deleted file mode 100644
index ce245f448d..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <AssemblyName>Microsoft.TestPlatform.PerformanceTests</AssemblyName>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights">
-      <Version>2.5.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs b/test/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs
deleted file mode 100644
index f82848e218..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests
-{
-    using Microsoft.TestPlatform.TestUtilities.PerfInstrumentation;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// The performance tests.
-    /// </summary>
-    [TestClass]
-    public class PerformanceTests : PerformanceTestBase
-    {
-        [TestMethod]
-        public void ExecutionPerformanceTest()
-        {
-            this.RunExecutionPerformanceTests(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            this.ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
-            this.ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
-
-            this.AnalyzePerfData();
-            var actualExecutionTime = this.GetExecutionTime();
-
-            // Sample Assert statement to verify the performance. 500 will be replaced by the actual threshold value.
-            Assert.IsTrue(actualExecutionTime < 500);
-        }
-
-        [TestMethod]
-        public void DiscoveryPerformanceTest()
-        {
-            this.RunDiscoveryPerformanceTests(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty);
-
-            this.ValidateDiscoveredTests(
-                "SampleUnitTestProject.UnitTest1.PassingTest",
-                "SampleUnitTestProject.UnitTest1.FailingTest",
-                "SampleUnitTestProject.UnitTest1.SkippingTest");
-
-            this.AnalyzePerfData();
-            var actualDiscoveryTime = this.GetDiscoveryTime();
-
-            // Sample Assert statement to verify the performance. 500 will be replaced by the actual threshold value.
-            Assert.IsTrue(actualDiscoveryTime < 500);
-        }
-
-        [TestMethod]
-        public void VsTestConsolePerformanceTest()
-        {
-            this.RunExecutionPerformanceTests(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            this.ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
-            this.ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
-
-            this.AnalyzePerfData();
-            var actualVsTestTime = this.GetVsTestTime();
-
-            // Sample Assert statement to verify the performance. 1500 will be replaced by the actual threshold value.
-            Assert.IsTrue(actualVsTestTime < 1500);
-        }
-
-        [TestMethod]
-        public void TestHostPerformanceTest()
-        {
-            this.RunExecutionPerformanceTests(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            this.ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
-            this.ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
-
-            this.AnalyzePerfData();
-            var actualTestHostTime = this.GetTestHostTime();
-
-            // Sample Assert statement to verify the performance. 1000 will be replaced by the actual threshold value.
-            Assert.IsTrue(actualTestHostTime < 1000);
-        }
-
-        [TestMethod]
-        public void MsTestV2AdapterPerformanceTest()
-        {
-            this.RunExecutionPerformanceTests(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty);
-
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            this.ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
-            this.ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
-
-            this.AnalyzePerfData();
-
-            var actualAdapterTimeTaken = this.GetAdapterExecutionTime("executor://mstestadapter/v2");
-
-            // Sample Assert statement to verify the performance. 300 will be replaced by the actual threshold value.
-            Assert.IsTrue(actualAdapterTimeTaken < 300);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Program.cs b/test/Microsoft.TestPlatform.PerformanceTests/Program.cs
deleted file mode 100644
index f51a7b7fe2..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace testhost.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 694542bbb7..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.PerformanceTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("12d59ced-9916-4c3f-af82-12e019757fd2")]
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV1Tests.cs b/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV1Tests.cs
deleted file mode 100644
index 7f78e23b16..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV1Tests.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    [TestClass]
-    public class ProtocolV1Tests
-    {
-        private static TestCase testCase = new TestCase(
-                                              "sampleTestClass.sampleTestCase",
-                                              new Uri("executor://sampleTestExecutor"),
-                                              "sampleTest.dll")
-        {
-            CodeFilePath = "/user/src/testFile.cs",
-            DisplayName = "sampleTestCase",
-            Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
-            LineNumber = 999,
-            Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
-        };
-
-        private static DateTimeOffset startTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
-
-        private static TestResult testResult = new TestResult(testCase)
-        {
-            // Attachments = ?
-            // Messages = ?
-            Outcome = TestOutcome.Passed,
-            ErrorMessage = "sampleError",
-            ErrorStackTrace = "sampleStackTrace",
-            DisplayName = "sampleTestResult",
-            ComputerName = "sampleComputerName",
-            Duration = TimeSpan.MaxValue,
-            StartTime = startTime,
-            EndTime = DateTimeOffset.MaxValue
-        };
-
-        [TestMethod]
-        public void TestCaseSerialize()
-        {
-            Serialize(testCase);
-            Stopwatch sw = Stopwatch.StartNew();
-
-            for (int i = 0; i < 10000; i++)
-            {
-                Serialize(testCase);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestCaseSerialize1", 2000, sw.ElapsedMilliseconds);
-        }
-        
-        [TestMethod]
-        public void TestCaseDeserialize()
-        {
-            var json = Serialize(testCase);
-            Deserialize<TestCase>(json);
-
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Deserialize<TestCase>(json);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestCaseDeserialize1", 2000, sw.ElapsedMilliseconds);
-        }
-
-        [TestMethod]
-        public void TestResultSerialize()
-        {
-            Serialize(testResult);
-            Stopwatch sw = Stopwatch.StartNew();
-
-            for (int i = 0; i < 10000; i++)
-            {
-                Serialize(testResult);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestResultSerialize1", 2000, sw.ElapsedMilliseconds);
-        }
-
-        [TestMethod]
-        public void TestResultDeserialize()
-        {
-            var json = Serialize(testResult);
-            Deserialize<TestResult>(json);
-
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Deserialize<TestResult>(json);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestResultDeserialize1", 3500, sw.ElapsedMilliseconds);
-        }
-
-        private static string Serialize<T>(T data, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Serialize(data, version);
-        }
-
-        private static T Deserialize<T>(string json, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Deserialize<T>(json, version);
-        }
-
-        private static void VerifyPerformanceResult(string scenario, long expectedElapsedTime, long elapsedTime)
-        {
-            Assert.IsTrue(elapsedTime < expectedElapsedTime, $"Scenario '{scenario}' doesn't match with expected elapsed time.");
-            File.AppendAllText(@"E:\ProtocolPerf.txt", $" {scenario} : " + elapsedTime);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV2Tests.cs b/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV2Tests.cs
deleted file mode 100644
index 4e2ca53d51..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/ProtocolV2Tests.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests
-{
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-
-    [TestClass]
-    public class ProtocolV2Tests
-    {
-        private static TestCase testCase = new TestCase(
-                                              "sampleTestClass.sampleTestCase",
-                                              new Uri("executor://sampleTestExecutor"),
-                                              "sampleTest.dll")
-        {
-            CodeFilePath = "/user/src/testFile.cs",
-            DisplayName = "sampleTestCase",
-            Id = new Guid("be78d6fc-61b0-4882-9d07-40d796fd96ce"),
-            LineNumber = 999,
-            Traits = { new Trait("Priority", "0"), new Trait("Category", "unit") }
-        };
-
-        private static DateTimeOffset startTime = new DateTimeOffset(new DateTime(2007, 3, 10, 0, 0, 0, DateTimeKind.Utc));
-
-        private static TestResult testResult = new TestResult(testCase)
-        {
-            // Attachments = ?
-            // Messages = ?
-            Outcome = TestOutcome.Passed,
-            ErrorMessage = "sampleError",
-            ErrorStackTrace = "sampleStackTrace",
-            DisplayName = "sampleTestResult",
-            ComputerName = "sampleComputerName",
-            Duration = TimeSpan.MaxValue,
-            StartTime = startTime,
-            EndTime = DateTimeOffset.MaxValue
-        };
-
-        [TestMethod]
-        public void TestCaseSerialize2()
-        {
-            Serialize(testCase, 2);
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Serialize(testCase, 2);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestCaseSerialize2", 2000, sw.ElapsedMilliseconds);
-        }
-
-        [TestMethod]
-        public void TestCaseDeserialize2()
-        {
-            var json = Serialize(testCase, 2);
-            Deserialize<TestCase>(json, 2);
-
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Deserialize<TestCase>(json, 2);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestCaseDeserialize2", 2000, sw.ElapsedMilliseconds);
-        }
-
-        [TestMethod]
-        public void TestResultSerialize2()
-        {
-            Serialize(testResult, 2);
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Serialize(testResult, 2);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestResultSerialize2", 2000, sw.ElapsedMilliseconds);
-        }
-
-        [TestMethod]
-        public void TestResultDeserialize2()
-        {
-            var json = Serialize(testResult, 2);
-            Deserialize<TestResult>(json, 2);
-
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < 10000; i++)
-            {
-                Deserialize<TestResult>(json, 2);
-            }
-            sw.Stop();
-
-            VerifyPerformanceResult("TestResultDeserialize2", 2000, sw.ElapsedMilliseconds);
-        }
-
-        private static string Serialize<T>(T data, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Serialize(data, version);
-        }
-
-        private static T Deserialize<T>(string json, int version = 1)
-        {
-            return JsonDataSerializer.Instance.Deserialize<T>(json, version);
-        }
-
-        private static void VerifyPerformanceResult(string scenario, long expectedElapsedTime, long elapsedTime)
-        {
-            Assert.IsTrue(elapsedTime < expectedElapsedTime, $"Scenario '{scenario}' doesn't match with expected elapsed time.");
-            File.AppendAllText(@"E:\ProtocolPerf.txt", $" {scenario} : " + elapsedTime);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/SocketTests.cs b/test/Microsoft.TestPlatform.PerformanceTests/SocketTests.cs
deleted file mode 100644
index 5281da2692..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/SocketTests.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests
-{
-    using System;
-    using System.Diagnostics;
-    using System.Net;
-    using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class SocketTests
-    {
-        [TestMethod]
-        public void SocketThroughput2()
-        {
-            // Measure the throughput with socket communication v2 (SocketServer, SocketClient)
-            // implementation.
-            var server = new SocketServer();
-            var client = new SocketClient();
-            ICommunicationChannel serverChannel = null;
-            ICommunicationChannel clientChannel = null;
-            ManualResetEventSlim dataTransferred = new ManualResetEventSlim(false);
-            ManualResetEventSlim clientConnected = new ManualResetEventSlim(false);
-            ManualResetEventSlim serverConnected = new ManualResetEventSlim(false);
-            int dataReceived = 0;
-            var watch = new Stopwatch();
-            var thread = new Thread(() => SendData(clientChannel, watch));
-
-            // Setup server
-            server.Connected += (sender, args) =>
-            {
-                serverChannel = args.Channel;
-                serverChannel.MessageReceived += (channel, messageReceived) =>
-                {
-                    // Keep count of bytes
-                    dataReceived += messageReceived.Data.Length;
-
-                    if (dataReceived >= 65536 * 20000)
-                    {
-                        dataTransferred.Set();
-                        watch.Stop();
-                    }
-                };
-
-                clientConnected.Set();
-            };
-
-            client.Connected += (sender, args) =>
-            {
-                clientChannel = args.Channel;
-
-                thread.Start();
-
-                serverConnected.Set();
-            };
-
-            var port = server.Start(IPAddress.Loopback.ToString()+":0");
-            client.Start(port);
-
-            clientConnected.Wait();
-            serverConnected.Wait();
-            thread.Join();
-            dataTransferred.Wait();
-
-            Assert.IsTrue(watch.Elapsed < TimeSpan.FromSeconds(4), "Elapsed: " + watch.Elapsed);
-        }
-
-        [TestMethod]
-        public void SocketThroughput1()
-        {
-            // Measure the throughput with socket communication v1 (SocketCommunicationManager)
-            // implementation.
-            var server = new SocketCommunicationManager();
-            var client = new SocketCommunicationManager();
-            var watch = new Stopwatch();
-
-            int port = server.HostServer(new IPEndPoint(IPAddress.Loopback, 0)).Port;
-            client.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port)).Wait();
-            server.AcceptClientAsync().Wait();
-
-            server.WaitForClientConnection(1000);
-            client.WaitForServerConnection(1000);
-
-            var clientThread = new Thread(() => SendData2(client, watch));
-            clientThread.Start();
-
-            var dataReceived = 0;
-            while (dataReceived < 65536 * 20000)
-            {
-                dataReceived += server.ReceiveRawMessage().Length;
-            }
-
-            watch.Stop();
-            clientThread.Join();
-
-            Assert.IsTrue(watch.Elapsed < TimeSpan.FromSeconds(4), "Elapsed: " + watch.Elapsed);
-        }
-
-        private static void SendData(ICommunicationChannel channel, Stopwatch watch)
-        {
-            var dataBytes = new byte[65536];
-            for (int i = 0; i < dataBytes.Length; i++)
-            {
-                dataBytes[i] = 0x65;
-            }
-
-            var dataBytesStr = System.Text.Encoding.UTF8.GetString(dataBytes);
-
-            watch.Start();
-            for (int i = 0; i < 20000; i++)
-            {
-                channel.Send(dataBytesStr);
-            }
-        }
-
-        private static void SendData2(ICommunicationManager communicationManager, Stopwatch watch)
-        {
-            var dataBytes = new byte[65536];
-            for (int i = 0; i < dataBytes.Length; i++)
-            {
-                dataBytes[i] = 0x65;
-            }
-
-            var dataBytesStr = System.Text.Encoding.UTF8.GetString(dataBytes);
-
-            watch.Start();
-            for (int i = 0; i < 20000; i++)
-            {
-                communicationManager.SendRawMessage(dataBytesStr);
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/DiscoveryPerfTests.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/DiscoveryPerfTests.cs
deleted file mode 100644
index ca2c0cdf9a..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/DiscoveryPerfTests.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests.TranslationLayer
-{
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-
-    [TestClass]
-    public class DiscoveryPerfTests : TelemetryPerfTestbase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private DiscoveryEventHandler2 discoveryEventHandler2;
-
-        public DiscoveryPerfTests()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.discoveryEventHandler2 = new DiscoveryEventHandler2();
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverMsTest10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("MSTestAdapterPerfTestProject", "MSTestAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverMsTest10K", this.discoveryEventHandler2.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverXunit10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("XunitAdapterPerfTestProject", "XunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverXunit10K", this.discoveryEventHandler2.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverNunit10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("NunitAdapterPerfTestProject", "NunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverNunit10K", this.discoveryEventHandler2.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverMsTest10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("MSTestAdapterPerfTestProject", "MSTestAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverMsTest10KWithDefaultAdaptersSkipped", this.discoveryEventHandler2.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverXunit10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("XunitAdapterPerfTestProject", "XunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverXunit10KWithDefaultAdaptersSkipped", this.discoveryEventHandler2.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void DiscoverNunit10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("NunitAdapterPerfTestProject", "NunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.DiscoverTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.discoveryEventHandler2);
-
-            this.PostTelemetry("DiscoverNunit10KWithDefaultAdaptersSkipped", this.discoveryEventHandler2.Metrics);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
deleted file mode 100644
index ffccb55529..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/DiscoveryEventHandler.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests.TranslationLayer
-{
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <inheritdoc />
-    public class DiscoveryEventHandler2 : ITestDiscoveryEventsHandler2
-    {
-        /// <summary>
-        /// Gets the discovered test cases.
-        /// </summary>
-        public List<TestCase> DiscoveredTestCases { get; }
-
-        /// <summary>
-        /// Gets the metrics.
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; private set; }
-
-        public DiscoveryEventHandler2()
-        {
-            this.DiscoveredTestCases = new List<TestCase>();
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No Op
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            // No Op
-        }
-
-        public void HandleDiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk)
-        {
-            if (lastChunk != null)
-            {
-                this.DiscoveredTestCases.AddRange(lastChunk);
-            }
-
-            this.Metrics = discoveryCompleteEventArgs.Metrics;
-        }
-
-        public void HandleDiscoveredTests(IEnumerable<TestCase> discoveredTestCases)
-        {
-            if (discoveredTestCases != null)
-            {
-                this.DiscoveredTestCases.AddRange(discoveredTestCases);
-            }
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs
deleted file mode 100644
index da3ec378d9..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/EventHandler/RunEventHandler.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests.TranslationLayer
-{
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
-    /// <inheritdoc />
-    public class RunEventHandler : ITestRunEventsHandler2
-    {
-        /// <summary>
-        /// Gets the test results.
-        /// </summary>
-        public List<TestResult> TestResults { get; private set; }
-
-        /// <summary>
-        /// Gets the metrics.
-        /// </summary>
-        public IDictionary<string, object> Metrics { get; private set; }
-
-        /// <summary>
-        /// Gets the log message.
-        /// </summary>
-        public string LogMessage { get; private set; }
-
-        /// <summary>
-        /// Gets the test message level.
-        /// </summary>
-        public TestMessageLevel TestMessageLevel { get; private set; }
-
-        public RunEventHandler()
-        {
-            this.TestResults = new List<TestResult>();
-        }
-
-        public void HandleLogMessage(TestMessageLevel level, string message)
-        {
-            this.LogMessage = message;
-            this.TestMessageLevel = level;
-        }
-
-        public void HandleTestRunComplete(
-            TestRunCompleteEventArgs testRunCompleteArgs,
-            TestRunChangedEventArgs lastChunkArgs,
-            ICollection<AttachmentSet> runContextAttachments,
-            ICollection<string> executorUris)
-        {
-            if (lastChunkArgs != null && lastChunkArgs.NewTestResults != null)
-            {
-                this.TestResults.AddRange(lastChunkArgs.NewTestResults);
-            }
-
-            this.Metrics = testRunCompleteArgs.Metrics;
-        }
-
-        public void HandleTestRunStatsChange(TestRunChangedEventArgs testRunChangedArgs)
-        {
-            if (testRunChangedArgs != null && testRunChangedArgs.NewTestResults != null)
-            {
-                this.TestResults.AddRange(testRunChangedArgs.NewTestResults);
-            }
-        }
-
-        public void HandleRawMessage(string rawMessage)
-        {
-            // No op
-        }
-
-        public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
-        {
-            // No op
-            return -1;
-        }
-
-        public bool AttachDebuggerToProcess(int pid)
-        {
-            // No op
-            return true;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/ExecutionPerfTests.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/ExecutionPerfTests.cs
deleted file mode 100644
index 81a45044cd..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/ExecutionPerfTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.TestPlatform.PerformanceTests.TranslationLayer
-{
-    [TestClass]
-    public class ExecutionPerfTests : TelemetryPerfTestbase
-    {
-        private IVsTestConsoleWrapper vstestConsoleWrapper;
-        private RunEventHandler runEventHandler;
-
-        public ExecutionPerfTests()
-        {
-            this.vstestConsoleWrapper = this.GetVsTestConsoleWrapper();
-            this.runEventHandler = new RunEventHandler();
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunMsTest10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("MSTestAdapterPerfTestProject", "MSTestAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunMsTest10K", this.runEventHandler.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunXunit10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("XunitAdapterPerfTestProject", "XunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunXunit10K", this.runEventHandler.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunNunit10K()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("NunitAdapterPerfTestProject", "NunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunNunit10K", this.runEventHandler.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunMsTest10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("MSTestAdapterPerfTestProject", "MSTestAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunMsTest10KWithDefaultAdaptersSkipped", this.runEventHandler.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunXunit10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("XunitAdapterPerfTestProject", "XunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunXunit10KWithDefaultAdaptersSkipped", this.runEventHandler.Metrics);
-        }
-
-        [TestMethod]
-        [TestCategory("TelemetryPerf")]
-        public void RunNunit10KWithDefaultAdaptersSkipped()
-        {
-            var testAssemblies = new List<string>
-                                     {
-                                         GetPerfAssetFullPath("NunitAdapterPerfTestProject", "NunitAdapterPerfTestProject.dll"),
-                                     };
-
-            this.vstestConsoleWrapper.RunTests(testAssemblies, this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true, SkipDefaultAdapters = true }, this.runEventHandler);
-
-            this.PostTelemetry("RunNunit10KWithDefaultAdaptersSkipped", this.runEventHandler.Metrics);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs b/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs
deleted file mode 100644
index 3f2dd5b6a2..0000000000
--- a/test/Microsoft.TestPlatform.PerformanceTests/TranslationLayer/TelemetryPerfTestBase.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.PerformanceTests.TranslationLayer
-{
-    using Microsoft.ApplicationInsights;
-    using Microsoft.ApplicationInsights.Extensibility;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-
-    [TestClass]
-    public class TelemetryPerfTestbase
-    {
-        private const string TelemetryInstrumentationKey = "76b373ba-8a55-45dd-b6db-7f1a83288691";
-        private TelemetryClient client;
-        private DirectoryInfo currentDirectory = new DirectoryInfo(typeof(DiscoveryPerfTests).GetTypeInfo().Assembly.GetAssemblyLocation()).Parent;
-
-        public TelemetryPerfTestbase()
-        {
-            client = new TelemetryClient();
-            TelemetryConfiguration.Active.InstrumentationKey = TelemetryInstrumentationKey;
-        }
-
-        /// <summary>
-        /// Used for posting the telemetry to AppInsights
-        /// </summary>
-        /// <param name="perfScenario"></param>
-        /// <param name="handlerMetrics"></param>
-        public void PostTelemetry(string perfScenario, IDictionary<string,object> handlerMetrics)
-        {
-            var properties = new Dictionary<string, string>();
-            var metrics = new Dictionary<string, double>();
-
-            foreach (var entry in handlerMetrics)
-            {
-                var stringValue = entry.Value.ToString();
-                if (double.TryParse(stringValue, out var doubleValue))
-                {
-                    metrics.Add(entry.Key, doubleValue);
-                }
-                else
-                {
-                    properties.Add(entry.Key, stringValue);
-                }
-            }
-            this.client.TrackEvent(perfScenario, properties, metrics);
-            this.client.Flush();
-        }
-
-        /// <summary>
-        /// Returns the full path to the test asset dll
-        /// </summary>
-        /// <param name="dllDirectory">Name of the directory of the test dll</param>
-        /// <param name="dllName">Name of the test dll</param>
-        /// <returns></returns>
-        public string GetPerfAssetFullPath(string dllDirectory, string dllName)
-        {
-            return Path.Combine(this.currentDirectory.FullName, "TestAssets\\PerfAssets", dllDirectory , dllName );
-        }
-
-        /// <summary>
-        /// Returns the VsTestConsole Wrapper.
-        /// </summary>
-        /// <returns></returns>
-        public IVsTestConsoleWrapper GetVsTestConsoleWrapper()
-        {
-            var vstestConsoleWrapper = new VsTestConsoleWrapper(this.GetConsoleRunnerPath());
-            vstestConsoleWrapper.StartSession();
-
-            return vstestConsoleWrapper;
-        }
-
-        private string BuildConfiguration
-        {
-            get
-            {
-#if DEBUG
-                return "Debug";
-#else
-                return "Release";
-#endif
-            }
-        }
-
-        private string GetConsoleRunnerPath()
-        {
-            // Find the root
-            var root = this.currentDirectory.Parent.Parent.Parent;
-            // Path to artifacts vstest.console
-            return Path.Combine(root.FullName, BuildConfiguration, "net451", "win7-x64", "vstest.console.exe");
-        }
-
-        /// <summary>
-        /// Returns the default runsettings xml
-        /// </summary>
-        /// <returns></returns>
-        public string GetDefaultRunSettings()
-        {
-            string runSettingsXml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-                                    <RunSettings>
-                                        <RunConfiguration>
-                                        <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-                                        </RunConfiguration>
-                                    </RunSettings>";
-            return runSettingsXml;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.Coverlet.cs b/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.Coverlet.cs
deleted file mode 100644
index ecf57aab6b..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.Coverlet.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.SmokeTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using System;
-    using System.IO;
-    using System.Linq;
-
-    [TestClass]
-    public class DataCollectorTestsCoverlets : IntegrationTestBase
-    {
-        [TestMethod]
-        public void RunCoverletCoverage()
-        {
-            // Collector is supported only for netcoreapp2.1, is compiled for netcoreapp2.1 and packaged as netstandard
-            if (this.testEnvironment.TargetFramework != CoreRunnerFramework)
-            {
-                return;
-            }
-
-            // We use netcoreapp runner 
-            // "...\vstest\tools\dotnet\dotnet.exe "...\vstest\artifacts\Debug\netcoreapp2.1\vstest.console.dll" --collect:"XPlat Code Coverage" ...
-            this.testEnvironment.RunnerFramework = CoreRunnerFramework;
-            var resultsDir = GetResultsDirectory();
-
-            string coverletAdapterPath = Path.GetDirectoryName(Directory.GetFiles(this.testEnvironment.GetNugetPackage("coverlet.collector"), "coverlet.collector.dll", SearchOption.AllDirectories).Single());
-            string logId = Guid.NewGuid().ToString("N");
-            string assemblyPath = this.BuildMultipleAssemblyPath("CoverletCoverageTestProject.dll").Trim('\"');
-            string logPath = Path.Combine(Path.GetDirectoryName(assemblyPath), $"coverletcoverage.{logId}.log");
-            string logPathDirectory = Path.GetDirectoryName(logPath);
-            string argument = $"--collect:{"XPlat Code Coverage".AddDoubleQuote()} {PrepareArguments(assemblyPath, coverletAdapterPath, "", ".NETCoreApp,Version=v2.1", resultsDirectory: resultsDir)} --diag:{logPath.AddDoubleQuote()}";
-            this.InvokeVsTest(argument);
-
-            // Verify vstest.console.dll CollectArgumentProcessor fix codeBase for coverlet package
-            // This assert check that we're sure that we've updated collector setting code base with full path, 
-            // otherwise without "custom coverlet code" inside ProxyExecutionManager coverlet dll won't be resolved inside testhost.
-            var log = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.log").Single();
-            Assert.IsTrue(File.ReadAllText(log).Contains("CoverletDataCollector in-process codeBase path"));
-
-            // Verify out-of-proc coverlet collector load
-            var dataCollectorLog = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.datacollector*log").Single();
-            Assert.IsTrue(File.ReadAllText(dataCollectorLog).Contains("[coverlet]Initializing CoverletCoverageDataCollector"));
-
-            // Verify in-proc coverlet collector load
-            var hostLog = Directory.GetFiles(logPathDirectory, $"coverletcoverage.{logId}.host*log").Single();
-            Assert.IsTrue(File.ReadAllText(hostLog).Contains("[coverlet]Initialize CoverletInProcDataCollector"));
-
-            // Verify default coverage file is generated
-            this.StdOutputContains("coverage.cobertura.xml");
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs b/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs
deleted file mode 100644
index d4fd64d77e..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.SmokeTests
-{
-    using System.IO;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DataCollectorTests : IntegrationTestBase
-    {
-        private static string InProcTestResultFile = Path.Combine(Path.GetTempPath(), "inproctest.txt");
-        private const string InProDataCollectorTestProject = "SimpleTestProject.dll";
-        [TestMethod]
-        public void RunAllWithInProcDataCollectorSettings()
-        {
-            // Delete File if already exists
-            File.Delete(InProcTestResultFile);
-
-            var runSettings = this.GetInProcDataCollectionRunsettingsFile();
-
-            this.InvokeVsTestForExecution(testEnvironment.GetTestAsset(DataCollectorTests.InProDataCollectorTestProject), this.GetTestAdapterPath(), ".NETFramework,Version=v4.5.1", runSettings);
-            this.ValidateSummaryStatus(1, 1, 1);
-
-            ValidateInProcDataCollectionOutput();
-        }
-
-        private static void ValidateInProcDataCollectionOutput()
-        {
-            Assert.IsTrue(File.Exists(InProcTestResultFile), "Datacollector test file doesn't exist: {0}.", InProcTestResultFile);
-            var actual = File.ReadAllText(InProcTestResultFile);
-            var expected = @"TestSessionStart : <Configuration><Port>4312</Port></Configuration> TestCaseStart : PassingTest TestCaseEnd : PassingTest TestCaseStart : FailingTest TestCaseEnd : FailingTest TestCaseStart : SkippingTest TestCaseEnd : SkippingTest TestSessionEnd";
-            actual = actual.Replace(" ", string.Empty).Replace("\r\n", string.Empty);
-            expected = expected.Replace(" ", string.Empty).Replace("\r\n", string.Empty);
-            Assert.AreEqual(expected, actual);
-        }
-
-        private string GetInProcDataCollectionRunsettingsFile()
-        {
-            var runSettings = Path.Combine(Path.GetDirectoryName(testEnvironment.GetTestAsset(DataCollectorTests.InProDataCollectorTestProject)), "runsettingstest.runsettings");
-            var inprocasm = testEnvironment.GetTestAsset("SimpleDataCollector.dll");
-            var fileContents = @"<RunSettings>
-                                    <InProcDataCollectionRunSettings>
-                                        <InProcDataCollectors>
-                                            <InProcDataCollector friendlyName='Test Impact' uri='InProcDataCollector://Microsoft/TestImpact/1.0' assemblyQualifiedName='SimpleDataCollector.SimpleDataCollector, {0}'  codebase='{1}'>
-                                                <Configuration>
-                                                    <Port>4312</Port>
-                                                </Configuration>
-                                            </InProcDataCollector>
-                                        </InProcDataCollectors>
-                                    </InProcDataCollectionRunSettings>
-                                </RunSettings>";
-
-            fileContents = string.Format(fileContents, AssemblyUtility.GetAssemblyName(inprocasm), inprocasm);
-            File.WriteAllText(runSettings, fileContents);
-
-            return runSettings;
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs
deleted file mode 100644
index 3329868548..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.SmokeTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class DiscoveryTests : IntegrationTestBase
-    {
-        [TestMethod]
-        public void DiscoverAllTests()
-        {
-            this.InvokeVsTestForDiscovery(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, ".NETFramework,Version=v4.5.1");
-            var listOfTests = new string[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" };
-            this.ValidateDiscoveredTests(listOfTests);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs
deleted file mode 100644
index ab30fabe3e..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.SmokeTests
-{
-    using Microsoft.TestPlatform.TestUtilities;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class ExecutionTests : IntegrationTestBase
-    {
-        [TestMethod]
-        public void RunAllTestExecution()
-        {
-            this.InvokeVsTestForExecution(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), ".NETFramework,Version=v4.5.1");
-            this.ValidateSummaryStatus(1, 1, 1);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            this.ValidateFailedTests("SampleUnitTestProject.UnitTest1.FailingTest");
-            this.ValidateSkippedTests("SampleUnitTestProject.UnitTest1.SkippingTest");
-        }
-
-        [TestMethod]
-        public void RunSelectedTests()
-        {
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, ".NETFramework,Version=v4.5.1", resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /Tests:PassingTest");
-            this.InvokeVsTest(arguments);
-            this.ValidateSummaryStatus(1, 0, 0);
-            this.ValidatePassedTests("SampleUnitTestProject.UnitTest1.PassingTest");
-            TryRemoveDirectory(resultsDir);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj
deleted file mode 100644
index f54a5ce17a..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <AssemblyName>Microsoft.TestPlatform.SmokeTests</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
-    <PackageReference Include="System.Runtime.Loader">
-      <Version>4.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/Microsoft.TestPlatform.SmokeTests/Program.cs b/test/Microsoft.TestPlatform.SmokeTests/Program.cs
deleted file mode 100644
index f51a7b7fe2..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace testhost.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 23906b17bb..0000000000
--- a/test/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestingMSTest")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c1497516-acb5-49af-a676-51db65ff8252")]
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs
index 99cb96cf7a..0055035827 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs
@@ -1,598 +1,657 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.TestHostProvider.Hosting.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
+using Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.TestHostProvider.Hosting.UnitTests;
+
+[TestClass]
+public class DefaultTestHostManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.DesktopTestHostRuntimeProvider;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-#pragma warning disable SA1600
-    [TestClass]
-    public class DefaultTestHostManagerTests
-    {
-        private readonly TestProcessStartInfo startInfo;
-        private readonly Mock<IMessageLogger> mockMessageLogger;
-        private readonly Mock<IProcessHelper> mockProcessHelper;
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private readonly Mock<IDotnetHostHelper> mockDotnetHostHelper;
-        private readonly Mock<IEnvironment> mockEnvironment;
-
-        private DefaultTestHostManager testHostManager;
-        private TestableTestHostManager testableTestHostManager;
-        private string errorMessage;
-        private int exitCode;
-        private int testHostId;
-
-        public DefaultTestHostManagerTests()
-        {
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("vstest.console.exe");
-            this.mockDotnetHostHelper = new Mock<IDotnetHostHelper>();
-            this.mockEnvironment = new Mock<IEnvironment>();
-
-            this.mockMessageLogger = new Mock<IMessageLogger>();
-
-            this.testHostManager = new DefaultTestHostManager(this.mockProcessHelper.Object, this.mockFileHelper.Object, this.mockEnvironment.Object, this.mockDotnetHostHelper.Object);
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X64}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
-            this.startInfo = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), null, default);
-        }
-
-        [TestMethod]
-        public void ConstructorShouldSetX86ProcessForX86Architecture()
-        {
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X86}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
+    private readonly TestProcessStartInfo _startInfo;
+    private readonly Mock<IMessageLogger> _mockMessageLogger;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IDotnetHostHelper> _mockDotnetHostHelper;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariable;
+    private readonly DefaultTestHostManager _testHostManager;
+
+    private TestableTestHostManager? _testableTestHostManager;
+    private string? _errorMessage;
+    private int _exitCode;
+    private int _testHostId;
+
+    public DefaultTestHostManagerTests()
+    {
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("vstest.console.exe");
+        _mockDotnetHostHelper = new Mock<IDotnetHostHelper>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockEnvironmentVariable = new Mock<IEnvironmentVariableHelper>();
+
+        _mockMessageLogger = new Mock<IMessageLogger>();
+
+        _testHostManager = new DefaultTestHostManager(_mockProcessHelper.Object, _mockFileHelper.Object, _mockDotnetHostHelper.Object, _mockEnvironment.Object, _mockEnvironmentVariable.Object);
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X64}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
+        _startInfo = _testHostManager.GetTestHostProcessStartInfo([], null, default);
+    }
 
-            var info = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), null, default);
+    [TestMethod]
+    public void ConstructorShouldSetX86ProcessForX86Architecture()
+    {
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X86}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
 
-            StringAssert.EndsWith(info.FileName, "testhost.x86.exe");
-        }
+        var info = _testHostManager.GetTestHostProcessStartInfo([], null, default);
 
-        [TestMethod]
-        public void ConstructorShouldSetX64ProcessForX64Architecture()
-        {
-            StringAssert.EndsWith(this.startInfo.FileName, "testhost.exe");
-        }
+        StringAssert.EndsWith(info.FileName, "testhost.x86.exe");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeFileNameFromSubFolderTestHostWhenCurrentProcessIsDotnet()
-        {
-            string subFoler = "TestHost";
+    [TestMethod]
+    public void ConstructorShouldSetX64ProcessForX64Architecture()
+    {
+        StringAssert.EndsWith(_startInfo.FileName, "testhost.exe");
+    }
 
-            var startInfo = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), null, default);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeFileNameFromSubFolderTestHostWhenCurrentProcessIsDotnet()
+    {
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("dotnet.exe");
+        _mockFileHelper.Setup(x => x.Exists(It.IsAny<string>())).Returns(false);
+        var startInfo = _testHostManager.GetTestHostProcessStartInfo([], null, default);
 
-            Assert.IsTrue(startInfo.FileName.EndsWith(Path.Combine(subFoler, "testhost.exe")));
-        }
+        Assert.IsTrue(startInfo.FileName!.EndsWith(Path.Combine("TestHostNetFramework", "testhost.exe")));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeConnectionInfo()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
-            var info = this.testHostManager.GetTestHostProcessStartInfo(
-                Enumerable.Empty<string>(),
-                null,
-                connectionInfo);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldNotIncludeFileNameFromSubFolderTestHostWhenCurrentProcessIsDotnet()
+    {
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("dotnet.exe");
+        _mockFileHelper.Setup(x => x.Exists(It.IsAny<string>())).Returns(true);
+        var startInfo = _testHostManager.GetTestHostProcessStartInfo([], null, default);
 
-            Assert.AreEqual(" --port 123 --endpoint 127.0.0.0:123 --role client --parentprocessid 101", info.Arguments);
-        }
+        Assert.IsFalse(startInfo.FileName!.EndsWith(Path.Combine("TestHost", "testhost.exe")));
+        Assert.IsTrue(startInfo.FileName!.EndsWith("testhost.exe"));
+    }
 
-        [TestMethod]
-        public void GetTestHostConnectionInfoShouldIncludeEndpointRoleAndChannelType()
-        {
-            var connectionInfo = new TestHostConnectionInfo
-            {
-                Endpoint = "127.0.0.1:0",
-                Role = ConnectionRole.Client,
-                Transport = Transport.Sockets
-            };
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldNotIncludeFileNameFromSubFolderTestHostWhenCurrentProcessIsIde()
+    {
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("devenv.exe");
+        var startInfo = _testHostManager.GetTestHostProcessStartInfo([], null, default);
 
-            var info = this.testHostManager.GetTestHostConnectionInfo();
+        Assert.IsFalse(startInfo.FileName!.EndsWith(Path.Combine("TestHost", "testhost.exe")));
+        Assert.IsTrue(startInfo.FileName!.EndsWith("testhost.exe"));
+    }
 
-            Assert.AreEqual(connectionInfo, info);
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeConnectionInfo()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
+        var info = _testHostManager.GetTestHostProcessStartInfo(
+            [],
+            null,
+            connectionInfo);
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeEmptyEnvironmentVariables()
-        {
-            Assert.AreEqual(0, this.startInfo.EnvironmentVariables.Count);
-        }
+        Assert.AreEqual(" --port 123 --endpoint 127.0.0.0:123 --role client --parentprocessid 101", info.Arguments);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeEnvironmentVariables()
+    [TestMethod]
+    public void GetTestHostConnectionInfoShouldIncludeEndpointRoleAndChannelType()
+    {
+        var connectionInfo = new TestHostConnectionInfo
         {
-            var environmentVariables = new Dictionary<string, string> { { "k1", "v1" } };
+            Endpoint = "127.0.0.1:0",
+            Role = ConnectionRole.Client,
+            Transport = Transport.Sockets
+        };
 
-            var info = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), environmentVariables, default);
+        var info = _testHostManager.GetTestHostConnectionInfo();
 
-            Assert.AreEqual(environmentVariables, info.EnvironmentVariables);
-        }
+        Assert.AreEqual(connectionInfo, info);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeCurrentWorkingDirectory()
-        {
-            Assert.AreEqual(Directory.GetCurrentDirectory(), this.startInfo.WorkingDirectory);
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeEmptyEnvironmentVariables()
+    {
+        Assert.AreEqual(0, _startInfo.EnvironmentVariables!.Count);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestSourcePathInArgumentsIfNonShared()
-        {
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X86}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{true}</DisableAppDomain> </RunConfiguration> </RunSettings>");
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
-            var source = "C:\temp\a.dll";
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeEnvironmentVariables()
+    {
+        var environmentVariables = new Dictionary<string, string?> { { "k1", "v1" } };
 
-            var info = this.testHostManager.GetTestHostProcessStartInfo(
-                new List<string>() { source },
-                null,
-                connectionInfo);
+        var info = _testHostManager.GetTestHostProcessStartInfo([], environmentVariables, default);
 
-            Assert.AreEqual(" --port 123 --endpoint 127.0.0.0:123 --role client --parentprocessid 101 --testsourcepath " + source.AddDoubleQuote(), info.Arguments);
-        }
+        Assert.AreEqual(environmentVariables, info.EnvironmentVariables);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseMonoAsHostOnNonWindowsIfNotStartedWithMono()
-        {
-            this.mockProcessHelper.Setup(p => p.GetCurrentProcessFileName()).Returns("/usr/bin/dotnet");
-            this.mockEnvironment.Setup(e => e.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
-            this.mockDotnetHostHelper.Setup(d => d.GetMonoPath()).Returns("/usr/bin/mono");
-            var source = "C:\temp\a.dll";
-
-            var info = this.testHostManager.GetTestHostProcessStartInfo(
-                new List<string>() { source },
-                null,
-                default);
-
-            Assert.AreEqual("/usr/bin/mono", info.FileName);
-            StringAssert.Contains(info.Arguments, "TestHost" + Path.DirectorySeparatorChar + "testhost.exe\"");
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeCurrentWorkingDirectory()
+    {
+        Assert.AreEqual(Directory.GetCurrentDirectory(), _startInfo.WorkingDirectory);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldNotUseMonoAsHostOnNonWindowsIfStartedWithMono()
-        {
-            this.mockProcessHelper.Setup(p => p.GetCurrentProcessFileName()).Returns("/usr/bin/mono");
-            this.mockEnvironment.Setup(e => e.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
-            this.mockDotnetHostHelper.Setup(d => d.GetMonoPath()).Returns("/usr/bin/mono");
-            var source = @"C:\temp\a.dll";
-
-            var info = this.testHostManager.GetTestHostProcessStartInfo(
-                new List<string>() { source },
-                null,
-                default);
-
-            StringAssert.Contains(info.FileName, "TestHost" + Path.DirectorySeparatorChar + "testhost.exe");
-            Assert.IsFalse(info.Arguments.Contains("TestHost" + Path.DirectorySeparatorChar + "testhost.exe"));
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestSourcePathInArgumentsIfNonShared()
+    {
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X86}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{true}</DisableAppDomain> </RunConfiguration> </RunSettings>");
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
+        var source = @"C:\temp\a.dll";
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldReturnExtensionsListAsIsIfSourcesListIsEmpty()
-        {
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration></RunConfiguration> </RunSettings>");
-            List<string> currentList = new List<string> { @"FooExtension.dll" };
+        var info = _testHostManager.GetTestHostProcessStartInfo(
+            new List<string>() { source },
+            null,
+            connectionInfo);
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(new List<string>(), currentList).ToList();
+        Assert.AreEqual(" --port 123 --endpoint 127.0.0.0:123 --role client --parentprocessid 101 --testsourcepath " + source.AddDoubleQuote(), info.Arguments);
+    }
 
-            // Verify
-            CollectionAssert.AreEqual(currentList, resultExtensions);
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldUseMonoAsHostOnNonWindowsIfNotStartedWithMono()
+    {
+        _mockProcessHelper.Setup(p => p.GetCurrentProcessFileName()).Returns("/usr/bin/dotnet");
+        _mockEnvironment.Setup(e => e.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
+        _mockDotnetHostHelper.Setup(d => d.GetMonoPath()).Returns("/usr/bin/mono");
+        var source = @"C:\temp\a.dll";
+
+        var info = _testHostManager.GetTestHostProcessStartInfo(
+            new List<string>() { source },
+            null,
+            default);
+
+        Assert.AreEqual("/usr/bin/mono", info.FileName);
+        StringAssert.Contains(info.Arguments, Path.Combine("TestHostNetFramework", "testhost.exe"));
+    }
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldReturnExtensionsListAsIsIfSourcesListIsNull()
-        {
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration></RunConfiguration> </RunSettings>");
-            List<string> currentList = new List<string> { @"FooExtension.dll" };
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldNotUseMonoAsHostOnNonWindowsIfStartedWithMono()
+    {
+        _mockProcessHelper.Setup(p => p.GetCurrentProcessFileName()).Returns("/usr/bin/mono");
+        _mockEnvironment.Setup(e => e.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
+        _mockDotnetHostHelper.Setup(d => d.GetMonoPath()).Returns("/usr/bin/mono");
+        var source = @"C:\temp\a.dll";
+
+        var info = _testHostManager.GetTestHostProcessStartInfo(
+            new List<string>() { source },
+            null,
+            default);
+
+        var testHostPath = Path.Combine("TestHostNetFramework", "testhost.exe");
+        StringAssert.EndsWith(info.FileName, testHostPath);
+        Assert.IsFalse(info.Arguments!.Contains(testHostPath));
+    }
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(null, currentList).ToList();
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldReturnExtensionsListAsIsIfSourcesListIsEmpty()
+    {
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration></RunConfiguration> </RunSettings>");
+        List<string> currentList = [@"FooExtension.dll"];
 
-            // Verify
-            CollectionAssert.AreEqual(currentList, resultExtensions);
-        }
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(new List<string>(), currentList).ToList();
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldNotExcludeOutputDirectoryExtensionsIfTestAdapterPathIsSet()
-        {
-            List<string> sourcesDir = new List<string> { @"C:\Source1" };
-            List<string> sources = new List<string> { @"C:\Source1\source1.dll" };
+        // Verify
+        CollectionAssert.AreEqual(currentList, resultExtensions);
+    }
 
-            List<string> extensionsList1 = new List<string> { @"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll" };
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldReturnExtensionsListAsIsIfSourcesListIsNull()
+    {
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration></RunConfiguration> </RunSettings>");
+        List<string> currentList = [@"FooExtension.dll"];
 
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[1])).Returns(new Version(5, 5));
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(null, currentList).ToList();
 
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TestAdaptersPaths>C:\\Foo</TestAdaptersPaths></RunConfiguration> </RunSettings>");
-            List<string> currentList = new List<string> { @"FooExtension.dll", @"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll" };
+        // Verify
+        CollectionAssert.AreEqual(currentList, resultExtensions);
+    }
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(sources, currentList).ToList();
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldNotExcludeOutputDirectoryExtensionsIfTestAdapterPathIsSet()
+    {
+        List<string> sourcesDir = [@"C:\Source1"];
+        List<string> sources = [@"C:\Source1\source1.dll"];
 
-            // Verify
-            CollectionAssert.AreEqual(currentList, resultExtensions);
-        }
+        List<string> extensionsList1 = [@"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll"];
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestPlatformExtensionsShouldIncludeOutputDirectoryExtensionsIfTestAdapterPathIsNotSet()
-        {
-            List<string> sourcesDir = new List<string> { "C:\\Source1", "C:\\Source2" };
-            List<string> sources = new List<string> { @"C:\Source1\source1.dll", @"C:\Source2\source2.dll" };
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[1])).Returns(new Version(5, 5));
 
-            List<string> extensionsList1 = new List<string> { @"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll" };
-            List<string> extensionsList2 = new List<string> { @"C:\Source2\ext1.TestAdapter.dll", @"C:\Source2\ext2.TestAdapter.dll" };
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TestAdaptersPaths>C:\\Foo</TestAdaptersPaths></RunConfiguration> </RunSettings>");
+        List<string> currentList = [@"FooExtension.dll", @"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll"];
 
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[1])).Returns(new Version(5, 5));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 2));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[1])).Returns(new Version(5, 0));
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(sources, currentList).ToList();
 
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
+        // Verify
+        CollectionAssert.AreEqual(currentList, resultExtensions);
+    }
 
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestPlatformExtensionsShouldIncludeOutputDirectoryExtensionsIfTestAdapterPathIsNotSet()
+    {
+        List<string> sourcesDir = ["C:\\Source1", "C:\\Source2"];
+        List<string> sources = [@"C:\Source1\source1.dll", @"C:\Source2\source2.dll"];
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
+        List<string> extensionsList1 = [@"C:\Source1\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll"];
+        List<string> extensionsList2 = [@"C:\Source2\ext1.TestAdapter.dll", @"C:\Source2\ext2.TestAdapter.dll"];
 
-            // Verify
-            List<string> expectedList = new List<string> { @"C:\Source2\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll" };
-            CollectionAssert.AreEqual(expectedList, resultExtensions);
-            this.mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, "Multiple versions of same extension found. Selecting the highest version." + Environment.NewLine + "  ext1.TestAdapter : 2.2\n  ext2.TestAdapter : 5.5"), Times.Once);
-        }
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[1])).Returns(new Version(5, 5));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 2));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[1])).Returns(new Version(5, 0));
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestPlatformExtensionsShouldReturnPathTheHigherVersionedFileExtensions()
-        {
-            List<string> sourcesDir = new List<string> { "C:\\Source1", "C:\\Source2" };
-            List<string> sources = new List<string> { @"C:\Source1\source1.dll", @"C:\Source2\source2.dll" };
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
 
-            List<string> extensionsList1 = new List<string> { @"C:\Source1\ext1.TestAdapter.dll" };
-            List<string> extensionsList2 = new List<string> { @"C:\Source2\ext1.TestAdapter.dll" };
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
 
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 2));
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
 
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
+        // Verify
+        List<string> expectedList = [@"C:\Source2\ext1.TestAdapter.dll", @"C:\Source1\ext2.TestAdapter.dll"];
+        CollectionAssert.AreEqual(expectedList, resultExtensions);
+        _mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, "Multiple versions of same extension found. Selecting the highest version." + Environment.NewLine + "  ext1.TestAdapter : 2.2\n  ext2.TestAdapter : 5.5"), Times.Once);
+    }
 
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestPlatformExtensionsShouldReturnPathTheHigherVersionedFileExtensions()
+    {
+        List<string> sourcesDir = ["C:\\Source1", "C:\\Source2"];
+        List<string> sources = [@"C:\Source1\source1.dll", @"C:\Source2\source2.dll"];
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
+        List<string> extensionsList1 = [@"C:\Source1\ext1.TestAdapter.dll"];
+        List<string> extensionsList2 = [@"C:\Source2\ext1.TestAdapter.dll"];
 
-            // Verify
-            CollectionAssert.AreEqual(extensionsList2, resultExtensions);
-            this.mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, "Multiple versions of same extension found. Selecting the highest version." + Environment.NewLine + "  ext1.TestAdapter : 2.2"), Times.Once);
-        }
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 2));
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestPlatformExtensionsShouldReturnPathToSingleFileExtensionOfATypeIfVersionsAreSame()
-        {
-            List<string> sourcesDir = new List<string> { "C:\\Source1", "C:\\Source2" };
-            List<string> sources = new List<string> { @"C:\Source1\source1.dll", @"C:\Source2\source2.dll" };
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
 
-            List<string> extensionsList1 = new List<string> { @"C:\Source1\ext1.TestAdapter.dll" };
-            List<string> extensionsList2 = new List<string> { @"C:\Source2\ext1.TestAdapter.dll" };
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
 
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
-            this.mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 0));
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
 
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
+        // Verify
+        CollectionAssert.AreEqual(extensionsList2, resultExtensions);
+        _mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, "Multiple versions of same extension found. Selecting the highest version." + Environment.NewLine + "  ext1.TestAdapter : 2.2"), Times.Once);
+    }
 
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestPlatformExtensionsShouldReturnPathToSingleFileExtensionOfATypeIfVersionsAreSame()
+    {
+        List<string> sourcesDir = ["C:\\Source1", "C:\\Source2"];
+        List<string> sources = [@"C:\Source1\source1.dll", @"C:\Source2\source2.dll"];
 
-            // Act
-            var resultExtensions = this.testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
+        List<string> extensionsList1 = [@"C:\Source1\ext1.TestAdapter.dll"];
+        List<string> extensionsList2 = [@"C:\Source2\ext1.TestAdapter.dll"];
 
-            // Verify
-            CollectionAssert.AreEqual(extensionsList1, resultExtensions);
-            this.mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, It.IsAny<string>()), Times.Never);
-        }
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList1[0])).Returns(new Version(2, 0));
+        _mockFileHelper.Setup(fh => fh.GetFileVersion(extensionsList2[0])).Returns(new Version(2, 0));
 
-        [TestMethod]
-        public void LaunchTestHostShouldReturnTestHostProcessId()
-        {
-            this.mockProcessHelper.Setup(
-                ph =>
-                    ph.LaunchProcess(
-                        It.IsAny<string>(),
-                        It.IsAny<string>(),
-                        It.IsAny<string>(),
-                        It.IsAny<IDictionary<string, string>>(),
-                        It.IsAny<Action<object, string>>(),
-                        It.IsAny<Action<object>>(),
-                         It.IsAny<Action<object, string>>())).Returns(Process.GetCurrentProcess());
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[0], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList1);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(sourcesDir[1], SearchOption.TopDirectoryOnly, "TestAdapter.dll")).Returns(extensionsList2);
 
-            this.testHostManager.Initialize(this.mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X64}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
-            var startInfo = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty<string>(), null, default);
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration><TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion></RunConfiguration> </RunSettings>");
 
-            this.testHostManager.HostLaunched += this.TestHostManagerHostLaunched;
+        // Act
+        var resultExtensions = _testHostManager.GetTestPlatformExtensions(sources, new List<string>()).ToList();
 
-            Task<bool> processId = this.testHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
-            processId.Wait();
+        // Verify
+        CollectionAssert.AreEqual(extensionsList1, resultExtensions);
+        _mockMessageLogger.Verify(ml => ml.SendMessage(TestMessageLevel.Warning, It.IsAny<string>()), Times.Never);
+    }
 
-            Assert.IsTrue(processId.Result);
+    [TestMethod]
+    public void LaunchTestHostShouldReturnTestHostProcessId()
+    {
+        _mockProcessHelper.Setup(
+            ph =>
+                ph.LaunchProcess(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<IDictionary<string, string?>>(),
+                    It.IsAny<Action<object?, string?>>(),
+                    It.IsAny<Action<object?>>(),
+                    It.IsAny<Action<object?, string?>>())).Returns(Process.GetCurrentProcess());
+
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{Architecture.X64}</TargetPlatform> <TargetFrameworkVersion>{Framework.DefaultFramework}</TargetFrameworkVersion> <DisableAppDomain>{false}</DisableAppDomain> </RunConfiguration> </RunSettings>");
+        var startInfo = _testHostManager.GetTestHostProcessStartInfo([], null, default);
+
+        _testHostManager.HostLaunched += TestHostManagerHostLaunched;
+
+        Task<bool> processId = _testHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
+        processId.Wait();
+
+        Assert.IsTrue(processId.Result);
+
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        Assert.AreEqual(pid, _testHostId);
+    }
 
-            Assert.AreEqual(Process.GetCurrentProcess().Id, this.testHostId);
-        }
+    [TestMethod]
+    public void LaunchTestHostAsyncShouldNotStartHostProcessIfCancellationTokenIsSet()
+    {
+        _testableTestHostManager = new TestableTestHostManager(
+            Architecture.X64,
+            Framework.DefaultFramework,
+            _mockProcessHelper.Object,
+            true,
+            _mockMessageLogger.Object);
 
-        [TestMethod]
-        public void LaunchTestHostAsyncShouldNotStartHostProcessIfCancellationTokenIsSet()
-        {
-            this.testableTestHostManager = new TestableTestHostManager(
-                Architecture.X64,
-                Framework.DefaultFramework,
-                this.mockProcessHelper.Object,
-                true,
-                this.mockMessageLogger.Object);
+        CancellationTokenSource cancellationTokenSource = new();
+        cancellationTokenSource.Cancel();
 
-            CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
+        Assert.ThrowsException<OperationCanceledException>(() => _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), cancellationTokenSource.Token).Wait());
+    }
 
-            Assert.ThrowsException<System.AggregateException>(() => this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), cancellationTokenSource.Token).Wait());
-        }
+    [TestMethod]
+    public void PropertiesShouldReturnEmptyDictionary()
+    {
+        Assert.AreEqual(0, _testHostManager.Properties.Count);
+    }
 
-        [TestMethod]
-        public void PropertiesShouldReturnEmptyDictionary()
-        {
-            Assert.AreEqual(0, this.testHostManager.Properties.Count);
-        }
+    [TestMethod]
+    public void DefaultTestHostManagerShouldNotBeSharedWhenOptedIn()
+    {
+        _testHostManager.Initialize(_mockMessageLogger.Object, $"""
+            <?xml version="1.0" encoding="utf-8"?>
+            <RunSettings>
+            <RunConfiguration>
+                <DisableSharedTestHost>{true}</DisableSharedTestHost>
+            </RunConfiguration>
+            </RunSettings>
+            """);
+        Assert.IsFalse(_testHostManager.Shared);
+    }
 
-        [TestMethod]
-        public void DefaultTestHostManagerShouldBeShared()
-        {
-            Assert.IsTrue(this.testHostManager.Shared);
-        }
+    [TestMethod]
+    public void DefaultTestHostManagerShouldBeShared()
+    {
+        Assert.IsTrue(_testHostManager.Shared);
+    }
 
-        [TestMethod]
-        public void LaunchTestHostShouldUseCustomHostIfSet()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            this.testHostManager.SetCustomLauncher(mockCustomLauncher.Object);
-            var currentProcess = Process.GetCurrentProcess();
-            mockCustomLauncher.Setup(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(currentProcess.Id);
+    [TestMethod]
+    public void LaunchTestHostShouldUseCustomHostIfSet()
+    {
+        var mockCustomLauncher = new Mock<ITestHostLauncher>();
+        _testHostManager.SetCustomLauncher(mockCustomLauncher.Object);
+        var currentProcess = Process.GetCurrentProcess();
+        mockCustomLauncher.Setup(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(currentProcess.Id);
 
-            this.testHostManager.HostLaunched += this.TestHostManagerHostLaunched;
+        _testHostManager.HostLaunched += TestHostManagerHostLaunched;
 
-            Task<bool> pid = this.testHostManager.LaunchTestHostAsync(this.startInfo, CancellationToken.None);
-            pid.Wait();
-            mockCustomLauncher.Verify(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
+        Task<bool> pid = _testHostManager.LaunchTestHostAsync(_startInfo, CancellationToken.None);
+        pid.Wait();
+        mockCustomLauncher.Verify(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()), Times.Once);
 
-            Assert.IsTrue(pid.Result);
-            Assert.AreEqual(currentProcess.Id, this.testHostId);
-        }
+        Assert.IsTrue(pid.Result);
+        Assert.AreEqual(currentProcess.Id, _testHostId);
+    }
 
-        [TestMethod]
-        public void LaunchTestHostShouldSetExitCallbackInCaseCustomHost()
-        {
-            var mockCustomLauncher = new Mock<ITestHostLauncher>();
-            this.testHostManager.SetCustomLauncher(mockCustomLauncher.Object);
-            var currentProcess = Process.GetCurrentProcess();
-            mockCustomLauncher.Setup(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(currentProcess.Id);
-            this.testHostManager.LaunchTestHostAsync(this.startInfo, CancellationToken.None).Wait();
+    [TestMethod]
+    public void LaunchTestHostShouldSetExitCallbackInCaseCustomHost()
+    {
+        var mockCustomLauncher = new Mock<ITestHostLauncher>();
+        _testHostManager.SetCustomLauncher(mockCustomLauncher.Object);
+        var currentProcess = Process.GetCurrentProcess();
+        mockCustomLauncher.Setup(mc => mc.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(currentProcess.Id);
+        _testHostManager.LaunchTestHostAsync(_startInfo, CancellationToken.None).Wait();
 
-            this.mockProcessHelper.Verify(ph => ph.SetExitCallback(currentProcess.Id, It.IsAny<Action<object>>()));
-        }
+        _mockProcessHelper.Verify(ph => ph.SetExitCallback(currentProcess.Id, It.IsAny<Action<object?>>()));
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestSourcesShouldReturnAppropriateSourceIfAppxRecipeIsProvided()
-        {
-            var sourcePath = Path.Combine(Path.GetDirectoryName(typeof(TestableTestHostManager).GetTypeInfo().Assembly.GetAssemblyLocation()), @"..\..\..\..\TestAssets\UWPTestAssets\UnitTestApp8.build.appxrecipe");
-            IEnumerable<string> sources = this.testHostManager.GetTestSources(new List<string> { sourcePath });
-            Assert.IsTrue(sources.Any());
-            Assert.IsTrue(sources.FirstOrDefault().EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
-        }
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestSourcesShouldReturnAppropriateSourceIfAppxRecipeIsProvided()
+    {
+        var sourcePath = Path.Combine(Path.GetDirectoryName(typeof(TestableTestHostManager).Assembly.GetAssemblyLocation())!, @"..\..\..\..\..\test\TestAssets\UWPTestAssets\UnitTestApp8.build.appxrecipe");
+        IEnumerable<string> sources = _testHostManager.GetTestSources(new List<string> { sourcePath });
+        Assert.IsTrue(sources.Any());
+        Assert.IsTrue(sources.First().EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void AppxManifestFileShouldReturnAppropriateSourceIfAppxManifestIsProvided()
-        {
-            var appxManifestPath = Path.Combine(Path.GetDirectoryName(typeof(TestableTestHostManager).GetTypeInfo().Assembly.GetAssemblyLocation()), @"..\..\..\..\TestAssets\UWPTestAssets\AppxManifest.xml");
-            string source = AppxManifestFile.GetApplicationExecutableName(appxManifestPath);
-            Assert.AreEqual("UnitTestApp8.exe", source);
-        }
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void AppxManifestFileShouldReturnAppropriateSourceIfAppxManifestIsProvided()
+    {
+        var appxManifestPath = Path.Combine(Path.GetDirectoryName(typeof(TestableTestHostManager).Assembly.GetAssemblyLocation())!, @"..\..\..\..\..\test\TestAssets\UWPTestAssets\AppxManifest.xml");
+        string? source = AppxManifestFile.GetApplicationExecutableName(appxManifestPath);
+        Assert.AreEqual("UnitTestApp8.exe", source);
+    }
 
-        [TestMethod]
-        public async Task ErrorMessageShouldBeReadAsynchronously()
-        {
-            string errorData = "Custom Error Strings";
-            this.ErrorCallBackTestHelper(errorData, -1);
+    [TestMethod]
+    public async Task ErrorMessageShouldBeReadAsynchronously()
+    {
+        string errorData = "Custom Error Strings";
+        ErrorCallBackTestHelper(errorData, -1);
 
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
 
-            Assert.AreEqual(errorData, this.errorMessage);
-        }
+        Assert.AreEqual(errorData, _errorMessage);
+    }
 
-        [TestMethod]
-        public async Task NoErrorMessageIfExitCodeZero()
-        {
-            string errorData = string.Empty;
-            this.ErrorCallBackTestHelper(errorData, 0);
+    [TestMethod]
+    public async Task NoErrorMessageIfExitCodeZero()
+    {
+        string errorData = string.Empty;
+        ErrorCallBackTestHelper(errorData, 0);
 
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
 
-            Assert.IsNull(this.errorMessage);
-        }
+        Assert.IsNull(_errorMessage);
+    }
 
-        [TestMethod]
-        [DataRow(null)]
-        [DataRow("")]
-        public async Task ErrorReceivedCallbackShouldNotLogNullOrEmptyData(string errorData)
-        {
-            this.ErrorCallBackTestHelper(errorData, -1);
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    public async Task ErrorReceivedCallbackShouldNotLogNullOrEmptyData(string errorData)
+    {
+        ErrorCallBackTestHelper(errorData, -1);
 
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
 
-            Assert.AreEqual(this.errorMessage, string.Empty);
-        }
+        Assert.AreEqual(_errorMessage, string.Empty);
+    }
 
-        [TestMethod]
-        [DataRow(0)]
-        [DataRow(-1)]
-        public async Task ProcessExitedButNoErrorMessageIfNoDataWritten(int exitCode)
-        {
-            this.ExitCallBackTestHelper(exitCode);
+    [TestMethod]
+    [DataRow(0)]
+    [DataRow(-1)]
+    public async Task ProcessExitedButNoErrorMessageIfNoDataWritten(int exitCode)
+    {
+        ExitCallBackTestHelper(exitCode);
 
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
 
-            Assert.AreEqual(this.errorMessage, string.Empty);
-            Assert.AreEqual(this.exitCode, exitCode);
-        }
+        Assert.AreEqual(_errorMessage, string.Empty);
+        Assert.AreEqual(_exitCode, exitCode);
+    }
 
-        [TestMethod]
-        public async Task CleanTestHostAsyncShouldKillTestHostProcess()
-        {
-            var pid = Process.GetCurrentProcess().Id;
-            bool isVerified = false;
-            this.mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>()))
-                .Callback<object>(p => isVerified = ((Process)p).Id == pid);
+    [TestMethod]
+    public async Task CleanTestHostAsyncShouldKillTestHostProcess()
+    {
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        bool isVerified = false;
+        _mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>()))
+            .Callback<object>(p => isVerified = ((Process)p).Id == pid);
+
+        ExitCallBackTestHelper(0);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.CleanTestHostAsync(CancellationToken.None);
+
+        Assert.IsTrue(isVerified);
+    }
 
-            this.ExitCallBackTestHelper(0);
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
-            await this.testableTestHostManager.CleanTestHostAsync(CancellationToken.None);
+    [TestMethod]
+    public async Task CleanTestHostAsyncShouldNotThrowIfTestHostIsNotStarted()
+    {
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        bool isVerified = false;
+        _mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>())).Callback<object>(p => isVerified = ((Process)p).Id == pid).Throws<Exception>();
+
+        ExitCallBackTestHelper(0);
+        await _testableTestHostManager.LaunchTestHostAsync(GetDefaultStartInfo(), CancellationToken.None);
+        await _testableTestHostManager.CleanTestHostAsync(CancellationToken.None);
+
+        Assert.IsTrue(isVerified);
+    }
 
-            Assert.IsTrue(isVerified);
-        }
+    private void TestableTestHostManagerHostExited(object? sender, HostProviderEventArgs e)
+    {
+        _errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
+        _exitCode = e.ErrroCode;
+    }
 
-        [TestMethod]
-        public async Task CleanTestHostAsyncShouldNotThrowIfTestHostIsNotStarted()
+    private void TestHostManagerHostExited(object? sender, HostProviderEventArgs e)
+    {
+        if (e.ErrroCode != 0)
         {
-            var pid = Process.GetCurrentProcess().Id;
-            bool isVerified = false;
-            this.mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>())).Callback<object>(p => isVerified = ((Process)p).Id == pid).Throws<Exception>();
+            _errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
+        }
+    }
 
-            this.ExitCallBackTestHelper(0);
-            await this.testableTestHostManager.LaunchTestHostAsync(this.GetDefaultStartInfo(), CancellationToken.None);
-            await this.testableTestHostManager.CleanTestHostAsync(CancellationToken.None);
+    private void TestHostManagerHostLaunched(object? sender, HostProviderEventArgs e)
+    {
+        _testHostId = e.ProcessId;
+    }
 
-            Assert.IsTrue(isVerified);
-        }
+    [MemberNotNull(nameof(_testableTestHostManager))]
+    private void ErrorCallBackTestHelper(string errorMessage, int exitCode)
+    {
+        _testableTestHostManager = new TestableTestHostManager(
+            Architecture.X64,
+            Framework.DefaultFramework,
+            _mockProcessHelper.Object,
+            true,
+            _mockMessageLogger.Object);
 
-        private void TestableTestHostManagerHostExited(object sender, HostProviderEventArgs e)
-        {
-            this.errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
-            this.exitCode = e.ErrroCode;
-        }
+        _testableTestHostManager.HostExited += TestHostManagerHostExited;
 
-        private void TestHostManagerHostExited(object sender, HostProviderEventArgs e)
-        {
-            if (e.ErrroCode != 0)
-            {
-                this.errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
-            }
-        }
+        _mockProcessHelper.Setup(
+                ph =>
+                    ph.LaunchProcess(
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.IsAny<Action<object?, string?>>(),
+                        It.IsAny<Action<object?>>(),
+                        It.IsAny<Action<object?, string?>>()))
+            .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
+                (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
+                {
+                    var process = Process.GetCurrentProcess();
+
+                    errorCallback(process, errorMessage);
+                    exitCallback(process);
+                }).Returns(Process.GetCurrentProcess());
+
+        _mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
+    }
 
-        private void TestHostManagerHostLaunched(object sender, HostProviderEventArgs e)
-        {
-            this.testHostId = e.ProcessId;
-        }
+    [MemberNotNull(nameof(_testableTestHostManager))]
+    private void ExitCallBackTestHelper(int exitCode)
+    {
+        _testableTestHostManager = new TestableTestHostManager(
+            Architecture.X64,
+            Framework.DefaultFramework,
+            _mockProcessHelper.Object,
+            true,
+            _mockMessageLogger.Object);
 
-        private void ErrorCallBackTestHelper(string errorMessage, int exitCode)
-        {
-            this.testableTestHostManager = new TestableTestHostManager(
-                Architecture.X64,
-                Framework.DefaultFramework,
-                this.mockProcessHelper.Object,
-                true,
-                this.mockMessageLogger.Object);
-
-            this.testableTestHostManager.HostExited += this.TestHostManagerHostExited;
-
-            this.mockProcessHelper.Setup(
-                    ph =>
-                        ph.LaunchProcess(
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.IsAny<Action<object, string>>(),
-                            It.IsAny<Action<object>>(),
-                            It.IsAny<Action<object, string>>()))
-                .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
-                    (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
-                    {
-                        var process = Process.GetCurrentProcess();
-
-                        errorCallback(process, errorMessage);
-                        exitCallback(process);
-                    }).Returns(Process.GetCurrentProcess());
-
-            this.mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
-        }
+        _testableTestHostManager.HostExited += TestableTestHostManagerHostExited;
 
-        private void ExitCallBackTestHelper(int exitCode)
-        {
-            this.testableTestHostManager = new TestableTestHostManager(
-                Architecture.X64,
-                Framework.DefaultFramework,
-                this.mockProcessHelper.Object,
-                true,
-                this.mockMessageLogger.Object);
-
-            this.testableTestHostManager.HostExited += this.TestableTestHostManagerHostExited;
-
-            this.mockProcessHelper.Setup(
-                    ph =>
-                        ph.LaunchProcess(
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.IsAny<Action<object, string>>(),
-                            It.IsAny<Action<object>>(),
-                            It.IsAny<Action<object, string>>()))
-                .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
-                    (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
-                    {
-                        var process = Process.GetCurrentProcess();
-                        exitCallback(process);
-                    }).Returns(Process.GetCurrentProcess());
-
-            this.mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
-        }
+        _mockProcessHelper.Setup(
+                ph =>
+                    ph.LaunchProcess(
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.IsAny<Action<object?, string?>>(),
+                        It.IsAny<Action<object?>>(),
+                        It.IsAny<Action<object?, string?>>()))
+            .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
+                (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
+                {
+                    var process = Process.GetCurrentProcess();
+                    exitCallback(process);
+                }).Returns(Process.GetCurrentProcess());
+
+        _mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
+    }
 
-        private TestProcessStartInfo GetDefaultStartInfo()
-        {
-            return new TestProcessStartInfo();
-        }
+    private static TestProcessStartInfo GetDefaultStartInfo()
+    {
+        return new TestProcessStartInfo();
+    }
 
-        private class TestableTestHostManager : DefaultTestHostManager
+    private class TestableTestHostManager : DefaultTestHostManager
+    {
+        public TestableTestHostManager(
+            Architecture architecture,
+            Framework framework,
+            IProcessHelper processHelper,
+            bool shared,
+            IMessageLogger logger)
+            : base(processHelper, new FileHelper(), new DotnetHostHelper(), new PlatformEnvironment(), new EnvironmentVariableHelper())
         {
-            public TestableTestHostManager(
-                Architecture architecture,
-                Framework framework,
-                IProcessHelper processHelper,
-                bool shared,
-                IMessageLogger logger)
-                : base(processHelper, new FileHelper(), new PlatformEnvironment(), new DotnetHostHelper())
-            {
-                this.Initialize(logger, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{architecture}</TargetPlatform> <TargetFrameworkVersion>{framework}</TargetFrameworkVersion> <DisableAppDomain>{!shared}</DisableAppDomain> </RunConfiguration> </RunSettings>");
-            }
+            Initialize(logger, $"<?xml version=\"1.0\" encoding=\"utf-8\"?><RunSettings> <RunConfiguration> <TargetPlatform>{architecture}</TargetPlatform> <TargetFrameworkVersion>{framework}</TargetFrameworkVersion> <DisableAppDomain>{!shared}</DisableAppDomain> </RunConfiguration> </RunSettings>");
         }
     }
-#pragma warning restore SA1600
 }
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
index ff2b077199..015812c4ab 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
@@ -1,316 +1,312 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.TestHostProvider.UnitTests.Hosting
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+#if NET
+using System.Reflection;
+#endif
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.TestHostProvider.UnitTests.Hosting;
+
+[TestClass]
+public class DotnetTestHostManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-#pragma warning disable SA1600
-
-    [TestClass]
-    public class DotnetTestHostManagerTests
+    private const string DefaultDotnetPath = "c:\\tmp\\dotnet.exe";
+
+    private readonly Mock<ITestHostLauncher> _mockTestHostLauncher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IWindowsRegistryHelper> _mockWindowsRegistry;
+    private readonly Mock<IMessageLogger> _mockMessageLogger;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IRunSettingsHelper> _mockRunsettingHelper;
+    private readonly TestRunnerConnectionInfo _defaultConnectionInfo;
+    private readonly string[] _testSource = ["test.dll"];
+    private readonly string _defaultTestHostPath;
+    private readonly TestProcessStartInfo _defaultTestProcessStartInfo;
+    private readonly TestableDotnetTestHostManager _dotnetHostManager;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariable;
+
+    private string? _errorMessage;
+    private int _exitCode;
+    private int _testHostId;
+
+    private readonly string _temp = Path.GetTempPath();
+
+    public DotnetTestHostManagerTests()
     {
-        private const string DefaultDotnetPath = "c:\\tmp\\dotnet.exe";
-
-        private readonly Mock<ITestHostLauncher> mockTestHostLauncher;
-
-        private readonly Mock<IProcessHelper> mockProcessHelper;
-
-        private readonly Mock<IFileHelper> mockFileHelper;
-
-        private readonly Mock<IWindowsRegistryHelper> mockWindowsRegistry;
-
-        private readonly Mock<IMessageLogger> mockMessageLogger;
-
-        private readonly Mock<IEnvironment> mockEnvironment;
-
-        private readonly Mock<IRunSettingsHelper> mockRunsettingHelper;
-
-        private readonly TestRunnerConnectionInfo defaultConnectionInfo;
-
-        private readonly string[] testSource = { "test.dll" };
-
-        private readonly string defaultTestHostPath;
-
-        private readonly TestProcessStartInfo defaultTestProcessStartInfo;
-
-        private readonly TestableDotnetTestHostManager dotnetHostManager;
-
-        private Mock<IEnvironmentVariableHelper> mockEnvironmentVariable;
-
-        private string errorMessage;
-
-        private int exitCode;
-
-        private int testHostId;
-
-        private string temp = Path.GetTempPath();
-
-        public DotnetTestHostManagerTests()
-        {
-            this.mockTestHostLauncher = new Mock<ITestHostLauncher>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockMessageLogger = new Mock<IMessageLogger>();
-            this.mockEnvironment = new Mock<IEnvironment>();
-            this.mockWindowsRegistry = new Mock<IWindowsRegistryHelper>();
-            this.mockEnvironmentVariable = new Mock<IEnvironmentVariableHelper>();
-            this.mockRunsettingHelper = new Mock<IRunSettingsHelper>();
-            this.defaultConnectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.1:123", Role = ConnectionRole.Client }, RunnerProcessId = 0 };
-
-            this.mockEnvironment.SetupGet(e => e.Architecture).Returns((PlatformArchitecture)Enum.Parse(typeof(PlatformArchitecture), Constants.DefaultPlatform.ToString()));
-            this.mockRunsettingHelper.SetupGet(r => r.IsDefaultTargetArchitecture).Returns(true);
-            string defaultSourcePath = Path.Combine(this.temp, "test.dll");
-            this.defaultTestHostPath = Path.Combine(this.temp, "testhost.dll");
-            this.dotnetHostManager = new TestableDotnetTestHostManager(
-                                         this.mockProcessHelper.Object,
-                                         this.mockFileHelper.Object,
-                                         new DotnetHostHelper(this.mockFileHelper.Object, this.mockEnvironment.Object, this.mockWindowsRegistry.Object, this.mockEnvironmentVariable.Object, this.mockProcessHelper.Object),
-                                         this.mockEnvironment.Object,
-                                         this.mockRunsettingHelper.Object,
-                                         this.mockWindowsRegistry.Object,
-                                         this.mockEnvironmentVariable.Object);
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, string.Empty);
-
-            this.dotnetHostManager.HostExited += this.DotnetHostManagerHostExited;
-
-            // Setup a dummy current process for tests
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns(DefaultDotnetPath);
-            this.mockProcessHelper.Setup(ph => ph.GetTestEngineDirectory()).Returns(DefaultDotnetPath);
-            this.mockEnvironmentVariable.Setup(ev => ev.GetEnvironmentVariable(It.IsAny<string>())).Returns(Path.GetDirectoryName(DefaultDotnetPath));
-            this.mockFileHelper.Setup(ph => ph.Exists(this.defaultTestHostPath)).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists(DefaultDotnetPath)).Returns(true);
-
-            this.mockTestHostLauncher
-                .Setup(th => th.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
-                .Returns(Process.GetCurrentProcess().Id);
-
-            this.mockTestHostLauncher
-                .Setup(th => th.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
-                .Returns(Process.GetCurrentProcess().Id);
-
-            this.defaultTestProcessStartInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { defaultSourcePath }, null, this.defaultConnectionInfo);
-        }
+        _mockTestHostLauncher = new Mock<ITestHostLauncher>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockMessageLogger = new Mock<IMessageLogger>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockWindowsRegistry = new Mock<IWindowsRegistryHelper>();
+        _mockEnvironmentVariable = new Mock<IEnvironmentVariableHelper>();
+        _mockRunsettingHelper = new Mock<IRunSettingsHelper>();
+        _defaultConnectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.1:123", Role = ConnectionRole.Client }, RunnerProcessId = 0 };
+
+        _mockEnvironment.SetupGet(e => e.Architecture).Returns((PlatformArchitecture)Enum.Parse(typeof(PlatformArchitecture), Constants.DefaultPlatform.ToString()));
+        _mockRunsettingHelper.SetupGet(r => r.IsDefaultTargetArchitecture).Returns(true);
+        string defaultSourcePath = Path.Combine(_temp, "test.dll");
+        _defaultTestHostPath = Path.Combine(_temp, "testhost.dll");
+        _dotnetHostManager = new TestableDotnetTestHostManager(
+            _mockProcessHelper.Object,
+            _mockFileHelper.Object,
+            new DotnetHostHelper(_mockFileHelper.Object, _mockEnvironment.Object, _mockWindowsRegistry.Object, _mockEnvironmentVariable.Object, _mockProcessHelper.Object),
+            _mockEnvironment.Object,
+            _mockRunsettingHelper.Object,
+            _mockWindowsRegistry.Object,
+            _mockEnvironmentVariable.Object);
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, string.Empty);
+
+        _dotnetHostManager.HostExited += DotnetHostManagerHostExited;
+
+        // Setup a dummy current process for tests
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns(DefaultDotnetPath);
+        _mockProcessHelper.Setup(ph => ph.GetTestEngineDirectory()).Returns(DefaultDotnetPath);
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessArchitecture()).Returns(PlatformArchitecture.X64);
+        _mockFileHelper.Setup(ph => ph.Exists(_defaultTestHostPath)).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists(DefaultDotnetPath)).Returns(true);
+
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+
+        _mockTestHostLauncher
+            .Setup(th => th.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>()))
+            .Returns(pid);
+
+        _mockTestHostLauncher
+            .Setup(th => th.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
+            .Returns(pid);
+
+        _defaultTestProcessStartInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { defaultSourcePath }, null, _defaultConnectionInfo);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldThrowIfSourceIsNull()
-        {
-            Action action = () => this.dotnetHostManager.GetTestHostProcessStartInfo(null, null, this.defaultConnectionInfo);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldThrowIfSourceIsNull()
+    {
+        Action action = () => _dotnetHostManager.GetTestHostProcessStartInfo(null!, null, _defaultConnectionInfo);
 
-            Assert.ThrowsException<ArgumentNullException>(action);
-        }
+        Assert.ThrowsException<ArgumentNullException>(action);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldThrowIfMultipleSourcesAreProvided()
-        {
-            var sources = new[] { "test1.dll", "test2.dll" };
-            Action action = () => this.dotnetHostManager.GetTestHostProcessStartInfo(sources, null, this.defaultConnectionInfo);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldThrowIfMultipleSourcesAreProvided()
+    {
+        var sources = new[] { "test1.dll", "test2.dll" };
+        Action action = () => _dotnetHostManager.GetTestHostProcessStartInfo(sources, null, _defaultConnectionInfo);
 
-            Assert.ThrowsException<InvalidOperationException>(action);
-        }
+        Assert.ThrowsException<InvalidOperationException>(action);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldInvokeDotnetCommandline()
-        {
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns(DefaultDotnetPath);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldInvokeDotnetCommandline()
+    {
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns(DefaultDotnetPath);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            Assert.AreEqual(DefaultDotnetPath, startInfo.FileName);
-        }
+        Assert.AreEqual(DefaultDotnetPath, startInfo.FileName);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldInvokeDotnetXPlatOnLinux()
-        {
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("/tmp/dotnet");
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldInvokeDotnetXPlatOnLinux()
+    {
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("/tmp/dotnet");
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            Assert.AreEqual("/tmp/dotnet", startInfo.FileName);
-        }
+        Assert.AreEqual("/tmp/dotnet", startInfo.FileName);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldInvokeDotnetExec()
-        {
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            var startInfo = this.GetDefaultStartInfo();
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldInvokeDotnetExec()
+    {
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.StartsWith(startInfo.Arguments, "exec");
-        }
+        StringAssert.StartsWith(startInfo.Arguments, "exec");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldAddRuntimeConfigJsonIfExists()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists("test.runtimeconfig.json")).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldAddRuntimeConfigJsonIfExists()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists("test.runtimeconfig.json")).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.Arguments, "--runtimeconfig \"test.runtimeconfig.json\"");
-        }
+        StringAssert.Contains(startInfo.Arguments, "--runtimeconfig \"test.runtimeconfig.json\"");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldNotAddRuntimeConfigJsonIfNotExists()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists("test.runtimeconfig.json")).Returns(false);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldNotAddRuntimeConfigJsonIfNotExists()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists("test.runtimeconfig.json")).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            Assert.IsFalse(startInfo.Arguments.Contains("--runtimeconfig \"test.runtimeconfig.json\""));
-        }
+        Assert.IsFalse(startInfo.Arguments!.Contains("--runtimeconfig \"test.runtimeconfig.json\""));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldAddDepsFileJsonIfExists()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldAddDepsFileJsonIfExists()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.Arguments, "--depsfile \"test.deps.json\"");
-        }
+        StringAssert.Contains(startInfo.Arguments, "--depsfile \"test.deps.json\"");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldNotAddDepsFileJsonIfNotExists()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(false);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldNotAddDepsFileJsonIfNotExists()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            Assert.IsFalse(startInfo.Arguments.Contains("--depsfile \"test.deps.json\""));
-        }
+        Assert.IsFalse(startInfo.Arguments!.Contains("--depsfile \"test.deps.json\""));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeConnectionInfo()
-        {
-            var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeConnectionInfo()
+    {
+        var connectionInfo = new TestRunnerConnectionInfo { Port = 123, ConnectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.0:123", Role = ConnectionRole.Client, Transport = Transport.Sockets }, RunnerProcessId = 101 };
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(this.testSource, null, connectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(_testSource, null, connectionInfo);
 
-            StringAssert.Contains(startInfo.Arguments, "--port " + connectionInfo.Port + " --endpoint " + connectionInfo.ConnectionInfo.Endpoint + " --role client --parentprocessid 101");
-        }
+        StringAssert.Contains(startInfo.Arguments, "--port " + connectionInfo.Port + " --endpoint " + connectionInfo.ConnectionInfo.Endpoint + " --role client --parentprocessid 101");
+    }
 
-        [TestMethod]
-        public void GetTestHostConnectionInfoShouldIncludeEndpointRoleAndChannelType()
-        {
-            var connectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
+    [TestMethod]
+    public void GetTestHostConnectionInfoShouldIncludeEndpointRoleAndChannelType()
+    {
+        var connectionInfo = new TestHostConnectionInfo { Endpoint = "127.0.0.1:0", Role = ConnectionRole.Client, Transport = Transport.Sockets };
 
-            var info = this.dotnetHostManager.GetTestHostConnectionInfo();
+        var info = _dotnetHostManager.GetTestHostConnectionInfo();
 
-            Assert.AreEqual(connectionInfo, info);
-        }
+        Assert.AreEqual(connectionInfo, info);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeEnvironmentVariables()
-        {
-            var environmentVariables = new Dictionary<string, string> { { "k1", "v1" }, { "k2", "v2" } };
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeEnvironmentVariables()
+    {
+        var environmentVariables = new Dictionary<string, string?> { { "k1", "v1" }, { "k2", "v2" } };
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(this.testSource, environmentVariables, this.defaultConnectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(_testSource, environmentVariables, _defaultConnectionInfo);
 
-            Assert.AreEqual(environmentVariables, startInfo.EnvironmentVariables);
-        }
+        Assert.AreEqual(environmentVariables, startInfo.EnvironmentVariables);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartIfDepsFileNotFoundAndTestHostFoundShouldNotThrowException()
-        {
-            this.mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(false);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartIfDepsFileNotFoundAndTestHostFoundShouldNotThrowException()
+    {
+        _mockFileHelper.Setup(fh => fh.Exists("test.deps.json")).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var startInfo = this.GetDefaultStartInfo();
-            StringAssert.Contains(startInfo.Arguments, "testhost.dll");
-        }
+        var startInfo = GetDefaultStartInfo();
+        StringAssert.Contains(startInfo.Arguments, "testhost.dll");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseTestHostX64ExePresentOnWindows()
-        {
-            var testhostExePath = "testhost.exe";
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldUseTestHostX64ExePresentOnWindows()
+    {
+        var testhostExePath = "testhost.exe";
+        _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.FileName, testhostExePath);
-        }
+        StringAssert.Contains(startInfo.FileName, testhostExePath);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnixWithTestHostDllPath()
-        {
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.x86.exe")).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldUseDotnetExeOnUnixWithTestHostDllPath()
+    {
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.x86.exe")).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
 
-            var startInfo = this.GetDefaultStartInfo();
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.FileName, "dotnet");
-            StringAssert.Contains(startInfo.Arguments, "testhost.dll");
-        }
+        StringAssert.Contains(startInfo.FileName, "dotnet");
+        StringAssert.Contains(startInfo.Arguments, "testhost.dll");
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseTestHostExeIfPresentOnWindows()
-        {
-            var testhostExePath = "testhost.exe";
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldUseTestHostExeIfPresentOnWindows()
+    {
+        var testhostExePath = "testhost.exe";
+        _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
 
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x64</TargetPlatform></RunConfiguration></RunSettings>");
-            var startInfo = this.GetDefaultStartInfo();
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x64</TargetPlatform></RunConfiguration></RunSettings>");
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.FileName, testhostExePath);
-        }
+        StringAssert.Contains(startInfo.FileName, testhostExePath);
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldUseDotnetHostPathFromRunsettings()
-        {
-            var dotnetHostPath = @"C:\dotnet.exe";
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, $"<RunSettings><RunConfiguration><DotNetHostPath>{dotnetHostPath}</DotNetHostPath></RunConfiguration></RunSettings>");
-            var startInfo = this.GetDefaultStartInfo();
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldUseDotnetHostPathFromRunsettings()
+    {
+        var dotnetHostPath = @"C:\dotnet.exe";
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, $"<RunSettings><RunConfiguration><DotNetHostPath>{dotnetHostPath}</DotNetHostPath></RunConfiguration></RunSettings>");
+        var startInfo = GetDefaultStartInfo();
 
-            StringAssert.Contains(startInfo.FileName, dotnetHostPath);
-        }
+        StringAssert.Contains(startInfo.FileName, dotnetHostPath);
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundInSourceLocation()
-        {
-            var testhostExePath = "testhost.exe";
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x64</TargetPlatform></RunConfiguration></RunSettings>");
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
-            this.mockFileHelper.Setup(ph => ph.Exists("C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp2.1\\x64\\testhost.exe")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-
-            string runtimeConfigFileContent =
-@"{
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundInSourceLocation()
+    {
+        var testhostExePath = "testhost.exe";
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x64</TargetPlatform></RunConfiguration></RunSettings>");
+        _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists("C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x64\\testhost.exe")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        var sourcePath = Path.Combine(_temp, "test.dll");
+
+        string runtimeConfigFileContent =
+            @"{
     ""runtimeOptions"": {
         ""additionalProbingPaths"": [
             ""C:\\packages""
@@ -318,8 +314,8 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
         }
 }";
 
-            string depsFileContent =
-@"{
+        string depsFileContent =
+            @"{
     ""runtimeTarget"": {
         ""name"": "".NETCoreApp,Version=v1.0"",
         ""signature"": ""8f25843f8e35a3e80ef4ae98b95117ea5c468b3f""
@@ -330,7 +326,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
             ""microsoft.testplatform.testhost/15.0.0-Dev"": {
                 ""dependencies"": {
                     ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
-                    ""Newtonsoft.Json"": ""9.0.1""
+                    ""Newtonsoft.Json"": ""13.0.3""
                 },
                 ""runtime"": {
                     ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
@@ -352,35 +348,38 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
     }
 }";
 
-            MemoryStream runtimeConfigStream = new MemoryStream(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
+        MemoryStream runtimeConfigStream = new(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-            MemoryStream depsFileStream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
+        MemoryStream depsFileStream = new(Encoding.UTF8.GetBytes(depsFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            string testHostFullPath = @"C:\packages\microsoft.testplatform.testhost/15.0.0-Dev\lib/netstandard1.5/testhost.dll";
-            this.mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
+        string testHostFullPath = @"C:\packages\microsoft.testplatform.testhost/15.0.0-Dev\lib/netstandard1.5/testhost.dll";
+        _mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp2.1\\x64\\testhost.exe");
-        }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoundInSourceLocation()
-        {
-            var testhostExePath = "testhost.x86.exe";
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>");
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
-            this.mockFileHelper.Setup(ph => ph.Exists($"C:\\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost\\15.0.0-Dev{Path.DirectorySeparatorChar}build\\netcoreapp2.1\\x86\\testhost.x86.exe")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-
-            string runtimeConfigFileContent =
-@"{
+        // If this starts failing after updating TFMs of packakges, the GetTestHostProcessStartInfo defines the default version
+        // to use in GetTestHostProcessStartInfo, change that to the lowest supported netcore version, and pass this test.
+        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x64\\testhost.exe");
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoundInSourceLocation()
+    {
+        var testhostExePath = "testhost.x86.exe";
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, "<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>");
+        _mockFileHelper.Setup(ph => ph.Exists(testhostExePath)).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists($"C:\\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost\\15.0.0-Dev{Path.DirectorySeparatorChar}build\\net8.0\\x86\\testhost.x86.exe")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        var sourcePath = Path.Combine(_temp, "test.dll");
+
+        string runtimeConfigFileContent =
+            @"{
     ""runtimeOptions"": {
         ""additionalProbingPaths"": [
             ""C:\\packages""
@@ -388,8 +387,8 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
         }
 }";
 
-            string depsFileContent =
-@"{
+        string depsFileContent =
+            @"{
     ""runtimeTarget"": {
         ""name"": "".NETCoreApp,Version=v1.0"",
         ""signature"": ""8f25843f8e35a3e80ef4ae98b95117ea5c468b3f""
@@ -400,7 +399,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
             ""microsoft.testplatform.testhost/15.0.0-Dev"": {
                 ""dependencies"": {
                     ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
-                    ""Newtonsoft.Json"": ""9.0.1""
+                    ""Newtonsoft.Json"": ""13.0.3""
                 },
                 ""runtime"": {
                     ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
@@ -422,274 +421,309 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
     }
 }";
 
-            MemoryStream runtimeConfigStream = new MemoryStream(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
+        MemoryStream runtimeConfigStream = new(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-            MemoryStream depsFileStream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
+        MemoryStream depsFileStream = new(Encoding.UTF8.GetBytes(depsFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
-            this.mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
+        string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
+        _mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
-
-            StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\netcoreapp2.1\\x86\\testhost.x86.exe");
-        }
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-        [TestMethod]
-        public void LaunchTestHostShouldLaunchProcessWithNullEnvironmentVariablesOrArgs()
-        {
-            var expectedProcessId = Process.GetCurrentProcess().Id;
-            this.mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(expectedProcessId);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            var startInfo = this.GetDefaultStartInfo();
-            this.dotnetHostManager.SetCustomLauncher(this.mockTestHostLauncher.Object);
+        // If this starts failing after updating TFMs of packakges, the GetTestHostProcessStartInfo defines the default version
+        // to use in GetTestHostProcessStartInfo, change that to the lowest supported netcore version, and pass this test.
+        StringAssert.Contains(startInfo.FileName, "C:\\packages\\microsoft.testplatform.testhost\\15.0.0-Dev\\build\\net8.0\\x86\\testhost.x86.exe");
+    }
 
-            this.dotnetHostManager.HostLaunched += this.DotnetHostManagerHostLaunched;
+    [TestMethod]
+    public void LaunchTestHostShouldLaunchProcessWithNullEnvironmentVariablesOrArgs()
+    {
+#if NET5_0_OR_GREATER
+        var expectedProcessId = Environment.ProcessId;
+#else
+        int expectedProcessId;
+        using (var p = Process.GetCurrentProcess())
+            expectedProcessId = p.Id;
+#endif
+        _mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(expectedProcessId);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        var startInfo = GetDefaultStartInfo();
+        _dotnetHostManager.SetCustomLauncher(_mockTestHostLauncher.Object);
+
+        _dotnetHostManager.HostLaunched += DotnetHostManagerHostLaunched;
+
+        Task<bool> processId = _dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
+        processId.Wait();
+
+        Assert.IsTrue(processId.Result);
+        Assert.AreEqual(expectedProcessId, _testHostId);
+    }
 
-            Task<bool> processId = this.dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
-            processId.Wait();
+    [TestMethod]
+    public void LaunchTestHostAsyncShouldNotStartHostProcessIfCancellationTokenIsSet()
+    {
+#if NET5_0_OR_GREATER
+        var expectedProcessId = Environment.ProcessId;
+#else
+        int expectedProcessId;
+        using (var p = Process.GetCurrentProcess())
+            expectedProcessId = p.Id;
+#endif
+        _mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(expectedProcessId);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+        var startInfo = GetDefaultStartInfo();
+
+        CancellationTokenSource cancellationTokenSource = new();
+        cancellationTokenSource.Cancel();
+
+        Assert.ThrowsException<OperationCanceledException>(() => _dotnetHostManager.LaunchTestHostAsync(startInfo, cancellationTokenSource.Token).Wait());
+    }
 
-            Assert.IsTrue(processId.Result);
-            Assert.AreEqual(expectedProcessId, this.testHostId);
-        }
+    [TestMethod]
+    public void LaunchTestHostShouldLaunchProcessWithEnvironmentVariables()
+    {
+        var variables = new Dictionary<string, string?> { { "k1", "v1" }, { "k2", "v2" } };
+        var startInfo = new TestProcessStartInfo { EnvironmentVariables = variables };
+        _dotnetHostManager.SetCustomLauncher(_mockTestHostLauncher.Object);
 
-        [TestMethod]
-        public void LaunchTestHostAsyncShouldNotStartHostProcessIfCancellationTokenIsSet()
-        {
-            var expectedProcessId = Process.GetCurrentProcess().Id;
-            this.mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(expectedProcessId);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
-            var startInfo = this.GetDefaultStartInfo();
+        _dotnetHostManager.HostLaunched += DotnetHostManagerHostLaunched;
 
-            CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
+        Task<bool> processId = _dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
+        processId.Wait();
 
-            Assert.ThrowsException<AggregateException>(() => this.dotnetHostManager.LaunchTestHostAsync(startInfo, cancellationTokenSource.Token).Wait());
-        }
+        Assert.IsTrue(processId.Result);
+        _mockTestHostLauncher.Verify(thl => thl.LaunchTestHost(It.Is<TestProcessStartInfo>(x => x.EnvironmentVariables!.Equals(variables)), It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void LaunchTestHostShouldLaunchProcessWithEnvironmentVariables()
-        {
-            var variables = new Dictionary<string, string> { { "k1", "v1" }, { "k2", "v2" } };
-            var startInfo = new TestProcessStartInfo { EnvironmentVariables = variables };
-            this.dotnetHostManager.SetCustomLauncher(this.mockTestHostLauncher.Object);
+    [TestMethod]
+    public void DotnetTestHostManagerShouldNotBeShared()
+    {
+        Assert.IsFalse(_dotnetHostManager.Shared);
+    }
 
-            this.dotnetHostManager.HostLaunched += this.DotnetHostManagerHostLaunched;
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldThrowExceptionWhenDotnetIsNotInstalled()
+    {
+        // To validate the else part, set current process to exe other than dotnet
+        _mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("vstest.console.exe");
 
-            Task<bool> processId = this.dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None);
-            processId.Wait();
+        // Reset the muxer
+        _mockEnvironmentVariable.Setup(ev => ev.GetEnvironmentVariable(It.IsAny<string>())).Returns(string.Empty);
 
-            Assert.IsTrue(processId.Result);
-            this.mockTestHostLauncher.Verify(thl => thl.LaunchTestHost(It.Is<TestProcessStartInfo>(x => x.EnvironmentVariables.Equals(variables)), It.IsAny<CancellationToken>()), Times.Once);
+        char separator = ';';
+        var dotnetExeName = "dotnet.exe";
+        if (!Environment.OSVersion.Platform.ToString().StartsWith("Win"))
+        {
+            separator = ':';
+            dotnetExeName = "dotnet";
         }
 
-        [TestMethod]
-        public void DotnetTestHostManagerShouldNotBeShared()
+        var paths = Environment.GetEnvironmentVariable("PATH")!.Split(separator);
+
+        foreach (string path in paths)
         {
-            Assert.IsFalse(this.dotnetHostManager.Shared);
+            string dotnetExeFullPath = Path.Combine(path.Trim(), dotnetExeName);
+            _mockFileHelper.Setup(fh => fh.Exists(dotnetExeFullPath)).Returns(false);
         }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldThrowExceptionWhenDotnetIsNotInstalled()
-        {
-            // To validate the else part, set current process to exe other than dotnet
-            this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("vstest.console.exe");
-
-            // Reset the muxer
-            this.mockEnvironmentVariable.Setup(ev => ev.GetEnvironmentVariable(It.IsAny<string>())).Returns(string.Empty);
-
-            char separator = ';';
-            var dotnetExeName = "dotnet.exe";
-            if (!System.Environment.OSVersion.Platform.ToString().StartsWith("Win"))
-            {
-                separator = ':';
-                dotnetExeName = "dotnet";
-            }
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
 
-            var paths = Environment.GetEnvironmentVariable("PATH").Split(separator);
+        Action action = () => GetDefaultStartInfo();
 
-            foreach (string path in paths)
-            {
-                string dotnetExeFullPath = Path.Combine(path.Trim(), dotnetExeName);
-                this.mockFileHelper.Setup(fh => fh.Exists(dotnetExeFullPath)).Returns(false);
-            }
+        Assert.ThrowsException<TestPlatformException>(action);
+    }
 
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeSourceDirectoryAsWorkingDirectory()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "testhost.dll"))).Returns(true);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            Action action = () => this.GetDefaultStartInfo();
+        Assert.AreEqual(Path.GetDirectoryName(_temp), startInfo.WorkingDirectory);
+    }
 
-            Assert.ThrowsException<TestPlatformException>(action);
-        }
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldReturnEmptySetIfSourceDirectoryDoesNotExist()
+    {
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
+        var extensions = _dotnetHostManager.GetTestPlatformExtensions(new[] { $".{Path.DirectorySeparatorChar}foo.dll" }, []);
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeSourceDirectoryAsWorkingDirectory()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "testhost.dll"))).Returns(true);
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        Assert.AreEqual(0, extensions.Count());
+    }
 
-            Assert.AreEqual(Path.GetDirectoryName(this.temp), startInfo.WorkingDirectory);
-        }
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldReturnLibrariesFromSourceDirectory()
+    {
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.TestAdapter.dll" });
+        var extensions = _dotnetHostManager.GetTestPlatformExtensions(new[] { $".{Path.DirectorySeparatorChar}foo.dll" }, []);
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldReturnEmptySetIfSourceDirectoryDoesNotExist()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
-            var extensions = this.dotnetHostManager.GetTestPlatformExtensions(new[] { $".{Path.DirectorySeparatorChar}foo.dll" }, Enumerable.Empty<string>());
+        CollectionAssert.AreEqual(new[] { "foo.TestAdapter.dll" }, extensions.ToArray());
+    }
 
-            Assert.AreEqual(0, extensions.Count());
-        }
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldReturnEmptySetIfSourceDirectoryIsEmpty()
+    {
+        // Parent directory is empty since the input source is file "test.dll"
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.dll" });
+        var extensions = _dotnetHostManager.GetTestPlatformExtensions(_testSource, []);
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldReturnLibariesFromSourceDirectory()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.TestAdapter.dll" });
-            var extensions = this.dotnetHostManager.GetTestPlatformExtensions(new[] { $".{Path.DirectorySeparatorChar}foo.dll" }, Enumerable.Empty<string>());
+        Assert.AreEqual(0, extensions.Count());
+    }
 
-            CollectionAssert.AreEqual(new[] { "foo.TestAdapter.dll" }, extensions.ToArray());
-        }
+    [TestMethod]
+    public void GetTestPlatformExtensionsShouldNotAddNonCoverletDataCollectorsExtensionsIfPresent()
+    {
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.dll" });
+        var extensions = _dotnetHostManager.GetTestPlatformExtensions(_testSource, ["abc.dataollector.dll"]);
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldReturnEmptySetIfSourceDirectoryIsEmpty()
-        {
-            // Parent directory is empty since the input source is file "test.dll"
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.dll" });
-            var extensions = this.dotnetHostManager.GetTestPlatformExtensions(this.testSource, Enumerable.Empty<string>());
+        Assert.AreEqual(0, extensions.Count());
+    }
 
-            Assert.AreEqual(0, extensions.Count());
-        }
+    [TestMethod]
+    public async Task LaunchTestHostShouldLaunchProcessWithConnectionInfo()
+    {
+        var expectedArgs = "exec \"" + _defaultTestHostPath + "\""
+#if NET
+            + " --roll-forward Major"
+#endif
+            + " --port 123 --endpoint 127.0.0.1:123 --role client --parentprocessid 0";
+        _dotnetHostManager.SetCustomLauncher(_mockTestHostLauncher.Object);
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
+
+        _mockTestHostLauncher.Verify(thl => thl.LaunchTestHost(It.Is<TestProcessStartInfo>(x => x.Arguments!.Equals(expectedArgs)), It.IsAny<CancellationToken>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void GetTestPlatformExtensionsShouldNotAddNonCoverletDataCollectorsExtensionsIfPresent()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            this.mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, It.IsAny<string[]>())).Returns(new[] { "foo.dll" });
-            var extensions = this.dotnetHostManager.GetTestPlatformExtensions(this.testSource, new List<string> { "abc.dataollector.dll" });
+    [TestMethod]
+    public void LaunchTestHostShouldSetExitCallBackInCaseCustomHost()
+    {
+#if NET5_0_OR_GREATER
+        var expectedProcessId = Environment.ProcessId;
+#else
+        int expectedProcessId;
+        using (var p = Process.GetCurrentProcess())
+            expectedProcessId = p.Id;
+#endif
+        _mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(expectedProcessId);
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+
+        var startInfo = GetDefaultStartInfo();
+        _dotnetHostManager.SetCustomLauncher(_mockTestHostLauncher.Object);
+        _dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None).Wait();
+
+        _mockProcessHelper.Verify(ph => ph.SetExitCallback(expectedProcessId, It.IsAny<Action<object?>>()));
+    }
 
-            Assert.AreEqual(0, extensions.Count());
-        }
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfDepsFileNotFound()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
+        string expectedTestHostPath = Path.Combine(_temp, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-        [TestMethod]
-        public async Task LaunchTestHostShouldLaunchProcessWithConnectionInfo()
-        {
-            var expectedArgs = "exec \"" + this.defaultTestHostPath + "\" --port 123 --endpoint 127.0.0.1:123 --role client --parentprocessid 0";
-            this.dotnetHostManager.SetCustomLauncher(this.mockTestHostLauncher.Object);
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            this.mockTestHostLauncher.Verify(thl => thl.LaunchTestHost(It.Is<TestProcessStartInfo>(x => x.Arguments.Equals(expectedArgs)), It.IsAny<CancellationToken>()), Times.Once);
-        }
+        StringAssert.Contains(startInfo.Arguments, expectedTestHostPath);
+    }
 
-        [TestMethod]
-        public void LaunchTestHostShouldSetExitCallBackInCaseCustomHost()
-        {
-            var expectedProcessId = Process.GetCurrentProcess().Id;
-            this.mockTestHostLauncher.Setup(thl => thl.LaunchTestHost(It.IsAny<TestProcessStartInfo>(), It.IsAny<CancellationToken>())).Returns(expectedProcessId);
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.dll")).Returns(true);
+    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as net8.0. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
+    // Assembly.GetEntryAssembly().Location is null because of running in app domain.
+#if NET
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunnerIfTesthostDllIsNoFoundAndDepsFileNotFound()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
+        string testhostNextToTestDll = Path.Combine(_temp, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(testhostNextToTestDll)).Returns(false);
+
+        var here = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!;
+        var expectedTestHostPath = Path.Combine(here, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
+
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
+
+        StringAssert.Contains(startInfo.Arguments, expectedTestHostPath);
+        var expectedAdditionalDepsPath = Path.Combine(here, "testhost.deps.json");
+        StringAssert.Contains(startInfo.Arguments, $"--additional-deps \"{expectedAdditionalDepsPath}\"");
+        var expectedAdditionalProbingPath = here;
+        StringAssert.Contains(startInfo.Arguments, $"--additionalprobingpath \"{expectedAdditionalProbingPath}\"");
+        var expectedRuntimeConfigPath = Path.Combine(here, "testhost-latest.runtimeconfig.json");
+        StringAssert.Contains(startInfo.Arguments, $"--runtimeconfig \"{expectedRuntimeConfigPath}\"");
+    }
 
-            var startInfo = this.GetDefaultStartInfo();
-            this.dotnetHostManager.SetCustomLauncher(this.mockTestHostLauncher.Object);
-            this.dotnetHostManager.LaunchTestHostAsync(startInfo, CancellationToken.None).Wait();
+#endif
 
-            this.mockProcessHelper.Verify(ph => ph.SetExitCallback(expectedProcessId, It.IsAny<Action<object>>()));
-        }
+    // TODO: This assembly was previously compiled as net472 and so it was skipped and only ran as net8.0. This fails in test, but works in code that is not isolated in appdomain. Might be worth fixing because we get one null here, and another in DotnetTestHostManager.
+    // Assembly.GetEntryAssembly().Location is null because of running in app domain.
+#if NET
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfDepsFileNotFound()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-            string expectedTestHostPath = Path.Combine(this.temp, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
+    [TestMethod]
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+    // we can't put in a "default" value, and we don't have other way to determine if this provided value is the
+    // runtime default or the actual value that user provided, so right now the default will use the latest, instead
+    // or the more correct 1.0, it should be okay, as that version is not supported anymore anyway
+    [DataRow("net8.0", "8.0", true)]
 
-            StringAssert.Contains(startInfo.Arguments, expectedTestHostPath);
-        }
+    // net9.0 is currently the latest released version, but it still has it's own runtime config, it is not the same as
+    // "latest" which means the latest you have on system. So if you have only 5.0 SDK then net8.0 will fail because it can't find net8.0,
+    // but latest would use net9.0 because that is the latest one on your system.
+    [DataRow("net9.0", "9.0", true)]
+    [DataRow("net9.0", "latest", false)]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunnerIfTesthostDllIsNoFoundAndDepsFileNotFoundWithTheCorrectTfm(string tfm, string suffix, bool runtimeConfigExists)
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
+        string testhostNextToTestDll = Path.Combine(_temp, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(testhostNextToTestDll)).Returns(false);
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunnerIfTesthostDllIsNoFoundAndDepsFileNotFound()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-            string testhostNextToTestDll = Path.Combine(this.temp, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostNextToTestDll)).Returns(false);
-
-            var here = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            var expectedTestHostPath = Path.Combine(here, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
-
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
-
-            StringAssert.Contains(startInfo.Arguments, expectedTestHostPath);
-            var expectedAdditionalDepsPath = Path.Combine(here, "testhost.deps.json");
-            StringAssert.Contains(startInfo.Arguments, $"--additional-deps \"{expectedAdditionalDepsPath}\"");
-            var expectedAdditionalProbingPath = here;
-            StringAssert.Contains(startInfo.Arguments, $"--additionalprobingpath \"{expectedAdditionalProbingPath}\"");
-            var expectedRuntimeConfigPath = Path.Combine(here, "testhost-latest.runtimeconfig.json");
-            StringAssert.Contains(startInfo.Arguments, $"--runtimeconfig \"{expectedRuntimeConfigPath}\"");
-        }
+        var here = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)!;
+        var testhostNextToRunner = Path.Combine(here, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(testhostNextToRunner)).Returns(true);
 
-        [TestMethod]
-
-        // we can't put in a "default" value, and we don't have other way to determine if this provided value is the
-        // runtime default or the actual value that user provided, so right now the default will use the latest, instead
-        // or the more correct 1.0, it should be okay, as that version is not supported anymore anyway
-        [DataRow("netcoreapp1.0", "latest")]
-        [DataRow("netcoreapp2.1", "2.1")]
-        [DataRow("netcoreapp3.1", "3.1")]
-        [DataRow("net5.0", "5.0")]
-
-        // net6.0 is currently the latest released version, but it still has it's own runtime config, it is not the same as
-        // "latest" which means the latest you have on system. So if you have only 5.0 SDK then net6.0 will fail because it can't find net6.0,
-        // but latest would use net5.0 because that is the latest one on your system.
-        [DataRow("net6.0", "6.0")]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathNextToTestRunnerIfTesthostDllIsNoFoundAndDepsFileNotFoundWithTheCorrectTfm(string tfm, string suffix)
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-            string testhostNextToTestDll = Path.Combine(this.temp, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostNextToTestDll)).Returns(false);
+        _mockFileHelper.Setup(ph => ph.Exists(It.Is<string>(s => s.Contains($"{suffix}.runtimeconfig.json")))).Returns(runtimeConfigExists);
 
-            var here = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            var testhostNextToRunner = Path.Combine(here, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(testhostNextToRunner)).Returns(true);
+        _dotnetHostManager.Initialize(_mockMessageLogger.Object, $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{tfm}</TargetFrameworkVersion></RunConfiguration></RunSettings>");
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            this.dotnetHostManager.Initialize(this.mockMessageLogger.Object, $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{tfm}</TargetFrameworkVersion></RunConfiguration></RunSettings>");
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        var expectedRuntimeConfigPath = Path.Combine(here, $"testhost-{suffix}.runtimeconfig.json");
+        StringAssert.Contains(startInfo.Arguments, $"--runtimeconfig \"{expectedRuntimeConfigPath}\"");
+    }
 
-            var expectedRuntimeConfigPath = Path.Combine(here, $"testhost-{suffix}.runtimeconfig.json");
-            StringAssert.Contains(startInfo.Arguments, $"--runtimeconfig \"{expectedRuntimeConfigPath}\"");
-        }
+#endif
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfRunConfigDevFileNotFound()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
-            string expectedTestHostPath = Path.Combine(this.temp, "testhost.dll");
-            this.mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfRunConfigDevFileNotFound()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
+        string expectedTestHostPath = Path.Combine(_temp, "testhost.dll");
+        _mockFileHelper.Setup(ph => ph.Exists(expectedTestHostPath)).Returns(true);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            Assert.IsTrue(startInfo.Arguments.Contains(expectedTestHostPath));
-        }
+        Assert.IsTrue(startInfo.Arguments!.Contains(expectedTestHostPath));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
 
-            string runtimeConfigFileContent =
-@"{
+        string runtimeConfigFileContent =
+            @"{
     ""runtimeOptions"": {
         ""additionalProbingPaths"": [
             ""C:\\packages""
@@ -697,8 +731,8 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
         }
 }";
 
-            string depsFileContent =
-@"{
+        string depsFileContent =
+            @"{
     ""runtimeTarget"": {
         ""name"": "".NETCoreApp,Version=v1.0"",
         ""signature"": ""8f25843f8e35a3e80ef4ae98b95117ea5c468b3f""
@@ -709,7 +743,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
             ""microsoft.testplatform.testhost/15.0.0-Dev"": {
                 ""dependencies"": {
                     ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
-                    ""Newtonsoft.Json"": ""9.0.1""
+                    ""Newtonsoft.Json"": ""13.0.3""
                 },
                 ""runtime"": {
                     ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
@@ -731,30 +765,30 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
     }
 }";
 
-            MemoryStream runtimeConfigStream = new MemoryStream(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
+        MemoryStream runtimeConfigStream = new(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-            MemoryStream depsFileStream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
+        MemoryStream depsFileStream = new(Encoding.UTF8.GetBytes(depsFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
-            this.mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
+        string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
+        _mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            Assert.IsTrue(startInfo.Arguments.Contains(testHostFullPath));
-        }
+        Assert.IsTrue(startInfo.Arguments!.Contains(testHostFullPath));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfNugetpathDoesntExist()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirectoryIfNugetpathDoesntExist()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
 
-            string runtimeConfigFileContent =
-@"{
+        string runtimeConfigFileContent =
+            @"{
     ""runtimeOptions"": {
         ""additionalProbingPaths"": [
             ""C:\\packages""
@@ -762,8 +796,8 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
         }
 }";
 
-            string depsFileContent =
-@"{
+        string depsFileContent =
+            @"{
     ""runtimeTarget"": {
         ""name"": "".NETCoreApp,Version=v1.0"",
         ""signature"": ""8f25843f8e35a3e80ef4ae98b95117ea5c468b3f""
@@ -774,7 +808,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
             ""microsoft.testplatform.testhost/15.0.0-Dev"": {
                 ""dependencies"": {
                     ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
-                    ""Newtonsoft.Json"": ""9.0.1""
+                    ""Newtonsoft.Json"": ""13.0.3""
                 },
                 ""runtime"": {
                     ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
@@ -796,32 +830,32 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
     }
 }";
 
-            MemoryStream runtimeConfigStream = new MemoryStream(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
+        MemoryStream runtimeConfigStream = new(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-            MemoryStream depsFileStream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
+        MemoryStream depsFileStream = new(Encoding.UTF8.GetBytes(depsFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
-            this.mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(false);
+        string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
+        _mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(false);
 
-            string testHostPath = Path.Combine(this.temp, "testhost.dll");
+        string testHostPath = Path.Combine(_temp, "testhost.dll");
 
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-            Assert.IsTrue(startInfo.Arguments.Contains(testHostPath));
-        }
+        Assert.IsTrue(startInfo.Arguments!.Contains(testHostPath));
+    }
 
-        [TestMethod]
-        public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
-        {
-            // Absolute path to the source directory
-            var sourcePath = Path.Combine(this.temp, "test.dll");
+    [TestMethod]
+    public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
+    {
+        // Absolute path to the source directory
+        var sourcePath = Path.Combine(_temp, "test.dll");
 
-            string runtimeConfigFileContent =
-@"{
+        string runtimeConfigFileContent =
+            @"{
     ""runtimeOptions"": {
         ""additionalProbingPaths"": [
             ""C:\\Users\\bob\\.dotnet\\store\\|arch|\\|tfm|"",
@@ -830,8 +864,8 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
         }
 }";
 
-            string depsFileContent =
-@"{
+        string depsFileContent =
+            @"{
     ""runtimeTarget"": {
         ""name"": "".NETCoreApp,Version=v1.0"",
         ""signature"": ""8f25843f8e35a3e80ef4ae98b95117ea5c468b3f""
@@ -842,7 +876,7 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
             ""microsoft.testplatform.testhost/15.0.0-Dev"": {
                 ""dependencies"": {
                     ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
-                    ""Newtonsoft.Json"": ""9.0.1""
+                    ""Newtonsoft.Json"": ""13.0.3""
                 },
                 ""runtime"": {
                     ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
@@ -864,217 +898,222 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
     }
 }";
 
-            MemoryStream runtimeConfigStream = new MemoryStream(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.runtimeconfig.dev.json"))).Returns(true);
-
-            MemoryStream depsFileStream = new MemoryStream(Encoding.UTF8.GetBytes(depsFileContent));
-            this.mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(this.temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
-            this.mockFileHelper.Setup(ph => ph.Exists(Path.Combine(this.temp, "test.deps.json"))).Returns(true);
-
-            string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
-            this.mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
-
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, this.defaultConnectionInfo);
-
-            Assert.IsTrue(startInfo.Arguments.Contains(testHostFullPath));
-        }
-
-        [TestMethod]
-        [DataRow("DOTNET_ROOT(x86)", "x86")]
-        [DataRow("DOTNET_ROOT", "x64")]
-        [DataRow("DOTNET_ROOT_WRONG", "")]
-        [TestCategory("Windows")]
-        public void GetTestHostProcessStartInfoShouldForwardDOTNET_ROOTEnvVarsForAppHost(string envVar, string expectedValue)
-        {
-            this.mockFileHelper.Setup(ph => ph.Exists("testhost.exe")).Returns(true);
-            this.mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvironmentVariable.Reset();
-            this.mockEnvironmentVariable.Setup(x => x.GetEnvironmentVariable($"VSTEST_WINAPPHOST_{envVar}")).Returns(expectedValue);
-
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(this.testSource, null, this.defaultConnectionInfo);
-            if (!string.IsNullOrEmpty(expectedValue))
-            {
-                Assert.AreEqual(1, startInfo.EnvironmentVariables.Count);
-                Assert.IsNotNull(startInfo.EnvironmentVariables[envVar]);
-                Assert.AreEqual(startInfo.EnvironmentVariables[envVar], expectedValue);
-            }
-            else
-            {
-                Assert.AreEqual(0, startInfo.EnvironmentVariables.Count);
-            }
-        }
+        MemoryStream runtimeConfigStream = new(Encoding.UTF8.GetBytes(runtimeConfigFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.runtimeconfig.dev.json"), FileMode.Open, FileAccess.Read)).Returns(runtimeConfigStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.runtimeconfig.dev.json"))).Returns(true);
 
-        [TestMethod]
-        public async Task DotNetCoreErrorMessageShouldBeReadAsynchronouslyAsync()
-        {
-            var errorData = "Custom Error Strings";
-            this.ErrorCallBackTestHelper(errorData, -1);
+        MemoryStream depsFileStream = new(Encoding.UTF8.GetBytes(depsFileContent));
+        _mockFileHelper.Setup(ph => ph.GetStream(Path.Combine(_temp, "test.deps.json"), FileMode.Open, FileAccess.Read)).Returns(depsFileStream);
+        _mockFileHelper.Setup(ph => ph.Exists(Path.Combine(_temp, "test.deps.json"))).Returns(true);
 
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        string testHostFullPath = $@"C:\packages{Path.DirectorySeparatorChar}microsoft.testplatform.testhost/15.0.0-Dev{Path.DirectorySeparatorChar}lib/netstandard1.5/testhost.dll";
+        _mockFileHelper.Setup(ph => ph.Exists(testHostFullPath)).Returns(true);
 
-            Assert.AreEqual(errorData, this.errorMessage);
-        }
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(new[] { sourcePath }, null, _defaultConnectionInfo);
 
-        [TestMethod]
-        public async Task DotNetCoreNoErrorMessageIfExitCodeZero()
-        {
-            string errorData = string.Empty;
-            this.ErrorCallBackTestHelper(errorData, 0);
-
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        Assert.IsTrue(startInfo.Arguments!.Contains(testHostFullPath));
+    }
 
-            Assert.IsNull(this.errorMessage);
-        }
+    [TestMethod]
+    [DataRow("x64")]
+    [DataRow("x86")]
+    [DataRow("arm64")]
+    public void GetTestHostProcessStartInfoShouldForwardDOTNET_ROOTEnvVarsForAppHost(string architecture)
+    {
+        var path = @"C:\dotnet";
+        _mockFileHelper.Setup(ph => ph.Exists("testhost.exe")).Returns(true);
+        _mockEnvironment.Setup(ev => ev.OperatingSystem).Returns(PlatformOperatingSystem.Windows);
+        _mockEnvironmentVariable.Reset();
+        _mockEnvironmentVariable.Setup(x => x.GetEnvironmentVariable($"VSTEST_DOTNET_ROOT_PATH")).Returns(path);
+        _mockEnvironmentVariable.Setup(x => x.GetEnvironmentVariable($"VSTEST_DOTNET_ROOT_ARCHITECTURE")).Returns(architecture);
+
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(_testSource, null, _defaultConnectionInfo);
+
+        var envVar = $"DOTNET_ROOT_{architecture.ToUpperInvariant()}";
+        Assert.IsNotNull(startInfo.EnvironmentVariables![envVar]);
+        Assert.AreEqual(startInfo.EnvironmentVariables![envVar], path);
+    }
 
-        [TestMethod]
-        [DataRow(null)]
-        [DataRow("")]
-        public async Task DotNetCoreErrorReceivedCallbackShouldNotLogNullOrEmptyData(string errorData)
-        {
-            this.ErrorCallBackTestHelper(errorData, -1);
+    [TestMethod]
+    public async Task DotNetCoreErrorMessageShouldBeReadAsynchronouslyAsync()
+    {
+        var errorData = "Custom Error Strings";
+        ErrorCallBackTestHelper(errorData, -1);
 
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
 
-            Assert.AreEqual(this.errorMessage, string.Empty);
-        }
+        Assert.AreEqual(errorData, _errorMessage);
+    }
 
-        [TestMethod]
-        [DataRow(0)]
-        [DataRow(-1)]
-        public async Task DotNetCoreProcessExitedButNoErrorMessageIfNoDataWritten(int exitCode)
-        {
-            var errorData = string.Empty;
-            this.ExitCallBackTestHelper(exitCode);
+    [TestMethod]
+    public async Task DotNetCoreNoErrorMessageIfExitCodeZero()
+    {
+        string errorData = string.Empty;
+        ErrorCallBackTestHelper(errorData, 0);
 
-            // override event listener
-            this.dotnetHostManager.HostExited += this.DotnetHostManagerExitCodeTesterHostExited;
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
 
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        Assert.IsNull(_errorMessage);
+    }
 
-            Assert.AreEqual(this.errorMessage, string.Empty);
-            Assert.AreEqual(this.exitCode, exitCode);
-        }
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    public async Task DotNetCoreErrorReceivedCallbackShouldNotLogNullOrEmptyData(string errorData)
+    {
+        ErrorCallBackTestHelper(errorData, -1);
 
-        [TestMethod]
-        public async Task CleanTestHostAsyncShouldKillTestHostProcess()
-        {
-            var pid = Process.GetCurrentProcess().Id;
-            bool isVerified = false;
-            this.mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>()))
-                .Callback<object>(p => isVerified = ((Process)p).Id == pid);
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
 
-            this.ExitCallBackTestHelper(0);
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        Assert.AreEqual(_errorMessage, string.Empty);
+    }
 
-            await this.dotnetHostManager.CleanTestHostAsync(CancellationToken.None);
+    [TestMethod]
+    [DataRow(0)]
+    [DataRow(-1)]
+    public async Task DotNetCoreProcessExitedButNoErrorMessageIfNoDataWritten(int exitCode)
+    {
+        var errorData = string.Empty;
+        ExitCallBackTestHelper(exitCode);
 
-            Assert.IsTrue(isVerified);
-        }
+        // override event listener
+        _dotnetHostManager.HostExited += DotnetHostManagerExitCodeTesterHostExited;
 
-        [TestMethod]
-        public async Task CleanTestHostAsyncShouldNotThrowIfTestHostIsNotStarted()
-        {
-            var pid = Process.GetCurrentProcess().Id;
-            bool isVerified = false;
-            this.mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>())).Callback<object>(p => isVerified = ((Process)p).Id == pid).Throws<Exception>();
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
 
-            this.ExitCallBackTestHelper(0);
-            await this.dotnetHostManager.LaunchTestHostAsync(this.defaultTestProcessStartInfo, CancellationToken.None);
+        Assert.AreEqual(_errorMessage, string.Empty);
+        Assert.AreEqual(_exitCode, exitCode);
+    }
 
-            await this.dotnetHostManager.CleanTestHostAsync(CancellationToken.None);
+    [TestMethod]
+    public async Task CleanTestHostAsyncShouldKillTestHostProcess()
+    {
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        bool isVerified = false;
+        _mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>()))
+            .Callback<object>(p => isVerified = ((Process)p).Id == pid);
+
+        ExitCallBackTestHelper(0);
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
+
+        await _dotnetHostManager.CleanTestHostAsync(CancellationToken.None);
+
+        Assert.IsTrue(isVerified);
+    }
 
-            Assert.IsTrue(isVerified);
-        }
+    [TestMethod]
+    public async Task CleanTestHostAsyncShouldNotThrowIfTestHostIsNotStarted()
+    {
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        bool isVerified = false;
+        _mockProcessHelper.Setup(ph => ph.TerminateProcess(It.IsAny<Process>())).Callback<object>(p => isVerified = ((Process)p).Id == pid).Throws<Exception>();
+
+        ExitCallBackTestHelper(0);
+        await _dotnetHostManager.LaunchTestHostAsync(_defaultTestProcessStartInfo, CancellationToken.None);
+
+        await _dotnetHostManager.CleanTestHostAsync(CancellationToken.None);
+
+        Assert.IsTrue(isVerified);
+    }
 
-        private void DotnetHostManagerExitCodeTesterHostExited(object sender, HostProviderEventArgs e)
-        {
-            this.errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
-            this.exitCode = e.ErrroCode;
-        }
+    private void DotnetHostManagerExitCodeTesterHostExited(object? sender, HostProviderEventArgs e)
+    {
+        _errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
+        _exitCode = e.ErrroCode;
+    }
 
-        private void DotnetHostManagerHostExited(object sender, HostProviderEventArgs e)
+    private void DotnetHostManagerHostExited(object? sender, HostProviderEventArgs e)
+    {
+        if (e.ErrroCode != 0)
         {
-            if (e.ErrroCode != 0)
-            {
-                this.errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
-            }
+            _errorMessage = e.Data.TrimEnd(Environment.NewLine.ToCharArray());
         }
+    }
 
-        private void DotnetHostManagerHostLaunched(object sender, HostProviderEventArgs e)
-        {
-            this.testHostId = e.ProcessId;
-        }
+    private void DotnetHostManagerHostLaunched(object? sender, HostProviderEventArgs e)
+    {
+        _testHostId = e.ProcessId;
+    }
 
-        private void ErrorCallBackTestHelper(string errorMessage, int exitCode)
-        {
-            this.mockProcessHelper.Setup(
-                    ph =>
-                        ph.LaunchProcess(
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.IsAny<Action<object, string>>(),
-                            It.IsAny<Action<object>>(),
-                            It.IsAny<Action<object, string>>()))
-                .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
-                    (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
-                    {
-                        var process = Process.GetCurrentProcess();
-
-                        errorCallback(process, errorMessage);
-                        exitCallback(process);
-                    }).Returns(Process.GetCurrentProcess());
-
-            this.mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
-        }
+    private void ErrorCallBackTestHelper(string errorMessage, int exitCode)
+    {
+        _mockProcessHelper.Setup(
+                ph =>
+                    ph.LaunchProcess(
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.IsAny<Action<object?, string?>>(),
+                        It.IsAny<Action<object?>>(),
+                        It.IsAny<Action<object?, string?>>()))
+            .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
+                (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
+                {
+                    var process = Process.GetCurrentProcess();
+
+                    errorCallback(process, errorMessage);
+                    exitCallback(process);
+                }).Returns(Process.GetCurrentProcess());
+
+        _mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
+    }
 
-        private void ExitCallBackTestHelper(int exitCode)
-        {
-            this.mockProcessHelper.Setup(
-                    ph =>
-                        ph.LaunchProcess(
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<string>(),
-                            It.IsAny<IDictionary<string, string>>(),
-                            It.IsAny<Action<object, string>>(),
-                            It.IsAny<Action<object>>(),
-                            It.IsAny<Action<object, string>>()))
-                .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
-                    (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
-                    {
-                        var process = Process.GetCurrentProcess();
-                        exitCallback(process);
-                    }).Returns(Process.GetCurrentProcess());
-
-            this.mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
-        }
+    private void ExitCallBackTestHelper(int exitCode)
+    {
+        _mockProcessHelper.Setup(
+                ph =>
+                    ph.LaunchProcess(
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<string>(),
+                        It.IsAny<IDictionary<string, string?>>(),
+                        It.IsAny<Action<object?, string?>>(),
+                        It.IsAny<Action<object?>>(),
+                        It.IsAny<Action<object?, string?>>()))
+            .Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
+                (var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
+                {
+                    var process = Process.GetCurrentProcess();
+                    exitCallback(process);
+                }).Returns(Process.GetCurrentProcess());
+
+        _mockProcessHelper.Setup(ph => ph.TryGetExitCode(It.IsAny<object>(), out exitCode)).Returns(true);
+    }
 
-        private TestProcessStartInfo GetDefaultStartInfo()
-        {
-            var startInfo = this.dotnetHostManager.GetTestHostProcessStartInfo(
-                this.testSource,
-                null,
-                this.defaultConnectionInfo);
-            return startInfo;
-        }
+    private TestProcessStartInfo GetDefaultStartInfo()
+    {
+        var startInfo = _dotnetHostManager.GetTestHostProcessStartInfo(
+            _testSource,
+            null,
+            _defaultConnectionInfo);
+        return startInfo;
+    }
 
-        internal class TestableDotnetTestHostManager : DotnetTestHostManager
+    internal class TestableDotnetTestHostManager : DotnetTestHostManager
+    {
+        public TestableDotnetTestHostManager(
+            IProcessHelper processHelper,
+            IFileHelper fileHelper,
+            IDotnetHostHelper dotnetTestHostHelper,
+            IEnvironment environment,
+            IRunSettingsHelper runsettingsHelper,
+            IWindowsRegistryHelper windowsRegistryHelper,
+            IEnvironmentVariableHelper environmentVariableHelper)
+            : base(processHelper, fileHelper, dotnetTestHostHelper, environment, runsettingsHelper, windowsRegistryHelper, environmentVariableHelper)
         {
-            public TestableDotnetTestHostManager(
-                IProcessHelper processHelper,
-                IFileHelper fileHelper,
-                IDotnetHostHelper dotnetTestHostHelper,
-                IEnvironment environment,
-                IRunSettingsHelper runsettingsHelper,
-                IWindowsRegistryHelper windowsRegistryHelper,
-                IEnvironmentVariableHelper environmentVariableHelper)
-                : base(processHelper, fileHelper, dotnetTestHostHelper, environment, runsettingsHelper, windowsRegistryHelper, environmentVariableHelper)
-            {
-            }
         }
     }
-#pragma warning restore SA1600
 }
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/TestHostManagerCallbacksTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/TestHostManagerCallbacksTests.cs
index 98e8f2d9cf..1f433c77bc 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/TestHostManagerCallbacksTests.cs
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/TestHostManagerCallbacksTests.cs
@@ -1,97 +1,124 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.TestHostProvider.Hosting.UnitTests
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+using Microsoft.TestPlatform.TestHostProvider.Hosting;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace TestPlatform.TestHostProvider.Hosting.UnitTests;
+
+[TestClass]
+public class TestHostManagerCallbacksTests
 {
-    using System;
-    using System.Text;
-    using Microsoft.TestPlatform.TestHostProvider.Hosting;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private StringBuilder _testHostProcessStdError;
 
-    [TestClass]
-    public class TestHostManagerCallbacksTests
+    public TestHostManagerCallbacksTests()
     {
-        private StringBuilder testHostProcessStdError;
+        _testHostProcessStdError = new StringBuilder(0, Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.StandardErrorMaxLength);
+    }
 
-        public TestHostManagerCallbacksTests()
-        {
-            this.testHostProcessStdError = new StringBuilder(0, Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants.StandardErrorMaxLength);
-        }
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendNoDataOnNullDataReceived()
+    {
+        _testHostProcessStdError.Append("NoDataShouldAppend");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, null);
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendNoDataOnNullDataReceived()
-        {
-            this.testHostProcessStdError.Append("NoDataShouldAppend");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, null);
+        Assert.AreEqual("NoDataShouldAppend", _testHostProcessStdError.ToString());
+    }
 
-            Assert.AreEqual("NoDataShouldAppend", this.testHostProcessStdError.ToString());
-        }
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendNoDataOnEmptyDataReceived()
+    {
+        _testHostProcessStdError.Append("NoDataShouldAppend");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, string.Empty);
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendNoDataOnEmptyDataReceived()
-        {
-            this.testHostProcessStdError.Append("NoDataShouldAppend");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, string.Empty);
+        Assert.AreEqual("NoDataShouldAppend", _testHostProcessStdError.ToString());
+    }
 
-            Assert.AreEqual("NoDataShouldAppend", this.testHostProcessStdError.ToString());
-        }
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendWhiteSpaceString()
+    {
+        _testHostProcessStdError.Append("OldData");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, " ");
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendWhiteSpaceString()
-        {
-            this.testHostProcessStdError.Append("OldData");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, " ");
+        Assert.AreEqual("OldData " + Environment.NewLine, _testHostProcessStdError.ToString());
+    }
+
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendGivenData()
+    {
+        _testHostProcessStdError.Append("NoDataShouldAppend");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, "new data");
 
-            Assert.AreEqual("OldData " + Environment.NewLine, this.testHostProcessStdError.ToString());
-        }
+        Assert.AreEqual("NoDataShouldAppendnew data" + Environment.NewLine, _testHostProcessStdError.ToString());
+    }
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendGivenData()
-        {
-            this.testHostProcessStdError.Append("NoDataShouldAppend");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, "new data");
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldNotAppendNewDataIfErrorMessageAlreadyReachedMaxLength()
+    {
+        _testHostProcessStdError = new StringBuilder(0, 5);
+        _testHostProcessStdError.Append("12345");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, "678");
 
-            Assert.AreEqual("NoDataShouldAppendnew data" + Environment.NewLine, this.testHostProcessStdError.ToString());
-        }
+        Assert.AreEqual("12345", _testHostProcessStdError.ToString());
+    }
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldNotAppendNewDataIfErrorMessageAlreadyReachedMaxLength()
-        {
-            this.testHostProcessStdError = new StringBuilder(0, 5);
-            this.testHostProcessStdError.Append("12345");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, "678");
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendSubStringOfDataIfErrorMessageReachedMaxLength()
+    {
+        _testHostProcessStdError = new StringBuilder(0, 5);
+        _testHostProcessStdError.Append("1234");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, "5678");
 
-            Assert.AreEqual("12345", this.testHostProcessStdError.ToString());
-        }
+        Assert.AreEqual("12345", _testHostProcessStdError.ToString());
+    }
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendSubStringOfDataIfErrorMessageReachedMaxLength()
-        {
-            this.testHostProcessStdError = new StringBuilder(0, 5);
-            this.testHostProcessStdError.Append("1234");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, "5678");
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendEntireStringEvenItReachesToMaxLength()
+    {
+        _testHostProcessStdError = new StringBuilder(0, 5);
+        _testHostProcessStdError.Append("12");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, "3");
 
-            Assert.AreEqual("12345", this.testHostProcessStdError.ToString());
-        }
+        Assert.AreEqual("123" + Environment.NewLine, _testHostProcessStdError.ToString());
+    }
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendEntireStringEvenItReachesToMaxLength()
-        {
-            this.testHostProcessStdError = new StringBuilder(0, 5);
-            this.testHostProcessStdError.Append("12");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, "3");
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldAppendNewLineApproprioritlyWhenReachingMaxLength()
+    {
+        _testHostProcessStdError = new StringBuilder(0, 5);
+        _testHostProcessStdError.Append("123");
+        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, "4");
 
-            Assert.AreEqual("123" + Environment.NewLine, this.testHostProcessStdError.ToString());
-        }
+        Assert.AreEqual("1234" + Environment.NewLine.Substring(0, 1), _testHostProcessStdError.ToString());
+    }
 
-        [TestMethod]
-        public void ErrorReceivedCallbackShouldAppendNewLineApproprioritlyWhenReachingMaxLength()
+    [TestMethod]
+    public void ErrorReceivedCallbackShouldNotCrashIfInvalidProcessHandle()
+    {
+        bool onHostExitedCalled = false;
+        Mock<IProcessHelper> mock = new();
+        mock.Setup(m => m.TryGetExitCode(It.IsAny<object>(), out It.Ref<int>.IsAny)).Callback((object process, out int exitCode) =>
         {
-            this.testHostProcessStdError = new StringBuilder(0, 5);
-            this.testHostProcessStdError.Append("123");
-            TestHostManagerCallbacks.ErrorReceivedCallback(this.testHostProcessStdError, "4");
-
-            Assert.AreEqual("1234" + Environment.NewLine.Substring(0, 1), this.testHostProcessStdError.ToString());
-        }
+            var err = new COMException("Invalid handle", unchecked((int)0x80070006));
+            typeof(COMException).GetProperty("HResult")!.SetValue(err, unchecked((int)0x80070006));
+            throw err;
+        });
+
+        TestHostManagerCallbacks.ExitCallBack(mock.Object, null, new StringBuilder(),
+            hostProviderEventArgs =>
+            {
+                onHostExitedCalled = true;
+                Assert.AreEqual(-1, hostProviderEventArgs.ErrroCode);
+            });
+
+        Assert.IsTrue(onHostExitedCalled, "onHostExited was not called");
+        mock.Verify(m => m.TryGetExitCode(It.IsAny<object>(), out It.Ref<int>.IsAny), Times.Once());
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
index f0ae08cbd3..09db15d7e8 100644
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
@@ -1,27 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestHostProvider.UnitTests</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' AND '$(OS)' != 'Windows_NT' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="netstandard" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Program.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Program.cs
deleted file mode 100644
index 02b716c787..0000000000
--- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.UnitTests
-{
-#pragma warning disable SA1600
-    public static class Program
-    {
-         public static void Main(string[] args)
-        {
-        }
-    }
-#pragma warning restore SA1600
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.TestUtilities/AssemblyUtility.cs b/test/Microsoft.TestPlatform.TestUtilities/AssemblyUtility.cs
index 1e1d29c5d6..866927c808 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/AssemblyUtility.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/AssemblyUtility.cs
@@ -1,30 +1,29 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.TestUtilities
-{
-    using System.Reflection;
-#if !NET451
-    using System.Runtime.Loader;
+using System.Reflection;
+#if !NETFRAMEWORK
+using System.Runtime.Loader;
 #endif
 
+namespace Microsoft.TestPlatform.TestUtilities;
+
+/// <summary>
+/// Assembly utility to perform assembly related functions.
+/// </summary>
+public class AssemblyUtility
+{
     /// <summary>
-    /// Assembly utility to perform assembly related functions.
+    /// Gets the assembly name at a given location.
     /// </summary>
-    public class AssemblyUtility
+    /// <param name="assemblyPath"></param>
+    /// <returns></returns>
+    public static AssemblyName GetAssemblyName(string assemblyPath)
     {
-        /// <summary>
-        /// Gets the assembly name at a given location.
-        /// </summary>
-        /// <param name="assemblyPath"></param>
-        /// <returns></returns>
-        public static AssemblyName GetAssemblyName(string assemblyPath)
-        {
-#if !NET451
-            return AssemblyLoadContext.GetAssemblyName(assemblyPath);
+#if !NETFRAMEWORK
+        return AssemblyLoadContext.GetAssemblyName(assemblyPath);
 #else
-            return AssemblyName.GetAssemblyName(assemblyPath);
+        return AssemblyName.GetAssemblyName(assemblyPath);
 #endif
-        }
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestUtilities/BannedSymbols.txt b/test/Microsoft.TestPlatform.TestUtilities/BannedSymbols.txt
new file mode 100644
index 0000000000..87ce187c16
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/BannedSymbols.txt
@@ -0,0 +1,5 @@
+M:System.IO.Path.GetTempPath(); Use 'IntegrationTestBase.GetTempPath()' instead
+M:System.Environment.SetEnvironmentVariable(System.String,System.String); Use one of the overload accepting a dictionary of environment variables instead
+M:System.Environment.SetEnvironmentVariable(System.String,System.String,System.EnvironmentVariableTarget); Use one of the overload accepting a dictionary of environment variables instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead
diff --git a/test/Microsoft.TestPlatform.TestUtilities/DebugInfo.cs b/test/Microsoft.TestPlatform.TestUtilities/DebugInfo.cs
new file mode 100644
index 0000000000..12eb25aaa5
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/DebugInfo.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+[Serializable]
+// For data source to serialize correctly to enable splitting testcases to one per test in VS,
+// this must be serializable. This is sealed because the exact type must be used, not any child type.
+// Otherwise it works, but silently does not split the test cases anymore.
+public sealed class DebugInfo
+{
+    public bool DebugVSTestConsole { get; set; }
+    public bool DebugTestHost { get; set; }
+    public bool DebugDataCollector { get; set; }
+    public bool DebugStopAtEntrypoint { get; set; }
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/DirectoryUtils.cs b/test/Microsoft.TestPlatform.TestUtilities/DirectoryUtils.cs
new file mode 100644
index 0000000000..9e37a1c1d9
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/DirectoryUtils.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+using IO = System.IO;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+public static class DirectoryUtils
+{
+    public static void CopyDirectory(string sourceDirectory, string targetDirectory)
+    {
+        CopyDirectory(new DirectoryInfo(sourceDirectory), new DirectoryInfo(targetDirectory));
+    }
+
+    public static void CopyDirectory(DirectoryInfo source, DirectoryInfo target)
+    {
+        Directory.CreateDirectory(target.FullName);
+
+        // Copy each file into the new directory.
+        foreach (FileInfo fi in source.GetFiles())
+        {
+            fi.CopyTo(IO.Path.Combine(target.FullName, fi.Name), true);
+        }
+
+        // Copy each subdirectory using recursion.
+        foreach (DirectoryInfo diSourceSubDir in source.GetDirectories())
+        {
+            DirectoryInfo nextTargetSubDir = target.CreateSubdirectory(diSourceSubDir.Name);
+            CopyDirectory(diSourceSubDir, nextTargetSubDir);
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/DllInfo.cs b/test/Microsoft.TestPlatform.TestUtilities/DllInfo.cs
new file mode 100644
index 0000000000..f840e9b983
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/DllInfo.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+// For data source to serialize correctly to enable splitting testcases to one per test in VS,
+// this must be serializable. This is NOT sealed because we need this for adapters and testSdk.
+// But be aware that the exact type must be used, not any child type for the data on data source object (RunnerInfo).
+// Otherwise it works, but silently does not split the test cases anymore.
+[Serializable]
+public class DllInfo
+{
+    public string? Name { get; set; }
+    public string? PropertyName { get; set; }
+    public string? VersionType { get; set; }
+    public string? Version { get; set; }
+    public string? Path { get; set; }
+
+    public override string ToString() => $" {Name} = {Version} [{VersionType}]";
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/FileAssert.cs b/test/Microsoft.TestPlatform.TestUtilities/FileAssert.cs
index 75147b98fc..622f6d2886 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/FileAssert.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/FileAssert.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace TestPlatform.TestUtilities
+using System.IO;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestPlatform.TestUtilities;
+
+public static class FileAssert
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.IO;
+    private const string StringHighlighter = "\"\"\"";
 
-    public static class FileAssert
+    public static void Contains(string filePath, params string[] substrs)
     {
-        private const string StringHighlighter = "\"\"\"";
-
-        public static void Contains(string filePath, params string[] substrs)
+        Assert.IsTrue(File.Exists(filePath), $"{filePath}: file doesn't exist.");
+        var fileContent = File.ReadAllText(filePath);
+        foreach (var substr in substrs)
         {
-            Assert.IsTrue(File.Exists(filePath), $"{filePath}: file doesn't exist.");
-            var fileContent= File.ReadAllText(filePath);
-            foreach(var substr in substrs)
-            {
-                Assert.IsTrue(fileContent.Contains(substr),
+            Assert.IsTrue(fileContent.Contains(substr),
                 $"{filePath}: file doesn't contains {StringHighlighter} {substr} {StringHighlighter}");
-            }
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
index b7181a2fe6..2fab9fa01c 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
@@ -1,758 +1,1015 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.TestUtilities
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+using FluentAssertions;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+/// <summary>
+/// Base class for integration tests.
+/// </summary>
+public class IntegrationTestBase
 {
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Text.RegularExpressions;
-    using System.Xml;
+    public const string DesktopRunnerFramework = "net462";
+    public const string CoreRunnerFramework = "net8.0";
 
-    /// <summary>
-    /// Base class for integration tests.
-    /// </summary>
-    public class IntegrationTestBase
+    private const string TotalTestsMessage = "Total tests: {0}";
+    private const string PassedTestsMessage = " Passed: {0}";
+    private const string FailedTestsMessage = " Failed: {0}";
+    private const string SkippedTestsMessage = " Skipped: {0}";
+    private const string TestSummaryStatusMessageFormat = "Total tests: {0} Passed: {1} Failed: {2} Skipped: {3}";
+    private string _standardTestOutput = string.Empty;
+    private string _standardTestError = string.Empty;
+    private int _runnerExitCode = -1;
+
+    private string? _arguments = string.Empty;
+
+    protected readonly IntegrationTestEnvironment _testEnvironment;
+
+    private readonly string _msTestPre3_0AdapterRelativePath = @"mstest.testadapter\{0}\build\_common".Replace('\\', Path.DirectorySeparatorChar);
+    private readonly string _msTestAdapterRelativePath = @"mstest.testadapter\{0}\buildTransitive\{1}".Replace('\\', Path.DirectorySeparatorChar);
+    private readonly string _nUnitTestAdapterRelativePath = @"nunit3testadapter\{0}\build".Replace('\\', Path.DirectorySeparatorChar);
+    private readonly string _xUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\{0}\build\{1}".Replace('\\', Path.DirectorySeparatorChar);
+
+    public enum UnitTestFramework
     {
-        public const string DesktopRunnerFramework = "net451";
-        public const string CoreRunnerFramework = "netcoreapp2.1";
+        NUnit, XUnit, MSTest, CPP, NonDll
+    }
+
+    public IntegrationTestBase()
+    {
+        _testEnvironment = new IntegrationTestEnvironment();
+        BuildConfiguration = IntegrationTestEnvironment.BuildConfiguration;
+        TempDirectory = new TempDirectory();
 
-        private const string TotalTestsMessage = "Total tests: {0}";
-        private const string PassedTestsMessage = " Passed: {0}";
-        private const string FailedTestsMessage = " Failed: {0}";
-        private const string SkippedTestsMessage = " Skipped: {0}";
-        private const string TestSummaryStatusMessageFormat = "Total tests: {0} Passed: {1} Failed: {2} Skipped: {3}";
-        private string standardTestOutput = string.Empty;
-        private string standardTestError = string.Empty;
-        private string standardTestOutputWithWhiteSpace = string.Empty;
-        private string standardTestErrorWithWhiteSpace = string.Empty;
-        private int runnerExitCode = -1;
+        var drive = new DriveInfo(Directory.GetDirectoryRoot(TempDirectory.Path));
+        Console.WriteLine($"Available space for TEMP: {drive.Name} {drive.AvailableFreeSpace / (1024 * 1024)} MB");
+
+        IsCI = IntegrationTestEnvironment.IsCI;
+    }
 
-        private string arguments = string.Empty;
+    public string StdOut => _standardTestOutput;
+    public string StdOutWithWhiteSpace { get; private set; } = string.Empty;
 
-        protected readonly IntegrationTestEnvironment testEnvironment;
+    public string StdErr => _standardTestError;
+    public string StdErrWithWhiteSpace { get; private set; } = string.Empty;
 
-        private readonly string TestAdapterRelativePath = @"mstest.testadapter\{0}\build\_common".Replace('\\', Path.DirectorySeparatorChar);
-        private readonly string NUnitTestAdapterRelativePath = @"nunit3testadapter\{0}\build".Replace('\\', Path.DirectorySeparatorChar);
-        private readonly string XUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\{0}\build\_common".Replace('\\', Path.DirectorySeparatorChar);
-        private readonly string ChutzpahTestAdapterRelativePath = @"chutzpah\{0}\tools".Replace('\\', Path.DirectorySeparatorChar);
+    public TempDirectory TempDirectory { get; }
 
-        protected readonly bool IsWindows = System.Environment.OSVersion.Platform.ToString().StartsWith("Win");
+    public TestContext? TestContext { get; set; }
 
-        public enum UnitTestFramework
+    public string BuildConfiguration { get; }
+
+    public bool IsCI { get; }
+
+    [TestCleanup]
+    public void TempDirectoryCleanup()
+    {
+        // In CI always delete the results, because we have limited disk space there.
+        //
+        // Locally delete the directory only when the test succeeded, so we can look
+        // at results and logs of failed tests.
+        if (IsCI || TestContext?.CurrentTestOutcome == UnitTestOutcome.Passed)
         {
-            NUnit, XUnit, MSTest, CPP, Chutzpah
+            TempDirectory.Dispose();
         }
+    }
 
-        public IntegrationTestBase()
+    /// <summary>
+    /// Prepare arguments for <c>vstest.console.exe</c>.
+    /// </summary>
+    /// <param name="testAssemblies">List of test assemblies.</param>
+    /// <param name="testAdapterPath">Path to test adapter.</param>
+    /// <param name="runSettings">Text of run settings.</param>
+    /// <param name="framework">Framework to use.</param>
+    /// <param name="inIsolation">If we should run in a separate process.</param>
+    /// <param name="resultsDirectory">The directory where results are stored.</param>
+    /// <returns>Command line arguments string.</returns>
+    public static string PrepareArguments(string[] testAssemblies, string? testAdapterPath, string? runSettings,
+        string framework, string? inIsolation = "", string? resultsDirectory = null)
+    {
+        var arguments = "";
+        foreach (var path in testAssemblies)
         {
-            this.testEnvironment = new IntegrationTestEnvironment();
+            // The incoming testAssembly path is either a single dll path in quotes or without quotes.
+            // Or multiple assembly paths in a single string each double quoted and joined by space.
+            // We trim, and add quotes here to get either:
+            // C:\1.dll -> "C:\1.dll"
+            // "C:\1.dll" -> "C:\1.dll"
+            // "C:\1.dll" "C:\2.dll" -> "C:\1.dll" "C:\2.dll"
+            //
+            // For unquoted multi path string C:\1.dll C:\2.dll, we will get "C:\1.dll C:\2.dll"
+            // which is wrong and will fail later, but it's the test's fault for doing it wrong
+            // rather than providing an array of strings that this overload takes.
+            arguments += path.Trim('\"').AddDoubleQuote() + " ";
         }
 
-        public string StdOut => this.standardTestOutput;
-        public string StdOutWithWhiteSpace => this.standardTestOutputWithWhiteSpace;
+        arguments = arguments.Trim();
 
-        public string StdErr => this.standardTestError;
-        public string StdErrWithWhiteSpace => this.standardTestErrorWithWhiteSpace;
+        if (!testAdapterPath.IsNullOrWhiteSpace())
+        {
+            // Append adapter path
+            arguments = string.Concat(arguments, " /testadapterpath:", testAdapterPath.AddDoubleQuote());
+        }
 
-        /// <summary>
-        /// Prepare arguments for <c>vstest.console.exe</c>.
-        /// </summary>
-        /// <param name="testAssembly">Name of the test assembly.</param>
-        /// <param name="testAdapterPath">Path to test adapter.</param>
-        /// <param name="runSettings">Text of run settings.</param>
-        /// <param name="framework"></param>
-        /// <param name="inIsolation"></param>
-        /// <returns>Command line arguments string.</returns>
-        public static string PrepareArguments(string testAssembly, string testAdapterPath, string runSettings,
-            string framework, string inIsolation = "", string resultsDirectory = null)
+        if (!runSettings.IsNullOrWhiteSpace())
         {
-            var arguments = testAssembly.AddDoubleQuote();
+            // Append run settings
+            arguments = string.Concat(arguments, " /settings:", runSettings.AddDoubleQuote());
+        }
 
-            if (!string.IsNullOrWhiteSpace(testAdapterPath))
-            {
-                // Append adapter path
-                arguments = string.Concat(arguments, " /testadapterpath:", testAdapterPath.AddDoubleQuote());
-            }
+        if (!framework.IsNullOrWhiteSpace())
+        {
+            // Append run settings
+            arguments = string.Concat(arguments, " /framework:", framework.AddDoubleQuote());
+        }
 
-            if (!string.IsNullOrWhiteSpace(runSettings))
-            {
-                // Append run settings
-                arguments = string.Concat(arguments, " /settings:", runSettings.AddDoubleQuote());
-            }
+        arguments = string.Concat(arguments, " /logger:", "console;verbosity=normal".AddDoubleQuote());
 
-            if (!string.IsNullOrWhiteSpace(framework))
+        if (!inIsolation.IsNullOrWhiteSpace())
+        {
+            if (inIsolation != "/InIsolation")
             {
-                // Append run settings
-                arguments = string.Concat(arguments, " /framework:", framework.AddDoubleQuote());
+                // TODO: The whole inIsolation should be just a bool, but it is not, and it's changing in other PR.
+                throw new InvalidOperationException("InIsolation value must be '/InIsolation'");
             }
+            arguments = string.Concat(arguments, " ", inIsolation);
+        }
 
-            arguments = string.Concat(arguments, " /logger:", "console;verbosity=normal".AddDoubleQuote());
+        if (!resultsDirectory.IsNullOrWhiteSpace())
+        {
+            // Append results directory
+            arguments = string.Concat(arguments, " /ResultsDirectory:", resultsDirectory.AddDoubleQuote());
+        }
 
-            if (!string.IsNullOrWhiteSpace(inIsolation))
-            {
-                arguments = string.Concat(arguments, " ", inIsolation);
-            }
+        return arguments;
+    }
 
-            if (!string.IsNullOrWhiteSpace(resultsDirectory))
-            {
-                // Append results directory
-                arguments = string.Concat(arguments, " /ResultsDirectory:", resultsDirectory.AddDoubleQuote());
-            }
+    /// <summary>
+    /// Prepare arguments for <c>vstest.console.exe</c>.
+    /// </summary>
+    /// <param name="testAssembly">Name of the test assembly.</param>
+    /// <param name="testAdapterPath">Path to test adapter.</param>
+    /// <param name="runSettings">Text of run settings.</param>
+    /// <param name="framework">The framework to use.</param>
+    /// <param name="inIsolation">If we should run in separate process.</param>
+    /// <param name="resultsDirectory">The directory in which results will be stored.</param>
+    /// <returns>Command line arguments string.</returns>
+    public static string PrepareArguments(string testAssembly, string? testAdapterPath, string? runSettings,
+        string framework, string? inIsolation = "", string? resultsDirectory = null)
+        => PrepareArguments([testAssembly], testAdapterPath, runSettings, framework, inIsolation, resultsDirectory);
 
-            return arguments;
-        }
 
-        /// <summary>
-        /// Invokes <c>vstest.console</c> with specified arguments.
-        /// </summary>
-        /// <param name="arguments">Arguments provided to <c>vstest.console</c>.exe</param>
-        public void InvokeVsTest(string arguments)
+    /// <summary>
+    /// Invokes <c>vstest.console</c> with specified arguments.
+    /// </summary>
+    /// <param name="arguments">Arguments provided to <c>vstest.console</c>.exe</param>
+    /// <param name="environmentVariables">Environment variables to set to the started process.</param>
+    public void InvokeVsTest(string? arguments, Dictionary<string, string?>? environmentVariables = null)
+    {
+        var debugEnvironmentVariables = AddDebugEnvironmentVariables(environmentVariables);
+        ExecuteVsTestConsole(arguments, out _standardTestOutput, out _standardTestError, out _runnerExitCode, debugEnvironmentVariables);
+        FormatStandardOutCome();
+    }
+
+    /// <summary>
+    /// Invokes our local copy of dotnet that is patched with artifacts from the build with specified arguments.
+    /// </summary>
+    /// <param name="arguments">Arguments provided to <c>vstest.console</c>.exe</param>
+    /// <param name="environmentVariables">Environment variables to set to the started process.</param>
+    /// <param name="workingDirectory"></param>
+    public void InvokeDotnetTest(string arguments, Dictionary<string, string?>? environmentVariables = null, string? workingDirectory = null)
+    {
+        if (workingDirectory is not null && !File.Exists(Path.Combine(workingDirectory, "dotnet.config")))
         {
-            this.ExecuteVsTestConsole(arguments, out this.standardTestOutput, out this.standardTestError, out this.runnerExitCode);
-            this.FormatStandardOutCome();
+            File.WriteAllText(Path.Combine(workingDirectory, "dotnet.config"), """
+                [dotnet.test.runner]
+                name = "VSTest"
+                """);
         }
 
+        var debugEnvironmentVariables = AddDebugEnvironmentVariables(environmentVariables);
 
-        /// <summary>
-        /// Invokes our local copy of dotnet that is patched with artifacts from the build with specified arguments.
-        /// </summary>
-        /// <param name="arguments">Arguments provided to <c>vstest.console</c>.exe</param>
-        public void InvokeDotnetTest(string arguments)
-        {
-            var vstestConsolePath = Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "netcoreapp2.1", "vstest.console.dll");
-            var env = "VSTEST_CONSOLE_PATH";
-            var originalVstestConsolePath = Environment.GetEnvironmentVariable(env);
+        var vstestConsolePath = GetDotnetRunnerPath();
 
-            try
+        if (arguments.Contains(".csproj"))
+        {
+            var consolePathParameter = $@" -p:VsTestConsolePath=""{vstestConsolePath}""";
+            var position = arguments.IndexOf(" -- ");
+            if (position == -1)
             {
-                Environment.SetEnvironmentVariable(env, vstestConsolePath);
-                if (arguments.Contains(".csproj"))
-                {
-                    arguments = $@"-p:VsTestConsolePath=""{vstestConsolePath}"" " + arguments;
-                }
-
-                this.ExecutePatchedDotnet("test", arguments, out this.standardTestOutput, out this.standardTestError, out this.runnerExitCode);
-                this.FormatStandardOutCome();
+                // Add at the end.
+                arguments += consolePathParameter; ;
             }
-            finally
+            else
             {
-                Environment.SetEnvironmentVariable(env, originalVstestConsolePath);
+                // Insert before inline runsettings.
+                arguments = arguments.Insert(position, consolePathParameter);
             }
         }
 
-        /// <summary>
-        /// Invokes <c>vstest.console</c> to execute tests in a test assembly.
-        /// </summary>
-        /// <param name="testAssembly">A test assembly.</param>
-        /// <param name="testAdapterPath">Path to test adapters.</param>
-        /// <param name="framework">Dotnet Framework of test assembly.</param>
-        /// <param name="runSettings">Run settings for execution.</param>
-        public void InvokeVsTestForExecution(string testAssembly,
-            string testAdapterPath,
-            string framework,
-            string runSettings = "")
-        {
-            var resultsDir = GetResultsDirectory();
-
-            var arguments = PrepareArguments(testAssembly, testAdapterPath, runSettings, framework, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-            this.InvokeVsTest(arguments);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        /// <summary>
-        /// Invokes <c>vstest.console</c> to discover tests in a test assembly. "/listTests" is appended to the arguments.
-        /// </summary>
-        /// <param name="testAssembly">A test assembly.</param>
-        /// <param name="testAdapterPath">Path to test adapters.</param>
-        /// <param name="runSettings">Run settings for execution.</param>
-        public void InvokeVsTestForDiscovery(string testAssembly, string testAdapterPath, string runSettings = "", string targetFramework = "")
-        {
-            var resultsDir = GetResultsDirectory();
-            var arguments = PrepareArguments(testAssembly, testAdapterPath, runSettings, targetFramework, this.testEnvironment.InIsolationValue, resultsDirectory: resultsDir);
-            arguments = string.Concat(arguments, " /listtests");
-            this.InvokeVsTest(arguments);
-            TryRemoveDirectory(resultsDir);
-        }
-
-        /// <summary>
-        /// Execute Tests that are not supported with given Runner framework.
-        /// </summary>
-        /// <param name="runnerFramework">Runner Framework</param>
-        /// <param name="framework">Framework for which Tests are not supported</param>
-        /// <param name="message">Message to be shown</param>
-        public void ExecuteNotSupportedRunnerFrameworkTests(string runnerFramework, string framework, string message)
-        {
-            if (runnerFramework.StartsWith(framework))
-            {
-                Assert.Inconclusive(message);
-            }
-        }
+        // This is used in dotnet/sdk to determine path to vstest.console:
+        // https://github.com/dotnet/sdk/blob/main/src/Cli/dotnet/commands/dotnet-test/VSTestForwardingApp.cs#L30-L39
+        debugEnvironmentVariables["VSTEST_CONSOLE_PATH"] = vstestConsolePath;
+
+        IntegrationTestBase.ExecutePatchedDotnet("test", arguments, out _standardTestOutput, out _standardTestError, out _runnerExitCode, debugEnvironmentVariables, workingDirectory);
+        FormatStandardOutCome();
+    }
+
+    /// <summary>
+    /// Invokes <c>vstest.console</c> to execute tests in a test assembly.
+    /// </summary>
+    /// <param name="testAssembly">A test assembly.</param>
+    /// <param name="testAdapterPath">Path to test adapters.</param>
+    /// <param name="framework">Dotnet Framework of test assembly.</param>
+    /// <param name="runSettings">Run settings for execution.</param>
+    /// <param name="environmentVariables">Environment variables to set to the started process.</param>
+    public void InvokeVsTestForExecution(string testAssembly,
+        string? testAdapterPath,
+        string framework,
+        string? runSettings = "",
+        Dictionary<string, string?>? environmentVariables = null)
+    {
+        var arguments = PrepareArguments(testAssembly, testAdapterPath, runSettings, framework, _testEnvironment.InIsolationValue, resultsDirectory: TempDirectory.Path);
+        InvokeVsTest(arguments, environmentVariables);
+    }
 
-        /// <summary>
-        /// Validate if the overall test count and results are matching.
-        /// </summary>
-        /// <param name="passedTestsCount">Passed test count</param>
-        /// <param name="failedTestsCount">Failed test count</param>
-        /// <param name="skippedTestsCount">Skipped test count</param>
-        public void ValidateSummaryStatus(int passedTestsCount, int failedTestsCount, int skippedTestsCount)
+    private Dictionary<string, string?> AddDebugEnvironmentVariables(Dictionary<string, string?>? environmentVariables)
+    {
+        environmentVariables ??= new();
+
+        if (_testEnvironment.DebugInfo != null)
         {
-            var totalTestCount = passedTestsCount + failedTestsCount + skippedTestsCount;
-            if (totalTestCount == 0)
+            if (_testEnvironment.DebugInfo.DebugVSTestConsole)
             {
-                // No test should be found/run
-                var summaryStatus = string.Format(
-                    TestSummaryStatusMessageFormat,
-                    @"\d+",
-                    @"\d+",
-                    @"\d+",
-                    @"\d+");
-                StringAssert.DoesNotMatch(
-                    this.standardTestOutput,
-                    new Regex(summaryStatus),
-                    "Excepted: There should not be test summary{2}Actual: {0}{2}Standard Error: {1}{2}Arguments: {3}{2}",
-                    this.standardTestOutput,
-                    this.standardTestError,
-                    Environment.NewLine,
-                    this.arguments);
+                environmentVariables["VSTEST_RUNNER_DEBUG_ATTACHVS"] = "1";
             }
-            else
-            {
-                var summaryStatus = string.Format(TotalTestsMessage, totalTestCount);
-                if (passedTestsCount != 0)
-                {
-                    summaryStatus += string.Format(PassedTestsMessage, passedTestsCount);
-                }
 
-                if (failedTestsCount != 0)
-                {
-                    summaryStatus += string.Format(FailedTestsMessage, failedTestsCount);
-                }
+            if (_testEnvironment.DebugInfo.DebugTestHost)
+            {
+                environmentVariables["VSTEST_HOST_DEBUG_ATTACHVS"] = "1";
+            }
 
-                if (skippedTestsCount != 0)
-                {
-                    summaryStatus += string.Format(SkippedTestsMessage, skippedTestsCount);
-                }
+            if (_testEnvironment.DebugInfo.DebugDataCollector)
+            {
+                environmentVariables["VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"] = "1";
+            }
 
-                Assert.IsTrue(
-                    this.standardTestOutput.Contains(summaryStatus),
-                    "The Test summary does not match.{3}Expected summary: {1}{3}Test Output: {0}{3}Standard Error: {2}{3}Arguments: {4}{3}",
-                    this.standardTestOutput,
-                    summaryStatus,
-                    this.standardTestError,
-                    Environment.NewLine,
-                    this.arguments);
+            if (!_testEnvironment.DebugInfo.DebugStopAtEntrypoint)
+            {
+                environmentVariables["VSTEST_DEBUG_NOBP"] = "1";
             }
         }
 
-        public void StdErrorContains(string substring)
-        {
-            Assert.IsTrue(this.standardTestError.Contains(substring), "StdErrorOutput - [{0}] did not contain expected string '{1}'", this.standardTestError, substring);
-        }
+        return environmentVariables;
+    }
 
-        public void StdErrorDoesNotContains(string substring)
-        {
-            Assert.IsFalse(this.standardTestError.Contains(substring), "StdErrorOutput - [{0}] did not contain expected string '{1}'", this.standardTestError, substring);
-        }
+    /// <summary>
+    /// Invokes <c>vstest.console</c> to discover tests in a test assembly. "/listTests" is appended to the arguments.
+    /// </summary>
+    /// <param name="testAssembly">A test assembly.</param>
+    /// <param name="testAdapterPath">Path to test adapters.</param>
+    /// <param name="runSettings">Run settings for execution.</param>
+    /// <param name="targetFramework">The target framework to use.</param>
+    /// <param name="environmentVariables">Environment variables to set to the started process.</param>
+    public void InvokeVsTestForDiscovery(string testAssembly, string testAdapterPath, string runSettings = "", string targetFramework = "",
+        Dictionary<string, string?>? environmentVariables = null)
+    {
+        var arguments = PrepareArguments(testAssembly, testAdapterPath, runSettings, targetFramework, _testEnvironment.InIsolationValue!, resultsDirectory: TempDirectory.Path);
+        arguments = string.Concat(arguments, " /listtests");
+        InvokeVsTest(arguments, environmentVariables);
+    }
 
-        public void StdOutputContains(string substring)
+    /// <summary>
+    /// Execute Tests that are not supported with given Runner framework.
+    /// </summary>
+    /// <param name="runnerFramework">Runner Framework</param>
+    /// <param name="framework">Framework for which Tests are supported</param>
+    /// <param name="message">Message to be shown</param>
+    public static void ExecuteNotSupportedRunnerFrameworkTests(string runnerFramework, string framework, string message)
+    {
+        if (!runnerFramework.StartsWith(framework, StringComparison.OrdinalIgnoreCase))
         {
-            Assert.IsTrue(this.standardTestOutput.Contains(substring), $"StdOutout:{Environment.NewLine} Expected substring: {substring}{Environment.NewLine}Actual string: {this.standardTestOutput}");
+            Assert.Inconclusive(message);
         }
+    }
 
-        public void StdOutputDoesNotContains(string substring)
+    /// <summary>
+    /// Validate if the overall test count and results are matching.
+    /// </summary>
+    /// <param name="passed">Passed test count</param>
+    /// <param name="failed">Failed test count</param>
+    /// <param name="skipped">Skipped test count</param>
+    public void ValidateSummaryStatus(int passed, int failed, int skipped)
+    {
+        // TODO: Switch on the actual version of vstest console when we have that set on test environment.
+        if (_testEnvironment.VSTestConsoleInfo?.Path?.Contains($"{Path.DirectorySeparatorChar}15.") == true)
         {
-            Assert.IsFalse(this.standardTestOutput.Contains(substring), $"StdOutout:{Environment.NewLine} Not expected substring: {substring}{Environment.NewLine}Actual string: {this.standardTestOutput}");
+            ValidateSummaryStatusv15(passed, failed, skipped);
+            return;
         }
 
-        public void ExitCodeEquals(int exitCode)
+        var totalTestCount = passed + failed + skipped;
+        if (totalTestCount == 0)
         {
-            Assert.AreEqual(exitCode, this.runnerExitCode, $"ExitCode - [{this.runnerExitCode}] doesn't match expected '{exitCode}'.");
+            // No test should be found/run
+            var summaryStatus = string.Format(
+                CultureInfo.CurrentCulture,
+                TestSummaryStatusMessageFormat,
+                @"\d+",
+                @"\d+",
+                @"\d+",
+                @"\d+");
+            StringAssert.DoesNotMatch(
+                _standardTestOutput,
+                new Regex(summaryStatus),
+                "Excepted: There should not be test summary{2}Actual: {0}{2}Standard Error: {1}{2}Arguments: {3}{2}",
+                _standardTestOutput,
+                _standardTestError,
+                Environment.NewLine,
+                _arguments);
         }
-
-        /// <summary>
-        /// Validates if the test results have the specified set of passed tests.
-        /// </summary>
-        /// <param name="passedTests">Set of passed tests.</param>
-        /// <remarks>Provide the full test name similar to this format SampleTest.TestCode.TestMethodPass.</remarks>
-        public void ValidatePassedTests(params string[] passedTests)
+        else
         {
-            // Convert the unicode character to its unicode value for assertion
-            this.standardTestOutput = Regex.Replace(this.standardTestOutput, @"[^\x00-\x7F]", c => string.Format(@"\u{0:x4}", (int)c.Value[0]));
-            foreach (var test in passedTests)
+            var summaryStatus = string.Format(CultureInfo.CurrentCulture, TotalTestsMessage, totalTestCount);
+            if (passed != 0)
             {
-                // Check for tick or ? both, in some cases as unicode character for tick is not available
-                // in std out and gets replaced by ?
-                var flag = this.standardTestOutput.Contains("Passed " + test)
-                           || this.standardTestOutput.Contains("Passed " + GetTestMethodName(test))
-                           || this.standardTestOutput.Contains("\\ufffd " + test)
-                           || this.standardTestOutput.Contains("\\ufffd " + GetTestMethodName(test));
-                Assert.IsTrue(flag, "Test {0} does not appear in passed tests list.", test);
+                summaryStatus += string.Format(CultureInfo.CurrentCulture, PassedTestsMessage, passed);
             }
-        }
 
-        /// <summary>
-        /// Validates if the test results have the specified set of failed tests.
-        /// </summary>
-        /// <param name="failedTests">Set of failed tests.</param>
-        /// <remarks>
-        /// Provide the full test name similar to this format SampleTest.TestCode.TestMethodFailed.
-        /// Also validates whether these tests have stack trace info.
-        /// </remarks>
-        public void ValidateFailedTests(params string[] failedTests)
-        {
-            foreach (var test in failedTests)
+            if (failed != 0)
             {
-                var flag = this.standardTestOutput.Contains("Failed " + test)
-                           || this.standardTestOutput.Contains("Failed " + GetTestMethodName(test));
-                Assert.IsTrue(flag, "Test {0} does not appear in failed tests list.", test);
+                summaryStatus += string.Format(CultureInfo.CurrentCulture, FailedTestsMessage, failed);
+            }
 
-                // Verify stack information as well.
-                Assert.IsTrue(this.standardTestOutput.Contains(GetTestMethodName(test)), "No stack trace for failed test: {0}", test);
+            if (skipped != 0)
+            {
+                summaryStatus += string.Format(CultureInfo.CurrentCulture, SkippedTestsMessage, skipped);
             }
+
+            Assert.IsTrue(
+                _standardTestOutput.Contains(summaryStatus),
+                "The Test summary does not match.{3}Expected summary: {1}{3}Test Output: {0}{3}Standard Error: {2}{3}Arguments: {4}{3}",
+                _standardTestOutput,
+                summaryStatus,
+                _standardTestError,
+                Environment.NewLine,
+                _arguments);
         }
+    }
 
-        /// <summary>
-        /// Validates if the test results have the specified set of skipped tests.
-        /// </summary>
-        /// <param name="skippedTests">The set of skipped tests.</param>
-        /// <remarks>Provide the full test name similar to this format SampleTest.TestCode.TestMethodSkipped.</remarks>
-        public void ValidateSkippedTests(params string[] skippedTests)
+    /// <summary>
+    /// Validate if the overall test count and results are matching.
+    /// </summary>
+    /// <param name="passed">Passed test count</param>
+    /// <param name="failed">Failed test count</param>
+    /// <param name="skipped">Skipped test count</param>
+    public void ValidateSummaryStatusv15(int passed, int failed, int skipped)
+    {
+        // example: Total tests: 6. Passed: 2. Failed: 2. Skipped: 2.
+        var totalTestCount = passed + failed + skipped;
+        if (totalTestCount == 0)
+        {
+            // No test should be found/run
+            StringAssert.DoesNotMatch(
+                _standardTestOutput,
+                new Regex("Total tests\\:"),
+                "Excepted: There should not be test summary{2}Actual: {0}{2}Standard Error: {1}{2}Arguments: {3}{2}",
+                _standardTestOutput,
+                _standardTestError,
+                Environment.NewLine,
+                _arguments);
+        }
+        else
         {
-            foreach (var test in skippedTests)
+            var summaryStatus = $"Total tests: {totalTestCount}.";
+            if (passed != 0)
             {
-                var flag = this.standardTestOutput.Contains("Skipped " + test)
-                           || this.standardTestOutput.Contains("Skipped " + GetTestMethodName(test));
-                Assert.IsTrue(flag, "Test {0} does not appear in skipped tests list.", test);
+                summaryStatus += $" Passed: {passed}.";
             }
-        }
 
-        /// <summary>
-        /// Validate if the discovered tests list contains provided tests.
-        /// </summary>
-        /// <param name="discoveredTestsList">List of tests expected to be discovered.</param>
-        public void ValidateDiscoveredTests(params string[] discoveredTestsList)
-        {
-            foreach (var test in discoveredTestsList)
+            if (failed != 0)
             {
-                var flag = this.standardTestOutput.Contains(test)
-                           || this.standardTestOutput.Contains(GetTestMethodName(test));
-                Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." +
-                                    $"{System.Environment.NewLine}Std Output: {this.standardTestOutput}" +
-                                    $"{System.Environment.NewLine}Std Error: { this.standardTestError}");
+                summaryStatus += $" Failed: {failed}.";
             }
-        }
 
-        /// <summary>
-        /// Validate that the discovered tests list doesn't contain specified tests.
-        /// </summary>
-        /// <param name="testsList">List of tests expected not to be discovered.</param>
-        public void ValidateTestsNotDiscovered(params string[] testsList)
-        {
-            foreach (var test in testsList)
+            if (skipped != 0)
             {
-                var flag = this.standardTestOutput.Contains(test)
-                           || this.standardTestOutput.Contains(GetTestMethodName(test));
-                Assert.IsFalse(flag, $"Test {test} should not appear in discovered tests list." +
-                                    $"{System.Environment.NewLine}Std Output: {this.standardTestOutput}" +
-                                    $"{System.Environment.NewLine}Std Error: { this.standardTestError}");
+                summaryStatus += $" Skipped: {skipped}.";
             }
+
+            Assert.IsTrue(
+                _standardTestOutput.Contains(summaryStatus),
+                "The Test summary does not match.{3}Expected summary: {1}{3}Test Output: {0}{3}Standard Error: {2}{3}Arguments: {4}{3}",
+                _standardTestOutput,
+                summaryStatus,
+                _standardTestError,
+                Environment.NewLine,
+                _arguments);
         }
+    }
 
-        public void ValidateFullyQualifiedDiscoveredTests(string filePath, params string[] discoveredTestsList)
-        {
-            var fileOutput = File.ReadAllLines(filePath);
-            Assert.IsTrue(fileOutput.Length == 3);
+    public void StdErrorContains(string substring)
+    {
+        Assert.IsTrue(_standardTestError.Contains(substring), "StdErrorOutput - [{0}] did not contain expected string '{1}'", _standardTestError, substring);
+    }
 
-            foreach (var test in discoveredTestsList)
-            {
-                var flag = fileOutput.Contains(test)
-                           || fileOutput.Contains(GetTestMethodName(test));
-                Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." +
-                                    $"{System.Environment.NewLine}Std Output: {this.standardTestOutput}" +
-                                    $"{System.Environment.NewLine}Std Error: { this.standardTestError}");
-            }
+    public void StdErrorRegexIsMatch(string pattern)
+    {
+        Assert.IsTrue(Regex.IsMatch(_standardTestError, pattern), "StdErrorOutput - [{0}] did not contain expected pattern '{1}'", _standardTestError, pattern);
+    }
+
+    public void StdErrorDoesNotContains(string substring)
+    {
+        Assert.IsFalse(_standardTestError.Contains(substring), "StdErrorOutput - [{0}] did not contain expected string '{1}'", _standardTestError, substring);
+    }
+
+    public void StdOutputContains(string substring)
+    {
+        Assert.IsTrue(_standardTestOutput.Contains(substring), $"{Environment.NewLine}StdOutput:{Environment.NewLine}{Environment.NewLine}Expected substring: {substring}{Environment.NewLine}{Environment.NewLine}Actual string: {_standardTestOutput}");
+    }
+
+    public void StdOutputDoesNotContains(string substring)
+    {
+        Assert.IsFalse(_standardTestOutput.Contains(substring), $"{Environment.NewLine}StdOutput:{Environment.NewLine}{Environment.NewLine}Not expected substring: {substring}{Environment.NewLine}{Environment.NewLine}Actual string: {_standardTestOutput}");
+    }
+
+    public void ExitCodeEquals(int exitCode)
+    {
+        Assert.AreEqual(exitCode, _runnerExitCode, $"ExitCode - [{_runnerExitCode}] doesn't match expected '{exitCode}'.");
+    }
+
+    /// <summary>
+    /// Validates if the test results have the specified set of passed tests.
+    /// </summary>
+    /// <param name="passedTests">Set of passed tests.</param>
+    /// <remarks>Provide the full test name similar to this format SampleTest.TestCode.TestMethodPass.</remarks>
+    public void ValidatePassedTests(params string[] passedTests)
+    {
+        // Convert the unicode character to its unicode value for assertion
+        _standardTestOutput = Regex.Replace(_standardTestOutput, @"[^\x00-\x7F]", c => $@"\u{(int)c.Value[0]:x4}");
+        foreach (var test in passedTests)
+        {
+            // Check for tick or ? both, in some cases as unicode character for tick is not available
+            // in std out and gets replaced by ?
+            var flag = _standardTestOutput.Contains("Passed " + test)
+                       || _standardTestOutput.Contains("Passed " + GetTestMethodName(test))
+                       || _standardTestOutput.Contains("\\ufffd " + test)
+                       || _standardTestOutput.Contains("\\ufffd " + GetTestMethodName(test));
+            Assert.IsTrue(flag, "Test {0} does not appear in passed tests list.", test);
         }
+    }
 
-        protected string GetSampleTestAssembly()
+    /// <summary>
+    /// Validates if the test results have the specified set of failed tests.
+    /// </summary>
+    /// <param name="failedTests">Set of failed tests.</param>
+    /// <remarks>
+    /// Provide the full test name similar to this format SampleTest.TestCode.TestMethodFailed.
+    /// Also validates whether these tests have stack trace info.
+    /// </remarks>
+    public void ValidateFailedTests(params string[] failedTests)
+    {
+        foreach (var test in failedTests)
         {
-            return this.GetAssetFullPath("SimpleTestProject.dll");
+            var flag = _standardTestOutput.Contains("Failed " + test)
+                       || _standardTestOutput.Contains("Failed " + GetTestMethodName(test));
+            Assert.IsTrue(flag, "Test {0} does not appear in failed tests list.", test);
+
+            // Verify stack information as well.
+            Assert.IsTrue(_standardTestOutput.Contains(GetTestMethodName(test)), "No stack trace for failed test: {0}", test);
         }
+    }
 
-        protected string GetAssetFullPath(string assetName)
+    /// <summary>
+    /// Validates if the test results have the specified set of skipped tests.
+    /// </summary>
+    /// <param name="skippedTests">The set of skipped tests.</param>
+    /// <remarks>Provide the full test name similar to this format SampleTest.TestCode.TestMethodSkipped.</remarks>
+    public void ValidateSkippedTests(params string[] skippedTests)
+    {
+        foreach (var test in skippedTests)
         {
-            return this.testEnvironment.GetTestAsset(assetName);
+            var flag = _standardTestOutput.Contains("Skipped " + test)
+                       || _standardTestOutput.Contains("Skipped " + GetTestMethodName(test));
+            Assert.IsTrue(flag, "Test {0} does not appear in skipped tests list.", test);
         }
+    }
 
-        protected string GetAssetFullPath(string assetName, string targetFramework)
+    /// <summary>
+    /// Validate if the discovered tests list contains provided tests.
+    /// </summary>
+    /// <param name="discoveredTestsList">List of tests expected to be discovered.</param>
+    public void ValidateDiscoveredTests(params string[] discoveredTestsList)
+    {
+        foreach (var test in discoveredTestsList)
         {
-            return this.testEnvironment.GetTestAsset(assetName, targetFramework);
+            var flag = _standardTestOutput.Contains(test)
+                       || _standardTestOutput.Contains(GetTestMethodName(test));
+            Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." +
+                                $"{Environment.NewLine}Std Output: {_standardTestOutput}" +
+                                $"{Environment.NewLine}Std Error: {_standardTestError}");
         }
+    }
 
-        protected string GetProjectFullPath(string projectName)
+    /// <summary>
+    /// Validate that the discovered tests list doesn't contain specified tests.
+    /// </summary>
+    /// <param name="testsList">List of tests expected not to be discovered.</param>
+    public void ValidateTestsNotDiscovered(params string[] testsList)
+    {
+        foreach (var test in testsList)
         {
-            return this.testEnvironment.GetTestProject(projectName);
+            var flag = _standardTestOutput.Contains(test)
+                       || _standardTestOutput.Contains(GetTestMethodName(test));
+            Assert.IsFalse(flag, $"Test {test} should not appear in discovered tests list." +
+                                $"{Environment.NewLine}Std Output: {_standardTestOutput}" +
+                                $"{Environment.NewLine}Std Error: {_standardTestError}");
         }
+    }
 
-        protected string GetProjectAssetFullPath(string projectName, string assetName)
+    public void ValidateFullyQualifiedDiscoveredTests(string filePath, params string[] discoveredTestsList)
+    {
+        var fileOutput = File.ReadAllLines(filePath);
+        Assert.IsTrue(fileOutput.Length == 3);
+
+        foreach (var test in discoveredTestsList)
         {
-            var projectPath = this.testEnvironment.GetTestProject(projectName);
-            return Path.Combine(Path.GetDirectoryName(projectPath), assetName);
+            var flag = fileOutput.Contains(test)
+                       || fileOutput.Contains(GetTestMethodName(test));
+            Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." +
+                                $"{Environment.NewLine}Std Output: {_standardTestOutput}" +
+                                $"{Environment.NewLine}Std Error: {_standardTestError}");
         }
+    }
 
-        protected string GetTestAdapterPath(UnitTestFramework testFramework = UnitTestFramework.MSTest)
-        {
-            string adapterRelativePath = string.Empty;
+    protected string GetSampleTestAssembly()
+    {
+        return GetAssetFullPath("SimpleTestProject.dll");
+    }
 
-            if (testFramework == UnitTestFramework.MSTest)
-            {
-                adapterRelativePath = string.Format(TestAdapterRelativePath, this.testEnvironment.DependencyVersions["MSTestAdapterVersion"]);
-            }
-            else if (testFramework == UnitTestFramework.NUnit)
-            {
-                adapterRelativePath = string.Format(NUnitTestAdapterRelativePath, this.testEnvironment.DependencyVersions["NUnit3AdapterVersion"]);
-            }
-            else if (testFramework == UnitTestFramework.XUnit)
-            {
-                adapterRelativePath = string.Format(XUnitTestAdapterRelativePath, this.testEnvironment.DependencyVersions["XUnitAdapterVersion"]);
-            }
-            else if (testFramework == UnitTestFramework.Chutzpah)
-            {
-                adapterRelativePath = string.Format(ChutzpahTestAdapterRelativePath, this.testEnvironment.DependencyVersions["ChutzpahAdapterVersion"]);
-            }
+    protected string GetAssetFullPath(string assetName)
+    {
+        return _testEnvironment.GetTestAsset(assetName);
+    }
 
-            return this.testEnvironment.GetNugetPackage(adapterRelativePath);
-        }
+    protected string GetTestDllForFramework(string assetName, string targetFramework)
+    {
+        return _testEnvironment.GetTestAsset(assetName, targetFramework);
+    }
 
-        protected bool IsDesktopRunner()
+    protected List<string> GetTestDlls(params string[] assetNames)
+    {
+        var assets = new List<string>();
+        foreach (var assetName in assetNames)
         {
-            return this.testEnvironment.RunnerFramework == IntegrationTestBase.DesktopRunnerFramework;
+            assets.Add(GetAssetFullPath(assetName));
         }
 
-        protected bool IsNetCoreRunner()
+        return assets;
+    }
+
+    protected string GetProjectFullPath(string projectName)
+    {
+        return _testEnvironment.GetTestProject(projectName);
+    }
+
+    protected string GetProjectAssetFullPath(string projectName, string assetName)
+    {
+        var projectPath = _testEnvironment.GetTestProject(projectName);
+        return Path.Combine(Path.GetDirectoryName(projectPath)!, assetName);
+    }
+
+    protected string GetTestAdapterPath(UnitTestFramework testFramework = UnitTestFramework.MSTest)
+    {
+        if (testFramework == UnitTestFramework.NonDll)
         {
-            return this.testEnvironment.RunnerFramework == IntegrationTestBase.CoreRunnerFramework;
+            var dllPath = _testEnvironment.GetTestAsset("NonDll.TestAdapter.dll", "netstandard2.0");
+            return Path.GetDirectoryName(dllPath)!;
         }
 
-        /// <summary>
-        /// Gets the path to <c>vstest.console.exe</c>.
-        /// </summary>
-        /// <returns>
-        /// Full path to test runner
-        /// </returns>
-        public virtual string GetConsoleRunnerPath()
-        {
-            string consoleRunnerPath = string.Empty;
+        string adapterRelativePath = string.Empty;
 
-            if (this.IsDesktopRunner())
-            {
-                consoleRunnerPath = Path.Combine(this.testEnvironment.PublishDirectory, "vstest.console.exe");
-            }
-            else if (this.IsNetCoreRunner())
+        if (testFramework == UnitTestFramework.MSTest)
+        {
+            var version = IntegrationTestEnvironment.DependencyVersions["MSTestTestAdapterVersion"];
+            if (version.StartsWith("3"))
             {
-                var executablePath = IsWindows ? @"dotnet\dotnet.exe" : @"dotnet-linux/dotnet";
-                consoleRunnerPath = Path.Combine(this.testEnvironment.ToolsDirectory, executablePath);
+                var tfm = _testEnvironment.TargetFramework.StartsWith("net4") ? "net462" : "netcoreapp3.1";
+                adapterRelativePath = string.Format(CultureInfo.InvariantCulture, _msTestAdapterRelativePath, version, tfm);
             }
             else
             {
-                Assert.Fail("Unknown Runner framework - [{0}]", this.testEnvironment.RunnerFramework);
+                adapterRelativePath = string.Format(CultureInfo.InvariantCulture, _msTestPre3_0AdapterRelativePath, version);
             }
-
-            Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: {0}", consoleRunnerPath);
-            return consoleRunnerPath;
         }
-
-        protected virtual string SetVSTestConsoleDLLPathInArgs(string args)
+        else if (testFramework == UnitTestFramework.NUnit)
         {
-            var vstestConsoleDll = Path.Combine(this.testEnvironment.PublishDirectory, "vstest.console.dll");
-            vstestConsoleDll = vstestConsoleDll.AddDoubleQuote();
-            args = string.Concat(
-                vstestConsoleDll,
-                " ",
-                args);
-            return args;
+            adapterRelativePath = string.Format(CultureInfo.InvariantCulture, _nUnitTestAdapterRelativePath, IntegrationTestEnvironment.DependencyVersions["NUnit3AdapterVersion"]);
         }
-
-        /// <summary>
-        /// Returns the VsTestConsole Wrapper.
-        /// </summary>
-        /// <returns></returns>
-        public IVsTestConsoleWrapper GetVsTestConsoleWrapper()
+        else if (testFramework == UnitTestFramework.XUnit)
         {
-            var logFileName = Path.GetFileName(Path.GetTempFileName());
-            var logFileDir = Path.Combine(Path.GetTempPath(), "VSTestConsoleWrapperLogs");
+            var tfm = _testEnvironment.TargetFramework.StartsWith("net4") ? "net462" : "netcoreapp3.1";
+            adapterRelativePath = string.Format(CultureInfo.InvariantCulture, _xUnitTestAdapterRelativePath, IntegrationTestEnvironment.DependencyVersions["XUnitAdapterVersion"], tfm);
+        }
 
-            if (!Directory.Exists(logFileDir))
-            {
-                Directory.CreateDirectory(logFileDir);
-            }
+        return _testEnvironment.GetNugetPackage(adapterRelativePath);
+    }
 
-            var logFilePath = Path.Combine(logFileDir, logFileName);
+    protected bool IsDesktopRunner()
+    {
+        return _testEnvironment.RunnerFramework == DesktopRunnerFramework;
+    }
 
-            Console.WriteLine($"Logging diagnostics in {logFilePath}");
+    protected bool IsNetCoreRunner()
+    {
+        return _testEnvironment.RunnerFramework == CoreRunnerFramework;
+    }
 
-            string consoleRunnerPath;
+    /// <summary>
+    /// Gets the path to <c>vstest.console.exe</c> or <c>dotnet.exe</c>.
+    /// </summary>
+    /// <returns>
+    /// Full path to test runner
+    /// </returns>
+    public virtual string GetConsoleRunnerPath()
+    {
+        string consoleRunnerPath = string.Empty;
 
-            if (this.IsNetCoreRunner())
-            {
-                consoleRunnerPath = Path.Combine(this.testEnvironment.PublishDirectory, "vstest.console.dll");
-            }
-            else
+        if (IsDesktopRunner())
+        {
+            consoleRunnerPath = StringUtils.IsNullOrWhiteSpace(_testEnvironment.VSTestConsoleInfo?.Path)
+                ? Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "tools", "net462", "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe")
+                : _testEnvironment.VSTestConsoleInfo.Path;
+        }
+        else if (IsNetCoreRunner())
+        {
+            var executablePath = OSUtils.IsWindows ? @".dotnet\dotnet.exe" : @".dotnet/dotnet";
+            consoleRunnerPath = Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, executablePath);
+        }
+        else
+        {
+            Assert.Fail("Unknown Runner framework - [{0}]", _testEnvironment.RunnerFramework);
+        }
+
+        Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: \"{0}\"", consoleRunnerPath);
+        return consoleRunnerPath;
+    }
+
+    protected virtual string SetVSTestConsoleDLLPathInArgs(string? args)
+    {
+        var vstestConsoleDll = GetDotnetRunnerPath();
+        vstestConsoleDll = vstestConsoleDll.AddDoubleQuote();
+        args = string.Concat(
+            vstestConsoleDll,
+            " ",
+            args);
+        return args;
+    }
+
+
+    /// <summary>
+    /// Returns the VsTestConsole Wrapper.
+    /// </summary>
+    /// <returns></returns>
+    public IVsTestConsoleWrapper GetVsTestConsoleWrapper(Dictionary<string, string?>? environmentVariables = null, TraceLevel traceLevel = TraceLevel.Verbose)
+    {
+        ConsoleParameters consoleParameters = new();
+        if (traceLevel != TraceLevel.Off)
+        {
+            if (!Directory.Exists(TempDirectory.Path))
             {
-                consoleRunnerPath = this.GetConsoleRunnerPath();
+                Directory.CreateDirectory(TempDirectory.Path);
             }
-            var executablePath = IsWindows ? @"dotnet\dotnet.exe" : @"dotnet-linux/dotnet";
-            var dotnetPath = Path.Combine(this.testEnvironment.ToolsDirectory, executablePath);
 
-            if (!File.Exists(dotnetPath))
+            // Directory is already unique so there is no need to have a unique file name.
+            var logFilePath = Path.Combine(TempDirectory.Path, "log.txt");
+            if (!File.Exists(logFilePath))
             {
-                throw new FileNotFoundException($"File '{dotnetPath}' was not found.");
+                File.Create(logFilePath).Close();
             }
 
-            var vstestConsoleWrapper = new VsTestConsoleWrapper(consoleRunnerPath, dotnetPath, new ConsoleParameters() { LogFilePath = logFilePath });
-            vstestConsoleWrapper.StartSession();
+            Console.WriteLine($"Logging diagnostics in {logFilePath}");
+            consoleParameters.LogFilePath = logFilePath;
+        }
+
+        var consoleRunnerPath = IsNetCoreRunner()
+                ? GetDotnetRunnerPath()
+                : GetConsoleRunnerPath();
+        var executablePath = OSUtils.IsWindows ? @".dotnet\dotnet.exe" : @".dotnet/dotnet";
+        var dotnetPath = Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, executablePath);
 
-            return vstestConsoleWrapper;
+        if (!File.Exists(dotnetPath))
+        {
+            throw new FileNotFoundException($"File '{dotnetPath}' was not found.");
         }
 
-        /// <summary>
-        /// Gets the test method name from full name.
-        /// </summary>
-        /// <param name="testFullName">Fully qualified name of the test.</param>
-        /// <returns>Simple name of the test.</returns>
-        private static string GetTestMethodName(string testFullName)
+        if (!File.Exists(consoleRunnerPath))
         {
-            string testMethodName = string.Empty;
+            throw new FileNotFoundException($"File '{consoleRunnerPath}' was not found.");
+        }
+
+        Console.WriteLine($"Console runner path: {consoleRunnerPath}");
 
-            var splits = testFullName.Split('.');
-            if (splits.Length >= 3)
+        // Providing any environment variable to vstest.console will clear all existing environment variables,
+        // this works around it by copying all existing variables, and adding debug. But we only want to do that
+        // when we are setting any debug variables.
+        // TODO: This is scheduled to be fixed in 17.3, where it will start working normally. We will just add those
+        // variables, unless we explicitly say to clean them. https://github.com/microsoft/vstest/pull/3433
+        // Remove this code later, and just pass the variables you want to add.
+        var debugEnvironmentVariables = AddDebugEnvironmentVariables(new());
+        environmentVariables ??= new();
+        if (debugEnvironmentVariables.Count > 0)
+        {
+            Environment.GetEnvironmentVariables().OfType<DictionaryEntry>().ToList().ForEach(e => environmentVariables.Add(e.Key.ToString()!, e.Value?.ToString()));
+            foreach (var pair in debugEnvironmentVariables)
             {
-                testMethodName = testFullName.Split('.')[2];
+                environmentVariables[pair.Key] = pair.Value;
             }
-
-            return testMethodName;
         }
 
-        private void ExecuteVsTestConsole(string args, out string stdOut, out string stdError, out int exitCode)
+        if (environmentVariables.Count > 0)
         {
-            if (this.IsNetCoreRunner())
-            {
-                args = this.SetVSTestConsoleDLLPathInArgs(args);
-            }
+            // This clears all variables, so we copy all environment variables, and add the debug ones to them.
+            consoleParameters.EnvironmentVariables = environmentVariables;
+        }
 
-            this.arguments = args;
+        var vstestConsoleWrapper = new VsTestConsoleWrapper(consoleRunnerPath, dotnetPath, consoleParameters);
+        vstestConsoleWrapper.StartSession();
 
-            this.ExecuteApplication(this.GetConsoleRunnerPath(), args, out stdOut, out stdError, out exitCode);
-        }
+        return vstestConsoleWrapper;
+    }
 
-        /// <summary>
-        /// Executes a local copy of dotnet that has VSTest task installed and possibly other modifications. Do not use this to
-        /// do your builds or to run general tests, unless you want your changes to be reflected.
-        /// </summary>
-        /// <param name="command"></param>
-        /// <param name="args"></param>
-        /// <param name="stdOut"></param>
-        /// <param name="stdError"></param>
-        /// <param name="exitCode"></param>
-        private void ExecutePatchedDotnet(string command, string args, out string stdOut, out string stdError, out int exitCode)
-        {
-            var environmentVariables = new Dictionary<string, string>
-            {
-                ["DOTNET_MULTILEVEL_LOOKUP"] = "0"
-            };
+    /// <summary>
+    /// Gets the test method name from full name.
+    /// </summary>
+    /// <param name="testFullName">Fully qualified name of the test.</param>
+    /// <returns>Simple name of the test.</returns>
+    private static string GetTestMethodName(string testFullName)
+    {
+        string testMethodName = string.Empty;
 
-            var executablePath = IsWindows ? @"dotnet\dotnet.exe" : @"dotnet-linux/dotnet";
-            var patchedDotnetPath = Path.Combine(this.testEnvironment.TestArtifactsDirectory, executablePath);
-            this.ExecuteApplication(patchedDotnetPath, string.Join(" ", command, args), out stdOut, out stdError, out exitCode, environmentVariables);
+        var splits = testFullName.Split('.');
+        if (splits.Length >= 3)
+        {
+            testMethodName = testFullName.Split('.')[2];
         }
 
-        private void ExecuteApplication(string path, string args, out string stdOut, out string stdError, out int exitCode, Dictionary<string, string> environmentVariables = null)
+        return testMethodName;
+    }
+
+    protected void ExecuteVsTestConsole(string? args, out string stdOut, out string stdError, out int exitCode, Dictionary<string, string?>? environmentVariables = null)
+    {
+        if (IsNetCoreRunner())
         {
-            if (string.IsNullOrWhiteSpace(path))
-            {
-                throw new ArgumentException("Executable path must not be null or whitespace.", nameof(path));
-            }
+            args = SetVSTestConsoleDLLPathInArgs(args);
+        }
 
-            var executableName = Path.GetFileName(path);
+        _arguments = args;
 
-            using (Process process = new Process())
-            {
-                Console.WriteLine($"IntegrationTestBase.Execute: Starting {executableName}");
-                process.StartInfo.FileName = path;
-                process.StartInfo.Arguments = args;
-                process.StartInfo.UseShellExecute = false;
-                //vstestconsole.StartInfo.WorkingDirectory = testEnvironment.PublishDirectory;
-                process.StartInfo.RedirectStandardError = true;
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.StandardOutputEncoding = Encoding.UTF8;
-                process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
-                if (environmentVariables != null)
-                {
-                    foreach (var variable in environmentVariables)
-                    {
-                        if (process.StartInfo.EnvironmentVariables.ContainsKey(variable.Key))
-                        {
-                            process.StartInfo.EnvironmentVariables[variable.Key] = variable.Value;
-                        }
-                        else
-                        {
-                            process.StartInfo.EnvironmentVariables.Add(variable.Key, variable.Value);
-                        }
-                    }
-                }
+        ExecuteApplication(GetConsoleRunnerPath(), args, out stdOut, out stdError, out exitCode, environmentVariables);
+    }
 
-                var stdoutBuffer = new StringBuilder();
-                var stderrBuffer = new StringBuilder();
-                process.OutputDataReceived += (sender, eventArgs) =>
-                {
-                    stdoutBuffer.AppendLine(eventArgs.Data);
-                };
+    /// <summary>
+    /// Executes a local copy of dotnet that has VSTest task installed and possibly other modifications. Do not use this to
+    /// do your builds or to run general tests, unless you want your changes to be reflected.
+    /// </summary>
+    /// <param name="command"></param>
+    /// <param name="args"></param>
+    /// <param name="stdOut"></param>
+    /// <param name="stdError"></param>
+    /// <param name="exitCode"></param>
+    /// <param name="environmentVariables">Environment variables to set to the started process.</param>
+    /// <param name="workingDirectory"></param>
+    private static void ExecutePatchedDotnet(string command, string args, out string stdOut, out string stdError, out int exitCode,
+        Dictionary<string, string?>? environmentVariables = null, string? workingDirectory = null)
+    {
+        environmentVariables ??= new();
+
+        environmentVariables["DOTNET_MULTILEVEL_LOOKUP"] = "0";
+
+        var executablePath = OSUtils.IsWindows ? @"dotnet.exe" : @"dotnet";
+        var patchedDotnetPath = Path.GetFullPath(Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, "artifacts", "tmp", ".dotnet", executablePath));
+        ExecuteApplication(patchedDotnetPath, string.Join(" ", command, args), out stdOut, out stdError, out exitCode, environmentVariables, workingDirectory);
+    }
+
+    protected static void ExecuteApplication(string path, string? args, out string stdOut, out string stdError, out int exitCode,
+        Dictionary<string, string?>? environmentVariables = null, string? workingDirectory = null)
+    {
+        if (path.IsNullOrWhiteSpace())
+        {
+            throw new ArgumentException("Executable path must not be null or whitespace.", nameof(path));
+        }
+
+        if (!File.Exists(path))
+        {
+            throw new ArgumentException($"Executable path '{path}' could not be found.", nameof(path));
+        }
 
-                process.ErrorDataReceived += (sender, eventArgs) => stderrBuffer.AppendLine(eventArgs.Data);
+        var executableName = Path.GetFileName(path);
 
-                Console.WriteLine("IntegrationTestBase.Execute: Path = {0}", process.StartInfo.FileName);
-                Console.WriteLine("IntegrationTestBase.Execute: Arguments = {0}", process.StartInfo.Arguments);
+        using var process = new Process();
+        Console.WriteLine($"IntegrationTestBase.Execute: Starting {executableName}");
+        process.StartInfo.FileName = path;
+        process.StartInfo.Arguments = args;
+        process.StartInfo.UseShellExecute = false;
+        process.StartInfo.RedirectStandardError = true;
+        process.StartInfo.RedirectStandardOutput = true;
+        process.StartInfo.CreateNoWindow = true;
+        process.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+        process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
 
-                Stopwatch stopwatch = new Stopwatch();
-                stopwatch.Start();
+        if (workingDirectory != null)
+        {
+            process.StartInfo.WorkingDirectory = workingDirectory;
+        }
 
-                process.Start();
-                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
-                if (!process.WaitForExit(5 * 60 * 1000)) // 5 minutes
+        if (environmentVariables != null)
+        {
+            foreach (var variable in environmentVariables)
+            {
+                if (process.StartInfo.EnvironmentVariables.ContainsKey(variable.Key))
                 {
-                    Console.WriteLine($"IntegrationTestBase.Execute: Timed out waiting for {executableName}. Terminating the process.");
-                    process.Kill();
+                    process.StartInfo.EnvironmentVariables[variable.Key] = variable.Value;
                 }
                 else
                 {
-                    // Ensure async buffers are flushed
-                    process.WaitForExit();
+                    process.StartInfo.EnvironmentVariables.Add(variable.Key, variable.Value);
                 }
+            }
+        }
 
-                stopwatch.Stop();
+        var stdoutBuffer = new StringBuilder();
+        var stderrBuffer = new StringBuilder();
+        process.OutputDataReceived += (sender, eventArgs) => stdoutBuffer.AppendLine(eventArgs.Data);
+        process.ErrorDataReceived += (sender, eventArgs) => stderrBuffer.AppendLine(eventArgs.Data);
 
-                Console.WriteLine($"IntegrationTestBase.Execute: Total execution time: {stopwatch.Elapsed.Duration()}");
+        Console.WriteLine("IntegrationTestBase.Execute: Path = {0}", process.StartInfo.FileName);
+        Console.WriteLine("IntegrationTestBase.Execute: Arguments = {0}", process.StartInfo.Arguments);
+        Console.WriteLine("IntegrationTestBase.Execute: WorkingDirectory = {0}", StringUtils.IsNullOrWhiteSpace(process.StartInfo.WorkingDirectory) ? $"(Current Directory) {Directory.GetCurrentDirectory()}" : process.StartInfo.WorkingDirectory);
 
-                stdError = stderrBuffer.ToString();
-                stdOut = stdoutBuffer.ToString();
-                exitCode = process.ExitCode;
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
-                Console.WriteLine("IntegrationTestBase.Execute: stdError = {0}", stdError);
-                Console.WriteLine("IntegrationTestBase.Execute: stdOut = {0}", stdOut);
-                Console.WriteLine($"IntegrationTestBase.Execute: Stopped {executableName}. Exit code = {0}", exitCode);
-            }
+        process.Start();
+        process.BeginOutputReadLine();
+        process.BeginErrorReadLine();
+        if (!process.WaitForExit(30 * 60 * 1000)) // 30 minutes
+        {
+            Console.WriteLine($"IntegrationTestBase.Execute: Timed out waiting for {executableName}. Terminating the process.");
+            process.Kill();
         }
-
-        private void FormatStandardOutCome()
+        else
         {
-            this.standardTestErrorWithWhiteSpace = this.standardTestError;
-            this.standardTestError = Regex.Replace(this.standardTestError, @"\s+", " ");
-
-            this.standardTestOutputWithWhiteSpace = this.standardTestOutput;
-            this.standardTestOutput = Regex.Replace(this.standardTestOutput, @"\s+", " ");
+            // Ensure async buffers are flushed
+            process.WaitForExit();
+            process.WaitForExit(1000);
         }
 
-        /// <summary>
-        /// Create runsettings file from runConfigurationDictionary at destinationRunsettingsPath
-        /// </summary>
-        /// <param name="destinationRunsettingsPath">
-        /// Destination runsettings path where resulted file saves
-        /// </param>
-        /// <param name="runConfigurationDictionary">
-        /// Contains run configuration settings
-        /// </param>
-        public static void CreateRunSettingsFile(string destinationRunsettingsPath, IDictionary<string, string> runConfigurationDictionary)
-        {
-            var doc = new XmlDocument();
-            var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
+        stopwatch.Stop();
 
-            doc.AppendChild(xmlDeclaration);
-            var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
-            doc.AppendChild(runSettingsNode);
-            var runConfigNode = doc.CreateElement(Constants.RunConfigurationSettingsName);
-            runSettingsNode.AppendChild(runConfigNode);
+        Console.WriteLine($"IntegrationTestBase.Execute: Total execution time: {stopwatch.Elapsed.Duration()}");
 
-            foreach (var settingsEntry in runConfigurationDictionary)
-            {
-                var childNode = doc.CreateElement(settingsEntry.Key);
-                childNode.InnerText = settingsEntry.Value;
-                runConfigNode.AppendChild(childNode);
-            }
+        stdError = stderrBuffer.ToString();
+        stdOut = stdoutBuffer.ToString();
+        exitCode = process.ExitCode;
 
-            Stream stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
-            doc.Save(stream);
-            stream.Dispose();
-        }
+        Console.WriteLine("IntegrationTestBase.Execute: stdError = {0}", stdError);
+        Console.WriteLine("IntegrationTestBase.Execute: stdOut = {0}", stdOut);
+        Console.WriteLine($"IntegrationTestBase.Execute: Stopped {executableName}. Exit code = {0}", exitCode);
+    }
+
+    private void FormatStandardOutCome()
+    {
+        StdErrWithWhiteSpace = _standardTestError;
+        _standardTestError = Regex.Replace(_standardTestError, @"\s+", " ");
+
+        StdOutWithWhiteSpace = _standardTestOutput;
+        _standardTestOutput = Regex.Replace(_standardTestOutput, @"\s+", " ");
+    }
+
+    /// <summary>
+    /// Create runsettings file from runConfigurationDictionary at destinationRunsettingsPath
+    /// </summary>
+    /// <param name="destinationRunsettingsPath">
+    /// Destination runsettings path where resulted file saves
+    /// </param>
+    /// <param name="runConfigurationDictionary">
+    /// Contains run configuration settings
+    /// </param>
+    public static void CreateRunSettingsFile(string destinationRunsettingsPath, IDictionary<string, string> runConfigurationDictionary)
+    {
+        var doc = new XmlDocument();
+        var xmlDeclaration = doc.CreateNode(XmlNodeType.XmlDeclaration, string.Empty, string.Empty);
 
-        /// <summary>
-        /// Create runsettings file at destinationRunsettingsPath with the content from xmlString
-        /// </summary>
-        /// <param name="destinationRunsettingsPath">
-        /// Destination runsettings path where resulted file is saved
-        /// </param>
-        /// <param name="runSettingsXml">
-        /// Run settings xml string
-        /// </param>
-        public static void CreateRunSettingsFile(string destinationRunsettingsPath, string runSettingsXml)
+        doc.AppendChild(xmlDeclaration);
+        var runSettingsNode = doc.CreateElement(Constants.RunSettingsName);
+        doc.AppendChild(runSettingsNode);
+        var runConfigNode = doc.CreateElement(Constants.RunConfigurationSettingsName);
+        runSettingsNode.AppendChild(runConfigNode);
+
+        foreach (var settingsEntry in runConfigurationDictionary)
         {
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXml);
-            var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
-            doc.Save(stream);
-            stream.Dispose();
+            var childNode = doc.CreateElement(settingsEntry.Key);
+            childNode.InnerText = settingsEntry.Value;
+            runConfigNode.AppendChild(childNode);
         }
 
-        protected string BuildMultipleAssemblyPath(params string[] assetNames)
-        {
-            var assertFullPaths = new string[assetNames.Length];
-            for (var i = 0; i < assetNames.Length; i++)
-            {
-                assertFullPaths[i] = this.GetAssetFullPath(assetNames[i]).AddDoubleQuote();
-            }
+        Stream stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
+        doc.Save(stream);
+        stream.Dispose();
+    }
 
-            return string.Join(" ", assertFullPaths);
-        }
+    /// <summary>
+    /// Create runsettings file at destinationRunsettingsPath with the content from xmlString
+    /// </summary>
+    /// <param name="destinationRunsettingsPath">
+    /// Destination runsettings path where resulted file is saved
+    /// </param>
+    /// <param name="runSettingsXml">
+    /// Run settings xml string
+    /// </param>
+    public static void CreateRunSettingsFile(string destinationRunsettingsPath, string runSettingsXml)
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
+        var stream = new FileHelper().GetStream(destinationRunsettingsPath, FileMode.Create);
+        doc.Save(stream);
+        stream.Dispose();
+    }
 
-        /// <summary>
-        /// Creates an unique temporary directory for storing test results.
-        /// </summary>
-        /// <returns>
-        /// Path of the created directory.
-        /// </returns>
-        protected static string GetResultsDirectory()
-        {
-            // AGENT_TEMPDIRECTORY is AzureDevops variable, which is set to path 
-            // that is cleaned up after every job. This is preferable to use over 
-            // just the normal temp. 
-            var temp = Environment.GetEnvironmentVariable("AGENT_TEMPDIRECTORY") ?? Path.GetTempPath();
-            var directoryPath = Path.Combine(temp, Guid.NewGuid().ToString("n"));
-            Directory.CreateDirectory(directoryPath);
+    protected string BuildMultipleAssemblyPath(params string[] assetNames)
+    {
+        // Double quoted sources separated by space.
+        return string.Join(" ", GetTestDlls(assetNames).Select(a => a.AddDoubleQuote()));
+    }
 
-            return directoryPath;
-        }
+    protected static string GetDiagArg(string rootDir)
+        => " --diag:" + Path.Combine(rootDir, "log.txt");
+
+    /// <summary>
+    /// Counts the number of logs following the '*.host.*' pattern in the given folder.
+    /// </summary>
+    protected static int CountTestHostLogs(string diagLogsDir)
+        => Directory.GetFiles(diagLogsDir, "*.host.*").Length;
+
+    protected static void AssertExpectedNumberOfHostProcesses(int expectedNumOfProcessCreated, string diagLogsDir, IEnumerable<string> testHostProcessNames,
+        string? arguments = null, string? runnerPath = null)
+    {
+        var processCreatedCount = CountTestHostLogs(diagLogsDir);
+        Assert.AreEqual(
+            expectedNumOfProcessCreated,
+            processCreatedCount,
+            $"Number of {string.Join(", ", testHostProcessNames)} process created, expected: {expectedNumOfProcessCreated} actual: {processCreatedCount} {(arguments == null ? "" : "args: " + arguments)} {(runnerPath == null ? "" : "runner path: " + runnerPath)}");
+    }
 
-        protected static void TryRemoveDirectory(string directory)
+    protected static string GetDownloadedDotnetMuxerFromTools(string architecture)
+    {
+        if (architecture is not "X86" and not "X64")
         {
-            if (Directory.Exists(directory))
-            {
-                try
-                {
-                    Directory.Delete(directory, true);
-                }
-                catch { }
-            }
+            throw new NotSupportedException(nameof(architecture));
         }
+
+        string path = Path.Combine(IntegrationTestEnvironment.RepoRootDirectory, ".dotnet",
+            architecture == "X86" ?
+            "dotnet-sdk-x86" :
+            "", // x64 is directly in .dotnet folder
+            $"dotnet{(OSUtils.IsWindows ? ".exe" : "")}");
+
+        Assert.IsTrue(File.Exists(path), $"Path '{path}' should exist.");
+
+        return path;
+    }
+
+    protected string GetDotnetRunnerPath() =>
+        _testEnvironment.VSTestConsoleInfo?.Path ?? Path.Combine(IntegrationTestEnvironment.PublishDirectory, $"Microsoft.TestPlatform.CLI.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "contentFiles", "any", "net9.0", "vstest.console.dll");
+
+    protected void StdOutHasNoWarnings()
+    {
+        StdOut.Should().NotContainEquivalentOf("warning");
+    }
+
+    protected void StdErrHasTestRunFailedMessageButNoOtherError()
+    {
+        StdErr?.Trim().Should().Be("Test Run Failed.");
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
index a56217f37d..d7743edb87 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs
@@ -1,331 +1,338 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.TestUtilities
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+/// <summary>
+/// Provider for test environment configuration.
+/// Currently reads configuration from environment variables. We may support a
+/// different provider later. E.g. run settings.
+/// </summary>
+public class IntegrationTestEnvironment
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
+    public static string RepoRootDirectory { get; } =
+        Environment.GetEnvironmentVariable("TP_ROOT_DIR")
+        // Running in VS/IDE. Use artifacts directory as root.
+        // Get root directory from test assembly output directory
+        ?? Path.GetFullPath(@"..\..\..\..\..".Replace('\\', Path.DirectorySeparatorChar));
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public static string ArtifactsTempDirectory { get; } = Path.Combine(RepoRootDirectory, "artifacts", "tmp", BuildConfiguration);
+
+    public static string LocalPackageSource { get; } = Path.Combine(RepoRootDirectory, "artifacts", "packages", BuildConfiguration, "Shipping").TrimEnd(Path.DirectorySeparatorChar);
+    public static string LatestLocallyBuiltNugetVersion { get; } = GetLatestLocallyBuiltPackageVersion();
 
     /// <summary>
-    /// Provider for test environment configuration.
-    /// Currently reads configuration from environment variables. We may support a
-    /// different provider later. E.g. run settings.
+    /// Gets the publish directory for <c>vstest.console</c> package.
     /// </summary>
-    public class IntegrationTestEnvironment
-    {
-        public static string TestPlatformRootDirectory = Environment.GetEnvironmentVariable("TP_ROOT_DIR")
-                                                      ?? Path.GetFullPath(@"..\..\..\..\..".Replace('\\', Path.DirectorySeparatorChar));
+    public static string PublishDirectory { get; } =
+        // this used to switch to src\package\package\bin\based on whether
+        // this is running in cli, but that's a bad idea, the console there does not have
+        // a runtime config and will fail to start with error testhostpolicy.dll not found
+        Path.Combine(ArtifactsTempDirectory, "extractedPackages");
 
-        private static Dictionary<string, string> dependencyVersions;
-
-        private string targetRuntime;
+    /// <summary>
+    /// Gets the extensions directory for <c>vstest.console</c> package.
+    /// </summary>
+    public static string ExtensionsDirectory { get; } = Path.Combine(PublishDirectory, $"Microsoft.TestPlatform.{IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion}.nupkg", "tools", "net462", "Common7", "IDE", "Extensions", "TestPlatform", "Extensions");
 
-        public IntegrationTestEnvironment()
-        {
-            // These environment variables are set in scripts/test.ps1 or scripts/test.sh.
-            this.TargetFramework = Environment.GetEnvironmentVariable("TPT_TargetFramework");
-            this.TargetRuntime = Environment.GetEnvironmentVariable("TPT_TargetRuntime");
+    private static Dictionary<string, string>? s_dependencyVersions;
 
-            // If the variables are not set, valid defaults are assumed.
-            if (string.IsNullOrEmpty(this.TargetFramework))
-            {
-                // Run integration tests for net451 by default.
-                this.TargetFramework = "net451";
-            }
+    private string? _targetRuntime;
 
-            if (string.IsNullOrEmpty(TestPlatformRootDirectory))
-            {
-                // Running in VS/IDE. Use artifacts directory as root.
-                // Get root directory from test assembly output directory
-                TestPlatformRootDirectory = Path.GetFullPath(@"..\..\..\..\..".Replace('\\', Path.DirectorySeparatorChar));
-            }
+    public IntegrationTestEnvironment()
+    {
+        // If the variables are not set, valid defaults are assumed.
+        if (TargetFramework.IsNullOrEmpty())
+        {
+            // Run integration tests for net462 by default.
+            TargetFramework = "net462";
+        }
 
-            this.TestAssetsPath = Path.Combine(TestPlatformRootDirectory, $@"test{Path.DirectorySeparatorChar}TestAssets");
+        TestAssetsPath = Path.Combine(RepoRootDirectory, "test", "TestAssets");
 
-            // There is an assumption that integration tests will always run from a source enlistment.
-            // Need to remove this assumption when we move to a CDP.
-            this.PackageDirectory = Path.Combine(TestPlatformRootDirectory, @"packages");
-            this.ToolsDirectory = Path.Combine(TestPlatformRootDirectory, @"tools");
-            this.TestArtifactsDirectory = Path.Combine(TestPlatformRootDirectory, "artifacts", "testArtifacts");
-            this.RunnerFramework = "net451";
-        }
+        // There is an assumption that integration tests will always run from a source enlistment.
+        // Need to remove this assumption when we move to a CDP.
+        PackageDirectory = Path.Combine(RepoRootDirectory, @".packages");
+        TestArtifactsDirectory = Path.Combine(RepoRootDirectory, "artifacts", "testArtifacts");
+        RunnerFramework = "net462";
+    }
 
-        /// <summary>
-        /// Gets the build configuration for the test run.
-        /// </summary>
-        public static string BuildConfiguration
+    /// <summary>
+    /// Gets the build configuration for the test run.
+    /// </summary>
+    public static string BuildConfiguration
+    {
+        get
         {
-            get
-            {
 #if DEBUG
-                return "Debug";
+            return "Debug";
 #else
-                return "Release";
+            return "Release";
 #endif
-            }
         }
+    }
 
-        public Dictionary<string, string> DependencyVersions
-        {
-            get
-            {
-                if (dependencyVersions == null)
-                {
-                    dependencyVersions = GetDependencies(TestPlatformRootDirectory);
-                }
+    public static Dictionary<string, string> DependencyVersions
+        => s_dependencyVersions ??= GetDependencies(RepoRootDirectory);
 
-                return dependencyVersions;
-            }
-        }
+    /// <summary>
+    /// Gets the nuget packages directory for enlistment.
+    /// </summary>
+    public string PackageDirectory { get; }
 
-        /// <summary>
-        /// Gets the nuget packages directory for enlistment.
-        /// </summary>
-        public string PackageDirectory
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the target framework.
+    /// Supported values = <c>net462</c>, <c>net8.0</c>.
+    /// </summary>
+    [NotNull]
+    public string? TargetFramework { get; set; }
 
-        /// <summary>
-        /// Gets the publish directory for <c>vstest.console</c> package.
-        /// </summary>
-        public string PublishDirectory
+    /// <summary>
+    /// Gets the target runtime.
+    /// Supported values = <c>win7-x64</c>.
+    /// </summary>
+    public string? TargetRuntime
+    {
+        get
         {
-            get
+            if (RunnerFramework == IntegrationTestBase.DesktopRunnerFramework)
             {
-                // this used to switch to src\package\package\bin\based on whether
-                // this is running in cli, but that's a bad idea, the console there does not have
-                // a runtime config and will fail to start with error testhostpolicy.dll not found
-                var publishDirectory = Path.Combine(
-                    TestPlatformRootDirectory,
-                    "artifacts",
-                    BuildConfiguration,
-                    this.RunnerFramework,
-                    this.TargetRuntime);
-
-                if (!Directory.Exists(publishDirectory))
+                if (_targetRuntime.IsNullOrEmpty())
                 {
-                    throw new InvalidOperationException($"Path '{publishDirectory}' does not exist, did you build the solution via build.cmd?");
+                    _targetRuntime = "win7-x64";
                 }
-
-                return publishDirectory;
             }
-        }
-
-        /// <summary>
-        /// Gets the extensions directory for <c>vstest.console</c> package.
-        /// </summary>
-        public string ExtensionsDirectory => Path.Combine(PublishDirectory, "Extensions");
+            else
+            {
+                _targetRuntime = "";
+            }
 
-        /// <summary>
-        /// Gets the target framework.
-        /// Supported values = <c>net451</c>, <c>netcoreapp1.0</c>.
-        /// </summary>
-        public string TargetFramework
+            return _targetRuntime;
+        }
+        set
         {
-            get;
-            set;
+            _targetRuntime = value;
         }
+    }
 
-        /// <summary>
-        /// Gets the target runtime.
-        /// Supported values = <c>win7-x64</c>.
-        /// </summary>
-        public string TargetRuntime
-        {
-            get
-            {
-                if (this.RunnerFramework == IntegrationTestBase.DesktopRunnerFramework)
-                {
-                    if (string.IsNullOrEmpty(this.targetRuntime))
-                    {
-                        this.targetRuntime = "win7-x64";
-                    }
-                }
-                else
-                {
-                    this.targetRuntime = "";
-                }
+    /// <summary>
+    /// Gets the inIsolation.
+    /// Supported values = <c>/InIsolation</c>.
+    /// </summary>
+    public string? InIsolationValue { get; set; }
 
-                return this.targetRuntime;
-            }
-            set
-            {
-                this.targetRuntime = value;
-            }
-        }
+    /// <summary>
+    /// Gets the root directory for test assets.
+    /// </summary>
+    public string TestAssetsPath { get; }
 
-        /// <summary>
-        /// Gets the inIsolation.
-        /// Supported values = <c>/InIsolation</c>.
-        /// </summary>
-        public string InIsolationValue
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets the test artifacts directory.
+    /// </summary>
+    public string TestArtifactsDirectory { get; private set; }
 
-        /// <summary>
-        /// Gets the root directory for test assets.
-        /// </summary>
-        public string TestAssetsPath
-        {
-            get;
-        }
+    /// <summary>
+    /// Gets the application type.
+    /// Supported values = <c>net462</c>, <c>net8.0</c>.
+    /// </summary>
+    public string RunnerFramework { get; set; }
 
-        /// <summary>
-        /// Gets the tools directory for dependent tools
-        /// </summary>
-        public string ToolsDirectory
-        {
-            get;
-            private set;
-        }
+    // A known AzureDevOps env variable meaning we are running in CI.
+    public static bool IsCI { get; } = Environment.GetEnvironmentVariable("TF_BUILD") == "True";
+    public DebugInfo? DebugInfo { get; set; }
+    public VSTestConsoleInfo? VSTestConsoleInfo { get; set; }
+    public List<DllInfo> DllInfos { get; set; } = new();
 
-        /// <summary>
-        /// Gets the test artifacts directory.
-        /// </summary>
-        public string TestArtifactsDirectory
-        {
-            get;
-            private set;
-        }
+    /// <summary>
+    /// Gets the full path to a test asset.
+    /// </summary>
+    /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.dll</c></param>
+    /// <returns>Full path to the test asset.</returns>
+    /// <remarks>
+    /// Test assets follow several conventions:
+    /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
+    /// (b) They are built for provided build configuration.
+    /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
+    /// produce <c>TestAssets\SimpleUnitTest\bin\Debug\net462\SimpleUnitTest.dll</c>
+    /// </remarks>
+    public string GetTestAsset(string assetName)
+    {
+        return GetTestAsset(assetName, TargetFramework!);
+    }
 
-        /// <summary>
-        /// Gets the application type.
-        /// Supported values = <c>net451</c>, <c>netcoreapp1.0</c>.
-        /// </summary>
-        public string RunnerFramework
+    /// <summary>
+    /// Gets the full path to a test asset.
+    /// </summary>
+    /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.dll</c></param>
+    /// <param name="targetFramework">asset project target framework. E.g <c>net462</c></param>
+    /// <returns>Full path to the test asset.</returns>
+    /// <remarks>
+    /// Test assets follow several conventions:
+    /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
+    /// (b) They are built for provided build configuration.
+    /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
+    /// produce <c>TestAssets\SimpleUnitTest\bin\Debug\net462\SimpleUnitTest.dll</c>
+    /// </remarks>
+    public string GetTestAsset(string assetName, string targetFramework)
+    {
+        var simpleAssetName = Path.GetFileNameWithoutExtension(assetName);
+        var assetPath = Path.Combine(
+            RepoRootDirectory,
+            "artifacts",
+            "bin",
+            "TestAssets",
+            simpleAssetName,
+            BuildConfiguration,
+            targetFramework,
+            assetName);
+
+        // Update the path to be taken from the compatibility matrix instead of from the root folder.
+        if (DllInfos.Count > 0)
         {
-            get;
-            set;
+            // The path is really ugly: S:\p\vstest3\test\GeneratedTestAssets\NETTestSdkLegacyStable-15.9.2--MSTestMostDownloaded-2.1.0--MSTestProject2\bin\Debug\net462\MSTestProject2-NETTestSdkLegacyStable-15.9.2--MSTestMostDownloaded-2.1.0.dll
+            // And we need to hash the versions in it to get shorter path as well.
+            var versions = string.Join("--", DllInfos.Select(d => d.Path));
+            var versionsHash = GetPathHash(versions);
+            assetPath = Path.Combine(RepoRootDirectory, "artifacts", "bin", "TestAssets", $"{simpleAssetName}--{versionsHash}", BuildConfiguration, targetFramework, $"{simpleAssetName}--{versionsHash}.dll");
         }
 
-        /// <summary>
-        /// Gets the full path to a test asset.
-        /// </summary>
-        /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.dll</c></param>
-        /// <returns>Full path to the test asset.</returns>
-        /// <remarks>
-        /// Test assets follow several conventions:
-        /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
-        /// (b) They are built for provided build configuration.
-        /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
-        /// produce <c>TestAssets\SimpleUnitTest\bin\Debug\net451\SimpleUnitTest.dll</c>
-        /// </remarks>
-        public string GetTestAsset(string assetName)
-        {
-            return GetTestAsset(assetName, this.TargetFramework);
-        }
+        Assert.IsTrue(File.Exists(assetPath), "GetTestAsset: Path not found: \"{0}\". Most likely you need to build using build.cmd -s PrepareAcceptanceTests.", assetPath);
+
+        // If you are thinking about wrapping the path in double quotes here,
+        // then don't. File.Exist cannot handle quoted paths, and we use it in a lot of places.
+        return assetPath;
+    }
 
-        /// <summary>
-        /// Gets the full path to a test asset.
-        /// </summary>
-        /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.dll</c></param>
-        /// <param name="targetFramework">asset project target framework. E.g <c>net451</c></param>
-        /// <returns>Full path to the test asset.</returns>
-        /// <remarks>
-        /// Test assets follow several conventions:
-        /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
-        /// (b) They are built for provided build configuration.
-        /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
-        /// produce <c>TestAssets\SimpleUnitTest\bin\Debug\net451\SimpleUnitTest.dll</c>
-        /// </remarks>
-        public string GetTestAsset(string assetName, string targetFramework)
+    public static string GetPathHash(string value)
+    {
+        unchecked
         {
-            var simpleAssetName = Path.GetFileNameWithoutExtension(assetName);
-            var assetPath = Path.Combine(
-                this.TestAssetsPath,
-                simpleAssetName,
-                "bin",
-                BuildConfiguration,
-                targetFramework,
-                assetName);
-
-            Assert.IsTrue(File.Exists(assetPath), "GetTestAsset: Path not found: {0}.", assetPath);
-
-            return assetPath;
+            long hash = 23;
+            foreach (char ch in value)
+            {
+                hash = hash * 31 + ch;
+            }
+
+            return $"{hash:X}";
         }
+    }
 
-        /// <summary>
-        /// Gets the full path to a nuget package.
-        /// </summary>
-        /// <param name="packageSuffix">Suffix for the nuget package.</param>
-        /// <returns>Complete path to a nuget package.</returns>
-        /// <remarks>GetNugetPackage("foobar") will return a path to packages\foobar.</remarks>
-        public string GetNugetPackage(string packageSuffix)
-        {
-            var packagePath = Path.Combine(this.PackageDirectory, packageSuffix);
+    /// <summary>
+    /// Gets the full path to a nuget package.
+    /// </summary>
+    /// <param name="packageSuffix">Suffix for the nuget package.</param>
+    /// <returns>Complete path to a nuget package.</returns>
+    /// <remarks>GetNugetPackage("foobar") will return a path to packages\foobar.</remarks>
+    public string GetNugetPackage(string packageSuffix)
+    {
+        var packagePath = Path.Combine(PackageDirectory, packageSuffix);
+
+        Assert.IsTrue(Directory.Exists(packagePath), "GetNugetPackage: Directory not found: {0}.", packagePath);
 
-            Assert.IsTrue(Directory.Exists(packagePath), "GetNugetPackage: Directory not found: {0}.", packagePath);
+        return packagePath;
+    }
 
-            return packagePath;
+    private static Dictionary<string, string> GetDependencies(string repoRoot)
+    {
+        var dependencyPropsFile = Path.GetFullPath(Path.Combine(repoRoot, @"eng", "Versions.props"));
+        var dependencyProps = new Dictionary<string, string>();
+        if (!File.Exists(dependencyPropsFile))
+        {
+            throw new FileNotFoundException("Dependency props file not found: " + dependencyPropsFile);
         }
 
-        private static Dictionary<string, string> GetDependencies(string testPlatformRoot)
+        using (var reader = XmlReader.Create(dependencyPropsFile))
         {
-            var dependencyPropsFile = Path.Combine(testPlatformRoot, @"scripts\build\TestPlatform.Dependencies.props".Replace('\\', Path.DirectorySeparatorChar));
-            var dependencyProps = new Dictionary<string, string>();
-            if (!File.Exists(dependencyPropsFile))
+            while (reader.Read())
             {
-                throw new FileNotFoundException("Dependency props file not found: " + dependencyPropsFile);
+                if (reader.NodeType == XmlNodeType.Element && reader.Name == "PropertyGroup" && reader.GetAttribute("Label") == "VSTest dependencies")
+                {
+                    break;
+                }
             }
 
-            using (var reader = XmlReader.Create(dependencyPropsFile))
+            reader.ReadToFollowing("PropertyGroup");
+            using var props = reader.ReadSubtree();
+            props.MoveToContent();
+            props.Read();   // Read thru the PropertyGroup node
+            while (!props.EOF)
             {
-                reader.ReadToFollowing("PropertyGroup");
-                using (var props = reader.ReadSubtree())
+                if (props.IsStartElement() && !props.Name.IsNullOrEmpty())
                 {
-                    props.MoveToContent();
-                    props.Read();   // Read thru the PropertyGroup node
-                    while (!props.EOF)
+                    if (!dependencyProps.ContainsKey(props.Name))
                     {
-                        if (props.IsStartElement() && !string.IsNullOrEmpty(props.Name))
-                        {
-                            if (!dependencyProps.ContainsKey(props.Name))
-                            {
-                                dependencyProps.Add(props.Name, props.ReadElementContentAsString());
-                            }
-                            else
-                            {
-                                dependencyProps[props.Name] = string.Join(", ", dependencyProps[props.Name], props.ReadElementContentAsString());
-                            }
-                        }
-                        props.Read();
+                        dependencyProps.Add(props.Name, props.ReadElementContentAsString());
+                    }
+                    else
+                    {
+                        dependencyProps[props.Name] = string.Join(", ", dependencyProps[props.Name], props.ReadElementContentAsString());
                     }
                 }
+                props.Read();
             }
-
-            return dependencyProps;
         }
 
-        /// <summary>
-        /// Gets the full path to a test asset.
-        /// </summary>
-        /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.csproj</c></param>
-        /// <returns>Full path to the test asset.</returns>
-        /// <remarks>
-        /// Test assets follow several conventions:
-        /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
-        /// (b) They are built for provided build configuration.
-        /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
-        /// produce <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c>
-        /// </remarks>
-        public string GetTestProject(string assetName)
+        return dependencyProps;
+    }
+
+    /// <summary>
+    /// Gets the full path to a test asset.
+    /// </summary>
+    /// <param name="assetName">Name of the asset with extension. E.g. <c>SimpleUnitTest.csproj</c></param>
+    /// <returns>Full path to the test asset.</returns>
+    /// <remarks>
+    /// Test assets follow several conventions:
+    /// (a) They are built for supported frameworks. See <see cref="TargetFramework"/>.
+    /// (b) They are built for provided build configuration.
+    /// (c) Name of the test asset matches the parent directory name. E.g. <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c> must
+    /// produce <c>TestAssets\SimpleUnitTest\SimpleUnitTest.csproj</c>
+    /// </remarks>
+    public string GetTestProject(string assetName)
+    {
+        var simpleAssetName = Path.GetFileNameWithoutExtension(assetName);
+        var assetPath = Path.Combine(
+            TestAssetsPath,
+            simpleAssetName,
+            assetName);
+
+        Assert.IsTrue(File.Exists(assetPath), "GetTestAsset: Path not found: \"{0}\".", assetPath);
+
+        return assetPath;
+    }
+
+    private static string GetLatestLocallyBuiltPackageVersion()
+    {
+        // Latest version is determined by inspecting the locally built packages in artifacts/packages. The package name changes during build,
+        // e.g. -dev locally, but -ci on CI server, etc., and we cannot always guarantee that we will have the build properties available (e.g.
+        // when building under VS).
+
+        if (!Directory.Exists(LocalPackageSource))
         {
-            var simpleAssetName = Path.GetFileNameWithoutExtension(assetName);
-            var assetPath = Path.Combine(
-                this.TestAssetsPath,
-                simpleAssetName,
-                assetName);
+            throw new InvalidOperationException($"Directory {LocalPackageSource}' does not exist, did you run build.cmd -pack?");
+        }
 
-            Assert.IsTrue(File.Exists(assetPath), "GetTestAsset: Path not found: {0}.", assetPath);
+        var nugets = Directory.GetFiles(LocalPackageSource, "Microsoft.TestPlatform.ObjectModel.*.nupkg")
+            .Where(f => !f.Contains(".symbols."))
+            .Select(f => new FileInfo(f))
+            .ToList();
 
-            return assetPath;
+        if (nugets.Count == 0)
+        {
+            throw new InvalidOperationException($"No Microsoft.TestPlatform.ObjectModel nugets were found in '{LocalPackageSource}', did you run build.cmd -pack?");
         }
+
+        var nuget = nugets.OrderByDescending(n => n.LastWriteTime).First().Name!;
+        var version = nuget.Replace("Microsoft.TestPlatform.ObjectModel.", "").Replace(".nupkg", "");
+        return version;
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
index 6c5ec02fda..14a64925bc 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
+++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
@@ -1,16 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.Settings.targets" />
+
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.TestUtilities</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <WarningsAsErrors>true</WarningsAsErrors>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="BannedSymbols.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="BannedSymbols.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\NullableAttributes.cs" Link="NullableAttributes.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
@@ -20,18 +25,16 @@
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Text.RegularExpressions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.TestUtilities/NetTestSdkInfo.cs b/test/Microsoft.TestPlatform.TestUtilities/NetTestSdkInfo.cs
new file mode 100644
index 0000000000..00deda8823
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/NetTestSdkInfo.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+[Serializable] // Type should be serializable to allow the tree-view behavior of test discovery in Test Explorer
+public class NetTestSdkInfo : DllInfo
+{
+    public NetTestSdkInfo()
+    {
+        Name = "Testhost";
+        PropertyName = "VSTestConsole";
+    }
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/NumberOfProcessLaunchedUtility.cs b/test/Microsoft.TestPlatform.TestUtilities/NumberOfProcessLaunchedUtility.cs
deleted file mode 100644
index 3b5a8bdb14..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/NumberOfProcessLaunchedUtility.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace TestPlatform.TestUtilities
-{
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// The number of process launched utility.
-    /// </summary>
-    public class NumberOfProcessLaunchedUtility
-    {
-        /// <summary>
-        /// Counts processes that are created until cancellation is requested.
-        /// </summary>
-        /// <param name="cts">
-        /// To cancel the task and finish counting
-        /// </param>
-        /// <param name="runnerName">
-        /// Name of the process, or a library that is launched by dotnet.exe
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public static async Task<ICollection<string>> NumberOfProcessCreated(CancellationTokenSource cts, string processName)
-        {
-            return await NumberOfProcessCreated(cts, new[] { processName });
-        }
-
-        public static async Task<ICollection<string>> NumberOfProcessCreated(CancellationTokenSource cts, IEnumerable<string> processNames)
-        {
-            var processesBeforeRun = GetProcesses(processNames);
-
-            var processesCreated = Task.Run(() => NumberOfProcessLaunchedDuringRun(cts.Token, processesBeforeRun, processNames));
-            return await processesCreated;
-        }
-
-        /// <summary>
-        /// The number of process launched during run.
-        /// </summary>
-        /// <param name="token">
-        /// The token.
-        /// </param>
-        /// <param name="processesBeforeRun">
-        /// The processes that were already running.
-        /// </param>
-        /// <param name="runnerName">
-        /// The process name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public static ICollection<string> NumberOfProcessLaunchedDuringRun(
-            CancellationToken token,
-            IEnumerable<Process> processesBeforeRun,
-            IEnumerable<string> processNames)
-        {
-            var existingProcessIDs = processesBeforeRun.Select(p => p.Id).ToList();
-            var startedNames = new List<string>();
-
-            while (!token.IsCancellationRequested)
-            {
-                var startedDuringRun = GetProcesses(processNames);
-
-                foreach (var process in startedDuringRun)
-                {
-                    if (existingProcessIDs.Contains(process.Id))
-                    {
-                        continue;
-                    }
-
-                    startedNames.Add(process.ProcessName);
-                    existingProcessIDs.Add(process.Id);
-                }
-            }
-
-            return startedNames;
-        }
-
-        private static IEnumerable<Process> GetProcesses(IEnumerable<string> processNames)
-        {
-            var processes = new List<Process>();
-            foreach (var processName in processNames)
-            {
-                processes.AddRange(Process.GetProcessesByName(processName));
-            }
-
-            return processes;
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.TestUtilities/OSUtils.cs b/test/Microsoft.TestPlatform.TestUtilities/OSUtils.cs
new file mode 100644
index 0000000000..4b6daaf8fe
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/OSUtils.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+public static class OSUtils
+{
+    public static bool IsWindows { get; } = System.Environment.OSVersion.Platform.ToString().StartsWith("Win");
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/Constants.cs b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/Constants.cs
deleted file mode 100644
index fd5e633154..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/Constants.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.TestUtilities.PerfInstrumentation
-{
-    /// <summary>
-    /// The constants.
-    /// </summary>
-    public class Constants
-    {
-        /// <summary>
-        /// The discovery task.
-        /// </summary>
-        public const string DiscoveryTask = "Discovery";
-
-        /// <summary>
-        /// The execution task.
-        /// </summary>
-        public const string ExecutionTask = "Execution";
-
-        /// <summary>
-        /// The execution request task.
-        /// </summary>
-        public const string ExecutionRequestTask = "ExecutionRequest";
-
-        /// <summary>
-        /// The discovery request task.
-        /// </summary>
-        public const string DiscoveryRequestTask = "DiscoveryRequest";
-
-        /// <summary>
-        /// The test host task.
-        /// </summary>
-        public const string TestHostTask = "TestHost";
-
-        /// <summary>
-        /// The vs test console task.
-        /// </summary>
-        public const string VsTestConsoleTask = "VsTestConsole";
-
-        /// <summary>
-        /// The adapter search task.
-        /// </summary>
-        public const string AdapterSearchTask = "AdapterSearch";
-
-        /// <summary>
-        /// The adapter execution task.
-        /// </summary>
-        public const string AdapterExecutionTask = "AdapterExecution";
-
-        /// <summary>
-        /// The adapter discovery task.
-        /// </summary>
-        public const string AdapterDiscoveryTask = "AdapterDiscovery";
-
-        #region PayLoad Property Names
-
-        /// <summary>
-        /// The execution uri property.
-        /// </summary>
-        public const string ExecutionUriProperty = "executorUri";
-
-        /// <summary>
-        /// The number of tests property.
-        /// </summary>
-        public const string NumberOfTestsProperty = "numberOfTests";
-        #endregion
-
-    }
-}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs
deleted file mode 100644
index 2cc24960b6..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.TestUtilities.PerfInstrumentation
-{
-    using System.Collections.Generic;
-
-#if NETFRAMEWORK
-    using Microsoft.Diagnostics.Tracing;
-    using Microsoft.Diagnostics.Tracing.Parsers;
-    using Microsoft.Diagnostics.Tracing.Session;
-    using System;
-    using System.Linq;
-#endif
-
-    /// <summary>
-    /// The performance analyzer.
-    /// </summary>
-    public class PerfAnalyzer
-    {
-        /// <summary>
-        /// The etw session provider name.
-        /// </summary>
-        private const string ETWSessionProviderName = "TestPlatform";
-
-#if NETFRAMEWORK
-        private string perfDataFileName;
-        private TraceEventSession traceEventSession;
-        private Dictionary<string, List<TestPlatformTask>> testPlatformTaskMap;
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerfAnalyzer"/> class.
-        /// </summary>
-        public PerfAnalyzer()
-        {
-#if NETFRAMEWORK
-            this.perfDataFileName = "TestPlatformEventsData.etl";
-            this.testPlatformTaskMap = new Dictionary<string, List<TestPlatformTask>>();
-            this.traceEventSession = new TraceEventSession("TestPlatformSession", this.perfDataFileName);
-#endif
-        }
-
-        /// <summary>
-        /// The enable provider.
-        /// </summary>
-        public void EnableProvider()
-        {
-#if NETFRAMEWORK
-            this.traceEventSession.StopOnDispose = true;
-            this.traceEventSession.EnableProvider(ETWSessionProviderName);
-#endif
-        }
-
-        /// <summary>
-        /// The disable provider.
-        /// </summary>
-        public void DisableProvider()
-        {
-#if NETFRAMEWORK
-            this.traceEventSession.Dispose();
-#endif
-        }
-
-        /// <summary>
-        /// The analyze events data.
-        /// </summary>
-        public void AnalyzeEventsData()
-        {
-#if NETFRAMEWORK
-            using (var source = new ETWTraceEventSource(this.perfDataFileName))
-            {
-                // Open the file
-                var parser = new DynamicTraceEventParser(source);
-                parser.All += delegate(TraceEvent data)
-                    {
-                        try
-                        {
-                            if (data.ProviderName.Equals("TestPlatform") && !data.EventName.Equals("ManifestData"))
-                            {
-                                Console.WriteLine("Received Event : {0}", data.ToString());
-                                var key = data.ProcessID + "_" + data.ThreadID.ToString() + "_" + data.TaskName;
-
-                                if (!testPlatformTaskMap.ContainsKey(key))
-                                {
-                                    var list = new List<TestPlatformTask> { CreateTestPlatformTask(data) };
-                                    testPlatformTaskMap.Add(key, list);
-                                }
-                                else
-                                {
-                                    if (data.Opcode == TraceEventOpcode.Start)
-                                    {
-                                        testPlatformTaskMap[key].Add(CreateTestPlatformTask(data));
-                                    }
-                                    else
-                                    {
-                                        UpdateTask(testPlatformTaskMap[key].Last(), data);
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Console.WriteLine(ex.ToString());
-                        }
-                    };
-                source.Process(); // Read the file, processing the callbacks.
-            }
-#endif
-        }
-
-        /// <summary>
-        /// The get elapsed time by task name.
-        /// </summary>
-        /// <param name="taskName">
-        /// The task name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public double GetElapsedTimeByTaskName(string taskName)
-        {
-            var timeTaken = 0.0;
-#if NETFRAMEWORK
-            var key = GetEventKey(taskName);
-
-            if (key != null)
-            {
-                var task = testPlatformTaskMap[key].First();
-                timeTaken = task.EventStopped - task.EventStarted;
-            }
-#endif
-            return timeTaken;
-        }
-
-        /// <summary>
-        /// The get event data by task name.
-        /// </summary>
-        /// <param name="taskName">
-        /// The task name.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IDictionary"/>.
-        /// </returns>
-        public IDictionary<string, string> GetEventDataByTaskName(string taskName)
-        {
-            IDictionary<string, string> properties = new Dictionary<string, string>();
-#if NETFRAMEWORK
-            var key = GetEventKey(taskName);
-
-            if(key != null)
-            {
-                properties = testPlatformTaskMap[key].First().PayLoadProperties;
-            }
-#endif
-            return properties;
-        }
-
-        public double GetAdapterExecutionTime(string executorUri)
-        {
-            var timeTaken = 0.0;
-#if NETFRAMEWORK
-            var key = GetEventKey(Constants.AdapterExecutionTask);
-
-            if(key != null)
-            {
-                var task = testPlatformTaskMap[key].Find(t => t.PayLoadProperties["executorUri"].Equals(executorUri));
-                timeTaken = task.EventStopped - task.EventStarted;
-            }
-#endif
-            return timeTaken;
-        }
-
-        public long GetAdapterExecutedTests(string executorUri)
-        {
-            long totalTestsExecuted = 0;
-#if NETFRAMEWORK
-            var key = GetEventKey(Constants.AdapterExecutionTask);
-
-            if (key != null)
-            {
-                var task = testPlatformTaskMap[key].Find(t => t.PayLoadProperties["executorUri"].Equals(executorUri));
-                long.TryParse(task.PayLoadProperties["numberOfTests"], out totalTestsExecuted);
-            }
-#endif
-            return totalTestsExecuted;
-        }
-
-#if NETFRAMEWORK
-
-        private string GetEventKey(string taskName)
-        {
-            string key = null;
-
-            key = testPlatformTaskMap.Keys.FirstOrDefault(k => k.Split('_')[2].Equals(taskName));
-
-            return key;
-        }
-
-        private static TestPlatformTask CreateTestPlatformTask(TraceEvent data)
-        {
-            var task = new TestPlatformTask(data.TaskName, data.TimeStampRelativeMSec);
-            task.PayLoadProperties = GetPayloadProperties(data);
-            return task;
-        }
-
-        private static void UpdateTask(TestPlatformTask task, TraceEvent data)
-        {
-            task.EventStopped = data.TimeStampRelativeMSec;
-            var payLoadProperties = GetPayloadProperties(data);
-
-            //Merging dictionaries look for better way
-            foreach (var k in payLoadProperties.Keys)
-            {
-                if (!task.PayLoadProperties.ContainsKey(k))
-                {
-                    task.PayLoadProperties.Add(k, payLoadProperties[k]);
-                }
-            }
-        }
-
-        private static IDictionary<string, string> GetPayloadProperties(TraceEvent data)
-        {
-            var payLoadProperties = new Dictionary<string, string>();
-
-            foreach (var payLoad in data.PayloadNames)
-            {
-                var payLoadData = data.PayloadByName(payLoad).ToString();
-                if (!payLoadProperties.ContainsKey(payLoad))
-                {
-                    payLoadProperties.Add(payLoad, payLoadData);
-                }
-                else
-                {
-                    payLoadProperties[payLoad] = payLoadData;
-                }
-            }
-
-            return payLoadProperties;
-        }
-#endif
-    }
-}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerformanceTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerformanceTestBase.cs
deleted file mode 100644
index 476d7c7684..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerformanceTestBase.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.TestUtilities.PerfInstrumentation
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The performance test base.
-    /// </summary>
-    public class PerformanceTestBase : IntegrationTestBase
-    {
-        private PerfAnalyzer perfAnalyzer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceTestBase"/> class.
-        /// </summary>
-        public PerformanceTestBase()
-            : base()
-        {
-            this.perfAnalyzer = new PerfAnalyzer();
-        }
-
-        /// <summary>
-        /// The run execution performance tests.
-        /// </summary>
-        /// <param name="testAsset">
-        /// The test asset.
-        /// </param>
-        /// <param name="testAdapterPath">
-        /// The test adapter path.
-        /// </param>
-        /// <param name="runSettings">
-        /// The run settings.
-        /// </param>
-        public void RunExecutionPerformanceTests(string testAsset, string testAdapterPath, string runSettings)
-        {
-            // Start session and listen
-#if NETFRAMEWORK
-            this.perfAnalyzer.EnableProvider();
-#endif
-            // Run Test
-            this.InvokeVsTestForExecution(testAsset, testAdapterPath, ".NETFramework,Version=v4.5.1", runSettings);
-
-            // Stop Listening
-#if NETFRAMEWORK
-            this.perfAnalyzer.DisableProvider();
-#endif
-        }
-
-        /// <summary>
-        /// The run discovery performance tests.
-        /// </summary>
-        /// <param name="testAsset">
-        /// The test asset.
-        /// </param>
-        /// <param name="testAdapterPath">
-        /// The test adapter path.
-        /// </param>
-        /// <param name="runSettings">
-        /// The run settings.
-        /// </param>
-        public void RunDiscoveryPerformanceTests(string testAsset, string testAdapterPath, string runSettings)
-        {
-            // Start session and listen
-#if NETFRAMEWORK
-            this.perfAnalyzer.EnableProvider();
-#endif
-            // Run Test
-            this.InvokeVsTestForDiscovery(testAsset, testAdapterPath, runSettings, ".NETFramework,Version=v4.5.1");
-
-            // Stop Listening
-#if NETFRAMEWORK
-            this.perfAnalyzer.DisableProvider();
-#endif
-        }
-
-        /// <summary>
-        /// The analyze performance data.
-        /// </summary>
-        public void AnalyzePerfData()
-        {
-            this.perfAnalyzer.AnalyzeEventsData();
-        }
-
-        /// <summary>
-        /// The get execution time.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public double GetExecutionTime()
-        {
-            return this.perfAnalyzer.GetElapsedTimeByTaskName(Constants.ExecutionTask);
-        }
-
-        public double GetDiscoveryTime()
-        {
-            return this.perfAnalyzer.GetElapsedTimeByTaskName(Constants.DiscoveryTask);
-        }
-
-        public double GetVsTestTime()
-        {
-            return this.perfAnalyzer.GetElapsedTimeByTaskName(Constants.VsTestConsoleTask);
-        }
-
-        public double GetTestHostTime()
-        {
-            return this.perfAnalyzer.GetElapsedTimeByTaskName(Constants.TestHostTask);
-        }
-
-        public double GetAdapterSearchTime()
-        {
-            return this.perfAnalyzer.GetElapsedTimeByTaskName(Constants.AdapterSearchTask);
-        }
-
-        public IDictionary<string,string> GetDiscoveryData()
-        {
-            return this.perfAnalyzer.GetEventDataByTaskName(Constants.AdapterDiscoveryTask);
-        }
-
-        public IDictionary<string, string> GetExecutionData()
-        {
-            return this.perfAnalyzer.GetEventDataByTaskName(Constants.AdapterExecutionTask);
-        }
-
-        public double GetAdapterExecutionTime(string executorUri)
-        {
-            return this.perfAnalyzer.GetAdapterExecutionTime(executorUri);
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/TestPlatformTask.cs b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/TestPlatformTask.cs
deleted file mode 100644
index b6b63343e8..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/TestPlatformTask.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.TestUtilities.PerfInstrumentation
-{
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// The test platform task.
-    /// </summary>
-    public class TestPlatformTask
-    {
-        public string TaskName { get; set; }
-
-        public double EventStarted { get; set; }
-
-        public double EventStopped { get; set; }
-
-        public IDictionary<string, string> PayLoadProperties { get; set; }
-
-        public TestPlatformTask(string taskName, double eventStarted)
-        {
-            this.EventStarted = eventStarted;
-            this.TaskName = taskName;
-            this.PayLoadProperties = new Dictionary<string, string>();
-        }
-    }
-}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.TestUtilities/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6a3cf582da..0000000000
--- a/test/Microsoft.TestPlatform.TestUtilities/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestPlatform.TestUtilities")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f52a4d48-90b3-4004-8c98-d2786cc9b965")]
diff --git a/test/Microsoft.TestPlatform.TestUtilities/RandomId.cs b/test/Microsoft.TestPlatform.TestUtilities/RandomId.cs
new file mode 100644
index 0000000000..cad0f84330
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/RandomId.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Security.Cryptography;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+/// <summary>
+/// Slightly random id that is just good enough for creating disctinct directories for each test.
+/// </summary>
+public static class RandomId
+{
+    private static readonly RandomNumberGenerator Rng = RandomNumberGenerator.Create();
+    private const string Pool = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    /// <summary>
+    /// 5 character long id from 0-9A-Za-z0, for example fUfko, A6uvM, sOMXa, RY1ei, KvdJZ.
+    /// </summary>
+    /// <returns></returns>
+    public static string Next()
+    {
+        return Next(5);
+    }
+
+    private static string Next(int length)
+    {
+        var poolLength = Pool.Length;
+        var id = new char[length];
+        lock (Pool)
+        {
+            for (var idIndex = 0; idIndex < length; idIndex++)
+            {
+                var poolIndex = poolLength + 1;
+                while (poolIndex >= poolLength)
+                {
+                    var bytes = new byte[1];
+                    Rng.GetNonZeroBytes(bytes);
+                    poolIndex = bytes[0];
+                }
+                id[idIndex] = Pool[poolIndex];
+            }
+        }
+
+        return new string(id);
+    }
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/TempDirectory.cs b/test/Microsoft.TestPlatform.TestUtilities/TempDirectory.cs
new file mode 100644
index 0000000000..e8fb8fa0ad
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/TempDirectory.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using IO = System.IO;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+public class TempDirectory : IDisposable
+{
+    private bool _isDisposed;
+
+    /// <summary>
+    /// Creates a unique temporary directory.
+    /// </summary>
+    public TempDirectory()
+    {
+        Path = CreateUniqueDirectory();
+    }
+
+    public string Path { get; }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_isDisposed)
+            return;
+
+        if (disposing)
+        {
+            TryRemoveDirectory(Path);
+        }
+
+        _isDisposed = true;
+    }
+
+    public DirectoryInfo CreateDirectory(string dir)
+        => Directory.CreateDirectory(IO.Path.Combine(Path, dir));
+    public void CopyDirectory(string sourceDirectory, string targetDirectory)
+    {
+        CopyDirectory(new DirectoryInfo(sourceDirectory), new DirectoryInfo(targetDirectory));
+    }
+
+#pragma warning disable CA1822 // Mark members as static
+    public void CopyDirectory(DirectoryInfo source, DirectoryInfo target)
+#pragma warning restore CA1822 // Mark members as static
+    {
+        DirectoryUtils.CopyDirectory(source, target);
+    }
+    /// <summary>
+    /// Copy given files into the TempDirectory and return the updated paths that are pointing to TempDirectory.
+    /// </summary>
+    /// <param name="filePaths"></param>
+    /// <returns></returns>
+    public string[] CopyFile(params string[] filePaths)
+    {
+        var paths = new List<string>(filePaths.Length);
+        foreach (var filePath in filePaths)
+        {
+            var destination = IO.Path.Combine(Path, IO.Path.GetFileName(filePath));
+            File.Copy(filePath, destination);
+            paths.Add(destination);
+        }
+
+        return paths.ToArray();
+    }
+
+    /// <summary>
+    /// Copy given file into TempDirectory and return the updated path.
+    /// </summary>
+    /// <param name="filePath"></param>
+    /// <returns></returns>
+    public string CopyFile(string filePath)
+    {
+        var destination = IO.Path.Combine(Path, IO.Path.GetFileName(filePath));
+        File.Copy(filePath, destination);
+        return destination;
+    }
+
+    /// <summary>
+    /// Creates an unique temporary directory.
+    /// </summary>
+    /// <returns>
+    /// Path of the created directory.
+    /// </returns>
+    internal static string CreateUniqueDirectory()
+    {
+        var temp = GetTempPath();
+        var directoryPath = IO.Path.Combine(temp, "vstest", RandomId.Next());
+        Directory.CreateDirectory(directoryPath);
+
+        return directoryPath;
+    }
+
+    private static string GetTempPath()
+    {
+        // AGENT_TEMPDIRECTORY is AzureDevops variable, which is set to path
+        // that is cleaned up after every job. This is preferable to use over
+        // just the normal TEMP, because that is not cleaned up for every run.
+        //
+        // System.IO.Path.GetTempPath is banned from the rest of the code. This is the only
+        // place where we are allowed to use it. All other methods should use our GetTempPath (this method).
+#pragma warning disable RS0030 // Do not used banned APIs
+        return Environment.GetEnvironmentVariable("AGENT_TEMPDIRECTORY")
+            ?? IO.Path.GetTempPath();
+#pragma warning restore RS0030 // Do not used banned APIs
+    }
+
+    public static void TryRemoveDirectory(string directory)
+    {
+        if (Directory.Exists(directory))
+        {
+            try
+            {
+                Directory.Delete(directory, recursive: true);
+            }
+            catch { }
+        }
+    }
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/TestPluginCacheHelper.cs b/test/Microsoft.TestPlatform.TestUtilities/TestPluginCacheHelper.cs
index 869d8897d7..e9c401a7b6 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/TestPluginCacheHelper.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/TestPluginCacheHelper.cs
@@ -1,70 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Linq;
+
 using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
 using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
 using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
 using Moq;
-using System;
-using System.Linq;
-using System.Reflection;
 
-namespace Microsoft.TestPlatform.TestUtilities
+namespace Microsoft.TestPlatform.TestUtilities;
+
+public static class TestPluginCacheHelper
 {
-    public static class TestPluginCacheHelper
+    public static TestableTestPluginCache SetupMockAdditionalPathExtensions(Type callingTest)
+    {
+        return SetupMockAdditionalPathExtensions(
+            [callingTest.Assembly.Location]);
+    }
+
+    public static TestableTestPluginCache SetupMockAdditionalPathExtensions(string[] extensions)
+    {
+        var mockFileHelper = new Mock<IFileHelper>();
+        var testPluginCache = new TestableTestPluginCache();
+
+        TestPluginCache.Instance = testPluginCache;
+
+        // Stub the default extensions folder.
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
+
+        TestPluginCache.Instance.UpdateExtensions(extensions, true);
+
+        return testPluginCache;
+    }
+
+    public static void SetupMockExtensions(Type callingTest, Mock<IFileHelper>? mockFileHelper = null)
+    {
+        SetupMockExtensions(callingTest, () => { }, mockFileHelper);
+    }
+
+    public static void SetupMockExtensions(Type callingTest, Action callback, Mock<IFileHelper>? mockFileHelper = null)
+    {
+        SetupMockExtensions([callingTest.Assembly.Location], callback, mockFileHelper);
+    }
+
+    public static void SetupMockExtensions(string[] extensions, Action callback, Mock<IFileHelper>? mockFileHelper = null)
+    {
+        // Setup mocks.
+        mockFileHelper ??= new Mock<IFileHelper>();
+
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+
+        var testableTestPluginCache = new TestableTestPluginCache(extensions.ToList());
+        testableTestPluginCache.Action = callback;
+
+        // Setup the testable instance.
+        TestPluginCache.Instance = testableTestPluginCache;
+    }
+
+    public static void ResetExtensionsCache()
     {
-        public static TestableTestPluginCache SetupMockAdditionalPathExtensions(Type callingTest)
-        {
-            return SetupMockAdditionalPathExtensions(
-                new string[] { callingTest.GetTypeInfo().Assembly.Location });
-        }
-
-        public static TestableTestPluginCache SetupMockAdditionalPathExtensions(string[] extensions)
-        {
-            var mockFileHelper = new Mock<IFileHelper>();
-            var testPluginCache = new TestableTestPluginCache();
-
-            TestPluginCache.Instance = testPluginCache;
-
-            // Stub the default extensions folder.
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
-
-            TestPluginCache.Instance.UpdateExtensions(extensions, true);
-
-            return testPluginCache;
-        }
-
-        public static void SetupMockExtensions(Type callingTest, Mock<IFileHelper> mockFileHelper = null)
-        {
-            SetupMockExtensions(callingTest, () => { }, mockFileHelper);
-        }
-
-        public static void SetupMockExtensions(Type callingTest, Action callback, Mock<IFileHelper> mockFileHelper = null)
-        {
-            SetupMockExtensions(new[] { callingTest.GetTypeInfo().Assembly.Location }, callback, mockFileHelper);
-        }
-
-        public static void SetupMockExtensions(string[] extensions, Action callback, Mock<IFileHelper> mockFileHelper = null)
-        {
-            // Setup mocks.
-            if (mockFileHelper == null)
-            {
-                mockFileHelper = new Mock<IFileHelper>();
-            }
-
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-
-            var testableTestPluginCache = new TestableTestPluginCache(extensions.ToList());
-            testableTestPluginCache.Action = callback;
-
-            // Setup the testable instance.
-            TestPluginCache.Instance = testableTestPluginCache;
-        }
-
-        public static void ResetExtensionsCache()
-        {
-            TestPluginCache.Instance = null;
-            SettingsProviderExtensionManager.Destroy();
-        }
+        TestPluginCache.Instance = null;
+        SettingsProviderExtensionManager.Destroy();
     }
 }
diff --git a/test/Microsoft.TestPlatform.TestUtilities/TestableTestPluginCache.cs b/test/Microsoft.TestPlatform.TestUtilities/TestableTestPluginCache.cs
index 58c234b378..98097a2972 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/TestableTestPluginCache.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/TestableTestPluginCache.cs
@@ -1,37 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.TestUtilities
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+public class TestableTestPluginCache : TestPluginCache
 {
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
-    using System;
-    using System.Collections.Generic;
+    public Action? Action { get; set; }
+
+    public TestableTestPluginCache(List<string> extensionsPath)
+    {
+        TestDiscoveryExtensionManager.Destroy();
+        TestExecutorExtensionManager.Destroy();
+        SettingsProviderExtensionManager.Destroy();
+        UpdateExtensions(extensionsPath, skipExtensionFilters: false);
+    }
+
+    public TestableTestPluginCache() : this(new List<string>())
+    {
+    }
+
+    protected override IEnumerable<string> GetFilteredExtensions(List<string> extensions, string searchPattern)
+    {
+        Action?.Invoke();
+        return extensions;
+    }
 
-    public class TestableTestPluginCache : TestPluginCache
+    new public void SetupAssemblyResolver(string extensionAssembly)
     {
-        public Action Action;
-        public TestableTestPluginCache(List<string> extensionsPath)
-        {
-            TestDiscoveryExtensionManager.Destroy();
-            TestExecutorExtensionManager.Destroy();
-            SettingsProviderExtensionManager.Destroy();
-            this.UpdateExtensions(extensionsPath, skipExtensionFilters: false);
-        }
-
-        public TestableTestPluginCache() : this(new List<string>())
-        {
-        }
-
-        protected override IEnumerable<string> GetFilteredExtensions(List<string> extensions, string searchPattern)
-        {
-            this.Action?.Invoke();
-            return extensions;
-        }
-
-        new public void SetupAssemblyResolver(string extensionAssembly)
-        {
-            base.SetupAssemblyResolver(extensionAssembly);
-        }
+        base.SetupAssemblyResolver(extensionAssembly);
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.TestPlatform.TestUtilities/VSTestConsoleInfo.cs b/test/Microsoft.TestPlatform.TestUtilities/VSTestConsoleInfo.cs
new file mode 100644
index 0000000000..3ba8deabc9
--- /dev/null
+++ b/test/Microsoft.TestPlatform.TestUtilities/VSTestConsoleInfo.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.TestPlatform.TestUtilities;
+
+[Serializable] // Type should be serializable to allow the tree-view behavior of test discovery in Test Explorer
+public class VSTestConsoleInfo
+{
+    public string? VersionType { get; set; }
+    public string? Version { get; set; }
+    public string? Path { get; set; }
+
+    public override string ToString() => $" vstest.console = {Version} [{VersionType}]";
+}
+
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/ClientUtilitiesTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/ClientUtilitiesTests.cs
index 1616cbd9f4..50849cada2 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/ClientUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/ClientUtilitiesTests.cs
@@ -1,223 +1,227 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.Tests
+using System;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Utilities.Tests;
+
+[TestClass]
+public class ClientUtilitiesTests
 {
-    using System;
-    using System.IO;
-    using System.Reflection;
-    using System.Xml;
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldThrowIfDocumentIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(null!, "c:\\temp"));
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldThrowIfPathIsNullOrEmpty()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(new XmlDocument(), null!));
+        Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(new XmlDocument(), ""));
+    }
 
-    [TestClass]
-    public class ClientUtilitiesTests
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldNotModifyAnEmptyRunSettings()
     {
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldThrowIfDocumentIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(null, "c:\\temp"));
-        }
+        var runSettingsXml = "<RunSettings></RunSettings>";
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldThrowIfPathIsNullOrEmpty()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(new XmlDocument(), null));
-            Assert.ThrowsException<ArgumentNullException>(() => ClientUtilities.FixRelativePathsInRunSettings(new XmlDocument(), ""));
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldNotModifyAnEmptyRunSettings()
-        {
-            var runSettingsXML = "<RunSettings></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedRunSettingsXml = string.Concat("<RunSettings><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedRunSettingsXml, finalSettingsXml);
+    }
 
-            var expectedRunSettingsXML = string.Concat("<RunSettings><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldModifyRelativeTestSettingsFilePath()
+    {
+        var runSettingsXml = "<RunSettings><MSTest><SettingsFile>..\\remote.testsettings</SettingsFile></MSTest></RunSettings>";
 
-            Assert.AreEqual(expectedRunSettingsXML, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldModifyRelativeTestSettingsFilePath()
-        {
-            var runSettingsXML = "<RunSettings><MSTest><SettingsFile>..\\remote.testsettings</SettingsFile></MSTest></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedPath = Path.GetFullPath(Path.Combine(
+            Path.GetDirectoryName(currentAssemblyLocation)!, "..\\remote.testsettings"));
+        var expectedSettingsXml = string.Concat(
+            "<RunSettings><MSTest><SettingsFile>",
+            expectedPath,
+            "</SettingsFile></MSTest><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
+    }
 
-            var expectedPath = Path.GetFullPath(Path.Combine(
-                Path.GetDirectoryName(currentAssemblyLocation), "..\\remote.testsettings"));
-            var expectedSettingsXml = string.Concat(
-                "<RunSettings><MSTest><SettingsFile>",
-                expectedPath,
-                "</SettingsFile></MSTest><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldNotModifyAbsoluteTestSettingsFilePath()
+    {
+        var absolutePath = Path.Combine(Path.GetTempPath(), "remote.testsettings");
+        var runSettingsXml = $"<RunSettings><MSTest><SettingsFile>{absolutePath}</SettingsFile></MSTest></RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldNotModifyAbsoluteTestSettingsFilePath()
-        {
-            var absolutePath = Path.Combine(Path.GetTempPath(), "remote.testsettings");
-            var runSettingsXML = $"<RunSettings><MSTest><SettingsFile>{absolutePath}</SettingsFile></MSTest></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedRunSettingsXml = string.Concat($"<RunSettings><MSTest><SettingsFile>{absolutePath}</SettingsFile></MSTest><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedRunSettingsXml, finalSettingsXml);
+    }
 
-            var expectedRunSettingsXML = string.Concat($"<RunSettings><MSTest><SettingsFile>{absolutePath}</SettingsFile></MSTest><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldNotModifyEmptyTestSettingsFilePath()
+    {
+        var runSettingsXml = "<RunSettings><MSTest><SettingsFile></SettingsFile></MSTest></RunSettings>";
 
-            Assert.AreEqual(expectedRunSettingsXML, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldNotModifyEmptyTestSettingsFilePath()
-        {
-            var runSettingsXML = "<RunSettings><MSTest><SettingsFile></SettingsFile></MSTest></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedRunSettingsXml = string.Concat("<RunSettings><MSTest><SettingsFile></SettingsFile></MSTest><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedRunSettingsXml, finalSettingsXml);
+    }
 
-            var expectedRunSettingsXML = string.Concat("<RunSettings><MSTest><SettingsFile></SettingsFile></MSTest><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldModifyRelativeResultsDirectory()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><ResultsDirectory>..\\results</ResultsDirectory></RunConfiguration></RunSettings>";
 
-            Assert.AreEqual(expectedRunSettingsXML, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldModifyRelativeResultsDirectory()
-        {
-            var runSettingsXML = "<RunSettings><RunConfiguration><ResultsDirectory>..\\results</ResultsDirectory></RunConfiguration></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedPath = Path.GetFullPath(Path.Combine(
+            Path.GetDirectoryName(currentAssemblyLocation)!, "..\\results"));
+        var expectedSettingsXml = string.Concat(
+            "<RunSettings><RunConfiguration><ResultsDirectory>",
+            expectedPath,
+            "</ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
+    }
 
-            var expectedPath = Path.GetFullPath(Path.Combine(
-                Path.GetDirectoryName(currentAssemblyLocation), "..\\results"));
-            var expectedSettingsXml = string.Concat(
-                "<RunSettings><RunConfiguration><ResultsDirectory>",
-                expectedPath,
-                "</ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldNotModifyAbsoluteResultsDirectory()
+    {
+        var absolutePath = Path.Combine(Path.GetTempPath(), "results");
+        var runSettingsXml = $"<RunSettings><RunConfiguration><ResultsDirectory>{absolutePath}</ResultsDirectory></RunConfiguration></RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldNotModifyAbsoluteResultsDirectory()
-        {
-            var absolutePath = Path.Combine(Path.GetTempPath(), "results");
-            var runSettingsXML = $"<RunSettings><RunConfiguration><ResultsDirectory>{absolutePath}</ResultsDirectory></RunConfiguration></RunSettings>";
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
-            var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+        var finalSettingsXml = doc.OuterXml;
 
-            ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
+        var expectedRunSettingsXml = string.Concat($"<RunSettings><RunConfiguration><ResultsDirectory>{absolutePath}</ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
 
-            var finalSettingsXml = doc.OuterXml;
+        Assert.AreEqual(expectedRunSettingsXml, finalSettingsXml);
+    }
 
-            var expectedRunSettingsXML = string.Concat($"<RunSettings><RunConfiguration><ResultsDirectory>{absolutePath}</ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
-                Path.GetDirectoryName(currentAssemblyLocation),
-                "</RunSettingsDirectory></RunSettings>");
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldNotModifyEmptyResultsDirectory()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><ResultsDirectory></ResultsDirectory></RunConfiguration></RunSettings>";
 
-            Assert.AreEqual(expectedRunSettingsXML, finalSettingsXml);
-        }
+        var doc = new XmlDocument();
+        doc.LoadXml(runSettingsXml);
+
+        var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
+
+        ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldNotModifyEmptyResultsDirectory()
+        var finalSettingsXml = doc.OuterXml;
+
+        var expectedRunSettingsXml = string.Concat("<RunSettings><RunConfiguration><ResultsDirectory></ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
+            Path.GetDirectoryName(currentAssemblyLocation),
+            "</RunSettingsDirectory></RunSettings>");
+
+        Assert.AreEqual(expectedRunSettingsXml, finalSettingsXml);
+    }
+
+    [TestMethod]
+    public void FixRelativePathsInRunSettingsShouldExpandEnvironmentVariable()
+    {
+        try
         {
-            var runSettingsXML = "<RunSettings><RunConfiguration><ResultsDirectory></ResultsDirectory></RunConfiguration></RunSettings>";
+            Environment.SetEnvironmentVariable("TEST_TEMP", Path.GetTempPath());
+            // using TEST_TEMP because TMP or TEMP, or HOME are not defined across all tested OSes
+            // Using \\ instead of platform specifc path separator does not matter, because the paths are not interpreted by the OS.
+            var runSettingsXml = "<RunSettings><RunConfiguration><ResultsDirectory>%TEST_TEMP%\\results</ResultsDirectory><DotNetHostPath>%TEST_TEMP%\\hostpath</DotNetHostPath></RunConfiguration></RunSettings>";
 
             var doc = new XmlDocument();
-            doc.LoadXml(runSettingsXML);
+            doc.LoadXml(runSettingsXml);
 
-            var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
+            var currentAssemblyLocation = typeof(ClientUtilitiesTests).Assembly.Location;
 
             ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
 
             var finalSettingsXml = doc.OuterXml;
 
-            var expectedRunSettingsXML = string.Concat("<RunSettings><RunConfiguration><ResultsDirectory></ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
+            var expectedResultsPath = $"{Environment.GetEnvironmentVariable("TEST_TEMP")}\\results";
+            var expectedDotNetHostPath = $"{Environment.GetEnvironmentVariable("TEST_TEMP")}\\hostpath";
+
+            var expectedSettingsXml = string.Concat(
+                "<RunSettings><RunConfiguration><ResultsDirectory>",
+                expectedResultsPath,
+                "</ResultsDirectory><DotNetHostPath>",
+                expectedDotNetHostPath,
+                "</DotNetHostPath></RunConfiguration><RunSettingsDirectory>",
                 Path.GetDirectoryName(currentAssemblyLocation),
                 "</RunSettingsDirectory></RunSettings>");
 
-            Assert.AreEqual(expectedRunSettingsXML, finalSettingsXml);
+            Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
         }
-
-        [TestMethod]
-        public void FixRelativePathsInRunSettingsShouldExpandEnvironmentVariable()
+        finally
         {
-            try {
-                Environment.SetEnvironmentVariable("TEST_TEMP", Path.GetTempPath());
-                // using TEST_TEMP because TMP or TEMP, or HOME are not defined across all tested OSes
-                // Using \\ instead of platform specifc path separator does not matter, because the paths are not interpreted by the OS.
-                var runSettingsXML = "<RunSettings><RunConfiguration><ResultsDirectory>%TEST_TEMP%\\results</ResultsDirectory></RunConfiguration></RunSettings>";
-
-                var doc = new XmlDocument();
-                doc.LoadXml(runSettingsXML);
-
-                var currentAssemblyLocation = typeof(ClientUtilitiesTests).GetTypeInfo().Assembly.Location;
-
-                ClientUtilities.FixRelativePathsInRunSettings(doc, currentAssemblyLocation);
-
-                var finalSettingsXml = doc.OuterXml;
-
-                var expectedPath = $"{Environment.GetEnvironmentVariable("TEST_TEMP")}\\results";
-                
-                var expectedSettingsXml = string.Concat(
-                    "<RunSettings><RunConfiguration><ResultsDirectory>",
-                    expectedPath,
-                    "</ResultsDirectory></RunConfiguration><RunSettingsDirectory>",
-                    Path.GetDirectoryName(currentAssemblyLocation),
-                    "</RunSettingsDirectory></RunSettings>");
-
-                Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
-            }
-            finally { 
-                Environment.SetEnvironmentVariable("TEST_TEMP", null);    
-            }
+            Environment.SetEnvironmentVariable("TEST_TEMP", null);
         }
     }
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs
index e805dde084..0dfa24dd46 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs
@@ -1,186 +1,219 @@
-namespace Microsoft.TestPlatform.Utilities.UnitTests
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+#if !NETFRAMEWORK
+using System.Runtime.InteropServices;
+#endif
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.Utilities.UnitTests;
+
+[TestClass]
+public class CodeCoverageDataAttachmentsHandlerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.InteropServices;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class CodeCoverageDataAttachmentsHandlerTests
-    {
-        private readonly Mock<IProgress<int>> mockProgressReporter;
-        private readonly CodeCoverageDataAttachmentsHandler coverageDataAttachmentsHandler;
-        private readonly string _filePrefix;
+    private readonly Mock<IProgress<int>> _mockProgressReporter;
+    private readonly Mock<IMessageLogger> _messageLogger;
+    private readonly XmlElement _configurationElement;
+    private readonly CodeCoverageDataAttachmentsHandler _coverageDataAttachmentsHandler;
+    private readonly string _filePrefix;
 
-        public TestContext TestContext { get; set; }
+    public TestContext? TestContext { get; set; }
 
-        internal string TestFilesDirectory => Path.Combine(TestContext.DeploymentDirectory, "TestFiles");
+    internal string TestFilesDirectory => Path.Combine(TestContext!.DeploymentDirectory!, "TestFiles");
 
-        public CodeCoverageDataAttachmentsHandlerTests()
-        {
-            mockProgressReporter = new Mock<IProgress<int>>();
-            coverageDataAttachmentsHandler = new CodeCoverageDataAttachmentsHandler();
+    public CodeCoverageDataAttachmentsHandlerTests()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml("<configurationElement/>");
+        _configurationElement = doc.DocumentElement!;
+        _mockProgressReporter = new Mock<IProgress<int>>();
+        _messageLogger = new Mock<IMessageLogger>();
+        _coverageDataAttachmentsHandler = new CodeCoverageDataAttachmentsHandler();
 #if NETFRAMEWORK
-            _filePrefix = "file:///";
+        _filePrefix = "file:///";
 #else
-            _filePrefix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "file:///" : "file://";
+        _filePrefix = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "file:///" : "file://";
 #endif
-        }
+    }
 
-#if NETFRAMEWORK
-        [ClassInitialize]
-        public static void ClassInitialize(TestContext context)
-        {
-            // Copying test files to correct place,
-            var assemblyPath = AppDomain.CurrentDomain.BaseDirectory;
-            var testFilesDirectory = Path.Combine(context.DeploymentDirectory, "TestFiles");
-            Directory.CreateDirectory(testFilesDirectory);
-            var files = Directory.GetFiles(Path.Combine(assemblyPath, "TestFiles"));
-            foreach (var file in files)
-                File.Copy(file, Path.Combine(testFilesDirectory, Path.GetFileName(file)));
-        }
-#endif
+    [ClassInitialize]
+    public static void ClassInitialize(TestContext context)
+    {
+        // Copying test files to correct place,
+        var assemblyPath = AppDomain.CurrentDomain.BaseDirectory;
+        var testFilesDirectory = Path.Combine(context.DeploymentDirectory!, "TestFiles");
+        Directory.CreateDirectory(testFilesDirectory);
+        var files = Directory.GetFiles(Path.Combine(assemblyPath, "TestFiles"));
+        foreach (var file in files)
+            File.Copy(file, Path.Combine(testFilesDirectory, Path.GetFileName(file)));
+    }
 
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnEmptySetWhenNoAttachmentsOrAttachmentsAreNull()
-        {
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet>();
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 0);
-
-            resultAttachmentSets = await coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(null, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 0);
-
-            mockProgressReporter.Verify(p => p.Report(It.IsAny<int>()), Times.Never);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnly1Attachment()
-        {
-            var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet> { attachmentSet };
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 1);
-            Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
-            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
-            Assert.AreEqual("file:///C:/temp/aa.coverage", resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIf2DifferentFormatAttachments()
-        {
-            var file1Path = Path.Combine(TestFilesDirectory, "fullcovered.cobertura.xml");
-            var file2Path = Path.Combine(Path.Combine(TestFilesDirectory, "fullcovered.coverage"));
-            var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file2Path), "coverage"));
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet> { attachmentSet };
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 1);
-            Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 2);
-            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
-            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.Last().Uri.AbsoluteUri);
-            Assert.AreEqual(_filePrefix + file1Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
-            Assert.AreEqual(_filePrefix + file2Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.Last().Uri.AbsoluteUri);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIf2SameFormatAttachments()
-        {
-            var file1Path = Path.Combine(TestFilesDirectory, "fullcovered.cobertura.xml");
-            var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet> { attachmentSet };
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 1);
-            Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
-            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
-            Assert.AreEqual(_filePrefix + file1Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnly1LogsAttachment()
-        {
-            var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.logs"), "coverage"));
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet> { attachmentSet };
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 1);
-            Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
-            Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
-            Assert.AreEqual("file:///C:/temp/aa.logs", resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnlySeveralLogsAttachmentAnd1Report()
-        {
-            var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
-
-            var attachmentSet1 = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
-            attachmentSet1.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.logs"), "coverage"));
-            attachmentSet1.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\bb.logs"), "coverage"));
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet> { attachmentSet, attachmentSet1 };
-            ICollection<AttachmentSet> resultAttachmentSets = await
-                coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, CancellationToken.None);
-
-            Assert.IsNotNull(resultAttachmentSets);
-            Assert.IsTrue(resultAttachmentSets.Count == 2);
-            Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
-            Assert.IsTrue(resultAttachmentSets.Last().Attachments.Count == 2);
-        }
-
-        [TestMethod]
-        public async Task HandleDataCollectionAttachmentSetsShouldThrowIfCancellationRequested()
-        {
-            var attachmentSet = new AttachmentSet(new Uri("//badrui//"), string.Empty);
-            attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
-            CancellationTokenSource cts = new CancellationTokenSource();
-            cts.Cancel();
-
-            Collection<AttachmentSet> attachment = new Collection<AttachmentSet>
-            {
-                attachmentSet,
-                attachmentSet
-            };
-
-            await Assert.ThrowsExceptionAsync<OperationCanceledException>(async () => await coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(attachment, mockProgressReporter.Object, null, cts.Token));
-
-            Assert.AreEqual(2, attachment.Count);
-
-            mockProgressReporter.Verify(p => p.Report(It.IsAny<int>()), Times.Never);
-        }
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnEmptySetWhenNoAttachmentsOrAttachmentsAreNull()
+    {
+        Collection<AttachmentSet> attachment = new();
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 0);
+
+        resultAttachmentSets = await _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, null, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 0);
+
+        _mockProgressReporter.Verify(p => p.Report(It.IsAny<int>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnly1Attachment()
+    {
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
+
+        Collection<AttachmentSet> attachment = [attachmentSet];
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
+        Assert.AreEqual("file:///C:/temp/aa.coverage", resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIf2DifferentFormatAttachments()
+    {
+        var file1Path = Path.Combine(TestFilesDirectory, "fullcovered.cobertura.xml");
+        var file2Path = Path.Combine(Path.Combine(TestFilesDirectory, "fullcovered.coverage"));
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file2Path), "coverage"));
+
+        Collection<AttachmentSet> attachment = [attachmentSet];
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 2);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.Last().Uri.AbsoluteUri);
+        Assert.AreEqual(_filePrefix + file1Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
+        Assert.AreEqual(_filePrefix + file2Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.Last().Uri.AbsoluteUri);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIf2SameFormatAttachments()
+    {
+        var file1Path = Path.Combine(TestFilesDirectory, "fullcovered.cobertura.xml");
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
+
+        Collection<AttachmentSet> attachment = [attachmentSet];
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
+        Assert.AreEqual(_filePrefix + file1Path.Replace("\\", "/").Replace(" ", "%20"), resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnly1LogsAttachment()
+    {
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.logs"), "coverage"));
+
+        Collection<AttachmentSet> attachment = [attachmentSet];
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
+        Assert.AreEqual("file:///C:/temp/aa.logs", resultAttachmentSets.First().Attachments.First().Uri.AbsoluteUri);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldReturnInputIfOnlySeveralLogsAttachmentAnd1Report()
+    {
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
+
+        var attachmentSet1 = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet1.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.logs"), "coverage"));
+        attachmentSet1.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\bb.logs"), "coverage"));
+
+        Collection<AttachmentSet> attachment = [attachmentSet, attachmentSet1];
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 2);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.Last().Attachments.Count == 2);
+    }
+
+    [TestMethod]
+    public async Task HandleDataCollectionAttachmentSetsShouldThrowIfCancellationRequested()
+    {
+        var attachmentSet = new AttachmentSet(new Uri("//badrui//"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri("C:\\temp\\aa.coverage"), "coverage"));
+        CancellationTokenSource cts = new();
+        cts.Cancel();
+
+        Collection<AttachmentSet> attachment =
+        [
+            attachmentSet,
+            attachmentSet
+        ];
+
+        await Assert.ThrowsExceptionAsync<OperationCanceledException>(async () => await _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(_configurationElement, attachment, _mockProgressReporter.Object, null, cts.Token));
+
+        Assert.AreEqual(2, attachment.Count);
+
+        _mockProgressReporter.Verify(p => p.Report(It.IsAny<int>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task MergingPerTestCodeCoverageReturnsOneCoverageFile()
+    {
+        string file1Path = Path.Combine(TestFilesDirectory, "fullcovered.cobertura.xml");
+        var attachmentSet = new AttachmentSet(new Uri("datacollector://microsoft/CodeCoverage/2.0"), string.Empty);
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
+        attachmentSet.Attachments.Add(new UriDataAttachment(new Uri(file1Path), "coverage"));
+
+        var attachment = new Collection<AttachmentSet> { attachmentSet };
+
+        var doc = new XmlDocument();
+        doc.LoadXml("<Configuration><PerTestCodeCoverage>TrUe</PerTestCodeCoverage></Configuration>");
+        ICollection<AttachmentSet> resultAttachmentSets = await
+            _coverageDataAttachmentsHandler.ProcessAttachmentSetsAsync(doc.DocumentElement!, attachment, _mockProgressReporter.Object, _messageLogger.Object, CancellationToken.None);
+
+        Assert.IsNotNull(resultAttachmentSets);
+        Assert.IsTrue(resultAttachmentSets.Count == 1);
+        Assert.IsTrue(resultAttachmentSets.First().Attachments.Count == 1);
+        Assert.AreEqual("datacollector://microsoft/CodeCoverage/2.0", resultAttachmentSets.First().Uri.AbsoluteUri);
     }
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageRunSettingsProcessorTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageRunSettingsProcessorTests.cs
index 03b51f7d41..e6023e99b7 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageRunSettingsProcessorTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageRunSettingsProcessorTests.cs
@@ -1,284 +1,278 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Utilities.UnitTests;
+
+[TestClass]
+public class CodeCoverageRunSettingsProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class CodeCoverageRunSettingsProcessorTests
+    private readonly XmlElement _defaultSettings;
+    private readonly CodeCoverageRunSettingsProcessor _processor;
+
+    public CodeCoverageRunSettingsProcessorTests()
     {
-        #region Members
-        private XmlElement defaultSettings;
+        _defaultSettings = GetDefaultConfiguration();
+        _processor = new CodeCoverageRunSettingsProcessor(_defaultSettings);
+    }
 
-        private CodeCoverageRunSettingsProcessor processor;
-        #endregion
+    #region Test Methods
+    [TestMethod]
+    public void ProcessingShouldReturnNullForNullOrEmptySettings()
+    {
+        Assert.IsNull(_processor.Process((string?)null));
+        Assert.IsNull(_processor.Process(""));
 
-        #region Constructors
-        public CodeCoverageRunSettingsProcessorTests()
-        {
-            this.defaultSettings = this.GetDefaultConfiguration();
-            this.processor = new CodeCoverageRunSettingsProcessor(this.defaultSettings);
-        }
-        #endregion
+        Assert.IsNull(_processor.Process((XmlNode?)null));
 
-        #region Test Methods
-        [TestMethod]
-        public void ProcessingShouldReturnNullForNullOrEmptySettings()
-        {
-            Assert.IsNull(processor.Process((string)null));
-            Assert.IsNull(processor.Process(""));
+        Assert.IsNull(_processor.Process((XmlDocument?)null));
+    }
 
-            Assert.IsNull(processor.Process((XmlNode)null));
+    [TestMethod]
+    public void MissingCodeCoverageTagShouldAddDefaultTag()
+    {
+        const string settings = "<Configuration></Configuration>";
+        string expected = $"{_defaultSettings.OuterXml}";
 
-            Assert.IsNull(processor.Process((XmlDocument)null));
-        }
+        Assert.AreEqual(expected, _processor.Process(settings)!.OuterXml);
+    }
 
-        [TestMethod]
-        public void MissingCodeCoverageTagShouldAddDefaultTag()
-        {
-            const string settings = "<Configuration></Configuration>";
-            string expected = $"{this.defaultSettings.OuterXml}";
+    [TestMethod]
+    public void EmptyCodeCoverageTagShouldAddDefaultTag()
+    {
+        const string settings = "<Configuration><CodeCoverage></CodeCoverage></Configuration>";
+        var processedNode = _processor.Process(settings);
+        Assert.IsNotNull(processedNode);
 
-            Assert.AreEqual(expected, processor.Process(settings).OuterXml);
-        }
+        var codeCoverageNodes = ExtractNodes(processedNode, _defaultSettings, "./CodeCoverage");
 
-        [TestMethod]
-        public void EmptyCodeCoverageTagShouldAddDefaultTag()
-        {
-            const string settings = "<Configuration><CodeCoverage></CodeCoverage></Configuration>";
-            var processedNode = processor.Process(settings);
-            Assert.IsNotNull(processedNode);
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./ModulePaths/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Functions/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Attributes/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Sources/Exclude");
+    }
 
-            var codeCoverageNodes = this.ExtractNodes(processedNode, this.defaultSettings, "./CodeCoverage");
+    [TestMethod]
+    public void MergeDefaultsDisabledShouldReturnInputUnaltered()
+    {
+        var settings = string.Join(
+            Environment.NewLine,
+            @"<Configuration>",
+            @"  <CodeCoverage>",
+            @"    <ModulePaths mergeDefaults=""false""></ModulePaths>",
+            @"    <Functions mergeDefaults=""false"">",
+            @"      <Exclude></Exclude>",
+            @"    </Functions>",
+            @"    <Sources mergeDefaults=""false"">",
+            @"      <Exclude>",
+            @"          <Source>.*\\atlmfc\\.*</Source>",
+            @"          <Source>.*\\atlmbfc\\.*</Source>",
+            @"          <Source>.*\\vctools\\.*</Source>",
+            @"          <Source>.*\\public\\sdk2\\.*</Source>",
+            @"          <Source>.*\\externalapis\\.*</Source>",
+            @"          <Source>.*\\microsoft sdks\\.*</Source>",
+            @"          <Source>.*\\vc\\include\\.*</Source>",
+            @"          <Source>.*\\msclr\\.*</Source>",
+            @"          <Source>.*\\ucrt\\.*</Source>",
+            @"      </Exclude>",
+            @"    </Sources>",
+            @"    <Attributes mergeDefaults=""false""></Attributes>",
+            @"  </CodeCoverage>",
+            @"</Configuration>");
+
+        var document = new XmlDocument();
+        document.LoadXml(settings);
+
+        Assert.AreEqual(document.OuterXml, _processor.Process(settings)!.OuterXml);
+    }
 
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./ModulePaths/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Functions/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Attributes/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Sources/Exclude");
-        }
+    [TestMethod]
+    public void MixedTestShouldCorrectlyAddMissingTags()
+    {
+        var settings = string.Join(
+            Environment.NewLine,
+            @"<Configuration>",
+            @"  <CodeCoverage>",
+            @"    <ModulePaths></ModulePaths>",
+            @"    <Functions>",
+            @"      <Exclude></Exclude>",
+            @"    </Functions>",
+            @"    <Sources>",
+            @"      <Exclude>",
+            @"          <Source>.*\\atlmfc\\.*</Source>",
+            @"          <Source>.*\\atlmbfc\\.*</Source>",
+            @"          <Source>.*\\vctools\\.*</Source>",
+            @"          <Source>.*\\public\\sdk2\\.*</Source>",
+            @"          <Source>.*\\externalapis\\.*</Source>",
+            @"          <Source>.*\\microsoft sdks\\.*</Source>",
+            @"          <Source>.*\\vc\\include\\.*</Source>",
+            @"          <Source>.*\\msclr\\.*</Source>",
+            @"          <Source>.*\\ucrt\\.*</Source>",
+            @"      </Exclude>",
+            @"    </Sources>",
+            @"  </CodeCoverage>",
+            @"</Configuration>");
+
+        var expectedResult = string.Join(
+            Environment.NewLine,
+            @"<Configuration>",
+            @"  <CodeCoverage>",
+            @"    <ModulePaths>",
+            @"      <Exclude>",
+            @"         <ModulePath>.*CPPUnitTestFramework.*</ModulePath>",
+            @"         <ModulePath>.*vstest.console.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.intellitrace.*</ModulePath>",
+            @"         <ModulePath>.*testhost.*</ModulePath>",
+            @"         <ModulePath>.*datacollector.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.teamfoundation.testplatform.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.visualstudio.testplatform.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.visualstudio.testwindow.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.visualstudio.mstest.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.visualstudio.qualitytools.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.vssdk.testhostadapter.*</ModulePath>",
+            @"         <ModulePath>.*microsoft.vssdk.testhostframework.*</ModulePath>",
+            @"         <ModulePath>.*qtagent32.*</ModulePath>",
+            @"         <ModulePath>.*msvcr.*dll$</ModulePath>",
+            @"         <ModulePath>.*msvcp.*dll$</ModulePath>",
+            @"         <ModulePath>.*clr.dll$</ModulePath>",
+            @"         <ModulePath>.*clr.ni.dll$</ModulePath>",
+            @"         <ModulePath>.*clrjit.dll$</ModulePath>",
+            @"         <ModulePath>.*clrjit.ni.dll$</ModulePath>",
+            @"         <ModulePath>.*mscoree.dll$</ModulePath>",
+            @"         <ModulePath>.*mscoreei.dll$</ModulePath>",
+            @"         <ModulePath>.*mscoreei.ni.dll$</ModulePath>",
+            @"         <ModulePath>.*mscorlib.dll$</ModulePath>",
+            @"         <ModulePath>.*mscorlib.ni.dll$</ModulePath>",
+            @"         <ModulePath>.*cryptbase.dll$</ModulePath>",
+            @"         <ModulePath>.*bcryptPrimitives.dll$</ModulePath>",
+            @"       </Exclude>",
+            @"    </ModulePaths>",
+            @"    <Functions>",
+            @"      <Exclude>",
+            @"        <Function>^std::.*</Function>",
+            @"        <Function>^ATL::.*</Function>",
+            @"        <Function>.*::__GetTestMethodInfo.*</Function>",
+            @"        <Function>.*__CxxPureMSILEntry.*</Function>",
+            @"        <Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>",
+            @"        <Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>",
+            @"        <Function>.*::YOU_CAN_ONLY_DESIGNATE_ONE_.*</Function>",
+            @"        <Function>^__empty_global_delete.*</Function>",
+            @"      </Exclude>",
+            @"    </Functions>",
+            @"    <Attributes>",
+            @"      <Exclude>",
+            @"        <Attribute>^System.Diagnostics.DebuggerHiddenAttribute$</Attribute>",
+            @"        <Attribute>^System.Diagnostics.DebuggerNonUserCodeAttribute$</Attribute>",
+            @"        <Attribute>System.Runtime.CompilerServices.CompilerGeneratedAttribute$</Attribute>",
+            @"        <Attribute>^System.CodeDom.Compiler.GeneratedCodeAttribute$</Attribute>",
+            @"        <Attribute>^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$</Attribute>",
+            @"        <Attribute>^Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode.*</Attribute>",
+            @"      </Exclude>",
+            @"    </Attributes>",
+            @"    <Sources>",
+            @"      <Exclude>",
+            @"          <Source>.*\\atlmfc\\.*</Source>",
+            @"          <Source>.*\\atlmbfc\\.*</Source>",
+            @"          <Source>.*\\vctools\\.*</Source>",
+            @"          <Source>.*\\public\\sdk2\\.*</Source>",
+            @"          <Source>.*\\externalapis\\.*</Source>",
+            @"          <Source>.*\\microsoft sdks\\.*</Source>",
+            @"          <Source>.*\\vc\\include\\.*</Source>",
+            @"          <Source>.*\\msclr\\.*</Source>",
+            @"          <Source>.*\\ucrt\\.*</Source>",
+            @"          <Source>.*\\public\\sdk\\.*</Source>",
+            @"      </Exclude>",
+            @"    </Sources>",
+            @"  </CodeCoverage>",
+            @"</Configuration>");
+
+        var expectedResultDocument = new XmlDocument();
+        expectedResultDocument.LoadXml(expectedResult);
+
+        var processedNode = _processor.Process(settings);
+        Assert.IsNotNull(processedNode);
+
+        var codeCoverageNodes = ExtractNodes(processedNode, expectedResultDocument.DocumentElement!, "./CodeCoverage");
+
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./ModulePaths/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Functions/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Attributes/Exclude");
+        CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Sources/Exclude");
+    }
+    #endregion
 
-        [TestMethod]
-        public void MergeDefaultsDisabledShouldReturnInputUnaltered()
+    #region Helpers
+    private static XmlNode? ExtractNode(XmlNode node, string path)
+    {
+        try
         {
-            var settings = string.Join(
-                Environment.NewLine,
-                @"<Configuration>",
-                @"  <CodeCoverage>",
-                @"    <ModulePaths mergeDefaults=""false""></ModulePaths>",
-                @"    <Functions mergeDefaults=""false"">",
-                @"      <Exclude></Exclude>",
-                @"    </Functions>",
-                @"    <Sources mergeDefaults=""false"">",
-                @"      <Exclude>",
-                @"          <Source>.*\\atlmfc\\.*</Source>",
-                @"          <Source>.*\\atlmbfc\\.*</Source>",
-                @"          <Source>.*\\vctools\\.*</Source>",
-                @"          <Source>.*\\public\\sdk2\\.*</Source>",
-                @"          <Source>.*\\externalapis\\.*</Source>",
-                @"          <Source>.*\\microsoft sdks\\.*</Source>",
-                @"          <Source>.*\\vc\\include\\.*</Source>",
-                @"          <Source>.*\\msclr\\.*</Source>",
-                @"          <Source>.*\\ucrt\\.*</Source>",
-                @"      </Exclude>",
-                @"    </Sources>",
-                @"    <Attributes mergeDefaults=""false""></Attributes>",
-                @"  </CodeCoverage>",
-                @"</Configuration>");
-
-            var document = new XmlDocument();
-            document.LoadXml(settings);
-
-            Assert.AreEqual(document.OuterXml, processor.Process(settings).OuterXml);
+            return node.SelectSingleNode(path);
         }
-
-        [TestMethod]
-        public void MixedTestShouldCorrectlyAddMissingTags()
+        catch
         {
-            var settings = string.Join(
-                Environment.NewLine,
-                @"<Configuration>",
-                @"  <CodeCoverage>",
-                @"    <ModulePaths></ModulePaths>",
-                @"    <Functions>",
-                @"      <Exclude></Exclude>",
-                @"    </Functions>",
-                @"    <Sources>",
-                @"      <Exclude>",
-                @"          <Source>.*\\atlmfc\\.*</Source>",
-                @"          <Source>.*\\atlmbfc\\.*</Source>",
-                @"          <Source>.*\\vctools\\.*</Source>",
-                @"          <Source>.*\\public\\sdk2\\.*</Source>",
-                @"          <Source>.*\\externalapis\\.*</Source>",
-                @"          <Source>.*\\microsoft sdks\\.*</Source>",
-                @"          <Source>.*\\vc\\include\\.*</Source>",
-                @"          <Source>.*\\msclr\\.*</Source>",
-                @"          <Source>.*\\ucrt\\.*</Source>",
-                @"      </Exclude>",
-                @"    </Sources>",
-                @"  </CodeCoverage>",
-                @"</Configuration>");
-
-            var expectedResult = string.Join(
-                Environment.NewLine,
-                @"<Configuration>",
-                @"  <CodeCoverage>",
-                @"    <ModulePaths>",
-                @"      <Exclude>",
-                @"         <ModulePath>.*CPPUnitTestFramework.*</ModulePath>",
-                @"         <ModulePath>.*vstest.console.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.intellitrace.*</ModulePath>",
-                @"         <ModulePath>.*testhost.*</ModulePath>",
-                @"         <ModulePath>.*datacollector.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.teamfoundation.testplatform.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.visualstudio.testplatform.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.visualstudio.testwindow.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.visualstudio.mstest.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.visualstudio.qualitytools.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.vssdk.testhostadapter.*</ModulePath>",
-                @"         <ModulePath>.*microsoft.vssdk.testhostframework.*</ModulePath>",
-                @"         <ModulePath>.*qtagent32.*</ModulePath>",
-                @"         <ModulePath>.*msvcr.*dll$</ModulePath>",
-                @"         <ModulePath>.*msvcp.*dll$</ModulePath>",
-                @"         <ModulePath>.*clr.dll$</ModulePath>",
-                @"         <ModulePath>.*clr.ni.dll$</ModulePath>",
-                @"         <ModulePath>.*clrjit.dll$</ModulePath>",
-                @"         <ModulePath>.*clrjit.ni.dll$</ModulePath>",
-                @"         <ModulePath>.*mscoree.dll$</ModulePath>",
-                @"         <ModulePath>.*mscoreei.dll$</ModulePath>",
-                @"         <ModulePath>.*mscoreei.ni.dll$</ModulePath>",
-                @"         <ModulePath>.*mscorlib.dll$</ModulePath>",
-                @"         <ModulePath>.*mscorlib.ni.dll$</ModulePath>",
-                @"         <ModulePath>.*cryptbase.dll$</ModulePath>",
-                @"         <ModulePath>.*bcryptPrimitives.dll$</ModulePath>",
-                @"       </Exclude>",
-                @"    </ModulePaths>",
-                @"    <Functions>",
-                @"      <Exclude>",
-                @"        <Function>^std::.*</Function>",
-                @"        <Function>^ATL::.*</Function>",
-                @"        <Function>.*::__GetTestMethodInfo.*</Function>",
-                @"        <Function>.*__CxxPureMSILEntry.*</Function>",
-                @"        <Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>",
-                @"        <Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>",
-                @"        <Function>.*::YOU_CAN_ONLY_DESIGNATE_ONE_.*</Function>",
-                @"        <Function>^__.*</Function>",
-                @"        <Function>.*::__.*</Function>",
-                @"      </Exclude>",
-                @"    </Functions>",
-                @"    <Attributes>",
-                @"      <Exclude>",
-                @"        <Attribute>^System.Diagnostics.DebuggerHiddenAttribute$</Attribute>",
-                @"        <Attribute>^System.Diagnostics.DebuggerNonUserCodeAttribute$</Attribute>",
-                @"        <Attribute>System.Runtime.CompilerServices.CompilerGeneratedAttribute$</Attribute>",
-                @"        <Attribute>^System.CodeDom.Compiler.GeneratedCodeAttribute$</Attribute>",
-                @"        <Attribute>^System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute$</Attribute>",
-                @"        <Attribute>^Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode.*</Attribute>",
-                @"      </Exclude>",
-                @"    </Attributes>",
-                @"    <Sources>",
-                @"      <Exclude>",
-                @"          <Source>.*\\atlmfc\\.*</Source>",
-                @"          <Source>.*\\atlmbfc\\.*</Source>",
-                @"          <Source>.*\\vctools\\.*</Source>",
-                @"          <Source>.*\\public\\sdk2\\.*</Source>",
-                @"          <Source>.*\\externalapis\\.*</Source>",
-                @"          <Source>.*\\microsoft sdks\\.*</Source>",
-                @"          <Source>.*\\vc\\include\\.*</Source>",
-                @"          <Source>.*\\msclr\\.*</Source>",
-                @"          <Source>.*\\ucrt\\.*</Source>",
-                @"          <Source>.*\\public\\sdk\\.*</Source>",
-                @"      </Exclude>",
-                @"    </Sources>",
-                @"  </CodeCoverage>",
-                @"</Configuration>");
-
-            var expectedResultDocument = new XmlDocument();
-            expectedResultDocument.LoadXml(expectedResult);
-
-            var processedNode = processor.Process(settings);
-            Assert.IsNotNull(processedNode);
-
-            var codeCoverageNodes = this.ExtractNodes(processedNode, expectedResultDocument.DocumentElement, "./CodeCoverage");
-
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./ModulePaths/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Functions/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Attributes/Exclude");
-            this.CompareResults(codeCoverageNodes.Item1, codeCoverageNodes.Item2, "./Sources/Exclude");
         }
-        #endregion
 
-        #region Helpers
-        private XmlNode ExtractNode(XmlNode node, string path)
-        {
-            try
-            {
-                return node.SelectSingleNode(path);
-            }
-            catch
-            {
-            }
-
-            return null;
-        }
+        return null;
+    }
 
-        private XmlElement GetDefaultConfiguration()
+    private static XmlElement GetDefaultConfiguration()
+    {
+        var document = new XmlDocument();
+        Assembly assembly = typeof(CodeCoverageRunSettingsProcessorTests).Assembly;
+        using (Stream stream = assembly.GetManifestResourceStream("Microsoft.TestPlatform.Utilities.UnitTests.DefaultCodeCoverageConfig.xml")!)
         {
-            var document = new XmlDocument();
-            Assembly assembly = typeof(CodeCoverageRunSettingsProcessorTests).GetTypeInfo().Assembly;
-            using (Stream stream = assembly.GetManifestResourceStream(
-                "Microsoft.TestPlatform.Utilities.UnitTests.DefaultCodeCoverageConfig.xml"))
-            {
-                document.Load(stream);
-            }
-
-            return document.DocumentElement;
+            document.Load(stream);
         }
 
-        private Tuple<XmlNode, XmlNode> ExtractNodes(XmlNode currentSettingsRoot, XmlNode defaultSettingsRoot, string path)
-        {
-            var currentNode = this.ExtractNode(currentSettingsRoot, path);
-            var defaultNode = this.ExtractNode(defaultSettingsRoot, path);
-            Assert.IsNotNull(currentNode);
-            Assert.IsNotNull(defaultNode);
+        return document.DocumentElement!;
+    }
 
-            return new Tuple<XmlNode, XmlNode>(currentNode, defaultNode);
-        }
+    private static Tuple<XmlNode, XmlNode> ExtractNodes(XmlNode currentSettingsRoot, XmlNode defaultSettingsRoot, string path)
+    {
+        var currentNode = ExtractNode(currentSettingsRoot, path);
+        var defaultNode = ExtractNode(defaultSettingsRoot, path);
+        Assert.IsNotNull(currentNode);
+        Assert.IsNotNull(defaultNode);
 
-        private void CompareResults(XmlNode currentSettingsRoot, XmlNode defaultSettingsRoot, string path)
-        {
-            var nodes = this.ExtractNodes(currentSettingsRoot, defaultSettingsRoot, path);
+        return new Tuple<XmlNode, XmlNode>(currentNode, defaultNode);
+    }
+
+    private static void CompareResults(XmlNode currentSettingsRoot, XmlNode defaultSettingsRoot, string path)
+    {
+        var nodes = ExtractNodes(currentSettingsRoot, defaultSettingsRoot, path);
 
-            Assert.AreEqual(nodes.Item1.ChildNodes.Count, nodes.Item2.ChildNodes.Count);
+        Assert.AreEqual(nodes.Item1.ChildNodes.Count, nodes.Item2.ChildNodes.Count);
 
-            var set = new HashSet<string>();
-            foreach (XmlNode child in nodes.Item1.ChildNodes)
+        var set = new HashSet<string>();
+        foreach (XmlNode child in nodes.Item1.ChildNodes)
+        {
+            if (!set.Contains(child.OuterXml))
             {
-                if (!set.Contains(child.OuterXml))
-                {
-                    set.Add(child.OuterXml);
-                }
+                set.Add(child.OuterXml);
             }
+        }
 
-            foreach (XmlNode child in nodes.Item2.ChildNodes)
+        foreach (XmlNode child in nodes.Item2.ChildNodes)
+        {
+            if (!set.Contains(child.OuterXml))
             {
-                if (!set.Contains(child.OuterXml))
-                {
-                    set.Add(child.OuterXml);
-                    continue;
-                }
-
-                set.Remove(child.OuterXml);
+                set.Add(child.OuterXml);
+                continue;
             }
 
-            Assert.AreEqual(0, set.Count);
+            set.Remove(child.OuterXml);
         }
-        #endregion
+
+        Assert.AreEqual(0, set.Count);
     }
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/CommandLineUtilitiesTest.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/CommandLineUtilitiesTest.cs
index f63ec574b6..c1106695a7 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/CommandLineUtilitiesTest.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/CommandLineUtilitiesTest.cs
@@ -1,32 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.Tests
-{
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-    [TestClass]
-    public class CommandLineUtilitiesTest
-    {
-        private void VerifyCommandLineSplitter(string commandLine, string[] expected)
-        {
-            CommandLineUtilities.SplitCommandLineIntoArguments(commandLine, out var actual);
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-            Assert.AreEqual(expected.Length, actual.Length);
-            for (int i = 0; i < actual.Length; ++i)
-            {
-                Assert.AreEqual(expected[i], actual[i]);
-            }
-        }
+namespace Microsoft.TestPlatform.Utilities.Tests;
+
+[TestClass]
+public class CommandLineUtilitiesTest
+{
+    private static void VerifyCommandLineSplitter(string commandLine, string[] expected)
+    {
+        CommandLineUtilities.SplitCommandLineIntoArguments(commandLine, out var actual);
 
-        [TestMethod]
-        public void TestCommandLineSplitter()
+        Assert.AreEqual(expected.Length, actual.Length);
+        for (int i = 0; i < actual.Length; ++i)
         {
-            VerifyCommandLineSplitter("", new string[0]);
-            VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\"", new[] { @"/testadapterpath:c:\Path" });
-            VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\" /logger:\"trx\"", new[] { @"/testadapterpath:c:\Path", "/logger:trx" });
-            VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\" /logger:\"trx\" /diag:\"log.txt\"", new[] { @"/testadapterpath:c:\Path", "/logger:trx", "/diag:log.txt" });
+            Assert.AreEqual(expected[i], actual[i]);
         }
     }
+
+    [TestMethod]
+    public void TestCommandLineSplitter()
+    {
+        VerifyCommandLineSplitter("", []);
+        VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\"", [@"/testadapterpath:c:\Path"]);
+        VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\" /logger:\"trx\"", [@"/testadapterpath:c:\Path", "/logger:trx"]);
+        VerifyCommandLineSplitter("/testadapterpath:\"c:\\Path\" /logger:\"trx\" /diag:\"log.txt\"", [@"/testadapterpath:c:\Path", "/logger:trx", "/diag:log.txt"]);
+    }
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/DefaultCodeCoverageConfig.xml b/test/Microsoft.TestPlatform.Utilities.UnitTests/DefaultCodeCoverageConfig.xml
index 3bc0b33877..693028e3e8 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/DefaultCodeCoverageConfig.xml
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/DefaultCodeCoverageConfig.xml
@@ -45,8 +45,7 @@
 				<Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>
 				<Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>
 				<Function>.*::YOU_CAN_ONLY_DESIGNATE_ONE_.*</Function>
-				<Function>^__.*</Function>
-				<Function>.*::__.*</Function>
+				<Function>^__empty_global_delete.*</Function>
 			</Exclude>
 		</Functions>
 		<Attributes>
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
index bd928e4965..d5c1de85a1 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
@@ -1,841 +1,810 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using OMResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
+
+namespace Microsoft.TestPlatform.Utilities.UnitTests;
+
+[TestClass]
+public class InferRunSettingsHelperTests
 {
-	using System;
-	using System.Xml;
-
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-	using OMResources = Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-	using Microsoft.VisualStudio.TestPlatform.Utilities;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
-	using MSTest.TestFramework.AssertExtensions;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Globalization;
-	using System.Text;
-
-	[TestClass]
-	public class InferRunSettingsHelperTests
-	{
-		private IDictionary<string, Architecture> sourceArchitectures;
-		private IDictionary<string, Framework> sourceFrameworks;
-		private readonly Framework frameworkNet45 = Framework.FromString(".NETFramework,Version=4.5");
-		private readonly Framework frameworkNet46 = Framework.FromString(".NETFramework,Version=4.6");
-		private readonly Framework frameworkNet47 = Framework.FromString(".NETFramework,Version=4.7");
-		private const string multiTargettingForwardLink = @"https://aka.ms/tp/vstest/multitargetingdoc?view=vs-2019";
-
-		public InferRunSettingsHelperTests()
-		{
-			sourceArchitectures = new Dictionary<string, Architecture>();
-			sourceFrameworks = new Dictionary<string, Framework>();
-		}
-
-		[TestMethod]
-		public void UpdateRunSettingsShouldThrowIfRunSettingsNodeDoesNotExist()
-		{
-			var settings = @"<RandomSettings></RandomSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
-
-			Assert.That.Throws<XmlException>(action)
-						.WithMessage(string.Format("An error occurred while loading the settings.  Error: {0}.",
-											"Could not find 'RunSettings' node."));
-		}
-
-		[TestMethod]
-		public void UpdateRunSettingsShouldThrowIfPlatformNodeIsInvalid()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetPlatform>foo</TargetPlatform></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
-
-			Assert.That.Throws<XmlException>(action)
-						.WithMessage(string.Format("An error occurred while loading the settings.  Error: {0}.",
-										string.Format("Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'",
-											"RunConfiguration",
-											"foo",
-											"TargetPlatform")));
-		}
-
-		[TestMethod]
-		public void UpdateRunSettingsShouldThrowIfFrameworkNodeIsInvalid()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>foo</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    private readonly IDictionary<string, Architecture> _sourceArchitectures;
+    private readonly IDictionary<string, Framework> _sourceFrameworks;
+    private readonly Framework _frameworkNet45 = Framework.FromString(".NETFramework,Version=4.5")!;
+    private readonly Framework _frameworkNet46 = Framework.FromString(".NETFramework,Version=4.6")!;
+    private readonly Framework _frameworkNet47 = Framework.FromString(".NETFramework,Version=4.7")!;
+    private const string MultiTargettingForwardLink = @"https://aka.ms/tp/vstest/multitargetingdoc?view=vs-2019";
+
+    public InferRunSettingsHelperTests()
+    {
+        _sourceArchitectures = new Dictionary<string, Architecture>();
+        _sourceFrameworks = new Dictionary<string, Framework>();
+    }
+
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrowIfRunSettingsNodeDoesNotExist()
+    {
+        var settings = @"<RandomSettings></RandomSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
+
+        var exception = Assert.ThrowsExactly<XmlException>(action);
+        Assert.AreEqual("An error occurred while loading the settings.  Error: Could not find 'RunSettings' node..", exception.Message);
+    }
+
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrowIfPlatformNodeIsInvalid()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetPlatform>foo</TargetPlatform></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
+        Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
 
-			Assert.That.Throws<XmlException>(action)
-						.WithMessage(string.Format("An error occurred while loading the settings.  Error: {0}.",
-										string.Format("Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'",
-										"RunConfiguration",
-										"foo",
-										"TargetFrameworkVersion")));
-		}
+        var exception = Assert.ThrowsExactly<XmlException>(action);
+        Assert.AreEqual("An error occurred while loading the settings.  Error: Invalid setting 'RunConfiguration'. Invalid value 'foo' specified for 'TargetPlatform'..", exception.Message);
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldUpdateWithPlatformSettings()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldThrowIfFrameworkNodeIsInvalid()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>foo</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
+        Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var exception = Assert.ThrowsExactly<XmlException>(action);
+        Assert.AreEqual("An error occurred while loading the settings.  Error: Invalid setting 'RunConfiguration'. Invalid value 'foo' specified for 'TargetFrameworkVersion'..", exception.Message);
+    }
 
-			StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
-		}
-
-		[TestMethod]
-		public void UpdateRunSettingsShouldUpdateWithFrameworkSettings()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldUpdateWithPlatformSettings()
+    {
+        var settings = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, $"<TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>");
-		}
+        StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldUpdateWithResultsDirectorySettings()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldUpdateWithFrameworkSettings()
+    {
+        var settings = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<ResultsDirectory>temp</ResultsDirectory>");
-		}
+        StringAssert.Contains(xml, $"<TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldNotUpdatePlatformIfRunSettingsAlreadyHasIt()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetPlatform>X86</TargetPlatform></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldUpdateWithResultsDirectorySettings()
+    {
+        var settings = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X86, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
-		}
+        StringAssert.Contains(xml, "<ResultsDirectory>temp</ResultsDirectory>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldNotUpdateFrameworkIfRunSettingsAlreadyHasIt()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>Framework40</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldNotUpdatePlatformIfRunSettingsAlreadyHasIt()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetPlatform>X86</TargetPlatform></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion>");
-		}
-		//TargetFrameworkMoniker
+        StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldAllowTargetFrameworkMonikerValue()
-		{
+    [TestMethod]
+    public void UpdateRunSettingsShouldNotUpdateFrameworkIfRunSettingsAlreadyHasIt()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>Framework40</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        var xml = xmlDocument.OuterXml;
 
-			var xml = xmlDocument.OuterXml;
+        StringAssert.Contains(xml, "<TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion>");
+    }
+    //TargetFrameworkMoniker
 
-			StringAssert.Contains(xml, "<TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion>");
-		}
+    [TestMethod]
+    public void UpdateRunSettingsShouldAllowTargetFrameworkMonikerValue()
+    {
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldNotUpdateResultsDirectoryIfRunSettingsAlreadyHasIt()
-		{
-			var settings = @"<RunSettings><RunConfiguration><ResultsDirectory>someplace</ResultsDirectory></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+        var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<ResultsDirectory>someplace</ResultsDirectory>");
-		}
+        StringAssert.Contains(xml, "<TargetFrameworkVersion>.NETFramework,Version=v4.0</TargetFrameworkVersion>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldNotUpdatePlatformOrFrameworkOrResultsDirectoryIfRunSettingsAlreadyHasIt()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetPlatform>X86</TargetPlatform><TargetFrameworkVersion>Framework40</TargetFrameworkVersion><ResultsDirectory>someplace</ResultsDirectory></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldNotUpdateResultsDirectoryIfRunSettingsAlreadyHasIt()
+    {
+        var settings = @"<RunSettings><RunConfiguration><ResultsDirectory>someplace</ResultsDirectory></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
-			StringAssert.Contains(xml, "<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>");
-			StringAssert.Contains(xml, "<ResultsDirectory>someplace</ResultsDirectory>");
-		}
+        StringAssert.Contains(xml, "<ResultsDirectory>someplace</ResultsDirectory>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsWithAnEmptyRunSettingsShouldAddValuesSpecifiedInRunConfiguration()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
+    [TestMethod]
+    public void UpdateRunSettingsShouldNotUpdatePlatformOrFrameworkOrResultsDirectoryIfRunSettingsAlreadyHasIt()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetPlatform>X86</TargetPlatform><TargetFrameworkVersion>Framework40</TargetFrameworkVersion><ResultsDirectory>someplace</ResultsDirectory></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
 
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
 
-			var xml = xmlDocument.OuterXml;
+        var xml = xmlDocument.OuterXml;
 
-			StringAssert.Contains(xml, "<TargetPlatform>X64</TargetPlatform>");
-			StringAssert.Contains(xml, $"<TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>");
-			StringAssert.Contains(xml, "<ResultsDirectory>temp</ResultsDirectory>");
-		}
+        StringAssert.Contains(xml, "<TargetPlatform>X86</TargetPlatform>");
+        StringAssert.Contains(xml, "<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>");
+        StringAssert.Contains(xml, "<ResultsDirectory>someplace</ResultsDirectory>");
+    }
 
-		[TestMethod]
-		public void UpdateRunSettingsShouldReturnBackACompleteRunSettings()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
-
-			var xml = xmlDocument.OuterXml;
-			var expectedRunSettings = string.Format("<RunSettings><RunConfiguration><ResultsDirectory>temp</ResultsDirectory><TargetPlatform>X64</TargetPlatform><TargetFrameworkVersion>{0}</TargetFrameworkVersion></RunConfiguration></RunSettings>", Framework.DefaultFramework.Name);
-
-			Assert.AreEqual(expectedRunSettings, xml);
-		}
-
-		[TestMethod]
-		public void UpdateRunSettingsShouldThrowIfArchitectureSetIsIncompatibleWithCurrentSystemArchitecture()
-		{
-			var settings = @"<RunSettings></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.ARM, Framework.DefaultFramework, "temp");
-
-			Assert.That.Throws<SettingsException>(action)
-				.WithMessage(string.Format(
-						"Incompatible Target platform settings '{0}' with system architecture '{1}'.",
-						"ARM",
-						XmlRunSettingsUtilities.OSArchitecture.ToString()));
-		}
-
-		[TestMethod]
-		public void UpdateDesignModeOrCsiShouldNotModifyXmlIfNodeIsAlreadyPresent()
-		{
-			var settings = @"<RunSettings><RunConfiguration><DesignMode>False</DesignMode><CollectSourceInformation>False</CollectSourceInformation></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateDesignMode(xmlDocument, true);
-			InferRunSettingsHelper.UpdateCollectSourceInformation(xmlDocument, true);
-
-			Assert.AreEqual("False", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/DesignMode"));
-			Assert.AreEqual("False", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/CollectSourceInformation"));
-		}
-
-		[DataTestMethod]
-		[DataRow(true)]
-		[DataRow(false)]
-		public void UpdateDesignModeOrCsiShouldModifyXmlToValueProvided(bool val)
-		{
-			var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateDesignMode(xmlDocument, val);
-			InferRunSettingsHelper.UpdateCollectSourceInformation(xmlDocument, val);
-
-			Assert.AreEqual(val.ToString(), this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/DesignMode"));
-			Assert.AreEqual(val.ToString(), this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/CollectSourceInformation"));
-		}
-
-		[TestMethod]
-		public void MakeRunsettingsCompatibleShouldDeleteNewlyAddedRunConfigurationNode()
-		{
-			var settings = @"<RunSettings><RunConfiguration><DesignMode>False</DesignMode><CollectSourceInformation>False</CollectSourceInformation></RunConfiguration></RunSettings>";
-
-			var result = InferRunSettingsHelper.MakeRunsettingsCompatible(settings);
-
-			Assert.IsTrue(result.IndexOf("DesignMode", StringComparison.OrdinalIgnoreCase) < 0);
-		}
-
-		[TestMethod]
-		public void MakeRunsettingsCompatibleShouldNotDeleteOldRunConfigurationNode()
-		{
-			var settings = @"<RunSettings>
-								<RunConfiguration>
-									<DesignMode>False</DesignMode>
-									<CollectSourceInformation>False</CollectSourceInformation>
-									<TargetPlatform>x86</TargetPlatform>
-									<TargetFrameworkVersion>net46</TargetFrameworkVersion>
-									<TestAdaptersPaths>dummypath</TestAdaptersPaths>
-									<ResultsDirectory>dummypath</ResultsDirectory>
-									<SolutionDirectory>dummypath</SolutionDirectory>
-									<MaxCpuCount>2</MaxCpuCount>
-									<DisableParallelization>False</DisableParallelization>
-									<DisableAppDomain>False</DisableAppDomain>
-								</RunConfiguration>
-							</RunSettings>";
-
-			var result = InferRunSettingsHelper.MakeRunsettingsCompatible(settings);
-
-			Assert.IsTrue(result.IndexOf("TargetPlatform", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("TargetFrameworkVersion", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("TestAdaptersPaths", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("ResultsDirectory", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("SolutionDirectory", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("MaxCpuCount", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("DisableParallelization", StringComparison.OrdinalIgnoreCase) > 0);
-			Assert.IsTrue(result.IndexOf("DisableAppDomain", StringComparison.OrdinalIgnoreCase) > 0);
-		}
-
-		[TestMethod]
-		public void UpdateTargetDeviceValueFromOldMsTestSettings()
-		{
-			var settings = @"<RunSettings>
-								<RunConfiguration>
-									<MaxCpuCount>2</MaxCpuCount>
-									<DisableParallelization>False</DisableParallelization>
-									<DisableAppDomain>False</DisableAppDomain>
-								</RunConfiguration>
-								<MSPhoneTest>
-								  <TargetDevice>169.254.193.190</TargetDevice>
-								</MSPhoneTest>
-							</RunSettings>";
-
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			var result = InferRunSettingsHelper.TryGetDeviceXml(xmlDocument.CreateNavigator(), out string deviceXml);
-			Assert.IsTrue(result);
-
-			InferRunSettingsHelper.UpdateTargetDevice(xmlDocument, deviceXml);
-			Assert.AreEqual(deviceXml.ToString(), this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetDevice"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetPlatformShouldNotModifyXmlIfNodeIsAlreadyPresentForOverwriteFalse()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64", overwrite: false);
-
-			Assert.AreEqual("x86", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetPlatformShouldModifyXmlIfNodeIsAlreadyPresentForOverwriteTrue()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64", overwrite: true);
-
-			Assert.AreEqual("X64", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetPlatformShouldAddPlatformXmlNodeIfNotPresent()
-		{
-			var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64");
-
-			Assert.AreEqual("X64", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetFrameworkShouldNotModifyXmlIfNodeIsAlreadyPresentForOverwriteFalse()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0", overwrite: false);
-
-			Assert.AreEqual(".NETFramework,Version=v4.5", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetFrameworkShouldModifyXmlIfNodeIsAlreadyPresentForOverwriteTrue()
-		{
-			var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0", overwrite: true);
-
-			Assert.AreEqual(".NETCoreApp,Version=v1.0", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
-		}
-
-		[TestMethod]
-		public void UpdateTargetFrameworkShouldAddFrameworkXmlNodeIfNotPresent()
-		{
-			var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-			var xmlDocument = this.GetXmlDocument(settings);
-
-			InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0");
-
-			Assert.AreEqual(".NETCoreApp,Version=v1.0", this.GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
-		}
-
-		[TestMethod]
-		public void FilterCompatibleSourcesShouldIdentifyIncomaptiableSourcesAndConstructWarningMessage()
-		{
-			#region Arrange
-			sourceArchitectures["AnyCPU1net46.dll"] = Architecture.AnyCPU;
-			sourceArchitectures["x64net47.exe"] = Architecture.X64;
-			sourceArchitectures["x86net45.dll"] = Architecture.X86;
-
-			sourceFrameworks["AnyCPU1net46.dll"] = frameworkNet46;
-			sourceFrameworks["x64net47.exe"] = frameworkNet47;
-			sourceFrameworks["x86net45.dll"] = frameworkNet45;
-
-			StringBuilder sb = new StringBuilder();
-			sb.AppendLine();
-			sb.AppendLine(GetSourceIncompatibleMessage("AnyCPU1net46.dll"));
-			sb.AppendLine(GetSourceIncompatibleMessage("x64net47.exe"));
-			sb.AppendLine(GetSourceIncompatibleMessage("x86net45.dll"));
-
-			var expected = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, frameworkNet45, Constants.DefaultPlatform, sb.ToString(), multiTargettingForwardLink);
-			#endregion
-
-			string warningMessage = string.Empty;
-			var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, frameworkNet45, sourceArchitectures, sourceFrameworks, out warningMessage);
-
-			// None of the DLLs passed are compatible to the chosen settings
-			Assert.AreEqual(0, compatibleSources.Count());
-			Assert.AreEqual(expected, warningMessage);
-		}
-
-		[TestMethod]
-		public void FilterCompatibleSourcesShouldIdentifyCompatibleSources()
-		{
-			sourceArchitectures["x64net45.exe"] = Architecture.X64;
-			sourceArchitectures["x86net45.dll"] = Architecture.X86;
-
-			sourceFrameworks["x64net45.exe"] = frameworkNet45;
-			sourceFrameworks["x86net45.dll"] = frameworkNet45;
-
-			StringBuilder sb = new StringBuilder();
-			sb.AppendLine();
-			sb.AppendLine(GetSourceIncompatibleMessage("x86net45.dll"));
-
-			var expected = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, frameworkNet45, Constants.DefaultPlatform, sb.ToString(), multiTargettingForwardLink);
-
-			string warningMessage = string.Empty;
-			var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, frameworkNet45, sourceArchitectures, sourceFrameworks, out warningMessage);
-
-			// only "x64net45.exe" is the compatible source
-			Assert.AreEqual(1, compatibleSources.Count());
-			Assert.AreEqual(expected, warningMessage);
-		}
-
-		[TestMethod]
-		public void FilterCompatibleSourcesShouldNotComposeWarningIfSettingsAreCorrect()
-		{
-			sourceArchitectures["x86net45.dll"] = Architecture.X86;
-			sourceFrameworks["x86net45.dll"] = frameworkNet45;
-
-			string warningMessage = string.Empty;
-			var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Architecture.X86, Constants.DefaultPlatform, frameworkNet45, sourceArchitectures, sourceFrameworks, out warningMessage);
-
-			// only "x86net45.dll" is the compatible source
-			Assert.AreEqual(1, compatibleSources.Count());
-			Assert.IsTrue(string.IsNullOrEmpty(warningMessage));
-		}
-
-		[TestMethod]
-		public void FilterCompatibleSourcesShouldRetrunWarningMessageIfNoConflict()
-		{
-			sourceArchitectures["x64net45.exe"] = Architecture.X64;
-			sourceFrameworks["x64net45.exe"] = frameworkNet45;
-
-			string warningMessage = string.Empty;
-			var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, frameworkNet45, sourceArchitectures, sourceFrameworks, out warningMessage);
-
-			Assert.IsTrue(string.IsNullOrEmpty(warningMessage));
-		}
-
-		[TestMethod]
-		public void IsTestSettingsEnabledShouldReturnTrueIfRunsettingsHasTestSettings()
-		{
-			string runsettingsString = @"<RunSettings>
-										<MSTest>
-											<SettingsFile>C:\temp.testsettings</SettingsFile>
-											<ForcedLegacyMode>true</ForcedLegacyMode>
-										</MSTest>
-									</RunSettings>";
-
-			Assert.IsTrue(InferRunSettingsHelper.IsTestSettingsEnabled(runsettingsString));
-		}
-
-		[TestMethod]
-		public void IsTestSettingsEnabledShouldReturnFalseIfRunsettingsDoesnotHaveTestSettings()
-		{
-			string runsettingsString = @"<RunSettings>
-										<MSTest>
-											<ForcedLegacyMode>true</ForcedLegacyMode>
-										</MSTest>
-									</RunSettings>";
-
-			Assert.IsFalse(InferRunSettingsHelper.IsTestSettingsEnabled(runsettingsString));
-		}
-
-		[TestMethod]
-		public void TryGetLegacySettingsForRunSettingsWithoutLegacySettingsShouldReturnFalse()
-		{
-			string runSettingsXml = @"<RunSettings>
-									  </RunSettings>";
-
-			Assert.IsFalse(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
-		}
-
-		[TestMethod]
-		public void TryGetLegacySettingsForRunSettingsWithInvalidLegacySettingsShouldReturnFalse()
-		{
-			string runSettingsXml = @"<RunSettings>
-										<LegacySettings>
-											<Foo>
-										</LegacySettings>
-									  </RunSettings>";
-
-			Assert.IsFalse(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
-		}
-
-		[TestMethod]
-		public void TryGetLegacySettingsForRunSettingsWithEmptyLegacySettingsShouldReturnTrueAndEmptyListForLegacySettingElements()
-		{
-			string runSettingsXml = @"<RunSettings>
-										<LegacySettings>
-										</LegacySettings>
-									  </RunSettings>";
-
-			Assert.IsTrue(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
-			Assert.AreEqual(0, legacySettings.Count);
-		}
-
-		[TestMethod]
-		public void TryGetLegacySettingsForRunSettingsWithValidLegacySettingsShouldReturnTrueAndListForLegacySettingElements()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <LegacySettings>
-											<Deployment enabled=""true"" deploySatelliteAssemblies=""true"" >
-												<DeploymentItem filename="".\test.txt"" />
-											</Deployment>
-											<Scripts setupScript="".\setup.bat"" cleanupScript="".\cleanup.bat"" />
-											<Execution hostProcessPlatform=""MSIL"" parallelTestCount=""4"">
-												<Timeouts testTimeout=""120"" />
-												<TestTypeSpecific>
-													<UnitTestRunConfig>
-														<AssemblyResolution />
-													</UnitTestRunConfig>
-												</TestTypeSpecific>
-												<Hosts />
-											</Execution>
-									   </LegacySettings>
-									  </RunSettings>";
-
-			var expectedElements = "Deployment, Scripts, Execution, AssemblyResolution, Timeouts, Hosts";
-			var expectedDeploymentAttributes = "enabled, deploySatelliteAssemblies";
-			var expectedExecutionAttributes = "hostProcessPlatform, parallelTestCount";
-
-			Assert.IsTrue(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
-			Assert.AreEqual(3, legacySettings.Count, "count does not match");
-			Assert.AreEqual(expectedElements, legacySettings["Elements"]);
-			Assert.AreEqual(expectedDeploymentAttributes, legacySettings["DeploymentAttributes"]);
-			Assert.AreEqual(expectedExecutionAttributes, legacySettings["ExecutionAttributes"]);
-		}
-
-		[TestMethod]
-		public void GetEnvironmentVariablesWithValidValuesInRunSettingsShouldReturnValidDictionary()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <RunConfiguration>
-										  <EnvironmentVariables>
-											 <RANDOM_PATH>C:\temp</RANDOM_PATH>
-											 <RANDOM_PATH2>C:\temp2</RANDOM_PATH2>
-										  </EnvironmentVariables>
-									   </RunConfiguration>
-									  </RunSettings>";
-
-			var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
-
-            Assert.AreEqual(2, envVars.Count);
-            Assert.AreEqual(@"C:\temp", envVars["RANDOM_PATH"]);
-            Assert.AreEqual(@"C:\temp2", envVars["RANDOM_PATH2"]);
-        }
-
-		[TestMethod]
-		public void GetEnvironmentVariablesWithDuplicateEnvValuesInRunSettingsShouldReturnValidDictionary()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <RunConfiguration>
-										  <EnvironmentVariables>
-											 <RANDOM_PATH>C:\temp</RANDOM_PATH>
-											 <RANDOM_PATH>C:\temp2</RANDOM_PATH>
-										  </EnvironmentVariables>
-									   </RunConfiguration>
-									  </RunSettings>";
-
-			var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
-
-            Assert.AreEqual(1, envVars.Count);
-            Assert.AreEqual(@"C:\temp", envVars["RANDOM_PATH"]);
-        }
-
-		[TestMethod]
-		public void GetEnvironmentVariablesWithEmptyVariablesInRunSettingsShouldReturnEmptyDictionary()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <RunConfiguration>
-										 <EnvironmentVariables>
-										 </EnvironmentVariables>
-									   </RunConfiguration>
-									  </RunSettings>";
-
-			var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
-			Assert.AreEqual(0, envVars.Count);
-		}
-
-		[TestMethod]
-		public void GetEnvironmentVariablesWithInvalidValuesInRunSettingsShouldReturnNull()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <RunConfiguration>
-										 <EnvironmentVariables>
-											<Foo>
-										 </EnvironmentVariables>
-									   </RunConfiguration>
-									  </RunSettings>";
-
-			var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
-			Assert.IsNull(envVars);
-		}
-
-		[TestMethod]
-		public void GetEnvironmentVariablesWithoutEnvVarNodeInRunSettingsShouldReturnNull()
-		{
-			string runSettingsXml = @"<RunSettings>
-									   <RunConfiguration>
-									   </RunConfiguration>
-									  </RunSettings>";
-
-			var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
-			Assert.IsNull(envVars);
-		}
-
-		#region RunSettingsIncompatibeWithTestSettings Tests
-
-		[TestMethod]
-		public void RunSettingsWithCodeCoverageAndInlineTestSettingsXml()
-		{
-			// Setup
-			var runSettingsWithCodeCoverageAndInlineTestSettingsXml = @"
-					<RunSettings>
-					  <RunConfiguration>
-						<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-						<ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
-						<SolutionDirectory>C:\TestProject1\</SolutionDirectory>
-						<TargetPlatform>X86</TargetPlatform>
-					  </RunConfiguration>
-					  <MSTest>
-						<SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
-						<ForcedLegacyMode>true</ForcedLegacyMode>
-						<IgnoreTestImpact>true</IgnoreTestImpact>
-					  </MSTest>
-					  <DataCollectionRunSettings>
-						<DataCollectors>
-						  <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
-							<Configuration>
-							  <CoverageFileName>DevBox 2018-01-07 20_42_30.coverage</CoverageFileName>
-							  <CodeCoverage>
-							  </CodeCoverage>
-							</Configuration>
-						  </DataCollector>
-						</DataCollectors>
-					  </DataCollectionRunSettings>
-					</RunSettings>";
-
-			// Act and validate
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				runSettingsWithCodeCoverageAndInlineTestSettingsXml), "Invalid response");
-			Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithCodeCoverageAndInlineTestSettingsXml)), "Invalid response");
-		}
-
-		[TestMethod]
-		public void RunSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml()
-		{
-			var runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml = @"
-				<RunSettings>
-				  <RunConfiguration>
-					<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-					<ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
-					<SolutionDirectory>C:\TestProject1\</SolutionDirectory>
-					<TargetPlatform>X86</TargetPlatform>
-				  </RunConfiguration>
-				  <MSTest>
-					<SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
-					<ForcedLegacyMode>true</ForcedLegacyMode>
-					<IgnoreTestImpact>true</IgnoreTestImpact>
-				  </MSTest>
-				  <DataCollectionRunSettings>
-					<DataCollectors>
-					  <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
-					  </DataCollector>
-					  <DataCollector friendlyName=""UnitTestIsolation"" uri=""datacollector://Microsoft/unittestisolation/1.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
-					  </DataCollector>
-					</DataCollectors>
-				  </DataCollectionRunSettings>
-				</RunSettings>";
-
-			// Act and validate
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml), "Invalid response");
-			Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml)), "Invalid response");
-		}
-
-		[TestMethod]
-		public void RunSettingsWithEnabledAndDisabledCollectorAndNoEmbeddedTestSettingsXml()
-		{
-			var runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml = @"
-				<RunSettings>
-					<RunConfiguration>
-						<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-						<ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
-						<SolutionDirectory>C:\TestProject1\</SolutionDirectory>
-						<TargetPlatform>X86</TargetPlatform>
-					</RunConfiguration>
-					<DataCollectionRunSettings>
-					<DataCollectors>
-						<DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" assemblyQualifiedName=""VideoCollector"">
-						</DataCollector>
-					</DataCollectors>
-					<DataCollectors>
-						<DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
-						</DataCollector>
-					</DataCollectors>
-					</DataCollectionRunSettings>
-				</RunSettings>";
-
-			// Act and validate
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml), "Invalid response");
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml)), "Invalid response");
-		}
-
-		[TestMethod]
-		public void RunSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml()
-		{
-			var runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml = @"
-				<RunSettings>
-					<RunConfiguration>
-						<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-						<ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
-						<SolutionDirectory>C:\TestProject1\</SolutionDirectory>
-						<TargetPlatform>X86</TargetPlatform>
-					</RunConfiguration>
-					<MSTest>
-						<SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
-						<ForcedLegacyMode>true</ForcedLegacyMode>
-						<IgnoreTestImpact>true</IgnoreTestImpact>
-					</MSTest>
-					<DataCollectionRunSettings>
-					<DataCollectors>
-						<DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" assemblyQualifiedName=""VideoCollector"">
-						</DataCollector>
-					</DataCollectors>
-					<DataCollectors>
-						<DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
-						</DataCollector>
-					</DataCollectors>
-					</DataCollectionRunSettings>
-				</RunSettings>";
-
-			// Act and validate
-			Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml), "Invalid response");
-			Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml)), "Invalid response");
-		}
-
-		[TestMethod]
-		public void RunSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml()
-		{
-			var runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml = @"
-				<RunSettings>
-				  <RunConfiguration>
-					<TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
-					<ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
-					<SolutionDirectory>C:\TestProject1\</SolutionDirectory>
-					<TargetPlatform>X86</TargetPlatform>
-				  </RunConfiguration>
-				  <MSTest>
-					<SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
-					<ForcedLegacyMode>true</ForcedLegacyMode>
-					<IgnoreTestImpact>true</IgnoreTestImpact>
-				  </MSTest>
-				  <DataCollectionRunSettings>
-					<DataCollectors>
-					  <DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" enabled=""false"" assemblyQualifiedName=""VideoCollector"">
-					  </DataCollector>
-					</DataCollectors>
-					<DataCollectors>
-					  <DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
-					  </DataCollector>
-					</DataCollectors>
-				  </DataCollectionRunSettings>
-				</RunSettings>";
-
-			// Act and validate
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml), "Invalid response");
-			Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
-				ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml)), "Invalid response");
-		}
-
-		#endregion
-
-		#region Private Methods
-
-		private string GetSourceIncompatibleMessage(string source)
-		{
-			return string.Format(CultureInfo.CurrentCulture, OMResources.SourceIncompatible, source, sourceFrameworks[source].Name, sourceArchitectures[source]);
-		}
-
-		private XmlDocument GetXmlDocument(string settingsXml)
-		{
-			var doc = new XmlDocument();
-			doc.LoadXml(settingsXml);
-
-			return doc;
-		}
-
-		private string GetValueOf(XmlDocument xmlDocument, string xpath)
-		{
-			return xmlDocument.SelectSingleNode(xpath).InnerText;
-		}
-
-		private string ConvertOutOfProcToInProcDataCollectionSettings(string settings)
-		{
-			return settings.Replace("DataCollectionRunSettings", "InProcDataCollectionRunSettings")
-						   .Replace("<DataCollectors>", "<InProcDataCollectors>")
-						   .Replace("</DataCollectors>", "</InProcDataCollectors>")
-						   .Replace("<DataCollector ", "<InProcDataCollector ")
-						   .Replace("</DataCollector>", "</InProcDataCollector>");
-		}
-
-		#endregion
-	}
+    [TestMethod]
+    public void UpdateRunSettingsWithAnEmptyRunSettingsShouldAddValuesSpecifiedInRunConfiguration()
+    {
+        var settings = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+
+        var xml = xmlDocument.OuterXml;
+
+        StringAssert.Contains(xml, "<TargetPlatform>X64</TargetPlatform>");
+        StringAssert.Contains(xml, $"<TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>");
+        StringAssert.Contains(xml, "<ResultsDirectory>temp</ResultsDirectory>");
+    }
+
+    [TestMethod]
+    public void UpdateRunSettingsShouldReturnBackACompleteRunSettings()
+    {
+        var settings = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.X64, Framework.DefaultFramework, "temp");
+
+        var xml = xmlDocument.OuterXml;
+        var expectedRunSettings = $"<RunSettings><RunConfiguration><ResultsDirectory>temp</ResultsDirectory><TargetPlatform>X64</TargetPlatform><TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+
+        Assert.AreEqual(expectedRunSettings, xml);
+    }
+
+    [TestMethod]
+    public void UpdateDesignModeOrCsiShouldNotModifyXmlIfNodeIsAlreadyPresent()
+    {
+        var settings = @"<RunSettings><RunConfiguration><DesignMode>False</DesignMode><CollectSourceInformation>False</CollectSourceInformation></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateDesignMode(xmlDocument, true);
+        InferRunSettingsHelper.UpdateCollectSourceInformation(xmlDocument, true);
+
+        Assert.AreEqual("False", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/DesignMode"));
+        Assert.AreEqual("False", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/CollectSourceInformation"));
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void UpdateDesignModeOrCsiShouldModifyXmlToValueProvided(bool val)
+    {
+        var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateDesignMode(xmlDocument, val);
+        InferRunSettingsHelper.UpdateCollectSourceInformation(xmlDocument, val);
+
+        Assert.AreEqual(val.ToString(), GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/DesignMode"));
+        Assert.AreEqual(val.ToString(), GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/CollectSourceInformation"));
+    }
+
+    [TestMethod]
+    public void MakeRunsettingsCompatibleShouldDeleteNewlyAddedRunConfigurationNode()
+    {
+        var settings = @"<RunSettings><RunConfiguration><DesignMode>False</DesignMode><CollectSourceInformation>False</CollectSourceInformation></RunConfiguration></RunSettings>";
+
+        var result = InferRunSettingsHelper.MakeRunsettingsCompatible(settings)!;
+
+        Assert.IsTrue(result.IndexOf("DesignMode", StringComparison.OrdinalIgnoreCase) < 0);
+    }
+
+    [TestMethod]
+    public void MakeRunsettingsCompatibleShouldNotDeleteOldRunConfigurationNode()
+    {
+        var settings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <DesignMode>False</DesignMode>
+                                    <CollectSourceInformation>False</CollectSourceInformation>
+                                    <TargetPlatform>x86</TargetPlatform>
+                                    <TargetFrameworkVersion>net46</TargetFrameworkVersion>
+                                    <TestAdaptersPaths>dummypath</TestAdaptersPaths>
+                                    <ResultsDirectory>dummypath</ResultsDirectory>
+                                    <SolutionDirectory>dummypath</SolutionDirectory>
+                                    <MaxCpuCount>2</MaxCpuCount>
+                                    <DisableParallelization>False</DisableParallelization>
+                                    <DisableAppDomain>False</DisableAppDomain>
+                                </RunConfiguration>
+                            </RunSettings>";
+
+        var result = InferRunSettingsHelper.MakeRunsettingsCompatible(settings)!;
+
+        Assert.IsTrue(result.IndexOf("TargetPlatform", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("TargetFrameworkVersion", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("TestAdaptersPaths", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("ResultsDirectory", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("SolutionDirectory", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("MaxCpuCount", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("DisableParallelization", StringComparison.OrdinalIgnoreCase) > 0);
+        Assert.IsTrue(result.IndexOf("DisableAppDomain", StringComparison.OrdinalIgnoreCase) > 0);
+    }
+
+    [TestMethod]
+    public void UpdateTargetDeviceValueFromOldMsTestSettings()
+    {
+        var settings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <MaxCpuCount>2</MaxCpuCount>
+                                    <DisableParallelization>False</DisableParallelization>
+                                    <DisableAppDomain>False</DisableAppDomain>
+                                </RunConfiguration>
+                                <MSPhoneTest>
+                                  <TargetDevice>169.254.193.190</TargetDevice>
+                                </MSPhoneTest>
+                            </RunSettings>";
+
+        var xmlDocument = GetXmlDocument(settings);
+
+        var result = InferRunSettingsHelper.TryGetDeviceXml(xmlDocument.CreateNavigator()!, out string? deviceXml);
+        Assert.IsTrue(result);
+        Assert.IsNotNull(deviceXml);
+
+        InferRunSettingsHelper.UpdateTargetDevice(xmlDocument, deviceXml);
+        Assert.AreEqual(deviceXml.ToString(), GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetDevice"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetPlatformShouldNotModifyXmlIfNodeIsAlreadyPresentForOverwriteFalse()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64", overwrite: false);
+
+        Assert.AreEqual("x86", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetPlatformShouldModifyXmlIfNodeIsAlreadyPresentForOverwriteTrue()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetPlatform>x86</TargetPlatform></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64", overwrite: true);
+
+        Assert.AreEqual("X64", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetPlatformShouldAddPlatformXmlNodeIfNotPresent()
+    {
+        var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetPlatform(xmlDocument, "X64");
+
+        Assert.AreEqual("X64", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetPlatform"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetFrameworkShouldNotModifyXmlIfNodeIsAlreadyPresentForOverwriteFalse()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0", overwrite: false);
+
+        Assert.AreEqual(".NETFramework,Version=v4.5", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetFrameworkShouldModifyXmlIfNodeIsAlreadyPresentForOverwriteTrue()
+    {
+        var settings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0", overwrite: true);
+
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
+    }
+
+    [TestMethod]
+    public void UpdateTargetFrameworkShouldAddFrameworkXmlNodeIfNotPresent()
+    {
+        var settings = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var xmlDocument = GetXmlDocument(settings);
+
+        InferRunSettingsHelper.UpdateTargetFramework(xmlDocument, ".NETCoreApp,Version=v1.0");
+
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", GetValueOf(xmlDocument, "/RunSettings/RunConfiguration/TargetFrameworkVersion"));
+    }
+
+    [TestMethod]
+    public void FilterCompatibleSourcesShouldIdentifyIncomaptiableSourcesAndConstructWarningMessage()
+    {
+        #region Arrange
+        _sourceArchitectures["AnyCPU1net46.dll"] = Architecture.AnyCPU;
+        _sourceArchitectures["x64net47.exe"] = Architecture.X64;
+        _sourceArchitectures["x86net45.dll"] = Architecture.X86;
+
+        _sourceFrameworks["AnyCPU1net46.dll"] = _frameworkNet46;
+        _sourceFrameworks["x64net47.exe"] = _frameworkNet47;
+        _sourceFrameworks["x86net45.dll"] = _frameworkNet45;
+
+        StringBuilder sb = new();
+        sb.AppendLine();
+        sb.AppendLine(GetSourceIncompatibleMessage("AnyCPU1net46.dll"));
+        sb.AppendLine(GetSourceIncompatibleMessage("x64net47.exe"));
+        sb.AppendLine(GetSourceIncompatibleMessage("x86net45.dll"));
+
+        var expected = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, _frameworkNet45, Constants.DefaultPlatform, sb.ToString(), MultiTargettingForwardLink);
+
+
+        #endregion
+        var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, _frameworkNet45, _sourceArchitectures, _sourceFrameworks, out string warningMessage);
+
+        // None of the DLLs passed are compatible to the chosen settings
+        Assert.AreEqual(0, compatibleSources.Count());
+        Assert.AreEqual(expected, warningMessage);
+    }
+
+    [TestMethod]
+    public void FilterCompatibleSourcesShouldIdentifyCompatibleSources()
+    {
+        _sourceArchitectures["x64net45.exe"] = Architecture.X64;
+        _sourceArchitectures["x86net45.dll"] = Architecture.X86;
+
+        _sourceFrameworks["x64net45.exe"] = _frameworkNet45;
+        _sourceFrameworks["x86net45.dll"] = _frameworkNet45;
+
+        StringBuilder sb = new();
+        sb.AppendLine();
+        sb.AppendLine(GetSourceIncompatibleMessage("x86net45.dll"));
+
+        var expected = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, _frameworkNet45, Constants.DefaultPlatform, sb.ToString(), MultiTargettingForwardLink);
+
+        var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, _frameworkNet45, _sourceArchitectures, _sourceFrameworks, out string warningMessage);
+
+        // only "x64net45.exe" is the compatible source
+        Assert.AreEqual(1, compatibleSources.Count());
+        Assert.AreEqual(expected, warningMessage);
+    }
+
+    [TestMethod]
+    public void FilterCompatibleSourcesShouldNotComposeWarningIfSettingsAreCorrect()
+    {
+        _sourceArchitectures["x86net45.dll"] = Architecture.X86;
+        _sourceFrameworks["x86net45.dll"] = _frameworkNet45;
+
+        var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(Architecture.X86, Constants.DefaultPlatform, _frameworkNet45, _sourceArchitectures, _sourceFrameworks, out string warningMessage);
+
+        // only "x86net45.dll" is the compatible source
+        Assert.AreEqual(1, compatibleSources.Count());
+        Assert.IsTrue(string.IsNullOrEmpty(warningMessage));
+    }
+
+    [TestMethod]
+    public void FilterCompatibleSourcesShouldRetrunWarningMessageIfNoConflict()
+    {
+        _sourceArchitectures["x64net45.exe"] = Architecture.X64;
+        _sourceFrameworks["x64net45.exe"] = _frameworkNet45;
+        _ = InferRunSettingsHelper.FilterCompatibleSources(Constants.DefaultPlatform, Constants.DefaultPlatform, _frameworkNet45, _sourceArchitectures, _sourceFrameworks, out string warningMessage);
+
+        Assert.IsTrue(string.IsNullOrEmpty(warningMessage));
+    }
+
+    [TestMethod]
+    public void IsTestSettingsEnabledShouldReturnTrueIfRunsettingsHasTestSettings()
+    {
+        string runsettingsString = @"<RunSettings>
+                                        <MSTest>
+                                            <SettingsFile>C:\temp.testsettings</SettingsFile>
+                                            <ForcedLegacyMode>true</ForcedLegacyMode>
+                                        </MSTest>
+                                    </RunSettings>";
+
+        Assert.IsTrue(InferRunSettingsHelper.IsTestSettingsEnabled(runsettingsString));
+    }
+
+    [TestMethod]
+    public void IsTestSettingsEnabledShouldReturnFalseIfRunsettingsDoesnotHaveTestSettings()
+    {
+        string runsettingsString = @"<RunSettings>
+                                        <MSTest>
+                                            <ForcedLegacyMode>true</ForcedLegacyMode>
+                                        </MSTest>
+                                    </RunSettings>";
+
+        Assert.IsFalse(InferRunSettingsHelper.IsTestSettingsEnabled(runsettingsString));
+    }
+
+    [TestMethod]
+    public void TryGetLegacySettingsForRunSettingsWithoutLegacySettingsShouldReturnFalse()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                      </RunSettings>";
+        Assert.IsFalse(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out _));
+    }
+
+    [TestMethod]
+    public void TryGetLegacySettingsForRunSettingsWithInvalidLegacySettingsShouldReturnFalse()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                        <LegacySettings>
+                                            <Foo>
+                                        </LegacySettings>
+                                      </RunSettings>";
+        Assert.IsFalse(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out _));
+    }
+
+    [TestMethod]
+    public void TryGetLegacySettingsForRunSettingsWithEmptyLegacySettingsShouldReturnTrueAndEmptyListForLegacySettingElements()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                        <LegacySettings>
+                                        </LegacySettings>
+                                      </RunSettings>";
+
+        Assert.IsTrue(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
+        Assert.AreEqual(0, legacySettings.Count);
+    }
+
+    [TestMethod]
+    public void TryGetLegacySettingsForRunSettingsWithValidLegacySettingsShouldReturnTrueAndListForLegacySettingElements()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <LegacySettings>
+                                            <Deployment enabled=""true"" deploySatelliteAssemblies=""true"" >
+                                                <DeploymentItem filename="".\test.txt"" />
+                                            </Deployment>
+                                            <Scripts setupScript="".\setup.bat"" cleanupScript="".\cleanup.bat"" />
+                                            <Execution hostProcessPlatform=""MSIL"" parallelTestCount=""4"">
+                                                <Timeouts testTimeout=""120"" />
+                                                <TestTypeSpecific>
+                                                    <UnitTestRunConfig>
+                                                        <AssemblyResolution />
+                                                    </UnitTestRunConfig>
+                                                </TestTypeSpecific>
+                                                <Hosts />
+                                            </Execution>
+                                       </LegacySettings>
+                                      </RunSettings>";
+
+        var expectedElements = "Deployment, Scripts, Execution, AssemblyResolution, Timeouts, Hosts";
+        var expectedDeploymentAttributes = "enabled, deploySatelliteAssemblies";
+        var expectedExecutionAttributes = "hostProcessPlatform, parallelTestCount";
+
+        Assert.IsTrue(InferRunSettingsHelper.TryGetLegacySettingElements(runSettingsXml, out Dictionary<string, string> legacySettings));
+        Assert.AreEqual(3, legacySettings.Count, "count does not match");
+        Assert.AreEqual(expectedElements, legacySettings["Elements"]);
+        Assert.AreEqual(expectedDeploymentAttributes, legacySettings["DeploymentAttributes"]);
+        Assert.AreEqual(expectedExecutionAttributes, legacySettings["ExecutionAttributes"]);
+    }
+
+    [TestMethod]
+    public void GetEnvironmentVariablesWithValidValuesInRunSettingsShouldReturnValidDictionary()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <RunConfiguration>
+                                          <EnvironmentVariables>
+                                             <RANDOM_PATH>C:\temp</RANDOM_PATH>
+                                             <RANDOM_PATH2>C:\temp2</RANDOM_PATH2>
+                                          </EnvironmentVariables>
+                                       </RunConfiguration>
+                                      </RunSettings>";
+
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml)!;
+
+        Assert.AreEqual(2, envVars.Count);
+        Assert.AreEqual(@"C:\temp", envVars["RANDOM_PATH"]);
+        Assert.AreEqual(@"C:\temp2", envVars["RANDOM_PATH2"]);
+    }
+
+    [TestMethod]
+    public void GetEnvironmentVariablesWithDuplicateEnvValuesInRunSettingsShouldReturnValidDictionary()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <RunConfiguration>
+                                          <EnvironmentVariables>
+                                             <RANDOM_PATH>C:\temp</RANDOM_PATH>
+                                             <RANDOM_PATH>C:\temp2</RANDOM_PATH>
+                                          </EnvironmentVariables>
+                                       </RunConfiguration>
+                                      </RunSettings>";
+
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml)!;
+
+        Assert.AreEqual(1, envVars.Count);
+        Assert.AreEqual(@"C:\temp", envVars["RANDOM_PATH"]);
+    }
+
+    [TestMethod]
+    public void GetEnvironmentVariablesWithEmptyVariablesInRunSettingsShouldReturnEmptyDictionary()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <RunConfiguration>
+                                         <EnvironmentVariables>
+                                         </EnvironmentVariables>
+                                       </RunConfiguration>
+                                      </RunSettings>";
+
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml)!;
+        Assert.AreEqual(0, envVars.Count);
+    }
+
+    [TestMethod]
+    public void GetEnvironmentVariablesWithInvalidValuesInRunSettingsShouldReturnNull()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <RunConfiguration>
+                                         <EnvironmentVariables>
+                                            <Foo>
+                                         </EnvironmentVariables>
+                                       </RunConfiguration>
+                                      </RunSettings>";
+
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
+        Assert.IsNull(envVars);
+    }
+
+    [TestMethod]
+    public void GetEnvironmentVariablesWithoutEnvVarNodeInRunSettingsShouldReturnNull()
+    {
+        string runSettingsXml = @"<RunSettings>
+                                       <RunConfiguration>
+                                       </RunConfiguration>
+                                      </RunSettings>";
+
+        var envVars = InferRunSettingsHelper.GetEnvironmentVariables(runSettingsXml);
+        Assert.IsNull(envVars);
+    }
+
+    #region RunSettingsIncompatibeWithTestSettings Tests
+
+    [TestMethod]
+    public void RunSettingsWithCodeCoverageAndInlineTestSettingsXml()
+    {
+        // Setup
+        var runSettingsWithCodeCoverageAndInlineTestSettingsXml = @"
+                    <RunSettings>
+                      <RunConfiguration>
+                        <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
+                        <ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
+                        <SolutionDirectory>C:\TestProject1\</SolutionDirectory>
+                        <TargetPlatform>X86</TargetPlatform>
+                      </RunConfiguration>
+                      <MSTest>
+                        <SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
+                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                        <IgnoreTestImpact>true</IgnoreTestImpact>
+                      </MSTest>
+                      <DataCollectionRunSettings>
+                        <DataCollectors>
+                          <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
+                            <Configuration>
+                              <CoverageFileName>DevBox 2018-01-07 20_42_30.coverage</CoverageFileName>
+                              <CodeCoverage>
+                              </CodeCoverage>
+                            </Configuration>
+                          </DataCollector>
+                        </DataCollectors>
+                      </DataCollectionRunSettings>
+                    </RunSettings>";
+
+        // Act and validate
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            runSettingsWithCodeCoverageAndInlineTestSettingsXml), "Invalid response");
+        Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithCodeCoverageAndInlineTestSettingsXml)), "Invalid response");
+    }
+
+    [TestMethod]
+    public void RunSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml()
+    {
+        var runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml = @"
+                <RunSettings>
+                  <RunConfiguration>
+                    <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
+                    <ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
+                    <SolutionDirectory>C:\TestProject1\</SolutionDirectory>
+                    <TargetPlatform>X86</TargetPlatform>
+                  </RunConfiguration>
+                  <MSTest>
+                    <SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
+                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                    <IgnoreTestImpact>true</IgnoreTestImpact>
+                  </MSTest>
+                  <DataCollectionRunSettings>
+                    <DataCollectors>
+                      <DataCollector friendlyName=""Code Coverage"" uri=""datacollector://Microsoft/CodeCoverage/2.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
+                      </DataCollector>
+                      <DataCollector friendlyName=""UnitTestIsolation"" uri=""datacollector://Microsoft/unittestisolation/1.0"" assemblyQualifiedName=""DynamicCoverageDataCollector"">
+                      </DataCollector>
+                    </DataCollectors>
+                  </DataCollectionRunSettings>
+                </RunSettings>";
+
+        // Act and validate
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml), "Invalid response");
+        Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithFakesAndCodeCoverageAndInlineTestSettingsXml)), "Invalid response");
+    }
+
+    [TestMethod]
+    public void RunSettingsWithEnabledAndDisabledCollectorAndNoEmbeddedTestSettingsXml()
+    {
+        var runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml = @"
+                <RunSettings>
+                    <RunConfiguration>
+                        <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
+                        <ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
+                        <SolutionDirectory>C:\TestProject1\</SolutionDirectory>
+                        <TargetPlatform>X86</TargetPlatform>
+                    </RunConfiguration>
+                    <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" assemblyQualifiedName=""VideoCollector"">
+                        </DataCollector>
+                    </DataCollectors>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
+                        </DataCollector>
+                    </DataCollectors>
+                    </DataCollectionRunSettings>
+                </RunSettings>";
+
+        // Act and validate
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml), "Invalid response");
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml)), "Invalid response");
+    }
+
+    [TestMethod]
+    public void RunSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml()
+    {
+        var runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml = @"
+                <RunSettings>
+                    <RunConfiguration>
+                        <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
+                        <ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
+                        <SolutionDirectory>C:\TestProject1\</SolutionDirectory>
+                        <TargetPlatform>X86</TargetPlatform>
+                    </RunConfiguration>
+                    <MSTest>
+                        <SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
+                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                        <IgnoreTestImpact>true</IgnoreTestImpact>
+                    </MSTest>
+                    <DataCollectionRunSettings>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" assemblyQualifiedName=""VideoCollector"">
+                        </DataCollector>
+                    </DataCollectors>
+                    <DataCollectors>
+                        <DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
+                        </DataCollector>
+                    </DataCollectors>
+                    </DataCollectionRunSettings>
+                </RunSettings>";
+
+        // Act and validate
+        Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml), "Invalid response");
+        Assert.IsTrue(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithEnabledAndDisabledCollectorAndInlineTestSettingsXml)), "Invalid response");
+    }
+
+    [TestMethod]
+    public void RunSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml()
+    {
+        var runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml = @"
+                <RunSettings>
+                  <RunConfiguration>
+                    <TargetFrameworkVersion>Framework45</TargetFrameworkVersion>
+                    <ResultsDirectory>C:\TestProject1\TestResults</ResultsDirectory>
+                    <SolutionDirectory>C:\TestProject1\</SolutionDirectory>
+                    <TargetPlatform>X86</TargetPlatform>
+                  </RunConfiguration>
+                  <MSTest>
+                    <SettingsFile>C:\TestProject1\TestSettings1.testsettings</SettingsFile>
+                    <ForcedLegacyMode>true</ForcedLegacyMode>
+                    <IgnoreTestImpact>true</IgnoreTestImpact>
+                  </MSTest>
+                  <DataCollectionRunSettings>
+                    <DataCollectors>
+                      <DataCollector friendlyName=""Video"" uri=""datacollector://Microsoft/Video/2.0"" enabled=""false"" assemblyQualifiedName=""VideoCollector"">
+                      </DataCollector>
+                    </DataCollectors>
+                    <DataCollectors>
+                      <DataCollector friendlyName=""EventLog"" uri=""datacollector://Microsoft/Log/2.0"" enabled=""false"" assemblyQualifiedName=""LogCollector"">
+                      </DataCollector>
+                    </DataCollectors>
+                  </DataCollectionRunSettings>
+                </RunSettings>";
+
+        // Act and validate
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml), "Invalid response");
+        Assert.IsFalse(InferRunSettingsHelper.AreRunSettingsCollectorsIncompatibleWithTestSettings(
+            ConvertOutOfProcToInProcDataCollectionSettings(runSettingsWithDisabledCollectionSettingsAndInlineTestSettingsXml)), "Invalid response");
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private string GetSourceIncompatibleMessage(string source)
+    {
+        return string.Format(CultureInfo.CurrentCulture, OMResources.SourceIncompatible, source, _sourceFrameworks[source].Name, _sourceArchitectures[source]);
+    }
+
+    private static XmlDocument GetXmlDocument(string settingsXml)
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(settingsXml);
+
+        return doc;
+    }
+
+    private static string GetValueOf(XmlDocument xmlDocument, string xpath)
+    {
+        return xmlDocument.SelectSingleNode(xpath)!.InnerText;
+    }
+
+    private static string ConvertOutOfProcToInProcDataCollectionSettings(string settings)
+    {
+        return settings.Replace("DataCollectionRunSettings", "InProcDataCollectionRunSettings")
+            .Replace("<DataCollectors>", "<InProcDataCollectors>")
+            .Replace("</DataCollectors>", "</InProcDataCollectors>")
+            .Replace("<DataCollector ", "<InProcDataCollector ")
+            .Replace("</DataCollector>", "</InProcDataCollector>");
+    }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/MSTestSettingsUtilitiesTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/MSTestSettingsUtilitiesTests.cs
index 366e32871a..d7b3e8baf0 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/MSTestSettingsUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/MSTestSettingsUtilitiesTests.cs
@@ -1,122 +1,122 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.Tests
+using System;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Utilities.Tests;
+
+[TestClass]
+public class MsTestSettingsUtilitiesTests
 {
-    using System;
-    using System.Xml;
+    #region IsLegacyTestSettingsFile tests
+
+    [TestMethod]
+    public void IsLegacyTestSettingsFileShouldReturnTrueIfTestSettingsExtension()
+    {
+        Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.testsettings"));
+    }
+
+    [TestMethod]
+    public void IsLegacyTestSettingsFileShouldReturnTrueIfTestRunConfigExtension()
+    {
+        Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.testrunConfig"));
+    }
+
+    [TestMethod]
+    public void IsLegacyTestSettingsFileShouldReturnTrueIfVsmdiExtension()
+    {
+        Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.vsmdi"));
+    }
+
+    #endregion
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using MSTest.TestFramework.AssertExtensions;
+    #region Import tests
 
-    [TestClass]
-    public class MSTestSettingsUtilitiesTests
+    [TestMethod]
+    public void ImportShouldThrowIfNotLegacySettingsFile()
     {
-        #region IsLegacyTestSettingsFile tests
-
-        [TestMethod]
-        public void IsLegacyTestSettingsFileShouldReturnTrueIfTestSettingsExtension()
-        {
-            Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.testsettings"));
-        }
-
-        [TestMethod]
-        public void IsLegacyTestSettingsFileShouldReturnTrueIfTestRunConfigExtension()
-        {
-            Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.testrunConfig"));
-        }
-
-        [TestMethod]
-        public void IsLegacyTestSettingsFileShouldReturnTrueIfVSMDIExtension()
-        {
-            Assert.IsTrue(MSTestSettingsUtilities.IsLegacyTestSettingsFile("C:\\temp\\t.vsmdi"));
-        }
-
-        #endregion
-
-        #region Import tests
-
-        [TestMethod]
-        public void ImportShouldThrowIfNotLegacySettingsFile()
-        {
-            var defaultRunSettingsXml = "<RunSettings></RunSettings>";
-            var xmlDocument = new XmlDocument();
-            xmlDocument.LoadXml(defaultRunSettingsXml);
-
-            Action action =
-                () =>
+        var defaultRunSettingsXml = "<RunSettings></RunSettings>";
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(defaultRunSettingsXml);
+
+        Action action =
+            () =>
                 MSTestSettingsUtilities.Import(
                     "C:\\temp\\r.runsettings",
                     xmlDocument);
-            Assert.That.Throws<XmlException>(action).WithMessage("Unexpected settings file specified.");
-        }
-
-        [TestMethod]
-        public void ImportShouldThrowIfDefaultRunSettingsIsIncorrect()
-        {
-            var defaultRunSettingsXml = "<DataRunSettings></DataRunSettings>";
-            var xmlDocument = new XmlDocument();
-            xmlDocument.LoadXml(defaultRunSettingsXml);
-
-            Action action =
-                () =>
+        var exception = Assert.ThrowsExactly<XmlException>(action);
+        Assert.AreEqual("Unexpected settings file specified.", exception.Message);
+    }
+
+    [TestMethod]
+    public void ImportShouldThrowIfDefaultRunSettingsIsIncorrect()
+    {
+        var defaultRunSettingsXml = "<DataRunSettings></DataRunSettings>";
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(defaultRunSettingsXml);
+
+        Action action =
+            () =>
                 MSTestSettingsUtilities.Import(
                     "C:\\temp\\r.testsettings",
                     xmlDocument);
-            Assert.That.Throws<XmlException>(action).WithMessage("Could not find 'RunSettings' node.");
-        }
-
-        [TestMethod]
-        public void ImportShouldEmbedTestSettingsInformation()
-        {
-            var defaultRunSettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-            var xmlDocument = new XmlDocument();
-            xmlDocument.LoadXml(defaultRunSettingsXml);
-            var finalxPath = MSTestSettingsUtilities.Import(
-                "C:\\temp\\r.testsettings",
-                xmlDocument);
-
-            var finalSettingsXml = finalxPath.CreateNavigator().OuterXml;
-
-            var expectedSettingsXml = string.Join(Environment.NewLine, 
-                "<RunSettings>",
-                "  <MSTest>",
-                "    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
-                "    <ForcedLegacyMode>true</ForcedLegacyMode>",
-                "  </MSTest>",
-                "  <RunConfiguration></RunConfiguration>",
-                "</RunSettings>"
-            );
-
-            Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
-        }
-
-        [TestMethod]
-        public void ImportShouldEmbedTestSettingsAndDefaultRunConfigurationInformation()
-        {
-            var defaultRunSettingsXml = "<RunSettings></RunSettings>";
-            var xmlDocument = new XmlDocument();
-            xmlDocument.LoadXml(defaultRunSettingsXml);
-            var finalxPath = MSTestSettingsUtilities.Import(
-                "C:\\temp\\r.testsettings",
-                xmlDocument);
-
-            var finalSettingsXml = finalxPath.CreateNavigator().OuterXml;
-
-            var expectedSettingsXml = string.Join(Environment.NewLine,
-                "<RunSettings>",
-                "  <RunConfiguration />",
-                "  <MSTest>",
-                "    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
-                "    <ForcedLegacyMode>true</ForcedLegacyMode>",
-                "  </MSTest>",
-                "</RunSettings>"
-            );
-
-            Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
-        }
-
-        #endregion
+        var exception = Assert.ThrowsExactly<XmlException>(action);
+        Assert.AreEqual("Could not find 'RunSettings' node.", exception.Message);
+    }
+
+    [TestMethod]
+    public void ImportShouldEmbedTestSettingsInformation()
+    {
+        var defaultRunSettingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(defaultRunSettingsXml);
+        var finalxPath = MSTestSettingsUtilities.Import(
+            "C:\\temp\\r.testsettings",
+            xmlDocument);
+
+        var finalSettingsXml = finalxPath.CreateNavigator()!.OuterXml;
+
+        var expectedSettingsXml = string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <MSTest>",
+            "    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
+            "    <ForcedLegacyMode>true</ForcedLegacyMode>",
+            "  </MSTest>",
+            "  <RunConfiguration></RunConfiguration>",
+            "</RunSettings>"
+        );
+
+        Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
+    }
+
+    [TestMethod]
+    public void ImportShouldEmbedTestSettingsAndDefaultRunConfigurationInformation()
+    {
+        var defaultRunSettingsXml = "<RunSettings></RunSettings>";
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml(defaultRunSettingsXml);
+        var finalxPath = MSTestSettingsUtilities.Import(
+            "C:\\temp\\r.testsettings",
+            xmlDocument);
+
+        var finalSettingsXml = finalxPath.CreateNavigator()!.OuterXml;
+
+        var expectedSettingsXml = string.Join(Environment.NewLine,
+            "<RunSettings>",
+            "  <RunConfiguration />",
+            "  <MSTest>",
+            "    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
+            "    <ForcedLegacyMode>true</ForcedLegacyMode>",
+            "  </MSTest>",
+            "</RunSettings>"
+        );
+
+        Assert.AreEqual(expectedSettingsXml, finalSettingsXml);
     }
+
+    #endregion
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj
index f87f3be25f..86bbf395d8 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj
@@ -1,41 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-  <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-  <TestProject>true</TestProject>
-  <IsTestProject>true</IsTestProject>
-  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-  <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-  <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-  <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-  <AssemblyName>Microsoft.TestPlatform.Utilities.UnitTests</AssemblyName>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>Microsoft.TestPlatform.Utilities.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-  <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-  <PackageReference Include="Microsoft.CodeCoverage">
-    <Version>1.0.3</Version>
-  </PackageReference>
-  <PackageReference Include="Microsoft.VisualStudio.Coverage.IO" Version="17.0.0-beta.21465.2" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-  <Reference Include="System.Runtime" />
-  <Reference Include="System" />
-  <Reference Include="Microsoft.CSharp" />
-  <Reference Include="System.Xml" />
-  <Reference Include="System.Threading.Tasks" />
+    <PackageReference Include="Microsoft.CodeCoverage.IO" Version="$(MicrosoftCodeCoverageIOVersion)" />
   </ItemGroup>
   <ItemGroup>
-  <None Update="TestFiles\**\*.*">
-    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-  </None>
+    <None Update="TestFiles\**\*.*">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
-  <EmbeddedResource Include="DefaultCodeCoverageConfig.xml" />
+    <EmbeddedResource Include="DefaultCodeCoverageConfig.xml" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs
deleted file mode 100644
index 7feda95b4b..0000000000
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.Utilities.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index dc4d031c99..0000000000
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.Utilities.Tests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("78a40fa0-835f-453e-8883-95eaac5f348d")]
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/StringUtilitiesTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/StringUtilitiesTests.cs
index c285f3a155..85bb55149b 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/StringUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/StringUtilitiesTests.cs
@@ -3,96 +3,97 @@
 
 using System.Linq;
 
-namespace Microsoft.TestPlatform.Utilities.UnitTests
+using Castle.Core.Internal;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.TestPlatform.Utilities.UnitTests;
+
+[TestClass]
+public class StringUtilitiesTests
 {
-    using Castle.Core.Internal;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void SplitShouldReturnWhenStringisNullOrEmpty()
+    {
+        var argsList = string.Empty.Tokenize(SplitChar, EscapeChar);
+
+        Assert.IsTrue(argsList.IsNullOrEmpty());
+    }
+
+    [TestMethod]
+    public void SplitShouldReturnWhenStringDoesntContainSplitChar()
+    {
+        var data = "foobar";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+
+        Assert.IsTrue(enumerable.Length == 1);
+        Assert.IsTrue(enumerable.First().Equals(data));
+    }
+
+    [TestMethod]
+    public void SplitShouldSplitWhenStringContainsSplitChar()
+    {
+        var data = "foo,bar";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+
+        Assert.IsTrue(enumerable.Length == 2);
+    }
+
+    [TestMethod]
+    public void SplitShouldSplitWhenStringWithSplitCharStartEnd()
+    {
+        var data = ",foo,bar,";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+
+        Assert.IsTrue(enumerable.Length == 4);
+    }
+
+    [TestMethod]
+    public void SplitShouldEscapeSplitCharWhenEscapedCharPresent()
+    {
+        var data = "foo\\,bar";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+
+        Assert.IsTrue(enumerable.Length == 1);
+        Assert.IsTrue(enumerable.First().Equals("foo,bar"));
+    }
+
+    [TestMethod]
+    public void SplitShouldEscapeSplitCharWhenEscapedNonEscapedCharPresent()
+    {
+        var data = "foo\\,,bar";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+        Assert.IsTrue(enumerable.Length == 2);
+        Assert.IsTrue(enumerable.First().Equals("foo,"));
+    }
+
+    [TestMethod]
+    public void SplitShouldSplitWhenOnlySplitCharPresent()
+    {
+        var data = ",";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
 
-    [TestClass]
-    public class StringUtilitiesTests
+        Assert.IsTrue(enumerable.Length == 2);
+    }
+
+    [TestMethod]
+    public void SplitShouldNotSplitWhenNoSplitCharPresent()
     {
-        [TestMethod]
-        public void SplitShouldReturnWhenStringisNullOrEmpty()
-        {
-            var argsList = string.Empty.Tokenize(SplitChar, EscapeChar);
-
-            Assert.IsTrue(argsList.IsNullOrEmpty());
-        }
-
-        [TestMethod]
-        public void SplitShouldReturnWhenStringDoesntContainSplitChar()
-        {
-            var data = "foobar";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 1);
-            Assert.IsTrue(enumerable.First().Equals(data));
-        }
-
-        [TestMethod]
-        public void SplitShouldSplitWhenStringContainsSplitChar()
-        {
-            var data = "foo,bar";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 2);
-        }
-
-        [TestMethod]
-        public void SplitShouldSplitWhenStringWithSplitCharStartEnd()
-        {
-            var data = ",foo,bar,";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 4);
-        }
-
-        [TestMethod]
-        public void SplitShouldEscapeSplitCharWhenEscapedCharPresent()
-        {
-            var data = "foo\\,bar";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 1);
-            Assert.IsTrue(enumerable.First().Equals("foo,bar"));
-        }
-
-        [TestMethod]
-        public void SplitShouldEscapeSplitCharWhenEscapedNonEscapedCharPresent()
-        {
-            var data = "foo\\,,bar";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-            Assert.IsTrue(enumerable.Length == 2);
-            Assert.IsTrue(enumerable.First().Equals("foo,"));
-        }
-
-        [TestMethod]
-        public void SplitShouldSplitWhenOnlySplitCharPresent()
-        {
-            var data = ",";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 2);
-        }
-
-        [TestMethod]
-        public void SplitShouldNotSplitWhenNoSplitCharPresent()
-        {
-            var data = "foo\\bar";
-            var argsList = data.Tokenize(SplitChar, EscapeChar);
-            var enumerable = argsList as string[] ?? argsList.ToArray();
-
-            Assert.IsTrue(enumerable.Length == 1);
-        }
-
-        private const char SplitChar = ',';
-        private const char EscapeChar = '\\';
+        var data = "foo\\bar";
+        var argsList = data.Tokenize(SplitChar, EscapeChar);
+        var enumerable = argsList as string[] ?? argsList.ToArray();
+
+        Assert.IsTrue(enumerable.Length == 1);
     }
+
+    private const char SplitChar = ',';
+    private const char EscapeChar = '\\';
 }
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/XmlUtilitiesTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/XmlUtilitiesTests.cs
index 76cc3772dc..41c4f3c481 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/XmlUtilitiesTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/XmlUtilitiesTests.cs
@@ -1,221 +1,214 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.Utilities.UnitTests
-{
-    using System;
-    using System.Xml;
-    using System.Xml.XPath;
-
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Xml;
+using System.Xml.XPath;
 
-    [TestClass]
-    public class XmlUtilitiesTests
-    {
-        #region GetNodeXml tests
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        [TestMethod]
-        public void GetNodeXmlShouldThrowIfxmlDocumentIsNull()
-        {
-            Assert.ThrowsException<NullReferenceException>(() => XmlUtilities.GetNodeXml(null, @"/RunSettings/RunConfiguration"));
-        }
+namespace Microsoft.TestPlatform.Utilities.UnitTests;
 
-        [TestMethod]
-        public void GetNodeXmlShouldThrowIfXPathIsNull()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+[TestClass]
+public class XmlUtilitiesTests
+{
+    #region GetNodeXml tests
 
-            Assert.ThrowsException<XPathException>(() => XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator(), null));
-        }
+    [TestMethod]
+    public void GetNodeXmlShouldThrowIfxmlDocumentIsNull()
+    {
+        Assert.ThrowsException<NullReferenceException>(() => XmlUtilities.GetNodeXml(null!, @"/RunSettings/RunConfiguration"));
+    }
 
-        [TestMethod]
-        public void GetNodeXmlShouldThrowIfXPathIsInvalid()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+    [TestMethod]
+    public void GetNodeXmlShouldThrowIfXPathIsNull()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-            Assert.ThrowsException<XPathException>(() => XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator(), @"Rs\r"));
-        }
+        Assert.ThrowsException<XPathException>(() => XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator()!, null!));
+    }
 
-        [TestMethod]
-        public void GetNodeXmlShouldReturnNullIfNodeDoesNotExist()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+    [TestMethod]
+    public void GetNodeXmlShouldThrowIfXPathIsInvalid()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-            Assert.IsNull(XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator(), @"/RunSettings/RunConfiguration"));
-        }
+        Assert.ThrowsException<XPathException>(() => XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator()!, @"Rs\r"));
+    }
 
-        [TestMethod]
-        public void GetNodeXmlShouldReturnNodeValue()
-        {
-            var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+    [TestMethod]
+    public void GetNodeXmlShouldReturnNullIfNodeDoesNotExist()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-            Assert.AreEqual("abc", XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator(), @"/RunSettings/RC"));
-        }
+        Assert.IsNull(XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator()!, @"/RunSettings/RunConfiguration"));
+    }
 
-        #endregion
+    [TestMethod]
+    public void GetNodeXmlShouldReturnNodeValue()
+    {
+        var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        #region IsValidNodeXmlValue tests
+        Assert.AreEqual("abc", XmlUtilities.GetNodeXml(xmlDocument.CreateNavigator()!, @"/RunSettings/RC"));
+    }
 
-        [TestMethod]
-        public void IsValidNodeXmlValueShouldReturnFalseOnArgumentException()
-        {
-            Func<string, bool> validator = (string xml) =>
-                {
-                    Enum.Parse(typeof(Architecture), xml);
-                    return true;
-                };
+    #endregion
 
-            Assert.IsFalse(XmlUtilities.IsValidNodeXmlValue("foo", validator));
-        }
+    #region IsValidNodeXmlValue tests
 
-        [TestMethod]
-        public void IsValidNodeXmlValueShouldReturnFalseIfValidatorReturnsFalse()
+    [TestMethod]
+    public void IsValidNodeXmlValueShouldReturnFalseOnArgumentException()
+    {
+        Func<string, bool> validator = (string xml) =>
         {
-            Func<string, bool> validator = (string xml) =>
-            {
-                return false;
-            };
+            Enum.Parse(typeof(Architecture), xml);
+            return true;
+        };
 
-            Assert.IsFalse(XmlUtilities.IsValidNodeXmlValue("foo", validator));
-        }
+        Assert.IsFalse(XmlUtilities.IsValidNodeXmlValue("foo", validator));
+    }
 
-        [TestMethod]
-        public void IsValidNodeXmlValueShouldReturnTrueIfValidatorReturnsTrue()
-        {
-            Func<string, bool> validator = (string xml) =>
-            {
-                return true;
-            };
+    [TestMethod]
+    public void IsValidNodeXmlValueShouldReturnFalseIfValidatorReturnsFalse()
+    {
+        Func<string, bool> validator = (string xml) => false;
 
-            Assert.IsTrue(XmlUtilities.IsValidNodeXmlValue("foo", validator));
-        }
+        Assert.IsFalse(XmlUtilities.IsValidNodeXmlValue("foo", validator));
+    }
 
-        #endregion
+    [TestMethod]
+    public void IsValidNodeXmlValueShouldReturnTrueIfValidatorReturnsTrue()
+    {
+        Func<string, bool> validator = (string xml) => true;
 
-        #region AppendOrModifyChild tests
+        Assert.IsTrue(XmlUtilities.IsValidNodeXmlValue("foo", validator));
+    }
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldModifyExistingNode()
-        {
-            var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+    #endregion
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "ab");
+    #region AppendOrModifyChild tests
 
-            var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
-            Assert.IsNotNull(rcxmlDocument);
-            Assert.AreEqual("ab", rcxmlDocument.InnerXml);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldModifyExistingNode()
+    {
+        var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldAppendANewNode()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "ab");
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "abc");
+        var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
+        Assert.IsNotNull(rcxmlDocument);
+        Assert.AreEqual("ab", rcxmlDocument.InnerXml);
+    }
 
-            var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
-            Assert.IsNotNull(rcxmlDocument);
-            Assert.AreEqual("abc", rcxmlDocument.InnerXml);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldAppendANewNode()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldNotModifyExistingXmlIfInnerXmlPassedInIsNull()
-        {
-            var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "abc");
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", null);
+        var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
+        Assert.IsNotNull(rcxmlDocument);
+        Assert.AreEqual("abc", rcxmlDocument.InnerXml);
+    }
 
-            var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
-            Assert.IsNotNull(rcxmlDocument);
-            Assert.AreEqual("abc", rcxmlDocument.InnerXml);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldNotModifyExistingXmlIfInnerXmlPassedInIsNull()
+    {
+        var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldCreateAnEmptyNewNodeIfInnerXmlPassedInIsNull()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", null);
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", null);
+        var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
+        Assert.IsNotNull(rcxmlDocument);
+        Assert.AreEqual("abc", rcxmlDocument.InnerXml);
+    }
 
-            var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
-            Assert.IsNotNull(rcxmlDocument);
-            Assert.AreEqual(string.Empty, rcxmlDocument.InnerXml);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldCreateAnEmptyNewNodeIfInnerXmlPassedInIsNull()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldNotModifyIfParentNodeDoesNotExist()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", null);
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC/RD", "RD", null);
+        var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
+        Assert.IsNotNull(rcxmlDocument);
+        Assert.AreEqual(string.Empty, rcxmlDocument.InnerXml);
+    }
 
-            Assert.AreEqual(settingsXml, xmlDocument.OuterXml);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldNotModifyIfParentNodeDoesNotExist()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void AppendOrModifyChildShouldAppendANewNodeWithEscapingSpecialChars()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC/RD", "RD", null);
 
-            XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "a&b<c>d\"e'f");
+        Assert.AreEqual(settingsXml, xmlDocument.OuterXml);
+    }
 
-            var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
-            Assert.IsNotNull(rcxmlDocument);
-            Assert.AreEqual("a&amp;b&lt;c&gt;d\"e'f", rcxmlDocument.InnerXml);
-            Assert.AreEqual("a&b<c>d\"e'f", rcxmlDocument.InnerText);
-        }
+    [TestMethod]
+    public void AppendOrModifyChildShouldAppendANewNodeWithEscapingSpecialChars()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        #endregion
+        XmlUtilities.AppendOrModifyChild(xmlDocument, @"/RunSettings/RC", "RC", "a&b<c>d\"e'f");
 
-        #region RemoveChildNode tests
+        var rcxmlDocument = xmlDocument.SelectSingleNode(@"/RunSettings/RC");
+        Assert.IsNotNull(rcxmlDocument);
+        Assert.AreEqual("a&amp;b&lt;c&gt;d\"e'f", rcxmlDocument.InnerXml);
+        Assert.AreEqual("a&b<c>d\"e'f", rcxmlDocument.InnerText);
+    }
 
-        [TestMethod]
-        public void RemoveChildNodeShouldNotModifyExistingXmlIfNodeDoesnotExist()
-        {
-            var settingsXml = @"<RunSettings></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
+    #endregion
 
-            XmlUtilities.RemoveChildNode(xmlDocument.CreateNavigator(), @"/RunSettings/RC", "RC");
+    #region RemoveChildNode tests
 
-            Assert.AreEqual(settingsXml, xmlDocument.OuterXml);
-        }
+    [TestMethod]
+    public void RemoveChildNodeShouldNotModifyExistingXmlIfNodeDoesnotExist()
+    {
+        var settingsXml = @"<RunSettings></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
 
-        [TestMethod]
-        public void RemoveChildNodeShouldRemoveXmlIfExist()
-        {
-            var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
-            var xmlDocument = this.GetXmlDocument(settingsXml);
-            var navigator = xmlDocument.CreateNavigator();
-            navigator.MoveToChild("RunSettings", string.Empty);
-            XmlUtilities.RemoveChildNode(navigator, @"/RunSettings/RC", "RC");
+        XmlUtilities.RemoveChildNode(xmlDocument.CreateNavigator(), @"/RunSettings/RC", "RC");
 
-            Assert.AreEqual(@"<RunSettings></RunSettings>", xmlDocument.OuterXml);
-        }
+        Assert.AreEqual(settingsXml, xmlDocument.OuterXml);
+    }
 
-        #endregion
+    [TestMethod]
+    public void RemoveChildNodeShouldRemoveXmlIfExist()
+    {
+        var settingsXml = @"<RunSettings><RC>abc</RC></RunSettings>";
+        var xmlDocument = GetXmlDocument(settingsXml);
+        var navigator = xmlDocument.CreateNavigator();
+        navigator!.MoveToChild("RunSettings", string.Empty);
+        XmlUtilities.RemoveChildNode(navigator, @"/RunSettings/RC", "RC");
 
-        #region Private Methods
+        Assert.AreEqual(@"<RunSettings></RunSettings>", xmlDocument.OuterXml);
+    }
 
-        private XmlDocument GetXmlDocument(string settingsXml)
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(settingsXml);
+    #endregion
 
-            return doc;
-        }
+    #region Private Methods
 
-        #endregion
+    private static XmlDocument GetXmlDocument(string settingsXml)
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(settingsXml);
+
+        return doc;
     }
+
+    #endregion
 }
diff --git a/test/SettingsMigrator.UnitTests/MigratorTests.cs b/test/SettingsMigrator.UnitTests/MigratorTests.cs
index 4fe25372a7..10dfd8440a 100644
--- a/test/SettingsMigrator.UnitTests/MigratorTests.cs
+++ b/test/SettingsMigrator.UnitTests/MigratorTests.cs
@@ -1,175 +1,182 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests;
+
+[TestClass]
+public class MigratorTests
 {
-    using System.IO;
-    using System.Xml;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private const string InvalidSettings = "<InvalidSettings>";
+
+    private const string OldRunSettings = "<RunSettings>" +
+                                          "<MSTest>" +
+                                          "<ForcedLegacyMode>true</ForcedLegacyMode>" +
+                                          "<SettingsFile></SettingsFile>" +
+                                          "</MSTest>" +
+                                          "</RunSettings>";
+
+    private readonly Migrator _migrator;
+    private readonly string _newRunsettingsPath;
+
+    private string _oldTestsettingsPath;
+    private string _oldRunsettingsPath;
 
-    [TestClass]
-    public class MigratorTests
+    public MigratorTests()
     {
-        private const string InvalidSettings = "<InvalidSettings>";
-
-        private const string OldRunSettings = "<RunSettings>" +
-                                    "<MSTest>" +
-                                    "<ForcedLegacyMode>true</ForcedLegacyMode>" +
-                                    "<SettingsFile></SettingsFile>" +
-                                    "</MSTest>" +
-                                    "</RunSettings>";
-
-        private Migrator migrator;
-        private string newRunsettingsPath;
-        private string oldTestsettingsPath;
-        private string oldRunsettingsPath;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.migrator = new Migrator();
-            this.newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
-            this.oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
-            this.oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
-        }
+        _migrator = new Migrator();
+        _newRunsettingsPath = Path.Combine(Path.GetTempPath(), "generatedRunsettings.runsettings");
+        _oldTestsettingsPath = Path.GetFullPath(Path.Combine(".", "oldTestsettings.testsettings"));
+        _oldRunsettingsPath = Path.Combine(Path.GetTempPath(), "oldRunsettings.runsettings");
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        if (File.Exists(_newRunsettingsPath))
         {
-            if (File.Exists(this.newRunsettingsPath))
-            {
-                File.Delete(this.newRunsettingsPath);
-            }
+            File.Delete(_newRunsettingsPath);
         }
+    }
 
-        [TestMethod]
-        public void NonRootedPathIsNotMigrated()
-        {
-            this.migrator.Migrate("asda", this.newRunsettingsPath);
+    [TestMethod]
+    public void NonRootedPathIsNotMigrated()
+    {
+        _migrator.Migrate("asda", _newRunsettingsPath);
 
-            Assert.IsFalse(File.Exists(this.newRunsettingsPath), "Run settings should not be generated.");
-        }
+        Assert.IsFalse(File.Exists(_newRunsettingsPath), "Run settings should not be generated.");
+    }
 
-        [TestMethod]
-        public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(OldRunSettings);
-            var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
-                settingsnode.InnerText = this.oldTestsettingsPath;
-            File.WriteAllText(this.oldRunsettingsPath, doc.InnerXml);
+    [TestMethod]
+    public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettings()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(OldRunSettings);
+        Assert.IsNotNull(doc.DocumentElement);
+        var settingsnode = doc.DocumentElement.SelectSingleNode(@"/RunSettings/MSTest/SettingsFile");
+        Assert.IsNotNull(settingsnode);
+        settingsnode.InnerText = _oldTestsettingsPath;
+        File.WriteAllText(_oldRunsettingsPath, doc.InnerXml);
 
-            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
+        _migrator.Migrate(_oldRunsettingsPath, _newRunsettingsPath);
 
-            Validate(this.newRunsettingsPath);
+        Validate(_newRunsettingsPath);
 
-            File.Delete(this.oldRunsettingsPath);
-        }
+        File.Delete(_oldRunsettingsPath);
+    }
 
-        [TestMethod]
-        public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelativePath()
-        {
-            this.oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithEmbeddedSettings.runSEttings"));
+    [TestMethod]
+    public void MigratorGeneratesCorrectRunsettingsForEmbeddedTestSettingsOfRelativePath()
+    {
+        _oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithEmbeddedSettings.runSEttings"));
 
-            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
-            Validate(this.newRunsettingsPath);
-        }
+        _migrator.Migrate(_oldRunsettingsPath, _newRunsettingsPath);
+        Validate(_newRunsettingsPath);
+    }
 
-        [TestMethod]
-        public void MigratorGeneratesCorrectRunsettingsWithDC()
-        {
-            this.oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
-
-            this.migrator.Migrate(this.oldRunsettingsPath, this.newRunsettingsPath);
-
-            using (XmlTextReader reader = new XmlTextReader(this.newRunsettingsPath))
-            {
-                reader.Namespaces = false;
-                var document = new XmlDocument();
-                document.Load(reader);
-                var root = document.DocumentElement;
-                var dataCollectorNode = root.SelectNodes(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
-                Assert.AreEqual(2, dataCollectorNode.Count, "Data collector is missing");
-            }
-        }
+    [TestMethod]
+    public void MigratorGeneratesCorrectRunsettingsWithDc()
+    {
+        _oldRunsettingsPath = Path.GetFullPath(Path.Combine(".", "oldRunSettingsWithDataCollector.runsettings"));
+
+        _migrator.Migrate(_oldRunsettingsPath, _newRunsettingsPath);
+
+        using XmlTextReader reader = new(_newRunsettingsPath);
+        reader.Namespaces = false;
+        var document = new XmlDocument();
+        document.Load(reader);
+        var root = document.DocumentElement;
+        Assert.IsNotNull(root);
+        var dataCollectorNode = root.SelectNodes(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+        Assert.IsNotNull(dataCollectorNode);
+        Assert.AreEqual(2, dataCollectorNode.Count, "Data collector is missing");
+    }
 
-        [TestMethod]
-        public void MigratorGeneratesCorrectRunsettingsForTestSettings()
-        {
-            this.migrator.Migrate(this.oldTestsettingsPath, this.newRunsettingsPath);
+    [TestMethod]
+    public void MigratorGeneratesCorrectRunsettingsForTestSettings()
+    {
+        _migrator.Migrate(_oldTestsettingsPath, _newRunsettingsPath);
 
-            Validate(this.newRunsettingsPath);
-        }
+        Validate(_newRunsettingsPath);
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(XmlException))]
-        public void InvalidSettingsThrowsException()
-        {
-            this.oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
+    [TestMethod]
+    [ExpectedException(typeof(XmlException))]
+    public void InvalidSettingsThrowsException()
+    {
+        _oldTestsettingsPath = Path.Combine(Path.GetTempPath(), "oldTestsettings.testsettings");
 
-            File.WriteAllText(this.oldTestsettingsPath, InvalidSettings);
-            File.WriteAllText(this.newRunsettingsPath, string.Empty);
+        File.WriteAllText(_oldTestsettingsPath, InvalidSettings);
+        File.WriteAllText(_newRunsettingsPath, string.Empty);
 
-            this.migrator.Migrate(this.oldTestsettingsPath, this.newRunsettingsPath);
+        _migrator.Migrate(_oldTestsettingsPath, _newRunsettingsPath);
 
-            File.Delete(this.oldTestsettingsPath);
-        }
+        File.Delete(_oldTestsettingsPath);
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(DirectoryNotFoundException))]
-        public void InvalidPathThrowsException()
-        {
-            string oldTestsettingsPath = @"X:\generatedRun,settings.runsettings";
+    [TestMethod]
+    // On some systems this throws file not found, on some it throws directory not found,
+    // I don't know why and it does not matter for the test. As long as it throws.
+    [ExpectedException(typeof(IOException), AllowDerivedTypes = true)]
+    public void InvalidPathThrowsException()
+    {
+        string oldTestsettingsPath = @"X:\generatedRun,settings.runsettings";
 
-            this.migrator.Migrate(oldTestsettingsPath, this.newRunsettingsPath);
-        }
+        _migrator.Migrate(oldTestsettingsPath, _newRunsettingsPath);
+    }
 
-        private static void Validate(string newRunsettingsPath)
-        {
-            Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
+    private static void Validate(string newRunsettingsPath)
+    {
+        Assert.IsTrue(File.Exists(newRunsettingsPath), "Run settings should be generated.");
 
-            using (XmlTextReader reader = new XmlTextReader(newRunsettingsPath))
-            {
-                reader.Namespaces = false;
+        using XmlTextReader reader = new(newRunsettingsPath);
+        reader.Namespaces = false;
 
-                var document = new XmlDocument();
-                document.Load(reader);
-                var root = document.DocumentElement;
+        var document = new XmlDocument();
+        document.Load(reader);
+        var root = document.DocumentElement;
+        Assert.IsNotNull(root);
 
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/WebTestRunConfiguration/Browser/Headers/Header"), "There should be a WebTestRunConfiguration node");
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings"), "There should be a LegacySettings node");
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment/DeploymentItem"), "There should be a DeploymentItem node");
+        Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/WebTestRunConfiguration/Browser/Headers/Header"), "There should be a WebTestRunConfiguration node");
+        Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings"), "There should be a LegacySettings node");
+        Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Deployment/DeploymentItem"), "There should be a DeploymentItem node");
 
-                var scriptNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Scripts");
-                Assert.IsNotNull(scriptNode, "There should be a WebTestRunConfiguration node");
-                Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"].Value, "setupScript does not match.");
-                Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"].Value, "cleanupScript does not match.");
+        var scriptNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Scripts");
+        Assert.IsNotNull(scriptNode, "There should be a WebTestRunConfiguration node");
+        Assert.IsNotNull(scriptNode.Attributes);
+        Assert.AreEqual(".\\setup.bat", scriptNode.Attributes["setupScript"]!.Value, "setupScript does not match.");
+        Assert.AreEqual(".\\cleanup.bat", scriptNode.Attributes["cleanupScript"]!.Value, "cleanupScript does not match.");
 
-                var forcedLegacyNode = root.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
-                Assert.IsNotNull(forcedLegacyNode, "ForcedLegacy node should be present");
-                Assert.AreEqual("true", forcedLegacyNode.InnerText, "Forced legacy should be true");
+        var forcedLegacyNode = root.SelectSingleNode(@"/RunSettings/MSTest/ForcedLegacyMode");
+        Assert.IsNotNull(forcedLegacyNode, "ForcedLegacy node should be present");
+        Assert.AreEqual("true", forcedLegacyNode.InnerText, "Forced legacy should be true");
 
-                var executionNode = root.SelectSingleNode(@" / RunSettings/LegacySettings/Execution");
-                Assert.IsNotNull(executionNode, "There should be a Execution node");
-                Assert.AreEqual("2", executionNode.Attributes["parallelTestCount"].Value, "parallelTestCount value does not match.");
-                Assert.AreEqual("MSIL", executionNode.Attributes["hostProcessPlatform"].Value, "hostProcessPlatform value does not match.");
+        var executionNode = root.SelectSingleNode(@" / RunSettings/LegacySettings/Execution");
+        Assert.IsNotNull(executionNode, "There should be a Execution node");
+        Assert.IsNotNull(executionNode.Attributes);
+        Assert.AreEqual("2", executionNode.Attributes["parallelTestCount"]!.Value, "parallelTestCount value does not match.");
+        Assert.AreEqual("MSIL", executionNode.Attributes["hostProcessPlatform"]!.Value, "hostProcessPlatform value does not match.");
 
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Hosts"), "There should be a Hosts node");
+        Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Hosts"), "There should be a Hosts node");
 
-                var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
-                Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
-                Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"].Value, "testTimeout value does not match.");
+        var timeoutNode = root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/Timeouts");
+        Assert.IsNotNull(timeoutNode, "There should be a Timeouts node");
+        Assert.IsNotNull(timeoutNode.Attributes);
+        Assert.AreEqual("120000", timeoutNode.Attributes["testTimeout"]!.Value, "testTimeout value does not match.");
 
-                Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution/TestDirectory"), "There should be a Assembly resolution node");
+        Assert.IsNotNull(root.SelectSingleNode(@"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution/TestDirectory"), "There should be a Assembly resolution node");
 
-                var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
-                Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
-                Assert.AreEqual("60000", testSessionTimeoutNode.InnerText, "Timeout value does not match.");
+        var testSessionTimeoutNode = root.SelectSingleNode(@"/RunSettings/RunConfiguration/TestSessionTimeout");
+        Assert.IsNotNull(testSessionTimeoutNode, "There should be a TestSessionTimeout node");
+        Assert.AreEqual("60000", testSessionTimeoutNode.InnerText, "Timeout value does not match.");
 
-                var dataCollectorNode = root.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
-                Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
-                Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"].Value, "Data collector does not match.");
-            }
-        }
+        var dataCollectorNode = root.SelectSingleNode(@"/RunSettings/DataCollectionRunSettings/DataCollectors/DataCollector");
+        Assert.IsNotNull(dataCollectorNode, "There should be a DataCollector node");
+        Assert.IsNotNull(dataCollectorNode.Attributes);
+        Assert.AreEqual("Event Log", dataCollectorNode.Attributes["friendlyName"]!.Value, "Data collector does not match.");
     }
 }
diff --git a/test/SettingsMigrator.UnitTests/PathResolverTests.cs b/test/SettingsMigrator.UnitTests/PathResolverTests.cs
index 9acd635236..678865ddd4 100644
--- a/test/SettingsMigrator.UnitTests/PathResolverTests.cs
+++ b/test/SettingsMigrator.UnitTests/PathResolverTests.cs
@@ -1,75 +1,74 @@
-// Copyright(c) Microsoft Corporation.All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
+using System;
+using System.Globalization;
+using System.IO;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests;
+
+[TestClass]
+public class PathResolverTests
 {
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly PathResolver _pathResolver;
 
-    [TestClass]
-    public class PathResolverTests
+    public PathResolverTests()
     {
-        private PathResolver pathResolver;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.pathResolver = new PathResolver();
-        }
+        _pathResolver = new PathResolver();
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnNullForEmptyArguments()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { });
-            Assert.IsNull(newFilePath, "Empty arguments should return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnNullForEmptyArguments()
+    {
+        var newFilePath = _pathResolver.GetTargetPath([]);
+        Assert.IsNull(newFilePath, "Empty arguments should return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnNullForInvalidArguments()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "asd", "asd", "asd" });
-            Assert.IsNull(newFilePath, "Invalid arguments should return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnNullForInvalidArguments()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["asd", "asd", "asd"]);
+        Assert.IsNull(newFilePath, "Invalid arguments should return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnNullForRelativePaths()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "asd.testsettings" });
-            Assert.IsNull(newFilePath, "Relative paths should return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnNullForRelativePaths()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["asd.testsettings"]);
+        Assert.IsNull(newFilePath, "Relative paths should return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnNullForRelativePathsWithTwoArguments()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "asd.Testsettings", "C:\\asd.runsettings" });
-            Assert.IsNull(newFilePath, "Relative paths should return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnNullForRelativePathsWithTwoArguments()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["asd.Testsettings", "C:\\asd.runsettings"]);
+        Assert.IsNull(newFilePath, "Relative paths should return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldNotReturnNullForPathsWithExtensionInCapitals()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "C:\\asd.TestSEettings", "C:\\asd.RuNSettings" });
-            Assert.IsNotNull(newFilePath, "Relative paths should not return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldNotReturnNullForPathsWithExtensionInCapitals()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["C:\\asd.TestSEettings", "C:\\asd.RuNSettings"]);
+        Assert.IsNotNull(newFilePath, "Relative paths should not return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnNullForRelativePathsForRunsettings()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "C:\\asd.testsettings", "asd.runsettings" });
-            Assert.IsNull(newFilePath, "Relative paths should return null");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnNullForRelativePathsForRunsettings()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["C:\\asd.testsettings", "asd.runsettings"]);
+        Assert.IsNull(newFilePath, "Relative paths should return null");
+    }
 
-        [TestMethod]
-        public void PathResolverShouldReturnRunsettingsPathOfSameLocationAsTestSettings()
-        {
-            var newFilePath = this.pathResolver.GetTargetPath(new string[] { "C:\\asd.testsettings" });
-            Assert.IsNotNull(newFilePath, "File path should not be null.");
-            Assert.IsTrue(string.Equals(Path.GetExtension(newFilePath), ".runsettings"), "File path should be .runsettings");
-            Assert.IsTrue(newFilePath.Contains("C:\\asd_"), "File should be of same name as testsettings");
-            var time = newFilePath.Substring(7, 19);
-            Assert.IsTrue(DateTime.TryParseExact(time, "MM-dd-yyyy_hh-mm-ss", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTime date), "File name should have datetime");
-        }
+    [TestMethod]
+    public void PathResolverShouldReturnRunsettingsPathOfSameLocationAsTestSettings()
+    {
+        var newFilePath = _pathResolver.GetTargetPath(["C:\\asd.testsettings"]);
+        Assert.IsNotNull(newFilePath, "File path should not be null.");
+        Assert.IsTrue(string.Equals(Path.GetExtension(newFilePath), ".runsettings"), "File path should be .runsettings");
+        Assert.IsTrue(newFilePath!.Contains("C:\\asd_"), "File should be of same name as testsettings");
+        var time = newFilePath.Substring(7, 19);
+        Assert.IsTrue(DateTime.TryParseExact(time, "MM-dd-yyyy_hh-mm-ss", CultureInfo.CurrentCulture, DateTimeStyles.None, out _), "File name should have datetime");
     }
-}
\ No newline at end of file
+}
diff --git a/test/SettingsMigrator.UnitTests/ProgramTests.cs b/test/SettingsMigrator.UnitTests/ProgramTests.cs
index 6ce0729e71..9e4ef90675 100644
--- a/test/SettingsMigrator.UnitTests/ProgramTests.cs
+++ b/test/SettingsMigrator.UnitTests/ProgramTests.cs
@@ -1,25 +1,24 @@
-// Copyright(c) Microsoft Corporation.All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.SettingsMigrator.UnitTests;
 
-    [TestClass]
-    public class ProgramTests
+[TestClass]
+public class ProgramTests
+{
+    [TestMethod]
+    public void MoreThanTwoArgumentsShouldNotBeAccepted()
     {
-        [TestMethod]
-        public void MoreThanTwoArgumentsShouldNotBeAccepted()
-        {
-            int returnCode = Program.Main(new string[] { "asd", "asd", "asd" });
-            Assert.AreEqual(1, returnCode, "More than 2 arguments should not be accepted.");
-        }
+        int returnCode = Program.Main(["asd", "asd", "asd"]);
+        Assert.AreEqual(1, returnCode, "More than 2 arguments should not be accepted.");
+    }
 
-        [TestMethod]
-        public void NoArgumentsShouldNotBeAccepted()
-        {
-            int returnCode = Program.Main(new string[] { });
-            Assert.AreEqual(1, returnCode, "No arguments should not be accepted.");
-        }
+    [TestMethod]
+    public void NoArgumentsShouldNotBeAccepted()
+    {
+        int returnCode = Program.Main([]);
+        Assert.AreEqual(1, returnCode, "No arguments should not be accepted.");
     }
-}
\ No newline at end of file
+}
diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
index 0c0c7f839c..03f7b9ec40 100644
--- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
+++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj
@@ -1,31 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
+    <IsTestProject Condition=" '$(OS)' != 'Windows_NT' ">false</IsTestProject>
+    <OutputType Condition=" '$(OS)' == 'Windows_NT' ">Exe</OutputType>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
-	<WarningsAsErrors>true</WarningsAsErrors>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
+    <!-- TODO: Do we need this for net8.0 as well? -->
+    <TargetFrameworks>net48</TargetFrameworks>
     <AssemblyName>SettingsMigrator.UnitTests</AssemblyName>
   </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\SettingsMigrator\SettingsMigrator.csproj" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" Condition=" '$(OS)' != 'Windows_NT' " />
   </ItemGroup>
+  
   <ItemGroup>
     <Content Include="oldTestSettings.testsettings" CopyToOutputDirectory="Always" />
-	<Content Include="oldRunSettingsWithEmbeddedSettings.runsettings" CopyToOutputDirectory="Always" />
-	<Content Include="oldRunSettingsWithDataCollector.runsettings" CopyToOutputDirectory="Always" />
+    <Content Include="oldRunSettingsWithEmbeddedSettings.runsettings" CopyToOutputDirectory="Always" />
+    <Content Include="oldRunSettingsWithDataCollector.runsettings" CopyToOutputDirectory="Always" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+  <Target Name="RunTests" Condition=" '$(OS)' != 'Windows_NT' " />
 </Project>
diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj
index f156940b22..f771066c14 100644
--- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj
+++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj
@@ -1,17 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/UnitTest1.cs b/test/TestAssets/AppDomainGetAssembliesTestProject/UnitTest1.cs
index 0cfa179995..d5a15789c5 100644
--- a/test/TestAssets/AppDomainGetAssembliesTestProject/UnitTest1.cs
+++ b/test/TestAssets/AppDomainGetAssembliesTestProject/UnitTest1.cs
@@ -1,24 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System;
-using System.Linq;
 
-namespace AppDomainGetAssembliesTestProject
+namespace AppDomainGetAssembliesTestProject;
+
+[TestClass]
+public class UnitTest1
 {
-    [TestClass]
-    public class UnitTest1
+    [TestMethod]
+    public void TestMethod1()
     {
-        [TestMethod]
-        public void TestMethod1()
-        {
-            // https://github.com/microsoft/vstest/issues/2008
-            // GetAssemblies adds datacollectors to test host appdomain which was failing in the above issue
+        // https://github.com/microsoft/vstest/issues/2008
+        // GetAssemblies adds datacollectors to test host appdomain which was failing in the above issue
 
-            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+        var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
 
-            foreach(var assembly in allAssemblies)
-            {
-                var typeInfo = assembly.GetTypes();
-            }
+        foreach (var assembly in allAssemblies)
+        {
+            var _ = assembly.GetTypes();
         }
     }
 }
diff --git a/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj
new file mode 100644
index 0000000000..ca790a13f9
--- /dev/null
+++ b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net9.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/ArchitectureSwitch/UnitTest1.cs b/test/TestAssets/ArchitectureSwitch/UnitTest1.cs
new file mode 100644
index 0000000000..e298ffc99d
--- /dev/null
+++ b/test/TestAssets/ArchitectureSwitch/UnitTest1.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+#pragma warning disable IDE0161 // Convert to file-scoped namespace
+namespace TestProjectNetcore
+#pragma warning restore IDE0161 // Convert to file-scoped namespace
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+            foreach (DictionaryEntry envVar in Environment.GetEnvironmentVariables())
+            {
+                if (envVar.Key.ToString().StartsWith("DOTNET_ROOT"))
+                {
+                    Console.WriteLine($"{envVar.Key}: {envVar.Value}");
+                }
+            }
+
+            Console.WriteLine("OSArchitecture: " + RuntimeInformation.OSArchitecture.ToString());
+            Console.WriteLine("ProcessArchitecture: " + RuntimeInformation.ProcessArchitecture.ToString());
+            Console.WriteLine("Runtime location: " + typeof(object).Assembly.Location);
+            Assert.IsTrue(false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj b/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj
new file mode 100644
index 0000000000..8d1d9edec7
--- /dev/null
+++ b/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/AttachmentProcessorDataCollector/SampleDataCollector.cs b/test/TestAssets/AttachmentProcessorDataCollector/SampleDataCollector.cs
new file mode 100644
index 0000000000..dfd265ccfd
--- /dev/null
+++ b/test/TestAssets/AttachmentProcessorDataCollector/SampleDataCollector.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace AttachmentProcessorDataCollector;
+
+internal class ExtensionInfo
+{
+    public const string ExtensionType = "DataCollector";
+    public const string ExtensionIdentifier = "my://sample/datacollector";
+}
+
+[DataCollectorFriendlyName("SampleDataCollector")]
+[DataCollectorTypeUri(ExtensionInfo.ExtensionIdentifier)]
+[DataCollectorAttachmentProcessor(typeof(SampleDataCollectorAttachmentProcessor))]
+public class SampleDataCollectorV2 : SampleDataCollectorV1 { }
+
+[DataCollectorFriendlyName("SampleDataCollector")]
+[DataCollectorTypeUri(ExtensionInfo.ExtensionIdentifier)]
+public class SampleDataCollectorV1 : DataCollector
+{
+    private DataCollectionSink? _dataCollectionSink;
+    private DataCollectionEnvironmentContext? _context;
+    private readonly string _tempDirectoryPath = Path.GetTempPath();
+
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
+    {
+        events.SessionEnd += SessionEnded_Handler;
+        _dataCollectionSink = dataSink;
+        _context = environmentContext;
+    }
+
+    private void SessionEnded_Handler(object? sender, SessionEndEventArgs e)
+    {
+        string tmpAttachment = Path.Combine(_tempDirectoryPath, Guid.NewGuid().ToString("N"), "DataCollectorAttachmentProcessor_1.txt");
+        Directory.CreateDirectory(Path.GetDirectoryName(tmpAttachment)!);
+        File.WriteAllText(tmpAttachment, $"SessionEnded_Handler_{Guid.NewGuid():N}");
+        _dataCollectionSink!.SendFileAsync(_context!.SessionDataCollectionContext, tmpAttachment, true);
+    }
+}
+
+public class SampleDataCollectorAttachmentProcessor : IDataCollectorAttachmentProcessor
+{
+    public bool SupportsIncrementalProcessing => true;
+
+    public IEnumerable<Uri> GetExtensionUris()
+        => new List<Uri>() { new Uri(ExtensionInfo.ExtensionIdentifier) };
+
+    public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+    {
+        string finalFileName = configurationElement.FirstChild!.InnerText;
+        StringBuilder stringBuilder = new();
+        string? finalFolder = null;
+        foreach (var attachmentSet in attachments)
+        {
+            foreach (var attachment in attachmentSet.Attachments.OrderBy(f => f.Uri.AbsolutePath))
+            {
+                finalFolder ??= Path.GetDirectoryName(attachment.Uri.AbsolutePath);
+
+                stringBuilder.AppendLine(File.ReadAllText(attachment.Uri.AbsolutePath).Trim());
+            }
+        }
+
+        File.WriteAllText(Path.Combine(finalFolder!, finalFileName), stringBuilder.ToString());
+
+        List<AttachmentSet> mergedAttachment = new();
+        var mergedAttachmentSet = new AttachmentSet(new Uri("my://sample/datacollector"), "SampleDataCollector");
+        mergedAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(Path.Combine(finalFolder!, finalFileName), string.Empty));
+        mergedAttachment.Add(mergedAttachmentSet);
+
+        return Task.FromResult((ICollection<AttachmentSet>)new Collection<AttachmentSet>(mergedAttachment));
+    }
+}
diff --git a/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs b/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs
new file mode 100644
index 0000000000..995d752bad
--- /dev/null
+++ b/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using AttachmentProcessorDataCollector;
+
+using Microsoft.VisualStudio.TestPlatform;
+
+[assembly: TestExtensionTypes(typeof(SampleDataCollectorV1))]
+[assembly: TestExtensionTypesV2(ExtensionInfo.ExtensionType, ExtensionInfo.ExtensionIdentifier, typeof(SampleDataCollectorV1), 1, "futureUnused")]
+[assembly: TestExtensionTypesV2(ExtensionInfo.ExtensionType, ExtensionInfo.ExtensionIdentifier, typeof(SampleDataCollectorV2), 2)]
+
+namespace Microsoft.VisualStudio.TestPlatform;
+
+[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+internal sealed class TestExtensionTypesAttribute : Attribute
+{
+    public TestExtensionTypesAttribute(params Type[] types)
+    {
+        Types = types;
+    }
+
+    public Type[] Types { get; }
+}
+
+[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = true)]
+internal sealed class TestExtensionTypesV2Attribute : Attribute
+{
+    public string ExtensionType { get; }
+    public string ExtensionIdentifier { get; }
+    public Type ExtensionImplementation { get; }
+    public int Version { get; }
+
+    public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation,
+        int version, string? _ = null)
+    {
+        ExtensionType = extensionType;
+        ExtensionIdentifier = extensionIdentifier;
+        ExtensionImplementation = extensionImplementation;
+        Version = version;
+    }
+}
diff --git a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj
index 7857fd0c9d..cdefdc3c6f 100644
--- a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj
+++ b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj
@@ -1,22 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
 
   <PropertyGroup>
     <AssemblyName>BlameUnitTestProject</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/BlameUnitTestProject/Program.cs b/test/TestAssets/BlameUnitTestProject/Program.cs
deleted file mode 100644
index 8cd953b668..0000000000
--- a/test/TestAssets/BlameUnitTestProject/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace BlameUnitTestProject
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-
-        }
-    }
-}
diff --git a/test/TestAssets/BlameUnitTestProject/UnitTest1.cs b/test/TestAssets/BlameUnitTestProject/UnitTest1.cs
index 9e8f7c5f33..52d02f72fe 100644
--- a/test/TestAssets/BlameUnitTestProject/UnitTest1.cs
+++ b/test/TestAssets/BlameUnitTestProject/UnitTest1.cs
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace BlameUnitTestProject
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using System;
 
+namespace BlameUnitTestProject 
+{
     [TestClass]
     public class UnitTest1
     {
diff --git a/test/TestAssets/CILProject/CILProject.proj b/test/TestAssets/CILProject/CILProject.proj
index cefbd5f276..294c781c9a 100644
--- a/test/TestAssets/CILProject/CILProject.proj
+++ b/test/TestAssets/CILProject/CILProject.proj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
         <PackagesPath Condition="'$(TP_PACKAGES_DIR)' != ''">$(TP_PACKAGES_DIR)\</PackagesPath>
-        <PackagesPath Condition="'$(PackagesPath)' == ''">$(TestPlatformRoot)\packages\</PackagesPath>
+        <PackagesPath Condition="'$(PackagesPath)' == ''">$(RepoRoot).packages\</PackagesPath>
     </PropertyGroup>
-    <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Dependencies.props" />
 
     <!-- Required by Microsoft.Common.targets -->
     <Target Name="CreateManifestResourceNames" Condition="'@(EmbeddedResource)' != ''" />
 
     <PropertyGroup>
-        <TargetFramework>net451</TargetFramework>
+        <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
         <OutputPath>bin\$(Configuration)</OutputPath>
         <RunningOnUnix Condition="$([MSBuild]::IsOSUnixLike())">true</RunningOnUnix>
         <RunningOnUnix Condition="'$(RunningOnUnix)' == ''">false</RunningOnUnix>
@@ -39,6 +37,10 @@
         <Compile Include="OrphanMethod.il" />
     </ItemGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
+    </ItemGroup>
+
     <Target Name="CoreCompile" Inputs="$(MSBuildAllProjects);@(Compile)" Outputs="@(IntermediateAssembly);" Returns="" DependsOnTargets="GetIlasmPath;$(CoreCompileDependsOn)">
         <Error Condition="'$(IlasmToolPath)' == ''" Text="IlasmToolPath must be set in order to build ilproj's outside of Windows." />
         <Message Text="Is Unix: $(RunningOnUnix)" Importance="High" />
@@ -65,4 +67,4 @@
 
         <CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''"/>
     </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/TestAssets/CILProject/OrphanMethod.il b/test/TestAssets/CILProject/OrphanMethod.il
index e13ddf6858..d7d9d1f9d5 100644
--- a/test/TestAssets/CILProject/OrphanMethod.il
+++ b/test/TestAssets/CILProject/OrphanMethod.il
@@ -2,24 +2,43 @@
 .assembly extern mscorlib {}
 .assembly extern System.Core {}
 
-.method static public int32 Add(int32 x, int32 y) cil managed 
+.class public CleanNamespaceName.ClassName
 {
-    .maxstack 2
+    .method static public int32 Add(int32 x, int32 y) cil managed 
+    {
+        .maxstack 2
 
-    ldarg.0
-    ldarg.1
-    add
-    ret
-}
+        ldarg.0
+        ldarg.1
+        add
+        ret
+    }
 
-.method static public int32 'An awesome method to add 𝓧➕𝓨'(int32 '𝓧', int32 '𝓨') cil managed 
-{
-    .maxstack 2
+    .method static public int32 'An awesome method to add 𝓧➕𝓨'(int32 '𝓧', int32 '𝓨') cil managed 
+    {
+        .maxstack 2
+
+        ldarg.0
+        ldarg.1
+        add
+        ret
+    }
+
+    // has ' and no spaces, e.g. coming from F# method ``don't``
+    .method static public void 'don\'t'() cil managed 
+    {
+        .maxstack 1
+
+        ret
+    }
 
-    ldarg.0
-    ldarg.1
-    add
-    ret
+    // has ' and a space, e.g. coming from F# method ``don't pass``
+    .method static public void 'don\'t pass'() cil managed 
+    {
+        .maxstack 1
+
+        ret
+    }
 }
 
 .class public CleanNamespaceName.SecondLevel.'𝐌𝐲 𝗮𝘄𝗲𝘀𝗼𝗺𝗲 𝘤𝘭𝘢𝘴𝘴 𝘢𝘯 𝒊𝒏𝒂𝒄𝒄𝒆𝒔𝒔𝒊𝒃𝒍𝒆 𝙣𝙖𝙢𝙚 😭' 
diff --git a/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec b/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec
index b2df3444ec..76685c8231 100644
--- a/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec
+++ b/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec
@@ -7,7 +7,7 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="file">LICENSE_NET.txt</license>
+    <license type="file">LICENSE_MIT.txt</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <description>MSDia typelib for reading debug symbols from managed code.</description>
     <copyright>Copyright © Microsoft Corporation</copyright>
@@ -17,7 +17,7 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="package\licenses\LICENSE_NET.txt" target="" />
+    <file src="package\licenses\LICENSE_MIT.txt" target="" />
     <file src="CPPSimpleProj\Release\Microsoft.TestPlatform.TestAsset.NativeCPP.dll" target="contentFiles\any\any\" />
     <file src="CPPSimpleProj\x64\Release\Microsoft.TestPlatform.TestAsset.NativeCPP.dll" target="contentFiles\any\any\x64" />
     <file src="ConsoleNativeApp\Release\Microsoft.TestPlatform.TestAsset.ConsoleNativeApp.exe" target="contentFiles\any\any\" />
diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj
deleted file mode 100644
index d4f7755a51..0000000000
--- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-
-  <PropertyGroup>
-    <AssemblyName>CUITTestProject</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
-    <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework" >
-      <HintPath>..\..\..\packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-      <HintPath>..\..\..\packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common">
-      <HintPath>..\..\..\packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITest.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension">
-      <HintPath>..\..\..\packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITest.Extension.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestTools.UITesting" >
-      <HintPath>..\..\..\packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITesting.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Cuit">
-      <Version>$(TestPlatformExternalsVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.QualityTools">
-      <Version>$(TestPlatformExternalsVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/TestAssets/CUITTestProject/CodedUITest1.cs b/test/TestAssets/CUITTestProject/CodedUITest1.cs
deleted file mode 100644
index ffefca4985..0000000000
--- a/test/TestAssets/CUITTestProject/CodedUITest1.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace CodedUITestProject
-{
-    using System;
-	using System.Collections.Generic;
-	using System.Text.RegularExpressions;
-	using System.Windows.Input;
-	using System.Drawing;
-	using Microsoft.VisualStudio.TestTools.UITesting;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
-	using Microsoft.VisualStudio.TestTools.UITest.Extension;
-
-    [CodedUITest]
-    public class CodedUITestProject
-    {
-        [TestMethod]
-        public void CodedUITestMethod1()
-        {
-            UITestControl.Desktop.DrawHighlight();
-        }
-    }
-}
diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj
index 17d4ea6f56..549fb66abc 100644
--- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj
+++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj
@@ -1,27 +1,23 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
     <AssemblyName>CodeCoverageTest</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>$(MSTestFrameworkVersion)</Version>
+      <Version>$(MSTestTestFrameworkVersion)</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestAdapter">
-      <Version>$(MSTestAdapterVersion)</Version>
+      <Version>$(MSTestTestAdapterVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>$(NETTestSdkVersion)</Version>
+      <Version>$(PackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/test/TestAssets/CodeCoverageTest/Logic.cs b/test/TestAssets/CodeCoverageTest/Logic.cs
index a6481b04af..cb2f7532a2 100644
--- a/test/TestAssets/CodeCoverageTest/Logic.cs
+++ b/test/TestAssets/CodeCoverageTest/Logic.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace CodeCoverageTest
 {
diff --git a/test/TestAssets/CodeCoverageTest/UnitTest1.cs b/test/TestAssets/CodeCoverageTest/UnitTest1.cs
index 071d4dfe93..6213c4c3ec 100644
--- a/test/TestAssets/CodeCoverageTest/UnitTest1.cs
+++ b/test/TestAssets/CodeCoverageTest/UnitTest1.cs
@@ -1,4 +1,6 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CodeCoverageTest
@@ -6,33 +8,35 @@ namespace CodeCoverageTest
     [TestClass]
     public class UnitTest1
     {
-        private Logic logic;
+        private readonly Logic _logic;
 
         public UnitTest1()
         {
-            this.logic = new Logic();
+            _logic = new Logic();
         }
 
         [TestMethod]
         public void TestAbs()
         {
-            Assert.AreEqual(logic.Abs(0), 0);
-            Assert.AreEqual(logic.Abs(-5), 5);
-            Assert.AreEqual(logic.Abs(7), 7);
+            Assert.AreEqual(_logic.Abs(0), 0);
+            Assert.AreEqual(_logic.Abs(-5), 5);
+            Assert.AreEqual(_logic.Abs(7), 7);
         }
 
         [TestMethod]
         public void TestSign()
         {
-            Assert.AreEqual(logic.Sign(0), 0);
-            Assert.AreEqual(logic.Sign(-5), -1);
-            Assert.AreEqual(logic.Sign(7), 1);
+            Assert.AreEqual(_logic.Sign(0), 0);
+            Assert.AreEqual(_logic.Sign(-5), -1);
+            Assert.AreEqual(_logic.Sign(7), 1);
         }
 
         [TestMethod]
+#pragma warning disable IDE1006 // Naming Styles
         public void __CxxPureMSILEntry_Test()
+#pragma warning restore IDE1006 // Naming Styles
         {
-            Assert.AreEqual(logic.Abs(0), 0);
+            Assert.AreEqual(_logic.Abs(0), 0);
         }
     }
 }
diff --git a/test/TestAssets/CompatTestExtension/Properties/AssemblyInfo.cs b/test/TestAssets/CompatTestExtension/Properties/AssemblyInfo.cs
index 5cf30251d6..7c49e6ed22 100644
--- a/test/TestAssets/CompatTestExtension/Properties/AssemblyInfo.cs
+++ b/test/TestAssets/CompatTestExtension/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CompatTestExtension")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/test/TestAssets/CompatTestProject/Properties/AssemblyInfo.cs b/test/TestAssets/CompatTestProject/Properties/AssemblyInfo.cs
index 8aae766cd9..d4655ba825 100644
--- a/test/TestAssets/CompatTestProject/Properties/AssemblyInfo.cs
+++ b/test/TestAssets/CompatTestProject/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SampleUnitTestProject")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj
index 5a7cfc1b43..a2788b9408 100644
--- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj
+++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj
@@ -1,13 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyName>ConsoleManagedApp</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/test/TestAssets/ConsoleManagedApp/Program.cs b/test/TestAssets/ConsoleManagedApp/Program.cs
index 247024f0a0..566447dfac 100644
--- a/test/TestAssets/ConsoleManagedApp/Program.cs
+++ b/test/TestAssets/ConsoleManagedApp/Program.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System;
 
 namespace ConsoleManagedApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static void Main()
         {
             Console.WriteLine("Hello World!");
         }
diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj
index 2a49271788..b64c2b099b 100644
--- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj
+++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj
@@ -1,10 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj
index 6aaaa6026c..15cc3f0e8c 100644
--- a/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj
+++ b/test/TestAssets/CoverletCoverageTestProject/CoverletCoverageTestProject.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppMinimum)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletCoverageVersion)" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/TestAssets/CoverletCoverageTestProject/UnitTest1.cs b/test/TestAssets/CoverletCoverageTestProject/UnitTest1.cs
index 7183e4941d..4f0f2868f9 100644
--- a/test/TestAssets/CoverletCoverageTestProject/UnitTest1.cs
+++ b/test/TestAssets/CoverletCoverageTestProject/UnitTest1.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Xunit;
 
 namespace CoverletCoverageTestProject
diff --git a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj
index 722ad2858e..ab41561921 100644
Binary files a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj and b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj differ
diff --git a/test/TestAssets/CrashingOnDebugAssertTestProject/DebugTests.cs b/test/TestAssets/CrashingOnDebugAssertTestProject/DebugTests.cs
index 52d252f1aa..f512bf7a13 100644
--- a/test/TestAssets/CrashingOnDebugAssertTestProject/DebugTests.cs
+++ b/test/TestAssets/CrashingOnDebugAssertTestProject/DebugTests.cs
@@ -1,5 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System.Diagnostics;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CrashingOnDebugAssertTestProject
diff --git a/test/TestAssets/Directory.Build.props b/test/TestAssets/Directory.Build.props
new file mode 100644
index 0000000000..5e3b60555a
--- /dev/null
+++ b/test/TestAssets/Directory.Build.props
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Including just a small subset of what Arcade would do, and not including Directory build props here
+  to avoid "polluting" our testing test projects with Arcade details. We don't want those details there because these
+  projects should be real-life, and most people don't use Arcade. -->
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)../../</RepoRoot>
+    <BaseOutputPath>$(RepoRoot)artifacts/bin/TestAssets/$(MSBuildProjectName)/</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(RepoRoot)artifacts/obj/TestAssets/$(MSBuildProjectName)/</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+
+    <NoWarn>$(NoWarn);
+    <!-- Suppress warnings about testhost being x64 (AMD64)/x86 when imported into AnyCPU (MSIL) test projects. -->
+    MSB3270;
+    <!-- Suppress warnings about net8.0 being used, and being out of support. -->
+    NETSDK1138;
+    <!-- Suppress warning about nugets that we produce not being available when we did not build at least once -->
+    NU1603</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- The TFMs to build and test against. -->
+    <!-- Naming is based on dotnet/runtime one -->
+    <NetFrameworkMinimum>net462</NetFrameworkMinimum>
+    <NetCoreAppMinimum>net8.0</NetCoreAppMinimum>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+
+  <Import Project="$(RepoRoot)eng/Versions.props" />
+</Project>
diff --git a/test/TestAssets/Directory.Build.targets b/test/TestAssets/Directory.Build.targets
new file mode 100644
index 0000000000..fb8841991d
--- /dev/null
+++ b/test/TestAssets/Directory.Build.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- We don't want these projects to be Arcade projects, because they are
+  test projects for testing, and most people don't use Arcade, so we don't want the details of
+  arcade to go into them. -->
+</Project>
diff --git a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj
index 78f8ba77c7..512e92b4e6 100644
--- a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj
+++ b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj
@@ -1,30 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
 
   <PropertyGroup>
     <AssemblyName>DisableAppdomainTest1</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
   </PropertyGroup>
 
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/DisableAppdomainTest1/UnitTest1.cs b/test/TestAssets/DisableAppdomainTest1/UnitTest1.cs
index 09a13aa6cb..98e074e67d 100644
--- a/test/TestAssets/DisableAppdomainTest1/UnitTest1.cs
+++ b/test/TestAssets/DisableAppdomainTest1/UnitTest1.cs
@@ -1,30 +1,31 @@
-using System;
-using System.Diagnostics;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.IO;
-using System.Threading;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTestProject1
+namespace UnitTestProject1;
+
+[TestClass]
+public class UnitTest1
 {
-    [TestClass]
-    public class UnitTest1
+    [TestMethod]
+    public void TestMethod1()
     {
-        [TestMethod]
-        public void TestMethod1()
-        {
-            // make sure the last test was run in different process.
-            var envvariable = Environment.GetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
-            Assert.IsTrue(string.IsNullOrEmpty(envvariable));
+        // make sure the last test was run in different process.
+        var envvariable = Environment.GetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
+        Assert.IsTrue(string.IsNullOrEmpty(envvariable));
 
-            // make sure the appdomain is the one created by testhost
-            var config = File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-            Assert.AreEqual("TestHostAppDomain", AppDomain.CurrentDomain.FriendlyName);
+        // make sure the appdomain is the one created by testhost
+        var config = File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
+        Assert.AreEqual("TestHostAppDomain", AppDomain.CurrentDomain.FriendlyName);
 
-            // make sure config file is honoured
-            Assert.IsTrue(config.Contains("Assembly1"));
+        // make sure config file is honoured
+        Assert.IsTrue(config.Contains("Assembly1"));
 
-            // set env variable so that next test can assert if this is not carried forward
-            Environment.SetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}", "{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
-        }
+        // set env variable so that next test can assert if this is not carried forward
+        Environment.SetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}", "{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
     }
 }
diff --git a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj
index bc1d297d64..da92a884e4 100644
--- a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj
+++ b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj
@@ -1,30 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
 
   <PropertyGroup>
     <AssemblyName>DisableAppDomainTest2</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
   </PropertyGroup>
 
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/DisableAppdomainTest2/UnitTest1.cs b/test/TestAssets/DisableAppdomainTest2/UnitTest1.cs
index 90cbc8550c..92dc3831ff 100644
--- a/test/TestAssets/DisableAppdomainTest2/UnitTest1.cs
+++ b/test/TestAssets/DisableAppdomainTest2/UnitTest1.cs
@@ -1,30 +1,31 @@
-using System;
-using System.Diagnostics;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.IO;
-using System.Threading;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTestProject17
+namespace UnitTestProject17;
+
+[TestClass]
+public class UnitTest1
 {
-    [TestClass]
-    public class UnitTest1
+    [TestMethod]
+    public void TestMethod1()
     {
-        [TestMethod]
-        public void TestMethod1()
-        {
-            // make sure the last test was run in different process.
-            var envvariable = Environment.GetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
-            Assert.IsTrue(string.IsNullOrEmpty(envvariable));
+        // make sure the last test was run in different process.
+        var envvariable = Environment.GetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
+        Assert.IsTrue(string.IsNullOrEmpty(envvariable));
 
-            // make sure the appdomain is the one created by testhost
-            var config = File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-            Assert.AreEqual("TestHostAppDomain", AppDomain.CurrentDomain.FriendlyName);
+        // make sure the appdomain is the one created by testhost
+        var config = File.ReadAllText(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
+        Assert.AreEqual("TestHostAppDomain", AppDomain.CurrentDomain.FriendlyName);
 
-            // make sure config file is honoured
-            Assert.IsTrue(config.Contains("Assembly2"));
+        // make sure config file is honoured
+        Assert.IsTrue(config.Contains("Assembly2"));
 
-            // set env variable so that next test can assert if this is not carried forward
-            Environment.SetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}", "{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
-        }
+        // set env variable so that next test can assert if this is not carried forward
+        Environment.SetEnvironmentVariable("{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}", "{60BBC8A3-3AEB-40C4-AAD5-F6DA6305C6C7}");
     }
 }
diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj
index e60a9a4041..454c931654 100644
--- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj
+++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj
@@ -1,21 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
     <AssemblyName>DiscoveryTestProject</AssemblyName>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/test/TestAssets/DiscoveryTestProject/LongDiscoveryTestClass.cs b/test/TestAssets/DiscoveryTestProject/LongDiscoveryTestClass.cs
index 2d5c65feeb..ea1516eac8 100644
--- a/test/TestAssets/DiscoveryTestProject/LongDiscoveryTestClass.cs
+++ b/test/TestAssets/DiscoveryTestProject/LongDiscoveryTestClass.cs
@@ -1,7 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.Text;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System.Threading;
 
 namespace DiscoveryTestProject3
@@ -9,18 +10,26 @@ namespace DiscoveryTestProject3
     [TestClass]
     public class LongDiscoveryTestClass
     {
-        [MyTestMethod]
-        public void CustomTestMethod()
+        // This is for discovery cancellation test.
+        // LongDiscoveryTestMethod has attribute attribute that
+        // takes a very long time to create, which prolongs the
+        // discovery time and keeps us discovering while we
+        // are cancelling the discovery from the CancelTestDiscovery test.
+
+        [TestMethodWithDelay]
+        public void LongDiscoveryTestMethod()
         {
 
         }
     }
 
-    internal class MyTestMethodAttribute : TestMethodAttribute
+    internal class TestMethodWithDelayAttribute : TestMethodAttribute
     {
-        public MyTestMethodAttribute()
+        public TestMethodWithDelayAttribute()
         {
-            Thread.Sleep(10000);
+            // This will be multiplied by 3 because the framework will internally create this
+            // attribute 3 times.
+            Thread.Sleep(1000);
         }
     }
 }
diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj
index 70e6228436..f771066c14 100644
--- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj
+++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj
@@ -1,17 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/TestAssets/EnvironmentVariablesTestProject/UnitTest1.cs b/test/TestAssets/EnvironmentVariablesTestProject/UnitTest1.cs
index bb6b2fcadc..783a51e865 100644
--- a/test/TestAssets/EnvironmentVariablesTestProject/UnitTest1.cs
+++ b/test/TestAssets/EnvironmentVariablesTestProject/UnitTest1.cs
@@ -1,4 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System;
 
 namespace EnvironmentVariablesTestProject
diff --git a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj
index 8a76f7e919..dfec5464d0 100644
--- a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj
+++ b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
 
   <PropertyGroup>
     <AssemblyName>EventLogUnitTestProject</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/EventLogUnitTestProject/UnitTest1.cs b/test/TestAssets/EventLogUnitTestProject/UnitTest1.cs
index cd54859fc5..006e565a5b 100644
--- a/test/TestAssets/EventLogUnitTestProject/UnitTest1.cs
+++ b/test/TestAssets/EventLogUnitTestProject/UnitTest1.cs
@@ -1,40 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace EventLogUnitTestProject
-{
-    using System.Diagnostics;
-    using System.Threading;
+using System.Diagnostics;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+namespace EventLogUnitTestProject;
 
-    [TestClass]
-    public class UnitTest1
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestMethod1()
     {
-        [TestMethod]
-        public void TestMethod1()
-        {
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 110);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 111);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 112);
-        }
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 110);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 111);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 112);
+    }
 
-        [TestMethod]
-        public void TestMethod2()
-        {
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 220);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 221);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 222);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 223);
-        }
+    [TestMethod]
+    public void TestMethod2()
+    {
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 220);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 221);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 222);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 223);
+    }
 
-        [TestMethod]
-        public void TestMethod3()
-        {
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 330);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 331);
-            EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 332);
-        }
+    [TestMethod]
+    public void TestMethod3()
+    {
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 330);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 331);
+        EventLog.WriteEntry("Application", "Application", EventLogEntryType.Error, 332);
     }
 }
diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj
index 81a3800789..b5c73fc491 100644
--- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj
+++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="CopyFiles" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <AssemblyName>LegacySettingsUnitTestProject</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -20,7 +18,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-      <HintPath>..\..\..\packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
+      <HintPath>..\..\..\.packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -32,5 +30,5 @@
   <Target Name="CopyFiles">
     <Copy SourceFiles="DeploymentFile.xml" DestinationFolder="$(OutputPath)\Deployment" ContinueOnError="false" />
   </Target>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/LegacySettingsUnitTestProject/UnitTest1.cs b/test/TestAssets/LegacySettingsUnitTestProject/UnitTest1.cs
index ad08ec679c..89490d09f3 100644
--- a/test/TestAssets/LegacySettingsUnitTestProject/UnitTest1.cs
+++ b/test/TestAssets/LegacySettingsUnitTestProject/UnitTest1.cs
@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LegacySettingsUnitTestProject
-{
-    using System.IO;
-    using System.Reflection;
+using System.IO;
+using System.Reflection;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+namespace LegacySettingsUnitTestProject
+{
     [TestClass]
     public class UnitTest1
-    {        
+    {
         /// <summary>
         /// Test for scripts
         /// </summary>
diff --git a/test/TestAssets/MSTestProject1/MSTestProject1.csproj b/test/TestAssets/MSTestProject1/MSTestProject1.csproj
new file mode 100644
index 0000000000..9bd9e59217
--- /dev/null
+++ b/test/TestAssets/MSTestProject1/MSTestProject1.csproj
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/MSTestProject1/UnitTest1.cs b/test/TestAssets/MSTestProject1/UnitTest1.cs
new file mode 100644
index 0000000000..17c1760f18
--- /dev/null
+++ b/test/TestAssets/MSTestProject1/UnitTest1.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MSTestProject1;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void PassingTest()
+    {
+        Assert.AreEqual(2, 2);
+    }
+
+    [TestMethod]
+    public void FailingTest()
+    {
+        Assert.AreEqual(2, 3);
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void SkippedTest()
+    {
+    }
+}
diff --git a/test/TestAssets/MSTestProject2/MSTestProject2.csproj b/test/TestAssets/MSTestProject2/MSTestProject2.csproj
new file mode 100644
index 0000000000..9bd9e59217
--- /dev/null
+++ b/test/TestAssets/MSTestProject2/MSTestProject2.csproj
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/MSTestProject2/UnitTest1.cs b/test/TestAssets/MSTestProject2/UnitTest1.cs
new file mode 100644
index 0000000000..1f6d2bf47e
--- /dev/null
+++ b/test/TestAssets/MSTestProject2/UnitTest1.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MSTestProject2;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void PassingTest()
+    {
+        Assert.AreEqual(2, 2);
+    }
+
+    [TestMethod]
+    public void FailingTest()
+    {
+        Assert.AreEqual(2, 3);
+    }
+
+    [Ignore]
+    [TestMethod]
+    public void SkippedTest()
+    {
+    }
+}
diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
index 776b6f86a7..a4dc9f9322 100644
--- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
+++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <AssemblyName>MstestV1UnitTestProject</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
@@ -17,7 +15,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-      <HintPath>..\..\..\packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
+      <HintPath>..\..\..\.packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -33,5 +31,5 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs b/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs
index 877ea916b3..9c5206bcd0 100644
--- a/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs
+++ b/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs
@@ -1,16 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 namespace MstestV1UnitTestProject
 {
-    using System;
-    using System.Diagnostics;
-    using System.Threading;
-    using System.IO;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-
     [TestClass]
     public class UnitTest1
     {
diff --git a/test/TestAssets/MultiHostTestExecutionProject/MultiHostTestExecutionProject.csproj b/test/TestAssets/MultiHostTestExecutionProject/MultiHostTestExecutionProject.csproj
new file mode 100644
index 0000000000..02776870c2
--- /dev/null
+++ b/test/TestAssets/MultiHostTestExecutionProject/MultiHostTestExecutionProject.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/MultiHostTestExecutionProject/UnitTest1.cs b/test/TestAssets/MultiHostTestExecutionProject/UnitTest1.cs
new file mode 100644
index 0000000000..fc3a3e6f4d
--- /dev/null
+++ b/test/TestAssets/MultiHostTestExecutionProject/UnitTest1.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Parallelize the execution
+[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)]
+
+namespace SerializeTestRunTestProject
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        private static readonly object Lock = new object();
+
+        private void LogToFile(string testName)
+        {
+            lock (Lock)
+            {
+                string folderToLogTo = Environment.GetEnvironmentVariable("VSTEST_LOGFOLDER");
+                File.AppendAllText(Path.Combine(folderToLogTo, $"TestHost_{Process.GetCurrentProcess().Id}.txt"), testName + "\n");
+            }
+        }
+
+        [TestMethod]
+        public void TestMethod1() => LogToFile(nameof(TestMethod1));
+
+        [TestMethod]
+        public void TestMethod2() => LogToFile(nameof(TestMethod2));
+
+        [TestMethod]
+        public void TestMethod3() => LogToFile(nameof(TestMethod3));
+
+        [TestMethod]
+        public void TestMethod4() => LogToFile(nameof(TestMethod4));
+
+        [TestMethod]
+        public void TestMethod5() => LogToFile(nameof(TestMethod5));
+
+        [TestMethod]
+        public void TestMethod6() => LogToFile(nameof(TestMethod6));
+
+        [TestMethod]
+        public void TestMethod7() => LogToFile(nameof(TestMethod7));
+
+        [TestMethod]
+        public void TestMethod8() => LogToFile(nameof(TestMethod8));
+
+        [TestMethod]
+        public void TestMethod9() => LogToFile(nameof(TestMethod9));
+
+        [TestMethod]
+        public void TestMethod10() => LogToFile(nameof(TestMethod10));
+    }
+}
diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj
index 264e952756..11e097b528 100644
Binary files a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj and b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj differ
diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs b/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs
index a7b364d9a0..587a62af3b 100644
--- a/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs
+++ b/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs
@@ -1,85 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using System;
-using System.IO;
-using System.Net.Security;
-using System.Security.Authentication;
+
 using Xunit;
 
 namespace MultitargetedNetFrameworkProject
 {
     public class UnitTest1
     {
-
-#if NET451
-        public string TargetFramework { get; } = "NET451";
-#endif
-
-#if NET452
-        public string TargetFramework { get; }  = "NET452";
-#endif
-
-#if NET46
-        public string TargetFramework { get; }  = "NET46";
-#endif
-
-#if NET461
-        public string TargetFramework { get; }  = "NET461";
-#endif
-
 #if NET462
-        public string TargetFramework { get; }  = "NET462";
+        public string TargetFramework { get; } = "NET462";
 #endif
 
 #if NET47
-        public string TargetFramework { get; }  = "NET47";
+        public string TargetFramework { get; } = "NET47";
 #endif
 
 #if NET471
-        public string TargetFramework { get; }  = "NET471";
+        public string TargetFramework { get; } = "NET471";
 #endif
 
 #if NET472
-        public string TargetFramework { get; }  = "NET472";
+        public string TargetFramework { get; } = "NET472";
 #endif
 
 #if NET48
-        public string TargetFramework { get; }  = "NET48";
+        public string TargetFramework { get; } = "NET48";
 #endif
-        // Using xUnit here because MSTest uses AppDomains by default and fixes this problem for us
-        // as long as the appdomains are enabled and modern .NET Framework is installed.
         [Fact]
         public void FailsUntilNet462ButPassesOnNewerNetFramework()
         {
-            Exception exception = null;
-            try
-            {
-                MemoryStream stream = new MemoryStream();
-                SslStream sslStream = new SslStream(stream);
-
-                // this throws SSLException on net451-net462, on net471 onwards it passes so we can use it to test that we target correctly
-                sslStream.BeginAuthenticateAsClient("microsoft.com", null, SslProtocols.None, false, new AsyncCallback(ProcessInformation), null);
-            }
-            catch (Exception ex)
-            {
-                exception = ex;
-            }
+            var expected = Environment.GetEnvironmentVariable("EXPECTED_TARGET_FRAMEWORK");
 
-            switch (this.TargetFramework)
-            {
-                case "NET451":
-                case "NET452":
-                case "NET46":
-                case "NET461":
-                case "NET462":
-                    Assert.NotNull(exception);
-                    break;
-                default:
-                    Assert.Null(exception);
-                    break;
-            }
-        }
-
-        static void ProcessInformation(IAsyncResult result)
-        {
+            Assert.Equal(expected, TargetFramework, ignoreCase: true);
         }
     }
 }
diff --git a/test/TestAssets/NUTestProject/Class1.cs b/test/TestAssets/NUTestProject/Class1.cs
index ec97dd18bf..4917511817 100644
--- a/test/TestAssets/NUTestProject/Class1.cs
+++ b/test/TestAssets/NUTestProject/Class1.cs
@@ -1,20 +1,22 @@
-using NUnit.Framework;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace NUnitTestProject
+using NUnit.Framework;
+
+namespace NUnitTestProject;
+
+[TestFixture]
+public class NUnitTest1
 {
-    [TestFixture]
-    public class NUnitTest1
+    [Test]
+    public void PassTestMethod1()
     {
-        [Test]
-        public void PassTestMethod1()
-        {
-            Assert.AreEqual(5, 5);
-        }
+        Assert.AreEqual(5, 5);
+    }
 
-        [Test]
-        public void FailTestMethod1()
-        {
-            Assert.AreEqual(5, 6);
-        }
+    [Test]
+    public void FailTestMethod1()
+    {
+        Assert.AreEqual(5, 6);
     }
 }
diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj
index 17f1b47419..731bd2c81d 100644
--- a/test/TestAssets/NUTestProject/NUTestProject.csproj
+++ b/test/TestAssets/NUTestProject/NUTestProject.csproj
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <AssemblyName>NUTestProject</AssemblyName>
   </PropertyGroup>
 
@@ -18,7 +14,7 @@
       <Version>$(NUnit3AdapterVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk">
-      <Version>$(NETTestSdkVersion)</Version>
+      <Version>$(PackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/test/TestAssets/NetStandard2Library/Class1.cs b/test/TestAssets/NetStandard2Library/Class1.cs
new file mode 100644
index 0000000000..036fa82d3a
--- /dev/null
+++ b/test/TestAssets/NetStandard2Library/Class1.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace NetStandard2Library;
+
+public class Class1
+{
+
+}
diff --git a/test/TestAssets/NetStandard2Library/NetStandard2Library.csproj b/test/TestAssets/NetStandard2Library/NetStandard2Library.csproj
new file mode 100644
index 0000000000..9f5c4f4abb
--- /dev/null
+++ b/test/TestAssets/NetStandard2Library/NetStandard2Library.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/TestAssets/NewtonSoftDependency/App.config b/test/TestAssets/NewtonSoftDependency/App.config
index 776d09c68c..f71f97e6bb 100644
--- a/test/TestAssets/NewtonSoftDependency/App.config
+++ b/test/TestAssets/NewtonSoftDependency/App.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
index b7bddcb34c..598ecfb843 100644
--- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
+++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
     <AssemblyName>NewtonSoftDependency</AssemblyName>
-    <TargetFrameworks>net451</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFramework) == 'true' ">Exe</OutputType>
   </PropertyGroup>
 
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System" />
     <Reference Include="System.Runtime" />
     <Reference Include="Microsoft.CSharp" />
@@ -24,9 +21,11 @@
 
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
+    <!-- TODO: This version would ideally be higher than the newtonsoft version we use in TP to show that the higher version is used.
+    Currently there is no higher stable version. -->
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/NewtonSoftDependency/UnitTest1.cs b/test/TestAssets/NewtonSoftDependency/UnitTest1.cs
index 522f819653..b18567b985 100644
--- a/test/TestAssets/NewtonSoftDependency/UnitTest1.cs
+++ b/test/TestAssets/NewtonSoftDependency/UnitTest1.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Newtonsoft.Json;
 
 namespace NewtonSoftDependency
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Newtonsoft.Json;
-    
     public class Account
     {
         public string Email { get; set; }
diff --git a/test/TestAssets/NonDll.TestAdapter/NonDll.TestAdapter.csproj b/test/TestAssets/NonDll.TestAdapter/NonDll.TestAdapter.csproj
new file mode 100644
index 0000000000..9f585892a3
--- /dev/null
+++ b/test/TestAssets/NonDll.TestAdapter/NonDll.TestAdapter.csproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/NonDll.TestAdapter/TestAdapter.cs b/test/TestAssets/NonDll.TestAdapter/TestAdapter.cs
new file mode 100644
index 0000000000..b1811d25e4
--- /dev/null
+++ b/test/TestAssets/NonDll.TestAdapter/TestAdapter.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace NonDll.TestAdapter;
+[FileExtension(".js")]
+[DefaultExecutorUri(Uri)]
+[ExtensionUri(Uri)]
+public class TestAdapter : ITestExecutor, ITestDiscoverer
+{
+    public const string Uri = "executor://nondll.testadapter";
+
+    public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discoveryContext,
+        IMessageLogger logger, ITestCaseDiscoverySink discoverySink)
+    {
+        var count = 1;
+        foreach (var source in sources)
+        {
+            TestCase testCase = new()
+            {
+                Source = source,
+                CodeFilePath = source,
+                DisplayName = $"Test{count++}",
+                ExecutorUri = new Uri(Uri),
+            };
+            discoverySink.SendTestCase(testCase);
+        }
+    }
+
+    public void Cancel()
+    {
+    }
+
+    public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
+    {
+        foreach (var test in tests)
+        {
+            TestResult testResult = new(test)
+            {
+                Outcome = TestOutcome.Passed,
+            };
+            frameworkHandle.RecordResult(testResult);
+        }
+    }
+
+    public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
+    {
+        var count = 1;
+        foreach (var source in sources)
+        {
+            TestCase testCase = new()
+            {
+                Source = source,
+                CodeFilePath = source,
+                DisplayName = $"Test{count++}",
+                ExecutorUri = new Uri(Uri),
+            };
+            TestResult testResult = new(testCase)
+            {
+                Outcome = TestOutcome.Passed,
+            };
+            frameworkHandle.RecordResult(testResult);
+        }
+    }
+}
diff --git a/test/TestAssets/NuGet.config b/test/TestAssets/NuGet.config
deleted file mode 100644
index 6f8bd3e5a2..0000000000
--- a/test/TestAssets/NuGet.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageRestore>
-    <add key="enabled" value="True" />
-  </packageRestore>
-  <packageSources>
-    <clear /> 
-    <add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
-    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-  </packageSources>
-  <fallbackPackageFolders>
-    <clear />
-  </fallbackPackageFolders>
-</configuration>
diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj
index f172b1ecb5..586f788a0c 100644
--- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj
+++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <Version>15.0.0.0</Version>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
+    <ProjectReference Include="$(RepoRoot)\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
   </ItemGroup>
 </Project>
diff --git a/test/TestAssets/OutOfProcDataCollector/SampleDataCollector.cs b/test/TestAssets/OutOfProcDataCollector/SampleDataCollector.cs
index 0422dad3ee..ab1be46dbe 100644
--- a/test/TestAssets/OutOfProcDataCollector/SampleDataCollector.cs
+++ b/test/TestAssets/OutOfProcDataCollector/SampleDataCollector.cs
@@ -1,76 +1,76 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace OutOfProcDataCollector
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
+namespace OutOfProcDataCollector
+{
     [DataCollectorFriendlyName("SampleDataCollector")]
     [DataCollectorTypeUri("my://sample/datacollector")]
     public class SampleDataCollector : DataCollector, ITestExecutionEnvironmentSpecifier
     {
-        int i = 0;
-        private DataCollectionSink dataCollectionSink;
-        private DataCollectionEnvironmentContext context;
-        private DataCollectionLogger logger;
-        private string tempDirectoryPath = Path.GetTempPath();
+        int _i;
+        private DataCollectionSink? _dataCollectionSink;
+        private DataCollectionEnvironmentContext? _context;
+        private DataCollectionLogger? _logger;
+        private readonly string _tempDirectoryPath = Environment.GetEnvironmentVariable("TEST_ASSET_SAMPLE_COLLECTOR_PATH") ?? Path.GetTempPath();
 
         public override void Initialize(
-            System.Xml.XmlElement configurationElement,
+            System.Xml.XmlElement? configurationElement,
             DataCollectionEvents events,
             DataCollectionSink dataSink,
             DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
+            DataCollectionEnvironmentContext? environmentContext)
         {
 
-            events.TestHostLaunched += this.TestHostLaunched_Handler;
-            events.SessionStart += this.SessionStarted_Handler;
-            events.SessionEnd += this.SessionEnded_Handler;
-            events.TestCaseStart += this.Events_TestCaseStart;
-            events.TestCaseEnd += this.Events_TestCaseEnd;
-            this.dataCollectionSink = dataSink;
-            this.context = environmentContext;
-            this.logger = logger;
+            events.TestHostLaunched += TestHostLaunched_Handler;
+            events.SessionStart += SessionStarted_Handler;
+            events.SessionEnd += SessionEnded_Handler;
+            events.TestCaseStart += Events_TestCaseStart;
+            events.TestCaseEnd += Events_TestCaseEnd;
+            _dataCollectionSink = dataSink;
+            _context = environmentContext;
+            _logger = logger;
         }
 
-        private void Events_TestCaseEnd(object sender, TestCaseEndEventArgs e)
+        private void Events_TestCaseEnd(object? sender, TestCaseEndEventArgs e)
         {
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "TestCaseEnded " + e.TestCaseName);
+            _logger!.LogWarning(_context!.SessionDataCollectionContext, "TestCaseEnded " + e.TestCaseName);
         }
 
-        private void Events_TestCaseStart(object sender, TestCaseStartEventArgs e)
+        private void Events_TestCaseStart(object? sender, TestCaseStartEventArgs e)
         {
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "TestCaseStarted " + e.TestCaseName);
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "TestCaseStarted " + e.TestElement.FullyQualifiedName);
-            var filename = Path.Combine(this.tempDirectoryPath, "testcasefilename" + i++ + ".txt");
+            _logger!.LogWarning(_context!.SessionDataCollectionContext, "TestCaseStarted " + e.TestCaseName);
+            _logger.LogWarning(_context.SessionDataCollectionContext, "TestCaseStarted " + e.TestElement!.FullyQualifiedName);
+            var filename = Path.Combine(_tempDirectoryPath, "testcasefilename" + _i++ + ".txt");
             File.WriteAllText(filename, string.Empty);
-            this.dataCollectionSink.SendFileAsync(e.Context, filename, true);
+            _dataCollectionSink!.SendFileAsync(e.Context, filename, true);
         }
 
-        private void SessionStarted_Handler(object sender, SessionStartEventArgs args)
+        private void SessionStarted_Handler(object? sender, SessionStartEventArgs args)
         {
-            var filename = Path.Combine(this.tempDirectoryPath, "filename.txt");
+            var filename = Path.Combine(_tempDirectoryPath, "filename.txt");
             File.WriteAllText(filename, string.Empty);
-            this.dataCollectionSink.SendFileAsync(this.context.SessionDataCollectionContext, filename, true);
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "SessionStarted");
+            _dataCollectionSink!.SendFileAsync(_context!.SessionDataCollectionContext, filename, true);
+            _logger!.LogWarning(_context.SessionDataCollectionContext, "SessionStarted");
         }
 
-        private void SessionEnded_Handler(object sender, SessionEndEventArgs args)
+        private void SessionEnded_Handler(object? sender, SessionEndEventArgs args)
         {
-            this.logger.LogError(this.context.SessionDataCollectionContext, new Exception("my exception"));
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "my warning");
-            this.logger.LogException(this.context.SessionDataCollectionContext, new Exception("abc"), DataCollectorMessageLevel.Error);
+            _logger!.LogError(_context!.SessionDataCollectionContext, new Exception("my exception"));
+            _logger.LogWarning(_context.SessionDataCollectionContext, "my warning");
+            _logger.LogException(_context.SessionDataCollectionContext, new Exception("abc"), DataCollectorMessageLevel.Error);
 
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "SessionEnded");
+            _logger.LogWarning(_context.SessionDataCollectionContext, "SessionEnded");
         }
 
-        private void TestHostLaunched_Handler(object sender, TestHostLaunchedEventArgs e)
+        private void TestHostLaunched_Handler(object? sender, TestHostLaunchedEventArgs e)
         {
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "TestHostLaunched " + e.TestHostProcessId);
+            _logger!.LogWarning(_context!.SessionDataCollectionContext, "TestHostLaunched " + e.TestHostProcessId);
         }
 
         public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
@@ -80,7 +80,8 @@ public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVari
 
         protected override void Dispose(bool disposing)
         {
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "Dispose called.");
+            _logger!.LogWarning(_context!.SessionDataCollectionContext, "Dispose called.");
+            base.Dispose(disposing);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/TestAssets/OutputtingTestProject/OutputtingTestProject.csproj b/test/TestAssets/OutputtingTestProject/OutputtingTestProject.csproj
new file mode 100644
index 0000000000..9d5a70e0fa
--- /dev/null
+++ b/test/TestAssets/OutputtingTestProject/OutputtingTestProject.csproj
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+    <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)"/>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/OutputtingTestProject/UnitTest1.cs b/test/TestAssets/OutputtingTestProject/UnitTest1.cs
new file mode 100644
index 0000000000..d71da20d2a
--- /dev/null
+++ b/test/TestAssets/OutputtingTestProject/UnitTest1.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using System;
+using System.IO;
+
+namespace OutputtingTestProject;
+
+[TestClass]
+public class UnitTest1
+{
+    [TestMethod]
+    public void TestThatWritesOutput()
+    {
+        // This is a trick to bypass the console output capturing that MSTest does, and write directly
+        // to console output. The same bypass can be configured by <MSTest><CaptureTraceOutput>false</CaptureTraceOutput></MSTest>
+        // in MSTest 3.3.2 and newer.
+        using StreamWriter writer = new StreamWriter(Console.OpenStandardOutput());
+        writer.WriteLine("MY OUTPUT FROM TEST");
+    }
+}
diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj
index 5f7d6ec0d0..0999951177 100644
Binary files a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj and b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj differ
diff --git a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj
deleted file mode 100644
index 47c125a329..0000000000
--- a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <Import Project="..\..\..\..\scripts\build\TestAssets.props" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestAdapterVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="MSTests.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>MSTests.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="MSTests.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>MSTests.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-</Project>
diff --git a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.cs b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.cs
deleted file mode 100644
index b544f41cd7..0000000000
--- a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.cs
+++ /dev/null
@@ -1,40017 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTestinProgress
-{
-    [TestClass]
-	public class MSTests
-    {
-
-		#region PassingTests
-		[TestMethod]
-		public void Test_01()
-		{
-		}
-		[TestMethod]
-		public void Test_02()
-		{
-		}
-		[TestMethod]
-		public void Test_03()
-		{
-		}
-		[TestMethod]
-		public void Test_04()
-		{
-		}
-		[TestMethod]
-		public void Test_05()
-		{
-		}
-		[TestMethod]
-		public void Test_06()
-		{
-		}
-		[TestMethod]
-		public void Test_07()
-		{
-		}
-		[TestMethod]
-		public void Test_08()
-		{
-		}
-		[TestMethod]
-		public void Test_09()
-		{
-		}
-		[TestMethod]
-		public void Test_10()
-		{
-		}
-		[TestMethod]
-		public void Test_11()
-		{
-		}
-		[TestMethod]
-		public void Test_12()
-		{
-		}
-		[TestMethod]
-		public void Test_13()
-		{
-		}
-		[TestMethod]
-		public void Test_14()
-		{
-		}
-		[TestMethod]
-		public void Test_15()
-		{
-		}
-		[TestMethod]
-		public void Test_16()
-		{
-		}
-		[TestMethod]
-		public void Test_17()
-		{
-		}
-		[TestMethod]
-		public void Test_18()
-		{
-		}
-		[TestMethod]
-		public void Test_19()
-		{
-		}
-		[TestMethod]
-		public void Test_20()
-		{
-		}
-		[TestMethod]
-		public void Test_21()
-		{
-		}
-		[TestMethod]
-		public void Test_22()
-		{
-		}
-		[TestMethod]
-		public void Test_23()
-		{
-		}
-		[TestMethod]
-		public void Test_24()
-		{
-		}
-		[TestMethod]
-		public void Test_25()
-		{
-		}
-		[TestMethod]
-		public void Test_26()
-		{
-		}
-		[TestMethod]
-		public void Test_27()
-		{
-		}
-		[TestMethod]
-		public void Test_28()
-		{
-		}
-		[TestMethod]
-		public void Test_29()
-		{
-		}
-		[TestMethod]
-		public void Test_30()
-		{
-		}
-		[TestMethod]
-		public void Test_31()
-		{
-		}
-		[TestMethod]
-		public void Test_32()
-		{
-		}
-		[TestMethod]
-		public void Test_33()
-		{
-		}
-		[TestMethod]
-		public void Test_34()
-		{
-		}
-		[TestMethod]
-		public void Test_35()
-		{
-		}
-		[TestMethod]
-		public void Test_36()
-		{
-		}
-		[TestMethod]
-		public void Test_37()
-		{
-		}
-		[TestMethod]
-		public void Test_38()
-		{
-		}
-		[TestMethod]
-		public void Test_39()
-		{
-		}
-		[TestMethod]
-		public void Test_40()
-		{
-		}
-		[TestMethod]
-		public void Test_41()
-		{
-		}
-		[TestMethod]
-		public void Test_42()
-		{
-		}
-		[TestMethod]
-		public void Test_43()
-		{
-		}
-		[TestMethod]
-		public void Test_44()
-		{
-		}
-		[TestMethod]
-		public void Test_45()
-		{
-		}
-		[TestMethod]
-		public void Test_46()
-		{
-		}
-		[TestMethod]
-		public void Test_47()
-		{
-		}
-		[TestMethod]
-		public void Test_48()
-		{
-		}
-		[TestMethod]
-		public void Test_49()
-		{
-		}
-		[TestMethod]
-		public void Test_50()
-		{
-		}
-		[TestMethod]
-		public void Test_51()
-		{
-		}
-		[TestMethod]
-		public void Test_52()
-		{
-		}
-		[TestMethod]
-		public void Test_53()
-		{
-		}
-		[TestMethod]
-		public void Test_54()
-		{
-		}
-		[TestMethod]
-		public void Test_55()
-		{
-		}
-		[TestMethod]
-		public void Test_56()
-		{
-		}
-		[TestMethod]
-		public void Test_57()
-		{
-		}
-		[TestMethod]
-		public void Test_58()
-		{
-		}
-		[TestMethod]
-		public void Test_59()
-		{
-		}
-		[TestMethod]
-		public void Test_60()
-		{
-		}
-		[TestMethod]
-		public void Test_61()
-		{
-		}
-		[TestMethod]
-		public void Test_62()
-		{
-		}
-		[TestMethod]
-		public void Test_63()
-		{
-		}
-		[TestMethod]
-		public void Test_64()
-		{
-		}
-		[TestMethod]
-		public void Test_65()
-		{
-		}
-		[TestMethod]
-		public void Test_66()
-		{
-		}
-		[TestMethod]
-		public void Test_67()
-		{
-		}
-		[TestMethod]
-		public void Test_68()
-		{
-		}
-		[TestMethod]
-		public void Test_69()
-		{
-		}
-		[TestMethod]
-		public void Test_70()
-		{
-		}
-		[TestMethod]
-		public void Test_71()
-		{
-		}
-		[TestMethod]
-		public void Test_72()
-		{
-		}
-		[TestMethod]
-		public void Test_73()
-		{
-		}
-		[TestMethod]
-		public void Test_74()
-		{
-		}
-		[TestMethod]
-		public void Test_75()
-		{
-		}
-		[TestMethod]
-		public void Test_76()
-		{
-		}
-		[TestMethod]
-		public void Test_77()
-		{
-		}
-		[TestMethod]
-		public void Test_78()
-		{
-		}
-		[TestMethod]
-		public void Test_79()
-		{
-		}
-		[TestMethod]
-		public void Test_80()
-		{
-		}
-		[TestMethod]
-		public void Test_81()
-		{
-		}
-		[TestMethod]
-		public void Test_82()
-		{
-		}
-		[TestMethod]
-		public void Test_83()
-		{
-		}
-		[TestMethod]
-		public void Test_84()
-		{
-		}
-		[TestMethod]
-		public void Test_85()
-		{
-		}
-		[TestMethod]
-		public void Test_86()
-		{
-		}
-		[TestMethod]
-		public void Test_87()
-		{
-		}
-		[TestMethod]
-		public void Test_88()
-		{
-		}
-		[TestMethod]
-		public void Test_89()
-		{
-		}
-		[TestMethod]
-		public void Test_90()
-		{
-		}
-		[TestMethod]
-		public void Test_91()
-		{
-		}
-		[TestMethod]
-		public void Test_92()
-		{
-		}
-		[TestMethod]
-		public void Test_93()
-		{
-		}
-		[TestMethod]
-		public void Test_94()
-		{
-		}
-		[TestMethod]
-		public void Test_95()
-		{
-		}
-		[TestMethod]
-		public void Test_96()
-		{
-		}
-		[TestMethod]
-		public void Test_97()
-		{
-		}
-		[TestMethod]
-		public void Test_98()
-		{
-		}
-		[TestMethod]
-		public void Test_99()
-		{
-		}
-		[TestMethod]
-		public void Test_100()
-		{
-		}
-		[TestMethod]
-		public void Test_101()
-		{
-		}
-		[TestMethod]
-		public void Test_102()
-		{
-		}
-		[TestMethod]
-		public void Test_103()
-		{
-		}
-		[TestMethod]
-		public void Test_104()
-		{
-		}
-		[TestMethod]
-		public void Test_105()
-		{
-		}
-		[TestMethod]
-		public void Test_106()
-		{
-		}
-		[TestMethod]
-		public void Test_107()
-		{
-		}
-		[TestMethod]
-		public void Test_108()
-		{
-		}
-		[TestMethod]
-		public void Test_109()
-		{
-		}
-		[TestMethod]
-		public void Test_110()
-		{
-		}
-		[TestMethod]
-		public void Test_111()
-		{
-		}
-		[TestMethod]
-		public void Test_112()
-		{
-		}
-		[TestMethod]
-		public void Test_113()
-		{
-		}
-		[TestMethod]
-		public void Test_114()
-		{
-		}
-		[TestMethod]
-		public void Test_115()
-		{
-		}
-		[TestMethod]
-		public void Test_116()
-		{
-		}
-		[TestMethod]
-		public void Test_117()
-		{
-		}
-		[TestMethod]
-		public void Test_118()
-		{
-		}
-		[TestMethod]
-		public void Test_119()
-		{
-		}
-		[TestMethod]
-		public void Test_120()
-		{
-		}
-		[TestMethod]
-		public void Test_121()
-		{
-		}
-		[TestMethod]
-		public void Test_122()
-		{
-		}
-		[TestMethod]
-		public void Test_123()
-		{
-		}
-		[TestMethod]
-		public void Test_124()
-		{
-		}
-		[TestMethod]
-		public void Test_125()
-		{
-		}
-		[TestMethod]
-		public void Test_126()
-		{
-		}
-		[TestMethod]
-		public void Test_127()
-		{
-		}
-		[TestMethod]
-		public void Test_128()
-		{
-		}
-		[TestMethod]
-		public void Test_129()
-		{
-		}
-		[TestMethod]
-		public void Test_130()
-		{
-		}
-		[TestMethod]
-		public void Test_131()
-		{
-		}
-		[TestMethod]
-		public void Test_132()
-		{
-		}
-		[TestMethod]
-		public void Test_133()
-		{
-		}
-		[TestMethod]
-		public void Test_134()
-		{
-		}
-		[TestMethod]
-		public void Test_135()
-		{
-		}
-		[TestMethod]
-		public void Test_136()
-		{
-		}
-		[TestMethod]
-		public void Test_137()
-		{
-		}
-		[TestMethod]
-		public void Test_138()
-		{
-		}
-		[TestMethod]
-		public void Test_139()
-		{
-		}
-		[TestMethod]
-		public void Test_140()
-		{
-		}
-		[TestMethod]
-		public void Test_141()
-		{
-		}
-		[TestMethod]
-		public void Test_142()
-		{
-		}
-		[TestMethod]
-		public void Test_143()
-		{
-		}
-		[TestMethod]
-		public void Test_144()
-		{
-		}
-		[TestMethod]
-		public void Test_145()
-		{
-		}
-		[TestMethod]
-		public void Test_146()
-		{
-		}
-		[TestMethod]
-		public void Test_147()
-		{
-		}
-		[TestMethod]
-		public void Test_148()
-		{
-		}
-		[TestMethod]
-		public void Test_149()
-		{
-		}
-		[TestMethod]
-		public void Test_150()
-		{
-		}
-		[TestMethod]
-		public void Test_151()
-		{
-		}
-		[TestMethod]
-		public void Test_152()
-		{
-		}
-		[TestMethod]
-		public void Test_153()
-		{
-		}
-		[TestMethod]
-		public void Test_154()
-		{
-		}
-		[TestMethod]
-		public void Test_155()
-		{
-		}
-		[TestMethod]
-		public void Test_156()
-		{
-		}
-		[TestMethod]
-		public void Test_157()
-		{
-		}
-		[TestMethod]
-		public void Test_158()
-		{
-		}
-		[TestMethod]
-		public void Test_159()
-		{
-		}
-		[TestMethod]
-		public void Test_160()
-		{
-		}
-		[TestMethod]
-		public void Test_161()
-		{
-		}
-		[TestMethod]
-		public void Test_162()
-		{
-		}
-		[TestMethod]
-		public void Test_163()
-		{
-		}
-		[TestMethod]
-		public void Test_164()
-		{
-		}
-		[TestMethod]
-		public void Test_165()
-		{
-		}
-		[TestMethod]
-		public void Test_166()
-		{
-		}
-		[TestMethod]
-		public void Test_167()
-		{
-		}
-		[TestMethod]
-		public void Test_168()
-		{
-		}
-		[TestMethod]
-		public void Test_169()
-		{
-		}
-		[TestMethod]
-		public void Test_170()
-		{
-		}
-		[TestMethod]
-		public void Test_171()
-		{
-		}
-		[TestMethod]
-		public void Test_172()
-		{
-		}
-		[TestMethod]
-		public void Test_173()
-		{
-		}
-		[TestMethod]
-		public void Test_174()
-		{
-		}
-		[TestMethod]
-		public void Test_175()
-		{
-		}
-		[TestMethod]
-		public void Test_176()
-		{
-		}
-		[TestMethod]
-		public void Test_177()
-		{
-		}
-		[TestMethod]
-		public void Test_178()
-		{
-		}
-		[TestMethod]
-		public void Test_179()
-		{
-		}
-		[TestMethod]
-		public void Test_180()
-		{
-		}
-		[TestMethod]
-		public void Test_181()
-		{
-		}
-		[TestMethod]
-		public void Test_182()
-		{
-		}
-		[TestMethod]
-		public void Test_183()
-		{
-		}
-		[TestMethod]
-		public void Test_184()
-		{
-		}
-		[TestMethod]
-		public void Test_185()
-		{
-		}
-		[TestMethod]
-		public void Test_186()
-		{
-		}
-		[TestMethod]
-		public void Test_187()
-		{
-		}
-		[TestMethod]
-		public void Test_188()
-		{
-		}
-		[TestMethod]
-		public void Test_189()
-		{
-		}
-		[TestMethod]
-		public void Test_190()
-		{
-		}
-		[TestMethod]
-		public void Test_191()
-		{
-		}
-		[TestMethod]
-		public void Test_192()
-		{
-		}
-		[TestMethod]
-		public void Test_193()
-		{
-		}
-		[TestMethod]
-		public void Test_194()
-		{
-		}
-		[TestMethod]
-		public void Test_195()
-		{
-		}
-		[TestMethod]
-		public void Test_196()
-		{
-		}
-		[TestMethod]
-		public void Test_197()
-		{
-		}
-		[TestMethod]
-		public void Test_198()
-		{
-		}
-		[TestMethod]
-		public void Test_199()
-		{
-		}
-		[TestMethod]
-		public void Test_200()
-		{
-		}
-		[TestMethod]
-		public void Test_201()
-		{
-		}
-		[TestMethod]
-		public void Test_202()
-		{
-		}
-		[TestMethod]
-		public void Test_203()
-		{
-		}
-		[TestMethod]
-		public void Test_204()
-		{
-		}
-		[TestMethod]
-		public void Test_205()
-		{
-		}
-		[TestMethod]
-		public void Test_206()
-		{
-		}
-		[TestMethod]
-		public void Test_207()
-		{
-		}
-		[TestMethod]
-		public void Test_208()
-		{
-		}
-		[TestMethod]
-		public void Test_209()
-		{
-		}
-		[TestMethod]
-		public void Test_210()
-		{
-		}
-		[TestMethod]
-		public void Test_211()
-		{
-		}
-		[TestMethod]
-		public void Test_212()
-		{
-		}
-		[TestMethod]
-		public void Test_213()
-		{
-		}
-		[TestMethod]
-		public void Test_214()
-		{
-		}
-		[TestMethod]
-		public void Test_215()
-		{
-		}
-		[TestMethod]
-		public void Test_216()
-		{
-		}
-		[TestMethod]
-		public void Test_217()
-		{
-		}
-		[TestMethod]
-		public void Test_218()
-		{
-		}
-		[TestMethod]
-		public void Test_219()
-		{
-		}
-		[TestMethod]
-		public void Test_220()
-		{
-		}
-		[TestMethod]
-		public void Test_221()
-		{
-		}
-		[TestMethod]
-		public void Test_222()
-		{
-		}
-		[TestMethod]
-		public void Test_223()
-		{
-		}
-		[TestMethod]
-		public void Test_224()
-		{
-		}
-		[TestMethod]
-		public void Test_225()
-		{
-		}
-		[TestMethod]
-		public void Test_226()
-		{
-		}
-		[TestMethod]
-		public void Test_227()
-		{
-		}
-		[TestMethod]
-		public void Test_228()
-		{
-		}
-		[TestMethod]
-		public void Test_229()
-		{
-		}
-		[TestMethod]
-		public void Test_230()
-		{
-		}
-		[TestMethod]
-		public void Test_231()
-		{
-		}
-		[TestMethod]
-		public void Test_232()
-		{
-		}
-		[TestMethod]
-		public void Test_233()
-		{
-		}
-		[TestMethod]
-		public void Test_234()
-		{
-		}
-		[TestMethod]
-		public void Test_235()
-		{
-		}
-		[TestMethod]
-		public void Test_236()
-		{
-		}
-		[TestMethod]
-		public void Test_237()
-		{
-		}
-		[TestMethod]
-		public void Test_238()
-		{
-		}
-		[TestMethod]
-		public void Test_239()
-		{
-		}
-		[TestMethod]
-		public void Test_240()
-		{
-		}
-		[TestMethod]
-		public void Test_241()
-		{
-		}
-		[TestMethod]
-		public void Test_242()
-		{
-		}
-		[TestMethod]
-		public void Test_243()
-		{
-		}
-		[TestMethod]
-		public void Test_244()
-		{
-		}
-		[TestMethod]
-		public void Test_245()
-		{
-		}
-		[TestMethod]
-		public void Test_246()
-		{
-		}
-		[TestMethod]
-		public void Test_247()
-		{
-		}
-		[TestMethod]
-		public void Test_248()
-		{
-		}
-		[TestMethod]
-		public void Test_249()
-		{
-		}
-		[TestMethod]
-		public void Test_250()
-		{
-		}
-		[TestMethod]
-		public void Test_251()
-		{
-		}
-		[TestMethod]
-		public void Test_252()
-		{
-		}
-		[TestMethod]
-		public void Test_253()
-		{
-		}
-		[TestMethod]
-		public void Test_254()
-		{
-		}
-		[TestMethod]
-		public void Test_255()
-		{
-		}
-		[TestMethod]
-		public void Test_256()
-		{
-		}
-		[TestMethod]
-		public void Test_257()
-		{
-		}
-		[TestMethod]
-		public void Test_258()
-		{
-		}
-		[TestMethod]
-		public void Test_259()
-		{
-		}
-		[TestMethod]
-		public void Test_260()
-		{
-		}
-		[TestMethod]
-		public void Test_261()
-		{
-		}
-		[TestMethod]
-		public void Test_262()
-		{
-		}
-		[TestMethod]
-		public void Test_263()
-		{
-		}
-		[TestMethod]
-		public void Test_264()
-		{
-		}
-		[TestMethod]
-		public void Test_265()
-		{
-		}
-		[TestMethod]
-		public void Test_266()
-		{
-		}
-		[TestMethod]
-		public void Test_267()
-		{
-		}
-		[TestMethod]
-		public void Test_268()
-		{
-		}
-		[TestMethod]
-		public void Test_269()
-		{
-		}
-		[TestMethod]
-		public void Test_270()
-		{
-		}
-		[TestMethod]
-		public void Test_271()
-		{
-		}
-		[TestMethod]
-		public void Test_272()
-		{
-		}
-		[TestMethod]
-		public void Test_273()
-		{
-		}
-		[TestMethod]
-		public void Test_274()
-		{
-		}
-		[TestMethod]
-		public void Test_275()
-		{
-		}
-		[TestMethod]
-		public void Test_276()
-		{
-		}
-		[TestMethod]
-		public void Test_277()
-		{
-		}
-		[TestMethod]
-		public void Test_278()
-		{
-		}
-		[TestMethod]
-		public void Test_279()
-		{
-		}
-		[TestMethod]
-		public void Test_280()
-		{
-		}
-		[TestMethod]
-		public void Test_281()
-		{
-		}
-		[TestMethod]
-		public void Test_282()
-		{
-		}
-		[TestMethod]
-		public void Test_283()
-		{
-		}
-		[TestMethod]
-		public void Test_284()
-		{
-		}
-		[TestMethod]
-		public void Test_285()
-		{
-		}
-		[TestMethod]
-		public void Test_286()
-		{
-		}
-		[TestMethod]
-		public void Test_287()
-		{
-		}
-		[TestMethod]
-		public void Test_288()
-		{
-		}
-		[TestMethod]
-		public void Test_289()
-		{
-		}
-		[TestMethod]
-		public void Test_290()
-		{
-		}
-		[TestMethod]
-		public void Test_291()
-		{
-		}
-		[TestMethod]
-		public void Test_292()
-		{
-		}
-		[TestMethod]
-		public void Test_293()
-		{
-		}
-		[TestMethod]
-		public void Test_294()
-		{
-		}
-		[TestMethod]
-		public void Test_295()
-		{
-		}
-		[TestMethod]
-		public void Test_296()
-		{
-		}
-		[TestMethod]
-		public void Test_297()
-		{
-		}
-		[TestMethod]
-		public void Test_298()
-		{
-		}
-		[TestMethod]
-		public void Test_299()
-		{
-		}
-		[TestMethod]
-		public void Test_300()
-		{
-		}
-		[TestMethod]
-		public void Test_301()
-		{
-		}
-		[TestMethod]
-		public void Test_302()
-		{
-		}
-		[TestMethod]
-		public void Test_303()
-		{
-		}
-		[TestMethod]
-		public void Test_304()
-		{
-		}
-		[TestMethod]
-		public void Test_305()
-		{
-		}
-		[TestMethod]
-		public void Test_306()
-		{
-		}
-		[TestMethod]
-		public void Test_307()
-		{
-		}
-		[TestMethod]
-		public void Test_308()
-		{
-		}
-		[TestMethod]
-		public void Test_309()
-		{
-		}
-		[TestMethod]
-		public void Test_310()
-		{
-		}
-		[TestMethod]
-		public void Test_311()
-		{
-		}
-		[TestMethod]
-		public void Test_312()
-		{
-		}
-		[TestMethod]
-		public void Test_313()
-		{
-		}
-		[TestMethod]
-		public void Test_314()
-		{
-		}
-		[TestMethod]
-		public void Test_315()
-		{
-		}
-		[TestMethod]
-		public void Test_316()
-		{
-		}
-		[TestMethod]
-		public void Test_317()
-		{
-		}
-		[TestMethod]
-		public void Test_318()
-		{
-		}
-		[TestMethod]
-		public void Test_319()
-		{
-		}
-		[TestMethod]
-		public void Test_320()
-		{
-		}
-		[TestMethod]
-		public void Test_321()
-		{
-		}
-		[TestMethod]
-		public void Test_322()
-		{
-		}
-		[TestMethod]
-		public void Test_323()
-		{
-		}
-		[TestMethod]
-		public void Test_324()
-		{
-		}
-		[TestMethod]
-		public void Test_325()
-		{
-		}
-		[TestMethod]
-		public void Test_326()
-		{
-		}
-		[TestMethod]
-		public void Test_327()
-		{
-		}
-		[TestMethod]
-		public void Test_328()
-		{
-		}
-		[TestMethod]
-		public void Test_329()
-		{
-		}
-		[TestMethod]
-		public void Test_330()
-		{
-		}
-		[TestMethod]
-		public void Test_331()
-		{
-		}
-		[TestMethod]
-		public void Test_332()
-		{
-		}
-		[TestMethod]
-		public void Test_333()
-		{
-		}
-		[TestMethod]
-		public void Test_334()
-		{
-		}
-		[TestMethod]
-		public void Test_335()
-		{
-		}
-		[TestMethod]
-		public void Test_336()
-		{
-		}
-		[TestMethod]
-		public void Test_337()
-		{
-		}
-		[TestMethod]
-		public void Test_338()
-		{
-		}
-		[TestMethod]
-		public void Test_339()
-		{
-		}
-		[TestMethod]
-		public void Test_340()
-		{
-		}
-		[TestMethod]
-		public void Test_341()
-		{
-		}
-		[TestMethod]
-		public void Test_342()
-		{
-		}
-		[TestMethod]
-		public void Test_343()
-		{
-		}
-		[TestMethod]
-		public void Test_344()
-		{
-		}
-		[TestMethod]
-		public void Test_345()
-		{
-		}
-		[TestMethod]
-		public void Test_346()
-		{
-		}
-		[TestMethod]
-		public void Test_347()
-		{
-		}
-		[TestMethod]
-		public void Test_348()
-		{
-		}
-		[TestMethod]
-		public void Test_349()
-		{
-		}
-		[TestMethod]
-		public void Test_350()
-		{
-		}
-		[TestMethod]
-		public void Test_351()
-		{
-		}
-		[TestMethod]
-		public void Test_352()
-		{
-		}
-		[TestMethod]
-		public void Test_353()
-		{
-		}
-		[TestMethod]
-		public void Test_354()
-		{
-		}
-		[TestMethod]
-		public void Test_355()
-		{
-		}
-		[TestMethod]
-		public void Test_356()
-		{
-		}
-		[TestMethod]
-		public void Test_357()
-		{
-		}
-		[TestMethod]
-		public void Test_358()
-		{
-		}
-		[TestMethod]
-		public void Test_359()
-		{
-		}
-		[TestMethod]
-		public void Test_360()
-		{
-		}
-		[TestMethod]
-		public void Test_361()
-		{
-		}
-		[TestMethod]
-		public void Test_362()
-		{
-		}
-		[TestMethod]
-		public void Test_363()
-		{
-		}
-		[TestMethod]
-		public void Test_364()
-		{
-		}
-		[TestMethod]
-		public void Test_365()
-		{
-		}
-		[TestMethod]
-		public void Test_366()
-		{
-		}
-		[TestMethod]
-		public void Test_367()
-		{
-		}
-		[TestMethod]
-		public void Test_368()
-		{
-		}
-		[TestMethod]
-		public void Test_369()
-		{
-		}
-		[TestMethod]
-		public void Test_370()
-		{
-		}
-		[TestMethod]
-		public void Test_371()
-		{
-		}
-		[TestMethod]
-		public void Test_372()
-		{
-		}
-		[TestMethod]
-		public void Test_373()
-		{
-		}
-		[TestMethod]
-		public void Test_374()
-		{
-		}
-		[TestMethod]
-		public void Test_375()
-		{
-		}
-		[TestMethod]
-		public void Test_376()
-		{
-		}
-		[TestMethod]
-		public void Test_377()
-		{
-		}
-		[TestMethod]
-		public void Test_378()
-		{
-		}
-		[TestMethod]
-		public void Test_379()
-		{
-		}
-		[TestMethod]
-		public void Test_380()
-		{
-		}
-		[TestMethod]
-		public void Test_381()
-		{
-		}
-		[TestMethod]
-		public void Test_382()
-		{
-		}
-		[TestMethod]
-		public void Test_383()
-		{
-		}
-		[TestMethod]
-		public void Test_384()
-		{
-		}
-		[TestMethod]
-		public void Test_385()
-		{
-		}
-		[TestMethod]
-		public void Test_386()
-		{
-		}
-		[TestMethod]
-		public void Test_387()
-		{
-		}
-		[TestMethod]
-		public void Test_388()
-		{
-		}
-		[TestMethod]
-		public void Test_389()
-		{
-		}
-		[TestMethod]
-		public void Test_390()
-		{
-		}
-		[TestMethod]
-		public void Test_391()
-		{
-		}
-		[TestMethod]
-		public void Test_392()
-		{
-		}
-		[TestMethod]
-		public void Test_393()
-		{
-		}
-		[TestMethod]
-		public void Test_394()
-		{
-		}
-		[TestMethod]
-		public void Test_395()
-		{
-		}
-		[TestMethod]
-		public void Test_396()
-		{
-		}
-		[TestMethod]
-		public void Test_397()
-		{
-		}
-		[TestMethod]
-		public void Test_398()
-		{
-		}
-		[TestMethod]
-		public void Test_399()
-		{
-		}
-		[TestMethod]
-		public void Test_400()
-		{
-		}
-		[TestMethod]
-		public void Test_401()
-		{
-		}
-		[TestMethod]
-		public void Test_402()
-		{
-		}
-		[TestMethod]
-		public void Test_403()
-		{
-		}
-		[TestMethod]
-		public void Test_404()
-		{
-		}
-		[TestMethod]
-		public void Test_405()
-		{
-		}
-		[TestMethod]
-		public void Test_406()
-		{
-		}
-		[TestMethod]
-		public void Test_407()
-		{
-		}
-		[TestMethod]
-		public void Test_408()
-		{
-		}
-		[TestMethod]
-		public void Test_409()
-		{
-		}
-		[TestMethod]
-		public void Test_410()
-		{
-		}
-		[TestMethod]
-		public void Test_411()
-		{
-		}
-		[TestMethod]
-		public void Test_412()
-		{
-		}
-		[TestMethod]
-		public void Test_413()
-		{
-		}
-		[TestMethod]
-		public void Test_414()
-		{
-		}
-		[TestMethod]
-		public void Test_415()
-		{
-		}
-		[TestMethod]
-		public void Test_416()
-		{
-		}
-		[TestMethod]
-		public void Test_417()
-		{
-		}
-		[TestMethod]
-		public void Test_418()
-		{
-		}
-		[TestMethod]
-		public void Test_419()
-		{
-		}
-		[TestMethod]
-		public void Test_420()
-		{
-		}
-		[TestMethod]
-		public void Test_421()
-		{
-		}
-		[TestMethod]
-		public void Test_422()
-		{
-		}
-		[TestMethod]
-		public void Test_423()
-		{
-		}
-		[TestMethod]
-		public void Test_424()
-		{
-		}
-		[TestMethod]
-		public void Test_425()
-		{
-		}
-		[TestMethod]
-		public void Test_426()
-		{
-		}
-		[TestMethod]
-		public void Test_427()
-		{
-		}
-		[TestMethod]
-		public void Test_428()
-		{
-		}
-		[TestMethod]
-		public void Test_429()
-		{
-		}
-		[TestMethod]
-		public void Test_430()
-		{
-		}
-		[TestMethod]
-		public void Test_431()
-		{
-		}
-		[TestMethod]
-		public void Test_432()
-		{
-		}
-		[TestMethod]
-		public void Test_433()
-		{
-		}
-		[TestMethod]
-		public void Test_434()
-		{
-		}
-		[TestMethod]
-		public void Test_435()
-		{
-		}
-		[TestMethod]
-		public void Test_436()
-		{
-		}
-		[TestMethod]
-		public void Test_437()
-		{
-		}
-		[TestMethod]
-		public void Test_438()
-		{
-		}
-		[TestMethod]
-		public void Test_439()
-		{
-		}
-		[TestMethod]
-		public void Test_440()
-		{
-		}
-		[TestMethod]
-		public void Test_441()
-		{
-		}
-		[TestMethod]
-		public void Test_442()
-		{
-		}
-		[TestMethod]
-		public void Test_443()
-		{
-		}
-		[TestMethod]
-		public void Test_444()
-		{
-		}
-		[TestMethod]
-		public void Test_445()
-		{
-		}
-		[TestMethod]
-		public void Test_446()
-		{
-		}
-		[TestMethod]
-		public void Test_447()
-		{
-		}
-		[TestMethod]
-		public void Test_448()
-		{
-		}
-		[TestMethod]
-		public void Test_449()
-		{
-		}
-		[TestMethod]
-		public void Test_450()
-		{
-		}
-		[TestMethod]
-		public void Test_451()
-		{
-		}
-		[TestMethod]
-		public void Test_452()
-		{
-		}
-		[TestMethod]
-		public void Test_453()
-		{
-		}
-		[TestMethod]
-		public void Test_454()
-		{
-		}
-		[TestMethod]
-		public void Test_455()
-		{
-		}
-		[TestMethod]
-		public void Test_456()
-		{
-		}
-		[TestMethod]
-		public void Test_457()
-		{
-		}
-		[TestMethod]
-		public void Test_458()
-		{
-		}
-		[TestMethod]
-		public void Test_459()
-		{
-		}
-		[TestMethod]
-		public void Test_460()
-		{
-		}
-		[TestMethod]
-		public void Test_461()
-		{
-		}
-		[TestMethod]
-		public void Test_462()
-		{
-		}
-		[TestMethod]
-		public void Test_463()
-		{
-		}
-		[TestMethod]
-		public void Test_464()
-		{
-		}
-		[TestMethod]
-		public void Test_465()
-		{
-		}
-		[TestMethod]
-		public void Test_466()
-		{
-		}
-		[TestMethod]
-		public void Test_467()
-		{
-		}
-		[TestMethod]
-		public void Test_468()
-		{
-		}
-		[TestMethod]
-		public void Test_469()
-		{
-		}
-		[TestMethod]
-		public void Test_470()
-		{
-		}
-		[TestMethod]
-		public void Test_471()
-		{
-		}
-		[TestMethod]
-		public void Test_472()
-		{
-		}
-		[TestMethod]
-		public void Test_473()
-		{
-		}
-		[TestMethod]
-		public void Test_474()
-		{
-		}
-		[TestMethod]
-		public void Test_475()
-		{
-		}
-		[TestMethod]
-		public void Test_476()
-		{
-		}
-		[TestMethod]
-		public void Test_477()
-		{
-		}
-		[TestMethod]
-		public void Test_478()
-		{
-		}
-		[TestMethod]
-		public void Test_479()
-		{
-		}
-		[TestMethod]
-		public void Test_480()
-		{
-		}
-		[TestMethod]
-		public void Test_481()
-		{
-		}
-		[TestMethod]
-		public void Test_482()
-		{
-		}
-		[TestMethod]
-		public void Test_483()
-		{
-		}
-		[TestMethod]
-		public void Test_484()
-		{
-		}
-		[TestMethod]
-		public void Test_485()
-		{
-		}
-		[TestMethod]
-		public void Test_486()
-		{
-		}
-		[TestMethod]
-		public void Test_487()
-		{
-		}
-		[TestMethod]
-		public void Test_488()
-		{
-		}
-		[TestMethod]
-		public void Test_489()
-		{
-		}
-		[TestMethod]
-		public void Test_490()
-		{
-		}
-		[TestMethod]
-		public void Test_491()
-		{
-		}
-		[TestMethod]
-		public void Test_492()
-		{
-		}
-		[TestMethod]
-		public void Test_493()
-		{
-		}
-		[TestMethod]
-		public void Test_494()
-		{
-		}
-		[TestMethod]
-		public void Test_495()
-		{
-		}
-		[TestMethod]
-		public void Test_496()
-		{
-		}
-		[TestMethod]
-		public void Test_497()
-		{
-		}
-		[TestMethod]
-		public void Test_498()
-		{
-		}
-		[TestMethod]
-		public void Test_499()
-		{
-		}
-		[TestMethod]
-		public void Test_500()
-		{
-		}
-		[TestMethod]
-		public void Test_501()
-		{
-		}
-		[TestMethod]
-		public void Test_502()
-		{
-		}
-		[TestMethod]
-		public void Test_503()
-		{
-		}
-		[TestMethod]
-		public void Test_504()
-		{
-		}
-		[TestMethod]
-		public void Test_505()
-		{
-		}
-		[TestMethod]
-		public void Test_506()
-		{
-		}
-		[TestMethod]
-		public void Test_507()
-		{
-		}
-		[TestMethod]
-		public void Test_508()
-		{
-		}
-		[TestMethod]
-		public void Test_509()
-		{
-		}
-		[TestMethod]
-		public void Test_510()
-		{
-		}
-		[TestMethod]
-		public void Test_511()
-		{
-		}
-		[TestMethod]
-		public void Test_512()
-		{
-		}
-		[TestMethod]
-		public void Test_513()
-		{
-		}
-		[TestMethod]
-		public void Test_514()
-		{
-		}
-		[TestMethod]
-		public void Test_515()
-		{
-		}
-		[TestMethod]
-		public void Test_516()
-		{
-		}
-		[TestMethod]
-		public void Test_517()
-		{
-		}
-		[TestMethod]
-		public void Test_518()
-		{
-		}
-		[TestMethod]
-		public void Test_519()
-		{
-		}
-		[TestMethod]
-		public void Test_520()
-		{
-		}
-		[TestMethod]
-		public void Test_521()
-		{
-		}
-		[TestMethod]
-		public void Test_522()
-		{
-		}
-		[TestMethod]
-		public void Test_523()
-		{
-		}
-		[TestMethod]
-		public void Test_524()
-		{
-		}
-		[TestMethod]
-		public void Test_525()
-		{
-		}
-		[TestMethod]
-		public void Test_526()
-		{
-		}
-		[TestMethod]
-		public void Test_527()
-		{
-		}
-		[TestMethod]
-		public void Test_528()
-		{
-		}
-		[TestMethod]
-		public void Test_529()
-		{
-		}
-		[TestMethod]
-		public void Test_530()
-		{
-		}
-		[TestMethod]
-		public void Test_531()
-		{
-		}
-		[TestMethod]
-		public void Test_532()
-		{
-		}
-		[TestMethod]
-		public void Test_533()
-		{
-		}
-		[TestMethod]
-		public void Test_534()
-		{
-		}
-		[TestMethod]
-		public void Test_535()
-		{
-		}
-		[TestMethod]
-		public void Test_536()
-		{
-		}
-		[TestMethod]
-		public void Test_537()
-		{
-		}
-		[TestMethod]
-		public void Test_538()
-		{
-		}
-		[TestMethod]
-		public void Test_539()
-		{
-		}
-		[TestMethod]
-		public void Test_540()
-		{
-		}
-		[TestMethod]
-		public void Test_541()
-		{
-		}
-		[TestMethod]
-		public void Test_542()
-		{
-		}
-		[TestMethod]
-		public void Test_543()
-		{
-		}
-		[TestMethod]
-		public void Test_544()
-		{
-		}
-		[TestMethod]
-		public void Test_545()
-		{
-		}
-		[TestMethod]
-		public void Test_546()
-		{
-		}
-		[TestMethod]
-		public void Test_547()
-		{
-		}
-		[TestMethod]
-		public void Test_548()
-		{
-		}
-		[TestMethod]
-		public void Test_549()
-		{
-		}
-		[TestMethod]
-		public void Test_550()
-		{
-		}
-		[TestMethod]
-		public void Test_551()
-		{
-		}
-		[TestMethod]
-		public void Test_552()
-		{
-		}
-		[TestMethod]
-		public void Test_553()
-		{
-		}
-		[TestMethod]
-		public void Test_554()
-		{
-		}
-		[TestMethod]
-		public void Test_555()
-		{
-		}
-		[TestMethod]
-		public void Test_556()
-		{
-		}
-		[TestMethod]
-		public void Test_557()
-		{
-		}
-		[TestMethod]
-		public void Test_558()
-		{
-		}
-		[TestMethod]
-		public void Test_559()
-		{
-		}
-		[TestMethod]
-		public void Test_560()
-		{
-		}
-		[TestMethod]
-		public void Test_561()
-		{
-		}
-		[TestMethod]
-		public void Test_562()
-		{
-		}
-		[TestMethod]
-		public void Test_563()
-		{
-		}
-		[TestMethod]
-		public void Test_564()
-		{
-		}
-		[TestMethod]
-		public void Test_565()
-		{
-		}
-		[TestMethod]
-		public void Test_566()
-		{
-		}
-		[TestMethod]
-		public void Test_567()
-		{
-		}
-		[TestMethod]
-		public void Test_568()
-		{
-		}
-		[TestMethod]
-		public void Test_569()
-		{
-		}
-		[TestMethod]
-		public void Test_570()
-		{
-		}
-		[TestMethod]
-		public void Test_571()
-		{
-		}
-		[TestMethod]
-		public void Test_572()
-		{
-		}
-		[TestMethod]
-		public void Test_573()
-		{
-		}
-		[TestMethod]
-		public void Test_574()
-		{
-		}
-		[TestMethod]
-		public void Test_575()
-		{
-		}
-		[TestMethod]
-		public void Test_576()
-		{
-		}
-		[TestMethod]
-		public void Test_577()
-		{
-		}
-		[TestMethod]
-		public void Test_578()
-		{
-		}
-		[TestMethod]
-		public void Test_579()
-		{
-		}
-		[TestMethod]
-		public void Test_580()
-		{
-		}
-		[TestMethod]
-		public void Test_581()
-		{
-		}
-		[TestMethod]
-		public void Test_582()
-		{
-		}
-		[TestMethod]
-		public void Test_583()
-		{
-		}
-		[TestMethod]
-		public void Test_584()
-		{
-		}
-		[TestMethod]
-		public void Test_585()
-		{
-		}
-		[TestMethod]
-		public void Test_586()
-		{
-		}
-		[TestMethod]
-		public void Test_587()
-		{
-		}
-		[TestMethod]
-		public void Test_588()
-		{
-		}
-		[TestMethod]
-		public void Test_589()
-		{
-		}
-		[TestMethod]
-		public void Test_590()
-		{
-		}
-		[TestMethod]
-		public void Test_591()
-		{
-		}
-		[TestMethod]
-		public void Test_592()
-		{
-		}
-		[TestMethod]
-		public void Test_593()
-		{
-		}
-		[TestMethod]
-		public void Test_594()
-		{
-		}
-		[TestMethod]
-		public void Test_595()
-		{
-		}
-		[TestMethod]
-		public void Test_596()
-		{
-		}
-		[TestMethod]
-		public void Test_597()
-		{
-		}
-		[TestMethod]
-		public void Test_598()
-		{
-		}
-		[TestMethod]
-		public void Test_599()
-		{
-		}
-		[TestMethod]
-		public void Test_600()
-		{
-		}
-		[TestMethod]
-		public void Test_601()
-		{
-		}
-		[TestMethod]
-		public void Test_602()
-		{
-		}
-		[TestMethod]
-		public void Test_603()
-		{
-		}
-		[TestMethod]
-		public void Test_604()
-		{
-		}
-		[TestMethod]
-		public void Test_605()
-		{
-		}
-		[TestMethod]
-		public void Test_606()
-		{
-		}
-		[TestMethod]
-		public void Test_607()
-		{
-		}
-		[TestMethod]
-		public void Test_608()
-		{
-		}
-		[TestMethod]
-		public void Test_609()
-		{
-		}
-		[TestMethod]
-		public void Test_610()
-		{
-		}
-		[TestMethod]
-		public void Test_611()
-		{
-		}
-		[TestMethod]
-		public void Test_612()
-		{
-		}
-		[TestMethod]
-		public void Test_613()
-		{
-		}
-		[TestMethod]
-		public void Test_614()
-		{
-		}
-		[TestMethod]
-		public void Test_615()
-		{
-		}
-		[TestMethod]
-		public void Test_616()
-		{
-		}
-		[TestMethod]
-		public void Test_617()
-		{
-		}
-		[TestMethod]
-		public void Test_618()
-		{
-		}
-		[TestMethod]
-		public void Test_619()
-		{
-		}
-		[TestMethod]
-		public void Test_620()
-		{
-		}
-		[TestMethod]
-		public void Test_621()
-		{
-		}
-		[TestMethod]
-		public void Test_622()
-		{
-		}
-		[TestMethod]
-		public void Test_623()
-		{
-		}
-		[TestMethod]
-		public void Test_624()
-		{
-		}
-		[TestMethod]
-		public void Test_625()
-		{
-		}
-		[TestMethod]
-		public void Test_626()
-		{
-		}
-		[TestMethod]
-		public void Test_627()
-		{
-		}
-		[TestMethod]
-		public void Test_628()
-		{
-		}
-		[TestMethod]
-		public void Test_629()
-		{
-		}
-		[TestMethod]
-		public void Test_630()
-		{
-		}
-		[TestMethod]
-		public void Test_631()
-		{
-		}
-		[TestMethod]
-		public void Test_632()
-		{
-		}
-		[TestMethod]
-		public void Test_633()
-		{
-		}
-		[TestMethod]
-		public void Test_634()
-		{
-		}
-		[TestMethod]
-		public void Test_635()
-		{
-		}
-		[TestMethod]
-		public void Test_636()
-		{
-		}
-		[TestMethod]
-		public void Test_637()
-		{
-		}
-		[TestMethod]
-		public void Test_638()
-		{
-		}
-		[TestMethod]
-		public void Test_639()
-		{
-		}
-		[TestMethod]
-		public void Test_640()
-		{
-		}
-		[TestMethod]
-		public void Test_641()
-		{
-		}
-		[TestMethod]
-		public void Test_642()
-		{
-		}
-		[TestMethod]
-		public void Test_643()
-		{
-		}
-		[TestMethod]
-		public void Test_644()
-		{
-		}
-		[TestMethod]
-		public void Test_645()
-		{
-		}
-		[TestMethod]
-		public void Test_646()
-		{
-		}
-		[TestMethod]
-		public void Test_647()
-		{
-		}
-		[TestMethod]
-		public void Test_648()
-		{
-		}
-		[TestMethod]
-		public void Test_649()
-		{
-		}
-		[TestMethod]
-		public void Test_650()
-		{
-		}
-		[TestMethod]
-		public void Test_651()
-		{
-		}
-		[TestMethod]
-		public void Test_652()
-		{
-		}
-		[TestMethod]
-		public void Test_653()
-		{
-		}
-		[TestMethod]
-		public void Test_654()
-		{
-		}
-		[TestMethod]
-		public void Test_655()
-		{
-		}
-		[TestMethod]
-		public void Test_656()
-		{
-		}
-		[TestMethod]
-		public void Test_657()
-		{
-		}
-		[TestMethod]
-		public void Test_658()
-		{
-		}
-		[TestMethod]
-		public void Test_659()
-		{
-		}
-		[TestMethod]
-		public void Test_660()
-		{
-		}
-		[TestMethod]
-		public void Test_661()
-		{
-		}
-		[TestMethod]
-		public void Test_662()
-		{
-		}
-		[TestMethod]
-		public void Test_663()
-		{
-		}
-		[TestMethod]
-		public void Test_664()
-		{
-		}
-		[TestMethod]
-		public void Test_665()
-		{
-		}
-		[TestMethod]
-		public void Test_666()
-		{
-		}
-		[TestMethod]
-		public void Test_667()
-		{
-		}
-		[TestMethod]
-		public void Test_668()
-		{
-		}
-		[TestMethod]
-		public void Test_669()
-		{
-		}
-		[TestMethod]
-		public void Test_670()
-		{
-		}
-		[TestMethod]
-		public void Test_671()
-		{
-		}
-		[TestMethod]
-		public void Test_672()
-		{
-		}
-		[TestMethod]
-		public void Test_673()
-		{
-		}
-		[TestMethod]
-		public void Test_674()
-		{
-		}
-		[TestMethod]
-		public void Test_675()
-		{
-		}
-		[TestMethod]
-		public void Test_676()
-		{
-		}
-		[TestMethod]
-		public void Test_677()
-		{
-		}
-		[TestMethod]
-		public void Test_678()
-		{
-		}
-		[TestMethod]
-		public void Test_679()
-		{
-		}
-		[TestMethod]
-		public void Test_680()
-		{
-		}
-		[TestMethod]
-		public void Test_681()
-		{
-		}
-		[TestMethod]
-		public void Test_682()
-		{
-		}
-		[TestMethod]
-		public void Test_683()
-		{
-		}
-		[TestMethod]
-		public void Test_684()
-		{
-		}
-		[TestMethod]
-		public void Test_685()
-		{
-		}
-		[TestMethod]
-		public void Test_686()
-		{
-		}
-		[TestMethod]
-		public void Test_687()
-		{
-		}
-		[TestMethod]
-		public void Test_688()
-		{
-		}
-		[TestMethod]
-		public void Test_689()
-		{
-		}
-		[TestMethod]
-		public void Test_690()
-		{
-		}
-		[TestMethod]
-		public void Test_691()
-		{
-		}
-		[TestMethod]
-		public void Test_692()
-		{
-		}
-		[TestMethod]
-		public void Test_693()
-		{
-		}
-		[TestMethod]
-		public void Test_694()
-		{
-		}
-		[TestMethod]
-		public void Test_695()
-		{
-		}
-		[TestMethod]
-		public void Test_696()
-		{
-		}
-		[TestMethod]
-		public void Test_697()
-		{
-		}
-		[TestMethod]
-		public void Test_698()
-		{
-		}
-		[TestMethod]
-		public void Test_699()
-		{
-		}
-		[TestMethod]
-		public void Test_700()
-		{
-		}
-		[TestMethod]
-		public void Test_701()
-		{
-		}
-		[TestMethod]
-		public void Test_702()
-		{
-		}
-		[TestMethod]
-		public void Test_703()
-		{
-		}
-		[TestMethod]
-		public void Test_704()
-		{
-		}
-		[TestMethod]
-		public void Test_705()
-		{
-		}
-		[TestMethod]
-		public void Test_706()
-		{
-		}
-		[TestMethod]
-		public void Test_707()
-		{
-		}
-		[TestMethod]
-		public void Test_708()
-		{
-		}
-		[TestMethod]
-		public void Test_709()
-		{
-		}
-		[TestMethod]
-		public void Test_710()
-		{
-		}
-		[TestMethod]
-		public void Test_711()
-		{
-		}
-		[TestMethod]
-		public void Test_712()
-		{
-		}
-		[TestMethod]
-		public void Test_713()
-		{
-		}
-		[TestMethod]
-		public void Test_714()
-		{
-		}
-		[TestMethod]
-		public void Test_715()
-		{
-		}
-		[TestMethod]
-		public void Test_716()
-		{
-		}
-		[TestMethod]
-		public void Test_717()
-		{
-		}
-		[TestMethod]
-		public void Test_718()
-		{
-		}
-		[TestMethod]
-		public void Test_719()
-		{
-		}
-		[TestMethod]
-		public void Test_720()
-		{
-		}
-		[TestMethod]
-		public void Test_721()
-		{
-		}
-		[TestMethod]
-		public void Test_722()
-		{
-		}
-		[TestMethod]
-		public void Test_723()
-		{
-		}
-		[TestMethod]
-		public void Test_724()
-		{
-		}
-		[TestMethod]
-		public void Test_725()
-		{
-		}
-		[TestMethod]
-		public void Test_726()
-		{
-		}
-		[TestMethod]
-		public void Test_727()
-		{
-		}
-		[TestMethod]
-		public void Test_728()
-		{
-		}
-		[TestMethod]
-		public void Test_729()
-		{
-		}
-		[TestMethod]
-		public void Test_730()
-		{
-		}
-		[TestMethod]
-		public void Test_731()
-		{
-		}
-		[TestMethod]
-		public void Test_732()
-		{
-		}
-		[TestMethod]
-		public void Test_733()
-		{
-		}
-		[TestMethod]
-		public void Test_734()
-		{
-		}
-		[TestMethod]
-		public void Test_735()
-		{
-		}
-		[TestMethod]
-		public void Test_736()
-		{
-		}
-		[TestMethod]
-		public void Test_737()
-		{
-		}
-		[TestMethod]
-		public void Test_738()
-		{
-		}
-		[TestMethod]
-		public void Test_739()
-		{
-		}
-		[TestMethod]
-		public void Test_740()
-		{
-		}
-		[TestMethod]
-		public void Test_741()
-		{
-		}
-		[TestMethod]
-		public void Test_742()
-		{
-		}
-		[TestMethod]
-		public void Test_743()
-		{
-		}
-		[TestMethod]
-		public void Test_744()
-		{
-		}
-		[TestMethod]
-		public void Test_745()
-		{
-		}
-		[TestMethod]
-		public void Test_746()
-		{
-		}
-		[TestMethod]
-		public void Test_747()
-		{
-		}
-		[TestMethod]
-		public void Test_748()
-		{
-		}
-		[TestMethod]
-		public void Test_749()
-		{
-		}
-		[TestMethod]
-		public void Test_750()
-		{
-		}
-		[TestMethod]
-		public void Test_751()
-		{
-		}
-		[TestMethod]
-		public void Test_752()
-		{
-		}
-		[TestMethod]
-		public void Test_753()
-		{
-		}
-		[TestMethod]
-		public void Test_754()
-		{
-		}
-		[TestMethod]
-		public void Test_755()
-		{
-		}
-		[TestMethod]
-		public void Test_756()
-		{
-		}
-		[TestMethod]
-		public void Test_757()
-		{
-		}
-		[TestMethod]
-		public void Test_758()
-		{
-		}
-		[TestMethod]
-		public void Test_759()
-		{
-		}
-		[TestMethod]
-		public void Test_760()
-		{
-		}
-		[TestMethod]
-		public void Test_761()
-		{
-		}
-		[TestMethod]
-		public void Test_762()
-		{
-		}
-		[TestMethod]
-		public void Test_763()
-		{
-		}
-		[TestMethod]
-		public void Test_764()
-		{
-		}
-		[TestMethod]
-		public void Test_765()
-		{
-		}
-		[TestMethod]
-		public void Test_766()
-		{
-		}
-		[TestMethod]
-		public void Test_767()
-		{
-		}
-		[TestMethod]
-		public void Test_768()
-		{
-		}
-		[TestMethod]
-		public void Test_769()
-		{
-		}
-		[TestMethod]
-		public void Test_770()
-		{
-		}
-		[TestMethod]
-		public void Test_771()
-		{
-		}
-		[TestMethod]
-		public void Test_772()
-		{
-		}
-		[TestMethod]
-		public void Test_773()
-		{
-		}
-		[TestMethod]
-		public void Test_774()
-		{
-		}
-		[TestMethod]
-		public void Test_775()
-		{
-		}
-		[TestMethod]
-		public void Test_776()
-		{
-		}
-		[TestMethod]
-		public void Test_777()
-		{
-		}
-		[TestMethod]
-		public void Test_778()
-		{
-		}
-		[TestMethod]
-		public void Test_779()
-		{
-		}
-		[TestMethod]
-		public void Test_780()
-		{
-		}
-		[TestMethod]
-		public void Test_781()
-		{
-		}
-		[TestMethod]
-		public void Test_782()
-		{
-		}
-		[TestMethod]
-		public void Test_783()
-		{
-		}
-		[TestMethod]
-		public void Test_784()
-		{
-		}
-		[TestMethod]
-		public void Test_785()
-		{
-		}
-		[TestMethod]
-		public void Test_786()
-		{
-		}
-		[TestMethod]
-		public void Test_787()
-		{
-		}
-		[TestMethod]
-		public void Test_788()
-		{
-		}
-		[TestMethod]
-		public void Test_789()
-		{
-		}
-		[TestMethod]
-		public void Test_790()
-		{
-		}
-		[TestMethod]
-		public void Test_791()
-		{
-		}
-		[TestMethod]
-		public void Test_792()
-		{
-		}
-		[TestMethod]
-		public void Test_793()
-		{
-		}
-		[TestMethod]
-		public void Test_794()
-		{
-		}
-		[TestMethod]
-		public void Test_795()
-		{
-		}
-		[TestMethod]
-		public void Test_796()
-		{
-		}
-		[TestMethod]
-		public void Test_797()
-		{
-		}
-		[TestMethod]
-		public void Test_798()
-		{
-		}
-		[TestMethod]
-		public void Test_799()
-		{
-		}
-		[TestMethod]
-		public void Test_800()
-		{
-		}
-		[TestMethod]
-		public void Test_801()
-		{
-		}
-		[TestMethod]
-		public void Test_802()
-		{
-		}
-		[TestMethod]
-		public void Test_803()
-		{
-		}
-		[TestMethod]
-		public void Test_804()
-		{
-		}
-		[TestMethod]
-		public void Test_805()
-		{
-		}
-		[TestMethod]
-		public void Test_806()
-		{
-		}
-		[TestMethod]
-		public void Test_807()
-		{
-		}
-		[TestMethod]
-		public void Test_808()
-		{
-		}
-		[TestMethod]
-		public void Test_809()
-		{
-		}
-		[TestMethod]
-		public void Test_810()
-		{
-		}
-		[TestMethod]
-		public void Test_811()
-		{
-		}
-		[TestMethod]
-		public void Test_812()
-		{
-		}
-		[TestMethod]
-		public void Test_813()
-		{
-		}
-		[TestMethod]
-		public void Test_814()
-		{
-		}
-		[TestMethod]
-		public void Test_815()
-		{
-		}
-		[TestMethod]
-		public void Test_816()
-		{
-		}
-		[TestMethod]
-		public void Test_817()
-		{
-		}
-		[TestMethod]
-		public void Test_818()
-		{
-		}
-		[TestMethod]
-		public void Test_819()
-		{
-		}
-		[TestMethod]
-		public void Test_820()
-		{
-		}
-		[TestMethod]
-		public void Test_821()
-		{
-		}
-		[TestMethod]
-		public void Test_822()
-		{
-		}
-		[TestMethod]
-		public void Test_823()
-		{
-		}
-		[TestMethod]
-		public void Test_824()
-		{
-		}
-		[TestMethod]
-		public void Test_825()
-		{
-		}
-		[TestMethod]
-		public void Test_826()
-		{
-		}
-		[TestMethod]
-		public void Test_827()
-		{
-		}
-		[TestMethod]
-		public void Test_828()
-		{
-		}
-		[TestMethod]
-		public void Test_829()
-		{
-		}
-		[TestMethod]
-		public void Test_830()
-		{
-		}
-		[TestMethod]
-		public void Test_831()
-		{
-		}
-		[TestMethod]
-		public void Test_832()
-		{
-		}
-		[TestMethod]
-		public void Test_833()
-		{
-		}
-		[TestMethod]
-		public void Test_834()
-		{
-		}
-		[TestMethod]
-		public void Test_835()
-		{
-		}
-		[TestMethod]
-		public void Test_836()
-		{
-		}
-		[TestMethod]
-		public void Test_837()
-		{
-		}
-		[TestMethod]
-		public void Test_838()
-		{
-		}
-		[TestMethod]
-		public void Test_839()
-		{
-		}
-		[TestMethod]
-		public void Test_840()
-		{
-		}
-		[TestMethod]
-		public void Test_841()
-		{
-		}
-		[TestMethod]
-		public void Test_842()
-		{
-		}
-		[TestMethod]
-		public void Test_843()
-		{
-		}
-		[TestMethod]
-		public void Test_844()
-		{
-		}
-		[TestMethod]
-		public void Test_845()
-		{
-		}
-		[TestMethod]
-		public void Test_846()
-		{
-		}
-		[TestMethod]
-		public void Test_847()
-		{
-		}
-		[TestMethod]
-		public void Test_848()
-		{
-		}
-		[TestMethod]
-		public void Test_849()
-		{
-		}
-		[TestMethod]
-		public void Test_850()
-		{
-		}
-		[TestMethod]
-		public void Test_851()
-		{
-		}
-		[TestMethod]
-		public void Test_852()
-		{
-		}
-		[TestMethod]
-		public void Test_853()
-		{
-		}
-		[TestMethod]
-		public void Test_854()
-		{
-		}
-		[TestMethod]
-		public void Test_855()
-		{
-		}
-		[TestMethod]
-		public void Test_856()
-		{
-		}
-		[TestMethod]
-		public void Test_857()
-		{
-		}
-		[TestMethod]
-		public void Test_858()
-		{
-		}
-		[TestMethod]
-		public void Test_859()
-		{
-		}
-		[TestMethod]
-		public void Test_860()
-		{
-		}
-		[TestMethod]
-		public void Test_861()
-		{
-		}
-		[TestMethod]
-		public void Test_862()
-		{
-		}
-		[TestMethod]
-		public void Test_863()
-		{
-		}
-		[TestMethod]
-		public void Test_864()
-		{
-		}
-		[TestMethod]
-		public void Test_865()
-		{
-		}
-		[TestMethod]
-		public void Test_866()
-		{
-		}
-		[TestMethod]
-		public void Test_867()
-		{
-		}
-		[TestMethod]
-		public void Test_868()
-		{
-		}
-		[TestMethod]
-		public void Test_869()
-		{
-		}
-		[TestMethod]
-		public void Test_870()
-		{
-		}
-		[TestMethod]
-		public void Test_871()
-		{
-		}
-		[TestMethod]
-		public void Test_872()
-		{
-		}
-		[TestMethod]
-		public void Test_873()
-		{
-		}
-		[TestMethod]
-		public void Test_874()
-		{
-		}
-		[TestMethod]
-		public void Test_875()
-		{
-		}
-		[TestMethod]
-		public void Test_876()
-		{
-		}
-		[TestMethod]
-		public void Test_877()
-		{
-		}
-		[TestMethod]
-		public void Test_878()
-		{
-		}
-		[TestMethod]
-		public void Test_879()
-		{
-		}
-		[TestMethod]
-		public void Test_880()
-		{
-		}
-		[TestMethod]
-		public void Test_881()
-		{
-		}
-		[TestMethod]
-		public void Test_882()
-		{
-		}
-		[TestMethod]
-		public void Test_883()
-		{
-		}
-		[TestMethod]
-		public void Test_884()
-		{
-		}
-		[TestMethod]
-		public void Test_885()
-		{
-		}
-		[TestMethod]
-		public void Test_886()
-		{
-		}
-		[TestMethod]
-		public void Test_887()
-		{
-		}
-		[TestMethod]
-		public void Test_888()
-		{
-		}
-		[TestMethod]
-		public void Test_889()
-		{
-		}
-		[TestMethod]
-		public void Test_890()
-		{
-		}
-		[TestMethod]
-		public void Test_891()
-		{
-		}
-		[TestMethod]
-		public void Test_892()
-		{
-		}
-		[TestMethod]
-		public void Test_893()
-		{
-		}
-		[TestMethod]
-		public void Test_894()
-		{
-		}
-		[TestMethod]
-		public void Test_895()
-		{
-		}
-		[TestMethod]
-		public void Test_896()
-		{
-		}
-		[TestMethod]
-		public void Test_897()
-		{
-		}
-		[TestMethod]
-		public void Test_898()
-		{
-		}
-		[TestMethod]
-		public void Test_899()
-		{
-		}
-		[TestMethod]
-		public void Test_900()
-		{
-		}
-		[TestMethod]
-		public void Test_901()
-		{
-		}
-		[TestMethod]
-		public void Test_902()
-		{
-		}
-		[TestMethod]
-		public void Test_903()
-		{
-		}
-		[TestMethod]
-		public void Test_904()
-		{
-		}
-		[TestMethod]
-		public void Test_905()
-		{
-		}
-		[TestMethod]
-		public void Test_906()
-		{
-		}
-		[TestMethod]
-		public void Test_907()
-		{
-		}
-		[TestMethod]
-		public void Test_908()
-		{
-		}
-		[TestMethod]
-		public void Test_909()
-		{
-		}
-		[TestMethod]
-		public void Test_910()
-		{
-		}
-		[TestMethod]
-		public void Test_911()
-		{
-		}
-		[TestMethod]
-		public void Test_912()
-		{
-		}
-		[TestMethod]
-		public void Test_913()
-		{
-		}
-		[TestMethod]
-		public void Test_914()
-		{
-		}
-		[TestMethod]
-		public void Test_915()
-		{
-		}
-		[TestMethod]
-		public void Test_916()
-		{
-		}
-		[TestMethod]
-		public void Test_917()
-		{
-		}
-		[TestMethod]
-		public void Test_918()
-		{
-		}
-		[TestMethod]
-		public void Test_919()
-		{
-		}
-		[TestMethod]
-		public void Test_920()
-		{
-		}
-		[TestMethod]
-		public void Test_921()
-		{
-		}
-		[TestMethod]
-		public void Test_922()
-		{
-		}
-		[TestMethod]
-		public void Test_923()
-		{
-		}
-		[TestMethod]
-		public void Test_924()
-		{
-		}
-		[TestMethod]
-		public void Test_925()
-		{
-		}
-		[TestMethod]
-		public void Test_926()
-		{
-		}
-		[TestMethod]
-		public void Test_927()
-		{
-		}
-		[TestMethod]
-		public void Test_928()
-		{
-		}
-		[TestMethod]
-		public void Test_929()
-		{
-		}
-		[TestMethod]
-		public void Test_930()
-		{
-		}
-		[TestMethod]
-		public void Test_931()
-		{
-		}
-		[TestMethod]
-		public void Test_932()
-		{
-		}
-		[TestMethod]
-		public void Test_933()
-		{
-		}
-		[TestMethod]
-		public void Test_934()
-		{
-		}
-		[TestMethod]
-		public void Test_935()
-		{
-		}
-		[TestMethod]
-		public void Test_936()
-		{
-		}
-		[TestMethod]
-		public void Test_937()
-		{
-		}
-		[TestMethod]
-		public void Test_938()
-		{
-		}
-		[TestMethod]
-		public void Test_939()
-		{
-		}
-		[TestMethod]
-		public void Test_940()
-		{
-		}
-		[TestMethod]
-		public void Test_941()
-		{
-		}
-		[TestMethod]
-		public void Test_942()
-		{
-		}
-		[TestMethod]
-		public void Test_943()
-		{
-		}
-		[TestMethod]
-		public void Test_944()
-		{
-		}
-		[TestMethod]
-		public void Test_945()
-		{
-		}
-		[TestMethod]
-		public void Test_946()
-		{
-		}
-		[TestMethod]
-		public void Test_947()
-		{
-		}
-		[TestMethod]
-		public void Test_948()
-		{
-		}
-		[TestMethod]
-		public void Test_949()
-		{
-		}
-		[TestMethod]
-		public void Test_950()
-		{
-		}
-		[TestMethod]
-		public void Test_951()
-		{
-		}
-		[TestMethod]
-		public void Test_952()
-		{
-		}
-		[TestMethod]
-		public void Test_953()
-		{
-		}
-		[TestMethod]
-		public void Test_954()
-		{
-		}
-		[TestMethod]
-		public void Test_955()
-		{
-		}
-		[TestMethod]
-		public void Test_956()
-		{
-		}
-		[TestMethod]
-		public void Test_957()
-		{
-		}
-		[TestMethod]
-		public void Test_958()
-		{
-		}
-		[TestMethod]
-		public void Test_959()
-		{
-		}
-		[TestMethod]
-		public void Test_960()
-		{
-		}
-		[TestMethod]
-		public void Test_961()
-		{
-		}
-		[TestMethod]
-		public void Test_962()
-		{
-		}
-		[TestMethod]
-		public void Test_963()
-		{
-		}
-		[TestMethod]
-		public void Test_964()
-		{
-		}
-		[TestMethod]
-		public void Test_965()
-		{
-		}
-		[TestMethod]
-		public void Test_966()
-		{
-		}
-		[TestMethod]
-		public void Test_967()
-		{
-		}
-		[TestMethod]
-		public void Test_968()
-		{
-		}
-		[TestMethod]
-		public void Test_969()
-		{
-		}
-		[TestMethod]
-		public void Test_970()
-		{
-		}
-		[TestMethod]
-		public void Test_971()
-		{
-		}
-		[TestMethod]
-		public void Test_972()
-		{
-		}
-		[TestMethod]
-		public void Test_973()
-		{
-		}
-		[TestMethod]
-		public void Test_974()
-		{
-		}
-		[TestMethod]
-		public void Test_975()
-		{
-		}
-		[TestMethod]
-		public void Test_976()
-		{
-		}
-		[TestMethod]
-		public void Test_977()
-		{
-		}
-		[TestMethod]
-		public void Test_978()
-		{
-		}
-		[TestMethod]
-		public void Test_979()
-		{
-		}
-		[TestMethod]
-		public void Test_980()
-		{
-		}
-		[TestMethod]
-		public void Test_981()
-		{
-		}
-		[TestMethod]
-		public void Test_982()
-		{
-		}
-		[TestMethod]
-		public void Test_983()
-		{
-		}
-		[TestMethod]
-		public void Test_984()
-		{
-		}
-		[TestMethod]
-		public void Test_985()
-		{
-		}
-		[TestMethod]
-		public void Test_986()
-		{
-		}
-		[TestMethod]
-		public void Test_987()
-		{
-		}
-		[TestMethod]
-		public void Test_988()
-		{
-		}
-		[TestMethod]
-		public void Test_989()
-		{
-		}
-		[TestMethod]
-		public void Test_990()
-		{
-		}
-		[TestMethod]
-		public void Test_991()
-		{
-		}
-		[TestMethod]
-		public void Test_992()
-		{
-		}
-		[TestMethod]
-		public void Test_993()
-		{
-		}
-		[TestMethod]
-		public void Test_994()
-		{
-		}
-		[TestMethod]
-		public void Test_995()
-		{
-		}
-		[TestMethod]
-		public void Test_996()
-		{
-		}
-		[TestMethod]
-		public void Test_997()
-		{
-		}
-		[TestMethod]
-		public void Test_998()
-		{
-		}
-		[TestMethod]
-		public void Test_999()
-		{
-		}
-		[TestMethod]
-		public void Test_1000()
-		{
-		}
-		[TestMethod]
-		public void Test_1001()
-		{
-		}
-		[TestMethod]
-		public void Test_1002()
-		{
-		}
-		[TestMethod]
-		public void Test_1003()
-		{
-		}
-		[TestMethod]
-		public void Test_1004()
-		{
-		}
-		[TestMethod]
-		public void Test_1005()
-		{
-		}
-		[TestMethod]
-		public void Test_1006()
-		{
-		}
-		[TestMethod]
-		public void Test_1007()
-		{
-		}
-		[TestMethod]
-		public void Test_1008()
-		{
-		}
-		[TestMethod]
-		public void Test_1009()
-		{
-		}
-		[TestMethod]
-		public void Test_1010()
-		{
-		}
-		[TestMethod]
-		public void Test_1011()
-		{
-		}
-		[TestMethod]
-		public void Test_1012()
-		{
-		}
-		[TestMethod]
-		public void Test_1013()
-		{
-		}
-		[TestMethod]
-		public void Test_1014()
-		{
-		}
-		[TestMethod]
-		public void Test_1015()
-		{
-		}
-		[TestMethod]
-		public void Test_1016()
-		{
-		}
-		[TestMethod]
-		public void Test_1017()
-		{
-		}
-		[TestMethod]
-		public void Test_1018()
-		{
-		}
-		[TestMethod]
-		public void Test_1019()
-		{
-		}
-		[TestMethod]
-		public void Test_1020()
-		{
-		}
-		[TestMethod]
-		public void Test_1021()
-		{
-		}
-		[TestMethod]
-		public void Test_1022()
-		{
-		}
-		[TestMethod]
-		public void Test_1023()
-		{
-		}
-		[TestMethod]
-		public void Test_1024()
-		{
-		}
-		[TestMethod]
-		public void Test_1025()
-		{
-		}
-		[TestMethod]
-		public void Test_1026()
-		{
-		}
-		[TestMethod]
-		public void Test_1027()
-		{
-		}
-		[TestMethod]
-		public void Test_1028()
-		{
-		}
-		[TestMethod]
-		public void Test_1029()
-		{
-		}
-		[TestMethod]
-		public void Test_1030()
-		{
-		}
-		[TestMethod]
-		public void Test_1031()
-		{
-		}
-		[TestMethod]
-		public void Test_1032()
-		{
-		}
-		[TestMethod]
-		public void Test_1033()
-		{
-		}
-		[TestMethod]
-		public void Test_1034()
-		{
-		}
-		[TestMethod]
-		public void Test_1035()
-		{
-		}
-		[TestMethod]
-		public void Test_1036()
-		{
-		}
-		[TestMethod]
-		public void Test_1037()
-		{
-		}
-		[TestMethod]
-		public void Test_1038()
-		{
-		}
-		[TestMethod]
-		public void Test_1039()
-		{
-		}
-		[TestMethod]
-		public void Test_1040()
-		{
-		}
-		[TestMethod]
-		public void Test_1041()
-		{
-		}
-		[TestMethod]
-		public void Test_1042()
-		{
-		}
-		[TestMethod]
-		public void Test_1043()
-		{
-		}
-		[TestMethod]
-		public void Test_1044()
-		{
-		}
-		[TestMethod]
-		public void Test_1045()
-		{
-		}
-		[TestMethod]
-		public void Test_1046()
-		{
-		}
-		[TestMethod]
-		public void Test_1047()
-		{
-		}
-		[TestMethod]
-		public void Test_1048()
-		{
-		}
-		[TestMethod]
-		public void Test_1049()
-		{
-		}
-		[TestMethod]
-		public void Test_1050()
-		{
-		}
-		[TestMethod]
-		public void Test_1051()
-		{
-		}
-		[TestMethod]
-		public void Test_1052()
-		{
-		}
-		[TestMethod]
-		public void Test_1053()
-		{
-		}
-		[TestMethod]
-		public void Test_1054()
-		{
-		}
-		[TestMethod]
-		public void Test_1055()
-		{
-		}
-		[TestMethod]
-		public void Test_1056()
-		{
-		}
-		[TestMethod]
-		public void Test_1057()
-		{
-		}
-		[TestMethod]
-		public void Test_1058()
-		{
-		}
-		[TestMethod]
-		public void Test_1059()
-		{
-		}
-		[TestMethod]
-		public void Test_1060()
-		{
-		}
-		[TestMethod]
-		public void Test_1061()
-		{
-		}
-		[TestMethod]
-		public void Test_1062()
-		{
-		}
-		[TestMethod]
-		public void Test_1063()
-		{
-		}
-		[TestMethod]
-		public void Test_1064()
-		{
-		}
-		[TestMethod]
-		public void Test_1065()
-		{
-		}
-		[TestMethod]
-		public void Test_1066()
-		{
-		}
-		[TestMethod]
-		public void Test_1067()
-		{
-		}
-		[TestMethod]
-		public void Test_1068()
-		{
-		}
-		[TestMethod]
-		public void Test_1069()
-		{
-		}
-		[TestMethod]
-		public void Test_1070()
-		{
-		}
-		[TestMethod]
-		public void Test_1071()
-		{
-		}
-		[TestMethod]
-		public void Test_1072()
-		{
-		}
-		[TestMethod]
-		public void Test_1073()
-		{
-		}
-		[TestMethod]
-		public void Test_1074()
-		{
-		}
-		[TestMethod]
-		public void Test_1075()
-		{
-		}
-		[TestMethod]
-		public void Test_1076()
-		{
-		}
-		[TestMethod]
-		public void Test_1077()
-		{
-		}
-		[TestMethod]
-		public void Test_1078()
-		{
-		}
-		[TestMethod]
-		public void Test_1079()
-		{
-		}
-		[TestMethod]
-		public void Test_1080()
-		{
-		}
-		[TestMethod]
-		public void Test_1081()
-		{
-		}
-		[TestMethod]
-		public void Test_1082()
-		{
-		}
-		[TestMethod]
-		public void Test_1083()
-		{
-		}
-		[TestMethod]
-		public void Test_1084()
-		{
-		}
-		[TestMethod]
-		public void Test_1085()
-		{
-		}
-		[TestMethod]
-		public void Test_1086()
-		{
-		}
-		[TestMethod]
-		public void Test_1087()
-		{
-		}
-		[TestMethod]
-		public void Test_1088()
-		{
-		}
-		[TestMethod]
-		public void Test_1089()
-		{
-		}
-		[TestMethod]
-		public void Test_1090()
-		{
-		}
-		[TestMethod]
-		public void Test_1091()
-		{
-		}
-		[TestMethod]
-		public void Test_1092()
-		{
-		}
-		[TestMethod]
-		public void Test_1093()
-		{
-		}
-		[TestMethod]
-		public void Test_1094()
-		{
-		}
-		[TestMethod]
-		public void Test_1095()
-		{
-		}
-		[TestMethod]
-		public void Test_1096()
-		{
-		}
-		[TestMethod]
-		public void Test_1097()
-		{
-		}
-		[TestMethod]
-		public void Test_1098()
-		{
-		}
-		[TestMethod]
-		public void Test_1099()
-		{
-		}
-		[TestMethod]
-		public void Test_1100()
-		{
-		}
-		[TestMethod]
-		public void Test_1101()
-		{
-		}
-		[TestMethod]
-		public void Test_1102()
-		{
-		}
-		[TestMethod]
-		public void Test_1103()
-		{
-		}
-		[TestMethod]
-		public void Test_1104()
-		{
-		}
-		[TestMethod]
-		public void Test_1105()
-		{
-		}
-		[TestMethod]
-		public void Test_1106()
-		{
-		}
-		[TestMethod]
-		public void Test_1107()
-		{
-		}
-		[TestMethod]
-		public void Test_1108()
-		{
-		}
-		[TestMethod]
-		public void Test_1109()
-		{
-		}
-		[TestMethod]
-		public void Test_1110()
-		{
-		}
-		[TestMethod]
-		public void Test_1111()
-		{
-		}
-		[TestMethod]
-		public void Test_1112()
-		{
-		}
-		[TestMethod]
-		public void Test_1113()
-		{
-		}
-		[TestMethod]
-		public void Test_1114()
-		{
-		}
-		[TestMethod]
-		public void Test_1115()
-		{
-		}
-		[TestMethod]
-		public void Test_1116()
-		{
-		}
-		[TestMethod]
-		public void Test_1117()
-		{
-		}
-		[TestMethod]
-		public void Test_1118()
-		{
-		}
-		[TestMethod]
-		public void Test_1119()
-		{
-		}
-		[TestMethod]
-		public void Test_1120()
-		{
-		}
-		[TestMethod]
-		public void Test_1121()
-		{
-		}
-		[TestMethod]
-		public void Test_1122()
-		{
-		}
-		[TestMethod]
-		public void Test_1123()
-		{
-		}
-		[TestMethod]
-		public void Test_1124()
-		{
-		}
-		[TestMethod]
-		public void Test_1125()
-		{
-		}
-		[TestMethod]
-		public void Test_1126()
-		{
-		}
-		[TestMethod]
-		public void Test_1127()
-		{
-		}
-		[TestMethod]
-		public void Test_1128()
-		{
-		}
-		[TestMethod]
-		public void Test_1129()
-		{
-		}
-		[TestMethod]
-		public void Test_1130()
-		{
-		}
-		[TestMethod]
-		public void Test_1131()
-		{
-		}
-		[TestMethod]
-		public void Test_1132()
-		{
-		}
-		[TestMethod]
-		public void Test_1133()
-		{
-		}
-		[TestMethod]
-		public void Test_1134()
-		{
-		}
-		[TestMethod]
-		public void Test_1135()
-		{
-		}
-		[TestMethod]
-		public void Test_1136()
-		{
-		}
-		[TestMethod]
-		public void Test_1137()
-		{
-		}
-		[TestMethod]
-		public void Test_1138()
-		{
-		}
-		[TestMethod]
-		public void Test_1139()
-		{
-		}
-		[TestMethod]
-		public void Test_1140()
-		{
-		}
-		[TestMethod]
-		public void Test_1141()
-		{
-		}
-		[TestMethod]
-		public void Test_1142()
-		{
-		}
-		[TestMethod]
-		public void Test_1143()
-		{
-		}
-		[TestMethod]
-		public void Test_1144()
-		{
-		}
-		[TestMethod]
-		public void Test_1145()
-		{
-		}
-		[TestMethod]
-		public void Test_1146()
-		{
-		}
-		[TestMethod]
-		public void Test_1147()
-		{
-		}
-		[TestMethod]
-		public void Test_1148()
-		{
-		}
-		[TestMethod]
-		public void Test_1149()
-		{
-		}
-		[TestMethod]
-		public void Test_1150()
-		{
-		}
-		[TestMethod]
-		public void Test_1151()
-		{
-		}
-		[TestMethod]
-		public void Test_1152()
-		{
-		}
-		[TestMethod]
-		public void Test_1153()
-		{
-		}
-		[TestMethod]
-		public void Test_1154()
-		{
-		}
-		[TestMethod]
-		public void Test_1155()
-		{
-		}
-		[TestMethod]
-		public void Test_1156()
-		{
-		}
-		[TestMethod]
-		public void Test_1157()
-		{
-		}
-		[TestMethod]
-		public void Test_1158()
-		{
-		}
-		[TestMethod]
-		public void Test_1159()
-		{
-		}
-		[TestMethod]
-		public void Test_1160()
-		{
-		}
-		[TestMethod]
-		public void Test_1161()
-		{
-		}
-		[TestMethod]
-		public void Test_1162()
-		{
-		}
-		[TestMethod]
-		public void Test_1163()
-		{
-		}
-		[TestMethod]
-		public void Test_1164()
-		{
-		}
-		[TestMethod]
-		public void Test_1165()
-		{
-		}
-		[TestMethod]
-		public void Test_1166()
-		{
-		}
-		[TestMethod]
-		public void Test_1167()
-		{
-		}
-		[TestMethod]
-		public void Test_1168()
-		{
-		}
-		[TestMethod]
-		public void Test_1169()
-		{
-		}
-		[TestMethod]
-		public void Test_1170()
-		{
-		}
-		[TestMethod]
-		public void Test_1171()
-		{
-		}
-		[TestMethod]
-		public void Test_1172()
-		{
-		}
-		[TestMethod]
-		public void Test_1173()
-		{
-		}
-		[TestMethod]
-		public void Test_1174()
-		{
-		}
-		[TestMethod]
-		public void Test_1175()
-		{
-		}
-		[TestMethod]
-		public void Test_1176()
-		{
-		}
-		[TestMethod]
-		public void Test_1177()
-		{
-		}
-		[TestMethod]
-		public void Test_1178()
-		{
-		}
-		[TestMethod]
-		public void Test_1179()
-		{
-		}
-		[TestMethod]
-		public void Test_1180()
-		{
-		}
-		[TestMethod]
-		public void Test_1181()
-		{
-		}
-		[TestMethod]
-		public void Test_1182()
-		{
-		}
-		[TestMethod]
-		public void Test_1183()
-		{
-		}
-		[TestMethod]
-		public void Test_1184()
-		{
-		}
-		[TestMethod]
-		public void Test_1185()
-		{
-		}
-		[TestMethod]
-		public void Test_1186()
-		{
-		}
-		[TestMethod]
-		public void Test_1187()
-		{
-		}
-		[TestMethod]
-		public void Test_1188()
-		{
-		}
-		[TestMethod]
-		public void Test_1189()
-		{
-		}
-		[TestMethod]
-		public void Test_1190()
-		{
-		}
-		[TestMethod]
-		public void Test_1191()
-		{
-		}
-		[TestMethod]
-		public void Test_1192()
-		{
-		}
-		[TestMethod]
-		public void Test_1193()
-		{
-		}
-		[TestMethod]
-		public void Test_1194()
-		{
-		}
-		[TestMethod]
-		public void Test_1195()
-		{
-		}
-		[TestMethod]
-		public void Test_1196()
-		{
-		}
-		[TestMethod]
-		public void Test_1197()
-		{
-		}
-		[TestMethod]
-		public void Test_1198()
-		{
-		}
-		[TestMethod]
-		public void Test_1199()
-		{
-		}
-		[TestMethod]
-		public void Test_1200()
-		{
-		}
-		[TestMethod]
-		public void Test_1201()
-		{
-		}
-		[TestMethod]
-		public void Test_1202()
-		{
-		}
-		[TestMethod]
-		public void Test_1203()
-		{
-		}
-		[TestMethod]
-		public void Test_1204()
-		{
-		}
-		[TestMethod]
-		public void Test_1205()
-		{
-		}
-		[TestMethod]
-		public void Test_1206()
-		{
-		}
-		[TestMethod]
-		public void Test_1207()
-		{
-		}
-		[TestMethod]
-		public void Test_1208()
-		{
-		}
-		[TestMethod]
-		public void Test_1209()
-		{
-		}
-		[TestMethod]
-		public void Test_1210()
-		{
-		}
-		[TestMethod]
-		public void Test_1211()
-		{
-		}
-		[TestMethod]
-		public void Test_1212()
-		{
-		}
-		[TestMethod]
-		public void Test_1213()
-		{
-		}
-		[TestMethod]
-		public void Test_1214()
-		{
-		}
-		[TestMethod]
-		public void Test_1215()
-		{
-		}
-		[TestMethod]
-		public void Test_1216()
-		{
-		}
-		[TestMethod]
-		public void Test_1217()
-		{
-		}
-		[TestMethod]
-		public void Test_1218()
-		{
-		}
-		[TestMethod]
-		public void Test_1219()
-		{
-		}
-		[TestMethod]
-		public void Test_1220()
-		{
-		}
-		[TestMethod]
-		public void Test_1221()
-		{
-		}
-		[TestMethod]
-		public void Test_1222()
-		{
-		}
-		[TestMethod]
-		public void Test_1223()
-		{
-		}
-		[TestMethod]
-		public void Test_1224()
-		{
-		}
-		[TestMethod]
-		public void Test_1225()
-		{
-		}
-		[TestMethod]
-		public void Test_1226()
-		{
-		}
-		[TestMethod]
-		public void Test_1227()
-		{
-		}
-		[TestMethod]
-		public void Test_1228()
-		{
-		}
-		[TestMethod]
-		public void Test_1229()
-		{
-		}
-		[TestMethod]
-		public void Test_1230()
-		{
-		}
-		[TestMethod]
-		public void Test_1231()
-		{
-		}
-		[TestMethod]
-		public void Test_1232()
-		{
-		}
-		[TestMethod]
-		public void Test_1233()
-		{
-		}
-		[TestMethod]
-		public void Test_1234()
-		{
-		}
-		[TestMethod]
-		public void Test_1235()
-		{
-		}
-		[TestMethod]
-		public void Test_1236()
-		{
-		}
-		[TestMethod]
-		public void Test_1237()
-		{
-		}
-		[TestMethod]
-		public void Test_1238()
-		{
-		}
-		[TestMethod]
-		public void Test_1239()
-		{
-		}
-		[TestMethod]
-		public void Test_1240()
-		{
-		}
-		[TestMethod]
-		public void Test_1241()
-		{
-		}
-		[TestMethod]
-		public void Test_1242()
-		{
-		}
-		[TestMethod]
-		public void Test_1243()
-		{
-		}
-		[TestMethod]
-		public void Test_1244()
-		{
-		}
-		[TestMethod]
-		public void Test_1245()
-		{
-		}
-		[TestMethod]
-		public void Test_1246()
-		{
-		}
-		[TestMethod]
-		public void Test_1247()
-		{
-		}
-		[TestMethod]
-		public void Test_1248()
-		{
-		}
-		[TestMethod]
-		public void Test_1249()
-		{
-		}
-		[TestMethod]
-		public void Test_1250()
-		{
-		}
-		[TestMethod]
-		public void Test_1251()
-		{
-		}
-		[TestMethod]
-		public void Test_1252()
-		{
-		}
-		[TestMethod]
-		public void Test_1253()
-		{
-		}
-		[TestMethod]
-		public void Test_1254()
-		{
-		}
-		[TestMethod]
-		public void Test_1255()
-		{
-		}
-		[TestMethod]
-		public void Test_1256()
-		{
-		}
-		[TestMethod]
-		public void Test_1257()
-		{
-		}
-		[TestMethod]
-		public void Test_1258()
-		{
-		}
-		[TestMethod]
-		public void Test_1259()
-		{
-		}
-		[TestMethod]
-		public void Test_1260()
-		{
-		}
-		[TestMethod]
-		public void Test_1261()
-		{
-		}
-		[TestMethod]
-		public void Test_1262()
-		{
-		}
-		[TestMethod]
-		public void Test_1263()
-		{
-		}
-		[TestMethod]
-		public void Test_1264()
-		{
-		}
-		[TestMethod]
-		public void Test_1265()
-		{
-		}
-		[TestMethod]
-		public void Test_1266()
-		{
-		}
-		[TestMethod]
-		public void Test_1267()
-		{
-		}
-		[TestMethod]
-		public void Test_1268()
-		{
-		}
-		[TestMethod]
-		public void Test_1269()
-		{
-		}
-		[TestMethod]
-		public void Test_1270()
-		{
-		}
-		[TestMethod]
-		public void Test_1271()
-		{
-		}
-		[TestMethod]
-		public void Test_1272()
-		{
-		}
-		[TestMethod]
-		public void Test_1273()
-		{
-		}
-		[TestMethod]
-		public void Test_1274()
-		{
-		}
-		[TestMethod]
-		public void Test_1275()
-		{
-		}
-		[TestMethod]
-		public void Test_1276()
-		{
-		}
-		[TestMethod]
-		public void Test_1277()
-		{
-		}
-		[TestMethod]
-		public void Test_1278()
-		{
-		}
-		[TestMethod]
-		public void Test_1279()
-		{
-		}
-		[TestMethod]
-		public void Test_1280()
-		{
-		}
-		[TestMethod]
-		public void Test_1281()
-		{
-		}
-		[TestMethod]
-		public void Test_1282()
-		{
-		}
-		[TestMethod]
-		public void Test_1283()
-		{
-		}
-		[TestMethod]
-		public void Test_1284()
-		{
-		}
-		[TestMethod]
-		public void Test_1285()
-		{
-		}
-		[TestMethod]
-		public void Test_1286()
-		{
-		}
-		[TestMethod]
-		public void Test_1287()
-		{
-		}
-		[TestMethod]
-		public void Test_1288()
-		{
-		}
-		[TestMethod]
-		public void Test_1289()
-		{
-		}
-		[TestMethod]
-		public void Test_1290()
-		{
-		}
-		[TestMethod]
-		public void Test_1291()
-		{
-		}
-		[TestMethod]
-		public void Test_1292()
-		{
-		}
-		[TestMethod]
-		public void Test_1293()
-		{
-		}
-		[TestMethod]
-		public void Test_1294()
-		{
-		}
-		[TestMethod]
-		public void Test_1295()
-		{
-		}
-		[TestMethod]
-		public void Test_1296()
-		{
-		}
-		[TestMethod]
-		public void Test_1297()
-		{
-		}
-		[TestMethod]
-		public void Test_1298()
-		{
-		}
-		[TestMethod]
-		public void Test_1299()
-		{
-		}
-		[TestMethod]
-		public void Test_1300()
-		{
-		}
-		[TestMethod]
-		public void Test_1301()
-		{
-		}
-		[TestMethod]
-		public void Test_1302()
-		{
-		}
-		[TestMethod]
-		public void Test_1303()
-		{
-		}
-		[TestMethod]
-		public void Test_1304()
-		{
-		}
-		[TestMethod]
-		public void Test_1305()
-		{
-		}
-		[TestMethod]
-		public void Test_1306()
-		{
-		}
-		[TestMethod]
-		public void Test_1307()
-		{
-		}
-		[TestMethod]
-		public void Test_1308()
-		{
-		}
-		[TestMethod]
-		public void Test_1309()
-		{
-		}
-		[TestMethod]
-		public void Test_1310()
-		{
-		}
-		[TestMethod]
-		public void Test_1311()
-		{
-		}
-		[TestMethod]
-		public void Test_1312()
-		{
-		}
-		[TestMethod]
-		public void Test_1313()
-		{
-		}
-		[TestMethod]
-		public void Test_1314()
-		{
-		}
-		[TestMethod]
-		public void Test_1315()
-		{
-		}
-		[TestMethod]
-		public void Test_1316()
-		{
-		}
-		[TestMethod]
-		public void Test_1317()
-		{
-		}
-		[TestMethod]
-		public void Test_1318()
-		{
-		}
-		[TestMethod]
-		public void Test_1319()
-		{
-		}
-		[TestMethod]
-		public void Test_1320()
-		{
-		}
-		[TestMethod]
-		public void Test_1321()
-		{
-		}
-		[TestMethod]
-		public void Test_1322()
-		{
-		}
-		[TestMethod]
-		public void Test_1323()
-		{
-		}
-		[TestMethod]
-		public void Test_1324()
-		{
-		}
-		[TestMethod]
-		public void Test_1325()
-		{
-		}
-		[TestMethod]
-		public void Test_1326()
-		{
-		}
-		[TestMethod]
-		public void Test_1327()
-		{
-		}
-		[TestMethod]
-		public void Test_1328()
-		{
-		}
-		[TestMethod]
-		public void Test_1329()
-		{
-		}
-		[TestMethod]
-		public void Test_1330()
-		{
-		}
-		[TestMethod]
-		public void Test_1331()
-		{
-		}
-		[TestMethod]
-		public void Test_1332()
-		{
-		}
-		[TestMethod]
-		public void Test_1333()
-		{
-		}
-		[TestMethod]
-		public void Test_1334()
-		{
-		}
-		[TestMethod]
-		public void Test_1335()
-		{
-		}
-		[TestMethod]
-		public void Test_1336()
-		{
-		}
-		[TestMethod]
-		public void Test_1337()
-		{
-		}
-		[TestMethod]
-		public void Test_1338()
-		{
-		}
-		[TestMethod]
-		public void Test_1339()
-		{
-		}
-		[TestMethod]
-		public void Test_1340()
-		{
-		}
-		[TestMethod]
-		public void Test_1341()
-		{
-		}
-		[TestMethod]
-		public void Test_1342()
-		{
-		}
-		[TestMethod]
-		public void Test_1343()
-		{
-		}
-		[TestMethod]
-		public void Test_1344()
-		{
-		}
-		[TestMethod]
-		public void Test_1345()
-		{
-		}
-		[TestMethod]
-		public void Test_1346()
-		{
-		}
-		[TestMethod]
-		public void Test_1347()
-		{
-		}
-		[TestMethod]
-		public void Test_1348()
-		{
-		}
-		[TestMethod]
-		public void Test_1349()
-		{
-		}
-		[TestMethod]
-		public void Test_1350()
-		{
-		}
-		[TestMethod]
-		public void Test_1351()
-		{
-		}
-		[TestMethod]
-		public void Test_1352()
-		{
-		}
-		[TestMethod]
-		public void Test_1353()
-		{
-		}
-		[TestMethod]
-		public void Test_1354()
-		{
-		}
-		[TestMethod]
-		public void Test_1355()
-		{
-		}
-		[TestMethod]
-		public void Test_1356()
-		{
-		}
-		[TestMethod]
-		public void Test_1357()
-		{
-		}
-		[TestMethod]
-		public void Test_1358()
-		{
-		}
-		[TestMethod]
-		public void Test_1359()
-		{
-		}
-		[TestMethod]
-		public void Test_1360()
-		{
-		}
-		[TestMethod]
-		public void Test_1361()
-		{
-		}
-		[TestMethod]
-		public void Test_1362()
-		{
-		}
-		[TestMethod]
-		public void Test_1363()
-		{
-		}
-		[TestMethod]
-		public void Test_1364()
-		{
-		}
-		[TestMethod]
-		public void Test_1365()
-		{
-		}
-		[TestMethod]
-		public void Test_1366()
-		{
-		}
-		[TestMethod]
-		public void Test_1367()
-		{
-		}
-		[TestMethod]
-		public void Test_1368()
-		{
-		}
-		[TestMethod]
-		public void Test_1369()
-		{
-		}
-		[TestMethod]
-		public void Test_1370()
-		{
-		}
-		[TestMethod]
-		public void Test_1371()
-		{
-		}
-		[TestMethod]
-		public void Test_1372()
-		{
-		}
-		[TestMethod]
-		public void Test_1373()
-		{
-		}
-		[TestMethod]
-		public void Test_1374()
-		{
-		}
-		[TestMethod]
-		public void Test_1375()
-		{
-		}
-		[TestMethod]
-		public void Test_1376()
-		{
-		}
-		[TestMethod]
-		public void Test_1377()
-		{
-		}
-		[TestMethod]
-		public void Test_1378()
-		{
-		}
-		[TestMethod]
-		public void Test_1379()
-		{
-		}
-		[TestMethod]
-		public void Test_1380()
-		{
-		}
-		[TestMethod]
-		public void Test_1381()
-		{
-		}
-		[TestMethod]
-		public void Test_1382()
-		{
-		}
-		[TestMethod]
-		public void Test_1383()
-		{
-		}
-		[TestMethod]
-		public void Test_1384()
-		{
-		}
-		[TestMethod]
-		public void Test_1385()
-		{
-		}
-		[TestMethod]
-		public void Test_1386()
-		{
-		}
-		[TestMethod]
-		public void Test_1387()
-		{
-		}
-		[TestMethod]
-		public void Test_1388()
-		{
-		}
-		[TestMethod]
-		public void Test_1389()
-		{
-		}
-		[TestMethod]
-		public void Test_1390()
-		{
-		}
-		[TestMethod]
-		public void Test_1391()
-		{
-		}
-		[TestMethod]
-		public void Test_1392()
-		{
-		}
-		[TestMethod]
-		public void Test_1393()
-		{
-		}
-		[TestMethod]
-		public void Test_1394()
-		{
-		}
-		[TestMethod]
-		public void Test_1395()
-		{
-		}
-		[TestMethod]
-		public void Test_1396()
-		{
-		}
-		[TestMethod]
-		public void Test_1397()
-		{
-		}
-		[TestMethod]
-		public void Test_1398()
-		{
-		}
-		[TestMethod]
-		public void Test_1399()
-		{
-		}
-		[TestMethod]
-		public void Test_1400()
-		{
-		}
-		[TestMethod]
-		public void Test_1401()
-		{
-		}
-		[TestMethod]
-		public void Test_1402()
-		{
-		}
-		[TestMethod]
-		public void Test_1403()
-		{
-		}
-		[TestMethod]
-		public void Test_1404()
-		{
-		}
-		[TestMethod]
-		public void Test_1405()
-		{
-		}
-		[TestMethod]
-		public void Test_1406()
-		{
-		}
-		[TestMethod]
-		public void Test_1407()
-		{
-		}
-		[TestMethod]
-		public void Test_1408()
-		{
-		}
-		[TestMethod]
-		public void Test_1409()
-		{
-		}
-		[TestMethod]
-		public void Test_1410()
-		{
-		}
-		[TestMethod]
-		public void Test_1411()
-		{
-		}
-		[TestMethod]
-		public void Test_1412()
-		{
-		}
-		[TestMethod]
-		public void Test_1413()
-		{
-		}
-		[TestMethod]
-		public void Test_1414()
-		{
-		}
-		[TestMethod]
-		public void Test_1415()
-		{
-		}
-		[TestMethod]
-		public void Test_1416()
-		{
-		}
-		[TestMethod]
-		public void Test_1417()
-		{
-		}
-		[TestMethod]
-		public void Test_1418()
-		{
-		}
-		[TestMethod]
-		public void Test_1419()
-		{
-		}
-		[TestMethod]
-		public void Test_1420()
-		{
-		}
-		[TestMethod]
-		public void Test_1421()
-		{
-		}
-		[TestMethod]
-		public void Test_1422()
-		{
-		}
-		[TestMethod]
-		public void Test_1423()
-		{
-		}
-		[TestMethod]
-		public void Test_1424()
-		{
-		}
-		[TestMethod]
-		public void Test_1425()
-		{
-		}
-		[TestMethod]
-		public void Test_1426()
-		{
-		}
-		[TestMethod]
-		public void Test_1427()
-		{
-		}
-		[TestMethod]
-		public void Test_1428()
-		{
-		}
-		[TestMethod]
-		public void Test_1429()
-		{
-		}
-		[TestMethod]
-		public void Test_1430()
-		{
-		}
-		[TestMethod]
-		public void Test_1431()
-		{
-		}
-		[TestMethod]
-		public void Test_1432()
-		{
-		}
-		[TestMethod]
-		public void Test_1433()
-		{
-		}
-		[TestMethod]
-		public void Test_1434()
-		{
-		}
-		[TestMethod]
-		public void Test_1435()
-		{
-		}
-		[TestMethod]
-		public void Test_1436()
-		{
-		}
-		[TestMethod]
-		public void Test_1437()
-		{
-		}
-		[TestMethod]
-		public void Test_1438()
-		{
-		}
-		[TestMethod]
-		public void Test_1439()
-		{
-		}
-		[TestMethod]
-		public void Test_1440()
-		{
-		}
-		[TestMethod]
-		public void Test_1441()
-		{
-		}
-		[TestMethod]
-		public void Test_1442()
-		{
-		}
-		[TestMethod]
-		public void Test_1443()
-		{
-		}
-		[TestMethod]
-		public void Test_1444()
-		{
-		}
-		[TestMethod]
-		public void Test_1445()
-		{
-		}
-		[TestMethod]
-		public void Test_1446()
-		{
-		}
-		[TestMethod]
-		public void Test_1447()
-		{
-		}
-		[TestMethod]
-		public void Test_1448()
-		{
-		}
-		[TestMethod]
-		public void Test_1449()
-		{
-		}
-		[TestMethod]
-		public void Test_1450()
-		{
-		}
-		[TestMethod]
-		public void Test_1451()
-		{
-		}
-		[TestMethod]
-		public void Test_1452()
-		{
-		}
-		[TestMethod]
-		public void Test_1453()
-		{
-		}
-		[TestMethod]
-		public void Test_1454()
-		{
-		}
-		[TestMethod]
-		public void Test_1455()
-		{
-		}
-		[TestMethod]
-		public void Test_1456()
-		{
-		}
-		[TestMethod]
-		public void Test_1457()
-		{
-		}
-		[TestMethod]
-		public void Test_1458()
-		{
-		}
-		[TestMethod]
-		public void Test_1459()
-		{
-		}
-		[TestMethod]
-		public void Test_1460()
-		{
-		}
-		[TestMethod]
-		public void Test_1461()
-		{
-		}
-		[TestMethod]
-		public void Test_1462()
-		{
-		}
-		[TestMethod]
-		public void Test_1463()
-		{
-		}
-		[TestMethod]
-		public void Test_1464()
-		{
-		}
-		[TestMethod]
-		public void Test_1465()
-		{
-		}
-		[TestMethod]
-		public void Test_1466()
-		{
-		}
-		[TestMethod]
-		public void Test_1467()
-		{
-		}
-		[TestMethod]
-		public void Test_1468()
-		{
-		}
-		[TestMethod]
-		public void Test_1469()
-		{
-		}
-		[TestMethod]
-		public void Test_1470()
-		{
-		}
-		[TestMethod]
-		public void Test_1471()
-		{
-		}
-		[TestMethod]
-		public void Test_1472()
-		{
-		}
-		[TestMethod]
-		public void Test_1473()
-		{
-		}
-		[TestMethod]
-		public void Test_1474()
-		{
-		}
-		[TestMethod]
-		public void Test_1475()
-		{
-		}
-		[TestMethod]
-		public void Test_1476()
-		{
-		}
-		[TestMethod]
-		public void Test_1477()
-		{
-		}
-		[TestMethod]
-		public void Test_1478()
-		{
-		}
-		[TestMethod]
-		public void Test_1479()
-		{
-		}
-		[TestMethod]
-		public void Test_1480()
-		{
-		}
-		[TestMethod]
-		public void Test_1481()
-		{
-		}
-		[TestMethod]
-		public void Test_1482()
-		{
-		}
-		[TestMethod]
-		public void Test_1483()
-		{
-		}
-		[TestMethod]
-		public void Test_1484()
-		{
-		}
-		[TestMethod]
-		public void Test_1485()
-		{
-		}
-		[TestMethod]
-		public void Test_1486()
-		{
-		}
-		[TestMethod]
-		public void Test_1487()
-		{
-		}
-		[TestMethod]
-		public void Test_1488()
-		{
-		}
-		[TestMethod]
-		public void Test_1489()
-		{
-		}
-		[TestMethod]
-		public void Test_1490()
-		{
-		}
-		[TestMethod]
-		public void Test_1491()
-		{
-		}
-		[TestMethod]
-		public void Test_1492()
-		{
-		}
-		[TestMethod]
-		public void Test_1493()
-		{
-		}
-		[TestMethod]
-		public void Test_1494()
-		{
-		}
-		[TestMethod]
-		public void Test_1495()
-		{
-		}
-		[TestMethod]
-		public void Test_1496()
-		{
-		}
-		[TestMethod]
-		public void Test_1497()
-		{
-		}
-		[TestMethod]
-		public void Test_1498()
-		{
-		}
-		[TestMethod]
-		public void Test_1499()
-		{
-		}
-		[TestMethod]
-		public void Test_1500()
-		{
-		}
-		[TestMethod]
-		public void Test_1501()
-		{
-		}
-		[TestMethod]
-		public void Test_1502()
-		{
-		}
-		[TestMethod]
-		public void Test_1503()
-		{
-		}
-		[TestMethod]
-		public void Test_1504()
-		{
-		}
-		[TestMethod]
-		public void Test_1505()
-		{
-		}
-		[TestMethod]
-		public void Test_1506()
-		{
-		}
-		[TestMethod]
-		public void Test_1507()
-		{
-		}
-		[TestMethod]
-		public void Test_1508()
-		{
-		}
-		[TestMethod]
-		public void Test_1509()
-		{
-		}
-		[TestMethod]
-		public void Test_1510()
-		{
-		}
-		[TestMethod]
-		public void Test_1511()
-		{
-		}
-		[TestMethod]
-		public void Test_1512()
-		{
-		}
-		[TestMethod]
-		public void Test_1513()
-		{
-		}
-		[TestMethod]
-		public void Test_1514()
-		{
-		}
-		[TestMethod]
-		public void Test_1515()
-		{
-		}
-		[TestMethod]
-		public void Test_1516()
-		{
-		}
-		[TestMethod]
-		public void Test_1517()
-		{
-		}
-		[TestMethod]
-		public void Test_1518()
-		{
-		}
-		[TestMethod]
-		public void Test_1519()
-		{
-		}
-		[TestMethod]
-		public void Test_1520()
-		{
-		}
-		[TestMethod]
-		public void Test_1521()
-		{
-		}
-		[TestMethod]
-		public void Test_1522()
-		{
-		}
-		[TestMethod]
-		public void Test_1523()
-		{
-		}
-		[TestMethod]
-		public void Test_1524()
-		{
-		}
-		[TestMethod]
-		public void Test_1525()
-		{
-		}
-		[TestMethod]
-		public void Test_1526()
-		{
-		}
-		[TestMethod]
-		public void Test_1527()
-		{
-		}
-		[TestMethod]
-		public void Test_1528()
-		{
-		}
-		[TestMethod]
-		public void Test_1529()
-		{
-		}
-		[TestMethod]
-		public void Test_1530()
-		{
-		}
-		[TestMethod]
-		public void Test_1531()
-		{
-		}
-		[TestMethod]
-		public void Test_1532()
-		{
-		}
-		[TestMethod]
-		public void Test_1533()
-		{
-		}
-		[TestMethod]
-		public void Test_1534()
-		{
-		}
-		[TestMethod]
-		public void Test_1535()
-		{
-		}
-		[TestMethod]
-		public void Test_1536()
-		{
-		}
-		[TestMethod]
-		public void Test_1537()
-		{
-		}
-		[TestMethod]
-		public void Test_1538()
-		{
-		}
-		[TestMethod]
-		public void Test_1539()
-		{
-		}
-		[TestMethod]
-		public void Test_1540()
-		{
-		}
-		[TestMethod]
-		public void Test_1541()
-		{
-		}
-		[TestMethod]
-		public void Test_1542()
-		{
-		}
-		[TestMethod]
-		public void Test_1543()
-		{
-		}
-		[TestMethod]
-		public void Test_1544()
-		{
-		}
-		[TestMethod]
-		public void Test_1545()
-		{
-		}
-		[TestMethod]
-		public void Test_1546()
-		{
-		}
-		[TestMethod]
-		public void Test_1547()
-		{
-		}
-		[TestMethod]
-		public void Test_1548()
-		{
-		}
-		[TestMethod]
-		public void Test_1549()
-		{
-		}
-		[TestMethod]
-		public void Test_1550()
-		{
-		}
-		[TestMethod]
-		public void Test_1551()
-		{
-		}
-		[TestMethod]
-		public void Test_1552()
-		{
-		}
-		[TestMethod]
-		public void Test_1553()
-		{
-		}
-		[TestMethod]
-		public void Test_1554()
-		{
-		}
-		[TestMethod]
-		public void Test_1555()
-		{
-		}
-		[TestMethod]
-		public void Test_1556()
-		{
-		}
-		[TestMethod]
-		public void Test_1557()
-		{
-		}
-		[TestMethod]
-		public void Test_1558()
-		{
-		}
-		[TestMethod]
-		public void Test_1559()
-		{
-		}
-		[TestMethod]
-		public void Test_1560()
-		{
-		}
-		[TestMethod]
-		public void Test_1561()
-		{
-		}
-		[TestMethod]
-		public void Test_1562()
-		{
-		}
-		[TestMethod]
-		public void Test_1563()
-		{
-		}
-		[TestMethod]
-		public void Test_1564()
-		{
-		}
-		[TestMethod]
-		public void Test_1565()
-		{
-		}
-		[TestMethod]
-		public void Test_1566()
-		{
-		}
-		[TestMethod]
-		public void Test_1567()
-		{
-		}
-		[TestMethod]
-		public void Test_1568()
-		{
-		}
-		[TestMethod]
-		public void Test_1569()
-		{
-		}
-		[TestMethod]
-		public void Test_1570()
-		{
-		}
-		[TestMethod]
-		public void Test_1571()
-		{
-		}
-		[TestMethod]
-		public void Test_1572()
-		{
-		}
-		[TestMethod]
-		public void Test_1573()
-		{
-		}
-		[TestMethod]
-		public void Test_1574()
-		{
-		}
-		[TestMethod]
-		public void Test_1575()
-		{
-		}
-		[TestMethod]
-		public void Test_1576()
-		{
-		}
-		[TestMethod]
-		public void Test_1577()
-		{
-		}
-		[TestMethod]
-		public void Test_1578()
-		{
-		}
-		[TestMethod]
-		public void Test_1579()
-		{
-		}
-		[TestMethod]
-		public void Test_1580()
-		{
-		}
-		[TestMethod]
-		public void Test_1581()
-		{
-		}
-		[TestMethod]
-		public void Test_1582()
-		{
-		}
-		[TestMethod]
-		public void Test_1583()
-		{
-		}
-		[TestMethod]
-		public void Test_1584()
-		{
-		}
-		[TestMethod]
-		public void Test_1585()
-		{
-		}
-		[TestMethod]
-		public void Test_1586()
-		{
-		}
-		[TestMethod]
-		public void Test_1587()
-		{
-		}
-		[TestMethod]
-		public void Test_1588()
-		{
-		}
-		[TestMethod]
-		public void Test_1589()
-		{
-		}
-		[TestMethod]
-		public void Test_1590()
-		{
-		}
-		[TestMethod]
-		public void Test_1591()
-		{
-		}
-		[TestMethod]
-		public void Test_1592()
-		{
-		}
-		[TestMethod]
-		public void Test_1593()
-		{
-		}
-		[TestMethod]
-		public void Test_1594()
-		{
-		}
-		[TestMethod]
-		public void Test_1595()
-		{
-		}
-		[TestMethod]
-		public void Test_1596()
-		{
-		}
-		[TestMethod]
-		public void Test_1597()
-		{
-		}
-		[TestMethod]
-		public void Test_1598()
-		{
-		}
-		[TestMethod]
-		public void Test_1599()
-		{
-		}
-		[TestMethod]
-		public void Test_1600()
-		{
-		}
-		[TestMethod]
-		public void Test_1601()
-		{
-		}
-		[TestMethod]
-		public void Test_1602()
-		{
-		}
-		[TestMethod]
-		public void Test_1603()
-		{
-		}
-		[TestMethod]
-		public void Test_1604()
-		{
-		}
-		[TestMethod]
-		public void Test_1605()
-		{
-		}
-		[TestMethod]
-		public void Test_1606()
-		{
-		}
-		[TestMethod]
-		public void Test_1607()
-		{
-		}
-		[TestMethod]
-		public void Test_1608()
-		{
-		}
-		[TestMethod]
-		public void Test_1609()
-		{
-		}
-		[TestMethod]
-		public void Test_1610()
-		{
-		}
-		[TestMethod]
-		public void Test_1611()
-		{
-		}
-		[TestMethod]
-		public void Test_1612()
-		{
-		}
-		[TestMethod]
-		public void Test_1613()
-		{
-		}
-		[TestMethod]
-		public void Test_1614()
-		{
-		}
-		[TestMethod]
-		public void Test_1615()
-		{
-		}
-		[TestMethod]
-		public void Test_1616()
-		{
-		}
-		[TestMethod]
-		public void Test_1617()
-		{
-		}
-		[TestMethod]
-		public void Test_1618()
-		{
-		}
-		[TestMethod]
-		public void Test_1619()
-		{
-		}
-		[TestMethod]
-		public void Test_1620()
-		{
-		}
-		[TestMethod]
-		public void Test_1621()
-		{
-		}
-		[TestMethod]
-		public void Test_1622()
-		{
-		}
-		[TestMethod]
-		public void Test_1623()
-		{
-		}
-		[TestMethod]
-		public void Test_1624()
-		{
-		}
-		[TestMethod]
-		public void Test_1625()
-		{
-		}
-		[TestMethod]
-		public void Test_1626()
-		{
-		}
-		[TestMethod]
-		public void Test_1627()
-		{
-		}
-		[TestMethod]
-		public void Test_1628()
-		{
-		}
-		[TestMethod]
-		public void Test_1629()
-		{
-		}
-		[TestMethod]
-		public void Test_1630()
-		{
-		}
-		[TestMethod]
-		public void Test_1631()
-		{
-		}
-		[TestMethod]
-		public void Test_1632()
-		{
-		}
-		[TestMethod]
-		public void Test_1633()
-		{
-		}
-		[TestMethod]
-		public void Test_1634()
-		{
-		}
-		[TestMethod]
-		public void Test_1635()
-		{
-		}
-		[TestMethod]
-		public void Test_1636()
-		{
-		}
-		[TestMethod]
-		public void Test_1637()
-		{
-		}
-		[TestMethod]
-		public void Test_1638()
-		{
-		}
-		[TestMethod]
-		public void Test_1639()
-		{
-		}
-		[TestMethod]
-		public void Test_1640()
-		{
-		}
-		[TestMethod]
-		public void Test_1641()
-		{
-		}
-		[TestMethod]
-		public void Test_1642()
-		{
-		}
-		[TestMethod]
-		public void Test_1643()
-		{
-		}
-		[TestMethod]
-		public void Test_1644()
-		{
-		}
-		[TestMethod]
-		public void Test_1645()
-		{
-		}
-		[TestMethod]
-		public void Test_1646()
-		{
-		}
-		[TestMethod]
-		public void Test_1647()
-		{
-		}
-		[TestMethod]
-		public void Test_1648()
-		{
-		}
-		[TestMethod]
-		public void Test_1649()
-		{
-		}
-		[TestMethod]
-		public void Test_1650()
-		{
-		}
-		[TestMethod]
-		public void Test_1651()
-		{
-		}
-		[TestMethod]
-		public void Test_1652()
-		{
-		}
-		[TestMethod]
-		public void Test_1653()
-		{
-		}
-		[TestMethod]
-		public void Test_1654()
-		{
-		}
-		[TestMethod]
-		public void Test_1655()
-		{
-		}
-		[TestMethod]
-		public void Test_1656()
-		{
-		}
-		[TestMethod]
-		public void Test_1657()
-		{
-		}
-		[TestMethod]
-		public void Test_1658()
-		{
-		}
-		[TestMethod]
-		public void Test_1659()
-		{
-		}
-		[TestMethod]
-		public void Test_1660()
-		{
-		}
-		[TestMethod]
-		public void Test_1661()
-		{
-		}
-		[TestMethod]
-		public void Test_1662()
-		{
-		}
-		[TestMethod]
-		public void Test_1663()
-		{
-		}
-		[TestMethod]
-		public void Test_1664()
-		{
-		}
-		[TestMethod]
-		public void Test_1665()
-		{
-		}
-		[TestMethod]
-		public void Test_1666()
-		{
-		}
-		[TestMethod]
-		public void Test_1667()
-		{
-		}
-		[TestMethod]
-		public void Test_1668()
-		{
-		}
-		[TestMethod]
-		public void Test_1669()
-		{
-		}
-		[TestMethod]
-		public void Test_1670()
-		{
-		}
-		[TestMethod]
-		public void Test_1671()
-		{
-		}
-		[TestMethod]
-		public void Test_1672()
-		{
-		}
-		[TestMethod]
-		public void Test_1673()
-		{
-		}
-		[TestMethod]
-		public void Test_1674()
-		{
-		}
-		[TestMethod]
-		public void Test_1675()
-		{
-		}
-		[TestMethod]
-		public void Test_1676()
-		{
-		}
-		[TestMethod]
-		public void Test_1677()
-		{
-		}
-		[TestMethod]
-		public void Test_1678()
-		{
-		}
-		[TestMethod]
-		public void Test_1679()
-		{
-		}
-		[TestMethod]
-		public void Test_1680()
-		{
-		}
-		[TestMethod]
-		public void Test_1681()
-		{
-		}
-		[TestMethod]
-		public void Test_1682()
-		{
-		}
-		[TestMethod]
-		public void Test_1683()
-		{
-		}
-		[TestMethod]
-		public void Test_1684()
-		{
-		}
-		[TestMethod]
-		public void Test_1685()
-		{
-		}
-		[TestMethod]
-		public void Test_1686()
-		{
-		}
-		[TestMethod]
-		public void Test_1687()
-		{
-		}
-		[TestMethod]
-		public void Test_1688()
-		{
-		}
-		[TestMethod]
-		public void Test_1689()
-		{
-		}
-		[TestMethod]
-		public void Test_1690()
-		{
-		}
-		[TestMethod]
-		public void Test_1691()
-		{
-		}
-		[TestMethod]
-		public void Test_1692()
-		{
-		}
-		[TestMethod]
-		public void Test_1693()
-		{
-		}
-		[TestMethod]
-		public void Test_1694()
-		{
-		}
-		[TestMethod]
-		public void Test_1695()
-		{
-		}
-		[TestMethod]
-		public void Test_1696()
-		{
-		}
-		[TestMethod]
-		public void Test_1697()
-		{
-		}
-		[TestMethod]
-		public void Test_1698()
-		{
-		}
-		[TestMethod]
-		public void Test_1699()
-		{
-		}
-		[TestMethod]
-		public void Test_1700()
-		{
-		}
-		[TestMethod]
-		public void Test_1701()
-		{
-		}
-		[TestMethod]
-		public void Test_1702()
-		{
-		}
-		[TestMethod]
-		public void Test_1703()
-		{
-		}
-		[TestMethod]
-		public void Test_1704()
-		{
-		}
-		[TestMethod]
-		public void Test_1705()
-		{
-		}
-		[TestMethod]
-		public void Test_1706()
-		{
-		}
-		[TestMethod]
-		public void Test_1707()
-		{
-		}
-		[TestMethod]
-		public void Test_1708()
-		{
-		}
-		[TestMethod]
-		public void Test_1709()
-		{
-		}
-		[TestMethod]
-		public void Test_1710()
-		{
-		}
-		[TestMethod]
-		public void Test_1711()
-		{
-		}
-		[TestMethod]
-		public void Test_1712()
-		{
-		}
-		[TestMethod]
-		public void Test_1713()
-		{
-		}
-		[TestMethod]
-		public void Test_1714()
-		{
-		}
-		[TestMethod]
-		public void Test_1715()
-		{
-		}
-		[TestMethod]
-		public void Test_1716()
-		{
-		}
-		[TestMethod]
-		public void Test_1717()
-		{
-		}
-		[TestMethod]
-		public void Test_1718()
-		{
-		}
-		[TestMethod]
-		public void Test_1719()
-		{
-		}
-		[TestMethod]
-		public void Test_1720()
-		{
-		}
-		[TestMethod]
-		public void Test_1721()
-		{
-		}
-		[TestMethod]
-		public void Test_1722()
-		{
-		}
-		[TestMethod]
-		public void Test_1723()
-		{
-		}
-		[TestMethod]
-		public void Test_1724()
-		{
-		}
-		[TestMethod]
-		public void Test_1725()
-		{
-		}
-		[TestMethod]
-		public void Test_1726()
-		{
-		}
-		[TestMethod]
-		public void Test_1727()
-		{
-		}
-		[TestMethod]
-		public void Test_1728()
-		{
-		}
-		[TestMethod]
-		public void Test_1729()
-		{
-		}
-		[TestMethod]
-		public void Test_1730()
-		{
-		}
-		[TestMethod]
-		public void Test_1731()
-		{
-		}
-		[TestMethod]
-		public void Test_1732()
-		{
-		}
-		[TestMethod]
-		public void Test_1733()
-		{
-		}
-		[TestMethod]
-		public void Test_1734()
-		{
-		}
-		[TestMethod]
-		public void Test_1735()
-		{
-		}
-		[TestMethod]
-		public void Test_1736()
-		{
-		}
-		[TestMethod]
-		public void Test_1737()
-		{
-		}
-		[TestMethod]
-		public void Test_1738()
-		{
-		}
-		[TestMethod]
-		public void Test_1739()
-		{
-		}
-		[TestMethod]
-		public void Test_1740()
-		{
-		}
-		[TestMethod]
-		public void Test_1741()
-		{
-		}
-		[TestMethod]
-		public void Test_1742()
-		{
-		}
-		[TestMethod]
-		public void Test_1743()
-		{
-		}
-		[TestMethod]
-		public void Test_1744()
-		{
-		}
-		[TestMethod]
-		public void Test_1745()
-		{
-		}
-		[TestMethod]
-		public void Test_1746()
-		{
-		}
-		[TestMethod]
-		public void Test_1747()
-		{
-		}
-		[TestMethod]
-		public void Test_1748()
-		{
-		}
-		[TestMethod]
-		public void Test_1749()
-		{
-		}
-		[TestMethod]
-		public void Test_1750()
-		{
-		}
-		[TestMethod]
-		public void Test_1751()
-		{
-		}
-		[TestMethod]
-		public void Test_1752()
-		{
-		}
-		[TestMethod]
-		public void Test_1753()
-		{
-		}
-		[TestMethod]
-		public void Test_1754()
-		{
-		}
-		[TestMethod]
-		public void Test_1755()
-		{
-		}
-		[TestMethod]
-		public void Test_1756()
-		{
-		}
-		[TestMethod]
-		public void Test_1757()
-		{
-		}
-		[TestMethod]
-		public void Test_1758()
-		{
-		}
-		[TestMethod]
-		public void Test_1759()
-		{
-		}
-		[TestMethod]
-		public void Test_1760()
-		{
-		}
-		[TestMethod]
-		public void Test_1761()
-		{
-		}
-		[TestMethod]
-		public void Test_1762()
-		{
-		}
-		[TestMethod]
-		public void Test_1763()
-		{
-		}
-		[TestMethod]
-		public void Test_1764()
-		{
-		}
-		[TestMethod]
-		public void Test_1765()
-		{
-		}
-		[TestMethod]
-		public void Test_1766()
-		{
-		}
-		[TestMethod]
-		public void Test_1767()
-		{
-		}
-		[TestMethod]
-		public void Test_1768()
-		{
-		}
-		[TestMethod]
-		public void Test_1769()
-		{
-		}
-		[TestMethod]
-		public void Test_1770()
-		{
-		}
-		[TestMethod]
-		public void Test_1771()
-		{
-		}
-		[TestMethod]
-		public void Test_1772()
-		{
-		}
-		[TestMethod]
-		public void Test_1773()
-		{
-		}
-		[TestMethod]
-		public void Test_1774()
-		{
-		}
-		[TestMethod]
-		public void Test_1775()
-		{
-		}
-		[TestMethod]
-		public void Test_1776()
-		{
-		}
-		[TestMethod]
-		public void Test_1777()
-		{
-		}
-		[TestMethod]
-		public void Test_1778()
-		{
-		}
-		[TestMethod]
-		public void Test_1779()
-		{
-		}
-		[TestMethod]
-		public void Test_1780()
-		{
-		}
-		[TestMethod]
-		public void Test_1781()
-		{
-		}
-		[TestMethod]
-		public void Test_1782()
-		{
-		}
-		[TestMethod]
-		public void Test_1783()
-		{
-		}
-		[TestMethod]
-		public void Test_1784()
-		{
-		}
-		[TestMethod]
-		public void Test_1785()
-		{
-		}
-		[TestMethod]
-		public void Test_1786()
-		{
-		}
-		[TestMethod]
-		public void Test_1787()
-		{
-		}
-		[TestMethod]
-		public void Test_1788()
-		{
-		}
-		[TestMethod]
-		public void Test_1789()
-		{
-		}
-		[TestMethod]
-		public void Test_1790()
-		{
-		}
-		[TestMethod]
-		public void Test_1791()
-		{
-		}
-		[TestMethod]
-		public void Test_1792()
-		{
-		}
-		[TestMethod]
-		public void Test_1793()
-		{
-		}
-		[TestMethod]
-		public void Test_1794()
-		{
-		}
-		[TestMethod]
-		public void Test_1795()
-		{
-		}
-		[TestMethod]
-		public void Test_1796()
-		{
-		}
-		[TestMethod]
-		public void Test_1797()
-		{
-		}
-		[TestMethod]
-		public void Test_1798()
-		{
-		}
-		[TestMethod]
-		public void Test_1799()
-		{
-		}
-		[TestMethod]
-		public void Test_1800()
-		{
-		}
-		[TestMethod]
-		public void Test_1801()
-		{
-		}
-		[TestMethod]
-		public void Test_1802()
-		{
-		}
-		[TestMethod]
-		public void Test_1803()
-		{
-		}
-		[TestMethod]
-		public void Test_1804()
-		{
-		}
-		[TestMethod]
-		public void Test_1805()
-		{
-		}
-		[TestMethod]
-		public void Test_1806()
-		{
-		}
-		[TestMethod]
-		public void Test_1807()
-		{
-		}
-		[TestMethod]
-		public void Test_1808()
-		{
-		}
-		[TestMethod]
-		public void Test_1809()
-		{
-		}
-		[TestMethod]
-		public void Test_1810()
-		{
-		}
-		[TestMethod]
-		public void Test_1811()
-		{
-		}
-		[TestMethod]
-		public void Test_1812()
-		{
-		}
-		[TestMethod]
-		public void Test_1813()
-		{
-		}
-		[TestMethod]
-		public void Test_1814()
-		{
-		}
-		[TestMethod]
-		public void Test_1815()
-		{
-		}
-		[TestMethod]
-		public void Test_1816()
-		{
-		}
-		[TestMethod]
-		public void Test_1817()
-		{
-		}
-		[TestMethod]
-		public void Test_1818()
-		{
-		}
-		[TestMethod]
-		public void Test_1819()
-		{
-		}
-		[TestMethod]
-		public void Test_1820()
-		{
-		}
-		[TestMethod]
-		public void Test_1821()
-		{
-		}
-		[TestMethod]
-		public void Test_1822()
-		{
-		}
-		[TestMethod]
-		public void Test_1823()
-		{
-		}
-		[TestMethod]
-		public void Test_1824()
-		{
-		}
-		[TestMethod]
-		public void Test_1825()
-		{
-		}
-		[TestMethod]
-		public void Test_1826()
-		{
-		}
-		[TestMethod]
-		public void Test_1827()
-		{
-		}
-		[TestMethod]
-		public void Test_1828()
-		{
-		}
-		[TestMethod]
-		public void Test_1829()
-		{
-		}
-		[TestMethod]
-		public void Test_1830()
-		{
-		}
-		[TestMethod]
-		public void Test_1831()
-		{
-		}
-		[TestMethod]
-		public void Test_1832()
-		{
-		}
-		[TestMethod]
-		public void Test_1833()
-		{
-		}
-		[TestMethod]
-		public void Test_1834()
-		{
-		}
-		[TestMethod]
-		public void Test_1835()
-		{
-		}
-		[TestMethod]
-		public void Test_1836()
-		{
-		}
-		[TestMethod]
-		public void Test_1837()
-		{
-		}
-		[TestMethod]
-		public void Test_1838()
-		{
-		}
-		[TestMethod]
-		public void Test_1839()
-		{
-		}
-		[TestMethod]
-		public void Test_1840()
-		{
-		}
-		[TestMethod]
-		public void Test_1841()
-		{
-		}
-		[TestMethod]
-		public void Test_1842()
-		{
-		}
-		[TestMethod]
-		public void Test_1843()
-		{
-		}
-		[TestMethod]
-		public void Test_1844()
-		{
-		}
-		[TestMethod]
-		public void Test_1845()
-		{
-		}
-		[TestMethod]
-		public void Test_1846()
-		{
-		}
-		[TestMethod]
-		public void Test_1847()
-		{
-		}
-		[TestMethod]
-		public void Test_1848()
-		{
-		}
-		[TestMethod]
-		public void Test_1849()
-		{
-		}
-		[TestMethod]
-		public void Test_1850()
-		{
-		}
-		[TestMethod]
-		public void Test_1851()
-		{
-		}
-		[TestMethod]
-		public void Test_1852()
-		{
-		}
-		[TestMethod]
-		public void Test_1853()
-		{
-		}
-		[TestMethod]
-		public void Test_1854()
-		{
-		}
-		[TestMethod]
-		public void Test_1855()
-		{
-		}
-		[TestMethod]
-		public void Test_1856()
-		{
-		}
-		[TestMethod]
-		public void Test_1857()
-		{
-		}
-		[TestMethod]
-		public void Test_1858()
-		{
-		}
-		[TestMethod]
-		public void Test_1859()
-		{
-		}
-		[TestMethod]
-		public void Test_1860()
-		{
-		}
-		[TestMethod]
-		public void Test_1861()
-		{
-		}
-		[TestMethod]
-		public void Test_1862()
-		{
-		}
-		[TestMethod]
-		public void Test_1863()
-		{
-		}
-		[TestMethod]
-		public void Test_1864()
-		{
-		}
-		[TestMethod]
-		public void Test_1865()
-		{
-		}
-		[TestMethod]
-		public void Test_1866()
-		{
-		}
-		[TestMethod]
-		public void Test_1867()
-		{
-		}
-		[TestMethod]
-		public void Test_1868()
-		{
-		}
-		[TestMethod]
-		public void Test_1869()
-		{
-		}
-		[TestMethod]
-		public void Test_1870()
-		{
-		}
-		[TestMethod]
-		public void Test_1871()
-		{
-		}
-		[TestMethod]
-		public void Test_1872()
-		{
-		}
-		[TestMethod]
-		public void Test_1873()
-		{
-		}
-		[TestMethod]
-		public void Test_1874()
-		{
-		}
-		[TestMethod]
-		public void Test_1875()
-		{
-		}
-		[TestMethod]
-		public void Test_1876()
-		{
-		}
-		[TestMethod]
-		public void Test_1877()
-		{
-		}
-		[TestMethod]
-		public void Test_1878()
-		{
-		}
-		[TestMethod]
-		public void Test_1879()
-		{
-		}
-		[TestMethod]
-		public void Test_1880()
-		{
-		}
-		[TestMethod]
-		public void Test_1881()
-		{
-		}
-		[TestMethod]
-		public void Test_1882()
-		{
-		}
-		[TestMethod]
-		public void Test_1883()
-		{
-		}
-		[TestMethod]
-		public void Test_1884()
-		{
-		}
-		[TestMethod]
-		public void Test_1885()
-		{
-		}
-		[TestMethod]
-		public void Test_1886()
-		{
-		}
-		[TestMethod]
-		public void Test_1887()
-		{
-		}
-		[TestMethod]
-		public void Test_1888()
-		{
-		}
-		[TestMethod]
-		public void Test_1889()
-		{
-		}
-		[TestMethod]
-		public void Test_1890()
-		{
-		}
-		[TestMethod]
-		public void Test_1891()
-		{
-		}
-		[TestMethod]
-		public void Test_1892()
-		{
-		}
-		[TestMethod]
-		public void Test_1893()
-		{
-		}
-		[TestMethod]
-		public void Test_1894()
-		{
-		}
-		[TestMethod]
-		public void Test_1895()
-		{
-		}
-		[TestMethod]
-		public void Test_1896()
-		{
-		}
-		[TestMethod]
-		public void Test_1897()
-		{
-		}
-		[TestMethod]
-		public void Test_1898()
-		{
-		}
-		[TestMethod]
-		public void Test_1899()
-		{
-		}
-		[TestMethod]
-		public void Test_1900()
-		{
-		}
-		[TestMethod]
-		public void Test_1901()
-		{
-		}
-		[TestMethod]
-		public void Test_1902()
-		{
-		}
-		[TestMethod]
-		public void Test_1903()
-		{
-		}
-		[TestMethod]
-		public void Test_1904()
-		{
-		}
-		[TestMethod]
-		public void Test_1905()
-		{
-		}
-		[TestMethod]
-		public void Test_1906()
-		{
-		}
-		[TestMethod]
-		public void Test_1907()
-		{
-		}
-		[TestMethod]
-		public void Test_1908()
-		{
-		}
-		[TestMethod]
-		public void Test_1909()
-		{
-		}
-		[TestMethod]
-		public void Test_1910()
-		{
-		}
-		[TestMethod]
-		public void Test_1911()
-		{
-		}
-		[TestMethod]
-		public void Test_1912()
-		{
-		}
-		[TestMethod]
-		public void Test_1913()
-		{
-		}
-		[TestMethod]
-		public void Test_1914()
-		{
-		}
-		[TestMethod]
-		public void Test_1915()
-		{
-		}
-		[TestMethod]
-		public void Test_1916()
-		{
-		}
-		[TestMethod]
-		public void Test_1917()
-		{
-		}
-		[TestMethod]
-		public void Test_1918()
-		{
-		}
-		[TestMethod]
-		public void Test_1919()
-		{
-		}
-		[TestMethod]
-		public void Test_1920()
-		{
-		}
-		[TestMethod]
-		public void Test_1921()
-		{
-		}
-		[TestMethod]
-		public void Test_1922()
-		{
-		}
-		[TestMethod]
-		public void Test_1923()
-		{
-		}
-		[TestMethod]
-		public void Test_1924()
-		{
-		}
-		[TestMethod]
-		public void Test_1925()
-		{
-		}
-		[TestMethod]
-		public void Test_1926()
-		{
-		}
-		[TestMethod]
-		public void Test_1927()
-		{
-		}
-		[TestMethod]
-		public void Test_1928()
-		{
-		}
-		[TestMethod]
-		public void Test_1929()
-		{
-		}
-		[TestMethod]
-		public void Test_1930()
-		{
-		}
-		[TestMethod]
-		public void Test_1931()
-		{
-		}
-		[TestMethod]
-		public void Test_1932()
-		{
-		}
-		[TestMethod]
-		public void Test_1933()
-		{
-		}
-		[TestMethod]
-		public void Test_1934()
-		{
-		}
-		[TestMethod]
-		public void Test_1935()
-		{
-		}
-		[TestMethod]
-		public void Test_1936()
-		{
-		}
-		[TestMethod]
-		public void Test_1937()
-		{
-		}
-		[TestMethod]
-		public void Test_1938()
-		{
-		}
-		[TestMethod]
-		public void Test_1939()
-		{
-		}
-		[TestMethod]
-		public void Test_1940()
-		{
-		}
-		[TestMethod]
-		public void Test_1941()
-		{
-		}
-		[TestMethod]
-		public void Test_1942()
-		{
-		}
-		[TestMethod]
-		public void Test_1943()
-		{
-		}
-		[TestMethod]
-		public void Test_1944()
-		{
-		}
-		[TestMethod]
-		public void Test_1945()
-		{
-		}
-		[TestMethod]
-		public void Test_1946()
-		{
-		}
-		[TestMethod]
-		public void Test_1947()
-		{
-		}
-		[TestMethod]
-		public void Test_1948()
-		{
-		}
-		[TestMethod]
-		public void Test_1949()
-		{
-		}
-		[TestMethod]
-		public void Test_1950()
-		{
-		}
-		[TestMethod]
-		public void Test_1951()
-		{
-		}
-		[TestMethod]
-		public void Test_1952()
-		{
-		}
-		[TestMethod]
-		public void Test_1953()
-		{
-		}
-		[TestMethod]
-		public void Test_1954()
-		{
-		}
-		[TestMethod]
-		public void Test_1955()
-		{
-		}
-		[TestMethod]
-		public void Test_1956()
-		{
-		}
-		[TestMethod]
-		public void Test_1957()
-		{
-		}
-		[TestMethod]
-		public void Test_1958()
-		{
-		}
-		[TestMethod]
-		public void Test_1959()
-		{
-		}
-		[TestMethod]
-		public void Test_1960()
-		{
-		}
-		[TestMethod]
-		public void Test_1961()
-		{
-		}
-		[TestMethod]
-		public void Test_1962()
-		{
-		}
-		[TestMethod]
-		public void Test_1963()
-		{
-		}
-		[TestMethod]
-		public void Test_1964()
-		{
-		}
-		[TestMethod]
-		public void Test_1965()
-		{
-		}
-		[TestMethod]
-		public void Test_1966()
-		{
-		}
-		[TestMethod]
-		public void Test_1967()
-		{
-		}
-		[TestMethod]
-		public void Test_1968()
-		{
-		}
-		[TestMethod]
-		public void Test_1969()
-		{
-		}
-		[TestMethod]
-		public void Test_1970()
-		{
-		}
-		[TestMethod]
-		public void Test_1971()
-		{
-		}
-		[TestMethod]
-		public void Test_1972()
-		{
-		}
-		[TestMethod]
-		public void Test_1973()
-		{
-		}
-		[TestMethod]
-		public void Test_1974()
-		{
-		}
-		[TestMethod]
-		public void Test_1975()
-		{
-		}
-		[TestMethod]
-		public void Test_1976()
-		{
-		}
-		[TestMethod]
-		public void Test_1977()
-		{
-		}
-		[TestMethod]
-		public void Test_1978()
-		{
-		}
-		[TestMethod]
-		public void Test_1979()
-		{
-		}
-		[TestMethod]
-		public void Test_1980()
-		{
-		}
-		[TestMethod]
-		public void Test_1981()
-		{
-		}
-		[TestMethod]
-		public void Test_1982()
-		{
-		}
-		[TestMethod]
-		public void Test_1983()
-		{
-		}
-		[TestMethod]
-		public void Test_1984()
-		{
-		}
-		[TestMethod]
-		public void Test_1985()
-		{
-		}
-		[TestMethod]
-		public void Test_1986()
-		{
-		}
-		[TestMethod]
-		public void Test_1987()
-		{
-		}
-		[TestMethod]
-		public void Test_1988()
-		{
-		}
-		[TestMethod]
-		public void Test_1989()
-		{
-		}
-		[TestMethod]
-		public void Test_1990()
-		{
-		}
-		[TestMethod]
-		public void Test_1991()
-		{
-		}
-		[TestMethod]
-		public void Test_1992()
-		{
-		}
-		[TestMethod]
-		public void Test_1993()
-		{
-		}
-		[TestMethod]
-		public void Test_1994()
-		{
-		}
-		[TestMethod]
-		public void Test_1995()
-		{
-		}
-		[TestMethod]
-		public void Test_1996()
-		{
-		}
-		[TestMethod]
-		public void Test_1997()
-		{
-		}
-		[TestMethod]
-		public void Test_1998()
-		{
-		}
-		[TestMethod]
-		public void Test_1999()
-		{
-		}
-		[TestMethod]
-		public void Test_2000()
-		{
-		}
-		[TestMethod]
-		public void Test_2001()
-		{
-		}
-		[TestMethod]
-		public void Test_2002()
-		{
-		}
-		[TestMethod]
-		public void Test_2003()
-		{
-		}
-		[TestMethod]
-		public void Test_2004()
-		{
-		}
-		[TestMethod]
-		public void Test_2005()
-		{
-		}
-		[TestMethod]
-		public void Test_2006()
-		{
-		}
-		[TestMethod]
-		public void Test_2007()
-		{
-		}
-		[TestMethod]
-		public void Test_2008()
-		{
-		}
-		[TestMethod]
-		public void Test_2009()
-		{
-		}
-		[TestMethod]
-		public void Test_2010()
-		{
-		}
-		[TestMethod]
-		public void Test_2011()
-		{
-		}
-		[TestMethod]
-		public void Test_2012()
-		{
-		}
-		[TestMethod]
-		public void Test_2013()
-		{
-		}
-		[TestMethod]
-		public void Test_2014()
-		{
-		}
-		[TestMethod]
-		public void Test_2015()
-		{
-		}
-		[TestMethod]
-		public void Test_2016()
-		{
-		}
-		[TestMethod]
-		public void Test_2017()
-		{
-		}
-		[TestMethod]
-		public void Test_2018()
-		{
-		}
-		[TestMethod]
-		public void Test_2019()
-		{
-		}
-		[TestMethod]
-		public void Test_2020()
-		{
-		}
-		[TestMethod]
-		public void Test_2021()
-		{
-		}
-		[TestMethod]
-		public void Test_2022()
-		{
-		}
-		[TestMethod]
-		public void Test_2023()
-		{
-		}
-		[TestMethod]
-		public void Test_2024()
-		{
-		}
-		[TestMethod]
-		public void Test_2025()
-		{
-		}
-		[TestMethod]
-		public void Test_2026()
-		{
-		}
-		[TestMethod]
-		public void Test_2027()
-		{
-		}
-		[TestMethod]
-		public void Test_2028()
-		{
-		}
-		[TestMethod]
-		public void Test_2029()
-		{
-		}
-		[TestMethod]
-		public void Test_2030()
-		{
-		}
-		[TestMethod]
-		public void Test_2031()
-		{
-		}
-		[TestMethod]
-		public void Test_2032()
-		{
-		}
-		[TestMethod]
-		public void Test_2033()
-		{
-		}
-		[TestMethod]
-		public void Test_2034()
-		{
-		}
-		[TestMethod]
-		public void Test_2035()
-		{
-		}
-		[TestMethod]
-		public void Test_2036()
-		{
-		}
-		[TestMethod]
-		public void Test_2037()
-		{
-		}
-		[TestMethod]
-		public void Test_2038()
-		{
-		}
-		[TestMethod]
-		public void Test_2039()
-		{
-		}
-		[TestMethod]
-		public void Test_2040()
-		{
-		}
-		[TestMethod]
-		public void Test_2041()
-		{
-		}
-		[TestMethod]
-		public void Test_2042()
-		{
-		}
-		[TestMethod]
-		public void Test_2043()
-		{
-		}
-		[TestMethod]
-		public void Test_2044()
-		{
-		}
-		[TestMethod]
-		public void Test_2045()
-		{
-		}
-		[TestMethod]
-		public void Test_2046()
-		{
-		}
-		[TestMethod]
-		public void Test_2047()
-		{
-		}
-		[TestMethod]
-		public void Test_2048()
-		{
-		}
-		[TestMethod]
-		public void Test_2049()
-		{
-		}
-		[TestMethod]
-		public void Test_2050()
-		{
-		}
-		[TestMethod]
-		public void Test_2051()
-		{
-		}
-		[TestMethod]
-		public void Test_2052()
-		{
-		}
-		[TestMethod]
-		public void Test_2053()
-		{
-		}
-		[TestMethod]
-		public void Test_2054()
-		{
-		}
-		[TestMethod]
-		public void Test_2055()
-		{
-		}
-		[TestMethod]
-		public void Test_2056()
-		{
-		}
-		[TestMethod]
-		public void Test_2057()
-		{
-		}
-		[TestMethod]
-		public void Test_2058()
-		{
-		}
-		[TestMethod]
-		public void Test_2059()
-		{
-		}
-		[TestMethod]
-		public void Test_2060()
-		{
-		}
-		[TestMethod]
-		public void Test_2061()
-		{
-		}
-		[TestMethod]
-		public void Test_2062()
-		{
-		}
-		[TestMethod]
-		public void Test_2063()
-		{
-		}
-		[TestMethod]
-		public void Test_2064()
-		{
-		}
-		[TestMethod]
-		public void Test_2065()
-		{
-		}
-		[TestMethod]
-		public void Test_2066()
-		{
-		}
-		[TestMethod]
-		public void Test_2067()
-		{
-		}
-		[TestMethod]
-		public void Test_2068()
-		{
-		}
-		[TestMethod]
-		public void Test_2069()
-		{
-		}
-		[TestMethod]
-		public void Test_2070()
-		{
-		}
-		[TestMethod]
-		public void Test_2071()
-		{
-		}
-		[TestMethod]
-		public void Test_2072()
-		{
-		}
-		[TestMethod]
-		public void Test_2073()
-		{
-		}
-		[TestMethod]
-		public void Test_2074()
-		{
-		}
-		[TestMethod]
-		public void Test_2075()
-		{
-		}
-		[TestMethod]
-		public void Test_2076()
-		{
-		}
-		[TestMethod]
-		public void Test_2077()
-		{
-		}
-		[TestMethod]
-		public void Test_2078()
-		{
-		}
-		[TestMethod]
-		public void Test_2079()
-		{
-		}
-		[TestMethod]
-		public void Test_2080()
-		{
-		}
-		[TestMethod]
-		public void Test_2081()
-		{
-		}
-		[TestMethod]
-		public void Test_2082()
-		{
-		}
-		[TestMethod]
-		public void Test_2083()
-		{
-		}
-		[TestMethod]
-		public void Test_2084()
-		{
-		}
-		[TestMethod]
-		public void Test_2085()
-		{
-		}
-		[TestMethod]
-		public void Test_2086()
-		{
-		}
-		[TestMethod]
-		public void Test_2087()
-		{
-		}
-		[TestMethod]
-		public void Test_2088()
-		{
-		}
-		[TestMethod]
-		public void Test_2089()
-		{
-		}
-		[TestMethod]
-		public void Test_2090()
-		{
-		}
-		[TestMethod]
-		public void Test_2091()
-		{
-		}
-		[TestMethod]
-		public void Test_2092()
-		{
-		}
-		[TestMethod]
-		public void Test_2093()
-		{
-		}
-		[TestMethod]
-		public void Test_2094()
-		{
-		}
-		[TestMethod]
-		public void Test_2095()
-		{
-		}
-		[TestMethod]
-		public void Test_2096()
-		{
-		}
-		[TestMethod]
-		public void Test_2097()
-		{
-		}
-		[TestMethod]
-		public void Test_2098()
-		{
-		}
-		[TestMethod]
-		public void Test_2099()
-		{
-		}
-		[TestMethod]
-		public void Test_2100()
-		{
-		}
-		[TestMethod]
-		public void Test_2101()
-		{
-		}
-		[TestMethod]
-		public void Test_2102()
-		{
-		}
-		[TestMethod]
-		public void Test_2103()
-		{
-		}
-		[TestMethod]
-		public void Test_2104()
-		{
-		}
-		[TestMethod]
-		public void Test_2105()
-		{
-		}
-		[TestMethod]
-		public void Test_2106()
-		{
-		}
-		[TestMethod]
-		public void Test_2107()
-		{
-		}
-		[TestMethod]
-		public void Test_2108()
-		{
-		}
-		[TestMethod]
-		public void Test_2109()
-		{
-		}
-		[TestMethod]
-		public void Test_2110()
-		{
-		}
-		[TestMethod]
-		public void Test_2111()
-		{
-		}
-		[TestMethod]
-		public void Test_2112()
-		{
-		}
-		[TestMethod]
-		public void Test_2113()
-		{
-		}
-		[TestMethod]
-		public void Test_2114()
-		{
-		}
-		[TestMethod]
-		public void Test_2115()
-		{
-		}
-		[TestMethod]
-		public void Test_2116()
-		{
-		}
-		[TestMethod]
-		public void Test_2117()
-		{
-		}
-		[TestMethod]
-		public void Test_2118()
-		{
-		}
-		[TestMethod]
-		public void Test_2119()
-		{
-		}
-		[TestMethod]
-		public void Test_2120()
-		{
-		}
-		[TestMethod]
-		public void Test_2121()
-		{
-		}
-		[TestMethod]
-		public void Test_2122()
-		{
-		}
-		[TestMethod]
-		public void Test_2123()
-		{
-		}
-		[TestMethod]
-		public void Test_2124()
-		{
-		}
-		[TestMethod]
-		public void Test_2125()
-		{
-		}
-		[TestMethod]
-		public void Test_2126()
-		{
-		}
-		[TestMethod]
-		public void Test_2127()
-		{
-		}
-		[TestMethod]
-		public void Test_2128()
-		{
-		}
-		[TestMethod]
-		public void Test_2129()
-		{
-		}
-		[TestMethod]
-		public void Test_2130()
-		{
-		}
-		[TestMethod]
-		public void Test_2131()
-		{
-		}
-		[TestMethod]
-		public void Test_2132()
-		{
-		}
-		[TestMethod]
-		public void Test_2133()
-		{
-		}
-		[TestMethod]
-		public void Test_2134()
-		{
-		}
-		[TestMethod]
-		public void Test_2135()
-		{
-		}
-		[TestMethod]
-		public void Test_2136()
-		{
-		}
-		[TestMethod]
-		public void Test_2137()
-		{
-		}
-		[TestMethod]
-		public void Test_2138()
-		{
-		}
-		[TestMethod]
-		public void Test_2139()
-		{
-		}
-		[TestMethod]
-		public void Test_2140()
-		{
-		}
-		[TestMethod]
-		public void Test_2141()
-		{
-		}
-		[TestMethod]
-		public void Test_2142()
-		{
-		}
-		[TestMethod]
-		public void Test_2143()
-		{
-		}
-		[TestMethod]
-		public void Test_2144()
-		{
-		}
-		[TestMethod]
-		public void Test_2145()
-		{
-		}
-		[TestMethod]
-		public void Test_2146()
-		{
-		}
-		[TestMethod]
-		public void Test_2147()
-		{
-		}
-		[TestMethod]
-		public void Test_2148()
-		{
-		}
-		[TestMethod]
-		public void Test_2149()
-		{
-		}
-		[TestMethod]
-		public void Test_2150()
-		{
-		}
-		[TestMethod]
-		public void Test_2151()
-		{
-		}
-		[TestMethod]
-		public void Test_2152()
-		{
-		}
-		[TestMethod]
-		public void Test_2153()
-		{
-		}
-		[TestMethod]
-		public void Test_2154()
-		{
-		}
-		[TestMethod]
-		public void Test_2155()
-		{
-		}
-		[TestMethod]
-		public void Test_2156()
-		{
-		}
-		[TestMethod]
-		public void Test_2157()
-		{
-		}
-		[TestMethod]
-		public void Test_2158()
-		{
-		}
-		[TestMethod]
-		public void Test_2159()
-		{
-		}
-		[TestMethod]
-		public void Test_2160()
-		{
-		}
-		[TestMethod]
-		public void Test_2161()
-		{
-		}
-		[TestMethod]
-		public void Test_2162()
-		{
-		}
-		[TestMethod]
-		public void Test_2163()
-		{
-		}
-		[TestMethod]
-		public void Test_2164()
-		{
-		}
-		[TestMethod]
-		public void Test_2165()
-		{
-		}
-		[TestMethod]
-		public void Test_2166()
-		{
-		}
-		[TestMethod]
-		public void Test_2167()
-		{
-		}
-		[TestMethod]
-		public void Test_2168()
-		{
-		}
-		[TestMethod]
-		public void Test_2169()
-		{
-		}
-		[TestMethod]
-		public void Test_2170()
-		{
-		}
-		[TestMethod]
-		public void Test_2171()
-		{
-		}
-		[TestMethod]
-		public void Test_2172()
-		{
-		}
-		[TestMethod]
-		public void Test_2173()
-		{
-		}
-		[TestMethod]
-		public void Test_2174()
-		{
-		}
-		[TestMethod]
-		public void Test_2175()
-		{
-		}
-		[TestMethod]
-		public void Test_2176()
-		{
-		}
-		[TestMethod]
-		public void Test_2177()
-		{
-		}
-		[TestMethod]
-		public void Test_2178()
-		{
-		}
-		[TestMethod]
-		public void Test_2179()
-		{
-		}
-		[TestMethod]
-		public void Test_2180()
-		{
-		}
-		[TestMethod]
-		public void Test_2181()
-		{
-		}
-		[TestMethod]
-		public void Test_2182()
-		{
-		}
-		[TestMethod]
-		public void Test_2183()
-		{
-		}
-		[TestMethod]
-		public void Test_2184()
-		{
-		}
-		[TestMethod]
-		public void Test_2185()
-		{
-		}
-		[TestMethod]
-		public void Test_2186()
-		{
-		}
-		[TestMethod]
-		public void Test_2187()
-		{
-		}
-		[TestMethod]
-		public void Test_2188()
-		{
-		}
-		[TestMethod]
-		public void Test_2189()
-		{
-		}
-		[TestMethod]
-		public void Test_2190()
-		{
-		}
-		[TestMethod]
-		public void Test_2191()
-		{
-		}
-		[TestMethod]
-		public void Test_2192()
-		{
-		}
-		[TestMethod]
-		public void Test_2193()
-		{
-		}
-		[TestMethod]
-		public void Test_2194()
-		{
-		}
-		[TestMethod]
-		public void Test_2195()
-		{
-		}
-		[TestMethod]
-		public void Test_2196()
-		{
-		}
-		[TestMethod]
-		public void Test_2197()
-		{
-		}
-		[TestMethod]
-		public void Test_2198()
-		{
-		}
-		[TestMethod]
-		public void Test_2199()
-		{
-		}
-		[TestMethod]
-		public void Test_2200()
-		{
-		}
-		[TestMethod]
-		public void Test_2201()
-		{
-		}
-		[TestMethod]
-		public void Test_2202()
-		{
-		}
-		[TestMethod]
-		public void Test_2203()
-		{
-		}
-		[TestMethod]
-		public void Test_2204()
-		{
-		}
-		[TestMethod]
-		public void Test_2205()
-		{
-		}
-		[TestMethod]
-		public void Test_2206()
-		{
-		}
-		[TestMethod]
-		public void Test_2207()
-		{
-		}
-		[TestMethod]
-		public void Test_2208()
-		{
-		}
-		[TestMethod]
-		public void Test_2209()
-		{
-		}
-		[TestMethod]
-		public void Test_2210()
-		{
-		}
-		[TestMethod]
-		public void Test_2211()
-		{
-		}
-		[TestMethod]
-		public void Test_2212()
-		{
-		}
-		[TestMethod]
-		public void Test_2213()
-		{
-		}
-		[TestMethod]
-		public void Test_2214()
-		{
-		}
-		[TestMethod]
-		public void Test_2215()
-		{
-		}
-		[TestMethod]
-		public void Test_2216()
-		{
-		}
-		[TestMethod]
-		public void Test_2217()
-		{
-		}
-		[TestMethod]
-		public void Test_2218()
-		{
-		}
-		[TestMethod]
-		public void Test_2219()
-		{
-		}
-		[TestMethod]
-		public void Test_2220()
-		{
-		}
-		[TestMethod]
-		public void Test_2221()
-		{
-		}
-		[TestMethod]
-		public void Test_2222()
-		{
-		}
-		[TestMethod]
-		public void Test_2223()
-		{
-		}
-		[TestMethod]
-		public void Test_2224()
-		{
-		}
-		[TestMethod]
-		public void Test_2225()
-		{
-		}
-		[TestMethod]
-		public void Test_2226()
-		{
-		}
-		[TestMethod]
-		public void Test_2227()
-		{
-		}
-		[TestMethod]
-		public void Test_2228()
-		{
-		}
-		[TestMethod]
-		public void Test_2229()
-		{
-		}
-		[TestMethod]
-		public void Test_2230()
-		{
-		}
-		[TestMethod]
-		public void Test_2231()
-		{
-		}
-		[TestMethod]
-		public void Test_2232()
-		{
-		}
-		[TestMethod]
-		public void Test_2233()
-		{
-		}
-		[TestMethod]
-		public void Test_2234()
-		{
-		}
-		[TestMethod]
-		public void Test_2235()
-		{
-		}
-		[TestMethod]
-		public void Test_2236()
-		{
-		}
-		[TestMethod]
-		public void Test_2237()
-		{
-		}
-		[TestMethod]
-		public void Test_2238()
-		{
-		}
-		[TestMethod]
-		public void Test_2239()
-		{
-		}
-		[TestMethod]
-		public void Test_2240()
-		{
-		}
-		[TestMethod]
-		public void Test_2241()
-		{
-		}
-		[TestMethod]
-		public void Test_2242()
-		{
-		}
-		[TestMethod]
-		public void Test_2243()
-		{
-		}
-		[TestMethod]
-		public void Test_2244()
-		{
-		}
-		[TestMethod]
-		public void Test_2245()
-		{
-		}
-		[TestMethod]
-		public void Test_2246()
-		{
-		}
-		[TestMethod]
-		public void Test_2247()
-		{
-		}
-		[TestMethod]
-		public void Test_2248()
-		{
-		}
-		[TestMethod]
-		public void Test_2249()
-		{
-		}
-		[TestMethod]
-		public void Test_2250()
-		{
-		}
-		[TestMethod]
-		public void Test_2251()
-		{
-		}
-		[TestMethod]
-		public void Test_2252()
-		{
-		}
-		[TestMethod]
-		public void Test_2253()
-		{
-		}
-		[TestMethod]
-		public void Test_2254()
-		{
-		}
-		[TestMethod]
-		public void Test_2255()
-		{
-		}
-		[TestMethod]
-		public void Test_2256()
-		{
-		}
-		[TestMethod]
-		public void Test_2257()
-		{
-		}
-		[TestMethod]
-		public void Test_2258()
-		{
-		}
-		[TestMethod]
-		public void Test_2259()
-		{
-		}
-		[TestMethod]
-		public void Test_2260()
-		{
-		}
-		[TestMethod]
-		public void Test_2261()
-		{
-		}
-		[TestMethod]
-		public void Test_2262()
-		{
-		}
-		[TestMethod]
-		public void Test_2263()
-		{
-		}
-		[TestMethod]
-		public void Test_2264()
-		{
-		}
-		[TestMethod]
-		public void Test_2265()
-		{
-		}
-		[TestMethod]
-		public void Test_2266()
-		{
-		}
-		[TestMethod]
-		public void Test_2267()
-		{
-		}
-		[TestMethod]
-		public void Test_2268()
-		{
-		}
-		[TestMethod]
-		public void Test_2269()
-		{
-		}
-		[TestMethod]
-		public void Test_2270()
-		{
-		}
-		[TestMethod]
-		public void Test_2271()
-		{
-		}
-		[TestMethod]
-		public void Test_2272()
-		{
-		}
-		[TestMethod]
-		public void Test_2273()
-		{
-		}
-		[TestMethod]
-		public void Test_2274()
-		{
-		}
-		[TestMethod]
-		public void Test_2275()
-		{
-		}
-		[TestMethod]
-		public void Test_2276()
-		{
-		}
-		[TestMethod]
-		public void Test_2277()
-		{
-		}
-		[TestMethod]
-		public void Test_2278()
-		{
-		}
-		[TestMethod]
-		public void Test_2279()
-		{
-		}
-		[TestMethod]
-		public void Test_2280()
-		{
-		}
-		[TestMethod]
-		public void Test_2281()
-		{
-		}
-		[TestMethod]
-		public void Test_2282()
-		{
-		}
-		[TestMethod]
-		public void Test_2283()
-		{
-		}
-		[TestMethod]
-		public void Test_2284()
-		{
-		}
-		[TestMethod]
-		public void Test_2285()
-		{
-		}
-		[TestMethod]
-		public void Test_2286()
-		{
-		}
-		[TestMethod]
-		public void Test_2287()
-		{
-		}
-		[TestMethod]
-		public void Test_2288()
-		{
-		}
-		[TestMethod]
-		public void Test_2289()
-		{
-		}
-		[TestMethod]
-		public void Test_2290()
-		{
-		}
-		[TestMethod]
-		public void Test_2291()
-		{
-		}
-		[TestMethod]
-		public void Test_2292()
-		{
-		}
-		[TestMethod]
-		public void Test_2293()
-		{
-		}
-		[TestMethod]
-		public void Test_2294()
-		{
-		}
-		[TestMethod]
-		public void Test_2295()
-		{
-		}
-		[TestMethod]
-		public void Test_2296()
-		{
-		}
-		[TestMethod]
-		public void Test_2297()
-		{
-		}
-		[TestMethod]
-		public void Test_2298()
-		{
-		}
-		[TestMethod]
-		public void Test_2299()
-		{
-		}
-		[TestMethod]
-		public void Test_2300()
-		{
-		}
-		[TestMethod]
-		public void Test_2301()
-		{
-		}
-		[TestMethod]
-		public void Test_2302()
-		{
-		}
-		[TestMethod]
-		public void Test_2303()
-		{
-		}
-		[TestMethod]
-		public void Test_2304()
-		{
-		}
-		[TestMethod]
-		public void Test_2305()
-		{
-		}
-		[TestMethod]
-		public void Test_2306()
-		{
-		}
-		[TestMethod]
-		public void Test_2307()
-		{
-		}
-		[TestMethod]
-		public void Test_2308()
-		{
-		}
-		[TestMethod]
-		public void Test_2309()
-		{
-		}
-		[TestMethod]
-		public void Test_2310()
-		{
-		}
-		[TestMethod]
-		public void Test_2311()
-		{
-		}
-		[TestMethod]
-		public void Test_2312()
-		{
-		}
-		[TestMethod]
-		public void Test_2313()
-		{
-		}
-		[TestMethod]
-		public void Test_2314()
-		{
-		}
-		[TestMethod]
-		public void Test_2315()
-		{
-		}
-		[TestMethod]
-		public void Test_2316()
-		{
-		}
-		[TestMethod]
-		public void Test_2317()
-		{
-		}
-		[TestMethod]
-		public void Test_2318()
-		{
-		}
-		[TestMethod]
-		public void Test_2319()
-		{
-		}
-		[TestMethod]
-		public void Test_2320()
-		{
-		}
-		[TestMethod]
-		public void Test_2321()
-		{
-		}
-		[TestMethod]
-		public void Test_2322()
-		{
-		}
-		[TestMethod]
-		public void Test_2323()
-		{
-		}
-		[TestMethod]
-		public void Test_2324()
-		{
-		}
-		[TestMethod]
-		public void Test_2325()
-		{
-		}
-		[TestMethod]
-		public void Test_2326()
-		{
-		}
-		[TestMethod]
-		public void Test_2327()
-		{
-		}
-		[TestMethod]
-		public void Test_2328()
-		{
-		}
-		[TestMethod]
-		public void Test_2329()
-		{
-		}
-		[TestMethod]
-		public void Test_2330()
-		{
-		}
-		[TestMethod]
-		public void Test_2331()
-		{
-		}
-		[TestMethod]
-		public void Test_2332()
-		{
-		}
-		[TestMethod]
-		public void Test_2333()
-		{
-		}
-		[TestMethod]
-		public void Test_2334()
-		{
-		}
-		[TestMethod]
-		public void Test_2335()
-		{
-		}
-		[TestMethod]
-		public void Test_2336()
-		{
-		}
-		[TestMethod]
-		public void Test_2337()
-		{
-		}
-		[TestMethod]
-		public void Test_2338()
-		{
-		}
-		[TestMethod]
-		public void Test_2339()
-		{
-		}
-		[TestMethod]
-		public void Test_2340()
-		{
-		}
-		[TestMethod]
-		public void Test_2341()
-		{
-		}
-		[TestMethod]
-		public void Test_2342()
-		{
-		}
-		[TestMethod]
-		public void Test_2343()
-		{
-		}
-		[TestMethod]
-		public void Test_2344()
-		{
-		}
-		[TestMethod]
-		public void Test_2345()
-		{
-		}
-		[TestMethod]
-		public void Test_2346()
-		{
-		}
-		[TestMethod]
-		public void Test_2347()
-		{
-		}
-		[TestMethod]
-		public void Test_2348()
-		{
-		}
-		[TestMethod]
-		public void Test_2349()
-		{
-		}
-		[TestMethod]
-		public void Test_2350()
-		{
-		}
-		[TestMethod]
-		public void Test_2351()
-		{
-		}
-		[TestMethod]
-		public void Test_2352()
-		{
-		}
-		[TestMethod]
-		public void Test_2353()
-		{
-		}
-		[TestMethod]
-		public void Test_2354()
-		{
-		}
-		[TestMethod]
-		public void Test_2355()
-		{
-		}
-		[TestMethod]
-		public void Test_2356()
-		{
-		}
-		[TestMethod]
-		public void Test_2357()
-		{
-		}
-		[TestMethod]
-		public void Test_2358()
-		{
-		}
-		[TestMethod]
-		public void Test_2359()
-		{
-		}
-		[TestMethod]
-		public void Test_2360()
-		{
-		}
-		[TestMethod]
-		public void Test_2361()
-		{
-		}
-		[TestMethod]
-		public void Test_2362()
-		{
-		}
-		[TestMethod]
-		public void Test_2363()
-		{
-		}
-		[TestMethod]
-		public void Test_2364()
-		{
-		}
-		[TestMethod]
-		public void Test_2365()
-		{
-		}
-		[TestMethod]
-		public void Test_2366()
-		{
-		}
-		[TestMethod]
-		public void Test_2367()
-		{
-		}
-		[TestMethod]
-		public void Test_2368()
-		{
-		}
-		[TestMethod]
-		public void Test_2369()
-		{
-		}
-		[TestMethod]
-		public void Test_2370()
-		{
-		}
-		[TestMethod]
-		public void Test_2371()
-		{
-		}
-		[TestMethod]
-		public void Test_2372()
-		{
-		}
-		[TestMethod]
-		public void Test_2373()
-		{
-		}
-		[TestMethod]
-		public void Test_2374()
-		{
-		}
-		[TestMethod]
-		public void Test_2375()
-		{
-		}
-		[TestMethod]
-		public void Test_2376()
-		{
-		}
-		[TestMethod]
-		public void Test_2377()
-		{
-		}
-		[TestMethod]
-		public void Test_2378()
-		{
-		}
-		[TestMethod]
-		public void Test_2379()
-		{
-		}
-		[TestMethod]
-		public void Test_2380()
-		{
-		}
-		[TestMethod]
-		public void Test_2381()
-		{
-		}
-		[TestMethod]
-		public void Test_2382()
-		{
-		}
-		[TestMethod]
-		public void Test_2383()
-		{
-		}
-		[TestMethod]
-		public void Test_2384()
-		{
-		}
-		[TestMethod]
-		public void Test_2385()
-		{
-		}
-		[TestMethod]
-		public void Test_2386()
-		{
-		}
-		[TestMethod]
-		public void Test_2387()
-		{
-		}
-		[TestMethod]
-		public void Test_2388()
-		{
-		}
-		[TestMethod]
-		public void Test_2389()
-		{
-		}
-		[TestMethod]
-		public void Test_2390()
-		{
-		}
-		[TestMethod]
-		public void Test_2391()
-		{
-		}
-		[TestMethod]
-		public void Test_2392()
-		{
-		}
-		[TestMethod]
-		public void Test_2393()
-		{
-		}
-		[TestMethod]
-		public void Test_2394()
-		{
-		}
-		[TestMethod]
-		public void Test_2395()
-		{
-		}
-		[TestMethod]
-		public void Test_2396()
-		{
-		}
-		[TestMethod]
-		public void Test_2397()
-		{
-		}
-		[TestMethod]
-		public void Test_2398()
-		{
-		}
-		[TestMethod]
-		public void Test_2399()
-		{
-		}
-		[TestMethod]
-		public void Test_2400()
-		{
-		}
-		[TestMethod]
-		public void Test_2401()
-		{
-		}
-		[TestMethod]
-		public void Test_2402()
-		{
-		}
-		[TestMethod]
-		public void Test_2403()
-		{
-		}
-		[TestMethod]
-		public void Test_2404()
-		{
-		}
-		[TestMethod]
-		public void Test_2405()
-		{
-		}
-		[TestMethod]
-		public void Test_2406()
-		{
-		}
-		[TestMethod]
-		public void Test_2407()
-		{
-		}
-		[TestMethod]
-		public void Test_2408()
-		{
-		}
-		[TestMethod]
-		public void Test_2409()
-		{
-		}
-		[TestMethod]
-		public void Test_2410()
-		{
-		}
-		[TestMethod]
-		public void Test_2411()
-		{
-		}
-		[TestMethod]
-		public void Test_2412()
-		{
-		}
-		[TestMethod]
-		public void Test_2413()
-		{
-		}
-		[TestMethod]
-		public void Test_2414()
-		{
-		}
-		[TestMethod]
-		public void Test_2415()
-		{
-		}
-		[TestMethod]
-		public void Test_2416()
-		{
-		}
-		[TestMethod]
-		public void Test_2417()
-		{
-		}
-		[TestMethod]
-		public void Test_2418()
-		{
-		}
-		[TestMethod]
-		public void Test_2419()
-		{
-		}
-		[TestMethod]
-		public void Test_2420()
-		{
-		}
-		[TestMethod]
-		public void Test_2421()
-		{
-		}
-		[TestMethod]
-		public void Test_2422()
-		{
-		}
-		[TestMethod]
-		public void Test_2423()
-		{
-		}
-		[TestMethod]
-		public void Test_2424()
-		{
-		}
-		[TestMethod]
-		public void Test_2425()
-		{
-		}
-		[TestMethod]
-		public void Test_2426()
-		{
-		}
-		[TestMethod]
-		public void Test_2427()
-		{
-		}
-		[TestMethod]
-		public void Test_2428()
-		{
-		}
-		[TestMethod]
-		public void Test_2429()
-		{
-		}
-		[TestMethod]
-		public void Test_2430()
-		{
-		}
-		[TestMethod]
-		public void Test_2431()
-		{
-		}
-		[TestMethod]
-		public void Test_2432()
-		{
-		}
-		[TestMethod]
-		public void Test_2433()
-		{
-		}
-		[TestMethod]
-		public void Test_2434()
-		{
-		}
-		[TestMethod]
-		public void Test_2435()
-		{
-		}
-		[TestMethod]
-		public void Test_2436()
-		{
-		}
-		[TestMethod]
-		public void Test_2437()
-		{
-		}
-		[TestMethod]
-		public void Test_2438()
-		{
-		}
-		[TestMethod]
-		public void Test_2439()
-		{
-		}
-		[TestMethod]
-		public void Test_2440()
-		{
-		}
-		[TestMethod]
-		public void Test_2441()
-		{
-		}
-		[TestMethod]
-		public void Test_2442()
-		{
-		}
-		[TestMethod]
-		public void Test_2443()
-		{
-		}
-		[TestMethod]
-		public void Test_2444()
-		{
-		}
-		[TestMethod]
-		public void Test_2445()
-		{
-		}
-		[TestMethod]
-		public void Test_2446()
-		{
-		}
-		[TestMethod]
-		public void Test_2447()
-		{
-		}
-		[TestMethod]
-		public void Test_2448()
-		{
-		}
-		[TestMethod]
-		public void Test_2449()
-		{
-		}
-		[TestMethod]
-		public void Test_2450()
-		{
-		}
-		[TestMethod]
-		public void Test_2451()
-		{
-		}
-		[TestMethod]
-		public void Test_2452()
-		{
-		}
-		[TestMethod]
-		public void Test_2453()
-		{
-		}
-		[TestMethod]
-		public void Test_2454()
-		{
-		}
-		[TestMethod]
-		public void Test_2455()
-		{
-		}
-		[TestMethod]
-		public void Test_2456()
-		{
-		}
-		[TestMethod]
-		public void Test_2457()
-		{
-		}
-		[TestMethod]
-		public void Test_2458()
-		{
-		}
-		[TestMethod]
-		public void Test_2459()
-		{
-		}
-		[TestMethod]
-		public void Test_2460()
-		{
-		}
-		[TestMethod]
-		public void Test_2461()
-		{
-		}
-		[TestMethod]
-		public void Test_2462()
-		{
-		}
-		[TestMethod]
-		public void Test_2463()
-		{
-		}
-		[TestMethod]
-		public void Test_2464()
-		{
-		}
-		[TestMethod]
-		public void Test_2465()
-		{
-		}
-		[TestMethod]
-		public void Test_2466()
-		{
-		}
-		[TestMethod]
-		public void Test_2467()
-		{
-		}
-		[TestMethod]
-		public void Test_2468()
-		{
-		}
-		[TestMethod]
-		public void Test_2469()
-		{
-		}
-		[TestMethod]
-		public void Test_2470()
-		{
-		}
-		[TestMethod]
-		public void Test_2471()
-		{
-		}
-		[TestMethod]
-		public void Test_2472()
-		{
-		}
-		[TestMethod]
-		public void Test_2473()
-		{
-		}
-		[TestMethod]
-		public void Test_2474()
-		{
-		}
-		[TestMethod]
-		public void Test_2475()
-		{
-		}
-		[TestMethod]
-		public void Test_2476()
-		{
-		}
-		[TestMethod]
-		public void Test_2477()
-		{
-		}
-		[TestMethod]
-		public void Test_2478()
-		{
-		}
-		[TestMethod]
-		public void Test_2479()
-		{
-		}
-		[TestMethod]
-		public void Test_2480()
-		{
-		}
-		[TestMethod]
-		public void Test_2481()
-		{
-		}
-		[TestMethod]
-		public void Test_2482()
-		{
-		}
-		[TestMethod]
-		public void Test_2483()
-		{
-		}
-		[TestMethod]
-		public void Test_2484()
-		{
-		}
-		[TestMethod]
-		public void Test_2485()
-		{
-		}
-		[TestMethod]
-		public void Test_2486()
-		{
-		}
-		[TestMethod]
-		public void Test_2487()
-		{
-		}
-		[TestMethod]
-		public void Test_2488()
-		{
-		}
-		[TestMethod]
-		public void Test_2489()
-		{
-		}
-		[TestMethod]
-		public void Test_2490()
-		{
-		}
-		[TestMethod]
-		public void Test_2491()
-		{
-		}
-		[TestMethod]
-		public void Test_2492()
-		{
-		}
-		[TestMethod]
-		public void Test_2493()
-		{
-		}
-		[TestMethod]
-		public void Test_2494()
-		{
-		}
-		[TestMethod]
-		public void Test_2495()
-		{
-		}
-		[TestMethod]
-		public void Test_2496()
-		{
-		}
-		[TestMethod]
-		public void Test_2497()
-		{
-		}
-		[TestMethod]
-		public void Test_2498()
-		{
-		}
-		[TestMethod]
-		public void Test_2499()
-		{
-		}
-		[TestMethod]
-		public void Test_2500()
-		{
-		}
-		[TestMethod]
-		public void Test_2501()
-		{
-		}
-		[TestMethod]
-		public void Test_2502()
-		{
-		}
-		[TestMethod]
-		public void Test_2503()
-		{
-		}
-		[TestMethod]
-		public void Test_2504()
-		{
-		}
-		[TestMethod]
-		public void Test_2505()
-		{
-		}
-		[TestMethod]
-		public void Test_2506()
-		{
-		}
-		[TestMethod]
-		public void Test_2507()
-		{
-		}
-		[TestMethod]
-		public void Test_2508()
-		{
-		}
-		[TestMethod]
-		public void Test_2509()
-		{
-		}
-		[TestMethod]
-		public void Test_2510()
-		{
-		}
-		[TestMethod]
-		public void Test_2511()
-		{
-		}
-		[TestMethod]
-		public void Test_2512()
-		{
-		}
-		[TestMethod]
-		public void Test_2513()
-		{
-		}
-		[TestMethod]
-		public void Test_2514()
-		{
-		}
-		[TestMethod]
-		public void Test_2515()
-		{
-		}
-		[TestMethod]
-		public void Test_2516()
-		{
-		}
-		[TestMethod]
-		public void Test_2517()
-		{
-		}
-		[TestMethod]
-		public void Test_2518()
-		{
-		}
-		[TestMethod]
-		public void Test_2519()
-		{
-		}
-		[TestMethod]
-		public void Test_2520()
-		{
-		}
-		[TestMethod]
-		public void Test_2521()
-		{
-		}
-		[TestMethod]
-		public void Test_2522()
-		{
-		}
-		[TestMethod]
-		public void Test_2523()
-		{
-		}
-		[TestMethod]
-		public void Test_2524()
-		{
-		}
-		[TestMethod]
-		public void Test_2525()
-		{
-		}
-		[TestMethod]
-		public void Test_2526()
-		{
-		}
-		[TestMethod]
-		public void Test_2527()
-		{
-		}
-		[TestMethod]
-		public void Test_2528()
-		{
-		}
-		[TestMethod]
-		public void Test_2529()
-		{
-		}
-		[TestMethod]
-		public void Test_2530()
-		{
-		}
-		[TestMethod]
-		public void Test_2531()
-		{
-		}
-		[TestMethod]
-		public void Test_2532()
-		{
-		}
-		[TestMethod]
-		public void Test_2533()
-		{
-		}
-		[TestMethod]
-		public void Test_2534()
-		{
-		}
-		[TestMethod]
-		public void Test_2535()
-		{
-		}
-		[TestMethod]
-		public void Test_2536()
-		{
-		}
-		[TestMethod]
-		public void Test_2537()
-		{
-		}
-		[TestMethod]
-		public void Test_2538()
-		{
-		}
-		[TestMethod]
-		public void Test_2539()
-		{
-		}
-		[TestMethod]
-		public void Test_2540()
-		{
-		}
-		[TestMethod]
-		public void Test_2541()
-		{
-		}
-		[TestMethod]
-		public void Test_2542()
-		{
-		}
-		[TestMethod]
-		public void Test_2543()
-		{
-		}
-		[TestMethod]
-		public void Test_2544()
-		{
-		}
-		[TestMethod]
-		public void Test_2545()
-		{
-		}
-		[TestMethod]
-		public void Test_2546()
-		{
-		}
-		[TestMethod]
-		public void Test_2547()
-		{
-		}
-		[TestMethod]
-		public void Test_2548()
-		{
-		}
-		[TestMethod]
-		public void Test_2549()
-		{
-		}
-		[TestMethod]
-		public void Test_2550()
-		{
-		}
-		[TestMethod]
-		public void Test_2551()
-		{
-		}
-		[TestMethod]
-		public void Test_2552()
-		{
-		}
-		[TestMethod]
-		public void Test_2553()
-		{
-		}
-		[TestMethod]
-		public void Test_2554()
-		{
-		}
-		[TestMethod]
-		public void Test_2555()
-		{
-		}
-		[TestMethod]
-		public void Test_2556()
-		{
-		}
-		[TestMethod]
-		public void Test_2557()
-		{
-		}
-		[TestMethod]
-		public void Test_2558()
-		{
-		}
-		[TestMethod]
-		public void Test_2559()
-		{
-		}
-		[TestMethod]
-		public void Test_2560()
-		{
-		}
-		[TestMethod]
-		public void Test_2561()
-		{
-		}
-		[TestMethod]
-		public void Test_2562()
-		{
-		}
-		[TestMethod]
-		public void Test_2563()
-		{
-		}
-		[TestMethod]
-		public void Test_2564()
-		{
-		}
-		[TestMethod]
-		public void Test_2565()
-		{
-		}
-		[TestMethod]
-		public void Test_2566()
-		{
-		}
-		[TestMethod]
-		public void Test_2567()
-		{
-		}
-		[TestMethod]
-		public void Test_2568()
-		{
-		}
-		[TestMethod]
-		public void Test_2569()
-		{
-		}
-		[TestMethod]
-		public void Test_2570()
-		{
-		}
-		[TestMethod]
-		public void Test_2571()
-		{
-		}
-		[TestMethod]
-		public void Test_2572()
-		{
-		}
-		[TestMethod]
-		public void Test_2573()
-		{
-		}
-		[TestMethod]
-		public void Test_2574()
-		{
-		}
-		[TestMethod]
-		public void Test_2575()
-		{
-		}
-		[TestMethod]
-		public void Test_2576()
-		{
-		}
-		[TestMethod]
-		public void Test_2577()
-		{
-		}
-		[TestMethod]
-		public void Test_2578()
-		{
-		}
-		[TestMethod]
-		public void Test_2579()
-		{
-		}
-		[TestMethod]
-		public void Test_2580()
-		{
-		}
-		[TestMethod]
-		public void Test_2581()
-		{
-		}
-		[TestMethod]
-		public void Test_2582()
-		{
-		}
-		[TestMethod]
-		public void Test_2583()
-		{
-		}
-		[TestMethod]
-		public void Test_2584()
-		{
-		}
-		[TestMethod]
-		public void Test_2585()
-		{
-		}
-		[TestMethod]
-		public void Test_2586()
-		{
-		}
-		[TestMethod]
-		public void Test_2587()
-		{
-		}
-		[TestMethod]
-		public void Test_2588()
-		{
-		}
-		[TestMethod]
-		public void Test_2589()
-		{
-		}
-		[TestMethod]
-		public void Test_2590()
-		{
-		}
-		[TestMethod]
-		public void Test_2591()
-		{
-		}
-		[TestMethod]
-		public void Test_2592()
-		{
-		}
-		[TestMethod]
-		public void Test_2593()
-		{
-		}
-		[TestMethod]
-		public void Test_2594()
-		{
-		}
-		[TestMethod]
-		public void Test_2595()
-		{
-		}
-		[TestMethod]
-		public void Test_2596()
-		{
-		}
-		[TestMethod]
-		public void Test_2597()
-		{
-		}
-		[TestMethod]
-		public void Test_2598()
-		{
-		}
-		[TestMethod]
-		public void Test_2599()
-		{
-		}
-		[TestMethod]
-		public void Test_2600()
-		{
-		}
-		[TestMethod]
-		public void Test_2601()
-		{
-		}
-		[TestMethod]
-		public void Test_2602()
-		{
-		}
-		[TestMethod]
-		public void Test_2603()
-		{
-		}
-		[TestMethod]
-		public void Test_2604()
-		{
-		}
-		[TestMethod]
-		public void Test_2605()
-		{
-		}
-		[TestMethod]
-		public void Test_2606()
-		{
-		}
-		[TestMethod]
-		public void Test_2607()
-		{
-		}
-		[TestMethod]
-		public void Test_2608()
-		{
-		}
-		[TestMethod]
-		public void Test_2609()
-		{
-		}
-		[TestMethod]
-		public void Test_2610()
-		{
-		}
-		[TestMethod]
-		public void Test_2611()
-		{
-		}
-		[TestMethod]
-		public void Test_2612()
-		{
-		}
-		[TestMethod]
-		public void Test_2613()
-		{
-		}
-		[TestMethod]
-		public void Test_2614()
-		{
-		}
-		[TestMethod]
-		public void Test_2615()
-		{
-		}
-		[TestMethod]
-		public void Test_2616()
-		{
-		}
-		[TestMethod]
-		public void Test_2617()
-		{
-		}
-		[TestMethod]
-		public void Test_2618()
-		{
-		}
-		[TestMethod]
-		public void Test_2619()
-		{
-		}
-		[TestMethod]
-		public void Test_2620()
-		{
-		}
-		[TestMethod]
-		public void Test_2621()
-		{
-		}
-		[TestMethod]
-		public void Test_2622()
-		{
-		}
-		[TestMethod]
-		public void Test_2623()
-		{
-		}
-		[TestMethod]
-		public void Test_2624()
-		{
-		}
-		[TestMethod]
-		public void Test_2625()
-		{
-		}
-		[TestMethod]
-		public void Test_2626()
-		{
-		}
-		[TestMethod]
-		public void Test_2627()
-		{
-		}
-		[TestMethod]
-		public void Test_2628()
-		{
-		}
-		[TestMethod]
-		public void Test_2629()
-		{
-		}
-		[TestMethod]
-		public void Test_2630()
-		{
-		}
-		[TestMethod]
-		public void Test_2631()
-		{
-		}
-		[TestMethod]
-		public void Test_2632()
-		{
-		}
-		[TestMethod]
-		public void Test_2633()
-		{
-		}
-		[TestMethod]
-		public void Test_2634()
-		{
-		}
-		[TestMethod]
-		public void Test_2635()
-		{
-		}
-		[TestMethod]
-		public void Test_2636()
-		{
-		}
-		[TestMethod]
-		public void Test_2637()
-		{
-		}
-		[TestMethod]
-		public void Test_2638()
-		{
-		}
-		[TestMethod]
-		public void Test_2639()
-		{
-		}
-		[TestMethod]
-		public void Test_2640()
-		{
-		}
-		[TestMethod]
-		public void Test_2641()
-		{
-		}
-		[TestMethod]
-		public void Test_2642()
-		{
-		}
-		[TestMethod]
-		public void Test_2643()
-		{
-		}
-		[TestMethod]
-		public void Test_2644()
-		{
-		}
-		[TestMethod]
-		public void Test_2645()
-		{
-		}
-		[TestMethod]
-		public void Test_2646()
-		{
-		}
-		[TestMethod]
-		public void Test_2647()
-		{
-		}
-		[TestMethod]
-		public void Test_2648()
-		{
-		}
-		[TestMethod]
-		public void Test_2649()
-		{
-		}
-		[TestMethod]
-		public void Test_2650()
-		{
-		}
-		[TestMethod]
-		public void Test_2651()
-		{
-		}
-		[TestMethod]
-		public void Test_2652()
-		{
-		}
-		[TestMethod]
-		public void Test_2653()
-		{
-		}
-		[TestMethod]
-		public void Test_2654()
-		{
-		}
-		[TestMethod]
-		public void Test_2655()
-		{
-		}
-		[TestMethod]
-		public void Test_2656()
-		{
-		}
-		[TestMethod]
-		public void Test_2657()
-		{
-		}
-		[TestMethod]
-		public void Test_2658()
-		{
-		}
-		[TestMethod]
-		public void Test_2659()
-		{
-		}
-		[TestMethod]
-		public void Test_2660()
-		{
-		}
-		[TestMethod]
-		public void Test_2661()
-		{
-		}
-		[TestMethod]
-		public void Test_2662()
-		{
-		}
-		[TestMethod]
-		public void Test_2663()
-		{
-		}
-		[TestMethod]
-		public void Test_2664()
-		{
-		}
-		[TestMethod]
-		public void Test_2665()
-		{
-		}
-		[TestMethod]
-		public void Test_2666()
-		{
-		}
-		[TestMethod]
-		public void Test_2667()
-		{
-		}
-		[TestMethod]
-		public void Test_2668()
-		{
-		}
-		[TestMethod]
-		public void Test_2669()
-		{
-		}
-		[TestMethod]
-		public void Test_2670()
-		{
-		}
-		[TestMethod]
-		public void Test_2671()
-		{
-		}
-		[TestMethod]
-		public void Test_2672()
-		{
-		}
-		[TestMethod]
-		public void Test_2673()
-		{
-		}
-		[TestMethod]
-		public void Test_2674()
-		{
-		}
-		[TestMethod]
-		public void Test_2675()
-		{
-		}
-		[TestMethod]
-		public void Test_2676()
-		{
-		}
-		[TestMethod]
-		public void Test_2677()
-		{
-		}
-		[TestMethod]
-		public void Test_2678()
-		{
-		}
-		[TestMethod]
-		public void Test_2679()
-		{
-		}
-		[TestMethod]
-		public void Test_2680()
-		{
-		}
-		[TestMethod]
-		public void Test_2681()
-		{
-		}
-		[TestMethod]
-		public void Test_2682()
-		{
-		}
-		[TestMethod]
-		public void Test_2683()
-		{
-		}
-		[TestMethod]
-		public void Test_2684()
-		{
-		}
-		[TestMethod]
-		public void Test_2685()
-		{
-		}
-		[TestMethod]
-		public void Test_2686()
-		{
-		}
-		[TestMethod]
-		public void Test_2687()
-		{
-		}
-		[TestMethod]
-		public void Test_2688()
-		{
-		}
-		[TestMethod]
-		public void Test_2689()
-		{
-		}
-		[TestMethod]
-		public void Test_2690()
-		{
-		}
-		[TestMethod]
-		public void Test_2691()
-		{
-		}
-		[TestMethod]
-		public void Test_2692()
-		{
-		}
-		[TestMethod]
-		public void Test_2693()
-		{
-		}
-		[TestMethod]
-		public void Test_2694()
-		{
-		}
-		[TestMethod]
-		public void Test_2695()
-		{
-		}
-		[TestMethod]
-		public void Test_2696()
-		{
-		}
-		[TestMethod]
-		public void Test_2697()
-		{
-		}
-		[TestMethod]
-		public void Test_2698()
-		{
-		}
-		[TestMethod]
-		public void Test_2699()
-		{
-		}
-		[TestMethod]
-		public void Test_2700()
-		{
-		}
-		[TestMethod]
-		public void Test_2701()
-		{
-		}
-		[TestMethod]
-		public void Test_2702()
-		{
-		}
-		[TestMethod]
-		public void Test_2703()
-		{
-		}
-		[TestMethod]
-		public void Test_2704()
-		{
-		}
-		[TestMethod]
-		public void Test_2705()
-		{
-		}
-		[TestMethod]
-		public void Test_2706()
-		{
-		}
-		[TestMethod]
-		public void Test_2707()
-		{
-		}
-		[TestMethod]
-		public void Test_2708()
-		{
-		}
-		[TestMethod]
-		public void Test_2709()
-		{
-		}
-		[TestMethod]
-		public void Test_2710()
-		{
-		}
-		[TestMethod]
-		public void Test_2711()
-		{
-		}
-		[TestMethod]
-		public void Test_2712()
-		{
-		}
-		[TestMethod]
-		public void Test_2713()
-		{
-		}
-		[TestMethod]
-		public void Test_2714()
-		{
-		}
-		[TestMethod]
-		public void Test_2715()
-		{
-		}
-		[TestMethod]
-		public void Test_2716()
-		{
-		}
-		[TestMethod]
-		public void Test_2717()
-		{
-		}
-		[TestMethod]
-		public void Test_2718()
-		{
-		}
-		[TestMethod]
-		public void Test_2719()
-		{
-		}
-		[TestMethod]
-		public void Test_2720()
-		{
-		}
-		[TestMethod]
-		public void Test_2721()
-		{
-		}
-		[TestMethod]
-		public void Test_2722()
-		{
-		}
-		[TestMethod]
-		public void Test_2723()
-		{
-		}
-		[TestMethod]
-		public void Test_2724()
-		{
-		}
-		[TestMethod]
-		public void Test_2725()
-		{
-		}
-		[TestMethod]
-		public void Test_2726()
-		{
-		}
-		[TestMethod]
-		public void Test_2727()
-		{
-		}
-		[TestMethod]
-		public void Test_2728()
-		{
-		}
-		[TestMethod]
-		public void Test_2729()
-		{
-		}
-		[TestMethod]
-		public void Test_2730()
-		{
-		}
-		[TestMethod]
-		public void Test_2731()
-		{
-		}
-		[TestMethod]
-		public void Test_2732()
-		{
-		}
-		[TestMethod]
-		public void Test_2733()
-		{
-		}
-		[TestMethod]
-		public void Test_2734()
-		{
-		}
-		[TestMethod]
-		public void Test_2735()
-		{
-		}
-		[TestMethod]
-		public void Test_2736()
-		{
-		}
-		[TestMethod]
-		public void Test_2737()
-		{
-		}
-		[TestMethod]
-		public void Test_2738()
-		{
-		}
-		[TestMethod]
-		public void Test_2739()
-		{
-		}
-		[TestMethod]
-		public void Test_2740()
-		{
-		}
-		[TestMethod]
-		public void Test_2741()
-		{
-		}
-		[TestMethod]
-		public void Test_2742()
-		{
-		}
-		[TestMethod]
-		public void Test_2743()
-		{
-		}
-		[TestMethod]
-		public void Test_2744()
-		{
-		}
-		[TestMethod]
-		public void Test_2745()
-		{
-		}
-		[TestMethod]
-		public void Test_2746()
-		{
-		}
-		[TestMethod]
-		public void Test_2747()
-		{
-		}
-		[TestMethod]
-		public void Test_2748()
-		{
-		}
-		[TestMethod]
-		public void Test_2749()
-		{
-		}
-		[TestMethod]
-		public void Test_2750()
-		{
-		}
-		[TestMethod]
-		public void Test_2751()
-		{
-		}
-		[TestMethod]
-		public void Test_2752()
-		{
-		}
-		[TestMethod]
-		public void Test_2753()
-		{
-		}
-		[TestMethod]
-		public void Test_2754()
-		{
-		}
-		[TestMethod]
-		public void Test_2755()
-		{
-		}
-		[TestMethod]
-		public void Test_2756()
-		{
-		}
-		[TestMethod]
-		public void Test_2757()
-		{
-		}
-		[TestMethod]
-		public void Test_2758()
-		{
-		}
-		[TestMethod]
-		public void Test_2759()
-		{
-		}
-		[TestMethod]
-		public void Test_2760()
-		{
-		}
-		[TestMethod]
-		public void Test_2761()
-		{
-		}
-		[TestMethod]
-		public void Test_2762()
-		{
-		}
-		[TestMethod]
-		public void Test_2763()
-		{
-		}
-		[TestMethod]
-		public void Test_2764()
-		{
-		}
-		[TestMethod]
-		public void Test_2765()
-		{
-		}
-		[TestMethod]
-		public void Test_2766()
-		{
-		}
-		[TestMethod]
-		public void Test_2767()
-		{
-		}
-		[TestMethod]
-		public void Test_2768()
-		{
-		}
-		[TestMethod]
-		public void Test_2769()
-		{
-		}
-		[TestMethod]
-		public void Test_2770()
-		{
-		}
-		[TestMethod]
-		public void Test_2771()
-		{
-		}
-		[TestMethod]
-		public void Test_2772()
-		{
-		}
-		[TestMethod]
-		public void Test_2773()
-		{
-		}
-		[TestMethod]
-		public void Test_2774()
-		{
-		}
-		[TestMethod]
-		public void Test_2775()
-		{
-		}
-		[TestMethod]
-		public void Test_2776()
-		{
-		}
-		[TestMethod]
-		public void Test_2777()
-		{
-		}
-		[TestMethod]
-		public void Test_2778()
-		{
-		}
-		[TestMethod]
-		public void Test_2779()
-		{
-		}
-		[TestMethod]
-		public void Test_2780()
-		{
-		}
-		[TestMethod]
-		public void Test_2781()
-		{
-		}
-		[TestMethod]
-		public void Test_2782()
-		{
-		}
-		[TestMethod]
-		public void Test_2783()
-		{
-		}
-		[TestMethod]
-		public void Test_2784()
-		{
-		}
-		[TestMethod]
-		public void Test_2785()
-		{
-		}
-		[TestMethod]
-		public void Test_2786()
-		{
-		}
-		[TestMethod]
-		public void Test_2787()
-		{
-		}
-		[TestMethod]
-		public void Test_2788()
-		{
-		}
-		[TestMethod]
-		public void Test_2789()
-		{
-		}
-		[TestMethod]
-		public void Test_2790()
-		{
-		}
-		[TestMethod]
-		public void Test_2791()
-		{
-		}
-		[TestMethod]
-		public void Test_2792()
-		{
-		}
-		[TestMethod]
-		public void Test_2793()
-		{
-		}
-		[TestMethod]
-		public void Test_2794()
-		{
-		}
-		[TestMethod]
-		public void Test_2795()
-		{
-		}
-		[TestMethod]
-		public void Test_2796()
-		{
-		}
-		[TestMethod]
-		public void Test_2797()
-		{
-		}
-		[TestMethod]
-		public void Test_2798()
-		{
-		}
-		[TestMethod]
-		public void Test_2799()
-		{
-		}
-		[TestMethod]
-		public void Test_2800()
-		{
-		}
-		[TestMethod]
-		public void Test_2801()
-		{
-		}
-		[TestMethod]
-		public void Test_2802()
-		{
-		}
-		[TestMethod]
-		public void Test_2803()
-		{
-		}
-		[TestMethod]
-		public void Test_2804()
-		{
-		}
-		[TestMethod]
-		public void Test_2805()
-		{
-		}
-		[TestMethod]
-		public void Test_2806()
-		{
-		}
-		[TestMethod]
-		public void Test_2807()
-		{
-		}
-		[TestMethod]
-		public void Test_2808()
-		{
-		}
-		[TestMethod]
-		public void Test_2809()
-		{
-		}
-		[TestMethod]
-		public void Test_2810()
-		{
-		}
-		[TestMethod]
-		public void Test_2811()
-		{
-		}
-		[TestMethod]
-		public void Test_2812()
-		{
-		}
-		[TestMethod]
-		public void Test_2813()
-		{
-		}
-		[TestMethod]
-		public void Test_2814()
-		{
-		}
-		[TestMethod]
-		public void Test_2815()
-		{
-		}
-		[TestMethod]
-		public void Test_2816()
-		{
-		}
-		[TestMethod]
-		public void Test_2817()
-		{
-		}
-		[TestMethod]
-		public void Test_2818()
-		{
-		}
-		[TestMethod]
-		public void Test_2819()
-		{
-		}
-		[TestMethod]
-		public void Test_2820()
-		{
-		}
-		[TestMethod]
-		public void Test_2821()
-		{
-		}
-		[TestMethod]
-		public void Test_2822()
-		{
-		}
-		[TestMethod]
-		public void Test_2823()
-		{
-		}
-		[TestMethod]
-		public void Test_2824()
-		{
-		}
-		[TestMethod]
-		public void Test_2825()
-		{
-		}
-		[TestMethod]
-		public void Test_2826()
-		{
-		}
-		[TestMethod]
-		public void Test_2827()
-		{
-		}
-		[TestMethod]
-		public void Test_2828()
-		{
-		}
-		[TestMethod]
-		public void Test_2829()
-		{
-		}
-		[TestMethod]
-		public void Test_2830()
-		{
-		}
-		[TestMethod]
-		public void Test_2831()
-		{
-		}
-		[TestMethod]
-		public void Test_2832()
-		{
-		}
-		[TestMethod]
-		public void Test_2833()
-		{
-		}
-		[TestMethod]
-		public void Test_2834()
-		{
-		}
-		[TestMethod]
-		public void Test_2835()
-		{
-		}
-		[TestMethod]
-		public void Test_2836()
-		{
-		}
-		[TestMethod]
-		public void Test_2837()
-		{
-		}
-		[TestMethod]
-		public void Test_2838()
-		{
-		}
-		[TestMethod]
-		public void Test_2839()
-		{
-		}
-		[TestMethod]
-		public void Test_2840()
-		{
-		}
-		[TestMethod]
-		public void Test_2841()
-		{
-		}
-		[TestMethod]
-		public void Test_2842()
-		{
-		}
-		[TestMethod]
-		public void Test_2843()
-		{
-		}
-		[TestMethod]
-		public void Test_2844()
-		{
-		}
-		[TestMethod]
-		public void Test_2845()
-		{
-		}
-		[TestMethod]
-		public void Test_2846()
-		{
-		}
-		[TestMethod]
-		public void Test_2847()
-		{
-		}
-		[TestMethod]
-		public void Test_2848()
-		{
-		}
-		[TestMethod]
-		public void Test_2849()
-		{
-		}
-		[TestMethod]
-		public void Test_2850()
-		{
-		}
-		[TestMethod]
-		public void Test_2851()
-		{
-		}
-		[TestMethod]
-		public void Test_2852()
-		{
-		}
-		[TestMethod]
-		public void Test_2853()
-		{
-		}
-		[TestMethod]
-		public void Test_2854()
-		{
-		}
-		[TestMethod]
-		public void Test_2855()
-		{
-		}
-		[TestMethod]
-		public void Test_2856()
-		{
-		}
-		[TestMethod]
-		public void Test_2857()
-		{
-		}
-		[TestMethod]
-		public void Test_2858()
-		{
-		}
-		[TestMethod]
-		public void Test_2859()
-		{
-		}
-		[TestMethod]
-		public void Test_2860()
-		{
-		}
-		[TestMethod]
-		public void Test_2861()
-		{
-		}
-		[TestMethod]
-		public void Test_2862()
-		{
-		}
-		[TestMethod]
-		public void Test_2863()
-		{
-		}
-		[TestMethod]
-		public void Test_2864()
-		{
-		}
-		[TestMethod]
-		public void Test_2865()
-		{
-		}
-		[TestMethod]
-		public void Test_2866()
-		{
-		}
-		[TestMethod]
-		public void Test_2867()
-		{
-		}
-		[TestMethod]
-		public void Test_2868()
-		{
-		}
-		[TestMethod]
-		public void Test_2869()
-		{
-		}
-		[TestMethod]
-		public void Test_2870()
-		{
-		}
-		[TestMethod]
-		public void Test_2871()
-		{
-		}
-		[TestMethod]
-		public void Test_2872()
-		{
-		}
-		[TestMethod]
-		public void Test_2873()
-		{
-		}
-		[TestMethod]
-		public void Test_2874()
-		{
-		}
-		[TestMethod]
-		public void Test_2875()
-		{
-		}
-		[TestMethod]
-		public void Test_2876()
-		{
-		}
-		[TestMethod]
-		public void Test_2877()
-		{
-		}
-		[TestMethod]
-		public void Test_2878()
-		{
-		}
-		[TestMethod]
-		public void Test_2879()
-		{
-		}
-		[TestMethod]
-		public void Test_2880()
-		{
-		}
-		[TestMethod]
-		public void Test_2881()
-		{
-		}
-		[TestMethod]
-		public void Test_2882()
-		{
-		}
-		[TestMethod]
-		public void Test_2883()
-		{
-		}
-		[TestMethod]
-		public void Test_2884()
-		{
-		}
-		[TestMethod]
-		public void Test_2885()
-		{
-		}
-		[TestMethod]
-		public void Test_2886()
-		{
-		}
-		[TestMethod]
-		public void Test_2887()
-		{
-		}
-		[TestMethod]
-		public void Test_2888()
-		{
-		}
-		[TestMethod]
-		public void Test_2889()
-		{
-		}
-		[TestMethod]
-		public void Test_2890()
-		{
-		}
-		[TestMethod]
-		public void Test_2891()
-		{
-		}
-		[TestMethod]
-		public void Test_2892()
-		{
-		}
-		[TestMethod]
-		public void Test_2893()
-		{
-		}
-		[TestMethod]
-		public void Test_2894()
-		{
-		}
-		[TestMethod]
-		public void Test_2895()
-		{
-		}
-		[TestMethod]
-		public void Test_2896()
-		{
-		}
-		[TestMethod]
-		public void Test_2897()
-		{
-		}
-		[TestMethod]
-		public void Test_2898()
-		{
-		}
-		[TestMethod]
-		public void Test_2899()
-		{
-		}
-		[TestMethod]
-		public void Test_2900()
-		{
-		}
-		[TestMethod]
-		public void Test_2901()
-		{
-		}
-		[TestMethod]
-		public void Test_2902()
-		{
-		}
-		[TestMethod]
-		public void Test_2903()
-		{
-		}
-		[TestMethod]
-		public void Test_2904()
-		{
-		}
-		[TestMethod]
-		public void Test_2905()
-		{
-		}
-		[TestMethod]
-		public void Test_2906()
-		{
-		}
-		[TestMethod]
-		public void Test_2907()
-		{
-		}
-		[TestMethod]
-		public void Test_2908()
-		{
-		}
-		[TestMethod]
-		public void Test_2909()
-		{
-		}
-		[TestMethod]
-		public void Test_2910()
-		{
-		}
-		[TestMethod]
-		public void Test_2911()
-		{
-		}
-		[TestMethod]
-		public void Test_2912()
-		{
-		}
-		[TestMethod]
-		public void Test_2913()
-		{
-		}
-		[TestMethod]
-		public void Test_2914()
-		{
-		}
-		[TestMethod]
-		public void Test_2915()
-		{
-		}
-		[TestMethod]
-		public void Test_2916()
-		{
-		}
-		[TestMethod]
-		public void Test_2917()
-		{
-		}
-		[TestMethod]
-		public void Test_2918()
-		{
-		}
-		[TestMethod]
-		public void Test_2919()
-		{
-		}
-		[TestMethod]
-		public void Test_2920()
-		{
-		}
-		[TestMethod]
-		public void Test_2921()
-		{
-		}
-		[TestMethod]
-		public void Test_2922()
-		{
-		}
-		[TestMethod]
-		public void Test_2923()
-		{
-		}
-		[TestMethod]
-		public void Test_2924()
-		{
-		}
-		[TestMethod]
-		public void Test_2925()
-		{
-		}
-		[TestMethod]
-		public void Test_2926()
-		{
-		}
-		[TestMethod]
-		public void Test_2927()
-		{
-		}
-		[TestMethod]
-		public void Test_2928()
-		{
-		}
-		[TestMethod]
-		public void Test_2929()
-		{
-		}
-		[TestMethod]
-		public void Test_2930()
-		{
-		}
-		[TestMethod]
-		public void Test_2931()
-		{
-		}
-		[TestMethod]
-		public void Test_2932()
-		{
-		}
-		[TestMethod]
-		public void Test_2933()
-		{
-		}
-		[TestMethod]
-		public void Test_2934()
-		{
-		}
-		[TestMethod]
-		public void Test_2935()
-		{
-		}
-		[TestMethod]
-		public void Test_2936()
-		{
-		}
-		[TestMethod]
-		public void Test_2937()
-		{
-		}
-		[TestMethod]
-		public void Test_2938()
-		{
-		}
-		[TestMethod]
-		public void Test_2939()
-		{
-		}
-		[TestMethod]
-		public void Test_2940()
-		{
-		}
-		[TestMethod]
-		public void Test_2941()
-		{
-		}
-		[TestMethod]
-		public void Test_2942()
-		{
-		}
-		[TestMethod]
-		public void Test_2943()
-		{
-		}
-		[TestMethod]
-		public void Test_2944()
-		{
-		}
-		[TestMethod]
-		public void Test_2945()
-		{
-		}
-		[TestMethod]
-		public void Test_2946()
-		{
-		}
-		[TestMethod]
-		public void Test_2947()
-		{
-		}
-		[TestMethod]
-		public void Test_2948()
-		{
-		}
-		[TestMethod]
-		public void Test_2949()
-		{
-		}
-		[TestMethod]
-		public void Test_2950()
-		{
-		}
-		[TestMethod]
-		public void Test_2951()
-		{
-		}
-		[TestMethod]
-		public void Test_2952()
-		{
-		}
-		[TestMethod]
-		public void Test_2953()
-		{
-		}
-		[TestMethod]
-		public void Test_2954()
-		{
-		}
-		[TestMethod]
-		public void Test_2955()
-		{
-		}
-		[TestMethod]
-		public void Test_2956()
-		{
-		}
-		[TestMethod]
-		public void Test_2957()
-		{
-		}
-		[TestMethod]
-		public void Test_2958()
-		{
-		}
-		[TestMethod]
-		public void Test_2959()
-		{
-		}
-		[TestMethod]
-		public void Test_2960()
-		{
-		}
-		[TestMethod]
-		public void Test_2961()
-		{
-		}
-		[TestMethod]
-		public void Test_2962()
-		{
-		}
-		[TestMethod]
-		public void Test_2963()
-		{
-		}
-		[TestMethod]
-		public void Test_2964()
-		{
-		}
-		[TestMethod]
-		public void Test_2965()
-		{
-		}
-		[TestMethod]
-		public void Test_2966()
-		{
-		}
-		[TestMethod]
-		public void Test_2967()
-		{
-		}
-		[TestMethod]
-		public void Test_2968()
-		{
-		}
-		[TestMethod]
-		public void Test_2969()
-		{
-		}
-		[TestMethod]
-		public void Test_2970()
-		{
-		}
-		[TestMethod]
-		public void Test_2971()
-		{
-		}
-		[TestMethod]
-		public void Test_2972()
-		{
-		}
-		[TestMethod]
-		public void Test_2973()
-		{
-		}
-		[TestMethod]
-		public void Test_2974()
-		{
-		}
-		[TestMethod]
-		public void Test_2975()
-		{
-		}
-		[TestMethod]
-		public void Test_2976()
-		{
-		}
-		[TestMethod]
-		public void Test_2977()
-		{
-		}
-		[TestMethod]
-		public void Test_2978()
-		{
-		}
-		[TestMethod]
-		public void Test_2979()
-		{
-		}
-		[TestMethod]
-		public void Test_2980()
-		{
-		}
-		[TestMethod]
-		public void Test_2981()
-		{
-		}
-		[TestMethod]
-		public void Test_2982()
-		{
-		}
-		[TestMethod]
-		public void Test_2983()
-		{
-		}
-		[TestMethod]
-		public void Test_2984()
-		{
-		}
-		[TestMethod]
-		public void Test_2985()
-		{
-		}
-		[TestMethod]
-		public void Test_2986()
-		{
-		}
-		[TestMethod]
-		public void Test_2987()
-		{
-		}
-		[TestMethod]
-		public void Test_2988()
-		{
-		}
-		[TestMethod]
-		public void Test_2989()
-		{
-		}
-		[TestMethod]
-		public void Test_2990()
-		{
-		}
-		[TestMethod]
-		public void Test_2991()
-		{
-		}
-		[TestMethod]
-		public void Test_2992()
-		{
-		}
-		[TestMethod]
-		public void Test_2993()
-		{
-		}
-		[TestMethod]
-		public void Test_2994()
-		{
-		}
-		[TestMethod]
-		public void Test_2995()
-		{
-		}
-		[TestMethod]
-		public void Test_2996()
-		{
-		}
-		[TestMethod]
-		public void Test_2997()
-		{
-		}
-		[TestMethod]
-		public void Test_2998()
-		{
-		}
-		[TestMethod]
-		public void Test_2999()
-		{
-		}
-		[TestMethod]
-		public void Test_3000()
-		{
-		}
-		[TestMethod]
-		public void Test_3001()
-		{
-		}
-		[TestMethod]
-		public void Test_3002()
-		{
-		}
-		[TestMethod]
-		public void Test_3003()
-		{
-		}
-		[TestMethod]
-		public void Test_3004()
-		{
-		}
-		[TestMethod]
-		public void Test_3005()
-		{
-		}
-		[TestMethod]
-		public void Test_3006()
-		{
-		}
-		[TestMethod]
-		public void Test_3007()
-		{
-		}
-		[TestMethod]
-		public void Test_3008()
-		{
-		}
-		[TestMethod]
-		public void Test_3009()
-		{
-		}
-		[TestMethod]
-		public void Test_3010()
-		{
-		}
-		[TestMethod]
-		public void Test_3011()
-		{
-		}
-		[TestMethod]
-		public void Test_3012()
-		{
-		}
-		[TestMethod]
-		public void Test_3013()
-		{
-		}
-		[TestMethod]
-		public void Test_3014()
-		{
-		}
-		[TestMethod]
-		public void Test_3015()
-		{
-		}
-		[TestMethod]
-		public void Test_3016()
-		{
-		}
-		[TestMethod]
-		public void Test_3017()
-		{
-		}
-		[TestMethod]
-		public void Test_3018()
-		{
-		}
-		[TestMethod]
-		public void Test_3019()
-		{
-		}
-		[TestMethod]
-		public void Test_3020()
-		{
-		}
-		[TestMethod]
-		public void Test_3021()
-		{
-		}
-		[TestMethod]
-		public void Test_3022()
-		{
-		}
-		[TestMethod]
-		public void Test_3023()
-		{
-		}
-		[TestMethod]
-		public void Test_3024()
-		{
-		}
-		[TestMethod]
-		public void Test_3025()
-		{
-		}
-		[TestMethod]
-		public void Test_3026()
-		{
-		}
-		[TestMethod]
-		public void Test_3027()
-		{
-		}
-		[TestMethod]
-		public void Test_3028()
-		{
-		}
-		[TestMethod]
-		public void Test_3029()
-		{
-		}
-		[TestMethod]
-		public void Test_3030()
-		{
-		}
-		[TestMethod]
-		public void Test_3031()
-		{
-		}
-		[TestMethod]
-		public void Test_3032()
-		{
-		}
-		[TestMethod]
-		public void Test_3033()
-		{
-		}
-		[TestMethod]
-		public void Test_3034()
-		{
-		}
-		[TestMethod]
-		public void Test_3035()
-		{
-		}
-		[TestMethod]
-		public void Test_3036()
-		{
-		}
-		[TestMethod]
-		public void Test_3037()
-		{
-		}
-		[TestMethod]
-		public void Test_3038()
-		{
-		}
-		[TestMethod]
-		public void Test_3039()
-		{
-		}
-		[TestMethod]
-		public void Test_3040()
-		{
-		}
-		[TestMethod]
-		public void Test_3041()
-		{
-		}
-		[TestMethod]
-		public void Test_3042()
-		{
-		}
-		[TestMethod]
-		public void Test_3043()
-		{
-		}
-		[TestMethod]
-		public void Test_3044()
-		{
-		}
-		[TestMethod]
-		public void Test_3045()
-		{
-		}
-		[TestMethod]
-		public void Test_3046()
-		{
-		}
-		[TestMethod]
-		public void Test_3047()
-		{
-		}
-		[TestMethod]
-		public void Test_3048()
-		{
-		}
-		[TestMethod]
-		public void Test_3049()
-		{
-		}
-		[TestMethod]
-		public void Test_3050()
-		{
-		}
-		[TestMethod]
-		public void Test_3051()
-		{
-		}
-		[TestMethod]
-		public void Test_3052()
-		{
-		}
-		[TestMethod]
-		public void Test_3053()
-		{
-		}
-		[TestMethod]
-		public void Test_3054()
-		{
-		}
-		[TestMethod]
-		public void Test_3055()
-		{
-		}
-		[TestMethod]
-		public void Test_3056()
-		{
-		}
-		[TestMethod]
-		public void Test_3057()
-		{
-		}
-		[TestMethod]
-		public void Test_3058()
-		{
-		}
-		[TestMethod]
-		public void Test_3059()
-		{
-		}
-		[TestMethod]
-		public void Test_3060()
-		{
-		}
-		[TestMethod]
-		public void Test_3061()
-		{
-		}
-		[TestMethod]
-		public void Test_3062()
-		{
-		}
-		[TestMethod]
-		public void Test_3063()
-		{
-		}
-		[TestMethod]
-		public void Test_3064()
-		{
-		}
-		[TestMethod]
-		public void Test_3065()
-		{
-		}
-		[TestMethod]
-		public void Test_3066()
-		{
-		}
-		[TestMethod]
-		public void Test_3067()
-		{
-		}
-		[TestMethod]
-		public void Test_3068()
-		{
-		}
-		[TestMethod]
-		public void Test_3069()
-		{
-		}
-		[TestMethod]
-		public void Test_3070()
-		{
-		}
-		[TestMethod]
-		public void Test_3071()
-		{
-		}
-		[TestMethod]
-		public void Test_3072()
-		{
-		}
-		[TestMethod]
-		public void Test_3073()
-		{
-		}
-		[TestMethod]
-		public void Test_3074()
-		{
-		}
-		[TestMethod]
-		public void Test_3075()
-		{
-		}
-		[TestMethod]
-		public void Test_3076()
-		{
-		}
-		[TestMethod]
-		public void Test_3077()
-		{
-		}
-		[TestMethod]
-		public void Test_3078()
-		{
-		}
-		[TestMethod]
-		public void Test_3079()
-		{
-		}
-		[TestMethod]
-		public void Test_3080()
-		{
-		}
-		[TestMethod]
-		public void Test_3081()
-		{
-		}
-		[TestMethod]
-		public void Test_3082()
-		{
-		}
-		[TestMethod]
-		public void Test_3083()
-		{
-		}
-		[TestMethod]
-		public void Test_3084()
-		{
-		}
-		[TestMethod]
-		public void Test_3085()
-		{
-		}
-		[TestMethod]
-		public void Test_3086()
-		{
-		}
-		[TestMethod]
-		public void Test_3087()
-		{
-		}
-		[TestMethod]
-		public void Test_3088()
-		{
-		}
-		[TestMethod]
-		public void Test_3089()
-		{
-		}
-		[TestMethod]
-		public void Test_3090()
-		{
-		}
-		[TestMethod]
-		public void Test_3091()
-		{
-		}
-		[TestMethod]
-		public void Test_3092()
-		{
-		}
-		[TestMethod]
-		public void Test_3093()
-		{
-		}
-		[TestMethod]
-		public void Test_3094()
-		{
-		}
-		[TestMethod]
-		public void Test_3095()
-		{
-		}
-		[TestMethod]
-		public void Test_3096()
-		{
-		}
-		[TestMethod]
-		public void Test_3097()
-		{
-		}
-		[TestMethod]
-		public void Test_3098()
-		{
-		}
-		[TestMethod]
-		public void Test_3099()
-		{
-		}
-		[TestMethod]
-		public void Test_3100()
-		{
-		}
-		[TestMethod]
-		public void Test_3101()
-		{
-		}
-		[TestMethod]
-		public void Test_3102()
-		{
-		}
-		[TestMethod]
-		public void Test_3103()
-		{
-		}
-		[TestMethod]
-		public void Test_3104()
-		{
-		}
-		[TestMethod]
-		public void Test_3105()
-		{
-		}
-		[TestMethod]
-		public void Test_3106()
-		{
-		}
-		[TestMethod]
-		public void Test_3107()
-		{
-		}
-		[TestMethod]
-		public void Test_3108()
-		{
-		}
-		[TestMethod]
-		public void Test_3109()
-		{
-		}
-		[TestMethod]
-		public void Test_3110()
-		{
-		}
-		[TestMethod]
-		public void Test_3111()
-		{
-		}
-		[TestMethod]
-		public void Test_3112()
-		{
-		}
-		[TestMethod]
-		public void Test_3113()
-		{
-		}
-		[TestMethod]
-		public void Test_3114()
-		{
-		}
-		[TestMethod]
-		public void Test_3115()
-		{
-		}
-		[TestMethod]
-		public void Test_3116()
-		{
-		}
-		[TestMethod]
-		public void Test_3117()
-		{
-		}
-		[TestMethod]
-		public void Test_3118()
-		{
-		}
-		[TestMethod]
-		public void Test_3119()
-		{
-		}
-		[TestMethod]
-		public void Test_3120()
-		{
-		}
-		[TestMethod]
-		public void Test_3121()
-		{
-		}
-		[TestMethod]
-		public void Test_3122()
-		{
-		}
-		[TestMethod]
-		public void Test_3123()
-		{
-		}
-		[TestMethod]
-		public void Test_3124()
-		{
-		}
-		[TestMethod]
-		public void Test_3125()
-		{
-		}
-		[TestMethod]
-		public void Test_3126()
-		{
-		}
-		[TestMethod]
-		public void Test_3127()
-		{
-		}
-		[TestMethod]
-		public void Test_3128()
-		{
-		}
-		[TestMethod]
-		public void Test_3129()
-		{
-		}
-		[TestMethod]
-		public void Test_3130()
-		{
-		}
-		[TestMethod]
-		public void Test_3131()
-		{
-		}
-		[TestMethod]
-		public void Test_3132()
-		{
-		}
-		[TestMethod]
-		public void Test_3133()
-		{
-		}
-		[TestMethod]
-		public void Test_3134()
-		{
-		}
-		[TestMethod]
-		public void Test_3135()
-		{
-		}
-		[TestMethod]
-		public void Test_3136()
-		{
-		}
-		[TestMethod]
-		public void Test_3137()
-		{
-		}
-		[TestMethod]
-		public void Test_3138()
-		{
-		}
-		[TestMethod]
-		public void Test_3139()
-		{
-		}
-		[TestMethod]
-		public void Test_3140()
-		{
-		}
-		[TestMethod]
-		public void Test_3141()
-		{
-		}
-		[TestMethod]
-		public void Test_3142()
-		{
-		}
-		[TestMethod]
-		public void Test_3143()
-		{
-		}
-		[TestMethod]
-		public void Test_3144()
-		{
-		}
-		[TestMethod]
-		public void Test_3145()
-		{
-		}
-		[TestMethod]
-		public void Test_3146()
-		{
-		}
-		[TestMethod]
-		public void Test_3147()
-		{
-		}
-		[TestMethod]
-		public void Test_3148()
-		{
-		}
-		[TestMethod]
-		public void Test_3149()
-		{
-		}
-		[TestMethod]
-		public void Test_3150()
-		{
-		}
-		[TestMethod]
-		public void Test_3151()
-		{
-		}
-		[TestMethod]
-		public void Test_3152()
-		{
-		}
-		[TestMethod]
-		public void Test_3153()
-		{
-		}
-		[TestMethod]
-		public void Test_3154()
-		{
-		}
-		[TestMethod]
-		public void Test_3155()
-		{
-		}
-		[TestMethod]
-		public void Test_3156()
-		{
-		}
-		[TestMethod]
-		public void Test_3157()
-		{
-		}
-		[TestMethod]
-		public void Test_3158()
-		{
-		}
-		[TestMethod]
-		public void Test_3159()
-		{
-		}
-		[TestMethod]
-		public void Test_3160()
-		{
-		}
-		[TestMethod]
-		public void Test_3161()
-		{
-		}
-		[TestMethod]
-		public void Test_3162()
-		{
-		}
-		[TestMethod]
-		public void Test_3163()
-		{
-		}
-		[TestMethod]
-		public void Test_3164()
-		{
-		}
-		[TestMethod]
-		public void Test_3165()
-		{
-		}
-		[TestMethod]
-		public void Test_3166()
-		{
-		}
-		[TestMethod]
-		public void Test_3167()
-		{
-		}
-		[TestMethod]
-		public void Test_3168()
-		{
-		}
-		[TestMethod]
-		public void Test_3169()
-		{
-		}
-		[TestMethod]
-		public void Test_3170()
-		{
-		}
-		[TestMethod]
-		public void Test_3171()
-		{
-		}
-		[TestMethod]
-		public void Test_3172()
-		{
-		}
-		[TestMethod]
-		public void Test_3173()
-		{
-		}
-		[TestMethod]
-		public void Test_3174()
-		{
-		}
-		[TestMethod]
-		public void Test_3175()
-		{
-		}
-		[TestMethod]
-		public void Test_3176()
-		{
-		}
-		[TestMethod]
-		public void Test_3177()
-		{
-		}
-		[TestMethod]
-		public void Test_3178()
-		{
-		}
-		[TestMethod]
-		public void Test_3179()
-		{
-		}
-		[TestMethod]
-		public void Test_3180()
-		{
-		}
-		[TestMethod]
-		public void Test_3181()
-		{
-		}
-		[TestMethod]
-		public void Test_3182()
-		{
-		}
-		[TestMethod]
-		public void Test_3183()
-		{
-		}
-		[TestMethod]
-		public void Test_3184()
-		{
-		}
-		[TestMethod]
-		public void Test_3185()
-		{
-		}
-		[TestMethod]
-		public void Test_3186()
-		{
-		}
-		[TestMethod]
-		public void Test_3187()
-		{
-		}
-		[TestMethod]
-		public void Test_3188()
-		{
-		}
-		[TestMethod]
-		public void Test_3189()
-		{
-		}
-		[TestMethod]
-		public void Test_3190()
-		{
-		}
-		[TestMethod]
-		public void Test_3191()
-		{
-		}
-		[TestMethod]
-		public void Test_3192()
-		{
-		}
-		[TestMethod]
-		public void Test_3193()
-		{
-		}
-		[TestMethod]
-		public void Test_3194()
-		{
-		}
-		[TestMethod]
-		public void Test_3195()
-		{
-		}
-		[TestMethod]
-		public void Test_3196()
-		{
-		}
-		[TestMethod]
-		public void Test_3197()
-		{
-		}
-		[TestMethod]
-		public void Test_3198()
-		{
-		}
-		[TestMethod]
-		public void Test_3199()
-		{
-		}
-		[TestMethod]
-		public void Test_3200()
-		{
-		}
-		[TestMethod]
-		public void Test_3201()
-		{
-		}
-		[TestMethod]
-		public void Test_3202()
-		{
-		}
-		[TestMethod]
-		public void Test_3203()
-		{
-		}
-		[TestMethod]
-		public void Test_3204()
-		{
-		}
-		[TestMethod]
-		public void Test_3205()
-		{
-		}
-		[TestMethod]
-		public void Test_3206()
-		{
-		}
-		[TestMethod]
-		public void Test_3207()
-		{
-		}
-		[TestMethod]
-		public void Test_3208()
-		{
-		}
-		[TestMethod]
-		public void Test_3209()
-		{
-		}
-		[TestMethod]
-		public void Test_3210()
-		{
-		}
-		[TestMethod]
-		public void Test_3211()
-		{
-		}
-		[TestMethod]
-		public void Test_3212()
-		{
-		}
-		[TestMethod]
-		public void Test_3213()
-		{
-		}
-		[TestMethod]
-		public void Test_3214()
-		{
-		}
-		[TestMethod]
-		public void Test_3215()
-		{
-		}
-		[TestMethod]
-		public void Test_3216()
-		{
-		}
-		[TestMethod]
-		public void Test_3217()
-		{
-		}
-		[TestMethod]
-		public void Test_3218()
-		{
-		}
-		[TestMethod]
-		public void Test_3219()
-		{
-		}
-		[TestMethod]
-		public void Test_3220()
-		{
-		}
-		[TestMethod]
-		public void Test_3221()
-		{
-		}
-		[TestMethod]
-		public void Test_3222()
-		{
-		}
-		[TestMethod]
-		public void Test_3223()
-		{
-		}
-		[TestMethod]
-		public void Test_3224()
-		{
-		}
-		[TestMethod]
-		public void Test_3225()
-		{
-		}
-		[TestMethod]
-		public void Test_3226()
-		{
-		}
-		[TestMethod]
-		public void Test_3227()
-		{
-		}
-		[TestMethod]
-		public void Test_3228()
-		{
-		}
-		[TestMethod]
-		public void Test_3229()
-		{
-		}
-		[TestMethod]
-		public void Test_3230()
-		{
-		}
-		[TestMethod]
-		public void Test_3231()
-		{
-		}
-		[TestMethod]
-		public void Test_3232()
-		{
-		}
-		[TestMethod]
-		public void Test_3233()
-		{
-		}
-		[TestMethod]
-		public void Test_3234()
-		{
-		}
-		[TestMethod]
-		public void Test_3235()
-		{
-		}
-		[TestMethod]
-		public void Test_3236()
-		{
-		}
-		[TestMethod]
-		public void Test_3237()
-		{
-		}
-		[TestMethod]
-		public void Test_3238()
-		{
-		}
-		[TestMethod]
-		public void Test_3239()
-		{
-		}
-		[TestMethod]
-		public void Test_3240()
-		{
-		}
-		[TestMethod]
-		public void Test_3241()
-		{
-		}
-		[TestMethod]
-		public void Test_3242()
-		{
-		}
-		[TestMethod]
-		public void Test_3243()
-		{
-		}
-		[TestMethod]
-		public void Test_3244()
-		{
-		}
-		[TestMethod]
-		public void Test_3245()
-		{
-		}
-		[TestMethod]
-		public void Test_3246()
-		{
-		}
-		[TestMethod]
-		public void Test_3247()
-		{
-		}
-		[TestMethod]
-		public void Test_3248()
-		{
-		}
-		[TestMethod]
-		public void Test_3249()
-		{
-		}
-		[TestMethod]
-		public void Test_3250()
-		{
-		}
-		[TestMethod]
-		public void Test_3251()
-		{
-		}
-		[TestMethod]
-		public void Test_3252()
-		{
-		}
-		[TestMethod]
-		public void Test_3253()
-		{
-		}
-		[TestMethod]
-		public void Test_3254()
-		{
-		}
-		[TestMethod]
-		public void Test_3255()
-		{
-		}
-		[TestMethod]
-		public void Test_3256()
-		{
-		}
-		[TestMethod]
-		public void Test_3257()
-		{
-		}
-		[TestMethod]
-		public void Test_3258()
-		{
-		}
-		[TestMethod]
-		public void Test_3259()
-		{
-		}
-		[TestMethod]
-		public void Test_3260()
-		{
-		}
-		[TestMethod]
-		public void Test_3261()
-		{
-		}
-		[TestMethod]
-		public void Test_3262()
-		{
-		}
-		[TestMethod]
-		public void Test_3263()
-		{
-		}
-		[TestMethod]
-		public void Test_3264()
-		{
-		}
-		[TestMethod]
-		public void Test_3265()
-		{
-		}
-		[TestMethod]
-		public void Test_3266()
-		{
-		}
-		[TestMethod]
-		public void Test_3267()
-		{
-		}
-		[TestMethod]
-		public void Test_3268()
-		{
-		}
-		[TestMethod]
-		public void Test_3269()
-		{
-		}
-		[TestMethod]
-		public void Test_3270()
-		{
-		}
-		[TestMethod]
-		public void Test_3271()
-		{
-		}
-		[TestMethod]
-		public void Test_3272()
-		{
-		}
-		[TestMethod]
-		public void Test_3273()
-		{
-		}
-		[TestMethod]
-		public void Test_3274()
-		{
-		}
-		[TestMethod]
-		public void Test_3275()
-		{
-		}
-		[TestMethod]
-		public void Test_3276()
-		{
-		}
-		[TestMethod]
-		public void Test_3277()
-		{
-		}
-		[TestMethod]
-		public void Test_3278()
-		{
-		}
-		[TestMethod]
-		public void Test_3279()
-		{
-		}
-		[TestMethod]
-		public void Test_3280()
-		{
-		}
-		[TestMethod]
-		public void Test_3281()
-		{
-		}
-		[TestMethod]
-		public void Test_3282()
-		{
-		}
-		[TestMethod]
-		public void Test_3283()
-		{
-		}
-		[TestMethod]
-		public void Test_3284()
-		{
-		}
-		[TestMethod]
-		public void Test_3285()
-		{
-		}
-		[TestMethod]
-		public void Test_3286()
-		{
-		}
-		[TestMethod]
-		public void Test_3287()
-		{
-		}
-		[TestMethod]
-		public void Test_3288()
-		{
-		}
-		[TestMethod]
-		public void Test_3289()
-		{
-		}
-		[TestMethod]
-		public void Test_3290()
-		{
-		}
-		[TestMethod]
-		public void Test_3291()
-		{
-		}
-		[TestMethod]
-		public void Test_3292()
-		{
-		}
-		[TestMethod]
-		public void Test_3293()
-		{
-		}
-		[TestMethod]
-		public void Test_3294()
-		{
-		}
-		[TestMethod]
-		public void Test_3295()
-		{
-		}
-		[TestMethod]
-		public void Test_3296()
-		{
-		}
-		[TestMethod]
-		public void Test_3297()
-		{
-		}
-		[TestMethod]
-		public void Test_3298()
-		{
-		}
-		[TestMethod]
-		public void Test_3299()
-		{
-		}
-		[TestMethod]
-		public void Test_3300()
-		{
-		}
-		[TestMethod]
-		public void Test_3301()
-		{
-		}
-		[TestMethod]
-		public void Test_3302()
-		{
-		}
-		[TestMethod]
-		public void Test_3303()
-		{
-		}
-		[TestMethod]
-		public void Test_3304()
-		{
-		}
-		[TestMethod]
-		public void Test_3305()
-		{
-		}
-		[TestMethod]
-		public void Test_3306()
-		{
-		}
-		[TestMethod]
-		public void Test_3307()
-		{
-		}
-		[TestMethod]
-		public void Test_3308()
-		{
-		}
-		[TestMethod]
-		public void Test_3309()
-		{
-		}
-		[TestMethod]
-		public void Test_3310()
-		{
-		}
-		[TestMethod]
-		public void Test_3311()
-		{
-		}
-		[TestMethod]
-		public void Test_3312()
-		{
-		}
-		[TestMethod]
-		public void Test_3313()
-		{
-		}
-		[TestMethod]
-		public void Test_3314()
-		{
-		}
-		[TestMethod]
-		public void Test_3315()
-		{
-		}
-		[TestMethod]
-		public void Test_3316()
-		{
-		}
-		[TestMethod]
-		public void Test_3317()
-		{
-		}
-		[TestMethod]
-		public void Test_3318()
-		{
-		}
-		[TestMethod]
-		public void Test_3319()
-		{
-		}
-		[TestMethod]
-		public void Test_3320()
-		{
-		}
-		[TestMethod]
-		public void Test_3321()
-		{
-		}
-		[TestMethod]
-		public void Test_3322()
-		{
-		}
-		[TestMethod]
-		public void Test_3323()
-		{
-		}
-		[TestMethod]
-		public void Test_3324()
-		{
-		}
-		[TestMethod]
-		public void Test_3325()
-		{
-		}
-		[TestMethod]
-		public void Test_3326()
-		{
-		}
-		[TestMethod]
-		public void Test_3327()
-		{
-		}
-		[TestMethod]
-		public void Test_3328()
-		{
-		}
-		[TestMethod]
-		public void Test_3329()
-		{
-		}
-		[TestMethod]
-		public void Test_3330()
-		{
-		}
-		[TestMethod]
-		public void Test_3331()
-		{
-		}
-		[TestMethod]
-		public void Test_3332()
-		{
-		}
-		[TestMethod]
-		public void Test_3333()
-		{
-		}
-		[TestMethod]
-		public void Test_3334()
-		{
-		}
-		[TestMethod]
-		public void Test_3335()
-		{
-		}
-		[TestMethod]
-		public void Test_3336()
-		{
-		}
-		[TestMethod]
-		public void Test_3337()
-		{
-		}
-		[TestMethod]
-		public void Test_3338()
-		{
-		}
-		[TestMethod]
-		public void Test_3339()
-		{
-		}
-		[TestMethod]
-		public void Test_3340()
-		{
-		}
-		[TestMethod]
-		public void Test_3341()
-		{
-		}
-		[TestMethod]
-		public void Test_3342()
-		{
-		}
-		[TestMethod]
-		public void Test_3343()
-		{
-		}
-		[TestMethod]
-		public void Test_3344()
-		{
-		}
-		[TestMethod]
-		public void Test_3345()
-		{
-		}
-		[TestMethod]
-		public void Test_3346()
-		{
-		}
-		[TestMethod]
-		public void Test_3347()
-		{
-		}
-		[TestMethod]
-		public void Test_3348()
-		{
-		}
-		[TestMethod]
-		public void Test_3349()
-		{
-		}
-		[TestMethod]
-		public void Test_3350()
-		{
-		}
-		[TestMethod]
-		public void Test_3351()
-		{
-		}
-		[TestMethod]
-		public void Test_3352()
-		{
-		}
-		[TestMethod]
-		public void Test_3353()
-		{
-		}
-		[TestMethod]
-		public void Test_3354()
-		{
-		}
-		[TestMethod]
-		public void Test_3355()
-		{
-		}
-		[TestMethod]
-		public void Test_3356()
-		{
-		}
-		[TestMethod]
-		public void Test_3357()
-		{
-		}
-		[TestMethod]
-		public void Test_3358()
-		{
-		}
-		[TestMethod]
-		public void Test_3359()
-		{
-		}
-		[TestMethod]
-		public void Test_3360()
-		{
-		}
-		[TestMethod]
-		public void Test_3361()
-		{
-		}
-		[TestMethod]
-		public void Test_3362()
-		{
-		}
-		[TestMethod]
-		public void Test_3363()
-		{
-		}
-		[TestMethod]
-		public void Test_3364()
-		{
-		}
-		[TestMethod]
-		public void Test_3365()
-		{
-		}
-		[TestMethod]
-		public void Test_3366()
-		{
-		}
-		[TestMethod]
-		public void Test_3367()
-		{
-		}
-		[TestMethod]
-		public void Test_3368()
-		{
-		}
-		[TestMethod]
-		public void Test_3369()
-		{
-		}
-		[TestMethod]
-		public void Test_3370()
-		{
-		}
-		[TestMethod]
-		public void Test_3371()
-		{
-		}
-		[TestMethod]
-		public void Test_3372()
-		{
-		}
-		[TestMethod]
-		public void Test_3373()
-		{
-		}
-		[TestMethod]
-		public void Test_3374()
-		{
-		}
-		[TestMethod]
-		public void Test_3375()
-		{
-		}
-		[TestMethod]
-		public void Test_3376()
-		{
-		}
-		[TestMethod]
-		public void Test_3377()
-		{
-		}
-		[TestMethod]
-		public void Test_3378()
-		{
-		}
-		[TestMethod]
-		public void Test_3379()
-		{
-		}
-		[TestMethod]
-		public void Test_3380()
-		{
-		}
-		[TestMethod]
-		public void Test_3381()
-		{
-		}
-		[TestMethod]
-		public void Test_3382()
-		{
-		}
-		[TestMethod]
-		public void Test_3383()
-		{
-		}
-		[TestMethod]
-		public void Test_3384()
-		{
-		}
-		[TestMethod]
-		public void Test_3385()
-		{
-		}
-		[TestMethod]
-		public void Test_3386()
-		{
-		}
-		[TestMethod]
-		public void Test_3387()
-		{
-		}
-		[TestMethod]
-		public void Test_3388()
-		{
-		}
-		[TestMethod]
-		public void Test_3389()
-		{
-		}
-		[TestMethod]
-		public void Test_3390()
-		{
-		}
-		[TestMethod]
-		public void Test_3391()
-		{
-		}
-		[TestMethod]
-		public void Test_3392()
-		{
-		}
-		[TestMethod]
-		public void Test_3393()
-		{
-		}
-		[TestMethod]
-		public void Test_3394()
-		{
-		}
-		[TestMethod]
-		public void Test_3395()
-		{
-		}
-		[TestMethod]
-		public void Test_3396()
-		{
-		}
-		[TestMethod]
-		public void Test_3397()
-		{
-		}
-		[TestMethod]
-		public void Test_3398()
-		{
-		}
-		[TestMethod]
-		public void Test_3399()
-		{
-		}
-		[TestMethod]
-		public void Test_3400()
-		{
-		}
-		[TestMethod]
-		public void Test_3401()
-		{
-		}
-		[TestMethod]
-		public void Test_3402()
-		{
-		}
-		[TestMethod]
-		public void Test_3403()
-		{
-		}
-		[TestMethod]
-		public void Test_3404()
-		{
-		}
-		[TestMethod]
-		public void Test_3405()
-		{
-		}
-		[TestMethod]
-		public void Test_3406()
-		{
-		}
-		[TestMethod]
-		public void Test_3407()
-		{
-		}
-		[TestMethod]
-		public void Test_3408()
-		{
-		}
-		[TestMethod]
-		public void Test_3409()
-		{
-		}
-		[TestMethod]
-		public void Test_3410()
-		{
-		}
-		[TestMethod]
-		public void Test_3411()
-		{
-		}
-		[TestMethod]
-		public void Test_3412()
-		{
-		}
-		[TestMethod]
-		public void Test_3413()
-		{
-		}
-		[TestMethod]
-		public void Test_3414()
-		{
-		}
-		[TestMethod]
-		public void Test_3415()
-		{
-		}
-		[TestMethod]
-		public void Test_3416()
-		{
-		}
-		[TestMethod]
-		public void Test_3417()
-		{
-		}
-		[TestMethod]
-		public void Test_3418()
-		{
-		}
-		[TestMethod]
-		public void Test_3419()
-		{
-		}
-		[TestMethod]
-		public void Test_3420()
-		{
-		}
-		[TestMethod]
-		public void Test_3421()
-		{
-		}
-		[TestMethod]
-		public void Test_3422()
-		{
-		}
-		[TestMethod]
-		public void Test_3423()
-		{
-		}
-		[TestMethod]
-		public void Test_3424()
-		{
-		}
-		[TestMethod]
-		public void Test_3425()
-		{
-		}
-		[TestMethod]
-		public void Test_3426()
-		{
-		}
-		[TestMethod]
-		public void Test_3427()
-		{
-		}
-		[TestMethod]
-		public void Test_3428()
-		{
-		}
-		[TestMethod]
-		public void Test_3429()
-		{
-		}
-		[TestMethod]
-		public void Test_3430()
-		{
-		}
-		[TestMethod]
-		public void Test_3431()
-		{
-		}
-		[TestMethod]
-		public void Test_3432()
-		{
-		}
-		[TestMethod]
-		public void Test_3433()
-		{
-		}
-		[TestMethod]
-		public void Test_3434()
-		{
-		}
-		[TestMethod]
-		public void Test_3435()
-		{
-		}
-		[TestMethod]
-		public void Test_3436()
-		{
-		}
-		[TestMethod]
-		public void Test_3437()
-		{
-		}
-		[TestMethod]
-		public void Test_3438()
-		{
-		}
-		[TestMethod]
-		public void Test_3439()
-		{
-		}
-		[TestMethod]
-		public void Test_3440()
-		{
-		}
-		[TestMethod]
-		public void Test_3441()
-		{
-		}
-		[TestMethod]
-		public void Test_3442()
-		{
-		}
-		[TestMethod]
-		public void Test_3443()
-		{
-		}
-		[TestMethod]
-		public void Test_3444()
-		{
-		}
-		[TestMethod]
-		public void Test_3445()
-		{
-		}
-		[TestMethod]
-		public void Test_3446()
-		{
-		}
-		[TestMethod]
-		public void Test_3447()
-		{
-		}
-		[TestMethod]
-		public void Test_3448()
-		{
-		}
-		[TestMethod]
-		public void Test_3449()
-		{
-		}
-		[TestMethod]
-		public void Test_3450()
-		{
-		}
-		[TestMethod]
-		public void Test_3451()
-		{
-		}
-		[TestMethod]
-		public void Test_3452()
-		{
-		}
-		[TestMethod]
-		public void Test_3453()
-		{
-		}
-		[TestMethod]
-		public void Test_3454()
-		{
-		}
-		[TestMethod]
-		public void Test_3455()
-		{
-		}
-		[TestMethod]
-		public void Test_3456()
-		{
-		}
-		[TestMethod]
-		public void Test_3457()
-		{
-		}
-		[TestMethod]
-		public void Test_3458()
-		{
-		}
-		[TestMethod]
-		public void Test_3459()
-		{
-		}
-		[TestMethod]
-		public void Test_3460()
-		{
-		}
-		[TestMethod]
-		public void Test_3461()
-		{
-		}
-		[TestMethod]
-		public void Test_3462()
-		{
-		}
-		[TestMethod]
-		public void Test_3463()
-		{
-		}
-		[TestMethod]
-		public void Test_3464()
-		{
-		}
-		[TestMethod]
-		public void Test_3465()
-		{
-		}
-		[TestMethod]
-		public void Test_3466()
-		{
-		}
-		[TestMethod]
-		public void Test_3467()
-		{
-		}
-		[TestMethod]
-		public void Test_3468()
-		{
-		}
-		[TestMethod]
-		public void Test_3469()
-		{
-		}
-		[TestMethod]
-		public void Test_3470()
-		{
-		}
-		[TestMethod]
-		public void Test_3471()
-		{
-		}
-		[TestMethod]
-		public void Test_3472()
-		{
-		}
-		[TestMethod]
-		public void Test_3473()
-		{
-		}
-		[TestMethod]
-		public void Test_3474()
-		{
-		}
-		[TestMethod]
-		public void Test_3475()
-		{
-		}
-		[TestMethod]
-		public void Test_3476()
-		{
-		}
-		[TestMethod]
-		public void Test_3477()
-		{
-		}
-		[TestMethod]
-		public void Test_3478()
-		{
-		}
-		[TestMethod]
-		public void Test_3479()
-		{
-		}
-		[TestMethod]
-		public void Test_3480()
-		{
-		}
-		[TestMethod]
-		public void Test_3481()
-		{
-		}
-		[TestMethod]
-		public void Test_3482()
-		{
-		}
-		[TestMethod]
-		public void Test_3483()
-		{
-		}
-		[TestMethod]
-		public void Test_3484()
-		{
-		}
-		[TestMethod]
-		public void Test_3485()
-		{
-		}
-		[TestMethod]
-		public void Test_3486()
-		{
-		}
-		[TestMethod]
-		public void Test_3487()
-		{
-		}
-		[TestMethod]
-		public void Test_3488()
-		{
-		}
-		[TestMethod]
-		public void Test_3489()
-		{
-		}
-		[TestMethod]
-		public void Test_3490()
-		{
-		}
-		[TestMethod]
-		public void Test_3491()
-		{
-		}
-		[TestMethod]
-		public void Test_3492()
-		{
-		}
-		[TestMethod]
-		public void Test_3493()
-		{
-		}
-		[TestMethod]
-		public void Test_3494()
-		{
-		}
-		[TestMethod]
-		public void Test_3495()
-		{
-		}
-		[TestMethod]
-		public void Test_3496()
-		{
-		}
-		[TestMethod]
-		public void Test_3497()
-		{
-		}
-		[TestMethod]
-		public void Test_3498()
-		{
-		}
-		[TestMethod]
-		public void Test_3499()
-		{
-		}
-		[TestMethod]
-		public void Test_3500()
-		{
-		}
-		[TestMethod]
-		public void Test_3501()
-		{
-		}
-		[TestMethod]
-		public void Test_3502()
-		{
-		}
-		[TestMethod]
-		public void Test_3503()
-		{
-		}
-		[TestMethod]
-		public void Test_3504()
-		{
-		}
-		[TestMethod]
-		public void Test_3505()
-		{
-		}
-		[TestMethod]
-		public void Test_3506()
-		{
-		}
-		[TestMethod]
-		public void Test_3507()
-		{
-		}
-		[TestMethod]
-		public void Test_3508()
-		{
-		}
-		[TestMethod]
-		public void Test_3509()
-		{
-		}
-		[TestMethod]
-		public void Test_3510()
-		{
-		}
-		[TestMethod]
-		public void Test_3511()
-		{
-		}
-		[TestMethod]
-		public void Test_3512()
-		{
-		}
-		[TestMethod]
-		public void Test_3513()
-		{
-		}
-		[TestMethod]
-		public void Test_3514()
-		{
-		}
-		[TestMethod]
-		public void Test_3515()
-		{
-		}
-		[TestMethod]
-		public void Test_3516()
-		{
-		}
-		[TestMethod]
-		public void Test_3517()
-		{
-		}
-		[TestMethod]
-		public void Test_3518()
-		{
-		}
-		[TestMethod]
-		public void Test_3519()
-		{
-		}
-		[TestMethod]
-		public void Test_3520()
-		{
-		}
-		[TestMethod]
-		public void Test_3521()
-		{
-		}
-		[TestMethod]
-		public void Test_3522()
-		{
-		}
-		[TestMethod]
-		public void Test_3523()
-		{
-		}
-		[TestMethod]
-		public void Test_3524()
-		{
-		}
-		[TestMethod]
-		public void Test_3525()
-		{
-		}
-		[TestMethod]
-		public void Test_3526()
-		{
-		}
-		[TestMethod]
-		public void Test_3527()
-		{
-		}
-		[TestMethod]
-		public void Test_3528()
-		{
-		}
-		[TestMethod]
-		public void Test_3529()
-		{
-		}
-		[TestMethod]
-		public void Test_3530()
-		{
-		}
-		[TestMethod]
-		public void Test_3531()
-		{
-		}
-		[TestMethod]
-		public void Test_3532()
-		{
-		}
-		[TestMethod]
-		public void Test_3533()
-		{
-		}
-		[TestMethod]
-		public void Test_3534()
-		{
-		}
-		[TestMethod]
-		public void Test_3535()
-		{
-		}
-		[TestMethod]
-		public void Test_3536()
-		{
-		}
-		[TestMethod]
-		public void Test_3537()
-		{
-		}
-		[TestMethod]
-		public void Test_3538()
-		{
-		}
-		[TestMethod]
-		public void Test_3539()
-		{
-		}
-		[TestMethod]
-		public void Test_3540()
-		{
-		}
-		[TestMethod]
-		public void Test_3541()
-		{
-		}
-		[TestMethod]
-		public void Test_3542()
-		{
-		}
-		[TestMethod]
-		public void Test_3543()
-		{
-		}
-		[TestMethod]
-		public void Test_3544()
-		{
-		}
-		[TestMethod]
-		public void Test_3545()
-		{
-		}
-		[TestMethod]
-		public void Test_3546()
-		{
-		}
-		[TestMethod]
-		public void Test_3547()
-		{
-		}
-		[TestMethod]
-		public void Test_3548()
-		{
-		}
-		[TestMethod]
-		public void Test_3549()
-		{
-		}
-		[TestMethod]
-		public void Test_3550()
-		{
-		}
-		[TestMethod]
-		public void Test_3551()
-		{
-		}
-		[TestMethod]
-		public void Test_3552()
-		{
-		}
-		[TestMethod]
-		public void Test_3553()
-		{
-		}
-		[TestMethod]
-		public void Test_3554()
-		{
-		}
-		[TestMethod]
-		public void Test_3555()
-		{
-		}
-		[TestMethod]
-		public void Test_3556()
-		{
-		}
-		[TestMethod]
-		public void Test_3557()
-		{
-		}
-		[TestMethod]
-		public void Test_3558()
-		{
-		}
-		[TestMethod]
-		public void Test_3559()
-		{
-		}
-		[TestMethod]
-		public void Test_3560()
-		{
-		}
-		[TestMethod]
-		public void Test_3561()
-		{
-		}
-		[TestMethod]
-		public void Test_3562()
-		{
-		}
-		[TestMethod]
-		public void Test_3563()
-		{
-		}
-		[TestMethod]
-		public void Test_3564()
-		{
-		}
-		[TestMethod]
-		public void Test_3565()
-		{
-		}
-		[TestMethod]
-		public void Test_3566()
-		{
-		}
-		[TestMethod]
-		public void Test_3567()
-		{
-		}
-		[TestMethod]
-		public void Test_3568()
-		{
-		}
-		[TestMethod]
-		public void Test_3569()
-		{
-		}
-		[TestMethod]
-		public void Test_3570()
-		{
-		}
-		[TestMethod]
-		public void Test_3571()
-		{
-		}
-		[TestMethod]
-		public void Test_3572()
-		{
-		}
-		[TestMethod]
-		public void Test_3573()
-		{
-		}
-		[TestMethod]
-		public void Test_3574()
-		{
-		}
-		[TestMethod]
-		public void Test_3575()
-		{
-		}
-		[TestMethod]
-		public void Test_3576()
-		{
-		}
-		[TestMethod]
-		public void Test_3577()
-		{
-		}
-		[TestMethod]
-		public void Test_3578()
-		{
-		}
-		[TestMethod]
-		public void Test_3579()
-		{
-		}
-		[TestMethod]
-		public void Test_3580()
-		{
-		}
-		[TestMethod]
-		public void Test_3581()
-		{
-		}
-		[TestMethod]
-		public void Test_3582()
-		{
-		}
-		[TestMethod]
-		public void Test_3583()
-		{
-		}
-		[TestMethod]
-		public void Test_3584()
-		{
-		}
-		[TestMethod]
-		public void Test_3585()
-		{
-		}
-		[TestMethod]
-		public void Test_3586()
-		{
-		}
-		[TestMethod]
-		public void Test_3587()
-		{
-		}
-		[TestMethod]
-		public void Test_3588()
-		{
-		}
-		[TestMethod]
-		public void Test_3589()
-		{
-		}
-		[TestMethod]
-		public void Test_3590()
-		{
-		}
-		[TestMethod]
-		public void Test_3591()
-		{
-		}
-		[TestMethod]
-		public void Test_3592()
-		{
-		}
-		[TestMethod]
-		public void Test_3593()
-		{
-		}
-		[TestMethod]
-		public void Test_3594()
-		{
-		}
-		[TestMethod]
-		public void Test_3595()
-		{
-		}
-		[TestMethod]
-		public void Test_3596()
-		{
-		}
-		[TestMethod]
-		public void Test_3597()
-		{
-		}
-		[TestMethod]
-		public void Test_3598()
-		{
-		}
-		[TestMethod]
-		public void Test_3599()
-		{
-		}
-		[TestMethod]
-		public void Test_3600()
-		{
-		}
-		[TestMethod]
-		public void Test_3601()
-		{
-		}
-		[TestMethod]
-		public void Test_3602()
-		{
-		}
-		[TestMethod]
-		public void Test_3603()
-		{
-		}
-		[TestMethod]
-		public void Test_3604()
-		{
-		}
-		[TestMethod]
-		public void Test_3605()
-		{
-		}
-		[TestMethod]
-		public void Test_3606()
-		{
-		}
-		[TestMethod]
-		public void Test_3607()
-		{
-		}
-		[TestMethod]
-		public void Test_3608()
-		{
-		}
-		[TestMethod]
-		public void Test_3609()
-		{
-		}
-		[TestMethod]
-		public void Test_3610()
-		{
-		}
-		[TestMethod]
-		public void Test_3611()
-		{
-		}
-		[TestMethod]
-		public void Test_3612()
-		{
-		}
-		[TestMethod]
-		public void Test_3613()
-		{
-		}
-		[TestMethod]
-		public void Test_3614()
-		{
-		}
-		[TestMethod]
-		public void Test_3615()
-		{
-		}
-		[TestMethod]
-		public void Test_3616()
-		{
-		}
-		[TestMethod]
-		public void Test_3617()
-		{
-		}
-		[TestMethod]
-		public void Test_3618()
-		{
-		}
-		[TestMethod]
-		public void Test_3619()
-		{
-		}
-		[TestMethod]
-		public void Test_3620()
-		{
-		}
-		[TestMethod]
-		public void Test_3621()
-		{
-		}
-		[TestMethod]
-		public void Test_3622()
-		{
-		}
-		[TestMethod]
-		public void Test_3623()
-		{
-		}
-		[TestMethod]
-		public void Test_3624()
-		{
-		}
-		[TestMethod]
-		public void Test_3625()
-		{
-		}
-		[TestMethod]
-		public void Test_3626()
-		{
-		}
-		[TestMethod]
-		public void Test_3627()
-		{
-		}
-		[TestMethod]
-		public void Test_3628()
-		{
-		}
-		[TestMethod]
-		public void Test_3629()
-		{
-		}
-		[TestMethod]
-		public void Test_3630()
-		{
-		}
-		[TestMethod]
-		public void Test_3631()
-		{
-		}
-		[TestMethod]
-		public void Test_3632()
-		{
-		}
-		[TestMethod]
-		public void Test_3633()
-		{
-		}
-		[TestMethod]
-		public void Test_3634()
-		{
-		}
-		[TestMethod]
-		public void Test_3635()
-		{
-		}
-		[TestMethod]
-		public void Test_3636()
-		{
-		}
-		[TestMethod]
-		public void Test_3637()
-		{
-		}
-		[TestMethod]
-		public void Test_3638()
-		{
-		}
-		[TestMethod]
-		public void Test_3639()
-		{
-		}
-		[TestMethod]
-		public void Test_3640()
-		{
-		}
-		[TestMethod]
-		public void Test_3641()
-		{
-		}
-		[TestMethod]
-		public void Test_3642()
-		{
-		}
-		[TestMethod]
-		public void Test_3643()
-		{
-		}
-		[TestMethod]
-		public void Test_3644()
-		{
-		}
-		[TestMethod]
-		public void Test_3645()
-		{
-		}
-		[TestMethod]
-		public void Test_3646()
-		{
-		}
-		[TestMethod]
-		public void Test_3647()
-		{
-		}
-		[TestMethod]
-		public void Test_3648()
-		{
-		}
-		[TestMethod]
-		public void Test_3649()
-		{
-		}
-		[TestMethod]
-		public void Test_3650()
-		{
-		}
-		[TestMethod]
-		public void Test_3651()
-		{
-		}
-		[TestMethod]
-		public void Test_3652()
-		{
-		}
-		[TestMethod]
-		public void Test_3653()
-		{
-		}
-		[TestMethod]
-		public void Test_3654()
-		{
-		}
-		[TestMethod]
-		public void Test_3655()
-		{
-		}
-		[TestMethod]
-		public void Test_3656()
-		{
-		}
-		[TestMethod]
-		public void Test_3657()
-		{
-		}
-		[TestMethod]
-		public void Test_3658()
-		{
-		}
-		[TestMethod]
-		public void Test_3659()
-		{
-		}
-		[TestMethod]
-		public void Test_3660()
-		{
-		}
-		[TestMethod]
-		public void Test_3661()
-		{
-		}
-		[TestMethod]
-		public void Test_3662()
-		{
-		}
-		[TestMethod]
-		public void Test_3663()
-		{
-		}
-		[TestMethod]
-		public void Test_3664()
-		{
-		}
-		[TestMethod]
-		public void Test_3665()
-		{
-		}
-		[TestMethod]
-		public void Test_3666()
-		{
-		}
-		[TestMethod]
-		public void Test_3667()
-		{
-		}
-		[TestMethod]
-		public void Test_3668()
-		{
-		}
-		[TestMethod]
-		public void Test_3669()
-		{
-		}
-		[TestMethod]
-		public void Test_3670()
-		{
-		}
-		[TestMethod]
-		public void Test_3671()
-		{
-		}
-		[TestMethod]
-		public void Test_3672()
-		{
-		}
-		[TestMethod]
-		public void Test_3673()
-		{
-		}
-		[TestMethod]
-		public void Test_3674()
-		{
-		}
-		[TestMethod]
-		public void Test_3675()
-		{
-		}
-		[TestMethod]
-		public void Test_3676()
-		{
-		}
-		[TestMethod]
-		public void Test_3677()
-		{
-		}
-		[TestMethod]
-		public void Test_3678()
-		{
-		}
-		[TestMethod]
-		public void Test_3679()
-		{
-		}
-		[TestMethod]
-		public void Test_3680()
-		{
-		}
-		[TestMethod]
-		public void Test_3681()
-		{
-		}
-		[TestMethod]
-		public void Test_3682()
-		{
-		}
-		[TestMethod]
-		public void Test_3683()
-		{
-		}
-		[TestMethod]
-		public void Test_3684()
-		{
-		}
-		[TestMethod]
-		public void Test_3685()
-		{
-		}
-		[TestMethod]
-		public void Test_3686()
-		{
-		}
-		[TestMethod]
-		public void Test_3687()
-		{
-		}
-		[TestMethod]
-		public void Test_3688()
-		{
-		}
-		[TestMethod]
-		public void Test_3689()
-		{
-		}
-		[TestMethod]
-		public void Test_3690()
-		{
-		}
-		[TestMethod]
-		public void Test_3691()
-		{
-		}
-		[TestMethod]
-		public void Test_3692()
-		{
-		}
-		[TestMethod]
-		public void Test_3693()
-		{
-		}
-		[TestMethod]
-		public void Test_3694()
-		{
-		}
-		[TestMethod]
-		public void Test_3695()
-		{
-		}
-		[TestMethod]
-		public void Test_3696()
-		{
-		}
-		[TestMethod]
-		public void Test_3697()
-		{
-		}
-		[TestMethod]
-		public void Test_3698()
-		{
-		}
-		[TestMethod]
-		public void Test_3699()
-		{
-		}
-		[TestMethod]
-		public void Test_3700()
-		{
-		}
-		[TestMethod]
-		public void Test_3701()
-		{
-		}
-		[TestMethod]
-		public void Test_3702()
-		{
-		}
-		[TestMethod]
-		public void Test_3703()
-		{
-		}
-		[TestMethod]
-		public void Test_3704()
-		{
-		}
-		[TestMethod]
-		public void Test_3705()
-		{
-		}
-		[TestMethod]
-		public void Test_3706()
-		{
-		}
-		[TestMethod]
-		public void Test_3707()
-		{
-		}
-		[TestMethod]
-		public void Test_3708()
-		{
-		}
-		[TestMethod]
-		public void Test_3709()
-		{
-		}
-		[TestMethod]
-		public void Test_3710()
-		{
-		}
-		[TestMethod]
-		public void Test_3711()
-		{
-		}
-		[TestMethod]
-		public void Test_3712()
-		{
-		}
-		[TestMethod]
-		public void Test_3713()
-		{
-		}
-		[TestMethod]
-		public void Test_3714()
-		{
-		}
-		[TestMethod]
-		public void Test_3715()
-		{
-		}
-		[TestMethod]
-		public void Test_3716()
-		{
-		}
-		[TestMethod]
-		public void Test_3717()
-		{
-		}
-		[TestMethod]
-		public void Test_3718()
-		{
-		}
-		[TestMethod]
-		public void Test_3719()
-		{
-		}
-		[TestMethod]
-		public void Test_3720()
-		{
-		}
-		[TestMethod]
-		public void Test_3721()
-		{
-		}
-		[TestMethod]
-		public void Test_3722()
-		{
-		}
-		[TestMethod]
-		public void Test_3723()
-		{
-		}
-		[TestMethod]
-		public void Test_3724()
-		{
-		}
-		[TestMethod]
-		public void Test_3725()
-		{
-		}
-		[TestMethod]
-		public void Test_3726()
-		{
-		}
-		[TestMethod]
-		public void Test_3727()
-		{
-		}
-		[TestMethod]
-		public void Test_3728()
-		{
-		}
-		[TestMethod]
-		public void Test_3729()
-		{
-		}
-		[TestMethod]
-		public void Test_3730()
-		{
-		}
-		[TestMethod]
-		public void Test_3731()
-		{
-		}
-		[TestMethod]
-		public void Test_3732()
-		{
-		}
-		[TestMethod]
-		public void Test_3733()
-		{
-		}
-		[TestMethod]
-		public void Test_3734()
-		{
-		}
-		[TestMethod]
-		public void Test_3735()
-		{
-		}
-		[TestMethod]
-		public void Test_3736()
-		{
-		}
-		[TestMethod]
-		public void Test_3737()
-		{
-		}
-		[TestMethod]
-		public void Test_3738()
-		{
-		}
-		[TestMethod]
-		public void Test_3739()
-		{
-		}
-		[TestMethod]
-		public void Test_3740()
-		{
-		}
-		[TestMethod]
-		public void Test_3741()
-		{
-		}
-		[TestMethod]
-		public void Test_3742()
-		{
-		}
-		[TestMethod]
-		public void Test_3743()
-		{
-		}
-		[TestMethod]
-		public void Test_3744()
-		{
-		}
-		[TestMethod]
-		public void Test_3745()
-		{
-		}
-		[TestMethod]
-		public void Test_3746()
-		{
-		}
-		[TestMethod]
-		public void Test_3747()
-		{
-		}
-		[TestMethod]
-		public void Test_3748()
-		{
-		}
-		[TestMethod]
-		public void Test_3749()
-		{
-		}
-		[TestMethod]
-		public void Test_3750()
-		{
-		}
-		[TestMethod]
-		public void Test_3751()
-		{
-		}
-		[TestMethod]
-		public void Test_3752()
-		{
-		}
-		[TestMethod]
-		public void Test_3753()
-		{
-		}
-		[TestMethod]
-		public void Test_3754()
-		{
-		}
-		[TestMethod]
-		public void Test_3755()
-		{
-		}
-		[TestMethod]
-		public void Test_3756()
-		{
-		}
-		[TestMethod]
-		public void Test_3757()
-		{
-		}
-		[TestMethod]
-		public void Test_3758()
-		{
-		}
-		[TestMethod]
-		public void Test_3759()
-		{
-		}
-		[TestMethod]
-		public void Test_3760()
-		{
-		}
-		[TestMethod]
-		public void Test_3761()
-		{
-		}
-		[TestMethod]
-		public void Test_3762()
-		{
-		}
-		[TestMethod]
-		public void Test_3763()
-		{
-		}
-		[TestMethod]
-		public void Test_3764()
-		{
-		}
-		[TestMethod]
-		public void Test_3765()
-		{
-		}
-		[TestMethod]
-		public void Test_3766()
-		{
-		}
-		[TestMethod]
-		public void Test_3767()
-		{
-		}
-		[TestMethod]
-		public void Test_3768()
-		{
-		}
-		[TestMethod]
-		public void Test_3769()
-		{
-		}
-		[TestMethod]
-		public void Test_3770()
-		{
-		}
-		[TestMethod]
-		public void Test_3771()
-		{
-		}
-		[TestMethod]
-		public void Test_3772()
-		{
-		}
-		[TestMethod]
-		public void Test_3773()
-		{
-		}
-		[TestMethod]
-		public void Test_3774()
-		{
-		}
-		[TestMethod]
-		public void Test_3775()
-		{
-		}
-		[TestMethod]
-		public void Test_3776()
-		{
-		}
-		[TestMethod]
-		public void Test_3777()
-		{
-		}
-		[TestMethod]
-		public void Test_3778()
-		{
-		}
-		[TestMethod]
-		public void Test_3779()
-		{
-		}
-		[TestMethod]
-		public void Test_3780()
-		{
-		}
-		[TestMethod]
-		public void Test_3781()
-		{
-		}
-		[TestMethod]
-		public void Test_3782()
-		{
-		}
-		[TestMethod]
-		public void Test_3783()
-		{
-		}
-		[TestMethod]
-		public void Test_3784()
-		{
-		}
-		[TestMethod]
-		public void Test_3785()
-		{
-		}
-		[TestMethod]
-		public void Test_3786()
-		{
-		}
-		[TestMethod]
-		public void Test_3787()
-		{
-		}
-		[TestMethod]
-		public void Test_3788()
-		{
-		}
-		[TestMethod]
-		public void Test_3789()
-		{
-		}
-		[TestMethod]
-		public void Test_3790()
-		{
-		}
-		[TestMethod]
-		public void Test_3791()
-		{
-		}
-		[TestMethod]
-		public void Test_3792()
-		{
-		}
-		[TestMethod]
-		public void Test_3793()
-		{
-		}
-		[TestMethod]
-		public void Test_3794()
-		{
-		}
-		[TestMethod]
-		public void Test_3795()
-		{
-		}
-		[TestMethod]
-		public void Test_3796()
-		{
-		}
-		[TestMethod]
-		public void Test_3797()
-		{
-		}
-		[TestMethod]
-		public void Test_3798()
-		{
-		}
-		[TestMethod]
-		public void Test_3799()
-		{
-		}
-		[TestMethod]
-		public void Test_3800()
-		{
-		}
-		[TestMethod]
-		public void Test_3801()
-		{
-		}
-		[TestMethod]
-		public void Test_3802()
-		{
-		}
-		[TestMethod]
-		public void Test_3803()
-		{
-		}
-		[TestMethod]
-		public void Test_3804()
-		{
-		}
-		[TestMethod]
-		public void Test_3805()
-		{
-		}
-		[TestMethod]
-		public void Test_3806()
-		{
-		}
-		[TestMethod]
-		public void Test_3807()
-		{
-		}
-		[TestMethod]
-		public void Test_3808()
-		{
-		}
-		[TestMethod]
-		public void Test_3809()
-		{
-		}
-		[TestMethod]
-		public void Test_3810()
-		{
-		}
-		[TestMethod]
-		public void Test_3811()
-		{
-		}
-		[TestMethod]
-		public void Test_3812()
-		{
-		}
-		[TestMethod]
-		public void Test_3813()
-		{
-		}
-		[TestMethod]
-		public void Test_3814()
-		{
-		}
-		[TestMethod]
-		public void Test_3815()
-		{
-		}
-		[TestMethod]
-		public void Test_3816()
-		{
-		}
-		[TestMethod]
-		public void Test_3817()
-		{
-		}
-		[TestMethod]
-		public void Test_3818()
-		{
-		}
-		[TestMethod]
-		public void Test_3819()
-		{
-		}
-		[TestMethod]
-		public void Test_3820()
-		{
-		}
-		[TestMethod]
-		public void Test_3821()
-		{
-		}
-		[TestMethod]
-		public void Test_3822()
-		{
-		}
-		[TestMethod]
-		public void Test_3823()
-		{
-		}
-		[TestMethod]
-		public void Test_3824()
-		{
-		}
-		[TestMethod]
-		public void Test_3825()
-		{
-		}
-		[TestMethod]
-		public void Test_3826()
-		{
-		}
-		[TestMethod]
-		public void Test_3827()
-		{
-		}
-		[TestMethod]
-		public void Test_3828()
-		{
-		}
-		[TestMethod]
-		public void Test_3829()
-		{
-		}
-		[TestMethod]
-		public void Test_3830()
-		{
-		}
-		[TestMethod]
-		public void Test_3831()
-		{
-		}
-		[TestMethod]
-		public void Test_3832()
-		{
-		}
-		[TestMethod]
-		public void Test_3833()
-		{
-		}
-		[TestMethod]
-		public void Test_3834()
-		{
-		}
-		[TestMethod]
-		public void Test_3835()
-		{
-		}
-		[TestMethod]
-		public void Test_3836()
-		{
-		}
-		[TestMethod]
-		public void Test_3837()
-		{
-		}
-		[TestMethod]
-		public void Test_3838()
-		{
-		}
-		[TestMethod]
-		public void Test_3839()
-		{
-		}
-		[TestMethod]
-		public void Test_3840()
-		{
-		}
-		[TestMethod]
-		public void Test_3841()
-		{
-		}
-		[TestMethod]
-		public void Test_3842()
-		{
-		}
-		[TestMethod]
-		public void Test_3843()
-		{
-		}
-		[TestMethod]
-		public void Test_3844()
-		{
-		}
-		[TestMethod]
-		public void Test_3845()
-		{
-		}
-		[TestMethod]
-		public void Test_3846()
-		{
-		}
-		[TestMethod]
-		public void Test_3847()
-		{
-		}
-		[TestMethod]
-		public void Test_3848()
-		{
-		}
-		[TestMethod]
-		public void Test_3849()
-		{
-		}
-		[TestMethod]
-		public void Test_3850()
-		{
-		}
-		[TestMethod]
-		public void Test_3851()
-		{
-		}
-		[TestMethod]
-		public void Test_3852()
-		{
-		}
-		[TestMethod]
-		public void Test_3853()
-		{
-		}
-		[TestMethod]
-		public void Test_3854()
-		{
-		}
-		[TestMethod]
-		public void Test_3855()
-		{
-		}
-		[TestMethod]
-		public void Test_3856()
-		{
-		}
-		[TestMethod]
-		public void Test_3857()
-		{
-		}
-		[TestMethod]
-		public void Test_3858()
-		{
-		}
-		[TestMethod]
-		public void Test_3859()
-		{
-		}
-		[TestMethod]
-		public void Test_3860()
-		{
-		}
-		[TestMethod]
-		public void Test_3861()
-		{
-		}
-		[TestMethod]
-		public void Test_3862()
-		{
-		}
-		[TestMethod]
-		public void Test_3863()
-		{
-		}
-		[TestMethod]
-		public void Test_3864()
-		{
-		}
-		[TestMethod]
-		public void Test_3865()
-		{
-		}
-		[TestMethod]
-		public void Test_3866()
-		{
-		}
-		[TestMethod]
-		public void Test_3867()
-		{
-		}
-		[TestMethod]
-		public void Test_3868()
-		{
-		}
-		[TestMethod]
-		public void Test_3869()
-		{
-		}
-		[TestMethod]
-		public void Test_3870()
-		{
-		}
-		[TestMethod]
-		public void Test_3871()
-		{
-		}
-		[TestMethod]
-		public void Test_3872()
-		{
-		}
-		[TestMethod]
-		public void Test_3873()
-		{
-		}
-		[TestMethod]
-		public void Test_3874()
-		{
-		}
-		[TestMethod]
-		public void Test_3875()
-		{
-		}
-		[TestMethod]
-		public void Test_3876()
-		{
-		}
-		[TestMethod]
-		public void Test_3877()
-		{
-		}
-		[TestMethod]
-		public void Test_3878()
-		{
-		}
-		[TestMethod]
-		public void Test_3879()
-		{
-		}
-		[TestMethod]
-		public void Test_3880()
-		{
-		}
-		[TestMethod]
-		public void Test_3881()
-		{
-		}
-		[TestMethod]
-		public void Test_3882()
-		{
-		}
-		[TestMethod]
-		public void Test_3883()
-		{
-		}
-		[TestMethod]
-		public void Test_3884()
-		{
-		}
-		[TestMethod]
-		public void Test_3885()
-		{
-		}
-		[TestMethod]
-		public void Test_3886()
-		{
-		}
-		[TestMethod]
-		public void Test_3887()
-		{
-		}
-		[TestMethod]
-		public void Test_3888()
-		{
-		}
-		[TestMethod]
-		public void Test_3889()
-		{
-		}
-		[TestMethod]
-		public void Test_3890()
-		{
-		}
-		[TestMethod]
-		public void Test_3891()
-		{
-		}
-		[TestMethod]
-		public void Test_3892()
-		{
-		}
-		[TestMethod]
-		public void Test_3893()
-		{
-		}
-		[TestMethod]
-		public void Test_3894()
-		{
-		}
-		[TestMethod]
-		public void Test_3895()
-		{
-		}
-		[TestMethod]
-		public void Test_3896()
-		{
-		}
-		[TestMethod]
-		public void Test_3897()
-		{
-		}
-		[TestMethod]
-		public void Test_3898()
-		{
-		}
-		[TestMethod]
-		public void Test_3899()
-		{
-		}
-		[TestMethod]
-		public void Test_3900()
-		{
-		}
-		[TestMethod]
-		public void Test_3901()
-		{
-		}
-		[TestMethod]
-		public void Test_3902()
-		{
-		}
-		[TestMethod]
-		public void Test_3903()
-		{
-		}
-		[TestMethod]
-		public void Test_3904()
-		{
-		}
-		[TestMethod]
-		public void Test_3905()
-		{
-		}
-		[TestMethod]
-		public void Test_3906()
-		{
-		}
-		[TestMethod]
-		public void Test_3907()
-		{
-		}
-		[TestMethod]
-		public void Test_3908()
-		{
-		}
-		[TestMethod]
-		public void Test_3909()
-		{
-		}
-		[TestMethod]
-		public void Test_3910()
-		{
-		}
-		[TestMethod]
-		public void Test_3911()
-		{
-		}
-		[TestMethod]
-		public void Test_3912()
-		{
-		}
-		[TestMethod]
-		public void Test_3913()
-		{
-		}
-		[TestMethod]
-		public void Test_3914()
-		{
-		}
-		[TestMethod]
-		public void Test_3915()
-		{
-		}
-		[TestMethod]
-		public void Test_3916()
-		{
-		}
-		[TestMethod]
-		public void Test_3917()
-		{
-		}
-		[TestMethod]
-		public void Test_3918()
-		{
-		}
-		[TestMethod]
-		public void Test_3919()
-		{
-		}
-		[TestMethod]
-		public void Test_3920()
-		{
-		}
-		[TestMethod]
-		public void Test_3921()
-		{
-		}
-		[TestMethod]
-		public void Test_3922()
-		{
-		}
-		[TestMethod]
-		public void Test_3923()
-		{
-		}
-		[TestMethod]
-		public void Test_3924()
-		{
-		}
-		[TestMethod]
-		public void Test_3925()
-		{
-		}
-		[TestMethod]
-		public void Test_3926()
-		{
-		}
-		[TestMethod]
-		public void Test_3927()
-		{
-		}
-		[TestMethod]
-		public void Test_3928()
-		{
-		}
-		[TestMethod]
-		public void Test_3929()
-		{
-		}
-		[TestMethod]
-		public void Test_3930()
-		{
-		}
-		[TestMethod]
-		public void Test_3931()
-		{
-		}
-		[TestMethod]
-		public void Test_3932()
-		{
-		}
-		[TestMethod]
-		public void Test_3933()
-		{
-		}
-		[TestMethod]
-		public void Test_3934()
-		{
-		}
-		[TestMethod]
-		public void Test_3935()
-		{
-		}
-		[TestMethod]
-		public void Test_3936()
-		{
-		}
-		[TestMethod]
-		public void Test_3937()
-		{
-		}
-		[TestMethod]
-		public void Test_3938()
-		{
-		}
-		[TestMethod]
-		public void Test_3939()
-		{
-		}
-		[TestMethod]
-		public void Test_3940()
-		{
-		}
-		[TestMethod]
-		public void Test_3941()
-		{
-		}
-		[TestMethod]
-		public void Test_3942()
-		{
-		}
-		[TestMethod]
-		public void Test_3943()
-		{
-		}
-		[TestMethod]
-		public void Test_3944()
-		{
-		}
-		[TestMethod]
-		public void Test_3945()
-		{
-		}
-		[TestMethod]
-		public void Test_3946()
-		{
-		}
-		[TestMethod]
-		public void Test_3947()
-		{
-		}
-		[TestMethod]
-		public void Test_3948()
-		{
-		}
-		[TestMethod]
-		public void Test_3949()
-		{
-		}
-		[TestMethod]
-		public void Test_3950()
-		{
-		}
-		[TestMethod]
-		public void Test_3951()
-		{
-		}
-		[TestMethod]
-		public void Test_3952()
-		{
-		}
-		[TestMethod]
-		public void Test_3953()
-		{
-		}
-		[TestMethod]
-		public void Test_3954()
-		{
-		}
-		[TestMethod]
-		public void Test_3955()
-		{
-		}
-		[TestMethod]
-		public void Test_3956()
-		{
-		}
-		[TestMethod]
-		public void Test_3957()
-		{
-		}
-		[TestMethod]
-		public void Test_3958()
-		{
-		}
-		[TestMethod]
-		public void Test_3959()
-		{
-		}
-		[TestMethod]
-		public void Test_3960()
-		{
-		}
-		[TestMethod]
-		public void Test_3961()
-		{
-		}
-		[TestMethod]
-		public void Test_3962()
-		{
-		}
-		[TestMethod]
-		public void Test_3963()
-		{
-		}
-		[TestMethod]
-		public void Test_3964()
-		{
-		}
-		[TestMethod]
-		public void Test_3965()
-		{
-		}
-		[TestMethod]
-		public void Test_3966()
-		{
-		}
-		[TestMethod]
-		public void Test_3967()
-		{
-		}
-		[TestMethod]
-		public void Test_3968()
-		{
-		}
-		[TestMethod]
-		public void Test_3969()
-		{
-		}
-		[TestMethod]
-		public void Test_3970()
-		{
-		}
-		[TestMethod]
-		public void Test_3971()
-		{
-		}
-		[TestMethod]
-		public void Test_3972()
-		{
-		}
-		[TestMethod]
-		public void Test_3973()
-		{
-		}
-		[TestMethod]
-		public void Test_3974()
-		{
-		}
-		[TestMethod]
-		public void Test_3975()
-		{
-		}
-		[TestMethod]
-		public void Test_3976()
-		{
-		}
-		[TestMethod]
-		public void Test_3977()
-		{
-		}
-		[TestMethod]
-		public void Test_3978()
-		{
-		}
-		[TestMethod]
-		public void Test_3979()
-		{
-		}
-		[TestMethod]
-		public void Test_3980()
-		{
-		}
-		[TestMethod]
-		public void Test_3981()
-		{
-		}
-		[TestMethod]
-		public void Test_3982()
-		{
-		}
-		[TestMethod]
-		public void Test_3983()
-		{
-		}
-		[TestMethod]
-		public void Test_3984()
-		{
-		}
-		[TestMethod]
-		public void Test_3985()
-		{
-		}
-		[TestMethod]
-		public void Test_3986()
-		{
-		}
-		[TestMethod]
-		public void Test_3987()
-		{
-		}
-		[TestMethod]
-		public void Test_3988()
-		{
-		}
-		[TestMethod]
-		public void Test_3989()
-		{
-		}
-		[TestMethod]
-		public void Test_3990()
-		{
-		}
-		[TestMethod]
-		public void Test_3991()
-		{
-		}
-		[TestMethod]
-		public void Test_3992()
-		{
-		}
-		[TestMethod]
-		public void Test_3993()
-		{
-		}
-		[TestMethod]
-		public void Test_3994()
-		{
-		}
-		[TestMethod]
-		public void Test_3995()
-		{
-		}
-		[TestMethod]
-		public void Test_3996()
-		{
-		}
-		[TestMethod]
-		public void Test_3997()
-		{
-		}
-		[TestMethod]
-		public void Test_3998()
-		{
-		}
-		[TestMethod]
-		public void Test_3999()
-		{
-		}
-		[TestMethod]
-		public void Test_4000()
-		{
-		}
-		[TestMethod]
-		public void Test_4001()
-		{
-		}
-		[TestMethod]
-		public void Test_4002()
-		{
-		}
-		[TestMethod]
-		public void Test_4003()
-		{
-		}
-		[TestMethod]
-		public void Test_4004()
-		{
-		}
-		[TestMethod]
-		public void Test_4005()
-		{
-		}
-		[TestMethod]
-		public void Test_4006()
-		{
-		}
-		[TestMethod]
-		public void Test_4007()
-		{
-		}
-		[TestMethod]
-		public void Test_4008()
-		{
-		}
-		[TestMethod]
-		public void Test_4009()
-		{
-		}
-		[TestMethod]
-		public void Test_4010()
-		{
-		}
-		[TestMethod]
-		public void Test_4011()
-		{
-		}
-		[TestMethod]
-		public void Test_4012()
-		{
-		}
-		[TestMethod]
-		public void Test_4013()
-		{
-		}
-		[TestMethod]
-		public void Test_4014()
-		{
-		}
-		[TestMethod]
-		public void Test_4015()
-		{
-		}
-		[TestMethod]
-		public void Test_4016()
-		{
-		}
-		[TestMethod]
-		public void Test_4017()
-		{
-		}
-		[TestMethod]
-		public void Test_4018()
-		{
-		}
-		[TestMethod]
-		public void Test_4019()
-		{
-		}
-		[TestMethod]
-		public void Test_4020()
-		{
-		}
-		[TestMethod]
-		public void Test_4021()
-		{
-		}
-		[TestMethod]
-		public void Test_4022()
-		{
-		}
-		[TestMethod]
-		public void Test_4023()
-		{
-		}
-		[TestMethod]
-		public void Test_4024()
-		{
-		}
-		[TestMethod]
-		public void Test_4025()
-		{
-		}
-		[TestMethod]
-		public void Test_4026()
-		{
-		}
-		[TestMethod]
-		public void Test_4027()
-		{
-		}
-		[TestMethod]
-		public void Test_4028()
-		{
-		}
-		[TestMethod]
-		public void Test_4029()
-		{
-		}
-		[TestMethod]
-		public void Test_4030()
-		{
-		}
-		[TestMethod]
-		public void Test_4031()
-		{
-		}
-		[TestMethod]
-		public void Test_4032()
-		{
-		}
-		[TestMethod]
-		public void Test_4033()
-		{
-		}
-		[TestMethod]
-		public void Test_4034()
-		{
-		}
-		[TestMethod]
-		public void Test_4035()
-		{
-		}
-		[TestMethod]
-		public void Test_4036()
-		{
-		}
-		[TestMethod]
-		public void Test_4037()
-		{
-		}
-		[TestMethod]
-		public void Test_4038()
-		{
-		}
-		[TestMethod]
-		public void Test_4039()
-		{
-		}
-		[TestMethod]
-		public void Test_4040()
-		{
-		}
-		[TestMethod]
-		public void Test_4041()
-		{
-		}
-		[TestMethod]
-		public void Test_4042()
-		{
-		}
-		[TestMethod]
-		public void Test_4043()
-		{
-		}
-		[TestMethod]
-		public void Test_4044()
-		{
-		}
-		[TestMethod]
-		public void Test_4045()
-		{
-		}
-		[TestMethod]
-		public void Test_4046()
-		{
-		}
-		[TestMethod]
-		public void Test_4047()
-		{
-		}
-		[TestMethod]
-		public void Test_4048()
-		{
-		}
-		[TestMethod]
-		public void Test_4049()
-		{
-		}
-		[TestMethod]
-		public void Test_4050()
-		{
-		}
-		[TestMethod]
-		public void Test_4051()
-		{
-		}
-		[TestMethod]
-		public void Test_4052()
-		{
-		}
-		[TestMethod]
-		public void Test_4053()
-		{
-		}
-		[TestMethod]
-		public void Test_4054()
-		{
-		}
-		[TestMethod]
-		public void Test_4055()
-		{
-		}
-		[TestMethod]
-		public void Test_4056()
-		{
-		}
-		[TestMethod]
-		public void Test_4057()
-		{
-		}
-		[TestMethod]
-		public void Test_4058()
-		{
-		}
-		[TestMethod]
-		public void Test_4059()
-		{
-		}
-		[TestMethod]
-		public void Test_4060()
-		{
-		}
-		[TestMethod]
-		public void Test_4061()
-		{
-		}
-		[TestMethod]
-		public void Test_4062()
-		{
-		}
-		[TestMethod]
-		public void Test_4063()
-		{
-		}
-		[TestMethod]
-		public void Test_4064()
-		{
-		}
-		[TestMethod]
-		public void Test_4065()
-		{
-		}
-		[TestMethod]
-		public void Test_4066()
-		{
-		}
-		[TestMethod]
-		public void Test_4067()
-		{
-		}
-		[TestMethod]
-		public void Test_4068()
-		{
-		}
-		[TestMethod]
-		public void Test_4069()
-		{
-		}
-		[TestMethod]
-		public void Test_4070()
-		{
-		}
-		[TestMethod]
-		public void Test_4071()
-		{
-		}
-		[TestMethod]
-		public void Test_4072()
-		{
-		}
-		[TestMethod]
-		public void Test_4073()
-		{
-		}
-		[TestMethod]
-		public void Test_4074()
-		{
-		}
-		[TestMethod]
-		public void Test_4075()
-		{
-		}
-		[TestMethod]
-		public void Test_4076()
-		{
-		}
-		[TestMethod]
-		public void Test_4077()
-		{
-		}
-		[TestMethod]
-		public void Test_4078()
-		{
-		}
-		[TestMethod]
-		public void Test_4079()
-		{
-		}
-		[TestMethod]
-		public void Test_4080()
-		{
-		}
-		[TestMethod]
-		public void Test_4081()
-		{
-		}
-		[TestMethod]
-		public void Test_4082()
-		{
-		}
-		[TestMethod]
-		public void Test_4083()
-		{
-		}
-		[TestMethod]
-		public void Test_4084()
-		{
-		}
-		[TestMethod]
-		public void Test_4085()
-		{
-		}
-		[TestMethod]
-		public void Test_4086()
-		{
-		}
-		[TestMethod]
-		public void Test_4087()
-		{
-		}
-		[TestMethod]
-		public void Test_4088()
-		{
-		}
-		[TestMethod]
-		public void Test_4089()
-		{
-		}
-		[TestMethod]
-		public void Test_4090()
-		{
-		}
-		[TestMethod]
-		public void Test_4091()
-		{
-		}
-		[TestMethod]
-		public void Test_4092()
-		{
-		}
-		[TestMethod]
-		public void Test_4093()
-		{
-		}
-		[TestMethod]
-		public void Test_4094()
-		{
-		}
-		[TestMethod]
-		public void Test_4095()
-		{
-		}
-		[TestMethod]
-		public void Test_4096()
-		{
-		}
-		[TestMethod]
-		public void Test_4097()
-		{
-		}
-		[TestMethod]
-		public void Test_4098()
-		{
-		}
-		[TestMethod]
-		public void Test_4099()
-		{
-		}
-		[TestMethod]
-		public void Test_4100()
-		{
-		}
-		[TestMethod]
-		public void Test_4101()
-		{
-		}
-		[TestMethod]
-		public void Test_4102()
-		{
-		}
-		[TestMethod]
-		public void Test_4103()
-		{
-		}
-		[TestMethod]
-		public void Test_4104()
-		{
-		}
-		[TestMethod]
-		public void Test_4105()
-		{
-		}
-		[TestMethod]
-		public void Test_4106()
-		{
-		}
-		[TestMethod]
-		public void Test_4107()
-		{
-		}
-		[TestMethod]
-		public void Test_4108()
-		{
-		}
-		[TestMethod]
-		public void Test_4109()
-		{
-		}
-		[TestMethod]
-		public void Test_4110()
-		{
-		}
-		[TestMethod]
-		public void Test_4111()
-		{
-		}
-		[TestMethod]
-		public void Test_4112()
-		{
-		}
-		[TestMethod]
-		public void Test_4113()
-		{
-		}
-		[TestMethod]
-		public void Test_4114()
-		{
-		}
-		[TestMethod]
-		public void Test_4115()
-		{
-		}
-		[TestMethod]
-		public void Test_4116()
-		{
-		}
-		[TestMethod]
-		public void Test_4117()
-		{
-		}
-		[TestMethod]
-		public void Test_4118()
-		{
-		}
-		[TestMethod]
-		public void Test_4119()
-		{
-		}
-		[TestMethod]
-		public void Test_4120()
-		{
-		}
-		[TestMethod]
-		public void Test_4121()
-		{
-		}
-		[TestMethod]
-		public void Test_4122()
-		{
-		}
-		[TestMethod]
-		public void Test_4123()
-		{
-		}
-		[TestMethod]
-		public void Test_4124()
-		{
-		}
-		[TestMethod]
-		public void Test_4125()
-		{
-		}
-		[TestMethod]
-		public void Test_4126()
-		{
-		}
-		[TestMethod]
-		public void Test_4127()
-		{
-		}
-		[TestMethod]
-		public void Test_4128()
-		{
-		}
-		[TestMethod]
-		public void Test_4129()
-		{
-		}
-		[TestMethod]
-		public void Test_4130()
-		{
-		}
-		[TestMethod]
-		public void Test_4131()
-		{
-		}
-		[TestMethod]
-		public void Test_4132()
-		{
-		}
-		[TestMethod]
-		public void Test_4133()
-		{
-		}
-		[TestMethod]
-		public void Test_4134()
-		{
-		}
-		[TestMethod]
-		public void Test_4135()
-		{
-		}
-		[TestMethod]
-		public void Test_4136()
-		{
-		}
-		[TestMethod]
-		public void Test_4137()
-		{
-		}
-		[TestMethod]
-		public void Test_4138()
-		{
-		}
-		[TestMethod]
-		public void Test_4139()
-		{
-		}
-		[TestMethod]
-		public void Test_4140()
-		{
-		}
-		[TestMethod]
-		public void Test_4141()
-		{
-		}
-		[TestMethod]
-		public void Test_4142()
-		{
-		}
-		[TestMethod]
-		public void Test_4143()
-		{
-		}
-		[TestMethod]
-		public void Test_4144()
-		{
-		}
-		[TestMethod]
-		public void Test_4145()
-		{
-		}
-		[TestMethod]
-		public void Test_4146()
-		{
-		}
-		[TestMethod]
-		public void Test_4147()
-		{
-		}
-		[TestMethod]
-		public void Test_4148()
-		{
-		}
-		[TestMethod]
-		public void Test_4149()
-		{
-		}
-		[TestMethod]
-		public void Test_4150()
-		{
-		}
-		[TestMethod]
-		public void Test_4151()
-		{
-		}
-		[TestMethod]
-		public void Test_4152()
-		{
-		}
-		[TestMethod]
-		public void Test_4153()
-		{
-		}
-		[TestMethod]
-		public void Test_4154()
-		{
-		}
-		[TestMethod]
-		public void Test_4155()
-		{
-		}
-		[TestMethod]
-		public void Test_4156()
-		{
-		}
-		[TestMethod]
-		public void Test_4157()
-		{
-		}
-		[TestMethod]
-		public void Test_4158()
-		{
-		}
-		[TestMethod]
-		public void Test_4159()
-		{
-		}
-		[TestMethod]
-		public void Test_4160()
-		{
-		}
-		[TestMethod]
-		public void Test_4161()
-		{
-		}
-		[TestMethod]
-		public void Test_4162()
-		{
-		}
-		[TestMethod]
-		public void Test_4163()
-		{
-		}
-		[TestMethod]
-		public void Test_4164()
-		{
-		}
-		[TestMethod]
-		public void Test_4165()
-		{
-		}
-		[TestMethod]
-		public void Test_4166()
-		{
-		}
-		[TestMethod]
-		public void Test_4167()
-		{
-		}
-		[TestMethod]
-		public void Test_4168()
-		{
-		}
-		[TestMethod]
-		public void Test_4169()
-		{
-		}
-		[TestMethod]
-		public void Test_4170()
-		{
-		}
-		[TestMethod]
-		public void Test_4171()
-		{
-		}
-		[TestMethod]
-		public void Test_4172()
-		{
-		}
-		[TestMethod]
-		public void Test_4173()
-		{
-		}
-		[TestMethod]
-		public void Test_4174()
-		{
-		}
-		[TestMethod]
-		public void Test_4175()
-		{
-		}
-		[TestMethod]
-		public void Test_4176()
-		{
-		}
-		[TestMethod]
-		public void Test_4177()
-		{
-		}
-		[TestMethod]
-		public void Test_4178()
-		{
-		}
-		[TestMethod]
-		public void Test_4179()
-		{
-		}
-		[TestMethod]
-		public void Test_4180()
-		{
-		}
-		[TestMethod]
-		public void Test_4181()
-		{
-		}
-		[TestMethod]
-		public void Test_4182()
-		{
-		}
-		[TestMethod]
-		public void Test_4183()
-		{
-		}
-		[TestMethod]
-		public void Test_4184()
-		{
-		}
-		[TestMethod]
-		public void Test_4185()
-		{
-		}
-		[TestMethod]
-		public void Test_4186()
-		{
-		}
-		[TestMethod]
-		public void Test_4187()
-		{
-		}
-		[TestMethod]
-		public void Test_4188()
-		{
-		}
-		[TestMethod]
-		public void Test_4189()
-		{
-		}
-		[TestMethod]
-		public void Test_4190()
-		{
-		}
-		[TestMethod]
-		public void Test_4191()
-		{
-		}
-		[TestMethod]
-		public void Test_4192()
-		{
-		}
-		[TestMethod]
-		public void Test_4193()
-		{
-		}
-		[TestMethod]
-		public void Test_4194()
-		{
-		}
-		[TestMethod]
-		public void Test_4195()
-		{
-		}
-		[TestMethod]
-		public void Test_4196()
-		{
-		}
-		[TestMethod]
-		public void Test_4197()
-		{
-		}
-		[TestMethod]
-		public void Test_4198()
-		{
-		}
-		[TestMethod]
-		public void Test_4199()
-		{
-		}
-		[TestMethod]
-		public void Test_4200()
-		{
-		}
-		[TestMethod]
-		public void Test_4201()
-		{
-		}
-		[TestMethod]
-		public void Test_4202()
-		{
-		}
-		[TestMethod]
-		public void Test_4203()
-		{
-		}
-		[TestMethod]
-		public void Test_4204()
-		{
-		}
-		[TestMethod]
-		public void Test_4205()
-		{
-		}
-		[TestMethod]
-		public void Test_4206()
-		{
-		}
-		[TestMethod]
-		public void Test_4207()
-		{
-		}
-		[TestMethod]
-		public void Test_4208()
-		{
-		}
-		[TestMethod]
-		public void Test_4209()
-		{
-		}
-		[TestMethod]
-		public void Test_4210()
-		{
-		}
-		[TestMethod]
-		public void Test_4211()
-		{
-		}
-		[TestMethod]
-		public void Test_4212()
-		{
-		}
-		[TestMethod]
-		public void Test_4213()
-		{
-		}
-		[TestMethod]
-		public void Test_4214()
-		{
-		}
-		[TestMethod]
-		public void Test_4215()
-		{
-		}
-		[TestMethod]
-		public void Test_4216()
-		{
-		}
-		[TestMethod]
-		public void Test_4217()
-		{
-		}
-		[TestMethod]
-		public void Test_4218()
-		{
-		}
-		[TestMethod]
-		public void Test_4219()
-		{
-		}
-		[TestMethod]
-		public void Test_4220()
-		{
-		}
-		[TestMethod]
-		public void Test_4221()
-		{
-		}
-		[TestMethod]
-		public void Test_4222()
-		{
-		}
-		[TestMethod]
-		public void Test_4223()
-		{
-		}
-		[TestMethod]
-		public void Test_4224()
-		{
-		}
-		[TestMethod]
-		public void Test_4225()
-		{
-		}
-		[TestMethod]
-		public void Test_4226()
-		{
-		}
-		[TestMethod]
-		public void Test_4227()
-		{
-		}
-		[TestMethod]
-		public void Test_4228()
-		{
-		}
-		[TestMethod]
-		public void Test_4229()
-		{
-		}
-		[TestMethod]
-		public void Test_4230()
-		{
-		}
-		[TestMethod]
-		public void Test_4231()
-		{
-		}
-		[TestMethod]
-		public void Test_4232()
-		{
-		}
-		[TestMethod]
-		public void Test_4233()
-		{
-		}
-		[TestMethod]
-		public void Test_4234()
-		{
-		}
-		[TestMethod]
-		public void Test_4235()
-		{
-		}
-		[TestMethod]
-		public void Test_4236()
-		{
-		}
-		[TestMethod]
-		public void Test_4237()
-		{
-		}
-		[TestMethod]
-		public void Test_4238()
-		{
-		}
-		[TestMethod]
-		public void Test_4239()
-		{
-		}
-		[TestMethod]
-		public void Test_4240()
-		{
-		}
-		[TestMethod]
-		public void Test_4241()
-		{
-		}
-		[TestMethod]
-		public void Test_4242()
-		{
-		}
-		[TestMethod]
-		public void Test_4243()
-		{
-		}
-		[TestMethod]
-		public void Test_4244()
-		{
-		}
-		[TestMethod]
-		public void Test_4245()
-		{
-		}
-		[TestMethod]
-		public void Test_4246()
-		{
-		}
-		[TestMethod]
-		public void Test_4247()
-		{
-		}
-		[TestMethod]
-		public void Test_4248()
-		{
-		}
-		[TestMethod]
-		public void Test_4249()
-		{
-		}
-		[TestMethod]
-		public void Test_4250()
-		{
-		}
-		[TestMethod]
-		public void Test_4251()
-		{
-		}
-		[TestMethod]
-		public void Test_4252()
-		{
-		}
-		[TestMethod]
-		public void Test_4253()
-		{
-		}
-		[TestMethod]
-		public void Test_4254()
-		{
-		}
-		[TestMethod]
-		public void Test_4255()
-		{
-		}
-		[TestMethod]
-		public void Test_4256()
-		{
-		}
-		[TestMethod]
-		public void Test_4257()
-		{
-		}
-		[TestMethod]
-		public void Test_4258()
-		{
-		}
-		[TestMethod]
-		public void Test_4259()
-		{
-		}
-		[TestMethod]
-		public void Test_4260()
-		{
-		}
-		[TestMethod]
-		public void Test_4261()
-		{
-		}
-		[TestMethod]
-		public void Test_4262()
-		{
-		}
-		[TestMethod]
-		public void Test_4263()
-		{
-		}
-		[TestMethod]
-		public void Test_4264()
-		{
-		}
-		[TestMethod]
-		public void Test_4265()
-		{
-		}
-		[TestMethod]
-		public void Test_4266()
-		{
-		}
-		[TestMethod]
-		public void Test_4267()
-		{
-		}
-		[TestMethod]
-		public void Test_4268()
-		{
-		}
-		[TestMethod]
-		public void Test_4269()
-		{
-		}
-		[TestMethod]
-		public void Test_4270()
-		{
-		}
-		[TestMethod]
-		public void Test_4271()
-		{
-		}
-		[TestMethod]
-		public void Test_4272()
-		{
-		}
-		[TestMethod]
-		public void Test_4273()
-		{
-		}
-		[TestMethod]
-		public void Test_4274()
-		{
-		}
-		[TestMethod]
-		public void Test_4275()
-		{
-		}
-		[TestMethod]
-		public void Test_4276()
-		{
-		}
-		[TestMethod]
-		public void Test_4277()
-		{
-		}
-		[TestMethod]
-		public void Test_4278()
-		{
-		}
-		[TestMethod]
-		public void Test_4279()
-		{
-		}
-		[TestMethod]
-		public void Test_4280()
-		{
-		}
-		[TestMethod]
-		public void Test_4281()
-		{
-		}
-		[TestMethod]
-		public void Test_4282()
-		{
-		}
-		[TestMethod]
-		public void Test_4283()
-		{
-		}
-		[TestMethod]
-		public void Test_4284()
-		{
-		}
-		[TestMethod]
-		public void Test_4285()
-		{
-		}
-		[TestMethod]
-		public void Test_4286()
-		{
-		}
-		[TestMethod]
-		public void Test_4287()
-		{
-		}
-		[TestMethod]
-		public void Test_4288()
-		{
-		}
-		[TestMethod]
-		public void Test_4289()
-		{
-		}
-		[TestMethod]
-		public void Test_4290()
-		{
-		}
-		[TestMethod]
-		public void Test_4291()
-		{
-		}
-		[TestMethod]
-		public void Test_4292()
-		{
-		}
-		[TestMethod]
-		public void Test_4293()
-		{
-		}
-		[TestMethod]
-		public void Test_4294()
-		{
-		}
-		[TestMethod]
-		public void Test_4295()
-		{
-		}
-		[TestMethod]
-		public void Test_4296()
-		{
-		}
-		[TestMethod]
-		public void Test_4297()
-		{
-		}
-		[TestMethod]
-		public void Test_4298()
-		{
-		}
-		[TestMethod]
-		public void Test_4299()
-		{
-		}
-		[TestMethod]
-		public void Test_4300()
-		{
-		}
-		[TestMethod]
-		public void Test_4301()
-		{
-		}
-		[TestMethod]
-		public void Test_4302()
-		{
-		}
-		[TestMethod]
-		public void Test_4303()
-		{
-		}
-		[TestMethod]
-		public void Test_4304()
-		{
-		}
-		[TestMethod]
-		public void Test_4305()
-		{
-		}
-		[TestMethod]
-		public void Test_4306()
-		{
-		}
-		[TestMethod]
-		public void Test_4307()
-		{
-		}
-		[TestMethod]
-		public void Test_4308()
-		{
-		}
-		[TestMethod]
-		public void Test_4309()
-		{
-		}
-		[TestMethod]
-		public void Test_4310()
-		{
-		}
-		[TestMethod]
-		public void Test_4311()
-		{
-		}
-		[TestMethod]
-		public void Test_4312()
-		{
-		}
-		[TestMethod]
-		public void Test_4313()
-		{
-		}
-		[TestMethod]
-		public void Test_4314()
-		{
-		}
-		[TestMethod]
-		public void Test_4315()
-		{
-		}
-		[TestMethod]
-		public void Test_4316()
-		{
-		}
-		[TestMethod]
-		public void Test_4317()
-		{
-		}
-		[TestMethod]
-		public void Test_4318()
-		{
-		}
-		[TestMethod]
-		public void Test_4319()
-		{
-		}
-		[TestMethod]
-		public void Test_4320()
-		{
-		}
-		[TestMethod]
-		public void Test_4321()
-		{
-		}
-		[TestMethod]
-		public void Test_4322()
-		{
-		}
-		[TestMethod]
-		public void Test_4323()
-		{
-		}
-		[TestMethod]
-		public void Test_4324()
-		{
-		}
-		[TestMethod]
-		public void Test_4325()
-		{
-		}
-		[TestMethod]
-		public void Test_4326()
-		{
-		}
-		[TestMethod]
-		public void Test_4327()
-		{
-		}
-		[TestMethod]
-		public void Test_4328()
-		{
-		}
-		[TestMethod]
-		public void Test_4329()
-		{
-		}
-		[TestMethod]
-		public void Test_4330()
-		{
-		}
-		[TestMethod]
-		public void Test_4331()
-		{
-		}
-		[TestMethod]
-		public void Test_4332()
-		{
-		}
-		[TestMethod]
-		public void Test_4333()
-		{
-		}
-		[TestMethod]
-		public void Test_4334()
-		{
-		}
-		[TestMethod]
-		public void Test_4335()
-		{
-		}
-		[TestMethod]
-		public void Test_4336()
-		{
-		}
-		[TestMethod]
-		public void Test_4337()
-		{
-		}
-		[TestMethod]
-		public void Test_4338()
-		{
-		}
-		[TestMethod]
-		public void Test_4339()
-		{
-		}
-		[TestMethod]
-		public void Test_4340()
-		{
-		}
-		[TestMethod]
-		public void Test_4341()
-		{
-		}
-		[TestMethod]
-		public void Test_4342()
-		{
-		}
-		[TestMethod]
-		public void Test_4343()
-		{
-		}
-		[TestMethod]
-		public void Test_4344()
-		{
-		}
-		[TestMethod]
-		public void Test_4345()
-		{
-		}
-		[TestMethod]
-		public void Test_4346()
-		{
-		}
-		[TestMethod]
-		public void Test_4347()
-		{
-		}
-		[TestMethod]
-		public void Test_4348()
-		{
-		}
-		[TestMethod]
-		public void Test_4349()
-		{
-		}
-		[TestMethod]
-		public void Test_4350()
-		{
-		}
-		[TestMethod]
-		public void Test_4351()
-		{
-		}
-		[TestMethod]
-		public void Test_4352()
-		{
-		}
-		[TestMethod]
-		public void Test_4353()
-		{
-		}
-		[TestMethod]
-		public void Test_4354()
-		{
-		}
-		[TestMethod]
-		public void Test_4355()
-		{
-		}
-		[TestMethod]
-		public void Test_4356()
-		{
-		}
-		[TestMethod]
-		public void Test_4357()
-		{
-		}
-		[TestMethod]
-		public void Test_4358()
-		{
-		}
-		[TestMethod]
-		public void Test_4359()
-		{
-		}
-		[TestMethod]
-		public void Test_4360()
-		{
-		}
-		[TestMethod]
-		public void Test_4361()
-		{
-		}
-		[TestMethod]
-		public void Test_4362()
-		{
-		}
-		[TestMethod]
-		public void Test_4363()
-		{
-		}
-		[TestMethod]
-		public void Test_4364()
-		{
-		}
-		[TestMethod]
-		public void Test_4365()
-		{
-		}
-		[TestMethod]
-		public void Test_4366()
-		{
-		}
-		[TestMethod]
-		public void Test_4367()
-		{
-		}
-		[TestMethod]
-		public void Test_4368()
-		{
-		}
-		[TestMethod]
-		public void Test_4369()
-		{
-		}
-		[TestMethod]
-		public void Test_4370()
-		{
-		}
-		[TestMethod]
-		public void Test_4371()
-		{
-		}
-		[TestMethod]
-		public void Test_4372()
-		{
-		}
-		[TestMethod]
-		public void Test_4373()
-		{
-		}
-		[TestMethod]
-		public void Test_4374()
-		{
-		}
-		[TestMethod]
-		public void Test_4375()
-		{
-		}
-		[TestMethod]
-		public void Test_4376()
-		{
-		}
-		[TestMethod]
-		public void Test_4377()
-		{
-		}
-		[TestMethod]
-		public void Test_4378()
-		{
-		}
-		[TestMethod]
-		public void Test_4379()
-		{
-		}
-		[TestMethod]
-		public void Test_4380()
-		{
-		}
-		[TestMethod]
-		public void Test_4381()
-		{
-		}
-		[TestMethod]
-		public void Test_4382()
-		{
-		}
-		[TestMethod]
-		public void Test_4383()
-		{
-		}
-		[TestMethod]
-		public void Test_4384()
-		{
-		}
-		[TestMethod]
-		public void Test_4385()
-		{
-		}
-		[TestMethod]
-		public void Test_4386()
-		{
-		}
-		[TestMethod]
-		public void Test_4387()
-		{
-		}
-		[TestMethod]
-		public void Test_4388()
-		{
-		}
-		[TestMethod]
-		public void Test_4389()
-		{
-		}
-		[TestMethod]
-		public void Test_4390()
-		{
-		}
-		[TestMethod]
-		public void Test_4391()
-		{
-		}
-		[TestMethod]
-		public void Test_4392()
-		{
-		}
-		[TestMethod]
-		public void Test_4393()
-		{
-		}
-		[TestMethod]
-		public void Test_4394()
-		{
-		}
-		[TestMethod]
-		public void Test_4395()
-		{
-		}
-		[TestMethod]
-		public void Test_4396()
-		{
-		}
-		[TestMethod]
-		public void Test_4397()
-		{
-		}
-		[TestMethod]
-		public void Test_4398()
-		{
-		}
-		[TestMethod]
-		public void Test_4399()
-		{
-		}
-		[TestMethod]
-		public void Test_4400()
-		{
-		}
-		[TestMethod]
-		public void Test_4401()
-		{
-		}
-		[TestMethod]
-		public void Test_4402()
-		{
-		}
-		[TestMethod]
-		public void Test_4403()
-		{
-		}
-		[TestMethod]
-		public void Test_4404()
-		{
-		}
-		[TestMethod]
-		public void Test_4405()
-		{
-		}
-		[TestMethod]
-		public void Test_4406()
-		{
-		}
-		[TestMethod]
-		public void Test_4407()
-		{
-		}
-		[TestMethod]
-		public void Test_4408()
-		{
-		}
-		[TestMethod]
-		public void Test_4409()
-		{
-		}
-		[TestMethod]
-		public void Test_4410()
-		{
-		}
-		[TestMethod]
-		public void Test_4411()
-		{
-		}
-		[TestMethod]
-		public void Test_4412()
-		{
-		}
-		[TestMethod]
-		public void Test_4413()
-		{
-		}
-		[TestMethod]
-		public void Test_4414()
-		{
-		}
-		[TestMethod]
-		public void Test_4415()
-		{
-		}
-		[TestMethod]
-		public void Test_4416()
-		{
-		}
-		[TestMethod]
-		public void Test_4417()
-		{
-		}
-		[TestMethod]
-		public void Test_4418()
-		{
-		}
-		[TestMethod]
-		public void Test_4419()
-		{
-		}
-		[TestMethod]
-		public void Test_4420()
-		{
-		}
-		[TestMethod]
-		public void Test_4421()
-		{
-		}
-		[TestMethod]
-		public void Test_4422()
-		{
-		}
-		[TestMethod]
-		public void Test_4423()
-		{
-		}
-		[TestMethod]
-		public void Test_4424()
-		{
-		}
-		[TestMethod]
-		public void Test_4425()
-		{
-		}
-		[TestMethod]
-		public void Test_4426()
-		{
-		}
-		[TestMethod]
-		public void Test_4427()
-		{
-		}
-		[TestMethod]
-		public void Test_4428()
-		{
-		}
-		[TestMethod]
-		public void Test_4429()
-		{
-		}
-		[TestMethod]
-		public void Test_4430()
-		{
-		}
-		[TestMethod]
-		public void Test_4431()
-		{
-		}
-		[TestMethod]
-		public void Test_4432()
-		{
-		}
-		[TestMethod]
-		public void Test_4433()
-		{
-		}
-		[TestMethod]
-		public void Test_4434()
-		{
-		}
-		[TestMethod]
-		public void Test_4435()
-		{
-		}
-		[TestMethod]
-		public void Test_4436()
-		{
-		}
-		[TestMethod]
-		public void Test_4437()
-		{
-		}
-		[TestMethod]
-		public void Test_4438()
-		{
-		}
-		[TestMethod]
-		public void Test_4439()
-		{
-		}
-		[TestMethod]
-		public void Test_4440()
-		{
-		}
-		[TestMethod]
-		public void Test_4441()
-		{
-		}
-		[TestMethod]
-		public void Test_4442()
-		{
-		}
-		[TestMethod]
-		public void Test_4443()
-		{
-		}
-		[TestMethod]
-		public void Test_4444()
-		{
-		}
-		[TestMethod]
-		public void Test_4445()
-		{
-		}
-		[TestMethod]
-		public void Test_4446()
-		{
-		}
-		[TestMethod]
-		public void Test_4447()
-		{
-		}
-		[TestMethod]
-		public void Test_4448()
-		{
-		}
-		[TestMethod]
-		public void Test_4449()
-		{
-		}
-		[TestMethod]
-		public void Test_4450()
-		{
-		}
-		[TestMethod]
-		public void Test_4451()
-		{
-		}
-		[TestMethod]
-		public void Test_4452()
-		{
-		}
-		[TestMethod]
-		public void Test_4453()
-		{
-		}
-		[TestMethod]
-		public void Test_4454()
-		{
-		}
-		[TestMethod]
-		public void Test_4455()
-		{
-		}
-		[TestMethod]
-		public void Test_4456()
-		{
-		}
-		[TestMethod]
-		public void Test_4457()
-		{
-		}
-		[TestMethod]
-		public void Test_4458()
-		{
-		}
-		[TestMethod]
-		public void Test_4459()
-		{
-		}
-		[TestMethod]
-		public void Test_4460()
-		{
-		}
-		[TestMethod]
-		public void Test_4461()
-		{
-		}
-		[TestMethod]
-		public void Test_4462()
-		{
-		}
-		[TestMethod]
-		public void Test_4463()
-		{
-		}
-		[TestMethod]
-		public void Test_4464()
-		{
-		}
-		[TestMethod]
-		public void Test_4465()
-		{
-		}
-		[TestMethod]
-		public void Test_4466()
-		{
-		}
-		[TestMethod]
-		public void Test_4467()
-		{
-		}
-		[TestMethod]
-		public void Test_4468()
-		{
-		}
-		[TestMethod]
-		public void Test_4469()
-		{
-		}
-		[TestMethod]
-		public void Test_4470()
-		{
-		}
-		[TestMethod]
-		public void Test_4471()
-		{
-		}
-		[TestMethod]
-		public void Test_4472()
-		{
-		}
-		[TestMethod]
-		public void Test_4473()
-		{
-		}
-		[TestMethod]
-		public void Test_4474()
-		{
-		}
-		[TestMethod]
-		public void Test_4475()
-		{
-		}
-		[TestMethod]
-		public void Test_4476()
-		{
-		}
-		[TestMethod]
-		public void Test_4477()
-		{
-		}
-		[TestMethod]
-		public void Test_4478()
-		{
-		}
-		[TestMethod]
-		public void Test_4479()
-		{
-		}
-		[TestMethod]
-		public void Test_4480()
-		{
-		}
-		[TestMethod]
-		public void Test_4481()
-		{
-		}
-		[TestMethod]
-		public void Test_4482()
-		{
-		}
-		[TestMethod]
-		public void Test_4483()
-		{
-		}
-		[TestMethod]
-		public void Test_4484()
-		{
-		}
-		[TestMethod]
-		public void Test_4485()
-		{
-		}
-		[TestMethod]
-		public void Test_4486()
-		{
-		}
-		[TestMethod]
-		public void Test_4487()
-		{
-		}
-		[TestMethod]
-		public void Test_4488()
-		{
-		}
-		[TestMethod]
-		public void Test_4489()
-		{
-		}
-		[TestMethod]
-		public void Test_4490()
-		{
-		}
-		[TestMethod]
-		public void Test_4491()
-		{
-		}
-		[TestMethod]
-		public void Test_4492()
-		{
-		}
-		[TestMethod]
-		public void Test_4493()
-		{
-		}
-		[TestMethod]
-		public void Test_4494()
-		{
-		}
-		[TestMethod]
-		public void Test_4495()
-		{
-		}
-		[TestMethod]
-		public void Test_4496()
-		{
-		}
-		[TestMethod]
-		public void Test_4497()
-		{
-		}
-		[TestMethod]
-		public void Test_4498()
-		{
-		}
-		[TestMethod]
-		public void Test_4499()
-		{
-		}
-		[TestMethod]
-		public void Test_4500()
-		{
-		}
-		[TestMethod]
-		public void Test_4501()
-		{
-		}
-		[TestMethod]
-		public void Test_4502()
-		{
-		}
-		[TestMethod]
-		public void Test_4503()
-		{
-		}
-		[TestMethod]
-		public void Test_4504()
-		{
-		}
-		[TestMethod]
-		public void Test_4505()
-		{
-		}
-		[TestMethod]
-		public void Test_4506()
-		{
-		}
-		[TestMethod]
-		public void Test_4507()
-		{
-		}
-		[TestMethod]
-		public void Test_4508()
-		{
-		}
-		[TestMethod]
-		public void Test_4509()
-		{
-		}
-		[TestMethod]
-		public void Test_4510()
-		{
-		}
-		[TestMethod]
-		public void Test_4511()
-		{
-		}
-		[TestMethod]
-		public void Test_4512()
-		{
-		}
-		[TestMethod]
-		public void Test_4513()
-		{
-		}
-		[TestMethod]
-		public void Test_4514()
-		{
-		}
-		[TestMethod]
-		public void Test_4515()
-		{
-		}
-		[TestMethod]
-		public void Test_4516()
-		{
-		}
-		[TestMethod]
-		public void Test_4517()
-		{
-		}
-		[TestMethod]
-		public void Test_4518()
-		{
-		}
-		[TestMethod]
-		public void Test_4519()
-		{
-		}
-		[TestMethod]
-		public void Test_4520()
-		{
-		}
-		[TestMethod]
-		public void Test_4521()
-		{
-		}
-		[TestMethod]
-		public void Test_4522()
-		{
-		}
-		[TestMethod]
-		public void Test_4523()
-		{
-		}
-		[TestMethod]
-		public void Test_4524()
-		{
-		}
-		[TestMethod]
-		public void Test_4525()
-		{
-		}
-		[TestMethod]
-		public void Test_4526()
-		{
-		}
-		[TestMethod]
-		public void Test_4527()
-		{
-		}
-		[TestMethod]
-		public void Test_4528()
-		{
-		}
-		[TestMethod]
-		public void Test_4529()
-		{
-		}
-		[TestMethod]
-		public void Test_4530()
-		{
-		}
-		[TestMethod]
-		public void Test_4531()
-		{
-		}
-		[TestMethod]
-		public void Test_4532()
-		{
-		}
-		[TestMethod]
-		public void Test_4533()
-		{
-		}
-		[TestMethod]
-		public void Test_4534()
-		{
-		}
-		[TestMethod]
-		public void Test_4535()
-		{
-		}
-		[TestMethod]
-		public void Test_4536()
-		{
-		}
-		[TestMethod]
-		public void Test_4537()
-		{
-		}
-		[TestMethod]
-		public void Test_4538()
-		{
-		}
-		[TestMethod]
-		public void Test_4539()
-		{
-		}
-		[TestMethod]
-		public void Test_4540()
-		{
-		}
-		[TestMethod]
-		public void Test_4541()
-		{
-		}
-		[TestMethod]
-		public void Test_4542()
-		{
-		}
-		[TestMethod]
-		public void Test_4543()
-		{
-		}
-		[TestMethod]
-		public void Test_4544()
-		{
-		}
-		[TestMethod]
-		public void Test_4545()
-		{
-		}
-		[TestMethod]
-		public void Test_4546()
-		{
-		}
-		[TestMethod]
-		public void Test_4547()
-		{
-		}
-		[TestMethod]
-		public void Test_4548()
-		{
-		}
-		[TestMethod]
-		public void Test_4549()
-		{
-		}
-		[TestMethod]
-		public void Test_4550()
-		{
-		}
-		[TestMethod]
-		public void Test_4551()
-		{
-		}
-		[TestMethod]
-		public void Test_4552()
-		{
-		}
-		[TestMethod]
-		public void Test_4553()
-		{
-		}
-		[TestMethod]
-		public void Test_4554()
-		{
-		}
-		[TestMethod]
-		public void Test_4555()
-		{
-		}
-		[TestMethod]
-		public void Test_4556()
-		{
-		}
-		[TestMethod]
-		public void Test_4557()
-		{
-		}
-		[TestMethod]
-		public void Test_4558()
-		{
-		}
-		[TestMethod]
-		public void Test_4559()
-		{
-		}
-		[TestMethod]
-		public void Test_4560()
-		{
-		}
-		[TestMethod]
-		public void Test_4561()
-		{
-		}
-		[TestMethod]
-		public void Test_4562()
-		{
-		}
-		[TestMethod]
-		public void Test_4563()
-		{
-		}
-		[TestMethod]
-		public void Test_4564()
-		{
-		}
-		[TestMethod]
-		public void Test_4565()
-		{
-		}
-		[TestMethod]
-		public void Test_4566()
-		{
-		}
-		[TestMethod]
-		public void Test_4567()
-		{
-		}
-		[TestMethod]
-		public void Test_4568()
-		{
-		}
-		[TestMethod]
-		public void Test_4569()
-		{
-		}
-		[TestMethod]
-		public void Test_4570()
-		{
-		}
-		[TestMethod]
-		public void Test_4571()
-		{
-		}
-		[TestMethod]
-		public void Test_4572()
-		{
-		}
-		[TestMethod]
-		public void Test_4573()
-		{
-		}
-		[TestMethod]
-		public void Test_4574()
-		{
-		}
-		[TestMethod]
-		public void Test_4575()
-		{
-		}
-		[TestMethod]
-		public void Test_4576()
-		{
-		}
-		[TestMethod]
-		public void Test_4577()
-		{
-		}
-		[TestMethod]
-		public void Test_4578()
-		{
-		}
-		[TestMethod]
-		public void Test_4579()
-		{
-		}
-		[TestMethod]
-		public void Test_4580()
-		{
-		}
-		[TestMethod]
-		public void Test_4581()
-		{
-		}
-		[TestMethod]
-		public void Test_4582()
-		{
-		}
-		[TestMethod]
-		public void Test_4583()
-		{
-		}
-		[TestMethod]
-		public void Test_4584()
-		{
-		}
-		[TestMethod]
-		public void Test_4585()
-		{
-		}
-		[TestMethod]
-		public void Test_4586()
-		{
-		}
-		[TestMethod]
-		public void Test_4587()
-		{
-		}
-		[TestMethod]
-		public void Test_4588()
-		{
-		}
-		[TestMethod]
-		public void Test_4589()
-		{
-		}
-		[TestMethod]
-		public void Test_4590()
-		{
-		}
-		[TestMethod]
-		public void Test_4591()
-		{
-		}
-		[TestMethod]
-		public void Test_4592()
-		{
-		}
-		[TestMethod]
-		public void Test_4593()
-		{
-		}
-		[TestMethod]
-		public void Test_4594()
-		{
-		}
-		[TestMethod]
-		public void Test_4595()
-		{
-		}
-		[TestMethod]
-		public void Test_4596()
-		{
-		}
-		[TestMethod]
-		public void Test_4597()
-		{
-		}
-		[TestMethod]
-		public void Test_4598()
-		{
-		}
-		[TestMethod]
-		public void Test_4599()
-		{
-		}
-		[TestMethod]
-		public void Test_4600()
-		{
-		}
-		[TestMethod]
-		public void Test_4601()
-		{
-		}
-		[TestMethod]
-		public void Test_4602()
-		{
-		}
-		[TestMethod]
-		public void Test_4603()
-		{
-		}
-		[TestMethod]
-		public void Test_4604()
-		{
-		}
-		[TestMethod]
-		public void Test_4605()
-		{
-		}
-		[TestMethod]
-		public void Test_4606()
-		{
-		}
-		[TestMethod]
-		public void Test_4607()
-		{
-		}
-		[TestMethod]
-		public void Test_4608()
-		{
-		}
-		[TestMethod]
-		public void Test_4609()
-		{
-		}
-		[TestMethod]
-		public void Test_4610()
-		{
-		}
-		[TestMethod]
-		public void Test_4611()
-		{
-		}
-		[TestMethod]
-		public void Test_4612()
-		{
-		}
-		[TestMethod]
-		public void Test_4613()
-		{
-		}
-		[TestMethod]
-		public void Test_4614()
-		{
-		}
-		[TestMethod]
-		public void Test_4615()
-		{
-		}
-		[TestMethod]
-		public void Test_4616()
-		{
-		}
-		[TestMethod]
-		public void Test_4617()
-		{
-		}
-		[TestMethod]
-		public void Test_4618()
-		{
-		}
-		[TestMethod]
-		public void Test_4619()
-		{
-		}
-		[TestMethod]
-		public void Test_4620()
-		{
-		}
-		[TestMethod]
-		public void Test_4621()
-		{
-		}
-		[TestMethod]
-		public void Test_4622()
-		{
-		}
-		[TestMethod]
-		public void Test_4623()
-		{
-		}
-		[TestMethod]
-		public void Test_4624()
-		{
-		}
-		[TestMethod]
-		public void Test_4625()
-		{
-		}
-		[TestMethod]
-		public void Test_4626()
-		{
-		}
-		[TestMethod]
-		public void Test_4627()
-		{
-		}
-		[TestMethod]
-		public void Test_4628()
-		{
-		}
-		[TestMethod]
-		public void Test_4629()
-		{
-		}
-		[TestMethod]
-		public void Test_4630()
-		{
-		}
-		[TestMethod]
-		public void Test_4631()
-		{
-		}
-		[TestMethod]
-		public void Test_4632()
-		{
-		}
-		[TestMethod]
-		public void Test_4633()
-		{
-		}
-		[TestMethod]
-		public void Test_4634()
-		{
-		}
-		[TestMethod]
-		public void Test_4635()
-		{
-		}
-		[TestMethod]
-		public void Test_4636()
-		{
-		}
-		[TestMethod]
-		public void Test_4637()
-		{
-		}
-		[TestMethod]
-		public void Test_4638()
-		{
-		}
-		[TestMethod]
-		public void Test_4639()
-		{
-		}
-		[TestMethod]
-		public void Test_4640()
-		{
-		}
-		[TestMethod]
-		public void Test_4641()
-		{
-		}
-		[TestMethod]
-		public void Test_4642()
-		{
-		}
-		[TestMethod]
-		public void Test_4643()
-		{
-		}
-		[TestMethod]
-		public void Test_4644()
-		{
-		}
-		[TestMethod]
-		public void Test_4645()
-		{
-		}
-		[TestMethod]
-		public void Test_4646()
-		{
-		}
-		[TestMethod]
-		public void Test_4647()
-		{
-		}
-		[TestMethod]
-		public void Test_4648()
-		{
-		}
-		[TestMethod]
-		public void Test_4649()
-		{
-		}
-		[TestMethod]
-		public void Test_4650()
-		{
-		}
-		[TestMethod]
-		public void Test_4651()
-		{
-		}
-		[TestMethod]
-		public void Test_4652()
-		{
-		}
-		[TestMethod]
-		public void Test_4653()
-		{
-		}
-		[TestMethod]
-		public void Test_4654()
-		{
-		}
-		[TestMethod]
-		public void Test_4655()
-		{
-		}
-		[TestMethod]
-		public void Test_4656()
-		{
-		}
-		[TestMethod]
-		public void Test_4657()
-		{
-		}
-		[TestMethod]
-		public void Test_4658()
-		{
-		}
-		[TestMethod]
-		public void Test_4659()
-		{
-		}
-		[TestMethod]
-		public void Test_4660()
-		{
-		}
-		[TestMethod]
-		public void Test_4661()
-		{
-		}
-		[TestMethod]
-		public void Test_4662()
-		{
-		}
-		[TestMethod]
-		public void Test_4663()
-		{
-		}
-		[TestMethod]
-		public void Test_4664()
-		{
-		}
-		[TestMethod]
-		public void Test_4665()
-		{
-		}
-		[TestMethod]
-		public void Test_4666()
-		{
-		}
-		[TestMethod]
-		public void Test_4667()
-		{
-		}
-		[TestMethod]
-		public void Test_4668()
-		{
-		}
-		[TestMethod]
-		public void Test_4669()
-		{
-		}
-		[TestMethod]
-		public void Test_4670()
-		{
-		}
-		[TestMethod]
-		public void Test_4671()
-		{
-		}
-		[TestMethod]
-		public void Test_4672()
-		{
-		}
-		[TestMethod]
-		public void Test_4673()
-		{
-		}
-		[TestMethod]
-		public void Test_4674()
-		{
-		}
-		[TestMethod]
-		public void Test_4675()
-		{
-		}
-		[TestMethod]
-		public void Test_4676()
-		{
-		}
-		[TestMethod]
-		public void Test_4677()
-		{
-		}
-		[TestMethod]
-		public void Test_4678()
-		{
-		}
-		[TestMethod]
-		public void Test_4679()
-		{
-		}
-		[TestMethod]
-		public void Test_4680()
-		{
-		}
-		[TestMethod]
-		public void Test_4681()
-		{
-		}
-		[TestMethod]
-		public void Test_4682()
-		{
-		}
-		[TestMethod]
-		public void Test_4683()
-		{
-		}
-		[TestMethod]
-		public void Test_4684()
-		{
-		}
-		[TestMethod]
-		public void Test_4685()
-		{
-		}
-		[TestMethod]
-		public void Test_4686()
-		{
-		}
-		[TestMethod]
-		public void Test_4687()
-		{
-		}
-		[TestMethod]
-		public void Test_4688()
-		{
-		}
-		[TestMethod]
-		public void Test_4689()
-		{
-		}
-		[TestMethod]
-		public void Test_4690()
-		{
-		}
-		[TestMethod]
-		public void Test_4691()
-		{
-		}
-		[TestMethod]
-		public void Test_4692()
-		{
-		}
-		[TestMethod]
-		public void Test_4693()
-		{
-		}
-		[TestMethod]
-		public void Test_4694()
-		{
-		}
-		[TestMethod]
-		public void Test_4695()
-		{
-		}
-		[TestMethod]
-		public void Test_4696()
-		{
-		}
-		[TestMethod]
-		public void Test_4697()
-		{
-		}
-		[TestMethod]
-		public void Test_4698()
-		{
-		}
-		[TestMethod]
-		public void Test_4699()
-		{
-		}
-		[TestMethod]
-		public void Test_4700()
-		{
-		}
-		[TestMethod]
-		public void Test_4701()
-		{
-		}
-		[TestMethod]
-		public void Test_4702()
-		{
-		}
-		[TestMethod]
-		public void Test_4703()
-		{
-		}
-		[TestMethod]
-		public void Test_4704()
-		{
-		}
-		[TestMethod]
-		public void Test_4705()
-		{
-		}
-		[TestMethod]
-		public void Test_4706()
-		{
-		}
-		[TestMethod]
-		public void Test_4707()
-		{
-		}
-		[TestMethod]
-		public void Test_4708()
-		{
-		}
-		[TestMethod]
-		public void Test_4709()
-		{
-		}
-		[TestMethod]
-		public void Test_4710()
-		{
-		}
-		[TestMethod]
-		public void Test_4711()
-		{
-		}
-		[TestMethod]
-		public void Test_4712()
-		{
-		}
-		[TestMethod]
-		public void Test_4713()
-		{
-		}
-		[TestMethod]
-		public void Test_4714()
-		{
-		}
-		[TestMethod]
-		public void Test_4715()
-		{
-		}
-		[TestMethod]
-		public void Test_4716()
-		{
-		}
-		[TestMethod]
-		public void Test_4717()
-		{
-		}
-		[TestMethod]
-		public void Test_4718()
-		{
-		}
-		[TestMethod]
-		public void Test_4719()
-		{
-		}
-		[TestMethod]
-		public void Test_4720()
-		{
-		}
-		[TestMethod]
-		public void Test_4721()
-		{
-		}
-		[TestMethod]
-		public void Test_4722()
-		{
-		}
-		[TestMethod]
-		public void Test_4723()
-		{
-		}
-		[TestMethod]
-		public void Test_4724()
-		{
-		}
-		[TestMethod]
-		public void Test_4725()
-		{
-		}
-		[TestMethod]
-		public void Test_4726()
-		{
-		}
-		[TestMethod]
-		public void Test_4727()
-		{
-		}
-		[TestMethod]
-		public void Test_4728()
-		{
-		}
-		[TestMethod]
-		public void Test_4729()
-		{
-		}
-		[TestMethod]
-		public void Test_4730()
-		{
-		}
-		[TestMethod]
-		public void Test_4731()
-		{
-		}
-		[TestMethod]
-		public void Test_4732()
-		{
-		}
-		[TestMethod]
-		public void Test_4733()
-		{
-		}
-		[TestMethod]
-		public void Test_4734()
-		{
-		}
-		[TestMethod]
-		public void Test_4735()
-		{
-		}
-		[TestMethod]
-		public void Test_4736()
-		{
-		}
-		[TestMethod]
-		public void Test_4737()
-		{
-		}
-		[TestMethod]
-		public void Test_4738()
-		{
-		}
-		[TestMethod]
-		public void Test_4739()
-		{
-		}
-		[TestMethod]
-		public void Test_4740()
-		{
-		}
-		[TestMethod]
-		public void Test_4741()
-		{
-		}
-		[TestMethod]
-		public void Test_4742()
-		{
-		}
-		[TestMethod]
-		public void Test_4743()
-		{
-		}
-		[TestMethod]
-		public void Test_4744()
-		{
-		}
-		[TestMethod]
-		public void Test_4745()
-		{
-		}
-		[TestMethod]
-		public void Test_4746()
-		{
-		}
-		[TestMethod]
-		public void Test_4747()
-		{
-		}
-		[TestMethod]
-		public void Test_4748()
-		{
-		}
-		[TestMethod]
-		public void Test_4749()
-		{
-		}
-		[TestMethod]
-		public void Test_4750()
-		{
-		}
-		[TestMethod]
-		public void Test_4751()
-		{
-		}
-		[TestMethod]
-		public void Test_4752()
-		{
-		}
-		[TestMethod]
-		public void Test_4753()
-		{
-		}
-		[TestMethod]
-		public void Test_4754()
-		{
-		}
-		[TestMethod]
-		public void Test_4755()
-		{
-		}
-		[TestMethod]
-		public void Test_4756()
-		{
-		}
-		[TestMethod]
-		public void Test_4757()
-		{
-		}
-		[TestMethod]
-		public void Test_4758()
-		{
-		}
-		[TestMethod]
-		public void Test_4759()
-		{
-		}
-		[TestMethod]
-		public void Test_4760()
-		{
-		}
-		[TestMethod]
-		public void Test_4761()
-		{
-		}
-		[TestMethod]
-		public void Test_4762()
-		{
-		}
-		[TestMethod]
-		public void Test_4763()
-		{
-		}
-		[TestMethod]
-		public void Test_4764()
-		{
-		}
-		[TestMethod]
-		public void Test_4765()
-		{
-		}
-		[TestMethod]
-		public void Test_4766()
-		{
-		}
-		[TestMethod]
-		public void Test_4767()
-		{
-		}
-		[TestMethod]
-		public void Test_4768()
-		{
-		}
-		[TestMethod]
-		public void Test_4769()
-		{
-		}
-		[TestMethod]
-		public void Test_4770()
-		{
-		}
-		[TestMethod]
-		public void Test_4771()
-		{
-		}
-		[TestMethod]
-		public void Test_4772()
-		{
-		}
-		[TestMethod]
-		public void Test_4773()
-		{
-		}
-		[TestMethod]
-		public void Test_4774()
-		{
-		}
-		[TestMethod]
-		public void Test_4775()
-		{
-		}
-		[TestMethod]
-		public void Test_4776()
-		{
-		}
-		[TestMethod]
-		public void Test_4777()
-		{
-		}
-		[TestMethod]
-		public void Test_4778()
-		{
-		}
-		[TestMethod]
-		public void Test_4779()
-		{
-		}
-		[TestMethod]
-		public void Test_4780()
-		{
-		}
-		[TestMethod]
-		public void Test_4781()
-		{
-		}
-		[TestMethod]
-		public void Test_4782()
-		{
-		}
-		[TestMethod]
-		public void Test_4783()
-		{
-		}
-		[TestMethod]
-		public void Test_4784()
-		{
-		}
-		[TestMethod]
-		public void Test_4785()
-		{
-		}
-		[TestMethod]
-		public void Test_4786()
-		{
-		}
-		[TestMethod]
-		public void Test_4787()
-		{
-		}
-		[TestMethod]
-		public void Test_4788()
-		{
-		}
-		[TestMethod]
-		public void Test_4789()
-		{
-		}
-		[TestMethod]
-		public void Test_4790()
-		{
-		}
-		[TestMethod]
-		public void Test_4791()
-		{
-		}
-		[TestMethod]
-		public void Test_4792()
-		{
-		}
-		[TestMethod]
-		public void Test_4793()
-		{
-		}
-		[TestMethod]
-		public void Test_4794()
-		{
-		}
-		[TestMethod]
-		public void Test_4795()
-		{
-		}
-		[TestMethod]
-		public void Test_4796()
-		{
-		}
-		[TestMethod]
-		public void Test_4797()
-		{
-		}
-		[TestMethod]
-		public void Test_4798()
-		{
-		}
-		[TestMethod]
-		public void Test_4799()
-		{
-		}
-		[TestMethod]
-		public void Test_4800()
-		{
-		}
-		[TestMethod]
-		public void Test_4801()
-		{
-		}
-		[TestMethod]
-		public void Test_4802()
-		{
-		}
-		[TestMethod]
-		public void Test_4803()
-		{
-		}
-		[TestMethod]
-		public void Test_4804()
-		{
-		}
-		[TestMethod]
-		public void Test_4805()
-		{
-		}
-		[TestMethod]
-		public void Test_4806()
-		{
-		}
-		[TestMethod]
-		public void Test_4807()
-		{
-		}
-		[TestMethod]
-		public void Test_4808()
-		{
-		}
-		[TestMethod]
-		public void Test_4809()
-		{
-		}
-		[TestMethod]
-		public void Test_4810()
-		{
-		}
-		[TestMethod]
-		public void Test_4811()
-		{
-		}
-		[TestMethod]
-		public void Test_4812()
-		{
-		}
-		[TestMethod]
-		public void Test_4813()
-		{
-		}
-		[TestMethod]
-		public void Test_4814()
-		{
-		}
-		[TestMethod]
-		public void Test_4815()
-		{
-		}
-		[TestMethod]
-		public void Test_4816()
-		{
-		}
-		[TestMethod]
-		public void Test_4817()
-		{
-		}
-		[TestMethod]
-		public void Test_4818()
-		{
-		}
-		[TestMethod]
-		public void Test_4819()
-		{
-		}
-		[TestMethod]
-		public void Test_4820()
-		{
-		}
-		[TestMethod]
-		public void Test_4821()
-		{
-		}
-		[TestMethod]
-		public void Test_4822()
-		{
-		}
-		[TestMethod]
-		public void Test_4823()
-		{
-		}
-		[TestMethod]
-		public void Test_4824()
-		{
-		}
-		[TestMethod]
-		public void Test_4825()
-		{
-		}
-		[TestMethod]
-		public void Test_4826()
-		{
-		}
-		[TestMethod]
-		public void Test_4827()
-		{
-		}
-		[TestMethod]
-		public void Test_4828()
-		{
-		}
-		[TestMethod]
-		public void Test_4829()
-		{
-		}
-		[TestMethod]
-		public void Test_4830()
-		{
-		}
-		[TestMethod]
-		public void Test_4831()
-		{
-		}
-		[TestMethod]
-		public void Test_4832()
-		{
-		}
-		[TestMethod]
-		public void Test_4833()
-		{
-		}
-		[TestMethod]
-		public void Test_4834()
-		{
-		}
-		[TestMethod]
-		public void Test_4835()
-		{
-		}
-		[TestMethod]
-		public void Test_4836()
-		{
-		}
-		[TestMethod]
-		public void Test_4837()
-		{
-		}
-		[TestMethod]
-		public void Test_4838()
-		{
-		}
-		[TestMethod]
-		public void Test_4839()
-		{
-		}
-		[TestMethod]
-		public void Test_4840()
-		{
-		}
-		[TestMethod]
-		public void Test_4841()
-		{
-		}
-		[TestMethod]
-		public void Test_4842()
-		{
-		}
-		[TestMethod]
-		public void Test_4843()
-		{
-		}
-		[TestMethod]
-		public void Test_4844()
-		{
-		}
-		[TestMethod]
-		public void Test_4845()
-		{
-		}
-		[TestMethod]
-		public void Test_4846()
-		{
-		}
-		[TestMethod]
-		public void Test_4847()
-		{
-		}
-		[TestMethod]
-		public void Test_4848()
-		{
-		}
-		[TestMethod]
-		public void Test_4849()
-		{
-		}
-		[TestMethod]
-		public void Test_4850()
-		{
-		}
-		[TestMethod]
-		public void Test_4851()
-		{
-		}
-		[TestMethod]
-		public void Test_4852()
-		{
-		}
-		[TestMethod]
-		public void Test_4853()
-		{
-		}
-		[TestMethod]
-		public void Test_4854()
-		{
-		}
-		[TestMethod]
-		public void Test_4855()
-		{
-		}
-		[TestMethod]
-		public void Test_4856()
-		{
-		}
-		[TestMethod]
-		public void Test_4857()
-		{
-		}
-		[TestMethod]
-		public void Test_4858()
-		{
-		}
-		[TestMethod]
-		public void Test_4859()
-		{
-		}
-		[TestMethod]
-		public void Test_4860()
-		{
-		}
-		[TestMethod]
-		public void Test_4861()
-		{
-		}
-		[TestMethod]
-		public void Test_4862()
-		{
-		}
-		[TestMethod]
-		public void Test_4863()
-		{
-		}
-		[TestMethod]
-		public void Test_4864()
-		{
-		}
-		[TestMethod]
-		public void Test_4865()
-		{
-		}
-		[TestMethod]
-		public void Test_4866()
-		{
-		}
-		[TestMethod]
-		public void Test_4867()
-		{
-		}
-		[TestMethod]
-		public void Test_4868()
-		{
-		}
-		[TestMethod]
-		public void Test_4869()
-		{
-		}
-		[TestMethod]
-		public void Test_4870()
-		{
-		}
-		[TestMethod]
-		public void Test_4871()
-		{
-		}
-		[TestMethod]
-		public void Test_4872()
-		{
-		}
-		[TestMethod]
-		public void Test_4873()
-		{
-		}
-		[TestMethod]
-		public void Test_4874()
-		{
-		}
-		[TestMethod]
-		public void Test_4875()
-		{
-		}
-		[TestMethod]
-		public void Test_4876()
-		{
-		}
-		[TestMethod]
-		public void Test_4877()
-		{
-		}
-		[TestMethod]
-		public void Test_4878()
-		{
-		}
-		[TestMethod]
-		public void Test_4879()
-		{
-		}
-		[TestMethod]
-		public void Test_4880()
-		{
-		}
-		[TestMethod]
-		public void Test_4881()
-		{
-		}
-		[TestMethod]
-		public void Test_4882()
-		{
-		}
-		[TestMethod]
-		public void Test_4883()
-		{
-		}
-		[TestMethod]
-		public void Test_4884()
-		{
-		}
-		[TestMethod]
-		public void Test_4885()
-		{
-		}
-		[TestMethod]
-		public void Test_4886()
-		{
-		}
-		[TestMethod]
-		public void Test_4887()
-		{
-		}
-		[TestMethod]
-		public void Test_4888()
-		{
-		}
-		[TestMethod]
-		public void Test_4889()
-		{
-		}
-		[TestMethod]
-		public void Test_4890()
-		{
-		}
-		[TestMethod]
-		public void Test_4891()
-		{
-		}
-		[TestMethod]
-		public void Test_4892()
-		{
-		}
-		[TestMethod]
-		public void Test_4893()
-		{
-		}
-		[TestMethod]
-		public void Test_4894()
-		{
-		}
-		[TestMethod]
-		public void Test_4895()
-		{
-		}
-		[TestMethod]
-		public void Test_4896()
-		{
-		}
-		[TestMethod]
-		public void Test_4897()
-		{
-		}
-		[TestMethod]
-		public void Test_4898()
-		{
-		}
-		[TestMethod]
-		public void Test_4899()
-		{
-		}
-		[TestMethod]
-		public void Test_4900()
-		{
-		}
-		[TestMethod]
-		public void Test_4901()
-		{
-		}
-		[TestMethod]
-		public void Test_4902()
-		{
-		}
-		[TestMethod]
-		public void Test_4903()
-		{
-		}
-		[TestMethod]
-		public void Test_4904()
-		{
-		}
-		[TestMethod]
-		public void Test_4905()
-		{
-		}
-		[TestMethod]
-		public void Test_4906()
-		{
-		}
-		[TestMethod]
-		public void Test_4907()
-		{
-		}
-		[TestMethod]
-		public void Test_4908()
-		{
-		}
-		[TestMethod]
-		public void Test_4909()
-		{
-		}
-		[TestMethod]
-		public void Test_4910()
-		{
-		}
-		[TestMethod]
-		public void Test_4911()
-		{
-		}
-		[TestMethod]
-		public void Test_4912()
-		{
-		}
-		[TestMethod]
-		public void Test_4913()
-		{
-		}
-		[TestMethod]
-		public void Test_4914()
-		{
-		}
-		[TestMethod]
-		public void Test_4915()
-		{
-		}
-		[TestMethod]
-		public void Test_4916()
-		{
-		}
-		[TestMethod]
-		public void Test_4917()
-		{
-		}
-		[TestMethod]
-		public void Test_4918()
-		{
-		}
-		[TestMethod]
-		public void Test_4919()
-		{
-		}
-		[TestMethod]
-		public void Test_4920()
-		{
-		}
-		[TestMethod]
-		public void Test_4921()
-		{
-		}
-		[TestMethod]
-		public void Test_4922()
-		{
-		}
-		[TestMethod]
-		public void Test_4923()
-		{
-		}
-		[TestMethod]
-		public void Test_4924()
-		{
-		}
-		[TestMethod]
-		public void Test_4925()
-		{
-		}
-		[TestMethod]
-		public void Test_4926()
-		{
-		}
-		[TestMethod]
-		public void Test_4927()
-		{
-		}
-		[TestMethod]
-		public void Test_4928()
-		{
-		}
-		[TestMethod]
-		public void Test_4929()
-		{
-		}
-		[TestMethod]
-		public void Test_4930()
-		{
-		}
-		[TestMethod]
-		public void Test_4931()
-		{
-		}
-		[TestMethod]
-		public void Test_4932()
-		{
-		}
-		[TestMethod]
-		public void Test_4933()
-		{
-		}
-		[TestMethod]
-		public void Test_4934()
-		{
-		}
-		[TestMethod]
-		public void Test_4935()
-		{
-		}
-		[TestMethod]
-		public void Test_4936()
-		{
-		}
-		[TestMethod]
-		public void Test_4937()
-		{
-		}
-		[TestMethod]
-		public void Test_4938()
-		{
-		}
-		[TestMethod]
-		public void Test_4939()
-		{
-		}
-		[TestMethod]
-		public void Test_4940()
-		{
-		}
-		[TestMethod]
-		public void Test_4941()
-		{
-		}
-		[TestMethod]
-		public void Test_4942()
-		{
-		}
-		[TestMethod]
-		public void Test_4943()
-		{
-		}
-		[TestMethod]
-		public void Test_4944()
-		{
-		}
-		[TestMethod]
-		public void Test_4945()
-		{
-		}
-		[TestMethod]
-		public void Test_4946()
-		{
-		}
-		[TestMethod]
-		public void Test_4947()
-		{
-		}
-		[TestMethod]
-		public void Test_4948()
-		{
-		}
-		[TestMethod]
-		public void Test_4949()
-		{
-		}
-		[TestMethod]
-		public void Test_4950()
-		{
-		}
-		[TestMethod]
-		public void Test_4951()
-		{
-		}
-		[TestMethod]
-		public void Test_4952()
-		{
-		}
-		[TestMethod]
-		public void Test_4953()
-		{
-		}
-		[TestMethod]
-		public void Test_4954()
-		{
-		}
-		[TestMethod]
-		public void Test_4955()
-		{
-		}
-		[TestMethod]
-		public void Test_4956()
-		{
-		}
-		[TestMethod]
-		public void Test_4957()
-		{
-		}
-		[TestMethod]
-		public void Test_4958()
-		{
-		}
-		[TestMethod]
-		public void Test_4959()
-		{
-		}
-		[TestMethod]
-		public void Test_4960()
-		{
-		}
-		[TestMethod]
-		public void Test_4961()
-		{
-		}
-		[TestMethod]
-		public void Test_4962()
-		{
-		}
-		[TestMethod]
-		public void Test_4963()
-		{
-		}
-		[TestMethod]
-		public void Test_4964()
-		{
-		}
-		[TestMethod]
-		public void Test_4965()
-		{
-		}
-		[TestMethod]
-		public void Test_4966()
-		{
-		}
-		[TestMethod]
-		public void Test_4967()
-		{
-		}
-		[TestMethod]
-		public void Test_4968()
-		{
-		}
-		[TestMethod]
-		public void Test_4969()
-		{
-		}
-		[TestMethod]
-		public void Test_4970()
-		{
-		}
-		[TestMethod]
-		public void Test_4971()
-		{
-		}
-		[TestMethod]
-		public void Test_4972()
-		{
-		}
-		[TestMethod]
-		public void Test_4973()
-		{
-		}
-		[TestMethod]
-		public void Test_4974()
-		{
-		}
-		[TestMethod]
-		public void Test_4975()
-		{
-		}
-		[TestMethod]
-		public void Test_4976()
-		{
-		}
-		[TestMethod]
-		public void Test_4977()
-		{
-		}
-		[TestMethod]
-		public void Test_4978()
-		{
-		}
-		[TestMethod]
-		public void Test_4979()
-		{
-		}
-		[TestMethod]
-		public void Test_4980()
-		{
-		}
-		[TestMethod]
-		public void Test_4981()
-		{
-		}
-		[TestMethod]
-		public void Test_4982()
-		{
-		}
-		[TestMethod]
-		public void Test_4983()
-		{
-		}
-		[TestMethod]
-		public void Test_4984()
-		{
-		}
-		[TestMethod]
-		public void Test_4985()
-		{
-		}
-		[TestMethod]
-		public void Test_4986()
-		{
-		}
-		[TestMethod]
-		public void Test_4987()
-		{
-		}
-		[TestMethod]
-		public void Test_4988()
-		{
-		}
-		[TestMethod]
-		public void Test_4989()
-		{
-		}
-		[TestMethod]
-		public void Test_4990()
-		{
-		}
-		[TestMethod]
-		public void Test_4991()
-		{
-		}
-		[TestMethod]
-		public void Test_4992()
-		{
-		}
-		[TestMethod]
-		public void Test_4993()
-		{
-		}
-		[TestMethod]
-		public void Test_4994()
-		{
-		}
-		[TestMethod]
-		public void Test_4995()
-		{
-		}
-		[TestMethod]
-		public void Test_4996()
-		{
-		}
-		[TestMethod]
-		public void Test_4997()
-		{
-		}
-		[TestMethod]
-		public void Test_4998()
-		{
-		}
-		[TestMethod]
-		public void Test_4999()
-		{
-		}
-		[TestMethod]
-		public void Test_5000()
-		{
-		}
-		[TestMethod]
-		public void Test_5001()
-		{
-		}
-		[TestMethod]
-		public void Test_5002()
-		{
-		}
-		[TestMethod]
-		public void Test_5003()
-		{
-		}
-		[TestMethod]
-		public void Test_5004()
-		{
-		}
-		[TestMethod]
-		public void Test_5005()
-		{
-		}
-		[TestMethod]
-		public void Test_5006()
-		{
-		}
-		[TestMethod]
-		public void Test_5007()
-		{
-		}
-		[TestMethod]
-		public void Test_5008()
-		{
-		}
-		[TestMethod]
-		public void Test_5009()
-		{
-		}
-		[TestMethod]
-		public void Test_5010()
-		{
-		}
-		[TestMethod]
-		public void Test_5011()
-		{
-		}
-		[TestMethod]
-		public void Test_5012()
-		{
-		}
-		[TestMethod]
-		public void Test_5013()
-		{
-		}
-		[TestMethod]
-		public void Test_5014()
-		{
-		}
-		[TestMethod]
-		public void Test_5015()
-		{
-		}
-		[TestMethod]
-		public void Test_5016()
-		{
-		}
-		[TestMethod]
-		public void Test_5017()
-		{
-		}
-		[TestMethod]
-		public void Test_5018()
-		{
-		}
-		[TestMethod]
-		public void Test_5019()
-		{
-		}
-		[TestMethod]
-		public void Test_5020()
-		{
-		}
-		[TestMethod]
-		public void Test_5021()
-		{
-		}
-		[TestMethod]
-		public void Test_5022()
-		{
-		}
-		[TestMethod]
-		public void Test_5023()
-		{
-		}
-		[TestMethod]
-		public void Test_5024()
-		{
-		}
-		[TestMethod]
-		public void Test_5025()
-		{
-		}
-		[TestMethod]
-		public void Test_5026()
-		{
-		}
-		[TestMethod]
-		public void Test_5027()
-		{
-		}
-		[TestMethod]
-		public void Test_5028()
-		{
-		}
-		[TestMethod]
-		public void Test_5029()
-		{
-		}
-		[TestMethod]
-		public void Test_5030()
-		{
-		}
-		[TestMethod]
-		public void Test_5031()
-		{
-		}
-		[TestMethod]
-		public void Test_5032()
-		{
-		}
-		[TestMethod]
-		public void Test_5033()
-		{
-		}
-		[TestMethod]
-		public void Test_5034()
-		{
-		}
-		[TestMethod]
-		public void Test_5035()
-		{
-		}
-		[TestMethod]
-		public void Test_5036()
-		{
-		}
-		[TestMethod]
-		public void Test_5037()
-		{
-		}
-		[TestMethod]
-		public void Test_5038()
-		{
-		}
-		[TestMethod]
-		public void Test_5039()
-		{
-		}
-		[TestMethod]
-		public void Test_5040()
-		{
-		}
-		[TestMethod]
-		public void Test_5041()
-		{
-		}
-		[TestMethod]
-		public void Test_5042()
-		{
-		}
-		[TestMethod]
-		public void Test_5043()
-		{
-		}
-		[TestMethod]
-		public void Test_5044()
-		{
-		}
-		[TestMethod]
-		public void Test_5045()
-		{
-		}
-		[TestMethod]
-		public void Test_5046()
-		{
-		}
-		[TestMethod]
-		public void Test_5047()
-		{
-		}
-		[TestMethod]
-		public void Test_5048()
-		{
-		}
-		[TestMethod]
-		public void Test_5049()
-		{
-		}
-		[TestMethod]
-		public void Test_5050()
-		{
-		}
-		[TestMethod]
-		public void Test_5051()
-		{
-		}
-		[TestMethod]
-		public void Test_5052()
-		{
-		}
-		[TestMethod]
-		public void Test_5053()
-		{
-		}
-		[TestMethod]
-		public void Test_5054()
-		{
-		}
-		[TestMethod]
-		public void Test_5055()
-		{
-		}
-		[TestMethod]
-		public void Test_5056()
-		{
-		}
-		[TestMethod]
-		public void Test_5057()
-		{
-		}
-		[TestMethod]
-		public void Test_5058()
-		{
-		}
-		[TestMethod]
-		public void Test_5059()
-		{
-		}
-		[TestMethod]
-		public void Test_5060()
-		{
-		}
-		[TestMethod]
-		public void Test_5061()
-		{
-		}
-		[TestMethod]
-		public void Test_5062()
-		{
-		}
-		[TestMethod]
-		public void Test_5063()
-		{
-		}
-		[TestMethod]
-		public void Test_5064()
-		{
-		}
-		[TestMethod]
-		public void Test_5065()
-		{
-		}
-		[TestMethod]
-		public void Test_5066()
-		{
-		}
-		[TestMethod]
-		public void Test_5067()
-		{
-		}
-		[TestMethod]
-		public void Test_5068()
-		{
-		}
-		[TestMethod]
-		public void Test_5069()
-		{
-		}
-		[TestMethod]
-		public void Test_5070()
-		{
-		}
-		[TestMethod]
-		public void Test_5071()
-		{
-		}
-		[TestMethod]
-		public void Test_5072()
-		{
-		}
-		[TestMethod]
-		public void Test_5073()
-		{
-		}
-		[TestMethod]
-		public void Test_5074()
-		{
-		}
-		[TestMethod]
-		public void Test_5075()
-		{
-		}
-		[TestMethod]
-		public void Test_5076()
-		{
-		}
-		[TestMethod]
-		public void Test_5077()
-		{
-		}
-		[TestMethod]
-		public void Test_5078()
-		{
-		}
-		[TestMethod]
-		public void Test_5079()
-		{
-		}
-		[TestMethod]
-		public void Test_5080()
-		{
-		}
-		[TestMethod]
-		public void Test_5081()
-		{
-		}
-		[TestMethod]
-		public void Test_5082()
-		{
-		}
-		[TestMethod]
-		public void Test_5083()
-		{
-		}
-		[TestMethod]
-		public void Test_5084()
-		{
-		}
-		[TestMethod]
-		public void Test_5085()
-		{
-		}
-		[TestMethod]
-		public void Test_5086()
-		{
-		}
-		[TestMethod]
-		public void Test_5087()
-		{
-		}
-		[TestMethod]
-		public void Test_5088()
-		{
-		}
-		[TestMethod]
-		public void Test_5089()
-		{
-		}
-		[TestMethod]
-		public void Test_5090()
-		{
-		}
-		[TestMethod]
-		public void Test_5091()
-		{
-		}
-		[TestMethod]
-		public void Test_5092()
-		{
-		}
-		[TestMethod]
-		public void Test_5093()
-		{
-		}
-		[TestMethod]
-		public void Test_5094()
-		{
-		}
-		[TestMethod]
-		public void Test_5095()
-		{
-		}
-		[TestMethod]
-		public void Test_5096()
-		{
-		}
-		[TestMethod]
-		public void Test_5097()
-		{
-		}
-		[TestMethod]
-		public void Test_5098()
-		{
-		}
-		[TestMethod]
-		public void Test_5099()
-		{
-		}
-		[TestMethod]
-		public void Test_5100()
-		{
-		}
-		[TestMethod]
-		public void Test_5101()
-		{
-		}
-		[TestMethod]
-		public void Test_5102()
-		{
-		}
-		[TestMethod]
-		public void Test_5103()
-		{
-		}
-		[TestMethod]
-		public void Test_5104()
-		{
-		}
-		[TestMethod]
-		public void Test_5105()
-		{
-		}
-		[TestMethod]
-		public void Test_5106()
-		{
-		}
-		[TestMethod]
-		public void Test_5107()
-		{
-		}
-		[TestMethod]
-		public void Test_5108()
-		{
-		}
-		[TestMethod]
-		public void Test_5109()
-		{
-		}
-		[TestMethod]
-		public void Test_5110()
-		{
-		}
-		[TestMethod]
-		public void Test_5111()
-		{
-		}
-		[TestMethod]
-		public void Test_5112()
-		{
-		}
-		[TestMethod]
-		public void Test_5113()
-		{
-		}
-		[TestMethod]
-		public void Test_5114()
-		{
-		}
-		[TestMethod]
-		public void Test_5115()
-		{
-		}
-		[TestMethod]
-		public void Test_5116()
-		{
-		}
-		[TestMethod]
-		public void Test_5117()
-		{
-		}
-		[TestMethod]
-		public void Test_5118()
-		{
-		}
-		[TestMethod]
-		public void Test_5119()
-		{
-		}
-		[TestMethod]
-		public void Test_5120()
-		{
-		}
-		[TestMethod]
-		public void Test_5121()
-		{
-		}
-		[TestMethod]
-		public void Test_5122()
-		{
-		}
-		[TestMethod]
-		public void Test_5123()
-		{
-		}
-		[TestMethod]
-		public void Test_5124()
-		{
-		}
-		[TestMethod]
-		public void Test_5125()
-		{
-		}
-		[TestMethod]
-		public void Test_5126()
-		{
-		}
-		[TestMethod]
-		public void Test_5127()
-		{
-		}
-		[TestMethod]
-		public void Test_5128()
-		{
-		}
-		[TestMethod]
-		public void Test_5129()
-		{
-		}
-		[TestMethod]
-		public void Test_5130()
-		{
-		}
-		[TestMethod]
-		public void Test_5131()
-		{
-		}
-		[TestMethod]
-		public void Test_5132()
-		{
-		}
-		[TestMethod]
-		public void Test_5133()
-		{
-		}
-		[TestMethod]
-		public void Test_5134()
-		{
-		}
-		[TestMethod]
-		public void Test_5135()
-		{
-		}
-		[TestMethod]
-		public void Test_5136()
-		{
-		}
-		[TestMethod]
-		public void Test_5137()
-		{
-		}
-		[TestMethod]
-		public void Test_5138()
-		{
-		}
-		[TestMethod]
-		public void Test_5139()
-		{
-		}
-		[TestMethod]
-		public void Test_5140()
-		{
-		}
-		[TestMethod]
-		public void Test_5141()
-		{
-		}
-		[TestMethod]
-		public void Test_5142()
-		{
-		}
-		[TestMethod]
-		public void Test_5143()
-		{
-		}
-		[TestMethod]
-		public void Test_5144()
-		{
-		}
-		[TestMethod]
-		public void Test_5145()
-		{
-		}
-		[TestMethod]
-		public void Test_5146()
-		{
-		}
-		[TestMethod]
-		public void Test_5147()
-		{
-		}
-		[TestMethod]
-		public void Test_5148()
-		{
-		}
-		[TestMethod]
-		public void Test_5149()
-		{
-		}
-		[TestMethod]
-		public void Test_5150()
-		{
-		}
-		[TestMethod]
-		public void Test_5151()
-		{
-		}
-		[TestMethod]
-		public void Test_5152()
-		{
-		}
-		[TestMethod]
-		public void Test_5153()
-		{
-		}
-		[TestMethod]
-		public void Test_5154()
-		{
-		}
-		[TestMethod]
-		public void Test_5155()
-		{
-		}
-		[TestMethod]
-		public void Test_5156()
-		{
-		}
-		[TestMethod]
-		public void Test_5157()
-		{
-		}
-		[TestMethod]
-		public void Test_5158()
-		{
-		}
-		[TestMethod]
-		public void Test_5159()
-		{
-		}
-		[TestMethod]
-		public void Test_5160()
-		{
-		}
-		[TestMethod]
-		public void Test_5161()
-		{
-		}
-		[TestMethod]
-		public void Test_5162()
-		{
-		}
-		[TestMethod]
-		public void Test_5163()
-		{
-		}
-		[TestMethod]
-		public void Test_5164()
-		{
-		}
-		[TestMethod]
-		public void Test_5165()
-		{
-		}
-		[TestMethod]
-		public void Test_5166()
-		{
-		}
-		[TestMethod]
-		public void Test_5167()
-		{
-		}
-		[TestMethod]
-		public void Test_5168()
-		{
-		}
-		[TestMethod]
-		public void Test_5169()
-		{
-		}
-		[TestMethod]
-		public void Test_5170()
-		{
-		}
-		[TestMethod]
-		public void Test_5171()
-		{
-		}
-		[TestMethod]
-		public void Test_5172()
-		{
-		}
-		[TestMethod]
-		public void Test_5173()
-		{
-		}
-		[TestMethod]
-		public void Test_5174()
-		{
-		}
-		[TestMethod]
-		public void Test_5175()
-		{
-		}
-		[TestMethod]
-		public void Test_5176()
-		{
-		}
-		[TestMethod]
-		public void Test_5177()
-		{
-		}
-		[TestMethod]
-		public void Test_5178()
-		{
-		}
-		[TestMethod]
-		public void Test_5179()
-		{
-		}
-		[TestMethod]
-		public void Test_5180()
-		{
-		}
-		[TestMethod]
-		public void Test_5181()
-		{
-		}
-		[TestMethod]
-		public void Test_5182()
-		{
-		}
-		[TestMethod]
-		public void Test_5183()
-		{
-		}
-		[TestMethod]
-		public void Test_5184()
-		{
-		}
-		[TestMethod]
-		public void Test_5185()
-		{
-		}
-		[TestMethod]
-		public void Test_5186()
-		{
-		}
-		[TestMethod]
-		public void Test_5187()
-		{
-		}
-		[TestMethod]
-		public void Test_5188()
-		{
-		}
-		[TestMethod]
-		public void Test_5189()
-		{
-		}
-		[TestMethod]
-		public void Test_5190()
-		{
-		}
-		[TestMethod]
-		public void Test_5191()
-		{
-		}
-		[TestMethod]
-		public void Test_5192()
-		{
-		}
-		[TestMethod]
-		public void Test_5193()
-		{
-		}
-		[TestMethod]
-		public void Test_5194()
-		{
-		}
-		[TestMethod]
-		public void Test_5195()
-		{
-		}
-		[TestMethod]
-		public void Test_5196()
-		{
-		}
-		[TestMethod]
-		public void Test_5197()
-		{
-		}
-		[TestMethod]
-		public void Test_5198()
-		{
-		}
-		[TestMethod]
-		public void Test_5199()
-		{
-		}
-		[TestMethod]
-		public void Test_5200()
-		{
-		}
-		[TestMethod]
-		public void Test_5201()
-		{
-		}
-		[TestMethod]
-		public void Test_5202()
-		{
-		}
-		[TestMethod]
-		public void Test_5203()
-		{
-		}
-		[TestMethod]
-		public void Test_5204()
-		{
-		}
-		[TestMethod]
-		public void Test_5205()
-		{
-		}
-		[TestMethod]
-		public void Test_5206()
-		{
-		}
-		[TestMethod]
-		public void Test_5207()
-		{
-		}
-		[TestMethod]
-		public void Test_5208()
-		{
-		}
-		[TestMethod]
-		public void Test_5209()
-		{
-		}
-		[TestMethod]
-		public void Test_5210()
-		{
-		}
-		[TestMethod]
-		public void Test_5211()
-		{
-		}
-		[TestMethod]
-		public void Test_5212()
-		{
-		}
-		[TestMethod]
-		public void Test_5213()
-		{
-		}
-		[TestMethod]
-		public void Test_5214()
-		{
-		}
-		[TestMethod]
-		public void Test_5215()
-		{
-		}
-		[TestMethod]
-		public void Test_5216()
-		{
-		}
-		[TestMethod]
-		public void Test_5217()
-		{
-		}
-		[TestMethod]
-		public void Test_5218()
-		{
-		}
-		[TestMethod]
-		public void Test_5219()
-		{
-		}
-		[TestMethod]
-		public void Test_5220()
-		{
-		}
-		[TestMethod]
-		public void Test_5221()
-		{
-		}
-		[TestMethod]
-		public void Test_5222()
-		{
-		}
-		[TestMethod]
-		public void Test_5223()
-		{
-		}
-		[TestMethod]
-		public void Test_5224()
-		{
-		}
-		[TestMethod]
-		public void Test_5225()
-		{
-		}
-		[TestMethod]
-		public void Test_5226()
-		{
-		}
-		[TestMethod]
-		public void Test_5227()
-		{
-		}
-		[TestMethod]
-		public void Test_5228()
-		{
-		}
-		[TestMethod]
-		public void Test_5229()
-		{
-		}
-		[TestMethod]
-		public void Test_5230()
-		{
-		}
-		[TestMethod]
-		public void Test_5231()
-		{
-		}
-		[TestMethod]
-		public void Test_5232()
-		{
-		}
-		[TestMethod]
-		public void Test_5233()
-		{
-		}
-		[TestMethod]
-		public void Test_5234()
-		{
-		}
-		[TestMethod]
-		public void Test_5235()
-		{
-		}
-		[TestMethod]
-		public void Test_5236()
-		{
-		}
-		[TestMethod]
-		public void Test_5237()
-		{
-		}
-		[TestMethod]
-		public void Test_5238()
-		{
-		}
-		[TestMethod]
-		public void Test_5239()
-		{
-		}
-		[TestMethod]
-		public void Test_5240()
-		{
-		}
-		[TestMethod]
-		public void Test_5241()
-		{
-		}
-		[TestMethod]
-		public void Test_5242()
-		{
-		}
-		[TestMethod]
-		public void Test_5243()
-		{
-		}
-		[TestMethod]
-		public void Test_5244()
-		{
-		}
-		[TestMethod]
-		public void Test_5245()
-		{
-		}
-		[TestMethod]
-		public void Test_5246()
-		{
-		}
-		[TestMethod]
-		public void Test_5247()
-		{
-		}
-		[TestMethod]
-		public void Test_5248()
-		{
-		}
-		[TestMethod]
-		public void Test_5249()
-		{
-		}
-		[TestMethod]
-		public void Test_5250()
-		{
-		}
-		[TestMethod]
-		public void Test_5251()
-		{
-		}
-		[TestMethod]
-		public void Test_5252()
-		{
-		}
-		[TestMethod]
-		public void Test_5253()
-		{
-		}
-		[TestMethod]
-		public void Test_5254()
-		{
-		}
-		[TestMethod]
-		public void Test_5255()
-		{
-		}
-		[TestMethod]
-		public void Test_5256()
-		{
-		}
-		[TestMethod]
-		public void Test_5257()
-		{
-		}
-		[TestMethod]
-		public void Test_5258()
-		{
-		}
-		[TestMethod]
-		public void Test_5259()
-		{
-		}
-		[TestMethod]
-		public void Test_5260()
-		{
-		}
-		[TestMethod]
-		public void Test_5261()
-		{
-		}
-		[TestMethod]
-		public void Test_5262()
-		{
-		}
-		[TestMethod]
-		public void Test_5263()
-		{
-		}
-		[TestMethod]
-		public void Test_5264()
-		{
-		}
-		[TestMethod]
-		public void Test_5265()
-		{
-		}
-		[TestMethod]
-		public void Test_5266()
-		{
-		}
-		[TestMethod]
-		public void Test_5267()
-		{
-		}
-		[TestMethod]
-		public void Test_5268()
-		{
-		}
-		[TestMethod]
-		public void Test_5269()
-		{
-		}
-		[TestMethod]
-		public void Test_5270()
-		{
-		}
-		[TestMethod]
-		public void Test_5271()
-		{
-		}
-		[TestMethod]
-		public void Test_5272()
-		{
-		}
-		[TestMethod]
-		public void Test_5273()
-		{
-		}
-		[TestMethod]
-		public void Test_5274()
-		{
-		}
-		[TestMethod]
-		public void Test_5275()
-		{
-		}
-		[TestMethod]
-		public void Test_5276()
-		{
-		}
-		[TestMethod]
-		public void Test_5277()
-		{
-		}
-		[TestMethod]
-		public void Test_5278()
-		{
-		}
-		[TestMethod]
-		public void Test_5279()
-		{
-		}
-		[TestMethod]
-		public void Test_5280()
-		{
-		}
-		[TestMethod]
-		public void Test_5281()
-		{
-		}
-		[TestMethod]
-		public void Test_5282()
-		{
-		}
-		[TestMethod]
-		public void Test_5283()
-		{
-		}
-		[TestMethod]
-		public void Test_5284()
-		{
-		}
-		[TestMethod]
-		public void Test_5285()
-		{
-		}
-		[TestMethod]
-		public void Test_5286()
-		{
-		}
-		[TestMethod]
-		public void Test_5287()
-		{
-		}
-		[TestMethod]
-		public void Test_5288()
-		{
-		}
-		[TestMethod]
-		public void Test_5289()
-		{
-		}
-		[TestMethod]
-		public void Test_5290()
-		{
-		}
-		[TestMethod]
-		public void Test_5291()
-		{
-		}
-		[TestMethod]
-		public void Test_5292()
-		{
-		}
-		[TestMethod]
-		public void Test_5293()
-		{
-		}
-		[TestMethod]
-		public void Test_5294()
-		{
-		}
-		[TestMethod]
-		public void Test_5295()
-		{
-		}
-		[TestMethod]
-		public void Test_5296()
-		{
-		}
-		[TestMethod]
-		public void Test_5297()
-		{
-		}
-		[TestMethod]
-		public void Test_5298()
-		{
-		}
-		[TestMethod]
-		public void Test_5299()
-		{
-		}
-		[TestMethod]
-		public void Test_5300()
-		{
-		}
-		[TestMethod]
-		public void Test_5301()
-		{
-		}
-		[TestMethod]
-		public void Test_5302()
-		{
-		}
-		[TestMethod]
-		public void Test_5303()
-		{
-		}
-		[TestMethod]
-		public void Test_5304()
-		{
-		}
-		[TestMethod]
-		public void Test_5305()
-		{
-		}
-		[TestMethod]
-		public void Test_5306()
-		{
-		}
-		[TestMethod]
-		public void Test_5307()
-		{
-		}
-		[TestMethod]
-		public void Test_5308()
-		{
-		}
-		[TestMethod]
-		public void Test_5309()
-		{
-		}
-		[TestMethod]
-		public void Test_5310()
-		{
-		}
-		[TestMethod]
-		public void Test_5311()
-		{
-		}
-		[TestMethod]
-		public void Test_5312()
-		{
-		}
-		[TestMethod]
-		public void Test_5313()
-		{
-		}
-		[TestMethod]
-		public void Test_5314()
-		{
-		}
-		[TestMethod]
-		public void Test_5315()
-		{
-		}
-		[TestMethod]
-		public void Test_5316()
-		{
-		}
-		[TestMethod]
-		public void Test_5317()
-		{
-		}
-		[TestMethod]
-		public void Test_5318()
-		{
-		}
-		[TestMethod]
-		public void Test_5319()
-		{
-		}
-		[TestMethod]
-		public void Test_5320()
-		{
-		}
-		[TestMethod]
-		public void Test_5321()
-		{
-		}
-		[TestMethod]
-		public void Test_5322()
-		{
-		}
-		[TestMethod]
-		public void Test_5323()
-		{
-		}
-		[TestMethod]
-		public void Test_5324()
-		{
-		}
-		[TestMethod]
-		public void Test_5325()
-		{
-		}
-		[TestMethod]
-		public void Test_5326()
-		{
-		}
-		[TestMethod]
-		public void Test_5327()
-		{
-		}
-		[TestMethod]
-		public void Test_5328()
-		{
-		}
-		[TestMethod]
-		public void Test_5329()
-		{
-		}
-		[TestMethod]
-		public void Test_5330()
-		{
-		}
-		[TestMethod]
-		public void Test_5331()
-		{
-		}
-		[TestMethod]
-		public void Test_5332()
-		{
-		}
-		[TestMethod]
-		public void Test_5333()
-		{
-		}
-		[TestMethod]
-		public void Test_5334()
-		{
-		}
-		[TestMethod]
-		public void Test_5335()
-		{
-		}
-		[TestMethod]
-		public void Test_5336()
-		{
-		}
-		[TestMethod]
-		public void Test_5337()
-		{
-		}
-		[TestMethod]
-		public void Test_5338()
-		{
-		}
-		[TestMethod]
-		public void Test_5339()
-		{
-		}
-		[TestMethod]
-		public void Test_5340()
-		{
-		}
-		[TestMethod]
-		public void Test_5341()
-		{
-		}
-		[TestMethod]
-		public void Test_5342()
-		{
-		}
-		[TestMethod]
-		public void Test_5343()
-		{
-		}
-		[TestMethod]
-		public void Test_5344()
-		{
-		}
-		[TestMethod]
-		public void Test_5345()
-		{
-		}
-		[TestMethod]
-		public void Test_5346()
-		{
-		}
-		[TestMethod]
-		public void Test_5347()
-		{
-		}
-		[TestMethod]
-		public void Test_5348()
-		{
-		}
-		[TestMethod]
-		public void Test_5349()
-		{
-		}
-		[TestMethod]
-		public void Test_5350()
-		{
-		}
-		[TestMethod]
-		public void Test_5351()
-		{
-		}
-		[TestMethod]
-		public void Test_5352()
-		{
-		}
-		[TestMethod]
-		public void Test_5353()
-		{
-		}
-		[TestMethod]
-		public void Test_5354()
-		{
-		}
-		[TestMethod]
-		public void Test_5355()
-		{
-		}
-		[TestMethod]
-		public void Test_5356()
-		{
-		}
-		[TestMethod]
-		public void Test_5357()
-		{
-		}
-		[TestMethod]
-		public void Test_5358()
-		{
-		}
-		[TestMethod]
-		public void Test_5359()
-		{
-		}
-		[TestMethod]
-		public void Test_5360()
-		{
-		}
-		[TestMethod]
-		public void Test_5361()
-		{
-		}
-		[TestMethod]
-		public void Test_5362()
-		{
-		}
-		[TestMethod]
-		public void Test_5363()
-		{
-		}
-		[TestMethod]
-		public void Test_5364()
-		{
-		}
-		[TestMethod]
-		public void Test_5365()
-		{
-		}
-		[TestMethod]
-		public void Test_5366()
-		{
-		}
-		[TestMethod]
-		public void Test_5367()
-		{
-		}
-		[TestMethod]
-		public void Test_5368()
-		{
-		}
-		[TestMethod]
-		public void Test_5369()
-		{
-		}
-		[TestMethod]
-		public void Test_5370()
-		{
-		}
-		[TestMethod]
-		public void Test_5371()
-		{
-		}
-		[TestMethod]
-		public void Test_5372()
-		{
-		}
-		[TestMethod]
-		public void Test_5373()
-		{
-		}
-		[TestMethod]
-		public void Test_5374()
-		{
-		}
-		[TestMethod]
-		public void Test_5375()
-		{
-		}
-		[TestMethod]
-		public void Test_5376()
-		{
-		}
-		[TestMethod]
-		public void Test_5377()
-		{
-		}
-		[TestMethod]
-		public void Test_5378()
-		{
-		}
-		[TestMethod]
-		public void Test_5379()
-		{
-		}
-		[TestMethod]
-		public void Test_5380()
-		{
-		}
-		[TestMethod]
-		public void Test_5381()
-		{
-		}
-		[TestMethod]
-		public void Test_5382()
-		{
-		}
-		[TestMethod]
-		public void Test_5383()
-		{
-		}
-		[TestMethod]
-		public void Test_5384()
-		{
-		}
-		[TestMethod]
-		public void Test_5385()
-		{
-		}
-		[TestMethod]
-		public void Test_5386()
-		{
-		}
-		[TestMethod]
-		public void Test_5387()
-		{
-		}
-		[TestMethod]
-		public void Test_5388()
-		{
-		}
-		[TestMethod]
-		public void Test_5389()
-		{
-		}
-		[TestMethod]
-		public void Test_5390()
-		{
-		}
-		[TestMethod]
-		public void Test_5391()
-		{
-		}
-		[TestMethod]
-		public void Test_5392()
-		{
-		}
-		[TestMethod]
-		public void Test_5393()
-		{
-		}
-		[TestMethod]
-		public void Test_5394()
-		{
-		}
-		[TestMethod]
-		public void Test_5395()
-		{
-		}
-		[TestMethod]
-		public void Test_5396()
-		{
-		}
-		[TestMethod]
-		public void Test_5397()
-		{
-		}
-		[TestMethod]
-		public void Test_5398()
-		{
-		}
-		[TestMethod]
-		public void Test_5399()
-		{
-		}
-		[TestMethod]
-		public void Test_5400()
-		{
-		}
-		[TestMethod]
-		public void Test_5401()
-		{
-		}
-		[TestMethod]
-		public void Test_5402()
-		{
-		}
-		[TestMethod]
-		public void Test_5403()
-		{
-		}
-		[TestMethod]
-		public void Test_5404()
-		{
-		}
-		[TestMethod]
-		public void Test_5405()
-		{
-		}
-		[TestMethod]
-		public void Test_5406()
-		{
-		}
-		[TestMethod]
-		public void Test_5407()
-		{
-		}
-		[TestMethod]
-		public void Test_5408()
-		{
-		}
-		[TestMethod]
-		public void Test_5409()
-		{
-		}
-		[TestMethod]
-		public void Test_5410()
-		{
-		}
-		[TestMethod]
-		public void Test_5411()
-		{
-		}
-		[TestMethod]
-		public void Test_5412()
-		{
-		}
-		[TestMethod]
-		public void Test_5413()
-		{
-		}
-		[TestMethod]
-		public void Test_5414()
-		{
-		}
-		[TestMethod]
-		public void Test_5415()
-		{
-		}
-		[TestMethod]
-		public void Test_5416()
-		{
-		}
-		[TestMethod]
-		public void Test_5417()
-		{
-		}
-		[TestMethod]
-		public void Test_5418()
-		{
-		}
-		[TestMethod]
-		public void Test_5419()
-		{
-		}
-		[TestMethod]
-		public void Test_5420()
-		{
-		}
-		[TestMethod]
-		public void Test_5421()
-		{
-		}
-		[TestMethod]
-		public void Test_5422()
-		{
-		}
-		[TestMethod]
-		public void Test_5423()
-		{
-		}
-		[TestMethod]
-		public void Test_5424()
-		{
-		}
-		[TestMethod]
-		public void Test_5425()
-		{
-		}
-		[TestMethod]
-		public void Test_5426()
-		{
-		}
-		[TestMethod]
-		public void Test_5427()
-		{
-		}
-		[TestMethod]
-		public void Test_5428()
-		{
-		}
-		[TestMethod]
-		public void Test_5429()
-		{
-		}
-		[TestMethod]
-		public void Test_5430()
-		{
-		}
-		[TestMethod]
-		public void Test_5431()
-		{
-		}
-		[TestMethod]
-		public void Test_5432()
-		{
-		}
-		[TestMethod]
-		public void Test_5433()
-		{
-		}
-		[TestMethod]
-		public void Test_5434()
-		{
-		}
-		[TestMethod]
-		public void Test_5435()
-		{
-		}
-		[TestMethod]
-		public void Test_5436()
-		{
-		}
-		[TestMethod]
-		public void Test_5437()
-		{
-		}
-		[TestMethod]
-		public void Test_5438()
-		{
-		}
-		[TestMethod]
-		public void Test_5439()
-		{
-		}
-		[TestMethod]
-		public void Test_5440()
-		{
-		}
-		[TestMethod]
-		public void Test_5441()
-		{
-		}
-		[TestMethod]
-		public void Test_5442()
-		{
-		}
-		[TestMethod]
-		public void Test_5443()
-		{
-		}
-		[TestMethod]
-		public void Test_5444()
-		{
-		}
-		[TestMethod]
-		public void Test_5445()
-		{
-		}
-		[TestMethod]
-		public void Test_5446()
-		{
-		}
-		[TestMethod]
-		public void Test_5447()
-		{
-		}
-		[TestMethod]
-		public void Test_5448()
-		{
-		}
-		[TestMethod]
-		public void Test_5449()
-		{
-		}
-		[TestMethod]
-		public void Test_5450()
-		{
-		}
-		[TestMethod]
-		public void Test_5451()
-		{
-		}
-		[TestMethod]
-		public void Test_5452()
-		{
-		}
-		[TestMethod]
-		public void Test_5453()
-		{
-		}
-		[TestMethod]
-		public void Test_5454()
-		{
-		}
-		[TestMethod]
-		public void Test_5455()
-		{
-		}
-		[TestMethod]
-		public void Test_5456()
-		{
-		}
-		[TestMethod]
-		public void Test_5457()
-		{
-		}
-		[TestMethod]
-		public void Test_5458()
-		{
-		}
-		[TestMethod]
-		public void Test_5459()
-		{
-		}
-		[TestMethod]
-		public void Test_5460()
-		{
-		}
-		[TestMethod]
-		public void Test_5461()
-		{
-		}
-		[TestMethod]
-		public void Test_5462()
-		{
-		}
-		[TestMethod]
-		public void Test_5463()
-		{
-		}
-		[TestMethod]
-		public void Test_5464()
-		{
-		}
-		[TestMethod]
-		public void Test_5465()
-		{
-		}
-		[TestMethod]
-		public void Test_5466()
-		{
-		}
-		[TestMethod]
-		public void Test_5467()
-		{
-		}
-		[TestMethod]
-		public void Test_5468()
-		{
-		}
-		[TestMethod]
-		public void Test_5469()
-		{
-		}
-		[TestMethod]
-		public void Test_5470()
-		{
-		}
-		[TestMethod]
-		public void Test_5471()
-		{
-		}
-		[TestMethod]
-		public void Test_5472()
-		{
-		}
-		[TestMethod]
-		public void Test_5473()
-		{
-		}
-		[TestMethod]
-		public void Test_5474()
-		{
-		}
-		[TestMethod]
-		public void Test_5475()
-		{
-		}
-		[TestMethod]
-		public void Test_5476()
-		{
-		}
-		[TestMethod]
-		public void Test_5477()
-		{
-		}
-		[TestMethod]
-		public void Test_5478()
-		{
-		}
-		[TestMethod]
-		public void Test_5479()
-		{
-		}
-		[TestMethod]
-		public void Test_5480()
-		{
-		}
-		[TestMethod]
-		public void Test_5481()
-		{
-		}
-		[TestMethod]
-		public void Test_5482()
-		{
-		}
-		[TestMethod]
-		public void Test_5483()
-		{
-		}
-		[TestMethod]
-		public void Test_5484()
-		{
-		}
-		[TestMethod]
-		public void Test_5485()
-		{
-		}
-		[TestMethod]
-		public void Test_5486()
-		{
-		}
-		[TestMethod]
-		public void Test_5487()
-		{
-		}
-		[TestMethod]
-		public void Test_5488()
-		{
-		}
-		[TestMethod]
-		public void Test_5489()
-		{
-		}
-		[TestMethod]
-		public void Test_5490()
-		{
-		}
-		[TestMethod]
-		public void Test_5491()
-		{
-		}
-		[TestMethod]
-		public void Test_5492()
-		{
-		}
-		[TestMethod]
-		public void Test_5493()
-		{
-		}
-		[TestMethod]
-		public void Test_5494()
-		{
-		}
-		[TestMethod]
-		public void Test_5495()
-		{
-		}
-		[TestMethod]
-		public void Test_5496()
-		{
-		}
-		[TestMethod]
-		public void Test_5497()
-		{
-		}
-		[TestMethod]
-		public void Test_5498()
-		{
-		}
-		[TestMethod]
-		public void Test_5499()
-		{
-		}
-		[TestMethod]
-		public void Test_5500()
-		{
-		}
-		[TestMethod]
-		public void Test_5501()
-		{
-		}
-		[TestMethod]
-		public void Test_5502()
-		{
-		}
-		[TestMethod]
-		public void Test_5503()
-		{
-		}
-		[TestMethod]
-		public void Test_5504()
-		{
-		}
-		[TestMethod]
-		public void Test_5505()
-		{
-		}
-		[TestMethod]
-		public void Test_5506()
-		{
-		}
-		[TestMethod]
-		public void Test_5507()
-		{
-		}
-		[TestMethod]
-		public void Test_5508()
-		{
-		}
-		[TestMethod]
-		public void Test_5509()
-		{
-		}
-		[TestMethod]
-		public void Test_5510()
-		{
-		}
-		[TestMethod]
-		public void Test_5511()
-		{
-		}
-		[TestMethod]
-		public void Test_5512()
-		{
-		}
-		[TestMethod]
-		public void Test_5513()
-		{
-		}
-		[TestMethod]
-		public void Test_5514()
-		{
-		}
-		[TestMethod]
-		public void Test_5515()
-		{
-		}
-		[TestMethod]
-		public void Test_5516()
-		{
-		}
-		[TestMethod]
-		public void Test_5517()
-		{
-		}
-		[TestMethod]
-		public void Test_5518()
-		{
-		}
-		[TestMethod]
-		public void Test_5519()
-		{
-		}
-		[TestMethod]
-		public void Test_5520()
-		{
-		}
-		[TestMethod]
-		public void Test_5521()
-		{
-		}
-		[TestMethod]
-		public void Test_5522()
-		{
-		}
-		[TestMethod]
-		public void Test_5523()
-		{
-		}
-		[TestMethod]
-		public void Test_5524()
-		{
-		}
-		[TestMethod]
-		public void Test_5525()
-		{
-		}
-		[TestMethod]
-		public void Test_5526()
-		{
-		}
-		[TestMethod]
-		public void Test_5527()
-		{
-		}
-		[TestMethod]
-		public void Test_5528()
-		{
-		}
-		[TestMethod]
-		public void Test_5529()
-		{
-		}
-		[TestMethod]
-		public void Test_5530()
-		{
-		}
-		[TestMethod]
-		public void Test_5531()
-		{
-		}
-		[TestMethod]
-		public void Test_5532()
-		{
-		}
-		[TestMethod]
-		public void Test_5533()
-		{
-		}
-		[TestMethod]
-		public void Test_5534()
-		{
-		}
-		[TestMethod]
-		public void Test_5535()
-		{
-		}
-		[TestMethod]
-		public void Test_5536()
-		{
-		}
-		[TestMethod]
-		public void Test_5537()
-		{
-		}
-		[TestMethod]
-		public void Test_5538()
-		{
-		}
-		[TestMethod]
-		public void Test_5539()
-		{
-		}
-		[TestMethod]
-		public void Test_5540()
-		{
-		}
-		[TestMethod]
-		public void Test_5541()
-		{
-		}
-		[TestMethod]
-		public void Test_5542()
-		{
-		}
-		[TestMethod]
-		public void Test_5543()
-		{
-		}
-		[TestMethod]
-		public void Test_5544()
-		{
-		}
-		[TestMethod]
-		public void Test_5545()
-		{
-		}
-		[TestMethod]
-		public void Test_5546()
-		{
-		}
-		[TestMethod]
-		public void Test_5547()
-		{
-		}
-		[TestMethod]
-		public void Test_5548()
-		{
-		}
-		[TestMethod]
-		public void Test_5549()
-		{
-		}
-		[TestMethod]
-		public void Test_5550()
-		{
-		}
-		[TestMethod]
-		public void Test_5551()
-		{
-		}
-		[TestMethod]
-		public void Test_5552()
-		{
-		}
-		[TestMethod]
-		public void Test_5553()
-		{
-		}
-		[TestMethod]
-		public void Test_5554()
-		{
-		}
-		[TestMethod]
-		public void Test_5555()
-		{
-		}
-		[TestMethod]
-		public void Test_5556()
-		{
-		}
-		[TestMethod]
-		public void Test_5557()
-		{
-		}
-		[TestMethod]
-		public void Test_5558()
-		{
-		}
-		[TestMethod]
-		public void Test_5559()
-		{
-		}
-		[TestMethod]
-		public void Test_5560()
-		{
-		}
-		[TestMethod]
-		public void Test_5561()
-		{
-		}
-		[TestMethod]
-		public void Test_5562()
-		{
-		}
-		[TestMethod]
-		public void Test_5563()
-		{
-		}
-		[TestMethod]
-		public void Test_5564()
-		{
-		}
-		[TestMethod]
-		public void Test_5565()
-		{
-		}
-		[TestMethod]
-		public void Test_5566()
-		{
-		}
-		[TestMethod]
-		public void Test_5567()
-		{
-		}
-		[TestMethod]
-		public void Test_5568()
-		{
-		}
-		[TestMethod]
-		public void Test_5569()
-		{
-		}
-		[TestMethod]
-		public void Test_5570()
-		{
-		}
-		[TestMethod]
-		public void Test_5571()
-		{
-		}
-		[TestMethod]
-		public void Test_5572()
-		{
-		}
-		[TestMethod]
-		public void Test_5573()
-		{
-		}
-		[TestMethod]
-		public void Test_5574()
-		{
-		}
-		[TestMethod]
-		public void Test_5575()
-		{
-		}
-		[TestMethod]
-		public void Test_5576()
-		{
-		}
-		[TestMethod]
-		public void Test_5577()
-		{
-		}
-		[TestMethod]
-		public void Test_5578()
-		{
-		}
-		[TestMethod]
-		public void Test_5579()
-		{
-		}
-		[TestMethod]
-		public void Test_5580()
-		{
-		}
-		[TestMethod]
-		public void Test_5581()
-		{
-		}
-		[TestMethod]
-		public void Test_5582()
-		{
-		}
-		[TestMethod]
-		public void Test_5583()
-		{
-		}
-		[TestMethod]
-		public void Test_5584()
-		{
-		}
-		[TestMethod]
-		public void Test_5585()
-		{
-		}
-		[TestMethod]
-		public void Test_5586()
-		{
-		}
-		[TestMethod]
-		public void Test_5587()
-		{
-		}
-		[TestMethod]
-		public void Test_5588()
-		{
-		}
-		[TestMethod]
-		public void Test_5589()
-		{
-		}
-		[TestMethod]
-		public void Test_5590()
-		{
-		}
-		[TestMethod]
-		public void Test_5591()
-		{
-		}
-		[TestMethod]
-		public void Test_5592()
-		{
-		}
-		[TestMethod]
-		public void Test_5593()
-		{
-		}
-		[TestMethod]
-		public void Test_5594()
-		{
-		}
-		[TestMethod]
-		public void Test_5595()
-		{
-		}
-		[TestMethod]
-		public void Test_5596()
-		{
-		}
-		[TestMethod]
-		public void Test_5597()
-		{
-		}
-		[TestMethod]
-		public void Test_5598()
-		{
-		}
-		[TestMethod]
-		public void Test_5599()
-		{
-		}
-		[TestMethod]
-		public void Test_5600()
-		{
-		}
-		[TestMethod]
-		public void Test_5601()
-		{
-		}
-		[TestMethod]
-		public void Test_5602()
-		{
-		}
-		[TestMethod]
-		public void Test_5603()
-		{
-		}
-		[TestMethod]
-		public void Test_5604()
-		{
-		}
-		[TestMethod]
-		public void Test_5605()
-		{
-		}
-		[TestMethod]
-		public void Test_5606()
-		{
-		}
-		[TestMethod]
-		public void Test_5607()
-		{
-		}
-		[TestMethod]
-		public void Test_5608()
-		{
-		}
-		[TestMethod]
-		public void Test_5609()
-		{
-		}
-		[TestMethod]
-		public void Test_5610()
-		{
-		}
-		[TestMethod]
-		public void Test_5611()
-		{
-		}
-		[TestMethod]
-		public void Test_5612()
-		{
-		}
-		[TestMethod]
-		public void Test_5613()
-		{
-		}
-		[TestMethod]
-		public void Test_5614()
-		{
-		}
-		[TestMethod]
-		public void Test_5615()
-		{
-		}
-		[TestMethod]
-		public void Test_5616()
-		{
-		}
-		[TestMethod]
-		public void Test_5617()
-		{
-		}
-		[TestMethod]
-		public void Test_5618()
-		{
-		}
-		[TestMethod]
-		public void Test_5619()
-		{
-		}
-		[TestMethod]
-		public void Test_5620()
-		{
-		}
-		[TestMethod]
-		public void Test_5621()
-		{
-		}
-		[TestMethod]
-		public void Test_5622()
-		{
-		}
-		[TestMethod]
-		public void Test_5623()
-		{
-		}
-		[TestMethod]
-		public void Test_5624()
-		{
-		}
-		[TestMethod]
-		public void Test_5625()
-		{
-		}
-		[TestMethod]
-		public void Test_5626()
-		{
-		}
-		[TestMethod]
-		public void Test_5627()
-		{
-		}
-		[TestMethod]
-		public void Test_5628()
-		{
-		}
-		[TestMethod]
-		public void Test_5629()
-		{
-		}
-		[TestMethod]
-		public void Test_5630()
-		{
-		}
-		[TestMethod]
-		public void Test_5631()
-		{
-		}
-		[TestMethod]
-		public void Test_5632()
-		{
-		}
-		[TestMethod]
-		public void Test_5633()
-		{
-		}
-		[TestMethod]
-		public void Test_5634()
-		{
-		}
-		[TestMethod]
-		public void Test_5635()
-		{
-		}
-		[TestMethod]
-		public void Test_5636()
-		{
-		}
-		[TestMethod]
-		public void Test_5637()
-		{
-		}
-		[TestMethod]
-		public void Test_5638()
-		{
-		}
-		[TestMethod]
-		public void Test_5639()
-		{
-		}
-		[TestMethod]
-		public void Test_5640()
-		{
-		}
-		[TestMethod]
-		public void Test_5641()
-		{
-		}
-		[TestMethod]
-		public void Test_5642()
-		{
-		}
-		[TestMethod]
-		public void Test_5643()
-		{
-		}
-		[TestMethod]
-		public void Test_5644()
-		{
-		}
-		[TestMethod]
-		public void Test_5645()
-		{
-		}
-		[TestMethod]
-		public void Test_5646()
-		{
-		}
-		[TestMethod]
-		public void Test_5647()
-		{
-		}
-		[TestMethod]
-		public void Test_5648()
-		{
-		}
-		[TestMethod]
-		public void Test_5649()
-		{
-		}
-		[TestMethod]
-		public void Test_5650()
-		{
-		}
-		[TestMethod]
-		public void Test_5651()
-		{
-		}
-		[TestMethod]
-		public void Test_5652()
-		{
-		}
-		[TestMethod]
-		public void Test_5653()
-		{
-		}
-		[TestMethod]
-		public void Test_5654()
-		{
-		}
-		[TestMethod]
-		public void Test_5655()
-		{
-		}
-		[TestMethod]
-		public void Test_5656()
-		{
-		}
-		[TestMethod]
-		public void Test_5657()
-		{
-		}
-		[TestMethod]
-		public void Test_5658()
-		{
-		}
-		[TestMethod]
-		public void Test_5659()
-		{
-		}
-		[TestMethod]
-		public void Test_5660()
-		{
-		}
-		[TestMethod]
-		public void Test_5661()
-		{
-		}
-		[TestMethod]
-		public void Test_5662()
-		{
-		}
-		[TestMethod]
-		public void Test_5663()
-		{
-		}
-		[TestMethod]
-		public void Test_5664()
-		{
-		}
-		[TestMethod]
-		public void Test_5665()
-		{
-		}
-		[TestMethod]
-		public void Test_5666()
-		{
-		}
-		[TestMethod]
-		public void Test_5667()
-		{
-		}
-		[TestMethod]
-		public void Test_5668()
-		{
-		}
-		[TestMethod]
-		public void Test_5669()
-		{
-		}
-		[TestMethod]
-		public void Test_5670()
-		{
-		}
-		[TestMethod]
-		public void Test_5671()
-		{
-		}
-		[TestMethod]
-		public void Test_5672()
-		{
-		}
-		[TestMethod]
-		public void Test_5673()
-		{
-		}
-		[TestMethod]
-		public void Test_5674()
-		{
-		}
-		[TestMethod]
-		public void Test_5675()
-		{
-		}
-		[TestMethod]
-		public void Test_5676()
-		{
-		}
-		[TestMethod]
-		public void Test_5677()
-		{
-		}
-		[TestMethod]
-		public void Test_5678()
-		{
-		}
-		[TestMethod]
-		public void Test_5679()
-		{
-		}
-		[TestMethod]
-		public void Test_5680()
-		{
-		}
-		[TestMethod]
-		public void Test_5681()
-		{
-		}
-		[TestMethod]
-		public void Test_5682()
-		{
-		}
-		[TestMethod]
-		public void Test_5683()
-		{
-		}
-		[TestMethod]
-		public void Test_5684()
-		{
-		}
-		[TestMethod]
-		public void Test_5685()
-		{
-		}
-		[TestMethod]
-		public void Test_5686()
-		{
-		}
-		[TestMethod]
-		public void Test_5687()
-		{
-		}
-		[TestMethod]
-		public void Test_5688()
-		{
-		}
-		[TestMethod]
-		public void Test_5689()
-		{
-		}
-		[TestMethod]
-		public void Test_5690()
-		{
-		}
-		[TestMethod]
-		public void Test_5691()
-		{
-		}
-		[TestMethod]
-		public void Test_5692()
-		{
-		}
-		[TestMethod]
-		public void Test_5693()
-		{
-		}
-		[TestMethod]
-		public void Test_5694()
-		{
-		}
-		[TestMethod]
-		public void Test_5695()
-		{
-		}
-		[TestMethod]
-		public void Test_5696()
-		{
-		}
-		[TestMethod]
-		public void Test_5697()
-		{
-		}
-		[TestMethod]
-		public void Test_5698()
-		{
-		}
-		[TestMethod]
-		public void Test_5699()
-		{
-		}
-		[TestMethod]
-		public void Test_5700()
-		{
-		}
-		[TestMethod]
-		public void Test_5701()
-		{
-		}
-		[TestMethod]
-		public void Test_5702()
-		{
-		}
-		[TestMethod]
-		public void Test_5703()
-		{
-		}
-		[TestMethod]
-		public void Test_5704()
-		{
-		}
-		[TestMethod]
-		public void Test_5705()
-		{
-		}
-		[TestMethod]
-		public void Test_5706()
-		{
-		}
-		[TestMethod]
-		public void Test_5707()
-		{
-		}
-		[TestMethod]
-		public void Test_5708()
-		{
-		}
-		[TestMethod]
-		public void Test_5709()
-		{
-		}
-		[TestMethod]
-		public void Test_5710()
-		{
-		}
-		[TestMethod]
-		public void Test_5711()
-		{
-		}
-		[TestMethod]
-		public void Test_5712()
-		{
-		}
-		[TestMethod]
-		public void Test_5713()
-		{
-		}
-		[TestMethod]
-		public void Test_5714()
-		{
-		}
-		[TestMethod]
-		public void Test_5715()
-		{
-		}
-		[TestMethod]
-		public void Test_5716()
-		{
-		}
-		[TestMethod]
-		public void Test_5717()
-		{
-		}
-		[TestMethod]
-		public void Test_5718()
-		{
-		}
-		[TestMethod]
-		public void Test_5719()
-		{
-		}
-		[TestMethod]
-		public void Test_5720()
-		{
-		}
-		[TestMethod]
-		public void Test_5721()
-		{
-		}
-		[TestMethod]
-		public void Test_5722()
-		{
-		}
-		[TestMethod]
-		public void Test_5723()
-		{
-		}
-		[TestMethod]
-		public void Test_5724()
-		{
-		}
-		[TestMethod]
-		public void Test_5725()
-		{
-		}
-		[TestMethod]
-		public void Test_5726()
-		{
-		}
-		[TestMethod]
-		public void Test_5727()
-		{
-		}
-		[TestMethod]
-		public void Test_5728()
-		{
-		}
-		[TestMethod]
-		public void Test_5729()
-		{
-		}
-		[TestMethod]
-		public void Test_5730()
-		{
-		}
-		[TestMethod]
-		public void Test_5731()
-		{
-		}
-		[TestMethod]
-		public void Test_5732()
-		{
-		}
-		[TestMethod]
-		public void Test_5733()
-		{
-		}
-		[TestMethod]
-		public void Test_5734()
-		{
-		}
-		[TestMethod]
-		public void Test_5735()
-		{
-		}
-		[TestMethod]
-		public void Test_5736()
-		{
-		}
-		[TestMethod]
-		public void Test_5737()
-		{
-		}
-		[TestMethod]
-		public void Test_5738()
-		{
-		}
-		[TestMethod]
-		public void Test_5739()
-		{
-		}
-		[TestMethod]
-		public void Test_5740()
-		{
-		}
-		[TestMethod]
-		public void Test_5741()
-		{
-		}
-		[TestMethod]
-		public void Test_5742()
-		{
-		}
-		[TestMethod]
-		public void Test_5743()
-		{
-		}
-		[TestMethod]
-		public void Test_5744()
-		{
-		}
-		[TestMethod]
-		public void Test_5745()
-		{
-		}
-		[TestMethod]
-		public void Test_5746()
-		{
-		}
-		[TestMethod]
-		public void Test_5747()
-		{
-		}
-		[TestMethod]
-		public void Test_5748()
-		{
-		}
-		[TestMethod]
-		public void Test_5749()
-		{
-		}
-		[TestMethod]
-		public void Test_5750()
-		{
-		}
-		[TestMethod]
-		public void Test_5751()
-		{
-		}
-		[TestMethod]
-		public void Test_5752()
-		{
-		}
-		[TestMethod]
-		public void Test_5753()
-		{
-		}
-		[TestMethod]
-		public void Test_5754()
-		{
-		}
-		[TestMethod]
-		public void Test_5755()
-		{
-		}
-		[TestMethod]
-		public void Test_5756()
-		{
-		}
-		[TestMethod]
-		public void Test_5757()
-		{
-		}
-		[TestMethod]
-		public void Test_5758()
-		{
-		}
-		[TestMethod]
-		public void Test_5759()
-		{
-		}
-		[TestMethod]
-		public void Test_5760()
-		{
-		}
-		[TestMethod]
-		public void Test_5761()
-		{
-		}
-		[TestMethod]
-		public void Test_5762()
-		{
-		}
-		[TestMethod]
-		public void Test_5763()
-		{
-		}
-		[TestMethod]
-		public void Test_5764()
-		{
-		}
-		[TestMethod]
-		public void Test_5765()
-		{
-		}
-		[TestMethod]
-		public void Test_5766()
-		{
-		}
-		[TestMethod]
-		public void Test_5767()
-		{
-		}
-		[TestMethod]
-		public void Test_5768()
-		{
-		}
-		[TestMethod]
-		public void Test_5769()
-		{
-		}
-		[TestMethod]
-		public void Test_5770()
-		{
-		}
-		[TestMethod]
-		public void Test_5771()
-		{
-		}
-		[TestMethod]
-		public void Test_5772()
-		{
-		}
-		[TestMethod]
-		public void Test_5773()
-		{
-		}
-		[TestMethod]
-		public void Test_5774()
-		{
-		}
-		[TestMethod]
-		public void Test_5775()
-		{
-		}
-		[TestMethod]
-		public void Test_5776()
-		{
-		}
-		[TestMethod]
-		public void Test_5777()
-		{
-		}
-		[TestMethod]
-		public void Test_5778()
-		{
-		}
-		[TestMethod]
-		public void Test_5779()
-		{
-		}
-		[TestMethod]
-		public void Test_5780()
-		{
-		}
-		[TestMethod]
-		public void Test_5781()
-		{
-		}
-		[TestMethod]
-		public void Test_5782()
-		{
-		}
-		[TestMethod]
-		public void Test_5783()
-		{
-		}
-		[TestMethod]
-		public void Test_5784()
-		{
-		}
-		[TestMethod]
-		public void Test_5785()
-		{
-		}
-		[TestMethod]
-		public void Test_5786()
-		{
-		}
-		[TestMethod]
-		public void Test_5787()
-		{
-		}
-		[TestMethod]
-		public void Test_5788()
-		{
-		}
-		[TestMethod]
-		public void Test_5789()
-		{
-		}
-		[TestMethod]
-		public void Test_5790()
-		{
-		}
-		[TestMethod]
-		public void Test_5791()
-		{
-		}
-		[TestMethod]
-		public void Test_5792()
-		{
-		}
-		[TestMethod]
-		public void Test_5793()
-		{
-		}
-		[TestMethod]
-		public void Test_5794()
-		{
-		}
-		[TestMethod]
-		public void Test_5795()
-		{
-		}
-		[TestMethod]
-		public void Test_5796()
-		{
-		}
-		[TestMethod]
-		public void Test_5797()
-		{
-		}
-		[TestMethod]
-		public void Test_5798()
-		{
-		}
-		[TestMethod]
-		public void Test_5799()
-		{
-		}
-		[TestMethod]
-		public void Test_5800()
-		{
-		}
-		[TestMethod]
-		public void Test_5801()
-		{
-		}
-		[TestMethod]
-		public void Test_5802()
-		{
-		}
-		[TestMethod]
-		public void Test_5803()
-		{
-		}
-		[TestMethod]
-		public void Test_5804()
-		{
-		}
-		[TestMethod]
-		public void Test_5805()
-		{
-		}
-		[TestMethod]
-		public void Test_5806()
-		{
-		}
-		[TestMethod]
-		public void Test_5807()
-		{
-		}
-		[TestMethod]
-		public void Test_5808()
-		{
-		}
-		[TestMethod]
-		public void Test_5809()
-		{
-		}
-		[TestMethod]
-		public void Test_5810()
-		{
-		}
-		[TestMethod]
-		public void Test_5811()
-		{
-		}
-		[TestMethod]
-		public void Test_5812()
-		{
-		}
-		[TestMethod]
-		public void Test_5813()
-		{
-		}
-		[TestMethod]
-		public void Test_5814()
-		{
-		}
-		[TestMethod]
-		public void Test_5815()
-		{
-		}
-		[TestMethod]
-		public void Test_5816()
-		{
-		}
-		[TestMethod]
-		public void Test_5817()
-		{
-		}
-		[TestMethod]
-		public void Test_5818()
-		{
-		}
-		[TestMethod]
-		public void Test_5819()
-		{
-		}
-		[TestMethod]
-		public void Test_5820()
-		{
-		}
-		[TestMethod]
-		public void Test_5821()
-		{
-		}
-		[TestMethod]
-		public void Test_5822()
-		{
-		}
-		[TestMethod]
-		public void Test_5823()
-		{
-		}
-		[TestMethod]
-		public void Test_5824()
-		{
-		}
-		[TestMethod]
-		public void Test_5825()
-		{
-		}
-		[TestMethod]
-		public void Test_5826()
-		{
-		}
-		[TestMethod]
-		public void Test_5827()
-		{
-		}
-		[TestMethod]
-		public void Test_5828()
-		{
-		}
-		[TestMethod]
-		public void Test_5829()
-		{
-		}
-		[TestMethod]
-		public void Test_5830()
-		{
-		}
-		[TestMethod]
-		public void Test_5831()
-		{
-		}
-		[TestMethod]
-		public void Test_5832()
-		{
-		}
-		[TestMethod]
-		public void Test_5833()
-		{
-		}
-		[TestMethod]
-		public void Test_5834()
-		{
-		}
-		[TestMethod]
-		public void Test_5835()
-		{
-		}
-		[TestMethod]
-		public void Test_5836()
-		{
-		}
-		[TestMethod]
-		public void Test_5837()
-		{
-		}
-		[TestMethod]
-		public void Test_5838()
-		{
-		}
-		[TestMethod]
-		public void Test_5839()
-		{
-		}
-		[TestMethod]
-		public void Test_5840()
-		{
-		}
-		[TestMethod]
-		public void Test_5841()
-		{
-		}
-		[TestMethod]
-		public void Test_5842()
-		{
-		}
-		[TestMethod]
-		public void Test_5843()
-		{
-		}
-		[TestMethod]
-		public void Test_5844()
-		{
-		}
-		[TestMethod]
-		public void Test_5845()
-		{
-		}
-		[TestMethod]
-		public void Test_5846()
-		{
-		}
-		[TestMethod]
-		public void Test_5847()
-		{
-		}
-		[TestMethod]
-		public void Test_5848()
-		{
-		}
-		[TestMethod]
-		public void Test_5849()
-		{
-		}
-		[TestMethod]
-		public void Test_5850()
-		{
-		}
-		[TestMethod]
-		public void Test_5851()
-		{
-		}
-		[TestMethod]
-		public void Test_5852()
-		{
-		}
-		[TestMethod]
-		public void Test_5853()
-		{
-		}
-		[TestMethod]
-		public void Test_5854()
-		{
-		}
-		[TestMethod]
-		public void Test_5855()
-		{
-		}
-		[TestMethod]
-		public void Test_5856()
-		{
-		}
-		[TestMethod]
-		public void Test_5857()
-		{
-		}
-		[TestMethod]
-		public void Test_5858()
-		{
-		}
-		[TestMethod]
-		public void Test_5859()
-		{
-		}
-		[TestMethod]
-		public void Test_5860()
-		{
-		}
-		[TestMethod]
-		public void Test_5861()
-		{
-		}
-		[TestMethod]
-		public void Test_5862()
-		{
-		}
-		[TestMethod]
-		public void Test_5863()
-		{
-		}
-		[TestMethod]
-		public void Test_5864()
-		{
-		}
-		[TestMethod]
-		public void Test_5865()
-		{
-		}
-		[TestMethod]
-		public void Test_5866()
-		{
-		}
-		[TestMethod]
-		public void Test_5867()
-		{
-		}
-		[TestMethod]
-		public void Test_5868()
-		{
-		}
-		[TestMethod]
-		public void Test_5869()
-		{
-		}
-		[TestMethod]
-		public void Test_5870()
-		{
-		}
-		[TestMethod]
-		public void Test_5871()
-		{
-		}
-		[TestMethod]
-		public void Test_5872()
-		{
-		}
-		[TestMethod]
-		public void Test_5873()
-		{
-		}
-		[TestMethod]
-		public void Test_5874()
-		{
-		}
-		[TestMethod]
-		public void Test_5875()
-		{
-		}
-		[TestMethod]
-		public void Test_5876()
-		{
-		}
-		[TestMethod]
-		public void Test_5877()
-		{
-		}
-		[TestMethod]
-		public void Test_5878()
-		{
-		}
-		[TestMethod]
-		public void Test_5879()
-		{
-		}
-		[TestMethod]
-		public void Test_5880()
-		{
-		}
-		[TestMethod]
-		public void Test_5881()
-		{
-		}
-		[TestMethod]
-		public void Test_5882()
-		{
-		}
-		[TestMethod]
-		public void Test_5883()
-		{
-		}
-		[TestMethod]
-		public void Test_5884()
-		{
-		}
-		[TestMethod]
-		public void Test_5885()
-		{
-		}
-		[TestMethod]
-		public void Test_5886()
-		{
-		}
-		[TestMethod]
-		public void Test_5887()
-		{
-		}
-		[TestMethod]
-		public void Test_5888()
-		{
-		}
-		[TestMethod]
-		public void Test_5889()
-		{
-		}
-		[TestMethod]
-		public void Test_5890()
-		{
-		}
-		[TestMethod]
-		public void Test_5891()
-		{
-		}
-		[TestMethod]
-		public void Test_5892()
-		{
-		}
-		[TestMethod]
-		public void Test_5893()
-		{
-		}
-		[TestMethod]
-		public void Test_5894()
-		{
-		}
-		[TestMethod]
-		public void Test_5895()
-		{
-		}
-		[TestMethod]
-		public void Test_5896()
-		{
-		}
-		[TestMethod]
-		public void Test_5897()
-		{
-		}
-		[TestMethod]
-		public void Test_5898()
-		{
-		}
-		[TestMethod]
-		public void Test_5899()
-		{
-		}
-		[TestMethod]
-		public void Test_5900()
-		{
-		}
-		[TestMethod]
-		public void Test_5901()
-		{
-		}
-		[TestMethod]
-		public void Test_5902()
-		{
-		}
-		[TestMethod]
-		public void Test_5903()
-		{
-		}
-		[TestMethod]
-		public void Test_5904()
-		{
-		}
-		[TestMethod]
-		public void Test_5905()
-		{
-		}
-		[TestMethod]
-		public void Test_5906()
-		{
-		}
-		[TestMethod]
-		public void Test_5907()
-		{
-		}
-		[TestMethod]
-		public void Test_5908()
-		{
-		}
-		[TestMethod]
-		public void Test_5909()
-		{
-		}
-		[TestMethod]
-		public void Test_5910()
-		{
-		}
-		[TestMethod]
-		public void Test_5911()
-		{
-		}
-		[TestMethod]
-		public void Test_5912()
-		{
-		}
-		[TestMethod]
-		public void Test_5913()
-		{
-		}
-		[TestMethod]
-		public void Test_5914()
-		{
-		}
-		[TestMethod]
-		public void Test_5915()
-		{
-		}
-		[TestMethod]
-		public void Test_5916()
-		{
-		}
-		[TestMethod]
-		public void Test_5917()
-		{
-		}
-		[TestMethod]
-		public void Test_5918()
-		{
-		}
-		[TestMethod]
-		public void Test_5919()
-		{
-		}
-		[TestMethod]
-		public void Test_5920()
-		{
-		}
-		[TestMethod]
-		public void Test_5921()
-		{
-		}
-		[TestMethod]
-		public void Test_5922()
-		{
-		}
-		[TestMethod]
-		public void Test_5923()
-		{
-		}
-		[TestMethod]
-		public void Test_5924()
-		{
-		}
-		[TestMethod]
-		public void Test_5925()
-		{
-		}
-		[TestMethod]
-		public void Test_5926()
-		{
-		}
-		[TestMethod]
-		public void Test_5927()
-		{
-		}
-		[TestMethod]
-		public void Test_5928()
-		{
-		}
-		[TestMethod]
-		public void Test_5929()
-		{
-		}
-		[TestMethod]
-		public void Test_5930()
-		{
-		}
-		[TestMethod]
-		public void Test_5931()
-		{
-		}
-		[TestMethod]
-		public void Test_5932()
-		{
-		}
-		[TestMethod]
-		public void Test_5933()
-		{
-		}
-		[TestMethod]
-		public void Test_5934()
-		{
-		}
-		[TestMethod]
-		public void Test_5935()
-		{
-		}
-		[TestMethod]
-		public void Test_5936()
-		{
-		}
-		[TestMethod]
-		public void Test_5937()
-		{
-		}
-		[TestMethod]
-		public void Test_5938()
-		{
-		}
-		[TestMethod]
-		public void Test_5939()
-		{
-		}
-		[TestMethod]
-		public void Test_5940()
-		{
-		}
-		[TestMethod]
-		public void Test_5941()
-		{
-		}
-		[TestMethod]
-		public void Test_5942()
-		{
-		}
-		[TestMethod]
-		public void Test_5943()
-		{
-		}
-		[TestMethod]
-		public void Test_5944()
-		{
-		}
-		[TestMethod]
-		public void Test_5945()
-		{
-		}
-		[TestMethod]
-		public void Test_5946()
-		{
-		}
-		[TestMethod]
-		public void Test_5947()
-		{
-		}
-		[TestMethod]
-		public void Test_5948()
-		{
-		}
-		[TestMethod]
-		public void Test_5949()
-		{
-		}
-		[TestMethod]
-		public void Test_5950()
-		{
-		}
-		[TestMethod]
-		public void Test_5951()
-		{
-		}
-		[TestMethod]
-		public void Test_5952()
-		{
-		}
-		[TestMethod]
-		public void Test_5953()
-		{
-		}
-		[TestMethod]
-		public void Test_5954()
-		{
-		}
-		[TestMethod]
-		public void Test_5955()
-		{
-		}
-		[TestMethod]
-		public void Test_5956()
-		{
-		}
-		[TestMethod]
-		public void Test_5957()
-		{
-		}
-		[TestMethod]
-		public void Test_5958()
-		{
-		}
-		[TestMethod]
-		public void Test_5959()
-		{
-		}
-		[TestMethod]
-		public void Test_5960()
-		{
-		}
-		[TestMethod]
-		public void Test_5961()
-		{
-		}
-		[TestMethod]
-		public void Test_5962()
-		{
-		}
-		[TestMethod]
-		public void Test_5963()
-		{
-		}
-		[TestMethod]
-		public void Test_5964()
-		{
-		}
-		[TestMethod]
-		public void Test_5965()
-		{
-		}
-		[TestMethod]
-		public void Test_5966()
-		{
-		}
-		[TestMethod]
-		public void Test_5967()
-		{
-		}
-		[TestMethod]
-		public void Test_5968()
-		{
-		}
-		[TestMethod]
-		public void Test_5969()
-		{
-		}
-		[TestMethod]
-		public void Test_5970()
-		{
-		}
-		[TestMethod]
-		public void Test_5971()
-		{
-		}
-		[TestMethod]
-		public void Test_5972()
-		{
-		}
-		[TestMethod]
-		public void Test_5973()
-		{
-		}
-		[TestMethod]
-		public void Test_5974()
-		{
-		}
-		[TestMethod]
-		public void Test_5975()
-		{
-		}
-		[TestMethod]
-		public void Test_5976()
-		{
-		}
-		[TestMethod]
-		public void Test_5977()
-		{
-		}
-		[TestMethod]
-		public void Test_5978()
-		{
-		}
-		[TestMethod]
-		public void Test_5979()
-		{
-		}
-		[TestMethod]
-		public void Test_5980()
-		{
-		}
-		[TestMethod]
-		public void Test_5981()
-		{
-		}
-		[TestMethod]
-		public void Test_5982()
-		{
-		}
-		[TestMethod]
-		public void Test_5983()
-		{
-		}
-		[TestMethod]
-		public void Test_5984()
-		{
-		}
-		[TestMethod]
-		public void Test_5985()
-		{
-		}
-		[TestMethod]
-		public void Test_5986()
-		{
-		}
-		[TestMethod]
-		public void Test_5987()
-		{
-		}
-		[TestMethod]
-		public void Test_5988()
-		{
-		}
-		[TestMethod]
-		public void Test_5989()
-		{
-		}
-		[TestMethod]
-		public void Test_5990()
-		{
-		}
-		[TestMethod]
-		public void Test_5991()
-		{
-		}
-		[TestMethod]
-		public void Test_5992()
-		{
-		}
-		[TestMethod]
-		public void Test_5993()
-		{
-		}
-		[TestMethod]
-		public void Test_5994()
-		{
-		}
-		[TestMethod]
-		public void Test_5995()
-		{
-		}
-		[TestMethod]
-		public void Test_5996()
-		{
-		}
-		[TestMethod]
-		public void Test_5997()
-		{
-		}
-		[TestMethod]
-		public void Test_5998()
-		{
-		}
-		[TestMethod]
-		public void Test_5999()
-		{
-		}
-		[TestMethod]
-		public void Test_6000()
-		{
-		}
-		[TestMethod]
-		public void Test_6001()
-		{
-		}
-		[TestMethod]
-		public void Test_6002()
-		{
-		}
-		[TestMethod]
-		public void Test_6003()
-		{
-		}
-		[TestMethod]
-		public void Test_6004()
-		{
-		}
-		[TestMethod]
-		public void Test_6005()
-		{
-		}
-		[TestMethod]
-		public void Test_6006()
-		{
-		}
-		[TestMethod]
-		public void Test_6007()
-		{
-		}
-		[TestMethod]
-		public void Test_6008()
-		{
-		}
-		[TestMethod]
-		public void Test_6009()
-		{
-		}
-		[TestMethod]
-		public void Test_6010()
-		{
-		}
-		[TestMethod]
-		public void Test_6011()
-		{
-		}
-		[TestMethod]
-		public void Test_6012()
-		{
-		}
-		[TestMethod]
-		public void Test_6013()
-		{
-		}
-		[TestMethod]
-		public void Test_6014()
-		{
-		}
-		[TestMethod]
-		public void Test_6015()
-		{
-		}
-		[TestMethod]
-		public void Test_6016()
-		{
-		}
-		[TestMethod]
-		public void Test_6017()
-		{
-		}
-		[TestMethod]
-		public void Test_6018()
-		{
-		}
-		[TestMethod]
-		public void Test_6019()
-		{
-		}
-		[TestMethod]
-		public void Test_6020()
-		{
-		}
-		[TestMethod]
-		public void Test_6021()
-		{
-		}
-		[TestMethod]
-		public void Test_6022()
-		{
-		}
-		[TestMethod]
-		public void Test_6023()
-		{
-		}
-		[TestMethod]
-		public void Test_6024()
-		{
-		}
-		[TestMethod]
-		public void Test_6025()
-		{
-		}
-		[TestMethod]
-		public void Test_6026()
-		{
-		}
-		[TestMethod]
-		public void Test_6027()
-		{
-		}
-		[TestMethod]
-		public void Test_6028()
-		{
-		}
-		[TestMethod]
-		public void Test_6029()
-		{
-		}
-		[TestMethod]
-		public void Test_6030()
-		{
-		}
-		[TestMethod]
-		public void Test_6031()
-		{
-		}
-		[TestMethod]
-		public void Test_6032()
-		{
-		}
-		[TestMethod]
-		public void Test_6033()
-		{
-		}
-		[TestMethod]
-		public void Test_6034()
-		{
-		}
-		[TestMethod]
-		public void Test_6035()
-		{
-		}
-		[TestMethod]
-		public void Test_6036()
-		{
-		}
-		[TestMethod]
-		public void Test_6037()
-		{
-		}
-		[TestMethod]
-		public void Test_6038()
-		{
-		}
-		[TestMethod]
-		public void Test_6039()
-		{
-		}
-		[TestMethod]
-		public void Test_6040()
-		{
-		}
-		[TestMethod]
-		public void Test_6041()
-		{
-		}
-		[TestMethod]
-		public void Test_6042()
-		{
-		}
-		[TestMethod]
-		public void Test_6043()
-		{
-		}
-		[TestMethod]
-		public void Test_6044()
-		{
-		}
-		[TestMethod]
-		public void Test_6045()
-		{
-		}
-		[TestMethod]
-		public void Test_6046()
-		{
-		}
-		[TestMethod]
-		public void Test_6047()
-		{
-		}
-		[TestMethod]
-		public void Test_6048()
-		{
-		}
-		[TestMethod]
-		public void Test_6049()
-		{
-		}
-		[TestMethod]
-		public void Test_6050()
-		{
-		}
-		[TestMethod]
-		public void Test_6051()
-		{
-		}
-		[TestMethod]
-		public void Test_6052()
-		{
-		}
-		[TestMethod]
-		public void Test_6053()
-		{
-		}
-		[TestMethod]
-		public void Test_6054()
-		{
-		}
-		[TestMethod]
-		public void Test_6055()
-		{
-		}
-		[TestMethod]
-		public void Test_6056()
-		{
-		}
-		[TestMethod]
-		public void Test_6057()
-		{
-		}
-		[TestMethod]
-		public void Test_6058()
-		{
-		}
-		[TestMethod]
-		public void Test_6059()
-		{
-		}
-		[TestMethod]
-		public void Test_6060()
-		{
-		}
-		[TestMethod]
-		public void Test_6061()
-		{
-		}
-		[TestMethod]
-		public void Test_6062()
-		{
-		}
-		[TestMethod]
-		public void Test_6063()
-		{
-		}
-		[TestMethod]
-		public void Test_6064()
-		{
-		}
-		[TestMethod]
-		public void Test_6065()
-		{
-		}
-		[TestMethod]
-		public void Test_6066()
-		{
-		}
-		[TestMethod]
-		public void Test_6067()
-		{
-		}
-		[TestMethod]
-		public void Test_6068()
-		{
-		}
-		[TestMethod]
-		public void Test_6069()
-		{
-		}
-		[TestMethod]
-		public void Test_6070()
-		{
-		}
-		[TestMethod]
-		public void Test_6071()
-		{
-		}
-		[TestMethod]
-		public void Test_6072()
-		{
-		}
-		[TestMethod]
-		public void Test_6073()
-		{
-		}
-		[TestMethod]
-		public void Test_6074()
-		{
-		}
-		[TestMethod]
-		public void Test_6075()
-		{
-		}
-		[TestMethod]
-		public void Test_6076()
-		{
-		}
-		[TestMethod]
-		public void Test_6077()
-		{
-		}
-		[TestMethod]
-		public void Test_6078()
-		{
-		}
-		[TestMethod]
-		public void Test_6079()
-		{
-		}
-		[TestMethod]
-		public void Test_6080()
-		{
-		}
-		[TestMethod]
-		public void Test_6081()
-		{
-		}
-		[TestMethod]
-		public void Test_6082()
-		{
-		}
-		[TestMethod]
-		public void Test_6083()
-		{
-		}
-		[TestMethod]
-		public void Test_6084()
-		{
-		}
-		[TestMethod]
-		public void Test_6085()
-		{
-		}
-		[TestMethod]
-		public void Test_6086()
-		{
-		}
-		[TestMethod]
-		public void Test_6087()
-		{
-		}
-		[TestMethod]
-		public void Test_6088()
-		{
-		}
-		[TestMethod]
-		public void Test_6089()
-		{
-		}
-		[TestMethod]
-		public void Test_6090()
-		{
-		}
-		[TestMethod]
-		public void Test_6091()
-		{
-		}
-		[TestMethod]
-		public void Test_6092()
-		{
-		}
-		[TestMethod]
-		public void Test_6093()
-		{
-		}
-		[TestMethod]
-		public void Test_6094()
-		{
-		}
-		[TestMethod]
-		public void Test_6095()
-		{
-		}
-		[TestMethod]
-		public void Test_6096()
-		{
-		}
-		[TestMethod]
-		public void Test_6097()
-		{
-		}
-		[TestMethod]
-		public void Test_6098()
-		{
-		}
-		[TestMethod]
-		public void Test_6099()
-		{
-		}
-		[TestMethod]
-		public void Test_6100()
-		{
-		}
-		[TestMethod]
-		public void Test_6101()
-		{
-		}
-		[TestMethod]
-		public void Test_6102()
-		{
-		}
-		[TestMethod]
-		public void Test_6103()
-		{
-		}
-		[TestMethod]
-		public void Test_6104()
-		{
-		}
-		[TestMethod]
-		public void Test_6105()
-		{
-		}
-		[TestMethod]
-		public void Test_6106()
-		{
-		}
-		[TestMethod]
-		public void Test_6107()
-		{
-		}
-		[TestMethod]
-		public void Test_6108()
-		{
-		}
-		[TestMethod]
-		public void Test_6109()
-		{
-		}
-		[TestMethod]
-		public void Test_6110()
-		{
-		}
-		[TestMethod]
-		public void Test_6111()
-		{
-		}
-		[TestMethod]
-		public void Test_6112()
-		{
-		}
-		[TestMethod]
-		public void Test_6113()
-		{
-		}
-		[TestMethod]
-		public void Test_6114()
-		{
-		}
-		[TestMethod]
-		public void Test_6115()
-		{
-		}
-		[TestMethod]
-		public void Test_6116()
-		{
-		}
-		[TestMethod]
-		public void Test_6117()
-		{
-		}
-		[TestMethod]
-		public void Test_6118()
-		{
-		}
-		[TestMethod]
-		public void Test_6119()
-		{
-		}
-		[TestMethod]
-		public void Test_6120()
-		{
-		}
-		[TestMethod]
-		public void Test_6121()
-		{
-		}
-		[TestMethod]
-		public void Test_6122()
-		{
-		}
-		[TestMethod]
-		public void Test_6123()
-		{
-		}
-		[TestMethod]
-		public void Test_6124()
-		{
-		}
-		[TestMethod]
-		public void Test_6125()
-		{
-		}
-		[TestMethod]
-		public void Test_6126()
-		{
-		}
-		[TestMethod]
-		public void Test_6127()
-		{
-		}
-		[TestMethod]
-		public void Test_6128()
-		{
-		}
-		[TestMethod]
-		public void Test_6129()
-		{
-		}
-		[TestMethod]
-		public void Test_6130()
-		{
-		}
-		[TestMethod]
-		public void Test_6131()
-		{
-		}
-		[TestMethod]
-		public void Test_6132()
-		{
-		}
-		[TestMethod]
-		public void Test_6133()
-		{
-		}
-		[TestMethod]
-		public void Test_6134()
-		{
-		}
-		[TestMethod]
-		public void Test_6135()
-		{
-		}
-		[TestMethod]
-		public void Test_6136()
-		{
-		}
-		[TestMethod]
-		public void Test_6137()
-		{
-		}
-		[TestMethod]
-		public void Test_6138()
-		{
-		}
-		[TestMethod]
-		public void Test_6139()
-		{
-		}
-		[TestMethod]
-		public void Test_6140()
-		{
-		}
-		[TestMethod]
-		public void Test_6141()
-		{
-		}
-		[TestMethod]
-		public void Test_6142()
-		{
-		}
-		[TestMethod]
-		public void Test_6143()
-		{
-		}
-		[TestMethod]
-		public void Test_6144()
-		{
-		}
-		[TestMethod]
-		public void Test_6145()
-		{
-		}
-		[TestMethod]
-		public void Test_6146()
-		{
-		}
-		[TestMethod]
-		public void Test_6147()
-		{
-		}
-		[TestMethod]
-		public void Test_6148()
-		{
-		}
-		[TestMethod]
-		public void Test_6149()
-		{
-		}
-		[TestMethod]
-		public void Test_6150()
-		{
-		}
-		[TestMethod]
-		public void Test_6151()
-		{
-		}
-		[TestMethod]
-		public void Test_6152()
-		{
-		}
-		[TestMethod]
-		public void Test_6153()
-		{
-		}
-		[TestMethod]
-		public void Test_6154()
-		{
-		}
-		[TestMethod]
-		public void Test_6155()
-		{
-		}
-		[TestMethod]
-		public void Test_6156()
-		{
-		}
-		[TestMethod]
-		public void Test_6157()
-		{
-		}
-		[TestMethod]
-		public void Test_6158()
-		{
-		}
-		[TestMethod]
-		public void Test_6159()
-		{
-		}
-		[TestMethod]
-		public void Test_6160()
-		{
-		}
-		[TestMethod]
-		public void Test_6161()
-		{
-		}
-		[TestMethod]
-		public void Test_6162()
-		{
-		}
-		[TestMethod]
-		public void Test_6163()
-		{
-		}
-		[TestMethod]
-		public void Test_6164()
-		{
-		}
-		[TestMethod]
-		public void Test_6165()
-		{
-		}
-		[TestMethod]
-		public void Test_6166()
-		{
-		}
-		[TestMethod]
-		public void Test_6167()
-		{
-		}
-		[TestMethod]
-		public void Test_6168()
-		{
-		}
-		[TestMethod]
-		public void Test_6169()
-		{
-		}
-		[TestMethod]
-		public void Test_6170()
-		{
-		}
-		[TestMethod]
-		public void Test_6171()
-		{
-		}
-		[TestMethod]
-		public void Test_6172()
-		{
-		}
-		[TestMethod]
-		public void Test_6173()
-		{
-		}
-		[TestMethod]
-		public void Test_6174()
-		{
-		}
-		[TestMethod]
-		public void Test_6175()
-		{
-		}
-		[TestMethod]
-		public void Test_6176()
-		{
-		}
-		[TestMethod]
-		public void Test_6177()
-		{
-		}
-		[TestMethod]
-		public void Test_6178()
-		{
-		}
-		[TestMethod]
-		public void Test_6179()
-		{
-		}
-		[TestMethod]
-		public void Test_6180()
-		{
-		}
-		[TestMethod]
-		public void Test_6181()
-		{
-		}
-		[TestMethod]
-		public void Test_6182()
-		{
-		}
-		[TestMethod]
-		public void Test_6183()
-		{
-		}
-		[TestMethod]
-		public void Test_6184()
-		{
-		}
-		[TestMethod]
-		public void Test_6185()
-		{
-		}
-		[TestMethod]
-		public void Test_6186()
-		{
-		}
-		[TestMethod]
-		public void Test_6187()
-		{
-		}
-		[TestMethod]
-		public void Test_6188()
-		{
-		}
-		[TestMethod]
-		public void Test_6189()
-		{
-		}
-		[TestMethod]
-		public void Test_6190()
-		{
-		}
-		[TestMethod]
-		public void Test_6191()
-		{
-		}
-		[TestMethod]
-		public void Test_6192()
-		{
-		}
-		[TestMethod]
-		public void Test_6193()
-		{
-		}
-		[TestMethod]
-		public void Test_6194()
-		{
-		}
-		[TestMethod]
-		public void Test_6195()
-		{
-		}
-		[TestMethod]
-		public void Test_6196()
-		{
-		}
-		[TestMethod]
-		public void Test_6197()
-		{
-		}
-		[TestMethod]
-		public void Test_6198()
-		{
-		}
-		[TestMethod]
-		public void Test_6199()
-		{
-		}
-		[TestMethod]
-		public void Test_6200()
-		{
-		}
-		[TestMethod]
-		public void Test_6201()
-		{
-		}
-		[TestMethod]
-		public void Test_6202()
-		{
-		}
-		[TestMethod]
-		public void Test_6203()
-		{
-		}
-		[TestMethod]
-		public void Test_6204()
-		{
-		}
-		[TestMethod]
-		public void Test_6205()
-		{
-		}
-		[TestMethod]
-		public void Test_6206()
-		{
-		}
-		[TestMethod]
-		public void Test_6207()
-		{
-		}
-		[TestMethod]
-		public void Test_6208()
-		{
-		}
-		[TestMethod]
-		public void Test_6209()
-		{
-		}
-		[TestMethod]
-		public void Test_6210()
-		{
-		}
-		[TestMethod]
-		public void Test_6211()
-		{
-		}
-		[TestMethod]
-		public void Test_6212()
-		{
-		}
-		[TestMethod]
-		public void Test_6213()
-		{
-		}
-		[TestMethod]
-		public void Test_6214()
-		{
-		}
-		[TestMethod]
-		public void Test_6215()
-		{
-		}
-		[TestMethod]
-		public void Test_6216()
-		{
-		}
-		[TestMethod]
-		public void Test_6217()
-		{
-		}
-		[TestMethod]
-		public void Test_6218()
-		{
-		}
-		[TestMethod]
-		public void Test_6219()
-		{
-		}
-		[TestMethod]
-		public void Test_6220()
-		{
-		}
-		[TestMethod]
-		public void Test_6221()
-		{
-		}
-		[TestMethod]
-		public void Test_6222()
-		{
-		}
-		[TestMethod]
-		public void Test_6223()
-		{
-		}
-		[TestMethod]
-		public void Test_6224()
-		{
-		}
-		[TestMethod]
-		public void Test_6225()
-		{
-		}
-		[TestMethod]
-		public void Test_6226()
-		{
-		}
-		[TestMethod]
-		public void Test_6227()
-		{
-		}
-		[TestMethod]
-		public void Test_6228()
-		{
-		}
-		[TestMethod]
-		public void Test_6229()
-		{
-		}
-		[TestMethod]
-		public void Test_6230()
-		{
-		}
-		[TestMethod]
-		public void Test_6231()
-		{
-		}
-		[TestMethod]
-		public void Test_6232()
-		{
-		}
-		[TestMethod]
-		public void Test_6233()
-		{
-		}
-		[TestMethod]
-		public void Test_6234()
-		{
-		}
-		[TestMethod]
-		public void Test_6235()
-		{
-		}
-		[TestMethod]
-		public void Test_6236()
-		{
-		}
-		[TestMethod]
-		public void Test_6237()
-		{
-		}
-		[TestMethod]
-		public void Test_6238()
-		{
-		}
-		[TestMethod]
-		public void Test_6239()
-		{
-		}
-		[TestMethod]
-		public void Test_6240()
-		{
-		}
-		[TestMethod]
-		public void Test_6241()
-		{
-		}
-		[TestMethod]
-		public void Test_6242()
-		{
-		}
-		[TestMethod]
-		public void Test_6243()
-		{
-		}
-		[TestMethod]
-		public void Test_6244()
-		{
-		}
-		[TestMethod]
-		public void Test_6245()
-		{
-		}
-		[TestMethod]
-		public void Test_6246()
-		{
-		}
-		[TestMethod]
-		public void Test_6247()
-		{
-		}
-		[TestMethod]
-		public void Test_6248()
-		{
-		}
-		[TestMethod]
-		public void Test_6249()
-		{
-		}
-		[TestMethod]
-		public void Test_6250()
-		{
-		}
-		[TestMethod]
-		public void Test_6251()
-		{
-		}
-		[TestMethod]
-		public void Test_6252()
-		{
-		}
-		[TestMethod]
-		public void Test_6253()
-		{
-		}
-		[TestMethod]
-		public void Test_6254()
-		{
-		}
-		[TestMethod]
-		public void Test_6255()
-		{
-		}
-		[TestMethod]
-		public void Test_6256()
-		{
-		}
-		[TestMethod]
-		public void Test_6257()
-		{
-		}
-		[TestMethod]
-		public void Test_6258()
-		{
-		}
-		[TestMethod]
-		public void Test_6259()
-		{
-		}
-		[TestMethod]
-		public void Test_6260()
-		{
-		}
-		[TestMethod]
-		public void Test_6261()
-		{
-		}
-		[TestMethod]
-		public void Test_6262()
-		{
-		}
-		[TestMethod]
-		public void Test_6263()
-		{
-		}
-		[TestMethod]
-		public void Test_6264()
-		{
-		}
-		[TestMethod]
-		public void Test_6265()
-		{
-		}
-		[TestMethod]
-		public void Test_6266()
-		{
-		}
-		[TestMethod]
-		public void Test_6267()
-		{
-		}
-		[TestMethod]
-		public void Test_6268()
-		{
-		}
-		[TestMethod]
-		public void Test_6269()
-		{
-		}
-		[TestMethod]
-		public void Test_6270()
-		{
-		}
-		[TestMethod]
-		public void Test_6271()
-		{
-		}
-		[TestMethod]
-		public void Test_6272()
-		{
-		}
-		[TestMethod]
-		public void Test_6273()
-		{
-		}
-		[TestMethod]
-		public void Test_6274()
-		{
-		}
-		[TestMethod]
-		public void Test_6275()
-		{
-		}
-		[TestMethod]
-		public void Test_6276()
-		{
-		}
-		[TestMethod]
-		public void Test_6277()
-		{
-		}
-		[TestMethod]
-		public void Test_6278()
-		{
-		}
-		[TestMethod]
-		public void Test_6279()
-		{
-		}
-		[TestMethod]
-		public void Test_6280()
-		{
-		}
-		[TestMethod]
-		public void Test_6281()
-		{
-		}
-		[TestMethod]
-		public void Test_6282()
-		{
-		}
-		[TestMethod]
-		public void Test_6283()
-		{
-		}
-		[TestMethod]
-		public void Test_6284()
-		{
-		}
-		[TestMethod]
-		public void Test_6285()
-		{
-		}
-		[TestMethod]
-		public void Test_6286()
-		{
-		}
-		[TestMethod]
-		public void Test_6287()
-		{
-		}
-		[TestMethod]
-		public void Test_6288()
-		{
-		}
-		[TestMethod]
-		public void Test_6289()
-		{
-		}
-		[TestMethod]
-		public void Test_6290()
-		{
-		}
-		[TestMethod]
-		public void Test_6291()
-		{
-		}
-		[TestMethod]
-		public void Test_6292()
-		{
-		}
-		[TestMethod]
-		public void Test_6293()
-		{
-		}
-		[TestMethod]
-		public void Test_6294()
-		{
-		}
-		[TestMethod]
-		public void Test_6295()
-		{
-		}
-		[TestMethod]
-		public void Test_6296()
-		{
-		}
-		[TestMethod]
-		public void Test_6297()
-		{
-		}
-		[TestMethod]
-		public void Test_6298()
-		{
-		}
-		[TestMethod]
-		public void Test_6299()
-		{
-		}
-		[TestMethod]
-		public void Test_6300()
-		{
-		}
-		[TestMethod]
-		public void Test_6301()
-		{
-		}
-		[TestMethod]
-		public void Test_6302()
-		{
-		}
-		[TestMethod]
-		public void Test_6303()
-		{
-		}
-		[TestMethod]
-		public void Test_6304()
-		{
-		}
-		[TestMethod]
-		public void Test_6305()
-		{
-		}
-		[TestMethod]
-		public void Test_6306()
-		{
-		}
-		[TestMethod]
-		public void Test_6307()
-		{
-		}
-		[TestMethod]
-		public void Test_6308()
-		{
-		}
-		[TestMethod]
-		public void Test_6309()
-		{
-		}
-		[TestMethod]
-		public void Test_6310()
-		{
-		}
-		[TestMethod]
-		public void Test_6311()
-		{
-		}
-		[TestMethod]
-		public void Test_6312()
-		{
-		}
-		[TestMethod]
-		public void Test_6313()
-		{
-		}
-		[TestMethod]
-		public void Test_6314()
-		{
-		}
-		[TestMethod]
-		public void Test_6315()
-		{
-		}
-		[TestMethod]
-		public void Test_6316()
-		{
-		}
-		[TestMethod]
-		public void Test_6317()
-		{
-		}
-		[TestMethod]
-		public void Test_6318()
-		{
-		}
-		[TestMethod]
-		public void Test_6319()
-		{
-		}
-		[TestMethod]
-		public void Test_6320()
-		{
-		}
-		[TestMethod]
-		public void Test_6321()
-		{
-		}
-		[TestMethod]
-		public void Test_6322()
-		{
-		}
-		[TestMethod]
-		public void Test_6323()
-		{
-		}
-		[TestMethod]
-		public void Test_6324()
-		{
-		}
-		[TestMethod]
-		public void Test_6325()
-		{
-		}
-		[TestMethod]
-		public void Test_6326()
-		{
-		}
-		[TestMethod]
-		public void Test_6327()
-		{
-		}
-		[TestMethod]
-		public void Test_6328()
-		{
-		}
-		[TestMethod]
-		public void Test_6329()
-		{
-		}
-		[TestMethod]
-		public void Test_6330()
-		{
-		}
-		[TestMethod]
-		public void Test_6331()
-		{
-		}
-		[TestMethod]
-		public void Test_6332()
-		{
-		}
-		[TestMethod]
-		public void Test_6333()
-		{
-		}
-		[TestMethod]
-		public void Test_6334()
-		{
-		}
-		[TestMethod]
-		public void Test_6335()
-		{
-		}
-		[TestMethod]
-		public void Test_6336()
-		{
-		}
-		[TestMethod]
-		public void Test_6337()
-		{
-		}
-		[TestMethod]
-		public void Test_6338()
-		{
-		}
-		[TestMethod]
-		public void Test_6339()
-		{
-		}
-		[TestMethod]
-		public void Test_6340()
-		{
-		}
-		[TestMethod]
-		public void Test_6341()
-		{
-		}
-		[TestMethod]
-		public void Test_6342()
-		{
-		}
-		[TestMethod]
-		public void Test_6343()
-		{
-		}
-		[TestMethod]
-		public void Test_6344()
-		{
-		}
-		[TestMethod]
-		public void Test_6345()
-		{
-		}
-		[TestMethod]
-		public void Test_6346()
-		{
-		}
-		[TestMethod]
-		public void Test_6347()
-		{
-		}
-		[TestMethod]
-		public void Test_6348()
-		{
-		}
-		[TestMethod]
-		public void Test_6349()
-		{
-		}
-		[TestMethod]
-		public void Test_6350()
-		{
-		}
-		[TestMethod]
-		public void Test_6351()
-		{
-		}
-		[TestMethod]
-		public void Test_6352()
-		{
-		}
-		[TestMethod]
-		public void Test_6353()
-		{
-		}
-		[TestMethod]
-		public void Test_6354()
-		{
-		}
-		[TestMethod]
-		public void Test_6355()
-		{
-		}
-		[TestMethod]
-		public void Test_6356()
-		{
-		}
-		[TestMethod]
-		public void Test_6357()
-		{
-		}
-		[TestMethod]
-		public void Test_6358()
-		{
-		}
-		[TestMethod]
-		public void Test_6359()
-		{
-		}
-		[TestMethod]
-		public void Test_6360()
-		{
-		}
-		[TestMethod]
-		public void Test_6361()
-		{
-		}
-		[TestMethod]
-		public void Test_6362()
-		{
-		}
-		[TestMethod]
-		public void Test_6363()
-		{
-		}
-		[TestMethod]
-		public void Test_6364()
-		{
-		}
-		[TestMethod]
-		public void Test_6365()
-		{
-		}
-		[TestMethod]
-		public void Test_6366()
-		{
-		}
-		[TestMethod]
-		public void Test_6367()
-		{
-		}
-		[TestMethod]
-		public void Test_6368()
-		{
-		}
-		[TestMethod]
-		public void Test_6369()
-		{
-		}
-		[TestMethod]
-		public void Test_6370()
-		{
-		}
-		[TestMethod]
-		public void Test_6371()
-		{
-		}
-		[TestMethod]
-		public void Test_6372()
-		{
-		}
-		[TestMethod]
-		public void Test_6373()
-		{
-		}
-		[TestMethod]
-		public void Test_6374()
-		{
-		}
-		[TestMethod]
-		public void Test_6375()
-		{
-		}
-		[TestMethod]
-		public void Test_6376()
-		{
-		}
-		[TestMethod]
-		public void Test_6377()
-		{
-		}
-		[TestMethod]
-		public void Test_6378()
-		{
-		}
-		[TestMethod]
-		public void Test_6379()
-		{
-		}
-		[TestMethod]
-		public void Test_6380()
-		{
-		}
-		[TestMethod]
-		public void Test_6381()
-		{
-		}
-		[TestMethod]
-		public void Test_6382()
-		{
-		}
-		[TestMethod]
-		public void Test_6383()
-		{
-		}
-		[TestMethod]
-		public void Test_6384()
-		{
-		}
-		[TestMethod]
-		public void Test_6385()
-		{
-		}
-		[TestMethod]
-		public void Test_6386()
-		{
-		}
-		[TestMethod]
-		public void Test_6387()
-		{
-		}
-		[TestMethod]
-		public void Test_6388()
-		{
-		}
-		[TestMethod]
-		public void Test_6389()
-		{
-		}
-		[TestMethod]
-		public void Test_6390()
-		{
-		}
-		[TestMethod]
-		public void Test_6391()
-		{
-		}
-		[TestMethod]
-		public void Test_6392()
-		{
-		}
-		[TestMethod]
-		public void Test_6393()
-		{
-		}
-		[TestMethod]
-		public void Test_6394()
-		{
-		}
-		[TestMethod]
-		public void Test_6395()
-		{
-		}
-		[TestMethod]
-		public void Test_6396()
-		{
-		}
-		[TestMethod]
-		public void Test_6397()
-		{
-		}
-		[TestMethod]
-		public void Test_6398()
-		{
-		}
-		[TestMethod]
-		public void Test_6399()
-		{
-		}
-		[TestMethod]
-		public void Test_6400()
-		{
-		}
-		[TestMethod]
-		public void Test_6401()
-		{
-		}
-		[TestMethod]
-		public void Test_6402()
-		{
-		}
-		[TestMethod]
-		public void Test_6403()
-		{
-		}
-		[TestMethod]
-		public void Test_6404()
-		{
-		}
-		[TestMethod]
-		public void Test_6405()
-		{
-		}
-		[TestMethod]
-		public void Test_6406()
-		{
-		}
-		[TestMethod]
-		public void Test_6407()
-		{
-		}
-		[TestMethod]
-		public void Test_6408()
-		{
-		}
-		[TestMethod]
-		public void Test_6409()
-		{
-		}
-		[TestMethod]
-		public void Test_6410()
-		{
-		}
-		[TestMethod]
-		public void Test_6411()
-		{
-		}
-		[TestMethod]
-		public void Test_6412()
-		{
-		}
-		[TestMethod]
-		public void Test_6413()
-		{
-		}
-		[TestMethod]
-		public void Test_6414()
-		{
-		}
-		[TestMethod]
-		public void Test_6415()
-		{
-		}
-		[TestMethod]
-		public void Test_6416()
-		{
-		}
-		[TestMethod]
-		public void Test_6417()
-		{
-		}
-		[TestMethod]
-		public void Test_6418()
-		{
-		}
-		[TestMethod]
-		public void Test_6419()
-		{
-		}
-		[TestMethod]
-		public void Test_6420()
-		{
-		}
-		[TestMethod]
-		public void Test_6421()
-		{
-		}
-		[TestMethod]
-		public void Test_6422()
-		{
-		}
-		[TestMethod]
-		public void Test_6423()
-		{
-		}
-		[TestMethod]
-		public void Test_6424()
-		{
-		}
-		[TestMethod]
-		public void Test_6425()
-		{
-		}
-		[TestMethod]
-		public void Test_6426()
-		{
-		}
-		[TestMethod]
-		public void Test_6427()
-		{
-		}
-		[TestMethod]
-		public void Test_6428()
-		{
-		}
-		[TestMethod]
-		public void Test_6429()
-		{
-		}
-		[TestMethod]
-		public void Test_6430()
-		{
-		}
-		[TestMethod]
-		public void Test_6431()
-		{
-		}
-		[TestMethod]
-		public void Test_6432()
-		{
-		}
-		[TestMethod]
-		public void Test_6433()
-		{
-		}
-		[TestMethod]
-		public void Test_6434()
-		{
-		}
-		[TestMethod]
-		public void Test_6435()
-		{
-		}
-		[TestMethod]
-		public void Test_6436()
-		{
-		}
-		[TestMethod]
-		public void Test_6437()
-		{
-		}
-		[TestMethod]
-		public void Test_6438()
-		{
-		}
-		[TestMethod]
-		public void Test_6439()
-		{
-		}
-		[TestMethod]
-		public void Test_6440()
-		{
-		}
-		[TestMethod]
-		public void Test_6441()
-		{
-		}
-		[TestMethod]
-		public void Test_6442()
-		{
-		}
-		[TestMethod]
-		public void Test_6443()
-		{
-		}
-		[TestMethod]
-		public void Test_6444()
-		{
-		}
-		[TestMethod]
-		public void Test_6445()
-		{
-		}
-		[TestMethod]
-		public void Test_6446()
-		{
-		}
-		[TestMethod]
-		public void Test_6447()
-		{
-		}
-		[TestMethod]
-		public void Test_6448()
-		{
-		}
-		[TestMethod]
-		public void Test_6449()
-		{
-		}
-		[TestMethod]
-		public void Test_6450()
-		{
-		}
-		[TestMethod]
-		public void Test_6451()
-		{
-		}
-		[TestMethod]
-		public void Test_6452()
-		{
-		}
-		[TestMethod]
-		public void Test_6453()
-		{
-		}
-		[TestMethod]
-		public void Test_6454()
-		{
-		}
-		[TestMethod]
-		public void Test_6455()
-		{
-		}
-		[TestMethod]
-		public void Test_6456()
-		{
-		}
-		[TestMethod]
-		public void Test_6457()
-		{
-		}
-		[TestMethod]
-		public void Test_6458()
-		{
-		}
-		[TestMethod]
-		public void Test_6459()
-		{
-		}
-		[TestMethod]
-		public void Test_6460()
-		{
-		}
-		[TestMethod]
-		public void Test_6461()
-		{
-		}
-		[TestMethod]
-		public void Test_6462()
-		{
-		}
-		[TestMethod]
-		public void Test_6463()
-		{
-		}
-		[TestMethod]
-		public void Test_6464()
-		{
-		}
-		[TestMethod]
-		public void Test_6465()
-		{
-		}
-		[TestMethod]
-		public void Test_6466()
-		{
-		}
-		[TestMethod]
-		public void Test_6467()
-		{
-		}
-		[TestMethod]
-		public void Test_6468()
-		{
-		}
-		[TestMethod]
-		public void Test_6469()
-		{
-		}
-		[TestMethod]
-		public void Test_6470()
-		{
-		}
-		[TestMethod]
-		public void Test_6471()
-		{
-		}
-		[TestMethod]
-		public void Test_6472()
-		{
-		}
-		[TestMethod]
-		public void Test_6473()
-		{
-		}
-		[TestMethod]
-		public void Test_6474()
-		{
-		}
-		[TestMethod]
-		public void Test_6475()
-		{
-		}
-		[TestMethod]
-		public void Test_6476()
-		{
-		}
-		[TestMethod]
-		public void Test_6477()
-		{
-		}
-		[TestMethod]
-		public void Test_6478()
-		{
-		}
-		[TestMethod]
-		public void Test_6479()
-		{
-		}
-		[TestMethod]
-		public void Test_6480()
-		{
-		}
-		[TestMethod]
-		public void Test_6481()
-		{
-		}
-		[TestMethod]
-		public void Test_6482()
-		{
-		}
-		[TestMethod]
-		public void Test_6483()
-		{
-		}
-		[TestMethod]
-		public void Test_6484()
-		{
-		}
-		[TestMethod]
-		public void Test_6485()
-		{
-		}
-		[TestMethod]
-		public void Test_6486()
-		{
-		}
-		[TestMethod]
-		public void Test_6487()
-		{
-		}
-		[TestMethod]
-		public void Test_6488()
-		{
-		}
-		[TestMethod]
-		public void Test_6489()
-		{
-		}
-		[TestMethod]
-		public void Test_6490()
-		{
-		}
-		[TestMethod]
-		public void Test_6491()
-		{
-		}
-		[TestMethod]
-		public void Test_6492()
-		{
-		}
-		[TestMethod]
-		public void Test_6493()
-		{
-		}
-		[TestMethod]
-		public void Test_6494()
-		{
-		}
-		[TestMethod]
-		public void Test_6495()
-		{
-		}
-		[TestMethod]
-		public void Test_6496()
-		{
-		}
-		[TestMethod]
-		public void Test_6497()
-		{
-		}
-		[TestMethod]
-		public void Test_6498()
-		{
-		}
-		[TestMethod]
-		public void Test_6499()
-		{
-		}
-		[TestMethod]
-		public void Test_6500()
-		{
-		}
-		[TestMethod]
-		public void Test_6501()
-		{
-		}
-		[TestMethod]
-		public void Test_6502()
-		{
-		}
-		[TestMethod]
-		public void Test_6503()
-		{
-		}
-		[TestMethod]
-		public void Test_6504()
-		{
-		}
-		[TestMethod]
-		public void Test_6505()
-		{
-		}
-		[TestMethod]
-		public void Test_6506()
-		{
-		}
-		[TestMethod]
-		public void Test_6507()
-		{
-		}
-		[TestMethod]
-		public void Test_6508()
-		{
-		}
-		[TestMethod]
-		public void Test_6509()
-		{
-		}
-		[TestMethod]
-		public void Test_6510()
-		{
-		}
-		[TestMethod]
-		public void Test_6511()
-		{
-		}
-		[TestMethod]
-		public void Test_6512()
-		{
-		}
-		[TestMethod]
-		public void Test_6513()
-		{
-		}
-		[TestMethod]
-		public void Test_6514()
-		{
-		}
-		[TestMethod]
-		public void Test_6515()
-		{
-		}
-		[TestMethod]
-		public void Test_6516()
-		{
-		}
-		[TestMethod]
-		public void Test_6517()
-		{
-		}
-		[TestMethod]
-		public void Test_6518()
-		{
-		}
-		[TestMethod]
-		public void Test_6519()
-		{
-		}
-		[TestMethod]
-		public void Test_6520()
-		{
-		}
-		[TestMethod]
-		public void Test_6521()
-		{
-		}
-		[TestMethod]
-		public void Test_6522()
-		{
-		}
-		[TestMethod]
-		public void Test_6523()
-		{
-		}
-		[TestMethod]
-		public void Test_6524()
-		{
-		}
-		[TestMethod]
-		public void Test_6525()
-		{
-		}
-		[TestMethod]
-		public void Test_6526()
-		{
-		}
-		[TestMethod]
-		public void Test_6527()
-		{
-		}
-		[TestMethod]
-		public void Test_6528()
-		{
-		}
-		[TestMethod]
-		public void Test_6529()
-		{
-		}
-		[TestMethod]
-		public void Test_6530()
-		{
-		}
-		[TestMethod]
-		public void Test_6531()
-		{
-		}
-		[TestMethod]
-		public void Test_6532()
-		{
-		}
-		[TestMethod]
-		public void Test_6533()
-		{
-		}
-		[TestMethod]
-		public void Test_6534()
-		{
-		}
-		[TestMethod]
-		public void Test_6535()
-		{
-		}
-		[TestMethod]
-		public void Test_6536()
-		{
-		}
-		[TestMethod]
-		public void Test_6537()
-		{
-		}
-		[TestMethod]
-		public void Test_6538()
-		{
-		}
-		[TestMethod]
-		public void Test_6539()
-		{
-		}
-		[TestMethod]
-		public void Test_6540()
-		{
-		}
-		[TestMethod]
-		public void Test_6541()
-		{
-		}
-		[TestMethod]
-		public void Test_6542()
-		{
-		}
-		[TestMethod]
-		public void Test_6543()
-		{
-		}
-		[TestMethod]
-		public void Test_6544()
-		{
-		}
-		[TestMethod]
-		public void Test_6545()
-		{
-		}
-		[TestMethod]
-		public void Test_6546()
-		{
-		}
-		[TestMethod]
-		public void Test_6547()
-		{
-		}
-		[TestMethod]
-		public void Test_6548()
-		{
-		}
-		[TestMethod]
-		public void Test_6549()
-		{
-		}
-		[TestMethod]
-		public void Test_6550()
-		{
-		}
-		[TestMethod]
-		public void Test_6551()
-		{
-		}
-		[TestMethod]
-		public void Test_6552()
-		{
-		}
-		[TestMethod]
-		public void Test_6553()
-		{
-		}
-		[TestMethod]
-		public void Test_6554()
-		{
-		}
-		[TestMethod]
-		public void Test_6555()
-		{
-		}
-		[TestMethod]
-		public void Test_6556()
-		{
-		}
-		[TestMethod]
-		public void Test_6557()
-		{
-		}
-		[TestMethod]
-		public void Test_6558()
-		{
-		}
-		[TestMethod]
-		public void Test_6559()
-		{
-		}
-		[TestMethod]
-		public void Test_6560()
-		{
-		}
-		[TestMethod]
-		public void Test_6561()
-		{
-		}
-		[TestMethod]
-		public void Test_6562()
-		{
-		}
-		[TestMethod]
-		public void Test_6563()
-		{
-		}
-		[TestMethod]
-		public void Test_6564()
-		{
-		}
-		[TestMethod]
-		public void Test_6565()
-		{
-		}
-		[TestMethod]
-		public void Test_6566()
-		{
-		}
-		[TestMethod]
-		public void Test_6567()
-		{
-		}
-		[TestMethod]
-		public void Test_6568()
-		{
-		}
-		[TestMethod]
-		public void Test_6569()
-		{
-		}
-		[TestMethod]
-		public void Test_6570()
-		{
-		}
-		[TestMethod]
-		public void Test_6571()
-		{
-		}
-		[TestMethod]
-		public void Test_6572()
-		{
-		}
-		[TestMethod]
-		public void Test_6573()
-		{
-		}
-		[TestMethod]
-		public void Test_6574()
-		{
-		}
-		[TestMethod]
-		public void Test_6575()
-		{
-		}
-		[TestMethod]
-		public void Test_6576()
-		{
-		}
-		[TestMethod]
-		public void Test_6577()
-		{
-		}
-		[TestMethod]
-		public void Test_6578()
-		{
-		}
-		[TestMethod]
-		public void Test_6579()
-		{
-		}
-		[TestMethod]
-		public void Test_6580()
-		{
-		}
-		[TestMethod]
-		public void Test_6581()
-		{
-		}
-		[TestMethod]
-		public void Test_6582()
-		{
-		}
-		[TestMethod]
-		public void Test_6583()
-		{
-		}
-		[TestMethod]
-		public void Test_6584()
-		{
-		}
-		[TestMethod]
-		public void Test_6585()
-		{
-		}
-		[TestMethod]
-		public void Test_6586()
-		{
-		}
-		[TestMethod]
-		public void Test_6587()
-		{
-		}
-		[TestMethod]
-		public void Test_6588()
-		{
-		}
-		[TestMethod]
-		public void Test_6589()
-		{
-		}
-		[TestMethod]
-		public void Test_6590()
-		{
-		}
-		[TestMethod]
-		public void Test_6591()
-		{
-		}
-		[TestMethod]
-		public void Test_6592()
-		{
-		}
-		[TestMethod]
-		public void Test_6593()
-		{
-		}
-		[TestMethod]
-		public void Test_6594()
-		{
-		}
-		[TestMethod]
-		public void Test_6595()
-		{
-		}
-		[TestMethod]
-		public void Test_6596()
-		{
-		}
-		[TestMethod]
-		public void Test_6597()
-		{
-		}
-		[TestMethod]
-		public void Test_6598()
-		{
-		}
-		[TestMethod]
-		public void Test_6599()
-		{
-		}
-		[TestMethod]
-		public void Test_6600()
-		{
-		}
-		[TestMethod]
-		public void Test_6601()
-		{
-		}
-		[TestMethod]
-		public void Test_6602()
-		{
-		}
-		[TestMethod]
-		public void Test_6603()
-		{
-		}
-		[TestMethod]
-		public void Test_6604()
-		{
-		}
-		[TestMethod]
-		public void Test_6605()
-		{
-		}
-		[TestMethod]
-		public void Test_6606()
-		{
-		}
-		[TestMethod]
-		public void Test_6607()
-		{
-		}
-		[TestMethod]
-		public void Test_6608()
-		{
-		}
-		[TestMethod]
-		public void Test_6609()
-		{
-		}
-		[TestMethod]
-		public void Test_6610()
-		{
-		}
-		[TestMethod]
-		public void Test_6611()
-		{
-		}
-		[TestMethod]
-		public void Test_6612()
-		{
-		}
-		[TestMethod]
-		public void Test_6613()
-		{
-		}
-		[TestMethod]
-		public void Test_6614()
-		{
-		}
-		[TestMethod]
-		public void Test_6615()
-		{
-		}
-		[TestMethod]
-		public void Test_6616()
-		{
-		}
-		[TestMethod]
-		public void Test_6617()
-		{
-		}
-		[TestMethod]
-		public void Test_6618()
-		{
-		}
-		[TestMethod]
-		public void Test_6619()
-		{
-		}
-		[TestMethod]
-		public void Test_6620()
-		{
-		}
-		[TestMethod]
-		public void Test_6621()
-		{
-		}
-		[TestMethod]
-		public void Test_6622()
-		{
-		}
-		[TestMethod]
-		public void Test_6623()
-		{
-		}
-		[TestMethod]
-		public void Test_6624()
-		{
-		}
-		[TestMethod]
-		public void Test_6625()
-		{
-		}
-		[TestMethod]
-		public void Test_6626()
-		{
-		}
-		[TestMethod]
-		public void Test_6627()
-		{
-		}
-		[TestMethod]
-		public void Test_6628()
-		{
-		}
-		[TestMethod]
-		public void Test_6629()
-		{
-		}
-		[TestMethod]
-		public void Test_6630()
-		{
-		}
-		[TestMethod]
-		public void Test_6631()
-		{
-		}
-		[TestMethod]
-		public void Test_6632()
-		{
-		}
-		[TestMethod]
-		public void Test_6633()
-		{
-		}
-		[TestMethod]
-		public void Test_6634()
-		{
-		}
-		[TestMethod]
-		public void Test_6635()
-		{
-		}
-		[TestMethod]
-		public void Test_6636()
-		{
-		}
-		[TestMethod]
-		public void Test_6637()
-		{
-		}
-		[TestMethod]
-		public void Test_6638()
-		{
-		}
-		[TestMethod]
-		public void Test_6639()
-		{
-		}
-		[TestMethod]
-		public void Test_6640()
-		{
-		}
-		[TestMethod]
-		public void Test_6641()
-		{
-		}
-		[TestMethod]
-		public void Test_6642()
-		{
-		}
-		[TestMethod]
-		public void Test_6643()
-		{
-		}
-		[TestMethod]
-		public void Test_6644()
-		{
-		}
-		[TestMethod]
-		public void Test_6645()
-		{
-		}
-		[TestMethod]
-		public void Test_6646()
-		{
-		}
-		[TestMethod]
-		public void Test_6647()
-		{
-		}
-		[TestMethod]
-		public void Test_6648()
-		{
-		}
-		[TestMethod]
-		public void Test_6649()
-		{
-		}
-		[TestMethod]
-		public void Test_6650()
-		{
-		}
-		[TestMethod]
-		public void Test_6651()
-		{
-		}
-		[TestMethod]
-		public void Test_6652()
-		{
-		}
-		[TestMethod]
-		public void Test_6653()
-		{
-		}
-		[TestMethod]
-		public void Test_6654()
-		{
-		}
-		[TestMethod]
-		public void Test_6655()
-		{
-		}
-		[TestMethod]
-		public void Test_6656()
-		{
-		}
-		[TestMethod]
-		public void Test_6657()
-		{
-		}
-		[TestMethod]
-		public void Test_6658()
-		{
-		}
-		[TestMethod]
-		public void Test_6659()
-		{
-		}
-		[TestMethod]
-		public void Test_6660()
-		{
-		}
-		[TestMethod]
-		public void Test_6661()
-		{
-		}
-		[TestMethod]
-		public void Test_6662()
-		{
-		}
-		[TestMethod]
-		public void Test_6663()
-		{
-		}
-		[TestMethod]
-		public void Test_6664()
-		{
-		}
-		[TestMethod]
-		public void Test_6665()
-		{
-		}
-		[TestMethod]
-		public void Test_6666()
-		{
-		}
-		[TestMethod]
-		public void Test_6667()
-		{
-		}
-		[TestMethod]
-		public void Test_6668()
-		{
-		}
-		[TestMethod]
-		public void Test_6669()
-		{
-		}
-		[TestMethod]
-		public void Test_6670()
-		{
-		}
-		[TestMethod]
-		public void Test_6671()
-		{
-		}
-		[TestMethod]
-		public void Test_6672()
-		{
-		}
-		[TestMethod]
-		public void Test_6673()
-		{
-		}
-		[TestMethod]
-		public void Test_6674()
-		{
-		}
-		[TestMethod]
-		public void Test_6675()
-		{
-		}
-		[TestMethod]
-		public void Test_6676()
-		{
-		}
-		[TestMethod]
-		public void Test_6677()
-		{
-		}
-		[TestMethod]
-		public void Test_6678()
-		{
-		}
-		[TestMethod]
-		public void Test_6679()
-		{
-		}
-		[TestMethod]
-		public void Test_6680()
-		{
-		}
-		[TestMethod]
-		public void Test_6681()
-		{
-		}
-		[TestMethod]
-		public void Test_6682()
-		{
-		}
-		[TestMethod]
-		public void Test_6683()
-		{
-		}
-		[TestMethod]
-		public void Test_6684()
-		{
-		}
-		[TestMethod]
-		public void Test_6685()
-		{
-		}
-		[TestMethod]
-		public void Test_6686()
-		{
-		}
-		[TestMethod]
-		public void Test_6687()
-		{
-		}
-		[TestMethod]
-		public void Test_6688()
-		{
-		}
-		[TestMethod]
-		public void Test_6689()
-		{
-		}
-		[TestMethod]
-		public void Test_6690()
-		{
-		}
-		[TestMethod]
-		public void Test_6691()
-		{
-		}
-		[TestMethod]
-		public void Test_6692()
-		{
-		}
-		[TestMethod]
-		public void Test_6693()
-		{
-		}
-		[TestMethod]
-		public void Test_6694()
-		{
-		}
-		[TestMethod]
-		public void Test_6695()
-		{
-		}
-		[TestMethod]
-		public void Test_6696()
-		{
-		}
-		[TestMethod]
-		public void Test_6697()
-		{
-		}
-		[TestMethod]
-		public void Test_6698()
-		{
-		}
-		[TestMethod]
-		public void Test_6699()
-		{
-		}
-		[TestMethod]
-		public void Test_6700()
-		{
-		}
-		[TestMethod]
-		public void Test_6701()
-		{
-		}
-		[TestMethod]
-		public void Test_6702()
-		{
-		}
-		[TestMethod]
-		public void Test_6703()
-		{
-		}
-		[TestMethod]
-		public void Test_6704()
-		{
-		}
-		[TestMethod]
-		public void Test_6705()
-		{
-		}
-		[TestMethod]
-		public void Test_6706()
-		{
-		}
-		[TestMethod]
-		public void Test_6707()
-		{
-		}
-		[TestMethod]
-		public void Test_6708()
-		{
-		}
-		[TestMethod]
-		public void Test_6709()
-		{
-		}
-		[TestMethod]
-		public void Test_6710()
-		{
-		}
-		[TestMethod]
-		public void Test_6711()
-		{
-		}
-		[TestMethod]
-		public void Test_6712()
-		{
-		}
-		[TestMethod]
-		public void Test_6713()
-		{
-		}
-		[TestMethod]
-		public void Test_6714()
-		{
-		}
-		[TestMethod]
-		public void Test_6715()
-		{
-		}
-		[TestMethod]
-		public void Test_6716()
-		{
-		}
-		[TestMethod]
-		public void Test_6717()
-		{
-		}
-		[TestMethod]
-		public void Test_6718()
-		{
-		}
-		[TestMethod]
-		public void Test_6719()
-		{
-		}
-		[TestMethod]
-		public void Test_6720()
-		{
-		}
-		[TestMethod]
-		public void Test_6721()
-		{
-		}
-		[TestMethod]
-		public void Test_6722()
-		{
-		}
-		[TestMethod]
-		public void Test_6723()
-		{
-		}
-		[TestMethod]
-		public void Test_6724()
-		{
-		}
-		[TestMethod]
-		public void Test_6725()
-		{
-		}
-		[TestMethod]
-		public void Test_6726()
-		{
-		}
-		[TestMethod]
-		public void Test_6727()
-		{
-		}
-		[TestMethod]
-		public void Test_6728()
-		{
-		}
-		[TestMethod]
-		public void Test_6729()
-		{
-		}
-		[TestMethod]
-		public void Test_6730()
-		{
-		}
-		[TestMethod]
-		public void Test_6731()
-		{
-		}
-		[TestMethod]
-		public void Test_6732()
-		{
-		}
-		[TestMethod]
-		public void Test_6733()
-		{
-		}
-		[TestMethod]
-		public void Test_6734()
-		{
-		}
-		[TestMethod]
-		public void Test_6735()
-		{
-		}
-		[TestMethod]
-		public void Test_6736()
-		{
-		}
-		[TestMethod]
-		public void Test_6737()
-		{
-		}
-		[TestMethod]
-		public void Test_6738()
-		{
-		}
-		[TestMethod]
-		public void Test_6739()
-		{
-		}
-		[TestMethod]
-		public void Test_6740()
-		{
-		}
-		[TestMethod]
-		public void Test_6741()
-		{
-		}
-		[TestMethod]
-		public void Test_6742()
-		{
-		}
-		[TestMethod]
-		public void Test_6743()
-		{
-		}
-		[TestMethod]
-		public void Test_6744()
-		{
-		}
-		[TestMethod]
-		public void Test_6745()
-		{
-		}
-		[TestMethod]
-		public void Test_6746()
-		{
-		}
-		[TestMethod]
-		public void Test_6747()
-		{
-		}
-		[TestMethod]
-		public void Test_6748()
-		{
-		}
-		[TestMethod]
-		public void Test_6749()
-		{
-		}
-		[TestMethod]
-		public void Test_6750()
-		{
-		}
-		[TestMethod]
-		public void Test_6751()
-		{
-		}
-		[TestMethod]
-		public void Test_6752()
-		{
-		}
-		[TestMethod]
-		public void Test_6753()
-		{
-		}
-		[TestMethod]
-		public void Test_6754()
-		{
-		}
-		[TestMethod]
-		public void Test_6755()
-		{
-		}
-		[TestMethod]
-		public void Test_6756()
-		{
-		}
-		[TestMethod]
-		public void Test_6757()
-		{
-		}
-		[TestMethod]
-		public void Test_6758()
-		{
-		}
-		[TestMethod]
-		public void Test_6759()
-		{
-		}
-		[TestMethod]
-		public void Test_6760()
-		{
-		}
-		[TestMethod]
-		public void Test_6761()
-		{
-		}
-		[TestMethod]
-		public void Test_6762()
-		{
-		}
-		[TestMethod]
-		public void Test_6763()
-		{
-		}
-		[TestMethod]
-		public void Test_6764()
-		{
-		}
-		[TestMethod]
-		public void Test_6765()
-		{
-		}
-		[TestMethod]
-		public void Test_6766()
-		{
-		}
-		[TestMethod]
-		public void Test_6767()
-		{
-		}
-		[TestMethod]
-		public void Test_6768()
-		{
-		}
-		[TestMethod]
-		public void Test_6769()
-		{
-		}
-		[TestMethod]
-		public void Test_6770()
-		{
-		}
-		[TestMethod]
-		public void Test_6771()
-		{
-		}
-		[TestMethod]
-		public void Test_6772()
-		{
-		}
-		[TestMethod]
-		public void Test_6773()
-		{
-		}
-		[TestMethod]
-		public void Test_6774()
-		{
-		}
-		[TestMethod]
-		public void Test_6775()
-		{
-		}
-		[TestMethod]
-		public void Test_6776()
-		{
-		}
-		[TestMethod]
-		public void Test_6777()
-		{
-		}
-		[TestMethod]
-		public void Test_6778()
-		{
-		}
-		[TestMethod]
-		public void Test_6779()
-		{
-		}
-		[TestMethod]
-		public void Test_6780()
-		{
-		}
-		[TestMethod]
-		public void Test_6781()
-		{
-		}
-		[TestMethod]
-		public void Test_6782()
-		{
-		}
-		[TestMethod]
-		public void Test_6783()
-		{
-		}
-		[TestMethod]
-		public void Test_6784()
-		{
-		}
-		[TestMethod]
-		public void Test_6785()
-		{
-		}
-		[TestMethod]
-		public void Test_6786()
-		{
-		}
-		[TestMethod]
-		public void Test_6787()
-		{
-		}
-		[TestMethod]
-		public void Test_6788()
-		{
-		}
-		[TestMethod]
-		public void Test_6789()
-		{
-		}
-		[TestMethod]
-		public void Test_6790()
-		{
-		}
-		[TestMethod]
-		public void Test_6791()
-		{
-		}
-		[TestMethod]
-		public void Test_6792()
-		{
-		}
-		[TestMethod]
-		public void Test_6793()
-		{
-		}
-		[TestMethod]
-		public void Test_6794()
-		{
-		}
-		[TestMethod]
-		public void Test_6795()
-		{
-		}
-		[TestMethod]
-		public void Test_6796()
-		{
-		}
-		[TestMethod]
-		public void Test_6797()
-		{
-		}
-		[TestMethod]
-		public void Test_6798()
-		{
-		}
-		[TestMethod]
-		public void Test_6799()
-		{
-		}
-		[TestMethod]
-		public void Test_6800()
-		{
-		}
-		[TestMethod]
-		public void Test_6801()
-		{
-		}
-		[TestMethod]
-		public void Test_6802()
-		{
-		}
-		[TestMethod]
-		public void Test_6803()
-		{
-		}
-		[TestMethod]
-		public void Test_6804()
-		{
-		}
-		[TestMethod]
-		public void Test_6805()
-		{
-		}
-		[TestMethod]
-		public void Test_6806()
-		{
-		}
-		[TestMethod]
-		public void Test_6807()
-		{
-		}
-		[TestMethod]
-		public void Test_6808()
-		{
-		}
-		[TestMethod]
-		public void Test_6809()
-		{
-		}
-		[TestMethod]
-		public void Test_6810()
-		{
-		}
-		[TestMethod]
-		public void Test_6811()
-		{
-		}
-		[TestMethod]
-		public void Test_6812()
-		{
-		}
-		[TestMethod]
-		public void Test_6813()
-		{
-		}
-		[TestMethod]
-		public void Test_6814()
-		{
-		}
-		[TestMethod]
-		public void Test_6815()
-		{
-		}
-		[TestMethod]
-		public void Test_6816()
-		{
-		}
-		[TestMethod]
-		public void Test_6817()
-		{
-		}
-		[TestMethod]
-		public void Test_6818()
-		{
-		}
-		[TestMethod]
-		public void Test_6819()
-		{
-		}
-		[TestMethod]
-		public void Test_6820()
-		{
-		}
-		[TestMethod]
-		public void Test_6821()
-		{
-		}
-		[TestMethod]
-		public void Test_6822()
-		{
-		}
-		[TestMethod]
-		public void Test_6823()
-		{
-		}
-		[TestMethod]
-		public void Test_6824()
-		{
-		}
-		[TestMethod]
-		public void Test_6825()
-		{
-		}
-		[TestMethod]
-		public void Test_6826()
-		{
-		}
-		[TestMethod]
-		public void Test_6827()
-		{
-		}
-		[TestMethod]
-		public void Test_6828()
-		{
-		}
-		[TestMethod]
-		public void Test_6829()
-		{
-		}
-		[TestMethod]
-		public void Test_6830()
-		{
-		}
-		[TestMethod]
-		public void Test_6831()
-		{
-		}
-		[TestMethod]
-		public void Test_6832()
-		{
-		}
-		[TestMethod]
-		public void Test_6833()
-		{
-		}
-		[TestMethod]
-		public void Test_6834()
-		{
-		}
-		[TestMethod]
-		public void Test_6835()
-		{
-		}
-		[TestMethod]
-		public void Test_6836()
-		{
-		}
-		[TestMethod]
-		public void Test_6837()
-		{
-		}
-		[TestMethod]
-		public void Test_6838()
-		{
-		}
-		[TestMethod]
-		public void Test_6839()
-		{
-		}
-		[TestMethod]
-		public void Test_6840()
-		{
-		}
-		[TestMethod]
-		public void Test_6841()
-		{
-		}
-		[TestMethod]
-		public void Test_6842()
-		{
-		}
-		[TestMethod]
-		public void Test_6843()
-		{
-		}
-		[TestMethod]
-		public void Test_6844()
-		{
-		}
-		[TestMethod]
-		public void Test_6845()
-		{
-		}
-		[TestMethod]
-		public void Test_6846()
-		{
-		}
-		[TestMethod]
-		public void Test_6847()
-		{
-		}
-		[TestMethod]
-		public void Test_6848()
-		{
-		}
-		[TestMethod]
-		public void Test_6849()
-		{
-		}
-		[TestMethod]
-		public void Test_6850()
-		{
-		}
-		[TestMethod]
-		public void Test_6851()
-		{
-		}
-		[TestMethod]
-		public void Test_6852()
-		{
-		}
-		[TestMethod]
-		public void Test_6853()
-		{
-		}
-		[TestMethod]
-		public void Test_6854()
-		{
-		}
-		[TestMethod]
-		public void Test_6855()
-		{
-		}
-		[TestMethod]
-		public void Test_6856()
-		{
-		}
-		[TestMethod]
-		public void Test_6857()
-		{
-		}
-		[TestMethod]
-		public void Test_6858()
-		{
-		}
-		[TestMethod]
-		public void Test_6859()
-		{
-		}
-		[TestMethod]
-		public void Test_6860()
-		{
-		}
-		[TestMethod]
-		public void Test_6861()
-		{
-		}
-		[TestMethod]
-		public void Test_6862()
-		{
-		}
-		[TestMethod]
-		public void Test_6863()
-		{
-		}
-		[TestMethod]
-		public void Test_6864()
-		{
-		}
-		[TestMethod]
-		public void Test_6865()
-		{
-		}
-		[TestMethod]
-		public void Test_6866()
-		{
-		}
-		[TestMethod]
-		public void Test_6867()
-		{
-		}
-		[TestMethod]
-		public void Test_6868()
-		{
-		}
-		[TestMethod]
-		public void Test_6869()
-		{
-		}
-		[TestMethod]
-		public void Test_6870()
-		{
-		}
-		[TestMethod]
-		public void Test_6871()
-		{
-		}
-		[TestMethod]
-		public void Test_6872()
-		{
-		}
-		[TestMethod]
-		public void Test_6873()
-		{
-		}
-		[TestMethod]
-		public void Test_6874()
-		{
-		}
-		[TestMethod]
-		public void Test_6875()
-		{
-		}
-		[TestMethod]
-		public void Test_6876()
-		{
-		}
-		[TestMethod]
-		public void Test_6877()
-		{
-		}
-		[TestMethod]
-		public void Test_6878()
-		{
-		}
-		[TestMethod]
-		public void Test_6879()
-		{
-		}
-		[TestMethod]
-		public void Test_6880()
-		{
-		}
-		[TestMethod]
-		public void Test_6881()
-		{
-		}
-		[TestMethod]
-		public void Test_6882()
-		{
-		}
-		[TestMethod]
-		public void Test_6883()
-		{
-		}
-		[TestMethod]
-		public void Test_6884()
-		{
-		}
-		[TestMethod]
-		public void Test_6885()
-		{
-		}
-		[TestMethod]
-		public void Test_6886()
-		{
-		}
-		[TestMethod]
-		public void Test_6887()
-		{
-		}
-		[TestMethod]
-		public void Test_6888()
-		{
-		}
-		[TestMethod]
-		public void Test_6889()
-		{
-		}
-		[TestMethod]
-		public void Test_6890()
-		{
-		}
-		[TestMethod]
-		public void Test_6891()
-		{
-		}
-		[TestMethod]
-		public void Test_6892()
-		{
-		}
-		[TestMethod]
-		public void Test_6893()
-		{
-		}
-		[TestMethod]
-		public void Test_6894()
-		{
-		}
-		[TestMethod]
-		public void Test_6895()
-		{
-		}
-		[TestMethod]
-		public void Test_6896()
-		{
-		}
-		[TestMethod]
-		public void Test_6897()
-		{
-		}
-		[TestMethod]
-		public void Test_6898()
-		{
-		}
-		[TestMethod]
-		public void Test_6899()
-		{
-		}
-		[TestMethod]
-		public void Test_6900()
-		{
-		}
-		[TestMethod]
-		public void Test_6901()
-		{
-		}
-		[TestMethod]
-		public void Test_6902()
-		{
-		}
-		[TestMethod]
-		public void Test_6903()
-		{
-		}
-		[TestMethod]
-		public void Test_6904()
-		{
-		}
-		[TestMethod]
-		public void Test_6905()
-		{
-		}
-		[TestMethod]
-		public void Test_6906()
-		{
-		}
-		[TestMethod]
-		public void Test_6907()
-		{
-		}
-		[TestMethod]
-		public void Test_6908()
-		{
-		}
-		[TestMethod]
-		public void Test_6909()
-		{
-		}
-		[TestMethod]
-		public void Test_6910()
-		{
-		}
-		[TestMethod]
-		public void Test_6911()
-		{
-		}
-		[TestMethod]
-		public void Test_6912()
-		{
-		}
-		[TestMethod]
-		public void Test_6913()
-		{
-		}
-		[TestMethod]
-		public void Test_6914()
-		{
-		}
-		[TestMethod]
-		public void Test_6915()
-		{
-		}
-		[TestMethod]
-		public void Test_6916()
-		{
-		}
-		[TestMethod]
-		public void Test_6917()
-		{
-		}
-		[TestMethod]
-		public void Test_6918()
-		{
-		}
-		[TestMethod]
-		public void Test_6919()
-		{
-		}
-		[TestMethod]
-		public void Test_6920()
-		{
-		}
-		[TestMethod]
-		public void Test_6921()
-		{
-		}
-		[TestMethod]
-		public void Test_6922()
-		{
-		}
-		[TestMethod]
-		public void Test_6923()
-		{
-		}
-		[TestMethod]
-		public void Test_6924()
-		{
-		}
-		[TestMethod]
-		public void Test_6925()
-		{
-		}
-		[TestMethod]
-		public void Test_6926()
-		{
-		}
-		[TestMethod]
-		public void Test_6927()
-		{
-		}
-		[TestMethod]
-		public void Test_6928()
-		{
-		}
-		[TestMethod]
-		public void Test_6929()
-		{
-		}
-		[TestMethod]
-		public void Test_6930()
-		{
-		}
-		[TestMethod]
-		public void Test_6931()
-		{
-		}
-		[TestMethod]
-		public void Test_6932()
-		{
-		}
-		[TestMethod]
-		public void Test_6933()
-		{
-		}
-		[TestMethod]
-		public void Test_6934()
-		{
-		}
-		[TestMethod]
-		public void Test_6935()
-		{
-		}
-		[TestMethod]
-		public void Test_6936()
-		{
-		}
-		[TestMethod]
-		public void Test_6937()
-		{
-		}
-		[TestMethod]
-		public void Test_6938()
-		{
-		}
-		[TestMethod]
-		public void Test_6939()
-		{
-		}
-		[TestMethod]
-		public void Test_6940()
-		{
-		}
-		[TestMethod]
-		public void Test_6941()
-		{
-		}
-		[TestMethod]
-		public void Test_6942()
-		{
-		}
-		[TestMethod]
-		public void Test_6943()
-		{
-		}
-		[TestMethod]
-		public void Test_6944()
-		{
-		}
-		[TestMethod]
-		public void Test_6945()
-		{
-		}
-		[TestMethod]
-		public void Test_6946()
-		{
-		}
-		[TestMethod]
-		public void Test_6947()
-		{
-		}
-		[TestMethod]
-		public void Test_6948()
-		{
-		}
-		[TestMethod]
-		public void Test_6949()
-		{
-		}
-		[TestMethod]
-		public void Test_6950()
-		{
-		}
-		[TestMethod]
-		public void Test_6951()
-		{
-		}
-		[TestMethod]
-		public void Test_6952()
-		{
-		}
-		[TestMethod]
-		public void Test_6953()
-		{
-		}
-		[TestMethod]
-		public void Test_6954()
-		{
-		}
-		[TestMethod]
-		public void Test_6955()
-		{
-		}
-		[TestMethod]
-		public void Test_6956()
-		{
-		}
-		[TestMethod]
-		public void Test_6957()
-		{
-		}
-		[TestMethod]
-		public void Test_6958()
-		{
-		}
-		[TestMethod]
-		public void Test_6959()
-		{
-		}
-		[TestMethod]
-		public void Test_6960()
-		{
-		}
-		[TestMethod]
-		public void Test_6961()
-		{
-		}
-		[TestMethod]
-		public void Test_6962()
-		{
-		}
-		[TestMethod]
-		public void Test_6963()
-		{
-		}
-		[TestMethod]
-		public void Test_6964()
-		{
-		}
-		[TestMethod]
-		public void Test_6965()
-		{
-		}
-		[TestMethod]
-		public void Test_6966()
-		{
-		}
-		[TestMethod]
-		public void Test_6967()
-		{
-		}
-		[TestMethod]
-		public void Test_6968()
-		{
-		}
-		[TestMethod]
-		public void Test_6969()
-		{
-		}
-		[TestMethod]
-		public void Test_6970()
-		{
-		}
-		[TestMethod]
-		public void Test_6971()
-		{
-		}
-		[TestMethod]
-		public void Test_6972()
-		{
-		}
-		[TestMethod]
-		public void Test_6973()
-		{
-		}
-		[TestMethod]
-		public void Test_6974()
-		{
-		}
-		[TestMethod]
-		public void Test_6975()
-		{
-		}
-		[TestMethod]
-		public void Test_6976()
-		{
-		}
-		[TestMethod]
-		public void Test_6977()
-		{
-		}
-		[TestMethod]
-		public void Test_6978()
-		{
-		}
-		[TestMethod]
-		public void Test_6979()
-		{
-		}
-		[TestMethod]
-		public void Test_6980()
-		{
-		}
-		[TestMethod]
-		public void Test_6981()
-		{
-		}
-		[TestMethod]
-		public void Test_6982()
-		{
-		}
-		[TestMethod]
-		public void Test_6983()
-		{
-		}
-		[TestMethod]
-		public void Test_6984()
-		{
-		}
-		[TestMethod]
-		public void Test_6985()
-		{
-		}
-		[TestMethod]
-		public void Test_6986()
-		{
-		}
-		[TestMethod]
-		public void Test_6987()
-		{
-		}
-		[TestMethod]
-		public void Test_6988()
-		{
-		}
-		[TestMethod]
-		public void Test_6989()
-		{
-		}
-		[TestMethod]
-		public void Test_6990()
-		{
-		}
-		[TestMethod]
-		public void Test_6991()
-		{
-		}
-		[TestMethod]
-		public void Test_6992()
-		{
-		}
-		[TestMethod]
-		public void Test_6993()
-		{
-		}
-		[TestMethod]
-		public void Test_6994()
-		{
-		}
-		[TestMethod]
-		public void Test_6995()
-		{
-		}
-		[TestMethod]
-		public void Test_6996()
-		{
-		}
-		[TestMethod]
-		public void Test_6997()
-		{
-		}
-		[TestMethod]
-		public void Test_6998()
-		{
-		}
-		[TestMethod]
-		public void Test_6999()
-		{
-		}
-		[TestMethod]
-		public void Test_7000()
-		{
-		}
-		[TestMethod]
-		public void Test_7001()
-		{
-		}
-		[TestMethod]
-		public void Test_7002()
-		{
-		}
-		[TestMethod]
-		public void Test_7003()
-		{
-		}
-		[TestMethod]
-		public void Test_7004()
-		{
-		}
-		[TestMethod]
-		public void Test_7005()
-		{
-		}
-		[TestMethod]
-		public void Test_7006()
-		{
-		}
-		[TestMethod]
-		public void Test_7007()
-		{
-		}
-		[TestMethod]
-		public void Test_7008()
-		{
-		}
-		[TestMethod]
-		public void Test_7009()
-		{
-		}
-		[TestMethod]
-		public void Test_7010()
-		{
-		}
-		[TestMethod]
-		public void Test_7011()
-		{
-		}
-		[TestMethod]
-		public void Test_7012()
-		{
-		}
-		[TestMethod]
-		public void Test_7013()
-		{
-		}
-		[TestMethod]
-		public void Test_7014()
-		{
-		}
-		[TestMethod]
-		public void Test_7015()
-		{
-		}
-		[TestMethod]
-		public void Test_7016()
-		{
-		}
-		[TestMethod]
-		public void Test_7017()
-		{
-		}
-		[TestMethod]
-		public void Test_7018()
-		{
-		}
-		[TestMethod]
-		public void Test_7019()
-		{
-		}
-		[TestMethod]
-		public void Test_7020()
-		{
-		}
-		[TestMethod]
-		public void Test_7021()
-		{
-		}
-		[TestMethod]
-		public void Test_7022()
-		{
-		}
-		[TestMethod]
-		public void Test_7023()
-		{
-		}
-		[TestMethod]
-		public void Test_7024()
-		{
-		}
-		[TestMethod]
-		public void Test_7025()
-		{
-		}
-		[TestMethod]
-		public void Test_7026()
-		{
-		}
-		[TestMethod]
-		public void Test_7027()
-		{
-		}
-		[TestMethod]
-		public void Test_7028()
-		{
-		}
-		[TestMethod]
-		public void Test_7029()
-		{
-		}
-		[TestMethod]
-		public void Test_7030()
-		{
-		}
-		[TestMethod]
-		public void Test_7031()
-		{
-		}
-		[TestMethod]
-		public void Test_7032()
-		{
-		}
-		[TestMethod]
-		public void Test_7033()
-		{
-		}
-		[TestMethod]
-		public void Test_7034()
-		{
-		}
-		[TestMethod]
-		public void Test_7035()
-		{
-		}
-		[TestMethod]
-		public void Test_7036()
-		{
-		}
-		[TestMethod]
-		public void Test_7037()
-		{
-		}
-		[TestMethod]
-		public void Test_7038()
-		{
-		}
-		[TestMethod]
-		public void Test_7039()
-		{
-		}
-		[TestMethod]
-		public void Test_7040()
-		{
-		}
-		[TestMethod]
-		public void Test_7041()
-		{
-		}
-		[TestMethod]
-		public void Test_7042()
-		{
-		}
-		[TestMethod]
-		public void Test_7043()
-		{
-		}
-		[TestMethod]
-		public void Test_7044()
-		{
-		}
-		[TestMethod]
-		public void Test_7045()
-		{
-		}
-		[TestMethod]
-		public void Test_7046()
-		{
-		}
-		[TestMethod]
-		public void Test_7047()
-		{
-		}
-		[TestMethod]
-		public void Test_7048()
-		{
-		}
-		[TestMethod]
-		public void Test_7049()
-		{
-		}
-		[TestMethod]
-		public void Test_7050()
-		{
-		}
-		[TestMethod]
-		public void Test_7051()
-		{
-		}
-		[TestMethod]
-		public void Test_7052()
-		{
-		}
-		[TestMethod]
-		public void Test_7053()
-		{
-		}
-		[TestMethod]
-		public void Test_7054()
-		{
-		}
-		[TestMethod]
-		public void Test_7055()
-		{
-		}
-		[TestMethod]
-		public void Test_7056()
-		{
-		}
-		[TestMethod]
-		public void Test_7057()
-		{
-		}
-		[TestMethod]
-		public void Test_7058()
-		{
-		}
-		[TestMethod]
-		public void Test_7059()
-		{
-		}
-		[TestMethod]
-		public void Test_7060()
-		{
-		}
-		[TestMethod]
-		public void Test_7061()
-		{
-		}
-		[TestMethod]
-		public void Test_7062()
-		{
-		}
-		[TestMethod]
-		public void Test_7063()
-		{
-		}
-		[TestMethod]
-		public void Test_7064()
-		{
-		}
-		[TestMethod]
-		public void Test_7065()
-		{
-		}
-		[TestMethod]
-		public void Test_7066()
-		{
-		}
-		[TestMethod]
-		public void Test_7067()
-		{
-		}
-		[TestMethod]
-		public void Test_7068()
-		{
-		}
-		[TestMethod]
-		public void Test_7069()
-		{
-		}
-		[TestMethod]
-		public void Test_7070()
-		{
-		}
-		[TestMethod]
-		public void Test_7071()
-		{
-		}
-		[TestMethod]
-		public void Test_7072()
-		{
-		}
-		[TestMethod]
-		public void Test_7073()
-		{
-		}
-		[TestMethod]
-		public void Test_7074()
-		{
-		}
-		[TestMethod]
-		public void Test_7075()
-		{
-		}
-		[TestMethod]
-		public void Test_7076()
-		{
-		}
-		[TestMethod]
-		public void Test_7077()
-		{
-		}
-		[TestMethod]
-		public void Test_7078()
-		{
-		}
-		[TestMethod]
-		public void Test_7079()
-		{
-		}
-		[TestMethod]
-		public void Test_7080()
-		{
-		}
-		[TestMethod]
-		public void Test_7081()
-		{
-		}
-		[TestMethod]
-		public void Test_7082()
-		{
-		}
-		[TestMethod]
-		public void Test_7083()
-		{
-		}
-		[TestMethod]
-		public void Test_7084()
-		{
-		}
-		[TestMethod]
-		public void Test_7085()
-		{
-		}
-		[TestMethod]
-		public void Test_7086()
-		{
-		}
-		[TestMethod]
-		public void Test_7087()
-		{
-		}
-		[TestMethod]
-		public void Test_7088()
-		{
-		}
-		[TestMethod]
-		public void Test_7089()
-		{
-		}
-		[TestMethod]
-		public void Test_7090()
-		{
-		}
-		[TestMethod]
-		public void Test_7091()
-		{
-		}
-		[TestMethod]
-		public void Test_7092()
-		{
-		}
-		[TestMethod]
-		public void Test_7093()
-		{
-		}
-		[TestMethod]
-		public void Test_7094()
-		{
-		}
-		[TestMethod]
-		public void Test_7095()
-		{
-		}
-		[TestMethod]
-		public void Test_7096()
-		{
-		}
-		[TestMethod]
-		public void Test_7097()
-		{
-		}
-		[TestMethod]
-		public void Test_7098()
-		{
-		}
-		[TestMethod]
-		public void Test_7099()
-		{
-		}
-		[TestMethod]
-		public void Test_7100()
-		{
-		}
-		[TestMethod]
-		public void Test_7101()
-		{
-		}
-		[TestMethod]
-		public void Test_7102()
-		{
-		}
-		[TestMethod]
-		public void Test_7103()
-		{
-		}
-		[TestMethod]
-		public void Test_7104()
-		{
-		}
-		[TestMethod]
-		public void Test_7105()
-		{
-		}
-		[TestMethod]
-		public void Test_7106()
-		{
-		}
-		[TestMethod]
-		public void Test_7107()
-		{
-		}
-		[TestMethod]
-		public void Test_7108()
-		{
-		}
-		[TestMethod]
-		public void Test_7109()
-		{
-		}
-		[TestMethod]
-		public void Test_7110()
-		{
-		}
-		[TestMethod]
-		public void Test_7111()
-		{
-		}
-		[TestMethod]
-		public void Test_7112()
-		{
-		}
-		[TestMethod]
-		public void Test_7113()
-		{
-		}
-		[TestMethod]
-		public void Test_7114()
-		{
-		}
-		[TestMethod]
-		public void Test_7115()
-		{
-		}
-		[TestMethod]
-		public void Test_7116()
-		{
-		}
-		[TestMethod]
-		public void Test_7117()
-		{
-		}
-		[TestMethod]
-		public void Test_7118()
-		{
-		}
-		[TestMethod]
-		public void Test_7119()
-		{
-		}
-		[TestMethod]
-		public void Test_7120()
-		{
-		}
-		[TestMethod]
-		public void Test_7121()
-		{
-		}
-		[TestMethod]
-		public void Test_7122()
-		{
-		}
-		[TestMethod]
-		public void Test_7123()
-		{
-		}
-		[TestMethod]
-		public void Test_7124()
-		{
-		}
-		[TestMethod]
-		public void Test_7125()
-		{
-		}
-		[TestMethod]
-		public void Test_7126()
-		{
-		}
-		[TestMethod]
-		public void Test_7127()
-		{
-		}
-		[TestMethod]
-		public void Test_7128()
-		{
-		}
-		[TestMethod]
-		public void Test_7129()
-		{
-		}
-		[TestMethod]
-		public void Test_7130()
-		{
-		}
-		[TestMethod]
-		public void Test_7131()
-		{
-		}
-		[TestMethod]
-		public void Test_7132()
-		{
-		}
-		[TestMethod]
-		public void Test_7133()
-		{
-		}
-		[TestMethod]
-		public void Test_7134()
-		{
-		}
-		[TestMethod]
-		public void Test_7135()
-		{
-		}
-		[TestMethod]
-		public void Test_7136()
-		{
-		}
-		[TestMethod]
-		public void Test_7137()
-		{
-		}
-		[TestMethod]
-		public void Test_7138()
-		{
-		}
-		[TestMethod]
-		public void Test_7139()
-		{
-		}
-		[TestMethod]
-		public void Test_7140()
-		{
-		}
-		[TestMethod]
-		public void Test_7141()
-		{
-		}
-		[TestMethod]
-		public void Test_7142()
-		{
-		}
-		[TestMethod]
-		public void Test_7143()
-		{
-		}
-		[TestMethod]
-		public void Test_7144()
-		{
-		}
-		[TestMethod]
-		public void Test_7145()
-		{
-		}
-		[TestMethod]
-		public void Test_7146()
-		{
-		}
-		[TestMethod]
-		public void Test_7147()
-		{
-		}
-		[TestMethod]
-		public void Test_7148()
-		{
-		}
-		[TestMethod]
-		public void Test_7149()
-		{
-		}
-		[TestMethod]
-		public void Test_7150()
-		{
-		}
-		[TestMethod]
-		public void Test_7151()
-		{
-		}
-		[TestMethod]
-		public void Test_7152()
-		{
-		}
-		[TestMethod]
-		public void Test_7153()
-		{
-		}
-		[TestMethod]
-		public void Test_7154()
-		{
-		}
-		[TestMethod]
-		public void Test_7155()
-		{
-		}
-		[TestMethod]
-		public void Test_7156()
-		{
-		}
-		[TestMethod]
-		public void Test_7157()
-		{
-		}
-		[TestMethod]
-		public void Test_7158()
-		{
-		}
-		[TestMethod]
-		public void Test_7159()
-		{
-		}
-		[TestMethod]
-		public void Test_7160()
-		{
-		}
-		[TestMethod]
-		public void Test_7161()
-		{
-		}
-		[TestMethod]
-		public void Test_7162()
-		{
-		}
-		[TestMethod]
-		public void Test_7163()
-		{
-		}
-		[TestMethod]
-		public void Test_7164()
-		{
-		}
-		[TestMethod]
-		public void Test_7165()
-		{
-		}
-		[TestMethod]
-		public void Test_7166()
-		{
-		}
-		[TestMethod]
-		public void Test_7167()
-		{
-		}
-		[TestMethod]
-		public void Test_7168()
-		{
-		}
-		[TestMethod]
-		public void Test_7169()
-		{
-		}
-		[TestMethod]
-		public void Test_7170()
-		{
-		}
-		[TestMethod]
-		public void Test_7171()
-		{
-		}
-		[TestMethod]
-		public void Test_7172()
-		{
-		}
-		[TestMethod]
-		public void Test_7173()
-		{
-		}
-		[TestMethod]
-		public void Test_7174()
-		{
-		}
-		[TestMethod]
-		public void Test_7175()
-		{
-		}
-		[TestMethod]
-		public void Test_7176()
-		{
-		}
-		[TestMethod]
-		public void Test_7177()
-		{
-		}
-		[TestMethod]
-		public void Test_7178()
-		{
-		}
-		[TestMethod]
-		public void Test_7179()
-		{
-		}
-		[TestMethod]
-		public void Test_7180()
-		{
-		}
-		[TestMethod]
-		public void Test_7181()
-		{
-		}
-		[TestMethod]
-		public void Test_7182()
-		{
-		}
-		[TestMethod]
-		public void Test_7183()
-		{
-		}
-		[TestMethod]
-		public void Test_7184()
-		{
-		}
-		[TestMethod]
-		public void Test_7185()
-		{
-		}
-		[TestMethod]
-		public void Test_7186()
-		{
-		}
-		[TestMethod]
-		public void Test_7187()
-		{
-		}
-		[TestMethod]
-		public void Test_7188()
-		{
-		}
-		[TestMethod]
-		public void Test_7189()
-		{
-		}
-		[TestMethod]
-		public void Test_7190()
-		{
-		}
-		[TestMethod]
-		public void Test_7191()
-		{
-		}
-		[TestMethod]
-		public void Test_7192()
-		{
-		}
-		[TestMethod]
-		public void Test_7193()
-		{
-		}
-		[TestMethod]
-		public void Test_7194()
-		{
-		}
-		[TestMethod]
-		public void Test_7195()
-		{
-		}
-		[TestMethod]
-		public void Test_7196()
-		{
-		}
-		[TestMethod]
-		public void Test_7197()
-		{
-		}
-		[TestMethod]
-		public void Test_7198()
-		{
-		}
-		[TestMethod]
-		public void Test_7199()
-		{
-		}
-		[TestMethod]
-		public void Test_7200()
-		{
-		}
-		[TestMethod]
-		public void Test_7201()
-		{
-		}
-		[TestMethod]
-		public void Test_7202()
-		{
-		}
-		[TestMethod]
-		public void Test_7203()
-		{
-		}
-		[TestMethod]
-		public void Test_7204()
-		{
-		}
-		[TestMethod]
-		public void Test_7205()
-		{
-		}
-		[TestMethod]
-		public void Test_7206()
-		{
-		}
-		[TestMethod]
-		public void Test_7207()
-		{
-		}
-		[TestMethod]
-		public void Test_7208()
-		{
-		}
-		[TestMethod]
-		public void Test_7209()
-		{
-		}
-		[TestMethod]
-		public void Test_7210()
-		{
-		}
-		[TestMethod]
-		public void Test_7211()
-		{
-		}
-		[TestMethod]
-		public void Test_7212()
-		{
-		}
-		[TestMethod]
-		public void Test_7213()
-		{
-		}
-		[TestMethod]
-		public void Test_7214()
-		{
-		}
-		[TestMethod]
-		public void Test_7215()
-		{
-		}
-		[TestMethod]
-		public void Test_7216()
-		{
-		}
-		[TestMethod]
-		public void Test_7217()
-		{
-		}
-		[TestMethod]
-		public void Test_7218()
-		{
-		}
-		[TestMethod]
-		public void Test_7219()
-		{
-		}
-		[TestMethod]
-		public void Test_7220()
-		{
-		}
-		[TestMethod]
-		public void Test_7221()
-		{
-		}
-		[TestMethod]
-		public void Test_7222()
-		{
-		}
-		[TestMethod]
-		public void Test_7223()
-		{
-		}
-		[TestMethod]
-		public void Test_7224()
-		{
-		}
-		[TestMethod]
-		public void Test_7225()
-		{
-		}
-		[TestMethod]
-		public void Test_7226()
-		{
-		}
-		[TestMethod]
-		public void Test_7227()
-		{
-		}
-		[TestMethod]
-		public void Test_7228()
-		{
-		}
-		[TestMethod]
-		public void Test_7229()
-		{
-		}
-		[TestMethod]
-		public void Test_7230()
-		{
-		}
-		[TestMethod]
-		public void Test_7231()
-		{
-		}
-		[TestMethod]
-		public void Test_7232()
-		{
-		}
-		[TestMethod]
-		public void Test_7233()
-		{
-		}
-		[TestMethod]
-		public void Test_7234()
-		{
-		}
-		[TestMethod]
-		public void Test_7235()
-		{
-		}
-		[TestMethod]
-		public void Test_7236()
-		{
-		}
-		[TestMethod]
-		public void Test_7237()
-		{
-		}
-		[TestMethod]
-		public void Test_7238()
-		{
-		}
-		[TestMethod]
-		public void Test_7239()
-		{
-		}
-		[TestMethod]
-		public void Test_7240()
-		{
-		}
-		[TestMethod]
-		public void Test_7241()
-		{
-		}
-		[TestMethod]
-		public void Test_7242()
-		{
-		}
-		[TestMethod]
-		public void Test_7243()
-		{
-		}
-		[TestMethod]
-		public void Test_7244()
-		{
-		}
-		[TestMethod]
-		public void Test_7245()
-		{
-		}
-		[TestMethod]
-		public void Test_7246()
-		{
-		}
-		[TestMethod]
-		public void Test_7247()
-		{
-		}
-		[TestMethod]
-		public void Test_7248()
-		{
-		}
-		[TestMethod]
-		public void Test_7249()
-		{
-		}
-		[TestMethod]
-		public void Test_7250()
-		{
-		}
-		[TestMethod]
-		public void Test_7251()
-		{
-		}
-		[TestMethod]
-		public void Test_7252()
-		{
-		}
-		[TestMethod]
-		public void Test_7253()
-		{
-		}
-		[TestMethod]
-		public void Test_7254()
-		{
-		}
-		[TestMethod]
-		public void Test_7255()
-		{
-		}
-		[TestMethod]
-		public void Test_7256()
-		{
-		}
-		[TestMethod]
-		public void Test_7257()
-		{
-		}
-		[TestMethod]
-		public void Test_7258()
-		{
-		}
-		[TestMethod]
-		public void Test_7259()
-		{
-		}
-		[TestMethod]
-		public void Test_7260()
-		{
-		}
-		[TestMethod]
-		public void Test_7261()
-		{
-		}
-		[TestMethod]
-		public void Test_7262()
-		{
-		}
-		[TestMethod]
-		public void Test_7263()
-		{
-		}
-		[TestMethod]
-		public void Test_7264()
-		{
-		}
-		[TestMethod]
-		public void Test_7265()
-		{
-		}
-		[TestMethod]
-		public void Test_7266()
-		{
-		}
-		[TestMethod]
-		public void Test_7267()
-		{
-		}
-		[TestMethod]
-		public void Test_7268()
-		{
-		}
-		[TestMethod]
-		public void Test_7269()
-		{
-		}
-		[TestMethod]
-		public void Test_7270()
-		{
-		}
-		[TestMethod]
-		public void Test_7271()
-		{
-		}
-		[TestMethod]
-		public void Test_7272()
-		{
-		}
-		[TestMethod]
-		public void Test_7273()
-		{
-		}
-		[TestMethod]
-		public void Test_7274()
-		{
-		}
-		[TestMethod]
-		public void Test_7275()
-		{
-		}
-		[TestMethod]
-		public void Test_7276()
-		{
-		}
-		[TestMethod]
-		public void Test_7277()
-		{
-		}
-		[TestMethod]
-		public void Test_7278()
-		{
-		}
-		[TestMethod]
-		public void Test_7279()
-		{
-		}
-		[TestMethod]
-		public void Test_7280()
-		{
-		}
-		[TestMethod]
-		public void Test_7281()
-		{
-		}
-		[TestMethod]
-		public void Test_7282()
-		{
-		}
-		[TestMethod]
-		public void Test_7283()
-		{
-		}
-		[TestMethod]
-		public void Test_7284()
-		{
-		}
-		[TestMethod]
-		public void Test_7285()
-		{
-		}
-		[TestMethod]
-		public void Test_7286()
-		{
-		}
-		[TestMethod]
-		public void Test_7287()
-		{
-		}
-		[TestMethod]
-		public void Test_7288()
-		{
-		}
-		[TestMethod]
-		public void Test_7289()
-		{
-		}
-		[TestMethod]
-		public void Test_7290()
-		{
-		}
-		[TestMethod]
-		public void Test_7291()
-		{
-		}
-		[TestMethod]
-		public void Test_7292()
-		{
-		}
-		[TestMethod]
-		public void Test_7293()
-		{
-		}
-		[TestMethod]
-		public void Test_7294()
-		{
-		}
-		[TestMethod]
-		public void Test_7295()
-		{
-		}
-		[TestMethod]
-		public void Test_7296()
-		{
-		}
-		[TestMethod]
-		public void Test_7297()
-		{
-		}
-		[TestMethod]
-		public void Test_7298()
-		{
-		}
-		[TestMethod]
-		public void Test_7299()
-		{
-		}
-		[TestMethod]
-		public void Test_7300()
-		{
-		}
-		[TestMethod]
-		public void Test_7301()
-		{
-		}
-		[TestMethod]
-		public void Test_7302()
-		{
-		}
-		[TestMethod]
-		public void Test_7303()
-		{
-		}
-		[TestMethod]
-		public void Test_7304()
-		{
-		}
-		[TestMethod]
-		public void Test_7305()
-		{
-		}
-		[TestMethod]
-		public void Test_7306()
-		{
-		}
-		[TestMethod]
-		public void Test_7307()
-		{
-		}
-		[TestMethod]
-		public void Test_7308()
-		{
-		}
-		[TestMethod]
-		public void Test_7309()
-		{
-		}
-		[TestMethod]
-		public void Test_7310()
-		{
-		}
-		[TestMethod]
-		public void Test_7311()
-		{
-		}
-		[TestMethod]
-		public void Test_7312()
-		{
-		}
-		[TestMethod]
-		public void Test_7313()
-		{
-		}
-		[TestMethod]
-		public void Test_7314()
-		{
-		}
-		[TestMethod]
-		public void Test_7315()
-		{
-		}
-		[TestMethod]
-		public void Test_7316()
-		{
-		}
-		[TestMethod]
-		public void Test_7317()
-		{
-		}
-		[TestMethod]
-		public void Test_7318()
-		{
-		}
-		[TestMethod]
-		public void Test_7319()
-		{
-		}
-		[TestMethod]
-		public void Test_7320()
-		{
-		}
-		[TestMethod]
-		public void Test_7321()
-		{
-		}
-		[TestMethod]
-		public void Test_7322()
-		{
-		}
-		[TestMethod]
-		public void Test_7323()
-		{
-		}
-		[TestMethod]
-		public void Test_7324()
-		{
-		}
-		[TestMethod]
-		public void Test_7325()
-		{
-		}
-		[TestMethod]
-		public void Test_7326()
-		{
-		}
-		[TestMethod]
-		public void Test_7327()
-		{
-		}
-		[TestMethod]
-		public void Test_7328()
-		{
-		}
-		[TestMethod]
-		public void Test_7329()
-		{
-		}
-		[TestMethod]
-		public void Test_7330()
-		{
-		}
-		[TestMethod]
-		public void Test_7331()
-		{
-		}
-		[TestMethod]
-		public void Test_7332()
-		{
-		}
-		[TestMethod]
-		public void Test_7333()
-		{
-		}
-		[TestMethod]
-		public void Test_7334()
-		{
-		}
-		[TestMethod]
-		public void Test_7335()
-		{
-		}
-		[TestMethod]
-		public void Test_7336()
-		{
-		}
-		[TestMethod]
-		public void Test_7337()
-		{
-		}
-		[TestMethod]
-		public void Test_7338()
-		{
-		}
-		[TestMethod]
-		public void Test_7339()
-		{
-		}
-		[TestMethod]
-		public void Test_7340()
-		{
-		}
-		[TestMethod]
-		public void Test_7341()
-		{
-		}
-		[TestMethod]
-		public void Test_7342()
-		{
-		}
-		[TestMethod]
-		public void Test_7343()
-		{
-		}
-		[TestMethod]
-		public void Test_7344()
-		{
-		}
-		[TestMethod]
-		public void Test_7345()
-		{
-		}
-		[TestMethod]
-		public void Test_7346()
-		{
-		}
-		[TestMethod]
-		public void Test_7347()
-		{
-		}
-		[TestMethod]
-		public void Test_7348()
-		{
-		}
-		[TestMethod]
-		public void Test_7349()
-		{
-		}
-		[TestMethod]
-		public void Test_7350()
-		{
-		}
-		[TestMethod]
-		public void Test_7351()
-		{
-		}
-		[TestMethod]
-		public void Test_7352()
-		{
-		}
-		[TestMethod]
-		public void Test_7353()
-		{
-		}
-		[TestMethod]
-		public void Test_7354()
-		{
-		}
-		[TestMethod]
-		public void Test_7355()
-		{
-		}
-		[TestMethod]
-		public void Test_7356()
-		{
-		}
-		[TestMethod]
-		public void Test_7357()
-		{
-		}
-		[TestMethod]
-		public void Test_7358()
-		{
-		}
-		[TestMethod]
-		public void Test_7359()
-		{
-		}
-		[TestMethod]
-		public void Test_7360()
-		{
-		}
-		[TestMethod]
-		public void Test_7361()
-		{
-		}
-		[TestMethod]
-		public void Test_7362()
-		{
-		}
-		[TestMethod]
-		public void Test_7363()
-		{
-		}
-		[TestMethod]
-		public void Test_7364()
-		{
-		}
-		[TestMethod]
-		public void Test_7365()
-		{
-		}
-		[TestMethod]
-		public void Test_7366()
-		{
-		}
-		[TestMethod]
-		public void Test_7367()
-		{
-		}
-		[TestMethod]
-		public void Test_7368()
-		{
-		}
-		[TestMethod]
-		public void Test_7369()
-		{
-		}
-		[TestMethod]
-		public void Test_7370()
-		{
-		}
-		[TestMethod]
-		public void Test_7371()
-		{
-		}
-		[TestMethod]
-		public void Test_7372()
-		{
-		}
-		[TestMethod]
-		public void Test_7373()
-		{
-		}
-		[TestMethod]
-		public void Test_7374()
-		{
-		}
-		[TestMethod]
-		public void Test_7375()
-		{
-		}
-		[TestMethod]
-		public void Test_7376()
-		{
-		}
-		[TestMethod]
-		public void Test_7377()
-		{
-		}
-		[TestMethod]
-		public void Test_7378()
-		{
-		}
-		[TestMethod]
-		public void Test_7379()
-		{
-		}
-		[TestMethod]
-		public void Test_7380()
-		{
-		}
-		[TestMethod]
-		public void Test_7381()
-		{
-		}
-		[TestMethod]
-		public void Test_7382()
-		{
-		}
-		[TestMethod]
-		public void Test_7383()
-		{
-		}
-		[TestMethod]
-		public void Test_7384()
-		{
-		}
-		[TestMethod]
-		public void Test_7385()
-		{
-		}
-		[TestMethod]
-		public void Test_7386()
-		{
-		}
-		[TestMethod]
-		public void Test_7387()
-		{
-		}
-		[TestMethod]
-		public void Test_7388()
-		{
-		}
-		[TestMethod]
-		public void Test_7389()
-		{
-		}
-		[TestMethod]
-		public void Test_7390()
-		{
-		}
-		[TestMethod]
-		public void Test_7391()
-		{
-		}
-		[TestMethod]
-		public void Test_7392()
-		{
-		}
-		[TestMethod]
-		public void Test_7393()
-		{
-		}
-		[TestMethod]
-		public void Test_7394()
-		{
-		}
-		[TestMethod]
-		public void Test_7395()
-		{
-		}
-		[TestMethod]
-		public void Test_7396()
-		{
-		}
-		[TestMethod]
-		public void Test_7397()
-		{
-		}
-		[TestMethod]
-		public void Test_7398()
-		{
-		}
-		[TestMethod]
-		public void Test_7399()
-		{
-		}
-		[TestMethod]
-		public void Test_7400()
-		{
-		}
-		[TestMethod]
-		public void Test_7401()
-		{
-		}
-		[TestMethod]
-		public void Test_7402()
-		{
-		}
-		[TestMethod]
-		public void Test_7403()
-		{
-		}
-		[TestMethod]
-		public void Test_7404()
-		{
-		}
-		[TestMethod]
-		public void Test_7405()
-		{
-		}
-		[TestMethod]
-		public void Test_7406()
-		{
-		}
-		[TestMethod]
-		public void Test_7407()
-		{
-		}
-		[TestMethod]
-		public void Test_7408()
-		{
-		}
-		[TestMethod]
-		public void Test_7409()
-		{
-		}
-		[TestMethod]
-		public void Test_7410()
-		{
-		}
-		[TestMethod]
-		public void Test_7411()
-		{
-		}
-		[TestMethod]
-		public void Test_7412()
-		{
-		}
-		[TestMethod]
-		public void Test_7413()
-		{
-		}
-		[TestMethod]
-		public void Test_7414()
-		{
-		}
-		[TestMethod]
-		public void Test_7415()
-		{
-		}
-		[TestMethod]
-		public void Test_7416()
-		{
-		}
-		[TestMethod]
-		public void Test_7417()
-		{
-		}
-		[TestMethod]
-		public void Test_7418()
-		{
-		}
-		[TestMethod]
-		public void Test_7419()
-		{
-		}
-		[TestMethod]
-		public void Test_7420()
-		{
-		}
-		[TestMethod]
-		public void Test_7421()
-		{
-		}
-		[TestMethod]
-		public void Test_7422()
-		{
-		}
-		[TestMethod]
-		public void Test_7423()
-		{
-		}
-		[TestMethod]
-		public void Test_7424()
-		{
-		}
-		[TestMethod]
-		public void Test_7425()
-		{
-		}
-		[TestMethod]
-		public void Test_7426()
-		{
-		}
-		[TestMethod]
-		public void Test_7427()
-		{
-		}
-		[TestMethod]
-		public void Test_7428()
-		{
-		}
-		[TestMethod]
-		public void Test_7429()
-		{
-		}
-		[TestMethod]
-		public void Test_7430()
-		{
-		}
-		[TestMethod]
-		public void Test_7431()
-		{
-		}
-		[TestMethod]
-		public void Test_7432()
-		{
-		}
-		[TestMethod]
-		public void Test_7433()
-		{
-		}
-		[TestMethod]
-		public void Test_7434()
-		{
-		}
-		[TestMethod]
-		public void Test_7435()
-		{
-		}
-		[TestMethod]
-		public void Test_7436()
-		{
-		}
-		[TestMethod]
-		public void Test_7437()
-		{
-		}
-		[TestMethod]
-		public void Test_7438()
-		{
-		}
-		[TestMethod]
-		public void Test_7439()
-		{
-		}
-		[TestMethod]
-		public void Test_7440()
-		{
-		}
-		[TestMethod]
-		public void Test_7441()
-		{
-		}
-		[TestMethod]
-		public void Test_7442()
-		{
-		}
-		[TestMethod]
-		public void Test_7443()
-		{
-		}
-		[TestMethod]
-		public void Test_7444()
-		{
-		}
-		[TestMethod]
-		public void Test_7445()
-		{
-		}
-		[TestMethod]
-		public void Test_7446()
-		{
-		}
-		[TestMethod]
-		public void Test_7447()
-		{
-		}
-		[TestMethod]
-		public void Test_7448()
-		{
-		}
-		[TestMethod]
-		public void Test_7449()
-		{
-		}
-		[TestMethod]
-		public void Test_7450()
-		{
-		}
-		[TestMethod]
-		public void Test_7451()
-		{
-		}
-		[TestMethod]
-		public void Test_7452()
-		{
-		}
-		[TestMethod]
-		public void Test_7453()
-		{
-		}
-		[TestMethod]
-		public void Test_7454()
-		{
-		}
-		[TestMethod]
-		public void Test_7455()
-		{
-		}
-		[TestMethod]
-		public void Test_7456()
-		{
-		}
-		[TestMethod]
-		public void Test_7457()
-		{
-		}
-		[TestMethod]
-		public void Test_7458()
-		{
-		}
-		[TestMethod]
-		public void Test_7459()
-		{
-		}
-		[TestMethod]
-		public void Test_7460()
-		{
-		}
-		[TestMethod]
-		public void Test_7461()
-		{
-		}
-		[TestMethod]
-		public void Test_7462()
-		{
-		}
-		[TestMethod]
-		public void Test_7463()
-		{
-		}
-		[TestMethod]
-		public void Test_7464()
-		{
-		}
-		[TestMethod]
-		public void Test_7465()
-		{
-		}
-		[TestMethod]
-		public void Test_7466()
-		{
-		}
-		[TestMethod]
-		public void Test_7467()
-		{
-		}
-		[TestMethod]
-		public void Test_7468()
-		{
-		}
-		[TestMethod]
-		public void Test_7469()
-		{
-		}
-		[TestMethod]
-		public void Test_7470()
-		{
-		}
-		[TestMethod]
-		public void Test_7471()
-		{
-		}
-		[TestMethod]
-		public void Test_7472()
-		{
-		}
-		[TestMethod]
-		public void Test_7473()
-		{
-		}
-		[TestMethod]
-		public void Test_7474()
-		{
-		}
-		[TestMethod]
-		public void Test_7475()
-		{
-		}
-		[TestMethod]
-		public void Test_7476()
-		{
-		}
-		[TestMethod]
-		public void Test_7477()
-		{
-		}
-		[TestMethod]
-		public void Test_7478()
-		{
-		}
-		[TestMethod]
-		public void Test_7479()
-		{
-		}
-		[TestMethod]
-		public void Test_7480()
-		{
-		}
-		[TestMethod]
-		public void Test_7481()
-		{
-		}
-		[TestMethod]
-		public void Test_7482()
-		{
-		}
-		[TestMethod]
-		public void Test_7483()
-		{
-		}
-		[TestMethod]
-		public void Test_7484()
-		{
-		}
-		[TestMethod]
-		public void Test_7485()
-		{
-		}
-		[TestMethod]
-		public void Test_7486()
-		{
-		}
-		[TestMethod]
-		public void Test_7487()
-		{
-		}
-		[TestMethod]
-		public void Test_7488()
-		{
-		}
-		[TestMethod]
-		public void Test_7489()
-		{
-		}
-		[TestMethod]
-		public void Test_7490()
-		{
-		}
-		[TestMethod]
-		public void Test_7491()
-		{
-		}
-		[TestMethod]
-		public void Test_7492()
-		{
-		}
-		[TestMethod]
-		public void Test_7493()
-		{
-		}
-		[TestMethod]
-		public void Test_7494()
-		{
-		}
-		[TestMethod]
-		public void Test_7495()
-		{
-		}
-		[TestMethod]
-		public void Test_7496()
-		{
-		}
-		[TestMethod]
-		public void Test_7497()
-		{
-		}
-		[TestMethod]
-		public void Test_7498()
-		{
-		}
-		[TestMethod]
-		public void Test_7499()
-		{
-		}
-		[TestMethod]
-		public void Test_7500()
-		{
-		}
-		[TestMethod]
-		public void Test_7501()
-		{
-		}
-		[TestMethod]
-		public void Test_7502()
-		{
-		}
-		[TestMethod]
-		public void Test_7503()
-		{
-		}
-		[TestMethod]
-		public void Test_7504()
-		{
-		}
-		[TestMethod]
-		public void Test_7505()
-		{
-		}
-		[TestMethod]
-		public void Test_7506()
-		{
-		}
-		[TestMethod]
-		public void Test_7507()
-		{
-		}
-		[TestMethod]
-		public void Test_7508()
-		{
-		}
-		[TestMethod]
-		public void Test_7509()
-		{
-		}
-		[TestMethod]
-		public void Test_7510()
-		{
-		}
-		[TestMethod]
-		public void Test_7511()
-		{
-		}
-		[TestMethod]
-		public void Test_7512()
-		{
-		}
-		[TestMethod]
-		public void Test_7513()
-		{
-		}
-		[TestMethod]
-		public void Test_7514()
-		{
-		}
-		[TestMethod]
-		public void Test_7515()
-		{
-		}
-		[TestMethod]
-		public void Test_7516()
-		{
-		}
-		[TestMethod]
-		public void Test_7517()
-		{
-		}
-		[TestMethod]
-		public void Test_7518()
-		{
-		}
-		[TestMethod]
-		public void Test_7519()
-		{
-		}
-		[TestMethod]
-		public void Test_7520()
-		{
-		}
-		[TestMethod]
-		public void Test_7521()
-		{
-		}
-		[TestMethod]
-		public void Test_7522()
-		{
-		}
-		[TestMethod]
-		public void Test_7523()
-		{
-		}
-		[TestMethod]
-		public void Test_7524()
-		{
-		}
-		[TestMethod]
-		public void Test_7525()
-		{
-		}
-		[TestMethod]
-		public void Test_7526()
-		{
-		}
-		[TestMethod]
-		public void Test_7527()
-		{
-		}
-		[TestMethod]
-		public void Test_7528()
-		{
-		}
-		[TestMethod]
-		public void Test_7529()
-		{
-		}
-		[TestMethod]
-		public void Test_7530()
-		{
-		}
-		[TestMethod]
-		public void Test_7531()
-		{
-		}
-		[TestMethod]
-		public void Test_7532()
-		{
-		}
-		[TestMethod]
-		public void Test_7533()
-		{
-		}
-		[TestMethod]
-		public void Test_7534()
-		{
-		}
-		[TestMethod]
-		public void Test_7535()
-		{
-		}
-		[TestMethod]
-		public void Test_7536()
-		{
-		}
-		[TestMethod]
-		public void Test_7537()
-		{
-		}
-		[TestMethod]
-		public void Test_7538()
-		{
-		}
-		[TestMethod]
-		public void Test_7539()
-		{
-		}
-		[TestMethod]
-		public void Test_7540()
-		{
-		}
-		[TestMethod]
-		public void Test_7541()
-		{
-		}
-		[TestMethod]
-		public void Test_7542()
-		{
-		}
-		[TestMethod]
-		public void Test_7543()
-		{
-		}
-		[TestMethod]
-		public void Test_7544()
-		{
-		}
-		[TestMethod]
-		public void Test_7545()
-		{
-		}
-		[TestMethod]
-		public void Test_7546()
-		{
-		}
-		[TestMethod]
-		public void Test_7547()
-		{
-		}
-		[TestMethod]
-		public void Test_7548()
-		{
-		}
-		[TestMethod]
-		public void Test_7549()
-		{
-		}
-		[TestMethod]
-		public void Test_7550()
-		{
-		}
-		[TestMethod]
-		public void Test_7551()
-		{
-		}
-		[TestMethod]
-		public void Test_7552()
-		{
-		}
-		[TestMethod]
-		public void Test_7553()
-		{
-		}
-		[TestMethod]
-		public void Test_7554()
-		{
-		}
-		[TestMethod]
-		public void Test_7555()
-		{
-		}
-		[TestMethod]
-		public void Test_7556()
-		{
-		}
-		[TestMethod]
-		public void Test_7557()
-		{
-		}
-		[TestMethod]
-		public void Test_7558()
-		{
-		}
-		[TestMethod]
-		public void Test_7559()
-		{
-		}
-		[TestMethod]
-		public void Test_7560()
-		{
-		}
-		[TestMethod]
-		public void Test_7561()
-		{
-		}
-		[TestMethod]
-		public void Test_7562()
-		{
-		}
-		[TestMethod]
-		public void Test_7563()
-		{
-		}
-		[TestMethod]
-		public void Test_7564()
-		{
-		}
-		[TestMethod]
-		public void Test_7565()
-		{
-		}
-		[TestMethod]
-		public void Test_7566()
-		{
-		}
-		[TestMethod]
-		public void Test_7567()
-		{
-		}
-		[TestMethod]
-		public void Test_7568()
-		{
-		}
-		[TestMethod]
-		public void Test_7569()
-		{
-		}
-		[TestMethod]
-		public void Test_7570()
-		{
-		}
-		[TestMethod]
-		public void Test_7571()
-		{
-		}
-		[TestMethod]
-		public void Test_7572()
-		{
-		}
-		[TestMethod]
-		public void Test_7573()
-		{
-		}
-		[TestMethod]
-		public void Test_7574()
-		{
-		}
-		[TestMethod]
-		public void Test_7575()
-		{
-		}
-		[TestMethod]
-		public void Test_7576()
-		{
-		}
-		[TestMethod]
-		public void Test_7577()
-		{
-		}
-		[TestMethod]
-		public void Test_7578()
-		{
-		}
-		[TestMethod]
-		public void Test_7579()
-		{
-		}
-		[TestMethod]
-		public void Test_7580()
-		{
-		}
-		[TestMethod]
-		public void Test_7581()
-		{
-		}
-		[TestMethod]
-		public void Test_7582()
-		{
-		}
-		[TestMethod]
-		public void Test_7583()
-		{
-		}
-		[TestMethod]
-		public void Test_7584()
-		{
-		}
-		[TestMethod]
-		public void Test_7585()
-		{
-		}
-		[TestMethod]
-		public void Test_7586()
-		{
-		}
-		[TestMethod]
-		public void Test_7587()
-		{
-		}
-		[TestMethod]
-		public void Test_7588()
-		{
-		}
-		[TestMethod]
-		public void Test_7589()
-		{
-		}
-		[TestMethod]
-		public void Test_7590()
-		{
-		}
-		[TestMethod]
-		public void Test_7591()
-		{
-		}
-		[TestMethod]
-		public void Test_7592()
-		{
-		}
-		[TestMethod]
-		public void Test_7593()
-		{
-		}
-		[TestMethod]
-		public void Test_7594()
-		{
-		}
-		[TestMethod]
-		public void Test_7595()
-		{
-		}
-		[TestMethod]
-		public void Test_7596()
-		{
-		}
-		[TestMethod]
-		public void Test_7597()
-		{
-		}
-		[TestMethod]
-		public void Test_7598()
-		{
-		}
-		[TestMethod]
-		public void Test_7599()
-		{
-		}
-		[TestMethod]
-		public void Test_7600()
-		{
-		}
-		[TestMethod]
-		public void Test_7601()
-		{
-		}
-		[TestMethod]
-		public void Test_7602()
-		{
-		}
-		[TestMethod]
-		public void Test_7603()
-		{
-		}
-		[TestMethod]
-		public void Test_7604()
-		{
-		}
-		[TestMethod]
-		public void Test_7605()
-		{
-		}
-		[TestMethod]
-		public void Test_7606()
-		{
-		}
-		[TestMethod]
-		public void Test_7607()
-		{
-		}
-		[TestMethod]
-		public void Test_7608()
-		{
-		}
-		[TestMethod]
-		public void Test_7609()
-		{
-		}
-		[TestMethod]
-		public void Test_7610()
-		{
-		}
-		[TestMethod]
-		public void Test_7611()
-		{
-		}
-		[TestMethod]
-		public void Test_7612()
-		{
-		}
-		[TestMethod]
-		public void Test_7613()
-		{
-		}
-		[TestMethod]
-		public void Test_7614()
-		{
-		}
-		[TestMethod]
-		public void Test_7615()
-		{
-		}
-		[TestMethod]
-		public void Test_7616()
-		{
-		}
-		[TestMethod]
-		public void Test_7617()
-		{
-		}
-		[TestMethod]
-		public void Test_7618()
-		{
-		}
-		[TestMethod]
-		public void Test_7619()
-		{
-		}
-		[TestMethod]
-		public void Test_7620()
-		{
-		}
-		[TestMethod]
-		public void Test_7621()
-		{
-		}
-		[TestMethod]
-		public void Test_7622()
-		{
-		}
-		[TestMethod]
-		public void Test_7623()
-		{
-		}
-		[TestMethod]
-		public void Test_7624()
-		{
-		}
-		[TestMethod]
-		public void Test_7625()
-		{
-		}
-		[TestMethod]
-		public void Test_7626()
-		{
-		}
-		[TestMethod]
-		public void Test_7627()
-		{
-		}
-		[TestMethod]
-		public void Test_7628()
-		{
-		}
-		[TestMethod]
-		public void Test_7629()
-		{
-		}
-		[TestMethod]
-		public void Test_7630()
-		{
-		}
-		[TestMethod]
-		public void Test_7631()
-		{
-		}
-		[TestMethod]
-		public void Test_7632()
-		{
-		}
-		[TestMethod]
-		public void Test_7633()
-		{
-		}
-		[TestMethod]
-		public void Test_7634()
-		{
-		}
-		[TestMethod]
-		public void Test_7635()
-		{
-		}
-		[TestMethod]
-		public void Test_7636()
-		{
-		}
-		[TestMethod]
-		public void Test_7637()
-		{
-		}
-		[TestMethod]
-		public void Test_7638()
-		{
-		}
-		[TestMethod]
-		public void Test_7639()
-		{
-		}
-		[TestMethod]
-		public void Test_7640()
-		{
-		}
-		[TestMethod]
-		public void Test_7641()
-		{
-		}
-		[TestMethod]
-		public void Test_7642()
-		{
-		}
-		[TestMethod]
-		public void Test_7643()
-		{
-		}
-		[TestMethod]
-		public void Test_7644()
-		{
-		}
-		[TestMethod]
-		public void Test_7645()
-		{
-		}
-		[TestMethod]
-		public void Test_7646()
-		{
-		}
-		[TestMethod]
-		public void Test_7647()
-		{
-		}
-		[TestMethod]
-		public void Test_7648()
-		{
-		}
-		[TestMethod]
-		public void Test_7649()
-		{
-		}
-		[TestMethod]
-		public void Test_7650()
-		{
-		}
-		[TestMethod]
-		public void Test_7651()
-		{
-		}
-		[TestMethod]
-		public void Test_7652()
-		{
-		}
-		[TestMethod]
-		public void Test_7653()
-		{
-		}
-		[TestMethod]
-		public void Test_7654()
-		{
-		}
-		[TestMethod]
-		public void Test_7655()
-		{
-		}
-		[TestMethod]
-		public void Test_7656()
-		{
-		}
-		[TestMethod]
-		public void Test_7657()
-		{
-		}
-		[TestMethod]
-		public void Test_7658()
-		{
-		}
-		[TestMethod]
-		public void Test_7659()
-		{
-		}
-		[TestMethod]
-		public void Test_7660()
-		{
-		}
-		[TestMethod]
-		public void Test_7661()
-		{
-		}
-		[TestMethod]
-		public void Test_7662()
-		{
-		}
-		[TestMethod]
-		public void Test_7663()
-		{
-		}
-		[TestMethod]
-		public void Test_7664()
-		{
-		}
-		[TestMethod]
-		public void Test_7665()
-		{
-		}
-		[TestMethod]
-		public void Test_7666()
-		{
-		}
-		[TestMethod]
-		public void Test_7667()
-		{
-		}
-		[TestMethod]
-		public void Test_7668()
-		{
-		}
-		[TestMethod]
-		public void Test_7669()
-		{
-		}
-		[TestMethod]
-		public void Test_7670()
-		{
-		}
-		[TestMethod]
-		public void Test_7671()
-		{
-		}
-		[TestMethod]
-		public void Test_7672()
-		{
-		}
-		[TestMethod]
-		public void Test_7673()
-		{
-		}
-		[TestMethod]
-		public void Test_7674()
-		{
-		}
-		[TestMethod]
-		public void Test_7675()
-		{
-		}
-		[TestMethod]
-		public void Test_7676()
-		{
-		}
-		[TestMethod]
-		public void Test_7677()
-		{
-		}
-		[TestMethod]
-		public void Test_7678()
-		{
-		}
-		[TestMethod]
-		public void Test_7679()
-		{
-		}
-		[TestMethod]
-		public void Test_7680()
-		{
-		}
-		[TestMethod]
-		public void Test_7681()
-		{
-		}
-		[TestMethod]
-		public void Test_7682()
-		{
-		}
-		[TestMethod]
-		public void Test_7683()
-		{
-		}
-		[TestMethod]
-		public void Test_7684()
-		{
-		}
-		[TestMethod]
-		public void Test_7685()
-		{
-		}
-		[TestMethod]
-		public void Test_7686()
-		{
-		}
-		[TestMethod]
-		public void Test_7687()
-		{
-		}
-		[TestMethod]
-		public void Test_7688()
-		{
-		}
-		[TestMethod]
-		public void Test_7689()
-		{
-		}
-		[TestMethod]
-		public void Test_7690()
-		{
-		}
-		[TestMethod]
-		public void Test_7691()
-		{
-		}
-		[TestMethod]
-		public void Test_7692()
-		{
-		}
-		[TestMethod]
-		public void Test_7693()
-		{
-		}
-		[TestMethod]
-		public void Test_7694()
-		{
-		}
-		[TestMethod]
-		public void Test_7695()
-		{
-		}
-		[TestMethod]
-		public void Test_7696()
-		{
-		}
-		[TestMethod]
-		public void Test_7697()
-		{
-		}
-		[TestMethod]
-		public void Test_7698()
-		{
-		}
-		[TestMethod]
-		public void Test_7699()
-		{
-		}
-		[TestMethod]
-		public void Test_7700()
-		{
-		}
-		[TestMethod]
-		public void Test_7701()
-		{
-		}
-		[TestMethod]
-		public void Test_7702()
-		{
-		}
-		[TestMethod]
-		public void Test_7703()
-		{
-		}
-		[TestMethod]
-		public void Test_7704()
-		{
-		}
-		[TestMethod]
-		public void Test_7705()
-		{
-		}
-		[TestMethod]
-		public void Test_7706()
-		{
-		}
-		[TestMethod]
-		public void Test_7707()
-		{
-		}
-		[TestMethod]
-		public void Test_7708()
-		{
-		}
-		[TestMethod]
-		public void Test_7709()
-		{
-		}
-		[TestMethod]
-		public void Test_7710()
-		{
-		}
-		[TestMethod]
-		public void Test_7711()
-		{
-		}
-		[TestMethod]
-		public void Test_7712()
-		{
-		}
-		[TestMethod]
-		public void Test_7713()
-		{
-		}
-		[TestMethod]
-		public void Test_7714()
-		{
-		}
-		[TestMethod]
-		public void Test_7715()
-		{
-		}
-		[TestMethod]
-		public void Test_7716()
-		{
-		}
-		[TestMethod]
-		public void Test_7717()
-		{
-		}
-		[TestMethod]
-		public void Test_7718()
-		{
-		}
-		[TestMethod]
-		public void Test_7719()
-		{
-		}
-		[TestMethod]
-		public void Test_7720()
-		{
-		}
-		[TestMethod]
-		public void Test_7721()
-		{
-		}
-		[TestMethod]
-		public void Test_7722()
-		{
-		}
-		[TestMethod]
-		public void Test_7723()
-		{
-		}
-		[TestMethod]
-		public void Test_7724()
-		{
-		}
-		[TestMethod]
-		public void Test_7725()
-		{
-		}
-		[TestMethod]
-		public void Test_7726()
-		{
-		}
-		[TestMethod]
-		public void Test_7727()
-		{
-		}
-		[TestMethod]
-		public void Test_7728()
-		{
-		}
-		[TestMethod]
-		public void Test_7729()
-		{
-		}
-		[TestMethod]
-		public void Test_7730()
-		{
-		}
-		[TestMethod]
-		public void Test_7731()
-		{
-		}
-		[TestMethod]
-		public void Test_7732()
-		{
-		}
-		[TestMethod]
-		public void Test_7733()
-		{
-		}
-		[TestMethod]
-		public void Test_7734()
-		{
-		}
-		[TestMethod]
-		public void Test_7735()
-		{
-		}
-		[TestMethod]
-		public void Test_7736()
-		{
-		}
-		[TestMethod]
-		public void Test_7737()
-		{
-		}
-		[TestMethod]
-		public void Test_7738()
-		{
-		}
-		[TestMethod]
-		public void Test_7739()
-		{
-		}
-		[TestMethod]
-		public void Test_7740()
-		{
-		}
-		[TestMethod]
-		public void Test_7741()
-		{
-		}
-		[TestMethod]
-		public void Test_7742()
-		{
-		}
-		[TestMethod]
-		public void Test_7743()
-		{
-		}
-		[TestMethod]
-		public void Test_7744()
-		{
-		}
-		[TestMethod]
-		public void Test_7745()
-		{
-		}
-		[TestMethod]
-		public void Test_7746()
-		{
-		}
-		[TestMethod]
-		public void Test_7747()
-		{
-		}
-		[TestMethod]
-		public void Test_7748()
-		{
-		}
-		[TestMethod]
-		public void Test_7749()
-		{
-		}
-		[TestMethod]
-		public void Test_7750()
-		{
-		}
-		[TestMethod]
-		public void Test_7751()
-		{
-		}
-		[TestMethod]
-		public void Test_7752()
-		{
-		}
-		[TestMethod]
-		public void Test_7753()
-		{
-		}
-		[TestMethod]
-		public void Test_7754()
-		{
-		}
-		[TestMethod]
-		public void Test_7755()
-		{
-		}
-		[TestMethod]
-		public void Test_7756()
-		{
-		}
-		[TestMethod]
-		public void Test_7757()
-		{
-		}
-		[TestMethod]
-		public void Test_7758()
-		{
-		}
-		[TestMethod]
-		public void Test_7759()
-		{
-		}
-		[TestMethod]
-		public void Test_7760()
-		{
-		}
-		[TestMethod]
-		public void Test_7761()
-		{
-		}
-		[TestMethod]
-		public void Test_7762()
-		{
-		}
-		[TestMethod]
-		public void Test_7763()
-		{
-		}
-		[TestMethod]
-		public void Test_7764()
-		{
-		}
-		[TestMethod]
-		public void Test_7765()
-		{
-		}
-		[TestMethod]
-		public void Test_7766()
-		{
-		}
-		[TestMethod]
-		public void Test_7767()
-		{
-		}
-		[TestMethod]
-		public void Test_7768()
-		{
-		}
-		[TestMethod]
-		public void Test_7769()
-		{
-		}
-		[TestMethod]
-		public void Test_7770()
-		{
-		}
-		[TestMethod]
-		public void Test_7771()
-		{
-		}
-		[TestMethod]
-		public void Test_7772()
-		{
-		}
-		[TestMethod]
-		public void Test_7773()
-		{
-		}
-		[TestMethod]
-		public void Test_7774()
-		{
-		}
-		[TestMethod]
-		public void Test_7775()
-		{
-		}
-		[TestMethod]
-		public void Test_7776()
-		{
-		}
-		[TestMethod]
-		public void Test_7777()
-		{
-		}
-		[TestMethod]
-		public void Test_7778()
-		{
-		}
-		[TestMethod]
-		public void Test_7779()
-		{
-		}
-		[TestMethod]
-		public void Test_7780()
-		{
-		}
-		[TestMethod]
-		public void Test_7781()
-		{
-		}
-		[TestMethod]
-		public void Test_7782()
-		{
-		}
-		[TestMethod]
-		public void Test_7783()
-		{
-		}
-		[TestMethod]
-		public void Test_7784()
-		{
-		}
-		[TestMethod]
-		public void Test_7785()
-		{
-		}
-		[TestMethod]
-		public void Test_7786()
-		{
-		}
-		[TestMethod]
-		public void Test_7787()
-		{
-		}
-		[TestMethod]
-		public void Test_7788()
-		{
-		}
-		[TestMethod]
-		public void Test_7789()
-		{
-		}
-		[TestMethod]
-		public void Test_7790()
-		{
-		}
-		[TestMethod]
-		public void Test_7791()
-		{
-		}
-		[TestMethod]
-		public void Test_7792()
-		{
-		}
-		[TestMethod]
-		public void Test_7793()
-		{
-		}
-		[TestMethod]
-		public void Test_7794()
-		{
-		}
-		[TestMethod]
-		public void Test_7795()
-		{
-		}
-		[TestMethod]
-		public void Test_7796()
-		{
-		}
-		[TestMethod]
-		public void Test_7797()
-		{
-		}
-		[TestMethod]
-		public void Test_7798()
-		{
-		}
-		[TestMethod]
-		public void Test_7799()
-		{
-		}
-		[TestMethod]
-		public void Test_7800()
-		{
-		}
-		[TestMethod]
-		public void Test_7801()
-		{
-		}
-		[TestMethod]
-		public void Test_7802()
-		{
-		}
-		[TestMethod]
-		public void Test_7803()
-		{
-		}
-		[TestMethod]
-		public void Test_7804()
-		{
-		}
-		[TestMethod]
-		public void Test_7805()
-		{
-		}
-		[TestMethod]
-		public void Test_7806()
-		{
-		}
-		[TestMethod]
-		public void Test_7807()
-		{
-		}
-		[TestMethod]
-		public void Test_7808()
-		{
-		}
-		[TestMethod]
-		public void Test_7809()
-		{
-		}
-		[TestMethod]
-		public void Test_7810()
-		{
-		}
-		[TestMethod]
-		public void Test_7811()
-		{
-		}
-		[TestMethod]
-		public void Test_7812()
-		{
-		}
-		[TestMethod]
-		public void Test_7813()
-		{
-		}
-		[TestMethod]
-		public void Test_7814()
-		{
-		}
-		[TestMethod]
-		public void Test_7815()
-		{
-		}
-		[TestMethod]
-		public void Test_7816()
-		{
-		}
-		[TestMethod]
-		public void Test_7817()
-		{
-		}
-		[TestMethod]
-		public void Test_7818()
-		{
-		}
-		[TestMethod]
-		public void Test_7819()
-		{
-		}
-		[TestMethod]
-		public void Test_7820()
-		{
-		}
-		[TestMethod]
-		public void Test_7821()
-		{
-		}
-		[TestMethod]
-		public void Test_7822()
-		{
-		}
-		[TestMethod]
-		public void Test_7823()
-		{
-		}
-		[TestMethod]
-		public void Test_7824()
-		{
-		}
-		[TestMethod]
-		public void Test_7825()
-		{
-		}
-		[TestMethod]
-		public void Test_7826()
-		{
-		}
-		[TestMethod]
-		public void Test_7827()
-		{
-		}
-		[TestMethod]
-		public void Test_7828()
-		{
-		}
-		[TestMethod]
-		public void Test_7829()
-		{
-		}
-		[TestMethod]
-		public void Test_7830()
-		{
-		}
-		[TestMethod]
-		public void Test_7831()
-		{
-		}
-		[TestMethod]
-		public void Test_7832()
-		{
-		}
-		[TestMethod]
-		public void Test_7833()
-		{
-		}
-		[TestMethod]
-		public void Test_7834()
-		{
-		}
-		[TestMethod]
-		public void Test_7835()
-		{
-		}
-		[TestMethod]
-		public void Test_7836()
-		{
-		}
-		[TestMethod]
-		public void Test_7837()
-		{
-		}
-		[TestMethod]
-		public void Test_7838()
-		{
-		}
-		[TestMethod]
-		public void Test_7839()
-		{
-		}
-		[TestMethod]
-		public void Test_7840()
-		{
-		}
-		[TestMethod]
-		public void Test_7841()
-		{
-		}
-		[TestMethod]
-		public void Test_7842()
-		{
-		}
-		[TestMethod]
-		public void Test_7843()
-		{
-		}
-		[TestMethod]
-		public void Test_7844()
-		{
-		}
-		[TestMethod]
-		public void Test_7845()
-		{
-		}
-		[TestMethod]
-		public void Test_7846()
-		{
-		}
-		[TestMethod]
-		public void Test_7847()
-		{
-		}
-		[TestMethod]
-		public void Test_7848()
-		{
-		}
-		[TestMethod]
-		public void Test_7849()
-		{
-		}
-		[TestMethod]
-		public void Test_7850()
-		{
-		}
-		[TestMethod]
-		public void Test_7851()
-		{
-		}
-		[TestMethod]
-		public void Test_7852()
-		{
-		}
-		[TestMethod]
-		public void Test_7853()
-		{
-		}
-		[TestMethod]
-		public void Test_7854()
-		{
-		}
-		[TestMethod]
-		public void Test_7855()
-		{
-		}
-		[TestMethod]
-		public void Test_7856()
-		{
-		}
-		[TestMethod]
-		public void Test_7857()
-		{
-		}
-		[TestMethod]
-		public void Test_7858()
-		{
-		}
-		[TestMethod]
-		public void Test_7859()
-		{
-		}
-		[TestMethod]
-		public void Test_7860()
-		{
-		}
-		[TestMethod]
-		public void Test_7861()
-		{
-		}
-		[TestMethod]
-		public void Test_7862()
-		{
-		}
-		[TestMethod]
-		public void Test_7863()
-		{
-		}
-		[TestMethod]
-		public void Test_7864()
-		{
-		}
-		[TestMethod]
-		public void Test_7865()
-		{
-		}
-		[TestMethod]
-		public void Test_7866()
-		{
-		}
-		[TestMethod]
-		public void Test_7867()
-		{
-		}
-		[TestMethod]
-		public void Test_7868()
-		{
-		}
-		[TestMethod]
-		public void Test_7869()
-		{
-		}
-		[TestMethod]
-		public void Test_7870()
-		{
-		}
-		[TestMethod]
-		public void Test_7871()
-		{
-		}
-		[TestMethod]
-		public void Test_7872()
-		{
-		}
-		[TestMethod]
-		public void Test_7873()
-		{
-		}
-		[TestMethod]
-		public void Test_7874()
-		{
-		}
-		[TestMethod]
-		public void Test_7875()
-		{
-		}
-		[TestMethod]
-		public void Test_7876()
-		{
-		}
-		[TestMethod]
-		public void Test_7877()
-		{
-		}
-		[TestMethod]
-		public void Test_7878()
-		{
-		}
-		[TestMethod]
-		public void Test_7879()
-		{
-		}
-		[TestMethod]
-		public void Test_7880()
-		{
-		}
-		[TestMethod]
-		public void Test_7881()
-		{
-		}
-		[TestMethod]
-		public void Test_7882()
-		{
-		}
-		[TestMethod]
-		public void Test_7883()
-		{
-		}
-		[TestMethod]
-		public void Test_7884()
-		{
-		}
-		[TestMethod]
-		public void Test_7885()
-		{
-		}
-		[TestMethod]
-		public void Test_7886()
-		{
-		}
-		[TestMethod]
-		public void Test_7887()
-		{
-		}
-		[TestMethod]
-		public void Test_7888()
-		{
-		}
-		[TestMethod]
-		public void Test_7889()
-		{
-		}
-		[TestMethod]
-		public void Test_7890()
-		{
-		}
-		[TestMethod]
-		public void Test_7891()
-		{
-		}
-		[TestMethod]
-		public void Test_7892()
-		{
-		}
-		[TestMethod]
-		public void Test_7893()
-		{
-		}
-		[TestMethod]
-		public void Test_7894()
-		{
-		}
-		[TestMethod]
-		public void Test_7895()
-		{
-		}
-		[TestMethod]
-		public void Test_7896()
-		{
-		}
-		[TestMethod]
-		public void Test_7897()
-		{
-		}
-		[TestMethod]
-		public void Test_7898()
-		{
-		}
-		[TestMethod]
-		public void Test_7899()
-		{
-		}
-		[TestMethod]
-		public void Test_7900()
-		{
-		}
-		[TestMethod]
-		public void Test_7901()
-		{
-		}
-		[TestMethod]
-		public void Test_7902()
-		{
-		}
-		[TestMethod]
-		public void Test_7903()
-		{
-		}
-		[TestMethod]
-		public void Test_7904()
-		{
-		}
-		[TestMethod]
-		public void Test_7905()
-		{
-		}
-		[TestMethod]
-		public void Test_7906()
-		{
-		}
-		[TestMethod]
-		public void Test_7907()
-		{
-		}
-		[TestMethod]
-		public void Test_7908()
-		{
-		}
-		[TestMethod]
-		public void Test_7909()
-		{
-		}
-		[TestMethod]
-		public void Test_7910()
-		{
-		}
-		[TestMethod]
-		public void Test_7911()
-		{
-		}
-		[TestMethod]
-		public void Test_7912()
-		{
-		}
-		[TestMethod]
-		public void Test_7913()
-		{
-		}
-		[TestMethod]
-		public void Test_7914()
-		{
-		}
-		[TestMethod]
-		public void Test_7915()
-		{
-		}
-		[TestMethod]
-		public void Test_7916()
-		{
-		}
-		[TestMethod]
-		public void Test_7917()
-		{
-		}
-		[TestMethod]
-		public void Test_7918()
-		{
-		}
-		[TestMethod]
-		public void Test_7919()
-		{
-		}
-		[TestMethod]
-		public void Test_7920()
-		{
-		}
-		[TestMethod]
-		public void Test_7921()
-		{
-		}
-		[TestMethod]
-		public void Test_7922()
-		{
-		}
-		[TestMethod]
-		public void Test_7923()
-		{
-		}
-		[TestMethod]
-		public void Test_7924()
-		{
-		}
-		[TestMethod]
-		public void Test_7925()
-		{
-		}
-		[TestMethod]
-		public void Test_7926()
-		{
-		}
-		[TestMethod]
-		public void Test_7927()
-		{
-		}
-		[TestMethod]
-		public void Test_7928()
-		{
-		}
-		[TestMethod]
-		public void Test_7929()
-		{
-		}
-		[TestMethod]
-		public void Test_7930()
-		{
-		}
-		[TestMethod]
-		public void Test_7931()
-		{
-		}
-		[TestMethod]
-		public void Test_7932()
-		{
-		}
-		[TestMethod]
-		public void Test_7933()
-		{
-		}
-		[TestMethod]
-		public void Test_7934()
-		{
-		}
-		[TestMethod]
-		public void Test_7935()
-		{
-		}
-		[TestMethod]
-		public void Test_7936()
-		{
-		}
-		[TestMethod]
-		public void Test_7937()
-		{
-		}
-		[TestMethod]
-		public void Test_7938()
-		{
-		}
-		[TestMethod]
-		public void Test_7939()
-		{
-		}
-		[TestMethod]
-		public void Test_7940()
-		{
-		}
-		[TestMethod]
-		public void Test_7941()
-		{
-		}
-		[TestMethod]
-		public void Test_7942()
-		{
-		}
-		[TestMethod]
-		public void Test_7943()
-		{
-		}
-		[TestMethod]
-		public void Test_7944()
-		{
-		}
-		[TestMethod]
-		public void Test_7945()
-		{
-		}
-		[TestMethod]
-		public void Test_7946()
-		{
-		}
-		[TestMethod]
-		public void Test_7947()
-		{
-		}
-		[TestMethod]
-		public void Test_7948()
-		{
-		}
-		[TestMethod]
-		public void Test_7949()
-		{
-		}
-		[TestMethod]
-		public void Test_7950()
-		{
-		}
-		[TestMethod]
-		public void Test_7951()
-		{
-		}
-		[TestMethod]
-		public void Test_7952()
-		{
-		}
-		[TestMethod]
-		public void Test_7953()
-		{
-		}
-		[TestMethod]
-		public void Test_7954()
-		{
-		}
-		[TestMethod]
-		public void Test_7955()
-		{
-		}
-		[TestMethod]
-		public void Test_7956()
-		{
-		}
-		[TestMethod]
-		public void Test_7957()
-		{
-		}
-		[TestMethod]
-		public void Test_7958()
-		{
-		}
-		[TestMethod]
-		public void Test_7959()
-		{
-		}
-		[TestMethod]
-		public void Test_7960()
-		{
-		}
-		[TestMethod]
-		public void Test_7961()
-		{
-		}
-		[TestMethod]
-		public void Test_7962()
-		{
-		}
-		[TestMethod]
-		public void Test_7963()
-		{
-		}
-		[TestMethod]
-		public void Test_7964()
-		{
-		}
-		[TestMethod]
-		public void Test_7965()
-		{
-		}
-		[TestMethod]
-		public void Test_7966()
-		{
-		}
-		[TestMethod]
-		public void Test_7967()
-		{
-		}
-		[TestMethod]
-		public void Test_7968()
-		{
-		}
-		[TestMethod]
-		public void Test_7969()
-		{
-		}
-		[TestMethod]
-		public void Test_7970()
-		{
-		}
-		[TestMethod]
-		public void Test_7971()
-		{
-		}
-		[TestMethod]
-		public void Test_7972()
-		{
-		}
-		[TestMethod]
-		public void Test_7973()
-		{
-		}
-		[TestMethod]
-		public void Test_7974()
-		{
-		}
-		[TestMethod]
-		public void Test_7975()
-		{
-		}
-		[TestMethod]
-		public void Test_7976()
-		{
-		}
-		[TestMethod]
-		public void Test_7977()
-		{
-		}
-		[TestMethod]
-		public void Test_7978()
-		{
-		}
-		[TestMethod]
-		public void Test_7979()
-		{
-		}
-		[TestMethod]
-		public void Test_7980()
-		{
-		}
-		[TestMethod]
-		public void Test_7981()
-		{
-		}
-		[TestMethod]
-		public void Test_7982()
-		{
-		}
-		[TestMethod]
-		public void Test_7983()
-		{
-		}
-		[TestMethod]
-		public void Test_7984()
-		{
-		}
-		[TestMethod]
-		public void Test_7985()
-		{
-		}
-		[TestMethod]
-		public void Test_7986()
-		{
-		}
-		[TestMethod]
-		public void Test_7987()
-		{
-		}
-		[TestMethod]
-		public void Test_7988()
-		{
-		}
-		[TestMethod]
-		public void Test_7989()
-		{
-		}
-		[TestMethod]
-		public void Test_7990()
-		{
-		}
-		[TestMethod]
-		public void Test_7991()
-		{
-		}
-		[TestMethod]
-		public void Test_7992()
-		{
-		}
-		[TestMethod]
-		public void Test_7993()
-		{
-		}
-		[TestMethod]
-		public void Test_7994()
-		{
-		}
-		[TestMethod]
-		public void Test_7995()
-		{
-		}
-		[TestMethod]
-		public void Test_7996()
-		{
-		}
-		[TestMethod]
-		public void Test_7997()
-		{
-		}
-		[TestMethod]
-		public void Test_7998()
-		{
-		}
-		[TestMethod]
-		public void Test_7999()
-		{
-		}
-		[TestMethod]
-		public void Test_8000()
-		{
-		}
-		[TestMethod]
-		public void Test_8001()
-		{
-		}
-		[TestMethod]
-		public void Test_8002()
-		{
-		}
-		[TestMethod]
-		public void Test_8003()
-		{
-		}
-		[TestMethod]
-		public void Test_8004()
-		{
-		}
-		[TestMethod]
-		public void Test_8005()
-		{
-		}
-		[TestMethod]
-		public void Test_8006()
-		{
-		}
-		[TestMethod]
-		public void Test_8007()
-		{
-		}
-		[TestMethod]
-		public void Test_8008()
-		{
-		}
-		[TestMethod]
-		public void Test_8009()
-		{
-		}
-		[TestMethod]
-		public void Test_8010()
-		{
-		}
-		[TestMethod]
-		public void Test_8011()
-		{
-		}
-		[TestMethod]
-		public void Test_8012()
-		{
-		}
-		[TestMethod]
-		public void Test_8013()
-		{
-		}
-		[TestMethod]
-		public void Test_8014()
-		{
-		}
-		[TestMethod]
-		public void Test_8015()
-		{
-		}
-		[TestMethod]
-		public void Test_8016()
-		{
-		}
-		[TestMethod]
-		public void Test_8017()
-		{
-		}
-		[TestMethod]
-		public void Test_8018()
-		{
-		}
-		[TestMethod]
-		public void Test_8019()
-		{
-		}
-		[TestMethod]
-		public void Test_8020()
-		{
-		}
-		[TestMethod]
-		public void Test_8021()
-		{
-		}
-		[TestMethod]
-		public void Test_8022()
-		{
-		}
-		[TestMethod]
-		public void Test_8023()
-		{
-		}
-		[TestMethod]
-		public void Test_8024()
-		{
-		}
-		[TestMethod]
-		public void Test_8025()
-		{
-		}
-		[TestMethod]
-		public void Test_8026()
-		{
-		}
-		[TestMethod]
-		public void Test_8027()
-		{
-		}
-		[TestMethod]
-		public void Test_8028()
-		{
-		}
-		[TestMethod]
-		public void Test_8029()
-		{
-		}
-		[TestMethod]
-		public void Test_8030()
-		{
-		}
-		[TestMethod]
-		public void Test_8031()
-		{
-		}
-		[TestMethod]
-		public void Test_8032()
-		{
-		}
-		[TestMethod]
-		public void Test_8033()
-		{
-		}
-		[TestMethod]
-		public void Test_8034()
-		{
-		}
-		[TestMethod]
-		public void Test_8035()
-		{
-		}
-		[TestMethod]
-		public void Test_8036()
-		{
-		}
-		[TestMethod]
-		public void Test_8037()
-		{
-		}
-		[TestMethod]
-		public void Test_8038()
-		{
-		}
-		[TestMethod]
-		public void Test_8039()
-		{
-		}
-		[TestMethod]
-		public void Test_8040()
-		{
-		}
-		[TestMethod]
-		public void Test_8041()
-		{
-		}
-		[TestMethod]
-		public void Test_8042()
-		{
-		}
-		[TestMethod]
-		public void Test_8043()
-		{
-		}
-		[TestMethod]
-		public void Test_8044()
-		{
-		}
-		[TestMethod]
-		public void Test_8045()
-		{
-		}
-		[TestMethod]
-		public void Test_8046()
-		{
-		}
-		[TestMethod]
-		public void Test_8047()
-		{
-		}
-		[TestMethod]
-		public void Test_8048()
-		{
-		}
-		[TestMethod]
-		public void Test_8049()
-		{
-		}
-		[TestMethod]
-		public void Test_8050()
-		{
-		}
-		[TestMethod]
-		public void Test_8051()
-		{
-		}
-		[TestMethod]
-		public void Test_8052()
-		{
-		}
-		[TestMethod]
-		public void Test_8053()
-		{
-		}
-		[TestMethod]
-		public void Test_8054()
-		{
-		}
-		[TestMethod]
-		public void Test_8055()
-		{
-		}
-		[TestMethod]
-		public void Test_8056()
-		{
-		}
-		[TestMethod]
-		public void Test_8057()
-		{
-		}
-		[TestMethod]
-		public void Test_8058()
-		{
-		}
-		[TestMethod]
-		public void Test_8059()
-		{
-		}
-		[TestMethod]
-		public void Test_8060()
-		{
-		}
-		[TestMethod]
-		public void Test_8061()
-		{
-		}
-		[TestMethod]
-		public void Test_8062()
-		{
-		}
-		[TestMethod]
-		public void Test_8063()
-		{
-		}
-		[TestMethod]
-		public void Test_8064()
-		{
-		}
-		[TestMethod]
-		public void Test_8065()
-		{
-		}
-		[TestMethod]
-		public void Test_8066()
-		{
-		}
-		[TestMethod]
-		public void Test_8067()
-		{
-		}
-		[TestMethod]
-		public void Test_8068()
-		{
-		}
-		[TestMethod]
-		public void Test_8069()
-		{
-		}
-		[TestMethod]
-		public void Test_8070()
-		{
-		}
-		[TestMethod]
-		public void Test_8071()
-		{
-		}
-		[TestMethod]
-		public void Test_8072()
-		{
-		}
-		[TestMethod]
-		public void Test_8073()
-		{
-		}
-		[TestMethod]
-		public void Test_8074()
-		{
-		}
-		[TestMethod]
-		public void Test_8075()
-		{
-		}
-		[TestMethod]
-		public void Test_8076()
-		{
-		}
-		[TestMethod]
-		public void Test_8077()
-		{
-		}
-		[TestMethod]
-		public void Test_8078()
-		{
-		}
-		[TestMethod]
-		public void Test_8079()
-		{
-		}
-		[TestMethod]
-		public void Test_8080()
-		{
-		}
-		[TestMethod]
-		public void Test_8081()
-		{
-		}
-		[TestMethod]
-		public void Test_8082()
-		{
-		}
-		[TestMethod]
-		public void Test_8083()
-		{
-		}
-		[TestMethod]
-		public void Test_8084()
-		{
-		}
-		[TestMethod]
-		public void Test_8085()
-		{
-		}
-		[TestMethod]
-		public void Test_8086()
-		{
-		}
-		[TestMethod]
-		public void Test_8087()
-		{
-		}
-		[TestMethod]
-		public void Test_8088()
-		{
-		}
-		[TestMethod]
-		public void Test_8089()
-		{
-		}
-		[TestMethod]
-		public void Test_8090()
-		{
-		}
-		[TestMethod]
-		public void Test_8091()
-		{
-		}
-		[TestMethod]
-		public void Test_8092()
-		{
-		}
-		[TestMethod]
-		public void Test_8093()
-		{
-		}
-		[TestMethod]
-		public void Test_8094()
-		{
-		}
-		[TestMethod]
-		public void Test_8095()
-		{
-		}
-		[TestMethod]
-		public void Test_8096()
-		{
-		}
-		[TestMethod]
-		public void Test_8097()
-		{
-		}
-		[TestMethod]
-		public void Test_8098()
-		{
-		}
-		[TestMethod]
-		public void Test_8099()
-		{
-		}
-		[TestMethod]
-		public void Test_8100()
-		{
-		}
-		[TestMethod]
-		public void Test_8101()
-		{
-		}
-		[TestMethod]
-		public void Test_8102()
-		{
-		}
-		[TestMethod]
-		public void Test_8103()
-		{
-		}
-		[TestMethod]
-		public void Test_8104()
-		{
-		}
-		[TestMethod]
-		public void Test_8105()
-		{
-		}
-		[TestMethod]
-		public void Test_8106()
-		{
-		}
-		[TestMethod]
-		public void Test_8107()
-		{
-		}
-		[TestMethod]
-		public void Test_8108()
-		{
-		}
-		[TestMethod]
-		public void Test_8109()
-		{
-		}
-		[TestMethod]
-		public void Test_8110()
-		{
-		}
-		[TestMethod]
-		public void Test_8111()
-		{
-		}
-		[TestMethod]
-		public void Test_8112()
-		{
-		}
-		[TestMethod]
-		public void Test_8113()
-		{
-		}
-		[TestMethod]
-		public void Test_8114()
-		{
-		}
-		[TestMethod]
-		public void Test_8115()
-		{
-		}
-		[TestMethod]
-		public void Test_8116()
-		{
-		}
-		[TestMethod]
-		public void Test_8117()
-		{
-		}
-		[TestMethod]
-		public void Test_8118()
-		{
-		}
-		[TestMethod]
-		public void Test_8119()
-		{
-		}
-		[TestMethod]
-		public void Test_8120()
-		{
-		}
-		[TestMethod]
-		public void Test_8121()
-		{
-		}
-		[TestMethod]
-		public void Test_8122()
-		{
-		}
-		[TestMethod]
-		public void Test_8123()
-		{
-		}
-		[TestMethod]
-		public void Test_8124()
-		{
-		}
-		[TestMethod]
-		public void Test_8125()
-		{
-		}
-		[TestMethod]
-		public void Test_8126()
-		{
-		}
-		[TestMethod]
-		public void Test_8127()
-		{
-		}
-		[TestMethod]
-		public void Test_8128()
-		{
-		}
-		[TestMethod]
-		public void Test_8129()
-		{
-		}
-		[TestMethod]
-		public void Test_8130()
-		{
-		}
-		[TestMethod]
-		public void Test_8131()
-		{
-		}
-		[TestMethod]
-		public void Test_8132()
-		{
-		}
-		[TestMethod]
-		public void Test_8133()
-		{
-		}
-		[TestMethod]
-		public void Test_8134()
-		{
-		}
-		[TestMethod]
-		public void Test_8135()
-		{
-		}
-		[TestMethod]
-		public void Test_8136()
-		{
-		}
-		[TestMethod]
-		public void Test_8137()
-		{
-		}
-		[TestMethod]
-		public void Test_8138()
-		{
-		}
-		[TestMethod]
-		public void Test_8139()
-		{
-		}
-		[TestMethod]
-		public void Test_8140()
-		{
-		}
-		[TestMethod]
-		public void Test_8141()
-		{
-		}
-		[TestMethod]
-		public void Test_8142()
-		{
-		}
-		[TestMethod]
-		public void Test_8143()
-		{
-		}
-		[TestMethod]
-		public void Test_8144()
-		{
-		}
-		[TestMethod]
-		public void Test_8145()
-		{
-		}
-		[TestMethod]
-		public void Test_8146()
-		{
-		}
-		[TestMethod]
-		public void Test_8147()
-		{
-		}
-		[TestMethod]
-		public void Test_8148()
-		{
-		}
-		[TestMethod]
-		public void Test_8149()
-		{
-		}
-		[TestMethod]
-		public void Test_8150()
-		{
-		}
-		[TestMethod]
-		public void Test_8151()
-		{
-		}
-		[TestMethod]
-		public void Test_8152()
-		{
-		}
-		[TestMethod]
-		public void Test_8153()
-		{
-		}
-		[TestMethod]
-		public void Test_8154()
-		{
-		}
-		[TestMethod]
-		public void Test_8155()
-		{
-		}
-		[TestMethod]
-		public void Test_8156()
-		{
-		}
-		[TestMethod]
-		public void Test_8157()
-		{
-		}
-		[TestMethod]
-		public void Test_8158()
-		{
-		}
-		[TestMethod]
-		public void Test_8159()
-		{
-		}
-		[TestMethod]
-		public void Test_8160()
-		{
-		}
-		[TestMethod]
-		public void Test_8161()
-		{
-		}
-		[TestMethod]
-		public void Test_8162()
-		{
-		}
-		[TestMethod]
-		public void Test_8163()
-		{
-		}
-		[TestMethod]
-		public void Test_8164()
-		{
-		}
-		[TestMethod]
-		public void Test_8165()
-		{
-		}
-		[TestMethod]
-		public void Test_8166()
-		{
-		}
-		[TestMethod]
-		public void Test_8167()
-		{
-		}
-		[TestMethod]
-		public void Test_8168()
-		{
-		}
-		[TestMethod]
-		public void Test_8169()
-		{
-		}
-		[TestMethod]
-		public void Test_8170()
-		{
-		}
-		[TestMethod]
-		public void Test_8171()
-		{
-		}
-		[TestMethod]
-		public void Test_8172()
-		{
-		}
-		[TestMethod]
-		public void Test_8173()
-		{
-		}
-		[TestMethod]
-		public void Test_8174()
-		{
-		}
-		[TestMethod]
-		public void Test_8175()
-		{
-		}
-		[TestMethod]
-		public void Test_8176()
-		{
-		}
-		[TestMethod]
-		public void Test_8177()
-		{
-		}
-		[TestMethod]
-		public void Test_8178()
-		{
-		}
-		[TestMethod]
-		public void Test_8179()
-		{
-		}
-		[TestMethod]
-		public void Test_8180()
-		{
-		}
-		[TestMethod]
-		public void Test_8181()
-		{
-		}
-		[TestMethod]
-		public void Test_8182()
-		{
-		}
-		[TestMethod]
-		public void Test_8183()
-		{
-		}
-		[TestMethod]
-		public void Test_8184()
-		{
-		}
-		[TestMethod]
-		public void Test_8185()
-		{
-		}
-		[TestMethod]
-		public void Test_8186()
-		{
-		}
-		[TestMethod]
-		public void Test_8187()
-		{
-		}
-		[TestMethod]
-		public void Test_8188()
-		{
-		}
-		[TestMethod]
-		public void Test_8189()
-		{
-		}
-		[TestMethod]
-		public void Test_8190()
-		{
-		}
-		[TestMethod]
-		public void Test_8191()
-		{
-		}
-		[TestMethod]
-		public void Test_8192()
-		{
-		}
-		[TestMethod]
-		public void Test_8193()
-		{
-		}
-		[TestMethod]
-		public void Test_8194()
-		{
-		}
-		[TestMethod]
-		public void Test_8195()
-		{
-		}
-		[TestMethod]
-		public void Test_8196()
-		{
-		}
-		[TestMethod]
-		public void Test_8197()
-		{
-		}
-		[TestMethod]
-		public void Test_8198()
-		{
-		}
-		[TestMethod]
-		public void Test_8199()
-		{
-		}
-		[TestMethod]
-		public void Test_8200()
-		{
-		}
-		[TestMethod]
-		public void Test_8201()
-		{
-		}
-		[TestMethod]
-		public void Test_8202()
-		{
-		}
-		[TestMethod]
-		public void Test_8203()
-		{
-		}
-		[TestMethod]
-		public void Test_8204()
-		{
-		}
-		[TestMethod]
-		public void Test_8205()
-		{
-		}
-		[TestMethod]
-		public void Test_8206()
-		{
-		}
-		[TestMethod]
-		public void Test_8207()
-		{
-		}
-		[TestMethod]
-		public void Test_8208()
-		{
-		}
-		[TestMethod]
-		public void Test_8209()
-		{
-		}
-		[TestMethod]
-		public void Test_8210()
-		{
-		}
-		[TestMethod]
-		public void Test_8211()
-		{
-		}
-		[TestMethod]
-		public void Test_8212()
-		{
-		}
-		[TestMethod]
-		public void Test_8213()
-		{
-		}
-		[TestMethod]
-		public void Test_8214()
-		{
-		}
-		[TestMethod]
-		public void Test_8215()
-		{
-		}
-		[TestMethod]
-		public void Test_8216()
-		{
-		}
-		[TestMethod]
-		public void Test_8217()
-		{
-		}
-		[TestMethod]
-		public void Test_8218()
-		{
-		}
-		[TestMethod]
-		public void Test_8219()
-		{
-		}
-		[TestMethod]
-		public void Test_8220()
-		{
-		}
-		[TestMethod]
-		public void Test_8221()
-		{
-		}
-		[TestMethod]
-		public void Test_8222()
-		{
-		}
-		[TestMethod]
-		public void Test_8223()
-		{
-		}
-		[TestMethod]
-		public void Test_8224()
-		{
-		}
-		[TestMethod]
-		public void Test_8225()
-		{
-		}
-		[TestMethod]
-		public void Test_8226()
-		{
-		}
-		[TestMethod]
-		public void Test_8227()
-		{
-		}
-		[TestMethod]
-		public void Test_8228()
-		{
-		}
-		[TestMethod]
-		public void Test_8229()
-		{
-		}
-		[TestMethod]
-		public void Test_8230()
-		{
-		}
-		[TestMethod]
-		public void Test_8231()
-		{
-		}
-		[TestMethod]
-		public void Test_8232()
-		{
-		}
-		[TestMethod]
-		public void Test_8233()
-		{
-		}
-		[TestMethod]
-		public void Test_8234()
-		{
-		}
-		[TestMethod]
-		public void Test_8235()
-		{
-		}
-		[TestMethod]
-		public void Test_8236()
-		{
-		}
-		[TestMethod]
-		public void Test_8237()
-		{
-		}
-		[TestMethod]
-		public void Test_8238()
-		{
-		}
-		[TestMethod]
-		public void Test_8239()
-		{
-		}
-		[TestMethod]
-		public void Test_8240()
-		{
-		}
-		[TestMethod]
-		public void Test_8241()
-		{
-		}
-		[TestMethod]
-		public void Test_8242()
-		{
-		}
-		[TestMethod]
-		public void Test_8243()
-		{
-		}
-		[TestMethod]
-		public void Test_8244()
-		{
-		}
-		[TestMethod]
-		public void Test_8245()
-		{
-		}
-		[TestMethod]
-		public void Test_8246()
-		{
-		}
-		[TestMethod]
-		public void Test_8247()
-		{
-		}
-		[TestMethod]
-		public void Test_8248()
-		{
-		}
-		[TestMethod]
-		public void Test_8249()
-		{
-		}
-		[TestMethod]
-		public void Test_8250()
-		{
-		}
-		[TestMethod]
-		public void Test_8251()
-		{
-		}
-		[TestMethod]
-		public void Test_8252()
-		{
-		}
-		[TestMethod]
-		public void Test_8253()
-		{
-		}
-		[TestMethod]
-		public void Test_8254()
-		{
-		}
-		[TestMethod]
-		public void Test_8255()
-		{
-		}
-		[TestMethod]
-		public void Test_8256()
-		{
-		}
-		[TestMethod]
-		public void Test_8257()
-		{
-		}
-		[TestMethod]
-		public void Test_8258()
-		{
-		}
-		[TestMethod]
-		public void Test_8259()
-		{
-		}
-		[TestMethod]
-		public void Test_8260()
-		{
-		}
-		[TestMethod]
-		public void Test_8261()
-		{
-		}
-		[TestMethod]
-		public void Test_8262()
-		{
-		}
-		[TestMethod]
-		public void Test_8263()
-		{
-		}
-		[TestMethod]
-		public void Test_8264()
-		{
-		}
-		[TestMethod]
-		public void Test_8265()
-		{
-		}
-		[TestMethod]
-		public void Test_8266()
-		{
-		}
-		[TestMethod]
-		public void Test_8267()
-		{
-		}
-		[TestMethod]
-		public void Test_8268()
-		{
-		}
-		[TestMethod]
-		public void Test_8269()
-		{
-		}
-		[TestMethod]
-		public void Test_8270()
-		{
-		}
-		[TestMethod]
-		public void Test_8271()
-		{
-		}
-		[TestMethod]
-		public void Test_8272()
-		{
-		}
-		[TestMethod]
-		public void Test_8273()
-		{
-		}
-		[TestMethod]
-		public void Test_8274()
-		{
-		}
-		[TestMethod]
-		public void Test_8275()
-		{
-		}
-		[TestMethod]
-		public void Test_8276()
-		{
-		}
-		[TestMethod]
-		public void Test_8277()
-		{
-		}
-		[TestMethod]
-		public void Test_8278()
-		{
-		}
-		[TestMethod]
-		public void Test_8279()
-		{
-		}
-		[TestMethod]
-		public void Test_8280()
-		{
-		}
-		[TestMethod]
-		public void Test_8281()
-		{
-		}
-		[TestMethod]
-		public void Test_8282()
-		{
-		}
-		[TestMethod]
-		public void Test_8283()
-		{
-		}
-		[TestMethod]
-		public void Test_8284()
-		{
-		}
-		[TestMethod]
-		public void Test_8285()
-		{
-		}
-		[TestMethod]
-		public void Test_8286()
-		{
-		}
-		[TestMethod]
-		public void Test_8287()
-		{
-		}
-		[TestMethod]
-		public void Test_8288()
-		{
-		}
-		[TestMethod]
-		public void Test_8289()
-		{
-		}
-		[TestMethod]
-		public void Test_8290()
-		{
-		}
-		[TestMethod]
-		public void Test_8291()
-		{
-		}
-		[TestMethod]
-		public void Test_8292()
-		{
-		}
-		[TestMethod]
-		public void Test_8293()
-		{
-		}
-		[TestMethod]
-		public void Test_8294()
-		{
-		}
-		[TestMethod]
-		public void Test_8295()
-		{
-		}
-		[TestMethod]
-		public void Test_8296()
-		{
-		}
-		[TestMethod]
-		public void Test_8297()
-		{
-		}
-		[TestMethod]
-		public void Test_8298()
-		{
-		}
-		[TestMethod]
-		public void Test_8299()
-		{
-		}
-		[TestMethod]
-		public void Test_8300()
-		{
-		}
-		[TestMethod]
-		public void Test_8301()
-		{
-		}
-		[TestMethod]
-		public void Test_8302()
-		{
-		}
-		[TestMethod]
-		public void Test_8303()
-		{
-		}
-		[TestMethod]
-		public void Test_8304()
-		{
-		}
-		[TestMethod]
-		public void Test_8305()
-		{
-		}
-		[TestMethod]
-		public void Test_8306()
-		{
-		}
-		[TestMethod]
-		public void Test_8307()
-		{
-		}
-		[TestMethod]
-		public void Test_8308()
-		{
-		}
-		[TestMethod]
-		public void Test_8309()
-		{
-		}
-		[TestMethod]
-		public void Test_8310()
-		{
-		}
-		[TestMethod]
-		public void Test_8311()
-		{
-		}
-		[TestMethod]
-		public void Test_8312()
-		{
-		}
-		[TestMethod]
-		public void Test_8313()
-		{
-		}
-		[TestMethod]
-		public void Test_8314()
-		{
-		}
-		[TestMethod]
-		public void Test_8315()
-		{
-		}
-		[TestMethod]
-		public void Test_8316()
-		{
-		}
-		[TestMethod]
-		public void Test_8317()
-		{
-		}
-		[TestMethod]
-		public void Test_8318()
-		{
-		}
-		[TestMethod]
-		public void Test_8319()
-		{
-		}
-		[TestMethod]
-		public void Test_8320()
-		{
-		}
-		[TestMethod]
-		public void Test_8321()
-		{
-		}
-		[TestMethod]
-		public void Test_8322()
-		{
-		}
-		[TestMethod]
-		public void Test_8323()
-		{
-		}
-		[TestMethod]
-		public void Test_8324()
-		{
-		}
-		[TestMethod]
-		public void Test_8325()
-		{
-		}
-		[TestMethod]
-		public void Test_8326()
-		{
-		}
-		[TestMethod]
-		public void Test_8327()
-		{
-		}
-		[TestMethod]
-		public void Test_8328()
-		{
-		}
-		[TestMethod]
-		public void Test_8329()
-		{
-		}
-		[TestMethod]
-		public void Test_8330()
-		{
-		}
-		[TestMethod]
-		public void Test_8331()
-		{
-		}
-		[TestMethod]
-		public void Test_8332()
-		{
-		}
-		[TestMethod]
-		public void Test_8333()
-		{
-		}
-		[TestMethod]
-		public void Test_8334()
-		{
-		}
-		[TestMethod]
-		public void Test_8335()
-		{
-		}
-		[TestMethod]
-		public void Test_8336()
-		{
-		}
-		[TestMethod]
-		public void Test_8337()
-		{
-		}
-		[TestMethod]
-		public void Test_8338()
-		{
-		}
-		[TestMethod]
-		public void Test_8339()
-		{
-		}
-		[TestMethod]
-		public void Test_8340()
-		{
-		}
-		[TestMethod]
-		public void Test_8341()
-		{
-		}
-		[TestMethod]
-		public void Test_8342()
-		{
-		}
-		[TestMethod]
-		public void Test_8343()
-		{
-		}
-		[TestMethod]
-		public void Test_8344()
-		{
-		}
-		[TestMethod]
-		public void Test_8345()
-		{
-		}
-		[TestMethod]
-		public void Test_8346()
-		{
-		}
-		[TestMethod]
-		public void Test_8347()
-		{
-		}
-		[TestMethod]
-		public void Test_8348()
-		{
-		}
-		[TestMethod]
-		public void Test_8349()
-		{
-		}
-		[TestMethod]
-		public void Test_8350()
-		{
-		}
-		[TestMethod]
-		public void Test_8351()
-		{
-		}
-		[TestMethod]
-		public void Test_8352()
-		{
-		}
-		[TestMethod]
-		public void Test_8353()
-		{
-		}
-		[TestMethod]
-		public void Test_8354()
-		{
-		}
-		[TestMethod]
-		public void Test_8355()
-		{
-		}
-		[TestMethod]
-		public void Test_8356()
-		{
-		}
-		[TestMethod]
-		public void Test_8357()
-		{
-		}
-		[TestMethod]
-		public void Test_8358()
-		{
-		}
-		[TestMethod]
-		public void Test_8359()
-		{
-		}
-		[TestMethod]
-		public void Test_8360()
-		{
-		}
-		[TestMethod]
-		public void Test_8361()
-		{
-		}
-		[TestMethod]
-		public void Test_8362()
-		{
-		}
-		[TestMethod]
-		public void Test_8363()
-		{
-		}
-		[TestMethod]
-		public void Test_8364()
-		{
-		}
-		[TestMethod]
-		public void Test_8365()
-		{
-		}
-		[TestMethod]
-		public void Test_8366()
-		{
-		}
-		[TestMethod]
-		public void Test_8367()
-		{
-		}
-		[TestMethod]
-		public void Test_8368()
-		{
-		}
-		[TestMethod]
-		public void Test_8369()
-		{
-		}
-		[TestMethod]
-		public void Test_8370()
-		{
-		}
-		[TestMethod]
-		public void Test_8371()
-		{
-		}
-		[TestMethod]
-		public void Test_8372()
-		{
-		}
-		[TestMethod]
-		public void Test_8373()
-		{
-		}
-		[TestMethod]
-		public void Test_8374()
-		{
-		}
-		[TestMethod]
-		public void Test_8375()
-		{
-		}
-		[TestMethod]
-		public void Test_8376()
-		{
-		}
-		[TestMethod]
-		public void Test_8377()
-		{
-		}
-		[TestMethod]
-		public void Test_8378()
-		{
-		}
-		[TestMethod]
-		public void Test_8379()
-		{
-		}
-		[TestMethod]
-		public void Test_8380()
-		{
-		}
-		[TestMethod]
-		public void Test_8381()
-		{
-		}
-		[TestMethod]
-		public void Test_8382()
-		{
-		}
-		[TestMethod]
-		public void Test_8383()
-		{
-		}
-		[TestMethod]
-		public void Test_8384()
-		{
-		}
-		[TestMethod]
-		public void Test_8385()
-		{
-		}
-		[TestMethod]
-		public void Test_8386()
-		{
-		}
-		[TestMethod]
-		public void Test_8387()
-		{
-		}
-		[TestMethod]
-		public void Test_8388()
-		{
-		}
-		[TestMethod]
-		public void Test_8389()
-		{
-		}
-		[TestMethod]
-		public void Test_8390()
-		{
-		}
-		[TestMethod]
-		public void Test_8391()
-		{
-		}
-		[TestMethod]
-		public void Test_8392()
-		{
-		}
-		[TestMethod]
-		public void Test_8393()
-		{
-		}
-		[TestMethod]
-		public void Test_8394()
-		{
-		}
-		[TestMethod]
-		public void Test_8395()
-		{
-		}
-		[TestMethod]
-		public void Test_8396()
-		{
-		}
-		[TestMethod]
-		public void Test_8397()
-		{
-		}
-		[TestMethod]
-		public void Test_8398()
-		{
-		}
-		[TestMethod]
-		public void Test_8399()
-		{
-		}
-		[TestMethod]
-		public void Test_8400()
-		{
-		}
-		[TestMethod]
-		public void Test_8401()
-		{
-		}
-		[TestMethod]
-		public void Test_8402()
-		{
-		}
-		[TestMethod]
-		public void Test_8403()
-		{
-		}
-		[TestMethod]
-		public void Test_8404()
-		{
-		}
-		[TestMethod]
-		public void Test_8405()
-		{
-		}
-		[TestMethod]
-		public void Test_8406()
-		{
-		}
-		[TestMethod]
-		public void Test_8407()
-		{
-		}
-		[TestMethod]
-		public void Test_8408()
-		{
-		}
-		[TestMethod]
-		public void Test_8409()
-		{
-		}
-		[TestMethod]
-		public void Test_8410()
-		{
-		}
-		[TestMethod]
-		public void Test_8411()
-		{
-		}
-		[TestMethod]
-		public void Test_8412()
-		{
-		}
-		[TestMethod]
-		public void Test_8413()
-		{
-		}
-		[TestMethod]
-		public void Test_8414()
-		{
-		}
-		[TestMethod]
-		public void Test_8415()
-		{
-		}
-		[TestMethod]
-		public void Test_8416()
-		{
-		}
-		[TestMethod]
-		public void Test_8417()
-		{
-		}
-		[TestMethod]
-		public void Test_8418()
-		{
-		}
-		[TestMethod]
-		public void Test_8419()
-		{
-		}
-		[TestMethod]
-		public void Test_8420()
-		{
-		}
-		[TestMethod]
-		public void Test_8421()
-		{
-		}
-		[TestMethod]
-		public void Test_8422()
-		{
-		}
-		[TestMethod]
-		public void Test_8423()
-		{
-		}
-		[TestMethod]
-		public void Test_8424()
-		{
-		}
-		[TestMethod]
-		public void Test_8425()
-		{
-		}
-		[TestMethod]
-		public void Test_8426()
-		{
-		}
-		[TestMethod]
-		public void Test_8427()
-		{
-		}
-		[TestMethod]
-		public void Test_8428()
-		{
-		}
-		[TestMethod]
-		public void Test_8429()
-		{
-		}
-		[TestMethod]
-		public void Test_8430()
-		{
-		}
-		[TestMethod]
-		public void Test_8431()
-		{
-		}
-		[TestMethod]
-		public void Test_8432()
-		{
-		}
-		[TestMethod]
-		public void Test_8433()
-		{
-		}
-		[TestMethod]
-		public void Test_8434()
-		{
-		}
-		[TestMethod]
-		public void Test_8435()
-		{
-		}
-		[TestMethod]
-		public void Test_8436()
-		{
-		}
-		[TestMethod]
-		public void Test_8437()
-		{
-		}
-		[TestMethod]
-		public void Test_8438()
-		{
-		}
-		[TestMethod]
-		public void Test_8439()
-		{
-		}
-		[TestMethod]
-		public void Test_8440()
-		{
-		}
-		[TestMethod]
-		public void Test_8441()
-		{
-		}
-		[TestMethod]
-		public void Test_8442()
-		{
-		}
-		[TestMethod]
-		public void Test_8443()
-		{
-		}
-		[TestMethod]
-		public void Test_8444()
-		{
-		}
-		[TestMethod]
-		public void Test_8445()
-		{
-		}
-		[TestMethod]
-		public void Test_8446()
-		{
-		}
-		[TestMethod]
-		public void Test_8447()
-		{
-		}
-		[TestMethod]
-		public void Test_8448()
-		{
-		}
-		[TestMethod]
-		public void Test_8449()
-		{
-		}
-		[TestMethod]
-		public void Test_8450()
-		{
-		}
-		[TestMethod]
-		public void Test_8451()
-		{
-		}
-		[TestMethod]
-		public void Test_8452()
-		{
-		}
-		[TestMethod]
-		public void Test_8453()
-		{
-		}
-		[TestMethod]
-		public void Test_8454()
-		{
-		}
-		[TestMethod]
-		public void Test_8455()
-		{
-		}
-		[TestMethod]
-		public void Test_8456()
-		{
-		}
-		[TestMethod]
-		public void Test_8457()
-		{
-		}
-		[TestMethod]
-		public void Test_8458()
-		{
-		}
-		[TestMethod]
-		public void Test_8459()
-		{
-		}
-		[TestMethod]
-		public void Test_8460()
-		{
-		}
-		[TestMethod]
-		public void Test_8461()
-		{
-		}
-		[TestMethod]
-		public void Test_8462()
-		{
-		}
-		[TestMethod]
-		public void Test_8463()
-		{
-		}
-		[TestMethod]
-		public void Test_8464()
-		{
-		}
-		[TestMethod]
-		public void Test_8465()
-		{
-		}
-		[TestMethod]
-		public void Test_8466()
-		{
-		}
-		[TestMethod]
-		public void Test_8467()
-		{
-		}
-		[TestMethod]
-		public void Test_8468()
-		{
-		}
-		[TestMethod]
-		public void Test_8469()
-		{
-		}
-		[TestMethod]
-		public void Test_8470()
-		{
-		}
-		[TestMethod]
-		public void Test_8471()
-		{
-		}
-		[TestMethod]
-		public void Test_8472()
-		{
-		}
-		[TestMethod]
-		public void Test_8473()
-		{
-		}
-		[TestMethod]
-		public void Test_8474()
-		{
-		}
-		[TestMethod]
-		public void Test_8475()
-		{
-		}
-		[TestMethod]
-		public void Test_8476()
-		{
-		}
-		[TestMethod]
-		public void Test_8477()
-		{
-		}
-		[TestMethod]
-		public void Test_8478()
-		{
-		}
-		[TestMethod]
-		public void Test_8479()
-		{
-		}
-		[TestMethod]
-		public void Test_8480()
-		{
-		}
-		[TestMethod]
-		public void Test_8481()
-		{
-		}
-		[TestMethod]
-		public void Test_8482()
-		{
-		}
-		[TestMethod]
-		public void Test_8483()
-		{
-		}
-		[TestMethod]
-		public void Test_8484()
-		{
-		}
-		[TestMethod]
-		public void Test_8485()
-		{
-		}
-		[TestMethod]
-		public void Test_8486()
-		{
-		}
-		[TestMethod]
-		public void Test_8487()
-		{
-		}
-		[TestMethod]
-		public void Test_8488()
-		{
-		}
-		[TestMethod]
-		public void Test_8489()
-		{
-		}
-		[TestMethod]
-		public void Test_8490()
-		{
-		}
-		[TestMethod]
-		public void Test_8491()
-		{
-		}
-		[TestMethod]
-		public void Test_8492()
-		{
-		}
-		[TestMethod]
-		public void Test_8493()
-		{
-		}
-		[TestMethod]
-		public void Test_8494()
-		{
-		}
-		[TestMethod]
-		public void Test_8495()
-		{
-		}
-		[TestMethod]
-		public void Test_8496()
-		{
-		}
-		[TestMethod]
-		public void Test_8497()
-		{
-		}
-		[TestMethod]
-		public void Test_8498()
-		{
-		}
-		[TestMethod]
-		public void Test_8499()
-		{
-		}
-		[TestMethod]
-		public void Test_8500()
-		{
-		}
-		[TestMethod]
-		public void Test_8501()
-		{
-		}
-		[TestMethod]
-		public void Test_8502()
-		{
-		}
-		[TestMethod]
-		public void Test_8503()
-		{
-		}
-		[TestMethod]
-		public void Test_8504()
-		{
-		}
-		[TestMethod]
-		public void Test_8505()
-		{
-		}
-		[TestMethod]
-		public void Test_8506()
-		{
-		}
-		[TestMethod]
-		public void Test_8507()
-		{
-		}
-		[TestMethod]
-		public void Test_8508()
-		{
-		}
-		[TestMethod]
-		public void Test_8509()
-		{
-		}
-		[TestMethod]
-		public void Test_8510()
-		{
-		}
-		[TestMethod]
-		public void Test_8511()
-		{
-		}
-		[TestMethod]
-		public void Test_8512()
-		{
-		}
-		[TestMethod]
-		public void Test_8513()
-		{
-		}
-		[TestMethod]
-		public void Test_8514()
-		{
-		}
-		[TestMethod]
-		public void Test_8515()
-		{
-		}
-		[TestMethod]
-		public void Test_8516()
-		{
-		}
-		[TestMethod]
-		public void Test_8517()
-		{
-		}
-		[TestMethod]
-		public void Test_8518()
-		{
-		}
-		[TestMethod]
-		public void Test_8519()
-		{
-		}
-		[TestMethod]
-		public void Test_8520()
-		{
-		}
-		[TestMethod]
-		public void Test_8521()
-		{
-		}
-		[TestMethod]
-		public void Test_8522()
-		{
-		}
-		[TestMethod]
-		public void Test_8523()
-		{
-		}
-		[TestMethod]
-		public void Test_8524()
-		{
-		}
-		[TestMethod]
-		public void Test_8525()
-		{
-		}
-		[TestMethod]
-		public void Test_8526()
-		{
-		}
-		[TestMethod]
-		public void Test_8527()
-		{
-		}
-		[TestMethod]
-		public void Test_8528()
-		{
-		}
-		[TestMethod]
-		public void Test_8529()
-		{
-		}
-		[TestMethod]
-		public void Test_8530()
-		{
-		}
-		[TestMethod]
-		public void Test_8531()
-		{
-		}
-		[TestMethod]
-		public void Test_8532()
-		{
-		}
-		[TestMethod]
-		public void Test_8533()
-		{
-		}
-		[TestMethod]
-		public void Test_8534()
-		{
-		}
-		[TestMethod]
-		public void Test_8535()
-		{
-		}
-		[TestMethod]
-		public void Test_8536()
-		{
-		}
-		[TestMethod]
-		public void Test_8537()
-		{
-		}
-		[TestMethod]
-		public void Test_8538()
-		{
-		}
-		[TestMethod]
-		public void Test_8539()
-		{
-		}
-		[TestMethod]
-		public void Test_8540()
-		{
-		}
-		[TestMethod]
-		public void Test_8541()
-		{
-		}
-		[TestMethod]
-		public void Test_8542()
-		{
-		}
-		[TestMethod]
-		public void Test_8543()
-		{
-		}
-		[TestMethod]
-		public void Test_8544()
-		{
-		}
-		[TestMethod]
-		public void Test_8545()
-		{
-		}
-		[TestMethod]
-		public void Test_8546()
-		{
-		}
-		[TestMethod]
-		public void Test_8547()
-		{
-		}
-		[TestMethod]
-		public void Test_8548()
-		{
-		}
-		[TestMethod]
-		public void Test_8549()
-		{
-		}
-		[TestMethod]
-		public void Test_8550()
-		{
-		}
-		[TestMethod]
-		public void Test_8551()
-		{
-		}
-		[TestMethod]
-		public void Test_8552()
-		{
-		}
-		[TestMethod]
-		public void Test_8553()
-		{
-		}
-		[TestMethod]
-		public void Test_8554()
-		{
-		}
-		[TestMethod]
-		public void Test_8555()
-		{
-		}
-		[TestMethod]
-		public void Test_8556()
-		{
-		}
-		[TestMethod]
-		public void Test_8557()
-		{
-		}
-		[TestMethod]
-		public void Test_8558()
-		{
-		}
-		[TestMethod]
-		public void Test_8559()
-		{
-		}
-		[TestMethod]
-		public void Test_8560()
-		{
-		}
-		[TestMethod]
-		public void Test_8561()
-		{
-		}
-		[TestMethod]
-		public void Test_8562()
-		{
-		}
-		[TestMethod]
-		public void Test_8563()
-		{
-		}
-		[TestMethod]
-		public void Test_8564()
-		{
-		}
-		[TestMethod]
-		public void Test_8565()
-		{
-		}
-		[TestMethod]
-		public void Test_8566()
-		{
-		}
-		[TestMethod]
-		public void Test_8567()
-		{
-		}
-		[TestMethod]
-		public void Test_8568()
-		{
-		}
-		[TestMethod]
-		public void Test_8569()
-		{
-		}
-		[TestMethod]
-		public void Test_8570()
-		{
-		}
-		[TestMethod]
-		public void Test_8571()
-		{
-		}
-		[TestMethod]
-		public void Test_8572()
-		{
-		}
-		[TestMethod]
-		public void Test_8573()
-		{
-		}
-		[TestMethod]
-		public void Test_8574()
-		{
-		}
-		[TestMethod]
-		public void Test_8575()
-		{
-		}
-		[TestMethod]
-		public void Test_8576()
-		{
-		}
-		[TestMethod]
-		public void Test_8577()
-		{
-		}
-		[TestMethod]
-		public void Test_8578()
-		{
-		}
-		[TestMethod]
-		public void Test_8579()
-		{
-		}
-		[TestMethod]
-		public void Test_8580()
-		{
-		}
-		[TestMethod]
-		public void Test_8581()
-		{
-		}
-		[TestMethod]
-		public void Test_8582()
-		{
-		}
-		[TestMethod]
-		public void Test_8583()
-		{
-		}
-		[TestMethod]
-		public void Test_8584()
-		{
-		}
-		[TestMethod]
-		public void Test_8585()
-		{
-		}
-		[TestMethod]
-		public void Test_8586()
-		{
-		}
-		[TestMethod]
-		public void Test_8587()
-		{
-		}
-		[TestMethod]
-		public void Test_8588()
-		{
-		}
-		[TestMethod]
-		public void Test_8589()
-		{
-		}
-		[TestMethod]
-		public void Test_8590()
-		{
-		}
-		[TestMethod]
-		public void Test_8591()
-		{
-		}
-		[TestMethod]
-		public void Test_8592()
-		{
-		}
-		[TestMethod]
-		public void Test_8593()
-		{
-		}
-		[TestMethod]
-		public void Test_8594()
-		{
-		}
-		[TestMethod]
-		public void Test_8595()
-		{
-		}
-		[TestMethod]
-		public void Test_8596()
-		{
-		}
-		[TestMethod]
-		public void Test_8597()
-		{
-		}
-		[TestMethod]
-		public void Test_8598()
-		{
-		}
-		[TestMethod]
-		public void Test_8599()
-		{
-		}
-		[TestMethod]
-		public void Test_8600()
-		{
-		}
-		[TestMethod]
-		public void Test_8601()
-		{
-		}
-		[TestMethod]
-		public void Test_8602()
-		{
-		}
-		[TestMethod]
-		public void Test_8603()
-		{
-		}
-		[TestMethod]
-		public void Test_8604()
-		{
-		}
-		[TestMethod]
-		public void Test_8605()
-		{
-		}
-		[TestMethod]
-		public void Test_8606()
-		{
-		}
-		[TestMethod]
-		public void Test_8607()
-		{
-		}
-		[TestMethod]
-		public void Test_8608()
-		{
-		}
-		[TestMethod]
-		public void Test_8609()
-		{
-		}
-		[TestMethod]
-		public void Test_8610()
-		{
-		}
-		[TestMethod]
-		public void Test_8611()
-		{
-		}
-		[TestMethod]
-		public void Test_8612()
-		{
-		}
-		[TestMethod]
-		public void Test_8613()
-		{
-		}
-		[TestMethod]
-		public void Test_8614()
-		{
-		}
-		[TestMethod]
-		public void Test_8615()
-		{
-		}
-		[TestMethod]
-		public void Test_8616()
-		{
-		}
-		[TestMethod]
-		public void Test_8617()
-		{
-		}
-		[TestMethod]
-		public void Test_8618()
-		{
-		}
-		[TestMethod]
-		public void Test_8619()
-		{
-		}
-		[TestMethod]
-		public void Test_8620()
-		{
-		}
-		[TestMethod]
-		public void Test_8621()
-		{
-		}
-		[TestMethod]
-		public void Test_8622()
-		{
-		}
-		[TestMethod]
-		public void Test_8623()
-		{
-		}
-		[TestMethod]
-		public void Test_8624()
-		{
-		}
-		[TestMethod]
-		public void Test_8625()
-		{
-		}
-		[TestMethod]
-		public void Test_8626()
-		{
-		}
-		[TestMethod]
-		public void Test_8627()
-		{
-		}
-		[TestMethod]
-		public void Test_8628()
-		{
-		}
-		[TestMethod]
-		public void Test_8629()
-		{
-		}
-		[TestMethod]
-		public void Test_8630()
-		{
-		}
-		[TestMethod]
-		public void Test_8631()
-		{
-		}
-		[TestMethod]
-		public void Test_8632()
-		{
-		}
-		[TestMethod]
-		public void Test_8633()
-		{
-		}
-		[TestMethod]
-		public void Test_8634()
-		{
-		}
-		[TestMethod]
-		public void Test_8635()
-		{
-		}
-		[TestMethod]
-		public void Test_8636()
-		{
-		}
-		[TestMethod]
-		public void Test_8637()
-		{
-		}
-		[TestMethod]
-		public void Test_8638()
-		{
-		}
-		[TestMethod]
-		public void Test_8639()
-		{
-		}
-		[TestMethod]
-		public void Test_8640()
-		{
-		}
-		[TestMethod]
-		public void Test_8641()
-		{
-		}
-		[TestMethod]
-		public void Test_8642()
-		{
-		}
-		[TestMethod]
-		public void Test_8643()
-		{
-		}
-		[TestMethod]
-		public void Test_8644()
-		{
-		}
-		[TestMethod]
-		public void Test_8645()
-		{
-		}
-		[TestMethod]
-		public void Test_8646()
-		{
-		}
-		[TestMethod]
-		public void Test_8647()
-		{
-		}
-		[TestMethod]
-		public void Test_8648()
-		{
-		}
-		[TestMethod]
-		public void Test_8649()
-		{
-		}
-		[TestMethod]
-		public void Test_8650()
-		{
-		}
-		[TestMethod]
-		public void Test_8651()
-		{
-		}
-		[TestMethod]
-		public void Test_8652()
-		{
-		}
-		[TestMethod]
-		public void Test_8653()
-		{
-		}
-		[TestMethod]
-		public void Test_8654()
-		{
-		}
-		[TestMethod]
-		public void Test_8655()
-		{
-		}
-		[TestMethod]
-		public void Test_8656()
-		{
-		}
-		[TestMethod]
-		public void Test_8657()
-		{
-		}
-		[TestMethod]
-		public void Test_8658()
-		{
-		}
-		[TestMethod]
-		public void Test_8659()
-		{
-		}
-		[TestMethod]
-		public void Test_8660()
-		{
-		}
-		[TestMethod]
-		public void Test_8661()
-		{
-		}
-		[TestMethod]
-		public void Test_8662()
-		{
-		}
-		[TestMethod]
-		public void Test_8663()
-		{
-		}
-		[TestMethod]
-		public void Test_8664()
-		{
-		}
-		[TestMethod]
-		public void Test_8665()
-		{
-		}
-		[TestMethod]
-		public void Test_8666()
-		{
-		}
-		[TestMethod]
-		public void Test_8667()
-		{
-		}
-		[TestMethod]
-		public void Test_8668()
-		{
-		}
-		[TestMethod]
-		public void Test_8669()
-		{
-		}
-		[TestMethod]
-		public void Test_8670()
-		{
-		}
-		[TestMethod]
-		public void Test_8671()
-		{
-		}
-		[TestMethod]
-		public void Test_8672()
-		{
-		}
-		[TestMethod]
-		public void Test_8673()
-		{
-		}
-		[TestMethod]
-		public void Test_8674()
-		{
-		}
-		[TestMethod]
-		public void Test_8675()
-		{
-		}
-		[TestMethod]
-		public void Test_8676()
-		{
-		}
-		[TestMethod]
-		public void Test_8677()
-		{
-		}
-		[TestMethod]
-		public void Test_8678()
-		{
-		}
-		[TestMethod]
-		public void Test_8679()
-		{
-		}
-		[TestMethod]
-		public void Test_8680()
-		{
-		}
-		[TestMethod]
-		public void Test_8681()
-		{
-		}
-		[TestMethod]
-		public void Test_8682()
-		{
-		}
-		[TestMethod]
-		public void Test_8683()
-		{
-		}
-		[TestMethod]
-		public void Test_8684()
-		{
-		}
-		[TestMethod]
-		public void Test_8685()
-		{
-		}
-		[TestMethod]
-		public void Test_8686()
-		{
-		}
-		[TestMethod]
-		public void Test_8687()
-		{
-		}
-		[TestMethod]
-		public void Test_8688()
-		{
-		}
-		[TestMethod]
-		public void Test_8689()
-		{
-		}
-		[TestMethod]
-		public void Test_8690()
-		{
-		}
-		[TestMethod]
-		public void Test_8691()
-		{
-		}
-		[TestMethod]
-		public void Test_8692()
-		{
-		}
-		[TestMethod]
-		public void Test_8693()
-		{
-		}
-		[TestMethod]
-		public void Test_8694()
-		{
-		}
-		[TestMethod]
-		public void Test_8695()
-		{
-		}
-		[TestMethod]
-		public void Test_8696()
-		{
-		}
-		[TestMethod]
-		public void Test_8697()
-		{
-		}
-		[TestMethod]
-		public void Test_8698()
-		{
-		}
-		[TestMethod]
-		public void Test_8699()
-		{
-		}
-		[TestMethod]
-		public void Test_8700()
-		{
-		}
-		[TestMethod]
-		public void Test_8701()
-		{
-		}
-		[TestMethod]
-		public void Test_8702()
-		{
-		}
-		[TestMethod]
-		public void Test_8703()
-		{
-		}
-		[TestMethod]
-		public void Test_8704()
-		{
-		}
-		[TestMethod]
-		public void Test_8705()
-		{
-		}
-		[TestMethod]
-		public void Test_8706()
-		{
-		}
-		[TestMethod]
-		public void Test_8707()
-		{
-		}
-		[TestMethod]
-		public void Test_8708()
-		{
-		}
-		[TestMethod]
-		public void Test_8709()
-		{
-		}
-		[TestMethod]
-		public void Test_8710()
-		{
-		}
-		[TestMethod]
-		public void Test_8711()
-		{
-		}
-		[TestMethod]
-		public void Test_8712()
-		{
-		}
-		[TestMethod]
-		public void Test_8713()
-		{
-		}
-		[TestMethod]
-		public void Test_8714()
-		{
-		}
-		[TestMethod]
-		public void Test_8715()
-		{
-		}
-		[TestMethod]
-		public void Test_8716()
-		{
-		}
-		[TestMethod]
-		public void Test_8717()
-		{
-		}
-		[TestMethod]
-		public void Test_8718()
-		{
-		}
-		[TestMethod]
-		public void Test_8719()
-		{
-		}
-		[TestMethod]
-		public void Test_8720()
-		{
-		}
-		[TestMethod]
-		public void Test_8721()
-		{
-		}
-		[TestMethod]
-		public void Test_8722()
-		{
-		}
-		[TestMethod]
-		public void Test_8723()
-		{
-		}
-		[TestMethod]
-		public void Test_8724()
-		{
-		}
-		[TestMethod]
-		public void Test_8725()
-		{
-		}
-		[TestMethod]
-		public void Test_8726()
-		{
-		}
-		[TestMethod]
-		public void Test_8727()
-		{
-		}
-		[TestMethod]
-		public void Test_8728()
-		{
-		}
-		[TestMethod]
-		public void Test_8729()
-		{
-		}
-		[TestMethod]
-		public void Test_8730()
-		{
-		}
-		[TestMethod]
-		public void Test_8731()
-		{
-		}
-		[TestMethod]
-		public void Test_8732()
-		{
-		}
-		[TestMethod]
-		public void Test_8733()
-		{
-		}
-		[TestMethod]
-		public void Test_8734()
-		{
-		}
-		[TestMethod]
-		public void Test_8735()
-		{
-		}
-		[TestMethod]
-		public void Test_8736()
-		{
-		}
-		[TestMethod]
-		public void Test_8737()
-		{
-		}
-		[TestMethod]
-		public void Test_8738()
-		{
-		}
-		[TestMethod]
-		public void Test_8739()
-		{
-		}
-		[TestMethod]
-		public void Test_8740()
-		{
-		}
-		[TestMethod]
-		public void Test_8741()
-		{
-		}
-		[TestMethod]
-		public void Test_8742()
-		{
-		}
-		[TestMethod]
-		public void Test_8743()
-		{
-		}
-		[TestMethod]
-		public void Test_8744()
-		{
-		}
-		[TestMethod]
-		public void Test_8745()
-		{
-		}
-		[TestMethod]
-		public void Test_8746()
-		{
-		}
-		[TestMethod]
-		public void Test_8747()
-		{
-		}
-		[TestMethod]
-		public void Test_8748()
-		{
-		}
-		[TestMethod]
-		public void Test_8749()
-		{
-		}
-		[TestMethod]
-		public void Test_8750()
-		{
-		}
-		[TestMethod]
-		public void Test_8751()
-		{
-		}
-		[TestMethod]
-		public void Test_8752()
-		{
-		}
-		[TestMethod]
-		public void Test_8753()
-		{
-		}
-		[TestMethod]
-		public void Test_8754()
-		{
-		}
-		[TestMethod]
-		public void Test_8755()
-		{
-		}
-		[TestMethod]
-		public void Test_8756()
-		{
-		}
-		[TestMethod]
-		public void Test_8757()
-		{
-		}
-		[TestMethod]
-		public void Test_8758()
-		{
-		}
-		[TestMethod]
-		public void Test_8759()
-		{
-		}
-		[TestMethod]
-		public void Test_8760()
-		{
-		}
-		[TestMethod]
-		public void Test_8761()
-		{
-		}
-		[TestMethod]
-		public void Test_8762()
-		{
-		}
-		[TestMethod]
-		public void Test_8763()
-		{
-		}
-		[TestMethod]
-		public void Test_8764()
-		{
-		}
-		[TestMethod]
-		public void Test_8765()
-		{
-		}
-		[TestMethod]
-		public void Test_8766()
-		{
-		}
-		[TestMethod]
-		public void Test_8767()
-		{
-		}
-		[TestMethod]
-		public void Test_8768()
-		{
-		}
-		[TestMethod]
-		public void Test_8769()
-		{
-		}
-		[TestMethod]
-		public void Test_8770()
-		{
-		}
-		[TestMethod]
-		public void Test_8771()
-		{
-		}
-		[TestMethod]
-		public void Test_8772()
-		{
-		}
-		[TestMethod]
-		public void Test_8773()
-		{
-		}
-		[TestMethod]
-		public void Test_8774()
-		{
-		}
-		[TestMethod]
-		public void Test_8775()
-		{
-		}
-		[TestMethod]
-		public void Test_8776()
-		{
-		}
-		[TestMethod]
-		public void Test_8777()
-		{
-		}
-		[TestMethod]
-		public void Test_8778()
-		{
-		}
-		[TestMethod]
-		public void Test_8779()
-		{
-		}
-		[TestMethod]
-		public void Test_8780()
-		{
-		}
-		[TestMethod]
-		public void Test_8781()
-		{
-		}
-		[TestMethod]
-		public void Test_8782()
-		{
-		}
-		[TestMethod]
-		public void Test_8783()
-		{
-		}
-		[TestMethod]
-		public void Test_8784()
-		{
-		}
-		[TestMethod]
-		public void Test_8785()
-		{
-		}
-		[TestMethod]
-		public void Test_8786()
-		{
-		}
-		[TestMethod]
-		public void Test_8787()
-		{
-		}
-		[TestMethod]
-		public void Test_8788()
-		{
-		}
-		[TestMethod]
-		public void Test_8789()
-		{
-		}
-		[TestMethod]
-		public void Test_8790()
-		{
-		}
-		[TestMethod]
-		public void Test_8791()
-		{
-		}
-		[TestMethod]
-		public void Test_8792()
-		{
-		}
-		[TestMethod]
-		public void Test_8793()
-		{
-		}
-		[TestMethod]
-		public void Test_8794()
-		{
-		}
-		[TestMethod]
-		public void Test_8795()
-		{
-		}
-		[TestMethod]
-		public void Test_8796()
-		{
-		}
-		[TestMethod]
-		public void Test_8797()
-		{
-		}
-		[TestMethod]
-		public void Test_8798()
-		{
-		}
-		[TestMethod]
-		public void Test_8799()
-		{
-		}
-		[TestMethod]
-		public void Test_8800()
-		{
-		}
-		[TestMethod]
-		public void Test_8801()
-		{
-		}
-		[TestMethod]
-		public void Test_8802()
-		{
-		}
-		[TestMethod]
-		public void Test_8803()
-		{
-		}
-		[TestMethod]
-		public void Test_8804()
-		{
-		}
-		[TestMethod]
-		public void Test_8805()
-		{
-		}
-		[TestMethod]
-		public void Test_8806()
-		{
-		}
-		[TestMethod]
-		public void Test_8807()
-		{
-		}
-		[TestMethod]
-		public void Test_8808()
-		{
-		}
-		[TestMethod]
-		public void Test_8809()
-		{
-		}
-		[TestMethod]
-		public void Test_8810()
-		{
-		}
-		[TestMethod]
-		public void Test_8811()
-		{
-		}
-		[TestMethod]
-		public void Test_8812()
-		{
-		}
-		[TestMethod]
-		public void Test_8813()
-		{
-		}
-		[TestMethod]
-		public void Test_8814()
-		{
-		}
-		[TestMethod]
-		public void Test_8815()
-		{
-		}
-		[TestMethod]
-		public void Test_8816()
-		{
-		}
-		[TestMethod]
-		public void Test_8817()
-		{
-		}
-		[TestMethod]
-		public void Test_8818()
-		{
-		}
-		[TestMethod]
-		public void Test_8819()
-		{
-		}
-		[TestMethod]
-		public void Test_8820()
-		{
-		}
-		[TestMethod]
-		public void Test_8821()
-		{
-		}
-		[TestMethod]
-		public void Test_8822()
-		{
-		}
-		[TestMethod]
-		public void Test_8823()
-		{
-		}
-		[TestMethod]
-		public void Test_8824()
-		{
-		}
-		[TestMethod]
-		public void Test_8825()
-		{
-		}
-		[TestMethod]
-		public void Test_8826()
-		{
-		}
-		[TestMethod]
-		public void Test_8827()
-		{
-		}
-		[TestMethod]
-		public void Test_8828()
-		{
-		}
-		[TestMethod]
-		public void Test_8829()
-		{
-		}
-		[TestMethod]
-		public void Test_8830()
-		{
-		}
-		[TestMethod]
-		public void Test_8831()
-		{
-		}
-		[TestMethod]
-		public void Test_8832()
-		{
-		}
-		[TestMethod]
-		public void Test_8833()
-		{
-		}
-		[TestMethod]
-		public void Test_8834()
-		{
-		}
-		[TestMethod]
-		public void Test_8835()
-		{
-		}
-		[TestMethod]
-		public void Test_8836()
-		{
-		}
-		[TestMethod]
-		public void Test_8837()
-		{
-		}
-		[TestMethod]
-		public void Test_8838()
-		{
-		}
-		[TestMethod]
-		public void Test_8839()
-		{
-		}
-		[TestMethod]
-		public void Test_8840()
-		{
-		}
-		[TestMethod]
-		public void Test_8841()
-		{
-		}
-		[TestMethod]
-		public void Test_8842()
-		{
-		}
-		[TestMethod]
-		public void Test_8843()
-		{
-		}
-		[TestMethod]
-		public void Test_8844()
-		{
-		}
-		[TestMethod]
-		public void Test_8845()
-		{
-		}
-		[TestMethod]
-		public void Test_8846()
-		{
-		}
-		[TestMethod]
-		public void Test_8847()
-		{
-		}
-		[TestMethod]
-		public void Test_8848()
-		{
-		}
-		[TestMethod]
-		public void Test_8849()
-		{
-		}
-		[TestMethod]
-		public void Test_8850()
-		{
-		}
-		[TestMethod]
-		public void Test_8851()
-		{
-		}
-		[TestMethod]
-		public void Test_8852()
-		{
-		}
-		[TestMethod]
-		public void Test_8853()
-		{
-		}
-		[TestMethod]
-		public void Test_8854()
-		{
-		}
-		[TestMethod]
-		public void Test_8855()
-		{
-		}
-		[TestMethod]
-		public void Test_8856()
-		{
-		}
-		[TestMethod]
-		public void Test_8857()
-		{
-		}
-		[TestMethod]
-		public void Test_8858()
-		{
-		}
-		[TestMethod]
-		public void Test_8859()
-		{
-		}
-		[TestMethod]
-		public void Test_8860()
-		{
-		}
-		[TestMethod]
-		public void Test_8861()
-		{
-		}
-		[TestMethod]
-		public void Test_8862()
-		{
-		}
-		[TestMethod]
-		public void Test_8863()
-		{
-		}
-		[TestMethod]
-		public void Test_8864()
-		{
-		}
-		[TestMethod]
-		public void Test_8865()
-		{
-		}
-		[TestMethod]
-		public void Test_8866()
-		{
-		}
-		[TestMethod]
-		public void Test_8867()
-		{
-		}
-		[TestMethod]
-		public void Test_8868()
-		{
-		}
-		[TestMethod]
-		public void Test_8869()
-		{
-		}
-		[TestMethod]
-		public void Test_8870()
-		{
-		}
-		[TestMethod]
-		public void Test_8871()
-		{
-		}
-		[TestMethod]
-		public void Test_8872()
-		{
-		}
-		[TestMethod]
-		public void Test_8873()
-		{
-		}
-		[TestMethod]
-		public void Test_8874()
-		{
-		}
-		[TestMethod]
-		public void Test_8875()
-		{
-		}
-		[TestMethod]
-		public void Test_8876()
-		{
-		}
-		[TestMethod]
-		public void Test_8877()
-		{
-		}
-		[TestMethod]
-		public void Test_8878()
-		{
-		}
-		[TestMethod]
-		public void Test_8879()
-		{
-		}
-		[TestMethod]
-		public void Test_8880()
-		{
-		}
-		[TestMethod]
-		public void Test_8881()
-		{
-		}
-		[TestMethod]
-		public void Test_8882()
-		{
-		}
-		[TestMethod]
-		public void Test_8883()
-		{
-		}
-		[TestMethod]
-		public void Test_8884()
-		{
-		}
-		[TestMethod]
-		public void Test_8885()
-		{
-		}
-		[TestMethod]
-		public void Test_8886()
-		{
-		}
-		[TestMethod]
-		public void Test_8887()
-		{
-		}
-		[TestMethod]
-		public void Test_8888()
-		{
-		}
-		[TestMethod]
-		public void Test_8889()
-		{
-		}
-		[TestMethod]
-		public void Test_8890()
-		{
-		}
-		[TestMethod]
-		public void Test_8891()
-		{
-		}
-		[TestMethod]
-		public void Test_8892()
-		{
-		}
-		[TestMethod]
-		public void Test_8893()
-		{
-		}
-		[TestMethod]
-		public void Test_8894()
-		{
-		}
-		[TestMethod]
-		public void Test_8895()
-		{
-		}
-		[TestMethod]
-		public void Test_8896()
-		{
-		}
-		[TestMethod]
-		public void Test_8897()
-		{
-		}
-		[TestMethod]
-		public void Test_8898()
-		{
-		}
-		[TestMethod]
-		public void Test_8899()
-		{
-		}
-		[TestMethod]
-		public void Test_8900()
-		{
-		}
-		[TestMethod]
-		public void Test_8901()
-		{
-		}
-		[TestMethod]
-		public void Test_8902()
-		{
-		}
-		[TestMethod]
-		public void Test_8903()
-		{
-		}
-		[TestMethod]
-		public void Test_8904()
-		{
-		}
-		[TestMethod]
-		public void Test_8905()
-		{
-		}
-		[TestMethod]
-		public void Test_8906()
-		{
-		}
-		[TestMethod]
-		public void Test_8907()
-		{
-		}
-		[TestMethod]
-		public void Test_8908()
-		{
-		}
-		[TestMethod]
-		public void Test_8909()
-		{
-		}
-		[TestMethod]
-		public void Test_8910()
-		{
-		}
-		[TestMethod]
-		public void Test_8911()
-		{
-		}
-		[TestMethod]
-		public void Test_8912()
-		{
-		}
-		[TestMethod]
-		public void Test_8913()
-		{
-		}
-		[TestMethod]
-		public void Test_8914()
-		{
-		}
-		[TestMethod]
-		public void Test_8915()
-		{
-		}
-		[TestMethod]
-		public void Test_8916()
-		{
-		}
-		[TestMethod]
-		public void Test_8917()
-		{
-		}
-		[TestMethod]
-		public void Test_8918()
-		{
-		}
-		[TestMethod]
-		public void Test_8919()
-		{
-		}
-		[TestMethod]
-		public void Test_8920()
-		{
-		}
-		[TestMethod]
-		public void Test_8921()
-		{
-		}
-		[TestMethod]
-		public void Test_8922()
-		{
-		}
-		[TestMethod]
-		public void Test_8923()
-		{
-		}
-		[TestMethod]
-		public void Test_8924()
-		{
-		}
-		[TestMethod]
-		public void Test_8925()
-		{
-		}
-		[TestMethod]
-		public void Test_8926()
-		{
-		}
-		[TestMethod]
-		public void Test_8927()
-		{
-		}
-		[TestMethod]
-		public void Test_8928()
-		{
-		}
-		[TestMethod]
-		public void Test_8929()
-		{
-		}
-		[TestMethod]
-		public void Test_8930()
-		{
-		}
-		[TestMethod]
-		public void Test_8931()
-		{
-		}
-		[TestMethod]
-		public void Test_8932()
-		{
-		}
-		[TestMethod]
-		public void Test_8933()
-		{
-		}
-		[TestMethod]
-		public void Test_8934()
-		{
-		}
-		[TestMethod]
-		public void Test_8935()
-		{
-		}
-		[TestMethod]
-		public void Test_8936()
-		{
-		}
-		[TestMethod]
-		public void Test_8937()
-		{
-		}
-		[TestMethod]
-		public void Test_8938()
-		{
-		}
-		[TestMethod]
-		public void Test_8939()
-		{
-		}
-		[TestMethod]
-		public void Test_8940()
-		{
-		}
-		[TestMethod]
-		public void Test_8941()
-		{
-		}
-		[TestMethod]
-		public void Test_8942()
-		{
-		}
-		[TestMethod]
-		public void Test_8943()
-		{
-		}
-		[TestMethod]
-		public void Test_8944()
-		{
-		}
-		[TestMethod]
-		public void Test_8945()
-		{
-		}
-		[TestMethod]
-		public void Test_8946()
-		{
-		}
-		[TestMethod]
-		public void Test_8947()
-		{
-		}
-		[TestMethod]
-		public void Test_8948()
-		{
-		}
-		[TestMethod]
-		public void Test_8949()
-		{
-		}
-		[TestMethod]
-		public void Test_8950()
-		{
-		}
-		[TestMethod]
-		public void Test_8951()
-		{
-		}
-		[TestMethod]
-		public void Test_8952()
-		{
-		}
-		[TestMethod]
-		public void Test_8953()
-		{
-		}
-		[TestMethod]
-		public void Test_8954()
-		{
-		}
-		[TestMethod]
-		public void Test_8955()
-		{
-		}
-		[TestMethod]
-		public void Test_8956()
-		{
-		}
-		[TestMethod]
-		public void Test_8957()
-		{
-		}
-		[TestMethod]
-		public void Test_8958()
-		{
-		}
-		[TestMethod]
-		public void Test_8959()
-		{
-		}
-		[TestMethod]
-		public void Test_8960()
-		{
-		}
-		[TestMethod]
-		public void Test_8961()
-		{
-		}
-		[TestMethod]
-		public void Test_8962()
-		{
-		}
-		[TestMethod]
-		public void Test_8963()
-		{
-		}
-		[TestMethod]
-		public void Test_8964()
-		{
-		}
-		[TestMethod]
-		public void Test_8965()
-		{
-		}
-		[TestMethod]
-		public void Test_8966()
-		{
-		}
-		[TestMethod]
-		public void Test_8967()
-		{
-		}
-		[TestMethod]
-		public void Test_8968()
-		{
-		}
-		[TestMethod]
-		public void Test_8969()
-		{
-		}
-		[TestMethod]
-		public void Test_8970()
-		{
-		}
-		[TestMethod]
-		public void Test_8971()
-		{
-		}
-		[TestMethod]
-		public void Test_8972()
-		{
-		}
-		[TestMethod]
-		public void Test_8973()
-		{
-		}
-		[TestMethod]
-		public void Test_8974()
-		{
-		}
-		[TestMethod]
-		public void Test_8975()
-		{
-		}
-		[TestMethod]
-		public void Test_8976()
-		{
-		}
-		[TestMethod]
-		public void Test_8977()
-		{
-		}
-		[TestMethod]
-		public void Test_8978()
-		{
-		}
-		[TestMethod]
-		public void Test_8979()
-		{
-		}
-		[TestMethod]
-		public void Test_8980()
-		{
-		}
-		[TestMethod]
-		public void Test_8981()
-		{
-		}
-		[TestMethod]
-		public void Test_8982()
-		{
-		}
-		[TestMethod]
-		public void Test_8983()
-		{
-		}
-		[TestMethod]
-		public void Test_8984()
-		{
-		}
-		[TestMethod]
-		public void Test_8985()
-		{
-		}
-		[TestMethod]
-		public void Test_8986()
-		{
-		}
-		[TestMethod]
-		public void Test_8987()
-		{
-		}
-		[TestMethod]
-		public void Test_8988()
-		{
-		}
-		[TestMethod]
-		public void Test_8989()
-		{
-		}
-		[TestMethod]
-		public void Test_8990()
-		{
-		}
-		[TestMethod]
-		public void Test_8991()
-		{
-		}
-		[TestMethod]
-		public void Test_8992()
-		{
-		}
-		[TestMethod]
-		public void Test_8993()
-		{
-		}
-		[TestMethod]
-		public void Test_8994()
-		{
-		}
-		[TestMethod]
-		public void Test_8995()
-		{
-		}
-		[TestMethod]
-		public void Test_8996()
-		{
-		}
-		[TestMethod]
-		public void Test_8997()
-		{
-		}
-		[TestMethod]
-		public void Test_8998()
-		{
-		}
-		[TestMethod]
-		public void Test_8999()
-		{
-		}
-		[TestMethod]
-		public void Test_9000()
-		{
-		}
-		[TestMethod]
-		public void Test_9001()
-		{
-		}
-		[TestMethod]
-		public void Test_9002()
-		{
-		}
-		[TestMethod]
-		public void Test_9003()
-		{
-		}
-		[TestMethod]
-		public void Test_9004()
-		{
-		}
-		[TestMethod]
-		public void Test_9005()
-		{
-		}
-		[TestMethod]
-		public void Test_9006()
-		{
-		}
-		[TestMethod]
-		public void Test_9007()
-		{
-		}
-		[TestMethod]
-		public void Test_9008()
-		{
-		}
-		[TestMethod]
-		public void Test_9009()
-		{
-		}
-		[TestMethod]
-		public void Test_9010()
-		{
-		}
-		[TestMethod]
-		public void Test_9011()
-		{
-		}
-		[TestMethod]
-		public void Test_9012()
-		{
-		}
-		[TestMethod]
-		public void Test_9013()
-		{
-		}
-		[TestMethod]
-		public void Test_9014()
-		{
-		}
-		[TestMethod]
-		public void Test_9015()
-		{
-		}
-		[TestMethod]
-		public void Test_9016()
-		{
-		}
-		[TestMethod]
-		public void Test_9017()
-		{
-		}
-		[TestMethod]
-		public void Test_9018()
-		{
-		}
-		[TestMethod]
-		public void Test_9019()
-		{
-		}
-		[TestMethod]
-		public void Test_9020()
-		{
-		}
-		[TestMethod]
-		public void Test_9021()
-		{
-		}
-		[TestMethod]
-		public void Test_9022()
-		{
-		}
-		[TestMethod]
-		public void Test_9023()
-		{
-		}
-		[TestMethod]
-		public void Test_9024()
-		{
-		}
-		[TestMethod]
-		public void Test_9025()
-		{
-		}
-		[TestMethod]
-		public void Test_9026()
-		{
-		}
-		[TestMethod]
-		public void Test_9027()
-		{
-		}
-		[TestMethod]
-		public void Test_9028()
-		{
-		}
-		[TestMethod]
-		public void Test_9029()
-		{
-		}
-		[TestMethod]
-		public void Test_9030()
-		{
-		}
-		[TestMethod]
-		public void Test_9031()
-		{
-		}
-		[TestMethod]
-		public void Test_9032()
-		{
-		}
-		[TestMethod]
-		public void Test_9033()
-		{
-		}
-		[TestMethod]
-		public void Test_9034()
-		{
-		}
-		[TestMethod]
-		public void Test_9035()
-		{
-		}
-		[TestMethod]
-		public void Test_9036()
-		{
-		}
-		[TestMethod]
-		public void Test_9037()
-		{
-		}
-		[TestMethod]
-		public void Test_9038()
-		{
-		}
-		[TestMethod]
-		public void Test_9039()
-		{
-		}
-		[TestMethod]
-		public void Test_9040()
-		{
-		}
-		[TestMethod]
-		public void Test_9041()
-		{
-		}
-		[TestMethod]
-		public void Test_9042()
-		{
-		}
-		[TestMethod]
-		public void Test_9043()
-		{
-		}
-		[TestMethod]
-		public void Test_9044()
-		{
-		}
-		[TestMethod]
-		public void Test_9045()
-		{
-		}
-		[TestMethod]
-		public void Test_9046()
-		{
-		}
-		[TestMethod]
-		public void Test_9047()
-		{
-		}
-		[TestMethod]
-		public void Test_9048()
-		{
-		}
-		[TestMethod]
-		public void Test_9049()
-		{
-		}
-		[TestMethod]
-		public void Test_9050()
-		{
-		}
-		[TestMethod]
-		public void Test_9051()
-		{
-		}
-		[TestMethod]
-		public void Test_9052()
-		{
-		}
-		[TestMethod]
-		public void Test_9053()
-		{
-		}
-		[TestMethod]
-		public void Test_9054()
-		{
-		}
-		[TestMethod]
-		public void Test_9055()
-		{
-		}
-		[TestMethod]
-		public void Test_9056()
-		{
-		}
-		[TestMethod]
-		public void Test_9057()
-		{
-		}
-		[TestMethod]
-		public void Test_9058()
-		{
-		}
-		[TestMethod]
-		public void Test_9059()
-		{
-		}
-		[TestMethod]
-		public void Test_9060()
-		{
-		}
-		[TestMethod]
-		public void Test_9061()
-		{
-		}
-		[TestMethod]
-		public void Test_9062()
-		{
-		}
-		[TestMethod]
-		public void Test_9063()
-		{
-		}
-		[TestMethod]
-		public void Test_9064()
-		{
-		}
-		[TestMethod]
-		public void Test_9065()
-		{
-		}
-		[TestMethod]
-		public void Test_9066()
-		{
-		}
-		[TestMethod]
-		public void Test_9067()
-		{
-		}
-		[TestMethod]
-		public void Test_9068()
-		{
-		}
-		[TestMethod]
-		public void Test_9069()
-		{
-		}
-		[TestMethod]
-		public void Test_9070()
-		{
-		}
-		[TestMethod]
-		public void Test_9071()
-		{
-		}
-		[TestMethod]
-		public void Test_9072()
-		{
-		}
-		[TestMethod]
-		public void Test_9073()
-		{
-		}
-		[TestMethod]
-		public void Test_9074()
-		{
-		}
-		[TestMethod]
-		public void Test_9075()
-		{
-		}
-		[TestMethod]
-		public void Test_9076()
-		{
-		}
-		[TestMethod]
-		public void Test_9077()
-		{
-		}
-		[TestMethod]
-		public void Test_9078()
-		{
-		}
-		[TestMethod]
-		public void Test_9079()
-		{
-		}
-		[TestMethod]
-		public void Test_9080()
-		{
-		}
-		[TestMethod]
-		public void Test_9081()
-		{
-		}
-		[TestMethod]
-		public void Test_9082()
-		{
-		}
-		[TestMethod]
-		public void Test_9083()
-		{
-		}
-		[TestMethod]
-		public void Test_9084()
-		{
-		}
-		[TestMethod]
-		public void Test_9085()
-		{
-		}
-		[TestMethod]
-		public void Test_9086()
-		{
-		}
-		[TestMethod]
-		public void Test_9087()
-		{
-		}
-		[TestMethod]
-		public void Test_9088()
-		{
-		}
-		[TestMethod]
-		public void Test_9089()
-		{
-		}
-		[TestMethod]
-		public void Test_9090()
-		{
-		}
-		[TestMethod]
-		public void Test_9091()
-		{
-		}
-		[TestMethod]
-		public void Test_9092()
-		{
-		}
-		[TestMethod]
-		public void Test_9093()
-		{
-		}
-		[TestMethod]
-		public void Test_9094()
-		{
-		}
-		[TestMethod]
-		public void Test_9095()
-		{
-		}
-		[TestMethod]
-		public void Test_9096()
-		{
-		}
-		[TestMethod]
-		public void Test_9097()
-		{
-		}
-		[TestMethod]
-		public void Test_9098()
-		{
-		}
-		[TestMethod]
-		public void Test_9099()
-		{
-		}
-		[TestMethod]
-		public void Test_9100()
-		{
-		}
-		[TestMethod]
-		public void Test_9101()
-		{
-		}
-		[TestMethod]
-		public void Test_9102()
-		{
-		}
-		[TestMethod]
-		public void Test_9103()
-		{
-		}
-		[TestMethod]
-		public void Test_9104()
-		{
-		}
-		[TestMethod]
-		public void Test_9105()
-		{
-		}
-		[TestMethod]
-		public void Test_9106()
-		{
-		}
-		[TestMethod]
-		public void Test_9107()
-		{
-		}
-		[TestMethod]
-		public void Test_9108()
-		{
-		}
-		[TestMethod]
-		public void Test_9109()
-		{
-		}
-		[TestMethod]
-		public void Test_9110()
-		{
-		}
-		[TestMethod]
-		public void Test_9111()
-		{
-		}
-		[TestMethod]
-		public void Test_9112()
-		{
-		}
-		[TestMethod]
-		public void Test_9113()
-		{
-		}
-		[TestMethod]
-		public void Test_9114()
-		{
-		}
-		[TestMethod]
-		public void Test_9115()
-		{
-		}
-		[TestMethod]
-		public void Test_9116()
-		{
-		}
-		[TestMethod]
-		public void Test_9117()
-		{
-		}
-		[TestMethod]
-		public void Test_9118()
-		{
-		}
-		[TestMethod]
-		public void Test_9119()
-		{
-		}
-		[TestMethod]
-		public void Test_9120()
-		{
-		}
-		[TestMethod]
-		public void Test_9121()
-		{
-		}
-		[TestMethod]
-		public void Test_9122()
-		{
-		}
-		[TestMethod]
-		public void Test_9123()
-		{
-		}
-		[TestMethod]
-		public void Test_9124()
-		{
-		}
-		[TestMethod]
-		public void Test_9125()
-		{
-		}
-		[TestMethod]
-		public void Test_9126()
-		{
-		}
-		[TestMethod]
-		public void Test_9127()
-		{
-		}
-		[TestMethod]
-		public void Test_9128()
-		{
-		}
-		[TestMethod]
-		public void Test_9129()
-		{
-		}
-		[TestMethod]
-		public void Test_9130()
-		{
-		}
-		[TestMethod]
-		public void Test_9131()
-		{
-		}
-		[TestMethod]
-		public void Test_9132()
-		{
-		}
-		[TestMethod]
-		public void Test_9133()
-		{
-		}
-		[TestMethod]
-		public void Test_9134()
-		{
-		}
-		[TestMethod]
-		public void Test_9135()
-		{
-		}
-		[TestMethod]
-		public void Test_9136()
-		{
-		}
-		[TestMethod]
-		public void Test_9137()
-		{
-		}
-		[TestMethod]
-		public void Test_9138()
-		{
-		}
-		[TestMethod]
-		public void Test_9139()
-		{
-		}
-		[TestMethod]
-		public void Test_9140()
-		{
-		}
-		[TestMethod]
-		public void Test_9141()
-		{
-		}
-		[TestMethod]
-		public void Test_9142()
-		{
-		}
-		[TestMethod]
-		public void Test_9143()
-		{
-		}
-		[TestMethod]
-		public void Test_9144()
-		{
-		}
-		[TestMethod]
-		public void Test_9145()
-		{
-		}
-		[TestMethod]
-		public void Test_9146()
-		{
-		}
-		[TestMethod]
-		public void Test_9147()
-		{
-		}
-		[TestMethod]
-		public void Test_9148()
-		{
-		}
-		[TestMethod]
-		public void Test_9149()
-		{
-		}
-		[TestMethod]
-		public void Test_9150()
-		{
-		}
-		[TestMethod]
-		public void Test_9151()
-		{
-		}
-		[TestMethod]
-		public void Test_9152()
-		{
-		}
-		[TestMethod]
-		public void Test_9153()
-		{
-		}
-		[TestMethod]
-		public void Test_9154()
-		{
-		}
-		[TestMethod]
-		public void Test_9155()
-		{
-		}
-		[TestMethod]
-		public void Test_9156()
-		{
-		}
-		[TestMethod]
-		public void Test_9157()
-		{
-		}
-		[TestMethod]
-		public void Test_9158()
-		{
-		}
-		[TestMethod]
-		public void Test_9159()
-		{
-		}
-		[TestMethod]
-		public void Test_9160()
-		{
-		}
-		[TestMethod]
-		public void Test_9161()
-		{
-		}
-		[TestMethod]
-		public void Test_9162()
-		{
-		}
-		[TestMethod]
-		public void Test_9163()
-		{
-		}
-		[TestMethod]
-		public void Test_9164()
-		{
-		}
-		[TestMethod]
-		public void Test_9165()
-		{
-		}
-		[TestMethod]
-		public void Test_9166()
-		{
-		}
-		[TestMethod]
-		public void Test_9167()
-		{
-		}
-		[TestMethod]
-		public void Test_9168()
-		{
-		}
-		[TestMethod]
-		public void Test_9169()
-		{
-		}
-		[TestMethod]
-		public void Test_9170()
-		{
-		}
-		[TestMethod]
-		public void Test_9171()
-		{
-		}
-		[TestMethod]
-		public void Test_9172()
-		{
-		}
-		[TestMethod]
-		public void Test_9173()
-		{
-		}
-		[TestMethod]
-		public void Test_9174()
-		{
-		}
-		[TestMethod]
-		public void Test_9175()
-		{
-		}
-		[TestMethod]
-		public void Test_9176()
-		{
-		}
-		[TestMethod]
-		public void Test_9177()
-		{
-		}
-		[TestMethod]
-		public void Test_9178()
-		{
-		}
-		[TestMethod]
-		public void Test_9179()
-		{
-		}
-		[TestMethod]
-		public void Test_9180()
-		{
-		}
-		[TestMethod]
-		public void Test_9181()
-		{
-		}
-		[TestMethod]
-		public void Test_9182()
-		{
-		}
-		[TestMethod]
-		public void Test_9183()
-		{
-		}
-		[TestMethod]
-		public void Test_9184()
-		{
-		}
-		[TestMethod]
-		public void Test_9185()
-		{
-		}
-		[TestMethod]
-		public void Test_9186()
-		{
-		}
-		[TestMethod]
-		public void Test_9187()
-		{
-		}
-		[TestMethod]
-		public void Test_9188()
-		{
-		}
-		[TestMethod]
-		public void Test_9189()
-		{
-		}
-		[TestMethod]
-		public void Test_9190()
-		{
-		}
-		[TestMethod]
-		public void Test_9191()
-		{
-		}
-		[TestMethod]
-		public void Test_9192()
-		{
-		}
-		[TestMethod]
-		public void Test_9193()
-		{
-		}
-		[TestMethod]
-		public void Test_9194()
-		{
-		}
-		[TestMethod]
-		public void Test_9195()
-		{
-		}
-		[TestMethod]
-		public void Test_9196()
-		{
-		}
-		[TestMethod]
-		public void Test_9197()
-		{
-		}
-		[TestMethod]
-		public void Test_9198()
-		{
-		}
-		[TestMethod]
-		public void Test_9199()
-		{
-		}
-		[TestMethod]
-		public void Test_9200()
-		{
-		}
-		[TestMethod]
-		public void Test_9201()
-		{
-		}
-		[TestMethod]
-		public void Test_9202()
-		{
-		}
-		[TestMethod]
-		public void Test_9203()
-		{
-		}
-		[TestMethod]
-		public void Test_9204()
-		{
-		}
-		[TestMethod]
-		public void Test_9205()
-		{
-		}
-		[TestMethod]
-		public void Test_9206()
-		{
-		}
-		[TestMethod]
-		public void Test_9207()
-		{
-		}
-		[TestMethod]
-		public void Test_9208()
-		{
-		}
-		[TestMethod]
-		public void Test_9209()
-		{
-		}
-		[TestMethod]
-		public void Test_9210()
-		{
-		}
-		[TestMethod]
-		public void Test_9211()
-		{
-		}
-		[TestMethod]
-		public void Test_9212()
-		{
-		}
-		[TestMethod]
-		public void Test_9213()
-		{
-		}
-		[TestMethod]
-		public void Test_9214()
-		{
-		}
-		[TestMethod]
-		public void Test_9215()
-		{
-		}
-		[TestMethod]
-		public void Test_9216()
-		{
-		}
-		[TestMethod]
-		public void Test_9217()
-		{
-		}
-		[TestMethod]
-		public void Test_9218()
-		{
-		}
-		[TestMethod]
-		public void Test_9219()
-		{
-		}
-		[TestMethod]
-		public void Test_9220()
-		{
-		}
-		[TestMethod]
-		public void Test_9221()
-		{
-		}
-		[TestMethod]
-		public void Test_9222()
-		{
-		}
-		[TestMethod]
-		public void Test_9223()
-		{
-		}
-		[TestMethod]
-		public void Test_9224()
-		{
-		}
-		[TestMethod]
-		public void Test_9225()
-		{
-		}
-		[TestMethod]
-		public void Test_9226()
-		{
-		}
-		[TestMethod]
-		public void Test_9227()
-		{
-		}
-		[TestMethod]
-		public void Test_9228()
-		{
-		}
-		[TestMethod]
-		public void Test_9229()
-		{
-		}
-		[TestMethod]
-		public void Test_9230()
-		{
-		}
-		[TestMethod]
-		public void Test_9231()
-		{
-		}
-		[TestMethod]
-		public void Test_9232()
-		{
-		}
-		[TestMethod]
-		public void Test_9233()
-		{
-		}
-		[TestMethod]
-		public void Test_9234()
-		{
-		}
-		[TestMethod]
-		public void Test_9235()
-		{
-		}
-		[TestMethod]
-		public void Test_9236()
-		{
-		}
-		[TestMethod]
-		public void Test_9237()
-		{
-		}
-		[TestMethod]
-		public void Test_9238()
-		{
-		}
-		[TestMethod]
-		public void Test_9239()
-		{
-		}
-		[TestMethod]
-		public void Test_9240()
-		{
-		}
-		[TestMethod]
-		public void Test_9241()
-		{
-		}
-		[TestMethod]
-		public void Test_9242()
-		{
-		}
-		[TestMethod]
-		public void Test_9243()
-		{
-		}
-		[TestMethod]
-		public void Test_9244()
-		{
-		}
-		[TestMethod]
-		public void Test_9245()
-		{
-		}
-		[TestMethod]
-		public void Test_9246()
-		{
-		}
-		[TestMethod]
-		public void Test_9247()
-		{
-		}
-		[TestMethod]
-		public void Test_9248()
-		{
-		}
-		[TestMethod]
-		public void Test_9249()
-		{
-		}
-		[TestMethod]
-		public void Test_9250()
-		{
-		}
-		[TestMethod]
-		public void Test_9251()
-		{
-		}
-		[TestMethod]
-		public void Test_9252()
-		{
-		}
-		[TestMethod]
-		public void Test_9253()
-		{
-		}
-		[TestMethod]
-		public void Test_9254()
-		{
-		}
-		[TestMethod]
-		public void Test_9255()
-		{
-		}
-		[TestMethod]
-		public void Test_9256()
-		{
-		}
-		[TestMethod]
-		public void Test_9257()
-		{
-		}
-		[TestMethod]
-		public void Test_9258()
-		{
-		}
-		[TestMethod]
-		public void Test_9259()
-		{
-		}
-		[TestMethod]
-		public void Test_9260()
-		{
-		}
-		[TestMethod]
-		public void Test_9261()
-		{
-		}
-		[TestMethod]
-		public void Test_9262()
-		{
-		}
-		[TestMethod]
-		public void Test_9263()
-		{
-		}
-		[TestMethod]
-		public void Test_9264()
-		{
-		}
-		[TestMethod]
-		public void Test_9265()
-		{
-		}
-		[TestMethod]
-		public void Test_9266()
-		{
-		}
-		[TestMethod]
-		public void Test_9267()
-		{
-		}
-		[TestMethod]
-		public void Test_9268()
-		{
-		}
-		[TestMethod]
-		public void Test_9269()
-		{
-		}
-		[TestMethod]
-		public void Test_9270()
-		{
-		}
-		[TestMethod]
-		public void Test_9271()
-		{
-		}
-		[TestMethod]
-		public void Test_9272()
-		{
-		}
-		[TestMethod]
-		public void Test_9273()
-		{
-		}
-		[TestMethod]
-		public void Test_9274()
-		{
-		}
-		[TestMethod]
-		public void Test_9275()
-		{
-		}
-		[TestMethod]
-		public void Test_9276()
-		{
-		}
-		[TestMethod]
-		public void Test_9277()
-		{
-		}
-		[TestMethod]
-		public void Test_9278()
-		{
-		}
-		[TestMethod]
-		public void Test_9279()
-		{
-		}
-		[TestMethod]
-		public void Test_9280()
-		{
-		}
-		[TestMethod]
-		public void Test_9281()
-		{
-		}
-		[TestMethod]
-		public void Test_9282()
-		{
-		}
-		[TestMethod]
-		public void Test_9283()
-		{
-		}
-		[TestMethod]
-		public void Test_9284()
-		{
-		}
-		[TestMethod]
-		public void Test_9285()
-		{
-		}
-		[TestMethod]
-		public void Test_9286()
-		{
-		}
-		[TestMethod]
-		public void Test_9287()
-		{
-		}
-		[TestMethod]
-		public void Test_9288()
-		{
-		}
-		[TestMethod]
-		public void Test_9289()
-		{
-		}
-		[TestMethod]
-		public void Test_9290()
-		{
-		}
-		[TestMethod]
-		public void Test_9291()
-		{
-		}
-		[TestMethod]
-		public void Test_9292()
-		{
-		}
-		[TestMethod]
-		public void Test_9293()
-		{
-		}
-		[TestMethod]
-		public void Test_9294()
-		{
-		}
-		[TestMethod]
-		public void Test_9295()
-		{
-		}
-		[TestMethod]
-		public void Test_9296()
-		{
-		}
-		[TestMethod]
-		public void Test_9297()
-		{
-		}
-		[TestMethod]
-		public void Test_9298()
-		{
-		}
-		[TestMethod]
-		public void Test_9299()
-		{
-		}
-		[TestMethod]
-		public void Test_9300()
-		{
-		}
-		[TestMethod]
-		public void Test_9301()
-		{
-		}
-		[TestMethod]
-		public void Test_9302()
-		{
-		}
-		[TestMethod]
-		public void Test_9303()
-		{
-		}
-		[TestMethod]
-		public void Test_9304()
-		{
-		}
-		[TestMethod]
-		public void Test_9305()
-		{
-		}
-		[TestMethod]
-		public void Test_9306()
-		{
-		}
-		[TestMethod]
-		public void Test_9307()
-		{
-		}
-		[TestMethod]
-		public void Test_9308()
-		{
-		}
-		[TestMethod]
-		public void Test_9309()
-		{
-		}
-		[TestMethod]
-		public void Test_9310()
-		{
-		}
-		[TestMethod]
-		public void Test_9311()
-		{
-		}
-		[TestMethod]
-		public void Test_9312()
-		{
-		}
-		[TestMethod]
-		public void Test_9313()
-		{
-		}
-		[TestMethod]
-		public void Test_9314()
-		{
-		}
-		[TestMethod]
-		public void Test_9315()
-		{
-		}
-		[TestMethod]
-		public void Test_9316()
-		{
-		}
-		[TestMethod]
-		public void Test_9317()
-		{
-		}
-		[TestMethod]
-		public void Test_9318()
-		{
-		}
-		[TestMethod]
-		public void Test_9319()
-		{
-		}
-		[TestMethod]
-		public void Test_9320()
-		{
-		}
-		[TestMethod]
-		public void Test_9321()
-		{
-		}
-		[TestMethod]
-		public void Test_9322()
-		{
-		}
-		[TestMethod]
-		public void Test_9323()
-		{
-		}
-		[TestMethod]
-		public void Test_9324()
-		{
-		}
-		[TestMethod]
-		public void Test_9325()
-		{
-		}
-		[TestMethod]
-		public void Test_9326()
-		{
-		}
-		[TestMethod]
-		public void Test_9327()
-		{
-		}
-		[TestMethod]
-		public void Test_9328()
-		{
-		}
-		[TestMethod]
-		public void Test_9329()
-		{
-		}
-		[TestMethod]
-		public void Test_9330()
-		{
-		}
-		[TestMethod]
-		public void Test_9331()
-		{
-		}
-		[TestMethod]
-		public void Test_9332()
-		{
-		}
-		[TestMethod]
-		public void Test_9333()
-		{
-		}
-		[TestMethod]
-		public void Test_9334()
-		{
-		}
-		[TestMethod]
-		public void Test_9335()
-		{
-		}
-		[TestMethod]
-		public void Test_9336()
-		{
-		}
-		[TestMethod]
-		public void Test_9337()
-		{
-		}
-		[TestMethod]
-		public void Test_9338()
-		{
-		}
-		[TestMethod]
-		public void Test_9339()
-		{
-		}
-		[TestMethod]
-		public void Test_9340()
-		{
-		}
-		[TestMethod]
-		public void Test_9341()
-		{
-		}
-		[TestMethod]
-		public void Test_9342()
-		{
-		}
-		[TestMethod]
-		public void Test_9343()
-		{
-		}
-		[TestMethod]
-		public void Test_9344()
-		{
-		}
-		[TestMethod]
-		public void Test_9345()
-		{
-		}
-		[TestMethod]
-		public void Test_9346()
-		{
-		}
-		[TestMethod]
-		public void Test_9347()
-		{
-		}
-		[TestMethod]
-		public void Test_9348()
-		{
-		}
-		[TestMethod]
-		public void Test_9349()
-		{
-		}
-		[TestMethod]
-		public void Test_9350()
-		{
-		}
-		[TestMethod]
-		public void Test_9351()
-		{
-		}
-		[TestMethod]
-		public void Test_9352()
-		{
-		}
-		[TestMethod]
-		public void Test_9353()
-		{
-		}
-		[TestMethod]
-		public void Test_9354()
-		{
-		}
-		[TestMethod]
-		public void Test_9355()
-		{
-		}
-		[TestMethod]
-		public void Test_9356()
-		{
-		}
-		[TestMethod]
-		public void Test_9357()
-		{
-		}
-		[TestMethod]
-		public void Test_9358()
-		{
-		}
-		[TestMethod]
-		public void Test_9359()
-		{
-		}
-		[TestMethod]
-		public void Test_9360()
-		{
-		}
-		[TestMethod]
-		public void Test_9361()
-		{
-		}
-		[TestMethod]
-		public void Test_9362()
-		{
-		}
-		[TestMethod]
-		public void Test_9363()
-		{
-		}
-		[TestMethod]
-		public void Test_9364()
-		{
-		}
-		[TestMethod]
-		public void Test_9365()
-		{
-		}
-		[TestMethod]
-		public void Test_9366()
-		{
-		}
-		[TestMethod]
-		public void Test_9367()
-		{
-		}
-		[TestMethod]
-		public void Test_9368()
-		{
-		}
-		[TestMethod]
-		public void Test_9369()
-		{
-		}
-		[TestMethod]
-		public void Test_9370()
-		{
-		}
-		[TestMethod]
-		public void Test_9371()
-		{
-		}
-		[TestMethod]
-		public void Test_9372()
-		{
-		}
-		[TestMethod]
-		public void Test_9373()
-		{
-		}
-		[TestMethod]
-		public void Test_9374()
-		{
-		}
-		[TestMethod]
-		public void Test_9375()
-		{
-		}
-		[TestMethod]
-		public void Test_9376()
-		{
-		}
-		[TestMethod]
-		public void Test_9377()
-		{
-		}
-		[TestMethod]
-		public void Test_9378()
-		{
-		}
-		[TestMethod]
-		public void Test_9379()
-		{
-		}
-		[TestMethod]
-		public void Test_9380()
-		{
-		}
-		[TestMethod]
-		public void Test_9381()
-		{
-		}
-		[TestMethod]
-		public void Test_9382()
-		{
-		}
-		[TestMethod]
-		public void Test_9383()
-		{
-		}
-		[TestMethod]
-		public void Test_9384()
-		{
-		}
-		[TestMethod]
-		public void Test_9385()
-		{
-		}
-		[TestMethod]
-		public void Test_9386()
-		{
-		}
-		[TestMethod]
-		public void Test_9387()
-		{
-		}
-		[TestMethod]
-		public void Test_9388()
-		{
-		}
-		[TestMethod]
-		public void Test_9389()
-		{
-		}
-		[TestMethod]
-		public void Test_9390()
-		{
-		}
-		[TestMethod]
-		public void Test_9391()
-		{
-		}
-		[TestMethod]
-		public void Test_9392()
-		{
-		}
-		[TestMethod]
-		public void Test_9393()
-		{
-		}
-		[TestMethod]
-		public void Test_9394()
-		{
-		}
-		[TestMethod]
-		public void Test_9395()
-		{
-		}
-		[TestMethod]
-		public void Test_9396()
-		{
-		}
-		[TestMethod]
-		public void Test_9397()
-		{
-		}
-		[TestMethod]
-		public void Test_9398()
-		{
-		}
-		[TestMethod]
-		public void Test_9399()
-		{
-		}
-		[TestMethod]
-		public void Test_9400()
-		{
-		}
-		[TestMethod]
-		public void Test_9401()
-		{
-		}
-		[TestMethod]
-		public void Test_9402()
-		{
-		}
-		[TestMethod]
-		public void Test_9403()
-		{
-		}
-		[TestMethod]
-		public void Test_9404()
-		{
-		}
-		[TestMethod]
-		public void Test_9405()
-		{
-		}
-		[TestMethod]
-		public void Test_9406()
-		{
-		}
-		[TestMethod]
-		public void Test_9407()
-		{
-		}
-		[TestMethod]
-		public void Test_9408()
-		{
-		}
-		[TestMethod]
-		public void Test_9409()
-		{
-		}
-		[TestMethod]
-		public void Test_9410()
-		{
-		}
-		[TestMethod]
-		public void Test_9411()
-		{
-		}
-		[TestMethod]
-		public void Test_9412()
-		{
-		}
-		[TestMethod]
-		public void Test_9413()
-		{
-		}
-		[TestMethod]
-		public void Test_9414()
-		{
-		}
-		[TestMethod]
-		public void Test_9415()
-		{
-		}
-		[TestMethod]
-		public void Test_9416()
-		{
-		}
-		[TestMethod]
-		public void Test_9417()
-		{
-		}
-		[TestMethod]
-		public void Test_9418()
-		{
-		}
-		[TestMethod]
-		public void Test_9419()
-		{
-		}
-		[TestMethod]
-		public void Test_9420()
-		{
-		}
-		[TestMethod]
-		public void Test_9421()
-		{
-		}
-		[TestMethod]
-		public void Test_9422()
-		{
-		}
-		[TestMethod]
-		public void Test_9423()
-		{
-		}
-		[TestMethod]
-		public void Test_9424()
-		{
-		}
-		[TestMethod]
-		public void Test_9425()
-		{
-		}
-		[TestMethod]
-		public void Test_9426()
-		{
-		}
-		[TestMethod]
-		public void Test_9427()
-		{
-		}
-		[TestMethod]
-		public void Test_9428()
-		{
-		}
-		[TestMethod]
-		public void Test_9429()
-		{
-		}
-		[TestMethod]
-		public void Test_9430()
-		{
-		}
-		[TestMethod]
-		public void Test_9431()
-		{
-		}
-		[TestMethod]
-		public void Test_9432()
-		{
-		}
-		[TestMethod]
-		public void Test_9433()
-		{
-		}
-		[TestMethod]
-		public void Test_9434()
-		{
-		}
-		[TestMethod]
-		public void Test_9435()
-		{
-		}
-		[TestMethod]
-		public void Test_9436()
-		{
-		}
-		[TestMethod]
-		public void Test_9437()
-		{
-		}
-		[TestMethod]
-		public void Test_9438()
-		{
-		}
-		[TestMethod]
-		public void Test_9439()
-		{
-		}
-		[TestMethod]
-		public void Test_9440()
-		{
-		}
-		[TestMethod]
-		public void Test_9441()
-		{
-		}
-		[TestMethod]
-		public void Test_9442()
-		{
-		}
-		[TestMethod]
-		public void Test_9443()
-		{
-		}
-		[TestMethod]
-		public void Test_9444()
-		{
-		}
-		[TestMethod]
-		public void Test_9445()
-		{
-		}
-		[TestMethod]
-		public void Test_9446()
-		{
-		}
-		[TestMethod]
-		public void Test_9447()
-		{
-		}
-		[TestMethod]
-		public void Test_9448()
-		{
-		}
-		[TestMethod]
-		public void Test_9449()
-		{
-		}
-		[TestMethod]
-		public void Test_9450()
-		{
-		}
-		[TestMethod]
-		public void Test_9451()
-		{
-		}
-		[TestMethod]
-		public void Test_9452()
-		{
-		}
-		[TestMethod]
-		public void Test_9453()
-		{
-		}
-		[TestMethod]
-		public void Test_9454()
-		{
-		}
-		[TestMethod]
-		public void Test_9455()
-		{
-		}
-		[TestMethod]
-		public void Test_9456()
-		{
-		}
-		[TestMethod]
-		public void Test_9457()
-		{
-		}
-		[TestMethod]
-		public void Test_9458()
-		{
-		}
-		[TestMethod]
-		public void Test_9459()
-		{
-		}
-		[TestMethod]
-		public void Test_9460()
-		{
-		}
-		[TestMethod]
-		public void Test_9461()
-		{
-		}
-		[TestMethod]
-		public void Test_9462()
-		{
-		}
-		[TestMethod]
-		public void Test_9463()
-		{
-		}
-		[TestMethod]
-		public void Test_9464()
-		{
-		}
-		[TestMethod]
-		public void Test_9465()
-		{
-		}
-		[TestMethod]
-		public void Test_9466()
-		{
-		}
-		[TestMethod]
-		public void Test_9467()
-		{
-		}
-		[TestMethod]
-		public void Test_9468()
-		{
-		}
-		[TestMethod]
-		public void Test_9469()
-		{
-		}
-		[TestMethod]
-		public void Test_9470()
-		{
-		}
-		[TestMethod]
-		public void Test_9471()
-		{
-		}
-		[TestMethod]
-		public void Test_9472()
-		{
-		}
-		[TestMethod]
-		public void Test_9473()
-		{
-		}
-		[TestMethod]
-		public void Test_9474()
-		{
-		}
-		[TestMethod]
-		public void Test_9475()
-		{
-		}
-		[TestMethod]
-		public void Test_9476()
-		{
-		}
-		[TestMethod]
-		public void Test_9477()
-		{
-		}
-		[TestMethod]
-		public void Test_9478()
-		{
-		}
-		[TestMethod]
-		public void Test_9479()
-		{
-		}
-		[TestMethod]
-		public void Test_9480()
-		{
-		}
-		[TestMethod]
-		public void Test_9481()
-		{
-		}
-		[TestMethod]
-		public void Test_9482()
-		{
-		}
-		[TestMethod]
-		public void Test_9483()
-		{
-		}
-		[TestMethod]
-		public void Test_9484()
-		{
-		}
-		[TestMethod]
-		public void Test_9485()
-		{
-		}
-		[TestMethod]
-		public void Test_9486()
-		{
-		}
-		[TestMethod]
-		public void Test_9487()
-		{
-		}
-		[TestMethod]
-		public void Test_9488()
-		{
-		}
-		[TestMethod]
-		public void Test_9489()
-		{
-		}
-		[TestMethod]
-		public void Test_9490()
-		{
-		}
-		[TestMethod]
-		public void Test_9491()
-		{
-		}
-		[TestMethod]
-		public void Test_9492()
-		{
-		}
-		[TestMethod]
-		public void Test_9493()
-		{
-		}
-		[TestMethod]
-		public void Test_9494()
-		{
-		}
-		[TestMethod]
-		public void Test_9495()
-		{
-		}
-		[TestMethod]
-		public void Test_9496()
-		{
-		}
-		[TestMethod]
-		public void Test_9497()
-		{
-		}
-		[TestMethod]
-		public void Test_9498()
-		{
-		}
-		[TestMethod]
-		public void Test_9499()
-		{
-		}
-		[TestMethod]
-		public void Test_9500()
-		{
-		}
-		[TestMethod]
-		public void Test_9501()
-		{
-		}
-		[TestMethod]
-		public void Test_9502()
-		{
-		}
-		[TestMethod]
-		public void Test_9503()
-		{
-		}
-		[TestMethod]
-		public void Test_9504()
-		{
-		}
-		[TestMethod]
-		public void Test_9505()
-		{
-		}
-		[TestMethod]
-		public void Test_9506()
-		{
-		}
-		[TestMethod]
-		public void Test_9507()
-		{
-		}
-		[TestMethod]
-		public void Test_9508()
-		{
-		}
-		[TestMethod]
-		public void Test_9509()
-		{
-		}
-		[TestMethod]
-		public void Test_9510()
-		{
-		}
-		[TestMethod]
-		public void Test_9511()
-		{
-		}
-		[TestMethod]
-		public void Test_9512()
-		{
-		}
-		[TestMethod]
-		public void Test_9513()
-		{
-		}
-		[TestMethod]
-		public void Test_9514()
-		{
-		}
-		[TestMethod]
-		public void Test_9515()
-		{
-		}
-		[TestMethod]
-		public void Test_9516()
-		{
-		}
-		[TestMethod]
-		public void Test_9517()
-		{
-		}
-		[TestMethod]
-		public void Test_9518()
-		{
-		}
-		[TestMethod]
-		public void Test_9519()
-		{
-		}
-		[TestMethod]
-		public void Test_9520()
-		{
-		}
-		[TestMethod]
-		public void Test_9521()
-		{
-		}
-		[TestMethod]
-		public void Test_9522()
-		{
-		}
-		[TestMethod]
-		public void Test_9523()
-		{
-		}
-		[TestMethod]
-		public void Test_9524()
-		{
-		}
-		[TestMethod]
-		public void Test_9525()
-		{
-		}
-		[TestMethod]
-		public void Test_9526()
-		{
-		}
-		[TestMethod]
-		public void Test_9527()
-		{
-		}
-		[TestMethod]
-		public void Test_9528()
-		{
-		}
-		[TestMethod]
-		public void Test_9529()
-		{
-		}
-		[TestMethod]
-		public void Test_9530()
-		{
-		}
-		[TestMethod]
-		public void Test_9531()
-		{
-		}
-		[TestMethod]
-		public void Test_9532()
-		{
-		}
-		[TestMethod]
-		public void Test_9533()
-		{
-		}
-		[TestMethod]
-		public void Test_9534()
-		{
-		}
-		[TestMethod]
-		public void Test_9535()
-		{
-		}
-		[TestMethod]
-		public void Test_9536()
-		{
-		}
-		[TestMethod]
-		public void Test_9537()
-		{
-		}
-		[TestMethod]
-		public void Test_9538()
-		{
-		}
-		[TestMethod]
-		public void Test_9539()
-		{
-		}
-		[TestMethod]
-		public void Test_9540()
-		{
-		}
-		[TestMethod]
-		public void Test_9541()
-		{
-		}
-		[TestMethod]
-		public void Test_9542()
-		{
-		}
-		[TestMethod]
-		public void Test_9543()
-		{
-		}
-		[TestMethod]
-		public void Test_9544()
-		{
-		}
-		[TestMethod]
-		public void Test_9545()
-		{
-		}
-		[TestMethod]
-		public void Test_9546()
-		{
-		}
-		[TestMethod]
-		public void Test_9547()
-		{
-		}
-		[TestMethod]
-		public void Test_9548()
-		{
-		}
-		[TestMethod]
-		public void Test_9549()
-		{
-		}
-		[TestMethod]
-		public void Test_9550()
-		{
-		}
-		[TestMethod]
-		public void Test_9551()
-		{
-		}
-		[TestMethod]
-		public void Test_9552()
-		{
-		}
-		[TestMethod]
-		public void Test_9553()
-		{
-		}
-		[TestMethod]
-		public void Test_9554()
-		{
-		}
-		[TestMethod]
-		public void Test_9555()
-		{
-		}
-		[TestMethod]
-		public void Test_9556()
-		{
-		}
-		[TestMethod]
-		public void Test_9557()
-		{
-		}
-		[TestMethod]
-		public void Test_9558()
-		{
-		}
-		[TestMethod]
-		public void Test_9559()
-		{
-		}
-		[TestMethod]
-		public void Test_9560()
-		{
-		}
-		[TestMethod]
-		public void Test_9561()
-		{
-		}
-		[TestMethod]
-		public void Test_9562()
-		{
-		}
-		[TestMethod]
-		public void Test_9563()
-		{
-		}
-		[TestMethod]
-		public void Test_9564()
-		{
-		}
-		[TestMethod]
-		public void Test_9565()
-		{
-		}
-		[TestMethod]
-		public void Test_9566()
-		{
-		}
-		[TestMethod]
-		public void Test_9567()
-		{
-		}
-		[TestMethod]
-		public void Test_9568()
-		{
-		}
-		[TestMethod]
-		public void Test_9569()
-		{
-		}
-		[TestMethod]
-		public void Test_9570()
-		{
-		}
-		[TestMethod]
-		public void Test_9571()
-		{
-		}
-		[TestMethod]
-		public void Test_9572()
-		{
-		}
-		[TestMethod]
-		public void Test_9573()
-		{
-		}
-		[TestMethod]
-		public void Test_9574()
-		{
-		}
-		[TestMethod]
-		public void Test_9575()
-		{
-		}
-		[TestMethod]
-		public void Test_9576()
-		{
-		}
-		[TestMethod]
-		public void Test_9577()
-		{
-		}
-		[TestMethod]
-		public void Test_9578()
-		{
-		}
-		[TestMethod]
-		public void Test_9579()
-		{
-		}
-		[TestMethod]
-		public void Test_9580()
-		{
-		}
-		[TestMethod]
-		public void Test_9581()
-		{
-		}
-		[TestMethod]
-		public void Test_9582()
-		{
-		}
-		[TestMethod]
-		public void Test_9583()
-		{
-		}
-		[TestMethod]
-		public void Test_9584()
-		{
-		}
-		[TestMethod]
-		public void Test_9585()
-		{
-		}
-		[TestMethod]
-		public void Test_9586()
-		{
-		}
-		[TestMethod]
-		public void Test_9587()
-		{
-		}
-		[TestMethod]
-		public void Test_9588()
-		{
-		}
-		[TestMethod]
-		public void Test_9589()
-		{
-		}
-		[TestMethod]
-		public void Test_9590()
-		{
-		}
-		[TestMethod]
-		public void Test_9591()
-		{
-		}
-		[TestMethod]
-		public void Test_9592()
-		{
-		}
-		[TestMethod]
-		public void Test_9593()
-		{
-		}
-		[TestMethod]
-		public void Test_9594()
-		{
-		}
-		[TestMethod]
-		public void Test_9595()
-		{
-		}
-		[TestMethod]
-		public void Test_9596()
-		{
-		}
-		[TestMethod]
-		public void Test_9597()
-		{
-		}
-		[TestMethod]
-		public void Test_9598()
-		{
-		}
-		[TestMethod]
-		public void Test_9599()
-		{
-		}
-		[TestMethod]
-		public void Test_9600()
-		{
-		}
-		[TestMethod]
-		public void Test_9601()
-		{
-		}
-		[TestMethod]
-		public void Test_9602()
-		{
-		}
-		[TestMethod]
-		public void Test_9603()
-		{
-		}
-		[TestMethod]
-		public void Test_9604()
-		{
-		}
-		[TestMethod]
-		public void Test_9605()
-		{
-		}
-		[TestMethod]
-		public void Test_9606()
-		{
-		}
-		[TestMethod]
-		public void Test_9607()
-		{
-		}
-		[TestMethod]
-		public void Test_9608()
-		{
-		}
-		[TestMethod]
-		public void Test_9609()
-		{
-		}
-		[TestMethod]
-		public void Test_9610()
-		{
-		}
-		[TestMethod]
-		public void Test_9611()
-		{
-		}
-		[TestMethod]
-		public void Test_9612()
-		{
-		}
-		[TestMethod]
-		public void Test_9613()
-		{
-		}
-		[TestMethod]
-		public void Test_9614()
-		{
-		}
-		[TestMethod]
-		public void Test_9615()
-		{
-		}
-		[TestMethod]
-		public void Test_9616()
-		{
-		}
-		[TestMethod]
-		public void Test_9617()
-		{
-		}
-		[TestMethod]
-		public void Test_9618()
-		{
-		}
-		[TestMethod]
-		public void Test_9619()
-		{
-		}
-		[TestMethod]
-		public void Test_9620()
-		{
-		}
-		[TestMethod]
-		public void Test_9621()
-		{
-		}
-		[TestMethod]
-		public void Test_9622()
-		{
-		}
-		[TestMethod]
-		public void Test_9623()
-		{
-		}
-		[TestMethod]
-		public void Test_9624()
-		{
-		}
-		[TestMethod]
-		public void Test_9625()
-		{
-		}
-		[TestMethod]
-		public void Test_9626()
-		{
-		}
-		[TestMethod]
-		public void Test_9627()
-		{
-		}
-		[TestMethod]
-		public void Test_9628()
-		{
-		}
-		[TestMethod]
-		public void Test_9629()
-		{
-		}
-		[TestMethod]
-		public void Test_9630()
-		{
-		}
-		[TestMethod]
-		public void Test_9631()
-		{
-		}
-		[TestMethod]
-		public void Test_9632()
-		{
-		}
-		[TestMethod]
-		public void Test_9633()
-		{
-		}
-		[TestMethod]
-		public void Test_9634()
-		{
-		}
-		[TestMethod]
-		public void Test_9635()
-		{
-		}
-		[TestMethod]
-		public void Test_9636()
-		{
-		}
-		[TestMethod]
-		public void Test_9637()
-		{
-		}
-		[TestMethod]
-		public void Test_9638()
-		{
-		}
-		[TestMethod]
-		public void Test_9639()
-		{
-		}
-		[TestMethod]
-		public void Test_9640()
-		{
-		}
-		[TestMethod]
-		public void Test_9641()
-		{
-		}
-		[TestMethod]
-		public void Test_9642()
-		{
-		}
-		[TestMethod]
-		public void Test_9643()
-		{
-		}
-		[TestMethod]
-		public void Test_9644()
-		{
-		}
-		[TestMethod]
-		public void Test_9645()
-		{
-		}
-		[TestMethod]
-		public void Test_9646()
-		{
-		}
-		[TestMethod]
-		public void Test_9647()
-		{
-		}
-		[TestMethod]
-		public void Test_9648()
-		{
-		}
-		[TestMethod]
-		public void Test_9649()
-		{
-		}
-		[TestMethod]
-		public void Test_9650()
-		{
-		}
-		[TestMethod]
-		public void Test_9651()
-		{
-		}
-		[TestMethod]
-		public void Test_9652()
-		{
-		}
-		[TestMethod]
-		public void Test_9653()
-		{
-		}
-		[TestMethod]
-		public void Test_9654()
-		{
-		}
-		[TestMethod]
-		public void Test_9655()
-		{
-		}
-		[TestMethod]
-		public void Test_9656()
-		{
-		}
-		[TestMethod]
-		public void Test_9657()
-		{
-		}
-		[TestMethod]
-		public void Test_9658()
-		{
-		}
-		[TestMethod]
-		public void Test_9659()
-		{
-		}
-		[TestMethod]
-		public void Test_9660()
-		{
-		}
-		[TestMethod]
-		public void Test_9661()
-		{
-		}
-		[TestMethod]
-		public void Test_9662()
-		{
-		}
-		[TestMethod]
-		public void Test_9663()
-		{
-		}
-		[TestMethod]
-		public void Test_9664()
-		{
-		}
-		[TestMethod]
-		public void Test_9665()
-		{
-		}
-		[TestMethod]
-		public void Test_9666()
-		{
-		}
-		[TestMethod]
-		public void Test_9667()
-		{
-		}
-		[TestMethod]
-		public void Test_9668()
-		{
-		}
-		[TestMethod]
-		public void Test_9669()
-		{
-		}
-		[TestMethod]
-		public void Test_9670()
-		{
-		}
-		[TestMethod]
-		public void Test_9671()
-		{
-		}
-		[TestMethod]
-		public void Test_9672()
-		{
-		}
-		[TestMethod]
-		public void Test_9673()
-		{
-		}
-		[TestMethod]
-		public void Test_9674()
-		{
-		}
-		[TestMethod]
-		public void Test_9675()
-		{
-		}
-		[TestMethod]
-		public void Test_9676()
-		{
-		}
-		[TestMethod]
-		public void Test_9677()
-		{
-		}
-		[TestMethod]
-		public void Test_9678()
-		{
-		}
-		[TestMethod]
-		public void Test_9679()
-		{
-		}
-		[TestMethod]
-		public void Test_9680()
-		{
-		}
-		[TestMethod]
-		public void Test_9681()
-		{
-		}
-		[TestMethod]
-		public void Test_9682()
-		{
-		}
-		[TestMethod]
-		public void Test_9683()
-		{
-		}
-		[TestMethod]
-		public void Test_9684()
-		{
-		}
-		[TestMethod]
-		public void Test_9685()
-		{
-		}
-		[TestMethod]
-		public void Test_9686()
-		{
-		}
-		[TestMethod]
-		public void Test_9687()
-		{
-		}
-		[TestMethod]
-		public void Test_9688()
-		{
-		}
-		[TestMethod]
-		public void Test_9689()
-		{
-		}
-		[TestMethod]
-		public void Test_9690()
-		{
-		}
-		[TestMethod]
-		public void Test_9691()
-		{
-		}
-		[TestMethod]
-		public void Test_9692()
-		{
-		}
-		[TestMethod]
-		public void Test_9693()
-		{
-		}
-		[TestMethod]
-		public void Test_9694()
-		{
-		}
-		[TestMethod]
-		public void Test_9695()
-		{
-		}
-		[TestMethod]
-		public void Test_9696()
-		{
-		}
-		[TestMethod]
-		public void Test_9697()
-		{
-		}
-		[TestMethod]
-		public void Test_9698()
-		{
-		}
-		[TestMethod]
-		public void Test_9699()
-		{
-		}
-		[TestMethod]
-		public void Test_9700()
-		{
-		}
-		[TestMethod]
-		public void Test_9701()
-		{
-		}
-		[TestMethod]
-		public void Test_9702()
-		{
-		}
-		[TestMethod]
-		public void Test_9703()
-		{
-		}
-		[TestMethod]
-		public void Test_9704()
-		{
-		}
-		[TestMethod]
-		public void Test_9705()
-		{
-		}
-		[TestMethod]
-		public void Test_9706()
-		{
-		}
-		[TestMethod]
-		public void Test_9707()
-		{
-		}
-		[TestMethod]
-		public void Test_9708()
-		{
-		}
-		[TestMethod]
-		public void Test_9709()
-		{
-		}
-		[TestMethod]
-		public void Test_9710()
-		{
-		}
-		[TestMethod]
-		public void Test_9711()
-		{
-		}
-		[TestMethod]
-		public void Test_9712()
-		{
-		}
-		[TestMethod]
-		public void Test_9713()
-		{
-		}
-		[TestMethod]
-		public void Test_9714()
-		{
-		}
-		[TestMethod]
-		public void Test_9715()
-		{
-		}
-		[TestMethod]
-		public void Test_9716()
-		{
-		}
-		[TestMethod]
-		public void Test_9717()
-		{
-		}
-		[TestMethod]
-		public void Test_9718()
-		{
-		}
-		[TestMethod]
-		public void Test_9719()
-		{
-		}
-		[TestMethod]
-		public void Test_9720()
-		{
-		}
-		[TestMethod]
-		public void Test_9721()
-		{
-		}
-		[TestMethod]
-		public void Test_9722()
-		{
-		}
-		[TestMethod]
-		public void Test_9723()
-		{
-		}
-		[TestMethod]
-		public void Test_9724()
-		{
-		}
-		[TestMethod]
-		public void Test_9725()
-		{
-		}
-		[TestMethod]
-		public void Test_9726()
-		{
-		}
-		[TestMethod]
-		public void Test_9727()
-		{
-		}
-		[TestMethod]
-		public void Test_9728()
-		{
-		}
-		[TestMethod]
-		public void Test_9729()
-		{
-		}
-		[TestMethod]
-		public void Test_9730()
-		{
-		}
-		[TestMethod]
-		public void Test_9731()
-		{
-		}
-		[TestMethod]
-		public void Test_9732()
-		{
-		}
-		[TestMethod]
-		public void Test_9733()
-		{
-		}
-		[TestMethod]
-		public void Test_9734()
-		{
-		}
-		[TestMethod]
-		public void Test_9735()
-		{
-		}
-		[TestMethod]
-		public void Test_9736()
-		{
-		}
-		[TestMethod]
-		public void Test_9737()
-		{
-		}
-		[TestMethod]
-		public void Test_9738()
-		{
-		}
-		[TestMethod]
-		public void Test_9739()
-		{
-		}
-		[TestMethod]
-		public void Test_9740()
-		{
-		}
-		[TestMethod]
-		public void Test_9741()
-		{
-		}
-		[TestMethod]
-		public void Test_9742()
-		{
-		}
-		[TestMethod]
-		public void Test_9743()
-		{
-		}
-		[TestMethod]
-		public void Test_9744()
-		{
-		}
-		[TestMethod]
-		public void Test_9745()
-		{
-		}
-		[TestMethod]
-		public void Test_9746()
-		{
-		}
-		[TestMethod]
-		public void Test_9747()
-		{
-		}
-		[TestMethod]
-		public void Test_9748()
-		{
-		}
-		[TestMethod]
-		public void Test_9749()
-		{
-		}
-		[TestMethod]
-		public void Test_9750()
-		{
-		}
-		[TestMethod]
-		public void Test_9751()
-		{
-		}
-		[TestMethod]
-		public void Test_9752()
-		{
-		}
-		[TestMethod]
-		public void Test_9753()
-		{
-		}
-		[TestMethod]
-		public void Test_9754()
-		{
-		}
-		[TestMethod]
-		public void Test_9755()
-		{
-		}
-		[TestMethod]
-		public void Test_9756()
-		{
-		}
-		[TestMethod]
-		public void Test_9757()
-		{
-		}
-		[TestMethod]
-		public void Test_9758()
-		{
-		}
-		[TestMethod]
-		public void Test_9759()
-		{
-		}
-		[TestMethod]
-		public void Test_9760()
-		{
-		}
-		[TestMethod]
-		public void Test_9761()
-		{
-		}
-		[TestMethod]
-		public void Test_9762()
-		{
-		}
-		[TestMethod]
-		public void Test_9763()
-		{
-		}
-		[TestMethod]
-		public void Test_9764()
-		{
-		}
-		[TestMethod]
-		public void Test_9765()
-		{
-		}
-		[TestMethod]
-		public void Test_9766()
-		{
-		}
-		[TestMethod]
-		public void Test_9767()
-		{
-		}
-		[TestMethod]
-		public void Test_9768()
-		{
-		}
-		[TestMethod]
-		public void Test_9769()
-		{
-		}
-		[TestMethod]
-		public void Test_9770()
-		{
-		}
-		[TestMethod]
-		public void Test_9771()
-		{
-		}
-		[TestMethod]
-		public void Test_9772()
-		{
-		}
-		[TestMethod]
-		public void Test_9773()
-		{
-		}
-		[TestMethod]
-		public void Test_9774()
-		{
-		}
-		[TestMethod]
-		public void Test_9775()
-		{
-		}
-		[TestMethod]
-		public void Test_9776()
-		{
-		}
-		[TestMethod]
-		public void Test_9777()
-		{
-		}
-		[TestMethod]
-		public void Test_9778()
-		{
-		}
-		[TestMethod]
-		public void Test_9779()
-		{
-		}
-		[TestMethod]
-		public void Test_9780()
-		{
-		}
-		[TestMethod]
-		public void Test_9781()
-		{
-		}
-		[TestMethod]
-		public void Test_9782()
-		{
-		}
-		[TestMethod]
-		public void Test_9783()
-		{
-		}
-		[TestMethod]
-		public void Test_9784()
-		{
-		}
-		[TestMethod]
-		public void Test_9785()
-		{
-		}
-		[TestMethod]
-		public void Test_9786()
-		{
-		}
-		[TestMethod]
-		public void Test_9787()
-		{
-		}
-		[TestMethod]
-		public void Test_9788()
-		{
-		}
-		[TestMethod]
-		public void Test_9789()
-		{
-		}
-		[TestMethod]
-		public void Test_9790()
-		{
-		}
-		[TestMethod]
-		public void Test_9791()
-		{
-		}
-		[TestMethod]
-		public void Test_9792()
-		{
-		}
-		[TestMethod]
-		public void Test_9793()
-		{
-		}
-		[TestMethod]
-		public void Test_9794()
-		{
-		}
-		[TestMethod]
-		public void Test_9795()
-		{
-		}
-		[TestMethod]
-		public void Test_9796()
-		{
-		}
-		[TestMethod]
-		public void Test_9797()
-		{
-		}
-		[TestMethod]
-		public void Test_9798()
-		{
-		}
-		[TestMethod]
-		public void Test_9799()
-		{
-		}
-		[TestMethod]
-		public void Test_9800()
-		{
-		}
-		[TestMethod]
-		public void Test_9801()
-		{
-		}
-		[TestMethod]
-		public void Test_9802()
-		{
-		}
-		[TestMethod]
-		public void Test_9803()
-		{
-		}
-		[TestMethod]
-		public void Test_9804()
-		{
-		}
-		[TestMethod]
-		public void Test_9805()
-		{
-		}
-		[TestMethod]
-		public void Test_9806()
-		{
-		}
-		[TestMethod]
-		public void Test_9807()
-		{
-		}
-		[TestMethod]
-		public void Test_9808()
-		{
-		}
-		[TestMethod]
-		public void Test_9809()
-		{
-		}
-		[TestMethod]
-		public void Test_9810()
-		{
-		}
-		[TestMethod]
-		public void Test_9811()
-		{
-		}
-		[TestMethod]
-		public void Test_9812()
-		{
-		}
-		[TestMethod]
-		public void Test_9813()
-		{
-		}
-		[TestMethod]
-		public void Test_9814()
-		{
-		}
-		[TestMethod]
-		public void Test_9815()
-		{
-		}
-		[TestMethod]
-		public void Test_9816()
-		{
-		}
-		[TestMethod]
-		public void Test_9817()
-		{
-		}
-		[TestMethod]
-		public void Test_9818()
-		{
-		}
-		[TestMethod]
-		public void Test_9819()
-		{
-		}
-		[TestMethod]
-		public void Test_9820()
-		{
-		}
-		[TestMethod]
-		public void Test_9821()
-		{
-		}
-		[TestMethod]
-		public void Test_9822()
-		{
-		}
-		[TestMethod]
-		public void Test_9823()
-		{
-		}
-		[TestMethod]
-		public void Test_9824()
-		{
-		}
-		[TestMethod]
-		public void Test_9825()
-		{
-		}
-		[TestMethod]
-		public void Test_9826()
-		{
-		}
-		[TestMethod]
-		public void Test_9827()
-		{
-		}
-		[TestMethod]
-		public void Test_9828()
-		{
-		}
-		[TestMethod]
-		public void Test_9829()
-		{
-		}
-		[TestMethod]
-		public void Test_9830()
-		{
-		}
-		[TestMethod]
-		public void Test_9831()
-		{
-		}
-		[TestMethod]
-		public void Test_9832()
-		{
-		}
-		[TestMethod]
-		public void Test_9833()
-		{
-		}
-		[TestMethod]
-		public void Test_9834()
-		{
-		}
-		[TestMethod]
-		public void Test_9835()
-		{
-		}
-		[TestMethod]
-		public void Test_9836()
-		{
-		}
-		[TestMethod]
-		public void Test_9837()
-		{
-		}
-		[TestMethod]
-		public void Test_9838()
-		{
-		}
-		[TestMethod]
-		public void Test_9839()
-		{
-		}
-		[TestMethod]
-		public void Test_9840()
-		{
-		}
-		[TestMethod]
-		public void Test_9841()
-		{
-		}
-		[TestMethod]
-		public void Test_9842()
-		{
-		}
-		[TestMethod]
-		public void Test_9843()
-		{
-		}
-		[TestMethod]
-		public void Test_9844()
-		{
-		}
-		[TestMethod]
-		public void Test_9845()
-		{
-		}
-		[TestMethod]
-		public void Test_9846()
-		{
-		}
-		[TestMethod]
-		public void Test_9847()
-		{
-		}
-		[TestMethod]
-		public void Test_9848()
-		{
-		}
-		[TestMethod]
-		public void Test_9849()
-		{
-		}
-		[TestMethod]
-		public void Test_9850()
-		{
-		}
-		[TestMethod]
-		public void Test_9851()
-		{
-		}
-		[TestMethod]
-		public void Test_9852()
-		{
-		}
-		[TestMethod]
-		public void Test_9853()
-		{
-		}
-		[TestMethod]
-		public void Test_9854()
-		{
-		}
-		[TestMethod]
-		public void Test_9855()
-		{
-		}
-		[TestMethod]
-		public void Test_9856()
-		{
-		}
-		[TestMethod]
-		public void Test_9857()
-		{
-		}
-		[TestMethod]
-		public void Test_9858()
-		{
-		}
-		[TestMethod]
-		public void Test_9859()
-		{
-		}
-		[TestMethod]
-		public void Test_9860()
-		{
-		}
-		[TestMethod]
-		public void Test_9861()
-		{
-		}
-		[TestMethod]
-		public void Test_9862()
-		{
-		}
-		[TestMethod]
-		public void Test_9863()
-		{
-		}
-		[TestMethod]
-		public void Test_9864()
-		{
-		}
-		[TestMethod]
-		public void Test_9865()
-		{
-		}
-		[TestMethod]
-		public void Test_9866()
-		{
-		}
-		[TestMethod]
-		public void Test_9867()
-		{
-		}
-		[TestMethod]
-		public void Test_9868()
-		{
-		}
-		[TestMethod]
-		public void Test_9869()
-		{
-		}
-		[TestMethod]
-		public void Test_9870()
-		{
-		}
-		[TestMethod]
-		public void Test_9871()
-		{
-		}
-		[TestMethod]
-		public void Test_9872()
-		{
-		}
-		[TestMethod]
-		public void Test_9873()
-		{
-		}
-		[TestMethod]
-		public void Test_9874()
-		{
-		}
-		[TestMethod]
-		public void Test_9875()
-		{
-		}
-		[TestMethod]
-		public void Test_9876()
-		{
-		}
-		[TestMethod]
-		public void Test_9877()
-		{
-		}
-		[TestMethod]
-		public void Test_9878()
-		{
-		}
-		[TestMethod]
-		public void Test_9879()
-		{
-		}
-		[TestMethod]
-		public void Test_9880()
-		{
-		}
-		[TestMethod]
-		public void Test_9881()
-		{
-		}
-		[TestMethod]
-		public void Test_9882()
-		{
-		}
-		[TestMethod]
-		public void Test_9883()
-		{
-		}
-		[TestMethod]
-		public void Test_9884()
-		{
-		}
-		[TestMethod]
-		public void Test_9885()
-		{
-		}
-		[TestMethod]
-		public void Test_9886()
-		{
-		}
-		[TestMethod]
-		public void Test_9887()
-		{
-		}
-		[TestMethod]
-		public void Test_9888()
-		{
-		}
-		[TestMethod]
-		public void Test_9889()
-		{
-		}
-		[TestMethod]
-		public void Test_9890()
-		{
-		}
-		[TestMethod]
-		public void Test_9891()
-		{
-		}
-		[TestMethod]
-		public void Test_9892()
-		{
-		}
-		[TestMethod]
-		public void Test_9893()
-		{
-		}
-		[TestMethod]
-		public void Test_9894()
-		{
-		}
-		[TestMethod]
-		public void Test_9895()
-		{
-		}
-		[TestMethod]
-		public void Test_9896()
-		{
-		}
-		[TestMethod]
-		public void Test_9897()
-		{
-		}
-		[TestMethod]
-		public void Test_9898()
-		{
-		}
-		[TestMethod]
-		public void Test_9899()
-		{
-		}
-		[TestMethod]
-		public void Test_9900()
-		{
-		}
-		[TestMethod]
-		public void Test_9901()
-		{
-		}
-		[TestMethod]
-		public void Test_9902()
-		{
-		}
-		[TestMethod]
-		public void Test_9903()
-		{
-		}
-		[TestMethod]
-		public void Test_9904()
-		{
-		}
-		[TestMethod]
-		public void Test_9905()
-		{
-		}
-		[TestMethod]
-		public void Test_9906()
-		{
-		}
-		[TestMethod]
-		public void Test_9907()
-		{
-		}
-		[TestMethod]
-		public void Test_9908()
-		{
-		}
-		[TestMethod]
-		public void Test_9909()
-		{
-		}
-		[TestMethod]
-		public void Test_9910()
-		{
-		}
-		[TestMethod]
-		public void Test_9911()
-		{
-		}
-		[TestMethod]
-		public void Test_9912()
-		{
-		}
-		[TestMethod]
-		public void Test_9913()
-		{
-		}
-		[TestMethod]
-		public void Test_9914()
-		{
-		}
-		[TestMethod]
-		public void Test_9915()
-		{
-		}
-		[TestMethod]
-		public void Test_9916()
-		{
-		}
-		[TestMethod]
-		public void Test_9917()
-		{
-		}
-		[TestMethod]
-		public void Test_9918()
-		{
-		}
-		[TestMethod]
-		public void Test_9919()
-		{
-		}
-		[TestMethod]
-		public void Test_9920()
-		{
-		}
-		[TestMethod]
-		public void Test_9921()
-		{
-		}
-		[TestMethod]
-		public void Test_9922()
-		{
-		}
-		[TestMethod]
-		public void Test_9923()
-		{
-		}
-		[TestMethod]
-		public void Test_9924()
-		{
-		}
-		[TestMethod]
-		public void Test_9925()
-		{
-		}
-		[TestMethod]
-		public void Test_9926()
-		{
-		}
-		[TestMethod]
-		public void Test_9927()
-		{
-		}
-		[TestMethod]
-		public void Test_9928()
-		{
-		}
-		[TestMethod]
-		public void Test_9929()
-		{
-		}
-		[TestMethod]
-		public void Test_9930()
-		{
-		}
-		[TestMethod]
-		public void Test_9931()
-		{
-		}
-		[TestMethod]
-		public void Test_9932()
-		{
-		}
-		[TestMethod]
-		public void Test_9933()
-		{
-		}
-		[TestMethod]
-		public void Test_9934()
-		{
-		}
-		[TestMethod]
-		public void Test_9935()
-		{
-		}
-		[TestMethod]
-		public void Test_9936()
-		{
-		}
-		[TestMethod]
-		public void Test_9937()
-		{
-		}
-		[TestMethod]
-		public void Test_9938()
-		{
-		}
-		[TestMethod]
-		public void Test_9939()
-		{
-		}
-		[TestMethod]
-		public void Test_9940()
-		{
-		}
-		[TestMethod]
-		public void Test_9941()
-		{
-		}
-		[TestMethod]
-		public void Test_9942()
-		{
-		}
-		[TestMethod]
-		public void Test_9943()
-		{
-		}
-		[TestMethod]
-		public void Test_9944()
-		{
-		}
-		[TestMethod]
-		public void Test_9945()
-		{
-		}
-		[TestMethod]
-		public void Test_9946()
-		{
-		}
-		[TestMethod]
-		public void Test_9947()
-		{
-		}
-		[TestMethod]
-		public void Test_9948()
-		{
-		}
-		[TestMethod]
-		public void Test_9949()
-		{
-		}
-		[TestMethod]
-		public void Test_9950()
-		{
-		}
-		[TestMethod]
-		public void Test_9951()
-		{
-		}
-		[TestMethod]
-		public void Test_9952()
-		{
-		}
-		[TestMethod]
-		public void Test_9953()
-		{
-		}
-		[TestMethod]
-		public void Test_9954()
-		{
-		}
-		[TestMethod]
-		public void Test_9955()
-		{
-		}
-		[TestMethod]
-		public void Test_9956()
-		{
-		}
-		[TestMethod]
-		public void Test_9957()
-		{
-		}
-		[TestMethod]
-		public void Test_9958()
-		{
-		}
-		[TestMethod]
-		public void Test_9959()
-		{
-		}
-		[TestMethod]
-		public void Test_9960()
-		{
-		}
-		[TestMethod]
-		public void Test_9961()
-		{
-		}
-		[TestMethod]
-		public void Test_9962()
-		{
-		}
-		[TestMethod]
-		public void Test_9963()
-		{
-		}
-		[TestMethod]
-		public void Test_9964()
-		{
-		}
-		[TestMethod]
-		public void Test_9965()
-		{
-		}
-		[TestMethod]
-		public void Test_9966()
-		{
-		}
-		[TestMethod]
-		public void Test_9967()
-		{
-		}
-		[TestMethod]
-		public void Test_9968()
-		{
-		}
-		[TestMethod]
-		public void Test_9969()
-		{
-		}
-		[TestMethod]
-		public void Test_9970()
-		{
-		}
-		[TestMethod]
-		public void Test_9971()
-		{
-		}
-		[TestMethod]
-		public void Test_9972()
-		{
-		}
-		[TestMethod]
-		public void Test_9973()
-		{
-		}
-		[TestMethod]
-		public void Test_9974()
-		{
-		}
-		[TestMethod]
-		public void Test_9975()
-		{
-		}
-		[TestMethod]
-		public void Test_9976()
-		{
-		}
-		[TestMethod]
-		public void Test_9977()
-		{
-		}
-		[TestMethod]
-		public void Test_9978()
-		{
-		}
-		[TestMethod]
-		public void Test_9979()
-		{
-		}
-		[TestMethod]
-		public void Test_9980()
-		{
-		}
-		[TestMethod]
-		public void Test_9981()
-		{
-		}
-		[TestMethod]
-		public void Test_9982()
-		{
-		}
-		[TestMethod]
-		public void Test_9983()
-		{
-		}
-		[TestMethod]
-		public void Test_9984()
-		{
-		}
-		[TestMethod]
-		public void Test_9985()
-		{
-		}
-		[TestMethod]
-		public void Test_9986()
-		{
-		}
-		[TestMethod]
-		public void Test_9987()
-		{
-		}
-		[TestMethod]
-		public void Test_9988()
-		{
-		}
-		[TestMethod]
-		public void Test_9989()
-		{
-		}
-		[TestMethod]
-		public void Test_9990()
-		{
-		}
-		[TestMethod]
-		public void Test_9991()
-		{
-		}
-		[TestMethod]
-		public void Test_9992()
-		{
-		}
-		[TestMethod]
-		public void Test_9993()
-		{
-		}
-		[TestMethod]
-		public void Test_9994()
-		{
-		}
-		[TestMethod]
-		public void Test_9995()
-		{
-		}
-		[TestMethod]
-		public void Test_9996()
-		{
-		}
-		[TestMethod]
-		public void Test_9997()
-		{
-		}
-		[TestMethod]
-		public void Test_9998()
-		{
-		}
-		[TestMethod]
-		public void Test_9999()
-		{
-		}
-		[TestMethod]
-		public void Test_10000()
-		{
-		}
-		#endregion
-
-		#region FailingTests
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.tt b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.tt
deleted file mode 100644
index c3a85e841b..0000000000
--- a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTests.tt
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTestinProgress
-{
-    [TestClass]
-	public class MSTests
-    {
-<#
-	int passedTests = 10000;
-	int failedTests = 0;
-	String padding = "00";
-
-	int count = 1;
-	String testmethodprefix = "Test_";
-
-
-#>
-
-		#region PassingTests
-<#
-	for(int i=0;i<passedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[TestMethod]
-		public void <#=methodName#>()
-		{
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-
-		#region FailingTests
-<#
-	for(int i=0;i<failedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[TestMethod]
-		public void <#=methodName#>()
-		{
-			Assert.Fail();
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj
deleted file mode 100644
index 02e49fa350..0000000000
--- a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <Import Project="..\..\..\..\scripts\build\TestAssets.props" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnit3FrameworkVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3AdapterVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="NunitTests.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>NunitTests.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="NunitTests.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NunitTests.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-</Project>
diff --git a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.cs b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.cs
deleted file mode 100644
index 0852d0bb7c..0000000000
--- a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.cs
+++ /dev/null
@@ -1,40017 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace NUnitAdapterPerfTests
-{
-
-	public class NunitTests
-    {
-
-		#region PassingTests
-		[Test]
-		public void Test_01()
-		{
-		}
-		[Test]
-		public void Test_02()
-		{
-		}
-		[Test]
-		public void Test_03()
-		{
-		}
-		[Test]
-		public void Test_04()
-		{
-		}
-		[Test]
-		public void Test_05()
-		{
-		}
-		[Test]
-		public void Test_06()
-		{
-		}
-		[Test]
-		public void Test_07()
-		{
-		}
-		[Test]
-		public void Test_08()
-		{
-		}
-		[Test]
-		public void Test_09()
-		{
-		}
-		[Test]
-		public void Test_10()
-		{
-		}
-		[Test]
-		public void Test_11()
-		{
-		}
-		[Test]
-		public void Test_12()
-		{
-		}
-		[Test]
-		public void Test_13()
-		{
-		}
-		[Test]
-		public void Test_14()
-		{
-		}
-		[Test]
-		public void Test_15()
-		{
-		}
-		[Test]
-		public void Test_16()
-		{
-		}
-		[Test]
-		public void Test_17()
-		{
-		}
-		[Test]
-		public void Test_18()
-		{
-		}
-		[Test]
-		public void Test_19()
-		{
-		}
-		[Test]
-		public void Test_20()
-		{
-		}
-		[Test]
-		public void Test_21()
-		{
-		}
-		[Test]
-		public void Test_22()
-		{
-		}
-		[Test]
-		public void Test_23()
-		{
-		}
-		[Test]
-		public void Test_24()
-		{
-		}
-		[Test]
-		public void Test_25()
-		{
-		}
-		[Test]
-		public void Test_26()
-		{
-		}
-		[Test]
-		public void Test_27()
-		{
-		}
-		[Test]
-		public void Test_28()
-		{
-		}
-		[Test]
-		public void Test_29()
-		{
-		}
-		[Test]
-		public void Test_30()
-		{
-		}
-		[Test]
-		public void Test_31()
-		{
-		}
-		[Test]
-		public void Test_32()
-		{
-		}
-		[Test]
-		public void Test_33()
-		{
-		}
-		[Test]
-		public void Test_34()
-		{
-		}
-		[Test]
-		public void Test_35()
-		{
-		}
-		[Test]
-		public void Test_36()
-		{
-		}
-		[Test]
-		public void Test_37()
-		{
-		}
-		[Test]
-		public void Test_38()
-		{
-		}
-		[Test]
-		public void Test_39()
-		{
-		}
-		[Test]
-		public void Test_40()
-		{
-		}
-		[Test]
-		public void Test_41()
-		{
-		}
-		[Test]
-		public void Test_42()
-		{
-		}
-		[Test]
-		public void Test_43()
-		{
-		}
-		[Test]
-		public void Test_44()
-		{
-		}
-		[Test]
-		public void Test_45()
-		{
-		}
-		[Test]
-		public void Test_46()
-		{
-		}
-		[Test]
-		public void Test_47()
-		{
-		}
-		[Test]
-		public void Test_48()
-		{
-		}
-		[Test]
-		public void Test_49()
-		{
-		}
-		[Test]
-		public void Test_50()
-		{
-		}
-		[Test]
-		public void Test_51()
-		{
-		}
-		[Test]
-		public void Test_52()
-		{
-		}
-		[Test]
-		public void Test_53()
-		{
-		}
-		[Test]
-		public void Test_54()
-		{
-		}
-		[Test]
-		public void Test_55()
-		{
-		}
-		[Test]
-		public void Test_56()
-		{
-		}
-		[Test]
-		public void Test_57()
-		{
-		}
-		[Test]
-		public void Test_58()
-		{
-		}
-		[Test]
-		public void Test_59()
-		{
-		}
-		[Test]
-		public void Test_60()
-		{
-		}
-		[Test]
-		public void Test_61()
-		{
-		}
-		[Test]
-		public void Test_62()
-		{
-		}
-		[Test]
-		public void Test_63()
-		{
-		}
-		[Test]
-		public void Test_64()
-		{
-		}
-		[Test]
-		public void Test_65()
-		{
-		}
-		[Test]
-		public void Test_66()
-		{
-		}
-		[Test]
-		public void Test_67()
-		{
-		}
-		[Test]
-		public void Test_68()
-		{
-		}
-		[Test]
-		public void Test_69()
-		{
-		}
-		[Test]
-		public void Test_70()
-		{
-		}
-		[Test]
-		public void Test_71()
-		{
-		}
-		[Test]
-		public void Test_72()
-		{
-		}
-		[Test]
-		public void Test_73()
-		{
-		}
-		[Test]
-		public void Test_74()
-		{
-		}
-		[Test]
-		public void Test_75()
-		{
-		}
-		[Test]
-		public void Test_76()
-		{
-		}
-		[Test]
-		public void Test_77()
-		{
-		}
-		[Test]
-		public void Test_78()
-		{
-		}
-		[Test]
-		public void Test_79()
-		{
-		}
-		[Test]
-		public void Test_80()
-		{
-		}
-		[Test]
-		public void Test_81()
-		{
-		}
-		[Test]
-		public void Test_82()
-		{
-		}
-		[Test]
-		public void Test_83()
-		{
-		}
-		[Test]
-		public void Test_84()
-		{
-		}
-		[Test]
-		public void Test_85()
-		{
-		}
-		[Test]
-		public void Test_86()
-		{
-		}
-		[Test]
-		public void Test_87()
-		{
-		}
-		[Test]
-		public void Test_88()
-		{
-		}
-		[Test]
-		public void Test_89()
-		{
-		}
-		[Test]
-		public void Test_90()
-		{
-		}
-		[Test]
-		public void Test_91()
-		{
-		}
-		[Test]
-		public void Test_92()
-		{
-		}
-		[Test]
-		public void Test_93()
-		{
-		}
-		[Test]
-		public void Test_94()
-		{
-		}
-		[Test]
-		public void Test_95()
-		{
-		}
-		[Test]
-		public void Test_96()
-		{
-		}
-		[Test]
-		public void Test_97()
-		{
-		}
-		[Test]
-		public void Test_98()
-		{
-		}
-		[Test]
-		public void Test_99()
-		{
-		}
-		[Test]
-		public void Test_100()
-		{
-		}
-		[Test]
-		public void Test_101()
-		{
-		}
-		[Test]
-		public void Test_102()
-		{
-		}
-		[Test]
-		public void Test_103()
-		{
-		}
-		[Test]
-		public void Test_104()
-		{
-		}
-		[Test]
-		public void Test_105()
-		{
-		}
-		[Test]
-		public void Test_106()
-		{
-		}
-		[Test]
-		public void Test_107()
-		{
-		}
-		[Test]
-		public void Test_108()
-		{
-		}
-		[Test]
-		public void Test_109()
-		{
-		}
-		[Test]
-		public void Test_110()
-		{
-		}
-		[Test]
-		public void Test_111()
-		{
-		}
-		[Test]
-		public void Test_112()
-		{
-		}
-		[Test]
-		public void Test_113()
-		{
-		}
-		[Test]
-		public void Test_114()
-		{
-		}
-		[Test]
-		public void Test_115()
-		{
-		}
-		[Test]
-		public void Test_116()
-		{
-		}
-		[Test]
-		public void Test_117()
-		{
-		}
-		[Test]
-		public void Test_118()
-		{
-		}
-		[Test]
-		public void Test_119()
-		{
-		}
-		[Test]
-		public void Test_120()
-		{
-		}
-		[Test]
-		public void Test_121()
-		{
-		}
-		[Test]
-		public void Test_122()
-		{
-		}
-		[Test]
-		public void Test_123()
-		{
-		}
-		[Test]
-		public void Test_124()
-		{
-		}
-		[Test]
-		public void Test_125()
-		{
-		}
-		[Test]
-		public void Test_126()
-		{
-		}
-		[Test]
-		public void Test_127()
-		{
-		}
-		[Test]
-		public void Test_128()
-		{
-		}
-		[Test]
-		public void Test_129()
-		{
-		}
-		[Test]
-		public void Test_130()
-		{
-		}
-		[Test]
-		public void Test_131()
-		{
-		}
-		[Test]
-		public void Test_132()
-		{
-		}
-		[Test]
-		public void Test_133()
-		{
-		}
-		[Test]
-		public void Test_134()
-		{
-		}
-		[Test]
-		public void Test_135()
-		{
-		}
-		[Test]
-		public void Test_136()
-		{
-		}
-		[Test]
-		public void Test_137()
-		{
-		}
-		[Test]
-		public void Test_138()
-		{
-		}
-		[Test]
-		public void Test_139()
-		{
-		}
-		[Test]
-		public void Test_140()
-		{
-		}
-		[Test]
-		public void Test_141()
-		{
-		}
-		[Test]
-		public void Test_142()
-		{
-		}
-		[Test]
-		public void Test_143()
-		{
-		}
-		[Test]
-		public void Test_144()
-		{
-		}
-		[Test]
-		public void Test_145()
-		{
-		}
-		[Test]
-		public void Test_146()
-		{
-		}
-		[Test]
-		public void Test_147()
-		{
-		}
-		[Test]
-		public void Test_148()
-		{
-		}
-		[Test]
-		public void Test_149()
-		{
-		}
-		[Test]
-		public void Test_150()
-		{
-		}
-		[Test]
-		public void Test_151()
-		{
-		}
-		[Test]
-		public void Test_152()
-		{
-		}
-		[Test]
-		public void Test_153()
-		{
-		}
-		[Test]
-		public void Test_154()
-		{
-		}
-		[Test]
-		public void Test_155()
-		{
-		}
-		[Test]
-		public void Test_156()
-		{
-		}
-		[Test]
-		public void Test_157()
-		{
-		}
-		[Test]
-		public void Test_158()
-		{
-		}
-		[Test]
-		public void Test_159()
-		{
-		}
-		[Test]
-		public void Test_160()
-		{
-		}
-		[Test]
-		public void Test_161()
-		{
-		}
-		[Test]
-		public void Test_162()
-		{
-		}
-		[Test]
-		public void Test_163()
-		{
-		}
-		[Test]
-		public void Test_164()
-		{
-		}
-		[Test]
-		public void Test_165()
-		{
-		}
-		[Test]
-		public void Test_166()
-		{
-		}
-		[Test]
-		public void Test_167()
-		{
-		}
-		[Test]
-		public void Test_168()
-		{
-		}
-		[Test]
-		public void Test_169()
-		{
-		}
-		[Test]
-		public void Test_170()
-		{
-		}
-		[Test]
-		public void Test_171()
-		{
-		}
-		[Test]
-		public void Test_172()
-		{
-		}
-		[Test]
-		public void Test_173()
-		{
-		}
-		[Test]
-		public void Test_174()
-		{
-		}
-		[Test]
-		public void Test_175()
-		{
-		}
-		[Test]
-		public void Test_176()
-		{
-		}
-		[Test]
-		public void Test_177()
-		{
-		}
-		[Test]
-		public void Test_178()
-		{
-		}
-		[Test]
-		public void Test_179()
-		{
-		}
-		[Test]
-		public void Test_180()
-		{
-		}
-		[Test]
-		public void Test_181()
-		{
-		}
-		[Test]
-		public void Test_182()
-		{
-		}
-		[Test]
-		public void Test_183()
-		{
-		}
-		[Test]
-		public void Test_184()
-		{
-		}
-		[Test]
-		public void Test_185()
-		{
-		}
-		[Test]
-		public void Test_186()
-		{
-		}
-		[Test]
-		public void Test_187()
-		{
-		}
-		[Test]
-		public void Test_188()
-		{
-		}
-		[Test]
-		public void Test_189()
-		{
-		}
-		[Test]
-		public void Test_190()
-		{
-		}
-		[Test]
-		public void Test_191()
-		{
-		}
-		[Test]
-		public void Test_192()
-		{
-		}
-		[Test]
-		public void Test_193()
-		{
-		}
-		[Test]
-		public void Test_194()
-		{
-		}
-		[Test]
-		public void Test_195()
-		{
-		}
-		[Test]
-		public void Test_196()
-		{
-		}
-		[Test]
-		public void Test_197()
-		{
-		}
-		[Test]
-		public void Test_198()
-		{
-		}
-		[Test]
-		public void Test_199()
-		{
-		}
-		[Test]
-		public void Test_200()
-		{
-		}
-		[Test]
-		public void Test_201()
-		{
-		}
-		[Test]
-		public void Test_202()
-		{
-		}
-		[Test]
-		public void Test_203()
-		{
-		}
-		[Test]
-		public void Test_204()
-		{
-		}
-		[Test]
-		public void Test_205()
-		{
-		}
-		[Test]
-		public void Test_206()
-		{
-		}
-		[Test]
-		public void Test_207()
-		{
-		}
-		[Test]
-		public void Test_208()
-		{
-		}
-		[Test]
-		public void Test_209()
-		{
-		}
-		[Test]
-		public void Test_210()
-		{
-		}
-		[Test]
-		public void Test_211()
-		{
-		}
-		[Test]
-		public void Test_212()
-		{
-		}
-		[Test]
-		public void Test_213()
-		{
-		}
-		[Test]
-		public void Test_214()
-		{
-		}
-		[Test]
-		public void Test_215()
-		{
-		}
-		[Test]
-		public void Test_216()
-		{
-		}
-		[Test]
-		public void Test_217()
-		{
-		}
-		[Test]
-		public void Test_218()
-		{
-		}
-		[Test]
-		public void Test_219()
-		{
-		}
-		[Test]
-		public void Test_220()
-		{
-		}
-		[Test]
-		public void Test_221()
-		{
-		}
-		[Test]
-		public void Test_222()
-		{
-		}
-		[Test]
-		public void Test_223()
-		{
-		}
-		[Test]
-		public void Test_224()
-		{
-		}
-		[Test]
-		public void Test_225()
-		{
-		}
-		[Test]
-		public void Test_226()
-		{
-		}
-		[Test]
-		public void Test_227()
-		{
-		}
-		[Test]
-		public void Test_228()
-		{
-		}
-		[Test]
-		public void Test_229()
-		{
-		}
-		[Test]
-		public void Test_230()
-		{
-		}
-		[Test]
-		public void Test_231()
-		{
-		}
-		[Test]
-		public void Test_232()
-		{
-		}
-		[Test]
-		public void Test_233()
-		{
-		}
-		[Test]
-		public void Test_234()
-		{
-		}
-		[Test]
-		public void Test_235()
-		{
-		}
-		[Test]
-		public void Test_236()
-		{
-		}
-		[Test]
-		public void Test_237()
-		{
-		}
-		[Test]
-		public void Test_238()
-		{
-		}
-		[Test]
-		public void Test_239()
-		{
-		}
-		[Test]
-		public void Test_240()
-		{
-		}
-		[Test]
-		public void Test_241()
-		{
-		}
-		[Test]
-		public void Test_242()
-		{
-		}
-		[Test]
-		public void Test_243()
-		{
-		}
-		[Test]
-		public void Test_244()
-		{
-		}
-		[Test]
-		public void Test_245()
-		{
-		}
-		[Test]
-		public void Test_246()
-		{
-		}
-		[Test]
-		public void Test_247()
-		{
-		}
-		[Test]
-		public void Test_248()
-		{
-		}
-		[Test]
-		public void Test_249()
-		{
-		}
-		[Test]
-		public void Test_250()
-		{
-		}
-		[Test]
-		public void Test_251()
-		{
-		}
-		[Test]
-		public void Test_252()
-		{
-		}
-		[Test]
-		public void Test_253()
-		{
-		}
-		[Test]
-		public void Test_254()
-		{
-		}
-		[Test]
-		public void Test_255()
-		{
-		}
-		[Test]
-		public void Test_256()
-		{
-		}
-		[Test]
-		public void Test_257()
-		{
-		}
-		[Test]
-		public void Test_258()
-		{
-		}
-		[Test]
-		public void Test_259()
-		{
-		}
-		[Test]
-		public void Test_260()
-		{
-		}
-		[Test]
-		public void Test_261()
-		{
-		}
-		[Test]
-		public void Test_262()
-		{
-		}
-		[Test]
-		public void Test_263()
-		{
-		}
-		[Test]
-		public void Test_264()
-		{
-		}
-		[Test]
-		public void Test_265()
-		{
-		}
-		[Test]
-		public void Test_266()
-		{
-		}
-		[Test]
-		public void Test_267()
-		{
-		}
-		[Test]
-		public void Test_268()
-		{
-		}
-		[Test]
-		public void Test_269()
-		{
-		}
-		[Test]
-		public void Test_270()
-		{
-		}
-		[Test]
-		public void Test_271()
-		{
-		}
-		[Test]
-		public void Test_272()
-		{
-		}
-		[Test]
-		public void Test_273()
-		{
-		}
-		[Test]
-		public void Test_274()
-		{
-		}
-		[Test]
-		public void Test_275()
-		{
-		}
-		[Test]
-		public void Test_276()
-		{
-		}
-		[Test]
-		public void Test_277()
-		{
-		}
-		[Test]
-		public void Test_278()
-		{
-		}
-		[Test]
-		public void Test_279()
-		{
-		}
-		[Test]
-		public void Test_280()
-		{
-		}
-		[Test]
-		public void Test_281()
-		{
-		}
-		[Test]
-		public void Test_282()
-		{
-		}
-		[Test]
-		public void Test_283()
-		{
-		}
-		[Test]
-		public void Test_284()
-		{
-		}
-		[Test]
-		public void Test_285()
-		{
-		}
-		[Test]
-		public void Test_286()
-		{
-		}
-		[Test]
-		public void Test_287()
-		{
-		}
-		[Test]
-		public void Test_288()
-		{
-		}
-		[Test]
-		public void Test_289()
-		{
-		}
-		[Test]
-		public void Test_290()
-		{
-		}
-		[Test]
-		public void Test_291()
-		{
-		}
-		[Test]
-		public void Test_292()
-		{
-		}
-		[Test]
-		public void Test_293()
-		{
-		}
-		[Test]
-		public void Test_294()
-		{
-		}
-		[Test]
-		public void Test_295()
-		{
-		}
-		[Test]
-		public void Test_296()
-		{
-		}
-		[Test]
-		public void Test_297()
-		{
-		}
-		[Test]
-		public void Test_298()
-		{
-		}
-		[Test]
-		public void Test_299()
-		{
-		}
-		[Test]
-		public void Test_300()
-		{
-		}
-		[Test]
-		public void Test_301()
-		{
-		}
-		[Test]
-		public void Test_302()
-		{
-		}
-		[Test]
-		public void Test_303()
-		{
-		}
-		[Test]
-		public void Test_304()
-		{
-		}
-		[Test]
-		public void Test_305()
-		{
-		}
-		[Test]
-		public void Test_306()
-		{
-		}
-		[Test]
-		public void Test_307()
-		{
-		}
-		[Test]
-		public void Test_308()
-		{
-		}
-		[Test]
-		public void Test_309()
-		{
-		}
-		[Test]
-		public void Test_310()
-		{
-		}
-		[Test]
-		public void Test_311()
-		{
-		}
-		[Test]
-		public void Test_312()
-		{
-		}
-		[Test]
-		public void Test_313()
-		{
-		}
-		[Test]
-		public void Test_314()
-		{
-		}
-		[Test]
-		public void Test_315()
-		{
-		}
-		[Test]
-		public void Test_316()
-		{
-		}
-		[Test]
-		public void Test_317()
-		{
-		}
-		[Test]
-		public void Test_318()
-		{
-		}
-		[Test]
-		public void Test_319()
-		{
-		}
-		[Test]
-		public void Test_320()
-		{
-		}
-		[Test]
-		public void Test_321()
-		{
-		}
-		[Test]
-		public void Test_322()
-		{
-		}
-		[Test]
-		public void Test_323()
-		{
-		}
-		[Test]
-		public void Test_324()
-		{
-		}
-		[Test]
-		public void Test_325()
-		{
-		}
-		[Test]
-		public void Test_326()
-		{
-		}
-		[Test]
-		public void Test_327()
-		{
-		}
-		[Test]
-		public void Test_328()
-		{
-		}
-		[Test]
-		public void Test_329()
-		{
-		}
-		[Test]
-		public void Test_330()
-		{
-		}
-		[Test]
-		public void Test_331()
-		{
-		}
-		[Test]
-		public void Test_332()
-		{
-		}
-		[Test]
-		public void Test_333()
-		{
-		}
-		[Test]
-		public void Test_334()
-		{
-		}
-		[Test]
-		public void Test_335()
-		{
-		}
-		[Test]
-		public void Test_336()
-		{
-		}
-		[Test]
-		public void Test_337()
-		{
-		}
-		[Test]
-		public void Test_338()
-		{
-		}
-		[Test]
-		public void Test_339()
-		{
-		}
-		[Test]
-		public void Test_340()
-		{
-		}
-		[Test]
-		public void Test_341()
-		{
-		}
-		[Test]
-		public void Test_342()
-		{
-		}
-		[Test]
-		public void Test_343()
-		{
-		}
-		[Test]
-		public void Test_344()
-		{
-		}
-		[Test]
-		public void Test_345()
-		{
-		}
-		[Test]
-		public void Test_346()
-		{
-		}
-		[Test]
-		public void Test_347()
-		{
-		}
-		[Test]
-		public void Test_348()
-		{
-		}
-		[Test]
-		public void Test_349()
-		{
-		}
-		[Test]
-		public void Test_350()
-		{
-		}
-		[Test]
-		public void Test_351()
-		{
-		}
-		[Test]
-		public void Test_352()
-		{
-		}
-		[Test]
-		public void Test_353()
-		{
-		}
-		[Test]
-		public void Test_354()
-		{
-		}
-		[Test]
-		public void Test_355()
-		{
-		}
-		[Test]
-		public void Test_356()
-		{
-		}
-		[Test]
-		public void Test_357()
-		{
-		}
-		[Test]
-		public void Test_358()
-		{
-		}
-		[Test]
-		public void Test_359()
-		{
-		}
-		[Test]
-		public void Test_360()
-		{
-		}
-		[Test]
-		public void Test_361()
-		{
-		}
-		[Test]
-		public void Test_362()
-		{
-		}
-		[Test]
-		public void Test_363()
-		{
-		}
-		[Test]
-		public void Test_364()
-		{
-		}
-		[Test]
-		public void Test_365()
-		{
-		}
-		[Test]
-		public void Test_366()
-		{
-		}
-		[Test]
-		public void Test_367()
-		{
-		}
-		[Test]
-		public void Test_368()
-		{
-		}
-		[Test]
-		public void Test_369()
-		{
-		}
-		[Test]
-		public void Test_370()
-		{
-		}
-		[Test]
-		public void Test_371()
-		{
-		}
-		[Test]
-		public void Test_372()
-		{
-		}
-		[Test]
-		public void Test_373()
-		{
-		}
-		[Test]
-		public void Test_374()
-		{
-		}
-		[Test]
-		public void Test_375()
-		{
-		}
-		[Test]
-		public void Test_376()
-		{
-		}
-		[Test]
-		public void Test_377()
-		{
-		}
-		[Test]
-		public void Test_378()
-		{
-		}
-		[Test]
-		public void Test_379()
-		{
-		}
-		[Test]
-		public void Test_380()
-		{
-		}
-		[Test]
-		public void Test_381()
-		{
-		}
-		[Test]
-		public void Test_382()
-		{
-		}
-		[Test]
-		public void Test_383()
-		{
-		}
-		[Test]
-		public void Test_384()
-		{
-		}
-		[Test]
-		public void Test_385()
-		{
-		}
-		[Test]
-		public void Test_386()
-		{
-		}
-		[Test]
-		public void Test_387()
-		{
-		}
-		[Test]
-		public void Test_388()
-		{
-		}
-		[Test]
-		public void Test_389()
-		{
-		}
-		[Test]
-		public void Test_390()
-		{
-		}
-		[Test]
-		public void Test_391()
-		{
-		}
-		[Test]
-		public void Test_392()
-		{
-		}
-		[Test]
-		public void Test_393()
-		{
-		}
-		[Test]
-		public void Test_394()
-		{
-		}
-		[Test]
-		public void Test_395()
-		{
-		}
-		[Test]
-		public void Test_396()
-		{
-		}
-		[Test]
-		public void Test_397()
-		{
-		}
-		[Test]
-		public void Test_398()
-		{
-		}
-		[Test]
-		public void Test_399()
-		{
-		}
-		[Test]
-		public void Test_400()
-		{
-		}
-		[Test]
-		public void Test_401()
-		{
-		}
-		[Test]
-		public void Test_402()
-		{
-		}
-		[Test]
-		public void Test_403()
-		{
-		}
-		[Test]
-		public void Test_404()
-		{
-		}
-		[Test]
-		public void Test_405()
-		{
-		}
-		[Test]
-		public void Test_406()
-		{
-		}
-		[Test]
-		public void Test_407()
-		{
-		}
-		[Test]
-		public void Test_408()
-		{
-		}
-		[Test]
-		public void Test_409()
-		{
-		}
-		[Test]
-		public void Test_410()
-		{
-		}
-		[Test]
-		public void Test_411()
-		{
-		}
-		[Test]
-		public void Test_412()
-		{
-		}
-		[Test]
-		public void Test_413()
-		{
-		}
-		[Test]
-		public void Test_414()
-		{
-		}
-		[Test]
-		public void Test_415()
-		{
-		}
-		[Test]
-		public void Test_416()
-		{
-		}
-		[Test]
-		public void Test_417()
-		{
-		}
-		[Test]
-		public void Test_418()
-		{
-		}
-		[Test]
-		public void Test_419()
-		{
-		}
-		[Test]
-		public void Test_420()
-		{
-		}
-		[Test]
-		public void Test_421()
-		{
-		}
-		[Test]
-		public void Test_422()
-		{
-		}
-		[Test]
-		public void Test_423()
-		{
-		}
-		[Test]
-		public void Test_424()
-		{
-		}
-		[Test]
-		public void Test_425()
-		{
-		}
-		[Test]
-		public void Test_426()
-		{
-		}
-		[Test]
-		public void Test_427()
-		{
-		}
-		[Test]
-		public void Test_428()
-		{
-		}
-		[Test]
-		public void Test_429()
-		{
-		}
-		[Test]
-		public void Test_430()
-		{
-		}
-		[Test]
-		public void Test_431()
-		{
-		}
-		[Test]
-		public void Test_432()
-		{
-		}
-		[Test]
-		public void Test_433()
-		{
-		}
-		[Test]
-		public void Test_434()
-		{
-		}
-		[Test]
-		public void Test_435()
-		{
-		}
-		[Test]
-		public void Test_436()
-		{
-		}
-		[Test]
-		public void Test_437()
-		{
-		}
-		[Test]
-		public void Test_438()
-		{
-		}
-		[Test]
-		public void Test_439()
-		{
-		}
-		[Test]
-		public void Test_440()
-		{
-		}
-		[Test]
-		public void Test_441()
-		{
-		}
-		[Test]
-		public void Test_442()
-		{
-		}
-		[Test]
-		public void Test_443()
-		{
-		}
-		[Test]
-		public void Test_444()
-		{
-		}
-		[Test]
-		public void Test_445()
-		{
-		}
-		[Test]
-		public void Test_446()
-		{
-		}
-		[Test]
-		public void Test_447()
-		{
-		}
-		[Test]
-		public void Test_448()
-		{
-		}
-		[Test]
-		public void Test_449()
-		{
-		}
-		[Test]
-		public void Test_450()
-		{
-		}
-		[Test]
-		public void Test_451()
-		{
-		}
-		[Test]
-		public void Test_452()
-		{
-		}
-		[Test]
-		public void Test_453()
-		{
-		}
-		[Test]
-		public void Test_454()
-		{
-		}
-		[Test]
-		public void Test_455()
-		{
-		}
-		[Test]
-		public void Test_456()
-		{
-		}
-		[Test]
-		public void Test_457()
-		{
-		}
-		[Test]
-		public void Test_458()
-		{
-		}
-		[Test]
-		public void Test_459()
-		{
-		}
-		[Test]
-		public void Test_460()
-		{
-		}
-		[Test]
-		public void Test_461()
-		{
-		}
-		[Test]
-		public void Test_462()
-		{
-		}
-		[Test]
-		public void Test_463()
-		{
-		}
-		[Test]
-		public void Test_464()
-		{
-		}
-		[Test]
-		public void Test_465()
-		{
-		}
-		[Test]
-		public void Test_466()
-		{
-		}
-		[Test]
-		public void Test_467()
-		{
-		}
-		[Test]
-		public void Test_468()
-		{
-		}
-		[Test]
-		public void Test_469()
-		{
-		}
-		[Test]
-		public void Test_470()
-		{
-		}
-		[Test]
-		public void Test_471()
-		{
-		}
-		[Test]
-		public void Test_472()
-		{
-		}
-		[Test]
-		public void Test_473()
-		{
-		}
-		[Test]
-		public void Test_474()
-		{
-		}
-		[Test]
-		public void Test_475()
-		{
-		}
-		[Test]
-		public void Test_476()
-		{
-		}
-		[Test]
-		public void Test_477()
-		{
-		}
-		[Test]
-		public void Test_478()
-		{
-		}
-		[Test]
-		public void Test_479()
-		{
-		}
-		[Test]
-		public void Test_480()
-		{
-		}
-		[Test]
-		public void Test_481()
-		{
-		}
-		[Test]
-		public void Test_482()
-		{
-		}
-		[Test]
-		public void Test_483()
-		{
-		}
-		[Test]
-		public void Test_484()
-		{
-		}
-		[Test]
-		public void Test_485()
-		{
-		}
-		[Test]
-		public void Test_486()
-		{
-		}
-		[Test]
-		public void Test_487()
-		{
-		}
-		[Test]
-		public void Test_488()
-		{
-		}
-		[Test]
-		public void Test_489()
-		{
-		}
-		[Test]
-		public void Test_490()
-		{
-		}
-		[Test]
-		public void Test_491()
-		{
-		}
-		[Test]
-		public void Test_492()
-		{
-		}
-		[Test]
-		public void Test_493()
-		{
-		}
-		[Test]
-		public void Test_494()
-		{
-		}
-		[Test]
-		public void Test_495()
-		{
-		}
-		[Test]
-		public void Test_496()
-		{
-		}
-		[Test]
-		public void Test_497()
-		{
-		}
-		[Test]
-		public void Test_498()
-		{
-		}
-		[Test]
-		public void Test_499()
-		{
-		}
-		[Test]
-		public void Test_500()
-		{
-		}
-		[Test]
-		public void Test_501()
-		{
-		}
-		[Test]
-		public void Test_502()
-		{
-		}
-		[Test]
-		public void Test_503()
-		{
-		}
-		[Test]
-		public void Test_504()
-		{
-		}
-		[Test]
-		public void Test_505()
-		{
-		}
-		[Test]
-		public void Test_506()
-		{
-		}
-		[Test]
-		public void Test_507()
-		{
-		}
-		[Test]
-		public void Test_508()
-		{
-		}
-		[Test]
-		public void Test_509()
-		{
-		}
-		[Test]
-		public void Test_510()
-		{
-		}
-		[Test]
-		public void Test_511()
-		{
-		}
-		[Test]
-		public void Test_512()
-		{
-		}
-		[Test]
-		public void Test_513()
-		{
-		}
-		[Test]
-		public void Test_514()
-		{
-		}
-		[Test]
-		public void Test_515()
-		{
-		}
-		[Test]
-		public void Test_516()
-		{
-		}
-		[Test]
-		public void Test_517()
-		{
-		}
-		[Test]
-		public void Test_518()
-		{
-		}
-		[Test]
-		public void Test_519()
-		{
-		}
-		[Test]
-		public void Test_520()
-		{
-		}
-		[Test]
-		public void Test_521()
-		{
-		}
-		[Test]
-		public void Test_522()
-		{
-		}
-		[Test]
-		public void Test_523()
-		{
-		}
-		[Test]
-		public void Test_524()
-		{
-		}
-		[Test]
-		public void Test_525()
-		{
-		}
-		[Test]
-		public void Test_526()
-		{
-		}
-		[Test]
-		public void Test_527()
-		{
-		}
-		[Test]
-		public void Test_528()
-		{
-		}
-		[Test]
-		public void Test_529()
-		{
-		}
-		[Test]
-		public void Test_530()
-		{
-		}
-		[Test]
-		public void Test_531()
-		{
-		}
-		[Test]
-		public void Test_532()
-		{
-		}
-		[Test]
-		public void Test_533()
-		{
-		}
-		[Test]
-		public void Test_534()
-		{
-		}
-		[Test]
-		public void Test_535()
-		{
-		}
-		[Test]
-		public void Test_536()
-		{
-		}
-		[Test]
-		public void Test_537()
-		{
-		}
-		[Test]
-		public void Test_538()
-		{
-		}
-		[Test]
-		public void Test_539()
-		{
-		}
-		[Test]
-		public void Test_540()
-		{
-		}
-		[Test]
-		public void Test_541()
-		{
-		}
-		[Test]
-		public void Test_542()
-		{
-		}
-		[Test]
-		public void Test_543()
-		{
-		}
-		[Test]
-		public void Test_544()
-		{
-		}
-		[Test]
-		public void Test_545()
-		{
-		}
-		[Test]
-		public void Test_546()
-		{
-		}
-		[Test]
-		public void Test_547()
-		{
-		}
-		[Test]
-		public void Test_548()
-		{
-		}
-		[Test]
-		public void Test_549()
-		{
-		}
-		[Test]
-		public void Test_550()
-		{
-		}
-		[Test]
-		public void Test_551()
-		{
-		}
-		[Test]
-		public void Test_552()
-		{
-		}
-		[Test]
-		public void Test_553()
-		{
-		}
-		[Test]
-		public void Test_554()
-		{
-		}
-		[Test]
-		public void Test_555()
-		{
-		}
-		[Test]
-		public void Test_556()
-		{
-		}
-		[Test]
-		public void Test_557()
-		{
-		}
-		[Test]
-		public void Test_558()
-		{
-		}
-		[Test]
-		public void Test_559()
-		{
-		}
-		[Test]
-		public void Test_560()
-		{
-		}
-		[Test]
-		public void Test_561()
-		{
-		}
-		[Test]
-		public void Test_562()
-		{
-		}
-		[Test]
-		public void Test_563()
-		{
-		}
-		[Test]
-		public void Test_564()
-		{
-		}
-		[Test]
-		public void Test_565()
-		{
-		}
-		[Test]
-		public void Test_566()
-		{
-		}
-		[Test]
-		public void Test_567()
-		{
-		}
-		[Test]
-		public void Test_568()
-		{
-		}
-		[Test]
-		public void Test_569()
-		{
-		}
-		[Test]
-		public void Test_570()
-		{
-		}
-		[Test]
-		public void Test_571()
-		{
-		}
-		[Test]
-		public void Test_572()
-		{
-		}
-		[Test]
-		public void Test_573()
-		{
-		}
-		[Test]
-		public void Test_574()
-		{
-		}
-		[Test]
-		public void Test_575()
-		{
-		}
-		[Test]
-		public void Test_576()
-		{
-		}
-		[Test]
-		public void Test_577()
-		{
-		}
-		[Test]
-		public void Test_578()
-		{
-		}
-		[Test]
-		public void Test_579()
-		{
-		}
-		[Test]
-		public void Test_580()
-		{
-		}
-		[Test]
-		public void Test_581()
-		{
-		}
-		[Test]
-		public void Test_582()
-		{
-		}
-		[Test]
-		public void Test_583()
-		{
-		}
-		[Test]
-		public void Test_584()
-		{
-		}
-		[Test]
-		public void Test_585()
-		{
-		}
-		[Test]
-		public void Test_586()
-		{
-		}
-		[Test]
-		public void Test_587()
-		{
-		}
-		[Test]
-		public void Test_588()
-		{
-		}
-		[Test]
-		public void Test_589()
-		{
-		}
-		[Test]
-		public void Test_590()
-		{
-		}
-		[Test]
-		public void Test_591()
-		{
-		}
-		[Test]
-		public void Test_592()
-		{
-		}
-		[Test]
-		public void Test_593()
-		{
-		}
-		[Test]
-		public void Test_594()
-		{
-		}
-		[Test]
-		public void Test_595()
-		{
-		}
-		[Test]
-		public void Test_596()
-		{
-		}
-		[Test]
-		public void Test_597()
-		{
-		}
-		[Test]
-		public void Test_598()
-		{
-		}
-		[Test]
-		public void Test_599()
-		{
-		}
-		[Test]
-		public void Test_600()
-		{
-		}
-		[Test]
-		public void Test_601()
-		{
-		}
-		[Test]
-		public void Test_602()
-		{
-		}
-		[Test]
-		public void Test_603()
-		{
-		}
-		[Test]
-		public void Test_604()
-		{
-		}
-		[Test]
-		public void Test_605()
-		{
-		}
-		[Test]
-		public void Test_606()
-		{
-		}
-		[Test]
-		public void Test_607()
-		{
-		}
-		[Test]
-		public void Test_608()
-		{
-		}
-		[Test]
-		public void Test_609()
-		{
-		}
-		[Test]
-		public void Test_610()
-		{
-		}
-		[Test]
-		public void Test_611()
-		{
-		}
-		[Test]
-		public void Test_612()
-		{
-		}
-		[Test]
-		public void Test_613()
-		{
-		}
-		[Test]
-		public void Test_614()
-		{
-		}
-		[Test]
-		public void Test_615()
-		{
-		}
-		[Test]
-		public void Test_616()
-		{
-		}
-		[Test]
-		public void Test_617()
-		{
-		}
-		[Test]
-		public void Test_618()
-		{
-		}
-		[Test]
-		public void Test_619()
-		{
-		}
-		[Test]
-		public void Test_620()
-		{
-		}
-		[Test]
-		public void Test_621()
-		{
-		}
-		[Test]
-		public void Test_622()
-		{
-		}
-		[Test]
-		public void Test_623()
-		{
-		}
-		[Test]
-		public void Test_624()
-		{
-		}
-		[Test]
-		public void Test_625()
-		{
-		}
-		[Test]
-		public void Test_626()
-		{
-		}
-		[Test]
-		public void Test_627()
-		{
-		}
-		[Test]
-		public void Test_628()
-		{
-		}
-		[Test]
-		public void Test_629()
-		{
-		}
-		[Test]
-		public void Test_630()
-		{
-		}
-		[Test]
-		public void Test_631()
-		{
-		}
-		[Test]
-		public void Test_632()
-		{
-		}
-		[Test]
-		public void Test_633()
-		{
-		}
-		[Test]
-		public void Test_634()
-		{
-		}
-		[Test]
-		public void Test_635()
-		{
-		}
-		[Test]
-		public void Test_636()
-		{
-		}
-		[Test]
-		public void Test_637()
-		{
-		}
-		[Test]
-		public void Test_638()
-		{
-		}
-		[Test]
-		public void Test_639()
-		{
-		}
-		[Test]
-		public void Test_640()
-		{
-		}
-		[Test]
-		public void Test_641()
-		{
-		}
-		[Test]
-		public void Test_642()
-		{
-		}
-		[Test]
-		public void Test_643()
-		{
-		}
-		[Test]
-		public void Test_644()
-		{
-		}
-		[Test]
-		public void Test_645()
-		{
-		}
-		[Test]
-		public void Test_646()
-		{
-		}
-		[Test]
-		public void Test_647()
-		{
-		}
-		[Test]
-		public void Test_648()
-		{
-		}
-		[Test]
-		public void Test_649()
-		{
-		}
-		[Test]
-		public void Test_650()
-		{
-		}
-		[Test]
-		public void Test_651()
-		{
-		}
-		[Test]
-		public void Test_652()
-		{
-		}
-		[Test]
-		public void Test_653()
-		{
-		}
-		[Test]
-		public void Test_654()
-		{
-		}
-		[Test]
-		public void Test_655()
-		{
-		}
-		[Test]
-		public void Test_656()
-		{
-		}
-		[Test]
-		public void Test_657()
-		{
-		}
-		[Test]
-		public void Test_658()
-		{
-		}
-		[Test]
-		public void Test_659()
-		{
-		}
-		[Test]
-		public void Test_660()
-		{
-		}
-		[Test]
-		public void Test_661()
-		{
-		}
-		[Test]
-		public void Test_662()
-		{
-		}
-		[Test]
-		public void Test_663()
-		{
-		}
-		[Test]
-		public void Test_664()
-		{
-		}
-		[Test]
-		public void Test_665()
-		{
-		}
-		[Test]
-		public void Test_666()
-		{
-		}
-		[Test]
-		public void Test_667()
-		{
-		}
-		[Test]
-		public void Test_668()
-		{
-		}
-		[Test]
-		public void Test_669()
-		{
-		}
-		[Test]
-		public void Test_670()
-		{
-		}
-		[Test]
-		public void Test_671()
-		{
-		}
-		[Test]
-		public void Test_672()
-		{
-		}
-		[Test]
-		public void Test_673()
-		{
-		}
-		[Test]
-		public void Test_674()
-		{
-		}
-		[Test]
-		public void Test_675()
-		{
-		}
-		[Test]
-		public void Test_676()
-		{
-		}
-		[Test]
-		public void Test_677()
-		{
-		}
-		[Test]
-		public void Test_678()
-		{
-		}
-		[Test]
-		public void Test_679()
-		{
-		}
-		[Test]
-		public void Test_680()
-		{
-		}
-		[Test]
-		public void Test_681()
-		{
-		}
-		[Test]
-		public void Test_682()
-		{
-		}
-		[Test]
-		public void Test_683()
-		{
-		}
-		[Test]
-		public void Test_684()
-		{
-		}
-		[Test]
-		public void Test_685()
-		{
-		}
-		[Test]
-		public void Test_686()
-		{
-		}
-		[Test]
-		public void Test_687()
-		{
-		}
-		[Test]
-		public void Test_688()
-		{
-		}
-		[Test]
-		public void Test_689()
-		{
-		}
-		[Test]
-		public void Test_690()
-		{
-		}
-		[Test]
-		public void Test_691()
-		{
-		}
-		[Test]
-		public void Test_692()
-		{
-		}
-		[Test]
-		public void Test_693()
-		{
-		}
-		[Test]
-		public void Test_694()
-		{
-		}
-		[Test]
-		public void Test_695()
-		{
-		}
-		[Test]
-		public void Test_696()
-		{
-		}
-		[Test]
-		public void Test_697()
-		{
-		}
-		[Test]
-		public void Test_698()
-		{
-		}
-		[Test]
-		public void Test_699()
-		{
-		}
-		[Test]
-		public void Test_700()
-		{
-		}
-		[Test]
-		public void Test_701()
-		{
-		}
-		[Test]
-		public void Test_702()
-		{
-		}
-		[Test]
-		public void Test_703()
-		{
-		}
-		[Test]
-		public void Test_704()
-		{
-		}
-		[Test]
-		public void Test_705()
-		{
-		}
-		[Test]
-		public void Test_706()
-		{
-		}
-		[Test]
-		public void Test_707()
-		{
-		}
-		[Test]
-		public void Test_708()
-		{
-		}
-		[Test]
-		public void Test_709()
-		{
-		}
-		[Test]
-		public void Test_710()
-		{
-		}
-		[Test]
-		public void Test_711()
-		{
-		}
-		[Test]
-		public void Test_712()
-		{
-		}
-		[Test]
-		public void Test_713()
-		{
-		}
-		[Test]
-		public void Test_714()
-		{
-		}
-		[Test]
-		public void Test_715()
-		{
-		}
-		[Test]
-		public void Test_716()
-		{
-		}
-		[Test]
-		public void Test_717()
-		{
-		}
-		[Test]
-		public void Test_718()
-		{
-		}
-		[Test]
-		public void Test_719()
-		{
-		}
-		[Test]
-		public void Test_720()
-		{
-		}
-		[Test]
-		public void Test_721()
-		{
-		}
-		[Test]
-		public void Test_722()
-		{
-		}
-		[Test]
-		public void Test_723()
-		{
-		}
-		[Test]
-		public void Test_724()
-		{
-		}
-		[Test]
-		public void Test_725()
-		{
-		}
-		[Test]
-		public void Test_726()
-		{
-		}
-		[Test]
-		public void Test_727()
-		{
-		}
-		[Test]
-		public void Test_728()
-		{
-		}
-		[Test]
-		public void Test_729()
-		{
-		}
-		[Test]
-		public void Test_730()
-		{
-		}
-		[Test]
-		public void Test_731()
-		{
-		}
-		[Test]
-		public void Test_732()
-		{
-		}
-		[Test]
-		public void Test_733()
-		{
-		}
-		[Test]
-		public void Test_734()
-		{
-		}
-		[Test]
-		public void Test_735()
-		{
-		}
-		[Test]
-		public void Test_736()
-		{
-		}
-		[Test]
-		public void Test_737()
-		{
-		}
-		[Test]
-		public void Test_738()
-		{
-		}
-		[Test]
-		public void Test_739()
-		{
-		}
-		[Test]
-		public void Test_740()
-		{
-		}
-		[Test]
-		public void Test_741()
-		{
-		}
-		[Test]
-		public void Test_742()
-		{
-		}
-		[Test]
-		public void Test_743()
-		{
-		}
-		[Test]
-		public void Test_744()
-		{
-		}
-		[Test]
-		public void Test_745()
-		{
-		}
-		[Test]
-		public void Test_746()
-		{
-		}
-		[Test]
-		public void Test_747()
-		{
-		}
-		[Test]
-		public void Test_748()
-		{
-		}
-		[Test]
-		public void Test_749()
-		{
-		}
-		[Test]
-		public void Test_750()
-		{
-		}
-		[Test]
-		public void Test_751()
-		{
-		}
-		[Test]
-		public void Test_752()
-		{
-		}
-		[Test]
-		public void Test_753()
-		{
-		}
-		[Test]
-		public void Test_754()
-		{
-		}
-		[Test]
-		public void Test_755()
-		{
-		}
-		[Test]
-		public void Test_756()
-		{
-		}
-		[Test]
-		public void Test_757()
-		{
-		}
-		[Test]
-		public void Test_758()
-		{
-		}
-		[Test]
-		public void Test_759()
-		{
-		}
-		[Test]
-		public void Test_760()
-		{
-		}
-		[Test]
-		public void Test_761()
-		{
-		}
-		[Test]
-		public void Test_762()
-		{
-		}
-		[Test]
-		public void Test_763()
-		{
-		}
-		[Test]
-		public void Test_764()
-		{
-		}
-		[Test]
-		public void Test_765()
-		{
-		}
-		[Test]
-		public void Test_766()
-		{
-		}
-		[Test]
-		public void Test_767()
-		{
-		}
-		[Test]
-		public void Test_768()
-		{
-		}
-		[Test]
-		public void Test_769()
-		{
-		}
-		[Test]
-		public void Test_770()
-		{
-		}
-		[Test]
-		public void Test_771()
-		{
-		}
-		[Test]
-		public void Test_772()
-		{
-		}
-		[Test]
-		public void Test_773()
-		{
-		}
-		[Test]
-		public void Test_774()
-		{
-		}
-		[Test]
-		public void Test_775()
-		{
-		}
-		[Test]
-		public void Test_776()
-		{
-		}
-		[Test]
-		public void Test_777()
-		{
-		}
-		[Test]
-		public void Test_778()
-		{
-		}
-		[Test]
-		public void Test_779()
-		{
-		}
-		[Test]
-		public void Test_780()
-		{
-		}
-		[Test]
-		public void Test_781()
-		{
-		}
-		[Test]
-		public void Test_782()
-		{
-		}
-		[Test]
-		public void Test_783()
-		{
-		}
-		[Test]
-		public void Test_784()
-		{
-		}
-		[Test]
-		public void Test_785()
-		{
-		}
-		[Test]
-		public void Test_786()
-		{
-		}
-		[Test]
-		public void Test_787()
-		{
-		}
-		[Test]
-		public void Test_788()
-		{
-		}
-		[Test]
-		public void Test_789()
-		{
-		}
-		[Test]
-		public void Test_790()
-		{
-		}
-		[Test]
-		public void Test_791()
-		{
-		}
-		[Test]
-		public void Test_792()
-		{
-		}
-		[Test]
-		public void Test_793()
-		{
-		}
-		[Test]
-		public void Test_794()
-		{
-		}
-		[Test]
-		public void Test_795()
-		{
-		}
-		[Test]
-		public void Test_796()
-		{
-		}
-		[Test]
-		public void Test_797()
-		{
-		}
-		[Test]
-		public void Test_798()
-		{
-		}
-		[Test]
-		public void Test_799()
-		{
-		}
-		[Test]
-		public void Test_800()
-		{
-		}
-		[Test]
-		public void Test_801()
-		{
-		}
-		[Test]
-		public void Test_802()
-		{
-		}
-		[Test]
-		public void Test_803()
-		{
-		}
-		[Test]
-		public void Test_804()
-		{
-		}
-		[Test]
-		public void Test_805()
-		{
-		}
-		[Test]
-		public void Test_806()
-		{
-		}
-		[Test]
-		public void Test_807()
-		{
-		}
-		[Test]
-		public void Test_808()
-		{
-		}
-		[Test]
-		public void Test_809()
-		{
-		}
-		[Test]
-		public void Test_810()
-		{
-		}
-		[Test]
-		public void Test_811()
-		{
-		}
-		[Test]
-		public void Test_812()
-		{
-		}
-		[Test]
-		public void Test_813()
-		{
-		}
-		[Test]
-		public void Test_814()
-		{
-		}
-		[Test]
-		public void Test_815()
-		{
-		}
-		[Test]
-		public void Test_816()
-		{
-		}
-		[Test]
-		public void Test_817()
-		{
-		}
-		[Test]
-		public void Test_818()
-		{
-		}
-		[Test]
-		public void Test_819()
-		{
-		}
-		[Test]
-		public void Test_820()
-		{
-		}
-		[Test]
-		public void Test_821()
-		{
-		}
-		[Test]
-		public void Test_822()
-		{
-		}
-		[Test]
-		public void Test_823()
-		{
-		}
-		[Test]
-		public void Test_824()
-		{
-		}
-		[Test]
-		public void Test_825()
-		{
-		}
-		[Test]
-		public void Test_826()
-		{
-		}
-		[Test]
-		public void Test_827()
-		{
-		}
-		[Test]
-		public void Test_828()
-		{
-		}
-		[Test]
-		public void Test_829()
-		{
-		}
-		[Test]
-		public void Test_830()
-		{
-		}
-		[Test]
-		public void Test_831()
-		{
-		}
-		[Test]
-		public void Test_832()
-		{
-		}
-		[Test]
-		public void Test_833()
-		{
-		}
-		[Test]
-		public void Test_834()
-		{
-		}
-		[Test]
-		public void Test_835()
-		{
-		}
-		[Test]
-		public void Test_836()
-		{
-		}
-		[Test]
-		public void Test_837()
-		{
-		}
-		[Test]
-		public void Test_838()
-		{
-		}
-		[Test]
-		public void Test_839()
-		{
-		}
-		[Test]
-		public void Test_840()
-		{
-		}
-		[Test]
-		public void Test_841()
-		{
-		}
-		[Test]
-		public void Test_842()
-		{
-		}
-		[Test]
-		public void Test_843()
-		{
-		}
-		[Test]
-		public void Test_844()
-		{
-		}
-		[Test]
-		public void Test_845()
-		{
-		}
-		[Test]
-		public void Test_846()
-		{
-		}
-		[Test]
-		public void Test_847()
-		{
-		}
-		[Test]
-		public void Test_848()
-		{
-		}
-		[Test]
-		public void Test_849()
-		{
-		}
-		[Test]
-		public void Test_850()
-		{
-		}
-		[Test]
-		public void Test_851()
-		{
-		}
-		[Test]
-		public void Test_852()
-		{
-		}
-		[Test]
-		public void Test_853()
-		{
-		}
-		[Test]
-		public void Test_854()
-		{
-		}
-		[Test]
-		public void Test_855()
-		{
-		}
-		[Test]
-		public void Test_856()
-		{
-		}
-		[Test]
-		public void Test_857()
-		{
-		}
-		[Test]
-		public void Test_858()
-		{
-		}
-		[Test]
-		public void Test_859()
-		{
-		}
-		[Test]
-		public void Test_860()
-		{
-		}
-		[Test]
-		public void Test_861()
-		{
-		}
-		[Test]
-		public void Test_862()
-		{
-		}
-		[Test]
-		public void Test_863()
-		{
-		}
-		[Test]
-		public void Test_864()
-		{
-		}
-		[Test]
-		public void Test_865()
-		{
-		}
-		[Test]
-		public void Test_866()
-		{
-		}
-		[Test]
-		public void Test_867()
-		{
-		}
-		[Test]
-		public void Test_868()
-		{
-		}
-		[Test]
-		public void Test_869()
-		{
-		}
-		[Test]
-		public void Test_870()
-		{
-		}
-		[Test]
-		public void Test_871()
-		{
-		}
-		[Test]
-		public void Test_872()
-		{
-		}
-		[Test]
-		public void Test_873()
-		{
-		}
-		[Test]
-		public void Test_874()
-		{
-		}
-		[Test]
-		public void Test_875()
-		{
-		}
-		[Test]
-		public void Test_876()
-		{
-		}
-		[Test]
-		public void Test_877()
-		{
-		}
-		[Test]
-		public void Test_878()
-		{
-		}
-		[Test]
-		public void Test_879()
-		{
-		}
-		[Test]
-		public void Test_880()
-		{
-		}
-		[Test]
-		public void Test_881()
-		{
-		}
-		[Test]
-		public void Test_882()
-		{
-		}
-		[Test]
-		public void Test_883()
-		{
-		}
-		[Test]
-		public void Test_884()
-		{
-		}
-		[Test]
-		public void Test_885()
-		{
-		}
-		[Test]
-		public void Test_886()
-		{
-		}
-		[Test]
-		public void Test_887()
-		{
-		}
-		[Test]
-		public void Test_888()
-		{
-		}
-		[Test]
-		public void Test_889()
-		{
-		}
-		[Test]
-		public void Test_890()
-		{
-		}
-		[Test]
-		public void Test_891()
-		{
-		}
-		[Test]
-		public void Test_892()
-		{
-		}
-		[Test]
-		public void Test_893()
-		{
-		}
-		[Test]
-		public void Test_894()
-		{
-		}
-		[Test]
-		public void Test_895()
-		{
-		}
-		[Test]
-		public void Test_896()
-		{
-		}
-		[Test]
-		public void Test_897()
-		{
-		}
-		[Test]
-		public void Test_898()
-		{
-		}
-		[Test]
-		public void Test_899()
-		{
-		}
-		[Test]
-		public void Test_900()
-		{
-		}
-		[Test]
-		public void Test_901()
-		{
-		}
-		[Test]
-		public void Test_902()
-		{
-		}
-		[Test]
-		public void Test_903()
-		{
-		}
-		[Test]
-		public void Test_904()
-		{
-		}
-		[Test]
-		public void Test_905()
-		{
-		}
-		[Test]
-		public void Test_906()
-		{
-		}
-		[Test]
-		public void Test_907()
-		{
-		}
-		[Test]
-		public void Test_908()
-		{
-		}
-		[Test]
-		public void Test_909()
-		{
-		}
-		[Test]
-		public void Test_910()
-		{
-		}
-		[Test]
-		public void Test_911()
-		{
-		}
-		[Test]
-		public void Test_912()
-		{
-		}
-		[Test]
-		public void Test_913()
-		{
-		}
-		[Test]
-		public void Test_914()
-		{
-		}
-		[Test]
-		public void Test_915()
-		{
-		}
-		[Test]
-		public void Test_916()
-		{
-		}
-		[Test]
-		public void Test_917()
-		{
-		}
-		[Test]
-		public void Test_918()
-		{
-		}
-		[Test]
-		public void Test_919()
-		{
-		}
-		[Test]
-		public void Test_920()
-		{
-		}
-		[Test]
-		public void Test_921()
-		{
-		}
-		[Test]
-		public void Test_922()
-		{
-		}
-		[Test]
-		public void Test_923()
-		{
-		}
-		[Test]
-		public void Test_924()
-		{
-		}
-		[Test]
-		public void Test_925()
-		{
-		}
-		[Test]
-		public void Test_926()
-		{
-		}
-		[Test]
-		public void Test_927()
-		{
-		}
-		[Test]
-		public void Test_928()
-		{
-		}
-		[Test]
-		public void Test_929()
-		{
-		}
-		[Test]
-		public void Test_930()
-		{
-		}
-		[Test]
-		public void Test_931()
-		{
-		}
-		[Test]
-		public void Test_932()
-		{
-		}
-		[Test]
-		public void Test_933()
-		{
-		}
-		[Test]
-		public void Test_934()
-		{
-		}
-		[Test]
-		public void Test_935()
-		{
-		}
-		[Test]
-		public void Test_936()
-		{
-		}
-		[Test]
-		public void Test_937()
-		{
-		}
-		[Test]
-		public void Test_938()
-		{
-		}
-		[Test]
-		public void Test_939()
-		{
-		}
-		[Test]
-		public void Test_940()
-		{
-		}
-		[Test]
-		public void Test_941()
-		{
-		}
-		[Test]
-		public void Test_942()
-		{
-		}
-		[Test]
-		public void Test_943()
-		{
-		}
-		[Test]
-		public void Test_944()
-		{
-		}
-		[Test]
-		public void Test_945()
-		{
-		}
-		[Test]
-		public void Test_946()
-		{
-		}
-		[Test]
-		public void Test_947()
-		{
-		}
-		[Test]
-		public void Test_948()
-		{
-		}
-		[Test]
-		public void Test_949()
-		{
-		}
-		[Test]
-		public void Test_950()
-		{
-		}
-		[Test]
-		public void Test_951()
-		{
-		}
-		[Test]
-		public void Test_952()
-		{
-		}
-		[Test]
-		public void Test_953()
-		{
-		}
-		[Test]
-		public void Test_954()
-		{
-		}
-		[Test]
-		public void Test_955()
-		{
-		}
-		[Test]
-		public void Test_956()
-		{
-		}
-		[Test]
-		public void Test_957()
-		{
-		}
-		[Test]
-		public void Test_958()
-		{
-		}
-		[Test]
-		public void Test_959()
-		{
-		}
-		[Test]
-		public void Test_960()
-		{
-		}
-		[Test]
-		public void Test_961()
-		{
-		}
-		[Test]
-		public void Test_962()
-		{
-		}
-		[Test]
-		public void Test_963()
-		{
-		}
-		[Test]
-		public void Test_964()
-		{
-		}
-		[Test]
-		public void Test_965()
-		{
-		}
-		[Test]
-		public void Test_966()
-		{
-		}
-		[Test]
-		public void Test_967()
-		{
-		}
-		[Test]
-		public void Test_968()
-		{
-		}
-		[Test]
-		public void Test_969()
-		{
-		}
-		[Test]
-		public void Test_970()
-		{
-		}
-		[Test]
-		public void Test_971()
-		{
-		}
-		[Test]
-		public void Test_972()
-		{
-		}
-		[Test]
-		public void Test_973()
-		{
-		}
-		[Test]
-		public void Test_974()
-		{
-		}
-		[Test]
-		public void Test_975()
-		{
-		}
-		[Test]
-		public void Test_976()
-		{
-		}
-		[Test]
-		public void Test_977()
-		{
-		}
-		[Test]
-		public void Test_978()
-		{
-		}
-		[Test]
-		public void Test_979()
-		{
-		}
-		[Test]
-		public void Test_980()
-		{
-		}
-		[Test]
-		public void Test_981()
-		{
-		}
-		[Test]
-		public void Test_982()
-		{
-		}
-		[Test]
-		public void Test_983()
-		{
-		}
-		[Test]
-		public void Test_984()
-		{
-		}
-		[Test]
-		public void Test_985()
-		{
-		}
-		[Test]
-		public void Test_986()
-		{
-		}
-		[Test]
-		public void Test_987()
-		{
-		}
-		[Test]
-		public void Test_988()
-		{
-		}
-		[Test]
-		public void Test_989()
-		{
-		}
-		[Test]
-		public void Test_990()
-		{
-		}
-		[Test]
-		public void Test_991()
-		{
-		}
-		[Test]
-		public void Test_992()
-		{
-		}
-		[Test]
-		public void Test_993()
-		{
-		}
-		[Test]
-		public void Test_994()
-		{
-		}
-		[Test]
-		public void Test_995()
-		{
-		}
-		[Test]
-		public void Test_996()
-		{
-		}
-		[Test]
-		public void Test_997()
-		{
-		}
-		[Test]
-		public void Test_998()
-		{
-		}
-		[Test]
-		public void Test_999()
-		{
-		}
-		[Test]
-		public void Test_1000()
-		{
-		}
-		[Test]
-		public void Test_1001()
-		{
-		}
-		[Test]
-		public void Test_1002()
-		{
-		}
-		[Test]
-		public void Test_1003()
-		{
-		}
-		[Test]
-		public void Test_1004()
-		{
-		}
-		[Test]
-		public void Test_1005()
-		{
-		}
-		[Test]
-		public void Test_1006()
-		{
-		}
-		[Test]
-		public void Test_1007()
-		{
-		}
-		[Test]
-		public void Test_1008()
-		{
-		}
-		[Test]
-		public void Test_1009()
-		{
-		}
-		[Test]
-		public void Test_1010()
-		{
-		}
-		[Test]
-		public void Test_1011()
-		{
-		}
-		[Test]
-		public void Test_1012()
-		{
-		}
-		[Test]
-		public void Test_1013()
-		{
-		}
-		[Test]
-		public void Test_1014()
-		{
-		}
-		[Test]
-		public void Test_1015()
-		{
-		}
-		[Test]
-		public void Test_1016()
-		{
-		}
-		[Test]
-		public void Test_1017()
-		{
-		}
-		[Test]
-		public void Test_1018()
-		{
-		}
-		[Test]
-		public void Test_1019()
-		{
-		}
-		[Test]
-		public void Test_1020()
-		{
-		}
-		[Test]
-		public void Test_1021()
-		{
-		}
-		[Test]
-		public void Test_1022()
-		{
-		}
-		[Test]
-		public void Test_1023()
-		{
-		}
-		[Test]
-		public void Test_1024()
-		{
-		}
-		[Test]
-		public void Test_1025()
-		{
-		}
-		[Test]
-		public void Test_1026()
-		{
-		}
-		[Test]
-		public void Test_1027()
-		{
-		}
-		[Test]
-		public void Test_1028()
-		{
-		}
-		[Test]
-		public void Test_1029()
-		{
-		}
-		[Test]
-		public void Test_1030()
-		{
-		}
-		[Test]
-		public void Test_1031()
-		{
-		}
-		[Test]
-		public void Test_1032()
-		{
-		}
-		[Test]
-		public void Test_1033()
-		{
-		}
-		[Test]
-		public void Test_1034()
-		{
-		}
-		[Test]
-		public void Test_1035()
-		{
-		}
-		[Test]
-		public void Test_1036()
-		{
-		}
-		[Test]
-		public void Test_1037()
-		{
-		}
-		[Test]
-		public void Test_1038()
-		{
-		}
-		[Test]
-		public void Test_1039()
-		{
-		}
-		[Test]
-		public void Test_1040()
-		{
-		}
-		[Test]
-		public void Test_1041()
-		{
-		}
-		[Test]
-		public void Test_1042()
-		{
-		}
-		[Test]
-		public void Test_1043()
-		{
-		}
-		[Test]
-		public void Test_1044()
-		{
-		}
-		[Test]
-		public void Test_1045()
-		{
-		}
-		[Test]
-		public void Test_1046()
-		{
-		}
-		[Test]
-		public void Test_1047()
-		{
-		}
-		[Test]
-		public void Test_1048()
-		{
-		}
-		[Test]
-		public void Test_1049()
-		{
-		}
-		[Test]
-		public void Test_1050()
-		{
-		}
-		[Test]
-		public void Test_1051()
-		{
-		}
-		[Test]
-		public void Test_1052()
-		{
-		}
-		[Test]
-		public void Test_1053()
-		{
-		}
-		[Test]
-		public void Test_1054()
-		{
-		}
-		[Test]
-		public void Test_1055()
-		{
-		}
-		[Test]
-		public void Test_1056()
-		{
-		}
-		[Test]
-		public void Test_1057()
-		{
-		}
-		[Test]
-		public void Test_1058()
-		{
-		}
-		[Test]
-		public void Test_1059()
-		{
-		}
-		[Test]
-		public void Test_1060()
-		{
-		}
-		[Test]
-		public void Test_1061()
-		{
-		}
-		[Test]
-		public void Test_1062()
-		{
-		}
-		[Test]
-		public void Test_1063()
-		{
-		}
-		[Test]
-		public void Test_1064()
-		{
-		}
-		[Test]
-		public void Test_1065()
-		{
-		}
-		[Test]
-		public void Test_1066()
-		{
-		}
-		[Test]
-		public void Test_1067()
-		{
-		}
-		[Test]
-		public void Test_1068()
-		{
-		}
-		[Test]
-		public void Test_1069()
-		{
-		}
-		[Test]
-		public void Test_1070()
-		{
-		}
-		[Test]
-		public void Test_1071()
-		{
-		}
-		[Test]
-		public void Test_1072()
-		{
-		}
-		[Test]
-		public void Test_1073()
-		{
-		}
-		[Test]
-		public void Test_1074()
-		{
-		}
-		[Test]
-		public void Test_1075()
-		{
-		}
-		[Test]
-		public void Test_1076()
-		{
-		}
-		[Test]
-		public void Test_1077()
-		{
-		}
-		[Test]
-		public void Test_1078()
-		{
-		}
-		[Test]
-		public void Test_1079()
-		{
-		}
-		[Test]
-		public void Test_1080()
-		{
-		}
-		[Test]
-		public void Test_1081()
-		{
-		}
-		[Test]
-		public void Test_1082()
-		{
-		}
-		[Test]
-		public void Test_1083()
-		{
-		}
-		[Test]
-		public void Test_1084()
-		{
-		}
-		[Test]
-		public void Test_1085()
-		{
-		}
-		[Test]
-		public void Test_1086()
-		{
-		}
-		[Test]
-		public void Test_1087()
-		{
-		}
-		[Test]
-		public void Test_1088()
-		{
-		}
-		[Test]
-		public void Test_1089()
-		{
-		}
-		[Test]
-		public void Test_1090()
-		{
-		}
-		[Test]
-		public void Test_1091()
-		{
-		}
-		[Test]
-		public void Test_1092()
-		{
-		}
-		[Test]
-		public void Test_1093()
-		{
-		}
-		[Test]
-		public void Test_1094()
-		{
-		}
-		[Test]
-		public void Test_1095()
-		{
-		}
-		[Test]
-		public void Test_1096()
-		{
-		}
-		[Test]
-		public void Test_1097()
-		{
-		}
-		[Test]
-		public void Test_1098()
-		{
-		}
-		[Test]
-		public void Test_1099()
-		{
-		}
-		[Test]
-		public void Test_1100()
-		{
-		}
-		[Test]
-		public void Test_1101()
-		{
-		}
-		[Test]
-		public void Test_1102()
-		{
-		}
-		[Test]
-		public void Test_1103()
-		{
-		}
-		[Test]
-		public void Test_1104()
-		{
-		}
-		[Test]
-		public void Test_1105()
-		{
-		}
-		[Test]
-		public void Test_1106()
-		{
-		}
-		[Test]
-		public void Test_1107()
-		{
-		}
-		[Test]
-		public void Test_1108()
-		{
-		}
-		[Test]
-		public void Test_1109()
-		{
-		}
-		[Test]
-		public void Test_1110()
-		{
-		}
-		[Test]
-		public void Test_1111()
-		{
-		}
-		[Test]
-		public void Test_1112()
-		{
-		}
-		[Test]
-		public void Test_1113()
-		{
-		}
-		[Test]
-		public void Test_1114()
-		{
-		}
-		[Test]
-		public void Test_1115()
-		{
-		}
-		[Test]
-		public void Test_1116()
-		{
-		}
-		[Test]
-		public void Test_1117()
-		{
-		}
-		[Test]
-		public void Test_1118()
-		{
-		}
-		[Test]
-		public void Test_1119()
-		{
-		}
-		[Test]
-		public void Test_1120()
-		{
-		}
-		[Test]
-		public void Test_1121()
-		{
-		}
-		[Test]
-		public void Test_1122()
-		{
-		}
-		[Test]
-		public void Test_1123()
-		{
-		}
-		[Test]
-		public void Test_1124()
-		{
-		}
-		[Test]
-		public void Test_1125()
-		{
-		}
-		[Test]
-		public void Test_1126()
-		{
-		}
-		[Test]
-		public void Test_1127()
-		{
-		}
-		[Test]
-		public void Test_1128()
-		{
-		}
-		[Test]
-		public void Test_1129()
-		{
-		}
-		[Test]
-		public void Test_1130()
-		{
-		}
-		[Test]
-		public void Test_1131()
-		{
-		}
-		[Test]
-		public void Test_1132()
-		{
-		}
-		[Test]
-		public void Test_1133()
-		{
-		}
-		[Test]
-		public void Test_1134()
-		{
-		}
-		[Test]
-		public void Test_1135()
-		{
-		}
-		[Test]
-		public void Test_1136()
-		{
-		}
-		[Test]
-		public void Test_1137()
-		{
-		}
-		[Test]
-		public void Test_1138()
-		{
-		}
-		[Test]
-		public void Test_1139()
-		{
-		}
-		[Test]
-		public void Test_1140()
-		{
-		}
-		[Test]
-		public void Test_1141()
-		{
-		}
-		[Test]
-		public void Test_1142()
-		{
-		}
-		[Test]
-		public void Test_1143()
-		{
-		}
-		[Test]
-		public void Test_1144()
-		{
-		}
-		[Test]
-		public void Test_1145()
-		{
-		}
-		[Test]
-		public void Test_1146()
-		{
-		}
-		[Test]
-		public void Test_1147()
-		{
-		}
-		[Test]
-		public void Test_1148()
-		{
-		}
-		[Test]
-		public void Test_1149()
-		{
-		}
-		[Test]
-		public void Test_1150()
-		{
-		}
-		[Test]
-		public void Test_1151()
-		{
-		}
-		[Test]
-		public void Test_1152()
-		{
-		}
-		[Test]
-		public void Test_1153()
-		{
-		}
-		[Test]
-		public void Test_1154()
-		{
-		}
-		[Test]
-		public void Test_1155()
-		{
-		}
-		[Test]
-		public void Test_1156()
-		{
-		}
-		[Test]
-		public void Test_1157()
-		{
-		}
-		[Test]
-		public void Test_1158()
-		{
-		}
-		[Test]
-		public void Test_1159()
-		{
-		}
-		[Test]
-		public void Test_1160()
-		{
-		}
-		[Test]
-		public void Test_1161()
-		{
-		}
-		[Test]
-		public void Test_1162()
-		{
-		}
-		[Test]
-		public void Test_1163()
-		{
-		}
-		[Test]
-		public void Test_1164()
-		{
-		}
-		[Test]
-		public void Test_1165()
-		{
-		}
-		[Test]
-		public void Test_1166()
-		{
-		}
-		[Test]
-		public void Test_1167()
-		{
-		}
-		[Test]
-		public void Test_1168()
-		{
-		}
-		[Test]
-		public void Test_1169()
-		{
-		}
-		[Test]
-		public void Test_1170()
-		{
-		}
-		[Test]
-		public void Test_1171()
-		{
-		}
-		[Test]
-		public void Test_1172()
-		{
-		}
-		[Test]
-		public void Test_1173()
-		{
-		}
-		[Test]
-		public void Test_1174()
-		{
-		}
-		[Test]
-		public void Test_1175()
-		{
-		}
-		[Test]
-		public void Test_1176()
-		{
-		}
-		[Test]
-		public void Test_1177()
-		{
-		}
-		[Test]
-		public void Test_1178()
-		{
-		}
-		[Test]
-		public void Test_1179()
-		{
-		}
-		[Test]
-		public void Test_1180()
-		{
-		}
-		[Test]
-		public void Test_1181()
-		{
-		}
-		[Test]
-		public void Test_1182()
-		{
-		}
-		[Test]
-		public void Test_1183()
-		{
-		}
-		[Test]
-		public void Test_1184()
-		{
-		}
-		[Test]
-		public void Test_1185()
-		{
-		}
-		[Test]
-		public void Test_1186()
-		{
-		}
-		[Test]
-		public void Test_1187()
-		{
-		}
-		[Test]
-		public void Test_1188()
-		{
-		}
-		[Test]
-		public void Test_1189()
-		{
-		}
-		[Test]
-		public void Test_1190()
-		{
-		}
-		[Test]
-		public void Test_1191()
-		{
-		}
-		[Test]
-		public void Test_1192()
-		{
-		}
-		[Test]
-		public void Test_1193()
-		{
-		}
-		[Test]
-		public void Test_1194()
-		{
-		}
-		[Test]
-		public void Test_1195()
-		{
-		}
-		[Test]
-		public void Test_1196()
-		{
-		}
-		[Test]
-		public void Test_1197()
-		{
-		}
-		[Test]
-		public void Test_1198()
-		{
-		}
-		[Test]
-		public void Test_1199()
-		{
-		}
-		[Test]
-		public void Test_1200()
-		{
-		}
-		[Test]
-		public void Test_1201()
-		{
-		}
-		[Test]
-		public void Test_1202()
-		{
-		}
-		[Test]
-		public void Test_1203()
-		{
-		}
-		[Test]
-		public void Test_1204()
-		{
-		}
-		[Test]
-		public void Test_1205()
-		{
-		}
-		[Test]
-		public void Test_1206()
-		{
-		}
-		[Test]
-		public void Test_1207()
-		{
-		}
-		[Test]
-		public void Test_1208()
-		{
-		}
-		[Test]
-		public void Test_1209()
-		{
-		}
-		[Test]
-		public void Test_1210()
-		{
-		}
-		[Test]
-		public void Test_1211()
-		{
-		}
-		[Test]
-		public void Test_1212()
-		{
-		}
-		[Test]
-		public void Test_1213()
-		{
-		}
-		[Test]
-		public void Test_1214()
-		{
-		}
-		[Test]
-		public void Test_1215()
-		{
-		}
-		[Test]
-		public void Test_1216()
-		{
-		}
-		[Test]
-		public void Test_1217()
-		{
-		}
-		[Test]
-		public void Test_1218()
-		{
-		}
-		[Test]
-		public void Test_1219()
-		{
-		}
-		[Test]
-		public void Test_1220()
-		{
-		}
-		[Test]
-		public void Test_1221()
-		{
-		}
-		[Test]
-		public void Test_1222()
-		{
-		}
-		[Test]
-		public void Test_1223()
-		{
-		}
-		[Test]
-		public void Test_1224()
-		{
-		}
-		[Test]
-		public void Test_1225()
-		{
-		}
-		[Test]
-		public void Test_1226()
-		{
-		}
-		[Test]
-		public void Test_1227()
-		{
-		}
-		[Test]
-		public void Test_1228()
-		{
-		}
-		[Test]
-		public void Test_1229()
-		{
-		}
-		[Test]
-		public void Test_1230()
-		{
-		}
-		[Test]
-		public void Test_1231()
-		{
-		}
-		[Test]
-		public void Test_1232()
-		{
-		}
-		[Test]
-		public void Test_1233()
-		{
-		}
-		[Test]
-		public void Test_1234()
-		{
-		}
-		[Test]
-		public void Test_1235()
-		{
-		}
-		[Test]
-		public void Test_1236()
-		{
-		}
-		[Test]
-		public void Test_1237()
-		{
-		}
-		[Test]
-		public void Test_1238()
-		{
-		}
-		[Test]
-		public void Test_1239()
-		{
-		}
-		[Test]
-		public void Test_1240()
-		{
-		}
-		[Test]
-		public void Test_1241()
-		{
-		}
-		[Test]
-		public void Test_1242()
-		{
-		}
-		[Test]
-		public void Test_1243()
-		{
-		}
-		[Test]
-		public void Test_1244()
-		{
-		}
-		[Test]
-		public void Test_1245()
-		{
-		}
-		[Test]
-		public void Test_1246()
-		{
-		}
-		[Test]
-		public void Test_1247()
-		{
-		}
-		[Test]
-		public void Test_1248()
-		{
-		}
-		[Test]
-		public void Test_1249()
-		{
-		}
-		[Test]
-		public void Test_1250()
-		{
-		}
-		[Test]
-		public void Test_1251()
-		{
-		}
-		[Test]
-		public void Test_1252()
-		{
-		}
-		[Test]
-		public void Test_1253()
-		{
-		}
-		[Test]
-		public void Test_1254()
-		{
-		}
-		[Test]
-		public void Test_1255()
-		{
-		}
-		[Test]
-		public void Test_1256()
-		{
-		}
-		[Test]
-		public void Test_1257()
-		{
-		}
-		[Test]
-		public void Test_1258()
-		{
-		}
-		[Test]
-		public void Test_1259()
-		{
-		}
-		[Test]
-		public void Test_1260()
-		{
-		}
-		[Test]
-		public void Test_1261()
-		{
-		}
-		[Test]
-		public void Test_1262()
-		{
-		}
-		[Test]
-		public void Test_1263()
-		{
-		}
-		[Test]
-		public void Test_1264()
-		{
-		}
-		[Test]
-		public void Test_1265()
-		{
-		}
-		[Test]
-		public void Test_1266()
-		{
-		}
-		[Test]
-		public void Test_1267()
-		{
-		}
-		[Test]
-		public void Test_1268()
-		{
-		}
-		[Test]
-		public void Test_1269()
-		{
-		}
-		[Test]
-		public void Test_1270()
-		{
-		}
-		[Test]
-		public void Test_1271()
-		{
-		}
-		[Test]
-		public void Test_1272()
-		{
-		}
-		[Test]
-		public void Test_1273()
-		{
-		}
-		[Test]
-		public void Test_1274()
-		{
-		}
-		[Test]
-		public void Test_1275()
-		{
-		}
-		[Test]
-		public void Test_1276()
-		{
-		}
-		[Test]
-		public void Test_1277()
-		{
-		}
-		[Test]
-		public void Test_1278()
-		{
-		}
-		[Test]
-		public void Test_1279()
-		{
-		}
-		[Test]
-		public void Test_1280()
-		{
-		}
-		[Test]
-		public void Test_1281()
-		{
-		}
-		[Test]
-		public void Test_1282()
-		{
-		}
-		[Test]
-		public void Test_1283()
-		{
-		}
-		[Test]
-		public void Test_1284()
-		{
-		}
-		[Test]
-		public void Test_1285()
-		{
-		}
-		[Test]
-		public void Test_1286()
-		{
-		}
-		[Test]
-		public void Test_1287()
-		{
-		}
-		[Test]
-		public void Test_1288()
-		{
-		}
-		[Test]
-		public void Test_1289()
-		{
-		}
-		[Test]
-		public void Test_1290()
-		{
-		}
-		[Test]
-		public void Test_1291()
-		{
-		}
-		[Test]
-		public void Test_1292()
-		{
-		}
-		[Test]
-		public void Test_1293()
-		{
-		}
-		[Test]
-		public void Test_1294()
-		{
-		}
-		[Test]
-		public void Test_1295()
-		{
-		}
-		[Test]
-		public void Test_1296()
-		{
-		}
-		[Test]
-		public void Test_1297()
-		{
-		}
-		[Test]
-		public void Test_1298()
-		{
-		}
-		[Test]
-		public void Test_1299()
-		{
-		}
-		[Test]
-		public void Test_1300()
-		{
-		}
-		[Test]
-		public void Test_1301()
-		{
-		}
-		[Test]
-		public void Test_1302()
-		{
-		}
-		[Test]
-		public void Test_1303()
-		{
-		}
-		[Test]
-		public void Test_1304()
-		{
-		}
-		[Test]
-		public void Test_1305()
-		{
-		}
-		[Test]
-		public void Test_1306()
-		{
-		}
-		[Test]
-		public void Test_1307()
-		{
-		}
-		[Test]
-		public void Test_1308()
-		{
-		}
-		[Test]
-		public void Test_1309()
-		{
-		}
-		[Test]
-		public void Test_1310()
-		{
-		}
-		[Test]
-		public void Test_1311()
-		{
-		}
-		[Test]
-		public void Test_1312()
-		{
-		}
-		[Test]
-		public void Test_1313()
-		{
-		}
-		[Test]
-		public void Test_1314()
-		{
-		}
-		[Test]
-		public void Test_1315()
-		{
-		}
-		[Test]
-		public void Test_1316()
-		{
-		}
-		[Test]
-		public void Test_1317()
-		{
-		}
-		[Test]
-		public void Test_1318()
-		{
-		}
-		[Test]
-		public void Test_1319()
-		{
-		}
-		[Test]
-		public void Test_1320()
-		{
-		}
-		[Test]
-		public void Test_1321()
-		{
-		}
-		[Test]
-		public void Test_1322()
-		{
-		}
-		[Test]
-		public void Test_1323()
-		{
-		}
-		[Test]
-		public void Test_1324()
-		{
-		}
-		[Test]
-		public void Test_1325()
-		{
-		}
-		[Test]
-		public void Test_1326()
-		{
-		}
-		[Test]
-		public void Test_1327()
-		{
-		}
-		[Test]
-		public void Test_1328()
-		{
-		}
-		[Test]
-		public void Test_1329()
-		{
-		}
-		[Test]
-		public void Test_1330()
-		{
-		}
-		[Test]
-		public void Test_1331()
-		{
-		}
-		[Test]
-		public void Test_1332()
-		{
-		}
-		[Test]
-		public void Test_1333()
-		{
-		}
-		[Test]
-		public void Test_1334()
-		{
-		}
-		[Test]
-		public void Test_1335()
-		{
-		}
-		[Test]
-		public void Test_1336()
-		{
-		}
-		[Test]
-		public void Test_1337()
-		{
-		}
-		[Test]
-		public void Test_1338()
-		{
-		}
-		[Test]
-		public void Test_1339()
-		{
-		}
-		[Test]
-		public void Test_1340()
-		{
-		}
-		[Test]
-		public void Test_1341()
-		{
-		}
-		[Test]
-		public void Test_1342()
-		{
-		}
-		[Test]
-		public void Test_1343()
-		{
-		}
-		[Test]
-		public void Test_1344()
-		{
-		}
-		[Test]
-		public void Test_1345()
-		{
-		}
-		[Test]
-		public void Test_1346()
-		{
-		}
-		[Test]
-		public void Test_1347()
-		{
-		}
-		[Test]
-		public void Test_1348()
-		{
-		}
-		[Test]
-		public void Test_1349()
-		{
-		}
-		[Test]
-		public void Test_1350()
-		{
-		}
-		[Test]
-		public void Test_1351()
-		{
-		}
-		[Test]
-		public void Test_1352()
-		{
-		}
-		[Test]
-		public void Test_1353()
-		{
-		}
-		[Test]
-		public void Test_1354()
-		{
-		}
-		[Test]
-		public void Test_1355()
-		{
-		}
-		[Test]
-		public void Test_1356()
-		{
-		}
-		[Test]
-		public void Test_1357()
-		{
-		}
-		[Test]
-		public void Test_1358()
-		{
-		}
-		[Test]
-		public void Test_1359()
-		{
-		}
-		[Test]
-		public void Test_1360()
-		{
-		}
-		[Test]
-		public void Test_1361()
-		{
-		}
-		[Test]
-		public void Test_1362()
-		{
-		}
-		[Test]
-		public void Test_1363()
-		{
-		}
-		[Test]
-		public void Test_1364()
-		{
-		}
-		[Test]
-		public void Test_1365()
-		{
-		}
-		[Test]
-		public void Test_1366()
-		{
-		}
-		[Test]
-		public void Test_1367()
-		{
-		}
-		[Test]
-		public void Test_1368()
-		{
-		}
-		[Test]
-		public void Test_1369()
-		{
-		}
-		[Test]
-		public void Test_1370()
-		{
-		}
-		[Test]
-		public void Test_1371()
-		{
-		}
-		[Test]
-		public void Test_1372()
-		{
-		}
-		[Test]
-		public void Test_1373()
-		{
-		}
-		[Test]
-		public void Test_1374()
-		{
-		}
-		[Test]
-		public void Test_1375()
-		{
-		}
-		[Test]
-		public void Test_1376()
-		{
-		}
-		[Test]
-		public void Test_1377()
-		{
-		}
-		[Test]
-		public void Test_1378()
-		{
-		}
-		[Test]
-		public void Test_1379()
-		{
-		}
-		[Test]
-		public void Test_1380()
-		{
-		}
-		[Test]
-		public void Test_1381()
-		{
-		}
-		[Test]
-		public void Test_1382()
-		{
-		}
-		[Test]
-		public void Test_1383()
-		{
-		}
-		[Test]
-		public void Test_1384()
-		{
-		}
-		[Test]
-		public void Test_1385()
-		{
-		}
-		[Test]
-		public void Test_1386()
-		{
-		}
-		[Test]
-		public void Test_1387()
-		{
-		}
-		[Test]
-		public void Test_1388()
-		{
-		}
-		[Test]
-		public void Test_1389()
-		{
-		}
-		[Test]
-		public void Test_1390()
-		{
-		}
-		[Test]
-		public void Test_1391()
-		{
-		}
-		[Test]
-		public void Test_1392()
-		{
-		}
-		[Test]
-		public void Test_1393()
-		{
-		}
-		[Test]
-		public void Test_1394()
-		{
-		}
-		[Test]
-		public void Test_1395()
-		{
-		}
-		[Test]
-		public void Test_1396()
-		{
-		}
-		[Test]
-		public void Test_1397()
-		{
-		}
-		[Test]
-		public void Test_1398()
-		{
-		}
-		[Test]
-		public void Test_1399()
-		{
-		}
-		[Test]
-		public void Test_1400()
-		{
-		}
-		[Test]
-		public void Test_1401()
-		{
-		}
-		[Test]
-		public void Test_1402()
-		{
-		}
-		[Test]
-		public void Test_1403()
-		{
-		}
-		[Test]
-		public void Test_1404()
-		{
-		}
-		[Test]
-		public void Test_1405()
-		{
-		}
-		[Test]
-		public void Test_1406()
-		{
-		}
-		[Test]
-		public void Test_1407()
-		{
-		}
-		[Test]
-		public void Test_1408()
-		{
-		}
-		[Test]
-		public void Test_1409()
-		{
-		}
-		[Test]
-		public void Test_1410()
-		{
-		}
-		[Test]
-		public void Test_1411()
-		{
-		}
-		[Test]
-		public void Test_1412()
-		{
-		}
-		[Test]
-		public void Test_1413()
-		{
-		}
-		[Test]
-		public void Test_1414()
-		{
-		}
-		[Test]
-		public void Test_1415()
-		{
-		}
-		[Test]
-		public void Test_1416()
-		{
-		}
-		[Test]
-		public void Test_1417()
-		{
-		}
-		[Test]
-		public void Test_1418()
-		{
-		}
-		[Test]
-		public void Test_1419()
-		{
-		}
-		[Test]
-		public void Test_1420()
-		{
-		}
-		[Test]
-		public void Test_1421()
-		{
-		}
-		[Test]
-		public void Test_1422()
-		{
-		}
-		[Test]
-		public void Test_1423()
-		{
-		}
-		[Test]
-		public void Test_1424()
-		{
-		}
-		[Test]
-		public void Test_1425()
-		{
-		}
-		[Test]
-		public void Test_1426()
-		{
-		}
-		[Test]
-		public void Test_1427()
-		{
-		}
-		[Test]
-		public void Test_1428()
-		{
-		}
-		[Test]
-		public void Test_1429()
-		{
-		}
-		[Test]
-		public void Test_1430()
-		{
-		}
-		[Test]
-		public void Test_1431()
-		{
-		}
-		[Test]
-		public void Test_1432()
-		{
-		}
-		[Test]
-		public void Test_1433()
-		{
-		}
-		[Test]
-		public void Test_1434()
-		{
-		}
-		[Test]
-		public void Test_1435()
-		{
-		}
-		[Test]
-		public void Test_1436()
-		{
-		}
-		[Test]
-		public void Test_1437()
-		{
-		}
-		[Test]
-		public void Test_1438()
-		{
-		}
-		[Test]
-		public void Test_1439()
-		{
-		}
-		[Test]
-		public void Test_1440()
-		{
-		}
-		[Test]
-		public void Test_1441()
-		{
-		}
-		[Test]
-		public void Test_1442()
-		{
-		}
-		[Test]
-		public void Test_1443()
-		{
-		}
-		[Test]
-		public void Test_1444()
-		{
-		}
-		[Test]
-		public void Test_1445()
-		{
-		}
-		[Test]
-		public void Test_1446()
-		{
-		}
-		[Test]
-		public void Test_1447()
-		{
-		}
-		[Test]
-		public void Test_1448()
-		{
-		}
-		[Test]
-		public void Test_1449()
-		{
-		}
-		[Test]
-		public void Test_1450()
-		{
-		}
-		[Test]
-		public void Test_1451()
-		{
-		}
-		[Test]
-		public void Test_1452()
-		{
-		}
-		[Test]
-		public void Test_1453()
-		{
-		}
-		[Test]
-		public void Test_1454()
-		{
-		}
-		[Test]
-		public void Test_1455()
-		{
-		}
-		[Test]
-		public void Test_1456()
-		{
-		}
-		[Test]
-		public void Test_1457()
-		{
-		}
-		[Test]
-		public void Test_1458()
-		{
-		}
-		[Test]
-		public void Test_1459()
-		{
-		}
-		[Test]
-		public void Test_1460()
-		{
-		}
-		[Test]
-		public void Test_1461()
-		{
-		}
-		[Test]
-		public void Test_1462()
-		{
-		}
-		[Test]
-		public void Test_1463()
-		{
-		}
-		[Test]
-		public void Test_1464()
-		{
-		}
-		[Test]
-		public void Test_1465()
-		{
-		}
-		[Test]
-		public void Test_1466()
-		{
-		}
-		[Test]
-		public void Test_1467()
-		{
-		}
-		[Test]
-		public void Test_1468()
-		{
-		}
-		[Test]
-		public void Test_1469()
-		{
-		}
-		[Test]
-		public void Test_1470()
-		{
-		}
-		[Test]
-		public void Test_1471()
-		{
-		}
-		[Test]
-		public void Test_1472()
-		{
-		}
-		[Test]
-		public void Test_1473()
-		{
-		}
-		[Test]
-		public void Test_1474()
-		{
-		}
-		[Test]
-		public void Test_1475()
-		{
-		}
-		[Test]
-		public void Test_1476()
-		{
-		}
-		[Test]
-		public void Test_1477()
-		{
-		}
-		[Test]
-		public void Test_1478()
-		{
-		}
-		[Test]
-		public void Test_1479()
-		{
-		}
-		[Test]
-		public void Test_1480()
-		{
-		}
-		[Test]
-		public void Test_1481()
-		{
-		}
-		[Test]
-		public void Test_1482()
-		{
-		}
-		[Test]
-		public void Test_1483()
-		{
-		}
-		[Test]
-		public void Test_1484()
-		{
-		}
-		[Test]
-		public void Test_1485()
-		{
-		}
-		[Test]
-		public void Test_1486()
-		{
-		}
-		[Test]
-		public void Test_1487()
-		{
-		}
-		[Test]
-		public void Test_1488()
-		{
-		}
-		[Test]
-		public void Test_1489()
-		{
-		}
-		[Test]
-		public void Test_1490()
-		{
-		}
-		[Test]
-		public void Test_1491()
-		{
-		}
-		[Test]
-		public void Test_1492()
-		{
-		}
-		[Test]
-		public void Test_1493()
-		{
-		}
-		[Test]
-		public void Test_1494()
-		{
-		}
-		[Test]
-		public void Test_1495()
-		{
-		}
-		[Test]
-		public void Test_1496()
-		{
-		}
-		[Test]
-		public void Test_1497()
-		{
-		}
-		[Test]
-		public void Test_1498()
-		{
-		}
-		[Test]
-		public void Test_1499()
-		{
-		}
-		[Test]
-		public void Test_1500()
-		{
-		}
-		[Test]
-		public void Test_1501()
-		{
-		}
-		[Test]
-		public void Test_1502()
-		{
-		}
-		[Test]
-		public void Test_1503()
-		{
-		}
-		[Test]
-		public void Test_1504()
-		{
-		}
-		[Test]
-		public void Test_1505()
-		{
-		}
-		[Test]
-		public void Test_1506()
-		{
-		}
-		[Test]
-		public void Test_1507()
-		{
-		}
-		[Test]
-		public void Test_1508()
-		{
-		}
-		[Test]
-		public void Test_1509()
-		{
-		}
-		[Test]
-		public void Test_1510()
-		{
-		}
-		[Test]
-		public void Test_1511()
-		{
-		}
-		[Test]
-		public void Test_1512()
-		{
-		}
-		[Test]
-		public void Test_1513()
-		{
-		}
-		[Test]
-		public void Test_1514()
-		{
-		}
-		[Test]
-		public void Test_1515()
-		{
-		}
-		[Test]
-		public void Test_1516()
-		{
-		}
-		[Test]
-		public void Test_1517()
-		{
-		}
-		[Test]
-		public void Test_1518()
-		{
-		}
-		[Test]
-		public void Test_1519()
-		{
-		}
-		[Test]
-		public void Test_1520()
-		{
-		}
-		[Test]
-		public void Test_1521()
-		{
-		}
-		[Test]
-		public void Test_1522()
-		{
-		}
-		[Test]
-		public void Test_1523()
-		{
-		}
-		[Test]
-		public void Test_1524()
-		{
-		}
-		[Test]
-		public void Test_1525()
-		{
-		}
-		[Test]
-		public void Test_1526()
-		{
-		}
-		[Test]
-		public void Test_1527()
-		{
-		}
-		[Test]
-		public void Test_1528()
-		{
-		}
-		[Test]
-		public void Test_1529()
-		{
-		}
-		[Test]
-		public void Test_1530()
-		{
-		}
-		[Test]
-		public void Test_1531()
-		{
-		}
-		[Test]
-		public void Test_1532()
-		{
-		}
-		[Test]
-		public void Test_1533()
-		{
-		}
-		[Test]
-		public void Test_1534()
-		{
-		}
-		[Test]
-		public void Test_1535()
-		{
-		}
-		[Test]
-		public void Test_1536()
-		{
-		}
-		[Test]
-		public void Test_1537()
-		{
-		}
-		[Test]
-		public void Test_1538()
-		{
-		}
-		[Test]
-		public void Test_1539()
-		{
-		}
-		[Test]
-		public void Test_1540()
-		{
-		}
-		[Test]
-		public void Test_1541()
-		{
-		}
-		[Test]
-		public void Test_1542()
-		{
-		}
-		[Test]
-		public void Test_1543()
-		{
-		}
-		[Test]
-		public void Test_1544()
-		{
-		}
-		[Test]
-		public void Test_1545()
-		{
-		}
-		[Test]
-		public void Test_1546()
-		{
-		}
-		[Test]
-		public void Test_1547()
-		{
-		}
-		[Test]
-		public void Test_1548()
-		{
-		}
-		[Test]
-		public void Test_1549()
-		{
-		}
-		[Test]
-		public void Test_1550()
-		{
-		}
-		[Test]
-		public void Test_1551()
-		{
-		}
-		[Test]
-		public void Test_1552()
-		{
-		}
-		[Test]
-		public void Test_1553()
-		{
-		}
-		[Test]
-		public void Test_1554()
-		{
-		}
-		[Test]
-		public void Test_1555()
-		{
-		}
-		[Test]
-		public void Test_1556()
-		{
-		}
-		[Test]
-		public void Test_1557()
-		{
-		}
-		[Test]
-		public void Test_1558()
-		{
-		}
-		[Test]
-		public void Test_1559()
-		{
-		}
-		[Test]
-		public void Test_1560()
-		{
-		}
-		[Test]
-		public void Test_1561()
-		{
-		}
-		[Test]
-		public void Test_1562()
-		{
-		}
-		[Test]
-		public void Test_1563()
-		{
-		}
-		[Test]
-		public void Test_1564()
-		{
-		}
-		[Test]
-		public void Test_1565()
-		{
-		}
-		[Test]
-		public void Test_1566()
-		{
-		}
-		[Test]
-		public void Test_1567()
-		{
-		}
-		[Test]
-		public void Test_1568()
-		{
-		}
-		[Test]
-		public void Test_1569()
-		{
-		}
-		[Test]
-		public void Test_1570()
-		{
-		}
-		[Test]
-		public void Test_1571()
-		{
-		}
-		[Test]
-		public void Test_1572()
-		{
-		}
-		[Test]
-		public void Test_1573()
-		{
-		}
-		[Test]
-		public void Test_1574()
-		{
-		}
-		[Test]
-		public void Test_1575()
-		{
-		}
-		[Test]
-		public void Test_1576()
-		{
-		}
-		[Test]
-		public void Test_1577()
-		{
-		}
-		[Test]
-		public void Test_1578()
-		{
-		}
-		[Test]
-		public void Test_1579()
-		{
-		}
-		[Test]
-		public void Test_1580()
-		{
-		}
-		[Test]
-		public void Test_1581()
-		{
-		}
-		[Test]
-		public void Test_1582()
-		{
-		}
-		[Test]
-		public void Test_1583()
-		{
-		}
-		[Test]
-		public void Test_1584()
-		{
-		}
-		[Test]
-		public void Test_1585()
-		{
-		}
-		[Test]
-		public void Test_1586()
-		{
-		}
-		[Test]
-		public void Test_1587()
-		{
-		}
-		[Test]
-		public void Test_1588()
-		{
-		}
-		[Test]
-		public void Test_1589()
-		{
-		}
-		[Test]
-		public void Test_1590()
-		{
-		}
-		[Test]
-		public void Test_1591()
-		{
-		}
-		[Test]
-		public void Test_1592()
-		{
-		}
-		[Test]
-		public void Test_1593()
-		{
-		}
-		[Test]
-		public void Test_1594()
-		{
-		}
-		[Test]
-		public void Test_1595()
-		{
-		}
-		[Test]
-		public void Test_1596()
-		{
-		}
-		[Test]
-		public void Test_1597()
-		{
-		}
-		[Test]
-		public void Test_1598()
-		{
-		}
-		[Test]
-		public void Test_1599()
-		{
-		}
-		[Test]
-		public void Test_1600()
-		{
-		}
-		[Test]
-		public void Test_1601()
-		{
-		}
-		[Test]
-		public void Test_1602()
-		{
-		}
-		[Test]
-		public void Test_1603()
-		{
-		}
-		[Test]
-		public void Test_1604()
-		{
-		}
-		[Test]
-		public void Test_1605()
-		{
-		}
-		[Test]
-		public void Test_1606()
-		{
-		}
-		[Test]
-		public void Test_1607()
-		{
-		}
-		[Test]
-		public void Test_1608()
-		{
-		}
-		[Test]
-		public void Test_1609()
-		{
-		}
-		[Test]
-		public void Test_1610()
-		{
-		}
-		[Test]
-		public void Test_1611()
-		{
-		}
-		[Test]
-		public void Test_1612()
-		{
-		}
-		[Test]
-		public void Test_1613()
-		{
-		}
-		[Test]
-		public void Test_1614()
-		{
-		}
-		[Test]
-		public void Test_1615()
-		{
-		}
-		[Test]
-		public void Test_1616()
-		{
-		}
-		[Test]
-		public void Test_1617()
-		{
-		}
-		[Test]
-		public void Test_1618()
-		{
-		}
-		[Test]
-		public void Test_1619()
-		{
-		}
-		[Test]
-		public void Test_1620()
-		{
-		}
-		[Test]
-		public void Test_1621()
-		{
-		}
-		[Test]
-		public void Test_1622()
-		{
-		}
-		[Test]
-		public void Test_1623()
-		{
-		}
-		[Test]
-		public void Test_1624()
-		{
-		}
-		[Test]
-		public void Test_1625()
-		{
-		}
-		[Test]
-		public void Test_1626()
-		{
-		}
-		[Test]
-		public void Test_1627()
-		{
-		}
-		[Test]
-		public void Test_1628()
-		{
-		}
-		[Test]
-		public void Test_1629()
-		{
-		}
-		[Test]
-		public void Test_1630()
-		{
-		}
-		[Test]
-		public void Test_1631()
-		{
-		}
-		[Test]
-		public void Test_1632()
-		{
-		}
-		[Test]
-		public void Test_1633()
-		{
-		}
-		[Test]
-		public void Test_1634()
-		{
-		}
-		[Test]
-		public void Test_1635()
-		{
-		}
-		[Test]
-		public void Test_1636()
-		{
-		}
-		[Test]
-		public void Test_1637()
-		{
-		}
-		[Test]
-		public void Test_1638()
-		{
-		}
-		[Test]
-		public void Test_1639()
-		{
-		}
-		[Test]
-		public void Test_1640()
-		{
-		}
-		[Test]
-		public void Test_1641()
-		{
-		}
-		[Test]
-		public void Test_1642()
-		{
-		}
-		[Test]
-		public void Test_1643()
-		{
-		}
-		[Test]
-		public void Test_1644()
-		{
-		}
-		[Test]
-		public void Test_1645()
-		{
-		}
-		[Test]
-		public void Test_1646()
-		{
-		}
-		[Test]
-		public void Test_1647()
-		{
-		}
-		[Test]
-		public void Test_1648()
-		{
-		}
-		[Test]
-		public void Test_1649()
-		{
-		}
-		[Test]
-		public void Test_1650()
-		{
-		}
-		[Test]
-		public void Test_1651()
-		{
-		}
-		[Test]
-		public void Test_1652()
-		{
-		}
-		[Test]
-		public void Test_1653()
-		{
-		}
-		[Test]
-		public void Test_1654()
-		{
-		}
-		[Test]
-		public void Test_1655()
-		{
-		}
-		[Test]
-		public void Test_1656()
-		{
-		}
-		[Test]
-		public void Test_1657()
-		{
-		}
-		[Test]
-		public void Test_1658()
-		{
-		}
-		[Test]
-		public void Test_1659()
-		{
-		}
-		[Test]
-		public void Test_1660()
-		{
-		}
-		[Test]
-		public void Test_1661()
-		{
-		}
-		[Test]
-		public void Test_1662()
-		{
-		}
-		[Test]
-		public void Test_1663()
-		{
-		}
-		[Test]
-		public void Test_1664()
-		{
-		}
-		[Test]
-		public void Test_1665()
-		{
-		}
-		[Test]
-		public void Test_1666()
-		{
-		}
-		[Test]
-		public void Test_1667()
-		{
-		}
-		[Test]
-		public void Test_1668()
-		{
-		}
-		[Test]
-		public void Test_1669()
-		{
-		}
-		[Test]
-		public void Test_1670()
-		{
-		}
-		[Test]
-		public void Test_1671()
-		{
-		}
-		[Test]
-		public void Test_1672()
-		{
-		}
-		[Test]
-		public void Test_1673()
-		{
-		}
-		[Test]
-		public void Test_1674()
-		{
-		}
-		[Test]
-		public void Test_1675()
-		{
-		}
-		[Test]
-		public void Test_1676()
-		{
-		}
-		[Test]
-		public void Test_1677()
-		{
-		}
-		[Test]
-		public void Test_1678()
-		{
-		}
-		[Test]
-		public void Test_1679()
-		{
-		}
-		[Test]
-		public void Test_1680()
-		{
-		}
-		[Test]
-		public void Test_1681()
-		{
-		}
-		[Test]
-		public void Test_1682()
-		{
-		}
-		[Test]
-		public void Test_1683()
-		{
-		}
-		[Test]
-		public void Test_1684()
-		{
-		}
-		[Test]
-		public void Test_1685()
-		{
-		}
-		[Test]
-		public void Test_1686()
-		{
-		}
-		[Test]
-		public void Test_1687()
-		{
-		}
-		[Test]
-		public void Test_1688()
-		{
-		}
-		[Test]
-		public void Test_1689()
-		{
-		}
-		[Test]
-		public void Test_1690()
-		{
-		}
-		[Test]
-		public void Test_1691()
-		{
-		}
-		[Test]
-		public void Test_1692()
-		{
-		}
-		[Test]
-		public void Test_1693()
-		{
-		}
-		[Test]
-		public void Test_1694()
-		{
-		}
-		[Test]
-		public void Test_1695()
-		{
-		}
-		[Test]
-		public void Test_1696()
-		{
-		}
-		[Test]
-		public void Test_1697()
-		{
-		}
-		[Test]
-		public void Test_1698()
-		{
-		}
-		[Test]
-		public void Test_1699()
-		{
-		}
-		[Test]
-		public void Test_1700()
-		{
-		}
-		[Test]
-		public void Test_1701()
-		{
-		}
-		[Test]
-		public void Test_1702()
-		{
-		}
-		[Test]
-		public void Test_1703()
-		{
-		}
-		[Test]
-		public void Test_1704()
-		{
-		}
-		[Test]
-		public void Test_1705()
-		{
-		}
-		[Test]
-		public void Test_1706()
-		{
-		}
-		[Test]
-		public void Test_1707()
-		{
-		}
-		[Test]
-		public void Test_1708()
-		{
-		}
-		[Test]
-		public void Test_1709()
-		{
-		}
-		[Test]
-		public void Test_1710()
-		{
-		}
-		[Test]
-		public void Test_1711()
-		{
-		}
-		[Test]
-		public void Test_1712()
-		{
-		}
-		[Test]
-		public void Test_1713()
-		{
-		}
-		[Test]
-		public void Test_1714()
-		{
-		}
-		[Test]
-		public void Test_1715()
-		{
-		}
-		[Test]
-		public void Test_1716()
-		{
-		}
-		[Test]
-		public void Test_1717()
-		{
-		}
-		[Test]
-		public void Test_1718()
-		{
-		}
-		[Test]
-		public void Test_1719()
-		{
-		}
-		[Test]
-		public void Test_1720()
-		{
-		}
-		[Test]
-		public void Test_1721()
-		{
-		}
-		[Test]
-		public void Test_1722()
-		{
-		}
-		[Test]
-		public void Test_1723()
-		{
-		}
-		[Test]
-		public void Test_1724()
-		{
-		}
-		[Test]
-		public void Test_1725()
-		{
-		}
-		[Test]
-		public void Test_1726()
-		{
-		}
-		[Test]
-		public void Test_1727()
-		{
-		}
-		[Test]
-		public void Test_1728()
-		{
-		}
-		[Test]
-		public void Test_1729()
-		{
-		}
-		[Test]
-		public void Test_1730()
-		{
-		}
-		[Test]
-		public void Test_1731()
-		{
-		}
-		[Test]
-		public void Test_1732()
-		{
-		}
-		[Test]
-		public void Test_1733()
-		{
-		}
-		[Test]
-		public void Test_1734()
-		{
-		}
-		[Test]
-		public void Test_1735()
-		{
-		}
-		[Test]
-		public void Test_1736()
-		{
-		}
-		[Test]
-		public void Test_1737()
-		{
-		}
-		[Test]
-		public void Test_1738()
-		{
-		}
-		[Test]
-		public void Test_1739()
-		{
-		}
-		[Test]
-		public void Test_1740()
-		{
-		}
-		[Test]
-		public void Test_1741()
-		{
-		}
-		[Test]
-		public void Test_1742()
-		{
-		}
-		[Test]
-		public void Test_1743()
-		{
-		}
-		[Test]
-		public void Test_1744()
-		{
-		}
-		[Test]
-		public void Test_1745()
-		{
-		}
-		[Test]
-		public void Test_1746()
-		{
-		}
-		[Test]
-		public void Test_1747()
-		{
-		}
-		[Test]
-		public void Test_1748()
-		{
-		}
-		[Test]
-		public void Test_1749()
-		{
-		}
-		[Test]
-		public void Test_1750()
-		{
-		}
-		[Test]
-		public void Test_1751()
-		{
-		}
-		[Test]
-		public void Test_1752()
-		{
-		}
-		[Test]
-		public void Test_1753()
-		{
-		}
-		[Test]
-		public void Test_1754()
-		{
-		}
-		[Test]
-		public void Test_1755()
-		{
-		}
-		[Test]
-		public void Test_1756()
-		{
-		}
-		[Test]
-		public void Test_1757()
-		{
-		}
-		[Test]
-		public void Test_1758()
-		{
-		}
-		[Test]
-		public void Test_1759()
-		{
-		}
-		[Test]
-		public void Test_1760()
-		{
-		}
-		[Test]
-		public void Test_1761()
-		{
-		}
-		[Test]
-		public void Test_1762()
-		{
-		}
-		[Test]
-		public void Test_1763()
-		{
-		}
-		[Test]
-		public void Test_1764()
-		{
-		}
-		[Test]
-		public void Test_1765()
-		{
-		}
-		[Test]
-		public void Test_1766()
-		{
-		}
-		[Test]
-		public void Test_1767()
-		{
-		}
-		[Test]
-		public void Test_1768()
-		{
-		}
-		[Test]
-		public void Test_1769()
-		{
-		}
-		[Test]
-		public void Test_1770()
-		{
-		}
-		[Test]
-		public void Test_1771()
-		{
-		}
-		[Test]
-		public void Test_1772()
-		{
-		}
-		[Test]
-		public void Test_1773()
-		{
-		}
-		[Test]
-		public void Test_1774()
-		{
-		}
-		[Test]
-		public void Test_1775()
-		{
-		}
-		[Test]
-		public void Test_1776()
-		{
-		}
-		[Test]
-		public void Test_1777()
-		{
-		}
-		[Test]
-		public void Test_1778()
-		{
-		}
-		[Test]
-		public void Test_1779()
-		{
-		}
-		[Test]
-		public void Test_1780()
-		{
-		}
-		[Test]
-		public void Test_1781()
-		{
-		}
-		[Test]
-		public void Test_1782()
-		{
-		}
-		[Test]
-		public void Test_1783()
-		{
-		}
-		[Test]
-		public void Test_1784()
-		{
-		}
-		[Test]
-		public void Test_1785()
-		{
-		}
-		[Test]
-		public void Test_1786()
-		{
-		}
-		[Test]
-		public void Test_1787()
-		{
-		}
-		[Test]
-		public void Test_1788()
-		{
-		}
-		[Test]
-		public void Test_1789()
-		{
-		}
-		[Test]
-		public void Test_1790()
-		{
-		}
-		[Test]
-		public void Test_1791()
-		{
-		}
-		[Test]
-		public void Test_1792()
-		{
-		}
-		[Test]
-		public void Test_1793()
-		{
-		}
-		[Test]
-		public void Test_1794()
-		{
-		}
-		[Test]
-		public void Test_1795()
-		{
-		}
-		[Test]
-		public void Test_1796()
-		{
-		}
-		[Test]
-		public void Test_1797()
-		{
-		}
-		[Test]
-		public void Test_1798()
-		{
-		}
-		[Test]
-		public void Test_1799()
-		{
-		}
-		[Test]
-		public void Test_1800()
-		{
-		}
-		[Test]
-		public void Test_1801()
-		{
-		}
-		[Test]
-		public void Test_1802()
-		{
-		}
-		[Test]
-		public void Test_1803()
-		{
-		}
-		[Test]
-		public void Test_1804()
-		{
-		}
-		[Test]
-		public void Test_1805()
-		{
-		}
-		[Test]
-		public void Test_1806()
-		{
-		}
-		[Test]
-		public void Test_1807()
-		{
-		}
-		[Test]
-		public void Test_1808()
-		{
-		}
-		[Test]
-		public void Test_1809()
-		{
-		}
-		[Test]
-		public void Test_1810()
-		{
-		}
-		[Test]
-		public void Test_1811()
-		{
-		}
-		[Test]
-		public void Test_1812()
-		{
-		}
-		[Test]
-		public void Test_1813()
-		{
-		}
-		[Test]
-		public void Test_1814()
-		{
-		}
-		[Test]
-		public void Test_1815()
-		{
-		}
-		[Test]
-		public void Test_1816()
-		{
-		}
-		[Test]
-		public void Test_1817()
-		{
-		}
-		[Test]
-		public void Test_1818()
-		{
-		}
-		[Test]
-		public void Test_1819()
-		{
-		}
-		[Test]
-		public void Test_1820()
-		{
-		}
-		[Test]
-		public void Test_1821()
-		{
-		}
-		[Test]
-		public void Test_1822()
-		{
-		}
-		[Test]
-		public void Test_1823()
-		{
-		}
-		[Test]
-		public void Test_1824()
-		{
-		}
-		[Test]
-		public void Test_1825()
-		{
-		}
-		[Test]
-		public void Test_1826()
-		{
-		}
-		[Test]
-		public void Test_1827()
-		{
-		}
-		[Test]
-		public void Test_1828()
-		{
-		}
-		[Test]
-		public void Test_1829()
-		{
-		}
-		[Test]
-		public void Test_1830()
-		{
-		}
-		[Test]
-		public void Test_1831()
-		{
-		}
-		[Test]
-		public void Test_1832()
-		{
-		}
-		[Test]
-		public void Test_1833()
-		{
-		}
-		[Test]
-		public void Test_1834()
-		{
-		}
-		[Test]
-		public void Test_1835()
-		{
-		}
-		[Test]
-		public void Test_1836()
-		{
-		}
-		[Test]
-		public void Test_1837()
-		{
-		}
-		[Test]
-		public void Test_1838()
-		{
-		}
-		[Test]
-		public void Test_1839()
-		{
-		}
-		[Test]
-		public void Test_1840()
-		{
-		}
-		[Test]
-		public void Test_1841()
-		{
-		}
-		[Test]
-		public void Test_1842()
-		{
-		}
-		[Test]
-		public void Test_1843()
-		{
-		}
-		[Test]
-		public void Test_1844()
-		{
-		}
-		[Test]
-		public void Test_1845()
-		{
-		}
-		[Test]
-		public void Test_1846()
-		{
-		}
-		[Test]
-		public void Test_1847()
-		{
-		}
-		[Test]
-		public void Test_1848()
-		{
-		}
-		[Test]
-		public void Test_1849()
-		{
-		}
-		[Test]
-		public void Test_1850()
-		{
-		}
-		[Test]
-		public void Test_1851()
-		{
-		}
-		[Test]
-		public void Test_1852()
-		{
-		}
-		[Test]
-		public void Test_1853()
-		{
-		}
-		[Test]
-		public void Test_1854()
-		{
-		}
-		[Test]
-		public void Test_1855()
-		{
-		}
-		[Test]
-		public void Test_1856()
-		{
-		}
-		[Test]
-		public void Test_1857()
-		{
-		}
-		[Test]
-		public void Test_1858()
-		{
-		}
-		[Test]
-		public void Test_1859()
-		{
-		}
-		[Test]
-		public void Test_1860()
-		{
-		}
-		[Test]
-		public void Test_1861()
-		{
-		}
-		[Test]
-		public void Test_1862()
-		{
-		}
-		[Test]
-		public void Test_1863()
-		{
-		}
-		[Test]
-		public void Test_1864()
-		{
-		}
-		[Test]
-		public void Test_1865()
-		{
-		}
-		[Test]
-		public void Test_1866()
-		{
-		}
-		[Test]
-		public void Test_1867()
-		{
-		}
-		[Test]
-		public void Test_1868()
-		{
-		}
-		[Test]
-		public void Test_1869()
-		{
-		}
-		[Test]
-		public void Test_1870()
-		{
-		}
-		[Test]
-		public void Test_1871()
-		{
-		}
-		[Test]
-		public void Test_1872()
-		{
-		}
-		[Test]
-		public void Test_1873()
-		{
-		}
-		[Test]
-		public void Test_1874()
-		{
-		}
-		[Test]
-		public void Test_1875()
-		{
-		}
-		[Test]
-		public void Test_1876()
-		{
-		}
-		[Test]
-		public void Test_1877()
-		{
-		}
-		[Test]
-		public void Test_1878()
-		{
-		}
-		[Test]
-		public void Test_1879()
-		{
-		}
-		[Test]
-		public void Test_1880()
-		{
-		}
-		[Test]
-		public void Test_1881()
-		{
-		}
-		[Test]
-		public void Test_1882()
-		{
-		}
-		[Test]
-		public void Test_1883()
-		{
-		}
-		[Test]
-		public void Test_1884()
-		{
-		}
-		[Test]
-		public void Test_1885()
-		{
-		}
-		[Test]
-		public void Test_1886()
-		{
-		}
-		[Test]
-		public void Test_1887()
-		{
-		}
-		[Test]
-		public void Test_1888()
-		{
-		}
-		[Test]
-		public void Test_1889()
-		{
-		}
-		[Test]
-		public void Test_1890()
-		{
-		}
-		[Test]
-		public void Test_1891()
-		{
-		}
-		[Test]
-		public void Test_1892()
-		{
-		}
-		[Test]
-		public void Test_1893()
-		{
-		}
-		[Test]
-		public void Test_1894()
-		{
-		}
-		[Test]
-		public void Test_1895()
-		{
-		}
-		[Test]
-		public void Test_1896()
-		{
-		}
-		[Test]
-		public void Test_1897()
-		{
-		}
-		[Test]
-		public void Test_1898()
-		{
-		}
-		[Test]
-		public void Test_1899()
-		{
-		}
-		[Test]
-		public void Test_1900()
-		{
-		}
-		[Test]
-		public void Test_1901()
-		{
-		}
-		[Test]
-		public void Test_1902()
-		{
-		}
-		[Test]
-		public void Test_1903()
-		{
-		}
-		[Test]
-		public void Test_1904()
-		{
-		}
-		[Test]
-		public void Test_1905()
-		{
-		}
-		[Test]
-		public void Test_1906()
-		{
-		}
-		[Test]
-		public void Test_1907()
-		{
-		}
-		[Test]
-		public void Test_1908()
-		{
-		}
-		[Test]
-		public void Test_1909()
-		{
-		}
-		[Test]
-		public void Test_1910()
-		{
-		}
-		[Test]
-		public void Test_1911()
-		{
-		}
-		[Test]
-		public void Test_1912()
-		{
-		}
-		[Test]
-		public void Test_1913()
-		{
-		}
-		[Test]
-		public void Test_1914()
-		{
-		}
-		[Test]
-		public void Test_1915()
-		{
-		}
-		[Test]
-		public void Test_1916()
-		{
-		}
-		[Test]
-		public void Test_1917()
-		{
-		}
-		[Test]
-		public void Test_1918()
-		{
-		}
-		[Test]
-		public void Test_1919()
-		{
-		}
-		[Test]
-		public void Test_1920()
-		{
-		}
-		[Test]
-		public void Test_1921()
-		{
-		}
-		[Test]
-		public void Test_1922()
-		{
-		}
-		[Test]
-		public void Test_1923()
-		{
-		}
-		[Test]
-		public void Test_1924()
-		{
-		}
-		[Test]
-		public void Test_1925()
-		{
-		}
-		[Test]
-		public void Test_1926()
-		{
-		}
-		[Test]
-		public void Test_1927()
-		{
-		}
-		[Test]
-		public void Test_1928()
-		{
-		}
-		[Test]
-		public void Test_1929()
-		{
-		}
-		[Test]
-		public void Test_1930()
-		{
-		}
-		[Test]
-		public void Test_1931()
-		{
-		}
-		[Test]
-		public void Test_1932()
-		{
-		}
-		[Test]
-		public void Test_1933()
-		{
-		}
-		[Test]
-		public void Test_1934()
-		{
-		}
-		[Test]
-		public void Test_1935()
-		{
-		}
-		[Test]
-		public void Test_1936()
-		{
-		}
-		[Test]
-		public void Test_1937()
-		{
-		}
-		[Test]
-		public void Test_1938()
-		{
-		}
-		[Test]
-		public void Test_1939()
-		{
-		}
-		[Test]
-		public void Test_1940()
-		{
-		}
-		[Test]
-		public void Test_1941()
-		{
-		}
-		[Test]
-		public void Test_1942()
-		{
-		}
-		[Test]
-		public void Test_1943()
-		{
-		}
-		[Test]
-		public void Test_1944()
-		{
-		}
-		[Test]
-		public void Test_1945()
-		{
-		}
-		[Test]
-		public void Test_1946()
-		{
-		}
-		[Test]
-		public void Test_1947()
-		{
-		}
-		[Test]
-		public void Test_1948()
-		{
-		}
-		[Test]
-		public void Test_1949()
-		{
-		}
-		[Test]
-		public void Test_1950()
-		{
-		}
-		[Test]
-		public void Test_1951()
-		{
-		}
-		[Test]
-		public void Test_1952()
-		{
-		}
-		[Test]
-		public void Test_1953()
-		{
-		}
-		[Test]
-		public void Test_1954()
-		{
-		}
-		[Test]
-		public void Test_1955()
-		{
-		}
-		[Test]
-		public void Test_1956()
-		{
-		}
-		[Test]
-		public void Test_1957()
-		{
-		}
-		[Test]
-		public void Test_1958()
-		{
-		}
-		[Test]
-		public void Test_1959()
-		{
-		}
-		[Test]
-		public void Test_1960()
-		{
-		}
-		[Test]
-		public void Test_1961()
-		{
-		}
-		[Test]
-		public void Test_1962()
-		{
-		}
-		[Test]
-		public void Test_1963()
-		{
-		}
-		[Test]
-		public void Test_1964()
-		{
-		}
-		[Test]
-		public void Test_1965()
-		{
-		}
-		[Test]
-		public void Test_1966()
-		{
-		}
-		[Test]
-		public void Test_1967()
-		{
-		}
-		[Test]
-		public void Test_1968()
-		{
-		}
-		[Test]
-		public void Test_1969()
-		{
-		}
-		[Test]
-		public void Test_1970()
-		{
-		}
-		[Test]
-		public void Test_1971()
-		{
-		}
-		[Test]
-		public void Test_1972()
-		{
-		}
-		[Test]
-		public void Test_1973()
-		{
-		}
-		[Test]
-		public void Test_1974()
-		{
-		}
-		[Test]
-		public void Test_1975()
-		{
-		}
-		[Test]
-		public void Test_1976()
-		{
-		}
-		[Test]
-		public void Test_1977()
-		{
-		}
-		[Test]
-		public void Test_1978()
-		{
-		}
-		[Test]
-		public void Test_1979()
-		{
-		}
-		[Test]
-		public void Test_1980()
-		{
-		}
-		[Test]
-		public void Test_1981()
-		{
-		}
-		[Test]
-		public void Test_1982()
-		{
-		}
-		[Test]
-		public void Test_1983()
-		{
-		}
-		[Test]
-		public void Test_1984()
-		{
-		}
-		[Test]
-		public void Test_1985()
-		{
-		}
-		[Test]
-		public void Test_1986()
-		{
-		}
-		[Test]
-		public void Test_1987()
-		{
-		}
-		[Test]
-		public void Test_1988()
-		{
-		}
-		[Test]
-		public void Test_1989()
-		{
-		}
-		[Test]
-		public void Test_1990()
-		{
-		}
-		[Test]
-		public void Test_1991()
-		{
-		}
-		[Test]
-		public void Test_1992()
-		{
-		}
-		[Test]
-		public void Test_1993()
-		{
-		}
-		[Test]
-		public void Test_1994()
-		{
-		}
-		[Test]
-		public void Test_1995()
-		{
-		}
-		[Test]
-		public void Test_1996()
-		{
-		}
-		[Test]
-		public void Test_1997()
-		{
-		}
-		[Test]
-		public void Test_1998()
-		{
-		}
-		[Test]
-		public void Test_1999()
-		{
-		}
-		[Test]
-		public void Test_2000()
-		{
-		}
-		[Test]
-		public void Test_2001()
-		{
-		}
-		[Test]
-		public void Test_2002()
-		{
-		}
-		[Test]
-		public void Test_2003()
-		{
-		}
-		[Test]
-		public void Test_2004()
-		{
-		}
-		[Test]
-		public void Test_2005()
-		{
-		}
-		[Test]
-		public void Test_2006()
-		{
-		}
-		[Test]
-		public void Test_2007()
-		{
-		}
-		[Test]
-		public void Test_2008()
-		{
-		}
-		[Test]
-		public void Test_2009()
-		{
-		}
-		[Test]
-		public void Test_2010()
-		{
-		}
-		[Test]
-		public void Test_2011()
-		{
-		}
-		[Test]
-		public void Test_2012()
-		{
-		}
-		[Test]
-		public void Test_2013()
-		{
-		}
-		[Test]
-		public void Test_2014()
-		{
-		}
-		[Test]
-		public void Test_2015()
-		{
-		}
-		[Test]
-		public void Test_2016()
-		{
-		}
-		[Test]
-		public void Test_2017()
-		{
-		}
-		[Test]
-		public void Test_2018()
-		{
-		}
-		[Test]
-		public void Test_2019()
-		{
-		}
-		[Test]
-		public void Test_2020()
-		{
-		}
-		[Test]
-		public void Test_2021()
-		{
-		}
-		[Test]
-		public void Test_2022()
-		{
-		}
-		[Test]
-		public void Test_2023()
-		{
-		}
-		[Test]
-		public void Test_2024()
-		{
-		}
-		[Test]
-		public void Test_2025()
-		{
-		}
-		[Test]
-		public void Test_2026()
-		{
-		}
-		[Test]
-		public void Test_2027()
-		{
-		}
-		[Test]
-		public void Test_2028()
-		{
-		}
-		[Test]
-		public void Test_2029()
-		{
-		}
-		[Test]
-		public void Test_2030()
-		{
-		}
-		[Test]
-		public void Test_2031()
-		{
-		}
-		[Test]
-		public void Test_2032()
-		{
-		}
-		[Test]
-		public void Test_2033()
-		{
-		}
-		[Test]
-		public void Test_2034()
-		{
-		}
-		[Test]
-		public void Test_2035()
-		{
-		}
-		[Test]
-		public void Test_2036()
-		{
-		}
-		[Test]
-		public void Test_2037()
-		{
-		}
-		[Test]
-		public void Test_2038()
-		{
-		}
-		[Test]
-		public void Test_2039()
-		{
-		}
-		[Test]
-		public void Test_2040()
-		{
-		}
-		[Test]
-		public void Test_2041()
-		{
-		}
-		[Test]
-		public void Test_2042()
-		{
-		}
-		[Test]
-		public void Test_2043()
-		{
-		}
-		[Test]
-		public void Test_2044()
-		{
-		}
-		[Test]
-		public void Test_2045()
-		{
-		}
-		[Test]
-		public void Test_2046()
-		{
-		}
-		[Test]
-		public void Test_2047()
-		{
-		}
-		[Test]
-		public void Test_2048()
-		{
-		}
-		[Test]
-		public void Test_2049()
-		{
-		}
-		[Test]
-		public void Test_2050()
-		{
-		}
-		[Test]
-		public void Test_2051()
-		{
-		}
-		[Test]
-		public void Test_2052()
-		{
-		}
-		[Test]
-		public void Test_2053()
-		{
-		}
-		[Test]
-		public void Test_2054()
-		{
-		}
-		[Test]
-		public void Test_2055()
-		{
-		}
-		[Test]
-		public void Test_2056()
-		{
-		}
-		[Test]
-		public void Test_2057()
-		{
-		}
-		[Test]
-		public void Test_2058()
-		{
-		}
-		[Test]
-		public void Test_2059()
-		{
-		}
-		[Test]
-		public void Test_2060()
-		{
-		}
-		[Test]
-		public void Test_2061()
-		{
-		}
-		[Test]
-		public void Test_2062()
-		{
-		}
-		[Test]
-		public void Test_2063()
-		{
-		}
-		[Test]
-		public void Test_2064()
-		{
-		}
-		[Test]
-		public void Test_2065()
-		{
-		}
-		[Test]
-		public void Test_2066()
-		{
-		}
-		[Test]
-		public void Test_2067()
-		{
-		}
-		[Test]
-		public void Test_2068()
-		{
-		}
-		[Test]
-		public void Test_2069()
-		{
-		}
-		[Test]
-		public void Test_2070()
-		{
-		}
-		[Test]
-		public void Test_2071()
-		{
-		}
-		[Test]
-		public void Test_2072()
-		{
-		}
-		[Test]
-		public void Test_2073()
-		{
-		}
-		[Test]
-		public void Test_2074()
-		{
-		}
-		[Test]
-		public void Test_2075()
-		{
-		}
-		[Test]
-		public void Test_2076()
-		{
-		}
-		[Test]
-		public void Test_2077()
-		{
-		}
-		[Test]
-		public void Test_2078()
-		{
-		}
-		[Test]
-		public void Test_2079()
-		{
-		}
-		[Test]
-		public void Test_2080()
-		{
-		}
-		[Test]
-		public void Test_2081()
-		{
-		}
-		[Test]
-		public void Test_2082()
-		{
-		}
-		[Test]
-		public void Test_2083()
-		{
-		}
-		[Test]
-		public void Test_2084()
-		{
-		}
-		[Test]
-		public void Test_2085()
-		{
-		}
-		[Test]
-		public void Test_2086()
-		{
-		}
-		[Test]
-		public void Test_2087()
-		{
-		}
-		[Test]
-		public void Test_2088()
-		{
-		}
-		[Test]
-		public void Test_2089()
-		{
-		}
-		[Test]
-		public void Test_2090()
-		{
-		}
-		[Test]
-		public void Test_2091()
-		{
-		}
-		[Test]
-		public void Test_2092()
-		{
-		}
-		[Test]
-		public void Test_2093()
-		{
-		}
-		[Test]
-		public void Test_2094()
-		{
-		}
-		[Test]
-		public void Test_2095()
-		{
-		}
-		[Test]
-		public void Test_2096()
-		{
-		}
-		[Test]
-		public void Test_2097()
-		{
-		}
-		[Test]
-		public void Test_2098()
-		{
-		}
-		[Test]
-		public void Test_2099()
-		{
-		}
-		[Test]
-		public void Test_2100()
-		{
-		}
-		[Test]
-		public void Test_2101()
-		{
-		}
-		[Test]
-		public void Test_2102()
-		{
-		}
-		[Test]
-		public void Test_2103()
-		{
-		}
-		[Test]
-		public void Test_2104()
-		{
-		}
-		[Test]
-		public void Test_2105()
-		{
-		}
-		[Test]
-		public void Test_2106()
-		{
-		}
-		[Test]
-		public void Test_2107()
-		{
-		}
-		[Test]
-		public void Test_2108()
-		{
-		}
-		[Test]
-		public void Test_2109()
-		{
-		}
-		[Test]
-		public void Test_2110()
-		{
-		}
-		[Test]
-		public void Test_2111()
-		{
-		}
-		[Test]
-		public void Test_2112()
-		{
-		}
-		[Test]
-		public void Test_2113()
-		{
-		}
-		[Test]
-		public void Test_2114()
-		{
-		}
-		[Test]
-		public void Test_2115()
-		{
-		}
-		[Test]
-		public void Test_2116()
-		{
-		}
-		[Test]
-		public void Test_2117()
-		{
-		}
-		[Test]
-		public void Test_2118()
-		{
-		}
-		[Test]
-		public void Test_2119()
-		{
-		}
-		[Test]
-		public void Test_2120()
-		{
-		}
-		[Test]
-		public void Test_2121()
-		{
-		}
-		[Test]
-		public void Test_2122()
-		{
-		}
-		[Test]
-		public void Test_2123()
-		{
-		}
-		[Test]
-		public void Test_2124()
-		{
-		}
-		[Test]
-		public void Test_2125()
-		{
-		}
-		[Test]
-		public void Test_2126()
-		{
-		}
-		[Test]
-		public void Test_2127()
-		{
-		}
-		[Test]
-		public void Test_2128()
-		{
-		}
-		[Test]
-		public void Test_2129()
-		{
-		}
-		[Test]
-		public void Test_2130()
-		{
-		}
-		[Test]
-		public void Test_2131()
-		{
-		}
-		[Test]
-		public void Test_2132()
-		{
-		}
-		[Test]
-		public void Test_2133()
-		{
-		}
-		[Test]
-		public void Test_2134()
-		{
-		}
-		[Test]
-		public void Test_2135()
-		{
-		}
-		[Test]
-		public void Test_2136()
-		{
-		}
-		[Test]
-		public void Test_2137()
-		{
-		}
-		[Test]
-		public void Test_2138()
-		{
-		}
-		[Test]
-		public void Test_2139()
-		{
-		}
-		[Test]
-		public void Test_2140()
-		{
-		}
-		[Test]
-		public void Test_2141()
-		{
-		}
-		[Test]
-		public void Test_2142()
-		{
-		}
-		[Test]
-		public void Test_2143()
-		{
-		}
-		[Test]
-		public void Test_2144()
-		{
-		}
-		[Test]
-		public void Test_2145()
-		{
-		}
-		[Test]
-		public void Test_2146()
-		{
-		}
-		[Test]
-		public void Test_2147()
-		{
-		}
-		[Test]
-		public void Test_2148()
-		{
-		}
-		[Test]
-		public void Test_2149()
-		{
-		}
-		[Test]
-		public void Test_2150()
-		{
-		}
-		[Test]
-		public void Test_2151()
-		{
-		}
-		[Test]
-		public void Test_2152()
-		{
-		}
-		[Test]
-		public void Test_2153()
-		{
-		}
-		[Test]
-		public void Test_2154()
-		{
-		}
-		[Test]
-		public void Test_2155()
-		{
-		}
-		[Test]
-		public void Test_2156()
-		{
-		}
-		[Test]
-		public void Test_2157()
-		{
-		}
-		[Test]
-		public void Test_2158()
-		{
-		}
-		[Test]
-		public void Test_2159()
-		{
-		}
-		[Test]
-		public void Test_2160()
-		{
-		}
-		[Test]
-		public void Test_2161()
-		{
-		}
-		[Test]
-		public void Test_2162()
-		{
-		}
-		[Test]
-		public void Test_2163()
-		{
-		}
-		[Test]
-		public void Test_2164()
-		{
-		}
-		[Test]
-		public void Test_2165()
-		{
-		}
-		[Test]
-		public void Test_2166()
-		{
-		}
-		[Test]
-		public void Test_2167()
-		{
-		}
-		[Test]
-		public void Test_2168()
-		{
-		}
-		[Test]
-		public void Test_2169()
-		{
-		}
-		[Test]
-		public void Test_2170()
-		{
-		}
-		[Test]
-		public void Test_2171()
-		{
-		}
-		[Test]
-		public void Test_2172()
-		{
-		}
-		[Test]
-		public void Test_2173()
-		{
-		}
-		[Test]
-		public void Test_2174()
-		{
-		}
-		[Test]
-		public void Test_2175()
-		{
-		}
-		[Test]
-		public void Test_2176()
-		{
-		}
-		[Test]
-		public void Test_2177()
-		{
-		}
-		[Test]
-		public void Test_2178()
-		{
-		}
-		[Test]
-		public void Test_2179()
-		{
-		}
-		[Test]
-		public void Test_2180()
-		{
-		}
-		[Test]
-		public void Test_2181()
-		{
-		}
-		[Test]
-		public void Test_2182()
-		{
-		}
-		[Test]
-		public void Test_2183()
-		{
-		}
-		[Test]
-		public void Test_2184()
-		{
-		}
-		[Test]
-		public void Test_2185()
-		{
-		}
-		[Test]
-		public void Test_2186()
-		{
-		}
-		[Test]
-		public void Test_2187()
-		{
-		}
-		[Test]
-		public void Test_2188()
-		{
-		}
-		[Test]
-		public void Test_2189()
-		{
-		}
-		[Test]
-		public void Test_2190()
-		{
-		}
-		[Test]
-		public void Test_2191()
-		{
-		}
-		[Test]
-		public void Test_2192()
-		{
-		}
-		[Test]
-		public void Test_2193()
-		{
-		}
-		[Test]
-		public void Test_2194()
-		{
-		}
-		[Test]
-		public void Test_2195()
-		{
-		}
-		[Test]
-		public void Test_2196()
-		{
-		}
-		[Test]
-		public void Test_2197()
-		{
-		}
-		[Test]
-		public void Test_2198()
-		{
-		}
-		[Test]
-		public void Test_2199()
-		{
-		}
-		[Test]
-		public void Test_2200()
-		{
-		}
-		[Test]
-		public void Test_2201()
-		{
-		}
-		[Test]
-		public void Test_2202()
-		{
-		}
-		[Test]
-		public void Test_2203()
-		{
-		}
-		[Test]
-		public void Test_2204()
-		{
-		}
-		[Test]
-		public void Test_2205()
-		{
-		}
-		[Test]
-		public void Test_2206()
-		{
-		}
-		[Test]
-		public void Test_2207()
-		{
-		}
-		[Test]
-		public void Test_2208()
-		{
-		}
-		[Test]
-		public void Test_2209()
-		{
-		}
-		[Test]
-		public void Test_2210()
-		{
-		}
-		[Test]
-		public void Test_2211()
-		{
-		}
-		[Test]
-		public void Test_2212()
-		{
-		}
-		[Test]
-		public void Test_2213()
-		{
-		}
-		[Test]
-		public void Test_2214()
-		{
-		}
-		[Test]
-		public void Test_2215()
-		{
-		}
-		[Test]
-		public void Test_2216()
-		{
-		}
-		[Test]
-		public void Test_2217()
-		{
-		}
-		[Test]
-		public void Test_2218()
-		{
-		}
-		[Test]
-		public void Test_2219()
-		{
-		}
-		[Test]
-		public void Test_2220()
-		{
-		}
-		[Test]
-		public void Test_2221()
-		{
-		}
-		[Test]
-		public void Test_2222()
-		{
-		}
-		[Test]
-		public void Test_2223()
-		{
-		}
-		[Test]
-		public void Test_2224()
-		{
-		}
-		[Test]
-		public void Test_2225()
-		{
-		}
-		[Test]
-		public void Test_2226()
-		{
-		}
-		[Test]
-		public void Test_2227()
-		{
-		}
-		[Test]
-		public void Test_2228()
-		{
-		}
-		[Test]
-		public void Test_2229()
-		{
-		}
-		[Test]
-		public void Test_2230()
-		{
-		}
-		[Test]
-		public void Test_2231()
-		{
-		}
-		[Test]
-		public void Test_2232()
-		{
-		}
-		[Test]
-		public void Test_2233()
-		{
-		}
-		[Test]
-		public void Test_2234()
-		{
-		}
-		[Test]
-		public void Test_2235()
-		{
-		}
-		[Test]
-		public void Test_2236()
-		{
-		}
-		[Test]
-		public void Test_2237()
-		{
-		}
-		[Test]
-		public void Test_2238()
-		{
-		}
-		[Test]
-		public void Test_2239()
-		{
-		}
-		[Test]
-		public void Test_2240()
-		{
-		}
-		[Test]
-		public void Test_2241()
-		{
-		}
-		[Test]
-		public void Test_2242()
-		{
-		}
-		[Test]
-		public void Test_2243()
-		{
-		}
-		[Test]
-		public void Test_2244()
-		{
-		}
-		[Test]
-		public void Test_2245()
-		{
-		}
-		[Test]
-		public void Test_2246()
-		{
-		}
-		[Test]
-		public void Test_2247()
-		{
-		}
-		[Test]
-		public void Test_2248()
-		{
-		}
-		[Test]
-		public void Test_2249()
-		{
-		}
-		[Test]
-		public void Test_2250()
-		{
-		}
-		[Test]
-		public void Test_2251()
-		{
-		}
-		[Test]
-		public void Test_2252()
-		{
-		}
-		[Test]
-		public void Test_2253()
-		{
-		}
-		[Test]
-		public void Test_2254()
-		{
-		}
-		[Test]
-		public void Test_2255()
-		{
-		}
-		[Test]
-		public void Test_2256()
-		{
-		}
-		[Test]
-		public void Test_2257()
-		{
-		}
-		[Test]
-		public void Test_2258()
-		{
-		}
-		[Test]
-		public void Test_2259()
-		{
-		}
-		[Test]
-		public void Test_2260()
-		{
-		}
-		[Test]
-		public void Test_2261()
-		{
-		}
-		[Test]
-		public void Test_2262()
-		{
-		}
-		[Test]
-		public void Test_2263()
-		{
-		}
-		[Test]
-		public void Test_2264()
-		{
-		}
-		[Test]
-		public void Test_2265()
-		{
-		}
-		[Test]
-		public void Test_2266()
-		{
-		}
-		[Test]
-		public void Test_2267()
-		{
-		}
-		[Test]
-		public void Test_2268()
-		{
-		}
-		[Test]
-		public void Test_2269()
-		{
-		}
-		[Test]
-		public void Test_2270()
-		{
-		}
-		[Test]
-		public void Test_2271()
-		{
-		}
-		[Test]
-		public void Test_2272()
-		{
-		}
-		[Test]
-		public void Test_2273()
-		{
-		}
-		[Test]
-		public void Test_2274()
-		{
-		}
-		[Test]
-		public void Test_2275()
-		{
-		}
-		[Test]
-		public void Test_2276()
-		{
-		}
-		[Test]
-		public void Test_2277()
-		{
-		}
-		[Test]
-		public void Test_2278()
-		{
-		}
-		[Test]
-		public void Test_2279()
-		{
-		}
-		[Test]
-		public void Test_2280()
-		{
-		}
-		[Test]
-		public void Test_2281()
-		{
-		}
-		[Test]
-		public void Test_2282()
-		{
-		}
-		[Test]
-		public void Test_2283()
-		{
-		}
-		[Test]
-		public void Test_2284()
-		{
-		}
-		[Test]
-		public void Test_2285()
-		{
-		}
-		[Test]
-		public void Test_2286()
-		{
-		}
-		[Test]
-		public void Test_2287()
-		{
-		}
-		[Test]
-		public void Test_2288()
-		{
-		}
-		[Test]
-		public void Test_2289()
-		{
-		}
-		[Test]
-		public void Test_2290()
-		{
-		}
-		[Test]
-		public void Test_2291()
-		{
-		}
-		[Test]
-		public void Test_2292()
-		{
-		}
-		[Test]
-		public void Test_2293()
-		{
-		}
-		[Test]
-		public void Test_2294()
-		{
-		}
-		[Test]
-		public void Test_2295()
-		{
-		}
-		[Test]
-		public void Test_2296()
-		{
-		}
-		[Test]
-		public void Test_2297()
-		{
-		}
-		[Test]
-		public void Test_2298()
-		{
-		}
-		[Test]
-		public void Test_2299()
-		{
-		}
-		[Test]
-		public void Test_2300()
-		{
-		}
-		[Test]
-		public void Test_2301()
-		{
-		}
-		[Test]
-		public void Test_2302()
-		{
-		}
-		[Test]
-		public void Test_2303()
-		{
-		}
-		[Test]
-		public void Test_2304()
-		{
-		}
-		[Test]
-		public void Test_2305()
-		{
-		}
-		[Test]
-		public void Test_2306()
-		{
-		}
-		[Test]
-		public void Test_2307()
-		{
-		}
-		[Test]
-		public void Test_2308()
-		{
-		}
-		[Test]
-		public void Test_2309()
-		{
-		}
-		[Test]
-		public void Test_2310()
-		{
-		}
-		[Test]
-		public void Test_2311()
-		{
-		}
-		[Test]
-		public void Test_2312()
-		{
-		}
-		[Test]
-		public void Test_2313()
-		{
-		}
-		[Test]
-		public void Test_2314()
-		{
-		}
-		[Test]
-		public void Test_2315()
-		{
-		}
-		[Test]
-		public void Test_2316()
-		{
-		}
-		[Test]
-		public void Test_2317()
-		{
-		}
-		[Test]
-		public void Test_2318()
-		{
-		}
-		[Test]
-		public void Test_2319()
-		{
-		}
-		[Test]
-		public void Test_2320()
-		{
-		}
-		[Test]
-		public void Test_2321()
-		{
-		}
-		[Test]
-		public void Test_2322()
-		{
-		}
-		[Test]
-		public void Test_2323()
-		{
-		}
-		[Test]
-		public void Test_2324()
-		{
-		}
-		[Test]
-		public void Test_2325()
-		{
-		}
-		[Test]
-		public void Test_2326()
-		{
-		}
-		[Test]
-		public void Test_2327()
-		{
-		}
-		[Test]
-		public void Test_2328()
-		{
-		}
-		[Test]
-		public void Test_2329()
-		{
-		}
-		[Test]
-		public void Test_2330()
-		{
-		}
-		[Test]
-		public void Test_2331()
-		{
-		}
-		[Test]
-		public void Test_2332()
-		{
-		}
-		[Test]
-		public void Test_2333()
-		{
-		}
-		[Test]
-		public void Test_2334()
-		{
-		}
-		[Test]
-		public void Test_2335()
-		{
-		}
-		[Test]
-		public void Test_2336()
-		{
-		}
-		[Test]
-		public void Test_2337()
-		{
-		}
-		[Test]
-		public void Test_2338()
-		{
-		}
-		[Test]
-		public void Test_2339()
-		{
-		}
-		[Test]
-		public void Test_2340()
-		{
-		}
-		[Test]
-		public void Test_2341()
-		{
-		}
-		[Test]
-		public void Test_2342()
-		{
-		}
-		[Test]
-		public void Test_2343()
-		{
-		}
-		[Test]
-		public void Test_2344()
-		{
-		}
-		[Test]
-		public void Test_2345()
-		{
-		}
-		[Test]
-		public void Test_2346()
-		{
-		}
-		[Test]
-		public void Test_2347()
-		{
-		}
-		[Test]
-		public void Test_2348()
-		{
-		}
-		[Test]
-		public void Test_2349()
-		{
-		}
-		[Test]
-		public void Test_2350()
-		{
-		}
-		[Test]
-		public void Test_2351()
-		{
-		}
-		[Test]
-		public void Test_2352()
-		{
-		}
-		[Test]
-		public void Test_2353()
-		{
-		}
-		[Test]
-		public void Test_2354()
-		{
-		}
-		[Test]
-		public void Test_2355()
-		{
-		}
-		[Test]
-		public void Test_2356()
-		{
-		}
-		[Test]
-		public void Test_2357()
-		{
-		}
-		[Test]
-		public void Test_2358()
-		{
-		}
-		[Test]
-		public void Test_2359()
-		{
-		}
-		[Test]
-		public void Test_2360()
-		{
-		}
-		[Test]
-		public void Test_2361()
-		{
-		}
-		[Test]
-		public void Test_2362()
-		{
-		}
-		[Test]
-		public void Test_2363()
-		{
-		}
-		[Test]
-		public void Test_2364()
-		{
-		}
-		[Test]
-		public void Test_2365()
-		{
-		}
-		[Test]
-		public void Test_2366()
-		{
-		}
-		[Test]
-		public void Test_2367()
-		{
-		}
-		[Test]
-		public void Test_2368()
-		{
-		}
-		[Test]
-		public void Test_2369()
-		{
-		}
-		[Test]
-		public void Test_2370()
-		{
-		}
-		[Test]
-		public void Test_2371()
-		{
-		}
-		[Test]
-		public void Test_2372()
-		{
-		}
-		[Test]
-		public void Test_2373()
-		{
-		}
-		[Test]
-		public void Test_2374()
-		{
-		}
-		[Test]
-		public void Test_2375()
-		{
-		}
-		[Test]
-		public void Test_2376()
-		{
-		}
-		[Test]
-		public void Test_2377()
-		{
-		}
-		[Test]
-		public void Test_2378()
-		{
-		}
-		[Test]
-		public void Test_2379()
-		{
-		}
-		[Test]
-		public void Test_2380()
-		{
-		}
-		[Test]
-		public void Test_2381()
-		{
-		}
-		[Test]
-		public void Test_2382()
-		{
-		}
-		[Test]
-		public void Test_2383()
-		{
-		}
-		[Test]
-		public void Test_2384()
-		{
-		}
-		[Test]
-		public void Test_2385()
-		{
-		}
-		[Test]
-		public void Test_2386()
-		{
-		}
-		[Test]
-		public void Test_2387()
-		{
-		}
-		[Test]
-		public void Test_2388()
-		{
-		}
-		[Test]
-		public void Test_2389()
-		{
-		}
-		[Test]
-		public void Test_2390()
-		{
-		}
-		[Test]
-		public void Test_2391()
-		{
-		}
-		[Test]
-		public void Test_2392()
-		{
-		}
-		[Test]
-		public void Test_2393()
-		{
-		}
-		[Test]
-		public void Test_2394()
-		{
-		}
-		[Test]
-		public void Test_2395()
-		{
-		}
-		[Test]
-		public void Test_2396()
-		{
-		}
-		[Test]
-		public void Test_2397()
-		{
-		}
-		[Test]
-		public void Test_2398()
-		{
-		}
-		[Test]
-		public void Test_2399()
-		{
-		}
-		[Test]
-		public void Test_2400()
-		{
-		}
-		[Test]
-		public void Test_2401()
-		{
-		}
-		[Test]
-		public void Test_2402()
-		{
-		}
-		[Test]
-		public void Test_2403()
-		{
-		}
-		[Test]
-		public void Test_2404()
-		{
-		}
-		[Test]
-		public void Test_2405()
-		{
-		}
-		[Test]
-		public void Test_2406()
-		{
-		}
-		[Test]
-		public void Test_2407()
-		{
-		}
-		[Test]
-		public void Test_2408()
-		{
-		}
-		[Test]
-		public void Test_2409()
-		{
-		}
-		[Test]
-		public void Test_2410()
-		{
-		}
-		[Test]
-		public void Test_2411()
-		{
-		}
-		[Test]
-		public void Test_2412()
-		{
-		}
-		[Test]
-		public void Test_2413()
-		{
-		}
-		[Test]
-		public void Test_2414()
-		{
-		}
-		[Test]
-		public void Test_2415()
-		{
-		}
-		[Test]
-		public void Test_2416()
-		{
-		}
-		[Test]
-		public void Test_2417()
-		{
-		}
-		[Test]
-		public void Test_2418()
-		{
-		}
-		[Test]
-		public void Test_2419()
-		{
-		}
-		[Test]
-		public void Test_2420()
-		{
-		}
-		[Test]
-		public void Test_2421()
-		{
-		}
-		[Test]
-		public void Test_2422()
-		{
-		}
-		[Test]
-		public void Test_2423()
-		{
-		}
-		[Test]
-		public void Test_2424()
-		{
-		}
-		[Test]
-		public void Test_2425()
-		{
-		}
-		[Test]
-		public void Test_2426()
-		{
-		}
-		[Test]
-		public void Test_2427()
-		{
-		}
-		[Test]
-		public void Test_2428()
-		{
-		}
-		[Test]
-		public void Test_2429()
-		{
-		}
-		[Test]
-		public void Test_2430()
-		{
-		}
-		[Test]
-		public void Test_2431()
-		{
-		}
-		[Test]
-		public void Test_2432()
-		{
-		}
-		[Test]
-		public void Test_2433()
-		{
-		}
-		[Test]
-		public void Test_2434()
-		{
-		}
-		[Test]
-		public void Test_2435()
-		{
-		}
-		[Test]
-		public void Test_2436()
-		{
-		}
-		[Test]
-		public void Test_2437()
-		{
-		}
-		[Test]
-		public void Test_2438()
-		{
-		}
-		[Test]
-		public void Test_2439()
-		{
-		}
-		[Test]
-		public void Test_2440()
-		{
-		}
-		[Test]
-		public void Test_2441()
-		{
-		}
-		[Test]
-		public void Test_2442()
-		{
-		}
-		[Test]
-		public void Test_2443()
-		{
-		}
-		[Test]
-		public void Test_2444()
-		{
-		}
-		[Test]
-		public void Test_2445()
-		{
-		}
-		[Test]
-		public void Test_2446()
-		{
-		}
-		[Test]
-		public void Test_2447()
-		{
-		}
-		[Test]
-		public void Test_2448()
-		{
-		}
-		[Test]
-		public void Test_2449()
-		{
-		}
-		[Test]
-		public void Test_2450()
-		{
-		}
-		[Test]
-		public void Test_2451()
-		{
-		}
-		[Test]
-		public void Test_2452()
-		{
-		}
-		[Test]
-		public void Test_2453()
-		{
-		}
-		[Test]
-		public void Test_2454()
-		{
-		}
-		[Test]
-		public void Test_2455()
-		{
-		}
-		[Test]
-		public void Test_2456()
-		{
-		}
-		[Test]
-		public void Test_2457()
-		{
-		}
-		[Test]
-		public void Test_2458()
-		{
-		}
-		[Test]
-		public void Test_2459()
-		{
-		}
-		[Test]
-		public void Test_2460()
-		{
-		}
-		[Test]
-		public void Test_2461()
-		{
-		}
-		[Test]
-		public void Test_2462()
-		{
-		}
-		[Test]
-		public void Test_2463()
-		{
-		}
-		[Test]
-		public void Test_2464()
-		{
-		}
-		[Test]
-		public void Test_2465()
-		{
-		}
-		[Test]
-		public void Test_2466()
-		{
-		}
-		[Test]
-		public void Test_2467()
-		{
-		}
-		[Test]
-		public void Test_2468()
-		{
-		}
-		[Test]
-		public void Test_2469()
-		{
-		}
-		[Test]
-		public void Test_2470()
-		{
-		}
-		[Test]
-		public void Test_2471()
-		{
-		}
-		[Test]
-		public void Test_2472()
-		{
-		}
-		[Test]
-		public void Test_2473()
-		{
-		}
-		[Test]
-		public void Test_2474()
-		{
-		}
-		[Test]
-		public void Test_2475()
-		{
-		}
-		[Test]
-		public void Test_2476()
-		{
-		}
-		[Test]
-		public void Test_2477()
-		{
-		}
-		[Test]
-		public void Test_2478()
-		{
-		}
-		[Test]
-		public void Test_2479()
-		{
-		}
-		[Test]
-		public void Test_2480()
-		{
-		}
-		[Test]
-		public void Test_2481()
-		{
-		}
-		[Test]
-		public void Test_2482()
-		{
-		}
-		[Test]
-		public void Test_2483()
-		{
-		}
-		[Test]
-		public void Test_2484()
-		{
-		}
-		[Test]
-		public void Test_2485()
-		{
-		}
-		[Test]
-		public void Test_2486()
-		{
-		}
-		[Test]
-		public void Test_2487()
-		{
-		}
-		[Test]
-		public void Test_2488()
-		{
-		}
-		[Test]
-		public void Test_2489()
-		{
-		}
-		[Test]
-		public void Test_2490()
-		{
-		}
-		[Test]
-		public void Test_2491()
-		{
-		}
-		[Test]
-		public void Test_2492()
-		{
-		}
-		[Test]
-		public void Test_2493()
-		{
-		}
-		[Test]
-		public void Test_2494()
-		{
-		}
-		[Test]
-		public void Test_2495()
-		{
-		}
-		[Test]
-		public void Test_2496()
-		{
-		}
-		[Test]
-		public void Test_2497()
-		{
-		}
-		[Test]
-		public void Test_2498()
-		{
-		}
-		[Test]
-		public void Test_2499()
-		{
-		}
-		[Test]
-		public void Test_2500()
-		{
-		}
-		[Test]
-		public void Test_2501()
-		{
-		}
-		[Test]
-		public void Test_2502()
-		{
-		}
-		[Test]
-		public void Test_2503()
-		{
-		}
-		[Test]
-		public void Test_2504()
-		{
-		}
-		[Test]
-		public void Test_2505()
-		{
-		}
-		[Test]
-		public void Test_2506()
-		{
-		}
-		[Test]
-		public void Test_2507()
-		{
-		}
-		[Test]
-		public void Test_2508()
-		{
-		}
-		[Test]
-		public void Test_2509()
-		{
-		}
-		[Test]
-		public void Test_2510()
-		{
-		}
-		[Test]
-		public void Test_2511()
-		{
-		}
-		[Test]
-		public void Test_2512()
-		{
-		}
-		[Test]
-		public void Test_2513()
-		{
-		}
-		[Test]
-		public void Test_2514()
-		{
-		}
-		[Test]
-		public void Test_2515()
-		{
-		}
-		[Test]
-		public void Test_2516()
-		{
-		}
-		[Test]
-		public void Test_2517()
-		{
-		}
-		[Test]
-		public void Test_2518()
-		{
-		}
-		[Test]
-		public void Test_2519()
-		{
-		}
-		[Test]
-		public void Test_2520()
-		{
-		}
-		[Test]
-		public void Test_2521()
-		{
-		}
-		[Test]
-		public void Test_2522()
-		{
-		}
-		[Test]
-		public void Test_2523()
-		{
-		}
-		[Test]
-		public void Test_2524()
-		{
-		}
-		[Test]
-		public void Test_2525()
-		{
-		}
-		[Test]
-		public void Test_2526()
-		{
-		}
-		[Test]
-		public void Test_2527()
-		{
-		}
-		[Test]
-		public void Test_2528()
-		{
-		}
-		[Test]
-		public void Test_2529()
-		{
-		}
-		[Test]
-		public void Test_2530()
-		{
-		}
-		[Test]
-		public void Test_2531()
-		{
-		}
-		[Test]
-		public void Test_2532()
-		{
-		}
-		[Test]
-		public void Test_2533()
-		{
-		}
-		[Test]
-		public void Test_2534()
-		{
-		}
-		[Test]
-		public void Test_2535()
-		{
-		}
-		[Test]
-		public void Test_2536()
-		{
-		}
-		[Test]
-		public void Test_2537()
-		{
-		}
-		[Test]
-		public void Test_2538()
-		{
-		}
-		[Test]
-		public void Test_2539()
-		{
-		}
-		[Test]
-		public void Test_2540()
-		{
-		}
-		[Test]
-		public void Test_2541()
-		{
-		}
-		[Test]
-		public void Test_2542()
-		{
-		}
-		[Test]
-		public void Test_2543()
-		{
-		}
-		[Test]
-		public void Test_2544()
-		{
-		}
-		[Test]
-		public void Test_2545()
-		{
-		}
-		[Test]
-		public void Test_2546()
-		{
-		}
-		[Test]
-		public void Test_2547()
-		{
-		}
-		[Test]
-		public void Test_2548()
-		{
-		}
-		[Test]
-		public void Test_2549()
-		{
-		}
-		[Test]
-		public void Test_2550()
-		{
-		}
-		[Test]
-		public void Test_2551()
-		{
-		}
-		[Test]
-		public void Test_2552()
-		{
-		}
-		[Test]
-		public void Test_2553()
-		{
-		}
-		[Test]
-		public void Test_2554()
-		{
-		}
-		[Test]
-		public void Test_2555()
-		{
-		}
-		[Test]
-		public void Test_2556()
-		{
-		}
-		[Test]
-		public void Test_2557()
-		{
-		}
-		[Test]
-		public void Test_2558()
-		{
-		}
-		[Test]
-		public void Test_2559()
-		{
-		}
-		[Test]
-		public void Test_2560()
-		{
-		}
-		[Test]
-		public void Test_2561()
-		{
-		}
-		[Test]
-		public void Test_2562()
-		{
-		}
-		[Test]
-		public void Test_2563()
-		{
-		}
-		[Test]
-		public void Test_2564()
-		{
-		}
-		[Test]
-		public void Test_2565()
-		{
-		}
-		[Test]
-		public void Test_2566()
-		{
-		}
-		[Test]
-		public void Test_2567()
-		{
-		}
-		[Test]
-		public void Test_2568()
-		{
-		}
-		[Test]
-		public void Test_2569()
-		{
-		}
-		[Test]
-		public void Test_2570()
-		{
-		}
-		[Test]
-		public void Test_2571()
-		{
-		}
-		[Test]
-		public void Test_2572()
-		{
-		}
-		[Test]
-		public void Test_2573()
-		{
-		}
-		[Test]
-		public void Test_2574()
-		{
-		}
-		[Test]
-		public void Test_2575()
-		{
-		}
-		[Test]
-		public void Test_2576()
-		{
-		}
-		[Test]
-		public void Test_2577()
-		{
-		}
-		[Test]
-		public void Test_2578()
-		{
-		}
-		[Test]
-		public void Test_2579()
-		{
-		}
-		[Test]
-		public void Test_2580()
-		{
-		}
-		[Test]
-		public void Test_2581()
-		{
-		}
-		[Test]
-		public void Test_2582()
-		{
-		}
-		[Test]
-		public void Test_2583()
-		{
-		}
-		[Test]
-		public void Test_2584()
-		{
-		}
-		[Test]
-		public void Test_2585()
-		{
-		}
-		[Test]
-		public void Test_2586()
-		{
-		}
-		[Test]
-		public void Test_2587()
-		{
-		}
-		[Test]
-		public void Test_2588()
-		{
-		}
-		[Test]
-		public void Test_2589()
-		{
-		}
-		[Test]
-		public void Test_2590()
-		{
-		}
-		[Test]
-		public void Test_2591()
-		{
-		}
-		[Test]
-		public void Test_2592()
-		{
-		}
-		[Test]
-		public void Test_2593()
-		{
-		}
-		[Test]
-		public void Test_2594()
-		{
-		}
-		[Test]
-		public void Test_2595()
-		{
-		}
-		[Test]
-		public void Test_2596()
-		{
-		}
-		[Test]
-		public void Test_2597()
-		{
-		}
-		[Test]
-		public void Test_2598()
-		{
-		}
-		[Test]
-		public void Test_2599()
-		{
-		}
-		[Test]
-		public void Test_2600()
-		{
-		}
-		[Test]
-		public void Test_2601()
-		{
-		}
-		[Test]
-		public void Test_2602()
-		{
-		}
-		[Test]
-		public void Test_2603()
-		{
-		}
-		[Test]
-		public void Test_2604()
-		{
-		}
-		[Test]
-		public void Test_2605()
-		{
-		}
-		[Test]
-		public void Test_2606()
-		{
-		}
-		[Test]
-		public void Test_2607()
-		{
-		}
-		[Test]
-		public void Test_2608()
-		{
-		}
-		[Test]
-		public void Test_2609()
-		{
-		}
-		[Test]
-		public void Test_2610()
-		{
-		}
-		[Test]
-		public void Test_2611()
-		{
-		}
-		[Test]
-		public void Test_2612()
-		{
-		}
-		[Test]
-		public void Test_2613()
-		{
-		}
-		[Test]
-		public void Test_2614()
-		{
-		}
-		[Test]
-		public void Test_2615()
-		{
-		}
-		[Test]
-		public void Test_2616()
-		{
-		}
-		[Test]
-		public void Test_2617()
-		{
-		}
-		[Test]
-		public void Test_2618()
-		{
-		}
-		[Test]
-		public void Test_2619()
-		{
-		}
-		[Test]
-		public void Test_2620()
-		{
-		}
-		[Test]
-		public void Test_2621()
-		{
-		}
-		[Test]
-		public void Test_2622()
-		{
-		}
-		[Test]
-		public void Test_2623()
-		{
-		}
-		[Test]
-		public void Test_2624()
-		{
-		}
-		[Test]
-		public void Test_2625()
-		{
-		}
-		[Test]
-		public void Test_2626()
-		{
-		}
-		[Test]
-		public void Test_2627()
-		{
-		}
-		[Test]
-		public void Test_2628()
-		{
-		}
-		[Test]
-		public void Test_2629()
-		{
-		}
-		[Test]
-		public void Test_2630()
-		{
-		}
-		[Test]
-		public void Test_2631()
-		{
-		}
-		[Test]
-		public void Test_2632()
-		{
-		}
-		[Test]
-		public void Test_2633()
-		{
-		}
-		[Test]
-		public void Test_2634()
-		{
-		}
-		[Test]
-		public void Test_2635()
-		{
-		}
-		[Test]
-		public void Test_2636()
-		{
-		}
-		[Test]
-		public void Test_2637()
-		{
-		}
-		[Test]
-		public void Test_2638()
-		{
-		}
-		[Test]
-		public void Test_2639()
-		{
-		}
-		[Test]
-		public void Test_2640()
-		{
-		}
-		[Test]
-		public void Test_2641()
-		{
-		}
-		[Test]
-		public void Test_2642()
-		{
-		}
-		[Test]
-		public void Test_2643()
-		{
-		}
-		[Test]
-		public void Test_2644()
-		{
-		}
-		[Test]
-		public void Test_2645()
-		{
-		}
-		[Test]
-		public void Test_2646()
-		{
-		}
-		[Test]
-		public void Test_2647()
-		{
-		}
-		[Test]
-		public void Test_2648()
-		{
-		}
-		[Test]
-		public void Test_2649()
-		{
-		}
-		[Test]
-		public void Test_2650()
-		{
-		}
-		[Test]
-		public void Test_2651()
-		{
-		}
-		[Test]
-		public void Test_2652()
-		{
-		}
-		[Test]
-		public void Test_2653()
-		{
-		}
-		[Test]
-		public void Test_2654()
-		{
-		}
-		[Test]
-		public void Test_2655()
-		{
-		}
-		[Test]
-		public void Test_2656()
-		{
-		}
-		[Test]
-		public void Test_2657()
-		{
-		}
-		[Test]
-		public void Test_2658()
-		{
-		}
-		[Test]
-		public void Test_2659()
-		{
-		}
-		[Test]
-		public void Test_2660()
-		{
-		}
-		[Test]
-		public void Test_2661()
-		{
-		}
-		[Test]
-		public void Test_2662()
-		{
-		}
-		[Test]
-		public void Test_2663()
-		{
-		}
-		[Test]
-		public void Test_2664()
-		{
-		}
-		[Test]
-		public void Test_2665()
-		{
-		}
-		[Test]
-		public void Test_2666()
-		{
-		}
-		[Test]
-		public void Test_2667()
-		{
-		}
-		[Test]
-		public void Test_2668()
-		{
-		}
-		[Test]
-		public void Test_2669()
-		{
-		}
-		[Test]
-		public void Test_2670()
-		{
-		}
-		[Test]
-		public void Test_2671()
-		{
-		}
-		[Test]
-		public void Test_2672()
-		{
-		}
-		[Test]
-		public void Test_2673()
-		{
-		}
-		[Test]
-		public void Test_2674()
-		{
-		}
-		[Test]
-		public void Test_2675()
-		{
-		}
-		[Test]
-		public void Test_2676()
-		{
-		}
-		[Test]
-		public void Test_2677()
-		{
-		}
-		[Test]
-		public void Test_2678()
-		{
-		}
-		[Test]
-		public void Test_2679()
-		{
-		}
-		[Test]
-		public void Test_2680()
-		{
-		}
-		[Test]
-		public void Test_2681()
-		{
-		}
-		[Test]
-		public void Test_2682()
-		{
-		}
-		[Test]
-		public void Test_2683()
-		{
-		}
-		[Test]
-		public void Test_2684()
-		{
-		}
-		[Test]
-		public void Test_2685()
-		{
-		}
-		[Test]
-		public void Test_2686()
-		{
-		}
-		[Test]
-		public void Test_2687()
-		{
-		}
-		[Test]
-		public void Test_2688()
-		{
-		}
-		[Test]
-		public void Test_2689()
-		{
-		}
-		[Test]
-		public void Test_2690()
-		{
-		}
-		[Test]
-		public void Test_2691()
-		{
-		}
-		[Test]
-		public void Test_2692()
-		{
-		}
-		[Test]
-		public void Test_2693()
-		{
-		}
-		[Test]
-		public void Test_2694()
-		{
-		}
-		[Test]
-		public void Test_2695()
-		{
-		}
-		[Test]
-		public void Test_2696()
-		{
-		}
-		[Test]
-		public void Test_2697()
-		{
-		}
-		[Test]
-		public void Test_2698()
-		{
-		}
-		[Test]
-		public void Test_2699()
-		{
-		}
-		[Test]
-		public void Test_2700()
-		{
-		}
-		[Test]
-		public void Test_2701()
-		{
-		}
-		[Test]
-		public void Test_2702()
-		{
-		}
-		[Test]
-		public void Test_2703()
-		{
-		}
-		[Test]
-		public void Test_2704()
-		{
-		}
-		[Test]
-		public void Test_2705()
-		{
-		}
-		[Test]
-		public void Test_2706()
-		{
-		}
-		[Test]
-		public void Test_2707()
-		{
-		}
-		[Test]
-		public void Test_2708()
-		{
-		}
-		[Test]
-		public void Test_2709()
-		{
-		}
-		[Test]
-		public void Test_2710()
-		{
-		}
-		[Test]
-		public void Test_2711()
-		{
-		}
-		[Test]
-		public void Test_2712()
-		{
-		}
-		[Test]
-		public void Test_2713()
-		{
-		}
-		[Test]
-		public void Test_2714()
-		{
-		}
-		[Test]
-		public void Test_2715()
-		{
-		}
-		[Test]
-		public void Test_2716()
-		{
-		}
-		[Test]
-		public void Test_2717()
-		{
-		}
-		[Test]
-		public void Test_2718()
-		{
-		}
-		[Test]
-		public void Test_2719()
-		{
-		}
-		[Test]
-		public void Test_2720()
-		{
-		}
-		[Test]
-		public void Test_2721()
-		{
-		}
-		[Test]
-		public void Test_2722()
-		{
-		}
-		[Test]
-		public void Test_2723()
-		{
-		}
-		[Test]
-		public void Test_2724()
-		{
-		}
-		[Test]
-		public void Test_2725()
-		{
-		}
-		[Test]
-		public void Test_2726()
-		{
-		}
-		[Test]
-		public void Test_2727()
-		{
-		}
-		[Test]
-		public void Test_2728()
-		{
-		}
-		[Test]
-		public void Test_2729()
-		{
-		}
-		[Test]
-		public void Test_2730()
-		{
-		}
-		[Test]
-		public void Test_2731()
-		{
-		}
-		[Test]
-		public void Test_2732()
-		{
-		}
-		[Test]
-		public void Test_2733()
-		{
-		}
-		[Test]
-		public void Test_2734()
-		{
-		}
-		[Test]
-		public void Test_2735()
-		{
-		}
-		[Test]
-		public void Test_2736()
-		{
-		}
-		[Test]
-		public void Test_2737()
-		{
-		}
-		[Test]
-		public void Test_2738()
-		{
-		}
-		[Test]
-		public void Test_2739()
-		{
-		}
-		[Test]
-		public void Test_2740()
-		{
-		}
-		[Test]
-		public void Test_2741()
-		{
-		}
-		[Test]
-		public void Test_2742()
-		{
-		}
-		[Test]
-		public void Test_2743()
-		{
-		}
-		[Test]
-		public void Test_2744()
-		{
-		}
-		[Test]
-		public void Test_2745()
-		{
-		}
-		[Test]
-		public void Test_2746()
-		{
-		}
-		[Test]
-		public void Test_2747()
-		{
-		}
-		[Test]
-		public void Test_2748()
-		{
-		}
-		[Test]
-		public void Test_2749()
-		{
-		}
-		[Test]
-		public void Test_2750()
-		{
-		}
-		[Test]
-		public void Test_2751()
-		{
-		}
-		[Test]
-		public void Test_2752()
-		{
-		}
-		[Test]
-		public void Test_2753()
-		{
-		}
-		[Test]
-		public void Test_2754()
-		{
-		}
-		[Test]
-		public void Test_2755()
-		{
-		}
-		[Test]
-		public void Test_2756()
-		{
-		}
-		[Test]
-		public void Test_2757()
-		{
-		}
-		[Test]
-		public void Test_2758()
-		{
-		}
-		[Test]
-		public void Test_2759()
-		{
-		}
-		[Test]
-		public void Test_2760()
-		{
-		}
-		[Test]
-		public void Test_2761()
-		{
-		}
-		[Test]
-		public void Test_2762()
-		{
-		}
-		[Test]
-		public void Test_2763()
-		{
-		}
-		[Test]
-		public void Test_2764()
-		{
-		}
-		[Test]
-		public void Test_2765()
-		{
-		}
-		[Test]
-		public void Test_2766()
-		{
-		}
-		[Test]
-		public void Test_2767()
-		{
-		}
-		[Test]
-		public void Test_2768()
-		{
-		}
-		[Test]
-		public void Test_2769()
-		{
-		}
-		[Test]
-		public void Test_2770()
-		{
-		}
-		[Test]
-		public void Test_2771()
-		{
-		}
-		[Test]
-		public void Test_2772()
-		{
-		}
-		[Test]
-		public void Test_2773()
-		{
-		}
-		[Test]
-		public void Test_2774()
-		{
-		}
-		[Test]
-		public void Test_2775()
-		{
-		}
-		[Test]
-		public void Test_2776()
-		{
-		}
-		[Test]
-		public void Test_2777()
-		{
-		}
-		[Test]
-		public void Test_2778()
-		{
-		}
-		[Test]
-		public void Test_2779()
-		{
-		}
-		[Test]
-		public void Test_2780()
-		{
-		}
-		[Test]
-		public void Test_2781()
-		{
-		}
-		[Test]
-		public void Test_2782()
-		{
-		}
-		[Test]
-		public void Test_2783()
-		{
-		}
-		[Test]
-		public void Test_2784()
-		{
-		}
-		[Test]
-		public void Test_2785()
-		{
-		}
-		[Test]
-		public void Test_2786()
-		{
-		}
-		[Test]
-		public void Test_2787()
-		{
-		}
-		[Test]
-		public void Test_2788()
-		{
-		}
-		[Test]
-		public void Test_2789()
-		{
-		}
-		[Test]
-		public void Test_2790()
-		{
-		}
-		[Test]
-		public void Test_2791()
-		{
-		}
-		[Test]
-		public void Test_2792()
-		{
-		}
-		[Test]
-		public void Test_2793()
-		{
-		}
-		[Test]
-		public void Test_2794()
-		{
-		}
-		[Test]
-		public void Test_2795()
-		{
-		}
-		[Test]
-		public void Test_2796()
-		{
-		}
-		[Test]
-		public void Test_2797()
-		{
-		}
-		[Test]
-		public void Test_2798()
-		{
-		}
-		[Test]
-		public void Test_2799()
-		{
-		}
-		[Test]
-		public void Test_2800()
-		{
-		}
-		[Test]
-		public void Test_2801()
-		{
-		}
-		[Test]
-		public void Test_2802()
-		{
-		}
-		[Test]
-		public void Test_2803()
-		{
-		}
-		[Test]
-		public void Test_2804()
-		{
-		}
-		[Test]
-		public void Test_2805()
-		{
-		}
-		[Test]
-		public void Test_2806()
-		{
-		}
-		[Test]
-		public void Test_2807()
-		{
-		}
-		[Test]
-		public void Test_2808()
-		{
-		}
-		[Test]
-		public void Test_2809()
-		{
-		}
-		[Test]
-		public void Test_2810()
-		{
-		}
-		[Test]
-		public void Test_2811()
-		{
-		}
-		[Test]
-		public void Test_2812()
-		{
-		}
-		[Test]
-		public void Test_2813()
-		{
-		}
-		[Test]
-		public void Test_2814()
-		{
-		}
-		[Test]
-		public void Test_2815()
-		{
-		}
-		[Test]
-		public void Test_2816()
-		{
-		}
-		[Test]
-		public void Test_2817()
-		{
-		}
-		[Test]
-		public void Test_2818()
-		{
-		}
-		[Test]
-		public void Test_2819()
-		{
-		}
-		[Test]
-		public void Test_2820()
-		{
-		}
-		[Test]
-		public void Test_2821()
-		{
-		}
-		[Test]
-		public void Test_2822()
-		{
-		}
-		[Test]
-		public void Test_2823()
-		{
-		}
-		[Test]
-		public void Test_2824()
-		{
-		}
-		[Test]
-		public void Test_2825()
-		{
-		}
-		[Test]
-		public void Test_2826()
-		{
-		}
-		[Test]
-		public void Test_2827()
-		{
-		}
-		[Test]
-		public void Test_2828()
-		{
-		}
-		[Test]
-		public void Test_2829()
-		{
-		}
-		[Test]
-		public void Test_2830()
-		{
-		}
-		[Test]
-		public void Test_2831()
-		{
-		}
-		[Test]
-		public void Test_2832()
-		{
-		}
-		[Test]
-		public void Test_2833()
-		{
-		}
-		[Test]
-		public void Test_2834()
-		{
-		}
-		[Test]
-		public void Test_2835()
-		{
-		}
-		[Test]
-		public void Test_2836()
-		{
-		}
-		[Test]
-		public void Test_2837()
-		{
-		}
-		[Test]
-		public void Test_2838()
-		{
-		}
-		[Test]
-		public void Test_2839()
-		{
-		}
-		[Test]
-		public void Test_2840()
-		{
-		}
-		[Test]
-		public void Test_2841()
-		{
-		}
-		[Test]
-		public void Test_2842()
-		{
-		}
-		[Test]
-		public void Test_2843()
-		{
-		}
-		[Test]
-		public void Test_2844()
-		{
-		}
-		[Test]
-		public void Test_2845()
-		{
-		}
-		[Test]
-		public void Test_2846()
-		{
-		}
-		[Test]
-		public void Test_2847()
-		{
-		}
-		[Test]
-		public void Test_2848()
-		{
-		}
-		[Test]
-		public void Test_2849()
-		{
-		}
-		[Test]
-		public void Test_2850()
-		{
-		}
-		[Test]
-		public void Test_2851()
-		{
-		}
-		[Test]
-		public void Test_2852()
-		{
-		}
-		[Test]
-		public void Test_2853()
-		{
-		}
-		[Test]
-		public void Test_2854()
-		{
-		}
-		[Test]
-		public void Test_2855()
-		{
-		}
-		[Test]
-		public void Test_2856()
-		{
-		}
-		[Test]
-		public void Test_2857()
-		{
-		}
-		[Test]
-		public void Test_2858()
-		{
-		}
-		[Test]
-		public void Test_2859()
-		{
-		}
-		[Test]
-		public void Test_2860()
-		{
-		}
-		[Test]
-		public void Test_2861()
-		{
-		}
-		[Test]
-		public void Test_2862()
-		{
-		}
-		[Test]
-		public void Test_2863()
-		{
-		}
-		[Test]
-		public void Test_2864()
-		{
-		}
-		[Test]
-		public void Test_2865()
-		{
-		}
-		[Test]
-		public void Test_2866()
-		{
-		}
-		[Test]
-		public void Test_2867()
-		{
-		}
-		[Test]
-		public void Test_2868()
-		{
-		}
-		[Test]
-		public void Test_2869()
-		{
-		}
-		[Test]
-		public void Test_2870()
-		{
-		}
-		[Test]
-		public void Test_2871()
-		{
-		}
-		[Test]
-		public void Test_2872()
-		{
-		}
-		[Test]
-		public void Test_2873()
-		{
-		}
-		[Test]
-		public void Test_2874()
-		{
-		}
-		[Test]
-		public void Test_2875()
-		{
-		}
-		[Test]
-		public void Test_2876()
-		{
-		}
-		[Test]
-		public void Test_2877()
-		{
-		}
-		[Test]
-		public void Test_2878()
-		{
-		}
-		[Test]
-		public void Test_2879()
-		{
-		}
-		[Test]
-		public void Test_2880()
-		{
-		}
-		[Test]
-		public void Test_2881()
-		{
-		}
-		[Test]
-		public void Test_2882()
-		{
-		}
-		[Test]
-		public void Test_2883()
-		{
-		}
-		[Test]
-		public void Test_2884()
-		{
-		}
-		[Test]
-		public void Test_2885()
-		{
-		}
-		[Test]
-		public void Test_2886()
-		{
-		}
-		[Test]
-		public void Test_2887()
-		{
-		}
-		[Test]
-		public void Test_2888()
-		{
-		}
-		[Test]
-		public void Test_2889()
-		{
-		}
-		[Test]
-		public void Test_2890()
-		{
-		}
-		[Test]
-		public void Test_2891()
-		{
-		}
-		[Test]
-		public void Test_2892()
-		{
-		}
-		[Test]
-		public void Test_2893()
-		{
-		}
-		[Test]
-		public void Test_2894()
-		{
-		}
-		[Test]
-		public void Test_2895()
-		{
-		}
-		[Test]
-		public void Test_2896()
-		{
-		}
-		[Test]
-		public void Test_2897()
-		{
-		}
-		[Test]
-		public void Test_2898()
-		{
-		}
-		[Test]
-		public void Test_2899()
-		{
-		}
-		[Test]
-		public void Test_2900()
-		{
-		}
-		[Test]
-		public void Test_2901()
-		{
-		}
-		[Test]
-		public void Test_2902()
-		{
-		}
-		[Test]
-		public void Test_2903()
-		{
-		}
-		[Test]
-		public void Test_2904()
-		{
-		}
-		[Test]
-		public void Test_2905()
-		{
-		}
-		[Test]
-		public void Test_2906()
-		{
-		}
-		[Test]
-		public void Test_2907()
-		{
-		}
-		[Test]
-		public void Test_2908()
-		{
-		}
-		[Test]
-		public void Test_2909()
-		{
-		}
-		[Test]
-		public void Test_2910()
-		{
-		}
-		[Test]
-		public void Test_2911()
-		{
-		}
-		[Test]
-		public void Test_2912()
-		{
-		}
-		[Test]
-		public void Test_2913()
-		{
-		}
-		[Test]
-		public void Test_2914()
-		{
-		}
-		[Test]
-		public void Test_2915()
-		{
-		}
-		[Test]
-		public void Test_2916()
-		{
-		}
-		[Test]
-		public void Test_2917()
-		{
-		}
-		[Test]
-		public void Test_2918()
-		{
-		}
-		[Test]
-		public void Test_2919()
-		{
-		}
-		[Test]
-		public void Test_2920()
-		{
-		}
-		[Test]
-		public void Test_2921()
-		{
-		}
-		[Test]
-		public void Test_2922()
-		{
-		}
-		[Test]
-		public void Test_2923()
-		{
-		}
-		[Test]
-		public void Test_2924()
-		{
-		}
-		[Test]
-		public void Test_2925()
-		{
-		}
-		[Test]
-		public void Test_2926()
-		{
-		}
-		[Test]
-		public void Test_2927()
-		{
-		}
-		[Test]
-		public void Test_2928()
-		{
-		}
-		[Test]
-		public void Test_2929()
-		{
-		}
-		[Test]
-		public void Test_2930()
-		{
-		}
-		[Test]
-		public void Test_2931()
-		{
-		}
-		[Test]
-		public void Test_2932()
-		{
-		}
-		[Test]
-		public void Test_2933()
-		{
-		}
-		[Test]
-		public void Test_2934()
-		{
-		}
-		[Test]
-		public void Test_2935()
-		{
-		}
-		[Test]
-		public void Test_2936()
-		{
-		}
-		[Test]
-		public void Test_2937()
-		{
-		}
-		[Test]
-		public void Test_2938()
-		{
-		}
-		[Test]
-		public void Test_2939()
-		{
-		}
-		[Test]
-		public void Test_2940()
-		{
-		}
-		[Test]
-		public void Test_2941()
-		{
-		}
-		[Test]
-		public void Test_2942()
-		{
-		}
-		[Test]
-		public void Test_2943()
-		{
-		}
-		[Test]
-		public void Test_2944()
-		{
-		}
-		[Test]
-		public void Test_2945()
-		{
-		}
-		[Test]
-		public void Test_2946()
-		{
-		}
-		[Test]
-		public void Test_2947()
-		{
-		}
-		[Test]
-		public void Test_2948()
-		{
-		}
-		[Test]
-		public void Test_2949()
-		{
-		}
-		[Test]
-		public void Test_2950()
-		{
-		}
-		[Test]
-		public void Test_2951()
-		{
-		}
-		[Test]
-		public void Test_2952()
-		{
-		}
-		[Test]
-		public void Test_2953()
-		{
-		}
-		[Test]
-		public void Test_2954()
-		{
-		}
-		[Test]
-		public void Test_2955()
-		{
-		}
-		[Test]
-		public void Test_2956()
-		{
-		}
-		[Test]
-		public void Test_2957()
-		{
-		}
-		[Test]
-		public void Test_2958()
-		{
-		}
-		[Test]
-		public void Test_2959()
-		{
-		}
-		[Test]
-		public void Test_2960()
-		{
-		}
-		[Test]
-		public void Test_2961()
-		{
-		}
-		[Test]
-		public void Test_2962()
-		{
-		}
-		[Test]
-		public void Test_2963()
-		{
-		}
-		[Test]
-		public void Test_2964()
-		{
-		}
-		[Test]
-		public void Test_2965()
-		{
-		}
-		[Test]
-		public void Test_2966()
-		{
-		}
-		[Test]
-		public void Test_2967()
-		{
-		}
-		[Test]
-		public void Test_2968()
-		{
-		}
-		[Test]
-		public void Test_2969()
-		{
-		}
-		[Test]
-		public void Test_2970()
-		{
-		}
-		[Test]
-		public void Test_2971()
-		{
-		}
-		[Test]
-		public void Test_2972()
-		{
-		}
-		[Test]
-		public void Test_2973()
-		{
-		}
-		[Test]
-		public void Test_2974()
-		{
-		}
-		[Test]
-		public void Test_2975()
-		{
-		}
-		[Test]
-		public void Test_2976()
-		{
-		}
-		[Test]
-		public void Test_2977()
-		{
-		}
-		[Test]
-		public void Test_2978()
-		{
-		}
-		[Test]
-		public void Test_2979()
-		{
-		}
-		[Test]
-		public void Test_2980()
-		{
-		}
-		[Test]
-		public void Test_2981()
-		{
-		}
-		[Test]
-		public void Test_2982()
-		{
-		}
-		[Test]
-		public void Test_2983()
-		{
-		}
-		[Test]
-		public void Test_2984()
-		{
-		}
-		[Test]
-		public void Test_2985()
-		{
-		}
-		[Test]
-		public void Test_2986()
-		{
-		}
-		[Test]
-		public void Test_2987()
-		{
-		}
-		[Test]
-		public void Test_2988()
-		{
-		}
-		[Test]
-		public void Test_2989()
-		{
-		}
-		[Test]
-		public void Test_2990()
-		{
-		}
-		[Test]
-		public void Test_2991()
-		{
-		}
-		[Test]
-		public void Test_2992()
-		{
-		}
-		[Test]
-		public void Test_2993()
-		{
-		}
-		[Test]
-		public void Test_2994()
-		{
-		}
-		[Test]
-		public void Test_2995()
-		{
-		}
-		[Test]
-		public void Test_2996()
-		{
-		}
-		[Test]
-		public void Test_2997()
-		{
-		}
-		[Test]
-		public void Test_2998()
-		{
-		}
-		[Test]
-		public void Test_2999()
-		{
-		}
-		[Test]
-		public void Test_3000()
-		{
-		}
-		[Test]
-		public void Test_3001()
-		{
-		}
-		[Test]
-		public void Test_3002()
-		{
-		}
-		[Test]
-		public void Test_3003()
-		{
-		}
-		[Test]
-		public void Test_3004()
-		{
-		}
-		[Test]
-		public void Test_3005()
-		{
-		}
-		[Test]
-		public void Test_3006()
-		{
-		}
-		[Test]
-		public void Test_3007()
-		{
-		}
-		[Test]
-		public void Test_3008()
-		{
-		}
-		[Test]
-		public void Test_3009()
-		{
-		}
-		[Test]
-		public void Test_3010()
-		{
-		}
-		[Test]
-		public void Test_3011()
-		{
-		}
-		[Test]
-		public void Test_3012()
-		{
-		}
-		[Test]
-		public void Test_3013()
-		{
-		}
-		[Test]
-		public void Test_3014()
-		{
-		}
-		[Test]
-		public void Test_3015()
-		{
-		}
-		[Test]
-		public void Test_3016()
-		{
-		}
-		[Test]
-		public void Test_3017()
-		{
-		}
-		[Test]
-		public void Test_3018()
-		{
-		}
-		[Test]
-		public void Test_3019()
-		{
-		}
-		[Test]
-		public void Test_3020()
-		{
-		}
-		[Test]
-		public void Test_3021()
-		{
-		}
-		[Test]
-		public void Test_3022()
-		{
-		}
-		[Test]
-		public void Test_3023()
-		{
-		}
-		[Test]
-		public void Test_3024()
-		{
-		}
-		[Test]
-		public void Test_3025()
-		{
-		}
-		[Test]
-		public void Test_3026()
-		{
-		}
-		[Test]
-		public void Test_3027()
-		{
-		}
-		[Test]
-		public void Test_3028()
-		{
-		}
-		[Test]
-		public void Test_3029()
-		{
-		}
-		[Test]
-		public void Test_3030()
-		{
-		}
-		[Test]
-		public void Test_3031()
-		{
-		}
-		[Test]
-		public void Test_3032()
-		{
-		}
-		[Test]
-		public void Test_3033()
-		{
-		}
-		[Test]
-		public void Test_3034()
-		{
-		}
-		[Test]
-		public void Test_3035()
-		{
-		}
-		[Test]
-		public void Test_3036()
-		{
-		}
-		[Test]
-		public void Test_3037()
-		{
-		}
-		[Test]
-		public void Test_3038()
-		{
-		}
-		[Test]
-		public void Test_3039()
-		{
-		}
-		[Test]
-		public void Test_3040()
-		{
-		}
-		[Test]
-		public void Test_3041()
-		{
-		}
-		[Test]
-		public void Test_3042()
-		{
-		}
-		[Test]
-		public void Test_3043()
-		{
-		}
-		[Test]
-		public void Test_3044()
-		{
-		}
-		[Test]
-		public void Test_3045()
-		{
-		}
-		[Test]
-		public void Test_3046()
-		{
-		}
-		[Test]
-		public void Test_3047()
-		{
-		}
-		[Test]
-		public void Test_3048()
-		{
-		}
-		[Test]
-		public void Test_3049()
-		{
-		}
-		[Test]
-		public void Test_3050()
-		{
-		}
-		[Test]
-		public void Test_3051()
-		{
-		}
-		[Test]
-		public void Test_3052()
-		{
-		}
-		[Test]
-		public void Test_3053()
-		{
-		}
-		[Test]
-		public void Test_3054()
-		{
-		}
-		[Test]
-		public void Test_3055()
-		{
-		}
-		[Test]
-		public void Test_3056()
-		{
-		}
-		[Test]
-		public void Test_3057()
-		{
-		}
-		[Test]
-		public void Test_3058()
-		{
-		}
-		[Test]
-		public void Test_3059()
-		{
-		}
-		[Test]
-		public void Test_3060()
-		{
-		}
-		[Test]
-		public void Test_3061()
-		{
-		}
-		[Test]
-		public void Test_3062()
-		{
-		}
-		[Test]
-		public void Test_3063()
-		{
-		}
-		[Test]
-		public void Test_3064()
-		{
-		}
-		[Test]
-		public void Test_3065()
-		{
-		}
-		[Test]
-		public void Test_3066()
-		{
-		}
-		[Test]
-		public void Test_3067()
-		{
-		}
-		[Test]
-		public void Test_3068()
-		{
-		}
-		[Test]
-		public void Test_3069()
-		{
-		}
-		[Test]
-		public void Test_3070()
-		{
-		}
-		[Test]
-		public void Test_3071()
-		{
-		}
-		[Test]
-		public void Test_3072()
-		{
-		}
-		[Test]
-		public void Test_3073()
-		{
-		}
-		[Test]
-		public void Test_3074()
-		{
-		}
-		[Test]
-		public void Test_3075()
-		{
-		}
-		[Test]
-		public void Test_3076()
-		{
-		}
-		[Test]
-		public void Test_3077()
-		{
-		}
-		[Test]
-		public void Test_3078()
-		{
-		}
-		[Test]
-		public void Test_3079()
-		{
-		}
-		[Test]
-		public void Test_3080()
-		{
-		}
-		[Test]
-		public void Test_3081()
-		{
-		}
-		[Test]
-		public void Test_3082()
-		{
-		}
-		[Test]
-		public void Test_3083()
-		{
-		}
-		[Test]
-		public void Test_3084()
-		{
-		}
-		[Test]
-		public void Test_3085()
-		{
-		}
-		[Test]
-		public void Test_3086()
-		{
-		}
-		[Test]
-		public void Test_3087()
-		{
-		}
-		[Test]
-		public void Test_3088()
-		{
-		}
-		[Test]
-		public void Test_3089()
-		{
-		}
-		[Test]
-		public void Test_3090()
-		{
-		}
-		[Test]
-		public void Test_3091()
-		{
-		}
-		[Test]
-		public void Test_3092()
-		{
-		}
-		[Test]
-		public void Test_3093()
-		{
-		}
-		[Test]
-		public void Test_3094()
-		{
-		}
-		[Test]
-		public void Test_3095()
-		{
-		}
-		[Test]
-		public void Test_3096()
-		{
-		}
-		[Test]
-		public void Test_3097()
-		{
-		}
-		[Test]
-		public void Test_3098()
-		{
-		}
-		[Test]
-		public void Test_3099()
-		{
-		}
-		[Test]
-		public void Test_3100()
-		{
-		}
-		[Test]
-		public void Test_3101()
-		{
-		}
-		[Test]
-		public void Test_3102()
-		{
-		}
-		[Test]
-		public void Test_3103()
-		{
-		}
-		[Test]
-		public void Test_3104()
-		{
-		}
-		[Test]
-		public void Test_3105()
-		{
-		}
-		[Test]
-		public void Test_3106()
-		{
-		}
-		[Test]
-		public void Test_3107()
-		{
-		}
-		[Test]
-		public void Test_3108()
-		{
-		}
-		[Test]
-		public void Test_3109()
-		{
-		}
-		[Test]
-		public void Test_3110()
-		{
-		}
-		[Test]
-		public void Test_3111()
-		{
-		}
-		[Test]
-		public void Test_3112()
-		{
-		}
-		[Test]
-		public void Test_3113()
-		{
-		}
-		[Test]
-		public void Test_3114()
-		{
-		}
-		[Test]
-		public void Test_3115()
-		{
-		}
-		[Test]
-		public void Test_3116()
-		{
-		}
-		[Test]
-		public void Test_3117()
-		{
-		}
-		[Test]
-		public void Test_3118()
-		{
-		}
-		[Test]
-		public void Test_3119()
-		{
-		}
-		[Test]
-		public void Test_3120()
-		{
-		}
-		[Test]
-		public void Test_3121()
-		{
-		}
-		[Test]
-		public void Test_3122()
-		{
-		}
-		[Test]
-		public void Test_3123()
-		{
-		}
-		[Test]
-		public void Test_3124()
-		{
-		}
-		[Test]
-		public void Test_3125()
-		{
-		}
-		[Test]
-		public void Test_3126()
-		{
-		}
-		[Test]
-		public void Test_3127()
-		{
-		}
-		[Test]
-		public void Test_3128()
-		{
-		}
-		[Test]
-		public void Test_3129()
-		{
-		}
-		[Test]
-		public void Test_3130()
-		{
-		}
-		[Test]
-		public void Test_3131()
-		{
-		}
-		[Test]
-		public void Test_3132()
-		{
-		}
-		[Test]
-		public void Test_3133()
-		{
-		}
-		[Test]
-		public void Test_3134()
-		{
-		}
-		[Test]
-		public void Test_3135()
-		{
-		}
-		[Test]
-		public void Test_3136()
-		{
-		}
-		[Test]
-		public void Test_3137()
-		{
-		}
-		[Test]
-		public void Test_3138()
-		{
-		}
-		[Test]
-		public void Test_3139()
-		{
-		}
-		[Test]
-		public void Test_3140()
-		{
-		}
-		[Test]
-		public void Test_3141()
-		{
-		}
-		[Test]
-		public void Test_3142()
-		{
-		}
-		[Test]
-		public void Test_3143()
-		{
-		}
-		[Test]
-		public void Test_3144()
-		{
-		}
-		[Test]
-		public void Test_3145()
-		{
-		}
-		[Test]
-		public void Test_3146()
-		{
-		}
-		[Test]
-		public void Test_3147()
-		{
-		}
-		[Test]
-		public void Test_3148()
-		{
-		}
-		[Test]
-		public void Test_3149()
-		{
-		}
-		[Test]
-		public void Test_3150()
-		{
-		}
-		[Test]
-		public void Test_3151()
-		{
-		}
-		[Test]
-		public void Test_3152()
-		{
-		}
-		[Test]
-		public void Test_3153()
-		{
-		}
-		[Test]
-		public void Test_3154()
-		{
-		}
-		[Test]
-		public void Test_3155()
-		{
-		}
-		[Test]
-		public void Test_3156()
-		{
-		}
-		[Test]
-		public void Test_3157()
-		{
-		}
-		[Test]
-		public void Test_3158()
-		{
-		}
-		[Test]
-		public void Test_3159()
-		{
-		}
-		[Test]
-		public void Test_3160()
-		{
-		}
-		[Test]
-		public void Test_3161()
-		{
-		}
-		[Test]
-		public void Test_3162()
-		{
-		}
-		[Test]
-		public void Test_3163()
-		{
-		}
-		[Test]
-		public void Test_3164()
-		{
-		}
-		[Test]
-		public void Test_3165()
-		{
-		}
-		[Test]
-		public void Test_3166()
-		{
-		}
-		[Test]
-		public void Test_3167()
-		{
-		}
-		[Test]
-		public void Test_3168()
-		{
-		}
-		[Test]
-		public void Test_3169()
-		{
-		}
-		[Test]
-		public void Test_3170()
-		{
-		}
-		[Test]
-		public void Test_3171()
-		{
-		}
-		[Test]
-		public void Test_3172()
-		{
-		}
-		[Test]
-		public void Test_3173()
-		{
-		}
-		[Test]
-		public void Test_3174()
-		{
-		}
-		[Test]
-		public void Test_3175()
-		{
-		}
-		[Test]
-		public void Test_3176()
-		{
-		}
-		[Test]
-		public void Test_3177()
-		{
-		}
-		[Test]
-		public void Test_3178()
-		{
-		}
-		[Test]
-		public void Test_3179()
-		{
-		}
-		[Test]
-		public void Test_3180()
-		{
-		}
-		[Test]
-		public void Test_3181()
-		{
-		}
-		[Test]
-		public void Test_3182()
-		{
-		}
-		[Test]
-		public void Test_3183()
-		{
-		}
-		[Test]
-		public void Test_3184()
-		{
-		}
-		[Test]
-		public void Test_3185()
-		{
-		}
-		[Test]
-		public void Test_3186()
-		{
-		}
-		[Test]
-		public void Test_3187()
-		{
-		}
-		[Test]
-		public void Test_3188()
-		{
-		}
-		[Test]
-		public void Test_3189()
-		{
-		}
-		[Test]
-		public void Test_3190()
-		{
-		}
-		[Test]
-		public void Test_3191()
-		{
-		}
-		[Test]
-		public void Test_3192()
-		{
-		}
-		[Test]
-		public void Test_3193()
-		{
-		}
-		[Test]
-		public void Test_3194()
-		{
-		}
-		[Test]
-		public void Test_3195()
-		{
-		}
-		[Test]
-		public void Test_3196()
-		{
-		}
-		[Test]
-		public void Test_3197()
-		{
-		}
-		[Test]
-		public void Test_3198()
-		{
-		}
-		[Test]
-		public void Test_3199()
-		{
-		}
-		[Test]
-		public void Test_3200()
-		{
-		}
-		[Test]
-		public void Test_3201()
-		{
-		}
-		[Test]
-		public void Test_3202()
-		{
-		}
-		[Test]
-		public void Test_3203()
-		{
-		}
-		[Test]
-		public void Test_3204()
-		{
-		}
-		[Test]
-		public void Test_3205()
-		{
-		}
-		[Test]
-		public void Test_3206()
-		{
-		}
-		[Test]
-		public void Test_3207()
-		{
-		}
-		[Test]
-		public void Test_3208()
-		{
-		}
-		[Test]
-		public void Test_3209()
-		{
-		}
-		[Test]
-		public void Test_3210()
-		{
-		}
-		[Test]
-		public void Test_3211()
-		{
-		}
-		[Test]
-		public void Test_3212()
-		{
-		}
-		[Test]
-		public void Test_3213()
-		{
-		}
-		[Test]
-		public void Test_3214()
-		{
-		}
-		[Test]
-		public void Test_3215()
-		{
-		}
-		[Test]
-		public void Test_3216()
-		{
-		}
-		[Test]
-		public void Test_3217()
-		{
-		}
-		[Test]
-		public void Test_3218()
-		{
-		}
-		[Test]
-		public void Test_3219()
-		{
-		}
-		[Test]
-		public void Test_3220()
-		{
-		}
-		[Test]
-		public void Test_3221()
-		{
-		}
-		[Test]
-		public void Test_3222()
-		{
-		}
-		[Test]
-		public void Test_3223()
-		{
-		}
-		[Test]
-		public void Test_3224()
-		{
-		}
-		[Test]
-		public void Test_3225()
-		{
-		}
-		[Test]
-		public void Test_3226()
-		{
-		}
-		[Test]
-		public void Test_3227()
-		{
-		}
-		[Test]
-		public void Test_3228()
-		{
-		}
-		[Test]
-		public void Test_3229()
-		{
-		}
-		[Test]
-		public void Test_3230()
-		{
-		}
-		[Test]
-		public void Test_3231()
-		{
-		}
-		[Test]
-		public void Test_3232()
-		{
-		}
-		[Test]
-		public void Test_3233()
-		{
-		}
-		[Test]
-		public void Test_3234()
-		{
-		}
-		[Test]
-		public void Test_3235()
-		{
-		}
-		[Test]
-		public void Test_3236()
-		{
-		}
-		[Test]
-		public void Test_3237()
-		{
-		}
-		[Test]
-		public void Test_3238()
-		{
-		}
-		[Test]
-		public void Test_3239()
-		{
-		}
-		[Test]
-		public void Test_3240()
-		{
-		}
-		[Test]
-		public void Test_3241()
-		{
-		}
-		[Test]
-		public void Test_3242()
-		{
-		}
-		[Test]
-		public void Test_3243()
-		{
-		}
-		[Test]
-		public void Test_3244()
-		{
-		}
-		[Test]
-		public void Test_3245()
-		{
-		}
-		[Test]
-		public void Test_3246()
-		{
-		}
-		[Test]
-		public void Test_3247()
-		{
-		}
-		[Test]
-		public void Test_3248()
-		{
-		}
-		[Test]
-		public void Test_3249()
-		{
-		}
-		[Test]
-		public void Test_3250()
-		{
-		}
-		[Test]
-		public void Test_3251()
-		{
-		}
-		[Test]
-		public void Test_3252()
-		{
-		}
-		[Test]
-		public void Test_3253()
-		{
-		}
-		[Test]
-		public void Test_3254()
-		{
-		}
-		[Test]
-		public void Test_3255()
-		{
-		}
-		[Test]
-		public void Test_3256()
-		{
-		}
-		[Test]
-		public void Test_3257()
-		{
-		}
-		[Test]
-		public void Test_3258()
-		{
-		}
-		[Test]
-		public void Test_3259()
-		{
-		}
-		[Test]
-		public void Test_3260()
-		{
-		}
-		[Test]
-		public void Test_3261()
-		{
-		}
-		[Test]
-		public void Test_3262()
-		{
-		}
-		[Test]
-		public void Test_3263()
-		{
-		}
-		[Test]
-		public void Test_3264()
-		{
-		}
-		[Test]
-		public void Test_3265()
-		{
-		}
-		[Test]
-		public void Test_3266()
-		{
-		}
-		[Test]
-		public void Test_3267()
-		{
-		}
-		[Test]
-		public void Test_3268()
-		{
-		}
-		[Test]
-		public void Test_3269()
-		{
-		}
-		[Test]
-		public void Test_3270()
-		{
-		}
-		[Test]
-		public void Test_3271()
-		{
-		}
-		[Test]
-		public void Test_3272()
-		{
-		}
-		[Test]
-		public void Test_3273()
-		{
-		}
-		[Test]
-		public void Test_3274()
-		{
-		}
-		[Test]
-		public void Test_3275()
-		{
-		}
-		[Test]
-		public void Test_3276()
-		{
-		}
-		[Test]
-		public void Test_3277()
-		{
-		}
-		[Test]
-		public void Test_3278()
-		{
-		}
-		[Test]
-		public void Test_3279()
-		{
-		}
-		[Test]
-		public void Test_3280()
-		{
-		}
-		[Test]
-		public void Test_3281()
-		{
-		}
-		[Test]
-		public void Test_3282()
-		{
-		}
-		[Test]
-		public void Test_3283()
-		{
-		}
-		[Test]
-		public void Test_3284()
-		{
-		}
-		[Test]
-		public void Test_3285()
-		{
-		}
-		[Test]
-		public void Test_3286()
-		{
-		}
-		[Test]
-		public void Test_3287()
-		{
-		}
-		[Test]
-		public void Test_3288()
-		{
-		}
-		[Test]
-		public void Test_3289()
-		{
-		}
-		[Test]
-		public void Test_3290()
-		{
-		}
-		[Test]
-		public void Test_3291()
-		{
-		}
-		[Test]
-		public void Test_3292()
-		{
-		}
-		[Test]
-		public void Test_3293()
-		{
-		}
-		[Test]
-		public void Test_3294()
-		{
-		}
-		[Test]
-		public void Test_3295()
-		{
-		}
-		[Test]
-		public void Test_3296()
-		{
-		}
-		[Test]
-		public void Test_3297()
-		{
-		}
-		[Test]
-		public void Test_3298()
-		{
-		}
-		[Test]
-		public void Test_3299()
-		{
-		}
-		[Test]
-		public void Test_3300()
-		{
-		}
-		[Test]
-		public void Test_3301()
-		{
-		}
-		[Test]
-		public void Test_3302()
-		{
-		}
-		[Test]
-		public void Test_3303()
-		{
-		}
-		[Test]
-		public void Test_3304()
-		{
-		}
-		[Test]
-		public void Test_3305()
-		{
-		}
-		[Test]
-		public void Test_3306()
-		{
-		}
-		[Test]
-		public void Test_3307()
-		{
-		}
-		[Test]
-		public void Test_3308()
-		{
-		}
-		[Test]
-		public void Test_3309()
-		{
-		}
-		[Test]
-		public void Test_3310()
-		{
-		}
-		[Test]
-		public void Test_3311()
-		{
-		}
-		[Test]
-		public void Test_3312()
-		{
-		}
-		[Test]
-		public void Test_3313()
-		{
-		}
-		[Test]
-		public void Test_3314()
-		{
-		}
-		[Test]
-		public void Test_3315()
-		{
-		}
-		[Test]
-		public void Test_3316()
-		{
-		}
-		[Test]
-		public void Test_3317()
-		{
-		}
-		[Test]
-		public void Test_3318()
-		{
-		}
-		[Test]
-		public void Test_3319()
-		{
-		}
-		[Test]
-		public void Test_3320()
-		{
-		}
-		[Test]
-		public void Test_3321()
-		{
-		}
-		[Test]
-		public void Test_3322()
-		{
-		}
-		[Test]
-		public void Test_3323()
-		{
-		}
-		[Test]
-		public void Test_3324()
-		{
-		}
-		[Test]
-		public void Test_3325()
-		{
-		}
-		[Test]
-		public void Test_3326()
-		{
-		}
-		[Test]
-		public void Test_3327()
-		{
-		}
-		[Test]
-		public void Test_3328()
-		{
-		}
-		[Test]
-		public void Test_3329()
-		{
-		}
-		[Test]
-		public void Test_3330()
-		{
-		}
-		[Test]
-		public void Test_3331()
-		{
-		}
-		[Test]
-		public void Test_3332()
-		{
-		}
-		[Test]
-		public void Test_3333()
-		{
-		}
-		[Test]
-		public void Test_3334()
-		{
-		}
-		[Test]
-		public void Test_3335()
-		{
-		}
-		[Test]
-		public void Test_3336()
-		{
-		}
-		[Test]
-		public void Test_3337()
-		{
-		}
-		[Test]
-		public void Test_3338()
-		{
-		}
-		[Test]
-		public void Test_3339()
-		{
-		}
-		[Test]
-		public void Test_3340()
-		{
-		}
-		[Test]
-		public void Test_3341()
-		{
-		}
-		[Test]
-		public void Test_3342()
-		{
-		}
-		[Test]
-		public void Test_3343()
-		{
-		}
-		[Test]
-		public void Test_3344()
-		{
-		}
-		[Test]
-		public void Test_3345()
-		{
-		}
-		[Test]
-		public void Test_3346()
-		{
-		}
-		[Test]
-		public void Test_3347()
-		{
-		}
-		[Test]
-		public void Test_3348()
-		{
-		}
-		[Test]
-		public void Test_3349()
-		{
-		}
-		[Test]
-		public void Test_3350()
-		{
-		}
-		[Test]
-		public void Test_3351()
-		{
-		}
-		[Test]
-		public void Test_3352()
-		{
-		}
-		[Test]
-		public void Test_3353()
-		{
-		}
-		[Test]
-		public void Test_3354()
-		{
-		}
-		[Test]
-		public void Test_3355()
-		{
-		}
-		[Test]
-		public void Test_3356()
-		{
-		}
-		[Test]
-		public void Test_3357()
-		{
-		}
-		[Test]
-		public void Test_3358()
-		{
-		}
-		[Test]
-		public void Test_3359()
-		{
-		}
-		[Test]
-		public void Test_3360()
-		{
-		}
-		[Test]
-		public void Test_3361()
-		{
-		}
-		[Test]
-		public void Test_3362()
-		{
-		}
-		[Test]
-		public void Test_3363()
-		{
-		}
-		[Test]
-		public void Test_3364()
-		{
-		}
-		[Test]
-		public void Test_3365()
-		{
-		}
-		[Test]
-		public void Test_3366()
-		{
-		}
-		[Test]
-		public void Test_3367()
-		{
-		}
-		[Test]
-		public void Test_3368()
-		{
-		}
-		[Test]
-		public void Test_3369()
-		{
-		}
-		[Test]
-		public void Test_3370()
-		{
-		}
-		[Test]
-		public void Test_3371()
-		{
-		}
-		[Test]
-		public void Test_3372()
-		{
-		}
-		[Test]
-		public void Test_3373()
-		{
-		}
-		[Test]
-		public void Test_3374()
-		{
-		}
-		[Test]
-		public void Test_3375()
-		{
-		}
-		[Test]
-		public void Test_3376()
-		{
-		}
-		[Test]
-		public void Test_3377()
-		{
-		}
-		[Test]
-		public void Test_3378()
-		{
-		}
-		[Test]
-		public void Test_3379()
-		{
-		}
-		[Test]
-		public void Test_3380()
-		{
-		}
-		[Test]
-		public void Test_3381()
-		{
-		}
-		[Test]
-		public void Test_3382()
-		{
-		}
-		[Test]
-		public void Test_3383()
-		{
-		}
-		[Test]
-		public void Test_3384()
-		{
-		}
-		[Test]
-		public void Test_3385()
-		{
-		}
-		[Test]
-		public void Test_3386()
-		{
-		}
-		[Test]
-		public void Test_3387()
-		{
-		}
-		[Test]
-		public void Test_3388()
-		{
-		}
-		[Test]
-		public void Test_3389()
-		{
-		}
-		[Test]
-		public void Test_3390()
-		{
-		}
-		[Test]
-		public void Test_3391()
-		{
-		}
-		[Test]
-		public void Test_3392()
-		{
-		}
-		[Test]
-		public void Test_3393()
-		{
-		}
-		[Test]
-		public void Test_3394()
-		{
-		}
-		[Test]
-		public void Test_3395()
-		{
-		}
-		[Test]
-		public void Test_3396()
-		{
-		}
-		[Test]
-		public void Test_3397()
-		{
-		}
-		[Test]
-		public void Test_3398()
-		{
-		}
-		[Test]
-		public void Test_3399()
-		{
-		}
-		[Test]
-		public void Test_3400()
-		{
-		}
-		[Test]
-		public void Test_3401()
-		{
-		}
-		[Test]
-		public void Test_3402()
-		{
-		}
-		[Test]
-		public void Test_3403()
-		{
-		}
-		[Test]
-		public void Test_3404()
-		{
-		}
-		[Test]
-		public void Test_3405()
-		{
-		}
-		[Test]
-		public void Test_3406()
-		{
-		}
-		[Test]
-		public void Test_3407()
-		{
-		}
-		[Test]
-		public void Test_3408()
-		{
-		}
-		[Test]
-		public void Test_3409()
-		{
-		}
-		[Test]
-		public void Test_3410()
-		{
-		}
-		[Test]
-		public void Test_3411()
-		{
-		}
-		[Test]
-		public void Test_3412()
-		{
-		}
-		[Test]
-		public void Test_3413()
-		{
-		}
-		[Test]
-		public void Test_3414()
-		{
-		}
-		[Test]
-		public void Test_3415()
-		{
-		}
-		[Test]
-		public void Test_3416()
-		{
-		}
-		[Test]
-		public void Test_3417()
-		{
-		}
-		[Test]
-		public void Test_3418()
-		{
-		}
-		[Test]
-		public void Test_3419()
-		{
-		}
-		[Test]
-		public void Test_3420()
-		{
-		}
-		[Test]
-		public void Test_3421()
-		{
-		}
-		[Test]
-		public void Test_3422()
-		{
-		}
-		[Test]
-		public void Test_3423()
-		{
-		}
-		[Test]
-		public void Test_3424()
-		{
-		}
-		[Test]
-		public void Test_3425()
-		{
-		}
-		[Test]
-		public void Test_3426()
-		{
-		}
-		[Test]
-		public void Test_3427()
-		{
-		}
-		[Test]
-		public void Test_3428()
-		{
-		}
-		[Test]
-		public void Test_3429()
-		{
-		}
-		[Test]
-		public void Test_3430()
-		{
-		}
-		[Test]
-		public void Test_3431()
-		{
-		}
-		[Test]
-		public void Test_3432()
-		{
-		}
-		[Test]
-		public void Test_3433()
-		{
-		}
-		[Test]
-		public void Test_3434()
-		{
-		}
-		[Test]
-		public void Test_3435()
-		{
-		}
-		[Test]
-		public void Test_3436()
-		{
-		}
-		[Test]
-		public void Test_3437()
-		{
-		}
-		[Test]
-		public void Test_3438()
-		{
-		}
-		[Test]
-		public void Test_3439()
-		{
-		}
-		[Test]
-		public void Test_3440()
-		{
-		}
-		[Test]
-		public void Test_3441()
-		{
-		}
-		[Test]
-		public void Test_3442()
-		{
-		}
-		[Test]
-		public void Test_3443()
-		{
-		}
-		[Test]
-		public void Test_3444()
-		{
-		}
-		[Test]
-		public void Test_3445()
-		{
-		}
-		[Test]
-		public void Test_3446()
-		{
-		}
-		[Test]
-		public void Test_3447()
-		{
-		}
-		[Test]
-		public void Test_3448()
-		{
-		}
-		[Test]
-		public void Test_3449()
-		{
-		}
-		[Test]
-		public void Test_3450()
-		{
-		}
-		[Test]
-		public void Test_3451()
-		{
-		}
-		[Test]
-		public void Test_3452()
-		{
-		}
-		[Test]
-		public void Test_3453()
-		{
-		}
-		[Test]
-		public void Test_3454()
-		{
-		}
-		[Test]
-		public void Test_3455()
-		{
-		}
-		[Test]
-		public void Test_3456()
-		{
-		}
-		[Test]
-		public void Test_3457()
-		{
-		}
-		[Test]
-		public void Test_3458()
-		{
-		}
-		[Test]
-		public void Test_3459()
-		{
-		}
-		[Test]
-		public void Test_3460()
-		{
-		}
-		[Test]
-		public void Test_3461()
-		{
-		}
-		[Test]
-		public void Test_3462()
-		{
-		}
-		[Test]
-		public void Test_3463()
-		{
-		}
-		[Test]
-		public void Test_3464()
-		{
-		}
-		[Test]
-		public void Test_3465()
-		{
-		}
-		[Test]
-		public void Test_3466()
-		{
-		}
-		[Test]
-		public void Test_3467()
-		{
-		}
-		[Test]
-		public void Test_3468()
-		{
-		}
-		[Test]
-		public void Test_3469()
-		{
-		}
-		[Test]
-		public void Test_3470()
-		{
-		}
-		[Test]
-		public void Test_3471()
-		{
-		}
-		[Test]
-		public void Test_3472()
-		{
-		}
-		[Test]
-		public void Test_3473()
-		{
-		}
-		[Test]
-		public void Test_3474()
-		{
-		}
-		[Test]
-		public void Test_3475()
-		{
-		}
-		[Test]
-		public void Test_3476()
-		{
-		}
-		[Test]
-		public void Test_3477()
-		{
-		}
-		[Test]
-		public void Test_3478()
-		{
-		}
-		[Test]
-		public void Test_3479()
-		{
-		}
-		[Test]
-		public void Test_3480()
-		{
-		}
-		[Test]
-		public void Test_3481()
-		{
-		}
-		[Test]
-		public void Test_3482()
-		{
-		}
-		[Test]
-		public void Test_3483()
-		{
-		}
-		[Test]
-		public void Test_3484()
-		{
-		}
-		[Test]
-		public void Test_3485()
-		{
-		}
-		[Test]
-		public void Test_3486()
-		{
-		}
-		[Test]
-		public void Test_3487()
-		{
-		}
-		[Test]
-		public void Test_3488()
-		{
-		}
-		[Test]
-		public void Test_3489()
-		{
-		}
-		[Test]
-		public void Test_3490()
-		{
-		}
-		[Test]
-		public void Test_3491()
-		{
-		}
-		[Test]
-		public void Test_3492()
-		{
-		}
-		[Test]
-		public void Test_3493()
-		{
-		}
-		[Test]
-		public void Test_3494()
-		{
-		}
-		[Test]
-		public void Test_3495()
-		{
-		}
-		[Test]
-		public void Test_3496()
-		{
-		}
-		[Test]
-		public void Test_3497()
-		{
-		}
-		[Test]
-		public void Test_3498()
-		{
-		}
-		[Test]
-		public void Test_3499()
-		{
-		}
-		[Test]
-		public void Test_3500()
-		{
-		}
-		[Test]
-		public void Test_3501()
-		{
-		}
-		[Test]
-		public void Test_3502()
-		{
-		}
-		[Test]
-		public void Test_3503()
-		{
-		}
-		[Test]
-		public void Test_3504()
-		{
-		}
-		[Test]
-		public void Test_3505()
-		{
-		}
-		[Test]
-		public void Test_3506()
-		{
-		}
-		[Test]
-		public void Test_3507()
-		{
-		}
-		[Test]
-		public void Test_3508()
-		{
-		}
-		[Test]
-		public void Test_3509()
-		{
-		}
-		[Test]
-		public void Test_3510()
-		{
-		}
-		[Test]
-		public void Test_3511()
-		{
-		}
-		[Test]
-		public void Test_3512()
-		{
-		}
-		[Test]
-		public void Test_3513()
-		{
-		}
-		[Test]
-		public void Test_3514()
-		{
-		}
-		[Test]
-		public void Test_3515()
-		{
-		}
-		[Test]
-		public void Test_3516()
-		{
-		}
-		[Test]
-		public void Test_3517()
-		{
-		}
-		[Test]
-		public void Test_3518()
-		{
-		}
-		[Test]
-		public void Test_3519()
-		{
-		}
-		[Test]
-		public void Test_3520()
-		{
-		}
-		[Test]
-		public void Test_3521()
-		{
-		}
-		[Test]
-		public void Test_3522()
-		{
-		}
-		[Test]
-		public void Test_3523()
-		{
-		}
-		[Test]
-		public void Test_3524()
-		{
-		}
-		[Test]
-		public void Test_3525()
-		{
-		}
-		[Test]
-		public void Test_3526()
-		{
-		}
-		[Test]
-		public void Test_3527()
-		{
-		}
-		[Test]
-		public void Test_3528()
-		{
-		}
-		[Test]
-		public void Test_3529()
-		{
-		}
-		[Test]
-		public void Test_3530()
-		{
-		}
-		[Test]
-		public void Test_3531()
-		{
-		}
-		[Test]
-		public void Test_3532()
-		{
-		}
-		[Test]
-		public void Test_3533()
-		{
-		}
-		[Test]
-		public void Test_3534()
-		{
-		}
-		[Test]
-		public void Test_3535()
-		{
-		}
-		[Test]
-		public void Test_3536()
-		{
-		}
-		[Test]
-		public void Test_3537()
-		{
-		}
-		[Test]
-		public void Test_3538()
-		{
-		}
-		[Test]
-		public void Test_3539()
-		{
-		}
-		[Test]
-		public void Test_3540()
-		{
-		}
-		[Test]
-		public void Test_3541()
-		{
-		}
-		[Test]
-		public void Test_3542()
-		{
-		}
-		[Test]
-		public void Test_3543()
-		{
-		}
-		[Test]
-		public void Test_3544()
-		{
-		}
-		[Test]
-		public void Test_3545()
-		{
-		}
-		[Test]
-		public void Test_3546()
-		{
-		}
-		[Test]
-		public void Test_3547()
-		{
-		}
-		[Test]
-		public void Test_3548()
-		{
-		}
-		[Test]
-		public void Test_3549()
-		{
-		}
-		[Test]
-		public void Test_3550()
-		{
-		}
-		[Test]
-		public void Test_3551()
-		{
-		}
-		[Test]
-		public void Test_3552()
-		{
-		}
-		[Test]
-		public void Test_3553()
-		{
-		}
-		[Test]
-		public void Test_3554()
-		{
-		}
-		[Test]
-		public void Test_3555()
-		{
-		}
-		[Test]
-		public void Test_3556()
-		{
-		}
-		[Test]
-		public void Test_3557()
-		{
-		}
-		[Test]
-		public void Test_3558()
-		{
-		}
-		[Test]
-		public void Test_3559()
-		{
-		}
-		[Test]
-		public void Test_3560()
-		{
-		}
-		[Test]
-		public void Test_3561()
-		{
-		}
-		[Test]
-		public void Test_3562()
-		{
-		}
-		[Test]
-		public void Test_3563()
-		{
-		}
-		[Test]
-		public void Test_3564()
-		{
-		}
-		[Test]
-		public void Test_3565()
-		{
-		}
-		[Test]
-		public void Test_3566()
-		{
-		}
-		[Test]
-		public void Test_3567()
-		{
-		}
-		[Test]
-		public void Test_3568()
-		{
-		}
-		[Test]
-		public void Test_3569()
-		{
-		}
-		[Test]
-		public void Test_3570()
-		{
-		}
-		[Test]
-		public void Test_3571()
-		{
-		}
-		[Test]
-		public void Test_3572()
-		{
-		}
-		[Test]
-		public void Test_3573()
-		{
-		}
-		[Test]
-		public void Test_3574()
-		{
-		}
-		[Test]
-		public void Test_3575()
-		{
-		}
-		[Test]
-		public void Test_3576()
-		{
-		}
-		[Test]
-		public void Test_3577()
-		{
-		}
-		[Test]
-		public void Test_3578()
-		{
-		}
-		[Test]
-		public void Test_3579()
-		{
-		}
-		[Test]
-		public void Test_3580()
-		{
-		}
-		[Test]
-		public void Test_3581()
-		{
-		}
-		[Test]
-		public void Test_3582()
-		{
-		}
-		[Test]
-		public void Test_3583()
-		{
-		}
-		[Test]
-		public void Test_3584()
-		{
-		}
-		[Test]
-		public void Test_3585()
-		{
-		}
-		[Test]
-		public void Test_3586()
-		{
-		}
-		[Test]
-		public void Test_3587()
-		{
-		}
-		[Test]
-		public void Test_3588()
-		{
-		}
-		[Test]
-		public void Test_3589()
-		{
-		}
-		[Test]
-		public void Test_3590()
-		{
-		}
-		[Test]
-		public void Test_3591()
-		{
-		}
-		[Test]
-		public void Test_3592()
-		{
-		}
-		[Test]
-		public void Test_3593()
-		{
-		}
-		[Test]
-		public void Test_3594()
-		{
-		}
-		[Test]
-		public void Test_3595()
-		{
-		}
-		[Test]
-		public void Test_3596()
-		{
-		}
-		[Test]
-		public void Test_3597()
-		{
-		}
-		[Test]
-		public void Test_3598()
-		{
-		}
-		[Test]
-		public void Test_3599()
-		{
-		}
-		[Test]
-		public void Test_3600()
-		{
-		}
-		[Test]
-		public void Test_3601()
-		{
-		}
-		[Test]
-		public void Test_3602()
-		{
-		}
-		[Test]
-		public void Test_3603()
-		{
-		}
-		[Test]
-		public void Test_3604()
-		{
-		}
-		[Test]
-		public void Test_3605()
-		{
-		}
-		[Test]
-		public void Test_3606()
-		{
-		}
-		[Test]
-		public void Test_3607()
-		{
-		}
-		[Test]
-		public void Test_3608()
-		{
-		}
-		[Test]
-		public void Test_3609()
-		{
-		}
-		[Test]
-		public void Test_3610()
-		{
-		}
-		[Test]
-		public void Test_3611()
-		{
-		}
-		[Test]
-		public void Test_3612()
-		{
-		}
-		[Test]
-		public void Test_3613()
-		{
-		}
-		[Test]
-		public void Test_3614()
-		{
-		}
-		[Test]
-		public void Test_3615()
-		{
-		}
-		[Test]
-		public void Test_3616()
-		{
-		}
-		[Test]
-		public void Test_3617()
-		{
-		}
-		[Test]
-		public void Test_3618()
-		{
-		}
-		[Test]
-		public void Test_3619()
-		{
-		}
-		[Test]
-		public void Test_3620()
-		{
-		}
-		[Test]
-		public void Test_3621()
-		{
-		}
-		[Test]
-		public void Test_3622()
-		{
-		}
-		[Test]
-		public void Test_3623()
-		{
-		}
-		[Test]
-		public void Test_3624()
-		{
-		}
-		[Test]
-		public void Test_3625()
-		{
-		}
-		[Test]
-		public void Test_3626()
-		{
-		}
-		[Test]
-		public void Test_3627()
-		{
-		}
-		[Test]
-		public void Test_3628()
-		{
-		}
-		[Test]
-		public void Test_3629()
-		{
-		}
-		[Test]
-		public void Test_3630()
-		{
-		}
-		[Test]
-		public void Test_3631()
-		{
-		}
-		[Test]
-		public void Test_3632()
-		{
-		}
-		[Test]
-		public void Test_3633()
-		{
-		}
-		[Test]
-		public void Test_3634()
-		{
-		}
-		[Test]
-		public void Test_3635()
-		{
-		}
-		[Test]
-		public void Test_3636()
-		{
-		}
-		[Test]
-		public void Test_3637()
-		{
-		}
-		[Test]
-		public void Test_3638()
-		{
-		}
-		[Test]
-		public void Test_3639()
-		{
-		}
-		[Test]
-		public void Test_3640()
-		{
-		}
-		[Test]
-		public void Test_3641()
-		{
-		}
-		[Test]
-		public void Test_3642()
-		{
-		}
-		[Test]
-		public void Test_3643()
-		{
-		}
-		[Test]
-		public void Test_3644()
-		{
-		}
-		[Test]
-		public void Test_3645()
-		{
-		}
-		[Test]
-		public void Test_3646()
-		{
-		}
-		[Test]
-		public void Test_3647()
-		{
-		}
-		[Test]
-		public void Test_3648()
-		{
-		}
-		[Test]
-		public void Test_3649()
-		{
-		}
-		[Test]
-		public void Test_3650()
-		{
-		}
-		[Test]
-		public void Test_3651()
-		{
-		}
-		[Test]
-		public void Test_3652()
-		{
-		}
-		[Test]
-		public void Test_3653()
-		{
-		}
-		[Test]
-		public void Test_3654()
-		{
-		}
-		[Test]
-		public void Test_3655()
-		{
-		}
-		[Test]
-		public void Test_3656()
-		{
-		}
-		[Test]
-		public void Test_3657()
-		{
-		}
-		[Test]
-		public void Test_3658()
-		{
-		}
-		[Test]
-		public void Test_3659()
-		{
-		}
-		[Test]
-		public void Test_3660()
-		{
-		}
-		[Test]
-		public void Test_3661()
-		{
-		}
-		[Test]
-		public void Test_3662()
-		{
-		}
-		[Test]
-		public void Test_3663()
-		{
-		}
-		[Test]
-		public void Test_3664()
-		{
-		}
-		[Test]
-		public void Test_3665()
-		{
-		}
-		[Test]
-		public void Test_3666()
-		{
-		}
-		[Test]
-		public void Test_3667()
-		{
-		}
-		[Test]
-		public void Test_3668()
-		{
-		}
-		[Test]
-		public void Test_3669()
-		{
-		}
-		[Test]
-		public void Test_3670()
-		{
-		}
-		[Test]
-		public void Test_3671()
-		{
-		}
-		[Test]
-		public void Test_3672()
-		{
-		}
-		[Test]
-		public void Test_3673()
-		{
-		}
-		[Test]
-		public void Test_3674()
-		{
-		}
-		[Test]
-		public void Test_3675()
-		{
-		}
-		[Test]
-		public void Test_3676()
-		{
-		}
-		[Test]
-		public void Test_3677()
-		{
-		}
-		[Test]
-		public void Test_3678()
-		{
-		}
-		[Test]
-		public void Test_3679()
-		{
-		}
-		[Test]
-		public void Test_3680()
-		{
-		}
-		[Test]
-		public void Test_3681()
-		{
-		}
-		[Test]
-		public void Test_3682()
-		{
-		}
-		[Test]
-		public void Test_3683()
-		{
-		}
-		[Test]
-		public void Test_3684()
-		{
-		}
-		[Test]
-		public void Test_3685()
-		{
-		}
-		[Test]
-		public void Test_3686()
-		{
-		}
-		[Test]
-		public void Test_3687()
-		{
-		}
-		[Test]
-		public void Test_3688()
-		{
-		}
-		[Test]
-		public void Test_3689()
-		{
-		}
-		[Test]
-		public void Test_3690()
-		{
-		}
-		[Test]
-		public void Test_3691()
-		{
-		}
-		[Test]
-		public void Test_3692()
-		{
-		}
-		[Test]
-		public void Test_3693()
-		{
-		}
-		[Test]
-		public void Test_3694()
-		{
-		}
-		[Test]
-		public void Test_3695()
-		{
-		}
-		[Test]
-		public void Test_3696()
-		{
-		}
-		[Test]
-		public void Test_3697()
-		{
-		}
-		[Test]
-		public void Test_3698()
-		{
-		}
-		[Test]
-		public void Test_3699()
-		{
-		}
-		[Test]
-		public void Test_3700()
-		{
-		}
-		[Test]
-		public void Test_3701()
-		{
-		}
-		[Test]
-		public void Test_3702()
-		{
-		}
-		[Test]
-		public void Test_3703()
-		{
-		}
-		[Test]
-		public void Test_3704()
-		{
-		}
-		[Test]
-		public void Test_3705()
-		{
-		}
-		[Test]
-		public void Test_3706()
-		{
-		}
-		[Test]
-		public void Test_3707()
-		{
-		}
-		[Test]
-		public void Test_3708()
-		{
-		}
-		[Test]
-		public void Test_3709()
-		{
-		}
-		[Test]
-		public void Test_3710()
-		{
-		}
-		[Test]
-		public void Test_3711()
-		{
-		}
-		[Test]
-		public void Test_3712()
-		{
-		}
-		[Test]
-		public void Test_3713()
-		{
-		}
-		[Test]
-		public void Test_3714()
-		{
-		}
-		[Test]
-		public void Test_3715()
-		{
-		}
-		[Test]
-		public void Test_3716()
-		{
-		}
-		[Test]
-		public void Test_3717()
-		{
-		}
-		[Test]
-		public void Test_3718()
-		{
-		}
-		[Test]
-		public void Test_3719()
-		{
-		}
-		[Test]
-		public void Test_3720()
-		{
-		}
-		[Test]
-		public void Test_3721()
-		{
-		}
-		[Test]
-		public void Test_3722()
-		{
-		}
-		[Test]
-		public void Test_3723()
-		{
-		}
-		[Test]
-		public void Test_3724()
-		{
-		}
-		[Test]
-		public void Test_3725()
-		{
-		}
-		[Test]
-		public void Test_3726()
-		{
-		}
-		[Test]
-		public void Test_3727()
-		{
-		}
-		[Test]
-		public void Test_3728()
-		{
-		}
-		[Test]
-		public void Test_3729()
-		{
-		}
-		[Test]
-		public void Test_3730()
-		{
-		}
-		[Test]
-		public void Test_3731()
-		{
-		}
-		[Test]
-		public void Test_3732()
-		{
-		}
-		[Test]
-		public void Test_3733()
-		{
-		}
-		[Test]
-		public void Test_3734()
-		{
-		}
-		[Test]
-		public void Test_3735()
-		{
-		}
-		[Test]
-		public void Test_3736()
-		{
-		}
-		[Test]
-		public void Test_3737()
-		{
-		}
-		[Test]
-		public void Test_3738()
-		{
-		}
-		[Test]
-		public void Test_3739()
-		{
-		}
-		[Test]
-		public void Test_3740()
-		{
-		}
-		[Test]
-		public void Test_3741()
-		{
-		}
-		[Test]
-		public void Test_3742()
-		{
-		}
-		[Test]
-		public void Test_3743()
-		{
-		}
-		[Test]
-		public void Test_3744()
-		{
-		}
-		[Test]
-		public void Test_3745()
-		{
-		}
-		[Test]
-		public void Test_3746()
-		{
-		}
-		[Test]
-		public void Test_3747()
-		{
-		}
-		[Test]
-		public void Test_3748()
-		{
-		}
-		[Test]
-		public void Test_3749()
-		{
-		}
-		[Test]
-		public void Test_3750()
-		{
-		}
-		[Test]
-		public void Test_3751()
-		{
-		}
-		[Test]
-		public void Test_3752()
-		{
-		}
-		[Test]
-		public void Test_3753()
-		{
-		}
-		[Test]
-		public void Test_3754()
-		{
-		}
-		[Test]
-		public void Test_3755()
-		{
-		}
-		[Test]
-		public void Test_3756()
-		{
-		}
-		[Test]
-		public void Test_3757()
-		{
-		}
-		[Test]
-		public void Test_3758()
-		{
-		}
-		[Test]
-		public void Test_3759()
-		{
-		}
-		[Test]
-		public void Test_3760()
-		{
-		}
-		[Test]
-		public void Test_3761()
-		{
-		}
-		[Test]
-		public void Test_3762()
-		{
-		}
-		[Test]
-		public void Test_3763()
-		{
-		}
-		[Test]
-		public void Test_3764()
-		{
-		}
-		[Test]
-		public void Test_3765()
-		{
-		}
-		[Test]
-		public void Test_3766()
-		{
-		}
-		[Test]
-		public void Test_3767()
-		{
-		}
-		[Test]
-		public void Test_3768()
-		{
-		}
-		[Test]
-		public void Test_3769()
-		{
-		}
-		[Test]
-		public void Test_3770()
-		{
-		}
-		[Test]
-		public void Test_3771()
-		{
-		}
-		[Test]
-		public void Test_3772()
-		{
-		}
-		[Test]
-		public void Test_3773()
-		{
-		}
-		[Test]
-		public void Test_3774()
-		{
-		}
-		[Test]
-		public void Test_3775()
-		{
-		}
-		[Test]
-		public void Test_3776()
-		{
-		}
-		[Test]
-		public void Test_3777()
-		{
-		}
-		[Test]
-		public void Test_3778()
-		{
-		}
-		[Test]
-		public void Test_3779()
-		{
-		}
-		[Test]
-		public void Test_3780()
-		{
-		}
-		[Test]
-		public void Test_3781()
-		{
-		}
-		[Test]
-		public void Test_3782()
-		{
-		}
-		[Test]
-		public void Test_3783()
-		{
-		}
-		[Test]
-		public void Test_3784()
-		{
-		}
-		[Test]
-		public void Test_3785()
-		{
-		}
-		[Test]
-		public void Test_3786()
-		{
-		}
-		[Test]
-		public void Test_3787()
-		{
-		}
-		[Test]
-		public void Test_3788()
-		{
-		}
-		[Test]
-		public void Test_3789()
-		{
-		}
-		[Test]
-		public void Test_3790()
-		{
-		}
-		[Test]
-		public void Test_3791()
-		{
-		}
-		[Test]
-		public void Test_3792()
-		{
-		}
-		[Test]
-		public void Test_3793()
-		{
-		}
-		[Test]
-		public void Test_3794()
-		{
-		}
-		[Test]
-		public void Test_3795()
-		{
-		}
-		[Test]
-		public void Test_3796()
-		{
-		}
-		[Test]
-		public void Test_3797()
-		{
-		}
-		[Test]
-		public void Test_3798()
-		{
-		}
-		[Test]
-		public void Test_3799()
-		{
-		}
-		[Test]
-		public void Test_3800()
-		{
-		}
-		[Test]
-		public void Test_3801()
-		{
-		}
-		[Test]
-		public void Test_3802()
-		{
-		}
-		[Test]
-		public void Test_3803()
-		{
-		}
-		[Test]
-		public void Test_3804()
-		{
-		}
-		[Test]
-		public void Test_3805()
-		{
-		}
-		[Test]
-		public void Test_3806()
-		{
-		}
-		[Test]
-		public void Test_3807()
-		{
-		}
-		[Test]
-		public void Test_3808()
-		{
-		}
-		[Test]
-		public void Test_3809()
-		{
-		}
-		[Test]
-		public void Test_3810()
-		{
-		}
-		[Test]
-		public void Test_3811()
-		{
-		}
-		[Test]
-		public void Test_3812()
-		{
-		}
-		[Test]
-		public void Test_3813()
-		{
-		}
-		[Test]
-		public void Test_3814()
-		{
-		}
-		[Test]
-		public void Test_3815()
-		{
-		}
-		[Test]
-		public void Test_3816()
-		{
-		}
-		[Test]
-		public void Test_3817()
-		{
-		}
-		[Test]
-		public void Test_3818()
-		{
-		}
-		[Test]
-		public void Test_3819()
-		{
-		}
-		[Test]
-		public void Test_3820()
-		{
-		}
-		[Test]
-		public void Test_3821()
-		{
-		}
-		[Test]
-		public void Test_3822()
-		{
-		}
-		[Test]
-		public void Test_3823()
-		{
-		}
-		[Test]
-		public void Test_3824()
-		{
-		}
-		[Test]
-		public void Test_3825()
-		{
-		}
-		[Test]
-		public void Test_3826()
-		{
-		}
-		[Test]
-		public void Test_3827()
-		{
-		}
-		[Test]
-		public void Test_3828()
-		{
-		}
-		[Test]
-		public void Test_3829()
-		{
-		}
-		[Test]
-		public void Test_3830()
-		{
-		}
-		[Test]
-		public void Test_3831()
-		{
-		}
-		[Test]
-		public void Test_3832()
-		{
-		}
-		[Test]
-		public void Test_3833()
-		{
-		}
-		[Test]
-		public void Test_3834()
-		{
-		}
-		[Test]
-		public void Test_3835()
-		{
-		}
-		[Test]
-		public void Test_3836()
-		{
-		}
-		[Test]
-		public void Test_3837()
-		{
-		}
-		[Test]
-		public void Test_3838()
-		{
-		}
-		[Test]
-		public void Test_3839()
-		{
-		}
-		[Test]
-		public void Test_3840()
-		{
-		}
-		[Test]
-		public void Test_3841()
-		{
-		}
-		[Test]
-		public void Test_3842()
-		{
-		}
-		[Test]
-		public void Test_3843()
-		{
-		}
-		[Test]
-		public void Test_3844()
-		{
-		}
-		[Test]
-		public void Test_3845()
-		{
-		}
-		[Test]
-		public void Test_3846()
-		{
-		}
-		[Test]
-		public void Test_3847()
-		{
-		}
-		[Test]
-		public void Test_3848()
-		{
-		}
-		[Test]
-		public void Test_3849()
-		{
-		}
-		[Test]
-		public void Test_3850()
-		{
-		}
-		[Test]
-		public void Test_3851()
-		{
-		}
-		[Test]
-		public void Test_3852()
-		{
-		}
-		[Test]
-		public void Test_3853()
-		{
-		}
-		[Test]
-		public void Test_3854()
-		{
-		}
-		[Test]
-		public void Test_3855()
-		{
-		}
-		[Test]
-		public void Test_3856()
-		{
-		}
-		[Test]
-		public void Test_3857()
-		{
-		}
-		[Test]
-		public void Test_3858()
-		{
-		}
-		[Test]
-		public void Test_3859()
-		{
-		}
-		[Test]
-		public void Test_3860()
-		{
-		}
-		[Test]
-		public void Test_3861()
-		{
-		}
-		[Test]
-		public void Test_3862()
-		{
-		}
-		[Test]
-		public void Test_3863()
-		{
-		}
-		[Test]
-		public void Test_3864()
-		{
-		}
-		[Test]
-		public void Test_3865()
-		{
-		}
-		[Test]
-		public void Test_3866()
-		{
-		}
-		[Test]
-		public void Test_3867()
-		{
-		}
-		[Test]
-		public void Test_3868()
-		{
-		}
-		[Test]
-		public void Test_3869()
-		{
-		}
-		[Test]
-		public void Test_3870()
-		{
-		}
-		[Test]
-		public void Test_3871()
-		{
-		}
-		[Test]
-		public void Test_3872()
-		{
-		}
-		[Test]
-		public void Test_3873()
-		{
-		}
-		[Test]
-		public void Test_3874()
-		{
-		}
-		[Test]
-		public void Test_3875()
-		{
-		}
-		[Test]
-		public void Test_3876()
-		{
-		}
-		[Test]
-		public void Test_3877()
-		{
-		}
-		[Test]
-		public void Test_3878()
-		{
-		}
-		[Test]
-		public void Test_3879()
-		{
-		}
-		[Test]
-		public void Test_3880()
-		{
-		}
-		[Test]
-		public void Test_3881()
-		{
-		}
-		[Test]
-		public void Test_3882()
-		{
-		}
-		[Test]
-		public void Test_3883()
-		{
-		}
-		[Test]
-		public void Test_3884()
-		{
-		}
-		[Test]
-		public void Test_3885()
-		{
-		}
-		[Test]
-		public void Test_3886()
-		{
-		}
-		[Test]
-		public void Test_3887()
-		{
-		}
-		[Test]
-		public void Test_3888()
-		{
-		}
-		[Test]
-		public void Test_3889()
-		{
-		}
-		[Test]
-		public void Test_3890()
-		{
-		}
-		[Test]
-		public void Test_3891()
-		{
-		}
-		[Test]
-		public void Test_3892()
-		{
-		}
-		[Test]
-		public void Test_3893()
-		{
-		}
-		[Test]
-		public void Test_3894()
-		{
-		}
-		[Test]
-		public void Test_3895()
-		{
-		}
-		[Test]
-		public void Test_3896()
-		{
-		}
-		[Test]
-		public void Test_3897()
-		{
-		}
-		[Test]
-		public void Test_3898()
-		{
-		}
-		[Test]
-		public void Test_3899()
-		{
-		}
-		[Test]
-		public void Test_3900()
-		{
-		}
-		[Test]
-		public void Test_3901()
-		{
-		}
-		[Test]
-		public void Test_3902()
-		{
-		}
-		[Test]
-		public void Test_3903()
-		{
-		}
-		[Test]
-		public void Test_3904()
-		{
-		}
-		[Test]
-		public void Test_3905()
-		{
-		}
-		[Test]
-		public void Test_3906()
-		{
-		}
-		[Test]
-		public void Test_3907()
-		{
-		}
-		[Test]
-		public void Test_3908()
-		{
-		}
-		[Test]
-		public void Test_3909()
-		{
-		}
-		[Test]
-		public void Test_3910()
-		{
-		}
-		[Test]
-		public void Test_3911()
-		{
-		}
-		[Test]
-		public void Test_3912()
-		{
-		}
-		[Test]
-		public void Test_3913()
-		{
-		}
-		[Test]
-		public void Test_3914()
-		{
-		}
-		[Test]
-		public void Test_3915()
-		{
-		}
-		[Test]
-		public void Test_3916()
-		{
-		}
-		[Test]
-		public void Test_3917()
-		{
-		}
-		[Test]
-		public void Test_3918()
-		{
-		}
-		[Test]
-		public void Test_3919()
-		{
-		}
-		[Test]
-		public void Test_3920()
-		{
-		}
-		[Test]
-		public void Test_3921()
-		{
-		}
-		[Test]
-		public void Test_3922()
-		{
-		}
-		[Test]
-		public void Test_3923()
-		{
-		}
-		[Test]
-		public void Test_3924()
-		{
-		}
-		[Test]
-		public void Test_3925()
-		{
-		}
-		[Test]
-		public void Test_3926()
-		{
-		}
-		[Test]
-		public void Test_3927()
-		{
-		}
-		[Test]
-		public void Test_3928()
-		{
-		}
-		[Test]
-		public void Test_3929()
-		{
-		}
-		[Test]
-		public void Test_3930()
-		{
-		}
-		[Test]
-		public void Test_3931()
-		{
-		}
-		[Test]
-		public void Test_3932()
-		{
-		}
-		[Test]
-		public void Test_3933()
-		{
-		}
-		[Test]
-		public void Test_3934()
-		{
-		}
-		[Test]
-		public void Test_3935()
-		{
-		}
-		[Test]
-		public void Test_3936()
-		{
-		}
-		[Test]
-		public void Test_3937()
-		{
-		}
-		[Test]
-		public void Test_3938()
-		{
-		}
-		[Test]
-		public void Test_3939()
-		{
-		}
-		[Test]
-		public void Test_3940()
-		{
-		}
-		[Test]
-		public void Test_3941()
-		{
-		}
-		[Test]
-		public void Test_3942()
-		{
-		}
-		[Test]
-		public void Test_3943()
-		{
-		}
-		[Test]
-		public void Test_3944()
-		{
-		}
-		[Test]
-		public void Test_3945()
-		{
-		}
-		[Test]
-		public void Test_3946()
-		{
-		}
-		[Test]
-		public void Test_3947()
-		{
-		}
-		[Test]
-		public void Test_3948()
-		{
-		}
-		[Test]
-		public void Test_3949()
-		{
-		}
-		[Test]
-		public void Test_3950()
-		{
-		}
-		[Test]
-		public void Test_3951()
-		{
-		}
-		[Test]
-		public void Test_3952()
-		{
-		}
-		[Test]
-		public void Test_3953()
-		{
-		}
-		[Test]
-		public void Test_3954()
-		{
-		}
-		[Test]
-		public void Test_3955()
-		{
-		}
-		[Test]
-		public void Test_3956()
-		{
-		}
-		[Test]
-		public void Test_3957()
-		{
-		}
-		[Test]
-		public void Test_3958()
-		{
-		}
-		[Test]
-		public void Test_3959()
-		{
-		}
-		[Test]
-		public void Test_3960()
-		{
-		}
-		[Test]
-		public void Test_3961()
-		{
-		}
-		[Test]
-		public void Test_3962()
-		{
-		}
-		[Test]
-		public void Test_3963()
-		{
-		}
-		[Test]
-		public void Test_3964()
-		{
-		}
-		[Test]
-		public void Test_3965()
-		{
-		}
-		[Test]
-		public void Test_3966()
-		{
-		}
-		[Test]
-		public void Test_3967()
-		{
-		}
-		[Test]
-		public void Test_3968()
-		{
-		}
-		[Test]
-		public void Test_3969()
-		{
-		}
-		[Test]
-		public void Test_3970()
-		{
-		}
-		[Test]
-		public void Test_3971()
-		{
-		}
-		[Test]
-		public void Test_3972()
-		{
-		}
-		[Test]
-		public void Test_3973()
-		{
-		}
-		[Test]
-		public void Test_3974()
-		{
-		}
-		[Test]
-		public void Test_3975()
-		{
-		}
-		[Test]
-		public void Test_3976()
-		{
-		}
-		[Test]
-		public void Test_3977()
-		{
-		}
-		[Test]
-		public void Test_3978()
-		{
-		}
-		[Test]
-		public void Test_3979()
-		{
-		}
-		[Test]
-		public void Test_3980()
-		{
-		}
-		[Test]
-		public void Test_3981()
-		{
-		}
-		[Test]
-		public void Test_3982()
-		{
-		}
-		[Test]
-		public void Test_3983()
-		{
-		}
-		[Test]
-		public void Test_3984()
-		{
-		}
-		[Test]
-		public void Test_3985()
-		{
-		}
-		[Test]
-		public void Test_3986()
-		{
-		}
-		[Test]
-		public void Test_3987()
-		{
-		}
-		[Test]
-		public void Test_3988()
-		{
-		}
-		[Test]
-		public void Test_3989()
-		{
-		}
-		[Test]
-		public void Test_3990()
-		{
-		}
-		[Test]
-		public void Test_3991()
-		{
-		}
-		[Test]
-		public void Test_3992()
-		{
-		}
-		[Test]
-		public void Test_3993()
-		{
-		}
-		[Test]
-		public void Test_3994()
-		{
-		}
-		[Test]
-		public void Test_3995()
-		{
-		}
-		[Test]
-		public void Test_3996()
-		{
-		}
-		[Test]
-		public void Test_3997()
-		{
-		}
-		[Test]
-		public void Test_3998()
-		{
-		}
-		[Test]
-		public void Test_3999()
-		{
-		}
-		[Test]
-		public void Test_4000()
-		{
-		}
-		[Test]
-		public void Test_4001()
-		{
-		}
-		[Test]
-		public void Test_4002()
-		{
-		}
-		[Test]
-		public void Test_4003()
-		{
-		}
-		[Test]
-		public void Test_4004()
-		{
-		}
-		[Test]
-		public void Test_4005()
-		{
-		}
-		[Test]
-		public void Test_4006()
-		{
-		}
-		[Test]
-		public void Test_4007()
-		{
-		}
-		[Test]
-		public void Test_4008()
-		{
-		}
-		[Test]
-		public void Test_4009()
-		{
-		}
-		[Test]
-		public void Test_4010()
-		{
-		}
-		[Test]
-		public void Test_4011()
-		{
-		}
-		[Test]
-		public void Test_4012()
-		{
-		}
-		[Test]
-		public void Test_4013()
-		{
-		}
-		[Test]
-		public void Test_4014()
-		{
-		}
-		[Test]
-		public void Test_4015()
-		{
-		}
-		[Test]
-		public void Test_4016()
-		{
-		}
-		[Test]
-		public void Test_4017()
-		{
-		}
-		[Test]
-		public void Test_4018()
-		{
-		}
-		[Test]
-		public void Test_4019()
-		{
-		}
-		[Test]
-		public void Test_4020()
-		{
-		}
-		[Test]
-		public void Test_4021()
-		{
-		}
-		[Test]
-		public void Test_4022()
-		{
-		}
-		[Test]
-		public void Test_4023()
-		{
-		}
-		[Test]
-		public void Test_4024()
-		{
-		}
-		[Test]
-		public void Test_4025()
-		{
-		}
-		[Test]
-		public void Test_4026()
-		{
-		}
-		[Test]
-		public void Test_4027()
-		{
-		}
-		[Test]
-		public void Test_4028()
-		{
-		}
-		[Test]
-		public void Test_4029()
-		{
-		}
-		[Test]
-		public void Test_4030()
-		{
-		}
-		[Test]
-		public void Test_4031()
-		{
-		}
-		[Test]
-		public void Test_4032()
-		{
-		}
-		[Test]
-		public void Test_4033()
-		{
-		}
-		[Test]
-		public void Test_4034()
-		{
-		}
-		[Test]
-		public void Test_4035()
-		{
-		}
-		[Test]
-		public void Test_4036()
-		{
-		}
-		[Test]
-		public void Test_4037()
-		{
-		}
-		[Test]
-		public void Test_4038()
-		{
-		}
-		[Test]
-		public void Test_4039()
-		{
-		}
-		[Test]
-		public void Test_4040()
-		{
-		}
-		[Test]
-		public void Test_4041()
-		{
-		}
-		[Test]
-		public void Test_4042()
-		{
-		}
-		[Test]
-		public void Test_4043()
-		{
-		}
-		[Test]
-		public void Test_4044()
-		{
-		}
-		[Test]
-		public void Test_4045()
-		{
-		}
-		[Test]
-		public void Test_4046()
-		{
-		}
-		[Test]
-		public void Test_4047()
-		{
-		}
-		[Test]
-		public void Test_4048()
-		{
-		}
-		[Test]
-		public void Test_4049()
-		{
-		}
-		[Test]
-		public void Test_4050()
-		{
-		}
-		[Test]
-		public void Test_4051()
-		{
-		}
-		[Test]
-		public void Test_4052()
-		{
-		}
-		[Test]
-		public void Test_4053()
-		{
-		}
-		[Test]
-		public void Test_4054()
-		{
-		}
-		[Test]
-		public void Test_4055()
-		{
-		}
-		[Test]
-		public void Test_4056()
-		{
-		}
-		[Test]
-		public void Test_4057()
-		{
-		}
-		[Test]
-		public void Test_4058()
-		{
-		}
-		[Test]
-		public void Test_4059()
-		{
-		}
-		[Test]
-		public void Test_4060()
-		{
-		}
-		[Test]
-		public void Test_4061()
-		{
-		}
-		[Test]
-		public void Test_4062()
-		{
-		}
-		[Test]
-		public void Test_4063()
-		{
-		}
-		[Test]
-		public void Test_4064()
-		{
-		}
-		[Test]
-		public void Test_4065()
-		{
-		}
-		[Test]
-		public void Test_4066()
-		{
-		}
-		[Test]
-		public void Test_4067()
-		{
-		}
-		[Test]
-		public void Test_4068()
-		{
-		}
-		[Test]
-		public void Test_4069()
-		{
-		}
-		[Test]
-		public void Test_4070()
-		{
-		}
-		[Test]
-		public void Test_4071()
-		{
-		}
-		[Test]
-		public void Test_4072()
-		{
-		}
-		[Test]
-		public void Test_4073()
-		{
-		}
-		[Test]
-		public void Test_4074()
-		{
-		}
-		[Test]
-		public void Test_4075()
-		{
-		}
-		[Test]
-		public void Test_4076()
-		{
-		}
-		[Test]
-		public void Test_4077()
-		{
-		}
-		[Test]
-		public void Test_4078()
-		{
-		}
-		[Test]
-		public void Test_4079()
-		{
-		}
-		[Test]
-		public void Test_4080()
-		{
-		}
-		[Test]
-		public void Test_4081()
-		{
-		}
-		[Test]
-		public void Test_4082()
-		{
-		}
-		[Test]
-		public void Test_4083()
-		{
-		}
-		[Test]
-		public void Test_4084()
-		{
-		}
-		[Test]
-		public void Test_4085()
-		{
-		}
-		[Test]
-		public void Test_4086()
-		{
-		}
-		[Test]
-		public void Test_4087()
-		{
-		}
-		[Test]
-		public void Test_4088()
-		{
-		}
-		[Test]
-		public void Test_4089()
-		{
-		}
-		[Test]
-		public void Test_4090()
-		{
-		}
-		[Test]
-		public void Test_4091()
-		{
-		}
-		[Test]
-		public void Test_4092()
-		{
-		}
-		[Test]
-		public void Test_4093()
-		{
-		}
-		[Test]
-		public void Test_4094()
-		{
-		}
-		[Test]
-		public void Test_4095()
-		{
-		}
-		[Test]
-		public void Test_4096()
-		{
-		}
-		[Test]
-		public void Test_4097()
-		{
-		}
-		[Test]
-		public void Test_4098()
-		{
-		}
-		[Test]
-		public void Test_4099()
-		{
-		}
-		[Test]
-		public void Test_4100()
-		{
-		}
-		[Test]
-		public void Test_4101()
-		{
-		}
-		[Test]
-		public void Test_4102()
-		{
-		}
-		[Test]
-		public void Test_4103()
-		{
-		}
-		[Test]
-		public void Test_4104()
-		{
-		}
-		[Test]
-		public void Test_4105()
-		{
-		}
-		[Test]
-		public void Test_4106()
-		{
-		}
-		[Test]
-		public void Test_4107()
-		{
-		}
-		[Test]
-		public void Test_4108()
-		{
-		}
-		[Test]
-		public void Test_4109()
-		{
-		}
-		[Test]
-		public void Test_4110()
-		{
-		}
-		[Test]
-		public void Test_4111()
-		{
-		}
-		[Test]
-		public void Test_4112()
-		{
-		}
-		[Test]
-		public void Test_4113()
-		{
-		}
-		[Test]
-		public void Test_4114()
-		{
-		}
-		[Test]
-		public void Test_4115()
-		{
-		}
-		[Test]
-		public void Test_4116()
-		{
-		}
-		[Test]
-		public void Test_4117()
-		{
-		}
-		[Test]
-		public void Test_4118()
-		{
-		}
-		[Test]
-		public void Test_4119()
-		{
-		}
-		[Test]
-		public void Test_4120()
-		{
-		}
-		[Test]
-		public void Test_4121()
-		{
-		}
-		[Test]
-		public void Test_4122()
-		{
-		}
-		[Test]
-		public void Test_4123()
-		{
-		}
-		[Test]
-		public void Test_4124()
-		{
-		}
-		[Test]
-		public void Test_4125()
-		{
-		}
-		[Test]
-		public void Test_4126()
-		{
-		}
-		[Test]
-		public void Test_4127()
-		{
-		}
-		[Test]
-		public void Test_4128()
-		{
-		}
-		[Test]
-		public void Test_4129()
-		{
-		}
-		[Test]
-		public void Test_4130()
-		{
-		}
-		[Test]
-		public void Test_4131()
-		{
-		}
-		[Test]
-		public void Test_4132()
-		{
-		}
-		[Test]
-		public void Test_4133()
-		{
-		}
-		[Test]
-		public void Test_4134()
-		{
-		}
-		[Test]
-		public void Test_4135()
-		{
-		}
-		[Test]
-		public void Test_4136()
-		{
-		}
-		[Test]
-		public void Test_4137()
-		{
-		}
-		[Test]
-		public void Test_4138()
-		{
-		}
-		[Test]
-		public void Test_4139()
-		{
-		}
-		[Test]
-		public void Test_4140()
-		{
-		}
-		[Test]
-		public void Test_4141()
-		{
-		}
-		[Test]
-		public void Test_4142()
-		{
-		}
-		[Test]
-		public void Test_4143()
-		{
-		}
-		[Test]
-		public void Test_4144()
-		{
-		}
-		[Test]
-		public void Test_4145()
-		{
-		}
-		[Test]
-		public void Test_4146()
-		{
-		}
-		[Test]
-		public void Test_4147()
-		{
-		}
-		[Test]
-		public void Test_4148()
-		{
-		}
-		[Test]
-		public void Test_4149()
-		{
-		}
-		[Test]
-		public void Test_4150()
-		{
-		}
-		[Test]
-		public void Test_4151()
-		{
-		}
-		[Test]
-		public void Test_4152()
-		{
-		}
-		[Test]
-		public void Test_4153()
-		{
-		}
-		[Test]
-		public void Test_4154()
-		{
-		}
-		[Test]
-		public void Test_4155()
-		{
-		}
-		[Test]
-		public void Test_4156()
-		{
-		}
-		[Test]
-		public void Test_4157()
-		{
-		}
-		[Test]
-		public void Test_4158()
-		{
-		}
-		[Test]
-		public void Test_4159()
-		{
-		}
-		[Test]
-		public void Test_4160()
-		{
-		}
-		[Test]
-		public void Test_4161()
-		{
-		}
-		[Test]
-		public void Test_4162()
-		{
-		}
-		[Test]
-		public void Test_4163()
-		{
-		}
-		[Test]
-		public void Test_4164()
-		{
-		}
-		[Test]
-		public void Test_4165()
-		{
-		}
-		[Test]
-		public void Test_4166()
-		{
-		}
-		[Test]
-		public void Test_4167()
-		{
-		}
-		[Test]
-		public void Test_4168()
-		{
-		}
-		[Test]
-		public void Test_4169()
-		{
-		}
-		[Test]
-		public void Test_4170()
-		{
-		}
-		[Test]
-		public void Test_4171()
-		{
-		}
-		[Test]
-		public void Test_4172()
-		{
-		}
-		[Test]
-		public void Test_4173()
-		{
-		}
-		[Test]
-		public void Test_4174()
-		{
-		}
-		[Test]
-		public void Test_4175()
-		{
-		}
-		[Test]
-		public void Test_4176()
-		{
-		}
-		[Test]
-		public void Test_4177()
-		{
-		}
-		[Test]
-		public void Test_4178()
-		{
-		}
-		[Test]
-		public void Test_4179()
-		{
-		}
-		[Test]
-		public void Test_4180()
-		{
-		}
-		[Test]
-		public void Test_4181()
-		{
-		}
-		[Test]
-		public void Test_4182()
-		{
-		}
-		[Test]
-		public void Test_4183()
-		{
-		}
-		[Test]
-		public void Test_4184()
-		{
-		}
-		[Test]
-		public void Test_4185()
-		{
-		}
-		[Test]
-		public void Test_4186()
-		{
-		}
-		[Test]
-		public void Test_4187()
-		{
-		}
-		[Test]
-		public void Test_4188()
-		{
-		}
-		[Test]
-		public void Test_4189()
-		{
-		}
-		[Test]
-		public void Test_4190()
-		{
-		}
-		[Test]
-		public void Test_4191()
-		{
-		}
-		[Test]
-		public void Test_4192()
-		{
-		}
-		[Test]
-		public void Test_4193()
-		{
-		}
-		[Test]
-		public void Test_4194()
-		{
-		}
-		[Test]
-		public void Test_4195()
-		{
-		}
-		[Test]
-		public void Test_4196()
-		{
-		}
-		[Test]
-		public void Test_4197()
-		{
-		}
-		[Test]
-		public void Test_4198()
-		{
-		}
-		[Test]
-		public void Test_4199()
-		{
-		}
-		[Test]
-		public void Test_4200()
-		{
-		}
-		[Test]
-		public void Test_4201()
-		{
-		}
-		[Test]
-		public void Test_4202()
-		{
-		}
-		[Test]
-		public void Test_4203()
-		{
-		}
-		[Test]
-		public void Test_4204()
-		{
-		}
-		[Test]
-		public void Test_4205()
-		{
-		}
-		[Test]
-		public void Test_4206()
-		{
-		}
-		[Test]
-		public void Test_4207()
-		{
-		}
-		[Test]
-		public void Test_4208()
-		{
-		}
-		[Test]
-		public void Test_4209()
-		{
-		}
-		[Test]
-		public void Test_4210()
-		{
-		}
-		[Test]
-		public void Test_4211()
-		{
-		}
-		[Test]
-		public void Test_4212()
-		{
-		}
-		[Test]
-		public void Test_4213()
-		{
-		}
-		[Test]
-		public void Test_4214()
-		{
-		}
-		[Test]
-		public void Test_4215()
-		{
-		}
-		[Test]
-		public void Test_4216()
-		{
-		}
-		[Test]
-		public void Test_4217()
-		{
-		}
-		[Test]
-		public void Test_4218()
-		{
-		}
-		[Test]
-		public void Test_4219()
-		{
-		}
-		[Test]
-		public void Test_4220()
-		{
-		}
-		[Test]
-		public void Test_4221()
-		{
-		}
-		[Test]
-		public void Test_4222()
-		{
-		}
-		[Test]
-		public void Test_4223()
-		{
-		}
-		[Test]
-		public void Test_4224()
-		{
-		}
-		[Test]
-		public void Test_4225()
-		{
-		}
-		[Test]
-		public void Test_4226()
-		{
-		}
-		[Test]
-		public void Test_4227()
-		{
-		}
-		[Test]
-		public void Test_4228()
-		{
-		}
-		[Test]
-		public void Test_4229()
-		{
-		}
-		[Test]
-		public void Test_4230()
-		{
-		}
-		[Test]
-		public void Test_4231()
-		{
-		}
-		[Test]
-		public void Test_4232()
-		{
-		}
-		[Test]
-		public void Test_4233()
-		{
-		}
-		[Test]
-		public void Test_4234()
-		{
-		}
-		[Test]
-		public void Test_4235()
-		{
-		}
-		[Test]
-		public void Test_4236()
-		{
-		}
-		[Test]
-		public void Test_4237()
-		{
-		}
-		[Test]
-		public void Test_4238()
-		{
-		}
-		[Test]
-		public void Test_4239()
-		{
-		}
-		[Test]
-		public void Test_4240()
-		{
-		}
-		[Test]
-		public void Test_4241()
-		{
-		}
-		[Test]
-		public void Test_4242()
-		{
-		}
-		[Test]
-		public void Test_4243()
-		{
-		}
-		[Test]
-		public void Test_4244()
-		{
-		}
-		[Test]
-		public void Test_4245()
-		{
-		}
-		[Test]
-		public void Test_4246()
-		{
-		}
-		[Test]
-		public void Test_4247()
-		{
-		}
-		[Test]
-		public void Test_4248()
-		{
-		}
-		[Test]
-		public void Test_4249()
-		{
-		}
-		[Test]
-		public void Test_4250()
-		{
-		}
-		[Test]
-		public void Test_4251()
-		{
-		}
-		[Test]
-		public void Test_4252()
-		{
-		}
-		[Test]
-		public void Test_4253()
-		{
-		}
-		[Test]
-		public void Test_4254()
-		{
-		}
-		[Test]
-		public void Test_4255()
-		{
-		}
-		[Test]
-		public void Test_4256()
-		{
-		}
-		[Test]
-		public void Test_4257()
-		{
-		}
-		[Test]
-		public void Test_4258()
-		{
-		}
-		[Test]
-		public void Test_4259()
-		{
-		}
-		[Test]
-		public void Test_4260()
-		{
-		}
-		[Test]
-		public void Test_4261()
-		{
-		}
-		[Test]
-		public void Test_4262()
-		{
-		}
-		[Test]
-		public void Test_4263()
-		{
-		}
-		[Test]
-		public void Test_4264()
-		{
-		}
-		[Test]
-		public void Test_4265()
-		{
-		}
-		[Test]
-		public void Test_4266()
-		{
-		}
-		[Test]
-		public void Test_4267()
-		{
-		}
-		[Test]
-		public void Test_4268()
-		{
-		}
-		[Test]
-		public void Test_4269()
-		{
-		}
-		[Test]
-		public void Test_4270()
-		{
-		}
-		[Test]
-		public void Test_4271()
-		{
-		}
-		[Test]
-		public void Test_4272()
-		{
-		}
-		[Test]
-		public void Test_4273()
-		{
-		}
-		[Test]
-		public void Test_4274()
-		{
-		}
-		[Test]
-		public void Test_4275()
-		{
-		}
-		[Test]
-		public void Test_4276()
-		{
-		}
-		[Test]
-		public void Test_4277()
-		{
-		}
-		[Test]
-		public void Test_4278()
-		{
-		}
-		[Test]
-		public void Test_4279()
-		{
-		}
-		[Test]
-		public void Test_4280()
-		{
-		}
-		[Test]
-		public void Test_4281()
-		{
-		}
-		[Test]
-		public void Test_4282()
-		{
-		}
-		[Test]
-		public void Test_4283()
-		{
-		}
-		[Test]
-		public void Test_4284()
-		{
-		}
-		[Test]
-		public void Test_4285()
-		{
-		}
-		[Test]
-		public void Test_4286()
-		{
-		}
-		[Test]
-		public void Test_4287()
-		{
-		}
-		[Test]
-		public void Test_4288()
-		{
-		}
-		[Test]
-		public void Test_4289()
-		{
-		}
-		[Test]
-		public void Test_4290()
-		{
-		}
-		[Test]
-		public void Test_4291()
-		{
-		}
-		[Test]
-		public void Test_4292()
-		{
-		}
-		[Test]
-		public void Test_4293()
-		{
-		}
-		[Test]
-		public void Test_4294()
-		{
-		}
-		[Test]
-		public void Test_4295()
-		{
-		}
-		[Test]
-		public void Test_4296()
-		{
-		}
-		[Test]
-		public void Test_4297()
-		{
-		}
-		[Test]
-		public void Test_4298()
-		{
-		}
-		[Test]
-		public void Test_4299()
-		{
-		}
-		[Test]
-		public void Test_4300()
-		{
-		}
-		[Test]
-		public void Test_4301()
-		{
-		}
-		[Test]
-		public void Test_4302()
-		{
-		}
-		[Test]
-		public void Test_4303()
-		{
-		}
-		[Test]
-		public void Test_4304()
-		{
-		}
-		[Test]
-		public void Test_4305()
-		{
-		}
-		[Test]
-		public void Test_4306()
-		{
-		}
-		[Test]
-		public void Test_4307()
-		{
-		}
-		[Test]
-		public void Test_4308()
-		{
-		}
-		[Test]
-		public void Test_4309()
-		{
-		}
-		[Test]
-		public void Test_4310()
-		{
-		}
-		[Test]
-		public void Test_4311()
-		{
-		}
-		[Test]
-		public void Test_4312()
-		{
-		}
-		[Test]
-		public void Test_4313()
-		{
-		}
-		[Test]
-		public void Test_4314()
-		{
-		}
-		[Test]
-		public void Test_4315()
-		{
-		}
-		[Test]
-		public void Test_4316()
-		{
-		}
-		[Test]
-		public void Test_4317()
-		{
-		}
-		[Test]
-		public void Test_4318()
-		{
-		}
-		[Test]
-		public void Test_4319()
-		{
-		}
-		[Test]
-		public void Test_4320()
-		{
-		}
-		[Test]
-		public void Test_4321()
-		{
-		}
-		[Test]
-		public void Test_4322()
-		{
-		}
-		[Test]
-		public void Test_4323()
-		{
-		}
-		[Test]
-		public void Test_4324()
-		{
-		}
-		[Test]
-		public void Test_4325()
-		{
-		}
-		[Test]
-		public void Test_4326()
-		{
-		}
-		[Test]
-		public void Test_4327()
-		{
-		}
-		[Test]
-		public void Test_4328()
-		{
-		}
-		[Test]
-		public void Test_4329()
-		{
-		}
-		[Test]
-		public void Test_4330()
-		{
-		}
-		[Test]
-		public void Test_4331()
-		{
-		}
-		[Test]
-		public void Test_4332()
-		{
-		}
-		[Test]
-		public void Test_4333()
-		{
-		}
-		[Test]
-		public void Test_4334()
-		{
-		}
-		[Test]
-		public void Test_4335()
-		{
-		}
-		[Test]
-		public void Test_4336()
-		{
-		}
-		[Test]
-		public void Test_4337()
-		{
-		}
-		[Test]
-		public void Test_4338()
-		{
-		}
-		[Test]
-		public void Test_4339()
-		{
-		}
-		[Test]
-		public void Test_4340()
-		{
-		}
-		[Test]
-		public void Test_4341()
-		{
-		}
-		[Test]
-		public void Test_4342()
-		{
-		}
-		[Test]
-		public void Test_4343()
-		{
-		}
-		[Test]
-		public void Test_4344()
-		{
-		}
-		[Test]
-		public void Test_4345()
-		{
-		}
-		[Test]
-		public void Test_4346()
-		{
-		}
-		[Test]
-		public void Test_4347()
-		{
-		}
-		[Test]
-		public void Test_4348()
-		{
-		}
-		[Test]
-		public void Test_4349()
-		{
-		}
-		[Test]
-		public void Test_4350()
-		{
-		}
-		[Test]
-		public void Test_4351()
-		{
-		}
-		[Test]
-		public void Test_4352()
-		{
-		}
-		[Test]
-		public void Test_4353()
-		{
-		}
-		[Test]
-		public void Test_4354()
-		{
-		}
-		[Test]
-		public void Test_4355()
-		{
-		}
-		[Test]
-		public void Test_4356()
-		{
-		}
-		[Test]
-		public void Test_4357()
-		{
-		}
-		[Test]
-		public void Test_4358()
-		{
-		}
-		[Test]
-		public void Test_4359()
-		{
-		}
-		[Test]
-		public void Test_4360()
-		{
-		}
-		[Test]
-		public void Test_4361()
-		{
-		}
-		[Test]
-		public void Test_4362()
-		{
-		}
-		[Test]
-		public void Test_4363()
-		{
-		}
-		[Test]
-		public void Test_4364()
-		{
-		}
-		[Test]
-		public void Test_4365()
-		{
-		}
-		[Test]
-		public void Test_4366()
-		{
-		}
-		[Test]
-		public void Test_4367()
-		{
-		}
-		[Test]
-		public void Test_4368()
-		{
-		}
-		[Test]
-		public void Test_4369()
-		{
-		}
-		[Test]
-		public void Test_4370()
-		{
-		}
-		[Test]
-		public void Test_4371()
-		{
-		}
-		[Test]
-		public void Test_4372()
-		{
-		}
-		[Test]
-		public void Test_4373()
-		{
-		}
-		[Test]
-		public void Test_4374()
-		{
-		}
-		[Test]
-		public void Test_4375()
-		{
-		}
-		[Test]
-		public void Test_4376()
-		{
-		}
-		[Test]
-		public void Test_4377()
-		{
-		}
-		[Test]
-		public void Test_4378()
-		{
-		}
-		[Test]
-		public void Test_4379()
-		{
-		}
-		[Test]
-		public void Test_4380()
-		{
-		}
-		[Test]
-		public void Test_4381()
-		{
-		}
-		[Test]
-		public void Test_4382()
-		{
-		}
-		[Test]
-		public void Test_4383()
-		{
-		}
-		[Test]
-		public void Test_4384()
-		{
-		}
-		[Test]
-		public void Test_4385()
-		{
-		}
-		[Test]
-		public void Test_4386()
-		{
-		}
-		[Test]
-		public void Test_4387()
-		{
-		}
-		[Test]
-		public void Test_4388()
-		{
-		}
-		[Test]
-		public void Test_4389()
-		{
-		}
-		[Test]
-		public void Test_4390()
-		{
-		}
-		[Test]
-		public void Test_4391()
-		{
-		}
-		[Test]
-		public void Test_4392()
-		{
-		}
-		[Test]
-		public void Test_4393()
-		{
-		}
-		[Test]
-		public void Test_4394()
-		{
-		}
-		[Test]
-		public void Test_4395()
-		{
-		}
-		[Test]
-		public void Test_4396()
-		{
-		}
-		[Test]
-		public void Test_4397()
-		{
-		}
-		[Test]
-		public void Test_4398()
-		{
-		}
-		[Test]
-		public void Test_4399()
-		{
-		}
-		[Test]
-		public void Test_4400()
-		{
-		}
-		[Test]
-		public void Test_4401()
-		{
-		}
-		[Test]
-		public void Test_4402()
-		{
-		}
-		[Test]
-		public void Test_4403()
-		{
-		}
-		[Test]
-		public void Test_4404()
-		{
-		}
-		[Test]
-		public void Test_4405()
-		{
-		}
-		[Test]
-		public void Test_4406()
-		{
-		}
-		[Test]
-		public void Test_4407()
-		{
-		}
-		[Test]
-		public void Test_4408()
-		{
-		}
-		[Test]
-		public void Test_4409()
-		{
-		}
-		[Test]
-		public void Test_4410()
-		{
-		}
-		[Test]
-		public void Test_4411()
-		{
-		}
-		[Test]
-		public void Test_4412()
-		{
-		}
-		[Test]
-		public void Test_4413()
-		{
-		}
-		[Test]
-		public void Test_4414()
-		{
-		}
-		[Test]
-		public void Test_4415()
-		{
-		}
-		[Test]
-		public void Test_4416()
-		{
-		}
-		[Test]
-		public void Test_4417()
-		{
-		}
-		[Test]
-		public void Test_4418()
-		{
-		}
-		[Test]
-		public void Test_4419()
-		{
-		}
-		[Test]
-		public void Test_4420()
-		{
-		}
-		[Test]
-		public void Test_4421()
-		{
-		}
-		[Test]
-		public void Test_4422()
-		{
-		}
-		[Test]
-		public void Test_4423()
-		{
-		}
-		[Test]
-		public void Test_4424()
-		{
-		}
-		[Test]
-		public void Test_4425()
-		{
-		}
-		[Test]
-		public void Test_4426()
-		{
-		}
-		[Test]
-		public void Test_4427()
-		{
-		}
-		[Test]
-		public void Test_4428()
-		{
-		}
-		[Test]
-		public void Test_4429()
-		{
-		}
-		[Test]
-		public void Test_4430()
-		{
-		}
-		[Test]
-		public void Test_4431()
-		{
-		}
-		[Test]
-		public void Test_4432()
-		{
-		}
-		[Test]
-		public void Test_4433()
-		{
-		}
-		[Test]
-		public void Test_4434()
-		{
-		}
-		[Test]
-		public void Test_4435()
-		{
-		}
-		[Test]
-		public void Test_4436()
-		{
-		}
-		[Test]
-		public void Test_4437()
-		{
-		}
-		[Test]
-		public void Test_4438()
-		{
-		}
-		[Test]
-		public void Test_4439()
-		{
-		}
-		[Test]
-		public void Test_4440()
-		{
-		}
-		[Test]
-		public void Test_4441()
-		{
-		}
-		[Test]
-		public void Test_4442()
-		{
-		}
-		[Test]
-		public void Test_4443()
-		{
-		}
-		[Test]
-		public void Test_4444()
-		{
-		}
-		[Test]
-		public void Test_4445()
-		{
-		}
-		[Test]
-		public void Test_4446()
-		{
-		}
-		[Test]
-		public void Test_4447()
-		{
-		}
-		[Test]
-		public void Test_4448()
-		{
-		}
-		[Test]
-		public void Test_4449()
-		{
-		}
-		[Test]
-		public void Test_4450()
-		{
-		}
-		[Test]
-		public void Test_4451()
-		{
-		}
-		[Test]
-		public void Test_4452()
-		{
-		}
-		[Test]
-		public void Test_4453()
-		{
-		}
-		[Test]
-		public void Test_4454()
-		{
-		}
-		[Test]
-		public void Test_4455()
-		{
-		}
-		[Test]
-		public void Test_4456()
-		{
-		}
-		[Test]
-		public void Test_4457()
-		{
-		}
-		[Test]
-		public void Test_4458()
-		{
-		}
-		[Test]
-		public void Test_4459()
-		{
-		}
-		[Test]
-		public void Test_4460()
-		{
-		}
-		[Test]
-		public void Test_4461()
-		{
-		}
-		[Test]
-		public void Test_4462()
-		{
-		}
-		[Test]
-		public void Test_4463()
-		{
-		}
-		[Test]
-		public void Test_4464()
-		{
-		}
-		[Test]
-		public void Test_4465()
-		{
-		}
-		[Test]
-		public void Test_4466()
-		{
-		}
-		[Test]
-		public void Test_4467()
-		{
-		}
-		[Test]
-		public void Test_4468()
-		{
-		}
-		[Test]
-		public void Test_4469()
-		{
-		}
-		[Test]
-		public void Test_4470()
-		{
-		}
-		[Test]
-		public void Test_4471()
-		{
-		}
-		[Test]
-		public void Test_4472()
-		{
-		}
-		[Test]
-		public void Test_4473()
-		{
-		}
-		[Test]
-		public void Test_4474()
-		{
-		}
-		[Test]
-		public void Test_4475()
-		{
-		}
-		[Test]
-		public void Test_4476()
-		{
-		}
-		[Test]
-		public void Test_4477()
-		{
-		}
-		[Test]
-		public void Test_4478()
-		{
-		}
-		[Test]
-		public void Test_4479()
-		{
-		}
-		[Test]
-		public void Test_4480()
-		{
-		}
-		[Test]
-		public void Test_4481()
-		{
-		}
-		[Test]
-		public void Test_4482()
-		{
-		}
-		[Test]
-		public void Test_4483()
-		{
-		}
-		[Test]
-		public void Test_4484()
-		{
-		}
-		[Test]
-		public void Test_4485()
-		{
-		}
-		[Test]
-		public void Test_4486()
-		{
-		}
-		[Test]
-		public void Test_4487()
-		{
-		}
-		[Test]
-		public void Test_4488()
-		{
-		}
-		[Test]
-		public void Test_4489()
-		{
-		}
-		[Test]
-		public void Test_4490()
-		{
-		}
-		[Test]
-		public void Test_4491()
-		{
-		}
-		[Test]
-		public void Test_4492()
-		{
-		}
-		[Test]
-		public void Test_4493()
-		{
-		}
-		[Test]
-		public void Test_4494()
-		{
-		}
-		[Test]
-		public void Test_4495()
-		{
-		}
-		[Test]
-		public void Test_4496()
-		{
-		}
-		[Test]
-		public void Test_4497()
-		{
-		}
-		[Test]
-		public void Test_4498()
-		{
-		}
-		[Test]
-		public void Test_4499()
-		{
-		}
-		[Test]
-		public void Test_4500()
-		{
-		}
-		[Test]
-		public void Test_4501()
-		{
-		}
-		[Test]
-		public void Test_4502()
-		{
-		}
-		[Test]
-		public void Test_4503()
-		{
-		}
-		[Test]
-		public void Test_4504()
-		{
-		}
-		[Test]
-		public void Test_4505()
-		{
-		}
-		[Test]
-		public void Test_4506()
-		{
-		}
-		[Test]
-		public void Test_4507()
-		{
-		}
-		[Test]
-		public void Test_4508()
-		{
-		}
-		[Test]
-		public void Test_4509()
-		{
-		}
-		[Test]
-		public void Test_4510()
-		{
-		}
-		[Test]
-		public void Test_4511()
-		{
-		}
-		[Test]
-		public void Test_4512()
-		{
-		}
-		[Test]
-		public void Test_4513()
-		{
-		}
-		[Test]
-		public void Test_4514()
-		{
-		}
-		[Test]
-		public void Test_4515()
-		{
-		}
-		[Test]
-		public void Test_4516()
-		{
-		}
-		[Test]
-		public void Test_4517()
-		{
-		}
-		[Test]
-		public void Test_4518()
-		{
-		}
-		[Test]
-		public void Test_4519()
-		{
-		}
-		[Test]
-		public void Test_4520()
-		{
-		}
-		[Test]
-		public void Test_4521()
-		{
-		}
-		[Test]
-		public void Test_4522()
-		{
-		}
-		[Test]
-		public void Test_4523()
-		{
-		}
-		[Test]
-		public void Test_4524()
-		{
-		}
-		[Test]
-		public void Test_4525()
-		{
-		}
-		[Test]
-		public void Test_4526()
-		{
-		}
-		[Test]
-		public void Test_4527()
-		{
-		}
-		[Test]
-		public void Test_4528()
-		{
-		}
-		[Test]
-		public void Test_4529()
-		{
-		}
-		[Test]
-		public void Test_4530()
-		{
-		}
-		[Test]
-		public void Test_4531()
-		{
-		}
-		[Test]
-		public void Test_4532()
-		{
-		}
-		[Test]
-		public void Test_4533()
-		{
-		}
-		[Test]
-		public void Test_4534()
-		{
-		}
-		[Test]
-		public void Test_4535()
-		{
-		}
-		[Test]
-		public void Test_4536()
-		{
-		}
-		[Test]
-		public void Test_4537()
-		{
-		}
-		[Test]
-		public void Test_4538()
-		{
-		}
-		[Test]
-		public void Test_4539()
-		{
-		}
-		[Test]
-		public void Test_4540()
-		{
-		}
-		[Test]
-		public void Test_4541()
-		{
-		}
-		[Test]
-		public void Test_4542()
-		{
-		}
-		[Test]
-		public void Test_4543()
-		{
-		}
-		[Test]
-		public void Test_4544()
-		{
-		}
-		[Test]
-		public void Test_4545()
-		{
-		}
-		[Test]
-		public void Test_4546()
-		{
-		}
-		[Test]
-		public void Test_4547()
-		{
-		}
-		[Test]
-		public void Test_4548()
-		{
-		}
-		[Test]
-		public void Test_4549()
-		{
-		}
-		[Test]
-		public void Test_4550()
-		{
-		}
-		[Test]
-		public void Test_4551()
-		{
-		}
-		[Test]
-		public void Test_4552()
-		{
-		}
-		[Test]
-		public void Test_4553()
-		{
-		}
-		[Test]
-		public void Test_4554()
-		{
-		}
-		[Test]
-		public void Test_4555()
-		{
-		}
-		[Test]
-		public void Test_4556()
-		{
-		}
-		[Test]
-		public void Test_4557()
-		{
-		}
-		[Test]
-		public void Test_4558()
-		{
-		}
-		[Test]
-		public void Test_4559()
-		{
-		}
-		[Test]
-		public void Test_4560()
-		{
-		}
-		[Test]
-		public void Test_4561()
-		{
-		}
-		[Test]
-		public void Test_4562()
-		{
-		}
-		[Test]
-		public void Test_4563()
-		{
-		}
-		[Test]
-		public void Test_4564()
-		{
-		}
-		[Test]
-		public void Test_4565()
-		{
-		}
-		[Test]
-		public void Test_4566()
-		{
-		}
-		[Test]
-		public void Test_4567()
-		{
-		}
-		[Test]
-		public void Test_4568()
-		{
-		}
-		[Test]
-		public void Test_4569()
-		{
-		}
-		[Test]
-		public void Test_4570()
-		{
-		}
-		[Test]
-		public void Test_4571()
-		{
-		}
-		[Test]
-		public void Test_4572()
-		{
-		}
-		[Test]
-		public void Test_4573()
-		{
-		}
-		[Test]
-		public void Test_4574()
-		{
-		}
-		[Test]
-		public void Test_4575()
-		{
-		}
-		[Test]
-		public void Test_4576()
-		{
-		}
-		[Test]
-		public void Test_4577()
-		{
-		}
-		[Test]
-		public void Test_4578()
-		{
-		}
-		[Test]
-		public void Test_4579()
-		{
-		}
-		[Test]
-		public void Test_4580()
-		{
-		}
-		[Test]
-		public void Test_4581()
-		{
-		}
-		[Test]
-		public void Test_4582()
-		{
-		}
-		[Test]
-		public void Test_4583()
-		{
-		}
-		[Test]
-		public void Test_4584()
-		{
-		}
-		[Test]
-		public void Test_4585()
-		{
-		}
-		[Test]
-		public void Test_4586()
-		{
-		}
-		[Test]
-		public void Test_4587()
-		{
-		}
-		[Test]
-		public void Test_4588()
-		{
-		}
-		[Test]
-		public void Test_4589()
-		{
-		}
-		[Test]
-		public void Test_4590()
-		{
-		}
-		[Test]
-		public void Test_4591()
-		{
-		}
-		[Test]
-		public void Test_4592()
-		{
-		}
-		[Test]
-		public void Test_4593()
-		{
-		}
-		[Test]
-		public void Test_4594()
-		{
-		}
-		[Test]
-		public void Test_4595()
-		{
-		}
-		[Test]
-		public void Test_4596()
-		{
-		}
-		[Test]
-		public void Test_4597()
-		{
-		}
-		[Test]
-		public void Test_4598()
-		{
-		}
-		[Test]
-		public void Test_4599()
-		{
-		}
-		[Test]
-		public void Test_4600()
-		{
-		}
-		[Test]
-		public void Test_4601()
-		{
-		}
-		[Test]
-		public void Test_4602()
-		{
-		}
-		[Test]
-		public void Test_4603()
-		{
-		}
-		[Test]
-		public void Test_4604()
-		{
-		}
-		[Test]
-		public void Test_4605()
-		{
-		}
-		[Test]
-		public void Test_4606()
-		{
-		}
-		[Test]
-		public void Test_4607()
-		{
-		}
-		[Test]
-		public void Test_4608()
-		{
-		}
-		[Test]
-		public void Test_4609()
-		{
-		}
-		[Test]
-		public void Test_4610()
-		{
-		}
-		[Test]
-		public void Test_4611()
-		{
-		}
-		[Test]
-		public void Test_4612()
-		{
-		}
-		[Test]
-		public void Test_4613()
-		{
-		}
-		[Test]
-		public void Test_4614()
-		{
-		}
-		[Test]
-		public void Test_4615()
-		{
-		}
-		[Test]
-		public void Test_4616()
-		{
-		}
-		[Test]
-		public void Test_4617()
-		{
-		}
-		[Test]
-		public void Test_4618()
-		{
-		}
-		[Test]
-		public void Test_4619()
-		{
-		}
-		[Test]
-		public void Test_4620()
-		{
-		}
-		[Test]
-		public void Test_4621()
-		{
-		}
-		[Test]
-		public void Test_4622()
-		{
-		}
-		[Test]
-		public void Test_4623()
-		{
-		}
-		[Test]
-		public void Test_4624()
-		{
-		}
-		[Test]
-		public void Test_4625()
-		{
-		}
-		[Test]
-		public void Test_4626()
-		{
-		}
-		[Test]
-		public void Test_4627()
-		{
-		}
-		[Test]
-		public void Test_4628()
-		{
-		}
-		[Test]
-		public void Test_4629()
-		{
-		}
-		[Test]
-		public void Test_4630()
-		{
-		}
-		[Test]
-		public void Test_4631()
-		{
-		}
-		[Test]
-		public void Test_4632()
-		{
-		}
-		[Test]
-		public void Test_4633()
-		{
-		}
-		[Test]
-		public void Test_4634()
-		{
-		}
-		[Test]
-		public void Test_4635()
-		{
-		}
-		[Test]
-		public void Test_4636()
-		{
-		}
-		[Test]
-		public void Test_4637()
-		{
-		}
-		[Test]
-		public void Test_4638()
-		{
-		}
-		[Test]
-		public void Test_4639()
-		{
-		}
-		[Test]
-		public void Test_4640()
-		{
-		}
-		[Test]
-		public void Test_4641()
-		{
-		}
-		[Test]
-		public void Test_4642()
-		{
-		}
-		[Test]
-		public void Test_4643()
-		{
-		}
-		[Test]
-		public void Test_4644()
-		{
-		}
-		[Test]
-		public void Test_4645()
-		{
-		}
-		[Test]
-		public void Test_4646()
-		{
-		}
-		[Test]
-		public void Test_4647()
-		{
-		}
-		[Test]
-		public void Test_4648()
-		{
-		}
-		[Test]
-		public void Test_4649()
-		{
-		}
-		[Test]
-		public void Test_4650()
-		{
-		}
-		[Test]
-		public void Test_4651()
-		{
-		}
-		[Test]
-		public void Test_4652()
-		{
-		}
-		[Test]
-		public void Test_4653()
-		{
-		}
-		[Test]
-		public void Test_4654()
-		{
-		}
-		[Test]
-		public void Test_4655()
-		{
-		}
-		[Test]
-		public void Test_4656()
-		{
-		}
-		[Test]
-		public void Test_4657()
-		{
-		}
-		[Test]
-		public void Test_4658()
-		{
-		}
-		[Test]
-		public void Test_4659()
-		{
-		}
-		[Test]
-		public void Test_4660()
-		{
-		}
-		[Test]
-		public void Test_4661()
-		{
-		}
-		[Test]
-		public void Test_4662()
-		{
-		}
-		[Test]
-		public void Test_4663()
-		{
-		}
-		[Test]
-		public void Test_4664()
-		{
-		}
-		[Test]
-		public void Test_4665()
-		{
-		}
-		[Test]
-		public void Test_4666()
-		{
-		}
-		[Test]
-		public void Test_4667()
-		{
-		}
-		[Test]
-		public void Test_4668()
-		{
-		}
-		[Test]
-		public void Test_4669()
-		{
-		}
-		[Test]
-		public void Test_4670()
-		{
-		}
-		[Test]
-		public void Test_4671()
-		{
-		}
-		[Test]
-		public void Test_4672()
-		{
-		}
-		[Test]
-		public void Test_4673()
-		{
-		}
-		[Test]
-		public void Test_4674()
-		{
-		}
-		[Test]
-		public void Test_4675()
-		{
-		}
-		[Test]
-		public void Test_4676()
-		{
-		}
-		[Test]
-		public void Test_4677()
-		{
-		}
-		[Test]
-		public void Test_4678()
-		{
-		}
-		[Test]
-		public void Test_4679()
-		{
-		}
-		[Test]
-		public void Test_4680()
-		{
-		}
-		[Test]
-		public void Test_4681()
-		{
-		}
-		[Test]
-		public void Test_4682()
-		{
-		}
-		[Test]
-		public void Test_4683()
-		{
-		}
-		[Test]
-		public void Test_4684()
-		{
-		}
-		[Test]
-		public void Test_4685()
-		{
-		}
-		[Test]
-		public void Test_4686()
-		{
-		}
-		[Test]
-		public void Test_4687()
-		{
-		}
-		[Test]
-		public void Test_4688()
-		{
-		}
-		[Test]
-		public void Test_4689()
-		{
-		}
-		[Test]
-		public void Test_4690()
-		{
-		}
-		[Test]
-		public void Test_4691()
-		{
-		}
-		[Test]
-		public void Test_4692()
-		{
-		}
-		[Test]
-		public void Test_4693()
-		{
-		}
-		[Test]
-		public void Test_4694()
-		{
-		}
-		[Test]
-		public void Test_4695()
-		{
-		}
-		[Test]
-		public void Test_4696()
-		{
-		}
-		[Test]
-		public void Test_4697()
-		{
-		}
-		[Test]
-		public void Test_4698()
-		{
-		}
-		[Test]
-		public void Test_4699()
-		{
-		}
-		[Test]
-		public void Test_4700()
-		{
-		}
-		[Test]
-		public void Test_4701()
-		{
-		}
-		[Test]
-		public void Test_4702()
-		{
-		}
-		[Test]
-		public void Test_4703()
-		{
-		}
-		[Test]
-		public void Test_4704()
-		{
-		}
-		[Test]
-		public void Test_4705()
-		{
-		}
-		[Test]
-		public void Test_4706()
-		{
-		}
-		[Test]
-		public void Test_4707()
-		{
-		}
-		[Test]
-		public void Test_4708()
-		{
-		}
-		[Test]
-		public void Test_4709()
-		{
-		}
-		[Test]
-		public void Test_4710()
-		{
-		}
-		[Test]
-		public void Test_4711()
-		{
-		}
-		[Test]
-		public void Test_4712()
-		{
-		}
-		[Test]
-		public void Test_4713()
-		{
-		}
-		[Test]
-		public void Test_4714()
-		{
-		}
-		[Test]
-		public void Test_4715()
-		{
-		}
-		[Test]
-		public void Test_4716()
-		{
-		}
-		[Test]
-		public void Test_4717()
-		{
-		}
-		[Test]
-		public void Test_4718()
-		{
-		}
-		[Test]
-		public void Test_4719()
-		{
-		}
-		[Test]
-		public void Test_4720()
-		{
-		}
-		[Test]
-		public void Test_4721()
-		{
-		}
-		[Test]
-		public void Test_4722()
-		{
-		}
-		[Test]
-		public void Test_4723()
-		{
-		}
-		[Test]
-		public void Test_4724()
-		{
-		}
-		[Test]
-		public void Test_4725()
-		{
-		}
-		[Test]
-		public void Test_4726()
-		{
-		}
-		[Test]
-		public void Test_4727()
-		{
-		}
-		[Test]
-		public void Test_4728()
-		{
-		}
-		[Test]
-		public void Test_4729()
-		{
-		}
-		[Test]
-		public void Test_4730()
-		{
-		}
-		[Test]
-		public void Test_4731()
-		{
-		}
-		[Test]
-		public void Test_4732()
-		{
-		}
-		[Test]
-		public void Test_4733()
-		{
-		}
-		[Test]
-		public void Test_4734()
-		{
-		}
-		[Test]
-		public void Test_4735()
-		{
-		}
-		[Test]
-		public void Test_4736()
-		{
-		}
-		[Test]
-		public void Test_4737()
-		{
-		}
-		[Test]
-		public void Test_4738()
-		{
-		}
-		[Test]
-		public void Test_4739()
-		{
-		}
-		[Test]
-		public void Test_4740()
-		{
-		}
-		[Test]
-		public void Test_4741()
-		{
-		}
-		[Test]
-		public void Test_4742()
-		{
-		}
-		[Test]
-		public void Test_4743()
-		{
-		}
-		[Test]
-		public void Test_4744()
-		{
-		}
-		[Test]
-		public void Test_4745()
-		{
-		}
-		[Test]
-		public void Test_4746()
-		{
-		}
-		[Test]
-		public void Test_4747()
-		{
-		}
-		[Test]
-		public void Test_4748()
-		{
-		}
-		[Test]
-		public void Test_4749()
-		{
-		}
-		[Test]
-		public void Test_4750()
-		{
-		}
-		[Test]
-		public void Test_4751()
-		{
-		}
-		[Test]
-		public void Test_4752()
-		{
-		}
-		[Test]
-		public void Test_4753()
-		{
-		}
-		[Test]
-		public void Test_4754()
-		{
-		}
-		[Test]
-		public void Test_4755()
-		{
-		}
-		[Test]
-		public void Test_4756()
-		{
-		}
-		[Test]
-		public void Test_4757()
-		{
-		}
-		[Test]
-		public void Test_4758()
-		{
-		}
-		[Test]
-		public void Test_4759()
-		{
-		}
-		[Test]
-		public void Test_4760()
-		{
-		}
-		[Test]
-		public void Test_4761()
-		{
-		}
-		[Test]
-		public void Test_4762()
-		{
-		}
-		[Test]
-		public void Test_4763()
-		{
-		}
-		[Test]
-		public void Test_4764()
-		{
-		}
-		[Test]
-		public void Test_4765()
-		{
-		}
-		[Test]
-		public void Test_4766()
-		{
-		}
-		[Test]
-		public void Test_4767()
-		{
-		}
-		[Test]
-		public void Test_4768()
-		{
-		}
-		[Test]
-		public void Test_4769()
-		{
-		}
-		[Test]
-		public void Test_4770()
-		{
-		}
-		[Test]
-		public void Test_4771()
-		{
-		}
-		[Test]
-		public void Test_4772()
-		{
-		}
-		[Test]
-		public void Test_4773()
-		{
-		}
-		[Test]
-		public void Test_4774()
-		{
-		}
-		[Test]
-		public void Test_4775()
-		{
-		}
-		[Test]
-		public void Test_4776()
-		{
-		}
-		[Test]
-		public void Test_4777()
-		{
-		}
-		[Test]
-		public void Test_4778()
-		{
-		}
-		[Test]
-		public void Test_4779()
-		{
-		}
-		[Test]
-		public void Test_4780()
-		{
-		}
-		[Test]
-		public void Test_4781()
-		{
-		}
-		[Test]
-		public void Test_4782()
-		{
-		}
-		[Test]
-		public void Test_4783()
-		{
-		}
-		[Test]
-		public void Test_4784()
-		{
-		}
-		[Test]
-		public void Test_4785()
-		{
-		}
-		[Test]
-		public void Test_4786()
-		{
-		}
-		[Test]
-		public void Test_4787()
-		{
-		}
-		[Test]
-		public void Test_4788()
-		{
-		}
-		[Test]
-		public void Test_4789()
-		{
-		}
-		[Test]
-		public void Test_4790()
-		{
-		}
-		[Test]
-		public void Test_4791()
-		{
-		}
-		[Test]
-		public void Test_4792()
-		{
-		}
-		[Test]
-		public void Test_4793()
-		{
-		}
-		[Test]
-		public void Test_4794()
-		{
-		}
-		[Test]
-		public void Test_4795()
-		{
-		}
-		[Test]
-		public void Test_4796()
-		{
-		}
-		[Test]
-		public void Test_4797()
-		{
-		}
-		[Test]
-		public void Test_4798()
-		{
-		}
-		[Test]
-		public void Test_4799()
-		{
-		}
-		[Test]
-		public void Test_4800()
-		{
-		}
-		[Test]
-		public void Test_4801()
-		{
-		}
-		[Test]
-		public void Test_4802()
-		{
-		}
-		[Test]
-		public void Test_4803()
-		{
-		}
-		[Test]
-		public void Test_4804()
-		{
-		}
-		[Test]
-		public void Test_4805()
-		{
-		}
-		[Test]
-		public void Test_4806()
-		{
-		}
-		[Test]
-		public void Test_4807()
-		{
-		}
-		[Test]
-		public void Test_4808()
-		{
-		}
-		[Test]
-		public void Test_4809()
-		{
-		}
-		[Test]
-		public void Test_4810()
-		{
-		}
-		[Test]
-		public void Test_4811()
-		{
-		}
-		[Test]
-		public void Test_4812()
-		{
-		}
-		[Test]
-		public void Test_4813()
-		{
-		}
-		[Test]
-		public void Test_4814()
-		{
-		}
-		[Test]
-		public void Test_4815()
-		{
-		}
-		[Test]
-		public void Test_4816()
-		{
-		}
-		[Test]
-		public void Test_4817()
-		{
-		}
-		[Test]
-		public void Test_4818()
-		{
-		}
-		[Test]
-		public void Test_4819()
-		{
-		}
-		[Test]
-		public void Test_4820()
-		{
-		}
-		[Test]
-		public void Test_4821()
-		{
-		}
-		[Test]
-		public void Test_4822()
-		{
-		}
-		[Test]
-		public void Test_4823()
-		{
-		}
-		[Test]
-		public void Test_4824()
-		{
-		}
-		[Test]
-		public void Test_4825()
-		{
-		}
-		[Test]
-		public void Test_4826()
-		{
-		}
-		[Test]
-		public void Test_4827()
-		{
-		}
-		[Test]
-		public void Test_4828()
-		{
-		}
-		[Test]
-		public void Test_4829()
-		{
-		}
-		[Test]
-		public void Test_4830()
-		{
-		}
-		[Test]
-		public void Test_4831()
-		{
-		}
-		[Test]
-		public void Test_4832()
-		{
-		}
-		[Test]
-		public void Test_4833()
-		{
-		}
-		[Test]
-		public void Test_4834()
-		{
-		}
-		[Test]
-		public void Test_4835()
-		{
-		}
-		[Test]
-		public void Test_4836()
-		{
-		}
-		[Test]
-		public void Test_4837()
-		{
-		}
-		[Test]
-		public void Test_4838()
-		{
-		}
-		[Test]
-		public void Test_4839()
-		{
-		}
-		[Test]
-		public void Test_4840()
-		{
-		}
-		[Test]
-		public void Test_4841()
-		{
-		}
-		[Test]
-		public void Test_4842()
-		{
-		}
-		[Test]
-		public void Test_4843()
-		{
-		}
-		[Test]
-		public void Test_4844()
-		{
-		}
-		[Test]
-		public void Test_4845()
-		{
-		}
-		[Test]
-		public void Test_4846()
-		{
-		}
-		[Test]
-		public void Test_4847()
-		{
-		}
-		[Test]
-		public void Test_4848()
-		{
-		}
-		[Test]
-		public void Test_4849()
-		{
-		}
-		[Test]
-		public void Test_4850()
-		{
-		}
-		[Test]
-		public void Test_4851()
-		{
-		}
-		[Test]
-		public void Test_4852()
-		{
-		}
-		[Test]
-		public void Test_4853()
-		{
-		}
-		[Test]
-		public void Test_4854()
-		{
-		}
-		[Test]
-		public void Test_4855()
-		{
-		}
-		[Test]
-		public void Test_4856()
-		{
-		}
-		[Test]
-		public void Test_4857()
-		{
-		}
-		[Test]
-		public void Test_4858()
-		{
-		}
-		[Test]
-		public void Test_4859()
-		{
-		}
-		[Test]
-		public void Test_4860()
-		{
-		}
-		[Test]
-		public void Test_4861()
-		{
-		}
-		[Test]
-		public void Test_4862()
-		{
-		}
-		[Test]
-		public void Test_4863()
-		{
-		}
-		[Test]
-		public void Test_4864()
-		{
-		}
-		[Test]
-		public void Test_4865()
-		{
-		}
-		[Test]
-		public void Test_4866()
-		{
-		}
-		[Test]
-		public void Test_4867()
-		{
-		}
-		[Test]
-		public void Test_4868()
-		{
-		}
-		[Test]
-		public void Test_4869()
-		{
-		}
-		[Test]
-		public void Test_4870()
-		{
-		}
-		[Test]
-		public void Test_4871()
-		{
-		}
-		[Test]
-		public void Test_4872()
-		{
-		}
-		[Test]
-		public void Test_4873()
-		{
-		}
-		[Test]
-		public void Test_4874()
-		{
-		}
-		[Test]
-		public void Test_4875()
-		{
-		}
-		[Test]
-		public void Test_4876()
-		{
-		}
-		[Test]
-		public void Test_4877()
-		{
-		}
-		[Test]
-		public void Test_4878()
-		{
-		}
-		[Test]
-		public void Test_4879()
-		{
-		}
-		[Test]
-		public void Test_4880()
-		{
-		}
-		[Test]
-		public void Test_4881()
-		{
-		}
-		[Test]
-		public void Test_4882()
-		{
-		}
-		[Test]
-		public void Test_4883()
-		{
-		}
-		[Test]
-		public void Test_4884()
-		{
-		}
-		[Test]
-		public void Test_4885()
-		{
-		}
-		[Test]
-		public void Test_4886()
-		{
-		}
-		[Test]
-		public void Test_4887()
-		{
-		}
-		[Test]
-		public void Test_4888()
-		{
-		}
-		[Test]
-		public void Test_4889()
-		{
-		}
-		[Test]
-		public void Test_4890()
-		{
-		}
-		[Test]
-		public void Test_4891()
-		{
-		}
-		[Test]
-		public void Test_4892()
-		{
-		}
-		[Test]
-		public void Test_4893()
-		{
-		}
-		[Test]
-		public void Test_4894()
-		{
-		}
-		[Test]
-		public void Test_4895()
-		{
-		}
-		[Test]
-		public void Test_4896()
-		{
-		}
-		[Test]
-		public void Test_4897()
-		{
-		}
-		[Test]
-		public void Test_4898()
-		{
-		}
-		[Test]
-		public void Test_4899()
-		{
-		}
-		[Test]
-		public void Test_4900()
-		{
-		}
-		[Test]
-		public void Test_4901()
-		{
-		}
-		[Test]
-		public void Test_4902()
-		{
-		}
-		[Test]
-		public void Test_4903()
-		{
-		}
-		[Test]
-		public void Test_4904()
-		{
-		}
-		[Test]
-		public void Test_4905()
-		{
-		}
-		[Test]
-		public void Test_4906()
-		{
-		}
-		[Test]
-		public void Test_4907()
-		{
-		}
-		[Test]
-		public void Test_4908()
-		{
-		}
-		[Test]
-		public void Test_4909()
-		{
-		}
-		[Test]
-		public void Test_4910()
-		{
-		}
-		[Test]
-		public void Test_4911()
-		{
-		}
-		[Test]
-		public void Test_4912()
-		{
-		}
-		[Test]
-		public void Test_4913()
-		{
-		}
-		[Test]
-		public void Test_4914()
-		{
-		}
-		[Test]
-		public void Test_4915()
-		{
-		}
-		[Test]
-		public void Test_4916()
-		{
-		}
-		[Test]
-		public void Test_4917()
-		{
-		}
-		[Test]
-		public void Test_4918()
-		{
-		}
-		[Test]
-		public void Test_4919()
-		{
-		}
-		[Test]
-		public void Test_4920()
-		{
-		}
-		[Test]
-		public void Test_4921()
-		{
-		}
-		[Test]
-		public void Test_4922()
-		{
-		}
-		[Test]
-		public void Test_4923()
-		{
-		}
-		[Test]
-		public void Test_4924()
-		{
-		}
-		[Test]
-		public void Test_4925()
-		{
-		}
-		[Test]
-		public void Test_4926()
-		{
-		}
-		[Test]
-		public void Test_4927()
-		{
-		}
-		[Test]
-		public void Test_4928()
-		{
-		}
-		[Test]
-		public void Test_4929()
-		{
-		}
-		[Test]
-		public void Test_4930()
-		{
-		}
-		[Test]
-		public void Test_4931()
-		{
-		}
-		[Test]
-		public void Test_4932()
-		{
-		}
-		[Test]
-		public void Test_4933()
-		{
-		}
-		[Test]
-		public void Test_4934()
-		{
-		}
-		[Test]
-		public void Test_4935()
-		{
-		}
-		[Test]
-		public void Test_4936()
-		{
-		}
-		[Test]
-		public void Test_4937()
-		{
-		}
-		[Test]
-		public void Test_4938()
-		{
-		}
-		[Test]
-		public void Test_4939()
-		{
-		}
-		[Test]
-		public void Test_4940()
-		{
-		}
-		[Test]
-		public void Test_4941()
-		{
-		}
-		[Test]
-		public void Test_4942()
-		{
-		}
-		[Test]
-		public void Test_4943()
-		{
-		}
-		[Test]
-		public void Test_4944()
-		{
-		}
-		[Test]
-		public void Test_4945()
-		{
-		}
-		[Test]
-		public void Test_4946()
-		{
-		}
-		[Test]
-		public void Test_4947()
-		{
-		}
-		[Test]
-		public void Test_4948()
-		{
-		}
-		[Test]
-		public void Test_4949()
-		{
-		}
-		[Test]
-		public void Test_4950()
-		{
-		}
-		[Test]
-		public void Test_4951()
-		{
-		}
-		[Test]
-		public void Test_4952()
-		{
-		}
-		[Test]
-		public void Test_4953()
-		{
-		}
-		[Test]
-		public void Test_4954()
-		{
-		}
-		[Test]
-		public void Test_4955()
-		{
-		}
-		[Test]
-		public void Test_4956()
-		{
-		}
-		[Test]
-		public void Test_4957()
-		{
-		}
-		[Test]
-		public void Test_4958()
-		{
-		}
-		[Test]
-		public void Test_4959()
-		{
-		}
-		[Test]
-		public void Test_4960()
-		{
-		}
-		[Test]
-		public void Test_4961()
-		{
-		}
-		[Test]
-		public void Test_4962()
-		{
-		}
-		[Test]
-		public void Test_4963()
-		{
-		}
-		[Test]
-		public void Test_4964()
-		{
-		}
-		[Test]
-		public void Test_4965()
-		{
-		}
-		[Test]
-		public void Test_4966()
-		{
-		}
-		[Test]
-		public void Test_4967()
-		{
-		}
-		[Test]
-		public void Test_4968()
-		{
-		}
-		[Test]
-		public void Test_4969()
-		{
-		}
-		[Test]
-		public void Test_4970()
-		{
-		}
-		[Test]
-		public void Test_4971()
-		{
-		}
-		[Test]
-		public void Test_4972()
-		{
-		}
-		[Test]
-		public void Test_4973()
-		{
-		}
-		[Test]
-		public void Test_4974()
-		{
-		}
-		[Test]
-		public void Test_4975()
-		{
-		}
-		[Test]
-		public void Test_4976()
-		{
-		}
-		[Test]
-		public void Test_4977()
-		{
-		}
-		[Test]
-		public void Test_4978()
-		{
-		}
-		[Test]
-		public void Test_4979()
-		{
-		}
-		[Test]
-		public void Test_4980()
-		{
-		}
-		[Test]
-		public void Test_4981()
-		{
-		}
-		[Test]
-		public void Test_4982()
-		{
-		}
-		[Test]
-		public void Test_4983()
-		{
-		}
-		[Test]
-		public void Test_4984()
-		{
-		}
-		[Test]
-		public void Test_4985()
-		{
-		}
-		[Test]
-		public void Test_4986()
-		{
-		}
-		[Test]
-		public void Test_4987()
-		{
-		}
-		[Test]
-		public void Test_4988()
-		{
-		}
-		[Test]
-		public void Test_4989()
-		{
-		}
-		[Test]
-		public void Test_4990()
-		{
-		}
-		[Test]
-		public void Test_4991()
-		{
-		}
-		[Test]
-		public void Test_4992()
-		{
-		}
-		[Test]
-		public void Test_4993()
-		{
-		}
-		[Test]
-		public void Test_4994()
-		{
-		}
-		[Test]
-		public void Test_4995()
-		{
-		}
-		[Test]
-		public void Test_4996()
-		{
-		}
-		[Test]
-		public void Test_4997()
-		{
-		}
-		[Test]
-		public void Test_4998()
-		{
-		}
-		[Test]
-		public void Test_4999()
-		{
-		}
-		[Test]
-		public void Test_5000()
-		{
-		}
-		[Test]
-		public void Test_5001()
-		{
-		}
-		[Test]
-		public void Test_5002()
-		{
-		}
-		[Test]
-		public void Test_5003()
-		{
-		}
-		[Test]
-		public void Test_5004()
-		{
-		}
-		[Test]
-		public void Test_5005()
-		{
-		}
-		[Test]
-		public void Test_5006()
-		{
-		}
-		[Test]
-		public void Test_5007()
-		{
-		}
-		[Test]
-		public void Test_5008()
-		{
-		}
-		[Test]
-		public void Test_5009()
-		{
-		}
-		[Test]
-		public void Test_5010()
-		{
-		}
-		[Test]
-		public void Test_5011()
-		{
-		}
-		[Test]
-		public void Test_5012()
-		{
-		}
-		[Test]
-		public void Test_5013()
-		{
-		}
-		[Test]
-		public void Test_5014()
-		{
-		}
-		[Test]
-		public void Test_5015()
-		{
-		}
-		[Test]
-		public void Test_5016()
-		{
-		}
-		[Test]
-		public void Test_5017()
-		{
-		}
-		[Test]
-		public void Test_5018()
-		{
-		}
-		[Test]
-		public void Test_5019()
-		{
-		}
-		[Test]
-		public void Test_5020()
-		{
-		}
-		[Test]
-		public void Test_5021()
-		{
-		}
-		[Test]
-		public void Test_5022()
-		{
-		}
-		[Test]
-		public void Test_5023()
-		{
-		}
-		[Test]
-		public void Test_5024()
-		{
-		}
-		[Test]
-		public void Test_5025()
-		{
-		}
-		[Test]
-		public void Test_5026()
-		{
-		}
-		[Test]
-		public void Test_5027()
-		{
-		}
-		[Test]
-		public void Test_5028()
-		{
-		}
-		[Test]
-		public void Test_5029()
-		{
-		}
-		[Test]
-		public void Test_5030()
-		{
-		}
-		[Test]
-		public void Test_5031()
-		{
-		}
-		[Test]
-		public void Test_5032()
-		{
-		}
-		[Test]
-		public void Test_5033()
-		{
-		}
-		[Test]
-		public void Test_5034()
-		{
-		}
-		[Test]
-		public void Test_5035()
-		{
-		}
-		[Test]
-		public void Test_5036()
-		{
-		}
-		[Test]
-		public void Test_5037()
-		{
-		}
-		[Test]
-		public void Test_5038()
-		{
-		}
-		[Test]
-		public void Test_5039()
-		{
-		}
-		[Test]
-		public void Test_5040()
-		{
-		}
-		[Test]
-		public void Test_5041()
-		{
-		}
-		[Test]
-		public void Test_5042()
-		{
-		}
-		[Test]
-		public void Test_5043()
-		{
-		}
-		[Test]
-		public void Test_5044()
-		{
-		}
-		[Test]
-		public void Test_5045()
-		{
-		}
-		[Test]
-		public void Test_5046()
-		{
-		}
-		[Test]
-		public void Test_5047()
-		{
-		}
-		[Test]
-		public void Test_5048()
-		{
-		}
-		[Test]
-		public void Test_5049()
-		{
-		}
-		[Test]
-		public void Test_5050()
-		{
-		}
-		[Test]
-		public void Test_5051()
-		{
-		}
-		[Test]
-		public void Test_5052()
-		{
-		}
-		[Test]
-		public void Test_5053()
-		{
-		}
-		[Test]
-		public void Test_5054()
-		{
-		}
-		[Test]
-		public void Test_5055()
-		{
-		}
-		[Test]
-		public void Test_5056()
-		{
-		}
-		[Test]
-		public void Test_5057()
-		{
-		}
-		[Test]
-		public void Test_5058()
-		{
-		}
-		[Test]
-		public void Test_5059()
-		{
-		}
-		[Test]
-		public void Test_5060()
-		{
-		}
-		[Test]
-		public void Test_5061()
-		{
-		}
-		[Test]
-		public void Test_5062()
-		{
-		}
-		[Test]
-		public void Test_5063()
-		{
-		}
-		[Test]
-		public void Test_5064()
-		{
-		}
-		[Test]
-		public void Test_5065()
-		{
-		}
-		[Test]
-		public void Test_5066()
-		{
-		}
-		[Test]
-		public void Test_5067()
-		{
-		}
-		[Test]
-		public void Test_5068()
-		{
-		}
-		[Test]
-		public void Test_5069()
-		{
-		}
-		[Test]
-		public void Test_5070()
-		{
-		}
-		[Test]
-		public void Test_5071()
-		{
-		}
-		[Test]
-		public void Test_5072()
-		{
-		}
-		[Test]
-		public void Test_5073()
-		{
-		}
-		[Test]
-		public void Test_5074()
-		{
-		}
-		[Test]
-		public void Test_5075()
-		{
-		}
-		[Test]
-		public void Test_5076()
-		{
-		}
-		[Test]
-		public void Test_5077()
-		{
-		}
-		[Test]
-		public void Test_5078()
-		{
-		}
-		[Test]
-		public void Test_5079()
-		{
-		}
-		[Test]
-		public void Test_5080()
-		{
-		}
-		[Test]
-		public void Test_5081()
-		{
-		}
-		[Test]
-		public void Test_5082()
-		{
-		}
-		[Test]
-		public void Test_5083()
-		{
-		}
-		[Test]
-		public void Test_5084()
-		{
-		}
-		[Test]
-		public void Test_5085()
-		{
-		}
-		[Test]
-		public void Test_5086()
-		{
-		}
-		[Test]
-		public void Test_5087()
-		{
-		}
-		[Test]
-		public void Test_5088()
-		{
-		}
-		[Test]
-		public void Test_5089()
-		{
-		}
-		[Test]
-		public void Test_5090()
-		{
-		}
-		[Test]
-		public void Test_5091()
-		{
-		}
-		[Test]
-		public void Test_5092()
-		{
-		}
-		[Test]
-		public void Test_5093()
-		{
-		}
-		[Test]
-		public void Test_5094()
-		{
-		}
-		[Test]
-		public void Test_5095()
-		{
-		}
-		[Test]
-		public void Test_5096()
-		{
-		}
-		[Test]
-		public void Test_5097()
-		{
-		}
-		[Test]
-		public void Test_5098()
-		{
-		}
-		[Test]
-		public void Test_5099()
-		{
-		}
-		[Test]
-		public void Test_5100()
-		{
-		}
-		[Test]
-		public void Test_5101()
-		{
-		}
-		[Test]
-		public void Test_5102()
-		{
-		}
-		[Test]
-		public void Test_5103()
-		{
-		}
-		[Test]
-		public void Test_5104()
-		{
-		}
-		[Test]
-		public void Test_5105()
-		{
-		}
-		[Test]
-		public void Test_5106()
-		{
-		}
-		[Test]
-		public void Test_5107()
-		{
-		}
-		[Test]
-		public void Test_5108()
-		{
-		}
-		[Test]
-		public void Test_5109()
-		{
-		}
-		[Test]
-		public void Test_5110()
-		{
-		}
-		[Test]
-		public void Test_5111()
-		{
-		}
-		[Test]
-		public void Test_5112()
-		{
-		}
-		[Test]
-		public void Test_5113()
-		{
-		}
-		[Test]
-		public void Test_5114()
-		{
-		}
-		[Test]
-		public void Test_5115()
-		{
-		}
-		[Test]
-		public void Test_5116()
-		{
-		}
-		[Test]
-		public void Test_5117()
-		{
-		}
-		[Test]
-		public void Test_5118()
-		{
-		}
-		[Test]
-		public void Test_5119()
-		{
-		}
-		[Test]
-		public void Test_5120()
-		{
-		}
-		[Test]
-		public void Test_5121()
-		{
-		}
-		[Test]
-		public void Test_5122()
-		{
-		}
-		[Test]
-		public void Test_5123()
-		{
-		}
-		[Test]
-		public void Test_5124()
-		{
-		}
-		[Test]
-		public void Test_5125()
-		{
-		}
-		[Test]
-		public void Test_5126()
-		{
-		}
-		[Test]
-		public void Test_5127()
-		{
-		}
-		[Test]
-		public void Test_5128()
-		{
-		}
-		[Test]
-		public void Test_5129()
-		{
-		}
-		[Test]
-		public void Test_5130()
-		{
-		}
-		[Test]
-		public void Test_5131()
-		{
-		}
-		[Test]
-		public void Test_5132()
-		{
-		}
-		[Test]
-		public void Test_5133()
-		{
-		}
-		[Test]
-		public void Test_5134()
-		{
-		}
-		[Test]
-		public void Test_5135()
-		{
-		}
-		[Test]
-		public void Test_5136()
-		{
-		}
-		[Test]
-		public void Test_5137()
-		{
-		}
-		[Test]
-		public void Test_5138()
-		{
-		}
-		[Test]
-		public void Test_5139()
-		{
-		}
-		[Test]
-		public void Test_5140()
-		{
-		}
-		[Test]
-		public void Test_5141()
-		{
-		}
-		[Test]
-		public void Test_5142()
-		{
-		}
-		[Test]
-		public void Test_5143()
-		{
-		}
-		[Test]
-		public void Test_5144()
-		{
-		}
-		[Test]
-		public void Test_5145()
-		{
-		}
-		[Test]
-		public void Test_5146()
-		{
-		}
-		[Test]
-		public void Test_5147()
-		{
-		}
-		[Test]
-		public void Test_5148()
-		{
-		}
-		[Test]
-		public void Test_5149()
-		{
-		}
-		[Test]
-		public void Test_5150()
-		{
-		}
-		[Test]
-		public void Test_5151()
-		{
-		}
-		[Test]
-		public void Test_5152()
-		{
-		}
-		[Test]
-		public void Test_5153()
-		{
-		}
-		[Test]
-		public void Test_5154()
-		{
-		}
-		[Test]
-		public void Test_5155()
-		{
-		}
-		[Test]
-		public void Test_5156()
-		{
-		}
-		[Test]
-		public void Test_5157()
-		{
-		}
-		[Test]
-		public void Test_5158()
-		{
-		}
-		[Test]
-		public void Test_5159()
-		{
-		}
-		[Test]
-		public void Test_5160()
-		{
-		}
-		[Test]
-		public void Test_5161()
-		{
-		}
-		[Test]
-		public void Test_5162()
-		{
-		}
-		[Test]
-		public void Test_5163()
-		{
-		}
-		[Test]
-		public void Test_5164()
-		{
-		}
-		[Test]
-		public void Test_5165()
-		{
-		}
-		[Test]
-		public void Test_5166()
-		{
-		}
-		[Test]
-		public void Test_5167()
-		{
-		}
-		[Test]
-		public void Test_5168()
-		{
-		}
-		[Test]
-		public void Test_5169()
-		{
-		}
-		[Test]
-		public void Test_5170()
-		{
-		}
-		[Test]
-		public void Test_5171()
-		{
-		}
-		[Test]
-		public void Test_5172()
-		{
-		}
-		[Test]
-		public void Test_5173()
-		{
-		}
-		[Test]
-		public void Test_5174()
-		{
-		}
-		[Test]
-		public void Test_5175()
-		{
-		}
-		[Test]
-		public void Test_5176()
-		{
-		}
-		[Test]
-		public void Test_5177()
-		{
-		}
-		[Test]
-		public void Test_5178()
-		{
-		}
-		[Test]
-		public void Test_5179()
-		{
-		}
-		[Test]
-		public void Test_5180()
-		{
-		}
-		[Test]
-		public void Test_5181()
-		{
-		}
-		[Test]
-		public void Test_5182()
-		{
-		}
-		[Test]
-		public void Test_5183()
-		{
-		}
-		[Test]
-		public void Test_5184()
-		{
-		}
-		[Test]
-		public void Test_5185()
-		{
-		}
-		[Test]
-		public void Test_5186()
-		{
-		}
-		[Test]
-		public void Test_5187()
-		{
-		}
-		[Test]
-		public void Test_5188()
-		{
-		}
-		[Test]
-		public void Test_5189()
-		{
-		}
-		[Test]
-		public void Test_5190()
-		{
-		}
-		[Test]
-		public void Test_5191()
-		{
-		}
-		[Test]
-		public void Test_5192()
-		{
-		}
-		[Test]
-		public void Test_5193()
-		{
-		}
-		[Test]
-		public void Test_5194()
-		{
-		}
-		[Test]
-		public void Test_5195()
-		{
-		}
-		[Test]
-		public void Test_5196()
-		{
-		}
-		[Test]
-		public void Test_5197()
-		{
-		}
-		[Test]
-		public void Test_5198()
-		{
-		}
-		[Test]
-		public void Test_5199()
-		{
-		}
-		[Test]
-		public void Test_5200()
-		{
-		}
-		[Test]
-		public void Test_5201()
-		{
-		}
-		[Test]
-		public void Test_5202()
-		{
-		}
-		[Test]
-		public void Test_5203()
-		{
-		}
-		[Test]
-		public void Test_5204()
-		{
-		}
-		[Test]
-		public void Test_5205()
-		{
-		}
-		[Test]
-		public void Test_5206()
-		{
-		}
-		[Test]
-		public void Test_5207()
-		{
-		}
-		[Test]
-		public void Test_5208()
-		{
-		}
-		[Test]
-		public void Test_5209()
-		{
-		}
-		[Test]
-		public void Test_5210()
-		{
-		}
-		[Test]
-		public void Test_5211()
-		{
-		}
-		[Test]
-		public void Test_5212()
-		{
-		}
-		[Test]
-		public void Test_5213()
-		{
-		}
-		[Test]
-		public void Test_5214()
-		{
-		}
-		[Test]
-		public void Test_5215()
-		{
-		}
-		[Test]
-		public void Test_5216()
-		{
-		}
-		[Test]
-		public void Test_5217()
-		{
-		}
-		[Test]
-		public void Test_5218()
-		{
-		}
-		[Test]
-		public void Test_5219()
-		{
-		}
-		[Test]
-		public void Test_5220()
-		{
-		}
-		[Test]
-		public void Test_5221()
-		{
-		}
-		[Test]
-		public void Test_5222()
-		{
-		}
-		[Test]
-		public void Test_5223()
-		{
-		}
-		[Test]
-		public void Test_5224()
-		{
-		}
-		[Test]
-		public void Test_5225()
-		{
-		}
-		[Test]
-		public void Test_5226()
-		{
-		}
-		[Test]
-		public void Test_5227()
-		{
-		}
-		[Test]
-		public void Test_5228()
-		{
-		}
-		[Test]
-		public void Test_5229()
-		{
-		}
-		[Test]
-		public void Test_5230()
-		{
-		}
-		[Test]
-		public void Test_5231()
-		{
-		}
-		[Test]
-		public void Test_5232()
-		{
-		}
-		[Test]
-		public void Test_5233()
-		{
-		}
-		[Test]
-		public void Test_5234()
-		{
-		}
-		[Test]
-		public void Test_5235()
-		{
-		}
-		[Test]
-		public void Test_5236()
-		{
-		}
-		[Test]
-		public void Test_5237()
-		{
-		}
-		[Test]
-		public void Test_5238()
-		{
-		}
-		[Test]
-		public void Test_5239()
-		{
-		}
-		[Test]
-		public void Test_5240()
-		{
-		}
-		[Test]
-		public void Test_5241()
-		{
-		}
-		[Test]
-		public void Test_5242()
-		{
-		}
-		[Test]
-		public void Test_5243()
-		{
-		}
-		[Test]
-		public void Test_5244()
-		{
-		}
-		[Test]
-		public void Test_5245()
-		{
-		}
-		[Test]
-		public void Test_5246()
-		{
-		}
-		[Test]
-		public void Test_5247()
-		{
-		}
-		[Test]
-		public void Test_5248()
-		{
-		}
-		[Test]
-		public void Test_5249()
-		{
-		}
-		[Test]
-		public void Test_5250()
-		{
-		}
-		[Test]
-		public void Test_5251()
-		{
-		}
-		[Test]
-		public void Test_5252()
-		{
-		}
-		[Test]
-		public void Test_5253()
-		{
-		}
-		[Test]
-		public void Test_5254()
-		{
-		}
-		[Test]
-		public void Test_5255()
-		{
-		}
-		[Test]
-		public void Test_5256()
-		{
-		}
-		[Test]
-		public void Test_5257()
-		{
-		}
-		[Test]
-		public void Test_5258()
-		{
-		}
-		[Test]
-		public void Test_5259()
-		{
-		}
-		[Test]
-		public void Test_5260()
-		{
-		}
-		[Test]
-		public void Test_5261()
-		{
-		}
-		[Test]
-		public void Test_5262()
-		{
-		}
-		[Test]
-		public void Test_5263()
-		{
-		}
-		[Test]
-		public void Test_5264()
-		{
-		}
-		[Test]
-		public void Test_5265()
-		{
-		}
-		[Test]
-		public void Test_5266()
-		{
-		}
-		[Test]
-		public void Test_5267()
-		{
-		}
-		[Test]
-		public void Test_5268()
-		{
-		}
-		[Test]
-		public void Test_5269()
-		{
-		}
-		[Test]
-		public void Test_5270()
-		{
-		}
-		[Test]
-		public void Test_5271()
-		{
-		}
-		[Test]
-		public void Test_5272()
-		{
-		}
-		[Test]
-		public void Test_5273()
-		{
-		}
-		[Test]
-		public void Test_5274()
-		{
-		}
-		[Test]
-		public void Test_5275()
-		{
-		}
-		[Test]
-		public void Test_5276()
-		{
-		}
-		[Test]
-		public void Test_5277()
-		{
-		}
-		[Test]
-		public void Test_5278()
-		{
-		}
-		[Test]
-		public void Test_5279()
-		{
-		}
-		[Test]
-		public void Test_5280()
-		{
-		}
-		[Test]
-		public void Test_5281()
-		{
-		}
-		[Test]
-		public void Test_5282()
-		{
-		}
-		[Test]
-		public void Test_5283()
-		{
-		}
-		[Test]
-		public void Test_5284()
-		{
-		}
-		[Test]
-		public void Test_5285()
-		{
-		}
-		[Test]
-		public void Test_5286()
-		{
-		}
-		[Test]
-		public void Test_5287()
-		{
-		}
-		[Test]
-		public void Test_5288()
-		{
-		}
-		[Test]
-		public void Test_5289()
-		{
-		}
-		[Test]
-		public void Test_5290()
-		{
-		}
-		[Test]
-		public void Test_5291()
-		{
-		}
-		[Test]
-		public void Test_5292()
-		{
-		}
-		[Test]
-		public void Test_5293()
-		{
-		}
-		[Test]
-		public void Test_5294()
-		{
-		}
-		[Test]
-		public void Test_5295()
-		{
-		}
-		[Test]
-		public void Test_5296()
-		{
-		}
-		[Test]
-		public void Test_5297()
-		{
-		}
-		[Test]
-		public void Test_5298()
-		{
-		}
-		[Test]
-		public void Test_5299()
-		{
-		}
-		[Test]
-		public void Test_5300()
-		{
-		}
-		[Test]
-		public void Test_5301()
-		{
-		}
-		[Test]
-		public void Test_5302()
-		{
-		}
-		[Test]
-		public void Test_5303()
-		{
-		}
-		[Test]
-		public void Test_5304()
-		{
-		}
-		[Test]
-		public void Test_5305()
-		{
-		}
-		[Test]
-		public void Test_5306()
-		{
-		}
-		[Test]
-		public void Test_5307()
-		{
-		}
-		[Test]
-		public void Test_5308()
-		{
-		}
-		[Test]
-		public void Test_5309()
-		{
-		}
-		[Test]
-		public void Test_5310()
-		{
-		}
-		[Test]
-		public void Test_5311()
-		{
-		}
-		[Test]
-		public void Test_5312()
-		{
-		}
-		[Test]
-		public void Test_5313()
-		{
-		}
-		[Test]
-		public void Test_5314()
-		{
-		}
-		[Test]
-		public void Test_5315()
-		{
-		}
-		[Test]
-		public void Test_5316()
-		{
-		}
-		[Test]
-		public void Test_5317()
-		{
-		}
-		[Test]
-		public void Test_5318()
-		{
-		}
-		[Test]
-		public void Test_5319()
-		{
-		}
-		[Test]
-		public void Test_5320()
-		{
-		}
-		[Test]
-		public void Test_5321()
-		{
-		}
-		[Test]
-		public void Test_5322()
-		{
-		}
-		[Test]
-		public void Test_5323()
-		{
-		}
-		[Test]
-		public void Test_5324()
-		{
-		}
-		[Test]
-		public void Test_5325()
-		{
-		}
-		[Test]
-		public void Test_5326()
-		{
-		}
-		[Test]
-		public void Test_5327()
-		{
-		}
-		[Test]
-		public void Test_5328()
-		{
-		}
-		[Test]
-		public void Test_5329()
-		{
-		}
-		[Test]
-		public void Test_5330()
-		{
-		}
-		[Test]
-		public void Test_5331()
-		{
-		}
-		[Test]
-		public void Test_5332()
-		{
-		}
-		[Test]
-		public void Test_5333()
-		{
-		}
-		[Test]
-		public void Test_5334()
-		{
-		}
-		[Test]
-		public void Test_5335()
-		{
-		}
-		[Test]
-		public void Test_5336()
-		{
-		}
-		[Test]
-		public void Test_5337()
-		{
-		}
-		[Test]
-		public void Test_5338()
-		{
-		}
-		[Test]
-		public void Test_5339()
-		{
-		}
-		[Test]
-		public void Test_5340()
-		{
-		}
-		[Test]
-		public void Test_5341()
-		{
-		}
-		[Test]
-		public void Test_5342()
-		{
-		}
-		[Test]
-		public void Test_5343()
-		{
-		}
-		[Test]
-		public void Test_5344()
-		{
-		}
-		[Test]
-		public void Test_5345()
-		{
-		}
-		[Test]
-		public void Test_5346()
-		{
-		}
-		[Test]
-		public void Test_5347()
-		{
-		}
-		[Test]
-		public void Test_5348()
-		{
-		}
-		[Test]
-		public void Test_5349()
-		{
-		}
-		[Test]
-		public void Test_5350()
-		{
-		}
-		[Test]
-		public void Test_5351()
-		{
-		}
-		[Test]
-		public void Test_5352()
-		{
-		}
-		[Test]
-		public void Test_5353()
-		{
-		}
-		[Test]
-		public void Test_5354()
-		{
-		}
-		[Test]
-		public void Test_5355()
-		{
-		}
-		[Test]
-		public void Test_5356()
-		{
-		}
-		[Test]
-		public void Test_5357()
-		{
-		}
-		[Test]
-		public void Test_5358()
-		{
-		}
-		[Test]
-		public void Test_5359()
-		{
-		}
-		[Test]
-		public void Test_5360()
-		{
-		}
-		[Test]
-		public void Test_5361()
-		{
-		}
-		[Test]
-		public void Test_5362()
-		{
-		}
-		[Test]
-		public void Test_5363()
-		{
-		}
-		[Test]
-		public void Test_5364()
-		{
-		}
-		[Test]
-		public void Test_5365()
-		{
-		}
-		[Test]
-		public void Test_5366()
-		{
-		}
-		[Test]
-		public void Test_5367()
-		{
-		}
-		[Test]
-		public void Test_5368()
-		{
-		}
-		[Test]
-		public void Test_5369()
-		{
-		}
-		[Test]
-		public void Test_5370()
-		{
-		}
-		[Test]
-		public void Test_5371()
-		{
-		}
-		[Test]
-		public void Test_5372()
-		{
-		}
-		[Test]
-		public void Test_5373()
-		{
-		}
-		[Test]
-		public void Test_5374()
-		{
-		}
-		[Test]
-		public void Test_5375()
-		{
-		}
-		[Test]
-		public void Test_5376()
-		{
-		}
-		[Test]
-		public void Test_5377()
-		{
-		}
-		[Test]
-		public void Test_5378()
-		{
-		}
-		[Test]
-		public void Test_5379()
-		{
-		}
-		[Test]
-		public void Test_5380()
-		{
-		}
-		[Test]
-		public void Test_5381()
-		{
-		}
-		[Test]
-		public void Test_5382()
-		{
-		}
-		[Test]
-		public void Test_5383()
-		{
-		}
-		[Test]
-		public void Test_5384()
-		{
-		}
-		[Test]
-		public void Test_5385()
-		{
-		}
-		[Test]
-		public void Test_5386()
-		{
-		}
-		[Test]
-		public void Test_5387()
-		{
-		}
-		[Test]
-		public void Test_5388()
-		{
-		}
-		[Test]
-		public void Test_5389()
-		{
-		}
-		[Test]
-		public void Test_5390()
-		{
-		}
-		[Test]
-		public void Test_5391()
-		{
-		}
-		[Test]
-		public void Test_5392()
-		{
-		}
-		[Test]
-		public void Test_5393()
-		{
-		}
-		[Test]
-		public void Test_5394()
-		{
-		}
-		[Test]
-		public void Test_5395()
-		{
-		}
-		[Test]
-		public void Test_5396()
-		{
-		}
-		[Test]
-		public void Test_5397()
-		{
-		}
-		[Test]
-		public void Test_5398()
-		{
-		}
-		[Test]
-		public void Test_5399()
-		{
-		}
-		[Test]
-		public void Test_5400()
-		{
-		}
-		[Test]
-		public void Test_5401()
-		{
-		}
-		[Test]
-		public void Test_5402()
-		{
-		}
-		[Test]
-		public void Test_5403()
-		{
-		}
-		[Test]
-		public void Test_5404()
-		{
-		}
-		[Test]
-		public void Test_5405()
-		{
-		}
-		[Test]
-		public void Test_5406()
-		{
-		}
-		[Test]
-		public void Test_5407()
-		{
-		}
-		[Test]
-		public void Test_5408()
-		{
-		}
-		[Test]
-		public void Test_5409()
-		{
-		}
-		[Test]
-		public void Test_5410()
-		{
-		}
-		[Test]
-		public void Test_5411()
-		{
-		}
-		[Test]
-		public void Test_5412()
-		{
-		}
-		[Test]
-		public void Test_5413()
-		{
-		}
-		[Test]
-		public void Test_5414()
-		{
-		}
-		[Test]
-		public void Test_5415()
-		{
-		}
-		[Test]
-		public void Test_5416()
-		{
-		}
-		[Test]
-		public void Test_5417()
-		{
-		}
-		[Test]
-		public void Test_5418()
-		{
-		}
-		[Test]
-		public void Test_5419()
-		{
-		}
-		[Test]
-		public void Test_5420()
-		{
-		}
-		[Test]
-		public void Test_5421()
-		{
-		}
-		[Test]
-		public void Test_5422()
-		{
-		}
-		[Test]
-		public void Test_5423()
-		{
-		}
-		[Test]
-		public void Test_5424()
-		{
-		}
-		[Test]
-		public void Test_5425()
-		{
-		}
-		[Test]
-		public void Test_5426()
-		{
-		}
-		[Test]
-		public void Test_5427()
-		{
-		}
-		[Test]
-		public void Test_5428()
-		{
-		}
-		[Test]
-		public void Test_5429()
-		{
-		}
-		[Test]
-		public void Test_5430()
-		{
-		}
-		[Test]
-		public void Test_5431()
-		{
-		}
-		[Test]
-		public void Test_5432()
-		{
-		}
-		[Test]
-		public void Test_5433()
-		{
-		}
-		[Test]
-		public void Test_5434()
-		{
-		}
-		[Test]
-		public void Test_5435()
-		{
-		}
-		[Test]
-		public void Test_5436()
-		{
-		}
-		[Test]
-		public void Test_5437()
-		{
-		}
-		[Test]
-		public void Test_5438()
-		{
-		}
-		[Test]
-		public void Test_5439()
-		{
-		}
-		[Test]
-		public void Test_5440()
-		{
-		}
-		[Test]
-		public void Test_5441()
-		{
-		}
-		[Test]
-		public void Test_5442()
-		{
-		}
-		[Test]
-		public void Test_5443()
-		{
-		}
-		[Test]
-		public void Test_5444()
-		{
-		}
-		[Test]
-		public void Test_5445()
-		{
-		}
-		[Test]
-		public void Test_5446()
-		{
-		}
-		[Test]
-		public void Test_5447()
-		{
-		}
-		[Test]
-		public void Test_5448()
-		{
-		}
-		[Test]
-		public void Test_5449()
-		{
-		}
-		[Test]
-		public void Test_5450()
-		{
-		}
-		[Test]
-		public void Test_5451()
-		{
-		}
-		[Test]
-		public void Test_5452()
-		{
-		}
-		[Test]
-		public void Test_5453()
-		{
-		}
-		[Test]
-		public void Test_5454()
-		{
-		}
-		[Test]
-		public void Test_5455()
-		{
-		}
-		[Test]
-		public void Test_5456()
-		{
-		}
-		[Test]
-		public void Test_5457()
-		{
-		}
-		[Test]
-		public void Test_5458()
-		{
-		}
-		[Test]
-		public void Test_5459()
-		{
-		}
-		[Test]
-		public void Test_5460()
-		{
-		}
-		[Test]
-		public void Test_5461()
-		{
-		}
-		[Test]
-		public void Test_5462()
-		{
-		}
-		[Test]
-		public void Test_5463()
-		{
-		}
-		[Test]
-		public void Test_5464()
-		{
-		}
-		[Test]
-		public void Test_5465()
-		{
-		}
-		[Test]
-		public void Test_5466()
-		{
-		}
-		[Test]
-		public void Test_5467()
-		{
-		}
-		[Test]
-		public void Test_5468()
-		{
-		}
-		[Test]
-		public void Test_5469()
-		{
-		}
-		[Test]
-		public void Test_5470()
-		{
-		}
-		[Test]
-		public void Test_5471()
-		{
-		}
-		[Test]
-		public void Test_5472()
-		{
-		}
-		[Test]
-		public void Test_5473()
-		{
-		}
-		[Test]
-		public void Test_5474()
-		{
-		}
-		[Test]
-		public void Test_5475()
-		{
-		}
-		[Test]
-		public void Test_5476()
-		{
-		}
-		[Test]
-		public void Test_5477()
-		{
-		}
-		[Test]
-		public void Test_5478()
-		{
-		}
-		[Test]
-		public void Test_5479()
-		{
-		}
-		[Test]
-		public void Test_5480()
-		{
-		}
-		[Test]
-		public void Test_5481()
-		{
-		}
-		[Test]
-		public void Test_5482()
-		{
-		}
-		[Test]
-		public void Test_5483()
-		{
-		}
-		[Test]
-		public void Test_5484()
-		{
-		}
-		[Test]
-		public void Test_5485()
-		{
-		}
-		[Test]
-		public void Test_5486()
-		{
-		}
-		[Test]
-		public void Test_5487()
-		{
-		}
-		[Test]
-		public void Test_5488()
-		{
-		}
-		[Test]
-		public void Test_5489()
-		{
-		}
-		[Test]
-		public void Test_5490()
-		{
-		}
-		[Test]
-		public void Test_5491()
-		{
-		}
-		[Test]
-		public void Test_5492()
-		{
-		}
-		[Test]
-		public void Test_5493()
-		{
-		}
-		[Test]
-		public void Test_5494()
-		{
-		}
-		[Test]
-		public void Test_5495()
-		{
-		}
-		[Test]
-		public void Test_5496()
-		{
-		}
-		[Test]
-		public void Test_5497()
-		{
-		}
-		[Test]
-		public void Test_5498()
-		{
-		}
-		[Test]
-		public void Test_5499()
-		{
-		}
-		[Test]
-		public void Test_5500()
-		{
-		}
-		[Test]
-		public void Test_5501()
-		{
-		}
-		[Test]
-		public void Test_5502()
-		{
-		}
-		[Test]
-		public void Test_5503()
-		{
-		}
-		[Test]
-		public void Test_5504()
-		{
-		}
-		[Test]
-		public void Test_5505()
-		{
-		}
-		[Test]
-		public void Test_5506()
-		{
-		}
-		[Test]
-		public void Test_5507()
-		{
-		}
-		[Test]
-		public void Test_5508()
-		{
-		}
-		[Test]
-		public void Test_5509()
-		{
-		}
-		[Test]
-		public void Test_5510()
-		{
-		}
-		[Test]
-		public void Test_5511()
-		{
-		}
-		[Test]
-		public void Test_5512()
-		{
-		}
-		[Test]
-		public void Test_5513()
-		{
-		}
-		[Test]
-		public void Test_5514()
-		{
-		}
-		[Test]
-		public void Test_5515()
-		{
-		}
-		[Test]
-		public void Test_5516()
-		{
-		}
-		[Test]
-		public void Test_5517()
-		{
-		}
-		[Test]
-		public void Test_5518()
-		{
-		}
-		[Test]
-		public void Test_5519()
-		{
-		}
-		[Test]
-		public void Test_5520()
-		{
-		}
-		[Test]
-		public void Test_5521()
-		{
-		}
-		[Test]
-		public void Test_5522()
-		{
-		}
-		[Test]
-		public void Test_5523()
-		{
-		}
-		[Test]
-		public void Test_5524()
-		{
-		}
-		[Test]
-		public void Test_5525()
-		{
-		}
-		[Test]
-		public void Test_5526()
-		{
-		}
-		[Test]
-		public void Test_5527()
-		{
-		}
-		[Test]
-		public void Test_5528()
-		{
-		}
-		[Test]
-		public void Test_5529()
-		{
-		}
-		[Test]
-		public void Test_5530()
-		{
-		}
-		[Test]
-		public void Test_5531()
-		{
-		}
-		[Test]
-		public void Test_5532()
-		{
-		}
-		[Test]
-		public void Test_5533()
-		{
-		}
-		[Test]
-		public void Test_5534()
-		{
-		}
-		[Test]
-		public void Test_5535()
-		{
-		}
-		[Test]
-		public void Test_5536()
-		{
-		}
-		[Test]
-		public void Test_5537()
-		{
-		}
-		[Test]
-		public void Test_5538()
-		{
-		}
-		[Test]
-		public void Test_5539()
-		{
-		}
-		[Test]
-		public void Test_5540()
-		{
-		}
-		[Test]
-		public void Test_5541()
-		{
-		}
-		[Test]
-		public void Test_5542()
-		{
-		}
-		[Test]
-		public void Test_5543()
-		{
-		}
-		[Test]
-		public void Test_5544()
-		{
-		}
-		[Test]
-		public void Test_5545()
-		{
-		}
-		[Test]
-		public void Test_5546()
-		{
-		}
-		[Test]
-		public void Test_5547()
-		{
-		}
-		[Test]
-		public void Test_5548()
-		{
-		}
-		[Test]
-		public void Test_5549()
-		{
-		}
-		[Test]
-		public void Test_5550()
-		{
-		}
-		[Test]
-		public void Test_5551()
-		{
-		}
-		[Test]
-		public void Test_5552()
-		{
-		}
-		[Test]
-		public void Test_5553()
-		{
-		}
-		[Test]
-		public void Test_5554()
-		{
-		}
-		[Test]
-		public void Test_5555()
-		{
-		}
-		[Test]
-		public void Test_5556()
-		{
-		}
-		[Test]
-		public void Test_5557()
-		{
-		}
-		[Test]
-		public void Test_5558()
-		{
-		}
-		[Test]
-		public void Test_5559()
-		{
-		}
-		[Test]
-		public void Test_5560()
-		{
-		}
-		[Test]
-		public void Test_5561()
-		{
-		}
-		[Test]
-		public void Test_5562()
-		{
-		}
-		[Test]
-		public void Test_5563()
-		{
-		}
-		[Test]
-		public void Test_5564()
-		{
-		}
-		[Test]
-		public void Test_5565()
-		{
-		}
-		[Test]
-		public void Test_5566()
-		{
-		}
-		[Test]
-		public void Test_5567()
-		{
-		}
-		[Test]
-		public void Test_5568()
-		{
-		}
-		[Test]
-		public void Test_5569()
-		{
-		}
-		[Test]
-		public void Test_5570()
-		{
-		}
-		[Test]
-		public void Test_5571()
-		{
-		}
-		[Test]
-		public void Test_5572()
-		{
-		}
-		[Test]
-		public void Test_5573()
-		{
-		}
-		[Test]
-		public void Test_5574()
-		{
-		}
-		[Test]
-		public void Test_5575()
-		{
-		}
-		[Test]
-		public void Test_5576()
-		{
-		}
-		[Test]
-		public void Test_5577()
-		{
-		}
-		[Test]
-		public void Test_5578()
-		{
-		}
-		[Test]
-		public void Test_5579()
-		{
-		}
-		[Test]
-		public void Test_5580()
-		{
-		}
-		[Test]
-		public void Test_5581()
-		{
-		}
-		[Test]
-		public void Test_5582()
-		{
-		}
-		[Test]
-		public void Test_5583()
-		{
-		}
-		[Test]
-		public void Test_5584()
-		{
-		}
-		[Test]
-		public void Test_5585()
-		{
-		}
-		[Test]
-		public void Test_5586()
-		{
-		}
-		[Test]
-		public void Test_5587()
-		{
-		}
-		[Test]
-		public void Test_5588()
-		{
-		}
-		[Test]
-		public void Test_5589()
-		{
-		}
-		[Test]
-		public void Test_5590()
-		{
-		}
-		[Test]
-		public void Test_5591()
-		{
-		}
-		[Test]
-		public void Test_5592()
-		{
-		}
-		[Test]
-		public void Test_5593()
-		{
-		}
-		[Test]
-		public void Test_5594()
-		{
-		}
-		[Test]
-		public void Test_5595()
-		{
-		}
-		[Test]
-		public void Test_5596()
-		{
-		}
-		[Test]
-		public void Test_5597()
-		{
-		}
-		[Test]
-		public void Test_5598()
-		{
-		}
-		[Test]
-		public void Test_5599()
-		{
-		}
-		[Test]
-		public void Test_5600()
-		{
-		}
-		[Test]
-		public void Test_5601()
-		{
-		}
-		[Test]
-		public void Test_5602()
-		{
-		}
-		[Test]
-		public void Test_5603()
-		{
-		}
-		[Test]
-		public void Test_5604()
-		{
-		}
-		[Test]
-		public void Test_5605()
-		{
-		}
-		[Test]
-		public void Test_5606()
-		{
-		}
-		[Test]
-		public void Test_5607()
-		{
-		}
-		[Test]
-		public void Test_5608()
-		{
-		}
-		[Test]
-		public void Test_5609()
-		{
-		}
-		[Test]
-		public void Test_5610()
-		{
-		}
-		[Test]
-		public void Test_5611()
-		{
-		}
-		[Test]
-		public void Test_5612()
-		{
-		}
-		[Test]
-		public void Test_5613()
-		{
-		}
-		[Test]
-		public void Test_5614()
-		{
-		}
-		[Test]
-		public void Test_5615()
-		{
-		}
-		[Test]
-		public void Test_5616()
-		{
-		}
-		[Test]
-		public void Test_5617()
-		{
-		}
-		[Test]
-		public void Test_5618()
-		{
-		}
-		[Test]
-		public void Test_5619()
-		{
-		}
-		[Test]
-		public void Test_5620()
-		{
-		}
-		[Test]
-		public void Test_5621()
-		{
-		}
-		[Test]
-		public void Test_5622()
-		{
-		}
-		[Test]
-		public void Test_5623()
-		{
-		}
-		[Test]
-		public void Test_5624()
-		{
-		}
-		[Test]
-		public void Test_5625()
-		{
-		}
-		[Test]
-		public void Test_5626()
-		{
-		}
-		[Test]
-		public void Test_5627()
-		{
-		}
-		[Test]
-		public void Test_5628()
-		{
-		}
-		[Test]
-		public void Test_5629()
-		{
-		}
-		[Test]
-		public void Test_5630()
-		{
-		}
-		[Test]
-		public void Test_5631()
-		{
-		}
-		[Test]
-		public void Test_5632()
-		{
-		}
-		[Test]
-		public void Test_5633()
-		{
-		}
-		[Test]
-		public void Test_5634()
-		{
-		}
-		[Test]
-		public void Test_5635()
-		{
-		}
-		[Test]
-		public void Test_5636()
-		{
-		}
-		[Test]
-		public void Test_5637()
-		{
-		}
-		[Test]
-		public void Test_5638()
-		{
-		}
-		[Test]
-		public void Test_5639()
-		{
-		}
-		[Test]
-		public void Test_5640()
-		{
-		}
-		[Test]
-		public void Test_5641()
-		{
-		}
-		[Test]
-		public void Test_5642()
-		{
-		}
-		[Test]
-		public void Test_5643()
-		{
-		}
-		[Test]
-		public void Test_5644()
-		{
-		}
-		[Test]
-		public void Test_5645()
-		{
-		}
-		[Test]
-		public void Test_5646()
-		{
-		}
-		[Test]
-		public void Test_5647()
-		{
-		}
-		[Test]
-		public void Test_5648()
-		{
-		}
-		[Test]
-		public void Test_5649()
-		{
-		}
-		[Test]
-		public void Test_5650()
-		{
-		}
-		[Test]
-		public void Test_5651()
-		{
-		}
-		[Test]
-		public void Test_5652()
-		{
-		}
-		[Test]
-		public void Test_5653()
-		{
-		}
-		[Test]
-		public void Test_5654()
-		{
-		}
-		[Test]
-		public void Test_5655()
-		{
-		}
-		[Test]
-		public void Test_5656()
-		{
-		}
-		[Test]
-		public void Test_5657()
-		{
-		}
-		[Test]
-		public void Test_5658()
-		{
-		}
-		[Test]
-		public void Test_5659()
-		{
-		}
-		[Test]
-		public void Test_5660()
-		{
-		}
-		[Test]
-		public void Test_5661()
-		{
-		}
-		[Test]
-		public void Test_5662()
-		{
-		}
-		[Test]
-		public void Test_5663()
-		{
-		}
-		[Test]
-		public void Test_5664()
-		{
-		}
-		[Test]
-		public void Test_5665()
-		{
-		}
-		[Test]
-		public void Test_5666()
-		{
-		}
-		[Test]
-		public void Test_5667()
-		{
-		}
-		[Test]
-		public void Test_5668()
-		{
-		}
-		[Test]
-		public void Test_5669()
-		{
-		}
-		[Test]
-		public void Test_5670()
-		{
-		}
-		[Test]
-		public void Test_5671()
-		{
-		}
-		[Test]
-		public void Test_5672()
-		{
-		}
-		[Test]
-		public void Test_5673()
-		{
-		}
-		[Test]
-		public void Test_5674()
-		{
-		}
-		[Test]
-		public void Test_5675()
-		{
-		}
-		[Test]
-		public void Test_5676()
-		{
-		}
-		[Test]
-		public void Test_5677()
-		{
-		}
-		[Test]
-		public void Test_5678()
-		{
-		}
-		[Test]
-		public void Test_5679()
-		{
-		}
-		[Test]
-		public void Test_5680()
-		{
-		}
-		[Test]
-		public void Test_5681()
-		{
-		}
-		[Test]
-		public void Test_5682()
-		{
-		}
-		[Test]
-		public void Test_5683()
-		{
-		}
-		[Test]
-		public void Test_5684()
-		{
-		}
-		[Test]
-		public void Test_5685()
-		{
-		}
-		[Test]
-		public void Test_5686()
-		{
-		}
-		[Test]
-		public void Test_5687()
-		{
-		}
-		[Test]
-		public void Test_5688()
-		{
-		}
-		[Test]
-		public void Test_5689()
-		{
-		}
-		[Test]
-		public void Test_5690()
-		{
-		}
-		[Test]
-		public void Test_5691()
-		{
-		}
-		[Test]
-		public void Test_5692()
-		{
-		}
-		[Test]
-		public void Test_5693()
-		{
-		}
-		[Test]
-		public void Test_5694()
-		{
-		}
-		[Test]
-		public void Test_5695()
-		{
-		}
-		[Test]
-		public void Test_5696()
-		{
-		}
-		[Test]
-		public void Test_5697()
-		{
-		}
-		[Test]
-		public void Test_5698()
-		{
-		}
-		[Test]
-		public void Test_5699()
-		{
-		}
-		[Test]
-		public void Test_5700()
-		{
-		}
-		[Test]
-		public void Test_5701()
-		{
-		}
-		[Test]
-		public void Test_5702()
-		{
-		}
-		[Test]
-		public void Test_5703()
-		{
-		}
-		[Test]
-		public void Test_5704()
-		{
-		}
-		[Test]
-		public void Test_5705()
-		{
-		}
-		[Test]
-		public void Test_5706()
-		{
-		}
-		[Test]
-		public void Test_5707()
-		{
-		}
-		[Test]
-		public void Test_5708()
-		{
-		}
-		[Test]
-		public void Test_5709()
-		{
-		}
-		[Test]
-		public void Test_5710()
-		{
-		}
-		[Test]
-		public void Test_5711()
-		{
-		}
-		[Test]
-		public void Test_5712()
-		{
-		}
-		[Test]
-		public void Test_5713()
-		{
-		}
-		[Test]
-		public void Test_5714()
-		{
-		}
-		[Test]
-		public void Test_5715()
-		{
-		}
-		[Test]
-		public void Test_5716()
-		{
-		}
-		[Test]
-		public void Test_5717()
-		{
-		}
-		[Test]
-		public void Test_5718()
-		{
-		}
-		[Test]
-		public void Test_5719()
-		{
-		}
-		[Test]
-		public void Test_5720()
-		{
-		}
-		[Test]
-		public void Test_5721()
-		{
-		}
-		[Test]
-		public void Test_5722()
-		{
-		}
-		[Test]
-		public void Test_5723()
-		{
-		}
-		[Test]
-		public void Test_5724()
-		{
-		}
-		[Test]
-		public void Test_5725()
-		{
-		}
-		[Test]
-		public void Test_5726()
-		{
-		}
-		[Test]
-		public void Test_5727()
-		{
-		}
-		[Test]
-		public void Test_5728()
-		{
-		}
-		[Test]
-		public void Test_5729()
-		{
-		}
-		[Test]
-		public void Test_5730()
-		{
-		}
-		[Test]
-		public void Test_5731()
-		{
-		}
-		[Test]
-		public void Test_5732()
-		{
-		}
-		[Test]
-		public void Test_5733()
-		{
-		}
-		[Test]
-		public void Test_5734()
-		{
-		}
-		[Test]
-		public void Test_5735()
-		{
-		}
-		[Test]
-		public void Test_5736()
-		{
-		}
-		[Test]
-		public void Test_5737()
-		{
-		}
-		[Test]
-		public void Test_5738()
-		{
-		}
-		[Test]
-		public void Test_5739()
-		{
-		}
-		[Test]
-		public void Test_5740()
-		{
-		}
-		[Test]
-		public void Test_5741()
-		{
-		}
-		[Test]
-		public void Test_5742()
-		{
-		}
-		[Test]
-		public void Test_5743()
-		{
-		}
-		[Test]
-		public void Test_5744()
-		{
-		}
-		[Test]
-		public void Test_5745()
-		{
-		}
-		[Test]
-		public void Test_5746()
-		{
-		}
-		[Test]
-		public void Test_5747()
-		{
-		}
-		[Test]
-		public void Test_5748()
-		{
-		}
-		[Test]
-		public void Test_5749()
-		{
-		}
-		[Test]
-		public void Test_5750()
-		{
-		}
-		[Test]
-		public void Test_5751()
-		{
-		}
-		[Test]
-		public void Test_5752()
-		{
-		}
-		[Test]
-		public void Test_5753()
-		{
-		}
-		[Test]
-		public void Test_5754()
-		{
-		}
-		[Test]
-		public void Test_5755()
-		{
-		}
-		[Test]
-		public void Test_5756()
-		{
-		}
-		[Test]
-		public void Test_5757()
-		{
-		}
-		[Test]
-		public void Test_5758()
-		{
-		}
-		[Test]
-		public void Test_5759()
-		{
-		}
-		[Test]
-		public void Test_5760()
-		{
-		}
-		[Test]
-		public void Test_5761()
-		{
-		}
-		[Test]
-		public void Test_5762()
-		{
-		}
-		[Test]
-		public void Test_5763()
-		{
-		}
-		[Test]
-		public void Test_5764()
-		{
-		}
-		[Test]
-		public void Test_5765()
-		{
-		}
-		[Test]
-		public void Test_5766()
-		{
-		}
-		[Test]
-		public void Test_5767()
-		{
-		}
-		[Test]
-		public void Test_5768()
-		{
-		}
-		[Test]
-		public void Test_5769()
-		{
-		}
-		[Test]
-		public void Test_5770()
-		{
-		}
-		[Test]
-		public void Test_5771()
-		{
-		}
-		[Test]
-		public void Test_5772()
-		{
-		}
-		[Test]
-		public void Test_5773()
-		{
-		}
-		[Test]
-		public void Test_5774()
-		{
-		}
-		[Test]
-		public void Test_5775()
-		{
-		}
-		[Test]
-		public void Test_5776()
-		{
-		}
-		[Test]
-		public void Test_5777()
-		{
-		}
-		[Test]
-		public void Test_5778()
-		{
-		}
-		[Test]
-		public void Test_5779()
-		{
-		}
-		[Test]
-		public void Test_5780()
-		{
-		}
-		[Test]
-		public void Test_5781()
-		{
-		}
-		[Test]
-		public void Test_5782()
-		{
-		}
-		[Test]
-		public void Test_5783()
-		{
-		}
-		[Test]
-		public void Test_5784()
-		{
-		}
-		[Test]
-		public void Test_5785()
-		{
-		}
-		[Test]
-		public void Test_5786()
-		{
-		}
-		[Test]
-		public void Test_5787()
-		{
-		}
-		[Test]
-		public void Test_5788()
-		{
-		}
-		[Test]
-		public void Test_5789()
-		{
-		}
-		[Test]
-		public void Test_5790()
-		{
-		}
-		[Test]
-		public void Test_5791()
-		{
-		}
-		[Test]
-		public void Test_5792()
-		{
-		}
-		[Test]
-		public void Test_5793()
-		{
-		}
-		[Test]
-		public void Test_5794()
-		{
-		}
-		[Test]
-		public void Test_5795()
-		{
-		}
-		[Test]
-		public void Test_5796()
-		{
-		}
-		[Test]
-		public void Test_5797()
-		{
-		}
-		[Test]
-		public void Test_5798()
-		{
-		}
-		[Test]
-		public void Test_5799()
-		{
-		}
-		[Test]
-		public void Test_5800()
-		{
-		}
-		[Test]
-		public void Test_5801()
-		{
-		}
-		[Test]
-		public void Test_5802()
-		{
-		}
-		[Test]
-		public void Test_5803()
-		{
-		}
-		[Test]
-		public void Test_5804()
-		{
-		}
-		[Test]
-		public void Test_5805()
-		{
-		}
-		[Test]
-		public void Test_5806()
-		{
-		}
-		[Test]
-		public void Test_5807()
-		{
-		}
-		[Test]
-		public void Test_5808()
-		{
-		}
-		[Test]
-		public void Test_5809()
-		{
-		}
-		[Test]
-		public void Test_5810()
-		{
-		}
-		[Test]
-		public void Test_5811()
-		{
-		}
-		[Test]
-		public void Test_5812()
-		{
-		}
-		[Test]
-		public void Test_5813()
-		{
-		}
-		[Test]
-		public void Test_5814()
-		{
-		}
-		[Test]
-		public void Test_5815()
-		{
-		}
-		[Test]
-		public void Test_5816()
-		{
-		}
-		[Test]
-		public void Test_5817()
-		{
-		}
-		[Test]
-		public void Test_5818()
-		{
-		}
-		[Test]
-		public void Test_5819()
-		{
-		}
-		[Test]
-		public void Test_5820()
-		{
-		}
-		[Test]
-		public void Test_5821()
-		{
-		}
-		[Test]
-		public void Test_5822()
-		{
-		}
-		[Test]
-		public void Test_5823()
-		{
-		}
-		[Test]
-		public void Test_5824()
-		{
-		}
-		[Test]
-		public void Test_5825()
-		{
-		}
-		[Test]
-		public void Test_5826()
-		{
-		}
-		[Test]
-		public void Test_5827()
-		{
-		}
-		[Test]
-		public void Test_5828()
-		{
-		}
-		[Test]
-		public void Test_5829()
-		{
-		}
-		[Test]
-		public void Test_5830()
-		{
-		}
-		[Test]
-		public void Test_5831()
-		{
-		}
-		[Test]
-		public void Test_5832()
-		{
-		}
-		[Test]
-		public void Test_5833()
-		{
-		}
-		[Test]
-		public void Test_5834()
-		{
-		}
-		[Test]
-		public void Test_5835()
-		{
-		}
-		[Test]
-		public void Test_5836()
-		{
-		}
-		[Test]
-		public void Test_5837()
-		{
-		}
-		[Test]
-		public void Test_5838()
-		{
-		}
-		[Test]
-		public void Test_5839()
-		{
-		}
-		[Test]
-		public void Test_5840()
-		{
-		}
-		[Test]
-		public void Test_5841()
-		{
-		}
-		[Test]
-		public void Test_5842()
-		{
-		}
-		[Test]
-		public void Test_5843()
-		{
-		}
-		[Test]
-		public void Test_5844()
-		{
-		}
-		[Test]
-		public void Test_5845()
-		{
-		}
-		[Test]
-		public void Test_5846()
-		{
-		}
-		[Test]
-		public void Test_5847()
-		{
-		}
-		[Test]
-		public void Test_5848()
-		{
-		}
-		[Test]
-		public void Test_5849()
-		{
-		}
-		[Test]
-		public void Test_5850()
-		{
-		}
-		[Test]
-		public void Test_5851()
-		{
-		}
-		[Test]
-		public void Test_5852()
-		{
-		}
-		[Test]
-		public void Test_5853()
-		{
-		}
-		[Test]
-		public void Test_5854()
-		{
-		}
-		[Test]
-		public void Test_5855()
-		{
-		}
-		[Test]
-		public void Test_5856()
-		{
-		}
-		[Test]
-		public void Test_5857()
-		{
-		}
-		[Test]
-		public void Test_5858()
-		{
-		}
-		[Test]
-		public void Test_5859()
-		{
-		}
-		[Test]
-		public void Test_5860()
-		{
-		}
-		[Test]
-		public void Test_5861()
-		{
-		}
-		[Test]
-		public void Test_5862()
-		{
-		}
-		[Test]
-		public void Test_5863()
-		{
-		}
-		[Test]
-		public void Test_5864()
-		{
-		}
-		[Test]
-		public void Test_5865()
-		{
-		}
-		[Test]
-		public void Test_5866()
-		{
-		}
-		[Test]
-		public void Test_5867()
-		{
-		}
-		[Test]
-		public void Test_5868()
-		{
-		}
-		[Test]
-		public void Test_5869()
-		{
-		}
-		[Test]
-		public void Test_5870()
-		{
-		}
-		[Test]
-		public void Test_5871()
-		{
-		}
-		[Test]
-		public void Test_5872()
-		{
-		}
-		[Test]
-		public void Test_5873()
-		{
-		}
-		[Test]
-		public void Test_5874()
-		{
-		}
-		[Test]
-		public void Test_5875()
-		{
-		}
-		[Test]
-		public void Test_5876()
-		{
-		}
-		[Test]
-		public void Test_5877()
-		{
-		}
-		[Test]
-		public void Test_5878()
-		{
-		}
-		[Test]
-		public void Test_5879()
-		{
-		}
-		[Test]
-		public void Test_5880()
-		{
-		}
-		[Test]
-		public void Test_5881()
-		{
-		}
-		[Test]
-		public void Test_5882()
-		{
-		}
-		[Test]
-		public void Test_5883()
-		{
-		}
-		[Test]
-		public void Test_5884()
-		{
-		}
-		[Test]
-		public void Test_5885()
-		{
-		}
-		[Test]
-		public void Test_5886()
-		{
-		}
-		[Test]
-		public void Test_5887()
-		{
-		}
-		[Test]
-		public void Test_5888()
-		{
-		}
-		[Test]
-		public void Test_5889()
-		{
-		}
-		[Test]
-		public void Test_5890()
-		{
-		}
-		[Test]
-		public void Test_5891()
-		{
-		}
-		[Test]
-		public void Test_5892()
-		{
-		}
-		[Test]
-		public void Test_5893()
-		{
-		}
-		[Test]
-		public void Test_5894()
-		{
-		}
-		[Test]
-		public void Test_5895()
-		{
-		}
-		[Test]
-		public void Test_5896()
-		{
-		}
-		[Test]
-		public void Test_5897()
-		{
-		}
-		[Test]
-		public void Test_5898()
-		{
-		}
-		[Test]
-		public void Test_5899()
-		{
-		}
-		[Test]
-		public void Test_5900()
-		{
-		}
-		[Test]
-		public void Test_5901()
-		{
-		}
-		[Test]
-		public void Test_5902()
-		{
-		}
-		[Test]
-		public void Test_5903()
-		{
-		}
-		[Test]
-		public void Test_5904()
-		{
-		}
-		[Test]
-		public void Test_5905()
-		{
-		}
-		[Test]
-		public void Test_5906()
-		{
-		}
-		[Test]
-		public void Test_5907()
-		{
-		}
-		[Test]
-		public void Test_5908()
-		{
-		}
-		[Test]
-		public void Test_5909()
-		{
-		}
-		[Test]
-		public void Test_5910()
-		{
-		}
-		[Test]
-		public void Test_5911()
-		{
-		}
-		[Test]
-		public void Test_5912()
-		{
-		}
-		[Test]
-		public void Test_5913()
-		{
-		}
-		[Test]
-		public void Test_5914()
-		{
-		}
-		[Test]
-		public void Test_5915()
-		{
-		}
-		[Test]
-		public void Test_5916()
-		{
-		}
-		[Test]
-		public void Test_5917()
-		{
-		}
-		[Test]
-		public void Test_5918()
-		{
-		}
-		[Test]
-		public void Test_5919()
-		{
-		}
-		[Test]
-		public void Test_5920()
-		{
-		}
-		[Test]
-		public void Test_5921()
-		{
-		}
-		[Test]
-		public void Test_5922()
-		{
-		}
-		[Test]
-		public void Test_5923()
-		{
-		}
-		[Test]
-		public void Test_5924()
-		{
-		}
-		[Test]
-		public void Test_5925()
-		{
-		}
-		[Test]
-		public void Test_5926()
-		{
-		}
-		[Test]
-		public void Test_5927()
-		{
-		}
-		[Test]
-		public void Test_5928()
-		{
-		}
-		[Test]
-		public void Test_5929()
-		{
-		}
-		[Test]
-		public void Test_5930()
-		{
-		}
-		[Test]
-		public void Test_5931()
-		{
-		}
-		[Test]
-		public void Test_5932()
-		{
-		}
-		[Test]
-		public void Test_5933()
-		{
-		}
-		[Test]
-		public void Test_5934()
-		{
-		}
-		[Test]
-		public void Test_5935()
-		{
-		}
-		[Test]
-		public void Test_5936()
-		{
-		}
-		[Test]
-		public void Test_5937()
-		{
-		}
-		[Test]
-		public void Test_5938()
-		{
-		}
-		[Test]
-		public void Test_5939()
-		{
-		}
-		[Test]
-		public void Test_5940()
-		{
-		}
-		[Test]
-		public void Test_5941()
-		{
-		}
-		[Test]
-		public void Test_5942()
-		{
-		}
-		[Test]
-		public void Test_5943()
-		{
-		}
-		[Test]
-		public void Test_5944()
-		{
-		}
-		[Test]
-		public void Test_5945()
-		{
-		}
-		[Test]
-		public void Test_5946()
-		{
-		}
-		[Test]
-		public void Test_5947()
-		{
-		}
-		[Test]
-		public void Test_5948()
-		{
-		}
-		[Test]
-		public void Test_5949()
-		{
-		}
-		[Test]
-		public void Test_5950()
-		{
-		}
-		[Test]
-		public void Test_5951()
-		{
-		}
-		[Test]
-		public void Test_5952()
-		{
-		}
-		[Test]
-		public void Test_5953()
-		{
-		}
-		[Test]
-		public void Test_5954()
-		{
-		}
-		[Test]
-		public void Test_5955()
-		{
-		}
-		[Test]
-		public void Test_5956()
-		{
-		}
-		[Test]
-		public void Test_5957()
-		{
-		}
-		[Test]
-		public void Test_5958()
-		{
-		}
-		[Test]
-		public void Test_5959()
-		{
-		}
-		[Test]
-		public void Test_5960()
-		{
-		}
-		[Test]
-		public void Test_5961()
-		{
-		}
-		[Test]
-		public void Test_5962()
-		{
-		}
-		[Test]
-		public void Test_5963()
-		{
-		}
-		[Test]
-		public void Test_5964()
-		{
-		}
-		[Test]
-		public void Test_5965()
-		{
-		}
-		[Test]
-		public void Test_5966()
-		{
-		}
-		[Test]
-		public void Test_5967()
-		{
-		}
-		[Test]
-		public void Test_5968()
-		{
-		}
-		[Test]
-		public void Test_5969()
-		{
-		}
-		[Test]
-		public void Test_5970()
-		{
-		}
-		[Test]
-		public void Test_5971()
-		{
-		}
-		[Test]
-		public void Test_5972()
-		{
-		}
-		[Test]
-		public void Test_5973()
-		{
-		}
-		[Test]
-		public void Test_5974()
-		{
-		}
-		[Test]
-		public void Test_5975()
-		{
-		}
-		[Test]
-		public void Test_5976()
-		{
-		}
-		[Test]
-		public void Test_5977()
-		{
-		}
-		[Test]
-		public void Test_5978()
-		{
-		}
-		[Test]
-		public void Test_5979()
-		{
-		}
-		[Test]
-		public void Test_5980()
-		{
-		}
-		[Test]
-		public void Test_5981()
-		{
-		}
-		[Test]
-		public void Test_5982()
-		{
-		}
-		[Test]
-		public void Test_5983()
-		{
-		}
-		[Test]
-		public void Test_5984()
-		{
-		}
-		[Test]
-		public void Test_5985()
-		{
-		}
-		[Test]
-		public void Test_5986()
-		{
-		}
-		[Test]
-		public void Test_5987()
-		{
-		}
-		[Test]
-		public void Test_5988()
-		{
-		}
-		[Test]
-		public void Test_5989()
-		{
-		}
-		[Test]
-		public void Test_5990()
-		{
-		}
-		[Test]
-		public void Test_5991()
-		{
-		}
-		[Test]
-		public void Test_5992()
-		{
-		}
-		[Test]
-		public void Test_5993()
-		{
-		}
-		[Test]
-		public void Test_5994()
-		{
-		}
-		[Test]
-		public void Test_5995()
-		{
-		}
-		[Test]
-		public void Test_5996()
-		{
-		}
-		[Test]
-		public void Test_5997()
-		{
-		}
-		[Test]
-		public void Test_5998()
-		{
-		}
-		[Test]
-		public void Test_5999()
-		{
-		}
-		[Test]
-		public void Test_6000()
-		{
-		}
-		[Test]
-		public void Test_6001()
-		{
-		}
-		[Test]
-		public void Test_6002()
-		{
-		}
-		[Test]
-		public void Test_6003()
-		{
-		}
-		[Test]
-		public void Test_6004()
-		{
-		}
-		[Test]
-		public void Test_6005()
-		{
-		}
-		[Test]
-		public void Test_6006()
-		{
-		}
-		[Test]
-		public void Test_6007()
-		{
-		}
-		[Test]
-		public void Test_6008()
-		{
-		}
-		[Test]
-		public void Test_6009()
-		{
-		}
-		[Test]
-		public void Test_6010()
-		{
-		}
-		[Test]
-		public void Test_6011()
-		{
-		}
-		[Test]
-		public void Test_6012()
-		{
-		}
-		[Test]
-		public void Test_6013()
-		{
-		}
-		[Test]
-		public void Test_6014()
-		{
-		}
-		[Test]
-		public void Test_6015()
-		{
-		}
-		[Test]
-		public void Test_6016()
-		{
-		}
-		[Test]
-		public void Test_6017()
-		{
-		}
-		[Test]
-		public void Test_6018()
-		{
-		}
-		[Test]
-		public void Test_6019()
-		{
-		}
-		[Test]
-		public void Test_6020()
-		{
-		}
-		[Test]
-		public void Test_6021()
-		{
-		}
-		[Test]
-		public void Test_6022()
-		{
-		}
-		[Test]
-		public void Test_6023()
-		{
-		}
-		[Test]
-		public void Test_6024()
-		{
-		}
-		[Test]
-		public void Test_6025()
-		{
-		}
-		[Test]
-		public void Test_6026()
-		{
-		}
-		[Test]
-		public void Test_6027()
-		{
-		}
-		[Test]
-		public void Test_6028()
-		{
-		}
-		[Test]
-		public void Test_6029()
-		{
-		}
-		[Test]
-		public void Test_6030()
-		{
-		}
-		[Test]
-		public void Test_6031()
-		{
-		}
-		[Test]
-		public void Test_6032()
-		{
-		}
-		[Test]
-		public void Test_6033()
-		{
-		}
-		[Test]
-		public void Test_6034()
-		{
-		}
-		[Test]
-		public void Test_6035()
-		{
-		}
-		[Test]
-		public void Test_6036()
-		{
-		}
-		[Test]
-		public void Test_6037()
-		{
-		}
-		[Test]
-		public void Test_6038()
-		{
-		}
-		[Test]
-		public void Test_6039()
-		{
-		}
-		[Test]
-		public void Test_6040()
-		{
-		}
-		[Test]
-		public void Test_6041()
-		{
-		}
-		[Test]
-		public void Test_6042()
-		{
-		}
-		[Test]
-		public void Test_6043()
-		{
-		}
-		[Test]
-		public void Test_6044()
-		{
-		}
-		[Test]
-		public void Test_6045()
-		{
-		}
-		[Test]
-		public void Test_6046()
-		{
-		}
-		[Test]
-		public void Test_6047()
-		{
-		}
-		[Test]
-		public void Test_6048()
-		{
-		}
-		[Test]
-		public void Test_6049()
-		{
-		}
-		[Test]
-		public void Test_6050()
-		{
-		}
-		[Test]
-		public void Test_6051()
-		{
-		}
-		[Test]
-		public void Test_6052()
-		{
-		}
-		[Test]
-		public void Test_6053()
-		{
-		}
-		[Test]
-		public void Test_6054()
-		{
-		}
-		[Test]
-		public void Test_6055()
-		{
-		}
-		[Test]
-		public void Test_6056()
-		{
-		}
-		[Test]
-		public void Test_6057()
-		{
-		}
-		[Test]
-		public void Test_6058()
-		{
-		}
-		[Test]
-		public void Test_6059()
-		{
-		}
-		[Test]
-		public void Test_6060()
-		{
-		}
-		[Test]
-		public void Test_6061()
-		{
-		}
-		[Test]
-		public void Test_6062()
-		{
-		}
-		[Test]
-		public void Test_6063()
-		{
-		}
-		[Test]
-		public void Test_6064()
-		{
-		}
-		[Test]
-		public void Test_6065()
-		{
-		}
-		[Test]
-		public void Test_6066()
-		{
-		}
-		[Test]
-		public void Test_6067()
-		{
-		}
-		[Test]
-		public void Test_6068()
-		{
-		}
-		[Test]
-		public void Test_6069()
-		{
-		}
-		[Test]
-		public void Test_6070()
-		{
-		}
-		[Test]
-		public void Test_6071()
-		{
-		}
-		[Test]
-		public void Test_6072()
-		{
-		}
-		[Test]
-		public void Test_6073()
-		{
-		}
-		[Test]
-		public void Test_6074()
-		{
-		}
-		[Test]
-		public void Test_6075()
-		{
-		}
-		[Test]
-		public void Test_6076()
-		{
-		}
-		[Test]
-		public void Test_6077()
-		{
-		}
-		[Test]
-		public void Test_6078()
-		{
-		}
-		[Test]
-		public void Test_6079()
-		{
-		}
-		[Test]
-		public void Test_6080()
-		{
-		}
-		[Test]
-		public void Test_6081()
-		{
-		}
-		[Test]
-		public void Test_6082()
-		{
-		}
-		[Test]
-		public void Test_6083()
-		{
-		}
-		[Test]
-		public void Test_6084()
-		{
-		}
-		[Test]
-		public void Test_6085()
-		{
-		}
-		[Test]
-		public void Test_6086()
-		{
-		}
-		[Test]
-		public void Test_6087()
-		{
-		}
-		[Test]
-		public void Test_6088()
-		{
-		}
-		[Test]
-		public void Test_6089()
-		{
-		}
-		[Test]
-		public void Test_6090()
-		{
-		}
-		[Test]
-		public void Test_6091()
-		{
-		}
-		[Test]
-		public void Test_6092()
-		{
-		}
-		[Test]
-		public void Test_6093()
-		{
-		}
-		[Test]
-		public void Test_6094()
-		{
-		}
-		[Test]
-		public void Test_6095()
-		{
-		}
-		[Test]
-		public void Test_6096()
-		{
-		}
-		[Test]
-		public void Test_6097()
-		{
-		}
-		[Test]
-		public void Test_6098()
-		{
-		}
-		[Test]
-		public void Test_6099()
-		{
-		}
-		[Test]
-		public void Test_6100()
-		{
-		}
-		[Test]
-		public void Test_6101()
-		{
-		}
-		[Test]
-		public void Test_6102()
-		{
-		}
-		[Test]
-		public void Test_6103()
-		{
-		}
-		[Test]
-		public void Test_6104()
-		{
-		}
-		[Test]
-		public void Test_6105()
-		{
-		}
-		[Test]
-		public void Test_6106()
-		{
-		}
-		[Test]
-		public void Test_6107()
-		{
-		}
-		[Test]
-		public void Test_6108()
-		{
-		}
-		[Test]
-		public void Test_6109()
-		{
-		}
-		[Test]
-		public void Test_6110()
-		{
-		}
-		[Test]
-		public void Test_6111()
-		{
-		}
-		[Test]
-		public void Test_6112()
-		{
-		}
-		[Test]
-		public void Test_6113()
-		{
-		}
-		[Test]
-		public void Test_6114()
-		{
-		}
-		[Test]
-		public void Test_6115()
-		{
-		}
-		[Test]
-		public void Test_6116()
-		{
-		}
-		[Test]
-		public void Test_6117()
-		{
-		}
-		[Test]
-		public void Test_6118()
-		{
-		}
-		[Test]
-		public void Test_6119()
-		{
-		}
-		[Test]
-		public void Test_6120()
-		{
-		}
-		[Test]
-		public void Test_6121()
-		{
-		}
-		[Test]
-		public void Test_6122()
-		{
-		}
-		[Test]
-		public void Test_6123()
-		{
-		}
-		[Test]
-		public void Test_6124()
-		{
-		}
-		[Test]
-		public void Test_6125()
-		{
-		}
-		[Test]
-		public void Test_6126()
-		{
-		}
-		[Test]
-		public void Test_6127()
-		{
-		}
-		[Test]
-		public void Test_6128()
-		{
-		}
-		[Test]
-		public void Test_6129()
-		{
-		}
-		[Test]
-		public void Test_6130()
-		{
-		}
-		[Test]
-		public void Test_6131()
-		{
-		}
-		[Test]
-		public void Test_6132()
-		{
-		}
-		[Test]
-		public void Test_6133()
-		{
-		}
-		[Test]
-		public void Test_6134()
-		{
-		}
-		[Test]
-		public void Test_6135()
-		{
-		}
-		[Test]
-		public void Test_6136()
-		{
-		}
-		[Test]
-		public void Test_6137()
-		{
-		}
-		[Test]
-		public void Test_6138()
-		{
-		}
-		[Test]
-		public void Test_6139()
-		{
-		}
-		[Test]
-		public void Test_6140()
-		{
-		}
-		[Test]
-		public void Test_6141()
-		{
-		}
-		[Test]
-		public void Test_6142()
-		{
-		}
-		[Test]
-		public void Test_6143()
-		{
-		}
-		[Test]
-		public void Test_6144()
-		{
-		}
-		[Test]
-		public void Test_6145()
-		{
-		}
-		[Test]
-		public void Test_6146()
-		{
-		}
-		[Test]
-		public void Test_6147()
-		{
-		}
-		[Test]
-		public void Test_6148()
-		{
-		}
-		[Test]
-		public void Test_6149()
-		{
-		}
-		[Test]
-		public void Test_6150()
-		{
-		}
-		[Test]
-		public void Test_6151()
-		{
-		}
-		[Test]
-		public void Test_6152()
-		{
-		}
-		[Test]
-		public void Test_6153()
-		{
-		}
-		[Test]
-		public void Test_6154()
-		{
-		}
-		[Test]
-		public void Test_6155()
-		{
-		}
-		[Test]
-		public void Test_6156()
-		{
-		}
-		[Test]
-		public void Test_6157()
-		{
-		}
-		[Test]
-		public void Test_6158()
-		{
-		}
-		[Test]
-		public void Test_6159()
-		{
-		}
-		[Test]
-		public void Test_6160()
-		{
-		}
-		[Test]
-		public void Test_6161()
-		{
-		}
-		[Test]
-		public void Test_6162()
-		{
-		}
-		[Test]
-		public void Test_6163()
-		{
-		}
-		[Test]
-		public void Test_6164()
-		{
-		}
-		[Test]
-		public void Test_6165()
-		{
-		}
-		[Test]
-		public void Test_6166()
-		{
-		}
-		[Test]
-		public void Test_6167()
-		{
-		}
-		[Test]
-		public void Test_6168()
-		{
-		}
-		[Test]
-		public void Test_6169()
-		{
-		}
-		[Test]
-		public void Test_6170()
-		{
-		}
-		[Test]
-		public void Test_6171()
-		{
-		}
-		[Test]
-		public void Test_6172()
-		{
-		}
-		[Test]
-		public void Test_6173()
-		{
-		}
-		[Test]
-		public void Test_6174()
-		{
-		}
-		[Test]
-		public void Test_6175()
-		{
-		}
-		[Test]
-		public void Test_6176()
-		{
-		}
-		[Test]
-		public void Test_6177()
-		{
-		}
-		[Test]
-		public void Test_6178()
-		{
-		}
-		[Test]
-		public void Test_6179()
-		{
-		}
-		[Test]
-		public void Test_6180()
-		{
-		}
-		[Test]
-		public void Test_6181()
-		{
-		}
-		[Test]
-		public void Test_6182()
-		{
-		}
-		[Test]
-		public void Test_6183()
-		{
-		}
-		[Test]
-		public void Test_6184()
-		{
-		}
-		[Test]
-		public void Test_6185()
-		{
-		}
-		[Test]
-		public void Test_6186()
-		{
-		}
-		[Test]
-		public void Test_6187()
-		{
-		}
-		[Test]
-		public void Test_6188()
-		{
-		}
-		[Test]
-		public void Test_6189()
-		{
-		}
-		[Test]
-		public void Test_6190()
-		{
-		}
-		[Test]
-		public void Test_6191()
-		{
-		}
-		[Test]
-		public void Test_6192()
-		{
-		}
-		[Test]
-		public void Test_6193()
-		{
-		}
-		[Test]
-		public void Test_6194()
-		{
-		}
-		[Test]
-		public void Test_6195()
-		{
-		}
-		[Test]
-		public void Test_6196()
-		{
-		}
-		[Test]
-		public void Test_6197()
-		{
-		}
-		[Test]
-		public void Test_6198()
-		{
-		}
-		[Test]
-		public void Test_6199()
-		{
-		}
-		[Test]
-		public void Test_6200()
-		{
-		}
-		[Test]
-		public void Test_6201()
-		{
-		}
-		[Test]
-		public void Test_6202()
-		{
-		}
-		[Test]
-		public void Test_6203()
-		{
-		}
-		[Test]
-		public void Test_6204()
-		{
-		}
-		[Test]
-		public void Test_6205()
-		{
-		}
-		[Test]
-		public void Test_6206()
-		{
-		}
-		[Test]
-		public void Test_6207()
-		{
-		}
-		[Test]
-		public void Test_6208()
-		{
-		}
-		[Test]
-		public void Test_6209()
-		{
-		}
-		[Test]
-		public void Test_6210()
-		{
-		}
-		[Test]
-		public void Test_6211()
-		{
-		}
-		[Test]
-		public void Test_6212()
-		{
-		}
-		[Test]
-		public void Test_6213()
-		{
-		}
-		[Test]
-		public void Test_6214()
-		{
-		}
-		[Test]
-		public void Test_6215()
-		{
-		}
-		[Test]
-		public void Test_6216()
-		{
-		}
-		[Test]
-		public void Test_6217()
-		{
-		}
-		[Test]
-		public void Test_6218()
-		{
-		}
-		[Test]
-		public void Test_6219()
-		{
-		}
-		[Test]
-		public void Test_6220()
-		{
-		}
-		[Test]
-		public void Test_6221()
-		{
-		}
-		[Test]
-		public void Test_6222()
-		{
-		}
-		[Test]
-		public void Test_6223()
-		{
-		}
-		[Test]
-		public void Test_6224()
-		{
-		}
-		[Test]
-		public void Test_6225()
-		{
-		}
-		[Test]
-		public void Test_6226()
-		{
-		}
-		[Test]
-		public void Test_6227()
-		{
-		}
-		[Test]
-		public void Test_6228()
-		{
-		}
-		[Test]
-		public void Test_6229()
-		{
-		}
-		[Test]
-		public void Test_6230()
-		{
-		}
-		[Test]
-		public void Test_6231()
-		{
-		}
-		[Test]
-		public void Test_6232()
-		{
-		}
-		[Test]
-		public void Test_6233()
-		{
-		}
-		[Test]
-		public void Test_6234()
-		{
-		}
-		[Test]
-		public void Test_6235()
-		{
-		}
-		[Test]
-		public void Test_6236()
-		{
-		}
-		[Test]
-		public void Test_6237()
-		{
-		}
-		[Test]
-		public void Test_6238()
-		{
-		}
-		[Test]
-		public void Test_6239()
-		{
-		}
-		[Test]
-		public void Test_6240()
-		{
-		}
-		[Test]
-		public void Test_6241()
-		{
-		}
-		[Test]
-		public void Test_6242()
-		{
-		}
-		[Test]
-		public void Test_6243()
-		{
-		}
-		[Test]
-		public void Test_6244()
-		{
-		}
-		[Test]
-		public void Test_6245()
-		{
-		}
-		[Test]
-		public void Test_6246()
-		{
-		}
-		[Test]
-		public void Test_6247()
-		{
-		}
-		[Test]
-		public void Test_6248()
-		{
-		}
-		[Test]
-		public void Test_6249()
-		{
-		}
-		[Test]
-		public void Test_6250()
-		{
-		}
-		[Test]
-		public void Test_6251()
-		{
-		}
-		[Test]
-		public void Test_6252()
-		{
-		}
-		[Test]
-		public void Test_6253()
-		{
-		}
-		[Test]
-		public void Test_6254()
-		{
-		}
-		[Test]
-		public void Test_6255()
-		{
-		}
-		[Test]
-		public void Test_6256()
-		{
-		}
-		[Test]
-		public void Test_6257()
-		{
-		}
-		[Test]
-		public void Test_6258()
-		{
-		}
-		[Test]
-		public void Test_6259()
-		{
-		}
-		[Test]
-		public void Test_6260()
-		{
-		}
-		[Test]
-		public void Test_6261()
-		{
-		}
-		[Test]
-		public void Test_6262()
-		{
-		}
-		[Test]
-		public void Test_6263()
-		{
-		}
-		[Test]
-		public void Test_6264()
-		{
-		}
-		[Test]
-		public void Test_6265()
-		{
-		}
-		[Test]
-		public void Test_6266()
-		{
-		}
-		[Test]
-		public void Test_6267()
-		{
-		}
-		[Test]
-		public void Test_6268()
-		{
-		}
-		[Test]
-		public void Test_6269()
-		{
-		}
-		[Test]
-		public void Test_6270()
-		{
-		}
-		[Test]
-		public void Test_6271()
-		{
-		}
-		[Test]
-		public void Test_6272()
-		{
-		}
-		[Test]
-		public void Test_6273()
-		{
-		}
-		[Test]
-		public void Test_6274()
-		{
-		}
-		[Test]
-		public void Test_6275()
-		{
-		}
-		[Test]
-		public void Test_6276()
-		{
-		}
-		[Test]
-		public void Test_6277()
-		{
-		}
-		[Test]
-		public void Test_6278()
-		{
-		}
-		[Test]
-		public void Test_6279()
-		{
-		}
-		[Test]
-		public void Test_6280()
-		{
-		}
-		[Test]
-		public void Test_6281()
-		{
-		}
-		[Test]
-		public void Test_6282()
-		{
-		}
-		[Test]
-		public void Test_6283()
-		{
-		}
-		[Test]
-		public void Test_6284()
-		{
-		}
-		[Test]
-		public void Test_6285()
-		{
-		}
-		[Test]
-		public void Test_6286()
-		{
-		}
-		[Test]
-		public void Test_6287()
-		{
-		}
-		[Test]
-		public void Test_6288()
-		{
-		}
-		[Test]
-		public void Test_6289()
-		{
-		}
-		[Test]
-		public void Test_6290()
-		{
-		}
-		[Test]
-		public void Test_6291()
-		{
-		}
-		[Test]
-		public void Test_6292()
-		{
-		}
-		[Test]
-		public void Test_6293()
-		{
-		}
-		[Test]
-		public void Test_6294()
-		{
-		}
-		[Test]
-		public void Test_6295()
-		{
-		}
-		[Test]
-		public void Test_6296()
-		{
-		}
-		[Test]
-		public void Test_6297()
-		{
-		}
-		[Test]
-		public void Test_6298()
-		{
-		}
-		[Test]
-		public void Test_6299()
-		{
-		}
-		[Test]
-		public void Test_6300()
-		{
-		}
-		[Test]
-		public void Test_6301()
-		{
-		}
-		[Test]
-		public void Test_6302()
-		{
-		}
-		[Test]
-		public void Test_6303()
-		{
-		}
-		[Test]
-		public void Test_6304()
-		{
-		}
-		[Test]
-		public void Test_6305()
-		{
-		}
-		[Test]
-		public void Test_6306()
-		{
-		}
-		[Test]
-		public void Test_6307()
-		{
-		}
-		[Test]
-		public void Test_6308()
-		{
-		}
-		[Test]
-		public void Test_6309()
-		{
-		}
-		[Test]
-		public void Test_6310()
-		{
-		}
-		[Test]
-		public void Test_6311()
-		{
-		}
-		[Test]
-		public void Test_6312()
-		{
-		}
-		[Test]
-		public void Test_6313()
-		{
-		}
-		[Test]
-		public void Test_6314()
-		{
-		}
-		[Test]
-		public void Test_6315()
-		{
-		}
-		[Test]
-		public void Test_6316()
-		{
-		}
-		[Test]
-		public void Test_6317()
-		{
-		}
-		[Test]
-		public void Test_6318()
-		{
-		}
-		[Test]
-		public void Test_6319()
-		{
-		}
-		[Test]
-		public void Test_6320()
-		{
-		}
-		[Test]
-		public void Test_6321()
-		{
-		}
-		[Test]
-		public void Test_6322()
-		{
-		}
-		[Test]
-		public void Test_6323()
-		{
-		}
-		[Test]
-		public void Test_6324()
-		{
-		}
-		[Test]
-		public void Test_6325()
-		{
-		}
-		[Test]
-		public void Test_6326()
-		{
-		}
-		[Test]
-		public void Test_6327()
-		{
-		}
-		[Test]
-		public void Test_6328()
-		{
-		}
-		[Test]
-		public void Test_6329()
-		{
-		}
-		[Test]
-		public void Test_6330()
-		{
-		}
-		[Test]
-		public void Test_6331()
-		{
-		}
-		[Test]
-		public void Test_6332()
-		{
-		}
-		[Test]
-		public void Test_6333()
-		{
-		}
-		[Test]
-		public void Test_6334()
-		{
-		}
-		[Test]
-		public void Test_6335()
-		{
-		}
-		[Test]
-		public void Test_6336()
-		{
-		}
-		[Test]
-		public void Test_6337()
-		{
-		}
-		[Test]
-		public void Test_6338()
-		{
-		}
-		[Test]
-		public void Test_6339()
-		{
-		}
-		[Test]
-		public void Test_6340()
-		{
-		}
-		[Test]
-		public void Test_6341()
-		{
-		}
-		[Test]
-		public void Test_6342()
-		{
-		}
-		[Test]
-		public void Test_6343()
-		{
-		}
-		[Test]
-		public void Test_6344()
-		{
-		}
-		[Test]
-		public void Test_6345()
-		{
-		}
-		[Test]
-		public void Test_6346()
-		{
-		}
-		[Test]
-		public void Test_6347()
-		{
-		}
-		[Test]
-		public void Test_6348()
-		{
-		}
-		[Test]
-		public void Test_6349()
-		{
-		}
-		[Test]
-		public void Test_6350()
-		{
-		}
-		[Test]
-		public void Test_6351()
-		{
-		}
-		[Test]
-		public void Test_6352()
-		{
-		}
-		[Test]
-		public void Test_6353()
-		{
-		}
-		[Test]
-		public void Test_6354()
-		{
-		}
-		[Test]
-		public void Test_6355()
-		{
-		}
-		[Test]
-		public void Test_6356()
-		{
-		}
-		[Test]
-		public void Test_6357()
-		{
-		}
-		[Test]
-		public void Test_6358()
-		{
-		}
-		[Test]
-		public void Test_6359()
-		{
-		}
-		[Test]
-		public void Test_6360()
-		{
-		}
-		[Test]
-		public void Test_6361()
-		{
-		}
-		[Test]
-		public void Test_6362()
-		{
-		}
-		[Test]
-		public void Test_6363()
-		{
-		}
-		[Test]
-		public void Test_6364()
-		{
-		}
-		[Test]
-		public void Test_6365()
-		{
-		}
-		[Test]
-		public void Test_6366()
-		{
-		}
-		[Test]
-		public void Test_6367()
-		{
-		}
-		[Test]
-		public void Test_6368()
-		{
-		}
-		[Test]
-		public void Test_6369()
-		{
-		}
-		[Test]
-		public void Test_6370()
-		{
-		}
-		[Test]
-		public void Test_6371()
-		{
-		}
-		[Test]
-		public void Test_6372()
-		{
-		}
-		[Test]
-		public void Test_6373()
-		{
-		}
-		[Test]
-		public void Test_6374()
-		{
-		}
-		[Test]
-		public void Test_6375()
-		{
-		}
-		[Test]
-		public void Test_6376()
-		{
-		}
-		[Test]
-		public void Test_6377()
-		{
-		}
-		[Test]
-		public void Test_6378()
-		{
-		}
-		[Test]
-		public void Test_6379()
-		{
-		}
-		[Test]
-		public void Test_6380()
-		{
-		}
-		[Test]
-		public void Test_6381()
-		{
-		}
-		[Test]
-		public void Test_6382()
-		{
-		}
-		[Test]
-		public void Test_6383()
-		{
-		}
-		[Test]
-		public void Test_6384()
-		{
-		}
-		[Test]
-		public void Test_6385()
-		{
-		}
-		[Test]
-		public void Test_6386()
-		{
-		}
-		[Test]
-		public void Test_6387()
-		{
-		}
-		[Test]
-		public void Test_6388()
-		{
-		}
-		[Test]
-		public void Test_6389()
-		{
-		}
-		[Test]
-		public void Test_6390()
-		{
-		}
-		[Test]
-		public void Test_6391()
-		{
-		}
-		[Test]
-		public void Test_6392()
-		{
-		}
-		[Test]
-		public void Test_6393()
-		{
-		}
-		[Test]
-		public void Test_6394()
-		{
-		}
-		[Test]
-		public void Test_6395()
-		{
-		}
-		[Test]
-		public void Test_6396()
-		{
-		}
-		[Test]
-		public void Test_6397()
-		{
-		}
-		[Test]
-		public void Test_6398()
-		{
-		}
-		[Test]
-		public void Test_6399()
-		{
-		}
-		[Test]
-		public void Test_6400()
-		{
-		}
-		[Test]
-		public void Test_6401()
-		{
-		}
-		[Test]
-		public void Test_6402()
-		{
-		}
-		[Test]
-		public void Test_6403()
-		{
-		}
-		[Test]
-		public void Test_6404()
-		{
-		}
-		[Test]
-		public void Test_6405()
-		{
-		}
-		[Test]
-		public void Test_6406()
-		{
-		}
-		[Test]
-		public void Test_6407()
-		{
-		}
-		[Test]
-		public void Test_6408()
-		{
-		}
-		[Test]
-		public void Test_6409()
-		{
-		}
-		[Test]
-		public void Test_6410()
-		{
-		}
-		[Test]
-		public void Test_6411()
-		{
-		}
-		[Test]
-		public void Test_6412()
-		{
-		}
-		[Test]
-		public void Test_6413()
-		{
-		}
-		[Test]
-		public void Test_6414()
-		{
-		}
-		[Test]
-		public void Test_6415()
-		{
-		}
-		[Test]
-		public void Test_6416()
-		{
-		}
-		[Test]
-		public void Test_6417()
-		{
-		}
-		[Test]
-		public void Test_6418()
-		{
-		}
-		[Test]
-		public void Test_6419()
-		{
-		}
-		[Test]
-		public void Test_6420()
-		{
-		}
-		[Test]
-		public void Test_6421()
-		{
-		}
-		[Test]
-		public void Test_6422()
-		{
-		}
-		[Test]
-		public void Test_6423()
-		{
-		}
-		[Test]
-		public void Test_6424()
-		{
-		}
-		[Test]
-		public void Test_6425()
-		{
-		}
-		[Test]
-		public void Test_6426()
-		{
-		}
-		[Test]
-		public void Test_6427()
-		{
-		}
-		[Test]
-		public void Test_6428()
-		{
-		}
-		[Test]
-		public void Test_6429()
-		{
-		}
-		[Test]
-		public void Test_6430()
-		{
-		}
-		[Test]
-		public void Test_6431()
-		{
-		}
-		[Test]
-		public void Test_6432()
-		{
-		}
-		[Test]
-		public void Test_6433()
-		{
-		}
-		[Test]
-		public void Test_6434()
-		{
-		}
-		[Test]
-		public void Test_6435()
-		{
-		}
-		[Test]
-		public void Test_6436()
-		{
-		}
-		[Test]
-		public void Test_6437()
-		{
-		}
-		[Test]
-		public void Test_6438()
-		{
-		}
-		[Test]
-		public void Test_6439()
-		{
-		}
-		[Test]
-		public void Test_6440()
-		{
-		}
-		[Test]
-		public void Test_6441()
-		{
-		}
-		[Test]
-		public void Test_6442()
-		{
-		}
-		[Test]
-		public void Test_6443()
-		{
-		}
-		[Test]
-		public void Test_6444()
-		{
-		}
-		[Test]
-		public void Test_6445()
-		{
-		}
-		[Test]
-		public void Test_6446()
-		{
-		}
-		[Test]
-		public void Test_6447()
-		{
-		}
-		[Test]
-		public void Test_6448()
-		{
-		}
-		[Test]
-		public void Test_6449()
-		{
-		}
-		[Test]
-		public void Test_6450()
-		{
-		}
-		[Test]
-		public void Test_6451()
-		{
-		}
-		[Test]
-		public void Test_6452()
-		{
-		}
-		[Test]
-		public void Test_6453()
-		{
-		}
-		[Test]
-		public void Test_6454()
-		{
-		}
-		[Test]
-		public void Test_6455()
-		{
-		}
-		[Test]
-		public void Test_6456()
-		{
-		}
-		[Test]
-		public void Test_6457()
-		{
-		}
-		[Test]
-		public void Test_6458()
-		{
-		}
-		[Test]
-		public void Test_6459()
-		{
-		}
-		[Test]
-		public void Test_6460()
-		{
-		}
-		[Test]
-		public void Test_6461()
-		{
-		}
-		[Test]
-		public void Test_6462()
-		{
-		}
-		[Test]
-		public void Test_6463()
-		{
-		}
-		[Test]
-		public void Test_6464()
-		{
-		}
-		[Test]
-		public void Test_6465()
-		{
-		}
-		[Test]
-		public void Test_6466()
-		{
-		}
-		[Test]
-		public void Test_6467()
-		{
-		}
-		[Test]
-		public void Test_6468()
-		{
-		}
-		[Test]
-		public void Test_6469()
-		{
-		}
-		[Test]
-		public void Test_6470()
-		{
-		}
-		[Test]
-		public void Test_6471()
-		{
-		}
-		[Test]
-		public void Test_6472()
-		{
-		}
-		[Test]
-		public void Test_6473()
-		{
-		}
-		[Test]
-		public void Test_6474()
-		{
-		}
-		[Test]
-		public void Test_6475()
-		{
-		}
-		[Test]
-		public void Test_6476()
-		{
-		}
-		[Test]
-		public void Test_6477()
-		{
-		}
-		[Test]
-		public void Test_6478()
-		{
-		}
-		[Test]
-		public void Test_6479()
-		{
-		}
-		[Test]
-		public void Test_6480()
-		{
-		}
-		[Test]
-		public void Test_6481()
-		{
-		}
-		[Test]
-		public void Test_6482()
-		{
-		}
-		[Test]
-		public void Test_6483()
-		{
-		}
-		[Test]
-		public void Test_6484()
-		{
-		}
-		[Test]
-		public void Test_6485()
-		{
-		}
-		[Test]
-		public void Test_6486()
-		{
-		}
-		[Test]
-		public void Test_6487()
-		{
-		}
-		[Test]
-		public void Test_6488()
-		{
-		}
-		[Test]
-		public void Test_6489()
-		{
-		}
-		[Test]
-		public void Test_6490()
-		{
-		}
-		[Test]
-		public void Test_6491()
-		{
-		}
-		[Test]
-		public void Test_6492()
-		{
-		}
-		[Test]
-		public void Test_6493()
-		{
-		}
-		[Test]
-		public void Test_6494()
-		{
-		}
-		[Test]
-		public void Test_6495()
-		{
-		}
-		[Test]
-		public void Test_6496()
-		{
-		}
-		[Test]
-		public void Test_6497()
-		{
-		}
-		[Test]
-		public void Test_6498()
-		{
-		}
-		[Test]
-		public void Test_6499()
-		{
-		}
-		[Test]
-		public void Test_6500()
-		{
-		}
-		[Test]
-		public void Test_6501()
-		{
-		}
-		[Test]
-		public void Test_6502()
-		{
-		}
-		[Test]
-		public void Test_6503()
-		{
-		}
-		[Test]
-		public void Test_6504()
-		{
-		}
-		[Test]
-		public void Test_6505()
-		{
-		}
-		[Test]
-		public void Test_6506()
-		{
-		}
-		[Test]
-		public void Test_6507()
-		{
-		}
-		[Test]
-		public void Test_6508()
-		{
-		}
-		[Test]
-		public void Test_6509()
-		{
-		}
-		[Test]
-		public void Test_6510()
-		{
-		}
-		[Test]
-		public void Test_6511()
-		{
-		}
-		[Test]
-		public void Test_6512()
-		{
-		}
-		[Test]
-		public void Test_6513()
-		{
-		}
-		[Test]
-		public void Test_6514()
-		{
-		}
-		[Test]
-		public void Test_6515()
-		{
-		}
-		[Test]
-		public void Test_6516()
-		{
-		}
-		[Test]
-		public void Test_6517()
-		{
-		}
-		[Test]
-		public void Test_6518()
-		{
-		}
-		[Test]
-		public void Test_6519()
-		{
-		}
-		[Test]
-		public void Test_6520()
-		{
-		}
-		[Test]
-		public void Test_6521()
-		{
-		}
-		[Test]
-		public void Test_6522()
-		{
-		}
-		[Test]
-		public void Test_6523()
-		{
-		}
-		[Test]
-		public void Test_6524()
-		{
-		}
-		[Test]
-		public void Test_6525()
-		{
-		}
-		[Test]
-		public void Test_6526()
-		{
-		}
-		[Test]
-		public void Test_6527()
-		{
-		}
-		[Test]
-		public void Test_6528()
-		{
-		}
-		[Test]
-		public void Test_6529()
-		{
-		}
-		[Test]
-		public void Test_6530()
-		{
-		}
-		[Test]
-		public void Test_6531()
-		{
-		}
-		[Test]
-		public void Test_6532()
-		{
-		}
-		[Test]
-		public void Test_6533()
-		{
-		}
-		[Test]
-		public void Test_6534()
-		{
-		}
-		[Test]
-		public void Test_6535()
-		{
-		}
-		[Test]
-		public void Test_6536()
-		{
-		}
-		[Test]
-		public void Test_6537()
-		{
-		}
-		[Test]
-		public void Test_6538()
-		{
-		}
-		[Test]
-		public void Test_6539()
-		{
-		}
-		[Test]
-		public void Test_6540()
-		{
-		}
-		[Test]
-		public void Test_6541()
-		{
-		}
-		[Test]
-		public void Test_6542()
-		{
-		}
-		[Test]
-		public void Test_6543()
-		{
-		}
-		[Test]
-		public void Test_6544()
-		{
-		}
-		[Test]
-		public void Test_6545()
-		{
-		}
-		[Test]
-		public void Test_6546()
-		{
-		}
-		[Test]
-		public void Test_6547()
-		{
-		}
-		[Test]
-		public void Test_6548()
-		{
-		}
-		[Test]
-		public void Test_6549()
-		{
-		}
-		[Test]
-		public void Test_6550()
-		{
-		}
-		[Test]
-		public void Test_6551()
-		{
-		}
-		[Test]
-		public void Test_6552()
-		{
-		}
-		[Test]
-		public void Test_6553()
-		{
-		}
-		[Test]
-		public void Test_6554()
-		{
-		}
-		[Test]
-		public void Test_6555()
-		{
-		}
-		[Test]
-		public void Test_6556()
-		{
-		}
-		[Test]
-		public void Test_6557()
-		{
-		}
-		[Test]
-		public void Test_6558()
-		{
-		}
-		[Test]
-		public void Test_6559()
-		{
-		}
-		[Test]
-		public void Test_6560()
-		{
-		}
-		[Test]
-		public void Test_6561()
-		{
-		}
-		[Test]
-		public void Test_6562()
-		{
-		}
-		[Test]
-		public void Test_6563()
-		{
-		}
-		[Test]
-		public void Test_6564()
-		{
-		}
-		[Test]
-		public void Test_6565()
-		{
-		}
-		[Test]
-		public void Test_6566()
-		{
-		}
-		[Test]
-		public void Test_6567()
-		{
-		}
-		[Test]
-		public void Test_6568()
-		{
-		}
-		[Test]
-		public void Test_6569()
-		{
-		}
-		[Test]
-		public void Test_6570()
-		{
-		}
-		[Test]
-		public void Test_6571()
-		{
-		}
-		[Test]
-		public void Test_6572()
-		{
-		}
-		[Test]
-		public void Test_6573()
-		{
-		}
-		[Test]
-		public void Test_6574()
-		{
-		}
-		[Test]
-		public void Test_6575()
-		{
-		}
-		[Test]
-		public void Test_6576()
-		{
-		}
-		[Test]
-		public void Test_6577()
-		{
-		}
-		[Test]
-		public void Test_6578()
-		{
-		}
-		[Test]
-		public void Test_6579()
-		{
-		}
-		[Test]
-		public void Test_6580()
-		{
-		}
-		[Test]
-		public void Test_6581()
-		{
-		}
-		[Test]
-		public void Test_6582()
-		{
-		}
-		[Test]
-		public void Test_6583()
-		{
-		}
-		[Test]
-		public void Test_6584()
-		{
-		}
-		[Test]
-		public void Test_6585()
-		{
-		}
-		[Test]
-		public void Test_6586()
-		{
-		}
-		[Test]
-		public void Test_6587()
-		{
-		}
-		[Test]
-		public void Test_6588()
-		{
-		}
-		[Test]
-		public void Test_6589()
-		{
-		}
-		[Test]
-		public void Test_6590()
-		{
-		}
-		[Test]
-		public void Test_6591()
-		{
-		}
-		[Test]
-		public void Test_6592()
-		{
-		}
-		[Test]
-		public void Test_6593()
-		{
-		}
-		[Test]
-		public void Test_6594()
-		{
-		}
-		[Test]
-		public void Test_6595()
-		{
-		}
-		[Test]
-		public void Test_6596()
-		{
-		}
-		[Test]
-		public void Test_6597()
-		{
-		}
-		[Test]
-		public void Test_6598()
-		{
-		}
-		[Test]
-		public void Test_6599()
-		{
-		}
-		[Test]
-		public void Test_6600()
-		{
-		}
-		[Test]
-		public void Test_6601()
-		{
-		}
-		[Test]
-		public void Test_6602()
-		{
-		}
-		[Test]
-		public void Test_6603()
-		{
-		}
-		[Test]
-		public void Test_6604()
-		{
-		}
-		[Test]
-		public void Test_6605()
-		{
-		}
-		[Test]
-		public void Test_6606()
-		{
-		}
-		[Test]
-		public void Test_6607()
-		{
-		}
-		[Test]
-		public void Test_6608()
-		{
-		}
-		[Test]
-		public void Test_6609()
-		{
-		}
-		[Test]
-		public void Test_6610()
-		{
-		}
-		[Test]
-		public void Test_6611()
-		{
-		}
-		[Test]
-		public void Test_6612()
-		{
-		}
-		[Test]
-		public void Test_6613()
-		{
-		}
-		[Test]
-		public void Test_6614()
-		{
-		}
-		[Test]
-		public void Test_6615()
-		{
-		}
-		[Test]
-		public void Test_6616()
-		{
-		}
-		[Test]
-		public void Test_6617()
-		{
-		}
-		[Test]
-		public void Test_6618()
-		{
-		}
-		[Test]
-		public void Test_6619()
-		{
-		}
-		[Test]
-		public void Test_6620()
-		{
-		}
-		[Test]
-		public void Test_6621()
-		{
-		}
-		[Test]
-		public void Test_6622()
-		{
-		}
-		[Test]
-		public void Test_6623()
-		{
-		}
-		[Test]
-		public void Test_6624()
-		{
-		}
-		[Test]
-		public void Test_6625()
-		{
-		}
-		[Test]
-		public void Test_6626()
-		{
-		}
-		[Test]
-		public void Test_6627()
-		{
-		}
-		[Test]
-		public void Test_6628()
-		{
-		}
-		[Test]
-		public void Test_6629()
-		{
-		}
-		[Test]
-		public void Test_6630()
-		{
-		}
-		[Test]
-		public void Test_6631()
-		{
-		}
-		[Test]
-		public void Test_6632()
-		{
-		}
-		[Test]
-		public void Test_6633()
-		{
-		}
-		[Test]
-		public void Test_6634()
-		{
-		}
-		[Test]
-		public void Test_6635()
-		{
-		}
-		[Test]
-		public void Test_6636()
-		{
-		}
-		[Test]
-		public void Test_6637()
-		{
-		}
-		[Test]
-		public void Test_6638()
-		{
-		}
-		[Test]
-		public void Test_6639()
-		{
-		}
-		[Test]
-		public void Test_6640()
-		{
-		}
-		[Test]
-		public void Test_6641()
-		{
-		}
-		[Test]
-		public void Test_6642()
-		{
-		}
-		[Test]
-		public void Test_6643()
-		{
-		}
-		[Test]
-		public void Test_6644()
-		{
-		}
-		[Test]
-		public void Test_6645()
-		{
-		}
-		[Test]
-		public void Test_6646()
-		{
-		}
-		[Test]
-		public void Test_6647()
-		{
-		}
-		[Test]
-		public void Test_6648()
-		{
-		}
-		[Test]
-		public void Test_6649()
-		{
-		}
-		[Test]
-		public void Test_6650()
-		{
-		}
-		[Test]
-		public void Test_6651()
-		{
-		}
-		[Test]
-		public void Test_6652()
-		{
-		}
-		[Test]
-		public void Test_6653()
-		{
-		}
-		[Test]
-		public void Test_6654()
-		{
-		}
-		[Test]
-		public void Test_6655()
-		{
-		}
-		[Test]
-		public void Test_6656()
-		{
-		}
-		[Test]
-		public void Test_6657()
-		{
-		}
-		[Test]
-		public void Test_6658()
-		{
-		}
-		[Test]
-		public void Test_6659()
-		{
-		}
-		[Test]
-		public void Test_6660()
-		{
-		}
-		[Test]
-		public void Test_6661()
-		{
-		}
-		[Test]
-		public void Test_6662()
-		{
-		}
-		[Test]
-		public void Test_6663()
-		{
-		}
-		[Test]
-		public void Test_6664()
-		{
-		}
-		[Test]
-		public void Test_6665()
-		{
-		}
-		[Test]
-		public void Test_6666()
-		{
-		}
-		[Test]
-		public void Test_6667()
-		{
-		}
-		[Test]
-		public void Test_6668()
-		{
-		}
-		[Test]
-		public void Test_6669()
-		{
-		}
-		[Test]
-		public void Test_6670()
-		{
-		}
-		[Test]
-		public void Test_6671()
-		{
-		}
-		[Test]
-		public void Test_6672()
-		{
-		}
-		[Test]
-		public void Test_6673()
-		{
-		}
-		[Test]
-		public void Test_6674()
-		{
-		}
-		[Test]
-		public void Test_6675()
-		{
-		}
-		[Test]
-		public void Test_6676()
-		{
-		}
-		[Test]
-		public void Test_6677()
-		{
-		}
-		[Test]
-		public void Test_6678()
-		{
-		}
-		[Test]
-		public void Test_6679()
-		{
-		}
-		[Test]
-		public void Test_6680()
-		{
-		}
-		[Test]
-		public void Test_6681()
-		{
-		}
-		[Test]
-		public void Test_6682()
-		{
-		}
-		[Test]
-		public void Test_6683()
-		{
-		}
-		[Test]
-		public void Test_6684()
-		{
-		}
-		[Test]
-		public void Test_6685()
-		{
-		}
-		[Test]
-		public void Test_6686()
-		{
-		}
-		[Test]
-		public void Test_6687()
-		{
-		}
-		[Test]
-		public void Test_6688()
-		{
-		}
-		[Test]
-		public void Test_6689()
-		{
-		}
-		[Test]
-		public void Test_6690()
-		{
-		}
-		[Test]
-		public void Test_6691()
-		{
-		}
-		[Test]
-		public void Test_6692()
-		{
-		}
-		[Test]
-		public void Test_6693()
-		{
-		}
-		[Test]
-		public void Test_6694()
-		{
-		}
-		[Test]
-		public void Test_6695()
-		{
-		}
-		[Test]
-		public void Test_6696()
-		{
-		}
-		[Test]
-		public void Test_6697()
-		{
-		}
-		[Test]
-		public void Test_6698()
-		{
-		}
-		[Test]
-		public void Test_6699()
-		{
-		}
-		[Test]
-		public void Test_6700()
-		{
-		}
-		[Test]
-		public void Test_6701()
-		{
-		}
-		[Test]
-		public void Test_6702()
-		{
-		}
-		[Test]
-		public void Test_6703()
-		{
-		}
-		[Test]
-		public void Test_6704()
-		{
-		}
-		[Test]
-		public void Test_6705()
-		{
-		}
-		[Test]
-		public void Test_6706()
-		{
-		}
-		[Test]
-		public void Test_6707()
-		{
-		}
-		[Test]
-		public void Test_6708()
-		{
-		}
-		[Test]
-		public void Test_6709()
-		{
-		}
-		[Test]
-		public void Test_6710()
-		{
-		}
-		[Test]
-		public void Test_6711()
-		{
-		}
-		[Test]
-		public void Test_6712()
-		{
-		}
-		[Test]
-		public void Test_6713()
-		{
-		}
-		[Test]
-		public void Test_6714()
-		{
-		}
-		[Test]
-		public void Test_6715()
-		{
-		}
-		[Test]
-		public void Test_6716()
-		{
-		}
-		[Test]
-		public void Test_6717()
-		{
-		}
-		[Test]
-		public void Test_6718()
-		{
-		}
-		[Test]
-		public void Test_6719()
-		{
-		}
-		[Test]
-		public void Test_6720()
-		{
-		}
-		[Test]
-		public void Test_6721()
-		{
-		}
-		[Test]
-		public void Test_6722()
-		{
-		}
-		[Test]
-		public void Test_6723()
-		{
-		}
-		[Test]
-		public void Test_6724()
-		{
-		}
-		[Test]
-		public void Test_6725()
-		{
-		}
-		[Test]
-		public void Test_6726()
-		{
-		}
-		[Test]
-		public void Test_6727()
-		{
-		}
-		[Test]
-		public void Test_6728()
-		{
-		}
-		[Test]
-		public void Test_6729()
-		{
-		}
-		[Test]
-		public void Test_6730()
-		{
-		}
-		[Test]
-		public void Test_6731()
-		{
-		}
-		[Test]
-		public void Test_6732()
-		{
-		}
-		[Test]
-		public void Test_6733()
-		{
-		}
-		[Test]
-		public void Test_6734()
-		{
-		}
-		[Test]
-		public void Test_6735()
-		{
-		}
-		[Test]
-		public void Test_6736()
-		{
-		}
-		[Test]
-		public void Test_6737()
-		{
-		}
-		[Test]
-		public void Test_6738()
-		{
-		}
-		[Test]
-		public void Test_6739()
-		{
-		}
-		[Test]
-		public void Test_6740()
-		{
-		}
-		[Test]
-		public void Test_6741()
-		{
-		}
-		[Test]
-		public void Test_6742()
-		{
-		}
-		[Test]
-		public void Test_6743()
-		{
-		}
-		[Test]
-		public void Test_6744()
-		{
-		}
-		[Test]
-		public void Test_6745()
-		{
-		}
-		[Test]
-		public void Test_6746()
-		{
-		}
-		[Test]
-		public void Test_6747()
-		{
-		}
-		[Test]
-		public void Test_6748()
-		{
-		}
-		[Test]
-		public void Test_6749()
-		{
-		}
-		[Test]
-		public void Test_6750()
-		{
-		}
-		[Test]
-		public void Test_6751()
-		{
-		}
-		[Test]
-		public void Test_6752()
-		{
-		}
-		[Test]
-		public void Test_6753()
-		{
-		}
-		[Test]
-		public void Test_6754()
-		{
-		}
-		[Test]
-		public void Test_6755()
-		{
-		}
-		[Test]
-		public void Test_6756()
-		{
-		}
-		[Test]
-		public void Test_6757()
-		{
-		}
-		[Test]
-		public void Test_6758()
-		{
-		}
-		[Test]
-		public void Test_6759()
-		{
-		}
-		[Test]
-		public void Test_6760()
-		{
-		}
-		[Test]
-		public void Test_6761()
-		{
-		}
-		[Test]
-		public void Test_6762()
-		{
-		}
-		[Test]
-		public void Test_6763()
-		{
-		}
-		[Test]
-		public void Test_6764()
-		{
-		}
-		[Test]
-		public void Test_6765()
-		{
-		}
-		[Test]
-		public void Test_6766()
-		{
-		}
-		[Test]
-		public void Test_6767()
-		{
-		}
-		[Test]
-		public void Test_6768()
-		{
-		}
-		[Test]
-		public void Test_6769()
-		{
-		}
-		[Test]
-		public void Test_6770()
-		{
-		}
-		[Test]
-		public void Test_6771()
-		{
-		}
-		[Test]
-		public void Test_6772()
-		{
-		}
-		[Test]
-		public void Test_6773()
-		{
-		}
-		[Test]
-		public void Test_6774()
-		{
-		}
-		[Test]
-		public void Test_6775()
-		{
-		}
-		[Test]
-		public void Test_6776()
-		{
-		}
-		[Test]
-		public void Test_6777()
-		{
-		}
-		[Test]
-		public void Test_6778()
-		{
-		}
-		[Test]
-		public void Test_6779()
-		{
-		}
-		[Test]
-		public void Test_6780()
-		{
-		}
-		[Test]
-		public void Test_6781()
-		{
-		}
-		[Test]
-		public void Test_6782()
-		{
-		}
-		[Test]
-		public void Test_6783()
-		{
-		}
-		[Test]
-		public void Test_6784()
-		{
-		}
-		[Test]
-		public void Test_6785()
-		{
-		}
-		[Test]
-		public void Test_6786()
-		{
-		}
-		[Test]
-		public void Test_6787()
-		{
-		}
-		[Test]
-		public void Test_6788()
-		{
-		}
-		[Test]
-		public void Test_6789()
-		{
-		}
-		[Test]
-		public void Test_6790()
-		{
-		}
-		[Test]
-		public void Test_6791()
-		{
-		}
-		[Test]
-		public void Test_6792()
-		{
-		}
-		[Test]
-		public void Test_6793()
-		{
-		}
-		[Test]
-		public void Test_6794()
-		{
-		}
-		[Test]
-		public void Test_6795()
-		{
-		}
-		[Test]
-		public void Test_6796()
-		{
-		}
-		[Test]
-		public void Test_6797()
-		{
-		}
-		[Test]
-		public void Test_6798()
-		{
-		}
-		[Test]
-		public void Test_6799()
-		{
-		}
-		[Test]
-		public void Test_6800()
-		{
-		}
-		[Test]
-		public void Test_6801()
-		{
-		}
-		[Test]
-		public void Test_6802()
-		{
-		}
-		[Test]
-		public void Test_6803()
-		{
-		}
-		[Test]
-		public void Test_6804()
-		{
-		}
-		[Test]
-		public void Test_6805()
-		{
-		}
-		[Test]
-		public void Test_6806()
-		{
-		}
-		[Test]
-		public void Test_6807()
-		{
-		}
-		[Test]
-		public void Test_6808()
-		{
-		}
-		[Test]
-		public void Test_6809()
-		{
-		}
-		[Test]
-		public void Test_6810()
-		{
-		}
-		[Test]
-		public void Test_6811()
-		{
-		}
-		[Test]
-		public void Test_6812()
-		{
-		}
-		[Test]
-		public void Test_6813()
-		{
-		}
-		[Test]
-		public void Test_6814()
-		{
-		}
-		[Test]
-		public void Test_6815()
-		{
-		}
-		[Test]
-		public void Test_6816()
-		{
-		}
-		[Test]
-		public void Test_6817()
-		{
-		}
-		[Test]
-		public void Test_6818()
-		{
-		}
-		[Test]
-		public void Test_6819()
-		{
-		}
-		[Test]
-		public void Test_6820()
-		{
-		}
-		[Test]
-		public void Test_6821()
-		{
-		}
-		[Test]
-		public void Test_6822()
-		{
-		}
-		[Test]
-		public void Test_6823()
-		{
-		}
-		[Test]
-		public void Test_6824()
-		{
-		}
-		[Test]
-		public void Test_6825()
-		{
-		}
-		[Test]
-		public void Test_6826()
-		{
-		}
-		[Test]
-		public void Test_6827()
-		{
-		}
-		[Test]
-		public void Test_6828()
-		{
-		}
-		[Test]
-		public void Test_6829()
-		{
-		}
-		[Test]
-		public void Test_6830()
-		{
-		}
-		[Test]
-		public void Test_6831()
-		{
-		}
-		[Test]
-		public void Test_6832()
-		{
-		}
-		[Test]
-		public void Test_6833()
-		{
-		}
-		[Test]
-		public void Test_6834()
-		{
-		}
-		[Test]
-		public void Test_6835()
-		{
-		}
-		[Test]
-		public void Test_6836()
-		{
-		}
-		[Test]
-		public void Test_6837()
-		{
-		}
-		[Test]
-		public void Test_6838()
-		{
-		}
-		[Test]
-		public void Test_6839()
-		{
-		}
-		[Test]
-		public void Test_6840()
-		{
-		}
-		[Test]
-		public void Test_6841()
-		{
-		}
-		[Test]
-		public void Test_6842()
-		{
-		}
-		[Test]
-		public void Test_6843()
-		{
-		}
-		[Test]
-		public void Test_6844()
-		{
-		}
-		[Test]
-		public void Test_6845()
-		{
-		}
-		[Test]
-		public void Test_6846()
-		{
-		}
-		[Test]
-		public void Test_6847()
-		{
-		}
-		[Test]
-		public void Test_6848()
-		{
-		}
-		[Test]
-		public void Test_6849()
-		{
-		}
-		[Test]
-		public void Test_6850()
-		{
-		}
-		[Test]
-		public void Test_6851()
-		{
-		}
-		[Test]
-		public void Test_6852()
-		{
-		}
-		[Test]
-		public void Test_6853()
-		{
-		}
-		[Test]
-		public void Test_6854()
-		{
-		}
-		[Test]
-		public void Test_6855()
-		{
-		}
-		[Test]
-		public void Test_6856()
-		{
-		}
-		[Test]
-		public void Test_6857()
-		{
-		}
-		[Test]
-		public void Test_6858()
-		{
-		}
-		[Test]
-		public void Test_6859()
-		{
-		}
-		[Test]
-		public void Test_6860()
-		{
-		}
-		[Test]
-		public void Test_6861()
-		{
-		}
-		[Test]
-		public void Test_6862()
-		{
-		}
-		[Test]
-		public void Test_6863()
-		{
-		}
-		[Test]
-		public void Test_6864()
-		{
-		}
-		[Test]
-		public void Test_6865()
-		{
-		}
-		[Test]
-		public void Test_6866()
-		{
-		}
-		[Test]
-		public void Test_6867()
-		{
-		}
-		[Test]
-		public void Test_6868()
-		{
-		}
-		[Test]
-		public void Test_6869()
-		{
-		}
-		[Test]
-		public void Test_6870()
-		{
-		}
-		[Test]
-		public void Test_6871()
-		{
-		}
-		[Test]
-		public void Test_6872()
-		{
-		}
-		[Test]
-		public void Test_6873()
-		{
-		}
-		[Test]
-		public void Test_6874()
-		{
-		}
-		[Test]
-		public void Test_6875()
-		{
-		}
-		[Test]
-		public void Test_6876()
-		{
-		}
-		[Test]
-		public void Test_6877()
-		{
-		}
-		[Test]
-		public void Test_6878()
-		{
-		}
-		[Test]
-		public void Test_6879()
-		{
-		}
-		[Test]
-		public void Test_6880()
-		{
-		}
-		[Test]
-		public void Test_6881()
-		{
-		}
-		[Test]
-		public void Test_6882()
-		{
-		}
-		[Test]
-		public void Test_6883()
-		{
-		}
-		[Test]
-		public void Test_6884()
-		{
-		}
-		[Test]
-		public void Test_6885()
-		{
-		}
-		[Test]
-		public void Test_6886()
-		{
-		}
-		[Test]
-		public void Test_6887()
-		{
-		}
-		[Test]
-		public void Test_6888()
-		{
-		}
-		[Test]
-		public void Test_6889()
-		{
-		}
-		[Test]
-		public void Test_6890()
-		{
-		}
-		[Test]
-		public void Test_6891()
-		{
-		}
-		[Test]
-		public void Test_6892()
-		{
-		}
-		[Test]
-		public void Test_6893()
-		{
-		}
-		[Test]
-		public void Test_6894()
-		{
-		}
-		[Test]
-		public void Test_6895()
-		{
-		}
-		[Test]
-		public void Test_6896()
-		{
-		}
-		[Test]
-		public void Test_6897()
-		{
-		}
-		[Test]
-		public void Test_6898()
-		{
-		}
-		[Test]
-		public void Test_6899()
-		{
-		}
-		[Test]
-		public void Test_6900()
-		{
-		}
-		[Test]
-		public void Test_6901()
-		{
-		}
-		[Test]
-		public void Test_6902()
-		{
-		}
-		[Test]
-		public void Test_6903()
-		{
-		}
-		[Test]
-		public void Test_6904()
-		{
-		}
-		[Test]
-		public void Test_6905()
-		{
-		}
-		[Test]
-		public void Test_6906()
-		{
-		}
-		[Test]
-		public void Test_6907()
-		{
-		}
-		[Test]
-		public void Test_6908()
-		{
-		}
-		[Test]
-		public void Test_6909()
-		{
-		}
-		[Test]
-		public void Test_6910()
-		{
-		}
-		[Test]
-		public void Test_6911()
-		{
-		}
-		[Test]
-		public void Test_6912()
-		{
-		}
-		[Test]
-		public void Test_6913()
-		{
-		}
-		[Test]
-		public void Test_6914()
-		{
-		}
-		[Test]
-		public void Test_6915()
-		{
-		}
-		[Test]
-		public void Test_6916()
-		{
-		}
-		[Test]
-		public void Test_6917()
-		{
-		}
-		[Test]
-		public void Test_6918()
-		{
-		}
-		[Test]
-		public void Test_6919()
-		{
-		}
-		[Test]
-		public void Test_6920()
-		{
-		}
-		[Test]
-		public void Test_6921()
-		{
-		}
-		[Test]
-		public void Test_6922()
-		{
-		}
-		[Test]
-		public void Test_6923()
-		{
-		}
-		[Test]
-		public void Test_6924()
-		{
-		}
-		[Test]
-		public void Test_6925()
-		{
-		}
-		[Test]
-		public void Test_6926()
-		{
-		}
-		[Test]
-		public void Test_6927()
-		{
-		}
-		[Test]
-		public void Test_6928()
-		{
-		}
-		[Test]
-		public void Test_6929()
-		{
-		}
-		[Test]
-		public void Test_6930()
-		{
-		}
-		[Test]
-		public void Test_6931()
-		{
-		}
-		[Test]
-		public void Test_6932()
-		{
-		}
-		[Test]
-		public void Test_6933()
-		{
-		}
-		[Test]
-		public void Test_6934()
-		{
-		}
-		[Test]
-		public void Test_6935()
-		{
-		}
-		[Test]
-		public void Test_6936()
-		{
-		}
-		[Test]
-		public void Test_6937()
-		{
-		}
-		[Test]
-		public void Test_6938()
-		{
-		}
-		[Test]
-		public void Test_6939()
-		{
-		}
-		[Test]
-		public void Test_6940()
-		{
-		}
-		[Test]
-		public void Test_6941()
-		{
-		}
-		[Test]
-		public void Test_6942()
-		{
-		}
-		[Test]
-		public void Test_6943()
-		{
-		}
-		[Test]
-		public void Test_6944()
-		{
-		}
-		[Test]
-		public void Test_6945()
-		{
-		}
-		[Test]
-		public void Test_6946()
-		{
-		}
-		[Test]
-		public void Test_6947()
-		{
-		}
-		[Test]
-		public void Test_6948()
-		{
-		}
-		[Test]
-		public void Test_6949()
-		{
-		}
-		[Test]
-		public void Test_6950()
-		{
-		}
-		[Test]
-		public void Test_6951()
-		{
-		}
-		[Test]
-		public void Test_6952()
-		{
-		}
-		[Test]
-		public void Test_6953()
-		{
-		}
-		[Test]
-		public void Test_6954()
-		{
-		}
-		[Test]
-		public void Test_6955()
-		{
-		}
-		[Test]
-		public void Test_6956()
-		{
-		}
-		[Test]
-		public void Test_6957()
-		{
-		}
-		[Test]
-		public void Test_6958()
-		{
-		}
-		[Test]
-		public void Test_6959()
-		{
-		}
-		[Test]
-		public void Test_6960()
-		{
-		}
-		[Test]
-		public void Test_6961()
-		{
-		}
-		[Test]
-		public void Test_6962()
-		{
-		}
-		[Test]
-		public void Test_6963()
-		{
-		}
-		[Test]
-		public void Test_6964()
-		{
-		}
-		[Test]
-		public void Test_6965()
-		{
-		}
-		[Test]
-		public void Test_6966()
-		{
-		}
-		[Test]
-		public void Test_6967()
-		{
-		}
-		[Test]
-		public void Test_6968()
-		{
-		}
-		[Test]
-		public void Test_6969()
-		{
-		}
-		[Test]
-		public void Test_6970()
-		{
-		}
-		[Test]
-		public void Test_6971()
-		{
-		}
-		[Test]
-		public void Test_6972()
-		{
-		}
-		[Test]
-		public void Test_6973()
-		{
-		}
-		[Test]
-		public void Test_6974()
-		{
-		}
-		[Test]
-		public void Test_6975()
-		{
-		}
-		[Test]
-		public void Test_6976()
-		{
-		}
-		[Test]
-		public void Test_6977()
-		{
-		}
-		[Test]
-		public void Test_6978()
-		{
-		}
-		[Test]
-		public void Test_6979()
-		{
-		}
-		[Test]
-		public void Test_6980()
-		{
-		}
-		[Test]
-		public void Test_6981()
-		{
-		}
-		[Test]
-		public void Test_6982()
-		{
-		}
-		[Test]
-		public void Test_6983()
-		{
-		}
-		[Test]
-		public void Test_6984()
-		{
-		}
-		[Test]
-		public void Test_6985()
-		{
-		}
-		[Test]
-		public void Test_6986()
-		{
-		}
-		[Test]
-		public void Test_6987()
-		{
-		}
-		[Test]
-		public void Test_6988()
-		{
-		}
-		[Test]
-		public void Test_6989()
-		{
-		}
-		[Test]
-		public void Test_6990()
-		{
-		}
-		[Test]
-		public void Test_6991()
-		{
-		}
-		[Test]
-		public void Test_6992()
-		{
-		}
-		[Test]
-		public void Test_6993()
-		{
-		}
-		[Test]
-		public void Test_6994()
-		{
-		}
-		[Test]
-		public void Test_6995()
-		{
-		}
-		[Test]
-		public void Test_6996()
-		{
-		}
-		[Test]
-		public void Test_6997()
-		{
-		}
-		[Test]
-		public void Test_6998()
-		{
-		}
-		[Test]
-		public void Test_6999()
-		{
-		}
-		[Test]
-		public void Test_7000()
-		{
-		}
-		[Test]
-		public void Test_7001()
-		{
-		}
-		[Test]
-		public void Test_7002()
-		{
-		}
-		[Test]
-		public void Test_7003()
-		{
-		}
-		[Test]
-		public void Test_7004()
-		{
-		}
-		[Test]
-		public void Test_7005()
-		{
-		}
-		[Test]
-		public void Test_7006()
-		{
-		}
-		[Test]
-		public void Test_7007()
-		{
-		}
-		[Test]
-		public void Test_7008()
-		{
-		}
-		[Test]
-		public void Test_7009()
-		{
-		}
-		[Test]
-		public void Test_7010()
-		{
-		}
-		[Test]
-		public void Test_7011()
-		{
-		}
-		[Test]
-		public void Test_7012()
-		{
-		}
-		[Test]
-		public void Test_7013()
-		{
-		}
-		[Test]
-		public void Test_7014()
-		{
-		}
-		[Test]
-		public void Test_7015()
-		{
-		}
-		[Test]
-		public void Test_7016()
-		{
-		}
-		[Test]
-		public void Test_7017()
-		{
-		}
-		[Test]
-		public void Test_7018()
-		{
-		}
-		[Test]
-		public void Test_7019()
-		{
-		}
-		[Test]
-		public void Test_7020()
-		{
-		}
-		[Test]
-		public void Test_7021()
-		{
-		}
-		[Test]
-		public void Test_7022()
-		{
-		}
-		[Test]
-		public void Test_7023()
-		{
-		}
-		[Test]
-		public void Test_7024()
-		{
-		}
-		[Test]
-		public void Test_7025()
-		{
-		}
-		[Test]
-		public void Test_7026()
-		{
-		}
-		[Test]
-		public void Test_7027()
-		{
-		}
-		[Test]
-		public void Test_7028()
-		{
-		}
-		[Test]
-		public void Test_7029()
-		{
-		}
-		[Test]
-		public void Test_7030()
-		{
-		}
-		[Test]
-		public void Test_7031()
-		{
-		}
-		[Test]
-		public void Test_7032()
-		{
-		}
-		[Test]
-		public void Test_7033()
-		{
-		}
-		[Test]
-		public void Test_7034()
-		{
-		}
-		[Test]
-		public void Test_7035()
-		{
-		}
-		[Test]
-		public void Test_7036()
-		{
-		}
-		[Test]
-		public void Test_7037()
-		{
-		}
-		[Test]
-		public void Test_7038()
-		{
-		}
-		[Test]
-		public void Test_7039()
-		{
-		}
-		[Test]
-		public void Test_7040()
-		{
-		}
-		[Test]
-		public void Test_7041()
-		{
-		}
-		[Test]
-		public void Test_7042()
-		{
-		}
-		[Test]
-		public void Test_7043()
-		{
-		}
-		[Test]
-		public void Test_7044()
-		{
-		}
-		[Test]
-		public void Test_7045()
-		{
-		}
-		[Test]
-		public void Test_7046()
-		{
-		}
-		[Test]
-		public void Test_7047()
-		{
-		}
-		[Test]
-		public void Test_7048()
-		{
-		}
-		[Test]
-		public void Test_7049()
-		{
-		}
-		[Test]
-		public void Test_7050()
-		{
-		}
-		[Test]
-		public void Test_7051()
-		{
-		}
-		[Test]
-		public void Test_7052()
-		{
-		}
-		[Test]
-		public void Test_7053()
-		{
-		}
-		[Test]
-		public void Test_7054()
-		{
-		}
-		[Test]
-		public void Test_7055()
-		{
-		}
-		[Test]
-		public void Test_7056()
-		{
-		}
-		[Test]
-		public void Test_7057()
-		{
-		}
-		[Test]
-		public void Test_7058()
-		{
-		}
-		[Test]
-		public void Test_7059()
-		{
-		}
-		[Test]
-		public void Test_7060()
-		{
-		}
-		[Test]
-		public void Test_7061()
-		{
-		}
-		[Test]
-		public void Test_7062()
-		{
-		}
-		[Test]
-		public void Test_7063()
-		{
-		}
-		[Test]
-		public void Test_7064()
-		{
-		}
-		[Test]
-		public void Test_7065()
-		{
-		}
-		[Test]
-		public void Test_7066()
-		{
-		}
-		[Test]
-		public void Test_7067()
-		{
-		}
-		[Test]
-		public void Test_7068()
-		{
-		}
-		[Test]
-		public void Test_7069()
-		{
-		}
-		[Test]
-		public void Test_7070()
-		{
-		}
-		[Test]
-		public void Test_7071()
-		{
-		}
-		[Test]
-		public void Test_7072()
-		{
-		}
-		[Test]
-		public void Test_7073()
-		{
-		}
-		[Test]
-		public void Test_7074()
-		{
-		}
-		[Test]
-		public void Test_7075()
-		{
-		}
-		[Test]
-		public void Test_7076()
-		{
-		}
-		[Test]
-		public void Test_7077()
-		{
-		}
-		[Test]
-		public void Test_7078()
-		{
-		}
-		[Test]
-		public void Test_7079()
-		{
-		}
-		[Test]
-		public void Test_7080()
-		{
-		}
-		[Test]
-		public void Test_7081()
-		{
-		}
-		[Test]
-		public void Test_7082()
-		{
-		}
-		[Test]
-		public void Test_7083()
-		{
-		}
-		[Test]
-		public void Test_7084()
-		{
-		}
-		[Test]
-		public void Test_7085()
-		{
-		}
-		[Test]
-		public void Test_7086()
-		{
-		}
-		[Test]
-		public void Test_7087()
-		{
-		}
-		[Test]
-		public void Test_7088()
-		{
-		}
-		[Test]
-		public void Test_7089()
-		{
-		}
-		[Test]
-		public void Test_7090()
-		{
-		}
-		[Test]
-		public void Test_7091()
-		{
-		}
-		[Test]
-		public void Test_7092()
-		{
-		}
-		[Test]
-		public void Test_7093()
-		{
-		}
-		[Test]
-		public void Test_7094()
-		{
-		}
-		[Test]
-		public void Test_7095()
-		{
-		}
-		[Test]
-		public void Test_7096()
-		{
-		}
-		[Test]
-		public void Test_7097()
-		{
-		}
-		[Test]
-		public void Test_7098()
-		{
-		}
-		[Test]
-		public void Test_7099()
-		{
-		}
-		[Test]
-		public void Test_7100()
-		{
-		}
-		[Test]
-		public void Test_7101()
-		{
-		}
-		[Test]
-		public void Test_7102()
-		{
-		}
-		[Test]
-		public void Test_7103()
-		{
-		}
-		[Test]
-		public void Test_7104()
-		{
-		}
-		[Test]
-		public void Test_7105()
-		{
-		}
-		[Test]
-		public void Test_7106()
-		{
-		}
-		[Test]
-		public void Test_7107()
-		{
-		}
-		[Test]
-		public void Test_7108()
-		{
-		}
-		[Test]
-		public void Test_7109()
-		{
-		}
-		[Test]
-		public void Test_7110()
-		{
-		}
-		[Test]
-		public void Test_7111()
-		{
-		}
-		[Test]
-		public void Test_7112()
-		{
-		}
-		[Test]
-		public void Test_7113()
-		{
-		}
-		[Test]
-		public void Test_7114()
-		{
-		}
-		[Test]
-		public void Test_7115()
-		{
-		}
-		[Test]
-		public void Test_7116()
-		{
-		}
-		[Test]
-		public void Test_7117()
-		{
-		}
-		[Test]
-		public void Test_7118()
-		{
-		}
-		[Test]
-		public void Test_7119()
-		{
-		}
-		[Test]
-		public void Test_7120()
-		{
-		}
-		[Test]
-		public void Test_7121()
-		{
-		}
-		[Test]
-		public void Test_7122()
-		{
-		}
-		[Test]
-		public void Test_7123()
-		{
-		}
-		[Test]
-		public void Test_7124()
-		{
-		}
-		[Test]
-		public void Test_7125()
-		{
-		}
-		[Test]
-		public void Test_7126()
-		{
-		}
-		[Test]
-		public void Test_7127()
-		{
-		}
-		[Test]
-		public void Test_7128()
-		{
-		}
-		[Test]
-		public void Test_7129()
-		{
-		}
-		[Test]
-		public void Test_7130()
-		{
-		}
-		[Test]
-		public void Test_7131()
-		{
-		}
-		[Test]
-		public void Test_7132()
-		{
-		}
-		[Test]
-		public void Test_7133()
-		{
-		}
-		[Test]
-		public void Test_7134()
-		{
-		}
-		[Test]
-		public void Test_7135()
-		{
-		}
-		[Test]
-		public void Test_7136()
-		{
-		}
-		[Test]
-		public void Test_7137()
-		{
-		}
-		[Test]
-		public void Test_7138()
-		{
-		}
-		[Test]
-		public void Test_7139()
-		{
-		}
-		[Test]
-		public void Test_7140()
-		{
-		}
-		[Test]
-		public void Test_7141()
-		{
-		}
-		[Test]
-		public void Test_7142()
-		{
-		}
-		[Test]
-		public void Test_7143()
-		{
-		}
-		[Test]
-		public void Test_7144()
-		{
-		}
-		[Test]
-		public void Test_7145()
-		{
-		}
-		[Test]
-		public void Test_7146()
-		{
-		}
-		[Test]
-		public void Test_7147()
-		{
-		}
-		[Test]
-		public void Test_7148()
-		{
-		}
-		[Test]
-		public void Test_7149()
-		{
-		}
-		[Test]
-		public void Test_7150()
-		{
-		}
-		[Test]
-		public void Test_7151()
-		{
-		}
-		[Test]
-		public void Test_7152()
-		{
-		}
-		[Test]
-		public void Test_7153()
-		{
-		}
-		[Test]
-		public void Test_7154()
-		{
-		}
-		[Test]
-		public void Test_7155()
-		{
-		}
-		[Test]
-		public void Test_7156()
-		{
-		}
-		[Test]
-		public void Test_7157()
-		{
-		}
-		[Test]
-		public void Test_7158()
-		{
-		}
-		[Test]
-		public void Test_7159()
-		{
-		}
-		[Test]
-		public void Test_7160()
-		{
-		}
-		[Test]
-		public void Test_7161()
-		{
-		}
-		[Test]
-		public void Test_7162()
-		{
-		}
-		[Test]
-		public void Test_7163()
-		{
-		}
-		[Test]
-		public void Test_7164()
-		{
-		}
-		[Test]
-		public void Test_7165()
-		{
-		}
-		[Test]
-		public void Test_7166()
-		{
-		}
-		[Test]
-		public void Test_7167()
-		{
-		}
-		[Test]
-		public void Test_7168()
-		{
-		}
-		[Test]
-		public void Test_7169()
-		{
-		}
-		[Test]
-		public void Test_7170()
-		{
-		}
-		[Test]
-		public void Test_7171()
-		{
-		}
-		[Test]
-		public void Test_7172()
-		{
-		}
-		[Test]
-		public void Test_7173()
-		{
-		}
-		[Test]
-		public void Test_7174()
-		{
-		}
-		[Test]
-		public void Test_7175()
-		{
-		}
-		[Test]
-		public void Test_7176()
-		{
-		}
-		[Test]
-		public void Test_7177()
-		{
-		}
-		[Test]
-		public void Test_7178()
-		{
-		}
-		[Test]
-		public void Test_7179()
-		{
-		}
-		[Test]
-		public void Test_7180()
-		{
-		}
-		[Test]
-		public void Test_7181()
-		{
-		}
-		[Test]
-		public void Test_7182()
-		{
-		}
-		[Test]
-		public void Test_7183()
-		{
-		}
-		[Test]
-		public void Test_7184()
-		{
-		}
-		[Test]
-		public void Test_7185()
-		{
-		}
-		[Test]
-		public void Test_7186()
-		{
-		}
-		[Test]
-		public void Test_7187()
-		{
-		}
-		[Test]
-		public void Test_7188()
-		{
-		}
-		[Test]
-		public void Test_7189()
-		{
-		}
-		[Test]
-		public void Test_7190()
-		{
-		}
-		[Test]
-		public void Test_7191()
-		{
-		}
-		[Test]
-		public void Test_7192()
-		{
-		}
-		[Test]
-		public void Test_7193()
-		{
-		}
-		[Test]
-		public void Test_7194()
-		{
-		}
-		[Test]
-		public void Test_7195()
-		{
-		}
-		[Test]
-		public void Test_7196()
-		{
-		}
-		[Test]
-		public void Test_7197()
-		{
-		}
-		[Test]
-		public void Test_7198()
-		{
-		}
-		[Test]
-		public void Test_7199()
-		{
-		}
-		[Test]
-		public void Test_7200()
-		{
-		}
-		[Test]
-		public void Test_7201()
-		{
-		}
-		[Test]
-		public void Test_7202()
-		{
-		}
-		[Test]
-		public void Test_7203()
-		{
-		}
-		[Test]
-		public void Test_7204()
-		{
-		}
-		[Test]
-		public void Test_7205()
-		{
-		}
-		[Test]
-		public void Test_7206()
-		{
-		}
-		[Test]
-		public void Test_7207()
-		{
-		}
-		[Test]
-		public void Test_7208()
-		{
-		}
-		[Test]
-		public void Test_7209()
-		{
-		}
-		[Test]
-		public void Test_7210()
-		{
-		}
-		[Test]
-		public void Test_7211()
-		{
-		}
-		[Test]
-		public void Test_7212()
-		{
-		}
-		[Test]
-		public void Test_7213()
-		{
-		}
-		[Test]
-		public void Test_7214()
-		{
-		}
-		[Test]
-		public void Test_7215()
-		{
-		}
-		[Test]
-		public void Test_7216()
-		{
-		}
-		[Test]
-		public void Test_7217()
-		{
-		}
-		[Test]
-		public void Test_7218()
-		{
-		}
-		[Test]
-		public void Test_7219()
-		{
-		}
-		[Test]
-		public void Test_7220()
-		{
-		}
-		[Test]
-		public void Test_7221()
-		{
-		}
-		[Test]
-		public void Test_7222()
-		{
-		}
-		[Test]
-		public void Test_7223()
-		{
-		}
-		[Test]
-		public void Test_7224()
-		{
-		}
-		[Test]
-		public void Test_7225()
-		{
-		}
-		[Test]
-		public void Test_7226()
-		{
-		}
-		[Test]
-		public void Test_7227()
-		{
-		}
-		[Test]
-		public void Test_7228()
-		{
-		}
-		[Test]
-		public void Test_7229()
-		{
-		}
-		[Test]
-		public void Test_7230()
-		{
-		}
-		[Test]
-		public void Test_7231()
-		{
-		}
-		[Test]
-		public void Test_7232()
-		{
-		}
-		[Test]
-		public void Test_7233()
-		{
-		}
-		[Test]
-		public void Test_7234()
-		{
-		}
-		[Test]
-		public void Test_7235()
-		{
-		}
-		[Test]
-		public void Test_7236()
-		{
-		}
-		[Test]
-		public void Test_7237()
-		{
-		}
-		[Test]
-		public void Test_7238()
-		{
-		}
-		[Test]
-		public void Test_7239()
-		{
-		}
-		[Test]
-		public void Test_7240()
-		{
-		}
-		[Test]
-		public void Test_7241()
-		{
-		}
-		[Test]
-		public void Test_7242()
-		{
-		}
-		[Test]
-		public void Test_7243()
-		{
-		}
-		[Test]
-		public void Test_7244()
-		{
-		}
-		[Test]
-		public void Test_7245()
-		{
-		}
-		[Test]
-		public void Test_7246()
-		{
-		}
-		[Test]
-		public void Test_7247()
-		{
-		}
-		[Test]
-		public void Test_7248()
-		{
-		}
-		[Test]
-		public void Test_7249()
-		{
-		}
-		[Test]
-		public void Test_7250()
-		{
-		}
-		[Test]
-		public void Test_7251()
-		{
-		}
-		[Test]
-		public void Test_7252()
-		{
-		}
-		[Test]
-		public void Test_7253()
-		{
-		}
-		[Test]
-		public void Test_7254()
-		{
-		}
-		[Test]
-		public void Test_7255()
-		{
-		}
-		[Test]
-		public void Test_7256()
-		{
-		}
-		[Test]
-		public void Test_7257()
-		{
-		}
-		[Test]
-		public void Test_7258()
-		{
-		}
-		[Test]
-		public void Test_7259()
-		{
-		}
-		[Test]
-		public void Test_7260()
-		{
-		}
-		[Test]
-		public void Test_7261()
-		{
-		}
-		[Test]
-		public void Test_7262()
-		{
-		}
-		[Test]
-		public void Test_7263()
-		{
-		}
-		[Test]
-		public void Test_7264()
-		{
-		}
-		[Test]
-		public void Test_7265()
-		{
-		}
-		[Test]
-		public void Test_7266()
-		{
-		}
-		[Test]
-		public void Test_7267()
-		{
-		}
-		[Test]
-		public void Test_7268()
-		{
-		}
-		[Test]
-		public void Test_7269()
-		{
-		}
-		[Test]
-		public void Test_7270()
-		{
-		}
-		[Test]
-		public void Test_7271()
-		{
-		}
-		[Test]
-		public void Test_7272()
-		{
-		}
-		[Test]
-		public void Test_7273()
-		{
-		}
-		[Test]
-		public void Test_7274()
-		{
-		}
-		[Test]
-		public void Test_7275()
-		{
-		}
-		[Test]
-		public void Test_7276()
-		{
-		}
-		[Test]
-		public void Test_7277()
-		{
-		}
-		[Test]
-		public void Test_7278()
-		{
-		}
-		[Test]
-		public void Test_7279()
-		{
-		}
-		[Test]
-		public void Test_7280()
-		{
-		}
-		[Test]
-		public void Test_7281()
-		{
-		}
-		[Test]
-		public void Test_7282()
-		{
-		}
-		[Test]
-		public void Test_7283()
-		{
-		}
-		[Test]
-		public void Test_7284()
-		{
-		}
-		[Test]
-		public void Test_7285()
-		{
-		}
-		[Test]
-		public void Test_7286()
-		{
-		}
-		[Test]
-		public void Test_7287()
-		{
-		}
-		[Test]
-		public void Test_7288()
-		{
-		}
-		[Test]
-		public void Test_7289()
-		{
-		}
-		[Test]
-		public void Test_7290()
-		{
-		}
-		[Test]
-		public void Test_7291()
-		{
-		}
-		[Test]
-		public void Test_7292()
-		{
-		}
-		[Test]
-		public void Test_7293()
-		{
-		}
-		[Test]
-		public void Test_7294()
-		{
-		}
-		[Test]
-		public void Test_7295()
-		{
-		}
-		[Test]
-		public void Test_7296()
-		{
-		}
-		[Test]
-		public void Test_7297()
-		{
-		}
-		[Test]
-		public void Test_7298()
-		{
-		}
-		[Test]
-		public void Test_7299()
-		{
-		}
-		[Test]
-		public void Test_7300()
-		{
-		}
-		[Test]
-		public void Test_7301()
-		{
-		}
-		[Test]
-		public void Test_7302()
-		{
-		}
-		[Test]
-		public void Test_7303()
-		{
-		}
-		[Test]
-		public void Test_7304()
-		{
-		}
-		[Test]
-		public void Test_7305()
-		{
-		}
-		[Test]
-		public void Test_7306()
-		{
-		}
-		[Test]
-		public void Test_7307()
-		{
-		}
-		[Test]
-		public void Test_7308()
-		{
-		}
-		[Test]
-		public void Test_7309()
-		{
-		}
-		[Test]
-		public void Test_7310()
-		{
-		}
-		[Test]
-		public void Test_7311()
-		{
-		}
-		[Test]
-		public void Test_7312()
-		{
-		}
-		[Test]
-		public void Test_7313()
-		{
-		}
-		[Test]
-		public void Test_7314()
-		{
-		}
-		[Test]
-		public void Test_7315()
-		{
-		}
-		[Test]
-		public void Test_7316()
-		{
-		}
-		[Test]
-		public void Test_7317()
-		{
-		}
-		[Test]
-		public void Test_7318()
-		{
-		}
-		[Test]
-		public void Test_7319()
-		{
-		}
-		[Test]
-		public void Test_7320()
-		{
-		}
-		[Test]
-		public void Test_7321()
-		{
-		}
-		[Test]
-		public void Test_7322()
-		{
-		}
-		[Test]
-		public void Test_7323()
-		{
-		}
-		[Test]
-		public void Test_7324()
-		{
-		}
-		[Test]
-		public void Test_7325()
-		{
-		}
-		[Test]
-		public void Test_7326()
-		{
-		}
-		[Test]
-		public void Test_7327()
-		{
-		}
-		[Test]
-		public void Test_7328()
-		{
-		}
-		[Test]
-		public void Test_7329()
-		{
-		}
-		[Test]
-		public void Test_7330()
-		{
-		}
-		[Test]
-		public void Test_7331()
-		{
-		}
-		[Test]
-		public void Test_7332()
-		{
-		}
-		[Test]
-		public void Test_7333()
-		{
-		}
-		[Test]
-		public void Test_7334()
-		{
-		}
-		[Test]
-		public void Test_7335()
-		{
-		}
-		[Test]
-		public void Test_7336()
-		{
-		}
-		[Test]
-		public void Test_7337()
-		{
-		}
-		[Test]
-		public void Test_7338()
-		{
-		}
-		[Test]
-		public void Test_7339()
-		{
-		}
-		[Test]
-		public void Test_7340()
-		{
-		}
-		[Test]
-		public void Test_7341()
-		{
-		}
-		[Test]
-		public void Test_7342()
-		{
-		}
-		[Test]
-		public void Test_7343()
-		{
-		}
-		[Test]
-		public void Test_7344()
-		{
-		}
-		[Test]
-		public void Test_7345()
-		{
-		}
-		[Test]
-		public void Test_7346()
-		{
-		}
-		[Test]
-		public void Test_7347()
-		{
-		}
-		[Test]
-		public void Test_7348()
-		{
-		}
-		[Test]
-		public void Test_7349()
-		{
-		}
-		[Test]
-		public void Test_7350()
-		{
-		}
-		[Test]
-		public void Test_7351()
-		{
-		}
-		[Test]
-		public void Test_7352()
-		{
-		}
-		[Test]
-		public void Test_7353()
-		{
-		}
-		[Test]
-		public void Test_7354()
-		{
-		}
-		[Test]
-		public void Test_7355()
-		{
-		}
-		[Test]
-		public void Test_7356()
-		{
-		}
-		[Test]
-		public void Test_7357()
-		{
-		}
-		[Test]
-		public void Test_7358()
-		{
-		}
-		[Test]
-		public void Test_7359()
-		{
-		}
-		[Test]
-		public void Test_7360()
-		{
-		}
-		[Test]
-		public void Test_7361()
-		{
-		}
-		[Test]
-		public void Test_7362()
-		{
-		}
-		[Test]
-		public void Test_7363()
-		{
-		}
-		[Test]
-		public void Test_7364()
-		{
-		}
-		[Test]
-		public void Test_7365()
-		{
-		}
-		[Test]
-		public void Test_7366()
-		{
-		}
-		[Test]
-		public void Test_7367()
-		{
-		}
-		[Test]
-		public void Test_7368()
-		{
-		}
-		[Test]
-		public void Test_7369()
-		{
-		}
-		[Test]
-		public void Test_7370()
-		{
-		}
-		[Test]
-		public void Test_7371()
-		{
-		}
-		[Test]
-		public void Test_7372()
-		{
-		}
-		[Test]
-		public void Test_7373()
-		{
-		}
-		[Test]
-		public void Test_7374()
-		{
-		}
-		[Test]
-		public void Test_7375()
-		{
-		}
-		[Test]
-		public void Test_7376()
-		{
-		}
-		[Test]
-		public void Test_7377()
-		{
-		}
-		[Test]
-		public void Test_7378()
-		{
-		}
-		[Test]
-		public void Test_7379()
-		{
-		}
-		[Test]
-		public void Test_7380()
-		{
-		}
-		[Test]
-		public void Test_7381()
-		{
-		}
-		[Test]
-		public void Test_7382()
-		{
-		}
-		[Test]
-		public void Test_7383()
-		{
-		}
-		[Test]
-		public void Test_7384()
-		{
-		}
-		[Test]
-		public void Test_7385()
-		{
-		}
-		[Test]
-		public void Test_7386()
-		{
-		}
-		[Test]
-		public void Test_7387()
-		{
-		}
-		[Test]
-		public void Test_7388()
-		{
-		}
-		[Test]
-		public void Test_7389()
-		{
-		}
-		[Test]
-		public void Test_7390()
-		{
-		}
-		[Test]
-		public void Test_7391()
-		{
-		}
-		[Test]
-		public void Test_7392()
-		{
-		}
-		[Test]
-		public void Test_7393()
-		{
-		}
-		[Test]
-		public void Test_7394()
-		{
-		}
-		[Test]
-		public void Test_7395()
-		{
-		}
-		[Test]
-		public void Test_7396()
-		{
-		}
-		[Test]
-		public void Test_7397()
-		{
-		}
-		[Test]
-		public void Test_7398()
-		{
-		}
-		[Test]
-		public void Test_7399()
-		{
-		}
-		[Test]
-		public void Test_7400()
-		{
-		}
-		[Test]
-		public void Test_7401()
-		{
-		}
-		[Test]
-		public void Test_7402()
-		{
-		}
-		[Test]
-		public void Test_7403()
-		{
-		}
-		[Test]
-		public void Test_7404()
-		{
-		}
-		[Test]
-		public void Test_7405()
-		{
-		}
-		[Test]
-		public void Test_7406()
-		{
-		}
-		[Test]
-		public void Test_7407()
-		{
-		}
-		[Test]
-		public void Test_7408()
-		{
-		}
-		[Test]
-		public void Test_7409()
-		{
-		}
-		[Test]
-		public void Test_7410()
-		{
-		}
-		[Test]
-		public void Test_7411()
-		{
-		}
-		[Test]
-		public void Test_7412()
-		{
-		}
-		[Test]
-		public void Test_7413()
-		{
-		}
-		[Test]
-		public void Test_7414()
-		{
-		}
-		[Test]
-		public void Test_7415()
-		{
-		}
-		[Test]
-		public void Test_7416()
-		{
-		}
-		[Test]
-		public void Test_7417()
-		{
-		}
-		[Test]
-		public void Test_7418()
-		{
-		}
-		[Test]
-		public void Test_7419()
-		{
-		}
-		[Test]
-		public void Test_7420()
-		{
-		}
-		[Test]
-		public void Test_7421()
-		{
-		}
-		[Test]
-		public void Test_7422()
-		{
-		}
-		[Test]
-		public void Test_7423()
-		{
-		}
-		[Test]
-		public void Test_7424()
-		{
-		}
-		[Test]
-		public void Test_7425()
-		{
-		}
-		[Test]
-		public void Test_7426()
-		{
-		}
-		[Test]
-		public void Test_7427()
-		{
-		}
-		[Test]
-		public void Test_7428()
-		{
-		}
-		[Test]
-		public void Test_7429()
-		{
-		}
-		[Test]
-		public void Test_7430()
-		{
-		}
-		[Test]
-		public void Test_7431()
-		{
-		}
-		[Test]
-		public void Test_7432()
-		{
-		}
-		[Test]
-		public void Test_7433()
-		{
-		}
-		[Test]
-		public void Test_7434()
-		{
-		}
-		[Test]
-		public void Test_7435()
-		{
-		}
-		[Test]
-		public void Test_7436()
-		{
-		}
-		[Test]
-		public void Test_7437()
-		{
-		}
-		[Test]
-		public void Test_7438()
-		{
-		}
-		[Test]
-		public void Test_7439()
-		{
-		}
-		[Test]
-		public void Test_7440()
-		{
-		}
-		[Test]
-		public void Test_7441()
-		{
-		}
-		[Test]
-		public void Test_7442()
-		{
-		}
-		[Test]
-		public void Test_7443()
-		{
-		}
-		[Test]
-		public void Test_7444()
-		{
-		}
-		[Test]
-		public void Test_7445()
-		{
-		}
-		[Test]
-		public void Test_7446()
-		{
-		}
-		[Test]
-		public void Test_7447()
-		{
-		}
-		[Test]
-		public void Test_7448()
-		{
-		}
-		[Test]
-		public void Test_7449()
-		{
-		}
-		[Test]
-		public void Test_7450()
-		{
-		}
-		[Test]
-		public void Test_7451()
-		{
-		}
-		[Test]
-		public void Test_7452()
-		{
-		}
-		[Test]
-		public void Test_7453()
-		{
-		}
-		[Test]
-		public void Test_7454()
-		{
-		}
-		[Test]
-		public void Test_7455()
-		{
-		}
-		[Test]
-		public void Test_7456()
-		{
-		}
-		[Test]
-		public void Test_7457()
-		{
-		}
-		[Test]
-		public void Test_7458()
-		{
-		}
-		[Test]
-		public void Test_7459()
-		{
-		}
-		[Test]
-		public void Test_7460()
-		{
-		}
-		[Test]
-		public void Test_7461()
-		{
-		}
-		[Test]
-		public void Test_7462()
-		{
-		}
-		[Test]
-		public void Test_7463()
-		{
-		}
-		[Test]
-		public void Test_7464()
-		{
-		}
-		[Test]
-		public void Test_7465()
-		{
-		}
-		[Test]
-		public void Test_7466()
-		{
-		}
-		[Test]
-		public void Test_7467()
-		{
-		}
-		[Test]
-		public void Test_7468()
-		{
-		}
-		[Test]
-		public void Test_7469()
-		{
-		}
-		[Test]
-		public void Test_7470()
-		{
-		}
-		[Test]
-		public void Test_7471()
-		{
-		}
-		[Test]
-		public void Test_7472()
-		{
-		}
-		[Test]
-		public void Test_7473()
-		{
-		}
-		[Test]
-		public void Test_7474()
-		{
-		}
-		[Test]
-		public void Test_7475()
-		{
-		}
-		[Test]
-		public void Test_7476()
-		{
-		}
-		[Test]
-		public void Test_7477()
-		{
-		}
-		[Test]
-		public void Test_7478()
-		{
-		}
-		[Test]
-		public void Test_7479()
-		{
-		}
-		[Test]
-		public void Test_7480()
-		{
-		}
-		[Test]
-		public void Test_7481()
-		{
-		}
-		[Test]
-		public void Test_7482()
-		{
-		}
-		[Test]
-		public void Test_7483()
-		{
-		}
-		[Test]
-		public void Test_7484()
-		{
-		}
-		[Test]
-		public void Test_7485()
-		{
-		}
-		[Test]
-		public void Test_7486()
-		{
-		}
-		[Test]
-		public void Test_7487()
-		{
-		}
-		[Test]
-		public void Test_7488()
-		{
-		}
-		[Test]
-		public void Test_7489()
-		{
-		}
-		[Test]
-		public void Test_7490()
-		{
-		}
-		[Test]
-		public void Test_7491()
-		{
-		}
-		[Test]
-		public void Test_7492()
-		{
-		}
-		[Test]
-		public void Test_7493()
-		{
-		}
-		[Test]
-		public void Test_7494()
-		{
-		}
-		[Test]
-		public void Test_7495()
-		{
-		}
-		[Test]
-		public void Test_7496()
-		{
-		}
-		[Test]
-		public void Test_7497()
-		{
-		}
-		[Test]
-		public void Test_7498()
-		{
-		}
-		[Test]
-		public void Test_7499()
-		{
-		}
-		[Test]
-		public void Test_7500()
-		{
-		}
-		[Test]
-		public void Test_7501()
-		{
-		}
-		[Test]
-		public void Test_7502()
-		{
-		}
-		[Test]
-		public void Test_7503()
-		{
-		}
-		[Test]
-		public void Test_7504()
-		{
-		}
-		[Test]
-		public void Test_7505()
-		{
-		}
-		[Test]
-		public void Test_7506()
-		{
-		}
-		[Test]
-		public void Test_7507()
-		{
-		}
-		[Test]
-		public void Test_7508()
-		{
-		}
-		[Test]
-		public void Test_7509()
-		{
-		}
-		[Test]
-		public void Test_7510()
-		{
-		}
-		[Test]
-		public void Test_7511()
-		{
-		}
-		[Test]
-		public void Test_7512()
-		{
-		}
-		[Test]
-		public void Test_7513()
-		{
-		}
-		[Test]
-		public void Test_7514()
-		{
-		}
-		[Test]
-		public void Test_7515()
-		{
-		}
-		[Test]
-		public void Test_7516()
-		{
-		}
-		[Test]
-		public void Test_7517()
-		{
-		}
-		[Test]
-		public void Test_7518()
-		{
-		}
-		[Test]
-		public void Test_7519()
-		{
-		}
-		[Test]
-		public void Test_7520()
-		{
-		}
-		[Test]
-		public void Test_7521()
-		{
-		}
-		[Test]
-		public void Test_7522()
-		{
-		}
-		[Test]
-		public void Test_7523()
-		{
-		}
-		[Test]
-		public void Test_7524()
-		{
-		}
-		[Test]
-		public void Test_7525()
-		{
-		}
-		[Test]
-		public void Test_7526()
-		{
-		}
-		[Test]
-		public void Test_7527()
-		{
-		}
-		[Test]
-		public void Test_7528()
-		{
-		}
-		[Test]
-		public void Test_7529()
-		{
-		}
-		[Test]
-		public void Test_7530()
-		{
-		}
-		[Test]
-		public void Test_7531()
-		{
-		}
-		[Test]
-		public void Test_7532()
-		{
-		}
-		[Test]
-		public void Test_7533()
-		{
-		}
-		[Test]
-		public void Test_7534()
-		{
-		}
-		[Test]
-		public void Test_7535()
-		{
-		}
-		[Test]
-		public void Test_7536()
-		{
-		}
-		[Test]
-		public void Test_7537()
-		{
-		}
-		[Test]
-		public void Test_7538()
-		{
-		}
-		[Test]
-		public void Test_7539()
-		{
-		}
-		[Test]
-		public void Test_7540()
-		{
-		}
-		[Test]
-		public void Test_7541()
-		{
-		}
-		[Test]
-		public void Test_7542()
-		{
-		}
-		[Test]
-		public void Test_7543()
-		{
-		}
-		[Test]
-		public void Test_7544()
-		{
-		}
-		[Test]
-		public void Test_7545()
-		{
-		}
-		[Test]
-		public void Test_7546()
-		{
-		}
-		[Test]
-		public void Test_7547()
-		{
-		}
-		[Test]
-		public void Test_7548()
-		{
-		}
-		[Test]
-		public void Test_7549()
-		{
-		}
-		[Test]
-		public void Test_7550()
-		{
-		}
-		[Test]
-		public void Test_7551()
-		{
-		}
-		[Test]
-		public void Test_7552()
-		{
-		}
-		[Test]
-		public void Test_7553()
-		{
-		}
-		[Test]
-		public void Test_7554()
-		{
-		}
-		[Test]
-		public void Test_7555()
-		{
-		}
-		[Test]
-		public void Test_7556()
-		{
-		}
-		[Test]
-		public void Test_7557()
-		{
-		}
-		[Test]
-		public void Test_7558()
-		{
-		}
-		[Test]
-		public void Test_7559()
-		{
-		}
-		[Test]
-		public void Test_7560()
-		{
-		}
-		[Test]
-		public void Test_7561()
-		{
-		}
-		[Test]
-		public void Test_7562()
-		{
-		}
-		[Test]
-		public void Test_7563()
-		{
-		}
-		[Test]
-		public void Test_7564()
-		{
-		}
-		[Test]
-		public void Test_7565()
-		{
-		}
-		[Test]
-		public void Test_7566()
-		{
-		}
-		[Test]
-		public void Test_7567()
-		{
-		}
-		[Test]
-		public void Test_7568()
-		{
-		}
-		[Test]
-		public void Test_7569()
-		{
-		}
-		[Test]
-		public void Test_7570()
-		{
-		}
-		[Test]
-		public void Test_7571()
-		{
-		}
-		[Test]
-		public void Test_7572()
-		{
-		}
-		[Test]
-		public void Test_7573()
-		{
-		}
-		[Test]
-		public void Test_7574()
-		{
-		}
-		[Test]
-		public void Test_7575()
-		{
-		}
-		[Test]
-		public void Test_7576()
-		{
-		}
-		[Test]
-		public void Test_7577()
-		{
-		}
-		[Test]
-		public void Test_7578()
-		{
-		}
-		[Test]
-		public void Test_7579()
-		{
-		}
-		[Test]
-		public void Test_7580()
-		{
-		}
-		[Test]
-		public void Test_7581()
-		{
-		}
-		[Test]
-		public void Test_7582()
-		{
-		}
-		[Test]
-		public void Test_7583()
-		{
-		}
-		[Test]
-		public void Test_7584()
-		{
-		}
-		[Test]
-		public void Test_7585()
-		{
-		}
-		[Test]
-		public void Test_7586()
-		{
-		}
-		[Test]
-		public void Test_7587()
-		{
-		}
-		[Test]
-		public void Test_7588()
-		{
-		}
-		[Test]
-		public void Test_7589()
-		{
-		}
-		[Test]
-		public void Test_7590()
-		{
-		}
-		[Test]
-		public void Test_7591()
-		{
-		}
-		[Test]
-		public void Test_7592()
-		{
-		}
-		[Test]
-		public void Test_7593()
-		{
-		}
-		[Test]
-		public void Test_7594()
-		{
-		}
-		[Test]
-		public void Test_7595()
-		{
-		}
-		[Test]
-		public void Test_7596()
-		{
-		}
-		[Test]
-		public void Test_7597()
-		{
-		}
-		[Test]
-		public void Test_7598()
-		{
-		}
-		[Test]
-		public void Test_7599()
-		{
-		}
-		[Test]
-		public void Test_7600()
-		{
-		}
-		[Test]
-		public void Test_7601()
-		{
-		}
-		[Test]
-		public void Test_7602()
-		{
-		}
-		[Test]
-		public void Test_7603()
-		{
-		}
-		[Test]
-		public void Test_7604()
-		{
-		}
-		[Test]
-		public void Test_7605()
-		{
-		}
-		[Test]
-		public void Test_7606()
-		{
-		}
-		[Test]
-		public void Test_7607()
-		{
-		}
-		[Test]
-		public void Test_7608()
-		{
-		}
-		[Test]
-		public void Test_7609()
-		{
-		}
-		[Test]
-		public void Test_7610()
-		{
-		}
-		[Test]
-		public void Test_7611()
-		{
-		}
-		[Test]
-		public void Test_7612()
-		{
-		}
-		[Test]
-		public void Test_7613()
-		{
-		}
-		[Test]
-		public void Test_7614()
-		{
-		}
-		[Test]
-		public void Test_7615()
-		{
-		}
-		[Test]
-		public void Test_7616()
-		{
-		}
-		[Test]
-		public void Test_7617()
-		{
-		}
-		[Test]
-		public void Test_7618()
-		{
-		}
-		[Test]
-		public void Test_7619()
-		{
-		}
-		[Test]
-		public void Test_7620()
-		{
-		}
-		[Test]
-		public void Test_7621()
-		{
-		}
-		[Test]
-		public void Test_7622()
-		{
-		}
-		[Test]
-		public void Test_7623()
-		{
-		}
-		[Test]
-		public void Test_7624()
-		{
-		}
-		[Test]
-		public void Test_7625()
-		{
-		}
-		[Test]
-		public void Test_7626()
-		{
-		}
-		[Test]
-		public void Test_7627()
-		{
-		}
-		[Test]
-		public void Test_7628()
-		{
-		}
-		[Test]
-		public void Test_7629()
-		{
-		}
-		[Test]
-		public void Test_7630()
-		{
-		}
-		[Test]
-		public void Test_7631()
-		{
-		}
-		[Test]
-		public void Test_7632()
-		{
-		}
-		[Test]
-		public void Test_7633()
-		{
-		}
-		[Test]
-		public void Test_7634()
-		{
-		}
-		[Test]
-		public void Test_7635()
-		{
-		}
-		[Test]
-		public void Test_7636()
-		{
-		}
-		[Test]
-		public void Test_7637()
-		{
-		}
-		[Test]
-		public void Test_7638()
-		{
-		}
-		[Test]
-		public void Test_7639()
-		{
-		}
-		[Test]
-		public void Test_7640()
-		{
-		}
-		[Test]
-		public void Test_7641()
-		{
-		}
-		[Test]
-		public void Test_7642()
-		{
-		}
-		[Test]
-		public void Test_7643()
-		{
-		}
-		[Test]
-		public void Test_7644()
-		{
-		}
-		[Test]
-		public void Test_7645()
-		{
-		}
-		[Test]
-		public void Test_7646()
-		{
-		}
-		[Test]
-		public void Test_7647()
-		{
-		}
-		[Test]
-		public void Test_7648()
-		{
-		}
-		[Test]
-		public void Test_7649()
-		{
-		}
-		[Test]
-		public void Test_7650()
-		{
-		}
-		[Test]
-		public void Test_7651()
-		{
-		}
-		[Test]
-		public void Test_7652()
-		{
-		}
-		[Test]
-		public void Test_7653()
-		{
-		}
-		[Test]
-		public void Test_7654()
-		{
-		}
-		[Test]
-		public void Test_7655()
-		{
-		}
-		[Test]
-		public void Test_7656()
-		{
-		}
-		[Test]
-		public void Test_7657()
-		{
-		}
-		[Test]
-		public void Test_7658()
-		{
-		}
-		[Test]
-		public void Test_7659()
-		{
-		}
-		[Test]
-		public void Test_7660()
-		{
-		}
-		[Test]
-		public void Test_7661()
-		{
-		}
-		[Test]
-		public void Test_7662()
-		{
-		}
-		[Test]
-		public void Test_7663()
-		{
-		}
-		[Test]
-		public void Test_7664()
-		{
-		}
-		[Test]
-		public void Test_7665()
-		{
-		}
-		[Test]
-		public void Test_7666()
-		{
-		}
-		[Test]
-		public void Test_7667()
-		{
-		}
-		[Test]
-		public void Test_7668()
-		{
-		}
-		[Test]
-		public void Test_7669()
-		{
-		}
-		[Test]
-		public void Test_7670()
-		{
-		}
-		[Test]
-		public void Test_7671()
-		{
-		}
-		[Test]
-		public void Test_7672()
-		{
-		}
-		[Test]
-		public void Test_7673()
-		{
-		}
-		[Test]
-		public void Test_7674()
-		{
-		}
-		[Test]
-		public void Test_7675()
-		{
-		}
-		[Test]
-		public void Test_7676()
-		{
-		}
-		[Test]
-		public void Test_7677()
-		{
-		}
-		[Test]
-		public void Test_7678()
-		{
-		}
-		[Test]
-		public void Test_7679()
-		{
-		}
-		[Test]
-		public void Test_7680()
-		{
-		}
-		[Test]
-		public void Test_7681()
-		{
-		}
-		[Test]
-		public void Test_7682()
-		{
-		}
-		[Test]
-		public void Test_7683()
-		{
-		}
-		[Test]
-		public void Test_7684()
-		{
-		}
-		[Test]
-		public void Test_7685()
-		{
-		}
-		[Test]
-		public void Test_7686()
-		{
-		}
-		[Test]
-		public void Test_7687()
-		{
-		}
-		[Test]
-		public void Test_7688()
-		{
-		}
-		[Test]
-		public void Test_7689()
-		{
-		}
-		[Test]
-		public void Test_7690()
-		{
-		}
-		[Test]
-		public void Test_7691()
-		{
-		}
-		[Test]
-		public void Test_7692()
-		{
-		}
-		[Test]
-		public void Test_7693()
-		{
-		}
-		[Test]
-		public void Test_7694()
-		{
-		}
-		[Test]
-		public void Test_7695()
-		{
-		}
-		[Test]
-		public void Test_7696()
-		{
-		}
-		[Test]
-		public void Test_7697()
-		{
-		}
-		[Test]
-		public void Test_7698()
-		{
-		}
-		[Test]
-		public void Test_7699()
-		{
-		}
-		[Test]
-		public void Test_7700()
-		{
-		}
-		[Test]
-		public void Test_7701()
-		{
-		}
-		[Test]
-		public void Test_7702()
-		{
-		}
-		[Test]
-		public void Test_7703()
-		{
-		}
-		[Test]
-		public void Test_7704()
-		{
-		}
-		[Test]
-		public void Test_7705()
-		{
-		}
-		[Test]
-		public void Test_7706()
-		{
-		}
-		[Test]
-		public void Test_7707()
-		{
-		}
-		[Test]
-		public void Test_7708()
-		{
-		}
-		[Test]
-		public void Test_7709()
-		{
-		}
-		[Test]
-		public void Test_7710()
-		{
-		}
-		[Test]
-		public void Test_7711()
-		{
-		}
-		[Test]
-		public void Test_7712()
-		{
-		}
-		[Test]
-		public void Test_7713()
-		{
-		}
-		[Test]
-		public void Test_7714()
-		{
-		}
-		[Test]
-		public void Test_7715()
-		{
-		}
-		[Test]
-		public void Test_7716()
-		{
-		}
-		[Test]
-		public void Test_7717()
-		{
-		}
-		[Test]
-		public void Test_7718()
-		{
-		}
-		[Test]
-		public void Test_7719()
-		{
-		}
-		[Test]
-		public void Test_7720()
-		{
-		}
-		[Test]
-		public void Test_7721()
-		{
-		}
-		[Test]
-		public void Test_7722()
-		{
-		}
-		[Test]
-		public void Test_7723()
-		{
-		}
-		[Test]
-		public void Test_7724()
-		{
-		}
-		[Test]
-		public void Test_7725()
-		{
-		}
-		[Test]
-		public void Test_7726()
-		{
-		}
-		[Test]
-		public void Test_7727()
-		{
-		}
-		[Test]
-		public void Test_7728()
-		{
-		}
-		[Test]
-		public void Test_7729()
-		{
-		}
-		[Test]
-		public void Test_7730()
-		{
-		}
-		[Test]
-		public void Test_7731()
-		{
-		}
-		[Test]
-		public void Test_7732()
-		{
-		}
-		[Test]
-		public void Test_7733()
-		{
-		}
-		[Test]
-		public void Test_7734()
-		{
-		}
-		[Test]
-		public void Test_7735()
-		{
-		}
-		[Test]
-		public void Test_7736()
-		{
-		}
-		[Test]
-		public void Test_7737()
-		{
-		}
-		[Test]
-		public void Test_7738()
-		{
-		}
-		[Test]
-		public void Test_7739()
-		{
-		}
-		[Test]
-		public void Test_7740()
-		{
-		}
-		[Test]
-		public void Test_7741()
-		{
-		}
-		[Test]
-		public void Test_7742()
-		{
-		}
-		[Test]
-		public void Test_7743()
-		{
-		}
-		[Test]
-		public void Test_7744()
-		{
-		}
-		[Test]
-		public void Test_7745()
-		{
-		}
-		[Test]
-		public void Test_7746()
-		{
-		}
-		[Test]
-		public void Test_7747()
-		{
-		}
-		[Test]
-		public void Test_7748()
-		{
-		}
-		[Test]
-		public void Test_7749()
-		{
-		}
-		[Test]
-		public void Test_7750()
-		{
-		}
-		[Test]
-		public void Test_7751()
-		{
-		}
-		[Test]
-		public void Test_7752()
-		{
-		}
-		[Test]
-		public void Test_7753()
-		{
-		}
-		[Test]
-		public void Test_7754()
-		{
-		}
-		[Test]
-		public void Test_7755()
-		{
-		}
-		[Test]
-		public void Test_7756()
-		{
-		}
-		[Test]
-		public void Test_7757()
-		{
-		}
-		[Test]
-		public void Test_7758()
-		{
-		}
-		[Test]
-		public void Test_7759()
-		{
-		}
-		[Test]
-		public void Test_7760()
-		{
-		}
-		[Test]
-		public void Test_7761()
-		{
-		}
-		[Test]
-		public void Test_7762()
-		{
-		}
-		[Test]
-		public void Test_7763()
-		{
-		}
-		[Test]
-		public void Test_7764()
-		{
-		}
-		[Test]
-		public void Test_7765()
-		{
-		}
-		[Test]
-		public void Test_7766()
-		{
-		}
-		[Test]
-		public void Test_7767()
-		{
-		}
-		[Test]
-		public void Test_7768()
-		{
-		}
-		[Test]
-		public void Test_7769()
-		{
-		}
-		[Test]
-		public void Test_7770()
-		{
-		}
-		[Test]
-		public void Test_7771()
-		{
-		}
-		[Test]
-		public void Test_7772()
-		{
-		}
-		[Test]
-		public void Test_7773()
-		{
-		}
-		[Test]
-		public void Test_7774()
-		{
-		}
-		[Test]
-		public void Test_7775()
-		{
-		}
-		[Test]
-		public void Test_7776()
-		{
-		}
-		[Test]
-		public void Test_7777()
-		{
-		}
-		[Test]
-		public void Test_7778()
-		{
-		}
-		[Test]
-		public void Test_7779()
-		{
-		}
-		[Test]
-		public void Test_7780()
-		{
-		}
-		[Test]
-		public void Test_7781()
-		{
-		}
-		[Test]
-		public void Test_7782()
-		{
-		}
-		[Test]
-		public void Test_7783()
-		{
-		}
-		[Test]
-		public void Test_7784()
-		{
-		}
-		[Test]
-		public void Test_7785()
-		{
-		}
-		[Test]
-		public void Test_7786()
-		{
-		}
-		[Test]
-		public void Test_7787()
-		{
-		}
-		[Test]
-		public void Test_7788()
-		{
-		}
-		[Test]
-		public void Test_7789()
-		{
-		}
-		[Test]
-		public void Test_7790()
-		{
-		}
-		[Test]
-		public void Test_7791()
-		{
-		}
-		[Test]
-		public void Test_7792()
-		{
-		}
-		[Test]
-		public void Test_7793()
-		{
-		}
-		[Test]
-		public void Test_7794()
-		{
-		}
-		[Test]
-		public void Test_7795()
-		{
-		}
-		[Test]
-		public void Test_7796()
-		{
-		}
-		[Test]
-		public void Test_7797()
-		{
-		}
-		[Test]
-		public void Test_7798()
-		{
-		}
-		[Test]
-		public void Test_7799()
-		{
-		}
-		[Test]
-		public void Test_7800()
-		{
-		}
-		[Test]
-		public void Test_7801()
-		{
-		}
-		[Test]
-		public void Test_7802()
-		{
-		}
-		[Test]
-		public void Test_7803()
-		{
-		}
-		[Test]
-		public void Test_7804()
-		{
-		}
-		[Test]
-		public void Test_7805()
-		{
-		}
-		[Test]
-		public void Test_7806()
-		{
-		}
-		[Test]
-		public void Test_7807()
-		{
-		}
-		[Test]
-		public void Test_7808()
-		{
-		}
-		[Test]
-		public void Test_7809()
-		{
-		}
-		[Test]
-		public void Test_7810()
-		{
-		}
-		[Test]
-		public void Test_7811()
-		{
-		}
-		[Test]
-		public void Test_7812()
-		{
-		}
-		[Test]
-		public void Test_7813()
-		{
-		}
-		[Test]
-		public void Test_7814()
-		{
-		}
-		[Test]
-		public void Test_7815()
-		{
-		}
-		[Test]
-		public void Test_7816()
-		{
-		}
-		[Test]
-		public void Test_7817()
-		{
-		}
-		[Test]
-		public void Test_7818()
-		{
-		}
-		[Test]
-		public void Test_7819()
-		{
-		}
-		[Test]
-		public void Test_7820()
-		{
-		}
-		[Test]
-		public void Test_7821()
-		{
-		}
-		[Test]
-		public void Test_7822()
-		{
-		}
-		[Test]
-		public void Test_7823()
-		{
-		}
-		[Test]
-		public void Test_7824()
-		{
-		}
-		[Test]
-		public void Test_7825()
-		{
-		}
-		[Test]
-		public void Test_7826()
-		{
-		}
-		[Test]
-		public void Test_7827()
-		{
-		}
-		[Test]
-		public void Test_7828()
-		{
-		}
-		[Test]
-		public void Test_7829()
-		{
-		}
-		[Test]
-		public void Test_7830()
-		{
-		}
-		[Test]
-		public void Test_7831()
-		{
-		}
-		[Test]
-		public void Test_7832()
-		{
-		}
-		[Test]
-		public void Test_7833()
-		{
-		}
-		[Test]
-		public void Test_7834()
-		{
-		}
-		[Test]
-		public void Test_7835()
-		{
-		}
-		[Test]
-		public void Test_7836()
-		{
-		}
-		[Test]
-		public void Test_7837()
-		{
-		}
-		[Test]
-		public void Test_7838()
-		{
-		}
-		[Test]
-		public void Test_7839()
-		{
-		}
-		[Test]
-		public void Test_7840()
-		{
-		}
-		[Test]
-		public void Test_7841()
-		{
-		}
-		[Test]
-		public void Test_7842()
-		{
-		}
-		[Test]
-		public void Test_7843()
-		{
-		}
-		[Test]
-		public void Test_7844()
-		{
-		}
-		[Test]
-		public void Test_7845()
-		{
-		}
-		[Test]
-		public void Test_7846()
-		{
-		}
-		[Test]
-		public void Test_7847()
-		{
-		}
-		[Test]
-		public void Test_7848()
-		{
-		}
-		[Test]
-		public void Test_7849()
-		{
-		}
-		[Test]
-		public void Test_7850()
-		{
-		}
-		[Test]
-		public void Test_7851()
-		{
-		}
-		[Test]
-		public void Test_7852()
-		{
-		}
-		[Test]
-		public void Test_7853()
-		{
-		}
-		[Test]
-		public void Test_7854()
-		{
-		}
-		[Test]
-		public void Test_7855()
-		{
-		}
-		[Test]
-		public void Test_7856()
-		{
-		}
-		[Test]
-		public void Test_7857()
-		{
-		}
-		[Test]
-		public void Test_7858()
-		{
-		}
-		[Test]
-		public void Test_7859()
-		{
-		}
-		[Test]
-		public void Test_7860()
-		{
-		}
-		[Test]
-		public void Test_7861()
-		{
-		}
-		[Test]
-		public void Test_7862()
-		{
-		}
-		[Test]
-		public void Test_7863()
-		{
-		}
-		[Test]
-		public void Test_7864()
-		{
-		}
-		[Test]
-		public void Test_7865()
-		{
-		}
-		[Test]
-		public void Test_7866()
-		{
-		}
-		[Test]
-		public void Test_7867()
-		{
-		}
-		[Test]
-		public void Test_7868()
-		{
-		}
-		[Test]
-		public void Test_7869()
-		{
-		}
-		[Test]
-		public void Test_7870()
-		{
-		}
-		[Test]
-		public void Test_7871()
-		{
-		}
-		[Test]
-		public void Test_7872()
-		{
-		}
-		[Test]
-		public void Test_7873()
-		{
-		}
-		[Test]
-		public void Test_7874()
-		{
-		}
-		[Test]
-		public void Test_7875()
-		{
-		}
-		[Test]
-		public void Test_7876()
-		{
-		}
-		[Test]
-		public void Test_7877()
-		{
-		}
-		[Test]
-		public void Test_7878()
-		{
-		}
-		[Test]
-		public void Test_7879()
-		{
-		}
-		[Test]
-		public void Test_7880()
-		{
-		}
-		[Test]
-		public void Test_7881()
-		{
-		}
-		[Test]
-		public void Test_7882()
-		{
-		}
-		[Test]
-		public void Test_7883()
-		{
-		}
-		[Test]
-		public void Test_7884()
-		{
-		}
-		[Test]
-		public void Test_7885()
-		{
-		}
-		[Test]
-		public void Test_7886()
-		{
-		}
-		[Test]
-		public void Test_7887()
-		{
-		}
-		[Test]
-		public void Test_7888()
-		{
-		}
-		[Test]
-		public void Test_7889()
-		{
-		}
-		[Test]
-		public void Test_7890()
-		{
-		}
-		[Test]
-		public void Test_7891()
-		{
-		}
-		[Test]
-		public void Test_7892()
-		{
-		}
-		[Test]
-		public void Test_7893()
-		{
-		}
-		[Test]
-		public void Test_7894()
-		{
-		}
-		[Test]
-		public void Test_7895()
-		{
-		}
-		[Test]
-		public void Test_7896()
-		{
-		}
-		[Test]
-		public void Test_7897()
-		{
-		}
-		[Test]
-		public void Test_7898()
-		{
-		}
-		[Test]
-		public void Test_7899()
-		{
-		}
-		[Test]
-		public void Test_7900()
-		{
-		}
-		[Test]
-		public void Test_7901()
-		{
-		}
-		[Test]
-		public void Test_7902()
-		{
-		}
-		[Test]
-		public void Test_7903()
-		{
-		}
-		[Test]
-		public void Test_7904()
-		{
-		}
-		[Test]
-		public void Test_7905()
-		{
-		}
-		[Test]
-		public void Test_7906()
-		{
-		}
-		[Test]
-		public void Test_7907()
-		{
-		}
-		[Test]
-		public void Test_7908()
-		{
-		}
-		[Test]
-		public void Test_7909()
-		{
-		}
-		[Test]
-		public void Test_7910()
-		{
-		}
-		[Test]
-		public void Test_7911()
-		{
-		}
-		[Test]
-		public void Test_7912()
-		{
-		}
-		[Test]
-		public void Test_7913()
-		{
-		}
-		[Test]
-		public void Test_7914()
-		{
-		}
-		[Test]
-		public void Test_7915()
-		{
-		}
-		[Test]
-		public void Test_7916()
-		{
-		}
-		[Test]
-		public void Test_7917()
-		{
-		}
-		[Test]
-		public void Test_7918()
-		{
-		}
-		[Test]
-		public void Test_7919()
-		{
-		}
-		[Test]
-		public void Test_7920()
-		{
-		}
-		[Test]
-		public void Test_7921()
-		{
-		}
-		[Test]
-		public void Test_7922()
-		{
-		}
-		[Test]
-		public void Test_7923()
-		{
-		}
-		[Test]
-		public void Test_7924()
-		{
-		}
-		[Test]
-		public void Test_7925()
-		{
-		}
-		[Test]
-		public void Test_7926()
-		{
-		}
-		[Test]
-		public void Test_7927()
-		{
-		}
-		[Test]
-		public void Test_7928()
-		{
-		}
-		[Test]
-		public void Test_7929()
-		{
-		}
-		[Test]
-		public void Test_7930()
-		{
-		}
-		[Test]
-		public void Test_7931()
-		{
-		}
-		[Test]
-		public void Test_7932()
-		{
-		}
-		[Test]
-		public void Test_7933()
-		{
-		}
-		[Test]
-		public void Test_7934()
-		{
-		}
-		[Test]
-		public void Test_7935()
-		{
-		}
-		[Test]
-		public void Test_7936()
-		{
-		}
-		[Test]
-		public void Test_7937()
-		{
-		}
-		[Test]
-		public void Test_7938()
-		{
-		}
-		[Test]
-		public void Test_7939()
-		{
-		}
-		[Test]
-		public void Test_7940()
-		{
-		}
-		[Test]
-		public void Test_7941()
-		{
-		}
-		[Test]
-		public void Test_7942()
-		{
-		}
-		[Test]
-		public void Test_7943()
-		{
-		}
-		[Test]
-		public void Test_7944()
-		{
-		}
-		[Test]
-		public void Test_7945()
-		{
-		}
-		[Test]
-		public void Test_7946()
-		{
-		}
-		[Test]
-		public void Test_7947()
-		{
-		}
-		[Test]
-		public void Test_7948()
-		{
-		}
-		[Test]
-		public void Test_7949()
-		{
-		}
-		[Test]
-		public void Test_7950()
-		{
-		}
-		[Test]
-		public void Test_7951()
-		{
-		}
-		[Test]
-		public void Test_7952()
-		{
-		}
-		[Test]
-		public void Test_7953()
-		{
-		}
-		[Test]
-		public void Test_7954()
-		{
-		}
-		[Test]
-		public void Test_7955()
-		{
-		}
-		[Test]
-		public void Test_7956()
-		{
-		}
-		[Test]
-		public void Test_7957()
-		{
-		}
-		[Test]
-		public void Test_7958()
-		{
-		}
-		[Test]
-		public void Test_7959()
-		{
-		}
-		[Test]
-		public void Test_7960()
-		{
-		}
-		[Test]
-		public void Test_7961()
-		{
-		}
-		[Test]
-		public void Test_7962()
-		{
-		}
-		[Test]
-		public void Test_7963()
-		{
-		}
-		[Test]
-		public void Test_7964()
-		{
-		}
-		[Test]
-		public void Test_7965()
-		{
-		}
-		[Test]
-		public void Test_7966()
-		{
-		}
-		[Test]
-		public void Test_7967()
-		{
-		}
-		[Test]
-		public void Test_7968()
-		{
-		}
-		[Test]
-		public void Test_7969()
-		{
-		}
-		[Test]
-		public void Test_7970()
-		{
-		}
-		[Test]
-		public void Test_7971()
-		{
-		}
-		[Test]
-		public void Test_7972()
-		{
-		}
-		[Test]
-		public void Test_7973()
-		{
-		}
-		[Test]
-		public void Test_7974()
-		{
-		}
-		[Test]
-		public void Test_7975()
-		{
-		}
-		[Test]
-		public void Test_7976()
-		{
-		}
-		[Test]
-		public void Test_7977()
-		{
-		}
-		[Test]
-		public void Test_7978()
-		{
-		}
-		[Test]
-		public void Test_7979()
-		{
-		}
-		[Test]
-		public void Test_7980()
-		{
-		}
-		[Test]
-		public void Test_7981()
-		{
-		}
-		[Test]
-		public void Test_7982()
-		{
-		}
-		[Test]
-		public void Test_7983()
-		{
-		}
-		[Test]
-		public void Test_7984()
-		{
-		}
-		[Test]
-		public void Test_7985()
-		{
-		}
-		[Test]
-		public void Test_7986()
-		{
-		}
-		[Test]
-		public void Test_7987()
-		{
-		}
-		[Test]
-		public void Test_7988()
-		{
-		}
-		[Test]
-		public void Test_7989()
-		{
-		}
-		[Test]
-		public void Test_7990()
-		{
-		}
-		[Test]
-		public void Test_7991()
-		{
-		}
-		[Test]
-		public void Test_7992()
-		{
-		}
-		[Test]
-		public void Test_7993()
-		{
-		}
-		[Test]
-		public void Test_7994()
-		{
-		}
-		[Test]
-		public void Test_7995()
-		{
-		}
-		[Test]
-		public void Test_7996()
-		{
-		}
-		[Test]
-		public void Test_7997()
-		{
-		}
-		[Test]
-		public void Test_7998()
-		{
-		}
-		[Test]
-		public void Test_7999()
-		{
-		}
-		[Test]
-		public void Test_8000()
-		{
-		}
-		[Test]
-		public void Test_8001()
-		{
-		}
-		[Test]
-		public void Test_8002()
-		{
-		}
-		[Test]
-		public void Test_8003()
-		{
-		}
-		[Test]
-		public void Test_8004()
-		{
-		}
-		[Test]
-		public void Test_8005()
-		{
-		}
-		[Test]
-		public void Test_8006()
-		{
-		}
-		[Test]
-		public void Test_8007()
-		{
-		}
-		[Test]
-		public void Test_8008()
-		{
-		}
-		[Test]
-		public void Test_8009()
-		{
-		}
-		[Test]
-		public void Test_8010()
-		{
-		}
-		[Test]
-		public void Test_8011()
-		{
-		}
-		[Test]
-		public void Test_8012()
-		{
-		}
-		[Test]
-		public void Test_8013()
-		{
-		}
-		[Test]
-		public void Test_8014()
-		{
-		}
-		[Test]
-		public void Test_8015()
-		{
-		}
-		[Test]
-		public void Test_8016()
-		{
-		}
-		[Test]
-		public void Test_8017()
-		{
-		}
-		[Test]
-		public void Test_8018()
-		{
-		}
-		[Test]
-		public void Test_8019()
-		{
-		}
-		[Test]
-		public void Test_8020()
-		{
-		}
-		[Test]
-		public void Test_8021()
-		{
-		}
-		[Test]
-		public void Test_8022()
-		{
-		}
-		[Test]
-		public void Test_8023()
-		{
-		}
-		[Test]
-		public void Test_8024()
-		{
-		}
-		[Test]
-		public void Test_8025()
-		{
-		}
-		[Test]
-		public void Test_8026()
-		{
-		}
-		[Test]
-		public void Test_8027()
-		{
-		}
-		[Test]
-		public void Test_8028()
-		{
-		}
-		[Test]
-		public void Test_8029()
-		{
-		}
-		[Test]
-		public void Test_8030()
-		{
-		}
-		[Test]
-		public void Test_8031()
-		{
-		}
-		[Test]
-		public void Test_8032()
-		{
-		}
-		[Test]
-		public void Test_8033()
-		{
-		}
-		[Test]
-		public void Test_8034()
-		{
-		}
-		[Test]
-		public void Test_8035()
-		{
-		}
-		[Test]
-		public void Test_8036()
-		{
-		}
-		[Test]
-		public void Test_8037()
-		{
-		}
-		[Test]
-		public void Test_8038()
-		{
-		}
-		[Test]
-		public void Test_8039()
-		{
-		}
-		[Test]
-		public void Test_8040()
-		{
-		}
-		[Test]
-		public void Test_8041()
-		{
-		}
-		[Test]
-		public void Test_8042()
-		{
-		}
-		[Test]
-		public void Test_8043()
-		{
-		}
-		[Test]
-		public void Test_8044()
-		{
-		}
-		[Test]
-		public void Test_8045()
-		{
-		}
-		[Test]
-		public void Test_8046()
-		{
-		}
-		[Test]
-		public void Test_8047()
-		{
-		}
-		[Test]
-		public void Test_8048()
-		{
-		}
-		[Test]
-		public void Test_8049()
-		{
-		}
-		[Test]
-		public void Test_8050()
-		{
-		}
-		[Test]
-		public void Test_8051()
-		{
-		}
-		[Test]
-		public void Test_8052()
-		{
-		}
-		[Test]
-		public void Test_8053()
-		{
-		}
-		[Test]
-		public void Test_8054()
-		{
-		}
-		[Test]
-		public void Test_8055()
-		{
-		}
-		[Test]
-		public void Test_8056()
-		{
-		}
-		[Test]
-		public void Test_8057()
-		{
-		}
-		[Test]
-		public void Test_8058()
-		{
-		}
-		[Test]
-		public void Test_8059()
-		{
-		}
-		[Test]
-		public void Test_8060()
-		{
-		}
-		[Test]
-		public void Test_8061()
-		{
-		}
-		[Test]
-		public void Test_8062()
-		{
-		}
-		[Test]
-		public void Test_8063()
-		{
-		}
-		[Test]
-		public void Test_8064()
-		{
-		}
-		[Test]
-		public void Test_8065()
-		{
-		}
-		[Test]
-		public void Test_8066()
-		{
-		}
-		[Test]
-		public void Test_8067()
-		{
-		}
-		[Test]
-		public void Test_8068()
-		{
-		}
-		[Test]
-		public void Test_8069()
-		{
-		}
-		[Test]
-		public void Test_8070()
-		{
-		}
-		[Test]
-		public void Test_8071()
-		{
-		}
-		[Test]
-		public void Test_8072()
-		{
-		}
-		[Test]
-		public void Test_8073()
-		{
-		}
-		[Test]
-		public void Test_8074()
-		{
-		}
-		[Test]
-		public void Test_8075()
-		{
-		}
-		[Test]
-		public void Test_8076()
-		{
-		}
-		[Test]
-		public void Test_8077()
-		{
-		}
-		[Test]
-		public void Test_8078()
-		{
-		}
-		[Test]
-		public void Test_8079()
-		{
-		}
-		[Test]
-		public void Test_8080()
-		{
-		}
-		[Test]
-		public void Test_8081()
-		{
-		}
-		[Test]
-		public void Test_8082()
-		{
-		}
-		[Test]
-		public void Test_8083()
-		{
-		}
-		[Test]
-		public void Test_8084()
-		{
-		}
-		[Test]
-		public void Test_8085()
-		{
-		}
-		[Test]
-		public void Test_8086()
-		{
-		}
-		[Test]
-		public void Test_8087()
-		{
-		}
-		[Test]
-		public void Test_8088()
-		{
-		}
-		[Test]
-		public void Test_8089()
-		{
-		}
-		[Test]
-		public void Test_8090()
-		{
-		}
-		[Test]
-		public void Test_8091()
-		{
-		}
-		[Test]
-		public void Test_8092()
-		{
-		}
-		[Test]
-		public void Test_8093()
-		{
-		}
-		[Test]
-		public void Test_8094()
-		{
-		}
-		[Test]
-		public void Test_8095()
-		{
-		}
-		[Test]
-		public void Test_8096()
-		{
-		}
-		[Test]
-		public void Test_8097()
-		{
-		}
-		[Test]
-		public void Test_8098()
-		{
-		}
-		[Test]
-		public void Test_8099()
-		{
-		}
-		[Test]
-		public void Test_8100()
-		{
-		}
-		[Test]
-		public void Test_8101()
-		{
-		}
-		[Test]
-		public void Test_8102()
-		{
-		}
-		[Test]
-		public void Test_8103()
-		{
-		}
-		[Test]
-		public void Test_8104()
-		{
-		}
-		[Test]
-		public void Test_8105()
-		{
-		}
-		[Test]
-		public void Test_8106()
-		{
-		}
-		[Test]
-		public void Test_8107()
-		{
-		}
-		[Test]
-		public void Test_8108()
-		{
-		}
-		[Test]
-		public void Test_8109()
-		{
-		}
-		[Test]
-		public void Test_8110()
-		{
-		}
-		[Test]
-		public void Test_8111()
-		{
-		}
-		[Test]
-		public void Test_8112()
-		{
-		}
-		[Test]
-		public void Test_8113()
-		{
-		}
-		[Test]
-		public void Test_8114()
-		{
-		}
-		[Test]
-		public void Test_8115()
-		{
-		}
-		[Test]
-		public void Test_8116()
-		{
-		}
-		[Test]
-		public void Test_8117()
-		{
-		}
-		[Test]
-		public void Test_8118()
-		{
-		}
-		[Test]
-		public void Test_8119()
-		{
-		}
-		[Test]
-		public void Test_8120()
-		{
-		}
-		[Test]
-		public void Test_8121()
-		{
-		}
-		[Test]
-		public void Test_8122()
-		{
-		}
-		[Test]
-		public void Test_8123()
-		{
-		}
-		[Test]
-		public void Test_8124()
-		{
-		}
-		[Test]
-		public void Test_8125()
-		{
-		}
-		[Test]
-		public void Test_8126()
-		{
-		}
-		[Test]
-		public void Test_8127()
-		{
-		}
-		[Test]
-		public void Test_8128()
-		{
-		}
-		[Test]
-		public void Test_8129()
-		{
-		}
-		[Test]
-		public void Test_8130()
-		{
-		}
-		[Test]
-		public void Test_8131()
-		{
-		}
-		[Test]
-		public void Test_8132()
-		{
-		}
-		[Test]
-		public void Test_8133()
-		{
-		}
-		[Test]
-		public void Test_8134()
-		{
-		}
-		[Test]
-		public void Test_8135()
-		{
-		}
-		[Test]
-		public void Test_8136()
-		{
-		}
-		[Test]
-		public void Test_8137()
-		{
-		}
-		[Test]
-		public void Test_8138()
-		{
-		}
-		[Test]
-		public void Test_8139()
-		{
-		}
-		[Test]
-		public void Test_8140()
-		{
-		}
-		[Test]
-		public void Test_8141()
-		{
-		}
-		[Test]
-		public void Test_8142()
-		{
-		}
-		[Test]
-		public void Test_8143()
-		{
-		}
-		[Test]
-		public void Test_8144()
-		{
-		}
-		[Test]
-		public void Test_8145()
-		{
-		}
-		[Test]
-		public void Test_8146()
-		{
-		}
-		[Test]
-		public void Test_8147()
-		{
-		}
-		[Test]
-		public void Test_8148()
-		{
-		}
-		[Test]
-		public void Test_8149()
-		{
-		}
-		[Test]
-		public void Test_8150()
-		{
-		}
-		[Test]
-		public void Test_8151()
-		{
-		}
-		[Test]
-		public void Test_8152()
-		{
-		}
-		[Test]
-		public void Test_8153()
-		{
-		}
-		[Test]
-		public void Test_8154()
-		{
-		}
-		[Test]
-		public void Test_8155()
-		{
-		}
-		[Test]
-		public void Test_8156()
-		{
-		}
-		[Test]
-		public void Test_8157()
-		{
-		}
-		[Test]
-		public void Test_8158()
-		{
-		}
-		[Test]
-		public void Test_8159()
-		{
-		}
-		[Test]
-		public void Test_8160()
-		{
-		}
-		[Test]
-		public void Test_8161()
-		{
-		}
-		[Test]
-		public void Test_8162()
-		{
-		}
-		[Test]
-		public void Test_8163()
-		{
-		}
-		[Test]
-		public void Test_8164()
-		{
-		}
-		[Test]
-		public void Test_8165()
-		{
-		}
-		[Test]
-		public void Test_8166()
-		{
-		}
-		[Test]
-		public void Test_8167()
-		{
-		}
-		[Test]
-		public void Test_8168()
-		{
-		}
-		[Test]
-		public void Test_8169()
-		{
-		}
-		[Test]
-		public void Test_8170()
-		{
-		}
-		[Test]
-		public void Test_8171()
-		{
-		}
-		[Test]
-		public void Test_8172()
-		{
-		}
-		[Test]
-		public void Test_8173()
-		{
-		}
-		[Test]
-		public void Test_8174()
-		{
-		}
-		[Test]
-		public void Test_8175()
-		{
-		}
-		[Test]
-		public void Test_8176()
-		{
-		}
-		[Test]
-		public void Test_8177()
-		{
-		}
-		[Test]
-		public void Test_8178()
-		{
-		}
-		[Test]
-		public void Test_8179()
-		{
-		}
-		[Test]
-		public void Test_8180()
-		{
-		}
-		[Test]
-		public void Test_8181()
-		{
-		}
-		[Test]
-		public void Test_8182()
-		{
-		}
-		[Test]
-		public void Test_8183()
-		{
-		}
-		[Test]
-		public void Test_8184()
-		{
-		}
-		[Test]
-		public void Test_8185()
-		{
-		}
-		[Test]
-		public void Test_8186()
-		{
-		}
-		[Test]
-		public void Test_8187()
-		{
-		}
-		[Test]
-		public void Test_8188()
-		{
-		}
-		[Test]
-		public void Test_8189()
-		{
-		}
-		[Test]
-		public void Test_8190()
-		{
-		}
-		[Test]
-		public void Test_8191()
-		{
-		}
-		[Test]
-		public void Test_8192()
-		{
-		}
-		[Test]
-		public void Test_8193()
-		{
-		}
-		[Test]
-		public void Test_8194()
-		{
-		}
-		[Test]
-		public void Test_8195()
-		{
-		}
-		[Test]
-		public void Test_8196()
-		{
-		}
-		[Test]
-		public void Test_8197()
-		{
-		}
-		[Test]
-		public void Test_8198()
-		{
-		}
-		[Test]
-		public void Test_8199()
-		{
-		}
-		[Test]
-		public void Test_8200()
-		{
-		}
-		[Test]
-		public void Test_8201()
-		{
-		}
-		[Test]
-		public void Test_8202()
-		{
-		}
-		[Test]
-		public void Test_8203()
-		{
-		}
-		[Test]
-		public void Test_8204()
-		{
-		}
-		[Test]
-		public void Test_8205()
-		{
-		}
-		[Test]
-		public void Test_8206()
-		{
-		}
-		[Test]
-		public void Test_8207()
-		{
-		}
-		[Test]
-		public void Test_8208()
-		{
-		}
-		[Test]
-		public void Test_8209()
-		{
-		}
-		[Test]
-		public void Test_8210()
-		{
-		}
-		[Test]
-		public void Test_8211()
-		{
-		}
-		[Test]
-		public void Test_8212()
-		{
-		}
-		[Test]
-		public void Test_8213()
-		{
-		}
-		[Test]
-		public void Test_8214()
-		{
-		}
-		[Test]
-		public void Test_8215()
-		{
-		}
-		[Test]
-		public void Test_8216()
-		{
-		}
-		[Test]
-		public void Test_8217()
-		{
-		}
-		[Test]
-		public void Test_8218()
-		{
-		}
-		[Test]
-		public void Test_8219()
-		{
-		}
-		[Test]
-		public void Test_8220()
-		{
-		}
-		[Test]
-		public void Test_8221()
-		{
-		}
-		[Test]
-		public void Test_8222()
-		{
-		}
-		[Test]
-		public void Test_8223()
-		{
-		}
-		[Test]
-		public void Test_8224()
-		{
-		}
-		[Test]
-		public void Test_8225()
-		{
-		}
-		[Test]
-		public void Test_8226()
-		{
-		}
-		[Test]
-		public void Test_8227()
-		{
-		}
-		[Test]
-		public void Test_8228()
-		{
-		}
-		[Test]
-		public void Test_8229()
-		{
-		}
-		[Test]
-		public void Test_8230()
-		{
-		}
-		[Test]
-		public void Test_8231()
-		{
-		}
-		[Test]
-		public void Test_8232()
-		{
-		}
-		[Test]
-		public void Test_8233()
-		{
-		}
-		[Test]
-		public void Test_8234()
-		{
-		}
-		[Test]
-		public void Test_8235()
-		{
-		}
-		[Test]
-		public void Test_8236()
-		{
-		}
-		[Test]
-		public void Test_8237()
-		{
-		}
-		[Test]
-		public void Test_8238()
-		{
-		}
-		[Test]
-		public void Test_8239()
-		{
-		}
-		[Test]
-		public void Test_8240()
-		{
-		}
-		[Test]
-		public void Test_8241()
-		{
-		}
-		[Test]
-		public void Test_8242()
-		{
-		}
-		[Test]
-		public void Test_8243()
-		{
-		}
-		[Test]
-		public void Test_8244()
-		{
-		}
-		[Test]
-		public void Test_8245()
-		{
-		}
-		[Test]
-		public void Test_8246()
-		{
-		}
-		[Test]
-		public void Test_8247()
-		{
-		}
-		[Test]
-		public void Test_8248()
-		{
-		}
-		[Test]
-		public void Test_8249()
-		{
-		}
-		[Test]
-		public void Test_8250()
-		{
-		}
-		[Test]
-		public void Test_8251()
-		{
-		}
-		[Test]
-		public void Test_8252()
-		{
-		}
-		[Test]
-		public void Test_8253()
-		{
-		}
-		[Test]
-		public void Test_8254()
-		{
-		}
-		[Test]
-		public void Test_8255()
-		{
-		}
-		[Test]
-		public void Test_8256()
-		{
-		}
-		[Test]
-		public void Test_8257()
-		{
-		}
-		[Test]
-		public void Test_8258()
-		{
-		}
-		[Test]
-		public void Test_8259()
-		{
-		}
-		[Test]
-		public void Test_8260()
-		{
-		}
-		[Test]
-		public void Test_8261()
-		{
-		}
-		[Test]
-		public void Test_8262()
-		{
-		}
-		[Test]
-		public void Test_8263()
-		{
-		}
-		[Test]
-		public void Test_8264()
-		{
-		}
-		[Test]
-		public void Test_8265()
-		{
-		}
-		[Test]
-		public void Test_8266()
-		{
-		}
-		[Test]
-		public void Test_8267()
-		{
-		}
-		[Test]
-		public void Test_8268()
-		{
-		}
-		[Test]
-		public void Test_8269()
-		{
-		}
-		[Test]
-		public void Test_8270()
-		{
-		}
-		[Test]
-		public void Test_8271()
-		{
-		}
-		[Test]
-		public void Test_8272()
-		{
-		}
-		[Test]
-		public void Test_8273()
-		{
-		}
-		[Test]
-		public void Test_8274()
-		{
-		}
-		[Test]
-		public void Test_8275()
-		{
-		}
-		[Test]
-		public void Test_8276()
-		{
-		}
-		[Test]
-		public void Test_8277()
-		{
-		}
-		[Test]
-		public void Test_8278()
-		{
-		}
-		[Test]
-		public void Test_8279()
-		{
-		}
-		[Test]
-		public void Test_8280()
-		{
-		}
-		[Test]
-		public void Test_8281()
-		{
-		}
-		[Test]
-		public void Test_8282()
-		{
-		}
-		[Test]
-		public void Test_8283()
-		{
-		}
-		[Test]
-		public void Test_8284()
-		{
-		}
-		[Test]
-		public void Test_8285()
-		{
-		}
-		[Test]
-		public void Test_8286()
-		{
-		}
-		[Test]
-		public void Test_8287()
-		{
-		}
-		[Test]
-		public void Test_8288()
-		{
-		}
-		[Test]
-		public void Test_8289()
-		{
-		}
-		[Test]
-		public void Test_8290()
-		{
-		}
-		[Test]
-		public void Test_8291()
-		{
-		}
-		[Test]
-		public void Test_8292()
-		{
-		}
-		[Test]
-		public void Test_8293()
-		{
-		}
-		[Test]
-		public void Test_8294()
-		{
-		}
-		[Test]
-		public void Test_8295()
-		{
-		}
-		[Test]
-		public void Test_8296()
-		{
-		}
-		[Test]
-		public void Test_8297()
-		{
-		}
-		[Test]
-		public void Test_8298()
-		{
-		}
-		[Test]
-		public void Test_8299()
-		{
-		}
-		[Test]
-		public void Test_8300()
-		{
-		}
-		[Test]
-		public void Test_8301()
-		{
-		}
-		[Test]
-		public void Test_8302()
-		{
-		}
-		[Test]
-		public void Test_8303()
-		{
-		}
-		[Test]
-		public void Test_8304()
-		{
-		}
-		[Test]
-		public void Test_8305()
-		{
-		}
-		[Test]
-		public void Test_8306()
-		{
-		}
-		[Test]
-		public void Test_8307()
-		{
-		}
-		[Test]
-		public void Test_8308()
-		{
-		}
-		[Test]
-		public void Test_8309()
-		{
-		}
-		[Test]
-		public void Test_8310()
-		{
-		}
-		[Test]
-		public void Test_8311()
-		{
-		}
-		[Test]
-		public void Test_8312()
-		{
-		}
-		[Test]
-		public void Test_8313()
-		{
-		}
-		[Test]
-		public void Test_8314()
-		{
-		}
-		[Test]
-		public void Test_8315()
-		{
-		}
-		[Test]
-		public void Test_8316()
-		{
-		}
-		[Test]
-		public void Test_8317()
-		{
-		}
-		[Test]
-		public void Test_8318()
-		{
-		}
-		[Test]
-		public void Test_8319()
-		{
-		}
-		[Test]
-		public void Test_8320()
-		{
-		}
-		[Test]
-		public void Test_8321()
-		{
-		}
-		[Test]
-		public void Test_8322()
-		{
-		}
-		[Test]
-		public void Test_8323()
-		{
-		}
-		[Test]
-		public void Test_8324()
-		{
-		}
-		[Test]
-		public void Test_8325()
-		{
-		}
-		[Test]
-		public void Test_8326()
-		{
-		}
-		[Test]
-		public void Test_8327()
-		{
-		}
-		[Test]
-		public void Test_8328()
-		{
-		}
-		[Test]
-		public void Test_8329()
-		{
-		}
-		[Test]
-		public void Test_8330()
-		{
-		}
-		[Test]
-		public void Test_8331()
-		{
-		}
-		[Test]
-		public void Test_8332()
-		{
-		}
-		[Test]
-		public void Test_8333()
-		{
-		}
-		[Test]
-		public void Test_8334()
-		{
-		}
-		[Test]
-		public void Test_8335()
-		{
-		}
-		[Test]
-		public void Test_8336()
-		{
-		}
-		[Test]
-		public void Test_8337()
-		{
-		}
-		[Test]
-		public void Test_8338()
-		{
-		}
-		[Test]
-		public void Test_8339()
-		{
-		}
-		[Test]
-		public void Test_8340()
-		{
-		}
-		[Test]
-		public void Test_8341()
-		{
-		}
-		[Test]
-		public void Test_8342()
-		{
-		}
-		[Test]
-		public void Test_8343()
-		{
-		}
-		[Test]
-		public void Test_8344()
-		{
-		}
-		[Test]
-		public void Test_8345()
-		{
-		}
-		[Test]
-		public void Test_8346()
-		{
-		}
-		[Test]
-		public void Test_8347()
-		{
-		}
-		[Test]
-		public void Test_8348()
-		{
-		}
-		[Test]
-		public void Test_8349()
-		{
-		}
-		[Test]
-		public void Test_8350()
-		{
-		}
-		[Test]
-		public void Test_8351()
-		{
-		}
-		[Test]
-		public void Test_8352()
-		{
-		}
-		[Test]
-		public void Test_8353()
-		{
-		}
-		[Test]
-		public void Test_8354()
-		{
-		}
-		[Test]
-		public void Test_8355()
-		{
-		}
-		[Test]
-		public void Test_8356()
-		{
-		}
-		[Test]
-		public void Test_8357()
-		{
-		}
-		[Test]
-		public void Test_8358()
-		{
-		}
-		[Test]
-		public void Test_8359()
-		{
-		}
-		[Test]
-		public void Test_8360()
-		{
-		}
-		[Test]
-		public void Test_8361()
-		{
-		}
-		[Test]
-		public void Test_8362()
-		{
-		}
-		[Test]
-		public void Test_8363()
-		{
-		}
-		[Test]
-		public void Test_8364()
-		{
-		}
-		[Test]
-		public void Test_8365()
-		{
-		}
-		[Test]
-		public void Test_8366()
-		{
-		}
-		[Test]
-		public void Test_8367()
-		{
-		}
-		[Test]
-		public void Test_8368()
-		{
-		}
-		[Test]
-		public void Test_8369()
-		{
-		}
-		[Test]
-		public void Test_8370()
-		{
-		}
-		[Test]
-		public void Test_8371()
-		{
-		}
-		[Test]
-		public void Test_8372()
-		{
-		}
-		[Test]
-		public void Test_8373()
-		{
-		}
-		[Test]
-		public void Test_8374()
-		{
-		}
-		[Test]
-		public void Test_8375()
-		{
-		}
-		[Test]
-		public void Test_8376()
-		{
-		}
-		[Test]
-		public void Test_8377()
-		{
-		}
-		[Test]
-		public void Test_8378()
-		{
-		}
-		[Test]
-		public void Test_8379()
-		{
-		}
-		[Test]
-		public void Test_8380()
-		{
-		}
-		[Test]
-		public void Test_8381()
-		{
-		}
-		[Test]
-		public void Test_8382()
-		{
-		}
-		[Test]
-		public void Test_8383()
-		{
-		}
-		[Test]
-		public void Test_8384()
-		{
-		}
-		[Test]
-		public void Test_8385()
-		{
-		}
-		[Test]
-		public void Test_8386()
-		{
-		}
-		[Test]
-		public void Test_8387()
-		{
-		}
-		[Test]
-		public void Test_8388()
-		{
-		}
-		[Test]
-		public void Test_8389()
-		{
-		}
-		[Test]
-		public void Test_8390()
-		{
-		}
-		[Test]
-		public void Test_8391()
-		{
-		}
-		[Test]
-		public void Test_8392()
-		{
-		}
-		[Test]
-		public void Test_8393()
-		{
-		}
-		[Test]
-		public void Test_8394()
-		{
-		}
-		[Test]
-		public void Test_8395()
-		{
-		}
-		[Test]
-		public void Test_8396()
-		{
-		}
-		[Test]
-		public void Test_8397()
-		{
-		}
-		[Test]
-		public void Test_8398()
-		{
-		}
-		[Test]
-		public void Test_8399()
-		{
-		}
-		[Test]
-		public void Test_8400()
-		{
-		}
-		[Test]
-		public void Test_8401()
-		{
-		}
-		[Test]
-		public void Test_8402()
-		{
-		}
-		[Test]
-		public void Test_8403()
-		{
-		}
-		[Test]
-		public void Test_8404()
-		{
-		}
-		[Test]
-		public void Test_8405()
-		{
-		}
-		[Test]
-		public void Test_8406()
-		{
-		}
-		[Test]
-		public void Test_8407()
-		{
-		}
-		[Test]
-		public void Test_8408()
-		{
-		}
-		[Test]
-		public void Test_8409()
-		{
-		}
-		[Test]
-		public void Test_8410()
-		{
-		}
-		[Test]
-		public void Test_8411()
-		{
-		}
-		[Test]
-		public void Test_8412()
-		{
-		}
-		[Test]
-		public void Test_8413()
-		{
-		}
-		[Test]
-		public void Test_8414()
-		{
-		}
-		[Test]
-		public void Test_8415()
-		{
-		}
-		[Test]
-		public void Test_8416()
-		{
-		}
-		[Test]
-		public void Test_8417()
-		{
-		}
-		[Test]
-		public void Test_8418()
-		{
-		}
-		[Test]
-		public void Test_8419()
-		{
-		}
-		[Test]
-		public void Test_8420()
-		{
-		}
-		[Test]
-		public void Test_8421()
-		{
-		}
-		[Test]
-		public void Test_8422()
-		{
-		}
-		[Test]
-		public void Test_8423()
-		{
-		}
-		[Test]
-		public void Test_8424()
-		{
-		}
-		[Test]
-		public void Test_8425()
-		{
-		}
-		[Test]
-		public void Test_8426()
-		{
-		}
-		[Test]
-		public void Test_8427()
-		{
-		}
-		[Test]
-		public void Test_8428()
-		{
-		}
-		[Test]
-		public void Test_8429()
-		{
-		}
-		[Test]
-		public void Test_8430()
-		{
-		}
-		[Test]
-		public void Test_8431()
-		{
-		}
-		[Test]
-		public void Test_8432()
-		{
-		}
-		[Test]
-		public void Test_8433()
-		{
-		}
-		[Test]
-		public void Test_8434()
-		{
-		}
-		[Test]
-		public void Test_8435()
-		{
-		}
-		[Test]
-		public void Test_8436()
-		{
-		}
-		[Test]
-		public void Test_8437()
-		{
-		}
-		[Test]
-		public void Test_8438()
-		{
-		}
-		[Test]
-		public void Test_8439()
-		{
-		}
-		[Test]
-		public void Test_8440()
-		{
-		}
-		[Test]
-		public void Test_8441()
-		{
-		}
-		[Test]
-		public void Test_8442()
-		{
-		}
-		[Test]
-		public void Test_8443()
-		{
-		}
-		[Test]
-		public void Test_8444()
-		{
-		}
-		[Test]
-		public void Test_8445()
-		{
-		}
-		[Test]
-		public void Test_8446()
-		{
-		}
-		[Test]
-		public void Test_8447()
-		{
-		}
-		[Test]
-		public void Test_8448()
-		{
-		}
-		[Test]
-		public void Test_8449()
-		{
-		}
-		[Test]
-		public void Test_8450()
-		{
-		}
-		[Test]
-		public void Test_8451()
-		{
-		}
-		[Test]
-		public void Test_8452()
-		{
-		}
-		[Test]
-		public void Test_8453()
-		{
-		}
-		[Test]
-		public void Test_8454()
-		{
-		}
-		[Test]
-		public void Test_8455()
-		{
-		}
-		[Test]
-		public void Test_8456()
-		{
-		}
-		[Test]
-		public void Test_8457()
-		{
-		}
-		[Test]
-		public void Test_8458()
-		{
-		}
-		[Test]
-		public void Test_8459()
-		{
-		}
-		[Test]
-		public void Test_8460()
-		{
-		}
-		[Test]
-		public void Test_8461()
-		{
-		}
-		[Test]
-		public void Test_8462()
-		{
-		}
-		[Test]
-		public void Test_8463()
-		{
-		}
-		[Test]
-		public void Test_8464()
-		{
-		}
-		[Test]
-		public void Test_8465()
-		{
-		}
-		[Test]
-		public void Test_8466()
-		{
-		}
-		[Test]
-		public void Test_8467()
-		{
-		}
-		[Test]
-		public void Test_8468()
-		{
-		}
-		[Test]
-		public void Test_8469()
-		{
-		}
-		[Test]
-		public void Test_8470()
-		{
-		}
-		[Test]
-		public void Test_8471()
-		{
-		}
-		[Test]
-		public void Test_8472()
-		{
-		}
-		[Test]
-		public void Test_8473()
-		{
-		}
-		[Test]
-		public void Test_8474()
-		{
-		}
-		[Test]
-		public void Test_8475()
-		{
-		}
-		[Test]
-		public void Test_8476()
-		{
-		}
-		[Test]
-		public void Test_8477()
-		{
-		}
-		[Test]
-		public void Test_8478()
-		{
-		}
-		[Test]
-		public void Test_8479()
-		{
-		}
-		[Test]
-		public void Test_8480()
-		{
-		}
-		[Test]
-		public void Test_8481()
-		{
-		}
-		[Test]
-		public void Test_8482()
-		{
-		}
-		[Test]
-		public void Test_8483()
-		{
-		}
-		[Test]
-		public void Test_8484()
-		{
-		}
-		[Test]
-		public void Test_8485()
-		{
-		}
-		[Test]
-		public void Test_8486()
-		{
-		}
-		[Test]
-		public void Test_8487()
-		{
-		}
-		[Test]
-		public void Test_8488()
-		{
-		}
-		[Test]
-		public void Test_8489()
-		{
-		}
-		[Test]
-		public void Test_8490()
-		{
-		}
-		[Test]
-		public void Test_8491()
-		{
-		}
-		[Test]
-		public void Test_8492()
-		{
-		}
-		[Test]
-		public void Test_8493()
-		{
-		}
-		[Test]
-		public void Test_8494()
-		{
-		}
-		[Test]
-		public void Test_8495()
-		{
-		}
-		[Test]
-		public void Test_8496()
-		{
-		}
-		[Test]
-		public void Test_8497()
-		{
-		}
-		[Test]
-		public void Test_8498()
-		{
-		}
-		[Test]
-		public void Test_8499()
-		{
-		}
-		[Test]
-		public void Test_8500()
-		{
-		}
-		[Test]
-		public void Test_8501()
-		{
-		}
-		[Test]
-		public void Test_8502()
-		{
-		}
-		[Test]
-		public void Test_8503()
-		{
-		}
-		[Test]
-		public void Test_8504()
-		{
-		}
-		[Test]
-		public void Test_8505()
-		{
-		}
-		[Test]
-		public void Test_8506()
-		{
-		}
-		[Test]
-		public void Test_8507()
-		{
-		}
-		[Test]
-		public void Test_8508()
-		{
-		}
-		[Test]
-		public void Test_8509()
-		{
-		}
-		[Test]
-		public void Test_8510()
-		{
-		}
-		[Test]
-		public void Test_8511()
-		{
-		}
-		[Test]
-		public void Test_8512()
-		{
-		}
-		[Test]
-		public void Test_8513()
-		{
-		}
-		[Test]
-		public void Test_8514()
-		{
-		}
-		[Test]
-		public void Test_8515()
-		{
-		}
-		[Test]
-		public void Test_8516()
-		{
-		}
-		[Test]
-		public void Test_8517()
-		{
-		}
-		[Test]
-		public void Test_8518()
-		{
-		}
-		[Test]
-		public void Test_8519()
-		{
-		}
-		[Test]
-		public void Test_8520()
-		{
-		}
-		[Test]
-		public void Test_8521()
-		{
-		}
-		[Test]
-		public void Test_8522()
-		{
-		}
-		[Test]
-		public void Test_8523()
-		{
-		}
-		[Test]
-		public void Test_8524()
-		{
-		}
-		[Test]
-		public void Test_8525()
-		{
-		}
-		[Test]
-		public void Test_8526()
-		{
-		}
-		[Test]
-		public void Test_8527()
-		{
-		}
-		[Test]
-		public void Test_8528()
-		{
-		}
-		[Test]
-		public void Test_8529()
-		{
-		}
-		[Test]
-		public void Test_8530()
-		{
-		}
-		[Test]
-		public void Test_8531()
-		{
-		}
-		[Test]
-		public void Test_8532()
-		{
-		}
-		[Test]
-		public void Test_8533()
-		{
-		}
-		[Test]
-		public void Test_8534()
-		{
-		}
-		[Test]
-		public void Test_8535()
-		{
-		}
-		[Test]
-		public void Test_8536()
-		{
-		}
-		[Test]
-		public void Test_8537()
-		{
-		}
-		[Test]
-		public void Test_8538()
-		{
-		}
-		[Test]
-		public void Test_8539()
-		{
-		}
-		[Test]
-		public void Test_8540()
-		{
-		}
-		[Test]
-		public void Test_8541()
-		{
-		}
-		[Test]
-		public void Test_8542()
-		{
-		}
-		[Test]
-		public void Test_8543()
-		{
-		}
-		[Test]
-		public void Test_8544()
-		{
-		}
-		[Test]
-		public void Test_8545()
-		{
-		}
-		[Test]
-		public void Test_8546()
-		{
-		}
-		[Test]
-		public void Test_8547()
-		{
-		}
-		[Test]
-		public void Test_8548()
-		{
-		}
-		[Test]
-		public void Test_8549()
-		{
-		}
-		[Test]
-		public void Test_8550()
-		{
-		}
-		[Test]
-		public void Test_8551()
-		{
-		}
-		[Test]
-		public void Test_8552()
-		{
-		}
-		[Test]
-		public void Test_8553()
-		{
-		}
-		[Test]
-		public void Test_8554()
-		{
-		}
-		[Test]
-		public void Test_8555()
-		{
-		}
-		[Test]
-		public void Test_8556()
-		{
-		}
-		[Test]
-		public void Test_8557()
-		{
-		}
-		[Test]
-		public void Test_8558()
-		{
-		}
-		[Test]
-		public void Test_8559()
-		{
-		}
-		[Test]
-		public void Test_8560()
-		{
-		}
-		[Test]
-		public void Test_8561()
-		{
-		}
-		[Test]
-		public void Test_8562()
-		{
-		}
-		[Test]
-		public void Test_8563()
-		{
-		}
-		[Test]
-		public void Test_8564()
-		{
-		}
-		[Test]
-		public void Test_8565()
-		{
-		}
-		[Test]
-		public void Test_8566()
-		{
-		}
-		[Test]
-		public void Test_8567()
-		{
-		}
-		[Test]
-		public void Test_8568()
-		{
-		}
-		[Test]
-		public void Test_8569()
-		{
-		}
-		[Test]
-		public void Test_8570()
-		{
-		}
-		[Test]
-		public void Test_8571()
-		{
-		}
-		[Test]
-		public void Test_8572()
-		{
-		}
-		[Test]
-		public void Test_8573()
-		{
-		}
-		[Test]
-		public void Test_8574()
-		{
-		}
-		[Test]
-		public void Test_8575()
-		{
-		}
-		[Test]
-		public void Test_8576()
-		{
-		}
-		[Test]
-		public void Test_8577()
-		{
-		}
-		[Test]
-		public void Test_8578()
-		{
-		}
-		[Test]
-		public void Test_8579()
-		{
-		}
-		[Test]
-		public void Test_8580()
-		{
-		}
-		[Test]
-		public void Test_8581()
-		{
-		}
-		[Test]
-		public void Test_8582()
-		{
-		}
-		[Test]
-		public void Test_8583()
-		{
-		}
-		[Test]
-		public void Test_8584()
-		{
-		}
-		[Test]
-		public void Test_8585()
-		{
-		}
-		[Test]
-		public void Test_8586()
-		{
-		}
-		[Test]
-		public void Test_8587()
-		{
-		}
-		[Test]
-		public void Test_8588()
-		{
-		}
-		[Test]
-		public void Test_8589()
-		{
-		}
-		[Test]
-		public void Test_8590()
-		{
-		}
-		[Test]
-		public void Test_8591()
-		{
-		}
-		[Test]
-		public void Test_8592()
-		{
-		}
-		[Test]
-		public void Test_8593()
-		{
-		}
-		[Test]
-		public void Test_8594()
-		{
-		}
-		[Test]
-		public void Test_8595()
-		{
-		}
-		[Test]
-		public void Test_8596()
-		{
-		}
-		[Test]
-		public void Test_8597()
-		{
-		}
-		[Test]
-		public void Test_8598()
-		{
-		}
-		[Test]
-		public void Test_8599()
-		{
-		}
-		[Test]
-		public void Test_8600()
-		{
-		}
-		[Test]
-		public void Test_8601()
-		{
-		}
-		[Test]
-		public void Test_8602()
-		{
-		}
-		[Test]
-		public void Test_8603()
-		{
-		}
-		[Test]
-		public void Test_8604()
-		{
-		}
-		[Test]
-		public void Test_8605()
-		{
-		}
-		[Test]
-		public void Test_8606()
-		{
-		}
-		[Test]
-		public void Test_8607()
-		{
-		}
-		[Test]
-		public void Test_8608()
-		{
-		}
-		[Test]
-		public void Test_8609()
-		{
-		}
-		[Test]
-		public void Test_8610()
-		{
-		}
-		[Test]
-		public void Test_8611()
-		{
-		}
-		[Test]
-		public void Test_8612()
-		{
-		}
-		[Test]
-		public void Test_8613()
-		{
-		}
-		[Test]
-		public void Test_8614()
-		{
-		}
-		[Test]
-		public void Test_8615()
-		{
-		}
-		[Test]
-		public void Test_8616()
-		{
-		}
-		[Test]
-		public void Test_8617()
-		{
-		}
-		[Test]
-		public void Test_8618()
-		{
-		}
-		[Test]
-		public void Test_8619()
-		{
-		}
-		[Test]
-		public void Test_8620()
-		{
-		}
-		[Test]
-		public void Test_8621()
-		{
-		}
-		[Test]
-		public void Test_8622()
-		{
-		}
-		[Test]
-		public void Test_8623()
-		{
-		}
-		[Test]
-		public void Test_8624()
-		{
-		}
-		[Test]
-		public void Test_8625()
-		{
-		}
-		[Test]
-		public void Test_8626()
-		{
-		}
-		[Test]
-		public void Test_8627()
-		{
-		}
-		[Test]
-		public void Test_8628()
-		{
-		}
-		[Test]
-		public void Test_8629()
-		{
-		}
-		[Test]
-		public void Test_8630()
-		{
-		}
-		[Test]
-		public void Test_8631()
-		{
-		}
-		[Test]
-		public void Test_8632()
-		{
-		}
-		[Test]
-		public void Test_8633()
-		{
-		}
-		[Test]
-		public void Test_8634()
-		{
-		}
-		[Test]
-		public void Test_8635()
-		{
-		}
-		[Test]
-		public void Test_8636()
-		{
-		}
-		[Test]
-		public void Test_8637()
-		{
-		}
-		[Test]
-		public void Test_8638()
-		{
-		}
-		[Test]
-		public void Test_8639()
-		{
-		}
-		[Test]
-		public void Test_8640()
-		{
-		}
-		[Test]
-		public void Test_8641()
-		{
-		}
-		[Test]
-		public void Test_8642()
-		{
-		}
-		[Test]
-		public void Test_8643()
-		{
-		}
-		[Test]
-		public void Test_8644()
-		{
-		}
-		[Test]
-		public void Test_8645()
-		{
-		}
-		[Test]
-		public void Test_8646()
-		{
-		}
-		[Test]
-		public void Test_8647()
-		{
-		}
-		[Test]
-		public void Test_8648()
-		{
-		}
-		[Test]
-		public void Test_8649()
-		{
-		}
-		[Test]
-		public void Test_8650()
-		{
-		}
-		[Test]
-		public void Test_8651()
-		{
-		}
-		[Test]
-		public void Test_8652()
-		{
-		}
-		[Test]
-		public void Test_8653()
-		{
-		}
-		[Test]
-		public void Test_8654()
-		{
-		}
-		[Test]
-		public void Test_8655()
-		{
-		}
-		[Test]
-		public void Test_8656()
-		{
-		}
-		[Test]
-		public void Test_8657()
-		{
-		}
-		[Test]
-		public void Test_8658()
-		{
-		}
-		[Test]
-		public void Test_8659()
-		{
-		}
-		[Test]
-		public void Test_8660()
-		{
-		}
-		[Test]
-		public void Test_8661()
-		{
-		}
-		[Test]
-		public void Test_8662()
-		{
-		}
-		[Test]
-		public void Test_8663()
-		{
-		}
-		[Test]
-		public void Test_8664()
-		{
-		}
-		[Test]
-		public void Test_8665()
-		{
-		}
-		[Test]
-		public void Test_8666()
-		{
-		}
-		[Test]
-		public void Test_8667()
-		{
-		}
-		[Test]
-		public void Test_8668()
-		{
-		}
-		[Test]
-		public void Test_8669()
-		{
-		}
-		[Test]
-		public void Test_8670()
-		{
-		}
-		[Test]
-		public void Test_8671()
-		{
-		}
-		[Test]
-		public void Test_8672()
-		{
-		}
-		[Test]
-		public void Test_8673()
-		{
-		}
-		[Test]
-		public void Test_8674()
-		{
-		}
-		[Test]
-		public void Test_8675()
-		{
-		}
-		[Test]
-		public void Test_8676()
-		{
-		}
-		[Test]
-		public void Test_8677()
-		{
-		}
-		[Test]
-		public void Test_8678()
-		{
-		}
-		[Test]
-		public void Test_8679()
-		{
-		}
-		[Test]
-		public void Test_8680()
-		{
-		}
-		[Test]
-		public void Test_8681()
-		{
-		}
-		[Test]
-		public void Test_8682()
-		{
-		}
-		[Test]
-		public void Test_8683()
-		{
-		}
-		[Test]
-		public void Test_8684()
-		{
-		}
-		[Test]
-		public void Test_8685()
-		{
-		}
-		[Test]
-		public void Test_8686()
-		{
-		}
-		[Test]
-		public void Test_8687()
-		{
-		}
-		[Test]
-		public void Test_8688()
-		{
-		}
-		[Test]
-		public void Test_8689()
-		{
-		}
-		[Test]
-		public void Test_8690()
-		{
-		}
-		[Test]
-		public void Test_8691()
-		{
-		}
-		[Test]
-		public void Test_8692()
-		{
-		}
-		[Test]
-		public void Test_8693()
-		{
-		}
-		[Test]
-		public void Test_8694()
-		{
-		}
-		[Test]
-		public void Test_8695()
-		{
-		}
-		[Test]
-		public void Test_8696()
-		{
-		}
-		[Test]
-		public void Test_8697()
-		{
-		}
-		[Test]
-		public void Test_8698()
-		{
-		}
-		[Test]
-		public void Test_8699()
-		{
-		}
-		[Test]
-		public void Test_8700()
-		{
-		}
-		[Test]
-		public void Test_8701()
-		{
-		}
-		[Test]
-		public void Test_8702()
-		{
-		}
-		[Test]
-		public void Test_8703()
-		{
-		}
-		[Test]
-		public void Test_8704()
-		{
-		}
-		[Test]
-		public void Test_8705()
-		{
-		}
-		[Test]
-		public void Test_8706()
-		{
-		}
-		[Test]
-		public void Test_8707()
-		{
-		}
-		[Test]
-		public void Test_8708()
-		{
-		}
-		[Test]
-		public void Test_8709()
-		{
-		}
-		[Test]
-		public void Test_8710()
-		{
-		}
-		[Test]
-		public void Test_8711()
-		{
-		}
-		[Test]
-		public void Test_8712()
-		{
-		}
-		[Test]
-		public void Test_8713()
-		{
-		}
-		[Test]
-		public void Test_8714()
-		{
-		}
-		[Test]
-		public void Test_8715()
-		{
-		}
-		[Test]
-		public void Test_8716()
-		{
-		}
-		[Test]
-		public void Test_8717()
-		{
-		}
-		[Test]
-		public void Test_8718()
-		{
-		}
-		[Test]
-		public void Test_8719()
-		{
-		}
-		[Test]
-		public void Test_8720()
-		{
-		}
-		[Test]
-		public void Test_8721()
-		{
-		}
-		[Test]
-		public void Test_8722()
-		{
-		}
-		[Test]
-		public void Test_8723()
-		{
-		}
-		[Test]
-		public void Test_8724()
-		{
-		}
-		[Test]
-		public void Test_8725()
-		{
-		}
-		[Test]
-		public void Test_8726()
-		{
-		}
-		[Test]
-		public void Test_8727()
-		{
-		}
-		[Test]
-		public void Test_8728()
-		{
-		}
-		[Test]
-		public void Test_8729()
-		{
-		}
-		[Test]
-		public void Test_8730()
-		{
-		}
-		[Test]
-		public void Test_8731()
-		{
-		}
-		[Test]
-		public void Test_8732()
-		{
-		}
-		[Test]
-		public void Test_8733()
-		{
-		}
-		[Test]
-		public void Test_8734()
-		{
-		}
-		[Test]
-		public void Test_8735()
-		{
-		}
-		[Test]
-		public void Test_8736()
-		{
-		}
-		[Test]
-		public void Test_8737()
-		{
-		}
-		[Test]
-		public void Test_8738()
-		{
-		}
-		[Test]
-		public void Test_8739()
-		{
-		}
-		[Test]
-		public void Test_8740()
-		{
-		}
-		[Test]
-		public void Test_8741()
-		{
-		}
-		[Test]
-		public void Test_8742()
-		{
-		}
-		[Test]
-		public void Test_8743()
-		{
-		}
-		[Test]
-		public void Test_8744()
-		{
-		}
-		[Test]
-		public void Test_8745()
-		{
-		}
-		[Test]
-		public void Test_8746()
-		{
-		}
-		[Test]
-		public void Test_8747()
-		{
-		}
-		[Test]
-		public void Test_8748()
-		{
-		}
-		[Test]
-		public void Test_8749()
-		{
-		}
-		[Test]
-		public void Test_8750()
-		{
-		}
-		[Test]
-		public void Test_8751()
-		{
-		}
-		[Test]
-		public void Test_8752()
-		{
-		}
-		[Test]
-		public void Test_8753()
-		{
-		}
-		[Test]
-		public void Test_8754()
-		{
-		}
-		[Test]
-		public void Test_8755()
-		{
-		}
-		[Test]
-		public void Test_8756()
-		{
-		}
-		[Test]
-		public void Test_8757()
-		{
-		}
-		[Test]
-		public void Test_8758()
-		{
-		}
-		[Test]
-		public void Test_8759()
-		{
-		}
-		[Test]
-		public void Test_8760()
-		{
-		}
-		[Test]
-		public void Test_8761()
-		{
-		}
-		[Test]
-		public void Test_8762()
-		{
-		}
-		[Test]
-		public void Test_8763()
-		{
-		}
-		[Test]
-		public void Test_8764()
-		{
-		}
-		[Test]
-		public void Test_8765()
-		{
-		}
-		[Test]
-		public void Test_8766()
-		{
-		}
-		[Test]
-		public void Test_8767()
-		{
-		}
-		[Test]
-		public void Test_8768()
-		{
-		}
-		[Test]
-		public void Test_8769()
-		{
-		}
-		[Test]
-		public void Test_8770()
-		{
-		}
-		[Test]
-		public void Test_8771()
-		{
-		}
-		[Test]
-		public void Test_8772()
-		{
-		}
-		[Test]
-		public void Test_8773()
-		{
-		}
-		[Test]
-		public void Test_8774()
-		{
-		}
-		[Test]
-		public void Test_8775()
-		{
-		}
-		[Test]
-		public void Test_8776()
-		{
-		}
-		[Test]
-		public void Test_8777()
-		{
-		}
-		[Test]
-		public void Test_8778()
-		{
-		}
-		[Test]
-		public void Test_8779()
-		{
-		}
-		[Test]
-		public void Test_8780()
-		{
-		}
-		[Test]
-		public void Test_8781()
-		{
-		}
-		[Test]
-		public void Test_8782()
-		{
-		}
-		[Test]
-		public void Test_8783()
-		{
-		}
-		[Test]
-		public void Test_8784()
-		{
-		}
-		[Test]
-		public void Test_8785()
-		{
-		}
-		[Test]
-		public void Test_8786()
-		{
-		}
-		[Test]
-		public void Test_8787()
-		{
-		}
-		[Test]
-		public void Test_8788()
-		{
-		}
-		[Test]
-		public void Test_8789()
-		{
-		}
-		[Test]
-		public void Test_8790()
-		{
-		}
-		[Test]
-		public void Test_8791()
-		{
-		}
-		[Test]
-		public void Test_8792()
-		{
-		}
-		[Test]
-		public void Test_8793()
-		{
-		}
-		[Test]
-		public void Test_8794()
-		{
-		}
-		[Test]
-		public void Test_8795()
-		{
-		}
-		[Test]
-		public void Test_8796()
-		{
-		}
-		[Test]
-		public void Test_8797()
-		{
-		}
-		[Test]
-		public void Test_8798()
-		{
-		}
-		[Test]
-		public void Test_8799()
-		{
-		}
-		[Test]
-		public void Test_8800()
-		{
-		}
-		[Test]
-		public void Test_8801()
-		{
-		}
-		[Test]
-		public void Test_8802()
-		{
-		}
-		[Test]
-		public void Test_8803()
-		{
-		}
-		[Test]
-		public void Test_8804()
-		{
-		}
-		[Test]
-		public void Test_8805()
-		{
-		}
-		[Test]
-		public void Test_8806()
-		{
-		}
-		[Test]
-		public void Test_8807()
-		{
-		}
-		[Test]
-		public void Test_8808()
-		{
-		}
-		[Test]
-		public void Test_8809()
-		{
-		}
-		[Test]
-		public void Test_8810()
-		{
-		}
-		[Test]
-		public void Test_8811()
-		{
-		}
-		[Test]
-		public void Test_8812()
-		{
-		}
-		[Test]
-		public void Test_8813()
-		{
-		}
-		[Test]
-		public void Test_8814()
-		{
-		}
-		[Test]
-		public void Test_8815()
-		{
-		}
-		[Test]
-		public void Test_8816()
-		{
-		}
-		[Test]
-		public void Test_8817()
-		{
-		}
-		[Test]
-		public void Test_8818()
-		{
-		}
-		[Test]
-		public void Test_8819()
-		{
-		}
-		[Test]
-		public void Test_8820()
-		{
-		}
-		[Test]
-		public void Test_8821()
-		{
-		}
-		[Test]
-		public void Test_8822()
-		{
-		}
-		[Test]
-		public void Test_8823()
-		{
-		}
-		[Test]
-		public void Test_8824()
-		{
-		}
-		[Test]
-		public void Test_8825()
-		{
-		}
-		[Test]
-		public void Test_8826()
-		{
-		}
-		[Test]
-		public void Test_8827()
-		{
-		}
-		[Test]
-		public void Test_8828()
-		{
-		}
-		[Test]
-		public void Test_8829()
-		{
-		}
-		[Test]
-		public void Test_8830()
-		{
-		}
-		[Test]
-		public void Test_8831()
-		{
-		}
-		[Test]
-		public void Test_8832()
-		{
-		}
-		[Test]
-		public void Test_8833()
-		{
-		}
-		[Test]
-		public void Test_8834()
-		{
-		}
-		[Test]
-		public void Test_8835()
-		{
-		}
-		[Test]
-		public void Test_8836()
-		{
-		}
-		[Test]
-		public void Test_8837()
-		{
-		}
-		[Test]
-		public void Test_8838()
-		{
-		}
-		[Test]
-		public void Test_8839()
-		{
-		}
-		[Test]
-		public void Test_8840()
-		{
-		}
-		[Test]
-		public void Test_8841()
-		{
-		}
-		[Test]
-		public void Test_8842()
-		{
-		}
-		[Test]
-		public void Test_8843()
-		{
-		}
-		[Test]
-		public void Test_8844()
-		{
-		}
-		[Test]
-		public void Test_8845()
-		{
-		}
-		[Test]
-		public void Test_8846()
-		{
-		}
-		[Test]
-		public void Test_8847()
-		{
-		}
-		[Test]
-		public void Test_8848()
-		{
-		}
-		[Test]
-		public void Test_8849()
-		{
-		}
-		[Test]
-		public void Test_8850()
-		{
-		}
-		[Test]
-		public void Test_8851()
-		{
-		}
-		[Test]
-		public void Test_8852()
-		{
-		}
-		[Test]
-		public void Test_8853()
-		{
-		}
-		[Test]
-		public void Test_8854()
-		{
-		}
-		[Test]
-		public void Test_8855()
-		{
-		}
-		[Test]
-		public void Test_8856()
-		{
-		}
-		[Test]
-		public void Test_8857()
-		{
-		}
-		[Test]
-		public void Test_8858()
-		{
-		}
-		[Test]
-		public void Test_8859()
-		{
-		}
-		[Test]
-		public void Test_8860()
-		{
-		}
-		[Test]
-		public void Test_8861()
-		{
-		}
-		[Test]
-		public void Test_8862()
-		{
-		}
-		[Test]
-		public void Test_8863()
-		{
-		}
-		[Test]
-		public void Test_8864()
-		{
-		}
-		[Test]
-		public void Test_8865()
-		{
-		}
-		[Test]
-		public void Test_8866()
-		{
-		}
-		[Test]
-		public void Test_8867()
-		{
-		}
-		[Test]
-		public void Test_8868()
-		{
-		}
-		[Test]
-		public void Test_8869()
-		{
-		}
-		[Test]
-		public void Test_8870()
-		{
-		}
-		[Test]
-		public void Test_8871()
-		{
-		}
-		[Test]
-		public void Test_8872()
-		{
-		}
-		[Test]
-		public void Test_8873()
-		{
-		}
-		[Test]
-		public void Test_8874()
-		{
-		}
-		[Test]
-		public void Test_8875()
-		{
-		}
-		[Test]
-		public void Test_8876()
-		{
-		}
-		[Test]
-		public void Test_8877()
-		{
-		}
-		[Test]
-		public void Test_8878()
-		{
-		}
-		[Test]
-		public void Test_8879()
-		{
-		}
-		[Test]
-		public void Test_8880()
-		{
-		}
-		[Test]
-		public void Test_8881()
-		{
-		}
-		[Test]
-		public void Test_8882()
-		{
-		}
-		[Test]
-		public void Test_8883()
-		{
-		}
-		[Test]
-		public void Test_8884()
-		{
-		}
-		[Test]
-		public void Test_8885()
-		{
-		}
-		[Test]
-		public void Test_8886()
-		{
-		}
-		[Test]
-		public void Test_8887()
-		{
-		}
-		[Test]
-		public void Test_8888()
-		{
-		}
-		[Test]
-		public void Test_8889()
-		{
-		}
-		[Test]
-		public void Test_8890()
-		{
-		}
-		[Test]
-		public void Test_8891()
-		{
-		}
-		[Test]
-		public void Test_8892()
-		{
-		}
-		[Test]
-		public void Test_8893()
-		{
-		}
-		[Test]
-		public void Test_8894()
-		{
-		}
-		[Test]
-		public void Test_8895()
-		{
-		}
-		[Test]
-		public void Test_8896()
-		{
-		}
-		[Test]
-		public void Test_8897()
-		{
-		}
-		[Test]
-		public void Test_8898()
-		{
-		}
-		[Test]
-		public void Test_8899()
-		{
-		}
-		[Test]
-		public void Test_8900()
-		{
-		}
-		[Test]
-		public void Test_8901()
-		{
-		}
-		[Test]
-		public void Test_8902()
-		{
-		}
-		[Test]
-		public void Test_8903()
-		{
-		}
-		[Test]
-		public void Test_8904()
-		{
-		}
-		[Test]
-		public void Test_8905()
-		{
-		}
-		[Test]
-		public void Test_8906()
-		{
-		}
-		[Test]
-		public void Test_8907()
-		{
-		}
-		[Test]
-		public void Test_8908()
-		{
-		}
-		[Test]
-		public void Test_8909()
-		{
-		}
-		[Test]
-		public void Test_8910()
-		{
-		}
-		[Test]
-		public void Test_8911()
-		{
-		}
-		[Test]
-		public void Test_8912()
-		{
-		}
-		[Test]
-		public void Test_8913()
-		{
-		}
-		[Test]
-		public void Test_8914()
-		{
-		}
-		[Test]
-		public void Test_8915()
-		{
-		}
-		[Test]
-		public void Test_8916()
-		{
-		}
-		[Test]
-		public void Test_8917()
-		{
-		}
-		[Test]
-		public void Test_8918()
-		{
-		}
-		[Test]
-		public void Test_8919()
-		{
-		}
-		[Test]
-		public void Test_8920()
-		{
-		}
-		[Test]
-		public void Test_8921()
-		{
-		}
-		[Test]
-		public void Test_8922()
-		{
-		}
-		[Test]
-		public void Test_8923()
-		{
-		}
-		[Test]
-		public void Test_8924()
-		{
-		}
-		[Test]
-		public void Test_8925()
-		{
-		}
-		[Test]
-		public void Test_8926()
-		{
-		}
-		[Test]
-		public void Test_8927()
-		{
-		}
-		[Test]
-		public void Test_8928()
-		{
-		}
-		[Test]
-		public void Test_8929()
-		{
-		}
-		[Test]
-		public void Test_8930()
-		{
-		}
-		[Test]
-		public void Test_8931()
-		{
-		}
-		[Test]
-		public void Test_8932()
-		{
-		}
-		[Test]
-		public void Test_8933()
-		{
-		}
-		[Test]
-		public void Test_8934()
-		{
-		}
-		[Test]
-		public void Test_8935()
-		{
-		}
-		[Test]
-		public void Test_8936()
-		{
-		}
-		[Test]
-		public void Test_8937()
-		{
-		}
-		[Test]
-		public void Test_8938()
-		{
-		}
-		[Test]
-		public void Test_8939()
-		{
-		}
-		[Test]
-		public void Test_8940()
-		{
-		}
-		[Test]
-		public void Test_8941()
-		{
-		}
-		[Test]
-		public void Test_8942()
-		{
-		}
-		[Test]
-		public void Test_8943()
-		{
-		}
-		[Test]
-		public void Test_8944()
-		{
-		}
-		[Test]
-		public void Test_8945()
-		{
-		}
-		[Test]
-		public void Test_8946()
-		{
-		}
-		[Test]
-		public void Test_8947()
-		{
-		}
-		[Test]
-		public void Test_8948()
-		{
-		}
-		[Test]
-		public void Test_8949()
-		{
-		}
-		[Test]
-		public void Test_8950()
-		{
-		}
-		[Test]
-		public void Test_8951()
-		{
-		}
-		[Test]
-		public void Test_8952()
-		{
-		}
-		[Test]
-		public void Test_8953()
-		{
-		}
-		[Test]
-		public void Test_8954()
-		{
-		}
-		[Test]
-		public void Test_8955()
-		{
-		}
-		[Test]
-		public void Test_8956()
-		{
-		}
-		[Test]
-		public void Test_8957()
-		{
-		}
-		[Test]
-		public void Test_8958()
-		{
-		}
-		[Test]
-		public void Test_8959()
-		{
-		}
-		[Test]
-		public void Test_8960()
-		{
-		}
-		[Test]
-		public void Test_8961()
-		{
-		}
-		[Test]
-		public void Test_8962()
-		{
-		}
-		[Test]
-		public void Test_8963()
-		{
-		}
-		[Test]
-		public void Test_8964()
-		{
-		}
-		[Test]
-		public void Test_8965()
-		{
-		}
-		[Test]
-		public void Test_8966()
-		{
-		}
-		[Test]
-		public void Test_8967()
-		{
-		}
-		[Test]
-		public void Test_8968()
-		{
-		}
-		[Test]
-		public void Test_8969()
-		{
-		}
-		[Test]
-		public void Test_8970()
-		{
-		}
-		[Test]
-		public void Test_8971()
-		{
-		}
-		[Test]
-		public void Test_8972()
-		{
-		}
-		[Test]
-		public void Test_8973()
-		{
-		}
-		[Test]
-		public void Test_8974()
-		{
-		}
-		[Test]
-		public void Test_8975()
-		{
-		}
-		[Test]
-		public void Test_8976()
-		{
-		}
-		[Test]
-		public void Test_8977()
-		{
-		}
-		[Test]
-		public void Test_8978()
-		{
-		}
-		[Test]
-		public void Test_8979()
-		{
-		}
-		[Test]
-		public void Test_8980()
-		{
-		}
-		[Test]
-		public void Test_8981()
-		{
-		}
-		[Test]
-		public void Test_8982()
-		{
-		}
-		[Test]
-		public void Test_8983()
-		{
-		}
-		[Test]
-		public void Test_8984()
-		{
-		}
-		[Test]
-		public void Test_8985()
-		{
-		}
-		[Test]
-		public void Test_8986()
-		{
-		}
-		[Test]
-		public void Test_8987()
-		{
-		}
-		[Test]
-		public void Test_8988()
-		{
-		}
-		[Test]
-		public void Test_8989()
-		{
-		}
-		[Test]
-		public void Test_8990()
-		{
-		}
-		[Test]
-		public void Test_8991()
-		{
-		}
-		[Test]
-		public void Test_8992()
-		{
-		}
-		[Test]
-		public void Test_8993()
-		{
-		}
-		[Test]
-		public void Test_8994()
-		{
-		}
-		[Test]
-		public void Test_8995()
-		{
-		}
-		[Test]
-		public void Test_8996()
-		{
-		}
-		[Test]
-		public void Test_8997()
-		{
-		}
-		[Test]
-		public void Test_8998()
-		{
-		}
-		[Test]
-		public void Test_8999()
-		{
-		}
-		[Test]
-		public void Test_9000()
-		{
-		}
-		[Test]
-		public void Test_9001()
-		{
-		}
-		[Test]
-		public void Test_9002()
-		{
-		}
-		[Test]
-		public void Test_9003()
-		{
-		}
-		[Test]
-		public void Test_9004()
-		{
-		}
-		[Test]
-		public void Test_9005()
-		{
-		}
-		[Test]
-		public void Test_9006()
-		{
-		}
-		[Test]
-		public void Test_9007()
-		{
-		}
-		[Test]
-		public void Test_9008()
-		{
-		}
-		[Test]
-		public void Test_9009()
-		{
-		}
-		[Test]
-		public void Test_9010()
-		{
-		}
-		[Test]
-		public void Test_9011()
-		{
-		}
-		[Test]
-		public void Test_9012()
-		{
-		}
-		[Test]
-		public void Test_9013()
-		{
-		}
-		[Test]
-		public void Test_9014()
-		{
-		}
-		[Test]
-		public void Test_9015()
-		{
-		}
-		[Test]
-		public void Test_9016()
-		{
-		}
-		[Test]
-		public void Test_9017()
-		{
-		}
-		[Test]
-		public void Test_9018()
-		{
-		}
-		[Test]
-		public void Test_9019()
-		{
-		}
-		[Test]
-		public void Test_9020()
-		{
-		}
-		[Test]
-		public void Test_9021()
-		{
-		}
-		[Test]
-		public void Test_9022()
-		{
-		}
-		[Test]
-		public void Test_9023()
-		{
-		}
-		[Test]
-		public void Test_9024()
-		{
-		}
-		[Test]
-		public void Test_9025()
-		{
-		}
-		[Test]
-		public void Test_9026()
-		{
-		}
-		[Test]
-		public void Test_9027()
-		{
-		}
-		[Test]
-		public void Test_9028()
-		{
-		}
-		[Test]
-		public void Test_9029()
-		{
-		}
-		[Test]
-		public void Test_9030()
-		{
-		}
-		[Test]
-		public void Test_9031()
-		{
-		}
-		[Test]
-		public void Test_9032()
-		{
-		}
-		[Test]
-		public void Test_9033()
-		{
-		}
-		[Test]
-		public void Test_9034()
-		{
-		}
-		[Test]
-		public void Test_9035()
-		{
-		}
-		[Test]
-		public void Test_9036()
-		{
-		}
-		[Test]
-		public void Test_9037()
-		{
-		}
-		[Test]
-		public void Test_9038()
-		{
-		}
-		[Test]
-		public void Test_9039()
-		{
-		}
-		[Test]
-		public void Test_9040()
-		{
-		}
-		[Test]
-		public void Test_9041()
-		{
-		}
-		[Test]
-		public void Test_9042()
-		{
-		}
-		[Test]
-		public void Test_9043()
-		{
-		}
-		[Test]
-		public void Test_9044()
-		{
-		}
-		[Test]
-		public void Test_9045()
-		{
-		}
-		[Test]
-		public void Test_9046()
-		{
-		}
-		[Test]
-		public void Test_9047()
-		{
-		}
-		[Test]
-		public void Test_9048()
-		{
-		}
-		[Test]
-		public void Test_9049()
-		{
-		}
-		[Test]
-		public void Test_9050()
-		{
-		}
-		[Test]
-		public void Test_9051()
-		{
-		}
-		[Test]
-		public void Test_9052()
-		{
-		}
-		[Test]
-		public void Test_9053()
-		{
-		}
-		[Test]
-		public void Test_9054()
-		{
-		}
-		[Test]
-		public void Test_9055()
-		{
-		}
-		[Test]
-		public void Test_9056()
-		{
-		}
-		[Test]
-		public void Test_9057()
-		{
-		}
-		[Test]
-		public void Test_9058()
-		{
-		}
-		[Test]
-		public void Test_9059()
-		{
-		}
-		[Test]
-		public void Test_9060()
-		{
-		}
-		[Test]
-		public void Test_9061()
-		{
-		}
-		[Test]
-		public void Test_9062()
-		{
-		}
-		[Test]
-		public void Test_9063()
-		{
-		}
-		[Test]
-		public void Test_9064()
-		{
-		}
-		[Test]
-		public void Test_9065()
-		{
-		}
-		[Test]
-		public void Test_9066()
-		{
-		}
-		[Test]
-		public void Test_9067()
-		{
-		}
-		[Test]
-		public void Test_9068()
-		{
-		}
-		[Test]
-		public void Test_9069()
-		{
-		}
-		[Test]
-		public void Test_9070()
-		{
-		}
-		[Test]
-		public void Test_9071()
-		{
-		}
-		[Test]
-		public void Test_9072()
-		{
-		}
-		[Test]
-		public void Test_9073()
-		{
-		}
-		[Test]
-		public void Test_9074()
-		{
-		}
-		[Test]
-		public void Test_9075()
-		{
-		}
-		[Test]
-		public void Test_9076()
-		{
-		}
-		[Test]
-		public void Test_9077()
-		{
-		}
-		[Test]
-		public void Test_9078()
-		{
-		}
-		[Test]
-		public void Test_9079()
-		{
-		}
-		[Test]
-		public void Test_9080()
-		{
-		}
-		[Test]
-		public void Test_9081()
-		{
-		}
-		[Test]
-		public void Test_9082()
-		{
-		}
-		[Test]
-		public void Test_9083()
-		{
-		}
-		[Test]
-		public void Test_9084()
-		{
-		}
-		[Test]
-		public void Test_9085()
-		{
-		}
-		[Test]
-		public void Test_9086()
-		{
-		}
-		[Test]
-		public void Test_9087()
-		{
-		}
-		[Test]
-		public void Test_9088()
-		{
-		}
-		[Test]
-		public void Test_9089()
-		{
-		}
-		[Test]
-		public void Test_9090()
-		{
-		}
-		[Test]
-		public void Test_9091()
-		{
-		}
-		[Test]
-		public void Test_9092()
-		{
-		}
-		[Test]
-		public void Test_9093()
-		{
-		}
-		[Test]
-		public void Test_9094()
-		{
-		}
-		[Test]
-		public void Test_9095()
-		{
-		}
-		[Test]
-		public void Test_9096()
-		{
-		}
-		[Test]
-		public void Test_9097()
-		{
-		}
-		[Test]
-		public void Test_9098()
-		{
-		}
-		[Test]
-		public void Test_9099()
-		{
-		}
-		[Test]
-		public void Test_9100()
-		{
-		}
-		[Test]
-		public void Test_9101()
-		{
-		}
-		[Test]
-		public void Test_9102()
-		{
-		}
-		[Test]
-		public void Test_9103()
-		{
-		}
-		[Test]
-		public void Test_9104()
-		{
-		}
-		[Test]
-		public void Test_9105()
-		{
-		}
-		[Test]
-		public void Test_9106()
-		{
-		}
-		[Test]
-		public void Test_9107()
-		{
-		}
-		[Test]
-		public void Test_9108()
-		{
-		}
-		[Test]
-		public void Test_9109()
-		{
-		}
-		[Test]
-		public void Test_9110()
-		{
-		}
-		[Test]
-		public void Test_9111()
-		{
-		}
-		[Test]
-		public void Test_9112()
-		{
-		}
-		[Test]
-		public void Test_9113()
-		{
-		}
-		[Test]
-		public void Test_9114()
-		{
-		}
-		[Test]
-		public void Test_9115()
-		{
-		}
-		[Test]
-		public void Test_9116()
-		{
-		}
-		[Test]
-		public void Test_9117()
-		{
-		}
-		[Test]
-		public void Test_9118()
-		{
-		}
-		[Test]
-		public void Test_9119()
-		{
-		}
-		[Test]
-		public void Test_9120()
-		{
-		}
-		[Test]
-		public void Test_9121()
-		{
-		}
-		[Test]
-		public void Test_9122()
-		{
-		}
-		[Test]
-		public void Test_9123()
-		{
-		}
-		[Test]
-		public void Test_9124()
-		{
-		}
-		[Test]
-		public void Test_9125()
-		{
-		}
-		[Test]
-		public void Test_9126()
-		{
-		}
-		[Test]
-		public void Test_9127()
-		{
-		}
-		[Test]
-		public void Test_9128()
-		{
-		}
-		[Test]
-		public void Test_9129()
-		{
-		}
-		[Test]
-		public void Test_9130()
-		{
-		}
-		[Test]
-		public void Test_9131()
-		{
-		}
-		[Test]
-		public void Test_9132()
-		{
-		}
-		[Test]
-		public void Test_9133()
-		{
-		}
-		[Test]
-		public void Test_9134()
-		{
-		}
-		[Test]
-		public void Test_9135()
-		{
-		}
-		[Test]
-		public void Test_9136()
-		{
-		}
-		[Test]
-		public void Test_9137()
-		{
-		}
-		[Test]
-		public void Test_9138()
-		{
-		}
-		[Test]
-		public void Test_9139()
-		{
-		}
-		[Test]
-		public void Test_9140()
-		{
-		}
-		[Test]
-		public void Test_9141()
-		{
-		}
-		[Test]
-		public void Test_9142()
-		{
-		}
-		[Test]
-		public void Test_9143()
-		{
-		}
-		[Test]
-		public void Test_9144()
-		{
-		}
-		[Test]
-		public void Test_9145()
-		{
-		}
-		[Test]
-		public void Test_9146()
-		{
-		}
-		[Test]
-		public void Test_9147()
-		{
-		}
-		[Test]
-		public void Test_9148()
-		{
-		}
-		[Test]
-		public void Test_9149()
-		{
-		}
-		[Test]
-		public void Test_9150()
-		{
-		}
-		[Test]
-		public void Test_9151()
-		{
-		}
-		[Test]
-		public void Test_9152()
-		{
-		}
-		[Test]
-		public void Test_9153()
-		{
-		}
-		[Test]
-		public void Test_9154()
-		{
-		}
-		[Test]
-		public void Test_9155()
-		{
-		}
-		[Test]
-		public void Test_9156()
-		{
-		}
-		[Test]
-		public void Test_9157()
-		{
-		}
-		[Test]
-		public void Test_9158()
-		{
-		}
-		[Test]
-		public void Test_9159()
-		{
-		}
-		[Test]
-		public void Test_9160()
-		{
-		}
-		[Test]
-		public void Test_9161()
-		{
-		}
-		[Test]
-		public void Test_9162()
-		{
-		}
-		[Test]
-		public void Test_9163()
-		{
-		}
-		[Test]
-		public void Test_9164()
-		{
-		}
-		[Test]
-		public void Test_9165()
-		{
-		}
-		[Test]
-		public void Test_9166()
-		{
-		}
-		[Test]
-		public void Test_9167()
-		{
-		}
-		[Test]
-		public void Test_9168()
-		{
-		}
-		[Test]
-		public void Test_9169()
-		{
-		}
-		[Test]
-		public void Test_9170()
-		{
-		}
-		[Test]
-		public void Test_9171()
-		{
-		}
-		[Test]
-		public void Test_9172()
-		{
-		}
-		[Test]
-		public void Test_9173()
-		{
-		}
-		[Test]
-		public void Test_9174()
-		{
-		}
-		[Test]
-		public void Test_9175()
-		{
-		}
-		[Test]
-		public void Test_9176()
-		{
-		}
-		[Test]
-		public void Test_9177()
-		{
-		}
-		[Test]
-		public void Test_9178()
-		{
-		}
-		[Test]
-		public void Test_9179()
-		{
-		}
-		[Test]
-		public void Test_9180()
-		{
-		}
-		[Test]
-		public void Test_9181()
-		{
-		}
-		[Test]
-		public void Test_9182()
-		{
-		}
-		[Test]
-		public void Test_9183()
-		{
-		}
-		[Test]
-		public void Test_9184()
-		{
-		}
-		[Test]
-		public void Test_9185()
-		{
-		}
-		[Test]
-		public void Test_9186()
-		{
-		}
-		[Test]
-		public void Test_9187()
-		{
-		}
-		[Test]
-		public void Test_9188()
-		{
-		}
-		[Test]
-		public void Test_9189()
-		{
-		}
-		[Test]
-		public void Test_9190()
-		{
-		}
-		[Test]
-		public void Test_9191()
-		{
-		}
-		[Test]
-		public void Test_9192()
-		{
-		}
-		[Test]
-		public void Test_9193()
-		{
-		}
-		[Test]
-		public void Test_9194()
-		{
-		}
-		[Test]
-		public void Test_9195()
-		{
-		}
-		[Test]
-		public void Test_9196()
-		{
-		}
-		[Test]
-		public void Test_9197()
-		{
-		}
-		[Test]
-		public void Test_9198()
-		{
-		}
-		[Test]
-		public void Test_9199()
-		{
-		}
-		[Test]
-		public void Test_9200()
-		{
-		}
-		[Test]
-		public void Test_9201()
-		{
-		}
-		[Test]
-		public void Test_9202()
-		{
-		}
-		[Test]
-		public void Test_9203()
-		{
-		}
-		[Test]
-		public void Test_9204()
-		{
-		}
-		[Test]
-		public void Test_9205()
-		{
-		}
-		[Test]
-		public void Test_9206()
-		{
-		}
-		[Test]
-		public void Test_9207()
-		{
-		}
-		[Test]
-		public void Test_9208()
-		{
-		}
-		[Test]
-		public void Test_9209()
-		{
-		}
-		[Test]
-		public void Test_9210()
-		{
-		}
-		[Test]
-		public void Test_9211()
-		{
-		}
-		[Test]
-		public void Test_9212()
-		{
-		}
-		[Test]
-		public void Test_9213()
-		{
-		}
-		[Test]
-		public void Test_9214()
-		{
-		}
-		[Test]
-		public void Test_9215()
-		{
-		}
-		[Test]
-		public void Test_9216()
-		{
-		}
-		[Test]
-		public void Test_9217()
-		{
-		}
-		[Test]
-		public void Test_9218()
-		{
-		}
-		[Test]
-		public void Test_9219()
-		{
-		}
-		[Test]
-		public void Test_9220()
-		{
-		}
-		[Test]
-		public void Test_9221()
-		{
-		}
-		[Test]
-		public void Test_9222()
-		{
-		}
-		[Test]
-		public void Test_9223()
-		{
-		}
-		[Test]
-		public void Test_9224()
-		{
-		}
-		[Test]
-		public void Test_9225()
-		{
-		}
-		[Test]
-		public void Test_9226()
-		{
-		}
-		[Test]
-		public void Test_9227()
-		{
-		}
-		[Test]
-		public void Test_9228()
-		{
-		}
-		[Test]
-		public void Test_9229()
-		{
-		}
-		[Test]
-		public void Test_9230()
-		{
-		}
-		[Test]
-		public void Test_9231()
-		{
-		}
-		[Test]
-		public void Test_9232()
-		{
-		}
-		[Test]
-		public void Test_9233()
-		{
-		}
-		[Test]
-		public void Test_9234()
-		{
-		}
-		[Test]
-		public void Test_9235()
-		{
-		}
-		[Test]
-		public void Test_9236()
-		{
-		}
-		[Test]
-		public void Test_9237()
-		{
-		}
-		[Test]
-		public void Test_9238()
-		{
-		}
-		[Test]
-		public void Test_9239()
-		{
-		}
-		[Test]
-		public void Test_9240()
-		{
-		}
-		[Test]
-		public void Test_9241()
-		{
-		}
-		[Test]
-		public void Test_9242()
-		{
-		}
-		[Test]
-		public void Test_9243()
-		{
-		}
-		[Test]
-		public void Test_9244()
-		{
-		}
-		[Test]
-		public void Test_9245()
-		{
-		}
-		[Test]
-		public void Test_9246()
-		{
-		}
-		[Test]
-		public void Test_9247()
-		{
-		}
-		[Test]
-		public void Test_9248()
-		{
-		}
-		[Test]
-		public void Test_9249()
-		{
-		}
-		[Test]
-		public void Test_9250()
-		{
-		}
-		[Test]
-		public void Test_9251()
-		{
-		}
-		[Test]
-		public void Test_9252()
-		{
-		}
-		[Test]
-		public void Test_9253()
-		{
-		}
-		[Test]
-		public void Test_9254()
-		{
-		}
-		[Test]
-		public void Test_9255()
-		{
-		}
-		[Test]
-		public void Test_9256()
-		{
-		}
-		[Test]
-		public void Test_9257()
-		{
-		}
-		[Test]
-		public void Test_9258()
-		{
-		}
-		[Test]
-		public void Test_9259()
-		{
-		}
-		[Test]
-		public void Test_9260()
-		{
-		}
-		[Test]
-		public void Test_9261()
-		{
-		}
-		[Test]
-		public void Test_9262()
-		{
-		}
-		[Test]
-		public void Test_9263()
-		{
-		}
-		[Test]
-		public void Test_9264()
-		{
-		}
-		[Test]
-		public void Test_9265()
-		{
-		}
-		[Test]
-		public void Test_9266()
-		{
-		}
-		[Test]
-		public void Test_9267()
-		{
-		}
-		[Test]
-		public void Test_9268()
-		{
-		}
-		[Test]
-		public void Test_9269()
-		{
-		}
-		[Test]
-		public void Test_9270()
-		{
-		}
-		[Test]
-		public void Test_9271()
-		{
-		}
-		[Test]
-		public void Test_9272()
-		{
-		}
-		[Test]
-		public void Test_9273()
-		{
-		}
-		[Test]
-		public void Test_9274()
-		{
-		}
-		[Test]
-		public void Test_9275()
-		{
-		}
-		[Test]
-		public void Test_9276()
-		{
-		}
-		[Test]
-		public void Test_9277()
-		{
-		}
-		[Test]
-		public void Test_9278()
-		{
-		}
-		[Test]
-		public void Test_9279()
-		{
-		}
-		[Test]
-		public void Test_9280()
-		{
-		}
-		[Test]
-		public void Test_9281()
-		{
-		}
-		[Test]
-		public void Test_9282()
-		{
-		}
-		[Test]
-		public void Test_9283()
-		{
-		}
-		[Test]
-		public void Test_9284()
-		{
-		}
-		[Test]
-		public void Test_9285()
-		{
-		}
-		[Test]
-		public void Test_9286()
-		{
-		}
-		[Test]
-		public void Test_9287()
-		{
-		}
-		[Test]
-		public void Test_9288()
-		{
-		}
-		[Test]
-		public void Test_9289()
-		{
-		}
-		[Test]
-		public void Test_9290()
-		{
-		}
-		[Test]
-		public void Test_9291()
-		{
-		}
-		[Test]
-		public void Test_9292()
-		{
-		}
-		[Test]
-		public void Test_9293()
-		{
-		}
-		[Test]
-		public void Test_9294()
-		{
-		}
-		[Test]
-		public void Test_9295()
-		{
-		}
-		[Test]
-		public void Test_9296()
-		{
-		}
-		[Test]
-		public void Test_9297()
-		{
-		}
-		[Test]
-		public void Test_9298()
-		{
-		}
-		[Test]
-		public void Test_9299()
-		{
-		}
-		[Test]
-		public void Test_9300()
-		{
-		}
-		[Test]
-		public void Test_9301()
-		{
-		}
-		[Test]
-		public void Test_9302()
-		{
-		}
-		[Test]
-		public void Test_9303()
-		{
-		}
-		[Test]
-		public void Test_9304()
-		{
-		}
-		[Test]
-		public void Test_9305()
-		{
-		}
-		[Test]
-		public void Test_9306()
-		{
-		}
-		[Test]
-		public void Test_9307()
-		{
-		}
-		[Test]
-		public void Test_9308()
-		{
-		}
-		[Test]
-		public void Test_9309()
-		{
-		}
-		[Test]
-		public void Test_9310()
-		{
-		}
-		[Test]
-		public void Test_9311()
-		{
-		}
-		[Test]
-		public void Test_9312()
-		{
-		}
-		[Test]
-		public void Test_9313()
-		{
-		}
-		[Test]
-		public void Test_9314()
-		{
-		}
-		[Test]
-		public void Test_9315()
-		{
-		}
-		[Test]
-		public void Test_9316()
-		{
-		}
-		[Test]
-		public void Test_9317()
-		{
-		}
-		[Test]
-		public void Test_9318()
-		{
-		}
-		[Test]
-		public void Test_9319()
-		{
-		}
-		[Test]
-		public void Test_9320()
-		{
-		}
-		[Test]
-		public void Test_9321()
-		{
-		}
-		[Test]
-		public void Test_9322()
-		{
-		}
-		[Test]
-		public void Test_9323()
-		{
-		}
-		[Test]
-		public void Test_9324()
-		{
-		}
-		[Test]
-		public void Test_9325()
-		{
-		}
-		[Test]
-		public void Test_9326()
-		{
-		}
-		[Test]
-		public void Test_9327()
-		{
-		}
-		[Test]
-		public void Test_9328()
-		{
-		}
-		[Test]
-		public void Test_9329()
-		{
-		}
-		[Test]
-		public void Test_9330()
-		{
-		}
-		[Test]
-		public void Test_9331()
-		{
-		}
-		[Test]
-		public void Test_9332()
-		{
-		}
-		[Test]
-		public void Test_9333()
-		{
-		}
-		[Test]
-		public void Test_9334()
-		{
-		}
-		[Test]
-		public void Test_9335()
-		{
-		}
-		[Test]
-		public void Test_9336()
-		{
-		}
-		[Test]
-		public void Test_9337()
-		{
-		}
-		[Test]
-		public void Test_9338()
-		{
-		}
-		[Test]
-		public void Test_9339()
-		{
-		}
-		[Test]
-		public void Test_9340()
-		{
-		}
-		[Test]
-		public void Test_9341()
-		{
-		}
-		[Test]
-		public void Test_9342()
-		{
-		}
-		[Test]
-		public void Test_9343()
-		{
-		}
-		[Test]
-		public void Test_9344()
-		{
-		}
-		[Test]
-		public void Test_9345()
-		{
-		}
-		[Test]
-		public void Test_9346()
-		{
-		}
-		[Test]
-		public void Test_9347()
-		{
-		}
-		[Test]
-		public void Test_9348()
-		{
-		}
-		[Test]
-		public void Test_9349()
-		{
-		}
-		[Test]
-		public void Test_9350()
-		{
-		}
-		[Test]
-		public void Test_9351()
-		{
-		}
-		[Test]
-		public void Test_9352()
-		{
-		}
-		[Test]
-		public void Test_9353()
-		{
-		}
-		[Test]
-		public void Test_9354()
-		{
-		}
-		[Test]
-		public void Test_9355()
-		{
-		}
-		[Test]
-		public void Test_9356()
-		{
-		}
-		[Test]
-		public void Test_9357()
-		{
-		}
-		[Test]
-		public void Test_9358()
-		{
-		}
-		[Test]
-		public void Test_9359()
-		{
-		}
-		[Test]
-		public void Test_9360()
-		{
-		}
-		[Test]
-		public void Test_9361()
-		{
-		}
-		[Test]
-		public void Test_9362()
-		{
-		}
-		[Test]
-		public void Test_9363()
-		{
-		}
-		[Test]
-		public void Test_9364()
-		{
-		}
-		[Test]
-		public void Test_9365()
-		{
-		}
-		[Test]
-		public void Test_9366()
-		{
-		}
-		[Test]
-		public void Test_9367()
-		{
-		}
-		[Test]
-		public void Test_9368()
-		{
-		}
-		[Test]
-		public void Test_9369()
-		{
-		}
-		[Test]
-		public void Test_9370()
-		{
-		}
-		[Test]
-		public void Test_9371()
-		{
-		}
-		[Test]
-		public void Test_9372()
-		{
-		}
-		[Test]
-		public void Test_9373()
-		{
-		}
-		[Test]
-		public void Test_9374()
-		{
-		}
-		[Test]
-		public void Test_9375()
-		{
-		}
-		[Test]
-		public void Test_9376()
-		{
-		}
-		[Test]
-		public void Test_9377()
-		{
-		}
-		[Test]
-		public void Test_9378()
-		{
-		}
-		[Test]
-		public void Test_9379()
-		{
-		}
-		[Test]
-		public void Test_9380()
-		{
-		}
-		[Test]
-		public void Test_9381()
-		{
-		}
-		[Test]
-		public void Test_9382()
-		{
-		}
-		[Test]
-		public void Test_9383()
-		{
-		}
-		[Test]
-		public void Test_9384()
-		{
-		}
-		[Test]
-		public void Test_9385()
-		{
-		}
-		[Test]
-		public void Test_9386()
-		{
-		}
-		[Test]
-		public void Test_9387()
-		{
-		}
-		[Test]
-		public void Test_9388()
-		{
-		}
-		[Test]
-		public void Test_9389()
-		{
-		}
-		[Test]
-		public void Test_9390()
-		{
-		}
-		[Test]
-		public void Test_9391()
-		{
-		}
-		[Test]
-		public void Test_9392()
-		{
-		}
-		[Test]
-		public void Test_9393()
-		{
-		}
-		[Test]
-		public void Test_9394()
-		{
-		}
-		[Test]
-		public void Test_9395()
-		{
-		}
-		[Test]
-		public void Test_9396()
-		{
-		}
-		[Test]
-		public void Test_9397()
-		{
-		}
-		[Test]
-		public void Test_9398()
-		{
-		}
-		[Test]
-		public void Test_9399()
-		{
-		}
-		[Test]
-		public void Test_9400()
-		{
-		}
-		[Test]
-		public void Test_9401()
-		{
-		}
-		[Test]
-		public void Test_9402()
-		{
-		}
-		[Test]
-		public void Test_9403()
-		{
-		}
-		[Test]
-		public void Test_9404()
-		{
-		}
-		[Test]
-		public void Test_9405()
-		{
-		}
-		[Test]
-		public void Test_9406()
-		{
-		}
-		[Test]
-		public void Test_9407()
-		{
-		}
-		[Test]
-		public void Test_9408()
-		{
-		}
-		[Test]
-		public void Test_9409()
-		{
-		}
-		[Test]
-		public void Test_9410()
-		{
-		}
-		[Test]
-		public void Test_9411()
-		{
-		}
-		[Test]
-		public void Test_9412()
-		{
-		}
-		[Test]
-		public void Test_9413()
-		{
-		}
-		[Test]
-		public void Test_9414()
-		{
-		}
-		[Test]
-		public void Test_9415()
-		{
-		}
-		[Test]
-		public void Test_9416()
-		{
-		}
-		[Test]
-		public void Test_9417()
-		{
-		}
-		[Test]
-		public void Test_9418()
-		{
-		}
-		[Test]
-		public void Test_9419()
-		{
-		}
-		[Test]
-		public void Test_9420()
-		{
-		}
-		[Test]
-		public void Test_9421()
-		{
-		}
-		[Test]
-		public void Test_9422()
-		{
-		}
-		[Test]
-		public void Test_9423()
-		{
-		}
-		[Test]
-		public void Test_9424()
-		{
-		}
-		[Test]
-		public void Test_9425()
-		{
-		}
-		[Test]
-		public void Test_9426()
-		{
-		}
-		[Test]
-		public void Test_9427()
-		{
-		}
-		[Test]
-		public void Test_9428()
-		{
-		}
-		[Test]
-		public void Test_9429()
-		{
-		}
-		[Test]
-		public void Test_9430()
-		{
-		}
-		[Test]
-		public void Test_9431()
-		{
-		}
-		[Test]
-		public void Test_9432()
-		{
-		}
-		[Test]
-		public void Test_9433()
-		{
-		}
-		[Test]
-		public void Test_9434()
-		{
-		}
-		[Test]
-		public void Test_9435()
-		{
-		}
-		[Test]
-		public void Test_9436()
-		{
-		}
-		[Test]
-		public void Test_9437()
-		{
-		}
-		[Test]
-		public void Test_9438()
-		{
-		}
-		[Test]
-		public void Test_9439()
-		{
-		}
-		[Test]
-		public void Test_9440()
-		{
-		}
-		[Test]
-		public void Test_9441()
-		{
-		}
-		[Test]
-		public void Test_9442()
-		{
-		}
-		[Test]
-		public void Test_9443()
-		{
-		}
-		[Test]
-		public void Test_9444()
-		{
-		}
-		[Test]
-		public void Test_9445()
-		{
-		}
-		[Test]
-		public void Test_9446()
-		{
-		}
-		[Test]
-		public void Test_9447()
-		{
-		}
-		[Test]
-		public void Test_9448()
-		{
-		}
-		[Test]
-		public void Test_9449()
-		{
-		}
-		[Test]
-		public void Test_9450()
-		{
-		}
-		[Test]
-		public void Test_9451()
-		{
-		}
-		[Test]
-		public void Test_9452()
-		{
-		}
-		[Test]
-		public void Test_9453()
-		{
-		}
-		[Test]
-		public void Test_9454()
-		{
-		}
-		[Test]
-		public void Test_9455()
-		{
-		}
-		[Test]
-		public void Test_9456()
-		{
-		}
-		[Test]
-		public void Test_9457()
-		{
-		}
-		[Test]
-		public void Test_9458()
-		{
-		}
-		[Test]
-		public void Test_9459()
-		{
-		}
-		[Test]
-		public void Test_9460()
-		{
-		}
-		[Test]
-		public void Test_9461()
-		{
-		}
-		[Test]
-		public void Test_9462()
-		{
-		}
-		[Test]
-		public void Test_9463()
-		{
-		}
-		[Test]
-		public void Test_9464()
-		{
-		}
-		[Test]
-		public void Test_9465()
-		{
-		}
-		[Test]
-		public void Test_9466()
-		{
-		}
-		[Test]
-		public void Test_9467()
-		{
-		}
-		[Test]
-		public void Test_9468()
-		{
-		}
-		[Test]
-		public void Test_9469()
-		{
-		}
-		[Test]
-		public void Test_9470()
-		{
-		}
-		[Test]
-		public void Test_9471()
-		{
-		}
-		[Test]
-		public void Test_9472()
-		{
-		}
-		[Test]
-		public void Test_9473()
-		{
-		}
-		[Test]
-		public void Test_9474()
-		{
-		}
-		[Test]
-		public void Test_9475()
-		{
-		}
-		[Test]
-		public void Test_9476()
-		{
-		}
-		[Test]
-		public void Test_9477()
-		{
-		}
-		[Test]
-		public void Test_9478()
-		{
-		}
-		[Test]
-		public void Test_9479()
-		{
-		}
-		[Test]
-		public void Test_9480()
-		{
-		}
-		[Test]
-		public void Test_9481()
-		{
-		}
-		[Test]
-		public void Test_9482()
-		{
-		}
-		[Test]
-		public void Test_9483()
-		{
-		}
-		[Test]
-		public void Test_9484()
-		{
-		}
-		[Test]
-		public void Test_9485()
-		{
-		}
-		[Test]
-		public void Test_9486()
-		{
-		}
-		[Test]
-		public void Test_9487()
-		{
-		}
-		[Test]
-		public void Test_9488()
-		{
-		}
-		[Test]
-		public void Test_9489()
-		{
-		}
-		[Test]
-		public void Test_9490()
-		{
-		}
-		[Test]
-		public void Test_9491()
-		{
-		}
-		[Test]
-		public void Test_9492()
-		{
-		}
-		[Test]
-		public void Test_9493()
-		{
-		}
-		[Test]
-		public void Test_9494()
-		{
-		}
-		[Test]
-		public void Test_9495()
-		{
-		}
-		[Test]
-		public void Test_9496()
-		{
-		}
-		[Test]
-		public void Test_9497()
-		{
-		}
-		[Test]
-		public void Test_9498()
-		{
-		}
-		[Test]
-		public void Test_9499()
-		{
-		}
-		[Test]
-		public void Test_9500()
-		{
-		}
-		[Test]
-		public void Test_9501()
-		{
-		}
-		[Test]
-		public void Test_9502()
-		{
-		}
-		[Test]
-		public void Test_9503()
-		{
-		}
-		[Test]
-		public void Test_9504()
-		{
-		}
-		[Test]
-		public void Test_9505()
-		{
-		}
-		[Test]
-		public void Test_9506()
-		{
-		}
-		[Test]
-		public void Test_9507()
-		{
-		}
-		[Test]
-		public void Test_9508()
-		{
-		}
-		[Test]
-		public void Test_9509()
-		{
-		}
-		[Test]
-		public void Test_9510()
-		{
-		}
-		[Test]
-		public void Test_9511()
-		{
-		}
-		[Test]
-		public void Test_9512()
-		{
-		}
-		[Test]
-		public void Test_9513()
-		{
-		}
-		[Test]
-		public void Test_9514()
-		{
-		}
-		[Test]
-		public void Test_9515()
-		{
-		}
-		[Test]
-		public void Test_9516()
-		{
-		}
-		[Test]
-		public void Test_9517()
-		{
-		}
-		[Test]
-		public void Test_9518()
-		{
-		}
-		[Test]
-		public void Test_9519()
-		{
-		}
-		[Test]
-		public void Test_9520()
-		{
-		}
-		[Test]
-		public void Test_9521()
-		{
-		}
-		[Test]
-		public void Test_9522()
-		{
-		}
-		[Test]
-		public void Test_9523()
-		{
-		}
-		[Test]
-		public void Test_9524()
-		{
-		}
-		[Test]
-		public void Test_9525()
-		{
-		}
-		[Test]
-		public void Test_9526()
-		{
-		}
-		[Test]
-		public void Test_9527()
-		{
-		}
-		[Test]
-		public void Test_9528()
-		{
-		}
-		[Test]
-		public void Test_9529()
-		{
-		}
-		[Test]
-		public void Test_9530()
-		{
-		}
-		[Test]
-		public void Test_9531()
-		{
-		}
-		[Test]
-		public void Test_9532()
-		{
-		}
-		[Test]
-		public void Test_9533()
-		{
-		}
-		[Test]
-		public void Test_9534()
-		{
-		}
-		[Test]
-		public void Test_9535()
-		{
-		}
-		[Test]
-		public void Test_9536()
-		{
-		}
-		[Test]
-		public void Test_9537()
-		{
-		}
-		[Test]
-		public void Test_9538()
-		{
-		}
-		[Test]
-		public void Test_9539()
-		{
-		}
-		[Test]
-		public void Test_9540()
-		{
-		}
-		[Test]
-		public void Test_9541()
-		{
-		}
-		[Test]
-		public void Test_9542()
-		{
-		}
-		[Test]
-		public void Test_9543()
-		{
-		}
-		[Test]
-		public void Test_9544()
-		{
-		}
-		[Test]
-		public void Test_9545()
-		{
-		}
-		[Test]
-		public void Test_9546()
-		{
-		}
-		[Test]
-		public void Test_9547()
-		{
-		}
-		[Test]
-		public void Test_9548()
-		{
-		}
-		[Test]
-		public void Test_9549()
-		{
-		}
-		[Test]
-		public void Test_9550()
-		{
-		}
-		[Test]
-		public void Test_9551()
-		{
-		}
-		[Test]
-		public void Test_9552()
-		{
-		}
-		[Test]
-		public void Test_9553()
-		{
-		}
-		[Test]
-		public void Test_9554()
-		{
-		}
-		[Test]
-		public void Test_9555()
-		{
-		}
-		[Test]
-		public void Test_9556()
-		{
-		}
-		[Test]
-		public void Test_9557()
-		{
-		}
-		[Test]
-		public void Test_9558()
-		{
-		}
-		[Test]
-		public void Test_9559()
-		{
-		}
-		[Test]
-		public void Test_9560()
-		{
-		}
-		[Test]
-		public void Test_9561()
-		{
-		}
-		[Test]
-		public void Test_9562()
-		{
-		}
-		[Test]
-		public void Test_9563()
-		{
-		}
-		[Test]
-		public void Test_9564()
-		{
-		}
-		[Test]
-		public void Test_9565()
-		{
-		}
-		[Test]
-		public void Test_9566()
-		{
-		}
-		[Test]
-		public void Test_9567()
-		{
-		}
-		[Test]
-		public void Test_9568()
-		{
-		}
-		[Test]
-		public void Test_9569()
-		{
-		}
-		[Test]
-		public void Test_9570()
-		{
-		}
-		[Test]
-		public void Test_9571()
-		{
-		}
-		[Test]
-		public void Test_9572()
-		{
-		}
-		[Test]
-		public void Test_9573()
-		{
-		}
-		[Test]
-		public void Test_9574()
-		{
-		}
-		[Test]
-		public void Test_9575()
-		{
-		}
-		[Test]
-		public void Test_9576()
-		{
-		}
-		[Test]
-		public void Test_9577()
-		{
-		}
-		[Test]
-		public void Test_9578()
-		{
-		}
-		[Test]
-		public void Test_9579()
-		{
-		}
-		[Test]
-		public void Test_9580()
-		{
-		}
-		[Test]
-		public void Test_9581()
-		{
-		}
-		[Test]
-		public void Test_9582()
-		{
-		}
-		[Test]
-		public void Test_9583()
-		{
-		}
-		[Test]
-		public void Test_9584()
-		{
-		}
-		[Test]
-		public void Test_9585()
-		{
-		}
-		[Test]
-		public void Test_9586()
-		{
-		}
-		[Test]
-		public void Test_9587()
-		{
-		}
-		[Test]
-		public void Test_9588()
-		{
-		}
-		[Test]
-		public void Test_9589()
-		{
-		}
-		[Test]
-		public void Test_9590()
-		{
-		}
-		[Test]
-		public void Test_9591()
-		{
-		}
-		[Test]
-		public void Test_9592()
-		{
-		}
-		[Test]
-		public void Test_9593()
-		{
-		}
-		[Test]
-		public void Test_9594()
-		{
-		}
-		[Test]
-		public void Test_9595()
-		{
-		}
-		[Test]
-		public void Test_9596()
-		{
-		}
-		[Test]
-		public void Test_9597()
-		{
-		}
-		[Test]
-		public void Test_9598()
-		{
-		}
-		[Test]
-		public void Test_9599()
-		{
-		}
-		[Test]
-		public void Test_9600()
-		{
-		}
-		[Test]
-		public void Test_9601()
-		{
-		}
-		[Test]
-		public void Test_9602()
-		{
-		}
-		[Test]
-		public void Test_9603()
-		{
-		}
-		[Test]
-		public void Test_9604()
-		{
-		}
-		[Test]
-		public void Test_9605()
-		{
-		}
-		[Test]
-		public void Test_9606()
-		{
-		}
-		[Test]
-		public void Test_9607()
-		{
-		}
-		[Test]
-		public void Test_9608()
-		{
-		}
-		[Test]
-		public void Test_9609()
-		{
-		}
-		[Test]
-		public void Test_9610()
-		{
-		}
-		[Test]
-		public void Test_9611()
-		{
-		}
-		[Test]
-		public void Test_9612()
-		{
-		}
-		[Test]
-		public void Test_9613()
-		{
-		}
-		[Test]
-		public void Test_9614()
-		{
-		}
-		[Test]
-		public void Test_9615()
-		{
-		}
-		[Test]
-		public void Test_9616()
-		{
-		}
-		[Test]
-		public void Test_9617()
-		{
-		}
-		[Test]
-		public void Test_9618()
-		{
-		}
-		[Test]
-		public void Test_9619()
-		{
-		}
-		[Test]
-		public void Test_9620()
-		{
-		}
-		[Test]
-		public void Test_9621()
-		{
-		}
-		[Test]
-		public void Test_9622()
-		{
-		}
-		[Test]
-		public void Test_9623()
-		{
-		}
-		[Test]
-		public void Test_9624()
-		{
-		}
-		[Test]
-		public void Test_9625()
-		{
-		}
-		[Test]
-		public void Test_9626()
-		{
-		}
-		[Test]
-		public void Test_9627()
-		{
-		}
-		[Test]
-		public void Test_9628()
-		{
-		}
-		[Test]
-		public void Test_9629()
-		{
-		}
-		[Test]
-		public void Test_9630()
-		{
-		}
-		[Test]
-		public void Test_9631()
-		{
-		}
-		[Test]
-		public void Test_9632()
-		{
-		}
-		[Test]
-		public void Test_9633()
-		{
-		}
-		[Test]
-		public void Test_9634()
-		{
-		}
-		[Test]
-		public void Test_9635()
-		{
-		}
-		[Test]
-		public void Test_9636()
-		{
-		}
-		[Test]
-		public void Test_9637()
-		{
-		}
-		[Test]
-		public void Test_9638()
-		{
-		}
-		[Test]
-		public void Test_9639()
-		{
-		}
-		[Test]
-		public void Test_9640()
-		{
-		}
-		[Test]
-		public void Test_9641()
-		{
-		}
-		[Test]
-		public void Test_9642()
-		{
-		}
-		[Test]
-		public void Test_9643()
-		{
-		}
-		[Test]
-		public void Test_9644()
-		{
-		}
-		[Test]
-		public void Test_9645()
-		{
-		}
-		[Test]
-		public void Test_9646()
-		{
-		}
-		[Test]
-		public void Test_9647()
-		{
-		}
-		[Test]
-		public void Test_9648()
-		{
-		}
-		[Test]
-		public void Test_9649()
-		{
-		}
-		[Test]
-		public void Test_9650()
-		{
-		}
-		[Test]
-		public void Test_9651()
-		{
-		}
-		[Test]
-		public void Test_9652()
-		{
-		}
-		[Test]
-		public void Test_9653()
-		{
-		}
-		[Test]
-		public void Test_9654()
-		{
-		}
-		[Test]
-		public void Test_9655()
-		{
-		}
-		[Test]
-		public void Test_9656()
-		{
-		}
-		[Test]
-		public void Test_9657()
-		{
-		}
-		[Test]
-		public void Test_9658()
-		{
-		}
-		[Test]
-		public void Test_9659()
-		{
-		}
-		[Test]
-		public void Test_9660()
-		{
-		}
-		[Test]
-		public void Test_9661()
-		{
-		}
-		[Test]
-		public void Test_9662()
-		{
-		}
-		[Test]
-		public void Test_9663()
-		{
-		}
-		[Test]
-		public void Test_9664()
-		{
-		}
-		[Test]
-		public void Test_9665()
-		{
-		}
-		[Test]
-		public void Test_9666()
-		{
-		}
-		[Test]
-		public void Test_9667()
-		{
-		}
-		[Test]
-		public void Test_9668()
-		{
-		}
-		[Test]
-		public void Test_9669()
-		{
-		}
-		[Test]
-		public void Test_9670()
-		{
-		}
-		[Test]
-		public void Test_9671()
-		{
-		}
-		[Test]
-		public void Test_9672()
-		{
-		}
-		[Test]
-		public void Test_9673()
-		{
-		}
-		[Test]
-		public void Test_9674()
-		{
-		}
-		[Test]
-		public void Test_9675()
-		{
-		}
-		[Test]
-		public void Test_9676()
-		{
-		}
-		[Test]
-		public void Test_9677()
-		{
-		}
-		[Test]
-		public void Test_9678()
-		{
-		}
-		[Test]
-		public void Test_9679()
-		{
-		}
-		[Test]
-		public void Test_9680()
-		{
-		}
-		[Test]
-		public void Test_9681()
-		{
-		}
-		[Test]
-		public void Test_9682()
-		{
-		}
-		[Test]
-		public void Test_9683()
-		{
-		}
-		[Test]
-		public void Test_9684()
-		{
-		}
-		[Test]
-		public void Test_9685()
-		{
-		}
-		[Test]
-		public void Test_9686()
-		{
-		}
-		[Test]
-		public void Test_9687()
-		{
-		}
-		[Test]
-		public void Test_9688()
-		{
-		}
-		[Test]
-		public void Test_9689()
-		{
-		}
-		[Test]
-		public void Test_9690()
-		{
-		}
-		[Test]
-		public void Test_9691()
-		{
-		}
-		[Test]
-		public void Test_9692()
-		{
-		}
-		[Test]
-		public void Test_9693()
-		{
-		}
-		[Test]
-		public void Test_9694()
-		{
-		}
-		[Test]
-		public void Test_9695()
-		{
-		}
-		[Test]
-		public void Test_9696()
-		{
-		}
-		[Test]
-		public void Test_9697()
-		{
-		}
-		[Test]
-		public void Test_9698()
-		{
-		}
-		[Test]
-		public void Test_9699()
-		{
-		}
-		[Test]
-		public void Test_9700()
-		{
-		}
-		[Test]
-		public void Test_9701()
-		{
-		}
-		[Test]
-		public void Test_9702()
-		{
-		}
-		[Test]
-		public void Test_9703()
-		{
-		}
-		[Test]
-		public void Test_9704()
-		{
-		}
-		[Test]
-		public void Test_9705()
-		{
-		}
-		[Test]
-		public void Test_9706()
-		{
-		}
-		[Test]
-		public void Test_9707()
-		{
-		}
-		[Test]
-		public void Test_9708()
-		{
-		}
-		[Test]
-		public void Test_9709()
-		{
-		}
-		[Test]
-		public void Test_9710()
-		{
-		}
-		[Test]
-		public void Test_9711()
-		{
-		}
-		[Test]
-		public void Test_9712()
-		{
-		}
-		[Test]
-		public void Test_9713()
-		{
-		}
-		[Test]
-		public void Test_9714()
-		{
-		}
-		[Test]
-		public void Test_9715()
-		{
-		}
-		[Test]
-		public void Test_9716()
-		{
-		}
-		[Test]
-		public void Test_9717()
-		{
-		}
-		[Test]
-		public void Test_9718()
-		{
-		}
-		[Test]
-		public void Test_9719()
-		{
-		}
-		[Test]
-		public void Test_9720()
-		{
-		}
-		[Test]
-		public void Test_9721()
-		{
-		}
-		[Test]
-		public void Test_9722()
-		{
-		}
-		[Test]
-		public void Test_9723()
-		{
-		}
-		[Test]
-		public void Test_9724()
-		{
-		}
-		[Test]
-		public void Test_9725()
-		{
-		}
-		[Test]
-		public void Test_9726()
-		{
-		}
-		[Test]
-		public void Test_9727()
-		{
-		}
-		[Test]
-		public void Test_9728()
-		{
-		}
-		[Test]
-		public void Test_9729()
-		{
-		}
-		[Test]
-		public void Test_9730()
-		{
-		}
-		[Test]
-		public void Test_9731()
-		{
-		}
-		[Test]
-		public void Test_9732()
-		{
-		}
-		[Test]
-		public void Test_9733()
-		{
-		}
-		[Test]
-		public void Test_9734()
-		{
-		}
-		[Test]
-		public void Test_9735()
-		{
-		}
-		[Test]
-		public void Test_9736()
-		{
-		}
-		[Test]
-		public void Test_9737()
-		{
-		}
-		[Test]
-		public void Test_9738()
-		{
-		}
-		[Test]
-		public void Test_9739()
-		{
-		}
-		[Test]
-		public void Test_9740()
-		{
-		}
-		[Test]
-		public void Test_9741()
-		{
-		}
-		[Test]
-		public void Test_9742()
-		{
-		}
-		[Test]
-		public void Test_9743()
-		{
-		}
-		[Test]
-		public void Test_9744()
-		{
-		}
-		[Test]
-		public void Test_9745()
-		{
-		}
-		[Test]
-		public void Test_9746()
-		{
-		}
-		[Test]
-		public void Test_9747()
-		{
-		}
-		[Test]
-		public void Test_9748()
-		{
-		}
-		[Test]
-		public void Test_9749()
-		{
-		}
-		[Test]
-		public void Test_9750()
-		{
-		}
-		[Test]
-		public void Test_9751()
-		{
-		}
-		[Test]
-		public void Test_9752()
-		{
-		}
-		[Test]
-		public void Test_9753()
-		{
-		}
-		[Test]
-		public void Test_9754()
-		{
-		}
-		[Test]
-		public void Test_9755()
-		{
-		}
-		[Test]
-		public void Test_9756()
-		{
-		}
-		[Test]
-		public void Test_9757()
-		{
-		}
-		[Test]
-		public void Test_9758()
-		{
-		}
-		[Test]
-		public void Test_9759()
-		{
-		}
-		[Test]
-		public void Test_9760()
-		{
-		}
-		[Test]
-		public void Test_9761()
-		{
-		}
-		[Test]
-		public void Test_9762()
-		{
-		}
-		[Test]
-		public void Test_9763()
-		{
-		}
-		[Test]
-		public void Test_9764()
-		{
-		}
-		[Test]
-		public void Test_9765()
-		{
-		}
-		[Test]
-		public void Test_9766()
-		{
-		}
-		[Test]
-		public void Test_9767()
-		{
-		}
-		[Test]
-		public void Test_9768()
-		{
-		}
-		[Test]
-		public void Test_9769()
-		{
-		}
-		[Test]
-		public void Test_9770()
-		{
-		}
-		[Test]
-		public void Test_9771()
-		{
-		}
-		[Test]
-		public void Test_9772()
-		{
-		}
-		[Test]
-		public void Test_9773()
-		{
-		}
-		[Test]
-		public void Test_9774()
-		{
-		}
-		[Test]
-		public void Test_9775()
-		{
-		}
-		[Test]
-		public void Test_9776()
-		{
-		}
-		[Test]
-		public void Test_9777()
-		{
-		}
-		[Test]
-		public void Test_9778()
-		{
-		}
-		[Test]
-		public void Test_9779()
-		{
-		}
-		[Test]
-		public void Test_9780()
-		{
-		}
-		[Test]
-		public void Test_9781()
-		{
-		}
-		[Test]
-		public void Test_9782()
-		{
-		}
-		[Test]
-		public void Test_9783()
-		{
-		}
-		[Test]
-		public void Test_9784()
-		{
-		}
-		[Test]
-		public void Test_9785()
-		{
-		}
-		[Test]
-		public void Test_9786()
-		{
-		}
-		[Test]
-		public void Test_9787()
-		{
-		}
-		[Test]
-		public void Test_9788()
-		{
-		}
-		[Test]
-		public void Test_9789()
-		{
-		}
-		[Test]
-		public void Test_9790()
-		{
-		}
-		[Test]
-		public void Test_9791()
-		{
-		}
-		[Test]
-		public void Test_9792()
-		{
-		}
-		[Test]
-		public void Test_9793()
-		{
-		}
-		[Test]
-		public void Test_9794()
-		{
-		}
-		[Test]
-		public void Test_9795()
-		{
-		}
-		[Test]
-		public void Test_9796()
-		{
-		}
-		[Test]
-		public void Test_9797()
-		{
-		}
-		[Test]
-		public void Test_9798()
-		{
-		}
-		[Test]
-		public void Test_9799()
-		{
-		}
-		[Test]
-		public void Test_9800()
-		{
-		}
-		[Test]
-		public void Test_9801()
-		{
-		}
-		[Test]
-		public void Test_9802()
-		{
-		}
-		[Test]
-		public void Test_9803()
-		{
-		}
-		[Test]
-		public void Test_9804()
-		{
-		}
-		[Test]
-		public void Test_9805()
-		{
-		}
-		[Test]
-		public void Test_9806()
-		{
-		}
-		[Test]
-		public void Test_9807()
-		{
-		}
-		[Test]
-		public void Test_9808()
-		{
-		}
-		[Test]
-		public void Test_9809()
-		{
-		}
-		[Test]
-		public void Test_9810()
-		{
-		}
-		[Test]
-		public void Test_9811()
-		{
-		}
-		[Test]
-		public void Test_9812()
-		{
-		}
-		[Test]
-		public void Test_9813()
-		{
-		}
-		[Test]
-		public void Test_9814()
-		{
-		}
-		[Test]
-		public void Test_9815()
-		{
-		}
-		[Test]
-		public void Test_9816()
-		{
-		}
-		[Test]
-		public void Test_9817()
-		{
-		}
-		[Test]
-		public void Test_9818()
-		{
-		}
-		[Test]
-		public void Test_9819()
-		{
-		}
-		[Test]
-		public void Test_9820()
-		{
-		}
-		[Test]
-		public void Test_9821()
-		{
-		}
-		[Test]
-		public void Test_9822()
-		{
-		}
-		[Test]
-		public void Test_9823()
-		{
-		}
-		[Test]
-		public void Test_9824()
-		{
-		}
-		[Test]
-		public void Test_9825()
-		{
-		}
-		[Test]
-		public void Test_9826()
-		{
-		}
-		[Test]
-		public void Test_9827()
-		{
-		}
-		[Test]
-		public void Test_9828()
-		{
-		}
-		[Test]
-		public void Test_9829()
-		{
-		}
-		[Test]
-		public void Test_9830()
-		{
-		}
-		[Test]
-		public void Test_9831()
-		{
-		}
-		[Test]
-		public void Test_9832()
-		{
-		}
-		[Test]
-		public void Test_9833()
-		{
-		}
-		[Test]
-		public void Test_9834()
-		{
-		}
-		[Test]
-		public void Test_9835()
-		{
-		}
-		[Test]
-		public void Test_9836()
-		{
-		}
-		[Test]
-		public void Test_9837()
-		{
-		}
-		[Test]
-		public void Test_9838()
-		{
-		}
-		[Test]
-		public void Test_9839()
-		{
-		}
-		[Test]
-		public void Test_9840()
-		{
-		}
-		[Test]
-		public void Test_9841()
-		{
-		}
-		[Test]
-		public void Test_9842()
-		{
-		}
-		[Test]
-		public void Test_9843()
-		{
-		}
-		[Test]
-		public void Test_9844()
-		{
-		}
-		[Test]
-		public void Test_9845()
-		{
-		}
-		[Test]
-		public void Test_9846()
-		{
-		}
-		[Test]
-		public void Test_9847()
-		{
-		}
-		[Test]
-		public void Test_9848()
-		{
-		}
-		[Test]
-		public void Test_9849()
-		{
-		}
-		[Test]
-		public void Test_9850()
-		{
-		}
-		[Test]
-		public void Test_9851()
-		{
-		}
-		[Test]
-		public void Test_9852()
-		{
-		}
-		[Test]
-		public void Test_9853()
-		{
-		}
-		[Test]
-		public void Test_9854()
-		{
-		}
-		[Test]
-		public void Test_9855()
-		{
-		}
-		[Test]
-		public void Test_9856()
-		{
-		}
-		[Test]
-		public void Test_9857()
-		{
-		}
-		[Test]
-		public void Test_9858()
-		{
-		}
-		[Test]
-		public void Test_9859()
-		{
-		}
-		[Test]
-		public void Test_9860()
-		{
-		}
-		[Test]
-		public void Test_9861()
-		{
-		}
-		[Test]
-		public void Test_9862()
-		{
-		}
-		[Test]
-		public void Test_9863()
-		{
-		}
-		[Test]
-		public void Test_9864()
-		{
-		}
-		[Test]
-		public void Test_9865()
-		{
-		}
-		[Test]
-		public void Test_9866()
-		{
-		}
-		[Test]
-		public void Test_9867()
-		{
-		}
-		[Test]
-		public void Test_9868()
-		{
-		}
-		[Test]
-		public void Test_9869()
-		{
-		}
-		[Test]
-		public void Test_9870()
-		{
-		}
-		[Test]
-		public void Test_9871()
-		{
-		}
-		[Test]
-		public void Test_9872()
-		{
-		}
-		[Test]
-		public void Test_9873()
-		{
-		}
-		[Test]
-		public void Test_9874()
-		{
-		}
-		[Test]
-		public void Test_9875()
-		{
-		}
-		[Test]
-		public void Test_9876()
-		{
-		}
-		[Test]
-		public void Test_9877()
-		{
-		}
-		[Test]
-		public void Test_9878()
-		{
-		}
-		[Test]
-		public void Test_9879()
-		{
-		}
-		[Test]
-		public void Test_9880()
-		{
-		}
-		[Test]
-		public void Test_9881()
-		{
-		}
-		[Test]
-		public void Test_9882()
-		{
-		}
-		[Test]
-		public void Test_9883()
-		{
-		}
-		[Test]
-		public void Test_9884()
-		{
-		}
-		[Test]
-		public void Test_9885()
-		{
-		}
-		[Test]
-		public void Test_9886()
-		{
-		}
-		[Test]
-		public void Test_9887()
-		{
-		}
-		[Test]
-		public void Test_9888()
-		{
-		}
-		[Test]
-		public void Test_9889()
-		{
-		}
-		[Test]
-		public void Test_9890()
-		{
-		}
-		[Test]
-		public void Test_9891()
-		{
-		}
-		[Test]
-		public void Test_9892()
-		{
-		}
-		[Test]
-		public void Test_9893()
-		{
-		}
-		[Test]
-		public void Test_9894()
-		{
-		}
-		[Test]
-		public void Test_9895()
-		{
-		}
-		[Test]
-		public void Test_9896()
-		{
-		}
-		[Test]
-		public void Test_9897()
-		{
-		}
-		[Test]
-		public void Test_9898()
-		{
-		}
-		[Test]
-		public void Test_9899()
-		{
-		}
-		[Test]
-		public void Test_9900()
-		{
-		}
-		[Test]
-		public void Test_9901()
-		{
-		}
-		[Test]
-		public void Test_9902()
-		{
-		}
-		[Test]
-		public void Test_9903()
-		{
-		}
-		[Test]
-		public void Test_9904()
-		{
-		}
-		[Test]
-		public void Test_9905()
-		{
-		}
-		[Test]
-		public void Test_9906()
-		{
-		}
-		[Test]
-		public void Test_9907()
-		{
-		}
-		[Test]
-		public void Test_9908()
-		{
-		}
-		[Test]
-		public void Test_9909()
-		{
-		}
-		[Test]
-		public void Test_9910()
-		{
-		}
-		[Test]
-		public void Test_9911()
-		{
-		}
-		[Test]
-		public void Test_9912()
-		{
-		}
-		[Test]
-		public void Test_9913()
-		{
-		}
-		[Test]
-		public void Test_9914()
-		{
-		}
-		[Test]
-		public void Test_9915()
-		{
-		}
-		[Test]
-		public void Test_9916()
-		{
-		}
-		[Test]
-		public void Test_9917()
-		{
-		}
-		[Test]
-		public void Test_9918()
-		{
-		}
-		[Test]
-		public void Test_9919()
-		{
-		}
-		[Test]
-		public void Test_9920()
-		{
-		}
-		[Test]
-		public void Test_9921()
-		{
-		}
-		[Test]
-		public void Test_9922()
-		{
-		}
-		[Test]
-		public void Test_9923()
-		{
-		}
-		[Test]
-		public void Test_9924()
-		{
-		}
-		[Test]
-		public void Test_9925()
-		{
-		}
-		[Test]
-		public void Test_9926()
-		{
-		}
-		[Test]
-		public void Test_9927()
-		{
-		}
-		[Test]
-		public void Test_9928()
-		{
-		}
-		[Test]
-		public void Test_9929()
-		{
-		}
-		[Test]
-		public void Test_9930()
-		{
-		}
-		[Test]
-		public void Test_9931()
-		{
-		}
-		[Test]
-		public void Test_9932()
-		{
-		}
-		[Test]
-		public void Test_9933()
-		{
-		}
-		[Test]
-		public void Test_9934()
-		{
-		}
-		[Test]
-		public void Test_9935()
-		{
-		}
-		[Test]
-		public void Test_9936()
-		{
-		}
-		[Test]
-		public void Test_9937()
-		{
-		}
-		[Test]
-		public void Test_9938()
-		{
-		}
-		[Test]
-		public void Test_9939()
-		{
-		}
-		[Test]
-		public void Test_9940()
-		{
-		}
-		[Test]
-		public void Test_9941()
-		{
-		}
-		[Test]
-		public void Test_9942()
-		{
-		}
-		[Test]
-		public void Test_9943()
-		{
-		}
-		[Test]
-		public void Test_9944()
-		{
-		}
-		[Test]
-		public void Test_9945()
-		{
-		}
-		[Test]
-		public void Test_9946()
-		{
-		}
-		[Test]
-		public void Test_9947()
-		{
-		}
-		[Test]
-		public void Test_9948()
-		{
-		}
-		[Test]
-		public void Test_9949()
-		{
-		}
-		[Test]
-		public void Test_9950()
-		{
-		}
-		[Test]
-		public void Test_9951()
-		{
-		}
-		[Test]
-		public void Test_9952()
-		{
-		}
-		[Test]
-		public void Test_9953()
-		{
-		}
-		[Test]
-		public void Test_9954()
-		{
-		}
-		[Test]
-		public void Test_9955()
-		{
-		}
-		[Test]
-		public void Test_9956()
-		{
-		}
-		[Test]
-		public void Test_9957()
-		{
-		}
-		[Test]
-		public void Test_9958()
-		{
-		}
-		[Test]
-		public void Test_9959()
-		{
-		}
-		[Test]
-		public void Test_9960()
-		{
-		}
-		[Test]
-		public void Test_9961()
-		{
-		}
-		[Test]
-		public void Test_9962()
-		{
-		}
-		[Test]
-		public void Test_9963()
-		{
-		}
-		[Test]
-		public void Test_9964()
-		{
-		}
-		[Test]
-		public void Test_9965()
-		{
-		}
-		[Test]
-		public void Test_9966()
-		{
-		}
-		[Test]
-		public void Test_9967()
-		{
-		}
-		[Test]
-		public void Test_9968()
-		{
-		}
-		[Test]
-		public void Test_9969()
-		{
-		}
-		[Test]
-		public void Test_9970()
-		{
-		}
-		[Test]
-		public void Test_9971()
-		{
-		}
-		[Test]
-		public void Test_9972()
-		{
-		}
-		[Test]
-		public void Test_9973()
-		{
-		}
-		[Test]
-		public void Test_9974()
-		{
-		}
-		[Test]
-		public void Test_9975()
-		{
-		}
-		[Test]
-		public void Test_9976()
-		{
-		}
-		[Test]
-		public void Test_9977()
-		{
-		}
-		[Test]
-		public void Test_9978()
-		{
-		}
-		[Test]
-		public void Test_9979()
-		{
-		}
-		[Test]
-		public void Test_9980()
-		{
-		}
-		[Test]
-		public void Test_9981()
-		{
-		}
-		[Test]
-		public void Test_9982()
-		{
-		}
-		[Test]
-		public void Test_9983()
-		{
-		}
-		[Test]
-		public void Test_9984()
-		{
-		}
-		[Test]
-		public void Test_9985()
-		{
-		}
-		[Test]
-		public void Test_9986()
-		{
-		}
-		[Test]
-		public void Test_9987()
-		{
-		}
-		[Test]
-		public void Test_9988()
-		{
-		}
-		[Test]
-		public void Test_9989()
-		{
-		}
-		[Test]
-		public void Test_9990()
-		{
-		}
-		[Test]
-		public void Test_9991()
-		{
-		}
-		[Test]
-		public void Test_9992()
-		{
-		}
-		[Test]
-		public void Test_9993()
-		{
-		}
-		[Test]
-		public void Test_9994()
-		{
-		}
-		[Test]
-		public void Test_9995()
-		{
-		}
-		[Test]
-		public void Test_9996()
-		{
-		}
-		[Test]
-		public void Test_9997()
-		{
-		}
-		[Test]
-		public void Test_9998()
-		{
-		}
-		[Test]
-		public void Test_9999()
-		{
-		}
-		[Test]
-		public void Test_10000()
-		{
-		}
-		#endregion
-
-		#region FailingTests
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.tt b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.tt
deleted file mode 100644
index 59f231f810..0000000000
--- a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NunitTests.tt
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace NUnitAdapterPerfTests
-{
-
-	public class NunitTests
-    {
-<#
-	int passedTests = 10000;
-	int failedTests = 0;
-	String padding = "00";
-	int count = 1;
-	String testmethodprefix = "Test_";
-
-
-#>
-
-		#region PassingTests
-<#
-	for(int i=0;i<passedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[Test]
-		public void <#=methodName#>()
-		{
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-
-		#region FailingTests
-<#
-	for(int i=0;i<failedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[Test]
-		public void <#=methodName#>()
-		{
-			Assert.Fail();
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj
deleted file mode 100644
index 72c1aa7187..0000000000
--- a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
-  <Import Project="..\..\..\..\scripts\build\TestAssets.props" />
-  
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="XunitTests.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>XunitTests.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="XunitTests.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>XunitTests.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-</Project>
diff --git a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.cs b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.cs
deleted file mode 100644
index 25fbbeff35..0000000000
--- a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.cs
+++ /dev/null
@@ -1,40015 +0,0 @@
-using Xunit;
-
-namespace XUnitAdapterPerfTests
-{
-	public class XuniTests
-    {
-
-		#region PassingTests
-		[Fact]
-		public void Test_01()
-		{
-		}
-		[Fact]
-		public void Test_02()
-		{
-		}
-		[Fact]
-		public void Test_03()
-		{
-		}
-		[Fact]
-		public void Test_04()
-		{
-		}
-		[Fact]
-		public void Test_05()
-		{
-		}
-		[Fact]
-		public void Test_06()
-		{
-		}
-		[Fact]
-		public void Test_07()
-		{
-		}
-		[Fact]
-		public void Test_08()
-		{
-		}
-		[Fact]
-		public void Test_09()
-		{
-		}
-		[Fact]
-		public void Test_10()
-		{
-		}
-		[Fact]
-		public void Test_11()
-		{
-		}
-		[Fact]
-		public void Test_12()
-		{
-		}
-		[Fact]
-		public void Test_13()
-		{
-		}
-		[Fact]
-		public void Test_14()
-		{
-		}
-		[Fact]
-		public void Test_15()
-		{
-		}
-		[Fact]
-		public void Test_16()
-		{
-		}
-		[Fact]
-		public void Test_17()
-		{
-		}
-		[Fact]
-		public void Test_18()
-		{
-		}
-		[Fact]
-		public void Test_19()
-		{
-		}
-		[Fact]
-		public void Test_20()
-		{
-		}
-		[Fact]
-		public void Test_21()
-		{
-		}
-		[Fact]
-		public void Test_22()
-		{
-		}
-		[Fact]
-		public void Test_23()
-		{
-		}
-		[Fact]
-		public void Test_24()
-		{
-		}
-		[Fact]
-		public void Test_25()
-		{
-		}
-		[Fact]
-		public void Test_26()
-		{
-		}
-		[Fact]
-		public void Test_27()
-		{
-		}
-		[Fact]
-		public void Test_28()
-		{
-		}
-		[Fact]
-		public void Test_29()
-		{
-		}
-		[Fact]
-		public void Test_30()
-		{
-		}
-		[Fact]
-		public void Test_31()
-		{
-		}
-		[Fact]
-		public void Test_32()
-		{
-		}
-		[Fact]
-		public void Test_33()
-		{
-		}
-		[Fact]
-		public void Test_34()
-		{
-		}
-		[Fact]
-		public void Test_35()
-		{
-		}
-		[Fact]
-		public void Test_36()
-		{
-		}
-		[Fact]
-		public void Test_37()
-		{
-		}
-		[Fact]
-		public void Test_38()
-		{
-		}
-		[Fact]
-		public void Test_39()
-		{
-		}
-		[Fact]
-		public void Test_40()
-		{
-		}
-		[Fact]
-		public void Test_41()
-		{
-		}
-		[Fact]
-		public void Test_42()
-		{
-		}
-		[Fact]
-		public void Test_43()
-		{
-		}
-		[Fact]
-		public void Test_44()
-		{
-		}
-		[Fact]
-		public void Test_45()
-		{
-		}
-		[Fact]
-		public void Test_46()
-		{
-		}
-		[Fact]
-		public void Test_47()
-		{
-		}
-		[Fact]
-		public void Test_48()
-		{
-		}
-		[Fact]
-		public void Test_49()
-		{
-		}
-		[Fact]
-		public void Test_50()
-		{
-		}
-		[Fact]
-		public void Test_51()
-		{
-		}
-		[Fact]
-		public void Test_52()
-		{
-		}
-		[Fact]
-		public void Test_53()
-		{
-		}
-		[Fact]
-		public void Test_54()
-		{
-		}
-		[Fact]
-		public void Test_55()
-		{
-		}
-		[Fact]
-		public void Test_56()
-		{
-		}
-		[Fact]
-		public void Test_57()
-		{
-		}
-		[Fact]
-		public void Test_58()
-		{
-		}
-		[Fact]
-		public void Test_59()
-		{
-		}
-		[Fact]
-		public void Test_60()
-		{
-		}
-		[Fact]
-		public void Test_61()
-		{
-		}
-		[Fact]
-		public void Test_62()
-		{
-		}
-		[Fact]
-		public void Test_63()
-		{
-		}
-		[Fact]
-		public void Test_64()
-		{
-		}
-		[Fact]
-		public void Test_65()
-		{
-		}
-		[Fact]
-		public void Test_66()
-		{
-		}
-		[Fact]
-		public void Test_67()
-		{
-		}
-		[Fact]
-		public void Test_68()
-		{
-		}
-		[Fact]
-		public void Test_69()
-		{
-		}
-		[Fact]
-		public void Test_70()
-		{
-		}
-		[Fact]
-		public void Test_71()
-		{
-		}
-		[Fact]
-		public void Test_72()
-		{
-		}
-		[Fact]
-		public void Test_73()
-		{
-		}
-		[Fact]
-		public void Test_74()
-		{
-		}
-		[Fact]
-		public void Test_75()
-		{
-		}
-		[Fact]
-		public void Test_76()
-		{
-		}
-		[Fact]
-		public void Test_77()
-		{
-		}
-		[Fact]
-		public void Test_78()
-		{
-		}
-		[Fact]
-		public void Test_79()
-		{
-		}
-		[Fact]
-		public void Test_80()
-		{
-		}
-		[Fact]
-		public void Test_81()
-		{
-		}
-		[Fact]
-		public void Test_82()
-		{
-		}
-		[Fact]
-		public void Test_83()
-		{
-		}
-		[Fact]
-		public void Test_84()
-		{
-		}
-		[Fact]
-		public void Test_85()
-		{
-		}
-		[Fact]
-		public void Test_86()
-		{
-		}
-		[Fact]
-		public void Test_87()
-		{
-		}
-		[Fact]
-		public void Test_88()
-		{
-		}
-		[Fact]
-		public void Test_89()
-		{
-		}
-		[Fact]
-		public void Test_90()
-		{
-		}
-		[Fact]
-		public void Test_91()
-		{
-		}
-		[Fact]
-		public void Test_92()
-		{
-		}
-		[Fact]
-		public void Test_93()
-		{
-		}
-		[Fact]
-		public void Test_94()
-		{
-		}
-		[Fact]
-		public void Test_95()
-		{
-		}
-		[Fact]
-		public void Test_96()
-		{
-		}
-		[Fact]
-		public void Test_97()
-		{
-		}
-		[Fact]
-		public void Test_98()
-		{
-		}
-		[Fact]
-		public void Test_99()
-		{
-		}
-		[Fact]
-		public void Test_100()
-		{
-		}
-		[Fact]
-		public void Test_101()
-		{
-		}
-		[Fact]
-		public void Test_102()
-		{
-		}
-		[Fact]
-		public void Test_103()
-		{
-		}
-		[Fact]
-		public void Test_104()
-		{
-		}
-		[Fact]
-		public void Test_105()
-		{
-		}
-		[Fact]
-		public void Test_106()
-		{
-		}
-		[Fact]
-		public void Test_107()
-		{
-		}
-		[Fact]
-		public void Test_108()
-		{
-		}
-		[Fact]
-		public void Test_109()
-		{
-		}
-		[Fact]
-		public void Test_110()
-		{
-		}
-		[Fact]
-		public void Test_111()
-		{
-		}
-		[Fact]
-		public void Test_112()
-		{
-		}
-		[Fact]
-		public void Test_113()
-		{
-		}
-		[Fact]
-		public void Test_114()
-		{
-		}
-		[Fact]
-		public void Test_115()
-		{
-		}
-		[Fact]
-		public void Test_116()
-		{
-		}
-		[Fact]
-		public void Test_117()
-		{
-		}
-		[Fact]
-		public void Test_118()
-		{
-		}
-		[Fact]
-		public void Test_119()
-		{
-		}
-		[Fact]
-		public void Test_120()
-		{
-		}
-		[Fact]
-		public void Test_121()
-		{
-		}
-		[Fact]
-		public void Test_122()
-		{
-		}
-		[Fact]
-		public void Test_123()
-		{
-		}
-		[Fact]
-		public void Test_124()
-		{
-		}
-		[Fact]
-		public void Test_125()
-		{
-		}
-		[Fact]
-		public void Test_126()
-		{
-		}
-		[Fact]
-		public void Test_127()
-		{
-		}
-		[Fact]
-		public void Test_128()
-		{
-		}
-		[Fact]
-		public void Test_129()
-		{
-		}
-		[Fact]
-		public void Test_130()
-		{
-		}
-		[Fact]
-		public void Test_131()
-		{
-		}
-		[Fact]
-		public void Test_132()
-		{
-		}
-		[Fact]
-		public void Test_133()
-		{
-		}
-		[Fact]
-		public void Test_134()
-		{
-		}
-		[Fact]
-		public void Test_135()
-		{
-		}
-		[Fact]
-		public void Test_136()
-		{
-		}
-		[Fact]
-		public void Test_137()
-		{
-		}
-		[Fact]
-		public void Test_138()
-		{
-		}
-		[Fact]
-		public void Test_139()
-		{
-		}
-		[Fact]
-		public void Test_140()
-		{
-		}
-		[Fact]
-		public void Test_141()
-		{
-		}
-		[Fact]
-		public void Test_142()
-		{
-		}
-		[Fact]
-		public void Test_143()
-		{
-		}
-		[Fact]
-		public void Test_144()
-		{
-		}
-		[Fact]
-		public void Test_145()
-		{
-		}
-		[Fact]
-		public void Test_146()
-		{
-		}
-		[Fact]
-		public void Test_147()
-		{
-		}
-		[Fact]
-		public void Test_148()
-		{
-		}
-		[Fact]
-		public void Test_149()
-		{
-		}
-		[Fact]
-		public void Test_150()
-		{
-		}
-		[Fact]
-		public void Test_151()
-		{
-		}
-		[Fact]
-		public void Test_152()
-		{
-		}
-		[Fact]
-		public void Test_153()
-		{
-		}
-		[Fact]
-		public void Test_154()
-		{
-		}
-		[Fact]
-		public void Test_155()
-		{
-		}
-		[Fact]
-		public void Test_156()
-		{
-		}
-		[Fact]
-		public void Test_157()
-		{
-		}
-		[Fact]
-		public void Test_158()
-		{
-		}
-		[Fact]
-		public void Test_159()
-		{
-		}
-		[Fact]
-		public void Test_160()
-		{
-		}
-		[Fact]
-		public void Test_161()
-		{
-		}
-		[Fact]
-		public void Test_162()
-		{
-		}
-		[Fact]
-		public void Test_163()
-		{
-		}
-		[Fact]
-		public void Test_164()
-		{
-		}
-		[Fact]
-		public void Test_165()
-		{
-		}
-		[Fact]
-		public void Test_166()
-		{
-		}
-		[Fact]
-		public void Test_167()
-		{
-		}
-		[Fact]
-		public void Test_168()
-		{
-		}
-		[Fact]
-		public void Test_169()
-		{
-		}
-		[Fact]
-		public void Test_170()
-		{
-		}
-		[Fact]
-		public void Test_171()
-		{
-		}
-		[Fact]
-		public void Test_172()
-		{
-		}
-		[Fact]
-		public void Test_173()
-		{
-		}
-		[Fact]
-		public void Test_174()
-		{
-		}
-		[Fact]
-		public void Test_175()
-		{
-		}
-		[Fact]
-		public void Test_176()
-		{
-		}
-		[Fact]
-		public void Test_177()
-		{
-		}
-		[Fact]
-		public void Test_178()
-		{
-		}
-		[Fact]
-		public void Test_179()
-		{
-		}
-		[Fact]
-		public void Test_180()
-		{
-		}
-		[Fact]
-		public void Test_181()
-		{
-		}
-		[Fact]
-		public void Test_182()
-		{
-		}
-		[Fact]
-		public void Test_183()
-		{
-		}
-		[Fact]
-		public void Test_184()
-		{
-		}
-		[Fact]
-		public void Test_185()
-		{
-		}
-		[Fact]
-		public void Test_186()
-		{
-		}
-		[Fact]
-		public void Test_187()
-		{
-		}
-		[Fact]
-		public void Test_188()
-		{
-		}
-		[Fact]
-		public void Test_189()
-		{
-		}
-		[Fact]
-		public void Test_190()
-		{
-		}
-		[Fact]
-		public void Test_191()
-		{
-		}
-		[Fact]
-		public void Test_192()
-		{
-		}
-		[Fact]
-		public void Test_193()
-		{
-		}
-		[Fact]
-		public void Test_194()
-		{
-		}
-		[Fact]
-		public void Test_195()
-		{
-		}
-		[Fact]
-		public void Test_196()
-		{
-		}
-		[Fact]
-		public void Test_197()
-		{
-		}
-		[Fact]
-		public void Test_198()
-		{
-		}
-		[Fact]
-		public void Test_199()
-		{
-		}
-		[Fact]
-		public void Test_200()
-		{
-		}
-		[Fact]
-		public void Test_201()
-		{
-		}
-		[Fact]
-		public void Test_202()
-		{
-		}
-		[Fact]
-		public void Test_203()
-		{
-		}
-		[Fact]
-		public void Test_204()
-		{
-		}
-		[Fact]
-		public void Test_205()
-		{
-		}
-		[Fact]
-		public void Test_206()
-		{
-		}
-		[Fact]
-		public void Test_207()
-		{
-		}
-		[Fact]
-		public void Test_208()
-		{
-		}
-		[Fact]
-		public void Test_209()
-		{
-		}
-		[Fact]
-		public void Test_210()
-		{
-		}
-		[Fact]
-		public void Test_211()
-		{
-		}
-		[Fact]
-		public void Test_212()
-		{
-		}
-		[Fact]
-		public void Test_213()
-		{
-		}
-		[Fact]
-		public void Test_214()
-		{
-		}
-		[Fact]
-		public void Test_215()
-		{
-		}
-		[Fact]
-		public void Test_216()
-		{
-		}
-		[Fact]
-		public void Test_217()
-		{
-		}
-		[Fact]
-		public void Test_218()
-		{
-		}
-		[Fact]
-		public void Test_219()
-		{
-		}
-		[Fact]
-		public void Test_220()
-		{
-		}
-		[Fact]
-		public void Test_221()
-		{
-		}
-		[Fact]
-		public void Test_222()
-		{
-		}
-		[Fact]
-		public void Test_223()
-		{
-		}
-		[Fact]
-		public void Test_224()
-		{
-		}
-		[Fact]
-		public void Test_225()
-		{
-		}
-		[Fact]
-		public void Test_226()
-		{
-		}
-		[Fact]
-		public void Test_227()
-		{
-		}
-		[Fact]
-		public void Test_228()
-		{
-		}
-		[Fact]
-		public void Test_229()
-		{
-		}
-		[Fact]
-		public void Test_230()
-		{
-		}
-		[Fact]
-		public void Test_231()
-		{
-		}
-		[Fact]
-		public void Test_232()
-		{
-		}
-		[Fact]
-		public void Test_233()
-		{
-		}
-		[Fact]
-		public void Test_234()
-		{
-		}
-		[Fact]
-		public void Test_235()
-		{
-		}
-		[Fact]
-		public void Test_236()
-		{
-		}
-		[Fact]
-		public void Test_237()
-		{
-		}
-		[Fact]
-		public void Test_238()
-		{
-		}
-		[Fact]
-		public void Test_239()
-		{
-		}
-		[Fact]
-		public void Test_240()
-		{
-		}
-		[Fact]
-		public void Test_241()
-		{
-		}
-		[Fact]
-		public void Test_242()
-		{
-		}
-		[Fact]
-		public void Test_243()
-		{
-		}
-		[Fact]
-		public void Test_244()
-		{
-		}
-		[Fact]
-		public void Test_245()
-		{
-		}
-		[Fact]
-		public void Test_246()
-		{
-		}
-		[Fact]
-		public void Test_247()
-		{
-		}
-		[Fact]
-		public void Test_248()
-		{
-		}
-		[Fact]
-		public void Test_249()
-		{
-		}
-		[Fact]
-		public void Test_250()
-		{
-		}
-		[Fact]
-		public void Test_251()
-		{
-		}
-		[Fact]
-		public void Test_252()
-		{
-		}
-		[Fact]
-		public void Test_253()
-		{
-		}
-		[Fact]
-		public void Test_254()
-		{
-		}
-		[Fact]
-		public void Test_255()
-		{
-		}
-		[Fact]
-		public void Test_256()
-		{
-		}
-		[Fact]
-		public void Test_257()
-		{
-		}
-		[Fact]
-		public void Test_258()
-		{
-		}
-		[Fact]
-		public void Test_259()
-		{
-		}
-		[Fact]
-		public void Test_260()
-		{
-		}
-		[Fact]
-		public void Test_261()
-		{
-		}
-		[Fact]
-		public void Test_262()
-		{
-		}
-		[Fact]
-		public void Test_263()
-		{
-		}
-		[Fact]
-		public void Test_264()
-		{
-		}
-		[Fact]
-		public void Test_265()
-		{
-		}
-		[Fact]
-		public void Test_266()
-		{
-		}
-		[Fact]
-		public void Test_267()
-		{
-		}
-		[Fact]
-		public void Test_268()
-		{
-		}
-		[Fact]
-		public void Test_269()
-		{
-		}
-		[Fact]
-		public void Test_270()
-		{
-		}
-		[Fact]
-		public void Test_271()
-		{
-		}
-		[Fact]
-		public void Test_272()
-		{
-		}
-		[Fact]
-		public void Test_273()
-		{
-		}
-		[Fact]
-		public void Test_274()
-		{
-		}
-		[Fact]
-		public void Test_275()
-		{
-		}
-		[Fact]
-		public void Test_276()
-		{
-		}
-		[Fact]
-		public void Test_277()
-		{
-		}
-		[Fact]
-		public void Test_278()
-		{
-		}
-		[Fact]
-		public void Test_279()
-		{
-		}
-		[Fact]
-		public void Test_280()
-		{
-		}
-		[Fact]
-		public void Test_281()
-		{
-		}
-		[Fact]
-		public void Test_282()
-		{
-		}
-		[Fact]
-		public void Test_283()
-		{
-		}
-		[Fact]
-		public void Test_284()
-		{
-		}
-		[Fact]
-		public void Test_285()
-		{
-		}
-		[Fact]
-		public void Test_286()
-		{
-		}
-		[Fact]
-		public void Test_287()
-		{
-		}
-		[Fact]
-		public void Test_288()
-		{
-		}
-		[Fact]
-		public void Test_289()
-		{
-		}
-		[Fact]
-		public void Test_290()
-		{
-		}
-		[Fact]
-		public void Test_291()
-		{
-		}
-		[Fact]
-		public void Test_292()
-		{
-		}
-		[Fact]
-		public void Test_293()
-		{
-		}
-		[Fact]
-		public void Test_294()
-		{
-		}
-		[Fact]
-		public void Test_295()
-		{
-		}
-		[Fact]
-		public void Test_296()
-		{
-		}
-		[Fact]
-		public void Test_297()
-		{
-		}
-		[Fact]
-		public void Test_298()
-		{
-		}
-		[Fact]
-		public void Test_299()
-		{
-		}
-		[Fact]
-		public void Test_300()
-		{
-		}
-		[Fact]
-		public void Test_301()
-		{
-		}
-		[Fact]
-		public void Test_302()
-		{
-		}
-		[Fact]
-		public void Test_303()
-		{
-		}
-		[Fact]
-		public void Test_304()
-		{
-		}
-		[Fact]
-		public void Test_305()
-		{
-		}
-		[Fact]
-		public void Test_306()
-		{
-		}
-		[Fact]
-		public void Test_307()
-		{
-		}
-		[Fact]
-		public void Test_308()
-		{
-		}
-		[Fact]
-		public void Test_309()
-		{
-		}
-		[Fact]
-		public void Test_310()
-		{
-		}
-		[Fact]
-		public void Test_311()
-		{
-		}
-		[Fact]
-		public void Test_312()
-		{
-		}
-		[Fact]
-		public void Test_313()
-		{
-		}
-		[Fact]
-		public void Test_314()
-		{
-		}
-		[Fact]
-		public void Test_315()
-		{
-		}
-		[Fact]
-		public void Test_316()
-		{
-		}
-		[Fact]
-		public void Test_317()
-		{
-		}
-		[Fact]
-		public void Test_318()
-		{
-		}
-		[Fact]
-		public void Test_319()
-		{
-		}
-		[Fact]
-		public void Test_320()
-		{
-		}
-		[Fact]
-		public void Test_321()
-		{
-		}
-		[Fact]
-		public void Test_322()
-		{
-		}
-		[Fact]
-		public void Test_323()
-		{
-		}
-		[Fact]
-		public void Test_324()
-		{
-		}
-		[Fact]
-		public void Test_325()
-		{
-		}
-		[Fact]
-		public void Test_326()
-		{
-		}
-		[Fact]
-		public void Test_327()
-		{
-		}
-		[Fact]
-		public void Test_328()
-		{
-		}
-		[Fact]
-		public void Test_329()
-		{
-		}
-		[Fact]
-		public void Test_330()
-		{
-		}
-		[Fact]
-		public void Test_331()
-		{
-		}
-		[Fact]
-		public void Test_332()
-		{
-		}
-		[Fact]
-		public void Test_333()
-		{
-		}
-		[Fact]
-		public void Test_334()
-		{
-		}
-		[Fact]
-		public void Test_335()
-		{
-		}
-		[Fact]
-		public void Test_336()
-		{
-		}
-		[Fact]
-		public void Test_337()
-		{
-		}
-		[Fact]
-		public void Test_338()
-		{
-		}
-		[Fact]
-		public void Test_339()
-		{
-		}
-		[Fact]
-		public void Test_340()
-		{
-		}
-		[Fact]
-		public void Test_341()
-		{
-		}
-		[Fact]
-		public void Test_342()
-		{
-		}
-		[Fact]
-		public void Test_343()
-		{
-		}
-		[Fact]
-		public void Test_344()
-		{
-		}
-		[Fact]
-		public void Test_345()
-		{
-		}
-		[Fact]
-		public void Test_346()
-		{
-		}
-		[Fact]
-		public void Test_347()
-		{
-		}
-		[Fact]
-		public void Test_348()
-		{
-		}
-		[Fact]
-		public void Test_349()
-		{
-		}
-		[Fact]
-		public void Test_350()
-		{
-		}
-		[Fact]
-		public void Test_351()
-		{
-		}
-		[Fact]
-		public void Test_352()
-		{
-		}
-		[Fact]
-		public void Test_353()
-		{
-		}
-		[Fact]
-		public void Test_354()
-		{
-		}
-		[Fact]
-		public void Test_355()
-		{
-		}
-		[Fact]
-		public void Test_356()
-		{
-		}
-		[Fact]
-		public void Test_357()
-		{
-		}
-		[Fact]
-		public void Test_358()
-		{
-		}
-		[Fact]
-		public void Test_359()
-		{
-		}
-		[Fact]
-		public void Test_360()
-		{
-		}
-		[Fact]
-		public void Test_361()
-		{
-		}
-		[Fact]
-		public void Test_362()
-		{
-		}
-		[Fact]
-		public void Test_363()
-		{
-		}
-		[Fact]
-		public void Test_364()
-		{
-		}
-		[Fact]
-		public void Test_365()
-		{
-		}
-		[Fact]
-		public void Test_366()
-		{
-		}
-		[Fact]
-		public void Test_367()
-		{
-		}
-		[Fact]
-		public void Test_368()
-		{
-		}
-		[Fact]
-		public void Test_369()
-		{
-		}
-		[Fact]
-		public void Test_370()
-		{
-		}
-		[Fact]
-		public void Test_371()
-		{
-		}
-		[Fact]
-		public void Test_372()
-		{
-		}
-		[Fact]
-		public void Test_373()
-		{
-		}
-		[Fact]
-		public void Test_374()
-		{
-		}
-		[Fact]
-		public void Test_375()
-		{
-		}
-		[Fact]
-		public void Test_376()
-		{
-		}
-		[Fact]
-		public void Test_377()
-		{
-		}
-		[Fact]
-		public void Test_378()
-		{
-		}
-		[Fact]
-		public void Test_379()
-		{
-		}
-		[Fact]
-		public void Test_380()
-		{
-		}
-		[Fact]
-		public void Test_381()
-		{
-		}
-		[Fact]
-		public void Test_382()
-		{
-		}
-		[Fact]
-		public void Test_383()
-		{
-		}
-		[Fact]
-		public void Test_384()
-		{
-		}
-		[Fact]
-		public void Test_385()
-		{
-		}
-		[Fact]
-		public void Test_386()
-		{
-		}
-		[Fact]
-		public void Test_387()
-		{
-		}
-		[Fact]
-		public void Test_388()
-		{
-		}
-		[Fact]
-		public void Test_389()
-		{
-		}
-		[Fact]
-		public void Test_390()
-		{
-		}
-		[Fact]
-		public void Test_391()
-		{
-		}
-		[Fact]
-		public void Test_392()
-		{
-		}
-		[Fact]
-		public void Test_393()
-		{
-		}
-		[Fact]
-		public void Test_394()
-		{
-		}
-		[Fact]
-		public void Test_395()
-		{
-		}
-		[Fact]
-		public void Test_396()
-		{
-		}
-		[Fact]
-		public void Test_397()
-		{
-		}
-		[Fact]
-		public void Test_398()
-		{
-		}
-		[Fact]
-		public void Test_399()
-		{
-		}
-		[Fact]
-		public void Test_400()
-		{
-		}
-		[Fact]
-		public void Test_401()
-		{
-		}
-		[Fact]
-		public void Test_402()
-		{
-		}
-		[Fact]
-		public void Test_403()
-		{
-		}
-		[Fact]
-		public void Test_404()
-		{
-		}
-		[Fact]
-		public void Test_405()
-		{
-		}
-		[Fact]
-		public void Test_406()
-		{
-		}
-		[Fact]
-		public void Test_407()
-		{
-		}
-		[Fact]
-		public void Test_408()
-		{
-		}
-		[Fact]
-		public void Test_409()
-		{
-		}
-		[Fact]
-		public void Test_410()
-		{
-		}
-		[Fact]
-		public void Test_411()
-		{
-		}
-		[Fact]
-		public void Test_412()
-		{
-		}
-		[Fact]
-		public void Test_413()
-		{
-		}
-		[Fact]
-		public void Test_414()
-		{
-		}
-		[Fact]
-		public void Test_415()
-		{
-		}
-		[Fact]
-		public void Test_416()
-		{
-		}
-		[Fact]
-		public void Test_417()
-		{
-		}
-		[Fact]
-		public void Test_418()
-		{
-		}
-		[Fact]
-		public void Test_419()
-		{
-		}
-		[Fact]
-		public void Test_420()
-		{
-		}
-		[Fact]
-		public void Test_421()
-		{
-		}
-		[Fact]
-		public void Test_422()
-		{
-		}
-		[Fact]
-		public void Test_423()
-		{
-		}
-		[Fact]
-		public void Test_424()
-		{
-		}
-		[Fact]
-		public void Test_425()
-		{
-		}
-		[Fact]
-		public void Test_426()
-		{
-		}
-		[Fact]
-		public void Test_427()
-		{
-		}
-		[Fact]
-		public void Test_428()
-		{
-		}
-		[Fact]
-		public void Test_429()
-		{
-		}
-		[Fact]
-		public void Test_430()
-		{
-		}
-		[Fact]
-		public void Test_431()
-		{
-		}
-		[Fact]
-		public void Test_432()
-		{
-		}
-		[Fact]
-		public void Test_433()
-		{
-		}
-		[Fact]
-		public void Test_434()
-		{
-		}
-		[Fact]
-		public void Test_435()
-		{
-		}
-		[Fact]
-		public void Test_436()
-		{
-		}
-		[Fact]
-		public void Test_437()
-		{
-		}
-		[Fact]
-		public void Test_438()
-		{
-		}
-		[Fact]
-		public void Test_439()
-		{
-		}
-		[Fact]
-		public void Test_440()
-		{
-		}
-		[Fact]
-		public void Test_441()
-		{
-		}
-		[Fact]
-		public void Test_442()
-		{
-		}
-		[Fact]
-		public void Test_443()
-		{
-		}
-		[Fact]
-		public void Test_444()
-		{
-		}
-		[Fact]
-		public void Test_445()
-		{
-		}
-		[Fact]
-		public void Test_446()
-		{
-		}
-		[Fact]
-		public void Test_447()
-		{
-		}
-		[Fact]
-		public void Test_448()
-		{
-		}
-		[Fact]
-		public void Test_449()
-		{
-		}
-		[Fact]
-		public void Test_450()
-		{
-		}
-		[Fact]
-		public void Test_451()
-		{
-		}
-		[Fact]
-		public void Test_452()
-		{
-		}
-		[Fact]
-		public void Test_453()
-		{
-		}
-		[Fact]
-		public void Test_454()
-		{
-		}
-		[Fact]
-		public void Test_455()
-		{
-		}
-		[Fact]
-		public void Test_456()
-		{
-		}
-		[Fact]
-		public void Test_457()
-		{
-		}
-		[Fact]
-		public void Test_458()
-		{
-		}
-		[Fact]
-		public void Test_459()
-		{
-		}
-		[Fact]
-		public void Test_460()
-		{
-		}
-		[Fact]
-		public void Test_461()
-		{
-		}
-		[Fact]
-		public void Test_462()
-		{
-		}
-		[Fact]
-		public void Test_463()
-		{
-		}
-		[Fact]
-		public void Test_464()
-		{
-		}
-		[Fact]
-		public void Test_465()
-		{
-		}
-		[Fact]
-		public void Test_466()
-		{
-		}
-		[Fact]
-		public void Test_467()
-		{
-		}
-		[Fact]
-		public void Test_468()
-		{
-		}
-		[Fact]
-		public void Test_469()
-		{
-		}
-		[Fact]
-		public void Test_470()
-		{
-		}
-		[Fact]
-		public void Test_471()
-		{
-		}
-		[Fact]
-		public void Test_472()
-		{
-		}
-		[Fact]
-		public void Test_473()
-		{
-		}
-		[Fact]
-		public void Test_474()
-		{
-		}
-		[Fact]
-		public void Test_475()
-		{
-		}
-		[Fact]
-		public void Test_476()
-		{
-		}
-		[Fact]
-		public void Test_477()
-		{
-		}
-		[Fact]
-		public void Test_478()
-		{
-		}
-		[Fact]
-		public void Test_479()
-		{
-		}
-		[Fact]
-		public void Test_480()
-		{
-		}
-		[Fact]
-		public void Test_481()
-		{
-		}
-		[Fact]
-		public void Test_482()
-		{
-		}
-		[Fact]
-		public void Test_483()
-		{
-		}
-		[Fact]
-		public void Test_484()
-		{
-		}
-		[Fact]
-		public void Test_485()
-		{
-		}
-		[Fact]
-		public void Test_486()
-		{
-		}
-		[Fact]
-		public void Test_487()
-		{
-		}
-		[Fact]
-		public void Test_488()
-		{
-		}
-		[Fact]
-		public void Test_489()
-		{
-		}
-		[Fact]
-		public void Test_490()
-		{
-		}
-		[Fact]
-		public void Test_491()
-		{
-		}
-		[Fact]
-		public void Test_492()
-		{
-		}
-		[Fact]
-		public void Test_493()
-		{
-		}
-		[Fact]
-		public void Test_494()
-		{
-		}
-		[Fact]
-		public void Test_495()
-		{
-		}
-		[Fact]
-		public void Test_496()
-		{
-		}
-		[Fact]
-		public void Test_497()
-		{
-		}
-		[Fact]
-		public void Test_498()
-		{
-		}
-		[Fact]
-		public void Test_499()
-		{
-		}
-		[Fact]
-		public void Test_500()
-		{
-		}
-		[Fact]
-		public void Test_501()
-		{
-		}
-		[Fact]
-		public void Test_502()
-		{
-		}
-		[Fact]
-		public void Test_503()
-		{
-		}
-		[Fact]
-		public void Test_504()
-		{
-		}
-		[Fact]
-		public void Test_505()
-		{
-		}
-		[Fact]
-		public void Test_506()
-		{
-		}
-		[Fact]
-		public void Test_507()
-		{
-		}
-		[Fact]
-		public void Test_508()
-		{
-		}
-		[Fact]
-		public void Test_509()
-		{
-		}
-		[Fact]
-		public void Test_510()
-		{
-		}
-		[Fact]
-		public void Test_511()
-		{
-		}
-		[Fact]
-		public void Test_512()
-		{
-		}
-		[Fact]
-		public void Test_513()
-		{
-		}
-		[Fact]
-		public void Test_514()
-		{
-		}
-		[Fact]
-		public void Test_515()
-		{
-		}
-		[Fact]
-		public void Test_516()
-		{
-		}
-		[Fact]
-		public void Test_517()
-		{
-		}
-		[Fact]
-		public void Test_518()
-		{
-		}
-		[Fact]
-		public void Test_519()
-		{
-		}
-		[Fact]
-		public void Test_520()
-		{
-		}
-		[Fact]
-		public void Test_521()
-		{
-		}
-		[Fact]
-		public void Test_522()
-		{
-		}
-		[Fact]
-		public void Test_523()
-		{
-		}
-		[Fact]
-		public void Test_524()
-		{
-		}
-		[Fact]
-		public void Test_525()
-		{
-		}
-		[Fact]
-		public void Test_526()
-		{
-		}
-		[Fact]
-		public void Test_527()
-		{
-		}
-		[Fact]
-		public void Test_528()
-		{
-		}
-		[Fact]
-		public void Test_529()
-		{
-		}
-		[Fact]
-		public void Test_530()
-		{
-		}
-		[Fact]
-		public void Test_531()
-		{
-		}
-		[Fact]
-		public void Test_532()
-		{
-		}
-		[Fact]
-		public void Test_533()
-		{
-		}
-		[Fact]
-		public void Test_534()
-		{
-		}
-		[Fact]
-		public void Test_535()
-		{
-		}
-		[Fact]
-		public void Test_536()
-		{
-		}
-		[Fact]
-		public void Test_537()
-		{
-		}
-		[Fact]
-		public void Test_538()
-		{
-		}
-		[Fact]
-		public void Test_539()
-		{
-		}
-		[Fact]
-		public void Test_540()
-		{
-		}
-		[Fact]
-		public void Test_541()
-		{
-		}
-		[Fact]
-		public void Test_542()
-		{
-		}
-		[Fact]
-		public void Test_543()
-		{
-		}
-		[Fact]
-		public void Test_544()
-		{
-		}
-		[Fact]
-		public void Test_545()
-		{
-		}
-		[Fact]
-		public void Test_546()
-		{
-		}
-		[Fact]
-		public void Test_547()
-		{
-		}
-		[Fact]
-		public void Test_548()
-		{
-		}
-		[Fact]
-		public void Test_549()
-		{
-		}
-		[Fact]
-		public void Test_550()
-		{
-		}
-		[Fact]
-		public void Test_551()
-		{
-		}
-		[Fact]
-		public void Test_552()
-		{
-		}
-		[Fact]
-		public void Test_553()
-		{
-		}
-		[Fact]
-		public void Test_554()
-		{
-		}
-		[Fact]
-		public void Test_555()
-		{
-		}
-		[Fact]
-		public void Test_556()
-		{
-		}
-		[Fact]
-		public void Test_557()
-		{
-		}
-		[Fact]
-		public void Test_558()
-		{
-		}
-		[Fact]
-		public void Test_559()
-		{
-		}
-		[Fact]
-		public void Test_560()
-		{
-		}
-		[Fact]
-		public void Test_561()
-		{
-		}
-		[Fact]
-		public void Test_562()
-		{
-		}
-		[Fact]
-		public void Test_563()
-		{
-		}
-		[Fact]
-		public void Test_564()
-		{
-		}
-		[Fact]
-		public void Test_565()
-		{
-		}
-		[Fact]
-		public void Test_566()
-		{
-		}
-		[Fact]
-		public void Test_567()
-		{
-		}
-		[Fact]
-		public void Test_568()
-		{
-		}
-		[Fact]
-		public void Test_569()
-		{
-		}
-		[Fact]
-		public void Test_570()
-		{
-		}
-		[Fact]
-		public void Test_571()
-		{
-		}
-		[Fact]
-		public void Test_572()
-		{
-		}
-		[Fact]
-		public void Test_573()
-		{
-		}
-		[Fact]
-		public void Test_574()
-		{
-		}
-		[Fact]
-		public void Test_575()
-		{
-		}
-		[Fact]
-		public void Test_576()
-		{
-		}
-		[Fact]
-		public void Test_577()
-		{
-		}
-		[Fact]
-		public void Test_578()
-		{
-		}
-		[Fact]
-		public void Test_579()
-		{
-		}
-		[Fact]
-		public void Test_580()
-		{
-		}
-		[Fact]
-		public void Test_581()
-		{
-		}
-		[Fact]
-		public void Test_582()
-		{
-		}
-		[Fact]
-		public void Test_583()
-		{
-		}
-		[Fact]
-		public void Test_584()
-		{
-		}
-		[Fact]
-		public void Test_585()
-		{
-		}
-		[Fact]
-		public void Test_586()
-		{
-		}
-		[Fact]
-		public void Test_587()
-		{
-		}
-		[Fact]
-		public void Test_588()
-		{
-		}
-		[Fact]
-		public void Test_589()
-		{
-		}
-		[Fact]
-		public void Test_590()
-		{
-		}
-		[Fact]
-		public void Test_591()
-		{
-		}
-		[Fact]
-		public void Test_592()
-		{
-		}
-		[Fact]
-		public void Test_593()
-		{
-		}
-		[Fact]
-		public void Test_594()
-		{
-		}
-		[Fact]
-		public void Test_595()
-		{
-		}
-		[Fact]
-		public void Test_596()
-		{
-		}
-		[Fact]
-		public void Test_597()
-		{
-		}
-		[Fact]
-		public void Test_598()
-		{
-		}
-		[Fact]
-		public void Test_599()
-		{
-		}
-		[Fact]
-		public void Test_600()
-		{
-		}
-		[Fact]
-		public void Test_601()
-		{
-		}
-		[Fact]
-		public void Test_602()
-		{
-		}
-		[Fact]
-		public void Test_603()
-		{
-		}
-		[Fact]
-		public void Test_604()
-		{
-		}
-		[Fact]
-		public void Test_605()
-		{
-		}
-		[Fact]
-		public void Test_606()
-		{
-		}
-		[Fact]
-		public void Test_607()
-		{
-		}
-		[Fact]
-		public void Test_608()
-		{
-		}
-		[Fact]
-		public void Test_609()
-		{
-		}
-		[Fact]
-		public void Test_610()
-		{
-		}
-		[Fact]
-		public void Test_611()
-		{
-		}
-		[Fact]
-		public void Test_612()
-		{
-		}
-		[Fact]
-		public void Test_613()
-		{
-		}
-		[Fact]
-		public void Test_614()
-		{
-		}
-		[Fact]
-		public void Test_615()
-		{
-		}
-		[Fact]
-		public void Test_616()
-		{
-		}
-		[Fact]
-		public void Test_617()
-		{
-		}
-		[Fact]
-		public void Test_618()
-		{
-		}
-		[Fact]
-		public void Test_619()
-		{
-		}
-		[Fact]
-		public void Test_620()
-		{
-		}
-		[Fact]
-		public void Test_621()
-		{
-		}
-		[Fact]
-		public void Test_622()
-		{
-		}
-		[Fact]
-		public void Test_623()
-		{
-		}
-		[Fact]
-		public void Test_624()
-		{
-		}
-		[Fact]
-		public void Test_625()
-		{
-		}
-		[Fact]
-		public void Test_626()
-		{
-		}
-		[Fact]
-		public void Test_627()
-		{
-		}
-		[Fact]
-		public void Test_628()
-		{
-		}
-		[Fact]
-		public void Test_629()
-		{
-		}
-		[Fact]
-		public void Test_630()
-		{
-		}
-		[Fact]
-		public void Test_631()
-		{
-		}
-		[Fact]
-		public void Test_632()
-		{
-		}
-		[Fact]
-		public void Test_633()
-		{
-		}
-		[Fact]
-		public void Test_634()
-		{
-		}
-		[Fact]
-		public void Test_635()
-		{
-		}
-		[Fact]
-		public void Test_636()
-		{
-		}
-		[Fact]
-		public void Test_637()
-		{
-		}
-		[Fact]
-		public void Test_638()
-		{
-		}
-		[Fact]
-		public void Test_639()
-		{
-		}
-		[Fact]
-		public void Test_640()
-		{
-		}
-		[Fact]
-		public void Test_641()
-		{
-		}
-		[Fact]
-		public void Test_642()
-		{
-		}
-		[Fact]
-		public void Test_643()
-		{
-		}
-		[Fact]
-		public void Test_644()
-		{
-		}
-		[Fact]
-		public void Test_645()
-		{
-		}
-		[Fact]
-		public void Test_646()
-		{
-		}
-		[Fact]
-		public void Test_647()
-		{
-		}
-		[Fact]
-		public void Test_648()
-		{
-		}
-		[Fact]
-		public void Test_649()
-		{
-		}
-		[Fact]
-		public void Test_650()
-		{
-		}
-		[Fact]
-		public void Test_651()
-		{
-		}
-		[Fact]
-		public void Test_652()
-		{
-		}
-		[Fact]
-		public void Test_653()
-		{
-		}
-		[Fact]
-		public void Test_654()
-		{
-		}
-		[Fact]
-		public void Test_655()
-		{
-		}
-		[Fact]
-		public void Test_656()
-		{
-		}
-		[Fact]
-		public void Test_657()
-		{
-		}
-		[Fact]
-		public void Test_658()
-		{
-		}
-		[Fact]
-		public void Test_659()
-		{
-		}
-		[Fact]
-		public void Test_660()
-		{
-		}
-		[Fact]
-		public void Test_661()
-		{
-		}
-		[Fact]
-		public void Test_662()
-		{
-		}
-		[Fact]
-		public void Test_663()
-		{
-		}
-		[Fact]
-		public void Test_664()
-		{
-		}
-		[Fact]
-		public void Test_665()
-		{
-		}
-		[Fact]
-		public void Test_666()
-		{
-		}
-		[Fact]
-		public void Test_667()
-		{
-		}
-		[Fact]
-		public void Test_668()
-		{
-		}
-		[Fact]
-		public void Test_669()
-		{
-		}
-		[Fact]
-		public void Test_670()
-		{
-		}
-		[Fact]
-		public void Test_671()
-		{
-		}
-		[Fact]
-		public void Test_672()
-		{
-		}
-		[Fact]
-		public void Test_673()
-		{
-		}
-		[Fact]
-		public void Test_674()
-		{
-		}
-		[Fact]
-		public void Test_675()
-		{
-		}
-		[Fact]
-		public void Test_676()
-		{
-		}
-		[Fact]
-		public void Test_677()
-		{
-		}
-		[Fact]
-		public void Test_678()
-		{
-		}
-		[Fact]
-		public void Test_679()
-		{
-		}
-		[Fact]
-		public void Test_680()
-		{
-		}
-		[Fact]
-		public void Test_681()
-		{
-		}
-		[Fact]
-		public void Test_682()
-		{
-		}
-		[Fact]
-		public void Test_683()
-		{
-		}
-		[Fact]
-		public void Test_684()
-		{
-		}
-		[Fact]
-		public void Test_685()
-		{
-		}
-		[Fact]
-		public void Test_686()
-		{
-		}
-		[Fact]
-		public void Test_687()
-		{
-		}
-		[Fact]
-		public void Test_688()
-		{
-		}
-		[Fact]
-		public void Test_689()
-		{
-		}
-		[Fact]
-		public void Test_690()
-		{
-		}
-		[Fact]
-		public void Test_691()
-		{
-		}
-		[Fact]
-		public void Test_692()
-		{
-		}
-		[Fact]
-		public void Test_693()
-		{
-		}
-		[Fact]
-		public void Test_694()
-		{
-		}
-		[Fact]
-		public void Test_695()
-		{
-		}
-		[Fact]
-		public void Test_696()
-		{
-		}
-		[Fact]
-		public void Test_697()
-		{
-		}
-		[Fact]
-		public void Test_698()
-		{
-		}
-		[Fact]
-		public void Test_699()
-		{
-		}
-		[Fact]
-		public void Test_700()
-		{
-		}
-		[Fact]
-		public void Test_701()
-		{
-		}
-		[Fact]
-		public void Test_702()
-		{
-		}
-		[Fact]
-		public void Test_703()
-		{
-		}
-		[Fact]
-		public void Test_704()
-		{
-		}
-		[Fact]
-		public void Test_705()
-		{
-		}
-		[Fact]
-		public void Test_706()
-		{
-		}
-		[Fact]
-		public void Test_707()
-		{
-		}
-		[Fact]
-		public void Test_708()
-		{
-		}
-		[Fact]
-		public void Test_709()
-		{
-		}
-		[Fact]
-		public void Test_710()
-		{
-		}
-		[Fact]
-		public void Test_711()
-		{
-		}
-		[Fact]
-		public void Test_712()
-		{
-		}
-		[Fact]
-		public void Test_713()
-		{
-		}
-		[Fact]
-		public void Test_714()
-		{
-		}
-		[Fact]
-		public void Test_715()
-		{
-		}
-		[Fact]
-		public void Test_716()
-		{
-		}
-		[Fact]
-		public void Test_717()
-		{
-		}
-		[Fact]
-		public void Test_718()
-		{
-		}
-		[Fact]
-		public void Test_719()
-		{
-		}
-		[Fact]
-		public void Test_720()
-		{
-		}
-		[Fact]
-		public void Test_721()
-		{
-		}
-		[Fact]
-		public void Test_722()
-		{
-		}
-		[Fact]
-		public void Test_723()
-		{
-		}
-		[Fact]
-		public void Test_724()
-		{
-		}
-		[Fact]
-		public void Test_725()
-		{
-		}
-		[Fact]
-		public void Test_726()
-		{
-		}
-		[Fact]
-		public void Test_727()
-		{
-		}
-		[Fact]
-		public void Test_728()
-		{
-		}
-		[Fact]
-		public void Test_729()
-		{
-		}
-		[Fact]
-		public void Test_730()
-		{
-		}
-		[Fact]
-		public void Test_731()
-		{
-		}
-		[Fact]
-		public void Test_732()
-		{
-		}
-		[Fact]
-		public void Test_733()
-		{
-		}
-		[Fact]
-		public void Test_734()
-		{
-		}
-		[Fact]
-		public void Test_735()
-		{
-		}
-		[Fact]
-		public void Test_736()
-		{
-		}
-		[Fact]
-		public void Test_737()
-		{
-		}
-		[Fact]
-		public void Test_738()
-		{
-		}
-		[Fact]
-		public void Test_739()
-		{
-		}
-		[Fact]
-		public void Test_740()
-		{
-		}
-		[Fact]
-		public void Test_741()
-		{
-		}
-		[Fact]
-		public void Test_742()
-		{
-		}
-		[Fact]
-		public void Test_743()
-		{
-		}
-		[Fact]
-		public void Test_744()
-		{
-		}
-		[Fact]
-		public void Test_745()
-		{
-		}
-		[Fact]
-		public void Test_746()
-		{
-		}
-		[Fact]
-		public void Test_747()
-		{
-		}
-		[Fact]
-		public void Test_748()
-		{
-		}
-		[Fact]
-		public void Test_749()
-		{
-		}
-		[Fact]
-		public void Test_750()
-		{
-		}
-		[Fact]
-		public void Test_751()
-		{
-		}
-		[Fact]
-		public void Test_752()
-		{
-		}
-		[Fact]
-		public void Test_753()
-		{
-		}
-		[Fact]
-		public void Test_754()
-		{
-		}
-		[Fact]
-		public void Test_755()
-		{
-		}
-		[Fact]
-		public void Test_756()
-		{
-		}
-		[Fact]
-		public void Test_757()
-		{
-		}
-		[Fact]
-		public void Test_758()
-		{
-		}
-		[Fact]
-		public void Test_759()
-		{
-		}
-		[Fact]
-		public void Test_760()
-		{
-		}
-		[Fact]
-		public void Test_761()
-		{
-		}
-		[Fact]
-		public void Test_762()
-		{
-		}
-		[Fact]
-		public void Test_763()
-		{
-		}
-		[Fact]
-		public void Test_764()
-		{
-		}
-		[Fact]
-		public void Test_765()
-		{
-		}
-		[Fact]
-		public void Test_766()
-		{
-		}
-		[Fact]
-		public void Test_767()
-		{
-		}
-		[Fact]
-		public void Test_768()
-		{
-		}
-		[Fact]
-		public void Test_769()
-		{
-		}
-		[Fact]
-		public void Test_770()
-		{
-		}
-		[Fact]
-		public void Test_771()
-		{
-		}
-		[Fact]
-		public void Test_772()
-		{
-		}
-		[Fact]
-		public void Test_773()
-		{
-		}
-		[Fact]
-		public void Test_774()
-		{
-		}
-		[Fact]
-		public void Test_775()
-		{
-		}
-		[Fact]
-		public void Test_776()
-		{
-		}
-		[Fact]
-		public void Test_777()
-		{
-		}
-		[Fact]
-		public void Test_778()
-		{
-		}
-		[Fact]
-		public void Test_779()
-		{
-		}
-		[Fact]
-		public void Test_780()
-		{
-		}
-		[Fact]
-		public void Test_781()
-		{
-		}
-		[Fact]
-		public void Test_782()
-		{
-		}
-		[Fact]
-		public void Test_783()
-		{
-		}
-		[Fact]
-		public void Test_784()
-		{
-		}
-		[Fact]
-		public void Test_785()
-		{
-		}
-		[Fact]
-		public void Test_786()
-		{
-		}
-		[Fact]
-		public void Test_787()
-		{
-		}
-		[Fact]
-		public void Test_788()
-		{
-		}
-		[Fact]
-		public void Test_789()
-		{
-		}
-		[Fact]
-		public void Test_790()
-		{
-		}
-		[Fact]
-		public void Test_791()
-		{
-		}
-		[Fact]
-		public void Test_792()
-		{
-		}
-		[Fact]
-		public void Test_793()
-		{
-		}
-		[Fact]
-		public void Test_794()
-		{
-		}
-		[Fact]
-		public void Test_795()
-		{
-		}
-		[Fact]
-		public void Test_796()
-		{
-		}
-		[Fact]
-		public void Test_797()
-		{
-		}
-		[Fact]
-		public void Test_798()
-		{
-		}
-		[Fact]
-		public void Test_799()
-		{
-		}
-		[Fact]
-		public void Test_800()
-		{
-		}
-		[Fact]
-		public void Test_801()
-		{
-		}
-		[Fact]
-		public void Test_802()
-		{
-		}
-		[Fact]
-		public void Test_803()
-		{
-		}
-		[Fact]
-		public void Test_804()
-		{
-		}
-		[Fact]
-		public void Test_805()
-		{
-		}
-		[Fact]
-		public void Test_806()
-		{
-		}
-		[Fact]
-		public void Test_807()
-		{
-		}
-		[Fact]
-		public void Test_808()
-		{
-		}
-		[Fact]
-		public void Test_809()
-		{
-		}
-		[Fact]
-		public void Test_810()
-		{
-		}
-		[Fact]
-		public void Test_811()
-		{
-		}
-		[Fact]
-		public void Test_812()
-		{
-		}
-		[Fact]
-		public void Test_813()
-		{
-		}
-		[Fact]
-		public void Test_814()
-		{
-		}
-		[Fact]
-		public void Test_815()
-		{
-		}
-		[Fact]
-		public void Test_816()
-		{
-		}
-		[Fact]
-		public void Test_817()
-		{
-		}
-		[Fact]
-		public void Test_818()
-		{
-		}
-		[Fact]
-		public void Test_819()
-		{
-		}
-		[Fact]
-		public void Test_820()
-		{
-		}
-		[Fact]
-		public void Test_821()
-		{
-		}
-		[Fact]
-		public void Test_822()
-		{
-		}
-		[Fact]
-		public void Test_823()
-		{
-		}
-		[Fact]
-		public void Test_824()
-		{
-		}
-		[Fact]
-		public void Test_825()
-		{
-		}
-		[Fact]
-		public void Test_826()
-		{
-		}
-		[Fact]
-		public void Test_827()
-		{
-		}
-		[Fact]
-		public void Test_828()
-		{
-		}
-		[Fact]
-		public void Test_829()
-		{
-		}
-		[Fact]
-		public void Test_830()
-		{
-		}
-		[Fact]
-		public void Test_831()
-		{
-		}
-		[Fact]
-		public void Test_832()
-		{
-		}
-		[Fact]
-		public void Test_833()
-		{
-		}
-		[Fact]
-		public void Test_834()
-		{
-		}
-		[Fact]
-		public void Test_835()
-		{
-		}
-		[Fact]
-		public void Test_836()
-		{
-		}
-		[Fact]
-		public void Test_837()
-		{
-		}
-		[Fact]
-		public void Test_838()
-		{
-		}
-		[Fact]
-		public void Test_839()
-		{
-		}
-		[Fact]
-		public void Test_840()
-		{
-		}
-		[Fact]
-		public void Test_841()
-		{
-		}
-		[Fact]
-		public void Test_842()
-		{
-		}
-		[Fact]
-		public void Test_843()
-		{
-		}
-		[Fact]
-		public void Test_844()
-		{
-		}
-		[Fact]
-		public void Test_845()
-		{
-		}
-		[Fact]
-		public void Test_846()
-		{
-		}
-		[Fact]
-		public void Test_847()
-		{
-		}
-		[Fact]
-		public void Test_848()
-		{
-		}
-		[Fact]
-		public void Test_849()
-		{
-		}
-		[Fact]
-		public void Test_850()
-		{
-		}
-		[Fact]
-		public void Test_851()
-		{
-		}
-		[Fact]
-		public void Test_852()
-		{
-		}
-		[Fact]
-		public void Test_853()
-		{
-		}
-		[Fact]
-		public void Test_854()
-		{
-		}
-		[Fact]
-		public void Test_855()
-		{
-		}
-		[Fact]
-		public void Test_856()
-		{
-		}
-		[Fact]
-		public void Test_857()
-		{
-		}
-		[Fact]
-		public void Test_858()
-		{
-		}
-		[Fact]
-		public void Test_859()
-		{
-		}
-		[Fact]
-		public void Test_860()
-		{
-		}
-		[Fact]
-		public void Test_861()
-		{
-		}
-		[Fact]
-		public void Test_862()
-		{
-		}
-		[Fact]
-		public void Test_863()
-		{
-		}
-		[Fact]
-		public void Test_864()
-		{
-		}
-		[Fact]
-		public void Test_865()
-		{
-		}
-		[Fact]
-		public void Test_866()
-		{
-		}
-		[Fact]
-		public void Test_867()
-		{
-		}
-		[Fact]
-		public void Test_868()
-		{
-		}
-		[Fact]
-		public void Test_869()
-		{
-		}
-		[Fact]
-		public void Test_870()
-		{
-		}
-		[Fact]
-		public void Test_871()
-		{
-		}
-		[Fact]
-		public void Test_872()
-		{
-		}
-		[Fact]
-		public void Test_873()
-		{
-		}
-		[Fact]
-		public void Test_874()
-		{
-		}
-		[Fact]
-		public void Test_875()
-		{
-		}
-		[Fact]
-		public void Test_876()
-		{
-		}
-		[Fact]
-		public void Test_877()
-		{
-		}
-		[Fact]
-		public void Test_878()
-		{
-		}
-		[Fact]
-		public void Test_879()
-		{
-		}
-		[Fact]
-		public void Test_880()
-		{
-		}
-		[Fact]
-		public void Test_881()
-		{
-		}
-		[Fact]
-		public void Test_882()
-		{
-		}
-		[Fact]
-		public void Test_883()
-		{
-		}
-		[Fact]
-		public void Test_884()
-		{
-		}
-		[Fact]
-		public void Test_885()
-		{
-		}
-		[Fact]
-		public void Test_886()
-		{
-		}
-		[Fact]
-		public void Test_887()
-		{
-		}
-		[Fact]
-		public void Test_888()
-		{
-		}
-		[Fact]
-		public void Test_889()
-		{
-		}
-		[Fact]
-		public void Test_890()
-		{
-		}
-		[Fact]
-		public void Test_891()
-		{
-		}
-		[Fact]
-		public void Test_892()
-		{
-		}
-		[Fact]
-		public void Test_893()
-		{
-		}
-		[Fact]
-		public void Test_894()
-		{
-		}
-		[Fact]
-		public void Test_895()
-		{
-		}
-		[Fact]
-		public void Test_896()
-		{
-		}
-		[Fact]
-		public void Test_897()
-		{
-		}
-		[Fact]
-		public void Test_898()
-		{
-		}
-		[Fact]
-		public void Test_899()
-		{
-		}
-		[Fact]
-		public void Test_900()
-		{
-		}
-		[Fact]
-		public void Test_901()
-		{
-		}
-		[Fact]
-		public void Test_902()
-		{
-		}
-		[Fact]
-		public void Test_903()
-		{
-		}
-		[Fact]
-		public void Test_904()
-		{
-		}
-		[Fact]
-		public void Test_905()
-		{
-		}
-		[Fact]
-		public void Test_906()
-		{
-		}
-		[Fact]
-		public void Test_907()
-		{
-		}
-		[Fact]
-		public void Test_908()
-		{
-		}
-		[Fact]
-		public void Test_909()
-		{
-		}
-		[Fact]
-		public void Test_910()
-		{
-		}
-		[Fact]
-		public void Test_911()
-		{
-		}
-		[Fact]
-		public void Test_912()
-		{
-		}
-		[Fact]
-		public void Test_913()
-		{
-		}
-		[Fact]
-		public void Test_914()
-		{
-		}
-		[Fact]
-		public void Test_915()
-		{
-		}
-		[Fact]
-		public void Test_916()
-		{
-		}
-		[Fact]
-		public void Test_917()
-		{
-		}
-		[Fact]
-		public void Test_918()
-		{
-		}
-		[Fact]
-		public void Test_919()
-		{
-		}
-		[Fact]
-		public void Test_920()
-		{
-		}
-		[Fact]
-		public void Test_921()
-		{
-		}
-		[Fact]
-		public void Test_922()
-		{
-		}
-		[Fact]
-		public void Test_923()
-		{
-		}
-		[Fact]
-		public void Test_924()
-		{
-		}
-		[Fact]
-		public void Test_925()
-		{
-		}
-		[Fact]
-		public void Test_926()
-		{
-		}
-		[Fact]
-		public void Test_927()
-		{
-		}
-		[Fact]
-		public void Test_928()
-		{
-		}
-		[Fact]
-		public void Test_929()
-		{
-		}
-		[Fact]
-		public void Test_930()
-		{
-		}
-		[Fact]
-		public void Test_931()
-		{
-		}
-		[Fact]
-		public void Test_932()
-		{
-		}
-		[Fact]
-		public void Test_933()
-		{
-		}
-		[Fact]
-		public void Test_934()
-		{
-		}
-		[Fact]
-		public void Test_935()
-		{
-		}
-		[Fact]
-		public void Test_936()
-		{
-		}
-		[Fact]
-		public void Test_937()
-		{
-		}
-		[Fact]
-		public void Test_938()
-		{
-		}
-		[Fact]
-		public void Test_939()
-		{
-		}
-		[Fact]
-		public void Test_940()
-		{
-		}
-		[Fact]
-		public void Test_941()
-		{
-		}
-		[Fact]
-		public void Test_942()
-		{
-		}
-		[Fact]
-		public void Test_943()
-		{
-		}
-		[Fact]
-		public void Test_944()
-		{
-		}
-		[Fact]
-		public void Test_945()
-		{
-		}
-		[Fact]
-		public void Test_946()
-		{
-		}
-		[Fact]
-		public void Test_947()
-		{
-		}
-		[Fact]
-		public void Test_948()
-		{
-		}
-		[Fact]
-		public void Test_949()
-		{
-		}
-		[Fact]
-		public void Test_950()
-		{
-		}
-		[Fact]
-		public void Test_951()
-		{
-		}
-		[Fact]
-		public void Test_952()
-		{
-		}
-		[Fact]
-		public void Test_953()
-		{
-		}
-		[Fact]
-		public void Test_954()
-		{
-		}
-		[Fact]
-		public void Test_955()
-		{
-		}
-		[Fact]
-		public void Test_956()
-		{
-		}
-		[Fact]
-		public void Test_957()
-		{
-		}
-		[Fact]
-		public void Test_958()
-		{
-		}
-		[Fact]
-		public void Test_959()
-		{
-		}
-		[Fact]
-		public void Test_960()
-		{
-		}
-		[Fact]
-		public void Test_961()
-		{
-		}
-		[Fact]
-		public void Test_962()
-		{
-		}
-		[Fact]
-		public void Test_963()
-		{
-		}
-		[Fact]
-		public void Test_964()
-		{
-		}
-		[Fact]
-		public void Test_965()
-		{
-		}
-		[Fact]
-		public void Test_966()
-		{
-		}
-		[Fact]
-		public void Test_967()
-		{
-		}
-		[Fact]
-		public void Test_968()
-		{
-		}
-		[Fact]
-		public void Test_969()
-		{
-		}
-		[Fact]
-		public void Test_970()
-		{
-		}
-		[Fact]
-		public void Test_971()
-		{
-		}
-		[Fact]
-		public void Test_972()
-		{
-		}
-		[Fact]
-		public void Test_973()
-		{
-		}
-		[Fact]
-		public void Test_974()
-		{
-		}
-		[Fact]
-		public void Test_975()
-		{
-		}
-		[Fact]
-		public void Test_976()
-		{
-		}
-		[Fact]
-		public void Test_977()
-		{
-		}
-		[Fact]
-		public void Test_978()
-		{
-		}
-		[Fact]
-		public void Test_979()
-		{
-		}
-		[Fact]
-		public void Test_980()
-		{
-		}
-		[Fact]
-		public void Test_981()
-		{
-		}
-		[Fact]
-		public void Test_982()
-		{
-		}
-		[Fact]
-		public void Test_983()
-		{
-		}
-		[Fact]
-		public void Test_984()
-		{
-		}
-		[Fact]
-		public void Test_985()
-		{
-		}
-		[Fact]
-		public void Test_986()
-		{
-		}
-		[Fact]
-		public void Test_987()
-		{
-		}
-		[Fact]
-		public void Test_988()
-		{
-		}
-		[Fact]
-		public void Test_989()
-		{
-		}
-		[Fact]
-		public void Test_990()
-		{
-		}
-		[Fact]
-		public void Test_991()
-		{
-		}
-		[Fact]
-		public void Test_992()
-		{
-		}
-		[Fact]
-		public void Test_993()
-		{
-		}
-		[Fact]
-		public void Test_994()
-		{
-		}
-		[Fact]
-		public void Test_995()
-		{
-		}
-		[Fact]
-		public void Test_996()
-		{
-		}
-		[Fact]
-		public void Test_997()
-		{
-		}
-		[Fact]
-		public void Test_998()
-		{
-		}
-		[Fact]
-		public void Test_999()
-		{
-		}
-		[Fact]
-		public void Test_1000()
-		{
-		}
-		[Fact]
-		public void Test_1001()
-		{
-		}
-		[Fact]
-		public void Test_1002()
-		{
-		}
-		[Fact]
-		public void Test_1003()
-		{
-		}
-		[Fact]
-		public void Test_1004()
-		{
-		}
-		[Fact]
-		public void Test_1005()
-		{
-		}
-		[Fact]
-		public void Test_1006()
-		{
-		}
-		[Fact]
-		public void Test_1007()
-		{
-		}
-		[Fact]
-		public void Test_1008()
-		{
-		}
-		[Fact]
-		public void Test_1009()
-		{
-		}
-		[Fact]
-		public void Test_1010()
-		{
-		}
-		[Fact]
-		public void Test_1011()
-		{
-		}
-		[Fact]
-		public void Test_1012()
-		{
-		}
-		[Fact]
-		public void Test_1013()
-		{
-		}
-		[Fact]
-		public void Test_1014()
-		{
-		}
-		[Fact]
-		public void Test_1015()
-		{
-		}
-		[Fact]
-		public void Test_1016()
-		{
-		}
-		[Fact]
-		public void Test_1017()
-		{
-		}
-		[Fact]
-		public void Test_1018()
-		{
-		}
-		[Fact]
-		public void Test_1019()
-		{
-		}
-		[Fact]
-		public void Test_1020()
-		{
-		}
-		[Fact]
-		public void Test_1021()
-		{
-		}
-		[Fact]
-		public void Test_1022()
-		{
-		}
-		[Fact]
-		public void Test_1023()
-		{
-		}
-		[Fact]
-		public void Test_1024()
-		{
-		}
-		[Fact]
-		public void Test_1025()
-		{
-		}
-		[Fact]
-		public void Test_1026()
-		{
-		}
-		[Fact]
-		public void Test_1027()
-		{
-		}
-		[Fact]
-		public void Test_1028()
-		{
-		}
-		[Fact]
-		public void Test_1029()
-		{
-		}
-		[Fact]
-		public void Test_1030()
-		{
-		}
-		[Fact]
-		public void Test_1031()
-		{
-		}
-		[Fact]
-		public void Test_1032()
-		{
-		}
-		[Fact]
-		public void Test_1033()
-		{
-		}
-		[Fact]
-		public void Test_1034()
-		{
-		}
-		[Fact]
-		public void Test_1035()
-		{
-		}
-		[Fact]
-		public void Test_1036()
-		{
-		}
-		[Fact]
-		public void Test_1037()
-		{
-		}
-		[Fact]
-		public void Test_1038()
-		{
-		}
-		[Fact]
-		public void Test_1039()
-		{
-		}
-		[Fact]
-		public void Test_1040()
-		{
-		}
-		[Fact]
-		public void Test_1041()
-		{
-		}
-		[Fact]
-		public void Test_1042()
-		{
-		}
-		[Fact]
-		public void Test_1043()
-		{
-		}
-		[Fact]
-		public void Test_1044()
-		{
-		}
-		[Fact]
-		public void Test_1045()
-		{
-		}
-		[Fact]
-		public void Test_1046()
-		{
-		}
-		[Fact]
-		public void Test_1047()
-		{
-		}
-		[Fact]
-		public void Test_1048()
-		{
-		}
-		[Fact]
-		public void Test_1049()
-		{
-		}
-		[Fact]
-		public void Test_1050()
-		{
-		}
-		[Fact]
-		public void Test_1051()
-		{
-		}
-		[Fact]
-		public void Test_1052()
-		{
-		}
-		[Fact]
-		public void Test_1053()
-		{
-		}
-		[Fact]
-		public void Test_1054()
-		{
-		}
-		[Fact]
-		public void Test_1055()
-		{
-		}
-		[Fact]
-		public void Test_1056()
-		{
-		}
-		[Fact]
-		public void Test_1057()
-		{
-		}
-		[Fact]
-		public void Test_1058()
-		{
-		}
-		[Fact]
-		public void Test_1059()
-		{
-		}
-		[Fact]
-		public void Test_1060()
-		{
-		}
-		[Fact]
-		public void Test_1061()
-		{
-		}
-		[Fact]
-		public void Test_1062()
-		{
-		}
-		[Fact]
-		public void Test_1063()
-		{
-		}
-		[Fact]
-		public void Test_1064()
-		{
-		}
-		[Fact]
-		public void Test_1065()
-		{
-		}
-		[Fact]
-		public void Test_1066()
-		{
-		}
-		[Fact]
-		public void Test_1067()
-		{
-		}
-		[Fact]
-		public void Test_1068()
-		{
-		}
-		[Fact]
-		public void Test_1069()
-		{
-		}
-		[Fact]
-		public void Test_1070()
-		{
-		}
-		[Fact]
-		public void Test_1071()
-		{
-		}
-		[Fact]
-		public void Test_1072()
-		{
-		}
-		[Fact]
-		public void Test_1073()
-		{
-		}
-		[Fact]
-		public void Test_1074()
-		{
-		}
-		[Fact]
-		public void Test_1075()
-		{
-		}
-		[Fact]
-		public void Test_1076()
-		{
-		}
-		[Fact]
-		public void Test_1077()
-		{
-		}
-		[Fact]
-		public void Test_1078()
-		{
-		}
-		[Fact]
-		public void Test_1079()
-		{
-		}
-		[Fact]
-		public void Test_1080()
-		{
-		}
-		[Fact]
-		public void Test_1081()
-		{
-		}
-		[Fact]
-		public void Test_1082()
-		{
-		}
-		[Fact]
-		public void Test_1083()
-		{
-		}
-		[Fact]
-		public void Test_1084()
-		{
-		}
-		[Fact]
-		public void Test_1085()
-		{
-		}
-		[Fact]
-		public void Test_1086()
-		{
-		}
-		[Fact]
-		public void Test_1087()
-		{
-		}
-		[Fact]
-		public void Test_1088()
-		{
-		}
-		[Fact]
-		public void Test_1089()
-		{
-		}
-		[Fact]
-		public void Test_1090()
-		{
-		}
-		[Fact]
-		public void Test_1091()
-		{
-		}
-		[Fact]
-		public void Test_1092()
-		{
-		}
-		[Fact]
-		public void Test_1093()
-		{
-		}
-		[Fact]
-		public void Test_1094()
-		{
-		}
-		[Fact]
-		public void Test_1095()
-		{
-		}
-		[Fact]
-		public void Test_1096()
-		{
-		}
-		[Fact]
-		public void Test_1097()
-		{
-		}
-		[Fact]
-		public void Test_1098()
-		{
-		}
-		[Fact]
-		public void Test_1099()
-		{
-		}
-		[Fact]
-		public void Test_1100()
-		{
-		}
-		[Fact]
-		public void Test_1101()
-		{
-		}
-		[Fact]
-		public void Test_1102()
-		{
-		}
-		[Fact]
-		public void Test_1103()
-		{
-		}
-		[Fact]
-		public void Test_1104()
-		{
-		}
-		[Fact]
-		public void Test_1105()
-		{
-		}
-		[Fact]
-		public void Test_1106()
-		{
-		}
-		[Fact]
-		public void Test_1107()
-		{
-		}
-		[Fact]
-		public void Test_1108()
-		{
-		}
-		[Fact]
-		public void Test_1109()
-		{
-		}
-		[Fact]
-		public void Test_1110()
-		{
-		}
-		[Fact]
-		public void Test_1111()
-		{
-		}
-		[Fact]
-		public void Test_1112()
-		{
-		}
-		[Fact]
-		public void Test_1113()
-		{
-		}
-		[Fact]
-		public void Test_1114()
-		{
-		}
-		[Fact]
-		public void Test_1115()
-		{
-		}
-		[Fact]
-		public void Test_1116()
-		{
-		}
-		[Fact]
-		public void Test_1117()
-		{
-		}
-		[Fact]
-		public void Test_1118()
-		{
-		}
-		[Fact]
-		public void Test_1119()
-		{
-		}
-		[Fact]
-		public void Test_1120()
-		{
-		}
-		[Fact]
-		public void Test_1121()
-		{
-		}
-		[Fact]
-		public void Test_1122()
-		{
-		}
-		[Fact]
-		public void Test_1123()
-		{
-		}
-		[Fact]
-		public void Test_1124()
-		{
-		}
-		[Fact]
-		public void Test_1125()
-		{
-		}
-		[Fact]
-		public void Test_1126()
-		{
-		}
-		[Fact]
-		public void Test_1127()
-		{
-		}
-		[Fact]
-		public void Test_1128()
-		{
-		}
-		[Fact]
-		public void Test_1129()
-		{
-		}
-		[Fact]
-		public void Test_1130()
-		{
-		}
-		[Fact]
-		public void Test_1131()
-		{
-		}
-		[Fact]
-		public void Test_1132()
-		{
-		}
-		[Fact]
-		public void Test_1133()
-		{
-		}
-		[Fact]
-		public void Test_1134()
-		{
-		}
-		[Fact]
-		public void Test_1135()
-		{
-		}
-		[Fact]
-		public void Test_1136()
-		{
-		}
-		[Fact]
-		public void Test_1137()
-		{
-		}
-		[Fact]
-		public void Test_1138()
-		{
-		}
-		[Fact]
-		public void Test_1139()
-		{
-		}
-		[Fact]
-		public void Test_1140()
-		{
-		}
-		[Fact]
-		public void Test_1141()
-		{
-		}
-		[Fact]
-		public void Test_1142()
-		{
-		}
-		[Fact]
-		public void Test_1143()
-		{
-		}
-		[Fact]
-		public void Test_1144()
-		{
-		}
-		[Fact]
-		public void Test_1145()
-		{
-		}
-		[Fact]
-		public void Test_1146()
-		{
-		}
-		[Fact]
-		public void Test_1147()
-		{
-		}
-		[Fact]
-		public void Test_1148()
-		{
-		}
-		[Fact]
-		public void Test_1149()
-		{
-		}
-		[Fact]
-		public void Test_1150()
-		{
-		}
-		[Fact]
-		public void Test_1151()
-		{
-		}
-		[Fact]
-		public void Test_1152()
-		{
-		}
-		[Fact]
-		public void Test_1153()
-		{
-		}
-		[Fact]
-		public void Test_1154()
-		{
-		}
-		[Fact]
-		public void Test_1155()
-		{
-		}
-		[Fact]
-		public void Test_1156()
-		{
-		}
-		[Fact]
-		public void Test_1157()
-		{
-		}
-		[Fact]
-		public void Test_1158()
-		{
-		}
-		[Fact]
-		public void Test_1159()
-		{
-		}
-		[Fact]
-		public void Test_1160()
-		{
-		}
-		[Fact]
-		public void Test_1161()
-		{
-		}
-		[Fact]
-		public void Test_1162()
-		{
-		}
-		[Fact]
-		public void Test_1163()
-		{
-		}
-		[Fact]
-		public void Test_1164()
-		{
-		}
-		[Fact]
-		public void Test_1165()
-		{
-		}
-		[Fact]
-		public void Test_1166()
-		{
-		}
-		[Fact]
-		public void Test_1167()
-		{
-		}
-		[Fact]
-		public void Test_1168()
-		{
-		}
-		[Fact]
-		public void Test_1169()
-		{
-		}
-		[Fact]
-		public void Test_1170()
-		{
-		}
-		[Fact]
-		public void Test_1171()
-		{
-		}
-		[Fact]
-		public void Test_1172()
-		{
-		}
-		[Fact]
-		public void Test_1173()
-		{
-		}
-		[Fact]
-		public void Test_1174()
-		{
-		}
-		[Fact]
-		public void Test_1175()
-		{
-		}
-		[Fact]
-		public void Test_1176()
-		{
-		}
-		[Fact]
-		public void Test_1177()
-		{
-		}
-		[Fact]
-		public void Test_1178()
-		{
-		}
-		[Fact]
-		public void Test_1179()
-		{
-		}
-		[Fact]
-		public void Test_1180()
-		{
-		}
-		[Fact]
-		public void Test_1181()
-		{
-		}
-		[Fact]
-		public void Test_1182()
-		{
-		}
-		[Fact]
-		public void Test_1183()
-		{
-		}
-		[Fact]
-		public void Test_1184()
-		{
-		}
-		[Fact]
-		public void Test_1185()
-		{
-		}
-		[Fact]
-		public void Test_1186()
-		{
-		}
-		[Fact]
-		public void Test_1187()
-		{
-		}
-		[Fact]
-		public void Test_1188()
-		{
-		}
-		[Fact]
-		public void Test_1189()
-		{
-		}
-		[Fact]
-		public void Test_1190()
-		{
-		}
-		[Fact]
-		public void Test_1191()
-		{
-		}
-		[Fact]
-		public void Test_1192()
-		{
-		}
-		[Fact]
-		public void Test_1193()
-		{
-		}
-		[Fact]
-		public void Test_1194()
-		{
-		}
-		[Fact]
-		public void Test_1195()
-		{
-		}
-		[Fact]
-		public void Test_1196()
-		{
-		}
-		[Fact]
-		public void Test_1197()
-		{
-		}
-		[Fact]
-		public void Test_1198()
-		{
-		}
-		[Fact]
-		public void Test_1199()
-		{
-		}
-		[Fact]
-		public void Test_1200()
-		{
-		}
-		[Fact]
-		public void Test_1201()
-		{
-		}
-		[Fact]
-		public void Test_1202()
-		{
-		}
-		[Fact]
-		public void Test_1203()
-		{
-		}
-		[Fact]
-		public void Test_1204()
-		{
-		}
-		[Fact]
-		public void Test_1205()
-		{
-		}
-		[Fact]
-		public void Test_1206()
-		{
-		}
-		[Fact]
-		public void Test_1207()
-		{
-		}
-		[Fact]
-		public void Test_1208()
-		{
-		}
-		[Fact]
-		public void Test_1209()
-		{
-		}
-		[Fact]
-		public void Test_1210()
-		{
-		}
-		[Fact]
-		public void Test_1211()
-		{
-		}
-		[Fact]
-		public void Test_1212()
-		{
-		}
-		[Fact]
-		public void Test_1213()
-		{
-		}
-		[Fact]
-		public void Test_1214()
-		{
-		}
-		[Fact]
-		public void Test_1215()
-		{
-		}
-		[Fact]
-		public void Test_1216()
-		{
-		}
-		[Fact]
-		public void Test_1217()
-		{
-		}
-		[Fact]
-		public void Test_1218()
-		{
-		}
-		[Fact]
-		public void Test_1219()
-		{
-		}
-		[Fact]
-		public void Test_1220()
-		{
-		}
-		[Fact]
-		public void Test_1221()
-		{
-		}
-		[Fact]
-		public void Test_1222()
-		{
-		}
-		[Fact]
-		public void Test_1223()
-		{
-		}
-		[Fact]
-		public void Test_1224()
-		{
-		}
-		[Fact]
-		public void Test_1225()
-		{
-		}
-		[Fact]
-		public void Test_1226()
-		{
-		}
-		[Fact]
-		public void Test_1227()
-		{
-		}
-		[Fact]
-		public void Test_1228()
-		{
-		}
-		[Fact]
-		public void Test_1229()
-		{
-		}
-		[Fact]
-		public void Test_1230()
-		{
-		}
-		[Fact]
-		public void Test_1231()
-		{
-		}
-		[Fact]
-		public void Test_1232()
-		{
-		}
-		[Fact]
-		public void Test_1233()
-		{
-		}
-		[Fact]
-		public void Test_1234()
-		{
-		}
-		[Fact]
-		public void Test_1235()
-		{
-		}
-		[Fact]
-		public void Test_1236()
-		{
-		}
-		[Fact]
-		public void Test_1237()
-		{
-		}
-		[Fact]
-		public void Test_1238()
-		{
-		}
-		[Fact]
-		public void Test_1239()
-		{
-		}
-		[Fact]
-		public void Test_1240()
-		{
-		}
-		[Fact]
-		public void Test_1241()
-		{
-		}
-		[Fact]
-		public void Test_1242()
-		{
-		}
-		[Fact]
-		public void Test_1243()
-		{
-		}
-		[Fact]
-		public void Test_1244()
-		{
-		}
-		[Fact]
-		public void Test_1245()
-		{
-		}
-		[Fact]
-		public void Test_1246()
-		{
-		}
-		[Fact]
-		public void Test_1247()
-		{
-		}
-		[Fact]
-		public void Test_1248()
-		{
-		}
-		[Fact]
-		public void Test_1249()
-		{
-		}
-		[Fact]
-		public void Test_1250()
-		{
-		}
-		[Fact]
-		public void Test_1251()
-		{
-		}
-		[Fact]
-		public void Test_1252()
-		{
-		}
-		[Fact]
-		public void Test_1253()
-		{
-		}
-		[Fact]
-		public void Test_1254()
-		{
-		}
-		[Fact]
-		public void Test_1255()
-		{
-		}
-		[Fact]
-		public void Test_1256()
-		{
-		}
-		[Fact]
-		public void Test_1257()
-		{
-		}
-		[Fact]
-		public void Test_1258()
-		{
-		}
-		[Fact]
-		public void Test_1259()
-		{
-		}
-		[Fact]
-		public void Test_1260()
-		{
-		}
-		[Fact]
-		public void Test_1261()
-		{
-		}
-		[Fact]
-		public void Test_1262()
-		{
-		}
-		[Fact]
-		public void Test_1263()
-		{
-		}
-		[Fact]
-		public void Test_1264()
-		{
-		}
-		[Fact]
-		public void Test_1265()
-		{
-		}
-		[Fact]
-		public void Test_1266()
-		{
-		}
-		[Fact]
-		public void Test_1267()
-		{
-		}
-		[Fact]
-		public void Test_1268()
-		{
-		}
-		[Fact]
-		public void Test_1269()
-		{
-		}
-		[Fact]
-		public void Test_1270()
-		{
-		}
-		[Fact]
-		public void Test_1271()
-		{
-		}
-		[Fact]
-		public void Test_1272()
-		{
-		}
-		[Fact]
-		public void Test_1273()
-		{
-		}
-		[Fact]
-		public void Test_1274()
-		{
-		}
-		[Fact]
-		public void Test_1275()
-		{
-		}
-		[Fact]
-		public void Test_1276()
-		{
-		}
-		[Fact]
-		public void Test_1277()
-		{
-		}
-		[Fact]
-		public void Test_1278()
-		{
-		}
-		[Fact]
-		public void Test_1279()
-		{
-		}
-		[Fact]
-		public void Test_1280()
-		{
-		}
-		[Fact]
-		public void Test_1281()
-		{
-		}
-		[Fact]
-		public void Test_1282()
-		{
-		}
-		[Fact]
-		public void Test_1283()
-		{
-		}
-		[Fact]
-		public void Test_1284()
-		{
-		}
-		[Fact]
-		public void Test_1285()
-		{
-		}
-		[Fact]
-		public void Test_1286()
-		{
-		}
-		[Fact]
-		public void Test_1287()
-		{
-		}
-		[Fact]
-		public void Test_1288()
-		{
-		}
-		[Fact]
-		public void Test_1289()
-		{
-		}
-		[Fact]
-		public void Test_1290()
-		{
-		}
-		[Fact]
-		public void Test_1291()
-		{
-		}
-		[Fact]
-		public void Test_1292()
-		{
-		}
-		[Fact]
-		public void Test_1293()
-		{
-		}
-		[Fact]
-		public void Test_1294()
-		{
-		}
-		[Fact]
-		public void Test_1295()
-		{
-		}
-		[Fact]
-		public void Test_1296()
-		{
-		}
-		[Fact]
-		public void Test_1297()
-		{
-		}
-		[Fact]
-		public void Test_1298()
-		{
-		}
-		[Fact]
-		public void Test_1299()
-		{
-		}
-		[Fact]
-		public void Test_1300()
-		{
-		}
-		[Fact]
-		public void Test_1301()
-		{
-		}
-		[Fact]
-		public void Test_1302()
-		{
-		}
-		[Fact]
-		public void Test_1303()
-		{
-		}
-		[Fact]
-		public void Test_1304()
-		{
-		}
-		[Fact]
-		public void Test_1305()
-		{
-		}
-		[Fact]
-		public void Test_1306()
-		{
-		}
-		[Fact]
-		public void Test_1307()
-		{
-		}
-		[Fact]
-		public void Test_1308()
-		{
-		}
-		[Fact]
-		public void Test_1309()
-		{
-		}
-		[Fact]
-		public void Test_1310()
-		{
-		}
-		[Fact]
-		public void Test_1311()
-		{
-		}
-		[Fact]
-		public void Test_1312()
-		{
-		}
-		[Fact]
-		public void Test_1313()
-		{
-		}
-		[Fact]
-		public void Test_1314()
-		{
-		}
-		[Fact]
-		public void Test_1315()
-		{
-		}
-		[Fact]
-		public void Test_1316()
-		{
-		}
-		[Fact]
-		public void Test_1317()
-		{
-		}
-		[Fact]
-		public void Test_1318()
-		{
-		}
-		[Fact]
-		public void Test_1319()
-		{
-		}
-		[Fact]
-		public void Test_1320()
-		{
-		}
-		[Fact]
-		public void Test_1321()
-		{
-		}
-		[Fact]
-		public void Test_1322()
-		{
-		}
-		[Fact]
-		public void Test_1323()
-		{
-		}
-		[Fact]
-		public void Test_1324()
-		{
-		}
-		[Fact]
-		public void Test_1325()
-		{
-		}
-		[Fact]
-		public void Test_1326()
-		{
-		}
-		[Fact]
-		public void Test_1327()
-		{
-		}
-		[Fact]
-		public void Test_1328()
-		{
-		}
-		[Fact]
-		public void Test_1329()
-		{
-		}
-		[Fact]
-		public void Test_1330()
-		{
-		}
-		[Fact]
-		public void Test_1331()
-		{
-		}
-		[Fact]
-		public void Test_1332()
-		{
-		}
-		[Fact]
-		public void Test_1333()
-		{
-		}
-		[Fact]
-		public void Test_1334()
-		{
-		}
-		[Fact]
-		public void Test_1335()
-		{
-		}
-		[Fact]
-		public void Test_1336()
-		{
-		}
-		[Fact]
-		public void Test_1337()
-		{
-		}
-		[Fact]
-		public void Test_1338()
-		{
-		}
-		[Fact]
-		public void Test_1339()
-		{
-		}
-		[Fact]
-		public void Test_1340()
-		{
-		}
-		[Fact]
-		public void Test_1341()
-		{
-		}
-		[Fact]
-		public void Test_1342()
-		{
-		}
-		[Fact]
-		public void Test_1343()
-		{
-		}
-		[Fact]
-		public void Test_1344()
-		{
-		}
-		[Fact]
-		public void Test_1345()
-		{
-		}
-		[Fact]
-		public void Test_1346()
-		{
-		}
-		[Fact]
-		public void Test_1347()
-		{
-		}
-		[Fact]
-		public void Test_1348()
-		{
-		}
-		[Fact]
-		public void Test_1349()
-		{
-		}
-		[Fact]
-		public void Test_1350()
-		{
-		}
-		[Fact]
-		public void Test_1351()
-		{
-		}
-		[Fact]
-		public void Test_1352()
-		{
-		}
-		[Fact]
-		public void Test_1353()
-		{
-		}
-		[Fact]
-		public void Test_1354()
-		{
-		}
-		[Fact]
-		public void Test_1355()
-		{
-		}
-		[Fact]
-		public void Test_1356()
-		{
-		}
-		[Fact]
-		public void Test_1357()
-		{
-		}
-		[Fact]
-		public void Test_1358()
-		{
-		}
-		[Fact]
-		public void Test_1359()
-		{
-		}
-		[Fact]
-		public void Test_1360()
-		{
-		}
-		[Fact]
-		public void Test_1361()
-		{
-		}
-		[Fact]
-		public void Test_1362()
-		{
-		}
-		[Fact]
-		public void Test_1363()
-		{
-		}
-		[Fact]
-		public void Test_1364()
-		{
-		}
-		[Fact]
-		public void Test_1365()
-		{
-		}
-		[Fact]
-		public void Test_1366()
-		{
-		}
-		[Fact]
-		public void Test_1367()
-		{
-		}
-		[Fact]
-		public void Test_1368()
-		{
-		}
-		[Fact]
-		public void Test_1369()
-		{
-		}
-		[Fact]
-		public void Test_1370()
-		{
-		}
-		[Fact]
-		public void Test_1371()
-		{
-		}
-		[Fact]
-		public void Test_1372()
-		{
-		}
-		[Fact]
-		public void Test_1373()
-		{
-		}
-		[Fact]
-		public void Test_1374()
-		{
-		}
-		[Fact]
-		public void Test_1375()
-		{
-		}
-		[Fact]
-		public void Test_1376()
-		{
-		}
-		[Fact]
-		public void Test_1377()
-		{
-		}
-		[Fact]
-		public void Test_1378()
-		{
-		}
-		[Fact]
-		public void Test_1379()
-		{
-		}
-		[Fact]
-		public void Test_1380()
-		{
-		}
-		[Fact]
-		public void Test_1381()
-		{
-		}
-		[Fact]
-		public void Test_1382()
-		{
-		}
-		[Fact]
-		public void Test_1383()
-		{
-		}
-		[Fact]
-		public void Test_1384()
-		{
-		}
-		[Fact]
-		public void Test_1385()
-		{
-		}
-		[Fact]
-		public void Test_1386()
-		{
-		}
-		[Fact]
-		public void Test_1387()
-		{
-		}
-		[Fact]
-		public void Test_1388()
-		{
-		}
-		[Fact]
-		public void Test_1389()
-		{
-		}
-		[Fact]
-		public void Test_1390()
-		{
-		}
-		[Fact]
-		public void Test_1391()
-		{
-		}
-		[Fact]
-		public void Test_1392()
-		{
-		}
-		[Fact]
-		public void Test_1393()
-		{
-		}
-		[Fact]
-		public void Test_1394()
-		{
-		}
-		[Fact]
-		public void Test_1395()
-		{
-		}
-		[Fact]
-		public void Test_1396()
-		{
-		}
-		[Fact]
-		public void Test_1397()
-		{
-		}
-		[Fact]
-		public void Test_1398()
-		{
-		}
-		[Fact]
-		public void Test_1399()
-		{
-		}
-		[Fact]
-		public void Test_1400()
-		{
-		}
-		[Fact]
-		public void Test_1401()
-		{
-		}
-		[Fact]
-		public void Test_1402()
-		{
-		}
-		[Fact]
-		public void Test_1403()
-		{
-		}
-		[Fact]
-		public void Test_1404()
-		{
-		}
-		[Fact]
-		public void Test_1405()
-		{
-		}
-		[Fact]
-		public void Test_1406()
-		{
-		}
-		[Fact]
-		public void Test_1407()
-		{
-		}
-		[Fact]
-		public void Test_1408()
-		{
-		}
-		[Fact]
-		public void Test_1409()
-		{
-		}
-		[Fact]
-		public void Test_1410()
-		{
-		}
-		[Fact]
-		public void Test_1411()
-		{
-		}
-		[Fact]
-		public void Test_1412()
-		{
-		}
-		[Fact]
-		public void Test_1413()
-		{
-		}
-		[Fact]
-		public void Test_1414()
-		{
-		}
-		[Fact]
-		public void Test_1415()
-		{
-		}
-		[Fact]
-		public void Test_1416()
-		{
-		}
-		[Fact]
-		public void Test_1417()
-		{
-		}
-		[Fact]
-		public void Test_1418()
-		{
-		}
-		[Fact]
-		public void Test_1419()
-		{
-		}
-		[Fact]
-		public void Test_1420()
-		{
-		}
-		[Fact]
-		public void Test_1421()
-		{
-		}
-		[Fact]
-		public void Test_1422()
-		{
-		}
-		[Fact]
-		public void Test_1423()
-		{
-		}
-		[Fact]
-		public void Test_1424()
-		{
-		}
-		[Fact]
-		public void Test_1425()
-		{
-		}
-		[Fact]
-		public void Test_1426()
-		{
-		}
-		[Fact]
-		public void Test_1427()
-		{
-		}
-		[Fact]
-		public void Test_1428()
-		{
-		}
-		[Fact]
-		public void Test_1429()
-		{
-		}
-		[Fact]
-		public void Test_1430()
-		{
-		}
-		[Fact]
-		public void Test_1431()
-		{
-		}
-		[Fact]
-		public void Test_1432()
-		{
-		}
-		[Fact]
-		public void Test_1433()
-		{
-		}
-		[Fact]
-		public void Test_1434()
-		{
-		}
-		[Fact]
-		public void Test_1435()
-		{
-		}
-		[Fact]
-		public void Test_1436()
-		{
-		}
-		[Fact]
-		public void Test_1437()
-		{
-		}
-		[Fact]
-		public void Test_1438()
-		{
-		}
-		[Fact]
-		public void Test_1439()
-		{
-		}
-		[Fact]
-		public void Test_1440()
-		{
-		}
-		[Fact]
-		public void Test_1441()
-		{
-		}
-		[Fact]
-		public void Test_1442()
-		{
-		}
-		[Fact]
-		public void Test_1443()
-		{
-		}
-		[Fact]
-		public void Test_1444()
-		{
-		}
-		[Fact]
-		public void Test_1445()
-		{
-		}
-		[Fact]
-		public void Test_1446()
-		{
-		}
-		[Fact]
-		public void Test_1447()
-		{
-		}
-		[Fact]
-		public void Test_1448()
-		{
-		}
-		[Fact]
-		public void Test_1449()
-		{
-		}
-		[Fact]
-		public void Test_1450()
-		{
-		}
-		[Fact]
-		public void Test_1451()
-		{
-		}
-		[Fact]
-		public void Test_1452()
-		{
-		}
-		[Fact]
-		public void Test_1453()
-		{
-		}
-		[Fact]
-		public void Test_1454()
-		{
-		}
-		[Fact]
-		public void Test_1455()
-		{
-		}
-		[Fact]
-		public void Test_1456()
-		{
-		}
-		[Fact]
-		public void Test_1457()
-		{
-		}
-		[Fact]
-		public void Test_1458()
-		{
-		}
-		[Fact]
-		public void Test_1459()
-		{
-		}
-		[Fact]
-		public void Test_1460()
-		{
-		}
-		[Fact]
-		public void Test_1461()
-		{
-		}
-		[Fact]
-		public void Test_1462()
-		{
-		}
-		[Fact]
-		public void Test_1463()
-		{
-		}
-		[Fact]
-		public void Test_1464()
-		{
-		}
-		[Fact]
-		public void Test_1465()
-		{
-		}
-		[Fact]
-		public void Test_1466()
-		{
-		}
-		[Fact]
-		public void Test_1467()
-		{
-		}
-		[Fact]
-		public void Test_1468()
-		{
-		}
-		[Fact]
-		public void Test_1469()
-		{
-		}
-		[Fact]
-		public void Test_1470()
-		{
-		}
-		[Fact]
-		public void Test_1471()
-		{
-		}
-		[Fact]
-		public void Test_1472()
-		{
-		}
-		[Fact]
-		public void Test_1473()
-		{
-		}
-		[Fact]
-		public void Test_1474()
-		{
-		}
-		[Fact]
-		public void Test_1475()
-		{
-		}
-		[Fact]
-		public void Test_1476()
-		{
-		}
-		[Fact]
-		public void Test_1477()
-		{
-		}
-		[Fact]
-		public void Test_1478()
-		{
-		}
-		[Fact]
-		public void Test_1479()
-		{
-		}
-		[Fact]
-		public void Test_1480()
-		{
-		}
-		[Fact]
-		public void Test_1481()
-		{
-		}
-		[Fact]
-		public void Test_1482()
-		{
-		}
-		[Fact]
-		public void Test_1483()
-		{
-		}
-		[Fact]
-		public void Test_1484()
-		{
-		}
-		[Fact]
-		public void Test_1485()
-		{
-		}
-		[Fact]
-		public void Test_1486()
-		{
-		}
-		[Fact]
-		public void Test_1487()
-		{
-		}
-		[Fact]
-		public void Test_1488()
-		{
-		}
-		[Fact]
-		public void Test_1489()
-		{
-		}
-		[Fact]
-		public void Test_1490()
-		{
-		}
-		[Fact]
-		public void Test_1491()
-		{
-		}
-		[Fact]
-		public void Test_1492()
-		{
-		}
-		[Fact]
-		public void Test_1493()
-		{
-		}
-		[Fact]
-		public void Test_1494()
-		{
-		}
-		[Fact]
-		public void Test_1495()
-		{
-		}
-		[Fact]
-		public void Test_1496()
-		{
-		}
-		[Fact]
-		public void Test_1497()
-		{
-		}
-		[Fact]
-		public void Test_1498()
-		{
-		}
-		[Fact]
-		public void Test_1499()
-		{
-		}
-		[Fact]
-		public void Test_1500()
-		{
-		}
-		[Fact]
-		public void Test_1501()
-		{
-		}
-		[Fact]
-		public void Test_1502()
-		{
-		}
-		[Fact]
-		public void Test_1503()
-		{
-		}
-		[Fact]
-		public void Test_1504()
-		{
-		}
-		[Fact]
-		public void Test_1505()
-		{
-		}
-		[Fact]
-		public void Test_1506()
-		{
-		}
-		[Fact]
-		public void Test_1507()
-		{
-		}
-		[Fact]
-		public void Test_1508()
-		{
-		}
-		[Fact]
-		public void Test_1509()
-		{
-		}
-		[Fact]
-		public void Test_1510()
-		{
-		}
-		[Fact]
-		public void Test_1511()
-		{
-		}
-		[Fact]
-		public void Test_1512()
-		{
-		}
-		[Fact]
-		public void Test_1513()
-		{
-		}
-		[Fact]
-		public void Test_1514()
-		{
-		}
-		[Fact]
-		public void Test_1515()
-		{
-		}
-		[Fact]
-		public void Test_1516()
-		{
-		}
-		[Fact]
-		public void Test_1517()
-		{
-		}
-		[Fact]
-		public void Test_1518()
-		{
-		}
-		[Fact]
-		public void Test_1519()
-		{
-		}
-		[Fact]
-		public void Test_1520()
-		{
-		}
-		[Fact]
-		public void Test_1521()
-		{
-		}
-		[Fact]
-		public void Test_1522()
-		{
-		}
-		[Fact]
-		public void Test_1523()
-		{
-		}
-		[Fact]
-		public void Test_1524()
-		{
-		}
-		[Fact]
-		public void Test_1525()
-		{
-		}
-		[Fact]
-		public void Test_1526()
-		{
-		}
-		[Fact]
-		public void Test_1527()
-		{
-		}
-		[Fact]
-		public void Test_1528()
-		{
-		}
-		[Fact]
-		public void Test_1529()
-		{
-		}
-		[Fact]
-		public void Test_1530()
-		{
-		}
-		[Fact]
-		public void Test_1531()
-		{
-		}
-		[Fact]
-		public void Test_1532()
-		{
-		}
-		[Fact]
-		public void Test_1533()
-		{
-		}
-		[Fact]
-		public void Test_1534()
-		{
-		}
-		[Fact]
-		public void Test_1535()
-		{
-		}
-		[Fact]
-		public void Test_1536()
-		{
-		}
-		[Fact]
-		public void Test_1537()
-		{
-		}
-		[Fact]
-		public void Test_1538()
-		{
-		}
-		[Fact]
-		public void Test_1539()
-		{
-		}
-		[Fact]
-		public void Test_1540()
-		{
-		}
-		[Fact]
-		public void Test_1541()
-		{
-		}
-		[Fact]
-		public void Test_1542()
-		{
-		}
-		[Fact]
-		public void Test_1543()
-		{
-		}
-		[Fact]
-		public void Test_1544()
-		{
-		}
-		[Fact]
-		public void Test_1545()
-		{
-		}
-		[Fact]
-		public void Test_1546()
-		{
-		}
-		[Fact]
-		public void Test_1547()
-		{
-		}
-		[Fact]
-		public void Test_1548()
-		{
-		}
-		[Fact]
-		public void Test_1549()
-		{
-		}
-		[Fact]
-		public void Test_1550()
-		{
-		}
-		[Fact]
-		public void Test_1551()
-		{
-		}
-		[Fact]
-		public void Test_1552()
-		{
-		}
-		[Fact]
-		public void Test_1553()
-		{
-		}
-		[Fact]
-		public void Test_1554()
-		{
-		}
-		[Fact]
-		public void Test_1555()
-		{
-		}
-		[Fact]
-		public void Test_1556()
-		{
-		}
-		[Fact]
-		public void Test_1557()
-		{
-		}
-		[Fact]
-		public void Test_1558()
-		{
-		}
-		[Fact]
-		public void Test_1559()
-		{
-		}
-		[Fact]
-		public void Test_1560()
-		{
-		}
-		[Fact]
-		public void Test_1561()
-		{
-		}
-		[Fact]
-		public void Test_1562()
-		{
-		}
-		[Fact]
-		public void Test_1563()
-		{
-		}
-		[Fact]
-		public void Test_1564()
-		{
-		}
-		[Fact]
-		public void Test_1565()
-		{
-		}
-		[Fact]
-		public void Test_1566()
-		{
-		}
-		[Fact]
-		public void Test_1567()
-		{
-		}
-		[Fact]
-		public void Test_1568()
-		{
-		}
-		[Fact]
-		public void Test_1569()
-		{
-		}
-		[Fact]
-		public void Test_1570()
-		{
-		}
-		[Fact]
-		public void Test_1571()
-		{
-		}
-		[Fact]
-		public void Test_1572()
-		{
-		}
-		[Fact]
-		public void Test_1573()
-		{
-		}
-		[Fact]
-		public void Test_1574()
-		{
-		}
-		[Fact]
-		public void Test_1575()
-		{
-		}
-		[Fact]
-		public void Test_1576()
-		{
-		}
-		[Fact]
-		public void Test_1577()
-		{
-		}
-		[Fact]
-		public void Test_1578()
-		{
-		}
-		[Fact]
-		public void Test_1579()
-		{
-		}
-		[Fact]
-		public void Test_1580()
-		{
-		}
-		[Fact]
-		public void Test_1581()
-		{
-		}
-		[Fact]
-		public void Test_1582()
-		{
-		}
-		[Fact]
-		public void Test_1583()
-		{
-		}
-		[Fact]
-		public void Test_1584()
-		{
-		}
-		[Fact]
-		public void Test_1585()
-		{
-		}
-		[Fact]
-		public void Test_1586()
-		{
-		}
-		[Fact]
-		public void Test_1587()
-		{
-		}
-		[Fact]
-		public void Test_1588()
-		{
-		}
-		[Fact]
-		public void Test_1589()
-		{
-		}
-		[Fact]
-		public void Test_1590()
-		{
-		}
-		[Fact]
-		public void Test_1591()
-		{
-		}
-		[Fact]
-		public void Test_1592()
-		{
-		}
-		[Fact]
-		public void Test_1593()
-		{
-		}
-		[Fact]
-		public void Test_1594()
-		{
-		}
-		[Fact]
-		public void Test_1595()
-		{
-		}
-		[Fact]
-		public void Test_1596()
-		{
-		}
-		[Fact]
-		public void Test_1597()
-		{
-		}
-		[Fact]
-		public void Test_1598()
-		{
-		}
-		[Fact]
-		public void Test_1599()
-		{
-		}
-		[Fact]
-		public void Test_1600()
-		{
-		}
-		[Fact]
-		public void Test_1601()
-		{
-		}
-		[Fact]
-		public void Test_1602()
-		{
-		}
-		[Fact]
-		public void Test_1603()
-		{
-		}
-		[Fact]
-		public void Test_1604()
-		{
-		}
-		[Fact]
-		public void Test_1605()
-		{
-		}
-		[Fact]
-		public void Test_1606()
-		{
-		}
-		[Fact]
-		public void Test_1607()
-		{
-		}
-		[Fact]
-		public void Test_1608()
-		{
-		}
-		[Fact]
-		public void Test_1609()
-		{
-		}
-		[Fact]
-		public void Test_1610()
-		{
-		}
-		[Fact]
-		public void Test_1611()
-		{
-		}
-		[Fact]
-		public void Test_1612()
-		{
-		}
-		[Fact]
-		public void Test_1613()
-		{
-		}
-		[Fact]
-		public void Test_1614()
-		{
-		}
-		[Fact]
-		public void Test_1615()
-		{
-		}
-		[Fact]
-		public void Test_1616()
-		{
-		}
-		[Fact]
-		public void Test_1617()
-		{
-		}
-		[Fact]
-		public void Test_1618()
-		{
-		}
-		[Fact]
-		public void Test_1619()
-		{
-		}
-		[Fact]
-		public void Test_1620()
-		{
-		}
-		[Fact]
-		public void Test_1621()
-		{
-		}
-		[Fact]
-		public void Test_1622()
-		{
-		}
-		[Fact]
-		public void Test_1623()
-		{
-		}
-		[Fact]
-		public void Test_1624()
-		{
-		}
-		[Fact]
-		public void Test_1625()
-		{
-		}
-		[Fact]
-		public void Test_1626()
-		{
-		}
-		[Fact]
-		public void Test_1627()
-		{
-		}
-		[Fact]
-		public void Test_1628()
-		{
-		}
-		[Fact]
-		public void Test_1629()
-		{
-		}
-		[Fact]
-		public void Test_1630()
-		{
-		}
-		[Fact]
-		public void Test_1631()
-		{
-		}
-		[Fact]
-		public void Test_1632()
-		{
-		}
-		[Fact]
-		public void Test_1633()
-		{
-		}
-		[Fact]
-		public void Test_1634()
-		{
-		}
-		[Fact]
-		public void Test_1635()
-		{
-		}
-		[Fact]
-		public void Test_1636()
-		{
-		}
-		[Fact]
-		public void Test_1637()
-		{
-		}
-		[Fact]
-		public void Test_1638()
-		{
-		}
-		[Fact]
-		public void Test_1639()
-		{
-		}
-		[Fact]
-		public void Test_1640()
-		{
-		}
-		[Fact]
-		public void Test_1641()
-		{
-		}
-		[Fact]
-		public void Test_1642()
-		{
-		}
-		[Fact]
-		public void Test_1643()
-		{
-		}
-		[Fact]
-		public void Test_1644()
-		{
-		}
-		[Fact]
-		public void Test_1645()
-		{
-		}
-		[Fact]
-		public void Test_1646()
-		{
-		}
-		[Fact]
-		public void Test_1647()
-		{
-		}
-		[Fact]
-		public void Test_1648()
-		{
-		}
-		[Fact]
-		public void Test_1649()
-		{
-		}
-		[Fact]
-		public void Test_1650()
-		{
-		}
-		[Fact]
-		public void Test_1651()
-		{
-		}
-		[Fact]
-		public void Test_1652()
-		{
-		}
-		[Fact]
-		public void Test_1653()
-		{
-		}
-		[Fact]
-		public void Test_1654()
-		{
-		}
-		[Fact]
-		public void Test_1655()
-		{
-		}
-		[Fact]
-		public void Test_1656()
-		{
-		}
-		[Fact]
-		public void Test_1657()
-		{
-		}
-		[Fact]
-		public void Test_1658()
-		{
-		}
-		[Fact]
-		public void Test_1659()
-		{
-		}
-		[Fact]
-		public void Test_1660()
-		{
-		}
-		[Fact]
-		public void Test_1661()
-		{
-		}
-		[Fact]
-		public void Test_1662()
-		{
-		}
-		[Fact]
-		public void Test_1663()
-		{
-		}
-		[Fact]
-		public void Test_1664()
-		{
-		}
-		[Fact]
-		public void Test_1665()
-		{
-		}
-		[Fact]
-		public void Test_1666()
-		{
-		}
-		[Fact]
-		public void Test_1667()
-		{
-		}
-		[Fact]
-		public void Test_1668()
-		{
-		}
-		[Fact]
-		public void Test_1669()
-		{
-		}
-		[Fact]
-		public void Test_1670()
-		{
-		}
-		[Fact]
-		public void Test_1671()
-		{
-		}
-		[Fact]
-		public void Test_1672()
-		{
-		}
-		[Fact]
-		public void Test_1673()
-		{
-		}
-		[Fact]
-		public void Test_1674()
-		{
-		}
-		[Fact]
-		public void Test_1675()
-		{
-		}
-		[Fact]
-		public void Test_1676()
-		{
-		}
-		[Fact]
-		public void Test_1677()
-		{
-		}
-		[Fact]
-		public void Test_1678()
-		{
-		}
-		[Fact]
-		public void Test_1679()
-		{
-		}
-		[Fact]
-		public void Test_1680()
-		{
-		}
-		[Fact]
-		public void Test_1681()
-		{
-		}
-		[Fact]
-		public void Test_1682()
-		{
-		}
-		[Fact]
-		public void Test_1683()
-		{
-		}
-		[Fact]
-		public void Test_1684()
-		{
-		}
-		[Fact]
-		public void Test_1685()
-		{
-		}
-		[Fact]
-		public void Test_1686()
-		{
-		}
-		[Fact]
-		public void Test_1687()
-		{
-		}
-		[Fact]
-		public void Test_1688()
-		{
-		}
-		[Fact]
-		public void Test_1689()
-		{
-		}
-		[Fact]
-		public void Test_1690()
-		{
-		}
-		[Fact]
-		public void Test_1691()
-		{
-		}
-		[Fact]
-		public void Test_1692()
-		{
-		}
-		[Fact]
-		public void Test_1693()
-		{
-		}
-		[Fact]
-		public void Test_1694()
-		{
-		}
-		[Fact]
-		public void Test_1695()
-		{
-		}
-		[Fact]
-		public void Test_1696()
-		{
-		}
-		[Fact]
-		public void Test_1697()
-		{
-		}
-		[Fact]
-		public void Test_1698()
-		{
-		}
-		[Fact]
-		public void Test_1699()
-		{
-		}
-		[Fact]
-		public void Test_1700()
-		{
-		}
-		[Fact]
-		public void Test_1701()
-		{
-		}
-		[Fact]
-		public void Test_1702()
-		{
-		}
-		[Fact]
-		public void Test_1703()
-		{
-		}
-		[Fact]
-		public void Test_1704()
-		{
-		}
-		[Fact]
-		public void Test_1705()
-		{
-		}
-		[Fact]
-		public void Test_1706()
-		{
-		}
-		[Fact]
-		public void Test_1707()
-		{
-		}
-		[Fact]
-		public void Test_1708()
-		{
-		}
-		[Fact]
-		public void Test_1709()
-		{
-		}
-		[Fact]
-		public void Test_1710()
-		{
-		}
-		[Fact]
-		public void Test_1711()
-		{
-		}
-		[Fact]
-		public void Test_1712()
-		{
-		}
-		[Fact]
-		public void Test_1713()
-		{
-		}
-		[Fact]
-		public void Test_1714()
-		{
-		}
-		[Fact]
-		public void Test_1715()
-		{
-		}
-		[Fact]
-		public void Test_1716()
-		{
-		}
-		[Fact]
-		public void Test_1717()
-		{
-		}
-		[Fact]
-		public void Test_1718()
-		{
-		}
-		[Fact]
-		public void Test_1719()
-		{
-		}
-		[Fact]
-		public void Test_1720()
-		{
-		}
-		[Fact]
-		public void Test_1721()
-		{
-		}
-		[Fact]
-		public void Test_1722()
-		{
-		}
-		[Fact]
-		public void Test_1723()
-		{
-		}
-		[Fact]
-		public void Test_1724()
-		{
-		}
-		[Fact]
-		public void Test_1725()
-		{
-		}
-		[Fact]
-		public void Test_1726()
-		{
-		}
-		[Fact]
-		public void Test_1727()
-		{
-		}
-		[Fact]
-		public void Test_1728()
-		{
-		}
-		[Fact]
-		public void Test_1729()
-		{
-		}
-		[Fact]
-		public void Test_1730()
-		{
-		}
-		[Fact]
-		public void Test_1731()
-		{
-		}
-		[Fact]
-		public void Test_1732()
-		{
-		}
-		[Fact]
-		public void Test_1733()
-		{
-		}
-		[Fact]
-		public void Test_1734()
-		{
-		}
-		[Fact]
-		public void Test_1735()
-		{
-		}
-		[Fact]
-		public void Test_1736()
-		{
-		}
-		[Fact]
-		public void Test_1737()
-		{
-		}
-		[Fact]
-		public void Test_1738()
-		{
-		}
-		[Fact]
-		public void Test_1739()
-		{
-		}
-		[Fact]
-		public void Test_1740()
-		{
-		}
-		[Fact]
-		public void Test_1741()
-		{
-		}
-		[Fact]
-		public void Test_1742()
-		{
-		}
-		[Fact]
-		public void Test_1743()
-		{
-		}
-		[Fact]
-		public void Test_1744()
-		{
-		}
-		[Fact]
-		public void Test_1745()
-		{
-		}
-		[Fact]
-		public void Test_1746()
-		{
-		}
-		[Fact]
-		public void Test_1747()
-		{
-		}
-		[Fact]
-		public void Test_1748()
-		{
-		}
-		[Fact]
-		public void Test_1749()
-		{
-		}
-		[Fact]
-		public void Test_1750()
-		{
-		}
-		[Fact]
-		public void Test_1751()
-		{
-		}
-		[Fact]
-		public void Test_1752()
-		{
-		}
-		[Fact]
-		public void Test_1753()
-		{
-		}
-		[Fact]
-		public void Test_1754()
-		{
-		}
-		[Fact]
-		public void Test_1755()
-		{
-		}
-		[Fact]
-		public void Test_1756()
-		{
-		}
-		[Fact]
-		public void Test_1757()
-		{
-		}
-		[Fact]
-		public void Test_1758()
-		{
-		}
-		[Fact]
-		public void Test_1759()
-		{
-		}
-		[Fact]
-		public void Test_1760()
-		{
-		}
-		[Fact]
-		public void Test_1761()
-		{
-		}
-		[Fact]
-		public void Test_1762()
-		{
-		}
-		[Fact]
-		public void Test_1763()
-		{
-		}
-		[Fact]
-		public void Test_1764()
-		{
-		}
-		[Fact]
-		public void Test_1765()
-		{
-		}
-		[Fact]
-		public void Test_1766()
-		{
-		}
-		[Fact]
-		public void Test_1767()
-		{
-		}
-		[Fact]
-		public void Test_1768()
-		{
-		}
-		[Fact]
-		public void Test_1769()
-		{
-		}
-		[Fact]
-		public void Test_1770()
-		{
-		}
-		[Fact]
-		public void Test_1771()
-		{
-		}
-		[Fact]
-		public void Test_1772()
-		{
-		}
-		[Fact]
-		public void Test_1773()
-		{
-		}
-		[Fact]
-		public void Test_1774()
-		{
-		}
-		[Fact]
-		public void Test_1775()
-		{
-		}
-		[Fact]
-		public void Test_1776()
-		{
-		}
-		[Fact]
-		public void Test_1777()
-		{
-		}
-		[Fact]
-		public void Test_1778()
-		{
-		}
-		[Fact]
-		public void Test_1779()
-		{
-		}
-		[Fact]
-		public void Test_1780()
-		{
-		}
-		[Fact]
-		public void Test_1781()
-		{
-		}
-		[Fact]
-		public void Test_1782()
-		{
-		}
-		[Fact]
-		public void Test_1783()
-		{
-		}
-		[Fact]
-		public void Test_1784()
-		{
-		}
-		[Fact]
-		public void Test_1785()
-		{
-		}
-		[Fact]
-		public void Test_1786()
-		{
-		}
-		[Fact]
-		public void Test_1787()
-		{
-		}
-		[Fact]
-		public void Test_1788()
-		{
-		}
-		[Fact]
-		public void Test_1789()
-		{
-		}
-		[Fact]
-		public void Test_1790()
-		{
-		}
-		[Fact]
-		public void Test_1791()
-		{
-		}
-		[Fact]
-		public void Test_1792()
-		{
-		}
-		[Fact]
-		public void Test_1793()
-		{
-		}
-		[Fact]
-		public void Test_1794()
-		{
-		}
-		[Fact]
-		public void Test_1795()
-		{
-		}
-		[Fact]
-		public void Test_1796()
-		{
-		}
-		[Fact]
-		public void Test_1797()
-		{
-		}
-		[Fact]
-		public void Test_1798()
-		{
-		}
-		[Fact]
-		public void Test_1799()
-		{
-		}
-		[Fact]
-		public void Test_1800()
-		{
-		}
-		[Fact]
-		public void Test_1801()
-		{
-		}
-		[Fact]
-		public void Test_1802()
-		{
-		}
-		[Fact]
-		public void Test_1803()
-		{
-		}
-		[Fact]
-		public void Test_1804()
-		{
-		}
-		[Fact]
-		public void Test_1805()
-		{
-		}
-		[Fact]
-		public void Test_1806()
-		{
-		}
-		[Fact]
-		public void Test_1807()
-		{
-		}
-		[Fact]
-		public void Test_1808()
-		{
-		}
-		[Fact]
-		public void Test_1809()
-		{
-		}
-		[Fact]
-		public void Test_1810()
-		{
-		}
-		[Fact]
-		public void Test_1811()
-		{
-		}
-		[Fact]
-		public void Test_1812()
-		{
-		}
-		[Fact]
-		public void Test_1813()
-		{
-		}
-		[Fact]
-		public void Test_1814()
-		{
-		}
-		[Fact]
-		public void Test_1815()
-		{
-		}
-		[Fact]
-		public void Test_1816()
-		{
-		}
-		[Fact]
-		public void Test_1817()
-		{
-		}
-		[Fact]
-		public void Test_1818()
-		{
-		}
-		[Fact]
-		public void Test_1819()
-		{
-		}
-		[Fact]
-		public void Test_1820()
-		{
-		}
-		[Fact]
-		public void Test_1821()
-		{
-		}
-		[Fact]
-		public void Test_1822()
-		{
-		}
-		[Fact]
-		public void Test_1823()
-		{
-		}
-		[Fact]
-		public void Test_1824()
-		{
-		}
-		[Fact]
-		public void Test_1825()
-		{
-		}
-		[Fact]
-		public void Test_1826()
-		{
-		}
-		[Fact]
-		public void Test_1827()
-		{
-		}
-		[Fact]
-		public void Test_1828()
-		{
-		}
-		[Fact]
-		public void Test_1829()
-		{
-		}
-		[Fact]
-		public void Test_1830()
-		{
-		}
-		[Fact]
-		public void Test_1831()
-		{
-		}
-		[Fact]
-		public void Test_1832()
-		{
-		}
-		[Fact]
-		public void Test_1833()
-		{
-		}
-		[Fact]
-		public void Test_1834()
-		{
-		}
-		[Fact]
-		public void Test_1835()
-		{
-		}
-		[Fact]
-		public void Test_1836()
-		{
-		}
-		[Fact]
-		public void Test_1837()
-		{
-		}
-		[Fact]
-		public void Test_1838()
-		{
-		}
-		[Fact]
-		public void Test_1839()
-		{
-		}
-		[Fact]
-		public void Test_1840()
-		{
-		}
-		[Fact]
-		public void Test_1841()
-		{
-		}
-		[Fact]
-		public void Test_1842()
-		{
-		}
-		[Fact]
-		public void Test_1843()
-		{
-		}
-		[Fact]
-		public void Test_1844()
-		{
-		}
-		[Fact]
-		public void Test_1845()
-		{
-		}
-		[Fact]
-		public void Test_1846()
-		{
-		}
-		[Fact]
-		public void Test_1847()
-		{
-		}
-		[Fact]
-		public void Test_1848()
-		{
-		}
-		[Fact]
-		public void Test_1849()
-		{
-		}
-		[Fact]
-		public void Test_1850()
-		{
-		}
-		[Fact]
-		public void Test_1851()
-		{
-		}
-		[Fact]
-		public void Test_1852()
-		{
-		}
-		[Fact]
-		public void Test_1853()
-		{
-		}
-		[Fact]
-		public void Test_1854()
-		{
-		}
-		[Fact]
-		public void Test_1855()
-		{
-		}
-		[Fact]
-		public void Test_1856()
-		{
-		}
-		[Fact]
-		public void Test_1857()
-		{
-		}
-		[Fact]
-		public void Test_1858()
-		{
-		}
-		[Fact]
-		public void Test_1859()
-		{
-		}
-		[Fact]
-		public void Test_1860()
-		{
-		}
-		[Fact]
-		public void Test_1861()
-		{
-		}
-		[Fact]
-		public void Test_1862()
-		{
-		}
-		[Fact]
-		public void Test_1863()
-		{
-		}
-		[Fact]
-		public void Test_1864()
-		{
-		}
-		[Fact]
-		public void Test_1865()
-		{
-		}
-		[Fact]
-		public void Test_1866()
-		{
-		}
-		[Fact]
-		public void Test_1867()
-		{
-		}
-		[Fact]
-		public void Test_1868()
-		{
-		}
-		[Fact]
-		public void Test_1869()
-		{
-		}
-		[Fact]
-		public void Test_1870()
-		{
-		}
-		[Fact]
-		public void Test_1871()
-		{
-		}
-		[Fact]
-		public void Test_1872()
-		{
-		}
-		[Fact]
-		public void Test_1873()
-		{
-		}
-		[Fact]
-		public void Test_1874()
-		{
-		}
-		[Fact]
-		public void Test_1875()
-		{
-		}
-		[Fact]
-		public void Test_1876()
-		{
-		}
-		[Fact]
-		public void Test_1877()
-		{
-		}
-		[Fact]
-		public void Test_1878()
-		{
-		}
-		[Fact]
-		public void Test_1879()
-		{
-		}
-		[Fact]
-		public void Test_1880()
-		{
-		}
-		[Fact]
-		public void Test_1881()
-		{
-		}
-		[Fact]
-		public void Test_1882()
-		{
-		}
-		[Fact]
-		public void Test_1883()
-		{
-		}
-		[Fact]
-		public void Test_1884()
-		{
-		}
-		[Fact]
-		public void Test_1885()
-		{
-		}
-		[Fact]
-		public void Test_1886()
-		{
-		}
-		[Fact]
-		public void Test_1887()
-		{
-		}
-		[Fact]
-		public void Test_1888()
-		{
-		}
-		[Fact]
-		public void Test_1889()
-		{
-		}
-		[Fact]
-		public void Test_1890()
-		{
-		}
-		[Fact]
-		public void Test_1891()
-		{
-		}
-		[Fact]
-		public void Test_1892()
-		{
-		}
-		[Fact]
-		public void Test_1893()
-		{
-		}
-		[Fact]
-		public void Test_1894()
-		{
-		}
-		[Fact]
-		public void Test_1895()
-		{
-		}
-		[Fact]
-		public void Test_1896()
-		{
-		}
-		[Fact]
-		public void Test_1897()
-		{
-		}
-		[Fact]
-		public void Test_1898()
-		{
-		}
-		[Fact]
-		public void Test_1899()
-		{
-		}
-		[Fact]
-		public void Test_1900()
-		{
-		}
-		[Fact]
-		public void Test_1901()
-		{
-		}
-		[Fact]
-		public void Test_1902()
-		{
-		}
-		[Fact]
-		public void Test_1903()
-		{
-		}
-		[Fact]
-		public void Test_1904()
-		{
-		}
-		[Fact]
-		public void Test_1905()
-		{
-		}
-		[Fact]
-		public void Test_1906()
-		{
-		}
-		[Fact]
-		public void Test_1907()
-		{
-		}
-		[Fact]
-		public void Test_1908()
-		{
-		}
-		[Fact]
-		public void Test_1909()
-		{
-		}
-		[Fact]
-		public void Test_1910()
-		{
-		}
-		[Fact]
-		public void Test_1911()
-		{
-		}
-		[Fact]
-		public void Test_1912()
-		{
-		}
-		[Fact]
-		public void Test_1913()
-		{
-		}
-		[Fact]
-		public void Test_1914()
-		{
-		}
-		[Fact]
-		public void Test_1915()
-		{
-		}
-		[Fact]
-		public void Test_1916()
-		{
-		}
-		[Fact]
-		public void Test_1917()
-		{
-		}
-		[Fact]
-		public void Test_1918()
-		{
-		}
-		[Fact]
-		public void Test_1919()
-		{
-		}
-		[Fact]
-		public void Test_1920()
-		{
-		}
-		[Fact]
-		public void Test_1921()
-		{
-		}
-		[Fact]
-		public void Test_1922()
-		{
-		}
-		[Fact]
-		public void Test_1923()
-		{
-		}
-		[Fact]
-		public void Test_1924()
-		{
-		}
-		[Fact]
-		public void Test_1925()
-		{
-		}
-		[Fact]
-		public void Test_1926()
-		{
-		}
-		[Fact]
-		public void Test_1927()
-		{
-		}
-		[Fact]
-		public void Test_1928()
-		{
-		}
-		[Fact]
-		public void Test_1929()
-		{
-		}
-		[Fact]
-		public void Test_1930()
-		{
-		}
-		[Fact]
-		public void Test_1931()
-		{
-		}
-		[Fact]
-		public void Test_1932()
-		{
-		}
-		[Fact]
-		public void Test_1933()
-		{
-		}
-		[Fact]
-		public void Test_1934()
-		{
-		}
-		[Fact]
-		public void Test_1935()
-		{
-		}
-		[Fact]
-		public void Test_1936()
-		{
-		}
-		[Fact]
-		public void Test_1937()
-		{
-		}
-		[Fact]
-		public void Test_1938()
-		{
-		}
-		[Fact]
-		public void Test_1939()
-		{
-		}
-		[Fact]
-		public void Test_1940()
-		{
-		}
-		[Fact]
-		public void Test_1941()
-		{
-		}
-		[Fact]
-		public void Test_1942()
-		{
-		}
-		[Fact]
-		public void Test_1943()
-		{
-		}
-		[Fact]
-		public void Test_1944()
-		{
-		}
-		[Fact]
-		public void Test_1945()
-		{
-		}
-		[Fact]
-		public void Test_1946()
-		{
-		}
-		[Fact]
-		public void Test_1947()
-		{
-		}
-		[Fact]
-		public void Test_1948()
-		{
-		}
-		[Fact]
-		public void Test_1949()
-		{
-		}
-		[Fact]
-		public void Test_1950()
-		{
-		}
-		[Fact]
-		public void Test_1951()
-		{
-		}
-		[Fact]
-		public void Test_1952()
-		{
-		}
-		[Fact]
-		public void Test_1953()
-		{
-		}
-		[Fact]
-		public void Test_1954()
-		{
-		}
-		[Fact]
-		public void Test_1955()
-		{
-		}
-		[Fact]
-		public void Test_1956()
-		{
-		}
-		[Fact]
-		public void Test_1957()
-		{
-		}
-		[Fact]
-		public void Test_1958()
-		{
-		}
-		[Fact]
-		public void Test_1959()
-		{
-		}
-		[Fact]
-		public void Test_1960()
-		{
-		}
-		[Fact]
-		public void Test_1961()
-		{
-		}
-		[Fact]
-		public void Test_1962()
-		{
-		}
-		[Fact]
-		public void Test_1963()
-		{
-		}
-		[Fact]
-		public void Test_1964()
-		{
-		}
-		[Fact]
-		public void Test_1965()
-		{
-		}
-		[Fact]
-		public void Test_1966()
-		{
-		}
-		[Fact]
-		public void Test_1967()
-		{
-		}
-		[Fact]
-		public void Test_1968()
-		{
-		}
-		[Fact]
-		public void Test_1969()
-		{
-		}
-		[Fact]
-		public void Test_1970()
-		{
-		}
-		[Fact]
-		public void Test_1971()
-		{
-		}
-		[Fact]
-		public void Test_1972()
-		{
-		}
-		[Fact]
-		public void Test_1973()
-		{
-		}
-		[Fact]
-		public void Test_1974()
-		{
-		}
-		[Fact]
-		public void Test_1975()
-		{
-		}
-		[Fact]
-		public void Test_1976()
-		{
-		}
-		[Fact]
-		public void Test_1977()
-		{
-		}
-		[Fact]
-		public void Test_1978()
-		{
-		}
-		[Fact]
-		public void Test_1979()
-		{
-		}
-		[Fact]
-		public void Test_1980()
-		{
-		}
-		[Fact]
-		public void Test_1981()
-		{
-		}
-		[Fact]
-		public void Test_1982()
-		{
-		}
-		[Fact]
-		public void Test_1983()
-		{
-		}
-		[Fact]
-		public void Test_1984()
-		{
-		}
-		[Fact]
-		public void Test_1985()
-		{
-		}
-		[Fact]
-		public void Test_1986()
-		{
-		}
-		[Fact]
-		public void Test_1987()
-		{
-		}
-		[Fact]
-		public void Test_1988()
-		{
-		}
-		[Fact]
-		public void Test_1989()
-		{
-		}
-		[Fact]
-		public void Test_1990()
-		{
-		}
-		[Fact]
-		public void Test_1991()
-		{
-		}
-		[Fact]
-		public void Test_1992()
-		{
-		}
-		[Fact]
-		public void Test_1993()
-		{
-		}
-		[Fact]
-		public void Test_1994()
-		{
-		}
-		[Fact]
-		public void Test_1995()
-		{
-		}
-		[Fact]
-		public void Test_1996()
-		{
-		}
-		[Fact]
-		public void Test_1997()
-		{
-		}
-		[Fact]
-		public void Test_1998()
-		{
-		}
-		[Fact]
-		public void Test_1999()
-		{
-		}
-		[Fact]
-		public void Test_2000()
-		{
-		}
-		[Fact]
-		public void Test_2001()
-		{
-		}
-		[Fact]
-		public void Test_2002()
-		{
-		}
-		[Fact]
-		public void Test_2003()
-		{
-		}
-		[Fact]
-		public void Test_2004()
-		{
-		}
-		[Fact]
-		public void Test_2005()
-		{
-		}
-		[Fact]
-		public void Test_2006()
-		{
-		}
-		[Fact]
-		public void Test_2007()
-		{
-		}
-		[Fact]
-		public void Test_2008()
-		{
-		}
-		[Fact]
-		public void Test_2009()
-		{
-		}
-		[Fact]
-		public void Test_2010()
-		{
-		}
-		[Fact]
-		public void Test_2011()
-		{
-		}
-		[Fact]
-		public void Test_2012()
-		{
-		}
-		[Fact]
-		public void Test_2013()
-		{
-		}
-		[Fact]
-		public void Test_2014()
-		{
-		}
-		[Fact]
-		public void Test_2015()
-		{
-		}
-		[Fact]
-		public void Test_2016()
-		{
-		}
-		[Fact]
-		public void Test_2017()
-		{
-		}
-		[Fact]
-		public void Test_2018()
-		{
-		}
-		[Fact]
-		public void Test_2019()
-		{
-		}
-		[Fact]
-		public void Test_2020()
-		{
-		}
-		[Fact]
-		public void Test_2021()
-		{
-		}
-		[Fact]
-		public void Test_2022()
-		{
-		}
-		[Fact]
-		public void Test_2023()
-		{
-		}
-		[Fact]
-		public void Test_2024()
-		{
-		}
-		[Fact]
-		public void Test_2025()
-		{
-		}
-		[Fact]
-		public void Test_2026()
-		{
-		}
-		[Fact]
-		public void Test_2027()
-		{
-		}
-		[Fact]
-		public void Test_2028()
-		{
-		}
-		[Fact]
-		public void Test_2029()
-		{
-		}
-		[Fact]
-		public void Test_2030()
-		{
-		}
-		[Fact]
-		public void Test_2031()
-		{
-		}
-		[Fact]
-		public void Test_2032()
-		{
-		}
-		[Fact]
-		public void Test_2033()
-		{
-		}
-		[Fact]
-		public void Test_2034()
-		{
-		}
-		[Fact]
-		public void Test_2035()
-		{
-		}
-		[Fact]
-		public void Test_2036()
-		{
-		}
-		[Fact]
-		public void Test_2037()
-		{
-		}
-		[Fact]
-		public void Test_2038()
-		{
-		}
-		[Fact]
-		public void Test_2039()
-		{
-		}
-		[Fact]
-		public void Test_2040()
-		{
-		}
-		[Fact]
-		public void Test_2041()
-		{
-		}
-		[Fact]
-		public void Test_2042()
-		{
-		}
-		[Fact]
-		public void Test_2043()
-		{
-		}
-		[Fact]
-		public void Test_2044()
-		{
-		}
-		[Fact]
-		public void Test_2045()
-		{
-		}
-		[Fact]
-		public void Test_2046()
-		{
-		}
-		[Fact]
-		public void Test_2047()
-		{
-		}
-		[Fact]
-		public void Test_2048()
-		{
-		}
-		[Fact]
-		public void Test_2049()
-		{
-		}
-		[Fact]
-		public void Test_2050()
-		{
-		}
-		[Fact]
-		public void Test_2051()
-		{
-		}
-		[Fact]
-		public void Test_2052()
-		{
-		}
-		[Fact]
-		public void Test_2053()
-		{
-		}
-		[Fact]
-		public void Test_2054()
-		{
-		}
-		[Fact]
-		public void Test_2055()
-		{
-		}
-		[Fact]
-		public void Test_2056()
-		{
-		}
-		[Fact]
-		public void Test_2057()
-		{
-		}
-		[Fact]
-		public void Test_2058()
-		{
-		}
-		[Fact]
-		public void Test_2059()
-		{
-		}
-		[Fact]
-		public void Test_2060()
-		{
-		}
-		[Fact]
-		public void Test_2061()
-		{
-		}
-		[Fact]
-		public void Test_2062()
-		{
-		}
-		[Fact]
-		public void Test_2063()
-		{
-		}
-		[Fact]
-		public void Test_2064()
-		{
-		}
-		[Fact]
-		public void Test_2065()
-		{
-		}
-		[Fact]
-		public void Test_2066()
-		{
-		}
-		[Fact]
-		public void Test_2067()
-		{
-		}
-		[Fact]
-		public void Test_2068()
-		{
-		}
-		[Fact]
-		public void Test_2069()
-		{
-		}
-		[Fact]
-		public void Test_2070()
-		{
-		}
-		[Fact]
-		public void Test_2071()
-		{
-		}
-		[Fact]
-		public void Test_2072()
-		{
-		}
-		[Fact]
-		public void Test_2073()
-		{
-		}
-		[Fact]
-		public void Test_2074()
-		{
-		}
-		[Fact]
-		public void Test_2075()
-		{
-		}
-		[Fact]
-		public void Test_2076()
-		{
-		}
-		[Fact]
-		public void Test_2077()
-		{
-		}
-		[Fact]
-		public void Test_2078()
-		{
-		}
-		[Fact]
-		public void Test_2079()
-		{
-		}
-		[Fact]
-		public void Test_2080()
-		{
-		}
-		[Fact]
-		public void Test_2081()
-		{
-		}
-		[Fact]
-		public void Test_2082()
-		{
-		}
-		[Fact]
-		public void Test_2083()
-		{
-		}
-		[Fact]
-		public void Test_2084()
-		{
-		}
-		[Fact]
-		public void Test_2085()
-		{
-		}
-		[Fact]
-		public void Test_2086()
-		{
-		}
-		[Fact]
-		public void Test_2087()
-		{
-		}
-		[Fact]
-		public void Test_2088()
-		{
-		}
-		[Fact]
-		public void Test_2089()
-		{
-		}
-		[Fact]
-		public void Test_2090()
-		{
-		}
-		[Fact]
-		public void Test_2091()
-		{
-		}
-		[Fact]
-		public void Test_2092()
-		{
-		}
-		[Fact]
-		public void Test_2093()
-		{
-		}
-		[Fact]
-		public void Test_2094()
-		{
-		}
-		[Fact]
-		public void Test_2095()
-		{
-		}
-		[Fact]
-		public void Test_2096()
-		{
-		}
-		[Fact]
-		public void Test_2097()
-		{
-		}
-		[Fact]
-		public void Test_2098()
-		{
-		}
-		[Fact]
-		public void Test_2099()
-		{
-		}
-		[Fact]
-		public void Test_2100()
-		{
-		}
-		[Fact]
-		public void Test_2101()
-		{
-		}
-		[Fact]
-		public void Test_2102()
-		{
-		}
-		[Fact]
-		public void Test_2103()
-		{
-		}
-		[Fact]
-		public void Test_2104()
-		{
-		}
-		[Fact]
-		public void Test_2105()
-		{
-		}
-		[Fact]
-		public void Test_2106()
-		{
-		}
-		[Fact]
-		public void Test_2107()
-		{
-		}
-		[Fact]
-		public void Test_2108()
-		{
-		}
-		[Fact]
-		public void Test_2109()
-		{
-		}
-		[Fact]
-		public void Test_2110()
-		{
-		}
-		[Fact]
-		public void Test_2111()
-		{
-		}
-		[Fact]
-		public void Test_2112()
-		{
-		}
-		[Fact]
-		public void Test_2113()
-		{
-		}
-		[Fact]
-		public void Test_2114()
-		{
-		}
-		[Fact]
-		public void Test_2115()
-		{
-		}
-		[Fact]
-		public void Test_2116()
-		{
-		}
-		[Fact]
-		public void Test_2117()
-		{
-		}
-		[Fact]
-		public void Test_2118()
-		{
-		}
-		[Fact]
-		public void Test_2119()
-		{
-		}
-		[Fact]
-		public void Test_2120()
-		{
-		}
-		[Fact]
-		public void Test_2121()
-		{
-		}
-		[Fact]
-		public void Test_2122()
-		{
-		}
-		[Fact]
-		public void Test_2123()
-		{
-		}
-		[Fact]
-		public void Test_2124()
-		{
-		}
-		[Fact]
-		public void Test_2125()
-		{
-		}
-		[Fact]
-		public void Test_2126()
-		{
-		}
-		[Fact]
-		public void Test_2127()
-		{
-		}
-		[Fact]
-		public void Test_2128()
-		{
-		}
-		[Fact]
-		public void Test_2129()
-		{
-		}
-		[Fact]
-		public void Test_2130()
-		{
-		}
-		[Fact]
-		public void Test_2131()
-		{
-		}
-		[Fact]
-		public void Test_2132()
-		{
-		}
-		[Fact]
-		public void Test_2133()
-		{
-		}
-		[Fact]
-		public void Test_2134()
-		{
-		}
-		[Fact]
-		public void Test_2135()
-		{
-		}
-		[Fact]
-		public void Test_2136()
-		{
-		}
-		[Fact]
-		public void Test_2137()
-		{
-		}
-		[Fact]
-		public void Test_2138()
-		{
-		}
-		[Fact]
-		public void Test_2139()
-		{
-		}
-		[Fact]
-		public void Test_2140()
-		{
-		}
-		[Fact]
-		public void Test_2141()
-		{
-		}
-		[Fact]
-		public void Test_2142()
-		{
-		}
-		[Fact]
-		public void Test_2143()
-		{
-		}
-		[Fact]
-		public void Test_2144()
-		{
-		}
-		[Fact]
-		public void Test_2145()
-		{
-		}
-		[Fact]
-		public void Test_2146()
-		{
-		}
-		[Fact]
-		public void Test_2147()
-		{
-		}
-		[Fact]
-		public void Test_2148()
-		{
-		}
-		[Fact]
-		public void Test_2149()
-		{
-		}
-		[Fact]
-		public void Test_2150()
-		{
-		}
-		[Fact]
-		public void Test_2151()
-		{
-		}
-		[Fact]
-		public void Test_2152()
-		{
-		}
-		[Fact]
-		public void Test_2153()
-		{
-		}
-		[Fact]
-		public void Test_2154()
-		{
-		}
-		[Fact]
-		public void Test_2155()
-		{
-		}
-		[Fact]
-		public void Test_2156()
-		{
-		}
-		[Fact]
-		public void Test_2157()
-		{
-		}
-		[Fact]
-		public void Test_2158()
-		{
-		}
-		[Fact]
-		public void Test_2159()
-		{
-		}
-		[Fact]
-		public void Test_2160()
-		{
-		}
-		[Fact]
-		public void Test_2161()
-		{
-		}
-		[Fact]
-		public void Test_2162()
-		{
-		}
-		[Fact]
-		public void Test_2163()
-		{
-		}
-		[Fact]
-		public void Test_2164()
-		{
-		}
-		[Fact]
-		public void Test_2165()
-		{
-		}
-		[Fact]
-		public void Test_2166()
-		{
-		}
-		[Fact]
-		public void Test_2167()
-		{
-		}
-		[Fact]
-		public void Test_2168()
-		{
-		}
-		[Fact]
-		public void Test_2169()
-		{
-		}
-		[Fact]
-		public void Test_2170()
-		{
-		}
-		[Fact]
-		public void Test_2171()
-		{
-		}
-		[Fact]
-		public void Test_2172()
-		{
-		}
-		[Fact]
-		public void Test_2173()
-		{
-		}
-		[Fact]
-		public void Test_2174()
-		{
-		}
-		[Fact]
-		public void Test_2175()
-		{
-		}
-		[Fact]
-		public void Test_2176()
-		{
-		}
-		[Fact]
-		public void Test_2177()
-		{
-		}
-		[Fact]
-		public void Test_2178()
-		{
-		}
-		[Fact]
-		public void Test_2179()
-		{
-		}
-		[Fact]
-		public void Test_2180()
-		{
-		}
-		[Fact]
-		public void Test_2181()
-		{
-		}
-		[Fact]
-		public void Test_2182()
-		{
-		}
-		[Fact]
-		public void Test_2183()
-		{
-		}
-		[Fact]
-		public void Test_2184()
-		{
-		}
-		[Fact]
-		public void Test_2185()
-		{
-		}
-		[Fact]
-		public void Test_2186()
-		{
-		}
-		[Fact]
-		public void Test_2187()
-		{
-		}
-		[Fact]
-		public void Test_2188()
-		{
-		}
-		[Fact]
-		public void Test_2189()
-		{
-		}
-		[Fact]
-		public void Test_2190()
-		{
-		}
-		[Fact]
-		public void Test_2191()
-		{
-		}
-		[Fact]
-		public void Test_2192()
-		{
-		}
-		[Fact]
-		public void Test_2193()
-		{
-		}
-		[Fact]
-		public void Test_2194()
-		{
-		}
-		[Fact]
-		public void Test_2195()
-		{
-		}
-		[Fact]
-		public void Test_2196()
-		{
-		}
-		[Fact]
-		public void Test_2197()
-		{
-		}
-		[Fact]
-		public void Test_2198()
-		{
-		}
-		[Fact]
-		public void Test_2199()
-		{
-		}
-		[Fact]
-		public void Test_2200()
-		{
-		}
-		[Fact]
-		public void Test_2201()
-		{
-		}
-		[Fact]
-		public void Test_2202()
-		{
-		}
-		[Fact]
-		public void Test_2203()
-		{
-		}
-		[Fact]
-		public void Test_2204()
-		{
-		}
-		[Fact]
-		public void Test_2205()
-		{
-		}
-		[Fact]
-		public void Test_2206()
-		{
-		}
-		[Fact]
-		public void Test_2207()
-		{
-		}
-		[Fact]
-		public void Test_2208()
-		{
-		}
-		[Fact]
-		public void Test_2209()
-		{
-		}
-		[Fact]
-		public void Test_2210()
-		{
-		}
-		[Fact]
-		public void Test_2211()
-		{
-		}
-		[Fact]
-		public void Test_2212()
-		{
-		}
-		[Fact]
-		public void Test_2213()
-		{
-		}
-		[Fact]
-		public void Test_2214()
-		{
-		}
-		[Fact]
-		public void Test_2215()
-		{
-		}
-		[Fact]
-		public void Test_2216()
-		{
-		}
-		[Fact]
-		public void Test_2217()
-		{
-		}
-		[Fact]
-		public void Test_2218()
-		{
-		}
-		[Fact]
-		public void Test_2219()
-		{
-		}
-		[Fact]
-		public void Test_2220()
-		{
-		}
-		[Fact]
-		public void Test_2221()
-		{
-		}
-		[Fact]
-		public void Test_2222()
-		{
-		}
-		[Fact]
-		public void Test_2223()
-		{
-		}
-		[Fact]
-		public void Test_2224()
-		{
-		}
-		[Fact]
-		public void Test_2225()
-		{
-		}
-		[Fact]
-		public void Test_2226()
-		{
-		}
-		[Fact]
-		public void Test_2227()
-		{
-		}
-		[Fact]
-		public void Test_2228()
-		{
-		}
-		[Fact]
-		public void Test_2229()
-		{
-		}
-		[Fact]
-		public void Test_2230()
-		{
-		}
-		[Fact]
-		public void Test_2231()
-		{
-		}
-		[Fact]
-		public void Test_2232()
-		{
-		}
-		[Fact]
-		public void Test_2233()
-		{
-		}
-		[Fact]
-		public void Test_2234()
-		{
-		}
-		[Fact]
-		public void Test_2235()
-		{
-		}
-		[Fact]
-		public void Test_2236()
-		{
-		}
-		[Fact]
-		public void Test_2237()
-		{
-		}
-		[Fact]
-		public void Test_2238()
-		{
-		}
-		[Fact]
-		public void Test_2239()
-		{
-		}
-		[Fact]
-		public void Test_2240()
-		{
-		}
-		[Fact]
-		public void Test_2241()
-		{
-		}
-		[Fact]
-		public void Test_2242()
-		{
-		}
-		[Fact]
-		public void Test_2243()
-		{
-		}
-		[Fact]
-		public void Test_2244()
-		{
-		}
-		[Fact]
-		public void Test_2245()
-		{
-		}
-		[Fact]
-		public void Test_2246()
-		{
-		}
-		[Fact]
-		public void Test_2247()
-		{
-		}
-		[Fact]
-		public void Test_2248()
-		{
-		}
-		[Fact]
-		public void Test_2249()
-		{
-		}
-		[Fact]
-		public void Test_2250()
-		{
-		}
-		[Fact]
-		public void Test_2251()
-		{
-		}
-		[Fact]
-		public void Test_2252()
-		{
-		}
-		[Fact]
-		public void Test_2253()
-		{
-		}
-		[Fact]
-		public void Test_2254()
-		{
-		}
-		[Fact]
-		public void Test_2255()
-		{
-		}
-		[Fact]
-		public void Test_2256()
-		{
-		}
-		[Fact]
-		public void Test_2257()
-		{
-		}
-		[Fact]
-		public void Test_2258()
-		{
-		}
-		[Fact]
-		public void Test_2259()
-		{
-		}
-		[Fact]
-		public void Test_2260()
-		{
-		}
-		[Fact]
-		public void Test_2261()
-		{
-		}
-		[Fact]
-		public void Test_2262()
-		{
-		}
-		[Fact]
-		public void Test_2263()
-		{
-		}
-		[Fact]
-		public void Test_2264()
-		{
-		}
-		[Fact]
-		public void Test_2265()
-		{
-		}
-		[Fact]
-		public void Test_2266()
-		{
-		}
-		[Fact]
-		public void Test_2267()
-		{
-		}
-		[Fact]
-		public void Test_2268()
-		{
-		}
-		[Fact]
-		public void Test_2269()
-		{
-		}
-		[Fact]
-		public void Test_2270()
-		{
-		}
-		[Fact]
-		public void Test_2271()
-		{
-		}
-		[Fact]
-		public void Test_2272()
-		{
-		}
-		[Fact]
-		public void Test_2273()
-		{
-		}
-		[Fact]
-		public void Test_2274()
-		{
-		}
-		[Fact]
-		public void Test_2275()
-		{
-		}
-		[Fact]
-		public void Test_2276()
-		{
-		}
-		[Fact]
-		public void Test_2277()
-		{
-		}
-		[Fact]
-		public void Test_2278()
-		{
-		}
-		[Fact]
-		public void Test_2279()
-		{
-		}
-		[Fact]
-		public void Test_2280()
-		{
-		}
-		[Fact]
-		public void Test_2281()
-		{
-		}
-		[Fact]
-		public void Test_2282()
-		{
-		}
-		[Fact]
-		public void Test_2283()
-		{
-		}
-		[Fact]
-		public void Test_2284()
-		{
-		}
-		[Fact]
-		public void Test_2285()
-		{
-		}
-		[Fact]
-		public void Test_2286()
-		{
-		}
-		[Fact]
-		public void Test_2287()
-		{
-		}
-		[Fact]
-		public void Test_2288()
-		{
-		}
-		[Fact]
-		public void Test_2289()
-		{
-		}
-		[Fact]
-		public void Test_2290()
-		{
-		}
-		[Fact]
-		public void Test_2291()
-		{
-		}
-		[Fact]
-		public void Test_2292()
-		{
-		}
-		[Fact]
-		public void Test_2293()
-		{
-		}
-		[Fact]
-		public void Test_2294()
-		{
-		}
-		[Fact]
-		public void Test_2295()
-		{
-		}
-		[Fact]
-		public void Test_2296()
-		{
-		}
-		[Fact]
-		public void Test_2297()
-		{
-		}
-		[Fact]
-		public void Test_2298()
-		{
-		}
-		[Fact]
-		public void Test_2299()
-		{
-		}
-		[Fact]
-		public void Test_2300()
-		{
-		}
-		[Fact]
-		public void Test_2301()
-		{
-		}
-		[Fact]
-		public void Test_2302()
-		{
-		}
-		[Fact]
-		public void Test_2303()
-		{
-		}
-		[Fact]
-		public void Test_2304()
-		{
-		}
-		[Fact]
-		public void Test_2305()
-		{
-		}
-		[Fact]
-		public void Test_2306()
-		{
-		}
-		[Fact]
-		public void Test_2307()
-		{
-		}
-		[Fact]
-		public void Test_2308()
-		{
-		}
-		[Fact]
-		public void Test_2309()
-		{
-		}
-		[Fact]
-		public void Test_2310()
-		{
-		}
-		[Fact]
-		public void Test_2311()
-		{
-		}
-		[Fact]
-		public void Test_2312()
-		{
-		}
-		[Fact]
-		public void Test_2313()
-		{
-		}
-		[Fact]
-		public void Test_2314()
-		{
-		}
-		[Fact]
-		public void Test_2315()
-		{
-		}
-		[Fact]
-		public void Test_2316()
-		{
-		}
-		[Fact]
-		public void Test_2317()
-		{
-		}
-		[Fact]
-		public void Test_2318()
-		{
-		}
-		[Fact]
-		public void Test_2319()
-		{
-		}
-		[Fact]
-		public void Test_2320()
-		{
-		}
-		[Fact]
-		public void Test_2321()
-		{
-		}
-		[Fact]
-		public void Test_2322()
-		{
-		}
-		[Fact]
-		public void Test_2323()
-		{
-		}
-		[Fact]
-		public void Test_2324()
-		{
-		}
-		[Fact]
-		public void Test_2325()
-		{
-		}
-		[Fact]
-		public void Test_2326()
-		{
-		}
-		[Fact]
-		public void Test_2327()
-		{
-		}
-		[Fact]
-		public void Test_2328()
-		{
-		}
-		[Fact]
-		public void Test_2329()
-		{
-		}
-		[Fact]
-		public void Test_2330()
-		{
-		}
-		[Fact]
-		public void Test_2331()
-		{
-		}
-		[Fact]
-		public void Test_2332()
-		{
-		}
-		[Fact]
-		public void Test_2333()
-		{
-		}
-		[Fact]
-		public void Test_2334()
-		{
-		}
-		[Fact]
-		public void Test_2335()
-		{
-		}
-		[Fact]
-		public void Test_2336()
-		{
-		}
-		[Fact]
-		public void Test_2337()
-		{
-		}
-		[Fact]
-		public void Test_2338()
-		{
-		}
-		[Fact]
-		public void Test_2339()
-		{
-		}
-		[Fact]
-		public void Test_2340()
-		{
-		}
-		[Fact]
-		public void Test_2341()
-		{
-		}
-		[Fact]
-		public void Test_2342()
-		{
-		}
-		[Fact]
-		public void Test_2343()
-		{
-		}
-		[Fact]
-		public void Test_2344()
-		{
-		}
-		[Fact]
-		public void Test_2345()
-		{
-		}
-		[Fact]
-		public void Test_2346()
-		{
-		}
-		[Fact]
-		public void Test_2347()
-		{
-		}
-		[Fact]
-		public void Test_2348()
-		{
-		}
-		[Fact]
-		public void Test_2349()
-		{
-		}
-		[Fact]
-		public void Test_2350()
-		{
-		}
-		[Fact]
-		public void Test_2351()
-		{
-		}
-		[Fact]
-		public void Test_2352()
-		{
-		}
-		[Fact]
-		public void Test_2353()
-		{
-		}
-		[Fact]
-		public void Test_2354()
-		{
-		}
-		[Fact]
-		public void Test_2355()
-		{
-		}
-		[Fact]
-		public void Test_2356()
-		{
-		}
-		[Fact]
-		public void Test_2357()
-		{
-		}
-		[Fact]
-		public void Test_2358()
-		{
-		}
-		[Fact]
-		public void Test_2359()
-		{
-		}
-		[Fact]
-		public void Test_2360()
-		{
-		}
-		[Fact]
-		public void Test_2361()
-		{
-		}
-		[Fact]
-		public void Test_2362()
-		{
-		}
-		[Fact]
-		public void Test_2363()
-		{
-		}
-		[Fact]
-		public void Test_2364()
-		{
-		}
-		[Fact]
-		public void Test_2365()
-		{
-		}
-		[Fact]
-		public void Test_2366()
-		{
-		}
-		[Fact]
-		public void Test_2367()
-		{
-		}
-		[Fact]
-		public void Test_2368()
-		{
-		}
-		[Fact]
-		public void Test_2369()
-		{
-		}
-		[Fact]
-		public void Test_2370()
-		{
-		}
-		[Fact]
-		public void Test_2371()
-		{
-		}
-		[Fact]
-		public void Test_2372()
-		{
-		}
-		[Fact]
-		public void Test_2373()
-		{
-		}
-		[Fact]
-		public void Test_2374()
-		{
-		}
-		[Fact]
-		public void Test_2375()
-		{
-		}
-		[Fact]
-		public void Test_2376()
-		{
-		}
-		[Fact]
-		public void Test_2377()
-		{
-		}
-		[Fact]
-		public void Test_2378()
-		{
-		}
-		[Fact]
-		public void Test_2379()
-		{
-		}
-		[Fact]
-		public void Test_2380()
-		{
-		}
-		[Fact]
-		public void Test_2381()
-		{
-		}
-		[Fact]
-		public void Test_2382()
-		{
-		}
-		[Fact]
-		public void Test_2383()
-		{
-		}
-		[Fact]
-		public void Test_2384()
-		{
-		}
-		[Fact]
-		public void Test_2385()
-		{
-		}
-		[Fact]
-		public void Test_2386()
-		{
-		}
-		[Fact]
-		public void Test_2387()
-		{
-		}
-		[Fact]
-		public void Test_2388()
-		{
-		}
-		[Fact]
-		public void Test_2389()
-		{
-		}
-		[Fact]
-		public void Test_2390()
-		{
-		}
-		[Fact]
-		public void Test_2391()
-		{
-		}
-		[Fact]
-		public void Test_2392()
-		{
-		}
-		[Fact]
-		public void Test_2393()
-		{
-		}
-		[Fact]
-		public void Test_2394()
-		{
-		}
-		[Fact]
-		public void Test_2395()
-		{
-		}
-		[Fact]
-		public void Test_2396()
-		{
-		}
-		[Fact]
-		public void Test_2397()
-		{
-		}
-		[Fact]
-		public void Test_2398()
-		{
-		}
-		[Fact]
-		public void Test_2399()
-		{
-		}
-		[Fact]
-		public void Test_2400()
-		{
-		}
-		[Fact]
-		public void Test_2401()
-		{
-		}
-		[Fact]
-		public void Test_2402()
-		{
-		}
-		[Fact]
-		public void Test_2403()
-		{
-		}
-		[Fact]
-		public void Test_2404()
-		{
-		}
-		[Fact]
-		public void Test_2405()
-		{
-		}
-		[Fact]
-		public void Test_2406()
-		{
-		}
-		[Fact]
-		public void Test_2407()
-		{
-		}
-		[Fact]
-		public void Test_2408()
-		{
-		}
-		[Fact]
-		public void Test_2409()
-		{
-		}
-		[Fact]
-		public void Test_2410()
-		{
-		}
-		[Fact]
-		public void Test_2411()
-		{
-		}
-		[Fact]
-		public void Test_2412()
-		{
-		}
-		[Fact]
-		public void Test_2413()
-		{
-		}
-		[Fact]
-		public void Test_2414()
-		{
-		}
-		[Fact]
-		public void Test_2415()
-		{
-		}
-		[Fact]
-		public void Test_2416()
-		{
-		}
-		[Fact]
-		public void Test_2417()
-		{
-		}
-		[Fact]
-		public void Test_2418()
-		{
-		}
-		[Fact]
-		public void Test_2419()
-		{
-		}
-		[Fact]
-		public void Test_2420()
-		{
-		}
-		[Fact]
-		public void Test_2421()
-		{
-		}
-		[Fact]
-		public void Test_2422()
-		{
-		}
-		[Fact]
-		public void Test_2423()
-		{
-		}
-		[Fact]
-		public void Test_2424()
-		{
-		}
-		[Fact]
-		public void Test_2425()
-		{
-		}
-		[Fact]
-		public void Test_2426()
-		{
-		}
-		[Fact]
-		public void Test_2427()
-		{
-		}
-		[Fact]
-		public void Test_2428()
-		{
-		}
-		[Fact]
-		public void Test_2429()
-		{
-		}
-		[Fact]
-		public void Test_2430()
-		{
-		}
-		[Fact]
-		public void Test_2431()
-		{
-		}
-		[Fact]
-		public void Test_2432()
-		{
-		}
-		[Fact]
-		public void Test_2433()
-		{
-		}
-		[Fact]
-		public void Test_2434()
-		{
-		}
-		[Fact]
-		public void Test_2435()
-		{
-		}
-		[Fact]
-		public void Test_2436()
-		{
-		}
-		[Fact]
-		public void Test_2437()
-		{
-		}
-		[Fact]
-		public void Test_2438()
-		{
-		}
-		[Fact]
-		public void Test_2439()
-		{
-		}
-		[Fact]
-		public void Test_2440()
-		{
-		}
-		[Fact]
-		public void Test_2441()
-		{
-		}
-		[Fact]
-		public void Test_2442()
-		{
-		}
-		[Fact]
-		public void Test_2443()
-		{
-		}
-		[Fact]
-		public void Test_2444()
-		{
-		}
-		[Fact]
-		public void Test_2445()
-		{
-		}
-		[Fact]
-		public void Test_2446()
-		{
-		}
-		[Fact]
-		public void Test_2447()
-		{
-		}
-		[Fact]
-		public void Test_2448()
-		{
-		}
-		[Fact]
-		public void Test_2449()
-		{
-		}
-		[Fact]
-		public void Test_2450()
-		{
-		}
-		[Fact]
-		public void Test_2451()
-		{
-		}
-		[Fact]
-		public void Test_2452()
-		{
-		}
-		[Fact]
-		public void Test_2453()
-		{
-		}
-		[Fact]
-		public void Test_2454()
-		{
-		}
-		[Fact]
-		public void Test_2455()
-		{
-		}
-		[Fact]
-		public void Test_2456()
-		{
-		}
-		[Fact]
-		public void Test_2457()
-		{
-		}
-		[Fact]
-		public void Test_2458()
-		{
-		}
-		[Fact]
-		public void Test_2459()
-		{
-		}
-		[Fact]
-		public void Test_2460()
-		{
-		}
-		[Fact]
-		public void Test_2461()
-		{
-		}
-		[Fact]
-		public void Test_2462()
-		{
-		}
-		[Fact]
-		public void Test_2463()
-		{
-		}
-		[Fact]
-		public void Test_2464()
-		{
-		}
-		[Fact]
-		public void Test_2465()
-		{
-		}
-		[Fact]
-		public void Test_2466()
-		{
-		}
-		[Fact]
-		public void Test_2467()
-		{
-		}
-		[Fact]
-		public void Test_2468()
-		{
-		}
-		[Fact]
-		public void Test_2469()
-		{
-		}
-		[Fact]
-		public void Test_2470()
-		{
-		}
-		[Fact]
-		public void Test_2471()
-		{
-		}
-		[Fact]
-		public void Test_2472()
-		{
-		}
-		[Fact]
-		public void Test_2473()
-		{
-		}
-		[Fact]
-		public void Test_2474()
-		{
-		}
-		[Fact]
-		public void Test_2475()
-		{
-		}
-		[Fact]
-		public void Test_2476()
-		{
-		}
-		[Fact]
-		public void Test_2477()
-		{
-		}
-		[Fact]
-		public void Test_2478()
-		{
-		}
-		[Fact]
-		public void Test_2479()
-		{
-		}
-		[Fact]
-		public void Test_2480()
-		{
-		}
-		[Fact]
-		public void Test_2481()
-		{
-		}
-		[Fact]
-		public void Test_2482()
-		{
-		}
-		[Fact]
-		public void Test_2483()
-		{
-		}
-		[Fact]
-		public void Test_2484()
-		{
-		}
-		[Fact]
-		public void Test_2485()
-		{
-		}
-		[Fact]
-		public void Test_2486()
-		{
-		}
-		[Fact]
-		public void Test_2487()
-		{
-		}
-		[Fact]
-		public void Test_2488()
-		{
-		}
-		[Fact]
-		public void Test_2489()
-		{
-		}
-		[Fact]
-		public void Test_2490()
-		{
-		}
-		[Fact]
-		public void Test_2491()
-		{
-		}
-		[Fact]
-		public void Test_2492()
-		{
-		}
-		[Fact]
-		public void Test_2493()
-		{
-		}
-		[Fact]
-		public void Test_2494()
-		{
-		}
-		[Fact]
-		public void Test_2495()
-		{
-		}
-		[Fact]
-		public void Test_2496()
-		{
-		}
-		[Fact]
-		public void Test_2497()
-		{
-		}
-		[Fact]
-		public void Test_2498()
-		{
-		}
-		[Fact]
-		public void Test_2499()
-		{
-		}
-		[Fact]
-		public void Test_2500()
-		{
-		}
-		[Fact]
-		public void Test_2501()
-		{
-		}
-		[Fact]
-		public void Test_2502()
-		{
-		}
-		[Fact]
-		public void Test_2503()
-		{
-		}
-		[Fact]
-		public void Test_2504()
-		{
-		}
-		[Fact]
-		public void Test_2505()
-		{
-		}
-		[Fact]
-		public void Test_2506()
-		{
-		}
-		[Fact]
-		public void Test_2507()
-		{
-		}
-		[Fact]
-		public void Test_2508()
-		{
-		}
-		[Fact]
-		public void Test_2509()
-		{
-		}
-		[Fact]
-		public void Test_2510()
-		{
-		}
-		[Fact]
-		public void Test_2511()
-		{
-		}
-		[Fact]
-		public void Test_2512()
-		{
-		}
-		[Fact]
-		public void Test_2513()
-		{
-		}
-		[Fact]
-		public void Test_2514()
-		{
-		}
-		[Fact]
-		public void Test_2515()
-		{
-		}
-		[Fact]
-		public void Test_2516()
-		{
-		}
-		[Fact]
-		public void Test_2517()
-		{
-		}
-		[Fact]
-		public void Test_2518()
-		{
-		}
-		[Fact]
-		public void Test_2519()
-		{
-		}
-		[Fact]
-		public void Test_2520()
-		{
-		}
-		[Fact]
-		public void Test_2521()
-		{
-		}
-		[Fact]
-		public void Test_2522()
-		{
-		}
-		[Fact]
-		public void Test_2523()
-		{
-		}
-		[Fact]
-		public void Test_2524()
-		{
-		}
-		[Fact]
-		public void Test_2525()
-		{
-		}
-		[Fact]
-		public void Test_2526()
-		{
-		}
-		[Fact]
-		public void Test_2527()
-		{
-		}
-		[Fact]
-		public void Test_2528()
-		{
-		}
-		[Fact]
-		public void Test_2529()
-		{
-		}
-		[Fact]
-		public void Test_2530()
-		{
-		}
-		[Fact]
-		public void Test_2531()
-		{
-		}
-		[Fact]
-		public void Test_2532()
-		{
-		}
-		[Fact]
-		public void Test_2533()
-		{
-		}
-		[Fact]
-		public void Test_2534()
-		{
-		}
-		[Fact]
-		public void Test_2535()
-		{
-		}
-		[Fact]
-		public void Test_2536()
-		{
-		}
-		[Fact]
-		public void Test_2537()
-		{
-		}
-		[Fact]
-		public void Test_2538()
-		{
-		}
-		[Fact]
-		public void Test_2539()
-		{
-		}
-		[Fact]
-		public void Test_2540()
-		{
-		}
-		[Fact]
-		public void Test_2541()
-		{
-		}
-		[Fact]
-		public void Test_2542()
-		{
-		}
-		[Fact]
-		public void Test_2543()
-		{
-		}
-		[Fact]
-		public void Test_2544()
-		{
-		}
-		[Fact]
-		public void Test_2545()
-		{
-		}
-		[Fact]
-		public void Test_2546()
-		{
-		}
-		[Fact]
-		public void Test_2547()
-		{
-		}
-		[Fact]
-		public void Test_2548()
-		{
-		}
-		[Fact]
-		public void Test_2549()
-		{
-		}
-		[Fact]
-		public void Test_2550()
-		{
-		}
-		[Fact]
-		public void Test_2551()
-		{
-		}
-		[Fact]
-		public void Test_2552()
-		{
-		}
-		[Fact]
-		public void Test_2553()
-		{
-		}
-		[Fact]
-		public void Test_2554()
-		{
-		}
-		[Fact]
-		public void Test_2555()
-		{
-		}
-		[Fact]
-		public void Test_2556()
-		{
-		}
-		[Fact]
-		public void Test_2557()
-		{
-		}
-		[Fact]
-		public void Test_2558()
-		{
-		}
-		[Fact]
-		public void Test_2559()
-		{
-		}
-		[Fact]
-		public void Test_2560()
-		{
-		}
-		[Fact]
-		public void Test_2561()
-		{
-		}
-		[Fact]
-		public void Test_2562()
-		{
-		}
-		[Fact]
-		public void Test_2563()
-		{
-		}
-		[Fact]
-		public void Test_2564()
-		{
-		}
-		[Fact]
-		public void Test_2565()
-		{
-		}
-		[Fact]
-		public void Test_2566()
-		{
-		}
-		[Fact]
-		public void Test_2567()
-		{
-		}
-		[Fact]
-		public void Test_2568()
-		{
-		}
-		[Fact]
-		public void Test_2569()
-		{
-		}
-		[Fact]
-		public void Test_2570()
-		{
-		}
-		[Fact]
-		public void Test_2571()
-		{
-		}
-		[Fact]
-		public void Test_2572()
-		{
-		}
-		[Fact]
-		public void Test_2573()
-		{
-		}
-		[Fact]
-		public void Test_2574()
-		{
-		}
-		[Fact]
-		public void Test_2575()
-		{
-		}
-		[Fact]
-		public void Test_2576()
-		{
-		}
-		[Fact]
-		public void Test_2577()
-		{
-		}
-		[Fact]
-		public void Test_2578()
-		{
-		}
-		[Fact]
-		public void Test_2579()
-		{
-		}
-		[Fact]
-		public void Test_2580()
-		{
-		}
-		[Fact]
-		public void Test_2581()
-		{
-		}
-		[Fact]
-		public void Test_2582()
-		{
-		}
-		[Fact]
-		public void Test_2583()
-		{
-		}
-		[Fact]
-		public void Test_2584()
-		{
-		}
-		[Fact]
-		public void Test_2585()
-		{
-		}
-		[Fact]
-		public void Test_2586()
-		{
-		}
-		[Fact]
-		public void Test_2587()
-		{
-		}
-		[Fact]
-		public void Test_2588()
-		{
-		}
-		[Fact]
-		public void Test_2589()
-		{
-		}
-		[Fact]
-		public void Test_2590()
-		{
-		}
-		[Fact]
-		public void Test_2591()
-		{
-		}
-		[Fact]
-		public void Test_2592()
-		{
-		}
-		[Fact]
-		public void Test_2593()
-		{
-		}
-		[Fact]
-		public void Test_2594()
-		{
-		}
-		[Fact]
-		public void Test_2595()
-		{
-		}
-		[Fact]
-		public void Test_2596()
-		{
-		}
-		[Fact]
-		public void Test_2597()
-		{
-		}
-		[Fact]
-		public void Test_2598()
-		{
-		}
-		[Fact]
-		public void Test_2599()
-		{
-		}
-		[Fact]
-		public void Test_2600()
-		{
-		}
-		[Fact]
-		public void Test_2601()
-		{
-		}
-		[Fact]
-		public void Test_2602()
-		{
-		}
-		[Fact]
-		public void Test_2603()
-		{
-		}
-		[Fact]
-		public void Test_2604()
-		{
-		}
-		[Fact]
-		public void Test_2605()
-		{
-		}
-		[Fact]
-		public void Test_2606()
-		{
-		}
-		[Fact]
-		public void Test_2607()
-		{
-		}
-		[Fact]
-		public void Test_2608()
-		{
-		}
-		[Fact]
-		public void Test_2609()
-		{
-		}
-		[Fact]
-		public void Test_2610()
-		{
-		}
-		[Fact]
-		public void Test_2611()
-		{
-		}
-		[Fact]
-		public void Test_2612()
-		{
-		}
-		[Fact]
-		public void Test_2613()
-		{
-		}
-		[Fact]
-		public void Test_2614()
-		{
-		}
-		[Fact]
-		public void Test_2615()
-		{
-		}
-		[Fact]
-		public void Test_2616()
-		{
-		}
-		[Fact]
-		public void Test_2617()
-		{
-		}
-		[Fact]
-		public void Test_2618()
-		{
-		}
-		[Fact]
-		public void Test_2619()
-		{
-		}
-		[Fact]
-		public void Test_2620()
-		{
-		}
-		[Fact]
-		public void Test_2621()
-		{
-		}
-		[Fact]
-		public void Test_2622()
-		{
-		}
-		[Fact]
-		public void Test_2623()
-		{
-		}
-		[Fact]
-		public void Test_2624()
-		{
-		}
-		[Fact]
-		public void Test_2625()
-		{
-		}
-		[Fact]
-		public void Test_2626()
-		{
-		}
-		[Fact]
-		public void Test_2627()
-		{
-		}
-		[Fact]
-		public void Test_2628()
-		{
-		}
-		[Fact]
-		public void Test_2629()
-		{
-		}
-		[Fact]
-		public void Test_2630()
-		{
-		}
-		[Fact]
-		public void Test_2631()
-		{
-		}
-		[Fact]
-		public void Test_2632()
-		{
-		}
-		[Fact]
-		public void Test_2633()
-		{
-		}
-		[Fact]
-		public void Test_2634()
-		{
-		}
-		[Fact]
-		public void Test_2635()
-		{
-		}
-		[Fact]
-		public void Test_2636()
-		{
-		}
-		[Fact]
-		public void Test_2637()
-		{
-		}
-		[Fact]
-		public void Test_2638()
-		{
-		}
-		[Fact]
-		public void Test_2639()
-		{
-		}
-		[Fact]
-		public void Test_2640()
-		{
-		}
-		[Fact]
-		public void Test_2641()
-		{
-		}
-		[Fact]
-		public void Test_2642()
-		{
-		}
-		[Fact]
-		public void Test_2643()
-		{
-		}
-		[Fact]
-		public void Test_2644()
-		{
-		}
-		[Fact]
-		public void Test_2645()
-		{
-		}
-		[Fact]
-		public void Test_2646()
-		{
-		}
-		[Fact]
-		public void Test_2647()
-		{
-		}
-		[Fact]
-		public void Test_2648()
-		{
-		}
-		[Fact]
-		public void Test_2649()
-		{
-		}
-		[Fact]
-		public void Test_2650()
-		{
-		}
-		[Fact]
-		public void Test_2651()
-		{
-		}
-		[Fact]
-		public void Test_2652()
-		{
-		}
-		[Fact]
-		public void Test_2653()
-		{
-		}
-		[Fact]
-		public void Test_2654()
-		{
-		}
-		[Fact]
-		public void Test_2655()
-		{
-		}
-		[Fact]
-		public void Test_2656()
-		{
-		}
-		[Fact]
-		public void Test_2657()
-		{
-		}
-		[Fact]
-		public void Test_2658()
-		{
-		}
-		[Fact]
-		public void Test_2659()
-		{
-		}
-		[Fact]
-		public void Test_2660()
-		{
-		}
-		[Fact]
-		public void Test_2661()
-		{
-		}
-		[Fact]
-		public void Test_2662()
-		{
-		}
-		[Fact]
-		public void Test_2663()
-		{
-		}
-		[Fact]
-		public void Test_2664()
-		{
-		}
-		[Fact]
-		public void Test_2665()
-		{
-		}
-		[Fact]
-		public void Test_2666()
-		{
-		}
-		[Fact]
-		public void Test_2667()
-		{
-		}
-		[Fact]
-		public void Test_2668()
-		{
-		}
-		[Fact]
-		public void Test_2669()
-		{
-		}
-		[Fact]
-		public void Test_2670()
-		{
-		}
-		[Fact]
-		public void Test_2671()
-		{
-		}
-		[Fact]
-		public void Test_2672()
-		{
-		}
-		[Fact]
-		public void Test_2673()
-		{
-		}
-		[Fact]
-		public void Test_2674()
-		{
-		}
-		[Fact]
-		public void Test_2675()
-		{
-		}
-		[Fact]
-		public void Test_2676()
-		{
-		}
-		[Fact]
-		public void Test_2677()
-		{
-		}
-		[Fact]
-		public void Test_2678()
-		{
-		}
-		[Fact]
-		public void Test_2679()
-		{
-		}
-		[Fact]
-		public void Test_2680()
-		{
-		}
-		[Fact]
-		public void Test_2681()
-		{
-		}
-		[Fact]
-		public void Test_2682()
-		{
-		}
-		[Fact]
-		public void Test_2683()
-		{
-		}
-		[Fact]
-		public void Test_2684()
-		{
-		}
-		[Fact]
-		public void Test_2685()
-		{
-		}
-		[Fact]
-		public void Test_2686()
-		{
-		}
-		[Fact]
-		public void Test_2687()
-		{
-		}
-		[Fact]
-		public void Test_2688()
-		{
-		}
-		[Fact]
-		public void Test_2689()
-		{
-		}
-		[Fact]
-		public void Test_2690()
-		{
-		}
-		[Fact]
-		public void Test_2691()
-		{
-		}
-		[Fact]
-		public void Test_2692()
-		{
-		}
-		[Fact]
-		public void Test_2693()
-		{
-		}
-		[Fact]
-		public void Test_2694()
-		{
-		}
-		[Fact]
-		public void Test_2695()
-		{
-		}
-		[Fact]
-		public void Test_2696()
-		{
-		}
-		[Fact]
-		public void Test_2697()
-		{
-		}
-		[Fact]
-		public void Test_2698()
-		{
-		}
-		[Fact]
-		public void Test_2699()
-		{
-		}
-		[Fact]
-		public void Test_2700()
-		{
-		}
-		[Fact]
-		public void Test_2701()
-		{
-		}
-		[Fact]
-		public void Test_2702()
-		{
-		}
-		[Fact]
-		public void Test_2703()
-		{
-		}
-		[Fact]
-		public void Test_2704()
-		{
-		}
-		[Fact]
-		public void Test_2705()
-		{
-		}
-		[Fact]
-		public void Test_2706()
-		{
-		}
-		[Fact]
-		public void Test_2707()
-		{
-		}
-		[Fact]
-		public void Test_2708()
-		{
-		}
-		[Fact]
-		public void Test_2709()
-		{
-		}
-		[Fact]
-		public void Test_2710()
-		{
-		}
-		[Fact]
-		public void Test_2711()
-		{
-		}
-		[Fact]
-		public void Test_2712()
-		{
-		}
-		[Fact]
-		public void Test_2713()
-		{
-		}
-		[Fact]
-		public void Test_2714()
-		{
-		}
-		[Fact]
-		public void Test_2715()
-		{
-		}
-		[Fact]
-		public void Test_2716()
-		{
-		}
-		[Fact]
-		public void Test_2717()
-		{
-		}
-		[Fact]
-		public void Test_2718()
-		{
-		}
-		[Fact]
-		public void Test_2719()
-		{
-		}
-		[Fact]
-		public void Test_2720()
-		{
-		}
-		[Fact]
-		public void Test_2721()
-		{
-		}
-		[Fact]
-		public void Test_2722()
-		{
-		}
-		[Fact]
-		public void Test_2723()
-		{
-		}
-		[Fact]
-		public void Test_2724()
-		{
-		}
-		[Fact]
-		public void Test_2725()
-		{
-		}
-		[Fact]
-		public void Test_2726()
-		{
-		}
-		[Fact]
-		public void Test_2727()
-		{
-		}
-		[Fact]
-		public void Test_2728()
-		{
-		}
-		[Fact]
-		public void Test_2729()
-		{
-		}
-		[Fact]
-		public void Test_2730()
-		{
-		}
-		[Fact]
-		public void Test_2731()
-		{
-		}
-		[Fact]
-		public void Test_2732()
-		{
-		}
-		[Fact]
-		public void Test_2733()
-		{
-		}
-		[Fact]
-		public void Test_2734()
-		{
-		}
-		[Fact]
-		public void Test_2735()
-		{
-		}
-		[Fact]
-		public void Test_2736()
-		{
-		}
-		[Fact]
-		public void Test_2737()
-		{
-		}
-		[Fact]
-		public void Test_2738()
-		{
-		}
-		[Fact]
-		public void Test_2739()
-		{
-		}
-		[Fact]
-		public void Test_2740()
-		{
-		}
-		[Fact]
-		public void Test_2741()
-		{
-		}
-		[Fact]
-		public void Test_2742()
-		{
-		}
-		[Fact]
-		public void Test_2743()
-		{
-		}
-		[Fact]
-		public void Test_2744()
-		{
-		}
-		[Fact]
-		public void Test_2745()
-		{
-		}
-		[Fact]
-		public void Test_2746()
-		{
-		}
-		[Fact]
-		public void Test_2747()
-		{
-		}
-		[Fact]
-		public void Test_2748()
-		{
-		}
-		[Fact]
-		public void Test_2749()
-		{
-		}
-		[Fact]
-		public void Test_2750()
-		{
-		}
-		[Fact]
-		public void Test_2751()
-		{
-		}
-		[Fact]
-		public void Test_2752()
-		{
-		}
-		[Fact]
-		public void Test_2753()
-		{
-		}
-		[Fact]
-		public void Test_2754()
-		{
-		}
-		[Fact]
-		public void Test_2755()
-		{
-		}
-		[Fact]
-		public void Test_2756()
-		{
-		}
-		[Fact]
-		public void Test_2757()
-		{
-		}
-		[Fact]
-		public void Test_2758()
-		{
-		}
-		[Fact]
-		public void Test_2759()
-		{
-		}
-		[Fact]
-		public void Test_2760()
-		{
-		}
-		[Fact]
-		public void Test_2761()
-		{
-		}
-		[Fact]
-		public void Test_2762()
-		{
-		}
-		[Fact]
-		public void Test_2763()
-		{
-		}
-		[Fact]
-		public void Test_2764()
-		{
-		}
-		[Fact]
-		public void Test_2765()
-		{
-		}
-		[Fact]
-		public void Test_2766()
-		{
-		}
-		[Fact]
-		public void Test_2767()
-		{
-		}
-		[Fact]
-		public void Test_2768()
-		{
-		}
-		[Fact]
-		public void Test_2769()
-		{
-		}
-		[Fact]
-		public void Test_2770()
-		{
-		}
-		[Fact]
-		public void Test_2771()
-		{
-		}
-		[Fact]
-		public void Test_2772()
-		{
-		}
-		[Fact]
-		public void Test_2773()
-		{
-		}
-		[Fact]
-		public void Test_2774()
-		{
-		}
-		[Fact]
-		public void Test_2775()
-		{
-		}
-		[Fact]
-		public void Test_2776()
-		{
-		}
-		[Fact]
-		public void Test_2777()
-		{
-		}
-		[Fact]
-		public void Test_2778()
-		{
-		}
-		[Fact]
-		public void Test_2779()
-		{
-		}
-		[Fact]
-		public void Test_2780()
-		{
-		}
-		[Fact]
-		public void Test_2781()
-		{
-		}
-		[Fact]
-		public void Test_2782()
-		{
-		}
-		[Fact]
-		public void Test_2783()
-		{
-		}
-		[Fact]
-		public void Test_2784()
-		{
-		}
-		[Fact]
-		public void Test_2785()
-		{
-		}
-		[Fact]
-		public void Test_2786()
-		{
-		}
-		[Fact]
-		public void Test_2787()
-		{
-		}
-		[Fact]
-		public void Test_2788()
-		{
-		}
-		[Fact]
-		public void Test_2789()
-		{
-		}
-		[Fact]
-		public void Test_2790()
-		{
-		}
-		[Fact]
-		public void Test_2791()
-		{
-		}
-		[Fact]
-		public void Test_2792()
-		{
-		}
-		[Fact]
-		public void Test_2793()
-		{
-		}
-		[Fact]
-		public void Test_2794()
-		{
-		}
-		[Fact]
-		public void Test_2795()
-		{
-		}
-		[Fact]
-		public void Test_2796()
-		{
-		}
-		[Fact]
-		public void Test_2797()
-		{
-		}
-		[Fact]
-		public void Test_2798()
-		{
-		}
-		[Fact]
-		public void Test_2799()
-		{
-		}
-		[Fact]
-		public void Test_2800()
-		{
-		}
-		[Fact]
-		public void Test_2801()
-		{
-		}
-		[Fact]
-		public void Test_2802()
-		{
-		}
-		[Fact]
-		public void Test_2803()
-		{
-		}
-		[Fact]
-		public void Test_2804()
-		{
-		}
-		[Fact]
-		public void Test_2805()
-		{
-		}
-		[Fact]
-		public void Test_2806()
-		{
-		}
-		[Fact]
-		public void Test_2807()
-		{
-		}
-		[Fact]
-		public void Test_2808()
-		{
-		}
-		[Fact]
-		public void Test_2809()
-		{
-		}
-		[Fact]
-		public void Test_2810()
-		{
-		}
-		[Fact]
-		public void Test_2811()
-		{
-		}
-		[Fact]
-		public void Test_2812()
-		{
-		}
-		[Fact]
-		public void Test_2813()
-		{
-		}
-		[Fact]
-		public void Test_2814()
-		{
-		}
-		[Fact]
-		public void Test_2815()
-		{
-		}
-		[Fact]
-		public void Test_2816()
-		{
-		}
-		[Fact]
-		public void Test_2817()
-		{
-		}
-		[Fact]
-		public void Test_2818()
-		{
-		}
-		[Fact]
-		public void Test_2819()
-		{
-		}
-		[Fact]
-		public void Test_2820()
-		{
-		}
-		[Fact]
-		public void Test_2821()
-		{
-		}
-		[Fact]
-		public void Test_2822()
-		{
-		}
-		[Fact]
-		public void Test_2823()
-		{
-		}
-		[Fact]
-		public void Test_2824()
-		{
-		}
-		[Fact]
-		public void Test_2825()
-		{
-		}
-		[Fact]
-		public void Test_2826()
-		{
-		}
-		[Fact]
-		public void Test_2827()
-		{
-		}
-		[Fact]
-		public void Test_2828()
-		{
-		}
-		[Fact]
-		public void Test_2829()
-		{
-		}
-		[Fact]
-		public void Test_2830()
-		{
-		}
-		[Fact]
-		public void Test_2831()
-		{
-		}
-		[Fact]
-		public void Test_2832()
-		{
-		}
-		[Fact]
-		public void Test_2833()
-		{
-		}
-		[Fact]
-		public void Test_2834()
-		{
-		}
-		[Fact]
-		public void Test_2835()
-		{
-		}
-		[Fact]
-		public void Test_2836()
-		{
-		}
-		[Fact]
-		public void Test_2837()
-		{
-		}
-		[Fact]
-		public void Test_2838()
-		{
-		}
-		[Fact]
-		public void Test_2839()
-		{
-		}
-		[Fact]
-		public void Test_2840()
-		{
-		}
-		[Fact]
-		public void Test_2841()
-		{
-		}
-		[Fact]
-		public void Test_2842()
-		{
-		}
-		[Fact]
-		public void Test_2843()
-		{
-		}
-		[Fact]
-		public void Test_2844()
-		{
-		}
-		[Fact]
-		public void Test_2845()
-		{
-		}
-		[Fact]
-		public void Test_2846()
-		{
-		}
-		[Fact]
-		public void Test_2847()
-		{
-		}
-		[Fact]
-		public void Test_2848()
-		{
-		}
-		[Fact]
-		public void Test_2849()
-		{
-		}
-		[Fact]
-		public void Test_2850()
-		{
-		}
-		[Fact]
-		public void Test_2851()
-		{
-		}
-		[Fact]
-		public void Test_2852()
-		{
-		}
-		[Fact]
-		public void Test_2853()
-		{
-		}
-		[Fact]
-		public void Test_2854()
-		{
-		}
-		[Fact]
-		public void Test_2855()
-		{
-		}
-		[Fact]
-		public void Test_2856()
-		{
-		}
-		[Fact]
-		public void Test_2857()
-		{
-		}
-		[Fact]
-		public void Test_2858()
-		{
-		}
-		[Fact]
-		public void Test_2859()
-		{
-		}
-		[Fact]
-		public void Test_2860()
-		{
-		}
-		[Fact]
-		public void Test_2861()
-		{
-		}
-		[Fact]
-		public void Test_2862()
-		{
-		}
-		[Fact]
-		public void Test_2863()
-		{
-		}
-		[Fact]
-		public void Test_2864()
-		{
-		}
-		[Fact]
-		public void Test_2865()
-		{
-		}
-		[Fact]
-		public void Test_2866()
-		{
-		}
-		[Fact]
-		public void Test_2867()
-		{
-		}
-		[Fact]
-		public void Test_2868()
-		{
-		}
-		[Fact]
-		public void Test_2869()
-		{
-		}
-		[Fact]
-		public void Test_2870()
-		{
-		}
-		[Fact]
-		public void Test_2871()
-		{
-		}
-		[Fact]
-		public void Test_2872()
-		{
-		}
-		[Fact]
-		public void Test_2873()
-		{
-		}
-		[Fact]
-		public void Test_2874()
-		{
-		}
-		[Fact]
-		public void Test_2875()
-		{
-		}
-		[Fact]
-		public void Test_2876()
-		{
-		}
-		[Fact]
-		public void Test_2877()
-		{
-		}
-		[Fact]
-		public void Test_2878()
-		{
-		}
-		[Fact]
-		public void Test_2879()
-		{
-		}
-		[Fact]
-		public void Test_2880()
-		{
-		}
-		[Fact]
-		public void Test_2881()
-		{
-		}
-		[Fact]
-		public void Test_2882()
-		{
-		}
-		[Fact]
-		public void Test_2883()
-		{
-		}
-		[Fact]
-		public void Test_2884()
-		{
-		}
-		[Fact]
-		public void Test_2885()
-		{
-		}
-		[Fact]
-		public void Test_2886()
-		{
-		}
-		[Fact]
-		public void Test_2887()
-		{
-		}
-		[Fact]
-		public void Test_2888()
-		{
-		}
-		[Fact]
-		public void Test_2889()
-		{
-		}
-		[Fact]
-		public void Test_2890()
-		{
-		}
-		[Fact]
-		public void Test_2891()
-		{
-		}
-		[Fact]
-		public void Test_2892()
-		{
-		}
-		[Fact]
-		public void Test_2893()
-		{
-		}
-		[Fact]
-		public void Test_2894()
-		{
-		}
-		[Fact]
-		public void Test_2895()
-		{
-		}
-		[Fact]
-		public void Test_2896()
-		{
-		}
-		[Fact]
-		public void Test_2897()
-		{
-		}
-		[Fact]
-		public void Test_2898()
-		{
-		}
-		[Fact]
-		public void Test_2899()
-		{
-		}
-		[Fact]
-		public void Test_2900()
-		{
-		}
-		[Fact]
-		public void Test_2901()
-		{
-		}
-		[Fact]
-		public void Test_2902()
-		{
-		}
-		[Fact]
-		public void Test_2903()
-		{
-		}
-		[Fact]
-		public void Test_2904()
-		{
-		}
-		[Fact]
-		public void Test_2905()
-		{
-		}
-		[Fact]
-		public void Test_2906()
-		{
-		}
-		[Fact]
-		public void Test_2907()
-		{
-		}
-		[Fact]
-		public void Test_2908()
-		{
-		}
-		[Fact]
-		public void Test_2909()
-		{
-		}
-		[Fact]
-		public void Test_2910()
-		{
-		}
-		[Fact]
-		public void Test_2911()
-		{
-		}
-		[Fact]
-		public void Test_2912()
-		{
-		}
-		[Fact]
-		public void Test_2913()
-		{
-		}
-		[Fact]
-		public void Test_2914()
-		{
-		}
-		[Fact]
-		public void Test_2915()
-		{
-		}
-		[Fact]
-		public void Test_2916()
-		{
-		}
-		[Fact]
-		public void Test_2917()
-		{
-		}
-		[Fact]
-		public void Test_2918()
-		{
-		}
-		[Fact]
-		public void Test_2919()
-		{
-		}
-		[Fact]
-		public void Test_2920()
-		{
-		}
-		[Fact]
-		public void Test_2921()
-		{
-		}
-		[Fact]
-		public void Test_2922()
-		{
-		}
-		[Fact]
-		public void Test_2923()
-		{
-		}
-		[Fact]
-		public void Test_2924()
-		{
-		}
-		[Fact]
-		public void Test_2925()
-		{
-		}
-		[Fact]
-		public void Test_2926()
-		{
-		}
-		[Fact]
-		public void Test_2927()
-		{
-		}
-		[Fact]
-		public void Test_2928()
-		{
-		}
-		[Fact]
-		public void Test_2929()
-		{
-		}
-		[Fact]
-		public void Test_2930()
-		{
-		}
-		[Fact]
-		public void Test_2931()
-		{
-		}
-		[Fact]
-		public void Test_2932()
-		{
-		}
-		[Fact]
-		public void Test_2933()
-		{
-		}
-		[Fact]
-		public void Test_2934()
-		{
-		}
-		[Fact]
-		public void Test_2935()
-		{
-		}
-		[Fact]
-		public void Test_2936()
-		{
-		}
-		[Fact]
-		public void Test_2937()
-		{
-		}
-		[Fact]
-		public void Test_2938()
-		{
-		}
-		[Fact]
-		public void Test_2939()
-		{
-		}
-		[Fact]
-		public void Test_2940()
-		{
-		}
-		[Fact]
-		public void Test_2941()
-		{
-		}
-		[Fact]
-		public void Test_2942()
-		{
-		}
-		[Fact]
-		public void Test_2943()
-		{
-		}
-		[Fact]
-		public void Test_2944()
-		{
-		}
-		[Fact]
-		public void Test_2945()
-		{
-		}
-		[Fact]
-		public void Test_2946()
-		{
-		}
-		[Fact]
-		public void Test_2947()
-		{
-		}
-		[Fact]
-		public void Test_2948()
-		{
-		}
-		[Fact]
-		public void Test_2949()
-		{
-		}
-		[Fact]
-		public void Test_2950()
-		{
-		}
-		[Fact]
-		public void Test_2951()
-		{
-		}
-		[Fact]
-		public void Test_2952()
-		{
-		}
-		[Fact]
-		public void Test_2953()
-		{
-		}
-		[Fact]
-		public void Test_2954()
-		{
-		}
-		[Fact]
-		public void Test_2955()
-		{
-		}
-		[Fact]
-		public void Test_2956()
-		{
-		}
-		[Fact]
-		public void Test_2957()
-		{
-		}
-		[Fact]
-		public void Test_2958()
-		{
-		}
-		[Fact]
-		public void Test_2959()
-		{
-		}
-		[Fact]
-		public void Test_2960()
-		{
-		}
-		[Fact]
-		public void Test_2961()
-		{
-		}
-		[Fact]
-		public void Test_2962()
-		{
-		}
-		[Fact]
-		public void Test_2963()
-		{
-		}
-		[Fact]
-		public void Test_2964()
-		{
-		}
-		[Fact]
-		public void Test_2965()
-		{
-		}
-		[Fact]
-		public void Test_2966()
-		{
-		}
-		[Fact]
-		public void Test_2967()
-		{
-		}
-		[Fact]
-		public void Test_2968()
-		{
-		}
-		[Fact]
-		public void Test_2969()
-		{
-		}
-		[Fact]
-		public void Test_2970()
-		{
-		}
-		[Fact]
-		public void Test_2971()
-		{
-		}
-		[Fact]
-		public void Test_2972()
-		{
-		}
-		[Fact]
-		public void Test_2973()
-		{
-		}
-		[Fact]
-		public void Test_2974()
-		{
-		}
-		[Fact]
-		public void Test_2975()
-		{
-		}
-		[Fact]
-		public void Test_2976()
-		{
-		}
-		[Fact]
-		public void Test_2977()
-		{
-		}
-		[Fact]
-		public void Test_2978()
-		{
-		}
-		[Fact]
-		public void Test_2979()
-		{
-		}
-		[Fact]
-		public void Test_2980()
-		{
-		}
-		[Fact]
-		public void Test_2981()
-		{
-		}
-		[Fact]
-		public void Test_2982()
-		{
-		}
-		[Fact]
-		public void Test_2983()
-		{
-		}
-		[Fact]
-		public void Test_2984()
-		{
-		}
-		[Fact]
-		public void Test_2985()
-		{
-		}
-		[Fact]
-		public void Test_2986()
-		{
-		}
-		[Fact]
-		public void Test_2987()
-		{
-		}
-		[Fact]
-		public void Test_2988()
-		{
-		}
-		[Fact]
-		public void Test_2989()
-		{
-		}
-		[Fact]
-		public void Test_2990()
-		{
-		}
-		[Fact]
-		public void Test_2991()
-		{
-		}
-		[Fact]
-		public void Test_2992()
-		{
-		}
-		[Fact]
-		public void Test_2993()
-		{
-		}
-		[Fact]
-		public void Test_2994()
-		{
-		}
-		[Fact]
-		public void Test_2995()
-		{
-		}
-		[Fact]
-		public void Test_2996()
-		{
-		}
-		[Fact]
-		public void Test_2997()
-		{
-		}
-		[Fact]
-		public void Test_2998()
-		{
-		}
-		[Fact]
-		public void Test_2999()
-		{
-		}
-		[Fact]
-		public void Test_3000()
-		{
-		}
-		[Fact]
-		public void Test_3001()
-		{
-		}
-		[Fact]
-		public void Test_3002()
-		{
-		}
-		[Fact]
-		public void Test_3003()
-		{
-		}
-		[Fact]
-		public void Test_3004()
-		{
-		}
-		[Fact]
-		public void Test_3005()
-		{
-		}
-		[Fact]
-		public void Test_3006()
-		{
-		}
-		[Fact]
-		public void Test_3007()
-		{
-		}
-		[Fact]
-		public void Test_3008()
-		{
-		}
-		[Fact]
-		public void Test_3009()
-		{
-		}
-		[Fact]
-		public void Test_3010()
-		{
-		}
-		[Fact]
-		public void Test_3011()
-		{
-		}
-		[Fact]
-		public void Test_3012()
-		{
-		}
-		[Fact]
-		public void Test_3013()
-		{
-		}
-		[Fact]
-		public void Test_3014()
-		{
-		}
-		[Fact]
-		public void Test_3015()
-		{
-		}
-		[Fact]
-		public void Test_3016()
-		{
-		}
-		[Fact]
-		public void Test_3017()
-		{
-		}
-		[Fact]
-		public void Test_3018()
-		{
-		}
-		[Fact]
-		public void Test_3019()
-		{
-		}
-		[Fact]
-		public void Test_3020()
-		{
-		}
-		[Fact]
-		public void Test_3021()
-		{
-		}
-		[Fact]
-		public void Test_3022()
-		{
-		}
-		[Fact]
-		public void Test_3023()
-		{
-		}
-		[Fact]
-		public void Test_3024()
-		{
-		}
-		[Fact]
-		public void Test_3025()
-		{
-		}
-		[Fact]
-		public void Test_3026()
-		{
-		}
-		[Fact]
-		public void Test_3027()
-		{
-		}
-		[Fact]
-		public void Test_3028()
-		{
-		}
-		[Fact]
-		public void Test_3029()
-		{
-		}
-		[Fact]
-		public void Test_3030()
-		{
-		}
-		[Fact]
-		public void Test_3031()
-		{
-		}
-		[Fact]
-		public void Test_3032()
-		{
-		}
-		[Fact]
-		public void Test_3033()
-		{
-		}
-		[Fact]
-		public void Test_3034()
-		{
-		}
-		[Fact]
-		public void Test_3035()
-		{
-		}
-		[Fact]
-		public void Test_3036()
-		{
-		}
-		[Fact]
-		public void Test_3037()
-		{
-		}
-		[Fact]
-		public void Test_3038()
-		{
-		}
-		[Fact]
-		public void Test_3039()
-		{
-		}
-		[Fact]
-		public void Test_3040()
-		{
-		}
-		[Fact]
-		public void Test_3041()
-		{
-		}
-		[Fact]
-		public void Test_3042()
-		{
-		}
-		[Fact]
-		public void Test_3043()
-		{
-		}
-		[Fact]
-		public void Test_3044()
-		{
-		}
-		[Fact]
-		public void Test_3045()
-		{
-		}
-		[Fact]
-		public void Test_3046()
-		{
-		}
-		[Fact]
-		public void Test_3047()
-		{
-		}
-		[Fact]
-		public void Test_3048()
-		{
-		}
-		[Fact]
-		public void Test_3049()
-		{
-		}
-		[Fact]
-		public void Test_3050()
-		{
-		}
-		[Fact]
-		public void Test_3051()
-		{
-		}
-		[Fact]
-		public void Test_3052()
-		{
-		}
-		[Fact]
-		public void Test_3053()
-		{
-		}
-		[Fact]
-		public void Test_3054()
-		{
-		}
-		[Fact]
-		public void Test_3055()
-		{
-		}
-		[Fact]
-		public void Test_3056()
-		{
-		}
-		[Fact]
-		public void Test_3057()
-		{
-		}
-		[Fact]
-		public void Test_3058()
-		{
-		}
-		[Fact]
-		public void Test_3059()
-		{
-		}
-		[Fact]
-		public void Test_3060()
-		{
-		}
-		[Fact]
-		public void Test_3061()
-		{
-		}
-		[Fact]
-		public void Test_3062()
-		{
-		}
-		[Fact]
-		public void Test_3063()
-		{
-		}
-		[Fact]
-		public void Test_3064()
-		{
-		}
-		[Fact]
-		public void Test_3065()
-		{
-		}
-		[Fact]
-		public void Test_3066()
-		{
-		}
-		[Fact]
-		public void Test_3067()
-		{
-		}
-		[Fact]
-		public void Test_3068()
-		{
-		}
-		[Fact]
-		public void Test_3069()
-		{
-		}
-		[Fact]
-		public void Test_3070()
-		{
-		}
-		[Fact]
-		public void Test_3071()
-		{
-		}
-		[Fact]
-		public void Test_3072()
-		{
-		}
-		[Fact]
-		public void Test_3073()
-		{
-		}
-		[Fact]
-		public void Test_3074()
-		{
-		}
-		[Fact]
-		public void Test_3075()
-		{
-		}
-		[Fact]
-		public void Test_3076()
-		{
-		}
-		[Fact]
-		public void Test_3077()
-		{
-		}
-		[Fact]
-		public void Test_3078()
-		{
-		}
-		[Fact]
-		public void Test_3079()
-		{
-		}
-		[Fact]
-		public void Test_3080()
-		{
-		}
-		[Fact]
-		public void Test_3081()
-		{
-		}
-		[Fact]
-		public void Test_3082()
-		{
-		}
-		[Fact]
-		public void Test_3083()
-		{
-		}
-		[Fact]
-		public void Test_3084()
-		{
-		}
-		[Fact]
-		public void Test_3085()
-		{
-		}
-		[Fact]
-		public void Test_3086()
-		{
-		}
-		[Fact]
-		public void Test_3087()
-		{
-		}
-		[Fact]
-		public void Test_3088()
-		{
-		}
-		[Fact]
-		public void Test_3089()
-		{
-		}
-		[Fact]
-		public void Test_3090()
-		{
-		}
-		[Fact]
-		public void Test_3091()
-		{
-		}
-		[Fact]
-		public void Test_3092()
-		{
-		}
-		[Fact]
-		public void Test_3093()
-		{
-		}
-		[Fact]
-		public void Test_3094()
-		{
-		}
-		[Fact]
-		public void Test_3095()
-		{
-		}
-		[Fact]
-		public void Test_3096()
-		{
-		}
-		[Fact]
-		public void Test_3097()
-		{
-		}
-		[Fact]
-		public void Test_3098()
-		{
-		}
-		[Fact]
-		public void Test_3099()
-		{
-		}
-		[Fact]
-		public void Test_3100()
-		{
-		}
-		[Fact]
-		public void Test_3101()
-		{
-		}
-		[Fact]
-		public void Test_3102()
-		{
-		}
-		[Fact]
-		public void Test_3103()
-		{
-		}
-		[Fact]
-		public void Test_3104()
-		{
-		}
-		[Fact]
-		public void Test_3105()
-		{
-		}
-		[Fact]
-		public void Test_3106()
-		{
-		}
-		[Fact]
-		public void Test_3107()
-		{
-		}
-		[Fact]
-		public void Test_3108()
-		{
-		}
-		[Fact]
-		public void Test_3109()
-		{
-		}
-		[Fact]
-		public void Test_3110()
-		{
-		}
-		[Fact]
-		public void Test_3111()
-		{
-		}
-		[Fact]
-		public void Test_3112()
-		{
-		}
-		[Fact]
-		public void Test_3113()
-		{
-		}
-		[Fact]
-		public void Test_3114()
-		{
-		}
-		[Fact]
-		public void Test_3115()
-		{
-		}
-		[Fact]
-		public void Test_3116()
-		{
-		}
-		[Fact]
-		public void Test_3117()
-		{
-		}
-		[Fact]
-		public void Test_3118()
-		{
-		}
-		[Fact]
-		public void Test_3119()
-		{
-		}
-		[Fact]
-		public void Test_3120()
-		{
-		}
-		[Fact]
-		public void Test_3121()
-		{
-		}
-		[Fact]
-		public void Test_3122()
-		{
-		}
-		[Fact]
-		public void Test_3123()
-		{
-		}
-		[Fact]
-		public void Test_3124()
-		{
-		}
-		[Fact]
-		public void Test_3125()
-		{
-		}
-		[Fact]
-		public void Test_3126()
-		{
-		}
-		[Fact]
-		public void Test_3127()
-		{
-		}
-		[Fact]
-		public void Test_3128()
-		{
-		}
-		[Fact]
-		public void Test_3129()
-		{
-		}
-		[Fact]
-		public void Test_3130()
-		{
-		}
-		[Fact]
-		public void Test_3131()
-		{
-		}
-		[Fact]
-		public void Test_3132()
-		{
-		}
-		[Fact]
-		public void Test_3133()
-		{
-		}
-		[Fact]
-		public void Test_3134()
-		{
-		}
-		[Fact]
-		public void Test_3135()
-		{
-		}
-		[Fact]
-		public void Test_3136()
-		{
-		}
-		[Fact]
-		public void Test_3137()
-		{
-		}
-		[Fact]
-		public void Test_3138()
-		{
-		}
-		[Fact]
-		public void Test_3139()
-		{
-		}
-		[Fact]
-		public void Test_3140()
-		{
-		}
-		[Fact]
-		public void Test_3141()
-		{
-		}
-		[Fact]
-		public void Test_3142()
-		{
-		}
-		[Fact]
-		public void Test_3143()
-		{
-		}
-		[Fact]
-		public void Test_3144()
-		{
-		}
-		[Fact]
-		public void Test_3145()
-		{
-		}
-		[Fact]
-		public void Test_3146()
-		{
-		}
-		[Fact]
-		public void Test_3147()
-		{
-		}
-		[Fact]
-		public void Test_3148()
-		{
-		}
-		[Fact]
-		public void Test_3149()
-		{
-		}
-		[Fact]
-		public void Test_3150()
-		{
-		}
-		[Fact]
-		public void Test_3151()
-		{
-		}
-		[Fact]
-		public void Test_3152()
-		{
-		}
-		[Fact]
-		public void Test_3153()
-		{
-		}
-		[Fact]
-		public void Test_3154()
-		{
-		}
-		[Fact]
-		public void Test_3155()
-		{
-		}
-		[Fact]
-		public void Test_3156()
-		{
-		}
-		[Fact]
-		public void Test_3157()
-		{
-		}
-		[Fact]
-		public void Test_3158()
-		{
-		}
-		[Fact]
-		public void Test_3159()
-		{
-		}
-		[Fact]
-		public void Test_3160()
-		{
-		}
-		[Fact]
-		public void Test_3161()
-		{
-		}
-		[Fact]
-		public void Test_3162()
-		{
-		}
-		[Fact]
-		public void Test_3163()
-		{
-		}
-		[Fact]
-		public void Test_3164()
-		{
-		}
-		[Fact]
-		public void Test_3165()
-		{
-		}
-		[Fact]
-		public void Test_3166()
-		{
-		}
-		[Fact]
-		public void Test_3167()
-		{
-		}
-		[Fact]
-		public void Test_3168()
-		{
-		}
-		[Fact]
-		public void Test_3169()
-		{
-		}
-		[Fact]
-		public void Test_3170()
-		{
-		}
-		[Fact]
-		public void Test_3171()
-		{
-		}
-		[Fact]
-		public void Test_3172()
-		{
-		}
-		[Fact]
-		public void Test_3173()
-		{
-		}
-		[Fact]
-		public void Test_3174()
-		{
-		}
-		[Fact]
-		public void Test_3175()
-		{
-		}
-		[Fact]
-		public void Test_3176()
-		{
-		}
-		[Fact]
-		public void Test_3177()
-		{
-		}
-		[Fact]
-		public void Test_3178()
-		{
-		}
-		[Fact]
-		public void Test_3179()
-		{
-		}
-		[Fact]
-		public void Test_3180()
-		{
-		}
-		[Fact]
-		public void Test_3181()
-		{
-		}
-		[Fact]
-		public void Test_3182()
-		{
-		}
-		[Fact]
-		public void Test_3183()
-		{
-		}
-		[Fact]
-		public void Test_3184()
-		{
-		}
-		[Fact]
-		public void Test_3185()
-		{
-		}
-		[Fact]
-		public void Test_3186()
-		{
-		}
-		[Fact]
-		public void Test_3187()
-		{
-		}
-		[Fact]
-		public void Test_3188()
-		{
-		}
-		[Fact]
-		public void Test_3189()
-		{
-		}
-		[Fact]
-		public void Test_3190()
-		{
-		}
-		[Fact]
-		public void Test_3191()
-		{
-		}
-		[Fact]
-		public void Test_3192()
-		{
-		}
-		[Fact]
-		public void Test_3193()
-		{
-		}
-		[Fact]
-		public void Test_3194()
-		{
-		}
-		[Fact]
-		public void Test_3195()
-		{
-		}
-		[Fact]
-		public void Test_3196()
-		{
-		}
-		[Fact]
-		public void Test_3197()
-		{
-		}
-		[Fact]
-		public void Test_3198()
-		{
-		}
-		[Fact]
-		public void Test_3199()
-		{
-		}
-		[Fact]
-		public void Test_3200()
-		{
-		}
-		[Fact]
-		public void Test_3201()
-		{
-		}
-		[Fact]
-		public void Test_3202()
-		{
-		}
-		[Fact]
-		public void Test_3203()
-		{
-		}
-		[Fact]
-		public void Test_3204()
-		{
-		}
-		[Fact]
-		public void Test_3205()
-		{
-		}
-		[Fact]
-		public void Test_3206()
-		{
-		}
-		[Fact]
-		public void Test_3207()
-		{
-		}
-		[Fact]
-		public void Test_3208()
-		{
-		}
-		[Fact]
-		public void Test_3209()
-		{
-		}
-		[Fact]
-		public void Test_3210()
-		{
-		}
-		[Fact]
-		public void Test_3211()
-		{
-		}
-		[Fact]
-		public void Test_3212()
-		{
-		}
-		[Fact]
-		public void Test_3213()
-		{
-		}
-		[Fact]
-		public void Test_3214()
-		{
-		}
-		[Fact]
-		public void Test_3215()
-		{
-		}
-		[Fact]
-		public void Test_3216()
-		{
-		}
-		[Fact]
-		public void Test_3217()
-		{
-		}
-		[Fact]
-		public void Test_3218()
-		{
-		}
-		[Fact]
-		public void Test_3219()
-		{
-		}
-		[Fact]
-		public void Test_3220()
-		{
-		}
-		[Fact]
-		public void Test_3221()
-		{
-		}
-		[Fact]
-		public void Test_3222()
-		{
-		}
-		[Fact]
-		public void Test_3223()
-		{
-		}
-		[Fact]
-		public void Test_3224()
-		{
-		}
-		[Fact]
-		public void Test_3225()
-		{
-		}
-		[Fact]
-		public void Test_3226()
-		{
-		}
-		[Fact]
-		public void Test_3227()
-		{
-		}
-		[Fact]
-		public void Test_3228()
-		{
-		}
-		[Fact]
-		public void Test_3229()
-		{
-		}
-		[Fact]
-		public void Test_3230()
-		{
-		}
-		[Fact]
-		public void Test_3231()
-		{
-		}
-		[Fact]
-		public void Test_3232()
-		{
-		}
-		[Fact]
-		public void Test_3233()
-		{
-		}
-		[Fact]
-		public void Test_3234()
-		{
-		}
-		[Fact]
-		public void Test_3235()
-		{
-		}
-		[Fact]
-		public void Test_3236()
-		{
-		}
-		[Fact]
-		public void Test_3237()
-		{
-		}
-		[Fact]
-		public void Test_3238()
-		{
-		}
-		[Fact]
-		public void Test_3239()
-		{
-		}
-		[Fact]
-		public void Test_3240()
-		{
-		}
-		[Fact]
-		public void Test_3241()
-		{
-		}
-		[Fact]
-		public void Test_3242()
-		{
-		}
-		[Fact]
-		public void Test_3243()
-		{
-		}
-		[Fact]
-		public void Test_3244()
-		{
-		}
-		[Fact]
-		public void Test_3245()
-		{
-		}
-		[Fact]
-		public void Test_3246()
-		{
-		}
-		[Fact]
-		public void Test_3247()
-		{
-		}
-		[Fact]
-		public void Test_3248()
-		{
-		}
-		[Fact]
-		public void Test_3249()
-		{
-		}
-		[Fact]
-		public void Test_3250()
-		{
-		}
-		[Fact]
-		public void Test_3251()
-		{
-		}
-		[Fact]
-		public void Test_3252()
-		{
-		}
-		[Fact]
-		public void Test_3253()
-		{
-		}
-		[Fact]
-		public void Test_3254()
-		{
-		}
-		[Fact]
-		public void Test_3255()
-		{
-		}
-		[Fact]
-		public void Test_3256()
-		{
-		}
-		[Fact]
-		public void Test_3257()
-		{
-		}
-		[Fact]
-		public void Test_3258()
-		{
-		}
-		[Fact]
-		public void Test_3259()
-		{
-		}
-		[Fact]
-		public void Test_3260()
-		{
-		}
-		[Fact]
-		public void Test_3261()
-		{
-		}
-		[Fact]
-		public void Test_3262()
-		{
-		}
-		[Fact]
-		public void Test_3263()
-		{
-		}
-		[Fact]
-		public void Test_3264()
-		{
-		}
-		[Fact]
-		public void Test_3265()
-		{
-		}
-		[Fact]
-		public void Test_3266()
-		{
-		}
-		[Fact]
-		public void Test_3267()
-		{
-		}
-		[Fact]
-		public void Test_3268()
-		{
-		}
-		[Fact]
-		public void Test_3269()
-		{
-		}
-		[Fact]
-		public void Test_3270()
-		{
-		}
-		[Fact]
-		public void Test_3271()
-		{
-		}
-		[Fact]
-		public void Test_3272()
-		{
-		}
-		[Fact]
-		public void Test_3273()
-		{
-		}
-		[Fact]
-		public void Test_3274()
-		{
-		}
-		[Fact]
-		public void Test_3275()
-		{
-		}
-		[Fact]
-		public void Test_3276()
-		{
-		}
-		[Fact]
-		public void Test_3277()
-		{
-		}
-		[Fact]
-		public void Test_3278()
-		{
-		}
-		[Fact]
-		public void Test_3279()
-		{
-		}
-		[Fact]
-		public void Test_3280()
-		{
-		}
-		[Fact]
-		public void Test_3281()
-		{
-		}
-		[Fact]
-		public void Test_3282()
-		{
-		}
-		[Fact]
-		public void Test_3283()
-		{
-		}
-		[Fact]
-		public void Test_3284()
-		{
-		}
-		[Fact]
-		public void Test_3285()
-		{
-		}
-		[Fact]
-		public void Test_3286()
-		{
-		}
-		[Fact]
-		public void Test_3287()
-		{
-		}
-		[Fact]
-		public void Test_3288()
-		{
-		}
-		[Fact]
-		public void Test_3289()
-		{
-		}
-		[Fact]
-		public void Test_3290()
-		{
-		}
-		[Fact]
-		public void Test_3291()
-		{
-		}
-		[Fact]
-		public void Test_3292()
-		{
-		}
-		[Fact]
-		public void Test_3293()
-		{
-		}
-		[Fact]
-		public void Test_3294()
-		{
-		}
-		[Fact]
-		public void Test_3295()
-		{
-		}
-		[Fact]
-		public void Test_3296()
-		{
-		}
-		[Fact]
-		public void Test_3297()
-		{
-		}
-		[Fact]
-		public void Test_3298()
-		{
-		}
-		[Fact]
-		public void Test_3299()
-		{
-		}
-		[Fact]
-		public void Test_3300()
-		{
-		}
-		[Fact]
-		public void Test_3301()
-		{
-		}
-		[Fact]
-		public void Test_3302()
-		{
-		}
-		[Fact]
-		public void Test_3303()
-		{
-		}
-		[Fact]
-		public void Test_3304()
-		{
-		}
-		[Fact]
-		public void Test_3305()
-		{
-		}
-		[Fact]
-		public void Test_3306()
-		{
-		}
-		[Fact]
-		public void Test_3307()
-		{
-		}
-		[Fact]
-		public void Test_3308()
-		{
-		}
-		[Fact]
-		public void Test_3309()
-		{
-		}
-		[Fact]
-		public void Test_3310()
-		{
-		}
-		[Fact]
-		public void Test_3311()
-		{
-		}
-		[Fact]
-		public void Test_3312()
-		{
-		}
-		[Fact]
-		public void Test_3313()
-		{
-		}
-		[Fact]
-		public void Test_3314()
-		{
-		}
-		[Fact]
-		public void Test_3315()
-		{
-		}
-		[Fact]
-		public void Test_3316()
-		{
-		}
-		[Fact]
-		public void Test_3317()
-		{
-		}
-		[Fact]
-		public void Test_3318()
-		{
-		}
-		[Fact]
-		public void Test_3319()
-		{
-		}
-		[Fact]
-		public void Test_3320()
-		{
-		}
-		[Fact]
-		public void Test_3321()
-		{
-		}
-		[Fact]
-		public void Test_3322()
-		{
-		}
-		[Fact]
-		public void Test_3323()
-		{
-		}
-		[Fact]
-		public void Test_3324()
-		{
-		}
-		[Fact]
-		public void Test_3325()
-		{
-		}
-		[Fact]
-		public void Test_3326()
-		{
-		}
-		[Fact]
-		public void Test_3327()
-		{
-		}
-		[Fact]
-		public void Test_3328()
-		{
-		}
-		[Fact]
-		public void Test_3329()
-		{
-		}
-		[Fact]
-		public void Test_3330()
-		{
-		}
-		[Fact]
-		public void Test_3331()
-		{
-		}
-		[Fact]
-		public void Test_3332()
-		{
-		}
-		[Fact]
-		public void Test_3333()
-		{
-		}
-		[Fact]
-		public void Test_3334()
-		{
-		}
-		[Fact]
-		public void Test_3335()
-		{
-		}
-		[Fact]
-		public void Test_3336()
-		{
-		}
-		[Fact]
-		public void Test_3337()
-		{
-		}
-		[Fact]
-		public void Test_3338()
-		{
-		}
-		[Fact]
-		public void Test_3339()
-		{
-		}
-		[Fact]
-		public void Test_3340()
-		{
-		}
-		[Fact]
-		public void Test_3341()
-		{
-		}
-		[Fact]
-		public void Test_3342()
-		{
-		}
-		[Fact]
-		public void Test_3343()
-		{
-		}
-		[Fact]
-		public void Test_3344()
-		{
-		}
-		[Fact]
-		public void Test_3345()
-		{
-		}
-		[Fact]
-		public void Test_3346()
-		{
-		}
-		[Fact]
-		public void Test_3347()
-		{
-		}
-		[Fact]
-		public void Test_3348()
-		{
-		}
-		[Fact]
-		public void Test_3349()
-		{
-		}
-		[Fact]
-		public void Test_3350()
-		{
-		}
-		[Fact]
-		public void Test_3351()
-		{
-		}
-		[Fact]
-		public void Test_3352()
-		{
-		}
-		[Fact]
-		public void Test_3353()
-		{
-		}
-		[Fact]
-		public void Test_3354()
-		{
-		}
-		[Fact]
-		public void Test_3355()
-		{
-		}
-		[Fact]
-		public void Test_3356()
-		{
-		}
-		[Fact]
-		public void Test_3357()
-		{
-		}
-		[Fact]
-		public void Test_3358()
-		{
-		}
-		[Fact]
-		public void Test_3359()
-		{
-		}
-		[Fact]
-		public void Test_3360()
-		{
-		}
-		[Fact]
-		public void Test_3361()
-		{
-		}
-		[Fact]
-		public void Test_3362()
-		{
-		}
-		[Fact]
-		public void Test_3363()
-		{
-		}
-		[Fact]
-		public void Test_3364()
-		{
-		}
-		[Fact]
-		public void Test_3365()
-		{
-		}
-		[Fact]
-		public void Test_3366()
-		{
-		}
-		[Fact]
-		public void Test_3367()
-		{
-		}
-		[Fact]
-		public void Test_3368()
-		{
-		}
-		[Fact]
-		public void Test_3369()
-		{
-		}
-		[Fact]
-		public void Test_3370()
-		{
-		}
-		[Fact]
-		public void Test_3371()
-		{
-		}
-		[Fact]
-		public void Test_3372()
-		{
-		}
-		[Fact]
-		public void Test_3373()
-		{
-		}
-		[Fact]
-		public void Test_3374()
-		{
-		}
-		[Fact]
-		public void Test_3375()
-		{
-		}
-		[Fact]
-		public void Test_3376()
-		{
-		}
-		[Fact]
-		public void Test_3377()
-		{
-		}
-		[Fact]
-		public void Test_3378()
-		{
-		}
-		[Fact]
-		public void Test_3379()
-		{
-		}
-		[Fact]
-		public void Test_3380()
-		{
-		}
-		[Fact]
-		public void Test_3381()
-		{
-		}
-		[Fact]
-		public void Test_3382()
-		{
-		}
-		[Fact]
-		public void Test_3383()
-		{
-		}
-		[Fact]
-		public void Test_3384()
-		{
-		}
-		[Fact]
-		public void Test_3385()
-		{
-		}
-		[Fact]
-		public void Test_3386()
-		{
-		}
-		[Fact]
-		public void Test_3387()
-		{
-		}
-		[Fact]
-		public void Test_3388()
-		{
-		}
-		[Fact]
-		public void Test_3389()
-		{
-		}
-		[Fact]
-		public void Test_3390()
-		{
-		}
-		[Fact]
-		public void Test_3391()
-		{
-		}
-		[Fact]
-		public void Test_3392()
-		{
-		}
-		[Fact]
-		public void Test_3393()
-		{
-		}
-		[Fact]
-		public void Test_3394()
-		{
-		}
-		[Fact]
-		public void Test_3395()
-		{
-		}
-		[Fact]
-		public void Test_3396()
-		{
-		}
-		[Fact]
-		public void Test_3397()
-		{
-		}
-		[Fact]
-		public void Test_3398()
-		{
-		}
-		[Fact]
-		public void Test_3399()
-		{
-		}
-		[Fact]
-		public void Test_3400()
-		{
-		}
-		[Fact]
-		public void Test_3401()
-		{
-		}
-		[Fact]
-		public void Test_3402()
-		{
-		}
-		[Fact]
-		public void Test_3403()
-		{
-		}
-		[Fact]
-		public void Test_3404()
-		{
-		}
-		[Fact]
-		public void Test_3405()
-		{
-		}
-		[Fact]
-		public void Test_3406()
-		{
-		}
-		[Fact]
-		public void Test_3407()
-		{
-		}
-		[Fact]
-		public void Test_3408()
-		{
-		}
-		[Fact]
-		public void Test_3409()
-		{
-		}
-		[Fact]
-		public void Test_3410()
-		{
-		}
-		[Fact]
-		public void Test_3411()
-		{
-		}
-		[Fact]
-		public void Test_3412()
-		{
-		}
-		[Fact]
-		public void Test_3413()
-		{
-		}
-		[Fact]
-		public void Test_3414()
-		{
-		}
-		[Fact]
-		public void Test_3415()
-		{
-		}
-		[Fact]
-		public void Test_3416()
-		{
-		}
-		[Fact]
-		public void Test_3417()
-		{
-		}
-		[Fact]
-		public void Test_3418()
-		{
-		}
-		[Fact]
-		public void Test_3419()
-		{
-		}
-		[Fact]
-		public void Test_3420()
-		{
-		}
-		[Fact]
-		public void Test_3421()
-		{
-		}
-		[Fact]
-		public void Test_3422()
-		{
-		}
-		[Fact]
-		public void Test_3423()
-		{
-		}
-		[Fact]
-		public void Test_3424()
-		{
-		}
-		[Fact]
-		public void Test_3425()
-		{
-		}
-		[Fact]
-		public void Test_3426()
-		{
-		}
-		[Fact]
-		public void Test_3427()
-		{
-		}
-		[Fact]
-		public void Test_3428()
-		{
-		}
-		[Fact]
-		public void Test_3429()
-		{
-		}
-		[Fact]
-		public void Test_3430()
-		{
-		}
-		[Fact]
-		public void Test_3431()
-		{
-		}
-		[Fact]
-		public void Test_3432()
-		{
-		}
-		[Fact]
-		public void Test_3433()
-		{
-		}
-		[Fact]
-		public void Test_3434()
-		{
-		}
-		[Fact]
-		public void Test_3435()
-		{
-		}
-		[Fact]
-		public void Test_3436()
-		{
-		}
-		[Fact]
-		public void Test_3437()
-		{
-		}
-		[Fact]
-		public void Test_3438()
-		{
-		}
-		[Fact]
-		public void Test_3439()
-		{
-		}
-		[Fact]
-		public void Test_3440()
-		{
-		}
-		[Fact]
-		public void Test_3441()
-		{
-		}
-		[Fact]
-		public void Test_3442()
-		{
-		}
-		[Fact]
-		public void Test_3443()
-		{
-		}
-		[Fact]
-		public void Test_3444()
-		{
-		}
-		[Fact]
-		public void Test_3445()
-		{
-		}
-		[Fact]
-		public void Test_3446()
-		{
-		}
-		[Fact]
-		public void Test_3447()
-		{
-		}
-		[Fact]
-		public void Test_3448()
-		{
-		}
-		[Fact]
-		public void Test_3449()
-		{
-		}
-		[Fact]
-		public void Test_3450()
-		{
-		}
-		[Fact]
-		public void Test_3451()
-		{
-		}
-		[Fact]
-		public void Test_3452()
-		{
-		}
-		[Fact]
-		public void Test_3453()
-		{
-		}
-		[Fact]
-		public void Test_3454()
-		{
-		}
-		[Fact]
-		public void Test_3455()
-		{
-		}
-		[Fact]
-		public void Test_3456()
-		{
-		}
-		[Fact]
-		public void Test_3457()
-		{
-		}
-		[Fact]
-		public void Test_3458()
-		{
-		}
-		[Fact]
-		public void Test_3459()
-		{
-		}
-		[Fact]
-		public void Test_3460()
-		{
-		}
-		[Fact]
-		public void Test_3461()
-		{
-		}
-		[Fact]
-		public void Test_3462()
-		{
-		}
-		[Fact]
-		public void Test_3463()
-		{
-		}
-		[Fact]
-		public void Test_3464()
-		{
-		}
-		[Fact]
-		public void Test_3465()
-		{
-		}
-		[Fact]
-		public void Test_3466()
-		{
-		}
-		[Fact]
-		public void Test_3467()
-		{
-		}
-		[Fact]
-		public void Test_3468()
-		{
-		}
-		[Fact]
-		public void Test_3469()
-		{
-		}
-		[Fact]
-		public void Test_3470()
-		{
-		}
-		[Fact]
-		public void Test_3471()
-		{
-		}
-		[Fact]
-		public void Test_3472()
-		{
-		}
-		[Fact]
-		public void Test_3473()
-		{
-		}
-		[Fact]
-		public void Test_3474()
-		{
-		}
-		[Fact]
-		public void Test_3475()
-		{
-		}
-		[Fact]
-		public void Test_3476()
-		{
-		}
-		[Fact]
-		public void Test_3477()
-		{
-		}
-		[Fact]
-		public void Test_3478()
-		{
-		}
-		[Fact]
-		public void Test_3479()
-		{
-		}
-		[Fact]
-		public void Test_3480()
-		{
-		}
-		[Fact]
-		public void Test_3481()
-		{
-		}
-		[Fact]
-		public void Test_3482()
-		{
-		}
-		[Fact]
-		public void Test_3483()
-		{
-		}
-		[Fact]
-		public void Test_3484()
-		{
-		}
-		[Fact]
-		public void Test_3485()
-		{
-		}
-		[Fact]
-		public void Test_3486()
-		{
-		}
-		[Fact]
-		public void Test_3487()
-		{
-		}
-		[Fact]
-		public void Test_3488()
-		{
-		}
-		[Fact]
-		public void Test_3489()
-		{
-		}
-		[Fact]
-		public void Test_3490()
-		{
-		}
-		[Fact]
-		public void Test_3491()
-		{
-		}
-		[Fact]
-		public void Test_3492()
-		{
-		}
-		[Fact]
-		public void Test_3493()
-		{
-		}
-		[Fact]
-		public void Test_3494()
-		{
-		}
-		[Fact]
-		public void Test_3495()
-		{
-		}
-		[Fact]
-		public void Test_3496()
-		{
-		}
-		[Fact]
-		public void Test_3497()
-		{
-		}
-		[Fact]
-		public void Test_3498()
-		{
-		}
-		[Fact]
-		public void Test_3499()
-		{
-		}
-		[Fact]
-		public void Test_3500()
-		{
-		}
-		[Fact]
-		public void Test_3501()
-		{
-		}
-		[Fact]
-		public void Test_3502()
-		{
-		}
-		[Fact]
-		public void Test_3503()
-		{
-		}
-		[Fact]
-		public void Test_3504()
-		{
-		}
-		[Fact]
-		public void Test_3505()
-		{
-		}
-		[Fact]
-		public void Test_3506()
-		{
-		}
-		[Fact]
-		public void Test_3507()
-		{
-		}
-		[Fact]
-		public void Test_3508()
-		{
-		}
-		[Fact]
-		public void Test_3509()
-		{
-		}
-		[Fact]
-		public void Test_3510()
-		{
-		}
-		[Fact]
-		public void Test_3511()
-		{
-		}
-		[Fact]
-		public void Test_3512()
-		{
-		}
-		[Fact]
-		public void Test_3513()
-		{
-		}
-		[Fact]
-		public void Test_3514()
-		{
-		}
-		[Fact]
-		public void Test_3515()
-		{
-		}
-		[Fact]
-		public void Test_3516()
-		{
-		}
-		[Fact]
-		public void Test_3517()
-		{
-		}
-		[Fact]
-		public void Test_3518()
-		{
-		}
-		[Fact]
-		public void Test_3519()
-		{
-		}
-		[Fact]
-		public void Test_3520()
-		{
-		}
-		[Fact]
-		public void Test_3521()
-		{
-		}
-		[Fact]
-		public void Test_3522()
-		{
-		}
-		[Fact]
-		public void Test_3523()
-		{
-		}
-		[Fact]
-		public void Test_3524()
-		{
-		}
-		[Fact]
-		public void Test_3525()
-		{
-		}
-		[Fact]
-		public void Test_3526()
-		{
-		}
-		[Fact]
-		public void Test_3527()
-		{
-		}
-		[Fact]
-		public void Test_3528()
-		{
-		}
-		[Fact]
-		public void Test_3529()
-		{
-		}
-		[Fact]
-		public void Test_3530()
-		{
-		}
-		[Fact]
-		public void Test_3531()
-		{
-		}
-		[Fact]
-		public void Test_3532()
-		{
-		}
-		[Fact]
-		public void Test_3533()
-		{
-		}
-		[Fact]
-		public void Test_3534()
-		{
-		}
-		[Fact]
-		public void Test_3535()
-		{
-		}
-		[Fact]
-		public void Test_3536()
-		{
-		}
-		[Fact]
-		public void Test_3537()
-		{
-		}
-		[Fact]
-		public void Test_3538()
-		{
-		}
-		[Fact]
-		public void Test_3539()
-		{
-		}
-		[Fact]
-		public void Test_3540()
-		{
-		}
-		[Fact]
-		public void Test_3541()
-		{
-		}
-		[Fact]
-		public void Test_3542()
-		{
-		}
-		[Fact]
-		public void Test_3543()
-		{
-		}
-		[Fact]
-		public void Test_3544()
-		{
-		}
-		[Fact]
-		public void Test_3545()
-		{
-		}
-		[Fact]
-		public void Test_3546()
-		{
-		}
-		[Fact]
-		public void Test_3547()
-		{
-		}
-		[Fact]
-		public void Test_3548()
-		{
-		}
-		[Fact]
-		public void Test_3549()
-		{
-		}
-		[Fact]
-		public void Test_3550()
-		{
-		}
-		[Fact]
-		public void Test_3551()
-		{
-		}
-		[Fact]
-		public void Test_3552()
-		{
-		}
-		[Fact]
-		public void Test_3553()
-		{
-		}
-		[Fact]
-		public void Test_3554()
-		{
-		}
-		[Fact]
-		public void Test_3555()
-		{
-		}
-		[Fact]
-		public void Test_3556()
-		{
-		}
-		[Fact]
-		public void Test_3557()
-		{
-		}
-		[Fact]
-		public void Test_3558()
-		{
-		}
-		[Fact]
-		public void Test_3559()
-		{
-		}
-		[Fact]
-		public void Test_3560()
-		{
-		}
-		[Fact]
-		public void Test_3561()
-		{
-		}
-		[Fact]
-		public void Test_3562()
-		{
-		}
-		[Fact]
-		public void Test_3563()
-		{
-		}
-		[Fact]
-		public void Test_3564()
-		{
-		}
-		[Fact]
-		public void Test_3565()
-		{
-		}
-		[Fact]
-		public void Test_3566()
-		{
-		}
-		[Fact]
-		public void Test_3567()
-		{
-		}
-		[Fact]
-		public void Test_3568()
-		{
-		}
-		[Fact]
-		public void Test_3569()
-		{
-		}
-		[Fact]
-		public void Test_3570()
-		{
-		}
-		[Fact]
-		public void Test_3571()
-		{
-		}
-		[Fact]
-		public void Test_3572()
-		{
-		}
-		[Fact]
-		public void Test_3573()
-		{
-		}
-		[Fact]
-		public void Test_3574()
-		{
-		}
-		[Fact]
-		public void Test_3575()
-		{
-		}
-		[Fact]
-		public void Test_3576()
-		{
-		}
-		[Fact]
-		public void Test_3577()
-		{
-		}
-		[Fact]
-		public void Test_3578()
-		{
-		}
-		[Fact]
-		public void Test_3579()
-		{
-		}
-		[Fact]
-		public void Test_3580()
-		{
-		}
-		[Fact]
-		public void Test_3581()
-		{
-		}
-		[Fact]
-		public void Test_3582()
-		{
-		}
-		[Fact]
-		public void Test_3583()
-		{
-		}
-		[Fact]
-		public void Test_3584()
-		{
-		}
-		[Fact]
-		public void Test_3585()
-		{
-		}
-		[Fact]
-		public void Test_3586()
-		{
-		}
-		[Fact]
-		public void Test_3587()
-		{
-		}
-		[Fact]
-		public void Test_3588()
-		{
-		}
-		[Fact]
-		public void Test_3589()
-		{
-		}
-		[Fact]
-		public void Test_3590()
-		{
-		}
-		[Fact]
-		public void Test_3591()
-		{
-		}
-		[Fact]
-		public void Test_3592()
-		{
-		}
-		[Fact]
-		public void Test_3593()
-		{
-		}
-		[Fact]
-		public void Test_3594()
-		{
-		}
-		[Fact]
-		public void Test_3595()
-		{
-		}
-		[Fact]
-		public void Test_3596()
-		{
-		}
-		[Fact]
-		public void Test_3597()
-		{
-		}
-		[Fact]
-		public void Test_3598()
-		{
-		}
-		[Fact]
-		public void Test_3599()
-		{
-		}
-		[Fact]
-		public void Test_3600()
-		{
-		}
-		[Fact]
-		public void Test_3601()
-		{
-		}
-		[Fact]
-		public void Test_3602()
-		{
-		}
-		[Fact]
-		public void Test_3603()
-		{
-		}
-		[Fact]
-		public void Test_3604()
-		{
-		}
-		[Fact]
-		public void Test_3605()
-		{
-		}
-		[Fact]
-		public void Test_3606()
-		{
-		}
-		[Fact]
-		public void Test_3607()
-		{
-		}
-		[Fact]
-		public void Test_3608()
-		{
-		}
-		[Fact]
-		public void Test_3609()
-		{
-		}
-		[Fact]
-		public void Test_3610()
-		{
-		}
-		[Fact]
-		public void Test_3611()
-		{
-		}
-		[Fact]
-		public void Test_3612()
-		{
-		}
-		[Fact]
-		public void Test_3613()
-		{
-		}
-		[Fact]
-		public void Test_3614()
-		{
-		}
-		[Fact]
-		public void Test_3615()
-		{
-		}
-		[Fact]
-		public void Test_3616()
-		{
-		}
-		[Fact]
-		public void Test_3617()
-		{
-		}
-		[Fact]
-		public void Test_3618()
-		{
-		}
-		[Fact]
-		public void Test_3619()
-		{
-		}
-		[Fact]
-		public void Test_3620()
-		{
-		}
-		[Fact]
-		public void Test_3621()
-		{
-		}
-		[Fact]
-		public void Test_3622()
-		{
-		}
-		[Fact]
-		public void Test_3623()
-		{
-		}
-		[Fact]
-		public void Test_3624()
-		{
-		}
-		[Fact]
-		public void Test_3625()
-		{
-		}
-		[Fact]
-		public void Test_3626()
-		{
-		}
-		[Fact]
-		public void Test_3627()
-		{
-		}
-		[Fact]
-		public void Test_3628()
-		{
-		}
-		[Fact]
-		public void Test_3629()
-		{
-		}
-		[Fact]
-		public void Test_3630()
-		{
-		}
-		[Fact]
-		public void Test_3631()
-		{
-		}
-		[Fact]
-		public void Test_3632()
-		{
-		}
-		[Fact]
-		public void Test_3633()
-		{
-		}
-		[Fact]
-		public void Test_3634()
-		{
-		}
-		[Fact]
-		public void Test_3635()
-		{
-		}
-		[Fact]
-		public void Test_3636()
-		{
-		}
-		[Fact]
-		public void Test_3637()
-		{
-		}
-		[Fact]
-		public void Test_3638()
-		{
-		}
-		[Fact]
-		public void Test_3639()
-		{
-		}
-		[Fact]
-		public void Test_3640()
-		{
-		}
-		[Fact]
-		public void Test_3641()
-		{
-		}
-		[Fact]
-		public void Test_3642()
-		{
-		}
-		[Fact]
-		public void Test_3643()
-		{
-		}
-		[Fact]
-		public void Test_3644()
-		{
-		}
-		[Fact]
-		public void Test_3645()
-		{
-		}
-		[Fact]
-		public void Test_3646()
-		{
-		}
-		[Fact]
-		public void Test_3647()
-		{
-		}
-		[Fact]
-		public void Test_3648()
-		{
-		}
-		[Fact]
-		public void Test_3649()
-		{
-		}
-		[Fact]
-		public void Test_3650()
-		{
-		}
-		[Fact]
-		public void Test_3651()
-		{
-		}
-		[Fact]
-		public void Test_3652()
-		{
-		}
-		[Fact]
-		public void Test_3653()
-		{
-		}
-		[Fact]
-		public void Test_3654()
-		{
-		}
-		[Fact]
-		public void Test_3655()
-		{
-		}
-		[Fact]
-		public void Test_3656()
-		{
-		}
-		[Fact]
-		public void Test_3657()
-		{
-		}
-		[Fact]
-		public void Test_3658()
-		{
-		}
-		[Fact]
-		public void Test_3659()
-		{
-		}
-		[Fact]
-		public void Test_3660()
-		{
-		}
-		[Fact]
-		public void Test_3661()
-		{
-		}
-		[Fact]
-		public void Test_3662()
-		{
-		}
-		[Fact]
-		public void Test_3663()
-		{
-		}
-		[Fact]
-		public void Test_3664()
-		{
-		}
-		[Fact]
-		public void Test_3665()
-		{
-		}
-		[Fact]
-		public void Test_3666()
-		{
-		}
-		[Fact]
-		public void Test_3667()
-		{
-		}
-		[Fact]
-		public void Test_3668()
-		{
-		}
-		[Fact]
-		public void Test_3669()
-		{
-		}
-		[Fact]
-		public void Test_3670()
-		{
-		}
-		[Fact]
-		public void Test_3671()
-		{
-		}
-		[Fact]
-		public void Test_3672()
-		{
-		}
-		[Fact]
-		public void Test_3673()
-		{
-		}
-		[Fact]
-		public void Test_3674()
-		{
-		}
-		[Fact]
-		public void Test_3675()
-		{
-		}
-		[Fact]
-		public void Test_3676()
-		{
-		}
-		[Fact]
-		public void Test_3677()
-		{
-		}
-		[Fact]
-		public void Test_3678()
-		{
-		}
-		[Fact]
-		public void Test_3679()
-		{
-		}
-		[Fact]
-		public void Test_3680()
-		{
-		}
-		[Fact]
-		public void Test_3681()
-		{
-		}
-		[Fact]
-		public void Test_3682()
-		{
-		}
-		[Fact]
-		public void Test_3683()
-		{
-		}
-		[Fact]
-		public void Test_3684()
-		{
-		}
-		[Fact]
-		public void Test_3685()
-		{
-		}
-		[Fact]
-		public void Test_3686()
-		{
-		}
-		[Fact]
-		public void Test_3687()
-		{
-		}
-		[Fact]
-		public void Test_3688()
-		{
-		}
-		[Fact]
-		public void Test_3689()
-		{
-		}
-		[Fact]
-		public void Test_3690()
-		{
-		}
-		[Fact]
-		public void Test_3691()
-		{
-		}
-		[Fact]
-		public void Test_3692()
-		{
-		}
-		[Fact]
-		public void Test_3693()
-		{
-		}
-		[Fact]
-		public void Test_3694()
-		{
-		}
-		[Fact]
-		public void Test_3695()
-		{
-		}
-		[Fact]
-		public void Test_3696()
-		{
-		}
-		[Fact]
-		public void Test_3697()
-		{
-		}
-		[Fact]
-		public void Test_3698()
-		{
-		}
-		[Fact]
-		public void Test_3699()
-		{
-		}
-		[Fact]
-		public void Test_3700()
-		{
-		}
-		[Fact]
-		public void Test_3701()
-		{
-		}
-		[Fact]
-		public void Test_3702()
-		{
-		}
-		[Fact]
-		public void Test_3703()
-		{
-		}
-		[Fact]
-		public void Test_3704()
-		{
-		}
-		[Fact]
-		public void Test_3705()
-		{
-		}
-		[Fact]
-		public void Test_3706()
-		{
-		}
-		[Fact]
-		public void Test_3707()
-		{
-		}
-		[Fact]
-		public void Test_3708()
-		{
-		}
-		[Fact]
-		public void Test_3709()
-		{
-		}
-		[Fact]
-		public void Test_3710()
-		{
-		}
-		[Fact]
-		public void Test_3711()
-		{
-		}
-		[Fact]
-		public void Test_3712()
-		{
-		}
-		[Fact]
-		public void Test_3713()
-		{
-		}
-		[Fact]
-		public void Test_3714()
-		{
-		}
-		[Fact]
-		public void Test_3715()
-		{
-		}
-		[Fact]
-		public void Test_3716()
-		{
-		}
-		[Fact]
-		public void Test_3717()
-		{
-		}
-		[Fact]
-		public void Test_3718()
-		{
-		}
-		[Fact]
-		public void Test_3719()
-		{
-		}
-		[Fact]
-		public void Test_3720()
-		{
-		}
-		[Fact]
-		public void Test_3721()
-		{
-		}
-		[Fact]
-		public void Test_3722()
-		{
-		}
-		[Fact]
-		public void Test_3723()
-		{
-		}
-		[Fact]
-		public void Test_3724()
-		{
-		}
-		[Fact]
-		public void Test_3725()
-		{
-		}
-		[Fact]
-		public void Test_3726()
-		{
-		}
-		[Fact]
-		public void Test_3727()
-		{
-		}
-		[Fact]
-		public void Test_3728()
-		{
-		}
-		[Fact]
-		public void Test_3729()
-		{
-		}
-		[Fact]
-		public void Test_3730()
-		{
-		}
-		[Fact]
-		public void Test_3731()
-		{
-		}
-		[Fact]
-		public void Test_3732()
-		{
-		}
-		[Fact]
-		public void Test_3733()
-		{
-		}
-		[Fact]
-		public void Test_3734()
-		{
-		}
-		[Fact]
-		public void Test_3735()
-		{
-		}
-		[Fact]
-		public void Test_3736()
-		{
-		}
-		[Fact]
-		public void Test_3737()
-		{
-		}
-		[Fact]
-		public void Test_3738()
-		{
-		}
-		[Fact]
-		public void Test_3739()
-		{
-		}
-		[Fact]
-		public void Test_3740()
-		{
-		}
-		[Fact]
-		public void Test_3741()
-		{
-		}
-		[Fact]
-		public void Test_3742()
-		{
-		}
-		[Fact]
-		public void Test_3743()
-		{
-		}
-		[Fact]
-		public void Test_3744()
-		{
-		}
-		[Fact]
-		public void Test_3745()
-		{
-		}
-		[Fact]
-		public void Test_3746()
-		{
-		}
-		[Fact]
-		public void Test_3747()
-		{
-		}
-		[Fact]
-		public void Test_3748()
-		{
-		}
-		[Fact]
-		public void Test_3749()
-		{
-		}
-		[Fact]
-		public void Test_3750()
-		{
-		}
-		[Fact]
-		public void Test_3751()
-		{
-		}
-		[Fact]
-		public void Test_3752()
-		{
-		}
-		[Fact]
-		public void Test_3753()
-		{
-		}
-		[Fact]
-		public void Test_3754()
-		{
-		}
-		[Fact]
-		public void Test_3755()
-		{
-		}
-		[Fact]
-		public void Test_3756()
-		{
-		}
-		[Fact]
-		public void Test_3757()
-		{
-		}
-		[Fact]
-		public void Test_3758()
-		{
-		}
-		[Fact]
-		public void Test_3759()
-		{
-		}
-		[Fact]
-		public void Test_3760()
-		{
-		}
-		[Fact]
-		public void Test_3761()
-		{
-		}
-		[Fact]
-		public void Test_3762()
-		{
-		}
-		[Fact]
-		public void Test_3763()
-		{
-		}
-		[Fact]
-		public void Test_3764()
-		{
-		}
-		[Fact]
-		public void Test_3765()
-		{
-		}
-		[Fact]
-		public void Test_3766()
-		{
-		}
-		[Fact]
-		public void Test_3767()
-		{
-		}
-		[Fact]
-		public void Test_3768()
-		{
-		}
-		[Fact]
-		public void Test_3769()
-		{
-		}
-		[Fact]
-		public void Test_3770()
-		{
-		}
-		[Fact]
-		public void Test_3771()
-		{
-		}
-		[Fact]
-		public void Test_3772()
-		{
-		}
-		[Fact]
-		public void Test_3773()
-		{
-		}
-		[Fact]
-		public void Test_3774()
-		{
-		}
-		[Fact]
-		public void Test_3775()
-		{
-		}
-		[Fact]
-		public void Test_3776()
-		{
-		}
-		[Fact]
-		public void Test_3777()
-		{
-		}
-		[Fact]
-		public void Test_3778()
-		{
-		}
-		[Fact]
-		public void Test_3779()
-		{
-		}
-		[Fact]
-		public void Test_3780()
-		{
-		}
-		[Fact]
-		public void Test_3781()
-		{
-		}
-		[Fact]
-		public void Test_3782()
-		{
-		}
-		[Fact]
-		public void Test_3783()
-		{
-		}
-		[Fact]
-		public void Test_3784()
-		{
-		}
-		[Fact]
-		public void Test_3785()
-		{
-		}
-		[Fact]
-		public void Test_3786()
-		{
-		}
-		[Fact]
-		public void Test_3787()
-		{
-		}
-		[Fact]
-		public void Test_3788()
-		{
-		}
-		[Fact]
-		public void Test_3789()
-		{
-		}
-		[Fact]
-		public void Test_3790()
-		{
-		}
-		[Fact]
-		public void Test_3791()
-		{
-		}
-		[Fact]
-		public void Test_3792()
-		{
-		}
-		[Fact]
-		public void Test_3793()
-		{
-		}
-		[Fact]
-		public void Test_3794()
-		{
-		}
-		[Fact]
-		public void Test_3795()
-		{
-		}
-		[Fact]
-		public void Test_3796()
-		{
-		}
-		[Fact]
-		public void Test_3797()
-		{
-		}
-		[Fact]
-		public void Test_3798()
-		{
-		}
-		[Fact]
-		public void Test_3799()
-		{
-		}
-		[Fact]
-		public void Test_3800()
-		{
-		}
-		[Fact]
-		public void Test_3801()
-		{
-		}
-		[Fact]
-		public void Test_3802()
-		{
-		}
-		[Fact]
-		public void Test_3803()
-		{
-		}
-		[Fact]
-		public void Test_3804()
-		{
-		}
-		[Fact]
-		public void Test_3805()
-		{
-		}
-		[Fact]
-		public void Test_3806()
-		{
-		}
-		[Fact]
-		public void Test_3807()
-		{
-		}
-		[Fact]
-		public void Test_3808()
-		{
-		}
-		[Fact]
-		public void Test_3809()
-		{
-		}
-		[Fact]
-		public void Test_3810()
-		{
-		}
-		[Fact]
-		public void Test_3811()
-		{
-		}
-		[Fact]
-		public void Test_3812()
-		{
-		}
-		[Fact]
-		public void Test_3813()
-		{
-		}
-		[Fact]
-		public void Test_3814()
-		{
-		}
-		[Fact]
-		public void Test_3815()
-		{
-		}
-		[Fact]
-		public void Test_3816()
-		{
-		}
-		[Fact]
-		public void Test_3817()
-		{
-		}
-		[Fact]
-		public void Test_3818()
-		{
-		}
-		[Fact]
-		public void Test_3819()
-		{
-		}
-		[Fact]
-		public void Test_3820()
-		{
-		}
-		[Fact]
-		public void Test_3821()
-		{
-		}
-		[Fact]
-		public void Test_3822()
-		{
-		}
-		[Fact]
-		public void Test_3823()
-		{
-		}
-		[Fact]
-		public void Test_3824()
-		{
-		}
-		[Fact]
-		public void Test_3825()
-		{
-		}
-		[Fact]
-		public void Test_3826()
-		{
-		}
-		[Fact]
-		public void Test_3827()
-		{
-		}
-		[Fact]
-		public void Test_3828()
-		{
-		}
-		[Fact]
-		public void Test_3829()
-		{
-		}
-		[Fact]
-		public void Test_3830()
-		{
-		}
-		[Fact]
-		public void Test_3831()
-		{
-		}
-		[Fact]
-		public void Test_3832()
-		{
-		}
-		[Fact]
-		public void Test_3833()
-		{
-		}
-		[Fact]
-		public void Test_3834()
-		{
-		}
-		[Fact]
-		public void Test_3835()
-		{
-		}
-		[Fact]
-		public void Test_3836()
-		{
-		}
-		[Fact]
-		public void Test_3837()
-		{
-		}
-		[Fact]
-		public void Test_3838()
-		{
-		}
-		[Fact]
-		public void Test_3839()
-		{
-		}
-		[Fact]
-		public void Test_3840()
-		{
-		}
-		[Fact]
-		public void Test_3841()
-		{
-		}
-		[Fact]
-		public void Test_3842()
-		{
-		}
-		[Fact]
-		public void Test_3843()
-		{
-		}
-		[Fact]
-		public void Test_3844()
-		{
-		}
-		[Fact]
-		public void Test_3845()
-		{
-		}
-		[Fact]
-		public void Test_3846()
-		{
-		}
-		[Fact]
-		public void Test_3847()
-		{
-		}
-		[Fact]
-		public void Test_3848()
-		{
-		}
-		[Fact]
-		public void Test_3849()
-		{
-		}
-		[Fact]
-		public void Test_3850()
-		{
-		}
-		[Fact]
-		public void Test_3851()
-		{
-		}
-		[Fact]
-		public void Test_3852()
-		{
-		}
-		[Fact]
-		public void Test_3853()
-		{
-		}
-		[Fact]
-		public void Test_3854()
-		{
-		}
-		[Fact]
-		public void Test_3855()
-		{
-		}
-		[Fact]
-		public void Test_3856()
-		{
-		}
-		[Fact]
-		public void Test_3857()
-		{
-		}
-		[Fact]
-		public void Test_3858()
-		{
-		}
-		[Fact]
-		public void Test_3859()
-		{
-		}
-		[Fact]
-		public void Test_3860()
-		{
-		}
-		[Fact]
-		public void Test_3861()
-		{
-		}
-		[Fact]
-		public void Test_3862()
-		{
-		}
-		[Fact]
-		public void Test_3863()
-		{
-		}
-		[Fact]
-		public void Test_3864()
-		{
-		}
-		[Fact]
-		public void Test_3865()
-		{
-		}
-		[Fact]
-		public void Test_3866()
-		{
-		}
-		[Fact]
-		public void Test_3867()
-		{
-		}
-		[Fact]
-		public void Test_3868()
-		{
-		}
-		[Fact]
-		public void Test_3869()
-		{
-		}
-		[Fact]
-		public void Test_3870()
-		{
-		}
-		[Fact]
-		public void Test_3871()
-		{
-		}
-		[Fact]
-		public void Test_3872()
-		{
-		}
-		[Fact]
-		public void Test_3873()
-		{
-		}
-		[Fact]
-		public void Test_3874()
-		{
-		}
-		[Fact]
-		public void Test_3875()
-		{
-		}
-		[Fact]
-		public void Test_3876()
-		{
-		}
-		[Fact]
-		public void Test_3877()
-		{
-		}
-		[Fact]
-		public void Test_3878()
-		{
-		}
-		[Fact]
-		public void Test_3879()
-		{
-		}
-		[Fact]
-		public void Test_3880()
-		{
-		}
-		[Fact]
-		public void Test_3881()
-		{
-		}
-		[Fact]
-		public void Test_3882()
-		{
-		}
-		[Fact]
-		public void Test_3883()
-		{
-		}
-		[Fact]
-		public void Test_3884()
-		{
-		}
-		[Fact]
-		public void Test_3885()
-		{
-		}
-		[Fact]
-		public void Test_3886()
-		{
-		}
-		[Fact]
-		public void Test_3887()
-		{
-		}
-		[Fact]
-		public void Test_3888()
-		{
-		}
-		[Fact]
-		public void Test_3889()
-		{
-		}
-		[Fact]
-		public void Test_3890()
-		{
-		}
-		[Fact]
-		public void Test_3891()
-		{
-		}
-		[Fact]
-		public void Test_3892()
-		{
-		}
-		[Fact]
-		public void Test_3893()
-		{
-		}
-		[Fact]
-		public void Test_3894()
-		{
-		}
-		[Fact]
-		public void Test_3895()
-		{
-		}
-		[Fact]
-		public void Test_3896()
-		{
-		}
-		[Fact]
-		public void Test_3897()
-		{
-		}
-		[Fact]
-		public void Test_3898()
-		{
-		}
-		[Fact]
-		public void Test_3899()
-		{
-		}
-		[Fact]
-		public void Test_3900()
-		{
-		}
-		[Fact]
-		public void Test_3901()
-		{
-		}
-		[Fact]
-		public void Test_3902()
-		{
-		}
-		[Fact]
-		public void Test_3903()
-		{
-		}
-		[Fact]
-		public void Test_3904()
-		{
-		}
-		[Fact]
-		public void Test_3905()
-		{
-		}
-		[Fact]
-		public void Test_3906()
-		{
-		}
-		[Fact]
-		public void Test_3907()
-		{
-		}
-		[Fact]
-		public void Test_3908()
-		{
-		}
-		[Fact]
-		public void Test_3909()
-		{
-		}
-		[Fact]
-		public void Test_3910()
-		{
-		}
-		[Fact]
-		public void Test_3911()
-		{
-		}
-		[Fact]
-		public void Test_3912()
-		{
-		}
-		[Fact]
-		public void Test_3913()
-		{
-		}
-		[Fact]
-		public void Test_3914()
-		{
-		}
-		[Fact]
-		public void Test_3915()
-		{
-		}
-		[Fact]
-		public void Test_3916()
-		{
-		}
-		[Fact]
-		public void Test_3917()
-		{
-		}
-		[Fact]
-		public void Test_3918()
-		{
-		}
-		[Fact]
-		public void Test_3919()
-		{
-		}
-		[Fact]
-		public void Test_3920()
-		{
-		}
-		[Fact]
-		public void Test_3921()
-		{
-		}
-		[Fact]
-		public void Test_3922()
-		{
-		}
-		[Fact]
-		public void Test_3923()
-		{
-		}
-		[Fact]
-		public void Test_3924()
-		{
-		}
-		[Fact]
-		public void Test_3925()
-		{
-		}
-		[Fact]
-		public void Test_3926()
-		{
-		}
-		[Fact]
-		public void Test_3927()
-		{
-		}
-		[Fact]
-		public void Test_3928()
-		{
-		}
-		[Fact]
-		public void Test_3929()
-		{
-		}
-		[Fact]
-		public void Test_3930()
-		{
-		}
-		[Fact]
-		public void Test_3931()
-		{
-		}
-		[Fact]
-		public void Test_3932()
-		{
-		}
-		[Fact]
-		public void Test_3933()
-		{
-		}
-		[Fact]
-		public void Test_3934()
-		{
-		}
-		[Fact]
-		public void Test_3935()
-		{
-		}
-		[Fact]
-		public void Test_3936()
-		{
-		}
-		[Fact]
-		public void Test_3937()
-		{
-		}
-		[Fact]
-		public void Test_3938()
-		{
-		}
-		[Fact]
-		public void Test_3939()
-		{
-		}
-		[Fact]
-		public void Test_3940()
-		{
-		}
-		[Fact]
-		public void Test_3941()
-		{
-		}
-		[Fact]
-		public void Test_3942()
-		{
-		}
-		[Fact]
-		public void Test_3943()
-		{
-		}
-		[Fact]
-		public void Test_3944()
-		{
-		}
-		[Fact]
-		public void Test_3945()
-		{
-		}
-		[Fact]
-		public void Test_3946()
-		{
-		}
-		[Fact]
-		public void Test_3947()
-		{
-		}
-		[Fact]
-		public void Test_3948()
-		{
-		}
-		[Fact]
-		public void Test_3949()
-		{
-		}
-		[Fact]
-		public void Test_3950()
-		{
-		}
-		[Fact]
-		public void Test_3951()
-		{
-		}
-		[Fact]
-		public void Test_3952()
-		{
-		}
-		[Fact]
-		public void Test_3953()
-		{
-		}
-		[Fact]
-		public void Test_3954()
-		{
-		}
-		[Fact]
-		public void Test_3955()
-		{
-		}
-		[Fact]
-		public void Test_3956()
-		{
-		}
-		[Fact]
-		public void Test_3957()
-		{
-		}
-		[Fact]
-		public void Test_3958()
-		{
-		}
-		[Fact]
-		public void Test_3959()
-		{
-		}
-		[Fact]
-		public void Test_3960()
-		{
-		}
-		[Fact]
-		public void Test_3961()
-		{
-		}
-		[Fact]
-		public void Test_3962()
-		{
-		}
-		[Fact]
-		public void Test_3963()
-		{
-		}
-		[Fact]
-		public void Test_3964()
-		{
-		}
-		[Fact]
-		public void Test_3965()
-		{
-		}
-		[Fact]
-		public void Test_3966()
-		{
-		}
-		[Fact]
-		public void Test_3967()
-		{
-		}
-		[Fact]
-		public void Test_3968()
-		{
-		}
-		[Fact]
-		public void Test_3969()
-		{
-		}
-		[Fact]
-		public void Test_3970()
-		{
-		}
-		[Fact]
-		public void Test_3971()
-		{
-		}
-		[Fact]
-		public void Test_3972()
-		{
-		}
-		[Fact]
-		public void Test_3973()
-		{
-		}
-		[Fact]
-		public void Test_3974()
-		{
-		}
-		[Fact]
-		public void Test_3975()
-		{
-		}
-		[Fact]
-		public void Test_3976()
-		{
-		}
-		[Fact]
-		public void Test_3977()
-		{
-		}
-		[Fact]
-		public void Test_3978()
-		{
-		}
-		[Fact]
-		public void Test_3979()
-		{
-		}
-		[Fact]
-		public void Test_3980()
-		{
-		}
-		[Fact]
-		public void Test_3981()
-		{
-		}
-		[Fact]
-		public void Test_3982()
-		{
-		}
-		[Fact]
-		public void Test_3983()
-		{
-		}
-		[Fact]
-		public void Test_3984()
-		{
-		}
-		[Fact]
-		public void Test_3985()
-		{
-		}
-		[Fact]
-		public void Test_3986()
-		{
-		}
-		[Fact]
-		public void Test_3987()
-		{
-		}
-		[Fact]
-		public void Test_3988()
-		{
-		}
-		[Fact]
-		public void Test_3989()
-		{
-		}
-		[Fact]
-		public void Test_3990()
-		{
-		}
-		[Fact]
-		public void Test_3991()
-		{
-		}
-		[Fact]
-		public void Test_3992()
-		{
-		}
-		[Fact]
-		public void Test_3993()
-		{
-		}
-		[Fact]
-		public void Test_3994()
-		{
-		}
-		[Fact]
-		public void Test_3995()
-		{
-		}
-		[Fact]
-		public void Test_3996()
-		{
-		}
-		[Fact]
-		public void Test_3997()
-		{
-		}
-		[Fact]
-		public void Test_3998()
-		{
-		}
-		[Fact]
-		public void Test_3999()
-		{
-		}
-		[Fact]
-		public void Test_4000()
-		{
-		}
-		[Fact]
-		public void Test_4001()
-		{
-		}
-		[Fact]
-		public void Test_4002()
-		{
-		}
-		[Fact]
-		public void Test_4003()
-		{
-		}
-		[Fact]
-		public void Test_4004()
-		{
-		}
-		[Fact]
-		public void Test_4005()
-		{
-		}
-		[Fact]
-		public void Test_4006()
-		{
-		}
-		[Fact]
-		public void Test_4007()
-		{
-		}
-		[Fact]
-		public void Test_4008()
-		{
-		}
-		[Fact]
-		public void Test_4009()
-		{
-		}
-		[Fact]
-		public void Test_4010()
-		{
-		}
-		[Fact]
-		public void Test_4011()
-		{
-		}
-		[Fact]
-		public void Test_4012()
-		{
-		}
-		[Fact]
-		public void Test_4013()
-		{
-		}
-		[Fact]
-		public void Test_4014()
-		{
-		}
-		[Fact]
-		public void Test_4015()
-		{
-		}
-		[Fact]
-		public void Test_4016()
-		{
-		}
-		[Fact]
-		public void Test_4017()
-		{
-		}
-		[Fact]
-		public void Test_4018()
-		{
-		}
-		[Fact]
-		public void Test_4019()
-		{
-		}
-		[Fact]
-		public void Test_4020()
-		{
-		}
-		[Fact]
-		public void Test_4021()
-		{
-		}
-		[Fact]
-		public void Test_4022()
-		{
-		}
-		[Fact]
-		public void Test_4023()
-		{
-		}
-		[Fact]
-		public void Test_4024()
-		{
-		}
-		[Fact]
-		public void Test_4025()
-		{
-		}
-		[Fact]
-		public void Test_4026()
-		{
-		}
-		[Fact]
-		public void Test_4027()
-		{
-		}
-		[Fact]
-		public void Test_4028()
-		{
-		}
-		[Fact]
-		public void Test_4029()
-		{
-		}
-		[Fact]
-		public void Test_4030()
-		{
-		}
-		[Fact]
-		public void Test_4031()
-		{
-		}
-		[Fact]
-		public void Test_4032()
-		{
-		}
-		[Fact]
-		public void Test_4033()
-		{
-		}
-		[Fact]
-		public void Test_4034()
-		{
-		}
-		[Fact]
-		public void Test_4035()
-		{
-		}
-		[Fact]
-		public void Test_4036()
-		{
-		}
-		[Fact]
-		public void Test_4037()
-		{
-		}
-		[Fact]
-		public void Test_4038()
-		{
-		}
-		[Fact]
-		public void Test_4039()
-		{
-		}
-		[Fact]
-		public void Test_4040()
-		{
-		}
-		[Fact]
-		public void Test_4041()
-		{
-		}
-		[Fact]
-		public void Test_4042()
-		{
-		}
-		[Fact]
-		public void Test_4043()
-		{
-		}
-		[Fact]
-		public void Test_4044()
-		{
-		}
-		[Fact]
-		public void Test_4045()
-		{
-		}
-		[Fact]
-		public void Test_4046()
-		{
-		}
-		[Fact]
-		public void Test_4047()
-		{
-		}
-		[Fact]
-		public void Test_4048()
-		{
-		}
-		[Fact]
-		public void Test_4049()
-		{
-		}
-		[Fact]
-		public void Test_4050()
-		{
-		}
-		[Fact]
-		public void Test_4051()
-		{
-		}
-		[Fact]
-		public void Test_4052()
-		{
-		}
-		[Fact]
-		public void Test_4053()
-		{
-		}
-		[Fact]
-		public void Test_4054()
-		{
-		}
-		[Fact]
-		public void Test_4055()
-		{
-		}
-		[Fact]
-		public void Test_4056()
-		{
-		}
-		[Fact]
-		public void Test_4057()
-		{
-		}
-		[Fact]
-		public void Test_4058()
-		{
-		}
-		[Fact]
-		public void Test_4059()
-		{
-		}
-		[Fact]
-		public void Test_4060()
-		{
-		}
-		[Fact]
-		public void Test_4061()
-		{
-		}
-		[Fact]
-		public void Test_4062()
-		{
-		}
-		[Fact]
-		public void Test_4063()
-		{
-		}
-		[Fact]
-		public void Test_4064()
-		{
-		}
-		[Fact]
-		public void Test_4065()
-		{
-		}
-		[Fact]
-		public void Test_4066()
-		{
-		}
-		[Fact]
-		public void Test_4067()
-		{
-		}
-		[Fact]
-		public void Test_4068()
-		{
-		}
-		[Fact]
-		public void Test_4069()
-		{
-		}
-		[Fact]
-		public void Test_4070()
-		{
-		}
-		[Fact]
-		public void Test_4071()
-		{
-		}
-		[Fact]
-		public void Test_4072()
-		{
-		}
-		[Fact]
-		public void Test_4073()
-		{
-		}
-		[Fact]
-		public void Test_4074()
-		{
-		}
-		[Fact]
-		public void Test_4075()
-		{
-		}
-		[Fact]
-		public void Test_4076()
-		{
-		}
-		[Fact]
-		public void Test_4077()
-		{
-		}
-		[Fact]
-		public void Test_4078()
-		{
-		}
-		[Fact]
-		public void Test_4079()
-		{
-		}
-		[Fact]
-		public void Test_4080()
-		{
-		}
-		[Fact]
-		public void Test_4081()
-		{
-		}
-		[Fact]
-		public void Test_4082()
-		{
-		}
-		[Fact]
-		public void Test_4083()
-		{
-		}
-		[Fact]
-		public void Test_4084()
-		{
-		}
-		[Fact]
-		public void Test_4085()
-		{
-		}
-		[Fact]
-		public void Test_4086()
-		{
-		}
-		[Fact]
-		public void Test_4087()
-		{
-		}
-		[Fact]
-		public void Test_4088()
-		{
-		}
-		[Fact]
-		public void Test_4089()
-		{
-		}
-		[Fact]
-		public void Test_4090()
-		{
-		}
-		[Fact]
-		public void Test_4091()
-		{
-		}
-		[Fact]
-		public void Test_4092()
-		{
-		}
-		[Fact]
-		public void Test_4093()
-		{
-		}
-		[Fact]
-		public void Test_4094()
-		{
-		}
-		[Fact]
-		public void Test_4095()
-		{
-		}
-		[Fact]
-		public void Test_4096()
-		{
-		}
-		[Fact]
-		public void Test_4097()
-		{
-		}
-		[Fact]
-		public void Test_4098()
-		{
-		}
-		[Fact]
-		public void Test_4099()
-		{
-		}
-		[Fact]
-		public void Test_4100()
-		{
-		}
-		[Fact]
-		public void Test_4101()
-		{
-		}
-		[Fact]
-		public void Test_4102()
-		{
-		}
-		[Fact]
-		public void Test_4103()
-		{
-		}
-		[Fact]
-		public void Test_4104()
-		{
-		}
-		[Fact]
-		public void Test_4105()
-		{
-		}
-		[Fact]
-		public void Test_4106()
-		{
-		}
-		[Fact]
-		public void Test_4107()
-		{
-		}
-		[Fact]
-		public void Test_4108()
-		{
-		}
-		[Fact]
-		public void Test_4109()
-		{
-		}
-		[Fact]
-		public void Test_4110()
-		{
-		}
-		[Fact]
-		public void Test_4111()
-		{
-		}
-		[Fact]
-		public void Test_4112()
-		{
-		}
-		[Fact]
-		public void Test_4113()
-		{
-		}
-		[Fact]
-		public void Test_4114()
-		{
-		}
-		[Fact]
-		public void Test_4115()
-		{
-		}
-		[Fact]
-		public void Test_4116()
-		{
-		}
-		[Fact]
-		public void Test_4117()
-		{
-		}
-		[Fact]
-		public void Test_4118()
-		{
-		}
-		[Fact]
-		public void Test_4119()
-		{
-		}
-		[Fact]
-		public void Test_4120()
-		{
-		}
-		[Fact]
-		public void Test_4121()
-		{
-		}
-		[Fact]
-		public void Test_4122()
-		{
-		}
-		[Fact]
-		public void Test_4123()
-		{
-		}
-		[Fact]
-		public void Test_4124()
-		{
-		}
-		[Fact]
-		public void Test_4125()
-		{
-		}
-		[Fact]
-		public void Test_4126()
-		{
-		}
-		[Fact]
-		public void Test_4127()
-		{
-		}
-		[Fact]
-		public void Test_4128()
-		{
-		}
-		[Fact]
-		public void Test_4129()
-		{
-		}
-		[Fact]
-		public void Test_4130()
-		{
-		}
-		[Fact]
-		public void Test_4131()
-		{
-		}
-		[Fact]
-		public void Test_4132()
-		{
-		}
-		[Fact]
-		public void Test_4133()
-		{
-		}
-		[Fact]
-		public void Test_4134()
-		{
-		}
-		[Fact]
-		public void Test_4135()
-		{
-		}
-		[Fact]
-		public void Test_4136()
-		{
-		}
-		[Fact]
-		public void Test_4137()
-		{
-		}
-		[Fact]
-		public void Test_4138()
-		{
-		}
-		[Fact]
-		public void Test_4139()
-		{
-		}
-		[Fact]
-		public void Test_4140()
-		{
-		}
-		[Fact]
-		public void Test_4141()
-		{
-		}
-		[Fact]
-		public void Test_4142()
-		{
-		}
-		[Fact]
-		public void Test_4143()
-		{
-		}
-		[Fact]
-		public void Test_4144()
-		{
-		}
-		[Fact]
-		public void Test_4145()
-		{
-		}
-		[Fact]
-		public void Test_4146()
-		{
-		}
-		[Fact]
-		public void Test_4147()
-		{
-		}
-		[Fact]
-		public void Test_4148()
-		{
-		}
-		[Fact]
-		public void Test_4149()
-		{
-		}
-		[Fact]
-		public void Test_4150()
-		{
-		}
-		[Fact]
-		public void Test_4151()
-		{
-		}
-		[Fact]
-		public void Test_4152()
-		{
-		}
-		[Fact]
-		public void Test_4153()
-		{
-		}
-		[Fact]
-		public void Test_4154()
-		{
-		}
-		[Fact]
-		public void Test_4155()
-		{
-		}
-		[Fact]
-		public void Test_4156()
-		{
-		}
-		[Fact]
-		public void Test_4157()
-		{
-		}
-		[Fact]
-		public void Test_4158()
-		{
-		}
-		[Fact]
-		public void Test_4159()
-		{
-		}
-		[Fact]
-		public void Test_4160()
-		{
-		}
-		[Fact]
-		public void Test_4161()
-		{
-		}
-		[Fact]
-		public void Test_4162()
-		{
-		}
-		[Fact]
-		public void Test_4163()
-		{
-		}
-		[Fact]
-		public void Test_4164()
-		{
-		}
-		[Fact]
-		public void Test_4165()
-		{
-		}
-		[Fact]
-		public void Test_4166()
-		{
-		}
-		[Fact]
-		public void Test_4167()
-		{
-		}
-		[Fact]
-		public void Test_4168()
-		{
-		}
-		[Fact]
-		public void Test_4169()
-		{
-		}
-		[Fact]
-		public void Test_4170()
-		{
-		}
-		[Fact]
-		public void Test_4171()
-		{
-		}
-		[Fact]
-		public void Test_4172()
-		{
-		}
-		[Fact]
-		public void Test_4173()
-		{
-		}
-		[Fact]
-		public void Test_4174()
-		{
-		}
-		[Fact]
-		public void Test_4175()
-		{
-		}
-		[Fact]
-		public void Test_4176()
-		{
-		}
-		[Fact]
-		public void Test_4177()
-		{
-		}
-		[Fact]
-		public void Test_4178()
-		{
-		}
-		[Fact]
-		public void Test_4179()
-		{
-		}
-		[Fact]
-		public void Test_4180()
-		{
-		}
-		[Fact]
-		public void Test_4181()
-		{
-		}
-		[Fact]
-		public void Test_4182()
-		{
-		}
-		[Fact]
-		public void Test_4183()
-		{
-		}
-		[Fact]
-		public void Test_4184()
-		{
-		}
-		[Fact]
-		public void Test_4185()
-		{
-		}
-		[Fact]
-		public void Test_4186()
-		{
-		}
-		[Fact]
-		public void Test_4187()
-		{
-		}
-		[Fact]
-		public void Test_4188()
-		{
-		}
-		[Fact]
-		public void Test_4189()
-		{
-		}
-		[Fact]
-		public void Test_4190()
-		{
-		}
-		[Fact]
-		public void Test_4191()
-		{
-		}
-		[Fact]
-		public void Test_4192()
-		{
-		}
-		[Fact]
-		public void Test_4193()
-		{
-		}
-		[Fact]
-		public void Test_4194()
-		{
-		}
-		[Fact]
-		public void Test_4195()
-		{
-		}
-		[Fact]
-		public void Test_4196()
-		{
-		}
-		[Fact]
-		public void Test_4197()
-		{
-		}
-		[Fact]
-		public void Test_4198()
-		{
-		}
-		[Fact]
-		public void Test_4199()
-		{
-		}
-		[Fact]
-		public void Test_4200()
-		{
-		}
-		[Fact]
-		public void Test_4201()
-		{
-		}
-		[Fact]
-		public void Test_4202()
-		{
-		}
-		[Fact]
-		public void Test_4203()
-		{
-		}
-		[Fact]
-		public void Test_4204()
-		{
-		}
-		[Fact]
-		public void Test_4205()
-		{
-		}
-		[Fact]
-		public void Test_4206()
-		{
-		}
-		[Fact]
-		public void Test_4207()
-		{
-		}
-		[Fact]
-		public void Test_4208()
-		{
-		}
-		[Fact]
-		public void Test_4209()
-		{
-		}
-		[Fact]
-		public void Test_4210()
-		{
-		}
-		[Fact]
-		public void Test_4211()
-		{
-		}
-		[Fact]
-		public void Test_4212()
-		{
-		}
-		[Fact]
-		public void Test_4213()
-		{
-		}
-		[Fact]
-		public void Test_4214()
-		{
-		}
-		[Fact]
-		public void Test_4215()
-		{
-		}
-		[Fact]
-		public void Test_4216()
-		{
-		}
-		[Fact]
-		public void Test_4217()
-		{
-		}
-		[Fact]
-		public void Test_4218()
-		{
-		}
-		[Fact]
-		public void Test_4219()
-		{
-		}
-		[Fact]
-		public void Test_4220()
-		{
-		}
-		[Fact]
-		public void Test_4221()
-		{
-		}
-		[Fact]
-		public void Test_4222()
-		{
-		}
-		[Fact]
-		public void Test_4223()
-		{
-		}
-		[Fact]
-		public void Test_4224()
-		{
-		}
-		[Fact]
-		public void Test_4225()
-		{
-		}
-		[Fact]
-		public void Test_4226()
-		{
-		}
-		[Fact]
-		public void Test_4227()
-		{
-		}
-		[Fact]
-		public void Test_4228()
-		{
-		}
-		[Fact]
-		public void Test_4229()
-		{
-		}
-		[Fact]
-		public void Test_4230()
-		{
-		}
-		[Fact]
-		public void Test_4231()
-		{
-		}
-		[Fact]
-		public void Test_4232()
-		{
-		}
-		[Fact]
-		public void Test_4233()
-		{
-		}
-		[Fact]
-		public void Test_4234()
-		{
-		}
-		[Fact]
-		public void Test_4235()
-		{
-		}
-		[Fact]
-		public void Test_4236()
-		{
-		}
-		[Fact]
-		public void Test_4237()
-		{
-		}
-		[Fact]
-		public void Test_4238()
-		{
-		}
-		[Fact]
-		public void Test_4239()
-		{
-		}
-		[Fact]
-		public void Test_4240()
-		{
-		}
-		[Fact]
-		public void Test_4241()
-		{
-		}
-		[Fact]
-		public void Test_4242()
-		{
-		}
-		[Fact]
-		public void Test_4243()
-		{
-		}
-		[Fact]
-		public void Test_4244()
-		{
-		}
-		[Fact]
-		public void Test_4245()
-		{
-		}
-		[Fact]
-		public void Test_4246()
-		{
-		}
-		[Fact]
-		public void Test_4247()
-		{
-		}
-		[Fact]
-		public void Test_4248()
-		{
-		}
-		[Fact]
-		public void Test_4249()
-		{
-		}
-		[Fact]
-		public void Test_4250()
-		{
-		}
-		[Fact]
-		public void Test_4251()
-		{
-		}
-		[Fact]
-		public void Test_4252()
-		{
-		}
-		[Fact]
-		public void Test_4253()
-		{
-		}
-		[Fact]
-		public void Test_4254()
-		{
-		}
-		[Fact]
-		public void Test_4255()
-		{
-		}
-		[Fact]
-		public void Test_4256()
-		{
-		}
-		[Fact]
-		public void Test_4257()
-		{
-		}
-		[Fact]
-		public void Test_4258()
-		{
-		}
-		[Fact]
-		public void Test_4259()
-		{
-		}
-		[Fact]
-		public void Test_4260()
-		{
-		}
-		[Fact]
-		public void Test_4261()
-		{
-		}
-		[Fact]
-		public void Test_4262()
-		{
-		}
-		[Fact]
-		public void Test_4263()
-		{
-		}
-		[Fact]
-		public void Test_4264()
-		{
-		}
-		[Fact]
-		public void Test_4265()
-		{
-		}
-		[Fact]
-		public void Test_4266()
-		{
-		}
-		[Fact]
-		public void Test_4267()
-		{
-		}
-		[Fact]
-		public void Test_4268()
-		{
-		}
-		[Fact]
-		public void Test_4269()
-		{
-		}
-		[Fact]
-		public void Test_4270()
-		{
-		}
-		[Fact]
-		public void Test_4271()
-		{
-		}
-		[Fact]
-		public void Test_4272()
-		{
-		}
-		[Fact]
-		public void Test_4273()
-		{
-		}
-		[Fact]
-		public void Test_4274()
-		{
-		}
-		[Fact]
-		public void Test_4275()
-		{
-		}
-		[Fact]
-		public void Test_4276()
-		{
-		}
-		[Fact]
-		public void Test_4277()
-		{
-		}
-		[Fact]
-		public void Test_4278()
-		{
-		}
-		[Fact]
-		public void Test_4279()
-		{
-		}
-		[Fact]
-		public void Test_4280()
-		{
-		}
-		[Fact]
-		public void Test_4281()
-		{
-		}
-		[Fact]
-		public void Test_4282()
-		{
-		}
-		[Fact]
-		public void Test_4283()
-		{
-		}
-		[Fact]
-		public void Test_4284()
-		{
-		}
-		[Fact]
-		public void Test_4285()
-		{
-		}
-		[Fact]
-		public void Test_4286()
-		{
-		}
-		[Fact]
-		public void Test_4287()
-		{
-		}
-		[Fact]
-		public void Test_4288()
-		{
-		}
-		[Fact]
-		public void Test_4289()
-		{
-		}
-		[Fact]
-		public void Test_4290()
-		{
-		}
-		[Fact]
-		public void Test_4291()
-		{
-		}
-		[Fact]
-		public void Test_4292()
-		{
-		}
-		[Fact]
-		public void Test_4293()
-		{
-		}
-		[Fact]
-		public void Test_4294()
-		{
-		}
-		[Fact]
-		public void Test_4295()
-		{
-		}
-		[Fact]
-		public void Test_4296()
-		{
-		}
-		[Fact]
-		public void Test_4297()
-		{
-		}
-		[Fact]
-		public void Test_4298()
-		{
-		}
-		[Fact]
-		public void Test_4299()
-		{
-		}
-		[Fact]
-		public void Test_4300()
-		{
-		}
-		[Fact]
-		public void Test_4301()
-		{
-		}
-		[Fact]
-		public void Test_4302()
-		{
-		}
-		[Fact]
-		public void Test_4303()
-		{
-		}
-		[Fact]
-		public void Test_4304()
-		{
-		}
-		[Fact]
-		public void Test_4305()
-		{
-		}
-		[Fact]
-		public void Test_4306()
-		{
-		}
-		[Fact]
-		public void Test_4307()
-		{
-		}
-		[Fact]
-		public void Test_4308()
-		{
-		}
-		[Fact]
-		public void Test_4309()
-		{
-		}
-		[Fact]
-		public void Test_4310()
-		{
-		}
-		[Fact]
-		public void Test_4311()
-		{
-		}
-		[Fact]
-		public void Test_4312()
-		{
-		}
-		[Fact]
-		public void Test_4313()
-		{
-		}
-		[Fact]
-		public void Test_4314()
-		{
-		}
-		[Fact]
-		public void Test_4315()
-		{
-		}
-		[Fact]
-		public void Test_4316()
-		{
-		}
-		[Fact]
-		public void Test_4317()
-		{
-		}
-		[Fact]
-		public void Test_4318()
-		{
-		}
-		[Fact]
-		public void Test_4319()
-		{
-		}
-		[Fact]
-		public void Test_4320()
-		{
-		}
-		[Fact]
-		public void Test_4321()
-		{
-		}
-		[Fact]
-		public void Test_4322()
-		{
-		}
-		[Fact]
-		public void Test_4323()
-		{
-		}
-		[Fact]
-		public void Test_4324()
-		{
-		}
-		[Fact]
-		public void Test_4325()
-		{
-		}
-		[Fact]
-		public void Test_4326()
-		{
-		}
-		[Fact]
-		public void Test_4327()
-		{
-		}
-		[Fact]
-		public void Test_4328()
-		{
-		}
-		[Fact]
-		public void Test_4329()
-		{
-		}
-		[Fact]
-		public void Test_4330()
-		{
-		}
-		[Fact]
-		public void Test_4331()
-		{
-		}
-		[Fact]
-		public void Test_4332()
-		{
-		}
-		[Fact]
-		public void Test_4333()
-		{
-		}
-		[Fact]
-		public void Test_4334()
-		{
-		}
-		[Fact]
-		public void Test_4335()
-		{
-		}
-		[Fact]
-		public void Test_4336()
-		{
-		}
-		[Fact]
-		public void Test_4337()
-		{
-		}
-		[Fact]
-		public void Test_4338()
-		{
-		}
-		[Fact]
-		public void Test_4339()
-		{
-		}
-		[Fact]
-		public void Test_4340()
-		{
-		}
-		[Fact]
-		public void Test_4341()
-		{
-		}
-		[Fact]
-		public void Test_4342()
-		{
-		}
-		[Fact]
-		public void Test_4343()
-		{
-		}
-		[Fact]
-		public void Test_4344()
-		{
-		}
-		[Fact]
-		public void Test_4345()
-		{
-		}
-		[Fact]
-		public void Test_4346()
-		{
-		}
-		[Fact]
-		public void Test_4347()
-		{
-		}
-		[Fact]
-		public void Test_4348()
-		{
-		}
-		[Fact]
-		public void Test_4349()
-		{
-		}
-		[Fact]
-		public void Test_4350()
-		{
-		}
-		[Fact]
-		public void Test_4351()
-		{
-		}
-		[Fact]
-		public void Test_4352()
-		{
-		}
-		[Fact]
-		public void Test_4353()
-		{
-		}
-		[Fact]
-		public void Test_4354()
-		{
-		}
-		[Fact]
-		public void Test_4355()
-		{
-		}
-		[Fact]
-		public void Test_4356()
-		{
-		}
-		[Fact]
-		public void Test_4357()
-		{
-		}
-		[Fact]
-		public void Test_4358()
-		{
-		}
-		[Fact]
-		public void Test_4359()
-		{
-		}
-		[Fact]
-		public void Test_4360()
-		{
-		}
-		[Fact]
-		public void Test_4361()
-		{
-		}
-		[Fact]
-		public void Test_4362()
-		{
-		}
-		[Fact]
-		public void Test_4363()
-		{
-		}
-		[Fact]
-		public void Test_4364()
-		{
-		}
-		[Fact]
-		public void Test_4365()
-		{
-		}
-		[Fact]
-		public void Test_4366()
-		{
-		}
-		[Fact]
-		public void Test_4367()
-		{
-		}
-		[Fact]
-		public void Test_4368()
-		{
-		}
-		[Fact]
-		public void Test_4369()
-		{
-		}
-		[Fact]
-		public void Test_4370()
-		{
-		}
-		[Fact]
-		public void Test_4371()
-		{
-		}
-		[Fact]
-		public void Test_4372()
-		{
-		}
-		[Fact]
-		public void Test_4373()
-		{
-		}
-		[Fact]
-		public void Test_4374()
-		{
-		}
-		[Fact]
-		public void Test_4375()
-		{
-		}
-		[Fact]
-		public void Test_4376()
-		{
-		}
-		[Fact]
-		public void Test_4377()
-		{
-		}
-		[Fact]
-		public void Test_4378()
-		{
-		}
-		[Fact]
-		public void Test_4379()
-		{
-		}
-		[Fact]
-		public void Test_4380()
-		{
-		}
-		[Fact]
-		public void Test_4381()
-		{
-		}
-		[Fact]
-		public void Test_4382()
-		{
-		}
-		[Fact]
-		public void Test_4383()
-		{
-		}
-		[Fact]
-		public void Test_4384()
-		{
-		}
-		[Fact]
-		public void Test_4385()
-		{
-		}
-		[Fact]
-		public void Test_4386()
-		{
-		}
-		[Fact]
-		public void Test_4387()
-		{
-		}
-		[Fact]
-		public void Test_4388()
-		{
-		}
-		[Fact]
-		public void Test_4389()
-		{
-		}
-		[Fact]
-		public void Test_4390()
-		{
-		}
-		[Fact]
-		public void Test_4391()
-		{
-		}
-		[Fact]
-		public void Test_4392()
-		{
-		}
-		[Fact]
-		public void Test_4393()
-		{
-		}
-		[Fact]
-		public void Test_4394()
-		{
-		}
-		[Fact]
-		public void Test_4395()
-		{
-		}
-		[Fact]
-		public void Test_4396()
-		{
-		}
-		[Fact]
-		public void Test_4397()
-		{
-		}
-		[Fact]
-		public void Test_4398()
-		{
-		}
-		[Fact]
-		public void Test_4399()
-		{
-		}
-		[Fact]
-		public void Test_4400()
-		{
-		}
-		[Fact]
-		public void Test_4401()
-		{
-		}
-		[Fact]
-		public void Test_4402()
-		{
-		}
-		[Fact]
-		public void Test_4403()
-		{
-		}
-		[Fact]
-		public void Test_4404()
-		{
-		}
-		[Fact]
-		public void Test_4405()
-		{
-		}
-		[Fact]
-		public void Test_4406()
-		{
-		}
-		[Fact]
-		public void Test_4407()
-		{
-		}
-		[Fact]
-		public void Test_4408()
-		{
-		}
-		[Fact]
-		public void Test_4409()
-		{
-		}
-		[Fact]
-		public void Test_4410()
-		{
-		}
-		[Fact]
-		public void Test_4411()
-		{
-		}
-		[Fact]
-		public void Test_4412()
-		{
-		}
-		[Fact]
-		public void Test_4413()
-		{
-		}
-		[Fact]
-		public void Test_4414()
-		{
-		}
-		[Fact]
-		public void Test_4415()
-		{
-		}
-		[Fact]
-		public void Test_4416()
-		{
-		}
-		[Fact]
-		public void Test_4417()
-		{
-		}
-		[Fact]
-		public void Test_4418()
-		{
-		}
-		[Fact]
-		public void Test_4419()
-		{
-		}
-		[Fact]
-		public void Test_4420()
-		{
-		}
-		[Fact]
-		public void Test_4421()
-		{
-		}
-		[Fact]
-		public void Test_4422()
-		{
-		}
-		[Fact]
-		public void Test_4423()
-		{
-		}
-		[Fact]
-		public void Test_4424()
-		{
-		}
-		[Fact]
-		public void Test_4425()
-		{
-		}
-		[Fact]
-		public void Test_4426()
-		{
-		}
-		[Fact]
-		public void Test_4427()
-		{
-		}
-		[Fact]
-		public void Test_4428()
-		{
-		}
-		[Fact]
-		public void Test_4429()
-		{
-		}
-		[Fact]
-		public void Test_4430()
-		{
-		}
-		[Fact]
-		public void Test_4431()
-		{
-		}
-		[Fact]
-		public void Test_4432()
-		{
-		}
-		[Fact]
-		public void Test_4433()
-		{
-		}
-		[Fact]
-		public void Test_4434()
-		{
-		}
-		[Fact]
-		public void Test_4435()
-		{
-		}
-		[Fact]
-		public void Test_4436()
-		{
-		}
-		[Fact]
-		public void Test_4437()
-		{
-		}
-		[Fact]
-		public void Test_4438()
-		{
-		}
-		[Fact]
-		public void Test_4439()
-		{
-		}
-		[Fact]
-		public void Test_4440()
-		{
-		}
-		[Fact]
-		public void Test_4441()
-		{
-		}
-		[Fact]
-		public void Test_4442()
-		{
-		}
-		[Fact]
-		public void Test_4443()
-		{
-		}
-		[Fact]
-		public void Test_4444()
-		{
-		}
-		[Fact]
-		public void Test_4445()
-		{
-		}
-		[Fact]
-		public void Test_4446()
-		{
-		}
-		[Fact]
-		public void Test_4447()
-		{
-		}
-		[Fact]
-		public void Test_4448()
-		{
-		}
-		[Fact]
-		public void Test_4449()
-		{
-		}
-		[Fact]
-		public void Test_4450()
-		{
-		}
-		[Fact]
-		public void Test_4451()
-		{
-		}
-		[Fact]
-		public void Test_4452()
-		{
-		}
-		[Fact]
-		public void Test_4453()
-		{
-		}
-		[Fact]
-		public void Test_4454()
-		{
-		}
-		[Fact]
-		public void Test_4455()
-		{
-		}
-		[Fact]
-		public void Test_4456()
-		{
-		}
-		[Fact]
-		public void Test_4457()
-		{
-		}
-		[Fact]
-		public void Test_4458()
-		{
-		}
-		[Fact]
-		public void Test_4459()
-		{
-		}
-		[Fact]
-		public void Test_4460()
-		{
-		}
-		[Fact]
-		public void Test_4461()
-		{
-		}
-		[Fact]
-		public void Test_4462()
-		{
-		}
-		[Fact]
-		public void Test_4463()
-		{
-		}
-		[Fact]
-		public void Test_4464()
-		{
-		}
-		[Fact]
-		public void Test_4465()
-		{
-		}
-		[Fact]
-		public void Test_4466()
-		{
-		}
-		[Fact]
-		public void Test_4467()
-		{
-		}
-		[Fact]
-		public void Test_4468()
-		{
-		}
-		[Fact]
-		public void Test_4469()
-		{
-		}
-		[Fact]
-		public void Test_4470()
-		{
-		}
-		[Fact]
-		public void Test_4471()
-		{
-		}
-		[Fact]
-		public void Test_4472()
-		{
-		}
-		[Fact]
-		public void Test_4473()
-		{
-		}
-		[Fact]
-		public void Test_4474()
-		{
-		}
-		[Fact]
-		public void Test_4475()
-		{
-		}
-		[Fact]
-		public void Test_4476()
-		{
-		}
-		[Fact]
-		public void Test_4477()
-		{
-		}
-		[Fact]
-		public void Test_4478()
-		{
-		}
-		[Fact]
-		public void Test_4479()
-		{
-		}
-		[Fact]
-		public void Test_4480()
-		{
-		}
-		[Fact]
-		public void Test_4481()
-		{
-		}
-		[Fact]
-		public void Test_4482()
-		{
-		}
-		[Fact]
-		public void Test_4483()
-		{
-		}
-		[Fact]
-		public void Test_4484()
-		{
-		}
-		[Fact]
-		public void Test_4485()
-		{
-		}
-		[Fact]
-		public void Test_4486()
-		{
-		}
-		[Fact]
-		public void Test_4487()
-		{
-		}
-		[Fact]
-		public void Test_4488()
-		{
-		}
-		[Fact]
-		public void Test_4489()
-		{
-		}
-		[Fact]
-		public void Test_4490()
-		{
-		}
-		[Fact]
-		public void Test_4491()
-		{
-		}
-		[Fact]
-		public void Test_4492()
-		{
-		}
-		[Fact]
-		public void Test_4493()
-		{
-		}
-		[Fact]
-		public void Test_4494()
-		{
-		}
-		[Fact]
-		public void Test_4495()
-		{
-		}
-		[Fact]
-		public void Test_4496()
-		{
-		}
-		[Fact]
-		public void Test_4497()
-		{
-		}
-		[Fact]
-		public void Test_4498()
-		{
-		}
-		[Fact]
-		public void Test_4499()
-		{
-		}
-		[Fact]
-		public void Test_4500()
-		{
-		}
-		[Fact]
-		public void Test_4501()
-		{
-		}
-		[Fact]
-		public void Test_4502()
-		{
-		}
-		[Fact]
-		public void Test_4503()
-		{
-		}
-		[Fact]
-		public void Test_4504()
-		{
-		}
-		[Fact]
-		public void Test_4505()
-		{
-		}
-		[Fact]
-		public void Test_4506()
-		{
-		}
-		[Fact]
-		public void Test_4507()
-		{
-		}
-		[Fact]
-		public void Test_4508()
-		{
-		}
-		[Fact]
-		public void Test_4509()
-		{
-		}
-		[Fact]
-		public void Test_4510()
-		{
-		}
-		[Fact]
-		public void Test_4511()
-		{
-		}
-		[Fact]
-		public void Test_4512()
-		{
-		}
-		[Fact]
-		public void Test_4513()
-		{
-		}
-		[Fact]
-		public void Test_4514()
-		{
-		}
-		[Fact]
-		public void Test_4515()
-		{
-		}
-		[Fact]
-		public void Test_4516()
-		{
-		}
-		[Fact]
-		public void Test_4517()
-		{
-		}
-		[Fact]
-		public void Test_4518()
-		{
-		}
-		[Fact]
-		public void Test_4519()
-		{
-		}
-		[Fact]
-		public void Test_4520()
-		{
-		}
-		[Fact]
-		public void Test_4521()
-		{
-		}
-		[Fact]
-		public void Test_4522()
-		{
-		}
-		[Fact]
-		public void Test_4523()
-		{
-		}
-		[Fact]
-		public void Test_4524()
-		{
-		}
-		[Fact]
-		public void Test_4525()
-		{
-		}
-		[Fact]
-		public void Test_4526()
-		{
-		}
-		[Fact]
-		public void Test_4527()
-		{
-		}
-		[Fact]
-		public void Test_4528()
-		{
-		}
-		[Fact]
-		public void Test_4529()
-		{
-		}
-		[Fact]
-		public void Test_4530()
-		{
-		}
-		[Fact]
-		public void Test_4531()
-		{
-		}
-		[Fact]
-		public void Test_4532()
-		{
-		}
-		[Fact]
-		public void Test_4533()
-		{
-		}
-		[Fact]
-		public void Test_4534()
-		{
-		}
-		[Fact]
-		public void Test_4535()
-		{
-		}
-		[Fact]
-		public void Test_4536()
-		{
-		}
-		[Fact]
-		public void Test_4537()
-		{
-		}
-		[Fact]
-		public void Test_4538()
-		{
-		}
-		[Fact]
-		public void Test_4539()
-		{
-		}
-		[Fact]
-		public void Test_4540()
-		{
-		}
-		[Fact]
-		public void Test_4541()
-		{
-		}
-		[Fact]
-		public void Test_4542()
-		{
-		}
-		[Fact]
-		public void Test_4543()
-		{
-		}
-		[Fact]
-		public void Test_4544()
-		{
-		}
-		[Fact]
-		public void Test_4545()
-		{
-		}
-		[Fact]
-		public void Test_4546()
-		{
-		}
-		[Fact]
-		public void Test_4547()
-		{
-		}
-		[Fact]
-		public void Test_4548()
-		{
-		}
-		[Fact]
-		public void Test_4549()
-		{
-		}
-		[Fact]
-		public void Test_4550()
-		{
-		}
-		[Fact]
-		public void Test_4551()
-		{
-		}
-		[Fact]
-		public void Test_4552()
-		{
-		}
-		[Fact]
-		public void Test_4553()
-		{
-		}
-		[Fact]
-		public void Test_4554()
-		{
-		}
-		[Fact]
-		public void Test_4555()
-		{
-		}
-		[Fact]
-		public void Test_4556()
-		{
-		}
-		[Fact]
-		public void Test_4557()
-		{
-		}
-		[Fact]
-		public void Test_4558()
-		{
-		}
-		[Fact]
-		public void Test_4559()
-		{
-		}
-		[Fact]
-		public void Test_4560()
-		{
-		}
-		[Fact]
-		public void Test_4561()
-		{
-		}
-		[Fact]
-		public void Test_4562()
-		{
-		}
-		[Fact]
-		public void Test_4563()
-		{
-		}
-		[Fact]
-		public void Test_4564()
-		{
-		}
-		[Fact]
-		public void Test_4565()
-		{
-		}
-		[Fact]
-		public void Test_4566()
-		{
-		}
-		[Fact]
-		public void Test_4567()
-		{
-		}
-		[Fact]
-		public void Test_4568()
-		{
-		}
-		[Fact]
-		public void Test_4569()
-		{
-		}
-		[Fact]
-		public void Test_4570()
-		{
-		}
-		[Fact]
-		public void Test_4571()
-		{
-		}
-		[Fact]
-		public void Test_4572()
-		{
-		}
-		[Fact]
-		public void Test_4573()
-		{
-		}
-		[Fact]
-		public void Test_4574()
-		{
-		}
-		[Fact]
-		public void Test_4575()
-		{
-		}
-		[Fact]
-		public void Test_4576()
-		{
-		}
-		[Fact]
-		public void Test_4577()
-		{
-		}
-		[Fact]
-		public void Test_4578()
-		{
-		}
-		[Fact]
-		public void Test_4579()
-		{
-		}
-		[Fact]
-		public void Test_4580()
-		{
-		}
-		[Fact]
-		public void Test_4581()
-		{
-		}
-		[Fact]
-		public void Test_4582()
-		{
-		}
-		[Fact]
-		public void Test_4583()
-		{
-		}
-		[Fact]
-		public void Test_4584()
-		{
-		}
-		[Fact]
-		public void Test_4585()
-		{
-		}
-		[Fact]
-		public void Test_4586()
-		{
-		}
-		[Fact]
-		public void Test_4587()
-		{
-		}
-		[Fact]
-		public void Test_4588()
-		{
-		}
-		[Fact]
-		public void Test_4589()
-		{
-		}
-		[Fact]
-		public void Test_4590()
-		{
-		}
-		[Fact]
-		public void Test_4591()
-		{
-		}
-		[Fact]
-		public void Test_4592()
-		{
-		}
-		[Fact]
-		public void Test_4593()
-		{
-		}
-		[Fact]
-		public void Test_4594()
-		{
-		}
-		[Fact]
-		public void Test_4595()
-		{
-		}
-		[Fact]
-		public void Test_4596()
-		{
-		}
-		[Fact]
-		public void Test_4597()
-		{
-		}
-		[Fact]
-		public void Test_4598()
-		{
-		}
-		[Fact]
-		public void Test_4599()
-		{
-		}
-		[Fact]
-		public void Test_4600()
-		{
-		}
-		[Fact]
-		public void Test_4601()
-		{
-		}
-		[Fact]
-		public void Test_4602()
-		{
-		}
-		[Fact]
-		public void Test_4603()
-		{
-		}
-		[Fact]
-		public void Test_4604()
-		{
-		}
-		[Fact]
-		public void Test_4605()
-		{
-		}
-		[Fact]
-		public void Test_4606()
-		{
-		}
-		[Fact]
-		public void Test_4607()
-		{
-		}
-		[Fact]
-		public void Test_4608()
-		{
-		}
-		[Fact]
-		public void Test_4609()
-		{
-		}
-		[Fact]
-		public void Test_4610()
-		{
-		}
-		[Fact]
-		public void Test_4611()
-		{
-		}
-		[Fact]
-		public void Test_4612()
-		{
-		}
-		[Fact]
-		public void Test_4613()
-		{
-		}
-		[Fact]
-		public void Test_4614()
-		{
-		}
-		[Fact]
-		public void Test_4615()
-		{
-		}
-		[Fact]
-		public void Test_4616()
-		{
-		}
-		[Fact]
-		public void Test_4617()
-		{
-		}
-		[Fact]
-		public void Test_4618()
-		{
-		}
-		[Fact]
-		public void Test_4619()
-		{
-		}
-		[Fact]
-		public void Test_4620()
-		{
-		}
-		[Fact]
-		public void Test_4621()
-		{
-		}
-		[Fact]
-		public void Test_4622()
-		{
-		}
-		[Fact]
-		public void Test_4623()
-		{
-		}
-		[Fact]
-		public void Test_4624()
-		{
-		}
-		[Fact]
-		public void Test_4625()
-		{
-		}
-		[Fact]
-		public void Test_4626()
-		{
-		}
-		[Fact]
-		public void Test_4627()
-		{
-		}
-		[Fact]
-		public void Test_4628()
-		{
-		}
-		[Fact]
-		public void Test_4629()
-		{
-		}
-		[Fact]
-		public void Test_4630()
-		{
-		}
-		[Fact]
-		public void Test_4631()
-		{
-		}
-		[Fact]
-		public void Test_4632()
-		{
-		}
-		[Fact]
-		public void Test_4633()
-		{
-		}
-		[Fact]
-		public void Test_4634()
-		{
-		}
-		[Fact]
-		public void Test_4635()
-		{
-		}
-		[Fact]
-		public void Test_4636()
-		{
-		}
-		[Fact]
-		public void Test_4637()
-		{
-		}
-		[Fact]
-		public void Test_4638()
-		{
-		}
-		[Fact]
-		public void Test_4639()
-		{
-		}
-		[Fact]
-		public void Test_4640()
-		{
-		}
-		[Fact]
-		public void Test_4641()
-		{
-		}
-		[Fact]
-		public void Test_4642()
-		{
-		}
-		[Fact]
-		public void Test_4643()
-		{
-		}
-		[Fact]
-		public void Test_4644()
-		{
-		}
-		[Fact]
-		public void Test_4645()
-		{
-		}
-		[Fact]
-		public void Test_4646()
-		{
-		}
-		[Fact]
-		public void Test_4647()
-		{
-		}
-		[Fact]
-		public void Test_4648()
-		{
-		}
-		[Fact]
-		public void Test_4649()
-		{
-		}
-		[Fact]
-		public void Test_4650()
-		{
-		}
-		[Fact]
-		public void Test_4651()
-		{
-		}
-		[Fact]
-		public void Test_4652()
-		{
-		}
-		[Fact]
-		public void Test_4653()
-		{
-		}
-		[Fact]
-		public void Test_4654()
-		{
-		}
-		[Fact]
-		public void Test_4655()
-		{
-		}
-		[Fact]
-		public void Test_4656()
-		{
-		}
-		[Fact]
-		public void Test_4657()
-		{
-		}
-		[Fact]
-		public void Test_4658()
-		{
-		}
-		[Fact]
-		public void Test_4659()
-		{
-		}
-		[Fact]
-		public void Test_4660()
-		{
-		}
-		[Fact]
-		public void Test_4661()
-		{
-		}
-		[Fact]
-		public void Test_4662()
-		{
-		}
-		[Fact]
-		public void Test_4663()
-		{
-		}
-		[Fact]
-		public void Test_4664()
-		{
-		}
-		[Fact]
-		public void Test_4665()
-		{
-		}
-		[Fact]
-		public void Test_4666()
-		{
-		}
-		[Fact]
-		public void Test_4667()
-		{
-		}
-		[Fact]
-		public void Test_4668()
-		{
-		}
-		[Fact]
-		public void Test_4669()
-		{
-		}
-		[Fact]
-		public void Test_4670()
-		{
-		}
-		[Fact]
-		public void Test_4671()
-		{
-		}
-		[Fact]
-		public void Test_4672()
-		{
-		}
-		[Fact]
-		public void Test_4673()
-		{
-		}
-		[Fact]
-		public void Test_4674()
-		{
-		}
-		[Fact]
-		public void Test_4675()
-		{
-		}
-		[Fact]
-		public void Test_4676()
-		{
-		}
-		[Fact]
-		public void Test_4677()
-		{
-		}
-		[Fact]
-		public void Test_4678()
-		{
-		}
-		[Fact]
-		public void Test_4679()
-		{
-		}
-		[Fact]
-		public void Test_4680()
-		{
-		}
-		[Fact]
-		public void Test_4681()
-		{
-		}
-		[Fact]
-		public void Test_4682()
-		{
-		}
-		[Fact]
-		public void Test_4683()
-		{
-		}
-		[Fact]
-		public void Test_4684()
-		{
-		}
-		[Fact]
-		public void Test_4685()
-		{
-		}
-		[Fact]
-		public void Test_4686()
-		{
-		}
-		[Fact]
-		public void Test_4687()
-		{
-		}
-		[Fact]
-		public void Test_4688()
-		{
-		}
-		[Fact]
-		public void Test_4689()
-		{
-		}
-		[Fact]
-		public void Test_4690()
-		{
-		}
-		[Fact]
-		public void Test_4691()
-		{
-		}
-		[Fact]
-		public void Test_4692()
-		{
-		}
-		[Fact]
-		public void Test_4693()
-		{
-		}
-		[Fact]
-		public void Test_4694()
-		{
-		}
-		[Fact]
-		public void Test_4695()
-		{
-		}
-		[Fact]
-		public void Test_4696()
-		{
-		}
-		[Fact]
-		public void Test_4697()
-		{
-		}
-		[Fact]
-		public void Test_4698()
-		{
-		}
-		[Fact]
-		public void Test_4699()
-		{
-		}
-		[Fact]
-		public void Test_4700()
-		{
-		}
-		[Fact]
-		public void Test_4701()
-		{
-		}
-		[Fact]
-		public void Test_4702()
-		{
-		}
-		[Fact]
-		public void Test_4703()
-		{
-		}
-		[Fact]
-		public void Test_4704()
-		{
-		}
-		[Fact]
-		public void Test_4705()
-		{
-		}
-		[Fact]
-		public void Test_4706()
-		{
-		}
-		[Fact]
-		public void Test_4707()
-		{
-		}
-		[Fact]
-		public void Test_4708()
-		{
-		}
-		[Fact]
-		public void Test_4709()
-		{
-		}
-		[Fact]
-		public void Test_4710()
-		{
-		}
-		[Fact]
-		public void Test_4711()
-		{
-		}
-		[Fact]
-		public void Test_4712()
-		{
-		}
-		[Fact]
-		public void Test_4713()
-		{
-		}
-		[Fact]
-		public void Test_4714()
-		{
-		}
-		[Fact]
-		public void Test_4715()
-		{
-		}
-		[Fact]
-		public void Test_4716()
-		{
-		}
-		[Fact]
-		public void Test_4717()
-		{
-		}
-		[Fact]
-		public void Test_4718()
-		{
-		}
-		[Fact]
-		public void Test_4719()
-		{
-		}
-		[Fact]
-		public void Test_4720()
-		{
-		}
-		[Fact]
-		public void Test_4721()
-		{
-		}
-		[Fact]
-		public void Test_4722()
-		{
-		}
-		[Fact]
-		public void Test_4723()
-		{
-		}
-		[Fact]
-		public void Test_4724()
-		{
-		}
-		[Fact]
-		public void Test_4725()
-		{
-		}
-		[Fact]
-		public void Test_4726()
-		{
-		}
-		[Fact]
-		public void Test_4727()
-		{
-		}
-		[Fact]
-		public void Test_4728()
-		{
-		}
-		[Fact]
-		public void Test_4729()
-		{
-		}
-		[Fact]
-		public void Test_4730()
-		{
-		}
-		[Fact]
-		public void Test_4731()
-		{
-		}
-		[Fact]
-		public void Test_4732()
-		{
-		}
-		[Fact]
-		public void Test_4733()
-		{
-		}
-		[Fact]
-		public void Test_4734()
-		{
-		}
-		[Fact]
-		public void Test_4735()
-		{
-		}
-		[Fact]
-		public void Test_4736()
-		{
-		}
-		[Fact]
-		public void Test_4737()
-		{
-		}
-		[Fact]
-		public void Test_4738()
-		{
-		}
-		[Fact]
-		public void Test_4739()
-		{
-		}
-		[Fact]
-		public void Test_4740()
-		{
-		}
-		[Fact]
-		public void Test_4741()
-		{
-		}
-		[Fact]
-		public void Test_4742()
-		{
-		}
-		[Fact]
-		public void Test_4743()
-		{
-		}
-		[Fact]
-		public void Test_4744()
-		{
-		}
-		[Fact]
-		public void Test_4745()
-		{
-		}
-		[Fact]
-		public void Test_4746()
-		{
-		}
-		[Fact]
-		public void Test_4747()
-		{
-		}
-		[Fact]
-		public void Test_4748()
-		{
-		}
-		[Fact]
-		public void Test_4749()
-		{
-		}
-		[Fact]
-		public void Test_4750()
-		{
-		}
-		[Fact]
-		public void Test_4751()
-		{
-		}
-		[Fact]
-		public void Test_4752()
-		{
-		}
-		[Fact]
-		public void Test_4753()
-		{
-		}
-		[Fact]
-		public void Test_4754()
-		{
-		}
-		[Fact]
-		public void Test_4755()
-		{
-		}
-		[Fact]
-		public void Test_4756()
-		{
-		}
-		[Fact]
-		public void Test_4757()
-		{
-		}
-		[Fact]
-		public void Test_4758()
-		{
-		}
-		[Fact]
-		public void Test_4759()
-		{
-		}
-		[Fact]
-		public void Test_4760()
-		{
-		}
-		[Fact]
-		public void Test_4761()
-		{
-		}
-		[Fact]
-		public void Test_4762()
-		{
-		}
-		[Fact]
-		public void Test_4763()
-		{
-		}
-		[Fact]
-		public void Test_4764()
-		{
-		}
-		[Fact]
-		public void Test_4765()
-		{
-		}
-		[Fact]
-		public void Test_4766()
-		{
-		}
-		[Fact]
-		public void Test_4767()
-		{
-		}
-		[Fact]
-		public void Test_4768()
-		{
-		}
-		[Fact]
-		public void Test_4769()
-		{
-		}
-		[Fact]
-		public void Test_4770()
-		{
-		}
-		[Fact]
-		public void Test_4771()
-		{
-		}
-		[Fact]
-		public void Test_4772()
-		{
-		}
-		[Fact]
-		public void Test_4773()
-		{
-		}
-		[Fact]
-		public void Test_4774()
-		{
-		}
-		[Fact]
-		public void Test_4775()
-		{
-		}
-		[Fact]
-		public void Test_4776()
-		{
-		}
-		[Fact]
-		public void Test_4777()
-		{
-		}
-		[Fact]
-		public void Test_4778()
-		{
-		}
-		[Fact]
-		public void Test_4779()
-		{
-		}
-		[Fact]
-		public void Test_4780()
-		{
-		}
-		[Fact]
-		public void Test_4781()
-		{
-		}
-		[Fact]
-		public void Test_4782()
-		{
-		}
-		[Fact]
-		public void Test_4783()
-		{
-		}
-		[Fact]
-		public void Test_4784()
-		{
-		}
-		[Fact]
-		public void Test_4785()
-		{
-		}
-		[Fact]
-		public void Test_4786()
-		{
-		}
-		[Fact]
-		public void Test_4787()
-		{
-		}
-		[Fact]
-		public void Test_4788()
-		{
-		}
-		[Fact]
-		public void Test_4789()
-		{
-		}
-		[Fact]
-		public void Test_4790()
-		{
-		}
-		[Fact]
-		public void Test_4791()
-		{
-		}
-		[Fact]
-		public void Test_4792()
-		{
-		}
-		[Fact]
-		public void Test_4793()
-		{
-		}
-		[Fact]
-		public void Test_4794()
-		{
-		}
-		[Fact]
-		public void Test_4795()
-		{
-		}
-		[Fact]
-		public void Test_4796()
-		{
-		}
-		[Fact]
-		public void Test_4797()
-		{
-		}
-		[Fact]
-		public void Test_4798()
-		{
-		}
-		[Fact]
-		public void Test_4799()
-		{
-		}
-		[Fact]
-		public void Test_4800()
-		{
-		}
-		[Fact]
-		public void Test_4801()
-		{
-		}
-		[Fact]
-		public void Test_4802()
-		{
-		}
-		[Fact]
-		public void Test_4803()
-		{
-		}
-		[Fact]
-		public void Test_4804()
-		{
-		}
-		[Fact]
-		public void Test_4805()
-		{
-		}
-		[Fact]
-		public void Test_4806()
-		{
-		}
-		[Fact]
-		public void Test_4807()
-		{
-		}
-		[Fact]
-		public void Test_4808()
-		{
-		}
-		[Fact]
-		public void Test_4809()
-		{
-		}
-		[Fact]
-		public void Test_4810()
-		{
-		}
-		[Fact]
-		public void Test_4811()
-		{
-		}
-		[Fact]
-		public void Test_4812()
-		{
-		}
-		[Fact]
-		public void Test_4813()
-		{
-		}
-		[Fact]
-		public void Test_4814()
-		{
-		}
-		[Fact]
-		public void Test_4815()
-		{
-		}
-		[Fact]
-		public void Test_4816()
-		{
-		}
-		[Fact]
-		public void Test_4817()
-		{
-		}
-		[Fact]
-		public void Test_4818()
-		{
-		}
-		[Fact]
-		public void Test_4819()
-		{
-		}
-		[Fact]
-		public void Test_4820()
-		{
-		}
-		[Fact]
-		public void Test_4821()
-		{
-		}
-		[Fact]
-		public void Test_4822()
-		{
-		}
-		[Fact]
-		public void Test_4823()
-		{
-		}
-		[Fact]
-		public void Test_4824()
-		{
-		}
-		[Fact]
-		public void Test_4825()
-		{
-		}
-		[Fact]
-		public void Test_4826()
-		{
-		}
-		[Fact]
-		public void Test_4827()
-		{
-		}
-		[Fact]
-		public void Test_4828()
-		{
-		}
-		[Fact]
-		public void Test_4829()
-		{
-		}
-		[Fact]
-		public void Test_4830()
-		{
-		}
-		[Fact]
-		public void Test_4831()
-		{
-		}
-		[Fact]
-		public void Test_4832()
-		{
-		}
-		[Fact]
-		public void Test_4833()
-		{
-		}
-		[Fact]
-		public void Test_4834()
-		{
-		}
-		[Fact]
-		public void Test_4835()
-		{
-		}
-		[Fact]
-		public void Test_4836()
-		{
-		}
-		[Fact]
-		public void Test_4837()
-		{
-		}
-		[Fact]
-		public void Test_4838()
-		{
-		}
-		[Fact]
-		public void Test_4839()
-		{
-		}
-		[Fact]
-		public void Test_4840()
-		{
-		}
-		[Fact]
-		public void Test_4841()
-		{
-		}
-		[Fact]
-		public void Test_4842()
-		{
-		}
-		[Fact]
-		public void Test_4843()
-		{
-		}
-		[Fact]
-		public void Test_4844()
-		{
-		}
-		[Fact]
-		public void Test_4845()
-		{
-		}
-		[Fact]
-		public void Test_4846()
-		{
-		}
-		[Fact]
-		public void Test_4847()
-		{
-		}
-		[Fact]
-		public void Test_4848()
-		{
-		}
-		[Fact]
-		public void Test_4849()
-		{
-		}
-		[Fact]
-		public void Test_4850()
-		{
-		}
-		[Fact]
-		public void Test_4851()
-		{
-		}
-		[Fact]
-		public void Test_4852()
-		{
-		}
-		[Fact]
-		public void Test_4853()
-		{
-		}
-		[Fact]
-		public void Test_4854()
-		{
-		}
-		[Fact]
-		public void Test_4855()
-		{
-		}
-		[Fact]
-		public void Test_4856()
-		{
-		}
-		[Fact]
-		public void Test_4857()
-		{
-		}
-		[Fact]
-		public void Test_4858()
-		{
-		}
-		[Fact]
-		public void Test_4859()
-		{
-		}
-		[Fact]
-		public void Test_4860()
-		{
-		}
-		[Fact]
-		public void Test_4861()
-		{
-		}
-		[Fact]
-		public void Test_4862()
-		{
-		}
-		[Fact]
-		public void Test_4863()
-		{
-		}
-		[Fact]
-		public void Test_4864()
-		{
-		}
-		[Fact]
-		public void Test_4865()
-		{
-		}
-		[Fact]
-		public void Test_4866()
-		{
-		}
-		[Fact]
-		public void Test_4867()
-		{
-		}
-		[Fact]
-		public void Test_4868()
-		{
-		}
-		[Fact]
-		public void Test_4869()
-		{
-		}
-		[Fact]
-		public void Test_4870()
-		{
-		}
-		[Fact]
-		public void Test_4871()
-		{
-		}
-		[Fact]
-		public void Test_4872()
-		{
-		}
-		[Fact]
-		public void Test_4873()
-		{
-		}
-		[Fact]
-		public void Test_4874()
-		{
-		}
-		[Fact]
-		public void Test_4875()
-		{
-		}
-		[Fact]
-		public void Test_4876()
-		{
-		}
-		[Fact]
-		public void Test_4877()
-		{
-		}
-		[Fact]
-		public void Test_4878()
-		{
-		}
-		[Fact]
-		public void Test_4879()
-		{
-		}
-		[Fact]
-		public void Test_4880()
-		{
-		}
-		[Fact]
-		public void Test_4881()
-		{
-		}
-		[Fact]
-		public void Test_4882()
-		{
-		}
-		[Fact]
-		public void Test_4883()
-		{
-		}
-		[Fact]
-		public void Test_4884()
-		{
-		}
-		[Fact]
-		public void Test_4885()
-		{
-		}
-		[Fact]
-		public void Test_4886()
-		{
-		}
-		[Fact]
-		public void Test_4887()
-		{
-		}
-		[Fact]
-		public void Test_4888()
-		{
-		}
-		[Fact]
-		public void Test_4889()
-		{
-		}
-		[Fact]
-		public void Test_4890()
-		{
-		}
-		[Fact]
-		public void Test_4891()
-		{
-		}
-		[Fact]
-		public void Test_4892()
-		{
-		}
-		[Fact]
-		public void Test_4893()
-		{
-		}
-		[Fact]
-		public void Test_4894()
-		{
-		}
-		[Fact]
-		public void Test_4895()
-		{
-		}
-		[Fact]
-		public void Test_4896()
-		{
-		}
-		[Fact]
-		public void Test_4897()
-		{
-		}
-		[Fact]
-		public void Test_4898()
-		{
-		}
-		[Fact]
-		public void Test_4899()
-		{
-		}
-		[Fact]
-		public void Test_4900()
-		{
-		}
-		[Fact]
-		public void Test_4901()
-		{
-		}
-		[Fact]
-		public void Test_4902()
-		{
-		}
-		[Fact]
-		public void Test_4903()
-		{
-		}
-		[Fact]
-		public void Test_4904()
-		{
-		}
-		[Fact]
-		public void Test_4905()
-		{
-		}
-		[Fact]
-		public void Test_4906()
-		{
-		}
-		[Fact]
-		public void Test_4907()
-		{
-		}
-		[Fact]
-		public void Test_4908()
-		{
-		}
-		[Fact]
-		public void Test_4909()
-		{
-		}
-		[Fact]
-		public void Test_4910()
-		{
-		}
-		[Fact]
-		public void Test_4911()
-		{
-		}
-		[Fact]
-		public void Test_4912()
-		{
-		}
-		[Fact]
-		public void Test_4913()
-		{
-		}
-		[Fact]
-		public void Test_4914()
-		{
-		}
-		[Fact]
-		public void Test_4915()
-		{
-		}
-		[Fact]
-		public void Test_4916()
-		{
-		}
-		[Fact]
-		public void Test_4917()
-		{
-		}
-		[Fact]
-		public void Test_4918()
-		{
-		}
-		[Fact]
-		public void Test_4919()
-		{
-		}
-		[Fact]
-		public void Test_4920()
-		{
-		}
-		[Fact]
-		public void Test_4921()
-		{
-		}
-		[Fact]
-		public void Test_4922()
-		{
-		}
-		[Fact]
-		public void Test_4923()
-		{
-		}
-		[Fact]
-		public void Test_4924()
-		{
-		}
-		[Fact]
-		public void Test_4925()
-		{
-		}
-		[Fact]
-		public void Test_4926()
-		{
-		}
-		[Fact]
-		public void Test_4927()
-		{
-		}
-		[Fact]
-		public void Test_4928()
-		{
-		}
-		[Fact]
-		public void Test_4929()
-		{
-		}
-		[Fact]
-		public void Test_4930()
-		{
-		}
-		[Fact]
-		public void Test_4931()
-		{
-		}
-		[Fact]
-		public void Test_4932()
-		{
-		}
-		[Fact]
-		public void Test_4933()
-		{
-		}
-		[Fact]
-		public void Test_4934()
-		{
-		}
-		[Fact]
-		public void Test_4935()
-		{
-		}
-		[Fact]
-		public void Test_4936()
-		{
-		}
-		[Fact]
-		public void Test_4937()
-		{
-		}
-		[Fact]
-		public void Test_4938()
-		{
-		}
-		[Fact]
-		public void Test_4939()
-		{
-		}
-		[Fact]
-		public void Test_4940()
-		{
-		}
-		[Fact]
-		public void Test_4941()
-		{
-		}
-		[Fact]
-		public void Test_4942()
-		{
-		}
-		[Fact]
-		public void Test_4943()
-		{
-		}
-		[Fact]
-		public void Test_4944()
-		{
-		}
-		[Fact]
-		public void Test_4945()
-		{
-		}
-		[Fact]
-		public void Test_4946()
-		{
-		}
-		[Fact]
-		public void Test_4947()
-		{
-		}
-		[Fact]
-		public void Test_4948()
-		{
-		}
-		[Fact]
-		public void Test_4949()
-		{
-		}
-		[Fact]
-		public void Test_4950()
-		{
-		}
-		[Fact]
-		public void Test_4951()
-		{
-		}
-		[Fact]
-		public void Test_4952()
-		{
-		}
-		[Fact]
-		public void Test_4953()
-		{
-		}
-		[Fact]
-		public void Test_4954()
-		{
-		}
-		[Fact]
-		public void Test_4955()
-		{
-		}
-		[Fact]
-		public void Test_4956()
-		{
-		}
-		[Fact]
-		public void Test_4957()
-		{
-		}
-		[Fact]
-		public void Test_4958()
-		{
-		}
-		[Fact]
-		public void Test_4959()
-		{
-		}
-		[Fact]
-		public void Test_4960()
-		{
-		}
-		[Fact]
-		public void Test_4961()
-		{
-		}
-		[Fact]
-		public void Test_4962()
-		{
-		}
-		[Fact]
-		public void Test_4963()
-		{
-		}
-		[Fact]
-		public void Test_4964()
-		{
-		}
-		[Fact]
-		public void Test_4965()
-		{
-		}
-		[Fact]
-		public void Test_4966()
-		{
-		}
-		[Fact]
-		public void Test_4967()
-		{
-		}
-		[Fact]
-		public void Test_4968()
-		{
-		}
-		[Fact]
-		public void Test_4969()
-		{
-		}
-		[Fact]
-		public void Test_4970()
-		{
-		}
-		[Fact]
-		public void Test_4971()
-		{
-		}
-		[Fact]
-		public void Test_4972()
-		{
-		}
-		[Fact]
-		public void Test_4973()
-		{
-		}
-		[Fact]
-		public void Test_4974()
-		{
-		}
-		[Fact]
-		public void Test_4975()
-		{
-		}
-		[Fact]
-		public void Test_4976()
-		{
-		}
-		[Fact]
-		public void Test_4977()
-		{
-		}
-		[Fact]
-		public void Test_4978()
-		{
-		}
-		[Fact]
-		public void Test_4979()
-		{
-		}
-		[Fact]
-		public void Test_4980()
-		{
-		}
-		[Fact]
-		public void Test_4981()
-		{
-		}
-		[Fact]
-		public void Test_4982()
-		{
-		}
-		[Fact]
-		public void Test_4983()
-		{
-		}
-		[Fact]
-		public void Test_4984()
-		{
-		}
-		[Fact]
-		public void Test_4985()
-		{
-		}
-		[Fact]
-		public void Test_4986()
-		{
-		}
-		[Fact]
-		public void Test_4987()
-		{
-		}
-		[Fact]
-		public void Test_4988()
-		{
-		}
-		[Fact]
-		public void Test_4989()
-		{
-		}
-		[Fact]
-		public void Test_4990()
-		{
-		}
-		[Fact]
-		public void Test_4991()
-		{
-		}
-		[Fact]
-		public void Test_4992()
-		{
-		}
-		[Fact]
-		public void Test_4993()
-		{
-		}
-		[Fact]
-		public void Test_4994()
-		{
-		}
-		[Fact]
-		public void Test_4995()
-		{
-		}
-		[Fact]
-		public void Test_4996()
-		{
-		}
-		[Fact]
-		public void Test_4997()
-		{
-		}
-		[Fact]
-		public void Test_4998()
-		{
-		}
-		[Fact]
-		public void Test_4999()
-		{
-		}
-		[Fact]
-		public void Test_5000()
-		{
-		}
-		[Fact]
-		public void Test_5001()
-		{
-		}
-		[Fact]
-		public void Test_5002()
-		{
-		}
-		[Fact]
-		public void Test_5003()
-		{
-		}
-		[Fact]
-		public void Test_5004()
-		{
-		}
-		[Fact]
-		public void Test_5005()
-		{
-		}
-		[Fact]
-		public void Test_5006()
-		{
-		}
-		[Fact]
-		public void Test_5007()
-		{
-		}
-		[Fact]
-		public void Test_5008()
-		{
-		}
-		[Fact]
-		public void Test_5009()
-		{
-		}
-		[Fact]
-		public void Test_5010()
-		{
-		}
-		[Fact]
-		public void Test_5011()
-		{
-		}
-		[Fact]
-		public void Test_5012()
-		{
-		}
-		[Fact]
-		public void Test_5013()
-		{
-		}
-		[Fact]
-		public void Test_5014()
-		{
-		}
-		[Fact]
-		public void Test_5015()
-		{
-		}
-		[Fact]
-		public void Test_5016()
-		{
-		}
-		[Fact]
-		public void Test_5017()
-		{
-		}
-		[Fact]
-		public void Test_5018()
-		{
-		}
-		[Fact]
-		public void Test_5019()
-		{
-		}
-		[Fact]
-		public void Test_5020()
-		{
-		}
-		[Fact]
-		public void Test_5021()
-		{
-		}
-		[Fact]
-		public void Test_5022()
-		{
-		}
-		[Fact]
-		public void Test_5023()
-		{
-		}
-		[Fact]
-		public void Test_5024()
-		{
-		}
-		[Fact]
-		public void Test_5025()
-		{
-		}
-		[Fact]
-		public void Test_5026()
-		{
-		}
-		[Fact]
-		public void Test_5027()
-		{
-		}
-		[Fact]
-		public void Test_5028()
-		{
-		}
-		[Fact]
-		public void Test_5029()
-		{
-		}
-		[Fact]
-		public void Test_5030()
-		{
-		}
-		[Fact]
-		public void Test_5031()
-		{
-		}
-		[Fact]
-		public void Test_5032()
-		{
-		}
-		[Fact]
-		public void Test_5033()
-		{
-		}
-		[Fact]
-		public void Test_5034()
-		{
-		}
-		[Fact]
-		public void Test_5035()
-		{
-		}
-		[Fact]
-		public void Test_5036()
-		{
-		}
-		[Fact]
-		public void Test_5037()
-		{
-		}
-		[Fact]
-		public void Test_5038()
-		{
-		}
-		[Fact]
-		public void Test_5039()
-		{
-		}
-		[Fact]
-		public void Test_5040()
-		{
-		}
-		[Fact]
-		public void Test_5041()
-		{
-		}
-		[Fact]
-		public void Test_5042()
-		{
-		}
-		[Fact]
-		public void Test_5043()
-		{
-		}
-		[Fact]
-		public void Test_5044()
-		{
-		}
-		[Fact]
-		public void Test_5045()
-		{
-		}
-		[Fact]
-		public void Test_5046()
-		{
-		}
-		[Fact]
-		public void Test_5047()
-		{
-		}
-		[Fact]
-		public void Test_5048()
-		{
-		}
-		[Fact]
-		public void Test_5049()
-		{
-		}
-		[Fact]
-		public void Test_5050()
-		{
-		}
-		[Fact]
-		public void Test_5051()
-		{
-		}
-		[Fact]
-		public void Test_5052()
-		{
-		}
-		[Fact]
-		public void Test_5053()
-		{
-		}
-		[Fact]
-		public void Test_5054()
-		{
-		}
-		[Fact]
-		public void Test_5055()
-		{
-		}
-		[Fact]
-		public void Test_5056()
-		{
-		}
-		[Fact]
-		public void Test_5057()
-		{
-		}
-		[Fact]
-		public void Test_5058()
-		{
-		}
-		[Fact]
-		public void Test_5059()
-		{
-		}
-		[Fact]
-		public void Test_5060()
-		{
-		}
-		[Fact]
-		public void Test_5061()
-		{
-		}
-		[Fact]
-		public void Test_5062()
-		{
-		}
-		[Fact]
-		public void Test_5063()
-		{
-		}
-		[Fact]
-		public void Test_5064()
-		{
-		}
-		[Fact]
-		public void Test_5065()
-		{
-		}
-		[Fact]
-		public void Test_5066()
-		{
-		}
-		[Fact]
-		public void Test_5067()
-		{
-		}
-		[Fact]
-		public void Test_5068()
-		{
-		}
-		[Fact]
-		public void Test_5069()
-		{
-		}
-		[Fact]
-		public void Test_5070()
-		{
-		}
-		[Fact]
-		public void Test_5071()
-		{
-		}
-		[Fact]
-		public void Test_5072()
-		{
-		}
-		[Fact]
-		public void Test_5073()
-		{
-		}
-		[Fact]
-		public void Test_5074()
-		{
-		}
-		[Fact]
-		public void Test_5075()
-		{
-		}
-		[Fact]
-		public void Test_5076()
-		{
-		}
-		[Fact]
-		public void Test_5077()
-		{
-		}
-		[Fact]
-		public void Test_5078()
-		{
-		}
-		[Fact]
-		public void Test_5079()
-		{
-		}
-		[Fact]
-		public void Test_5080()
-		{
-		}
-		[Fact]
-		public void Test_5081()
-		{
-		}
-		[Fact]
-		public void Test_5082()
-		{
-		}
-		[Fact]
-		public void Test_5083()
-		{
-		}
-		[Fact]
-		public void Test_5084()
-		{
-		}
-		[Fact]
-		public void Test_5085()
-		{
-		}
-		[Fact]
-		public void Test_5086()
-		{
-		}
-		[Fact]
-		public void Test_5087()
-		{
-		}
-		[Fact]
-		public void Test_5088()
-		{
-		}
-		[Fact]
-		public void Test_5089()
-		{
-		}
-		[Fact]
-		public void Test_5090()
-		{
-		}
-		[Fact]
-		public void Test_5091()
-		{
-		}
-		[Fact]
-		public void Test_5092()
-		{
-		}
-		[Fact]
-		public void Test_5093()
-		{
-		}
-		[Fact]
-		public void Test_5094()
-		{
-		}
-		[Fact]
-		public void Test_5095()
-		{
-		}
-		[Fact]
-		public void Test_5096()
-		{
-		}
-		[Fact]
-		public void Test_5097()
-		{
-		}
-		[Fact]
-		public void Test_5098()
-		{
-		}
-		[Fact]
-		public void Test_5099()
-		{
-		}
-		[Fact]
-		public void Test_5100()
-		{
-		}
-		[Fact]
-		public void Test_5101()
-		{
-		}
-		[Fact]
-		public void Test_5102()
-		{
-		}
-		[Fact]
-		public void Test_5103()
-		{
-		}
-		[Fact]
-		public void Test_5104()
-		{
-		}
-		[Fact]
-		public void Test_5105()
-		{
-		}
-		[Fact]
-		public void Test_5106()
-		{
-		}
-		[Fact]
-		public void Test_5107()
-		{
-		}
-		[Fact]
-		public void Test_5108()
-		{
-		}
-		[Fact]
-		public void Test_5109()
-		{
-		}
-		[Fact]
-		public void Test_5110()
-		{
-		}
-		[Fact]
-		public void Test_5111()
-		{
-		}
-		[Fact]
-		public void Test_5112()
-		{
-		}
-		[Fact]
-		public void Test_5113()
-		{
-		}
-		[Fact]
-		public void Test_5114()
-		{
-		}
-		[Fact]
-		public void Test_5115()
-		{
-		}
-		[Fact]
-		public void Test_5116()
-		{
-		}
-		[Fact]
-		public void Test_5117()
-		{
-		}
-		[Fact]
-		public void Test_5118()
-		{
-		}
-		[Fact]
-		public void Test_5119()
-		{
-		}
-		[Fact]
-		public void Test_5120()
-		{
-		}
-		[Fact]
-		public void Test_5121()
-		{
-		}
-		[Fact]
-		public void Test_5122()
-		{
-		}
-		[Fact]
-		public void Test_5123()
-		{
-		}
-		[Fact]
-		public void Test_5124()
-		{
-		}
-		[Fact]
-		public void Test_5125()
-		{
-		}
-		[Fact]
-		public void Test_5126()
-		{
-		}
-		[Fact]
-		public void Test_5127()
-		{
-		}
-		[Fact]
-		public void Test_5128()
-		{
-		}
-		[Fact]
-		public void Test_5129()
-		{
-		}
-		[Fact]
-		public void Test_5130()
-		{
-		}
-		[Fact]
-		public void Test_5131()
-		{
-		}
-		[Fact]
-		public void Test_5132()
-		{
-		}
-		[Fact]
-		public void Test_5133()
-		{
-		}
-		[Fact]
-		public void Test_5134()
-		{
-		}
-		[Fact]
-		public void Test_5135()
-		{
-		}
-		[Fact]
-		public void Test_5136()
-		{
-		}
-		[Fact]
-		public void Test_5137()
-		{
-		}
-		[Fact]
-		public void Test_5138()
-		{
-		}
-		[Fact]
-		public void Test_5139()
-		{
-		}
-		[Fact]
-		public void Test_5140()
-		{
-		}
-		[Fact]
-		public void Test_5141()
-		{
-		}
-		[Fact]
-		public void Test_5142()
-		{
-		}
-		[Fact]
-		public void Test_5143()
-		{
-		}
-		[Fact]
-		public void Test_5144()
-		{
-		}
-		[Fact]
-		public void Test_5145()
-		{
-		}
-		[Fact]
-		public void Test_5146()
-		{
-		}
-		[Fact]
-		public void Test_5147()
-		{
-		}
-		[Fact]
-		public void Test_5148()
-		{
-		}
-		[Fact]
-		public void Test_5149()
-		{
-		}
-		[Fact]
-		public void Test_5150()
-		{
-		}
-		[Fact]
-		public void Test_5151()
-		{
-		}
-		[Fact]
-		public void Test_5152()
-		{
-		}
-		[Fact]
-		public void Test_5153()
-		{
-		}
-		[Fact]
-		public void Test_5154()
-		{
-		}
-		[Fact]
-		public void Test_5155()
-		{
-		}
-		[Fact]
-		public void Test_5156()
-		{
-		}
-		[Fact]
-		public void Test_5157()
-		{
-		}
-		[Fact]
-		public void Test_5158()
-		{
-		}
-		[Fact]
-		public void Test_5159()
-		{
-		}
-		[Fact]
-		public void Test_5160()
-		{
-		}
-		[Fact]
-		public void Test_5161()
-		{
-		}
-		[Fact]
-		public void Test_5162()
-		{
-		}
-		[Fact]
-		public void Test_5163()
-		{
-		}
-		[Fact]
-		public void Test_5164()
-		{
-		}
-		[Fact]
-		public void Test_5165()
-		{
-		}
-		[Fact]
-		public void Test_5166()
-		{
-		}
-		[Fact]
-		public void Test_5167()
-		{
-		}
-		[Fact]
-		public void Test_5168()
-		{
-		}
-		[Fact]
-		public void Test_5169()
-		{
-		}
-		[Fact]
-		public void Test_5170()
-		{
-		}
-		[Fact]
-		public void Test_5171()
-		{
-		}
-		[Fact]
-		public void Test_5172()
-		{
-		}
-		[Fact]
-		public void Test_5173()
-		{
-		}
-		[Fact]
-		public void Test_5174()
-		{
-		}
-		[Fact]
-		public void Test_5175()
-		{
-		}
-		[Fact]
-		public void Test_5176()
-		{
-		}
-		[Fact]
-		public void Test_5177()
-		{
-		}
-		[Fact]
-		public void Test_5178()
-		{
-		}
-		[Fact]
-		public void Test_5179()
-		{
-		}
-		[Fact]
-		public void Test_5180()
-		{
-		}
-		[Fact]
-		public void Test_5181()
-		{
-		}
-		[Fact]
-		public void Test_5182()
-		{
-		}
-		[Fact]
-		public void Test_5183()
-		{
-		}
-		[Fact]
-		public void Test_5184()
-		{
-		}
-		[Fact]
-		public void Test_5185()
-		{
-		}
-		[Fact]
-		public void Test_5186()
-		{
-		}
-		[Fact]
-		public void Test_5187()
-		{
-		}
-		[Fact]
-		public void Test_5188()
-		{
-		}
-		[Fact]
-		public void Test_5189()
-		{
-		}
-		[Fact]
-		public void Test_5190()
-		{
-		}
-		[Fact]
-		public void Test_5191()
-		{
-		}
-		[Fact]
-		public void Test_5192()
-		{
-		}
-		[Fact]
-		public void Test_5193()
-		{
-		}
-		[Fact]
-		public void Test_5194()
-		{
-		}
-		[Fact]
-		public void Test_5195()
-		{
-		}
-		[Fact]
-		public void Test_5196()
-		{
-		}
-		[Fact]
-		public void Test_5197()
-		{
-		}
-		[Fact]
-		public void Test_5198()
-		{
-		}
-		[Fact]
-		public void Test_5199()
-		{
-		}
-		[Fact]
-		public void Test_5200()
-		{
-		}
-		[Fact]
-		public void Test_5201()
-		{
-		}
-		[Fact]
-		public void Test_5202()
-		{
-		}
-		[Fact]
-		public void Test_5203()
-		{
-		}
-		[Fact]
-		public void Test_5204()
-		{
-		}
-		[Fact]
-		public void Test_5205()
-		{
-		}
-		[Fact]
-		public void Test_5206()
-		{
-		}
-		[Fact]
-		public void Test_5207()
-		{
-		}
-		[Fact]
-		public void Test_5208()
-		{
-		}
-		[Fact]
-		public void Test_5209()
-		{
-		}
-		[Fact]
-		public void Test_5210()
-		{
-		}
-		[Fact]
-		public void Test_5211()
-		{
-		}
-		[Fact]
-		public void Test_5212()
-		{
-		}
-		[Fact]
-		public void Test_5213()
-		{
-		}
-		[Fact]
-		public void Test_5214()
-		{
-		}
-		[Fact]
-		public void Test_5215()
-		{
-		}
-		[Fact]
-		public void Test_5216()
-		{
-		}
-		[Fact]
-		public void Test_5217()
-		{
-		}
-		[Fact]
-		public void Test_5218()
-		{
-		}
-		[Fact]
-		public void Test_5219()
-		{
-		}
-		[Fact]
-		public void Test_5220()
-		{
-		}
-		[Fact]
-		public void Test_5221()
-		{
-		}
-		[Fact]
-		public void Test_5222()
-		{
-		}
-		[Fact]
-		public void Test_5223()
-		{
-		}
-		[Fact]
-		public void Test_5224()
-		{
-		}
-		[Fact]
-		public void Test_5225()
-		{
-		}
-		[Fact]
-		public void Test_5226()
-		{
-		}
-		[Fact]
-		public void Test_5227()
-		{
-		}
-		[Fact]
-		public void Test_5228()
-		{
-		}
-		[Fact]
-		public void Test_5229()
-		{
-		}
-		[Fact]
-		public void Test_5230()
-		{
-		}
-		[Fact]
-		public void Test_5231()
-		{
-		}
-		[Fact]
-		public void Test_5232()
-		{
-		}
-		[Fact]
-		public void Test_5233()
-		{
-		}
-		[Fact]
-		public void Test_5234()
-		{
-		}
-		[Fact]
-		public void Test_5235()
-		{
-		}
-		[Fact]
-		public void Test_5236()
-		{
-		}
-		[Fact]
-		public void Test_5237()
-		{
-		}
-		[Fact]
-		public void Test_5238()
-		{
-		}
-		[Fact]
-		public void Test_5239()
-		{
-		}
-		[Fact]
-		public void Test_5240()
-		{
-		}
-		[Fact]
-		public void Test_5241()
-		{
-		}
-		[Fact]
-		public void Test_5242()
-		{
-		}
-		[Fact]
-		public void Test_5243()
-		{
-		}
-		[Fact]
-		public void Test_5244()
-		{
-		}
-		[Fact]
-		public void Test_5245()
-		{
-		}
-		[Fact]
-		public void Test_5246()
-		{
-		}
-		[Fact]
-		public void Test_5247()
-		{
-		}
-		[Fact]
-		public void Test_5248()
-		{
-		}
-		[Fact]
-		public void Test_5249()
-		{
-		}
-		[Fact]
-		public void Test_5250()
-		{
-		}
-		[Fact]
-		public void Test_5251()
-		{
-		}
-		[Fact]
-		public void Test_5252()
-		{
-		}
-		[Fact]
-		public void Test_5253()
-		{
-		}
-		[Fact]
-		public void Test_5254()
-		{
-		}
-		[Fact]
-		public void Test_5255()
-		{
-		}
-		[Fact]
-		public void Test_5256()
-		{
-		}
-		[Fact]
-		public void Test_5257()
-		{
-		}
-		[Fact]
-		public void Test_5258()
-		{
-		}
-		[Fact]
-		public void Test_5259()
-		{
-		}
-		[Fact]
-		public void Test_5260()
-		{
-		}
-		[Fact]
-		public void Test_5261()
-		{
-		}
-		[Fact]
-		public void Test_5262()
-		{
-		}
-		[Fact]
-		public void Test_5263()
-		{
-		}
-		[Fact]
-		public void Test_5264()
-		{
-		}
-		[Fact]
-		public void Test_5265()
-		{
-		}
-		[Fact]
-		public void Test_5266()
-		{
-		}
-		[Fact]
-		public void Test_5267()
-		{
-		}
-		[Fact]
-		public void Test_5268()
-		{
-		}
-		[Fact]
-		public void Test_5269()
-		{
-		}
-		[Fact]
-		public void Test_5270()
-		{
-		}
-		[Fact]
-		public void Test_5271()
-		{
-		}
-		[Fact]
-		public void Test_5272()
-		{
-		}
-		[Fact]
-		public void Test_5273()
-		{
-		}
-		[Fact]
-		public void Test_5274()
-		{
-		}
-		[Fact]
-		public void Test_5275()
-		{
-		}
-		[Fact]
-		public void Test_5276()
-		{
-		}
-		[Fact]
-		public void Test_5277()
-		{
-		}
-		[Fact]
-		public void Test_5278()
-		{
-		}
-		[Fact]
-		public void Test_5279()
-		{
-		}
-		[Fact]
-		public void Test_5280()
-		{
-		}
-		[Fact]
-		public void Test_5281()
-		{
-		}
-		[Fact]
-		public void Test_5282()
-		{
-		}
-		[Fact]
-		public void Test_5283()
-		{
-		}
-		[Fact]
-		public void Test_5284()
-		{
-		}
-		[Fact]
-		public void Test_5285()
-		{
-		}
-		[Fact]
-		public void Test_5286()
-		{
-		}
-		[Fact]
-		public void Test_5287()
-		{
-		}
-		[Fact]
-		public void Test_5288()
-		{
-		}
-		[Fact]
-		public void Test_5289()
-		{
-		}
-		[Fact]
-		public void Test_5290()
-		{
-		}
-		[Fact]
-		public void Test_5291()
-		{
-		}
-		[Fact]
-		public void Test_5292()
-		{
-		}
-		[Fact]
-		public void Test_5293()
-		{
-		}
-		[Fact]
-		public void Test_5294()
-		{
-		}
-		[Fact]
-		public void Test_5295()
-		{
-		}
-		[Fact]
-		public void Test_5296()
-		{
-		}
-		[Fact]
-		public void Test_5297()
-		{
-		}
-		[Fact]
-		public void Test_5298()
-		{
-		}
-		[Fact]
-		public void Test_5299()
-		{
-		}
-		[Fact]
-		public void Test_5300()
-		{
-		}
-		[Fact]
-		public void Test_5301()
-		{
-		}
-		[Fact]
-		public void Test_5302()
-		{
-		}
-		[Fact]
-		public void Test_5303()
-		{
-		}
-		[Fact]
-		public void Test_5304()
-		{
-		}
-		[Fact]
-		public void Test_5305()
-		{
-		}
-		[Fact]
-		public void Test_5306()
-		{
-		}
-		[Fact]
-		public void Test_5307()
-		{
-		}
-		[Fact]
-		public void Test_5308()
-		{
-		}
-		[Fact]
-		public void Test_5309()
-		{
-		}
-		[Fact]
-		public void Test_5310()
-		{
-		}
-		[Fact]
-		public void Test_5311()
-		{
-		}
-		[Fact]
-		public void Test_5312()
-		{
-		}
-		[Fact]
-		public void Test_5313()
-		{
-		}
-		[Fact]
-		public void Test_5314()
-		{
-		}
-		[Fact]
-		public void Test_5315()
-		{
-		}
-		[Fact]
-		public void Test_5316()
-		{
-		}
-		[Fact]
-		public void Test_5317()
-		{
-		}
-		[Fact]
-		public void Test_5318()
-		{
-		}
-		[Fact]
-		public void Test_5319()
-		{
-		}
-		[Fact]
-		public void Test_5320()
-		{
-		}
-		[Fact]
-		public void Test_5321()
-		{
-		}
-		[Fact]
-		public void Test_5322()
-		{
-		}
-		[Fact]
-		public void Test_5323()
-		{
-		}
-		[Fact]
-		public void Test_5324()
-		{
-		}
-		[Fact]
-		public void Test_5325()
-		{
-		}
-		[Fact]
-		public void Test_5326()
-		{
-		}
-		[Fact]
-		public void Test_5327()
-		{
-		}
-		[Fact]
-		public void Test_5328()
-		{
-		}
-		[Fact]
-		public void Test_5329()
-		{
-		}
-		[Fact]
-		public void Test_5330()
-		{
-		}
-		[Fact]
-		public void Test_5331()
-		{
-		}
-		[Fact]
-		public void Test_5332()
-		{
-		}
-		[Fact]
-		public void Test_5333()
-		{
-		}
-		[Fact]
-		public void Test_5334()
-		{
-		}
-		[Fact]
-		public void Test_5335()
-		{
-		}
-		[Fact]
-		public void Test_5336()
-		{
-		}
-		[Fact]
-		public void Test_5337()
-		{
-		}
-		[Fact]
-		public void Test_5338()
-		{
-		}
-		[Fact]
-		public void Test_5339()
-		{
-		}
-		[Fact]
-		public void Test_5340()
-		{
-		}
-		[Fact]
-		public void Test_5341()
-		{
-		}
-		[Fact]
-		public void Test_5342()
-		{
-		}
-		[Fact]
-		public void Test_5343()
-		{
-		}
-		[Fact]
-		public void Test_5344()
-		{
-		}
-		[Fact]
-		public void Test_5345()
-		{
-		}
-		[Fact]
-		public void Test_5346()
-		{
-		}
-		[Fact]
-		public void Test_5347()
-		{
-		}
-		[Fact]
-		public void Test_5348()
-		{
-		}
-		[Fact]
-		public void Test_5349()
-		{
-		}
-		[Fact]
-		public void Test_5350()
-		{
-		}
-		[Fact]
-		public void Test_5351()
-		{
-		}
-		[Fact]
-		public void Test_5352()
-		{
-		}
-		[Fact]
-		public void Test_5353()
-		{
-		}
-		[Fact]
-		public void Test_5354()
-		{
-		}
-		[Fact]
-		public void Test_5355()
-		{
-		}
-		[Fact]
-		public void Test_5356()
-		{
-		}
-		[Fact]
-		public void Test_5357()
-		{
-		}
-		[Fact]
-		public void Test_5358()
-		{
-		}
-		[Fact]
-		public void Test_5359()
-		{
-		}
-		[Fact]
-		public void Test_5360()
-		{
-		}
-		[Fact]
-		public void Test_5361()
-		{
-		}
-		[Fact]
-		public void Test_5362()
-		{
-		}
-		[Fact]
-		public void Test_5363()
-		{
-		}
-		[Fact]
-		public void Test_5364()
-		{
-		}
-		[Fact]
-		public void Test_5365()
-		{
-		}
-		[Fact]
-		public void Test_5366()
-		{
-		}
-		[Fact]
-		public void Test_5367()
-		{
-		}
-		[Fact]
-		public void Test_5368()
-		{
-		}
-		[Fact]
-		public void Test_5369()
-		{
-		}
-		[Fact]
-		public void Test_5370()
-		{
-		}
-		[Fact]
-		public void Test_5371()
-		{
-		}
-		[Fact]
-		public void Test_5372()
-		{
-		}
-		[Fact]
-		public void Test_5373()
-		{
-		}
-		[Fact]
-		public void Test_5374()
-		{
-		}
-		[Fact]
-		public void Test_5375()
-		{
-		}
-		[Fact]
-		public void Test_5376()
-		{
-		}
-		[Fact]
-		public void Test_5377()
-		{
-		}
-		[Fact]
-		public void Test_5378()
-		{
-		}
-		[Fact]
-		public void Test_5379()
-		{
-		}
-		[Fact]
-		public void Test_5380()
-		{
-		}
-		[Fact]
-		public void Test_5381()
-		{
-		}
-		[Fact]
-		public void Test_5382()
-		{
-		}
-		[Fact]
-		public void Test_5383()
-		{
-		}
-		[Fact]
-		public void Test_5384()
-		{
-		}
-		[Fact]
-		public void Test_5385()
-		{
-		}
-		[Fact]
-		public void Test_5386()
-		{
-		}
-		[Fact]
-		public void Test_5387()
-		{
-		}
-		[Fact]
-		public void Test_5388()
-		{
-		}
-		[Fact]
-		public void Test_5389()
-		{
-		}
-		[Fact]
-		public void Test_5390()
-		{
-		}
-		[Fact]
-		public void Test_5391()
-		{
-		}
-		[Fact]
-		public void Test_5392()
-		{
-		}
-		[Fact]
-		public void Test_5393()
-		{
-		}
-		[Fact]
-		public void Test_5394()
-		{
-		}
-		[Fact]
-		public void Test_5395()
-		{
-		}
-		[Fact]
-		public void Test_5396()
-		{
-		}
-		[Fact]
-		public void Test_5397()
-		{
-		}
-		[Fact]
-		public void Test_5398()
-		{
-		}
-		[Fact]
-		public void Test_5399()
-		{
-		}
-		[Fact]
-		public void Test_5400()
-		{
-		}
-		[Fact]
-		public void Test_5401()
-		{
-		}
-		[Fact]
-		public void Test_5402()
-		{
-		}
-		[Fact]
-		public void Test_5403()
-		{
-		}
-		[Fact]
-		public void Test_5404()
-		{
-		}
-		[Fact]
-		public void Test_5405()
-		{
-		}
-		[Fact]
-		public void Test_5406()
-		{
-		}
-		[Fact]
-		public void Test_5407()
-		{
-		}
-		[Fact]
-		public void Test_5408()
-		{
-		}
-		[Fact]
-		public void Test_5409()
-		{
-		}
-		[Fact]
-		public void Test_5410()
-		{
-		}
-		[Fact]
-		public void Test_5411()
-		{
-		}
-		[Fact]
-		public void Test_5412()
-		{
-		}
-		[Fact]
-		public void Test_5413()
-		{
-		}
-		[Fact]
-		public void Test_5414()
-		{
-		}
-		[Fact]
-		public void Test_5415()
-		{
-		}
-		[Fact]
-		public void Test_5416()
-		{
-		}
-		[Fact]
-		public void Test_5417()
-		{
-		}
-		[Fact]
-		public void Test_5418()
-		{
-		}
-		[Fact]
-		public void Test_5419()
-		{
-		}
-		[Fact]
-		public void Test_5420()
-		{
-		}
-		[Fact]
-		public void Test_5421()
-		{
-		}
-		[Fact]
-		public void Test_5422()
-		{
-		}
-		[Fact]
-		public void Test_5423()
-		{
-		}
-		[Fact]
-		public void Test_5424()
-		{
-		}
-		[Fact]
-		public void Test_5425()
-		{
-		}
-		[Fact]
-		public void Test_5426()
-		{
-		}
-		[Fact]
-		public void Test_5427()
-		{
-		}
-		[Fact]
-		public void Test_5428()
-		{
-		}
-		[Fact]
-		public void Test_5429()
-		{
-		}
-		[Fact]
-		public void Test_5430()
-		{
-		}
-		[Fact]
-		public void Test_5431()
-		{
-		}
-		[Fact]
-		public void Test_5432()
-		{
-		}
-		[Fact]
-		public void Test_5433()
-		{
-		}
-		[Fact]
-		public void Test_5434()
-		{
-		}
-		[Fact]
-		public void Test_5435()
-		{
-		}
-		[Fact]
-		public void Test_5436()
-		{
-		}
-		[Fact]
-		public void Test_5437()
-		{
-		}
-		[Fact]
-		public void Test_5438()
-		{
-		}
-		[Fact]
-		public void Test_5439()
-		{
-		}
-		[Fact]
-		public void Test_5440()
-		{
-		}
-		[Fact]
-		public void Test_5441()
-		{
-		}
-		[Fact]
-		public void Test_5442()
-		{
-		}
-		[Fact]
-		public void Test_5443()
-		{
-		}
-		[Fact]
-		public void Test_5444()
-		{
-		}
-		[Fact]
-		public void Test_5445()
-		{
-		}
-		[Fact]
-		public void Test_5446()
-		{
-		}
-		[Fact]
-		public void Test_5447()
-		{
-		}
-		[Fact]
-		public void Test_5448()
-		{
-		}
-		[Fact]
-		public void Test_5449()
-		{
-		}
-		[Fact]
-		public void Test_5450()
-		{
-		}
-		[Fact]
-		public void Test_5451()
-		{
-		}
-		[Fact]
-		public void Test_5452()
-		{
-		}
-		[Fact]
-		public void Test_5453()
-		{
-		}
-		[Fact]
-		public void Test_5454()
-		{
-		}
-		[Fact]
-		public void Test_5455()
-		{
-		}
-		[Fact]
-		public void Test_5456()
-		{
-		}
-		[Fact]
-		public void Test_5457()
-		{
-		}
-		[Fact]
-		public void Test_5458()
-		{
-		}
-		[Fact]
-		public void Test_5459()
-		{
-		}
-		[Fact]
-		public void Test_5460()
-		{
-		}
-		[Fact]
-		public void Test_5461()
-		{
-		}
-		[Fact]
-		public void Test_5462()
-		{
-		}
-		[Fact]
-		public void Test_5463()
-		{
-		}
-		[Fact]
-		public void Test_5464()
-		{
-		}
-		[Fact]
-		public void Test_5465()
-		{
-		}
-		[Fact]
-		public void Test_5466()
-		{
-		}
-		[Fact]
-		public void Test_5467()
-		{
-		}
-		[Fact]
-		public void Test_5468()
-		{
-		}
-		[Fact]
-		public void Test_5469()
-		{
-		}
-		[Fact]
-		public void Test_5470()
-		{
-		}
-		[Fact]
-		public void Test_5471()
-		{
-		}
-		[Fact]
-		public void Test_5472()
-		{
-		}
-		[Fact]
-		public void Test_5473()
-		{
-		}
-		[Fact]
-		public void Test_5474()
-		{
-		}
-		[Fact]
-		public void Test_5475()
-		{
-		}
-		[Fact]
-		public void Test_5476()
-		{
-		}
-		[Fact]
-		public void Test_5477()
-		{
-		}
-		[Fact]
-		public void Test_5478()
-		{
-		}
-		[Fact]
-		public void Test_5479()
-		{
-		}
-		[Fact]
-		public void Test_5480()
-		{
-		}
-		[Fact]
-		public void Test_5481()
-		{
-		}
-		[Fact]
-		public void Test_5482()
-		{
-		}
-		[Fact]
-		public void Test_5483()
-		{
-		}
-		[Fact]
-		public void Test_5484()
-		{
-		}
-		[Fact]
-		public void Test_5485()
-		{
-		}
-		[Fact]
-		public void Test_5486()
-		{
-		}
-		[Fact]
-		public void Test_5487()
-		{
-		}
-		[Fact]
-		public void Test_5488()
-		{
-		}
-		[Fact]
-		public void Test_5489()
-		{
-		}
-		[Fact]
-		public void Test_5490()
-		{
-		}
-		[Fact]
-		public void Test_5491()
-		{
-		}
-		[Fact]
-		public void Test_5492()
-		{
-		}
-		[Fact]
-		public void Test_5493()
-		{
-		}
-		[Fact]
-		public void Test_5494()
-		{
-		}
-		[Fact]
-		public void Test_5495()
-		{
-		}
-		[Fact]
-		public void Test_5496()
-		{
-		}
-		[Fact]
-		public void Test_5497()
-		{
-		}
-		[Fact]
-		public void Test_5498()
-		{
-		}
-		[Fact]
-		public void Test_5499()
-		{
-		}
-		[Fact]
-		public void Test_5500()
-		{
-		}
-		[Fact]
-		public void Test_5501()
-		{
-		}
-		[Fact]
-		public void Test_5502()
-		{
-		}
-		[Fact]
-		public void Test_5503()
-		{
-		}
-		[Fact]
-		public void Test_5504()
-		{
-		}
-		[Fact]
-		public void Test_5505()
-		{
-		}
-		[Fact]
-		public void Test_5506()
-		{
-		}
-		[Fact]
-		public void Test_5507()
-		{
-		}
-		[Fact]
-		public void Test_5508()
-		{
-		}
-		[Fact]
-		public void Test_5509()
-		{
-		}
-		[Fact]
-		public void Test_5510()
-		{
-		}
-		[Fact]
-		public void Test_5511()
-		{
-		}
-		[Fact]
-		public void Test_5512()
-		{
-		}
-		[Fact]
-		public void Test_5513()
-		{
-		}
-		[Fact]
-		public void Test_5514()
-		{
-		}
-		[Fact]
-		public void Test_5515()
-		{
-		}
-		[Fact]
-		public void Test_5516()
-		{
-		}
-		[Fact]
-		public void Test_5517()
-		{
-		}
-		[Fact]
-		public void Test_5518()
-		{
-		}
-		[Fact]
-		public void Test_5519()
-		{
-		}
-		[Fact]
-		public void Test_5520()
-		{
-		}
-		[Fact]
-		public void Test_5521()
-		{
-		}
-		[Fact]
-		public void Test_5522()
-		{
-		}
-		[Fact]
-		public void Test_5523()
-		{
-		}
-		[Fact]
-		public void Test_5524()
-		{
-		}
-		[Fact]
-		public void Test_5525()
-		{
-		}
-		[Fact]
-		public void Test_5526()
-		{
-		}
-		[Fact]
-		public void Test_5527()
-		{
-		}
-		[Fact]
-		public void Test_5528()
-		{
-		}
-		[Fact]
-		public void Test_5529()
-		{
-		}
-		[Fact]
-		public void Test_5530()
-		{
-		}
-		[Fact]
-		public void Test_5531()
-		{
-		}
-		[Fact]
-		public void Test_5532()
-		{
-		}
-		[Fact]
-		public void Test_5533()
-		{
-		}
-		[Fact]
-		public void Test_5534()
-		{
-		}
-		[Fact]
-		public void Test_5535()
-		{
-		}
-		[Fact]
-		public void Test_5536()
-		{
-		}
-		[Fact]
-		public void Test_5537()
-		{
-		}
-		[Fact]
-		public void Test_5538()
-		{
-		}
-		[Fact]
-		public void Test_5539()
-		{
-		}
-		[Fact]
-		public void Test_5540()
-		{
-		}
-		[Fact]
-		public void Test_5541()
-		{
-		}
-		[Fact]
-		public void Test_5542()
-		{
-		}
-		[Fact]
-		public void Test_5543()
-		{
-		}
-		[Fact]
-		public void Test_5544()
-		{
-		}
-		[Fact]
-		public void Test_5545()
-		{
-		}
-		[Fact]
-		public void Test_5546()
-		{
-		}
-		[Fact]
-		public void Test_5547()
-		{
-		}
-		[Fact]
-		public void Test_5548()
-		{
-		}
-		[Fact]
-		public void Test_5549()
-		{
-		}
-		[Fact]
-		public void Test_5550()
-		{
-		}
-		[Fact]
-		public void Test_5551()
-		{
-		}
-		[Fact]
-		public void Test_5552()
-		{
-		}
-		[Fact]
-		public void Test_5553()
-		{
-		}
-		[Fact]
-		public void Test_5554()
-		{
-		}
-		[Fact]
-		public void Test_5555()
-		{
-		}
-		[Fact]
-		public void Test_5556()
-		{
-		}
-		[Fact]
-		public void Test_5557()
-		{
-		}
-		[Fact]
-		public void Test_5558()
-		{
-		}
-		[Fact]
-		public void Test_5559()
-		{
-		}
-		[Fact]
-		public void Test_5560()
-		{
-		}
-		[Fact]
-		public void Test_5561()
-		{
-		}
-		[Fact]
-		public void Test_5562()
-		{
-		}
-		[Fact]
-		public void Test_5563()
-		{
-		}
-		[Fact]
-		public void Test_5564()
-		{
-		}
-		[Fact]
-		public void Test_5565()
-		{
-		}
-		[Fact]
-		public void Test_5566()
-		{
-		}
-		[Fact]
-		public void Test_5567()
-		{
-		}
-		[Fact]
-		public void Test_5568()
-		{
-		}
-		[Fact]
-		public void Test_5569()
-		{
-		}
-		[Fact]
-		public void Test_5570()
-		{
-		}
-		[Fact]
-		public void Test_5571()
-		{
-		}
-		[Fact]
-		public void Test_5572()
-		{
-		}
-		[Fact]
-		public void Test_5573()
-		{
-		}
-		[Fact]
-		public void Test_5574()
-		{
-		}
-		[Fact]
-		public void Test_5575()
-		{
-		}
-		[Fact]
-		public void Test_5576()
-		{
-		}
-		[Fact]
-		public void Test_5577()
-		{
-		}
-		[Fact]
-		public void Test_5578()
-		{
-		}
-		[Fact]
-		public void Test_5579()
-		{
-		}
-		[Fact]
-		public void Test_5580()
-		{
-		}
-		[Fact]
-		public void Test_5581()
-		{
-		}
-		[Fact]
-		public void Test_5582()
-		{
-		}
-		[Fact]
-		public void Test_5583()
-		{
-		}
-		[Fact]
-		public void Test_5584()
-		{
-		}
-		[Fact]
-		public void Test_5585()
-		{
-		}
-		[Fact]
-		public void Test_5586()
-		{
-		}
-		[Fact]
-		public void Test_5587()
-		{
-		}
-		[Fact]
-		public void Test_5588()
-		{
-		}
-		[Fact]
-		public void Test_5589()
-		{
-		}
-		[Fact]
-		public void Test_5590()
-		{
-		}
-		[Fact]
-		public void Test_5591()
-		{
-		}
-		[Fact]
-		public void Test_5592()
-		{
-		}
-		[Fact]
-		public void Test_5593()
-		{
-		}
-		[Fact]
-		public void Test_5594()
-		{
-		}
-		[Fact]
-		public void Test_5595()
-		{
-		}
-		[Fact]
-		public void Test_5596()
-		{
-		}
-		[Fact]
-		public void Test_5597()
-		{
-		}
-		[Fact]
-		public void Test_5598()
-		{
-		}
-		[Fact]
-		public void Test_5599()
-		{
-		}
-		[Fact]
-		public void Test_5600()
-		{
-		}
-		[Fact]
-		public void Test_5601()
-		{
-		}
-		[Fact]
-		public void Test_5602()
-		{
-		}
-		[Fact]
-		public void Test_5603()
-		{
-		}
-		[Fact]
-		public void Test_5604()
-		{
-		}
-		[Fact]
-		public void Test_5605()
-		{
-		}
-		[Fact]
-		public void Test_5606()
-		{
-		}
-		[Fact]
-		public void Test_5607()
-		{
-		}
-		[Fact]
-		public void Test_5608()
-		{
-		}
-		[Fact]
-		public void Test_5609()
-		{
-		}
-		[Fact]
-		public void Test_5610()
-		{
-		}
-		[Fact]
-		public void Test_5611()
-		{
-		}
-		[Fact]
-		public void Test_5612()
-		{
-		}
-		[Fact]
-		public void Test_5613()
-		{
-		}
-		[Fact]
-		public void Test_5614()
-		{
-		}
-		[Fact]
-		public void Test_5615()
-		{
-		}
-		[Fact]
-		public void Test_5616()
-		{
-		}
-		[Fact]
-		public void Test_5617()
-		{
-		}
-		[Fact]
-		public void Test_5618()
-		{
-		}
-		[Fact]
-		public void Test_5619()
-		{
-		}
-		[Fact]
-		public void Test_5620()
-		{
-		}
-		[Fact]
-		public void Test_5621()
-		{
-		}
-		[Fact]
-		public void Test_5622()
-		{
-		}
-		[Fact]
-		public void Test_5623()
-		{
-		}
-		[Fact]
-		public void Test_5624()
-		{
-		}
-		[Fact]
-		public void Test_5625()
-		{
-		}
-		[Fact]
-		public void Test_5626()
-		{
-		}
-		[Fact]
-		public void Test_5627()
-		{
-		}
-		[Fact]
-		public void Test_5628()
-		{
-		}
-		[Fact]
-		public void Test_5629()
-		{
-		}
-		[Fact]
-		public void Test_5630()
-		{
-		}
-		[Fact]
-		public void Test_5631()
-		{
-		}
-		[Fact]
-		public void Test_5632()
-		{
-		}
-		[Fact]
-		public void Test_5633()
-		{
-		}
-		[Fact]
-		public void Test_5634()
-		{
-		}
-		[Fact]
-		public void Test_5635()
-		{
-		}
-		[Fact]
-		public void Test_5636()
-		{
-		}
-		[Fact]
-		public void Test_5637()
-		{
-		}
-		[Fact]
-		public void Test_5638()
-		{
-		}
-		[Fact]
-		public void Test_5639()
-		{
-		}
-		[Fact]
-		public void Test_5640()
-		{
-		}
-		[Fact]
-		public void Test_5641()
-		{
-		}
-		[Fact]
-		public void Test_5642()
-		{
-		}
-		[Fact]
-		public void Test_5643()
-		{
-		}
-		[Fact]
-		public void Test_5644()
-		{
-		}
-		[Fact]
-		public void Test_5645()
-		{
-		}
-		[Fact]
-		public void Test_5646()
-		{
-		}
-		[Fact]
-		public void Test_5647()
-		{
-		}
-		[Fact]
-		public void Test_5648()
-		{
-		}
-		[Fact]
-		public void Test_5649()
-		{
-		}
-		[Fact]
-		public void Test_5650()
-		{
-		}
-		[Fact]
-		public void Test_5651()
-		{
-		}
-		[Fact]
-		public void Test_5652()
-		{
-		}
-		[Fact]
-		public void Test_5653()
-		{
-		}
-		[Fact]
-		public void Test_5654()
-		{
-		}
-		[Fact]
-		public void Test_5655()
-		{
-		}
-		[Fact]
-		public void Test_5656()
-		{
-		}
-		[Fact]
-		public void Test_5657()
-		{
-		}
-		[Fact]
-		public void Test_5658()
-		{
-		}
-		[Fact]
-		public void Test_5659()
-		{
-		}
-		[Fact]
-		public void Test_5660()
-		{
-		}
-		[Fact]
-		public void Test_5661()
-		{
-		}
-		[Fact]
-		public void Test_5662()
-		{
-		}
-		[Fact]
-		public void Test_5663()
-		{
-		}
-		[Fact]
-		public void Test_5664()
-		{
-		}
-		[Fact]
-		public void Test_5665()
-		{
-		}
-		[Fact]
-		public void Test_5666()
-		{
-		}
-		[Fact]
-		public void Test_5667()
-		{
-		}
-		[Fact]
-		public void Test_5668()
-		{
-		}
-		[Fact]
-		public void Test_5669()
-		{
-		}
-		[Fact]
-		public void Test_5670()
-		{
-		}
-		[Fact]
-		public void Test_5671()
-		{
-		}
-		[Fact]
-		public void Test_5672()
-		{
-		}
-		[Fact]
-		public void Test_5673()
-		{
-		}
-		[Fact]
-		public void Test_5674()
-		{
-		}
-		[Fact]
-		public void Test_5675()
-		{
-		}
-		[Fact]
-		public void Test_5676()
-		{
-		}
-		[Fact]
-		public void Test_5677()
-		{
-		}
-		[Fact]
-		public void Test_5678()
-		{
-		}
-		[Fact]
-		public void Test_5679()
-		{
-		}
-		[Fact]
-		public void Test_5680()
-		{
-		}
-		[Fact]
-		public void Test_5681()
-		{
-		}
-		[Fact]
-		public void Test_5682()
-		{
-		}
-		[Fact]
-		public void Test_5683()
-		{
-		}
-		[Fact]
-		public void Test_5684()
-		{
-		}
-		[Fact]
-		public void Test_5685()
-		{
-		}
-		[Fact]
-		public void Test_5686()
-		{
-		}
-		[Fact]
-		public void Test_5687()
-		{
-		}
-		[Fact]
-		public void Test_5688()
-		{
-		}
-		[Fact]
-		public void Test_5689()
-		{
-		}
-		[Fact]
-		public void Test_5690()
-		{
-		}
-		[Fact]
-		public void Test_5691()
-		{
-		}
-		[Fact]
-		public void Test_5692()
-		{
-		}
-		[Fact]
-		public void Test_5693()
-		{
-		}
-		[Fact]
-		public void Test_5694()
-		{
-		}
-		[Fact]
-		public void Test_5695()
-		{
-		}
-		[Fact]
-		public void Test_5696()
-		{
-		}
-		[Fact]
-		public void Test_5697()
-		{
-		}
-		[Fact]
-		public void Test_5698()
-		{
-		}
-		[Fact]
-		public void Test_5699()
-		{
-		}
-		[Fact]
-		public void Test_5700()
-		{
-		}
-		[Fact]
-		public void Test_5701()
-		{
-		}
-		[Fact]
-		public void Test_5702()
-		{
-		}
-		[Fact]
-		public void Test_5703()
-		{
-		}
-		[Fact]
-		public void Test_5704()
-		{
-		}
-		[Fact]
-		public void Test_5705()
-		{
-		}
-		[Fact]
-		public void Test_5706()
-		{
-		}
-		[Fact]
-		public void Test_5707()
-		{
-		}
-		[Fact]
-		public void Test_5708()
-		{
-		}
-		[Fact]
-		public void Test_5709()
-		{
-		}
-		[Fact]
-		public void Test_5710()
-		{
-		}
-		[Fact]
-		public void Test_5711()
-		{
-		}
-		[Fact]
-		public void Test_5712()
-		{
-		}
-		[Fact]
-		public void Test_5713()
-		{
-		}
-		[Fact]
-		public void Test_5714()
-		{
-		}
-		[Fact]
-		public void Test_5715()
-		{
-		}
-		[Fact]
-		public void Test_5716()
-		{
-		}
-		[Fact]
-		public void Test_5717()
-		{
-		}
-		[Fact]
-		public void Test_5718()
-		{
-		}
-		[Fact]
-		public void Test_5719()
-		{
-		}
-		[Fact]
-		public void Test_5720()
-		{
-		}
-		[Fact]
-		public void Test_5721()
-		{
-		}
-		[Fact]
-		public void Test_5722()
-		{
-		}
-		[Fact]
-		public void Test_5723()
-		{
-		}
-		[Fact]
-		public void Test_5724()
-		{
-		}
-		[Fact]
-		public void Test_5725()
-		{
-		}
-		[Fact]
-		public void Test_5726()
-		{
-		}
-		[Fact]
-		public void Test_5727()
-		{
-		}
-		[Fact]
-		public void Test_5728()
-		{
-		}
-		[Fact]
-		public void Test_5729()
-		{
-		}
-		[Fact]
-		public void Test_5730()
-		{
-		}
-		[Fact]
-		public void Test_5731()
-		{
-		}
-		[Fact]
-		public void Test_5732()
-		{
-		}
-		[Fact]
-		public void Test_5733()
-		{
-		}
-		[Fact]
-		public void Test_5734()
-		{
-		}
-		[Fact]
-		public void Test_5735()
-		{
-		}
-		[Fact]
-		public void Test_5736()
-		{
-		}
-		[Fact]
-		public void Test_5737()
-		{
-		}
-		[Fact]
-		public void Test_5738()
-		{
-		}
-		[Fact]
-		public void Test_5739()
-		{
-		}
-		[Fact]
-		public void Test_5740()
-		{
-		}
-		[Fact]
-		public void Test_5741()
-		{
-		}
-		[Fact]
-		public void Test_5742()
-		{
-		}
-		[Fact]
-		public void Test_5743()
-		{
-		}
-		[Fact]
-		public void Test_5744()
-		{
-		}
-		[Fact]
-		public void Test_5745()
-		{
-		}
-		[Fact]
-		public void Test_5746()
-		{
-		}
-		[Fact]
-		public void Test_5747()
-		{
-		}
-		[Fact]
-		public void Test_5748()
-		{
-		}
-		[Fact]
-		public void Test_5749()
-		{
-		}
-		[Fact]
-		public void Test_5750()
-		{
-		}
-		[Fact]
-		public void Test_5751()
-		{
-		}
-		[Fact]
-		public void Test_5752()
-		{
-		}
-		[Fact]
-		public void Test_5753()
-		{
-		}
-		[Fact]
-		public void Test_5754()
-		{
-		}
-		[Fact]
-		public void Test_5755()
-		{
-		}
-		[Fact]
-		public void Test_5756()
-		{
-		}
-		[Fact]
-		public void Test_5757()
-		{
-		}
-		[Fact]
-		public void Test_5758()
-		{
-		}
-		[Fact]
-		public void Test_5759()
-		{
-		}
-		[Fact]
-		public void Test_5760()
-		{
-		}
-		[Fact]
-		public void Test_5761()
-		{
-		}
-		[Fact]
-		public void Test_5762()
-		{
-		}
-		[Fact]
-		public void Test_5763()
-		{
-		}
-		[Fact]
-		public void Test_5764()
-		{
-		}
-		[Fact]
-		public void Test_5765()
-		{
-		}
-		[Fact]
-		public void Test_5766()
-		{
-		}
-		[Fact]
-		public void Test_5767()
-		{
-		}
-		[Fact]
-		public void Test_5768()
-		{
-		}
-		[Fact]
-		public void Test_5769()
-		{
-		}
-		[Fact]
-		public void Test_5770()
-		{
-		}
-		[Fact]
-		public void Test_5771()
-		{
-		}
-		[Fact]
-		public void Test_5772()
-		{
-		}
-		[Fact]
-		public void Test_5773()
-		{
-		}
-		[Fact]
-		public void Test_5774()
-		{
-		}
-		[Fact]
-		public void Test_5775()
-		{
-		}
-		[Fact]
-		public void Test_5776()
-		{
-		}
-		[Fact]
-		public void Test_5777()
-		{
-		}
-		[Fact]
-		public void Test_5778()
-		{
-		}
-		[Fact]
-		public void Test_5779()
-		{
-		}
-		[Fact]
-		public void Test_5780()
-		{
-		}
-		[Fact]
-		public void Test_5781()
-		{
-		}
-		[Fact]
-		public void Test_5782()
-		{
-		}
-		[Fact]
-		public void Test_5783()
-		{
-		}
-		[Fact]
-		public void Test_5784()
-		{
-		}
-		[Fact]
-		public void Test_5785()
-		{
-		}
-		[Fact]
-		public void Test_5786()
-		{
-		}
-		[Fact]
-		public void Test_5787()
-		{
-		}
-		[Fact]
-		public void Test_5788()
-		{
-		}
-		[Fact]
-		public void Test_5789()
-		{
-		}
-		[Fact]
-		public void Test_5790()
-		{
-		}
-		[Fact]
-		public void Test_5791()
-		{
-		}
-		[Fact]
-		public void Test_5792()
-		{
-		}
-		[Fact]
-		public void Test_5793()
-		{
-		}
-		[Fact]
-		public void Test_5794()
-		{
-		}
-		[Fact]
-		public void Test_5795()
-		{
-		}
-		[Fact]
-		public void Test_5796()
-		{
-		}
-		[Fact]
-		public void Test_5797()
-		{
-		}
-		[Fact]
-		public void Test_5798()
-		{
-		}
-		[Fact]
-		public void Test_5799()
-		{
-		}
-		[Fact]
-		public void Test_5800()
-		{
-		}
-		[Fact]
-		public void Test_5801()
-		{
-		}
-		[Fact]
-		public void Test_5802()
-		{
-		}
-		[Fact]
-		public void Test_5803()
-		{
-		}
-		[Fact]
-		public void Test_5804()
-		{
-		}
-		[Fact]
-		public void Test_5805()
-		{
-		}
-		[Fact]
-		public void Test_5806()
-		{
-		}
-		[Fact]
-		public void Test_5807()
-		{
-		}
-		[Fact]
-		public void Test_5808()
-		{
-		}
-		[Fact]
-		public void Test_5809()
-		{
-		}
-		[Fact]
-		public void Test_5810()
-		{
-		}
-		[Fact]
-		public void Test_5811()
-		{
-		}
-		[Fact]
-		public void Test_5812()
-		{
-		}
-		[Fact]
-		public void Test_5813()
-		{
-		}
-		[Fact]
-		public void Test_5814()
-		{
-		}
-		[Fact]
-		public void Test_5815()
-		{
-		}
-		[Fact]
-		public void Test_5816()
-		{
-		}
-		[Fact]
-		public void Test_5817()
-		{
-		}
-		[Fact]
-		public void Test_5818()
-		{
-		}
-		[Fact]
-		public void Test_5819()
-		{
-		}
-		[Fact]
-		public void Test_5820()
-		{
-		}
-		[Fact]
-		public void Test_5821()
-		{
-		}
-		[Fact]
-		public void Test_5822()
-		{
-		}
-		[Fact]
-		public void Test_5823()
-		{
-		}
-		[Fact]
-		public void Test_5824()
-		{
-		}
-		[Fact]
-		public void Test_5825()
-		{
-		}
-		[Fact]
-		public void Test_5826()
-		{
-		}
-		[Fact]
-		public void Test_5827()
-		{
-		}
-		[Fact]
-		public void Test_5828()
-		{
-		}
-		[Fact]
-		public void Test_5829()
-		{
-		}
-		[Fact]
-		public void Test_5830()
-		{
-		}
-		[Fact]
-		public void Test_5831()
-		{
-		}
-		[Fact]
-		public void Test_5832()
-		{
-		}
-		[Fact]
-		public void Test_5833()
-		{
-		}
-		[Fact]
-		public void Test_5834()
-		{
-		}
-		[Fact]
-		public void Test_5835()
-		{
-		}
-		[Fact]
-		public void Test_5836()
-		{
-		}
-		[Fact]
-		public void Test_5837()
-		{
-		}
-		[Fact]
-		public void Test_5838()
-		{
-		}
-		[Fact]
-		public void Test_5839()
-		{
-		}
-		[Fact]
-		public void Test_5840()
-		{
-		}
-		[Fact]
-		public void Test_5841()
-		{
-		}
-		[Fact]
-		public void Test_5842()
-		{
-		}
-		[Fact]
-		public void Test_5843()
-		{
-		}
-		[Fact]
-		public void Test_5844()
-		{
-		}
-		[Fact]
-		public void Test_5845()
-		{
-		}
-		[Fact]
-		public void Test_5846()
-		{
-		}
-		[Fact]
-		public void Test_5847()
-		{
-		}
-		[Fact]
-		public void Test_5848()
-		{
-		}
-		[Fact]
-		public void Test_5849()
-		{
-		}
-		[Fact]
-		public void Test_5850()
-		{
-		}
-		[Fact]
-		public void Test_5851()
-		{
-		}
-		[Fact]
-		public void Test_5852()
-		{
-		}
-		[Fact]
-		public void Test_5853()
-		{
-		}
-		[Fact]
-		public void Test_5854()
-		{
-		}
-		[Fact]
-		public void Test_5855()
-		{
-		}
-		[Fact]
-		public void Test_5856()
-		{
-		}
-		[Fact]
-		public void Test_5857()
-		{
-		}
-		[Fact]
-		public void Test_5858()
-		{
-		}
-		[Fact]
-		public void Test_5859()
-		{
-		}
-		[Fact]
-		public void Test_5860()
-		{
-		}
-		[Fact]
-		public void Test_5861()
-		{
-		}
-		[Fact]
-		public void Test_5862()
-		{
-		}
-		[Fact]
-		public void Test_5863()
-		{
-		}
-		[Fact]
-		public void Test_5864()
-		{
-		}
-		[Fact]
-		public void Test_5865()
-		{
-		}
-		[Fact]
-		public void Test_5866()
-		{
-		}
-		[Fact]
-		public void Test_5867()
-		{
-		}
-		[Fact]
-		public void Test_5868()
-		{
-		}
-		[Fact]
-		public void Test_5869()
-		{
-		}
-		[Fact]
-		public void Test_5870()
-		{
-		}
-		[Fact]
-		public void Test_5871()
-		{
-		}
-		[Fact]
-		public void Test_5872()
-		{
-		}
-		[Fact]
-		public void Test_5873()
-		{
-		}
-		[Fact]
-		public void Test_5874()
-		{
-		}
-		[Fact]
-		public void Test_5875()
-		{
-		}
-		[Fact]
-		public void Test_5876()
-		{
-		}
-		[Fact]
-		public void Test_5877()
-		{
-		}
-		[Fact]
-		public void Test_5878()
-		{
-		}
-		[Fact]
-		public void Test_5879()
-		{
-		}
-		[Fact]
-		public void Test_5880()
-		{
-		}
-		[Fact]
-		public void Test_5881()
-		{
-		}
-		[Fact]
-		public void Test_5882()
-		{
-		}
-		[Fact]
-		public void Test_5883()
-		{
-		}
-		[Fact]
-		public void Test_5884()
-		{
-		}
-		[Fact]
-		public void Test_5885()
-		{
-		}
-		[Fact]
-		public void Test_5886()
-		{
-		}
-		[Fact]
-		public void Test_5887()
-		{
-		}
-		[Fact]
-		public void Test_5888()
-		{
-		}
-		[Fact]
-		public void Test_5889()
-		{
-		}
-		[Fact]
-		public void Test_5890()
-		{
-		}
-		[Fact]
-		public void Test_5891()
-		{
-		}
-		[Fact]
-		public void Test_5892()
-		{
-		}
-		[Fact]
-		public void Test_5893()
-		{
-		}
-		[Fact]
-		public void Test_5894()
-		{
-		}
-		[Fact]
-		public void Test_5895()
-		{
-		}
-		[Fact]
-		public void Test_5896()
-		{
-		}
-		[Fact]
-		public void Test_5897()
-		{
-		}
-		[Fact]
-		public void Test_5898()
-		{
-		}
-		[Fact]
-		public void Test_5899()
-		{
-		}
-		[Fact]
-		public void Test_5900()
-		{
-		}
-		[Fact]
-		public void Test_5901()
-		{
-		}
-		[Fact]
-		public void Test_5902()
-		{
-		}
-		[Fact]
-		public void Test_5903()
-		{
-		}
-		[Fact]
-		public void Test_5904()
-		{
-		}
-		[Fact]
-		public void Test_5905()
-		{
-		}
-		[Fact]
-		public void Test_5906()
-		{
-		}
-		[Fact]
-		public void Test_5907()
-		{
-		}
-		[Fact]
-		public void Test_5908()
-		{
-		}
-		[Fact]
-		public void Test_5909()
-		{
-		}
-		[Fact]
-		public void Test_5910()
-		{
-		}
-		[Fact]
-		public void Test_5911()
-		{
-		}
-		[Fact]
-		public void Test_5912()
-		{
-		}
-		[Fact]
-		public void Test_5913()
-		{
-		}
-		[Fact]
-		public void Test_5914()
-		{
-		}
-		[Fact]
-		public void Test_5915()
-		{
-		}
-		[Fact]
-		public void Test_5916()
-		{
-		}
-		[Fact]
-		public void Test_5917()
-		{
-		}
-		[Fact]
-		public void Test_5918()
-		{
-		}
-		[Fact]
-		public void Test_5919()
-		{
-		}
-		[Fact]
-		public void Test_5920()
-		{
-		}
-		[Fact]
-		public void Test_5921()
-		{
-		}
-		[Fact]
-		public void Test_5922()
-		{
-		}
-		[Fact]
-		public void Test_5923()
-		{
-		}
-		[Fact]
-		public void Test_5924()
-		{
-		}
-		[Fact]
-		public void Test_5925()
-		{
-		}
-		[Fact]
-		public void Test_5926()
-		{
-		}
-		[Fact]
-		public void Test_5927()
-		{
-		}
-		[Fact]
-		public void Test_5928()
-		{
-		}
-		[Fact]
-		public void Test_5929()
-		{
-		}
-		[Fact]
-		public void Test_5930()
-		{
-		}
-		[Fact]
-		public void Test_5931()
-		{
-		}
-		[Fact]
-		public void Test_5932()
-		{
-		}
-		[Fact]
-		public void Test_5933()
-		{
-		}
-		[Fact]
-		public void Test_5934()
-		{
-		}
-		[Fact]
-		public void Test_5935()
-		{
-		}
-		[Fact]
-		public void Test_5936()
-		{
-		}
-		[Fact]
-		public void Test_5937()
-		{
-		}
-		[Fact]
-		public void Test_5938()
-		{
-		}
-		[Fact]
-		public void Test_5939()
-		{
-		}
-		[Fact]
-		public void Test_5940()
-		{
-		}
-		[Fact]
-		public void Test_5941()
-		{
-		}
-		[Fact]
-		public void Test_5942()
-		{
-		}
-		[Fact]
-		public void Test_5943()
-		{
-		}
-		[Fact]
-		public void Test_5944()
-		{
-		}
-		[Fact]
-		public void Test_5945()
-		{
-		}
-		[Fact]
-		public void Test_5946()
-		{
-		}
-		[Fact]
-		public void Test_5947()
-		{
-		}
-		[Fact]
-		public void Test_5948()
-		{
-		}
-		[Fact]
-		public void Test_5949()
-		{
-		}
-		[Fact]
-		public void Test_5950()
-		{
-		}
-		[Fact]
-		public void Test_5951()
-		{
-		}
-		[Fact]
-		public void Test_5952()
-		{
-		}
-		[Fact]
-		public void Test_5953()
-		{
-		}
-		[Fact]
-		public void Test_5954()
-		{
-		}
-		[Fact]
-		public void Test_5955()
-		{
-		}
-		[Fact]
-		public void Test_5956()
-		{
-		}
-		[Fact]
-		public void Test_5957()
-		{
-		}
-		[Fact]
-		public void Test_5958()
-		{
-		}
-		[Fact]
-		public void Test_5959()
-		{
-		}
-		[Fact]
-		public void Test_5960()
-		{
-		}
-		[Fact]
-		public void Test_5961()
-		{
-		}
-		[Fact]
-		public void Test_5962()
-		{
-		}
-		[Fact]
-		public void Test_5963()
-		{
-		}
-		[Fact]
-		public void Test_5964()
-		{
-		}
-		[Fact]
-		public void Test_5965()
-		{
-		}
-		[Fact]
-		public void Test_5966()
-		{
-		}
-		[Fact]
-		public void Test_5967()
-		{
-		}
-		[Fact]
-		public void Test_5968()
-		{
-		}
-		[Fact]
-		public void Test_5969()
-		{
-		}
-		[Fact]
-		public void Test_5970()
-		{
-		}
-		[Fact]
-		public void Test_5971()
-		{
-		}
-		[Fact]
-		public void Test_5972()
-		{
-		}
-		[Fact]
-		public void Test_5973()
-		{
-		}
-		[Fact]
-		public void Test_5974()
-		{
-		}
-		[Fact]
-		public void Test_5975()
-		{
-		}
-		[Fact]
-		public void Test_5976()
-		{
-		}
-		[Fact]
-		public void Test_5977()
-		{
-		}
-		[Fact]
-		public void Test_5978()
-		{
-		}
-		[Fact]
-		public void Test_5979()
-		{
-		}
-		[Fact]
-		public void Test_5980()
-		{
-		}
-		[Fact]
-		public void Test_5981()
-		{
-		}
-		[Fact]
-		public void Test_5982()
-		{
-		}
-		[Fact]
-		public void Test_5983()
-		{
-		}
-		[Fact]
-		public void Test_5984()
-		{
-		}
-		[Fact]
-		public void Test_5985()
-		{
-		}
-		[Fact]
-		public void Test_5986()
-		{
-		}
-		[Fact]
-		public void Test_5987()
-		{
-		}
-		[Fact]
-		public void Test_5988()
-		{
-		}
-		[Fact]
-		public void Test_5989()
-		{
-		}
-		[Fact]
-		public void Test_5990()
-		{
-		}
-		[Fact]
-		public void Test_5991()
-		{
-		}
-		[Fact]
-		public void Test_5992()
-		{
-		}
-		[Fact]
-		public void Test_5993()
-		{
-		}
-		[Fact]
-		public void Test_5994()
-		{
-		}
-		[Fact]
-		public void Test_5995()
-		{
-		}
-		[Fact]
-		public void Test_5996()
-		{
-		}
-		[Fact]
-		public void Test_5997()
-		{
-		}
-		[Fact]
-		public void Test_5998()
-		{
-		}
-		[Fact]
-		public void Test_5999()
-		{
-		}
-		[Fact]
-		public void Test_6000()
-		{
-		}
-		[Fact]
-		public void Test_6001()
-		{
-		}
-		[Fact]
-		public void Test_6002()
-		{
-		}
-		[Fact]
-		public void Test_6003()
-		{
-		}
-		[Fact]
-		public void Test_6004()
-		{
-		}
-		[Fact]
-		public void Test_6005()
-		{
-		}
-		[Fact]
-		public void Test_6006()
-		{
-		}
-		[Fact]
-		public void Test_6007()
-		{
-		}
-		[Fact]
-		public void Test_6008()
-		{
-		}
-		[Fact]
-		public void Test_6009()
-		{
-		}
-		[Fact]
-		public void Test_6010()
-		{
-		}
-		[Fact]
-		public void Test_6011()
-		{
-		}
-		[Fact]
-		public void Test_6012()
-		{
-		}
-		[Fact]
-		public void Test_6013()
-		{
-		}
-		[Fact]
-		public void Test_6014()
-		{
-		}
-		[Fact]
-		public void Test_6015()
-		{
-		}
-		[Fact]
-		public void Test_6016()
-		{
-		}
-		[Fact]
-		public void Test_6017()
-		{
-		}
-		[Fact]
-		public void Test_6018()
-		{
-		}
-		[Fact]
-		public void Test_6019()
-		{
-		}
-		[Fact]
-		public void Test_6020()
-		{
-		}
-		[Fact]
-		public void Test_6021()
-		{
-		}
-		[Fact]
-		public void Test_6022()
-		{
-		}
-		[Fact]
-		public void Test_6023()
-		{
-		}
-		[Fact]
-		public void Test_6024()
-		{
-		}
-		[Fact]
-		public void Test_6025()
-		{
-		}
-		[Fact]
-		public void Test_6026()
-		{
-		}
-		[Fact]
-		public void Test_6027()
-		{
-		}
-		[Fact]
-		public void Test_6028()
-		{
-		}
-		[Fact]
-		public void Test_6029()
-		{
-		}
-		[Fact]
-		public void Test_6030()
-		{
-		}
-		[Fact]
-		public void Test_6031()
-		{
-		}
-		[Fact]
-		public void Test_6032()
-		{
-		}
-		[Fact]
-		public void Test_6033()
-		{
-		}
-		[Fact]
-		public void Test_6034()
-		{
-		}
-		[Fact]
-		public void Test_6035()
-		{
-		}
-		[Fact]
-		public void Test_6036()
-		{
-		}
-		[Fact]
-		public void Test_6037()
-		{
-		}
-		[Fact]
-		public void Test_6038()
-		{
-		}
-		[Fact]
-		public void Test_6039()
-		{
-		}
-		[Fact]
-		public void Test_6040()
-		{
-		}
-		[Fact]
-		public void Test_6041()
-		{
-		}
-		[Fact]
-		public void Test_6042()
-		{
-		}
-		[Fact]
-		public void Test_6043()
-		{
-		}
-		[Fact]
-		public void Test_6044()
-		{
-		}
-		[Fact]
-		public void Test_6045()
-		{
-		}
-		[Fact]
-		public void Test_6046()
-		{
-		}
-		[Fact]
-		public void Test_6047()
-		{
-		}
-		[Fact]
-		public void Test_6048()
-		{
-		}
-		[Fact]
-		public void Test_6049()
-		{
-		}
-		[Fact]
-		public void Test_6050()
-		{
-		}
-		[Fact]
-		public void Test_6051()
-		{
-		}
-		[Fact]
-		public void Test_6052()
-		{
-		}
-		[Fact]
-		public void Test_6053()
-		{
-		}
-		[Fact]
-		public void Test_6054()
-		{
-		}
-		[Fact]
-		public void Test_6055()
-		{
-		}
-		[Fact]
-		public void Test_6056()
-		{
-		}
-		[Fact]
-		public void Test_6057()
-		{
-		}
-		[Fact]
-		public void Test_6058()
-		{
-		}
-		[Fact]
-		public void Test_6059()
-		{
-		}
-		[Fact]
-		public void Test_6060()
-		{
-		}
-		[Fact]
-		public void Test_6061()
-		{
-		}
-		[Fact]
-		public void Test_6062()
-		{
-		}
-		[Fact]
-		public void Test_6063()
-		{
-		}
-		[Fact]
-		public void Test_6064()
-		{
-		}
-		[Fact]
-		public void Test_6065()
-		{
-		}
-		[Fact]
-		public void Test_6066()
-		{
-		}
-		[Fact]
-		public void Test_6067()
-		{
-		}
-		[Fact]
-		public void Test_6068()
-		{
-		}
-		[Fact]
-		public void Test_6069()
-		{
-		}
-		[Fact]
-		public void Test_6070()
-		{
-		}
-		[Fact]
-		public void Test_6071()
-		{
-		}
-		[Fact]
-		public void Test_6072()
-		{
-		}
-		[Fact]
-		public void Test_6073()
-		{
-		}
-		[Fact]
-		public void Test_6074()
-		{
-		}
-		[Fact]
-		public void Test_6075()
-		{
-		}
-		[Fact]
-		public void Test_6076()
-		{
-		}
-		[Fact]
-		public void Test_6077()
-		{
-		}
-		[Fact]
-		public void Test_6078()
-		{
-		}
-		[Fact]
-		public void Test_6079()
-		{
-		}
-		[Fact]
-		public void Test_6080()
-		{
-		}
-		[Fact]
-		public void Test_6081()
-		{
-		}
-		[Fact]
-		public void Test_6082()
-		{
-		}
-		[Fact]
-		public void Test_6083()
-		{
-		}
-		[Fact]
-		public void Test_6084()
-		{
-		}
-		[Fact]
-		public void Test_6085()
-		{
-		}
-		[Fact]
-		public void Test_6086()
-		{
-		}
-		[Fact]
-		public void Test_6087()
-		{
-		}
-		[Fact]
-		public void Test_6088()
-		{
-		}
-		[Fact]
-		public void Test_6089()
-		{
-		}
-		[Fact]
-		public void Test_6090()
-		{
-		}
-		[Fact]
-		public void Test_6091()
-		{
-		}
-		[Fact]
-		public void Test_6092()
-		{
-		}
-		[Fact]
-		public void Test_6093()
-		{
-		}
-		[Fact]
-		public void Test_6094()
-		{
-		}
-		[Fact]
-		public void Test_6095()
-		{
-		}
-		[Fact]
-		public void Test_6096()
-		{
-		}
-		[Fact]
-		public void Test_6097()
-		{
-		}
-		[Fact]
-		public void Test_6098()
-		{
-		}
-		[Fact]
-		public void Test_6099()
-		{
-		}
-		[Fact]
-		public void Test_6100()
-		{
-		}
-		[Fact]
-		public void Test_6101()
-		{
-		}
-		[Fact]
-		public void Test_6102()
-		{
-		}
-		[Fact]
-		public void Test_6103()
-		{
-		}
-		[Fact]
-		public void Test_6104()
-		{
-		}
-		[Fact]
-		public void Test_6105()
-		{
-		}
-		[Fact]
-		public void Test_6106()
-		{
-		}
-		[Fact]
-		public void Test_6107()
-		{
-		}
-		[Fact]
-		public void Test_6108()
-		{
-		}
-		[Fact]
-		public void Test_6109()
-		{
-		}
-		[Fact]
-		public void Test_6110()
-		{
-		}
-		[Fact]
-		public void Test_6111()
-		{
-		}
-		[Fact]
-		public void Test_6112()
-		{
-		}
-		[Fact]
-		public void Test_6113()
-		{
-		}
-		[Fact]
-		public void Test_6114()
-		{
-		}
-		[Fact]
-		public void Test_6115()
-		{
-		}
-		[Fact]
-		public void Test_6116()
-		{
-		}
-		[Fact]
-		public void Test_6117()
-		{
-		}
-		[Fact]
-		public void Test_6118()
-		{
-		}
-		[Fact]
-		public void Test_6119()
-		{
-		}
-		[Fact]
-		public void Test_6120()
-		{
-		}
-		[Fact]
-		public void Test_6121()
-		{
-		}
-		[Fact]
-		public void Test_6122()
-		{
-		}
-		[Fact]
-		public void Test_6123()
-		{
-		}
-		[Fact]
-		public void Test_6124()
-		{
-		}
-		[Fact]
-		public void Test_6125()
-		{
-		}
-		[Fact]
-		public void Test_6126()
-		{
-		}
-		[Fact]
-		public void Test_6127()
-		{
-		}
-		[Fact]
-		public void Test_6128()
-		{
-		}
-		[Fact]
-		public void Test_6129()
-		{
-		}
-		[Fact]
-		public void Test_6130()
-		{
-		}
-		[Fact]
-		public void Test_6131()
-		{
-		}
-		[Fact]
-		public void Test_6132()
-		{
-		}
-		[Fact]
-		public void Test_6133()
-		{
-		}
-		[Fact]
-		public void Test_6134()
-		{
-		}
-		[Fact]
-		public void Test_6135()
-		{
-		}
-		[Fact]
-		public void Test_6136()
-		{
-		}
-		[Fact]
-		public void Test_6137()
-		{
-		}
-		[Fact]
-		public void Test_6138()
-		{
-		}
-		[Fact]
-		public void Test_6139()
-		{
-		}
-		[Fact]
-		public void Test_6140()
-		{
-		}
-		[Fact]
-		public void Test_6141()
-		{
-		}
-		[Fact]
-		public void Test_6142()
-		{
-		}
-		[Fact]
-		public void Test_6143()
-		{
-		}
-		[Fact]
-		public void Test_6144()
-		{
-		}
-		[Fact]
-		public void Test_6145()
-		{
-		}
-		[Fact]
-		public void Test_6146()
-		{
-		}
-		[Fact]
-		public void Test_6147()
-		{
-		}
-		[Fact]
-		public void Test_6148()
-		{
-		}
-		[Fact]
-		public void Test_6149()
-		{
-		}
-		[Fact]
-		public void Test_6150()
-		{
-		}
-		[Fact]
-		public void Test_6151()
-		{
-		}
-		[Fact]
-		public void Test_6152()
-		{
-		}
-		[Fact]
-		public void Test_6153()
-		{
-		}
-		[Fact]
-		public void Test_6154()
-		{
-		}
-		[Fact]
-		public void Test_6155()
-		{
-		}
-		[Fact]
-		public void Test_6156()
-		{
-		}
-		[Fact]
-		public void Test_6157()
-		{
-		}
-		[Fact]
-		public void Test_6158()
-		{
-		}
-		[Fact]
-		public void Test_6159()
-		{
-		}
-		[Fact]
-		public void Test_6160()
-		{
-		}
-		[Fact]
-		public void Test_6161()
-		{
-		}
-		[Fact]
-		public void Test_6162()
-		{
-		}
-		[Fact]
-		public void Test_6163()
-		{
-		}
-		[Fact]
-		public void Test_6164()
-		{
-		}
-		[Fact]
-		public void Test_6165()
-		{
-		}
-		[Fact]
-		public void Test_6166()
-		{
-		}
-		[Fact]
-		public void Test_6167()
-		{
-		}
-		[Fact]
-		public void Test_6168()
-		{
-		}
-		[Fact]
-		public void Test_6169()
-		{
-		}
-		[Fact]
-		public void Test_6170()
-		{
-		}
-		[Fact]
-		public void Test_6171()
-		{
-		}
-		[Fact]
-		public void Test_6172()
-		{
-		}
-		[Fact]
-		public void Test_6173()
-		{
-		}
-		[Fact]
-		public void Test_6174()
-		{
-		}
-		[Fact]
-		public void Test_6175()
-		{
-		}
-		[Fact]
-		public void Test_6176()
-		{
-		}
-		[Fact]
-		public void Test_6177()
-		{
-		}
-		[Fact]
-		public void Test_6178()
-		{
-		}
-		[Fact]
-		public void Test_6179()
-		{
-		}
-		[Fact]
-		public void Test_6180()
-		{
-		}
-		[Fact]
-		public void Test_6181()
-		{
-		}
-		[Fact]
-		public void Test_6182()
-		{
-		}
-		[Fact]
-		public void Test_6183()
-		{
-		}
-		[Fact]
-		public void Test_6184()
-		{
-		}
-		[Fact]
-		public void Test_6185()
-		{
-		}
-		[Fact]
-		public void Test_6186()
-		{
-		}
-		[Fact]
-		public void Test_6187()
-		{
-		}
-		[Fact]
-		public void Test_6188()
-		{
-		}
-		[Fact]
-		public void Test_6189()
-		{
-		}
-		[Fact]
-		public void Test_6190()
-		{
-		}
-		[Fact]
-		public void Test_6191()
-		{
-		}
-		[Fact]
-		public void Test_6192()
-		{
-		}
-		[Fact]
-		public void Test_6193()
-		{
-		}
-		[Fact]
-		public void Test_6194()
-		{
-		}
-		[Fact]
-		public void Test_6195()
-		{
-		}
-		[Fact]
-		public void Test_6196()
-		{
-		}
-		[Fact]
-		public void Test_6197()
-		{
-		}
-		[Fact]
-		public void Test_6198()
-		{
-		}
-		[Fact]
-		public void Test_6199()
-		{
-		}
-		[Fact]
-		public void Test_6200()
-		{
-		}
-		[Fact]
-		public void Test_6201()
-		{
-		}
-		[Fact]
-		public void Test_6202()
-		{
-		}
-		[Fact]
-		public void Test_6203()
-		{
-		}
-		[Fact]
-		public void Test_6204()
-		{
-		}
-		[Fact]
-		public void Test_6205()
-		{
-		}
-		[Fact]
-		public void Test_6206()
-		{
-		}
-		[Fact]
-		public void Test_6207()
-		{
-		}
-		[Fact]
-		public void Test_6208()
-		{
-		}
-		[Fact]
-		public void Test_6209()
-		{
-		}
-		[Fact]
-		public void Test_6210()
-		{
-		}
-		[Fact]
-		public void Test_6211()
-		{
-		}
-		[Fact]
-		public void Test_6212()
-		{
-		}
-		[Fact]
-		public void Test_6213()
-		{
-		}
-		[Fact]
-		public void Test_6214()
-		{
-		}
-		[Fact]
-		public void Test_6215()
-		{
-		}
-		[Fact]
-		public void Test_6216()
-		{
-		}
-		[Fact]
-		public void Test_6217()
-		{
-		}
-		[Fact]
-		public void Test_6218()
-		{
-		}
-		[Fact]
-		public void Test_6219()
-		{
-		}
-		[Fact]
-		public void Test_6220()
-		{
-		}
-		[Fact]
-		public void Test_6221()
-		{
-		}
-		[Fact]
-		public void Test_6222()
-		{
-		}
-		[Fact]
-		public void Test_6223()
-		{
-		}
-		[Fact]
-		public void Test_6224()
-		{
-		}
-		[Fact]
-		public void Test_6225()
-		{
-		}
-		[Fact]
-		public void Test_6226()
-		{
-		}
-		[Fact]
-		public void Test_6227()
-		{
-		}
-		[Fact]
-		public void Test_6228()
-		{
-		}
-		[Fact]
-		public void Test_6229()
-		{
-		}
-		[Fact]
-		public void Test_6230()
-		{
-		}
-		[Fact]
-		public void Test_6231()
-		{
-		}
-		[Fact]
-		public void Test_6232()
-		{
-		}
-		[Fact]
-		public void Test_6233()
-		{
-		}
-		[Fact]
-		public void Test_6234()
-		{
-		}
-		[Fact]
-		public void Test_6235()
-		{
-		}
-		[Fact]
-		public void Test_6236()
-		{
-		}
-		[Fact]
-		public void Test_6237()
-		{
-		}
-		[Fact]
-		public void Test_6238()
-		{
-		}
-		[Fact]
-		public void Test_6239()
-		{
-		}
-		[Fact]
-		public void Test_6240()
-		{
-		}
-		[Fact]
-		public void Test_6241()
-		{
-		}
-		[Fact]
-		public void Test_6242()
-		{
-		}
-		[Fact]
-		public void Test_6243()
-		{
-		}
-		[Fact]
-		public void Test_6244()
-		{
-		}
-		[Fact]
-		public void Test_6245()
-		{
-		}
-		[Fact]
-		public void Test_6246()
-		{
-		}
-		[Fact]
-		public void Test_6247()
-		{
-		}
-		[Fact]
-		public void Test_6248()
-		{
-		}
-		[Fact]
-		public void Test_6249()
-		{
-		}
-		[Fact]
-		public void Test_6250()
-		{
-		}
-		[Fact]
-		public void Test_6251()
-		{
-		}
-		[Fact]
-		public void Test_6252()
-		{
-		}
-		[Fact]
-		public void Test_6253()
-		{
-		}
-		[Fact]
-		public void Test_6254()
-		{
-		}
-		[Fact]
-		public void Test_6255()
-		{
-		}
-		[Fact]
-		public void Test_6256()
-		{
-		}
-		[Fact]
-		public void Test_6257()
-		{
-		}
-		[Fact]
-		public void Test_6258()
-		{
-		}
-		[Fact]
-		public void Test_6259()
-		{
-		}
-		[Fact]
-		public void Test_6260()
-		{
-		}
-		[Fact]
-		public void Test_6261()
-		{
-		}
-		[Fact]
-		public void Test_6262()
-		{
-		}
-		[Fact]
-		public void Test_6263()
-		{
-		}
-		[Fact]
-		public void Test_6264()
-		{
-		}
-		[Fact]
-		public void Test_6265()
-		{
-		}
-		[Fact]
-		public void Test_6266()
-		{
-		}
-		[Fact]
-		public void Test_6267()
-		{
-		}
-		[Fact]
-		public void Test_6268()
-		{
-		}
-		[Fact]
-		public void Test_6269()
-		{
-		}
-		[Fact]
-		public void Test_6270()
-		{
-		}
-		[Fact]
-		public void Test_6271()
-		{
-		}
-		[Fact]
-		public void Test_6272()
-		{
-		}
-		[Fact]
-		public void Test_6273()
-		{
-		}
-		[Fact]
-		public void Test_6274()
-		{
-		}
-		[Fact]
-		public void Test_6275()
-		{
-		}
-		[Fact]
-		public void Test_6276()
-		{
-		}
-		[Fact]
-		public void Test_6277()
-		{
-		}
-		[Fact]
-		public void Test_6278()
-		{
-		}
-		[Fact]
-		public void Test_6279()
-		{
-		}
-		[Fact]
-		public void Test_6280()
-		{
-		}
-		[Fact]
-		public void Test_6281()
-		{
-		}
-		[Fact]
-		public void Test_6282()
-		{
-		}
-		[Fact]
-		public void Test_6283()
-		{
-		}
-		[Fact]
-		public void Test_6284()
-		{
-		}
-		[Fact]
-		public void Test_6285()
-		{
-		}
-		[Fact]
-		public void Test_6286()
-		{
-		}
-		[Fact]
-		public void Test_6287()
-		{
-		}
-		[Fact]
-		public void Test_6288()
-		{
-		}
-		[Fact]
-		public void Test_6289()
-		{
-		}
-		[Fact]
-		public void Test_6290()
-		{
-		}
-		[Fact]
-		public void Test_6291()
-		{
-		}
-		[Fact]
-		public void Test_6292()
-		{
-		}
-		[Fact]
-		public void Test_6293()
-		{
-		}
-		[Fact]
-		public void Test_6294()
-		{
-		}
-		[Fact]
-		public void Test_6295()
-		{
-		}
-		[Fact]
-		public void Test_6296()
-		{
-		}
-		[Fact]
-		public void Test_6297()
-		{
-		}
-		[Fact]
-		public void Test_6298()
-		{
-		}
-		[Fact]
-		public void Test_6299()
-		{
-		}
-		[Fact]
-		public void Test_6300()
-		{
-		}
-		[Fact]
-		public void Test_6301()
-		{
-		}
-		[Fact]
-		public void Test_6302()
-		{
-		}
-		[Fact]
-		public void Test_6303()
-		{
-		}
-		[Fact]
-		public void Test_6304()
-		{
-		}
-		[Fact]
-		public void Test_6305()
-		{
-		}
-		[Fact]
-		public void Test_6306()
-		{
-		}
-		[Fact]
-		public void Test_6307()
-		{
-		}
-		[Fact]
-		public void Test_6308()
-		{
-		}
-		[Fact]
-		public void Test_6309()
-		{
-		}
-		[Fact]
-		public void Test_6310()
-		{
-		}
-		[Fact]
-		public void Test_6311()
-		{
-		}
-		[Fact]
-		public void Test_6312()
-		{
-		}
-		[Fact]
-		public void Test_6313()
-		{
-		}
-		[Fact]
-		public void Test_6314()
-		{
-		}
-		[Fact]
-		public void Test_6315()
-		{
-		}
-		[Fact]
-		public void Test_6316()
-		{
-		}
-		[Fact]
-		public void Test_6317()
-		{
-		}
-		[Fact]
-		public void Test_6318()
-		{
-		}
-		[Fact]
-		public void Test_6319()
-		{
-		}
-		[Fact]
-		public void Test_6320()
-		{
-		}
-		[Fact]
-		public void Test_6321()
-		{
-		}
-		[Fact]
-		public void Test_6322()
-		{
-		}
-		[Fact]
-		public void Test_6323()
-		{
-		}
-		[Fact]
-		public void Test_6324()
-		{
-		}
-		[Fact]
-		public void Test_6325()
-		{
-		}
-		[Fact]
-		public void Test_6326()
-		{
-		}
-		[Fact]
-		public void Test_6327()
-		{
-		}
-		[Fact]
-		public void Test_6328()
-		{
-		}
-		[Fact]
-		public void Test_6329()
-		{
-		}
-		[Fact]
-		public void Test_6330()
-		{
-		}
-		[Fact]
-		public void Test_6331()
-		{
-		}
-		[Fact]
-		public void Test_6332()
-		{
-		}
-		[Fact]
-		public void Test_6333()
-		{
-		}
-		[Fact]
-		public void Test_6334()
-		{
-		}
-		[Fact]
-		public void Test_6335()
-		{
-		}
-		[Fact]
-		public void Test_6336()
-		{
-		}
-		[Fact]
-		public void Test_6337()
-		{
-		}
-		[Fact]
-		public void Test_6338()
-		{
-		}
-		[Fact]
-		public void Test_6339()
-		{
-		}
-		[Fact]
-		public void Test_6340()
-		{
-		}
-		[Fact]
-		public void Test_6341()
-		{
-		}
-		[Fact]
-		public void Test_6342()
-		{
-		}
-		[Fact]
-		public void Test_6343()
-		{
-		}
-		[Fact]
-		public void Test_6344()
-		{
-		}
-		[Fact]
-		public void Test_6345()
-		{
-		}
-		[Fact]
-		public void Test_6346()
-		{
-		}
-		[Fact]
-		public void Test_6347()
-		{
-		}
-		[Fact]
-		public void Test_6348()
-		{
-		}
-		[Fact]
-		public void Test_6349()
-		{
-		}
-		[Fact]
-		public void Test_6350()
-		{
-		}
-		[Fact]
-		public void Test_6351()
-		{
-		}
-		[Fact]
-		public void Test_6352()
-		{
-		}
-		[Fact]
-		public void Test_6353()
-		{
-		}
-		[Fact]
-		public void Test_6354()
-		{
-		}
-		[Fact]
-		public void Test_6355()
-		{
-		}
-		[Fact]
-		public void Test_6356()
-		{
-		}
-		[Fact]
-		public void Test_6357()
-		{
-		}
-		[Fact]
-		public void Test_6358()
-		{
-		}
-		[Fact]
-		public void Test_6359()
-		{
-		}
-		[Fact]
-		public void Test_6360()
-		{
-		}
-		[Fact]
-		public void Test_6361()
-		{
-		}
-		[Fact]
-		public void Test_6362()
-		{
-		}
-		[Fact]
-		public void Test_6363()
-		{
-		}
-		[Fact]
-		public void Test_6364()
-		{
-		}
-		[Fact]
-		public void Test_6365()
-		{
-		}
-		[Fact]
-		public void Test_6366()
-		{
-		}
-		[Fact]
-		public void Test_6367()
-		{
-		}
-		[Fact]
-		public void Test_6368()
-		{
-		}
-		[Fact]
-		public void Test_6369()
-		{
-		}
-		[Fact]
-		public void Test_6370()
-		{
-		}
-		[Fact]
-		public void Test_6371()
-		{
-		}
-		[Fact]
-		public void Test_6372()
-		{
-		}
-		[Fact]
-		public void Test_6373()
-		{
-		}
-		[Fact]
-		public void Test_6374()
-		{
-		}
-		[Fact]
-		public void Test_6375()
-		{
-		}
-		[Fact]
-		public void Test_6376()
-		{
-		}
-		[Fact]
-		public void Test_6377()
-		{
-		}
-		[Fact]
-		public void Test_6378()
-		{
-		}
-		[Fact]
-		public void Test_6379()
-		{
-		}
-		[Fact]
-		public void Test_6380()
-		{
-		}
-		[Fact]
-		public void Test_6381()
-		{
-		}
-		[Fact]
-		public void Test_6382()
-		{
-		}
-		[Fact]
-		public void Test_6383()
-		{
-		}
-		[Fact]
-		public void Test_6384()
-		{
-		}
-		[Fact]
-		public void Test_6385()
-		{
-		}
-		[Fact]
-		public void Test_6386()
-		{
-		}
-		[Fact]
-		public void Test_6387()
-		{
-		}
-		[Fact]
-		public void Test_6388()
-		{
-		}
-		[Fact]
-		public void Test_6389()
-		{
-		}
-		[Fact]
-		public void Test_6390()
-		{
-		}
-		[Fact]
-		public void Test_6391()
-		{
-		}
-		[Fact]
-		public void Test_6392()
-		{
-		}
-		[Fact]
-		public void Test_6393()
-		{
-		}
-		[Fact]
-		public void Test_6394()
-		{
-		}
-		[Fact]
-		public void Test_6395()
-		{
-		}
-		[Fact]
-		public void Test_6396()
-		{
-		}
-		[Fact]
-		public void Test_6397()
-		{
-		}
-		[Fact]
-		public void Test_6398()
-		{
-		}
-		[Fact]
-		public void Test_6399()
-		{
-		}
-		[Fact]
-		public void Test_6400()
-		{
-		}
-		[Fact]
-		public void Test_6401()
-		{
-		}
-		[Fact]
-		public void Test_6402()
-		{
-		}
-		[Fact]
-		public void Test_6403()
-		{
-		}
-		[Fact]
-		public void Test_6404()
-		{
-		}
-		[Fact]
-		public void Test_6405()
-		{
-		}
-		[Fact]
-		public void Test_6406()
-		{
-		}
-		[Fact]
-		public void Test_6407()
-		{
-		}
-		[Fact]
-		public void Test_6408()
-		{
-		}
-		[Fact]
-		public void Test_6409()
-		{
-		}
-		[Fact]
-		public void Test_6410()
-		{
-		}
-		[Fact]
-		public void Test_6411()
-		{
-		}
-		[Fact]
-		public void Test_6412()
-		{
-		}
-		[Fact]
-		public void Test_6413()
-		{
-		}
-		[Fact]
-		public void Test_6414()
-		{
-		}
-		[Fact]
-		public void Test_6415()
-		{
-		}
-		[Fact]
-		public void Test_6416()
-		{
-		}
-		[Fact]
-		public void Test_6417()
-		{
-		}
-		[Fact]
-		public void Test_6418()
-		{
-		}
-		[Fact]
-		public void Test_6419()
-		{
-		}
-		[Fact]
-		public void Test_6420()
-		{
-		}
-		[Fact]
-		public void Test_6421()
-		{
-		}
-		[Fact]
-		public void Test_6422()
-		{
-		}
-		[Fact]
-		public void Test_6423()
-		{
-		}
-		[Fact]
-		public void Test_6424()
-		{
-		}
-		[Fact]
-		public void Test_6425()
-		{
-		}
-		[Fact]
-		public void Test_6426()
-		{
-		}
-		[Fact]
-		public void Test_6427()
-		{
-		}
-		[Fact]
-		public void Test_6428()
-		{
-		}
-		[Fact]
-		public void Test_6429()
-		{
-		}
-		[Fact]
-		public void Test_6430()
-		{
-		}
-		[Fact]
-		public void Test_6431()
-		{
-		}
-		[Fact]
-		public void Test_6432()
-		{
-		}
-		[Fact]
-		public void Test_6433()
-		{
-		}
-		[Fact]
-		public void Test_6434()
-		{
-		}
-		[Fact]
-		public void Test_6435()
-		{
-		}
-		[Fact]
-		public void Test_6436()
-		{
-		}
-		[Fact]
-		public void Test_6437()
-		{
-		}
-		[Fact]
-		public void Test_6438()
-		{
-		}
-		[Fact]
-		public void Test_6439()
-		{
-		}
-		[Fact]
-		public void Test_6440()
-		{
-		}
-		[Fact]
-		public void Test_6441()
-		{
-		}
-		[Fact]
-		public void Test_6442()
-		{
-		}
-		[Fact]
-		public void Test_6443()
-		{
-		}
-		[Fact]
-		public void Test_6444()
-		{
-		}
-		[Fact]
-		public void Test_6445()
-		{
-		}
-		[Fact]
-		public void Test_6446()
-		{
-		}
-		[Fact]
-		public void Test_6447()
-		{
-		}
-		[Fact]
-		public void Test_6448()
-		{
-		}
-		[Fact]
-		public void Test_6449()
-		{
-		}
-		[Fact]
-		public void Test_6450()
-		{
-		}
-		[Fact]
-		public void Test_6451()
-		{
-		}
-		[Fact]
-		public void Test_6452()
-		{
-		}
-		[Fact]
-		public void Test_6453()
-		{
-		}
-		[Fact]
-		public void Test_6454()
-		{
-		}
-		[Fact]
-		public void Test_6455()
-		{
-		}
-		[Fact]
-		public void Test_6456()
-		{
-		}
-		[Fact]
-		public void Test_6457()
-		{
-		}
-		[Fact]
-		public void Test_6458()
-		{
-		}
-		[Fact]
-		public void Test_6459()
-		{
-		}
-		[Fact]
-		public void Test_6460()
-		{
-		}
-		[Fact]
-		public void Test_6461()
-		{
-		}
-		[Fact]
-		public void Test_6462()
-		{
-		}
-		[Fact]
-		public void Test_6463()
-		{
-		}
-		[Fact]
-		public void Test_6464()
-		{
-		}
-		[Fact]
-		public void Test_6465()
-		{
-		}
-		[Fact]
-		public void Test_6466()
-		{
-		}
-		[Fact]
-		public void Test_6467()
-		{
-		}
-		[Fact]
-		public void Test_6468()
-		{
-		}
-		[Fact]
-		public void Test_6469()
-		{
-		}
-		[Fact]
-		public void Test_6470()
-		{
-		}
-		[Fact]
-		public void Test_6471()
-		{
-		}
-		[Fact]
-		public void Test_6472()
-		{
-		}
-		[Fact]
-		public void Test_6473()
-		{
-		}
-		[Fact]
-		public void Test_6474()
-		{
-		}
-		[Fact]
-		public void Test_6475()
-		{
-		}
-		[Fact]
-		public void Test_6476()
-		{
-		}
-		[Fact]
-		public void Test_6477()
-		{
-		}
-		[Fact]
-		public void Test_6478()
-		{
-		}
-		[Fact]
-		public void Test_6479()
-		{
-		}
-		[Fact]
-		public void Test_6480()
-		{
-		}
-		[Fact]
-		public void Test_6481()
-		{
-		}
-		[Fact]
-		public void Test_6482()
-		{
-		}
-		[Fact]
-		public void Test_6483()
-		{
-		}
-		[Fact]
-		public void Test_6484()
-		{
-		}
-		[Fact]
-		public void Test_6485()
-		{
-		}
-		[Fact]
-		public void Test_6486()
-		{
-		}
-		[Fact]
-		public void Test_6487()
-		{
-		}
-		[Fact]
-		public void Test_6488()
-		{
-		}
-		[Fact]
-		public void Test_6489()
-		{
-		}
-		[Fact]
-		public void Test_6490()
-		{
-		}
-		[Fact]
-		public void Test_6491()
-		{
-		}
-		[Fact]
-		public void Test_6492()
-		{
-		}
-		[Fact]
-		public void Test_6493()
-		{
-		}
-		[Fact]
-		public void Test_6494()
-		{
-		}
-		[Fact]
-		public void Test_6495()
-		{
-		}
-		[Fact]
-		public void Test_6496()
-		{
-		}
-		[Fact]
-		public void Test_6497()
-		{
-		}
-		[Fact]
-		public void Test_6498()
-		{
-		}
-		[Fact]
-		public void Test_6499()
-		{
-		}
-		[Fact]
-		public void Test_6500()
-		{
-		}
-		[Fact]
-		public void Test_6501()
-		{
-		}
-		[Fact]
-		public void Test_6502()
-		{
-		}
-		[Fact]
-		public void Test_6503()
-		{
-		}
-		[Fact]
-		public void Test_6504()
-		{
-		}
-		[Fact]
-		public void Test_6505()
-		{
-		}
-		[Fact]
-		public void Test_6506()
-		{
-		}
-		[Fact]
-		public void Test_6507()
-		{
-		}
-		[Fact]
-		public void Test_6508()
-		{
-		}
-		[Fact]
-		public void Test_6509()
-		{
-		}
-		[Fact]
-		public void Test_6510()
-		{
-		}
-		[Fact]
-		public void Test_6511()
-		{
-		}
-		[Fact]
-		public void Test_6512()
-		{
-		}
-		[Fact]
-		public void Test_6513()
-		{
-		}
-		[Fact]
-		public void Test_6514()
-		{
-		}
-		[Fact]
-		public void Test_6515()
-		{
-		}
-		[Fact]
-		public void Test_6516()
-		{
-		}
-		[Fact]
-		public void Test_6517()
-		{
-		}
-		[Fact]
-		public void Test_6518()
-		{
-		}
-		[Fact]
-		public void Test_6519()
-		{
-		}
-		[Fact]
-		public void Test_6520()
-		{
-		}
-		[Fact]
-		public void Test_6521()
-		{
-		}
-		[Fact]
-		public void Test_6522()
-		{
-		}
-		[Fact]
-		public void Test_6523()
-		{
-		}
-		[Fact]
-		public void Test_6524()
-		{
-		}
-		[Fact]
-		public void Test_6525()
-		{
-		}
-		[Fact]
-		public void Test_6526()
-		{
-		}
-		[Fact]
-		public void Test_6527()
-		{
-		}
-		[Fact]
-		public void Test_6528()
-		{
-		}
-		[Fact]
-		public void Test_6529()
-		{
-		}
-		[Fact]
-		public void Test_6530()
-		{
-		}
-		[Fact]
-		public void Test_6531()
-		{
-		}
-		[Fact]
-		public void Test_6532()
-		{
-		}
-		[Fact]
-		public void Test_6533()
-		{
-		}
-		[Fact]
-		public void Test_6534()
-		{
-		}
-		[Fact]
-		public void Test_6535()
-		{
-		}
-		[Fact]
-		public void Test_6536()
-		{
-		}
-		[Fact]
-		public void Test_6537()
-		{
-		}
-		[Fact]
-		public void Test_6538()
-		{
-		}
-		[Fact]
-		public void Test_6539()
-		{
-		}
-		[Fact]
-		public void Test_6540()
-		{
-		}
-		[Fact]
-		public void Test_6541()
-		{
-		}
-		[Fact]
-		public void Test_6542()
-		{
-		}
-		[Fact]
-		public void Test_6543()
-		{
-		}
-		[Fact]
-		public void Test_6544()
-		{
-		}
-		[Fact]
-		public void Test_6545()
-		{
-		}
-		[Fact]
-		public void Test_6546()
-		{
-		}
-		[Fact]
-		public void Test_6547()
-		{
-		}
-		[Fact]
-		public void Test_6548()
-		{
-		}
-		[Fact]
-		public void Test_6549()
-		{
-		}
-		[Fact]
-		public void Test_6550()
-		{
-		}
-		[Fact]
-		public void Test_6551()
-		{
-		}
-		[Fact]
-		public void Test_6552()
-		{
-		}
-		[Fact]
-		public void Test_6553()
-		{
-		}
-		[Fact]
-		public void Test_6554()
-		{
-		}
-		[Fact]
-		public void Test_6555()
-		{
-		}
-		[Fact]
-		public void Test_6556()
-		{
-		}
-		[Fact]
-		public void Test_6557()
-		{
-		}
-		[Fact]
-		public void Test_6558()
-		{
-		}
-		[Fact]
-		public void Test_6559()
-		{
-		}
-		[Fact]
-		public void Test_6560()
-		{
-		}
-		[Fact]
-		public void Test_6561()
-		{
-		}
-		[Fact]
-		public void Test_6562()
-		{
-		}
-		[Fact]
-		public void Test_6563()
-		{
-		}
-		[Fact]
-		public void Test_6564()
-		{
-		}
-		[Fact]
-		public void Test_6565()
-		{
-		}
-		[Fact]
-		public void Test_6566()
-		{
-		}
-		[Fact]
-		public void Test_6567()
-		{
-		}
-		[Fact]
-		public void Test_6568()
-		{
-		}
-		[Fact]
-		public void Test_6569()
-		{
-		}
-		[Fact]
-		public void Test_6570()
-		{
-		}
-		[Fact]
-		public void Test_6571()
-		{
-		}
-		[Fact]
-		public void Test_6572()
-		{
-		}
-		[Fact]
-		public void Test_6573()
-		{
-		}
-		[Fact]
-		public void Test_6574()
-		{
-		}
-		[Fact]
-		public void Test_6575()
-		{
-		}
-		[Fact]
-		public void Test_6576()
-		{
-		}
-		[Fact]
-		public void Test_6577()
-		{
-		}
-		[Fact]
-		public void Test_6578()
-		{
-		}
-		[Fact]
-		public void Test_6579()
-		{
-		}
-		[Fact]
-		public void Test_6580()
-		{
-		}
-		[Fact]
-		public void Test_6581()
-		{
-		}
-		[Fact]
-		public void Test_6582()
-		{
-		}
-		[Fact]
-		public void Test_6583()
-		{
-		}
-		[Fact]
-		public void Test_6584()
-		{
-		}
-		[Fact]
-		public void Test_6585()
-		{
-		}
-		[Fact]
-		public void Test_6586()
-		{
-		}
-		[Fact]
-		public void Test_6587()
-		{
-		}
-		[Fact]
-		public void Test_6588()
-		{
-		}
-		[Fact]
-		public void Test_6589()
-		{
-		}
-		[Fact]
-		public void Test_6590()
-		{
-		}
-		[Fact]
-		public void Test_6591()
-		{
-		}
-		[Fact]
-		public void Test_6592()
-		{
-		}
-		[Fact]
-		public void Test_6593()
-		{
-		}
-		[Fact]
-		public void Test_6594()
-		{
-		}
-		[Fact]
-		public void Test_6595()
-		{
-		}
-		[Fact]
-		public void Test_6596()
-		{
-		}
-		[Fact]
-		public void Test_6597()
-		{
-		}
-		[Fact]
-		public void Test_6598()
-		{
-		}
-		[Fact]
-		public void Test_6599()
-		{
-		}
-		[Fact]
-		public void Test_6600()
-		{
-		}
-		[Fact]
-		public void Test_6601()
-		{
-		}
-		[Fact]
-		public void Test_6602()
-		{
-		}
-		[Fact]
-		public void Test_6603()
-		{
-		}
-		[Fact]
-		public void Test_6604()
-		{
-		}
-		[Fact]
-		public void Test_6605()
-		{
-		}
-		[Fact]
-		public void Test_6606()
-		{
-		}
-		[Fact]
-		public void Test_6607()
-		{
-		}
-		[Fact]
-		public void Test_6608()
-		{
-		}
-		[Fact]
-		public void Test_6609()
-		{
-		}
-		[Fact]
-		public void Test_6610()
-		{
-		}
-		[Fact]
-		public void Test_6611()
-		{
-		}
-		[Fact]
-		public void Test_6612()
-		{
-		}
-		[Fact]
-		public void Test_6613()
-		{
-		}
-		[Fact]
-		public void Test_6614()
-		{
-		}
-		[Fact]
-		public void Test_6615()
-		{
-		}
-		[Fact]
-		public void Test_6616()
-		{
-		}
-		[Fact]
-		public void Test_6617()
-		{
-		}
-		[Fact]
-		public void Test_6618()
-		{
-		}
-		[Fact]
-		public void Test_6619()
-		{
-		}
-		[Fact]
-		public void Test_6620()
-		{
-		}
-		[Fact]
-		public void Test_6621()
-		{
-		}
-		[Fact]
-		public void Test_6622()
-		{
-		}
-		[Fact]
-		public void Test_6623()
-		{
-		}
-		[Fact]
-		public void Test_6624()
-		{
-		}
-		[Fact]
-		public void Test_6625()
-		{
-		}
-		[Fact]
-		public void Test_6626()
-		{
-		}
-		[Fact]
-		public void Test_6627()
-		{
-		}
-		[Fact]
-		public void Test_6628()
-		{
-		}
-		[Fact]
-		public void Test_6629()
-		{
-		}
-		[Fact]
-		public void Test_6630()
-		{
-		}
-		[Fact]
-		public void Test_6631()
-		{
-		}
-		[Fact]
-		public void Test_6632()
-		{
-		}
-		[Fact]
-		public void Test_6633()
-		{
-		}
-		[Fact]
-		public void Test_6634()
-		{
-		}
-		[Fact]
-		public void Test_6635()
-		{
-		}
-		[Fact]
-		public void Test_6636()
-		{
-		}
-		[Fact]
-		public void Test_6637()
-		{
-		}
-		[Fact]
-		public void Test_6638()
-		{
-		}
-		[Fact]
-		public void Test_6639()
-		{
-		}
-		[Fact]
-		public void Test_6640()
-		{
-		}
-		[Fact]
-		public void Test_6641()
-		{
-		}
-		[Fact]
-		public void Test_6642()
-		{
-		}
-		[Fact]
-		public void Test_6643()
-		{
-		}
-		[Fact]
-		public void Test_6644()
-		{
-		}
-		[Fact]
-		public void Test_6645()
-		{
-		}
-		[Fact]
-		public void Test_6646()
-		{
-		}
-		[Fact]
-		public void Test_6647()
-		{
-		}
-		[Fact]
-		public void Test_6648()
-		{
-		}
-		[Fact]
-		public void Test_6649()
-		{
-		}
-		[Fact]
-		public void Test_6650()
-		{
-		}
-		[Fact]
-		public void Test_6651()
-		{
-		}
-		[Fact]
-		public void Test_6652()
-		{
-		}
-		[Fact]
-		public void Test_6653()
-		{
-		}
-		[Fact]
-		public void Test_6654()
-		{
-		}
-		[Fact]
-		public void Test_6655()
-		{
-		}
-		[Fact]
-		public void Test_6656()
-		{
-		}
-		[Fact]
-		public void Test_6657()
-		{
-		}
-		[Fact]
-		public void Test_6658()
-		{
-		}
-		[Fact]
-		public void Test_6659()
-		{
-		}
-		[Fact]
-		public void Test_6660()
-		{
-		}
-		[Fact]
-		public void Test_6661()
-		{
-		}
-		[Fact]
-		public void Test_6662()
-		{
-		}
-		[Fact]
-		public void Test_6663()
-		{
-		}
-		[Fact]
-		public void Test_6664()
-		{
-		}
-		[Fact]
-		public void Test_6665()
-		{
-		}
-		[Fact]
-		public void Test_6666()
-		{
-		}
-		[Fact]
-		public void Test_6667()
-		{
-		}
-		[Fact]
-		public void Test_6668()
-		{
-		}
-		[Fact]
-		public void Test_6669()
-		{
-		}
-		[Fact]
-		public void Test_6670()
-		{
-		}
-		[Fact]
-		public void Test_6671()
-		{
-		}
-		[Fact]
-		public void Test_6672()
-		{
-		}
-		[Fact]
-		public void Test_6673()
-		{
-		}
-		[Fact]
-		public void Test_6674()
-		{
-		}
-		[Fact]
-		public void Test_6675()
-		{
-		}
-		[Fact]
-		public void Test_6676()
-		{
-		}
-		[Fact]
-		public void Test_6677()
-		{
-		}
-		[Fact]
-		public void Test_6678()
-		{
-		}
-		[Fact]
-		public void Test_6679()
-		{
-		}
-		[Fact]
-		public void Test_6680()
-		{
-		}
-		[Fact]
-		public void Test_6681()
-		{
-		}
-		[Fact]
-		public void Test_6682()
-		{
-		}
-		[Fact]
-		public void Test_6683()
-		{
-		}
-		[Fact]
-		public void Test_6684()
-		{
-		}
-		[Fact]
-		public void Test_6685()
-		{
-		}
-		[Fact]
-		public void Test_6686()
-		{
-		}
-		[Fact]
-		public void Test_6687()
-		{
-		}
-		[Fact]
-		public void Test_6688()
-		{
-		}
-		[Fact]
-		public void Test_6689()
-		{
-		}
-		[Fact]
-		public void Test_6690()
-		{
-		}
-		[Fact]
-		public void Test_6691()
-		{
-		}
-		[Fact]
-		public void Test_6692()
-		{
-		}
-		[Fact]
-		public void Test_6693()
-		{
-		}
-		[Fact]
-		public void Test_6694()
-		{
-		}
-		[Fact]
-		public void Test_6695()
-		{
-		}
-		[Fact]
-		public void Test_6696()
-		{
-		}
-		[Fact]
-		public void Test_6697()
-		{
-		}
-		[Fact]
-		public void Test_6698()
-		{
-		}
-		[Fact]
-		public void Test_6699()
-		{
-		}
-		[Fact]
-		public void Test_6700()
-		{
-		}
-		[Fact]
-		public void Test_6701()
-		{
-		}
-		[Fact]
-		public void Test_6702()
-		{
-		}
-		[Fact]
-		public void Test_6703()
-		{
-		}
-		[Fact]
-		public void Test_6704()
-		{
-		}
-		[Fact]
-		public void Test_6705()
-		{
-		}
-		[Fact]
-		public void Test_6706()
-		{
-		}
-		[Fact]
-		public void Test_6707()
-		{
-		}
-		[Fact]
-		public void Test_6708()
-		{
-		}
-		[Fact]
-		public void Test_6709()
-		{
-		}
-		[Fact]
-		public void Test_6710()
-		{
-		}
-		[Fact]
-		public void Test_6711()
-		{
-		}
-		[Fact]
-		public void Test_6712()
-		{
-		}
-		[Fact]
-		public void Test_6713()
-		{
-		}
-		[Fact]
-		public void Test_6714()
-		{
-		}
-		[Fact]
-		public void Test_6715()
-		{
-		}
-		[Fact]
-		public void Test_6716()
-		{
-		}
-		[Fact]
-		public void Test_6717()
-		{
-		}
-		[Fact]
-		public void Test_6718()
-		{
-		}
-		[Fact]
-		public void Test_6719()
-		{
-		}
-		[Fact]
-		public void Test_6720()
-		{
-		}
-		[Fact]
-		public void Test_6721()
-		{
-		}
-		[Fact]
-		public void Test_6722()
-		{
-		}
-		[Fact]
-		public void Test_6723()
-		{
-		}
-		[Fact]
-		public void Test_6724()
-		{
-		}
-		[Fact]
-		public void Test_6725()
-		{
-		}
-		[Fact]
-		public void Test_6726()
-		{
-		}
-		[Fact]
-		public void Test_6727()
-		{
-		}
-		[Fact]
-		public void Test_6728()
-		{
-		}
-		[Fact]
-		public void Test_6729()
-		{
-		}
-		[Fact]
-		public void Test_6730()
-		{
-		}
-		[Fact]
-		public void Test_6731()
-		{
-		}
-		[Fact]
-		public void Test_6732()
-		{
-		}
-		[Fact]
-		public void Test_6733()
-		{
-		}
-		[Fact]
-		public void Test_6734()
-		{
-		}
-		[Fact]
-		public void Test_6735()
-		{
-		}
-		[Fact]
-		public void Test_6736()
-		{
-		}
-		[Fact]
-		public void Test_6737()
-		{
-		}
-		[Fact]
-		public void Test_6738()
-		{
-		}
-		[Fact]
-		public void Test_6739()
-		{
-		}
-		[Fact]
-		public void Test_6740()
-		{
-		}
-		[Fact]
-		public void Test_6741()
-		{
-		}
-		[Fact]
-		public void Test_6742()
-		{
-		}
-		[Fact]
-		public void Test_6743()
-		{
-		}
-		[Fact]
-		public void Test_6744()
-		{
-		}
-		[Fact]
-		public void Test_6745()
-		{
-		}
-		[Fact]
-		public void Test_6746()
-		{
-		}
-		[Fact]
-		public void Test_6747()
-		{
-		}
-		[Fact]
-		public void Test_6748()
-		{
-		}
-		[Fact]
-		public void Test_6749()
-		{
-		}
-		[Fact]
-		public void Test_6750()
-		{
-		}
-		[Fact]
-		public void Test_6751()
-		{
-		}
-		[Fact]
-		public void Test_6752()
-		{
-		}
-		[Fact]
-		public void Test_6753()
-		{
-		}
-		[Fact]
-		public void Test_6754()
-		{
-		}
-		[Fact]
-		public void Test_6755()
-		{
-		}
-		[Fact]
-		public void Test_6756()
-		{
-		}
-		[Fact]
-		public void Test_6757()
-		{
-		}
-		[Fact]
-		public void Test_6758()
-		{
-		}
-		[Fact]
-		public void Test_6759()
-		{
-		}
-		[Fact]
-		public void Test_6760()
-		{
-		}
-		[Fact]
-		public void Test_6761()
-		{
-		}
-		[Fact]
-		public void Test_6762()
-		{
-		}
-		[Fact]
-		public void Test_6763()
-		{
-		}
-		[Fact]
-		public void Test_6764()
-		{
-		}
-		[Fact]
-		public void Test_6765()
-		{
-		}
-		[Fact]
-		public void Test_6766()
-		{
-		}
-		[Fact]
-		public void Test_6767()
-		{
-		}
-		[Fact]
-		public void Test_6768()
-		{
-		}
-		[Fact]
-		public void Test_6769()
-		{
-		}
-		[Fact]
-		public void Test_6770()
-		{
-		}
-		[Fact]
-		public void Test_6771()
-		{
-		}
-		[Fact]
-		public void Test_6772()
-		{
-		}
-		[Fact]
-		public void Test_6773()
-		{
-		}
-		[Fact]
-		public void Test_6774()
-		{
-		}
-		[Fact]
-		public void Test_6775()
-		{
-		}
-		[Fact]
-		public void Test_6776()
-		{
-		}
-		[Fact]
-		public void Test_6777()
-		{
-		}
-		[Fact]
-		public void Test_6778()
-		{
-		}
-		[Fact]
-		public void Test_6779()
-		{
-		}
-		[Fact]
-		public void Test_6780()
-		{
-		}
-		[Fact]
-		public void Test_6781()
-		{
-		}
-		[Fact]
-		public void Test_6782()
-		{
-		}
-		[Fact]
-		public void Test_6783()
-		{
-		}
-		[Fact]
-		public void Test_6784()
-		{
-		}
-		[Fact]
-		public void Test_6785()
-		{
-		}
-		[Fact]
-		public void Test_6786()
-		{
-		}
-		[Fact]
-		public void Test_6787()
-		{
-		}
-		[Fact]
-		public void Test_6788()
-		{
-		}
-		[Fact]
-		public void Test_6789()
-		{
-		}
-		[Fact]
-		public void Test_6790()
-		{
-		}
-		[Fact]
-		public void Test_6791()
-		{
-		}
-		[Fact]
-		public void Test_6792()
-		{
-		}
-		[Fact]
-		public void Test_6793()
-		{
-		}
-		[Fact]
-		public void Test_6794()
-		{
-		}
-		[Fact]
-		public void Test_6795()
-		{
-		}
-		[Fact]
-		public void Test_6796()
-		{
-		}
-		[Fact]
-		public void Test_6797()
-		{
-		}
-		[Fact]
-		public void Test_6798()
-		{
-		}
-		[Fact]
-		public void Test_6799()
-		{
-		}
-		[Fact]
-		public void Test_6800()
-		{
-		}
-		[Fact]
-		public void Test_6801()
-		{
-		}
-		[Fact]
-		public void Test_6802()
-		{
-		}
-		[Fact]
-		public void Test_6803()
-		{
-		}
-		[Fact]
-		public void Test_6804()
-		{
-		}
-		[Fact]
-		public void Test_6805()
-		{
-		}
-		[Fact]
-		public void Test_6806()
-		{
-		}
-		[Fact]
-		public void Test_6807()
-		{
-		}
-		[Fact]
-		public void Test_6808()
-		{
-		}
-		[Fact]
-		public void Test_6809()
-		{
-		}
-		[Fact]
-		public void Test_6810()
-		{
-		}
-		[Fact]
-		public void Test_6811()
-		{
-		}
-		[Fact]
-		public void Test_6812()
-		{
-		}
-		[Fact]
-		public void Test_6813()
-		{
-		}
-		[Fact]
-		public void Test_6814()
-		{
-		}
-		[Fact]
-		public void Test_6815()
-		{
-		}
-		[Fact]
-		public void Test_6816()
-		{
-		}
-		[Fact]
-		public void Test_6817()
-		{
-		}
-		[Fact]
-		public void Test_6818()
-		{
-		}
-		[Fact]
-		public void Test_6819()
-		{
-		}
-		[Fact]
-		public void Test_6820()
-		{
-		}
-		[Fact]
-		public void Test_6821()
-		{
-		}
-		[Fact]
-		public void Test_6822()
-		{
-		}
-		[Fact]
-		public void Test_6823()
-		{
-		}
-		[Fact]
-		public void Test_6824()
-		{
-		}
-		[Fact]
-		public void Test_6825()
-		{
-		}
-		[Fact]
-		public void Test_6826()
-		{
-		}
-		[Fact]
-		public void Test_6827()
-		{
-		}
-		[Fact]
-		public void Test_6828()
-		{
-		}
-		[Fact]
-		public void Test_6829()
-		{
-		}
-		[Fact]
-		public void Test_6830()
-		{
-		}
-		[Fact]
-		public void Test_6831()
-		{
-		}
-		[Fact]
-		public void Test_6832()
-		{
-		}
-		[Fact]
-		public void Test_6833()
-		{
-		}
-		[Fact]
-		public void Test_6834()
-		{
-		}
-		[Fact]
-		public void Test_6835()
-		{
-		}
-		[Fact]
-		public void Test_6836()
-		{
-		}
-		[Fact]
-		public void Test_6837()
-		{
-		}
-		[Fact]
-		public void Test_6838()
-		{
-		}
-		[Fact]
-		public void Test_6839()
-		{
-		}
-		[Fact]
-		public void Test_6840()
-		{
-		}
-		[Fact]
-		public void Test_6841()
-		{
-		}
-		[Fact]
-		public void Test_6842()
-		{
-		}
-		[Fact]
-		public void Test_6843()
-		{
-		}
-		[Fact]
-		public void Test_6844()
-		{
-		}
-		[Fact]
-		public void Test_6845()
-		{
-		}
-		[Fact]
-		public void Test_6846()
-		{
-		}
-		[Fact]
-		public void Test_6847()
-		{
-		}
-		[Fact]
-		public void Test_6848()
-		{
-		}
-		[Fact]
-		public void Test_6849()
-		{
-		}
-		[Fact]
-		public void Test_6850()
-		{
-		}
-		[Fact]
-		public void Test_6851()
-		{
-		}
-		[Fact]
-		public void Test_6852()
-		{
-		}
-		[Fact]
-		public void Test_6853()
-		{
-		}
-		[Fact]
-		public void Test_6854()
-		{
-		}
-		[Fact]
-		public void Test_6855()
-		{
-		}
-		[Fact]
-		public void Test_6856()
-		{
-		}
-		[Fact]
-		public void Test_6857()
-		{
-		}
-		[Fact]
-		public void Test_6858()
-		{
-		}
-		[Fact]
-		public void Test_6859()
-		{
-		}
-		[Fact]
-		public void Test_6860()
-		{
-		}
-		[Fact]
-		public void Test_6861()
-		{
-		}
-		[Fact]
-		public void Test_6862()
-		{
-		}
-		[Fact]
-		public void Test_6863()
-		{
-		}
-		[Fact]
-		public void Test_6864()
-		{
-		}
-		[Fact]
-		public void Test_6865()
-		{
-		}
-		[Fact]
-		public void Test_6866()
-		{
-		}
-		[Fact]
-		public void Test_6867()
-		{
-		}
-		[Fact]
-		public void Test_6868()
-		{
-		}
-		[Fact]
-		public void Test_6869()
-		{
-		}
-		[Fact]
-		public void Test_6870()
-		{
-		}
-		[Fact]
-		public void Test_6871()
-		{
-		}
-		[Fact]
-		public void Test_6872()
-		{
-		}
-		[Fact]
-		public void Test_6873()
-		{
-		}
-		[Fact]
-		public void Test_6874()
-		{
-		}
-		[Fact]
-		public void Test_6875()
-		{
-		}
-		[Fact]
-		public void Test_6876()
-		{
-		}
-		[Fact]
-		public void Test_6877()
-		{
-		}
-		[Fact]
-		public void Test_6878()
-		{
-		}
-		[Fact]
-		public void Test_6879()
-		{
-		}
-		[Fact]
-		public void Test_6880()
-		{
-		}
-		[Fact]
-		public void Test_6881()
-		{
-		}
-		[Fact]
-		public void Test_6882()
-		{
-		}
-		[Fact]
-		public void Test_6883()
-		{
-		}
-		[Fact]
-		public void Test_6884()
-		{
-		}
-		[Fact]
-		public void Test_6885()
-		{
-		}
-		[Fact]
-		public void Test_6886()
-		{
-		}
-		[Fact]
-		public void Test_6887()
-		{
-		}
-		[Fact]
-		public void Test_6888()
-		{
-		}
-		[Fact]
-		public void Test_6889()
-		{
-		}
-		[Fact]
-		public void Test_6890()
-		{
-		}
-		[Fact]
-		public void Test_6891()
-		{
-		}
-		[Fact]
-		public void Test_6892()
-		{
-		}
-		[Fact]
-		public void Test_6893()
-		{
-		}
-		[Fact]
-		public void Test_6894()
-		{
-		}
-		[Fact]
-		public void Test_6895()
-		{
-		}
-		[Fact]
-		public void Test_6896()
-		{
-		}
-		[Fact]
-		public void Test_6897()
-		{
-		}
-		[Fact]
-		public void Test_6898()
-		{
-		}
-		[Fact]
-		public void Test_6899()
-		{
-		}
-		[Fact]
-		public void Test_6900()
-		{
-		}
-		[Fact]
-		public void Test_6901()
-		{
-		}
-		[Fact]
-		public void Test_6902()
-		{
-		}
-		[Fact]
-		public void Test_6903()
-		{
-		}
-		[Fact]
-		public void Test_6904()
-		{
-		}
-		[Fact]
-		public void Test_6905()
-		{
-		}
-		[Fact]
-		public void Test_6906()
-		{
-		}
-		[Fact]
-		public void Test_6907()
-		{
-		}
-		[Fact]
-		public void Test_6908()
-		{
-		}
-		[Fact]
-		public void Test_6909()
-		{
-		}
-		[Fact]
-		public void Test_6910()
-		{
-		}
-		[Fact]
-		public void Test_6911()
-		{
-		}
-		[Fact]
-		public void Test_6912()
-		{
-		}
-		[Fact]
-		public void Test_6913()
-		{
-		}
-		[Fact]
-		public void Test_6914()
-		{
-		}
-		[Fact]
-		public void Test_6915()
-		{
-		}
-		[Fact]
-		public void Test_6916()
-		{
-		}
-		[Fact]
-		public void Test_6917()
-		{
-		}
-		[Fact]
-		public void Test_6918()
-		{
-		}
-		[Fact]
-		public void Test_6919()
-		{
-		}
-		[Fact]
-		public void Test_6920()
-		{
-		}
-		[Fact]
-		public void Test_6921()
-		{
-		}
-		[Fact]
-		public void Test_6922()
-		{
-		}
-		[Fact]
-		public void Test_6923()
-		{
-		}
-		[Fact]
-		public void Test_6924()
-		{
-		}
-		[Fact]
-		public void Test_6925()
-		{
-		}
-		[Fact]
-		public void Test_6926()
-		{
-		}
-		[Fact]
-		public void Test_6927()
-		{
-		}
-		[Fact]
-		public void Test_6928()
-		{
-		}
-		[Fact]
-		public void Test_6929()
-		{
-		}
-		[Fact]
-		public void Test_6930()
-		{
-		}
-		[Fact]
-		public void Test_6931()
-		{
-		}
-		[Fact]
-		public void Test_6932()
-		{
-		}
-		[Fact]
-		public void Test_6933()
-		{
-		}
-		[Fact]
-		public void Test_6934()
-		{
-		}
-		[Fact]
-		public void Test_6935()
-		{
-		}
-		[Fact]
-		public void Test_6936()
-		{
-		}
-		[Fact]
-		public void Test_6937()
-		{
-		}
-		[Fact]
-		public void Test_6938()
-		{
-		}
-		[Fact]
-		public void Test_6939()
-		{
-		}
-		[Fact]
-		public void Test_6940()
-		{
-		}
-		[Fact]
-		public void Test_6941()
-		{
-		}
-		[Fact]
-		public void Test_6942()
-		{
-		}
-		[Fact]
-		public void Test_6943()
-		{
-		}
-		[Fact]
-		public void Test_6944()
-		{
-		}
-		[Fact]
-		public void Test_6945()
-		{
-		}
-		[Fact]
-		public void Test_6946()
-		{
-		}
-		[Fact]
-		public void Test_6947()
-		{
-		}
-		[Fact]
-		public void Test_6948()
-		{
-		}
-		[Fact]
-		public void Test_6949()
-		{
-		}
-		[Fact]
-		public void Test_6950()
-		{
-		}
-		[Fact]
-		public void Test_6951()
-		{
-		}
-		[Fact]
-		public void Test_6952()
-		{
-		}
-		[Fact]
-		public void Test_6953()
-		{
-		}
-		[Fact]
-		public void Test_6954()
-		{
-		}
-		[Fact]
-		public void Test_6955()
-		{
-		}
-		[Fact]
-		public void Test_6956()
-		{
-		}
-		[Fact]
-		public void Test_6957()
-		{
-		}
-		[Fact]
-		public void Test_6958()
-		{
-		}
-		[Fact]
-		public void Test_6959()
-		{
-		}
-		[Fact]
-		public void Test_6960()
-		{
-		}
-		[Fact]
-		public void Test_6961()
-		{
-		}
-		[Fact]
-		public void Test_6962()
-		{
-		}
-		[Fact]
-		public void Test_6963()
-		{
-		}
-		[Fact]
-		public void Test_6964()
-		{
-		}
-		[Fact]
-		public void Test_6965()
-		{
-		}
-		[Fact]
-		public void Test_6966()
-		{
-		}
-		[Fact]
-		public void Test_6967()
-		{
-		}
-		[Fact]
-		public void Test_6968()
-		{
-		}
-		[Fact]
-		public void Test_6969()
-		{
-		}
-		[Fact]
-		public void Test_6970()
-		{
-		}
-		[Fact]
-		public void Test_6971()
-		{
-		}
-		[Fact]
-		public void Test_6972()
-		{
-		}
-		[Fact]
-		public void Test_6973()
-		{
-		}
-		[Fact]
-		public void Test_6974()
-		{
-		}
-		[Fact]
-		public void Test_6975()
-		{
-		}
-		[Fact]
-		public void Test_6976()
-		{
-		}
-		[Fact]
-		public void Test_6977()
-		{
-		}
-		[Fact]
-		public void Test_6978()
-		{
-		}
-		[Fact]
-		public void Test_6979()
-		{
-		}
-		[Fact]
-		public void Test_6980()
-		{
-		}
-		[Fact]
-		public void Test_6981()
-		{
-		}
-		[Fact]
-		public void Test_6982()
-		{
-		}
-		[Fact]
-		public void Test_6983()
-		{
-		}
-		[Fact]
-		public void Test_6984()
-		{
-		}
-		[Fact]
-		public void Test_6985()
-		{
-		}
-		[Fact]
-		public void Test_6986()
-		{
-		}
-		[Fact]
-		public void Test_6987()
-		{
-		}
-		[Fact]
-		public void Test_6988()
-		{
-		}
-		[Fact]
-		public void Test_6989()
-		{
-		}
-		[Fact]
-		public void Test_6990()
-		{
-		}
-		[Fact]
-		public void Test_6991()
-		{
-		}
-		[Fact]
-		public void Test_6992()
-		{
-		}
-		[Fact]
-		public void Test_6993()
-		{
-		}
-		[Fact]
-		public void Test_6994()
-		{
-		}
-		[Fact]
-		public void Test_6995()
-		{
-		}
-		[Fact]
-		public void Test_6996()
-		{
-		}
-		[Fact]
-		public void Test_6997()
-		{
-		}
-		[Fact]
-		public void Test_6998()
-		{
-		}
-		[Fact]
-		public void Test_6999()
-		{
-		}
-		[Fact]
-		public void Test_7000()
-		{
-		}
-		[Fact]
-		public void Test_7001()
-		{
-		}
-		[Fact]
-		public void Test_7002()
-		{
-		}
-		[Fact]
-		public void Test_7003()
-		{
-		}
-		[Fact]
-		public void Test_7004()
-		{
-		}
-		[Fact]
-		public void Test_7005()
-		{
-		}
-		[Fact]
-		public void Test_7006()
-		{
-		}
-		[Fact]
-		public void Test_7007()
-		{
-		}
-		[Fact]
-		public void Test_7008()
-		{
-		}
-		[Fact]
-		public void Test_7009()
-		{
-		}
-		[Fact]
-		public void Test_7010()
-		{
-		}
-		[Fact]
-		public void Test_7011()
-		{
-		}
-		[Fact]
-		public void Test_7012()
-		{
-		}
-		[Fact]
-		public void Test_7013()
-		{
-		}
-		[Fact]
-		public void Test_7014()
-		{
-		}
-		[Fact]
-		public void Test_7015()
-		{
-		}
-		[Fact]
-		public void Test_7016()
-		{
-		}
-		[Fact]
-		public void Test_7017()
-		{
-		}
-		[Fact]
-		public void Test_7018()
-		{
-		}
-		[Fact]
-		public void Test_7019()
-		{
-		}
-		[Fact]
-		public void Test_7020()
-		{
-		}
-		[Fact]
-		public void Test_7021()
-		{
-		}
-		[Fact]
-		public void Test_7022()
-		{
-		}
-		[Fact]
-		public void Test_7023()
-		{
-		}
-		[Fact]
-		public void Test_7024()
-		{
-		}
-		[Fact]
-		public void Test_7025()
-		{
-		}
-		[Fact]
-		public void Test_7026()
-		{
-		}
-		[Fact]
-		public void Test_7027()
-		{
-		}
-		[Fact]
-		public void Test_7028()
-		{
-		}
-		[Fact]
-		public void Test_7029()
-		{
-		}
-		[Fact]
-		public void Test_7030()
-		{
-		}
-		[Fact]
-		public void Test_7031()
-		{
-		}
-		[Fact]
-		public void Test_7032()
-		{
-		}
-		[Fact]
-		public void Test_7033()
-		{
-		}
-		[Fact]
-		public void Test_7034()
-		{
-		}
-		[Fact]
-		public void Test_7035()
-		{
-		}
-		[Fact]
-		public void Test_7036()
-		{
-		}
-		[Fact]
-		public void Test_7037()
-		{
-		}
-		[Fact]
-		public void Test_7038()
-		{
-		}
-		[Fact]
-		public void Test_7039()
-		{
-		}
-		[Fact]
-		public void Test_7040()
-		{
-		}
-		[Fact]
-		public void Test_7041()
-		{
-		}
-		[Fact]
-		public void Test_7042()
-		{
-		}
-		[Fact]
-		public void Test_7043()
-		{
-		}
-		[Fact]
-		public void Test_7044()
-		{
-		}
-		[Fact]
-		public void Test_7045()
-		{
-		}
-		[Fact]
-		public void Test_7046()
-		{
-		}
-		[Fact]
-		public void Test_7047()
-		{
-		}
-		[Fact]
-		public void Test_7048()
-		{
-		}
-		[Fact]
-		public void Test_7049()
-		{
-		}
-		[Fact]
-		public void Test_7050()
-		{
-		}
-		[Fact]
-		public void Test_7051()
-		{
-		}
-		[Fact]
-		public void Test_7052()
-		{
-		}
-		[Fact]
-		public void Test_7053()
-		{
-		}
-		[Fact]
-		public void Test_7054()
-		{
-		}
-		[Fact]
-		public void Test_7055()
-		{
-		}
-		[Fact]
-		public void Test_7056()
-		{
-		}
-		[Fact]
-		public void Test_7057()
-		{
-		}
-		[Fact]
-		public void Test_7058()
-		{
-		}
-		[Fact]
-		public void Test_7059()
-		{
-		}
-		[Fact]
-		public void Test_7060()
-		{
-		}
-		[Fact]
-		public void Test_7061()
-		{
-		}
-		[Fact]
-		public void Test_7062()
-		{
-		}
-		[Fact]
-		public void Test_7063()
-		{
-		}
-		[Fact]
-		public void Test_7064()
-		{
-		}
-		[Fact]
-		public void Test_7065()
-		{
-		}
-		[Fact]
-		public void Test_7066()
-		{
-		}
-		[Fact]
-		public void Test_7067()
-		{
-		}
-		[Fact]
-		public void Test_7068()
-		{
-		}
-		[Fact]
-		public void Test_7069()
-		{
-		}
-		[Fact]
-		public void Test_7070()
-		{
-		}
-		[Fact]
-		public void Test_7071()
-		{
-		}
-		[Fact]
-		public void Test_7072()
-		{
-		}
-		[Fact]
-		public void Test_7073()
-		{
-		}
-		[Fact]
-		public void Test_7074()
-		{
-		}
-		[Fact]
-		public void Test_7075()
-		{
-		}
-		[Fact]
-		public void Test_7076()
-		{
-		}
-		[Fact]
-		public void Test_7077()
-		{
-		}
-		[Fact]
-		public void Test_7078()
-		{
-		}
-		[Fact]
-		public void Test_7079()
-		{
-		}
-		[Fact]
-		public void Test_7080()
-		{
-		}
-		[Fact]
-		public void Test_7081()
-		{
-		}
-		[Fact]
-		public void Test_7082()
-		{
-		}
-		[Fact]
-		public void Test_7083()
-		{
-		}
-		[Fact]
-		public void Test_7084()
-		{
-		}
-		[Fact]
-		public void Test_7085()
-		{
-		}
-		[Fact]
-		public void Test_7086()
-		{
-		}
-		[Fact]
-		public void Test_7087()
-		{
-		}
-		[Fact]
-		public void Test_7088()
-		{
-		}
-		[Fact]
-		public void Test_7089()
-		{
-		}
-		[Fact]
-		public void Test_7090()
-		{
-		}
-		[Fact]
-		public void Test_7091()
-		{
-		}
-		[Fact]
-		public void Test_7092()
-		{
-		}
-		[Fact]
-		public void Test_7093()
-		{
-		}
-		[Fact]
-		public void Test_7094()
-		{
-		}
-		[Fact]
-		public void Test_7095()
-		{
-		}
-		[Fact]
-		public void Test_7096()
-		{
-		}
-		[Fact]
-		public void Test_7097()
-		{
-		}
-		[Fact]
-		public void Test_7098()
-		{
-		}
-		[Fact]
-		public void Test_7099()
-		{
-		}
-		[Fact]
-		public void Test_7100()
-		{
-		}
-		[Fact]
-		public void Test_7101()
-		{
-		}
-		[Fact]
-		public void Test_7102()
-		{
-		}
-		[Fact]
-		public void Test_7103()
-		{
-		}
-		[Fact]
-		public void Test_7104()
-		{
-		}
-		[Fact]
-		public void Test_7105()
-		{
-		}
-		[Fact]
-		public void Test_7106()
-		{
-		}
-		[Fact]
-		public void Test_7107()
-		{
-		}
-		[Fact]
-		public void Test_7108()
-		{
-		}
-		[Fact]
-		public void Test_7109()
-		{
-		}
-		[Fact]
-		public void Test_7110()
-		{
-		}
-		[Fact]
-		public void Test_7111()
-		{
-		}
-		[Fact]
-		public void Test_7112()
-		{
-		}
-		[Fact]
-		public void Test_7113()
-		{
-		}
-		[Fact]
-		public void Test_7114()
-		{
-		}
-		[Fact]
-		public void Test_7115()
-		{
-		}
-		[Fact]
-		public void Test_7116()
-		{
-		}
-		[Fact]
-		public void Test_7117()
-		{
-		}
-		[Fact]
-		public void Test_7118()
-		{
-		}
-		[Fact]
-		public void Test_7119()
-		{
-		}
-		[Fact]
-		public void Test_7120()
-		{
-		}
-		[Fact]
-		public void Test_7121()
-		{
-		}
-		[Fact]
-		public void Test_7122()
-		{
-		}
-		[Fact]
-		public void Test_7123()
-		{
-		}
-		[Fact]
-		public void Test_7124()
-		{
-		}
-		[Fact]
-		public void Test_7125()
-		{
-		}
-		[Fact]
-		public void Test_7126()
-		{
-		}
-		[Fact]
-		public void Test_7127()
-		{
-		}
-		[Fact]
-		public void Test_7128()
-		{
-		}
-		[Fact]
-		public void Test_7129()
-		{
-		}
-		[Fact]
-		public void Test_7130()
-		{
-		}
-		[Fact]
-		public void Test_7131()
-		{
-		}
-		[Fact]
-		public void Test_7132()
-		{
-		}
-		[Fact]
-		public void Test_7133()
-		{
-		}
-		[Fact]
-		public void Test_7134()
-		{
-		}
-		[Fact]
-		public void Test_7135()
-		{
-		}
-		[Fact]
-		public void Test_7136()
-		{
-		}
-		[Fact]
-		public void Test_7137()
-		{
-		}
-		[Fact]
-		public void Test_7138()
-		{
-		}
-		[Fact]
-		public void Test_7139()
-		{
-		}
-		[Fact]
-		public void Test_7140()
-		{
-		}
-		[Fact]
-		public void Test_7141()
-		{
-		}
-		[Fact]
-		public void Test_7142()
-		{
-		}
-		[Fact]
-		public void Test_7143()
-		{
-		}
-		[Fact]
-		public void Test_7144()
-		{
-		}
-		[Fact]
-		public void Test_7145()
-		{
-		}
-		[Fact]
-		public void Test_7146()
-		{
-		}
-		[Fact]
-		public void Test_7147()
-		{
-		}
-		[Fact]
-		public void Test_7148()
-		{
-		}
-		[Fact]
-		public void Test_7149()
-		{
-		}
-		[Fact]
-		public void Test_7150()
-		{
-		}
-		[Fact]
-		public void Test_7151()
-		{
-		}
-		[Fact]
-		public void Test_7152()
-		{
-		}
-		[Fact]
-		public void Test_7153()
-		{
-		}
-		[Fact]
-		public void Test_7154()
-		{
-		}
-		[Fact]
-		public void Test_7155()
-		{
-		}
-		[Fact]
-		public void Test_7156()
-		{
-		}
-		[Fact]
-		public void Test_7157()
-		{
-		}
-		[Fact]
-		public void Test_7158()
-		{
-		}
-		[Fact]
-		public void Test_7159()
-		{
-		}
-		[Fact]
-		public void Test_7160()
-		{
-		}
-		[Fact]
-		public void Test_7161()
-		{
-		}
-		[Fact]
-		public void Test_7162()
-		{
-		}
-		[Fact]
-		public void Test_7163()
-		{
-		}
-		[Fact]
-		public void Test_7164()
-		{
-		}
-		[Fact]
-		public void Test_7165()
-		{
-		}
-		[Fact]
-		public void Test_7166()
-		{
-		}
-		[Fact]
-		public void Test_7167()
-		{
-		}
-		[Fact]
-		public void Test_7168()
-		{
-		}
-		[Fact]
-		public void Test_7169()
-		{
-		}
-		[Fact]
-		public void Test_7170()
-		{
-		}
-		[Fact]
-		public void Test_7171()
-		{
-		}
-		[Fact]
-		public void Test_7172()
-		{
-		}
-		[Fact]
-		public void Test_7173()
-		{
-		}
-		[Fact]
-		public void Test_7174()
-		{
-		}
-		[Fact]
-		public void Test_7175()
-		{
-		}
-		[Fact]
-		public void Test_7176()
-		{
-		}
-		[Fact]
-		public void Test_7177()
-		{
-		}
-		[Fact]
-		public void Test_7178()
-		{
-		}
-		[Fact]
-		public void Test_7179()
-		{
-		}
-		[Fact]
-		public void Test_7180()
-		{
-		}
-		[Fact]
-		public void Test_7181()
-		{
-		}
-		[Fact]
-		public void Test_7182()
-		{
-		}
-		[Fact]
-		public void Test_7183()
-		{
-		}
-		[Fact]
-		public void Test_7184()
-		{
-		}
-		[Fact]
-		public void Test_7185()
-		{
-		}
-		[Fact]
-		public void Test_7186()
-		{
-		}
-		[Fact]
-		public void Test_7187()
-		{
-		}
-		[Fact]
-		public void Test_7188()
-		{
-		}
-		[Fact]
-		public void Test_7189()
-		{
-		}
-		[Fact]
-		public void Test_7190()
-		{
-		}
-		[Fact]
-		public void Test_7191()
-		{
-		}
-		[Fact]
-		public void Test_7192()
-		{
-		}
-		[Fact]
-		public void Test_7193()
-		{
-		}
-		[Fact]
-		public void Test_7194()
-		{
-		}
-		[Fact]
-		public void Test_7195()
-		{
-		}
-		[Fact]
-		public void Test_7196()
-		{
-		}
-		[Fact]
-		public void Test_7197()
-		{
-		}
-		[Fact]
-		public void Test_7198()
-		{
-		}
-		[Fact]
-		public void Test_7199()
-		{
-		}
-		[Fact]
-		public void Test_7200()
-		{
-		}
-		[Fact]
-		public void Test_7201()
-		{
-		}
-		[Fact]
-		public void Test_7202()
-		{
-		}
-		[Fact]
-		public void Test_7203()
-		{
-		}
-		[Fact]
-		public void Test_7204()
-		{
-		}
-		[Fact]
-		public void Test_7205()
-		{
-		}
-		[Fact]
-		public void Test_7206()
-		{
-		}
-		[Fact]
-		public void Test_7207()
-		{
-		}
-		[Fact]
-		public void Test_7208()
-		{
-		}
-		[Fact]
-		public void Test_7209()
-		{
-		}
-		[Fact]
-		public void Test_7210()
-		{
-		}
-		[Fact]
-		public void Test_7211()
-		{
-		}
-		[Fact]
-		public void Test_7212()
-		{
-		}
-		[Fact]
-		public void Test_7213()
-		{
-		}
-		[Fact]
-		public void Test_7214()
-		{
-		}
-		[Fact]
-		public void Test_7215()
-		{
-		}
-		[Fact]
-		public void Test_7216()
-		{
-		}
-		[Fact]
-		public void Test_7217()
-		{
-		}
-		[Fact]
-		public void Test_7218()
-		{
-		}
-		[Fact]
-		public void Test_7219()
-		{
-		}
-		[Fact]
-		public void Test_7220()
-		{
-		}
-		[Fact]
-		public void Test_7221()
-		{
-		}
-		[Fact]
-		public void Test_7222()
-		{
-		}
-		[Fact]
-		public void Test_7223()
-		{
-		}
-		[Fact]
-		public void Test_7224()
-		{
-		}
-		[Fact]
-		public void Test_7225()
-		{
-		}
-		[Fact]
-		public void Test_7226()
-		{
-		}
-		[Fact]
-		public void Test_7227()
-		{
-		}
-		[Fact]
-		public void Test_7228()
-		{
-		}
-		[Fact]
-		public void Test_7229()
-		{
-		}
-		[Fact]
-		public void Test_7230()
-		{
-		}
-		[Fact]
-		public void Test_7231()
-		{
-		}
-		[Fact]
-		public void Test_7232()
-		{
-		}
-		[Fact]
-		public void Test_7233()
-		{
-		}
-		[Fact]
-		public void Test_7234()
-		{
-		}
-		[Fact]
-		public void Test_7235()
-		{
-		}
-		[Fact]
-		public void Test_7236()
-		{
-		}
-		[Fact]
-		public void Test_7237()
-		{
-		}
-		[Fact]
-		public void Test_7238()
-		{
-		}
-		[Fact]
-		public void Test_7239()
-		{
-		}
-		[Fact]
-		public void Test_7240()
-		{
-		}
-		[Fact]
-		public void Test_7241()
-		{
-		}
-		[Fact]
-		public void Test_7242()
-		{
-		}
-		[Fact]
-		public void Test_7243()
-		{
-		}
-		[Fact]
-		public void Test_7244()
-		{
-		}
-		[Fact]
-		public void Test_7245()
-		{
-		}
-		[Fact]
-		public void Test_7246()
-		{
-		}
-		[Fact]
-		public void Test_7247()
-		{
-		}
-		[Fact]
-		public void Test_7248()
-		{
-		}
-		[Fact]
-		public void Test_7249()
-		{
-		}
-		[Fact]
-		public void Test_7250()
-		{
-		}
-		[Fact]
-		public void Test_7251()
-		{
-		}
-		[Fact]
-		public void Test_7252()
-		{
-		}
-		[Fact]
-		public void Test_7253()
-		{
-		}
-		[Fact]
-		public void Test_7254()
-		{
-		}
-		[Fact]
-		public void Test_7255()
-		{
-		}
-		[Fact]
-		public void Test_7256()
-		{
-		}
-		[Fact]
-		public void Test_7257()
-		{
-		}
-		[Fact]
-		public void Test_7258()
-		{
-		}
-		[Fact]
-		public void Test_7259()
-		{
-		}
-		[Fact]
-		public void Test_7260()
-		{
-		}
-		[Fact]
-		public void Test_7261()
-		{
-		}
-		[Fact]
-		public void Test_7262()
-		{
-		}
-		[Fact]
-		public void Test_7263()
-		{
-		}
-		[Fact]
-		public void Test_7264()
-		{
-		}
-		[Fact]
-		public void Test_7265()
-		{
-		}
-		[Fact]
-		public void Test_7266()
-		{
-		}
-		[Fact]
-		public void Test_7267()
-		{
-		}
-		[Fact]
-		public void Test_7268()
-		{
-		}
-		[Fact]
-		public void Test_7269()
-		{
-		}
-		[Fact]
-		public void Test_7270()
-		{
-		}
-		[Fact]
-		public void Test_7271()
-		{
-		}
-		[Fact]
-		public void Test_7272()
-		{
-		}
-		[Fact]
-		public void Test_7273()
-		{
-		}
-		[Fact]
-		public void Test_7274()
-		{
-		}
-		[Fact]
-		public void Test_7275()
-		{
-		}
-		[Fact]
-		public void Test_7276()
-		{
-		}
-		[Fact]
-		public void Test_7277()
-		{
-		}
-		[Fact]
-		public void Test_7278()
-		{
-		}
-		[Fact]
-		public void Test_7279()
-		{
-		}
-		[Fact]
-		public void Test_7280()
-		{
-		}
-		[Fact]
-		public void Test_7281()
-		{
-		}
-		[Fact]
-		public void Test_7282()
-		{
-		}
-		[Fact]
-		public void Test_7283()
-		{
-		}
-		[Fact]
-		public void Test_7284()
-		{
-		}
-		[Fact]
-		public void Test_7285()
-		{
-		}
-		[Fact]
-		public void Test_7286()
-		{
-		}
-		[Fact]
-		public void Test_7287()
-		{
-		}
-		[Fact]
-		public void Test_7288()
-		{
-		}
-		[Fact]
-		public void Test_7289()
-		{
-		}
-		[Fact]
-		public void Test_7290()
-		{
-		}
-		[Fact]
-		public void Test_7291()
-		{
-		}
-		[Fact]
-		public void Test_7292()
-		{
-		}
-		[Fact]
-		public void Test_7293()
-		{
-		}
-		[Fact]
-		public void Test_7294()
-		{
-		}
-		[Fact]
-		public void Test_7295()
-		{
-		}
-		[Fact]
-		public void Test_7296()
-		{
-		}
-		[Fact]
-		public void Test_7297()
-		{
-		}
-		[Fact]
-		public void Test_7298()
-		{
-		}
-		[Fact]
-		public void Test_7299()
-		{
-		}
-		[Fact]
-		public void Test_7300()
-		{
-		}
-		[Fact]
-		public void Test_7301()
-		{
-		}
-		[Fact]
-		public void Test_7302()
-		{
-		}
-		[Fact]
-		public void Test_7303()
-		{
-		}
-		[Fact]
-		public void Test_7304()
-		{
-		}
-		[Fact]
-		public void Test_7305()
-		{
-		}
-		[Fact]
-		public void Test_7306()
-		{
-		}
-		[Fact]
-		public void Test_7307()
-		{
-		}
-		[Fact]
-		public void Test_7308()
-		{
-		}
-		[Fact]
-		public void Test_7309()
-		{
-		}
-		[Fact]
-		public void Test_7310()
-		{
-		}
-		[Fact]
-		public void Test_7311()
-		{
-		}
-		[Fact]
-		public void Test_7312()
-		{
-		}
-		[Fact]
-		public void Test_7313()
-		{
-		}
-		[Fact]
-		public void Test_7314()
-		{
-		}
-		[Fact]
-		public void Test_7315()
-		{
-		}
-		[Fact]
-		public void Test_7316()
-		{
-		}
-		[Fact]
-		public void Test_7317()
-		{
-		}
-		[Fact]
-		public void Test_7318()
-		{
-		}
-		[Fact]
-		public void Test_7319()
-		{
-		}
-		[Fact]
-		public void Test_7320()
-		{
-		}
-		[Fact]
-		public void Test_7321()
-		{
-		}
-		[Fact]
-		public void Test_7322()
-		{
-		}
-		[Fact]
-		public void Test_7323()
-		{
-		}
-		[Fact]
-		public void Test_7324()
-		{
-		}
-		[Fact]
-		public void Test_7325()
-		{
-		}
-		[Fact]
-		public void Test_7326()
-		{
-		}
-		[Fact]
-		public void Test_7327()
-		{
-		}
-		[Fact]
-		public void Test_7328()
-		{
-		}
-		[Fact]
-		public void Test_7329()
-		{
-		}
-		[Fact]
-		public void Test_7330()
-		{
-		}
-		[Fact]
-		public void Test_7331()
-		{
-		}
-		[Fact]
-		public void Test_7332()
-		{
-		}
-		[Fact]
-		public void Test_7333()
-		{
-		}
-		[Fact]
-		public void Test_7334()
-		{
-		}
-		[Fact]
-		public void Test_7335()
-		{
-		}
-		[Fact]
-		public void Test_7336()
-		{
-		}
-		[Fact]
-		public void Test_7337()
-		{
-		}
-		[Fact]
-		public void Test_7338()
-		{
-		}
-		[Fact]
-		public void Test_7339()
-		{
-		}
-		[Fact]
-		public void Test_7340()
-		{
-		}
-		[Fact]
-		public void Test_7341()
-		{
-		}
-		[Fact]
-		public void Test_7342()
-		{
-		}
-		[Fact]
-		public void Test_7343()
-		{
-		}
-		[Fact]
-		public void Test_7344()
-		{
-		}
-		[Fact]
-		public void Test_7345()
-		{
-		}
-		[Fact]
-		public void Test_7346()
-		{
-		}
-		[Fact]
-		public void Test_7347()
-		{
-		}
-		[Fact]
-		public void Test_7348()
-		{
-		}
-		[Fact]
-		public void Test_7349()
-		{
-		}
-		[Fact]
-		public void Test_7350()
-		{
-		}
-		[Fact]
-		public void Test_7351()
-		{
-		}
-		[Fact]
-		public void Test_7352()
-		{
-		}
-		[Fact]
-		public void Test_7353()
-		{
-		}
-		[Fact]
-		public void Test_7354()
-		{
-		}
-		[Fact]
-		public void Test_7355()
-		{
-		}
-		[Fact]
-		public void Test_7356()
-		{
-		}
-		[Fact]
-		public void Test_7357()
-		{
-		}
-		[Fact]
-		public void Test_7358()
-		{
-		}
-		[Fact]
-		public void Test_7359()
-		{
-		}
-		[Fact]
-		public void Test_7360()
-		{
-		}
-		[Fact]
-		public void Test_7361()
-		{
-		}
-		[Fact]
-		public void Test_7362()
-		{
-		}
-		[Fact]
-		public void Test_7363()
-		{
-		}
-		[Fact]
-		public void Test_7364()
-		{
-		}
-		[Fact]
-		public void Test_7365()
-		{
-		}
-		[Fact]
-		public void Test_7366()
-		{
-		}
-		[Fact]
-		public void Test_7367()
-		{
-		}
-		[Fact]
-		public void Test_7368()
-		{
-		}
-		[Fact]
-		public void Test_7369()
-		{
-		}
-		[Fact]
-		public void Test_7370()
-		{
-		}
-		[Fact]
-		public void Test_7371()
-		{
-		}
-		[Fact]
-		public void Test_7372()
-		{
-		}
-		[Fact]
-		public void Test_7373()
-		{
-		}
-		[Fact]
-		public void Test_7374()
-		{
-		}
-		[Fact]
-		public void Test_7375()
-		{
-		}
-		[Fact]
-		public void Test_7376()
-		{
-		}
-		[Fact]
-		public void Test_7377()
-		{
-		}
-		[Fact]
-		public void Test_7378()
-		{
-		}
-		[Fact]
-		public void Test_7379()
-		{
-		}
-		[Fact]
-		public void Test_7380()
-		{
-		}
-		[Fact]
-		public void Test_7381()
-		{
-		}
-		[Fact]
-		public void Test_7382()
-		{
-		}
-		[Fact]
-		public void Test_7383()
-		{
-		}
-		[Fact]
-		public void Test_7384()
-		{
-		}
-		[Fact]
-		public void Test_7385()
-		{
-		}
-		[Fact]
-		public void Test_7386()
-		{
-		}
-		[Fact]
-		public void Test_7387()
-		{
-		}
-		[Fact]
-		public void Test_7388()
-		{
-		}
-		[Fact]
-		public void Test_7389()
-		{
-		}
-		[Fact]
-		public void Test_7390()
-		{
-		}
-		[Fact]
-		public void Test_7391()
-		{
-		}
-		[Fact]
-		public void Test_7392()
-		{
-		}
-		[Fact]
-		public void Test_7393()
-		{
-		}
-		[Fact]
-		public void Test_7394()
-		{
-		}
-		[Fact]
-		public void Test_7395()
-		{
-		}
-		[Fact]
-		public void Test_7396()
-		{
-		}
-		[Fact]
-		public void Test_7397()
-		{
-		}
-		[Fact]
-		public void Test_7398()
-		{
-		}
-		[Fact]
-		public void Test_7399()
-		{
-		}
-		[Fact]
-		public void Test_7400()
-		{
-		}
-		[Fact]
-		public void Test_7401()
-		{
-		}
-		[Fact]
-		public void Test_7402()
-		{
-		}
-		[Fact]
-		public void Test_7403()
-		{
-		}
-		[Fact]
-		public void Test_7404()
-		{
-		}
-		[Fact]
-		public void Test_7405()
-		{
-		}
-		[Fact]
-		public void Test_7406()
-		{
-		}
-		[Fact]
-		public void Test_7407()
-		{
-		}
-		[Fact]
-		public void Test_7408()
-		{
-		}
-		[Fact]
-		public void Test_7409()
-		{
-		}
-		[Fact]
-		public void Test_7410()
-		{
-		}
-		[Fact]
-		public void Test_7411()
-		{
-		}
-		[Fact]
-		public void Test_7412()
-		{
-		}
-		[Fact]
-		public void Test_7413()
-		{
-		}
-		[Fact]
-		public void Test_7414()
-		{
-		}
-		[Fact]
-		public void Test_7415()
-		{
-		}
-		[Fact]
-		public void Test_7416()
-		{
-		}
-		[Fact]
-		public void Test_7417()
-		{
-		}
-		[Fact]
-		public void Test_7418()
-		{
-		}
-		[Fact]
-		public void Test_7419()
-		{
-		}
-		[Fact]
-		public void Test_7420()
-		{
-		}
-		[Fact]
-		public void Test_7421()
-		{
-		}
-		[Fact]
-		public void Test_7422()
-		{
-		}
-		[Fact]
-		public void Test_7423()
-		{
-		}
-		[Fact]
-		public void Test_7424()
-		{
-		}
-		[Fact]
-		public void Test_7425()
-		{
-		}
-		[Fact]
-		public void Test_7426()
-		{
-		}
-		[Fact]
-		public void Test_7427()
-		{
-		}
-		[Fact]
-		public void Test_7428()
-		{
-		}
-		[Fact]
-		public void Test_7429()
-		{
-		}
-		[Fact]
-		public void Test_7430()
-		{
-		}
-		[Fact]
-		public void Test_7431()
-		{
-		}
-		[Fact]
-		public void Test_7432()
-		{
-		}
-		[Fact]
-		public void Test_7433()
-		{
-		}
-		[Fact]
-		public void Test_7434()
-		{
-		}
-		[Fact]
-		public void Test_7435()
-		{
-		}
-		[Fact]
-		public void Test_7436()
-		{
-		}
-		[Fact]
-		public void Test_7437()
-		{
-		}
-		[Fact]
-		public void Test_7438()
-		{
-		}
-		[Fact]
-		public void Test_7439()
-		{
-		}
-		[Fact]
-		public void Test_7440()
-		{
-		}
-		[Fact]
-		public void Test_7441()
-		{
-		}
-		[Fact]
-		public void Test_7442()
-		{
-		}
-		[Fact]
-		public void Test_7443()
-		{
-		}
-		[Fact]
-		public void Test_7444()
-		{
-		}
-		[Fact]
-		public void Test_7445()
-		{
-		}
-		[Fact]
-		public void Test_7446()
-		{
-		}
-		[Fact]
-		public void Test_7447()
-		{
-		}
-		[Fact]
-		public void Test_7448()
-		{
-		}
-		[Fact]
-		public void Test_7449()
-		{
-		}
-		[Fact]
-		public void Test_7450()
-		{
-		}
-		[Fact]
-		public void Test_7451()
-		{
-		}
-		[Fact]
-		public void Test_7452()
-		{
-		}
-		[Fact]
-		public void Test_7453()
-		{
-		}
-		[Fact]
-		public void Test_7454()
-		{
-		}
-		[Fact]
-		public void Test_7455()
-		{
-		}
-		[Fact]
-		public void Test_7456()
-		{
-		}
-		[Fact]
-		public void Test_7457()
-		{
-		}
-		[Fact]
-		public void Test_7458()
-		{
-		}
-		[Fact]
-		public void Test_7459()
-		{
-		}
-		[Fact]
-		public void Test_7460()
-		{
-		}
-		[Fact]
-		public void Test_7461()
-		{
-		}
-		[Fact]
-		public void Test_7462()
-		{
-		}
-		[Fact]
-		public void Test_7463()
-		{
-		}
-		[Fact]
-		public void Test_7464()
-		{
-		}
-		[Fact]
-		public void Test_7465()
-		{
-		}
-		[Fact]
-		public void Test_7466()
-		{
-		}
-		[Fact]
-		public void Test_7467()
-		{
-		}
-		[Fact]
-		public void Test_7468()
-		{
-		}
-		[Fact]
-		public void Test_7469()
-		{
-		}
-		[Fact]
-		public void Test_7470()
-		{
-		}
-		[Fact]
-		public void Test_7471()
-		{
-		}
-		[Fact]
-		public void Test_7472()
-		{
-		}
-		[Fact]
-		public void Test_7473()
-		{
-		}
-		[Fact]
-		public void Test_7474()
-		{
-		}
-		[Fact]
-		public void Test_7475()
-		{
-		}
-		[Fact]
-		public void Test_7476()
-		{
-		}
-		[Fact]
-		public void Test_7477()
-		{
-		}
-		[Fact]
-		public void Test_7478()
-		{
-		}
-		[Fact]
-		public void Test_7479()
-		{
-		}
-		[Fact]
-		public void Test_7480()
-		{
-		}
-		[Fact]
-		public void Test_7481()
-		{
-		}
-		[Fact]
-		public void Test_7482()
-		{
-		}
-		[Fact]
-		public void Test_7483()
-		{
-		}
-		[Fact]
-		public void Test_7484()
-		{
-		}
-		[Fact]
-		public void Test_7485()
-		{
-		}
-		[Fact]
-		public void Test_7486()
-		{
-		}
-		[Fact]
-		public void Test_7487()
-		{
-		}
-		[Fact]
-		public void Test_7488()
-		{
-		}
-		[Fact]
-		public void Test_7489()
-		{
-		}
-		[Fact]
-		public void Test_7490()
-		{
-		}
-		[Fact]
-		public void Test_7491()
-		{
-		}
-		[Fact]
-		public void Test_7492()
-		{
-		}
-		[Fact]
-		public void Test_7493()
-		{
-		}
-		[Fact]
-		public void Test_7494()
-		{
-		}
-		[Fact]
-		public void Test_7495()
-		{
-		}
-		[Fact]
-		public void Test_7496()
-		{
-		}
-		[Fact]
-		public void Test_7497()
-		{
-		}
-		[Fact]
-		public void Test_7498()
-		{
-		}
-		[Fact]
-		public void Test_7499()
-		{
-		}
-		[Fact]
-		public void Test_7500()
-		{
-		}
-		[Fact]
-		public void Test_7501()
-		{
-		}
-		[Fact]
-		public void Test_7502()
-		{
-		}
-		[Fact]
-		public void Test_7503()
-		{
-		}
-		[Fact]
-		public void Test_7504()
-		{
-		}
-		[Fact]
-		public void Test_7505()
-		{
-		}
-		[Fact]
-		public void Test_7506()
-		{
-		}
-		[Fact]
-		public void Test_7507()
-		{
-		}
-		[Fact]
-		public void Test_7508()
-		{
-		}
-		[Fact]
-		public void Test_7509()
-		{
-		}
-		[Fact]
-		public void Test_7510()
-		{
-		}
-		[Fact]
-		public void Test_7511()
-		{
-		}
-		[Fact]
-		public void Test_7512()
-		{
-		}
-		[Fact]
-		public void Test_7513()
-		{
-		}
-		[Fact]
-		public void Test_7514()
-		{
-		}
-		[Fact]
-		public void Test_7515()
-		{
-		}
-		[Fact]
-		public void Test_7516()
-		{
-		}
-		[Fact]
-		public void Test_7517()
-		{
-		}
-		[Fact]
-		public void Test_7518()
-		{
-		}
-		[Fact]
-		public void Test_7519()
-		{
-		}
-		[Fact]
-		public void Test_7520()
-		{
-		}
-		[Fact]
-		public void Test_7521()
-		{
-		}
-		[Fact]
-		public void Test_7522()
-		{
-		}
-		[Fact]
-		public void Test_7523()
-		{
-		}
-		[Fact]
-		public void Test_7524()
-		{
-		}
-		[Fact]
-		public void Test_7525()
-		{
-		}
-		[Fact]
-		public void Test_7526()
-		{
-		}
-		[Fact]
-		public void Test_7527()
-		{
-		}
-		[Fact]
-		public void Test_7528()
-		{
-		}
-		[Fact]
-		public void Test_7529()
-		{
-		}
-		[Fact]
-		public void Test_7530()
-		{
-		}
-		[Fact]
-		public void Test_7531()
-		{
-		}
-		[Fact]
-		public void Test_7532()
-		{
-		}
-		[Fact]
-		public void Test_7533()
-		{
-		}
-		[Fact]
-		public void Test_7534()
-		{
-		}
-		[Fact]
-		public void Test_7535()
-		{
-		}
-		[Fact]
-		public void Test_7536()
-		{
-		}
-		[Fact]
-		public void Test_7537()
-		{
-		}
-		[Fact]
-		public void Test_7538()
-		{
-		}
-		[Fact]
-		public void Test_7539()
-		{
-		}
-		[Fact]
-		public void Test_7540()
-		{
-		}
-		[Fact]
-		public void Test_7541()
-		{
-		}
-		[Fact]
-		public void Test_7542()
-		{
-		}
-		[Fact]
-		public void Test_7543()
-		{
-		}
-		[Fact]
-		public void Test_7544()
-		{
-		}
-		[Fact]
-		public void Test_7545()
-		{
-		}
-		[Fact]
-		public void Test_7546()
-		{
-		}
-		[Fact]
-		public void Test_7547()
-		{
-		}
-		[Fact]
-		public void Test_7548()
-		{
-		}
-		[Fact]
-		public void Test_7549()
-		{
-		}
-		[Fact]
-		public void Test_7550()
-		{
-		}
-		[Fact]
-		public void Test_7551()
-		{
-		}
-		[Fact]
-		public void Test_7552()
-		{
-		}
-		[Fact]
-		public void Test_7553()
-		{
-		}
-		[Fact]
-		public void Test_7554()
-		{
-		}
-		[Fact]
-		public void Test_7555()
-		{
-		}
-		[Fact]
-		public void Test_7556()
-		{
-		}
-		[Fact]
-		public void Test_7557()
-		{
-		}
-		[Fact]
-		public void Test_7558()
-		{
-		}
-		[Fact]
-		public void Test_7559()
-		{
-		}
-		[Fact]
-		public void Test_7560()
-		{
-		}
-		[Fact]
-		public void Test_7561()
-		{
-		}
-		[Fact]
-		public void Test_7562()
-		{
-		}
-		[Fact]
-		public void Test_7563()
-		{
-		}
-		[Fact]
-		public void Test_7564()
-		{
-		}
-		[Fact]
-		public void Test_7565()
-		{
-		}
-		[Fact]
-		public void Test_7566()
-		{
-		}
-		[Fact]
-		public void Test_7567()
-		{
-		}
-		[Fact]
-		public void Test_7568()
-		{
-		}
-		[Fact]
-		public void Test_7569()
-		{
-		}
-		[Fact]
-		public void Test_7570()
-		{
-		}
-		[Fact]
-		public void Test_7571()
-		{
-		}
-		[Fact]
-		public void Test_7572()
-		{
-		}
-		[Fact]
-		public void Test_7573()
-		{
-		}
-		[Fact]
-		public void Test_7574()
-		{
-		}
-		[Fact]
-		public void Test_7575()
-		{
-		}
-		[Fact]
-		public void Test_7576()
-		{
-		}
-		[Fact]
-		public void Test_7577()
-		{
-		}
-		[Fact]
-		public void Test_7578()
-		{
-		}
-		[Fact]
-		public void Test_7579()
-		{
-		}
-		[Fact]
-		public void Test_7580()
-		{
-		}
-		[Fact]
-		public void Test_7581()
-		{
-		}
-		[Fact]
-		public void Test_7582()
-		{
-		}
-		[Fact]
-		public void Test_7583()
-		{
-		}
-		[Fact]
-		public void Test_7584()
-		{
-		}
-		[Fact]
-		public void Test_7585()
-		{
-		}
-		[Fact]
-		public void Test_7586()
-		{
-		}
-		[Fact]
-		public void Test_7587()
-		{
-		}
-		[Fact]
-		public void Test_7588()
-		{
-		}
-		[Fact]
-		public void Test_7589()
-		{
-		}
-		[Fact]
-		public void Test_7590()
-		{
-		}
-		[Fact]
-		public void Test_7591()
-		{
-		}
-		[Fact]
-		public void Test_7592()
-		{
-		}
-		[Fact]
-		public void Test_7593()
-		{
-		}
-		[Fact]
-		public void Test_7594()
-		{
-		}
-		[Fact]
-		public void Test_7595()
-		{
-		}
-		[Fact]
-		public void Test_7596()
-		{
-		}
-		[Fact]
-		public void Test_7597()
-		{
-		}
-		[Fact]
-		public void Test_7598()
-		{
-		}
-		[Fact]
-		public void Test_7599()
-		{
-		}
-		[Fact]
-		public void Test_7600()
-		{
-		}
-		[Fact]
-		public void Test_7601()
-		{
-		}
-		[Fact]
-		public void Test_7602()
-		{
-		}
-		[Fact]
-		public void Test_7603()
-		{
-		}
-		[Fact]
-		public void Test_7604()
-		{
-		}
-		[Fact]
-		public void Test_7605()
-		{
-		}
-		[Fact]
-		public void Test_7606()
-		{
-		}
-		[Fact]
-		public void Test_7607()
-		{
-		}
-		[Fact]
-		public void Test_7608()
-		{
-		}
-		[Fact]
-		public void Test_7609()
-		{
-		}
-		[Fact]
-		public void Test_7610()
-		{
-		}
-		[Fact]
-		public void Test_7611()
-		{
-		}
-		[Fact]
-		public void Test_7612()
-		{
-		}
-		[Fact]
-		public void Test_7613()
-		{
-		}
-		[Fact]
-		public void Test_7614()
-		{
-		}
-		[Fact]
-		public void Test_7615()
-		{
-		}
-		[Fact]
-		public void Test_7616()
-		{
-		}
-		[Fact]
-		public void Test_7617()
-		{
-		}
-		[Fact]
-		public void Test_7618()
-		{
-		}
-		[Fact]
-		public void Test_7619()
-		{
-		}
-		[Fact]
-		public void Test_7620()
-		{
-		}
-		[Fact]
-		public void Test_7621()
-		{
-		}
-		[Fact]
-		public void Test_7622()
-		{
-		}
-		[Fact]
-		public void Test_7623()
-		{
-		}
-		[Fact]
-		public void Test_7624()
-		{
-		}
-		[Fact]
-		public void Test_7625()
-		{
-		}
-		[Fact]
-		public void Test_7626()
-		{
-		}
-		[Fact]
-		public void Test_7627()
-		{
-		}
-		[Fact]
-		public void Test_7628()
-		{
-		}
-		[Fact]
-		public void Test_7629()
-		{
-		}
-		[Fact]
-		public void Test_7630()
-		{
-		}
-		[Fact]
-		public void Test_7631()
-		{
-		}
-		[Fact]
-		public void Test_7632()
-		{
-		}
-		[Fact]
-		public void Test_7633()
-		{
-		}
-		[Fact]
-		public void Test_7634()
-		{
-		}
-		[Fact]
-		public void Test_7635()
-		{
-		}
-		[Fact]
-		public void Test_7636()
-		{
-		}
-		[Fact]
-		public void Test_7637()
-		{
-		}
-		[Fact]
-		public void Test_7638()
-		{
-		}
-		[Fact]
-		public void Test_7639()
-		{
-		}
-		[Fact]
-		public void Test_7640()
-		{
-		}
-		[Fact]
-		public void Test_7641()
-		{
-		}
-		[Fact]
-		public void Test_7642()
-		{
-		}
-		[Fact]
-		public void Test_7643()
-		{
-		}
-		[Fact]
-		public void Test_7644()
-		{
-		}
-		[Fact]
-		public void Test_7645()
-		{
-		}
-		[Fact]
-		public void Test_7646()
-		{
-		}
-		[Fact]
-		public void Test_7647()
-		{
-		}
-		[Fact]
-		public void Test_7648()
-		{
-		}
-		[Fact]
-		public void Test_7649()
-		{
-		}
-		[Fact]
-		public void Test_7650()
-		{
-		}
-		[Fact]
-		public void Test_7651()
-		{
-		}
-		[Fact]
-		public void Test_7652()
-		{
-		}
-		[Fact]
-		public void Test_7653()
-		{
-		}
-		[Fact]
-		public void Test_7654()
-		{
-		}
-		[Fact]
-		public void Test_7655()
-		{
-		}
-		[Fact]
-		public void Test_7656()
-		{
-		}
-		[Fact]
-		public void Test_7657()
-		{
-		}
-		[Fact]
-		public void Test_7658()
-		{
-		}
-		[Fact]
-		public void Test_7659()
-		{
-		}
-		[Fact]
-		public void Test_7660()
-		{
-		}
-		[Fact]
-		public void Test_7661()
-		{
-		}
-		[Fact]
-		public void Test_7662()
-		{
-		}
-		[Fact]
-		public void Test_7663()
-		{
-		}
-		[Fact]
-		public void Test_7664()
-		{
-		}
-		[Fact]
-		public void Test_7665()
-		{
-		}
-		[Fact]
-		public void Test_7666()
-		{
-		}
-		[Fact]
-		public void Test_7667()
-		{
-		}
-		[Fact]
-		public void Test_7668()
-		{
-		}
-		[Fact]
-		public void Test_7669()
-		{
-		}
-		[Fact]
-		public void Test_7670()
-		{
-		}
-		[Fact]
-		public void Test_7671()
-		{
-		}
-		[Fact]
-		public void Test_7672()
-		{
-		}
-		[Fact]
-		public void Test_7673()
-		{
-		}
-		[Fact]
-		public void Test_7674()
-		{
-		}
-		[Fact]
-		public void Test_7675()
-		{
-		}
-		[Fact]
-		public void Test_7676()
-		{
-		}
-		[Fact]
-		public void Test_7677()
-		{
-		}
-		[Fact]
-		public void Test_7678()
-		{
-		}
-		[Fact]
-		public void Test_7679()
-		{
-		}
-		[Fact]
-		public void Test_7680()
-		{
-		}
-		[Fact]
-		public void Test_7681()
-		{
-		}
-		[Fact]
-		public void Test_7682()
-		{
-		}
-		[Fact]
-		public void Test_7683()
-		{
-		}
-		[Fact]
-		public void Test_7684()
-		{
-		}
-		[Fact]
-		public void Test_7685()
-		{
-		}
-		[Fact]
-		public void Test_7686()
-		{
-		}
-		[Fact]
-		public void Test_7687()
-		{
-		}
-		[Fact]
-		public void Test_7688()
-		{
-		}
-		[Fact]
-		public void Test_7689()
-		{
-		}
-		[Fact]
-		public void Test_7690()
-		{
-		}
-		[Fact]
-		public void Test_7691()
-		{
-		}
-		[Fact]
-		public void Test_7692()
-		{
-		}
-		[Fact]
-		public void Test_7693()
-		{
-		}
-		[Fact]
-		public void Test_7694()
-		{
-		}
-		[Fact]
-		public void Test_7695()
-		{
-		}
-		[Fact]
-		public void Test_7696()
-		{
-		}
-		[Fact]
-		public void Test_7697()
-		{
-		}
-		[Fact]
-		public void Test_7698()
-		{
-		}
-		[Fact]
-		public void Test_7699()
-		{
-		}
-		[Fact]
-		public void Test_7700()
-		{
-		}
-		[Fact]
-		public void Test_7701()
-		{
-		}
-		[Fact]
-		public void Test_7702()
-		{
-		}
-		[Fact]
-		public void Test_7703()
-		{
-		}
-		[Fact]
-		public void Test_7704()
-		{
-		}
-		[Fact]
-		public void Test_7705()
-		{
-		}
-		[Fact]
-		public void Test_7706()
-		{
-		}
-		[Fact]
-		public void Test_7707()
-		{
-		}
-		[Fact]
-		public void Test_7708()
-		{
-		}
-		[Fact]
-		public void Test_7709()
-		{
-		}
-		[Fact]
-		public void Test_7710()
-		{
-		}
-		[Fact]
-		public void Test_7711()
-		{
-		}
-		[Fact]
-		public void Test_7712()
-		{
-		}
-		[Fact]
-		public void Test_7713()
-		{
-		}
-		[Fact]
-		public void Test_7714()
-		{
-		}
-		[Fact]
-		public void Test_7715()
-		{
-		}
-		[Fact]
-		public void Test_7716()
-		{
-		}
-		[Fact]
-		public void Test_7717()
-		{
-		}
-		[Fact]
-		public void Test_7718()
-		{
-		}
-		[Fact]
-		public void Test_7719()
-		{
-		}
-		[Fact]
-		public void Test_7720()
-		{
-		}
-		[Fact]
-		public void Test_7721()
-		{
-		}
-		[Fact]
-		public void Test_7722()
-		{
-		}
-		[Fact]
-		public void Test_7723()
-		{
-		}
-		[Fact]
-		public void Test_7724()
-		{
-		}
-		[Fact]
-		public void Test_7725()
-		{
-		}
-		[Fact]
-		public void Test_7726()
-		{
-		}
-		[Fact]
-		public void Test_7727()
-		{
-		}
-		[Fact]
-		public void Test_7728()
-		{
-		}
-		[Fact]
-		public void Test_7729()
-		{
-		}
-		[Fact]
-		public void Test_7730()
-		{
-		}
-		[Fact]
-		public void Test_7731()
-		{
-		}
-		[Fact]
-		public void Test_7732()
-		{
-		}
-		[Fact]
-		public void Test_7733()
-		{
-		}
-		[Fact]
-		public void Test_7734()
-		{
-		}
-		[Fact]
-		public void Test_7735()
-		{
-		}
-		[Fact]
-		public void Test_7736()
-		{
-		}
-		[Fact]
-		public void Test_7737()
-		{
-		}
-		[Fact]
-		public void Test_7738()
-		{
-		}
-		[Fact]
-		public void Test_7739()
-		{
-		}
-		[Fact]
-		public void Test_7740()
-		{
-		}
-		[Fact]
-		public void Test_7741()
-		{
-		}
-		[Fact]
-		public void Test_7742()
-		{
-		}
-		[Fact]
-		public void Test_7743()
-		{
-		}
-		[Fact]
-		public void Test_7744()
-		{
-		}
-		[Fact]
-		public void Test_7745()
-		{
-		}
-		[Fact]
-		public void Test_7746()
-		{
-		}
-		[Fact]
-		public void Test_7747()
-		{
-		}
-		[Fact]
-		public void Test_7748()
-		{
-		}
-		[Fact]
-		public void Test_7749()
-		{
-		}
-		[Fact]
-		public void Test_7750()
-		{
-		}
-		[Fact]
-		public void Test_7751()
-		{
-		}
-		[Fact]
-		public void Test_7752()
-		{
-		}
-		[Fact]
-		public void Test_7753()
-		{
-		}
-		[Fact]
-		public void Test_7754()
-		{
-		}
-		[Fact]
-		public void Test_7755()
-		{
-		}
-		[Fact]
-		public void Test_7756()
-		{
-		}
-		[Fact]
-		public void Test_7757()
-		{
-		}
-		[Fact]
-		public void Test_7758()
-		{
-		}
-		[Fact]
-		public void Test_7759()
-		{
-		}
-		[Fact]
-		public void Test_7760()
-		{
-		}
-		[Fact]
-		public void Test_7761()
-		{
-		}
-		[Fact]
-		public void Test_7762()
-		{
-		}
-		[Fact]
-		public void Test_7763()
-		{
-		}
-		[Fact]
-		public void Test_7764()
-		{
-		}
-		[Fact]
-		public void Test_7765()
-		{
-		}
-		[Fact]
-		public void Test_7766()
-		{
-		}
-		[Fact]
-		public void Test_7767()
-		{
-		}
-		[Fact]
-		public void Test_7768()
-		{
-		}
-		[Fact]
-		public void Test_7769()
-		{
-		}
-		[Fact]
-		public void Test_7770()
-		{
-		}
-		[Fact]
-		public void Test_7771()
-		{
-		}
-		[Fact]
-		public void Test_7772()
-		{
-		}
-		[Fact]
-		public void Test_7773()
-		{
-		}
-		[Fact]
-		public void Test_7774()
-		{
-		}
-		[Fact]
-		public void Test_7775()
-		{
-		}
-		[Fact]
-		public void Test_7776()
-		{
-		}
-		[Fact]
-		public void Test_7777()
-		{
-		}
-		[Fact]
-		public void Test_7778()
-		{
-		}
-		[Fact]
-		public void Test_7779()
-		{
-		}
-		[Fact]
-		public void Test_7780()
-		{
-		}
-		[Fact]
-		public void Test_7781()
-		{
-		}
-		[Fact]
-		public void Test_7782()
-		{
-		}
-		[Fact]
-		public void Test_7783()
-		{
-		}
-		[Fact]
-		public void Test_7784()
-		{
-		}
-		[Fact]
-		public void Test_7785()
-		{
-		}
-		[Fact]
-		public void Test_7786()
-		{
-		}
-		[Fact]
-		public void Test_7787()
-		{
-		}
-		[Fact]
-		public void Test_7788()
-		{
-		}
-		[Fact]
-		public void Test_7789()
-		{
-		}
-		[Fact]
-		public void Test_7790()
-		{
-		}
-		[Fact]
-		public void Test_7791()
-		{
-		}
-		[Fact]
-		public void Test_7792()
-		{
-		}
-		[Fact]
-		public void Test_7793()
-		{
-		}
-		[Fact]
-		public void Test_7794()
-		{
-		}
-		[Fact]
-		public void Test_7795()
-		{
-		}
-		[Fact]
-		public void Test_7796()
-		{
-		}
-		[Fact]
-		public void Test_7797()
-		{
-		}
-		[Fact]
-		public void Test_7798()
-		{
-		}
-		[Fact]
-		public void Test_7799()
-		{
-		}
-		[Fact]
-		public void Test_7800()
-		{
-		}
-		[Fact]
-		public void Test_7801()
-		{
-		}
-		[Fact]
-		public void Test_7802()
-		{
-		}
-		[Fact]
-		public void Test_7803()
-		{
-		}
-		[Fact]
-		public void Test_7804()
-		{
-		}
-		[Fact]
-		public void Test_7805()
-		{
-		}
-		[Fact]
-		public void Test_7806()
-		{
-		}
-		[Fact]
-		public void Test_7807()
-		{
-		}
-		[Fact]
-		public void Test_7808()
-		{
-		}
-		[Fact]
-		public void Test_7809()
-		{
-		}
-		[Fact]
-		public void Test_7810()
-		{
-		}
-		[Fact]
-		public void Test_7811()
-		{
-		}
-		[Fact]
-		public void Test_7812()
-		{
-		}
-		[Fact]
-		public void Test_7813()
-		{
-		}
-		[Fact]
-		public void Test_7814()
-		{
-		}
-		[Fact]
-		public void Test_7815()
-		{
-		}
-		[Fact]
-		public void Test_7816()
-		{
-		}
-		[Fact]
-		public void Test_7817()
-		{
-		}
-		[Fact]
-		public void Test_7818()
-		{
-		}
-		[Fact]
-		public void Test_7819()
-		{
-		}
-		[Fact]
-		public void Test_7820()
-		{
-		}
-		[Fact]
-		public void Test_7821()
-		{
-		}
-		[Fact]
-		public void Test_7822()
-		{
-		}
-		[Fact]
-		public void Test_7823()
-		{
-		}
-		[Fact]
-		public void Test_7824()
-		{
-		}
-		[Fact]
-		public void Test_7825()
-		{
-		}
-		[Fact]
-		public void Test_7826()
-		{
-		}
-		[Fact]
-		public void Test_7827()
-		{
-		}
-		[Fact]
-		public void Test_7828()
-		{
-		}
-		[Fact]
-		public void Test_7829()
-		{
-		}
-		[Fact]
-		public void Test_7830()
-		{
-		}
-		[Fact]
-		public void Test_7831()
-		{
-		}
-		[Fact]
-		public void Test_7832()
-		{
-		}
-		[Fact]
-		public void Test_7833()
-		{
-		}
-		[Fact]
-		public void Test_7834()
-		{
-		}
-		[Fact]
-		public void Test_7835()
-		{
-		}
-		[Fact]
-		public void Test_7836()
-		{
-		}
-		[Fact]
-		public void Test_7837()
-		{
-		}
-		[Fact]
-		public void Test_7838()
-		{
-		}
-		[Fact]
-		public void Test_7839()
-		{
-		}
-		[Fact]
-		public void Test_7840()
-		{
-		}
-		[Fact]
-		public void Test_7841()
-		{
-		}
-		[Fact]
-		public void Test_7842()
-		{
-		}
-		[Fact]
-		public void Test_7843()
-		{
-		}
-		[Fact]
-		public void Test_7844()
-		{
-		}
-		[Fact]
-		public void Test_7845()
-		{
-		}
-		[Fact]
-		public void Test_7846()
-		{
-		}
-		[Fact]
-		public void Test_7847()
-		{
-		}
-		[Fact]
-		public void Test_7848()
-		{
-		}
-		[Fact]
-		public void Test_7849()
-		{
-		}
-		[Fact]
-		public void Test_7850()
-		{
-		}
-		[Fact]
-		public void Test_7851()
-		{
-		}
-		[Fact]
-		public void Test_7852()
-		{
-		}
-		[Fact]
-		public void Test_7853()
-		{
-		}
-		[Fact]
-		public void Test_7854()
-		{
-		}
-		[Fact]
-		public void Test_7855()
-		{
-		}
-		[Fact]
-		public void Test_7856()
-		{
-		}
-		[Fact]
-		public void Test_7857()
-		{
-		}
-		[Fact]
-		public void Test_7858()
-		{
-		}
-		[Fact]
-		public void Test_7859()
-		{
-		}
-		[Fact]
-		public void Test_7860()
-		{
-		}
-		[Fact]
-		public void Test_7861()
-		{
-		}
-		[Fact]
-		public void Test_7862()
-		{
-		}
-		[Fact]
-		public void Test_7863()
-		{
-		}
-		[Fact]
-		public void Test_7864()
-		{
-		}
-		[Fact]
-		public void Test_7865()
-		{
-		}
-		[Fact]
-		public void Test_7866()
-		{
-		}
-		[Fact]
-		public void Test_7867()
-		{
-		}
-		[Fact]
-		public void Test_7868()
-		{
-		}
-		[Fact]
-		public void Test_7869()
-		{
-		}
-		[Fact]
-		public void Test_7870()
-		{
-		}
-		[Fact]
-		public void Test_7871()
-		{
-		}
-		[Fact]
-		public void Test_7872()
-		{
-		}
-		[Fact]
-		public void Test_7873()
-		{
-		}
-		[Fact]
-		public void Test_7874()
-		{
-		}
-		[Fact]
-		public void Test_7875()
-		{
-		}
-		[Fact]
-		public void Test_7876()
-		{
-		}
-		[Fact]
-		public void Test_7877()
-		{
-		}
-		[Fact]
-		public void Test_7878()
-		{
-		}
-		[Fact]
-		public void Test_7879()
-		{
-		}
-		[Fact]
-		public void Test_7880()
-		{
-		}
-		[Fact]
-		public void Test_7881()
-		{
-		}
-		[Fact]
-		public void Test_7882()
-		{
-		}
-		[Fact]
-		public void Test_7883()
-		{
-		}
-		[Fact]
-		public void Test_7884()
-		{
-		}
-		[Fact]
-		public void Test_7885()
-		{
-		}
-		[Fact]
-		public void Test_7886()
-		{
-		}
-		[Fact]
-		public void Test_7887()
-		{
-		}
-		[Fact]
-		public void Test_7888()
-		{
-		}
-		[Fact]
-		public void Test_7889()
-		{
-		}
-		[Fact]
-		public void Test_7890()
-		{
-		}
-		[Fact]
-		public void Test_7891()
-		{
-		}
-		[Fact]
-		public void Test_7892()
-		{
-		}
-		[Fact]
-		public void Test_7893()
-		{
-		}
-		[Fact]
-		public void Test_7894()
-		{
-		}
-		[Fact]
-		public void Test_7895()
-		{
-		}
-		[Fact]
-		public void Test_7896()
-		{
-		}
-		[Fact]
-		public void Test_7897()
-		{
-		}
-		[Fact]
-		public void Test_7898()
-		{
-		}
-		[Fact]
-		public void Test_7899()
-		{
-		}
-		[Fact]
-		public void Test_7900()
-		{
-		}
-		[Fact]
-		public void Test_7901()
-		{
-		}
-		[Fact]
-		public void Test_7902()
-		{
-		}
-		[Fact]
-		public void Test_7903()
-		{
-		}
-		[Fact]
-		public void Test_7904()
-		{
-		}
-		[Fact]
-		public void Test_7905()
-		{
-		}
-		[Fact]
-		public void Test_7906()
-		{
-		}
-		[Fact]
-		public void Test_7907()
-		{
-		}
-		[Fact]
-		public void Test_7908()
-		{
-		}
-		[Fact]
-		public void Test_7909()
-		{
-		}
-		[Fact]
-		public void Test_7910()
-		{
-		}
-		[Fact]
-		public void Test_7911()
-		{
-		}
-		[Fact]
-		public void Test_7912()
-		{
-		}
-		[Fact]
-		public void Test_7913()
-		{
-		}
-		[Fact]
-		public void Test_7914()
-		{
-		}
-		[Fact]
-		public void Test_7915()
-		{
-		}
-		[Fact]
-		public void Test_7916()
-		{
-		}
-		[Fact]
-		public void Test_7917()
-		{
-		}
-		[Fact]
-		public void Test_7918()
-		{
-		}
-		[Fact]
-		public void Test_7919()
-		{
-		}
-		[Fact]
-		public void Test_7920()
-		{
-		}
-		[Fact]
-		public void Test_7921()
-		{
-		}
-		[Fact]
-		public void Test_7922()
-		{
-		}
-		[Fact]
-		public void Test_7923()
-		{
-		}
-		[Fact]
-		public void Test_7924()
-		{
-		}
-		[Fact]
-		public void Test_7925()
-		{
-		}
-		[Fact]
-		public void Test_7926()
-		{
-		}
-		[Fact]
-		public void Test_7927()
-		{
-		}
-		[Fact]
-		public void Test_7928()
-		{
-		}
-		[Fact]
-		public void Test_7929()
-		{
-		}
-		[Fact]
-		public void Test_7930()
-		{
-		}
-		[Fact]
-		public void Test_7931()
-		{
-		}
-		[Fact]
-		public void Test_7932()
-		{
-		}
-		[Fact]
-		public void Test_7933()
-		{
-		}
-		[Fact]
-		public void Test_7934()
-		{
-		}
-		[Fact]
-		public void Test_7935()
-		{
-		}
-		[Fact]
-		public void Test_7936()
-		{
-		}
-		[Fact]
-		public void Test_7937()
-		{
-		}
-		[Fact]
-		public void Test_7938()
-		{
-		}
-		[Fact]
-		public void Test_7939()
-		{
-		}
-		[Fact]
-		public void Test_7940()
-		{
-		}
-		[Fact]
-		public void Test_7941()
-		{
-		}
-		[Fact]
-		public void Test_7942()
-		{
-		}
-		[Fact]
-		public void Test_7943()
-		{
-		}
-		[Fact]
-		public void Test_7944()
-		{
-		}
-		[Fact]
-		public void Test_7945()
-		{
-		}
-		[Fact]
-		public void Test_7946()
-		{
-		}
-		[Fact]
-		public void Test_7947()
-		{
-		}
-		[Fact]
-		public void Test_7948()
-		{
-		}
-		[Fact]
-		public void Test_7949()
-		{
-		}
-		[Fact]
-		public void Test_7950()
-		{
-		}
-		[Fact]
-		public void Test_7951()
-		{
-		}
-		[Fact]
-		public void Test_7952()
-		{
-		}
-		[Fact]
-		public void Test_7953()
-		{
-		}
-		[Fact]
-		public void Test_7954()
-		{
-		}
-		[Fact]
-		public void Test_7955()
-		{
-		}
-		[Fact]
-		public void Test_7956()
-		{
-		}
-		[Fact]
-		public void Test_7957()
-		{
-		}
-		[Fact]
-		public void Test_7958()
-		{
-		}
-		[Fact]
-		public void Test_7959()
-		{
-		}
-		[Fact]
-		public void Test_7960()
-		{
-		}
-		[Fact]
-		public void Test_7961()
-		{
-		}
-		[Fact]
-		public void Test_7962()
-		{
-		}
-		[Fact]
-		public void Test_7963()
-		{
-		}
-		[Fact]
-		public void Test_7964()
-		{
-		}
-		[Fact]
-		public void Test_7965()
-		{
-		}
-		[Fact]
-		public void Test_7966()
-		{
-		}
-		[Fact]
-		public void Test_7967()
-		{
-		}
-		[Fact]
-		public void Test_7968()
-		{
-		}
-		[Fact]
-		public void Test_7969()
-		{
-		}
-		[Fact]
-		public void Test_7970()
-		{
-		}
-		[Fact]
-		public void Test_7971()
-		{
-		}
-		[Fact]
-		public void Test_7972()
-		{
-		}
-		[Fact]
-		public void Test_7973()
-		{
-		}
-		[Fact]
-		public void Test_7974()
-		{
-		}
-		[Fact]
-		public void Test_7975()
-		{
-		}
-		[Fact]
-		public void Test_7976()
-		{
-		}
-		[Fact]
-		public void Test_7977()
-		{
-		}
-		[Fact]
-		public void Test_7978()
-		{
-		}
-		[Fact]
-		public void Test_7979()
-		{
-		}
-		[Fact]
-		public void Test_7980()
-		{
-		}
-		[Fact]
-		public void Test_7981()
-		{
-		}
-		[Fact]
-		public void Test_7982()
-		{
-		}
-		[Fact]
-		public void Test_7983()
-		{
-		}
-		[Fact]
-		public void Test_7984()
-		{
-		}
-		[Fact]
-		public void Test_7985()
-		{
-		}
-		[Fact]
-		public void Test_7986()
-		{
-		}
-		[Fact]
-		public void Test_7987()
-		{
-		}
-		[Fact]
-		public void Test_7988()
-		{
-		}
-		[Fact]
-		public void Test_7989()
-		{
-		}
-		[Fact]
-		public void Test_7990()
-		{
-		}
-		[Fact]
-		public void Test_7991()
-		{
-		}
-		[Fact]
-		public void Test_7992()
-		{
-		}
-		[Fact]
-		public void Test_7993()
-		{
-		}
-		[Fact]
-		public void Test_7994()
-		{
-		}
-		[Fact]
-		public void Test_7995()
-		{
-		}
-		[Fact]
-		public void Test_7996()
-		{
-		}
-		[Fact]
-		public void Test_7997()
-		{
-		}
-		[Fact]
-		public void Test_7998()
-		{
-		}
-		[Fact]
-		public void Test_7999()
-		{
-		}
-		[Fact]
-		public void Test_8000()
-		{
-		}
-		[Fact]
-		public void Test_8001()
-		{
-		}
-		[Fact]
-		public void Test_8002()
-		{
-		}
-		[Fact]
-		public void Test_8003()
-		{
-		}
-		[Fact]
-		public void Test_8004()
-		{
-		}
-		[Fact]
-		public void Test_8005()
-		{
-		}
-		[Fact]
-		public void Test_8006()
-		{
-		}
-		[Fact]
-		public void Test_8007()
-		{
-		}
-		[Fact]
-		public void Test_8008()
-		{
-		}
-		[Fact]
-		public void Test_8009()
-		{
-		}
-		[Fact]
-		public void Test_8010()
-		{
-		}
-		[Fact]
-		public void Test_8011()
-		{
-		}
-		[Fact]
-		public void Test_8012()
-		{
-		}
-		[Fact]
-		public void Test_8013()
-		{
-		}
-		[Fact]
-		public void Test_8014()
-		{
-		}
-		[Fact]
-		public void Test_8015()
-		{
-		}
-		[Fact]
-		public void Test_8016()
-		{
-		}
-		[Fact]
-		public void Test_8017()
-		{
-		}
-		[Fact]
-		public void Test_8018()
-		{
-		}
-		[Fact]
-		public void Test_8019()
-		{
-		}
-		[Fact]
-		public void Test_8020()
-		{
-		}
-		[Fact]
-		public void Test_8021()
-		{
-		}
-		[Fact]
-		public void Test_8022()
-		{
-		}
-		[Fact]
-		public void Test_8023()
-		{
-		}
-		[Fact]
-		public void Test_8024()
-		{
-		}
-		[Fact]
-		public void Test_8025()
-		{
-		}
-		[Fact]
-		public void Test_8026()
-		{
-		}
-		[Fact]
-		public void Test_8027()
-		{
-		}
-		[Fact]
-		public void Test_8028()
-		{
-		}
-		[Fact]
-		public void Test_8029()
-		{
-		}
-		[Fact]
-		public void Test_8030()
-		{
-		}
-		[Fact]
-		public void Test_8031()
-		{
-		}
-		[Fact]
-		public void Test_8032()
-		{
-		}
-		[Fact]
-		public void Test_8033()
-		{
-		}
-		[Fact]
-		public void Test_8034()
-		{
-		}
-		[Fact]
-		public void Test_8035()
-		{
-		}
-		[Fact]
-		public void Test_8036()
-		{
-		}
-		[Fact]
-		public void Test_8037()
-		{
-		}
-		[Fact]
-		public void Test_8038()
-		{
-		}
-		[Fact]
-		public void Test_8039()
-		{
-		}
-		[Fact]
-		public void Test_8040()
-		{
-		}
-		[Fact]
-		public void Test_8041()
-		{
-		}
-		[Fact]
-		public void Test_8042()
-		{
-		}
-		[Fact]
-		public void Test_8043()
-		{
-		}
-		[Fact]
-		public void Test_8044()
-		{
-		}
-		[Fact]
-		public void Test_8045()
-		{
-		}
-		[Fact]
-		public void Test_8046()
-		{
-		}
-		[Fact]
-		public void Test_8047()
-		{
-		}
-		[Fact]
-		public void Test_8048()
-		{
-		}
-		[Fact]
-		public void Test_8049()
-		{
-		}
-		[Fact]
-		public void Test_8050()
-		{
-		}
-		[Fact]
-		public void Test_8051()
-		{
-		}
-		[Fact]
-		public void Test_8052()
-		{
-		}
-		[Fact]
-		public void Test_8053()
-		{
-		}
-		[Fact]
-		public void Test_8054()
-		{
-		}
-		[Fact]
-		public void Test_8055()
-		{
-		}
-		[Fact]
-		public void Test_8056()
-		{
-		}
-		[Fact]
-		public void Test_8057()
-		{
-		}
-		[Fact]
-		public void Test_8058()
-		{
-		}
-		[Fact]
-		public void Test_8059()
-		{
-		}
-		[Fact]
-		public void Test_8060()
-		{
-		}
-		[Fact]
-		public void Test_8061()
-		{
-		}
-		[Fact]
-		public void Test_8062()
-		{
-		}
-		[Fact]
-		public void Test_8063()
-		{
-		}
-		[Fact]
-		public void Test_8064()
-		{
-		}
-		[Fact]
-		public void Test_8065()
-		{
-		}
-		[Fact]
-		public void Test_8066()
-		{
-		}
-		[Fact]
-		public void Test_8067()
-		{
-		}
-		[Fact]
-		public void Test_8068()
-		{
-		}
-		[Fact]
-		public void Test_8069()
-		{
-		}
-		[Fact]
-		public void Test_8070()
-		{
-		}
-		[Fact]
-		public void Test_8071()
-		{
-		}
-		[Fact]
-		public void Test_8072()
-		{
-		}
-		[Fact]
-		public void Test_8073()
-		{
-		}
-		[Fact]
-		public void Test_8074()
-		{
-		}
-		[Fact]
-		public void Test_8075()
-		{
-		}
-		[Fact]
-		public void Test_8076()
-		{
-		}
-		[Fact]
-		public void Test_8077()
-		{
-		}
-		[Fact]
-		public void Test_8078()
-		{
-		}
-		[Fact]
-		public void Test_8079()
-		{
-		}
-		[Fact]
-		public void Test_8080()
-		{
-		}
-		[Fact]
-		public void Test_8081()
-		{
-		}
-		[Fact]
-		public void Test_8082()
-		{
-		}
-		[Fact]
-		public void Test_8083()
-		{
-		}
-		[Fact]
-		public void Test_8084()
-		{
-		}
-		[Fact]
-		public void Test_8085()
-		{
-		}
-		[Fact]
-		public void Test_8086()
-		{
-		}
-		[Fact]
-		public void Test_8087()
-		{
-		}
-		[Fact]
-		public void Test_8088()
-		{
-		}
-		[Fact]
-		public void Test_8089()
-		{
-		}
-		[Fact]
-		public void Test_8090()
-		{
-		}
-		[Fact]
-		public void Test_8091()
-		{
-		}
-		[Fact]
-		public void Test_8092()
-		{
-		}
-		[Fact]
-		public void Test_8093()
-		{
-		}
-		[Fact]
-		public void Test_8094()
-		{
-		}
-		[Fact]
-		public void Test_8095()
-		{
-		}
-		[Fact]
-		public void Test_8096()
-		{
-		}
-		[Fact]
-		public void Test_8097()
-		{
-		}
-		[Fact]
-		public void Test_8098()
-		{
-		}
-		[Fact]
-		public void Test_8099()
-		{
-		}
-		[Fact]
-		public void Test_8100()
-		{
-		}
-		[Fact]
-		public void Test_8101()
-		{
-		}
-		[Fact]
-		public void Test_8102()
-		{
-		}
-		[Fact]
-		public void Test_8103()
-		{
-		}
-		[Fact]
-		public void Test_8104()
-		{
-		}
-		[Fact]
-		public void Test_8105()
-		{
-		}
-		[Fact]
-		public void Test_8106()
-		{
-		}
-		[Fact]
-		public void Test_8107()
-		{
-		}
-		[Fact]
-		public void Test_8108()
-		{
-		}
-		[Fact]
-		public void Test_8109()
-		{
-		}
-		[Fact]
-		public void Test_8110()
-		{
-		}
-		[Fact]
-		public void Test_8111()
-		{
-		}
-		[Fact]
-		public void Test_8112()
-		{
-		}
-		[Fact]
-		public void Test_8113()
-		{
-		}
-		[Fact]
-		public void Test_8114()
-		{
-		}
-		[Fact]
-		public void Test_8115()
-		{
-		}
-		[Fact]
-		public void Test_8116()
-		{
-		}
-		[Fact]
-		public void Test_8117()
-		{
-		}
-		[Fact]
-		public void Test_8118()
-		{
-		}
-		[Fact]
-		public void Test_8119()
-		{
-		}
-		[Fact]
-		public void Test_8120()
-		{
-		}
-		[Fact]
-		public void Test_8121()
-		{
-		}
-		[Fact]
-		public void Test_8122()
-		{
-		}
-		[Fact]
-		public void Test_8123()
-		{
-		}
-		[Fact]
-		public void Test_8124()
-		{
-		}
-		[Fact]
-		public void Test_8125()
-		{
-		}
-		[Fact]
-		public void Test_8126()
-		{
-		}
-		[Fact]
-		public void Test_8127()
-		{
-		}
-		[Fact]
-		public void Test_8128()
-		{
-		}
-		[Fact]
-		public void Test_8129()
-		{
-		}
-		[Fact]
-		public void Test_8130()
-		{
-		}
-		[Fact]
-		public void Test_8131()
-		{
-		}
-		[Fact]
-		public void Test_8132()
-		{
-		}
-		[Fact]
-		public void Test_8133()
-		{
-		}
-		[Fact]
-		public void Test_8134()
-		{
-		}
-		[Fact]
-		public void Test_8135()
-		{
-		}
-		[Fact]
-		public void Test_8136()
-		{
-		}
-		[Fact]
-		public void Test_8137()
-		{
-		}
-		[Fact]
-		public void Test_8138()
-		{
-		}
-		[Fact]
-		public void Test_8139()
-		{
-		}
-		[Fact]
-		public void Test_8140()
-		{
-		}
-		[Fact]
-		public void Test_8141()
-		{
-		}
-		[Fact]
-		public void Test_8142()
-		{
-		}
-		[Fact]
-		public void Test_8143()
-		{
-		}
-		[Fact]
-		public void Test_8144()
-		{
-		}
-		[Fact]
-		public void Test_8145()
-		{
-		}
-		[Fact]
-		public void Test_8146()
-		{
-		}
-		[Fact]
-		public void Test_8147()
-		{
-		}
-		[Fact]
-		public void Test_8148()
-		{
-		}
-		[Fact]
-		public void Test_8149()
-		{
-		}
-		[Fact]
-		public void Test_8150()
-		{
-		}
-		[Fact]
-		public void Test_8151()
-		{
-		}
-		[Fact]
-		public void Test_8152()
-		{
-		}
-		[Fact]
-		public void Test_8153()
-		{
-		}
-		[Fact]
-		public void Test_8154()
-		{
-		}
-		[Fact]
-		public void Test_8155()
-		{
-		}
-		[Fact]
-		public void Test_8156()
-		{
-		}
-		[Fact]
-		public void Test_8157()
-		{
-		}
-		[Fact]
-		public void Test_8158()
-		{
-		}
-		[Fact]
-		public void Test_8159()
-		{
-		}
-		[Fact]
-		public void Test_8160()
-		{
-		}
-		[Fact]
-		public void Test_8161()
-		{
-		}
-		[Fact]
-		public void Test_8162()
-		{
-		}
-		[Fact]
-		public void Test_8163()
-		{
-		}
-		[Fact]
-		public void Test_8164()
-		{
-		}
-		[Fact]
-		public void Test_8165()
-		{
-		}
-		[Fact]
-		public void Test_8166()
-		{
-		}
-		[Fact]
-		public void Test_8167()
-		{
-		}
-		[Fact]
-		public void Test_8168()
-		{
-		}
-		[Fact]
-		public void Test_8169()
-		{
-		}
-		[Fact]
-		public void Test_8170()
-		{
-		}
-		[Fact]
-		public void Test_8171()
-		{
-		}
-		[Fact]
-		public void Test_8172()
-		{
-		}
-		[Fact]
-		public void Test_8173()
-		{
-		}
-		[Fact]
-		public void Test_8174()
-		{
-		}
-		[Fact]
-		public void Test_8175()
-		{
-		}
-		[Fact]
-		public void Test_8176()
-		{
-		}
-		[Fact]
-		public void Test_8177()
-		{
-		}
-		[Fact]
-		public void Test_8178()
-		{
-		}
-		[Fact]
-		public void Test_8179()
-		{
-		}
-		[Fact]
-		public void Test_8180()
-		{
-		}
-		[Fact]
-		public void Test_8181()
-		{
-		}
-		[Fact]
-		public void Test_8182()
-		{
-		}
-		[Fact]
-		public void Test_8183()
-		{
-		}
-		[Fact]
-		public void Test_8184()
-		{
-		}
-		[Fact]
-		public void Test_8185()
-		{
-		}
-		[Fact]
-		public void Test_8186()
-		{
-		}
-		[Fact]
-		public void Test_8187()
-		{
-		}
-		[Fact]
-		public void Test_8188()
-		{
-		}
-		[Fact]
-		public void Test_8189()
-		{
-		}
-		[Fact]
-		public void Test_8190()
-		{
-		}
-		[Fact]
-		public void Test_8191()
-		{
-		}
-		[Fact]
-		public void Test_8192()
-		{
-		}
-		[Fact]
-		public void Test_8193()
-		{
-		}
-		[Fact]
-		public void Test_8194()
-		{
-		}
-		[Fact]
-		public void Test_8195()
-		{
-		}
-		[Fact]
-		public void Test_8196()
-		{
-		}
-		[Fact]
-		public void Test_8197()
-		{
-		}
-		[Fact]
-		public void Test_8198()
-		{
-		}
-		[Fact]
-		public void Test_8199()
-		{
-		}
-		[Fact]
-		public void Test_8200()
-		{
-		}
-		[Fact]
-		public void Test_8201()
-		{
-		}
-		[Fact]
-		public void Test_8202()
-		{
-		}
-		[Fact]
-		public void Test_8203()
-		{
-		}
-		[Fact]
-		public void Test_8204()
-		{
-		}
-		[Fact]
-		public void Test_8205()
-		{
-		}
-		[Fact]
-		public void Test_8206()
-		{
-		}
-		[Fact]
-		public void Test_8207()
-		{
-		}
-		[Fact]
-		public void Test_8208()
-		{
-		}
-		[Fact]
-		public void Test_8209()
-		{
-		}
-		[Fact]
-		public void Test_8210()
-		{
-		}
-		[Fact]
-		public void Test_8211()
-		{
-		}
-		[Fact]
-		public void Test_8212()
-		{
-		}
-		[Fact]
-		public void Test_8213()
-		{
-		}
-		[Fact]
-		public void Test_8214()
-		{
-		}
-		[Fact]
-		public void Test_8215()
-		{
-		}
-		[Fact]
-		public void Test_8216()
-		{
-		}
-		[Fact]
-		public void Test_8217()
-		{
-		}
-		[Fact]
-		public void Test_8218()
-		{
-		}
-		[Fact]
-		public void Test_8219()
-		{
-		}
-		[Fact]
-		public void Test_8220()
-		{
-		}
-		[Fact]
-		public void Test_8221()
-		{
-		}
-		[Fact]
-		public void Test_8222()
-		{
-		}
-		[Fact]
-		public void Test_8223()
-		{
-		}
-		[Fact]
-		public void Test_8224()
-		{
-		}
-		[Fact]
-		public void Test_8225()
-		{
-		}
-		[Fact]
-		public void Test_8226()
-		{
-		}
-		[Fact]
-		public void Test_8227()
-		{
-		}
-		[Fact]
-		public void Test_8228()
-		{
-		}
-		[Fact]
-		public void Test_8229()
-		{
-		}
-		[Fact]
-		public void Test_8230()
-		{
-		}
-		[Fact]
-		public void Test_8231()
-		{
-		}
-		[Fact]
-		public void Test_8232()
-		{
-		}
-		[Fact]
-		public void Test_8233()
-		{
-		}
-		[Fact]
-		public void Test_8234()
-		{
-		}
-		[Fact]
-		public void Test_8235()
-		{
-		}
-		[Fact]
-		public void Test_8236()
-		{
-		}
-		[Fact]
-		public void Test_8237()
-		{
-		}
-		[Fact]
-		public void Test_8238()
-		{
-		}
-		[Fact]
-		public void Test_8239()
-		{
-		}
-		[Fact]
-		public void Test_8240()
-		{
-		}
-		[Fact]
-		public void Test_8241()
-		{
-		}
-		[Fact]
-		public void Test_8242()
-		{
-		}
-		[Fact]
-		public void Test_8243()
-		{
-		}
-		[Fact]
-		public void Test_8244()
-		{
-		}
-		[Fact]
-		public void Test_8245()
-		{
-		}
-		[Fact]
-		public void Test_8246()
-		{
-		}
-		[Fact]
-		public void Test_8247()
-		{
-		}
-		[Fact]
-		public void Test_8248()
-		{
-		}
-		[Fact]
-		public void Test_8249()
-		{
-		}
-		[Fact]
-		public void Test_8250()
-		{
-		}
-		[Fact]
-		public void Test_8251()
-		{
-		}
-		[Fact]
-		public void Test_8252()
-		{
-		}
-		[Fact]
-		public void Test_8253()
-		{
-		}
-		[Fact]
-		public void Test_8254()
-		{
-		}
-		[Fact]
-		public void Test_8255()
-		{
-		}
-		[Fact]
-		public void Test_8256()
-		{
-		}
-		[Fact]
-		public void Test_8257()
-		{
-		}
-		[Fact]
-		public void Test_8258()
-		{
-		}
-		[Fact]
-		public void Test_8259()
-		{
-		}
-		[Fact]
-		public void Test_8260()
-		{
-		}
-		[Fact]
-		public void Test_8261()
-		{
-		}
-		[Fact]
-		public void Test_8262()
-		{
-		}
-		[Fact]
-		public void Test_8263()
-		{
-		}
-		[Fact]
-		public void Test_8264()
-		{
-		}
-		[Fact]
-		public void Test_8265()
-		{
-		}
-		[Fact]
-		public void Test_8266()
-		{
-		}
-		[Fact]
-		public void Test_8267()
-		{
-		}
-		[Fact]
-		public void Test_8268()
-		{
-		}
-		[Fact]
-		public void Test_8269()
-		{
-		}
-		[Fact]
-		public void Test_8270()
-		{
-		}
-		[Fact]
-		public void Test_8271()
-		{
-		}
-		[Fact]
-		public void Test_8272()
-		{
-		}
-		[Fact]
-		public void Test_8273()
-		{
-		}
-		[Fact]
-		public void Test_8274()
-		{
-		}
-		[Fact]
-		public void Test_8275()
-		{
-		}
-		[Fact]
-		public void Test_8276()
-		{
-		}
-		[Fact]
-		public void Test_8277()
-		{
-		}
-		[Fact]
-		public void Test_8278()
-		{
-		}
-		[Fact]
-		public void Test_8279()
-		{
-		}
-		[Fact]
-		public void Test_8280()
-		{
-		}
-		[Fact]
-		public void Test_8281()
-		{
-		}
-		[Fact]
-		public void Test_8282()
-		{
-		}
-		[Fact]
-		public void Test_8283()
-		{
-		}
-		[Fact]
-		public void Test_8284()
-		{
-		}
-		[Fact]
-		public void Test_8285()
-		{
-		}
-		[Fact]
-		public void Test_8286()
-		{
-		}
-		[Fact]
-		public void Test_8287()
-		{
-		}
-		[Fact]
-		public void Test_8288()
-		{
-		}
-		[Fact]
-		public void Test_8289()
-		{
-		}
-		[Fact]
-		public void Test_8290()
-		{
-		}
-		[Fact]
-		public void Test_8291()
-		{
-		}
-		[Fact]
-		public void Test_8292()
-		{
-		}
-		[Fact]
-		public void Test_8293()
-		{
-		}
-		[Fact]
-		public void Test_8294()
-		{
-		}
-		[Fact]
-		public void Test_8295()
-		{
-		}
-		[Fact]
-		public void Test_8296()
-		{
-		}
-		[Fact]
-		public void Test_8297()
-		{
-		}
-		[Fact]
-		public void Test_8298()
-		{
-		}
-		[Fact]
-		public void Test_8299()
-		{
-		}
-		[Fact]
-		public void Test_8300()
-		{
-		}
-		[Fact]
-		public void Test_8301()
-		{
-		}
-		[Fact]
-		public void Test_8302()
-		{
-		}
-		[Fact]
-		public void Test_8303()
-		{
-		}
-		[Fact]
-		public void Test_8304()
-		{
-		}
-		[Fact]
-		public void Test_8305()
-		{
-		}
-		[Fact]
-		public void Test_8306()
-		{
-		}
-		[Fact]
-		public void Test_8307()
-		{
-		}
-		[Fact]
-		public void Test_8308()
-		{
-		}
-		[Fact]
-		public void Test_8309()
-		{
-		}
-		[Fact]
-		public void Test_8310()
-		{
-		}
-		[Fact]
-		public void Test_8311()
-		{
-		}
-		[Fact]
-		public void Test_8312()
-		{
-		}
-		[Fact]
-		public void Test_8313()
-		{
-		}
-		[Fact]
-		public void Test_8314()
-		{
-		}
-		[Fact]
-		public void Test_8315()
-		{
-		}
-		[Fact]
-		public void Test_8316()
-		{
-		}
-		[Fact]
-		public void Test_8317()
-		{
-		}
-		[Fact]
-		public void Test_8318()
-		{
-		}
-		[Fact]
-		public void Test_8319()
-		{
-		}
-		[Fact]
-		public void Test_8320()
-		{
-		}
-		[Fact]
-		public void Test_8321()
-		{
-		}
-		[Fact]
-		public void Test_8322()
-		{
-		}
-		[Fact]
-		public void Test_8323()
-		{
-		}
-		[Fact]
-		public void Test_8324()
-		{
-		}
-		[Fact]
-		public void Test_8325()
-		{
-		}
-		[Fact]
-		public void Test_8326()
-		{
-		}
-		[Fact]
-		public void Test_8327()
-		{
-		}
-		[Fact]
-		public void Test_8328()
-		{
-		}
-		[Fact]
-		public void Test_8329()
-		{
-		}
-		[Fact]
-		public void Test_8330()
-		{
-		}
-		[Fact]
-		public void Test_8331()
-		{
-		}
-		[Fact]
-		public void Test_8332()
-		{
-		}
-		[Fact]
-		public void Test_8333()
-		{
-		}
-		[Fact]
-		public void Test_8334()
-		{
-		}
-		[Fact]
-		public void Test_8335()
-		{
-		}
-		[Fact]
-		public void Test_8336()
-		{
-		}
-		[Fact]
-		public void Test_8337()
-		{
-		}
-		[Fact]
-		public void Test_8338()
-		{
-		}
-		[Fact]
-		public void Test_8339()
-		{
-		}
-		[Fact]
-		public void Test_8340()
-		{
-		}
-		[Fact]
-		public void Test_8341()
-		{
-		}
-		[Fact]
-		public void Test_8342()
-		{
-		}
-		[Fact]
-		public void Test_8343()
-		{
-		}
-		[Fact]
-		public void Test_8344()
-		{
-		}
-		[Fact]
-		public void Test_8345()
-		{
-		}
-		[Fact]
-		public void Test_8346()
-		{
-		}
-		[Fact]
-		public void Test_8347()
-		{
-		}
-		[Fact]
-		public void Test_8348()
-		{
-		}
-		[Fact]
-		public void Test_8349()
-		{
-		}
-		[Fact]
-		public void Test_8350()
-		{
-		}
-		[Fact]
-		public void Test_8351()
-		{
-		}
-		[Fact]
-		public void Test_8352()
-		{
-		}
-		[Fact]
-		public void Test_8353()
-		{
-		}
-		[Fact]
-		public void Test_8354()
-		{
-		}
-		[Fact]
-		public void Test_8355()
-		{
-		}
-		[Fact]
-		public void Test_8356()
-		{
-		}
-		[Fact]
-		public void Test_8357()
-		{
-		}
-		[Fact]
-		public void Test_8358()
-		{
-		}
-		[Fact]
-		public void Test_8359()
-		{
-		}
-		[Fact]
-		public void Test_8360()
-		{
-		}
-		[Fact]
-		public void Test_8361()
-		{
-		}
-		[Fact]
-		public void Test_8362()
-		{
-		}
-		[Fact]
-		public void Test_8363()
-		{
-		}
-		[Fact]
-		public void Test_8364()
-		{
-		}
-		[Fact]
-		public void Test_8365()
-		{
-		}
-		[Fact]
-		public void Test_8366()
-		{
-		}
-		[Fact]
-		public void Test_8367()
-		{
-		}
-		[Fact]
-		public void Test_8368()
-		{
-		}
-		[Fact]
-		public void Test_8369()
-		{
-		}
-		[Fact]
-		public void Test_8370()
-		{
-		}
-		[Fact]
-		public void Test_8371()
-		{
-		}
-		[Fact]
-		public void Test_8372()
-		{
-		}
-		[Fact]
-		public void Test_8373()
-		{
-		}
-		[Fact]
-		public void Test_8374()
-		{
-		}
-		[Fact]
-		public void Test_8375()
-		{
-		}
-		[Fact]
-		public void Test_8376()
-		{
-		}
-		[Fact]
-		public void Test_8377()
-		{
-		}
-		[Fact]
-		public void Test_8378()
-		{
-		}
-		[Fact]
-		public void Test_8379()
-		{
-		}
-		[Fact]
-		public void Test_8380()
-		{
-		}
-		[Fact]
-		public void Test_8381()
-		{
-		}
-		[Fact]
-		public void Test_8382()
-		{
-		}
-		[Fact]
-		public void Test_8383()
-		{
-		}
-		[Fact]
-		public void Test_8384()
-		{
-		}
-		[Fact]
-		public void Test_8385()
-		{
-		}
-		[Fact]
-		public void Test_8386()
-		{
-		}
-		[Fact]
-		public void Test_8387()
-		{
-		}
-		[Fact]
-		public void Test_8388()
-		{
-		}
-		[Fact]
-		public void Test_8389()
-		{
-		}
-		[Fact]
-		public void Test_8390()
-		{
-		}
-		[Fact]
-		public void Test_8391()
-		{
-		}
-		[Fact]
-		public void Test_8392()
-		{
-		}
-		[Fact]
-		public void Test_8393()
-		{
-		}
-		[Fact]
-		public void Test_8394()
-		{
-		}
-		[Fact]
-		public void Test_8395()
-		{
-		}
-		[Fact]
-		public void Test_8396()
-		{
-		}
-		[Fact]
-		public void Test_8397()
-		{
-		}
-		[Fact]
-		public void Test_8398()
-		{
-		}
-		[Fact]
-		public void Test_8399()
-		{
-		}
-		[Fact]
-		public void Test_8400()
-		{
-		}
-		[Fact]
-		public void Test_8401()
-		{
-		}
-		[Fact]
-		public void Test_8402()
-		{
-		}
-		[Fact]
-		public void Test_8403()
-		{
-		}
-		[Fact]
-		public void Test_8404()
-		{
-		}
-		[Fact]
-		public void Test_8405()
-		{
-		}
-		[Fact]
-		public void Test_8406()
-		{
-		}
-		[Fact]
-		public void Test_8407()
-		{
-		}
-		[Fact]
-		public void Test_8408()
-		{
-		}
-		[Fact]
-		public void Test_8409()
-		{
-		}
-		[Fact]
-		public void Test_8410()
-		{
-		}
-		[Fact]
-		public void Test_8411()
-		{
-		}
-		[Fact]
-		public void Test_8412()
-		{
-		}
-		[Fact]
-		public void Test_8413()
-		{
-		}
-		[Fact]
-		public void Test_8414()
-		{
-		}
-		[Fact]
-		public void Test_8415()
-		{
-		}
-		[Fact]
-		public void Test_8416()
-		{
-		}
-		[Fact]
-		public void Test_8417()
-		{
-		}
-		[Fact]
-		public void Test_8418()
-		{
-		}
-		[Fact]
-		public void Test_8419()
-		{
-		}
-		[Fact]
-		public void Test_8420()
-		{
-		}
-		[Fact]
-		public void Test_8421()
-		{
-		}
-		[Fact]
-		public void Test_8422()
-		{
-		}
-		[Fact]
-		public void Test_8423()
-		{
-		}
-		[Fact]
-		public void Test_8424()
-		{
-		}
-		[Fact]
-		public void Test_8425()
-		{
-		}
-		[Fact]
-		public void Test_8426()
-		{
-		}
-		[Fact]
-		public void Test_8427()
-		{
-		}
-		[Fact]
-		public void Test_8428()
-		{
-		}
-		[Fact]
-		public void Test_8429()
-		{
-		}
-		[Fact]
-		public void Test_8430()
-		{
-		}
-		[Fact]
-		public void Test_8431()
-		{
-		}
-		[Fact]
-		public void Test_8432()
-		{
-		}
-		[Fact]
-		public void Test_8433()
-		{
-		}
-		[Fact]
-		public void Test_8434()
-		{
-		}
-		[Fact]
-		public void Test_8435()
-		{
-		}
-		[Fact]
-		public void Test_8436()
-		{
-		}
-		[Fact]
-		public void Test_8437()
-		{
-		}
-		[Fact]
-		public void Test_8438()
-		{
-		}
-		[Fact]
-		public void Test_8439()
-		{
-		}
-		[Fact]
-		public void Test_8440()
-		{
-		}
-		[Fact]
-		public void Test_8441()
-		{
-		}
-		[Fact]
-		public void Test_8442()
-		{
-		}
-		[Fact]
-		public void Test_8443()
-		{
-		}
-		[Fact]
-		public void Test_8444()
-		{
-		}
-		[Fact]
-		public void Test_8445()
-		{
-		}
-		[Fact]
-		public void Test_8446()
-		{
-		}
-		[Fact]
-		public void Test_8447()
-		{
-		}
-		[Fact]
-		public void Test_8448()
-		{
-		}
-		[Fact]
-		public void Test_8449()
-		{
-		}
-		[Fact]
-		public void Test_8450()
-		{
-		}
-		[Fact]
-		public void Test_8451()
-		{
-		}
-		[Fact]
-		public void Test_8452()
-		{
-		}
-		[Fact]
-		public void Test_8453()
-		{
-		}
-		[Fact]
-		public void Test_8454()
-		{
-		}
-		[Fact]
-		public void Test_8455()
-		{
-		}
-		[Fact]
-		public void Test_8456()
-		{
-		}
-		[Fact]
-		public void Test_8457()
-		{
-		}
-		[Fact]
-		public void Test_8458()
-		{
-		}
-		[Fact]
-		public void Test_8459()
-		{
-		}
-		[Fact]
-		public void Test_8460()
-		{
-		}
-		[Fact]
-		public void Test_8461()
-		{
-		}
-		[Fact]
-		public void Test_8462()
-		{
-		}
-		[Fact]
-		public void Test_8463()
-		{
-		}
-		[Fact]
-		public void Test_8464()
-		{
-		}
-		[Fact]
-		public void Test_8465()
-		{
-		}
-		[Fact]
-		public void Test_8466()
-		{
-		}
-		[Fact]
-		public void Test_8467()
-		{
-		}
-		[Fact]
-		public void Test_8468()
-		{
-		}
-		[Fact]
-		public void Test_8469()
-		{
-		}
-		[Fact]
-		public void Test_8470()
-		{
-		}
-		[Fact]
-		public void Test_8471()
-		{
-		}
-		[Fact]
-		public void Test_8472()
-		{
-		}
-		[Fact]
-		public void Test_8473()
-		{
-		}
-		[Fact]
-		public void Test_8474()
-		{
-		}
-		[Fact]
-		public void Test_8475()
-		{
-		}
-		[Fact]
-		public void Test_8476()
-		{
-		}
-		[Fact]
-		public void Test_8477()
-		{
-		}
-		[Fact]
-		public void Test_8478()
-		{
-		}
-		[Fact]
-		public void Test_8479()
-		{
-		}
-		[Fact]
-		public void Test_8480()
-		{
-		}
-		[Fact]
-		public void Test_8481()
-		{
-		}
-		[Fact]
-		public void Test_8482()
-		{
-		}
-		[Fact]
-		public void Test_8483()
-		{
-		}
-		[Fact]
-		public void Test_8484()
-		{
-		}
-		[Fact]
-		public void Test_8485()
-		{
-		}
-		[Fact]
-		public void Test_8486()
-		{
-		}
-		[Fact]
-		public void Test_8487()
-		{
-		}
-		[Fact]
-		public void Test_8488()
-		{
-		}
-		[Fact]
-		public void Test_8489()
-		{
-		}
-		[Fact]
-		public void Test_8490()
-		{
-		}
-		[Fact]
-		public void Test_8491()
-		{
-		}
-		[Fact]
-		public void Test_8492()
-		{
-		}
-		[Fact]
-		public void Test_8493()
-		{
-		}
-		[Fact]
-		public void Test_8494()
-		{
-		}
-		[Fact]
-		public void Test_8495()
-		{
-		}
-		[Fact]
-		public void Test_8496()
-		{
-		}
-		[Fact]
-		public void Test_8497()
-		{
-		}
-		[Fact]
-		public void Test_8498()
-		{
-		}
-		[Fact]
-		public void Test_8499()
-		{
-		}
-		[Fact]
-		public void Test_8500()
-		{
-		}
-		[Fact]
-		public void Test_8501()
-		{
-		}
-		[Fact]
-		public void Test_8502()
-		{
-		}
-		[Fact]
-		public void Test_8503()
-		{
-		}
-		[Fact]
-		public void Test_8504()
-		{
-		}
-		[Fact]
-		public void Test_8505()
-		{
-		}
-		[Fact]
-		public void Test_8506()
-		{
-		}
-		[Fact]
-		public void Test_8507()
-		{
-		}
-		[Fact]
-		public void Test_8508()
-		{
-		}
-		[Fact]
-		public void Test_8509()
-		{
-		}
-		[Fact]
-		public void Test_8510()
-		{
-		}
-		[Fact]
-		public void Test_8511()
-		{
-		}
-		[Fact]
-		public void Test_8512()
-		{
-		}
-		[Fact]
-		public void Test_8513()
-		{
-		}
-		[Fact]
-		public void Test_8514()
-		{
-		}
-		[Fact]
-		public void Test_8515()
-		{
-		}
-		[Fact]
-		public void Test_8516()
-		{
-		}
-		[Fact]
-		public void Test_8517()
-		{
-		}
-		[Fact]
-		public void Test_8518()
-		{
-		}
-		[Fact]
-		public void Test_8519()
-		{
-		}
-		[Fact]
-		public void Test_8520()
-		{
-		}
-		[Fact]
-		public void Test_8521()
-		{
-		}
-		[Fact]
-		public void Test_8522()
-		{
-		}
-		[Fact]
-		public void Test_8523()
-		{
-		}
-		[Fact]
-		public void Test_8524()
-		{
-		}
-		[Fact]
-		public void Test_8525()
-		{
-		}
-		[Fact]
-		public void Test_8526()
-		{
-		}
-		[Fact]
-		public void Test_8527()
-		{
-		}
-		[Fact]
-		public void Test_8528()
-		{
-		}
-		[Fact]
-		public void Test_8529()
-		{
-		}
-		[Fact]
-		public void Test_8530()
-		{
-		}
-		[Fact]
-		public void Test_8531()
-		{
-		}
-		[Fact]
-		public void Test_8532()
-		{
-		}
-		[Fact]
-		public void Test_8533()
-		{
-		}
-		[Fact]
-		public void Test_8534()
-		{
-		}
-		[Fact]
-		public void Test_8535()
-		{
-		}
-		[Fact]
-		public void Test_8536()
-		{
-		}
-		[Fact]
-		public void Test_8537()
-		{
-		}
-		[Fact]
-		public void Test_8538()
-		{
-		}
-		[Fact]
-		public void Test_8539()
-		{
-		}
-		[Fact]
-		public void Test_8540()
-		{
-		}
-		[Fact]
-		public void Test_8541()
-		{
-		}
-		[Fact]
-		public void Test_8542()
-		{
-		}
-		[Fact]
-		public void Test_8543()
-		{
-		}
-		[Fact]
-		public void Test_8544()
-		{
-		}
-		[Fact]
-		public void Test_8545()
-		{
-		}
-		[Fact]
-		public void Test_8546()
-		{
-		}
-		[Fact]
-		public void Test_8547()
-		{
-		}
-		[Fact]
-		public void Test_8548()
-		{
-		}
-		[Fact]
-		public void Test_8549()
-		{
-		}
-		[Fact]
-		public void Test_8550()
-		{
-		}
-		[Fact]
-		public void Test_8551()
-		{
-		}
-		[Fact]
-		public void Test_8552()
-		{
-		}
-		[Fact]
-		public void Test_8553()
-		{
-		}
-		[Fact]
-		public void Test_8554()
-		{
-		}
-		[Fact]
-		public void Test_8555()
-		{
-		}
-		[Fact]
-		public void Test_8556()
-		{
-		}
-		[Fact]
-		public void Test_8557()
-		{
-		}
-		[Fact]
-		public void Test_8558()
-		{
-		}
-		[Fact]
-		public void Test_8559()
-		{
-		}
-		[Fact]
-		public void Test_8560()
-		{
-		}
-		[Fact]
-		public void Test_8561()
-		{
-		}
-		[Fact]
-		public void Test_8562()
-		{
-		}
-		[Fact]
-		public void Test_8563()
-		{
-		}
-		[Fact]
-		public void Test_8564()
-		{
-		}
-		[Fact]
-		public void Test_8565()
-		{
-		}
-		[Fact]
-		public void Test_8566()
-		{
-		}
-		[Fact]
-		public void Test_8567()
-		{
-		}
-		[Fact]
-		public void Test_8568()
-		{
-		}
-		[Fact]
-		public void Test_8569()
-		{
-		}
-		[Fact]
-		public void Test_8570()
-		{
-		}
-		[Fact]
-		public void Test_8571()
-		{
-		}
-		[Fact]
-		public void Test_8572()
-		{
-		}
-		[Fact]
-		public void Test_8573()
-		{
-		}
-		[Fact]
-		public void Test_8574()
-		{
-		}
-		[Fact]
-		public void Test_8575()
-		{
-		}
-		[Fact]
-		public void Test_8576()
-		{
-		}
-		[Fact]
-		public void Test_8577()
-		{
-		}
-		[Fact]
-		public void Test_8578()
-		{
-		}
-		[Fact]
-		public void Test_8579()
-		{
-		}
-		[Fact]
-		public void Test_8580()
-		{
-		}
-		[Fact]
-		public void Test_8581()
-		{
-		}
-		[Fact]
-		public void Test_8582()
-		{
-		}
-		[Fact]
-		public void Test_8583()
-		{
-		}
-		[Fact]
-		public void Test_8584()
-		{
-		}
-		[Fact]
-		public void Test_8585()
-		{
-		}
-		[Fact]
-		public void Test_8586()
-		{
-		}
-		[Fact]
-		public void Test_8587()
-		{
-		}
-		[Fact]
-		public void Test_8588()
-		{
-		}
-		[Fact]
-		public void Test_8589()
-		{
-		}
-		[Fact]
-		public void Test_8590()
-		{
-		}
-		[Fact]
-		public void Test_8591()
-		{
-		}
-		[Fact]
-		public void Test_8592()
-		{
-		}
-		[Fact]
-		public void Test_8593()
-		{
-		}
-		[Fact]
-		public void Test_8594()
-		{
-		}
-		[Fact]
-		public void Test_8595()
-		{
-		}
-		[Fact]
-		public void Test_8596()
-		{
-		}
-		[Fact]
-		public void Test_8597()
-		{
-		}
-		[Fact]
-		public void Test_8598()
-		{
-		}
-		[Fact]
-		public void Test_8599()
-		{
-		}
-		[Fact]
-		public void Test_8600()
-		{
-		}
-		[Fact]
-		public void Test_8601()
-		{
-		}
-		[Fact]
-		public void Test_8602()
-		{
-		}
-		[Fact]
-		public void Test_8603()
-		{
-		}
-		[Fact]
-		public void Test_8604()
-		{
-		}
-		[Fact]
-		public void Test_8605()
-		{
-		}
-		[Fact]
-		public void Test_8606()
-		{
-		}
-		[Fact]
-		public void Test_8607()
-		{
-		}
-		[Fact]
-		public void Test_8608()
-		{
-		}
-		[Fact]
-		public void Test_8609()
-		{
-		}
-		[Fact]
-		public void Test_8610()
-		{
-		}
-		[Fact]
-		public void Test_8611()
-		{
-		}
-		[Fact]
-		public void Test_8612()
-		{
-		}
-		[Fact]
-		public void Test_8613()
-		{
-		}
-		[Fact]
-		public void Test_8614()
-		{
-		}
-		[Fact]
-		public void Test_8615()
-		{
-		}
-		[Fact]
-		public void Test_8616()
-		{
-		}
-		[Fact]
-		public void Test_8617()
-		{
-		}
-		[Fact]
-		public void Test_8618()
-		{
-		}
-		[Fact]
-		public void Test_8619()
-		{
-		}
-		[Fact]
-		public void Test_8620()
-		{
-		}
-		[Fact]
-		public void Test_8621()
-		{
-		}
-		[Fact]
-		public void Test_8622()
-		{
-		}
-		[Fact]
-		public void Test_8623()
-		{
-		}
-		[Fact]
-		public void Test_8624()
-		{
-		}
-		[Fact]
-		public void Test_8625()
-		{
-		}
-		[Fact]
-		public void Test_8626()
-		{
-		}
-		[Fact]
-		public void Test_8627()
-		{
-		}
-		[Fact]
-		public void Test_8628()
-		{
-		}
-		[Fact]
-		public void Test_8629()
-		{
-		}
-		[Fact]
-		public void Test_8630()
-		{
-		}
-		[Fact]
-		public void Test_8631()
-		{
-		}
-		[Fact]
-		public void Test_8632()
-		{
-		}
-		[Fact]
-		public void Test_8633()
-		{
-		}
-		[Fact]
-		public void Test_8634()
-		{
-		}
-		[Fact]
-		public void Test_8635()
-		{
-		}
-		[Fact]
-		public void Test_8636()
-		{
-		}
-		[Fact]
-		public void Test_8637()
-		{
-		}
-		[Fact]
-		public void Test_8638()
-		{
-		}
-		[Fact]
-		public void Test_8639()
-		{
-		}
-		[Fact]
-		public void Test_8640()
-		{
-		}
-		[Fact]
-		public void Test_8641()
-		{
-		}
-		[Fact]
-		public void Test_8642()
-		{
-		}
-		[Fact]
-		public void Test_8643()
-		{
-		}
-		[Fact]
-		public void Test_8644()
-		{
-		}
-		[Fact]
-		public void Test_8645()
-		{
-		}
-		[Fact]
-		public void Test_8646()
-		{
-		}
-		[Fact]
-		public void Test_8647()
-		{
-		}
-		[Fact]
-		public void Test_8648()
-		{
-		}
-		[Fact]
-		public void Test_8649()
-		{
-		}
-		[Fact]
-		public void Test_8650()
-		{
-		}
-		[Fact]
-		public void Test_8651()
-		{
-		}
-		[Fact]
-		public void Test_8652()
-		{
-		}
-		[Fact]
-		public void Test_8653()
-		{
-		}
-		[Fact]
-		public void Test_8654()
-		{
-		}
-		[Fact]
-		public void Test_8655()
-		{
-		}
-		[Fact]
-		public void Test_8656()
-		{
-		}
-		[Fact]
-		public void Test_8657()
-		{
-		}
-		[Fact]
-		public void Test_8658()
-		{
-		}
-		[Fact]
-		public void Test_8659()
-		{
-		}
-		[Fact]
-		public void Test_8660()
-		{
-		}
-		[Fact]
-		public void Test_8661()
-		{
-		}
-		[Fact]
-		public void Test_8662()
-		{
-		}
-		[Fact]
-		public void Test_8663()
-		{
-		}
-		[Fact]
-		public void Test_8664()
-		{
-		}
-		[Fact]
-		public void Test_8665()
-		{
-		}
-		[Fact]
-		public void Test_8666()
-		{
-		}
-		[Fact]
-		public void Test_8667()
-		{
-		}
-		[Fact]
-		public void Test_8668()
-		{
-		}
-		[Fact]
-		public void Test_8669()
-		{
-		}
-		[Fact]
-		public void Test_8670()
-		{
-		}
-		[Fact]
-		public void Test_8671()
-		{
-		}
-		[Fact]
-		public void Test_8672()
-		{
-		}
-		[Fact]
-		public void Test_8673()
-		{
-		}
-		[Fact]
-		public void Test_8674()
-		{
-		}
-		[Fact]
-		public void Test_8675()
-		{
-		}
-		[Fact]
-		public void Test_8676()
-		{
-		}
-		[Fact]
-		public void Test_8677()
-		{
-		}
-		[Fact]
-		public void Test_8678()
-		{
-		}
-		[Fact]
-		public void Test_8679()
-		{
-		}
-		[Fact]
-		public void Test_8680()
-		{
-		}
-		[Fact]
-		public void Test_8681()
-		{
-		}
-		[Fact]
-		public void Test_8682()
-		{
-		}
-		[Fact]
-		public void Test_8683()
-		{
-		}
-		[Fact]
-		public void Test_8684()
-		{
-		}
-		[Fact]
-		public void Test_8685()
-		{
-		}
-		[Fact]
-		public void Test_8686()
-		{
-		}
-		[Fact]
-		public void Test_8687()
-		{
-		}
-		[Fact]
-		public void Test_8688()
-		{
-		}
-		[Fact]
-		public void Test_8689()
-		{
-		}
-		[Fact]
-		public void Test_8690()
-		{
-		}
-		[Fact]
-		public void Test_8691()
-		{
-		}
-		[Fact]
-		public void Test_8692()
-		{
-		}
-		[Fact]
-		public void Test_8693()
-		{
-		}
-		[Fact]
-		public void Test_8694()
-		{
-		}
-		[Fact]
-		public void Test_8695()
-		{
-		}
-		[Fact]
-		public void Test_8696()
-		{
-		}
-		[Fact]
-		public void Test_8697()
-		{
-		}
-		[Fact]
-		public void Test_8698()
-		{
-		}
-		[Fact]
-		public void Test_8699()
-		{
-		}
-		[Fact]
-		public void Test_8700()
-		{
-		}
-		[Fact]
-		public void Test_8701()
-		{
-		}
-		[Fact]
-		public void Test_8702()
-		{
-		}
-		[Fact]
-		public void Test_8703()
-		{
-		}
-		[Fact]
-		public void Test_8704()
-		{
-		}
-		[Fact]
-		public void Test_8705()
-		{
-		}
-		[Fact]
-		public void Test_8706()
-		{
-		}
-		[Fact]
-		public void Test_8707()
-		{
-		}
-		[Fact]
-		public void Test_8708()
-		{
-		}
-		[Fact]
-		public void Test_8709()
-		{
-		}
-		[Fact]
-		public void Test_8710()
-		{
-		}
-		[Fact]
-		public void Test_8711()
-		{
-		}
-		[Fact]
-		public void Test_8712()
-		{
-		}
-		[Fact]
-		public void Test_8713()
-		{
-		}
-		[Fact]
-		public void Test_8714()
-		{
-		}
-		[Fact]
-		public void Test_8715()
-		{
-		}
-		[Fact]
-		public void Test_8716()
-		{
-		}
-		[Fact]
-		public void Test_8717()
-		{
-		}
-		[Fact]
-		public void Test_8718()
-		{
-		}
-		[Fact]
-		public void Test_8719()
-		{
-		}
-		[Fact]
-		public void Test_8720()
-		{
-		}
-		[Fact]
-		public void Test_8721()
-		{
-		}
-		[Fact]
-		public void Test_8722()
-		{
-		}
-		[Fact]
-		public void Test_8723()
-		{
-		}
-		[Fact]
-		public void Test_8724()
-		{
-		}
-		[Fact]
-		public void Test_8725()
-		{
-		}
-		[Fact]
-		public void Test_8726()
-		{
-		}
-		[Fact]
-		public void Test_8727()
-		{
-		}
-		[Fact]
-		public void Test_8728()
-		{
-		}
-		[Fact]
-		public void Test_8729()
-		{
-		}
-		[Fact]
-		public void Test_8730()
-		{
-		}
-		[Fact]
-		public void Test_8731()
-		{
-		}
-		[Fact]
-		public void Test_8732()
-		{
-		}
-		[Fact]
-		public void Test_8733()
-		{
-		}
-		[Fact]
-		public void Test_8734()
-		{
-		}
-		[Fact]
-		public void Test_8735()
-		{
-		}
-		[Fact]
-		public void Test_8736()
-		{
-		}
-		[Fact]
-		public void Test_8737()
-		{
-		}
-		[Fact]
-		public void Test_8738()
-		{
-		}
-		[Fact]
-		public void Test_8739()
-		{
-		}
-		[Fact]
-		public void Test_8740()
-		{
-		}
-		[Fact]
-		public void Test_8741()
-		{
-		}
-		[Fact]
-		public void Test_8742()
-		{
-		}
-		[Fact]
-		public void Test_8743()
-		{
-		}
-		[Fact]
-		public void Test_8744()
-		{
-		}
-		[Fact]
-		public void Test_8745()
-		{
-		}
-		[Fact]
-		public void Test_8746()
-		{
-		}
-		[Fact]
-		public void Test_8747()
-		{
-		}
-		[Fact]
-		public void Test_8748()
-		{
-		}
-		[Fact]
-		public void Test_8749()
-		{
-		}
-		[Fact]
-		public void Test_8750()
-		{
-		}
-		[Fact]
-		public void Test_8751()
-		{
-		}
-		[Fact]
-		public void Test_8752()
-		{
-		}
-		[Fact]
-		public void Test_8753()
-		{
-		}
-		[Fact]
-		public void Test_8754()
-		{
-		}
-		[Fact]
-		public void Test_8755()
-		{
-		}
-		[Fact]
-		public void Test_8756()
-		{
-		}
-		[Fact]
-		public void Test_8757()
-		{
-		}
-		[Fact]
-		public void Test_8758()
-		{
-		}
-		[Fact]
-		public void Test_8759()
-		{
-		}
-		[Fact]
-		public void Test_8760()
-		{
-		}
-		[Fact]
-		public void Test_8761()
-		{
-		}
-		[Fact]
-		public void Test_8762()
-		{
-		}
-		[Fact]
-		public void Test_8763()
-		{
-		}
-		[Fact]
-		public void Test_8764()
-		{
-		}
-		[Fact]
-		public void Test_8765()
-		{
-		}
-		[Fact]
-		public void Test_8766()
-		{
-		}
-		[Fact]
-		public void Test_8767()
-		{
-		}
-		[Fact]
-		public void Test_8768()
-		{
-		}
-		[Fact]
-		public void Test_8769()
-		{
-		}
-		[Fact]
-		public void Test_8770()
-		{
-		}
-		[Fact]
-		public void Test_8771()
-		{
-		}
-		[Fact]
-		public void Test_8772()
-		{
-		}
-		[Fact]
-		public void Test_8773()
-		{
-		}
-		[Fact]
-		public void Test_8774()
-		{
-		}
-		[Fact]
-		public void Test_8775()
-		{
-		}
-		[Fact]
-		public void Test_8776()
-		{
-		}
-		[Fact]
-		public void Test_8777()
-		{
-		}
-		[Fact]
-		public void Test_8778()
-		{
-		}
-		[Fact]
-		public void Test_8779()
-		{
-		}
-		[Fact]
-		public void Test_8780()
-		{
-		}
-		[Fact]
-		public void Test_8781()
-		{
-		}
-		[Fact]
-		public void Test_8782()
-		{
-		}
-		[Fact]
-		public void Test_8783()
-		{
-		}
-		[Fact]
-		public void Test_8784()
-		{
-		}
-		[Fact]
-		public void Test_8785()
-		{
-		}
-		[Fact]
-		public void Test_8786()
-		{
-		}
-		[Fact]
-		public void Test_8787()
-		{
-		}
-		[Fact]
-		public void Test_8788()
-		{
-		}
-		[Fact]
-		public void Test_8789()
-		{
-		}
-		[Fact]
-		public void Test_8790()
-		{
-		}
-		[Fact]
-		public void Test_8791()
-		{
-		}
-		[Fact]
-		public void Test_8792()
-		{
-		}
-		[Fact]
-		public void Test_8793()
-		{
-		}
-		[Fact]
-		public void Test_8794()
-		{
-		}
-		[Fact]
-		public void Test_8795()
-		{
-		}
-		[Fact]
-		public void Test_8796()
-		{
-		}
-		[Fact]
-		public void Test_8797()
-		{
-		}
-		[Fact]
-		public void Test_8798()
-		{
-		}
-		[Fact]
-		public void Test_8799()
-		{
-		}
-		[Fact]
-		public void Test_8800()
-		{
-		}
-		[Fact]
-		public void Test_8801()
-		{
-		}
-		[Fact]
-		public void Test_8802()
-		{
-		}
-		[Fact]
-		public void Test_8803()
-		{
-		}
-		[Fact]
-		public void Test_8804()
-		{
-		}
-		[Fact]
-		public void Test_8805()
-		{
-		}
-		[Fact]
-		public void Test_8806()
-		{
-		}
-		[Fact]
-		public void Test_8807()
-		{
-		}
-		[Fact]
-		public void Test_8808()
-		{
-		}
-		[Fact]
-		public void Test_8809()
-		{
-		}
-		[Fact]
-		public void Test_8810()
-		{
-		}
-		[Fact]
-		public void Test_8811()
-		{
-		}
-		[Fact]
-		public void Test_8812()
-		{
-		}
-		[Fact]
-		public void Test_8813()
-		{
-		}
-		[Fact]
-		public void Test_8814()
-		{
-		}
-		[Fact]
-		public void Test_8815()
-		{
-		}
-		[Fact]
-		public void Test_8816()
-		{
-		}
-		[Fact]
-		public void Test_8817()
-		{
-		}
-		[Fact]
-		public void Test_8818()
-		{
-		}
-		[Fact]
-		public void Test_8819()
-		{
-		}
-		[Fact]
-		public void Test_8820()
-		{
-		}
-		[Fact]
-		public void Test_8821()
-		{
-		}
-		[Fact]
-		public void Test_8822()
-		{
-		}
-		[Fact]
-		public void Test_8823()
-		{
-		}
-		[Fact]
-		public void Test_8824()
-		{
-		}
-		[Fact]
-		public void Test_8825()
-		{
-		}
-		[Fact]
-		public void Test_8826()
-		{
-		}
-		[Fact]
-		public void Test_8827()
-		{
-		}
-		[Fact]
-		public void Test_8828()
-		{
-		}
-		[Fact]
-		public void Test_8829()
-		{
-		}
-		[Fact]
-		public void Test_8830()
-		{
-		}
-		[Fact]
-		public void Test_8831()
-		{
-		}
-		[Fact]
-		public void Test_8832()
-		{
-		}
-		[Fact]
-		public void Test_8833()
-		{
-		}
-		[Fact]
-		public void Test_8834()
-		{
-		}
-		[Fact]
-		public void Test_8835()
-		{
-		}
-		[Fact]
-		public void Test_8836()
-		{
-		}
-		[Fact]
-		public void Test_8837()
-		{
-		}
-		[Fact]
-		public void Test_8838()
-		{
-		}
-		[Fact]
-		public void Test_8839()
-		{
-		}
-		[Fact]
-		public void Test_8840()
-		{
-		}
-		[Fact]
-		public void Test_8841()
-		{
-		}
-		[Fact]
-		public void Test_8842()
-		{
-		}
-		[Fact]
-		public void Test_8843()
-		{
-		}
-		[Fact]
-		public void Test_8844()
-		{
-		}
-		[Fact]
-		public void Test_8845()
-		{
-		}
-		[Fact]
-		public void Test_8846()
-		{
-		}
-		[Fact]
-		public void Test_8847()
-		{
-		}
-		[Fact]
-		public void Test_8848()
-		{
-		}
-		[Fact]
-		public void Test_8849()
-		{
-		}
-		[Fact]
-		public void Test_8850()
-		{
-		}
-		[Fact]
-		public void Test_8851()
-		{
-		}
-		[Fact]
-		public void Test_8852()
-		{
-		}
-		[Fact]
-		public void Test_8853()
-		{
-		}
-		[Fact]
-		public void Test_8854()
-		{
-		}
-		[Fact]
-		public void Test_8855()
-		{
-		}
-		[Fact]
-		public void Test_8856()
-		{
-		}
-		[Fact]
-		public void Test_8857()
-		{
-		}
-		[Fact]
-		public void Test_8858()
-		{
-		}
-		[Fact]
-		public void Test_8859()
-		{
-		}
-		[Fact]
-		public void Test_8860()
-		{
-		}
-		[Fact]
-		public void Test_8861()
-		{
-		}
-		[Fact]
-		public void Test_8862()
-		{
-		}
-		[Fact]
-		public void Test_8863()
-		{
-		}
-		[Fact]
-		public void Test_8864()
-		{
-		}
-		[Fact]
-		public void Test_8865()
-		{
-		}
-		[Fact]
-		public void Test_8866()
-		{
-		}
-		[Fact]
-		public void Test_8867()
-		{
-		}
-		[Fact]
-		public void Test_8868()
-		{
-		}
-		[Fact]
-		public void Test_8869()
-		{
-		}
-		[Fact]
-		public void Test_8870()
-		{
-		}
-		[Fact]
-		public void Test_8871()
-		{
-		}
-		[Fact]
-		public void Test_8872()
-		{
-		}
-		[Fact]
-		public void Test_8873()
-		{
-		}
-		[Fact]
-		public void Test_8874()
-		{
-		}
-		[Fact]
-		public void Test_8875()
-		{
-		}
-		[Fact]
-		public void Test_8876()
-		{
-		}
-		[Fact]
-		public void Test_8877()
-		{
-		}
-		[Fact]
-		public void Test_8878()
-		{
-		}
-		[Fact]
-		public void Test_8879()
-		{
-		}
-		[Fact]
-		public void Test_8880()
-		{
-		}
-		[Fact]
-		public void Test_8881()
-		{
-		}
-		[Fact]
-		public void Test_8882()
-		{
-		}
-		[Fact]
-		public void Test_8883()
-		{
-		}
-		[Fact]
-		public void Test_8884()
-		{
-		}
-		[Fact]
-		public void Test_8885()
-		{
-		}
-		[Fact]
-		public void Test_8886()
-		{
-		}
-		[Fact]
-		public void Test_8887()
-		{
-		}
-		[Fact]
-		public void Test_8888()
-		{
-		}
-		[Fact]
-		public void Test_8889()
-		{
-		}
-		[Fact]
-		public void Test_8890()
-		{
-		}
-		[Fact]
-		public void Test_8891()
-		{
-		}
-		[Fact]
-		public void Test_8892()
-		{
-		}
-		[Fact]
-		public void Test_8893()
-		{
-		}
-		[Fact]
-		public void Test_8894()
-		{
-		}
-		[Fact]
-		public void Test_8895()
-		{
-		}
-		[Fact]
-		public void Test_8896()
-		{
-		}
-		[Fact]
-		public void Test_8897()
-		{
-		}
-		[Fact]
-		public void Test_8898()
-		{
-		}
-		[Fact]
-		public void Test_8899()
-		{
-		}
-		[Fact]
-		public void Test_8900()
-		{
-		}
-		[Fact]
-		public void Test_8901()
-		{
-		}
-		[Fact]
-		public void Test_8902()
-		{
-		}
-		[Fact]
-		public void Test_8903()
-		{
-		}
-		[Fact]
-		public void Test_8904()
-		{
-		}
-		[Fact]
-		public void Test_8905()
-		{
-		}
-		[Fact]
-		public void Test_8906()
-		{
-		}
-		[Fact]
-		public void Test_8907()
-		{
-		}
-		[Fact]
-		public void Test_8908()
-		{
-		}
-		[Fact]
-		public void Test_8909()
-		{
-		}
-		[Fact]
-		public void Test_8910()
-		{
-		}
-		[Fact]
-		public void Test_8911()
-		{
-		}
-		[Fact]
-		public void Test_8912()
-		{
-		}
-		[Fact]
-		public void Test_8913()
-		{
-		}
-		[Fact]
-		public void Test_8914()
-		{
-		}
-		[Fact]
-		public void Test_8915()
-		{
-		}
-		[Fact]
-		public void Test_8916()
-		{
-		}
-		[Fact]
-		public void Test_8917()
-		{
-		}
-		[Fact]
-		public void Test_8918()
-		{
-		}
-		[Fact]
-		public void Test_8919()
-		{
-		}
-		[Fact]
-		public void Test_8920()
-		{
-		}
-		[Fact]
-		public void Test_8921()
-		{
-		}
-		[Fact]
-		public void Test_8922()
-		{
-		}
-		[Fact]
-		public void Test_8923()
-		{
-		}
-		[Fact]
-		public void Test_8924()
-		{
-		}
-		[Fact]
-		public void Test_8925()
-		{
-		}
-		[Fact]
-		public void Test_8926()
-		{
-		}
-		[Fact]
-		public void Test_8927()
-		{
-		}
-		[Fact]
-		public void Test_8928()
-		{
-		}
-		[Fact]
-		public void Test_8929()
-		{
-		}
-		[Fact]
-		public void Test_8930()
-		{
-		}
-		[Fact]
-		public void Test_8931()
-		{
-		}
-		[Fact]
-		public void Test_8932()
-		{
-		}
-		[Fact]
-		public void Test_8933()
-		{
-		}
-		[Fact]
-		public void Test_8934()
-		{
-		}
-		[Fact]
-		public void Test_8935()
-		{
-		}
-		[Fact]
-		public void Test_8936()
-		{
-		}
-		[Fact]
-		public void Test_8937()
-		{
-		}
-		[Fact]
-		public void Test_8938()
-		{
-		}
-		[Fact]
-		public void Test_8939()
-		{
-		}
-		[Fact]
-		public void Test_8940()
-		{
-		}
-		[Fact]
-		public void Test_8941()
-		{
-		}
-		[Fact]
-		public void Test_8942()
-		{
-		}
-		[Fact]
-		public void Test_8943()
-		{
-		}
-		[Fact]
-		public void Test_8944()
-		{
-		}
-		[Fact]
-		public void Test_8945()
-		{
-		}
-		[Fact]
-		public void Test_8946()
-		{
-		}
-		[Fact]
-		public void Test_8947()
-		{
-		}
-		[Fact]
-		public void Test_8948()
-		{
-		}
-		[Fact]
-		public void Test_8949()
-		{
-		}
-		[Fact]
-		public void Test_8950()
-		{
-		}
-		[Fact]
-		public void Test_8951()
-		{
-		}
-		[Fact]
-		public void Test_8952()
-		{
-		}
-		[Fact]
-		public void Test_8953()
-		{
-		}
-		[Fact]
-		public void Test_8954()
-		{
-		}
-		[Fact]
-		public void Test_8955()
-		{
-		}
-		[Fact]
-		public void Test_8956()
-		{
-		}
-		[Fact]
-		public void Test_8957()
-		{
-		}
-		[Fact]
-		public void Test_8958()
-		{
-		}
-		[Fact]
-		public void Test_8959()
-		{
-		}
-		[Fact]
-		public void Test_8960()
-		{
-		}
-		[Fact]
-		public void Test_8961()
-		{
-		}
-		[Fact]
-		public void Test_8962()
-		{
-		}
-		[Fact]
-		public void Test_8963()
-		{
-		}
-		[Fact]
-		public void Test_8964()
-		{
-		}
-		[Fact]
-		public void Test_8965()
-		{
-		}
-		[Fact]
-		public void Test_8966()
-		{
-		}
-		[Fact]
-		public void Test_8967()
-		{
-		}
-		[Fact]
-		public void Test_8968()
-		{
-		}
-		[Fact]
-		public void Test_8969()
-		{
-		}
-		[Fact]
-		public void Test_8970()
-		{
-		}
-		[Fact]
-		public void Test_8971()
-		{
-		}
-		[Fact]
-		public void Test_8972()
-		{
-		}
-		[Fact]
-		public void Test_8973()
-		{
-		}
-		[Fact]
-		public void Test_8974()
-		{
-		}
-		[Fact]
-		public void Test_8975()
-		{
-		}
-		[Fact]
-		public void Test_8976()
-		{
-		}
-		[Fact]
-		public void Test_8977()
-		{
-		}
-		[Fact]
-		public void Test_8978()
-		{
-		}
-		[Fact]
-		public void Test_8979()
-		{
-		}
-		[Fact]
-		public void Test_8980()
-		{
-		}
-		[Fact]
-		public void Test_8981()
-		{
-		}
-		[Fact]
-		public void Test_8982()
-		{
-		}
-		[Fact]
-		public void Test_8983()
-		{
-		}
-		[Fact]
-		public void Test_8984()
-		{
-		}
-		[Fact]
-		public void Test_8985()
-		{
-		}
-		[Fact]
-		public void Test_8986()
-		{
-		}
-		[Fact]
-		public void Test_8987()
-		{
-		}
-		[Fact]
-		public void Test_8988()
-		{
-		}
-		[Fact]
-		public void Test_8989()
-		{
-		}
-		[Fact]
-		public void Test_8990()
-		{
-		}
-		[Fact]
-		public void Test_8991()
-		{
-		}
-		[Fact]
-		public void Test_8992()
-		{
-		}
-		[Fact]
-		public void Test_8993()
-		{
-		}
-		[Fact]
-		public void Test_8994()
-		{
-		}
-		[Fact]
-		public void Test_8995()
-		{
-		}
-		[Fact]
-		public void Test_8996()
-		{
-		}
-		[Fact]
-		public void Test_8997()
-		{
-		}
-		[Fact]
-		public void Test_8998()
-		{
-		}
-		[Fact]
-		public void Test_8999()
-		{
-		}
-		[Fact]
-		public void Test_9000()
-		{
-		}
-		[Fact]
-		public void Test_9001()
-		{
-		}
-		[Fact]
-		public void Test_9002()
-		{
-		}
-		[Fact]
-		public void Test_9003()
-		{
-		}
-		[Fact]
-		public void Test_9004()
-		{
-		}
-		[Fact]
-		public void Test_9005()
-		{
-		}
-		[Fact]
-		public void Test_9006()
-		{
-		}
-		[Fact]
-		public void Test_9007()
-		{
-		}
-		[Fact]
-		public void Test_9008()
-		{
-		}
-		[Fact]
-		public void Test_9009()
-		{
-		}
-		[Fact]
-		public void Test_9010()
-		{
-		}
-		[Fact]
-		public void Test_9011()
-		{
-		}
-		[Fact]
-		public void Test_9012()
-		{
-		}
-		[Fact]
-		public void Test_9013()
-		{
-		}
-		[Fact]
-		public void Test_9014()
-		{
-		}
-		[Fact]
-		public void Test_9015()
-		{
-		}
-		[Fact]
-		public void Test_9016()
-		{
-		}
-		[Fact]
-		public void Test_9017()
-		{
-		}
-		[Fact]
-		public void Test_9018()
-		{
-		}
-		[Fact]
-		public void Test_9019()
-		{
-		}
-		[Fact]
-		public void Test_9020()
-		{
-		}
-		[Fact]
-		public void Test_9021()
-		{
-		}
-		[Fact]
-		public void Test_9022()
-		{
-		}
-		[Fact]
-		public void Test_9023()
-		{
-		}
-		[Fact]
-		public void Test_9024()
-		{
-		}
-		[Fact]
-		public void Test_9025()
-		{
-		}
-		[Fact]
-		public void Test_9026()
-		{
-		}
-		[Fact]
-		public void Test_9027()
-		{
-		}
-		[Fact]
-		public void Test_9028()
-		{
-		}
-		[Fact]
-		public void Test_9029()
-		{
-		}
-		[Fact]
-		public void Test_9030()
-		{
-		}
-		[Fact]
-		public void Test_9031()
-		{
-		}
-		[Fact]
-		public void Test_9032()
-		{
-		}
-		[Fact]
-		public void Test_9033()
-		{
-		}
-		[Fact]
-		public void Test_9034()
-		{
-		}
-		[Fact]
-		public void Test_9035()
-		{
-		}
-		[Fact]
-		public void Test_9036()
-		{
-		}
-		[Fact]
-		public void Test_9037()
-		{
-		}
-		[Fact]
-		public void Test_9038()
-		{
-		}
-		[Fact]
-		public void Test_9039()
-		{
-		}
-		[Fact]
-		public void Test_9040()
-		{
-		}
-		[Fact]
-		public void Test_9041()
-		{
-		}
-		[Fact]
-		public void Test_9042()
-		{
-		}
-		[Fact]
-		public void Test_9043()
-		{
-		}
-		[Fact]
-		public void Test_9044()
-		{
-		}
-		[Fact]
-		public void Test_9045()
-		{
-		}
-		[Fact]
-		public void Test_9046()
-		{
-		}
-		[Fact]
-		public void Test_9047()
-		{
-		}
-		[Fact]
-		public void Test_9048()
-		{
-		}
-		[Fact]
-		public void Test_9049()
-		{
-		}
-		[Fact]
-		public void Test_9050()
-		{
-		}
-		[Fact]
-		public void Test_9051()
-		{
-		}
-		[Fact]
-		public void Test_9052()
-		{
-		}
-		[Fact]
-		public void Test_9053()
-		{
-		}
-		[Fact]
-		public void Test_9054()
-		{
-		}
-		[Fact]
-		public void Test_9055()
-		{
-		}
-		[Fact]
-		public void Test_9056()
-		{
-		}
-		[Fact]
-		public void Test_9057()
-		{
-		}
-		[Fact]
-		public void Test_9058()
-		{
-		}
-		[Fact]
-		public void Test_9059()
-		{
-		}
-		[Fact]
-		public void Test_9060()
-		{
-		}
-		[Fact]
-		public void Test_9061()
-		{
-		}
-		[Fact]
-		public void Test_9062()
-		{
-		}
-		[Fact]
-		public void Test_9063()
-		{
-		}
-		[Fact]
-		public void Test_9064()
-		{
-		}
-		[Fact]
-		public void Test_9065()
-		{
-		}
-		[Fact]
-		public void Test_9066()
-		{
-		}
-		[Fact]
-		public void Test_9067()
-		{
-		}
-		[Fact]
-		public void Test_9068()
-		{
-		}
-		[Fact]
-		public void Test_9069()
-		{
-		}
-		[Fact]
-		public void Test_9070()
-		{
-		}
-		[Fact]
-		public void Test_9071()
-		{
-		}
-		[Fact]
-		public void Test_9072()
-		{
-		}
-		[Fact]
-		public void Test_9073()
-		{
-		}
-		[Fact]
-		public void Test_9074()
-		{
-		}
-		[Fact]
-		public void Test_9075()
-		{
-		}
-		[Fact]
-		public void Test_9076()
-		{
-		}
-		[Fact]
-		public void Test_9077()
-		{
-		}
-		[Fact]
-		public void Test_9078()
-		{
-		}
-		[Fact]
-		public void Test_9079()
-		{
-		}
-		[Fact]
-		public void Test_9080()
-		{
-		}
-		[Fact]
-		public void Test_9081()
-		{
-		}
-		[Fact]
-		public void Test_9082()
-		{
-		}
-		[Fact]
-		public void Test_9083()
-		{
-		}
-		[Fact]
-		public void Test_9084()
-		{
-		}
-		[Fact]
-		public void Test_9085()
-		{
-		}
-		[Fact]
-		public void Test_9086()
-		{
-		}
-		[Fact]
-		public void Test_9087()
-		{
-		}
-		[Fact]
-		public void Test_9088()
-		{
-		}
-		[Fact]
-		public void Test_9089()
-		{
-		}
-		[Fact]
-		public void Test_9090()
-		{
-		}
-		[Fact]
-		public void Test_9091()
-		{
-		}
-		[Fact]
-		public void Test_9092()
-		{
-		}
-		[Fact]
-		public void Test_9093()
-		{
-		}
-		[Fact]
-		public void Test_9094()
-		{
-		}
-		[Fact]
-		public void Test_9095()
-		{
-		}
-		[Fact]
-		public void Test_9096()
-		{
-		}
-		[Fact]
-		public void Test_9097()
-		{
-		}
-		[Fact]
-		public void Test_9098()
-		{
-		}
-		[Fact]
-		public void Test_9099()
-		{
-		}
-		[Fact]
-		public void Test_9100()
-		{
-		}
-		[Fact]
-		public void Test_9101()
-		{
-		}
-		[Fact]
-		public void Test_9102()
-		{
-		}
-		[Fact]
-		public void Test_9103()
-		{
-		}
-		[Fact]
-		public void Test_9104()
-		{
-		}
-		[Fact]
-		public void Test_9105()
-		{
-		}
-		[Fact]
-		public void Test_9106()
-		{
-		}
-		[Fact]
-		public void Test_9107()
-		{
-		}
-		[Fact]
-		public void Test_9108()
-		{
-		}
-		[Fact]
-		public void Test_9109()
-		{
-		}
-		[Fact]
-		public void Test_9110()
-		{
-		}
-		[Fact]
-		public void Test_9111()
-		{
-		}
-		[Fact]
-		public void Test_9112()
-		{
-		}
-		[Fact]
-		public void Test_9113()
-		{
-		}
-		[Fact]
-		public void Test_9114()
-		{
-		}
-		[Fact]
-		public void Test_9115()
-		{
-		}
-		[Fact]
-		public void Test_9116()
-		{
-		}
-		[Fact]
-		public void Test_9117()
-		{
-		}
-		[Fact]
-		public void Test_9118()
-		{
-		}
-		[Fact]
-		public void Test_9119()
-		{
-		}
-		[Fact]
-		public void Test_9120()
-		{
-		}
-		[Fact]
-		public void Test_9121()
-		{
-		}
-		[Fact]
-		public void Test_9122()
-		{
-		}
-		[Fact]
-		public void Test_9123()
-		{
-		}
-		[Fact]
-		public void Test_9124()
-		{
-		}
-		[Fact]
-		public void Test_9125()
-		{
-		}
-		[Fact]
-		public void Test_9126()
-		{
-		}
-		[Fact]
-		public void Test_9127()
-		{
-		}
-		[Fact]
-		public void Test_9128()
-		{
-		}
-		[Fact]
-		public void Test_9129()
-		{
-		}
-		[Fact]
-		public void Test_9130()
-		{
-		}
-		[Fact]
-		public void Test_9131()
-		{
-		}
-		[Fact]
-		public void Test_9132()
-		{
-		}
-		[Fact]
-		public void Test_9133()
-		{
-		}
-		[Fact]
-		public void Test_9134()
-		{
-		}
-		[Fact]
-		public void Test_9135()
-		{
-		}
-		[Fact]
-		public void Test_9136()
-		{
-		}
-		[Fact]
-		public void Test_9137()
-		{
-		}
-		[Fact]
-		public void Test_9138()
-		{
-		}
-		[Fact]
-		public void Test_9139()
-		{
-		}
-		[Fact]
-		public void Test_9140()
-		{
-		}
-		[Fact]
-		public void Test_9141()
-		{
-		}
-		[Fact]
-		public void Test_9142()
-		{
-		}
-		[Fact]
-		public void Test_9143()
-		{
-		}
-		[Fact]
-		public void Test_9144()
-		{
-		}
-		[Fact]
-		public void Test_9145()
-		{
-		}
-		[Fact]
-		public void Test_9146()
-		{
-		}
-		[Fact]
-		public void Test_9147()
-		{
-		}
-		[Fact]
-		public void Test_9148()
-		{
-		}
-		[Fact]
-		public void Test_9149()
-		{
-		}
-		[Fact]
-		public void Test_9150()
-		{
-		}
-		[Fact]
-		public void Test_9151()
-		{
-		}
-		[Fact]
-		public void Test_9152()
-		{
-		}
-		[Fact]
-		public void Test_9153()
-		{
-		}
-		[Fact]
-		public void Test_9154()
-		{
-		}
-		[Fact]
-		public void Test_9155()
-		{
-		}
-		[Fact]
-		public void Test_9156()
-		{
-		}
-		[Fact]
-		public void Test_9157()
-		{
-		}
-		[Fact]
-		public void Test_9158()
-		{
-		}
-		[Fact]
-		public void Test_9159()
-		{
-		}
-		[Fact]
-		public void Test_9160()
-		{
-		}
-		[Fact]
-		public void Test_9161()
-		{
-		}
-		[Fact]
-		public void Test_9162()
-		{
-		}
-		[Fact]
-		public void Test_9163()
-		{
-		}
-		[Fact]
-		public void Test_9164()
-		{
-		}
-		[Fact]
-		public void Test_9165()
-		{
-		}
-		[Fact]
-		public void Test_9166()
-		{
-		}
-		[Fact]
-		public void Test_9167()
-		{
-		}
-		[Fact]
-		public void Test_9168()
-		{
-		}
-		[Fact]
-		public void Test_9169()
-		{
-		}
-		[Fact]
-		public void Test_9170()
-		{
-		}
-		[Fact]
-		public void Test_9171()
-		{
-		}
-		[Fact]
-		public void Test_9172()
-		{
-		}
-		[Fact]
-		public void Test_9173()
-		{
-		}
-		[Fact]
-		public void Test_9174()
-		{
-		}
-		[Fact]
-		public void Test_9175()
-		{
-		}
-		[Fact]
-		public void Test_9176()
-		{
-		}
-		[Fact]
-		public void Test_9177()
-		{
-		}
-		[Fact]
-		public void Test_9178()
-		{
-		}
-		[Fact]
-		public void Test_9179()
-		{
-		}
-		[Fact]
-		public void Test_9180()
-		{
-		}
-		[Fact]
-		public void Test_9181()
-		{
-		}
-		[Fact]
-		public void Test_9182()
-		{
-		}
-		[Fact]
-		public void Test_9183()
-		{
-		}
-		[Fact]
-		public void Test_9184()
-		{
-		}
-		[Fact]
-		public void Test_9185()
-		{
-		}
-		[Fact]
-		public void Test_9186()
-		{
-		}
-		[Fact]
-		public void Test_9187()
-		{
-		}
-		[Fact]
-		public void Test_9188()
-		{
-		}
-		[Fact]
-		public void Test_9189()
-		{
-		}
-		[Fact]
-		public void Test_9190()
-		{
-		}
-		[Fact]
-		public void Test_9191()
-		{
-		}
-		[Fact]
-		public void Test_9192()
-		{
-		}
-		[Fact]
-		public void Test_9193()
-		{
-		}
-		[Fact]
-		public void Test_9194()
-		{
-		}
-		[Fact]
-		public void Test_9195()
-		{
-		}
-		[Fact]
-		public void Test_9196()
-		{
-		}
-		[Fact]
-		public void Test_9197()
-		{
-		}
-		[Fact]
-		public void Test_9198()
-		{
-		}
-		[Fact]
-		public void Test_9199()
-		{
-		}
-		[Fact]
-		public void Test_9200()
-		{
-		}
-		[Fact]
-		public void Test_9201()
-		{
-		}
-		[Fact]
-		public void Test_9202()
-		{
-		}
-		[Fact]
-		public void Test_9203()
-		{
-		}
-		[Fact]
-		public void Test_9204()
-		{
-		}
-		[Fact]
-		public void Test_9205()
-		{
-		}
-		[Fact]
-		public void Test_9206()
-		{
-		}
-		[Fact]
-		public void Test_9207()
-		{
-		}
-		[Fact]
-		public void Test_9208()
-		{
-		}
-		[Fact]
-		public void Test_9209()
-		{
-		}
-		[Fact]
-		public void Test_9210()
-		{
-		}
-		[Fact]
-		public void Test_9211()
-		{
-		}
-		[Fact]
-		public void Test_9212()
-		{
-		}
-		[Fact]
-		public void Test_9213()
-		{
-		}
-		[Fact]
-		public void Test_9214()
-		{
-		}
-		[Fact]
-		public void Test_9215()
-		{
-		}
-		[Fact]
-		public void Test_9216()
-		{
-		}
-		[Fact]
-		public void Test_9217()
-		{
-		}
-		[Fact]
-		public void Test_9218()
-		{
-		}
-		[Fact]
-		public void Test_9219()
-		{
-		}
-		[Fact]
-		public void Test_9220()
-		{
-		}
-		[Fact]
-		public void Test_9221()
-		{
-		}
-		[Fact]
-		public void Test_9222()
-		{
-		}
-		[Fact]
-		public void Test_9223()
-		{
-		}
-		[Fact]
-		public void Test_9224()
-		{
-		}
-		[Fact]
-		public void Test_9225()
-		{
-		}
-		[Fact]
-		public void Test_9226()
-		{
-		}
-		[Fact]
-		public void Test_9227()
-		{
-		}
-		[Fact]
-		public void Test_9228()
-		{
-		}
-		[Fact]
-		public void Test_9229()
-		{
-		}
-		[Fact]
-		public void Test_9230()
-		{
-		}
-		[Fact]
-		public void Test_9231()
-		{
-		}
-		[Fact]
-		public void Test_9232()
-		{
-		}
-		[Fact]
-		public void Test_9233()
-		{
-		}
-		[Fact]
-		public void Test_9234()
-		{
-		}
-		[Fact]
-		public void Test_9235()
-		{
-		}
-		[Fact]
-		public void Test_9236()
-		{
-		}
-		[Fact]
-		public void Test_9237()
-		{
-		}
-		[Fact]
-		public void Test_9238()
-		{
-		}
-		[Fact]
-		public void Test_9239()
-		{
-		}
-		[Fact]
-		public void Test_9240()
-		{
-		}
-		[Fact]
-		public void Test_9241()
-		{
-		}
-		[Fact]
-		public void Test_9242()
-		{
-		}
-		[Fact]
-		public void Test_9243()
-		{
-		}
-		[Fact]
-		public void Test_9244()
-		{
-		}
-		[Fact]
-		public void Test_9245()
-		{
-		}
-		[Fact]
-		public void Test_9246()
-		{
-		}
-		[Fact]
-		public void Test_9247()
-		{
-		}
-		[Fact]
-		public void Test_9248()
-		{
-		}
-		[Fact]
-		public void Test_9249()
-		{
-		}
-		[Fact]
-		public void Test_9250()
-		{
-		}
-		[Fact]
-		public void Test_9251()
-		{
-		}
-		[Fact]
-		public void Test_9252()
-		{
-		}
-		[Fact]
-		public void Test_9253()
-		{
-		}
-		[Fact]
-		public void Test_9254()
-		{
-		}
-		[Fact]
-		public void Test_9255()
-		{
-		}
-		[Fact]
-		public void Test_9256()
-		{
-		}
-		[Fact]
-		public void Test_9257()
-		{
-		}
-		[Fact]
-		public void Test_9258()
-		{
-		}
-		[Fact]
-		public void Test_9259()
-		{
-		}
-		[Fact]
-		public void Test_9260()
-		{
-		}
-		[Fact]
-		public void Test_9261()
-		{
-		}
-		[Fact]
-		public void Test_9262()
-		{
-		}
-		[Fact]
-		public void Test_9263()
-		{
-		}
-		[Fact]
-		public void Test_9264()
-		{
-		}
-		[Fact]
-		public void Test_9265()
-		{
-		}
-		[Fact]
-		public void Test_9266()
-		{
-		}
-		[Fact]
-		public void Test_9267()
-		{
-		}
-		[Fact]
-		public void Test_9268()
-		{
-		}
-		[Fact]
-		public void Test_9269()
-		{
-		}
-		[Fact]
-		public void Test_9270()
-		{
-		}
-		[Fact]
-		public void Test_9271()
-		{
-		}
-		[Fact]
-		public void Test_9272()
-		{
-		}
-		[Fact]
-		public void Test_9273()
-		{
-		}
-		[Fact]
-		public void Test_9274()
-		{
-		}
-		[Fact]
-		public void Test_9275()
-		{
-		}
-		[Fact]
-		public void Test_9276()
-		{
-		}
-		[Fact]
-		public void Test_9277()
-		{
-		}
-		[Fact]
-		public void Test_9278()
-		{
-		}
-		[Fact]
-		public void Test_9279()
-		{
-		}
-		[Fact]
-		public void Test_9280()
-		{
-		}
-		[Fact]
-		public void Test_9281()
-		{
-		}
-		[Fact]
-		public void Test_9282()
-		{
-		}
-		[Fact]
-		public void Test_9283()
-		{
-		}
-		[Fact]
-		public void Test_9284()
-		{
-		}
-		[Fact]
-		public void Test_9285()
-		{
-		}
-		[Fact]
-		public void Test_9286()
-		{
-		}
-		[Fact]
-		public void Test_9287()
-		{
-		}
-		[Fact]
-		public void Test_9288()
-		{
-		}
-		[Fact]
-		public void Test_9289()
-		{
-		}
-		[Fact]
-		public void Test_9290()
-		{
-		}
-		[Fact]
-		public void Test_9291()
-		{
-		}
-		[Fact]
-		public void Test_9292()
-		{
-		}
-		[Fact]
-		public void Test_9293()
-		{
-		}
-		[Fact]
-		public void Test_9294()
-		{
-		}
-		[Fact]
-		public void Test_9295()
-		{
-		}
-		[Fact]
-		public void Test_9296()
-		{
-		}
-		[Fact]
-		public void Test_9297()
-		{
-		}
-		[Fact]
-		public void Test_9298()
-		{
-		}
-		[Fact]
-		public void Test_9299()
-		{
-		}
-		[Fact]
-		public void Test_9300()
-		{
-		}
-		[Fact]
-		public void Test_9301()
-		{
-		}
-		[Fact]
-		public void Test_9302()
-		{
-		}
-		[Fact]
-		public void Test_9303()
-		{
-		}
-		[Fact]
-		public void Test_9304()
-		{
-		}
-		[Fact]
-		public void Test_9305()
-		{
-		}
-		[Fact]
-		public void Test_9306()
-		{
-		}
-		[Fact]
-		public void Test_9307()
-		{
-		}
-		[Fact]
-		public void Test_9308()
-		{
-		}
-		[Fact]
-		public void Test_9309()
-		{
-		}
-		[Fact]
-		public void Test_9310()
-		{
-		}
-		[Fact]
-		public void Test_9311()
-		{
-		}
-		[Fact]
-		public void Test_9312()
-		{
-		}
-		[Fact]
-		public void Test_9313()
-		{
-		}
-		[Fact]
-		public void Test_9314()
-		{
-		}
-		[Fact]
-		public void Test_9315()
-		{
-		}
-		[Fact]
-		public void Test_9316()
-		{
-		}
-		[Fact]
-		public void Test_9317()
-		{
-		}
-		[Fact]
-		public void Test_9318()
-		{
-		}
-		[Fact]
-		public void Test_9319()
-		{
-		}
-		[Fact]
-		public void Test_9320()
-		{
-		}
-		[Fact]
-		public void Test_9321()
-		{
-		}
-		[Fact]
-		public void Test_9322()
-		{
-		}
-		[Fact]
-		public void Test_9323()
-		{
-		}
-		[Fact]
-		public void Test_9324()
-		{
-		}
-		[Fact]
-		public void Test_9325()
-		{
-		}
-		[Fact]
-		public void Test_9326()
-		{
-		}
-		[Fact]
-		public void Test_9327()
-		{
-		}
-		[Fact]
-		public void Test_9328()
-		{
-		}
-		[Fact]
-		public void Test_9329()
-		{
-		}
-		[Fact]
-		public void Test_9330()
-		{
-		}
-		[Fact]
-		public void Test_9331()
-		{
-		}
-		[Fact]
-		public void Test_9332()
-		{
-		}
-		[Fact]
-		public void Test_9333()
-		{
-		}
-		[Fact]
-		public void Test_9334()
-		{
-		}
-		[Fact]
-		public void Test_9335()
-		{
-		}
-		[Fact]
-		public void Test_9336()
-		{
-		}
-		[Fact]
-		public void Test_9337()
-		{
-		}
-		[Fact]
-		public void Test_9338()
-		{
-		}
-		[Fact]
-		public void Test_9339()
-		{
-		}
-		[Fact]
-		public void Test_9340()
-		{
-		}
-		[Fact]
-		public void Test_9341()
-		{
-		}
-		[Fact]
-		public void Test_9342()
-		{
-		}
-		[Fact]
-		public void Test_9343()
-		{
-		}
-		[Fact]
-		public void Test_9344()
-		{
-		}
-		[Fact]
-		public void Test_9345()
-		{
-		}
-		[Fact]
-		public void Test_9346()
-		{
-		}
-		[Fact]
-		public void Test_9347()
-		{
-		}
-		[Fact]
-		public void Test_9348()
-		{
-		}
-		[Fact]
-		public void Test_9349()
-		{
-		}
-		[Fact]
-		public void Test_9350()
-		{
-		}
-		[Fact]
-		public void Test_9351()
-		{
-		}
-		[Fact]
-		public void Test_9352()
-		{
-		}
-		[Fact]
-		public void Test_9353()
-		{
-		}
-		[Fact]
-		public void Test_9354()
-		{
-		}
-		[Fact]
-		public void Test_9355()
-		{
-		}
-		[Fact]
-		public void Test_9356()
-		{
-		}
-		[Fact]
-		public void Test_9357()
-		{
-		}
-		[Fact]
-		public void Test_9358()
-		{
-		}
-		[Fact]
-		public void Test_9359()
-		{
-		}
-		[Fact]
-		public void Test_9360()
-		{
-		}
-		[Fact]
-		public void Test_9361()
-		{
-		}
-		[Fact]
-		public void Test_9362()
-		{
-		}
-		[Fact]
-		public void Test_9363()
-		{
-		}
-		[Fact]
-		public void Test_9364()
-		{
-		}
-		[Fact]
-		public void Test_9365()
-		{
-		}
-		[Fact]
-		public void Test_9366()
-		{
-		}
-		[Fact]
-		public void Test_9367()
-		{
-		}
-		[Fact]
-		public void Test_9368()
-		{
-		}
-		[Fact]
-		public void Test_9369()
-		{
-		}
-		[Fact]
-		public void Test_9370()
-		{
-		}
-		[Fact]
-		public void Test_9371()
-		{
-		}
-		[Fact]
-		public void Test_9372()
-		{
-		}
-		[Fact]
-		public void Test_9373()
-		{
-		}
-		[Fact]
-		public void Test_9374()
-		{
-		}
-		[Fact]
-		public void Test_9375()
-		{
-		}
-		[Fact]
-		public void Test_9376()
-		{
-		}
-		[Fact]
-		public void Test_9377()
-		{
-		}
-		[Fact]
-		public void Test_9378()
-		{
-		}
-		[Fact]
-		public void Test_9379()
-		{
-		}
-		[Fact]
-		public void Test_9380()
-		{
-		}
-		[Fact]
-		public void Test_9381()
-		{
-		}
-		[Fact]
-		public void Test_9382()
-		{
-		}
-		[Fact]
-		public void Test_9383()
-		{
-		}
-		[Fact]
-		public void Test_9384()
-		{
-		}
-		[Fact]
-		public void Test_9385()
-		{
-		}
-		[Fact]
-		public void Test_9386()
-		{
-		}
-		[Fact]
-		public void Test_9387()
-		{
-		}
-		[Fact]
-		public void Test_9388()
-		{
-		}
-		[Fact]
-		public void Test_9389()
-		{
-		}
-		[Fact]
-		public void Test_9390()
-		{
-		}
-		[Fact]
-		public void Test_9391()
-		{
-		}
-		[Fact]
-		public void Test_9392()
-		{
-		}
-		[Fact]
-		public void Test_9393()
-		{
-		}
-		[Fact]
-		public void Test_9394()
-		{
-		}
-		[Fact]
-		public void Test_9395()
-		{
-		}
-		[Fact]
-		public void Test_9396()
-		{
-		}
-		[Fact]
-		public void Test_9397()
-		{
-		}
-		[Fact]
-		public void Test_9398()
-		{
-		}
-		[Fact]
-		public void Test_9399()
-		{
-		}
-		[Fact]
-		public void Test_9400()
-		{
-		}
-		[Fact]
-		public void Test_9401()
-		{
-		}
-		[Fact]
-		public void Test_9402()
-		{
-		}
-		[Fact]
-		public void Test_9403()
-		{
-		}
-		[Fact]
-		public void Test_9404()
-		{
-		}
-		[Fact]
-		public void Test_9405()
-		{
-		}
-		[Fact]
-		public void Test_9406()
-		{
-		}
-		[Fact]
-		public void Test_9407()
-		{
-		}
-		[Fact]
-		public void Test_9408()
-		{
-		}
-		[Fact]
-		public void Test_9409()
-		{
-		}
-		[Fact]
-		public void Test_9410()
-		{
-		}
-		[Fact]
-		public void Test_9411()
-		{
-		}
-		[Fact]
-		public void Test_9412()
-		{
-		}
-		[Fact]
-		public void Test_9413()
-		{
-		}
-		[Fact]
-		public void Test_9414()
-		{
-		}
-		[Fact]
-		public void Test_9415()
-		{
-		}
-		[Fact]
-		public void Test_9416()
-		{
-		}
-		[Fact]
-		public void Test_9417()
-		{
-		}
-		[Fact]
-		public void Test_9418()
-		{
-		}
-		[Fact]
-		public void Test_9419()
-		{
-		}
-		[Fact]
-		public void Test_9420()
-		{
-		}
-		[Fact]
-		public void Test_9421()
-		{
-		}
-		[Fact]
-		public void Test_9422()
-		{
-		}
-		[Fact]
-		public void Test_9423()
-		{
-		}
-		[Fact]
-		public void Test_9424()
-		{
-		}
-		[Fact]
-		public void Test_9425()
-		{
-		}
-		[Fact]
-		public void Test_9426()
-		{
-		}
-		[Fact]
-		public void Test_9427()
-		{
-		}
-		[Fact]
-		public void Test_9428()
-		{
-		}
-		[Fact]
-		public void Test_9429()
-		{
-		}
-		[Fact]
-		public void Test_9430()
-		{
-		}
-		[Fact]
-		public void Test_9431()
-		{
-		}
-		[Fact]
-		public void Test_9432()
-		{
-		}
-		[Fact]
-		public void Test_9433()
-		{
-		}
-		[Fact]
-		public void Test_9434()
-		{
-		}
-		[Fact]
-		public void Test_9435()
-		{
-		}
-		[Fact]
-		public void Test_9436()
-		{
-		}
-		[Fact]
-		public void Test_9437()
-		{
-		}
-		[Fact]
-		public void Test_9438()
-		{
-		}
-		[Fact]
-		public void Test_9439()
-		{
-		}
-		[Fact]
-		public void Test_9440()
-		{
-		}
-		[Fact]
-		public void Test_9441()
-		{
-		}
-		[Fact]
-		public void Test_9442()
-		{
-		}
-		[Fact]
-		public void Test_9443()
-		{
-		}
-		[Fact]
-		public void Test_9444()
-		{
-		}
-		[Fact]
-		public void Test_9445()
-		{
-		}
-		[Fact]
-		public void Test_9446()
-		{
-		}
-		[Fact]
-		public void Test_9447()
-		{
-		}
-		[Fact]
-		public void Test_9448()
-		{
-		}
-		[Fact]
-		public void Test_9449()
-		{
-		}
-		[Fact]
-		public void Test_9450()
-		{
-		}
-		[Fact]
-		public void Test_9451()
-		{
-		}
-		[Fact]
-		public void Test_9452()
-		{
-		}
-		[Fact]
-		public void Test_9453()
-		{
-		}
-		[Fact]
-		public void Test_9454()
-		{
-		}
-		[Fact]
-		public void Test_9455()
-		{
-		}
-		[Fact]
-		public void Test_9456()
-		{
-		}
-		[Fact]
-		public void Test_9457()
-		{
-		}
-		[Fact]
-		public void Test_9458()
-		{
-		}
-		[Fact]
-		public void Test_9459()
-		{
-		}
-		[Fact]
-		public void Test_9460()
-		{
-		}
-		[Fact]
-		public void Test_9461()
-		{
-		}
-		[Fact]
-		public void Test_9462()
-		{
-		}
-		[Fact]
-		public void Test_9463()
-		{
-		}
-		[Fact]
-		public void Test_9464()
-		{
-		}
-		[Fact]
-		public void Test_9465()
-		{
-		}
-		[Fact]
-		public void Test_9466()
-		{
-		}
-		[Fact]
-		public void Test_9467()
-		{
-		}
-		[Fact]
-		public void Test_9468()
-		{
-		}
-		[Fact]
-		public void Test_9469()
-		{
-		}
-		[Fact]
-		public void Test_9470()
-		{
-		}
-		[Fact]
-		public void Test_9471()
-		{
-		}
-		[Fact]
-		public void Test_9472()
-		{
-		}
-		[Fact]
-		public void Test_9473()
-		{
-		}
-		[Fact]
-		public void Test_9474()
-		{
-		}
-		[Fact]
-		public void Test_9475()
-		{
-		}
-		[Fact]
-		public void Test_9476()
-		{
-		}
-		[Fact]
-		public void Test_9477()
-		{
-		}
-		[Fact]
-		public void Test_9478()
-		{
-		}
-		[Fact]
-		public void Test_9479()
-		{
-		}
-		[Fact]
-		public void Test_9480()
-		{
-		}
-		[Fact]
-		public void Test_9481()
-		{
-		}
-		[Fact]
-		public void Test_9482()
-		{
-		}
-		[Fact]
-		public void Test_9483()
-		{
-		}
-		[Fact]
-		public void Test_9484()
-		{
-		}
-		[Fact]
-		public void Test_9485()
-		{
-		}
-		[Fact]
-		public void Test_9486()
-		{
-		}
-		[Fact]
-		public void Test_9487()
-		{
-		}
-		[Fact]
-		public void Test_9488()
-		{
-		}
-		[Fact]
-		public void Test_9489()
-		{
-		}
-		[Fact]
-		public void Test_9490()
-		{
-		}
-		[Fact]
-		public void Test_9491()
-		{
-		}
-		[Fact]
-		public void Test_9492()
-		{
-		}
-		[Fact]
-		public void Test_9493()
-		{
-		}
-		[Fact]
-		public void Test_9494()
-		{
-		}
-		[Fact]
-		public void Test_9495()
-		{
-		}
-		[Fact]
-		public void Test_9496()
-		{
-		}
-		[Fact]
-		public void Test_9497()
-		{
-		}
-		[Fact]
-		public void Test_9498()
-		{
-		}
-		[Fact]
-		public void Test_9499()
-		{
-		}
-		[Fact]
-		public void Test_9500()
-		{
-		}
-		[Fact]
-		public void Test_9501()
-		{
-		}
-		[Fact]
-		public void Test_9502()
-		{
-		}
-		[Fact]
-		public void Test_9503()
-		{
-		}
-		[Fact]
-		public void Test_9504()
-		{
-		}
-		[Fact]
-		public void Test_9505()
-		{
-		}
-		[Fact]
-		public void Test_9506()
-		{
-		}
-		[Fact]
-		public void Test_9507()
-		{
-		}
-		[Fact]
-		public void Test_9508()
-		{
-		}
-		[Fact]
-		public void Test_9509()
-		{
-		}
-		[Fact]
-		public void Test_9510()
-		{
-		}
-		[Fact]
-		public void Test_9511()
-		{
-		}
-		[Fact]
-		public void Test_9512()
-		{
-		}
-		[Fact]
-		public void Test_9513()
-		{
-		}
-		[Fact]
-		public void Test_9514()
-		{
-		}
-		[Fact]
-		public void Test_9515()
-		{
-		}
-		[Fact]
-		public void Test_9516()
-		{
-		}
-		[Fact]
-		public void Test_9517()
-		{
-		}
-		[Fact]
-		public void Test_9518()
-		{
-		}
-		[Fact]
-		public void Test_9519()
-		{
-		}
-		[Fact]
-		public void Test_9520()
-		{
-		}
-		[Fact]
-		public void Test_9521()
-		{
-		}
-		[Fact]
-		public void Test_9522()
-		{
-		}
-		[Fact]
-		public void Test_9523()
-		{
-		}
-		[Fact]
-		public void Test_9524()
-		{
-		}
-		[Fact]
-		public void Test_9525()
-		{
-		}
-		[Fact]
-		public void Test_9526()
-		{
-		}
-		[Fact]
-		public void Test_9527()
-		{
-		}
-		[Fact]
-		public void Test_9528()
-		{
-		}
-		[Fact]
-		public void Test_9529()
-		{
-		}
-		[Fact]
-		public void Test_9530()
-		{
-		}
-		[Fact]
-		public void Test_9531()
-		{
-		}
-		[Fact]
-		public void Test_9532()
-		{
-		}
-		[Fact]
-		public void Test_9533()
-		{
-		}
-		[Fact]
-		public void Test_9534()
-		{
-		}
-		[Fact]
-		public void Test_9535()
-		{
-		}
-		[Fact]
-		public void Test_9536()
-		{
-		}
-		[Fact]
-		public void Test_9537()
-		{
-		}
-		[Fact]
-		public void Test_9538()
-		{
-		}
-		[Fact]
-		public void Test_9539()
-		{
-		}
-		[Fact]
-		public void Test_9540()
-		{
-		}
-		[Fact]
-		public void Test_9541()
-		{
-		}
-		[Fact]
-		public void Test_9542()
-		{
-		}
-		[Fact]
-		public void Test_9543()
-		{
-		}
-		[Fact]
-		public void Test_9544()
-		{
-		}
-		[Fact]
-		public void Test_9545()
-		{
-		}
-		[Fact]
-		public void Test_9546()
-		{
-		}
-		[Fact]
-		public void Test_9547()
-		{
-		}
-		[Fact]
-		public void Test_9548()
-		{
-		}
-		[Fact]
-		public void Test_9549()
-		{
-		}
-		[Fact]
-		public void Test_9550()
-		{
-		}
-		[Fact]
-		public void Test_9551()
-		{
-		}
-		[Fact]
-		public void Test_9552()
-		{
-		}
-		[Fact]
-		public void Test_9553()
-		{
-		}
-		[Fact]
-		public void Test_9554()
-		{
-		}
-		[Fact]
-		public void Test_9555()
-		{
-		}
-		[Fact]
-		public void Test_9556()
-		{
-		}
-		[Fact]
-		public void Test_9557()
-		{
-		}
-		[Fact]
-		public void Test_9558()
-		{
-		}
-		[Fact]
-		public void Test_9559()
-		{
-		}
-		[Fact]
-		public void Test_9560()
-		{
-		}
-		[Fact]
-		public void Test_9561()
-		{
-		}
-		[Fact]
-		public void Test_9562()
-		{
-		}
-		[Fact]
-		public void Test_9563()
-		{
-		}
-		[Fact]
-		public void Test_9564()
-		{
-		}
-		[Fact]
-		public void Test_9565()
-		{
-		}
-		[Fact]
-		public void Test_9566()
-		{
-		}
-		[Fact]
-		public void Test_9567()
-		{
-		}
-		[Fact]
-		public void Test_9568()
-		{
-		}
-		[Fact]
-		public void Test_9569()
-		{
-		}
-		[Fact]
-		public void Test_9570()
-		{
-		}
-		[Fact]
-		public void Test_9571()
-		{
-		}
-		[Fact]
-		public void Test_9572()
-		{
-		}
-		[Fact]
-		public void Test_9573()
-		{
-		}
-		[Fact]
-		public void Test_9574()
-		{
-		}
-		[Fact]
-		public void Test_9575()
-		{
-		}
-		[Fact]
-		public void Test_9576()
-		{
-		}
-		[Fact]
-		public void Test_9577()
-		{
-		}
-		[Fact]
-		public void Test_9578()
-		{
-		}
-		[Fact]
-		public void Test_9579()
-		{
-		}
-		[Fact]
-		public void Test_9580()
-		{
-		}
-		[Fact]
-		public void Test_9581()
-		{
-		}
-		[Fact]
-		public void Test_9582()
-		{
-		}
-		[Fact]
-		public void Test_9583()
-		{
-		}
-		[Fact]
-		public void Test_9584()
-		{
-		}
-		[Fact]
-		public void Test_9585()
-		{
-		}
-		[Fact]
-		public void Test_9586()
-		{
-		}
-		[Fact]
-		public void Test_9587()
-		{
-		}
-		[Fact]
-		public void Test_9588()
-		{
-		}
-		[Fact]
-		public void Test_9589()
-		{
-		}
-		[Fact]
-		public void Test_9590()
-		{
-		}
-		[Fact]
-		public void Test_9591()
-		{
-		}
-		[Fact]
-		public void Test_9592()
-		{
-		}
-		[Fact]
-		public void Test_9593()
-		{
-		}
-		[Fact]
-		public void Test_9594()
-		{
-		}
-		[Fact]
-		public void Test_9595()
-		{
-		}
-		[Fact]
-		public void Test_9596()
-		{
-		}
-		[Fact]
-		public void Test_9597()
-		{
-		}
-		[Fact]
-		public void Test_9598()
-		{
-		}
-		[Fact]
-		public void Test_9599()
-		{
-		}
-		[Fact]
-		public void Test_9600()
-		{
-		}
-		[Fact]
-		public void Test_9601()
-		{
-		}
-		[Fact]
-		public void Test_9602()
-		{
-		}
-		[Fact]
-		public void Test_9603()
-		{
-		}
-		[Fact]
-		public void Test_9604()
-		{
-		}
-		[Fact]
-		public void Test_9605()
-		{
-		}
-		[Fact]
-		public void Test_9606()
-		{
-		}
-		[Fact]
-		public void Test_9607()
-		{
-		}
-		[Fact]
-		public void Test_9608()
-		{
-		}
-		[Fact]
-		public void Test_9609()
-		{
-		}
-		[Fact]
-		public void Test_9610()
-		{
-		}
-		[Fact]
-		public void Test_9611()
-		{
-		}
-		[Fact]
-		public void Test_9612()
-		{
-		}
-		[Fact]
-		public void Test_9613()
-		{
-		}
-		[Fact]
-		public void Test_9614()
-		{
-		}
-		[Fact]
-		public void Test_9615()
-		{
-		}
-		[Fact]
-		public void Test_9616()
-		{
-		}
-		[Fact]
-		public void Test_9617()
-		{
-		}
-		[Fact]
-		public void Test_9618()
-		{
-		}
-		[Fact]
-		public void Test_9619()
-		{
-		}
-		[Fact]
-		public void Test_9620()
-		{
-		}
-		[Fact]
-		public void Test_9621()
-		{
-		}
-		[Fact]
-		public void Test_9622()
-		{
-		}
-		[Fact]
-		public void Test_9623()
-		{
-		}
-		[Fact]
-		public void Test_9624()
-		{
-		}
-		[Fact]
-		public void Test_9625()
-		{
-		}
-		[Fact]
-		public void Test_9626()
-		{
-		}
-		[Fact]
-		public void Test_9627()
-		{
-		}
-		[Fact]
-		public void Test_9628()
-		{
-		}
-		[Fact]
-		public void Test_9629()
-		{
-		}
-		[Fact]
-		public void Test_9630()
-		{
-		}
-		[Fact]
-		public void Test_9631()
-		{
-		}
-		[Fact]
-		public void Test_9632()
-		{
-		}
-		[Fact]
-		public void Test_9633()
-		{
-		}
-		[Fact]
-		public void Test_9634()
-		{
-		}
-		[Fact]
-		public void Test_9635()
-		{
-		}
-		[Fact]
-		public void Test_9636()
-		{
-		}
-		[Fact]
-		public void Test_9637()
-		{
-		}
-		[Fact]
-		public void Test_9638()
-		{
-		}
-		[Fact]
-		public void Test_9639()
-		{
-		}
-		[Fact]
-		public void Test_9640()
-		{
-		}
-		[Fact]
-		public void Test_9641()
-		{
-		}
-		[Fact]
-		public void Test_9642()
-		{
-		}
-		[Fact]
-		public void Test_9643()
-		{
-		}
-		[Fact]
-		public void Test_9644()
-		{
-		}
-		[Fact]
-		public void Test_9645()
-		{
-		}
-		[Fact]
-		public void Test_9646()
-		{
-		}
-		[Fact]
-		public void Test_9647()
-		{
-		}
-		[Fact]
-		public void Test_9648()
-		{
-		}
-		[Fact]
-		public void Test_9649()
-		{
-		}
-		[Fact]
-		public void Test_9650()
-		{
-		}
-		[Fact]
-		public void Test_9651()
-		{
-		}
-		[Fact]
-		public void Test_9652()
-		{
-		}
-		[Fact]
-		public void Test_9653()
-		{
-		}
-		[Fact]
-		public void Test_9654()
-		{
-		}
-		[Fact]
-		public void Test_9655()
-		{
-		}
-		[Fact]
-		public void Test_9656()
-		{
-		}
-		[Fact]
-		public void Test_9657()
-		{
-		}
-		[Fact]
-		public void Test_9658()
-		{
-		}
-		[Fact]
-		public void Test_9659()
-		{
-		}
-		[Fact]
-		public void Test_9660()
-		{
-		}
-		[Fact]
-		public void Test_9661()
-		{
-		}
-		[Fact]
-		public void Test_9662()
-		{
-		}
-		[Fact]
-		public void Test_9663()
-		{
-		}
-		[Fact]
-		public void Test_9664()
-		{
-		}
-		[Fact]
-		public void Test_9665()
-		{
-		}
-		[Fact]
-		public void Test_9666()
-		{
-		}
-		[Fact]
-		public void Test_9667()
-		{
-		}
-		[Fact]
-		public void Test_9668()
-		{
-		}
-		[Fact]
-		public void Test_9669()
-		{
-		}
-		[Fact]
-		public void Test_9670()
-		{
-		}
-		[Fact]
-		public void Test_9671()
-		{
-		}
-		[Fact]
-		public void Test_9672()
-		{
-		}
-		[Fact]
-		public void Test_9673()
-		{
-		}
-		[Fact]
-		public void Test_9674()
-		{
-		}
-		[Fact]
-		public void Test_9675()
-		{
-		}
-		[Fact]
-		public void Test_9676()
-		{
-		}
-		[Fact]
-		public void Test_9677()
-		{
-		}
-		[Fact]
-		public void Test_9678()
-		{
-		}
-		[Fact]
-		public void Test_9679()
-		{
-		}
-		[Fact]
-		public void Test_9680()
-		{
-		}
-		[Fact]
-		public void Test_9681()
-		{
-		}
-		[Fact]
-		public void Test_9682()
-		{
-		}
-		[Fact]
-		public void Test_9683()
-		{
-		}
-		[Fact]
-		public void Test_9684()
-		{
-		}
-		[Fact]
-		public void Test_9685()
-		{
-		}
-		[Fact]
-		public void Test_9686()
-		{
-		}
-		[Fact]
-		public void Test_9687()
-		{
-		}
-		[Fact]
-		public void Test_9688()
-		{
-		}
-		[Fact]
-		public void Test_9689()
-		{
-		}
-		[Fact]
-		public void Test_9690()
-		{
-		}
-		[Fact]
-		public void Test_9691()
-		{
-		}
-		[Fact]
-		public void Test_9692()
-		{
-		}
-		[Fact]
-		public void Test_9693()
-		{
-		}
-		[Fact]
-		public void Test_9694()
-		{
-		}
-		[Fact]
-		public void Test_9695()
-		{
-		}
-		[Fact]
-		public void Test_9696()
-		{
-		}
-		[Fact]
-		public void Test_9697()
-		{
-		}
-		[Fact]
-		public void Test_9698()
-		{
-		}
-		[Fact]
-		public void Test_9699()
-		{
-		}
-		[Fact]
-		public void Test_9700()
-		{
-		}
-		[Fact]
-		public void Test_9701()
-		{
-		}
-		[Fact]
-		public void Test_9702()
-		{
-		}
-		[Fact]
-		public void Test_9703()
-		{
-		}
-		[Fact]
-		public void Test_9704()
-		{
-		}
-		[Fact]
-		public void Test_9705()
-		{
-		}
-		[Fact]
-		public void Test_9706()
-		{
-		}
-		[Fact]
-		public void Test_9707()
-		{
-		}
-		[Fact]
-		public void Test_9708()
-		{
-		}
-		[Fact]
-		public void Test_9709()
-		{
-		}
-		[Fact]
-		public void Test_9710()
-		{
-		}
-		[Fact]
-		public void Test_9711()
-		{
-		}
-		[Fact]
-		public void Test_9712()
-		{
-		}
-		[Fact]
-		public void Test_9713()
-		{
-		}
-		[Fact]
-		public void Test_9714()
-		{
-		}
-		[Fact]
-		public void Test_9715()
-		{
-		}
-		[Fact]
-		public void Test_9716()
-		{
-		}
-		[Fact]
-		public void Test_9717()
-		{
-		}
-		[Fact]
-		public void Test_9718()
-		{
-		}
-		[Fact]
-		public void Test_9719()
-		{
-		}
-		[Fact]
-		public void Test_9720()
-		{
-		}
-		[Fact]
-		public void Test_9721()
-		{
-		}
-		[Fact]
-		public void Test_9722()
-		{
-		}
-		[Fact]
-		public void Test_9723()
-		{
-		}
-		[Fact]
-		public void Test_9724()
-		{
-		}
-		[Fact]
-		public void Test_9725()
-		{
-		}
-		[Fact]
-		public void Test_9726()
-		{
-		}
-		[Fact]
-		public void Test_9727()
-		{
-		}
-		[Fact]
-		public void Test_9728()
-		{
-		}
-		[Fact]
-		public void Test_9729()
-		{
-		}
-		[Fact]
-		public void Test_9730()
-		{
-		}
-		[Fact]
-		public void Test_9731()
-		{
-		}
-		[Fact]
-		public void Test_9732()
-		{
-		}
-		[Fact]
-		public void Test_9733()
-		{
-		}
-		[Fact]
-		public void Test_9734()
-		{
-		}
-		[Fact]
-		public void Test_9735()
-		{
-		}
-		[Fact]
-		public void Test_9736()
-		{
-		}
-		[Fact]
-		public void Test_9737()
-		{
-		}
-		[Fact]
-		public void Test_9738()
-		{
-		}
-		[Fact]
-		public void Test_9739()
-		{
-		}
-		[Fact]
-		public void Test_9740()
-		{
-		}
-		[Fact]
-		public void Test_9741()
-		{
-		}
-		[Fact]
-		public void Test_9742()
-		{
-		}
-		[Fact]
-		public void Test_9743()
-		{
-		}
-		[Fact]
-		public void Test_9744()
-		{
-		}
-		[Fact]
-		public void Test_9745()
-		{
-		}
-		[Fact]
-		public void Test_9746()
-		{
-		}
-		[Fact]
-		public void Test_9747()
-		{
-		}
-		[Fact]
-		public void Test_9748()
-		{
-		}
-		[Fact]
-		public void Test_9749()
-		{
-		}
-		[Fact]
-		public void Test_9750()
-		{
-		}
-		[Fact]
-		public void Test_9751()
-		{
-		}
-		[Fact]
-		public void Test_9752()
-		{
-		}
-		[Fact]
-		public void Test_9753()
-		{
-		}
-		[Fact]
-		public void Test_9754()
-		{
-		}
-		[Fact]
-		public void Test_9755()
-		{
-		}
-		[Fact]
-		public void Test_9756()
-		{
-		}
-		[Fact]
-		public void Test_9757()
-		{
-		}
-		[Fact]
-		public void Test_9758()
-		{
-		}
-		[Fact]
-		public void Test_9759()
-		{
-		}
-		[Fact]
-		public void Test_9760()
-		{
-		}
-		[Fact]
-		public void Test_9761()
-		{
-		}
-		[Fact]
-		public void Test_9762()
-		{
-		}
-		[Fact]
-		public void Test_9763()
-		{
-		}
-		[Fact]
-		public void Test_9764()
-		{
-		}
-		[Fact]
-		public void Test_9765()
-		{
-		}
-		[Fact]
-		public void Test_9766()
-		{
-		}
-		[Fact]
-		public void Test_9767()
-		{
-		}
-		[Fact]
-		public void Test_9768()
-		{
-		}
-		[Fact]
-		public void Test_9769()
-		{
-		}
-		[Fact]
-		public void Test_9770()
-		{
-		}
-		[Fact]
-		public void Test_9771()
-		{
-		}
-		[Fact]
-		public void Test_9772()
-		{
-		}
-		[Fact]
-		public void Test_9773()
-		{
-		}
-		[Fact]
-		public void Test_9774()
-		{
-		}
-		[Fact]
-		public void Test_9775()
-		{
-		}
-		[Fact]
-		public void Test_9776()
-		{
-		}
-		[Fact]
-		public void Test_9777()
-		{
-		}
-		[Fact]
-		public void Test_9778()
-		{
-		}
-		[Fact]
-		public void Test_9779()
-		{
-		}
-		[Fact]
-		public void Test_9780()
-		{
-		}
-		[Fact]
-		public void Test_9781()
-		{
-		}
-		[Fact]
-		public void Test_9782()
-		{
-		}
-		[Fact]
-		public void Test_9783()
-		{
-		}
-		[Fact]
-		public void Test_9784()
-		{
-		}
-		[Fact]
-		public void Test_9785()
-		{
-		}
-		[Fact]
-		public void Test_9786()
-		{
-		}
-		[Fact]
-		public void Test_9787()
-		{
-		}
-		[Fact]
-		public void Test_9788()
-		{
-		}
-		[Fact]
-		public void Test_9789()
-		{
-		}
-		[Fact]
-		public void Test_9790()
-		{
-		}
-		[Fact]
-		public void Test_9791()
-		{
-		}
-		[Fact]
-		public void Test_9792()
-		{
-		}
-		[Fact]
-		public void Test_9793()
-		{
-		}
-		[Fact]
-		public void Test_9794()
-		{
-		}
-		[Fact]
-		public void Test_9795()
-		{
-		}
-		[Fact]
-		public void Test_9796()
-		{
-		}
-		[Fact]
-		public void Test_9797()
-		{
-		}
-		[Fact]
-		public void Test_9798()
-		{
-		}
-		[Fact]
-		public void Test_9799()
-		{
-		}
-		[Fact]
-		public void Test_9800()
-		{
-		}
-		[Fact]
-		public void Test_9801()
-		{
-		}
-		[Fact]
-		public void Test_9802()
-		{
-		}
-		[Fact]
-		public void Test_9803()
-		{
-		}
-		[Fact]
-		public void Test_9804()
-		{
-		}
-		[Fact]
-		public void Test_9805()
-		{
-		}
-		[Fact]
-		public void Test_9806()
-		{
-		}
-		[Fact]
-		public void Test_9807()
-		{
-		}
-		[Fact]
-		public void Test_9808()
-		{
-		}
-		[Fact]
-		public void Test_9809()
-		{
-		}
-		[Fact]
-		public void Test_9810()
-		{
-		}
-		[Fact]
-		public void Test_9811()
-		{
-		}
-		[Fact]
-		public void Test_9812()
-		{
-		}
-		[Fact]
-		public void Test_9813()
-		{
-		}
-		[Fact]
-		public void Test_9814()
-		{
-		}
-		[Fact]
-		public void Test_9815()
-		{
-		}
-		[Fact]
-		public void Test_9816()
-		{
-		}
-		[Fact]
-		public void Test_9817()
-		{
-		}
-		[Fact]
-		public void Test_9818()
-		{
-		}
-		[Fact]
-		public void Test_9819()
-		{
-		}
-		[Fact]
-		public void Test_9820()
-		{
-		}
-		[Fact]
-		public void Test_9821()
-		{
-		}
-		[Fact]
-		public void Test_9822()
-		{
-		}
-		[Fact]
-		public void Test_9823()
-		{
-		}
-		[Fact]
-		public void Test_9824()
-		{
-		}
-		[Fact]
-		public void Test_9825()
-		{
-		}
-		[Fact]
-		public void Test_9826()
-		{
-		}
-		[Fact]
-		public void Test_9827()
-		{
-		}
-		[Fact]
-		public void Test_9828()
-		{
-		}
-		[Fact]
-		public void Test_9829()
-		{
-		}
-		[Fact]
-		public void Test_9830()
-		{
-		}
-		[Fact]
-		public void Test_9831()
-		{
-		}
-		[Fact]
-		public void Test_9832()
-		{
-		}
-		[Fact]
-		public void Test_9833()
-		{
-		}
-		[Fact]
-		public void Test_9834()
-		{
-		}
-		[Fact]
-		public void Test_9835()
-		{
-		}
-		[Fact]
-		public void Test_9836()
-		{
-		}
-		[Fact]
-		public void Test_9837()
-		{
-		}
-		[Fact]
-		public void Test_9838()
-		{
-		}
-		[Fact]
-		public void Test_9839()
-		{
-		}
-		[Fact]
-		public void Test_9840()
-		{
-		}
-		[Fact]
-		public void Test_9841()
-		{
-		}
-		[Fact]
-		public void Test_9842()
-		{
-		}
-		[Fact]
-		public void Test_9843()
-		{
-		}
-		[Fact]
-		public void Test_9844()
-		{
-		}
-		[Fact]
-		public void Test_9845()
-		{
-		}
-		[Fact]
-		public void Test_9846()
-		{
-		}
-		[Fact]
-		public void Test_9847()
-		{
-		}
-		[Fact]
-		public void Test_9848()
-		{
-		}
-		[Fact]
-		public void Test_9849()
-		{
-		}
-		[Fact]
-		public void Test_9850()
-		{
-		}
-		[Fact]
-		public void Test_9851()
-		{
-		}
-		[Fact]
-		public void Test_9852()
-		{
-		}
-		[Fact]
-		public void Test_9853()
-		{
-		}
-		[Fact]
-		public void Test_9854()
-		{
-		}
-		[Fact]
-		public void Test_9855()
-		{
-		}
-		[Fact]
-		public void Test_9856()
-		{
-		}
-		[Fact]
-		public void Test_9857()
-		{
-		}
-		[Fact]
-		public void Test_9858()
-		{
-		}
-		[Fact]
-		public void Test_9859()
-		{
-		}
-		[Fact]
-		public void Test_9860()
-		{
-		}
-		[Fact]
-		public void Test_9861()
-		{
-		}
-		[Fact]
-		public void Test_9862()
-		{
-		}
-		[Fact]
-		public void Test_9863()
-		{
-		}
-		[Fact]
-		public void Test_9864()
-		{
-		}
-		[Fact]
-		public void Test_9865()
-		{
-		}
-		[Fact]
-		public void Test_9866()
-		{
-		}
-		[Fact]
-		public void Test_9867()
-		{
-		}
-		[Fact]
-		public void Test_9868()
-		{
-		}
-		[Fact]
-		public void Test_9869()
-		{
-		}
-		[Fact]
-		public void Test_9870()
-		{
-		}
-		[Fact]
-		public void Test_9871()
-		{
-		}
-		[Fact]
-		public void Test_9872()
-		{
-		}
-		[Fact]
-		public void Test_9873()
-		{
-		}
-		[Fact]
-		public void Test_9874()
-		{
-		}
-		[Fact]
-		public void Test_9875()
-		{
-		}
-		[Fact]
-		public void Test_9876()
-		{
-		}
-		[Fact]
-		public void Test_9877()
-		{
-		}
-		[Fact]
-		public void Test_9878()
-		{
-		}
-		[Fact]
-		public void Test_9879()
-		{
-		}
-		[Fact]
-		public void Test_9880()
-		{
-		}
-		[Fact]
-		public void Test_9881()
-		{
-		}
-		[Fact]
-		public void Test_9882()
-		{
-		}
-		[Fact]
-		public void Test_9883()
-		{
-		}
-		[Fact]
-		public void Test_9884()
-		{
-		}
-		[Fact]
-		public void Test_9885()
-		{
-		}
-		[Fact]
-		public void Test_9886()
-		{
-		}
-		[Fact]
-		public void Test_9887()
-		{
-		}
-		[Fact]
-		public void Test_9888()
-		{
-		}
-		[Fact]
-		public void Test_9889()
-		{
-		}
-		[Fact]
-		public void Test_9890()
-		{
-		}
-		[Fact]
-		public void Test_9891()
-		{
-		}
-		[Fact]
-		public void Test_9892()
-		{
-		}
-		[Fact]
-		public void Test_9893()
-		{
-		}
-		[Fact]
-		public void Test_9894()
-		{
-		}
-		[Fact]
-		public void Test_9895()
-		{
-		}
-		[Fact]
-		public void Test_9896()
-		{
-		}
-		[Fact]
-		public void Test_9897()
-		{
-		}
-		[Fact]
-		public void Test_9898()
-		{
-		}
-		[Fact]
-		public void Test_9899()
-		{
-		}
-		[Fact]
-		public void Test_9900()
-		{
-		}
-		[Fact]
-		public void Test_9901()
-		{
-		}
-		[Fact]
-		public void Test_9902()
-		{
-		}
-		[Fact]
-		public void Test_9903()
-		{
-		}
-		[Fact]
-		public void Test_9904()
-		{
-		}
-		[Fact]
-		public void Test_9905()
-		{
-		}
-		[Fact]
-		public void Test_9906()
-		{
-		}
-		[Fact]
-		public void Test_9907()
-		{
-		}
-		[Fact]
-		public void Test_9908()
-		{
-		}
-		[Fact]
-		public void Test_9909()
-		{
-		}
-		[Fact]
-		public void Test_9910()
-		{
-		}
-		[Fact]
-		public void Test_9911()
-		{
-		}
-		[Fact]
-		public void Test_9912()
-		{
-		}
-		[Fact]
-		public void Test_9913()
-		{
-		}
-		[Fact]
-		public void Test_9914()
-		{
-		}
-		[Fact]
-		public void Test_9915()
-		{
-		}
-		[Fact]
-		public void Test_9916()
-		{
-		}
-		[Fact]
-		public void Test_9917()
-		{
-		}
-		[Fact]
-		public void Test_9918()
-		{
-		}
-		[Fact]
-		public void Test_9919()
-		{
-		}
-		[Fact]
-		public void Test_9920()
-		{
-		}
-		[Fact]
-		public void Test_9921()
-		{
-		}
-		[Fact]
-		public void Test_9922()
-		{
-		}
-		[Fact]
-		public void Test_9923()
-		{
-		}
-		[Fact]
-		public void Test_9924()
-		{
-		}
-		[Fact]
-		public void Test_9925()
-		{
-		}
-		[Fact]
-		public void Test_9926()
-		{
-		}
-		[Fact]
-		public void Test_9927()
-		{
-		}
-		[Fact]
-		public void Test_9928()
-		{
-		}
-		[Fact]
-		public void Test_9929()
-		{
-		}
-		[Fact]
-		public void Test_9930()
-		{
-		}
-		[Fact]
-		public void Test_9931()
-		{
-		}
-		[Fact]
-		public void Test_9932()
-		{
-		}
-		[Fact]
-		public void Test_9933()
-		{
-		}
-		[Fact]
-		public void Test_9934()
-		{
-		}
-		[Fact]
-		public void Test_9935()
-		{
-		}
-		[Fact]
-		public void Test_9936()
-		{
-		}
-		[Fact]
-		public void Test_9937()
-		{
-		}
-		[Fact]
-		public void Test_9938()
-		{
-		}
-		[Fact]
-		public void Test_9939()
-		{
-		}
-		[Fact]
-		public void Test_9940()
-		{
-		}
-		[Fact]
-		public void Test_9941()
-		{
-		}
-		[Fact]
-		public void Test_9942()
-		{
-		}
-		[Fact]
-		public void Test_9943()
-		{
-		}
-		[Fact]
-		public void Test_9944()
-		{
-		}
-		[Fact]
-		public void Test_9945()
-		{
-		}
-		[Fact]
-		public void Test_9946()
-		{
-		}
-		[Fact]
-		public void Test_9947()
-		{
-		}
-		[Fact]
-		public void Test_9948()
-		{
-		}
-		[Fact]
-		public void Test_9949()
-		{
-		}
-		[Fact]
-		public void Test_9950()
-		{
-		}
-		[Fact]
-		public void Test_9951()
-		{
-		}
-		[Fact]
-		public void Test_9952()
-		{
-		}
-		[Fact]
-		public void Test_9953()
-		{
-		}
-		[Fact]
-		public void Test_9954()
-		{
-		}
-		[Fact]
-		public void Test_9955()
-		{
-		}
-		[Fact]
-		public void Test_9956()
-		{
-		}
-		[Fact]
-		public void Test_9957()
-		{
-		}
-		[Fact]
-		public void Test_9958()
-		{
-		}
-		[Fact]
-		public void Test_9959()
-		{
-		}
-		[Fact]
-		public void Test_9960()
-		{
-		}
-		[Fact]
-		public void Test_9961()
-		{
-		}
-		[Fact]
-		public void Test_9962()
-		{
-		}
-		[Fact]
-		public void Test_9963()
-		{
-		}
-		[Fact]
-		public void Test_9964()
-		{
-		}
-		[Fact]
-		public void Test_9965()
-		{
-		}
-		[Fact]
-		public void Test_9966()
-		{
-		}
-		[Fact]
-		public void Test_9967()
-		{
-		}
-		[Fact]
-		public void Test_9968()
-		{
-		}
-		[Fact]
-		public void Test_9969()
-		{
-		}
-		[Fact]
-		public void Test_9970()
-		{
-		}
-		[Fact]
-		public void Test_9971()
-		{
-		}
-		[Fact]
-		public void Test_9972()
-		{
-		}
-		[Fact]
-		public void Test_9973()
-		{
-		}
-		[Fact]
-		public void Test_9974()
-		{
-		}
-		[Fact]
-		public void Test_9975()
-		{
-		}
-		[Fact]
-		public void Test_9976()
-		{
-		}
-		[Fact]
-		public void Test_9977()
-		{
-		}
-		[Fact]
-		public void Test_9978()
-		{
-		}
-		[Fact]
-		public void Test_9979()
-		{
-		}
-		[Fact]
-		public void Test_9980()
-		{
-		}
-		[Fact]
-		public void Test_9981()
-		{
-		}
-		[Fact]
-		public void Test_9982()
-		{
-		}
-		[Fact]
-		public void Test_9983()
-		{
-		}
-		[Fact]
-		public void Test_9984()
-		{
-		}
-		[Fact]
-		public void Test_9985()
-		{
-		}
-		[Fact]
-		public void Test_9986()
-		{
-		}
-		[Fact]
-		public void Test_9987()
-		{
-		}
-		[Fact]
-		public void Test_9988()
-		{
-		}
-		[Fact]
-		public void Test_9989()
-		{
-		}
-		[Fact]
-		public void Test_9990()
-		{
-		}
-		[Fact]
-		public void Test_9991()
-		{
-		}
-		[Fact]
-		public void Test_9992()
-		{
-		}
-		[Fact]
-		public void Test_9993()
-		{
-		}
-		[Fact]
-		public void Test_9994()
-		{
-		}
-		[Fact]
-		public void Test_9995()
-		{
-		}
-		[Fact]
-		public void Test_9996()
-		{
-		}
-		[Fact]
-		public void Test_9997()
-		{
-		}
-		[Fact]
-		public void Test_9998()
-		{
-		}
-		[Fact]
-		public void Test_9999()
-		{
-		}
-		[Fact]
-		public void Test_10000()
-		{
-		}
-		#endregion
-
-		#region FailingTests
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.tt b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.tt
deleted file mode 100644
index f70f52d215..0000000000
--- a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XunitTests.tt
+++ /dev/null
@@ -1,49 +0,0 @@
-using Xunit;
-
-namespace XUnitAdapterPerfTests
-{
-	public class XuniTests
-    {
-<#
-	int passedTests = 10000;
-	int failedTests = 0;
-	String padding = "00";
-	int count = 1;
-	String testmethodprefix = "Test_";
-#>
-
-		#region PassingTests
-<#
-	for(int i=0;i<passedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[Fact]
-		public void <#=methodName#>()
-		{
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-
-		#region FailingTests
-<#
-	for(int i=0;i<failedTests;i++)
-	{
-	String methodName= testmethodprefix + count.ToString(padding);
-#>
-		[Fact]
-		public void <#=methodName#>()
-		{
-			Assert.Fail();
-		}
-<#		
-		count++;
-	}
-#>
-		#endregion
-   	
-    }
-}
diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj
index 94c7a09f41..1601a6e3d3 100644
Binary files a/test/TestAssets/PerfTestProject/PerfTestProject.csproj and b/test/TestAssets/PerfTestProject/PerfTestProject.csproj differ
diff --git a/test/TestAssets/PerfTestProject/Program.cs b/test/TestAssets/PerfTestProject/Program.cs
deleted file mode 100644
index 3ee39b8af8..0000000000
--- a/test/TestAssets/PerfTestProject/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace PerfTestProject
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
-
diff --git a/test/TestAssets/PerfTestProject/UnitTest1.cs b/test/TestAssets/PerfTestProject/UnitTest1.cs
index e124b31913..13e350f0c2 100644
--- a/test/TestAssets/PerfTestProject/UnitTest1.cs
+++ b/test/TestAssets/PerfTestProject/UnitTest1.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 namespace PerfTestProject
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
     /// <summary>
     /// The unit test 1.
     /// </summary>
diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj
index 1ad743626e..c44b84fd01 100644
--- a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj
+++ b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <PlatformTarget>x64</PlatformTarget>
     <RunSettingsFilePath>fail.runsettings</RunSettingsFilePath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/UnitTest1.cs b/test/TestAssets/ProjectFileRunSettingsTestProject/UnitTest1.cs
index 0ec4b790f2..ee1491d65d 100644
--- a/test/TestAssets/ProjectFileRunSettingsTestProject/UnitTest1.cs
+++ b/test/TestAssets/ProjectFileRunSettingsTestProject/UnitTest1.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace ProjectFileRunSettingsTestProject
diff --git a/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
index e9c0056a3f..248b264e3e 100644
--- a/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
+++ b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
@@ -17,7 +17,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,24 +53,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/test/TestAssets/QualityToolsAssets/BingWebTest/Properties/AssemblyInfo.cs b/test/TestAssets/QualityToolsAssets/BingWebTest/Properties/AssemblyInfo.cs
index e4c12d1e5b..c8ad6561a2 100644
--- a/test/TestAssets/QualityToolsAssets/BingWebTest/Properties/AssemblyInfo.cs
+++ b/test/TestAssets/QualityToolsAssets/BingWebTest/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BingWebTest")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec b/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec
index 1090df2b39..1e4a82ce93 100644
--- a/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec
+++ b/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec
@@ -7,7 +7,7 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="file">LICENSE_NET.txt</license>
+    <license type="file">LICENSE_MIT.txt</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
     <description>MSDia typelib for reading debug symbols from managed code.</description>
     <copyright>Copyright © Microsoft Corporation</copyright>
@@ -17,7 +17,7 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="package\licenses\LICENSE_NET.txt" target="" />
+    <file src="package\licenses\LICENSE_MIT.txt" target="" />
     <file src="BingWebTest\bin\*.*" target="contentFiles\any\any\WebTestAssets" />
   </files>
 </package>
diff --git a/test/TestAssets/RecursiveResourceLookupCrash/RecursiveResourceLookupCrash.csproj b/test/TestAssets/RecursiveResourceLookupCrash/RecursiveResourceLookupCrash.csproj
new file mode 100644
index 0000000000..281662c2d1
--- /dev/null
+++ b/test/TestAssets/RecursiveResourceLookupCrash/RecursiveResourceLookupCrash.csproj
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/RecursiveResourceLookupCrash/UnitTest1.cs b/test/TestAssets/RecursiveResourceLookupCrash/UnitTest1.cs
new file mode 100644
index 0000000000..ec8fef250e
--- /dev/null
+++ b/test/TestAssets/RecursiveResourceLookupCrash/UnitTest1.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.IO.IsolatedStorage;
+using System.Threading;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace RecursiveResourceLookupCrash
+{
+    [TestClass]
+    public class RecursiveResourceLookupCrashTests
+    {
+        [TestInitialize]
+        public void TestInitialize()
+        {
+            // You need to set non-English culture explicitly to reproduce recursive resource
+            // lookup bug in English environment.
+            Thread.CurrentThread.CurrentUICulture = new CultureInfo("ja-JP");
+        }
+
+        [TestMethod]
+        public void CrashesOnResourcesLookupWhenNotHandledByAssemblyResolver()
+        {
+            try
+            {
+                // This will internally trigger file not found exception, and try to find ja-JP resources
+                // for the string, which will trigger Resolve in AssemblyResolver, which will
+                // use File.Exists call and that will trigger another round of looking up ja-JP
+                // resources, until this is detected by .NET Framework, and Environment.FailFast
+                // is called to crash the testhost.
+                var stream = new IsolatedStorageFileStream("non-existent-filename", FileMode.Open);
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}
diff --git a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj b/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj
deleted file mode 100644
index da4d6ceb4e..0000000000
--- a/test/TestAssets/SampleProjectWithOldTestHost/SampleProjectWithOldTestHost.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-	  <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161024-02" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/TestAssets/SampleProjectWithOldTestHost/UnitTest1.cs b/test/TestAssets/SampleProjectWithOldTestHost/UnitTest1.cs
deleted file mode 100644
index 4df22575dc..0000000000
--- a/test/TestAssets/SampleProjectWithOldTestHost/UnitTest1.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace SampleProjectWithOldTestHost
-{
-    [TestClass]
-    public class UnitTest1
-    {
-        [TestMethod]
-        public void TestMethod1()
-        {
-        }
-    }
-}
diff --git a/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj b/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj
index e6980294b6..0ec96ca324 100644
Binary files a/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj and b/test/TestAssets/SelfContainedAppTestProject/SelfContainedAppTestProject.csproj differ
diff --git a/test/TestAssets/SelfContainedAppTestProject/UnitTest1.cs b/test/TestAssets/SelfContainedAppTestProject/UnitTest1.cs
index 6b5e36fa0b..418fed62d3 100644
--- a/test/TestAssets/SelfContainedAppTestProject/UnitTest1.cs
+++ b/test/TestAssets/SelfContainedAppTestProject/UnitTest1.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace SelfContainedAppTestProject
diff --git a/test/TestAssets/SerializeTestRunTestProject/SerializeTestRunTestProject.csproj b/test/TestAssets/SerializeTestRunTestProject/SerializeTestRunTestProject.csproj
new file mode 100644
index 0000000000..02776870c2
--- /dev/null
+++ b/test/TestAssets/SerializeTestRunTestProject/SerializeTestRunTestProject.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/SerializeTestRunTestProject/UnitTest1.cs b/test/TestAssets/SerializeTestRunTestProject/UnitTest1.cs
new file mode 100644
index 0000000000..475ade64ee
--- /dev/null
+++ b/test/TestAssets/SerializeTestRunTestProject/UnitTest1.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Threading;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+// Parallelize the execution
+[assembly: Parallelize(Workers = 0, Scope = ExecutionScope.MethodLevel)]
+
+namespace SerializeTestRunTestProject
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        private static readonly object ObjectToAcquire = new object();
+
+        private static void AcquireAndReleaseLock()
+        {
+            Assert.IsTrue(Monitor.TryEnter(ObjectToAcquire));
+            Thread.Sleep(100);
+            Monitor.Exit(ObjectToAcquire);
+        }
+
+        [TestMethod]
+        public void TestMethod1() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod2() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod3() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod4() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod5() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod6() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod7() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod8() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod9() => AcquireAndReleaseLock();
+
+        [TestMethod]
+        public void TestMethod10() => AcquireAndReleaseLock();
+    }
+}
diff --git a/test/TestAssets/SimpleClassLibrary/Class1.cs b/test/TestAssets/SimpleClassLibrary/Class1.cs
index b84cb4118f..a967b82aaf 100644
--- a/test/TestAssets/SimpleClassLibrary/Class1.cs
+++ b/test/TestAssets/SimpleClassLibrary/Class1.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Threading.Tasks;
+
 namespace SimpleClassLibrary
 {
-    using System.Diagnostics;
-    using System.Threading.Tasks;
-
     public class Class1
     {
         public void PassingTest()
@@ -22,7 +21,7 @@ public void OverLoadedMethod()
         {
         }
 
-        public void OverLoadedMethod(string name)
+        public void OverLoadedMethod(string _)
         {
         }
     }
diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj
index ea770a0731..ac382027ea 100644
--- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj
+++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj
@@ -1,15 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
   <PropertyGroup Condition="$(NetCoreAppTargetFramework) == 'true' and $(Configuration) == 'Debug'">
@@ -18,10 +14,11 @@
   <PropertyGroup Condition="$(NetCoreAppTargetFramework) == 'true' and $(Configuration) == 'Release'">
     <DebugType>portable</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' and $(Configuration) == 'Debug'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' and $(Configuration) == 'Debug'">
     <DebugType>full</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' and $(Configuration) == 'Release'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' and $(Configuration) == 'Release'">
     <DebugType>portable</DebugType>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/test/TestAssets/SimpleDataCollector/Class1.cs b/test/TestAssets/SimpleDataCollector/Class1.cs
index 50998b8881..580e986450 100644
--- a/test/TestAssets/SimpleDataCollector/Class1.cs
+++ b/test/TestAssets/SimpleDataCollector/Class1.cs
@@ -1,32 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
+
 namespace SimpleDataCollector
 {
-    using System;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
-
     /// <summary>
     /// The ti listener tests.
     /// </summary>
     public class SimpleDataCollector : InProcDataCollection
     {
-        private readonly string fileName;
+        private readonly string _fileName;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SimpleDataCollector"/> class.
         /// </summary>
         public SimpleDataCollector()
         {
-            this.fileName = Path.Combine(Path.GetTempPath(), "inproctest.txt");
+            _fileName = Path.Combine(Path.GetTempPath(), "inproctest.txt");
         }
 
         public void Initialize(IDataCollectionSink dataCollectionSink)
         {
-           // Do Nothing
+            // Do Nothing
         }
 
         /// <summary>
@@ -38,10 +39,10 @@ public void Initialize(IDataCollectionSink dataCollectionSink)
         public void TestSessionStart(TestSessionStartArgs testSessionStartArgs)
         {
             Console.WriteLine(testSessionStartArgs.Configuration);
-            File.WriteAllText(this.fileName, "TestSessionStart : " + testSessionStartArgs.Configuration + "\r\n");
+            File.WriteAllText(_fileName, "TestSessionStart : " + testSessionStartArgs.Configuration + "\r\n");
 #if NETFRAMEWORK
-            var appDomainFilePath = Path.Combine(Path.GetTempPath(), "appdomain_datacollector.txt");
-            File.WriteAllText(appDomainFilePath, "AppDomain FriendlyName: "+ AppDomain.CurrentDomain.FriendlyName);
+            var appDomainFilePath = Environment.GetEnvironmentVariable("TEST_ASSET_APPDOMAIN_COLLECTOR_PATH") ?? Path.Combine(Path.GetTempPath(), "appdomain_datacollector.txt");
+            File.WriteAllText(appDomainFilePath, "AppDomain FriendlyName: " + AppDomain.CurrentDomain.FriendlyName);
 #endif
         }
 
@@ -57,7 +58,7 @@ public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
                 "TestCase Name : {0}, TestCase ID:{1}",
                 testCaseStartArgs.TestCase.DisplayName,
                 testCaseStartArgs.TestCase.Id);
-            File.AppendAllText(this.fileName, "TestCaseStart : " + testCaseStartArgs.TestCase.DisplayName + "\r\n");
+            File.AppendAllText(_fileName, "TestCaseStart : " + testCaseStartArgs.TestCase.DisplayName + "\r\n");
         }
 
         /// <summary>
@@ -68,8 +69,8 @@ public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
         /// </param>
         public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
         {
-            Console.WriteLine("TestCase Name:{0}, TestCase ID:{1}, OutCome:{2}", testCaseEndArgs.DataCollectionContext.TestCase.DisplayName, testCaseEndArgs.DataCollectionContext.TestCase.Id, testCaseEndArgs.TestOutcome);            
-            File.AppendAllText(this.fileName, "TestCaseEnd : " + testCaseEndArgs.DataCollectionContext.TestCase.DisplayName + "\r\n");
+            Console.WriteLine("TestCase Name:{0}, TestCase ID:{1}, OutCome:{2}", testCaseEndArgs.DataCollectionContext.TestCase.DisplayName, testCaseEndArgs.DataCollectionContext.TestCase.Id, testCaseEndArgs.TestOutcome);
+            File.AppendAllText(_fileName, "TestCaseEnd : " + testCaseEndArgs.DataCollectionContext.TestCase.DisplayName + "\r\n");
         }
 
         /// <summary>
@@ -81,7 +82,7 @@ public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
         public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
         {
             Console.WriteLine("TestSession Ended");
-            File.AppendAllText(this.fileName, "TestSessionEnd");
+            File.AppendAllText(_fileName, "TestSessionEnd");
         }
     }
 }
diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj
index b14207c1d7..7f7262516d 100644
Binary files a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj and b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj differ
diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj
index 6aa9b4cc10..bfd19d5549 100644
Binary files a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj and b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj differ
diff --git a/test/TestAssets/SimpleTestProject/UnitTest1.cs b/test/TestAssets/SimpleTestProject/UnitTest1.cs
index fba55f698b..1496002aec 100644
--- a/test/TestAssets/SimpleTestProject/UnitTest1.cs
+++ b/test/TestAssets/SimpleTestProject/UnitTest1.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+using System;
+using System.IO;
+#endif
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 namespace SampleUnitTestProject
 {
-    using System;
-    using System.IO;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
     /// <summary>
     /// The unit test 1.
     /// </summary>
@@ -33,7 +35,7 @@ public void FailingTest()
         {
 #if NETFRAMEWORK
             // current App domain should be write to file to test DisableAppDomain acceptance test.
-            var appDomainFilePath = Path.Combine(Path.GetTempPath(), "appdomain_test.txt");
+            var appDomainFilePath = Environment.GetEnvironmentVariable("TEST_ASSET_APPDOMAIN_TEST_PATH") ?? Path.Combine(Path.GetTempPath(), "appdomain_test.txt");
             File.WriteAllText(appDomainFilePath, "AppDomain FriendlyName: " + AppDomain.CurrentDomain.FriendlyName);
 #endif
             Assert.AreEqual(2, 3);
diff --git a/test/TestAssets/SimpleTestProject2/Program.cs b/test/TestAssets/SimpleTestProject2/Program.cs
deleted file mode 100644
index 80615b0898..0000000000
--- a/test/TestAssets/SimpleTestProject2/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace SimpleTestProject2
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-
-        }
-    }
-}
diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj
index e3cd2aa7b3..5747451e98 100644
Binary files a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj and b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj differ
diff --git a/test/TestAssets/SimpleTestProject2/UnitTest1.cs b/test/TestAssets/SimpleTestProject2/UnitTest1.cs
index b97b671bb9..4b790665a2 100644
--- a/test/TestAssets/SimpleTestProject2/UnitTest1.cs
+++ b/test/TestAssets/SimpleTestProject2/UnitTest1.cs
@@ -1,40 +1,40 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace SampleUnitTestProject2
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace SampleUnitTestProject2;
 
+/// <summary>
+/// The unit test 1.
+/// </summary>
+[TestClass]
+public class UnitTest1
+{
     /// <summary>
-    /// The unit test 1.
+    /// The passing test.
     /// </summary>
-    [TestClass]
-    public class UnitTest1
+    [TestMethod]
+    public void PassingTest2()
     {
-        /// <summary>
-        /// The passing test.
-        /// </summary>
-        [TestMethod]
-        public void PassingTest2()
-        {
-            Assert.AreEqual(2, 2);
-        }
+        Assert.AreEqual(2, 2);
+    }
 
-        /// <summary>
-        /// The failing test.
-        /// </summary>
-        [TestMethod]
-        public void FailingTest2()
-        {
-            Assert.AreEqual(2, 3);
-        }
+    /// <summary>
+    /// The failing test.
+    /// </summary>
+    [TestMethod]
+    public void FailingTest2()
+    {
+        Assert.AreEqual(2, 3);
+    }
 
-        /// <summary>
-        /// The skipping test.
-        /// </summary>
-        [Ignore]
-        [TestMethod]
-        public void SkippingTest2()
-        {
-        }
+    /// <summary>
+    /// The skipping test.
+    /// </summary>
+    [Ignore]
+    [TestMethod]
+    public void SkippingTest2()
+    {
     }
 }
diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj
index 68d44a12b0..9d5a70e0fa 100644
--- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj
+++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj
@@ -1,27 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
     <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="System.Memory" Version="4.5.3"/>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)"/>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/test/TestAssets/SimpleTestProject3/TestSessionTimeoutTest.cs b/test/TestAssets/SimpleTestProject3/TestSessionTimeoutTest.cs
index 9de44ab9a5..4860755700 100644
--- a/test/TestAssets/SimpleTestProject3/TestSessionTimeoutTest.cs
+++ b/test/TestAssets/SimpleTestProject3/TestSessionTimeoutTest.cs
@@ -1,9 +1,10 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace SampleUnitTestProject3
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
     [TestClass]
     public class TestSessionTimeoutTest
     {
diff --git a/test/TestAssets/SimpleTestProject3/UnitTest1.cs b/test/TestAssets/SimpleTestProject3/UnitTest1.cs
index 3ce4c563cc..78c39fe3d1 100644
--- a/test/TestAssets/SimpleTestProject3/UnitTest1.cs
+++ b/test/TestAssets/SimpleTestProject3/UnitTest1.cs
@@ -1,16 +1,19 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace SampleUnitTestProject3
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.IO;
-    using System.Reflection;
-    using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading;
 #if NETFRAMEWORK
-    using System.Windows.Forms;
+using System.Windows.Forms;
 #endif
 
+namespace SampleUnitTestProject3
+{
+
     [TestClass]
     public class UnitTest1
     {
diff --git a/test/TestAssets/SimpleTestProjectARM/Program.cs b/test/TestAssets/SimpleTestProjectARM/Program.cs
deleted file mode 100644
index 72a9860cf2..0000000000
--- a/test/TestAssets/SimpleTestProjectARM/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace SimpleTestProjectARM
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj
deleted file mode 100644
index 659d4e1984..0000000000
Binary files a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj and /dev/null differ
diff --git a/test/TestAssets/SimpleTestProjectARM/UnitTest1.cs b/test/TestAssets/SimpleTestProjectARM/UnitTest1.cs
deleted file mode 100644
index cddcbc7f11..0000000000
--- a/test/TestAssets/SimpleTestProjectARM/UnitTest1.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace SimpleTestProjectARM
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    /// <summary>
-    /// The unit test 1.
-    /// </summary>
-    [TestClass]
-    public class UnitTest1
-    {
-    }
-}
diff --git a/test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj b/test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj
new file mode 100644
index 0000000000..3f1c4b034e
--- /dev/null
+++ b/test/TestAssets/SimpleTestProjectARM64/SimpleTestProjectARM64.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+    <PlatformTarget>ARM64</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+    <OutputType Condition="$(NetCoreAppTargetFrameWork) == 'true' ">Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/SimpleTestProjectARM64/UnitTest1.cs b/test/TestAssets/SimpleTestProjectARM64/UnitTest1.cs
new file mode 100644
index 0000000000..8603230ce7
--- /dev/null
+++ b/test/TestAssets/SimpleTestProjectARM64/UnitTest1.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace SimpleTestProjectARM
+{
+    /// <summary>
+    /// The unit test 1.
+    /// </summary>
+    [TestClass]
+    public class UnitTest1
+    {
+    }
+}
diff --git a/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj
new file mode 100644
index 0000000000..34187149f4
--- /dev/null
+++ b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/SimpleTestProjectMessedUpTargetFramework.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCoreAppMinimum)</TargetFrameworks>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/UnitTest1.cs b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/UnitTest1.cs
new file mode 100644
index 0000000000..8c3ad218b1
--- /dev/null
+++ b/test/TestAssets/SimpleTestProjectMessedUpTargetFramework/UnitTest1.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace SimpleTestProjectMessedUpTargetFramework
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}
diff --git a/test/TestAssets/SimpleTestProjectx86/Program.cs b/test/TestAssets/SimpleTestProjectx86/Program.cs
deleted file mode 100644
index 8988f8c442..0000000000
--- a/test/TestAssets/SimpleTestProjectx86/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace SimpleTestProjectx86
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-
-        }
-    }
-}
diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj
index 6606fa6add..398c3d908d 100644
Binary files a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj and b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj differ
diff --git a/test/TestAssets/SimpleTestProjectx86/UnitTest1.cs b/test/TestAssets/SimpleTestProjectx86/UnitTest1.cs
index db8897be24..4e405dace5 100644
--- a/test/TestAssets/SimpleTestProjectx86/UnitTest1.cs
+++ b/test/TestAssets/SimpleTestProjectx86/UnitTest1.cs
@@ -1,9 +1,10 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace SimpleTestProjectx86
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
     /// <summary>
     /// The unit test 1.
     /// </summary>
diff --git a/test/TestAssets/TerminalLoggerTestProject/TerminalLoggerTestProject.csproj b/test/TestAssets/TerminalLoggerTestProject/TerminalLoggerTestProject.csproj
new file mode 100644
index 0000000000..bfd19d5549
--- /dev/null
+++ b/test/TestAssets/TerminalLoggerTestProject/TerminalLoggerTestProject.csproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>SimpleTestProject</AssemblyName>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>$(MSTestTestFrameworkVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>$(MSTestTestAdapterVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>$(PackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/TerminalLoggerTestProject/UnitTest1.cs b/test/TestAssets/TerminalLoggerTestProject/UnitTest1.cs
new file mode 100644
index 0000000000..1d4b51287a
--- /dev/null
+++ b/test/TestAssets/TerminalLoggerTestProject/UnitTest1.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if NETFRAMEWORK
+using System;
+using System.IO;
+#endif
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TerminalLoggerUnitTests
+{
+    /// <summary>
+    /// The unit test 1.
+    /// </summary>
+    [TestClass]
+    public class UnitTest1
+    {
+        /// <summary>
+        /// The passing test.
+        /// </summary>
+        [TestMethod]
+        public void PassingTest()
+        {
+            Assert.AreEqual(2, 2);
+        }
+
+        /// <summary>
+        /// The failing test.
+        /// </summary>
+        [TestMethod]
+        public void FailingTest()
+        {
+            // test characters taken from https://pages.ucsd.edu/~dkjordan/chin/unitestuni.html
+            Assert.AreEqual("ğğğ𦮙我們剛才從𓋴𓅓𓏏𓇏𓇌𓀀", "not the same");
+        }
+
+        /// <summary>
+        /// The skipping test.
+        /// </summary>
+        [Ignore]
+        [TestMethod]
+        public void SkippingTest()
+        {
+        }
+    }
+}
diff --git a/test/TestAssets/TestAssets.sln b/test/TestAssets/TestAssets.sln
index 8aa29c6ac7..286260a313 100644
--- a/test/TestAssets/TestAssets.sln
+++ b/test/TestAssets/TestAssets.sln
@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32024.52
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitAdapterPerfTestProject", "PerfAssets\NUnitAdapterPerfTestProject\NUnitAdapterPerfTestProject.csproj", "{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit10kPassing", "performance\NUnit10kPassing\NUnit10kPassing.csproj", "{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitAdapterPerfTestProject", "PerfAssets\XUnitAdapterPerfTestProject\XUnitAdapterPerfTestProject.csproj", "{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit10kPassing", "performance\XUnit10kPassing\XUnit10kPassing.csproj", "{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestAdapterPerfTestProject", "PerfAssets\MSTestAdapterPerfTestProject\MSTestAdapterPerfTestProject.csproj", "{52CAF89F-2309-4597-B531-79D6A96902BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest10kPassing", "performance\MSTest10kPassing\MSTest10kPassing.csproj", "{52CAF89F-2309-4597-B531-79D6A96902BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUTestProject", "NUTestProject\NUTestProject.csproj", "{1ADE5795-2365-4790-8ACB-2EF0C2613D61}"
 EndProject
@@ -23,17 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject2", "Simpl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcDataCollector", "OutOfProcDataCollector\OutOfProcDataCollector.csproj", "{1266AB9D-94D9-496D-8AE5-73612D097A09}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfTestProject", "PerfTestProject\PerfTestProject.csproj", "{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleRunners", "ConsoleRunners\ConsoleRunners.csproj", "{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MstestV1UnitTestProject", "MstestV1UnitTestProject\MstestV1UnitTestProject.csproj", "{E28DD78A-E4C1-48C1-B027-88576F669C73}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectx86", "SimpleTestProjectx86\SimpleTestProjectx86.csproj", "{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM", "SimpleTestProjectARM\SimpleTestProjectARM.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUITTestProject", "CUITTestProject\CUITTestProject.csproj", "{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM64", "SimpleTestProjectARM64\SimpleTestProjectARM64.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisableAppdomainTest1", "DisableAppdomainTest1\DisableAppdomainTest1.csproj", "{36C7990F-0A36-47CE-8E10-7887D24E2F9A}"
 EndProject
@@ -64,8 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscoveryTestProject", "Dis
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventLogUnitTestProject", "EventLogUnitTestProject\EventLogUnitTestProject.csproj", "{40DA6965-C3C3-46BC-BA56-6D457C097F3C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleProjectWithOldTestHost", "SampleProjectWithOldTestHost\SampleProjectWithOldTestHost.csproj", "{D7869421-F18B-4BEF-AECD-71485136808C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleClassLibrary", "SimpleClassLibrary\SimpleClassLibrary.csproj", "{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfContainedAppTestProject", "SelfContainedAppTestProject\SelfContainedAppTestProject.csproj", "{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}"
@@ -90,512 +84,327 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "problematic-child", "proble
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParametrizedTestProject", "ParametrizedTestProject\ParametrizedTestProject.csproj", "{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AttachmentProcessorDataCollector", "AttachmentProcessorDataCollector\AttachmentProcessorDataCollector.csproj", "{16F51720-29D0-472A-93FA-2604D61991B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchitectureSwitch", "ArchitectureSwitch\ArchitectureSwitch.csproj", "{452352E1-71CA-436E-8165-F284EE36C924}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectMessedUpTargetFramework", "SimpleTestProjectMessedUpTargetFramework\SimpleTestProjectMessedUpTargetFramework.csproj", "{08C44607-EB80-4EE5-927D-08C34AA277AF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "performance", "performance", "{0C9CA869-32FD-4A9E-8885-E2E19786C746}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest1Passing", "performance\MSTest1Passing\MSTest1Passing.csproj", "{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest100Passing", "performance\MSTest100Passing\MSTest100Passing.csproj", "{027CADBF-7071-482A-8D86-CA03AC31FC4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest1000Passing", "performance\MSTest1000Passing\MSTest1000Passing.csproj", "{B0ECF78C-71A7-4281-B81E-7BD09649E5EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit1Passing", "performance\NUnit1Passing\NUnit1Passing.csproj", "{EF157AEA-43B8-4923-9E86-BB134F17F2F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit100Passing", "performance\NUnit100Passing\NUnit100Passing.csproj", "{76EFDDEC-4AD2-4B12-8EC9-440190B89418}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit1000Passing", "performance\NUnit1000Passing\NUnit1000Passing.csproj", "{75A46D17-91D6-430C-A8A8-C2D2E8C9943C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit1Passing", "performance\XUnit1Passing\XUnit1Passing.csproj", "{B2F74D8D-9D16-493C-A716-B58426074075}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit100Passing", "performance\XUnit100Passing\XUnit100Passing.csproj", "{06724523-611A-4054-A1AC-29DA2E87DD87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit1000Passing", "performance\XUnit1000Passing\XUnit1000Passing.csproj", "{15DC879D-1A60-4745-8DF4-EBC36EE12339}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestProject2", "MSTestProject2\MSTestProject2.csproj", "{10AA955C-B412-41A8-899F-8609AAE19F61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestProject1", "MSTestProject1\MSTestProject1.csproj", "{E166D337-4033-4209-863F-8F77675EAEE8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "basic", "basic", "{2633D125-64A7-456C-AD37-F8A6B56C2403}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools", "Tools\Tools.csproj", "{85F9F2A8-D2A5-4EA1-8BE0-06CCE141EC7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perfy.TestAdapter", "performance\Perfy.TestAdapter\Perfy.TestAdapter.csproj", "{71BF7EC9-7BEE-4038-8F4E-87032FA4E995}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RecursiveResourceLookupCrash", "RecursiveResourceLookupCrash\RecursiveResourceLookupCrash.csproj", "{9B5BDF7D-5816-47C6-8CFD-E45B152CA35F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializeTestRunTestProject", "SerializeTestRunTestProject\SerializeTestRunTestProject.csproj", "{64C4C4CD-2319-4033-9F33-53AAA8FECEFA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiHostTestExecutionProject", "MultiHostTestExecutionProject\MultiHostTestExecutionProject.csproj", "{CE6673DA-B50F-46DF-99A3-8A7C54DE9B61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NonDll.TestAdapter", "NonDll.TestAdapter\NonDll.TestAdapter.csproj", "{429552A4-4C18-4355-94C5-80DC88C48405}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetStandard2Library", "NetStandard2Library\NetStandard2Library.csproj", "{080F0AD2-E7AE-42C8-B867-56D78576735D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalLoggerTestProject", "TerminalLoggerTestProject\TerminalLoggerTestProject.csproj", "{C69BEEA4-BE37-4155-8DD0-130C62D8BF6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutputtingTestProject", "OutputtingTestProject\OutputtingTestProject.csproj", "{A83CE873-2536-4795-B601-5816294ED0B8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|x64.Build.0 = Debug|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|x86.Build.0 = Debug|Any CPU
 		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|x64.ActiveCfg = Release|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|x64.Build.0 = Release|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|x86.ActiveCfg = Release|Any CPU
-		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|x86.Build.0 = Release|Any CPU
 		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|x86.Build.0 = Debug|Any CPU
 		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|x64.Build.0 = Release|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|x86.Build.0 = Release|Any CPU
 		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|x86.Build.0 = Debug|Any CPU
 		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|x64.Build.0 = Release|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|x86.ActiveCfg = Release|Any CPU
-		{52CAF89F-2309-4597-B531-79D6A96902BE}.Release|x86.Build.0 = Release|Any CPU
 		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|x64.Build.0 = Debug|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|x86.Build.0 = Debug|Any CPU
 		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|x64.ActiveCfg = Release|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|x64.Build.0 = Release|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|x86.ActiveCfg = Release|Any CPU
-		{1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|x86.Build.0 = Release|Any CPU
 		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|x86.Build.0 = Debug|Any CPU
 		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|x64.Build.0 = Release|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|x86.Build.0 = Release|Any CPU
 		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|x64.Build.0 = Debug|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|x86.Build.0 = Debug|Any CPU
 		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|x64.ActiveCfg = Release|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|x64.Build.0 = Release|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|x86.ActiveCfg = Release|Any CPU
-		{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|x86.Build.0 = Release|Any CPU
 		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|x64.Build.0 = Debug|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|x86.Build.0 = Debug|Any CPU
 		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|x64.Build.0 = Release|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|x86.Build.0 = Release|Any CPU
 		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|x64.Build.0 = Debug|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|x86.Build.0 = Debug|Any CPU
 		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|x64.ActiveCfg = Release|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|x64.Build.0 = Release|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|x86.Build.0 = Release|Any CPU
 		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|x64.Build.0 = Debug|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|x86.Build.0 = Debug|Any CPU
 		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|x64.ActiveCfg = Release|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|x64.Build.0 = Release|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|x86.ActiveCfg = Release|Any CPU
-		{2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|x86.Build.0 = Release|Any CPU
 		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|x64.Build.0 = Debug|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|x86.Build.0 = Debug|Any CPU
 		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|x64.ActiveCfg = Release|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|x64.Build.0 = Release|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|x86.ActiveCfg = Release|Any CPU
-		{1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|x86.Build.0 = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|x64.Build.0 = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|x64.Build.0 = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|x86.Build.0 = Release|Any CPU
 		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|x64.Build.0 = Debug|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|x86.Build.0 = Debug|Any CPU
 		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|x64.ActiveCfg = Release|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|x64.Build.0 = Release|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|x86.ActiveCfg = Release|Any CPU
-		{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|x86.Build.0 = Release|Any CPU
 		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|x64.Build.0 = Debug|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Debug|x86.Build.0 = Debug|Any CPU
 		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|x64.ActiveCfg = Release|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|x64.Build.0 = Release|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|x86.ActiveCfg = Release|Any CPU
-		{E28DD78A-E4C1-48C1-B027-88576F669C73}.Release|x86.Build.0 = Release|Any CPU
 		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Debug|x86.Build.0 = Debug|Any CPU
 		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|x64.Build.0 = Release|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4369F97-5D81-4D1A-BAE1-2AE3B2408D44}.Release|x86.Build.0 = Release|Any CPU
 		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|x64.Build.0 = Debug|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|x86.Build.0 = Debug|Any CPU
 		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|x64.ActiveCfg = Release|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|x64.Build.0 = Release|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|x86.ActiveCfg = Release|Any CPU
-		{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|x86.Build.0 = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|x64.ActiveCfg = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|x64.Build.0 = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|x86.Build.0 = Release|Any CPU
 		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|x64.Build.0 = Debug|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|x86.Build.0 = Debug|Any CPU
 		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|x64.ActiveCfg = Release|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|x64.Build.0 = Release|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|x86.ActiveCfg = Release|Any CPU
-		{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|x86.Build.0 = Release|Any CPU
 		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|x64.Build.0 = Debug|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Debug|x86.Build.0 = Debug|Any CPU
 		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|x64.ActiveCfg = Release|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|x64.Build.0 = Release|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|x86.ActiveCfg = Release|Any CPU
-		{A09B21CC-F726-413A-B185-3AE1172BAED0}.Release|x86.Build.0 = Release|Any CPU
 		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Debug|x86.Build.0 = Debug|Any CPU
 		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|x64.Build.0 = Release|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{132E4690-DE43-4684-BA05-6942155EEAB5}.Release|x86.Build.0 = Release|Any CPU
 		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Debug|x86.Build.0 = Debug|Any CPU
 		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|x64.Build.0 = Release|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C38E692-FBE3-41A4-A008-4CA79B203985}.Release|x86.Build.0 = Release|Any CPU
 		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|x64.Build.0 = Debug|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Debug|x86.Build.0 = Debug|Any CPU
 		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|x64.ActiveCfg = Release|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|x64.Build.0 = Release|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|x86.ActiveCfg = Release|Any CPU
-		{79EDA259-5EA0-45F0-990A-F078427E198A}.Release|x86.Build.0 = Release|Any CPU
 		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|x64.Build.0 = Debug|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Debug|x86.Build.0 = Debug|Any CPU
 		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|x64.ActiveCfg = Release|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|x64.Build.0 = Release|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF090BCE-CC7D-4359-93E2-30F2B454F751}.Release|x86.Build.0 = Release|Any CPU
 		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|x64.Build.0 = Debug|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Debug|x86.Build.0 = Debug|Any CPU
 		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|x64.ActiveCfg = Release|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|x64.Build.0 = Release|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|x86.ActiveCfg = Release|Any CPU
-		{BA53C202-55D6-4BBC-A24A-444B2D5F6309}.Release|x86.Build.0 = Release|Any CPU
 		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|x64.Build.0 = Debug|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Debug|x86.Build.0 = Debug|Any CPU
 		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|x64.ActiveCfg = Release|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|x64.Build.0 = Release|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A0113409-56D3-4060-BD94-A4BA4739712D}.Release|x86.Build.0 = Release|Any CPU
 		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Debug|x86.Build.0 = Debug|Any CPU
 		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|x64.Build.0 = Release|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A04F7AC-09E4-426C-A599-110DFA693200}.Release|x86.Build.0 = Release|Any CPU
 		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|x64.Build.0 = Release|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{1FF723F6-3A09-41F6-B85C-C4BE9C4374F0}.Release|x86.Build.0 = Release|Any CPU
 		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Debug|x86.Build.0 = Debug|Any CPU
 		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|x64.Build.0 = Release|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BAA0E81-FB31-4BAB-BD75-0CA315245BD8}.Release|x86.Build.0 = Release|Any CPU
 		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|x64.Build.0 = Debug|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Debug|x86.Build.0 = Debug|Any CPU
 		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|x64.ActiveCfg = Release|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|x64.Build.0 = Release|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|x86.ActiveCfg = Release|Any CPU
-		{40DA6965-C3C3-46BC-BA56-6D457C097F3C}.Release|x86.Build.0 = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|x64.Build.0 = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|x64.ActiveCfg = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|x64.Build.0 = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7869421-F18B-4BEF-AECD-71485136808C}.Release|x86.Build.0 = Release|Any CPU
 		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|x64.Build.0 = Debug|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Debug|x86.Build.0 = Debug|Any CPU
 		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|x64.ActiveCfg = Release|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|x64.Build.0 = Release|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|x86.ActiveCfg = Release|Any CPU
-		{F37144D7-2C6D-42AF-9E85-EF10E5244A7B}.Release|x86.Build.0 = Release|Any CPU
 		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Debug|x86.Build.0 = Debug|Any CPU
 		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|x64.Build.0 = Release|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F85E9D0-7BCE-431D-B468-4F6104E52DFA}.Release|x86.Build.0 = Release|Any CPU
 		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|x64.Build.0 = Debug|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Debug|x86.Build.0 = Debug|Any CPU
 		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|x64.ActiveCfg = Release|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|x64.Build.0 = Release|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|x86.ActiveCfg = Release|Any CPU
-		{0D4D59D7-C52F-4858-A220-EAC7484E3827}.Release|x86.Build.0 = Release|Any CPU
 		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Debug|x86.Build.0 = Debug|Any CPU
 		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|x64.Build.0 = Release|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{23790570-66D2-4CD5-9CD0-F8787C5B61BF}.Release|x86.Build.0 = Release|Any CPU
 		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|x64.Build.0 = Release|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2F1E03B-002A-4A3E-BAFC-8F2F0AB5B86F}.Release|x86.Build.0 = Release|Any CPU
 		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|x64.Build.0 = Debug|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Debug|x86.Build.0 = Debug|Any CPU
 		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|x64.ActiveCfg = Release|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|x64.Build.0 = Release|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A716ED69-FBC8-4E3F-B728-589873A1540D}.Release|x86.Build.0 = Release|Any CPU
 		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|x64.Build.0 = Debug|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Debug|x86.Build.0 = Debug|Any CPU
 		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|x64.ActiveCfg = Release|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|x64.Build.0 = Release|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|x86.ActiveCfg = Release|Any CPU
-		{F262678B-7CD8-43DD-B752-4E761BE9A0A3}.Release|x86.Build.0 = Release|Any CPU
 		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|x64.Build.0 = Debug|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Debug|x86.Build.0 = Debug|Any CPU
 		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|x64.ActiveCfg = Release|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|x64.Build.0 = Release|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA159C14-FCE9-4D65-815C-F5D7D79583DE}.Release|x86.Build.0 = Release|Any CPU
 		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|x64.Build.0 = Debug|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Debug|x86.Build.0 = Debug|Any CPU
 		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|x64.ActiveCfg = Release|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|x64.Build.0 = Release|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|x86.ActiveCfg = Release|Any CPU
-		{4393D63A-0C36-42F3-98A9-81440F213640}.Release|x86.Build.0 = Release|Any CPU
 		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|x64.Build.0 = Debug|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Debug|x86.Build.0 = Debug|Any CPU
 		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|x64.ActiveCfg = Release|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|x64.Build.0 = Release|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|x86.ActiveCfg = Release|Any CPU
-		{135B06DB-1A0E-4DC3-93DA-8649AE3BDE19}.Release|x86.Build.0 = Release|Any CPU
 		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|x64.Build.0 = Debug|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Debug|x86.Build.0 = Debug|Any CPU
 		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|x64.ActiveCfg = Release|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|x64.Build.0 = Release|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|x86.ActiveCfg = Release|Any CPU
-		{5FB9DFB8-2453-40EA-AAAD-D44677BCDF50}.Release|x86.Build.0 = Release|Any CPU
 		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|x64.Build.0 = Debug|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Debug|x86.Build.0 = Debug|Any CPU
 		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|x64.ActiveCfg = Release|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|x64.Build.0 = Release|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA82D2B3-CCF7-4F68-8840-286BA2D5B23B}.Release|x86.Build.0 = Release|Any CPU
+		{16F51720-29D0-472A-93FA-2604D61991B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16F51720-29D0-472A-93FA-2604D61991B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16F51720-29D0-472A-93FA-2604D61991B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16F51720-29D0-472A-93FA-2604D61991B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{452352E1-71CA-436E-8165-F284EE36C924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{452352E1-71CA-436E-8165-F284EE36C924}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{452352E1-71CA-436E-8165-F284EE36C924}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{452352E1-71CA-436E-8165-F284EE36C924}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08C44607-EB80-4EE5-927D-08C34AA277AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08C44607-EB80-4EE5-927D-08C34AA277AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08C44607-EB80-4EE5-927D-08C34AA277AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08C44607-EB80-4EE5-927D-08C34AA277AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680}.Release|Any CPU.Build.0 = Release|Any CPU
+		{027CADBF-7071-482A-8D86-CA03AC31FC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{027CADBF-7071-482A-8D86-CA03AC31FC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{027CADBF-7071-482A-8D86-CA03AC31FC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{027CADBF-7071-482A-8D86-CA03AC31FC4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0ECF78C-71A7-4281-B81E-7BD09649E5EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0ECF78C-71A7-4281-B81E-7BD09649E5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0ECF78C-71A7-4281-B81E-7BD09649E5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0ECF78C-71A7-4281-B81E-7BD09649E5EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF157AEA-43B8-4923-9E86-BB134F17F2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF157AEA-43B8-4923-9E86-BB134F17F2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF157AEA-43B8-4923-9E86-BB134F17F2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF157AEA-43B8-4923-9E86-BB134F17F2F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76EFDDEC-4AD2-4B12-8EC9-440190B89418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76EFDDEC-4AD2-4B12-8EC9-440190B89418}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76EFDDEC-4AD2-4B12-8EC9-440190B89418}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76EFDDEC-4AD2-4B12-8EC9-440190B89418}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75A46D17-91D6-430C-A8A8-C2D2E8C9943C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75A46D17-91D6-430C-A8A8-C2D2E8C9943C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75A46D17-91D6-430C-A8A8-C2D2E8C9943C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75A46D17-91D6-430C-A8A8-C2D2E8C9943C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2F74D8D-9D16-493C-A716-B58426074075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2F74D8D-9D16-493C-A716-B58426074075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2F74D8D-9D16-493C-A716-B58426074075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2F74D8D-9D16-493C-A716-B58426074075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06724523-611A-4054-A1AC-29DA2E87DD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06724523-611A-4054-A1AC-29DA2E87DD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06724523-611A-4054-A1AC-29DA2E87DD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06724523-611A-4054-A1AC-29DA2E87DD87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15DC879D-1A60-4745-8DF4-EBC36EE12339}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15DC879D-1A60-4745-8DF4-EBC36EE12339}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15DC879D-1A60-4745-8DF4-EBC36EE12339}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15DC879D-1A60-4745-8DF4-EBC36EE12339}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10AA955C-B412-41A8-899F-8609AAE19F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10AA955C-B412-41A8-899F-8609AAE19F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10AA955C-B412-41A8-899F-8609AAE19F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10AA955C-B412-41A8-899F-8609AAE19F61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E166D337-4033-4209-863F-8F77675EAEE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E166D337-4033-4209-863F-8F77675EAEE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E166D337-4033-4209-863F-8F77675EAEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E166D337-4033-4209-863F-8F77675EAEE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85F9F2A8-D2A5-4EA1-8BE0-06CCE141EC7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F9F2A8-D2A5-4EA1-8BE0-06CCE141EC7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F9F2A8-D2A5-4EA1-8BE0-06CCE141EC7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85F9F2A8-D2A5-4EA1-8BE0-06CCE141EC7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71BF7EC9-7BEE-4038-8F4E-87032FA4E995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71BF7EC9-7BEE-4038-8F4E-87032FA4E995}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71BF7EC9-7BEE-4038-8F4E-87032FA4E995}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71BF7EC9-7BEE-4038-8F4E-87032FA4E995}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B5BDF7D-5816-47C6-8CFD-E45B152CA35F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5BDF7D-5816-47C6-8CFD-E45B152CA35F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B5BDF7D-5816-47C6-8CFD-E45B152CA35F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B5BDF7D-5816-47C6-8CFD-E45B152CA35F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64C4C4CD-2319-4033-9F33-53AAA8FECEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64C4C4CD-2319-4033-9F33-53AAA8FECEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64C4C4CD-2319-4033-9F33-53AAA8FECEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64C4C4CD-2319-4033-9F33-53AAA8FECEFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE6673DA-B50F-46DF-99A3-8A7C54DE9B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE6673DA-B50F-46DF-99A3-8A7C54DE9B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE6673DA-B50F-46DF-99A3-8A7C54DE9B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE6673DA-B50F-46DF-99A3-8A7C54DE9B61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{429552A4-4C18-4355-94C5-80DC88C48405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{429552A4-4C18-4355-94C5-80DC88C48405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{429552A4-4C18-4355-94C5-80DC88C48405}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{429552A4-4C18-4355-94C5-80DC88C48405}.Release|Any CPU.Build.0 = Release|Any CPU
+		{080F0AD2-E7AE-42C8-B867-56D78576735D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{080F0AD2-E7AE-42C8-B867-56D78576735D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{080F0AD2-E7AE-42C8-B867-56D78576735D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{080F0AD2-E7AE-42C8-B867-56D78576735D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C69BEEA4-BE37-4155-8DD0-130C62D8BF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C69BEEA4-BE37-4155-8DD0-130C62D8BF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C69BEEA4-BE37-4155-8DD0-130C62D8BF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C69BEEA4-BE37-4155-8DD0-130C62D8BF6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A83CE873-2536-4795-B601-5816294ED0B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A83CE873-2536-4795-B601-5816294ED0B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A83CE873-2536-4795-B601-5816294ED0B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A83CE873-2536-4795-B601-5816294ED0B8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{52CAF89F-2309-4597-B531-79D6A96902BE} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{3F23276F-F7D6-4E50-AA43-8DDB3EF1F680} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{027CADBF-7071-482A-8D86-CA03AC31FC4D} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{B0ECF78C-71A7-4281-B81E-7BD09649E5EE} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{EF157AEA-43B8-4923-9E86-BB134F17F2F0} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{76EFDDEC-4AD2-4B12-8EC9-440190B89418} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{75A46D17-91D6-430C-A8A8-C2D2E8C9943C} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{B2F74D8D-9D16-493C-A716-B58426074075} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{06724523-611A-4054-A1AC-29DA2E87DD87} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{15DC879D-1A60-4745-8DF4-EBC36EE12339} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+		{10AA955C-B412-41A8-899F-8609AAE19F61} = {2633D125-64A7-456C-AD37-F8A6B56C2403}
+		{E166D337-4033-4209-863F-8F77675EAEE8} = {2633D125-64A7-456C-AD37-F8A6B56C2403}
+		{71BF7EC9-7BEE-4038-8F4E-87032FA4E995} = {0C9CA869-32FD-4A9E-8885-E2E19786C746}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D2334DAA-F7B2-450E-ABA4-FBC185152500}
 	EndGlobalSection
diff --git a/test/TestAssets/Tools/Program.cs b/test/TestAssets/Tools/Program.cs
new file mode 100644
index 0000000000..94783ab8a9
--- /dev/null
+++ b/test/TestAssets/Tools/Program.cs
@@ -0,0 +1,7 @@
+// See https://aka.ms/new-console-template for more information
+using System;
+
+// This project is used to restore TestPlatform and TestPlatform.CLI tools packages
+// for testing with older versions.
+
+Console.WriteLine("Hello, World!");
diff --git a/test/TestAssets/Tools/Tools.csproj b/test/TestAssets/Tools/Tools.csproj
new file mode 100644
index 0000000000..7c13e8ec53
--- /dev/null
+++ b/test/TestAssets/Tools/Tools.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Package dependency versions -->
+  <PropertyGroup>
+    <TestProject>true</TestProject>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>hanging_child</RootNamespace>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TestPlatform" Version="$(PackageVersion)" />
+    <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(PackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/XUPerfTestProject/Program.cs b/test/TestAssets/XUPerfTestProject/Program.cs
deleted file mode 100644
index 7424402cd8..0000000000
--- a/test/TestAssets/XUPerfTestProject/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace XUPerfTestProject
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
-
diff --git a/test/TestAssets/XUPerfTestProject/UnitTest1.cs b/test/TestAssets/XUPerfTestProject/UnitTest1.cs
deleted file mode 100644
index dbc9a5329c..0000000000
--- a/test/TestAssets/XUPerfTestProject/UnitTest1.cs
+++ /dev/null
@@ -1,60016 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace XUPerfTestProject
-{
-    using Xunit;
-
-    public class UnitTest1
-    {
-        #region PassingTests
-        [Fact]
-        public void XUnit_D1_01()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_02()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_03()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_04()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_05()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_06()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_07()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_08()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_09()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_10()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_11()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_12()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_13()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_14()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_15()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_16()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_17()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_18()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_19()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_20()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_21()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_22()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_23()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_24()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_25()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_26()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_27()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_28()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_29()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_30()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_31()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_32()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_33()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_34()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_35()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_36()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_37()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_38()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_39()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_40()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_41()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_42()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_43()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_44()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_45()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_46()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_47()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_48()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_49()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_50()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_51()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_52()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_53()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_54()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_55()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_56()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_57()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_58()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_59()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_60()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_61()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_62()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_63()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_64()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_65()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_66()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_67()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_68()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_69()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_70()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_71()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_72()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_73()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_74()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_75()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_76()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_77()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_78()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_79()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_80()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_81()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_82()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_83()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_84()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_85()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_86()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_87()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_88()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_89()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_90()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_91()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_92()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_93()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_94()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_95()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_96()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_97()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_98()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_99()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_1999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_2999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_3999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_4999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        [Fact]
-        public void XUnit_D1_5000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.Equal(1, 1);
-        }
-        #endregion
-
-        #region FailingTests
-        [Fact]
-        public void XUnit_D1_5001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_5999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_6999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_7999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_8999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9001()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9002()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9003()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9004()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9005()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9006()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9007()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9008()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9009()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9010()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9011()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9012()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9013()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9014()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9015()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9016()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9017()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9018()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9019()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9020()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9021()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9022()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9023()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9024()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9025()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9026()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9027()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9028()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9029()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9030()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9031()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9032()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9033()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9034()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9035()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9036()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9037()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9038()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9039()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9040()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9041()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9042()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9043()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9044()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9045()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9046()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9047()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9048()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9049()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9050()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9051()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9052()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9053()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9054()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9055()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9056()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9057()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9058()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9059()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9060()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9061()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9062()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9063()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9064()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9065()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9066()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9067()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9068()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9069()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9070()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9071()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9072()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9073()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9074()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9075()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9076()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9077()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9078()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9079()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9080()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9081()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9082()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9083()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9084()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9085()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9086()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9087()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9088()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9089()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9090()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9091()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9092()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9093()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9094()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9095()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9096()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9097()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9098()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9099()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9100()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9101()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9102()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9103()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9104()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9105()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9106()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9107()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9108()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9109()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9110()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9111()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9112()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9113()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9114()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9115()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9116()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9117()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9118()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9119()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9120()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9121()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9122()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9123()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9124()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9125()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9126()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9127()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9128()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9129()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9130()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9131()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9132()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9133()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9134()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9135()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9136()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9137()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9138()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9139()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9140()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9141()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9142()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9143()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9144()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9145()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9146()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9147()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9148()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9149()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9150()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9151()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9152()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9153()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9154()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9155()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9156()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9157()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9158()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9159()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9160()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9161()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9162()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9163()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9164()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9165()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9166()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9167()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9168()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9169()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9170()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9171()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9172()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9173()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9174()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9175()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9176()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9177()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9178()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9179()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9180()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9181()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9182()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9183()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9184()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9185()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9186()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9187()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9188()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9189()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9190()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9191()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9192()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9193()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9194()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9195()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9196()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9197()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9198()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9199()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9200()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9201()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9202()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9203()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9204()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9205()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9206()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9207()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9208()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9209()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9210()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9211()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9212()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9213()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9214()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9215()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9216()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9217()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9218()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9219()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9220()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9221()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9222()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9223()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9224()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9225()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9226()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9227()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9228()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9229()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9230()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9231()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9232()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9233()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9234()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9235()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9236()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9237()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9238()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9239()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9240()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9241()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9242()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9243()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9244()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9245()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9246()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9247()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9248()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9249()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9250()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9251()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9252()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9253()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9254()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9255()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9256()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9257()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9258()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9259()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9260()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9261()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9262()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9263()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9264()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9265()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9266()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9267()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9268()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9269()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9270()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9271()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9272()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9273()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9274()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9275()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9276()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9277()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9278()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9279()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9280()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9281()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9282()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9283()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9284()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9285()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9286()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9287()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9288()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9289()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9290()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9291()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9292()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9293()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9294()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9295()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9296()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9297()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9298()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9299()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9300()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9301()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9302()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9303()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9304()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9305()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9306()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9307()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9308()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9309()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9310()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9311()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9312()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9313()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9314()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9315()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9316()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9317()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9318()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9319()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9320()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9321()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9322()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9323()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9324()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9325()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9326()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9327()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9328()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9329()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9330()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9331()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9332()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9333()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9334()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9335()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9336()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9337()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9338()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9339()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9340()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9341()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9342()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9343()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9344()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9345()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9346()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9347()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9348()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9349()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9350()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9351()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9352()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9353()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9354()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9355()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9356()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9357()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9358()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9359()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9360()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9361()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9362()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9363()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9364()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9365()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9366()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9367()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9368()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9369()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9370()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9371()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9372()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9373()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9374()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9375()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9376()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9377()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9378()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9379()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9380()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9381()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9382()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9383()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9384()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9385()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9386()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9387()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9388()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9389()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9390()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9391()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9392()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9393()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9394()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9395()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9396()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9397()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9398()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9399()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9400()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9401()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9402()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9403()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9404()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9405()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9406()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9407()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9408()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9409()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9410()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9411()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9412()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9413()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9414()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9415()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9416()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9417()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9418()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9419()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9420()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9421()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9422()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9423()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9424()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9425()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9426()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9427()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9428()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9429()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9430()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9431()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9432()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9433()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9434()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9435()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9436()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9437()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9438()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9439()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9440()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9441()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9442()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9443()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9444()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9445()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9446()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9447()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9448()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9449()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9450()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9451()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9452()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9453()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9454()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9455()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9456()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9457()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9458()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9459()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9460()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9461()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9462()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9463()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9464()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9465()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9466()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9467()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9468()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9469()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9470()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9471()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9472()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9473()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9474()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9475()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9476()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9477()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9478()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9479()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9480()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9481()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9482()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9483()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9484()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9485()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9486()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9487()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9488()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9489()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9490()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9491()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9492()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9493()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9494()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9495()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9496()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9497()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9498()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9499()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9500()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9501()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9502()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9503()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9504()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9505()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9506()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9507()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9508()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9509()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9510()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9511()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9512()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9513()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9514()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9515()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9516()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9517()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9518()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9519()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9520()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9521()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9522()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9523()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9524()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9525()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9526()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9527()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9528()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9529()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9530()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9531()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9532()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9533()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9534()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9535()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9536()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9537()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9538()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9539()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9540()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9541()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9542()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9543()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9544()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9545()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9546()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9547()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9548()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9549()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9550()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9551()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9552()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9553()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9554()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9555()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9556()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9557()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9558()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9559()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9560()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9561()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9562()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9563()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9564()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9565()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9566()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9567()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9568()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9569()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9570()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9571()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9572()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9573()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9574()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9575()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9576()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9577()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9578()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9579()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9580()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9581()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9582()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9583()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9584()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9585()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9586()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9587()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9588()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9589()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9590()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9591()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9592()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9593()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9594()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9595()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9596()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9597()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9598()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9599()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9600()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9601()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9602()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9603()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9604()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9605()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9606()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9607()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9608()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9609()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9610()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9611()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9612()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9613()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9614()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9615()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9616()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9617()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9618()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9619()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9620()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9621()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9622()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9623()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9624()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9625()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9626()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9627()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9628()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9629()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9630()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9631()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9632()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9633()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9634()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9635()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9636()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9637()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9638()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9639()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9640()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9641()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9642()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9643()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9644()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9645()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9646()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9647()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9648()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9649()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9650()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9651()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9652()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9653()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9654()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9655()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9656()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9657()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9658()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9659()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9660()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9661()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9662()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9663()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9664()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9665()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9666()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9667()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9668()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9669()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9670()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9671()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9672()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9673()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9674()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9675()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9676()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9677()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9678()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9679()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9680()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9681()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9682()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9683()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9684()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9685()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9686()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9687()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9688()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9689()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9690()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9691()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9692()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9693()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9694()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9695()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9696()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9697()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9698()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9699()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9700()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9701()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9702()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9703()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9704()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9705()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9706()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9707()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9708()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9709()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9710()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9711()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9712()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9713()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9714()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9715()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9716()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9717()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9718()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9719()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9720()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9721()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9722()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9723()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9724()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9725()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9726()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9727()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9728()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9729()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9730()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9731()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9732()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9733()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9734()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9735()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9736()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9737()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9738()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9739()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9740()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9741()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9742()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9743()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9744()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9745()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9746()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9747()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9748()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9749()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9750()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9751()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9752()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9753()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9754()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9755()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9756()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9757()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9758()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9759()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9760()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9761()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9762()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9763()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9764()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9765()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9766()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9767()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9768()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9769()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9770()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9771()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9772()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9773()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9774()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9775()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9776()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9777()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9778()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9779()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9780()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9781()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9782()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9783()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9784()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9785()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9786()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9787()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9788()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9789()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9790()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9791()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9792()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9793()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9794()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9795()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9796()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9797()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9798()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9799()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9800()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9801()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9802()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9803()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9804()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9805()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9806()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9807()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9808()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9809()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9810()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9811()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9812()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9813()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9814()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9815()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9816()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9817()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9818()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9819()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9820()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9821()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9822()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9823()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9824()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9825()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9826()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9827()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9828()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9829()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9830()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9831()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9832()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9833()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9834()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9835()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9836()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9837()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9838()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9839()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9840()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9841()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9842()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9843()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9844()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9845()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9846()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9847()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9848()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9849()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9850()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9851()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9852()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9853()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9854()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9855()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9856()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9857()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9858()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9859()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9860()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9861()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9862()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9863()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9864()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9865()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9866()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9867()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9868()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9869()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9870()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9871()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9872()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9873()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9874()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9875()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9876()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9877()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9878()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9879()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9880()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9881()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9882()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9883()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9884()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9885()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9886()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9887()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9888()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9889()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9890()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9891()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9892()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9893()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9894()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9895()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9896()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9897()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9898()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9899()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9900()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9901()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9902()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9903()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9904()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9905()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9906()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9907()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9908()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9909()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9910()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9911()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9912()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9913()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9914()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9915()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9916()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9917()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9918()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9919()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9920()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9921()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9922()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9923()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9924()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9925()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9926()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9927()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9928()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9929()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9930()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9931()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9932()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9933()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9934()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9935()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9936()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9937()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9938()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9939()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9940()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9941()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9942()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9943()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9944()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9945()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9946()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9947()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9948()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9949()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9950()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9951()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9952()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9953()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9954()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9955()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9956()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9957()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9958()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9959()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9960()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9961()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9962()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9963()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9964()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9965()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9966()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9967()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9968()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9969()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9970()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9971()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9972()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9973()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9974()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9975()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9976()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9977()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9978()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9979()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9980()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9981()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9982()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9983()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9984()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9985()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9986()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9987()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9988()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9989()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9990()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9991()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9992()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9993()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9994()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9995()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9996()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9997()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9998()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_9999()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        [Fact]
-        public void XUnit_D1_10000()
-        {
-            //System.Threading.Thread.Sleep(1500);
-            Assert.False(true);
-        }
-        #endregion
-    }
-}
diff --git a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj b/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj
deleted file mode 100644
index b74766c104..0000000000
--- a/test/TestAssets/XUPerfTestProject/XUPerfTestProject.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-16"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <Target Name="WorkAroundPackageAndProjectReferenceConflict" BeforeTargets="ResolveLockFileReferences">
-    <ItemGroup>
-      <ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'%(ResolvedCompileFileDefinitions.Filename)' == 'Microsoft.TestPlatform.ObjectModel'" />
-    </ItemGroup>
-  </Target>  
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" '$(TargetFramework)' != 'net452' ">Exe</OutputType>
-    <AssemblyName>XUPerfTestProject</AssemblyName>
-    <SignAssembly>false</SignAssembly>
-    <PublicSign>false</PublicSign>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'net452' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/TestAssets/XUTestProject/Class1.cs b/test/TestAssets/XUTestProject/Class1.cs
index e1d33d201f..5ae946aa5a 100644
--- a/test/TestAssets/XUTestProject/Class1.cs
+++ b/test/TestAssets/XUTestProject/Class1.cs
@@ -1,13 +1,12 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Xunit;
+
+#pragma warning disable IDE1006 // Naming Styles
 namespace xUnitTestProject
+#pragma warning restore IDE1006 // Naming Styles
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using Xunit;
-
     public class Class1
     {
         [Fact]
diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj
index 6a1c12cddc..5e91dc7e9d 100644
--- a/test/TestAssets/XUTestProject/XUTestProject.csproj
+++ b/test/TestAssets/XUTestProject/XUTestProject.csproj
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
   <PropertyGroup>
     <AssemblyName>XUTestProject</AssemblyName>
-    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <TargetFrameworks>$(NetFrameworkMinimum);$(NetCoreAppMinimum)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/test/TestAssets/child-crash/UnitTest1.cs b/test/TestAssets/child-crash/UnitTest1.cs
index f35ac67928..6ea2e14d2d 100644
--- a/test/TestAssets/child-crash/UnitTest1.cs
+++ b/test/TestAssets/child-crash/UnitTest1.cs
@@ -1,10 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace child_crash
+#pragma warning restore IDE1006 // Naming Styles
 {
     [TestClass]
     public class UnitTest1
@@ -18,7 +24,7 @@ public void TestMethod1()
             var directory = "Release";
 #endif
             // wait for two children to crash
-            var childProcess = Path.GetFullPath($@"../../../../problematic-child/bin/{directory}/net5.0/problematic-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
+            var childProcess = Path.GetFullPath($@"../../../problematic-child/{directory}/net9.0/problematic-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
             if (!File.Exists(childProcess))
             {
                 throw new FileNotFoundException(childProcess);
diff --git a/test/TestAssets/child-crash/child-crash.csproj b/test/TestAssets/child-crash/child-crash.csproj
index be91e37289..5503a12b23 100644
--- a/test/TestAssets/child-crash/child-crash.csproj
+++ b/test/TestAssets/child-crash/child-crash.csproj
@@ -1,26 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Package dependency versions -->
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
+
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <RootNamespace>child_crash</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="$(PackageVersion)" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/child-hang/UnitTest1.cs b/test/TestAssets/child-hang/UnitTest1.cs
index 1c0f378c8e..621fc7b3e5 100644
--- a/test/TestAssets/child-hang/UnitTest1.cs
+++ b/test/TestAssets/child-hang/UnitTest1.cs
@@ -1,11 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace child_hang
+#pragma warning restore IDE1006 // Naming Styles
 {
     [TestClass]
     public class UnitTest1
@@ -19,7 +25,7 @@ public void TestMethod1()
             var directory = "Release";
 #endif
             // wait for two children to crash
-            var childProcess =  Path.GetFullPath($@"../../../../hanging-child/bin/{directory}/net5.0/hanging-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
+            var childProcess = Path.GetFullPath($@"../../../hanging-child/{directory}/net9.0/hanging-child{(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ".dll")}");
             // 2 chidren, that is 3 hanging processes
             var process = (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? Process.Start(childProcess, "2") : Process.Start(GetFullPath("dotnet"), $"{childProcess} 2"));
             process.WaitForExit();
diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj
index 318d5f6204..0a96b3dcf2 100644
--- a/test/TestAssets/child-hang/child-hang.csproj
+++ b/test/TestAssets/child-hang/child-hang.csproj
@@ -1,27 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
+
   <PropertyGroup>
-    <TargetFrameworks>net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <RootNamespace>child_hang</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="$(PackageVersion)" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
-  
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
+
 </Project>
diff --git a/test/TestAssets/crash/UnitTest1.cs b/test/TestAssets/crash/UnitTest1.cs
index c3e0e3a547..cfcb1181c3 100644
--- a/test/TestAssets/crash/UnitTest1.cs
+++ b/test/TestAssets/crash/UnitTest1.cs
@@ -1,7 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace timeout
+#pragma warning restore IDE1006 // Naming Styles
 {
     [TestClass]
     public class UnitTest1
diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj
index f6a159698a..8488ca3319 100644
--- a/test/TestAssets/crash/crash.csproj
+++ b/test/TestAssets/crash/crash.csproj
@@ -1,26 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
-  <PropertyGroup>
-    <TargetFrameworks>net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="$(PackageVersion)" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/hanging-child/Program.cs b/test/TestAssets/hanging-child/Program.cs
index 62719c9a47..54eddaecac 100644
--- a/test/TestAssets/hanging-child/Program.cs
+++ b/test/TestAssets/hanging-child/Program.cs
@@ -1,11 +1,17 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace hanging_child
+#pragma warning restore IDE1006 // Naming Styles
 {
     class Program
     {
@@ -13,13 +19,13 @@ static void Main(string[] args)
         {
             if (args.Length > 0)
             {
-                var val = int.Parse(args[0]);
+                var val = int.Parse(args[0], CultureInfo.InvariantCulture);
                 if (val > 0)
                 {
-                    // 2 chidren, that is 3 hanging processes
+                    // 2 children, that is 3 hanging processes
                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     {
-                        Process.Start(Process.GetCurrentProcess().MainModule.FileName, (val - 1).ToString());
+                        Process.Start(Process.GetCurrentProcess().MainModule.FileName, (val - 1).ToString(CultureInfo.InvariantCulture));
                     }
                     else
                     {
diff --git a/test/TestAssets/hanging-child/hanging-child.csproj b/test/TestAssets/hanging-child/hanging-child.csproj
index ad2be3e645..2c46cb554d 100644
--- a/test/TestAssets/hanging-child/hanging-child.csproj
+++ b/test/TestAssets/hanging-child/hanging-child.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Package dependency versions -->
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
+
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>hanging_child</RootNamespace>
   </PropertyGroup>
@@ -17,5 +14,5 @@
   <ItemGroup>
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj b/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj
new file mode 100644
index 0000000000..003be862b0
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1000Passing/MSTest1000Passing.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="MSTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MSTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="MSTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MSTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/MSTest1000Passing/MSTests.cs b/test/TestAssets/performance/MSTest1000Passing/MSTests.cs
new file mode 100644
index 0000000000..d896ce5180
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1000Passing/MSTests.cs
@@ -0,0 +1,5455 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+    [TestClass]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_01_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_02_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_03_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_04_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_05_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_06
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_06_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_07
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_07_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_08
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_08_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_09
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_09_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_10
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_10_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_11
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_11_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_12
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_12_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_13
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_13_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_14
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_14_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_15
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_15_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_16
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_16_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_17
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_17_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_18
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_18_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_19
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_19_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_20
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_20_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_21
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_21_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_22
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_22_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_23
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_23_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_24
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_24_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_25
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_25_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_26
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_26_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_27
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_27_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_28
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_28_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_29
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_29_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_30
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_30_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_31
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_31_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_32
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_32_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_33
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_33_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_34
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_34_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_35
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_35_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_36
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_36_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_37
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_37_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_38
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_38_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_39
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_39_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_40
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_40_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_41
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_41_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_42
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_42_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_43
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_43_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_44
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_44_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_45
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_45_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_46
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_46_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_47
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_47_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_48
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_48_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_49
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_49_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_50
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_50_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/MSTest1000Passing/MSTests.tt b/test/TestAssets/performance/MSTest1000Passing/MSTests.tt
new file mode 100644
index 0000000000..dfbb3afc54
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1000Passing/MSTests.tt
@@ -0,0 +1,56 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+<#
+    int classes = 50;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestClass]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj b/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj
new file mode 100644
index 0000000000..003be862b0
--- /dev/null
+++ b/test/TestAssets/performance/MSTest100Passing/MSTest100Passing.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="MSTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MSTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="MSTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MSTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/MSTest100Passing/MSTests.cs b/test/TestAssets/performance/MSTest100Passing/MSTests.cs
new file mode 100644
index 0000000000..0820bf071a
--- /dev/null
+++ b/test/TestAssets/performance/MSTest100Passing/MSTests.cs
@@ -0,0 +1,550 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+    [TestClass]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_01_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_02_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_03_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_04_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_05_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/MSTest100Passing/MSTests.tt b/test/TestAssets/performance/MSTest100Passing/MSTests.tt
new file mode 100644
index 0000000000..bf88b84c78
--- /dev/null
+++ b/test/TestAssets/performance/MSTest100Passing/MSTests.tt
@@ -0,0 +1,56 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+<#
+    int classes = 5;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestClass]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj b/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj
new file mode 100644
index 0000000000..38220eb26e
--- /dev/null
+++ b/test/TestAssets/performance/MSTest10kPassing/MSTest10kPassing.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net48;net472</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="MSTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MSTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="MSTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MSTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/MSTest10kPassing/MSTests.cs b/test/TestAssets/performance/MSTest10kPassing/MSTests.cs
new file mode 100644
index 0000000000..20e9319c11
--- /dev/null
+++ b/test/TestAssets/performance/MSTest10kPassing/MSTests.cs
@@ -0,0 +1,54505 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+    [TestClass]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_01_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_02_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_03_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_04_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_05_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_06
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_06_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_07
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_07_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_08
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_08_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_09
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_09_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_10
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_10_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_11
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_11_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_12
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_12_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_13
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_13_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_14
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_14_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_15
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_15_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_16
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_16_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_17
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_17_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_18
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_18_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_19
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_19_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_20
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_20_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_21
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_21_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_22
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_22_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_23
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_23_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_24
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_24_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_25
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_25_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_26
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_26_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_27
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_27_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_28
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_28_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_29
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_29_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_30
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_30_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_31
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_31_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_32
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_32_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_33
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_33_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_34
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_34_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_35
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_35_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_36
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_36_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_37
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_37_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_38
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_38_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_39
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_39_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_40
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_40_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_41
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_41_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_42
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_42_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_43
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_43_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_44
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_44_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_45
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_45_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_46
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_46_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_47
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_47_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_48
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_48_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_49
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_49_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_50
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_50_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_51
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_51_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_51_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_52
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_52_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_52_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_53
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_53_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_53_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_54
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_54_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_54_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_55
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_55_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_55_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_56
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_56_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_56_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_57
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_57_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_57_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_58
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_58_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_58_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_59
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_59_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_59_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_60
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_60_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_60_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_61
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_61_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_61_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_62
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_62_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_62_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_63
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_63_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_63_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_64
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_64_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_64_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_65
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_65_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_65_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_66
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_66_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_66_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_67
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_67_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_67_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_68
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_68_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_68_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_69
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_69_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_69_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_70
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_70_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_70_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_71
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_71_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_71_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_72
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_72_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_72_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_73
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_73_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_73_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_74
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_74_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_74_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_75
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_75_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_75_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_76
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_76_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_76_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_77
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_77_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_77_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_78
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_78_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_78_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_79
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_79_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_79_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_80
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_80_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_80_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_81
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_81_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_81_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_82
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_82_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_82_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_83
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_83_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_83_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_84
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_84_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_84_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_85
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_85_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_85_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_86
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_86_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_86_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_87
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_87_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_87_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_88
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_88_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_88_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_89
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_89_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_89_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_90
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_90_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_90_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_91
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_91_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_91_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_92
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_92_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_92_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_93
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_93_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_93_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_94
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_94_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_94_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_95
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_95_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_95_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_96
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_96_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_96_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_97
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_97_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_97_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_98
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_98_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_98_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_99
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_99_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_99_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_100
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_100_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_100_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_101
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_101_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_101_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_102
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_102_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_102_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_103
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_103_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_103_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_104
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_104_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_104_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_105
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_105_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_105_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_106
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_106_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_106_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_107
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_107_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_107_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_108
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_108_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_108_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_109
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_109_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_109_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_110
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_110_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_110_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_111
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_111_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_111_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_112
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_112_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_112_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_113
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_113_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_113_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_114
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_114_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_114_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_115
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_115_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_115_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_116
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_116_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_116_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_117
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_117_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_117_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_118
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_118_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_118_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_119
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_119_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_119_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_120
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_120_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_120_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_121
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_121_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_121_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_122
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_122_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_122_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_123
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_123_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_123_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_124
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_124_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_124_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_125
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_125_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_125_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_126
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_126_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_126_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_127
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_127_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_127_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_128
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_128_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_128_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_129
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_129_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_129_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_130
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_130_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_130_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_131
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_131_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_131_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_132
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_132_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_132_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_133
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_133_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_133_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_134
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_134_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_134_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_135
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_135_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_135_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_136
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_136_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_136_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_137
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_137_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_137_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_138
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_138_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_138_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_139
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_139_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_139_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_140
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_140_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_140_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_141
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_141_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_141_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_142
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_142_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_142_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_143
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_143_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_143_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_144
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_144_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_144_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_145
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_145_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_145_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_146
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_146_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_146_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_147
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_147_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_147_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_148
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_148_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_148_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_149
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_149_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_149_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_150
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_150_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_150_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_151
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_151_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_151_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_152
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_152_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_152_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_153
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_153_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_153_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_154
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_154_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_154_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_155
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_155_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_155_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_156
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_156_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_156_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_157
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_157_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_157_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_158
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_158_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_158_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_159
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_159_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_159_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_160
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_160_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_160_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_161
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_161_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_161_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_162
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_162_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_162_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_163
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_163_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_163_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_164
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_164_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_164_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_165
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_165_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_165_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_166
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_166_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_166_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_167
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_167_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_167_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_168
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_168_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_168_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_169
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_169_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_169_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_170
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_170_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_170_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_171
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_171_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_171_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_172
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_172_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_172_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_173
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_173_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_173_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_174
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_174_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_174_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_175
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_175_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_175_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_176
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_176_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_176_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_177
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_177_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_177_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_178
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_178_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_178_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_179
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_179_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_179_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_180
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_180_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_180_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_181
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_181_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_181_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_182
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_182_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_182_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_183
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_183_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_183_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_184
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_184_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_184_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_185
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_185_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_185_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_186
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_186_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_186_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_187
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_187_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_187_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_188
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_188_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_188_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_189
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_189_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_189_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_190
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_190_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_190_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_191
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_191_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_191_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_192
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_192_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_192_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_193
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_193_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_193_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_194
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_194_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_194_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_195
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_195_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_195_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_196
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_196_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_196_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_197
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_197_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_197_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_198
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_198_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_198_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_199
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_199_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_199_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_200
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_200_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_200_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_201
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_201_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_201_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_202
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_202_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_202_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_203
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_203_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_203_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_204
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_204_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_204_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_205
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_205_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_205_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_206
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_206_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_206_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_207
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_207_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_207_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_208
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_208_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_208_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_209
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_209_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_209_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_210
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_210_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_210_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_211
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_211_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_211_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_212
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_212_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_212_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_213
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_213_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_213_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_214
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_214_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_214_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_215
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_215_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_215_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_216
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_216_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_216_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_217
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_217_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_217_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_218
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_218_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_218_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_219
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_219_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_219_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_220
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_220_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_220_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_221
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_221_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_221_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_222
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_222_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_222_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_223
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_223_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_223_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_224
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_224_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_224_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_225
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_225_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_225_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_226
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_226_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_226_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_227
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_227_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_227_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_228
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_228_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_228_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_229
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_229_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_229_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_230
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_230_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_230_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_231
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_231_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_231_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_232
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_232_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_232_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_233
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_233_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_233_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_234
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_234_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_234_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_235
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_235_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_235_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_236
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_236_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_236_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_237
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_237_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_237_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_238
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_238_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_238_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_239
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_239_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_239_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_240
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_240_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_240_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_241
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_241_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_241_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_242
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_242_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_242_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_243
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_243_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_243_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_244
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_244_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_244_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_245
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_245_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_245_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_246
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_246_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_246_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_247
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_247_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_247_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_248
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_248_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_248_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_249
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_249_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_249_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_250
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_250_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_250_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_251
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_251_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_251_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_252
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_252_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_252_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_253
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_253_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_253_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_254
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_254_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_254_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_255
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_255_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_255_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_256
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_256_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_256_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_257
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_257_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_257_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_258
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_258_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_258_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_259
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_259_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_259_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_260
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_260_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_260_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_261
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_261_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_261_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_262
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_262_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_262_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_263
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_263_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_263_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_264
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_264_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_264_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_265
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_265_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_265_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_266
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_266_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_266_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_267
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_267_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_267_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_268
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_268_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_268_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_269
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_269_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_269_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_270
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_270_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_270_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_271
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_271_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_271_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_272
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_272_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_272_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_273
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_273_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_273_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_274
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_274_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_274_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_275
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_275_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_275_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_276
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_276_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_276_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_277
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_277_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_277_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_278
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_278_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_278_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_279
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_279_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_279_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_280
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_280_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_280_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_281
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_281_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_281_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_282
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_282_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_282_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_283
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_283_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_283_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_284
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_284_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_284_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_285
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_285_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_285_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_286
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_286_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_286_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_287
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_287_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_287_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_288
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_288_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_288_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_289
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_289_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_289_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_290
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_290_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_290_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_291
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_291_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_291_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_292
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_292_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_292_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_293
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_293_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_293_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_294
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_294_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_294_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_295
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_295_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_295_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_296
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_296_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_296_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_297
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_297_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_297_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_298
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_298_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_298_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_299
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_299_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_299_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_300
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_300_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_300_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_301
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_301_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_301_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_302
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_302_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_302_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_303
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_303_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_303_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_304
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_304_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_304_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_305
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_305_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_305_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_306
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_306_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_306_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_307
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_307_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_307_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_308
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_308_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_308_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_309
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_309_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_309_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_310
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_310_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_310_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_311
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_311_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_311_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_312
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_312_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_312_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_313
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_313_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_313_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_314
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_314_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_314_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_315
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_315_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_315_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_316
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_316_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_316_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_317
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_317_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_317_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_318
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_318_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_318_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_319
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_319_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_319_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_320
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_320_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_320_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_321
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_321_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_321_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_322
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_322_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_322_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_323
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_323_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_323_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_324
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_324_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_324_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_325
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_325_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_325_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_326
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_326_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_326_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_327
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_327_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_327_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_328
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_328_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_328_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_329
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_329_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_329_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_330
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_330_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_330_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_331
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_331_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_331_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_332
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_332_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_332_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_333
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_333_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_333_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_334
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_334_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_334_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_335
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_335_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_335_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_336
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_336_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_336_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_337
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_337_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_337_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_338
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_338_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_338_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_339
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_339_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_339_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_340
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_340_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_340_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_341
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_341_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_341_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_342
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_342_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_342_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_343
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_343_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_343_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_344
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_344_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_344_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_345
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_345_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_345_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_346
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_346_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_346_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_347
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_347_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_347_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_348
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_348_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_348_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_349
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_349_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_349_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_350
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_350_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_350_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_351
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_351_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_351_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_352
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_352_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_352_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_353
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_353_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_353_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_354
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_354_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_354_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_355
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_355_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_355_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_356
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_356_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_356_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_357
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_357_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_357_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_358
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_358_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_358_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_359
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_359_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_359_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_360
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_360_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_360_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_361
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_361_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_361_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_362
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_362_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_362_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_363
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_363_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_363_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_364
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_364_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_364_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_365
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_365_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_365_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_366
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_366_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_366_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_367
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_367_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_367_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_368
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_368_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_368_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_369
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_369_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_369_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_370
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_370_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_370_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_371
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_371_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_371_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_372
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_372_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_372_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_373
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_373_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_373_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_374
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_374_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_374_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_375
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_375_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_375_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_376
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_376_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_376_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_377
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_377_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_377_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_378
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_378_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_378_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_379
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_379_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_379_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_380
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_380_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_380_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_381
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_381_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_381_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_382
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_382_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_382_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_383
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_383_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_383_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_384
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_384_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_384_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_385
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_385_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_385_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_386
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_386_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_386_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_387
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_387_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_387_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_388
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_388_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_388_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_389
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_389_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_389_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_390
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_390_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_390_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_391
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_391_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_391_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_392
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_392_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_392_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_393
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_393_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_393_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_394
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_394_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_394_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_395
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_395_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_395_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_396
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_396_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_396_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_397
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_397_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_397_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_398
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_398_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_398_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_399
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_399_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_399_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_400
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_400_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_400_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_401
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_401_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_401_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_402
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_402_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_402_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_403
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_403_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_403_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_404
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_404_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_404_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_405
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_405_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_405_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_406
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_406_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_406_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_407
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_407_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_407_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_408
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_408_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_408_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_409
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_409_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_409_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_410
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_410_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_410_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_411
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_411_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_411_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_412
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_412_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_412_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_413
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_413_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_413_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_414
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_414_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_414_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_415
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_415_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_415_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_416
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_416_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_416_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_417
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_417_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_417_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_418
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_418_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_418_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_419
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_419_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_419_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_420
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_420_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_420_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_421
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_421_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_421_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_422
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_422_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_422_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_423
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_423_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_423_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_424
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_424_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_424_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_425
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_425_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_425_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_426
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_426_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_426_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_427
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_427_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_427_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_428
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_428_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_428_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_429
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_429_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_429_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_430
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_430_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_430_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_431
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_431_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_431_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_432
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_432_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_432_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_433
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_433_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_433_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_434
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_434_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_434_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_435
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_435_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_435_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_436
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_436_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_436_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_437
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_437_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_437_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_438
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_438_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_438_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_439
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_439_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_439_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_440
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_440_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_440_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_441
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_441_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_441_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_442
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_442_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_442_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_443
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_443_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_443_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_444
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_444_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_444_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_445
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_445_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_445_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_446
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_446_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_446_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_447
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_447_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_447_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_448
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_448_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_448_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_449
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_449_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_449_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_450
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_450_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_450_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_451
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_451_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_451_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_452
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_452_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_452_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_453
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_453_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_453_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_454
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_454_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_454_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_455
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_455_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_455_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_456
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_456_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_456_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_457
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_457_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_457_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_458
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_458_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_458_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_459
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_459_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_459_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_460
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_460_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_460_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_461
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_461_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_461_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_462
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_462_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_462_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_463
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_463_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_463_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_464
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_464_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_464_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_465
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_465_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_465_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_466
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_466_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_466_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_467
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_467_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_467_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_468
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_468_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_468_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_469
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_469_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_469_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_470
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_470_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_470_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_471
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_471_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_471_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_472
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_472_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_472_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_473
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_473_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_473_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_474
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_474_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_474_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_475
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_475_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_475_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_476
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_476_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_476_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_477
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_477_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_477_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_478
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_478_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_478_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_479
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_479_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_479_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_480
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_480_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_480_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_481
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_481_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_481_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_482
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_482_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_482_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_483
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_483_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_483_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_484
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_484_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_484_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_485
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_485_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_485_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_486
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_486_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_486_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_487
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_487_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_487_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_488
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_488_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_488_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_489
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_489_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_489_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_490
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_490_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_490_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_491
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_491_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_491_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_492
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_492_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_492_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_493
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_493_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_493_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_494
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_494_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_494_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_495
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_495_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_495_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_496
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_496_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_496_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_497
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_497_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_497_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_498
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_498_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_498_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_499
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_499_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_499_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestClass]
+    public class TestClass_500
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_500_01()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_02()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_03()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_04()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_05()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_06()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_07()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_08()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_09()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_10()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_11()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_12()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_13()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_14()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_15()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_16()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_17()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_18()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_19()
+        {
+        }
+
+        [TestMethod]
+        public void Test_500_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/MSTest10kPassing/MSTests.tt b/test/TestAssets/performance/MSTest10kPassing/MSTests.tt
new file mode 100644
index 0000000000..f476b44d51
--- /dev/null
+++ b/test/TestAssets/performance/MSTest10kPassing/MSTests.tt
@@ -0,0 +1,56 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+<#
+    int classes = 500;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestClass]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj b/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj
new file mode 100644
index 0000000000..b81e9fb18d
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1Passing/MSTest1Passing.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="MSTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MSTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="MSTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MSTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/MSTest1Passing/MSTests.cs b/test/TestAssets/performance/MSTest1Passing/MSTests.cs
new file mode 100644
index 0000000000..c5300f1880
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1Passing/MSTests.cs
@@ -0,0 +1,19 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+    [TestClass]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [TestMethod]
+        public void Test_01_01()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/MSTest1Passing/MSTests.tt b/test/TestAssets/performance/MSTest1Passing/MSTests.tt
new file mode 100644
index 0000000000..f6374efefe
--- /dev/null
+++ b/test/TestAssets/performance/MSTest1Passing/MSTests.tt
@@ -0,0 +1,56 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Tests
+{
+<#
+    int classes = 1;
+    int passedTests = 1;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestClass]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [TestMethod]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj b/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj
new file mode 100644
index 0000000000..2b873ab980
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1000Passing/NUnit1000Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnit3FrameworkVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3AdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/NUnit1000Passing/NunitTests.cs b/test/TestAssets/performance/NUnit1000Passing/NunitTests.cs
new file mode 100644
index 0000000000..375f852d12
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1000Passing/NunitTests.cs
@@ -0,0 +1,5455 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+    [TestFixture]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Test]
+        public void Test_01_01()
+        {
+        }
+
+        [Test]
+        public void Test_01_02()
+        {
+        }
+
+        [Test]
+        public void Test_01_03()
+        {
+        }
+
+        [Test]
+        public void Test_01_04()
+        {
+        }
+
+        [Test]
+        public void Test_01_05()
+        {
+        }
+
+        [Test]
+        public void Test_01_06()
+        {
+        }
+
+        [Test]
+        public void Test_01_07()
+        {
+        }
+
+        [Test]
+        public void Test_01_08()
+        {
+        }
+
+        [Test]
+        public void Test_01_09()
+        {
+        }
+
+        [Test]
+        public void Test_01_10()
+        {
+        }
+
+        [Test]
+        public void Test_01_11()
+        {
+        }
+
+        [Test]
+        public void Test_01_12()
+        {
+        }
+
+        [Test]
+        public void Test_01_13()
+        {
+        }
+
+        [Test]
+        public void Test_01_14()
+        {
+        }
+
+        [Test]
+        public void Test_01_15()
+        {
+        }
+
+        [Test]
+        public void Test_01_16()
+        {
+        }
+
+        [Test]
+        public void Test_01_17()
+        {
+        }
+
+        [Test]
+        public void Test_01_18()
+        {
+        }
+
+        [Test]
+        public void Test_01_19()
+        {
+        }
+
+        [Test]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Test]
+        public void Test_02_01()
+        {
+        }
+
+        [Test]
+        public void Test_02_02()
+        {
+        }
+
+        [Test]
+        public void Test_02_03()
+        {
+        }
+
+        [Test]
+        public void Test_02_04()
+        {
+        }
+
+        [Test]
+        public void Test_02_05()
+        {
+        }
+
+        [Test]
+        public void Test_02_06()
+        {
+        }
+
+        [Test]
+        public void Test_02_07()
+        {
+        }
+
+        [Test]
+        public void Test_02_08()
+        {
+        }
+
+        [Test]
+        public void Test_02_09()
+        {
+        }
+
+        [Test]
+        public void Test_02_10()
+        {
+        }
+
+        [Test]
+        public void Test_02_11()
+        {
+        }
+
+        [Test]
+        public void Test_02_12()
+        {
+        }
+
+        [Test]
+        public void Test_02_13()
+        {
+        }
+
+        [Test]
+        public void Test_02_14()
+        {
+        }
+
+        [Test]
+        public void Test_02_15()
+        {
+        }
+
+        [Test]
+        public void Test_02_16()
+        {
+        }
+
+        [Test]
+        public void Test_02_17()
+        {
+        }
+
+        [Test]
+        public void Test_02_18()
+        {
+        }
+
+        [Test]
+        public void Test_02_19()
+        {
+        }
+
+        [Test]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Test]
+        public void Test_03_01()
+        {
+        }
+
+        [Test]
+        public void Test_03_02()
+        {
+        }
+
+        [Test]
+        public void Test_03_03()
+        {
+        }
+
+        [Test]
+        public void Test_03_04()
+        {
+        }
+
+        [Test]
+        public void Test_03_05()
+        {
+        }
+
+        [Test]
+        public void Test_03_06()
+        {
+        }
+
+        [Test]
+        public void Test_03_07()
+        {
+        }
+
+        [Test]
+        public void Test_03_08()
+        {
+        }
+
+        [Test]
+        public void Test_03_09()
+        {
+        }
+
+        [Test]
+        public void Test_03_10()
+        {
+        }
+
+        [Test]
+        public void Test_03_11()
+        {
+        }
+
+        [Test]
+        public void Test_03_12()
+        {
+        }
+
+        [Test]
+        public void Test_03_13()
+        {
+        }
+
+        [Test]
+        public void Test_03_14()
+        {
+        }
+
+        [Test]
+        public void Test_03_15()
+        {
+        }
+
+        [Test]
+        public void Test_03_16()
+        {
+        }
+
+        [Test]
+        public void Test_03_17()
+        {
+        }
+
+        [Test]
+        public void Test_03_18()
+        {
+        }
+
+        [Test]
+        public void Test_03_19()
+        {
+        }
+
+        [Test]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Test]
+        public void Test_04_01()
+        {
+        }
+
+        [Test]
+        public void Test_04_02()
+        {
+        }
+
+        [Test]
+        public void Test_04_03()
+        {
+        }
+
+        [Test]
+        public void Test_04_04()
+        {
+        }
+
+        [Test]
+        public void Test_04_05()
+        {
+        }
+
+        [Test]
+        public void Test_04_06()
+        {
+        }
+
+        [Test]
+        public void Test_04_07()
+        {
+        }
+
+        [Test]
+        public void Test_04_08()
+        {
+        }
+
+        [Test]
+        public void Test_04_09()
+        {
+        }
+
+        [Test]
+        public void Test_04_10()
+        {
+        }
+
+        [Test]
+        public void Test_04_11()
+        {
+        }
+
+        [Test]
+        public void Test_04_12()
+        {
+        }
+
+        [Test]
+        public void Test_04_13()
+        {
+        }
+
+        [Test]
+        public void Test_04_14()
+        {
+        }
+
+        [Test]
+        public void Test_04_15()
+        {
+        }
+
+        [Test]
+        public void Test_04_16()
+        {
+        }
+
+        [Test]
+        public void Test_04_17()
+        {
+        }
+
+        [Test]
+        public void Test_04_18()
+        {
+        }
+
+        [Test]
+        public void Test_04_19()
+        {
+        }
+
+        [Test]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Test]
+        public void Test_05_01()
+        {
+        }
+
+        [Test]
+        public void Test_05_02()
+        {
+        }
+
+        [Test]
+        public void Test_05_03()
+        {
+        }
+
+        [Test]
+        public void Test_05_04()
+        {
+        }
+
+        [Test]
+        public void Test_05_05()
+        {
+        }
+
+        [Test]
+        public void Test_05_06()
+        {
+        }
+
+        [Test]
+        public void Test_05_07()
+        {
+        }
+
+        [Test]
+        public void Test_05_08()
+        {
+        }
+
+        [Test]
+        public void Test_05_09()
+        {
+        }
+
+        [Test]
+        public void Test_05_10()
+        {
+        }
+
+        [Test]
+        public void Test_05_11()
+        {
+        }
+
+        [Test]
+        public void Test_05_12()
+        {
+        }
+
+        [Test]
+        public void Test_05_13()
+        {
+        }
+
+        [Test]
+        public void Test_05_14()
+        {
+        }
+
+        [Test]
+        public void Test_05_15()
+        {
+        }
+
+        [Test]
+        public void Test_05_16()
+        {
+        }
+
+        [Test]
+        public void Test_05_17()
+        {
+        }
+
+        [Test]
+        public void Test_05_18()
+        {
+        }
+
+        [Test]
+        public void Test_05_19()
+        {
+        }
+
+        [Test]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_06
+    {
+        #region PassingTests
+        [Test]
+        public void Test_06_01()
+        {
+        }
+
+        [Test]
+        public void Test_06_02()
+        {
+        }
+
+        [Test]
+        public void Test_06_03()
+        {
+        }
+
+        [Test]
+        public void Test_06_04()
+        {
+        }
+
+        [Test]
+        public void Test_06_05()
+        {
+        }
+
+        [Test]
+        public void Test_06_06()
+        {
+        }
+
+        [Test]
+        public void Test_06_07()
+        {
+        }
+
+        [Test]
+        public void Test_06_08()
+        {
+        }
+
+        [Test]
+        public void Test_06_09()
+        {
+        }
+
+        [Test]
+        public void Test_06_10()
+        {
+        }
+
+        [Test]
+        public void Test_06_11()
+        {
+        }
+
+        [Test]
+        public void Test_06_12()
+        {
+        }
+
+        [Test]
+        public void Test_06_13()
+        {
+        }
+
+        [Test]
+        public void Test_06_14()
+        {
+        }
+
+        [Test]
+        public void Test_06_15()
+        {
+        }
+
+        [Test]
+        public void Test_06_16()
+        {
+        }
+
+        [Test]
+        public void Test_06_17()
+        {
+        }
+
+        [Test]
+        public void Test_06_18()
+        {
+        }
+
+        [Test]
+        public void Test_06_19()
+        {
+        }
+
+        [Test]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_07
+    {
+        #region PassingTests
+        [Test]
+        public void Test_07_01()
+        {
+        }
+
+        [Test]
+        public void Test_07_02()
+        {
+        }
+
+        [Test]
+        public void Test_07_03()
+        {
+        }
+
+        [Test]
+        public void Test_07_04()
+        {
+        }
+
+        [Test]
+        public void Test_07_05()
+        {
+        }
+
+        [Test]
+        public void Test_07_06()
+        {
+        }
+
+        [Test]
+        public void Test_07_07()
+        {
+        }
+
+        [Test]
+        public void Test_07_08()
+        {
+        }
+
+        [Test]
+        public void Test_07_09()
+        {
+        }
+
+        [Test]
+        public void Test_07_10()
+        {
+        }
+
+        [Test]
+        public void Test_07_11()
+        {
+        }
+
+        [Test]
+        public void Test_07_12()
+        {
+        }
+
+        [Test]
+        public void Test_07_13()
+        {
+        }
+
+        [Test]
+        public void Test_07_14()
+        {
+        }
+
+        [Test]
+        public void Test_07_15()
+        {
+        }
+
+        [Test]
+        public void Test_07_16()
+        {
+        }
+
+        [Test]
+        public void Test_07_17()
+        {
+        }
+
+        [Test]
+        public void Test_07_18()
+        {
+        }
+
+        [Test]
+        public void Test_07_19()
+        {
+        }
+
+        [Test]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_08
+    {
+        #region PassingTests
+        [Test]
+        public void Test_08_01()
+        {
+        }
+
+        [Test]
+        public void Test_08_02()
+        {
+        }
+
+        [Test]
+        public void Test_08_03()
+        {
+        }
+
+        [Test]
+        public void Test_08_04()
+        {
+        }
+
+        [Test]
+        public void Test_08_05()
+        {
+        }
+
+        [Test]
+        public void Test_08_06()
+        {
+        }
+
+        [Test]
+        public void Test_08_07()
+        {
+        }
+
+        [Test]
+        public void Test_08_08()
+        {
+        }
+
+        [Test]
+        public void Test_08_09()
+        {
+        }
+
+        [Test]
+        public void Test_08_10()
+        {
+        }
+
+        [Test]
+        public void Test_08_11()
+        {
+        }
+
+        [Test]
+        public void Test_08_12()
+        {
+        }
+
+        [Test]
+        public void Test_08_13()
+        {
+        }
+
+        [Test]
+        public void Test_08_14()
+        {
+        }
+
+        [Test]
+        public void Test_08_15()
+        {
+        }
+
+        [Test]
+        public void Test_08_16()
+        {
+        }
+
+        [Test]
+        public void Test_08_17()
+        {
+        }
+
+        [Test]
+        public void Test_08_18()
+        {
+        }
+
+        [Test]
+        public void Test_08_19()
+        {
+        }
+
+        [Test]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_09
+    {
+        #region PassingTests
+        [Test]
+        public void Test_09_01()
+        {
+        }
+
+        [Test]
+        public void Test_09_02()
+        {
+        }
+
+        [Test]
+        public void Test_09_03()
+        {
+        }
+
+        [Test]
+        public void Test_09_04()
+        {
+        }
+
+        [Test]
+        public void Test_09_05()
+        {
+        }
+
+        [Test]
+        public void Test_09_06()
+        {
+        }
+
+        [Test]
+        public void Test_09_07()
+        {
+        }
+
+        [Test]
+        public void Test_09_08()
+        {
+        }
+
+        [Test]
+        public void Test_09_09()
+        {
+        }
+
+        [Test]
+        public void Test_09_10()
+        {
+        }
+
+        [Test]
+        public void Test_09_11()
+        {
+        }
+
+        [Test]
+        public void Test_09_12()
+        {
+        }
+
+        [Test]
+        public void Test_09_13()
+        {
+        }
+
+        [Test]
+        public void Test_09_14()
+        {
+        }
+
+        [Test]
+        public void Test_09_15()
+        {
+        }
+
+        [Test]
+        public void Test_09_16()
+        {
+        }
+
+        [Test]
+        public void Test_09_17()
+        {
+        }
+
+        [Test]
+        public void Test_09_18()
+        {
+        }
+
+        [Test]
+        public void Test_09_19()
+        {
+        }
+
+        [Test]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_10
+    {
+        #region PassingTests
+        [Test]
+        public void Test_10_01()
+        {
+        }
+
+        [Test]
+        public void Test_10_02()
+        {
+        }
+
+        [Test]
+        public void Test_10_03()
+        {
+        }
+
+        [Test]
+        public void Test_10_04()
+        {
+        }
+
+        [Test]
+        public void Test_10_05()
+        {
+        }
+
+        [Test]
+        public void Test_10_06()
+        {
+        }
+
+        [Test]
+        public void Test_10_07()
+        {
+        }
+
+        [Test]
+        public void Test_10_08()
+        {
+        }
+
+        [Test]
+        public void Test_10_09()
+        {
+        }
+
+        [Test]
+        public void Test_10_10()
+        {
+        }
+
+        [Test]
+        public void Test_10_11()
+        {
+        }
+
+        [Test]
+        public void Test_10_12()
+        {
+        }
+
+        [Test]
+        public void Test_10_13()
+        {
+        }
+
+        [Test]
+        public void Test_10_14()
+        {
+        }
+
+        [Test]
+        public void Test_10_15()
+        {
+        }
+
+        [Test]
+        public void Test_10_16()
+        {
+        }
+
+        [Test]
+        public void Test_10_17()
+        {
+        }
+
+        [Test]
+        public void Test_10_18()
+        {
+        }
+
+        [Test]
+        public void Test_10_19()
+        {
+        }
+
+        [Test]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_11
+    {
+        #region PassingTests
+        [Test]
+        public void Test_11_01()
+        {
+        }
+
+        [Test]
+        public void Test_11_02()
+        {
+        }
+
+        [Test]
+        public void Test_11_03()
+        {
+        }
+
+        [Test]
+        public void Test_11_04()
+        {
+        }
+
+        [Test]
+        public void Test_11_05()
+        {
+        }
+
+        [Test]
+        public void Test_11_06()
+        {
+        }
+
+        [Test]
+        public void Test_11_07()
+        {
+        }
+
+        [Test]
+        public void Test_11_08()
+        {
+        }
+
+        [Test]
+        public void Test_11_09()
+        {
+        }
+
+        [Test]
+        public void Test_11_10()
+        {
+        }
+
+        [Test]
+        public void Test_11_11()
+        {
+        }
+
+        [Test]
+        public void Test_11_12()
+        {
+        }
+
+        [Test]
+        public void Test_11_13()
+        {
+        }
+
+        [Test]
+        public void Test_11_14()
+        {
+        }
+
+        [Test]
+        public void Test_11_15()
+        {
+        }
+
+        [Test]
+        public void Test_11_16()
+        {
+        }
+
+        [Test]
+        public void Test_11_17()
+        {
+        }
+
+        [Test]
+        public void Test_11_18()
+        {
+        }
+
+        [Test]
+        public void Test_11_19()
+        {
+        }
+
+        [Test]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_12
+    {
+        #region PassingTests
+        [Test]
+        public void Test_12_01()
+        {
+        }
+
+        [Test]
+        public void Test_12_02()
+        {
+        }
+
+        [Test]
+        public void Test_12_03()
+        {
+        }
+
+        [Test]
+        public void Test_12_04()
+        {
+        }
+
+        [Test]
+        public void Test_12_05()
+        {
+        }
+
+        [Test]
+        public void Test_12_06()
+        {
+        }
+
+        [Test]
+        public void Test_12_07()
+        {
+        }
+
+        [Test]
+        public void Test_12_08()
+        {
+        }
+
+        [Test]
+        public void Test_12_09()
+        {
+        }
+
+        [Test]
+        public void Test_12_10()
+        {
+        }
+
+        [Test]
+        public void Test_12_11()
+        {
+        }
+
+        [Test]
+        public void Test_12_12()
+        {
+        }
+
+        [Test]
+        public void Test_12_13()
+        {
+        }
+
+        [Test]
+        public void Test_12_14()
+        {
+        }
+
+        [Test]
+        public void Test_12_15()
+        {
+        }
+
+        [Test]
+        public void Test_12_16()
+        {
+        }
+
+        [Test]
+        public void Test_12_17()
+        {
+        }
+
+        [Test]
+        public void Test_12_18()
+        {
+        }
+
+        [Test]
+        public void Test_12_19()
+        {
+        }
+
+        [Test]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_13
+    {
+        #region PassingTests
+        [Test]
+        public void Test_13_01()
+        {
+        }
+
+        [Test]
+        public void Test_13_02()
+        {
+        }
+
+        [Test]
+        public void Test_13_03()
+        {
+        }
+
+        [Test]
+        public void Test_13_04()
+        {
+        }
+
+        [Test]
+        public void Test_13_05()
+        {
+        }
+
+        [Test]
+        public void Test_13_06()
+        {
+        }
+
+        [Test]
+        public void Test_13_07()
+        {
+        }
+
+        [Test]
+        public void Test_13_08()
+        {
+        }
+
+        [Test]
+        public void Test_13_09()
+        {
+        }
+
+        [Test]
+        public void Test_13_10()
+        {
+        }
+
+        [Test]
+        public void Test_13_11()
+        {
+        }
+
+        [Test]
+        public void Test_13_12()
+        {
+        }
+
+        [Test]
+        public void Test_13_13()
+        {
+        }
+
+        [Test]
+        public void Test_13_14()
+        {
+        }
+
+        [Test]
+        public void Test_13_15()
+        {
+        }
+
+        [Test]
+        public void Test_13_16()
+        {
+        }
+
+        [Test]
+        public void Test_13_17()
+        {
+        }
+
+        [Test]
+        public void Test_13_18()
+        {
+        }
+
+        [Test]
+        public void Test_13_19()
+        {
+        }
+
+        [Test]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_14
+    {
+        #region PassingTests
+        [Test]
+        public void Test_14_01()
+        {
+        }
+
+        [Test]
+        public void Test_14_02()
+        {
+        }
+
+        [Test]
+        public void Test_14_03()
+        {
+        }
+
+        [Test]
+        public void Test_14_04()
+        {
+        }
+
+        [Test]
+        public void Test_14_05()
+        {
+        }
+
+        [Test]
+        public void Test_14_06()
+        {
+        }
+
+        [Test]
+        public void Test_14_07()
+        {
+        }
+
+        [Test]
+        public void Test_14_08()
+        {
+        }
+
+        [Test]
+        public void Test_14_09()
+        {
+        }
+
+        [Test]
+        public void Test_14_10()
+        {
+        }
+
+        [Test]
+        public void Test_14_11()
+        {
+        }
+
+        [Test]
+        public void Test_14_12()
+        {
+        }
+
+        [Test]
+        public void Test_14_13()
+        {
+        }
+
+        [Test]
+        public void Test_14_14()
+        {
+        }
+
+        [Test]
+        public void Test_14_15()
+        {
+        }
+
+        [Test]
+        public void Test_14_16()
+        {
+        }
+
+        [Test]
+        public void Test_14_17()
+        {
+        }
+
+        [Test]
+        public void Test_14_18()
+        {
+        }
+
+        [Test]
+        public void Test_14_19()
+        {
+        }
+
+        [Test]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_15
+    {
+        #region PassingTests
+        [Test]
+        public void Test_15_01()
+        {
+        }
+
+        [Test]
+        public void Test_15_02()
+        {
+        }
+
+        [Test]
+        public void Test_15_03()
+        {
+        }
+
+        [Test]
+        public void Test_15_04()
+        {
+        }
+
+        [Test]
+        public void Test_15_05()
+        {
+        }
+
+        [Test]
+        public void Test_15_06()
+        {
+        }
+
+        [Test]
+        public void Test_15_07()
+        {
+        }
+
+        [Test]
+        public void Test_15_08()
+        {
+        }
+
+        [Test]
+        public void Test_15_09()
+        {
+        }
+
+        [Test]
+        public void Test_15_10()
+        {
+        }
+
+        [Test]
+        public void Test_15_11()
+        {
+        }
+
+        [Test]
+        public void Test_15_12()
+        {
+        }
+
+        [Test]
+        public void Test_15_13()
+        {
+        }
+
+        [Test]
+        public void Test_15_14()
+        {
+        }
+
+        [Test]
+        public void Test_15_15()
+        {
+        }
+
+        [Test]
+        public void Test_15_16()
+        {
+        }
+
+        [Test]
+        public void Test_15_17()
+        {
+        }
+
+        [Test]
+        public void Test_15_18()
+        {
+        }
+
+        [Test]
+        public void Test_15_19()
+        {
+        }
+
+        [Test]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_16
+    {
+        #region PassingTests
+        [Test]
+        public void Test_16_01()
+        {
+        }
+
+        [Test]
+        public void Test_16_02()
+        {
+        }
+
+        [Test]
+        public void Test_16_03()
+        {
+        }
+
+        [Test]
+        public void Test_16_04()
+        {
+        }
+
+        [Test]
+        public void Test_16_05()
+        {
+        }
+
+        [Test]
+        public void Test_16_06()
+        {
+        }
+
+        [Test]
+        public void Test_16_07()
+        {
+        }
+
+        [Test]
+        public void Test_16_08()
+        {
+        }
+
+        [Test]
+        public void Test_16_09()
+        {
+        }
+
+        [Test]
+        public void Test_16_10()
+        {
+        }
+
+        [Test]
+        public void Test_16_11()
+        {
+        }
+
+        [Test]
+        public void Test_16_12()
+        {
+        }
+
+        [Test]
+        public void Test_16_13()
+        {
+        }
+
+        [Test]
+        public void Test_16_14()
+        {
+        }
+
+        [Test]
+        public void Test_16_15()
+        {
+        }
+
+        [Test]
+        public void Test_16_16()
+        {
+        }
+
+        [Test]
+        public void Test_16_17()
+        {
+        }
+
+        [Test]
+        public void Test_16_18()
+        {
+        }
+
+        [Test]
+        public void Test_16_19()
+        {
+        }
+
+        [Test]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_17
+    {
+        #region PassingTests
+        [Test]
+        public void Test_17_01()
+        {
+        }
+
+        [Test]
+        public void Test_17_02()
+        {
+        }
+
+        [Test]
+        public void Test_17_03()
+        {
+        }
+
+        [Test]
+        public void Test_17_04()
+        {
+        }
+
+        [Test]
+        public void Test_17_05()
+        {
+        }
+
+        [Test]
+        public void Test_17_06()
+        {
+        }
+
+        [Test]
+        public void Test_17_07()
+        {
+        }
+
+        [Test]
+        public void Test_17_08()
+        {
+        }
+
+        [Test]
+        public void Test_17_09()
+        {
+        }
+
+        [Test]
+        public void Test_17_10()
+        {
+        }
+
+        [Test]
+        public void Test_17_11()
+        {
+        }
+
+        [Test]
+        public void Test_17_12()
+        {
+        }
+
+        [Test]
+        public void Test_17_13()
+        {
+        }
+
+        [Test]
+        public void Test_17_14()
+        {
+        }
+
+        [Test]
+        public void Test_17_15()
+        {
+        }
+
+        [Test]
+        public void Test_17_16()
+        {
+        }
+
+        [Test]
+        public void Test_17_17()
+        {
+        }
+
+        [Test]
+        public void Test_17_18()
+        {
+        }
+
+        [Test]
+        public void Test_17_19()
+        {
+        }
+
+        [Test]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_18
+    {
+        #region PassingTests
+        [Test]
+        public void Test_18_01()
+        {
+        }
+
+        [Test]
+        public void Test_18_02()
+        {
+        }
+
+        [Test]
+        public void Test_18_03()
+        {
+        }
+
+        [Test]
+        public void Test_18_04()
+        {
+        }
+
+        [Test]
+        public void Test_18_05()
+        {
+        }
+
+        [Test]
+        public void Test_18_06()
+        {
+        }
+
+        [Test]
+        public void Test_18_07()
+        {
+        }
+
+        [Test]
+        public void Test_18_08()
+        {
+        }
+
+        [Test]
+        public void Test_18_09()
+        {
+        }
+
+        [Test]
+        public void Test_18_10()
+        {
+        }
+
+        [Test]
+        public void Test_18_11()
+        {
+        }
+
+        [Test]
+        public void Test_18_12()
+        {
+        }
+
+        [Test]
+        public void Test_18_13()
+        {
+        }
+
+        [Test]
+        public void Test_18_14()
+        {
+        }
+
+        [Test]
+        public void Test_18_15()
+        {
+        }
+
+        [Test]
+        public void Test_18_16()
+        {
+        }
+
+        [Test]
+        public void Test_18_17()
+        {
+        }
+
+        [Test]
+        public void Test_18_18()
+        {
+        }
+
+        [Test]
+        public void Test_18_19()
+        {
+        }
+
+        [Test]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_19
+    {
+        #region PassingTests
+        [Test]
+        public void Test_19_01()
+        {
+        }
+
+        [Test]
+        public void Test_19_02()
+        {
+        }
+
+        [Test]
+        public void Test_19_03()
+        {
+        }
+
+        [Test]
+        public void Test_19_04()
+        {
+        }
+
+        [Test]
+        public void Test_19_05()
+        {
+        }
+
+        [Test]
+        public void Test_19_06()
+        {
+        }
+
+        [Test]
+        public void Test_19_07()
+        {
+        }
+
+        [Test]
+        public void Test_19_08()
+        {
+        }
+
+        [Test]
+        public void Test_19_09()
+        {
+        }
+
+        [Test]
+        public void Test_19_10()
+        {
+        }
+
+        [Test]
+        public void Test_19_11()
+        {
+        }
+
+        [Test]
+        public void Test_19_12()
+        {
+        }
+
+        [Test]
+        public void Test_19_13()
+        {
+        }
+
+        [Test]
+        public void Test_19_14()
+        {
+        }
+
+        [Test]
+        public void Test_19_15()
+        {
+        }
+
+        [Test]
+        public void Test_19_16()
+        {
+        }
+
+        [Test]
+        public void Test_19_17()
+        {
+        }
+
+        [Test]
+        public void Test_19_18()
+        {
+        }
+
+        [Test]
+        public void Test_19_19()
+        {
+        }
+
+        [Test]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_20
+    {
+        #region PassingTests
+        [Test]
+        public void Test_20_01()
+        {
+        }
+
+        [Test]
+        public void Test_20_02()
+        {
+        }
+
+        [Test]
+        public void Test_20_03()
+        {
+        }
+
+        [Test]
+        public void Test_20_04()
+        {
+        }
+
+        [Test]
+        public void Test_20_05()
+        {
+        }
+
+        [Test]
+        public void Test_20_06()
+        {
+        }
+
+        [Test]
+        public void Test_20_07()
+        {
+        }
+
+        [Test]
+        public void Test_20_08()
+        {
+        }
+
+        [Test]
+        public void Test_20_09()
+        {
+        }
+
+        [Test]
+        public void Test_20_10()
+        {
+        }
+
+        [Test]
+        public void Test_20_11()
+        {
+        }
+
+        [Test]
+        public void Test_20_12()
+        {
+        }
+
+        [Test]
+        public void Test_20_13()
+        {
+        }
+
+        [Test]
+        public void Test_20_14()
+        {
+        }
+
+        [Test]
+        public void Test_20_15()
+        {
+        }
+
+        [Test]
+        public void Test_20_16()
+        {
+        }
+
+        [Test]
+        public void Test_20_17()
+        {
+        }
+
+        [Test]
+        public void Test_20_18()
+        {
+        }
+
+        [Test]
+        public void Test_20_19()
+        {
+        }
+
+        [Test]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_21
+    {
+        #region PassingTests
+        [Test]
+        public void Test_21_01()
+        {
+        }
+
+        [Test]
+        public void Test_21_02()
+        {
+        }
+
+        [Test]
+        public void Test_21_03()
+        {
+        }
+
+        [Test]
+        public void Test_21_04()
+        {
+        }
+
+        [Test]
+        public void Test_21_05()
+        {
+        }
+
+        [Test]
+        public void Test_21_06()
+        {
+        }
+
+        [Test]
+        public void Test_21_07()
+        {
+        }
+
+        [Test]
+        public void Test_21_08()
+        {
+        }
+
+        [Test]
+        public void Test_21_09()
+        {
+        }
+
+        [Test]
+        public void Test_21_10()
+        {
+        }
+
+        [Test]
+        public void Test_21_11()
+        {
+        }
+
+        [Test]
+        public void Test_21_12()
+        {
+        }
+
+        [Test]
+        public void Test_21_13()
+        {
+        }
+
+        [Test]
+        public void Test_21_14()
+        {
+        }
+
+        [Test]
+        public void Test_21_15()
+        {
+        }
+
+        [Test]
+        public void Test_21_16()
+        {
+        }
+
+        [Test]
+        public void Test_21_17()
+        {
+        }
+
+        [Test]
+        public void Test_21_18()
+        {
+        }
+
+        [Test]
+        public void Test_21_19()
+        {
+        }
+
+        [Test]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_22
+    {
+        #region PassingTests
+        [Test]
+        public void Test_22_01()
+        {
+        }
+
+        [Test]
+        public void Test_22_02()
+        {
+        }
+
+        [Test]
+        public void Test_22_03()
+        {
+        }
+
+        [Test]
+        public void Test_22_04()
+        {
+        }
+
+        [Test]
+        public void Test_22_05()
+        {
+        }
+
+        [Test]
+        public void Test_22_06()
+        {
+        }
+
+        [Test]
+        public void Test_22_07()
+        {
+        }
+
+        [Test]
+        public void Test_22_08()
+        {
+        }
+
+        [Test]
+        public void Test_22_09()
+        {
+        }
+
+        [Test]
+        public void Test_22_10()
+        {
+        }
+
+        [Test]
+        public void Test_22_11()
+        {
+        }
+
+        [Test]
+        public void Test_22_12()
+        {
+        }
+
+        [Test]
+        public void Test_22_13()
+        {
+        }
+
+        [Test]
+        public void Test_22_14()
+        {
+        }
+
+        [Test]
+        public void Test_22_15()
+        {
+        }
+
+        [Test]
+        public void Test_22_16()
+        {
+        }
+
+        [Test]
+        public void Test_22_17()
+        {
+        }
+
+        [Test]
+        public void Test_22_18()
+        {
+        }
+
+        [Test]
+        public void Test_22_19()
+        {
+        }
+
+        [Test]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_23
+    {
+        #region PassingTests
+        [Test]
+        public void Test_23_01()
+        {
+        }
+
+        [Test]
+        public void Test_23_02()
+        {
+        }
+
+        [Test]
+        public void Test_23_03()
+        {
+        }
+
+        [Test]
+        public void Test_23_04()
+        {
+        }
+
+        [Test]
+        public void Test_23_05()
+        {
+        }
+
+        [Test]
+        public void Test_23_06()
+        {
+        }
+
+        [Test]
+        public void Test_23_07()
+        {
+        }
+
+        [Test]
+        public void Test_23_08()
+        {
+        }
+
+        [Test]
+        public void Test_23_09()
+        {
+        }
+
+        [Test]
+        public void Test_23_10()
+        {
+        }
+
+        [Test]
+        public void Test_23_11()
+        {
+        }
+
+        [Test]
+        public void Test_23_12()
+        {
+        }
+
+        [Test]
+        public void Test_23_13()
+        {
+        }
+
+        [Test]
+        public void Test_23_14()
+        {
+        }
+
+        [Test]
+        public void Test_23_15()
+        {
+        }
+
+        [Test]
+        public void Test_23_16()
+        {
+        }
+
+        [Test]
+        public void Test_23_17()
+        {
+        }
+
+        [Test]
+        public void Test_23_18()
+        {
+        }
+
+        [Test]
+        public void Test_23_19()
+        {
+        }
+
+        [Test]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_24
+    {
+        #region PassingTests
+        [Test]
+        public void Test_24_01()
+        {
+        }
+
+        [Test]
+        public void Test_24_02()
+        {
+        }
+
+        [Test]
+        public void Test_24_03()
+        {
+        }
+
+        [Test]
+        public void Test_24_04()
+        {
+        }
+
+        [Test]
+        public void Test_24_05()
+        {
+        }
+
+        [Test]
+        public void Test_24_06()
+        {
+        }
+
+        [Test]
+        public void Test_24_07()
+        {
+        }
+
+        [Test]
+        public void Test_24_08()
+        {
+        }
+
+        [Test]
+        public void Test_24_09()
+        {
+        }
+
+        [Test]
+        public void Test_24_10()
+        {
+        }
+
+        [Test]
+        public void Test_24_11()
+        {
+        }
+
+        [Test]
+        public void Test_24_12()
+        {
+        }
+
+        [Test]
+        public void Test_24_13()
+        {
+        }
+
+        [Test]
+        public void Test_24_14()
+        {
+        }
+
+        [Test]
+        public void Test_24_15()
+        {
+        }
+
+        [Test]
+        public void Test_24_16()
+        {
+        }
+
+        [Test]
+        public void Test_24_17()
+        {
+        }
+
+        [Test]
+        public void Test_24_18()
+        {
+        }
+
+        [Test]
+        public void Test_24_19()
+        {
+        }
+
+        [Test]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_25
+    {
+        #region PassingTests
+        [Test]
+        public void Test_25_01()
+        {
+        }
+
+        [Test]
+        public void Test_25_02()
+        {
+        }
+
+        [Test]
+        public void Test_25_03()
+        {
+        }
+
+        [Test]
+        public void Test_25_04()
+        {
+        }
+
+        [Test]
+        public void Test_25_05()
+        {
+        }
+
+        [Test]
+        public void Test_25_06()
+        {
+        }
+
+        [Test]
+        public void Test_25_07()
+        {
+        }
+
+        [Test]
+        public void Test_25_08()
+        {
+        }
+
+        [Test]
+        public void Test_25_09()
+        {
+        }
+
+        [Test]
+        public void Test_25_10()
+        {
+        }
+
+        [Test]
+        public void Test_25_11()
+        {
+        }
+
+        [Test]
+        public void Test_25_12()
+        {
+        }
+
+        [Test]
+        public void Test_25_13()
+        {
+        }
+
+        [Test]
+        public void Test_25_14()
+        {
+        }
+
+        [Test]
+        public void Test_25_15()
+        {
+        }
+
+        [Test]
+        public void Test_25_16()
+        {
+        }
+
+        [Test]
+        public void Test_25_17()
+        {
+        }
+
+        [Test]
+        public void Test_25_18()
+        {
+        }
+
+        [Test]
+        public void Test_25_19()
+        {
+        }
+
+        [Test]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_26
+    {
+        #region PassingTests
+        [Test]
+        public void Test_26_01()
+        {
+        }
+
+        [Test]
+        public void Test_26_02()
+        {
+        }
+
+        [Test]
+        public void Test_26_03()
+        {
+        }
+
+        [Test]
+        public void Test_26_04()
+        {
+        }
+
+        [Test]
+        public void Test_26_05()
+        {
+        }
+
+        [Test]
+        public void Test_26_06()
+        {
+        }
+
+        [Test]
+        public void Test_26_07()
+        {
+        }
+
+        [Test]
+        public void Test_26_08()
+        {
+        }
+
+        [Test]
+        public void Test_26_09()
+        {
+        }
+
+        [Test]
+        public void Test_26_10()
+        {
+        }
+
+        [Test]
+        public void Test_26_11()
+        {
+        }
+
+        [Test]
+        public void Test_26_12()
+        {
+        }
+
+        [Test]
+        public void Test_26_13()
+        {
+        }
+
+        [Test]
+        public void Test_26_14()
+        {
+        }
+
+        [Test]
+        public void Test_26_15()
+        {
+        }
+
+        [Test]
+        public void Test_26_16()
+        {
+        }
+
+        [Test]
+        public void Test_26_17()
+        {
+        }
+
+        [Test]
+        public void Test_26_18()
+        {
+        }
+
+        [Test]
+        public void Test_26_19()
+        {
+        }
+
+        [Test]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_27
+    {
+        #region PassingTests
+        [Test]
+        public void Test_27_01()
+        {
+        }
+
+        [Test]
+        public void Test_27_02()
+        {
+        }
+
+        [Test]
+        public void Test_27_03()
+        {
+        }
+
+        [Test]
+        public void Test_27_04()
+        {
+        }
+
+        [Test]
+        public void Test_27_05()
+        {
+        }
+
+        [Test]
+        public void Test_27_06()
+        {
+        }
+
+        [Test]
+        public void Test_27_07()
+        {
+        }
+
+        [Test]
+        public void Test_27_08()
+        {
+        }
+
+        [Test]
+        public void Test_27_09()
+        {
+        }
+
+        [Test]
+        public void Test_27_10()
+        {
+        }
+
+        [Test]
+        public void Test_27_11()
+        {
+        }
+
+        [Test]
+        public void Test_27_12()
+        {
+        }
+
+        [Test]
+        public void Test_27_13()
+        {
+        }
+
+        [Test]
+        public void Test_27_14()
+        {
+        }
+
+        [Test]
+        public void Test_27_15()
+        {
+        }
+
+        [Test]
+        public void Test_27_16()
+        {
+        }
+
+        [Test]
+        public void Test_27_17()
+        {
+        }
+
+        [Test]
+        public void Test_27_18()
+        {
+        }
+
+        [Test]
+        public void Test_27_19()
+        {
+        }
+
+        [Test]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_28
+    {
+        #region PassingTests
+        [Test]
+        public void Test_28_01()
+        {
+        }
+
+        [Test]
+        public void Test_28_02()
+        {
+        }
+
+        [Test]
+        public void Test_28_03()
+        {
+        }
+
+        [Test]
+        public void Test_28_04()
+        {
+        }
+
+        [Test]
+        public void Test_28_05()
+        {
+        }
+
+        [Test]
+        public void Test_28_06()
+        {
+        }
+
+        [Test]
+        public void Test_28_07()
+        {
+        }
+
+        [Test]
+        public void Test_28_08()
+        {
+        }
+
+        [Test]
+        public void Test_28_09()
+        {
+        }
+
+        [Test]
+        public void Test_28_10()
+        {
+        }
+
+        [Test]
+        public void Test_28_11()
+        {
+        }
+
+        [Test]
+        public void Test_28_12()
+        {
+        }
+
+        [Test]
+        public void Test_28_13()
+        {
+        }
+
+        [Test]
+        public void Test_28_14()
+        {
+        }
+
+        [Test]
+        public void Test_28_15()
+        {
+        }
+
+        [Test]
+        public void Test_28_16()
+        {
+        }
+
+        [Test]
+        public void Test_28_17()
+        {
+        }
+
+        [Test]
+        public void Test_28_18()
+        {
+        }
+
+        [Test]
+        public void Test_28_19()
+        {
+        }
+
+        [Test]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_29
+    {
+        #region PassingTests
+        [Test]
+        public void Test_29_01()
+        {
+        }
+
+        [Test]
+        public void Test_29_02()
+        {
+        }
+
+        [Test]
+        public void Test_29_03()
+        {
+        }
+
+        [Test]
+        public void Test_29_04()
+        {
+        }
+
+        [Test]
+        public void Test_29_05()
+        {
+        }
+
+        [Test]
+        public void Test_29_06()
+        {
+        }
+
+        [Test]
+        public void Test_29_07()
+        {
+        }
+
+        [Test]
+        public void Test_29_08()
+        {
+        }
+
+        [Test]
+        public void Test_29_09()
+        {
+        }
+
+        [Test]
+        public void Test_29_10()
+        {
+        }
+
+        [Test]
+        public void Test_29_11()
+        {
+        }
+
+        [Test]
+        public void Test_29_12()
+        {
+        }
+
+        [Test]
+        public void Test_29_13()
+        {
+        }
+
+        [Test]
+        public void Test_29_14()
+        {
+        }
+
+        [Test]
+        public void Test_29_15()
+        {
+        }
+
+        [Test]
+        public void Test_29_16()
+        {
+        }
+
+        [Test]
+        public void Test_29_17()
+        {
+        }
+
+        [Test]
+        public void Test_29_18()
+        {
+        }
+
+        [Test]
+        public void Test_29_19()
+        {
+        }
+
+        [Test]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_30
+    {
+        #region PassingTests
+        [Test]
+        public void Test_30_01()
+        {
+        }
+
+        [Test]
+        public void Test_30_02()
+        {
+        }
+
+        [Test]
+        public void Test_30_03()
+        {
+        }
+
+        [Test]
+        public void Test_30_04()
+        {
+        }
+
+        [Test]
+        public void Test_30_05()
+        {
+        }
+
+        [Test]
+        public void Test_30_06()
+        {
+        }
+
+        [Test]
+        public void Test_30_07()
+        {
+        }
+
+        [Test]
+        public void Test_30_08()
+        {
+        }
+
+        [Test]
+        public void Test_30_09()
+        {
+        }
+
+        [Test]
+        public void Test_30_10()
+        {
+        }
+
+        [Test]
+        public void Test_30_11()
+        {
+        }
+
+        [Test]
+        public void Test_30_12()
+        {
+        }
+
+        [Test]
+        public void Test_30_13()
+        {
+        }
+
+        [Test]
+        public void Test_30_14()
+        {
+        }
+
+        [Test]
+        public void Test_30_15()
+        {
+        }
+
+        [Test]
+        public void Test_30_16()
+        {
+        }
+
+        [Test]
+        public void Test_30_17()
+        {
+        }
+
+        [Test]
+        public void Test_30_18()
+        {
+        }
+
+        [Test]
+        public void Test_30_19()
+        {
+        }
+
+        [Test]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_31
+    {
+        #region PassingTests
+        [Test]
+        public void Test_31_01()
+        {
+        }
+
+        [Test]
+        public void Test_31_02()
+        {
+        }
+
+        [Test]
+        public void Test_31_03()
+        {
+        }
+
+        [Test]
+        public void Test_31_04()
+        {
+        }
+
+        [Test]
+        public void Test_31_05()
+        {
+        }
+
+        [Test]
+        public void Test_31_06()
+        {
+        }
+
+        [Test]
+        public void Test_31_07()
+        {
+        }
+
+        [Test]
+        public void Test_31_08()
+        {
+        }
+
+        [Test]
+        public void Test_31_09()
+        {
+        }
+
+        [Test]
+        public void Test_31_10()
+        {
+        }
+
+        [Test]
+        public void Test_31_11()
+        {
+        }
+
+        [Test]
+        public void Test_31_12()
+        {
+        }
+
+        [Test]
+        public void Test_31_13()
+        {
+        }
+
+        [Test]
+        public void Test_31_14()
+        {
+        }
+
+        [Test]
+        public void Test_31_15()
+        {
+        }
+
+        [Test]
+        public void Test_31_16()
+        {
+        }
+
+        [Test]
+        public void Test_31_17()
+        {
+        }
+
+        [Test]
+        public void Test_31_18()
+        {
+        }
+
+        [Test]
+        public void Test_31_19()
+        {
+        }
+
+        [Test]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_32
+    {
+        #region PassingTests
+        [Test]
+        public void Test_32_01()
+        {
+        }
+
+        [Test]
+        public void Test_32_02()
+        {
+        }
+
+        [Test]
+        public void Test_32_03()
+        {
+        }
+
+        [Test]
+        public void Test_32_04()
+        {
+        }
+
+        [Test]
+        public void Test_32_05()
+        {
+        }
+
+        [Test]
+        public void Test_32_06()
+        {
+        }
+
+        [Test]
+        public void Test_32_07()
+        {
+        }
+
+        [Test]
+        public void Test_32_08()
+        {
+        }
+
+        [Test]
+        public void Test_32_09()
+        {
+        }
+
+        [Test]
+        public void Test_32_10()
+        {
+        }
+
+        [Test]
+        public void Test_32_11()
+        {
+        }
+
+        [Test]
+        public void Test_32_12()
+        {
+        }
+
+        [Test]
+        public void Test_32_13()
+        {
+        }
+
+        [Test]
+        public void Test_32_14()
+        {
+        }
+
+        [Test]
+        public void Test_32_15()
+        {
+        }
+
+        [Test]
+        public void Test_32_16()
+        {
+        }
+
+        [Test]
+        public void Test_32_17()
+        {
+        }
+
+        [Test]
+        public void Test_32_18()
+        {
+        }
+
+        [Test]
+        public void Test_32_19()
+        {
+        }
+
+        [Test]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_33
+    {
+        #region PassingTests
+        [Test]
+        public void Test_33_01()
+        {
+        }
+
+        [Test]
+        public void Test_33_02()
+        {
+        }
+
+        [Test]
+        public void Test_33_03()
+        {
+        }
+
+        [Test]
+        public void Test_33_04()
+        {
+        }
+
+        [Test]
+        public void Test_33_05()
+        {
+        }
+
+        [Test]
+        public void Test_33_06()
+        {
+        }
+
+        [Test]
+        public void Test_33_07()
+        {
+        }
+
+        [Test]
+        public void Test_33_08()
+        {
+        }
+
+        [Test]
+        public void Test_33_09()
+        {
+        }
+
+        [Test]
+        public void Test_33_10()
+        {
+        }
+
+        [Test]
+        public void Test_33_11()
+        {
+        }
+
+        [Test]
+        public void Test_33_12()
+        {
+        }
+
+        [Test]
+        public void Test_33_13()
+        {
+        }
+
+        [Test]
+        public void Test_33_14()
+        {
+        }
+
+        [Test]
+        public void Test_33_15()
+        {
+        }
+
+        [Test]
+        public void Test_33_16()
+        {
+        }
+
+        [Test]
+        public void Test_33_17()
+        {
+        }
+
+        [Test]
+        public void Test_33_18()
+        {
+        }
+
+        [Test]
+        public void Test_33_19()
+        {
+        }
+
+        [Test]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_34
+    {
+        #region PassingTests
+        [Test]
+        public void Test_34_01()
+        {
+        }
+
+        [Test]
+        public void Test_34_02()
+        {
+        }
+
+        [Test]
+        public void Test_34_03()
+        {
+        }
+
+        [Test]
+        public void Test_34_04()
+        {
+        }
+
+        [Test]
+        public void Test_34_05()
+        {
+        }
+
+        [Test]
+        public void Test_34_06()
+        {
+        }
+
+        [Test]
+        public void Test_34_07()
+        {
+        }
+
+        [Test]
+        public void Test_34_08()
+        {
+        }
+
+        [Test]
+        public void Test_34_09()
+        {
+        }
+
+        [Test]
+        public void Test_34_10()
+        {
+        }
+
+        [Test]
+        public void Test_34_11()
+        {
+        }
+
+        [Test]
+        public void Test_34_12()
+        {
+        }
+
+        [Test]
+        public void Test_34_13()
+        {
+        }
+
+        [Test]
+        public void Test_34_14()
+        {
+        }
+
+        [Test]
+        public void Test_34_15()
+        {
+        }
+
+        [Test]
+        public void Test_34_16()
+        {
+        }
+
+        [Test]
+        public void Test_34_17()
+        {
+        }
+
+        [Test]
+        public void Test_34_18()
+        {
+        }
+
+        [Test]
+        public void Test_34_19()
+        {
+        }
+
+        [Test]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_35
+    {
+        #region PassingTests
+        [Test]
+        public void Test_35_01()
+        {
+        }
+
+        [Test]
+        public void Test_35_02()
+        {
+        }
+
+        [Test]
+        public void Test_35_03()
+        {
+        }
+
+        [Test]
+        public void Test_35_04()
+        {
+        }
+
+        [Test]
+        public void Test_35_05()
+        {
+        }
+
+        [Test]
+        public void Test_35_06()
+        {
+        }
+
+        [Test]
+        public void Test_35_07()
+        {
+        }
+
+        [Test]
+        public void Test_35_08()
+        {
+        }
+
+        [Test]
+        public void Test_35_09()
+        {
+        }
+
+        [Test]
+        public void Test_35_10()
+        {
+        }
+
+        [Test]
+        public void Test_35_11()
+        {
+        }
+
+        [Test]
+        public void Test_35_12()
+        {
+        }
+
+        [Test]
+        public void Test_35_13()
+        {
+        }
+
+        [Test]
+        public void Test_35_14()
+        {
+        }
+
+        [Test]
+        public void Test_35_15()
+        {
+        }
+
+        [Test]
+        public void Test_35_16()
+        {
+        }
+
+        [Test]
+        public void Test_35_17()
+        {
+        }
+
+        [Test]
+        public void Test_35_18()
+        {
+        }
+
+        [Test]
+        public void Test_35_19()
+        {
+        }
+
+        [Test]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_36
+    {
+        #region PassingTests
+        [Test]
+        public void Test_36_01()
+        {
+        }
+
+        [Test]
+        public void Test_36_02()
+        {
+        }
+
+        [Test]
+        public void Test_36_03()
+        {
+        }
+
+        [Test]
+        public void Test_36_04()
+        {
+        }
+
+        [Test]
+        public void Test_36_05()
+        {
+        }
+
+        [Test]
+        public void Test_36_06()
+        {
+        }
+
+        [Test]
+        public void Test_36_07()
+        {
+        }
+
+        [Test]
+        public void Test_36_08()
+        {
+        }
+
+        [Test]
+        public void Test_36_09()
+        {
+        }
+
+        [Test]
+        public void Test_36_10()
+        {
+        }
+
+        [Test]
+        public void Test_36_11()
+        {
+        }
+
+        [Test]
+        public void Test_36_12()
+        {
+        }
+
+        [Test]
+        public void Test_36_13()
+        {
+        }
+
+        [Test]
+        public void Test_36_14()
+        {
+        }
+
+        [Test]
+        public void Test_36_15()
+        {
+        }
+
+        [Test]
+        public void Test_36_16()
+        {
+        }
+
+        [Test]
+        public void Test_36_17()
+        {
+        }
+
+        [Test]
+        public void Test_36_18()
+        {
+        }
+
+        [Test]
+        public void Test_36_19()
+        {
+        }
+
+        [Test]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_37
+    {
+        #region PassingTests
+        [Test]
+        public void Test_37_01()
+        {
+        }
+
+        [Test]
+        public void Test_37_02()
+        {
+        }
+
+        [Test]
+        public void Test_37_03()
+        {
+        }
+
+        [Test]
+        public void Test_37_04()
+        {
+        }
+
+        [Test]
+        public void Test_37_05()
+        {
+        }
+
+        [Test]
+        public void Test_37_06()
+        {
+        }
+
+        [Test]
+        public void Test_37_07()
+        {
+        }
+
+        [Test]
+        public void Test_37_08()
+        {
+        }
+
+        [Test]
+        public void Test_37_09()
+        {
+        }
+
+        [Test]
+        public void Test_37_10()
+        {
+        }
+
+        [Test]
+        public void Test_37_11()
+        {
+        }
+
+        [Test]
+        public void Test_37_12()
+        {
+        }
+
+        [Test]
+        public void Test_37_13()
+        {
+        }
+
+        [Test]
+        public void Test_37_14()
+        {
+        }
+
+        [Test]
+        public void Test_37_15()
+        {
+        }
+
+        [Test]
+        public void Test_37_16()
+        {
+        }
+
+        [Test]
+        public void Test_37_17()
+        {
+        }
+
+        [Test]
+        public void Test_37_18()
+        {
+        }
+
+        [Test]
+        public void Test_37_19()
+        {
+        }
+
+        [Test]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_38
+    {
+        #region PassingTests
+        [Test]
+        public void Test_38_01()
+        {
+        }
+
+        [Test]
+        public void Test_38_02()
+        {
+        }
+
+        [Test]
+        public void Test_38_03()
+        {
+        }
+
+        [Test]
+        public void Test_38_04()
+        {
+        }
+
+        [Test]
+        public void Test_38_05()
+        {
+        }
+
+        [Test]
+        public void Test_38_06()
+        {
+        }
+
+        [Test]
+        public void Test_38_07()
+        {
+        }
+
+        [Test]
+        public void Test_38_08()
+        {
+        }
+
+        [Test]
+        public void Test_38_09()
+        {
+        }
+
+        [Test]
+        public void Test_38_10()
+        {
+        }
+
+        [Test]
+        public void Test_38_11()
+        {
+        }
+
+        [Test]
+        public void Test_38_12()
+        {
+        }
+
+        [Test]
+        public void Test_38_13()
+        {
+        }
+
+        [Test]
+        public void Test_38_14()
+        {
+        }
+
+        [Test]
+        public void Test_38_15()
+        {
+        }
+
+        [Test]
+        public void Test_38_16()
+        {
+        }
+
+        [Test]
+        public void Test_38_17()
+        {
+        }
+
+        [Test]
+        public void Test_38_18()
+        {
+        }
+
+        [Test]
+        public void Test_38_19()
+        {
+        }
+
+        [Test]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_39
+    {
+        #region PassingTests
+        [Test]
+        public void Test_39_01()
+        {
+        }
+
+        [Test]
+        public void Test_39_02()
+        {
+        }
+
+        [Test]
+        public void Test_39_03()
+        {
+        }
+
+        [Test]
+        public void Test_39_04()
+        {
+        }
+
+        [Test]
+        public void Test_39_05()
+        {
+        }
+
+        [Test]
+        public void Test_39_06()
+        {
+        }
+
+        [Test]
+        public void Test_39_07()
+        {
+        }
+
+        [Test]
+        public void Test_39_08()
+        {
+        }
+
+        [Test]
+        public void Test_39_09()
+        {
+        }
+
+        [Test]
+        public void Test_39_10()
+        {
+        }
+
+        [Test]
+        public void Test_39_11()
+        {
+        }
+
+        [Test]
+        public void Test_39_12()
+        {
+        }
+
+        [Test]
+        public void Test_39_13()
+        {
+        }
+
+        [Test]
+        public void Test_39_14()
+        {
+        }
+
+        [Test]
+        public void Test_39_15()
+        {
+        }
+
+        [Test]
+        public void Test_39_16()
+        {
+        }
+
+        [Test]
+        public void Test_39_17()
+        {
+        }
+
+        [Test]
+        public void Test_39_18()
+        {
+        }
+
+        [Test]
+        public void Test_39_19()
+        {
+        }
+
+        [Test]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_40
+    {
+        #region PassingTests
+        [Test]
+        public void Test_40_01()
+        {
+        }
+
+        [Test]
+        public void Test_40_02()
+        {
+        }
+
+        [Test]
+        public void Test_40_03()
+        {
+        }
+
+        [Test]
+        public void Test_40_04()
+        {
+        }
+
+        [Test]
+        public void Test_40_05()
+        {
+        }
+
+        [Test]
+        public void Test_40_06()
+        {
+        }
+
+        [Test]
+        public void Test_40_07()
+        {
+        }
+
+        [Test]
+        public void Test_40_08()
+        {
+        }
+
+        [Test]
+        public void Test_40_09()
+        {
+        }
+
+        [Test]
+        public void Test_40_10()
+        {
+        }
+
+        [Test]
+        public void Test_40_11()
+        {
+        }
+
+        [Test]
+        public void Test_40_12()
+        {
+        }
+
+        [Test]
+        public void Test_40_13()
+        {
+        }
+
+        [Test]
+        public void Test_40_14()
+        {
+        }
+
+        [Test]
+        public void Test_40_15()
+        {
+        }
+
+        [Test]
+        public void Test_40_16()
+        {
+        }
+
+        [Test]
+        public void Test_40_17()
+        {
+        }
+
+        [Test]
+        public void Test_40_18()
+        {
+        }
+
+        [Test]
+        public void Test_40_19()
+        {
+        }
+
+        [Test]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_41
+    {
+        #region PassingTests
+        [Test]
+        public void Test_41_01()
+        {
+        }
+
+        [Test]
+        public void Test_41_02()
+        {
+        }
+
+        [Test]
+        public void Test_41_03()
+        {
+        }
+
+        [Test]
+        public void Test_41_04()
+        {
+        }
+
+        [Test]
+        public void Test_41_05()
+        {
+        }
+
+        [Test]
+        public void Test_41_06()
+        {
+        }
+
+        [Test]
+        public void Test_41_07()
+        {
+        }
+
+        [Test]
+        public void Test_41_08()
+        {
+        }
+
+        [Test]
+        public void Test_41_09()
+        {
+        }
+
+        [Test]
+        public void Test_41_10()
+        {
+        }
+
+        [Test]
+        public void Test_41_11()
+        {
+        }
+
+        [Test]
+        public void Test_41_12()
+        {
+        }
+
+        [Test]
+        public void Test_41_13()
+        {
+        }
+
+        [Test]
+        public void Test_41_14()
+        {
+        }
+
+        [Test]
+        public void Test_41_15()
+        {
+        }
+
+        [Test]
+        public void Test_41_16()
+        {
+        }
+
+        [Test]
+        public void Test_41_17()
+        {
+        }
+
+        [Test]
+        public void Test_41_18()
+        {
+        }
+
+        [Test]
+        public void Test_41_19()
+        {
+        }
+
+        [Test]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_42
+    {
+        #region PassingTests
+        [Test]
+        public void Test_42_01()
+        {
+        }
+
+        [Test]
+        public void Test_42_02()
+        {
+        }
+
+        [Test]
+        public void Test_42_03()
+        {
+        }
+
+        [Test]
+        public void Test_42_04()
+        {
+        }
+
+        [Test]
+        public void Test_42_05()
+        {
+        }
+
+        [Test]
+        public void Test_42_06()
+        {
+        }
+
+        [Test]
+        public void Test_42_07()
+        {
+        }
+
+        [Test]
+        public void Test_42_08()
+        {
+        }
+
+        [Test]
+        public void Test_42_09()
+        {
+        }
+
+        [Test]
+        public void Test_42_10()
+        {
+        }
+
+        [Test]
+        public void Test_42_11()
+        {
+        }
+
+        [Test]
+        public void Test_42_12()
+        {
+        }
+
+        [Test]
+        public void Test_42_13()
+        {
+        }
+
+        [Test]
+        public void Test_42_14()
+        {
+        }
+
+        [Test]
+        public void Test_42_15()
+        {
+        }
+
+        [Test]
+        public void Test_42_16()
+        {
+        }
+
+        [Test]
+        public void Test_42_17()
+        {
+        }
+
+        [Test]
+        public void Test_42_18()
+        {
+        }
+
+        [Test]
+        public void Test_42_19()
+        {
+        }
+
+        [Test]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_43
+    {
+        #region PassingTests
+        [Test]
+        public void Test_43_01()
+        {
+        }
+
+        [Test]
+        public void Test_43_02()
+        {
+        }
+
+        [Test]
+        public void Test_43_03()
+        {
+        }
+
+        [Test]
+        public void Test_43_04()
+        {
+        }
+
+        [Test]
+        public void Test_43_05()
+        {
+        }
+
+        [Test]
+        public void Test_43_06()
+        {
+        }
+
+        [Test]
+        public void Test_43_07()
+        {
+        }
+
+        [Test]
+        public void Test_43_08()
+        {
+        }
+
+        [Test]
+        public void Test_43_09()
+        {
+        }
+
+        [Test]
+        public void Test_43_10()
+        {
+        }
+
+        [Test]
+        public void Test_43_11()
+        {
+        }
+
+        [Test]
+        public void Test_43_12()
+        {
+        }
+
+        [Test]
+        public void Test_43_13()
+        {
+        }
+
+        [Test]
+        public void Test_43_14()
+        {
+        }
+
+        [Test]
+        public void Test_43_15()
+        {
+        }
+
+        [Test]
+        public void Test_43_16()
+        {
+        }
+
+        [Test]
+        public void Test_43_17()
+        {
+        }
+
+        [Test]
+        public void Test_43_18()
+        {
+        }
+
+        [Test]
+        public void Test_43_19()
+        {
+        }
+
+        [Test]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_44
+    {
+        #region PassingTests
+        [Test]
+        public void Test_44_01()
+        {
+        }
+
+        [Test]
+        public void Test_44_02()
+        {
+        }
+
+        [Test]
+        public void Test_44_03()
+        {
+        }
+
+        [Test]
+        public void Test_44_04()
+        {
+        }
+
+        [Test]
+        public void Test_44_05()
+        {
+        }
+
+        [Test]
+        public void Test_44_06()
+        {
+        }
+
+        [Test]
+        public void Test_44_07()
+        {
+        }
+
+        [Test]
+        public void Test_44_08()
+        {
+        }
+
+        [Test]
+        public void Test_44_09()
+        {
+        }
+
+        [Test]
+        public void Test_44_10()
+        {
+        }
+
+        [Test]
+        public void Test_44_11()
+        {
+        }
+
+        [Test]
+        public void Test_44_12()
+        {
+        }
+
+        [Test]
+        public void Test_44_13()
+        {
+        }
+
+        [Test]
+        public void Test_44_14()
+        {
+        }
+
+        [Test]
+        public void Test_44_15()
+        {
+        }
+
+        [Test]
+        public void Test_44_16()
+        {
+        }
+
+        [Test]
+        public void Test_44_17()
+        {
+        }
+
+        [Test]
+        public void Test_44_18()
+        {
+        }
+
+        [Test]
+        public void Test_44_19()
+        {
+        }
+
+        [Test]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_45
+    {
+        #region PassingTests
+        [Test]
+        public void Test_45_01()
+        {
+        }
+
+        [Test]
+        public void Test_45_02()
+        {
+        }
+
+        [Test]
+        public void Test_45_03()
+        {
+        }
+
+        [Test]
+        public void Test_45_04()
+        {
+        }
+
+        [Test]
+        public void Test_45_05()
+        {
+        }
+
+        [Test]
+        public void Test_45_06()
+        {
+        }
+
+        [Test]
+        public void Test_45_07()
+        {
+        }
+
+        [Test]
+        public void Test_45_08()
+        {
+        }
+
+        [Test]
+        public void Test_45_09()
+        {
+        }
+
+        [Test]
+        public void Test_45_10()
+        {
+        }
+
+        [Test]
+        public void Test_45_11()
+        {
+        }
+
+        [Test]
+        public void Test_45_12()
+        {
+        }
+
+        [Test]
+        public void Test_45_13()
+        {
+        }
+
+        [Test]
+        public void Test_45_14()
+        {
+        }
+
+        [Test]
+        public void Test_45_15()
+        {
+        }
+
+        [Test]
+        public void Test_45_16()
+        {
+        }
+
+        [Test]
+        public void Test_45_17()
+        {
+        }
+
+        [Test]
+        public void Test_45_18()
+        {
+        }
+
+        [Test]
+        public void Test_45_19()
+        {
+        }
+
+        [Test]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_46
+    {
+        #region PassingTests
+        [Test]
+        public void Test_46_01()
+        {
+        }
+
+        [Test]
+        public void Test_46_02()
+        {
+        }
+
+        [Test]
+        public void Test_46_03()
+        {
+        }
+
+        [Test]
+        public void Test_46_04()
+        {
+        }
+
+        [Test]
+        public void Test_46_05()
+        {
+        }
+
+        [Test]
+        public void Test_46_06()
+        {
+        }
+
+        [Test]
+        public void Test_46_07()
+        {
+        }
+
+        [Test]
+        public void Test_46_08()
+        {
+        }
+
+        [Test]
+        public void Test_46_09()
+        {
+        }
+
+        [Test]
+        public void Test_46_10()
+        {
+        }
+
+        [Test]
+        public void Test_46_11()
+        {
+        }
+
+        [Test]
+        public void Test_46_12()
+        {
+        }
+
+        [Test]
+        public void Test_46_13()
+        {
+        }
+
+        [Test]
+        public void Test_46_14()
+        {
+        }
+
+        [Test]
+        public void Test_46_15()
+        {
+        }
+
+        [Test]
+        public void Test_46_16()
+        {
+        }
+
+        [Test]
+        public void Test_46_17()
+        {
+        }
+
+        [Test]
+        public void Test_46_18()
+        {
+        }
+
+        [Test]
+        public void Test_46_19()
+        {
+        }
+
+        [Test]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_47
+    {
+        #region PassingTests
+        [Test]
+        public void Test_47_01()
+        {
+        }
+
+        [Test]
+        public void Test_47_02()
+        {
+        }
+
+        [Test]
+        public void Test_47_03()
+        {
+        }
+
+        [Test]
+        public void Test_47_04()
+        {
+        }
+
+        [Test]
+        public void Test_47_05()
+        {
+        }
+
+        [Test]
+        public void Test_47_06()
+        {
+        }
+
+        [Test]
+        public void Test_47_07()
+        {
+        }
+
+        [Test]
+        public void Test_47_08()
+        {
+        }
+
+        [Test]
+        public void Test_47_09()
+        {
+        }
+
+        [Test]
+        public void Test_47_10()
+        {
+        }
+
+        [Test]
+        public void Test_47_11()
+        {
+        }
+
+        [Test]
+        public void Test_47_12()
+        {
+        }
+
+        [Test]
+        public void Test_47_13()
+        {
+        }
+
+        [Test]
+        public void Test_47_14()
+        {
+        }
+
+        [Test]
+        public void Test_47_15()
+        {
+        }
+
+        [Test]
+        public void Test_47_16()
+        {
+        }
+
+        [Test]
+        public void Test_47_17()
+        {
+        }
+
+        [Test]
+        public void Test_47_18()
+        {
+        }
+
+        [Test]
+        public void Test_47_19()
+        {
+        }
+
+        [Test]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_48
+    {
+        #region PassingTests
+        [Test]
+        public void Test_48_01()
+        {
+        }
+
+        [Test]
+        public void Test_48_02()
+        {
+        }
+
+        [Test]
+        public void Test_48_03()
+        {
+        }
+
+        [Test]
+        public void Test_48_04()
+        {
+        }
+
+        [Test]
+        public void Test_48_05()
+        {
+        }
+
+        [Test]
+        public void Test_48_06()
+        {
+        }
+
+        [Test]
+        public void Test_48_07()
+        {
+        }
+
+        [Test]
+        public void Test_48_08()
+        {
+        }
+
+        [Test]
+        public void Test_48_09()
+        {
+        }
+
+        [Test]
+        public void Test_48_10()
+        {
+        }
+
+        [Test]
+        public void Test_48_11()
+        {
+        }
+
+        [Test]
+        public void Test_48_12()
+        {
+        }
+
+        [Test]
+        public void Test_48_13()
+        {
+        }
+
+        [Test]
+        public void Test_48_14()
+        {
+        }
+
+        [Test]
+        public void Test_48_15()
+        {
+        }
+
+        [Test]
+        public void Test_48_16()
+        {
+        }
+
+        [Test]
+        public void Test_48_17()
+        {
+        }
+
+        [Test]
+        public void Test_48_18()
+        {
+        }
+
+        [Test]
+        public void Test_48_19()
+        {
+        }
+
+        [Test]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_49
+    {
+        #region PassingTests
+        [Test]
+        public void Test_49_01()
+        {
+        }
+
+        [Test]
+        public void Test_49_02()
+        {
+        }
+
+        [Test]
+        public void Test_49_03()
+        {
+        }
+
+        [Test]
+        public void Test_49_04()
+        {
+        }
+
+        [Test]
+        public void Test_49_05()
+        {
+        }
+
+        [Test]
+        public void Test_49_06()
+        {
+        }
+
+        [Test]
+        public void Test_49_07()
+        {
+        }
+
+        [Test]
+        public void Test_49_08()
+        {
+        }
+
+        [Test]
+        public void Test_49_09()
+        {
+        }
+
+        [Test]
+        public void Test_49_10()
+        {
+        }
+
+        [Test]
+        public void Test_49_11()
+        {
+        }
+
+        [Test]
+        public void Test_49_12()
+        {
+        }
+
+        [Test]
+        public void Test_49_13()
+        {
+        }
+
+        [Test]
+        public void Test_49_14()
+        {
+        }
+
+        [Test]
+        public void Test_49_15()
+        {
+        }
+
+        [Test]
+        public void Test_49_16()
+        {
+        }
+
+        [Test]
+        public void Test_49_17()
+        {
+        }
+
+        [Test]
+        public void Test_49_18()
+        {
+        }
+
+        [Test]
+        public void Test_49_19()
+        {
+        }
+
+        [Test]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_50
+    {
+        #region PassingTests
+        [Test]
+        public void Test_50_01()
+        {
+        }
+
+        [Test]
+        public void Test_50_02()
+        {
+        }
+
+        [Test]
+        public void Test_50_03()
+        {
+        }
+
+        [Test]
+        public void Test_50_04()
+        {
+        }
+
+        [Test]
+        public void Test_50_05()
+        {
+        }
+
+        [Test]
+        public void Test_50_06()
+        {
+        }
+
+        [Test]
+        public void Test_50_07()
+        {
+        }
+
+        [Test]
+        public void Test_50_08()
+        {
+        }
+
+        [Test]
+        public void Test_50_09()
+        {
+        }
+
+        [Test]
+        public void Test_50_10()
+        {
+        }
+
+        [Test]
+        public void Test_50_11()
+        {
+        }
+
+        [Test]
+        public void Test_50_12()
+        {
+        }
+
+        [Test]
+        public void Test_50_13()
+        {
+        }
+
+        [Test]
+        public void Test_50_14()
+        {
+        }
+
+        [Test]
+        public void Test_50_15()
+        {
+        }
+
+        [Test]
+        public void Test_50_16()
+        {
+        }
+
+        [Test]
+        public void Test_50_17()
+        {
+        }
+
+        [Test]
+        public void Test_50_18()
+        {
+        }
+
+        [Test]
+        public void Test_50_19()
+        {
+        }
+
+        [Test]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/NUnit1000Passing/NunitTests.tt b/test/TestAssets/performance/NUnit1000Passing/NunitTests.tt
new file mode 100644
index 0000000000..5203ef532f
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1000Passing/NunitTests.tt
@@ -0,0 +1,56 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+<#
+    int classes = 50;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestFixture]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj b/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj
new file mode 100644
index 0000000000..4b0d0e5b87
--- /dev/null
+++ b/test/TestAssets/performance/NUnit100Passing/NUnit100Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnit3FrameworkVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3AdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/NUnit100Passing/NunitTests.cs b/test/TestAssets/performance/NUnit100Passing/NunitTests.cs
new file mode 100644
index 0000000000..2102117bfb
--- /dev/null
+++ b/test/TestAssets/performance/NUnit100Passing/NunitTests.cs
@@ -0,0 +1,550 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+    [TestFixture]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Test]
+        public void Test_01_01()
+        {
+        }
+
+        [Test]
+        public void Test_01_02()
+        {
+        }
+
+        [Test]
+        public void Test_01_03()
+        {
+        }
+
+        [Test]
+        public void Test_01_04()
+        {
+        }
+
+        [Test]
+        public void Test_01_05()
+        {
+        }
+
+        [Test]
+        public void Test_01_06()
+        {
+        }
+
+        [Test]
+        public void Test_01_07()
+        {
+        }
+
+        [Test]
+        public void Test_01_08()
+        {
+        }
+
+        [Test]
+        public void Test_01_09()
+        {
+        }
+
+        [Test]
+        public void Test_01_10()
+        {
+        }
+
+        [Test]
+        public void Test_01_11()
+        {
+        }
+
+        [Test]
+        public void Test_01_12()
+        {
+        }
+
+        [Test]
+        public void Test_01_13()
+        {
+        }
+
+        [Test]
+        public void Test_01_14()
+        {
+        }
+
+        [Test]
+        public void Test_01_15()
+        {
+        }
+
+        [Test]
+        public void Test_01_16()
+        {
+        }
+
+        [Test]
+        public void Test_01_17()
+        {
+        }
+
+        [Test]
+        public void Test_01_18()
+        {
+        }
+
+        [Test]
+        public void Test_01_19()
+        {
+        }
+
+        [Test]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Test]
+        public void Test_02_01()
+        {
+        }
+
+        [Test]
+        public void Test_02_02()
+        {
+        }
+
+        [Test]
+        public void Test_02_03()
+        {
+        }
+
+        [Test]
+        public void Test_02_04()
+        {
+        }
+
+        [Test]
+        public void Test_02_05()
+        {
+        }
+
+        [Test]
+        public void Test_02_06()
+        {
+        }
+
+        [Test]
+        public void Test_02_07()
+        {
+        }
+
+        [Test]
+        public void Test_02_08()
+        {
+        }
+
+        [Test]
+        public void Test_02_09()
+        {
+        }
+
+        [Test]
+        public void Test_02_10()
+        {
+        }
+
+        [Test]
+        public void Test_02_11()
+        {
+        }
+
+        [Test]
+        public void Test_02_12()
+        {
+        }
+
+        [Test]
+        public void Test_02_13()
+        {
+        }
+
+        [Test]
+        public void Test_02_14()
+        {
+        }
+
+        [Test]
+        public void Test_02_15()
+        {
+        }
+
+        [Test]
+        public void Test_02_16()
+        {
+        }
+
+        [Test]
+        public void Test_02_17()
+        {
+        }
+
+        [Test]
+        public void Test_02_18()
+        {
+        }
+
+        [Test]
+        public void Test_02_19()
+        {
+        }
+
+        [Test]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Test]
+        public void Test_03_01()
+        {
+        }
+
+        [Test]
+        public void Test_03_02()
+        {
+        }
+
+        [Test]
+        public void Test_03_03()
+        {
+        }
+
+        [Test]
+        public void Test_03_04()
+        {
+        }
+
+        [Test]
+        public void Test_03_05()
+        {
+        }
+
+        [Test]
+        public void Test_03_06()
+        {
+        }
+
+        [Test]
+        public void Test_03_07()
+        {
+        }
+
+        [Test]
+        public void Test_03_08()
+        {
+        }
+
+        [Test]
+        public void Test_03_09()
+        {
+        }
+
+        [Test]
+        public void Test_03_10()
+        {
+        }
+
+        [Test]
+        public void Test_03_11()
+        {
+        }
+
+        [Test]
+        public void Test_03_12()
+        {
+        }
+
+        [Test]
+        public void Test_03_13()
+        {
+        }
+
+        [Test]
+        public void Test_03_14()
+        {
+        }
+
+        [Test]
+        public void Test_03_15()
+        {
+        }
+
+        [Test]
+        public void Test_03_16()
+        {
+        }
+
+        [Test]
+        public void Test_03_17()
+        {
+        }
+
+        [Test]
+        public void Test_03_18()
+        {
+        }
+
+        [Test]
+        public void Test_03_19()
+        {
+        }
+
+        [Test]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Test]
+        public void Test_04_01()
+        {
+        }
+
+        [Test]
+        public void Test_04_02()
+        {
+        }
+
+        [Test]
+        public void Test_04_03()
+        {
+        }
+
+        [Test]
+        public void Test_04_04()
+        {
+        }
+
+        [Test]
+        public void Test_04_05()
+        {
+        }
+
+        [Test]
+        public void Test_04_06()
+        {
+        }
+
+        [Test]
+        public void Test_04_07()
+        {
+        }
+
+        [Test]
+        public void Test_04_08()
+        {
+        }
+
+        [Test]
+        public void Test_04_09()
+        {
+        }
+
+        [Test]
+        public void Test_04_10()
+        {
+        }
+
+        [Test]
+        public void Test_04_11()
+        {
+        }
+
+        [Test]
+        public void Test_04_12()
+        {
+        }
+
+        [Test]
+        public void Test_04_13()
+        {
+        }
+
+        [Test]
+        public void Test_04_14()
+        {
+        }
+
+        [Test]
+        public void Test_04_15()
+        {
+        }
+
+        [Test]
+        public void Test_04_16()
+        {
+        }
+
+        [Test]
+        public void Test_04_17()
+        {
+        }
+
+        [Test]
+        public void Test_04_18()
+        {
+        }
+
+        [Test]
+        public void Test_04_19()
+        {
+        }
+
+        [Test]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Test]
+        public void Test_05_01()
+        {
+        }
+
+        [Test]
+        public void Test_05_02()
+        {
+        }
+
+        [Test]
+        public void Test_05_03()
+        {
+        }
+
+        [Test]
+        public void Test_05_04()
+        {
+        }
+
+        [Test]
+        public void Test_05_05()
+        {
+        }
+
+        [Test]
+        public void Test_05_06()
+        {
+        }
+
+        [Test]
+        public void Test_05_07()
+        {
+        }
+
+        [Test]
+        public void Test_05_08()
+        {
+        }
+
+        [Test]
+        public void Test_05_09()
+        {
+        }
+
+        [Test]
+        public void Test_05_10()
+        {
+        }
+
+        [Test]
+        public void Test_05_11()
+        {
+        }
+
+        [Test]
+        public void Test_05_12()
+        {
+        }
+
+        [Test]
+        public void Test_05_13()
+        {
+        }
+
+        [Test]
+        public void Test_05_14()
+        {
+        }
+
+        [Test]
+        public void Test_05_15()
+        {
+        }
+
+        [Test]
+        public void Test_05_16()
+        {
+        }
+
+        [Test]
+        public void Test_05_17()
+        {
+        }
+
+        [Test]
+        public void Test_05_18()
+        {
+        }
+
+        [Test]
+        public void Test_05_19()
+        {
+        }
+
+        [Test]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/NUnit100Passing/NunitTests.tt b/test/TestAssets/performance/NUnit100Passing/NunitTests.tt
new file mode 100644
index 0000000000..6db97ec3dd
--- /dev/null
+++ b/test/TestAssets/performance/NUnit100Passing/NunitTests.tt
@@ -0,0 +1,56 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+<#
+    int classes = 5;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestFixture]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj b/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj
new file mode 100644
index 0000000000..4b0d0e5b87
--- /dev/null
+++ b/test/TestAssets/performance/NUnit10kPassing/NUnit10kPassing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnit3FrameworkVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3AdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/NUnit10kPassing/NunitTests.cs b/test/TestAssets/performance/NUnit10kPassing/NunitTests.cs
new file mode 100644
index 0000000000..7cb2d4760d
--- /dev/null
+++ b/test/TestAssets/performance/NUnit10kPassing/NunitTests.cs
@@ -0,0 +1,54505 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+    [TestFixture]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Test]
+        public void Test_01_01()
+        {
+        }
+
+        [Test]
+        public void Test_01_02()
+        {
+        }
+
+        [Test]
+        public void Test_01_03()
+        {
+        }
+
+        [Test]
+        public void Test_01_04()
+        {
+        }
+
+        [Test]
+        public void Test_01_05()
+        {
+        }
+
+        [Test]
+        public void Test_01_06()
+        {
+        }
+
+        [Test]
+        public void Test_01_07()
+        {
+        }
+
+        [Test]
+        public void Test_01_08()
+        {
+        }
+
+        [Test]
+        public void Test_01_09()
+        {
+        }
+
+        [Test]
+        public void Test_01_10()
+        {
+        }
+
+        [Test]
+        public void Test_01_11()
+        {
+        }
+
+        [Test]
+        public void Test_01_12()
+        {
+        }
+
+        [Test]
+        public void Test_01_13()
+        {
+        }
+
+        [Test]
+        public void Test_01_14()
+        {
+        }
+
+        [Test]
+        public void Test_01_15()
+        {
+        }
+
+        [Test]
+        public void Test_01_16()
+        {
+        }
+
+        [Test]
+        public void Test_01_17()
+        {
+        }
+
+        [Test]
+        public void Test_01_18()
+        {
+        }
+
+        [Test]
+        public void Test_01_19()
+        {
+        }
+
+        [Test]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Test]
+        public void Test_02_01()
+        {
+        }
+
+        [Test]
+        public void Test_02_02()
+        {
+        }
+
+        [Test]
+        public void Test_02_03()
+        {
+        }
+
+        [Test]
+        public void Test_02_04()
+        {
+        }
+
+        [Test]
+        public void Test_02_05()
+        {
+        }
+
+        [Test]
+        public void Test_02_06()
+        {
+        }
+
+        [Test]
+        public void Test_02_07()
+        {
+        }
+
+        [Test]
+        public void Test_02_08()
+        {
+        }
+
+        [Test]
+        public void Test_02_09()
+        {
+        }
+
+        [Test]
+        public void Test_02_10()
+        {
+        }
+
+        [Test]
+        public void Test_02_11()
+        {
+        }
+
+        [Test]
+        public void Test_02_12()
+        {
+        }
+
+        [Test]
+        public void Test_02_13()
+        {
+        }
+
+        [Test]
+        public void Test_02_14()
+        {
+        }
+
+        [Test]
+        public void Test_02_15()
+        {
+        }
+
+        [Test]
+        public void Test_02_16()
+        {
+        }
+
+        [Test]
+        public void Test_02_17()
+        {
+        }
+
+        [Test]
+        public void Test_02_18()
+        {
+        }
+
+        [Test]
+        public void Test_02_19()
+        {
+        }
+
+        [Test]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Test]
+        public void Test_03_01()
+        {
+        }
+
+        [Test]
+        public void Test_03_02()
+        {
+        }
+
+        [Test]
+        public void Test_03_03()
+        {
+        }
+
+        [Test]
+        public void Test_03_04()
+        {
+        }
+
+        [Test]
+        public void Test_03_05()
+        {
+        }
+
+        [Test]
+        public void Test_03_06()
+        {
+        }
+
+        [Test]
+        public void Test_03_07()
+        {
+        }
+
+        [Test]
+        public void Test_03_08()
+        {
+        }
+
+        [Test]
+        public void Test_03_09()
+        {
+        }
+
+        [Test]
+        public void Test_03_10()
+        {
+        }
+
+        [Test]
+        public void Test_03_11()
+        {
+        }
+
+        [Test]
+        public void Test_03_12()
+        {
+        }
+
+        [Test]
+        public void Test_03_13()
+        {
+        }
+
+        [Test]
+        public void Test_03_14()
+        {
+        }
+
+        [Test]
+        public void Test_03_15()
+        {
+        }
+
+        [Test]
+        public void Test_03_16()
+        {
+        }
+
+        [Test]
+        public void Test_03_17()
+        {
+        }
+
+        [Test]
+        public void Test_03_18()
+        {
+        }
+
+        [Test]
+        public void Test_03_19()
+        {
+        }
+
+        [Test]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Test]
+        public void Test_04_01()
+        {
+        }
+
+        [Test]
+        public void Test_04_02()
+        {
+        }
+
+        [Test]
+        public void Test_04_03()
+        {
+        }
+
+        [Test]
+        public void Test_04_04()
+        {
+        }
+
+        [Test]
+        public void Test_04_05()
+        {
+        }
+
+        [Test]
+        public void Test_04_06()
+        {
+        }
+
+        [Test]
+        public void Test_04_07()
+        {
+        }
+
+        [Test]
+        public void Test_04_08()
+        {
+        }
+
+        [Test]
+        public void Test_04_09()
+        {
+        }
+
+        [Test]
+        public void Test_04_10()
+        {
+        }
+
+        [Test]
+        public void Test_04_11()
+        {
+        }
+
+        [Test]
+        public void Test_04_12()
+        {
+        }
+
+        [Test]
+        public void Test_04_13()
+        {
+        }
+
+        [Test]
+        public void Test_04_14()
+        {
+        }
+
+        [Test]
+        public void Test_04_15()
+        {
+        }
+
+        [Test]
+        public void Test_04_16()
+        {
+        }
+
+        [Test]
+        public void Test_04_17()
+        {
+        }
+
+        [Test]
+        public void Test_04_18()
+        {
+        }
+
+        [Test]
+        public void Test_04_19()
+        {
+        }
+
+        [Test]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Test]
+        public void Test_05_01()
+        {
+        }
+
+        [Test]
+        public void Test_05_02()
+        {
+        }
+
+        [Test]
+        public void Test_05_03()
+        {
+        }
+
+        [Test]
+        public void Test_05_04()
+        {
+        }
+
+        [Test]
+        public void Test_05_05()
+        {
+        }
+
+        [Test]
+        public void Test_05_06()
+        {
+        }
+
+        [Test]
+        public void Test_05_07()
+        {
+        }
+
+        [Test]
+        public void Test_05_08()
+        {
+        }
+
+        [Test]
+        public void Test_05_09()
+        {
+        }
+
+        [Test]
+        public void Test_05_10()
+        {
+        }
+
+        [Test]
+        public void Test_05_11()
+        {
+        }
+
+        [Test]
+        public void Test_05_12()
+        {
+        }
+
+        [Test]
+        public void Test_05_13()
+        {
+        }
+
+        [Test]
+        public void Test_05_14()
+        {
+        }
+
+        [Test]
+        public void Test_05_15()
+        {
+        }
+
+        [Test]
+        public void Test_05_16()
+        {
+        }
+
+        [Test]
+        public void Test_05_17()
+        {
+        }
+
+        [Test]
+        public void Test_05_18()
+        {
+        }
+
+        [Test]
+        public void Test_05_19()
+        {
+        }
+
+        [Test]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_06
+    {
+        #region PassingTests
+        [Test]
+        public void Test_06_01()
+        {
+        }
+
+        [Test]
+        public void Test_06_02()
+        {
+        }
+
+        [Test]
+        public void Test_06_03()
+        {
+        }
+
+        [Test]
+        public void Test_06_04()
+        {
+        }
+
+        [Test]
+        public void Test_06_05()
+        {
+        }
+
+        [Test]
+        public void Test_06_06()
+        {
+        }
+
+        [Test]
+        public void Test_06_07()
+        {
+        }
+
+        [Test]
+        public void Test_06_08()
+        {
+        }
+
+        [Test]
+        public void Test_06_09()
+        {
+        }
+
+        [Test]
+        public void Test_06_10()
+        {
+        }
+
+        [Test]
+        public void Test_06_11()
+        {
+        }
+
+        [Test]
+        public void Test_06_12()
+        {
+        }
+
+        [Test]
+        public void Test_06_13()
+        {
+        }
+
+        [Test]
+        public void Test_06_14()
+        {
+        }
+
+        [Test]
+        public void Test_06_15()
+        {
+        }
+
+        [Test]
+        public void Test_06_16()
+        {
+        }
+
+        [Test]
+        public void Test_06_17()
+        {
+        }
+
+        [Test]
+        public void Test_06_18()
+        {
+        }
+
+        [Test]
+        public void Test_06_19()
+        {
+        }
+
+        [Test]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_07
+    {
+        #region PassingTests
+        [Test]
+        public void Test_07_01()
+        {
+        }
+
+        [Test]
+        public void Test_07_02()
+        {
+        }
+
+        [Test]
+        public void Test_07_03()
+        {
+        }
+
+        [Test]
+        public void Test_07_04()
+        {
+        }
+
+        [Test]
+        public void Test_07_05()
+        {
+        }
+
+        [Test]
+        public void Test_07_06()
+        {
+        }
+
+        [Test]
+        public void Test_07_07()
+        {
+        }
+
+        [Test]
+        public void Test_07_08()
+        {
+        }
+
+        [Test]
+        public void Test_07_09()
+        {
+        }
+
+        [Test]
+        public void Test_07_10()
+        {
+        }
+
+        [Test]
+        public void Test_07_11()
+        {
+        }
+
+        [Test]
+        public void Test_07_12()
+        {
+        }
+
+        [Test]
+        public void Test_07_13()
+        {
+        }
+
+        [Test]
+        public void Test_07_14()
+        {
+        }
+
+        [Test]
+        public void Test_07_15()
+        {
+        }
+
+        [Test]
+        public void Test_07_16()
+        {
+        }
+
+        [Test]
+        public void Test_07_17()
+        {
+        }
+
+        [Test]
+        public void Test_07_18()
+        {
+        }
+
+        [Test]
+        public void Test_07_19()
+        {
+        }
+
+        [Test]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_08
+    {
+        #region PassingTests
+        [Test]
+        public void Test_08_01()
+        {
+        }
+
+        [Test]
+        public void Test_08_02()
+        {
+        }
+
+        [Test]
+        public void Test_08_03()
+        {
+        }
+
+        [Test]
+        public void Test_08_04()
+        {
+        }
+
+        [Test]
+        public void Test_08_05()
+        {
+        }
+
+        [Test]
+        public void Test_08_06()
+        {
+        }
+
+        [Test]
+        public void Test_08_07()
+        {
+        }
+
+        [Test]
+        public void Test_08_08()
+        {
+        }
+
+        [Test]
+        public void Test_08_09()
+        {
+        }
+
+        [Test]
+        public void Test_08_10()
+        {
+        }
+
+        [Test]
+        public void Test_08_11()
+        {
+        }
+
+        [Test]
+        public void Test_08_12()
+        {
+        }
+
+        [Test]
+        public void Test_08_13()
+        {
+        }
+
+        [Test]
+        public void Test_08_14()
+        {
+        }
+
+        [Test]
+        public void Test_08_15()
+        {
+        }
+
+        [Test]
+        public void Test_08_16()
+        {
+        }
+
+        [Test]
+        public void Test_08_17()
+        {
+        }
+
+        [Test]
+        public void Test_08_18()
+        {
+        }
+
+        [Test]
+        public void Test_08_19()
+        {
+        }
+
+        [Test]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_09
+    {
+        #region PassingTests
+        [Test]
+        public void Test_09_01()
+        {
+        }
+
+        [Test]
+        public void Test_09_02()
+        {
+        }
+
+        [Test]
+        public void Test_09_03()
+        {
+        }
+
+        [Test]
+        public void Test_09_04()
+        {
+        }
+
+        [Test]
+        public void Test_09_05()
+        {
+        }
+
+        [Test]
+        public void Test_09_06()
+        {
+        }
+
+        [Test]
+        public void Test_09_07()
+        {
+        }
+
+        [Test]
+        public void Test_09_08()
+        {
+        }
+
+        [Test]
+        public void Test_09_09()
+        {
+        }
+
+        [Test]
+        public void Test_09_10()
+        {
+        }
+
+        [Test]
+        public void Test_09_11()
+        {
+        }
+
+        [Test]
+        public void Test_09_12()
+        {
+        }
+
+        [Test]
+        public void Test_09_13()
+        {
+        }
+
+        [Test]
+        public void Test_09_14()
+        {
+        }
+
+        [Test]
+        public void Test_09_15()
+        {
+        }
+
+        [Test]
+        public void Test_09_16()
+        {
+        }
+
+        [Test]
+        public void Test_09_17()
+        {
+        }
+
+        [Test]
+        public void Test_09_18()
+        {
+        }
+
+        [Test]
+        public void Test_09_19()
+        {
+        }
+
+        [Test]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_10
+    {
+        #region PassingTests
+        [Test]
+        public void Test_10_01()
+        {
+        }
+
+        [Test]
+        public void Test_10_02()
+        {
+        }
+
+        [Test]
+        public void Test_10_03()
+        {
+        }
+
+        [Test]
+        public void Test_10_04()
+        {
+        }
+
+        [Test]
+        public void Test_10_05()
+        {
+        }
+
+        [Test]
+        public void Test_10_06()
+        {
+        }
+
+        [Test]
+        public void Test_10_07()
+        {
+        }
+
+        [Test]
+        public void Test_10_08()
+        {
+        }
+
+        [Test]
+        public void Test_10_09()
+        {
+        }
+
+        [Test]
+        public void Test_10_10()
+        {
+        }
+
+        [Test]
+        public void Test_10_11()
+        {
+        }
+
+        [Test]
+        public void Test_10_12()
+        {
+        }
+
+        [Test]
+        public void Test_10_13()
+        {
+        }
+
+        [Test]
+        public void Test_10_14()
+        {
+        }
+
+        [Test]
+        public void Test_10_15()
+        {
+        }
+
+        [Test]
+        public void Test_10_16()
+        {
+        }
+
+        [Test]
+        public void Test_10_17()
+        {
+        }
+
+        [Test]
+        public void Test_10_18()
+        {
+        }
+
+        [Test]
+        public void Test_10_19()
+        {
+        }
+
+        [Test]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_11
+    {
+        #region PassingTests
+        [Test]
+        public void Test_11_01()
+        {
+        }
+
+        [Test]
+        public void Test_11_02()
+        {
+        }
+
+        [Test]
+        public void Test_11_03()
+        {
+        }
+
+        [Test]
+        public void Test_11_04()
+        {
+        }
+
+        [Test]
+        public void Test_11_05()
+        {
+        }
+
+        [Test]
+        public void Test_11_06()
+        {
+        }
+
+        [Test]
+        public void Test_11_07()
+        {
+        }
+
+        [Test]
+        public void Test_11_08()
+        {
+        }
+
+        [Test]
+        public void Test_11_09()
+        {
+        }
+
+        [Test]
+        public void Test_11_10()
+        {
+        }
+
+        [Test]
+        public void Test_11_11()
+        {
+        }
+
+        [Test]
+        public void Test_11_12()
+        {
+        }
+
+        [Test]
+        public void Test_11_13()
+        {
+        }
+
+        [Test]
+        public void Test_11_14()
+        {
+        }
+
+        [Test]
+        public void Test_11_15()
+        {
+        }
+
+        [Test]
+        public void Test_11_16()
+        {
+        }
+
+        [Test]
+        public void Test_11_17()
+        {
+        }
+
+        [Test]
+        public void Test_11_18()
+        {
+        }
+
+        [Test]
+        public void Test_11_19()
+        {
+        }
+
+        [Test]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_12
+    {
+        #region PassingTests
+        [Test]
+        public void Test_12_01()
+        {
+        }
+
+        [Test]
+        public void Test_12_02()
+        {
+        }
+
+        [Test]
+        public void Test_12_03()
+        {
+        }
+
+        [Test]
+        public void Test_12_04()
+        {
+        }
+
+        [Test]
+        public void Test_12_05()
+        {
+        }
+
+        [Test]
+        public void Test_12_06()
+        {
+        }
+
+        [Test]
+        public void Test_12_07()
+        {
+        }
+
+        [Test]
+        public void Test_12_08()
+        {
+        }
+
+        [Test]
+        public void Test_12_09()
+        {
+        }
+
+        [Test]
+        public void Test_12_10()
+        {
+        }
+
+        [Test]
+        public void Test_12_11()
+        {
+        }
+
+        [Test]
+        public void Test_12_12()
+        {
+        }
+
+        [Test]
+        public void Test_12_13()
+        {
+        }
+
+        [Test]
+        public void Test_12_14()
+        {
+        }
+
+        [Test]
+        public void Test_12_15()
+        {
+        }
+
+        [Test]
+        public void Test_12_16()
+        {
+        }
+
+        [Test]
+        public void Test_12_17()
+        {
+        }
+
+        [Test]
+        public void Test_12_18()
+        {
+        }
+
+        [Test]
+        public void Test_12_19()
+        {
+        }
+
+        [Test]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_13
+    {
+        #region PassingTests
+        [Test]
+        public void Test_13_01()
+        {
+        }
+
+        [Test]
+        public void Test_13_02()
+        {
+        }
+
+        [Test]
+        public void Test_13_03()
+        {
+        }
+
+        [Test]
+        public void Test_13_04()
+        {
+        }
+
+        [Test]
+        public void Test_13_05()
+        {
+        }
+
+        [Test]
+        public void Test_13_06()
+        {
+        }
+
+        [Test]
+        public void Test_13_07()
+        {
+        }
+
+        [Test]
+        public void Test_13_08()
+        {
+        }
+
+        [Test]
+        public void Test_13_09()
+        {
+        }
+
+        [Test]
+        public void Test_13_10()
+        {
+        }
+
+        [Test]
+        public void Test_13_11()
+        {
+        }
+
+        [Test]
+        public void Test_13_12()
+        {
+        }
+
+        [Test]
+        public void Test_13_13()
+        {
+        }
+
+        [Test]
+        public void Test_13_14()
+        {
+        }
+
+        [Test]
+        public void Test_13_15()
+        {
+        }
+
+        [Test]
+        public void Test_13_16()
+        {
+        }
+
+        [Test]
+        public void Test_13_17()
+        {
+        }
+
+        [Test]
+        public void Test_13_18()
+        {
+        }
+
+        [Test]
+        public void Test_13_19()
+        {
+        }
+
+        [Test]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_14
+    {
+        #region PassingTests
+        [Test]
+        public void Test_14_01()
+        {
+        }
+
+        [Test]
+        public void Test_14_02()
+        {
+        }
+
+        [Test]
+        public void Test_14_03()
+        {
+        }
+
+        [Test]
+        public void Test_14_04()
+        {
+        }
+
+        [Test]
+        public void Test_14_05()
+        {
+        }
+
+        [Test]
+        public void Test_14_06()
+        {
+        }
+
+        [Test]
+        public void Test_14_07()
+        {
+        }
+
+        [Test]
+        public void Test_14_08()
+        {
+        }
+
+        [Test]
+        public void Test_14_09()
+        {
+        }
+
+        [Test]
+        public void Test_14_10()
+        {
+        }
+
+        [Test]
+        public void Test_14_11()
+        {
+        }
+
+        [Test]
+        public void Test_14_12()
+        {
+        }
+
+        [Test]
+        public void Test_14_13()
+        {
+        }
+
+        [Test]
+        public void Test_14_14()
+        {
+        }
+
+        [Test]
+        public void Test_14_15()
+        {
+        }
+
+        [Test]
+        public void Test_14_16()
+        {
+        }
+
+        [Test]
+        public void Test_14_17()
+        {
+        }
+
+        [Test]
+        public void Test_14_18()
+        {
+        }
+
+        [Test]
+        public void Test_14_19()
+        {
+        }
+
+        [Test]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_15
+    {
+        #region PassingTests
+        [Test]
+        public void Test_15_01()
+        {
+        }
+
+        [Test]
+        public void Test_15_02()
+        {
+        }
+
+        [Test]
+        public void Test_15_03()
+        {
+        }
+
+        [Test]
+        public void Test_15_04()
+        {
+        }
+
+        [Test]
+        public void Test_15_05()
+        {
+        }
+
+        [Test]
+        public void Test_15_06()
+        {
+        }
+
+        [Test]
+        public void Test_15_07()
+        {
+        }
+
+        [Test]
+        public void Test_15_08()
+        {
+        }
+
+        [Test]
+        public void Test_15_09()
+        {
+        }
+
+        [Test]
+        public void Test_15_10()
+        {
+        }
+
+        [Test]
+        public void Test_15_11()
+        {
+        }
+
+        [Test]
+        public void Test_15_12()
+        {
+        }
+
+        [Test]
+        public void Test_15_13()
+        {
+        }
+
+        [Test]
+        public void Test_15_14()
+        {
+        }
+
+        [Test]
+        public void Test_15_15()
+        {
+        }
+
+        [Test]
+        public void Test_15_16()
+        {
+        }
+
+        [Test]
+        public void Test_15_17()
+        {
+        }
+
+        [Test]
+        public void Test_15_18()
+        {
+        }
+
+        [Test]
+        public void Test_15_19()
+        {
+        }
+
+        [Test]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_16
+    {
+        #region PassingTests
+        [Test]
+        public void Test_16_01()
+        {
+        }
+
+        [Test]
+        public void Test_16_02()
+        {
+        }
+
+        [Test]
+        public void Test_16_03()
+        {
+        }
+
+        [Test]
+        public void Test_16_04()
+        {
+        }
+
+        [Test]
+        public void Test_16_05()
+        {
+        }
+
+        [Test]
+        public void Test_16_06()
+        {
+        }
+
+        [Test]
+        public void Test_16_07()
+        {
+        }
+
+        [Test]
+        public void Test_16_08()
+        {
+        }
+
+        [Test]
+        public void Test_16_09()
+        {
+        }
+
+        [Test]
+        public void Test_16_10()
+        {
+        }
+
+        [Test]
+        public void Test_16_11()
+        {
+        }
+
+        [Test]
+        public void Test_16_12()
+        {
+        }
+
+        [Test]
+        public void Test_16_13()
+        {
+        }
+
+        [Test]
+        public void Test_16_14()
+        {
+        }
+
+        [Test]
+        public void Test_16_15()
+        {
+        }
+
+        [Test]
+        public void Test_16_16()
+        {
+        }
+
+        [Test]
+        public void Test_16_17()
+        {
+        }
+
+        [Test]
+        public void Test_16_18()
+        {
+        }
+
+        [Test]
+        public void Test_16_19()
+        {
+        }
+
+        [Test]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_17
+    {
+        #region PassingTests
+        [Test]
+        public void Test_17_01()
+        {
+        }
+
+        [Test]
+        public void Test_17_02()
+        {
+        }
+
+        [Test]
+        public void Test_17_03()
+        {
+        }
+
+        [Test]
+        public void Test_17_04()
+        {
+        }
+
+        [Test]
+        public void Test_17_05()
+        {
+        }
+
+        [Test]
+        public void Test_17_06()
+        {
+        }
+
+        [Test]
+        public void Test_17_07()
+        {
+        }
+
+        [Test]
+        public void Test_17_08()
+        {
+        }
+
+        [Test]
+        public void Test_17_09()
+        {
+        }
+
+        [Test]
+        public void Test_17_10()
+        {
+        }
+
+        [Test]
+        public void Test_17_11()
+        {
+        }
+
+        [Test]
+        public void Test_17_12()
+        {
+        }
+
+        [Test]
+        public void Test_17_13()
+        {
+        }
+
+        [Test]
+        public void Test_17_14()
+        {
+        }
+
+        [Test]
+        public void Test_17_15()
+        {
+        }
+
+        [Test]
+        public void Test_17_16()
+        {
+        }
+
+        [Test]
+        public void Test_17_17()
+        {
+        }
+
+        [Test]
+        public void Test_17_18()
+        {
+        }
+
+        [Test]
+        public void Test_17_19()
+        {
+        }
+
+        [Test]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_18
+    {
+        #region PassingTests
+        [Test]
+        public void Test_18_01()
+        {
+        }
+
+        [Test]
+        public void Test_18_02()
+        {
+        }
+
+        [Test]
+        public void Test_18_03()
+        {
+        }
+
+        [Test]
+        public void Test_18_04()
+        {
+        }
+
+        [Test]
+        public void Test_18_05()
+        {
+        }
+
+        [Test]
+        public void Test_18_06()
+        {
+        }
+
+        [Test]
+        public void Test_18_07()
+        {
+        }
+
+        [Test]
+        public void Test_18_08()
+        {
+        }
+
+        [Test]
+        public void Test_18_09()
+        {
+        }
+
+        [Test]
+        public void Test_18_10()
+        {
+        }
+
+        [Test]
+        public void Test_18_11()
+        {
+        }
+
+        [Test]
+        public void Test_18_12()
+        {
+        }
+
+        [Test]
+        public void Test_18_13()
+        {
+        }
+
+        [Test]
+        public void Test_18_14()
+        {
+        }
+
+        [Test]
+        public void Test_18_15()
+        {
+        }
+
+        [Test]
+        public void Test_18_16()
+        {
+        }
+
+        [Test]
+        public void Test_18_17()
+        {
+        }
+
+        [Test]
+        public void Test_18_18()
+        {
+        }
+
+        [Test]
+        public void Test_18_19()
+        {
+        }
+
+        [Test]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_19
+    {
+        #region PassingTests
+        [Test]
+        public void Test_19_01()
+        {
+        }
+
+        [Test]
+        public void Test_19_02()
+        {
+        }
+
+        [Test]
+        public void Test_19_03()
+        {
+        }
+
+        [Test]
+        public void Test_19_04()
+        {
+        }
+
+        [Test]
+        public void Test_19_05()
+        {
+        }
+
+        [Test]
+        public void Test_19_06()
+        {
+        }
+
+        [Test]
+        public void Test_19_07()
+        {
+        }
+
+        [Test]
+        public void Test_19_08()
+        {
+        }
+
+        [Test]
+        public void Test_19_09()
+        {
+        }
+
+        [Test]
+        public void Test_19_10()
+        {
+        }
+
+        [Test]
+        public void Test_19_11()
+        {
+        }
+
+        [Test]
+        public void Test_19_12()
+        {
+        }
+
+        [Test]
+        public void Test_19_13()
+        {
+        }
+
+        [Test]
+        public void Test_19_14()
+        {
+        }
+
+        [Test]
+        public void Test_19_15()
+        {
+        }
+
+        [Test]
+        public void Test_19_16()
+        {
+        }
+
+        [Test]
+        public void Test_19_17()
+        {
+        }
+
+        [Test]
+        public void Test_19_18()
+        {
+        }
+
+        [Test]
+        public void Test_19_19()
+        {
+        }
+
+        [Test]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_20
+    {
+        #region PassingTests
+        [Test]
+        public void Test_20_01()
+        {
+        }
+
+        [Test]
+        public void Test_20_02()
+        {
+        }
+
+        [Test]
+        public void Test_20_03()
+        {
+        }
+
+        [Test]
+        public void Test_20_04()
+        {
+        }
+
+        [Test]
+        public void Test_20_05()
+        {
+        }
+
+        [Test]
+        public void Test_20_06()
+        {
+        }
+
+        [Test]
+        public void Test_20_07()
+        {
+        }
+
+        [Test]
+        public void Test_20_08()
+        {
+        }
+
+        [Test]
+        public void Test_20_09()
+        {
+        }
+
+        [Test]
+        public void Test_20_10()
+        {
+        }
+
+        [Test]
+        public void Test_20_11()
+        {
+        }
+
+        [Test]
+        public void Test_20_12()
+        {
+        }
+
+        [Test]
+        public void Test_20_13()
+        {
+        }
+
+        [Test]
+        public void Test_20_14()
+        {
+        }
+
+        [Test]
+        public void Test_20_15()
+        {
+        }
+
+        [Test]
+        public void Test_20_16()
+        {
+        }
+
+        [Test]
+        public void Test_20_17()
+        {
+        }
+
+        [Test]
+        public void Test_20_18()
+        {
+        }
+
+        [Test]
+        public void Test_20_19()
+        {
+        }
+
+        [Test]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_21
+    {
+        #region PassingTests
+        [Test]
+        public void Test_21_01()
+        {
+        }
+
+        [Test]
+        public void Test_21_02()
+        {
+        }
+
+        [Test]
+        public void Test_21_03()
+        {
+        }
+
+        [Test]
+        public void Test_21_04()
+        {
+        }
+
+        [Test]
+        public void Test_21_05()
+        {
+        }
+
+        [Test]
+        public void Test_21_06()
+        {
+        }
+
+        [Test]
+        public void Test_21_07()
+        {
+        }
+
+        [Test]
+        public void Test_21_08()
+        {
+        }
+
+        [Test]
+        public void Test_21_09()
+        {
+        }
+
+        [Test]
+        public void Test_21_10()
+        {
+        }
+
+        [Test]
+        public void Test_21_11()
+        {
+        }
+
+        [Test]
+        public void Test_21_12()
+        {
+        }
+
+        [Test]
+        public void Test_21_13()
+        {
+        }
+
+        [Test]
+        public void Test_21_14()
+        {
+        }
+
+        [Test]
+        public void Test_21_15()
+        {
+        }
+
+        [Test]
+        public void Test_21_16()
+        {
+        }
+
+        [Test]
+        public void Test_21_17()
+        {
+        }
+
+        [Test]
+        public void Test_21_18()
+        {
+        }
+
+        [Test]
+        public void Test_21_19()
+        {
+        }
+
+        [Test]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_22
+    {
+        #region PassingTests
+        [Test]
+        public void Test_22_01()
+        {
+        }
+
+        [Test]
+        public void Test_22_02()
+        {
+        }
+
+        [Test]
+        public void Test_22_03()
+        {
+        }
+
+        [Test]
+        public void Test_22_04()
+        {
+        }
+
+        [Test]
+        public void Test_22_05()
+        {
+        }
+
+        [Test]
+        public void Test_22_06()
+        {
+        }
+
+        [Test]
+        public void Test_22_07()
+        {
+        }
+
+        [Test]
+        public void Test_22_08()
+        {
+        }
+
+        [Test]
+        public void Test_22_09()
+        {
+        }
+
+        [Test]
+        public void Test_22_10()
+        {
+        }
+
+        [Test]
+        public void Test_22_11()
+        {
+        }
+
+        [Test]
+        public void Test_22_12()
+        {
+        }
+
+        [Test]
+        public void Test_22_13()
+        {
+        }
+
+        [Test]
+        public void Test_22_14()
+        {
+        }
+
+        [Test]
+        public void Test_22_15()
+        {
+        }
+
+        [Test]
+        public void Test_22_16()
+        {
+        }
+
+        [Test]
+        public void Test_22_17()
+        {
+        }
+
+        [Test]
+        public void Test_22_18()
+        {
+        }
+
+        [Test]
+        public void Test_22_19()
+        {
+        }
+
+        [Test]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_23
+    {
+        #region PassingTests
+        [Test]
+        public void Test_23_01()
+        {
+        }
+
+        [Test]
+        public void Test_23_02()
+        {
+        }
+
+        [Test]
+        public void Test_23_03()
+        {
+        }
+
+        [Test]
+        public void Test_23_04()
+        {
+        }
+
+        [Test]
+        public void Test_23_05()
+        {
+        }
+
+        [Test]
+        public void Test_23_06()
+        {
+        }
+
+        [Test]
+        public void Test_23_07()
+        {
+        }
+
+        [Test]
+        public void Test_23_08()
+        {
+        }
+
+        [Test]
+        public void Test_23_09()
+        {
+        }
+
+        [Test]
+        public void Test_23_10()
+        {
+        }
+
+        [Test]
+        public void Test_23_11()
+        {
+        }
+
+        [Test]
+        public void Test_23_12()
+        {
+        }
+
+        [Test]
+        public void Test_23_13()
+        {
+        }
+
+        [Test]
+        public void Test_23_14()
+        {
+        }
+
+        [Test]
+        public void Test_23_15()
+        {
+        }
+
+        [Test]
+        public void Test_23_16()
+        {
+        }
+
+        [Test]
+        public void Test_23_17()
+        {
+        }
+
+        [Test]
+        public void Test_23_18()
+        {
+        }
+
+        [Test]
+        public void Test_23_19()
+        {
+        }
+
+        [Test]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_24
+    {
+        #region PassingTests
+        [Test]
+        public void Test_24_01()
+        {
+        }
+
+        [Test]
+        public void Test_24_02()
+        {
+        }
+
+        [Test]
+        public void Test_24_03()
+        {
+        }
+
+        [Test]
+        public void Test_24_04()
+        {
+        }
+
+        [Test]
+        public void Test_24_05()
+        {
+        }
+
+        [Test]
+        public void Test_24_06()
+        {
+        }
+
+        [Test]
+        public void Test_24_07()
+        {
+        }
+
+        [Test]
+        public void Test_24_08()
+        {
+        }
+
+        [Test]
+        public void Test_24_09()
+        {
+        }
+
+        [Test]
+        public void Test_24_10()
+        {
+        }
+
+        [Test]
+        public void Test_24_11()
+        {
+        }
+
+        [Test]
+        public void Test_24_12()
+        {
+        }
+
+        [Test]
+        public void Test_24_13()
+        {
+        }
+
+        [Test]
+        public void Test_24_14()
+        {
+        }
+
+        [Test]
+        public void Test_24_15()
+        {
+        }
+
+        [Test]
+        public void Test_24_16()
+        {
+        }
+
+        [Test]
+        public void Test_24_17()
+        {
+        }
+
+        [Test]
+        public void Test_24_18()
+        {
+        }
+
+        [Test]
+        public void Test_24_19()
+        {
+        }
+
+        [Test]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_25
+    {
+        #region PassingTests
+        [Test]
+        public void Test_25_01()
+        {
+        }
+
+        [Test]
+        public void Test_25_02()
+        {
+        }
+
+        [Test]
+        public void Test_25_03()
+        {
+        }
+
+        [Test]
+        public void Test_25_04()
+        {
+        }
+
+        [Test]
+        public void Test_25_05()
+        {
+        }
+
+        [Test]
+        public void Test_25_06()
+        {
+        }
+
+        [Test]
+        public void Test_25_07()
+        {
+        }
+
+        [Test]
+        public void Test_25_08()
+        {
+        }
+
+        [Test]
+        public void Test_25_09()
+        {
+        }
+
+        [Test]
+        public void Test_25_10()
+        {
+        }
+
+        [Test]
+        public void Test_25_11()
+        {
+        }
+
+        [Test]
+        public void Test_25_12()
+        {
+        }
+
+        [Test]
+        public void Test_25_13()
+        {
+        }
+
+        [Test]
+        public void Test_25_14()
+        {
+        }
+
+        [Test]
+        public void Test_25_15()
+        {
+        }
+
+        [Test]
+        public void Test_25_16()
+        {
+        }
+
+        [Test]
+        public void Test_25_17()
+        {
+        }
+
+        [Test]
+        public void Test_25_18()
+        {
+        }
+
+        [Test]
+        public void Test_25_19()
+        {
+        }
+
+        [Test]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_26
+    {
+        #region PassingTests
+        [Test]
+        public void Test_26_01()
+        {
+        }
+
+        [Test]
+        public void Test_26_02()
+        {
+        }
+
+        [Test]
+        public void Test_26_03()
+        {
+        }
+
+        [Test]
+        public void Test_26_04()
+        {
+        }
+
+        [Test]
+        public void Test_26_05()
+        {
+        }
+
+        [Test]
+        public void Test_26_06()
+        {
+        }
+
+        [Test]
+        public void Test_26_07()
+        {
+        }
+
+        [Test]
+        public void Test_26_08()
+        {
+        }
+
+        [Test]
+        public void Test_26_09()
+        {
+        }
+
+        [Test]
+        public void Test_26_10()
+        {
+        }
+
+        [Test]
+        public void Test_26_11()
+        {
+        }
+
+        [Test]
+        public void Test_26_12()
+        {
+        }
+
+        [Test]
+        public void Test_26_13()
+        {
+        }
+
+        [Test]
+        public void Test_26_14()
+        {
+        }
+
+        [Test]
+        public void Test_26_15()
+        {
+        }
+
+        [Test]
+        public void Test_26_16()
+        {
+        }
+
+        [Test]
+        public void Test_26_17()
+        {
+        }
+
+        [Test]
+        public void Test_26_18()
+        {
+        }
+
+        [Test]
+        public void Test_26_19()
+        {
+        }
+
+        [Test]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_27
+    {
+        #region PassingTests
+        [Test]
+        public void Test_27_01()
+        {
+        }
+
+        [Test]
+        public void Test_27_02()
+        {
+        }
+
+        [Test]
+        public void Test_27_03()
+        {
+        }
+
+        [Test]
+        public void Test_27_04()
+        {
+        }
+
+        [Test]
+        public void Test_27_05()
+        {
+        }
+
+        [Test]
+        public void Test_27_06()
+        {
+        }
+
+        [Test]
+        public void Test_27_07()
+        {
+        }
+
+        [Test]
+        public void Test_27_08()
+        {
+        }
+
+        [Test]
+        public void Test_27_09()
+        {
+        }
+
+        [Test]
+        public void Test_27_10()
+        {
+        }
+
+        [Test]
+        public void Test_27_11()
+        {
+        }
+
+        [Test]
+        public void Test_27_12()
+        {
+        }
+
+        [Test]
+        public void Test_27_13()
+        {
+        }
+
+        [Test]
+        public void Test_27_14()
+        {
+        }
+
+        [Test]
+        public void Test_27_15()
+        {
+        }
+
+        [Test]
+        public void Test_27_16()
+        {
+        }
+
+        [Test]
+        public void Test_27_17()
+        {
+        }
+
+        [Test]
+        public void Test_27_18()
+        {
+        }
+
+        [Test]
+        public void Test_27_19()
+        {
+        }
+
+        [Test]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_28
+    {
+        #region PassingTests
+        [Test]
+        public void Test_28_01()
+        {
+        }
+
+        [Test]
+        public void Test_28_02()
+        {
+        }
+
+        [Test]
+        public void Test_28_03()
+        {
+        }
+
+        [Test]
+        public void Test_28_04()
+        {
+        }
+
+        [Test]
+        public void Test_28_05()
+        {
+        }
+
+        [Test]
+        public void Test_28_06()
+        {
+        }
+
+        [Test]
+        public void Test_28_07()
+        {
+        }
+
+        [Test]
+        public void Test_28_08()
+        {
+        }
+
+        [Test]
+        public void Test_28_09()
+        {
+        }
+
+        [Test]
+        public void Test_28_10()
+        {
+        }
+
+        [Test]
+        public void Test_28_11()
+        {
+        }
+
+        [Test]
+        public void Test_28_12()
+        {
+        }
+
+        [Test]
+        public void Test_28_13()
+        {
+        }
+
+        [Test]
+        public void Test_28_14()
+        {
+        }
+
+        [Test]
+        public void Test_28_15()
+        {
+        }
+
+        [Test]
+        public void Test_28_16()
+        {
+        }
+
+        [Test]
+        public void Test_28_17()
+        {
+        }
+
+        [Test]
+        public void Test_28_18()
+        {
+        }
+
+        [Test]
+        public void Test_28_19()
+        {
+        }
+
+        [Test]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_29
+    {
+        #region PassingTests
+        [Test]
+        public void Test_29_01()
+        {
+        }
+
+        [Test]
+        public void Test_29_02()
+        {
+        }
+
+        [Test]
+        public void Test_29_03()
+        {
+        }
+
+        [Test]
+        public void Test_29_04()
+        {
+        }
+
+        [Test]
+        public void Test_29_05()
+        {
+        }
+
+        [Test]
+        public void Test_29_06()
+        {
+        }
+
+        [Test]
+        public void Test_29_07()
+        {
+        }
+
+        [Test]
+        public void Test_29_08()
+        {
+        }
+
+        [Test]
+        public void Test_29_09()
+        {
+        }
+
+        [Test]
+        public void Test_29_10()
+        {
+        }
+
+        [Test]
+        public void Test_29_11()
+        {
+        }
+
+        [Test]
+        public void Test_29_12()
+        {
+        }
+
+        [Test]
+        public void Test_29_13()
+        {
+        }
+
+        [Test]
+        public void Test_29_14()
+        {
+        }
+
+        [Test]
+        public void Test_29_15()
+        {
+        }
+
+        [Test]
+        public void Test_29_16()
+        {
+        }
+
+        [Test]
+        public void Test_29_17()
+        {
+        }
+
+        [Test]
+        public void Test_29_18()
+        {
+        }
+
+        [Test]
+        public void Test_29_19()
+        {
+        }
+
+        [Test]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_30
+    {
+        #region PassingTests
+        [Test]
+        public void Test_30_01()
+        {
+        }
+
+        [Test]
+        public void Test_30_02()
+        {
+        }
+
+        [Test]
+        public void Test_30_03()
+        {
+        }
+
+        [Test]
+        public void Test_30_04()
+        {
+        }
+
+        [Test]
+        public void Test_30_05()
+        {
+        }
+
+        [Test]
+        public void Test_30_06()
+        {
+        }
+
+        [Test]
+        public void Test_30_07()
+        {
+        }
+
+        [Test]
+        public void Test_30_08()
+        {
+        }
+
+        [Test]
+        public void Test_30_09()
+        {
+        }
+
+        [Test]
+        public void Test_30_10()
+        {
+        }
+
+        [Test]
+        public void Test_30_11()
+        {
+        }
+
+        [Test]
+        public void Test_30_12()
+        {
+        }
+
+        [Test]
+        public void Test_30_13()
+        {
+        }
+
+        [Test]
+        public void Test_30_14()
+        {
+        }
+
+        [Test]
+        public void Test_30_15()
+        {
+        }
+
+        [Test]
+        public void Test_30_16()
+        {
+        }
+
+        [Test]
+        public void Test_30_17()
+        {
+        }
+
+        [Test]
+        public void Test_30_18()
+        {
+        }
+
+        [Test]
+        public void Test_30_19()
+        {
+        }
+
+        [Test]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_31
+    {
+        #region PassingTests
+        [Test]
+        public void Test_31_01()
+        {
+        }
+
+        [Test]
+        public void Test_31_02()
+        {
+        }
+
+        [Test]
+        public void Test_31_03()
+        {
+        }
+
+        [Test]
+        public void Test_31_04()
+        {
+        }
+
+        [Test]
+        public void Test_31_05()
+        {
+        }
+
+        [Test]
+        public void Test_31_06()
+        {
+        }
+
+        [Test]
+        public void Test_31_07()
+        {
+        }
+
+        [Test]
+        public void Test_31_08()
+        {
+        }
+
+        [Test]
+        public void Test_31_09()
+        {
+        }
+
+        [Test]
+        public void Test_31_10()
+        {
+        }
+
+        [Test]
+        public void Test_31_11()
+        {
+        }
+
+        [Test]
+        public void Test_31_12()
+        {
+        }
+
+        [Test]
+        public void Test_31_13()
+        {
+        }
+
+        [Test]
+        public void Test_31_14()
+        {
+        }
+
+        [Test]
+        public void Test_31_15()
+        {
+        }
+
+        [Test]
+        public void Test_31_16()
+        {
+        }
+
+        [Test]
+        public void Test_31_17()
+        {
+        }
+
+        [Test]
+        public void Test_31_18()
+        {
+        }
+
+        [Test]
+        public void Test_31_19()
+        {
+        }
+
+        [Test]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_32
+    {
+        #region PassingTests
+        [Test]
+        public void Test_32_01()
+        {
+        }
+
+        [Test]
+        public void Test_32_02()
+        {
+        }
+
+        [Test]
+        public void Test_32_03()
+        {
+        }
+
+        [Test]
+        public void Test_32_04()
+        {
+        }
+
+        [Test]
+        public void Test_32_05()
+        {
+        }
+
+        [Test]
+        public void Test_32_06()
+        {
+        }
+
+        [Test]
+        public void Test_32_07()
+        {
+        }
+
+        [Test]
+        public void Test_32_08()
+        {
+        }
+
+        [Test]
+        public void Test_32_09()
+        {
+        }
+
+        [Test]
+        public void Test_32_10()
+        {
+        }
+
+        [Test]
+        public void Test_32_11()
+        {
+        }
+
+        [Test]
+        public void Test_32_12()
+        {
+        }
+
+        [Test]
+        public void Test_32_13()
+        {
+        }
+
+        [Test]
+        public void Test_32_14()
+        {
+        }
+
+        [Test]
+        public void Test_32_15()
+        {
+        }
+
+        [Test]
+        public void Test_32_16()
+        {
+        }
+
+        [Test]
+        public void Test_32_17()
+        {
+        }
+
+        [Test]
+        public void Test_32_18()
+        {
+        }
+
+        [Test]
+        public void Test_32_19()
+        {
+        }
+
+        [Test]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_33
+    {
+        #region PassingTests
+        [Test]
+        public void Test_33_01()
+        {
+        }
+
+        [Test]
+        public void Test_33_02()
+        {
+        }
+
+        [Test]
+        public void Test_33_03()
+        {
+        }
+
+        [Test]
+        public void Test_33_04()
+        {
+        }
+
+        [Test]
+        public void Test_33_05()
+        {
+        }
+
+        [Test]
+        public void Test_33_06()
+        {
+        }
+
+        [Test]
+        public void Test_33_07()
+        {
+        }
+
+        [Test]
+        public void Test_33_08()
+        {
+        }
+
+        [Test]
+        public void Test_33_09()
+        {
+        }
+
+        [Test]
+        public void Test_33_10()
+        {
+        }
+
+        [Test]
+        public void Test_33_11()
+        {
+        }
+
+        [Test]
+        public void Test_33_12()
+        {
+        }
+
+        [Test]
+        public void Test_33_13()
+        {
+        }
+
+        [Test]
+        public void Test_33_14()
+        {
+        }
+
+        [Test]
+        public void Test_33_15()
+        {
+        }
+
+        [Test]
+        public void Test_33_16()
+        {
+        }
+
+        [Test]
+        public void Test_33_17()
+        {
+        }
+
+        [Test]
+        public void Test_33_18()
+        {
+        }
+
+        [Test]
+        public void Test_33_19()
+        {
+        }
+
+        [Test]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_34
+    {
+        #region PassingTests
+        [Test]
+        public void Test_34_01()
+        {
+        }
+
+        [Test]
+        public void Test_34_02()
+        {
+        }
+
+        [Test]
+        public void Test_34_03()
+        {
+        }
+
+        [Test]
+        public void Test_34_04()
+        {
+        }
+
+        [Test]
+        public void Test_34_05()
+        {
+        }
+
+        [Test]
+        public void Test_34_06()
+        {
+        }
+
+        [Test]
+        public void Test_34_07()
+        {
+        }
+
+        [Test]
+        public void Test_34_08()
+        {
+        }
+
+        [Test]
+        public void Test_34_09()
+        {
+        }
+
+        [Test]
+        public void Test_34_10()
+        {
+        }
+
+        [Test]
+        public void Test_34_11()
+        {
+        }
+
+        [Test]
+        public void Test_34_12()
+        {
+        }
+
+        [Test]
+        public void Test_34_13()
+        {
+        }
+
+        [Test]
+        public void Test_34_14()
+        {
+        }
+
+        [Test]
+        public void Test_34_15()
+        {
+        }
+
+        [Test]
+        public void Test_34_16()
+        {
+        }
+
+        [Test]
+        public void Test_34_17()
+        {
+        }
+
+        [Test]
+        public void Test_34_18()
+        {
+        }
+
+        [Test]
+        public void Test_34_19()
+        {
+        }
+
+        [Test]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_35
+    {
+        #region PassingTests
+        [Test]
+        public void Test_35_01()
+        {
+        }
+
+        [Test]
+        public void Test_35_02()
+        {
+        }
+
+        [Test]
+        public void Test_35_03()
+        {
+        }
+
+        [Test]
+        public void Test_35_04()
+        {
+        }
+
+        [Test]
+        public void Test_35_05()
+        {
+        }
+
+        [Test]
+        public void Test_35_06()
+        {
+        }
+
+        [Test]
+        public void Test_35_07()
+        {
+        }
+
+        [Test]
+        public void Test_35_08()
+        {
+        }
+
+        [Test]
+        public void Test_35_09()
+        {
+        }
+
+        [Test]
+        public void Test_35_10()
+        {
+        }
+
+        [Test]
+        public void Test_35_11()
+        {
+        }
+
+        [Test]
+        public void Test_35_12()
+        {
+        }
+
+        [Test]
+        public void Test_35_13()
+        {
+        }
+
+        [Test]
+        public void Test_35_14()
+        {
+        }
+
+        [Test]
+        public void Test_35_15()
+        {
+        }
+
+        [Test]
+        public void Test_35_16()
+        {
+        }
+
+        [Test]
+        public void Test_35_17()
+        {
+        }
+
+        [Test]
+        public void Test_35_18()
+        {
+        }
+
+        [Test]
+        public void Test_35_19()
+        {
+        }
+
+        [Test]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_36
+    {
+        #region PassingTests
+        [Test]
+        public void Test_36_01()
+        {
+        }
+
+        [Test]
+        public void Test_36_02()
+        {
+        }
+
+        [Test]
+        public void Test_36_03()
+        {
+        }
+
+        [Test]
+        public void Test_36_04()
+        {
+        }
+
+        [Test]
+        public void Test_36_05()
+        {
+        }
+
+        [Test]
+        public void Test_36_06()
+        {
+        }
+
+        [Test]
+        public void Test_36_07()
+        {
+        }
+
+        [Test]
+        public void Test_36_08()
+        {
+        }
+
+        [Test]
+        public void Test_36_09()
+        {
+        }
+
+        [Test]
+        public void Test_36_10()
+        {
+        }
+
+        [Test]
+        public void Test_36_11()
+        {
+        }
+
+        [Test]
+        public void Test_36_12()
+        {
+        }
+
+        [Test]
+        public void Test_36_13()
+        {
+        }
+
+        [Test]
+        public void Test_36_14()
+        {
+        }
+
+        [Test]
+        public void Test_36_15()
+        {
+        }
+
+        [Test]
+        public void Test_36_16()
+        {
+        }
+
+        [Test]
+        public void Test_36_17()
+        {
+        }
+
+        [Test]
+        public void Test_36_18()
+        {
+        }
+
+        [Test]
+        public void Test_36_19()
+        {
+        }
+
+        [Test]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_37
+    {
+        #region PassingTests
+        [Test]
+        public void Test_37_01()
+        {
+        }
+
+        [Test]
+        public void Test_37_02()
+        {
+        }
+
+        [Test]
+        public void Test_37_03()
+        {
+        }
+
+        [Test]
+        public void Test_37_04()
+        {
+        }
+
+        [Test]
+        public void Test_37_05()
+        {
+        }
+
+        [Test]
+        public void Test_37_06()
+        {
+        }
+
+        [Test]
+        public void Test_37_07()
+        {
+        }
+
+        [Test]
+        public void Test_37_08()
+        {
+        }
+
+        [Test]
+        public void Test_37_09()
+        {
+        }
+
+        [Test]
+        public void Test_37_10()
+        {
+        }
+
+        [Test]
+        public void Test_37_11()
+        {
+        }
+
+        [Test]
+        public void Test_37_12()
+        {
+        }
+
+        [Test]
+        public void Test_37_13()
+        {
+        }
+
+        [Test]
+        public void Test_37_14()
+        {
+        }
+
+        [Test]
+        public void Test_37_15()
+        {
+        }
+
+        [Test]
+        public void Test_37_16()
+        {
+        }
+
+        [Test]
+        public void Test_37_17()
+        {
+        }
+
+        [Test]
+        public void Test_37_18()
+        {
+        }
+
+        [Test]
+        public void Test_37_19()
+        {
+        }
+
+        [Test]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_38
+    {
+        #region PassingTests
+        [Test]
+        public void Test_38_01()
+        {
+        }
+
+        [Test]
+        public void Test_38_02()
+        {
+        }
+
+        [Test]
+        public void Test_38_03()
+        {
+        }
+
+        [Test]
+        public void Test_38_04()
+        {
+        }
+
+        [Test]
+        public void Test_38_05()
+        {
+        }
+
+        [Test]
+        public void Test_38_06()
+        {
+        }
+
+        [Test]
+        public void Test_38_07()
+        {
+        }
+
+        [Test]
+        public void Test_38_08()
+        {
+        }
+
+        [Test]
+        public void Test_38_09()
+        {
+        }
+
+        [Test]
+        public void Test_38_10()
+        {
+        }
+
+        [Test]
+        public void Test_38_11()
+        {
+        }
+
+        [Test]
+        public void Test_38_12()
+        {
+        }
+
+        [Test]
+        public void Test_38_13()
+        {
+        }
+
+        [Test]
+        public void Test_38_14()
+        {
+        }
+
+        [Test]
+        public void Test_38_15()
+        {
+        }
+
+        [Test]
+        public void Test_38_16()
+        {
+        }
+
+        [Test]
+        public void Test_38_17()
+        {
+        }
+
+        [Test]
+        public void Test_38_18()
+        {
+        }
+
+        [Test]
+        public void Test_38_19()
+        {
+        }
+
+        [Test]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_39
+    {
+        #region PassingTests
+        [Test]
+        public void Test_39_01()
+        {
+        }
+
+        [Test]
+        public void Test_39_02()
+        {
+        }
+
+        [Test]
+        public void Test_39_03()
+        {
+        }
+
+        [Test]
+        public void Test_39_04()
+        {
+        }
+
+        [Test]
+        public void Test_39_05()
+        {
+        }
+
+        [Test]
+        public void Test_39_06()
+        {
+        }
+
+        [Test]
+        public void Test_39_07()
+        {
+        }
+
+        [Test]
+        public void Test_39_08()
+        {
+        }
+
+        [Test]
+        public void Test_39_09()
+        {
+        }
+
+        [Test]
+        public void Test_39_10()
+        {
+        }
+
+        [Test]
+        public void Test_39_11()
+        {
+        }
+
+        [Test]
+        public void Test_39_12()
+        {
+        }
+
+        [Test]
+        public void Test_39_13()
+        {
+        }
+
+        [Test]
+        public void Test_39_14()
+        {
+        }
+
+        [Test]
+        public void Test_39_15()
+        {
+        }
+
+        [Test]
+        public void Test_39_16()
+        {
+        }
+
+        [Test]
+        public void Test_39_17()
+        {
+        }
+
+        [Test]
+        public void Test_39_18()
+        {
+        }
+
+        [Test]
+        public void Test_39_19()
+        {
+        }
+
+        [Test]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_40
+    {
+        #region PassingTests
+        [Test]
+        public void Test_40_01()
+        {
+        }
+
+        [Test]
+        public void Test_40_02()
+        {
+        }
+
+        [Test]
+        public void Test_40_03()
+        {
+        }
+
+        [Test]
+        public void Test_40_04()
+        {
+        }
+
+        [Test]
+        public void Test_40_05()
+        {
+        }
+
+        [Test]
+        public void Test_40_06()
+        {
+        }
+
+        [Test]
+        public void Test_40_07()
+        {
+        }
+
+        [Test]
+        public void Test_40_08()
+        {
+        }
+
+        [Test]
+        public void Test_40_09()
+        {
+        }
+
+        [Test]
+        public void Test_40_10()
+        {
+        }
+
+        [Test]
+        public void Test_40_11()
+        {
+        }
+
+        [Test]
+        public void Test_40_12()
+        {
+        }
+
+        [Test]
+        public void Test_40_13()
+        {
+        }
+
+        [Test]
+        public void Test_40_14()
+        {
+        }
+
+        [Test]
+        public void Test_40_15()
+        {
+        }
+
+        [Test]
+        public void Test_40_16()
+        {
+        }
+
+        [Test]
+        public void Test_40_17()
+        {
+        }
+
+        [Test]
+        public void Test_40_18()
+        {
+        }
+
+        [Test]
+        public void Test_40_19()
+        {
+        }
+
+        [Test]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_41
+    {
+        #region PassingTests
+        [Test]
+        public void Test_41_01()
+        {
+        }
+
+        [Test]
+        public void Test_41_02()
+        {
+        }
+
+        [Test]
+        public void Test_41_03()
+        {
+        }
+
+        [Test]
+        public void Test_41_04()
+        {
+        }
+
+        [Test]
+        public void Test_41_05()
+        {
+        }
+
+        [Test]
+        public void Test_41_06()
+        {
+        }
+
+        [Test]
+        public void Test_41_07()
+        {
+        }
+
+        [Test]
+        public void Test_41_08()
+        {
+        }
+
+        [Test]
+        public void Test_41_09()
+        {
+        }
+
+        [Test]
+        public void Test_41_10()
+        {
+        }
+
+        [Test]
+        public void Test_41_11()
+        {
+        }
+
+        [Test]
+        public void Test_41_12()
+        {
+        }
+
+        [Test]
+        public void Test_41_13()
+        {
+        }
+
+        [Test]
+        public void Test_41_14()
+        {
+        }
+
+        [Test]
+        public void Test_41_15()
+        {
+        }
+
+        [Test]
+        public void Test_41_16()
+        {
+        }
+
+        [Test]
+        public void Test_41_17()
+        {
+        }
+
+        [Test]
+        public void Test_41_18()
+        {
+        }
+
+        [Test]
+        public void Test_41_19()
+        {
+        }
+
+        [Test]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_42
+    {
+        #region PassingTests
+        [Test]
+        public void Test_42_01()
+        {
+        }
+
+        [Test]
+        public void Test_42_02()
+        {
+        }
+
+        [Test]
+        public void Test_42_03()
+        {
+        }
+
+        [Test]
+        public void Test_42_04()
+        {
+        }
+
+        [Test]
+        public void Test_42_05()
+        {
+        }
+
+        [Test]
+        public void Test_42_06()
+        {
+        }
+
+        [Test]
+        public void Test_42_07()
+        {
+        }
+
+        [Test]
+        public void Test_42_08()
+        {
+        }
+
+        [Test]
+        public void Test_42_09()
+        {
+        }
+
+        [Test]
+        public void Test_42_10()
+        {
+        }
+
+        [Test]
+        public void Test_42_11()
+        {
+        }
+
+        [Test]
+        public void Test_42_12()
+        {
+        }
+
+        [Test]
+        public void Test_42_13()
+        {
+        }
+
+        [Test]
+        public void Test_42_14()
+        {
+        }
+
+        [Test]
+        public void Test_42_15()
+        {
+        }
+
+        [Test]
+        public void Test_42_16()
+        {
+        }
+
+        [Test]
+        public void Test_42_17()
+        {
+        }
+
+        [Test]
+        public void Test_42_18()
+        {
+        }
+
+        [Test]
+        public void Test_42_19()
+        {
+        }
+
+        [Test]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_43
+    {
+        #region PassingTests
+        [Test]
+        public void Test_43_01()
+        {
+        }
+
+        [Test]
+        public void Test_43_02()
+        {
+        }
+
+        [Test]
+        public void Test_43_03()
+        {
+        }
+
+        [Test]
+        public void Test_43_04()
+        {
+        }
+
+        [Test]
+        public void Test_43_05()
+        {
+        }
+
+        [Test]
+        public void Test_43_06()
+        {
+        }
+
+        [Test]
+        public void Test_43_07()
+        {
+        }
+
+        [Test]
+        public void Test_43_08()
+        {
+        }
+
+        [Test]
+        public void Test_43_09()
+        {
+        }
+
+        [Test]
+        public void Test_43_10()
+        {
+        }
+
+        [Test]
+        public void Test_43_11()
+        {
+        }
+
+        [Test]
+        public void Test_43_12()
+        {
+        }
+
+        [Test]
+        public void Test_43_13()
+        {
+        }
+
+        [Test]
+        public void Test_43_14()
+        {
+        }
+
+        [Test]
+        public void Test_43_15()
+        {
+        }
+
+        [Test]
+        public void Test_43_16()
+        {
+        }
+
+        [Test]
+        public void Test_43_17()
+        {
+        }
+
+        [Test]
+        public void Test_43_18()
+        {
+        }
+
+        [Test]
+        public void Test_43_19()
+        {
+        }
+
+        [Test]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_44
+    {
+        #region PassingTests
+        [Test]
+        public void Test_44_01()
+        {
+        }
+
+        [Test]
+        public void Test_44_02()
+        {
+        }
+
+        [Test]
+        public void Test_44_03()
+        {
+        }
+
+        [Test]
+        public void Test_44_04()
+        {
+        }
+
+        [Test]
+        public void Test_44_05()
+        {
+        }
+
+        [Test]
+        public void Test_44_06()
+        {
+        }
+
+        [Test]
+        public void Test_44_07()
+        {
+        }
+
+        [Test]
+        public void Test_44_08()
+        {
+        }
+
+        [Test]
+        public void Test_44_09()
+        {
+        }
+
+        [Test]
+        public void Test_44_10()
+        {
+        }
+
+        [Test]
+        public void Test_44_11()
+        {
+        }
+
+        [Test]
+        public void Test_44_12()
+        {
+        }
+
+        [Test]
+        public void Test_44_13()
+        {
+        }
+
+        [Test]
+        public void Test_44_14()
+        {
+        }
+
+        [Test]
+        public void Test_44_15()
+        {
+        }
+
+        [Test]
+        public void Test_44_16()
+        {
+        }
+
+        [Test]
+        public void Test_44_17()
+        {
+        }
+
+        [Test]
+        public void Test_44_18()
+        {
+        }
+
+        [Test]
+        public void Test_44_19()
+        {
+        }
+
+        [Test]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_45
+    {
+        #region PassingTests
+        [Test]
+        public void Test_45_01()
+        {
+        }
+
+        [Test]
+        public void Test_45_02()
+        {
+        }
+
+        [Test]
+        public void Test_45_03()
+        {
+        }
+
+        [Test]
+        public void Test_45_04()
+        {
+        }
+
+        [Test]
+        public void Test_45_05()
+        {
+        }
+
+        [Test]
+        public void Test_45_06()
+        {
+        }
+
+        [Test]
+        public void Test_45_07()
+        {
+        }
+
+        [Test]
+        public void Test_45_08()
+        {
+        }
+
+        [Test]
+        public void Test_45_09()
+        {
+        }
+
+        [Test]
+        public void Test_45_10()
+        {
+        }
+
+        [Test]
+        public void Test_45_11()
+        {
+        }
+
+        [Test]
+        public void Test_45_12()
+        {
+        }
+
+        [Test]
+        public void Test_45_13()
+        {
+        }
+
+        [Test]
+        public void Test_45_14()
+        {
+        }
+
+        [Test]
+        public void Test_45_15()
+        {
+        }
+
+        [Test]
+        public void Test_45_16()
+        {
+        }
+
+        [Test]
+        public void Test_45_17()
+        {
+        }
+
+        [Test]
+        public void Test_45_18()
+        {
+        }
+
+        [Test]
+        public void Test_45_19()
+        {
+        }
+
+        [Test]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_46
+    {
+        #region PassingTests
+        [Test]
+        public void Test_46_01()
+        {
+        }
+
+        [Test]
+        public void Test_46_02()
+        {
+        }
+
+        [Test]
+        public void Test_46_03()
+        {
+        }
+
+        [Test]
+        public void Test_46_04()
+        {
+        }
+
+        [Test]
+        public void Test_46_05()
+        {
+        }
+
+        [Test]
+        public void Test_46_06()
+        {
+        }
+
+        [Test]
+        public void Test_46_07()
+        {
+        }
+
+        [Test]
+        public void Test_46_08()
+        {
+        }
+
+        [Test]
+        public void Test_46_09()
+        {
+        }
+
+        [Test]
+        public void Test_46_10()
+        {
+        }
+
+        [Test]
+        public void Test_46_11()
+        {
+        }
+
+        [Test]
+        public void Test_46_12()
+        {
+        }
+
+        [Test]
+        public void Test_46_13()
+        {
+        }
+
+        [Test]
+        public void Test_46_14()
+        {
+        }
+
+        [Test]
+        public void Test_46_15()
+        {
+        }
+
+        [Test]
+        public void Test_46_16()
+        {
+        }
+
+        [Test]
+        public void Test_46_17()
+        {
+        }
+
+        [Test]
+        public void Test_46_18()
+        {
+        }
+
+        [Test]
+        public void Test_46_19()
+        {
+        }
+
+        [Test]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_47
+    {
+        #region PassingTests
+        [Test]
+        public void Test_47_01()
+        {
+        }
+
+        [Test]
+        public void Test_47_02()
+        {
+        }
+
+        [Test]
+        public void Test_47_03()
+        {
+        }
+
+        [Test]
+        public void Test_47_04()
+        {
+        }
+
+        [Test]
+        public void Test_47_05()
+        {
+        }
+
+        [Test]
+        public void Test_47_06()
+        {
+        }
+
+        [Test]
+        public void Test_47_07()
+        {
+        }
+
+        [Test]
+        public void Test_47_08()
+        {
+        }
+
+        [Test]
+        public void Test_47_09()
+        {
+        }
+
+        [Test]
+        public void Test_47_10()
+        {
+        }
+
+        [Test]
+        public void Test_47_11()
+        {
+        }
+
+        [Test]
+        public void Test_47_12()
+        {
+        }
+
+        [Test]
+        public void Test_47_13()
+        {
+        }
+
+        [Test]
+        public void Test_47_14()
+        {
+        }
+
+        [Test]
+        public void Test_47_15()
+        {
+        }
+
+        [Test]
+        public void Test_47_16()
+        {
+        }
+
+        [Test]
+        public void Test_47_17()
+        {
+        }
+
+        [Test]
+        public void Test_47_18()
+        {
+        }
+
+        [Test]
+        public void Test_47_19()
+        {
+        }
+
+        [Test]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_48
+    {
+        #region PassingTests
+        [Test]
+        public void Test_48_01()
+        {
+        }
+
+        [Test]
+        public void Test_48_02()
+        {
+        }
+
+        [Test]
+        public void Test_48_03()
+        {
+        }
+
+        [Test]
+        public void Test_48_04()
+        {
+        }
+
+        [Test]
+        public void Test_48_05()
+        {
+        }
+
+        [Test]
+        public void Test_48_06()
+        {
+        }
+
+        [Test]
+        public void Test_48_07()
+        {
+        }
+
+        [Test]
+        public void Test_48_08()
+        {
+        }
+
+        [Test]
+        public void Test_48_09()
+        {
+        }
+
+        [Test]
+        public void Test_48_10()
+        {
+        }
+
+        [Test]
+        public void Test_48_11()
+        {
+        }
+
+        [Test]
+        public void Test_48_12()
+        {
+        }
+
+        [Test]
+        public void Test_48_13()
+        {
+        }
+
+        [Test]
+        public void Test_48_14()
+        {
+        }
+
+        [Test]
+        public void Test_48_15()
+        {
+        }
+
+        [Test]
+        public void Test_48_16()
+        {
+        }
+
+        [Test]
+        public void Test_48_17()
+        {
+        }
+
+        [Test]
+        public void Test_48_18()
+        {
+        }
+
+        [Test]
+        public void Test_48_19()
+        {
+        }
+
+        [Test]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_49
+    {
+        #region PassingTests
+        [Test]
+        public void Test_49_01()
+        {
+        }
+
+        [Test]
+        public void Test_49_02()
+        {
+        }
+
+        [Test]
+        public void Test_49_03()
+        {
+        }
+
+        [Test]
+        public void Test_49_04()
+        {
+        }
+
+        [Test]
+        public void Test_49_05()
+        {
+        }
+
+        [Test]
+        public void Test_49_06()
+        {
+        }
+
+        [Test]
+        public void Test_49_07()
+        {
+        }
+
+        [Test]
+        public void Test_49_08()
+        {
+        }
+
+        [Test]
+        public void Test_49_09()
+        {
+        }
+
+        [Test]
+        public void Test_49_10()
+        {
+        }
+
+        [Test]
+        public void Test_49_11()
+        {
+        }
+
+        [Test]
+        public void Test_49_12()
+        {
+        }
+
+        [Test]
+        public void Test_49_13()
+        {
+        }
+
+        [Test]
+        public void Test_49_14()
+        {
+        }
+
+        [Test]
+        public void Test_49_15()
+        {
+        }
+
+        [Test]
+        public void Test_49_16()
+        {
+        }
+
+        [Test]
+        public void Test_49_17()
+        {
+        }
+
+        [Test]
+        public void Test_49_18()
+        {
+        }
+
+        [Test]
+        public void Test_49_19()
+        {
+        }
+
+        [Test]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_50
+    {
+        #region PassingTests
+        [Test]
+        public void Test_50_01()
+        {
+        }
+
+        [Test]
+        public void Test_50_02()
+        {
+        }
+
+        [Test]
+        public void Test_50_03()
+        {
+        }
+
+        [Test]
+        public void Test_50_04()
+        {
+        }
+
+        [Test]
+        public void Test_50_05()
+        {
+        }
+
+        [Test]
+        public void Test_50_06()
+        {
+        }
+
+        [Test]
+        public void Test_50_07()
+        {
+        }
+
+        [Test]
+        public void Test_50_08()
+        {
+        }
+
+        [Test]
+        public void Test_50_09()
+        {
+        }
+
+        [Test]
+        public void Test_50_10()
+        {
+        }
+
+        [Test]
+        public void Test_50_11()
+        {
+        }
+
+        [Test]
+        public void Test_50_12()
+        {
+        }
+
+        [Test]
+        public void Test_50_13()
+        {
+        }
+
+        [Test]
+        public void Test_50_14()
+        {
+        }
+
+        [Test]
+        public void Test_50_15()
+        {
+        }
+
+        [Test]
+        public void Test_50_16()
+        {
+        }
+
+        [Test]
+        public void Test_50_17()
+        {
+        }
+
+        [Test]
+        public void Test_50_18()
+        {
+        }
+
+        [Test]
+        public void Test_50_19()
+        {
+        }
+
+        [Test]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_51
+    {
+        #region PassingTests
+        [Test]
+        public void Test_51_01()
+        {
+        }
+
+        [Test]
+        public void Test_51_02()
+        {
+        }
+
+        [Test]
+        public void Test_51_03()
+        {
+        }
+
+        [Test]
+        public void Test_51_04()
+        {
+        }
+
+        [Test]
+        public void Test_51_05()
+        {
+        }
+
+        [Test]
+        public void Test_51_06()
+        {
+        }
+
+        [Test]
+        public void Test_51_07()
+        {
+        }
+
+        [Test]
+        public void Test_51_08()
+        {
+        }
+
+        [Test]
+        public void Test_51_09()
+        {
+        }
+
+        [Test]
+        public void Test_51_10()
+        {
+        }
+
+        [Test]
+        public void Test_51_11()
+        {
+        }
+
+        [Test]
+        public void Test_51_12()
+        {
+        }
+
+        [Test]
+        public void Test_51_13()
+        {
+        }
+
+        [Test]
+        public void Test_51_14()
+        {
+        }
+
+        [Test]
+        public void Test_51_15()
+        {
+        }
+
+        [Test]
+        public void Test_51_16()
+        {
+        }
+
+        [Test]
+        public void Test_51_17()
+        {
+        }
+
+        [Test]
+        public void Test_51_18()
+        {
+        }
+
+        [Test]
+        public void Test_51_19()
+        {
+        }
+
+        [Test]
+        public void Test_51_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_52
+    {
+        #region PassingTests
+        [Test]
+        public void Test_52_01()
+        {
+        }
+
+        [Test]
+        public void Test_52_02()
+        {
+        }
+
+        [Test]
+        public void Test_52_03()
+        {
+        }
+
+        [Test]
+        public void Test_52_04()
+        {
+        }
+
+        [Test]
+        public void Test_52_05()
+        {
+        }
+
+        [Test]
+        public void Test_52_06()
+        {
+        }
+
+        [Test]
+        public void Test_52_07()
+        {
+        }
+
+        [Test]
+        public void Test_52_08()
+        {
+        }
+
+        [Test]
+        public void Test_52_09()
+        {
+        }
+
+        [Test]
+        public void Test_52_10()
+        {
+        }
+
+        [Test]
+        public void Test_52_11()
+        {
+        }
+
+        [Test]
+        public void Test_52_12()
+        {
+        }
+
+        [Test]
+        public void Test_52_13()
+        {
+        }
+
+        [Test]
+        public void Test_52_14()
+        {
+        }
+
+        [Test]
+        public void Test_52_15()
+        {
+        }
+
+        [Test]
+        public void Test_52_16()
+        {
+        }
+
+        [Test]
+        public void Test_52_17()
+        {
+        }
+
+        [Test]
+        public void Test_52_18()
+        {
+        }
+
+        [Test]
+        public void Test_52_19()
+        {
+        }
+
+        [Test]
+        public void Test_52_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_53
+    {
+        #region PassingTests
+        [Test]
+        public void Test_53_01()
+        {
+        }
+
+        [Test]
+        public void Test_53_02()
+        {
+        }
+
+        [Test]
+        public void Test_53_03()
+        {
+        }
+
+        [Test]
+        public void Test_53_04()
+        {
+        }
+
+        [Test]
+        public void Test_53_05()
+        {
+        }
+
+        [Test]
+        public void Test_53_06()
+        {
+        }
+
+        [Test]
+        public void Test_53_07()
+        {
+        }
+
+        [Test]
+        public void Test_53_08()
+        {
+        }
+
+        [Test]
+        public void Test_53_09()
+        {
+        }
+
+        [Test]
+        public void Test_53_10()
+        {
+        }
+
+        [Test]
+        public void Test_53_11()
+        {
+        }
+
+        [Test]
+        public void Test_53_12()
+        {
+        }
+
+        [Test]
+        public void Test_53_13()
+        {
+        }
+
+        [Test]
+        public void Test_53_14()
+        {
+        }
+
+        [Test]
+        public void Test_53_15()
+        {
+        }
+
+        [Test]
+        public void Test_53_16()
+        {
+        }
+
+        [Test]
+        public void Test_53_17()
+        {
+        }
+
+        [Test]
+        public void Test_53_18()
+        {
+        }
+
+        [Test]
+        public void Test_53_19()
+        {
+        }
+
+        [Test]
+        public void Test_53_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_54
+    {
+        #region PassingTests
+        [Test]
+        public void Test_54_01()
+        {
+        }
+
+        [Test]
+        public void Test_54_02()
+        {
+        }
+
+        [Test]
+        public void Test_54_03()
+        {
+        }
+
+        [Test]
+        public void Test_54_04()
+        {
+        }
+
+        [Test]
+        public void Test_54_05()
+        {
+        }
+
+        [Test]
+        public void Test_54_06()
+        {
+        }
+
+        [Test]
+        public void Test_54_07()
+        {
+        }
+
+        [Test]
+        public void Test_54_08()
+        {
+        }
+
+        [Test]
+        public void Test_54_09()
+        {
+        }
+
+        [Test]
+        public void Test_54_10()
+        {
+        }
+
+        [Test]
+        public void Test_54_11()
+        {
+        }
+
+        [Test]
+        public void Test_54_12()
+        {
+        }
+
+        [Test]
+        public void Test_54_13()
+        {
+        }
+
+        [Test]
+        public void Test_54_14()
+        {
+        }
+
+        [Test]
+        public void Test_54_15()
+        {
+        }
+
+        [Test]
+        public void Test_54_16()
+        {
+        }
+
+        [Test]
+        public void Test_54_17()
+        {
+        }
+
+        [Test]
+        public void Test_54_18()
+        {
+        }
+
+        [Test]
+        public void Test_54_19()
+        {
+        }
+
+        [Test]
+        public void Test_54_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_55
+    {
+        #region PassingTests
+        [Test]
+        public void Test_55_01()
+        {
+        }
+
+        [Test]
+        public void Test_55_02()
+        {
+        }
+
+        [Test]
+        public void Test_55_03()
+        {
+        }
+
+        [Test]
+        public void Test_55_04()
+        {
+        }
+
+        [Test]
+        public void Test_55_05()
+        {
+        }
+
+        [Test]
+        public void Test_55_06()
+        {
+        }
+
+        [Test]
+        public void Test_55_07()
+        {
+        }
+
+        [Test]
+        public void Test_55_08()
+        {
+        }
+
+        [Test]
+        public void Test_55_09()
+        {
+        }
+
+        [Test]
+        public void Test_55_10()
+        {
+        }
+
+        [Test]
+        public void Test_55_11()
+        {
+        }
+
+        [Test]
+        public void Test_55_12()
+        {
+        }
+
+        [Test]
+        public void Test_55_13()
+        {
+        }
+
+        [Test]
+        public void Test_55_14()
+        {
+        }
+
+        [Test]
+        public void Test_55_15()
+        {
+        }
+
+        [Test]
+        public void Test_55_16()
+        {
+        }
+
+        [Test]
+        public void Test_55_17()
+        {
+        }
+
+        [Test]
+        public void Test_55_18()
+        {
+        }
+
+        [Test]
+        public void Test_55_19()
+        {
+        }
+
+        [Test]
+        public void Test_55_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_56
+    {
+        #region PassingTests
+        [Test]
+        public void Test_56_01()
+        {
+        }
+
+        [Test]
+        public void Test_56_02()
+        {
+        }
+
+        [Test]
+        public void Test_56_03()
+        {
+        }
+
+        [Test]
+        public void Test_56_04()
+        {
+        }
+
+        [Test]
+        public void Test_56_05()
+        {
+        }
+
+        [Test]
+        public void Test_56_06()
+        {
+        }
+
+        [Test]
+        public void Test_56_07()
+        {
+        }
+
+        [Test]
+        public void Test_56_08()
+        {
+        }
+
+        [Test]
+        public void Test_56_09()
+        {
+        }
+
+        [Test]
+        public void Test_56_10()
+        {
+        }
+
+        [Test]
+        public void Test_56_11()
+        {
+        }
+
+        [Test]
+        public void Test_56_12()
+        {
+        }
+
+        [Test]
+        public void Test_56_13()
+        {
+        }
+
+        [Test]
+        public void Test_56_14()
+        {
+        }
+
+        [Test]
+        public void Test_56_15()
+        {
+        }
+
+        [Test]
+        public void Test_56_16()
+        {
+        }
+
+        [Test]
+        public void Test_56_17()
+        {
+        }
+
+        [Test]
+        public void Test_56_18()
+        {
+        }
+
+        [Test]
+        public void Test_56_19()
+        {
+        }
+
+        [Test]
+        public void Test_56_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_57
+    {
+        #region PassingTests
+        [Test]
+        public void Test_57_01()
+        {
+        }
+
+        [Test]
+        public void Test_57_02()
+        {
+        }
+
+        [Test]
+        public void Test_57_03()
+        {
+        }
+
+        [Test]
+        public void Test_57_04()
+        {
+        }
+
+        [Test]
+        public void Test_57_05()
+        {
+        }
+
+        [Test]
+        public void Test_57_06()
+        {
+        }
+
+        [Test]
+        public void Test_57_07()
+        {
+        }
+
+        [Test]
+        public void Test_57_08()
+        {
+        }
+
+        [Test]
+        public void Test_57_09()
+        {
+        }
+
+        [Test]
+        public void Test_57_10()
+        {
+        }
+
+        [Test]
+        public void Test_57_11()
+        {
+        }
+
+        [Test]
+        public void Test_57_12()
+        {
+        }
+
+        [Test]
+        public void Test_57_13()
+        {
+        }
+
+        [Test]
+        public void Test_57_14()
+        {
+        }
+
+        [Test]
+        public void Test_57_15()
+        {
+        }
+
+        [Test]
+        public void Test_57_16()
+        {
+        }
+
+        [Test]
+        public void Test_57_17()
+        {
+        }
+
+        [Test]
+        public void Test_57_18()
+        {
+        }
+
+        [Test]
+        public void Test_57_19()
+        {
+        }
+
+        [Test]
+        public void Test_57_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_58
+    {
+        #region PassingTests
+        [Test]
+        public void Test_58_01()
+        {
+        }
+
+        [Test]
+        public void Test_58_02()
+        {
+        }
+
+        [Test]
+        public void Test_58_03()
+        {
+        }
+
+        [Test]
+        public void Test_58_04()
+        {
+        }
+
+        [Test]
+        public void Test_58_05()
+        {
+        }
+
+        [Test]
+        public void Test_58_06()
+        {
+        }
+
+        [Test]
+        public void Test_58_07()
+        {
+        }
+
+        [Test]
+        public void Test_58_08()
+        {
+        }
+
+        [Test]
+        public void Test_58_09()
+        {
+        }
+
+        [Test]
+        public void Test_58_10()
+        {
+        }
+
+        [Test]
+        public void Test_58_11()
+        {
+        }
+
+        [Test]
+        public void Test_58_12()
+        {
+        }
+
+        [Test]
+        public void Test_58_13()
+        {
+        }
+
+        [Test]
+        public void Test_58_14()
+        {
+        }
+
+        [Test]
+        public void Test_58_15()
+        {
+        }
+
+        [Test]
+        public void Test_58_16()
+        {
+        }
+
+        [Test]
+        public void Test_58_17()
+        {
+        }
+
+        [Test]
+        public void Test_58_18()
+        {
+        }
+
+        [Test]
+        public void Test_58_19()
+        {
+        }
+
+        [Test]
+        public void Test_58_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_59
+    {
+        #region PassingTests
+        [Test]
+        public void Test_59_01()
+        {
+        }
+
+        [Test]
+        public void Test_59_02()
+        {
+        }
+
+        [Test]
+        public void Test_59_03()
+        {
+        }
+
+        [Test]
+        public void Test_59_04()
+        {
+        }
+
+        [Test]
+        public void Test_59_05()
+        {
+        }
+
+        [Test]
+        public void Test_59_06()
+        {
+        }
+
+        [Test]
+        public void Test_59_07()
+        {
+        }
+
+        [Test]
+        public void Test_59_08()
+        {
+        }
+
+        [Test]
+        public void Test_59_09()
+        {
+        }
+
+        [Test]
+        public void Test_59_10()
+        {
+        }
+
+        [Test]
+        public void Test_59_11()
+        {
+        }
+
+        [Test]
+        public void Test_59_12()
+        {
+        }
+
+        [Test]
+        public void Test_59_13()
+        {
+        }
+
+        [Test]
+        public void Test_59_14()
+        {
+        }
+
+        [Test]
+        public void Test_59_15()
+        {
+        }
+
+        [Test]
+        public void Test_59_16()
+        {
+        }
+
+        [Test]
+        public void Test_59_17()
+        {
+        }
+
+        [Test]
+        public void Test_59_18()
+        {
+        }
+
+        [Test]
+        public void Test_59_19()
+        {
+        }
+
+        [Test]
+        public void Test_59_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_60
+    {
+        #region PassingTests
+        [Test]
+        public void Test_60_01()
+        {
+        }
+
+        [Test]
+        public void Test_60_02()
+        {
+        }
+
+        [Test]
+        public void Test_60_03()
+        {
+        }
+
+        [Test]
+        public void Test_60_04()
+        {
+        }
+
+        [Test]
+        public void Test_60_05()
+        {
+        }
+
+        [Test]
+        public void Test_60_06()
+        {
+        }
+
+        [Test]
+        public void Test_60_07()
+        {
+        }
+
+        [Test]
+        public void Test_60_08()
+        {
+        }
+
+        [Test]
+        public void Test_60_09()
+        {
+        }
+
+        [Test]
+        public void Test_60_10()
+        {
+        }
+
+        [Test]
+        public void Test_60_11()
+        {
+        }
+
+        [Test]
+        public void Test_60_12()
+        {
+        }
+
+        [Test]
+        public void Test_60_13()
+        {
+        }
+
+        [Test]
+        public void Test_60_14()
+        {
+        }
+
+        [Test]
+        public void Test_60_15()
+        {
+        }
+
+        [Test]
+        public void Test_60_16()
+        {
+        }
+
+        [Test]
+        public void Test_60_17()
+        {
+        }
+
+        [Test]
+        public void Test_60_18()
+        {
+        }
+
+        [Test]
+        public void Test_60_19()
+        {
+        }
+
+        [Test]
+        public void Test_60_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_61
+    {
+        #region PassingTests
+        [Test]
+        public void Test_61_01()
+        {
+        }
+
+        [Test]
+        public void Test_61_02()
+        {
+        }
+
+        [Test]
+        public void Test_61_03()
+        {
+        }
+
+        [Test]
+        public void Test_61_04()
+        {
+        }
+
+        [Test]
+        public void Test_61_05()
+        {
+        }
+
+        [Test]
+        public void Test_61_06()
+        {
+        }
+
+        [Test]
+        public void Test_61_07()
+        {
+        }
+
+        [Test]
+        public void Test_61_08()
+        {
+        }
+
+        [Test]
+        public void Test_61_09()
+        {
+        }
+
+        [Test]
+        public void Test_61_10()
+        {
+        }
+
+        [Test]
+        public void Test_61_11()
+        {
+        }
+
+        [Test]
+        public void Test_61_12()
+        {
+        }
+
+        [Test]
+        public void Test_61_13()
+        {
+        }
+
+        [Test]
+        public void Test_61_14()
+        {
+        }
+
+        [Test]
+        public void Test_61_15()
+        {
+        }
+
+        [Test]
+        public void Test_61_16()
+        {
+        }
+
+        [Test]
+        public void Test_61_17()
+        {
+        }
+
+        [Test]
+        public void Test_61_18()
+        {
+        }
+
+        [Test]
+        public void Test_61_19()
+        {
+        }
+
+        [Test]
+        public void Test_61_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_62
+    {
+        #region PassingTests
+        [Test]
+        public void Test_62_01()
+        {
+        }
+
+        [Test]
+        public void Test_62_02()
+        {
+        }
+
+        [Test]
+        public void Test_62_03()
+        {
+        }
+
+        [Test]
+        public void Test_62_04()
+        {
+        }
+
+        [Test]
+        public void Test_62_05()
+        {
+        }
+
+        [Test]
+        public void Test_62_06()
+        {
+        }
+
+        [Test]
+        public void Test_62_07()
+        {
+        }
+
+        [Test]
+        public void Test_62_08()
+        {
+        }
+
+        [Test]
+        public void Test_62_09()
+        {
+        }
+
+        [Test]
+        public void Test_62_10()
+        {
+        }
+
+        [Test]
+        public void Test_62_11()
+        {
+        }
+
+        [Test]
+        public void Test_62_12()
+        {
+        }
+
+        [Test]
+        public void Test_62_13()
+        {
+        }
+
+        [Test]
+        public void Test_62_14()
+        {
+        }
+
+        [Test]
+        public void Test_62_15()
+        {
+        }
+
+        [Test]
+        public void Test_62_16()
+        {
+        }
+
+        [Test]
+        public void Test_62_17()
+        {
+        }
+
+        [Test]
+        public void Test_62_18()
+        {
+        }
+
+        [Test]
+        public void Test_62_19()
+        {
+        }
+
+        [Test]
+        public void Test_62_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_63
+    {
+        #region PassingTests
+        [Test]
+        public void Test_63_01()
+        {
+        }
+
+        [Test]
+        public void Test_63_02()
+        {
+        }
+
+        [Test]
+        public void Test_63_03()
+        {
+        }
+
+        [Test]
+        public void Test_63_04()
+        {
+        }
+
+        [Test]
+        public void Test_63_05()
+        {
+        }
+
+        [Test]
+        public void Test_63_06()
+        {
+        }
+
+        [Test]
+        public void Test_63_07()
+        {
+        }
+
+        [Test]
+        public void Test_63_08()
+        {
+        }
+
+        [Test]
+        public void Test_63_09()
+        {
+        }
+
+        [Test]
+        public void Test_63_10()
+        {
+        }
+
+        [Test]
+        public void Test_63_11()
+        {
+        }
+
+        [Test]
+        public void Test_63_12()
+        {
+        }
+
+        [Test]
+        public void Test_63_13()
+        {
+        }
+
+        [Test]
+        public void Test_63_14()
+        {
+        }
+
+        [Test]
+        public void Test_63_15()
+        {
+        }
+
+        [Test]
+        public void Test_63_16()
+        {
+        }
+
+        [Test]
+        public void Test_63_17()
+        {
+        }
+
+        [Test]
+        public void Test_63_18()
+        {
+        }
+
+        [Test]
+        public void Test_63_19()
+        {
+        }
+
+        [Test]
+        public void Test_63_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_64
+    {
+        #region PassingTests
+        [Test]
+        public void Test_64_01()
+        {
+        }
+
+        [Test]
+        public void Test_64_02()
+        {
+        }
+
+        [Test]
+        public void Test_64_03()
+        {
+        }
+
+        [Test]
+        public void Test_64_04()
+        {
+        }
+
+        [Test]
+        public void Test_64_05()
+        {
+        }
+
+        [Test]
+        public void Test_64_06()
+        {
+        }
+
+        [Test]
+        public void Test_64_07()
+        {
+        }
+
+        [Test]
+        public void Test_64_08()
+        {
+        }
+
+        [Test]
+        public void Test_64_09()
+        {
+        }
+
+        [Test]
+        public void Test_64_10()
+        {
+        }
+
+        [Test]
+        public void Test_64_11()
+        {
+        }
+
+        [Test]
+        public void Test_64_12()
+        {
+        }
+
+        [Test]
+        public void Test_64_13()
+        {
+        }
+
+        [Test]
+        public void Test_64_14()
+        {
+        }
+
+        [Test]
+        public void Test_64_15()
+        {
+        }
+
+        [Test]
+        public void Test_64_16()
+        {
+        }
+
+        [Test]
+        public void Test_64_17()
+        {
+        }
+
+        [Test]
+        public void Test_64_18()
+        {
+        }
+
+        [Test]
+        public void Test_64_19()
+        {
+        }
+
+        [Test]
+        public void Test_64_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_65
+    {
+        #region PassingTests
+        [Test]
+        public void Test_65_01()
+        {
+        }
+
+        [Test]
+        public void Test_65_02()
+        {
+        }
+
+        [Test]
+        public void Test_65_03()
+        {
+        }
+
+        [Test]
+        public void Test_65_04()
+        {
+        }
+
+        [Test]
+        public void Test_65_05()
+        {
+        }
+
+        [Test]
+        public void Test_65_06()
+        {
+        }
+
+        [Test]
+        public void Test_65_07()
+        {
+        }
+
+        [Test]
+        public void Test_65_08()
+        {
+        }
+
+        [Test]
+        public void Test_65_09()
+        {
+        }
+
+        [Test]
+        public void Test_65_10()
+        {
+        }
+
+        [Test]
+        public void Test_65_11()
+        {
+        }
+
+        [Test]
+        public void Test_65_12()
+        {
+        }
+
+        [Test]
+        public void Test_65_13()
+        {
+        }
+
+        [Test]
+        public void Test_65_14()
+        {
+        }
+
+        [Test]
+        public void Test_65_15()
+        {
+        }
+
+        [Test]
+        public void Test_65_16()
+        {
+        }
+
+        [Test]
+        public void Test_65_17()
+        {
+        }
+
+        [Test]
+        public void Test_65_18()
+        {
+        }
+
+        [Test]
+        public void Test_65_19()
+        {
+        }
+
+        [Test]
+        public void Test_65_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_66
+    {
+        #region PassingTests
+        [Test]
+        public void Test_66_01()
+        {
+        }
+
+        [Test]
+        public void Test_66_02()
+        {
+        }
+
+        [Test]
+        public void Test_66_03()
+        {
+        }
+
+        [Test]
+        public void Test_66_04()
+        {
+        }
+
+        [Test]
+        public void Test_66_05()
+        {
+        }
+
+        [Test]
+        public void Test_66_06()
+        {
+        }
+
+        [Test]
+        public void Test_66_07()
+        {
+        }
+
+        [Test]
+        public void Test_66_08()
+        {
+        }
+
+        [Test]
+        public void Test_66_09()
+        {
+        }
+
+        [Test]
+        public void Test_66_10()
+        {
+        }
+
+        [Test]
+        public void Test_66_11()
+        {
+        }
+
+        [Test]
+        public void Test_66_12()
+        {
+        }
+
+        [Test]
+        public void Test_66_13()
+        {
+        }
+
+        [Test]
+        public void Test_66_14()
+        {
+        }
+
+        [Test]
+        public void Test_66_15()
+        {
+        }
+
+        [Test]
+        public void Test_66_16()
+        {
+        }
+
+        [Test]
+        public void Test_66_17()
+        {
+        }
+
+        [Test]
+        public void Test_66_18()
+        {
+        }
+
+        [Test]
+        public void Test_66_19()
+        {
+        }
+
+        [Test]
+        public void Test_66_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_67
+    {
+        #region PassingTests
+        [Test]
+        public void Test_67_01()
+        {
+        }
+
+        [Test]
+        public void Test_67_02()
+        {
+        }
+
+        [Test]
+        public void Test_67_03()
+        {
+        }
+
+        [Test]
+        public void Test_67_04()
+        {
+        }
+
+        [Test]
+        public void Test_67_05()
+        {
+        }
+
+        [Test]
+        public void Test_67_06()
+        {
+        }
+
+        [Test]
+        public void Test_67_07()
+        {
+        }
+
+        [Test]
+        public void Test_67_08()
+        {
+        }
+
+        [Test]
+        public void Test_67_09()
+        {
+        }
+
+        [Test]
+        public void Test_67_10()
+        {
+        }
+
+        [Test]
+        public void Test_67_11()
+        {
+        }
+
+        [Test]
+        public void Test_67_12()
+        {
+        }
+
+        [Test]
+        public void Test_67_13()
+        {
+        }
+
+        [Test]
+        public void Test_67_14()
+        {
+        }
+
+        [Test]
+        public void Test_67_15()
+        {
+        }
+
+        [Test]
+        public void Test_67_16()
+        {
+        }
+
+        [Test]
+        public void Test_67_17()
+        {
+        }
+
+        [Test]
+        public void Test_67_18()
+        {
+        }
+
+        [Test]
+        public void Test_67_19()
+        {
+        }
+
+        [Test]
+        public void Test_67_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_68
+    {
+        #region PassingTests
+        [Test]
+        public void Test_68_01()
+        {
+        }
+
+        [Test]
+        public void Test_68_02()
+        {
+        }
+
+        [Test]
+        public void Test_68_03()
+        {
+        }
+
+        [Test]
+        public void Test_68_04()
+        {
+        }
+
+        [Test]
+        public void Test_68_05()
+        {
+        }
+
+        [Test]
+        public void Test_68_06()
+        {
+        }
+
+        [Test]
+        public void Test_68_07()
+        {
+        }
+
+        [Test]
+        public void Test_68_08()
+        {
+        }
+
+        [Test]
+        public void Test_68_09()
+        {
+        }
+
+        [Test]
+        public void Test_68_10()
+        {
+        }
+
+        [Test]
+        public void Test_68_11()
+        {
+        }
+
+        [Test]
+        public void Test_68_12()
+        {
+        }
+
+        [Test]
+        public void Test_68_13()
+        {
+        }
+
+        [Test]
+        public void Test_68_14()
+        {
+        }
+
+        [Test]
+        public void Test_68_15()
+        {
+        }
+
+        [Test]
+        public void Test_68_16()
+        {
+        }
+
+        [Test]
+        public void Test_68_17()
+        {
+        }
+
+        [Test]
+        public void Test_68_18()
+        {
+        }
+
+        [Test]
+        public void Test_68_19()
+        {
+        }
+
+        [Test]
+        public void Test_68_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_69
+    {
+        #region PassingTests
+        [Test]
+        public void Test_69_01()
+        {
+        }
+
+        [Test]
+        public void Test_69_02()
+        {
+        }
+
+        [Test]
+        public void Test_69_03()
+        {
+        }
+
+        [Test]
+        public void Test_69_04()
+        {
+        }
+
+        [Test]
+        public void Test_69_05()
+        {
+        }
+
+        [Test]
+        public void Test_69_06()
+        {
+        }
+
+        [Test]
+        public void Test_69_07()
+        {
+        }
+
+        [Test]
+        public void Test_69_08()
+        {
+        }
+
+        [Test]
+        public void Test_69_09()
+        {
+        }
+
+        [Test]
+        public void Test_69_10()
+        {
+        }
+
+        [Test]
+        public void Test_69_11()
+        {
+        }
+
+        [Test]
+        public void Test_69_12()
+        {
+        }
+
+        [Test]
+        public void Test_69_13()
+        {
+        }
+
+        [Test]
+        public void Test_69_14()
+        {
+        }
+
+        [Test]
+        public void Test_69_15()
+        {
+        }
+
+        [Test]
+        public void Test_69_16()
+        {
+        }
+
+        [Test]
+        public void Test_69_17()
+        {
+        }
+
+        [Test]
+        public void Test_69_18()
+        {
+        }
+
+        [Test]
+        public void Test_69_19()
+        {
+        }
+
+        [Test]
+        public void Test_69_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_70
+    {
+        #region PassingTests
+        [Test]
+        public void Test_70_01()
+        {
+        }
+
+        [Test]
+        public void Test_70_02()
+        {
+        }
+
+        [Test]
+        public void Test_70_03()
+        {
+        }
+
+        [Test]
+        public void Test_70_04()
+        {
+        }
+
+        [Test]
+        public void Test_70_05()
+        {
+        }
+
+        [Test]
+        public void Test_70_06()
+        {
+        }
+
+        [Test]
+        public void Test_70_07()
+        {
+        }
+
+        [Test]
+        public void Test_70_08()
+        {
+        }
+
+        [Test]
+        public void Test_70_09()
+        {
+        }
+
+        [Test]
+        public void Test_70_10()
+        {
+        }
+
+        [Test]
+        public void Test_70_11()
+        {
+        }
+
+        [Test]
+        public void Test_70_12()
+        {
+        }
+
+        [Test]
+        public void Test_70_13()
+        {
+        }
+
+        [Test]
+        public void Test_70_14()
+        {
+        }
+
+        [Test]
+        public void Test_70_15()
+        {
+        }
+
+        [Test]
+        public void Test_70_16()
+        {
+        }
+
+        [Test]
+        public void Test_70_17()
+        {
+        }
+
+        [Test]
+        public void Test_70_18()
+        {
+        }
+
+        [Test]
+        public void Test_70_19()
+        {
+        }
+
+        [Test]
+        public void Test_70_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_71
+    {
+        #region PassingTests
+        [Test]
+        public void Test_71_01()
+        {
+        }
+
+        [Test]
+        public void Test_71_02()
+        {
+        }
+
+        [Test]
+        public void Test_71_03()
+        {
+        }
+
+        [Test]
+        public void Test_71_04()
+        {
+        }
+
+        [Test]
+        public void Test_71_05()
+        {
+        }
+
+        [Test]
+        public void Test_71_06()
+        {
+        }
+
+        [Test]
+        public void Test_71_07()
+        {
+        }
+
+        [Test]
+        public void Test_71_08()
+        {
+        }
+
+        [Test]
+        public void Test_71_09()
+        {
+        }
+
+        [Test]
+        public void Test_71_10()
+        {
+        }
+
+        [Test]
+        public void Test_71_11()
+        {
+        }
+
+        [Test]
+        public void Test_71_12()
+        {
+        }
+
+        [Test]
+        public void Test_71_13()
+        {
+        }
+
+        [Test]
+        public void Test_71_14()
+        {
+        }
+
+        [Test]
+        public void Test_71_15()
+        {
+        }
+
+        [Test]
+        public void Test_71_16()
+        {
+        }
+
+        [Test]
+        public void Test_71_17()
+        {
+        }
+
+        [Test]
+        public void Test_71_18()
+        {
+        }
+
+        [Test]
+        public void Test_71_19()
+        {
+        }
+
+        [Test]
+        public void Test_71_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_72
+    {
+        #region PassingTests
+        [Test]
+        public void Test_72_01()
+        {
+        }
+
+        [Test]
+        public void Test_72_02()
+        {
+        }
+
+        [Test]
+        public void Test_72_03()
+        {
+        }
+
+        [Test]
+        public void Test_72_04()
+        {
+        }
+
+        [Test]
+        public void Test_72_05()
+        {
+        }
+
+        [Test]
+        public void Test_72_06()
+        {
+        }
+
+        [Test]
+        public void Test_72_07()
+        {
+        }
+
+        [Test]
+        public void Test_72_08()
+        {
+        }
+
+        [Test]
+        public void Test_72_09()
+        {
+        }
+
+        [Test]
+        public void Test_72_10()
+        {
+        }
+
+        [Test]
+        public void Test_72_11()
+        {
+        }
+
+        [Test]
+        public void Test_72_12()
+        {
+        }
+
+        [Test]
+        public void Test_72_13()
+        {
+        }
+
+        [Test]
+        public void Test_72_14()
+        {
+        }
+
+        [Test]
+        public void Test_72_15()
+        {
+        }
+
+        [Test]
+        public void Test_72_16()
+        {
+        }
+
+        [Test]
+        public void Test_72_17()
+        {
+        }
+
+        [Test]
+        public void Test_72_18()
+        {
+        }
+
+        [Test]
+        public void Test_72_19()
+        {
+        }
+
+        [Test]
+        public void Test_72_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_73
+    {
+        #region PassingTests
+        [Test]
+        public void Test_73_01()
+        {
+        }
+
+        [Test]
+        public void Test_73_02()
+        {
+        }
+
+        [Test]
+        public void Test_73_03()
+        {
+        }
+
+        [Test]
+        public void Test_73_04()
+        {
+        }
+
+        [Test]
+        public void Test_73_05()
+        {
+        }
+
+        [Test]
+        public void Test_73_06()
+        {
+        }
+
+        [Test]
+        public void Test_73_07()
+        {
+        }
+
+        [Test]
+        public void Test_73_08()
+        {
+        }
+
+        [Test]
+        public void Test_73_09()
+        {
+        }
+
+        [Test]
+        public void Test_73_10()
+        {
+        }
+
+        [Test]
+        public void Test_73_11()
+        {
+        }
+
+        [Test]
+        public void Test_73_12()
+        {
+        }
+
+        [Test]
+        public void Test_73_13()
+        {
+        }
+
+        [Test]
+        public void Test_73_14()
+        {
+        }
+
+        [Test]
+        public void Test_73_15()
+        {
+        }
+
+        [Test]
+        public void Test_73_16()
+        {
+        }
+
+        [Test]
+        public void Test_73_17()
+        {
+        }
+
+        [Test]
+        public void Test_73_18()
+        {
+        }
+
+        [Test]
+        public void Test_73_19()
+        {
+        }
+
+        [Test]
+        public void Test_73_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_74
+    {
+        #region PassingTests
+        [Test]
+        public void Test_74_01()
+        {
+        }
+
+        [Test]
+        public void Test_74_02()
+        {
+        }
+
+        [Test]
+        public void Test_74_03()
+        {
+        }
+
+        [Test]
+        public void Test_74_04()
+        {
+        }
+
+        [Test]
+        public void Test_74_05()
+        {
+        }
+
+        [Test]
+        public void Test_74_06()
+        {
+        }
+
+        [Test]
+        public void Test_74_07()
+        {
+        }
+
+        [Test]
+        public void Test_74_08()
+        {
+        }
+
+        [Test]
+        public void Test_74_09()
+        {
+        }
+
+        [Test]
+        public void Test_74_10()
+        {
+        }
+
+        [Test]
+        public void Test_74_11()
+        {
+        }
+
+        [Test]
+        public void Test_74_12()
+        {
+        }
+
+        [Test]
+        public void Test_74_13()
+        {
+        }
+
+        [Test]
+        public void Test_74_14()
+        {
+        }
+
+        [Test]
+        public void Test_74_15()
+        {
+        }
+
+        [Test]
+        public void Test_74_16()
+        {
+        }
+
+        [Test]
+        public void Test_74_17()
+        {
+        }
+
+        [Test]
+        public void Test_74_18()
+        {
+        }
+
+        [Test]
+        public void Test_74_19()
+        {
+        }
+
+        [Test]
+        public void Test_74_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_75
+    {
+        #region PassingTests
+        [Test]
+        public void Test_75_01()
+        {
+        }
+
+        [Test]
+        public void Test_75_02()
+        {
+        }
+
+        [Test]
+        public void Test_75_03()
+        {
+        }
+
+        [Test]
+        public void Test_75_04()
+        {
+        }
+
+        [Test]
+        public void Test_75_05()
+        {
+        }
+
+        [Test]
+        public void Test_75_06()
+        {
+        }
+
+        [Test]
+        public void Test_75_07()
+        {
+        }
+
+        [Test]
+        public void Test_75_08()
+        {
+        }
+
+        [Test]
+        public void Test_75_09()
+        {
+        }
+
+        [Test]
+        public void Test_75_10()
+        {
+        }
+
+        [Test]
+        public void Test_75_11()
+        {
+        }
+
+        [Test]
+        public void Test_75_12()
+        {
+        }
+
+        [Test]
+        public void Test_75_13()
+        {
+        }
+
+        [Test]
+        public void Test_75_14()
+        {
+        }
+
+        [Test]
+        public void Test_75_15()
+        {
+        }
+
+        [Test]
+        public void Test_75_16()
+        {
+        }
+
+        [Test]
+        public void Test_75_17()
+        {
+        }
+
+        [Test]
+        public void Test_75_18()
+        {
+        }
+
+        [Test]
+        public void Test_75_19()
+        {
+        }
+
+        [Test]
+        public void Test_75_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_76
+    {
+        #region PassingTests
+        [Test]
+        public void Test_76_01()
+        {
+        }
+
+        [Test]
+        public void Test_76_02()
+        {
+        }
+
+        [Test]
+        public void Test_76_03()
+        {
+        }
+
+        [Test]
+        public void Test_76_04()
+        {
+        }
+
+        [Test]
+        public void Test_76_05()
+        {
+        }
+
+        [Test]
+        public void Test_76_06()
+        {
+        }
+
+        [Test]
+        public void Test_76_07()
+        {
+        }
+
+        [Test]
+        public void Test_76_08()
+        {
+        }
+
+        [Test]
+        public void Test_76_09()
+        {
+        }
+
+        [Test]
+        public void Test_76_10()
+        {
+        }
+
+        [Test]
+        public void Test_76_11()
+        {
+        }
+
+        [Test]
+        public void Test_76_12()
+        {
+        }
+
+        [Test]
+        public void Test_76_13()
+        {
+        }
+
+        [Test]
+        public void Test_76_14()
+        {
+        }
+
+        [Test]
+        public void Test_76_15()
+        {
+        }
+
+        [Test]
+        public void Test_76_16()
+        {
+        }
+
+        [Test]
+        public void Test_76_17()
+        {
+        }
+
+        [Test]
+        public void Test_76_18()
+        {
+        }
+
+        [Test]
+        public void Test_76_19()
+        {
+        }
+
+        [Test]
+        public void Test_76_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_77
+    {
+        #region PassingTests
+        [Test]
+        public void Test_77_01()
+        {
+        }
+
+        [Test]
+        public void Test_77_02()
+        {
+        }
+
+        [Test]
+        public void Test_77_03()
+        {
+        }
+
+        [Test]
+        public void Test_77_04()
+        {
+        }
+
+        [Test]
+        public void Test_77_05()
+        {
+        }
+
+        [Test]
+        public void Test_77_06()
+        {
+        }
+
+        [Test]
+        public void Test_77_07()
+        {
+        }
+
+        [Test]
+        public void Test_77_08()
+        {
+        }
+
+        [Test]
+        public void Test_77_09()
+        {
+        }
+
+        [Test]
+        public void Test_77_10()
+        {
+        }
+
+        [Test]
+        public void Test_77_11()
+        {
+        }
+
+        [Test]
+        public void Test_77_12()
+        {
+        }
+
+        [Test]
+        public void Test_77_13()
+        {
+        }
+
+        [Test]
+        public void Test_77_14()
+        {
+        }
+
+        [Test]
+        public void Test_77_15()
+        {
+        }
+
+        [Test]
+        public void Test_77_16()
+        {
+        }
+
+        [Test]
+        public void Test_77_17()
+        {
+        }
+
+        [Test]
+        public void Test_77_18()
+        {
+        }
+
+        [Test]
+        public void Test_77_19()
+        {
+        }
+
+        [Test]
+        public void Test_77_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_78
+    {
+        #region PassingTests
+        [Test]
+        public void Test_78_01()
+        {
+        }
+
+        [Test]
+        public void Test_78_02()
+        {
+        }
+
+        [Test]
+        public void Test_78_03()
+        {
+        }
+
+        [Test]
+        public void Test_78_04()
+        {
+        }
+
+        [Test]
+        public void Test_78_05()
+        {
+        }
+
+        [Test]
+        public void Test_78_06()
+        {
+        }
+
+        [Test]
+        public void Test_78_07()
+        {
+        }
+
+        [Test]
+        public void Test_78_08()
+        {
+        }
+
+        [Test]
+        public void Test_78_09()
+        {
+        }
+
+        [Test]
+        public void Test_78_10()
+        {
+        }
+
+        [Test]
+        public void Test_78_11()
+        {
+        }
+
+        [Test]
+        public void Test_78_12()
+        {
+        }
+
+        [Test]
+        public void Test_78_13()
+        {
+        }
+
+        [Test]
+        public void Test_78_14()
+        {
+        }
+
+        [Test]
+        public void Test_78_15()
+        {
+        }
+
+        [Test]
+        public void Test_78_16()
+        {
+        }
+
+        [Test]
+        public void Test_78_17()
+        {
+        }
+
+        [Test]
+        public void Test_78_18()
+        {
+        }
+
+        [Test]
+        public void Test_78_19()
+        {
+        }
+
+        [Test]
+        public void Test_78_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_79
+    {
+        #region PassingTests
+        [Test]
+        public void Test_79_01()
+        {
+        }
+
+        [Test]
+        public void Test_79_02()
+        {
+        }
+
+        [Test]
+        public void Test_79_03()
+        {
+        }
+
+        [Test]
+        public void Test_79_04()
+        {
+        }
+
+        [Test]
+        public void Test_79_05()
+        {
+        }
+
+        [Test]
+        public void Test_79_06()
+        {
+        }
+
+        [Test]
+        public void Test_79_07()
+        {
+        }
+
+        [Test]
+        public void Test_79_08()
+        {
+        }
+
+        [Test]
+        public void Test_79_09()
+        {
+        }
+
+        [Test]
+        public void Test_79_10()
+        {
+        }
+
+        [Test]
+        public void Test_79_11()
+        {
+        }
+
+        [Test]
+        public void Test_79_12()
+        {
+        }
+
+        [Test]
+        public void Test_79_13()
+        {
+        }
+
+        [Test]
+        public void Test_79_14()
+        {
+        }
+
+        [Test]
+        public void Test_79_15()
+        {
+        }
+
+        [Test]
+        public void Test_79_16()
+        {
+        }
+
+        [Test]
+        public void Test_79_17()
+        {
+        }
+
+        [Test]
+        public void Test_79_18()
+        {
+        }
+
+        [Test]
+        public void Test_79_19()
+        {
+        }
+
+        [Test]
+        public void Test_79_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_80
+    {
+        #region PassingTests
+        [Test]
+        public void Test_80_01()
+        {
+        }
+
+        [Test]
+        public void Test_80_02()
+        {
+        }
+
+        [Test]
+        public void Test_80_03()
+        {
+        }
+
+        [Test]
+        public void Test_80_04()
+        {
+        }
+
+        [Test]
+        public void Test_80_05()
+        {
+        }
+
+        [Test]
+        public void Test_80_06()
+        {
+        }
+
+        [Test]
+        public void Test_80_07()
+        {
+        }
+
+        [Test]
+        public void Test_80_08()
+        {
+        }
+
+        [Test]
+        public void Test_80_09()
+        {
+        }
+
+        [Test]
+        public void Test_80_10()
+        {
+        }
+
+        [Test]
+        public void Test_80_11()
+        {
+        }
+
+        [Test]
+        public void Test_80_12()
+        {
+        }
+
+        [Test]
+        public void Test_80_13()
+        {
+        }
+
+        [Test]
+        public void Test_80_14()
+        {
+        }
+
+        [Test]
+        public void Test_80_15()
+        {
+        }
+
+        [Test]
+        public void Test_80_16()
+        {
+        }
+
+        [Test]
+        public void Test_80_17()
+        {
+        }
+
+        [Test]
+        public void Test_80_18()
+        {
+        }
+
+        [Test]
+        public void Test_80_19()
+        {
+        }
+
+        [Test]
+        public void Test_80_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_81
+    {
+        #region PassingTests
+        [Test]
+        public void Test_81_01()
+        {
+        }
+
+        [Test]
+        public void Test_81_02()
+        {
+        }
+
+        [Test]
+        public void Test_81_03()
+        {
+        }
+
+        [Test]
+        public void Test_81_04()
+        {
+        }
+
+        [Test]
+        public void Test_81_05()
+        {
+        }
+
+        [Test]
+        public void Test_81_06()
+        {
+        }
+
+        [Test]
+        public void Test_81_07()
+        {
+        }
+
+        [Test]
+        public void Test_81_08()
+        {
+        }
+
+        [Test]
+        public void Test_81_09()
+        {
+        }
+
+        [Test]
+        public void Test_81_10()
+        {
+        }
+
+        [Test]
+        public void Test_81_11()
+        {
+        }
+
+        [Test]
+        public void Test_81_12()
+        {
+        }
+
+        [Test]
+        public void Test_81_13()
+        {
+        }
+
+        [Test]
+        public void Test_81_14()
+        {
+        }
+
+        [Test]
+        public void Test_81_15()
+        {
+        }
+
+        [Test]
+        public void Test_81_16()
+        {
+        }
+
+        [Test]
+        public void Test_81_17()
+        {
+        }
+
+        [Test]
+        public void Test_81_18()
+        {
+        }
+
+        [Test]
+        public void Test_81_19()
+        {
+        }
+
+        [Test]
+        public void Test_81_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_82
+    {
+        #region PassingTests
+        [Test]
+        public void Test_82_01()
+        {
+        }
+
+        [Test]
+        public void Test_82_02()
+        {
+        }
+
+        [Test]
+        public void Test_82_03()
+        {
+        }
+
+        [Test]
+        public void Test_82_04()
+        {
+        }
+
+        [Test]
+        public void Test_82_05()
+        {
+        }
+
+        [Test]
+        public void Test_82_06()
+        {
+        }
+
+        [Test]
+        public void Test_82_07()
+        {
+        }
+
+        [Test]
+        public void Test_82_08()
+        {
+        }
+
+        [Test]
+        public void Test_82_09()
+        {
+        }
+
+        [Test]
+        public void Test_82_10()
+        {
+        }
+
+        [Test]
+        public void Test_82_11()
+        {
+        }
+
+        [Test]
+        public void Test_82_12()
+        {
+        }
+
+        [Test]
+        public void Test_82_13()
+        {
+        }
+
+        [Test]
+        public void Test_82_14()
+        {
+        }
+
+        [Test]
+        public void Test_82_15()
+        {
+        }
+
+        [Test]
+        public void Test_82_16()
+        {
+        }
+
+        [Test]
+        public void Test_82_17()
+        {
+        }
+
+        [Test]
+        public void Test_82_18()
+        {
+        }
+
+        [Test]
+        public void Test_82_19()
+        {
+        }
+
+        [Test]
+        public void Test_82_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_83
+    {
+        #region PassingTests
+        [Test]
+        public void Test_83_01()
+        {
+        }
+
+        [Test]
+        public void Test_83_02()
+        {
+        }
+
+        [Test]
+        public void Test_83_03()
+        {
+        }
+
+        [Test]
+        public void Test_83_04()
+        {
+        }
+
+        [Test]
+        public void Test_83_05()
+        {
+        }
+
+        [Test]
+        public void Test_83_06()
+        {
+        }
+
+        [Test]
+        public void Test_83_07()
+        {
+        }
+
+        [Test]
+        public void Test_83_08()
+        {
+        }
+
+        [Test]
+        public void Test_83_09()
+        {
+        }
+
+        [Test]
+        public void Test_83_10()
+        {
+        }
+
+        [Test]
+        public void Test_83_11()
+        {
+        }
+
+        [Test]
+        public void Test_83_12()
+        {
+        }
+
+        [Test]
+        public void Test_83_13()
+        {
+        }
+
+        [Test]
+        public void Test_83_14()
+        {
+        }
+
+        [Test]
+        public void Test_83_15()
+        {
+        }
+
+        [Test]
+        public void Test_83_16()
+        {
+        }
+
+        [Test]
+        public void Test_83_17()
+        {
+        }
+
+        [Test]
+        public void Test_83_18()
+        {
+        }
+
+        [Test]
+        public void Test_83_19()
+        {
+        }
+
+        [Test]
+        public void Test_83_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_84
+    {
+        #region PassingTests
+        [Test]
+        public void Test_84_01()
+        {
+        }
+
+        [Test]
+        public void Test_84_02()
+        {
+        }
+
+        [Test]
+        public void Test_84_03()
+        {
+        }
+
+        [Test]
+        public void Test_84_04()
+        {
+        }
+
+        [Test]
+        public void Test_84_05()
+        {
+        }
+
+        [Test]
+        public void Test_84_06()
+        {
+        }
+
+        [Test]
+        public void Test_84_07()
+        {
+        }
+
+        [Test]
+        public void Test_84_08()
+        {
+        }
+
+        [Test]
+        public void Test_84_09()
+        {
+        }
+
+        [Test]
+        public void Test_84_10()
+        {
+        }
+
+        [Test]
+        public void Test_84_11()
+        {
+        }
+
+        [Test]
+        public void Test_84_12()
+        {
+        }
+
+        [Test]
+        public void Test_84_13()
+        {
+        }
+
+        [Test]
+        public void Test_84_14()
+        {
+        }
+
+        [Test]
+        public void Test_84_15()
+        {
+        }
+
+        [Test]
+        public void Test_84_16()
+        {
+        }
+
+        [Test]
+        public void Test_84_17()
+        {
+        }
+
+        [Test]
+        public void Test_84_18()
+        {
+        }
+
+        [Test]
+        public void Test_84_19()
+        {
+        }
+
+        [Test]
+        public void Test_84_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_85
+    {
+        #region PassingTests
+        [Test]
+        public void Test_85_01()
+        {
+        }
+
+        [Test]
+        public void Test_85_02()
+        {
+        }
+
+        [Test]
+        public void Test_85_03()
+        {
+        }
+
+        [Test]
+        public void Test_85_04()
+        {
+        }
+
+        [Test]
+        public void Test_85_05()
+        {
+        }
+
+        [Test]
+        public void Test_85_06()
+        {
+        }
+
+        [Test]
+        public void Test_85_07()
+        {
+        }
+
+        [Test]
+        public void Test_85_08()
+        {
+        }
+
+        [Test]
+        public void Test_85_09()
+        {
+        }
+
+        [Test]
+        public void Test_85_10()
+        {
+        }
+
+        [Test]
+        public void Test_85_11()
+        {
+        }
+
+        [Test]
+        public void Test_85_12()
+        {
+        }
+
+        [Test]
+        public void Test_85_13()
+        {
+        }
+
+        [Test]
+        public void Test_85_14()
+        {
+        }
+
+        [Test]
+        public void Test_85_15()
+        {
+        }
+
+        [Test]
+        public void Test_85_16()
+        {
+        }
+
+        [Test]
+        public void Test_85_17()
+        {
+        }
+
+        [Test]
+        public void Test_85_18()
+        {
+        }
+
+        [Test]
+        public void Test_85_19()
+        {
+        }
+
+        [Test]
+        public void Test_85_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_86
+    {
+        #region PassingTests
+        [Test]
+        public void Test_86_01()
+        {
+        }
+
+        [Test]
+        public void Test_86_02()
+        {
+        }
+
+        [Test]
+        public void Test_86_03()
+        {
+        }
+
+        [Test]
+        public void Test_86_04()
+        {
+        }
+
+        [Test]
+        public void Test_86_05()
+        {
+        }
+
+        [Test]
+        public void Test_86_06()
+        {
+        }
+
+        [Test]
+        public void Test_86_07()
+        {
+        }
+
+        [Test]
+        public void Test_86_08()
+        {
+        }
+
+        [Test]
+        public void Test_86_09()
+        {
+        }
+
+        [Test]
+        public void Test_86_10()
+        {
+        }
+
+        [Test]
+        public void Test_86_11()
+        {
+        }
+
+        [Test]
+        public void Test_86_12()
+        {
+        }
+
+        [Test]
+        public void Test_86_13()
+        {
+        }
+
+        [Test]
+        public void Test_86_14()
+        {
+        }
+
+        [Test]
+        public void Test_86_15()
+        {
+        }
+
+        [Test]
+        public void Test_86_16()
+        {
+        }
+
+        [Test]
+        public void Test_86_17()
+        {
+        }
+
+        [Test]
+        public void Test_86_18()
+        {
+        }
+
+        [Test]
+        public void Test_86_19()
+        {
+        }
+
+        [Test]
+        public void Test_86_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_87
+    {
+        #region PassingTests
+        [Test]
+        public void Test_87_01()
+        {
+        }
+
+        [Test]
+        public void Test_87_02()
+        {
+        }
+
+        [Test]
+        public void Test_87_03()
+        {
+        }
+
+        [Test]
+        public void Test_87_04()
+        {
+        }
+
+        [Test]
+        public void Test_87_05()
+        {
+        }
+
+        [Test]
+        public void Test_87_06()
+        {
+        }
+
+        [Test]
+        public void Test_87_07()
+        {
+        }
+
+        [Test]
+        public void Test_87_08()
+        {
+        }
+
+        [Test]
+        public void Test_87_09()
+        {
+        }
+
+        [Test]
+        public void Test_87_10()
+        {
+        }
+
+        [Test]
+        public void Test_87_11()
+        {
+        }
+
+        [Test]
+        public void Test_87_12()
+        {
+        }
+
+        [Test]
+        public void Test_87_13()
+        {
+        }
+
+        [Test]
+        public void Test_87_14()
+        {
+        }
+
+        [Test]
+        public void Test_87_15()
+        {
+        }
+
+        [Test]
+        public void Test_87_16()
+        {
+        }
+
+        [Test]
+        public void Test_87_17()
+        {
+        }
+
+        [Test]
+        public void Test_87_18()
+        {
+        }
+
+        [Test]
+        public void Test_87_19()
+        {
+        }
+
+        [Test]
+        public void Test_87_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_88
+    {
+        #region PassingTests
+        [Test]
+        public void Test_88_01()
+        {
+        }
+
+        [Test]
+        public void Test_88_02()
+        {
+        }
+
+        [Test]
+        public void Test_88_03()
+        {
+        }
+
+        [Test]
+        public void Test_88_04()
+        {
+        }
+
+        [Test]
+        public void Test_88_05()
+        {
+        }
+
+        [Test]
+        public void Test_88_06()
+        {
+        }
+
+        [Test]
+        public void Test_88_07()
+        {
+        }
+
+        [Test]
+        public void Test_88_08()
+        {
+        }
+
+        [Test]
+        public void Test_88_09()
+        {
+        }
+
+        [Test]
+        public void Test_88_10()
+        {
+        }
+
+        [Test]
+        public void Test_88_11()
+        {
+        }
+
+        [Test]
+        public void Test_88_12()
+        {
+        }
+
+        [Test]
+        public void Test_88_13()
+        {
+        }
+
+        [Test]
+        public void Test_88_14()
+        {
+        }
+
+        [Test]
+        public void Test_88_15()
+        {
+        }
+
+        [Test]
+        public void Test_88_16()
+        {
+        }
+
+        [Test]
+        public void Test_88_17()
+        {
+        }
+
+        [Test]
+        public void Test_88_18()
+        {
+        }
+
+        [Test]
+        public void Test_88_19()
+        {
+        }
+
+        [Test]
+        public void Test_88_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_89
+    {
+        #region PassingTests
+        [Test]
+        public void Test_89_01()
+        {
+        }
+
+        [Test]
+        public void Test_89_02()
+        {
+        }
+
+        [Test]
+        public void Test_89_03()
+        {
+        }
+
+        [Test]
+        public void Test_89_04()
+        {
+        }
+
+        [Test]
+        public void Test_89_05()
+        {
+        }
+
+        [Test]
+        public void Test_89_06()
+        {
+        }
+
+        [Test]
+        public void Test_89_07()
+        {
+        }
+
+        [Test]
+        public void Test_89_08()
+        {
+        }
+
+        [Test]
+        public void Test_89_09()
+        {
+        }
+
+        [Test]
+        public void Test_89_10()
+        {
+        }
+
+        [Test]
+        public void Test_89_11()
+        {
+        }
+
+        [Test]
+        public void Test_89_12()
+        {
+        }
+
+        [Test]
+        public void Test_89_13()
+        {
+        }
+
+        [Test]
+        public void Test_89_14()
+        {
+        }
+
+        [Test]
+        public void Test_89_15()
+        {
+        }
+
+        [Test]
+        public void Test_89_16()
+        {
+        }
+
+        [Test]
+        public void Test_89_17()
+        {
+        }
+
+        [Test]
+        public void Test_89_18()
+        {
+        }
+
+        [Test]
+        public void Test_89_19()
+        {
+        }
+
+        [Test]
+        public void Test_89_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_90
+    {
+        #region PassingTests
+        [Test]
+        public void Test_90_01()
+        {
+        }
+
+        [Test]
+        public void Test_90_02()
+        {
+        }
+
+        [Test]
+        public void Test_90_03()
+        {
+        }
+
+        [Test]
+        public void Test_90_04()
+        {
+        }
+
+        [Test]
+        public void Test_90_05()
+        {
+        }
+
+        [Test]
+        public void Test_90_06()
+        {
+        }
+
+        [Test]
+        public void Test_90_07()
+        {
+        }
+
+        [Test]
+        public void Test_90_08()
+        {
+        }
+
+        [Test]
+        public void Test_90_09()
+        {
+        }
+
+        [Test]
+        public void Test_90_10()
+        {
+        }
+
+        [Test]
+        public void Test_90_11()
+        {
+        }
+
+        [Test]
+        public void Test_90_12()
+        {
+        }
+
+        [Test]
+        public void Test_90_13()
+        {
+        }
+
+        [Test]
+        public void Test_90_14()
+        {
+        }
+
+        [Test]
+        public void Test_90_15()
+        {
+        }
+
+        [Test]
+        public void Test_90_16()
+        {
+        }
+
+        [Test]
+        public void Test_90_17()
+        {
+        }
+
+        [Test]
+        public void Test_90_18()
+        {
+        }
+
+        [Test]
+        public void Test_90_19()
+        {
+        }
+
+        [Test]
+        public void Test_90_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_91
+    {
+        #region PassingTests
+        [Test]
+        public void Test_91_01()
+        {
+        }
+
+        [Test]
+        public void Test_91_02()
+        {
+        }
+
+        [Test]
+        public void Test_91_03()
+        {
+        }
+
+        [Test]
+        public void Test_91_04()
+        {
+        }
+
+        [Test]
+        public void Test_91_05()
+        {
+        }
+
+        [Test]
+        public void Test_91_06()
+        {
+        }
+
+        [Test]
+        public void Test_91_07()
+        {
+        }
+
+        [Test]
+        public void Test_91_08()
+        {
+        }
+
+        [Test]
+        public void Test_91_09()
+        {
+        }
+
+        [Test]
+        public void Test_91_10()
+        {
+        }
+
+        [Test]
+        public void Test_91_11()
+        {
+        }
+
+        [Test]
+        public void Test_91_12()
+        {
+        }
+
+        [Test]
+        public void Test_91_13()
+        {
+        }
+
+        [Test]
+        public void Test_91_14()
+        {
+        }
+
+        [Test]
+        public void Test_91_15()
+        {
+        }
+
+        [Test]
+        public void Test_91_16()
+        {
+        }
+
+        [Test]
+        public void Test_91_17()
+        {
+        }
+
+        [Test]
+        public void Test_91_18()
+        {
+        }
+
+        [Test]
+        public void Test_91_19()
+        {
+        }
+
+        [Test]
+        public void Test_91_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_92
+    {
+        #region PassingTests
+        [Test]
+        public void Test_92_01()
+        {
+        }
+
+        [Test]
+        public void Test_92_02()
+        {
+        }
+
+        [Test]
+        public void Test_92_03()
+        {
+        }
+
+        [Test]
+        public void Test_92_04()
+        {
+        }
+
+        [Test]
+        public void Test_92_05()
+        {
+        }
+
+        [Test]
+        public void Test_92_06()
+        {
+        }
+
+        [Test]
+        public void Test_92_07()
+        {
+        }
+
+        [Test]
+        public void Test_92_08()
+        {
+        }
+
+        [Test]
+        public void Test_92_09()
+        {
+        }
+
+        [Test]
+        public void Test_92_10()
+        {
+        }
+
+        [Test]
+        public void Test_92_11()
+        {
+        }
+
+        [Test]
+        public void Test_92_12()
+        {
+        }
+
+        [Test]
+        public void Test_92_13()
+        {
+        }
+
+        [Test]
+        public void Test_92_14()
+        {
+        }
+
+        [Test]
+        public void Test_92_15()
+        {
+        }
+
+        [Test]
+        public void Test_92_16()
+        {
+        }
+
+        [Test]
+        public void Test_92_17()
+        {
+        }
+
+        [Test]
+        public void Test_92_18()
+        {
+        }
+
+        [Test]
+        public void Test_92_19()
+        {
+        }
+
+        [Test]
+        public void Test_92_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_93
+    {
+        #region PassingTests
+        [Test]
+        public void Test_93_01()
+        {
+        }
+
+        [Test]
+        public void Test_93_02()
+        {
+        }
+
+        [Test]
+        public void Test_93_03()
+        {
+        }
+
+        [Test]
+        public void Test_93_04()
+        {
+        }
+
+        [Test]
+        public void Test_93_05()
+        {
+        }
+
+        [Test]
+        public void Test_93_06()
+        {
+        }
+
+        [Test]
+        public void Test_93_07()
+        {
+        }
+
+        [Test]
+        public void Test_93_08()
+        {
+        }
+
+        [Test]
+        public void Test_93_09()
+        {
+        }
+
+        [Test]
+        public void Test_93_10()
+        {
+        }
+
+        [Test]
+        public void Test_93_11()
+        {
+        }
+
+        [Test]
+        public void Test_93_12()
+        {
+        }
+
+        [Test]
+        public void Test_93_13()
+        {
+        }
+
+        [Test]
+        public void Test_93_14()
+        {
+        }
+
+        [Test]
+        public void Test_93_15()
+        {
+        }
+
+        [Test]
+        public void Test_93_16()
+        {
+        }
+
+        [Test]
+        public void Test_93_17()
+        {
+        }
+
+        [Test]
+        public void Test_93_18()
+        {
+        }
+
+        [Test]
+        public void Test_93_19()
+        {
+        }
+
+        [Test]
+        public void Test_93_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_94
+    {
+        #region PassingTests
+        [Test]
+        public void Test_94_01()
+        {
+        }
+
+        [Test]
+        public void Test_94_02()
+        {
+        }
+
+        [Test]
+        public void Test_94_03()
+        {
+        }
+
+        [Test]
+        public void Test_94_04()
+        {
+        }
+
+        [Test]
+        public void Test_94_05()
+        {
+        }
+
+        [Test]
+        public void Test_94_06()
+        {
+        }
+
+        [Test]
+        public void Test_94_07()
+        {
+        }
+
+        [Test]
+        public void Test_94_08()
+        {
+        }
+
+        [Test]
+        public void Test_94_09()
+        {
+        }
+
+        [Test]
+        public void Test_94_10()
+        {
+        }
+
+        [Test]
+        public void Test_94_11()
+        {
+        }
+
+        [Test]
+        public void Test_94_12()
+        {
+        }
+
+        [Test]
+        public void Test_94_13()
+        {
+        }
+
+        [Test]
+        public void Test_94_14()
+        {
+        }
+
+        [Test]
+        public void Test_94_15()
+        {
+        }
+
+        [Test]
+        public void Test_94_16()
+        {
+        }
+
+        [Test]
+        public void Test_94_17()
+        {
+        }
+
+        [Test]
+        public void Test_94_18()
+        {
+        }
+
+        [Test]
+        public void Test_94_19()
+        {
+        }
+
+        [Test]
+        public void Test_94_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_95
+    {
+        #region PassingTests
+        [Test]
+        public void Test_95_01()
+        {
+        }
+
+        [Test]
+        public void Test_95_02()
+        {
+        }
+
+        [Test]
+        public void Test_95_03()
+        {
+        }
+
+        [Test]
+        public void Test_95_04()
+        {
+        }
+
+        [Test]
+        public void Test_95_05()
+        {
+        }
+
+        [Test]
+        public void Test_95_06()
+        {
+        }
+
+        [Test]
+        public void Test_95_07()
+        {
+        }
+
+        [Test]
+        public void Test_95_08()
+        {
+        }
+
+        [Test]
+        public void Test_95_09()
+        {
+        }
+
+        [Test]
+        public void Test_95_10()
+        {
+        }
+
+        [Test]
+        public void Test_95_11()
+        {
+        }
+
+        [Test]
+        public void Test_95_12()
+        {
+        }
+
+        [Test]
+        public void Test_95_13()
+        {
+        }
+
+        [Test]
+        public void Test_95_14()
+        {
+        }
+
+        [Test]
+        public void Test_95_15()
+        {
+        }
+
+        [Test]
+        public void Test_95_16()
+        {
+        }
+
+        [Test]
+        public void Test_95_17()
+        {
+        }
+
+        [Test]
+        public void Test_95_18()
+        {
+        }
+
+        [Test]
+        public void Test_95_19()
+        {
+        }
+
+        [Test]
+        public void Test_95_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_96
+    {
+        #region PassingTests
+        [Test]
+        public void Test_96_01()
+        {
+        }
+
+        [Test]
+        public void Test_96_02()
+        {
+        }
+
+        [Test]
+        public void Test_96_03()
+        {
+        }
+
+        [Test]
+        public void Test_96_04()
+        {
+        }
+
+        [Test]
+        public void Test_96_05()
+        {
+        }
+
+        [Test]
+        public void Test_96_06()
+        {
+        }
+
+        [Test]
+        public void Test_96_07()
+        {
+        }
+
+        [Test]
+        public void Test_96_08()
+        {
+        }
+
+        [Test]
+        public void Test_96_09()
+        {
+        }
+
+        [Test]
+        public void Test_96_10()
+        {
+        }
+
+        [Test]
+        public void Test_96_11()
+        {
+        }
+
+        [Test]
+        public void Test_96_12()
+        {
+        }
+
+        [Test]
+        public void Test_96_13()
+        {
+        }
+
+        [Test]
+        public void Test_96_14()
+        {
+        }
+
+        [Test]
+        public void Test_96_15()
+        {
+        }
+
+        [Test]
+        public void Test_96_16()
+        {
+        }
+
+        [Test]
+        public void Test_96_17()
+        {
+        }
+
+        [Test]
+        public void Test_96_18()
+        {
+        }
+
+        [Test]
+        public void Test_96_19()
+        {
+        }
+
+        [Test]
+        public void Test_96_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_97
+    {
+        #region PassingTests
+        [Test]
+        public void Test_97_01()
+        {
+        }
+
+        [Test]
+        public void Test_97_02()
+        {
+        }
+
+        [Test]
+        public void Test_97_03()
+        {
+        }
+
+        [Test]
+        public void Test_97_04()
+        {
+        }
+
+        [Test]
+        public void Test_97_05()
+        {
+        }
+
+        [Test]
+        public void Test_97_06()
+        {
+        }
+
+        [Test]
+        public void Test_97_07()
+        {
+        }
+
+        [Test]
+        public void Test_97_08()
+        {
+        }
+
+        [Test]
+        public void Test_97_09()
+        {
+        }
+
+        [Test]
+        public void Test_97_10()
+        {
+        }
+
+        [Test]
+        public void Test_97_11()
+        {
+        }
+
+        [Test]
+        public void Test_97_12()
+        {
+        }
+
+        [Test]
+        public void Test_97_13()
+        {
+        }
+
+        [Test]
+        public void Test_97_14()
+        {
+        }
+
+        [Test]
+        public void Test_97_15()
+        {
+        }
+
+        [Test]
+        public void Test_97_16()
+        {
+        }
+
+        [Test]
+        public void Test_97_17()
+        {
+        }
+
+        [Test]
+        public void Test_97_18()
+        {
+        }
+
+        [Test]
+        public void Test_97_19()
+        {
+        }
+
+        [Test]
+        public void Test_97_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_98
+    {
+        #region PassingTests
+        [Test]
+        public void Test_98_01()
+        {
+        }
+
+        [Test]
+        public void Test_98_02()
+        {
+        }
+
+        [Test]
+        public void Test_98_03()
+        {
+        }
+
+        [Test]
+        public void Test_98_04()
+        {
+        }
+
+        [Test]
+        public void Test_98_05()
+        {
+        }
+
+        [Test]
+        public void Test_98_06()
+        {
+        }
+
+        [Test]
+        public void Test_98_07()
+        {
+        }
+
+        [Test]
+        public void Test_98_08()
+        {
+        }
+
+        [Test]
+        public void Test_98_09()
+        {
+        }
+
+        [Test]
+        public void Test_98_10()
+        {
+        }
+
+        [Test]
+        public void Test_98_11()
+        {
+        }
+
+        [Test]
+        public void Test_98_12()
+        {
+        }
+
+        [Test]
+        public void Test_98_13()
+        {
+        }
+
+        [Test]
+        public void Test_98_14()
+        {
+        }
+
+        [Test]
+        public void Test_98_15()
+        {
+        }
+
+        [Test]
+        public void Test_98_16()
+        {
+        }
+
+        [Test]
+        public void Test_98_17()
+        {
+        }
+
+        [Test]
+        public void Test_98_18()
+        {
+        }
+
+        [Test]
+        public void Test_98_19()
+        {
+        }
+
+        [Test]
+        public void Test_98_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_99
+    {
+        #region PassingTests
+        [Test]
+        public void Test_99_01()
+        {
+        }
+
+        [Test]
+        public void Test_99_02()
+        {
+        }
+
+        [Test]
+        public void Test_99_03()
+        {
+        }
+
+        [Test]
+        public void Test_99_04()
+        {
+        }
+
+        [Test]
+        public void Test_99_05()
+        {
+        }
+
+        [Test]
+        public void Test_99_06()
+        {
+        }
+
+        [Test]
+        public void Test_99_07()
+        {
+        }
+
+        [Test]
+        public void Test_99_08()
+        {
+        }
+
+        [Test]
+        public void Test_99_09()
+        {
+        }
+
+        [Test]
+        public void Test_99_10()
+        {
+        }
+
+        [Test]
+        public void Test_99_11()
+        {
+        }
+
+        [Test]
+        public void Test_99_12()
+        {
+        }
+
+        [Test]
+        public void Test_99_13()
+        {
+        }
+
+        [Test]
+        public void Test_99_14()
+        {
+        }
+
+        [Test]
+        public void Test_99_15()
+        {
+        }
+
+        [Test]
+        public void Test_99_16()
+        {
+        }
+
+        [Test]
+        public void Test_99_17()
+        {
+        }
+
+        [Test]
+        public void Test_99_18()
+        {
+        }
+
+        [Test]
+        public void Test_99_19()
+        {
+        }
+
+        [Test]
+        public void Test_99_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_100
+    {
+        #region PassingTests
+        [Test]
+        public void Test_100_01()
+        {
+        }
+
+        [Test]
+        public void Test_100_02()
+        {
+        }
+
+        [Test]
+        public void Test_100_03()
+        {
+        }
+
+        [Test]
+        public void Test_100_04()
+        {
+        }
+
+        [Test]
+        public void Test_100_05()
+        {
+        }
+
+        [Test]
+        public void Test_100_06()
+        {
+        }
+
+        [Test]
+        public void Test_100_07()
+        {
+        }
+
+        [Test]
+        public void Test_100_08()
+        {
+        }
+
+        [Test]
+        public void Test_100_09()
+        {
+        }
+
+        [Test]
+        public void Test_100_10()
+        {
+        }
+
+        [Test]
+        public void Test_100_11()
+        {
+        }
+
+        [Test]
+        public void Test_100_12()
+        {
+        }
+
+        [Test]
+        public void Test_100_13()
+        {
+        }
+
+        [Test]
+        public void Test_100_14()
+        {
+        }
+
+        [Test]
+        public void Test_100_15()
+        {
+        }
+
+        [Test]
+        public void Test_100_16()
+        {
+        }
+
+        [Test]
+        public void Test_100_17()
+        {
+        }
+
+        [Test]
+        public void Test_100_18()
+        {
+        }
+
+        [Test]
+        public void Test_100_19()
+        {
+        }
+
+        [Test]
+        public void Test_100_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_101
+    {
+        #region PassingTests
+        [Test]
+        public void Test_101_01()
+        {
+        }
+
+        [Test]
+        public void Test_101_02()
+        {
+        }
+
+        [Test]
+        public void Test_101_03()
+        {
+        }
+
+        [Test]
+        public void Test_101_04()
+        {
+        }
+
+        [Test]
+        public void Test_101_05()
+        {
+        }
+
+        [Test]
+        public void Test_101_06()
+        {
+        }
+
+        [Test]
+        public void Test_101_07()
+        {
+        }
+
+        [Test]
+        public void Test_101_08()
+        {
+        }
+
+        [Test]
+        public void Test_101_09()
+        {
+        }
+
+        [Test]
+        public void Test_101_10()
+        {
+        }
+
+        [Test]
+        public void Test_101_11()
+        {
+        }
+
+        [Test]
+        public void Test_101_12()
+        {
+        }
+
+        [Test]
+        public void Test_101_13()
+        {
+        }
+
+        [Test]
+        public void Test_101_14()
+        {
+        }
+
+        [Test]
+        public void Test_101_15()
+        {
+        }
+
+        [Test]
+        public void Test_101_16()
+        {
+        }
+
+        [Test]
+        public void Test_101_17()
+        {
+        }
+
+        [Test]
+        public void Test_101_18()
+        {
+        }
+
+        [Test]
+        public void Test_101_19()
+        {
+        }
+
+        [Test]
+        public void Test_101_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_102
+    {
+        #region PassingTests
+        [Test]
+        public void Test_102_01()
+        {
+        }
+
+        [Test]
+        public void Test_102_02()
+        {
+        }
+
+        [Test]
+        public void Test_102_03()
+        {
+        }
+
+        [Test]
+        public void Test_102_04()
+        {
+        }
+
+        [Test]
+        public void Test_102_05()
+        {
+        }
+
+        [Test]
+        public void Test_102_06()
+        {
+        }
+
+        [Test]
+        public void Test_102_07()
+        {
+        }
+
+        [Test]
+        public void Test_102_08()
+        {
+        }
+
+        [Test]
+        public void Test_102_09()
+        {
+        }
+
+        [Test]
+        public void Test_102_10()
+        {
+        }
+
+        [Test]
+        public void Test_102_11()
+        {
+        }
+
+        [Test]
+        public void Test_102_12()
+        {
+        }
+
+        [Test]
+        public void Test_102_13()
+        {
+        }
+
+        [Test]
+        public void Test_102_14()
+        {
+        }
+
+        [Test]
+        public void Test_102_15()
+        {
+        }
+
+        [Test]
+        public void Test_102_16()
+        {
+        }
+
+        [Test]
+        public void Test_102_17()
+        {
+        }
+
+        [Test]
+        public void Test_102_18()
+        {
+        }
+
+        [Test]
+        public void Test_102_19()
+        {
+        }
+
+        [Test]
+        public void Test_102_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_103
+    {
+        #region PassingTests
+        [Test]
+        public void Test_103_01()
+        {
+        }
+
+        [Test]
+        public void Test_103_02()
+        {
+        }
+
+        [Test]
+        public void Test_103_03()
+        {
+        }
+
+        [Test]
+        public void Test_103_04()
+        {
+        }
+
+        [Test]
+        public void Test_103_05()
+        {
+        }
+
+        [Test]
+        public void Test_103_06()
+        {
+        }
+
+        [Test]
+        public void Test_103_07()
+        {
+        }
+
+        [Test]
+        public void Test_103_08()
+        {
+        }
+
+        [Test]
+        public void Test_103_09()
+        {
+        }
+
+        [Test]
+        public void Test_103_10()
+        {
+        }
+
+        [Test]
+        public void Test_103_11()
+        {
+        }
+
+        [Test]
+        public void Test_103_12()
+        {
+        }
+
+        [Test]
+        public void Test_103_13()
+        {
+        }
+
+        [Test]
+        public void Test_103_14()
+        {
+        }
+
+        [Test]
+        public void Test_103_15()
+        {
+        }
+
+        [Test]
+        public void Test_103_16()
+        {
+        }
+
+        [Test]
+        public void Test_103_17()
+        {
+        }
+
+        [Test]
+        public void Test_103_18()
+        {
+        }
+
+        [Test]
+        public void Test_103_19()
+        {
+        }
+
+        [Test]
+        public void Test_103_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_104
+    {
+        #region PassingTests
+        [Test]
+        public void Test_104_01()
+        {
+        }
+
+        [Test]
+        public void Test_104_02()
+        {
+        }
+
+        [Test]
+        public void Test_104_03()
+        {
+        }
+
+        [Test]
+        public void Test_104_04()
+        {
+        }
+
+        [Test]
+        public void Test_104_05()
+        {
+        }
+
+        [Test]
+        public void Test_104_06()
+        {
+        }
+
+        [Test]
+        public void Test_104_07()
+        {
+        }
+
+        [Test]
+        public void Test_104_08()
+        {
+        }
+
+        [Test]
+        public void Test_104_09()
+        {
+        }
+
+        [Test]
+        public void Test_104_10()
+        {
+        }
+
+        [Test]
+        public void Test_104_11()
+        {
+        }
+
+        [Test]
+        public void Test_104_12()
+        {
+        }
+
+        [Test]
+        public void Test_104_13()
+        {
+        }
+
+        [Test]
+        public void Test_104_14()
+        {
+        }
+
+        [Test]
+        public void Test_104_15()
+        {
+        }
+
+        [Test]
+        public void Test_104_16()
+        {
+        }
+
+        [Test]
+        public void Test_104_17()
+        {
+        }
+
+        [Test]
+        public void Test_104_18()
+        {
+        }
+
+        [Test]
+        public void Test_104_19()
+        {
+        }
+
+        [Test]
+        public void Test_104_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_105
+    {
+        #region PassingTests
+        [Test]
+        public void Test_105_01()
+        {
+        }
+
+        [Test]
+        public void Test_105_02()
+        {
+        }
+
+        [Test]
+        public void Test_105_03()
+        {
+        }
+
+        [Test]
+        public void Test_105_04()
+        {
+        }
+
+        [Test]
+        public void Test_105_05()
+        {
+        }
+
+        [Test]
+        public void Test_105_06()
+        {
+        }
+
+        [Test]
+        public void Test_105_07()
+        {
+        }
+
+        [Test]
+        public void Test_105_08()
+        {
+        }
+
+        [Test]
+        public void Test_105_09()
+        {
+        }
+
+        [Test]
+        public void Test_105_10()
+        {
+        }
+
+        [Test]
+        public void Test_105_11()
+        {
+        }
+
+        [Test]
+        public void Test_105_12()
+        {
+        }
+
+        [Test]
+        public void Test_105_13()
+        {
+        }
+
+        [Test]
+        public void Test_105_14()
+        {
+        }
+
+        [Test]
+        public void Test_105_15()
+        {
+        }
+
+        [Test]
+        public void Test_105_16()
+        {
+        }
+
+        [Test]
+        public void Test_105_17()
+        {
+        }
+
+        [Test]
+        public void Test_105_18()
+        {
+        }
+
+        [Test]
+        public void Test_105_19()
+        {
+        }
+
+        [Test]
+        public void Test_105_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_106
+    {
+        #region PassingTests
+        [Test]
+        public void Test_106_01()
+        {
+        }
+
+        [Test]
+        public void Test_106_02()
+        {
+        }
+
+        [Test]
+        public void Test_106_03()
+        {
+        }
+
+        [Test]
+        public void Test_106_04()
+        {
+        }
+
+        [Test]
+        public void Test_106_05()
+        {
+        }
+
+        [Test]
+        public void Test_106_06()
+        {
+        }
+
+        [Test]
+        public void Test_106_07()
+        {
+        }
+
+        [Test]
+        public void Test_106_08()
+        {
+        }
+
+        [Test]
+        public void Test_106_09()
+        {
+        }
+
+        [Test]
+        public void Test_106_10()
+        {
+        }
+
+        [Test]
+        public void Test_106_11()
+        {
+        }
+
+        [Test]
+        public void Test_106_12()
+        {
+        }
+
+        [Test]
+        public void Test_106_13()
+        {
+        }
+
+        [Test]
+        public void Test_106_14()
+        {
+        }
+
+        [Test]
+        public void Test_106_15()
+        {
+        }
+
+        [Test]
+        public void Test_106_16()
+        {
+        }
+
+        [Test]
+        public void Test_106_17()
+        {
+        }
+
+        [Test]
+        public void Test_106_18()
+        {
+        }
+
+        [Test]
+        public void Test_106_19()
+        {
+        }
+
+        [Test]
+        public void Test_106_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_107
+    {
+        #region PassingTests
+        [Test]
+        public void Test_107_01()
+        {
+        }
+
+        [Test]
+        public void Test_107_02()
+        {
+        }
+
+        [Test]
+        public void Test_107_03()
+        {
+        }
+
+        [Test]
+        public void Test_107_04()
+        {
+        }
+
+        [Test]
+        public void Test_107_05()
+        {
+        }
+
+        [Test]
+        public void Test_107_06()
+        {
+        }
+
+        [Test]
+        public void Test_107_07()
+        {
+        }
+
+        [Test]
+        public void Test_107_08()
+        {
+        }
+
+        [Test]
+        public void Test_107_09()
+        {
+        }
+
+        [Test]
+        public void Test_107_10()
+        {
+        }
+
+        [Test]
+        public void Test_107_11()
+        {
+        }
+
+        [Test]
+        public void Test_107_12()
+        {
+        }
+
+        [Test]
+        public void Test_107_13()
+        {
+        }
+
+        [Test]
+        public void Test_107_14()
+        {
+        }
+
+        [Test]
+        public void Test_107_15()
+        {
+        }
+
+        [Test]
+        public void Test_107_16()
+        {
+        }
+
+        [Test]
+        public void Test_107_17()
+        {
+        }
+
+        [Test]
+        public void Test_107_18()
+        {
+        }
+
+        [Test]
+        public void Test_107_19()
+        {
+        }
+
+        [Test]
+        public void Test_107_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_108
+    {
+        #region PassingTests
+        [Test]
+        public void Test_108_01()
+        {
+        }
+
+        [Test]
+        public void Test_108_02()
+        {
+        }
+
+        [Test]
+        public void Test_108_03()
+        {
+        }
+
+        [Test]
+        public void Test_108_04()
+        {
+        }
+
+        [Test]
+        public void Test_108_05()
+        {
+        }
+
+        [Test]
+        public void Test_108_06()
+        {
+        }
+
+        [Test]
+        public void Test_108_07()
+        {
+        }
+
+        [Test]
+        public void Test_108_08()
+        {
+        }
+
+        [Test]
+        public void Test_108_09()
+        {
+        }
+
+        [Test]
+        public void Test_108_10()
+        {
+        }
+
+        [Test]
+        public void Test_108_11()
+        {
+        }
+
+        [Test]
+        public void Test_108_12()
+        {
+        }
+
+        [Test]
+        public void Test_108_13()
+        {
+        }
+
+        [Test]
+        public void Test_108_14()
+        {
+        }
+
+        [Test]
+        public void Test_108_15()
+        {
+        }
+
+        [Test]
+        public void Test_108_16()
+        {
+        }
+
+        [Test]
+        public void Test_108_17()
+        {
+        }
+
+        [Test]
+        public void Test_108_18()
+        {
+        }
+
+        [Test]
+        public void Test_108_19()
+        {
+        }
+
+        [Test]
+        public void Test_108_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_109
+    {
+        #region PassingTests
+        [Test]
+        public void Test_109_01()
+        {
+        }
+
+        [Test]
+        public void Test_109_02()
+        {
+        }
+
+        [Test]
+        public void Test_109_03()
+        {
+        }
+
+        [Test]
+        public void Test_109_04()
+        {
+        }
+
+        [Test]
+        public void Test_109_05()
+        {
+        }
+
+        [Test]
+        public void Test_109_06()
+        {
+        }
+
+        [Test]
+        public void Test_109_07()
+        {
+        }
+
+        [Test]
+        public void Test_109_08()
+        {
+        }
+
+        [Test]
+        public void Test_109_09()
+        {
+        }
+
+        [Test]
+        public void Test_109_10()
+        {
+        }
+
+        [Test]
+        public void Test_109_11()
+        {
+        }
+
+        [Test]
+        public void Test_109_12()
+        {
+        }
+
+        [Test]
+        public void Test_109_13()
+        {
+        }
+
+        [Test]
+        public void Test_109_14()
+        {
+        }
+
+        [Test]
+        public void Test_109_15()
+        {
+        }
+
+        [Test]
+        public void Test_109_16()
+        {
+        }
+
+        [Test]
+        public void Test_109_17()
+        {
+        }
+
+        [Test]
+        public void Test_109_18()
+        {
+        }
+
+        [Test]
+        public void Test_109_19()
+        {
+        }
+
+        [Test]
+        public void Test_109_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_110
+    {
+        #region PassingTests
+        [Test]
+        public void Test_110_01()
+        {
+        }
+
+        [Test]
+        public void Test_110_02()
+        {
+        }
+
+        [Test]
+        public void Test_110_03()
+        {
+        }
+
+        [Test]
+        public void Test_110_04()
+        {
+        }
+
+        [Test]
+        public void Test_110_05()
+        {
+        }
+
+        [Test]
+        public void Test_110_06()
+        {
+        }
+
+        [Test]
+        public void Test_110_07()
+        {
+        }
+
+        [Test]
+        public void Test_110_08()
+        {
+        }
+
+        [Test]
+        public void Test_110_09()
+        {
+        }
+
+        [Test]
+        public void Test_110_10()
+        {
+        }
+
+        [Test]
+        public void Test_110_11()
+        {
+        }
+
+        [Test]
+        public void Test_110_12()
+        {
+        }
+
+        [Test]
+        public void Test_110_13()
+        {
+        }
+
+        [Test]
+        public void Test_110_14()
+        {
+        }
+
+        [Test]
+        public void Test_110_15()
+        {
+        }
+
+        [Test]
+        public void Test_110_16()
+        {
+        }
+
+        [Test]
+        public void Test_110_17()
+        {
+        }
+
+        [Test]
+        public void Test_110_18()
+        {
+        }
+
+        [Test]
+        public void Test_110_19()
+        {
+        }
+
+        [Test]
+        public void Test_110_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_111
+    {
+        #region PassingTests
+        [Test]
+        public void Test_111_01()
+        {
+        }
+
+        [Test]
+        public void Test_111_02()
+        {
+        }
+
+        [Test]
+        public void Test_111_03()
+        {
+        }
+
+        [Test]
+        public void Test_111_04()
+        {
+        }
+
+        [Test]
+        public void Test_111_05()
+        {
+        }
+
+        [Test]
+        public void Test_111_06()
+        {
+        }
+
+        [Test]
+        public void Test_111_07()
+        {
+        }
+
+        [Test]
+        public void Test_111_08()
+        {
+        }
+
+        [Test]
+        public void Test_111_09()
+        {
+        }
+
+        [Test]
+        public void Test_111_10()
+        {
+        }
+
+        [Test]
+        public void Test_111_11()
+        {
+        }
+
+        [Test]
+        public void Test_111_12()
+        {
+        }
+
+        [Test]
+        public void Test_111_13()
+        {
+        }
+
+        [Test]
+        public void Test_111_14()
+        {
+        }
+
+        [Test]
+        public void Test_111_15()
+        {
+        }
+
+        [Test]
+        public void Test_111_16()
+        {
+        }
+
+        [Test]
+        public void Test_111_17()
+        {
+        }
+
+        [Test]
+        public void Test_111_18()
+        {
+        }
+
+        [Test]
+        public void Test_111_19()
+        {
+        }
+
+        [Test]
+        public void Test_111_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_112
+    {
+        #region PassingTests
+        [Test]
+        public void Test_112_01()
+        {
+        }
+
+        [Test]
+        public void Test_112_02()
+        {
+        }
+
+        [Test]
+        public void Test_112_03()
+        {
+        }
+
+        [Test]
+        public void Test_112_04()
+        {
+        }
+
+        [Test]
+        public void Test_112_05()
+        {
+        }
+
+        [Test]
+        public void Test_112_06()
+        {
+        }
+
+        [Test]
+        public void Test_112_07()
+        {
+        }
+
+        [Test]
+        public void Test_112_08()
+        {
+        }
+
+        [Test]
+        public void Test_112_09()
+        {
+        }
+
+        [Test]
+        public void Test_112_10()
+        {
+        }
+
+        [Test]
+        public void Test_112_11()
+        {
+        }
+
+        [Test]
+        public void Test_112_12()
+        {
+        }
+
+        [Test]
+        public void Test_112_13()
+        {
+        }
+
+        [Test]
+        public void Test_112_14()
+        {
+        }
+
+        [Test]
+        public void Test_112_15()
+        {
+        }
+
+        [Test]
+        public void Test_112_16()
+        {
+        }
+
+        [Test]
+        public void Test_112_17()
+        {
+        }
+
+        [Test]
+        public void Test_112_18()
+        {
+        }
+
+        [Test]
+        public void Test_112_19()
+        {
+        }
+
+        [Test]
+        public void Test_112_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_113
+    {
+        #region PassingTests
+        [Test]
+        public void Test_113_01()
+        {
+        }
+
+        [Test]
+        public void Test_113_02()
+        {
+        }
+
+        [Test]
+        public void Test_113_03()
+        {
+        }
+
+        [Test]
+        public void Test_113_04()
+        {
+        }
+
+        [Test]
+        public void Test_113_05()
+        {
+        }
+
+        [Test]
+        public void Test_113_06()
+        {
+        }
+
+        [Test]
+        public void Test_113_07()
+        {
+        }
+
+        [Test]
+        public void Test_113_08()
+        {
+        }
+
+        [Test]
+        public void Test_113_09()
+        {
+        }
+
+        [Test]
+        public void Test_113_10()
+        {
+        }
+
+        [Test]
+        public void Test_113_11()
+        {
+        }
+
+        [Test]
+        public void Test_113_12()
+        {
+        }
+
+        [Test]
+        public void Test_113_13()
+        {
+        }
+
+        [Test]
+        public void Test_113_14()
+        {
+        }
+
+        [Test]
+        public void Test_113_15()
+        {
+        }
+
+        [Test]
+        public void Test_113_16()
+        {
+        }
+
+        [Test]
+        public void Test_113_17()
+        {
+        }
+
+        [Test]
+        public void Test_113_18()
+        {
+        }
+
+        [Test]
+        public void Test_113_19()
+        {
+        }
+
+        [Test]
+        public void Test_113_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_114
+    {
+        #region PassingTests
+        [Test]
+        public void Test_114_01()
+        {
+        }
+
+        [Test]
+        public void Test_114_02()
+        {
+        }
+
+        [Test]
+        public void Test_114_03()
+        {
+        }
+
+        [Test]
+        public void Test_114_04()
+        {
+        }
+
+        [Test]
+        public void Test_114_05()
+        {
+        }
+
+        [Test]
+        public void Test_114_06()
+        {
+        }
+
+        [Test]
+        public void Test_114_07()
+        {
+        }
+
+        [Test]
+        public void Test_114_08()
+        {
+        }
+
+        [Test]
+        public void Test_114_09()
+        {
+        }
+
+        [Test]
+        public void Test_114_10()
+        {
+        }
+
+        [Test]
+        public void Test_114_11()
+        {
+        }
+
+        [Test]
+        public void Test_114_12()
+        {
+        }
+
+        [Test]
+        public void Test_114_13()
+        {
+        }
+
+        [Test]
+        public void Test_114_14()
+        {
+        }
+
+        [Test]
+        public void Test_114_15()
+        {
+        }
+
+        [Test]
+        public void Test_114_16()
+        {
+        }
+
+        [Test]
+        public void Test_114_17()
+        {
+        }
+
+        [Test]
+        public void Test_114_18()
+        {
+        }
+
+        [Test]
+        public void Test_114_19()
+        {
+        }
+
+        [Test]
+        public void Test_114_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_115
+    {
+        #region PassingTests
+        [Test]
+        public void Test_115_01()
+        {
+        }
+
+        [Test]
+        public void Test_115_02()
+        {
+        }
+
+        [Test]
+        public void Test_115_03()
+        {
+        }
+
+        [Test]
+        public void Test_115_04()
+        {
+        }
+
+        [Test]
+        public void Test_115_05()
+        {
+        }
+
+        [Test]
+        public void Test_115_06()
+        {
+        }
+
+        [Test]
+        public void Test_115_07()
+        {
+        }
+
+        [Test]
+        public void Test_115_08()
+        {
+        }
+
+        [Test]
+        public void Test_115_09()
+        {
+        }
+
+        [Test]
+        public void Test_115_10()
+        {
+        }
+
+        [Test]
+        public void Test_115_11()
+        {
+        }
+
+        [Test]
+        public void Test_115_12()
+        {
+        }
+
+        [Test]
+        public void Test_115_13()
+        {
+        }
+
+        [Test]
+        public void Test_115_14()
+        {
+        }
+
+        [Test]
+        public void Test_115_15()
+        {
+        }
+
+        [Test]
+        public void Test_115_16()
+        {
+        }
+
+        [Test]
+        public void Test_115_17()
+        {
+        }
+
+        [Test]
+        public void Test_115_18()
+        {
+        }
+
+        [Test]
+        public void Test_115_19()
+        {
+        }
+
+        [Test]
+        public void Test_115_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_116
+    {
+        #region PassingTests
+        [Test]
+        public void Test_116_01()
+        {
+        }
+
+        [Test]
+        public void Test_116_02()
+        {
+        }
+
+        [Test]
+        public void Test_116_03()
+        {
+        }
+
+        [Test]
+        public void Test_116_04()
+        {
+        }
+
+        [Test]
+        public void Test_116_05()
+        {
+        }
+
+        [Test]
+        public void Test_116_06()
+        {
+        }
+
+        [Test]
+        public void Test_116_07()
+        {
+        }
+
+        [Test]
+        public void Test_116_08()
+        {
+        }
+
+        [Test]
+        public void Test_116_09()
+        {
+        }
+
+        [Test]
+        public void Test_116_10()
+        {
+        }
+
+        [Test]
+        public void Test_116_11()
+        {
+        }
+
+        [Test]
+        public void Test_116_12()
+        {
+        }
+
+        [Test]
+        public void Test_116_13()
+        {
+        }
+
+        [Test]
+        public void Test_116_14()
+        {
+        }
+
+        [Test]
+        public void Test_116_15()
+        {
+        }
+
+        [Test]
+        public void Test_116_16()
+        {
+        }
+
+        [Test]
+        public void Test_116_17()
+        {
+        }
+
+        [Test]
+        public void Test_116_18()
+        {
+        }
+
+        [Test]
+        public void Test_116_19()
+        {
+        }
+
+        [Test]
+        public void Test_116_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_117
+    {
+        #region PassingTests
+        [Test]
+        public void Test_117_01()
+        {
+        }
+
+        [Test]
+        public void Test_117_02()
+        {
+        }
+
+        [Test]
+        public void Test_117_03()
+        {
+        }
+
+        [Test]
+        public void Test_117_04()
+        {
+        }
+
+        [Test]
+        public void Test_117_05()
+        {
+        }
+
+        [Test]
+        public void Test_117_06()
+        {
+        }
+
+        [Test]
+        public void Test_117_07()
+        {
+        }
+
+        [Test]
+        public void Test_117_08()
+        {
+        }
+
+        [Test]
+        public void Test_117_09()
+        {
+        }
+
+        [Test]
+        public void Test_117_10()
+        {
+        }
+
+        [Test]
+        public void Test_117_11()
+        {
+        }
+
+        [Test]
+        public void Test_117_12()
+        {
+        }
+
+        [Test]
+        public void Test_117_13()
+        {
+        }
+
+        [Test]
+        public void Test_117_14()
+        {
+        }
+
+        [Test]
+        public void Test_117_15()
+        {
+        }
+
+        [Test]
+        public void Test_117_16()
+        {
+        }
+
+        [Test]
+        public void Test_117_17()
+        {
+        }
+
+        [Test]
+        public void Test_117_18()
+        {
+        }
+
+        [Test]
+        public void Test_117_19()
+        {
+        }
+
+        [Test]
+        public void Test_117_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_118
+    {
+        #region PassingTests
+        [Test]
+        public void Test_118_01()
+        {
+        }
+
+        [Test]
+        public void Test_118_02()
+        {
+        }
+
+        [Test]
+        public void Test_118_03()
+        {
+        }
+
+        [Test]
+        public void Test_118_04()
+        {
+        }
+
+        [Test]
+        public void Test_118_05()
+        {
+        }
+
+        [Test]
+        public void Test_118_06()
+        {
+        }
+
+        [Test]
+        public void Test_118_07()
+        {
+        }
+
+        [Test]
+        public void Test_118_08()
+        {
+        }
+
+        [Test]
+        public void Test_118_09()
+        {
+        }
+
+        [Test]
+        public void Test_118_10()
+        {
+        }
+
+        [Test]
+        public void Test_118_11()
+        {
+        }
+
+        [Test]
+        public void Test_118_12()
+        {
+        }
+
+        [Test]
+        public void Test_118_13()
+        {
+        }
+
+        [Test]
+        public void Test_118_14()
+        {
+        }
+
+        [Test]
+        public void Test_118_15()
+        {
+        }
+
+        [Test]
+        public void Test_118_16()
+        {
+        }
+
+        [Test]
+        public void Test_118_17()
+        {
+        }
+
+        [Test]
+        public void Test_118_18()
+        {
+        }
+
+        [Test]
+        public void Test_118_19()
+        {
+        }
+
+        [Test]
+        public void Test_118_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_119
+    {
+        #region PassingTests
+        [Test]
+        public void Test_119_01()
+        {
+        }
+
+        [Test]
+        public void Test_119_02()
+        {
+        }
+
+        [Test]
+        public void Test_119_03()
+        {
+        }
+
+        [Test]
+        public void Test_119_04()
+        {
+        }
+
+        [Test]
+        public void Test_119_05()
+        {
+        }
+
+        [Test]
+        public void Test_119_06()
+        {
+        }
+
+        [Test]
+        public void Test_119_07()
+        {
+        }
+
+        [Test]
+        public void Test_119_08()
+        {
+        }
+
+        [Test]
+        public void Test_119_09()
+        {
+        }
+
+        [Test]
+        public void Test_119_10()
+        {
+        }
+
+        [Test]
+        public void Test_119_11()
+        {
+        }
+
+        [Test]
+        public void Test_119_12()
+        {
+        }
+
+        [Test]
+        public void Test_119_13()
+        {
+        }
+
+        [Test]
+        public void Test_119_14()
+        {
+        }
+
+        [Test]
+        public void Test_119_15()
+        {
+        }
+
+        [Test]
+        public void Test_119_16()
+        {
+        }
+
+        [Test]
+        public void Test_119_17()
+        {
+        }
+
+        [Test]
+        public void Test_119_18()
+        {
+        }
+
+        [Test]
+        public void Test_119_19()
+        {
+        }
+
+        [Test]
+        public void Test_119_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_120
+    {
+        #region PassingTests
+        [Test]
+        public void Test_120_01()
+        {
+        }
+
+        [Test]
+        public void Test_120_02()
+        {
+        }
+
+        [Test]
+        public void Test_120_03()
+        {
+        }
+
+        [Test]
+        public void Test_120_04()
+        {
+        }
+
+        [Test]
+        public void Test_120_05()
+        {
+        }
+
+        [Test]
+        public void Test_120_06()
+        {
+        }
+
+        [Test]
+        public void Test_120_07()
+        {
+        }
+
+        [Test]
+        public void Test_120_08()
+        {
+        }
+
+        [Test]
+        public void Test_120_09()
+        {
+        }
+
+        [Test]
+        public void Test_120_10()
+        {
+        }
+
+        [Test]
+        public void Test_120_11()
+        {
+        }
+
+        [Test]
+        public void Test_120_12()
+        {
+        }
+
+        [Test]
+        public void Test_120_13()
+        {
+        }
+
+        [Test]
+        public void Test_120_14()
+        {
+        }
+
+        [Test]
+        public void Test_120_15()
+        {
+        }
+
+        [Test]
+        public void Test_120_16()
+        {
+        }
+
+        [Test]
+        public void Test_120_17()
+        {
+        }
+
+        [Test]
+        public void Test_120_18()
+        {
+        }
+
+        [Test]
+        public void Test_120_19()
+        {
+        }
+
+        [Test]
+        public void Test_120_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_121
+    {
+        #region PassingTests
+        [Test]
+        public void Test_121_01()
+        {
+        }
+
+        [Test]
+        public void Test_121_02()
+        {
+        }
+
+        [Test]
+        public void Test_121_03()
+        {
+        }
+
+        [Test]
+        public void Test_121_04()
+        {
+        }
+
+        [Test]
+        public void Test_121_05()
+        {
+        }
+
+        [Test]
+        public void Test_121_06()
+        {
+        }
+
+        [Test]
+        public void Test_121_07()
+        {
+        }
+
+        [Test]
+        public void Test_121_08()
+        {
+        }
+
+        [Test]
+        public void Test_121_09()
+        {
+        }
+
+        [Test]
+        public void Test_121_10()
+        {
+        }
+
+        [Test]
+        public void Test_121_11()
+        {
+        }
+
+        [Test]
+        public void Test_121_12()
+        {
+        }
+
+        [Test]
+        public void Test_121_13()
+        {
+        }
+
+        [Test]
+        public void Test_121_14()
+        {
+        }
+
+        [Test]
+        public void Test_121_15()
+        {
+        }
+
+        [Test]
+        public void Test_121_16()
+        {
+        }
+
+        [Test]
+        public void Test_121_17()
+        {
+        }
+
+        [Test]
+        public void Test_121_18()
+        {
+        }
+
+        [Test]
+        public void Test_121_19()
+        {
+        }
+
+        [Test]
+        public void Test_121_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_122
+    {
+        #region PassingTests
+        [Test]
+        public void Test_122_01()
+        {
+        }
+
+        [Test]
+        public void Test_122_02()
+        {
+        }
+
+        [Test]
+        public void Test_122_03()
+        {
+        }
+
+        [Test]
+        public void Test_122_04()
+        {
+        }
+
+        [Test]
+        public void Test_122_05()
+        {
+        }
+
+        [Test]
+        public void Test_122_06()
+        {
+        }
+
+        [Test]
+        public void Test_122_07()
+        {
+        }
+
+        [Test]
+        public void Test_122_08()
+        {
+        }
+
+        [Test]
+        public void Test_122_09()
+        {
+        }
+
+        [Test]
+        public void Test_122_10()
+        {
+        }
+
+        [Test]
+        public void Test_122_11()
+        {
+        }
+
+        [Test]
+        public void Test_122_12()
+        {
+        }
+
+        [Test]
+        public void Test_122_13()
+        {
+        }
+
+        [Test]
+        public void Test_122_14()
+        {
+        }
+
+        [Test]
+        public void Test_122_15()
+        {
+        }
+
+        [Test]
+        public void Test_122_16()
+        {
+        }
+
+        [Test]
+        public void Test_122_17()
+        {
+        }
+
+        [Test]
+        public void Test_122_18()
+        {
+        }
+
+        [Test]
+        public void Test_122_19()
+        {
+        }
+
+        [Test]
+        public void Test_122_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_123
+    {
+        #region PassingTests
+        [Test]
+        public void Test_123_01()
+        {
+        }
+
+        [Test]
+        public void Test_123_02()
+        {
+        }
+
+        [Test]
+        public void Test_123_03()
+        {
+        }
+
+        [Test]
+        public void Test_123_04()
+        {
+        }
+
+        [Test]
+        public void Test_123_05()
+        {
+        }
+
+        [Test]
+        public void Test_123_06()
+        {
+        }
+
+        [Test]
+        public void Test_123_07()
+        {
+        }
+
+        [Test]
+        public void Test_123_08()
+        {
+        }
+
+        [Test]
+        public void Test_123_09()
+        {
+        }
+
+        [Test]
+        public void Test_123_10()
+        {
+        }
+
+        [Test]
+        public void Test_123_11()
+        {
+        }
+
+        [Test]
+        public void Test_123_12()
+        {
+        }
+
+        [Test]
+        public void Test_123_13()
+        {
+        }
+
+        [Test]
+        public void Test_123_14()
+        {
+        }
+
+        [Test]
+        public void Test_123_15()
+        {
+        }
+
+        [Test]
+        public void Test_123_16()
+        {
+        }
+
+        [Test]
+        public void Test_123_17()
+        {
+        }
+
+        [Test]
+        public void Test_123_18()
+        {
+        }
+
+        [Test]
+        public void Test_123_19()
+        {
+        }
+
+        [Test]
+        public void Test_123_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_124
+    {
+        #region PassingTests
+        [Test]
+        public void Test_124_01()
+        {
+        }
+
+        [Test]
+        public void Test_124_02()
+        {
+        }
+
+        [Test]
+        public void Test_124_03()
+        {
+        }
+
+        [Test]
+        public void Test_124_04()
+        {
+        }
+
+        [Test]
+        public void Test_124_05()
+        {
+        }
+
+        [Test]
+        public void Test_124_06()
+        {
+        }
+
+        [Test]
+        public void Test_124_07()
+        {
+        }
+
+        [Test]
+        public void Test_124_08()
+        {
+        }
+
+        [Test]
+        public void Test_124_09()
+        {
+        }
+
+        [Test]
+        public void Test_124_10()
+        {
+        }
+
+        [Test]
+        public void Test_124_11()
+        {
+        }
+
+        [Test]
+        public void Test_124_12()
+        {
+        }
+
+        [Test]
+        public void Test_124_13()
+        {
+        }
+
+        [Test]
+        public void Test_124_14()
+        {
+        }
+
+        [Test]
+        public void Test_124_15()
+        {
+        }
+
+        [Test]
+        public void Test_124_16()
+        {
+        }
+
+        [Test]
+        public void Test_124_17()
+        {
+        }
+
+        [Test]
+        public void Test_124_18()
+        {
+        }
+
+        [Test]
+        public void Test_124_19()
+        {
+        }
+
+        [Test]
+        public void Test_124_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_125
+    {
+        #region PassingTests
+        [Test]
+        public void Test_125_01()
+        {
+        }
+
+        [Test]
+        public void Test_125_02()
+        {
+        }
+
+        [Test]
+        public void Test_125_03()
+        {
+        }
+
+        [Test]
+        public void Test_125_04()
+        {
+        }
+
+        [Test]
+        public void Test_125_05()
+        {
+        }
+
+        [Test]
+        public void Test_125_06()
+        {
+        }
+
+        [Test]
+        public void Test_125_07()
+        {
+        }
+
+        [Test]
+        public void Test_125_08()
+        {
+        }
+
+        [Test]
+        public void Test_125_09()
+        {
+        }
+
+        [Test]
+        public void Test_125_10()
+        {
+        }
+
+        [Test]
+        public void Test_125_11()
+        {
+        }
+
+        [Test]
+        public void Test_125_12()
+        {
+        }
+
+        [Test]
+        public void Test_125_13()
+        {
+        }
+
+        [Test]
+        public void Test_125_14()
+        {
+        }
+
+        [Test]
+        public void Test_125_15()
+        {
+        }
+
+        [Test]
+        public void Test_125_16()
+        {
+        }
+
+        [Test]
+        public void Test_125_17()
+        {
+        }
+
+        [Test]
+        public void Test_125_18()
+        {
+        }
+
+        [Test]
+        public void Test_125_19()
+        {
+        }
+
+        [Test]
+        public void Test_125_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_126
+    {
+        #region PassingTests
+        [Test]
+        public void Test_126_01()
+        {
+        }
+
+        [Test]
+        public void Test_126_02()
+        {
+        }
+
+        [Test]
+        public void Test_126_03()
+        {
+        }
+
+        [Test]
+        public void Test_126_04()
+        {
+        }
+
+        [Test]
+        public void Test_126_05()
+        {
+        }
+
+        [Test]
+        public void Test_126_06()
+        {
+        }
+
+        [Test]
+        public void Test_126_07()
+        {
+        }
+
+        [Test]
+        public void Test_126_08()
+        {
+        }
+
+        [Test]
+        public void Test_126_09()
+        {
+        }
+
+        [Test]
+        public void Test_126_10()
+        {
+        }
+
+        [Test]
+        public void Test_126_11()
+        {
+        }
+
+        [Test]
+        public void Test_126_12()
+        {
+        }
+
+        [Test]
+        public void Test_126_13()
+        {
+        }
+
+        [Test]
+        public void Test_126_14()
+        {
+        }
+
+        [Test]
+        public void Test_126_15()
+        {
+        }
+
+        [Test]
+        public void Test_126_16()
+        {
+        }
+
+        [Test]
+        public void Test_126_17()
+        {
+        }
+
+        [Test]
+        public void Test_126_18()
+        {
+        }
+
+        [Test]
+        public void Test_126_19()
+        {
+        }
+
+        [Test]
+        public void Test_126_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_127
+    {
+        #region PassingTests
+        [Test]
+        public void Test_127_01()
+        {
+        }
+
+        [Test]
+        public void Test_127_02()
+        {
+        }
+
+        [Test]
+        public void Test_127_03()
+        {
+        }
+
+        [Test]
+        public void Test_127_04()
+        {
+        }
+
+        [Test]
+        public void Test_127_05()
+        {
+        }
+
+        [Test]
+        public void Test_127_06()
+        {
+        }
+
+        [Test]
+        public void Test_127_07()
+        {
+        }
+
+        [Test]
+        public void Test_127_08()
+        {
+        }
+
+        [Test]
+        public void Test_127_09()
+        {
+        }
+
+        [Test]
+        public void Test_127_10()
+        {
+        }
+
+        [Test]
+        public void Test_127_11()
+        {
+        }
+
+        [Test]
+        public void Test_127_12()
+        {
+        }
+
+        [Test]
+        public void Test_127_13()
+        {
+        }
+
+        [Test]
+        public void Test_127_14()
+        {
+        }
+
+        [Test]
+        public void Test_127_15()
+        {
+        }
+
+        [Test]
+        public void Test_127_16()
+        {
+        }
+
+        [Test]
+        public void Test_127_17()
+        {
+        }
+
+        [Test]
+        public void Test_127_18()
+        {
+        }
+
+        [Test]
+        public void Test_127_19()
+        {
+        }
+
+        [Test]
+        public void Test_127_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_128
+    {
+        #region PassingTests
+        [Test]
+        public void Test_128_01()
+        {
+        }
+
+        [Test]
+        public void Test_128_02()
+        {
+        }
+
+        [Test]
+        public void Test_128_03()
+        {
+        }
+
+        [Test]
+        public void Test_128_04()
+        {
+        }
+
+        [Test]
+        public void Test_128_05()
+        {
+        }
+
+        [Test]
+        public void Test_128_06()
+        {
+        }
+
+        [Test]
+        public void Test_128_07()
+        {
+        }
+
+        [Test]
+        public void Test_128_08()
+        {
+        }
+
+        [Test]
+        public void Test_128_09()
+        {
+        }
+
+        [Test]
+        public void Test_128_10()
+        {
+        }
+
+        [Test]
+        public void Test_128_11()
+        {
+        }
+
+        [Test]
+        public void Test_128_12()
+        {
+        }
+
+        [Test]
+        public void Test_128_13()
+        {
+        }
+
+        [Test]
+        public void Test_128_14()
+        {
+        }
+
+        [Test]
+        public void Test_128_15()
+        {
+        }
+
+        [Test]
+        public void Test_128_16()
+        {
+        }
+
+        [Test]
+        public void Test_128_17()
+        {
+        }
+
+        [Test]
+        public void Test_128_18()
+        {
+        }
+
+        [Test]
+        public void Test_128_19()
+        {
+        }
+
+        [Test]
+        public void Test_128_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_129
+    {
+        #region PassingTests
+        [Test]
+        public void Test_129_01()
+        {
+        }
+
+        [Test]
+        public void Test_129_02()
+        {
+        }
+
+        [Test]
+        public void Test_129_03()
+        {
+        }
+
+        [Test]
+        public void Test_129_04()
+        {
+        }
+
+        [Test]
+        public void Test_129_05()
+        {
+        }
+
+        [Test]
+        public void Test_129_06()
+        {
+        }
+
+        [Test]
+        public void Test_129_07()
+        {
+        }
+
+        [Test]
+        public void Test_129_08()
+        {
+        }
+
+        [Test]
+        public void Test_129_09()
+        {
+        }
+
+        [Test]
+        public void Test_129_10()
+        {
+        }
+
+        [Test]
+        public void Test_129_11()
+        {
+        }
+
+        [Test]
+        public void Test_129_12()
+        {
+        }
+
+        [Test]
+        public void Test_129_13()
+        {
+        }
+
+        [Test]
+        public void Test_129_14()
+        {
+        }
+
+        [Test]
+        public void Test_129_15()
+        {
+        }
+
+        [Test]
+        public void Test_129_16()
+        {
+        }
+
+        [Test]
+        public void Test_129_17()
+        {
+        }
+
+        [Test]
+        public void Test_129_18()
+        {
+        }
+
+        [Test]
+        public void Test_129_19()
+        {
+        }
+
+        [Test]
+        public void Test_129_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_130
+    {
+        #region PassingTests
+        [Test]
+        public void Test_130_01()
+        {
+        }
+
+        [Test]
+        public void Test_130_02()
+        {
+        }
+
+        [Test]
+        public void Test_130_03()
+        {
+        }
+
+        [Test]
+        public void Test_130_04()
+        {
+        }
+
+        [Test]
+        public void Test_130_05()
+        {
+        }
+
+        [Test]
+        public void Test_130_06()
+        {
+        }
+
+        [Test]
+        public void Test_130_07()
+        {
+        }
+
+        [Test]
+        public void Test_130_08()
+        {
+        }
+
+        [Test]
+        public void Test_130_09()
+        {
+        }
+
+        [Test]
+        public void Test_130_10()
+        {
+        }
+
+        [Test]
+        public void Test_130_11()
+        {
+        }
+
+        [Test]
+        public void Test_130_12()
+        {
+        }
+
+        [Test]
+        public void Test_130_13()
+        {
+        }
+
+        [Test]
+        public void Test_130_14()
+        {
+        }
+
+        [Test]
+        public void Test_130_15()
+        {
+        }
+
+        [Test]
+        public void Test_130_16()
+        {
+        }
+
+        [Test]
+        public void Test_130_17()
+        {
+        }
+
+        [Test]
+        public void Test_130_18()
+        {
+        }
+
+        [Test]
+        public void Test_130_19()
+        {
+        }
+
+        [Test]
+        public void Test_130_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_131
+    {
+        #region PassingTests
+        [Test]
+        public void Test_131_01()
+        {
+        }
+
+        [Test]
+        public void Test_131_02()
+        {
+        }
+
+        [Test]
+        public void Test_131_03()
+        {
+        }
+
+        [Test]
+        public void Test_131_04()
+        {
+        }
+
+        [Test]
+        public void Test_131_05()
+        {
+        }
+
+        [Test]
+        public void Test_131_06()
+        {
+        }
+
+        [Test]
+        public void Test_131_07()
+        {
+        }
+
+        [Test]
+        public void Test_131_08()
+        {
+        }
+
+        [Test]
+        public void Test_131_09()
+        {
+        }
+
+        [Test]
+        public void Test_131_10()
+        {
+        }
+
+        [Test]
+        public void Test_131_11()
+        {
+        }
+
+        [Test]
+        public void Test_131_12()
+        {
+        }
+
+        [Test]
+        public void Test_131_13()
+        {
+        }
+
+        [Test]
+        public void Test_131_14()
+        {
+        }
+
+        [Test]
+        public void Test_131_15()
+        {
+        }
+
+        [Test]
+        public void Test_131_16()
+        {
+        }
+
+        [Test]
+        public void Test_131_17()
+        {
+        }
+
+        [Test]
+        public void Test_131_18()
+        {
+        }
+
+        [Test]
+        public void Test_131_19()
+        {
+        }
+
+        [Test]
+        public void Test_131_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_132
+    {
+        #region PassingTests
+        [Test]
+        public void Test_132_01()
+        {
+        }
+
+        [Test]
+        public void Test_132_02()
+        {
+        }
+
+        [Test]
+        public void Test_132_03()
+        {
+        }
+
+        [Test]
+        public void Test_132_04()
+        {
+        }
+
+        [Test]
+        public void Test_132_05()
+        {
+        }
+
+        [Test]
+        public void Test_132_06()
+        {
+        }
+
+        [Test]
+        public void Test_132_07()
+        {
+        }
+
+        [Test]
+        public void Test_132_08()
+        {
+        }
+
+        [Test]
+        public void Test_132_09()
+        {
+        }
+
+        [Test]
+        public void Test_132_10()
+        {
+        }
+
+        [Test]
+        public void Test_132_11()
+        {
+        }
+
+        [Test]
+        public void Test_132_12()
+        {
+        }
+
+        [Test]
+        public void Test_132_13()
+        {
+        }
+
+        [Test]
+        public void Test_132_14()
+        {
+        }
+
+        [Test]
+        public void Test_132_15()
+        {
+        }
+
+        [Test]
+        public void Test_132_16()
+        {
+        }
+
+        [Test]
+        public void Test_132_17()
+        {
+        }
+
+        [Test]
+        public void Test_132_18()
+        {
+        }
+
+        [Test]
+        public void Test_132_19()
+        {
+        }
+
+        [Test]
+        public void Test_132_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_133
+    {
+        #region PassingTests
+        [Test]
+        public void Test_133_01()
+        {
+        }
+
+        [Test]
+        public void Test_133_02()
+        {
+        }
+
+        [Test]
+        public void Test_133_03()
+        {
+        }
+
+        [Test]
+        public void Test_133_04()
+        {
+        }
+
+        [Test]
+        public void Test_133_05()
+        {
+        }
+
+        [Test]
+        public void Test_133_06()
+        {
+        }
+
+        [Test]
+        public void Test_133_07()
+        {
+        }
+
+        [Test]
+        public void Test_133_08()
+        {
+        }
+
+        [Test]
+        public void Test_133_09()
+        {
+        }
+
+        [Test]
+        public void Test_133_10()
+        {
+        }
+
+        [Test]
+        public void Test_133_11()
+        {
+        }
+
+        [Test]
+        public void Test_133_12()
+        {
+        }
+
+        [Test]
+        public void Test_133_13()
+        {
+        }
+
+        [Test]
+        public void Test_133_14()
+        {
+        }
+
+        [Test]
+        public void Test_133_15()
+        {
+        }
+
+        [Test]
+        public void Test_133_16()
+        {
+        }
+
+        [Test]
+        public void Test_133_17()
+        {
+        }
+
+        [Test]
+        public void Test_133_18()
+        {
+        }
+
+        [Test]
+        public void Test_133_19()
+        {
+        }
+
+        [Test]
+        public void Test_133_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_134
+    {
+        #region PassingTests
+        [Test]
+        public void Test_134_01()
+        {
+        }
+
+        [Test]
+        public void Test_134_02()
+        {
+        }
+
+        [Test]
+        public void Test_134_03()
+        {
+        }
+
+        [Test]
+        public void Test_134_04()
+        {
+        }
+
+        [Test]
+        public void Test_134_05()
+        {
+        }
+
+        [Test]
+        public void Test_134_06()
+        {
+        }
+
+        [Test]
+        public void Test_134_07()
+        {
+        }
+
+        [Test]
+        public void Test_134_08()
+        {
+        }
+
+        [Test]
+        public void Test_134_09()
+        {
+        }
+
+        [Test]
+        public void Test_134_10()
+        {
+        }
+
+        [Test]
+        public void Test_134_11()
+        {
+        }
+
+        [Test]
+        public void Test_134_12()
+        {
+        }
+
+        [Test]
+        public void Test_134_13()
+        {
+        }
+
+        [Test]
+        public void Test_134_14()
+        {
+        }
+
+        [Test]
+        public void Test_134_15()
+        {
+        }
+
+        [Test]
+        public void Test_134_16()
+        {
+        }
+
+        [Test]
+        public void Test_134_17()
+        {
+        }
+
+        [Test]
+        public void Test_134_18()
+        {
+        }
+
+        [Test]
+        public void Test_134_19()
+        {
+        }
+
+        [Test]
+        public void Test_134_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_135
+    {
+        #region PassingTests
+        [Test]
+        public void Test_135_01()
+        {
+        }
+
+        [Test]
+        public void Test_135_02()
+        {
+        }
+
+        [Test]
+        public void Test_135_03()
+        {
+        }
+
+        [Test]
+        public void Test_135_04()
+        {
+        }
+
+        [Test]
+        public void Test_135_05()
+        {
+        }
+
+        [Test]
+        public void Test_135_06()
+        {
+        }
+
+        [Test]
+        public void Test_135_07()
+        {
+        }
+
+        [Test]
+        public void Test_135_08()
+        {
+        }
+
+        [Test]
+        public void Test_135_09()
+        {
+        }
+
+        [Test]
+        public void Test_135_10()
+        {
+        }
+
+        [Test]
+        public void Test_135_11()
+        {
+        }
+
+        [Test]
+        public void Test_135_12()
+        {
+        }
+
+        [Test]
+        public void Test_135_13()
+        {
+        }
+
+        [Test]
+        public void Test_135_14()
+        {
+        }
+
+        [Test]
+        public void Test_135_15()
+        {
+        }
+
+        [Test]
+        public void Test_135_16()
+        {
+        }
+
+        [Test]
+        public void Test_135_17()
+        {
+        }
+
+        [Test]
+        public void Test_135_18()
+        {
+        }
+
+        [Test]
+        public void Test_135_19()
+        {
+        }
+
+        [Test]
+        public void Test_135_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_136
+    {
+        #region PassingTests
+        [Test]
+        public void Test_136_01()
+        {
+        }
+
+        [Test]
+        public void Test_136_02()
+        {
+        }
+
+        [Test]
+        public void Test_136_03()
+        {
+        }
+
+        [Test]
+        public void Test_136_04()
+        {
+        }
+
+        [Test]
+        public void Test_136_05()
+        {
+        }
+
+        [Test]
+        public void Test_136_06()
+        {
+        }
+
+        [Test]
+        public void Test_136_07()
+        {
+        }
+
+        [Test]
+        public void Test_136_08()
+        {
+        }
+
+        [Test]
+        public void Test_136_09()
+        {
+        }
+
+        [Test]
+        public void Test_136_10()
+        {
+        }
+
+        [Test]
+        public void Test_136_11()
+        {
+        }
+
+        [Test]
+        public void Test_136_12()
+        {
+        }
+
+        [Test]
+        public void Test_136_13()
+        {
+        }
+
+        [Test]
+        public void Test_136_14()
+        {
+        }
+
+        [Test]
+        public void Test_136_15()
+        {
+        }
+
+        [Test]
+        public void Test_136_16()
+        {
+        }
+
+        [Test]
+        public void Test_136_17()
+        {
+        }
+
+        [Test]
+        public void Test_136_18()
+        {
+        }
+
+        [Test]
+        public void Test_136_19()
+        {
+        }
+
+        [Test]
+        public void Test_136_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_137
+    {
+        #region PassingTests
+        [Test]
+        public void Test_137_01()
+        {
+        }
+
+        [Test]
+        public void Test_137_02()
+        {
+        }
+
+        [Test]
+        public void Test_137_03()
+        {
+        }
+
+        [Test]
+        public void Test_137_04()
+        {
+        }
+
+        [Test]
+        public void Test_137_05()
+        {
+        }
+
+        [Test]
+        public void Test_137_06()
+        {
+        }
+
+        [Test]
+        public void Test_137_07()
+        {
+        }
+
+        [Test]
+        public void Test_137_08()
+        {
+        }
+
+        [Test]
+        public void Test_137_09()
+        {
+        }
+
+        [Test]
+        public void Test_137_10()
+        {
+        }
+
+        [Test]
+        public void Test_137_11()
+        {
+        }
+
+        [Test]
+        public void Test_137_12()
+        {
+        }
+
+        [Test]
+        public void Test_137_13()
+        {
+        }
+
+        [Test]
+        public void Test_137_14()
+        {
+        }
+
+        [Test]
+        public void Test_137_15()
+        {
+        }
+
+        [Test]
+        public void Test_137_16()
+        {
+        }
+
+        [Test]
+        public void Test_137_17()
+        {
+        }
+
+        [Test]
+        public void Test_137_18()
+        {
+        }
+
+        [Test]
+        public void Test_137_19()
+        {
+        }
+
+        [Test]
+        public void Test_137_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_138
+    {
+        #region PassingTests
+        [Test]
+        public void Test_138_01()
+        {
+        }
+
+        [Test]
+        public void Test_138_02()
+        {
+        }
+
+        [Test]
+        public void Test_138_03()
+        {
+        }
+
+        [Test]
+        public void Test_138_04()
+        {
+        }
+
+        [Test]
+        public void Test_138_05()
+        {
+        }
+
+        [Test]
+        public void Test_138_06()
+        {
+        }
+
+        [Test]
+        public void Test_138_07()
+        {
+        }
+
+        [Test]
+        public void Test_138_08()
+        {
+        }
+
+        [Test]
+        public void Test_138_09()
+        {
+        }
+
+        [Test]
+        public void Test_138_10()
+        {
+        }
+
+        [Test]
+        public void Test_138_11()
+        {
+        }
+
+        [Test]
+        public void Test_138_12()
+        {
+        }
+
+        [Test]
+        public void Test_138_13()
+        {
+        }
+
+        [Test]
+        public void Test_138_14()
+        {
+        }
+
+        [Test]
+        public void Test_138_15()
+        {
+        }
+
+        [Test]
+        public void Test_138_16()
+        {
+        }
+
+        [Test]
+        public void Test_138_17()
+        {
+        }
+
+        [Test]
+        public void Test_138_18()
+        {
+        }
+
+        [Test]
+        public void Test_138_19()
+        {
+        }
+
+        [Test]
+        public void Test_138_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_139
+    {
+        #region PassingTests
+        [Test]
+        public void Test_139_01()
+        {
+        }
+
+        [Test]
+        public void Test_139_02()
+        {
+        }
+
+        [Test]
+        public void Test_139_03()
+        {
+        }
+
+        [Test]
+        public void Test_139_04()
+        {
+        }
+
+        [Test]
+        public void Test_139_05()
+        {
+        }
+
+        [Test]
+        public void Test_139_06()
+        {
+        }
+
+        [Test]
+        public void Test_139_07()
+        {
+        }
+
+        [Test]
+        public void Test_139_08()
+        {
+        }
+
+        [Test]
+        public void Test_139_09()
+        {
+        }
+
+        [Test]
+        public void Test_139_10()
+        {
+        }
+
+        [Test]
+        public void Test_139_11()
+        {
+        }
+
+        [Test]
+        public void Test_139_12()
+        {
+        }
+
+        [Test]
+        public void Test_139_13()
+        {
+        }
+
+        [Test]
+        public void Test_139_14()
+        {
+        }
+
+        [Test]
+        public void Test_139_15()
+        {
+        }
+
+        [Test]
+        public void Test_139_16()
+        {
+        }
+
+        [Test]
+        public void Test_139_17()
+        {
+        }
+
+        [Test]
+        public void Test_139_18()
+        {
+        }
+
+        [Test]
+        public void Test_139_19()
+        {
+        }
+
+        [Test]
+        public void Test_139_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_140
+    {
+        #region PassingTests
+        [Test]
+        public void Test_140_01()
+        {
+        }
+
+        [Test]
+        public void Test_140_02()
+        {
+        }
+
+        [Test]
+        public void Test_140_03()
+        {
+        }
+
+        [Test]
+        public void Test_140_04()
+        {
+        }
+
+        [Test]
+        public void Test_140_05()
+        {
+        }
+
+        [Test]
+        public void Test_140_06()
+        {
+        }
+
+        [Test]
+        public void Test_140_07()
+        {
+        }
+
+        [Test]
+        public void Test_140_08()
+        {
+        }
+
+        [Test]
+        public void Test_140_09()
+        {
+        }
+
+        [Test]
+        public void Test_140_10()
+        {
+        }
+
+        [Test]
+        public void Test_140_11()
+        {
+        }
+
+        [Test]
+        public void Test_140_12()
+        {
+        }
+
+        [Test]
+        public void Test_140_13()
+        {
+        }
+
+        [Test]
+        public void Test_140_14()
+        {
+        }
+
+        [Test]
+        public void Test_140_15()
+        {
+        }
+
+        [Test]
+        public void Test_140_16()
+        {
+        }
+
+        [Test]
+        public void Test_140_17()
+        {
+        }
+
+        [Test]
+        public void Test_140_18()
+        {
+        }
+
+        [Test]
+        public void Test_140_19()
+        {
+        }
+
+        [Test]
+        public void Test_140_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_141
+    {
+        #region PassingTests
+        [Test]
+        public void Test_141_01()
+        {
+        }
+
+        [Test]
+        public void Test_141_02()
+        {
+        }
+
+        [Test]
+        public void Test_141_03()
+        {
+        }
+
+        [Test]
+        public void Test_141_04()
+        {
+        }
+
+        [Test]
+        public void Test_141_05()
+        {
+        }
+
+        [Test]
+        public void Test_141_06()
+        {
+        }
+
+        [Test]
+        public void Test_141_07()
+        {
+        }
+
+        [Test]
+        public void Test_141_08()
+        {
+        }
+
+        [Test]
+        public void Test_141_09()
+        {
+        }
+
+        [Test]
+        public void Test_141_10()
+        {
+        }
+
+        [Test]
+        public void Test_141_11()
+        {
+        }
+
+        [Test]
+        public void Test_141_12()
+        {
+        }
+
+        [Test]
+        public void Test_141_13()
+        {
+        }
+
+        [Test]
+        public void Test_141_14()
+        {
+        }
+
+        [Test]
+        public void Test_141_15()
+        {
+        }
+
+        [Test]
+        public void Test_141_16()
+        {
+        }
+
+        [Test]
+        public void Test_141_17()
+        {
+        }
+
+        [Test]
+        public void Test_141_18()
+        {
+        }
+
+        [Test]
+        public void Test_141_19()
+        {
+        }
+
+        [Test]
+        public void Test_141_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_142
+    {
+        #region PassingTests
+        [Test]
+        public void Test_142_01()
+        {
+        }
+
+        [Test]
+        public void Test_142_02()
+        {
+        }
+
+        [Test]
+        public void Test_142_03()
+        {
+        }
+
+        [Test]
+        public void Test_142_04()
+        {
+        }
+
+        [Test]
+        public void Test_142_05()
+        {
+        }
+
+        [Test]
+        public void Test_142_06()
+        {
+        }
+
+        [Test]
+        public void Test_142_07()
+        {
+        }
+
+        [Test]
+        public void Test_142_08()
+        {
+        }
+
+        [Test]
+        public void Test_142_09()
+        {
+        }
+
+        [Test]
+        public void Test_142_10()
+        {
+        }
+
+        [Test]
+        public void Test_142_11()
+        {
+        }
+
+        [Test]
+        public void Test_142_12()
+        {
+        }
+
+        [Test]
+        public void Test_142_13()
+        {
+        }
+
+        [Test]
+        public void Test_142_14()
+        {
+        }
+
+        [Test]
+        public void Test_142_15()
+        {
+        }
+
+        [Test]
+        public void Test_142_16()
+        {
+        }
+
+        [Test]
+        public void Test_142_17()
+        {
+        }
+
+        [Test]
+        public void Test_142_18()
+        {
+        }
+
+        [Test]
+        public void Test_142_19()
+        {
+        }
+
+        [Test]
+        public void Test_142_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_143
+    {
+        #region PassingTests
+        [Test]
+        public void Test_143_01()
+        {
+        }
+
+        [Test]
+        public void Test_143_02()
+        {
+        }
+
+        [Test]
+        public void Test_143_03()
+        {
+        }
+
+        [Test]
+        public void Test_143_04()
+        {
+        }
+
+        [Test]
+        public void Test_143_05()
+        {
+        }
+
+        [Test]
+        public void Test_143_06()
+        {
+        }
+
+        [Test]
+        public void Test_143_07()
+        {
+        }
+
+        [Test]
+        public void Test_143_08()
+        {
+        }
+
+        [Test]
+        public void Test_143_09()
+        {
+        }
+
+        [Test]
+        public void Test_143_10()
+        {
+        }
+
+        [Test]
+        public void Test_143_11()
+        {
+        }
+
+        [Test]
+        public void Test_143_12()
+        {
+        }
+
+        [Test]
+        public void Test_143_13()
+        {
+        }
+
+        [Test]
+        public void Test_143_14()
+        {
+        }
+
+        [Test]
+        public void Test_143_15()
+        {
+        }
+
+        [Test]
+        public void Test_143_16()
+        {
+        }
+
+        [Test]
+        public void Test_143_17()
+        {
+        }
+
+        [Test]
+        public void Test_143_18()
+        {
+        }
+
+        [Test]
+        public void Test_143_19()
+        {
+        }
+
+        [Test]
+        public void Test_143_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_144
+    {
+        #region PassingTests
+        [Test]
+        public void Test_144_01()
+        {
+        }
+
+        [Test]
+        public void Test_144_02()
+        {
+        }
+
+        [Test]
+        public void Test_144_03()
+        {
+        }
+
+        [Test]
+        public void Test_144_04()
+        {
+        }
+
+        [Test]
+        public void Test_144_05()
+        {
+        }
+
+        [Test]
+        public void Test_144_06()
+        {
+        }
+
+        [Test]
+        public void Test_144_07()
+        {
+        }
+
+        [Test]
+        public void Test_144_08()
+        {
+        }
+
+        [Test]
+        public void Test_144_09()
+        {
+        }
+
+        [Test]
+        public void Test_144_10()
+        {
+        }
+
+        [Test]
+        public void Test_144_11()
+        {
+        }
+
+        [Test]
+        public void Test_144_12()
+        {
+        }
+
+        [Test]
+        public void Test_144_13()
+        {
+        }
+
+        [Test]
+        public void Test_144_14()
+        {
+        }
+
+        [Test]
+        public void Test_144_15()
+        {
+        }
+
+        [Test]
+        public void Test_144_16()
+        {
+        }
+
+        [Test]
+        public void Test_144_17()
+        {
+        }
+
+        [Test]
+        public void Test_144_18()
+        {
+        }
+
+        [Test]
+        public void Test_144_19()
+        {
+        }
+
+        [Test]
+        public void Test_144_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_145
+    {
+        #region PassingTests
+        [Test]
+        public void Test_145_01()
+        {
+        }
+
+        [Test]
+        public void Test_145_02()
+        {
+        }
+
+        [Test]
+        public void Test_145_03()
+        {
+        }
+
+        [Test]
+        public void Test_145_04()
+        {
+        }
+
+        [Test]
+        public void Test_145_05()
+        {
+        }
+
+        [Test]
+        public void Test_145_06()
+        {
+        }
+
+        [Test]
+        public void Test_145_07()
+        {
+        }
+
+        [Test]
+        public void Test_145_08()
+        {
+        }
+
+        [Test]
+        public void Test_145_09()
+        {
+        }
+
+        [Test]
+        public void Test_145_10()
+        {
+        }
+
+        [Test]
+        public void Test_145_11()
+        {
+        }
+
+        [Test]
+        public void Test_145_12()
+        {
+        }
+
+        [Test]
+        public void Test_145_13()
+        {
+        }
+
+        [Test]
+        public void Test_145_14()
+        {
+        }
+
+        [Test]
+        public void Test_145_15()
+        {
+        }
+
+        [Test]
+        public void Test_145_16()
+        {
+        }
+
+        [Test]
+        public void Test_145_17()
+        {
+        }
+
+        [Test]
+        public void Test_145_18()
+        {
+        }
+
+        [Test]
+        public void Test_145_19()
+        {
+        }
+
+        [Test]
+        public void Test_145_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_146
+    {
+        #region PassingTests
+        [Test]
+        public void Test_146_01()
+        {
+        }
+
+        [Test]
+        public void Test_146_02()
+        {
+        }
+
+        [Test]
+        public void Test_146_03()
+        {
+        }
+
+        [Test]
+        public void Test_146_04()
+        {
+        }
+
+        [Test]
+        public void Test_146_05()
+        {
+        }
+
+        [Test]
+        public void Test_146_06()
+        {
+        }
+
+        [Test]
+        public void Test_146_07()
+        {
+        }
+
+        [Test]
+        public void Test_146_08()
+        {
+        }
+
+        [Test]
+        public void Test_146_09()
+        {
+        }
+
+        [Test]
+        public void Test_146_10()
+        {
+        }
+
+        [Test]
+        public void Test_146_11()
+        {
+        }
+
+        [Test]
+        public void Test_146_12()
+        {
+        }
+
+        [Test]
+        public void Test_146_13()
+        {
+        }
+
+        [Test]
+        public void Test_146_14()
+        {
+        }
+
+        [Test]
+        public void Test_146_15()
+        {
+        }
+
+        [Test]
+        public void Test_146_16()
+        {
+        }
+
+        [Test]
+        public void Test_146_17()
+        {
+        }
+
+        [Test]
+        public void Test_146_18()
+        {
+        }
+
+        [Test]
+        public void Test_146_19()
+        {
+        }
+
+        [Test]
+        public void Test_146_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_147
+    {
+        #region PassingTests
+        [Test]
+        public void Test_147_01()
+        {
+        }
+
+        [Test]
+        public void Test_147_02()
+        {
+        }
+
+        [Test]
+        public void Test_147_03()
+        {
+        }
+
+        [Test]
+        public void Test_147_04()
+        {
+        }
+
+        [Test]
+        public void Test_147_05()
+        {
+        }
+
+        [Test]
+        public void Test_147_06()
+        {
+        }
+
+        [Test]
+        public void Test_147_07()
+        {
+        }
+
+        [Test]
+        public void Test_147_08()
+        {
+        }
+
+        [Test]
+        public void Test_147_09()
+        {
+        }
+
+        [Test]
+        public void Test_147_10()
+        {
+        }
+
+        [Test]
+        public void Test_147_11()
+        {
+        }
+
+        [Test]
+        public void Test_147_12()
+        {
+        }
+
+        [Test]
+        public void Test_147_13()
+        {
+        }
+
+        [Test]
+        public void Test_147_14()
+        {
+        }
+
+        [Test]
+        public void Test_147_15()
+        {
+        }
+
+        [Test]
+        public void Test_147_16()
+        {
+        }
+
+        [Test]
+        public void Test_147_17()
+        {
+        }
+
+        [Test]
+        public void Test_147_18()
+        {
+        }
+
+        [Test]
+        public void Test_147_19()
+        {
+        }
+
+        [Test]
+        public void Test_147_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_148
+    {
+        #region PassingTests
+        [Test]
+        public void Test_148_01()
+        {
+        }
+
+        [Test]
+        public void Test_148_02()
+        {
+        }
+
+        [Test]
+        public void Test_148_03()
+        {
+        }
+
+        [Test]
+        public void Test_148_04()
+        {
+        }
+
+        [Test]
+        public void Test_148_05()
+        {
+        }
+
+        [Test]
+        public void Test_148_06()
+        {
+        }
+
+        [Test]
+        public void Test_148_07()
+        {
+        }
+
+        [Test]
+        public void Test_148_08()
+        {
+        }
+
+        [Test]
+        public void Test_148_09()
+        {
+        }
+
+        [Test]
+        public void Test_148_10()
+        {
+        }
+
+        [Test]
+        public void Test_148_11()
+        {
+        }
+
+        [Test]
+        public void Test_148_12()
+        {
+        }
+
+        [Test]
+        public void Test_148_13()
+        {
+        }
+
+        [Test]
+        public void Test_148_14()
+        {
+        }
+
+        [Test]
+        public void Test_148_15()
+        {
+        }
+
+        [Test]
+        public void Test_148_16()
+        {
+        }
+
+        [Test]
+        public void Test_148_17()
+        {
+        }
+
+        [Test]
+        public void Test_148_18()
+        {
+        }
+
+        [Test]
+        public void Test_148_19()
+        {
+        }
+
+        [Test]
+        public void Test_148_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_149
+    {
+        #region PassingTests
+        [Test]
+        public void Test_149_01()
+        {
+        }
+
+        [Test]
+        public void Test_149_02()
+        {
+        }
+
+        [Test]
+        public void Test_149_03()
+        {
+        }
+
+        [Test]
+        public void Test_149_04()
+        {
+        }
+
+        [Test]
+        public void Test_149_05()
+        {
+        }
+
+        [Test]
+        public void Test_149_06()
+        {
+        }
+
+        [Test]
+        public void Test_149_07()
+        {
+        }
+
+        [Test]
+        public void Test_149_08()
+        {
+        }
+
+        [Test]
+        public void Test_149_09()
+        {
+        }
+
+        [Test]
+        public void Test_149_10()
+        {
+        }
+
+        [Test]
+        public void Test_149_11()
+        {
+        }
+
+        [Test]
+        public void Test_149_12()
+        {
+        }
+
+        [Test]
+        public void Test_149_13()
+        {
+        }
+
+        [Test]
+        public void Test_149_14()
+        {
+        }
+
+        [Test]
+        public void Test_149_15()
+        {
+        }
+
+        [Test]
+        public void Test_149_16()
+        {
+        }
+
+        [Test]
+        public void Test_149_17()
+        {
+        }
+
+        [Test]
+        public void Test_149_18()
+        {
+        }
+
+        [Test]
+        public void Test_149_19()
+        {
+        }
+
+        [Test]
+        public void Test_149_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_150
+    {
+        #region PassingTests
+        [Test]
+        public void Test_150_01()
+        {
+        }
+
+        [Test]
+        public void Test_150_02()
+        {
+        }
+
+        [Test]
+        public void Test_150_03()
+        {
+        }
+
+        [Test]
+        public void Test_150_04()
+        {
+        }
+
+        [Test]
+        public void Test_150_05()
+        {
+        }
+
+        [Test]
+        public void Test_150_06()
+        {
+        }
+
+        [Test]
+        public void Test_150_07()
+        {
+        }
+
+        [Test]
+        public void Test_150_08()
+        {
+        }
+
+        [Test]
+        public void Test_150_09()
+        {
+        }
+
+        [Test]
+        public void Test_150_10()
+        {
+        }
+
+        [Test]
+        public void Test_150_11()
+        {
+        }
+
+        [Test]
+        public void Test_150_12()
+        {
+        }
+
+        [Test]
+        public void Test_150_13()
+        {
+        }
+
+        [Test]
+        public void Test_150_14()
+        {
+        }
+
+        [Test]
+        public void Test_150_15()
+        {
+        }
+
+        [Test]
+        public void Test_150_16()
+        {
+        }
+
+        [Test]
+        public void Test_150_17()
+        {
+        }
+
+        [Test]
+        public void Test_150_18()
+        {
+        }
+
+        [Test]
+        public void Test_150_19()
+        {
+        }
+
+        [Test]
+        public void Test_150_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_151
+    {
+        #region PassingTests
+        [Test]
+        public void Test_151_01()
+        {
+        }
+
+        [Test]
+        public void Test_151_02()
+        {
+        }
+
+        [Test]
+        public void Test_151_03()
+        {
+        }
+
+        [Test]
+        public void Test_151_04()
+        {
+        }
+
+        [Test]
+        public void Test_151_05()
+        {
+        }
+
+        [Test]
+        public void Test_151_06()
+        {
+        }
+
+        [Test]
+        public void Test_151_07()
+        {
+        }
+
+        [Test]
+        public void Test_151_08()
+        {
+        }
+
+        [Test]
+        public void Test_151_09()
+        {
+        }
+
+        [Test]
+        public void Test_151_10()
+        {
+        }
+
+        [Test]
+        public void Test_151_11()
+        {
+        }
+
+        [Test]
+        public void Test_151_12()
+        {
+        }
+
+        [Test]
+        public void Test_151_13()
+        {
+        }
+
+        [Test]
+        public void Test_151_14()
+        {
+        }
+
+        [Test]
+        public void Test_151_15()
+        {
+        }
+
+        [Test]
+        public void Test_151_16()
+        {
+        }
+
+        [Test]
+        public void Test_151_17()
+        {
+        }
+
+        [Test]
+        public void Test_151_18()
+        {
+        }
+
+        [Test]
+        public void Test_151_19()
+        {
+        }
+
+        [Test]
+        public void Test_151_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_152
+    {
+        #region PassingTests
+        [Test]
+        public void Test_152_01()
+        {
+        }
+
+        [Test]
+        public void Test_152_02()
+        {
+        }
+
+        [Test]
+        public void Test_152_03()
+        {
+        }
+
+        [Test]
+        public void Test_152_04()
+        {
+        }
+
+        [Test]
+        public void Test_152_05()
+        {
+        }
+
+        [Test]
+        public void Test_152_06()
+        {
+        }
+
+        [Test]
+        public void Test_152_07()
+        {
+        }
+
+        [Test]
+        public void Test_152_08()
+        {
+        }
+
+        [Test]
+        public void Test_152_09()
+        {
+        }
+
+        [Test]
+        public void Test_152_10()
+        {
+        }
+
+        [Test]
+        public void Test_152_11()
+        {
+        }
+
+        [Test]
+        public void Test_152_12()
+        {
+        }
+
+        [Test]
+        public void Test_152_13()
+        {
+        }
+
+        [Test]
+        public void Test_152_14()
+        {
+        }
+
+        [Test]
+        public void Test_152_15()
+        {
+        }
+
+        [Test]
+        public void Test_152_16()
+        {
+        }
+
+        [Test]
+        public void Test_152_17()
+        {
+        }
+
+        [Test]
+        public void Test_152_18()
+        {
+        }
+
+        [Test]
+        public void Test_152_19()
+        {
+        }
+
+        [Test]
+        public void Test_152_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_153
+    {
+        #region PassingTests
+        [Test]
+        public void Test_153_01()
+        {
+        }
+
+        [Test]
+        public void Test_153_02()
+        {
+        }
+
+        [Test]
+        public void Test_153_03()
+        {
+        }
+
+        [Test]
+        public void Test_153_04()
+        {
+        }
+
+        [Test]
+        public void Test_153_05()
+        {
+        }
+
+        [Test]
+        public void Test_153_06()
+        {
+        }
+
+        [Test]
+        public void Test_153_07()
+        {
+        }
+
+        [Test]
+        public void Test_153_08()
+        {
+        }
+
+        [Test]
+        public void Test_153_09()
+        {
+        }
+
+        [Test]
+        public void Test_153_10()
+        {
+        }
+
+        [Test]
+        public void Test_153_11()
+        {
+        }
+
+        [Test]
+        public void Test_153_12()
+        {
+        }
+
+        [Test]
+        public void Test_153_13()
+        {
+        }
+
+        [Test]
+        public void Test_153_14()
+        {
+        }
+
+        [Test]
+        public void Test_153_15()
+        {
+        }
+
+        [Test]
+        public void Test_153_16()
+        {
+        }
+
+        [Test]
+        public void Test_153_17()
+        {
+        }
+
+        [Test]
+        public void Test_153_18()
+        {
+        }
+
+        [Test]
+        public void Test_153_19()
+        {
+        }
+
+        [Test]
+        public void Test_153_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_154
+    {
+        #region PassingTests
+        [Test]
+        public void Test_154_01()
+        {
+        }
+
+        [Test]
+        public void Test_154_02()
+        {
+        }
+
+        [Test]
+        public void Test_154_03()
+        {
+        }
+
+        [Test]
+        public void Test_154_04()
+        {
+        }
+
+        [Test]
+        public void Test_154_05()
+        {
+        }
+
+        [Test]
+        public void Test_154_06()
+        {
+        }
+
+        [Test]
+        public void Test_154_07()
+        {
+        }
+
+        [Test]
+        public void Test_154_08()
+        {
+        }
+
+        [Test]
+        public void Test_154_09()
+        {
+        }
+
+        [Test]
+        public void Test_154_10()
+        {
+        }
+
+        [Test]
+        public void Test_154_11()
+        {
+        }
+
+        [Test]
+        public void Test_154_12()
+        {
+        }
+
+        [Test]
+        public void Test_154_13()
+        {
+        }
+
+        [Test]
+        public void Test_154_14()
+        {
+        }
+
+        [Test]
+        public void Test_154_15()
+        {
+        }
+
+        [Test]
+        public void Test_154_16()
+        {
+        }
+
+        [Test]
+        public void Test_154_17()
+        {
+        }
+
+        [Test]
+        public void Test_154_18()
+        {
+        }
+
+        [Test]
+        public void Test_154_19()
+        {
+        }
+
+        [Test]
+        public void Test_154_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_155
+    {
+        #region PassingTests
+        [Test]
+        public void Test_155_01()
+        {
+        }
+
+        [Test]
+        public void Test_155_02()
+        {
+        }
+
+        [Test]
+        public void Test_155_03()
+        {
+        }
+
+        [Test]
+        public void Test_155_04()
+        {
+        }
+
+        [Test]
+        public void Test_155_05()
+        {
+        }
+
+        [Test]
+        public void Test_155_06()
+        {
+        }
+
+        [Test]
+        public void Test_155_07()
+        {
+        }
+
+        [Test]
+        public void Test_155_08()
+        {
+        }
+
+        [Test]
+        public void Test_155_09()
+        {
+        }
+
+        [Test]
+        public void Test_155_10()
+        {
+        }
+
+        [Test]
+        public void Test_155_11()
+        {
+        }
+
+        [Test]
+        public void Test_155_12()
+        {
+        }
+
+        [Test]
+        public void Test_155_13()
+        {
+        }
+
+        [Test]
+        public void Test_155_14()
+        {
+        }
+
+        [Test]
+        public void Test_155_15()
+        {
+        }
+
+        [Test]
+        public void Test_155_16()
+        {
+        }
+
+        [Test]
+        public void Test_155_17()
+        {
+        }
+
+        [Test]
+        public void Test_155_18()
+        {
+        }
+
+        [Test]
+        public void Test_155_19()
+        {
+        }
+
+        [Test]
+        public void Test_155_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_156
+    {
+        #region PassingTests
+        [Test]
+        public void Test_156_01()
+        {
+        }
+
+        [Test]
+        public void Test_156_02()
+        {
+        }
+
+        [Test]
+        public void Test_156_03()
+        {
+        }
+
+        [Test]
+        public void Test_156_04()
+        {
+        }
+
+        [Test]
+        public void Test_156_05()
+        {
+        }
+
+        [Test]
+        public void Test_156_06()
+        {
+        }
+
+        [Test]
+        public void Test_156_07()
+        {
+        }
+
+        [Test]
+        public void Test_156_08()
+        {
+        }
+
+        [Test]
+        public void Test_156_09()
+        {
+        }
+
+        [Test]
+        public void Test_156_10()
+        {
+        }
+
+        [Test]
+        public void Test_156_11()
+        {
+        }
+
+        [Test]
+        public void Test_156_12()
+        {
+        }
+
+        [Test]
+        public void Test_156_13()
+        {
+        }
+
+        [Test]
+        public void Test_156_14()
+        {
+        }
+
+        [Test]
+        public void Test_156_15()
+        {
+        }
+
+        [Test]
+        public void Test_156_16()
+        {
+        }
+
+        [Test]
+        public void Test_156_17()
+        {
+        }
+
+        [Test]
+        public void Test_156_18()
+        {
+        }
+
+        [Test]
+        public void Test_156_19()
+        {
+        }
+
+        [Test]
+        public void Test_156_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_157
+    {
+        #region PassingTests
+        [Test]
+        public void Test_157_01()
+        {
+        }
+
+        [Test]
+        public void Test_157_02()
+        {
+        }
+
+        [Test]
+        public void Test_157_03()
+        {
+        }
+
+        [Test]
+        public void Test_157_04()
+        {
+        }
+
+        [Test]
+        public void Test_157_05()
+        {
+        }
+
+        [Test]
+        public void Test_157_06()
+        {
+        }
+
+        [Test]
+        public void Test_157_07()
+        {
+        }
+
+        [Test]
+        public void Test_157_08()
+        {
+        }
+
+        [Test]
+        public void Test_157_09()
+        {
+        }
+
+        [Test]
+        public void Test_157_10()
+        {
+        }
+
+        [Test]
+        public void Test_157_11()
+        {
+        }
+
+        [Test]
+        public void Test_157_12()
+        {
+        }
+
+        [Test]
+        public void Test_157_13()
+        {
+        }
+
+        [Test]
+        public void Test_157_14()
+        {
+        }
+
+        [Test]
+        public void Test_157_15()
+        {
+        }
+
+        [Test]
+        public void Test_157_16()
+        {
+        }
+
+        [Test]
+        public void Test_157_17()
+        {
+        }
+
+        [Test]
+        public void Test_157_18()
+        {
+        }
+
+        [Test]
+        public void Test_157_19()
+        {
+        }
+
+        [Test]
+        public void Test_157_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_158
+    {
+        #region PassingTests
+        [Test]
+        public void Test_158_01()
+        {
+        }
+
+        [Test]
+        public void Test_158_02()
+        {
+        }
+
+        [Test]
+        public void Test_158_03()
+        {
+        }
+
+        [Test]
+        public void Test_158_04()
+        {
+        }
+
+        [Test]
+        public void Test_158_05()
+        {
+        }
+
+        [Test]
+        public void Test_158_06()
+        {
+        }
+
+        [Test]
+        public void Test_158_07()
+        {
+        }
+
+        [Test]
+        public void Test_158_08()
+        {
+        }
+
+        [Test]
+        public void Test_158_09()
+        {
+        }
+
+        [Test]
+        public void Test_158_10()
+        {
+        }
+
+        [Test]
+        public void Test_158_11()
+        {
+        }
+
+        [Test]
+        public void Test_158_12()
+        {
+        }
+
+        [Test]
+        public void Test_158_13()
+        {
+        }
+
+        [Test]
+        public void Test_158_14()
+        {
+        }
+
+        [Test]
+        public void Test_158_15()
+        {
+        }
+
+        [Test]
+        public void Test_158_16()
+        {
+        }
+
+        [Test]
+        public void Test_158_17()
+        {
+        }
+
+        [Test]
+        public void Test_158_18()
+        {
+        }
+
+        [Test]
+        public void Test_158_19()
+        {
+        }
+
+        [Test]
+        public void Test_158_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_159
+    {
+        #region PassingTests
+        [Test]
+        public void Test_159_01()
+        {
+        }
+
+        [Test]
+        public void Test_159_02()
+        {
+        }
+
+        [Test]
+        public void Test_159_03()
+        {
+        }
+
+        [Test]
+        public void Test_159_04()
+        {
+        }
+
+        [Test]
+        public void Test_159_05()
+        {
+        }
+
+        [Test]
+        public void Test_159_06()
+        {
+        }
+
+        [Test]
+        public void Test_159_07()
+        {
+        }
+
+        [Test]
+        public void Test_159_08()
+        {
+        }
+
+        [Test]
+        public void Test_159_09()
+        {
+        }
+
+        [Test]
+        public void Test_159_10()
+        {
+        }
+
+        [Test]
+        public void Test_159_11()
+        {
+        }
+
+        [Test]
+        public void Test_159_12()
+        {
+        }
+
+        [Test]
+        public void Test_159_13()
+        {
+        }
+
+        [Test]
+        public void Test_159_14()
+        {
+        }
+
+        [Test]
+        public void Test_159_15()
+        {
+        }
+
+        [Test]
+        public void Test_159_16()
+        {
+        }
+
+        [Test]
+        public void Test_159_17()
+        {
+        }
+
+        [Test]
+        public void Test_159_18()
+        {
+        }
+
+        [Test]
+        public void Test_159_19()
+        {
+        }
+
+        [Test]
+        public void Test_159_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_160
+    {
+        #region PassingTests
+        [Test]
+        public void Test_160_01()
+        {
+        }
+
+        [Test]
+        public void Test_160_02()
+        {
+        }
+
+        [Test]
+        public void Test_160_03()
+        {
+        }
+
+        [Test]
+        public void Test_160_04()
+        {
+        }
+
+        [Test]
+        public void Test_160_05()
+        {
+        }
+
+        [Test]
+        public void Test_160_06()
+        {
+        }
+
+        [Test]
+        public void Test_160_07()
+        {
+        }
+
+        [Test]
+        public void Test_160_08()
+        {
+        }
+
+        [Test]
+        public void Test_160_09()
+        {
+        }
+
+        [Test]
+        public void Test_160_10()
+        {
+        }
+
+        [Test]
+        public void Test_160_11()
+        {
+        }
+
+        [Test]
+        public void Test_160_12()
+        {
+        }
+
+        [Test]
+        public void Test_160_13()
+        {
+        }
+
+        [Test]
+        public void Test_160_14()
+        {
+        }
+
+        [Test]
+        public void Test_160_15()
+        {
+        }
+
+        [Test]
+        public void Test_160_16()
+        {
+        }
+
+        [Test]
+        public void Test_160_17()
+        {
+        }
+
+        [Test]
+        public void Test_160_18()
+        {
+        }
+
+        [Test]
+        public void Test_160_19()
+        {
+        }
+
+        [Test]
+        public void Test_160_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_161
+    {
+        #region PassingTests
+        [Test]
+        public void Test_161_01()
+        {
+        }
+
+        [Test]
+        public void Test_161_02()
+        {
+        }
+
+        [Test]
+        public void Test_161_03()
+        {
+        }
+
+        [Test]
+        public void Test_161_04()
+        {
+        }
+
+        [Test]
+        public void Test_161_05()
+        {
+        }
+
+        [Test]
+        public void Test_161_06()
+        {
+        }
+
+        [Test]
+        public void Test_161_07()
+        {
+        }
+
+        [Test]
+        public void Test_161_08()
+        {
+        }
+
+        [Test]
+        public void Test_161_09()
+        {
+        }
+
+        [Test]
+        public void Test_161_10()
+        {
+        }
+
+        [Test]
+        public void Test_161_11()
+        {
+        }
+
+        [Test]
+        public void Test_161_12()
+        {
+        }
+
+        [Test]
+        public void Test_161_13()
+        {
+        }
+
+        [Test]
+        public void Test_161_14()
+        {
+        }
+
+        [Test]
+        public void Test_161_15()
+        {
+        }
+
+        [Test]
+        public void Test_161_16()
+        {
+        }
+
+        [Test]
+        public void Test_161_17()
+        {
+        }
+
+        [Test]
+        public void Test_161_18()
+        {
+        }
+
+        [Test]
+        public void Test_161_19()
+        {
+        }
+
+        [Test]
+        public void Test_161_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_162
+    {
+        #region PassingTests
+        [Test]
+        public void Test_162_01()
+        {
+        }
+
+        [Test]
+        public void Test_162_02()
+        {
+        }
+
+        [Test]
+        public void Test_162_03()
+        {
+        }
+
+        [Test]
+        public void Test_162_04()
+        {
+        }
+
+        [Test]
+        public void Test_162_05()
+        {
+        }
+
+        [Test]
+        public void Test_162_06()
+        {
+        }
+
+        [Test]
+        public void Test_162_07()
+        {
+        }
+
+        [Test]
+        public void Test_162_08()
+        {
+        }
+
+        [Test]
+        public void Test_162_09()
+        {
+        }
+
+        [Test]
+        public void Test_162_10()
+        {
+        }
+
+        [Test]
+        public void Test_162_11()
+        {
+        }
+
+        [Test]
+        public void Test_162_12()
+        {
+        }
+
+        [Test]
+        public void Test_162_13()
+        {
+        }
+
+        [Test]
+        public void Test_162_14()
+        {
+        }
+
+        [Test]
+        public void Test_162_15()
+        {
+        }
+
+        [Test]
+        public void Test_162_16()
+        {
+        }
+
+        [Test]
+        public void Test_162_17()
+        {
+        }
+
+        [Test]
+        public void Test_162_18()
+        {
+        }
+
+        [Test]
+        public void Test_162_19()
+        {
+        }
+
+        [Test]
+        public void Test_162_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_163
+    {
+        #region PassingTests
+        [Test]
+        public void Test_163_01()
+        {
+        }
+
+        [Test]
+        public void Test_163_02()
+        {
+        }
+
+        [Test]
+        public void Test_163_03()
+        {
+        }
+
+        [Test]
+        public void Test_163_04()
+        {
+        }
+
+        [Test]
+        public void Test_163_05()
+        {
+        }
+
+        [Test]
+        public void Test_163_06()
+        {
+        }
+
+        [Test]
+        public void Test_163_07()
+        {
+        }
+
+        [Test]
+        public void Test_163_08()
+        {
+        }
+
+        [Test]
+        public void Test_163_09()
+        {
+        }
+
+        [Test]
+        public void Test_163_10()
+        {
+        }
+
+        [Test]
+        public void Test_163_11()
+        {
+        }
+
+        [Test]
+        public void Test_163_12()
+        {
+        }
+
+        [Test]
+        public void Test_163_13()
+        {
+        }
+
+        [Test]
+        public void Test_163_14()
+        {
+        }
+
+        [Test]
+        public void Test_163_15()
+        {
+        }
+
+        [Test]
+        public void Test_163_16()
+        {
+        }
+
+        [Test]
+        public void Test_163_17()
+        {
+        }
+
+        [Test]
+        public void Test_163_18()
+        {
+        }
+
+        [Test]
+        public void Test_163_19()
+        {
+        }
+
+        [Test]
+        public void Test_163_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_164
+    {
+        #region PassingTests
+        [Test]
+        public void Test_164_01()
+        {
+        }
+
+        [Test]
+        public void Test_164_02()
+        {
+        }
+
+        [Test]
+        public void Test_164_03()
+        {
+        }
+
+        [Test]
+        public void Test_164_04()
+        {
+        }
+
+        [Test]
+        public void Test_164_05()
+        {
+        }
+
+        [Test]
+        public void Test_164_06()
+        {
+        }
+
+        [Test]
+        public void Test_164_07()
+        {
+        }
+
+        [Test]
+        public void Test_164_08()
+        {
+        }
+
+        [Test]
+        public void Test_164_09()
+        {
+        }
+
+        [Test]
+        public void Test_164_10()
+        {
+        }
+
+        [Test]
+        public void Test_164_11()
+        {
+        }
+
+        [Test]
+        public void Test_164_12()
+        {
+        }
+
+        [Test]
+        public void Test_164_13()
+        {
+        }
+
+        [Test]
+        public void Test_164_14()
+        {
+        }
+
+        [Test]
+        public void Test_164_15()
+        {
+        }
+
+        [Test]
+        public void Test_164_16()
+        {
+        }
+
+        [Test]
+        public void Test_164_17()
+        {
+        }
+
+        [Test]
+        public void Test_164_18()
+        {
+        }
+
+        [Test]
+        public void Test_164_19()
+        {
+        }
+
+        [Test]
+        public void Test_164_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_165
+    {
+        #region PassingTests
+        [Test]
+        public void Test_165_01()
+        {
+        }
+
+        [Test]
+        public void Test_165_02()
+        {
+        }
+
+        [Test]
+        public void Test_165_03()
+        {
+        }
+
+        [Test]
+        public void Test_165_04()
+        {
+        }
+
+        [Test]
+        public void Test_165_05()
+        {
+        }
+
+        [Test]
+        public void Test_165_06()
+        {
+        }
+
+        [Test]
+        public void Test_165_07()
+        {
+        }
+
+        [Test]
+        public void Test_165_08()
+        {
+        }
+
+        [Test]
+        public void Test_165_09()
+        {
+        }
+
+        [Test]
+        public void Test_165_10()
+        {
+        }
+
+        [Test]
+        public void Test_165_11()
+        {
+        }
+
+        [Test]
+        public void Test_165_12()
+        {
+        }
+
+        [Test]
+        public void Test_165_13()
+        {
+        }
+
+        [Test]
+        public void Test_165_14()
+        {
+        }
+
+        [Test]
+        public void Test_165_15()
+        {
+        }
+
+        [Test]
+        public void Test_165_16()
+        {
+        }
+
+        [Test]
+        public void Test_165_17()
+        {
+        }
+
+        [Test]
+        public void Test_165_18()
+        {
+        }
+
+        [Test]
+        public void Test_165_19()
+        {
+        }
+
+        [Test]
+        public void Test_165_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_166
+    {
+        #region PassingTests
+        [Test]
+        public void Test_166_01()
+        {
+        }
+
+        [Test]
+        public void Test_166_02()
+        {
+        }
+
+        [Test]
+        public void Test_166_03()
+        {
+        }
+
+        [Test]
+        public void Test_166_04()
+        {
+        }
+
+        [Test]
+        public void Test_166_05()
+        {
+        }
+
+        [Test]
+        public void Test_166_06()
+        {
+        }
+
+        [Test]
+        public void Test_166_07()
+        {
+        }
+
+        [Test]
+        public void Test_166_08()
+        {
+        }
+
+        [Test]
+        public void Test_166_09()
+        {
+        }
+
+        [Test]
+        public void Test_166_10()
+        {
+        }
+
+        [Test]
+        public void Test_166_11()
+        {
+        }
+
+        [Test]
+        public void Test_166_12()
+        {
+        }
+
+        [Test]
+        public void Test_166_13()
+        {
+        }
+
+        [Test]
+        public void Test_166_14()
+        {
+        }
+
+        [Test]
+        public void Test_166_15()
+        {
+        }
+
+        [Test]
+        public void Test_166_16()
+        {
+        }
+
+        [Test]
+        public void Test_166_17()
+        {
+        }
+
+        [Test]
+        public void Test_166_18()
+        {
+        }
+
+        [Test]
+        public void Test_166_19()
+        {
+        }
+
+        [Test]
+        public void Test_166_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_167
+    {
+        #region PassingTests
+        [Test]
+        public void Test_167_01()
+        {
+        }
+
+        [Test]
+        public void Test_167_02()
+        {
+        }
+
+        [Test]
+        public void Test_167_03()
+        {
+        }
+
+        [Test]
+        public void Test_167_04()
+        {
+        }
+
+        [Test]
+        public void Test_167_05()
+        {
+        }
+
+        [Test]
+        public void Test_167_06()
+        {
+        }
+
+        [Test]
+        public void Test_167_07()
+        {
+        }
+
+        [Test]
+        public void Test_167_08()
+        {
+        }
+
+        [Test]
+        public void Test_167_09()
+        {
+        }
+
+        [Test]
+        public void Test_167_10()
+        {
+        }
+
+        [Test]
+        public void Test_167_11()
+        {
+        }
+
+        [Test]
+        public void Test_167_12()
+        {
+        }
+
+        [Test]
+        public void Test_167_13()
+        {
+        }
+
+        [Test]
+        public void Test_167_14()
+        {
+        }
+
+        [Test]
+        public void Test_167_15()
+        {
+        }
+
+        [Test]
+        public void Test_167_16()
+        {
+        }
+
+        [Test]
+        public void Test_167_17()
+        {
+        }
+
+        [Test]
+        public void Test_167_18()
+        {
+        }
+
+        [Test]
+        public void Test_167_19()
+        {
+        }
+
+        [Test]
+        public void Test_167_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_168
+    {
+        #region PassingTests
+        [Test]
+        public void Test_168_01()
+        {
+        }
+
+        [Test]
+        public void Test_168_02()
+        {
+        }
+
+        [Test]
+        public void Test_168_03()
+        {
+        }
+
+        [Test]
+        public void Test_168_04()
+        {
+        }
+
+        [Test]
+        public void Test_168_05()
+        {
+        }
+
+        [Test]
+        public void Test_168_06()
+        {
+        }
+
+        [Test]
+        public void Test_168_07()
+        {
+        }
+
+        [Test]
+        public void Test_168_08()
+        {
+        }
+
+        [Test]
+        public void Test_168_09()
+        {
+        }
+
+        [Test]
+        public void Test_168_10()
+        {
+        }
+
+        [Test]
+        public void Test_168_11()
+        {
+        }
+
+        [Test]
+        public void Test_168_12()
+        {
+        }
+
+        [Test]
+        public void Test_168_13()
+        {
+        }
+
+        [Test]
+        public void Test_168_14()
+        {
+        }
+
+        [Test]
+        public void Test_168_15()
+        {
+        }
+
+        [Test]
+        public void Test_168_16()
+        {
+        }
+
+        [Test]
+        public void Test_168_17()
+        {
+        }
+
+        [Test]
+        public void Test_168_18()
+        {
+        }
+
+        [Test]
+        public void Test_168_19()
+        {
+        }
+
+        [Test]
+        public void Test_168_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_169
+    {
+        #region PassingTests
+        [Test]
+        public void Test_169_01()
+        {
+        }
+
+        [Test]
+        public void Test_169_02()
+        {
+        }
+
+        [Test]
+        public void Test_169_03()
+        {
+        }
+
+        [Test]
+        public void Test_169_04()
+        {
+        }
+
+        [Test]
+        public void Test_169_05()
+        {
+        }
+
+        [Test]
+        public void Test_169_06()
+        {
+        }
+
+        [Test]
+        public void Test_169_07()
+        {
+        }
+
+        [Test]
+        public void Test_169_08()
+        {
+        }
+
+        [Test]
+        public void Test_169_09()
+        {
+        }
+
+        [Test]
+        public void Test_169_10()
+        {
+        }
+
+        [Test]
+        public void Test_169_11()
+        {
+        }
+
+        [Test]
+        public void Test_169_12()
+        {
+        }
+
+        [Test]
+        public void Test_169_13()
+        {
+        }
+
+        [Test]
+        public void Test_169_14()
+        {
+        }
+
+        [Test]
+        public void Test_169_15()
+        {
+        }
+
+        [Test]
+        public void Test_169_16()
+        {
+        }
+
+        [Test]
+        public void Test_169_17()
+        {
+        }
+
+        [Test]
+        public void Test_169_18()
+        {
+        }
+
+        [Test]
+        public void Test_169_19()
+        {
+        }
+
+        [Test]
+        public void Test_169_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_170
+    {
+        #region PassingTests
+        [Test]
+        public void Test_170_01()
+        {
+        }
+
+        [Test]
+        public void Test_170_02()
+        {
+        }
+
+        [Test]
+        public void Test_170_03()
+        {
+        }
+
+        [Test]
+        public void Test_170_04()
+        {
+        }
+
+        [Test]
+        public void Test_170_05()
+        {
+        }
+
+        [Test]
+        public void Test_170_06()
+        {
+        }
+
+        [Test]
+        public void Test_170_07()
+        {
+        }
+
+        [Test]
+        public void Test_170_08()
+        {
+        }
+
+        [Test]
+        public void Test_170_09()
+        {
+        }
+
+        [Test]
+        public void Test_170_10()
+        {
+        }
+
+        [Test]
+        public void Test_170_11()
+        {
+        }
+
+        [Test]
+        public void Test_170_12()
+        {
+        }
+
+        [Test]
+        public void Test_170_13()
+        {
+        }
+
+        [Test]
+        public void Test_170_14()
+        {
+        }
+
+        [Test]
+        public void Test_170_15()
+        {
+        }
+
+        [Test]
+        public void Test_170_16()
+        {
+        }
+
+        [Test]
+        public void Test_170_17()
+        {
+        }
+
+        [Test]
+        public void Test_170_18()
+        {
+        }
+
+        [Test]
+        public void Test_170_19()
+        {
+        }
+
+        [Test]
+        public void Test_170_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_171
+    {
+        #region PassingTests
+        [Test]
+        public void Test_171_01()
+        {
+        }
+
+        [Test]
+        public void Test_171_02()
+        {
+        }
+
+        [Test]
+        public void Test_171_03()
+        {
+        }
+
+        [Test]
+        public void Test_171_04()
+        {
+        }
+
+        [Test]
+        public void Test_171_05()
+        {
+        }
+
+        [Test]
+        public void Test_171_06()
+        {
+        }
+
+        [Test]
+        public void Test_171_07()
+        {
+        }
+
+        [Test]
+        public void Test_171_08()
+        {
+        }
+
+        [Test]
+        public void Test_171_09()
+        {
+        }
+
+        [Test]
+        public void Test_171_10()
+        {
+        }
+
+        [Test]
+        public void Test_171_11()
+        {
+        }
+
+        [Test]
+        public void Test_171_12()
+        {
+        }
+
+        [Test]
+        public void Test_171_13()
+        {
+        }
+
+        [Test]
+        public void Test_171_14()
+        {
+        }
+
+        [Test]
+        public void Test_171_15()
+        {
+        }
+
+        [Test]
+        public void Test_171_16()
+        {
+        }
+
+        [Test]
+        public void Test_171_17()
+        {
+        }
+
+        [Test]
+        public void Test_171_18()
+        {
+        }
+
+        [Test]
+        public void Test_171_19()
+        {
+        }
+
+        [Test]
+        public void Test_171_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_172
+    {
+        #region PassingTests
+        [Test]
+        public void Test_172_01()
+        {
+        }
+
+        [Test]
+        public void Test_172_02()
+        {
+        }
+
+        [Test]
+        public void Test_172_03()
+        {
+        }
+
+        [Test]
+        public void Test_172_04()
+        {
+        }
+
+        [Test]
+        public void Test_172_05()
+        {
+        }
+
+        [Test]
+        public void Test_172_06()
+        {
+        }
+
+        [Test]
+        public void Test_172_07()
+        {
+        }
+
+        [Test]
+        public void Test_172_08()
+        {
+        }
+
+        [Test]
+        public void Test_172_09()
+        {
+        }
+
+        [Test]
+        public void Test_172_10()
+        {
+        }
+
+        [Test]
+        public void Test_172_11()
+        {
+        }
+
+        [Test]
+        public void Test_172_12()
+        {
+        }
+
+        [Test]
+        public void Test_172_13()
+        {
+        }
+
+        [Test]
+        public void Test_172_14()
+        {
+        }
+
+        [Test]
+        public void Test_172_15()
+        {
+        }
+
+        [Test]
+        public void Test_172_16()
+        {
+        }
+
+        [Test]
+        public void Test_172_17()
+        {
+        }
+
+        [Test]
+        public void Test_172_18()
+        {
+        }
+
+        [Test]
+        public void Test_172_19()
+        {
+        }
+
+        [Test]
+        public void Test_172_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_173
+    {
+        #region PassingTests
+        [Test]
+        public void Test_173_01()
+        {
+        }
+
+        [Test]
+        public void Test_173_02()
+        {
+        }
+
+        [Test]
+        public void Test_173_03()
+        {
+        }
+
+        [Test]
+        public void Test_173_04()
+        {
+        }
+
+        [Test]
+        public void Test_173_05()
+        {
+        }
+
+        [Test]
+        public void Test_173_06()
+        {
+        }
+
+        [Test]
+        public void Test_173_07()
+        {
+        }
+
+        [Test]
+        public void Test_173_08()
+        {
+        }
+
+        [Test]
+        public void Test_173_09()
+        {
+        }
+
+        [Test]
+        public void Test_173_10()
+        {
+        }
+
+        [Test]
+        public void Test_173_11()
+        {
+        }
+
+        [Test]
+        public void Test_173_12()
+        {
+        }
+
+        [Test]
+        public void Test_173_13()
+        {
+        }
+
+        [Test]
+        public void Test_173_14()
+        {
+        }
+
+        [Test]
+        public void Test_173_15()
+        {
+        }
+
+        [Test]
+        public void Test_173_16()
+        {
+        }
+
+        [Test]
+        public void Test_173_17()
+        {
+        }
+
+        [Test]
+        public void Test_173_18()
+        {
+        }
+
+        [Test]
+        public void Test_173_19()
+        {
+        }
+
+        [Test]
+        public void Test_173_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_174
+    {
+        #region PassingTests
+        [Test]
+        public void Test_174_01()
+        {
+        }
+
+        [Test]
+        public void Test_174_02()
+        {
+        }
+
+        [Test]
+        public void Test_174_03()
+        {
+        }
+
+        [Test]
+        public void Test_174_04()
+        {
+        }
+
+        [Test]
+        public void Test_174_05()
+        {
+        }
+
+        [Test]
+        public void Test_174_06()
+        {
+        }
+
+        [Test]
+        public void Test_174_07()
+        {
+        }
+
+        [Test]
+        public void Test_174_08()
+        {
+        }
+
+        [Test]
+        public void Test_174_09()
+        {
+        }
+
+        [Test]
+        public void Test_174_10()
+        {
+        }
+
+        [Test]
+        public void Test_174_11()
+        {
+        }
+
+        [Test]
+        public void Test_174_12()
+        {
+        }
+
+        [Test]
+        public void Test_174_13()
+        {
+        }
+
+        [Test]
+        public void Test_174_14()
+        {
+        }
+
+        [Test]
+        public void Test_174_15()
+        {
+        }
+
+        [Test]
+        public void Test_174_16()
+        {
+        }
+
+        [Test]
+        public void Test_174_17()
+        {
+        }
+
+        [Test]
+        public void Test_174_18()
+        {
+        }
+
+        [Test]
+        public void Test_174_19()
+        {
+        }
+
+        [Test]
+        public void Test_174_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_175
+    {
+        #region PassingTests
+        [Test]
+        public void Test_175_01()
+        {
+        }
+
+        [Test]
+        public void Test_175_02()
+        {
+        }
+
+        [Test]
+        public void Test_175_03()
+        {
+        }
+
+        [Test]
+        public void Test_175_04()
+        {
+        }
+
+        [Test]
+        public void Test_175_05()
+        {
+        }
+
+        [Test]
+        public void Test_175_06()
+        {
+        }
+
+        [Test]
+        public void Test_175_07()
+        {
+        }
+
+        [Test]
+        public void Test_175_08()
+        {
+        }
+
+        [Test]
+        public void Test_175_09()
+        {
+        }
+
+        [Test]
+        public void Test_175_10()
+        {
+        }
+
+        [Test]
+        public void Test_175_11()
+        {
+        }
+
+        [Test]
+        public void Test_175_12()
+        {
+        }
+
+        [Test]
+        public void Test_175_13()
+        {
+        }
+
+        [Test]
+        public void Test_175_14()
+        {
+        }
+
+        [Test]
+        public void Test_175_15()
+        {
+        }
+
+        [Test]
+        public void Test_175_16()
+        {
+        }
+
+        [Test]
+        public void Test_175_17()
+        {
+        }
+
+        [Test]
+        public void Test_175_18()
+        {
+        }
+
+        [Test]
+        public void Test_175_19()
+        {
+        }
+
+        [Test]
+        public void Test_175_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_176
+    {
+        #region PassingTests
+        [Test]
+        public void Test_176_01()
+        {
+        }
+
+        [Test]
+        public void Test_176_02()
+        {
+        }
+
+        [Test]
+        public void Test_176_03()
+        {
+        }
+
+        [Test]
+        public void Test_176_04()
+        {
+        }
+
+        [Test]
+        public void Test_176_05()
+        {
+        }
+
+        [Test]
+        public void Test_176_06()
+        {
+        }
+
+        [Test]
+        public void Test_176_07()
+        {
+        }
+
+        [Test]
+        public void Test_176_08()
+        {
+        }
+
+        [Test]
+        public void Test_176_09()
+        {
+        }
+
+        [Test]
+        public void Test_176_10()
+        {
+        }
+
+        [Test]
+        public void Test_176_11()
+        {
+        }
+
+        [Test]
+        public void Test_176_12()
+        {
+        }
+
+        [Test]
+        public void Test_176_13()
+        {
+        }
+
+        [Test]
+        public void Test_176_14()
+        {
+        }
+
+        [Test]
+        public void Test_176_15()
+        {
+        }
+
+        [Test]
+        public void Test_176_16()
+        {
+        }
+
+        [Test]
+        public void Test_176_17()
+        {
+        }
+
+        [Test]
+        public void Test_176_18()
+        {
+        }
+
+        [Test]
+        public void Test_176_19()
+        {
+        }
+
+        [Test]
+        public void Test_176_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_177
+    {
+        #region PassingTests
+        [Test]
+        public void Test_177_01()
+        {
+        }
+
+        [Test]
+        public void Test_177_02()
+        {
+        }
+
+        [Test]
+        public void Test_177_03()
+        {
+        }
+
+        [Test]
+        public void Test_177_04()
+        {
+        }
+
+        [Test]
+        public void Test_177_05()
+        {
+        }
+
+        [Test]
+        public void Test_177_06()
+        {
+        }
+
+        [Test]
+        public void Test_177_07()
+        {
+        }
+
+        [Test]
+        public void Test_177_08()
+        {
+        }
+
+        [Test]
+        public void Test_177_09()
+        {
+        }
+
+        [Test]
+        public void Test_177_10()
+        {
+        }
+
+        [Test]
+        public void Test_177_11()
+        {
+        }
+
+        [Test]
+        public void Test_177_12()
+        {
+        }
+
+        [Test]
+        public void Test_177_13()
+        {
+        }
+
+        [Test]
+        public void Test_177_14()
+        {
+        }
+
+        [Test]
+        public void Test_177_15()
+        {
+        }
+
+        [Test]
+        public void Test_177_16()
+        {
+        }
+
+        [Test]
+        public void Test_177_17()
+        {
+        }
+
+        [Test]
+        public void Test_177_18()
+        {
+        }
+
+        [Test]
+        public void Test_177_19()
+        {
+        }
+
+        [Test]
+        public void Test_177_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_178
+    {
+        #region PassingTests
+        [Test]
+        public void Test_178_01()
+        {
+        }
+
+        [Test]
+        public void Test_178_02()
+        {
+        }
+
+        [Test]
+        public void Test_178_03()
+        {
+        }
+
+        [Test]
+        public void Test_178_04()
+        {
+        }
+
+        [Test]
+        public void Test_178_05()
+        {
+        }
+
+        [Test]
+        public void Test_178_06()
+        {
+        }
+
+        [Test]
+        public void Test_178_07()
+        {
+        }
+
+        [Test]
+        public void Test_178_08()
+        {
+        }
+
+        [Test]
+        public void Test_178_09()
+        {
+        }
+
+        [Test]
+        public void Test_178_10()
+        {
+        }
+
+        [Test]
+        public void Test_178_11()
+        {
+        }
+
+        [Test]
+        public void Test_178_12()
+        {
+        }
+
+        [Test]
+        public void Test_178_13()
+        {
+        }
+
+        [Test]
+        public void Test_178_14()
+        {
+        }
+
+        [Test]
+        public void Test_178_15()
+        {
+        }
+
+        [Test]
+        public void Test_178_16()
+        {
+        }
+
+        [Test]
+        public void Test_178_17()
+        {
+        }
+
+        [Test]
+        public void Test_178_18()
+        {
+        }
+
+        [Test]
+        public void Test_178_19()
+        {
+        }
+
+        [Test]
+        public void Test_178_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_179
+    {
+        #region PassingTests
+        [Test]
+        public void Test_179_01()
+        {
+        }
+
+        [Test]
+        public void Test_179_02()
+        {
+        }
+
+        [Test]
+        public void Test_179_03()
+        {
+        }
+
+        [Test]
+        public void Test_179_04()
+        {
+        }
+
+        [Test]
+        public void Test_179_05()
+        {
+        }
+
+        [Test]
+        public void Test_179_06()
+        {
+        }
+
+        [Test]
+        public void Test_179_07()
+        {
+        }
+
+        [Test]
+        public void Test_179_08()
+        {
+        }
+
+        [Test]
+        public void Test_179_09()
+        {
+        }
+
+        [Test]
+        public void Test_179_10()
+        {
+        }
+
+        [Test]
+        public void Test_179_11()
+        {
+        }
+
+        [Test]
+        public void Test_179_12()
+        {
+        }
+
+        [Test]
+        public void Test_179_13()
+        {
+        }
+
+        [Test]
+        public void Test_179_14()
+        {
+        }
+
+        [Test]
+        public void Test_179_15()
+        {
+        }
+
+        [Test]
+        public void Test_179_16()
+        {
+        }
+
+        [Test]
+        public void Test_179_17()
+        {
+        }
+
+        [Test]
+        public void Test_179_18()
+        {
+        }
+
+        [Test]
+        public void Test_179_19()
+        {
+        }
+
+        [Test]
+        public void Test_179_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_180
+    {
+        #region PassingTests
+        [Test]
+        public void Test_180_01()
+        {
+        }
+
+        [Test]
+        public void Test_180_02()
+        {
+        }
+
+        [Test]
+        public void Test_180_03()
+        {
+        }
+
+        [Test]
+        public void Test_180_04()
+        {
+        }
+
+        [Test]
+        public void Test_180_05()
+        {
+        }
+
+        [Test]
+        public void Test_180_06()
+        {
+        }
+
+        [Test]
+        public void Test_180_07()
+        {
+        }
+
+        [Test]
+        public void Test_180_08()
+        {
+        }
+
+        [Test]
+        public void Test_180_09()
+        {
+        }
+
+        [Test]
+        public void Test_180_10()
+        {
+        }
+
+        [Test]
+        public void Test_180_11()
+        {
+        }
+
+        [Test]
+        public void Test_180_12()
+        {
+        }
+
+        [Test]
+        public void Test_180_13()
+        {
+        }
+
+        [Test]
+        public void Test_180_14()
+        {
+        }
+
+        [Test]
+        public void Test_180_15()
+        {
+        }
+
+        [Test]
+        public void Test_180_16()
+        {
+        }
+
+        [Test]
+        public void Test_180_17()
+        {
+        }
+
+        [Test]
+        public void Test_180_18()
+        {
+        }
+
+        [Test]
+        public void Test_180_19()
+        {
+        }
+
+        [Test]
+        public void Test_180_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_181
+    {
+        #region PassingTests
+        [Test]
+        public void Test_181_01()
+        {
+        }
+
+        [Test]
+        public void Test_181_02()
+        {
+        }
+
+        [Test]
+        public void Test_181_03()
+        {
+        }
+
+        [Test]
+        public void Test_181_04()
+        {
+        }
+
+        [Test]
+        public void Test_181_05()
+        {
+        }
+
+        [Test]
+        public void Test_181_06()
+        {
+        }
+
+        [Test]
+        public void Test_181_07()
+        {
+        }
+
+        [Test]
+        public void Test_181_08()
+        {
+        }
+
+        [Test]
+        public void Test_181_09()
+        {
+        }
+
+        [Test]
+        public void Test_181_10()
+        {
+        }
+
+        [Test]
+        public void Test_181_11()
+        {
+        }
+
+        [Test]
+        public void Test_181_12()
+        {
+        }
+
+        [Test]
+        public void Test_181_13()
+        {
+        }
+
+        [Test]
+        public void Test_181_14()
+        {
+        }
+
+        [Test]
+        public void Test_181_15()
+        {
+        }
+
+        [Test]
+        public void Test_181_16()
+        {
+        }
+
+        [Test]
+        public void Test_181_17()
+        {
+        }
+
+        [Test]
+        public void Test_181_18()
+        {
+        }
+
+        [Test]
+        public void Test_181_19()
+        {
+        }
+
+        [Test]
+        public void Test_181_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_182
+    {
+        #region PassingTests
+        [Test]
+        public void Test_182_01()
+        {
+        }
+
+        [Test]
+        public void Test_182_02()
+        {
+        }
+
+        [Test]
+        public void Test_182_03()
+        {
+        }
+
+        [Test]
+        public void Test_182_04()
+        {
+        }
+
+        [Test]
+        public void Test_182_05()
+        {
+        }
+
+        [Test]
+        public void Test_182_06()
+        {
+        }
+
+        [Test]
+        public void Test_182_07()
+        {
+        }
+
+        [Test]
+        public void Test_182_08()
+        {
+        }
+
+        [Test]
+        public void Test_182_09()
+        {
+        }
+
+        [Test]
+        public void Test_182_10()
+        {
+        }
+
+        [Test]
+        public void Test_182_11()
+        {
+        }
+
+        [Test]
+        public void Test_182_12()
+        {
+        }
+
+        [Test]
+        public void Test_182_13()
+        {
+        }
+
+        [Test]
+        public void Test_182_14()
+        {
+        }
+
+        [Test]
+        public void Test_182_15()
+        {
+        }
+
+        [Test]
+        public void Test_182_16()
+        {
+        }
+
+        [Test]
+        public void Test_182_17()
+        {
+        }
+
+        [Test]
+        public void Test_182_18()
+        {
+        }
+
+        [Test]
+        public void Test_182_19()
+        {
+        }
+
+        [Test]
+        public void Test_182_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_183
+    {
+        #region PassingTests
+        [Test]
+        public void Test_183_01()
+        {
+        }
+
+        [Test]
+        public void Test_183_02()
+        {
+        }
+
+        [Test]
+        public void Test_183_03()
+        {
+        }
+
+        [Test]
+        public void Test_183_04()
+        {
+        }
+
+        [Test]
+        public void Test_183_05()
+        {
+        }
+
+        [Test]
+        public void Test_183_06()
+        {
+        }
+
+        [Test]
+        public void Test_183_07()
+        {
+        }
+
+        [Test]
+        public void Test_183_08()
+        {
+        }
+
+        [Test]
+        public void Test_183_09()
+        {
+        }
+
+        [Test]
+        public void Test_183_10()
+        {
+        }
+
+        [Test]
+        public void Test_183_11()
+        {
+        }
+
+        [Test]
+        public void Test_183_12()
+        {
+        }
+
+        [Test]
+        public void Test_183_13()
+        {
+        }
+
+        [Test]
+        public void Test_183_14()
+        {
+        }
+
+        [Test]
+        public void Test_183_15()
+        {
+        }
+
+        [Test]
+        public void Test_183_16()
+        {
+        }
+
+        [Test]
+        public void Test_183_17()
+        {
+        }
+
+        [Test]
+        public void Test_183_18()
+        {
+        }
+
+        [Test]
+        public void Test_183_19()
+        {
+        }
+
+        [Test]
+        public void Test_183_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_184
+    {
+        #region PassingTests
+        [Test]
+        public void Test_184_01()
+        {
+        }
+
+        [Test]
+        public void Test_184_02()
+        {
+        }
+
+        [Test]
+        public void Test_184_03()
+        {
+        }
+
+        [Test]
+        public void Test_184_04()
+        {
+        }
+
+        [Test]
+        public void Test_184_05()
+        {
+        }
+
+        [Test]
+        public void Test_184_06()
+        {
+        }
+
+        [Test]
+        public void Test_184_07()
+        {
+        }
+
+        [Test]
+        public void Test_184_08()
+        {
+        }
+
+        [Test]
+        public void Test_184_09()
+        {
+        }
+
+        [Test]
+        public void Test_184_10()
+        {
+        }
+
+        [Test]
+        public void Test_184_11()
+        {
+        }
+
+        [Test]
+        public void Test_184_12()
+        {
+        }
+
+        [Test]
+        public void Test_184_13()
+        {
+        }
+
+        [Test]
+        public void Test_184_14()
+        {
+        }
+
+        [Test]
+        public void Test_184_15()
+        {
+        }
+
+        [Test]
+        public void Test_184_16()
+        {
+        }
+
+        [Test]
+        public void Test_184_17()
+        {
+        }
+
+        [Test]
+        public void Test_184_18()
+        {
+        }
+
+        [Test]
+        public void Test_184_19()
+        {
+        }
+
+        [Test]
+        public void Test_184_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_185
+    {
+        #region PassingTests
+        [Test]
+        public void Test_185_01()
+        {
+        }
+
+        [Test]
+        public void Test_185_02()
+        {
+        }
+
+        [Test]
+        public void Test_185_03()
+        {
+        }
+
+        [Test]
+        public void Test_185_04()
+        {
+        }
+
+        [Test]
+        public void Test_185_05()
+        {
+        }
+
+        [Test]
+        public void Test_185_06()
+        {
+        }
+
+        [Test]
+        public void Test_185_07()
+        {
+        }
+
+        [Test]
+        public void Test_185_08()
+        {
+        }
+
+        [Test]
+        public void Test_185_09()
+        {
+        }
+
+        [Test]
+        public void Test_185_10()
+        {
+        }
+
+        [Test]
+        public void Test_185_11()
+        {
+        }
+
+        [Test]
+        public void Test_185_12()
+        {
+        }
+
+        [Test]
+        public void Test_185_13()
+        {
+        }
+
+        [Test]
+        public void Test_185_14()
+        {
+        }
+
+        [Test]
+        public void Test_185_15()
+        {
+        }
+
+        [Test]
+        public void Test_185_16()
+        {
+        }
+
+        [Test]
+        public void Test_185_17()
+        {
+        }
+
+        [Test]
+        public void Test_185_18()
+        {
+        }
+
+        [Test]
+        public void Test_185_19()
+        {
+        }
+
+        [Test]
+        public void Test_185_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_186
+    {
+        #region PassingTests
+        [Test]
+        public void Test_186_01()
+        {
+        }
+
+        [Test]
+        public void Test_186_02()
+        {
+        }
+
+        [Test]
+        public void Test_186_03()
+        {
+        }
+
+        [Test]
+        public void Test_186_04()
+        {
+        }
+
+        [Test]
+        public void Test_186_05()
+        {
+        }
+
+        [Test]
+        public void Test_186_06()
+        {
+        }
+
+        [Test]
+        public void Test_186_07()
+        {
+        }
+
+        [Test]
+        public void Test_186_08()
+        {
+        }
+
+        [Test]
+        public void Test_186_09()
+        {
+        }
+
+        [Test]
+        public void Test_186_10()
+        {
+        }
+
+        [Test]
+        public void Test_186_11()
+        {
+        }
+
+        [Test]
+        public void Test_186_12()
+        {
+        }
+
+        [Test]
+        public void Test_186_13()
+        {
+        }
+
+        [Test]
+        public void Test_186_14()
+        {
+        }
+
+        [Test]
+        public void Test_186_15()
+        {
+        }
+
+        [Test]
+        public void Test_186_16()
+        {
+        }
+
+        [Test]
+        public void Test_186_17()
+        {
+        }
+
+        [Test]
+        public void Test_186_18()
+        {
+        }
+
+        [Test]
+        public void Test_186_19()
+        {
+        }
+
+        [Test]
+        public void Test_186_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_187
+    {
+        #region PassingTests
+        [Test]
+        public void Test_187_01()
+        {
+        }
+
+        [Test]
+        public void Test_187_02()
+        {
+        }
+
+        [Test]
+        public void Test_187_03()
+        {
+        }
+
+        [Test]
+        public void Test_187_04()
+        {
+        }
+
+        [Test]
+        public void Test_187_05()
+        {
+        }
+
+        [Test]
+        public void Test_187_06()
+        {
+        }
+
+        [Test]
+        public void Test_187_07()
+        {
+        }
+
+        [Test]
+        public void Test_187_08()
+        {
+        }
+
+        [Test]
+        public void Test_187_09()
+        {
+        }
+
+        [Test]
+        public void Test_187_10()
+        {
+        }
+
+        [Test]
+        public void Test_187_11()
+        {
+        }
+
+        [Test]
+        public void Test_187_12()
+        {
+        }
+
+        [Test]
+        public void Test_187_13()
+        {
+        }
+
+        [Test]
+        public void Test_187_14()
+        {
+        }
+
+        [Test]
+        public void Test_187_15()
+        {
+        }
+
+        [Test]
+        public void Test_187_16()
+        {
+        }
+
+        [Test]
+        public void Test_187_17()
+        {
+        }
+
+        [Test]
+        public void Test_187_18()
+        {
+        }
+
+        [Test]
+        public void Test_187_19()
+        {
+        }
+
+        [Test]
+        public void Test_187_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_188
+    {
+        #region PassingTests
+        [Test]
+        public void Test_188_01()
+        {
+        }
+
+        [Test]
+        public void Test_188_02()
+        {
+        }
+
+        [Test]
+        public void Test_188_03()
+        {
+        }
+
+        [Test]
+        public void Test_188_04()
+        {
+        }
+
+        [Test]
+        public void Test_188_05()
+        {
+        }
+
+        [Test]
+        public void Test_188_06()
+        {
+        }
+
+        [Test]
+        public void Test_188_07()
+        {
+        }
+
+        [Test]
+        public void Test_188_08()
+        {
+        }
+
+        [Test]
+        public void Test_188_09()
+        {
+        }
+
+        [Test]
+        public void Test_188_10()
+        {
+        }
+
+        [Test]
+        public void Test_188_11()
+        {
+        }
+
+        [Test]
+        public void Test_188_12()
+        {
+        }
+
+        [Test]
+        public void Test_188_13()
+        {
+        }
+
+        [Test]
+        public void Test_188_14()
+        {
+        }
+
+        [Test]
+        public void Test_188_15()
+        {
+        }
+
+        [Test]
+        public void Test_188_16()
+        {
+        }
+
+        [Test]
+        public void Test_188_17()
+        {
+        }
+
+        [Test]
+        public void Test_188_18()
+        {
+        }
+
+        [Test]
+        public void Test_188_19()
+        {
+        }
+
+        [Test]
+        public void Test_188_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_189
+    {
+        #region PassingTests
+        [Test]
+        public void Test_189_01()
+        {
+        }
+
+        [Test]
+        public void Test_189_02()
+        {
+        }
+
+        [Test]
+        public void Test_189_03()
+        {
+        }
+
+        [Test]
+        public void Test_189_04()
+        {
+        }
+
+        [Test]
+        public void Test_189_05()
+        {
+        }
+
+        [Test]
+        public void Test_189_06()
+        {
+        }
+
+        [Test]
+        public void Test_189_07()
+        {
+        }
+
+        [Test]
+        public void Test_189_08()
+        {
+        }
+
+        [Test]
+        public void Test_189_09()
+        {
+        }
+
+        [Test]
+        public void Test_189_10()
+        {
+        }
+
+        [Test]
+        public void Test_189_11()
+        {
+        }
+
+        [Test]
+        public void Test_189_12()
+        {
+        }
+
+        [Test]
+        public void Test_189_13()
+        {
+        }
+
+        [Test]
+        public void Test_189_14()
+        {
+        }
+
+        [Test]
+        public void Test_189_15()
+        {
+        }
+
+        [Test]
+        public void Test_189_16()
+        {
+        }
+
+        [Test]
+        public void Test_189_17()
+        {
+        }
+
+        [Test]
+        public void Test_189_18()
+        {
+        }
+
+        [Test]
+        public void Test_189_19()
+        {
+        }
+
+        [Test]
+        public void Test_189_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_190
+    {
+        #region PassingTests
+        [Test]
+        public void Test_190_01()
+        {
+        }
+
+        [Test]
+        public void Test_190_02()
+        {
+        }
+
+        [Test]
+        public void Test_190_03()
+        {
+        }
+
+        [Test]
+        public void Test_190_04()
+        {
+        }
+
+        [Test]
+        public void Test_190_05()
+        {
+        }
+
+        [Test]
+        public void Test_190_06()
+        {
+        }
+
+        [Test]
+        public void Test_190_07()
+        {
+        }
+
+        [Test]
+        public void Test_190_08()
+        {
+        }
+
+        [Test]
+        public void Test_190_09()
+        {
+        }
+
+        [Test]
+        public void Test_190_10()
+        {
+        }
+
+        [Test]
+        public void Test_190_11()
+        {
+        }
+
+        [Test]
+        public void Test_190_12()
+        {
+        }
+
+        [Test]
+        public void Test_190_13()
+        {
+        }
+
+        [Test]
+        public void Test_190_14()
+        {
+        }
+
+        [Test]
+        public void Test_190_15()
+        {
+        }
+
+        [Test]
+        public void Test_190_16()
+        {
+        }
+
+        [Test]
+        public void Test_190_17()
+        {
+        }
+
+        [Test]
+        public void Test_190_18()
+        {
+        }
+
+        [Test]
+        public void Test_190_19()
+        {
+        }
+
+        [Test]
+        public void Test_190_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_191
+    {
+        #region PassingTests
+        [Test]
+        public void Test_191_01()
+        {
+        }
+
+        [Test]
+        public void Test_191_02()
+        {
+        }
+
+        [Test]
+        public void Test_191_03()
+        {
+        }
+
+        [Test]
+        public void Test_191_04()
+        {
+        }
+
+        [Test]
+        public void Test_191_05()
+        {
+        }
+
+        [Test]
+        public void Test_191_06()
+        {
+        }
+
+        [Test]
+        public void Test_191_07()
+        {
+        }
+
+        [Test]
+        public void Test_191_08()
+        {
+        }
+
+        [Test]
+        public void Test_191_09()
+        {
+        }
+
+        [Test]
+        public void Test_191_10()
+        {
+        }
+
+        [Test]
+        public void Test_191_11()
+        {
+        }
+
+        [Test]
+        public void Test_191_12()
+        {
+        }
+
+        [Test]
+        public void Test_191_13()
+        {
+        }
+
+        [Test]
+        public void Test_191_14()
+        {
+        }
+
+        [Test]
+        public void Test_191_15()
+        {
+        }
+
+        [Test]
+        public void Test_191_16()
+        {
+        }
+
+        [Test]
+        public void Test_191_17()
+        {
+        }
+
+        [Test]
+        public void Test_191_18()
+        {
+        }
+
+        [Test]
+        public void Test_191_19()
+        {
+        }
+
+        [Test]
+        public void Test_191_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_192
+    {
+        #region PassingTests
+        [Test]
+        public void Test_192_01()
+        {
+        }
+
+        [Test]
+        public void Test_192_02()
+        {
+        }
+
+        [Test]
+        public void Test_192_03()
+        {
+        }
+
+        [Test]
+        public void Test_192_04()
+        {
+        }
+
+        [Test]
+        public void Test_192_05()
+        {
+        }
+
+        [Test]
+        public void Test_192_06()
+        {
+        }
+
+        [Test]
+        public void Test_192_07()
+        {
+        }
+
+        [Test]
+        public void Test_192_08()
+        {
+        }
+
+        [Test]
+        public void Test_192_09()
+        {
+        }
+
+        [Test]
+        public void Test_192_10()
+        {
+        }
+
+        [Test]
+        public void Test_192_11()
+        {
+        }
+
+        [Test]
+        public void Test_192_12()
+        {
+        }
+
+        [Test]
+        public void Test_192_13()
+        {
+        }
+
+        [Test]
+        public void Test_192_14()
+        {
+        }
+
+        [Test]
+        public void Test_192_15()
+        {
+        }
+
+        [Test]
+        public void Test_192_16()
+        {
+        }
+
+        [Test]
+        public void Test_192_17()
+        {
+        }
+
+        [Test]
+        public void Test_192_18()
+        {
+        }
+
+        [Test]
+        public void Test_192_19()
+        {
+        }
+
+        [Test]
+        public void Test_192_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_193
+    {
+        #region PassingTests
+        [Test]
+        public void Test_193_01()
+        {
+        }
+
+        [Test]
+        public void Test_193_02()
+        {
+        }
+
+        [Test]
+        public void Test_193_03()
+        {
+        }
+
+        [Test]
+        public void Test_193_04()
+        {
+        }
+
+        [Test]
+        public void Test_193_05()
+        {
+        }
+
+        [Test]
+        public void Test_193_06()
+        {
+        }
+
+        [Test]
+        public void Test_193_07()
+        {
+        }
+
+        [Test]
+        public void Test_193_08()
+        {
+        }
+
+        [Test]
+        public void Test_193_09()
+        {
+        }
+
+        [Test]
+        public void Test_193_10()
+        {
+        }
+
+        [Test]
+        public void Test_193_11()
+        {
+        }
+
+        [Test]
+        public void Test_193_12()
+        {
+        }
+
+        [Test]
+        public void Test_193_13()
+        {
+        }
+
+        [Test]
+        public void Test_193_14()
+        {
+        }
+
+        [Test]
+        public void Test_193_15()
+        {
+        }
+
+        [Test]
+        public void Test_193_16()
+        {
+        }
+
+        [Test]
+        public void Test_193_17()
+        {
+        }
+
+        [Test]
+        public void Test_193_18()
+        {
+        }
+
+        [Test]
+        public void Test_193_19()
+        {
+        }
+
+        [Test]
+        public void Test_193_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_194
+    {
+        #region PassingTests
+        [Test]
+        public void Test_194_01()
+        {
+        }
+
+        [Test]
+        public void Test_194_02()
+        {
+        }
+
+        [Test]
+        public void Test_194_03()
+        {
+        }
+
+        [Test]
+        public void Test_194_04()
+        {
+        }
+
+        [Test]
+        public void Test_194_05()
+        {
+        }
+
+        [Test]
+        public void Test_194_06()
+        {
+        }
+
+        [Test]
+        public void Test_194_07()
+        {
+        }
+
+        [Test]
+        public void Test_194_08()
+        {
+        }
+
+        [Test]
+        public void Test_194_09()
+        {
+        }
+
+        [Test]
+        public void Test_194_10()
+        {
+        }
+
+        [Test]
+        public void Test_194_11()
+        {
+        }
+
+        [Test]
+        public void Test_194_12()
+        {
+        }
+
+        [Test]
+        public void Test_194_13()
+        {
+        }
+
+        [Test]
+        public void Test_194_14()
+        {
+        }
+
+        [Test]
+        public void Test_194_15()
+        {
+        }
+
+        [Test]
+        public void Test_194_16()
+        {
+        }
+
+        [Test]
+        public void Test_194_17()
+        {
+        }
+
+        [Test]
+        public void Test_194_18()
+        {
+        }
+
+        [Test]
+        public void Test_194_19()
+        {
+        }
+
+        [Test]
+        public void Test_194_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_195
+    {
+        #region PassingTests
+        [Test]
+        public void Test_195_01()
+        {
+        }
+
+        [Test]
+        public void Test_195_02()
+        {
+        }
+
+        [Test]
+        public void Test_195_03()
+        {
+        }
+
+        [Test]
+        public void Test_195_04()
+        {
+        }
+
+        [Test]
+        public void Test_195_05()
+        {
+        }
+
+        [Test]
+        public void Test_195_06()
+        {
+        }
+
+        [Test]
+        public void Test_195_07()
+        {
+        }
+
+        [Test]
+        public void Test_195_08()
+        {
+        }
+
+        [Test]
+        public void Test_195_09()
+        {
+        }
+
+        [Test]
+        public void Test_195_10()
+        {
+        }
+
+        [Test]
+        public void Test_195_11()
+        {
+        }
+
+        [Test]
+        public void Test_195_12()
+        {
+        }
+
+        [Test]
+        public void Test_195_13()
+        {
+        }
+
+        [Test]
+        public void Test_195_14()
+        {
+        }
+
+        [Test]
+        public void Test_195_15()
+        {
+        }
+
+        [Test]
+        public void Test_195_16()
+        {
+        }
+
+        [Test]
+        public void Test_195_17()
+        {
+        }
+
+        [Test]
+        public void Test_195_18()
+        {
+        }
+
+        [Test]
+        public void Test_195_19()
+        {
+        }
+
+        [Test]
+        public void Test_195_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_196
+    {
+        #region PassingTests
+        [Test]
+        public void Test_196_01()
+        {
+        }
+
+        [Test]
+        public void Test_196_02()
+        {
+        }
+
+        [Test]
+        public void Test_196_03()
+        {
+        }
+
+        [Test]
+        public void Test_196_04()
+        {
+        }
+
+        [Test]
+        public void Test_196_05()
+        {
+        }
+
+        [Test]
+        public void Test_196_06()
+        {
+        }
+
+        [Test]
+        public void Test_196_07()
+        {
+        }
+
+        [Test]
+        public void Test_196_08()
+        {
+        }
+
+        [Test]
+        public void Test_196_09()
+        {
+        }
+
+        [Test]
+        public void Test_196_10()
+        {
+        }
+
+        [Test]
+        public void Test_196_11()
+        {
+        }
+
+        [Test]
+        public void Test_196_12()
+        {
+        }
+
+        [Test]
+        public void Test_196_13()
+        {
+        }
+
+        [Test]
+        public void Test_196_14()
+        {
+        }
+
+        [Test]
+        public void Test_196_15()
+        {
+        }
+
+        [Test]
+        public void Test_196_16()
+        {
+        }
+
+        [Test]
+        public void Test_196_17()
+        {
+        }
+
+        [Test]
+        public void Test_196_18()
+        {
+        }
+
+        [Test]
+        public void Test_196_19()
+        {
+        }
+
+        [Test]
+        public void Test_196_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_197
+    {
+        #region PassingTests
+        [Test]
+        public void Test_197_01()
+        {
+        }
+
+        [Test]
+        public void Test_197_02()
+        {
+        }
+
+        [Test]
+        public void Test_197_03()
+        {
+        }
+
+        [Test]
+        public void Test_197_04()
+        {
+        }
+
+        [Test]
+        public void Test_197_05()
+        {
+        }
+
+        [Test]
+        public void Test_197_06()
+        {
+        }
+
+        [Test]
+        public void Test_197_07()
+        {
+        }
+
+        [Test]
+        public void Test_197_08()
+        {
+        }
+
+        [Test]
+        public void Test_197_09()
+        {
+        }
+
+        [Test]
+        public void Test_197_10()
+        {
+        }
+
+        [Test]
+        public void Test_197_11()
+        {
+        }
+
+        [Test]
+        public void Test_197_12()
+        {
+        }
+
+        [Test]
+        public void Test_197_13()
+        {
+        }
+
+        [Test]
+        public void Test_197_14()
+        {
+        }
+
+        [Test]
+        public void Test_197_15()
+        {
+        }
+
+        [Test]
+        public void Test_197_16()
+        {
+        }
+
+        [Test]
+        public void Test_197_17()
+        {
+        }
+
+        [Test]
+        public void Test_197_18()
+        {
+        }
+
+        [Test]
+        public void Test_197_19()
+        {
+        }
+
+        [Test]
+        public void Test_197_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_198
+    {
+        #region PassingTests
+        [Test]
+        public void Test_198_01()
+        {
+        }
+
+        [Test]
+        public void Test_198_02()
+        {
+        }
+
+        [Test]
+        public void Test_198_03()
+        {
+        }
+
+        [Test]
+        public void Test_198_04()
+        {
+        }
+
+        [Test]
+        public void Test_198_05()
+        {
+        }
+
+        [Test]
+        public void Test_198_06()
+        {
+        }
+
+        [Test]
+        public void Test_198_07()
+        {
+        }
+
+        [Test]
+        public void Test_198_08()
+        {
+        }
+
+        [Test]
+        public void Test_198_09()
+        {
+        }
+
+        [Test]
+        public void Test_198_10()
+        {
+        }
+
+        [Test]
+        public void Test_198_11()
+        {
+        }
+
+        [Test]
+        public void Test_198_12()
+        {
+        }
+
+        [Test]
+        public void Test_198_13()
+        {
+        }
+
+        [Test]
+        public void Test_198_14()
+        {
+        }
+
+        [Test]
+        public void Test_198_15()
+        {
+        }
+
+        [Test]
+        public void Test_198_16()
+        {
+        }
+
+        [Test]
+        public void Test_198_17()
+        {
+        }
+
+        [Test]
+        public void Test_198_18()
+        {
+        }
+
+        [Test]
+        public void Test_198_19()
+        {
+        }
+
+        [Test]
+        public void Test_198_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_199
+    {
+        #region PassingTests
+        [Test]
+        public void Test_199_01()
+        {
+        }
+
+        [Test]
+        public void Test_199_02()
+        {
+        }
+
+        [Test]
+        public void Test_199_03()
+        {
+        }
+
+        [Test]
+        public void Test_199_04()
+        {
+        }
+
+        [Test]
+        public void Test_199_05()
+        {
+        }
+
+        [Test]
+        public void Test_199_06()
+        {
+        }
+
+        [Test]
+        public void Test_199_07()
+        {
+        }
+
+        [Test]
+        public void Test_199_08()
+        {
+        }
+
+        [Test]
+        public void Test_199_09()
+        {
+        }
+
+        [Test]
+        public void Test_199_10()
+        {
+        }
+
+        [Test]
+        public void Test_199_11()
+        {
+        }
+
+        [Test]
+        public void Test_199_12()
+        {
+        }
+
+        [Test]
+        public void Test_199_13()
+        {
+        }
+
+        [Test]
+        public void Test_199_14()
+        {
+        }
+
+        [Test]
+        public void Test_199_15()
+        {
+        }
+
+        [Test]
+        public void Test_199_16()
+        {
+        }
+
+        [Test]
+        public void Test_199_17()
+        {
+        }
+
+        [Test]
+        public void Test_199_18()
+        {
+        }
+
+        [Test]
+        public void Test_199_19()
+        {
+        }
+
+        [Test]
+        public void Test_199_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_200
+    {
+        #region PassingTests
+        [Test]
+        public void Test_200_01()
+        {
+        }
+
+        [Test]
+        public void Test_200_02()
+        {
+        }
+
+        [Test]
+        public void Test_200_03()
+        {
+        }
+
+        [Test]
+        public void Test_200_04()
+        {
+        }
+
+        [Test]
+        public void Test_200_05()
+        {
+        }
+
+        [Test]
+        public void Test_200_06()
+        {
+        }
+
+        [Test]
+        public void Test_200_07()
+        {
+        }
+
+        [Test]
+        public void Test_200_08()
+        {
+        }
+
+        [Test]
+        public void Test_200_09()
+        {
+        }
+
+        [Test]
+        public void Test_200_10()
+        {
+        }
+
+        [Test]
+        public void Test_200_11()
+        {
+        }
+
+        [Test]
+        public void Test_200_12()
+        {
+        }
+
+        [Test]
+        public void Test_200_13()
+        {
+        }
+
+        [Test]
+        public void Test_200_14()
+        {
+        }
+
+        [Test]
+        public void Test_200_15()
+        {
+        }
+
+        [Test]
+        public void Test_200_16()
+        {
+        }
+
+        [Test]
+        public void Test_200_17()
+        {
+        }
+
+        [Test]
+        public void Test_200_18()
+        {
+        }
+
+        [Test]
+        public void Test_200_19()
+        {
+        }
+
+        [Test]
+        public void Test_200_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_201
+    {
+        #region PassingTests
+        [Test]
+        public void Test_201_01()
+        {
+        }
+
+        [Test]
+        public void Test_201_02()
+        {
+        }
+
+        [Test]
+        public void Test_201_03()
+        {
+        }
+
+        [Test]
+        public void Test_201_04()
+        {
+        }
+
+        [Test]
+        public void Test_201_05()
+        {
+        }
+
+        [Test]
+        public void Test_201_06()
+        {
+        }
+
+        [Test]
+        public void Test_201_07()
+        {
+        }
+
+        [Test]
+        public void Test_201_08()
+        {
+        }
+
+        [Test]
+        public void Test_201_09()
+        {
+        }
+
+        [Test]
+        public void Test_201_10()
+        {
+        }
+
+        [Test]
+        public void Test_201_11()
+        {
+        }
+
+        [Test]
+        public void Test_201_12()
+        {
+        }
+
+        [Test]
+        public void Test_201_13()
+        {
+        }
+
+        [Test]
+        public void Test_201_14()
+        {
+        }
+
+        [Test]
+        public void Test_201_15()
+        {
+        }
+
+        [Test]
+        public void Test_201_16()
+        {
+        }
+
+        [Test]
+        public void Test_201_17()
+        {
+        }
+
+        [Test]
+        public void Test_201_18()
+        {
+        }
+
+        [Test]
+        public void Test_201_19()
+        {
+        }
+
+        [Test]
+        public void Test_201_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_202
+    {
+        #region PassingTests
+        [Test]
+        public void Test_202_01()
+        {
+        }
+
+        [Test]
+        public void Test_202_02()
+        {
+        }
+
+        [Test]
+        public void Test_202_03()
+        {
+        }
+
+        [Test]
+        public void Test_202_04()
+        {
+        }
+
+        [Test]
+        public void Test_202_05()
+        {
+        }
+
+        [Test]
+        public void Test_202_06()
+        {
+        }
+
+        [Test]
+        public void Test_202_07()
+        {
+        }
+
+        [Test]
+        public void Test_202_08()
+        {
+        }
+
+        [Test]
+        public void Test_202_09()
+        {
+        }
+
+        [Test]
+        public void Test_202_10()
+        {
+        }
+
+        [Test]
+        public void Test_202_11()
+        {
+        }
+
+        [Test]
+        public void Test_202_12()
+        {
+        }
+
+        [Test]
+        public void Test_202_13()
+        {
+        }
+
+        [Test]
+        public void Test_202_14()
+        {
+        }
+
+        [Test]
+        public void Test_202_15()
+        {
+        }
+
+        [Test]
+        public void Test_202_16()
+        {
+        }
+
+        [Test]
+        public void Test_202_17()
+        {
+        }
+
+        [Test]
+        public void Test_202_18()
+        {
+        }
+
+        [Test]
+        public void Test_202_19()
+        {
+        }
+
+        [Test]
+        public void Test_202_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_203
+    {
+        #region PassingTests
+        [Test]
+        public void Test_203_01()
+        {
+        }
+
+        [Test]
+        public void Test_203_02()
+        {
+        }
+
+        [Test]
+        public void Test_203_03()
+        {
+        }
+
+        [Test]
+        public void Test_203_04()
+        {
+        }
+
+        [Test]
+        public void Test_203_05()
+        {
+        }
+
+        [Test]
+        public void Test_203_06()
+        {
+        }
+
+        [Test]
+        public void Test_203_07()
+        {
+        }
+
+        [Test]
+        public void Test_203_08()
+        {
+        }
+
+        [Test]
+        public void Test_203_09()
+        {
+        }
+
+        [Test]
+        public void Test_203_10()
+        {
+        }
+
+        [Test]
+        public void Test_203_11()
+        {
+        }
+
+        [Test]
+        public void Test_203_12()
+        {
+        }
+
+        [Test]
+        public void Test_203_13()
+        {
+        }
+
+        [Test]
+        public void Test_203_14()
+        {
+        }
+
+        [Test]
+        public void Test_203_15()
+        {
+        }
+
+        [Test]
+        public void Test_203_16()
+        {
+        }
+
+        [Test]
+        public void Test_203_17()
+        {
+        }
+
+        [Test]
+        public void Test_203_18()
+        {
+        }
+
+        [Test]
+        public void Test_203_19()
+        {
+        }
+
+        [Test]
+        public void Test_203_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_204
+    {
+        #region PassingTests
+        [Test]
+        public void Test_204_01()
+        {
+        }
+
+        [Test]
+        public void Test_204_02()
+        {
+        }
+
+        [Test]
+        public void Test_204_03()
+        {
+        }
+
+        [Test]
+        public void Test_204_04()
+        {
+        }
+
+        [Test]
+        public void Test_204_05()
+        {
+        }
+
+        [Test]
+        public void Test_204_06()
+        {
+        }
+
+        [Test]
+        public void Test_204_07()
+        {
+        }
+
+        [Test]
+        public void Test_204_08()
+        {
+        }
+
+        [Test]
+        public void Test_204_09()
+        {
+        }
+
+        [Test]
+        public void Test_204_10()
+        {
+        }
+
+        [Test]
+        public void Test_204_11()
+        {
+        }
+
+        [Test]
+        public void Test_204_12()
+        {
+        }
+
+        [Test]
+        public void Test_204_13()
+        {
+        }
+
+        [Test]
+        public void Test_204_14()
+        {
+        }
+
+        [Test]
+        public void Test_204_15()
+        {
+        }
+
+        [Test]
+        public void Test_204_16()
+        {
+        }
+
+        [Test]
+        public void Test_204_17()
+        {
+        }
+
+        [Test]
+        public void Test_204_18()
+        {
+        }
+
+        [Test]
+        public void Test_204_19()
+        {
+        }
+
+        [Test]
+        public void Test_204_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_205
+    {
+        #region PassingTests
+        [Test]
+        public void Test_205_01()
+        {
+        }
+
+        [Test]
+        public void Test_205_02()
+        {
+        }
+
+        [Test]
+        public void Test_205_03()
+        {
+        }
+
+        [Test]
+        public void Test_205_04()
+        {
+        }
+
+        [Test]
+        public void Test_205_05()
+        {
+        }
+
+        [Test]
+        public void Test_205_06()
+        {
+        }
+
+        [Test]
+        public void Test_205_07()
+        {
+        }
+
+        [Test]
+        public void Test_205_08()
+        {
+        }
+
+        [Test]
+        public void Test_205_09()
+        {
+        }
+
+        [Test]
+        public void Test_205_10()
+        {
+        }
+
+        [Test]
+        public void Test_205_11()
+        {
+        }
+
+        [Test]
+        public void Test_205_12()
+        {
+        }
+
+        [Test]
+        public void Test_205_13()
+        {
+        }
+
+        [Test]
+        public void Test_205_14()
+        {
+        }
+
+        [Test]
+        public void Test_205_15()
+        {
+        }
+
+        [Test]
+        public void Test_205_16()
+        {
+        }
+
+        [Test]
+        public void Test_205_17()
+        {
+        }
+
+        [Test]
+        public void Test_205_18()
+        {
+        }
+
+        [Test]
+        public void Test_205_19()
+        {
+        }
+
+        [Test]
+        public void Test_205_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_206
+    {
+        #region PassingTests
+        [Test]
+        public void Test_206_01()
+        {
+        }
+
+        [Test]
+        public void Test_206_02()
+        {
+        }
+
+        [Test]
+        public void Test_206_03()
+        {
+        }
+
+        [Test]
+        public void Test_206_04()
+        {
+        }
+
+        [Test]
+        public void Test_206_05()
+        {
+        }
+
+        [Test]
+        public void Test_206_06()
+        {
+        }
+
+        [Test]
+        public void Test_206_07()
+        {
+        }
+
+        [Test]
+        public void Test_206_08()
+        {
+        }
+
+        [Test]
+        public void Test_206_09()
+        {
+        }
+
+        [Test]
+        public void Test_206_10()
+        {
+        }
+
+        [Test]
+        public void Test_206_11()
+        {
+        }
+
+        [Test]
+        public void Test_206_12()
+        {
+        }
+
+        [Test]
+        public void Test_206_13()
+        {
+        }
+
+        [Test]
+        public void Test_206_14()
+        {
+        }
+
+        [Test]
+        public void Test_206_15()
+        {
+        }
+
+        [Test]
+        public void Test_206_16()
+        {
+        }
+
+        [Test]
+        public void Test_206_17()
+        {
+        }
+
+        [Test]
+        public void Test_206_18()
+        {
+        }
+
+        [Test]
+        public void Test_206_19()
+        {
+        }
+
+        [Test]
+        public void Test_206_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_207
+    {
+        #region PassingTests
+        [Test]
+        public void Test_207_01()
+        {
+        }
+
+        [Test]
+        public void Test_207_02()
+        {
+        }
+
+        [Test]
+        public void Test_207_03()
+        {
+        }
+
+        [Test]
+        public void Test_207_04()
+        {
+        }
+
+        [Test]
+        public void Test_207_05()
+        {
+        }
+
+        [Test]
+        public void Test_207_06()
+        {
+        }
+
+        [Test]
+        public void Test_207_07()
+        {
+        }
+
+        [Test]
+        public void Test_207_08()
+        {
+        }
+
+        [Test]
+        public void Test_207_09()
+        {
+        }
+
+        [Test]
+        public void Test_207_10()
+        {
+        }
+
+        [Test]
+        public void Test_207_11()
+        {
+        }
+
+        [Test]
+        public void Test_207_12()
+        {
+        }
+
+        [Test]
+        public void Test_207_13()
+        {
+        }
+
+        [Test]
+        public void Test_207_14()
+        {
+        }
+
+        [Test]
+        public void Test_207_15()
+        {
+        }
+
+        [Test]
+        public void Test_207_16()
+        {
+        }
+
+        [Test]
+        public void Test_207_17()
+        {
+        }
+
+        [Test]
+        public void Test_207_18()
+        {
+        }
+
+        [Test]
+        public void Test_207_19()
+        {
+        }
+
+        [Test]
+        public void Test_207_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_208
+    {
+        #region PassingTests
+        [Test]
+        public void Test_208_01()
+        {
+        }
+
+        [Test]
+        public void Test_208_02()
+        {
+        }
+
+        [Test]
+        public void Test_208_03()
+        {
+        }
+
+        [Test]
+        public void Test_208_04()
+        {
+        }
+
+        [Test]
+        public void Test_208_05()
+        {
+        }
+
+        [Test]
+        public void Test_208_06()
+        {
+        }
+
+        [Test]
+        public void Test_208_07()
+        {
+        }
+
+        [Test]
+        public void Test_208_08()
+        {
+        }
+
+        [Test]
+        public void Test_208_09()
+        {
+        }
+
+        [Test]
+        public void Test_208_10()
+        {
+        }
+
+        [Test]
+        public void Test_208_11()
+        {
+        }
+
+        [Test]
+        public void Test_208_12()
+        {
+        }
+
+        [Test]
+        public void Test_208_13()
+        {
+        }
+
+        [Test]
+        public void Test_208_14()
+        {
+        }
+
+        [Test]
+        public void Test_208_15()
+        {
+        }
+
+        [Test]
+        public void Test_208_16()
+        {
+        }
+
+        [Test]
+        public void Test_208_17()
+        {
+        }
+
+        [Test]
+        public void Test_208_18()
+        {
+        }
+
+        [Test]
+        public void Test_208_19()
+        {
+        }
+
+        [Test]
+        public void Test_208_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_209
+    {
+        #region PassingTests
+        [Test]
+        public void Test_209_01()
+        {
+        }
+
+        [Test]
+        public void Test_209_02()
+        {
+        }
+
+        [Test]
+        public void Test_209_03()
+        {
+        }
+
+        [Test]
+        public void Test_209_04()
+        {
+        }
+
+        [Test]
+        public void Test_209_05()
+        {
+        }
+
+        [Test]
+        public void Test_209_06()
+        {
+        }
+
+        [Test]
+        public void Test_209_07()
+        {
+        }
+
+        [Test]
+        public void Test_209_08()
+        {
+        }
+
+        [Test]
+        public void Test_209_09()
+        {
+        }
+
+        [Test]
+        public void Test_209_10()
+        {
+        }
+
+        [Test]
+        public void Test_209_11()
+        {
+        }
+
+        [Test]
+        public void Test_209_12()
+        {
+        }
+
+        [Test]
+        public void Test_209_13()
+        {
+        }
+
+        [Test]
+        public void Test_209_14()
+        {
+        }
+
+        [Test]
+        public void Test_209_15()
+        {
+        }
+
+        [Test]
+        public void Test_209_16()
+        {
+        }
+
+        [Test]
+        public void Test_209_17()
+        {
+        }
+
+        [Test]
+        public void Test_209_18()
+        {
+        }
+
+        [Test]
+        public void Test_209_19()
+        {
+        }
+
+        [Test]
+        public void Test_209_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_210
+    {
+        #region PassingTests
+        [Test]
+        public void Test_210_01()
+        {
+        }
+
+        [Test]
+        public void Test_210_02()
+        {
+        }
+
+        [Test]
+        public void Test_210_03()
+        {
+        }
+
+        [Test]
+        public void Test_210_04()
+        {
+        }
+
+        [Test]
+        public void Test_210_05()
+        {
+        }
+
+        [Test]
+        public void Test_210_06()
+        {
+        }
+
+        [Test]
+        public void Test_210_07()
+        {
+        }
+
+        [Test]
+        public void Test_210_08()
+        {
+        }
+
+        [Test]
+        public void Test_210_09()
+        {
+        }
+
+        [Test]
+        public void Test_210_10()
+        {
+        }
+
+        [Test]
+        public void Test_210_11()
+        {
+        }
+
+        [Test]
+        public void Test_210_12()
+        {
+        }
+
+        [Test]
+        public void Test_210_13()
+        {
+        }
+
+        [Test]
+        public void Test_210_14()
+        {
+        }
+
+        [Test]
+        public void Test_210_15()
+        {
+        }
+
+        [Test]
+        public void Test_210_16()
+        {
+        }
+
+        [Test]
+        public void Test_210_17()
+        {
+        }
+
+        [Test]
+        public void Test_210_18()
+        {
+        }
+
+        [Test]
+        public void Test_210_19()
+        {
+        }
+
+        [Test]
+        public void Test_210_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_211
+    {
+        #region PassingTests
+        [Test]
+        public void Test_211_01()
+        {
+        }
+
+        [Test]
+        public void Test_211_02()
+        {
+        }
+
+        [Test]
+        public void Test_211_03()
+        {
+        }
+
+        [Test]
+        public void Test_211_04()
+        {
+        }
+
+        [Test]
+        public void Test_211_05()
+        {
+        }
+
+        [Test]
+        public void Test_211_06()
+        {
+        }
+
+        [Test]
+        public void Test_211_07()
+        {
+        }
+
+        [Test]
+        public void Test_211_08()
+        {
+        }
+
+        [Test]
+        public void Test_211_09()
+        {
+        }
+
+        [Test]
+        public void Test_211_10()
+        {
+        }
+
+        [Test]
+        public void Test_211_11()
+        {
+        }
+
+        [Test]
+        public void Test_211_12()
+        {
+        }
+
+        [Test]
+        public void Test_211_13()
+        {
+        }
+
+        [Test]
+        public void Test_211_14()
+        {
+        }
+
+        [Test]
+        public void Test_211_15()
+        {
+        }
+
+        [Test]
+        public void Test_211_16()
+        {
+        }
+
+        [Test]
+        public void Test_211_17()
+        {
+        }
+
+        [Test]
+        public void Test_211_18()
+        {
+        }
+
+        [Test]
+        public void Test_211_19()
+        {
+        }
+
+        [Test]
+        public void Test_211_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_212
+    {
+        #region PassingTests
+        [Test]
+        public void Test_212_01()
+        {
+        }
+
+        [Test]
+        public void Test_212_02()
+        {
+        }
+
+        [Test]
+        public void Test_212_03()
+        {
+        }
+
+        [Test]
+        public void Test_212_04()
+        {
+        }
+
+        [Test]
+        public void Test_212_05()
+        {
+        }
+
+        [Test]
+        public void Test_212_06()
+        {
+        }
+
+        [Test]
+        public void Test_212_07()
+        {
+        }
+
+        [Test]
+        public void Test_212_08()
+        {
+        }
+
+        [Test]
+        public void Test_212_09()
+        {
+        }
+
+        [Test]
+        public void Test_212_10()
+        {
+        }
+
+        [Test]
+        public void Test_212_11()
+        {
+        }
+
+        [Test]
+        public void Test_212_12()
+        {
+        }
+
+        [Test]
+        public void Test_212_13()
+        {
+        }
+
+        [Test]
+        public void Test_212_14()
+        {
+        }
+
+        [Test]
+        public void Test_212_15()
+        {
+        }
+
+        [Test]
+        public void Test_212_16()
+        {
+        }
+
+        [Test]
+        public void Test_212_17()
+        {
+        }
+
+        [Test]
+        public void Test_212_18()
+        {
+        }
+
+        [Test]
+        public void Test_212_19()
+        {
+        }
+
+        [Test]
+        public void Test_212_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_213
+    {
+        #region PassingTests
+        [Test]
+        public void Test_213_01()
+        {
+        }
+
+        [Test]
+        public void Test_213_02()
+        {
+        }
+
+        [Test]
+        public void Test_213_03()
+        {
+        }
+
+        [Test]
+        public void Test_213_04()
+        {
+        }
+
+        [Test]
+        public void Test_213_05()
+        {
+        }
+
+        [Test]
+        public void Test_213_06()
+        {
+        }
+
+        [Test]
+        public void Test_213_07()
+        {
+        }
+
+        [Test]
+        public void Test_213_08()
+        {
+        }
+
+        [Test]
+        public void Test_213_09()
+        {
+        }
+
+        [Test]
+        public void Test_213_10()
+        {
+        }
+
+        [Test]
+        public void Test_213_11()
+        {
+        }
+
+        [Test]
+        public void Test_213_12()
+        {
+        }
+
+        [Test]
+        public void Test_213_13()
+        {
+        }
+
+        [Test]
+        public void Test_213_14()
+        {
+        }
+
+        [Test]
+        public void Test_213_15()
+        {
+        }
+
+        [Test]
+        public void Test_213_16()
+        {
+        }
+
+        [Test]
+        public void Test_213_17()
+        {
+        }
+
+        [Test]
+        public void Test_213_18()
+        {
+        }
+
+        [Test]
+        public void Test_213_19()
+        {
+        }
+
+        [Test]
+        public void Test_213_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_214
+    {
+        #region PassingTests
+        [Test]
+        public void Test_214_01()
+        {
+        }
+
+        [Test]
+        public void Test_214_02()
+        {
+        }
+
+        [Test]
+        public void Test_214_03()
+        {
+        }
+
+        [Test]
+        public void Test_214_04()
+        {
+        }
+
+        [Test]
+        public void Test_214_05()
+        {
+        }
+
+        [Test]
+        public void Test_214_06()
+        {
+        }
+
+        [Test]
+        public void Test_214_07()
+        {
+        }
+
+        [Test]
+        public void Test_214_08()
+        {
+        }
+
+        [Test]
+        public void Test_214_09()
+        {
+        }
+
+        [Test]
+        public void Test_214_10()
+        {
+        }
+
+        [Test]
+        public void Test_214_11()
+        {
+        }
+
+        [Test]
+        public void Test_214_12()
+        {
+        }
+
+        [Test]
+        public void Test_214_13()
+        {
+        }
+
+        [Test]
+        public void Test_214_14()
+        {
+        }
+
+        [Test]
+        public void Test_214_15()
+        {
+        }
+
+        [Test]
+        public void Test_214_16()
+        {
+        }
+
+        [Test]
+        public void Test_214_17()
+        {
+        }
+
+        [Test]
+        public void Test_214_18()
+        {
+        }
+
+        [Test]
+        public void Test_214_19()
+        {
+        }
+
+        [Test]
+        public void Test_214_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_215
+    {
+        #region PassingTests
+        [Test]
+        public void Test_215_01()
+        {
+        }
+
+        [Test]
+        public void Test_215_02()
+        {
+        }
+
+        [Test]
+        public void Test_215_03()
+        {
+        }
+
+        [Test]
+        public void Test_215_04()
+        {
+        }
+
+        [Test]
+        public void Test_215_05()
+        {
+        }
+
+        [Test]
+        public void Test_215_06()
+        {
+        }
+
+        [Test]
+        public void Test_215_07()
+        {
+        }
+
+        [Test]
+        public void Test_215_08()
+        {
+        }
+
+        [Test]
+        public void Test_215_09()
+        {
+        }
+
+        [Test]
+        public void Test_215_10()
+        {
+        }
+
+        [Test]
+        public void Test_215_11()
+        {
+        }
+
+        [Test]
+        public void Test_215_12()
+        {
+        }
+
+        [Test]
+        public void Test_215_13()
+        {
+        }
+
+        [Test]
+        public void Test_215_14()
+        {
+        }
+
+        [Test]
+        public void Test_215_15()
+        {
+        }
+
+        [Test]
+        public void Test_215_16()
+        {
+        }
+
+        [Test]
+        public void Test_215_17()
+        {
+        }
+
+        [Test]
+        public void Test_215_18()
+        {
+        }
+
+        [Test]
+        public void Test_215_19()
+        {
+        }
+
+        [Test]
+        public void Test_215_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_216
+    {
+        #region PassingTests
+        [Test]
+        public void Test_216_01()
+        {
+        }
+
+        [Test]
+        public void Test_216_02()
+        {
+        }
+
+        [Test]
+        public void Test_216_03()
+        {
+        }
+
+        [Test]
+        public void Test_216_04()
+        {
+        }
+
+        [Test]
+        public void Test_216_05()
+        {
+        }
+
+        [Test]
+        public void Test_216_06()
+        {
+        }
+
+        [Test]
+        public void Test_216_07()
+        {
+        }
+
+        [Test]
+        public void Test_216_08()
+        {
+        }
+
+        [Test]
+        public void Test_216_09()
+        {
+        }
+
+        [Test]
+        public void Test_216_10()
+        {
+        }
+
+        [Test]
+        public void Test_216_11()
+        {
+        }
+
+        [Test]
+        public void Test_216_12()
+        {
+        }
+
+        [Test]
+        public void Test_216_13()
+        {
+        }
+
+        [Test]
+        public void Test_216_14()
+        {
+        }
+
+        [Test]
+        public void Test_216_15()
+        {
+        }
+
+        [Test]
+        public void Test_216_16()
+        {
+        }
+
+        [Test]
+        public void Test_216_17()
+        {
+        }
+
+        [Test]
+        public void Test_216_18()
+        {
+        }
+
+        [Test]
+        public void Test_216_19()
+        {
+        }
+
+        [Test]
+        public void Test_216_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_217
+    {
+        #region PassingTests
+        [Test]
+        public void Test_217_01()
+        {
+        }
+
+        [Test]
+        public void Test_217_02()
+        {
+        }
+
+        [Test]
+        public void Test_217_03()
+        {
+        }
+
+        [Test]
+        public void Test_217_04()
+        {
+        }
+
+        [Test]
+        public void Test_217_05()
+        {
+        }
+
+        [Test]
+        public void Test_217_06()
+        {
+        }
+
+        [Test]
+        public void Test_217_07()
+        {
+        }
+
+        [Test]
+        public void Test_217_08()
+        {
+        }
+
+        [Test]
+        public void Test_217_09()
+        {
+        }
+
+        [Test]
+        public void Test_217_10()
+        {
+        }
+
+        [Test]
+        public void Test_217_11()
+        {
+        }
+
+        [Test]
+        public void Test_217_12()
+        {
+        }
+
+        [Test]
+        public void Test_217_13()
+        {
+        }
+
+        [Test]
+        public void Test_217_14()
+        {
+        }
+
+        [Test]
+        public void Test_217_15()
+        {
+        }
+
+        [Test]
+        public void Test_217_16()
+        {
+        }
+
+        [Test]
+        public void Test_217_17()
+        {
+        }
+
+        [Test]
+        public void Test_217_18()
+        {
+        }
+
+        [Test]
+        public void Test_217_19()
+        {
+        }
+
+        [Test]
+        public void Test_217_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_218
+    {
+        #region PassingTests
+        [Test]
+        public void Test_218_01()
+        {
+        }
+
+        [Test]
+        public void Test_218_02()
+        {
+        }
+
+        [Test]
+        public void Test_218_03()
+        {
+        }
+
+        [Test]
+        public void Test_218_04()
+        {
+        }
+
+        [Test]
+        public void Test_218_05()
+        {
+        }
+
+        [Test]
+        public void Test_218_06()
+        {
+        }
+
+        [Test]
+        public void Test_218_07()
+        {
+        }
+
+        [Test]
+        public void Test_218_08()
+        {
+        }
+
+        [Test]
+        public void Test_218_09()
+        {
+        }
+
+        [Test]
+        public void Test_218_10()
+        {
+        }
+
+        [Test]
+        public void Test_218_11()
+        {
+        }
+
+        [Test]
+        public void Test_218_12()
+        {
+        }
+
+        [Test]
+        public void Test_218_13()
+        {
+        }
+
+        [Test]
+        public void Test_218_14()
+        {
+        }
+
+        [Test]
+        public void Test_218_15()
+        {
+        }
+
+        [Test]
+        public void Test_218_16()
+        {
+        }
+
+        [Test]
+        public void Test_218_17()
+        {
+        }
+
+        [Test]
+        public void Test_218_18()
+        {
+        }
+
+        [Test]
+        public void Test_218_19()
+        {
+        }
+
+        [Test]
+        public void Test_218_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_219
+    {
+        #region PassingTests
+        [Test]
+        public void Test_219_01()
+        {
+        }
+
+        [Test]
+        public void Test_219_02()
+        {
+        }
+
+        [Test]
+        public void Test_219_03()
+        {
+        }
+
+        [Test]
+        public void Test_219_04()
+        {
+        }
+
+        [Test]
+        public void Test_219_05()
+        {
+        }
+
+        [Test]
+        public void Test_219_06()
+        {
+        }
+
+        [Test]
+        public void Test_219_07()
+        {
+        }
+
+        [Test]
+        public void Test_219_08()
+        {
+        }
+
+        [Test]
+        public void Test_219_09()
+        {
+        }
+
+        [Test]
+        public void Test_219_10()
+        {
+        }
+
+        [Test]
+        public void Test_219_11()
+        {
+        }
+
+        [Test]
+        public void Test_219_12()
+        {
+        }
+
+        [Test]
+        public void Test_219_13()
+        {
+        }
+
+        [Test]
+        public void Test_219_14()
+        {
+        }
+
+        [Test]
+        public void Test_219_15()
+        {
+        }
+
+        [Test]
+        public void Test_219_16()
+        {
+        }
+
+        [Test]
+        public void Test_219_17()
+        {
+        }
+
+        [Test]
+        public void Test_219_18()
+        {
+        }
+
+        [Test]
+        public void Test_219_19()
+        {
+        }
+
+        [Test]
+        public void Test_219_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_220
+    {
+        #region PassingTests
+        [Test]
+        public void Test_220_01()
+        {
+        }
+
+        [Test]
+        public void Test_220_02()
+        {
+        }
+
+        [Test]
+        public void Test_220_03()
+        {
+        }
+
+        [Test]
+        public void Test_220_04()
+        {
+        }
+
+        [Test]
+        public void Test_220_05()
+        {
+        }
+
+        [Test]
+        public void Test_220_06()
+        {
+        }
+
+        [Test]
+        public void Test_220_07()
+        {
+        }
+
+        [Test]
+        public void Test_220_08()
+        {
+        }
+
+        [Test]
+        public void Test_220_09()
+        {
+        }
+
+        [Test]
+        public void Test_220_10()
+        {
+        }
+
+        [Test]
+        public void Test_220_11()
+        {
+        }
+
+        [Test]
+        public void Test_220_12()
+        {
+        }
+
+        [Test]
+        public void Test_220_13()
+        {
+        }
+
+        [Test]
+        public void Test_220_14()
+        {
+        }
+
+        [Test]
+        public void Test_220_15()
+        {
+        }
+
+        [Test]
+        public void Test_220_16()
+        {
+        }
+
+        [Test]
+        public void Test_220_17()
+        {
+        }
+
+        [Test]
+        public void Test_220_18()
+        {
+        }
+
+        [Test]
+        public void Test_220_19()
+        {
+        }
+
+        [Test]
+        public void Test_220_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_221
+    {
+        #region PassingTests
+        [Test]
+        public void Test_221_01()
+        {
+        }
+
+        [Test]
+        public void Test_221_02()
+        {
+        }
+
+        [Test]
+        public void Test_221_03()
+        {
+        }
+
+        [Test]
+        public void Test_221_04()
+        {
+        }
+
+        [Test]
+        public void Test_221_05()
+        {
+        }
+
+        [Test]
+        public void Test_221_06()
+        {
+        }
+
+        [Test]
+        public void Test_221_07()
+        {
+        }
+
+        [Test]
+        public void Test_221_08()
+        {
+        }
+
+        [Test]
+        public void Test_221_09()
+        {
+        }
+
+        [Test]
+        public void Test_221_10()
+        {
+        }
+
+        [Test]
+        public void Test_221_11()
+        {
+        }
+
+        [Test]
+        public void Test_221_12()
+        {
+        }
+
+        [Test]
+        public void Test_221_13()
+        {
+        }
+
+        [Test]
+        public void Test_221_14()
+        {
+        }
+
+        [Test]
+        public void Test_221_15()
+        {
+        }
+
+        [Test]
+        public void Test_221_16()
+        {
+        }
+
+        [Test]
+        public void Test_221_17()
+        {
+        }
+
+        [Test]
+        public void Test_221_18()
+        {
+        }
+
+        [Test]
+        public void Test_221_19()
+        {
+        }
+
+        [Test]
+        public void Test_221_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_222
+    {
+        #region PassingTests
+        [Test]
+        public void Test_222_01()
+        {
+        }
+
+        [Test]
+        public void Test_222_02()
+        {
+        }
+
+        [Test]
+        public void Test_222_03()
+        {
+        }
+
+        [Test]
+        public void Test_222_04()
+        {
+        }
+
+        [Test]
+        public void Test_222_05()
+        {
+        }
+
+        [Test]
+        public void Test_222_06()
+        {
+        }
+
+        [Test]
+        public void Test_222_07()
+        {
+        }
+
+        [Test]
+        public void Test_222_08()
+        {
+        }
+
+        [Test]
+        public void Test_222_09()
+        {
+        }
+
+        [Test]
+        public void Test_222_10()
+        {
+        }
+
+        [Test]
+        public void Test_222_11()
+        {
+        }
+
+        [Test]
+        public void Test_222_12()
+        {
+        }
+
+        [Test]
+        public void Test_222_13()
+        {
+        }
+
+        [Test]
+        public void Test_222_14()
+        {
+        }
+
+        [Test]
+        public void Test_222_15()
+        {
+        }
+
+        [Test]
+        public void Test_222_16()
+        {
+        }
+
+        [Test]
+        public void Test_222_17()
+        {
+        }
+
+        [Test]
+        public void Test_222_18()
+        {
+        }
+
+        [Test]
+        public void Test_222_19()
+        {
+        }
+
+        [Test]
+        public void Test_222_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_223
+    {
+        #region PassingTests
+        [Test]
+        public void Test_223_01()
+        {
+        }
+
+        [Test]
+        public void Test_223_02()
+        {
+        }
+
+        [Test]
+        public void Test_223_03()
+        {
+        }
+
+        [Test]
+        public void Test_223_04()
+        {
+        }
+
+        [Test]
+        public void Test_223_05()
+        {
+        }
+
+        [Test]
+        public void Test_223_06()
+        {
+        }
+
+        [Test]
+        public void Test_223_07()
+        {
+        }
+
+        [Test]
+        public void Test_223_08()
+        {
+        }
+
+        [Test]
+        public void Test_223_09()
+        {
+        }
+
+        [Test]
+        public void Test_223_10()
+        {
+        }
+
+        [Test]
+        public void Test_223_11()
+        {
+        }
+
+        [Test]
+        public void Test_223_12()
+        {
+        }
+
+        [Test]
+        public void Test_223_13()
+        {
+        }
+
+        [Test]
+        public void Test_223_14()
+        {
+        }
+
+        [Test]
+        public void Test_223_15()
+        {
+        }
+
+        [Test]
+        public void Test_223_16()
+        {
+        }
+
+        [Test]
+        public void Test_223_17()
+        {
+        }
+
+        [Test]
+        public void Test_223_18()
+        {
+        }
+
+        [Test]
+        public void Test_223_19()
+        {
+        }
+
+        [Test]
+        public void Test_223_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_224
+    {
+        #region PassingTests
+        [Test]
+        public void Test_224_01()
+        {
+        }
+
+        [Test]
+        public void Test_224_02()
+        {
+        }
+
+        [Test]
+        public void Test_224_03()
+        {
+        }
+
+        [Test]
+        public void Test_224_04()
+        {
+        }
+
+        [Test]
+        public void Test_224_05()
+        {
+        }
+
+        [Test]
+        public void Test_224_06()
+        {
+        }
+
+        [Test]
+        public void Test_224_07()
+        {
+        }
+
+        [Test]
+        public void Test_224_08()
+        {
+        }
+
+        [Test]
+        public void Test_224_09()
+        {
+        }
+
+        [Test]
+        public void Test_224_10()
+        {
+        }
+
+        [Test]
+        public void Test_224_11()
+        {
+        }
+
+        [Test]
+        public void Test_224_12()
+        {
+        }
+
+        [Test]
+        public void Test_224_13()
+        {
+        }
+
+        [Test]
+        public void Test_224_14()
+        {
+        }
+
+        [Test]
+        public void Test_224_15()
+        {
+        }
+
+        [Test]
+        public void Test_224_16()
+        {
+        }
+
+        [Test]
+        public void Test_224_17()
+        {
+        }
+
+        [Test]
+        public void Test_224_18()
+        {
+        }
+
+        [Test]
+        public void Test_224_19()
+        {
+        }
+
+        [Test]
+        public void Test_224_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_225
+    {
+        #region PassingTests
+        [Test]
+        public void Test_225_01()
+        {
+        }
+
+        [Test]
+        public void Test_225_02()
+        {
+        }
+
+        [Test]
+        public void Test_225_03()
+        {
+        }
+
+        [Test]
+        public void Test_225_04()
+        {
+        }
+
+        [Test]
+        public void Test_225_05()
+        {
+        }
+
+        [Test]
+        public void Test_225_06()
+        {
+        }
+
+        [Test]
+        public void Test_225_07()
+        {
+        }
+
+        [Test]
+        public void Test_225_08()
+        {
+        }
+
+        [Test]
+        public void Test_225_09()
+        {
+        }
+
+        [Test]
+        public void Test_225_10()
+        {
+        }
+
+        [Test]
+        public void Test_225_11()
+        {
+        }
+
+        [Test]
+        public void Test_225_12()
+        {
+        }
+
+        [Test]
+        public void Test_225_13()
+        {
+        }
+
+        [Test]
+        public void Test_225_14()
+        {
+        }
+
+        [Test]
+        public void Test_225_15()
+        {
+        }
+
+        [Test]
+        public void Test_225_16()
+        {
+        }
+
+        [Test]
+        public void Test_225_17()
+        {
+        }
+
+        [Test]
+        public void Test_225_18()
+        {
+        }
+
+        [Test]
+        public void Test_225_19()
+        {
+        }
+
+        [Test]
+        public void Test_225_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_226
+    {
+        #region PassingTests
+        [Test]
+        public void Test_226_01()
+        {
+        }
+
+        [Test]
+        public void Test_226_02()
+        {
+        }
+
+        [Test]
+        public void Test_226_03()
+        {
+        }
+
+        [Test]
+        public void Test_226_04()
+        {
+        }
+
+        [Test]
+        public void Test_226_05()
+        {
+        }
+
+        [Test]
+        public void Test_226_06()
+        {
+        }
+
+        [Test]
+        public void Test_226_07()
+        {
+        }
+
+        [Test]
+        public void Test_226_08()
+        {
+        }
+
+        [Test]
+        public void Test_226_09()
+        {
+        }
+
+        [Test]
+        public void Test_226_10()
+        {
+        }
+
+        [Test]
+        public void Test_226_11()
+        {
+        }
+
+        [Test]
+        public void Test_226_12()
+        {
+        }
+
+        [Test]
+        public void Test_226_13()
+        {
+        }
+
+        [Test]
+        public void Test_226_14()
+        {
+        }
+
+        [Test]
+        public void Test_226_15()
+        {
+        }
+
+        [Test]
+        public void Test_226_16()
+        {
+        }
+
+        [Test]
+        public void Test_226_17()
+        {
+        }
+
+        [Test]
+        public void Test_226_18()
+        {
+        }
+
+        [Test]
+        public void Test_226_19()
+        {
+        }
+
+        [Test]
+        public void Test_226_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_227
+    {
+        #region PassingTests
+        [Test]
+        public void Test_227_01()
+        {
+        }
+
+        [Test]
+        public void Test_227_02()
+        {
+        }
+
+        [Test]
+        public void Test_227_03()
+        {
+        }
+
+        [Test]
+        public void Test_227_04()
+        {
+        }
+
+        [Test]
+        public void Test_227_05()
+        {
+        }
+
+        [Test]
+        public void Test_227_06()
+        {
+        }
+
+        [Test]
+        public void Test_227_07()
+        {
+        }
+
+        [Test]
+        public void Test_227_08()
+        {
+        }
+
+        [Test]
+        public void Test_227_09()
+        {
+        }
+
+        [Test]
+        public void Test_227_10()
+        {
+        }
+
+        [Test]
+        public void Test_227_11()
+        {
+        }
+
+        [Test]
+        public void Test_227_12()
+        {
+        }
+
+        [Test]
+        public void Test_227_13()
+        {
+        }
+
+        [Test]
+        public void Test_227_14()
+        {
+        }
+
+        [Test]
+        public void Test_227_15()
+        {
+        }
+
+        [Test]
+        public void Test_227_16()
+        {
+        }
+
+        [Test]
+        public void Test_227_17()
+        {
+        }
+
+        [Test]
+        public void Test_227_18()
+        {
+        }
+
+        [Test]
+        public void Test_227_19()
+        {
+        }
+
+        [Test]
+        public void Test_227_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_228
+    {
+        #region PassingTests
+        [Test]
+        public void Test_228_01()
+        {
+        }
+
+        [Test]
+        public void Test_228_02()
+        {
+        }
+
+        [Test]
+        public void Test_228_03()
+        {
+        }
+
+        [Test]
+        public void Test_228_04()
+        {
+        }
+
+        [Test]
+        public void Test_228_05()
+        {
+        }
+
+        [Test]
+        public void Test_228_06()
+        {
+        }
+
+        [Test]
+        public void Test_228_07()
+        {
+        }
+
+        [Test]
+        public void Test_228_08()
+        {
+        }
+
+        [Test]
+        public void Test_228_09()
+        {
+        }
+
+        [Test]
+        public void Test_228_10()
+        {
+        }
+
+        [Test]
+        public void Test_228_11()
+        {
+        }
+
+        [Test]
+        public void Test_228_12()
+        {
+        }
+
+        [Test]
+        public void Test_228_13()
+        {
+        }
+
+        [Test]
+        public void Test_228_14()
+        {
+        }
+
+        [Test]
+        public void Test_228_15()
+        {
+        }
+
+        [Test]
+        public void Test_228_16()
+        {
+        }
+
+        [Test]
+        public void Test_228_17()
+        {
+        }
+
+        [Test]
+        public void Test_228_18()
+        {
+        }
+
+        [Test]
+        public void Test_228_19()
+        {
+        }
+
+        [Test]
+        public void Test_228_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_229
+    {
+        #region PassingTests
+        [Test]
+        public void Test_229_01()
+        {
+        }
+
+        [Test]
+        public void Test_229_02()
+        {
+        }
+
+        [Test]
+        public void Test_229_03()
+        {
+        }
+
+        [Test]
+        public void Test_229_04()
+        {
+        }
+
+        [Test]
+        public void Test_229_05()
+        {
+        }
+
+        [Test]
+        public void Test_229_06()
+        {
+        }
+
+        [Test]
+        public void Test_229_07()
+        {
+        }
+
+        [Test]
+        public void Test_229_08()
+        {
+        }
+
+        [Test]
+        public void Test_229_09()
+        {
+        }
+
+        [Test]
+        public void Test_229_10()
+        {
+        }
+
+        [Test]
+        public void Test_229_11()
+        {
+        }
+
+        [Test]
+        public void Test_229_12()
+        {
+        }
+
+        [Test]
+        public void Test_229_13()
+        {
+        }
+
+        [Test]
+        public void Test_229_14()
+        {
+        }
+
+        [Test]
+        public void Test_229_15()
+        {
+        }
+
+        [Test]
+        public void Test_229_16()
+        {
+        }
+
+        [Test]
+        public void Test_229_17()
+        {
+        }
+
+        [Test]
+        public void Test_229_18()
+        {
+        }
+
+        [Test]
+        public void Test_229_19()
+        {
+        }
+
+        [Test]
+        public void Test_229_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_230
+    {
+        #region PassingTests
+        [Test]
+        public void Test_230_01()
+        {
+        }
+
+        [Test]
+        public void Test_230_02()
+        {
+        }
+
+        [Test]
+        public void Test_230_03()
+        {
+        }
+
+        [Test]
+        public void Test_230_04()
+        {
+        }
+
+        [Test]
+        public void Test_230_05()
+        {
+        }
+
+        [Test]
+        public void Test_230_06()
+        {
+        }
+
+        [Test]
+        public void Test_230_07()
+        {
+        }
+
+        [Test]
+        public void Test_230_08()
+        {
+        }
+
+        [Test]
+        public void Test_230_09()
+        {
+        }
+
+        [Test]
+        public void Test_230_10()
+        {
+        }
+
+        [Test]
+        public void Test_230_11()
+        {
+        }
+
+        [Test]
+        public void Test_230_12()
+        {
+        }
+
+        [Test]
+        public void Test_230_13()
+        {
+        }
+
+        [Test]
+        public void Test_230_14()
+        {
+        }
+
+        [Test]
+        public void Test_230_15()
+        {
+        }
+
+        [Test]
+        public void Test_230_16()
+        {
+        }
+
+        [Test]
+        public void Test_230_17()
+        {
+        }
+
+        [Test]
+        public void Test_230_18()
+        {
+        }
+
+        [Test]
+        public void Test_230_19()
+        {
+        }
+
+        [Test]
+        public void Test_230_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_231
+    {
+        #region PassingTests
+        [Test]
+        public void Test_231_01()
+        {
+        }
+
+        [Test]
+        public void Test_231_02()
+        {
+        }
+
+        [Test]
+        public void Test_231_03()
+        {
+        }
+
+        [Test]
+        public void Test_231_04()
+        {
+        }
+
+        [Test]
+        public void Test_231_05()
+        {
+        }
+
+        [Test]
+        public void Test_231_06()
+        {
+        }
+
+        [Test]
+        public void Test_231_07()
+        {
+        }
+
+        [Test]
+        public void Test_231_08()
+        {
+        }
+
+        [Test]
+        public void Test_231_09()
+        {
+        }
+
+        [Test]
+        public void Test_231_10()
+        {
+        }
+
+        [Test]
+        public void Test_231_11()
+        {
+        }
+
+        [Test]
+        public void Test_231_12()
+        {
+        }
+
+        [Test]
+        public void Test_231_13()
+        {
+        }
+
+        [Test]
+        public void Test_231_14()
+        {
+        }
+
+        [Test]
+        public void Test_231_15()
+        {
+        }
+
+        [Test]
+        public void Test_231_16()
+        {
+        }
+
+        [Test]
+        public void Test_231_17()
+        {
+        }
+
+        [Test]
+        public void Test_231_18()
+        {
+        }
+
+        [Test]
+        public void Test_231_19()
+        {
+        }
+
+        [Test]
+        public void Test_231_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_232
+    {
+        #region PassingTests
+        [Test]
+        public void Test_232_01()
+        {
+        }
+
+        [Test]
+        public void Test_232_02()
+        {
+        }
+
+        [Test]
+        public void Test_232_03()
+        {
+        }
+
+        [Test]
+        public void Test_232_04()
+        {
+        }
+
+        [Test]
+        public void Test_232_05()
+        {
+        }
+
+        [Test]
+        public void Test_232_06()
+        {
+        }
+
+        [Test]
+        public void Test_232_07()
+        {
+        }
+
+        [Test]
+        public void Test_232_08()
+        {
+        }
+
+        [Test]
+        public void Test_232_09()
+        {
+        }
+
+        [Test]
+        public void Test_232_10()
+        {
+        }
+
+        [Test]
+        public void Test_232_11()
+        {
+        }
+
+        [Test]
+        public void Test_232_12()
+        {
+        }
+
+        [Test]
+        public void Test_232_13()
+        {
+        }
+
+        [Test]
+        public void Test_232_14()
+        {
+        }
+
+        [Test]
+        public void Test_232_15()
+        {
+        }
+
+        [Test]
+        public void Test_232_16()
+        {
+        }
+
+        [Test]
+        public void Test_232_17()
+        {
+        }
+
+        [Test]
+        public void Test_232_18()
+        {
+        }
+
+        [Test]
+        public void Test_232_19()
+        {
+        }
+
+        [Test]
+        public void Test_232_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_233
+    {
+        #region PassingTests
+        [Test]
+        public void Test_233_01()
+        {
+        }
+
+        [Test]
+        public void Test_233_02()
+        {
+        }
+
+        [Test]
+        public void Test_233_03()
+        {
+        }
+
+        [Test]
+        public void Test_233_04()
+        {
+        }
+
+        [Test]
+        public void Test_233_05()
+        {
+        }
+
+        [Test]
+        public void Test_233_06()
+        {
+        }
+
+        [Test]
+        public void Test_233_07()
+        {
+        }
+
+        [Test]
+        public void Test_233_08()
+        {
+        }
+
+        [Test]
+        public void Test_233_09()
+        {
+        }
+
+        [Test]
+        public void Test_233_10()
+        {
+        }
+
+        [Test]
+        public void Test_233_11()
+        {
+        }
+
+        [Test]
+        public void Test_233_12()
+        {
+        }
+
+        [Test]
+        public void Test_233_13()
+        {
+        }
+
+        [Test]
+        public void Test_233_14()
+        {
+        }
+
+        [Test]
+        public void Test_233_15()
+        {
+        }
+
+        [Test]
+        public void Test_233_16()
+        {
+        }
+
+        [Test]
+        public void Test_233_17()
+        {
+        }
+
+        [Test]
+        public void Test_233_18()
+        {
+        }
+
+        [Test]
+        public void Test_233_19()
+        {
+        }
+
+        [Test]
+        public void Test_233_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_234
+    {
+        #region PassingTests
+        [Test]
+        public void Test_234_01()
+        {
+        }
+
+        [Test]
+        public void Test_234_02()
+        {
+        }
+
+        [Test]
+        public void Test_234_03()
+        {
+        }
+
+        [Test]
+        public void Test_234_04()
+        {
+        }
+
+        [Test]
+        public void Test_234_05()
+        {
+        }
+
+        [Test]
+        public void Test_234_06()
+        {
+        }
+
+        [Test]
+        public void Test_234_07()
+        {
+        }
+
+        [Test]
+        public void Test_234_08()
+        {
+        }
+
+        [Test]
+        public void Test_234_09()
+        {
+        }
+
+        [Test]
+        public void Test_234_10()
+        {
+        }
+
+        [Test]
+        public void Test_234_11()
+        {
+        }
+
+        [Test]
+        public void Test_234_12()
+        {
+        }
+
+        [Test]
+        public void Test_234_13()
+        {
+        }
+
+        [Test]
+        public void Test_234_14()
+        {
+        }
+
+        [Test]
+        public void Test_234_15()
+        {
+        }
+
+        [Test]
+        public void Test_234_16()
+        {
+        }
+
+        [Test]
+        public void Test_234_17()
+        {
+        }
+
+        [Test]
+        public void Test_234_18()
+        {
+        }
+
+        [Test]
+        public void Test_234_19()
+        {
+        }
+
+        [Test]
+        public void Test_234_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_235
+    {
+        #region PassingTests
+        [Test]
+        public void Test_235_01()
+        {
+        }
+
+        [Test]
+        public void Test_235_02()
+        {
+        }
+
+        [Test]
+        public void Test_235_03()
+        {
+        }
+
+        [Test]
+        public void Test_235_04()
+        {
+        }
+
+        [Test]
+        public void Test_235_05()
+        {
+        }
+
+        [Test]
+        public void Test_235_06()
+        {
+        }
+
+        [Test]
+        public void Test_235_07()
+        {
+        }
+
+        [Test]
+        public void Test_235_08()
+        {
+        }
+
+        [Test]
+        public void Test_235_09()
+        {
+        }
+
+        [Test]
+        public void Test_235_10()
+        {
+        }
+
+        [Test]
+        public void Test_235_11()
+        {
+        }
+
+        [Test]
+        public void Test_235_12()
+        {
+        }
+
+        [Test]
+        public void Test_235_13()
+        {
+        }
+
+        [Test]
+        public void Test_235_14()
+        {
+        }
+
+        [Test]
+        public void Test_235_15()
+        {
+        }
+
+        [Test]
+        public void Test_235_16()
+        {
+        }
+
+        [Test]
+        public void Test_235_17()
+        {
+        }
+
+        [Test]
+        public void Test_235_18()
+        {
+        }
+
+        [Test]
+        public void Test_235_19()
+        {
+        }
+
+        [Test]
+        public void Test_235_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_236
+    {
+        #region PassingTests
+        [Test]
+        public void Test_236_01()
+        {
+        }
+
+        [Test]
+        public void Test_236_02()
+        {
+        }
+
+        [Test]
+        public void Test_236_03()
+        {
+        }
+
+        [Test]
+        public void Test_236_04()
+        {
+        }
+
+        [Test]
+        public void Test_236_05()
+        {
+        }
+
+        [Test]
+        public void Test_236_06()
+        {
+        }
+
+        [Test]
+        public void Test_236_07()
+        {
+        }
+
+        [Test]
+        public void Test_236_08()
+        {
+        }
+
+        [Test]
+        public void Test_236_09()
+        {
+        }
+
+        [Test]
+        public void Test_236_10()
+        {
+        }
+
+        [Test]
+        public void Test_236_11()
+        {
+        }
+
+        [Test]
+        public void Test_236_12()
+        {
+        }
+
+        [Test]
+        public void Test_236_13()
+        {
+        }
+
+        [Test]
+        public void Test_236_14()
+        {
+        }
+
+        [Test]
+        public void Test_236_15()
+        {
+        }
+
+        [Test]
+        public void Test_236_16()
+        {
+        }
+
+        [Test]
+        public void Test_236_17()
+        {
+        }
+
+        [Test]
+        public void Test_236_18()
+        {
+        }
+
+        [Test]
+        public void Test_236_19()
+        {
+        }
+
+        [Test]
+        public void Test_236_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_237
+    {
+        #region PassingTests
+        [Test]
+        public void Test_237_01()
+        {
+        }
+
+        [Test]
+        public void Test_237_02()
+        {
+        }
+
+        [Test]
+        public void Test_237_03()
+        {
+        }
+
+        [Test]
+        public void Test_237_04()
+        {
+        }
+
+        [Test]
+        public void Test_237_05()
+        {
+        }
+
+        [Test]
+        public void Test_237_06()
+        {
+        }
+
+        [Test]
+        public void Test_237_07()
+        {
+        }
+
+        [Test]
+        public void Test_237_08()
+        {
+        }
+
+        [Test]
+        public void Test_237_09()
+        {
+        }
+
+        [Test]
+        public void Test_237_10()
+        {
+        }
+
+        [Test]
+        public void Test_237_11()
+        {
+        }
+
+        [Test]
+        public void Test_237_12()
+        {
+        }
+
+        [Test]
+        public void Test_237_13()
+        {
+        }
+
+        [Test]
+        public void Test_237_14()
+        {
+        }
+
+        [Test]
+        public void Test_237_15()
+        {
+        }
+
+        [Test]
+        public void Test_237_16()
+        {
+        }
+
+        [Test]
+        public void Test_237_17()
+        {
+        }
+
+        [Test]
+        public void Test_237_18()
+        {
+        }
+
+        [Test]
+        public void Test_237_19()
+        {
+        }
+
+        [Test]
+        public void Test_237_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_238
+    {
+        #region PassingTests
+        [Test]
+        public void Test_238_01()
+        {
+        }
+
+        [Test]
+        public void Test_238_02()
+        {
+        }
+
+        [Test]
+        public void Test_238_03()
+        {
+        }
+
+        [Test]
+        public void Test_238_04()
+        {
+        }
+
+        [Test]
+        public void Test_238_05()
+        {
+        }
+
+        [Test]
+        public void Test_238_06()
+        {
+        }
+
+        [Test]
+        public void Test_238_07()
+        {
+        }
+
+        [Test]
+        public void Test_238_08()
+        {
+        }
+
+        [Test]
+        public void Test_238_09()
+        {
+        }
+
+        [Test]
+        public void Test_238_10()
+        {
+        }
+
+        [Test]
+        public void Test_238_11()
+        {
+        }
+
+        [Test]
+        public void Test_238_12()
+        {
+        }
+
+        [Test]
+        public void Test_238_13()
+        {
+        }
+
+        [Test]
+        public void Test_238_14()
+        {
+        }
+
+        [Test]
+        public void Test_238_15()
+        {
+        }
+
+        [Test]
+        public void Test_238_16()
+        {
+        }
+
+        [Test]
+        public void Test_238_17()
+        {
+        }
+
+        [Test]
+        public void Test_238_18()
+        {
+        }
+
+        [Test]
+        public void Test_238_19()
+        {
+        }
+
+        [Test]
+        public void Test_238_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_239
+    {
+        #region PassingTests
+        [Test]
+        public void Test_239_01()
+        {
+        }
+
+        [Test]
+        public void Test_239_02()
+        {
+        }
+
+        [Test]
+        public void Test_239_03()
+        {
+        }
+
+        [Test]
+        public void Test_239_04()
+        {
+        }
+
+        [Test]
+        public void Test_239_05()
+        {
+        }
+
+        [Test]
+        public void Test_239_06()
+        {
+        }
+
+        [Test]
+        public void Test_239_07()
+        {
+        }
+
+        [Test]
+        public void Test_239_08()
+        {
+        }
+
+        [Test]
+        public void Test_239_09()
+        {
+        }
+
+        [Test]
+        public void Test_239_10()
+        {
+        }
+
+        [Test]
+        public void Test_239_11()
+        {
+        }
+
+        [Test]
+        public void Test_239_12()
+        {
+        }
+
+        [Test]
+        public void Test_239_13()
+        {
+        }
+
+        [Test]
+        public void Test_239_14()
+        {
+        }
+
+        [Test]
+        public void Test_239_15()
+        {
+        }
+
+        [Test]
+        public void Test_239_16()
+        {
+        }
+
+        [Test]
+        public void Test_239_17()
+        {
+        }
+
+        [Test]
+        public void Test_239_18()
+        {
+        }
+
+        [Test]
+        public void Test_239_19()
+        {
+        }
+
+        [Test]
+        public void Test_239_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_240
+    {
+        #region PassingTests
+        [Test]
+        public void Test_240_01()
+        {
+        }
+
+        [Test]
+        public void Test_240_02()
+        {
+        }
+
+        [Test]
+        public void Test_240_03()
+        {
+        }
+
+        [Test]
+        public void Test_240_04()
+        {
+        }
+
+        [Test]
+        public void Test_240_05()
+        {
+        }
+
+        [Test]
+        public void Test_240_06()
+        {
+        }
+
+        [Test]
+        public void Test_240_07()
+        {
+        }
+
+        [Test]
+        public void Test_240_08()
+        {
+        }
+
+        [Test]
+        public void Test_240_09()
+        {
+        }
+
+        [Test]
+        public void Test_240_10()
+        {
+        }
+
+        [Test]
+        public void Test_240_11()
+        {
+        }
+
+        [Test]
+        public void Test_240_12()
+        {
+        }
+
+        [Test]
+        public void Test_240_13()
+        {
+        }
+
+        [Test]
+        public void Test_240_14()
+        {
+        }
+
+        [Test]
+        public void Test_240_15()
+        {
+        }
+
+        [Test]
+        public void Test_240_16()
+        {
+        }
+
+        [Test]
+        public void Test_240_17()
+        {
+        }
+
+        [Test]
+        public void Test_240_18()
+        {
+        }
+
+        [Test]
+        public void Test_240_19()
+        {
+        }
+
+        [Test]
+        public void Test_240_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_241
+    {
+        #region PassingTests
+        [Test]
+        public void Test_241_01()
+        {
+        }
+
+        [Test]
+        public void Test_241_02()
+        {
+        }
+
+        [Test]
+        public void Test_241_03()
+        {
+        }
+
+        [Test]
+        public void Test_241_04()
+        {
+        }
+
+        [Test]
+        public void Test_241_05()
+        {
+        }
+
+        [Test]
+        public void Test_241_06()
+        {
+        }
+
+        [Test]
+        public void Test_241_07()
+        {
+        }
+
+        [Test]
+        public void Test_241_08()
+        {
+        }
+
+        [Test]
+        public void Test_241_09()
+        {
+        }
+
+        [Test]
+        public void Test_241_10()
+        {
+        }
+
+        [Test]
+        public void Test_241_11()
+        {
+        }
+
+        [Test]
+        public void Test_241_12()
+        {
+        }
+
+        [Test]
+        public void Test_241_13()
+        {
+        }
+
+        [Test]
+        public void Test_241_14()
+        {
+        }
+
+        [Test]
+        public void Test_241_15()
+        {
+        }
+
+        [Test]
+        public void Test_241_16()
+        {
+        }
+
+        [Test]
+        public void Test_241_17()
+        {
+        }
+
+        [Test]
+        public void Test_241_18()
+        {
+        }
+
+        [Test]
+        public void Test_241_19()
+        {
+        }
+
+        [Test]
+        public void Test_241_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_242
+    {
+        #region PassingTests
+        [Test]
+        public void Test_242_01()
+        {
+        }
+
+        [Test]
+        public void Test_242_02()
+        {
+        }
+
+        [Test]
+        public void Test_242_03()
+        {
+        }
+
+        [Test]
+        public void Test_242_04()
+        {
+        }
+
+        [Test]
+        public void Test_242_05()
+        {
+        }
+
+        [Test]
+        public void Test_242_06()
+        {
+        }
+
+        [Test]
+        public void Test_242_07()
+        {
+        }
+
+        [Test]
+        public void Test_242_08()
+        {
+        }
+
+        [Test]
+        public void Test_242_09()
+        {
+        }
+
+        [Test]
+        public void Test_242_10()
+        {
+        }
+
+        [Test]
+        public void Test_242_11()
+        {
+        }
+
+        [Test]
+        public void Test_242_12()
+        {
+        }
+
+        [Test]
+        public void Test_242_13()
+        {
+        }
+
+        [Test]
+        public void Test_242_14()
+        {
+        }
+
+        [Test]
+        public void Test_242_15()
+        {
+        }
+
+        [Test]
+        public void Test_242_16()
+        {
+        }
+
+        [Test]
+        public void Test_242_17()
+        {
+        }
+
+        [Test]
+        public void Test_242_18()
+        {
+        }
+
+        [Test]
+        public void Test_242_19()
+        {
+        }
+
+        [Test]
+        public void Test_242_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_243
+    {
+        #region PassingTests
+        [Test]
+        public void Test_243_01()
+        {
+        }
+
+        [Test]
+        public void Test_243_02()
+        {
+        }
+
+        [Test]
+        public void Test_243_03()
+        {
+        }
+
+        [Test]
+        public void Test_243_04()
+        {
+        }
+
+        [Test]
+        public void Test_243_05()
+        {
+        }
+
+        [Test]
+        public void Test_243_06()
+        {
+        }
+
+        [Test]
+        public void Test_243_07()
+        {
+        }
+
+        [Test]
+        public void Test_243_08()
+        {
+        }
+
+        [Test]
+        public void Test_243_09()
+        {
+        }
+
+        [Test]
+        public void Test_243_10()
+        {
+        }
+
+        [Test]
+        public void Test_243_11()
+        {
+        }
+
+        [Test]
+        public void Test_243_12()
+        {
+        }
+
+        [Test]
+        public void Test_243_13()
+        {
+        }
+
+        [Test]
+        public void Test_243_14()
+        {
+        }
+
+        [Test]
+        public void Test_243_15()
+        {
+        }
+
+        [Test]
+        public void Test_243_16()
+        {
+        }
+
+        [Test]
+        public void Test_243_17()
+        {
+        }
+
+        [Test]
+        public void Test_243_18()
+        {
+        }
+
+        [Test]
+        public void Test_243_19()
+        {
+        }
+
+        [Test]
+        public void Test_243_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_244
+    {
+        #region PassingTests
+        [Test]
+        public void Test_244_01()
+        {
+        }
+
+        [Test]
+        public void Test_244_02()
+        {
+        }
+
+        [Test]
+        public void Test_244_03()
+        {
+        }
+
+        [Test]
+        public void Test_244_04()
+        {
+        }
+
+        [Test]
+        public void Test_244_05()
+        {
+        }
+
+        [Test]
+        public void Test_244_06()
+        {
+        }
+
+        [Test]
+        public void Test_244_07()
+        {
+        }
+
+        [Test]
+        public void Test_244_08()
+        {
+        }
+
+        [Test]
+        public void Test_244_09()
+        {
+        }
+
+        [Test]
+        public void Test_244_10()
+        {
+        }
+
+        [Test]
+        public void Test_244_11()
+        {
+        }
+
+        [Test]
+        public void Test_244_12()
+        {
+        }
+
+        [Test]
+        public void Test_244_13()
+        {
+        }
+
+        [Test]
+        public void Test_244_14()
+        {
+        }
+
+        [Test]
+        public void Test_244_15()
+        {
+        }
+
+        [Test]
+        public void Test_244_16()
+        {
+        }
+
+        [Test]
+        public void Test_244_17()
+        {
+        }
+
+        [Test]
+        public void Test_244_18()
+        {
+        }
+
+        [Test]
+        public void Test_244_19()
+        {
+        }
+
+        [Test]
+        public void Test_244_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_245
+    {
+        #region PassingTests
+        [Test]
+        public void Test_245_01()
+        {
+        }
+
+        [Test]
+        public void Test_245_02()
+        {
+        }
+
+        [Test]
+        public void Test_245_03()
+        {
+        }
+
+        [Test]
+        public void Test_245_04()
+        {
+        }
+
+        [Test]
+        public void Test_245_05()
+        {
+        }
+
+        [Test]
+        public void Test_245_06()
+        {
+        }
+
+        [Test]
+        public void Test_245_07()
+        {
+        }
+
+        [Test]
+        public void Test_245_08()
+        {
+        }
+
+        [Test]
+        public void Test_245_09()
+        {
+        }
+
+        [Test]
+        public void Test_245_10()
+        {
+        }
+
+        [Test]
+        public void Test_245_11()
+        {
+        }
+
+        [Test]
+        public void Test_245_12()
+        {
+        }
+
+        [Test]
+        public void Test_245_13()
+        {
+        }
+
+        [Test]
+        public void Test_245_14()
+        {
+        }
+
+        [Test]
+        public void Test_245_15()
+        {
+        }
+
+        [Test]
+        public void Test_245_16()
+        {
+        }
+
+        [Test]
+        public void Test_245_17()
+        {
+        }
+
+        [Test]
+        public void Test_245_18()
+        {
+        }
+
+        [Test]
+        public void Test_245_19()
+        {
+        }
+
+        [Test]
+        public void Test_245_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_246
+    {
+        #region PassingTests
+        [Test]
+        public void Test_246_01()
+        {
+        }
+
+        [Test]
+        public void Test_246_02()
+        {
+        }
+
+        [Test]
+        public void Test_246_03()
+        {
+        }
+
+        [Test]
+        public void Test_246_04()
+        {
+        }
+
+        [Test]
+        public void Test_246_05()
+        {
+        }
+
+        [Test]
+        public void Test_246_06()
+        {
+        }
+
+        [Test]
+        public void Test_246_07()
+        {
+        }
+
+        [Test]
+        public void Test_246_08()
+        {
+        }
+
+        [Test]
+        public void Test_246_09()
+        {
+        }
+
+        [Test]
+        public void Test_246_10()
+        {
+        }
+
+        [Test]
+        public void Test_246_11()
+        {
+        }
+
+        [Test]
+        public void Test_246_12()
+        {
+        }
+
+        [Test]
+        public void Test_246_13()
+        {
+        }
+
+        [Test]
+        public void Test_246_14()
+        {
+        }
+
+        [Test]
+        public void Test_246_15()
+        {
+        }
+
+        [Test]
+        public void Test_246_16()
+        {
+        }
+
+        [Test]
+        public void Test_246_17()
+        {
+        }
+
+        [Test]
+        public void Test_246_18()
+        {
+        }
+
+        [Test]
+        public void Test_246_19()
+        {
+        }
+
+        [Test]
+        public void Test_246_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_247
+    {
+        #region PassingTests
+        [Test]
+        public void Test_247_01()
+        {
+        }
+
+        [Test]
+        public void Test_247_02()
+        {
+        }
+
+        [Test]
+        public void Test_247_03()
+        {
+        }
+
+        [Test]
+        public void Test_247_04()
+        {
+        }
+
+        [Test]
+        public void Test_247_05()
+        {
+        }
+
+        [Test]
+        public void Test_247_06()
+        {
+        }
+
+        [Test]
+        public void Test_247_07()
+        {
+        }
+
+        [Test]
+        public void Test_247_08()
+        {
+        }
+
+        [Test]
+        public void Test_247_09()
+        {
+        }
+
+        [Test]
+        public void Test_247_10()
+        {
+        }
+
+        [Test]
+        public void Test_247_11()
+        {
+        }
+
+        [Test]
+        public void Test_247_12()
+        {
+        }
+
+        [Test]
+        public void Test_247_13()
+        {
+        }
+
+        [Test]
+        public void Test_247_14()
+        {
+        }
+
+        [Test]
+        public void Test_247_15()
+        {
+        }
+
+        [Test]
+        public void Test_247_16()
+        {
+        }
+
+        [Test]
+        public void Test_247_17()
+        {
+        }
+
+        [Test]
+        public void Test_247_18()
+        {
+        }
+
+        [Test]
+        public void Test_247_19()
+        {
+        }
+
+        [Test]
+        public void Test_247_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_248
+    {
+        #region PassingTests
+        [Test]
+        public void Test_248_01()
+        {
+        }
+
+        [Test]
+        public void Test_248_02()
+        {
+        }
+
+        [Test]
+        public void Test_248_03()
+        {
+        }
+
+        [Test]
+        public void Test_248_04()
+        {
+        }
+
+        [Test]
+        public void Test_248_05()
+        {
+        }
+
+        [Test]
+        public void Test_248_06()
+        {
+        }
+
+        [Test]
+        public void Test_248_07()
+        {
+        }
+
+        [Test]
+        public void Test_248_08()
+        {
+        }
+
+        [Test]
+        public void Test_248_09()
+        {
+        }
+
+        [Test]
+        public void Test_248_10()
+        {
+        }
+
+        [Test]
+        public void Test_248_11()
+        {
+        }
+
+        [Test]
+        public void Test_248_12()
+        {
+        }
+
+        [Test]
+        public void Test_248_13()
+        {
+        }
+
+        [Test]
+        public void Test_248_14()
+        {
+        }
+
+        [Test]
+        public void Test_248_15()
+        {
+        }
+
+        [Test]
+        public void Test_248_16()
+        {
+        }
+
+        [Test]
+        public void Test_248_17()
+        {
+        }
+
+        [Test]
+        public void Test_248_18()
+        {
+        }
+
+        [Test]
+        public void Test_248_19()
+        {
+        }
+
+        [Test]
+        public void Test_248_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_249
+    {
+        #region PassingTests
+        [Test]
+        public void Test_249_01()
+        {
+        }
+
+        [Test]
+        public void Test_249_02()
+        {
+        }
+
+        [Test]
+        public void Test_249_03()
+        {
+        }
+
+        [Test]
+        public void Test_249_04()
+        {
+        }
+
+        [Test]
+        public void Test_249_05()
+        {
+        }
+
+        [Test]
+        public void Test_249_06()
+        {
+        }
+
+        [Test]
+        public void Test_249_07()
+        {
+        }
+
+        [Test]
+        public void Test_249_08()
+        {
+        }
+
+        [Test]
+        public void Test_249_09()
+        {
+        }
+
+        [Test]
+        public void Test_249_10()
+        {
+        }
+
+        [Test]
+        public void Test_249_11()
+        {
+        }
+
+        [Test]
+        public void Test_249_12()
+        {
+        }
+
+        [Test]
+        public void Test_249_13()
+        {
+        }
+
+        [Test]
+        public void Test_249_14()
+        {
+        }
+
+        [Test]
+        public void Test_249_15()
+        {
+        }
+
+        [Test]
+        public void Test_249_16()
+        {
+        }
+
+        [Test]
+        public void Test_249_17()
+        {
+        }
+
+        [Test]
+        public void Test_249_18()
+        {
+        }
+
+        [Test]
+        public void Test_249_19()
+        {
+        }
+
+        [Test]
+        public void Test_249_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_250
+    {
+        #region PassingTests
+        [Test]
+        public void Test_250_01()
+        {
+        }
+
+        [Test]
+        public void Test_250_02()
+        {
+        }
+
+        [Test]
+        public void Test_250_03()
+        {
+        }
+
+        [Test]
+        public void Test_250_04()
+        {
+        }
+
+        [Test]
+        public void Test_250_05()
+        {
+        }
+
+        [Test]
+        public void Test_250_06()
+        {
+        }
+
+        [Test]
+        public void Test_250_07()
+        {
+        }
+
+        [Test]
+        public void Test_250_08()
+        {
+        }
+
+        [Test]
+        public void Test_250_09()
+        {
+        }
+
+        [Test]
+        public void Test_250_10()
+        {
+        }
+
+        [Test]
+        public void Test_250_11()
+        {
+        }
+
+        [Test]
+        public void Test_250_12()
+        {
+        }
+
+        [Test]
+        public void Test_250_13()
+        {
+        }
+
+        [Test]
+        public void Test_250_14()
+        {
+        }
+
+        [Test]
+        public void Test_250_15()
+        {
+        }
+
+        [Test]
+        public void Test_250_16()
+        {
+        }
+
+        [Test]
+        public void Test_250_17()
+        {
+        }
+
+        [Test]
+        public void Test_250_18()
+        {
+        }
+
+        [Test]
+        public void Test_250_19()
+        {
+        }
+
+        [Test]
+        public void Test_250_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_251
+    {
+        #region PassingTests
+        [Test]
+        public void Test_251_01()
+        {
+        }
+
+        [Test]
+        public void Test_251_02()
+        {
+        }
+
+        [Test]
+        public void Test_251_03()
+        {
+        }
+
+        [Test]
+        public void Test_251_04()
+        {
+        }
+
+        [Test]
+        public void Test_251_05()
+        {
+        }
+
+        [Test]
+        public void Test_251_06()
+        {
+        }
+
+        [Test]
+        public void Test_251_07()
+        {
+        }
+
+        [Test]
+        public void Test_251_08()
+        {
+        }
+
+        [Test]
+        public void Test_251_09()
+        {
+        }
+
+        [Test]
+        public void Test_251_10()
+        {
+        }
+
+        [Test]
+        public void Test_251_11()
+        {
+        }
+
+        [Test]
+        public void Test_251_12()
+        {
+        }
+
+        [Test]
+        public void Test_251_13()
+        {
+        }
+
+        [Test]
+        public void Test_251_14()
+        {
+        }
+
+        [Test]
+        public void Test_251_15()
+        {
+        }
+
+        [Test]
+        public void Test_251_16()
+        {
+        }
+
+        [Test]
+        public void Test_251_17()
+        {
+        }
+
+        [Test]
+        public void Test_251_18()
+        {
+        }
+
+        [Test]
+        public void Test_251_19()
+        {
+        }
+
+        [Test]
+        public void Test_251_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_252
+    {
+        #region PassingTests
+        [Test]
+        public void Test_252_01()
+        {
+        }
+
+        [Test]
+        public void Test_252_02()
+        {
+        }
+
+        [Test]
+        public void Test_252_03()
+        {
+        }
+
+        [Test]
+        public void Test_252_04()
+        {
+        }
+
+        [Test]
+        public void Test_252_05()
+        {
+        }
+
+        [Test]
+        public void Test_252_06()
+        {
+        }
+
+        [Test]
+        public void Test_252_07()
+        {
+        }
+
+        [Test]
+        public void Test_252_08()
+        {
+        }
+
+        [Test]
+        public void Test_252_09()
+        {
+        }
+
+        [Test]
+        public void Test_252_10()
+        {
+        }
+
+        [Test]
+        public void Test_252_11()
+        {
+        }
+
+        [Test]
+        public void Test_252_12()
+        {
+        }
+
+        [Test]
+        public void Test_252_13()
+        {
+        }
+
+        [Test]
+        public void Test_252_14()
+        {
+        }
+
+        [Test]
+        public void Test_252_15()
+        {
+        }
+
+        [Test]
+        public void Test_252_16()
+        {
+        }
+
+        [Test]
+        public void Test_252_17()
+        {
+        }
+
+        [Test]
+        public void Test_252_18()
+        {
+        }
+
+        [Test]
+        public void Test_252_19()
+        {
+        }
+
+        [Test]
+        public void Test_252_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_253
+    {
+        #region PassingTests
+        [Test]
+        public void Test_253_01()
+        {
+        }
+
+        [Test]
+        public void Test_253_02()
+        {
+        }
+
+        [Test]
+        public void Test_253_03()
+        {
+        }
+
+        [Test]
+        public void Test_253_04()
+        {
+        }
+
+        [Test]
+        public void Test_253_05()
+        {
+        }
+
+        [Test]
+        public void Test_253_06()
+        {
+        }
+
+        [Test]
+        public void Test_253_07()
+        {
+        }
+
+        [Test]
+        public void Test_253_08()
+        {
+        }
+
+        [Test]
+        public void Test_253_09()
+        {
+        }
+
+        [Test]
+        public void Test_253_10()
+        {
+        }
+
+        [Test]
+        public void Test_253_11()
+        {
+        }
+
+        [Test]
+        public void Test_253_12()
+        {
+        }
+
+        [Test]
+        public void Test_253_13()
+        {
+        }
+
+        [Test]
+        public void Test_253_14()
+        {
+        }
+
+        [Test]
+        public void Test_253_15()
+        {
+        }
+
+        [Test]
+        public void Test_253_16()
+        {
+        }
+
+        [Test]
+        public void Test_253_17()
+        {
+        }
+
+        [Test]
+        public void Test_253_18()
+        {
+        }
+
+        [Test]
+        public void Test_253_19()
+        {
+        }
+
+        [Test]
+        public void Test_253_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_254
+    {
+        #region PassingTests
+        [Test]
+        public void Test_254_01()
+        {
+        }
+
+        [Test]
+        public void Test_254_02()
+        {
+        }
+
+        [Test]
+        public void Test_254_03()
+        {
+        }
+
+        [Test]
+        public void Test_254_04()
+        {
+        }
+
+        [Test]
+        public void Test_254_05()
+        {
+        }
+
+        [Test]
+        public void Test_254_06()
+        {
+        }
+
+        [Test]
+        public void Test_254_07()
+        {
+        }
+
+        [Test]
+        public void Test_254_08()
+        {
+        }
+
+        [Test]
+        public void Test_254_09()
+        {
+        }
+
+        [Test]
+        public void Test_254_10()
+        {
+        }
+
+        [Test]
+        public void Test_254_11()
+        {
+        }
+
+        [Test]
+        public void Test_254_12()
+        {
+        }
+
+        [Test]
+        public void Test_254_13()
+        {
+        }
+
+        [Test]
+        public void Test_254_14()
+        {
+        }
+
+        [Test]
+        public void Test_254_15()
+        {
+        }
+
+        [Test]
+        public void Test_254_16()
+        {
+        }
+
+        [Test]
+        public void Test_254_17()
+        {
+        }
+
+        [Test]
+        public void Test_254_18()
+        {
+        }
+
+        [Test]
+        public void Test_254_19()
+        {
+        }
+
+        [Test]
+        public void Test_254_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_255
+    {
+        #region PassingTests
+        [Test]
+        public void Test_255_01()
+        {
+        }
+
+        [Test]
+        public void Test_255_02()
+        {
+        }
+
+        [Test]
+        public void Test_255_03()
+        {
+        }
+
+        [Test]
+        public void Test_255_04()
+        {
+        }
+
+        [Test]
+        public void Test_255_05()
+        {
+        }
+
+        [Test]
+        public void Test_255_06()
+        {
+        }
+
+        [Test]
+        public void Test_255_07()
+        {
+        }
+
+        [Test]
+        public void Test_255_08()
+        {
+        }
+
+        [Test]
+        public void Test_255_09()
+        {
+        }
+
+        [Test]
+        public void Test_255_10()
+        {
+        }
+
+        [Test]
+        public void Test_255_11()
+        {
+        }
+
+        [Test]
+        public void Test_255_12()
+        {
+        }
+
+        [Test]
+        public void Test_255_13()
+        {
+        }
+
+        [Test]
+        public void Test_255_14()
+        {
+        }
+
+        [Test]
+        public void Test_255_15()
+        {
+        }
+
+        [Test]
+        public void Test_255_16()
+        {
+        }
+
+        [Test]
+        public void Test_255_17()
+        {
+        }
+
+        [Test]
+        public void Test_255_18()
+        {
+        }
+
+        [Test]
+        public void Test_255_19()
+        {
+        }
+
+        [Test]
+        public void Test_255_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_256
+    {
+        #region PassingTests
+        [Test]
+        public void Test_256_01()
+        {
+        }
+
+        [Test]
+        public void Test_256_02()
+        {
+        }
+
+        [Test]
+        public void Test_256_03()
+        {
+        }
+
+        [Test]
+        public void Test_256_04()
+        {
+        }
+
+        [Test]
+        public void Test_256_05()
+        {
+        }
+
+        [Test]
+        public void Test_256_06()
+        {
+        }
+
+        [Test]
+        public void Test_256_07()
+        {
+        }
+
+        [Test]
+        public void Test_256_08()
+        {
+        }
+
+        [Test]
+        public void Test_256_09()
+        {
+        }
+
+        [Test]
+        public void Test_256_10()
+        {
+        }
+
+        [Test]
+        public void Test_256_11()
+        {
+        }
+
+        [Test]
+        public void Test_256_12()
+        {
+        }
+
+        [Test]
+        public void Test_256_13()
+        {
+        }
+
+        [Test]
+        public void Test_256_14()
+        {
+        }
+
+        [Test]
+        public void Test_256_15()
+        {
+        }
+
+        [Test]
+        public void Test_256_16()
+        {
+        }
+
+        [Test]
+        public void Test_256_17()
+        {
+        }
+
+        [Test]
+        public void Test_256_18()
+        {
+        }
+
+        [Test]
+        public void Test_256_19()
+        {
+        }
+
+        [Test]
+        public void Test_256_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_257
+    {
+        #region PassingTests
+        [Test]
+        public void Test_257_01()
+        {
+        }
+
+        [Test]
+        public void Test_257_02()
+        {
+        }
+
+        [Test]
+        public void Test_257_03()
+        {
+        }
+
+        [Test]
+        public void Test_257_04()
+        {
+        }
+
+        [Test]
+        public void Test_257_05()
+        {
+        }
+
+        [Test]
+        public void Test_257_06()
+        {
+        }
+
+        [Test]
+        public void Test_257_07()
+        {
+        }
+
+        [Test]
+        public void Test_257_08()
+        {
+        }
+
+        [Test]
+        public void Test_257_09()
+        {
+        }
+
+        [Test]
+        public void Test_257_10()
+        {
+        }
+
+        [Test]
+        public void Test_257_11()
+        {
+        }
+
+        [Test]
+        public void Test_257_12()
+        {
+        }
+
+        [Test]
+        public void Test_257_13()
+        {
+        }
+
+        [Test]
+        public void Test_257_14()
+        {
+        }
+
+        [Test]
+        public void Test_257_15()
+        {
+        }
+
+        [Test]
+        public void Test_257_16()
+        {
+        }
+
+        [Test]
+        public void Test_257_17()
+        {
+        }
+
+        [Test]
+        public void Test_257_18()
+        {
+        }
+
+        [Test]
+        public void Test_257_19()
+        {
+        }
+
+        [Test]
+        public void Test_257_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_258
+    {
+        #region PassingTests
+        [Test]
+        public void Test_258_01()
+        {
+        }
+
+        [Test]
+        public void Test_258_02()
+        {
+        }
+
+        [Test]
+        public void Test_258_03()
+        {
+        }
+
+        [Test]
+        public void Test_258_04()
+        {
+        }
+
+        [Test]
+        public void Test_258_05()
+        {
+        }
+
+        [Test]
+        public void Test_258_06()
+        {
+        }
+
+        [Test]
+        public void Test_258_07()
+        {
+        }
+
+        [Test]
+        public void Test_258_08()
+        {
+        }
+
+        [Test]
+        public void Test_258_09()
+        {
+        }
+
+        [Test]
+        public void Test_258_10()
+        {
+        }
+
+        [Test]
+        public void Test_258_11()
+        {
+        }
+
+        [Test]
+        public void Test_258_12()
+        {
+        }
+
+        [Test]
+        public void Test_258_13()
+        {
+        }
+
+        [Test]
+        public void Test_258_14()
+        {
+        }
+
+        [Test]
+        public void Test_258_15()
+        {
+        }
+
+        [Test]
+        public void Test_258_16()
+        {
+        }
+
+        [Test]
+        public void Test_258_17()
+        {
+        }
+
+        [Test]
+        public void Test_258_18()
+        {
+        }
+
+        [Test]
+        public void Test_258_19()
+        {
+        }
+
+        [Test]
+        public void Test_258_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_259
+    {
+        #region PassingTests
+        [Test]
+        public void Test_259_01()
+        {
+        }
+
+        [Test]
+        public void Test_259_02()
+        {
+        }
+
+        [Test]
+        public void Test_259_03()
+        {
+        }
+
+        [Test]
+        public void Test_259_04()
+        {
+        }
+
+        [Test]
+        public void Test_259_05()
+        {
+        }
+
+        [Test]
+        public void Test_259_06()
+        {
+        }
+
+        [Test]
+        public void Test_259_07()
+        {
+        }
+
+        [Test]
+        public void Test_259_08()
+        {
+        }
+
+        [Test]
+        public void Test_259_09()
+        {
+        }
+
+        [Test]
+        public void Test_259_10()
+        {
+        }
+
+        [Test]
+        public void Test_259_11()
+        {
+        }
+
+        [Test]
+        public void Test_259_12()
+        {
+        }
+
+        [Test]
+        public void Test_259_13()
+        {
+        }
+
+        [Test]
+        public void Test_259_14()
+        {
+        }
+
+        [Test]
+        public void Test_259_15()
+        {
+        }
+
+        [Test]
+        public void Test_259_16()
+        {
+        }
+
+        [Test]
+        public void Test_259_17()
+        {
+        }
+
+        [Test]
+        public void Test_259_18()
+        {
+        }
+
+        [Test]
+        public void Test_259_19()
+        {
+        }
+
+        [Test]
+        public void Test_259_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_260
+    {
+        #region PassingTests
+        [Test]
+        public void Test_260_01()
+        {
+        }
+
+        [Test]
+        public void Test_260_02()
+        {
+        }
+
+        [Test]
+        public void Test_260_03()
+        {
+        }
+
+        [Test]
+        public void Test_260_04()
+        {
+        }
+
+        [Test]
+        public void Test_260_05()
+        {
+        }
+
+        [Test]
+        public void Test_260_06()
+        {
+        }
+
+        [Test]
+        public void Test_260_07()
+        {
+        }
+
+        [Test]
+        public void Test_260_08()
+        {
+        }
+
+        [Test]
+        public void Test_260_09()
+        {
+        }
+
+        [Test]
+        public void Test_260_10()
+        {
+        }
+
+        [Test]
+        public void Test_260_11()
+        {
+        }
+
+        [Test]
+        public void Test_260_12()
+        {
+        }
+
+        [Test]
+        public void Test_260_13()
+        {
+        }
+
+        [Test]
+        public void Test_260_14()
+        {
+        }
+
+        [Test]
+        public void Test_260_15()
+        {
+        }
+
+        [Test]
+        public void Test_260_16()
+        {
+        }
+
+        [Test]
+        public void Test_260_17()
+        {
+        }
+
+        [Test]
+        public void Test_260_18()
+        {
+        }
+
+        [Test]
+        public void Test_260_19()
+        {
+        }
+
+        [Test]
+        public void Test_260_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_261
+    {
+        #region PassingTests
+        [Test]
+        public void Test_261_01()
+        {
+        }
+
+        [Test]
+        public void Test_261_02()
+        {
+        }
+
+        [Test]
+        public void Test_261_03()
+        {
+        }
+
+        [Test]
+        public void Test_261_04()
+        {
+        }
+
+        [Test]
+        public void Test_261_05()
+        {
+        }
+
+        [Test]
+        public void Test_261_06()
+        {
+        }
+
+        [Test]
+        public void Test_261_07()
+        {
+        }
+
+        [Test]
+        public void Test_261_08()
+        {
+        }
+
+        [Test]
+        public void Test_261_09()
+        {
+        }
+
+        [Test]
+        public void Test_261_10()
+        {
+        }
+
+        [Test]
+        public void Test_261_11()
+        {
+        }
+
+        [Test]
+        public void Test_261_12()
+        {
+        }
+
+        [Test]
+        public void Test_261_13()
+        {
+        }
+
+        [Test]
+        public void Test_261_14()
+        {
+        }
+
+        [Test]
+        public void Test_261_15()
+        {
+        }
+
+        [Test]
+        public void Test_261_16()
+        {
+        }
+
+        [Test]
+        public void Test_261_17()
+        {
+        }
+
+        [Test]
+        public void Test_261_18()
+        {
+        }
+
+        [Test]
+        public void Test_261_19()
+        {
+        }
+
+        [Test]
+        public void Test_261_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_262
+    {
+        #region PassingTests
+        [Test]
+        public void Test_262_01()
+        {
+        }
+
+        [Test]
+        public void Test_262_02()
+        {
+        }
+
+        [Test]
+        public void Test_262_03()
+        {
+        }
+
+        [Test]
+        public void Test_262_04()
+        {
+        }
+
+        [Test]
+        public void Test_262_05()
+        {
+        }
+
+        [Test]
+        public void Test_262_06()
+        {
+        }
+
+        [Test]
+        public void Test_262_07()
+        {
+        }
+
+        [Test]
+        public void Test_262_08()
+        {
+        }
+
+        [Test]
+        public void Test_262_09()
+        {
+        }
+
+        [Test]
+        public void Test_262_10()
+        {
+        }
+
+        [Test]
+        public void Test_262_11()
+        {
+        }
+
+        [Test]
+        public void Test_262_12()
+        {
+        }
+
+        [Test]
+        public void Test_262_13()
+        {
+        }
+
+        [Test]
+        public void Test_262_14()
+        {
+        }
+
+        [Test]
+        public void Test_262_15()
+        {
+        }
+
+        [Test]
+        public void Test_262_16()
+        {
+        }
+
+        [Test]
+        public void Test_262_17()
+        {
+        }
+
+        [Test]
+        public void Test_262_18()
+        {
+        }
+
+        [Test]
+        public void Test_262_19()
+        {
+        }
+
+        [Test]
+        public void Test_262_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_263
+    {
+        #region PassingTests
+        [Test]
+        public void Test_263_01()
+        {
+        }
+
+        [Test]
+        public void Test_263_02()
+        {
+        }
+
+        [Test]
+        public void Test_263_03()
+        {
+        }
+
+        [Test]
+        public void Test_263_04()
+        {
+        }
+
+        [Test]
+        public void Test_263_05()
+        {
+        }
+
+        [Test]
+        public void Test_263_06()
+        {
+        }
+
+        [Test]
+        public void Test_263_07()
+        {
+        }
+
+        [Test]
+        public void Test_263_08()
+        {
+        }
+
+        [Test]
+        public void Test_263_09()
+        {
+        }
+
+        [Test]
+        public void Test_263_10()
+        {
+        }
+
+        [Test]
+        public void Test_263_11()
+        {
+        }
+
+        [Test]
+        public void Test_263_12()
+        {
+        }
+
+        [Test]
+        public void Test_263_13()
+        {
+        }
+
+        [Test]
+        public void Test_263_14()
+        {
+        }
+
+        [Test]
+        public void Test_263_15()
+        {
+        }
+
+        [Test]
+        public void Test_263_16()
+        {
+        }
+
+        [Test]
+        public void Test_263_17()
+        {
+        }
+
+        [Test]
+        public void Test_263_18()
+        {
+        }
+
+        [Test]
+        public void Test_263_19()
+        {
+        }
+
+        [Test]
+        public void Test_263_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_264
+    {
+        #region PassingTests
+        [Test]
+        public void Test_264_01()
+        {
+        }
+
+        [Test]
+        public void Test_264_02()
+        {
+        }
+
+        [Test]
+        public void Test_264_03()
+        {
+        }
+
+        [Test]
+        public void Test_264_04()
+        {
+        }
+
+        [Test]
+        public void Test_264_05()
+        {
+        }
+
+        [Test]
+        public void Test_264_06()
+        {
+        }
+
+        [Test]
+        public void Test_264_07()
+        {
+        }
+
+        [Test]
+        public void Test_264_08()
+        {
+        }
+
+        [Test]
+        public void Test_264_09()
+        {
+        }
+
+        [Test]
+        public void Test_264_10()
+        {
+        }
+
+        [Test]
+        public void Test_264_11()
+        {
+        }
+
+        [Test]
+        public void Test_264_12()
+        {
+        }
+
+        [Test]
+        public void Test_264_13()
+        {
+        }
+
+        [Test]
+        public void Test_264_14()
+        {
+        }
+
+        [Test]
+        public void Test_264_15()
+        {
+        }
+
+        [Test]
+        public void Test_264_16()
+        {
+        }
+
+        [Test]
+        public void Test_264_17()
+        {
+        }
+
+        [Test]
+        public void Test_264_18()
+        {
+        }
+
+        [Test]
+        public void Test_264_19()
+        {
+        }
+
+        [Test]
+        public void Test_264_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_265
+    {
+        #region PassingTests
+        [Test]
+        public void Test_265_01()
+        {
+        }
+
+        [Test]
+        public void Test_265_02()
+        {
+        }
+
+        [Test]
+        public void Test_265_03()
+        {
+        }
+
+        [Test]
+        public void Test_265_04()
+        {
+        }
+
+        [Test]
+        public void Test_265_05()
+        {
+        }
+
+        [Test]
+        public void Test_265_06()
+        {
+        }
+
+        [Test]
+        public void Test_265_07()
+        {
+        }
+
+        [Test]
+        public void Test_265_08()
+        {
+        }
+
+        [Test]
+        public void Test_265_09()
+        {
+        }
+
+        [Test]
+        public void Test_265_10()
+        {
+        }
+
+        [Test]
+        public void Test_265_11()
+        {
+        }
+
+        [Test]
+        public void Test_265_12()
+        {
+        }
+
+        [Test]
+        public void Test_265_13()
+        {
+        }
+
+        [Test]
+        public void Test_265_14()
+        {
+        }
+
+        [Test]
+        public void Test_265_15()
+        {
+        }
+
+        [Test]
+        public void Test_265_16()
+        {
+        }
+
+        [Test]
+        public void Test_265_17()
+        {
+        }
+
+        [Test]
+        public void Test_265_18()
+        {
+        }
+
+        [Test]
+        public void Test_265_19()
+        {
+        }
+
+        [Test]
+        public void Test_265_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_266
+    {
+        #region PassingTests
+        [Test]
+        public void Test_266_01()
+        {
+        }
+
+        [Test]
+        public void Test_266_02()
+        {
+        }
+
+        [Test]
+        public void Test_266_03()
+        {
+        }
+
+        [Test]
+        public void Test_266_04()
+        {
+        }
+
+        [Test]
+        public void Test_266_05()
+        {
+        }
+
+        [Test]
+        public void Test_266_06()
+        {
+        }
+
+        [Test]
+        public void Test_266_07()
+        {
+        }
+
+        [Test]
+        public void Test_266_08()
+        {
+        }
+
+        [Test]
+        public void Test_266_09()
+        {
+        }
+
+        [Test]
+        public void Test_266_10()
+        {
+        }
+
+        [Test]
+        public void Test_266_11()
+        {
+        }
+
+        [Test]
+        public void Test_266_12()
+        {
+        }
+
+        [Test]
+        public void Test_266_13()
+        {
+        }
+
+        [Test]
+        public void Test_266_14()
+        {
+        }
+
+        [Test]
+        public void Test_266_15()
+        {
+        }
+
+        [Test]
+        public void Test_266_16()
+        {
+        }
+
+        [Test]
+        public void Test_266_17()
+        {
+        }
+
+        [Test]
+        public void Test_266_18()
+        {
+        }
+
+        [Test]
+        public void Test_266_19()
+        {
+        }
+
+        [Test]
+        public void Test_266_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_267
+    {
+        #region PassingTests
+        [Test]
+        public void Test_267_01()
+        {
+        }
+
+        [Test]
+        public void Test_267_02()
+        {
+        }
+
+        [Test]
+        public void Test_267_03()
+        {
+        }
+
+        [Test]
+        public void Test_267_04()
+        {
+        }
+
+        [Test]
+        public void Test_267_05()
+        {
+        }
+
+        [Test]
+        public void Test_267_06()
+        {
+        }
+
+        [Test]
+        public void Test_267_07()
+        {
+        }
+
+        [Test]
+        public void Test_267_08()
+        {
+        }
+
+        [Test]
+        public void Test_267_09()
+        {
+        }
+
+        [Test]
+        public void Test_267_10()
+        {
+        }
+
+        [Test]
+        public void Test_267_11()
+        {
+        }
+
+        [Test]
+        public void Test_267_12()
+        {
+        }
+
+        [Test]
+        public void Test_267_13()
+        {
+        }
+
+        [Test]
+        public void Test_267_14()
+        {
+        }
+
+        [Test]
+        public void Test_267_15()
+        {
+        }
+
+        [Test]
+        public void Test_267_16()
+        {
+        }
+
+        [Test]
+        public void Test_267_17()
+        {
+        }
+
+        [Test]
+        public void Test_267_18()
+        {
+        }
+
+        [Test]
+        public void Test_267_19()
+        {
+        }
+
+        [Test]
+        public void Test_267_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_268
+    {
+        #region PassingTests
+        [Test]
+        public void Test_268_01()
+        {
+        }
+
+        [Test]
+        public void Test_268_02()
+        {
+        }
+
+        [Test]
+        public void Test_268_03()
+        {
+        }
+
+        [Test]
+        public void Test_268_04()
+        {
+        }
+
+        [Test]
+        public void Test_268_05()
+        {
+        }
+
+        [Test]
+        public void Test_268_06()
+        {
+        }
+
+        [Test]
+        public void Test_268_07()
+        {
+        }
+
+        [Test]
+        public void Test_268_08()
+        {
+        }
+
+        [Test]
+        public void Test_268_09()
+        {
+        }
+
+        [Test]
+        public void Test_268_10()
+        {
+        }
+
+        [Test]
+        public void Test_268_11()
+        {
+        }
+
+        [Test]
+        public void Test_268_12()
+        {
+        }
+
+        [Test]
+        public void Test_268_13()
+        {
+        }
+
+        [Test]
+        public void Test_268_14()
+        {
+        }
+
+        [Test]
+        public void Test_268_15()
+        {
+        }
+
+        [Test]
+        public void Test_268_16()
+        {
+        }
+
+        [Test]
+        public void Test_268_17()
+        {
+        }
+
+        [Test]
+        public void Test_268_18()
+        {
+        }
+
+        [Test]
+        public void Test_268_19()
+        {
+        }
+
+        [Test]
+        public void Test_268_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_269
+    {
+        #region PassingTests
+        [Test]
+        public void Test_269_01()
+        {
+        }
+
+        [Test]
+        public void Test_269_02()
+        {
+        }
+
+        [Test]
+        public void Test_269_03()
+        {
+        }
+
+        [Test]
+        public void Test_269_04()
+        {
+        }
+
+        [Test]
+        public void Test_269_05()
+        {
+        }
+
+        [Test]
+        public void Test_269_06()
+        {
+        }
+
+        [Test]
+        public void Test_269_07()
+        {
+        }
+
+        [Test]
+        public void Test_269_08()
+        {
+        }
+
+        [Test]
+        public void Test_269_09()
+        {
+        }
+
+        [Test]
+        public void Test_269_10()
+        {
+        }
+
+        [Test]
+        public void Test_269_11()
+        {
+        }
+
+        [Test]
+        public void Test_269_12()
+        {
+        }
+
+        [Test]
+        public void Test_269_13()
+        {
+        }
+
+        [Test]
+        public void Test_269_14()
+        {
+        }
+
+        [Test]
+        public void Test_269_15()
+        {
+        }
+
+        [Test]
+        public void Test_269_16()
+        {
+        }
+
+        [Test]
+        public void Test_269_17()
+        {
+        }
+
+        [Test]
+        public void Test_269_18()
+        {
+        }
+
+        [Test]
+        public void Test_269_19()
+        {
+        }
+
+        [Test]
+        public void Test_269_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_270
+    {
+        #region PassingTests
+        [Test]
+        public void Test_270_01()
+        {
+        }
+
+        [Test]
+        public void Test_270_02()
+        {
+        }
+
+        [Test]
+        public void Test_270_03()
+        {
+        }
+
+        [Test]
+        public void Test_270_04()
+        {
+        }
+
+        [Test]
+        public void Test_270_05()
+        {
+        }
+
+        [Test]
+        public void Test_270_06()
+        {
+        }
+
+        [Test]
+        public void Test_270_07()
+        {
+        }
+
+        [Test]
+        public void Test_270_08()
+        {
+        }
+
+        [Test]
+        public void Test_270_09()
+        {
+        }
+
+        [Test]
+        public void Test_270_10()
+        {
+        }
+
+        [Test]
+        public void Test_270_11()
+        {
+        }
+
+        [Test]
+        public void Test_270_12()
+        {
+        }
+
+        [Test]
+        public void Test_270_13()
+        {
+        }
+
+        [Test]
+        public void Test_270_14()
+        {
+        }
+
+        [Test]
+        public void Test_270_15()
+        {
+        }
+
+        [Test]
+        public void Test_270_16()
+        {
+        }
+
+        [Test]
+        public void Test_270_17()
+        {
+        }
+
+        [Test]
+        public void Test_270_18()
+        {
+        }
+
+        [Test]
+        public void Test_270_19()
+        {
+        }
+
+        [Test]
+        public void Test_270_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_271
+    {
+        #region PassingTests
+        [Test]
+        public void Test_271_01()
+        {
+        }
+
+        [Test]
+        public void Test_271_02()
+        {
+        }
+
+        [Test]
+        public void Test_271_03()
+        {
+        }
+
+        [Test]
+        public void Test_271_04()
+        {
+        }
+
+        [Test]
+        public void Test_271_05()
+        {
+        }
+
+        [Test]
+        public void Test_271_06()
+        {
+        }
+
+        [Test]
+        public void Test_271_07()
+        {
+        }
+
+        [Test]
+        public void Test_271_08()
+        {
+        }
+
+        [Test]
+        public void Test_271_09()
+        {
+        }
+
+        [Test]
+        public void Test_271_10()
+        {
+        }
+
+        [Test]
+        public void Test_271_11()
+        {
+        }
+
+        [Test]
+        public void Test_271_12()
+        {
+        }
+
+        [Test]
+        public void Test_271_13()
+        {
+        }
+
+        [Test]
+        public void Test_271_14()
+        {
+        }
+
+        [Test]
+        public void Test_271_15()
+        {
+        }
+
+        [Test]
+        public void Test_271_16()
+        {
+        }
+
+        [Test]
+        public void Test_271_17()
+        {
+        }
+
+        [Test]
+        public void Test_271_18()
+        {
+        }
+
+        [Test]
+        public void Test_271_19()
+        {
+        }
+
+        [Test]
+        public void Test_271_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_272
+    {
+        #region PassingTests
+        [Test]
+        public void Test_272_01()
+        {
+        }
+
+        [Test]
+        public void Test_272_02()
+        {
+        }
+
+        [Test]
+        public void Test_272_03()
+        {
+        }
+
+        [Test]
+        public void Test_272_04()
+        {
+        }
+
+        [Test]
+        public void Test_272_05()
+        {
+        }
+
+        [Test]
+        public void Test_272_06()
+        {
+        }
+
+        [Test]
+        public void Test_272_07()
+        {
+        }
+
+        [Test]
+        public void Test_272_08()
+        {
+        }
+
+        [Test]
+        public void Test_272_09()
+        {
+        }
+
+        [Test]
+        public void Test_272_10()
+        {
+        }
+
+        [Test]
+        public void Test_272_11()
+        {
+        }
+
+        [Test]
+        public void Test_272_12()
+        {
+        }
+
+        [Test]
+        public void Test_272_13()
+        {
+        }
+
+        [Test]
+        public void Test_272_14()
+        {
+        }
+
+        [Test]
+        public void Test_272_15()
+        {
+        }
+
+        [Test]
+        public void Test_272_16()
+        {
+        }
+
+        [Test]
+        public void Test_272_17()
+        {
+        }
+
+        [Test]
+        public void Test_272_18()
+        {
+        }
+
+        [Test]
+        public void Test_272_19()
+        {
+        }
+
+        [Test]
+        public void Test_272_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_273
+    {
+        #region PassingTests
+        [Test]
+        public void Test_273_01()
+        {
+        }
+
+        [Test]
+        public void Test_273_02()
+        {
+        }
+
+        [Test]
+        public void Test_273_03()
+        {
+        }
+
+        [Test]
+        public void Test_273_04()
+        {
+        }
+
+        [Test]
+        public void Test_273_05()
+        {
+        }
+
+        [Test]
+        public void Test_273_06()
+        {
+        }
+
+        [Test]
+        public void Test_273_07()
+        {
+        }
+
+        [Test]
+        public void Test_273_08()
+        {
+        }
+
+        [Test]
+        public void Test_273_09()
+        {
+        }
+
+        [Test]
+        public void Test_273_10()
+        {
+        }
+
+        [Test]
+        public void Test_273_11()
+        {
+        }
+
+        [Test]
+        public void Test_273_12()
+        {
+        }
+
+        [Test]
+        public void Test_273_13()
+        {
+        }
+
+        [Test]
+        public void Test_273_14()
+        {
+        }
+
+        [Test]
+        public void Test_273_15()
+        {
+        }
+
+        [Test]
+        public void Test_273_16()
+        {
+        }
+
+        [Test]
+        public void Test_273_17()
+        {
+        }
+
+        [Test]
+        public void Test_273_18()
+        {
+        }
+
+        [Test]
+        public void Test_273_19()
+        {
+        }
+
+        [Test]
+        public void Test_273_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_274
+    {
+        #region PassingTests
+        [Test]
+        public void Test_274_01()
+        {
+        }
+
+        [Test]
+        public void Test_274_02()
+        {
+        }
+
+        [Test]
+        public void Test_274_03()
+        {
+        }
+
+        [Test]
+        public void Test_274_04()
+        {
+        }
+
+        [Test]
+        public void Test_274_05()
+        {
+        }
+
+        [Test]
+        public void Test_274_06()
+        {
+        }
+
+        [Test]
+        public void Test_274_07()
+        {
+        }
+
+        [Test]
+        public void Test_274_08()
+        {
+        }
+
+        [Test]
+        public void Test_274_09()
+        {
+        }
+
+        [Test]
+        public void Test_274_10()
+        {
+        }
+
+        [Test]
+        public void Test_274_11()
+        {
+        }
+
+        [Test]
+        public void Test_274_12()
+        {
+        }
+
+        [Test]
+        public void Test_274_13()
+        {
+        }
+
+        [Test]
+        public void Test_274_14()
+        {
+        }
+
+        [Test]
+        public void Test_274_15()
+        {
+        }
+
+        [Test]
+        public void Test_274_16()
+        {
+        }
+
+        [Test]
+        public void Test_274_17()
+        {
+        }
+
+        [Test]
+        public void Test_274_18()
+        {
+        }
+
+        [Test]
+        public void Test_274_19()
+        {
+        }
+
+        [Test]
+        public void Test_274_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_275
+    {
+        #region PassingTests
+        [Test]
+        public void Test_275_01()
+        {
+        }
+
+        [Test]
+        public void Test_275_02()
+        {
+        }
+
+        [Test]
+        public void Test_275_03()
+        {
+        }
+
+        [Test]
+        public void Test_275_04()
+        {
+        }
+
+        [Test]
+        public void Test_275_05()
+        {
+        }
+
+        [Test]
+        public void Test_275_06()
+        {
+        }
+
+        [Test]
+        public void Test_275_07()
+        {
+        }
+
+        [Test]
+        public void Test_275_08()
+        {
+        }
+
+        [Test]
+        public void Test_275_09()
+        {
+        }
+
+        [Test]
+        public void Test_275_10()
+        {
+        }
+
+        [Test]
+        public void Test_275_11()
+        {
+        }
+
+        [Test]
+        public void Test_275_12()
+        {
+        }
+
+        [Test]
+        public void Test_275_13()
+        {
+        }
+
+        [Test]
+        public void Test_275_14()
+        {
+        }
+
+        [Test]
+        public void Test_275_15()
+        {
+        }
+
+        [Test]
+        public void Test_275_16()
+        {
+        }
+
+        [Test]
+        public void Test_275_17()
+        {
+        }
+
+        [Test]
+        public void Test_275_18()
+        {
+        }
+
+        [Test]
+        public void Test_275_19()
+        {
+        }
+
+        [Test]
+        public void Test_275_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_276
+    {
+        #region PassingTests
+        [Test]
+        public void Test_276_01()
+        {
+        }
+
+        [Test]
+        public void Test_276_02()
+        {
+        }
+
+        [Test]
+        public void Test_276_03()
+        {
+        }
+
+        [Test]
+        public void Test_276_04()
+        {
+        }
+
+        [Test]
+        public void Test_276_05()
+        {
+        }
+
+        [Test]
+        public void Test_276_06()
+        {
+        }
+
+        [Test]
+        public void Test_276_07()
+        {
+        }
+
+        [Test]
+        public void Test_276_08()
+        {
+        }
+
+        [Test]
+        public void Test_276_09()
+        {
+        }
+
+        [Test]
+        public void Test_276_10()
+        {
+        }
+
+        [Test]
+        public void Test_276_11()
+        {
+        }
+
+        [Test]
+        public void Test_276_12()
+        {
+        }
+
+        [Test]
+        public void Test_276_13()
+        {
+        }
+
+        [Test]
+        public void Test_276_14()
+        {
+        }
+
+        [Test]
+        public void Test_276_15()
+        {
+        }
+
+        [Test]
+        public void Test_276_16()
+        {
+        }
+
+        [Test]
+        public void Test_276_17()
+        {
+        }
+
+        [Test]
+        public void Test_276_18()
+        {
+        }
+
+        [Test]
+        public void Test_276_19()
+        {
+        }
+
+        [Test]
+        public void Test_276_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_277
+    {
+        #region PassingTests
+        [Test]
+        public void Test_277_01()
+        {
+        }
+
+        [Test]
+        public void Test_277_02()
+        {
+        }
+
+        [Test]
+        public void Test_277_03()
+        {
+        }
+
+        [Test]
+        public void Test_277_04()
+        {
+        }
+
+        [Test]
+        public void Test_277_05()
+        {
+        }
+
+        [Test]
+        public void Test_277_06()
+        {
+        }
+
+        [Test]
+        public void Test_277_07()
+        {
+        }
+
+        [Test]
+        public void Test_277_08()
+        {
+        }
+
+        [Test]
+        public void Test_277_09()
+        {
+        }
+
+        [Test]
+        public void Test_277_10()
+        {
+        }
+
+        [Test]
+        public void Test_277_11()
+        {
+        }
+
+        [Test]
+        public void Test_277_12()
+        {
+        }
+
+        [Test]
+        public void Test_277_13()
+        {
+        }
+
+        [Test]
+        public void Test_277_14()
+        {
+        }
+
+        [Test]
+        public void Test_277_15()
+        {
+        }
+
+        [Test]
+        public void Test_277_16()
+        {
+        }
+
+        [Test]
+        public void Test_277_17()
+        {
+        }
+
+        [Test]
+        public void Test_277_18()
+        {
+        }
+
+        [Test]
+        public void Test_277_19()
+        {
+        }
+
+        [Test]
+        public void Test_277_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_278
+    {
+        #region PassingTests
+        [Test]
+        public void Test_278_01()
+        {
+        }
+
+        [Test]
+        public void Test_278_02()
+        {
+        }
+
+        [Test]
+        public void Test_278_03()
+        {
+        }
+
+        [Test]
+        public void Test_278_04()
+        {
+        }
+
+        [Test]
+        public void Test_278_05()
+        {
+        }
+
+        [Test]
+        public void Test_278_06()
+        {
+        }
+
+        [Test]
+        public void Test_278_07()
+        {
+        }
+
+        [Test]
+        public void Test_278_08()
+        {
+        }
+
+        [Test]
+        public void Test_278_09()
+        {
+        }
+
+        [Test]
+        public void Test_278_10()
+        {
+        }
+
+        [Test]
+        public void Test_278_11()
+        {
+        }
+
+        [Test]
+        public void Test_278_12()
+        {
+        }
+
+        [Test]
+        public void Test_278_13()
+        {
+        }
+
+        [Test]
+        public void Test_278_14()
+        {
+        }
+
+        [Test]
+        public void Test_278_15()
+        {
+        }
+
+        [Test]
+        public void Test_278_16()
+        {
+        }
+
+        [Test]
+        public void Test_278_17()
+        {
+        }
+
+        [Test]
+        public void Test_278_18()
+        {
+        }
+
+        [Test]
+        public void Test_278_19()
+        {
+        }
+
+        [Test]
+        public void Test_278_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_279
+    {
+        #region PassingTests
+        [Test]
+        public void Test_279_01()
+        {
+        }
+
+        [Test]
+        public void Test_279_02()
+        {
+        }
+
+        [Test]
+        public void Test_279_03()
+        {
+        }
+
+        [Test]
+        public void Test_279_04()
+        {
+        }
+
+        [Test]
+        public void Test_279_05()
+        {
+        }
+
+        [Test]
+        public void Test_279_06()
+        {
+        }
+
+        [Test]
+        public void Test_279_07()
+        {
+        }
+
+        [Test]
+        public void Test_279_08()
+        {
+        }
+
+        [Test]
+        public void Test_279_09()
+        {
+        }
+
+        [Test]
+        public void Test_279_10()
+        {
+        }
+
+        [Test]
+        public void Test_279_11()
+        {
+        }
+
+        [Test]
+        public void Test_279_12()
+        {
+        }
+
+        [Test]
+        public void Test_279_13()
+        {
+        }
+
+        [Test]
+        public void Test_279_14()
+        {
+        }
+
+        [Test]
+        public void Test_279_15()
+        {
+        }
+
+        [Test]
+        public void Test_279_16()
+        {
+        }
+
+        [Test]
+        public void Test_279_17()
+        {
+        }
+
+        [Test]
+        public void Test_279_18()
+        {
+        }
+
+        [Test]
+        public void Test_279_19()
+        {
+        }
+
+        [Test]
+        public void Test_279_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_280
+    {
+        #region PassingTests
+        [Test]
+        public void Test_280_01()
+        {
+        }
+
+        [Test]
+        public void Test_280_02()
+        {
+        }
+
+        [Test]
+        public void Test_280_03()
+        {
+        }
+
+        [Test]
+        public void Test_280_04()
+        {
+        }
+
+        [Test]
+        public void Test_280_05()
+        {
+        }
+
+        [Test]
+        public void Test_280_06()
+        {
+        }
+
+        [Test]
+        public void Test_280_07()
+        {
+        }
+
+        [Test]
+        public void Test_280_08()
+        {
+        }
+
+        [Test]
+        public void Test_280_09()
+        {
+        }
+
+        [Test]
+        public void Test_280_10()
+        {
+        }
+
+        [Test]
+        public void Test_280_11()
+        {
+        }
+
+        [Test]
+        public void Test_280_12()
+        {
+        }
+
+        [Test]
+        public void Test_280_13()
+        {
+        }
+
+        [Test]
+        public void Test_280_14()
+        {
+        }
+
+        [Test]
+        public void Test_280_15()
+        {
+        }
+
+        [Test]
+        public void Test_280_16()
+        {
+        }
+
+        [Test]
+        public void Test_280_17()
+        {
+        }
+
+        [Test]
+        public void Test_280_18()
+        {
+        }
+
+        [Test]
+        public void Test_280_19()
+        {
+        }
+
+        [Test]
+        public void Test_280_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_281
+    {
+        #region PassingTests
+        [Test]
+        public void Test_281_01()
+        {
+        }
+
+        [Test]
+        public void Test_281_02()
+        {
+        }
+
+        [Test]
+        public void Test_281_03()
+        {
+        }
+
+        [Test]
+        public void Test_281_04()
+        {
+        }
+
+        [Test]
+        public void Test_281_05()
+        {
+        }
+
+        [Test]
+        public void Test_281_06()
+        {
+        }
+
+        [Test]
+        public void Test_281_07()
+        {
+        }
+
+        [Test]
+        public void Test_281_08()
+        {
+        }
+
+        [Test]
+        public void Test_281_09()
+        {
+        }
+
+        [Test]
+        public void Test_281_10()
+        {
+        }
+
+        [Test]
+        public void Test_281_11()
+        {
+        }
+
+        [Test]
+        public void Test_281_12()
+        {
+        }
+
+        [Test]
+        public void Test_281_13()
+        {
+        }
+
+        [Test]
+        public void Test_281_14()
+        {
+        }
+
+        [Test]
+        public void Test_281_15()
+        {
+        }
+
+        [Test]
+        public void Test_281_16()
+        {
+        }
+
+        [Test]
+        public void Test_281_17()
+        {
+        }
+
+        [Test]
+        public void Test_281_18()
+        {
+        }
+
+        [Test]
+        public void Test_281_19()
+        {
+        }
+
+        [Test]
+        public void Test_281_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_282
+    {
+        #region PassingTests
+        [Test]
+        public void Test_282_01()
+        {
+        }
+
+        [Test]
+        public void Test_282_02()
+        {
+        }
+
+        [Test]
+        public void Test_282_03()
+        {
+        }
+
+        [Test]
+        public void Test_282_04()
+        {
+        }
+
+        [Test]
+        public void Test_282_05()
+        {
+        }
+
+        [Test]
+        public void Test_282_06()
+        {
+        }
+
+        [Test]
+        public void Test_282_07()
+        {
+        }
+
+        [Test]
+        public void Test_282_08()
+        {
+        }
+
+        [Test]
+        public void Test_282_09()
+        {
+        }
+
+        [Test]
+        public void Test_282_10()
+        {
+        }
+
+        [Test]
+        public void Test_282_11()
+        {
+        }
+
+        [Test]
+        public void Test_282_12()
+        {
+        }
+
+        [Test]
+        public void Test_282_13()
+        {
+        }
+
+        [Test]
+        public void Test_282_14()
+        {
+        }
+
+        [Test]
+        public void Test_282_15()
+        {
+        }
+
+        [Test]
+        public void Test_282_16()
+        {
+        }
+
+        [Test]
+        public void Test_282_17()
+        {
+        }
+
+        [Test]
+        public void Test_282_18()
+        {
+        }
+
+        [Test]
+        public void Test_282_19()
+        {
+        }
+
+        [Test]
+        public void Test_282_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_283
+    {
+        #region PassingTests
+        [Test]
+        public void Test_283_01()
+        {
+        }
+
+        [Test]
+        public void Test_283_02()
+        {
+        }
+
+        [Test]
+        public void Test_283_03()
+        {
+        }
+
+        [Test]
+        public void Test_283_04()
+        {
+        }
+
+        [Test]
+        public void Test_283_05()
+        {
+        }
+
+        [Test]
+        public void Test_283_06()
+        {
+        }
+
+        [Test]
+        public void Test_283_07()
+        {
+        }
+
+        [Test]
+        public void Test_283_08()
+        {
+        }
+
+        [Test]
+        public void Test_283_09()
+        {
+        }
+
+        [Test]
+        public void Test_283_10()
+        {
+        }
+
+        [Test]
+        public void Test_283_11()
+        {
+        }
+
+        [Test]
+        public void Test_283_12()
+        {
+        }
+
+        [Test]
+        public void Test_283_13()
+        {
+        }
+
+        [Test]
+        public void Test_283_14()
+        {
+        }
+
+        [Test]
+        public void Test_283_15()
+        {
+        }
+
+        [Test]
+        public void Test_283_16()
+        {
+        }
+
+        [Test]
+        public void Test_283_17()
+        {
+        }
+
+        [Test]
+        public void Test_283_18()
+        {
+        }
+
+        [Test]
+        public void Test_283_19()
+        {
+        }
+
+        [Test]
+        public void Test_283_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_284
+    {
+        #region PassingTests
+        [Test]
+        public void Test_284_01()
+        {
+        }
+
+        [Test]
+        public void Test_284_02()
+        {
+        }
+
+        [Test]
+        public void Test_284_03()
+        {
+        }
+
+        [Test]
+        public void Test_284_04()
+        {
+        }
+
+        [Test]
+        public void Test_284_05()
+        {
+        }
+
+        [Test]
+        public void Test_284_06()
+        {
+        }
+
+        [Test]
+        public void Test_284_07()
+        {
+        }
+
+        [Test]
+        public void Test_284_08()
+        {
+        }
+
+        [Test]
+        public void Test_284_09()
+        {
+        }
+
+        [Test]
+        public void Test_284_10()
+        {
+        }
+
+        [Test]
+        public void Test_284_11()
+        {
+        }
+
+        [Test]
+        public void Test_284_12()
+        {
+        }
+
+        [Test]
+        public void Test_284_13()
+        {
+        }
+
+        [Test]
+        public void Test_284_14()
+        {
+        }
+
+        [Test]
+        public void Test_284_15()
+        {
+        }
+
+        [Test]
+        public void Test_284_16()
+        {
+        }
+
+        [Test]
+        public void Test_284_17()
+        {
+        }
+
+        [Test]
+        public void Test_284_18()
+        {
+        }
+
+        [Test]
+        public void Test_284_19()
+        {
+        }
+
+        [Test]
+        public void Test_284_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_285
+    {
+        #region PassingTests
+        [Test]
+        public void Test_285_01()
+        {
+        }
+
+        [Test]
+        public void Test_285_02()
+        {
+        }
+
+        [Test]
+        public void Test_285_03()
+        {
+        }
+
+        [Test]
+        public void Test_285_04()
+        {
+        }
+
+        [Test]
+        public void Test_285_05()
+        {
+        }
+
+        [Test]
+        public void Test_285_06()
+        {
+        }
+
+        [Test]
+        public void Test_285_07()
+        {
+        }
+
+        [Test]
+        public void Test_285_08()
+        {
+        }
+
+        [Test]
+        public void Test_285_09()
+        {
+        }
+
+        [Test]
+        public void Test_285_10()
+        {
+        }
+
+        [Test]
+        public void Test_285_11()
+        {
+        }
+
+        [Test]
+        public void Test_285_12()
+        {
+        }
+
+        [Test]
+        public void Test_285_13()
+        {
+        }
+
+        [Test]
+        public void Test_285_14()
+        {
+        }
+
+        [Test]
+        public void Test_285_15()
+        {
+        }
+
+        [Test]
+        public void Test_285_16()
+        {
+        }
+
+        [Test]
+        public void Test_285_17()
+        {
+        }
+
+        [Test]
+        public void Test_285_18()
+        {
+        }
+
+        [Test]
+        public void Test_285_19()
+        {
+        }
+
+        [Test]
+        public void Test_285_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_286
+    {
+        #region PassingTests
+        [Test]
+        public void Test_286_01()
+        {
+        }
+
+        [Test]
+        public void Test_286_02()
+        {
+        }
+
+        [Test]
+        public void Test_286_03()
+        {
+        }
+
+        [Test]
+        public void Test_286_04()
+        {
+        }
+
+        [Test]
+        public void Test_286_05()
+        {
+        }
+
+        [Test]
+        public void Test_286_06()
+        {
+        }
+
+        [Test]
+        public void Test_286_07()
+        {
+        }
+
+        [Test]
+        public void Test_286_08()
+        {
+        }
+
+        [Test]
+        public void Test_286_09()
+        {
+        }
+
+        [Test]
+        public void Test_286_10()
+        {
+        }
+
+        [Test]
+        public void Test_286_11()
+        {
+        }
+
+        [Test]
+        public void Test_286_12()
+        {
+        }
+
+        [Test]
+        public void Test_286_13()
+        {
+        }
+
+        [Test]
+        public void Test_286_14()
+        {
+        }
+
+        [Test]
+        public void Test_286_15()
+        {
+        }
+
+        [Test]
+        public void Test_286_16()
+        {
+        }
+
+        [Test]
+        public void Test_286_17()
+        {
+        }
+
+        [Test]
+        public void Test_286_18()
+        {
+        }
+
+        [Test]
+        public void Test_286_19()
+        {
+        }
+
+        [Test]
+        public void Test_286_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_287
+    {
+        #region PassingTests
+        [Test]
+        public void Test_287_01()
+        {
+        }
+
+        [Test]
+        public void Test_287_02()
+        {
+        }
+
+        [Test]
+        public void Test_287_03()
+        {
+        }
+
+        [Test]
+        public void Test_287_04()
+        {
+        }
+
+        [Test]
+        public void Test_287_05()
+        {
+        }
+
+        [Test]
+        public void Test_287_06()
+        {
+        }
+
+        [Test]
+        public void Test_287_07()
+        {
+        }
+
+        [Test]
+        public void Test_287_08()
+        {
+        }
+
+        [Test]
+        public void Test_287_09()
+        {
+        }
+
+        [Test]
+        public void Test_287_10()
+        {
+        }
+
+        [Test]
+        public void Test_287_11()
+        {
+        }
+
+        [Test]
+        public void Test_287_12()
+        {
+        }
+
+        [Test]
+        public void Test_287_13()
+        {
+        }
+
+        [Test]
+        public void Test_287_14()
+        {
+        }
+
+        [Test]
+        public void Test_287_15()
+        {
+        }
+
+        [Test]
+        public void Test_287_16()
+        {
+        }
+
+        [Test]
+        public void Test_287_17()
+        {
+        }
+
+        [Test]
+        public void Test_287_18()
+        {
+        }
+
+        [Test]
+        public void Test_287_19()
+        {
+        }
+
+        [Test]
+        public void Test_287_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_288
+    {
+        #region PassingTests
+        [Test]
+        public void Test_288_01()
+        {
+        }
+
+        [Test]
+        public void Test_288_02()
+        {
+        }
+
+        [Test]
+        public void Test_288_03()
+        {
+        }
+
+        [Test]
+        public void Test_288_04()
+        {
+        }
+
+        [Test]
+        public void Test_288_05()
+        {
+        }
+
+        [Test]
+        public void Test_288_06()
+        {
+        }
+
+        [Test]
+        public void Test_288_07()
+        {
+        }
+
+        [Test]
+        public void Test_288_08()
+        {
+        }
+
+        [Test]
+        public void Test_288_09()
+        {
+        }
+
+        [Test]
+        public void Test_288_10()
+        {
+        }
+
+        [Test]
+        public void Test_288_11()
+        {
+        }
+
+        [Test]
+        public void Test_288_12()
+        {
+        }
+
+        [Test]
+        public void Test_288_13()
+        {
+        }
+
+        [Test]
+        public void Test_288_14()
+        {
+        }
+
+        [Test]
+        public void Test_288_15()
+        {
+        }
+
+        [Test]
+        public void Test_288_16()
+        {
+        }
+
+        [Test]
+        public void Test_288_17()
+        {
+        }
+
+        [Test]
+        public void Test_288_18()
+        {
+        }
+
+        [Test]
+        public void Test_288_19()
+        {
+        }
+
+        [Test]
+        public void Test_288_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_289
+    {
+        #region PassingTests
+        [Test]
+        public void Test_289_01()
+        {
+        }
+
+        [Test]
+        public void Test_289_02()
+        {
+        }
+
+        [Test]
+        public void Test_289_03()
+        {
+        }
+
+        [Test]
+        public void Test_289_04()
+        {
+        }
+
+        [Test]
+        public void Test_289_05()
+        {
+        }
+
+        [Test]
+        public void Test_289_06()
+        {
+        }
+
+        [Test]
+        public void Test_289_07()
+        {
+        }
+
+        [Test]
+        public void Test_289_08()
+        {
+        }
+
+        [Test]
+        public void Test_289_09()
+        {
+        }
+
+        [Test]
+        public void Test_289_10()
+        {
+        }
+
+        [Test]
+        public void Test_289_11()
+        {
+        }
+
+        [Test]
+        public void Test_289_12()
+        {
+        }
+
+        [Test]
+        public void Test_289_13()
+        {
+        }
+
+        [Test]
+        public void Test_289_14()
+        {
+        }
+
+        [Test]
+        public void Test_289_15()
+        {
+        }
+
+        [Test]
+        public void Test_289_16()
+        {
+        }
+
+        [Test]
+        public void Test_289_17()
+        {
+        }
+
+        [Test]
+        public void Test_289_18()
+        {
+        }
+
+        [Test]
+        public void Test_289_19()
+        {
+        }
+
+        [Test]
+        public void Test_289_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_290
+    {
+        #region PassingTests
+        [Test]
+        public void Test_290_01()
+        {
+        }
+
+        [Test]
+        public void Test_290_02()
+        {
+        }
+
+        [Test]
+        public void Test_290_03()
+        {
+        }
+
+        [Test]
+        public void Test_290_04()
+        {
+        }
+
+        [Test]
+        public void Test_290_05()
+        {
+        }
+
+        [Test]
+        public void Test_290_06()
+        {
+        }
+
+        [Test]
+        public void Test_290_07()
+        {
+        }
+
+        [Test]
+        public void Test_290_08()
+        {
+        }
+
+        [Test]
+        public void Test_290_09()
+        {
+        }
+
+        [Test]
+        public void Test_290_10()
+        {
+        }
+
+        [Test]
+        public void Test_290_11()
+        {
+        }
+
+        [Test]
+        public void Test_290_12()
+        {
+        }
+
+        [Test]
+        public void Test_290_13()
+        {
+        }
+
+        [Test]
+        public void Test_290_14()
+        {
+        }
+
+        [Test]
+        public void Test_290_15()
+        {
+        }
+
+        [Test]
+        public void Test_290_16()
+        {
+        }
+
+        [Test]
+        public void Test_290_17()
+        {
+        }
+
+        [Test]
+        public void Test_290_18()
+        {
+        }
+
+        [Test]
+        public void Test_290_19()
+        {
+        }
+
+        [Test]
+        public void Test_290_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_291
+    {
+        #region PassingTests
+        [Test]
+        public void Test_291_01()
+        {
+        }
+
+        [Test]
+        public void Test_291_02()
+        {
+        }
+
+        [Test]
+        public void Test_291_03()
+        {
+        }
+
+        [Test]
+        public void Test_291_04()
+        {
+        }
+
+        [Test]
+        public void Test_291_05()
+        {
+        }
+
+        [Test]
+        public void Test_291_06()
+        {
+        }
+
+        [Test]
+        public void Test_291_07()
+        {
+        }
+
+        [Test]
+        public void Test_291_08()
+        {
+        }
+
+        [Test]
+        public void Test_291_09()
+        {
+        }
+
+        [Test]
+        public void Test_291_10()
+        {
+        }
+
+        [Test]
+        public void Test_291_11()
+        {
+        }
+
+        [Test]
+        public void Test_291_12()
+        {
+        }
+
+        [Test]
+        public void Test_291_13()
+        {
+        }
+
+        [Test]
+        public void Test_291_14()
+        {
+        }
+
+        [Test]
+        public void Test_291_15()
+        {
+        }
+
+        [Test]
+        public void Test_291_16()
+        {
+        }
+
+        [Test]
+        public void Test_291_17()
+        {
+        }
+
+        [Test]
+        public void Test_291_18()
+        {
+        }
+
+        [Test]
+        public void Test_291_19()
+        {
+        }
+
+        [Test]
+        public void Test_291_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_292
+    {
+        #region PassingTests
+        [Test]
+        public void Test_292_01()
+        {
+        }
+
+        [Test]
+        public void Test_292_02()
+        {
+        }
+
+        [Test]
+        public void Test_292_03()
+        {
+        }
+
+        [Test]
+        public void Test_292_04()
+        {
+        }
+
+        [Test]
+        public void Test_292_05()
+        {
+        }
+
+        [Test]
+        public void Test_292_06()
+        {
+        }
+
+        [Test]
+        public void Test_292_07()
+        {
+        }
+
+        [Test]
+        public void Test_292_08()
+        {
+        }
+
+        [Test]
+        public void Test_292_09()
+        {
+        }
+
+        [Test]
+        public void Test_292_10()
+        {
+        }
+
+        [Test]
+        public void Test_292_11()
+        {
+        }
+
+        [Test]
+        public void Test_292_12()
+        {
+        }
+
+        [Test]
+        public void Test_292_13()
+        {
+        }
+
+        [Test]
+        public void Test_292_14()
+        {
+        }
+
+        [Test]
+        public void Test_292_15()
+        {
+        }
+
+        [Test]
+        public void Test_292_16()
+        {
+        }
+
+        [Test]
+        public void Test_292_17()
+        {
+        }
+
+        [Test]
+        public void Test_292_18()
+        {
+        }
+
+        [Test]
+        public void Test_292_19()
+        {
+        }
+
+        [Test]
+        public void Test_292_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_293
+    {
+        #region PassingTests
+        [Test]
+        public void Test_293_01()
+        {
+        }
+
+        [Test]
+        public void Test_293_02()
+        {
+        }
+
+        [Test]
+        public void Test_293_03()
+        {
+        }
+
+        [Test]
+        public void Test_293_04()
+        {
+        }
+
+        [Test]
+        public void Test_293_05()
+        {
+        }
+
+        [Test]
+        public void Test_293_06()
+        {
+        }
+
+        [Test]
+        public void Test_293_07()
+        {
+        }
+
+        [Test]
+        public void Test_293_08()
+        {
+        }
+
+        [Test]
+        public void Test_293_09()
+        {
+        }
+
+        [Test]
+        public void Test_293_10()
+        {
+        }
+
+        [Test]
+        public void Test_293_11()
+        {
+        }
+
+        [Test]
+        public void Test_293_12()
+        {
+        }
+
+        [Test]
+        public void Test_293_13()
+        {
+        }
+
+        [Test]
+        public void Test_293_14()
+        {
+        }
+
+        [Test]
+        public void Test_293_15()
+        {
+        }
+
+        [Test]
+        public void Test_293_16()
+        {
+        }
+
+        [Test]
+        public void Test_293_17()
+        {
+        }
+
+        [Test]
+        public void Test_293_18()
+        {
+        }
+
+        [Test]
+        public void Test_293_19()
+        {
+        }
+
+        [Test]
+        public void Test_293_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_294
+    {
+        #region PassingTests
+        [Test]
+        public void Test_294_01()
+        {
+        }
+
+        [Test]
+        public void Test_294_02()
+        {
+        }
+
+        [Test]
+        public void Test_294_03()
+        {
+        }
+
+        [Test]
+        public void Test_294_04()
+        {
+        }
+
+        [Test]
+        public void Test_294_05()
+        {
+        }
+
+        [Test]
+        public void Test_294_06()
+        {
+        }
+
+        [Test]
+        public void Test_294_07()
+        {
+        }
+
+        [Test]
+        public void Test_294_08()
+        {
+        }
+
+        [Test]
+        public void Test_294_09()
+        {
+        }
+
+        [Test]
+        public void Test_294_10()
+        {
+        }
+
+        [Test]
+        public void Test_294_11()
+        {
+        }
+
+        [Test]
+        public void Test_294_12()
+        {
+        }
+
+        [Test]
+        public void Test_294_13()
+        {
+        }
+
+        [Test]
+        public void Test_294_14()
+        {
+        }
+
+        [Test]
+        public void Test_294_15()
+        {
+        }
+
+        [Test]
+        public void Test_294_16()
+        {
+        }
+
+        [Test]
+        public void Test_294_17()
+        {
+        }
+
+        [Test]
+        public void Test_294_18()
+        {
+        }
+
+        [Test]
+        public void Test_294_19()
+        {
+        }
+
+        [Test]
+        public void Test_294_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_295
+    {
+        #region PassingTests
+        [Test]
+        public void Test_295_01()
+        {
+        }
+
+        [Test]
+        public void Test_295_02()
+        {
+        }
+
+        [Test]
+        public void Test_295_03()
+        {
+        }
+
+        [Test]
+        public void Test_295_04()
+        {
+        }
+
+        [Test]
+        public void Test_295_05()
+        {
+        }
+
+        [Test]
+        public void Test_295_06()
+        {
+        }
+
+        [Test]
+        public void Test_295_07()
+        {
+        }
+
+        [Test]
+        public void Test_295_08()
+        {
+        }
+
+        [Test]
+        public void Test_295_09()
+        {
+        }
+
+        [Test]
+        public void Test_295_10()
+        {
+        }
+
+        [Test]
+        public void Test_295_11()
+        {
+        }
+
+        [Test]
+        public void Test_295_12()
+        {
+        }
+
+        [Test]
+        public void Test_295_13()
+        {
+        }
+
+        [Test]
+        public void Test_295_14()
+        {
+        }
+
+        [Test]
+        public void Test_295_15()
+        {
+        }
+
+        [Test]
+        public void Test_295_16()
+        {
+        }
+
+        [Test]
+        public void Test_295_17()
+        {
+        }
+
+        [Test]
+        public void Test_295_18()
+        {
+        }
+
+        [Test]
+        public void Test_295_19()
+        {
+        }
+
+        [Test]
+        public void Test_295_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_296
+    {
+        #region PassingTests
+        [Test]
+        public void Test_296_01()
+        {
+        }
+
+        [Test]
+        public void Test_296_02()
+        {
+        }
+
+        [Test]
+        public void Test_296_03()
+        {
+        }
+
+        [Test]
+        public void Test_296_04()
+        {
+        }
+
+        [Test]
+        public void Test_296_05()
+        {
+        }
+
+        [Test]
+        public void Test_296_06()
+        {
+        }
+
+        [Test]
+        public void Test_296_07()
+        {
+        }
+
+        [Test]
+        public void Test_296_08()
+        {
+        }
+
+        [Test]
+        public void Test_296_09()
+        {
+        }
+
+        [Test]
+        public void Test_296_10()
+        {
+        }
+
+        [Test]
+        public void Test_296_11()
+        {
+        }
+
+        [Test]
+        public void Test_296_12()
+        {
+        }
+
+        [Test]
+        public void Test_296_13()
+        {
+        }
+
+        [Test]
+        public void Test_296_14()
+        {
+        }
+
+        [Test]
+        public void Test_296_15()
+        {
+        }
+
+        [Test]
+        public void Test_296_16()
+        {
+        }
+
+        [Test]
+        public void Test_296_17()
+        {
+        }
+
+        [Test]
+        public void Test_296_18()
+        {
+        }
+
+        [Test]
+        public void Test_296_19()
+        {
+        }
+
+        [Test]
+        public void Test_296_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_297
+    {
+        #region PassingTests
+        [Test]
+        public void Test_297_01()
+        {
+        }
+
+        [Test]
+        public void Test_297_02()
+        {
+        }
+
+        [Test]
+        public void Test_297_03()
+        {
+        }
+
+        [Test]
+        public void Test_297_04()
+        {
+        }
+
+        [Test]
+        public void Test_297_05()
+        {
+        }
+
+        [Test]
+        public void Test_297_06()
+        {
+        }
+
+        [Test]
+        public void Test_297_07()
+        {
+        }
+
+        [Test]
+        public void Test_297_08()
+        {
+        }
+
+        [Test]
+        public void Test_297_09()
+        {
+        }
+
+        [Test]
+        public void Test_297_10()
+        {
+        }
+
+        [Test]
+        public void Test_297_11()
+        {
+        }
+
+        [Test]
+        public void Test_297_12()
+        {
+        }
+
+        [Test]
+        public void Test_297_13()
+        {
+        }
+
+        [Test]
+        public void Test_297_14()
+        {
+        }
+
+        [Test]
+        public void Test_297_15()
+        {
+        }
+
+        [Test]
+        public void Test_297_16()
+        {
+        }
+
+        [Test]
+        public void Test_297_17()
+        {
+        }
+
+        [Test]
+        public void Test_297_18()
+        {
+        }
+
+        [Test]
+        public void Test_297_19()
+        {
+        }
+
+        [Test]
+        public void Test_297_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_298
+    {
+        #region PassingTests
+        [Test]
+        public void Test_298_01()
+        {
+        }
+
+        [Test]
+        public void Test_298_02()
+        {
+        }
+
+        [Test]
+        public void Test_298_03()
+        {
+        }
+
+        [Test]
+        public void Test_298_04()
+        {
+        }
+
+        [Test]
+        public void Test_298_05()
+        {
+        }
+
+        [Test]
+        public void Test_298_06()
+        {
+        }
+
+        [Test]
+        public void Test_298_07()
+        {
+        }
+
+        [Test]
+        public void Test_298_08()
+        {
+        }
+
+        [Test]
+        public void Test_298_09()
+        {
+        }
+
+        [Test]
+        public void Test_298_10()
+        {
+        }
+
+        [Test]
+        public void Test_298_11()
+        {
+        }
+
+        [Test]
+        public void Test_298_12()
+        {
+        }
+
+        [Test]
+        public void Test_298_13()
+        {
+        }
+
+        [Test]
+        public void Test_298_14()
+        {
+        }
+
+        [Test]
+        public void Test_298_15()
+        {
+        }
+
+        [Test]
+        public void Test_298_16()
+        {
+        }
+
+        [Test]
+        public void Test_298_17()
+        {
+        }
+
+        [Test]
+        public void Test_298_18()
+        {
+        }
+
+        [Test]
+        public void Test_298_19()
+        {
+        }
+
+        [Test]
+        public void Test_298_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_299
+    {
+        #region PassingTests
+        [Test]
+        public void Test_299_01()
+        {
+        }
+
+        [Test]
+        public void Test_299_02()
+        {
+        }
+
+        [Test]
+        public void Test_299_03()
+        {
+        }
+
+        [Test]
+        public void Test_299_04()
+        {
+        }
+
+        [Test]
+        public void Test_299_05()
+        {
+        }
+
+        [Test]
+        public void Test_299_06()
+        {
+        }
+
+        [Test]
+        public void Test_299_07()
+        {
+        }
+
+        [Test]
+        public void Test_299_08()
+        {
+        }
+
+        [Test]
+        public void Test_299_09()
+        {
+        }
+
+        [Test]
+        public void Test_299_10()
+        {
+        }
+
+        [Test]
+        public void Test_299_11()
+        {
+        }
+
+        [Test]
+        public void Test_299_12()
+        {
+        }
+
+        [Test]
+        public void Test_299_13()
+        {
+        }
+
+        [Test]
+        public void Test_299_14()
+        {
+        }
+
+        [Test]
+        public void Test_299_15()
+        {
+        }
+
+        [Test]
+        public void Test_299_16()
+        {
+        }
+
+        [Test]
+        public void Test_299_17()
+        {
+        }
+
+        [Test]
+        public void Test_299_18()
+        {
+        }
+
+        [Test]
+        public void Test_299_19()
+        {
+        }
+
+        [Test]
+        public void Test_299_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_300
+    {
+        #region PassingTests
+        [Test]
+        public void Test_300_01()
+        {
+        }
+
+        [Test]
+        public void Test_300_02()
+        {
+        }
+
+        [Test]
+        public void Test_300_03()
+        {
+        }
+
+        [Test]
+        public void Test_300_04()
+        {
+        }
+
+        [Test]
+        public void Test_300_05()
+        {
+        }
+
+        [Test]
+        public void Test_300_06()
+        {
+        }
+
+        [Test]
+        public void Test_300_07()
+        {
+        }
+
+        [Test]
+        public void Test_300_08()
+        {
+        }
+
+        [Test]
+        public void Test_300_09()
+        {
+        }
+
+        [Test]
+        public void Test_300_10()
+        {
+        }
+
+        [Test]
+        public void Test_300_11()
+        {
+        }
+
+        [Test]
+        public void Test_300_12()
+        {
+        }
+
+        [Test]
+        public void Test_300_13()
+        {
+        }
+
+        [Test]
+        public void Test_300_14()
+        {
+        }
+
+        [Test]
+        public void Test_300_15()
+        {
+        }
+
+        [Test]
+        public void Test_300_16()
+        {
+        }
+
+        [Test]
+        public void Test_300_17()
+        {
+        }
+
+        [Test]
+        public void Test_300_18()
+        {
+        }
+
+        [Test]
+        public void Test_300_19()
+        {
+        }
+
+        [Test]
+        public void Test_300_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_301
+    {
+        #region PassingTests
+        [Test]
+        public void Test_301_01()
+        {
+        }
+
+        [Test]
+        public void Test_301_02()
+        {
+        }
+
+        [Test]
+        public void Test_301_03()
+        {
+        }
+
+        [Test]
+        public void Test_301_04()
+        {
+        }
+
+        [Test]
+        public void Test_301_05()
+        {
+        }
+
+        [Test]
+        public void Test_301_06()
+        {
+        }
+
+        [Test]
+        public void Test_301_07()
+        {
+        }
+
+        [Test]
+        public void Test_301_08()
+        {
+        }
+
+        [Test]
+        public void Test_301_09()
+        {
+        }
+
+        [Test]
+        public void Test_301_10()
+        {
+        }
+
+        [Test]
+        public void Test_301_11()
+        {
+        }
+
+        [Test]
+        public void Test_301_12()
+        {
+        }
+
+        [Test]
+        public void Test_301_13()
+        {
+        }
+
+        [Test]
+        public void Test_301_14()
+        {
+        }
+
+        [Test]
+        public void Test_301_15()
+        {
+        }
+
+        [Test]
+        public void Test_301_16()
+        {
+        }
+
+        [Test]
+        public void Test_301_17()
+        {
+        }
+
+        [Test]
+        public void Test_301_18()
+        {
+        }
+
+        [Test]
+        public void Test_301_19()
+        {
+        }
+
+        [Test]
+        public void Test_301_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_302
+    {
+        #region PassingTests
+        [Test]
+        public void Test_302_01()
+        {
+        }
+
+        [Test]
+        public void Test_302_02()
+        {
+        }
+
+        [Test]
+        public void Test_302_03()
+        {
+        }
+
+        [Test]
+        public void Test_302_04()
+        {
+        }
+
+        [Test]
+        public void Test_302_05()
+        {
+        }
+
+        [Test]
+        public void Test_302_06()
+        {
+        }
+
+        [Test]
+        public void Test_302_07()
+        {
+        }
+
+        [Test]
+        public void Test_302_08()
+        {
+        }
+
+        [Test]
+        public void Test_302_09()
+        {
+        }
+
+        [Test]
+        public void Test_302_10()
+        {
+        }
+
+        [Test]
+        public void Test_302_11()
+        {
+        }
+
+        [Test]
+        public void Test_302_12()
+        {
+        }
+
+        [Test]
+        public void Test_302_13()
+        {
+        }
+
+        [Test]
+        public void Test_302_14()
+        {
+        }
+
+        [Test]
+        public void Test_302_15()
+        {
+        }
+
+        [Test]
+        public void Test_302_16()
+        {
+        }
+
+        [Test]
+        public void Test_302_17()
+        {
+        }
+
+        [Test]
+        public void Test_302_18()
+        {
+        }
+
+        [Test]
+        public void Test_302_19()
+        {
+        }
+
+        [Test]
+        public void Test_302_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_303
+    {
+        #region PassingTests
+        [Test]
+        public void Test_303_01()
+        {
+        }
+
+        [Test]
+        public void Test_303_02()
+        {
+        }
+
+        [Test]
+        public void Test_303_03()
+        {
+        }
+
+        [Test]
+        public void Test_303_04()
+        {
+        }
+
+        [Test]
+        public void Test_303_05()
+        {
+        }
+
+        [Test]
+        public void Test_303_06()
+        {
+        }
+
+        [Test]
+        public void Test_303_07()
+        {
+        }
+
+        [Test]
+        public void Test_303_08()
+        {
+        }
+
+        [Test]
+        public void Test_303_09()
+        {
+        }
+
+        [Test]
+        public void Test_303_10()
+        {
+        }
+
+        [Test]
+        public void Test_303_11()
+        {
+        }
+
+        [Test]
+        public void Test_303_12()
+        {
+        }
+
+        [Test]
+        public void Test_303_13()
+        {
+        }
+
+        [Test]
+        public void Test_303_14()
+        {
+        }
+
+        [Test]
+        public void Test_303_15()
+        {
+        }
+
+        [Test]
+        public void Test_303_16()
+        {
+        }
+
+        [Test]
+        public void Test_303_17()
+        {
+        }
+
+        [Test]
+        public void Test_303_18()
+        {
+        }
+
+        [Test]
+        public void Test_303_19()
+        {
+        }
+
+        [Test]
+        public void Test_303_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_304
+    {
+        #region PassingTests
+        [Test]
+        public void Test_304_01()
+        {
+        }
+
+        [Test]
+        public void Test_304_02()
+        {
+        }
+
+        [Test]
+        public void Test_304_03()
+        {
+        }
+
+        [Test]
+        public void Test_304_04()
+        {
+        }
+
+        [Test]
+        public void Test_304_05()
+        {
+        }
+
+        [Test]
+        public void Test_304_06()
+        {
+        }
+
+        [Test]
+        public void Test_304_07()
+        {
+        }
+
+        [Test]
+        public void Test_304_08()
+        {
+        }
+
+        [Test]
+        public void Test_304_09()
+        {
+        }
+
+        [Test]
+        public void Test_304_10()
+        {
+        }
+
+        [Test]
+        public void Test_304_11()
+        {
+        }
+
+        [Test]
+        public void Test_304_12()
+        {
+        }
+
+        [Test]
+        public void Test_304_13()
+        {
+        }
+
+        [Test]
+        public void Test_304_14()
+        {
+        }
+
+        [Test]
+        public void Test_304_15()
+        {
+        }
+
+        [Test]
+        public void Test_304_16()
+        {
+        }
+
+        [Test]
+        public void Test_304_17()
+        {
+        }
+
+        [Test]
+        public void Test_304_18()
+        {
+        }
+
+        [Test]
+        public void Test_304_19()
+        {
+        }
+
+        [Test]
+        public void Test_304_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_305
+    {
+        #region PassingTests
+        [Test]
+        public void Test_305_01()
+        {
+        }
+
+        [Test]
+        public void Test_305_02()
+        {
+        }
+
+        [Test]
+        public void Test_305_03()
+        {
+        }
+
+        [Test]
+        public void Test_305_04()
+        {
+        }
+
+        [Test]
+        public void Test_305_05()
+        {
+        }
+
+        [Test]
+        public void Test_305_06()
+        {
+        }
+
+        [Test]
+        public void Test_305_07()
+        {
+        }
+
+        [Test]
+        public void Test_305_08()
+        {
+        }
+
+        [Test]
+        public void Test_305_09()
+        {
+        }
+
+        [Test]
+        public void Test_305_10()
+        {
+        }
+
+        [Test]
+        public void Test_305_11()
+        {
+        }
+
+        [Test]
+        public void Test_305_12()
+        {
+        }
+
+        [Test]
+        public void Test_305_13()
+        {
+        }
+
+        [Test]
+        public void Test_305_14()
+        {
+        }
+
+        [Test]
+        public void Test_305_15()
+        {
+        }
+
+        [Test]
+        public void Test_305_16()
+        {
+        }
+
+        [Test]
+        public void Test_305_17()
+        {
+        }
+
+        [Test]
+        public void Test_305_18()
+        {
+        }
+
+        [Test]
+        public void Test_305_19()
+        {
+        }
+
+        [Test]
+        public void Test_305_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_306
+    {
+        #region PassingTests
+        [Test]
+        public void Test_306_01()
+        {
+        }
+
+        [Test]
+        public void Test_306_02()
+        {
+        }
+
+        [Test]
+        public void Test_306_03()
+        {
+        }
+
+        [Test]
+        public void Test_306_04()
+        {
+        }
+
+        [Test]
+        public void Test_306_05()
+        {
+        }
+
+        [Test]
+        public void Test_306_06()
+        {
+        }
+
+        [Test]
+        public void Test_306_07()
+        {
+        }
+
+        [Test]
+        public void Test_306_08()
+        {
+        }
+
+        [Test]
+        public void Test_306_09()
+        {
+        }
+
+        [Test]
+        public void Test_306_10()
+        {
+        }
+
+        [Test]
+        public void Test_306_11()
+        {
+        }
+
+        [Test]
+        public void Test_306_12()
+        {
+        }
+
+        [Test]
+        public void Test_306_13()
+        {
+        }
+
+        [Test]
+        public void Test_306_14()
+        {
+        }
+
+        [Test]
+        public void Test_306_15()
+        {
+        }
+
+        [Test]
+        public void Test_306_16()
+        {
+        }
+
+        [Test]
+        public void Test_306_17()
+        {
+        }
+
+        [Test]
+        public void Test_306_18()
+        {
+        }
+
+        [Test]
+        public void Test_306_19()
+        {
+        }
+
+        [Test]
+        public void Test_306_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_307
+    {
+        #region PassingTests
+        [Test]
+        public void Test_307_01()
+        {
+        }
+
+        [Test]
+        public void Test_307_02()
+        {
+        }
+
+        [Test]
+        public void Test_307_03()
+        {
+        }
+
+        [Test]
+        public void Test_307_04()
+        {
+        }
+
+        [Test]
+        public void Test_307_05()
+        {
+        }
+
+        [Test]
+        public void Test_307_06()
+        {
+        }
+
+        [Test]
+        public void Test_307_07()
+        {
+        }
+
+        [Test]
+        public void Test_307_08()
+        {
+        }
+
+        [Test]
+        public void Test_307_09()
+        {
+        }
+
+        [Test]
+        public void Test_307_10()
+        {
+        }
+
+        [Test]
+        public void Test_307_11()
+        {
+        }
+
+        [Test]
+        public void Test_307_12()
+        {
+        }
+
+        [Test]
+        public void Test_307_13()
+        {
+        }
+
+        [Test]
+        public void Test_307_14()
+        {
+        }
+
+        [Test]
+        public void Test_307_15()
+        {
+        }
+
+        [Test]
+        public void Test_307_16()
+        {
+        }
+
+        [Test]
+        public void Test_307_17()
+        {
+        }
+
+        [Test]
+        public void Test_307_18()
+        {
+        }
+
+        [Test]
+        public void Test_307_19()
+        {
+        }
+
+        [Test]
+        public void Test_307_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_308
+    {
+        #region PassingTests
+        [Test]
+        public void Test_308_01()
+        {
+        }
+
+        [Test]
+        public void Test_308_02()
+        {
+        }
+
+        [Test]
+        public void Test_308_03()
+        {
+        }
+
+        [Test]
+        public void Test_308_04()
+        {
+        }
+
+        [Test]
+        public void Test_308_05()
+        {
+        }
+
+        [Test]
+        public void Test_308_06()
+        {
+        }
+
+        [Test]
+        public void Test_308_07()
+        {
+        }
+
+        [Test]
+        public void Test_308_08()
+        {
+        }
+
+        [Test]
+        public void Test_308_09()
+        {
+        }
+
+        [Test]
+        public void Test_308_10()
+        {
+        }
+
+        [Test]
+        public void Test_308_11()
+        {
+        }
+
+        [Test]
+        public void Test_308_12()
+        {
+        }
+
+        [Test]
+        public void Test_308_13()
+        {
+        }
+
+        [Test]
+        public void Test_308_14()
+        {
+        }
+
+        [Test]
+        public void Test_308_15()
+        {
+        }
+
+        [Test]
+        public void Test_308_16()
+        {
+        }
+
+        [Test]
+        public void Test_308_17()
+        {
+        }
+
+        [Test]
+        public void Test_308_18()
+        {
+        }
+
+        [Test]
+        public void Test_308_19()
+        {
+        }
+
+        [Test]
+        public void Test_308_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_309
+    {
+        #region PassingTests
+        [Test]
+        public void Test_309_01()
+        {
+        }
+
+        [Test]
+        public void Test_309_02()
+        {
+        }
+
+        [Test]
+        public void Test_309_03()
+        {
+        }
+
+        [Test]
+        public void Test_309_04()
+        {
+        }
+
+        [Test]
+        public void Test_309_05()
+        {
+        }
+
+        [Test]
+        public void Test_309_06()
+        {
+        }
+
+        [Test]
+        public void Test_309_07()
+        {
+        }
+
+        [Test]
+        public void Test_309_08()
+        {
+        }
+
+        [Test]
+        public void Test_309_09()
+        {
+        }
+
+        [Test]
+        public void Test_309_10()
+        {
+        }
+
+        [Test]
+        public void Test_309_11()
+        {
+        }
+
+        [Test]
+        public void Test_309_12()
+        {
+        }
+
+        [Test]
+        public void Test_309_13()
+        {
+        }
+
+        [Test]
+        public void Test_309_14()
+        {
+        }
+
+        [Test]
+        public void Test_309_15()
+        {
+        }
+
+        [Test]
+        public void Test_309_16()
+        {
+        }
+
+        [Test]
+        public void Test_309_17()
+        {
+        }
+
+        [Test]
+        public void Test_309_18()
+        {
+        }
+
+        [Test]
+        public void Test_309_19()
+        {
+        }
+
+        [Test]
+        public void Test_309_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_310
+    {
+        #region PassingTests
+        [Test]
+        public void Test_310_01()
+        {
+        }
+
+        [Test]
+        public void Test_310_02()
+        {
+        }
+
+        [Test]
+        public void Test_310_03()
+        {
+        }
+
+        [Test]
+        public void Test_310_04()
+        {
+        }
+
+        [Test]
+        public void Test_310_05()
+        {
+        }
+
+        [Test]
+        public void Test_310_06()
+        {
+        }
+
+        [Test]
+        public void Test_310_07()
+        {
+        }
+
+        [Test]
+        public void Test_310_08()
+        {
+        }
+
+        [Test]
+        public void Test_310_09()
+        {
+        }
+
+        [Test]
+        public void Test_310_10()
+        {
+        }
+
+        [Test]
+        public void Test_310_11()
+        {
+        }
+
+        [Test]
+        public void Test_310_12()
+        {
+        }
+
+        [Test]
+        public void Test_310_13()
+        {
+        }
+
+        [Test]
+        public void Test_310_14()
+        {
+        }
+
+        [Test]
+        public void Test_310_15()
+        {
+        }
+
+        [Test]
+        public void Test_310_16()
+        {
+        }
+
+        [Test]
+        public void Test_310_17()
+        {
+        }
+
+        [Test]
+        public void Test_310_18()
+        {
+        }
+
+        [Test]
+        public void Test_310_19()
+        {
+        }
+
+        [Test]
+        public void Test_310_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_311
+    {
+        #region PassingTests
+        [Test]
+        public void Test_311_01()
+        {
+        }
+
+        [Test]
+        public void Test_311_02()
+        {
+        }
+
+        [Test]
+        public void Test_311_03()
+        {
+        }
+
+        [Test]
+        public void Test_311_04()
+        {
+        }
+
+        [Test]
+        public void Test_311_05()
+        {
+        }
+
+        [Test]
+        public void Test_311_06()
+        {
+        }
+
+        [Test]
+        public void Test_311_07()
+        {
+        }
+
+        [Test]
+        public void Test_311_08()
+        {
+        }
+
+        [Test]
+        public void Test_311_09()
+        {
+        }
+
+        [Test]
+        public void Test_311_10()
+        {
+        }
+
+        [Test]
+        public void Test_311_11()
+        {
+        }
+
+        [Test]
+        public void Test_311_12()
+        {
+        }
+
+        [Test]
+        public void Test_311_13()
+        {
+        }
+
+        [Test]
+        public void Test_311_14()
+        {
+        }
+
+        [Test]
+        public void Test_311_15()
+        {
+        }
+
+        [Test]
+        public void Test_311_16()
+        {
+        }
+
+        [Test]
+        public void Test_311_17()
+        {
+        }
+
+        [Test]
+        public void Test_311_18()
+        {
+        }
+
+        [Test]
+        public void Test_311_19()
+        {
+        }
+
+        [Test]
+        public void Test_311_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_312
+    {
+        #region PassingTests
+        [Test]
+        public void Test_312_01()
+        {
+        }
+
+        [Test]
+        public void Test_312_02()
+        {
+        }
+
+        [Test]
+        public void Test_312_03()
+        {
+        }
+
+        [Test]
+        public void Test_312_04()
+        {
+        }
+
+        [Test]
+        public void Test_312_05()
+        {
+        }
+
+        [Test]
+        public void Test_312_06()
+        {
+        }
+
+        [Test]
+        public void Test_312_07()
+        {
+        }
+
+        [Test]
+        public void Test_312_08()
+        {
+        }
+
+        [Test]
+        public void Test_312_09()
+        {
+        }
+
+        [Test]
+        public void Test_312_10()
+        {
+        }
+
+        [Test]
+        public void Test_312_11()
+        {
+        }
+
+        [Test]
+        public void Test_312_12()
+        {
+        }
+
+        [Test]
+        public void Test_312_13()
+        {
+        }
+
+        [Test]
+        public void Test_312_14()
+        {
+        }
+
+        [Test]
+        public void Test_312_15()
+        {
+        }
+
+        [Test]
+        public void Test_312_16()
+        {
+        }
+
+        [Test]
+        public void Test_312_17()
+        {
+        }
+
+        [Test]
+        public void Test_312_18()
+        {
+        }
+
+        [Test]
+        public void Test_312_19()
+        {
+        }
+
+        [Test]
+        public void Test_312_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_313
+    {
+        #region PassingTests
+        [Test]
+        public void Test_313_01()
+        {
+        }
+
+        [Test]
+        public void Test_313_02()
+        {
+        }
+
+        [Test]
+        public void Test_313_03()
+        {
+        }
+
+        [Test]
+        public void Test_313_04()
+        {
+        }
+
+        [Test]
+        public void Test_313_05()
+        {
+        }
+
+        [Test]
+        public void Test_313_06()
+        {
+        }
+
+        [Test]
+        public void Test_313_07()
+        {
+        }
+
+        [Test]
+        public void Test_313_08()
+        {
+        }
+
+        [Test]
+        public void Test_313_09()
+        {
+        }
+
+        [Test]
+        public void Test_313_10()
+        {
+        }
+
+        [Test]
+        public void Test_313_11()
+        {
+        }
+
+        [Test]
+        public void Test_313_12()
+        {
+        }
+
+        [Test]
+        public void Test_313_13()
+        {
+        }
+
+        [Test]
+        public void Test_313_14()
+        {
+        }
+
+        [Test]
+        public void Test_313_15()
+        {
+        }
+
+        [Test]
+        public void Test_313_16()
+        {
+        }
+
+        [Test]
+        public void Test_313_17()
+        {
+        }
+
+        [Test]
+        public void Test_313_18()
+        {
+        }
+
+        [Test]
+        public void Test_313_19()
+        {
+        }
+
+        [Test]
+        public void Test_313_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_314
+    {
+        #region PassingTests
+        [Test]
+        public void Test_314_01()
+        {
+        }
+
+        [Test]
+        public void Test_314_02()
+        {
+        }
+
+        [Test]
+        public void Test_314_03()
+        {
+        }
+
+        [Test]
+        public void Test_314_04()
+        {
+        }
+
+        [Test]
+        public void Test_314_05()
+        {
+        }
+
+        [Test]
+        public void Test_314_06()
+        {
+        }
+
+        [Test]
+        public void Test_314_07()
+        {
+        }
+
+        [Test]
+        public void Test_314_08()
+        {
+        }
+
+        [Test]
+        public void Test_314_09()
+        {
+        }
+
+        [Test]
+        public void Test_314_10()
+        {
+        }
+
+        [Test]
+        public void Test_314_11()
+        {
+        }
+
+        [Test]
+        public void Test_314_12()
+        {
+        }
+
+        [Test]
+        public void Test_314_13()
+        {
+        }
+
+        [Test]
+        public void Test_314_14()
+        {
+        }
+
+        [Test]
+        public void Test_314_15()
+        {
+        }
+
+        [Test]
+        public void Test_314_16()
+        {
+        }
+
+        [Test]
+        public void Test_314_17()
+        {
+        }
+
+        [Test]
+        public void Test_314_18()
+        {
+        }
+
+        [Test]
+        public void Test_314_19()
+        {
+        }
+
+        [Test]
+        public void Test_314_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_315
+    {
+        #region PassingTests
+        [Test]
+        public void Test_315_01()
+        {
+        }
+
+        [Test]
+        public void Test_315_02()
+        {
+        }
+
+        [Test]
+        public void Test_315_03()
+        {
+        }
+
+        [Test]
+        public void Test_315_04()
+        {
+        }
+
+        [Test]
+        public void Test_315_05()
+        {
+        }
+
+        [Test]
+        public void Test_315_06()
+        {
+        }
+
+        [Test]
+        public void Test_315_07()
+        {
+        }
+
+        [Test]
+        public void Test_315_08()
+        {
+        }
+
+        [Test]
+        public void Test_315_09()
+        {
+        }
+
+        [Test]
+        public void Test_315_10()
+        {
+        }
+
+        [Test]
+        public void Test_315_11()
+        {
+        }
+
+        [Test]
+        public void Test_315_12()
+        {
+        }
+
+        [Test]
+        public void Test_315_13()
+        {
+        }
+
+        [Test]
+        public void Test_315_14()
+        {
+        }
+
+        [Test]
+        public void Test_315_15()
+        {
+        }
+
+        [Test]
+        public void Test_315_16()
+        {
+        }
+
+        [Test]
+        public void Test_315_17()
+        {
+        }
+
+        [Test]
+        public void Test_315_18()
+        {
+        }
+
+        [Test]
+        public void Test_315_19()
+        {
+        }
+
+        [Test]
+        public void Test_315_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_316
+    {
+        #region PassingTests
+        [Test]
+        public void Test_316_01()
+        {
+        }
+
+        [Test]
+        public void Test_316_02()
+        {
+        }
+
+        [Test]
+        public void Test_316_03()
+        {
+        }
+
+        [Test]
+        public void Test_316_04()
+        {
+        }
+
+        [Test]
+        public void Test_316_05()
+        {
+        }
+
+        [Test]
+        public void Test_316_06()
+        {
+        }
+
+        [Test]
+        public void Test_316_07()
+        {
+        }
+
+        [Test]
+        public void Test_316_08()
+        {
+        }
+
+        [Test]
+        public void Test_316_09()
+        {
+        }
+
+        [Test]
+        public void Test_316_10()
+        {
+        }
+
+        [Test]
+        public void Test_316_11()
+        {
+        }
+
+        [Test]
+        public void Test_316_12()
+        {
+        }
+
+        [Test]
+        public void Test_316_13()
+        {
+        }
+
+        [Test]
+        public void Test_316_14()
+        {
+        }
+
+        [Test]
+        public void Test_316_15()
+        {
+        }
+
+        [Test]
+        public void Test_316_16()
+        {
+        }
+
+        [Test]
+        public void Test_316_17()
+        {
+        }
+
+        [Test]
+        public void Test_316_18()
+        {
+        }
+
+        [Test]
+        public void Test_316_19()
+        {
+        }
+
+        [Test]
+        public void Test_316_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_317
+    {
+        #region PassingTests
+        [Test]
+        public void Test_317_01()
+        {
+        }
+
+        [Test]
+        public void Test_317_02()
+        {
+        }
+
+        [Test]
+        public void Test_317_03()
+        {
+        }
+
+        [Test]
+        public void Test_317_04()
+        {
+        }
+
+        [Test]
+        public void Test_317_05()
+        {
+        }
+
+        [Test]
+        public void Test_317_06()
+        {
+        }
+
+        [Test]
+        public void Test_317_07()
+        {
+        }
+
+        [Test]
+        public void Test_317_08()
+        {
+        }
+
+        [Test]
+        public void Test_317_09()
+        {
+        }
+
+        [Test]
+        public void Test_317_10()
+        {
+        }
+
+        [Test]
+        public void Test_317_11()
+        {
+        }
+
+        [Test]
+        public void Test_317_12()
+        {
+        }
+
+        [Test]
+        public void Test_317_13()
+        {
+        }
+
+        [Test]
+        public void Test_317_14()
+        {
+        }
+
+        [Test]
+        public void Test_317_15()
+        {
+        }
+
+        [Test]
+        public void Test_317_16()
+        {
+        }
+
+        [Test]
+        public void Test_317_17()
+        {
+        }
+
+        [Test]
+        public void Test_317_18()
+        {
+        }
+
+        [Test]
+        public void Test_317_19()
+        {
+        }
+
+        [Test]
+        public void Test_317_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_318
+    {
+        #region PassingTests
+        [Test]
+        public void Test_318_01()
+        {
+        }
+
+        [Test]
+        public void Test_318_02()
+        {
+        }
+
+        [Test]
+        public void Test_318_03()
+        {
+        }
+
+        [Test]
+        public void Test_318_04()
+        {
+        }
+
+        [Test]
+        public void Test_318_05()
+        {
+        }
+
+        [Test]
+        public void Test_318_06()
+        {
+        }
+
+        [Test]
+        public void Test_318_07()
+        {
+        }
+
+        [Test]
+        public void Test_318_08()
+        {
+        }
+
+        [Test]
+        public void Test_318_09()
+        {
+        }
+
+        [Test]
+        public void Test_318_10()
+        {
+        }
+
+        [Test]
+        public void Test_318_11()
+        {
+        }
+
+        [Test]
+        public void Test_318_12()
+        {
+        }
+
+        [Test]
+        public void Test_318_13()
+        {
+        }
+
+        [Test]
+        public void Test_318_14()
+        {
+        }
+
+        [Test]
+        public void Test_318_15()
+        {
+        }
+
+        [Test]
+        public void Test_318_16()
+        {
+        }
+
+        [Test]
+        public void Test_318_17()
+        {
+        }
+
+        [Test]
+        public void Test_318_18()
+        {
+        }
+
+        [Test]
+        public void Test_318_19()
+        {
+        }
+
+        [Test]
+        public void Test_318_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_319
+    {
+        #region PassingTests
+        [Test]
+        public void Test_319_01()
+        {
+        }
+
+        [Test]
+        public void Test_319_02()
+        {
+        }
+
+        [Test]
+        public void Test_319_03()
+        {
+        }
+
+        [Test]
+        public void Test_319_04()
+        {
+        }
+
+        [Test]
+        public void Test_319_05()
+        {
+        }
+
+        [Test]
+        public void Test_319_06()
+        {
+        }
+
+        [Test]
+        public void Test_319_07()
+        {
+        }
+
+        [Test]
+        public void Test_319_08()
+        {
+        }
+
+        [Test]
+        public void Test_319_09()
+        {
+        }
+
+        [Test]
+        public void Test_319_10()
+        {
+        }
+
+        [Test]
+        public void Test_319_11()
+        {
+        }
+
+        [Test]
+        public void Test_319_12()
+        {
+        }
+
+        [Test]
+        public void Test_319_13()
+        {
+        }
+
+        [Test]
+        public void Test_319_14()
+        {
+        }
+
+        [Test]
+        public void Test_319_15()
+        {
+        }
+
+        [Test]
+        public void Test_319_16()
+        {
+        }
+
+        [Test]
+        public void Test_319_17()
+        {
+        }
+
+        [Test]
+        public void Test_319_18()
+        {
+        }
+
+        [Test]
+        public void Test_319_19()
+        {
+        }
+
+        [Test]
+        public void Test_319_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_320
+    {
+        #region PassingTests
+        [Test]
+        public void Test_320_01()
+        {
+        }
+
+        [Test]
+        public void Test_320_02()
+        {
+        }
+
+        [Test]
+        public void Test_320_03()
+        {
+        }
+
+        [Test]
+        public void Test_320_04()
+        {
+        }
+
+        [Test]
+        public void Test_320_05()
+        {
+        }
+
+        [Test]
+        public void Test_320_06()
+        {
+        }
+
+        [Test]
+        public void Test_320_07()
+        {
+        }
+
+        [Test]
+        public void Test_320_08()
+        {
+        }
+
+        [Test]
+        public void Test_320_09()
+        {
+        }
+
+        [Test]
+        public void Test_320_10()
+        {
+        }
+
+        [Test]
+        public void Test_320_11()
+        {
+        }
+
+        [Test]
+        public void Test_320_12()
+        {
+        }
+
+        [Test]
+        public void Test_320_13()
+        {
+        }
+
+        [Test]
+        public void Test_320_14()
+        {
+        }
+
+        [Test]
+        public void Test_320_15()
+        {
+        }
+
+        [Test]
+        public void Test_320_16()
+        {
+        }
+
+        [Test]
+        public void Test_320_17()
+        {
+        }
+
+        [Test]
+        public void Test_320_18()
+        {
+        }
+
+        [Test]
+        public void Test_320_19()
+        {
+        }
+
+        [Test]
+        public void Test_320_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_321
+    {
+        #region PassingTests
+        [Test]
+        public void Test_321_01()
+        {
+        }
+
+        [Test]
+        public void Test_321_02()
+        {
+        }
+
+        [Test]
+        public void Test_321_03()
+        {
+        }
+
+        [Test]
+        public void Test_321_04()
+        {
+        }
+
+        [Test]
+        public void Test_321_05()
+        {
+        }
+
+        [Test]
+        public void Test_321_06()
+        {
+        }
+
+        [Test]
+        public void Test_321_07()
+        {
+        }
+
+        [Test]
+        public void Test_321_08()
+        {
+        }
+
+        [Test]
+        public void Test_321_09()
+        {
+        }
+
+        [Test]
+        public void Test_321_10()
+        {
+        }
+
+        [Test]
+        public void Test_321_11()
+        {
+        }
+
+        [Test]
+        public void Test_321_12()
+        {
+        }
+
+        [Test]
+        public void Test_321_13()
+        {
+        }
+
+        [Test]
+        public void Test_321_14()
+        {
+        }
+
+        [Test]
+        public void Test_321_15()
+        {
+        }
+
+        [Test]
+        public void Test_321_16()
+        {
+        }
+
+        [Test]
+        public void Test_321_17()
+        {
+        }
+
+        [Test]
+        public void Test_321_18()
+        {
+        }
+
+        [Test]
+        public void Test_321_19()
+        {
+        }
+
+        [Test]
+        public void Test_321_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_322
+    {
+        #region PassingTests
+        [Test]
+        public void Test_322_01()
+        {
+        }
+
+        [Test]
+        public void Test_322_02()
+        {
+        }
+
+        [Test]
+        public void Test_322_03()
+        {
+        }
+
+        [Test]
+        public void Test_322_04()
+        {
+        }
+
+        [Test]
+        public void Test_322_05()
+        {
+        }
+
+        [Test]
+        public void Test_322_06()
+        {
+        }
+
+        [Test]
+        public void Test_322_07()
+        {
+        }
+
+        [Test]
+        public void Test_322_08()
+        {
+        }
+
+        [Test]
+        public void Test_322_09()
+        {
+        }
+
+        [Test]
+        public void Test_322_10()
+        {
+        }
+
+        [Test]
+        public void Test_322_11()
+        {
+        }
+
+        [Test]
+        public void Test_322_12()
+        {
+        }
+
+        [Test]
+        public void Test_322_13()
+        {
+        }
+
+        [Test]
+        public void Test_322_14()
+        {
+        }
+
+        [Test]
+        public void Test_322_15()
+        {
+        }
+
+        [Test]
+        public void Test_322_16()
+        {
+        }
+
+        [Test]
+        public void Test_322_17()
+        {
+        }
+
+        [Test]
+        public void Test_322_18()
+        {
+        }
+
+        [Test]
+        public void Test_322_19()
+        {
+        }
+
+        [Test]
+        public void Test_322_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_323
+    {
+        #region PassingTests
+        [Test]
+        public void Test_323_01()
+        {
+        }
+
+        [Test]
+        public void Test_323_02()
+        {
+        }
+
+        [Test]
+        public void Test_323_03()
+        {
+        }
+
+        [Test]
+        public void Test_323_04()
+        {
+        }
+
+        [Test]
+        public void Test_323_05()
+        {
+        }
+
+        [Test]
+        public void Test_323_06()
+        {
+        }
+
+        [Test]
+        public void Test_323_07()
+        {
+        }
+
+        [Test]
+        public void Test_323_08()
+        {
+        }
+
+        [Test]
+        public void Test_323_09()
+        {
+        }
+
+        [Test]
+        public void Test_323_10()
+        {
+        }
+
+        [Test]
+        public void Test_323_11()
+        {
+        }
+
+        [Test]
+        public void Test_323_12()
+        {
+        }
+
+        [Test]
+        public void Test_323_13()
+        {
+        }
+
+        [Test]
+        public void Test_323_14()
+        {
+        }
+
+        [Test]
+        public void Test_323_15()
+        {
+        }
+
+        [Test]
+        public void Test_323_16()
+        {
+        }
+
+        [Test]
+        public void Test_323_17()
+        {
+        }
+
+        [Test]
+        public void Test_323_18()
+        {
+        }
+
+        [Test]
+        public void Test_323_19()
+        {
+        }
+
+        [Test]
+        public void Test_323_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_324
+    {
+        #region PassingTests
+        [Test]
+        public void Test_324_01()
+        {
+        }
+
+        [Test]
+        public void Test_324_02()
+        {
+        }
+
+        [Test]
+        public void Test_324_03()
+        {
+        }
+
+        [Test]
+        public void Test_324_04()
+        {
+        }
+
+        [Test]
+        public void Test_324_05()
+        {
+        }
+
+        [Test]
+        public void Test_324_06()
+        {
+        }
+
+        [Test]
+        public void Test_324_07()
+        {
+        }
+
+        [Test]
+        public void Test_324_08()
+        {
+        }
+
+        [Test]
+        public void Test_324_09()
+        {
+        }
+
+        [Test]
+        public void Test_324_10()
+        {
+        }
+
+        [Test]
+        public void Test_324_11()
+        {
+        }
+
+        [Test]
+        public void Test_324_12()
+        {
+        }
+
+        [Test]
+        public void Test_324_13()
+        {
+        }
+
+        [Test]
+        public void Test_324_14()
+        {
+        }
+
+        [Test]
+        public void Test_324_15()
+        {
+        }
+
+        [Test]
+        public void Test_324_16()
+        {
+        }
+
+        [Test]
+        public void Test_324_17()
+        {
+        }
+
+        [Test]
+        public void Test_324_18()
+        {
+        }
+
+        [Test]
+        public void Test_324_19()
+        {
+        }
+
+        [Test]
+        public void Test_324_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_325
+    {
+        #region PassingTests
+        [Test]
+        public void Test_325_01()
+        {
+        }
+
+        [Test]
+        public void Test_325_02()
+        {
+        }
+
+        [Test]
+        public void Test_325_03()
+        {
+        }
+
+        [Test]
+        public void Test_325_04()
+        {
+        }
+
+        [Test]
+        public void Test_325_05()
+        {
+        }
+
+        [Test]
+        public void Test_325_06()
+        {
+        }
+
+        [Test]
+        public void Test_325_07()
+        {
+        }
+
+        [Test]
+        public void Test_325_08()
+        {
+        }
+
+        [Test]
+        public void Test_325_09()
+        {
+        }
+
+        [Test]
+        public void Test_325_10()
+        {
+        }
+
+        [Test]
+        public void Test_325_11()
+        {
+        }
+
+        [Test]
+        public void Test_325_12()
+        {
+        }
+
+        [Test]
+        public void Test_325_13()
+        {
+        }
+
+        [Test]
+        public void Test_325_14()
+        {
+        }
+
+        [Test]
+        public void Test_325_15()
+        {
+        }
+
+        [Test]
+        public void Test_325_16()
+        {
+        }
+
+        [Test]
+        public void Test_325_17()
+        {
+        }
+
+        [Test]
+        public void Test_325_18()
+        {
+        }
+
+        [Test]
+        public void Test_325_19()
+        {
+        }
+
+        [Test]
+        public void Test_325_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_326
+    {
+        #region PassingTests
+        [Test]
+        public void Test_326_01()
+        {
+        }
+
+        [Test]
+        public void Test_326_02()
+        {
+        }
+
+        [Test]
+        public void Test_326_03()
+        {
+        }
+
+        [Test]
+        public void Test_326_04()
+        {
+        }
+
+        [Test]
+        public void Test_326_05()
+        {
+        }
+
+        [Test]
+        public void Test_326_06()
+        {
+        }
+
+        [Test]
+        public void Test_326_07()
+        {
+        }
+
+        [Test]
+        public void Test_326_08()
+        {
+        }
+
+        [Test]
+        public void Test_326_09()
+        {
+        }
+
+        [Test]
+        public void Test_326_10()
+        {
+        }
+
+        [Test]
+        public void Test_326_11()
+        {
+        }
+
+        [Test]
+        public void Test_326_12()
+        {
+        }
+
+        [Test]
+        public void Test_326_13()
+        {
+        }
+
+        [Test]
+        public void Test_326_14()
+        {
+        }
+
+        [Test]
+        public void Test_326_15()
+        {
+        }
+
+        [Test]
+        public void Test_326_16()
+        {
+        }
+
+        [Test]
+        public void Test_326_17()
+        {
+        }
+
+        [Test]
+        public void Test_326_18()
+        {
+        }
+
+        [Test]
+        public void Test_326_19()
+        {
+        }
+
+        [Test]
+        public void Test_326_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_327
+    {
+        #region PassingTests
+        [Test]
+        public void Test_327_01()
+        {
+        }
+
+        [Test]
+        public void Test_327_02()
+        {
+        }
+
+        [Test]
+        public void Test_327_03()
+        {
+        }
+
+        [Test]
+        public void Test_327_04()
+        {
+        }
+
+        [Test]
+        public void Test_327_05()
+        {
+        }
+
+        [Test]
+        public void Test_327_06()
+        {
+        }
+
+        [Test]
+        public void Test_327_07()
+        {
+        }
+
+        [Test]
+        public void Test_327_08()
+        {
+        }
+
+        [Test]
+        public void Test_327_09()
+        {
+        }
+
+        [Test]
+        public void Test_327_10()
+        {
+        }
+
+        [Test]
+        public void Test_327_11()
+        {
+        }
+
+        [Test]
+        public void Test_327_12()
+        {
+        }
+
+        [Test]
+        public void Test_327_13()
+        {
+        }
+
+        [Test]
+        public void Test_327_14()
+        {
+        }
+
+        [Test]
+        public void Test_327_15()
+        {
+        }
+
+        [Test]
+        public void Test_327_16()
+        {
+        }
+
+        [Test]
+        public void Test_327_17()
+        {
+        }
+
+        [Test]
+        public void Test_327_18()
+        {
+        }
+
+        [Test]
+        public void Test_327_19()
+        {
+        }
+
+        [Test]
+        public void Test_327_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_328
+    {
+        #region PassingTests
+        [Test]
+        public void Test_328_01()
+        {
+        }
+
+        [Test]
+        public void Test_328_02()
+        {
+        }
+
+        [Test]
+        public void Test_328_03()
+        {
+        }
+
+        [Test]
+        public void Test_328_04()
+        {
+        }
+
+        [Test]
+        public void Test_328_05()
+        {
+        }
+
+        [Test]
+        public void Test_328_06()
+        {
+        }
+
+        [Test]
+        public void Test_328_07()
+        {
+        }
+
+        [Test]
+        public void Test_328_08()
+        {
+        }
+
+        [Test]
+        public void Test_328_09()
+        {
+        }
+
+        [Test]
+        public void Test_328_10()
+        {
+        }
+
+        [Test]
+        public void Test_328_11()
+        {
+        }
+
+        [Test]
+        public void Test_328_12()
+        {
+        }
+
+        [Test]
+        public void Test_328_13()
+        {
+        }
+
+        [Test]
+        public void Test_328_14()
+        {
+        }
+
+        [Test]
+        public void Test_328_15()
+        {
+        }
+
+        [Test]
+        public void Test_328_16()
+        {
+        }
+
+        [Test]
+        public void Test_328_17()
+        {
+        }
+
+        [Test]
+        public void Test_328_18()
+        {
+        }
+
+        [Test]
+        public void Test_328_19()
+        {
+        }
+
+        [Test]
+        public void Test_328_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_329
+    {
+        #region PassingTests
+        [Test]
+        public void Test_329_01()
+        {
+        }
+
+        [Test]
+        public void Test_329_02()
+        {
+        }
+
+        [Test]
+        public void Test_329_03()
+        {
+        }
+
+        [Test]
+        public void Test_329_04()
+        {
+        }
+
+        [Test]
+        public void Test_329_05()
+        {
+        }
+
+        [Test]
+        public void Test_329_06()
+        {
+        }
+
+        [Test]
+        public void Test_329_07()
+        {
+        }
+
+        [Test]
+        public void Test_329_08()
+        {
+        }
+
+        [Test]
+        public void Test_329_09()
+        {
+        }
+
+        [Test]
+        public void Test_329_10()
+        {
+        }
+
+        [Test]
+        public void Test_329_11()
+        {
+        }
+
+        [Test]
+        public void Test_329_12()
+        {
+        }
+
+        [Test]
+        public void Test_329_13()
+        {
+        }
+
+        [Test]
+        public void Test_329_14()
+        {
+        }
+
+        [Test]
+        public void Test_329_15()
+        {
+        }
+
+        [Test]
+        public void Test_329_16()
+        {
+        }
+
+        [Test]
+        public void Test_329_17()
+        {
+        }
+
+        [Test]
+        public void Test_329_18()
+        {
+        }
+
+        [Test]
+        public void Test_329_19()
+        {
+        }
+
+        [Test]
+        public void Test_329_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_330
+    {
+        #region PassingTests
+        [Test]
+        public void Test_330_01()
+        {
+        }
+
+        [Test]
+        public void Test_330_02()
+        {
+        }
+
+        [Test]
+        public void Test_330_03()
+        {
+        }
+
+        [Test]
+        public void Test_330_04()
+        {
+        }
+
+        [Test]
+        public void Test_330_05()
+        {
+        }
+
+        [Test]
+        public void Test_330_06()
+        {
+        }
+
+        [Test]
+        public void Test_330_07()
+        {
+        }
+
+        [Test]
+        public void Test_330_08()
+        {
+        }
+
+        [Test]
+        public void Test_330_09()
+        {
+        }
+
+        [Test]
+        public void Test_330_10()
+        {
+        }
+
+        [Test]
+        public void Test_330_11()
+        {
+        }
+
+        [Test]
+        public void Test_330_12()
+        {
+        }
+
+        [Test]
+        public void Test_330_13()
+        {
+        }
+
+        [Test]
+        public void Test_330_14()
+        {
+        }
+
+        [Test]
+        public void Test_330_15()
+        {
+        }
+
+        [Test]
+        public void Test_330_16()
+        {
+        }
+
+        [Test]
+        public void Test_330_17()
+        {
+        }
+
+        [Test]
+        public void Test_330_18()
+        {
+        }
+
+        [Test]
+        public void Test_330_19()
+        {
+        }
+
+        [Test]
+        public void Test_330_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_331
+    {
+        #region PassingTests
+        [Test]
+        public void Test_331_01()
+        {
+        }
+
+        [Test]
+        public void Test_331_02()
+        {
+        }
+
+        [Test]
+        public void Test_331_03()
+        {
+        }
+
+        [Test]
+        public void Test_331_04()
+        {
+        }
+
+        [Test]
+        public void Test_331_05()
+        {
+        }
+
+        [Test]
+        public void Test_331_06()
+        {
+        }
+
+        [Test]
+        public void Test_331_07()
+        {
+        }
+
+        [Test]
+        public void Test_331_08()
+        {
+        }
+
+        [Test]
+        public void Test_331_09()
+        {
+        }
+
+        [Test]
+        public void Test_331_10()
+        {
+        }
+
+        [Test]
+        public void Test_331_11()
+        {
+        }
+
+        [Test]
+        public void Test_331_12()
+        {
+        }
+
+        [Test]
+        public void Test_331_13()
+        {
+        }
+
+        [Test]
+        public void Test_331_14()
+        {
+        }
+
+        [Test]
+        public void Test_331_15()
+        {
+        }
+
+        [Test]
+        public void Test_331_16()
+        {
+        }
+
+        [Test]
+        public void Test_331_17()
+        {
+        }
+
+        [Test]
+        public void Test_331_18()
+        {
+        }
+
+        [Test]
+        public void Test_331_19()
+        {
+        }
+
+        [Test]
+        public void Test_331_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_332
+    {
+        #region PassingTests
+        [Test]
+        public void Test_332_01()
+        {
+        }
+
+        [Test]
+        public void Test_332_02()
+        {
+        }
+
+        [Test]
+        public void Test_332_03()
+        {
+        }
+
+        [Test]
+        public void Test_332_04()
+        {
+        }
+
+        [Test]
+        public void Test_332_05()
+        {
+        }
+
+        [Test]
+        public void Test_332_06()
+        {
+        }
+
+        [Test]
+        public void Test_332_07()
+        {
+        }
+
+        [Test]
+        public void Test_332_08()
+        {
+        }
+
+        [Test]
+        public void Test_332_09()
+        {
+        }
+
+        [Test]
+        public void Test_332_10()
+        {
+        }
+
+        [Test]
+        public void Test_332_11()
+        {
+        }
+
+        [Test]
+        public void Test_332_12()
+        {
+        }
+
+        [Test]
+        public void Test_332_13()
+        {
+        }
+
+        [Test]
+        public void Test_332_14()
+        {
+        }
+
+        [Test]
+        public void Test_332_15()
+        {
+        }
+
+        [Test]
+        public void Test_332_16()
+        {
+        }
+
+        [Test]
+        public void Test_332_17()
+        {
+        }
+
+        [Test]
+        public void Test_332_18()
+        {
+        }
+
+        [Test]
+        public void Test_332_19()
+        {
+        }
+
+        [Test]
+        public void Test_332_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_333
+    {
+        #region PassingTests
+        [Test]
+        public void Test_333_01()
+        {
+        }
+
+        [Test]
+        public void Test_333_02()
+        {
+        }
+
+        [Test]
+        public void Test_333_03()
+        {
+        }
+
+        [Test]
+        public void Test_333_04()
+        {
+        }
+
+        [Test]
+        public void Test_333_05()
+        {
+        }
+
+        [Test]
+        public void Test_333_06()
+        {
+        }
+
+        [Test]
+        public void Test_333_07()
+        {
+        }
+
+        [Test]
+        public void Test_333_08()
+        {
+        }
+
+        [Test]
+        public void Test_333_09()
+        {
+        }
+
+        [Test]
+        public void Test_333_10()
+        {
+        }
+
+        [Test]
+        public void Test_333_11()
+        {
+        }
+
+        [Test]
+        public void Test_333_12()
+        {
+        }
+
+        [Test]
+        public void Test_333_13()
+        {
+        }
+
+        [Test]
+        public void Test_333_14()
+        {
+        }
+
+        [Test]
+        public void Test_333_15()
+        {
+        }
+
+        [Test]
+        public void Test_333_16()
+        {
+        }
+
+        [Test]
+        public void Test_333_17()
+        {
+        }
+
+        [Test]
+        public void Test_333_18()
+        {
+        }
+
+        [Test]
+        public void Test_333_19()
+        {
+        }
+
+        [Test]
+        public void Test_333_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_334
+    {
+        #region PassingTests
+        [Test]
+        public void Test_334_01()
+        {
+        }
+
+        [Test]
+        public void Test_334_02()
+        {
+        }
+
+        [Test]
+        public void Test_334_03()
+        {
+        }
+
+        [Test]
+        public void Test_334_04()
+        {
+        }
+
+        [Test]
+        public void Test_334_05()
+        {
+        }
+
+        [Test]
+        public void Test_334_06()
+        {
+        }
+
+        [Test]
+        public void Test_334_07()
+        {
+        }
+
+        [Test]
+        public void Test_334_08()
+        {
+        }
+
+        [Test]
+        public void Test_334_09()
+        {
+        }
+
+        [Test]
+        public void Test_334_10()
+        {
+        }
+
+        [Test]
+        public void Test_334_11()
+        {
+        }
+
+        [Test]
+        public void Test_334_12()
+        {
+        }
+
+        [Test]
+        public void Test_334_13()
+        {
+        }
+
+        [Test]
+        public void Test_334_14()
+        {
+        }
+
+        [Test]
+        public void Test_334_15()
+        {
+        }
+
+        [Test]
+        public void Test_334_16()
+        {
+        }
+
+        [Test]
+        public void Test_334_17()
+        {
+        }
+
+        [Test]
+        public void Test_334_18()
+        {
+        }
+
+        [Test]
+        public void Test_334_19()
+        {
+        }
+
+        [Test]
+        public void Test_334_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_335
+    {
+        #region PassingTests
+        [Test]
+        public void Test_335_01()
+        {
+        }
+
+        [Test]
+        public void Test_335_02()
+        {
+        }
+
+        [Test]
+        public void Test_335_03()
+        {
+        }
+
+        [Test]
+        public void Test_335_04()
+        {
+        }
+
+        [Test]
+        public void Test_335_05()
+        {
+        }
+
+        [Test]
+        public void Test_335_06()
+        {
+        }
+
+        [Test]
+        public void Test_335_07()
+        {
+        }
+
+        [Test]
+        public void Test_335_08()
+        {
+        }
+
+        [Test]
+        public void Test_335_09()
+        {
+        }
+
+        [Test]
+        public void Test_335_10()
+        {
+        }
+
+        [Test]
+        public void Test_335_11()
+        {
+        }
+
+        [Test]
+        public void Test_335_12()
+        {
+        }
+
+        [Test]
+        public void Test_335_13()
+        {
+        }
+
+        [Test]
+        public void Test_335_14()
+        {
+        }
+
+        [Test]
+        public void Test_335_15()
+        {
+        }
+
+        [Test]
+        public void Test_335_16()
+        {
+        }
+
+        [Test]
+        public void Test_335_17()
+        {
+        }
+
+        [Test]
+        public void Test_335_18()
+        {
+        }
+
+        [Test]
+        public void Test_335_19()
+        {
+        }
+
+        [Test]
+        public void Test_335_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_336
+    {
+        #region PassingTests
+        [Test]
+        public void Test_336_01()
+        {
+        }
+
+        [Test]
+        public void Test_336_02()
+        {
+        }
+
+        [Test]
+        public void Test_336_03()
+        {
+        }
+
+        [Test]
+        public void Test_336_04()
+        {
+        }
+
+        [Test]
+        public void Test_336_05()
+        {
+        }
+
+        [Test]
+        public void Test_336_06()
+        {
+        }
+
+        [Test]
+        public void Test_336_07()
+        {
+        }
+
+        [Test]
+        public void Test_336_08()
+        {
+        }
+
+        [Test]
+        public void Test_336_09()
+        {
+        }
+
+        [Test]
+        public void Test_336_10()
+        {
+        }
+
+        [Test]
+        public void Test_336_11()
+        {
+        }
+
+        [Test]
+        public void Test_336_12()
+        {
+        }
+
+        [Test]
+        public void Test_336_13()
+        {
+        }
+
+        [Test]
+        public void Test_336_14()
+        {
+        }
+
+        [Test]
+        public void Test_336_15()
+        {
+        }
+
+        [Test]
+        public void Test_336_16()
+        {
+        }
+
+        [Test]
+        public void Test_336_17()
+        {
+        }
+
+        [Test]
+        public void Test_336_18()
+        {
+        }
+
+        [Test]
+        public void Test_336_19()
+        {
+        }
+
+        [Test]
+        public void Test_336_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_337
+    {
+        #region PassingTests
+        [Test]
+        public void Test_337_01()
+        {
+        }
+
+        [Test]
+        public void Test_337_02()
+        {
+        }
+
+        [Test]
+        public void Test_337_03()
+        {
+        }
+
+        [Test]
+        public void Test_337_04()
+        {
+        }
+
+        [Test]
+        public void Test_337_05()
+        {
+        }
+
+        [Test]
+        public void Test_337_06()
+        {
+        }
+
+        [Test]
+        public void Test_337_07()
+        {
+        }
+
+        [Test]
+        public void Test_337_08()
+        {
+        }
+
+        [Test]
+        public void Test_337_09()
+        {
+        }
+
+        [Test]
+        public void Test_337_10()
+        {
+        }
+
+        [Test]
+        public void Test_337_11()
+        {
+        }
+
+        [Test]
+        public void Test_337_12()
+        {
+        }
+
+        [Test]
+        public void Test_337_13()
+        {
+        }
+
+        [Test]
+        public void Test_337_14()
+        {
+        }
+
+        [Test]
+        public void Test_337_15()
+        {
+        }
+
+        [Test]
+        public void Test_337_16()
+        {
+        }
+
+        [Test]
+        public void Test_337_17()
+        {
+        }
+
+        [Test]
+        public void Test_337_18()
+        {
+        }
+
+        [Test]
+        public void Test_337_19()
+        {
+        }
+
+        [Test]
+        public void Test_337_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_338
+    {
+        #region PassingTests
+        [Test]
+        public void Test_338_01()
+        {
+        }
+
+        [Test]
+        public void Test_338_02()
+        {
+        }
+
+        [Test]
+        public void Test_338_03()
+        {
+        }
+
+        [Test]
+        public void Test_338_04()
+        {
+        }
+
+        [Test]
+        public void Test_338_05()
+        {
+        }
+
+        [Test]
+        public void Test_338_06()
+        {
+        }
+
+        [Test]
+        public void Test_338_07()
+        {
+        }
+
+        [Test]
+        public void Test_338_08()
+        {
+        }
+
+        [Test]
+        public void Test_338_09()
+        {
+        }
+
+        [Test]
+        public void Test_338_10()
+        {
+        }
+
+        [Test]
+        public void Test_338_11()
+        {
+        }
+
+        [Test]
+        public void Test_338_12()
+        {
+        }
+
+        [Test]
+        public void Test_338_13()
+        {
+        }
+
+        [Test]
+        public void Test_338_14()
+        {
+        }
+
+        [Test]
+        public void Test_338_15()
+        {
+        }
+
+        [Test]
+        public void Test_338_16()
+        {
+        }
+
+        [Test]
+        public void Test_338_17()
+        {
+        }
+
+        [Test]
+        public void Test_338_18()
+        {
+        }
+
+        [Test]
+        public void Test_338_19()
+        {
+        }
+
+        [Test]
+        public void Test_338_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_339
+    {
+        #region PassingTests
+        [Test]
+        public void Test_339_01()
+        {
+        }
+
+        [Test]
+        public void Test_339_02()
+        {
+        }
+
+        [Test]
+        public void Test_339_03()
+        {
+        }
+
+        [Test]
+        public void Test_339_04()
+        {
+        }
+
+        [Test]
+        public void Test_339_05()
+        {
+        }
+
+        [Test]
+        public void Test_339_06()
+        {
+        }
+
+        [Test]
+        public void Test_339_07()
+        {
+        }
+
+        [Test]
+        public void Test_339_08()
+        {
+        }
+
+        [Test]
+        public void Test_339_09()
+        {
+        }
+
+        [Test]
+        public void Test_339_10()
+        {
+        }
+
+        [Test]
+        public void Test_339_11()
+        {
+        }
+
+        [Test]
+        public void Test_339_12()
+        {
+        }
+
+        [Test]
+        public void Test_339_13()
+        {
+        }
+
+        [Test]
+        public void Test_339_14()
+        {
+        }
+
+        [Test]
+        public void Test_339_15()
+        {
+        }
+
+        [Test]
+        public void Test_339_16()
+        {
+        }
+
+        [Test]
+        public void Test_339_17()
+        {
+        }
+
+        [Test]
+        public void Test_339_18()
+        {
+        }
+
+        [Test]
+        public void Test_339_19()
+        {
+        }
+
+        [Test]
+        public void Test_339_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_340
+    {
+        #region PassingTests
+        [Test]
+        public void Test_340_01()
+        {
+        }
+
+        [Test]
+        public void Test_340_02()
+        {
+        }
+
+        [Test]
+        public void Test_340_03()
+        {
+        }
+
+        [Test]
+        public void Test_340_04()
+        {
+        }
+
+        [Test]
+        public void Test_340_05()
+        {
+        }
+
+        [Test]
+        public void Test_340_06()
+        {
+        }
+
+        [Test]
+        public void Test_340_07()
+        {
+        }
+
+        [Test]
+        public void Test_340_08()
+        {
+        }
+
+        [Test]
+        public void Test_340_09()
+        {
+        }
+
+        [Test]
+        public void Test_340_10()
+        {
+        }
+
+        [Test]
+        public void Test_340_11()
+        {
+        }
+
+        [Test]
+        public void Test_340_12()
+        {
+        }
+
+        [Test]
+        public void Test_340_13()
+        {
+        }
+
+        [Test]
+        public void Test_340_14()
+        {
+        }
+
+        [Test]
+        public void Test_340_15()
+        {
+        }
+
+        [Test]
+        public void Test_340_16()
+        {
+        }
+
+        [Test]
+        public void Test_340_17()
+        {
+        }
+
+        [Test]
+        public void Test_340_18()
+        {
+        }
+
+        [Test]
+        public void Test_340_19()
+        {
+        }
+
+        [Test]
+        public void Test_340_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_341
+    {
+        #region PassingTests
+        [Test]
+        public void Test_341_01()
+        {
+        }
+
+        [Test]
+        public void Test_341_02()
+        {
+        }
+
+        [Test]
+        public void Test_341_03()
+        {
+        }
+
+        [Test]
+        public void Test_341_04()
+        {
+        }
+
+        [Test]
+        public void Test_341_05()
+        {
+        }
+
+        [Test]
+        public void Test_341_06()
+        {
+        }
+
+        [Test]
+        public void Test_341_07()
+        {
+        }
+
+        [Test]
+        public void Test_341_08()
+        {
+        }
+
+        [Test]
+        public void Test_341_09()
+        {
+        }
+
+        [Test]
+        public void Test_341_10()
+        {
+        }
+
+        [Test]
+        public void Test_341_11()
+        {
+        }
+
+        [Test]
+        public void Test_341_12()
+        {
+        }
+
+        [Test]
+        public void Test_341_13()
+        {
+        }
+
+        [Test]
+        public void Test_341_14()
+        {
+        }
+
+        [Test]
+        public void Test_341_15()
+        {
+        }
+
+        [Test]
+        public void Test_341_16()
+        {
+        }
+
+        [Test]
+        public void Test_341_17()
+        {
+        }
+
+        [Test]
+        public void Test_341_18()
+        {
+        }
+
+        [Test]
+        public void Test_341_19()
+        {
+        }
+
+        [Test]
+        public void Test_341_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_342
+    {
+        #region PassingTests
+        [Test]
+        public void Test_342_01()
+        {
+        }
+
+        [Test]
+        public void Test_342_02()
+        {
+        }
+
+        [Test]
+        public void Test_342_03()
+        {
+        }
+
+        [Test]
+        public void Test_342_04()
+        {
+        }
+
+        [Test]
+        public void Test_342_05()
+        {
+        }
+
+        [Test]
+        public void Test_342_06()
+        {
+        }
+
+        [Test]
+        public void Test_342_07()
+        {
+        }
+
+        [Test]
+        public void Test_342_08()
+        {
+        }
+
+        [Test]
+        public void Test_342_09()
+        {
+        }
+
+        [Test]
+        public void Test_342_10()
+        {
+        }
+
+        [Test]
+        public void Test_342_11()
+        {
+        }
+
+        [Test]
+        public void Test_342_12()
+        {
+        }
+
+        [Test]
+        public void Test_342_13()
+        {
+        }
+
+        [Test]
+        public void Test_342_14()
+        {
+        }
+
+        [Test]
+        public void Test_342_15()
+        {
+        }
+
+        [Test]
+        public void Test_342_16()
+        {
+        }
+
+        [Test]
+        public void Test_342_17()
+        {
+        }
+
+        [Test]
+        public void Test_342_18()
+        {
+        }
+
+        [Test]
+        public void Test_342_19()
+        {
+        }
+
+        [Test]
+        public void Test_342_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_343
+    {
+        #region PassingTests
+        [Test]
+        public void Test_343_01()
+        {
+        }
+
+        [Test]
+        public void Test_343_02()
+        {
+        }
+
+        [Test]
+        public void Test_343_03()
+        {
+        }
+
+        [Test]
+        public void Test_343_04()
+        {
+        }
+
+        [Test]
+        public void Test_343_05()
+        {
+        }
+
+        [Test]
+        public void Test_343_06()
+        {
+        }
+
+        [Test]
+        public void Test_343_07()
+        {
+        }
+
+        [Test]
+        public void Test_343_08()
+        {
+        }
+
+        [Test]
+        public void Test_343_09()
+        {
+        }
+
+        [Test]
+        public void Test_343_10()
+        {
+        }
+
+        [Test]
+        public void Test_343_11()
+        {
+        }
+
+        [Test]
+        public void Test_343_12()
+        {
+        }
+
+        [Test]
+        public void Test_343_13()
+        {
+        }
+
+        [Test]
+        public void Test_343_14()
+        {
+        }
+
+        [Test]
+        public void Test_343_15()
+        {
+        }
+
+        [Test]
+        public void Test_343_16()
+        {
+        }
+
+        [Test]
+        public void Test_343_17()
+        {
+        }
+
+        [Test]
+        public void Test_343_18()
+        {
+        }
+
+        [Test]
+        public void Test_343_19()
+        {
+        }
+
+        [Test]
+        public void Test_343_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_344
+    {
+        #region PassingTests
+        [Test]
+        public void Test_344_01()
+        {
+        }
+
+        [Test]
+        public void Test_344_02()
+        {
+        }
+
+        [Test]
+        public void Test_344_03()
+        {
+        }
+
+        [Test]
+        public void Test_344_04()
+        {
+        }
+
+        [Test]
+        public void Test_344_05()
+        {
+        }
+
+        [Test]
+        public void Test_344_06()
+        {
+        }
+
+        [Test]
+        public void Test_344_07()
+        {
+        }
+
+        [Test]
+        public void Test_344_08()
+        {
+        }
+
+        [Test]
+        public void Test_344_09()
+        {
+        }
+
+        [Test]
+        public void Test_344_10()
+        {
+        }
+
+        [Test]
+        public void Test_344_11()
+        {
+        }
+
+        [Test]
+        public void Test_344_12()
+        {
+        }
+
+        [Test]
+        public void Test_344_13()
+        {
+        }
+
+        [Test]
+        public void Test_344_14()
+        {
+        }
+
+        [Test]
+        public void Test_344_15()
+        {
+        }
+
+        [Test]
+        public void Test_344_16()
+        {
+        }
+
+        [Test]
+        public void Test_344_17()
+        {
+        }
+
+        [Test]
+        public void Test_344_18()
+        {
+        }
+
+        [Test]
+        public void Test_344_19()
+        {
+        }
+
+        [Test]
+        public void Test_344_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_345
+    {
+        #region PassingTests
+        [Test]
+        public void Test_345_01()
+        {
+        }
+
+        [Test]
+        public void Test_345_02()
+        {
+        }
+
+        [Test]
+        public void Test_345_03()
+        {
+        }
+
+        [Test]
+        public void Test_345_04()
+        {
+        }
+
+        [Test]
+        public void Test_345_05()
+        {
+        }
+
+        [Test]
+        public void Test_345_06()
+        {
+        }
+
+        [Test]
+        public void Test_345_07()
+        {
+        }
+
+        [Test]
+        public void Test_345_08()
+        {
+        }
+
+        [Test]
+        public void Test_345_09()
+        {
+        }
+
+        [Test]
+        public void Test_345_10()
+        {
+        }
+
+        [Test]
+        public void Test_345_11()
+        {
+        }
+
+        [Test]
+        public void Test_345_12()
+        {
+        }
+
+        [Test]
+        public void Test_345_13()
+        {
+        }
+
+        [Test]
+        public void Test_345_14()
+        {
+        }
+
+        [Test]
+        public void Test_345_15()
+        {
+        }
+
+        [Test]
+        public void Test_345_16()
+        {
+        }
+
+        [Test]
+        public void Test_345_17()
+        {
+        }
+
+        [Test]
+        public void Test_345_18()
+        {
+        }
+
+        [Test]
+        public void Test_345_19()
+        {
+        }
+
+        [Test]
+        public void Test_345_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_346
+    {
+        #region PassingTests
+        [Test]
+        public void Test_346_01()
+        {
+        }
+
+        [Test]
+        public void Test_346_02()
+        {
+        }
+
+        [Test]
+        public void Test_346_03()
+        {
+        }
+
+        [Test]
+        public void Test_346_04()
+        {
+        }
+
+        [Test]
+        public void Test_346_05()
+        {
+        }
+
+        [Test]
+        public void Test_346_06()
+        {
+        }
+
+        [Test]
+        public void Test_346_07()
+        {
+        }
+
+        [Test]
+        public void Test_346_08()
+        {
+        }
+
+        [Test]
+        public void Test_346_09()
+        {
+        }
+
+        [Test]
+        public void Test_346_10()
+        {
+        }
+
+        [Test]
+        public void Test_346_11()
+        {
+        }
+
+        [Test]
+        public void Test_346_12()
+        {
+        }
+
+        [Test]
+        public void Test_346_13()
+        {
+        }
+
+        [Test]
+        public void Test_346_14()
+        {
+        }
+
+        [Test]
+        public void Test_346_15()
+        {
+        }
+
+        [Test]
+        public void Test_346_16()
+        {
+        }
+
+        [Test]
+        public void Test_346_17()
+        {
+        }
+
+        [Test]
+        public void Test_346_18()
+        {
+        }
+
+        [Test]
+        public void Test_346_19()
+        {
+        }
+
+        [Test]
+        public void Test_346_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_347
+    {
+        #region PassingTests
+        [Test]
+        public void Test_347_01()
+        {
+        }
+
+        [Test]
+        public void Test_347_02()
+        {
+        }
+
+        [Test]
+        public void Test_347_03()
+        {
+        }
+
+        [Test]
+        public void Test_347_04()
+        {
+        }
+
+        [Test]
+        public void Test_347_05()
+        {
+        }
+
+        [Test]
+        public void Test_347_06()
+        {
+        }
+
+        [Test]
+        public void Test_347_07()
+        {
+        }
+
+        [Test]
+        public void Test_347_08()
+        {
+        }
+
+        [Test]
+        public void Test_347_09()
+        {
+        }
+
+        [Test]
+        public void Test_347_10()
+        {
+        }
+
+        [Test]
+        public void Test_347_11()
+        {
+        }
+
+        [Test]
+        public void Test_347_12()
+        {
+        }
+
+        [Test]
+        public void Test_347_13()
+        {
+        }
+
+        [Test]
+        public void Test_347_14()
+        {
+        }
+
+        [Test]
+        public void Test_347_15()
+        {
+        }
+
+        [Test]
+        public void Test_347_16()
+        {
+        }
+
+        [Test]
+        public void Test_347_17()
+        {
+        }
+
+        [Test]
+        public void Test_347_18()
+        {
+        }
+
+        [Test]
+        public void Test_347_19()
+        {
+        }
+
+        [Test]
+        public void Test_347_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_348
+    {
+        #region PassingTests
+        [Test]
+        public void Test_348_01()
+        {
+        }
+
+        [Test]
+        public void Test_348_02()
+        {
+        }
+
+        [Test]
+        public void Test_348_03()
+        {
+        }
+
+        [Test]
+        public void Test_348_04()
+        {
+        }
+
+        [Test]
+        public void Test_348_05()
+        {
+        }
+
+        [Test]
+        public void Test_348_06()
+        {
+        }
+
+        [Test]
+        public void Test_348_07()
+        {
+        }
+
+        [Test]
+        public void Test_348_08()
+        {
+        }
+
+        [Test]
+        public void Test_348_09()
+        {
+        }
+
+        [Test]
+        public void Test_348_10()
+        {
+        }
+
+        [Test]
+        public void Test_348_11()
+        {
+        }
+
+        [Test]
+        public void Test_348_12()
+        {
+        }
+
+        [Test]
+        public void Test_348_13()
+        {
+        }
+
+        [Test]
+        public void Test_348_14()
+        {
+        }
+
+        [Test]
+        public void Test_348_15()
+        {
+        }
+
+        [Test]
+        public void Test_348_16()
+        {
+        }
+
+        [Test]
+        public void Test_348_17()
+        {
+        }
+
+        [Test]
+        public void Test_348_18()
+        {
+        }
+
+        [Test]
+        public void Test_348_19()
+        {
+        }
+
+        [Test]
+        public void Test_348_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_349
+    {
+        #region PassingTests
+        [Test]
+        public void Test_349_01()
+        {
+        }
+
+        [Test]
+        public void Test_349_02()
+        {
+        }
+
+        [Test]
+        public void Test_349_03()
+        {
+        }
+
+        [Test]
+        public void Test_349_04()
+        {
+        }
+
+        [Test]
+        public void Test_349_05()
+        {
+        }
+
+        [Test]
+        public void Test_349_06()
+        {
+        }
+
+        [Test]
+        public void Test_349_07()
+        {
+        }
+
+        [Test]
+        public void Test_349_08()
+        {
+        }
+
+        [Test]
+        public void Test_349_09()
+        {
+        }
+
+        [Test]
+        public void Test_349_10()
+        {
+        }
+
+        [Test]
+        public void Test_349_11()
+        {
+        }
+
+        [Test]
+        public void Test_349_12()
+        {
+        }
+
+        [Test]
+        public void Test_349_13()
+        {
+        }
+
+        [Test]
+        public void Test_349_14()
+        {
+        }
+
+        [Test]
+        public void Test_349_15()
+        {
+        }
+
+        [Test]
+        public void Test_349_16()
+        {
+        }
+
+        [Test]
+        public void Test_349_17()
+        {
+        }
+
+        [Test]
+        public void Test_349_18()
+        {
+        }
+
+        [Test]
+        public void Test_349_19()
+        {
+        }
+
+        [Test]
+        public void Test_349_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_350
+    {
+        #region PassingTests
+        [Test]
+        public void Test_350_01()
+        {
+        }
+
+        [Test]
+        public void Test_350_02()
+        {
+        }
+
+        [Test]
+        public void Test_350_03()
+        {
+        }
+
+        [Test]
+        public void Test_350_04()
+        {
+        }
+
+        [Test]
+        public void Test_350_05()
+        {
+        }
+
+        [Test]
+        public void Test_350_06()
+        {
+        }
+
+        [Test]
+        public void Test_350_07()
+        {
+        }
+
+        [Test]
+        public void Test_350_08()
+        {
+        }
+
+        [Test]
+        public void Test_350_09()
+        {
+        }
+
+        [Test]
+        public void Test_350_10()
+        {
+        }
+
+        [Test]
+        public void Test_350_11()
+        {
+        }
+
+        [Test]
+        public void Test_350_12()
+        {
+        }
+
+        [Test]
+        public void Test_350_13()
+        {
+        }
+
+        [Test]
+        public void Test_350_14()
+        {
+        }
+
+        [Test]
+        public void Test_350_15()
+        {
+        }
+
+        [Test]
+        public void Test_350_16()
+        {
+        }
+
+        [Test]
+        public void Test_350_17()
+        {
+        }
+
+        [Test]
+        public void Test_350_18()
+        {
+        }
+
+        [Test]
+        public void Test_350_19()
+        {
+        }
+
+        [Test]
+        public void Test_350_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_351
+    {
+        #region PassingTests
+        [Test]
+        public void Test_351_01()
+        {
+        }
+
+        [Test]
+        public void Test_351_02()
+        {
+        }
+
+        [Test]
+        public void Test_351_03()
+        {
+        }
+
+        [Test]
+        public void Test_351_04()
+        {
+        }
+
+        [Test]
+        public void Test_351_05()
+        {
+        }
+
+        [Test]
+        public void Test_351_06()
+        {
+        }
+
+        [Test]
+        public void Test_351_07()
+        {
+        }
+
+        [Test]
+        public void Test_351_08()
+        {
+        }
+
+        [Test]
+        public void Test_351_09()
+        {
+        }
+
+        [Test]
+        public void Test_351_10()
+        {
+        }
+
+        [Test]
+        public void Test_351_11()
+        {
+        }
+
+        [Test]
+        public void Test_351_12()
+        {
+        }
+
+        [Test]
+        public void Test_351_13()
+        {
+        }
+
+        [Test]
+        public void Test_351_14()
+        {
+        }
+
+        [Test]
+        public void Test_351_15()
+        {
+        }
+
+        [Test]
+        public void Test_351_16()
+        {
+        }
+
+        [Test]
+        public void Test_351_17()
+        {
+        }
+
+        [Test]
+        public void Test_351_18()
+        {
+        }
+
+        [Test]
+        public void Test_351_19()
+        {
+        }
+
+        [Test]
+        public void Test_351_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_352
+    {
+        #region PassingTests
+        [Test]
+        public void Test_352_01()
+        {
+        }
+
+        [Test]
+        public void Test_352_02()
+        {
+        }
+
+        [Test]
+        public void Test_352_03()
+        {
+        }
+
+        [Test]
+        public void Test_352_04()
+        {
+        }
+
+        [Test]
+        public void Test_352_05()
+        {
+        }
+
+        [Test]
+        public void Test_352_06()
+        {
+        }
+
+        [Test]
+        public void Test_352_07()
+        {
+        }
+
+        [Test]
+        public void Test_352_08()
+        {
+        }
+
+        [Test]
+        public void Test_352_09()
+        {
+        }
+
+        [Test]
+        public void Test_352_10()
+        {
+        }
+
+        [Test]
+        public void Test_352_11()
+        {
+        }
+
+        [Test]
+        public void Test_352_12()
+        {
+        }
+
+        [Test]
+        public void Test_352_13()
+        {
+        }
+
+        [Test]
+        public void Test_352_14()
+        {
+        }
+
+        [Test]
+        public void Test_352_15()
+        {
+        }
+
+        [Test]
+        public void Test_352_16()
+        {
+        }
+
+        [Test]
+        public void Test_352_17()
+        {
+        }
+
+        [Test]
+        public void Test_352_18()
+        {
+        }
+
+        [Test]
+        public void Test_352_19()
+        {
+        }
+
+        [Test]
+        public void Test_352_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_353
+    {
+        #region PassingTests
+        [Test]
+        public void Test_353_01()
+        {
+        }
+
+        [Test]
+        public void Test_353_02()
+        {
+        }
+
+        [Test]
+        public void Test_353_03()
+        {
+        }
+
+        [Test]
+        public void Test_353_04()
+        {
+        }
+
+        [Test]
+        public void Test_353_05()
+        {
+        }
+
+        [Test]
+        public void Test_353_06()
+        {
+        }
+
+        [Test]
+        public void Test_353_07()
+        {
+        }
+
+        [Test]
+        public void Test_353_08()
+        {
+        }
+
+        [Test]
+        public void Test_353_09()
+        {
+        }
+
+        [Test]
+        public void Test_353_10()
+        {
+        }
+
+        [Test]
+        public void Test_353_11()
+        {
+        }
+
+        [Test]
+        public void Test_353_12()
+        {
+        }
+
+        [Test]
+        public void Test_353_13()
+        {
+        }
+
+        [Test]
+        public void Test_353_14()
+        {
+        }
+
+        [Test]
+        public void Test_353_15()
+        {
+        }
+
+        [Test]
+        public void Test_353_16()
+        {
+        }
+
+        [Test]
+        public void Test_353_17()
+        {
+        }
+
+        [Test]
+        public void Test_353_18()
+        {
+        }
+
+        [Test]
+        public void Test_353_19()
+        {
+        }
+
+        [Test]
+        public void Test_353_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_354
+    {
+        #region PassingTests
+        [Test]
+        public void Test_354_01()
+        {
+        }
+
+        [Test]
+        public void Test_354_02()
+        {
+        }
+
+        [Test]
+        public void Test_354_03()
+        {
+        }
+
+        [Test]
+        public void Test_354_04()
+        {
+        }
+
+        [Test]
+        public void Test_354_05()
+        {
+        }
+
+        [Test]
+        public void Test_354_06()
+        {
+        }
+
+        [Test]
+        public void Test_354_07()
+        {
+        }
+
+        [Test]
+        public void Test_354_08()
+        {
+        }
+
+        [Test]
+        public void Test_354_09()
+        {
+        }
+
+        [Test]
+        public void Test_354_10()
+        {
+        }
+
+        [Test]
+        public void Test_354_11()
+        {
+        }
+
+        [Test]
+        public void Test_354_12()
+        {
+        }
+
+        [Test]
+        public void Test_354_13()
+        {
+        }
+
+        [Test]
+        public void Test_354_14()
+        {
+        }
+
+        [Test]
+        public void Test_354_15()
+        {
+        }
+
+        [Test]
+        public void Test_354_16()
+        {
+        }
+
+        [Test]
+        public void Test_354_17()
+        {
+        }
+
+        [Test]
+        public void Test_354_18()
+        {
+        }
+
+        [Test]
+        public void Test_354_19()
+        {
+        }
+
+        [Test]
+        public void Test_354_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_355
+    {
+        #region PassingTests
+        [Test]
+        public void Test_355_01()
+        {
+        }
+
+        [Test]
+        public void Test_355_02()
+        {
+        }
+
+        [Test]
+        public void Test_355_03()
+        {
+        }
+
+        [Test]
+        public void Test_355_04()
+        {
+        }
+
+        [Test]
+        public void Test_355_05()
+        {
+        }
+
+        [Test]
+        public void Test_355_06()
+        {
+        }
+
+        [Test]
+        public void Test_355_07()
+        {
+        }
+
+        [Test]
+        public void Test_355_08()
+        {
+        }
+
+        [Test]
+        public void Test_355_09()
+        {
+        }
+
+        [Test]
+        public void Test_355_10()
+        {
+        }
+
+        [Test]
+        public void Test_355_11()
+        {
+        }
+
+        [Test]
+        public void Test_355_12()
+        {
+        }
+
+        [Test]
+        public void Test_355_13()
+        {
+        }
+
+        [Test]
+        public void Test_355_14()
+        {
+        }
+
+        [Test]
+        public void Test_355_15()
+        {
+        }
+
+        [Test]
+        public void Test_355_16()
+        {
+        }
+
+        [Test]
+        public void Test_355_17()
+        {
+        }
+
+        [Test]
+        public void Test_355_18()
+        {
+        }
+
+        [Test]
+        public void Test_355_19()
+        {
+        }
+
+        [Test]
+        public void Test_355_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_356
+    {
+        #region PassingTests
+        [Test]
+        public void Test_356_01()
+        {
+        }
+
+        [Test]
+        public void Test_356_02()
+        {
+        }
+
+        [Test]
+        public void Test_356_03()
+        {
+        }
+
+        [Test]
+        public void Test_356_04()
+        {
+        }
+
+        [Test]
+        public void Test_356_05()
+        {
+        }
+
+        [Test]
+        public void Test_356_06()
+        {
+        }
+
+        [Test]
+        public void Test_356_07()
+        {
+        }
+
+        [Test]
+        public void Test_356_08()
+        {
+        }
+
+        [Test]
+        public void Test_356_09()
+        {
+        }
+
+        [Test]
+        public void Test_356_10()
+        {
+        }
+
+        [Test]
+        public void Test_356_11()
+        {
+        }
+
+        [Test]
+        public void Test_356_12()
+        {
+        }
+
+        [Test]
+        public void Test_356_13()
+        {
+        }
+
+        [Test]
+        public void Test_356_14()
+        {
+        }
+
+        [Test]
+        public void Test_356_15()
+        {
+        }
+
+        [Test]
+        public void Test_356_16()
+        {
+        }
+
+        [Test]
+        public void Test_356_17()
+        {
+        }
+
+        [Test]
+        public void Test_356_18()
+        {
+        }
+
+        [Test]
+        public void Test_356_19()
+        {
+        }
+
+        [Test]
+        public void Test_356_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_357
+    {
+        #region PassingTests
+        [Test]
+        public void Test_357_01()
+        {
+        }
+
+        [Test]
+        public void Test_357_02()
+        {
+        }
+
+        [Test]
+        public void Test_357_03()
+        {
+        }
+
+        [Test]
+        public void Test_357_04()
+        {
+        }
+
+        [Test]
+        public void Test_357_05()
+        {
+        }
+
+        [Test]
+        public void Test_357_06()
+        {
+        }
+
+        [Test]
+        public void Test_357_07()
+        {
+        }
+
+        [Test]
+        public void Test_357_08()
+        {
+        }
+
+        [Test]
+        public void Test_357_09()
+        {
+        }
+
+        [Test]
+        public void Test_357_10()
+        {
+        }
+
+        [Test]
+        public void Test_357_11()
+        {
+        }
+
+        [Test]
+        public void Test_357_12()
+        {
+        }
+
+        [Test]
+        public void Test_357_13()
+        {
+        }
+
+        [Test]
+        public void Test_357_14()
+        {
+        }
+
+        [Test]
+        public void Test_357_15()
+        {
+        }
+
+        [Test]
+        public void Test_357_16()
+        {
+        }
+
+        [Test]
+        public void Test_357_17()
+        {
+        }
+
+        [Test]
+        public void Test_357_18()
+        {
+        }
+
+        [Test]
+        public void Test_357_19()
+        {
+        }
+
+        [Test]
+        public void Test_357_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_358
+    {
+        #region PassingTests
+        [Test]
+        public void Test_358_01()
+        {
+        }
+
+        [Test]
+        public void Test_358_02()
+        {
+        }
+
+        [Test]
+        public void Test_358_03()
+        {
+        }
+
+        [Test]
+        public void Test_358_04()
+        {
+        }
+
+        [Test]
+        public void Test_358_05()
+        {
+        }
+
+        [Test]
+        public void Test_358_06()
+        {
+        }
+
+        [Test]
+        public void Test_358_07()
+        {
+        }
+
+        [Test]
+        public void Test_358_08()
+        {
+        }
+
+        [Test]
+        public void Test_358_09()
+        {
+        }
+
+        [Test]
+        public void Test_358_10()
+        {
+        }
+
+        [Test]
+        public void Test_358_11()
+        {
+        }
+
+        [Test]
+        public void Test_358_12()
+        {
+        }
+
+        [Test]
+        public void Test_358_13()
+        {
+        }
+
+        [Test]
+        public void Test_358_14()
+        {
+        }
+
+        [Test]
+        public void Test_358_15()
+        {
+        }
+
+        [Test]
+        public void Test_358_16()
+        {
+        }
+
+        [Test]
+        public void Test_358_17()
+        {
+        }
+
+        [Test]
+        public void Test_358_18()
+        {
+        }
+
+        [Test]
+        public void Test_358_19()
+        {
+        }
+
+        [Test]
+        public void Test_358_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_359
+    {
+        #region PassingTests
+        [Test]
+        public void Test_359_01()
+        {
+        }
+
+        [Test]
+        public void Test_359_02()
+        {
+        }
+
+        [Test]
+        public void Test_359_03()
+        {
+        }
+
+        [Test]
+        public void Test_359_04()
+        {
+        }
+
+        [Test]
+        public void Test_359_05()
+        {
+        }
+
+        [Test]
+        public void Test_359_06()
+        {
+        }
+
+        [Test]
+        public void Test_359_07()
+        {
+        }
+
+        [Test]
+        public void Test_359_08()
+        {
+        }
+
+        [Test]
+        public void Test_359_09()
+        {
+        }
+
+        [Test]
+        public void Test_359_10()
+        {
+        }
+
+        [Test]
+        public void Test_359_11()
+        {
+        }
+
+        [Test]
+        public void Test_359_12()
+        {
+        }
+
+        [Test]
+        public void Test_359_13()
+        {
+        }
+
+        [Test]
+        public void Test_359_14()
+        {
+        }
+
+        [Test]
+        public void Test_359_15()
+        {
+        }
+
+        [Test]
+        public void Test_359_16()
+        {
+        }
+
+        [Test]
+        public void Test_359_17()
+        {
+        }
+
+        [Test]
+        public void Test_359_18()
+        {
+        }
+
+        [Test]
+        public void Test_359_19()
+        {
+        }
+
+        [Test]
+        public void Test_359_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_360
+    {
+        #region PassingTests
+        [Test]
+        public void Test_360_01()
+        {
+        }
+
+        [Test]
+        public void Test_360_02()
+        {
+        }
+
+        [Test]
+        public void Test_360_03()
+        {
+        }
+
+        [Test]
+        public void Test_360_04()
+        {
+        }
+
+        [Test]
+        public void Test_360_05()
+        {
+        }
+
+        [Test]
+        public void Test_360_06()
+        {
+        }
+
+        [Test]
+        public void Test_360_07()
+        {
+        }
+
+        [Test]
+        public void Test_360_08()
+        {
+        }
+
+        [Test]
+        public void Test_360_09()
+        {
+        }
+
+        [Test]
+        public void Test_360_10()
+        {
+        }
+
+        [Test]
+        public void Test_360_11()
+        {
+        }
+
+        [Test]
+        public void Test_360_12()
+        {
+        }
+
+        [Test]
+        public void Test_360_13()
+        {
+        }
+
+        [Test]
+        public void Test_360_14()
+        {
+        }
+
+        [Test]
+        public void Test_360_15()
+        {
+        }
+
+        [Test]
+        public void Test_360_16()
+        {
+        }
+
+        [Test]
+        public void Test_360_17()
+        {
+        }
+
+        [Test]
+        public void Test_360_18()
+        {
+        }
+
+        [Test]
+        public void Test_360_19()
+        {
+        }
+
+        [Test]
+        public void Test_360_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_361
+    {
+        #region PassingTests
+        [Test]
+        public void Test_361_01()
+        {
+        }
+
+        [Test]
+        public void Test_361_02()
+        {
+        }
+
+        [Test]
+        public void Test_361_03()
+        {
+        }
+
+        [Test]
+        public void Test_361_04()
+        {
+        }
+
+        [Test]
+        public void Test_361_05()
+        {
+        }
+
+        [Test]
+        public void Test_361_06()
+        {
+        }
+
+        [Test]
+        public void Test_361_07()
+        {
+        }
+
+        [Test]
+        public void Test_361_08()
+        {
+        }
+
+        [Test]
+        public void Test_361_09()
+        {
+        }
+
+        [Test]
+        public void Test_361_10()
+        {
+        }
+
+        [Test]
+        public void Test_361_11()
+        {
+        }
+
+        [Test]
+        public void Test_361_12()
+        {
+        }
+
+        [Test]
+        public void Test_361_13()
+        {
+        }
+
+        [Test]
+        public void Test_361_14()
+        {
+        }
+
+        [Test]
+        public void Test_361_15()
+        {
+        }
+
+        [Test]
+        public void Test_361_16()
+        {
+        }
+
+        [Test]
+        public void Test_361_17()
+        {
+        }
+
+        [Test]
+        public void Test_361_18()
+        {
+        }
+
+        [Test]
+        public void Test_361_19()
+        {
+        }
+
+        [Test]
+        public void Test_361_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_362
+    {
+        #region PassingTests
+        [Test]
+        public void Test_362_01()
+        {
+        }
+
+        [Test]
+        public void Test_362_02()
+        {
+        }
+
+        [Test]
+        public void Test_362_03()
+        {
+        }
+
+        [Test]
+        public void Test_362_04()
+        {
+        }
+
+        [Test]
+        public void Test_362_05()
+        {
+        }
+
+        [Test]
+        public void Test_362_06()
+        {
+        }
+
+        [Test]
+        public void Test_362_07()
+        {
+        }
+
+        [Test]
+        public void Test_362_08()
+        {
+        }
+
+        [Test]
+        public void Test_362_09()
+        {
+        }
+
+        [Test]
+        public void Test_362_10()
+        {
+        }
+
+        [Test]
+        public void Test_362_11()
+        {
+        }
+
+        [Test]
+        public void Test_362_12()
+        {
+        }
+
+        [Test]
+        public void Test_362_13()
+        {
+        }
+
+        [Test]
+        public void Test_362_14()
+        {
+        }
+
+        [Test]
+        public void Test_362_15()
+        {
+        }
+
+        [Test]
+        public void Test_362_16()
+        {
+        }
+
+        [Test]
+        public void Test_362_17()
+        {
+        }
+
+        [Test]
+        public void Test_362_18()
+        {
+        }
+
+        [Test]
+        public void Test_362_19()
+        {
+        }
+
+        [Test]
+        public void Test_362_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_363
+    {
+        #region PassingTests
+        [Test]
+        public void Test_363_01()
+        {
+        }
+
+        [Test]
+        public void Test_363_02()
+        {
+        }
+
+        [Test]
+        public void Test_363_03()
+        {
+        }
+
+        [Test]
+        public void Test_363_04()
+        {
+        }
+
+        [Test]
+        public void Test_363_05()
+        {
+        }
+
+        [Test]
+        public void Test_363_06()
+        {
+        }
+
+        [Test]
+        public void Test_363_07()
+        {
+        }
+
+        [Test]
+        public void Test_363_08()
+        {
+        }
+
+        [Test]
+        public void Test_363_09()
+        {
+        }
+
+        [Test]
+        public void Test_363_10()
+        {
+        }
+
+        [Test]
+        public void Test_363_11()
+        {
+        }
+
+        [Test]
+        public void Test_363_12()
+        {
+        }
+
+        [Test]
+        public void Test_363_13()
+        {
+        }
+
+        [Test]
+        public void Test_363_14()
+        {
+        }
+
+        [Test]
+        public void Test_363_15()
+        {
+        }
+
+        [Test]
+        public void Test_363_16()
+        {
+        }
+
+        [Test]
+        public void Test_363_17()
+        {
+        }
+
+        [Test]
+        public void Test_363_18()
+        {
+        }
+
+        [Test]
+        public void Test_363_19()
+        {
+        }
+
+        [Test]
+        public void Test_363_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_364
+    {
+        #region PassingTests
+        [Test]
+        public void Test_364_01()
+        {
+        }
+
+        [Test]
+        public void Test_364_02()
+        {
+        }
+
+        [Test]
+        public void Test_364_03()
+        {
+        }
+
+        [Test]
+        public void Test_364_04()
+        {
+        }
+
+        [Test]
+        public void Test_364_05()
+        {
+        }
+
+        [Test]
+        public void Test_364_06()
+        {
+        }
+
+        [Test]
+        public void Test_364_07()
+        {
+        }
+
+        [Test]
+        public void Test_364_08()
+        {
+        }
+
+        [Test]
+        public void Test_364_09()
+        {
+        }
+
+        [Test]
+        public void Test_364_10()
+        {
+        }
+
+        [Test]
+        public void Test_364_11()
+        {
+        }
+
+        [Test]
+        public void Test_364_12()
+        {
+        }
+
+        [Test]
+        public void Test_364_13()
+        {
+        }
+
+        [Test]
+        public void Test_364_14()
+        {
+        }
+
+        [Test]
+        public void Test_364_15()
+        {
+        }
+
+        [Test]
+        public void Test_364_16()
+        {
+        }
+
+        [Test]
+        public void Test_364_17()
+        {
+        }
+
+        [Test]
+        public void Test_364_18()
+        {
+        }
+
+        [Test]
+        public void Test_364_19()
+        {
+        }
+
+        [Test]
+        public void Test_364_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_365
+    {
+        #region PassingTests
+        [Test]
+        public void Test_365_01()
+        {
+        }
+
+        [Test]
+        public void Test_365_02()
+        {
+        }
+
+        [Test]
+        public void Test_365_03()
+        {
+        }
+
+        [Test]
+        public void Test_365_04()
+        {
+        }
+
+        [Test]
+        public void Test_365_05()
+        {
+        }
+
+        [Test]
+        public void Test_365_06()
+        {
+        }
+
+        [Test]
+        public void Test_365_07()
+        {
+        }
+
+        [Test]
+        public void Test_365_08()
+        {
+        }
+
+        [Test]
+        public void Test_365_09()
+        {
+        }
+
+        [Test]
+        public void Test_365_10()
+        {
+        }
+
+        [Test]
+        public void Test_365_11()
+        {
+        }
+
+        [Test]
+        public void Test_365_12()
+        {
+        }
+
+        [Test]
+        public void Test_365_13()
+        {
+        }
+
+        [Test]
+        public void Test_365_14()
+        {
+        }
+
+        [Test]
+        public void Test_365_15()
+        {
+        }
+
+        [Test]
+        public void Test_365_16()
+        {
+        }
+
+        [Test]
+        public void Test_365_17()
+        {
+        }
+
+        [Test]
+        public void Test_365_18()
+        {
+        }
+
+        [Test]
+        public void Test_365_19()
+        {
+        }
+
+        [Test]
+        public void Test_365_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_366
+    {
+        #region PassingTests
+        [Test]
+        public void Test_366_01()
+        {
+        }
+
+        [Test]
+        public void Test_366_02()
+        {
+        }
+
+        [Test]
+        public void Test_366_03()
+        {
+        }
+
+        [Test]
+        public void Test_366_04()
+        {
+        }
+
+        [Test]
+        public void Test_366_05()
+        {
+        }
+
+        [Test]
+        public void Test_366_06()
+        {
+        }
+
+        [Test]
+        public void Test_366_07()
+        {
+        }
+
+        [Test]
+        public void Test_366_08()
+        {
+        }
+
+        [Test]
+        public void Test_366_09()
+        {
+        }
+
+        [Test]
+        public void Test_366_10()
+        {
+        }
+
+        [Test]
+        public void Test_366_11()
+        {
+        }
+
+        [Test]
+        public void Test_366_12()
+        {
+        }
+
+        [Test]
+        public void Test_366_13()
+        {
+        }
+
+        [Test]
+        public void Test_366_14()
+        {
+        }
+
+        [Test]
+        public void Test_366_15()
+        {
+        }
+
+        [Test]
+        public void Test_366_16()
+        {
+        }
+
+        [Test]
+        public void Test_366_17()
+        {
+        }
+
+        [Test]
+        public void Test_366_18()
+        {
+        }
+
+        [Test]
+        public void Test_366_19()
+        {
+        }
+
+        [Test]
+        public void Test_366_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_367
+    {
+        #region PassingTests
+        [Test]
+        public void Test_367_01()
+        {
+        }
+
+        [Test]
+        public void Test_367_02()
+        {
+        }
+
+        [Test]
+        public void Test_367_03()
+        {
+        }
+
+        [Test]
+        public void Test_367_04()
+        {
+        }
+
+        [Test]
+        public void Test_367_05()
+        {
+        }
+
+        [Test]
+        public void Test_367_06()
+        {
+        }
+
+        [Test]
+        public void Test_367_07()
+        {
+        }
+
+        [Test]
+        public void Test_367_08()
+        {
+        }
+
+        [Test]
+        public void Test_367_09()
+        {
+        }
+
+        [Test]
+        public void Test_367_10()
+        {
+        }
+
+        [Test]
+        public void Test_367_11()
+        {
+        }
+
+        [Test]
+        public void Test_367_12()
+        {
+        }
+
+        [Test]
+        public void Test_367_13()
+        {
+        }
+
+        [Test]
+        public void Test_367_14()
+        {
+        }
+
+        [Test]
+        public void Test_367_15()
+        {
+        }
+
+        [Test]
+        public void Test_367_16()
+        {
+        }
+
+        [Test]
+        public void Test_367_17()
+        {
+        }
+
+        [Test]
+        public void Test_367_18()
+        {
+        }
+
+        [Test]
+        public void Test_367_19()
+        {
+        }
+
+        [Test]
+        public void Test_367_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_368
+    {
+        #region PassingTests
+        [Test]
+        public void Test_368_01()
+        {
+        }
+
+        [Test]
+        public void Test_368_02()
+        {
+        }
+
+        [Test]
+        public void Test_368_03()
+        {
+        }
+
+        [Test]
+        public void Test_368_04()
+        {
+        }
+
+        [Test]
+        public void Test_368_05()
+        {
+        }
+
+        [Test]
+        public void Test_368_06()
+        {
+        }
+
+        [Test]
+        public void Test_368_07()
+        {
+        }
+
+        [Test]
+        public void Test_368_08()
+        {
+        }
+
+        [Test]
+        public void Test_368_09()
+        {
+        }
+
+        [Test]
+        public void Test_368_10()
+        {
+        }
+
+        [Test]
+        public void Test_368_11()
+        {
+        }
+
+        [Test]
+        public void Test_368_12()
+        {
+        }
+
+        [Test]
+        public void Test_368_13()
+        {
+        }
+
+        [Test]
+        public void Test_368_14()
+        {
+        }
+
+        [Test]
+        public void Test_368_15()
+        {
+        }
+
+        [Test]
+        public void Test_368_16()
+        {
+        }
+
+        [Test]
+        public void Test_368_17()
+        {
+        }
+
+        [Test]
+        public void Test_368_18()
+        {
+        }
+
+        [Test]
+        public void Test_368_19()
+        {
+        }
+
+        [Test]
+        public void Test_368_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_369
+    {
+        #region PassingTests
+        [Test]
+        public void Test_369_01()
+        {
+        }
+
+        [Test]
+        public void Test_369_02()
+        {
+        }
+
+        [Test]
+        public void Test_369_03()
+        {
+        }
+
+        [Test]
+        public void Test_369_04()
+        {
+        }
+
+        [Test]
+        public void Test_369_05()
+        {
+        }
+
+        [Test]
+        public void Test_369_06()
+        {
+        }
+
+        [Test]
+        public void Test_369_07()
+        {
+        }
+
+        [Test]
+        public void Test_369_08()
+        {
+        }
+
+        [Test]
+        public void Test_369_09()
+        {
+        }
+
+        [Test]
+        public void Test_369_10()
+        {
+        }
+
+        [Test]
+        public void Test_369_11()
+        {
+        }
+
+        [Test]
+        public void Test_369_12()
+        {
+        }
+
+        [Test]
+        public void Test_369_13()
+        {
+        }
+
+        [Test]
+        public void Test_369_14()
+        {
+        }
+
+        [Test]
+        public void Test_369_15()
+        {
+        }
+
+        [Test]
+        public void Test_369_16()
+        {
+        }
+
+        [Test]
+        public void Test_369_17()
+        {
+        }
+
+        [Test]
+        public void Test_369_18()
+        {
+        }
+
+        [Test]
+        public void Test_369_19()
+        {
+        }
+
+        [Test]
+        public void Test_369_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_370
+    {
+        #region PassingTests
+        [Test]
+        public void Test_370_01()
+        {
+        }
+
+        [Test]
+        public void Test_370_02()
+        {
+        }
+
+        [Test]
+        public void Test_370_03()
+        {
+        }
+
+        [Test]
+        public void Test_370_04()
+        {
+        }
+
+        [Test]
+        public void Test_370_05()
+        {
+        }
+
+        [Test]
+        public void Test_370_06()
+        {
+        }
+
+        [Test]
+        public void Test_370_07()
+        {
+        }
+
+        [Test]
+        public void Test_370_08()
+        {
+        }
+
+        [Test]
+        public void Test_370_09()
+        {
+        }
+
+        [Test]
+        public void Test_370_10()
+        {
+        }
+
+        [Test]
+        public void Test_370_11()
+        {
+        }
+
+        [Test]
+        public void Test_370_12()
+        {
+        }
+
+        [Test]
+        public void Test_370_13()
+        {
+        }
+
+        [Test]
+        public void Test_370_14()
+        {
+        }
+
+        [Test]
+        public void Test_370_15()
+        {
+        }
+
+        [Test]
+        public void Test_370_16()
+        {
+        }
+
+        [Test]
+        public void Test_370_17()
+        {
+        }
+
+        [Test]
+        public void Test_370_18()
+        {
+        }
+
+        [Test]
+        public void Test_370_19()
+        {
+        }
+
+        [Test]
+        public void Test_370_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_371
+    {
+        #region PassingTests
+        [Test]
+        public void Test_371_01()
+        {
+        }
+
+        [Test]
+        public void Test_371_02()
+        {
+        }
+
+        [Test]
+        public void Test_371_03()
+        {
+        }
+
+        [Test]
+        public void Test_371_04()
+        {
+        }
+
+        [Test]
+        public void Test_371_05()
+        {
+        }
+
+        [Test]
+        public void Test_371_06()
+        {
+        }
+
+        [Test]
+        public void Test_371_07()
+        {
+        }
+
+        [Test]
+        public void Test_371_08()
+        {
+        }
+
+        [Test]
+        public void Test_371_09()
+        {
+        }
+
+        [Test]
+        public void Test_371_10()
+        {
+        }
+
+        [Test]
+        public void Test_371_11()
+        {
+        }
+
+        [Test]
+        public void Test_371_12()
+        {
+        }
+
+        [Test]
+        public void Test_371_13()
+        {
+        }
+
+        [Test]
+        public void Test_371_14()
+        {
+        }
+
+        [Test]
+        public void Test_371_15()
+        {
+        }
+
+        [Test]
+        public void Test_371_16()
+        {
+        }
+
+        [Test]
+        public void Test_371_17()
+        {
+        }
+
+        [Test]
+        public void Test_371_18()
+        {
+        }
+
+        [Test]
+        public void Test_371_19()
+        {
+        }
+
+        [Test]
+        public void Test_371_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_372
+    {
+        #region PassingTests
+        [Test]
+        public void Test_372_01()
+        {
+        }
+
+        [Test]
+        public void Test_372_02()
+        {
+        }
+
+        [Test]
+        public void Test_372_03()
+        {
+        }
+
+        [Test]
+        public void Test_372_04()
+        {
+        }
+
+        [Test]
+        public void Test_372_05()
+        {
+        }
+
+        [Test]
+        public void Test_372_06()
+        {
+        }
+
+        [Test]
+        public void Test_372_07()
+        {
+        }
+
+        [Test]
+        public void Test_372_08()
+        {
+        }
+
+        [Test]
+        public void Test_372_09()
+        {
+        }
+
+        [Test]
+        public void Test_372_10()
+        {
+        }
+
+        [Test]
+        public void Test_372_11()
+        {
+        }
+
+        [Test]
+        public void Test_372_12()
+        {
+        }
+
+        [Test]
+        public void Test_372_13()
+        {
+        }
+
+        [Test]
+        public void Test_372_14()
+        {
+        }
+
+        [Test]
+        public void Test_372_15()
+        {
+        }
+
+        [Test]
+        public void Test_372_16()
+        {
+        }
+
+        [Test]
+        public void Test_372_17()
+        {
+        }
+
+        [Test]
+        public void Test_372_18()
+        {
+        }
+
+        [Test]
+        public void Test_372_19()
+        {
+        }
+
+        [Test]
+        public void Test_372_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_373
+    {
+        #region PassingTests
+        [Test]
+        public void Test_373_01()
+        {
+        }
+
+        [Test]
+        public void Test_373_02()
+        {
+        }
+
+        [Test]
+        public void Test_373_03()
+        {
+        }
+
+        [Test]
+        public void Test_373_04()
+        {
+        }
+
+        [Test]
+        public void Test_373_05()
+        {
+        }
+
+        [Test]
+        public void Test_373_06()
+        {
+        }
+
+        [Test]
+        public void Test_373_07()
+        {
+        }
+
+        [Test]
+        public void Test_373_08()
+        {
+        }
+
+        [Test]
+        public void Test_373_09()
+        {
+        }
+
+        [Test]
+        public void Test_373_10()
+        {
+        }
+
+        [Test]
+        public void Test_373_11()
+        {
+        }
+
+        [Test]
+        public void Test_373_12()
+        {
+        }
+
+        [Test]
+        public void Test_373_13()
+        {
+        }
+
+        [Test]
+        public void Test_373_14()
+        {
+        }
+
+        [Test]
+        public void Test_373_15()
+        {
+        }
+
+        [Test]
+        public void Test_373_16()
+        {
+        }
+
+        [Test]
+        public void Test_373_17()
+        {
+        }
+
+        [Test]
+        public void Test_373_18()
+        {
+        }
+
+        [Test]
+        public void Test_373_19()
+        {
+        }
+
+        [Test]
+        public void Test_373_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_374
+    {
+        #region PassingTests
+        [Test]
+        public void Test_374_01()
+        {
+        }
+
+        [Test]
+        public void Test_374_02()
+        {
+        }
+
+        [Test]
+        public void Test_374_03()
+        {
+        }
+
+        [Test]
+        public void Test_374_04()
+        {
+        }
+
+        [Test]
+        public void Test_374_05()
+        {
+        }
+
+        [Test]
+        public void Test_374_06()
+        {
+        }
+
+        [Test]
+        public void Test_374_07()
+        {
+        }
+
+        [Test]
+        public void Test_374_08()
+        {
+        }
+
+        [Test]
+        public void Test_374_09()
+        {
+        }
+
+        [Test]
+        public void Test_374_10()
+        {
+        }
+
+        [Test]
+        public void Test_374_11()
+        {
+        }
+
+        [Test]
+        public void Test_374_12()
+        {
+        }
+
+        [Test]
+        public void Test_374_13()
+        {
+        }
+
+        [Test]
+        public void Test_374_14()
+        {
+        }
+
+        [Test]
+        public void Test_374_15()
+        {
+        }
+
+        [Test]
+        public void Test_374_16()
+        {
+        }
+
+        [Test]
+        public void Test_374_17()
+        {
+        }
+
+        [Test]
+        public void Test_374_18()
+        {
+        }
+
+        [Test]
+        public void Test_374_19()
+        {
+        }
+
+        [Test]
+        public void Test_374_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_375
+    {
+        #region PassingTests
+        [Test]
+        public void Test_375_01()
+        {
+        }
+
+        [Test]
+        public void Test_375_02()
+        {
+        }
+
+        [Test]
+        public void Test_375_03()
+        {
+        }
+
+        [Test]
+        public void Test_375_04()
+        {
+        }
+
+        [Test]
+        public void Test_375_05()
+        {
+        }
+
+        [Test]
+        public void Test_375_06()
+        {
+        }
+
+        [Test]
+        public void Test_375_07()
+        {
+        }
+
+        [Test]
+        public void Test_375_08()
+        {
+        }
+
+        [Test]
+        public void Test_375_09()
+        {
+        }
+
+        [Test]
+        public void Test_375_10()
+        {
+        }
+
+        [Test]
+        public void Test_375_11()
+        {
+        }
+
+        [Test]
+        public void Test_375_12()
+        {
+        }
+
+        [Test]
+        public void Test_375_13()
+        {
+        }
+
+        [Test]
+        public void Test_375_14()
+        {
+        }
+
+        [Test]
+        public void Test_375_15()
+        {
+        }
+
+        [Test]
+        public void Test_375_16()
+        {
+        }
+
+        [Test]
+        public void Test_375_17()
+        {
+        }
+
+        [Test]
+        public void Test_375_18()
+        {
+        }
+
+        [Test]
+        public void Test_375_19()
+        {
+        }
+
+        [Test]
+        public void Test_375_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_376
+    {
+        #region PassingTests
+        [Test]
+        public void Test_376_01()
+        {
+        }
+
+        [Test]
+        public void Test_376_02()
+        {
+        }
+
+        [Test]
+        public void Test_376_03()
+        {
+        }
+
+        [Test]
+        public void Test_376_04()
+        {
+        }
+
+        [Test]
+        public void Test_376_05()
+        {
+        }
+
+        [Test]
+        public void Test_376_06()
+        {
+        }
+
+        [Test]
+        public void Test_376_07()
+        {
+        }
+
+        [Test]
+        public void Test_376_08()
+        {
+        }
+
+        [Test]
+        public void Test_376_09()
+        {
+        }
+
+        [Test]
+        public void Test_376_10()
+        {
+        }
+
+        [Test]
+        public void Test_376_11()
+        {
+        }
+
+        [Test]
+        public void Test_376_12()
+        {
+        }
+
+        [Test]
+        public void Test_376_13()
+        {
+        }
+
+        [Test]
+        public void Test_376_14()
+        {
+        }
+
+        [Test]
+        public void Test_376_15()
+        {
+        }
+
+        [Test]
+        public void Test_376_16()
+        {
+        }
+
+        [Test]
+        public void Test_376_17()
+        {
+        }
+
+        [Test]
+        public void Test_376_18()
+        {
+        }
+
+        [Test]
+        public void Test_376_19()
+        {
+        }
+
+        [Test]
+        public void Test_376_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_377
+    {
+        #region PassingTests
+        [Test]
+        public void Test_377_01()
+        {
+        }
+
+        [Test]
+        public void Test_377_02()
+        {
+        }
+
+        [Test]
+        public void Test_377_03()
+        {
+        }
+
+        [Test]
+        public void Test_377_04()
+        {
+        }
+
+        [Test]
+        public void Test_377_05()
+        {
+        }
+
+        [Test]
+        public void Test_377_06()
+        {
+        }
+
+        [Test]
+        public void Test_377_07()
+        {
+        }
+
+        [Test]
+        public void Test_377_08()
+        {
+        }
+
+        [Test]
+        public void Test_377_09()
+        {
+        }
+
+        [Test]
+        public void Test_377_10()
+        {
+        }
+
+        [Test]
+        public void Test_377_11()
+        {
+        }
+
+        [Test]
+        public void Test_377_12()
+        {
+        }
+
+        [Test]
+        public void Test_377_13()
+        {
+        }
+
+        [Test]
+        public void Test_377_14()
+        {
+        }
+
+        [Test]
+        public void Test_377_15()
+        {
+        }
+
+        [Test]
+        public void Test_377_16()
+        {
+        }
+
+        [Test]
+        public void Test_377_17()
+        {
+        }
+
+        [Test]
+        public void Test_377_18()
+        {
+        }
+
+        [Test]
+        public void Test_377_19()
+        {
+        }
+
+        [Test]
+        public void Test_377_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_378
+    {
+        #region PassingTests
+        [Test]
+        public void Test_378_01()
+        {
+        }
+
+        [Test]
+        public void Test_378_02()
+        {
+        }
+
+        [Test]
+        public void Test_378_03()
+        {
+        }
+
+        [Test]
+        public void Test_378_04()
+        {
+        }
+
+        [Test]
+        public void Test_378_05()
+        {
+        }
+
+        [Test]
+        public void Test_378_06()
+        {
+        }
+
+        [Test]
+        public void Test_378_07()
+        {
+        }
+
+        [Test]
+        public void Test_378_08()
+        {
+        }
+
+        [Test]
+        public void Test_378_09()
+        {
+        }
+
+        [Test]
+        public void Test_378_10()
+        {
+        }
+
+        [Test]
+        public void Test_378_11()
+        {
+        }
+
+        [Test]
+        public void Test_378_12()
+        {
+        }
+
+        [Test]
+        public void Test_378_13()
+        {
+        }
+
+        [Test]
+        public void Test_378_14()
+        {
+        }
+
+        [Test]
+        public void Test_378_15()
+        {
+        }
+
+        [Test]
+        public void Test_378_16()
+        {
+        }
+
+        [Test]
+        public void Test_378_17()
+        {
+        }
+
+        [Test]
+        public void Test_378_18()
+        {
+        }
+
+        [Test]
+        public void Test_378_19()
+        {
+        }
+
+        [Test]
+        public void Test_378_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_379
+    {
+        #region PassingTests
+        [Test]
+        public void Test_379_01()
+        {
+        }
+
+        [Test]
+        public void Test_379_02()
+        {
+        }
+
+        [Test]
+        public void Test_379_03()
+        {
+        }
+
+        [Test]
+        public void Test_379_04()
+        {
+        }
+
+        [Test]
+        public void Test_379_05()
+        {
+        }
+
+        [Test]
+        public void Test_379_06()
+        {
+        }
+
+        [Test]
+        public void Test_379_07()
+        {
+        }
+
+        [Test]
+        public void Test_379_08()
+        {
+        }
+
+        [Test]
+        public void Test_379_09()
+        {
+        }
+
+        [Test]
+        public void Test_379_10()
+        {
+        }
+
+        [Test]
+        public void Test_379_11()
+        {
+        }
+
+        [Test]
+        public void Test_379_12()
+        {
+        }
+
+        [Test]
+        public void Test_379_13()
+        {
+        }
+
+        [Test]
+        public void Test_379_14()
+        {
+        }
+
+        [Test]
+        public void Test_379_15()
+        {
+        }
+
+        [Test]
+        public void Test_379_16()
+        {
+        }
+
+        [Test]
+        public void Test_379_17()
+        {
+        }
+
+        [Test]
+        public void Test_379_18()
+        {
+        }
+
+        [Test]
+        public void Test_379_19()
+        {
+        }
+
+        [Test]
+        public void Test_379_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_380
+    {
+        #region PassingTests
+        [Test]
+        public void Test_380_01()
+        {
+        }
+
+        [Test]
+        public void Test_380_02()
+        {
+        }
+
+        [Test]
+        public void Test_380_03()
+        {
+        }
+
+        [Test]
+        public void Test_380_04()
+        {
+        }
+
+        [Test]
+        public void Test_380_05()
+        {
+        }
+
+        [Test]
+        public void Test_380_06()
+        {
+        }
+
+        [Test]
+        public void Test_380_07()
+        {
+        }
+
+        [Test]
+        public void Test_380_08()
+        {
+        }
+
+        [Test]
+        public void Test_380_09()
+        {
+        }
+
+        [Test]
+        public void Test_380_10()
+        {
+        }
+
+        [Test]
+        public void Test_380_11()
+        {
+        }
+
+        [Test]
+        public void Test_380_12()
+        {
+        }
+
+        [Test]
+        public void Test_380_13()
+        {
+        }
+
+        [Test]
+        public void Test_380_14()
+        {
+        }
+
+        [Test]
+        public void Test_380_15()
+        {
+        }
+
+        [Test]
+        public void Test_380_16()
+        {
+        }
+
+        [Test]
+        public void Test_380_17()
+        {
+        }
+
+        [Test]
+        public void Test_380_18()
+        {
+        }
+
+        [Test]
+        public void Test_380_19()
+        {
+        }
+
+        [Test]
+        public void Test_380_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_381
+    {
+        #region PassingTests
+        [Test]
+        public void Test_381_01()
+        {
+        }
+
+        [Test]
+        public void Test_381_02()
+        {
+        }
+
+        [Test]
+        public void Test_381_03()
+        {
+        }
+
+        [Test]
+        public void Test_381_04()
+        {
+        }
+
+        [Test]
+        public void Test_381_05()
+        {
+        }
+
+        [Test]
+        public void Test_381_06()
+        {
+        }
+
+        [Test]
+        public void Test_381_07()
+        {
+        }
+
+        [Test]
+        public void Test_381_08()
+        {
+        }
+
+        [Test]
+        public void Test_381_09()
+        {
+        }
+
+        [Test]
+        public void Test_381_10()
+        {
+        }
+
+        [Test]
+        public void Test_381_11()
+        {
+        }
+
+        [Test]
+        public void Test_381_12()
+        {
+        }
+
+        [Test]
+        public void Test_381_13()
+        {
+        }
+
+        [Test]
+        public void Test_381_14()
+        {
+        }
+
+        [Test]
+        public void Test_381_15()
+        {
+        }
+
+        [Test]
+        public void Test_381_16()
+        {
+        }
+
+        [Test]
+        public void Test_381_17()
+        {
+        }
+
+        [Test]
+        public void Test_381_18()
+        {
+        }
+
+        [Test]
+        public void Test_381_19()
+        {
+        }
+
+        [Test]
+        public void Test_381_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_382
+    {
+        #region PassingTests
+        [Test]
+        public void Test_382_01()
+        {
+        }
+
+        [Test]
+        public void Test_382_02()
+        {
+        }
+
+        [Test]
+        public void Test_382_03()
+        {
+        }
+
+        [Test]
+        public void Test_382_04()
+        {
+        }
+
+        [Test]
+        public void Test_382_05()
+        {
+        }
+
+        [Test]
+        public void Test_382_06()
+        {
+        }
+
+        [Test]
+        public void Test_382_07()
+        {
+        }
+
+        [Test]
+        public void Test_382_08()
+        {
+        }
+
+        [Test]
+        public void Test_382_09()
+        {
+        }
+
+        [Test]
+        public void Test_382_10()
+        {
+        }
+
+        [Test]
+        public void Test_382_11()
+        {
+        }
+
+        [Test]
+        public void Test_382_12()
+        {
+        }
+
+        [Test]
+        public void Test_382_13()
+        {
+        }
+
+        [Test]
+        public void Test_382_14()
+        {
+        }
+
+        [Test]
+        public void Test_382_15()
+        {
+        }
+
+        [Test]
+        public void Test_382_16()
+        {
+        }
+
+        [Test]
+        public void Test_382_17()
+        {
+        }
+
+        [Test]
+        public void Test_382_18()
+        {
+        }
+
+        [Test]
+        public void Test_382_19()
+        {
+        }
+
+        [Test]
+        public void Test_382_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_383
+    {
+        #region PassingTests
+        [Test]
+        public void Test_383_01()
+        {
+        }
+
+        [Test]
+        public void Test_383_02()
+        {
+        }
+
+        [Test]
+        public void Test_383_03()
+        {
+        }
+
+        [Test]
+        public void Test_383_04()
+        {
+        }
+
+        [Test]
+        public void Test_383_05()
+        {
+        }
+
+        [Test]
+        public void Test_383_06()
+        {
+        }
+
+        [Test]
+        public void Test_383_07()
+        {
+        }
+
+        [Test]
+        public void Test_383_08()
+        {
+        }
+
+        [Test]
+        public void Test_383_09()
+        {
+        }
+
+        [Test]
+        public void Test_383_10()
+        {
+        }
+
+        [Test]
+        public void Test_383_11()
+        {
+        }
+
+        [Test]
+        public void Test_383_12()
+        {
+        }
+
+        [Test]
+        public void Test_383_13()
+        {
+        }
+
+        [Test]
+        public void Test_383_14()
+        {
+        }
+
+        [Test]
+        public void Test_383_15()
+        {
+        }
+
+        [Test]
+        public void Test_383_16()
+        {
+        }
+
+        [Test]
+        public void Test_383_17()
+        {
+        }
+
+        [Test]
+        public void Test_383_18()
+        {
+        }
+
+        [Test]
+        public void Test_383_19()
+        {
+        }
+
+        [Test]
+        public void Test_383_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_384
+    {
+        #region PassingTests
+        [Test]
+        public void Test_384_01()
+        {
+        }
+
+        [Test]
+        public void Test_384_02()
+        {
+        }
+
+        [Test]
+        public void Test_384_03()
+        {
+        }
+
+        [Test]
+        public void Test_384_04()
+        {
+        }
+
+        [Test]
+        public void Test_384_05()
+        {
+        }
+
+        [Test]
+        public void Test_384_06()
+        {
+        }
+
+        [Test]
+        public void Test_384_07()
+        {
+        }
+
+        [Test]
+        public void Test_384_08()
+        {
+        }
+
+        [Test]
+        public void Test_384_09()
+        {
+        }
+
+        [Test]
+        public void Test_384_10()
+        {
+        }
+
+        [Test]
+        public void Test_384_11()
+        {
+        }
+
+        [Test]
+        public void Test_384_12()
+        {
+        }
+
+        [Test]
+        public void Test_384_13()
+        {
+        }
+
+        [Test]
+        public void Test_384_14()
+        {
+        }
+
+        [Test]
+        public void Test_384_15()
+        {
+        }
+
+        [Test]
+        public void Test_384_16()
+        {
+        }
+
+        [Test]
+        public void Test_384_17()
+        {
+        }
+
+        [Test]
+        public void Test_384_18()
+        {
+        }
+
+        [Test]
+        public void Test_384_19()
+        {
+        }
+
+        [Test]
+        public void Test_384_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_385
+    {
+        #region PassingTests
+        [Test]
+        public void Test_385_01()
+        {
+        }
+
+        [Test]
+        public void Test_385_02()
+        {
+        }
+
+        [Test]
+        public void Test_385_03()
+        {
+        }
+
+        [Test]
+        public void Test_385_04()
+        {
+        }
+
+        [Test]
+        public void Test_385_05()
+        {
+        }
+
+        [Test]
+        public void Test_385_06()
+        {
+        }
+
+        [Test]
+        public void Test_385_07()
+        {
+        }
+
+        [Test]
+        public void Test_385_08()
+        {
+        }
+
+        [Test]
+        public void Test_385_09()
+        {
+        }
+
+        [Test]
+        public void Test_385_10()
+        {
+        }
+
+        [Test]
+        public void Test_385_11()
+        {
+        }
+
+        [Test]
+        public void Test_385_12()
+        {
+        }
+
+        [Test]
+        public void Test_385_13()
+        {
+        }
+
+        [Test]
+        public void Test_385_14()
+        {
+        }
+
+        [Test]
+        public void Test_385_15()
+        {
+        }
+
+        [Test]
+        public void Test_385_16()
+        {
+        }
+
+        [Test]
+        public void Test_385_17()
+        {
+        }
+
+        [Test]
+        public void Test_385_18()
+        {
+        }
+
+        [Test]
+        public void Test_385_19()
+        {
+        }
+
+        [Test]
+        public void Test_385_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_386
+    {
+        #region PassingTests
+        [Test]
+        public void Test_386_01()
+        {
+        }
+
+        [Test]
+        public void Test_386_02()
+        {
+        }
+
+        [Test]
+        public void Test_386_03()
+        {
+        }
+
+        [Test]
+        public void Test_386_04()
+        {
+        }
+
+        [Test]
+        public void Test_386_05()
+        {
+        }
+
+        [Test]
+        public void Test_386_06()
+        {
+        }
+
+        [Test]
+        public void Test_386_07()
+        {
+        }
+
+        [Test]
+        public void Test_386_08()
+        {
+        }
+
+        [Test]
+        public void Test_386_09()
+        {
+        }
+
+        [Test]
+        public void Test_386_10()
+        {
+        }
+
+        [Test]
+        public void Test_386_11()
+        {
+        }
+
+        [Test]
+        public void Test_386_12()
+        {
+        }
+
+        [Test]
+        public void Test_386_13()
+        {
+        }
+
+        [Test]
+        public void Test_386_14()
+        {
+        }
+
+        [Test]
+        public void Test_386_15()
+        {
+        }
+
+        [Test]
+        public void Test_386_16()
+        {
+        }
+
+        [Test]
+        public void Test_386_17()
+        {
+        }
+
+        [Test]
+        public void Test_386_18()
+        {
+        }
+
+        [Test]
+        public void Test_386_19()
+        {
+        }
+
+        [Test]
+        public void Test_386_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_387
+    {
+        #region PassingTests
+        [Test]
+        public void Test_387_01()
+        {
+        }
+
+        [Test]
+        public void Test_387_02()
+        {
+        }
+
+        [Test]
+        public void Test_387_03()
+        {
+        }
+
+        [Test]
+        public void Test_387_04()
+        {
+        }
+
+        [Test]
+        public void Test_387_05()
+        {
+        }
+
+        [Test]
+        public void Test_387_06()
+        {
+        }
+
+        [Test]
+        public void Test_387_07()
+        {
+        }
+
+        [Test]
+        public void Test_387_08()
+        {
+        }
+
+        [Test]
+        public void Test_387_09()
+        {
+        }
+
+        [Test]
+        public void Test_387_10()
+        {
+        }
+
+        [Test]
+        public void Test_387_11()
+        {
+        }
+
+        [Test]
+        public void Test_387_12()
+        {
+        }
+
+        [Test]
+        public void Test_387_13()
+        {
+        }
+
+        [Test]
+        public void Test_387_14()
+        {
+        }
+
+        [Test]
+        public void Test_387_15()
+        {
+        }
+
+        [Test]
+        public void Test_387_16()
+        {
+        }
+
+        [Test]
+        public void Test_387_17()
+        {
+        }
+
+        [Test]
+        public void Test_387_18()
+        {
+        }
+
+        [Test]
+        public void Test_387_19()
+        {
+        }
+
+        [Test]
+        public void Test_387_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_388
+    {
+        #region PassingTests
+        [Test]
+        public void Test_388_01()
+        {
+        }
+
+        [Test]
+        public void Test_388_02()
+        {
+        }
+
+        [Test]
+        public void Test_388_03()
+        {
+        }
+
+        [Test]
+        public void Test_388_04()
+        {
+        }
+
+        [Test]
+        public void Test_388_05()
+        {
+        }
+
+        [Test]
+        public void Test_388_06()
+        {
+        }
+
+        [Test]
+        public void Test_388_07()
+        {
+        }
+
+        [Test]
+        public void Test_388_08()
+        {
+        }
+
+        [Test]
+        public void Test_388_09()
+        {
+        }
+
+        [Test]
+        public void Test_388_10()
+        {
+        }
+
+        [Test]
+        public void Test_388_11()
+        {
+        }
+
+        [Test]
+        public void Test_388_12()
+        {
+        }
+
+        [Test]
+        public void Test_388_13()
+        {
+        }
+
+        [Test]
+        public void Test_388_14()
+        {
+        }
+
+        [Test]
+        public void Test_388_15()
+        {
+        }
+
+        [Test]
+        public void Test_388_16()
+        {
+        }
+
+        [Test]
+        public void Test_388_17()
+        {
+        }
+
+        [Test]
+        public void Test_388_18()
+        {
+        }
+
+        [Test]
+        public void Test_388_19()
+        {
+        }
+
+        [Test]
+        public void Test_388_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_389
+    {
+        #region PassingTests
+        [Test]
+        public void Test_389_01()
+        {
+        }
+
+        [Test]
+        public void Test_389_02()
+        {
+        }
+
+        [Test]
+        public void Test_389_03()
+        {
+        }
+
+        [Test]
+        public void Test_389_04()
+        {
+        }
+
+        [Test]
+        public void Test_389_05()
+        {
+        }
+
+        [Test]
+        public void Test_389_06()
+        {
+        }
+
+        [Test]
+        public void Test_389_07()
+        {
+        }
+
+        [Test]
+        public void Test_389_08()
+        {
+        }
+
+        [Test]
+        public void Test_389_09()
+        {
+        }
+
+        [Test]
+        public void Test_389_10()
+        {
+        }
+
+        [Test]
+        public void Test_389_11()
+        {
+        }
+
+        [Test]
+        public void Test_389_12()
+        {
+        }
+
+        [Test]
+        public void Test_389_13()
+        {
+        }
+
+        [Test]
+        public void Test_389_14()
+        {
+        }
+
+        [Test]
+        public void Test_389_15()
+        {
+        }
+
+        [Test]
+        public void Test_389_16()
+        {
+        }
+
+        [Test]
+        public void Test_389_17()
+        {
+        }
+
+        [Test]
+        public void Test_389_18()
+        {
+        }
+
+        [Test]
+        public void Test_389_19()
+        {
+        }
+
+        [Test]
+        public void Test_389_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_390
+    {
+        #region PassingTests
+        [Test]
+        public void Test_390_01()
+        {
+        }
+
+        [Test]
+        public void Test_390_02()
+        {
+        }
+
+        [Test]
+        public void Test_390_03()
+        {
+        }
+
+        [Test]
+        public void Test_390_04()
+        {
+        }
+
+        [Test]
+        public void Test_390_05()
+        {
+        }
+
+        [Test]
+        public void Test_390_06()
+        {
+        }
+
+        [Test]
+        public void Test_390_07()
+        {
+        }
+
+        [Test]
+        public void Test_390_08()
+        {
+        }
+
+        [Test]
+        public void Test_390_09()
+        {
+        }
+
+        [Test]
+        public void Test_390_10()
+        {
+        }
+
+        [Test]
+        public void Test_390_11()
+        {
+        }
+
+        [Test]
+        public void Test_390_12()
+        {
+        }
+
+        [Test]
+        public void Test_390_13()
+        {
+        }
+
+        [Test]
+        public void Test_390_14()
+        {
+        }
+
+        [Test]
+        public void Test_390_15()
+        {
+        }
+
+        [Test]
+        public void Test_390_16()
+        {
+        }
+
+        [Test]
+        public void Test_390_17()
+        {
+        }
+
+        [Test]
+        public void Test_390_18()
+        {
+        }
+
+        [Test]
+        public void Test_390_19()
+        {
+        }
+
+        [Test]
+        public void Test_390_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_391
+    {
+        #region PassingTests
+        [Test]
+        public void Test_391_01()
+        {
+        }
+
+        [Test]
+        public void Test_391_02()
+        {
+        }
+
+        [Test]
+        public void Test_391_03()
+        {
+        }
+
+        [Test]
+        public void Test_391_04()
+        {
+        }
+
+        [Test]
+        public void Test_391_05()
+        {
+        }
+
+        [Test]
+        public void Test_391_06()
+        {
+        }
+
+        [Test]
+        public void Test_391_07()
+        {
+        }
+
+        [Test]
+        public void Test_391_08()
+        {
+        }
+
+        [Test]
+        public void Test_391_09()
+        {
+        }
+
+        [Test]
+        public void Test_391_10()
+        {
+        }
+
+        [Test]
+        public void Test_391_11()
+        {
+        }
+
+        [Test]
+        public void Test_391_12()
+        {
+        }
+
+        [Test]
+        public void Test_391_13()
+        {
+        }
+
+        [Test]
+        public void Test_391_14()
+        {
+        }
+
+        [Test]
+        public void Test_391_15()
+        {
+        }
+
+        [Test]
+        public void Test_391_16()
+        {
+        }
+
+        [Test]
+        public void Test_391_17()
+        {
+        }
+
+        [Test]
+        public void Test_391_18()
+        {
+        }
+
+        [Test]
+        public void Test_391_19()
+        {
+        }
+
+        [Test]
+        public void Test_391_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_392
+    {
+        #region PassingTests
+        [Test]
+        public void Test_392_01()
+        {
+        }
+
+        [Test]
+        public void Test_392_02()
+        {
+        }
+
+        [Test]
+        public void Test_392_03()
+        {
+        }
+
+        [Test]
+        public void Test_392_04()
+        {
+        }
+
+        [Test]
+        public void Test_392_05()
+        {
+        }
+
+        [Test]
+        public void Test_392_06()
+        {
+        }
+
+        [Test]
+        public void Test_392_07()
+        {
+        }
+
+        [Test]
+        public void Test_392_08()
+        {
+        }
+
+        [Test]
+        public void Test_392_09()
+        {
+        }
+
+        [Test]
+        public void Test_392_10()
+        {
+        }
+
+        [Test]
+        public void Test_392_11()
+        {
+        }
+
+        [Test]
+        public void Test_392_12()
+        {
+        }
+
+        [Test]
+        public void Test_392_13()
+        {
+        }
+
+        [Test]
+        public void Test_392_14()
+        {
+        }
+
+        [Test]
+        public void Test_392_15()
+        {
+        }
+
+        [Test]
+        public void Test_392_16()
+        {
+        }
+
+        [Test]
+        public void Test_392_17()
+        {
+        }
+
+        [Test]
+        public void Test_392_18()
+        {
+        }
+
+        [Test]
+        public void Test_392_19()
+        {
+        }
+
+        [Test]
+        public void Test_392_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_393
+    {
+        #region PassingTests
+        [Test]
+        public void Test_393_01()
+        {
+        }
+
+        [Test]
+        public void Test_393_02()
+        {
+        }
+
+        [Test]
+        public void Test_393_03()
+        {
+        }
+
+        [Test]
+        public void Test_393_04()
+        {
+        }
+
+        [Test]
+        public void Test_393_05()
+        {
+        }
+
+        [Test]
+        public void Test_393_06()
+        {
+        }
+
+        [Test]
+        public void Test_393_07()
+        {
+        }
+
+        [Test]
+        public void Test_393_08()
+        {
+        }
+
+        [Test]
+        public void Test_393_09()
+        {
+        }
+
+        [Test]
+        public void Test_393_10()
+        {
+        }
+
+        [Test]
+        public void Test_393_11()
+        {
+        }
+
+        [Test]
+        public void Test_393_12()
+        {
+        }
+
+        [Test]
+        public void Test_393_13()
+        {
+        }
+
+        [Test]
+        public void Test_393_14()
+        {
+        }
+
+        [Test]
+        public void Test_393_15()
+        {
+        }
+
+        [Test]
+        public void Test_393_16()
+        {
+        }
+
+        [Test]
+        public void Test_393_17()
+        {
+        }
+
+        [Test]
+        public void Test_393_18()
+        {
+        }
+
+        [Test]
+        public void Test_393_19()
+        {
+        }
+
+        [Test]
+        public void Test_393_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_394
+    {
+        #region PassingTests
+        [Test]
+        public void Test_394_01()
+        {
+        }
+
+        [Test]
+        public void Test_394_02()
+        {
+        }
+
+        [Test]
+        public void Test_394_03()
+        {
+        }
+
+        [Test]
+        public void Test_394_04()
+        {
+        }
+
+        [Test]
+        public void Test_394_05()
+        {
+        }
+
+        [Test]
+        public void Test_394_06()
+        {
+        }
+
+        [Test]
+        public void Test_394_07()
+        {
+        }
+
+        [Test]
+        public void Test_394_08()
+        {
+        }
+
+        [Test]
+        public void Test_394_09()
+        {
+        }
+
+        [Test]
+        public void Test_394_10()
+        {
+        }
+
+        [Test]
+        public void Test_394_11()
+        {
+        }
+
+        [Test]
+        public void Test_394_12()
+        {
+        }
+
+        [Test]
+        public void Test_394_13()
+        {
+        }
+
+        [Test]
+        public void Test_394_14()
+        {
+        }
+
+        [Test]
+        public void Test_394_15()
+        {
+        }
+
+        [Test]
+        public void Test_394_16()
+        {
+        }
+
+        [Test]
+        public void Test_394_17()
+        {
+        }
+
+        [Test]
+        public void Test_394_18()
+        {
+        }
+
+        [Test]
+        public void Test_394_19()
+        {
+        }
+
+        [Test]
+        public void Test_394_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_395
+    {
+        #region PassingTests
+        [Test]
+        public void Test_395_01()
+        {
+        }
+
+        [Test]
+        public void Test_395_02()
+        {
+        }
+
+        [Test]
+        public void Test_395_03()
+        {
+        }
+
+        [Test]
+        public void Test_395_04()
+        {
+        }
+
+        [Test]
+        public void Test_395_05()
+        {
+        }
+
+        [Test]
+        public void Test_395_06()
+        {
+        }
+
+        [Test]
+        public void Test_395_07()
+        {
+        }
+
+        [Test]
+        public void Test_395_08()
+        {
+        }
+
+        [Test]
+        public void Test_395_09()
+        {
+        }
+
+        [Test]
+        public void Test_395_10()
+        {
+        }
+
+        [Test]
+        public void Test_395_11()
+        {
+        }
+
+        [Test]
+        public void Test_395_12()
+        {
+        }
+
+        [Test]
+        public void Test_395_13()
+        {
+        }
+
+        [Test]
+        public void Test_395_14()
+        {
+        }
+
+        [Test]
+        public void Test_395_15()
+        {
+        }
+
+        [Test]
+        public void Test_395_16()
+        {
+        }
+
+        [Test]
+        public void Test_395_17()
+        {
+        }
+
+        [Test]
+        public void Test_395_18()
+        {
+        }
+
+        [Test]
+        public void Test_395_19()
+        {
+        }
+
+        [Test]
+        public void Test_395_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_396
+    {
+        #region PassingTests
+        [Test]
+        public void Test_396_01()
+        {
+        }
+
+        [Test]
+        public void Test_396_02()
+        {
+        }
+
+        [Test]
+        public void Test_396_03()
+        {
+        }
+
+        [Test]
+        public void Test_396_04()
+        {
+        }
+
+        [Test]
+        public void Test_396_05()
+        {
+        }
+
+        [Test]
+        public void Test_396_06()
+        {
+        }
+
+        [Test]
+        public void Test_396_07()
+        {
+        }
+
+        [Test]
+        public void Test_396_08()
+        {
+        }
+
+        [Test]
+        public void Test_396_09()
+        {
+        }
+
+        [Test]
+        public void Test_396_10()
+        {
+        }
+
+        [Test]
+        public void Test_396_11()
+        {
+        }
+
+        [Test]
+        public void Test_396_12()
+        {
+        }
+
+        [Test]
+        public void Test_396_13()
+        {
+        }
+
+        [Test]
+        public void Test_396_14()
+        {
+        }
+
+        [Test]
+        public void Test_396_15()
+        {
+        }
+
+        [Test]
+        public void Test_396_16()
+        {
+        }
+
+        [Test]
+        public void Test_396_17()
+        {
+        }
+
+        [Test]
+        public void Test_396_18()
+        {
+        }
+
+        [Test]
+        public void Test_396_19()
+        {
+        }
+
+        [Test]
+        public void Test_396_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_397
+    {
+        #region PassingTests
+        [Test]
+        public void Test_397_01()
+        {
+        }
+
+        [Test]
+        public void Test_397_02()
+        {
+        }
+
+        [Test]
+        public void Test_397_03()
+        {
+        }
+
+        [Test]
+        public void Test_397_04()
+        {
+        }
+
+        [Test]
+        public void Test_397_05()
+        {
+        }
+
+        [Test]
+        public void Test_397_06()
+        {
+        }
+
+        [Test]
+        public void Test_397_07()
+        {
+        }
+
+        [Test]
+        public void Test_397_08()
+        {
+        }
+
+        [Test]
+        public void Test_397_09()
+        {
+        }
+
+        [Test]
+        public void Test_397_10()
+        {
+        }
+
+        [Test]
+        public void Test_397_11()
+        {
+        }
+
+        [Test]
+        public void Test_397_12()
+        {
+        }
+
+        [Test]
+        public void Test_397_13()
+        {
+        }
+
+        [Test]
+        public void Test_397_14()
+        {
+        }
+
+        [Test]
+        public void Test_397_15()
+        {
+        }
+
+        [Test]
+        public void Test_397_16()
+        {
+        }
+
+        [Test]
+        public void Test_397_17()
+        {
+        }
+
+        [Test]
+        public void Test_397_18()
+        {
+        }
+
+        [Test]
+        public void Test_397_19()
+        {
+        }
+
+        [Test]
+        public void Test_397_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_398
+    {
+        #region PassingTests
+        [Test]
+        public void Test_398_01()
+        {
+        }
+
+        [Test]
+        public void Test_398_02()
+        {
+        }
+
+        [Test]
+        public void Test_398_03()
+        {
+        }
+
+        [Test]
+        public void Test_398_04()
+        {
+        }
+
+        [Test]
+        public void Test_398_05()
+        {
+        }
+
+        [Test]
+        public void Test_398_06()
+        {
+        }
+
+        [Test]
+        public void Test_398_07()
+        {
+        }
+
+        [Test]
+        public void Test_398_08()
+        {
+        }
+
+        [Test]
+        public void Test_398_09()
+        {
+        }
+
+        [Test]
+        public void Test_398_10()
+        {
+        }
+
+        [Test]
+        public void Test_398_11()
+        {
+        }
+
+        [Test]
+        public void Test_398_12()
+        {
+        }
+
+        [Test]
+        public void Test_398_13()
+        {
+        }
+
+        [Test]
+        public void Test_398_14()
+        {
+        }
+
+        [Test]
+        public void Test_398_15()
+        {
+        }
+
+        [Test]
+        public void Test_398_16()
+        {
+        }
+
+        [Test]
+        public void Test_398_17()
+        {
+        }
+
+        [Test]
+        public void Test_398_18()
+        {
+        }
+
+        [Test]
+        public void Test_398_19()
+        {
+        }
+
+        [Test]
+        public void Test_398_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_399
+    {
+        #region PassingTests
+        [Test]
+        public void Test_399_01()
+        {
+        }
+
+        [Test]
+        public void Test_399_02()
+        {
+        }
+
+        [Test]
+        public void Test_399_03()
+        {
+        }
+
+        [Test]
+        public void Test_399_04()
+        {
+        }
+
+        [Test]
+        public void Test_399_05()
+        {
+        }
+
+        [Test]
+        public void Test_399_06()
+        {
+        }
+
+        [Test]
+        public void Test_399_07()
+        {
+        }
+
+        [Test]
+        public void Test_399_08()
+        {
+        }
+
+        [Test]
+        public void Test_399_09()
+        {
+        }
+
+        [Test]
+        public void Test_399_10()
+        {
+        }
+
+        [Test]
+        public void Test_399_11()
+        {
+        }
+
+        [Test]
+        public void Test_399_12()
+        {
+        }
+
+        [Test]
+        public void Test_399_13()
+        {
+        }
+
+        [Test]
+        public void Test_399_14()
+        {
+        }
+
+        [Test]
+        public void Test_399_15()
+        {
+        }
+
+        [Test]
+        public void Test_399_16()
+        {
+        }
+
+        [Test]
+        public void Test_399_17()
+        {
+        }
+
+        [Test]
+        public void Test_399_18()
+        {
+        }
+
+        [Test]
+        public void Test_399_19()
+        {
+        }
+
+        [Test]
+        public void Test_399_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_400
+    {
+        #region PassingTests
+        [Test]
+        public void Test_400_01()
+        {
+        }
+
+        [Test]
+        public void Test_400_02()
+        {
+        }
+
+        [Test]
+        public void Test_400_03()
+        {
+        }
+
+        [Test]
+        public void Test_400_04()
+        {
+        }
+
+        [Test]
+        public void Test_400_05()
+        {
+        }
+
+        [Test]
+        public void Test_400_06()
+        {
+        }
+
+        [Test]
+        public void Test_400_07()
+        {
+        }
+
+        [Test]
+        public void Test_400_08()
+        {
+        }
+
+        [Test]
+        public void Test_400_09()
+        {
+        }
+
+        [Test]
+        public void Test_400_10()
+        {
+        }
+
+        [Test]
+        public void Test_400_11()
+        {
+        }
+
+        [Test]
+        public void Test_400_12()
+        {
+        }
+
+        [Test]
+        public void Test_400_13()
+        {
+        }
+
+        [Test]
+        public void Test_400_14()
+        {
+        }
+
+        [Test]
+        public void Test_400_15()
+        {
+        }
+
+        [Test]
+        public void Test_400_16()
+        {
+        }
+
+        [Test]
+        public void Test_400_17()
+        {
+        }
+
+        [Test]
+        public void Test_400_18()
+        {
+        }
+
+        [Test]
+        public void Test_400_19()
+        {
+        }
+
+        [Test]
+        public void Test_400_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_401
+    {
+        #region PassingTests
+        [Test]
+        public void Test_401_01()
+        {
+        }
+
+        [Test]
+        public void Test_401_02()
+        {
+        }
+
+        [Test]
+        public void Test_401_03()
+        {
+        }
+
+        [Test]
+        public void Test_401_04()
+        {
+        }
+
+        [Test]
+        public void Test_401_05()
+        {
+        }
+
+        [Test]
+        public void Test_401_06()
+        {
+        }
+
+        [Test]
+        public void Test_401_07()
+        {
+        }
+
+        [Test]
+        public void Test_401_08()
+        {
+        }
+
+        [Test]
+        public void Test_401_09()
+        {
+        }
+
+        [Test]
+        public void Test_401_10()
+        {
+        }
+
+        [Test]
+        public void Test_401_11()
+        {
+        }
+
+        [Test]
+        public void Test_401_12()
+        {
+        }
+
+        [Test]
+        public void Test_401_13()
+        {
+        }
+
+        [Test]
+        public void Test_401_14()
+        {
+        }
+
+        [Test]
+        public void Test_401_15()
+        {
+        }
+
+        [Test]
+        public void Test_401_16()
+        {
+        }
+
+        [Test]
+        public void Test_401_17()
+        {
+        }
+
+        [Test]
+        public void Test_401_18()
+        {
+        }
+
+        [Test]
+        public void Test_401_19()
+        {
+        }
+
+        [Test]
+        public void Test_401_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_402
+    {
+        #region PassingTests
+        [Test]
+        public void Test_402_01()
+        {
+        }
+
+        [Test]
+        public void Test_402_02()
+        {
+        }
+
+        [Test]
+        public void Test_402_03()
+        {
+        }
+
+        [Test]
+        public void Test_402_04()
+        {
+        }
+
+        [Test]
+        public void Test_402_05()
+        {
+        }
+
+        [Test]
+        public void Test_402_06()
+        {
+        }
+
+        [Test]
+        public void Test_402_07()
+        {
+        }
+
+        [Test]
+        public void Test_402_08()
+        {
+        }
+
+        [Test]
+        public void Test_402_09()
+        {
+        }
+
+        [Test]
+        public void Test_402_10()
+        {
+        }
+
+        [Test]
+        public void Test_402_11()
+        {
+        }
+
+        [Test]
+        public void Test_402_12()
+        {
+        }
+
+        [Test]
+        public void Test_402_13()
+        {
+        }
+
+        [Test]
+        public void Test_402_14()
+        {
+        }
+
+        [Test]
+        public void Test_402_15()
+        {
+        }
+
+        [Test]
+        public void Test_402_16()
+        {
+        }
+
+        [Test]
+        public void Test_402_17()
+        {
+        }
+
+        [Test]
+        public void Test_402_18()
+        {
+        }
+
+        [Test]
+        public void Test_402_19()
+        {
+        }
+
+        [Test]
+        public void Test_402_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_403
+    {
+        #region PassingTests
+        [Test]
+        public void Test_403_01()
+        {
+        }
+
+        [Test]
+        public void Test_403_02()
+        {
+        }
+
+        [Test]
+        public void Test_403_03()
+        {
+        }
+
+        [Test]
+        public void Test_403_04()
+        {
+        }
+
+        [Test]
+        public void Test_403_05()
+        {
+        }
+
+        [Test]
+        public void Test_403_06()
+        {
+        }
+
+        [Test]
+        public void Test_403_07()
+        {
+        }
+
+        [Test]
+        public void Test_403_08()
+        {
+        }
+
+        [Test]
+        public void Test_403_09()
+        {
+        }
+
+        [Test]
+        public void Test_403_10()
+        {
+        }
+
+        [Test]
+        public void Test_403_11()
+        {
+        }
+
+        [Test]
+        public void Test_403_12()
+        {
+        }
+
+        [Test]
+        public void Test_403_13()
+        {
+        }
+
+        [Test]
+        public void Test_403_14()
+        {
+        }
+
+        [Test]
+        public void Test_403_15()
+        {
+        }
+
+        [Test]
+        public void Test_403_16()
+        {
+        }
+
+        [Test]
+        public void Test_403_17()
+        {
+        }
+
+        [Test]
+        public void Test_403_18()
+        {
+        }
+
+        [Test]
+        public void Test_403_19()
+        {
+        }
+
+        [Test]
+        public void Test_403_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_404
+    {
+        #region PassingTests
+        [Test]
+        public void Test_404_01()
+        {
+        }
+
+        [Test]
+        public void Test_404_02()
+        {
+        }
+
+        [Test]
+        public void Test_404_03()
+        {
+        }
+
+        [Test]
+        public void Test_404_04()
+        {
+        }
+
+        [Test]
+        public void Test_404_05()
+        {
+        }
+
+        [Test]
+        public void Test_404_06()
+        {
+        }
+
+        [Test]
+        public void Test_404_07()
+        {
+        }
+
+        [Test]
+        public void Test_404_08()
+        {
+        }
+
+        [Test]
+        public void Test_404_09()
+        {
+        }
+
+        [Test]
+        public void Test_404_10()
+        {
+        }
+
+        [Test]
+        public void Test_404_11()
+        {
+        }
+
+        [Test]
+        public void Test_404_12()
+        {
+        }
+
+        [Test]
+        public void Test_404_13()
+        {
+        }
+
+        [Test]
+        public void Test_404_14()
+        {
+        }
+
+        [Test]
+        public void Test_404_15()
+        {
+        }
+
+        [Test]
+        public void Test_404_16()
+        {
+        }
+
+        [Test]
+        public void Test_404_17()
+        {
+        }
+
+        [Test]
+        public void Test_404_18()
+        {
+        }
+
+        [Test]
+        public void Test_404_19()
+        {
+        }
+
+        [Test]
+        public void Test_404_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_405
+    {
+        #region PassingTests
+        [Test]
+        public void Test_405_01()
+        {
+        }
+
+        [Test]
+        public void Test_405_02()
+        {
+        }
+
+        [Test]
+        public void Test_405_03()
+        {
+        }
+
+        [Test]
+        public void Test_405_04()
+        {
+        }
+
+        [Test]
+        public void Test_405_05()
+        {
+        }
+
+        [Test]
+        public void Test_405_06()
+        {
+        }
+
+        [Test]
+        public void Test_405_07()
+        {
+        }
+
+        [Test]
+        public void Test_405_08()
+        {
+        }
+
+        [Test]
+        public void Test_405_09()
+        {
+        }
+
+        [Test]
+        public void Test_405_10()
+        {
+        }
+
+        [Test]
+        public void Test_405_11()
+        {
+        }
+
+        [Test]
+        public void Test_405_12()
+        {
+        }
+
+        [Test]
+        public void Test_405_13()
+        {
+        }
+
+        [Test]
+        public void Test_405_14()
+        {
+        }
+
+        [Test]
+        public void Test_405_15()
+        {
+        }
+
+        [Test]
+        public void Test_405_16()
+        {
+        }
+
+        [Test]
+        public void Test_405_17()
+        {
+        }
+
+        [Test]
+        public void Test_405_18()
+        {
+        }
+
+        [Test]
+        public void Test_405_19()
+        {
+        }
+
+        [Test]
+        public void Test_405_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_406
+    {
+        #region PassingTests
+        [Test]
+        public void Test_406_01()
+        {
+        }
+
+        [Test]
+        public void Test_406_02()
+        {
+        }
+
+        [Test]
+        public void Test_406_03()
+        {
+        }
+
+        [Test]
+        public void Test_406_04()
+        {
+        }
+
+        [Test]
+        public void Test_406_05()
+        {
+        }
+
+        [Test]
+        public void Test_406_06()
+        {
+        }
+
+        [Test]
+        public void Test_406_07()
+        {
+        }
+
+        [Test]
+        public void Test_406_08()
+        {
+        }
+
+        [Test]
+        public void Test_406_09()
+        {
+        }
+
+        [Test]
+        public void Test_406_10()
+        {
+        }
+
+        [Test]
+        public void Test_406_11()
+        {
+        }
+
+        [Test]
+        public void Test_406_12()
+        {
+        }
+
+        [Test]
+        public void Test_406_13()
+        {
+        }
+
+        [Test]
+        public void Test_406_14()
+        {
+        }
+
+        [Test]
+        public void Test_406_15()
+        {
+        }
+
+        [Test]
+        public void Test_406_16()
+        {
+        }
+
+        [Test]
+        public void Test_406_17()
+        {
+        }
+
+        [Test]
+        public void Test_406_18()
+        {
+        }
+
+        [Test]
+        public void Test_406_19()
+        {
+        }
+
+        [Test]
+        public void Test_406_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_407
+    {
+        #region PassingTests
+        [Test]
+        public void Test_407_01()
+        {
+        }
+
+        [Test]
+        public void Test_407_02()
+        {
+        }
+
+        [Test]
+        public void Test_407_03()
+        {
+        }
+
+        [Test]
+        public void Test_407_04()
+        {
+        }
+
+        [Test]
+        public void Test_407_05()
+        {
+        }
+
+        [Test]
+        public void Test_407_06()
+        {
+        }
+
+        [Test]
+        public void Test_407_07()
+        {
+        }
+
+        [Test]
+        public void Test_407_08()
+        {
+        }
+
+        [Test]
+        public void Test_407_09()
+        {
+        }
+
+        [Test]
+        public void Test_407_10()
+        {
+        }
+
+        [Test]
+        public void Test_407_11()
+        {
+        }
+
+        [Test]
+        public void Test_407_12()
+        {
+        }
+
+        [Test]
+        public void Test_407_13()
+        {
+        }
+
+        [Test]
+        public void Test_407_14()
+        {
+        }
+
+        [Test]
+        public void Test_407_15()
+        {
+        }
+
+        [Test]
+        public void Test_407_16()
+        {
+        }
+
+        [Test]
+        public void Test_407_17()
+        {
+        }
+
+        [Test]
+        public void Test_407_18()
+        {
+        }
+
+        [Test]
+        public void Test_407_19()
+        {
+        }
+
+        [Test]
+        public void Test_407_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_408
+    {
+        #region PassingTests
+        [Test]
+        public void Test_408_01()
+        {
+        }
+
+        [Test]
+        public void Test_408_02()
+        {
+        }
+
+        [Test]
+        public void Test_408_03()
+        {
+        }
+
+        [Test]
+        public void Test_408_04()
+        {
+        }
+
+        [Test]
+        public void Test_408_05()
+        {
+        }
+
+        [Test]
+        public void Test_408_06()
+        {
+        }
+
+        [Test]
+        public void Test_408_07()
+        {
+        }
+
+        [Test]
+        public void Test_408_08()
+        {
+        }
+
+        [Test]
+        public void Test_408_09()
+        {
+        }
+
+        [Test]
+        public void Test_408_10()
+        {
+        }
+
+        [Test]
+        public void Test_408_11()
+        {
+        }
+
+        [Test]
+        public void Test_408_12()
+        {
+        }
+
+        [Test]
+        public void Test_408_13()
+        {
+        }
+
+        [Test]
+        public void Test_408_14()
+        {
+        }
+
+        [Test]
+        public void Test_408_15()
+        {
+        }
+
+        [Test]
+        public void Test_408_16()
+        {
+        }
+
+        [Test]
+        public void Test_408_17()
+        {
+        }
+
+        [Test]
+        public void Test_408_18()
+        {
+        }
+
+        [Test]
+        public void Test_408_19()
+        {
+        }
+
+        [Test]
+        public void Test_408_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_409
+    {
+        #region PassingTests
+        [Test]
+        public void Test_409_01()
+        {
+        }
+
+        [Test]
+        public void Test_409_02()
+        {
+        }
+
+        [Test]
+        public void Test_409_03()
+        {
+        }
+
+        [Test]
+        public void Test_409_04()
+        {
+        }
+
+        [Test]
+        public void Test_409_05()
+        {
+        }
+
+        [Test]
+        public void Test_409_06()
+        {
+        }
+
+        [Test]
+        public void Test_409_07()
+        {
+        }
+
+        [Test]
+        public void Test_409_08()
+        {
+        }
+
+        [Test]
+        public void Test_409_09()
+        {
+        }
+
+        [Test]
+        public void Test_409_10()
+        {
+        }
+
+        [Test]
+        public void Test_409_11()
+        {
+        }
+
+        [Test]
+        public void Test_409_12()
+        {
+        }
+
+        [Test]
+        public void Test_409_13()
+        {
+        }
+
+        [Test]
+        public void Test_409_14()
+        {
+        }
+
+        [Test]
+        public void Test_409_15()
+        {
+        }
+
+        [Test]
+        public void Test_409_16()
+        {
+        }
+
+        [Test]
+        public void Test_409_17()
+        {
+        }
+
+        [Test]
+        public void Test_409_18()
+        {
+        }
+
+        [Test]
+        public void Test_409_19()
+        {
+        }
+
+        [Test]
+        public void Test_409_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_410
+    {
+        #region PassingTests
+        [Test]
+        public void Test_410_01()
+        {
+        }
+
+        [Test]
+        public void Test_410_02()
+        {
+        }
+
+        [Test]
+        public void Test_410_03()
+        {
+        }
+
+        [Test]
+        public void Test_410_04()
+        {
+        }
+
+        [Test]
+        public void Test_410_05()
+        {
+        }
+
+        [Test]
+        public void Test_410_06()
+        {
+        }
+
+        [Test]
+        public void Test_410_07()
+        {
+        }
+
+        [Test]
+        public void Test_410_08()
+        {
+        }
+
+        [Test]
+        public void Test_410_09()
+        {
+        }
+
+        [Test]
+        public void Test_410_10()
+        {
+        }
+
+        [Test]
+        public void Test_410_11()
+        {
+        }
+
+        [Test]
+        public void Test_410_12()
+        {
+        }
+
+        [Test]
+        public void Test_410_13()
+        {
+        }
+
+        [Test]
+        public void Test_410_14()
+        {
+        }
+
+        [Test]
+        public void Test_410_15()
+        {
+        }
+
+        [Test]
+        public void Test_410_16()
+        {
+        }
+
+        [Test]
+        public void Test_410_17()
+        {
+        }
+
+        [Test]
+        public void Test_410_18()
+        {
+        }
+
+        [Test]
+        public void Test_410_19()
+        {
+        }
+
+        [Test]
+        public void Test_410_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_411
+    {
+        #region PassingTests
+        [Test]
+        public void Test_411_01()
+        {
+        }
+
+        [Test]
+        public void Test_411_02()
+        {
+        }
+
+        [Test]
+        public void Test_411_03()
+        {
+        }
+
+        [Test]
+        public void Test_411_04()
+        {
+        }
+
+        [Test]
+        public void Test_411_05()
+        {
+        }
+
+        [Test]
+        public void Test_411_06()
+        {
+        }
+
+        [Test]
+        public void Test_411_07()
+        {
+        }
+
+        [Test]
+        public void Test_411_08()
+        {
+        }
+
+        [Test]
+        public void Test_411_09()
+        {
+        }
+
+        [Test]
+        public void Test_411_10()
+        {
+        }
+
+        [Test]
+        public void Test_411_11()
+        {
+        }
+
+        [Test]
+        public void Test_411_12()
+        {
+        }
+
+        [Test]
+        public void Test_411_13()
+        {
+        }
+
+        [Test]
+        public void Test_411_14()
+        {
+        }
+
+        [Test]
+        public void Test_411_15()
+        {
+        }
+
+        [Test]
+        public void Test_411_16()
+        {
+        }
+
+        [Test]
+        public void Test_411_17()
+        {
+        }
+
+        [Test]
+        public void Test_411_18()
+        {
+        }
+
+        [Test]
+        public void Test_411_19()
+        {
+        }
+
+        [Test]
+        public void Test_411_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_412
+    {
+        #region PassingTests
+        [Test]
+        public void Test_412_01()
+        {
+        }
+
+        [Test]
+        public void Test_412_02()
+        {
+        }
+
+        [Test]
+        public void Test_412_03()
+        {
+        }
+
+        [Test]
+        public void Test_412_04()
+        {
+        }
+
+        [Test]
+        public void Test_412_05()
+        {
+        }
+
+        [Test]
+        public void Test_412_06()
+        {
+        }
+
+        [Test]
+        public void Test_412_07()
+        {
+        }
+
+        [Test]
+        public void Test_412_08()
+        {
+        }
+
+        [Test]
+        public void Test_412_09()
+        {
+        }
+
+        [Test]
+        public void Test_412_10()
+        {
+        }
+
+        [Test]
+        public void Test_412_11()
+        {
+        }
+
+        [Test]
+        public void Test_412_12()
+        {
+        }
+
+        [Test]
+        public void Test_412_13()
+        {
+        }
+
+        [Test]
+        public void Test_412_14()
+        {
+        }
+
+        [Test]
+        public void Test_412_15()
+        {
+        }
+
+        [Test]
+        public void Test_412_16()
+        {
+        }
+
+        [Test]
+        public void Test_412_17()
+        {
+        }
+
+        [Test]
+        public void Test_412_18()
+        {
+        }
+
+        [Test]
+        public void Test_412_19()
+        {
+        }
+
+        [Test]
+        public void Test_412_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_413
+    {
+        #region PassingTests
+        [Test]
+        public void Test_413_01()
+        {
+        }
+
+        [Test]
+        public void Test_413_02()
+        {
+        }
+
+        [Test]
+        public void Test_413_03()
+        {
+        }
+
+        [Test]
+        public void Test_413_04()
+        {
+        }
+
+        [Test]
+        public void Test_413_05()
+        {
+        }
+
+        [Test]
+        public void Test_413_06()
+        {
+        }
+
+        [Test]
+        public void Test_413_07()
+        {
+        }
+
+        [Test]
+        public void Test_413_08()
+        {
+        }
+
+        [Test]
+        public void Test_413_09()
+        {
+        }
+
+        [Test]
+        public void Test_413_10()
+        {
+        }
+
+        [Test]
+        public void Test_413_11()
+        {
+        }
+
+        [Test]
+        public void Test_413_12()
+        {
+        }
+
+        [Test]
+        public void Test_413_13()
+        {
+        }
+
+        [Test]
+        public void Test_413_14()
+        {
+        }
+
+        [Test]
+        public void Test_413_15()
+        {
+        }
+
+        [Test]
+        public void Test_413_16()
+        {
+        }
+
+        [Test]
+        public void Test_413_17()
+        {
+        }
+
+        [Test]
+        public void Test_413_18()
+        {
+        }
+
+        [Test]
+        public void Test_413_19()
+        {
+        }
+
+        [Test]
+        public void Test_413_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_414
+    {
+        #region PassingTests
+        [Test]
+        public void Test_414_01()
+        {
+        }
+
+        [Test]
+        public void Test_414_02()
+        {
+        }
+
+        [Test]
+        public void Test_414_03()
+        {
+        }
+
+        [Test]
+        public void Test_414_04()
+        {
+        }
+
+        [Test]
+        public void Test_414_05()
+        {
+        }
+
+        [Test]
+        public void Test_414_06()
+        {
+        }
+
+        [Test]
+        public void Test_414_07()
+        {
+        }
+
+        [Test]
+        public void Test_414_08()
+        {
+        }
+
+        [Test]
+        public void Test_414_09()
+        {
+        }
+
+        [Test]
+        public void Test_414_10()
+        {
+        }
+
+        [Test]
+        public void Test_414_11()
+        {
+        }
+
+        [Test]
+        public void Test_414_12()
+        {
+        }
+
+        [Test]
+        public void Test_414_13()
+        {
+        }
+
+        [Test]
+        public void Test_414_14()
+        {
+        }
+
+        [Test]
+        public void Test_414_15()
+        {
+        }
+
+        [Test]
+        public void Test_414_16()
+        {
+        }
+
+        [Test]
+        public void Test_414_17()
+        {
+        }
+
+        [Test]
+        public void Test_414_18()
+        {
+        }
+
+        [Test]
+        public void Test_414_19()
+        {
+        }
+
+        [Test]
+        public void Test_414_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_415
+    {
+        #region PassingTests
+        [Test]
+        public void Test_415_01()
+        {
+        }
+
+        [Test]
+        public void Test_415_02()
+        {
+        }
+
+        [Test]
+        public void Test_415_03()
+        {
+        }
+
+        [Test]
+        public void Test_415_04()
+        {
+        }
+
+        [Test]
+        public void Test_415_05()
+        {
+        }
+
+        [Test]
+        public void Test_415_06()
+        {
+        }
+
+        [Test]
+        public void Test_415_07()
+        {
+        }
+
+        [Test]
+        public void Test_415_08()
+        {
+        }
+
+        [Test]
+        public void Test_415_09()
+        {
+        }
+
+        [Test]
+        public void Test_415_10()
+        {
+        }
+
+        [Test]
+        public void Test_415_11()
+        {
+        }
+
+        [Test]
+        public void Test_415_12()
+        {
+        }
+
+        [Test]
+        public void Test_415_13()
+        {
+        }
+
+        [Test]
+        public void Test_415_14()
+        {
+        }
+
+        [Test]
+        public void Test_415_15()
+        {
+        }
+
+        [Test]
+        public void Test_415_16()
+        {
+        }
+
+        [Test]
+        public void Test_415_17()
+        {
+        }
+
+        [Test]
+        public void Test_415_18()
+        {
+        }
+
+        [Test]
+        public void Test_415_19()
+        {
+        }
+
+        [Test]
+        public void Test_415_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_416
+    {
+        #region PassingTests
+        [Test]
+        public void Test_416_01()
+        {
+        }
+
+        [Test]
+        public void Test_416_02()
+        {
+        }
+
+        [Test]
+        public void Test_416_03()
+        {
+        }
+
+        [Test]
+        public void Test_416_04()
+        {
+        }
+
+        [Test]
+        public void Test_416_05()
+        {
+        }
+
+        [Test]
+        public void Test_416_06()
+        {
+        }
+
+        [Test]
+        public void Test_416_07()
+        {
+        }
+
+        [Test]
+        public void Test_416_08()
+        {
+        }
+
+        [Test]
+        public void Test_416_09()
+        {
+        }
+
+        [Test]
+        public void Test_416_10()
+        {
+        }
+
+        [Test]
+        public void Test_416_11()
+        {
+        }
+
+        [Test]
+        public void Test_416_12()
+        {
+        }
+
+        [Test]
+        public void Test_416_13()
+        {
+        }
+
+        [Test]
+        public void Test_416_14()
+        {
+        }
+
+        [Test]
+        public void Test_416_15()
+        {
+        }
+
+        [Test]
+        public void Test_416_16()
+        {
+        }
+
+        [Test]
+        public void Test_416_17()
+        {
+        }
+
+        [Test]
+        public void Test_416_18()
+        {
+        }
+
+        [Test]
+        public void Test_416_19()
+        {
+        }
+
+        [Test]
+        public void Test_416_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_417
+    {
+        #region PassingTests
+        [Test]
+        public void Test_417_01()
+        {
+        }
+
+        [Test]
+        public void Test_417_02()
+        {
+        }
+
+        [Test]
+        public void Test_417_03()
+        {
+        }
+
+        [Test]
+        public void Test_417_04()
+        {
+        }
+
+        [Test]
+        public void Test_417_05()
+        {
+        }
+
+        [Test]
+        public void Test_417_06()
+        {
+        }
+
+        [Test]
+        public void Test_417_07()
+        {
+        }
+
+        [Test]
+        public void Test_417_08()
+        {
+        }
+
+        [Test]
+        public void Test_417_09()
+        {
+        }
+
+        [Test]
+        public void Test_417_10()
+        {
+        }
+
+        [Test]
+        public void Test_417_11()
+        {
+        }
+
+        [Test]
+        public void Test_417_12()
+        {
+        }
+
+        [Test]
+        public void Test_417_13()
+        {
+        }
+
+        [Test]
+        public void Test_417_14()
+        {
+        }
+
+        [Test]
+        public void Test_417_15()
+        {
+        }
+
+        [Test]
+        public void Test_417_16()
+        {
+        }
+
+        [Test]
+        public void Test_417_17()
+        {
+        }
+
+        [Test]
+        public void Test_417_18()
+        {
+        }
+
+        [Test]
+        public void Test_417_19()
+        {
+        }
+
+        [Test]
+        public void Test_417_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_418
+    {
+        #region PassingTests
+        [Test]
+        public void Test_418_01()
+        {
+        }
+
+        [Test]
+        public void Test_418_02()
+        {
+        }
+
+        [Test]
+        public void Test_418_03()
+        {
+        }
+
+        [Test]
+        public void Test_418_04()
+        {
+        }
+
+        [Test]
+        public void Test_418_05()
+        {
+        }
+
+        [Test]
+        public void Test_418_06()
+        {
+        }
+
+        [Test]
+        public void Test_418_07()
+        {
+        }
+
+        [Test]
+        public void Test_418_08()
+        {
+        }
+
+        [Test]
+        public void Test_418_09()
+        {
+        }
+
+        [Test]
+        public void Test_418_10()
+        {
+        }
+
+        [Test]
+        public void Test_418_11()
+        {
+        }
+
+        [Test]
+        public void Test_418_12()
+        {
+        }
+
+        [Test]
+        public void Test_418_13()
+        {
+        }
+
+        [Test]
+        public void Test_418_14()
+        {
+        }
+
+        [Test]
+        public void Test_418_15()
+        {
+        }
+
+        [Test]
+        public void Test_418_16()
+        {
+        }
+
+        [Test]
+        public void Test_418_17()
+        {
+        }
+
+        [Test]
+        public void Test_418_18()
+        {
+        }
+
+        [Test]
+        public void Test_418_19()
+        {
+        }
+
+        [Test]
+        public void Test_418_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_419
+    {
+        #region PassingTests
+        [Test]
+        public void Test_419_01()
+        {
+        }
+
+        [Test]
+        public void Test_419_02()
+        {
+        }
+
+        [Test]
+        public void Test_419_03()
+        {
+        }
+
+        [Test]
+        public void Test_419_04()
+        {
+        }
+
+        [Test]
+        public void Test_419_05()
+        {
+        }
+
+        [Test]
+        public void Test_419_06()
+        {
+        }
+
+        [Test]
+        public void Test_419_07()
+        {
+        }
+
+        [Test]
+        public void Test_419_08()
+        {
+        }
+
+        [Test]
+        public void Test_419_09()
+        {
+        }
+
+        [Test]
+        public void Test_419_10()
+        {
+        }
+
+        [Test]
+        public void Test_419_11()
+        {
+        }
+
+        [Test]
+        public void Test_419_12()
+        {
+        }
+
+        [Test]
+        public void Test_419_13()
+        {
+        }
+
+        [Test]
+        public void Test_419_14()
+        {
+        }
+
+        [Test]
+        public void Test_419_15()
+        {
+        }
+
+        [Test]
+        public void Test_419_16()
+        {
+        }
+
+        [Test]
+        public void Test_419_17()
+        {
+        }
+
+        [Test]
+        public void Test_419_18()
+        {
+        }
+
+        [Test]
+        public void Test_419_19()
+        {
+        }
+
+        [Test]
+        public void Test_419_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_420
+    {
+        #region PassingTests
+        [Test]
+        public void Test_420_01()
+        {
+        }
+
+        [Test]
+        public void Test_420_02()
+        {
+        }
+
+        [Test]
+        public void Test_420_03()
+        {
+        }
+
+        [Test]
+        public void Test_420_04()
+        {
+        }
+
+        [Test]
+        public void Test_420_05()
+        {
+        }
+
+        [Test]
+        public void Test_420_06()
+        {
+        }
+
+        [Test]
+        public void Test_420_07()
+        {
+        }
+
+        [Test]
+        public void Test_420_08()
+        {
+        }
+
+        [Test]
+        public void Test_420_09()
+        {
+        }
+
+        [Test]
+        public void Test_420_10()
+        {
+        }
+
+        [Test]
+        public void Test_420_11()
+        {
+        }
+
+        [Test]
+        public void Test_420_12()
+        {
+        }
+
+        [Test]
+        public void Test_420_13()
+        {
+        }
+
+        [Test]
+        public void Test_420_14()
+        {
+        }
+
+        [Test]
+        public void Test_420_15()
+        {
+        }
+
+        [Test]
+        public void Test_420_16()
+        {
+        }
+
+        [Test]
+        public void Test_420_17()
+        {
+        }
+
+        [Test]
+        public void Test_420_18()
+        {
+        }
+
+        [Test]
+        public void Test_420_19()
+        {
+        }
+
+        [Test]
+        public void Test_420_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_421
+    {
+        #region PassingTests
+        [Test]
+        public void Test_421_01()
+        {
+        }
+
+        [Test]
+        public void Test_421_02()
+        {
+        }
+
+        [Test]
+        public void Test_421_03()
+        {
+        }
+
+        [Test]
+        public void Test_421_04()
+        {
+        }
+
+        [Test]
+        public void Test_421_05()
+        {
+        }
+
+        [Test]
+        public void Test_421_06()
+        {
+        }
+
+        [Test]
+        public void Test_421_07()
+        {
+        }
+
+        [Test]
+        public void Test_421_08()
+        {
+        }
+
+        [Test]
+        public void Test_421_09()
+        {
+        }
+
+        [Test]
+        public void Test_421_10()
+        {
+        }
+
+        [Test]
+        public void Test_421_11()
+        {
+        }
+
+        [Test]
+        public void Test_421_12()
+        {
+        }
+
+        [Test]
+        public void Test_421_13()
+        {
+        }
+
+        [Test]
+        public void Test_421_14()
+        {
+        }
+
+        [Test]
+        public void Test_421_15()
+        {
+        }
+
+        [Test]
+        public void Test_421_16()
+        {
+        }
+
+        [Test]
+        public void Test_421_17()
+        {
+        }
+
+        [Test]
+        public void Test_421_18()
+        {
+        }
+
+        [Test]
+        public void Test_421_19()
+        {
+        }
+
+        [Test]
+        public void Test_421_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_422
+    {
+        #region PassingTests
+        [Test]
+        public void Test_422_01()
+        {
+        }
+
+        [Test]
+        public void Test_422_02()
+        {
+        }
+
+        [Test]
+        public void Test_422_03()
+        {
+        }
+
+        [Test]
+        public void Test_422_04()
+        {
+        }
+
+        [Test]
+        public void Test_422_05()
+        {
+        }
+
+        [Test]
+        public void Test_422_06()
+        {
+        }
+
+        [Test]
+        public void Test_422_07()
+        {
+        }
+
+        [Test]
+        public void Test_422_08()
+        {
+        }
+
+        [Test]
+        public void Test_422_09()
+        {
+        }
+
+        [Test]
+        public void Test_422_10()
+        {
+        }
+
+        [Test]
+        public void Test_422_11()
+        {
+        }
+
+        [Test]
+        public void Test_422_12()
+        {
+        }
+
+        [Test]
+        public void Test_422_13()
+        {
+        }
+
+        [Test]
+        public void Test_422_14()
+        {
+        }
+
+        [Test]
+        public void Test_422_15()
+        {
+        }
+
+        [Test]
+        public void Test_422_16()
+        {
+        }
+
+        [Test]
+        public void Test_422_17()
+        {
+        }
+
+        [Test]
+        public void Test_422_18()
+        {
+        }
+
+        [Test]
+        public void Test_422_19()
+        {
+        }
+
+        [Test]
+        public void Test_422_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_423
+    {
+        #region PassingTests
+        [Test]
+        public void Test_423_01()
+        {
+        }
+
+        [Test]
+        public void Test_423_02()
+        {
+        }
+
+        [Test]
+        public void Test_423_03()
+        {
+        }
+
+        [Test]
+        public void Test_423_04()
+        {
+        }
+
+        [Test]
+        public void Test_423_05()
+        {
+        }
+
+        [Test]
+        public void Test_423_06()
+        {
+        }
+
+        [Test]
+        public void Test_423_07()
+        {
+        }
+
+        [Test]
+        public void Test_423_08()
+        {
+        }
+
+        [Test]
+        public void Test_423_09()
+        {
+        }
+
+        [Test]
+        public void Test_423_10()
+        {
+        }
+
+        [Test]
+        public void Test_423_11()
+        {
+        }
+
+        [Test]
+        public void Test_423_12()
+        {
+        }
+
+        [Test]
+        public void Test_423_13()
+        {
+        }
+
+        [Test]
+        public void Test_423_14()
+        {
+        }
+
+        [Test]
+        public void Test_423_15()
+        {
+        }
+
+        [Test]
+        public void Test_423_16()
+        {
+        }
+
+        [Test]
+        public void Test_423_17()
+        {
+        }
+
+        [Test]
+        public void Test_423_18()
+        {
+        }
+
+        [Test]
+        public void Test_423_19()
+        {
+        }
+
+        [Test]
+        public void Test_423_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_424
+    {
+        #region PassingTests
+        [Test]
+        public void Test_424_01()
+        {
+        }
+
+        [Test]
+        public void Test_424_02()
+        {
+        }
+
+        [Test]
+        public void Test_424_03()
+        {
+        }
+
+        [Test]
+        public void Test_424_04()
+        {
+        }
+
+        [Test]
+        public void Test_424_05()
+        {
+        }
+
+        [Test]
+        public void Test_424_06()
+        {
+        }
+
+        [Test]
+        public void Test_424_07()
+        {
+        }
+
+        [Test]
+        public void Test_424_08()
+        {
+        }
+
+        [Test]
+        public void Test_424_09()
+        {
+        }
+
+        [Test]
+        public void Test_424_10()
+        {
+        }
+
+        [Test]
+        public void Test_424_11()
+        {
+        }
+
+        [Test]
+        public void Test_424_12()
+        {
+        }
+
+        [Test]
+        public void Test_424_13()
+        {
+        }
+
+        [Test]
+        public void Test_424_14()
+        {
+        }
+
+        [Test]
+        public void Test_424_15()
+        {
+        }
+
+        [Test]
+        public void Test_424_16()
+        {
+        }
+
+        [Test]
+        public void Test_424_17()
+        {
+        }
+
+        [Test]
+        public void Test_424_18()
+        {
+        }
+
+        [Test]
+        public void Test_424_19()
+        {
+        }
+
+        [Test]
+        public void Test_424_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_425
+    {
+        #region PassingTests
+        [Test]
+        public void Test_425_01()
+        {
+        }
+
+        [Test]
+        public void Test_425_02()
+        {
+        }
+
+        [Test]
+        public void Test_425_03()
+        {
+        }
+
+        [Test]
+        public void Test_425_04()
+        {
+        }
+
+        [Test]
+        public void Test_425_05()
+        {
+        }
+
+        [Test]
+        public void Test_425_06()
+        {
+        }
+
+        [Test]
+        public void Test_425_07()
+        {
+        }
+
+        [Test]
+        public void Test_425_08()
+        {
+        }
+
+        [Test]
+        public void Test_425_09()
+        {
+        }
+
+        [Test]
+        public void Test_425_10()
+        {
+        }
+
+        [Test]
+        public void Test_425_11()
+        {
+        }
+
+        [Test]
+        public void Test_425_12()
+        {
+        }
+
+        [Test]
+        public void Test_425_13()
+        {
+        }
+
+        [Test]
+        public void Test_425_14()
+        {
+        }
+
+        [Test]
+        public void Test_425_15()
+        {
+        }
+
+        [Test]
+        public void Test_425_16()
+        {
+        }
+
+        [Test]
+        public void Test_425_17()
+        {
+        }
+
+        [Test]
+        public void Test_425_18()
+        {
+        }
+
+        [Test]
+        public void Test_425_19()
+        {
+        }
+
+        [Test]
+        public void Test_425_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_426
+    {
+        #region PassingTests
+        [Test]
+        public void Test_426_01()
+        {
+        }
+
+        [Test]
+        public void Test_426_02()
+        {
+        }
+
+        [Test]
+        public void Test_426_03()
+        {
+        }
+
+        [Test]
+        public void Test_426_04()
+        {
+        }
+
+        [Test]
+        public void Test_426_05()
+        {
+        }
+
+        [Test]
+        public void Test_426_06()
+        {
+        }
+
+        [Test]
+        public void Test_426_07()
+        {
+        }
+
+        [Test]
+        public void Test_426_08()
+        {
+        }
+
+        [Test]
+        public void Test_426_09()
+        {
+        }
+
+        [Test]
+        public void Test_426_10()
+        {
+        }
+
+        [Test]
+        public void Test_426_11()
+        {
+        }
+
+        [Test]
+        public void Test_426_12()
+        {
+        }
+
+        [Test]
+        public void Test_426_13()
+        {
+        }
+
+        [Test]
+        public void Test_426_14()
+        {
+        }
+
+        [Test]
+        public void Test_426_15()
+        {
+        }
+
+        [Test]
+        public void Test_426_16()
+        {
+        }
+
+        [Test]
+        public void Test_426_17()
+        {
+        }
+
+        [Test]
+        public void Test_426_18()
+        {
+        }
+
+        [Test]
+        public void Test_426_19()
+        {
+        }
+
+        [Test]
+        public void Test_426_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_427
+    {
+        #region PassingTests
+        [Test]
+        public void Test_427_01()
+        {
+        }
+
+        [Test]
+        public void Test_427_02()
+        {
+        }
+
+        [Test]
+        public void Test_427_03()
+        {
+        }
+
+        [Test]
+        public void Test_427_04()
+        {
+        }
+
+        [Test]
+        public void Test_427_05()
+        {
+        }
+
+        [Test]
+        public void Test_427_06()
+        {
+        }
+
+        [Test]
+        public void Test_427_07()
+        {
+        }
+
+        [Test]
+        public void Test_427_08()
+        {
+        }
+
+        [Test]
+        public void Test_427_09()
+        {
+        }
+
+        [Test]
+        public void Test_427_10()
+        {
+        }
+
+        [Test]
+        public void Test_427_11()
+        {
+        }
+
+        [Test]
+        public void Test_427_12()
+        {
+        }
+
+        [Test]
+        public void Test_427_13()
+        {
+        }
+
+        [Test]
+        public void Test_427_14()
+        {
+        }
+
+        [Test]
+        public void Test_427_15()
+        {
+        }
+
+        [Test]
+        public void Test_427_16()
+        {
+        }
+
+        [Test]
+        public void Test_427_17()
+        {
+        }
+
+        [Test]
+        public void Test_427_18()
+        {
+        }
+
+        [Test]
+        public void Test_427_19()
+        {
+        }
+
+        [Test]
+        public void Test_427_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_428
+    {
+        #region PassingTests
+        [Test]
+        public void Test_428_01()
+        {
+        }
+
+        [Test]
+        public void Test_428_02()
+        {
+        }
+
+        [Test]
+        public void Test_428_03()
+        {
+        }
+
+        [Test]
+        public void Test_428_04()
+        {
+        }
+
+        [Test]
+        public void Test_428_05()
+        {
+        }
+
+        [Test]
+        public void Test_428_06()
+        {
+        }
+
+        [Test]
+        public void Test_428_07()
+        {
+        }
+
+        [Test]
+        public void Test_428_08()
+        {
+        }
+
+        [Test]
+        public void Test_428_09()
+        {
+        }
+
+        [Test]
+        public void Test_428_10()
+        {
+        }
+
+        [Test]
+        public void Test_428_11()
+        {
+        }
+
+        [Test]
+        public void Test_428_12()
+        {
+        }
+
+        [Test]
+        public void Test_428_13()
+        {
+        }
+
+        [Test]
+        public void Test_428_14()
+        {
+        }
+
+        [Test]
+        public void Test_428_15()
+        {
+        }
+
+        [Test]
+        public void Test_428_16()
+        {
+        }
+
+        [Test]
+        public void Test_428_17()
+        {
+        }
+
+        [Test]
+        public void Test_428_18()
+        {
+        }
+
+        [Test]
+        public void Test_428_19()
+        {
+        }
+
+        [Test]
+        public void Test_428_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_429
+    {
+        #region PassingTests
+        [Test]
+        public void Test_429_01()
+        {
+        }
+
+        [Test]
+        public void Test_429_02()
+        {
+        }
+
+        [Test]
+        public void Test_429_03()
+        {
+        }
+
+        [Test]
+        public void Test_429_04()
+        {
+        }
+
+        [Test]
+        public void Test_429_05()
+        {
+        }
+
+        [Test]
+        public void Test_429_06()
+        {
+        }
+
+        [Test]
+        public void Test_429_07()
+        {
+        }
+
+        [Test]
+        public void Test_429_08()
+        {
+        }
+
+        [Test]
+        public void Test_429_09()
+        {
+        }
+
+        [Test]
+        public void Test_429_10()
+        {
+        }
+
+        [Test]
+        public void Test_429_11()
+        {
+        }
+
+        [Test]
+        public void Test_429_12()
+        {
+        }
+
+        [Test]
+        public void Test_429_13()
+        {
+        }
+
+        [Test]
+        public void Test_429_14()
+        {
+        }
+
+        [Test]
+        public void Test_429_15()
+        {
+        }
+
+        [Test]
+        public void Test_429_16()
+        {
+        }
+
+        [Test]
+        public void Test_429_17()
+        {
+        }
+
+        [Test]
+        public void Test_429_18()
+        {
+        }
+
+        [Test]
+        public void Test_429_19()
+        {
+        }
+
+        [Test]
+        public void Test_429_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_430
+    {
+        #region PassingTests
+        [Test]
+        public void Test_430_01()
+        {
+        }
+
+        [Test]
+        public void Test_430_02()
+        {
+        }
+
+        [Test]
+        public void Test_430_03()
+        {
+        }
+
+        [Test]
+        public void Test_430_04()
+        {
+        }
+
+        [Test]
+        public void Test_430_05()
+        {
+        }
+
+        [Test]
+        public void Test_430_06()
+        {
+        }
+
+        [Test]
+        public void Test_430_07()
+        {
+        }
+
+        [Test]
+        public void Test_430_08()
+        {
+        }
+
+        [Test]
+        public void Test_430_09()
+        {
+        }
+
+        [Test]
+        public void Test_430_10()
+        {
+        }
+
+        [Test]
+        public void Test_430_11()
+        {
+        }
+
+        [Test]
+        public void Test_430_12()
+        {
+        }
+
+        [Test]
+        public void Test_430_13()
+        {
+        }
+
+        [Test]
+        public void Test_430_14()
+        {
+        }
+
+        [Test]
+        public void Test_430_15()
+        {
+        }
+
+        [Test]
+        public void Test_430_16()
+        {
+        }
+
+        [Test]
+        public void Test_430_17()
+        {
+        }
+
+        [Test]
+        public void Test_430_18()
+        {
+        }
+
+        [Test]
+        public void Test_430_19()
+        {
+        }
+
+        [Test]
+        public void Test_430_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_431
+    {
+        #region PassingTests
+        [Test]
+        public void Test_431_01()
+        {
+        }
+
+        [Test]
+        public void Test_431_02()
+        {
+        }
+
+        [Test]
+        public void Test_431_03()
+        {
+        }
+
+        [Test]
+        public void Test_431_04()
+        {
+        }
+
+        [Test]
+        public void Test_431_05()
+        {
+        }
+
+        [Test]
+        public void Test_431_06()
+        {
+        }
+
+        [Test]
+        public void Test_431_07()
+        {
+        }
+
+        [Test]
+        public void Test_431_08()
+        {
+        }
+
+        [Test]
+        public void Test_431_09()
+        {
+        }
+
+        [Test]
+        public void Test_431_10()
+        {
+        }
+
+        [Test]
+        public void Test_431_11()
+        {
+        }
+
+        [Test]
+        public void Test_431_12()
+        {
+        }
+
+        [Test]
+        public void Test_431_13()
+        {
+        }
+
+        [Test]
+        public void Test_431_14()
+        {
+        }
+
+        [Test]
+        public void Test_431_15()
+        {
+        }
+
+        [Test]
+        public void Test_431_16()
+        {
+        }
+
+        [Test]
+        public void Test_431_17()
+        {
+        }
+
+        [Test]
+        public void Test_431_18()
+        {
+        }
+
+        [Test]
+        public void Test_431_19()
+        {
+        }
+
+        [Test]
+        public void Test_431_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_432
+    {
+        #region PassingTests
+        [Test]
+        public void Test_432_01()
+        {
+        }
+
+        [Test]
+        public void Test_432_02()
+        {
+        }
+
+        [Test]
+        public void Test_432_03()
+        {
+        }
+
+        [Test]
+        public void Test_432_04()
+        {
+        }
+
+        [Test]
+        public void Test_432_05()
+        {
+        }
+
+        [Test]
+        public void Test_432_06()
+        {
+        }
+
+        [Test]
+        public void Test_432_07()
+        {
+        }
+
+        [Test]
+        public void Test_432_08()
+        {
+        }
+
+        [Test]
+        public void Test_432_09()
+        {
+        }
+
+        [Test]
+        public void Test_432_10()
+        {
+        }
+
+        [Test]
+        public void Test_432_11()
+        {
+        }
+
+        [Test]
+        public void Test_432_12()
+        {
+        }
+
+        [Test]
+        public void Test_432_13()
+        {
+        }
+
+        [Test]
+        public void Test_432_14()
+        {
+        }
+
+        [Test]
+        public void Test_432_15()
+        {
+        }
+
+        [Test]
+        public void Test_432_16()
+        {
+        }
+
+        [Test]
+        public void Test_432_17()
+        {
+        }
+
+        [Test]
+        public void Test_432_18()
+        {
+        }
+
+        [Test]
+        public void Test_432_19()
+        {
+        }
+
+        [Test]
+        public void Test_432_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_433
+    {
+        #region PassingTests
+        [Test]
+        public void Test_433_01()
+        {
+        }
+
+        [Test]
+        public void Test_433_02()
+        {
+        }
+
+        [Test]
+        public void Test_433_03()
+        {
+        }
+
+        [Test]
+        public void Test_433_04()
+        {
+        }
+
+        [Test]
+        public void Test_433_05()
+        {
+        }
+
+        [Test]
+        public void Test_433_06()
+        {
+        }
+
+        [Test]
+        public void Test_433_07()
+        {
+        }
+
+        [Test]
+        public void Test_433_08()
+        {
+        }
+
+        [Test]
+        public void Test_433_09()
+        {
+        }
+
+        [Test]
+        public void Test_433_10()
+        {
+        }
+
+        [Test]
+        public void Test_433_11()
+        {
+        }
+
+        [Test]
+        public void Test_433_12()
+        {
+        }
+
+        [Test]
+        public void Test_433_13()
+        {
+        }
+
+        [Test]
+        public void Test_433_14()
+        {
+        }
+
+        [Test]
+        public void Test_433_15()
+        {
+        }
+
+        [Test]
+        public void Test_433_16()
+        {
+        }
+
+        [Test]
+        public void Test_433_17()
+        {
+        }
+
+        [Test]
+        public void Test_433_18()
+        {
+        }
+
+        [Test]
+        public void Test_433_19()
+        {
+        }
+
+        [Test]
+        public void Test_433_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_434
+    {
+        #region PassingTests
+        [Test]
+        public void Test_434_01()
+        {
+        }
+
+        [Test]
+        public void Test_434_02()
+        {
+        }
+
+        [Test]
+        public void Test_434_03()
+        {
+        }
+
+        [Test]
+        public void Test_434_04()
+        {
+        }
+
+        [Test]
+        public void Test_434_05()
+        {
+        }
+
+        [Test]
+        public void Test_434_06()
+        {
+        }
+
+        [Test]
+        public void Test_434_07()
+        {
+        }
+
+        [Test]
+        public void Test_434_08()
+        {
+        }
+
+        [Test]
+        public void Test_434_09()
+        {
+        }
+
+        [Test]
+        public void Test_434_10()
+        {
+        }
+
+        [Test]
+        public void Test_434_11()
+        {
+        }
+
+        [Test]
+        public void Test_434_12()
+        {
+        }
+
+        [Test]
+        public void Test_434_13()
+        {
+        }
+
+        [Test]
+        public void Test_434_14()
+        {
+        }
+
+        [Test]
+        public void Test_434_15()
+        {
+        }
+
+        [Test]
+        public void Test_434_16()
+        {
+        }
+
+        [Test]
+        public void Test_434_17()
+        {
+        }
+
+        [Test]
+        public void Test_434_18()
+        {
+        }
+
+        [Test]
+        public void Test_434_19()
+        {
+        }
+
+        [Test]
+        public void Test_434_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_435
+    {
+        #region PassingTests
+        [Test]
+        public void Test_435_01()
+        {
+        }
+
+        [Test]
+        public void Test_435_02()
+        {
+        }
+
+        [Test]
+        public void Test_435_03()
+        {
+        }
+
+        [Test]
+        public void Test_435_04()
+        {
+        }
+
+        [Test]
+        public void Test_435_05()
+        {
+        }
+
+        [Test]
+        public void Test_435_06()
+        {
+        }
+
+        [Test]
+        public void Test_435_07()
+        {
+        }
+
+        [Test]
+        public void Test_435_08()
+        {
+        }
+
+        [Test]
+        public void Test_435_09()
+        {
+        }
+
+        [Test]
+        public void Test_435_10()
+        {
+        }
+
+        [Test]
+        public void Test_435_11()
+        {
+        }
+
+        [Test]
+        public void Test_435_12()
+        {
+        }
+
+        [Test]
+        public void Test_435_13()
+        {
+        }
+
+        [Test]
+        public void Test_435_14()
+        {
+        }
+
+        [Test]
+        public void Test_435_15()
+        {
+        }
+
+        [Test]
+        public void Test_435_16()
+        {
+        }
+
+        [Test]
+        public void Test_435_17()
+        {
+        }
+
+        [Test]
+        public void Test_435_18()
+        {
+        }
+
+        [Test]
+        public void Test_435_19()
+        {
+        }
+
+        [Test]
+        public void Test_435_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_436
+    {
+        #region PassingTests
+        [Test]
+        public void Test_436_01()
+        {
+        }
+
+        [Test]
+        public void Test_436_02()
+        {
+        }
+
+        [Test]
+        public void Test_436_03()
+        {
+        }
+
+        [Test]
+        public void Test_436_04()
+        {
+        }
+
+        [Test]
+        public void Test_436_05()
+        {
+        }
+
+        [Test]
+        public void Test_436_06()
+        {
+        }
+
+        [Test]
+        public void Test_436_07()
+        {
+        }
+
+        [Test]
+        public void Test_436_08()
+        {
+        }
+
+        [Test]
+        public void Test_436_09()
+        {
+        }
+
+        [Test]
+        public void Test_436_10()
+        {
+        }
+
+        [Test]
+        public void Test_436_11()
+        {
+        }
+
+        [Test]
+        public void Test_436_12()
+        {
+        }
+
+        [Test]
+        public void Test_436_13()
+        {
+        }
+
+        [Test]
+        public void Test_436_14()
+        {
+        }
+
+        [Test]
+        public void Test_436_15()
+        {
+        }
+
+        [Test]
+        public void Test_436_16()
+        {
+        }
+
+        [Test]
+        public void Test_436_17()
+        {
+        }
+
+        [Test]
+        public void Test_436_18()
+        {
+        }
+
+        [Test]
+        public void Test_436_19()
+        {
+        }
+
+        [Test]
+        public void Test_436_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_437
+    {
+        #region PassingTests
+        [Test]
+        public void Test_437_01()
+        {
+        }
+
+        [Test]
+        public void Test_437_02()
+        {
+        }
+
+        [Test]
+        public void Test_437_03()
+        {
+        }
+
+        [Test]
+        public void Test_437_04()
+        {
+        }
+
+        [Test]
+        public void Test_437_05()
+        {
+        }
+
+        [Test]
+        public void Test_437_06()
+        {
+        }
+
+        [Test]
+        public void Test_437_07()
+        {
+        }
+
+        [Test]
+        public void Test_437_08()
+        {
+        }
+
+        [Test]
+        public void Test_437_09()
+        {
+        }
+
+        [Test]
+        public void Test_437_10()
+        {
+        }
+
+        [Test]
+        public void Test_437_11()
+        {
+        }
+
+        [Test]
+        public void Test_437_12()
+        {
+        }
+
+        [Test]
+        public void Test_437_13()
+        {
+        }
+
+        [Test]
+        public void Test_437_14()
+        {
+        }
+
+        [Test]
+        public void Test_437_15()
+        {
+        }
+
+        [Test]
+        public void Test_437_16()
+        {
+        }
+
+        [Test]
+        public void Test_437_17()
+        {
+        }
+
+        [Test]
+        public void Test_437_18()
+        {
+        }
+
+        [Test]
+        public void Test_437_19()
+        {
+        }
+
+        [Test]
+        public void Test_437_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_438
+    {
+        #region PassingTests
+        [Test]
+        public void Test_438_01()
+        {
+        }
+
+        [Test]
+        public void Test_438_02()
+        {
+        }
+
+        [Test]
+        public void Test_438_03()
+        {
+        }
+
+        [Test]
+        public void Test_438_04()
+        {
+        }
+
+        [Test]
+        public void Test_438_05()
+        {
+        }
+
+        [Test]
+        public void Test_438_06()
+        {
+        }
+
+        [Test]
+        public void Test_438_07()
+        {
+        }
+
+        [Test]
+        public void Test_438_08()
+        {
+        }
+
+        [Test]
+        public void Test_438_09()
+        {
+        }
+
+        [Test]
+        public void Test_438_10()
+        {
+        }
+
+        [Test]
+        public void Test_438_11()
+        {
+        }
+
+        [Test]
+        public void Test_438_12()
+        {
+        }
+
+        [Test]
+        public void Test_438_13()
+        {
+        }
+
+        [Test]
+        public void Test_438_14()
+        {
+        }
+
+        [Test]
+        public void Test_438_15()
+        {
+        }
+
+        [Test]
+        public void Test_438_16()
+        {
+        }
+
+        [Test]
+        public void Test_438_17()
+        {
+        }
+
+        [Test]
+        public void Test_438_18()
+        {
+        }
+
+        [Test]
+        public void Test_438_19()
+        {
+        }
+
+        [Test]
+        public void Test_438_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_439
+    {
+        #region PassingTests
+        [Test]
+        public void Test_439_01()
+        {
+        }
+
+        [Test]
+        public void Test_439_02()
+        {
+        }
+
+        [Test]
+        public void Test_439_03()
+        {
+        }
+
+        [Test]
+        public void Test_439_04()
+        {
+        }
+
+        [Test]
+        public void Test_439_05()
+        {
+        }
+
+        [Test]
+        public void Test_439_06()
+        {
+        }
+
+        [Test]
+        public void Test_439_07()
+        {
+        }
+
+        [Test]
+        public void Test_439_08()
+        {
+        }
+
+        [Test]
+        public void Test_439_09()
+        {
+        }
+
+        [Test]
+        public void Test_439_10()
+        {
+        }
+
+        [Test]
+        public void Test_439_11()
+        {
+        }
+
+        [Test]
+        public void Test_439_12()
+        {
+        }
+
+        [Test]
+        public void Test_439_13()
+        {
+        }
+
+        [Test]
+        public void Test_439_14()
+        {
+        }
+
+        [Test]
+        public void Test_439_15()
+        {
+        }
+
+        [Test]
+        public void Test_439_16()
+        {
+        }
+
+        [Test]
+        public void Test_439_17()
+        {
+        }
+
+        [Test]
+        public void Test_439_18()
+        {
+        }
+
+        [Test]
+        public void Test_439_19()
+        {
+        }
+
+        [Test]
+        public void Test_439_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_440
+    {
+        #region PassingTests
+        [Test]
+        public void Test_440_01()
+        {
+        }
+
+        [Test]
+        public void Test_440_02()
+        {
+        }
+
+        [Test]
+        public void Test_440_03()
+        {
+        }
+
+        [Test]
+        public void Test_440_04()
+        {
+        }
+
+        [Test]
+        public void Test_440_05()
+        {
+        }
+
+        [Test]
+        public void Test_440_06()
+        {
+        }
+
+        [Test]
+        public void Test_440_07()
+        {
+        }
+
+        [Test]
+        public void Test_440_08()
+        {
+        }
+
+        [Test]
+        public void Test_440_09()
+        {
+        }
+
+        [Test]
+        public void Test_440_10()
+        {
+        }
+
+        [Test]
+        public void Test_440_11()
+        {
+        }
+
+        [Test]
+        public void Test_440_12()
+        {
+        }
+
+        [Test]
+        public void Test_440_13()
+        {
+        }
+
+        [Test]
+        public void Test_440_14()
+        {
+        }
+
+        [Test]
+        public void Test_440_15()
+        {
+        }
+
+        [Test]
+        public void Test_440_16()
+        {
+        }
+
+        [Test]
+        public void Test_440_17()
+        {
+        }
+
+        [Test]
+        public void Test_440_18()
+        {
+        }
+
+        [Test]
+        public void Test_440_19()
+        {
+        }
+
+        [Test]
+        public void Test_440_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_441
+    {
+        #region PassingTests
+        [Test]
+        public void Test_441_01()
+        {
+        }
+
+        [Test]
+        public void Test_441_02()
+        {
+        }
+
+        [Test]
+        public void Test_441_03()
+        {
+        }
+
+        [Test]
+        public void Test_441_04()
+        {
+        }
+
+        [Test]
+        public void Test_441_05()
+        {
+        }
+
+        [Test]
+        public void Test_441_06()
+        {
+        }
+
+        [Test]
+        public void Test_441_07()
+        {
+        }
+
+        [Test]
+        public void Test_441_08()
+        {
+        }
+
+        [Test]
+        public void Test_441_09()
+        {
+        }
+
+        [Test]
+        public void Test_441_10()
+        {
+        }
+
+        [Test]
+        public void Test_441_11()
+        {
+        }
+
+        [Test]
+        public void Test_441_12()
+        {
+        }
+
+        [Test]
+        public void Test_441_13()
+        {
+        }
+
+        [Test]
+        public void Test_441_14()
+        {
+        }
+
+        [Test]
+        public void Test_441_15()
+        {
+        }
+
+        [Test]
+        public void Test_441_16()
+        {
+        }
+
+        [Test]
+        public void Test_441_17()
+        {
+        }
+
+        [Test]
+        public void Test_441_18()
+        {
+        }
+
+        [Test]
+        public void Test_441_19()
+        {
+        }
+
+        [Test]
+        public void Test_441_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_442
+    {
+        #region PassingTests
+        [Test]
+        public void Test_442_01()
+        {
+        }
+
+        [Test]
+        public void Test_442_02()
+        {
+        }
+
+        [Test]
+        public void Test_442_03()
+        {
+        }
+
+        [Test]
+        public void Test_442_04()
+        {
+        }
+
+        [Test]
+        public void Test_442_05()
+        {
+        }
+
+        [Test]
+        public void Test_442_06()
+        {
+        }
+
+        [Test]
+        public void Test_442_07()
+        {
+        }
+
+        [Test]
+        public void Test_442_08()
+        {
+        }
+
+        [Test]
+        public void Test_442_09()
+        {
+        }
+
+        [Test]
+        public void Test_442_10()
+        {
+        }
+
+        [Test]
+        public void Test_442_11()
+        {
+        }
+
+        [Test]
+        public void Test_442_12()
+        {
+        }
+
+        [Test]
+        public void Test_442_13()
+        {
+        }
+
+        [Test]
+        public void Test_442_14()
+        {
+        }
+
+        [Test]
+        public void Test_442_15()
+        {
+        }
+
+        [Test]
+        public void Test_442_16()
+        {
+        }
+
+        [Test]
+        public void Test_442_17()
+        {
+        }
+
+        [Test]
+        public void Test_442_18()
+        {
+        }
+
+        [Test]
+        public void Test_442_19()
+        {
+        }
+
+        [Test]
+        public void Test_442_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_443
+    {
+        #region PassingTests
+        [Test]
+        public void Test_443_01()
+        {
+        }
+
+        [Test]
+        public void Test_443_02()
+        {
+        }
+
+        [Test]
+        public void Test_443_03()
+        {
+        }
+
+        [Test]
+        public void Test_443_04()
+        {
+        }
+
+        [Test]
+        public void Test_443_05()
+        {
+        }
+
+        [Test]
+        public void Test_443_06()
+        {
+        }
+
+        [Test]
+        public void Test_443_07()
+        {
+        }
+
+        [Test]
+        public void Test_443_08()
+        {
+        }
+
+        [Test]
+        public void Test_443_09()
+        {
+        }
+
+        [Test]
+        public void Test_443_10()
+        {
+        }
+
+        [Test]
+        public void Test_443_11()
+        {
+        }
+
+        [Test]
+        public void Test_443_12()
+        {
+        }
+
+        [Test]
+        public void Test_443_13()
+        {
+        }
+
+        [Test]
+        public void Test_443_14()
+        {
+        }
+
+        [Test]
+        public void Test_443_15()
+        {
+        }
+
+        [Test]
+        public void Test_443_16()
+        {
+        }
+
+        [Test]
+        public void Test_443_17()
+        {
+        }
+
+        [Test]
+        public void Test_443_18()
+        {
+        }
+
+        [Test]
+        public void Test_443_19()
+        {
+        }
+
+        [Test]
+        public void Test_443_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_444
+    {
+        #region PassingTests
+        [Test]
+        public void Test_444_01()
+        {
+        }
+
+        [Test]
+        public void Test_444_02()
+        {
+        }
+
+        [Test]
+        public void Test_444_03()
+        {
+        }
+
+        [Test]
+        public void Test_444_04()
+        {
+        }
+
+        [Test]
+        public void Test_444_05()
+        {
+        }
+
+        [Test]
+        public void Test_444_06()
+        {
+        }
+
+        [Test]
+        public void Test_444_07()
+        {
+        }
+
+        [Test]
+        public void Test_444_08()
+        {
+        }
+
+        [Test]
+        public void Test_444_09()
+        {
+        }
+
+        [Test]
+        public void Test_444_10()
+        {
+        }
+
+        [Test]
+        public void Test_444_11()
+        {
+        }
+
+        [Test]
+        public void Test_444_12()
+        {
+        }
+
+        [Test]
+        public void Test_444_13()
+        {
+        }
+
+        [Test]
+        public void Test_444_14()
+        {
+        }
+
+        [Test]
+        public void Test_444_15()
+        {
+        }
+
+        [Test]
+        public void Test_444_16()
+        {
+        }
+
+        [Test]
+        public void Test_444_17()
+        {
+        }
+
+        [Test]
+        public void Test_444_18()
+        {
+        }
+
+        [Test]
+        public void Test_444_19()
+        {
+        }
+
+        [Test]
+        public void Test_444_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_445
+    {
+        #region PassingTests
+        [Test]
+        public void Test_445_01()
+        {
+        }
+
+        [Test]
+        public void Test_445_02()
+        {
+        }
+
+        [Test]
+        public void Test_445_03()
+        {
+        }
+
+        [Test]
+        public void Test_445_04()
+        {
+        }
+
+        [Test]
+        public void Test_445_05()
+        {
+        }
+
+        [Test]
+        public void Test_445_06()
+        {
+        }
+
+        [Test]
+        public void Test_445_07()
+        {
+        }
+
+        [Test]
+        public void Test_445_08()
+        {
+        }
+
+        [Test]
+        public void Test_445_09()
+        {
+        }
+
+        [Test]
+        public void Test_445_10()
+        {
+        }
+
+        [Test]
+        public void Test_445_11()
+        {
+        }
+
+        [Test]
+        public void Test_445_12()
+        {
+        }
+
+        [Test]
+        public void Test_445_13()
+        {
+        }
+
+        [Test]
+        public void Test_445_14()
+        {
+        }
+
+        [Test]
+        public void Test_445_15()
+        {
+        }
+
+        [Test]
+        public void Test_445_16()
+        {
+        }
+
+        [Test]
+        public void Test_445_17()
+        {
+        }
+
+        [Test]
+        public void Test_445_18()
+        {
+        }
+
+        [Test]
+        public void Test_445_19()
+        {
+        }
+
+        [Test]
+        public void Test_445_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_446
+    {
+        #region PassingTests
+        [Test]
+        public void Test_446_01()
+        {
+        }
+
+        [Test]
+        public void Test_446_02()
+        {
+        }
+
+        [Test]
+        public void Test_446_03()
+        {
+        }
+
+        [Test]
+        public void Test_446_04()
+        {
+        }
+
+        [Test]
+        public void Test_446_05()
+        {
+        }
+
+        [Test]
+        public void Test_446_06()
+        {
+        }
+
+        [Test]
+        public void Test_446_07()
+        {
+        }
+
+        [Test]
+        public void Test_446_08()
+        {
+        }
+
+        [Test]
+        public void Test_446_09()
+        {
+        }
+
+        [Test]
+        public void Test_446_10()
+        {
+        }
+
+        [Test]
+        public void Test_446_11()
+        {
+        }
+
+        [Test]
+        public void Test_446_12()
+        {
+        }
+
+        [Test]
+        public void Test_446_13()
+        {
+        }
+
+        [Test]
+        public void Test_446_14()
+        {
+        }
+
+        [Test]
+        public void Test_446_15()
+        {
+        }
+
+        [Test]
+        public void Test_446_16()
+        {
+        }
+
+        [Test]
+        public void Test_446_17()
+        {
+        }
+
+        [Test]
+        public void Test_446_18()
+        {
+        }
+
+        [Test]
+        public void Test_446_19()
+        {
+        }
+
+        [Test]
+        public void Test_446_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_447
+    {
+        #region PassingTests
+        [Test]
+        public void Test_447_01()
+        {
+        }
+
+        [Test]
+        public void Test_447_02()
+        {
+        }
+
+        [Test]
+        public void Test_447_03()
+        {
+        }
+
+        [Test]
+        public void Test_447_04()
+        {
+        }
+
+        [Test]
+        public void Test_447_05()
+        {
+        }
+
+        [Test]
+        public void Test_447_06()
+        {
+        }
+
+        [Test]
+        public void Test_447_07()
+        {
+        }
+
+        [Test]
+        public void Test_447_08()
+        {
+        }
+
+        [Test]
+        public void Test_447_09()
+        {
+        }
+
+        [Test]
+        public void Test_447_10()
+        {
+        }
+
+        [Test]
+        public void Test_447_11()
+        {
+        }
+
+        [Test]
+        public void Test_447_12()
+        {
+        }
+
+        [Test]
+        public void Test_447_13()
+        {
+        }
+
+        [Test]
+        public void Test_447_14()
+        {
+        }
+
+        [Test]
+        public void Test_447_15()
+        {
+        }
+
+        [Test]
+        public void Test_447_16()
+        {
+        }
+
+        [Test]
+        public void Test_447_17()
+        {
+        }
+
+        [Test]
+        public void Test_447_18()
+        {
+        }
+
+        [Test]
+        public void Test_447_19()
+        {
+        }
+
+        [Test]
+        public void Test_447_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_448
+    {
+        #region PassingTests
+        [Test]
+        public void Test_448_01()
+        {
+        }
+
+        [Test]
+        public void Test_448_02()
+        {
+        }
+
+        [Test]
+        public void Test_448_03()
+        {
+        }
+
+        [Test]
+        public void Test_448_04()
+        {
+        }
+
+        [Test]
+        public void Test_448_05()
+        {
+        }
+
+        [Test]
+        public void Test_448_06()
+        {
+        }
+
+        [Test]
+        public void Test_448_07()
+        {
+        }
+
+        [Test]
+        public void Test_448_08()
+        {
+        }
+
+        [Test]
+        public void Test_448_09()
+        {
+        }
+
+        [Test]
+        public void Test_448_10()
+        {
+        }
+
+        [Test]
+        public void Test_448_11()
+        {
+        }
+
+        [Test]
+        public void Test_448_12()
+        {
+        }
+
+        [Test]
+        public void Test_448_13()
+        {
+        }
+
+        [Test]
+        public void Test_448_14()
+        {
+        }
+
+        [Test]
+        public void Test_448_15()
+        {
+        }
+
+        [Test]
+        public void Test_448_16()
+        {
+        }
+
+        [Test]
+        public void Test_448_17()
+        {
+        }
+
+        [Test]
+        public void Test_448_18()
+        {
+        }
+
+        [Test]
+        public void Test_448_19()
+        {
+        }
+
+        [Test]
+        public void Test_448_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_449
+    {
+        #region PassingTests
+        [Test]
+        public void Test_449_01()
+        {
+        }
+
+        [Test]
+        public void Test_449_02()
+        {
+        }
+
+        [Test]
+        public void Test_449_03()
+        {
+        }
+
+        [Test]
+        public void Test_449_04()
+        {
+        }
+
+        [Test]
+        public void Test_449_05()
+        {
+        }
+
+        [Test]
+        public void Test_449_06()
+        {
+        }
+
+        [Test]
+        public void Test_449_07()
+        {
+        }
+
+        [Test]
+        public void Test_449_08()
+        {
+        }
+
+        [Test]
+        public void Test_449_09()
+        {
+        }
+
+        [Test]
+        public void Test_449_10()
+        {
+        }
+
+        [Test]
+        public void Test_449_11()
+        {
+        }
+
+        [Test]
+        public void Test_449_12()
+        {
+        }
+
+        [Test]
+        public void Test_449_13()
+        {
+        }
+
+        [Test]
+        public void Test_449_14()
+        {
+        }
+
+        [Test]
+        public void Test_449_15()
+        {
+        }
+
+        [Test]
+        public void Test_449_16()
+        {
+        }
+
+        [Test]
+        public void Test_449_17()
+        {
+        }
+
+        [Test]
+        public void Test_449_18()
+        {
+        }
+
+        [Test]
+        public void Test_449_19()
+        {
+        }
+
+        [Test]
+        public void Test_449_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_450
+    {
+        #region PassingTests
+        [Test]
+        public void Test_450_01()
+        {
+        }
+
+        [Test]
+        public void Test_450_02()
+        {
+        }
+
+        [Test]
+        public void Test_450_03()
+        {
+        }
+
+        [Test]
+        public void Test_450_04()
+        {
+        }
+
+        [Test]
+        public void Test_450_05()
+        {
+        }
+
+        [Test]
+        public void Test_450_06()
+        {
+        }
+
+        [Test]
+        public void Test_450_07()
+        {
+        }
+
+        [Test]
+        public void Test_450_08()
+        {
+        }
+
+        [Test]
+        public void Test_450_09()
+        {
+        }
+
+        [Test]
+        public void Test_450_10()
+        {
+        }
+
+        [Test]
+        public void Test_450_11()
+        {
+        }
+
+        [Test]
+        public void Test_450_12()
+        {
+        }
+
+        [Test]
+        public void Test_450_13()
+        {
+        }
+
+        [Test]
+        public void Test_450_14()
+        {
+        }
+
+        [Test]
+        public void Test_450_15()
+        {
+        }
+
+        [Test]
+        public void Test_450_16()
+        {
+        }
+
+        [Test]
+        public void Test_450_17()
+        {
+        }
+
+        [Test]
+        public void Test_450_18()
+        {
+        }
+
+        [Test]
+        public void Test_450_19()
+        {
+        }
+
+        [Test]
+        public void Test_450_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_451
+    {
+        #region PassingTests
+        [Test]
+        public void Test_451_01()
+        {
+        }
+
+        [Test]
+        public void Test_451_02()
+        {
+        }
+
+        [Test]
+        public void Test_451_03()
+        {
+        }
+
+        [Test]
+        public void Test_451_04()
+        {
+        }
+
+        [Test]
+        public void Test_451_05()
+        {
+        }
+
+        [Test]
+        public void Test_451_06()
+        {
+        }
+
+        [Test]
+        public void Test_451_07()
+        {
+        }
+
+        [Test]
+        public void Test_451_08()
+        {
+        }
+
+        [Test]
+        public void Test_451_09()
+        {
+        }
+
+        [Test]
+        public void Test_451_10()
+        {
+        }
+
+        [Test]
+        public void Test_451_11()
+        {
+        }
+
+        [Test]
+        public void Test_451_12()
+        {
+        }
+
+        [Test]
+        public void Test_451_13()
+        {
+        }
+
+        [Test]
+        public void Test_451_14()
+        {
+        }
+
+        [Test]
+        public void Test_451_15()
+        {
+        }
+
+        [Test]
+        public void Test_451_16()
+        {
+        }
+
+        [Test]
+        public void Test_451_17()
+        {
+        }
+
+        [Test]
+        public void Test_451_18()
+        {
+        }
+
+        [Test]
+        public void Test_451_19()
+        {
+        }
+
+        [Test]
+        public void Test_451_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_452
+    {
+        #region PassingTests
+        [Test]
+        public void Test_452_01()
+        {
+        }
+
+        [Test]
+        public void Test_452_02()
+        {
+        }
+
+        [Test]
+        public void Test_452_03()
+        {
+        }
+
+        [Test]
+        public void Test_452_04()
+        {
+        }
+
+        [Test]
+        public void Test_452_05()
+        {
+        }
+
+        [Test]
+        public void Test_452_06()
+        {
+        }
+
+        [Test]
+        public void Test_452_07()
+        {
+        }
+
+        [Test]
+        public void Test_452_08()
+        {
+        }
+
+        [Test]
+        public void Test_452_09()
+        {
+        }
+
+        [Test]
+        public void Test_452_10()
+        {
+        }
+
+        [Test]
+        public void Test_452_11()
+        {
+        }
+
+        [Test]
+        public void Test_452_12()
+        {
+        }
+
+        [Test]
+        public void Test_452_13()
+        {
+        }
+
+        [Test]
+        public void Test_452_14()
+        {
+        }
+
+        [Test]
+        public void Test_452_15()
+        {
+        }
+
+        [Test]
+        public void Test_452_16()
+        {
+        }
+
+        [Test]
+        public void Test_452_17()
+        {
+        }
+
+        [Test]
+        public void Test_452_18()
+        {
+        }
+
+        [Test]
+        public void Test_452_19()
+        {
+        }
+
+        [Test]
+        public void Test_452_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_453
+    {
+        #region PassingTests
+        [Test]
+        public void Test_453_01()
+        {
+        }
+
+        [Test]
+        public void Test_453_02()
+        {
+        }
+
+        [Test]
+        public void Test_453_03()
+        {
+        }
+
+        [Test]
+        public void Test_453_04()
+        {
+        }
+
+        [Test]
+        public void Test_453_05()
+        {
+        }
+
+        [Test]
+        public void Test_453_06()
+        {
+        }
+
+        [Test]
+        public void Test_453_07()
+        {
+        }
+
+        [Test]
+        public void Test_453_08()
+        {
+        }
+
+        [Test]
+        public void Test_453_09()
+        {
+        }
+
+        [Test]
+        public void Test_453_10()
+        {
+        }
+
+        [Test]
+        public void Test_453_11()
+        {
+        }
+
+        [Test]
+        public void Test_453_12()
+        {
+        }
+
+        [Test]
+        public void Test_453_13()
+        {
+        }
+
+        [Test]
+        public void Test_453_14()
+        {
+        }
+
+        [Test]
+        public void Test_453_15()
+        {
+        }
+
+        [Test]
+        public void Test_453_16()
+        {
+        }
+
+        [Test]
+        public void Test_453_17()
+        {
+        }
+
+        [Test]
+        public void Test_453_18()
+        {
+        }
+
+        [Test]
+        public void Test_453_19()
+        {
+        }
+
+        [Test]
+        public void Test_453_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_454
+    {
+        #region PassingTests
+        [Test]
+        public void Test_454_01()
+        {
+        }
+
+        [Test]
+        public void Test_454_02()
+        {
+        }
+
+        [Test]
+        public void Test_454_03()
+        {
+        }
+
+        [Test]
+        public void Test_454_04()
+        {
+        }
+
+        [Test]
+        public void Test_454_05()
+        {
+        }
+
+        [Test]
+        public void Test_454_06()
+        {
+        }
+
+        [Test]
+        public void Test_454_07()
+        {
+        }
+
+        [Test]
+        public void Test_454_08()
+        {
+        }
+
+        [Test]
+        public void Test_454_09()
+        {
+        }
+
+        [Test]
+        public void Test_454_10()
+        {
+        }
+
+        [Test]
+        public void Test_454_11()
+        {
+        }
+
+        [Test]
+        public void Test_454_12()
+        {
+        }
+
+        [Test]
+        public void Test_454_13()
+        {
+        }
+
+        [Test]
+        public void Test_454_14()
+        {
+        }
+
+        [Test]
+        public void Test_454_15()
+        {
+        }
+
+        [Test]
+        public void Test_454_16()
+        {
+        }
+
+        [Test]
+        public void Test_454_17()
+        {
+        }
+
+        [Test]
+        public void Test_454_18()
+        {
+        }
+
+        [Test]
+        public void Test_454_19()
+        {
+        }
+
+        [Test]
+        public void Test_454_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_455
+    {
+        #region PassingTests
+        [Test]
+        public void Test_455_01()
+        {
+        }
+
+        [Test]
+        public void Test_455_02()
+        {
+        }
+
+        [Test]
+        public void Test_455_03()
+        {
+        }
+
+        [Test]
+        public void Test_455_04()
+        {
+        }
+
+        [Test]
+        public void Test_455_05()
+        {
+        }
+
+        [Test]
+        public void Test_455_06()
+        {
+        }
+
+        [Test]
+        public void Test_455_07()
+        {
+        }
+
+        [Test]
+        public void Test_455_08()
+        {
+        }
+
+        [Test]
+        public void Test_455_09()
+        {
+        }
+
+        [Test]
+        public void Test_455_10()
+        {
+        }
+
+        [Test]
+        public void Test_455_11()
+        {
+        }
+
+        [Test]
+        public void Test_455_12()
+        {
+        }
+
+        [Test]
+        public void Test_455_13()
+        {
+        }
+
+        [Test]
+        public void Test_455_14()
+        {
+        }
+
+        [Test]
+        public void Test_455_15()
+        {
+        }
+
+        [Test]
+        public void Test_455_16()
+        {
+        }
+
+        [Test]
+        public void Test_455_17()
+        {
+        }
+
+        [Test]
+        public void Test_455_18()
+        {
+        }
+
+        [Test]
+        public void Test_455_19()
+        {
+        }
+
+        [Test]
+        public void Test_455_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_456
+    {
+        #region PassingTests
+        [Test]
+        public void Test_456_01()
+        {
+        }
+
+        [Test]
+        public void Test_456_02()
+        {
+        }
+
+        [Test]
+        public void Test_456_03()
+        {
+        }
+
+        [Test]
+        public void Test_456_04()
+        {
+        }
+
+        [Test]
+        public void Test_456_05()
+        {
+        }
+
+        [Test]
+        public void Test_456_06()
+        {
+        }
+
+        [Test]
+        public void Test_456_07()
+        {
+        }
+
+        [Test]
+        public void Test_456_08()
+        {
+        }
+
+        [Test]
+        public void Test_456_09()
+        {
+        }
+
+        [Test]
+        public void Test_456_10()
+        {
+        }
+
+        [Test]
+        public void Test_456_11()
+        {
+        }
+
+        [Test]
+        public void Test_456_12()
+        {
+        }
+
+        [Test]
+        public void Test_456_13()
+        {
+        }
+
+        [Test]
+        public void Test_456_14()
+        {
+        }
+
+        [Test]
+        public void Test_456_15()
+        {
+        }
+
+        [Test]
+        public void Test_456_16()
+        {
+        }
+
+        [Test]
+        public void Test_456_17()
+        {
+        }
+
+        [Test]
+        public void Test_456_18()
+        {
+        }
+
+        [Test]
+        public void Test_456_19()
+        {
+        }
+
+        [Test]
+        public void Test_456_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_457
+    {
+        #region PassingTests
+        [Test]
+        public void Test_457_01()
+        {
+        }
+
+        [Test]
+        public void Test_457_02()
+        {
+        }
+
+        [Test]
+        public void Test_457_03()
+        {
+        }
+
+        [Test]
+        public void Test_457_04()
+        {
+        }
+
+        [Test]
+        public void Test_457_05()
+        {
+        }
+
+        [Test]
+        public void Test_457_06()
+        {
+        }
+
+        [Test]
+        public void Test_457_07()
+        {
+        }
+
+        [Test]
+        public void Test_457_08()
+        {
+        }
+
+        [Test]
+        public void Test_457_09()
+        {
+        }
+
+        [Test]
+        public void Test_457_10()
+        {
+        }
+
+        [Test]
+        public void Test_457_11()
+        {
+        }
+
+        [Test]
+        public void Test_457_12()
+        {
+        }
+
+        [Test]
+        public void Test_457_13()
+        {
+        }
+
+        [Test]
+        public void Test_457_14()
+        {
+        }
+
+        [Test]
+        public void Test_457_15()
+        {
+        }
+
+        [Test]
+        public void Test_457_16()
+        {
+        }
+
+        [Test]
+        public void Test_457_17()
+        {
+        }
+
+        [Test]
+        public void Test_457_18()
+        {
+        }
+
+        [Test]
+        public void Test_457_19()
+        {
+        }
+
+        [Test]
+        public void Test_457_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_458
+    {
+        #region PassingTests
+        [Test]
+        public void Test_458_01()
+        {
+        }
+
+        [Test]
+        public void Test_458_02()
+        {
+        }
+
+        [Test]
+        public void Test_458_03()
+        {
+        }
+
+        [Test]
+        public void Test_458_04()
+        {
+        }
+
+        [Test]
+        public void Test_458_05()
+        {
+        }
+
+        [Test]
+        public void Test_458_06()
+        {
+        }
+
+        [Test]
+        public void Test_458_07()
+        {
+        }
+
+        [Test]
+        public void Test_458_08()
+        {
+        }
+
+        [Test]
+        public void Test_458_09()
+        {
+        }
+
+        [Test]
+        public void Test_458_10()
+        {
+        }
+
+        [Test]
+        public void Test_458_11()
+        {
+        }
+
+        [Test]
+        public void Test_458_12()
+        {
+        }
+
+        [Test]
+        public void Test_458_13()
+        {
+        }
+
+        [Test]
+        public void Test_458_14()
+        {
+        }
+
+        [Test]
+        public void Test_458_15()
+        {
+        }
+
+        [Test]
+        public void Test_458_16()
+        {
+        }
+
+        [Test]
+        public void Test_458_17()
+        {
+        }
+
+        [Test]
+        public void Test_458_18()
+        {
+        }
+
+        [Test]
+        public void Test_458_19()
+        {
+        }
+
+        [Test]
+        public void Test_458_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_459
+    {
+        #region PassingTests
+        [Test]
+        public void Test_459_01()
+        {
+        }
+
+        [Test]
+        public void Test_459_02()
+        {
+        }
+
+        [Test]
+        public void Test_459_03()
+        {
+        }
+
+        [Test]
+        public void Test_459_04()
+        {
+        }
+
+        [Test]
+        public void Test_459_05()
+        {
+        }
+
+        [Test]
+        public void Test_459_06()
+        {
+        }
+
+        [Test]
+        public void Test_459_07()
+        {
+        }
+
+        [Test]
+        public void Test_459_08()
+        {
+        }
+
+        [Test]
+        public void Test_459_09()
+        {
+        }
+
+        [Test]
+        public void Test_459_10()
+        {
+        }
+
+        [Test]
+        public void Test_459_11()
+        {
+        }
+
+        [Test]
+        public void Test_459_12()
+        {
+        }
+
+        [Test]
+        public void Test_459_13()
+        {
+        }
+
+        [Test]
+        public void Test_459_14()
+        {
+        }
+
+        [Test]
+        public void Test_459_15()
+        {
+        }
+
+        [Test]
+        public void Test_459_16()
+        {
+        }
+
+        [Test]
+        public void Test_459_17()
+        {
+        }
+
+        [Test]
+        public void Test_459_18()
+        {
+        }
+
+        [Test]
+        public void Test_459_19()
+        {
+        }
+
+        [Test]
+        public void Test_459_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_460
+    {
+        #region PassingTests
+        [Test]
+        public void Test_460_01()
+        {
+        }
+
+        [Test]
+        public void Test_460_02()
+        {
+        }
+
+        [Test]
+        public void Test_460_03()
+        {
+        }
+
+        [Test]
+        public void Test_460_04()
+        {
+        }
+
+        [Test]
+        public void Test_460_05()
+        {
+        }
+
+        [Test]
+        public void Test_460_06()
+        {
+        }
+
+        [Test]
+        public void Test_460_07()
+        {
+        }
+
+        [Test]
+        public void Test_460_08()
+        {
+        }
+
+        [Test]
+        public void Test_460_09()
+        {
+        }
+
+        [Test]
+        public void Test_460_10()
+        {
+        }
+
+        [Test]
+        public void Test_460_11()
+        {
+        }
+
+        [Test]
+        public void Test_460_12()
+        {
+        }
+
+        [Test]
+        public void Test_460_13()
+        {
+        }
+
+        [Test]
+        public void Test_460_14()
+        {
+        }
+
+        [Test]
+        public void Test_460_15()
+        {
+        }
+
+        [Test]
+        public void Test_460_16()
+        {
+        }
+
+        [Test]
+        public void Test_460_17()
+        {
+        }
+
+        [Test]
+        public void Test_460_18()
+        {
+        }
+
+        [Test]
+        public void Test_460_19()
+        {
+        }
+
+        [Test]
+        public void Test_460_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_461
+    {
+        #region PassingTests
+        [Test]
+        public void Test_461_01()
+        {
+        }
+
+        [Test]
+        public void Test_461_02()
+        {
+        }
+
+        [Test]
+        public void Test_461_03()
+        {
+        }
+
+        [Test]
+        public void Test_461_04()
+        {
+        }
+
+        [Test]
+        public void Test_461_05()
+        {
+        }
+
+        [Test]
+        public void Test_461_06()
+        {
+        }
+
+        [Test]
+        public void Test_461_07()
+        {
+        }
+
+        [Test]
+        public void Test_461_08()
+        {
+        }
+
+        [Test]
+        public void Test_461_09()
+        {
+        }
+
+        [Test]
+        public void Test_461_10()
+        {
+        }
+
+        [Test]
+        public void Test_461_11()
+        {
+        }
+
+        [Test]
+        public void Test_461_12()
+        {
+        }
+
+        [Test]
+        public void Test_461_13()
+        {
+        }
+
+        [Test]
+        public void Test_461_14()
+        {
+        }
+
+        [Test]
+        public void Test_461_15()
+        {
+        }
+
+        [Test]
+        public void Test_461_16()
+        {
+        }
+
+        [Test]
+        public void Test_461_17()
+        {
+        }
+
+        [Test]
+        public void Test_461_18()
+        {
+        }
+
+        [Test]
+        public void Test_461_19()
+        {
+        }
+
+        [Test]
+        public void Test_461_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_462
+    {
+        #region PassingTests
+        [Test]
+        public void Test_462_01()
+        {
+        }
+
+        [Test]
+        public void Test_462_02()
+        {
+        }
+
+        [Test]
+        public void Test_462_03()
+        {
+        }
+
+        [Test]
+        public void Test_462_04()
+        {
+        }
+
+        [Test]
+        public void Test_462_05()
+        {
+        }
+
+        [Test]
+        public void Test_462_06()
+        {
+        }
+
+        [Test]
+        public void Test_462_07()
+        {
+        }
+
+        [Test]
+        public void Test_462_08()
+        {
+        }
+
+        [Test]
+        public void Test_462_09()
+        {
+        }
+
+        [Test]
+        public void Test_462_10()
+        {
+        }
+
+        [Test]
+        public void Test_462_11()
+        {
+        }
+
+        [Test]
+        public void Test_462_12()
+        {
+        }
+
+        [Test]
+        public void Test_462_13()
+        {
+        }
+
+        [Test]
+        public void Test_462_14()
+        {
+        }
+
+        [Test]
+        public void Test_462_15()
+        {
+        }
+
+        [Test]
+        public void Test_462_16()
+        {
+        }
+
+        [Test]
+        public void Test_462_17()
+        {
+        }
+
+        [Test]
+        public void Test_462_18()
+        {
+        }
+
+        [Test]
+        public void Test_462_19()
+        {
+        }
+
+        [Test]
+        public void Test_462_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_463
+    {
+        #region PassingTests
+        [Test]
+        public void Test_463_01()
+        {
+        }
+
+        [Test]
+        public void Test_463_02()
+        {
+        }
+
+        [Test]
+        public void Test_463_03()
+        {
+        }
+
+        [Test]
+        public void Test_463_04()
+        {
+        }
+
+        [Test]
+        public void Test_463_05()
+        {
+        }
+
+        [Test]
+        public void Test_463_06()
+        {
+        }
+
+        [Test]
+        public void Test_463_07()
+        {
+        }
+
+        [Test]
+        public void Test_463_08()
+        {
+        }
+
+        [Test]
+        public void Test_463_09()
+        {
+        }
+
+        [Test]
+        public void Test_463_10()
+        {
+        }
+
+        [Test]
+        public void Test_463_11()
+        {
+        }
+
+        [Test]
+        public void Test_463_12()
+        {
+        }
+
+        [Test]
+        public void Test_463_13()
+        {
+        }
+
+        [Test]
+        public void Test_463_14()
+        {
+        }
+
+        [Test]
+        public void Test_463_15()
+        {
+        }
+
+        [Test]
+        public void Test_463_16()
+        {
+        }
+
+        [Test]
+        public void Test_463_17()
+        {
+        }
+
+        [Test]
+        public void Test_463_18()
+        {
+        }
+
+        [Test]
+        public void Test_463_19()
+        {
+        }
+
+        [Test]
+        public void Test_463_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_464
+    {
+        #region PassingTests
+        [Test]
+        public void Test_464_01()
+        {
+        }
+
+        [Test]
+        public void Test_464_02()
+        {
+        }
+
+        [Test]
+        public void Test_464_03()
+        {
+        }
+
+        [Test]
+        public void Test_464_04()
+        {
+        }
+
+        [Test]
+        public void Test_464_05()
+        {
+        }
+
+        [Test]
+        public void Test_464_06()
+        {
+        }
+
+        [Test]
+        public void Test_464_07()
+        {
+        }
+
+        [Test]
+        public void Test_464_08()
+        {
+        }
+
+        [Test]
+        public void Test_464_09()
+        {
+        }
+
+        [Test]
+        public void Test_464_10()
+        {
+        }
+
+        [Test]
+        public void Test_464_11()
+        {
+        }
+
+        [Test]
+        public void Test_464_12()
+        {
+        }
+
+        [Test]
+        public void Test_464_13()
+        {
+        }
+
+        [Test]
+        public void Test_464_14()
+        {
+        }
+
+        [Test]
+        public void Test_464_15()
+        {
+        }
+
+        [Test]
+        public void Test_464_16()
+        {
+        }
+
+        [Test]
+        public void Test_464_17()
+        {
+        }
+
+        [Test]
+        public void Test_464_18()
+        {
+        }
+
+        [Test]
+        public void Test_464_19()
+        {
+        }
+
+        [Test]
+        public void Test_464_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_465
+    {
+        #region PassingTests
+        [Test]
+        public void Test_465_01()
+        {
+        }
+
+        [Test]
+        public void Test_465_02()
+        {
+        }
+
+        [Test]
+        public void Test_465_03()
+        {
+        }
+
+        [Test]
+        public void Test_465_04()
+        {
+        }
+
+        [Test]
+        public void Test_465_05()
+        {
+        }
+
+        [Test]
+        public void Test_465_06()
+        {
+        }
+
+        [Test]
+        public void Test_465_07()
+        {
+        }
+
+        [Test]
+        public void Test_465_08()
+        {
+        }
+
+        [Test]
+        public void Test_465_09()
+        {
+        }
+
+        [Test]
+        public void Test_465_10()
+        {
+        }
+
+        [Test]
+        public void Test_465_11()
+        {
+        }
+
+        [Test]
+        public void Test_465_12()
+        {
+        }
+
+        [Test]
+        public void Test_465_13()
+        {
+        }
+
+        [Test]
+        public void Test_465_14()
+        {
+        }
+
+        [Test]
+        public void Test_465_15()
+        {
+        }
+
+        [Test]
+        public void Test_465_16()
+        {
+        }
+
+        [Test]
+        public void Test_465_17()
+        {
+        }
+
+        [Test]
+        public void Test_465_18()
+        {
+        }
+
+        [Test]
+        public void Test_465_19()
+        {
+        }
+
+        [Test]
+        public void Test_465_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_466
+    {
+        #region PassingTests
+        [Test]
+        public void Test_466_01()
+        {
+        }
+
+        [Test]
+        public void Test_466_02()
+        {
+        }
+
+        [Test]
+        public void Test_466_03()
+        {
+        }
+
+        [Test]
+        public void Test_466_04()
+        {
+        }
+
+        [Test]
+        public void Test_466_05()
+        {
+        }
+
+        [Test]
+        public void Test_466_06()
+        {
+        }
+
+        [Test]
+        public void Test_466_07()
+        {
+        }
+
+        [Test]
+        public void Test_466_08()
+        {
+        }
+
+        [Test]
+        public void Test_466_09()
+        {
+        }
+
+        [Test]
+        public void Test_466_10()
+        {
+        }
+
+        [Test]
+        public void Test_466_11()
+        {
+        }
+
+        [Test]
+        public void Test_466_12()
+        {
+        }
+
+        [Test]
+        public void Test_466_13()
+        {
+        }
+
+        [Test]
+        public void Test_466_14()
+        {
+        }
+
+        [Test]
+        public void Test_466_15()
+        {
+        }
+
+        [Test]
+        public void Test_466_16()
+        {
+        }
+
+        [Test]
+        public void Test_466_17()
+        {
+        }
+
+        [Test]
+        public void Test_466_18()
+        {
+        }
+
+        [Test]
+        public void Test_466_19()
+        {
+        }
+
+        [Test]
+        public void Test_466_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_467
+    {
+        #region PassingTests
+        [Test]
+        public void Test_467_01()
+        {
+        }
+
+        [Test]
+        public void Test_467_02()
+        {
+        }
+
+        [Test]
+        public void Test_467_03()
+        {
+        }
+
+        [Test]
+        public void Test_467_04()
+        {
+        }
+
+        [Test]
+        public void Test_467_05()
+        {
+        }
+
+        [Test]
+        public void Test_467_06()
+        {
+        }
+
+        [Test]
+        public void Test_467_07()
+        {
+        }
+
+        [Test]
+        public void Test_467_08()
+        {
+        }
+
+        [Test]
+        public void Test_467_09()
+        {
+        }
+
+        [Test]
+        public void Test_467_10()
+        {
+        }
+
+        [Test]
+        public void Test_467_11()
+        {
+        }
+
+        [Test]
+        public void Test_467_12()
+        {
+        }
+
+        [Test]
+        public void Test_467_13()
+        {
+        }
+
+        [Test]
+        public void Test_467_14()
+        {
+        }
+
+        [Test]
+        public void Test_467_15()
+        {
+        }
+
+        [Test]
+        public void Test_467_16()
+        {
+        }
+
+        [Test]
+        public void Test_467_17()
+        {
+        }
+
+        [Test]
+        public void Test_467_18()
+        {
+        }
+
+        [Test]
+        public void Test_467_19()
+        {
+        }
+
+        [Test]
+        public void Test_467_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_468
+    {
+        #region PassingTests
+        [Test]
+        public void Test_468_01()
+        {
+        }
+
+        [Test]
+        public void Test_468_02()
+        {
+        }
+
+        [Test]
+        public void Test_468_03()
+        {
+        }
+
+        [Test]
+        public void Test_468_04()
+        {
+        }
+
+        [Test]
+        public void Test_468_05()
+        {
+        }
+
+        [Test]
+        public void Test_468_06()
+        {
+        }
+
+        [Test]
+        public void Test_468_07()
+        {
+        }
+
+        [Test]
+        public void Test_468_08()
+        {
+        }
+
+        [Test]
+        public void Test_468_09()
+        {
+        }
+
+        [Test]
+        public void Test_468_10()
+        {
+        }
+
+        [Test]
+        public void Test_468_11()
+        {
+        }
+
+        [Test]
+        public void Test_468_12()
+        {
+        }
+
+        [Test]
+        public void Test_468_13()
+        {
+        }
+
+        [Test]
+        public void Test_468_14()
+        {
+        }
+
+        [Test]
+        public void Test_468_15()
+        {
+        }
+
+        [Test]
+        public void Test_468_16()
+        {
+        }
+
+        [Test]
+        public void Test_468_17()
+        {
+        }
+
+        [Test]
+        public void Test_468_18()
+        {
+        }
+
+        [Test]
+        public void Test_468_19()
+        {
+        }
+
+        [Test]
+        public void Test_468_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_469
+    {
+        #region PassingTests
+        [Test]
+        public void Test_469_01()
+        {
+        }
+
+        [Test]
+        public void Test_469_02()
+        {
+        }
+
+        [Test]
+        public void Test_469_03()
+        {
+        }
+
+        [Test]
+        public void Test_469_04()
+        {
+        }
+
+        [Test]
+        public void Test_469_05()
+        {
+        }
+
+        [Test]
+        public void Test_469_06()
+        {
+        }
+
+        [Test]
+        public void Test_469_07()
+        {
+        }
+
+        [Test]
+        public void Test_469_08()
+        {
+        }
+
+        [Test]
+        public void Test_469_09()
+        {
+        }
+
+        [Test]
+        public void Test_469_10()
+        {
+        }
+
+        [Test]
+        public void Test_469_11()
+        {
+        }
+
+        [Test]
+        public void Test_469_12()
+        {
+        }
+
+        [Test]
+        public void Test_469_13()
+        {
+        }
+
+        [Test]
+        public void Test_469_14()
+        {
+        }
+
+        [Test]
+        public void Test_469_15()
+        {
+        }
+
+        [Test]
+        public void Test_469_16()
+        {
+        }
+
+        [Test]
+        public void Test_469_17()
+        {
+        }
+
+        [Test]
+        public void Test_469_18()
+        {
+        }
+
+        [Test]
+        public void Test_469_19()
+        {
+        }
+
+        [Test]
+        public void Test_469_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_470
+    {
+        #region PassingTests
+        [Test]
+        public void Test_470_01()
+        {
+        }
+
+        [Test]
+        public void Test_470_02()
+        {
+        }
+
+        [Test]
+        public void Test_470_03()
+        {
+        }
+
+        [Test]
+        public void Test_470_04()
+        {
+        }
+
+        [Test]
+        public void Test_470_05()
+        {
+        }
+
+        [Test]
+        public void Test_470_06()
+        {
+        }
+
+        [Test]
+        public void Test_470_07()
+        {
+        }
+
+        [Test]
+        public void Test_470_08()
+        {
+        }
+
+        [Test]
+        public void Test_470_09()
+        {
+        }
+
+        [Test]
+        public void Test_470_10()
+        {
+        }
+
+        [Test]
+        public void Test_470_11()
+        {
+        }
+
+        [Test]
+        public void Test_470_12()
+        {
+        }
+
+        [Test]
+        public void Test_470_13()
+        {
+        }
+
+        [Test]
+        public void Test_470_14()
+        {
+        }
+
+        [Test]
+        public void Test_470_15()
+        {
+        }
+
+        [Test]
+        public void Test_470_16()
+        {
+        }
+
+        [Test]
+        public void Test_470_17()
+        {
+        }
+
+        [Test]
+        public void Test_470_18()
+        {
+        }
+
+        [Test]
+        public void Test_470_19()
+        {
+        }
+
+        [Test]
+        public void Test_470_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_471
+    {
+        #region PassingTests
+        [Test]
+        public void Test_471_01()
+        {
+        }
+
+        [Test]
+        public void Test_471_02()
+        {
+        }
+
+        [Test]
+        public void Test_471_03()
+        {
+        }
+
+        [Test]
+        public void Test_471_04()
+        {
+        }
+
+        [Test]
+        public void Test_471_05()
+        {
+        }
+
+        [Test]
+        public void Test_471_06()
+        {
+        }
+
+        [Test]
+        public void Test_471_07()
+        {
+        }
+
+        [Test]
+        public void Test_471_08()
+        {
+        }
+
+        [Test]
+        public void Test_471_09()
+        {
+        }
+
+        [Test]
+        public void Test_471_10()
+        {
+        }
+
+        [Test]
+        public void Test_471_11()
+        {
+        }
+
+        [Test]
+        public void Test_471_12()
+        {
+        }
+
+        [Test]
+        public void Test_471_13()
+        {
+        }
+
+        [Test]
+        public void Test_471_14()
+        {
+        }
+
+        [Test]
+        public void Test_471_15()
+        {
+        }
+
+        [Test]
+        public void Test_471_16()
+        {
+        }
+
+        [Test]
+        public void Test_471_17()
+        {
+        }
+
+        [Test]
+        public void Test_471_18()
+        {
+        }
+
+        [Test]
+        public void Test_471_19()
+        {
+        }
+
+        [Test]
+        public void Test_471_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_472
+    {
+        #region PassingTests
+        [Test]
+        public void Test_472_01()
+        {
+        }
+
+        [Test]
+        public void Test_472_02()
+        {
+        }
+
+        [Test]
+        public void Test_472_03()
+        {
+        }
+
+        [Test]
+        public void Test_472_04()
+        {
+        }
+
+        [Test]
+        public void Test_472_05()
+        {
+        }
+
+        [Test]
+        public void Test_472_06()
+        {
+        }
+
+        [Test]
+        public void Test_472_07()
+        {
+        }
+
+        [Test]
+        public void Test_472_08()
+        {
+        }
+
+        [Test]
+        public void Test_472_09()
+        {
+        }
+
+        [Test]
+        public void Test_472_10()
+        {
+        }
+
+        [Test]
+        public void Test_472_11()
+        {
+        }
+
+        [Test]
+        public void Test_472_12()
+        {
+        }
+
+        [Test]
+        public void Test_472_13()
+        {
+        }
+
+        [Test]
+        public void Test_472_14()
+        {
+        }
+
+        [Test]
+        public void Test_472_15()
+        {
+        }
+
+        [Test]
+        public void Test_472_16()
+        {
+        }
+
+        [Test]
+        public void Test_472_17()
+        {
+        }
+
+        [Test]
+        public void Test_472_18()
+        {
+        }
+
+        [Test]
+        public void Test_472_19()
+        {
+        }
+
+        [Test]
+        public void Test_472_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_473
+    {
+        #region PassingTests
+        [Test]
+        public void Test_473_01()
+        {
+        }
+
+        [Test]
+        public void Test_473_02()
+        {
+        }
+
+        [Test]
+        public void Test_473_03()
+        {
+        }
+
+        [Test]
+        public void Test_473_04()
+        {
+        }
+
+        [Test]
+        public void Test_473_05()
+        {
+        }
+
+        [Test]
+        public void Test_473_06()
+        {
+        }
+
+        [Test]
+        public void Test_473_07()
+        {
+        }
+
+        [Test]
+        public void Test_473_08()
+        {
+        }
+
+        [Test]
+        public void Test_473_09()
+        {
+        }
+
+        [Test]
+        public void Test_473_10()
+        {
+        }
+
+        [Test]
+        public void Test_473_11()
+        {
+        }
+
+        [Test]
+        public void Test_473_12()
+        {
+        }
+
+        [Test]
+        public void Test_473_13()
+        {
+        }
+
+        [Test]
+        public void Test_473_14()
+        {
+        }
+
+        [Test]
+        public void Test_473_15()
+        {
+        }
+
+        [Test]
+        public void Test_473_16()
+        {
+        }
+
+        [Test]
+        public void Test_473_17()
+        {
+        }
+
+        [Test]
+        public void Test_473_18()
+        {
+        }
+
+        [Test]
+        public void Test_473_19()
+        {
+        }
+
+        [Test]
+        public void Test_473_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_474
+    {
+        #region PassingTests
+        [Test]
+        public void Test_474_01()
+        {
+        }
+
+        [Test]
+        public void Test_474_02()
+        {
+        }
+
+        [Test]
+        public void Test_474_03()
+        {
+        }
+
+        [Test]
+        public void Test_474_04()
+        {
+        }
+
+        [Test]
+        public void Test_474_05()
+        {
+        }
+
+        [Test]
+        public void Test_474_06()
+        {
+        }
+
+        [Test]
+        public void Test_474_07()
+        {
+        }
+
+        [Test]
+        public void Test_474_08()
+        {
+        }
+
+        [Test]
+        public void Test_474_09()
+        {
+        }
+
+        [Test]
+        public void Test_474_10()
+        {
+        }
+
+        [Test]
+        public void Test_474_11()
+        {
+        }
+
+        [Test]
+        public void Test_474_12()
+        {
+        }
+
+        [Test]
+        public void Test_474_13()
+        {
+        }
+
+        [Test]
+        public void Test_474_14()
+        {
+        }
+
+        [Test]
+        public void Test_474_15()
+        {
+        }
+
+        [Test]
+        public void Test_474_16()
+        {
+        }
+
+        [Test]
+        public void Test_474_17()
+        {
+        }
+
+        [Test]
+        public void Test_474_18()
+        {
+        }
+
+        [Test]
+        public void Test_474_19()
+        {
+        }
+
+        [Test]
+        public void Test_474_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_475
+    {
+        #region PassingTests
+        [Test]
+        public void Test_475_01()
+        {
+        }
+
+        [Test]
+        public void Test_475_02()
+        {
+        }
+
+        [Test]
+        public void Test_475_03()
+        {
+        }
+
+        [Test]
+        public void Test_475_04()
+        {
+        }
+
+        [Test]
+        public void Test_475_05()
+        {
+        }
+
+        [Test]
+        public void Test_475_06()
+        {
+        }
+
+        [Test]
+        public void Test_475_07()
+        {
+        }
+
+        [Test]
+        public void Test_475_08()
+        {
+        }
+
+        [Test]
+        public void Test_475_09()
+        {
+        }
+
+        [Test]
+        public void Test_475_10()
+        {
+        }
+
+        [Test]
+        public void Test_475_11()
+        {
+        }
+
+        [Test]
+        public void Test_475_12()
+        {
+        }
+
+        [Test]
+        public void Test_475_13()
+        {
+        }
+
+        [Test]
+        public void Test_475_14()
+        {
+        }
+
+        [Test]
+        public void Test_475_15()
+        {
+        }
+
+        [Test]
+        public void Test_475_16()
+        {
+        }
+
+        [Test]
+        public void Test_475_17()
+        {
+        }
+
+        [Test]
+        public void Test_475_18()
+        {
+        }
+
+        [Test]
+        public void Test_475_19()
+        {
+        }
+
+        [Test]
+        public void Test_475_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_476
+    {
+        #region PassingTests
+        [Test]
+        public void Test_476_01()
+        {
+        }
+
+        [Test]
+        public void Test_476_02()
+        {
+        }
+
+        [Test]
+        public void Test_476_03()
+        {
+        }
+
+        [Test]
+        public void Test_476_04()
+        {
+        }
+
+        [Test]
+        public void Test_476_05()
+        {
+        }
+
+        [Test]
+        public void Test_476_06()
+        {
+        }
+
+        [Test]
+        public void Test_476_07()
+        {
+        }
+
+        [Test]
+        public void Test_476_08()
+        {
+        }
+
+        [Test]
+        public void Test_476_09()
+        {
+        }
+
+        [Test]
+        public void Test_476_10()
+        {
+        }
+
+        [Test]
+        public void Test_476_11()
+        {
+        }
+
+        [Test]
+        public void Test_476_12()
+        {
+        }
+
+        [Test]
+        public void Test_476_13()
+        {
+        }
+
+        [Test]
+        public void Test_476_14()
+        {
+        }
+
+        [Test]
+        public void Test_476_15()
+        {
+        }
+
+        [Test]
+        public void Test_476_16()
+        {
+        }
+
+        [Test]
+        public void Test_476_17()
+        {
+        }
+
+        [Test]
+        public void Test_476_18()
+        {
+        }
+
+        [Test]
+        public void Test_476_19()
+        {
+        }
+
+        [Test]
+        public void Test_476_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_477
+    {
+        #region PassingTests
+        [Test]
+        public void Test_477_01()
+        {
+        }
+
+        [Test]
+        public void Test_477_02()
+        {
+        }
+
+        [Test]
+        public void Test_477_03()
+        {
+        }
+
+        [Test]
+        public void Test_477_04()
+        {
+        }
+
+        [Test]
+        public void Test_477_05()
+        {
+        }
+
+        [Test]
+        public void Test_477_06()
+        {
+        }
+
+        [Test]
+        public void Test_477_07()
+        {
+        }
+
+        [Test]
+        public void Test_477_08()
+        {
+        }
+
+        [Test]
+        public void Test_477_09()
+        {
+        }
+
+        [Test]
+        public void Test_477_10()
+        {
+        }
+
+        [Test]
+        public void Test_477_11()
+        {
+        }
+
+        [Test]
+        public void Test_477_12()
+        {
+        }
+
+        [Test]
+        public void Test_477_13()
+        {
+        }
+
+        [Test]
+        public void Test_477_14()
+        {
+        }
+
+        [Test]
+        public void Test_477_15()
+        {
+        }
+
+        [Test]
+        public void Test_477_16()
+        {
+        }
+
+        [Test]
+        public void Test_477_17()
+        {
+        }
+
+        [Test]
+        public void Test_477_18()
+        {
+        }
+
+        [Test]
+        public void Test_477_19()
+        {
+        }
+
+        [Test]
+        public void Test_477_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_478
+    {
+        #region PassingTests
+        [Test]
+        public void Test_478_01()
+        {
+        }
+
+        [Test]
+        public void Test_478_02()
+        {
+        }
+
+        [Test]
+        public void Test_478_03()
+        {
+        }
+
+        [Test]
+        public void Test_478_04()
+        {
+        }
+
+        [Test]
+        public void Test_478_05()
+        {
+        }
+
+        [Test]
+        public void Test_478_06()
+        {
+        }
+
+        [Test]
+        public void Test_478_07()
+        {
+        }
+
+        [Test]
+        public void Test_478_08()
+        {
+        }
+
+        [Test]
+        public void Test_478_09()
+        {
+        }
+
+        [Test]
+        public void Test_478_10()
+        {
+        }
+
+        [Test]
+        public void Test_478_11()
+        {
+        }
+
+        [Test]
+        public void Test_478_12()
+        {
+        }
+
+        [Test]
+        public void Test_478_13()
+        {
+        }
+
+        [Test]
+        public void Test_478_14()
+        {
+        }
+
+        [Test]
+        public void Test_478_15()
+        {
+        }
+
+        [Test]
+        public void Test_478_16()
+        {
+        }
+
+        [Test]
+        public void Test_478_17()
+        {
+        }
+
+        [Test]
+        public void Test_478_18()
+        {
+        }
+
+        [Test]
+        public void Test_478_19()
+        {
+        }
+
+        [Test]
+        public void Test_478_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_479
+    {
+        #region PassingTests
+        [Test]
+        public void Test_479_01()
+        {
+        }
+
+        [Test]
+        public void Test_479_02()
+        {
+        }
+
+        [Test]
+        public void Test_479_03()
+        {
+        }
+
+        [Test]
+        public void Test_479_04()
+        {
+        }
+
+        [Test]
+        public void Test_479_05()
+        {
+        }
+
+        [Test]
+        public void Test_479_06()
+        {
+        }
+
+        [Test]
+        public void Test_479_07()
+        {
+        }
+
+        [Test]
+        public void Test_479_08()
+        {
+        }
+
+        [Test]
+        public void Test_479_09()
+        {
+        }
+
+        [Test]
+        public void Test_479_10()
+        {
+        }
+
+        [Test]
+        public void Test_479_11()
+        {
+        }
+
+        [Test]
+        public void Test_479_12()
+        {
+        }
+
+        [Test]
+        public void Test_479_13()
+        {
+        }
+
+        [Test]
+        public void Test_479_14()
+        {
+        }
+
+        [Test]
+        public void Test_479_15()
+        {
+        }
+
+        [Test]
+        public void Test_479_16()
+        {
+        }
+
+        [Test]
+        public void Test_479_17()
+        {
+        }
+
+        [Test]
+        public void Test_479_18()
+        {
+        }
+
+        [Test]
+        public void Test_479_19()
+        {
+        }
+
+        [Test]
+        public void Test_479_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_480
+    {
+        #region PassingTests
+        [Test]
+        public void Test_480_01()
+        {
+        }
+
+        [Test]
+        public void Test_480_02()
+        {
+        }
+
+        [Test]
+        public void Test_480_03()
+        {
+        }
+
+        [Test]
+        public void Test_480_04()
+        {
+        }
+
+        [Test]
+        public void Test_480_05()
+        {
+        }
+
+        [Test]
+        public void Test_480_06()
+        {
+        }
+
+        [Test]
+        public void Test_480_07()
+        {
+        }
+
+        [Test]
+        public void Test_480_08()
+        {
+        }
+
+        [Test]
+        public void Test_480_09()
+        {
+        }
+
+        [Test]
+        public void Test_480_10()
+        {
+        }
+
+        [Test]
+        public void Test_480_11()
+        {
+        }
+
+        [Test]
+        public void Test_480_12()
+        {
+        }
+
+        [Test]
+        public void Test_480_13()
+        {
+        }
+
+        [Test]
+        public void Test_480_14()
+        {
+        }
+
+        [Test]
+        public void Test_480_15()
+        {
+        }
+
+        [Test]
+        public void Test_480_16()
+        {
+        }
+
+        [Test]
+        public void Test_480_17()
+        {
+        }
+
+        [Test]
+        public void Test_480_18()
+        {
+        }
+
+        [Test]
+        public void Test_480_19()
+        {
+        }
+
+        [Test]
+        public void Test_480_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_481
+    {
+        #region PassingTests
+        [Test]
+        public void Test_481_01()
+        {
+        }
+
+        [Test]
+        public void Test_481_02()
+        {
+        }
+
+        [Test]
+        public void Test_481_03()
+        {
+        }
+
+        [Test]
+        public void Test_481_04()
+        {
+        }
+
+        [Test]
+        public void Test_481_05()
+        {
+        }
+
+        [Test]
+        public void Test_481_06()
+        {
+        }
+
+        [Test]
+        public void Test_481_07()
+        {
+        }
+
+        [Test]
+        public void Test_481_08()
+        {
+        }
+
+        [Test]
+        public void Test_481_09()
+        {
+        }
+
+        [Test]
+        public void Test_481_10()
+        {
+        }
+
+        [Test]
+        public void Test_481_11()
+        {
+        }
+
+        [Test]
+        public void Test_481_12()
+        {
+        }
+
+        [Test]
+        public void Test_481_13()
+        {
+        }
+
+        [Test]
+        public void Test_481_14()
+        {
+        }
+
+        [Test]
+        public void Test_481_15()
+        {
+        }
+
+        [Test]
+        public void Test_481_16()
+        {
+        }
+
+        [Test]
+        public void Test_481_17()
+        {
+        }
+
+        [Test]
+        public void Test_481_18()
+        {
+        }
+
+        [Test]
+        public void Test_481_19()
+        {
+        }
+
+        [Test]
+        public void Test_481_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_482
+    {
+        #region PassingTests
+        [Test]
+        public void Test_482_01()
+        {
+        }
+
+        [Test]
+        public void Test_482_02()
+        {
+        }
+
+        [Test]
+        public void Test_482_03()
+        {
+        }
+
+        [Test]
+        public void Test_482_04()
+        {
+        }
+
+        [Test]
+        public void Test_482_05()
+        {
+        }
+
+        [Test]
+        public void Test_482_06()
+        {
+        }
+
+        [Test]
+        public void Test_482_07()
+        {
+        }
+
+        [Test]
+        public void Test_482_08()
+        {
+        }
+
+        [Test]
+        public void Test_482_09()
+        {
+        }
+
+        [Test]
+        public void Test_482_10()
+        {
+        }
+
+        [Test]
+        public void Test_482_11()
+        {
+        }
+
+        [Test]
+        public void Test_482_12()
+        {
+        }
+
+        [Test]
+        public void Test_482_13()
+        {
+        }
+
+        [Test]
+        public void Test_482_14()
+        {
+        }
+
+        [Test]
+        public void Test_482_15()
+        {
+        }
+
+        [Test]
+        public void Test_482_16()
+        {
+        }
+
+        [Test]
+        public void Test_482_17()
+        {
+        }
+
+        [Test]
+        public void Test_482_18()
+        {
+        }
+
+        [Test]
+        public void Test_482_19()
+        {
+        }
+
+        [Test]
+        public void Test_482_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_483
+    {
+        #region PassingTests
+        [Test]
+        public void Test_483_01()
+        {
+        }
+
+        [Test]
+        public void Test_483_02()
+        {
+        }
+
+        [Test]
+        public void Test_483_03()
+        {
+        }
+
+        [Test]
+        public void Test_483_04()
+        {
+        }
+
+        [Test]
+        public void Test_483_05()
+        {
+        }
+
+        [Test]
+        public void Test_483_06()
+        {
+        }
+
+        [Test]
+        public void Test_483_07()
+        {
+        }
+
+        [Test]
+        public void Test_483_08()
+        {
+        }
+
+        [Test]
+        public void Test_483_09()
+        {
+        }
+
+        [Test]
+        public void Test_483_10()
+        {
+        }
+
+        [Test]
+        public void Test_483_11()
+        {
+        }
+
+        [Test]
+        public void Test_483_12()
+        {
+        }
+
+        [Test]
+        public void Test_483_13()
+        {
+        }
+
+        [Test]
+        public void Test_483_14()
+        {
+        }
+
+        [Test]
+        public void Test_483_15()
+        {
+        }
+
+        [Test]
+        public void Test_483_16()
+        {
+        }
+
+        [Test]
+        public void Test_483_17()
+        {
+        }
+
+        [Test]
+        public void Test_483_18()
+        {
+        }
+
+        [Test]
+        public void Test_483_19()
+        {
+        }
+
+        [Test]
+        public void Test_483_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_484
+    {
+        #region PassingTests
+        [Test]
+        public void Test_484_01()
+        {
+        }
+
+        [Test]
+        public void Test_484_02()
+        {
+        }
+
+        [Test]
+        public void Test_484_03()
+        {
+        }
+
+        [Test]
+        public void Test_484_04()
+        {
+        }
+
+        [Test]
+        public void Test_484_05()
+        {
+        }
+
+        [Test]
+        public void Test_484_06()
+        {
+        }
+
+        [Test]
+        public void Test_484_07()
+        {
+        }
+
+        [Test]
+        public void Test_484_08()
+        {
+        }
+
+        [Test]
+        public void Test_484_09()
+        {
+        }
+
+        [Test]
+        public void Test_484_10()
+        {
+        }
+
+        [Test]
+        public void Test_484_11()
+        {
+        }
+
+        [Test]
+        public void Test_484_12()
+        {
+        }
+
+        [Test]
+        public void Test_484_13()
+        {
+        }
+
+        [Test]
+        public void Test_484_14()
+        {
+        }
+
+        [Test]
+        public void Test_484_15()
+        {
+        }
+
+        [Test]
+        public void Test_484_16()
+        {
+        }
+
+        [Test]
+        public void Test_484_17()
+        {
+        }
+
+        [Test]
+        public void Test_484_18()
+        {
+        }
+
+        [Test]
+        public void Test_484_19()
+        {
+        }
+
+        [Test]
+        public void Test_484_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_485
+    {
+        #region PassingTests
+        [Test]
+        public void Test_485_01()
+        {
+        }
+
+        [Test]
+        public void Test_485_02()
+        {
+        }
+
+        [Test]
+        public void Test_485_03()
+        {
+        }
+
+        [Test]
+        public void Test_485_04()
+        {
+        }
+
+        [Test]
+        public void Test_485_05()
+        {
+        }
+
+        [Test]
+        public void Test_485_06()
+        {
+        }
+
+        [Test]
+        public void Test_485_07()
+        {
+        }
+
+        [Test]
+        public void Test_485_08()
+        {
+        }
+
+        [Test]
+        public void Test_485_09()
+        {
+        }
+
+        [Test]
+        public void Test_485_10()
+        {
+        }
+
+        [Test]
+        public void Test_485_11()
+        {
+        }
+
+        [Test]
+        public void Test_485_12()
+        {
+        }
+
+        [Test]
+        public void Test_485_13()
+        {
+        }
+
+        [Test]
+        public void Test_485_14()
+        {
+        }
+
+        [Test]
+        public void Test_485_15()
+        {
+        }
+
+        [Test]
+        public void Test_485_16()
+        {
+        }
+
+        [Test]
+        public void Test_485_17()
+        {
+        }
+
+        [Test]
+        public void Test_485_18()
+        {
+        }
+
+        [Test]
+        public void Test_485_19()
+        {
+        }
+
+        [Test]
+        public void Test_485_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_486
+    {
+        #region PassingTests
+        [Test]
+        public void Test_486_01()
+        {
+        }
+
+        [Test]
+        public void Test_486_02()
+        {
+        }
+
+        [Test]
+        public void Test_486_03()
+        {
+        }
+
+        [Test]
+        public void Test_486_04()
+        {
+        }
+
+        [Test]
+        public void Test_486_05()
+        {
+        }
+
+        [Test]
+        public void Test_486_06()
+        {
+        }
+
+        [Test]
+        public void Test_486_07()
+        {
+        }
+
+        [Test]
+        public void Test_486_08()
+        {
+        }
+
+        [Test]
+        public void Test_486_09()
+        {
+        }
+
+        [Test]
+        public void Test_486_10()
+        {
+        }
+
+        [Test]
+        public void Test_486_11()
+        {
+        }
+
+        [Test]
+        public void Test_486_12()
+        {
+        }
+
+        [Test]
+        public void Test_486_13()
+        {
+        }
+
+        [Test]
+        public void Test_486_14()
+        {
+        }
+
+        [Test]
+        public void Test_486_15()
+        {
+        }
+
+        [Test]
+        public void Test_486_16()
+        {
+        }
+
+        [Test]
+        public void Test_486_17()
+        {
+        }
+
+        [Test]
+        public void Test_486_18()
+        {
+        }
+
+        [Test]
+        public void Test_486_19()
+        {
+        }
+
+        [Test]
+        public void Test_486_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_487
+    {
+        #region PassingTests
+        [Test]
+        public void Test_487_01()
+        {
+        }
+
+        [Test]
+        public void Test_487_02()
+        {
+        }
+
+        [Test]
+        public void Test_487_03()
+        {
+        }
+
+        [Test]
+        public void Test_487_04()
+        {
+        }
+
+        [Test]
+        public void Test_487_05()
+        {
+        }
+
+        [Test]
+        public void Test_487_06()
+        {
+        }
+
+        [Test]
+        public void Test_487_07()
+        {
+        }
+
+        [Test]
+        public void Test_487_08()
+        {
+        }
+
+        [Test]
+        public void Test_487_09()
+        {
+        }
+
+        [Test]
+        public void Test_487_10()
+        {
+        }
+
+        [Test]
+        public void Test_487_11()
+        {
+        }
+
+        [Test]
+        public void Test_487_12()
+        {
+        }
+
+        [Test]
+        public void Test_487_13()
+        {
+        }
+
+        [Test]
+        public void Test_487_14()
+        {
+        }
+
+        [Test]
+        public void Test_487_15()
+        {
+        }
+
+        [Test]
+        public void Test_487_16()
+        {
+        }
+
+        [Test]
+        public void Test_487_17()
+        {
+        }
+
+        [Test]
+        public void Test_487_18()
+        {
+        }
+
+        [Test]
+        public void Test_487_19()
+        {
+        }
+
+        [Test]
+        public void Test_487_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_488
+    {
+        #region PassingTests
+        [Test]
+        public void Test_488_01()
+        {
+        }
+
+        [Test]
+        public void Test_488_02()
+        {
+        }
+
+        [Test]
+        public void Test_488_03()
+        {
+        }
+
+        [Test]
+        public void Test_488_04()
+        {
+        }
+
+        [Test]
+        public void Test_488_05()
+        {
+        }
+
+        [Test]
+        public void Test_488_06()
+        {
+        }
+
+        [Test]
+        public void Test_488_07()
+        {
+        }
+
+        [Test]
+        public void Test_488_08()
+        {
+        }
+
+        [Test]
+        public void Test_488_09()
+        {
+        }
+
+        [Test]
+        public void Test_488_10()
+        {
+        }
+
+        [Test]
+        public void Test_488_11()
+        {
+        }
+
+        [Test]
+        public void Test_488_12()
+        {
+        }
+
+        [Test]
+        public void Test_488_13()
+        {
+        }
+
+        [Test]
+        public void Test_488_14()
+        {
+        }
+
+        [Test]
+        public void Test_488_15()
+        {
+        }
+
+        [Test]
+        public void Test_488_16()
+        {
+        }
+
+        [Test]
+        public void Test_488_17()
+        {
+        }
+
+        [Test]
+        public void Test_488_18()
+        {
+        }
+
+        [Test]
+        public void Test_488_19()
+        {
+        }
+
+        [Test]
+        public void Test_488_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_489
+    {
+        #region PassingTests
+        [Test]
+        public void Test_489_01()
+        {
+        }
+
+        [Test]
+        public void Test_489_02()
+        {
+        }
+
+        [Test]
+        public void Test_489_03()
+        {
+        }
+
+        [Test]
+        public void Test_489_04()
+        {
+        }
+
+        [Test]
+        public void Test_489_05()
+        {
+        }
+
+        [Test]
+        public void Test_489_06()
+        {
+        }
+
+        [Test]
+        public void Test_489_07()
+        {
+        }
+
+        [Test]
+        public void Test_489_08()
+        {
+        }
+
+        [Test]
+        public void Test_489_09()
+        {
+        }
+
+        [Test]
+        public void Test_489_10()
+        {
+        }
+
+        [Test]
+        public void Test_489_11()
+        {
+        }
+
+        [Test]
+        public void Test_489_12()
+        {
+        }
+
+        [Test]
+        public void Test_489_13()
+        {
+        }
+
+        [Test]
+        public void Test_489_14()
+        {
+        }
+
+        [Test]
+        public void Test_489_15()
+        {
+        }
+
+        [Test]
+        public void Test_489_16()
+        {
+        }
+
+        [Test]
+        public void Test_489_17()
+        {
+        }
+
+        [Test]
+        public void Test_489_18()
+        {
+        }
+
+        [Test]
+        public void Test_489_19()
+        {
+        }
+
+        [Test]
+        public void Test_489_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_490
+    {
+        #region PassingTests
+        [Test]
+        public void Test_490_01()
+        {
+        }
+
+        [Test]
+        public void Test_490_02()
+        {
+        }
+
+        [Test]
+        public void Test_490_03()
+        {
+        }
+
+        [Test]
+        public void Test_490_04()
+        {
+        }
+
+        [Test]
+        public void Test_490_05()
+        {
+        }
+
+        [Test]
+        public void Test_490_06()
+        {
+        }
+
+        [Test]
+        public void Test_490_07()
+        {
+        }
+
+        [Test]
+        public void Test_490_08()
+        {
+        }
+
+        [Test]
+        public void Test_490_09()
+        {
+        }
+
+        [Test]
+        public void Test_490_10()
+        {
+        }
+
+        [Test]
+        public void Test_490_11()
+        {
+        }
+
+        [Test]
+        public void Test_490_12()
+        {
+        }
+
+        [Test]
+        public void Test_490_13()
+        {
+        }
+
+        [Test]
+        public void Test_490_14()
+        {
+        }
+
+        [Test]
+        public void Test_490_15()
+        {
+        }
+
+        [Test]
+        public void Test_490_16()
+        {
+        }
+
+        [Test]
+        public void Test_490_17()
+        {
+        }
+
+        [Test]
+        public void Test_490_18()
+        {
+        }
+
+        [Test]
+        public void Test_490_19()
+        {
+        }
+
+        [Test]
+        public void Test_490_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_491
+    {
+        #region PassingTests
+        [Test]
+        public void Test_491_01()
+        {
+        }
+
+        [Test]
+        public void Test_491_02()
+        {
+        }
+
+        [Test]
+        public void Test_491_03()
+        {
+        }
+
+        [Test]
+        public void Test_491_04()
+        {
+        }
+
+        [Test]
+        public void Test_491_05()
+        {
+        }
+
+        [Test]
+        public void Test_491_06()
+        {
+        }
+
+        [Test]
+        public void Test_491_07()
+        {
+        }
+
+        [Test]
+        public void Test_491_08()
+        {
+        }
+
+        [Test]
+        public void Test_491_09()
+        {
+        }
+
+        [Test]
+        public void Test_491_10()
+        {
+        }
+
+        [Test]
+        public void Test_491_11()
+        {
+        }
+
+        [Test]
+        public void Test_491_12()
+        {
+        }
+
+        [Test]
+        public void Test_491_13()
+        {
+        }
+
+        [Test]
+        public void Test_491_14()
+        {
+        }
+
+        [Test]
+        public void Test_491_15()
+        {
+        }
+
+        [Test]
+        public void Test_491_16()
+        {
+        }
+
+        [Test]
+        public void Test_491_17()
+        {
+        }
+
+        [Test]
+        public void Test_491_18()
+        {
+        }
+
+        [Test]
+        public void Test_491_19()
+        {
+        }
+
+        [Test]
+        public void Test_491_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_492
+    {
+        #region PassingTests
+        [Test]
+        public void Test_492_01()
+        {
+        }
+
+        [Test]
+        public void Test_492_02()
+        {
+        }
+
+        [Test]
+        public void Test_492_03()
+        {
+        }
+
+        [Test]
+        public void Test_492_04()
+        {
+        }
+
+        [Test]
+        public void Test_492_05()
+        {
+        }
+
+        [Test]
+        public void Test_492_06()
+        {
+        }
+
+        [Test]
+        public void Test_492_07()
+        {
+        }
+
+        [Test]
+        public void Test_492_08()
+        {
+        }
+
+        [Test]
+        public void Test_492_09()
+        {
+        }
+
+        [Test]
+        public void Test_492_10()
+        {
+        }
+
+        [Test]
+        public void Test_492_11()
+        {
+        }
+
+        [Test]
+        public void Test_492_12()
+        {
+        }
+
+        [Test]
+        public void Test_492_13()
+        {
+        }
+
+        [Test]
+        public void Test_492_14()
+        {
+        }
+
+        [Test]
+        public void Test_492_15()
+        {
+        }
+
+        [Test]
+        public void Test_492_16()
+        {
+        }
+
+        [Test]
+        public void Test_492_17()
+        {
+        }
+
+        [Test]
+        public void Test_492_18()
+        {
+        }
+
+        [Test]
+        public void Test_492_19()
+        {
+        }
+
+        [Test]
+        public void Test_492_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_493
+    {
+        #region PassingTests
+        [Test]
+        public void Test_493_01()
+        {
+        }
+
+        [Test]
+        public void Test_493_02()
+        {
+        }
+
+        [Test]
+        public void Test_493_03()
+        {
+        }
+
+        [Test]
+        public void Test_493_04()
+        {
+        }
+
+        [Test]
+        public void Test_493_05()
+        {
+        }
+
+        [Test]
+        public void Test_493_06()
+        {
+        }
+
+        [Test]
+        public void Test_493_07()
+        {
+        }
+
+        [Test]
+        public void Test_493_08()
+        {
+        }
+
+        [Test]
+        public void Test_493_09()
+        {
+        }
+
+        [Test]
+        public void Test_493_10()
+        {
+        }
+
+        [Test]
+        public void Test_493_11()
+        {
+        }
+
+        [Test]
+        public void Test_493_12()
+        {
+        }
+
+        [Test]
+        public void Test_493_13()
+        {
+        }
+
+        [Test]
+        public void Test_493_14()
+        {
+        }
+
+        [Test]
+        public void Test_493_15()
+        {
+        }
+
+        [Test]
+        public void Test_493_16()
+        {
+        }
+
+        [Test]
+        public void Test_493_17()
+        {
+        }
+
+        [Test]
+        public void Test_493_18()
+        {
+        }
+
+        [Test]
+        public void Test_493_19()
+        {
+        }
+
+        [Test]
+        public void Test_493_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_494
+    {
+        #region PassingTests
+        [Test]
+        public void Test_494_01()
+        {
+        }
+
+        [Test]
+        public void Test_494_02()
+        {
+        }
+
+        [Test]
+        public void Test_494_03()
+        {
+        }
+
+        [Test]
+        public void Test_494_04()
+        {
+        }
+
+        [Test]
+        public void Test_494_05()
+        {
+        }
+
+        [Test]
+        public void Test_494_06()
+        {
+        }
+
+        [Test]
+        public void Test_494_07()
+        {
+        }
+
+        [Test]
+        public void Test_494_08()
+        {
+        }
+
+        [Test]
+        public void Test_494_09()
+        {
+        }
+
+        [Test]
+        public void Test_494_10()
+        {
+        }
+
+        [Test]
+        public void Test_494_11()
+        {
+        }
+
+        [Test]
+        public void Test_494_12()
+        {
+        }
+
+        [Test]
+        public void Test_494_13()
+        {
+        }
+
+        [Test]
+        public void Test_494_14()
+        {
+        }
+
+        [Test]
+        public void Test_494_15()
+        {
+        }
+
+        [Test]
+        public void Test_494_16()
+        {
+        }
+
+        [Test]
+        public void Test_494_17()
+        {
+        }
+
+        [Test]
+        public void Test_494_18()
+        {
+        }
+
+        [Test]
+        public void Test_494_19()
+        {
+        }
+
+        [Test]
+        public void Test_494_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_495
+    {
+        #region PassingTests
+        [Test]
+        public void Test_495_01()
+        {
+        }
+
+        [Test]
+        public void Test_495_02()
+        {
+        }
+
+        [Test]
+        public void Test_495_03()
+        {
+        }
+
+        [Test]
+        public void Test_495_04()
+        {
+        }
+
+        [Test]
+        public void Test_495_05()
+        {
+        }
+
+        [Test]
+        public void Test_495_06()
+        {
+        }
+
+        [Test]
+        public void Test_495_07()
+        {
+        }
+
+        [Test]
+        public void Test_495_08()
+        {
+        }
+
+        [Test]
+        public void Test_495_09()
+        {
+        }
+
+        [Test]
+        public void Test_495_10()
+        {
+        }
+
+        [Test]
+        public void Test_495_11()
+        {
+        }
+
+        [Test]
+        public void Test_495_12()
+        {
+        }
+
+        [Test]
+        public void Test_495_13()
+        {
+        }
+
+        [Test]
+        public void Test_495_14()
+        {
+        }
+
+        [Test]
+        public void Test_495_15()
+        {
+        }
+
+        [Test]
+        public void Test_495_16()
+        {
+        }
+
+        [Test]
+        public void Test_495_17()
+        {
+        }
+
+        [Test]
+        public void Test_495_18()
+        {
+        }
+
+        [Test]
+        public void Test_495_19()
+        {
+        }
+
+        [Test]
+        public void Test_495_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_496
+    {
+        #region PassingTests
+        [Test]
+        public void Test_496_01()
+        {
+        }
+
+        [Test]
+        public void Test_496_02()
+        {
+        }
+
+        [Test]
+        public void Test_496_03()
+        {
+        }
+
+        [Test]
+        public void Test_496_04()
+        {
+        }
+
+        [Test]
+        public void Test_496_05()
+        {
+        }
+
+        [Test]
+        public void Test_496_06()
+        {
+        }
+
+        [Test]
+        public void Test_496_07()
+        {
+        }
+
+        [Test]
+        public void Test_496_08()
+        {
+        }
+
+        [Test]
+        public void Test_496_09()
+        {
+        }
+
+        [Test]
+        public void Test_496_10()
+        {
+        }
+
+        [Test]
+        public void Test_496_11()
+        {
+        }
+
+        [Test]
+        public void Test_496_12()
+        {
+        }
+
+        [Test]
+        public void Test_496_13()
+        {
+        }
+
+        [Test]
+        public void Test_496_14()
+        {
+        }
+
+        [Test]
+        public void Test_496_15()
+        {
+        }
+
+        [Test]
+        public void Test_496_16()
+        {
+        }
+
+        [Test]
+        public void Test_496_17()
+        {
+        }
+
+        [Test]
+        public void Test_496_18()
+        {
+        }
+
+        [Test]
+        public void Test_496_19()
+        {
+        }
+
+        [Test]
+        public void Test_496_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_497
+    {
+        #region PassingTests
+        [Test]
+        public void Test_497_01()
+        {
+        }
+
+        [Test]
+        public void Test_497_02()
+        {
+        }
+
+        [Test]
+        public void Test_497_03()
+        {
+        }
+
+        [Test]
+        public void Test_497_04()
+        {
+        }
+
+        [Test]
+        public void Test_497_05()
+        {
+        }
+
+        [Test]
+        public void Test_497_06()
+        {
+        }
+
+        [Test]
+        public void Test_497_07()
+        {
+        }
+
+        [Test]
+        public void Test_497_08()
+        {
+        }
+
+        [Test]
+        public void Test_497_09()
+        {
+        }
+
+        [Test]
+        public void Test_497_10()
+        {
+        }
+
+        [Test]
+        public void Test_497_11()
+        {
+        }
+
+        [Test]
+        public void Test_497_12()
+        {
+        }
+
+        [Test]
+        public void Test_497_13()
+        {
+        }
+
+        [Test]
+        public void Test_497_14()
+        {
+        }
+
+        [Test]
+        public void Test_497_15()
+        {
+        }
+
+        [Test]
+        public void Test_497_16()
+        {
+        }
+
+        [Test]
+        public void Test_497_17()
+        {
+        }
+
+        [Test]
+        public void Test_497_18()
+        {
+        }
+
+        [Test]
+        public void Test_497_19()
+        {
+        }
+
+        [Test]
+        public void Test_497_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_498
+    {
+        #region PassingTests
+        [Test]
+        public void Test_498_01()
+        {
+        }
+
+        [Test]
+        public void Test_498_02()
+        {
+        }
+
+        [Test]
+        public void Test_498_03()
+        {
+        }
+
+        [Test]
+        public void Test_498_04()
+        {
+        }
+
+        [Test]
+        public void Test_498_05()
+        {
+        }
+
+        [Test]
+        public void Test_498_06()
+        {
+        }
+
+        [Test]
+        public void Test_498_07()
+        {
+        }
+
+        [Test]
+        public void Test_498_08()
+        {
+        }
+
+        [Test]
+        public void Test_498_09()
+        {
+        }
+
+        [Test]
+        public void Test_498_10()
+        {
+        }
+
+        [Test]
+        public void Test_498_11()
+        {
+        }
+
+        [Test]
+        public void Test_498_12()
+        {
+        }
+
+        [Test]
+        public void Test_498_13()
+        {
+        }
+
+        [Test]
+        public void Test_498_14()
+        {
+        }
+
+        [Test]
+        public void Test_498_15()
+        {
+        }
+
+        [Test]
+        public void Test_498_16()
+        {
+        }
+
+        [Test]
+        public void Test_498_17()
+        {
+        }
+
+        [Test]
+        public void Test_498_18()
+        {
+        }
+
+        [Test]
+        public void Test_498_19()
+        {
+        }
+
+        [Test]
+        public void Test_498_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_499
+    {
+        #region PassingTests
+        [Test]
+        public void Test_499_01()
+        {
+        }
+
+        [Test]
+        public void Test_499_02()
+        {
+        }
+
+        [Test]
+        public void Test_499_03()
+        {
+        }
+
+        [Test]
+        public void Test_499_04()
+        {
+        }
+
+        [Test]
+        public void Test_499_05()
+        {
+        }
+
+        [Test]
+        public void Test_499_06()
+        {
+        }
+
+        [Test]
+        public void Test_499_07()
+        {
+        }
+
+        [Test]
+        public void Test_499_08()
+        {
+        }
+
+        [Test]
+        public void Test_499_09()
+        {
+        }
+
+        [Test]
+        public void Test_499_10()
+        {
+        }
+
+        [Test]
+        public void Test_499_11()
+        {
+        }
+
+        [Test]
+        public void Test_499_12()
+        {
+        }
+
+        [Test]
+        public void Test_499_13()
+        {
+        }
+
+        [Test]
+        public void Test_499_14()
+        {
+        }
+
+        [Test]
+        public void Test_499_15()
+        {
+        }
+
+        [Test]
+        public void Test_499_16()
+        {
+        }
+
+        [Test]
+        public void Test_499_17()
+        {
+        }
+
+        [Test]
+        public void Test_499_18()
+        {
+        }
+
+        [Test]
+        public void Test_499_19()
+        {
+        }
+
+        [Test]
+        public void Test_499_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    [TestFixture]
+    public class TestClass_500
+    {
+        #region PassingTests
+        [Test]
+        public void Test_500_01()
+        {
+        }
+
+        [Test]
+        public void Test_500_02()
+        {
+        }
+
+        [Test]
+        public void Test_500_03()
+        {
+        }
+
+        [Test]
+        public void Test_500_04()
+        {
+        }
+
+        [Test]
+        public void Test_500_05()
+        {
+        }
+
+        [Test]
+        public void Test_500_06()
+        {
+        }
+
+        [Test]
+        public void Test_500_07()
+        {
+        }
+
+        [Test]
+        public void Test_500_08()
+        {
+        }
+
+        [Test]
+        public void Test_500_09()
+        {
+        }
+
+        [Test]
+        public void Test_500_10()
+        {
+        }
+
+        [Test]
+        public void Test_500_11()
+        {
+        }
+
+        [Test]
+        public void Test_500_12()
+        {
+        }
+
+        [Test]
+        public void Test_500_13()
+        {
+        }
+
+        [Test]
+        public void Test_500_14()
+        {
+        }
+
+        [Test]
+        public void Test_500_15()
+        {
+        }
+
+        [Test]
+        public void Test_500_16()
+        {
+        }
+
+        [Test]
+        public void Test_500_17()
+        {
+        }
+
+        [Test]
+        public void Test_500_18()
+        {
+        }
+
+        [Test]
+        public void Test_500_19()
+        {
+        }
+
+        [Test]
+        public void Test_500_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/NUnit10kPassing/NunitTests.tt b/test/TestAssets/performance/NUnit10kPassing/NunitTests.tt
new file mode 100644
index 0000000000..e84470ad3d
--- /dev/null
+++ b/test/TestAssets/performance/NUnit10kPassing/NunitTests.tt
@@ -0,0 +1,56 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+<#
+    int classes = 500;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestFixture]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj b/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj
new file mode 100644
index 0000000000..4b0d0e5b87
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1Passing/NUnit1Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnit3FrameworkVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3AdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="NunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="NunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/NUnit1Passing/NunitTests.cs b/test/TestAssets/performance/NUnit1Passing/NunitTests.cs
new file mode 100644
index 0000000000..b0fd7a3c9c
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1Passing/NunitTests.cs
@@ -0,0 +1,19 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+    [TestFixture]
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Test]
+        public void Test_01_01()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/NUnit1Passing/NunitTests.tt b/test/TestAssets/performance/NUnit1Passing/NunitTests.tt
new file mode 100644
index 0000000000..482c0ff2f9
--- /dev/null
+++ b/test/TestAssets/performance/NUnit1Passing/NunitTests.tt
@@ -0,0 +1,56 @@
+using NUnit.Framework;
+
+namespace Tests
+{
+<#
+    int classes = 1;
+    int passedTests = 1;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    [TestFixture]
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Test]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj
new file mode 100644
index 0000000000..0ab7c46aa0
--- /dev/null
+++ b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.TestAdapter.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net48;net472;net471;net9.0;net8.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <!-- Don't output any of this into the output folder,
+    it would clash with Test.Sdk, MSTest also does not ship ObjectModel that it builds against. -->
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(PackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/performance/Perfy.TestAdapter/Perfy.cs b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.cs
new file mode 100644
index 0000000000..64ccf1d648
--- /dev/null
+++ b/test/TestAssets/performance/Perfy.TestAdapter/Perfy.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// This dll is a TestProject as well as a test adapter.We use it as a baseline for performance.
+// It does no actual discovery or run.It just returns as many results as we ask it to by TEST_COUNT env variable.
+// It has almost no overhead, so all the overhead we see is coming from TestPlatform.
+
+using System.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace PerfyPassing
+{
+    [ExtensionUri(Id)]
+    [DefaultExecutorUri(Id)]
+    public class Perfy : ITestDiscoverer, ITestExecutor
+    {
+        static Perfy()
+        {
+            // No meaning to the number, it is just easy to find when it breaks. Better than returning 1000 or 0 which are both
+            // less suspicious. It could throw, but that is bad for interactive debugging.
+            Count = int.TryParse(Environment.GetEnvironmentVariable("TEST_COUNT") ?? "10000", out var count) ? count : 356;
+        }
+
+        public const string Id = "executor://perfy.testadapter";
+        public static readonly Uri Uri = new Uri(Id);
+
+        public static int Count { get; }
+
+        public void Cancel()
+        {
+            // noop
+        }
+
+        public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
+        {
+            var sources = tests.Select(t => t.Source).Distinct().ToList();
+            RunTests(sources, runContext, frameworkHandle);
+        }
+
+        public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
+        {
+            var location = typeof(Perfy).Assembly.Location;
+            for (var i = 0; i < Count; i++)
+            {
+                var tc = new TestCase($"Test{i}", Uri, location);
+                frameworkHandle.RecordResult(new TestResult(tc)
+                {
+                    Outcome = TestOutcome.Passed
+                });
+            }
+        }
+
+        public void DiscoverTests(IEnumerable<string> _, IDiscoveryContext _2,
+            IMessageLogger _3, ITestCaseDiscoverySink discoverySink)
+        {
+            var location = typeof(Perfy).Assembly.Location;
+            var tps = new List<TestProperty>();
+            Func<object, bool> validator = (object o) => !string.IsNullOrWhiteSpace(o as string);
+
+            for (var i = 0; i < Count; i++)
+            {
+                var tc = new TestCase($"Test{i}", Uri, location);
+                discoverySink.SendTestCase(tc);
+            }
+        }
+    }
+}
diff --git a/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj b/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj
new file mode 100644
index 0000000000..119a479786
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1000Passing/XUnit1000Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="XunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>XunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="XunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>XunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/performance/XUnit1000Passing/XunitTests.cs b/test/TestAssets/performance/XUnit1000Passing/XunitTests.cs
new file mode 100644
index 0000000000..db3236d8ae
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1000Passing/XunitTests.cs
@@ -0,0 +1,5405 @@
+using Xunit;
+
+namespace Tests
+{
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_01_01()
+        {
+        }
+
+        [Fact]
+        public void Test_01_02()
+        {
+        }
+
+        [Fact]
+        public void Test_01_03()
+        {
+        }
+
+        [Fact]
+        public void Test_01_04()
+        {
+        }
+
+        [Fact]
+        public void Test_01_05()
+        {
+        }
+
+        [Fact]
+        public void Test_01_06()
+        {
+        }
+
+        [Fact]
+        public void Test_01_07()
+        {
+        }
+
+        [Fact]
+        public void Test_01_08()
+        {
+        }
+
+        [Fact]
+        public void Test_01_09()
+        {
+        }
+
+        [Fact]
+        public void Test_01_10()
+        {
+        }
+
+        [Fact]
+        public void Test_01_11()
+        {
+        }
+
+        [Fact]
+        public void Test_01_12()
+        {
+        }
+
+        [Fact]
+        public void Test_01_13()
+        {
+        }
+
+        [Fact]
+        public void Test_01_14()
+        {
+        }
+
+        [Fact]
+        public void Test_01_15()
+        {
+        }
+
+        [Fact]
+        public void Test_01_16()
+        {
+        }
+
+        [Fact]
+        public void Test_01_17()
+        {
+        }
+
+        [Fact]
+        public void Test_01_18()
+        {
+        }
+
+        [Fact]
+        public void Test_01_19()
+        {
+        }
+
+        [Fact]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_02_01()
+        {
+        }
+
+        [Fact]
+        public void Test_02_02()
+        {
+        }
+
+        [Fact]
+        public void Test_02_03()
+        {
+        }
+
+        [Fact]
+        public void Test_02_04()
+        {
+        }
+
+        [Fact]
+        public void Test_02_05()
+        {
+        }
+
+        [Fact]
+        public void Test_02_06()
+        {
+        }
+
+        [Fact]
+        public void Test_02_07()
+        {
+        }
+
+        [Fact]
+        public void Test_02_08()
+        {
+        }
+
+        [Fact]
+        public void Test_02_09()
+        {
+        }
+
+        [Fact]
+        public void Test_02_10()
+        {
+        }
+
+        [Fact]
+        public void Test_02_11()
+        {
+        }
+
+        [Fact]
+        public void Test_02_12()
+        {
+        }
+
+        [Fact]
+        public void Test_02_13()
+        {
+        }
+
+        [Fact]
+        public void Test_02_14()
+        {
+        }
+
+        [Fact]
+        public void Test_02_15()
+        {
+        }
+
+        [Fact]
+        public void Test_02_16()
+        {
+        }
+
+        [Fact]
+        public void Test_02_17()
+        {
+        }
+
+        [Fact]
+        public void Test_02_18()
+        {
+        }
+
+        [Fact]
+        public void Test_02_19()
+        {
+        }
+
+        [Fact]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_03_01()
+        {
+        }
+
+        [Fact]
+        public void Test_03_02()
+        {
+        }
+
+        [Fact]
+        public void Test_03_03()
+        {
+        }
+
+        [Fact]
+        public void Test_03_04()
+        {
+        }
+
+        [Fact]
+        public void Test_03_05()
+        {
+        }
+
+        [Fact]
+        public void Test_03_06()
+        {
+        }
+
+        [Fact]
+        public void Test_03_07()
+        {
+        }
+
+        [Fact]
+        public void Test_03_08()
+        {
+        }
+
+        [Fact]
+        public void Test_03_09()
+        {
+        }
+
+        [Fact]
+        public void Test_03_10()
+        {
+        }
+
+        [Fact]
+        public void Test_03_11()
+        {
+        }
+
+        [Fact]
+        public void Test_03_12()
+        {
+        }
+
+        [Fact]
+        public void Test_03_13()
+        {
+        }
+
+        [Fact]
+        public void Test_03_14()
+        {
+        }
+
+        [Fact]
+        public void Test_03_15()
+        {
+        }
+
+        [Fact]
+        public void Test_03_16()
+        {
+        }
+
+        [Fact]
+        public void Test_03_17()
+        {
+        }
+
+        [Fact]
+        public void Test_03_18()
+        {
+        }
+
+        [Fact]
+        public void Test_03_19()
+        {
+        }
+
+        [Fact]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_04_01()
+        {
+        }
+
+        [Fact]
+        public void Test_04_02()
+        {
+        }
+
+        [Fact]
+        public void Test_04_03()
+        {
+        }
+
+        [Fact]
+        public void Test_04_04()
+        {
+        }
+
+        [Fact]
+        public void Test_04_05()
+        {
+        }
+
+        [Fact]
+        public void Test_04_06()
+        {
+        }
+
+        [Fact]
+        public void Test_04_07()
+        {
+        }
+
+        [Fact]
+        public void Test_04_08()
+        {
+        }
+
+        [Fact]
+        public void Test_04_09()
+        {
+        }
+
+        [Fact]
+        public void Test_04_10()
+        {
+        }
+
+        [Fact]
+        public void Test_04_11()
+        {
+        }
+
+        [Fact]
+        public void Test_04_12()
+        {
+        }
+
+        [Fact]
+        public void Test_04_13()
+        {
+        }
+
+        [Fact]
+        public void Test_04_14()
+        {
+        }
+
+        [Fact]
+        public void Test_04_15()
+        {
+        }
+
+        [Fact]
+        public void Test_04_16()
+        {
+        }
+
+        [Fact]
+        public void Test_04_17()
+        {
+        }
+
+        [Fact]
+        public void Test_04_18()
+        {
+        }
+
+        [Fact]
+        public void Test_04_19()
+        {
+        }
+
+        [Fact]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_05_01()
+        {
+        }
+
+        [Fact]
+        public void Test_05_02()
+        {
+        }
+
+        [Fact]
+        public void Test_05_03()
+        {
+        }
+
+        [Fact]
+        public void Test_05_04()
+        {
+        }
+
+        [Fact]
+        public void Test_05_05()
+        {
+        }
+
+        [Fact]
+        public void Test_05_06()
+        {
+        }
+
+        [Fact]
+        public void Test_05_07()
+        {
+        }
+
+        [Fact]
+        public void Test_05_08()
+        {
+        }
+
+        [Fact]
+        public void Test_05_09()
+        {
+        }
+
+        [Fact]
+        public void Test_05_10()
+        {
+        }
+
+        [Fact]
+        public void Test_05_11()
+        {
+        }
+
+        [Fact]
+        public void Test_05_12()
+        {
+        }
+
+        [Fact]
+        public void Test_05_13()
+        {
+        }
+
+        [Fact]
+        public void Test_05_14()
+        {
+        }
+
+        [Fact]
+        public void Test_05_15()
+        {
+        }
+
+        [Fact]
+        public void Test_05_16()
+        {
+        }
+
+        [Fact]
+        public void Test_05_17()
+        {
+        }
+
+        [Fact]
+        public void Test_05_18()
+        {
+        }
+
+        [Fact]
+        public void Test_05_19()
+        {
+        }
+
+        [Fact]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_06
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_06_01()
+        {
+        }
+
+        [Fact]
+        public void Test_06_02()
+        {
+        }
+
+        [Fact]
+        public void Test_06_03()
+        {
+        }
+
+        [Fact]
+        public void Test_06_04()
+        {
+        }
+
+        [Fact]
+        public void Test_06_05()
+        {
+        }
+
+        [Fact]
+        public void Test_06_06()
+        {
+        }
+
+        [Fact]
+        public void Test_06_07()
+        {
+        }
+
+        [Fact]
+        public void Test_06_08()
+        {
+        }
+
+        [Fact]
+        public void Test_06_09()
+        {
+        }
+
+        [Fact]
+        public void Test_06_10()
+        {
+        }
+
+        [Fact]
+        public void Test_06_11()
+        {
+        }
+
+        [Fact]
+        public void Test_06_12()
+        {
+        }
+
+        [Fact]
+        public void Test_06_13()
+        {
+        }
+
+        [Fact]
+        public void Test_06_14()
+        {
+        }
+
+        [Fact]
+        public void Test_06_15()
+        {
+        }
+
+        [Fact]
+        public void Test_06_16()
+        {
+        }
+
+        [Fact]
+        public void Test_06_17()
+        {
+        }
+
+        [Fact]
+        public void Test_06_18()
+        {
+        }
+
+        [Fact]
+        public void Test_06_19()
+        {
+        }
+
+        [Fact]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_07
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_07_01()
+        {
+        }
+
+        [Fact]
+        public void Test_07_02()
+        {
+        }
+
+        [Fact]
+        public void Test_07_03()
+        {
+        }
+
+        [Fact]
+        public void Test_07_04()
+        {
+        }
+
+        [Fact]
+        public void Test_07_05()
+        {
+        }
+
+        [Fact]
+        public void Test_07_06()
+        {
+        }
+
+        [Fact]
+        public void Test_07_07()
+        {
+        }
+
+        [Fact]
+        public void Test_07_08()
+        {
+        }
+
+        [Fact]
+        public void Test_07_09()
+        {
+        }
+
+        [Fact]
+        public void Test_07_10()
+        {
+        }
+
+        [Fact]
+        public void Test_07_11()
+        {
+        }
+
+        [Fact]
+        public void Test_07_12()
+        {
+        }
+
+        [Fact]
+        public void Test_07_13()
+        {
+        }
+
+        [Fact]
+        public void Test_07_14()
+        {
+        }
+
+        [Fact]
+        public void Test_07_15()
+        {
+        }
+
+        [Fact]
+        public void Test_07_16()
+        {
+        }
+
+        [Fact]
+        public void Test_07_17()
+        {
+        }
+
+        [Fact]
+        public void Test_07_18()
+        {
+        }
+
+        [Fact]
+        public void Test_07_19()
+        {
+        }
+
+        [Fact]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_08
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_08_01()
+        {
+        }
+
+        [Fact]
+        public void Test_08_02()
+        {
+        }
+
+        [Fact]
+        public void Test_08_03()
+        {
+        }
+
+        [Fact]
+        public void Test_08_04()
+        {
+        }
+
+        [Fact]
+        public void Test_08_05()
+        {
+        }
+
+        [Fact]
+        public void Test_08_06()
+        {
+        }
+
+        [Fact]
+        public void Test_08_07()
+        {
+        }
+
+        [Fact]
+        public void Test_08_08()
+        {
+        }
+
+        [Fact]
+        public void Test_08_09()
+        {
+        }
+
+        [Fact]
+        public void Test_08_10()
+        {
+        }
+
+        [Fact]
+        public void Test_08_11()
+        {
+        }
+
+        [Fact]
+        public void Test_08_12()
+        {
+        }
+
+        [Fact]
+        public void Test_08_13()
+        {
+        }
+
+        [Fact]
+        public void Test_08_14()
+        {
+        }
+
+        [Fact]
+        public void Test_08_15()
+        {
+        }
+
+        [Fact]
+        public void Test_08_16()
+        {
+        }
+
+        [Fact]
+        public void Test_08_17()
+        {
+        }
+
+        [Fact]
+        public void Test_08_18()
+        {
+        }
+
+        [Fact]
+        public void Test_08_19()
+        {
+        }
+
+        [Fact]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_09
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_09_01()
+        {
+        }
+
+        [Fact]
+        public void Test_09_02()
+        {
+        }
+
+        [Fact]
+        public void Test_09_03()
+        {
+        }
+
+        [Fact]
+        public void Test_09_04()
+        {
+        }
+
+        [Fact]
+        public void Test_09_05()
+        {
+        }
+
+        [Fact]
+        public void Test_09_06()
+        {
+        }
+
+        [Fact]
+        public void Test_09_07()
+        {
+        }
+
+        [Fact]
+        public void Test_09_08()
+        {
+        }
+
+        [Fact]
+        public void Test_09_09()
+        {
+        }
+
+        [Fact]
+        public void Test_09_10()
+        {
+        }
+
+        [Fact]
+        public void Test_09_11()
+        {
+        }
+
+        [Fact]
+        public void Test_09_12()
+        {
+        }
+
+        [Fact]
+        public void Test_09_13()
+        {
+        }
+
+        [Fact]
+        public void Test_09_14()
+        {
+        }
+
+        [Fact]
+        public void Test_09_15()
+        {
+        }
+
+        [Fact]
+        public void Test_09_16()
+        {
+        }
+
+        [Fact]
+        public void Test_09_17()
+        {
+        }
+
+        [Fact]
+        public void Test_09_18()
+        {
+        }
+
+        [Fact]
+        public void Test_09_19()
+        {
+        }
+
+        [Fact]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_10
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_10_01()
+        {
+        }
+
+        [Fact]
+        public void Test_10_02()
+        {
+        }
+
+        [Fact]
+        public void Test_10_03()
+        {
+        }
+
+        [Fact]
+        public void Test_10_04()
+        {
+        }
+
+        [Fact]
+        public void Test_10_05()
+        {
+        }
+
+        [Fact]
+        public void Test_10_06()
+        {
+        }
+
+        [Fact]
+        public void Test_10_07()
+        {
+        }
+
+        [Fact]
+        public void Test_10_08()
+        {
+        }
+
+        [Fact]
+        public void Test_10_09()
+        {
+        }
+
+        [Fact]
+        public void Test_10_10()
+        {
+        }
+
+        [Fact]
+        public void Test_10_11()
+        {
+        }
+
+        [Fact]
+        public void Test_10_12()
+        {
+        }
+
+        [Fact]
+        public void Test_10_13()
+        {
+        }
+
+        [Fact]
+        public void Test_10_14()
+        {
+        }
+
+        [Fact]
+        public void Test_10_15()
+        {
+        }
+
+        [Fact]
+        public void Test_10_16()
+        {
+        }
+
+        [Fact]
+        public void Test_10_17()
+        {
+        }
+
+        [Fact]
+        public void Test_10_18()
+        {
+        }
+
+        [Fact]
+        public void Test_10_19()
+        {
+        }
+
+        [Fact]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_11
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_11_01()
+        {
+        }
+
+        [Fact]
+        public void Test_11_02()
+        {
+        }
+
+        [Fact]
+        public void Test_11_03()
+        {
+        }
+
+        [Fact]
+        public void Test_11_04()
+        {
+        }
+
+        [Fact]
+        public void Test_11_05()
+        {
+        }
+
+        [Fact]
+        public void Test_11_06()
+        {
+        }
+
+        [Fact]
+        public void Test_11_07()
+        {
+        }
+
+        [Fact]
+        public void Test_11_08()
+        {
+        }
+
+        [Fact]
+        public void Test_11_09()
+        {
+        }
+
+        [Fact]
+        public void Test_11_10()
+        {
+        }
+
+        [Fact]
+        public void Test_11_11()
+        {
+        }
+
+        [Fact]
+        public void Test_11_12()
+        {
+        }
+
+        [Fact]
+        public void Test_11_13()
+        {
+        }
+
+        [Fact]
+        public void Test_11_14()
+        {
+        }
+
+        [Fact]
+        public void Test_11_15()
+        {
+        }
+
+        [Fact]
+        public void Test_11_16()
+        {
+        }
+
+        [Fact]
+        public void Test_11_17()
+        {
+        }
+
+        [Fact]
+        public void Test_11_18()
+        {
+        }
+
+        [Fact]
+        public void Test_11_19()
+        {
+        }
+
+        [Fact]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_12
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_12_01()
+        {
+        }
+
+        [Fact]
+        public void Test_12_02()
+        {
+        }
+
+        [Fact]
+        public void Test_12_03()
+        {
+        }
+
+        [Fact]
+        public void Test_12_04()
+        {
+        }
+
+        [Fact]
+        public void Test_12_05()
+        {
+        }
+
+        [Fact]
+        public void Test_12_06()
+        {
+        }
+
+        [Fact]
+        public void Test_12_07()
+        {
+        }
+
+        [Fact]
+        public void Test_12_08()
+        {
+        }
+
+        [Fact]
+        public void Test_12_09()
+        {
+        }
+
+        [Fact]
+        public void Test_12_10()
+        {
+        }
+
+        [Fact]
+        public void Test_12_11()
+        {
+        }
+
+        [Fact]
+        public void Test_12_12()
+        {
+        }
+
+        [Fact]
+        public void Test_12_13()
+        {
+        }
+
+        [Fact]
+        public void Test_12_14()
+        {
+        }
+
+        [Fact]
+        public void Test_12_15()
+        {
+        }
+
+        [Fact]
+        public void Test_12_16()
+        {
+        }
+
+        [Fact]
+        public void Test_12_17()
+        {
+        }
+
+        [Fact]
+        public void Test_12_18()
+        {
+        }
+
+        [Fact]
+        public void Test_12_19()
+        {
+        }
+
+        [Fact]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_13
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_13_01()
+        {
+        }
+
+        [Fact]
+        public void Test_13_02()
+        {
+        }
+
+        [Fact]
+        public void Test_13_03()
+        {
+        }
+
+        [Fact]
+        public void Test_13_04()
+        {
+        }
+
+        [Fact]
+        public void Test_13_05()
+        {
+        }
+
+        [Fact]
+        public void Test_13_06()
+        {
+        }
+
+        [Fact]
+        public void Test_13_07()
+        {
+        }
+
+        [Fact]
+        public void Test_13_08()
+        {
+        }
+
+        [Fact]
+        public void Test_13_09()
+        {
+        }
+
+        [Fact]
+        public void Test_13_10()
+        {
+        }
+
+        [Fact]
+        public void Test_13_11()
+        {
+        }
+
+        [Fact]
+        public void Test_13_12()
+        {
+        }
+
+        [Fact]
+        public void Test_13_13()
+        {
+        }
+
+        [Fact]
+        public void Test_13_14()
+        {
+        }
+
+        [Fact]
+        public void Test_13_15()
+        {
+        }
+
+        [Fact]
+        public void Test_13_16()
+        {
+        }
+
+        [Fact]
+        public void Test_13_17()
+        {
+        }
+
+        [Fact]
+        public void Test_13_18()
+        {
+        }
+
+        [Fact]
+        public void Test_13_19()
+        {
+        }
+
+        [Fact]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_14
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_14_01()
+        {
+        }
+
+        [Fact]
+        public void Test_14_02()
+        {
+        }
+
+        [Fact]
+        public void Test_14_03()
+        {
+        }
+
+        [Fact]
+        public void Test_14_04()
+        {
+        }
+
+        [Fact]
+        public void Test_14_05()
+        {
+        }
+
+        [Fact]
+        public void Test_14_06()
+        {
+        }
+
+        [Fact]
+        public void Test_14_07()
+        {
+        }
+
+        [Fact]
+        public void Test_14_08()
+        {
+        }
+
+        [Fact]
+        public void Test_14_09()
+        {
+        }
+
+        [Fact]
+        public void Test_14_10()
+        {
+        }
+
+        [Fact]
+        public void Test_14_11()
+        {
+        }
+
+        [Fact]
+        public void Test_14_12()
+        {
+        }
+
+        [Fact]
+        public void Test_14_13()
+        {
+        }
+
+        [Fact]
+        public void Test_14_14()
+        {
+        }
+
+        [Fact]
+        public void Test_14_15()
+        {
+        }
+
+        [Fact]
+        public void Test_14_16()
+        {
+        }
+
+        [Fact]
+        public void Test_14_17()
+        {
+        }
+
+        [Fact]
+        public void Test_14_18()
+        {
+        }
+
+        [Fact]
+        public void Test_14_19()
+        {
+        }
+
+        [Fact]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_15
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_15_01()
+        {
+        }
+
+        [Fact]
+        public void Test_15_02()
+        {
+        }
+
+        [Fact]
+        public void Test_15_03()
+        {
+        }
+
+        [Fact]
+        public void Test_15_04()
+        {
+        }
+
+        [Fact]
+        public void Test_15_05()
+        {
+        }
+
+        [Fact]
+        public void Test_15_06()
+        {
+        }
+
+        [Fact]
+        public void Test_15_07()
+        {
+        }
+
+        [Fact]
+        public void Test_15_08()
+        {
+        }
+
+        [Fact]
+        public void Test_15_09()
+        {
+        }
+
+        [Fact]
+        public void Test_15_10()
+        {
+        }
+
+        [Fact]
+        public void Test_15_11()
+        {
+        }
+
+        [Fact]
+        public void Test_15_12()
+        {
+        }
+
+        [Fact]
+        public void Test_15_13()
+        {
+        }
+
+        [Fact]
+        public void Test_15_14()
+        {
+        }
+
+        [Fact]
+        public void Test_15_15()
+        {
+        }
+
+        [Fact]
+        public void Test_15_16()
+        {
+        }
+
+        [Fact]
+        public void Test_15_17()
+        {
+        }
+
+        [Fact]
+        public void Test_15_18()
+        {
+        }
+
+        [Fact]
+        public void Test_15_19()
+        {
+        }
+
+        [Fact]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_16
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_16_01()
+        {
+        }
+
+        [Fact]
+        public void Test_16_02()
+        {
+        }
+
+        [Fact]
+        public void Test_16_03()
+        {
+        }
+
+        [Fact]
+        public void Test_16_04()
+        {
+        }
+
+        [Fact]
+        public void Test_16_05()
+        {
+        }
+
+        [Fact]
+        public void Test_16_06()
+        {
+        }
+
+        [Fact]
+        public void Test_16_07()
+        {
+        }
+
+        [Fact]
+        public void Test_16_08()
+        {
+        }
+
+        [Fact]
+        public void Test_16_09()
+        {
+        }
+
+        [Fact]
+        public void Test_16_10()
+        {
+        }
+
+        [Fact]
+        public void Test_16_11()
+        {
+        }
+
+        [Fact]
+        public void Test_16_12()
+        {
+        }
+
+        [Fact]
+        public void Test_16_13()
+        {
+        }
+
+        [Fact]
+        public void Test_16_14()
+        {
+        }
+
+        [Fact]
+        public void Test_16_15()
+        {
+        }
+
+        [Fact]
+        public void Test_16_16()
+        {
+        }
+
+        [Fact]
+        public void Test_16_17()
+        {
+        }
+
+        [Fact]
+        public void Test_16_18()
+        {
+        }
+
+        [Fact]
+        public void Test_16_19()
+        {
+        }
+
+        [Fact]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_17
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_17_01()
+        {
+        }
+
+        [Fact]
+        public void Test_17_02()
+        {
+        }
+
+        [Fact]
+        public void Test_17_03()
+        {
+        }
+
+        [Fact]
+        public void Test_17_04()
+        {
+        }
+
+        [Fact]
+        public void Test_17_05()
+        {
+        }
+
+        [Fact]
+        public void Test_17_06()
+        {
+        }
+
+        [Fact]
+        public void Test_17_07()
+        {
+        }
+
+        [Fact]
+        public void Test_17_08()
+        {
+        }
+
+        [Fact]
+        public void Test_17_09()
+        {
+        }
+
+        [Fact]
+        public void Test_17_10()
+        {
+        }
+
+        [Fact]
+        public void Test_17_11()
+        {
+        }
+
+        [Fact]
+        public void Test_17_12()
+        {
+        }
+
+        [Fact]
+        public void Test_17_13()
+        {
+        }
+
+        [Fact]
+        public void Test_17_14()
+        {
+        }
+
+        [Fact]
+        public void Test_17_15()
+        {
+        }
+
+        [Fact]
+        public void Test_17_16()
+        {
+        }
+
+        [Fact]
+        public void Test_17_17()
+        {
+        }
+
+        [Fact]
+        public void Test_17_18()
+        {
+        }
+
+        [Fact]
+        public void Test_17_19()
+        {
+        }
+
+        [Fact]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_18
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_18_01()
+        {
+        }
+
+        [Fact]
+        public void Test_18_02()
+        {
+        }
+
+        [Fact]
+        public void Test_18_03()
+        {
+        }
+
+        [Fact]
+        public void Test_18_04()
+        {
+        }
+
+        [Fact]
+        public void Test_18_05()
+        {
+        }
+
+        [Fact]
+        public void Test_18_06()
+        {
+        }
+
+        [Fact]
+        public void Test_18_07()
+        {
+        }
+
+        [Fact]
+        public void Test_18_08()
+        {
+        }
+
+        [Fact]
+        public void Test_18_09()
+        {
+        }
+
+        [Fact]
+        public void Test_18_10()
+        {
+        }
+
+        [Fact]
+        public void Test_18_11()
+        {
+        }
+
+        [Fact]
+        public void Test_18_12()
+        {
+        }
+
+        [Fact]
+        public void Test_18_13()
+        {
+        }
+
+        [Fact]
+        public void Test_18_14()
+        {
+        }
+
+        [Fact]
+        public void Test_18_15()
+        {
+        }
+
+        [Fact]
+        public void Test_18_16()
+        {
+        }
+
+        [Fact]
+        public void Test_18_17()
+        {
+        }
+
+        [Fact]
+        public void Test_18_18()
+        {
+        }
+
+        [Fact]
+        public void Test_18_19()
+        {
+        }
+
+        [Fact]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_19
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_19_01()
+        {
+        }
+
+        [Fact]
+        public void Test_19_02()
+        {
+        }
+
+        [Fact]
+        public void Test_19_03()
+        {
+        }
+
+        [Fact]
+        public void Test_19_04()
+        {
+        }
+
+        [Fact]
+        public void Test_19_05()
+        {
+        }
+
+        [Fact]
+        public void Test_19_06()
+        {
+        }
+
+        [Fact]
+        public void Test_19_07()
+        {
+        }
+
+        [Fact]
+        public void Test_19_08()
+        {
+        }
+
+        [Fact]
+        public void Test_19_09()
+        {
+        }
+
+        [Fact]
+        public void Test_19_10()
+        {
+        }
+
+        [Fact]
+        public void Test_19_11()
+        {
+        }
+
+        [Fact]
+        public void Test_19_12()
+        {
+        }
+
+        [Fact]
+        public void Test_19_13()
+        {
+        }
+
+        [Fact]
+        public void Test_19_14()
+        {
+        }
+
+        [Fact]
+        public void Test_19_15()
+        {
+        }
+
+        [Fact]
+        public void Test_19_16()
+        {
+        }
+
+        [Fact]
+        public void Test_19_17()
+        {
+        }
+
+        [Fact]
+        public void Test_19_18()
+        {
+        }
+
+        [Fact]
+        public void Test_19_19()
+        {
+        }
+
+        [Fact]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_20
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_20_01()
+        {
+        }
+
+        [Fact]
+        public void Test_20_02()
+        {
+        }
+
+        [Fact]
+        public void Test_20_03()
+        {
+        }
+
+        [Fact]
+        public void Test_20_04()
+        {
+        }
+
+        [Fact]
+        public void Test_20_05()
+        {
+        }
+
+        [Fact]
+        public void Test_20_06()
+        {
+        }
+
+        [Fact]
+        public void Test_20_07()
+        {
+        }
+
+        [Fact]
+        public void Test_20_08()
+        {
+        }
+
+        [Fact]
+        public void Test_20_09()
+        {
+        }
+
+        [Fact]
+        public void Test_20_10()
+        {
+        }
+
+        [Fact]
+        public void Test_20_11()
+        {
+        }
+
+        [Fact]
+        public void Test_20_12()
+        {
+        }
+
+        [Fact]
+        public void Test_20_13()
+        {
+        }
+
+        [Fact]
+        public void Test_20_14()
+        {
+        }
+
+        [Fact]
+        public void Test_20_15()
+        {
+        }
+
+        [Fact]
+        public void Test_20_16()
+        {
+        }
+
+        [Fact]
+        public void Test_20_17()
+        {
+        }
+
+        [Fact]
+        public void Test_20_18()
+        {
+        }
+
+        [Fact]
+        public void Test_20_19()
+        {
+        }
+
+        [Fact]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_21
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_21_01()
+        {
+        }
+
+        [Fact]
+        public void Test_21_02()
+        {
+        }
+
+        [Fact]
+        public void Test_21_03()
+        {
+        }
+
+        [Fact]
+        public void Test_21_04()
+        {
+        }
+
+        [Fact]
+        public void Test_21_05()
+        {
+        }
+
+        [Fact]
+        public void Test_21_06()
+        {
+        }
+
+        [Fact]
+        public void Test_21_07()
+        {
+        }
+
+        [Fact]
+        public void Test_21_08()
+        {
+        }
+
+        [Fact]
+        public void Test_21_09()
+        {
+        }
+
+        [Fact]
+        public void Test_21_10()
+        {
+        }
+
+        [Fact]
+        public void Test_21_11()
+        {
+        }
+
+        [Fact]
+        public void Test_21_12()
+        {
+        }
+
+        [Fact]
+        public void Test_21_13()
+        {
+        }
+
+        [Fact]
+        public void Test_21_14()
+        {
+        }
+
+        [Fact]
+        public void Test_21_15()
+        {
+        }
+
+        [Fact]
+        public void Test_21_16()
+        {
+        }
+
+        [Fact]
+        public void Test_21_17()
+        {
+        }
+
+        [Fact]
+        public void Test_21_18()
+        {
+        }
+
+        [Fact]
+        public void Test_21_19()
+        {
+        }
+
+        [Fact]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_22
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_22_01()
+        {
+        }
+
+        [Fact]
+        public void Test_22_02()
+        {
+        }
+
+        [Fact]
+        public void Test_22_03()
+        {
+        }
+
+        [Fact]
+        public void Test_22_04()
+        {
+        }
+
+        [Fact]
+        public void Test_22_05()
+        {
+        }
+
+        [Fact]
+        public void Test_22_06()
+        {
+        }
+
+        [Fact]
+        public void Test_22_07()
+        {
+        }
+
+        [Fact]
+        public void Test_22_08()
+        {
+        }
+
+        [Fact]
+        public void Test_22_09()
+        {
+        }
+
+        [Fact]
+        public void Test_22_10()
+        {
+        }
+
+        [Fact]
+        public void Test_22_11()
+        {
+        }
+
+        [Fact]
+        public void Test_22_12()
+        {
+        }
+
+        [Fact]
+        public void Test_22_13()
+        {
+        }
+
+        [Fact]
+        public void Test_22_14()
+        {
+        }
+
+        [Fact]
+        public void Test_22_15()
+        {
+        }
+
+        [Fact]
+        public void Test_22_16()
+        {
+        }
+
+        [Fact]
+        public void Test_22_17()
+        {
+        }
+
+        [Fact]
+        public void Test_22_18()
+        {
+        }
+
+        [Fact]
+        public void Test_22_19()
+        {
+        }
+
+        [Fact]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_23
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_23_01()
+        {
+        }
+
+        [Fact]
+        public void Test_23_02()
+        {
+        }
+
+        [Fact]
+        public void Test_23_03()
+        {
+        }
+
+        [Fact]
+        public void Test_23_04()
+        {
+        }
+
+        [Fact]
+        public void Test_23_05()
+        {
+        }
+
+        [Fact]
+        public void Test_23_06()
+        {
+        }
+
+        [Fact]
+        public void Test_23_07()
+        {
+        }
+
+        [Fact]
+        public void Test_23_08()
+        {
+        }
+
+        [Fact]
+        public void Test_23_09()
+        {
+        }
+
+        [Fact]
+        public void Test_23_10()
+        {
+        }
+
+        [Fact]
+        public void Test_23_11()
+        {
+        }
+
+        [Fact]
+        public void Test_23_12()
+        {
+        }
+
+        [Fact]
+        public void Test_23_13()
+        {
+        }
+
+        [Fact]
+        public void Test_23_14()
+        {
+        }
+
+        [Fact]
+        public void Test_23_15()
+        {
+        }
+
+        [Fact]
+        public void Test_23_16()
+        {
+        }
+
+        [Fact]
+        public void Test_23_17()
+        {
+        }
+
+        [Fact]
+        public void Test_23_18()
+        {
+        }
+
+        [Fact]
+        public void Test_23_19()
+        {
+        }
+
+        [Fact]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_24
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_24_01()
+        {
+        }
+
+        [Fact]
+        public void Test_24_02()
+        {
+        }
+
+        [Fact]
+        public void Test_24_03()
+        {
+        }
+
+        [Fact]
+        public void Test_24_04()
+        {
+        }
+
+        [Fact]
+        public void Test_24_05()
+        {
+        }
+
+        [Fact]
+        public void Test_24_06()
+        {
+        }
+
+        [Fact]
+        public void Test_24_07()
+        {
+        }
+
+        [Fact]
+        public void Test_24_08()
+        {
+        }
+
+        [Fact]
+        public void Test_24_09()
+        {
+        }
+
+        [Fact]
+        public void Test_24_10()
+        {
+        }
+
+        [Fact]
+        public void Test_24_11()
+        {
+        }
+
+        [Fact]
+        public void Test_24_12()
+        {
+        }
+
+        [Fact]
+        public void Test_24_13()
+        {
+        }
+
+        [Fact]
+        public void Test_24_14()
+        {
+        }
+
+        [Fact]
+        public void Test_24_15()
+        {
+        }
+
+        [Fact]
+        public void Test_24_16()
+        {
+        }
+
+        [Fact]
+        public void Test_24_17()
+        {
+        }
+
+        [Fact]
+        public void Test_24_18()
+        {
+        }
+
+        [Fact]
+        public void Test_24_19()
+        {
+        }
+
+        [Fact]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_25
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_25_01()
+        {
+        }
+
+        [Fact]
+        public void Test_25_02()
+        {
+        }
+
+        [Fact]
+        public void Test_25_03()
+        {
+        }
+
+        [Fact]
+        public void Test_25_04()
+        {
+        }
+
+        [Fact]
+        public void Test_25_05()
+        {
+        }
+
+        [Fact]
+        public void Test_25_06()
+        {
+        }
+
+        [Fact]
+        public void Test_25_07()
+        {
+        }
+
+        [Fact]
+        public void Test_25_08()
+        {
+        }
+
+        [Fact]
+        public void Test_25_09()
+        {
+        }
+
+        [Fact]
+        public void Test_25_10()
+        {
+        }
+
+        [Fact]
+        public void Test_25_11()
+        {
+        }
+
+        [Fact]
+        public void Test_25_12()
+        {
+        }
+
+        [Fact]
+        public void Test_25_13()
+        {
+        }
+
+        [Fact]
+        public void Test_25_14()
+        {
+        }
+
+        [Fact]
+        public void Test_25_15()
+        {
+        }
+
+        [Fact]
+        public void Test_25_16()
+        {
+        }
+
+        [Fact]
+        public void Test_25_17()
+        {
+        }
+
+        [Fact]
+        public void Test_25_18()
+        {
+        }
+
+        [Fact]
+        public void Test_25_19()
+        {
+        }
+
+        [Fact]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_26
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_26_01()
+        {
+        }
+
+        [Fact]
+        public void Test_26_02()
+        {
+        }
+
+        [Fact]
+        public void Test_26_03()
+        {
+        }
+
+        [Fact]
+        public void Test_26_04()
+        {
+        }
+
+        [Fact]
+        public void Test_26_05()
+        {
+        }
+
+        [Fact]
+        public void Test_26_06()
+        {
+        }
+
+        [Fact]
+        public void Test_26_07()
+        {
+        }
+
+        [Fact]
+        public void Test_26_08()
+        {
+        }
+
+        [Fact]
+        public void Test_26_09()
+        {
+        }
+
+        [Fact]
+        public void Test_26_10()
+        {
+        }
+
+        [Fact]
+        public void Test_26_11()
+        {
+        }
+
+        [Fact]
+        public void Test_26_12()
+        {
+        }
+
+        [Fact]
+        public void Test_26_13()
+        {
+        }
+
+        [Fact]
+        public void Test_26_14()
+        {
+        }
+
+        [Fact]
+        public void Test_26_15()
+        {
+        }
+
+        [Fact]
+        public void Test_26_16()
+        {
+        }
+
+        [Fact]
+        public void Test_26_17()
+        {
+        }
+
+        [Fact]
+        public void Test_26_18()
+        {
+        }
+
+        [Fact]
+        public void Test_26_19()
+        {
+        }
+
+        [Fact]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_27
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_27_01()
+        {
+        }
+
+        [Fact]
+        public void Test_27_02()
+        {
+        }
+
+        [Fact]
+        public void Test_27_03()
+        {
+        }
+
+        [Fact]
+        public void Test_27_04()
+        {
+        }
+
+        [Fact]
+        public void Test_27_05()
+        {
+        }
+
+        [Fact]
+        public void Test_27_06()
+        {
+        }
+
+        [Fact]
+        public void Test_27_07()
+        {
+        }
+
+        [Fact]
+        public void Test_27_08()
+        {
+        }
+
+        [Fact]
+        public void Test_27_09()
+        {
+        }
+
+        [Fact]
+        public void Test_27_10()
+        {
+        }
+
+        [Fact]
+        public void Test_27_11()
+        {
+        }
+
+        [Fact]
+        public void Test_27_12()
+        {
+        }
+
+        [Fact]
+        public void Test_27_13()
+        {
+        }
+
+        [Fact]
+        public void Test_27_14()
+        {
+        }
+
+        [Fact]
+        public void Test_27_15()
+        {
+        }
+
+        [Fact]
+        public void Test_27_16()
+        {
+        }
+
+        [Fact]
+        public void Test_27_17()
+        {
+        }
+
+        [Fact]
+        public void Test_27_18()
+        {
+        }
+
+        [Fact]
+        public void Test_27_19()
+        {
+        }
+
+        [Fact]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_28
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_28_01()
+        {
+        }
+
+        [Fact]
+        public void Test_28_02()
+        {
+        }
+
+        [Fact]
+        public void Test_28_03()
+        {
+        }
+
+        [Fact]
+        public void Test_28_04()
+        {
+        }
+
+        [Fact]
+        public void Test_28_05()
+        {
+        }
+
+        [Fact]
+        public void Test_28_06()
+        {
+        }
+
+        [Fact]
+        public void Test_28_07()
+        {
+        }
+
+        [Fact]
+        public void Test_28_08()
+        {
+        }
+
+        [Fact]
+        public void Test_28_09()
+        {
+        }
+
+        [Fact]
+        public void Test_28_10()
+        {
+        }
+
+        [Fact]
+        public void Test_28_11()
+        {
+        }
+
+        [Fact]
+        public void Test_28_12()
+        {
+        }
+
+        [Fact]
+        public void Test_28_13()
+        {
+        }
+
+        [Fact]
+        public void Test_28_14()
+        {
+        }
+
+        [Fact]
+        public void Test_28_15()
+        {
+        }
+
+        [Fact]
+        public void Test_28_16()
+        {
+        }
+
+        [Fact]
+        public void Test_28_17()
+        {
+        }
+
+        [Fact]
+        public void Test_28_18()
+        {
+        }
+
+        [Fact]
+        public void Test_28_19()
+        {
+        }
+
+        [Fact]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_29
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_29_01()
+        {
+        }
+
+        [Fact]
+        public void Test_29_02()
+        {
+        }
+
+        [Fact]
+        public void Test_29_03()
+        {
+        }
+
+        [Fact]
+        public void Test_29_04()
+        {
+        }
+
+        [Fact]
+        public void Test_29_05()
+        {
+        }
+
+        [Fact]
+        public void Test_29_06()
+        {
+        }
+
+        [Fact]
+        public void Test_29_07()
+        {
+        }
+
+        [Fact]
+        public void Test_29_08()
+        {
+        }
+
+        [Fact]
+        public void Test_29_09()
+        {
+        }
+
+        [Fact]
+        public void Test_29_10()
+        {
+        }
+
+        [Fact]
+        public void Test_29_11()
+        {
+        }
+
+        [Fact]
+        public void Test_29_12()
+        {
+        }
+
+        [Fact]
+        public void Test_29_13()
+        {
+        }
+
+        [Fact]
+        public void Test_29_14()
+        {
+        }
+
+        [Fact]
+        public void Test_29_15()
+        {
+        }
+
+        [Fact]
+        public void Test_29_16()
+        {
+        }
+
+        [Fact]
+        public void Test_29_17()
+        {
+        }
+
+        [Fact]
+        public void Test_29_18()
+        {
+        }
+
+        [Fact]
+        public void Test_29_19()
+        {
+        }
+
+        [Fact]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_30
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_30_01()
+        {
+        }
+
+        [Fact]
+        public void Test_30_02()
+        {
+        }
+
+        [Fact]
+        public void Test_30_03()
+        {
+        }
+
+        [Fact]
+        public void Test_30_04()
+        {
+        }
+
+        [Fact]
+        public void Test_30_05()
+        {
+        }
+
+        [Fact]
+        public void Test_30_06()
+        {
+        }
+
+        [Fact]
+        public void Test_30_07()
+        {
+        }
+
+        [Fact]
+        public void Test_30_08()
+        {
+        }
+
+        [Fact]
+        public void Test_30_09()
+        {
+        }
+
+        [Fact]
+        public void Test_30_10()
+        {
+        }
+
+        [Fact]
+        public void Test_30_11()
+        {
+        }
+
+        [Fact]
+        public void Test_30_12()
+        {
+        }
+
+        [Fact]
+        public void Test_30_13()
+        {
+        }
+
+        [Fact]
+        public void Test_30_14()
+        {
+        }
+
+        [Fact]
+        public void Test_30_15()
+        {
+        }
+
+        [Fact]
+        public void Test_30_16()
+        {
+        }
+
+        [Fact]
+        public void Test_30_17()
+        {
+        }
+
+        [Fact]
+        public void Test_30_18()
+        {
+        }
+
+        [Fact]
+        public void Test_30_19()
+        {
+        }
+
+        [Fact]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_31
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_31_01()
+        {
+        }
+
+        [Fact]
+        public void Test_31_02()
+        {
+        }
+
+        [Fact]
+        public void Test_31_03()
+        {
+        }
+
+        [Fact]
+        public void Test_31_04()
+        {
+        }
+
+        [Fact]
+        public void Test_31_05()
+        {
+        }
+
+        [Fact]
+        public void Test_31_06()
+        {
+        }
+
+        [Fact]
+        public void Test_31_07()
+        {
+        }
+
+        [Fact]
+        public void Test_31_08()
+        {
+        }
+
+        [Fact]
+        public void Test_31_09()
+        {
+        }
+
+        [Fact]
+        public void Test_31_10()
+        {
+        }
+
+        [Fact]
+        public void Test_31_11()
+        {
+        }
+
+        [Fact]
+        public void Test_31_12()
+        {
+        }
+
+        [Fact]
+        public void Test_31_13()
+        {
+        }
+
+        [Fact]
+        public void Test_31_14()
+        {
+        }
+
+        [Fact]
+        public void Test_31_15()
+        {
+        }
+
+        [Fact]
+        public void Test_31_16()
+        {
+        }
+
+        [Fact]
+        public void Test_31_17()
+        {
+        }
+
+        [Fact]
+        public void Test_31_18()
+        {
+        }
+
+        [Fact]
+        public void Test_31_19()
+        {
+        }
+
+        [Fact]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_32
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_32_01()
+        {
+        }
+
+        [Fact]
+        public void Test_32_02()
+        {
+        }
+
+        [Fact]
+        public void Test_32_03()
+        {
+        }
+
+        [Fact]
+        public void Test_32_04()
+        {
+        }
+
+        [Fact]
+        public void Test_32_05()
+        {
+        }
+
+        [Fact]
+        public void Test_32_06()
+        {
+        }
+
+        [Fact]
+        public void Test_32_07()
+        {
+        }
+
+        [Fact]
+        public void Test_32_08()
+        {
+        }
+
+        [Fact]
+        public void Test_32_09()
+        {
+        }
+
+        [Fact]
+        public void Test_32_10()
+        {
+        }
+
+        [Fact]
+        public void Test_32_11()
+        {
+        }
+
+        [Fact]
+        public void Test_32_12()
+        {
+        }
+
+        [Fact]
+        public void Test_32_13()
+        {
+        }
+
+        [Fact]
+        public void Test_32_14()
+        {
+        }
+
+        [Fact]
+        public void Test_32_15()
+        {
+        }
+
+        [Fact]
+        public void Test_32_16()
+        {
+        }
+
+        [Fact]
+        public void Test_32_17()
+        {
+        }
+
+        [Fact]
+        public void Test_32_18()
+        {
+        }
+
+        [Fact]
+        public void Test_32_19()
+        {
+        }
+
+        [Fact]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_33
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_33_01()
+        {
+        }
+
+        [Fact]
+        public void Test_33_02()
+        {
+        }
+
+        [Fact]
+        public void Test_33_03()
+        {
+        }
+
+        [Fact]
+        public void Test_33_04()
+        {
+        }
+
+        [Fact]
+        public void Test_33_05()
+        {
+        }
+
+        [Fact]
+        public void Test_33_06()
+        {
+        }
+
+        [Fact]
+        public void Test_33_07()
+        {
+        }
+
+        [Fact]
+        public void Test_33_08()
+        {
+        }
+
+        [Fact]
+        public void Test_33_09()
+        {
+        }
+
+        [Fact]
+        public void Test_33_10()
+        {
+        }
+
+        [Fact]
+        public void Test_33_11()
+        {
+        }
+
+        [Fact]
+        public void Test_33_12()
+        {
+        }
+
+        [Fact]
+        public void Test_33_13()
+        {
+        }
+
+        [Fact]
+        public void Test_33_14()
+        {
+        }
+
+        [Fact]
+        public void Test_33_15()
+        {
+        }
+
+        [Fact]
+        public void Test_33_16()
+        {
+        }
+
+        [Fact]
+        public void Test_33_17()
+        {
+        }
+
+        [Fact]
+        public void Test_33_18()
+        {
+        }
+
+        [Fact]
+        public void Test_33_19()
+        {
+        }
+
+        [Fact]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_34
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_34_01()
+        {
+        }
+
+        [Fact]
+        public void Test_34_02()
+        {
+        }
+
+        [Fact]
+        public void Test_34_03()
+        {
+        }
+
+        [Fact]
+        public void Test_34_04()
+        {
+        }
+
+        [Fact]
+        public void Test_34_05()
+        {
+        }
+
+        [Fact]
+        public void Test_34_06()
+        {
+        }
+
+        [Fact]
+        public void Test_34_07()
+        {
+        }
+
+        [Fact]
+        public void Test_34_08()
+        {
+        }
+
+        [Fact]
+        public void Test_34_09()
+        {
+        }
+
+        [Fact]
+        public void Test_34_10()
+        {
+        }
+
+        [Fact]
+        public void Test_34_11()
+        {
+        }
+
+        [Fact]
+        public void Test_34_12()
+        {
+        }
+
+        [Fact]
+        public void Test_34_13()
+        {
+        }
+
+        [Fact]
+        public void Test_34_14()
+        {
+        }
+
+        [Fact]
+        public void Test_34_15()
+        {
+        }
+
+        [Fact]
+        public void Test_34_16()
+        {
+        }
+
+        [Fact]
+        public void Test_34_17()
+        {
+        }
+
+        [Fact]
+        public void Test_34_18()
+        {
+        }
+
+        [Fact]
+        public void Test_34_19()
+        {
+        }
+
+        [Fact]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_35
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_35_01()
+        {
+        }
+
+        [Fact]
+        public void Test_35_02()
+        {
+        }
+
+        [Fact]
+        public void Test_35_03()
+        {
+        }
+
+        [Fact]
+        public void Test_35_04()
+        {
+        }
+
+        [Fact]
+        public void Test_35_05()
+        {
+        }
+
+        [Fact]
+        public void Test_35_06()
+        {
+        }
+
+        [Fact]
+        public void Test_35_07()
+        {
+        }
+
+        [Fact]
+        public void Test_35_08()
+        {
+        }
+
+        [Fact]
+        public void Test_35_09()
+        {
+        }
+
+        [Fact]
+        public void Test_35_10()
+        {
+        }
+
+        [Fact]
+        public void Test_35_11()
+        {
+        }
+
+        [Fact]
+        public void Test_35_12()
+        {
+        }
+
+        [Fact]
+        public void Test_35_13()
+        {
+        }
+
+        [Fact]
+        public void Test_35_14()
+        {
+        }
+
+        [Fact]
+        public void Test_35_15()
+        {
+        }
+
+        [Fact]
+        public void Test_35_16()
+        {
+        }
+
+        [Fact]
+        public void Test_35_17()
+        {
+        }
+
+        [Fact]
+        public void Test_35_18()
+        {
+        }
+
+        [Fact]
+        public void Test_35_19()
+        {
+        }
+
+        [Fact]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_36
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_36_01()
+        {
+        }
+
+        [Fact]
+        public void Test_36_02()
+        {
+        }
+
+        [Fact]
+        public void Test_36_03()
+        {
+        }
+
+        [Fact]
+        public void Test_36_04()
+        {
+        }
+
+        [Fact]
+        public void Test_36_05()
+        {
+        }
+
+        [Fact]
+        public void Test_36_06()
+        {
+        }
+
+        [Fact]
+        public void Test_36_07()
+        {
+        }
+
+        [Fact]
+        public void Test_36_08()
+        {
+        }
+
+        [Fact]
+        public void Test_36_09()
+        {
+        }
+
+        [Fact]
+        public void Test_36_10()
+        {
+        }
+
+        [Fact]
+        public void Test_36_11()
+        {
+        }
+
+        [Fact]
+        public void Test_36_12()
+        {
+        }
+
+        [Fact]
+        public void Test_36_13()
+        {
+        }
+
+        [Fact]
+        public void Test_36_14()
+        {
+        }
+
+        [Fact]
+        public void Test_36_15()
+        {
+        }
+
+        [Fact]
+        public void Test_36_16()
+        {
+        }
+
+        [Fact]
+        public void Test_36_17()
+        {
+        }
+
+        [Fact]
+        public void Test_36_18()
+        {
+        }
+
+        [Fact]
+        public void Test_36_19()
+        {
+        }
+
+        [Fact]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_37
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_37_01()
+        {
+        }
+
+        [Fact]
+        public void Test_37_02()
+        {
+        }
+
+        [Fact]
+        public void Test_37_03()
+        {
+        }
+
+        [Fact]
+        public void Test_37_04()
+        {
+        }
+
+        [Fact]
+        public void Test_37_05()
+        {
+        }
+
+        [Fact]
+        public void Test_37_06()
+        {
+        }
+
+        [Fact]
+        public void Test_37_07()
+        {
+        }
+
+        [Fact]
+        public void Test_37_08()
+        {
+        }
+
+        [Fact]
+        public void Test_37_09()
+        {
+        }
+
+        [Fact]
+        public void Test_37_10()
+        {
+        }
+
+        [Fact]
+        public void Test_37_11()
+        {
+        }
+
+        [Fact]
+        public void Test_37_12()
+        {
+        }
+
+        [Fact]
+        public void Test_37_13()
+        {
+        }
+
+        [Fact]
+        public void Test_37_14()
+        {
+        }
+
+        [Fact]
+        public void Test_37_15()
+        {
+        }
+
+        [Fact]
+        public void Test_37_16()
+        {
+        }
+
+        [Fact]
+        public void Test_37_17()
+        {
+        }
+
+        [Fact]
+        public void Test_37_18()
+        {
+        }
+
+        [Fact]
+        public void Test_37_19()
+        {
+        }
+
+        [Fact]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_38
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_38_01()
+        {
+        }
+
+        [Fact]
+        public void Test_38_02()
+        {
+        }
+
+        [Fact]
+        public void Test_38_03()
+        {
+        }
+
+        [Fact]
+        public void Test_38_04()
+        {
+        }
+
+        [Fact]
+        public void Test_38_05()
+        {
+        }
+
+        [Fact]
+        public void Test_38_06()
+        {
+        }
+
+        [Fact]
+        public void Test_38_07()
+        {
+        }
+
+        [Fact]
+        public void Test_38_08()
+        {
+        }
+
+        [Fact]
+        public void Test_38_09()
+        {
+        }
+
+        [Fact]
+        public void Test_38_10()
+        {
+        }
+
+        [Fact]
+        public void Test_38_11()
+        {
+        }
+
+        [Fact]
+        public void Test_38_12()
+        {
+        }
+
+        [Fact]
+        public void Test_38_13()
+        {
+        }
+
+        [Fact]
+        public void Test_38_14()
+        {
+        }
+
+        [Fact]
+        public void Test_38_15()
+        {
+        }
+
+        [Fact]
+        public void Test_38_16()
+        {
+        }
+
+        [Fact]
+        public void Test_38_17()
+        {
+        }
+
+        [Fact]
+        public void Test_38_18()
+        {
+        }
+
+        [Fact]
+        public void Test_38_19()
+        {
+        }
+
+        [Fact]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_39
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_39_01()
+        {
+        }
+
+        [Fact]
+        public void Test_39_02()
+        {
+        }
+
+        [Fact]
+        public void Test_39_03()
+        {
+        }
+
+        [Fact]
+        public void Test_39_04()
+        {
+        }
+
+        [Fact]
+        public void Test_39_05()
+        {
+        }
+
+        [Fact]
+        public void Test_39_06()
+        {
+        }
+
+        [Fact]
+        public void Test_39_07()
+        {
+        }
+
+        [Fact]
+        public void Test_39_08()
+        {
+        }
+
+        [Fact]
+        public void Test_39_09()
+        {
+        }
+
+        [Fact]
+        public void Test_39_10()
+        {
+        }
+
+        [Fact]
+        public void Test_39_11()
+        {
+        }
+
+        [Fact]
+        public void Test_39_12()
+        {
+        }
+
+        [Fact]
+        public void Test_39_13()
+        {
+        }
+
+        [Fact]
+        public void Test_39_14()
+        {
+        }
+
+        [Fact]
+        public void Test_39_15()
+        {
+        }
+
+        [Fact]
+        public void Test_39_16()
+        {
+        }
+
+        [Fact]
+        public void Test_39_17()
+        {
+        }
+
+        [Fact]
+        public void Test_39_18()
+        {
+        }
+
+        [Fact]
+        public void Test_39_19()
+        {
+        }
+
+        [Fact]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_40
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_40_01()
+        {
+        }
+
+        [Fact]
+        public void Test_40_02()
+        {
+        }
+
+        [Fact]
+        public void Test_40_03()
+        {
+        }
+
+        [Fact]
+        public void Test_40_04()
+        {
+        }
+
+        [Fact]
+        public void Test_40_05()
+        {
+        }
+
+        [Fact]
+        public void Test_40_06()
+        {
+        }
+
+        [Fact]
+        public void Test_40_07()
+        {
+        }
+
+        [Fact]
+        public void Test_40_08()
+        {
+        }
+
+        [Fact]
+        public void Test_40_09()
+        {
+        }
+
+        [Fact]
+        public void Test_40_10()
+        {
+        }
+
+        [Fact]
+        public void Test_40_11()
+        {
+        }
+
+        [Fact]
+        public void Test_40_12()
+        {
+        }
+
+        [Fact]
+        public void Test_40_13()
+        {
+        }
+
+        [Fact]
+        public void Test_40_14()
+        {
+        }
+
+        [Fact]
+        public void Test_40_15()
+        {
+        }
+
+        [Fact]
+        public void Test_40_16()
+        {
+        }
+
+        [Fact]
+        public void Test_40_17()
+        {
+        }
+
+        [Fact]
+        public void Test_40_18()
+        {
+        }
+
+        [Fact]
+        public void Test_40_19()
+        {
+        }
+
+        [Fact]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_41
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_41_01()
+        {
+        }
+
+        [Fact]
+        public void Test_41_02()
+        {
+        }
+
+        [Fact]
+        public void Test_41_03()
+        {
+        }
+
+        [Fact]
+        public void Test_41_04()
+        {
+        }
+
+        [Fact]
+        public void Test_41_05()
+        {
+        }
+
+        [Fact]
+        public void Test_41_06()
+        {
+        }
+
+        [Fact]
+        public void Test_41_07()
+        {
+        }
+
+        [Fact]
+        public void Test_41_08()
+        {
+        }
+
+        [Fact]
+        public void Test_41_09()
+        {
+        }
+
+        [Fact]
+        public void Test_41_10()
+        {
+        }
+
+        [Fact]
+        public void Test_41_11()
+        {
+        }
+
+        [Fact]
+        public void Test_41_12()
+        {
+        }
+
+        [Fact]
+        public void Test_41_13()
+        {
+        }
+
+        [Fact]
+        public void Test_41_14()
+        {
+        }
+
+        [Fact]
+        public void Test_41_15()
+        {
+        }
+
+        [Fact]
+        public void Test_41_16()
+        {
+        }
+
+        [Fact]
+        public void Test_41_17()
+        {
+        }
+
+        [Fact]
+        public void Test_41_18()
+        {
+        }
+
+        [Fact]
+        public void Test_41_19()
+        {
+        }
+
+        [Fact]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_42
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_42_01()
+        {
+        }
+
+        [Fact]
+        public void Test_42_02()
+        {
+        }
+
+        [Fact]
+        public void Test_42_03()
+        {
+        }
+
+        [Fact]
+        public void Test_42_04()
+        {
+        }
+
+        [Fact]
+        public void Test_42_05()
+        {
+        }
+
+        [Fact]
+        public void Test_42_06()
+        {
+        }
+
+        [Fact]
+        public void Test_42_07()
+        {
+        }
+
+        [Fact]
+        public void Test_42_08()
+        {
+        }
+
+        [Fact]
+        public void Test_42_09()
+        {
+        }
+
+        [Fact]
+        public void Test_42_10()
+        {
+        }
+
+        [Fact]
+        public void Test_42_11()
+        {
+        }
+
+        [Fact]
+        public void Test_42_12()
+        {
+        }
+
+        [Fact]
+        public void Test_42_13()
+        {
+        }
+
+        [Fact]
+        public void Test_42_14()
+        {
+        }
+
+        [Fact]
+        public void Test_42_15()
+        {
+        }
+
+        [Fact]
+        public void Test_42_16()
+        {
+        }
+
+        [Fact]
+        public void Test_42_17()
+        {
+        }
+
+        [Fact]
+        public void Test_42_18()
+        {
+        }
+
+        [Fact]
+        public void Test_42_19()
+        {
+        }
+
+        [Fact]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_43
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_43_01()
+        {
+        }
+
+        [Fact]
+        public void Test_43_02()
+        {
+        }
+
+        [Fact]
+        public void Test_43_03()
+        {
+        }
+
+        [Fact]
+        public void Test_43_04()
+        {
+        }
+
+        [Fact]
+        public void Test_43_05()
+        {
+        }
+
+        [Fact]
+        public void Test_43_06()
+        {
+        }
+
+        [Fact]
+        public void Test_43_07()
+        {
+        }
+
+        [Fact]
+        public void Test_43_08()
+        {
+        }
+
+        [Fact]
+        public void Test_43_09()
+        {
+        }
+
+        [Fact]
+        public void Test_43_10()
+        {
+        }
+
+        [Fact]
+        public void Test_43_11()
+        {
+        }
+
+        [Fact]
+        public void Test_43_12()
+        {
+        }
+
+        [Fact]
+        public void Test_43_13()
+        {
+        }
+
+        [Fact]
+        public void Test_43_14()
+        {
+        }
+
+        [Fact]
+        public void Test_43_15()
+        {
+        }
+
+        [Fact]
+        public void Test_43_16()
+        {
+        }
+
+        [Fact]
+        public void Test_43_17()
+        {
+        }
+
+        [Fact]
+        public void Test_43_18()
+        {
+        }
+
+        [Fact]
+        public void Test_43_19()
+        {
+        }
+
+        [Fact]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_44
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_44_01()
+        {
+        }
+
+        [Fact]
+        public void Test_44_02()
+        {
+        }
+
+        [Fact]
+        public void Test_44_03()
+        {
+        }
+
+        [Fact]
+        public void Test_44_04()
+        {
+        }
+
+        [Fact]
+        public void Test_44_05()
+        {
+        }
+
+        [Fact]
+        public void Test_44_06()
+        {
+        }
+
+        [Fact]
+        public void Test_44_07()
+        {
+        }
+
+        [Fact]
+        public void Test_44_08()
+        {
+        }
+
+        [Fact]
+        public void Test_44_09()
+        {
+        }
+
+        [Fact]
+        public void Test_44_10()
+        {
+        }
+
+        [Fact]
+        public void Test_44_11()
+        {
+        }
+
+        [Fact]
+        public void Test_44_12()
+        {
+        }
+
+        [Fact]
+        public void Test_44_13()
+        {
+        }
+
+        [Fact]
+        public void Test_44_14()
+        {
+        }
+
+        [Fact]
+        public void Test_44_15()
+        {
+        }
+
+        [Fact]
+        public void Test_44_16()
+        {
+        }
+
+        [Fact]
+        public void Test_44_17()
+        {
+        }
+
+        [Fact]
+        public void Test_44_18()
+        {
+        }
+
+        [Fact]
+        public void Test_44_19()
+        {
+        }
+
+        [Fact]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_45
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_45_01()
+        {
+        }
+
+        [Fact]
+        public void Test_45_02()
+        {
+        }
+
+        [Fact]
+        public void Test_45_03()
+        {
+        }
+
+        [Fact]
+        public void Test_45_04()
+        {
+        }
+
+        [Fact]
+        public void Test_45_05()
+        {
+        }
+
+        [Fact]
+        public void Test_45_06()
+        {
+        }
+
+        [Fact]
+        public void Test_45_07()
+        {
+        }
+
+        [Fact]
+        public void Test_45_08()
+        {
+        }
+
+        [Fact]
+        public void Test_45_09()
+        {
+        }
+
+        [Fact]
+        public void Test_45_10()
+        {
+        }
+
+        [Fact]
+        public void Test_45_11()
+        {
+        }
+
+        [Fact]
+        public void Test_45_12()
+        {
+        }
+
+        [Fact]
+        public void Test_45_13()
+        {
+        }
+
+        [Fact]
+        public void Test_45_14()
+        {
+        }
+
+        [Fact]
+        public void Test_45_15()
+        {
+        }
+
+        [Fact]
+        public void Test_45_16()
+        {
+        }
+
+        [Fact]
+        public void Test_45_17()
+        {
+        }
+
+        [Fact]
+        public void Test_45_18()
+        {
+        }
+
+        [Fact]
+        public void Test_45_19()
+        {
+        }
+
+        [Fact]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_46
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_46_01()
+        {
+        }
+
+        [Fact]
+        public void Test_46_02()
+        {
+        }
+
+        [Fact]
+        public void Test_46_03()
+        {
+        }
+
+        [Fact]
+        public void Test_46_04()
+        {
+        }
+
+        [Fact]
+        public void Test_46_05()
+        {
+        }
+
+        [Fact]
+        public void Test_46_06()
+        {
+        }
+
+        [Fact]
+        public void Test_46_07()
+        {
+        }
+
+        [Fact]
+        public void Test_46_08()
+        {
+        }
+
+        [Fact]
+        public void Test_46_09()
+        {
+        }
+
+        [Fact]
+        public void Test_46_10()
+        {
+        }
+
+        [Fact]
+        public void Test_46_11()
+        {
+        }
+
+        [Fact]
+        public void Test_46_12()
+        {
+        }
+
+        [Fact]
+        public void Test_46_13()
+        {
+        }
+
+        [Fact]
+        public void Test_46_14()
+        {
+        }
+
+        [Fact]
+        public void Test_46_15()
+        {
+        }
+
+        [Fact]
+        public void Test_46_16()
+        {
+        }
+
+        [Fact]
+        public void Test_46_17()
+        {
+        }
+
+        [Fact]
+        public void Test_46_18()
+        {
+        }
+
+        [Fact]
+        public void Test_46_19()
+        {
+        }
+
+        [Fact]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_47
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_47_01()
+        {
+        }
+
+        [Fact]
+        public void Test_47_02()
+        {
+        }
+
+        [Fact]
+        public void Test_47_03()
+        {
+        }
+
+        [Fact]
+        public void Test_47_04()
+        {
+        }
+
+        [Fact]
+        public void Test_47_05()
+        {
+        }
+
+        [Fact]
+        public void Test_47_06()
+        {
+        }
+
+        [Fact]
+        public void Test_47_07()
+        {
+        }
+
+        [Fact]
+        public void Test_47_08()
+        {
+        }
+
+        [Fact]
+        public void Test_47_09()
+        {
+        }
+
+        [Fact]
+        public void Test_47_10()
+        {
+        }
+
+        [Fact]
+        public void Test_47_11()
+        {
+        }
+
+        [Fact]
+        public void Test_47_12()
+        {
+        }
+
+        [Fact]
+        public void Test_47_13()
+        {
+        }
+
+        [Fact]
+        public void Test_47_14()
+        {
+        }
+
+        [Fact]
+        public void Test_47_15()
+        {
+        }
+
+        [Fact]
+        public void Test_47_16()
+        {
+        }
+
+        [Fact]
+        public void Test_47_17()
+        {
+        }
+
+        [Fact]
+        public void Test_47_18()
+        {
+        }
+
+        [Fact]
+        public void Test_47_19()
+        {
+        }
+
+        [Fact]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_48
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_48_01()
+        {
+        }
+
+        [Fact]
+        public void Test_48_02()
+        {
+        }
+
+        [Fact]
+        public void Test_48_03()
+        {
+        }
+
+        [Fact]
+        public void Test_48_04()
+        {
+        }
+
+        [Fact]
+        public void Test_48_05()
+        {
+        }
+
+        [Fact]
+        public void Test_48_06()
+        {
+        }
+
+        [Fact]
+        public void Test_48_07()
+        {
+        }
+
+        [Fact]
+        public void Test_48_08()
+        {
+        }
+
+        [Fact]
+        public void Test_48_09()
+        {
+        }
+
+        [Fact]
+        public void Test_48_10()
+        {
+        }
+
+        [Fact]
+        public void Test_48_11()
+        {
+        }
+
+        [Fact]
+        public void Test_48_12()
+        {
+        }
+
+        [Fact]
+        public void Test_48_13()
+        {
+        }
+
+        [Fact]
+        public void Test_48_14()
+        {
+        }
+
+        [Fact]
+        public void Test_48_15()
+        {
+        }
+
+        [Fact]
+        public void Test_48_16()
+        {
+        }
+
+        [Fact]
+        public void Test_48_17()
+        {
+        }
+
+        [Fact]
+        public void Test_48_18()
+        {
+        }
+
+        [Fact]
+        public void Test_48_19()
+        {
+        }
+
+        [Fact]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_49
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_49_01()
+        {
+        }
+
+        [Fact]
+        public void Test_49_02()
+        {
+        }
+
+        [Fact]
+        public void Test_49_03()
+        {
+        }
+
+        [Fact]
+        public void Test_49_04()
+        {
+        }
+
+        [Fact]
+        public void Test_49_05()
+        {
+        }
+
+        [Fact]
+        public void Test_49_06()
+        {
+        }
+
+        [Fact]
+        public void Test_49_07()
+        {
+        }
+
+        [Fact]
+        public void Test_49_08()
+        {
+        }
+
+        [Fact]
+        public void Test_49_09()
+        {
+        }
+
+        [Fact]
+        public void Test_49_10()
+        {
+        }
+
+        [Fact]
+        public void Test_49_11()
+        {
+        }
+
+        [Fact]
+        public void Test_49_12()
+        {
+        }
+
+        [Fact]
+        public void Test_49_13()
+        {
+        }
+
+        [Fact]
+        public void Test_49_14()
+        {
+        }
+
+        [Fact]
+        public void Test_49_15()
+        {
+        }
+
+        [Fact]
+        public void Test_49_16()
+        {
+        }
+
+        [Fact]
+        public void Test_49_17()
+        {
+        }
+
+        [Fact]
+        public void Test_49_18()
+        {
+        }
+
+        [Fact]
+        public void Test_49_19()
+        {
+        }
+
+        [Fact]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_50
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_50_01()
+        {
+        }
+
+        [Fact]
+        public void Test_50_02()
+        {
+        }
+
+        [Fact]
+        public void Test_50_03()
+        {
+        }
+
+        [Fact]
+        public void Test_50_04()
+        {
+        }
+
+        [Fact]
+        public void Test_50_05()
+        {
+        }
+
+        [Fact]
+        public void Test_50_06()
+        {
+        }
+
+        [Fact]
+        public void Test_50_07()
+        {
+        }
+
+        [Fact]
+        public void Test_50_08()
+        {
+        }
+
+        [Fact]
+        public void Test_50_09()
+        {
+        }
+
+        [Fact]
+        public void Test_50_10()
+        {
+        }
+
+        [Fact]
+        public void Test_50_11()
+        {
+        }
+
+        [Fact]
+        public void Test_50_12()
+        {
+        }
+
+        [Fact]
+        public void Test_50_13()
+        {
+        }
+
+        [Fact]
+        public void Test_50_14()
+        {
+        }
+
+        [Fact]
+        public void Test_50_15()
+        {
+        }
+
+        [Fact]
+        public void Test_50_16()
+        {
+        }
+
+        [Fact]
+        public void Test_50_17()
+        {
+        }
+
+        [Fact]
+        public void Test_50_18()
+        {
+        }
+
+        [Fact]
+        public void Test_50_19()
+        {
+        }
+
+        [Fact]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/XUnit1000Passing/XunitTests.tt b/test/TestAssets/performance/XUnit1000Passing/XunitTests.tt
new file mode 100644
index 0000000000..7486b49df3
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1000Passing/XunitTests.tt
@@ -0,0 +1,55 @@
+using Xunit;
+
+namespace Tests
+{
+<#
+    int classes = 50;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj b/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj
new file mode 100644
index 0000000000..119a479786
--- /dev/null
+++ b/test/TestAssets/performance/XUnit100Passing/XUnit100Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="XunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>XunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="XunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>XunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/performance/XUnit100Passing/XunitTests.cs b/test/TestAssets/performance/XUnit100Passing/XunitTests.cs
new file mode 100644
index 0000000000..23ce625eac
--- /dev/null
+++ b/test/TestAssets/performance/XUnit100Passing/XunitTests.cs
@@ -0,0 +1,545 @@
+using Xunit;
+
+namespace Tests
+{
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_01_01()
+        {
+        }
+
+        [Fact]
+        public void Test_01_02()
+        {
+        }
+
+        [Fact]
+        public void Test_01_03()
+        {
+        }
+
+        [Fact]
+        public void Test_01_04()
+        {
+        }
+
+        [Fact]
+        public void Test_01_05()
+        {
+        }
+
+        [Fact]
+        public void Test_01_06()
+        {
+        }
+
+        [Fact]
+        public void Test_01_07()
+        {
+        }
+
+        [Fact]
+        public void Test_01_08()
+        {
+        }
+
+        [Fact]
+        public void Test_01_09()
+        {
+        }
+
+        [Fact]
+        public void Test_01_10()
+        {
+        }
+
+        [Fact]
+        public void Test_01_11()
+        {
+        }
+
+        [Fact]
+        public void Test_01_12()
+        {
+        }
+
+        [Fact]
+        public void Test_01_13()
+        {
+        }
+
+        [Fact]
+        public void Test_01_14()
+        {
+        }
+
+        [Fact]
+        public void Test_01_15()
+        {
+        }
+
+        [Fact]
+        public void Test_01_16()
+        {
+        }
+
+        [Fact]
+        public void Test_01_17()
+        {
+        }
+
+        [Fact]
+        public void Test_01_18()
+        {
+        }
+
+        [Fact]
+        public void Test_01_19()
+        {
+        }
+
+        [Fact]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_02_01()
+        {
+        }
+
+        [Fact]
+        public void Test_02_02()
+        {
+        }
+
+        [Fact]
+        public void Test_02_03()
+        {
+        }
+
+        [Fact]
+        public void Test_02_04()
+        {
+        }
+
+        [Fact]
+        public void Test_02_05()
+        {
+        }
+
+        [Fact]
+        public void Test_02_06()
+        {
+        }
+
+        [Fact]
+        public void Test_02_07()
+        {
+        }
+
+        [Fact]
+        public void Test_02_08()
+        {
+        }
+
+        [Fact]
+        public void Test_02_09()
+        {
+        }
+
+        [Fact]
+        public void Test_02_10()
+        {
+        }
+
+        [Fact]
+        public void Test_02_11()
+        {
+        }
+
+        [Fact]
+        public void Test_02_12()
+        {
+        }
+
+        [Fact]
+        public void Test_02_13()
+        {
+        }
+
+        [Fact]
+        public void Test_02_14()
+        {
+        }
+
+        [Fact]
+        public void Test_02_15()
+        {
+        }
+
+        [Fact]
+        public void Test_02_16()
+        {
+        }
+
+        [Fact]
+        public void Test_02_17()
+        {
+        }
+
+        [Fact]
+        public void Test_02_18()
+        {
+        }
+
+        [Fact]
+        public void Test_02_19()
+        {
+        }
+
+        [Fact]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_03_01()
+        {
+        }
+
+        [Fact]
+        public void Test_03_02()
+        {
+        }
+
+        [Fact]
+        public void Test_03_03()
+        {
+        }
+
+        [Fact]
+        public void Test_03_04()
+        {
+        }
+
+        [Fact]
+        public void Test_03_05()
+        {
+        }
+
+        [Fact]
+        public void Test_03_06()
+        {
+        }
+
+        [Fact]
+        public void Test_03_07()
+        {
+        }
+
+        [Fact]
+        public void Test_03_08()
+        {
+        }
+
+        [Fact]
+        public void Test_03_09()
+        {
+        }
+
+        [Fact]
+        public void Test_03_10()
+        {
+        }
+
+        [Fact]
+        public void Test_03_11()
+        {
+        }
+
+        [Fact]
+        public void Test_03_12()
+        {
+        }
+
+        [Fact]
+        public void Test_03_13()
+        {
+        }
+
+        [Fact]
+        public void Test_03_14()
+        {
+        }
+
+        [Fact]
+        public void Test_03_15()
+        {
+        }
+
+        [Fact]
+        public void Test_03_16()
+        {
+        }
+
+        [Fact]
+        public void Test_03_17()
+        {
+        }
+
+        [Fact]
+        public void Test_03_18()
+        {
+        }
+
+        [Fact]
+        public void Test_03_19()
+        {
+        }
+
+        [Fact]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_04_01()
+        {
+        }
+
+        [Fact]
+        public void Test_04_02()
+        {
+        }
+
+        [Fact]
+        public void Test_04_03()
+        {
+        }
+
+        [Fact]
+        public void Test_04_04()
+        {
+        }
+
+        [Fact]
+        public void Test_04_05()
+        {
+        }
+
+        [Fact]
+        public void Test_04_06()
+        {
+        }
+
+        [Fact]
+        public void Test_04_07()
+        {
+        }
+
+        [Fact]
+        public void Test_04_08()
+        {
+        }
+
+        [Fact]
+        public void Test_04_09()
+        {
+        }
+
+        [Fact]
+        public void Test_04_10()
+        {
+        }
+
+        [Fact]
+        public void Test_04_11()
+        {
+        }
+
+        [Fact]
+        public void Test_04_12()
+        {
+        }
+
+        [Fact]
+        public void Test_04_13()
+        {
+        }
+
+        [Fact]
+        public void Test_04_14()
+        {
+        }
+
+        [Fact]
+        public void Test_04_15()
+        {
+        }
+
+        [Fact]
+        public void Test_04_16()
+        {
+        }
+
+        [Fact]
+        public void Test_04_17()
+        {
+        }
+
+        [Fact]
+        public void Test_04_18()
+        {
+        }
+
+        [Fact]
+        public void Test_04_19()
+        {
+        }
+
+        [Fact]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_05_01()
+        {
+        }
+
+        [Fact]
+        public void Test_05_02()
+        {
+        }
+
+        [Fact]
+        public void Test_05_03()
+        {
+        }
+
+        [Fact]
+        public void Test_05_04()
+        {
+        }
+
+        [Fact]
+        public void Test_05_05()
+        {
+        }
+
+        [Fact]
+        public void Test_05_06()
+        {
+        }
+
+        [Fact]
+        public void Test_05_07()
+        {
+        }
+
+        [Fact]
+        public void Test_05_08()
+        {
+        }
+
+        [Fact]
+        public void Test_05_09()
+        {
+        }
+
+        [Fact]
+        public void Test_05_10()
+        {
+        }
+
+        [Fact]
+        public void Test_05_11()
+        {
+        }
+
+        [Fact]
+        public void Test_05_12()
+        {
+        }
+
+        [Fact]
+        public void Test_05_13()
+        {
+        }
+
+        [Fact]
+        public void Test_05_14()
+        {
+        }
+
+        [Fact]
+        public void Test_05_15()
+        {
+        }
+
+        [Fact]
+        public void Test_05_16()
+        {
+        }
+
+        [Fact]
+        public void Test_05_17()
+        {
+        }
+
+        [Fact]
+        public void Test_05_18()
+        {
+        }
+
+        [Fact]
+        public void Test_05_19()
+        {
+        }
+
+        [Fact]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/XUnit100Passing/XunitTests.tt b/test/TestAssets/performance/XUnit100Passing/XunitTests.tt
new file mode 100644
index 0000000000..0d05a30ff3
--- /dev/null
+++ b/test/TestAssets/performance/XUnit100Passing/XunitTests.tt
@@ -0,0 +1,55 @@
+using Xunit;
+
+namespace Tests
+{
+<#
+    int classes = 5;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj b/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj
new file mode 100644
index 0000000000..393eb3be00
--- /dev/null
+++ b/test/TestAssets/performance/XUnit10kPassing/XUnit10kPassing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="XunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>XunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="XunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>XunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/performance/XUnit10kPassing/XunitTests.cs b/test/TestAssets/performance/XUnit10kPassing/XunitTests.cs
new file mode 100644
index 0000000000..b91251de85
--- /dev/null
+++ b/test/TestAssets/performance/XUnit10kPassing/XunitTests.cs
@@ -0,0 +1,54005 @@
+using Xunit;
+
+namespace Tests
+{
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_01_01()
+        {
+        }
+
+        [Fact]
+        public void Test_01_02()
+        {
+        }
+
+        [Fact]
+        public void Test_01_03()
+        {
+        }
+
+        [Fact]
+        public void Test_01_04()
+        {
+        }
+
+        [Fact]
+        public void Test_01_05()
+        {
+        }
+
+        [Fact]
+        public void Test_01_06()
+        {
+        }
+
+        [Fact]
+        public void Test_01_07()
+        {
+        }
+
+        [Fact]
+        public void Test_01_08()
+        {
+        }
+
+        [Fact]
+        public void Test_01_09()
+        {
+        }
+
+        [Fact]
+        public void Test_01_10()
+        {
+        }
+
+        [Fact]
+        public void Test_01_11()
+        {
+        }
+
+        [Fact]
+        public void Test_01_12()
+        {
+        }
+
+        [Fact]
+        public void Test_01_13()
+        {
+        }
+
+        [Fact]
+        public void Test_01_14()
+        {
+        }
+
+        [Fact]
+        public void Test_01_15()
+        {
+        }
+
+        [Fact]
+        public void Test_01_16()
+        {
+        }
+
+        [Fact]
+        public void Test_01_17()
+        {
+        }
+
+        [Fact]
+        public void Test_01_18()
+        {
+        }
+
+        [Fact]
+        public void Test_01_19()
+        {
+        }
+
+        [Fact]
+        public void Test_01_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_02
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_02_01()
+        {
+        }
+
+        [Fact]
+        public void Test_02_02()
+        {
+        }
+
+        [Fact]
+        public void Test_02_03()
+        {
+        }
+
+        [Fact]
+        public void Test_02_04()
+        {
+        }
+
+        [Fact]
+        public void Test_02_05()
+        {
+        }
+
+        [Fact]
+        public void Test_02_06()
+        {
+        }
+
+        [Fact]
+        public void Test_02_07()
+        {
+        }
+
+        [Fact]
+        public void Test_02_08()
+        {
+        }
+
+        [Fact]
+        public void Test_02_09()
+        {
+        }
+
+        [Fact]
+        public void Test_02_10()
+        {
+        }
+
+        [Fact]
+        public void Test_02_11()
+        {
+        }
+
+        [Fact]
+        public void Test_02_12()
+        {
+        }
+
+        [Fact]
+        public void Test_02_13()
+        {
+        }
+
+        [Fact]
+        public void Test_02_14()
+        {
+        }
+
+        [Fact]
+        public void Test_02_15()
+        {
+        }
+
+        [Fact]
+        public void Test_02_16()
+        {
+        }
+
+        [Fact]
+        public void Test_02_17()
+        {
+        }
+
+        [Fact]
+        public void Test_02_18()
+        {
+        }
+
+        [Fact]
+        public void Test_02_19()
+        {
+        }
+
+        [Fact]
+        public void Test_02_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_03
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_03_01()
+        {
+        }
+
+        [Fact]
+        public void Test_03_02()
+        {
+        }
+
+        [Fact]
+        public void Test_03_03()
+        {
+        }
+
+        [Fact]
+        public void Test_03_04()
+        {
+        }
+
+        [Fact]
+        public void Test_03_05()
+        {
+        }
+
+        [Fact]
+        public void Test_03_06()
+        {
+        }
+
+        [Fact]
+        public void Test_03_07()
+        {
+        }
+
+        [Fact]
+        public void Test_03_08()
+        {
+        }
+
+        [Fact]
+        public void Test_03_09()
+        {
+        }
+
+        [Fact]
+        public void Test_03_10()
+        {
+        }
+
+        [Fact]
+        public void Test_03_11()
+        {
+        }
+
+        [Fact]
+        public void Test_03_12()
+        {
+        }
+
+        [Fact]
+        public void Test_03_13()
+        {
+        }
+
+        [Fact]
+        public void Test_03_14()
+        {
+        }
+
+        [Fact]
+        public void Test_03_15()
+        {
+        }
+
+        [Fact]
+        public void Test_03_16()
+        {
+        }
+
+        [Fact]
+        public void Test_03_17()
+        {
+        }
+
+        [Fact]
+        public void Test_03_18()
+        {
+        }
+
+        [Fact]
+        public void Test_03_19()
+        {
+        }
+
+        [Fact]
+        public void Test_03_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_04
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_04_01()
+        {
+        }
+
+        [Fact]
+        public void Test_04_02()
+        {
+        }
+
+        [Fact]
+        public void Test_04_03()
+        {
+        }
+
+        [Fact]
+        public void Test_04_04()
+        {
+        }
+
+        [Fact]
+        public void Test_04_05()
+        {
+        }
+
+        [Fact]
+        public void Test_04_06()
+        {
+        }
+
+        [Fact]
+        public void Test_04_07()
+        {
+        }
+
+        [Fact]
+        public void Test_04_08()
+        {
+        }
+
+        [Fact]
+        public void Test_04_09()
+        {
+        }
+
+        [Fact]
+        public void Test_04_10()
+        {
+        }
+
+        [Fact]
+        public void Test_04_11()
+        {
+        }
+
+        [Fact]
+        public void Test_04_12()
+        {
+        }
+
+        [Fact]
+        public void Test_04_13()
+        {
+        }
+
+        [Fact]
+        public void Test_04_14()
+        {
+        }
+
+        [Fact]
+        public void Test_04_15()
+        {
+        }
+
+        [Fact]
+        public void Test_04_16()
+        {
+        }
+
+        [Fact]
+        public void Test_04_17()
+        {
+        }
+
+        [Fact]
+        public void Test_04_18()
+        {
+        }
+
+        [Fact]
+        public void Test_04_19()
+        {
+        }
+
+        [Fact]
+        public void Test_04_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_05
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_05_01()
+        {
+        }
+
+        [Fact]
+        public void Test_05_02()
+        {
+        }
+
+        [Fact]
+        public void Test_05_03()
+        {
+        }
+
+        [Fact]
+        public void Test_05_04()
+        {
+        }
+
+        [Fact]
+        public void Test_05_05()
+        {
+        }
+
+        [Fact]
+        public void Test_05_06()
+        {
+        }
+
+        [Fact]
+        public void Test_05_07()
+        {
+        }
+
+        [Fact]
+        public void Test_05_08()
+        {
+        }
+
+        [Fact]
+        public void Test_05_09()
+        {
+        }
+
+        [Fact]
+        public void Test_05_10()
+        {
+        }
+
+        [Fact]
+        public void Test_05_11()
+        {
+        }
+
+        [Fact]
+        public void Test_05_12()
+        {
+        }
+
+        [Fact]
+        public void Test_05_13()
+        {
+        }
+
+        [Fact]
+        public void Test_05_14()
+        {
+        }
+
+        [Fact]
+        public void Test_05_15()
+        {
+        }
+
+        [Fact]
+        public void Test_05_16()
+        {
+        }
+
+        [Fact]
+        public void Test_05_17()
+        {
+        }
+
+        [Fact]
+        public void Test_05_18()
+        {
+        }
+
+        [Fact]
+        public void Test_05_19()
+        {
+        }
+
+        [Fact]
+        public void Test_05_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_06
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_06_01()
+        {
+        }
+
+        [Fact]
+        public void Test_06_02()
+        {
+        }
+
+        [Fact]
+        public void Test_06_03()
+        {
+        }
+
+        [Fact]
+        public void Test_06_04()
+        {
+        }
+
+        [Fact]
+        public void Test_06_05()
+        {
+        }
+
+        [Fact]
+        public void Test_06_06()
+        {
+        }
+
+        [Fact]
+        public void Test_06_07()
+        {
+        }
+
+        [Fact]
+        public void Test_06_08()
+        {
+        }
+
+        [Fact]
+        public void Test_06_09()
+        {
+        }
+
+        [Fact]
+        public void Test_06_10()
+        {
+        }
+
+        [Fact]
+        public void Test_06_11()
+        {
+        }
+
+        [Fact]
+        public void Test_06_12()
+        {
+        }
+
+        [Fact]
+        public void Test_06_13()
+        {
+        }
+
+        [Fact]
+        public void Test_06_14()
+        {
+        }
+
+        [Fact]
+        public void Test_06_15()
+        {
+        }
+
+        [Fact]
+        public void Test_06_16()
+        {
+        }
+
+        [Fact]
+        public void Test_06_17()
+        {
+        }
+
+        [Fact]
+        public void Test_06_18()
+        {
+        }
+
+        [Fact]
+        public void Test_06_19()
+        {
+        }
+
+        [Fact]
+        public void Test_06_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_07
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_07_01()
+        {
+        }
+
+        [Fact]
+        public void Test_07_02()
+        {
+        }
+
+        [Fact]
+        public void Test_07_03()
+        {
+        }
+
+        [Fact]
+        public void Test_07_04()
+        {
+        }
+
+        [Fact]
+        public void Test_07_05()
+        {
+        }
+
+        [Fact]
+        public void Test_07_06()
+        {
+        }
+
+        [Fact]
+        public void Test_07_07()
+        {
+        }
+
+        [Fact]
+        public void Test_07_08()
+        {
+        }
+
+        [Fact]
+        public void Test_07_09()
+        {
+        }
+
+        [Fact]
+        public void Test_07_10()
+        {
+        }
+
+        [Fact]
+        public void Test_07_11()
+        {
+        }
+
+        [Fact]
+        public void Test_07_12()
+        {
+        }
+
+        [Fact]
+        public void Test_07_13()
+        {
+        }
+
+        [Fact]
+        public void Test_07_14()
+        {
+        }
+
+        [Fact]
+        public void Test_07_15()
+        {
+        }
+
+        [Fact]
+        public void Test_07_16()
+        {
+        }
+
+        [Fact]
+        public void Test_07_17()
+        {
+        }
+
+        [Fact]
+        public void Test_07_18()
+        {
+        }
+
+        [Fact]
+        public void Test_07_19()
+        {
+        }
+
+        [Fact]
+        public void Test_07_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_08
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_08_01()
+        {
+        }
+
+        [Fact]
+        public void Test_08_02()
+        {
+        }
+
+        [Fact]
+        public void Test_08_03()
+        {
+        }
+
+        [Fact]
+        public void Test_08_04()
+        {
+        }
+
+        [Fact]
+        public void Test_08_05()
+        {
+        }
+
+        [Fact]
+        public void Test_08_06()
+        {
+        }
+
+        [Fact]
+        public void Test_08_07()
+        {
+        }
+
+        [Fact]
+        public void Test_08_08()
+        {
+        }
+
+        [Fact]
+        public void Test_08_09()
+        {
+        }
+
+        [Fact]
+        public void Test_08_10()
+        {
+        }
+
+        [Fact]
+        public void Test_08_11()
+        {
+        }
+
+        [Fact]
+        public void Test_08_12()
+        {
+        }
+
+        [Fact]
+        public void Test_08_13()
+        {
+        }
+
+        [Fact]
+        public void Test_08_14()
+        {
+        }
+
+        [Fact]
+        public void Test_08_15()
+        {
+        }
+
+        [Fact]
+        public void Test_08_16()
+        {
+        }
+
+        [Fact]
+        public void Test_08_17()
+        {
+        }
+
+        [Fact]
+        public void Test_08_18()
+        {
+        }
+
+        [Fact]
+        public void Test_08_19()
+        {
+        }
+
+        [Fact]
+        public void Test_08_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_09
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_09_01()
+        {
+        }
+
+        [Fact]
+        public void Test_09_02()
+        {
+        }
+
+        [Fact]
+        public void Test_09_03()
+        {
+        }
+
+        [Fact]
+        public void Test_09_04()
+        {
+        }
+
+        [Fact]
+        public void Test_09_05()
+        {
+        }
+
+        [Fact]
+        public void Test_09_06()
+        {
+        }
+
+        [Fact]
+        public void Test_09_07()
+        {
+        }
+
+        [Fact]
+        public void Test_09_08()
+        {
+        }
+
+        [Fact]
+        public void Test_09_09()
+        {
+        }
+
+        [Fact]
+        public void Test_09_10()
+        {
+        }
+
+        [Fact]
+        public void Test_09_11()
+        {
+        }
+
+        [Fact]
+        public void Test_09_12()
+        {
+        }
+
+        [Fact]
+        public void Test_09_13()
+        {
+        }
+
+        [Fact]
+        public void Test_09_14()
+        {
+        }
+
+        [Fact]
+        public void Test_09_15()
+        {
+        }
+
+        [Fact]
+        public void Test_09_16()
+        {
+        }
+
+        [Fact]
+        public void Test_09_17()
+        {
+        }
+
+        [Fact]
+        public void Test_09_18()
+        {
+        }
+
+        [Fact]
+        public void Test_09_19()
+        {
+        }
+
+        [Fact]
+        public void Test_09_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_10
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_10_01()
+        {
+        }
+
+        [Fact]
+        public void Test_10_02()
+        {
+        }
+
+        [Fact]
+        public void Test_10_03()
+        {
+        }
+
+        [Fact]
+        public void Test_10_04()
+        {
+        }
+
+        [Fact]
+        public void Test_10_05()
+        {
+        }
+
+        [Fact]
+        public void Test_10_06()
+        {
+        }
+
+        [Fact]
+        public void Test_10_07()
+        {
+        }
+
+        [Fact]
+        public void Test_10_08()
+        {
+        }
+
+        [Fact]
+        public void Test_10_09()
+        {
+        }
+
+        [Fact]
+        public void Test_10_10()
+        {
+        }
+
+        [Fact]
+        public void Test_10_11()
+        {
+        }
+
+        [Fact]
+        public void Test_10_12()
+        {
+        }
+
+        [Fact]
+        public void Test_10_13()
+        {
+        }
+
+        [Fact]
+        public void Test_10_14()
+        {
+        }
+
+        [Fact]
+        public void Test_10_15()
+        {
+        }
+
+        [Fact]
+        public void Test_10_16()
+        {
+        }
+
+        [Fact]
+        public void Test_10_17()
+        {
+        }
+
+        [Fact]
+        public void Test_10_18()
+        {
+        }
+
+        [Fact]
+        public void Test_10_19()
+        {
+        }
+
+        [Fact]
+        public void Test_10_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_11
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_11_01()
+        {
+        }
+
+        [Fact]
+        public void Test_11_02()
+        {
+        }
+
+        [Fact]
+        public void Test_11_03()
+        {
+        }
+
+        [Fact]
+        public void Test_11_04()
+        {
+        }
+
+        [Fact]
+        public void Test_11_05()
+        {
+        }
+
+        [Fact]
+        public void Test_11_06()
+        {
+        }
+
+        [Fact]
+        public void Test_11_07()
+        {
+        }
+
+        [Fact]
+        public void Test_11_08()
+        {
+        }
+
+        [Fact]
+        public void Test_11_09()
+        {
+        }
+
+        [Fact]
+        public void Test_11_10()
+        {
+        }
+
+        [Fact]
+        public void Test_11_11()
+        {
+        }
+
+        [Fact]
+        public void Test_11_12()
+        {
+        }
+
+        [Fact]
+        public void Test_11_13()
+        {
+        }
+
+        [Fact]
+        public void Test_11_14()
+        {
+        }
+
+        [Fact]
+        public void Test_11_15()
+        {
+        }
+
+        [Fact]
+        public void Test_11_16()
+        {
+        }
+
+        [Fact]
+        public void Test_11_17()
+        {
+        }
+
+        [Fact]
+        public void Test_11_18()
+        {
+        }
+
+        [Fact]
+        public void Test_11_19()
+        {
+        }
+
+        [Fact]
+        public void Test_11_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_12
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_12_01()
+        {
+        }
+
+        [Fact]
+        public void Test_12_02()
+        {
+        }
+
+        [Fact]
+        public void Test_12_03()
+        {
+        }
+
+        [Fact]
+        public void Test_12_04()
+        {
+        }
+
+        [Fact]
+        public void Test_12_05()
+        {
+        }
+
+        [Fact]
+        public void Test_12_06()
+        {
+        }
+
+        [Fact]
+        public void Test_12_07()
+        {
+        }
+
+        [Fact]
+        public void Test_12_08()
+        {
+        }
+
+        [Fact]
+        public void Test_12_09()
+        {
+        }
+
+        [Fact]
+        public void Test_12_10()
+        {
+        }
+
+        [Fact]
+        public void Test_12_11()
+        {
+        }
+
+        [Fact]
+        public void Test_12_12()
+        {
+        }
+
+        [Fact]
+        public void Test_12_13()
+        {
+        }
+
+        [Fact]
+        public void Test_12_14()
+        {
+        }
+
+        [Fact]
+        public void Test_12_15()
+        {
+        }
+
+        [Fact]
+        public void Test_12_16()
+        {
+        }
+
+        [Fact]
+        public void Test_12_17()
+        {
+        }
+
+        [Fact]
+        public void Test_12_18()
+        {
+        }
+
+        [Fact]
+        public void Test_12_19()
+        {
+        }
+
+        [Fact]
+        public void Test_12_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_13
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_13_01()
+        {
+        }
+
+        [Fact]
+        public void Test_13_02()
+        {
+        }
+
+        [Fact]
+        public void Test_13_03()
+        {
+        }
+
+        [Fact]
+        public void Test_13_04()
+        {
+        }
+
+        [Fact]
+        public void Test_13_05()
+        {
+        }
+
+        [Fact]
+        public void Test_13_06()
+        {
+        }
+
+        [Fact]
+        public void Test_13_07()
+        {
+        }
+
+        [Fact]
+        public void Test_13_08()
+        {
+        }
+
+        [Fact]
+        public void Test_13_09()
+        {
+        }
+
+        [Fact]
+        public void Test_13_10()
+        {
+        }
+
+        [Fact]
+        public void Test_13_11()
+        {
+        }
+
+        [Fact]
+        public void Test_13_12()
+        {
+        }
+
+        [Fact]
+        public void Test_13_13()
+        {
+        }
+
+        [Fact]
+        public void Test_13_14()
+        {
+        }
+
+        [Fact]
+        public void Test_13_15()
+        {
+        }
+
+        [Fact]
+        public void Test_13_16()
+        {
+        }
+
+        [Fact]
+        public void Test_13_17()
+        {
+        }
+
+        [Fact]
+        public void Test_13_18()
+        {
+        }
+
+        [Fact]
+        public void Test_13_19()
+        {
+        }
+
+        [Fact]
+        public void Test_13_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_14
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_14_01()
+        {
+        }
+
+        [Fact]
+        public void Test_14_02()
+        {
+        }
+
+        [Fact]
+        public void Test_14_03()
+        {
+        }
+
+        [Fact]
+        public void Test_14_04()
+        {
+        }
+
+        [Fact]
+        public void Test_14_05()
+        {
+        }
+
+        [Fact]
+        public void Test_14_06()
+        {
+        }
+
+        [Fact]
+        public void Test_14_07()
+        {
+        }
+
+        [Fact]
+        public void Test_14_08()
+        {
+        }
+
+        [Fact]
+        public void Test_14_09()
+        {
+        }
+
+        [Fact]
+        public void Test_14_10()
+        {
+        }
+
+        [Fact]
+        public void Test_14_11()
+        {
+        }
+
+        [Fact]
+        public void Test_14_12()
+        {
+        }
+
+        [Fact]
+        public void Test_14_13()
+        {
+        }
+
+        [Fact]
+        public void Test_14_14()
+        {
+        }
+
+        [Fact]
+        public void Test_14_15()
+        {
+        }
+
+        [Fact]
+        public void Test_14_16()
+        {
+        }
+
+        [Fact]
+        public void Test_14_17()
+        {
+        }
+
+        [Fact]
+        public void Test_14_18()
+        {
+        }
+
+        [Fact]
+        public void Test_14_19()
+        {
+        }
+
+        [Fact]
+        public void Test_14_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_15
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_15_01()
+        {
+        }
+
+        [Fact]
+        public void Test_15_02()
+        {
+        }
+
+        [Fact]
+        public void Test_15_03()
+        {
+        }
+
+        [Fact]
+        public void Test_15_04()
+        {
+        }
+
+        [Fact]
+        public void Test_15_05()
+        {
+        }
+
+        [Fact]
+        public void Test_15_06()
+        {
+        }
+
+        [Fact]
+        public void Test_15_07()
+        {
+        }
+
+        [Fact]
+        public void Test_15_08()
+        {
+        }
+
+        [Fact]
+        public void Test_15_09()
+        {
+        }
+
+        [Fact]
+        public void Test_15_10()
+        {
+        }
+
+        [Fact]
+        public void Test_15_11()
+        {
+        }
+
+        [Fact]
+        public void Test_15_12()
+        {
+        }
+
+        [Fact]
+        public void Test_15_13()
+        {
+        }
+
+        [Fact]
+        public void Test_15_14()
+        {
+        }
+
+        [Fact]
+        public void Test_15_15()
+        {
+        }
+
+        [Fact]
+        public void Test_15_16()
+        {
+        }
+
+        [Fact]
+        public void Test_15_17()
+        {
+        }
+
+        [Fact]
+        public void Test_15_18()
+        {
+        }
+
+        [Fact]
+        public void Test_15_19()
+        {
+        }
+
+        [Fact]
+        public void Test_15_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_16
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_16_01()
+        {
+        }
+
+        [Fact]
+        public void Test_16_02()
+        {
+        }
+
+        [Fact]
+        public void Test_16_03()
+        {
+        }
+
+        [Fact]
+        public void Test_16_04()
+        {
+        }
+
+        [Fact]
+        public void Test_16_05()
+        {
+        }
+
+        [Fact]
+        public void Test_16_06()
+        {
+        }
+
+        [Fact]
+        public void Test_16_07()
+        {
+        }
+
+        [Fact]
+        public void Test_16_08()
+        {
+        }
+
+        [Fact]
+        public void Test_16_09()
+        {
+        }
+
+        [Fact]
+        public void Test_16_10()
+        {
+        }
+
+        [Fact]
+        public void Test_16_11()
+        {
+        }
+
+        [Fact]
+        public void Test_16_12()
+        {
+        }
+
+        [Fact]
+        public void Test_16_13()
+        {
+        }
+
+        [Fact]
+        public void Test_16_14()
+        {
+        }
+
+        [Fact]
+        public void Test_16_15()
+        {
+        }
+
+        [Fact]
+        public void Test_16_16()
+        {
+        }
+
+        [Fact]
+        public void Test_16_17()
+        {
+        }
+
+        [Fact]
+        public void Test_16_18()
+        {
+        }
+
+        [Fact]
+        public void Test_16_19()
+        {
+        }
+
+        [Fact]
+        public void Test_16_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_17
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_17_01()
+        {
+        }
+
+        [Fact]
+        public void Test_17_02()
+        {
+        }
+
+        [Fact]
+        public void Test_17_03()
+        {
+        }
+
+        [Fact]
+        public void Test_17_04()
+        {
+        }
+
+        [Fact]
+        public void Test_17_05()
+        {
+        }
+
+        [Fact]
+        public void Test_17_06()
+        {
+        }
+
+        [Fact]
+        public void Test_17_07()
+        {
+        }
+
+        [Fact]
+        public void Test_17_08()
+        {
+        }
+
+        [Fact]
+        public void Test_17_09()
+        {
+        }
+
+        [Fact]
+        public void Test_17_10()
+        {
+        }
+
+        [Fact]
+        public void Test_17_11()
+        {
+        }
+
+        [Fact]
+        public void Test_17_12()
+        {
+        }
+
+        [Fact]
+        public void Test_17_13()
+        {
+        }
+
+        [Fact]
+        public void Test_17_14()
+        {
+        }
+
+        [Fact]
+        public void Test_17_15()
+        {
+        }
+
+        [Fact]
+        public void Test_17_16()
+        {
+        }
+
+        [Fact]
+        public void Test_17_17()
+        {
+        }
+
+        [Fact]
+        public void Test_17_18()
+        {
+        }
+
+        [Fact]
+        public void Test_17_19()
+        {
+        }
+
+        [Fact]
+        public void Test_17_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_18
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_18_01()
+        {
+        }
+
+        [Fact]
+        public void Test_18_02()
+        {
+        }
+
+        [Fact]
+        public void Test_18_03()
+        {
+        }
+
+        [Fact]
+        public void Test_18_04()
+        {
+        }
+
+        [Fact]
+        public void Test_18_05()
+        {
+        }
+
+        [Fact]
+        public void Test_18_06()
+        {
+        }
+
+        [Fact]
+        public void Test_18_07()
+        {
+        }
+
+        [Fact]
+        public void Test_18_08()
+        {
+        }
+
+        [Fact]
+        public void Test_18_09()
+        {
+        }
+
+        [Fact]
+        public void Test_18_10()
+        {
+        }
+
+        [Fact]
+        public void Test_18_11()
+        {
+        }
+
+        [Fact]
+        public void Test_18_12()
+        {
+        }
+
+        [Fact]
+        public void Test_18_13()
+        {
+        }
+
+        [Fact]
+        public void Test_18_14()
+        {
+        }
+
+        [Fact]
+        public void Test_18_15()
+        {
+        }
+
+        [Fact]
+        public void Test_18_16()
+        {
+        }
+
+        [Fact]
+        public void Test_18_17()
+        {
+        }
+
+        [Fact]
+        public void Test_18_18()
+        {
+        }
+
+        [Fact]
+        public void Test_18_19()
+        {
+        }
+
+        [Fact]
+        public void Test_18_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_19
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_19_01()
+        {
+        }
+
+        [Fact]
+        public void Test_19_02()
+        {
+        }
+
+        [Fact]
+        public void Test_19_03()
+        {
+        }
+
+        [Fact]
+        public void Test_19_04()
+        {
+        }
+
+        [Fact]
+        public void Test_19_05()
+        {
+        }
+
+        [Fact]
+        public void Test_19_06()
+        {
+        }
+
+        [Fact]
+        public void Test_19_07()
+        {
+        }
+
+        [Fact]
+        public void Test_19_08()
+        {
+        }
+
+        [Fact]
+        public void Test_19_09()
+        {
+        }
+
+        [Fact]
+        public void Test_19_10()
+        {
+        }
+
+        [Fact]
+        public void Test_19_11()
+        {
+        }
+
+        [Fact]
+        public void Test_19_12()
+        {
+        }
+
+        [Fact]
+        public void Test_19_13()
+        {
+        }
+
+        [Fact]
+        public void Test_19_14()
+        {
+        }
+
+        [Fact]
+        public void Test_19_15()
+        {
+        }
+
+        [Fact]
+        public void Test_19_16()
+        {
+        }
+
+        [Fact]
+        public void Test_19_17()
+        {
+        }
+
+        [Fact]
+        public void Test_19_18()
+        {
+        }
+
+        [Fact]
+        public void Test_19_19()
+        {
+        }
+
+        [Fact]
+        public void Test_19_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_20
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_20_01()
+        {
+        }
+
+        [Fact]
+        public void Test_20_02()
+        {
+        }
+
+        [Fact]
+        public void Test_20_03()
+        {
+        }
+
+        [Fact]
+        public void Test_20_04()
+        {
+        }
+
+        [Fact]
+        public void Test_20_05()
+        {
+        }
+
+        [Fact]
+        public void Test_20_06()
+        {
+        }
+
+        [Fact]
+        public void Test_20_07()
+        {
+        }
+
+        [Fact]
+        public void Test_20_08()
+        {
+        }
+
+        [Fact]
+        public void Test_20_09()
+        {
+        }
+
+        [Fact]
+        public void Test_20_10()
+        {
+        }
+
+        [Fact]
+        public void Test_20_11()
+        {
+        }
+
+        [Fact]
+        public void Test_20_12()
+        {
+        }
+
+        [Fact]
+        public void Test_20_13()
+        {
+        }
+
+        [Fact]
+        public void Test_20_14()
+        {
+        }
+
+        [Fact]
+        public void Test_20_15()
+        {
+        }
+
+        [Fact]
+        public void Test_20_16()
+        {
+        }
+
+        [Fact]
+        public void Test_20_17()
+        {
+        }
+
+        [Fact]
+        public void Test_20_18()
+        {
+        }
+
+        [Fact]
+        public void Test_20_19()
+        {
+        }
+
+        [Fact]
+        public void Test_20_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_21
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_21_01()
+        {
+        }
+
+        [Fact]
+        public void Test_21_02()
+        {
+        }
+
+        [Fact]
+        public void Test_21_03()
+        {
+        }
+
+        [Fact]
+        public void Test_21_04()
+        {
+        }
+
+        [Fact]
+        public void Test_21_05()
+        {
+        }
+
+        [Fact]
+        public void Test_21_06()
+        {
+        }
+
+        [Fact]
+        public void Test_21_07()
+        {
+        }
+
+        [Fact]
+        public void Test_21_08()
+        {
+        }
+
+        [Fact]
+        public void Test_21_09()
+        {
+        }
+
+        [Fact]
+        public void Test_21_10()
+        {
+        }
+
+        [Fact]
+        public void Test_21_11()
+        {
+        }
+
+        [Fact]
+        public void Test_21_12()
+        {
+        }
+
+        [Fact]
+        public void Test_21_13()
+        {
+        }
+
+        [Fact]
+        public void Test_21_14()
+        {
+        }
+
+        [Fact]
+        public void Test_21_15()
+        {
+        }
+
+        [Fact]
+        public void Test_21_16()
+        {
+        }
+
+        [Fact]
+        public void Test_21_17()
+        {
+        }
+
+        [Fact]
+        public void Test_21_18()
+        {
+        }
+
+        [Fact]
+        public void Test_21_19()
+        {
+        }
+
+        [Fact]
+        public void Test_21_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_22
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_22_01()
+        {
+        }
+
+        [Fact]
+        public void Test_22_02()
+        {
+        }
+
+        [Fact]
+        public void Test_22_03()
+        {
+        }
+
+        [Fact]
+        public void Test_22_04()
+        {
+        }
+
+        [Fact]
+        public void Test_22_05()
+        {
+        }
+
+        [Fact]
+        public void Test_22_06()
+        {
+        }
+
+        [Fact]
+        public void Test_22_07()
+        {
+        }
+
+        [Fact]
+        public void Test_22_08()
+        {
+        }
+
+        [Fact]
+        public void Test_22_09()
+        {
+        }
+
+        [Fact]
+        public void Test_22_10()
+        {
+        }
+
+        [Fact]
+        public void Test_22_11()
+        {
+        }
+
+        [Fact]
+        public void Test_22_12()
+        {
+        }
+
+        [Fact]
+        public void Test_22_13()
+        {
+        }
+
+        [Fact]
+        public void Test_22_14()
+        {
+        }
+
+        [Fact]
+        public void Test_22_15()
+        {
+        }
+
+        [Fact]
+        public void Test_22_16()
+        {
+        }
+
+        [Fact]
+        public void Test_22_17()
+        {
+        }
+
+        [Fact]
+        public void Test_22_18()
+        {
+        }
+
+        [Fact]
+        public void Test_22_19()
+        {
+        }
+
+        [Fact]
+        public void Test_22_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_23
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_23_01()
+        {
+        }
+
+        [Fact]
+        public void Test_23_02()
+        {
+        }
+
+        [Fact]
+        public void Test_23_03()
+        {
+        }
+
+        [Fact]
+        public void Test_23_04()
+        {
+        }
+
+        [Fact]
+        public void Test_23_05()
+        {
+        }
+
+        [Fact]
+        public void Test_23_06()
+        {
+        }
+
+        [Fact]
+        public void Test_23_07()
+        {
+        }
+
+        [Fact]
+        public void Test_23_08()
+        {
+        }
+
+        [Fact]
+        public void Test_23_09()
+        {
+        }
+
+        [Fact]
+        public void Test_23_10()
+        {
+        }
+
+        [Fact]
+        public void Test_23_11()
+        {
+        }
+
+        [Fact]
+        public void Test_23_12()
+        {
+        }
+
+        [Fact]
+        public void Test_23_13()
+        {
+        }
+
+        [Fact]
+        public void Test_23_14()
+        {
+        }
+
+        [Fact]
+        public void Test_23_15()
+        {
+        }
+
+        [Fact]
+        public void Test_23_16()
+        {
+        }
+
+        [Fact]
+        public void Test_23_17()
+        {
+        }
+
+        [Fact]
+        public void Test_23_18()
+        {
+        }
+
+        [Fact]
+        public void Test_23_19()
+        {
+        }
+
+        [Fact]
+        public void Test_23_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_24
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_24_01()
+        {
+        }
+
+        [Fact]
+        public void Test_24_02()
+        {
+        }
+
+        [Fact]
+        public void Test_24_03()
+        {
+        }
+
+        [Fact]
+        public void Test_24_04()
+        {
+        }
+
+        [Fact]
+        public void Test_24_05()
+        {
+        }
+
+        [Fact]
+        public void Test_24_06()
+        {
+        }
+
+        [Fact]
+        public void Test_24_07()
+        {
+        }
+
+        [Fact]
+        public void Test_24_08()
+        {
+        }
+
+        [Fact]
+        public void Test_24_09()
+        {
+        }
+
+        [Fact]
+        public void Test_24_10()
+        {
+        }
+
+        [Fact]
+        public void Test_24_11()
+        {
+        }
+
+        [Fact]
+        public void Test_24_12()
+        {
+        }
+
+        [Fact]
+        public void Test_24_13()
+        {
+        }
+
+        [Fact]
+        public void Test_24_14()
+        {
+        }
+
+        [Fact]
+        public void Test_24_15()
+        {
+        }
+
+        [Fact]
+        public void Test_24_16()
+        {
+        }
+
+        [Fact]
+        public void Test_24_17()
+        {
+        }
+
+        [Fact]
+        public void Test_24_18()
+        {
+        }
+
+        [Fact]
+        public void Test_24_19()
+        {
+        }
+
+        [Fact]
+        public void Test_24_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_25
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_25_01()
+        {
+        }
+
+        [Fact]
+        public void Test_25_02()
+        {
+        }
+
+        [Fact]
+        public void Test_25_03()
+        {
+        }
+
+        [Fact]
+        public void Test_25_04()
+        {
+        }
+
+        [Fact]
+        public void Test_25_05()
+        {
+        }
+
+        [Fact]
+        public void Test_25_06()
+        {
+        }
+
+        [Fact]
+        public void Test_25_07()
+        {
+        }
+
+        [Fact]
+        public void Test_25_08()
+        {
+        }
+
+        [Fact]
+        public void Test_25_09()
+        {
+        }
+
+        [Fact]
+        public void Test_25_10()
+        {
+        }
+
+        [Fact]
+        public void Test_25_11()
+        {
+        }
+
+        [Fact]
+        public void Test_25_12()
+        {
+        }
+
+        [Fact]
+        public void Test_25_13()
+        {
+        }
+
+        [Fact]
+        public void Test_25_14()
+        {
+        }
+
+        [Fact]
+        public void Test_25_15()
+        {
+        }
+
+        [Fact]
+        public void Test_25_16()
+        {
+        }
+
+        [Fact]
+        public void Test_25_17()
+        {
+        }
+
+        [Fact]
+        public void Test_25_18()
+        {
+        }
+
+        [Fact]
+        public void Test_25_19()
+        {
+        }
+
+        [Fact]
+        public void Test_25_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_26
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_26_01()
+        {
+        }
+
+        [Fact]
+        public void Test_26_02()
+        {
+        }
+
+        [Fact]
+        public void Test_26_03()
+        {
+        }
+
+        [Fact]
+        public void Test_26_04()
+        {
+        }
+
+        [Fact]
+        public void Test_26_05()
+        {
+        }
+
+        [Fact]
+        public void Test_26_06()
+        {
+        }
+
+        [Fact]
+        public void Test_26_07()
+        {
+        }
+
+        [Fact]
+        public void Test_26_08()
+        {
+        }
+
+        [Fact]
+        public void Test_26_09()
+        {
+        }
+
+        [Fact]
+        public void Test_26_10()
+        {
+        }
+
+        [Fact]
+        public void Test_26_11()
+        {
+        }
+
+        [Fact]
+        public void Test_26_12()
+        {
+        }
+
+        [Fact]
+        public void Test_26_13()
+        {
+        }
+
+        [Fact]
+        public void Test_26_14()
+        {
+        }
+
+        [Fact]
+        public void Test_26_15()
+        {
+        }
+
+        [Fact]
+        public void Test_26_16()
+        {
+        }
+
+        [Fact]
+        public void Test_26_17()
+        {
+        }
+
+        [Fact]
+        public void Test_26_18()
+        {
+        }
+
+        [Fact]
+        public void Test_26_19()
+        {
+        }
+
+        [Fact]
+        public void Test_26_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_27
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_27_01()
+        {
+        }
+
+        [Fact]
+        public void Test_27_02()
+        {
+        }
+
+        [Fact]
+        public void Test_27_03()
+        {
+        }
+
+        [Fact]
+        public void Test_27_04()
+        {
+        }
+
+        [Fact]
+        public void Test_27_05()
+        {
+        }
+
+        [Fact]
+        public void Test_27_06()
+        {
+        }
+
+        [Fact]
+        public void Test_27_07()
+        {
+        }
+
+        [Fact]
+        public void Test_27_08()
+        {
+        }
+
+        [Fact]
+        public void Test_27_09()
+        {
+        }
+
+        [Fact]
+        public void Test_27_10()
+        {
+        }
+
+        [Fact]
+        public void Test_27_11()
+        {
+        }
+
+        [Fact]
+        public void Test_27_12()
+        {
+        }
+
+        [Fact]
+        public void Test_27_13()
+        {
+        }
+
+        [Fact]
+        public void Test_27_14()
+        {
+        }
+
+        [Fact]
+        public void Test_27_15()
+        {
+        }
+
+        [Fact]
+        public void Test_27_16()
+        {
+        }
+
+        [Fact]
+        public void Test_27_17()
+        {
+        }
+
+        [Fact]
+        public void Test_27_18()
+        {
+        }
+
+        [Fact]
+        public void Test_27_19()
+        {
+        }
+
+        [Fact]
+        public void Test_27_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_28
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_28_01()
+        {
+        }
+
+        [Fact]
+        public void Test_28_02()
+        {
+        }
+
+        [Fact]
+        public void Test_28_03()
+        {
+        }
+
+        [Fact]
+        public void Test_28_04()
+        {
+        }
+
+        [Fact]
+        public void Test_28_05()
+        {
+        }
+
+        [Fact]
+        public void Test_28_06()
+        {
+        }
+
+        [Fact]
+        public void Test_28_07()
+        {
+        }
+
+        [Fact]
+        public void Test_28_08()
+        {
+        }
+
+        [Fact]
+        public void Test_28_09()
+        {
+        }
+
+        [Fact]
+        public void Test_28_10()
+        {
+        }
+
+        [Fact]
+        public void Test_28_11()
+        {
+        }
+
+        [Fact]
+        public void Test_28_12()
+        {
+        }
+
+        [Fact]
+        public void Test_28_13()
+        {
+        }
+
+        [Fact]
+        public void Test_28_14()
+        {
+        }
+
+        [Fact]
+        public void Test_28_15()
+        {
+        }
+
+        [Fact]
+        public void Test_28_16()
+        {
+        }
+
+        [Fact]
+        public void Test_28_17()
+        {
+        }
+
+        [Fact]
+        public void Test_28_18()
+        {
+        }
+
+        [Fact]
+        public void Test_28_19()
+        {
+        }
+
+        [Fact]
+        public void Test_28_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_29
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_29_01()
+        {
+        }
+
+        [Fact]
+        public void Test_29_02()
+        {
+        }
+
+        [Fact]
+        public void Test_29_03()
+        {
+        }
+
+        [Fact]
+        public void Test_29_04()
+        {
+        }
+
+        [Fact]
+        public void Test_29_05()
+        {
+        }
+
+        [Fact]
+        public void Test_29_06()
+        {
+        }
+
+        [Fact]
+        public void Test_29_07()
+        {
+        }
+
+        [Fact]
+        public void Test_29_08()
+        {
+        }
+
+        [Fact]
+        public void Test_29_09()
+        {
+        }
+
+        [Fact]
+        public void Test_29_10()
+        {
+        }
+
+        [Fact]
+        public void Test_29_11()
+        {
+        }
+
+        [Fact]
+        public void Test_29_12()
+        {
+        }
+
+        [Fact]
+        public void Test_29_13()
+        {
+        }
+
+        [Fact]
+        public void Test_29_14()
+        {
+        }
+
+        [Fact]
+        public void Test_29_15()
+        {
+        }
+
+        [Fact]
+        public void Test_29_16()
+        {
+        }
+
+        [Fact]
+        public void Test_29_17()
+        {
+        }
+
+        [Fact]
+        public void Test_29_18()
+        {
+        }
+
+        [Fact]
+        public void Test_29_19()
+        {
+        }
+
+        [Fact]
+        public void Test_29_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_30
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_30_01()
+        {
+        }
+
+        [Fact]
+        public void Test_30_02()
+        {
+        }
+
+        [Fact]
+        public void Test_30_03()
+        {
+        }
+
+        [Fact]
+        public void Test_30_04()
+        {
+        }
+
+        [Fact]
+        public void Test_30_05()
+        {
+        }
+
+        [Fact]
+        public void Test_30_06()
+        {
+        }
+
+        [Fact]
+        public void Test_30_07()
+        {
+        }
+
+        [Fact]
+        public void Test_30_08()
+        {
+        }
+
+        [Fact]
+        public void Test_30_09()
+        {
+        }
+
+        [Fact]
+        public void Test_30_10()
+        {
+        }
+
+        [Fact]
+        public void Test_30_11()
+        {
+        }
+
+        [Fact]
+        public void Test_30_12()
+        {
+        }
+
+        [Fact]
+        public void Test_30_13()
+        {
+        }
+
+        [Fact]
+        public void Test_30_14()
+        {
+        }
+
+        [Fact]
+        public void Test_30_15()
+        {
+        }
+
+        [Fact]
+        public void Test_30_16()
+        {
+        }
+
+        [Fact]
+        public void Test_30_17()
+        {
+        }
+
+        [Fact]
+        public void Test_30_18()
+        {
+        }
+
+        [Fact]
+        public void Test_30_19()
+        {
+        }
+
+        [Fact]
+        public void Test_30_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_31
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_31_01()
+        {
+        }
+
+        [Fact]
+        public void Test_31_02()
+        {
+        }
+
+        [Fact]
+        public void Test_31_03()
+        {
+        }
+
+        [Fact]
+        public void Test_31_04()
+        {
+        }
+
+        [Fact]
+        public void Test_31_05()
+        {
+        }
+
+        [Fact]
+        public void Test_31_06()
+        {
+        }
+
+        [Fact]
+        public void Test_31_07()
+        {
+        }
+
+        [Fact]
+        public void Test_31_08()
+        {
+        }
+
+        [Fact]
+        public void Test_31_09()
+        {
+        }
+
+        [Fact]
+        public void Test_31_10()
+        {
+        }
+
+        [Fact]
+        public void Test_31_11()
+        {
+        }
+
+        [Fact]
+        public void Test_31_12()
+        {
+        }
+
+        [Fact]
+        public void Test_31_13()
+        {
+        }
+
+        [Fact]
+        public void Test_31_14()
+        {
+        }
+
+        [Fact]
+        public void Test_31_15()
+        {
+        }
+
+        [Fact]
+        public void Test_31_16()
+        {
+        }
+
+        [Fact]
+        public void Test_31_17()
+        {
+        }
+
+        [Fact]
+        public void Test_31_18()
+        {
+        }
+
+        [Fact]
+        public void Test_31_19()
+        {
+        }
+
+        [Fact]
+        public void Test_31_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_32
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_32_01()
+        {
+        }
+
+        [Fact]
+        public void Test_32_02()
+        {
+        }
+
+        [Fact]
+        public void Test_32_03()
+        {
+        }
+
+        [Fact]
+        public void Test_32_04()
+        {
+        }
+
+        [Fact]
+        public void Test_32_05()
+        {
+        }
+
+        [Fact]
+        public void Test_32_06()
+        {
+        }
+
+        [Fact]
+        public void Test_32_07()
+        {
+        }
+
+        [Fact]
+        public void Test_32_08()
+        {
+        }
+
+        [Fact]
+        public void Test_32_09()
+        {
+        }
+
+        [Fact]
+        public void Test_32_10()
+        {
+        }
+
+        [Fact]
+        public void Test_32_11()
+        {
+        }
+
+        [Fact]
+        public void Test_32_12()
+        {
+        }
+
+        [Fact]
+        public void Test_32_13()
+        {
+        }
+
+        [Fact]
+        public void Test_32_14()
+        {
+        }
+
+        [Fact]
+        public void Test_32_15()
+        {
+        }
+
+        [Fact]
+        public void Test_32_16()
+        {
+        }
+
+        [Fact]
+        public void Test_32_17()
+        {
+        }
+
+        [Fact]
+        public void Test_32_18()
+        {
+        }
+
+        [Fact]
+        public void Test_32_19()
+        {
+        }
+
+        [Fact]
+        public void Test_32_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_33
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_33_01()
+        {
+        }
+
+        [Fact]
+        public void Test_33_02()
+        {
+        }
+
+        [Fact]
+        public void Test_33_03()
+        {
+        }
+
+        [Fact]
+        public void Test_33_04()
+        {
+        }
+
+        [Fact]
+        public void Test_33_05()
+        {
+        }
+
+        [Fact]
+        public void Test_33_06()
+        {
+        }
+
+        [Fact]
+        public void Test_33_07()
+        {
+        }
+
+        [Fact]
+        public void Test_33_08()
+        {
+        }
+
+        [Fact]
+        public void Test_33_09()
+        {
+        }
+
+        [Fact]
+        public void Test_33_10()
+        {
+        }
+
+        [Fact]
+        public void Test_33_11()
+        {
+        }
+
+        [Fact]
+        public void Test_33_12()
+        {
+        }
+
+        [Fact]
+        public void Test_33_13()
+        {
+        }
+
+        [Fact]
+        public void Test_33_14()
+        {
+        }
+
+        [Fact]
+        public void Test_33_15()
+        {
+        }
+
+        [Fact]
+        public void Test_33_16()
+        {
+        }
+
+        [Fact]
+        public void Test_33_17()
+        {
+        }
+
+        [Fact]
+        public void Test_33_18()
+        {
+        }
+
+        [Fact]
+        public void Test_33_19()
+        {
+        }
+
+        [Fact]
+        public void Test_33_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_34
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_34_01()
+        {
+        }
+
+        [Fact]
+        public void Test_34_02()
+        {
+        }
+
+        [Fact]
+        public void Test_34_03()
+        {
+        }
+
+        [Fact]
+        public void Test_34_04()
+        {
+        }
+
+        [Fact]
+        public void Test_34_05()
+        {
+        }
+
+        [Fact]
+        public void Test_34_06()
+        {
+        }
+
+        [Fact]
+        public void Test_34_07()
+        {
+        }
+
+        [Fact]
+        public void Test_34_08()
+        {
+        }
+
+        [Fact]
+        public void Test_34_09()
+        {
+        }
+
+        [Fact]
+        public void Test_34_10()
+        {
+        }
+
+        [Fact]
+        public void Test_34_11()
+        {
+        }
+
+        [Fact]
+        public void Test_34_12()
+        {
+        }
+
+        [Fact]
+        public void Test_34_13()
+        {
+        }
+
+        [Fact]
+        public void Test_34_14()
+        {
+        }
+
+        [Fact]
+        public void Test_34_15()
+        {
+        }
+
+        [Fact]
+        public void Test_34_16()
+        {
+        }
+
+        [Fact]
+        public void Test_34_17()
+        {
+        }
+
+        [Fact]
+        public void Test_34_18()
+        {
+        }
+
+        [Fact]
+        public void Test_34_19()
+        {
+        }
+
+        [Fact]
+        public void Test_34_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_35
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_35_01()
+        {
+        }
+
+        [Fact]
+        public void Test_35_02()
+        {
+        }
+
+        [Fact]
+        public void Test_35_03()
+        {
+        }
+
+        [Fact]
+        public void Test_35_04()
+        {
+        }
+
+        [Fact]
+        public void Test_35_05()
+        {
+        }
+
+        [Fact]
+        public void Test_35_06()
+        {
+        }
+
+        [Fact]
+        public void Test_35_07()
+        {
+        }
+
+        [Fact]
+        public void Test_35_08()
+        {
+        }
+
+        [Fact]
+        public void Test_35_09()
+        {
+        }
+
+        [Fact]
+        public void Test_35_10()
+        {
+        }
+
+        [Fact]
+        public void Test_35_11()
+        {
+        }
+
+        [Fact]
+        public void Test_35_12()
+        {
+        }
+
+        [Fact]
+        public void Test_35_13()
+        {
+        }
+
+        [Fact]
+        public void Test_35_14()
+        {
+        }
+
+        [Fact]
+        public void Test_35_15()
+        {
+        }
+
+        [Fact]
+        public void Test_35_16()
+        {
+        }
+
+        [Fact]
+        public void Test_35_17()
+        {
+        }
+
+        [Fact]
+        public void Test_35_18()
+        {
+        }
+
+        [Fact]
+        public void Test_35_19()
+        {
+        }
+
+        [Fact]
+        public void Test_35_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_36
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_36_01()
+        {
+        }
+
+        [Fact]
+        public void Test_36_02()
+        {
+        }
+
+        [Fact]
+        public void Test_36_03()
+        {
+        }
+
+        [Fact]
+        public void Test_36_04()
+        {
+        }
+
+        [Fact]
+        public void Test_36_05()
+        {
+        }
+
+        [Fact]
+        public void Test_36_06()
+        {
+        }
+
+        [Fact]
+        public void Test_36_07()
+        {
+        }
+
+        [Fact]
+        public void Test_36_08()
+        {
+        }
+
+        [Fact]
+        public void Test_36_09()
+        {
+        }
+
+        [Fact]
+        public void Test_36_10()
+        {
+        }
+
+        [Fact]
+        public void Test_36_11()
+        {
+        }
+
+        [Fact]
+        public void Test_36_12()
+        {
+        }
+
+        [Fact]
+        public void Test_36_13()
+        {
+        }
+
+        [Fact]
+        public void Test_36_14()
+        {
+        }
+
+        [Fact]
+        public void Test_36_15()
+        {
+        }
+
+        [Fact]
+        public void Test_36_16()
+        {
+        }
+
+        [Fact]
+        public void Test_36_17()
+        {
+        }
+
+        [Fact]
+        public void Test_36_18()
+        {
+        }
+
+        [Fact]
+        public void Test_36_19()
+        {
+        }
+
+        [Fact]
+        public void Test_36_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_37
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_37_01()
+        {
+        }
+
+        [Fact]
+        public void Test_37_02()
+        {
+        }
+
+        [Fact]
+        public void Test_37_03()
+        {
+        }
+
+        [Fact]
+        public void Test_37_04()
+        {
+        }
+
+        [Fact]
+        public void Test_37_05()
+        {
+        }
+
+        [Fact]
+        public void Test_37_06()
+        {
+        }
+
+        [Fact]
+        public void Test_37_07()
+        {
+        }
+
+        [Fact]
+        public void Test_37_08()
+        {
+        }
+
+        [Fact]
+        public void Test_37_09()
+        {
+        }
+
+        [Fact]
+        public void Test_37_10()
+        {
+        }
+
+        [Fact]
+        public void Test_37_11()
+        {
+        }
+
+        [Fact]
+        public void Test_37_12()
+        {
+        }
+
+        [Fact]
+        public void Test_37_13()
+        {
+        }
+
+        [Fact]
+        public void Test_37_14()
+        {
+        }
+
+        [Fact]
+        public void Test_37_15()
+        {
+        }
+
+        [Fact]
+        public void Test_37_16()
+        {
+        }
+
+        [Fact]
+        public void Test_37_17()
+        {
+        }
+
+        [Fact]
+        public void Test_37_18()
+        {
+        }
+
+        [Fact]
+        public void Test_37_19()
+        {
+        }
+
+        [Fact]
+        public void Test_37_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_38
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_38_01()
+        {
+        }
+
+        [Fact]
+        public void Test_38_02()
+        {
+        }
+
+        [Fact]
+        public void Test_38_03()
+        {
+        }
+
+        [Fact]
+        public void Test_38_04()
+        {
+        }
+
+        [Fact]
+        public void Test_38_05()
+        {
+        }
+
+        [Fact]
+        public void Test_38_06()
+        {
+        }
+
+        [Fact]
+        public void Test_38_07()
+        {
+        }
+
+        [Fact]
+        public void Test_38_08()
+        {
+        }
+
+        [Fact]
+        public void Test_38_09()
+        {
+        }
+
+        [Fact]
+        public void Test_38_10()
+        {
+        }
+
+        [Fact]
+        public void Test_38_11()
+        {
+        }
+
+        [Fact]
+        public void Test_38_12()
+        {
+        }
+
+        [Fact]
+        public void Test_38_13()
+        {
+        }
+
+        [Fact]
+        public void Test_38_14()
+        {
+        }
+
+        [Fact]
+        public void Test_38_15()
+        {
+        }
+
+        [Fact]
+        public void Test_38_16()
+        {
+        }
+
+        [Fact]
+        public void Test_38_17()
+        {
+        }
+
+        [Fact]
+        public void Test_38_18()
+        {
+        }
+
+        [Fact]
+        public void Test_38_19()
+        {
+        }
+
+        [Fact]
+        public void Test_38_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_39
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_39_01()
+        {
+        }
+
+        [Fact]
+        public void Test_39_02()
+        {
+        }
+
+        [Fact]
+        public void Test_39_03()
+        {
+        }
+
+        [Fact]
+        public void Test_39_04()
+        {
+        }
+
+        [Fact]
+        public void Test_39_05()
+        {
+        }
+
+        [Fact]
+        public void Test_39_06()
+        {
+        }
+
+        [Fact]
+        public void Test_39_07()
+        {
+        }
+
+        [Fact]
+        public void Test_39_08()
+        {
+        }
+
+        [Fact]
+        public void Test_39_09()
+        {
+        }
+
+        [Fact]
+        public void Test_39_10()
+        {
+        }
+
+        [Fact]
+        public void Test_39_11()
+        {
+        }
+
+        [Fact]
+        public void Test_39_12()
+        {
+        }
+
+        [Fact]
+        public void Test_39_13()
+        {
+        }
+
+        [Fact]
+        public void Test_39_14()
+        {
+        }
+
+        [Fact]
+        public void Test_39_15()
+        {
+        }
+
+        [Fact]
+        public void Test_39_16()
+        {
+        }
+
+        [Fact]
+        public void Test_39_17()
+        {
+        }
+
+        [Fact]
+        public void Test_39_18()
+        {
+        }
+
+        [Fact]
+        public void Test_39_19()
+        {
+        }
+
+        [Fact]
+        public void Test_39_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_40
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_40_01()
+        {
+        }
+
+        [Fact]
+        public void Test_40_02()
+        {
+        }
+
+        [Fact]
+        public void Test_40_03()
+        {
+        }
+
+        [Fact]
+        public void Test_40_04()
+        {
+        }
+
+        [Fact]
+        public void Test_40_05()
+        {
+        }
+
+        [Fact]
+        public void Test_40_06()
+        {
+        }
+
+        [Fact]
+        public void Test_40_07()
+        {
+        }
+
+        [Fact]
+        public void Test_40_08()
+        {
+        }
+
+        [Fact]
+        public void Test_40_09()
+        {
+        }
+
+        [Fact]
+        public void Test_40_10()
+        {
+        }
+
+        [Fact]
+        public void Test_40_11()
+        {
+        }
+
+        [Fact]
+        public void Test_40_12()
+        {
+        }
+
+        [Fact]
+        public void Test_40_13()
+        {
+        }
+
+        [Fact]
+        public void Test_40_14()
+        {
+        }
+
+        [Fact]
+        public void Test_40_15()
+        {
+        }
+
+        [Fact]
+        public void Test_40_16()
+        {
+        }
+
+        [Fact]
+        public void Test_40_17()
+        {
+        }
+
+        [Fact]
+        public void Test_40_18()
+        {
+        }
+
+        [Fact]
+        public void Test_40_19()
+        {
+        }
+
+        [Fact]
+        public void Test_40_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_41
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_41_01()
+        {
+        }
+
+        [Fact]
+        public void Test_41_02()
+        {
+        }
+
+        [Fact]
+        public void Test_41_03()
+        {
+        }
+
+        [Fact]
+        public void Test_41_04()
+        {
+        }
+
+        [Fact]
+        public void Test_41_05()
+        {
+        }
+
+        [Fact]
+        public void Test_41_06()
+        {
+        }
+
+        [Fact]
+        public void Test_41_07()
+        {
+        }
+
+        [Fact]
+        public void Test_41_08()
+        {
+        }
+
+        [Fact]
+        public void Test_41_09()
+        {
+        }
+
+        [Fact]
+        public void Test_41_10()
+        {
+        }
+
+        [Fact]
+        public void Test_41_11()
+        {
+        }
+
+        [Fact]
+        public void Test_41_12()
+        {
+        }
+
+        [Fact]
+        public void Test_41_13()
+        {
+        }
+
+        [Fact]
+        public void Test_41_14()
+        {
+        }
+
+        [Fact]
+        public void Test_41_15()
+        {
+        }
+
+        [Fact]
+        public void Test_41_16()
+        {
+        }
+
+        [Fact]
+        public void Test_41_17()
+        {
+        }
+
+        [Fact]
+        public void Test_41_18()
+        {
+        }
+
+        [Fact]
+        public void Test_41_19()
+        {
+        }
+
+        [Fact]
+        public void Test_41_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_42
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_42_01()
+        {
+        }
+
+        [Fact]
+        public void Test_42_02()
+        {
+        }
+
+        [Fact]
+        public void Test_42_03()
+        {
+        }
+
+        [Fact]
+        public void Test_42_04()
+        {
+        }
+
+        [Fact]
+        public void Test_42_05()
+        {
+        }
+
+        [Fact]
+        public void Test_42_06()
+        {
+        }
+
+        [Fact]
+        public void Test_42_07()
+        {
+        }
+
+        [Fact]
+        public void Test_42_08()
+        {
+        }
+
+        [Fact]
+        public void Test_42_09()
+        {
+        }
+
+        [Fact]
+        public void Test_42_10()
+        {
+        }
+
+        [Fact]
+        public void Test_42_11()
+        {
+        }
+
+        [Fact]
+        public void Test_42_12()
+        {
+        }
+
+        [Fact]
+        public void Test_42_13()
+        {
+        }
+
+        [Fact]
+        public void Test_42_14()
+        {
+        }
+
+        [Fact]
+        public void Test_42_15()
+        {
+        }
+
+        [Fact]
+        public void Test_42_16()
+        {
+        }
+
+        [Fact]
+        public void Test_42_17()
+        {
+        }
+
+        [Fact]
+        public void Test_42_18()
+        {
+        }
+
+        [Fact]
+        public void Test_42_19()
+        {
+        }
+
+        [Fact]
+        public void Test_42_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_43
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_43_01()
+        {
+        }
+
+        [Fact]
+        public void Test_43_02()
+        {
+        }
+
+        [Fact]
+        public void Test_43_03()
+        {
+        }
+
+        [Fact]
+        public void Test_43_04()
+        {
+        }
+
+        [Fact]
+        public void Test_43_05()
+        {
+        }
+
+        [Fact]
+        public void Test_43_06()
+        {
+        }
+
+        [Fact]
+        public void Test_43_07()
+        {
+        }
+
+        [Fact]
+        public void Test_43_08()
+        {
+        }
+
+        [Fact]
+        public void Test_43_09()
+        {
+        }
+
+        [Fact]
+        public void Test_43_10()
+        {
+        }
+
+        [Fact]
+        public void Test_43_11()
+        {
+        }
+
+        [Fact]
+        public void Test_43_12()
+        {
+        }
+
+        [Fact]
+        public void Test_43_13()
+        {
+        }
+
+        [Fact]
+        public void Test_43_14()
+        {
+        }
+
+        [Fact]
+        public void Test_43_15()
+        {
+        }
+
+        [Fact]
+        public void Test_43_16()
+        {
+        }
+
+        [Fact]
+        public void Test_43_17()
+        {
+        }
+
+        [Fact]
+        public void Test_43_18()
+        {
+        }
+
+        [Fact]
+        public void Test_43_19()
+        {
+        }
+
+        [Fact]
+        public void Test_43_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_44
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_44_01()
+        {
+        }
+
+        [Fact]
+        public void Test_44_02()
+        {
+        }
+
+        [Fact]
+        public void Test_44_03()
+        {
+        }
+
+        [Fact]
+        public void Test_44_04()
+        {
+        }
+
+        [Fact]
+        public void Test_44_05()
+        {
+        }
+
+        [Fact]
+        public void Test_44_06()
+        {
+        }
+
+        [Fact]
+        public void Test_44_07()
+        {
+        }
+
+        [Fact]
+        public void Test_44_08()
+        {
+        }
+
+        [Fact]
+        public void Test_44_09()
+        {
+        }
+
+        [Fact]
+        public void Test_44_10()
+        {
+        }
+
+        [Fact]
+        public void Test_44_11()
+        {
+        }
+
+        [Fact]
+        public void Test_44_12()
+        {
+        }
+
+        [Fact]
+        public void Test_44_13()
+        {
+        }
+
+        [Fact]
+        public void Test_44_14()
+        {
+        }
+
+        [Fact]
+        public void Test_44_15()
+        {
+        }
+
+        [Fact]
+        public void Test_44_16()
+        {
+        }
+
+        [Fact]
+        public void Test_44_17()
+        {
+        }
+
+        [Fact]
+        public void Test_44_18()
+        {
+        }
+
+        [Fact]
+        public void Test_44_19()
+        {
+        }
+
+        [Fact]
+        public void Test_44_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_45
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_45_01()
+        {
+        }
+
+        [Fact]
+        public void Test_45_02()
+        {
+        }
+
+        [Fact]
+        public void Test_45_03()
+        {
+        }
+
+        [Fact]
+        public void Test_45_04()
+        {
+        }
+
+        [Fact]
+        public void Test_45_05()
+        {
+        }
+
+        [Fact]
+        public void Test_45_06()
+        {
+        }
+
+        [Fact]
+        public void Test_45_07()
+        {
+        }
+
+        [Fact]
+        public void Test_45_08()
+        {
+        }
+
+        [Fact]
+        public void Test_45_09()
+        {
+        }
+
+        [Fact]
+        public void Test_45_10()
+        {
+        }
+
+        [Fact]
+        public void Test_45_11()
+        {
+        }
+
+        [Fact]
+        public void Test_45_12()
+        {
+        }
+
+        [Fact]
+        public void Test_45_13()
+        {
+        }
+
+        [Fact]
+        public void Test_45_14()
+        {
+        }
+
+        [Fact]
+        public void Test_45_15()
+        {
+        }
+
+        [Fact]
+        public void Test_45_16()
+        {
+        }
+
+        [Fact]
+        public void Test_45_17()
+        {
+        }
+
+        [Fact]
+        public void Test_45_18()
+        {
+        }
+
+        [Fact]
+        public void Test_45_19()
+        {
+        }
+
+        [Fact]
+        public void Test_45_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_46
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_46_01()
+        {
+        }
+
+        [Fact]
+        public void Test_46_02()
+        {
+        }
+
+        [Fact]
+        public void Test_46_03()
+        {
+        }
+
+        [Fact]
+        public void Test_46_04()
+        {
+        }
+
+        [Fact]
+        public void Test_46_05()
+        {
+        }
+
+        [Fact]
+        public void Test_46_06()
+        {
+        }
+
+        [Fact]
+        public void Test_46_07()
+        {
+        }
+
+        [Fact]
+        public void Test_46_08()
+        {
+        }
+
+        [Fact]
+        public void Test_46_09()
+        {
+        }
+
+        [Fact]
+        public void Test_46_10()
+        {
+        }
+
+        [Fact]
+        public void Test_46_11()
+        {
+        }
+
+        [Fact]
+        public void Test_46_12()
+        {
+        }
+
+        [Fact]
+        public void Test_46_13()
+        {
+        }
+
+        [Fact]
+        public void Test_46_14()
+        {
+        }
+
+        [Fact]
+        public void Test_46_15()
+        {
+        }
+
+        [Fact]
+        public void Test_46_16()
+        {
+        }
+
+        [Fact]
+        public void Test_46_17()
+        {
+        }
+
+        [Fact]
+        public void Test_46_18()
+        {
+        }
+
+        [Fact]
+        public void Test_46_19()
+        {
+        }
+
+        [Fact]
+        public void Test_46_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_47
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_47_01()
+        {
+        }
+
+        [Fact]
+        public void Test_47_02()
+        {
+        }
+
+        [Fact]
+        public void Test_47_03()
+        {
+        }
+
+        [Fact]
+        public void Test_47_04()
+        {
+        }
+
+        [Fact]
+        public void Test_47_05()
+        {
+        }
+
+        [Fact]
+        public void Test_47_06()
+        {
+        }
+
+        [Fact]
+        public void Test_47_07()
+        {
+        }
+
+        [Fact]
+        public void Test_47_08()
+        {
+        }
+
+        [Fact]
+        public void Test_47_09()
+        {
+        }
+
+        [Fact]
+        public void Test_47_10()
+        {
+        }
+
+        [Fact]
+        public void Test_47_11()
+        {
+        }
+
+        [Fact]
+        public void Test_47_12()
+        {
+        }
+
+        [Fact]
+        public void Test_47_13()
+        {
+        }
+
+        [Fact]
+        public void Test_47_14()
+        {
+        }
+
+        [Fact]
+        public void Test_47_15()
+        {
+        }
+
+        [Fact]
+        public void Test_47_16()
+        {
+        }
+
+        [Fact]
+        public void Test_47_17()
+        {
+        }
+
+        [Fact]
+        public void Test_47_18()
+        {
+        }
+
+        [Fact]
+        public void Test_47_19()
+        {
+        }
+
+        [Fact]
+        public void Test_47_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_48
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_48_01()
+        {
+        }
+
+        [Fact]
+        public void Test_48_02()
+        {
+        }
+
+        [Fact]
+        public void Test_48_03()
+        {
+        }
+
+        [Fact]
+        public void Test_48_04()
+        {
+        }
+
+        [Fact]
+        public void Test_48_05()
+        {
+        }
+
+        [Fact]
+        public void Test_48_06()
+        {
+        }
+
+        [Fact]
+        public void Test_48_07()
+        {
+        }
+
+        [Fact]
+        public void Test_48_08()
+        {
+        }
+
+        [Fact]
+        public void Test_48_09()
+        {
+        }
+
+        [Fact]
+        public void Test_48_10()
+        {
+        }
+
+        [Fact]
+        public void Test_48_11()
+        {
+        }
+
+        [Fact]
+        public void Test_48_12()
+        {
+        }
+
+        [Fact]
+        public void Test_48_13()
+        {
+        }
+
+        [Fact]
+        public void Test_48_14()
+        {
+        }
+
+        [Fact]
+        public void Test_48_15()
+        {
+        }
+
+        [Fact]
+        public void Test_48_16()
+        {
+        }
+
+        [Fact]
+        public void Test_48_17()
+        {
+        }
+
+        [Fact]
+        public void Test_48_18()
+        {
+        }
+
+        [Fact]
+        public void Test_48_19()
+        {
+        }
+
+        [Fact]
+        public void Test_48_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_49
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_49_01()
+        {
+        }
+
+        [Fact]
+        public void Test_49_02()
+        {
+        }
+
+        [Fact]
+        public void Test_49_03()
+        {
+        }
+
+        [Fact]
+        public void Test_49_04()
+        {
+        }
+
+        [Fact]
+        public void Test_49_05()
+        {
+        }
+
+        [Fact]
+        public void Test_49_06()
+        {
+        }
+
+        [Fact]
+        public void Test_49_07()
+        {
+        }
+
+        [Fact]
+        public void Test_49_08()
+        {
+        }
+
+        [Fact]
+        public void Test_49_09()
+        {
+        }
+
+        [Fact]
+        public void Test_49_10()
+        {
+        }
+
+        [Fact]
+        public void Test_49_11()
+        {
+        }
+
+        [Fact]
+        public void Test_49_12()
+        {
+        }
+
+        [Fact]
+        public void Test_49_13()
+        {
+        }
+
+        [Fact]
+        public void Test_49_14()
+        {
+        }
+
+        [Fact]
+        public void Test_49_15()
+        {
+        }
+
+        [Fact]
+        public void Test_49_16()
+        {
+        }
+
+        [Fact]
+        public void Test_49_17()
+        {
+        }
+
+        [Fact]
+        public void Test_49_18()
+        {
+        }
+
+        [Fact]
+        public void Test_49_19()
+        {
+        }
+
+        [Fact]
+        public void Test_49_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_50
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_50_01()
+        {
+        }
+
+        [Fact]
+        public void Test_50_02()
+        {
+        }
+
+        [Fact]
+        public void Test_50_03()
+        {
+        }
+
+        [Fact]
+        public void Test_50_04()
+        {
+        }
+
+        [Fact]
+        public void Test_50_05()
+        {
+        }
+
+        [Fact]
+        public void Test_50_06()
+        {
+        }
+
+        [Fact]
+        public void Test_50_07()
+        {
+        }
+
+        [Fact]
+        public void Test_50_08()
+        {
+        }
+
+        [Fact]
+        public void Test_50_09()
+        {
+        }
+
+        [Fact]
+        public void Test_50_10()
+        {
+        }
+
+        [Fact]
+        public void Test_50_11()
+        {
+        }
+
+        [Fact]
+        public void Test_50_12()
+        {
+        }
+
+        [Fact]
+        public void Test_50_13()
+        {
+        }
+
+        [Fact]
+        public void Test_50_14()
+        {
+        }
+
+        [Fact]
+        public void Test_50_15()
+        {
+        }
+
+        [Fact]
+        public void Test_50_16()
+        {
+        }
+
+        [Fact]
+        public void Test_50_17()
+        {
+        }
+
+        [Fact]
+        public void Test_50_18()
+        {
+        }
+
+        [Fact]
+        public void Test_50_19()
+        {
+        }
+
+        [Fact]
+        public void Test_50_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_51
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_51_01()
+        {
+        }
+
+        [Fact]
+        public void Test_51_02()
+        {
+        }
+
+        [Fact]
+        public void Test_51_03()
+        {
+        }
+
+        [Fact]
+        public void Test_51_04()
+        {
+        }
+
+        [Fact]
+        public void Test_51_05()
+        {
+        }
+
+        [Fact]
+        public void Test_51_06()
+        {
+        }
+
+        [Fact]
+        public void Test_51_07()
+        {
+        }
+
+        [Fact]
+        public void Test_51_08()
+        {
+        }
+
+        [Fact]
+        public void Test_51_09()
+        {
+        }
+
+        [Fact]
+        public void Test_51_10()
+        {
+        }
+
+        [Fact]
+        public void Test_51_11()
+        {
+        }
+
+        [Fact]
+        public void Test_51_12()
+        {
+        }
+
+        [Fact]
+        public void Test_51_13()
+        {
+        }
+
+        [Fact]
+        public void Test_51_14()
+        {
+        }
+
+        [Fact]
+        public void Test_51_15()
+        {
+        }
+
+        [Fact]
+        public void Test_51_16()
+        {
+        }
+
+        [Fact]
+        public void Test_51_17()
+        {
+        }
+
+        [Fact]
+        public void Test_51_18()
+        {
+        }
+
+        [Fact]
+        public void Test_51_19()
+        {
+        }
+
+        [Fact]
+        public void Test_51_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_52
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_52_01()
+        {
+        }
+
+        [Fact]
+        public void Test_52_02()
+        {
+        }
+
+        [Fact]
+        public void Test_52_03()
+        {
+        }
+
+        [Fact]
+        public void Test_52_04()
+        {
+        }
+
+        [Fact]
+        public void Test_52_05()
+        {
+        }
+
+        [Fact]
+        public void Test_52_06()
+        {
+        }
+
+        [Fact]
+        public void Test_52_07()
+        {
+        }
+
+        [Fact]
+        public void Test_52_08()
+        {
+        }
+
+        [Fact]
+        public void Test_52_09()
+        {
+        }
+
+        [Fact]
+        public void Test_52_10()
+        {
+        }
+
+        [Fact]
+        public void Test_52_11()
+        {
+        }
+
+        [Fact]
+        public void Test_52_12()
+        {
+        }
+
+        [Fact]
+        public void Test_52_13()
+        {
+        }
+
+        [Fact]
+        public void Test_52_14()
+        {
+        }
+
+        [Fact]
+        public void Test_52_15()
+        {
+        }
+
+        [Fact]
+        public void Test_52_16()
+        {
+        }
+
+        [Fact]
+        public void Test_52_17()
+        {
+        }
+
+        [Fact]
+        public void Test_52_18()
+        {
+        }
+
+        [Fact]
+        public void Test_52_19()
+        {
+        }
+
+        [Fact]
+        public void Test_52_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_53
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_53_01()
+        {
+        }
+
+        [Fact]
+        public void Test_53_02()
+        {
+        }
+
+        [Fact]
+        public void Test_53_03()
+        {
+        }
+
+        [Fact]
+        public void Test_53_04()
+        {
+        }
+
+        [Fact]
+        public void Test_53_05()
+        {
+        }
+
+        [Fact]
+        public void Test_53_06()
+        {
+        }
+
+        [Fact]
+        public void Test_53_07()
+        {
+        }
+
+        [Fact]
+        public void Test_53_08()
+        {
+        }
+
+        [Fact]
+        public void Test_53_09()
+        {
+        }
+
+        [Fact]
+        public void Test_53_10()
+        {
+        }
+
+        [Fact]
+        public void Test_53_11()
+        {
+        }
+
+        [Fact]
+        public void Test_53_12()
+        {
+        }
+
+        [Fact]
+        public void Test_53_13()
+        {
+        }
+
+        [Fact]
+        public void Test_53_14()
+        {
+        }
+
+        [Fact]
+        public void Test_53_15()
+        {
+        }
+
+        [Fact]
+        public void Test_53_16()
+        {
+        }
+
+        [Fact]
+        public void Test_53_17()
+        {
+        }
+
+        [Fact]
+        public void Test_53_18()
+        {
+        }
+
+        [Fact]
+        public void Test_53_19()
+        {
+        }
+
+        [Fact]
+        public void Test_53_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_54
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_54_01()
+        {
+        }
+
+        [Fact]
+        public void Test_54_02()
+        {
+        }
+
+        [Fact]
+        public void Test_54_03()
+        {
+        }
+
+        [Fact]
+        public void Test_54_04()
+        {
+        }
+
+        [Fact]
+        public void Test_54_05()
+        {
+        }
+
+        [Fact]
+        public void Test_54_06()
+        {
+        }
+
+        [Fact]
+        public void Test_54_07()
+        {
+        }
+
+        [Fact]
+        public void Test_54_08()
+        {
+        }
+
+        [Fact]
+        public void Test_54_09()
+        {
+        }
+
+        [Fact]
+        public void Test_54_10()
+        {
+        }
+
+        [Fact]
+        public void Test_54_11()
+        {
+        }
+
+        [Fact]
+        public void Test_54_12()
+        {
+        }
+
+        [Fact]
+        public void Test_54_13()
+        {
+        }
+
+        [Fact]
+        public void Test_54_14()
+        {
+        }
+
+        [Fact]
+        public void Test_54_15()
+        {
+        }
+
+        [Fact]
+        public void Test_54_16()
+        {
+        }
+
+        [Fact]
+        public void Test_54_17()
+        {
+        }
+
+        [Fact]
+        public void Test_54_18()
+        {
+        }
+
+        [Fact]
+        public void Test_54_19()
+        {
+        }
+
+        [Fact]
+        public void Test_54_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_55
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_55_01()
+        {
+        }
+
+        [Fact]
+        public void Test_55_02()
+        {
+        }
+
+        [Fact]
+        public void Test_55_03()
+        {
+        }
+
+        [Fact]
+        public void Test_55_04()
+        {
+        }
+
+        [Fact]
+        public void Test_55_05()
+        {
+        }
+
+        [Fact]
+        public void Test_55_06()
+        {
+        }
+
+        [Fact]
+        public void Test_55_07()
+        {
+        }
+
+        [Fact]
+        public void Test_55_08()
+        {
+        }
+
+        [Fact]
+        public void Test_55_09()
+        {
+        }
+
+        [Fact]
+        public void Test_55_10()
+        {
+        }
+
+        [Fact]
+        public void Test_55_11()
+        {
+        }
+
+        [Fact]
+        public void Test_55_12()
+        {
+        }
+
+        [Fact]
+        public void Test_55_13()
+        {
+        }
+
+        [Fact]
+        public void Test_55_14()
+        {
+        }
+
+        [Fact]
+        public void Test_55_15()
+        {
+        }
+
+        [Fact]
+        public void Test_55_16()
+        {
+        }
+
+        [Fact]
+        public void Test_55_17()
+        {
+        }
+
+        [Fact]
+        public void Test_55_18()
+        {
+        }
+
+        [Fact]
+        public void Test_55_19()
+        {
+        }
+
+        [Fact]
+        public void Test_55_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_56
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_56_01()
+        {
+        }
+
+        [Fact]
+        public void Test_56_02()
+        {
+        }
+
+        [Fact]
+        public void Test_56_03()
+        {
+        }
+
+        [Fact]
+        public void Test_56_04()
+        {
+        }
+
+        [Fact]
+        public void Test_56_05()
+        {
+        }
+
+        [Fact]
+        public void Test_56_06()
+        {
+        }
+
+        [Fact]
+        public void Test_56_07()
+        {
+        }
+
+        [Fact]
+        public void Test_56_08()
+        {
+        }
+
+        [Fact]
+        public void Test_56_09()
+        {
+        }
+
+        [Fact]
+        public void Test_56_10()
+        {
+        }
+
+        [Fact]
+        public void Test_56_11()
+        {
+        }
+
+        [Fact]
+        public void Test_56_12()
+        {
+        }
+
+        [Fact]
+        public void Test_56_13()
+        {
+        }
+
+        [Fact]
+        public void Test_56_14()
+        {
+        }
+
+        [Fact]
+        public void Test_56_15()
+        {
+        }
+
+        [Fact]
+        public void Test_56_16()
+        {
+        }
+
+        [Fact]
+        public void Test_56_17()
+        {
+        }
+
+        [Fact]
+        public void Test_56_18()
+        {
+        }
+
+        [Fact]
+        public void Test_56_19()
+        {
+        }
+
+        [Fact]
+        public void Test_56_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_57
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_57_01()
+        {
+        }
+
+        [Fact]
+        public void Test_57_02()
+        {
+        }
+
+        [Fact]
+        public void Test_57_03()
+        {
+        }
+
+        [Fact]
+        public void Test_57_04()
+        {
+        }
+
+        [Fact]
+        public void Test_57_05()
+        {
+        }
+
+        [Fact]
+        public void Test_57_06()
+        {
+        }
+
+        [Fact]
+        public void Test_57_07()
+        {
+        }
+
+        [Fact]
+        public void Test_57_08()
+        {
+        }
+
+        [Fact]
+        public void Test_57_09()
+        {
+        }
+
+        [Fact]
+        public void Test_57_10()
+        {
+        }
+
+        [Fact]
+        public void Test_57_11()
+        {
+        }
+
+        [Fact]
+        public void Test_57_12()
+        {
+        }
+
+        [Fact]
+        public void Test_57_13()
+        {
+        }
+
+        [Fact]
+        public void Test_57_14()
+        {
+        }
+
+        [Fact]
+        public void Test_57_15()
+        {
+        }
+
+        [Fact]
+        public void Test_57_16()
+        {
+        }
+
+        [Fact]
+        public void Test_57_17()
+        {
+        }
+
+        [Fact]
+        public void Test_57_18()
+        {
+        }
+
+        [Fact]
+        public void Test_57_19()
+        {
+        }
+
+        [Fact]
+        public void Test_57_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_58
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_58_01()
+        {
+        }
+
+        [Fact]
+        public void Test_58_02()
+        {
+        }
+
+        [Fact]
+        public void Test_58_03()
+        {
+        }
+
+        [Fact]
+        public void Test_58_04()
+        {
+        }
+
+        [Fact]
+        public void Test_58_05()
+        {
+        }
+
+        [Fact]
+        public void Test_58_06()
+        {
+        }
+
+        [Fact]
+        public void Test_58_07()
+        {
+        }
+
+        [Fact]
+        public void Test_58_08()
+        {
+        }
+
+        [Fact]
+        public void Test_58_09()
+        {
+        }
+
+        [Fact]
+        public void Test_58_10()
+        {
+        }
+
+        [Fact]
+        public void Test_58_11()
+        {
+        }
+
+        [Fact]
+        public void Test_58_12()
+        {
+        }
+
+        [Fact]
+        public void Test_58_13()
+        {
+        }
+
+        [Fact]
+        public void Test_58_14()
+        {
+        }
+
+        [Fact]
+        public void Test_58_15()
+        {
+        }
+
+        [Fact]
+        public void Test_58_16()
+        {
+        }
+
+        [Fact]
+        public void Test_58_17()
+        {
+        }
+
+        [Fact]
+        public void Test_58_18()
+        {
+        }
+
+        [Fact]
+        public void Test_58_19()
+        {
+        }
+
+        [Fact]
+        public void Test_58_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_59
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_59_01()
+        {
+        }
+
+        [Fact]
+        public void Test_59_02()
+        {
+        }
+
+        [Fact]
+        public void Test_59_03()
+        {
+        }
+
+        [Fact]
+        public void Test_59_04()
+        {
+        }
+
+        [Fact]
+        public void Test_59_05()
+        {
+        }
+
+        [Fact]
+        public void Test_59_06()
+        {
+        }
+
+        [Fact]
+        public void Test_59_07()
+        {
+        }
+
+        [Fact]
+        public void Test_59_08()
+        {
+        }
+
+        [Fact]
+        public void Test_59_09()
+        {
+        }
+
+        [Fact]
+        public void Test_59_10()
+        {
+        }
+
+        [Fact]
+        public void Test_59_11()
+        {
+        }
+
+        [Fact]
+        public void Test_59_12()
+        {
+        }
+
+        [Fact]
+        public void Test_59_13()
+        {
+        }
+
+        [Fact]
+        public void Test_59_14()
+        {
+        }
+
+        [Fact]
+        public void Test_59_15()
+        {
+        }
+
+        [Fact]
+        public void Test_59_16()
+        {
+        }
+
+        [Fact]
+        public void Test_59_17()
+        {
+        }
+
+        [Fact]
+        public void Test_59_18()
+        {
+        }
+
+        [Fact]
+        public void Test_59_19()
+        {
+        }
+
+        [Fact]
+        public void Test_59_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_60
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_60_01()
+        {
+        }
+
+        [Fact]
+        public void Test_60_02()
+        {
+        }
+
+        [Fact]
+        public void Test_60_03()
+        {
+        }
+
+        [Fact]
+        public void Test_60_04()
+        {
+        }
+
+        [Fact]
+        public void Test_60_05()
+        {
+        }
+
+        [Fact]
+        public void Test_60_06()
+        {
+        }
+
+        [Fact]
+        public void Test_60_07()
+        {
+        }
+
+        [Fact]
+        public void Test_60_08()
+        {
+        }
+
+        [Fact]
+        public void Test_60_09()
+        {
+        }
+
+        [Fact]
+        public void Test_60_10()
+        {
+        }
+
+        [Fact]
+        public void Test_60_11()
+        {
+        }
+
+        [Fact]
+        public void Test_60_12()
+        {
+        }
+
+        [Fact]
+        public void Test_60_13()
+        {
+        }
+
+        [Fact]
+        public void Test_60_14()
+        {
+        }
+
+        [Fact]
+        public void Test_60_15()
+        {
+        }
+
+        [Fact]
+        public void Test_60_16()
+        {
+        }
+
+        [Fact]
+        public void Test_60_17()
+        {
+        }
+
+        [Fact]
+        public void Test_60_18()
+        {
+        }
+
+        [Fact]
+        public void Test_60_19()
+        {
+        }
+
+        [Fact]
+        public void Test_60_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_61
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_61_01()
+        {
+        }
+
+        [Fact]
+        public void Test_61_02()
+        {
+        }
+
+        [Fact]
+        public void Test_61_03()
+        {
+        }
+
+        [Fact]
+        public void Test_61_04()
+        {
+        }
+
+        [Fact]
+        public void Test_61_05()
+        {
+        }
+
+        [Fact]
+        public void Test_61_06()
+        {
+        }
+
+        [Fact]
+        public void Test_61_07()
+        {
+        }
+
+        [Fact]
+        public void Test_61_08()
+        {
+        }
+
+        [Fact]
+        public void Test_61_09()
+        {
+        }
+
+        [Fact]
+        public void Test_61_10()
+        {
+        }
+
+        [Fact]
+        public void Test_61_11()
+        {
+        }
+
+        [Fact]
+        public void Test_61_12()
+        {
+        }
+
+        [Fact]
+        public void Test_61_13()
+        {
+        }
+
+        [Fact]
+        public void Test_61_14()
+        {
+        }
+
+        [Fact]
+        public void Test_61_15()
+        {
+        }
+
+        [Fact]
+        public void Test_61_16()
+        {
+        }
+
+        [Fact]
+        public void Test_61_17()
+        {
+        }
+
+        [Fact]
+        public void Test_61_18()
+        {
+        }
+
+        [Fact]
+        public void Test_61_19()
+        {
+        }
+
+        [Fact]
+        public void Test_61_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_62
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_62_01()
+        {
+        }
+
+        [Fact]
+        public void Test_62_02()
+        {
+        }
+
+        [Fact]
+        public void Test_62_03()
+        {
+        }
+
+        [Fact]
+        public void Test_62_04()
+        {
+        }
+
+        [Fact]
+        public void Test_62_05()
+        {
+        }
+
+        [Fact]
+        public void Test_62_06()
+        {
+        }
+
+        [Fact]
+        public void Test_62_07()
+        {
+        }
+
+        [Fact]
+        public void Test_62_08()
+        {
+        }
+
+        [Fact]
+        public void Test_62_09()
+        {
+        }
+
+        [Fact]
+        public void Test_62_10()
+        {
+        }
+
+        [Fact]
+        public void Test_62_11()
+        {
+        }
+
+        [Fact]
+        public void Test_62_12()
+        {
+        }
+
+        [Fact]
+        public void Test_62_13()
+        {
+        }
+
+        [Fact]
+        public void Test_62_14()
+        {
+        }
+
+        [Fact]
+        public void Test_62_15()
+        {
+        }
+
+        [Fact]
+        public void Test_62_16()
+        {
+        }
+
+        [Fact]
+        public void Test_62_17()
+        {
+        }
+
+        [Fact]
+        public void Test_62_18()
+        {
+        }
+
+        [Fact]
+        public void Test_62_19()
+        {
+        }
+
+        [Fact]
+        public void Test_62_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_63
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_63_01()
+        {
+        }
+
+        [Fact]
+        public void Test_63_02()
+        {
+        }
+
+        [Fact]
+        public void Test_63_03()
+        {
+        }
+
+        [Fact]
+        public void Test_63_04()
+        {
+        }
+
+        [Fact]
+        public void Test_63_05()
+        {
+        }
+
+        [Fact]
+        public void Test_63_06()
+        {
+        }
+
+        [Fact]
+        public void Test_63_07()
+        {
+        }
+
+        [Fact]
+        public void Test_63_08()
+        {
+        }
+
+        [Fact]
+        public void Test_63_09()
+        {
+        }
+
+        [Fact]
+        public void Test_63_10()
+        {
+        }
+
+        [Fact]
+        public void Test_63_11()
+        {
+        }
+
+        [Fact]
+        public void Test_63_12()
+        {
+        }
+
+        [Fact]
+        public void Test_63_13()
+        {
+        }
+
+        [Fact]
+        public void Test_63_14()
+        {
+        }
+
+        [Fact]
+        public void Test_63_15()
+        {
+        }
+
+        [Fact]
+        public void Test_63_16()
+        {
+        }
+
+        [Fact]
+        public void Test_63_17()
+        {
+        }
+
+        [Fact]
+        public void Test_63_18()
+        {
+        }
+
+        [Fact]
+        public void Test_63_19()
+        {
+        }
+
+        [Fact]
+        public void Test_63_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_64
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_64_01()
+        {
+        }
+
+        [Fact]
+        public void Test_64_02()
+        {
+        }
+
+        [Fact]
+        public void Test_64_03()
+        {
+        }
+
+        [Fact]
+        public void Test_64_04()
+        {
+        }
+
+        [Fact]
+        public void Test_64_05()
+        {
+        }
+
+        [Fact]
+        public void Test_64_06()
+        {
+        }
+
+        [Fact]
+        public void Test_64_07()
+        {
+        }
+
+        [Fact]
+        public void Test_64_08()
+        {
+        }
+
+        [Fact]
+        public void Test_64_09()
+        {
+        }
+
+        [Fact]
+        public void Test_64_10()
+        {
+        }
+
+        [Fact]
+        public void Test_64_11()
+        {
+        }
+
+        [Fact]
+        public void Test_64_12()
+        {
+        }
+
+        [Fact]
+        public void Test_64_13()
+        {
+        }
+
+        [Fact]
+        public void Test_64_14()
+        {
+        }
+
+        [Fact]
+        public void Test_64_15()
+        {
+        }
+
+        [Fact]
+        public void Test_64_16()
+        {
+        }
+
+        [Fact]
+        public void Test_64_17()
+        {
+        }
+
+        [Fact]
+        public void Test_64_18()
+        {
+        }
+
+        [Fact]
+        public void Test_64_19()
+        {
+        }
+
+        [Fact]
+        public void Test_64_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_65
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_65_01()
+        {
+        }
+
+        [Fact]
+        public void Test_65_02()
+        {
+        }
+
+        [Fact]
+        public void Test_65_03()
+        {
+        }
+
+        [Fact]
+        public void Test_65_04()
+        {
+        }
+
+        [Fact]
+        public void Test_65_05()
+        {
+        }
+
+        [Fact]
+        public void Test_65_06()
+        {
+        }
+
+        [Fact]
+        public void Test_65_07()
+        {
+        }
+
+        [Fact]
+        public void Test_65_08()
+        {
+        }
+
+        [Fact]
+        public void Test_65_09()
+        {
+        }
+
+        [Fact]
+        public void Test_65_10()
+        {
+        }
+
+        [Fact]
+        public void Test_65_11()
+        {
+        }
+
+        [Fact]
+        public void Test_65_12()
+        {
+        }
+
+        [Fact]
+        public void Test_65_13()
+        {
+        }
+
+        [Fact]
+        public void Test_65_14()
+        {
+        }
+
+        [Fact]
+        public void Test_65_15()
+        {
+        }
+
+        [Fact]
+        public void Test_65_16()
+        {
+        }
+
+        [Fact]
+        public void Test_65_17()
+        {
+        }
+
+        [Fact]
+        public void Test_65_18()
+        {
+        }
+
+        [Fact]
+        public void Test_65_19()
+        {
+        }
+
+        [Fact]
+        public void Test_65_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_66
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_66_01()
+        {
+        }
+
+        [Fact]
+        public void Test_66_02()
+        {
+        }
+
+        [Fact]
+        public void Test_66_03()
+        {
+        }
+
+        [Fact]
+        public void Test_66_04()
+        {
+        }
+
+        [Fact]
+        public void Test_66_05()
+        {
+        }
+
+        [Fact]
+        public void Test_66_06()
+        {
+        }
+
+        [Fact]
+        public void Test_66_07()
+        {
+        }
+
+        [Fact]
+        public void Test_66_08()
+        {
+        }
+
+        [Fact]
+        public void Test_66_09()
+        {
+        }
+
+        [Fact]
+        public void Test_66_10()
+        {
+        }
+
+        [Fact]
+        public void Test_66_11()
+        {
+        }
+
+        [Fact]
+        public void Test_66_12()
+        {
+        }
+
+        [Fact]
+        public void Test_66_13()
+        {
+        }
+
+        [Fact]
+        public void Test_66_14()
+        {
+        }
+
+        [Fact]
+        public void Test_66_15()
+        {
+        }
+
+        [Fact]
+        public void Test_66_16()
+        {
+        }
+
+        [Fact]
+        public void Test_66_17()
+        {
+        }
+
+        [Fact]
+        public void Test_66_18()
+        {
+        }
+
+        [Fact]
+        public void Test_66_19()
+        {
+        }
+
+        [Fact]
+        public void Test_66_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_67
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_67_01()
+        {
+        }
+
+        [Fact]
+        public void Test_67_02()
+        {
+        }
+
+        [Fact]
+        public void Test_67_03()
+        {
+        }
+
+        [Fact]
+        public void Test_67_04()
+        {
+        }
+
+        [Fact]
+        public void Test_67_05()
+        {
+        }
+
+        [Fact]
+        public void Test_67_06()
+        {
+        }
+
+        [Fact]
+        public void Test_67_07()
+        {
+        }
+
+        [Fact]
+        public void Test_67_08()
+        {
+        }
+
+        [Fact]
+        public void Test_67_09()
+        {
+        }
+
+        [Fact]
+        public void Test_67_10()
+        {
+        }
+
+        [Fact]
+        public void Test_67_11()
+        {
+        }
+
+        [Fact]
+        public void Test_67_12()
+        {
+        }
+
+        [Fact]
+        public void Test_67_13()
+        {
+        }
+
+        [Fact]
+        public void Test_67_14()
+        {
+        }
+
+        [Fact]
+        public void Test_67_15()
+        {
+        }
+
+        [Fact]
+        public void Test_67_16()
+        {
+        }
+
+        [Fact]
+        public void Test_67_17()
+        {
+        }
+
+        [Fact]
+        public void Test_67_18()
+        {
+        }
+
+        [Fact]
+        public void Test_67_19()
+        {
+        }
+
+        [Fact]
+        public void Test_67_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_68
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_68_01()
+        {
+        }
+
+        [Fact]
+        public void Test_68_02()
+        {
+        }
+
+        [Fact]
+        public void Test_68_03()
+        {
+        }
+
+        [Fact]
+        public void Test_68_04()
+        {
+        }
+
+        [Fact]
+        public void Test_68_05()
+        {
+        }
+
+        [Fact]
+        public void Test_68_06()
+        {
+        }
+
+        [Fact]
+        public void Test_68_07()
+        {
+        }
+
+        [Fact]
+        public void Test_68_08()
+        {
+        }
+
+        [Fact]
+        public void Test_68_09()
+        {
+        }
+
+        [Fact]
+        public void Test_68_10()
+        {
+        }
+
+        [Fact]
+        public void Test_68_11()
+        {
+        }
+
+        [Fact]
+        public void Test_68_12()
+        {
+        }
+
+        [Fact]
+        public void Test_68_13()
+        {
+        }
+
+        [Fact]
+        public void Test_68_14()
+        {
+        }
+
+        [Fact]
+        public void Test_68_15()
+        {
+        }
+
+        [Fact]
+        public void Test_68_16()
+        {
+        }
+
+        [Fact]
+        public void Test_68_17()
+        {
+        }
+
+        [Fact]
+        public void Test_68_18()
+        {
+        }
+
+        [Fact]
+        public void Test_68_19()
+        {
+        }
+
+        [Fact]
+        public void Test_68_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_69
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_69_01()
+        {
+        }
+
+        [Fact]
+        public void Test_69_02()
+        {
+        }
+
+        [Fact]
+        public void Test_69_03()
+        {
+        }
+
+        [Fact]
+        public void Test_69_04()
+        {
+        }
+
+        [Fact]
+        public void Test_69_05()
+        {
+        }
+
+        [Fact]
+        public void Test_69_06()
+        {
+        }
+
+        [Fact]
+        public void Test_69_07()
+        {
+        }
+
+        [Fact]
+        public void Test_69_08()
+        {
+        }
+
+        [Fact]
+        public void Test_69_09()
+        {
+        }
+
+        [Fact]
+        public void Test_69_10()
+        {
+        }
+
+        [Fact]
+        public void Test_69_11()
+        {
+        }
+
+        [Fact]
+        public void Test_69_12()
+        {
+        }
+
+        [Fact]
+        public void Test_69_13()
+        {
+        }
+
+        [Fact]
+        public void Test_69_14()
+        {
+        }
+
+        [Fact]
+        public void Test_69_15()
+        {
+        }
+
+        [Fact]
+        public void Test_69_16()
+        {
+        }
+
+        [Fact]
+        public void Test_69_17()
+        {
+        }
+
+        [Fact]
+        public void Test_69_18()
+        {
+        }
+
+        [Fact]
+        public void Test_69_19()
+        {
+        }
+
+        [Fact]
+        public void Test_69_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_70
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_70_01()
+        {
+        }
+
+        [Fact]
+        public void Test_70_02()
+        {
+        }
+
+        [Fact]
+        public void Test_70_03()
+        {
+        }
+
+        [Fact]
+        public void Test_70_04()
+        {
+        }
+
+        [Fact]
+        public void Test_70_05()
+        {
+        }
+
+        [Fact]
+        public void Test_70_06()
+        {
+        }
+
+        [Fact]
+        public void Test_70_07()
+        {
+        }
+
+        [Fact]
+        public void Test_70_08()
+        {
+        }
+
+        [Fact]
+        public void Test_70_09()
+        {
+        }
+
+        [Fact]
+        public void Test_70_10()
+        {
+        }
+
+        [Fact]
+        public void Test_70_11()
+        {
+        }
+
+        [Fact]
+        public void Test_70_12()
+        {
+        }
+
+        [Fact]
+        public void Test_70_13()
+        {
+        }
+
+        [Fact]
+        public void Test_70_14()
+        {
+        }
+
+        [Fact]
+        public void Test_70_15()
+        {
+        }
+
+        [Fact]
+        public void Test_70_16()
+        {
+        }
+
+        [Fact]
+        public void Test_70_17()
+        {
+        }
+
+        [Fact]
+        public void Test_70_18()
+        {
+        }
+
+        [Fact]
+        public void Test_70_19()
+        {
+        }
+
+        [Fact]
+        public void Test_70_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_71
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_71_01()
+        {
+        }
+
+        [Fact]
+        public void Test_71_02()
+        {
+        }
+
+        [Fact]
+        public void Test_71_03()
+        {
+        }
+
+        [Fact]
+        public void Test_71_04()
+        {
+        }
+
+        [Fact]
+        public void Test_71_05()
+        {
+        }
+
+        [Fact]
+        public void Test_71_06()
+        {
+        }
+
+        [Fact]
+        public void Test_71_07()
+        {
+        }
+
+        [Fact]
+        public void Test_71_08()
+        {
+        }
+
+        [Fact]
+        public void Test_71_09()
+        {
+        }
+
+        [Fact]
+        public void Test_71_10()
+        {
+        }
+
+        [Fact]
+        public void Test_71_11()
+        {
+        }
+
+        [Fact]
+        public void Test_71_12()
+        {
+        }
+
+        [Fact]
+        public void Test_71_13()
+        {
+        }
+
+        [Fact]
+        public void Test_71_14()
+        {
+        }
+
+        [Fact]
+        public void Test_71_15()
+        {
+        }
+
+        [Fact]
+        public void Test_71_16()
+        {
+        }
+
+        [Fact]
+        public void Test_71_17()
+        {
+        }
+
+        [Fact]
+        public void Test_71_18()
+        {
+        }
+
+        [Fact]
+        public void Test_71_19()
+        {
+        }
+
+        [Fact]
+        public void Test_71_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_72
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_72_01()
+        {
+        }
+
+        [Fact]
+        public void Test_72_02()
+        {
+        }
+
+        [Fact]
+        public void Test_72_03()
+        {
+        }
+
+        [Fact]
+        public void Test_72_04()
+        {
+        }
+
+        [Fact]
+        public void Test_72_05()
+        {
+        }
+
+        [Fact]
+        public void Test_72_06()
+        {
+        }
+
+        [Fact]
+        public void Test_72_07()
+        {
+        }
+
+        [Fact]
+        public void Test_72_08()
+        {
+        }
+
+        [Fact]
+        public void Test_72_09()
+        {
+        }
+
+        [Fact]
+        public void Test_72_10()
+        {
+        }
+
+        [Fact]
+        public void Test_72_11()
+        {
+        }
+
+        [Fact]
+        public void Test_72_12()
+        {
+        }
+
+        [Fact]
+        public void Test_72_13()
+        {
+        }
+
+        [Fact]
+        public void Test_72_14()
+        {
+        }
+
+        [Fact]
+        public void Test_72_15()
+        {
+        }
+
+        [Fact]
+        public void Test_72_16()
+        {
+        }
+
+        [Fact]
+        public void Test_72_17()
+        {
+        }
+
+        [Fact]
+        public void Test_72_18()
+        {
+        }
+
+        [Fact]
+        public void Test_72_19()
+        {
+        }
+
+        [Fact]
+        public void Test_72_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_73
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_73_01()
+        {
+        }
+
+        [Fact]
+        public void Test_73_02()
+        {
+        }
+
+        [Fact]
+        public void Test_73_03()
+        {
+        }
+
+        [Fact]
+        public void Test_73_04()
+        {
+        }
+
+        [Fact]
+        public void Test_73_05()
+        {
+        }
+
+        [Fact]
+        public void Test_73_06()
+        {
+        }
+
+        [Fact]
+        public void Test_73_07()
+        {
+        }
+
+        [Fact]
+        public void Test_73_08()
+        {
+        }
+
+        [Fact]
+        public void Test_73_09()
+        {
+        }
+
+        [Fact]
+        public void Test_73_10()
+        {
+        }
+
+        [Fact]
+        public void Test_73_11()
+        {
+        }
+
+        [Fact]
+        public void Test_73_12()
+        {
+        }
+
+        [Fact]
+        public void Test_73_13()
+        {
+        }
+
+        [Fact]
+        public void Test_73_14()
+        {
+        }
+
+        [Fact]
+        public void Test_73_15()
+        {
+        }
+
+        [Fact]
+        public void Test_73_16()
+        {
+        }
+
+        [Fact]
+        public void Test_73_17()
+        {
+        }
+
+        [Fact]
+        public void Test_73_18()
+        {
+        }
+
+        [Fact]
+        public void Test_73_19()
+        {
+        }
+
+        [Fact]
+        public void Test_73_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_74
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_74_01()
+        {
+        }
+
+        [Fact]
+        public void Test_74_02()
+        {
+        }
+
+        [Fact]
+        public void Test_74_03()
+        {
+        }
+
+        [Fact]
+        public void Test_74_04()
+        {
+        }
+
+        [Fact]
+        public void Test_74_05()
+        {
+        }
+
+        [Fact]
+        public void Test_74_06()
+        {
+        }
+
+        [Fact]
+        public void Test_74_07()
+        {
+        }
+
+        [Fact]
+        public void Test_74_08()
+        {
+        }
+
+        [Fact]
+        public void Test_74_09()
+        {
+        }
+
+        [Fact]
+        public void Test_74_10()
+        {
+        }
+
+        [Fact]
+        public void Test_74_11()
+        {
+        }
+
+        [Fact]
+        public void Test_74_12()
+        {
+        }
+
+        [Fact]
+        public void Test_74_13()
+        {
+        }
+
+        [Fact]
+        public void Test_74_14()
+        {
+        }
+
+        [Fact]
+        public void Test_74_15()
+        {
+        }
+
+        [Fact]
+        public void Test_74_16()
+        {
+        }
+
+        [Fact]
+        public void Test_74_17()
+        {
+        }
+
+        [Fact]
+        public void Test_74_18()
+        {
+        }
+
+        [Fact]
+        public void Test_74_19()
+        {
+        }
+
+        [Fact]
+        public void Test_74_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_75
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_75_01()
+        {
+        }
+
+        [Fact]
+        public void Test_75_02()
+        {
+        }
+
+        [Fact]
+        public void Test_75_03()
+        {
+        }
+
+        [Fact]
+        public void Test_75_04()
+        {
+        }
+
+        [Fact]
+        public void Test_75_05()
+        {
+        }
+
+        [Fact]
+        public void Test_75_06()
+        {
+        }
+
+        [Fact]
+        public void Test_75_07()
+        {
+        }
+
+        [Fact]
+        public void Test_75_08()
+        {
+        }
+
+        [Fact]
+        public void Test_75_09()
+        {
+        }
+
+        [Fact]
+        public void Test_75_10()
+        {
+        }
+
+        [Fact]
+        public void Test_75_11()
+        {
+        }
+
+        [Fact]
+        public void Test_75_12()
+        {
+        }
+
+        [Fact]
+        public void Test_75_13()
+        {
+        }
+
+        [Fact]
+        public void Test_75_14()
+        {
+        }
+
+        [Fact]
+        public void Test_75_15()
+        {
+        }
+
+        [Fact]
+        public void Test_75_16()
+        {
+        }
+
+        [Fact]
+        public void Test_75_17()
+        {
+        }
+
+        [Fact]
+        public void Test_75_18()
+        {
+        }
+
+        [Fact]
+        public void Test_75_19()
+        {
+        }
+
+        [Fact]
+        public void Test_75_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_76
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_76_01()
+        {
+        }
+
+        [Fact]
+        public void Test_76_02()
+        {
+        }
+
+        [Fact]
+        public void Test_76_03()
+        {
+        }
+
+        [Fact]
+        public void Test_76_04()
+        {
+        }
+
+        [Fact]
+        public void Test_76_05()
+        {
+        }
+
+        [Fact]
+        public void Test_76_06()
+        {
+        }
+
+        [Fact]
+        public void Test_76_07()
+        {
+        }
+
+        [Fact]
+        public void Test_76_08()
+        {
+        }
+
+        [Fact]
+        public void Test_76_09()
+        {
+        }
+
+        [Fact]
+        public void Test_76_10()
+        {
+        }
+
+        [Fact]
+        public void Test_76_11()
+        {
+        }
+
+        [Fact]
+        public void Test_76_12()
+        {
+        }
+
+        [Fact]
+        public void Test_76_13()
+        {
+        }
+
+        [Fact]
+        public void Test_76_14()
+        {
+        }
+
+        [Fact]
+        public void Test_76_15()
+        {
+        }
+
+        [Fact]
+        public void Test_76_16()
+        {
+        }
+
+        [Fact]
+        public void Test_76_17()
+        {
+        }
+
+        [Fact]
+        public void Test_76_18()
+        {
+        }
+
+        [Fact]
+        public void Test_76_19()
+        {
+        }
+
+        [Fact]
+        public void Test_76_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_77
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_77_01()
+        {
+        }
+
+        [Fact]
+        public void Test_77_02()
+        {
+        }
+
+        [Fact]
+        public void Test_77_03()
+        {
+        }
+
+        [Fact]
+        public void Test_77_04()
+        {
+        }
+
+        [Fact]
+        public void Test_77_05()
+        {
+        }
+
+        [Fact]
+        public void Test_77_06()
+        {
+        }
+
+        [Fact]
+        public void Test_77_07()
+        {
+        }
+
+        [Fact]
+        public void Test_77_08()
+        {
+        }
+
+        [Fact]
+        public void Test_77_09()
+        {
+        }
+
+        [Fact]
+        public void Test_77_10()
+        {
+        }
+
+        [Fact]
+        public void Test_77_11()
+        {
+        }
+
+        [Fact]
+        public void Test_77_12()
+        {
+        }
+
+        [Fact]
+        public void Test_77_13()
+        {
+        }
+
+        [Fact]
+        public void Test_77_14()
+        {
+        }
+
+        [Fact]
+        public void Test_77_15()
+        {
+        }
+
+        [Fact]
+        public void Test_77_16()
+        {
+        }
+
+        [Fact]
+        public void Test_77_17()
+        {
+        }
+
+        [Fact]
+        public void Test_77_18()
+        {
+        }
+
+        [Fact]
+        public void Test_77_19()
+        {
+        }
+
+        [Fact]
+        public void Test_77_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_78
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_78_01()
+        {
+        }
+
+        [Fact]
+        public void Test_78_02()
+        {
+        }
+
+        [Fact]
+        public void Test_78_03()
+        {
+        }
+
+        [Fact]
+        public void Test_78_04()
+        {
+        }
+
+        [Fact]
+        public void Test_78_05()
+        {
+        }
+
+        [Fact]
+        public void Test_78_06()
+        {
+        }
+
+        [Fact]
+        public void Test_78_07()
+        {
+        }
+
+        [Fact]
+        public void Test_78_08()
+        {
+        }
+
+        [Fact]
+        public void Test_78_09()
+        {
+        }
+
+        [Fact]
+        public void Test_78_10()
+        {
+        }
+
+        [Fact]
+        public void Test_78_11()
+        {
+        }
+
+        [Fact]
+        public void Test_78_12()
+        {
+        }
+
+        [Fact]
+        public void Test_78_13()
+        {
+        }
+
+        [Fact]
+        public void Test_78_14()
+        {
+        }
+
+        [Fact]
+        public void Test_78_15()
+        {
+        }
+
+        [Fact]
+        public void Test_78_16()
+        {
+        }
+
+        [Fact]
+        public void Test_78_17()
+        {
+        }
+
+        [Fact]
+        public void Test_78_18()
+        {
+        }
+
+        [Fact]
+        public void Test_78_19()
+        {
+        }
+
+        [Fact]
+        public void Test_78_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_79
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_79_01()
+        {
+        }
+
+        [Fact]
+        public void Test_79_02()
+        {
+        }
+
+        [Fact]
+        public void Test_79_03()
+        {
+        }
+
+        [Fact]
+        public void Test_79_04()
+        {
+        }
+
+        [Fact]
+        public void Test_79_05()
+        {
+        }
+
+        [Fact]
+        public void Test_79_06()
+        {
+        }
+
+        [Fact]
+        public void Test_79_07()
+        {
+        }
+
+        [Fact]
+        public void Test_79_08()
+        {
+        }
+
+        [Fact]
+        public void Test_79_09()
+        {
+        }
+
+        [Fact]
+        public void Test_79_10()
+        {
+        }
+
+        [Fact]
+        public void Test_79_11()
+        {
+        }
+
+        [Fact]
+        public void Test_79_12()
+        {
+        }
+
+        [Fact]
+        public void Test_79_13()
+        {
+        }
+
+        [Fact]
+        public void Test_79_14()
+        {
+        }
+
+        [Fact]
+        public void Test_79_15()
+        {
+        }
+
+        [Fact]
+        public void Test_79_16()
+        {
+        }
+
+        [Fact]
+        public void Test_79_17()
+        {
+        }
+
+        [Fact]
+        public void Test_79_18()
+        {
+        }
+
+        [Fact]
+        public void Test_79_19()
+        {
+        }
+
+        [Fact]
+        public void Test_79_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_80
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_80_01()
+        {
+        }
+
+        [Fact]
+        public void Test_80_02()
+        {
+        }
+
+        [Fact]
+        public void Test_80_03()
+        {
+        }
+
+        [Fact]
+        public void Test_80_04()
+        {
+        }
+
+        [Fact]
+        public void Test_80_05()
+        {
+        }
+
+        [Fact]
+        public void Test_80_06()
+        {
+        }
+
+        [Fact]
+        public void Test_80_07()
+        {
+        }
+
+        [Fact]
+        public void Test_80_08()
+        {
+        }
+
+        [Fact]
+        public void Test_80_09()
+        {
+        }
+
+        [Fact]
+        public void Test_80_10()
+        {
+        }
+
+        [Fact]
+        public void Test_80_11()
+        {
+        }
+
+        [Fact]
+        public void Test_80_12()
+        {
+        }
+
+        [Fact]
+        public void Test_80_13()
+        {
+        }
+
+        [Fact]
+        public void Test_80_14()
+        {
+        }
+
+        [Fact]
+        public void Test_80_15()
+        {
+        }
+
+        [Fact]
+        public void Test_80_16()
+        {
+        }
+
+        [Fact]
+        public void Test_80_17()
+        {
+        }
+
+        [Fact]
+        public void Test_80_18()
+        {
+        }
+
+        [Fact]
+        public void Test_80_19()
+        {
+        }
+
+        [Fact]
+        public void Test_80_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_81
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_81_01()
+        {
+        }
+
+        [Fact]
+        public void Test_81_02()
+        {
+        }
+
+        [Fact]
+        public void Test_81_03()
+        {
+        }
+
+        [Fact]
+        public void Test_81_04()
+        {
+        }
+
+        [Fact]
+        public void Test_81_05()
+        {
+        }
+
+        [Fact]
+        public void Test_81_06()
+        {
+        }
+
+        [Fact]
+        public void Test_81_07()
+        {
+        }
+
+        [Fact]
+        public void Test_81_08()
+        {
+        }
+
+        [Fact]
+        public void Test_81_09()
+        {
+        }
+
+        [Fact]
+        public void Test_81_10()
+        {
+        }
+
+        [Fact]
+        public void Test_81_11()
+        {
+        }
+
+        [Fact]
+        public void Test_81_12()
+        {
+        }
+
+        [Fact]
+        public void Test_81_13()
+        {
+        }
+
+        [Fact]
+        public void Test_81_14()
+        {
+        }
+
+        [Fact]
+        public void Test_81_15()
+        {
+        }
+
+        [Fact]
+        public void Test_81_16()
+        {
+        }
+
+        [Fact]
+        public void Test_81_17()
+        {
+        }
+
+        [Fact]
+        public void Test_81_18()
+        {
+        }
+
+        [Fact]
+        public void Test_81_19()
+        {
+        }
+
+        [Fact]
+        public void Test_81_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_82
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_82_01()
+        {
+        }
+
+        [Fact]
+        public void Test_82_02()
+        {
+        }
+
+        [Fact]
+        public void Test_82_03()
+        {
+        }
+
+        [Fact]
+        public void Test_82_04()
+        {
+        }
+
+        [Fact]
+        public void Test_82_05()
+        {
+        }
+
+        [Fact]
+        public void Test_82_06()
+        {
+        }
+
+        [Fact]
+        public void Test_82_07()
+        {
+        }
+
+        [Fact]
+        public void Test_82_08()
+        {
+        }
+
+        [Fact]
+        public void Test_82_09()
+        {
+        }
+
+        [Fact]
+        public void Test_82_10()
+        {
+        }
+
+        [Fact]
+        public void Test_82_11()
+        {
+        }
+
+        [Fact]
+        public void Test_82_12()
+        {
+        }
+
+        [Fact]
+        public void Test_82_13()
+        {
+        }
+
+        [Fact]
+        public void Test_82_14()
+        {
+        }
+
+        [Fact]
+        public void Test_82_15()
+        {
+        }
+
+        [Fact]
+        public void Test_82_16()
+        {
+        }
+
+        [Fact]
+        public void Test_82_17()
+        {
+        }
+
+        [Fact]
+        public void Test_82_18()
+        {
+        }
+
+        [Fact]
+        public void Test_82_19()
+        {
+        }
+
+        [Fact]
+        public void Test_82_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_83
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_83_01()
+        {
+        }
+
+        [Fact]
+        public void Test_83_02()
+        {
+        }
+
+        [Fact]
+        public void Test_83_03()
+        {
+        }
+
+        [Fact]
+        public void Test_83_04()
+        {
+        }
+
+        [Fact]
+        public void Test_83_05()
+        {
+        }
+
+        [Fact]
+        public void Test_83_06()
+        {
+        }
+
+        [Fact]
+        public void Test_83_07()
+        {
+        }
+
+        [Fact]
+        public void Test_83_08()
+        {
+        }
+
+        [Fact]
+        public void Test_83_09()
+        {
+        }
+
+        [Fact]
+        public void Test_83_10()
+        {
+        }
+
+        [Fact]
+        public void Test_83_11()
+        {
+        }
+
+        [Fact]
+        public void Test_83_12()
+        {
+        }
+
+        [Fact]
+        public void Test_83_13()
+        {
+        }
+
+        [Fact]
+        public void Test_83_14()
+        {
+        }
+
+        [Fact]
+        public void Test_83_15()
+        {
+        }
+
+        [Fact]
+        public void Test_83_16()
+        {
+        }
+
+        [Fact]
+        public void Test_83_17()
+        {
+        }
+
+        [Fact]
+        public void Test_83_18()
+        {
+        }
+
+        [Fact]
+        public void Test_83_19()
+        {
+        }
+
+        [Fact]
+        public void Test_83_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_84
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_84_01()
+        {
+        }
+
+        [Fact]
+        public void Test_84_02()
+        {
+        }
+
+        [Fact]
+        public void Test_84_03()
+        {
+        }
+
+        [Fact]
+        public void Test_84_04()
+        {
+        }
+
+        [Fact]
+        public void Test_84_05()
+        {
+        }
+
+        [Fact]
+        public void Test_84_06()
+        {
+        }
+
+        [Fact]
+        public void Test_84_07()
+        {
+        }
+
+        [Fact]
+        public void Test_84_08()
+        {
+        }
+
+        [Fact]
+        public void Test_84_09()
+        {
+        }
+
+        [Fact]
+        public void Test_84_10()
+        {
+        }
+
+        [Fact]
+        public void Test_84_11()
+        {
+        }
+
+        [Fact]
+        public void Test_84_12()
+        {
+        }
+
+        [Fact]
+        public void Test_84_13()
+        {
+        }
+
+        [Fact]
+        public void Test_84_14()
+        {
+        }
+
+        [Fact]
+        public void Test_84_15()
+        {
+        }
+
+        [Fact]
+        public void Test_84_16()
+        {
+        }
+
+        [Fact]
+        public void Test_84_17()
+        {
+        }
+
+        [Fact]
+        public void Test_84_18()
+        {
+        }
+
+        [Fact]
+        public void Test_84_19()
+        {
+        }
+
+        [Fact]
+        public void Test_84_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_85
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_85_01()
+        {
+        }
+
+        [Fact]
+        public void Test_85_02()
+        {
+        }
+
+        [Fact]
+        public void Test_85_03()
+        {
+        }
+
+        [Fact]
+        public void Test_85_04()
+        {
+        }
+
+        [Fact]
+        public void Test_85_05()
+        {
+        }
+
+        [Fact]
+        public void Test_85_06()
+        {
+        }
+
+        [Fact]
+        public void Test_85_07()
+        {
+        }
+
+        [Fact]
+        public void Test_85_08()
+        {
+        }
+
+        [Fact]
+        public void Test_85_09()
+        {
+        }
+
+        [Fact]
+        public void Test_85_10()
+        {
+        }
+
+        [Fact]
+        public void Test_85_11()
+        {
+        }
+
+        [Fact]
+        public void Test_85_12()
+        {
+        }
+
+        [Fact]
+        public void Test_85_13()
+        {
+        }
+
+        [Fact]
+        public void Test_85_14()
+        {
+        }
+
+        [Fact]
+        public void Test_85_15()
+        {
+        }
+
+        [Fact]
+        public void Test_85_16()
+        {
+        }
+
+        [Fact]
+        public void Test_85_17()
+        {
+        }
+
+        [Fact]
+        public void Test_85_18()
+        {
+        }
+
+        [Fact]
+        public void Test_85_19()
+        {
+        }
+
+        [Fact]
+        public void Test_85_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_86
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_86_01()
+        {
+        }
+
+        [Fact]
+        public void Test_86_02()
+        {
+        }
+
+        [Fact]
+        public void Test_86_03()
+        {
+        }
+
+        [Fact]
+        public void Test_86_04()
+        {
+        }
+
+        [Fact]
+        public void Test_86_05()
+        {
+        }
+
+        [Fact]
+        public void Test_86_06()
+        {
+        }
+
+        [Fact]
+        public void Test_86_07()
+        {
+        }
+
+        [Fact]
+        public void Test_86_08()
+        {
+        }
+
+        [Fact]
+        public void Test_86_09()
+        {
+        }
+
+        [Fact]
+        public void Test_86_10()
+        {
+        }
+
+        [Fact]
+        public void Test_86_11()
+        {
+        }
+
+        [Fact]
+        public void Test_86_12()
+        {
+        }
+
+        [Fact]
+        public void Test_86_13()
+        {
+        }
+
+        [Fact]
+        public void Test_86_14()
+        {
+        }
+
+        [Fact]
+        public void Test_86_15()
+        {
+        }
+
+        [Fact]
+        public void Test_86_16()
+        {
+        }
+
+        [Fact]
+        public void Test_86_17()
+        {
+        }
+
+        [Fact]
+        public void Test_86_18()
+        {
+        }
+
+        [Fact]
+        public void Test_86_19()
+        {
+        }
+
+        [Fact]
+        public void Test_86_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_87
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_87_01()
+        {
+        }
+
+        [Fact]
+        public void Test_87_02()
+        {
+        }
+
+        [Fact]
+        public void Test_87_03()
+        {
+        }
+
+        [Fact]
+        public void Test_87_04()
+        {
+        }
+
+        [Fact]
+        public void Test_87_05()
+        {
+        }
+
+        [Fact]
+        public void Test_87_06()
+        {
+        }
+
+        [Fact]
+        public void Test_87_07()
+        {
+        }
+
+        [Fact]
+        public void Test_87_08()
+        {
+        }
+
+        [Fact]
+        public void Test_87_09()
+        {
+        }
+
+        [Fact]
+        public void Test_87_10()
+        {
+        }
+
+        [Fact]
+        public void Test_87_11()
+        {
+        }
+
+        [Fact]
+        public void Test_87_12()
+        {
+        }
+
+        [Fact]
+        public void Test_87_13()
+        {
+        }
+
+        [Fact]
+        public void Test_87_14()
+        {
+        }
+
+        [Fact]
+        public void Test_87_15()
+        {
+        }
+
+        [Fact]
+        public void Test_87_16()
+        {
+        }
+
+        [Fact]
+        public void Test_87_17()
+        {
+        }
+
+        [Fact]
+        public void Test_87_18()
+        {
+        }
+
+        [Fact]
+        public void Test_87_19()
+        {
+        }
+
+        [Fact]
+        public void Test_87_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_88
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_88_01()
+        {
+        }
+
+        [Fact]
+        public void Test_88_02()
+        {
+        }
+
+        [Fact]
+        public void Test_88_03()
+        {
+        }
+
+        [Fact]
+        public void Test_88_04()
+        {
+        }
+
+        [Fact]
+        public void Test_88_05()
+        {
+        }
+
+        [Fact]
+        public void Test_88_06()
+        {
+        }
+
+        [Fact]
+        public void Test_88_07()
+        {
+        }
+
+        [Fact]
+        public void Test_88_08()
+        {
+        }
+
+        [Fact]
+        public void Test_88_09()
+        {
+        }
+
+        [Fact]
+        public void Test_88_10()
+        {
+        }
+
+        [Fact]
+        public void Test_88_11()
+        {
+        }
+
+        [Fact]
+        public void Test_88_12()
+        {
+        }
+
+        [Fact]
+        public void Test_88_13()
+        {
+        }
+
+        [Fact]
+        public void Test_88_14()
+        {
+        }
+
+        [Fact]
+        public void Test_88_15()
+        {
+        }
+
+        [Fact]
+        public void Test_88_16()
+        {
+        }
+
+        [Fact]
+        public void Test_88_17()
+        {
+        }
+
+        [Fact]
+        public void Test_88_18()
+        {
+        }
+
+        [Fact]
+        public void Test_88_19()
+        {
+        }
+
+        [Fact]
+        public void Test_88_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_89
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_89_01()
+        {
+        }
+
+        [Fact]
+        public void Test_89_02()
+        {
+        }
+
+        [Fact]
+        public void Test_89_03()
+        {
+        }
+
+        [Fact]
+        public void Test_89_04()
+        {
+        }
+
+        [Fact]
+        public void Test_89_05()
+        {
+        }
+
+        [Fact]
+        public void Test_89_06()
+        {
+        }
+
+        [Fact]
+        public void Test_89_07()
+        {
+        }
+
+        [Fact]
+        public void Test_89_08()
+        {
+        }
+
+        [Fact]
+        public void Test_89_09()
+        {
+        }
+
+        [Fact]
+        public void Test_89_10()
+        {
+        }
+
+        [Fact]
+        public void Test_89_11()
+        {
+        }
+
+        [Fact]
+        public void Test_89_12()
+        {
+        }
+
+        [Fact]
+        public void Test_89_13()
+        {
+        }
+
+        [Fact]
+        public void Test_89_14()
+        {
+        }
+
+        [Fact]
+        public void Test_89_15()
+        {
+        }
+
+        [Fact]
+        public void Test_89_16()
+        {
+        }
+
+        [Fact]
+        public void Test_89_17()
+        {
+        }
+
+        [Fact]
+        public void Test_89_18()
+        {
+        }
+
+        [Fact]
+        public void Test_89_19()
+        {
+        }
+
+        [Fact]
+        public void Test_89_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_90
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_90_01()
+        {
+        }
+
+        [Fact]
+        public void Test_90_02()
+        {
+        }
+
+        [Fact]
+        public void Test_90_03()
+        {
+        }
+
+        [Fact]
+        public void Test_90_04()
+        {
+        }
+
+        [Fact]
+        public void Test_90_05()
+        {
+        }
+
+        [Fact]
+        public void Test_90_06()
+        {
+        }
+
+        [Fact]
+        public void Test_90_07()
+        {
+        }
+
+        [Fact]
+        public void Test_90_08()
+        {
+        }
+
+        [Fact]
+        public void Test_90_09()
+        {
+        }
+
+        [Fact]
+        public void Test_90_10()
+        {
+        }
+
+        [Fact]
+        public void Test_90_11()
+        {
+        }
+
+        [Fact]
+        public void Test_90_12()
+        {
+        }
+
+        [Fact]
+        public void Test_90_13()
+        {
+        }
+
+        [Fact]
+        public void Test_90_14()
+        {
+        }
+
+        [Fact]
+        public void Test_90_15()
+        {
+        }
+
+        [Fact]
+        public void Test_90_16()
+        {
+        }
+
+        [Fact]
+        public void Test_90_17()
+        {
+        }
+
+        [Fact]
+        public void Test_90_18()
+        {
+        }
+
+        [Fact]
+        public void Test_90_19()
+        {
+        }
+
+        [Fact]
+        public void Test_90_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_91
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_91_01()
+        {
+        }
+
+        [Fact]
+        public void Test_91_02()
+        {
+        }
+
+        [Fact]
+        public void Test_91_03()
+        {
+        }
+
+        [Fact]
+        public void Test_91_04()
+        {
+        }
+
+        [Fact]
+        public void Test_91_05()
+        {
+        }
+
+        [Fact]
+        public void Test_91_06()
+        {
+        }
+
+        [Fact]
+        public void Test_91_07()
+        {
+        }
+
+        [Fact]
+        public void Test_91_08()
+        {
+        }
+
+        [Fact]
+        public void Test_91_09()
+        {
+        }
+
+        [Fact]
+        public void Test_91_10()
+        {
+        }
+
+        [Fact]
+        public void Test_91_11()
+        {
+        }
+
+        [Fact]
+        public void Test_91_12()
+        {
+        }
+
+        [Fact]
+        public void Test_91_13()
+        {
+        }
+
+        [Fact]
+        public void Test_91_14()
+        {
+        }
+
+        [Fact]
+        public void Test_91_15()
+        {
+        }
+
+        [Fact]
+        public void Test_91_16()
+        {
+        }
+
+        [Fact]
+        public void Test_91_17()
+        {
+        }
+
+        [Fact]
+        public void Test_91_18()
+        {
+        }
+
+        [Fact]
+        public void Test_91_19()
+        {
+        }
+
+        [Fact]
+        public void Test_91_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_92
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_92_01()
+        {
+        }
+
+        [Fact]
+        public void Test_92_02()
+        {
+        }
+
+        [Fact]
+        public void Test_92_03()
+        {
+        }
+
+        [Fact]
+        public void Test_92_04()
+        {
+        }
+
+        [Fact]
+        public void Test_92_05()
+        {
+        }
+
+        [Fact]
+        public void Test_92_06()
+        {
+        }
+
+        [Fact]
+        public void Test_92_07()
+        {
+        }
+
+        [Fact]
+        public void Test_92_08()
+        {
+        }
+
+        [Fact]
+        public void Test_92_09()
+        {
+        }
+
+        [Fact]
+        public void Test_92_10()
+        {
+        }
+
+        [Fact]
+        public void Test_92_11()
+        {
+        }
+
+        [Fact]
+        public void Test_92_12()
+        {
+        }
+
+        [Fact]
+        public void Test_92_13()
+        {
+        }
+
+        [Fact]
+        public void Test_92_14()
+        {
+        }
+
+        [Fact]
+        public void Test_92_15()
+        {
+        }
+
+        [Fact]
+        public void Test_92_16()
+        {
+        }
+
+        [Fact]
+        public void Test_92_17()
+        {
+        }
+
+        [Fact]
+        public void Test_92_18()
+        {
+        }
+
+        [Fact]
+        public void Test_92_19()
+        {
+        }
+
+        [Fact]
+        public void Test_92_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_93
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_93_01()
+        {
+        }
+
+        [Fact]
+        public void Test_93_02()
+        {
+        }
+
+        [Fact]
+        public void Test_93_03()
+        {
+        }
+
+        [Fact]
+        public void Test_93_04()
+        {
+        }
+
+        [Fact]
+        public void Test_93_05()
+        {
+        }
+
+        [Fact]
+        public void Test_93_06()
+        {
+        }
+
+        [Fact]
+        public void Test_93_07()
+        {
+        }
+
+        [Fact]
+        public void Test_93_08()
+        {
+        }
+
+        [Fact]
+        public void Test_93_09()
+        {
+        }
+
+        [Fact]
+        public void Test_93_10()
+        {
+        }
+
+        [Fact]
+        public void Test_93_11()
+        {
+        }
+
+        [Fact]
+        public void Test_93_12()
+        {
+        }
+
+        [Fact]
+        public void Test_93_13()
+        {
+        }
+
+        [Fact]
+        public void Test_93_14()
+        {
+        }
+
+        [Fact]
+        public void Test_93_15()
+        {
+        }
+
+        [Fact]
+        public void Test_93_16()
+        {
+        }
+
+        [Fact]
+        public void Test_93_17()
+        {
+        }
+
+        [Fact]
+        public void Test_93_18()
+        {
+        }
+
+        [Fact]
+        public void Test_93_19()
+        {
+        }
+
+        [Fact]
+        public void Test_93_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_94
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_94_01()
+        {
+        }
+
+        [Fact]
+        public void Test_94_02()
+        {
+        }
+
+        [Fact]
+        public void Test_94_03()
+        {
+        }
+
+        [Fact]
+        public void Test_94_04()
+        {
+        }
+
+        [Fact]
+        public void Test_94_05()
+        {
+        }
+
+        [Fact]
+        public void Test_94_06()
+        {
+        }
+
+        [Fact]
+        public void Test_94_07()
+        {
+        }
+
+        [Fact]
+        public void Test_94_08()
+        {
+        }
+
+        [Fact]
+        public void Test_94_09()
+        {
+        }
+
+        [Fact]
+        public void Test_94_10()
+        {
+        }
+
+        [Fact]
+        public void Test_94_11()
+        {
+        }
+
+        [Fact]
+        public void Test_94_12()
+        {
+        }
+
+        [Fact]
+        public void Test_94_13()
+        {
+        }
+
+        [Fact]
+        public void Test_94_14()
+        {
+        }
+
+        [Fact]
+        public void Test_94_15()
+        {
+        }
+
+        [Fact]
+        public void Test_94_16()
+        {
+        }
+
+        [Fact]
+        public void Test_94_17()
+        {
+        }
+
+        [Fact]
+        public void Test_94_18()
+        {
+        }
+
+        [Fact]
+        public void Test_94_19()
+        {
+        }
+
+        [Fact]
+        public void Test_94_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_95
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_95_01()
+        {
+        }
+
+        [Fact]
+        public void Test_95_02()
+        {
+        }
+
+        [Fact]
+        public void Test_95_03()
+        {
+        }
+
+        [Fact]
+        public void Test_95_04()
+        {
+        }
+
+        [Fact]
+        public void Test_95_05()
+        {
+        }
+
+        [Fact]
+        public void Test_95_06()
+        {
+        }
+
+        [Fact]
+        public void Test_95_07()
+        {
+        }
+
+        [Fact]
+        public void Test_95_08()
+        {
+        }
+
+        [Fact]
+        public void Test_95_09()
+        {
+        }
+
+        [Fact]
+        public void Test_95_10()
+        {
+        }
+
+        [Fact]
+        public void Test_95_11()
+        {
+        }
+
+        [Fact]
+        public void Test_95_12()
+        {
+        }
+
+        [Fact]
+        public void Test_95_13()
+        {
+        }
+
+        [Fact]
+        public void Test_95_14()
+        {
+        }
+
+        [Fact]
+        public void Test_95_15()
+        {
+        }
+
+        [Fact]
+        public void Test_95_16()
+        {
+        }
+
+        [Fact]
+        public void Test_95_17()
+        {
+        }
+
+        [Fact]
+        public void Test_95_18()
+        {
+        }
+
+        [Fact]
+        public void Test_95_19()
+        {
+        }
+
+        [Fact]
+        public void Test_95_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_96
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_96_01()
+        {
+        }
+
+        [Fact]
+        public void Test_96_02()
+        {
+        }
+
+        [Fact]
+        public void Test_96_03()
+        {
+        }
+
+        [Fact]
+        public void Test_96_04()
+        {
+        }
+
+        [Fact]
+        public void Test_96_05()
+        {
+        }
+
+        [Fact]
+        public void Test_96_06()
+        {
+        }
+
+        [Fact]
+        public void Test_96_07()
+        {
+        }
+
+        [Fact]
+        public void Test_96_08()
+        {
+        }
+
+        [Fact]
+        public void Test_96_09()
+        {
+        }
+
+        [Fact]
+        public void Test_96_10()
+        {
+        }
+
+        [Fact]
+        public void Test_96_11()
+        {
+        }
+
+        [Fact]
+        public void Test_96_12()
+        {
+        }
+
+        [Fact]
+        public void Test_96_13()
+        {
+        }
+
+        [Fact]
+        public void Test_96_14()
+        {
+        }
+
+        [Fact]
+        public void Test_96_15()
+        {
+        }
+
+        [Fact]
+        public void Test_96_16()
+        {
+        }
+
+        [Fact]
+        public void Test_96_17()
+        {
+        }
+
+        [Fact]
+        public void Test_96_18()
+        {
+        }
+
+        [Fact]
+        public void Test_96_19()
+        {
+        }
+
+        [Fact]
+        public void Test_96_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_97
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_97_01()
+        {
+        }
+
+        [Fact]
+        public void Test_97_02()
+        {
+        }
+
+        [Fact]
+        public void Test_97_03()
+        {
+        }
+
+        [Fact]
+        public void Test_97_04()
+        {
+        }
+
+        [Fact]
+        public void Test_97_05()
+        {
+        }
+
+        [Fact]
+        public void Test_97_06()
+        {
+        }
+
+        [Fact]
+        public void Test_97_07()
+        {
+        }
+
+        [Fact]
+        public void Test_97_08()
+        {
+        }
+
+        [Fact]
+        public void Test_97_09()
+        {
+        }
+
+        [Fact]
+        public void Test_97_10()
+        {
+        }
+
+        [Fact]
+        public void Test_97_11()
+        {
+        }
+
+        [Fact]
+        public void Test_97_12()
+        {
+        }
+
+        [Fact]
+        public void Test_97_13()
+        {
+        }
+
+        [Fact]
+        public void Test_97_14()
+        {
+        }
+
+        [Fact]
+        public void Test_97_15()
+        {
+        }
+
+        [Fact]
+        public void Test_97_16()
+        {
+        }
+
+        [Fact]
+        public void Test_97_17()
+        {
+        }
+
+        [Fact]
+        public void Test_97_18()
+        {
+        }
+
+        [Fact]
+        public void Test_97_19()
+        {
+        }
+
+        [Fact]
+        public void Test_97_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_98
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_98_01()
+        {
+        }
+
+        [Fact]
+        public void Test_98_02()
+        {
+        }
+
+        [Fact]
+        public void Test_98_03()
+        {
+        }
+
+        [Fact]
+        public void Test_98_04()
+        {
+        }
+
+        [Fact]
+        public void Test_98_05()
+        {
+        }
+
+        [Fact]
+        public void Test_98_06()
+        {
+        }
+
+        [Fact]
+        public void Test_98_07()
+        {
+        }
+
+        [Fact]
+        public void Test_98_08()
+        {
+        }
+
+        [Fact]
+        public void Test_98_09()
+        {
+        }
+
+        [Fact]
+        public void Test_98_10()
+        {
+        }
+
+        [Fact]
+        public void Test_98_11()
+        {
+        }
+
+        [Fact]
+        public void Test_98_12()
+        {
+        }
+
+        [Fact]
+        public void Test_98_13()
+        {
+        }
+
+        [Fact]
+        public void Test_98_14()
+        {
+        }
+
+        [Fact]
+        public void Test_98_15()
+        {
+        }
+
+        [Fact]
+        public void Test_98_16()
+        {
+        }
+
+        [Fact]
+        public void Test_98_17()
+        {
+        }
+
+        [Fact]
+        public void Test_98_18()
+        {
+        }
+
+        [Fact]
+        public void Test_98_19()
+        {
+        }
+
+        [Fact]
+        public void Test_98_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_99
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_99_01()
+        {
+        }
+
+        [Fact]
+        public void Test_99_02()
+        {
+        }
+
+        [Fact]
+        public void Test_99_03()
+        {
+        }
+
+        [Fact]
+        public void Test_99_04()
+        {
+        }
+
+        [Fact]
+        public void Test_99_05()
+        {
+        }
+
+        [Fact]
+        public void Test_99_06()
+        {
+        }
+
+        [Fact]
+        public void Test_99_07()
+        {
+        }
+
+        [Fact]
+        public void Test_99_08()
+        {
+        }
+
+        [Fact]
+        public void Test_99_09()
+        {
+        }
+
+        [Fact]
+        public void Test_99_10()
+        {
+        }
+
+        [Fact]
+        public void Test_99_11()
+        {
+        }
+
+        [Fact]
+        public void Test_99_12()
+        {
+        }
+
+        [Fact]
+        public void Test_99_13()
+        {
+        }
+
+        [Fact]
+        public void Test_99_14()
+        {
+        }
+
+        [Fact]
+        public void Test_99_15()
+        {
+        }
+
+        [Fact]
+        public void Test_99_16()
+        {
+        }
+
+        [Fact]
+        public void Test_99_17()
+        {
+        }
+
+        [Fact]
+        public void Test_99_18()
+        {
+        }
+
+        [Fact]
+        public void Test_99_19()
+        {
+        }
+
+        [Fact]
+        public void Test_99_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_100
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_100_01()
+        {
+        }
+
+        [Fact]
+        public void Test_100_02()
+        {
+        }
+
+        [Fact]
+        public void Test_100_03()
+        {
+        }
+
+        [Fact]
+        public void Test_100_04()
+        {
+        }
+
+        [Fact]
+        public void Test_100_05()
+        {
+        }
+
+        [Fact]
+        public void Test_100_06()
+        {
+        }
+
+        [Fact]
+        public void Test_100_07()
+        {
+        }
+
+        [Fact]
+        public void Test_100_08()
+        {
+        }
+
+        [Fact]
+        public void Test_100_09()
+        {
+        }
+
+        [Fact]
+        public void Test_100_10()
+        {
+        }
+
+        [Fact]
+        public void Test_100_11()
+        {
+        }
+
+        [Fact]
+        public void Test_100_12()
+        {
+        }
+
+        [Fact]
+        public void Test_100_13()
+        {
+        }
+
+        [Fact]
+        public void Test_100_14()
+        {
+        }
+
+        [Fact]
+        public void Test_100_15()
+        {
+        }
+
+        [Fact]
+        public void Test_100_16()
+        {
+        }
+
+        [Fact]
+        public void Test_100_17()
+        {
+        }
+
+        [Fact]
+        public void Test_100_18()
+        {
+        }
+
+        [Fact]
+        public void Test_100_19()
+        {
+        }
+
+        [Fact]
+        public void Test_100_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_101
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_101_01()
+        {
+        }
+
+        [Fact]
+        public void Test_101_02()
+        {
+        }
+
+        [Fact]
+        public void Test_101_03()
+        {
+        }
+
+        [Fact]
+        public void Test_101_04()
+        {
+        }
+
+        [Fact]
+        public void Test_101_05()
+        {
+        }
+
+        [Fact]
+        public void Test_101_06()
+        {
+        }
+
+        [Fact]
+        public void Test_101_07()
+        {
+        }
+
+        [Fact]
+        public void Test_101_08()
+        {
+        }
+
+        [Fact]
+        public void Test_101_09()
+        {
+        }
+
+        [Fact]
+        public void Test_101_10()
+        {
+        }
+
+        [Fact]
+        public void Test_101_11()
+        {
+        }
+
+        [Fact]
+        public void Test_101_12()
+        {
+        }
+
+        [Fact]
+        public void Test_101_13()
+        {
+        }
+
+        [Fact]
+        public void Test_101_14()
+        {
+        }
+
+        [Fact]
+        public void Test_101_15()
+        {
+        }
+
+        [Fact]
+        public void Test_101_16()
+        {
+        }
+
+        [Fact]
+        public void Test_101_17()
+        {
+        }
+
+        [Fact]
+        public void Test_101_18()
+        {
+        }
+
+        [Fact]
+        public void Test_101_19()
+        {
+        }
+
+        [Fact]
+        public void Test_101_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_102
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_102_01()
+        {
+        }
+
+        [Fact]
+        public void Test_102_02()
+        {
+        }
+
+        [Fact]
+        public void Test_102_03()
+        {
+        }
+
+        [Fact]
+        public void Test_102_04()
+        {
+        }
+
+        [Fact]
+        public void Test_102_05()
+        {
+        }
+
+        [Fact]
+        public void Test_102_06()
+        {
+        }
+
+        [Fact]
+        public void Test_102_07()
+        {
+        }
+
+        [Fact]
+        public void Test_102_08()
+        {
+        }
+
+        [Fact]
+        public void Test_102_09()
+        {
+        }
+
+        [Fact]
+        public void Test_102_10()
+        {
+        }
+
+        [Fact]
+        public void Test_102_11()
+        {
+        }
+
+        [Fact]
+        public void Test_102_12()
+        {
+        }
+
+        [Fact]
+        public void Test_102_13()
+        {
+        }
+
+        [Fact]
+        public void Test_102_14()
+        {
+        }
+
+        [Fact]
+        public void Test_102_15()
+        {
+        }
+
+        [Fact]
+        public void Test_102_16()
+        {
+        }
+
+        [Fact]
+        public void Test_102_17()
+        {
+        }
+
+        [Fact]
+        public void Test_102_18()
+        {
+        }
+
+        [Fact]
+        public void Test_102_19()
+        {
+        }
+
+        [Fact]
+        public void Test_102_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_103
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_103_01()
+        {
+        }
+
+        [Fact]
+        public void Test_103_02()
+        {
+        }
+
+        [Fact]
+        public void Test_103_03()
+        {
+        }
+
+        [Fact]
+        public void Test_103_04()
+        {
+        }
+
+        [Fact]
+        public void Test_103_05()
+        {
+        }
+
+        [Fact]
+        public void Test_103_06()
+        {
+        }
+
+        [Fact]
+        public void Test_103_07()
+        {
+        }
+
+        [Fact]
+        public void Test_103_08()
+        {
+        }
+
+        [Fact]
+        public void Test_103_09()
+        {
+        }
+
+        [Fact]
+        public void Test_103_10()
+        {
+        }
+
+        [Fact]
+        public void Test_103_11()
+        {
+        }
+
+        [Fact]
+        public void Test_103_12()
+        {
+        }
+
+        [Fact]
+        public void Test_103_13()
+        {
+        }
+
+        [Fact]
+        public void Test_103_14()
+        {
+        }
+
+        [Fact]
+        public void Test_103_15()
+        {
+        }
+
+        [Fact]
+        public void Test_103_16()
+        {
+        }
+
+        [Fact]
+        public void Test_103_17()
+        {
+        }
+
+        [Fact]
+        public void Test_103_18()
+        {
+        }
+
+        [Fact]
+        public void Test_103_19()
+        {
+        }
+
+        [Fact]
+        public void Test_103_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_104
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_104_01()
+        {
+        }
+
+        [Fact]
+        public void Test_104_02()
+        {
+        }
+
+        [Fact]
+        public void Test_104_03()
+        {
+        }
+
+        [Fact]
+        public void Test_104_04()
+        {
+        }
+
+        [Fact]
+        public void Test_104_05()
+        {
+        }
+
+        [Fact]
+        public void Test_104_06()
+        {
+        }
+
+        [Fact]
+        public void Test_104_07()
+        {
+        }
+
+        [Fact]
+        public void Test_104_08()
+        {
+        }
+
+        [Fact]
+        public void Test_104_09()
+        {
+        }
+
+        [Fact]
+        public void Test_104_10()
+        {
+        }
+
+        [Fact]
+        public void Test_104_11()
+        {
+        }
+
+        [Fact]
+        public void Test_104_12()
+        {
+        }
+
+        [Fact]
+        public void Test_104_13()
+        {
+        }
+
+        [Fact]
+        public void Test_104_14()
+        {
+        }
+
+        [Fact]
+        public void Test_104_15()
+        {
+        }
+
+        [Fact]
+        public void Test_104_16()
+        {
+        }
+
+        [Fact]
+        public void Test_104_17()
+        {
+        }
+
+        [Fact]
+        public void Test_104_18()
+        {
+        }
+
+        [Fact]
+        public void Test_104_19()
+        {
+        }
+
+        [Fact]
+        public void Test_104_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_105
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_105_01()
+        {
+        }
+
+        [Fact]
+        public void Test_105_02()
+        {
+        }
+
+        [Fact]
+        public void Test_105_03()
+        {
+        }
+
+        [Fact]
+        public void Test_105_04()
+        {
+        }
+
+        [Fact]
+        public void Test_105_05()
+        {
+        }
+
+        [Fact]
+        public void Test_105_06()
+        {
+        }
+
+        [Fact]
+        public void Test_105_07()
+        {
+        }
+
+        [Fact]
+        public void Test_105_08()
+        {
+        }
+
+        [Fact]
+        public void Test_105_09()
+        {
+        }
+
+        [Fact]
+        public void Test_105_10()
+        {
+        }
+
+        [Fact]
+        public void Test_105_11()
+        {
+        }
+
+        [Fact]
+        public void Test_105_12()
+        {
+        }
+
+        [Fact]
+        public void Test_105_13()
+        {
+        }
+
+        [Fact]
+        public void Test_105_14()
+        {
+        }
+
+        [Fact]
+        public void Test_105_15()
+        {
+        }
+
+        [Fact]
+        public void Test_105_16()
+        {
+        }
+
+        [Fact]
+        public void Test_105_17()
+        {
+        }
+
+        [Fact]
+        public void Test_105_18()
+        {
+        }
+
+        [Fact]
+        public void Test_105_19()
+        {
+        }
+
+        [Fact]
+        public void Test_105_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_106
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_106_01()
+        {
+        }
+
+        [Fact]
+        public void Test_106_02()
+        {
+        }
+
+        [Fact]
+        public void Test_106_03()
+        {
+        }
+
+        [Fact]
+        public void Test_106_04()
+        {
+        }
+
+        [Fact]
+        public void Test_106_05()
+        {
+        }
+
+        [Fact]
+        public void Test_106_06()
+        {
+        }
+
+        [Fact]
+        public void Test_106_07()
+        {
+        }
+
+        [Fact]
+        public void Test_106_08()
+        {
+        }
+
+        [Fact]
+        public void Test_106_09()
+        {
+        }
+
+        [Fact]
+        public void Test_106_10()
+        {
+        }
+
+        [Fact]
+        public void Test_106_11()
+        {
+        }
+
+        [Fact]
+        public void Test_106_12()
+        {
+        }
+
+        [Fact]
+        public void Test_106_13()
+        {
+        }
+
+        [Fact]
+        public void Test_106_14()
+        {
+        }
+
+        [Fact]
+        public void Test_106_15()
+        {
+        }
+
+        [Fact]
+        public void Test_106_16()
+        {
+        }
+
+        [Fact]
+        public void Test_106_17()
+        {
+        }
+
+        [Fact]
+        public void Test_106_18()
+        {
+        }
+
+        [Fact]
+        public void Test_106_19()
+        {
+        }
+
+        [Fact]
+        public void Test_106_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_107
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_107_01()
+        {
+        }
+
+        [Fact]
+        public void Test_107_02()
+        {
+        }
+
+        [Fact]
+        public void Test_107_03()
+        {
+        }
+
+        [Fact]
+        public void Test_107_04()
+        {
+        }
+
+        [Fact]
+        public void Test_107_05()
+        {
+        }
+
+        [Fact]
+        public void Test_107_06()
+        {
+        }
+
+        [Fact]
+        public void Test_107_07()
+        {
+        }
+
+        [Fact]
+        public void Test_107_08()
+        {
+        }
+
+        [Fact]
+        public void Test_107_09()
+        {
+        }
+
+        [Fact]
+        public void Test_107_10()
+        {
+        }
+
+        [Fact]
+        public void Test_107_11()
+        {
+        }
+
+        [Fact]
+        public void Test_107_12()
+        {
+        }
+
+        [Fact]
+        public void Test_107_13()
+        {
+        }
+
+        [Fact]
+        public void Test_107_14()
+        {
+        }
+
+        [Fact]
+        public void Test_107_15()
+        {
+        }
+
+        [Fact]
+        public void Test_107_16()
+        {
+        }
+
+        [Fact]
+        public void Test_107_17()
+        {
+        }
+
+        [Fact]
+        public void Test_107_18()
+        {
+        }
+
+        [Fact]
+        public void Test_107_19()
+        {
+        }
+
+        [Fact]
+        public void Test_107_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_108
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_108_01()
+        {
+        }
+
+        [Fact]
+        public void Test_108_02()
+        {
+        }
+
+        [Fact]
+        public void Test_108_03()
+        {
+        }
+
+        [Fact]
+        public void Test_108_04()
+        {
+        }
+
+        [Fact]
+        public void Test_108_05()
+        {
+        }
+
+        [Fact]
+        public void Test_108_06()
+        {
+        }
+
+        [Fact]
+        public void Test_108_07()
+        {
+        }
+
+        [Fact]
+        public void Test_108_08()
+        {
+        }
+
+        [Fact]
+        public void Test_108_09()
+        {
+        }
+
+        [Fact]
+        public void Test_108_10()
+        {
+        }
+
+        [Fact]
+        public void Test_108_11()
+        {
+        }
+
+        [Fact]
+        public void Test_108_12()
+        {
+        }
+
+        [Fact]
+        public void Test_108_13()
+        {
+        }
+
+        [Fact]
+        public void Test_108_14()
+        {
+        }
+
+        [Fact]
+        public void Test_108_15()
+        {
+        }
+
+        [Fact]
+        public void Test_108_16()
+        {
+        }
+
+        [Fact]
+        public void Test_108_17()
+        {
+        }
+
+        [Fact]
+        public void Test_108_18()
+        {
+        }
+
+        [Fact]
+        public void Test_108_19()
+        {
+        }
+
+        [Fact]
+        public void Test_108_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_109
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_109_01()
+        {
+        }
+
+        [Fact]
+        public void Test_109_02()
+        {
+        }
+
+        [Fact]
+        public void Test_109_03()
+        {
+        }
+
+        [Fact]
+        public void Test_109_04()
+        {
+        }
+
+        [Fact]
+        public void Test_109_05()
+        {
+        }
+
+        [Fact]
+        public void Test_109_06()
+        {
+        }
+
+        [Fact]
+        public void Test_109_07()
+        {
+        }
+
+        [Fact]
+        public void Test_109_08()
+        {
+        }
+
+        [Fact]
+        public void Test_109_09()
+        {
+        }
+
+        [Fact]
+        public void Test_109_10()
+        {
+        }
+
+        [Fact]
+        public void Test_109_11()
+        {
+        }
+
+        [Fact]
+        public void Test_109_12()
+        {
+        }
+
+        [Fact]
+        public void Test_109_13()
+        {
+        }
+
+        [Fact]
+        public void Test_109_14()
+        {
+        }
+
+        [Fact]
+        public void Test_109_15()
+        {
+        }
+
+        [Fact]
+        public void Test_109_16()
+        {
+        }
+
+        [Fact]
+        public void Test_109_17()
+        {
+        }
+
+        [Fact]
+        public void Test_109_18()
+        {
+        }
+
+        [Fact]
+        public void Test_109_19()
+        {
+        }
+
+        [Fact]
+        public void Test_109_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_110
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_110_01()
+        {
+        }
+
+        [Fact]
+        public void Test_110_02()
+        {
+        }
+
+        [Fact]
+        public void Test_110_03()
+        {
+        }
+
+        [Fact]
+        public void Test_110_04()
+        {
+        }
+
+        [Fact]
+        public void Test_110_05()
+        {
+        }
+
+        [Fact]
+        public void Test_110_06()
+        {
+        }
+
+        [Fact]
+        public void Test_110_07()
+        {
+        }
+
+        [Fact]
+        public void Test_110_08()
+        {
+        }
+
+        [Fact]
+        public void Test_110_09()
+        {
+        }
+
+        [Fact]
+        public void Test_110_10()
+        {
+        }
+
+        [Fact]
+        public void Test_110_11()
+        {
+        }
+
+        [Fact]
+        public void Test_110_12()
+        {
+        }
+
+        [Fact]
+        public void Test_110_13()
+        {
+        }
+
+        [Fact]
+        public void Test_110_14()
+        {
+        }
+
+        [Fact]
+        public void Test_110_15()
+        {
+        }
+
+        [Fact]
+        public void Test_110_16()
+        {
+        }
+
+        [Fact]
+        public void Test_110_17()
+        {
+        }
+
+        [Fact]
+        public void Test_110_18()
+        {
+        }
+
+        [Fact]
+        public void Test_110_19()
+        {
+        }
+
+        [Fact]
+        public void Test_110_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_111
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_111_01()
+        {
+        }
+
+        [Fact]
+        public void Test_111_02()
+        {
+        }
+
+        [Fact]
+        public void Test_111_03()
+        {
+        }
+
+        [Fact]
+        public void Test_111_04()
+        {
+        }
+
+        [Fact]
+        public void Test_111_05()
+        {
+        }
+
+        [Fact]
+        public void Test_111_06()
+        {
+        }
+
+        [Fact]
+        public void Test_111_07()
+        {
+        }
+
+        [Fact]
+        public void Test_111_08()
+        {
+        }
+
+        [Fact]
+        public void Test_111_09()
+        {
+        }
+
+        [Fact]
+        public void Test_111_10()
+        {
+        }
+
+        [Fact]
+        public void Test_111_11()
+        {
+        }
+
+        [Fact]
+        public void Test_111_12()
+        {
+        }
+
+        [Fact]
+        public void Test_111_13()
+        {
+        }
+
+        [Fact]
+        public void Test_111_14()
+        {
+        }
+
+        [Fact]
+        public void Test_111_15()
+        {
+        }
+
+        [Fact]
+        public void Test_111_16()
+        {
+        }
+
+        [Fact]
+        public void Test_111_17()
+        {
+        }
+
+        [Fact]
+        public void Test_111_18()
+        {
+        }
+
+        [Fact]
+        public void Test_111_19()
+        {
+        }
+
+        [Fact]
+        public void Test_111_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_112
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_112_01()
+        {
+        }
+
+        [Fact]
+        public void Test_112_02()
+        {
+        }
+
+        [Fact]
+        public void Test_112_03()
+        {
+        }
+
+        [Fact]
+        public void Test_112_04()
+        {
+        }
+
+        [Fact]
+        public void Test_112_05()
+        {
+        }
+
+        [Fact]
+        public void Test_112_06()
+        {
+        }
+
+        [Fact]
+        public void Test_112_07()
+        {
+        }
+
+        [Fact]
+        public void Test_112_08()
+        {
+        }
+
+        [Fact]
+        public void Test_112_09()
+        {
+        }
+
+        [Fact]
+        public void Test_112_10()
+        {
+        }
+
+        [Fact]
+        public void Test_112_11()
+        {
+        }
+
+        [Fact]
+        public void Test_112_12()
+        {
+        }
+
+        [Fact]
+        public void Test_112_13()
+        {
+        }
+
+        [Fact]
+        public void Test_112_14()
+        {
+        }
+
+        [Fact]
+        public void Test_112_15()
+        {
+        }
+
+        [Fact]
+        public void Test_112_16()
+        {
+        }
+
+        [Fact]
+        public void Test_112_17()
+        {
+        }
+
+        [Fact]
+        public void Test_112_18()
+        {
+        }
+
+        [Fact]
+        public void Test_112_19()
+        {
+        }
+
+        [Fact]
+        public void Test_112_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_113
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_113_01()
+        {
+        }
+
+        [Fact]
+        public void Test_113_02()
+        {
+        }
+
+        [Fact]
+        public void Test_113_03()
+        {
+        }
+
+        [Fact]
+        public void Test_113_04()
+        {
+        }
+
+        [Fact]
+        public void Test_113_05()
+        {
+        }
+
+        [Fact]
+        public void Test_113_06()
+        {
+        }
+
+        [Fact]
+        public void Test_113_07()
+        {
+        }
+
+        [Fact]
+        public void Test_113_08()
+        {
+        }
+
+        [Fact]
+        public void Test_113_09()
+        {
+        }
+
+        [Fact]
+        public void Test_113_10()
+        {
+        }
+
+        [Fact]
+        public void Test_113_11()
+        {
+        }
+
+        [Fact]
+        public void Test_113_12()
+        {
+        }
+
+        [Fact]
+        public void Test_113_13()
+        {
+        }
+
+        [Fact]
+        public void Test_113_14()
+        {
+        }
+
+        [Fact]
+        public void Test_113_15()
+        {
+        }
+
+        [Fact]
+        public void Test_113_16()
+        {
+        }
+
+        [Fact]
+        public void Test_113_17()
+        {
+        }
+
+        [Fact]
+        public void Test_113_18()
+        {
+        }
+
+        [Fact]
+        public void Test_113_19()
+        {
+        }
+
+        [Fact]
+        public void Test_113_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_114
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_114_01()
+        {
+        }
+
+        [Fact]
+        public void Test_114_02()
+        {
+        }
+
+        [Fact]
+        public void Test_114_03()
+        {
+        }
+
+        [Fact]
+        public void Test_114_04()
+        {
+        }
+
+        [Fact]
+        public void Test_114_05()
+        {
+        }
+
+        [Fact]
+        public void Test_114_06()
+        {
+        }
+
+        [Fact]
+        public void Test_114_07()
+        {
+        }
+
+        [Fact]
+        public void Test_114_08()
+        {
+        }
+
+        [Fact]
+        public void Test_114_09()
+        {
+        }
+
+        [Fact]
+        public void Test_114_10()
+        {
+        }
+
+        [Fact]
+        public void Test_114_11()
+        {
+        }
+
+        [Fact]
+        public void Test_114_12()
+        {
+        }
+
+        [Fact]
+        public void Test_114_13()
+        {
+        }
+
+        [Fact]
+        public void Test_114_14()
+        {
+        }
+
+        [Fact]
+        public void Test_114_15()
+        {
+        }
+
+        [Fact]
+        public void Test_114_16()
+        {
+        }
+
+        [Fact]
+        public void Test_114_17()
+        {
+        }
+
+        [Fact]
+        public void Test_114_18()
+        {
+        }
+
+        [Fact]
+        public void Test_114_19()
+        {
+        }
+
+        [Fact]
+        public void Test_114_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_115
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_115_01()
+        {
+        }
+
+        [Fact]
+        public void Test_115_02()
+        {
+        }
+
+        [Fact]
+        public void Test_115_03()
+        {
+        }
+
+        [Fact]
+        public void Test_115_04()
+        {
+        }
+
+        [Fact]
+        public void Test_115_05()
+        {
+        }
+
+        [Fact]
+        public void Test_115_06()
+        {
+        }
+
+        [Fact]
+        public void Test_115_07()
+        {
+        }
+
+        [Fact]
+        public void Test_115_08()
+        {
+        }
+
+        [Fact]
+        public void Test_115_09()
+        {
+        }
+
+        [Fact]
+        public void Test_115_10()
+        {
+        }
+
+        [Fact]
+        public void Test_115_11()
+        {
+        }
+
+        [Fact]
+        public void Test_115_12()
+        {
+        }
+
+        [Fact]
+        public void Test_115_13()
+        {
+        }
+
+        [Fact]
+        public void Test_115_14()
+        {
+        }
+
+        [Fact]
+        public void Test_115_15()
+        {
+        }
+
+        [Fact]
+        public void Test_115_16()
+        {
+        }
+
+        [Fact]
+        public void Test_115_17()
+        {
+        }
+
+        [Fact]
+        public void Test_115_18()
+        {
+        }
+
+        [Fact]
+        public void Test_115_19()
+        {
+        }
+
+        [Fact]
+        public void Test_115_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_116
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_116_01()
+        {
+        }
+
+        [Fact]
+        public void Test_116_02()
+        {
+        }
+
+        [Fact]
+        public void Test_116_03()
+        {
+        }
+
+        [Fact]
+        public void Test_116_04()
+        {
+        }
+
+        [Fact]
+        public void Test_116_05()
+        {
+        }
+
+        [Fact]
+        public void Test_116_06()
+        {
+        }
+
+        [Fact]
+        public void Test_116_07()
+        {
+        }
+
+        [Fact]
+        public void Test_116_08()
+        {
+        }
+
+        [Fact]
+        public void Test_116_09()
+        {
+        }
+
+        [Fact]
+        public void Test_116_10()
+        {
+        }
+
+        [Fact]
+        public void Test_116_11()
+        {
+        }
+
+        [Fact]
+        public void Test_116_12()
+        {
+        }
+
+        [Fact]
+        public void Test_116_13()
+        {
+        }
+
+        [Fact]
+        public void Test_116_14()
+        {
+        }
+
+        [Fact]
+        public void Test_116_15()
+        {
+        }
+
+        [Fact]
+        public void Test_116_16()
+        {
+        }
+
+        [Fact]
+        public void Test_116_17()
+        {
+        }
+
+        [Fact]
+        public void Test_116_18()
+        {
+        }
+
+        [Fact]
+        public void Test_116_19()
+        {
+        }
+
+        [Fact]
+        public void Test_116_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_117
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_117_01()
+        {
+        }
+
+        [Fact]
+        public void Test_117_02()
+        {
+        }
+
+        [Fact]
+        public void Test_117_03()
+        {
+        }
+
+        [Fact]
+        public void Test_117_04()
+        {
+        }
+
+        [Fact]
+        public void Test_117_05()
+        {
+        }
+
+        [Fact]
+        public void Test_117_06()
+        {
+        }
+
+        [Fact]
+        public void Test_117_07()
+        {
+        }
+
+        [Fact]
+        public void Test_117_08()
+        {
+        }
+
+        [Fact]
+        public void Test_117_09()
+        {
+        }
+
+        [Fact]
+        public void Test_117_10()
+        {
+        }
+
+        [Fact]
+        public void Test_117_11()
+        {
+        }
+
+        [Fact]
+        public void Test_117_12()
+        {
+        }
+
+        [Fact]
+        public void Test_117_13()
+        {
+        }
+
+        [Fact]
+        public void Test_117_14()
+        {
+        }
+
+        [Fact]
+        public void Test_117_15()
+        {
+        }
+
+        [Fact]
+        public void Test_117_16()
+        {
+        }
+
+        [Fact]
+        public void Test_117_17()
+        {
+        }
+
+        [Fact]
+        public void Test_117_18()
+        {
+        }
+
+        [Fact]
+        public void Test_117_19()
+        {
+        }
+
+        [Fact]
+        public void Test_117_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_118
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_118_01()
+        {
+        }
+
+        [Fact]
+        public void Test_118_02()
+        {
+        }
+
+        [Fact]
+        public void Test_118_03()
+        {
+        }
+
+        [Fact]
+        public void Test_118_04()
+        {
+        }
+
+        [Fact]
+        public void Test_118_05()
+        {
+        }
+
+        [Fact]
+        public void Test_118_06()
+        {
+        }
+
+        [Fact]
+        public void Test_118_07()
+        {
+        }
+
+        [Fact]
+        public void Test_118_08()
+        {
+        }
+
+        [Fact]
+        public void Test_118_09()
+        {
+        }
+
+        [Fact]
+        public void Test_118_10()
+        {
+        }
+
+        [Fact]
+        public void Test_118_11()
+        {
+        }
+
+        [Fact]
+        public void Test_118_12()
+        {
+        }
+
+        [Fact]
+        public void Test_118_13()
+        {
+        }
+
+        [Fact]
+        public void Test_118_14()
+        {
+        }
+
+        [Fact]
+        public void Test_118_15()
+        {
+        }
+
+        [Fact]
+        public void Test_118_16()
+        {
+        }
+
+        [Fact]
+        public void Test_118_17()
+        {
+        }
+
+        [Fact]
+        public void Test_118_18()
+        {
+        }
+
+        [Fact]
+        public void Test_118_19()
+        {
+        }
+
+        [Fact]
+        public void Test_118_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_119
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_119_01()
+        {
+        }
+
+        [Fact]
+        public void Test_119_02()
+        {
+        }
+
+        [Fact]
+        public void Test_119_03()
+        {
+        }
+
+        [Fact]
+        public void Test_119_04()
+        {
+        }
+
+        [Fact]
+        public void Test_119_05()
+        {
+        }
+
+        [Fact]
+        public void Test_119_06()
+        {
+        }
+
+        [Fact]
+        public void Test_119_07()
+        {
+        }
+
+        [Fact]
+        public void Test_119_08()
+        {
+        }
+
+        [Fact]
+        public void Test_119_09()
+        {
+        }
+
+        [Fact]
+        public void Test_119_10()
+        {
+        }
+
+        [Fact]
+        public void Test_119_11()
+        {
+        }
+
+        [Fact]
+        public void Test_119_12()
+        {
+        }
+
+        [Fact]
+        public void Test_119_13()
+        {
+        }
+
+        [Fact]
+        public void Test_119_14()
+        {
+        }
+
+        [Fact]
+        public void Test_119_15()
+        {
+        }
+
+        [Fact]
+        public void Test_119_16()
+        {
+        }
+
+        [Fact]
+        public void Test_119_17()
+        {
+        }
+
+        [Fact]
+        public void Test_119_18()
+        {
+        }
+
+        [Fact]
+        public void Test_119_19()
+        {
+        }
+
+        [Fact]
+        public void Test_119_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_120
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_120_01()
+        {
+        }
+
+        [Fact]
+        public void Test_120_02()
+        {
+        }
+
+        [Fact]
+        public void Test_120_03()
+        {
+        }
+
+        [Fact]
+        public void Test_120_04()
+        {
+        }
+
+        [Fact]
+        public void Test_120_05()
+        {
+        }
+
+        [Fact]
+        public void Test_120_06()
+        {
+        }
+
+        [Fact]
+        public void Test_120_07()
+        {
+        }
+
+        [Fact]
+        public void Test_120_08()
+        {
+        }
+
+        [Fact]
+        public void Test_120_09()
+        {
+        }
+
+        [Fact]
+        public void Test_120_10()
+        {
+        }
+
+        [Fact]
+        public void Test_120_11()
+        {
+        }
+
+        [Fact]
+        public void Test_120_12()
+        {
+        }
+
+        [Fact]
+        public void Test_120_13()
+        {
+        }
+
+        [Fact]
+        public void Test_120_14()
+        {
+        }
+
+        [Fact]
+        public void Test_120_15()
+        {
+        }
+
+        [Fact]
+        public void Test_120_16()
+        {
+        }
+
+        [Fact]
+        public void Test_120_17()
+        {
+        }
+
+        [Fact]
+        public void Test_120_18()
+        {
+        }
+
+        [Fact]
+        public void Test_120_19()
+        {
+        }
+
+        [Fact]
+        public void Test_120_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_121
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_121_01()
+        {
+        }
+
+        [Fact]
+        public void Test_121_02()
+        {
+        }
+
+        [Fact]
+        public void Test_121_03()
+        {
+        }
+
+        [Fact]
+        public void Test_121_04()
+        {
+        }
+
+        [Fact]
+        public void Test_121_05()
+        {
+        }
+
+        [Fact]
+        public void Test_121_06()
+        {
+        }
+
+        [Fact]
+        public void Test_121_07()
+        {
+        }
+
+        [Fact]
+        public void Test_121_08()
+        {
+        }
+
+        [Fact]
+        public void Test_121_09()
+        {
+        }
+
+        [Fact]
+        public void Test_121_10()
+        {
+        }
+
+        [Fact]
+        public void Test_121_11()
+        {
+        }
+
+        [Fact]
+        public void Test_121_12()
+        {
+        }
+
+        [Fact]
+        public void Test_121_13()
+        {
+        }
+
+        [Fact]
+        public void Test_121_14()
+        {
+        }
+
+        [Fact]
+        public void Test_121_15()
+        {
+        }
+
+        [Fact]
+        public void Test_121_16()
+        {
+        }
+
+        [Fact]
+        public void Test_121_17()
+        {
+        }
+
+        [Fact]
+        public void Test_121_18()
+        {
+        }
+
+        [Fact]
+        public void Test_121_19()
+        {
+        }
+
+        [Fact]
+        public void Test_121_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_122
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_122_01()
+        {
+        }
+
+        [Fact]
+        public void Test_122_02()
+        {
+        }
+
+        [Fact]
+        public void Test_122_03()
+        {
+        }
+
+        [Fact]
+        public void Test_122_04()
+        {
+        }
+
+        [Fact]
+        public void Test_122_05()
+        {
+        }
+
+        [Fact]
+        public void Test_122_06()
+        {
+        }
+
+        [Fact]
+        public void Test_122_07()
+        {
+        }
+
+        [Fact]
+        public void Test_122_08()
+        {
+        }
+
+        [Fact]
+        public void Test_122_09()
+        {
+        }
+
+        [Fact]
+        public void Test_122_10()
+        {
+        }
+
+        [Fact]
+        public void Test_122_11()
+        {
+        }
+
+        [Fact]
+        public void Test_122_12()
+        {
+        }
+
+        [Fact]
+        public void Test_122_13()
+        {
+        }
+
+        [Fact]
+        public void Test_122_14()
+        {
+        }
+
+        [Fact]
+        public void Test_122_15()
+        {
+        }
+
+        [Fact]
+        public void Test_122_16()
+        {
+        }
+
+        [Fact]
+        public void Test_122_17()
+        {
+        }
+
+        [Fact]
+        public void Test_122_18()
+        {
+        }
+
+        [Fact]
+        public void Test_122_19()
+        {
+        }
+
+        [Fact]
+        public void Test_122_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_123
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_123_01()
+        {
+        }
+
+        [Fact]
+        public void Test_123_02()
+        {
+        }
+
+        [Fact]
+        public void Test_123_03()
+        {
+        }
+
+        [Fact]
+        public void Test_123_04()
+        {
+        }
+
+        [Fact]
+        public void Test_123_05()
+        {
+        }
+
+        [Fact]
+        public void Test_123_06()
+        {
+        }
+
+        [Fact]
+        public void Test_123_07()
+        {
+        }
+
+        [Fact]
+        public void Test_123_08()
+        {
+        }
+
+        [Fact]
+        public void Test_123_09()
+        {
+        }
+
+        [Fact]
+        public void Test_123_10()
+        {
+        }
+
+        [Fact]
+        public void Test_123_11()
+        {
+        }
+
+        [Fact]
+        public void Test_123_12()
+        {
+        }
+
+        [Fact]
+        public void Test_123_13()
+        {
+        }
+
+        [Fact]
+        public void Test_123_14()
+        {
+        }
+
+        [Fact]
+        public void Test_123_15()
+        {
+        }
+
+        [Fact]
+        public void Test_123_16()
+        {
+        }
+
+        [Fact]
+        public void Test_123_17()
+        {
+        }
+
+        [Fact]
+        public void Test_123_18()
+        {
+        }
+
+        [Fact]
+        public void Test_123_19()
+        {
+        }
+
+        [Fact]
+        public void Test_123_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_124
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_124_01()
+        {
+        }
+
+        [Fact]
+        public void Test_124_02()
+        {
+        }
+
+        [Fact]
+        public void Test_124_03()
+        {
+        }
+
+        [Fact]
+        public void Test_124_04()
+        {
+        }
+
+        [Fact]
+        public void Test_124_05()
+        {
+        }
+
+        [Fact]
+        public void Test_124_06()
+        {
+        }
+
+        [Fact]
+        public void Test_124_07()
+        {
+        }
+
+        [Fact]
+        public void Test_124_08()
+        {
+        }
+
+        [Fact]
+        public void Test_124_09()
+        {
+        }
+
+        [Fact]
+        public void Test_124_10()
+        {
+        }
+
+        [Fact]
+        public void Test_124_11()
+        {
+        }
+
+        [Fact]
+        public void Test_124_12()
+        {
+        }
+
+        [Fact]
+        public void Test_124_13()
+        {
+        }
+
+        [Fact]
+        public void Test_124_14()
+        {
+        }
+
+        [Fact]
+        public void Test_124_15()
+        {
+        }
+
+        [Fact]
+        public void Test_124_16()
+        {
+        }
+
+        [Fact]
+        public void Test_124_17()
+        {
+        }
+
+        [Fact]
+        public void Test_124_18()
+        {
+        }
+
+        [Fact]
+        public void Test_124_19()
+        {
+        }
+
+        [Fact]
+        public void Test_124_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_125
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_125_01()
+        {
+        }
+
+        [Fact]
+        public void Test_125_02()
+        {
+        }
+
+        [Fact]
+        public void Test_125_03()
+        {
+        }
+
+        [Fact]
+        public void Test_125_04()
+        {
+        }
+
+        [Fact]
+        public void Test_125_05()
+        {
+        }
+
+        [Fact]
+        public void Test_125_06()
+        {
+        }
+
+        [Fact]
+        public void Test_125_07()
+        {
+        }
+
+        [Fact]
+        public void Test_125_08()
+        {
+        }
+
+        [Fact]
+        public void Test_125_09()
+        {
+        }
+
+        [Fact]
+        public void Test_125_10()
+        {
+        }
+
+        [Fact]
+        public void Test_125_11()
+        {
+        }
+
+        [Fact]
+        public void Test_125_12()
+        {
+        }
+
+        [Fact]
+        public void Test_125_13()
+        {
+        }
+
+        [Fact]
+        public void Test_125_14()
+        {
+        }
+
+        [Fact]
+        public void Test_125_15()
+        {
+        }
+
+        [Fact]
+        public void Test_125_16()
+        {
+        }
+
+        [Fact]
+        public void Test_125_17()
+        {
+        }
+
+        [Fact]
+        public void Test_125_18()
+        {
+        }
+
+        [Fact]
+        public void Test_125_19()
+        {
+        }
+
+        [Fact]
+        public void Test_125_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_126
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_126_01()
+        {
+        }
+
+        [Fact]
+        public void Test_126_02()
+        {
+        }
+
+        [Fact]
+        public void Test_126_03()
+        {
+        }
+
+        [Fact]
+        public void Test_126_04()
+        {
+        }
+
+        [Fact]
+        public void Test_126_05()
+        {
+        }
+
+        [Fact]
+        public void Test_126_06()
+        {
+        }
+
+        [Fact]
+        public void Test_126_07()
+        {
+        }
+
+        [Fact]
+        public void Test_126_08()
+        {
+        }
+
+        [Fact]
+        public void Test_126_09()
+        {
+        }
+
+        [Fact]
+        public void Test_126_10()
+        {
+        }
+
+        [Fact]
+        public void Test_126_11()
+        {
+        }
+
+        [Fact]
+        public void Test_126_12()
+        {
+        }
+
+        [Fact]
+        public void Test_126_13()
+        {
+        }
+
+        [Fact]
+        public void Test_126_14()
+        {
+        }
+
+        [Fact]
+        public void Test_126_15()
+        {
+        }
+
+        [Fact]
+        public void Test_126_16()
+        {
+        }
+
+        [Fact]
+        public void Test_126_17()
+        {
+        }
+
+        [Fact]
+        public void Test_126_18()
+        {
+        }
+
+        [Fact]
+        public void Test_126_19()
+        {
+        }
+
+        [Fact]
+        public void Test_126_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_127
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_127_01()
+        {
+        }
+
+        [Fact]
+        public void Test_127_02()
+        {
+        }
+
+        [Fact]
+        public void Test_127_03()
+        {
+        }
+
+        [Fact]
+        public void Test_127_04()
+        {
+        }
+
+        [Fact]
+        public void Test_127_05()
+        {
+        }
+
+        [Fact]
+        public void Test_127_06()
+        {
+        }
+
+        [Fact]
+        public void Test_127_07()
+        {
+        }
+
+        [Fact]
+        public void Test_127_08()
+        {
+        }
+
+        [Fact]
+        public void Test_127_09()
+        {
+        }
+
+        [Fact]
+        public void Test_127_10()
+        {
+        }
+
+        [Fact]
+        public void Test_127_11()
+        {
+        }
+
+        [Fact]
+        public void Test_127_12()
+        {
+        }
+
+        [Fact]
+        public void Test_127_13()
+        {
+        }
+
+        [Fact]
+        public void Test_127_14()
+        {
+        }
+
+        [Fact]
+        public void Test_127_15()
+        {
+        }
+
+        [Fact]
+        public void Test_127_16()
+        {
+        }
+
+        [Fact]
+        public void Test_127_17()
+        {
+        }
+
+        [Fact]
+        public void Test_127_18()
+        {
+        }
+
+        [Fact]
+        public void Test_127_19()
+        {
+        }
+
+        [Fact]
+        public void Test_127_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_128
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_128_01()
+        {
+        }
+
+        [Fact]
+        public void Test_128_02()
+        {
+        }
+
+        [Fact]
+        public void Test_128_03()
+        {
+        }
+
+        [Fact]
+        public void Test_128_04()
+        {
+        }
+
+        [Fact]
+        public void Test_128_05()
+        {
+        }
+
+        [Fact]
+        public void Test_128_06()
+        {
+        }
+
+        [Fact]
+        public void Test_128_07()
+        {
+        }
+
+        [Fact]
+        public void Test_128_08()
+        {
+        }
+
+        [Fact]
+        public void Test_128_09()
+        {
+        }
+
+        [Fact]
+        public void Test_128_10()
+        {
+        }
+
+        [Fact]
+        public void Test_128_11()
+        {
+        }
+
+        [Fact]
+        public void Test_128_12()
+        {
+        }
+
+        [Fact]
+        public void Test_128_13()
+        {
+        }
+
+        [Fact]
+        public void Test_128_14()
+        {
+        }
+
+        [Fact]
+        public void Test_128_15()
+        {
+        }
+
+        [Fact]
+        public void Test_128_16()
+        {
+        }
+
+        [Fact]
+        public void Test_128_17()
+        {
+        }
+
+        [Fact]
+        public void Test_128_18()
+        {
+        }
+
+        [Fact]
+        public void Test_128_19()
+        {
+        }
+
+        [Fact]
+        public void Test_128_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_129
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_129_01()
+        {
+        }
+
+        [Fact]
+        public void Test_129_02()
+        {
+        }
+
+        [Fact]
+        public void Test_129_03()
+        {
+        }
+
+        [Fact]
+        public void Test_129_04()
+        {
+        }
+
+        [Fact]
+        public void Test_129_05()
+        {
+        }
+
+        [Fact]
+        public void Test_129_06()
+        {
+        }
+
+        [Fact]
+        public void Test_129_07()
+        {
+        }
+
+        [Fact]
+        public void Test_129_08()
+        {
+        }
+
+        [Fact]
+        public void Test_129_09()
+        {
+        }
+
+        [Fact]
+        public void Test_129_10()
+        {
+        }
+
+        [Fact]
+        public void Test_129_11()
+        {
+        }
+
+        [Fact]
+        public void Test_129_12()
+        {
+        }
+
+        [Fact]
+        public void Test_129_13()
+        {
+        }
+
+        [Fact]
+        public void Test_129_14()
+        {
+        }
+
+        [Fact]
+        public void Test_129_15()
+        {
+        }
+
+        [Fact]
+        public void Test_129_16()
+        {
+        }
+
+        [Fact]
+        public void Test_129_17()
+        {
+        }
+
+        [Fact]
+        public void Test_129_18()
+        {
+        }
+
+        [Fact]
+        public void Test_129_19()
+        {
+        }
+
+        [Fact]
+        public void Test_129_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_130
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_130_01()
+        {
+        }
+
+        [Fact]
+        public void Test_130_02()
+        {
+        }
+
+        [Fact]
+        public void Test_130_03()
+        {
+        }
+
+        [Fact]
+        public void Test_130_04()
+        {
+        }
+
+        [Fact]
+        public void Test_130_05()
+        {
+        }
+
+        [Fact]
+        public void Test_130_06()
+        {
+        }
+
+        [Fact]
+        public void Test_130_07()
+        {
+        }
+
+        [Fact]
+        public void Test_130_08()
+        {
+        }
+
+        [Fact]
+        public void Test_130_09()
+        {
+        }
+
+        [Fact]
+        public void Test_130_10()
+        {
+        }
+
+        [Fact]
+        public void Test_130_11()
+        {
+        }
+
+        [Fact]
+        public void Test_130_12()
+        {
+        }
+
+        [Fact]
+        public void Test_130_13()
+        {
+        }
+
+        [Fact]
+        public void Test_130_14()
+        {
+        }
+
+        [Fact]
+        public void Test_130_15()
+        {
+        }
+
+        [Fact]
+        public void Test_130_16()
+        {
+        }
+
+        [Fact]
+        public void Test_130_17()
+        {
+        }
+
+        [Fact]
+        public void Test_130_18()
+        {
+        }
+
+        [Fact]
+        public void Test_130_19()
+        {
+        }
+
+        [Fact]
+        public void Test_130_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_131
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_131_01()
+        {
+        }
+
+        [Fact]
+        public void Test_131_02()
+        {
+        }
+
+        [Fact]
+        public void Test_131_03()
+        {
+        }
+
+        [Fact]
+        public void Test_131_04()
+        {
+        }
+
+        [Fact]
+        public void Test_131_05()
+        {
+        }
+
+        [Fact]
+        public void Test_131_06()
+        {
+        }
+
+        [Fact]
+        public void Test_131_07()
+        {
+        }
+
+        [Fact]
+        public void Test_131_08()
+        {
+        }
+
+        [Fact]
+        public void Test_131_09()
+        {
+        }
+
+        [Fact]
+        public void Test_131_10()
+        {
+        }
+
+        [Fact]
+        public void Test_131_11()
+        {
+        }
+
+        [Fact]
+        public void Test_131_12()
+        {
+        }
+
+        [Fact]
+        public void Test_131_13()
+        {
+        }
+
+        [Fact]
+        public void Test_131_14()
+        {
+        }
+
+        [Fact]
+        public void Test_131_15()
+        {
+        }
+
+        [Fact]
+        public void Test_131_16()
+        {
+        }
+
+        [Fact]
+        public void Test_131_17()
+        {
+        }
+
+        [Fact]
+        public void Test_131_18()
+        {
+        }
+
+        [Fact]
+        public void Test_131_19()
+        {
+        }
+
+        [Fact]
+        public void Test_131_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_132
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_132_01()
+        {
+        }
+
+        [Fact]
+        public void Test_132_02()
+        {
+        }
+
+        [Fact]
+        public void Test_132_03()
+        {
+        }
+
+        [Fact]
+        public void Test_132_04()
+        {
+        }
+
+        [Fact]
+        public void Test_132_05()
+        {
+        }
+
+        [Fact]
+        public void Test_132_06()
+        {
+        }
+
+        [Fact]
+        public void Test_132_07()
+        {
+        }
+
+        [Fact]
+        public void Test_132_08()
+        {
+        }
+
+        [Fact]
+        public void Test_132_09()
+        {
+        }
+
+        [Fact]
+        public void Test_132_10()
+        {
+        }
+
+        [Fact]
+        public void Test_132_11()
+        {
+        }
+
+        [Fact]
+        public void Test_132_12()
+        {
+        }
+
+        [Fact]
+        public void Test_132_13()
+        {
+        }
+
+        [Fact]
+        public void Test_132_14()
+        {
+        }
+
+        [Fact]
+        public void Test_132_15()
+        {
+        }
+
+        [Fact]
+        public void Test_132_16()
+        {
+        }
+
+        [Fact]
+        public void Test_132_17()
+        {
+        }
+
+        [Fact]
+        public void Test_132_18()
+        {
+        }
+
+        [Fact]
+        public void Test_132_19()
+        {
+        }
+
+        [Fact]
+        public void Test_132_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_133
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_133_01()
+        {
+        }
+
+        [Fact]
+        public void Test_133_02()
+        {
+        }
+
+        [Fact]
+        public void Test_133_03()
+        {
+        }
+
+        [Fact]
+        public void Test_133_04()
+        {
+        }
+
+        [Fact]
+        public void Test_133_05()
+        {
+        }
+
+        [Fact]
+        public void Test_133_06()
+        {
+        }
+
+        [Fact]
+        public void Test_133_07()
+        {
+        }
+
+        [Fact]
+        public void Test_133_08()
+        {
+        }
+
+        [Fact]
+        public void Test_133_09()
+        {
+        }
+
+        [Fact]
+        public void Test_133_10()
+        {
+        }
+
+        [Fact]
+        public void Test_133_11()
+        {
+        }
+
+        [Fact]
+        public void Test_133_12()
+        {
+        }
+
+        [Fact]
+        public void Test_133_13()
+        {
+        }
+
+        [Fact]
+        public void Test_133_14()
+        {
+        }
+
+        [Fact]
+        public void Test_133_15()
+        {
+        }
+
+        [Fact]
+        public void Test_133_16()
+        {
+        }
+
+        [Fact]
+        public void Test_133_17()
+        {
+        }
+
+        [Fact]
+        public void Test_133_18()
+        {
+        }
+
+        [Fact]
+        public void Test_133_19()
+        {
+        }
+
+        [Fact]
+        public void Test_133_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_134
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_134_01()
+        {
+        }
+
+        [Fact]
+        public void Test_134_02()
+        {
+        }
+
+        [Fact]
+        public void Test_134_03()
+        {
+        }
+
+        [Fact]
+        public void Test_134_04()
+        {
+        }
+
+        [Fact]
+        public void Test_134_05()
+        {
+        }
+
+        [Fact]
+        public void Test_134_06()
+        {
+        }
+
+        [Fact]
+        public void Test_134_07()
+        {
+        }
+
+        [Fact]
+        public void Test_134_08()
+        {
+        }
+
+        [Fact]
+        public void Test_134_09()
+        {
+        }
+
+        [Fact]
+        public void Test_134_10()
+        {
+        }
+
+        [Fact]
+        public void Test_134_11()
+        {
+        }
+
+        [Fact]
+        public void Test_134_12()
+        {
+        }
+
+        [Fact]
+        public void Test_134_13()
+        {
+        }
+
+        [Fact]
+        public void Test_134_14()
+        {
+        }
+
+        [Fact]
+        public void Test_134_15()
+        {
+        }
+
+        [Fact]
+        public void Test_134_16()
+        {
+        }
+
+        [Fact]
+        public void Test_134_17()
+        {
+        }
+
+        [Fact]
+        public void Test_134_18()
+        {
+        }
+
+        [Fact]
+        public void Test_134_19()
+        {
+        }
+
+        [Fact]
+        public void Test_134_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_135
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_135_01()
+        {
+        }
+
+        [Fact]
+        public void Test_135_02()
+        {
+        }
+
+        [Fact]
+        public void Test_135_03()
+        {
+        }
+
+        [Fact]
+        public void Test_135_04()
+        {
+        }
+
+        [Fact]
+        public void Test_135_05()
+        {
+        }
+
+        [Fact]
+        public void Test_135_06()
+        {
+        }
+
+        [Fact]
+        public void Test_135_07()
+        {
+        }
+
+        [Fact]
+        public void Test_135_08()
+        {
+        }
+
+        [Fact]
+        public void Test_135_09()
+        {
+        }
+
+        [Fact]
+        public void Test_135_10()
+        {
+        }
+
+        [Fact]
+        public void Test_135_11()
+        {
+        }
+
+        [Fact]
+        public void Test_135_12()
+        {
+        }
+
+        [Fact]
+        public void Test_135_13()
+        {
+        }
+
+        [Fact]
+        public void Test_135_14()
+        {
+        }
+
+        [Fact]
+        public void Test_135_15()
+        {
+        }
+
+        [Fact]
+        public void Test_135_16()
+        {
+        }
+
+        [Fact]
+        public void Test_135_17()
+        {
+        }
+
+        [Fact]
+        public void Test_135_18()
+        {
+        }
+
+        [Fact]
+        public void Test_135_19()
+        {
+        }
+
+        [Fact]
+        public void Test_135_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_136
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_136_01()
+        {
+        }
+
+        [Fact]
+        public void Test_136_02()
+        {
+        }
+
+        [Fact]
+        public void Test_136_03()
+        {
+        }
+
+        [Fact]
+        public void Test_136_04()
+        {
+        }
+
+        [Fact]
+        public void Test_136_05()
+        {
+        }
+
+        [Fact]
+        public void Test_136_06()
+        {
+        }
+
+        [Fact]
+        public void Test_136_07()
+        {
+        }
+
+        [Fact]
+        public void Test_136_08()
+        {
+        }
+
+        [Fact]
+        public void Test_136_09()
+        {
+        }
+
+        [Fact]
+        public void Test_136_10()
+        {
+        }
+
+        [Fact]
+        public void Test_136_11()
+        {
+        }
+
+        [Fact]
+        public void Test_136_12()
+        {
+        }
+
+        [Fact]
+        public void Test_136_13()
+        {
+        }
+
+        [Fact]
+        public void Test_136_14()
+        {
+        }
+
+        [Fact]
+        public void Test_136_15()
+        {
+        }
+
+        [Fact]
+        public void Test_136_16()
+        {
+        }
+
+        [Fact]
+        public void Test_136_17()
+        {
+        }
+
+        [Fact]
+        public void Test_136_18()
+        {
+        }
+
+        [Fact]
+        public void Test_136_19()
+        {
+        }
+
+        [Fact]
+        public void Test_136_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_137
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_137_01()
+        {
+        }
+
+        [Fact]
+        public void Test_137_02()
+        {
+        }
+
+        [Fact]
+        public void Test_137_03()
+        {
+        }
+
+        [Fact]
+        public void Test_137_04()
+        {
+        }
+
+        [Fact]
+        public void Test_137_05()
+        {
+        }
+
+        [Fact]
+        public void Test_137_06()
+        {
+        }
+
+        [Fact]
+        public void Test_137_07()
+        {
+        }
+
+        [Fact]
+        public void Test_137_08()
+        {
+        }
+
+        [Fact]
+        public void Test_137_09()
+        {
+        }
+
+        [Fact]
+        public void Test_137_10()
+        {
+        }
+
+        [Fact]
+        public void Test_137_11()
+        {
+        }
+
+        [Fact]
+        public void Test_137_12()
+        {
+        }
+
+        [Fact]
+        public void Test_137_13()
+        {
+        }
+
+        [Fact]
+        public void Test_137_14()
+        {
+        }
+
+        [Fact]
+        public void Test_137_15()
+        {
+        }
+
+        [Fact]
+        public void Test_137_16()
+        {
+        }
+
+        [Fact]
+        public void Test_137_17()
+        {
+        }
+
+        [Fact]
+        public void Test_137_18()
+        {
+        }
+
+        [Fact]
+        public void Test_137_19()
+        {
+        }
+
+        [Fact]
+        public void Test_137_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_138
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_138_01()
+        {
+        }
+
+        [Fact]
+        public void Test_138_02()
+        {
+        }
+
+        [Fact]
+        public void Test_138_03()
+        {
+        }
+
+        [Fact]
+        public void Test_138_04()
+        {
+        }
+
+        [Fact]
+        public void Test_138_05()
+        {
+        }
+
+        [Fact]
+        public void Test_138_06()
+        {
+        }
+
+        [Fact]
+        public void Test_138_07()
+        {
+        }
+
+        [Fact]
+        public void Test_138_08()
+        {
+        }
+
+        [Fact]
+        public void Test_138_09()
+        {
+        }
+
+        [Fact]
+        public void Test_138_10()
+        {
+        }
+
+        [Fact]
+        public void Test_138_11()
+        {
+        }
+
+        [Fact]
+        public void Test_138_12()
+        {
+        }
+
+        [Fact]
+        public void Test_138_13()
+        {
+        }
+
+        [Fact]
+        public void Test_138_14()
+        {
+        }
+
+        [Fact]
+        public void Test_138_15()
+        {
+        }
+
+        [Fact]
+        public void Test_138_16()
+        {
+        }
+
+        [Fact]
+        public void Test_138_17()
+        {
+        }
+
+        [Fact]
+        public void Test_138_18()
+        {
+        }
+
+        [Fact]
+        public void Test_138_19()
+        {
+        }
+
+        [Fact]
+        public void Test_138_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_139
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_139_01()
+        {
+        }
+
+        [Fact]
+        public void Test_139_02()
+        {
+        }
+
+        [Fact]
+        public void Test_139_03()
+        {
+        }
+
+        [Fact]
+        public void Test_139_04()
+        {
+        }
+
+        [Fact]
+        public void Test_139_05()
+        {
+        }
+
+        [Fact]
+        public void Test_139_06()
+        {
+        }
+
+        [Fact]
+        public void Test_139_07()
+        {
+        }
+
+        [Fact]
+        public void Test_139_08()
+        {
+        }
+
+        [Fact]
+        public void Test_139_09()
+        {
+        }
+
+        [Fact]
+        public void Test_139_10()
+        {
+        }
+
+        [Fact]
+        public void Test_139_11()
+        {
+        }
+
+        [Fact]
+        public void Test_139_12()
+        {
+        }
+
+        [Fact]
+        public void Test_139_13()
+        {
+        }
+
+        [Fact]
+        public void Test_139_14()
+        {
+        }
+
+        [Fact]
+        public void Test_139_15()
+        {
+        }
+
+        [Fact]
+        public void Test_139_16()
+        {
+        }
+
+        [Fact]
+        public void Test_139_17()
+        {
+        }
+
+        [Fact]
+        public void Test_139_18()
+        {
+        }
+
+        [Fact]
+        public void Test_139_19()
+        {
+        }
+
+        [Fact]
+        public void Test_139_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_140
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_140_01()
+        {
+        }
+
+        [Fact]
+        public void Test_140_02()
+        {
+        }
+
+        [Fact]
+        public void Test_140_03()
+        {
+        }
+
+        [Fact]
+        public void Test_140_04()
+        {
+        }
+
+        [Fact]
+        public void Test_140_05()
+        {
+        }
+
+        [Fact]
+        public void Test_140_06()
+        {
+        }
+
+        [Fact]
+        public void Test_140_07()
+        {
+        }
+
+        [Fact]
+        public void Test_140_08()
+        {
+        }
+
+        [Fact]
+        public void Test_140_09()
+        {
+        }
+
+        [Fact]
+        public void Test_140_10()
+        {
+        }
+
+        [Fact]
+        public void Test_140_11()
+        {
+        }
+
+        [Fact]
+        public void Test_140_12()
+        {
+        }
+
+        [Fact]
+        public void Test_140_13()
+        {
+        }
+
+        [Fact]
+        public void Test_140_14()
+        {
+        }
+
+        [Fact]
+        public void Test_140_15()
+        {
+        }
+
+        [Fact]
+        public void Test_140_16()
+        {
+        }
+
+        [Fact]
+        public void Test_140_17()
+        {
+        }
+
+        [Fact]
+        public void Test_140_18()
+        {
+        }
+
+        [Fact]
+        public void Test_140_19()
+        {
+        }
+
+        [Fact]
+        public void Test_140_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_141
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_141_01()
+        {
+        }
+
+        [Fact]
+        public void Test_141_02()
+        {
+        }
+
+        [Fact]
+        public void Test_141_03()
+        {
+        }
+
+        [Fact]
+        public void Test_141_04()
+        {
+        }
+
+        [Fact]
+        public void Test_141_05()
+        {
+        }
+
+        [Fact]
+        public void Test_141_06()
+        {
+        }
+
+        [Fact]
+        public void Test_141_07()
+        {
+        }
+
+        [Fact]
+        public void Test_141_08()
+        {
+        }
+
+        [Fact]
+        public void Test_141_09()
+        {
+        }
+
+        [Fact]
+        public void Test_141_10()
+        {
+        }
+
+        [Fact]
+        public void Test_141_11()
+        {
+        }
+
+        [Fact]
+        public void Test_141_12()
+        {
+        }
+
+        [Fact]
+        public void Test_141_13()
+        {
+        }
+
+        [Fact]
+        public void Test_141_14()
+        {
+        }
+
+        [Fact]
+        public void Test_141_15()
+        {
+        }
+
+        [Fact]
+        public void Test_141_16()
+        {
+        }
+
+        [Fact]
+        public void Test_141_17()
+        {
+        }
+
+        [Fact]
+        public void Test_141_18()
+        {
+        }
+
+        [Fact]
+        public void Test_141_19()
+        {
+        }
+
+        [Fact]
+        public void Test_141_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_142
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_142_01()
+        {
+        }
+
+        [Fact]
+        public void Test_142_02()
+        {
+        }
+
+        [Fact]
+        public void Test_142_03()
+        {
+        }
+
+        [Fact]
+        public void Test_142_04()
+        {
+        }
+
+        [Fact]
+        public void Test_142_05()
+        {
+        }
+
+        [Fact]
+        public void Test_142_06()
+        {
+        }
+
+        [Fact]
+        public void Test_142_07()
+        {
+        }
+
+        [Fact]
+        public void Test_142_08()
+        {
+        }
+
+        [Fact]
+        public void Test_142_09()
+        {
+        }
+
+        [Fact]
+        public void Test_142_10()
+        {
+        }
+
+        [Fact]
+        public void Test_142_11()
+        {
+        }
+
+        [Fact]
+        public void Test_142_12()
+        {
+        }
+
+        [Fact]
+        public void Test_142_13()
+        {
+        }
+
+        [Fact]
+        public void Test_142_14()
+        {
+        }
+
+        [Fact]
+        public void Test_142_15()
+        {
+        }
+
+        [Fact]
+        public void Test_142_16()
+        {
+        }
+
+        [Fact]
+        public void Test_142_17()
+        {
+        }
+
+        [Fact]
+        public void Test_142_18()
+        {
+        }
+
+        [Fact]
+        public void Test_142_19()
+        {
+        }
+
+        [Fact]
+        public void Test_142_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_143
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_143_01()
+        {
+        }
+
+        [Fact]
+        public void Test_143_02()
+        {
+        }
+
+        [Fact]
+        public void Test_143_03()
+        {
+        }
+
+        [Fact]
+        public void Test_143_04()
+        {
+        }
+
+        [Fact]
+        public void Test_143_05()
+        {
+        }
+
+        [Fact]
+        public void Test_143_06()
+        {
+        }
+
+        [Fact]
+        public void Test_143_07()
+        {
+        }
+
+        [Fact]
+        public void Test_143_08()
+        {
+        }
+
+        [Fact]
+        public void Test_143_09()
+        {
+        }
+
+        [Fact]
+        public void Test_143_10()
+        {
+        }
+
+        [Fact]
+        public void Test_143_11()
+        {
+        }
+
+        [Fact]
+        public void Test_143_12()
+        {
+        }
+
+        [Fact]
+        public void Test_143_13()
+        {
+        }
+
+        [Fact]
+        public void Test_143_14()
+        {
+        }
+
+        [Fact]
+        public void Test_143_15()
+        {
+        }
+
+        [Fact]
+        public void Test_143_16()
+        {
+        }
+
+        [Fact]
+        public void Test_143_17()
+        {
+        }
+
+        [Fact]
+        public void Test_143_18()
+        {
+        }
+
+        [Fact]
+        public void Test_143_19()
+        {
+        }
+
+        [Fact]
+        public void Test_143_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_144
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_144_01()
+        {
+        }
+
+        [Fact]
+        public void Test_144_02()
+        {
+        }
+
+        [Fact]
+        public void Test_144_03()
+        {
+        }
+
+        [Fact]
+        public void Test_144_04()
+        {
+        }
+
+        [Fact]
+        public void Test_144_05()
+        {
+        }
+
+        [Fact]
+        public void Test_144_06()
+        {
+        }
+
+        [Fact]
+        public void Test_144_07()
+        {
+        }
+
+        [Fact]
+        public void Test_144_08()
+        {
+        }
+
+        [Fact]
+        public void Test_144_09()
+        {
+        }
+
+        [Fact]
+        public void Test_144_10()
+        {
+        }
+
+        [Fact]
+        public void Test_144_11()
+        {
+        }
+
+        [Fact]
+        public void Test_144_12()
+        {
+        }
+
+        [Fact]
+        public void Test_144_13()
+        {
+        }
+
+        [Fact]
+        public void Test_144_14()
+        {
+        }
+
+        [Fact]
+        public void Test_144_15()
+        {
+        }
+
+        [Fact]
+        public void Test_144_16()
+        {
+        }
+
+        [Fact]
+        public void Test_144_17()
+        {
+        }
+
+        [Fact]
+        public void Test_144_18()
+        {
+        }
+
+        [Fact]
+        public void Test_144_19()
+        {
+        }
+
+        [Fact]
+        public void Test_144_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_145
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_145_01()
+        {
+        }
+
+        [Fact]
+        public void Test_145_02()
+        {
+        }
+
+        [Fact]
+        public void Test_145_03()
+        {
+        }
+
+        [Fact]
+        public void Test_145_04()
+        {
+        }
+
+        [Fact]
+        public void Test_145_05()
+        {
+        }
+
+        [Fact]
+        public void Test_145_06()
+        {
+        }
+
+        [Fact]
+        public void Test_145_07()
+        {
+        }
+
+        [Fact]
+        public void Test_145_08()
+        {
+        }
+
+        [Fact]
+        public void Test_145_09()
+        {
+        }
+
+        [Fact]
+        public void Test_145_10()
+        {
+        }
+
+        [Fact]
+        public void Test_145_11()
+        {
+        }
+
+        [Fact]
+        public void Test_145_12()
+        {
+        }
+
+        [Fact]
+        public void Test_145_13()
+        {
+        }
+
+        [Fact]
+        public void Test_145_14()
+        {
+        }
+
+        [Fact]
+        public void Test_145_15()
+        {
+        }
+
+        [Fact]
+        public void Test_145_16()
+        {
+        }
+
+        [Fact]
+        public void Test_145_17()
+        {
+        }
+
+        [Fact]
+        public void Test_145_18()
+        {
+        }
+
+        [Fact]
+        public void Test_145_19()
+        {
+        }
+
+        [Fact]
+        public void Test_145_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_146
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_146_01()
+        {
+        }
+
+        [Fact]
+        public void Test_146_02()
+        {
+        }
+
+        [Fact]
+        public void Test_146_03()
+        {
+        }
+
+        [Fact]
+        public void Test_146_04()
+        {
+        }
+
+        [Fact]
+        public void Test_146_05()
+        {
+        }
+
+        [Fact]
+        public void Test_146_06()
+        {
+        }
+
+        [Fact]
+        public void Test_146_07()
+        {
+        }
+
+        [Fact]
+        public void Test_146_08()
+        {
+        }
+
+        [Fact]
+        public void Test_146_09()
+        {
+        }
+
+        [Fact]
+        public void Test_146_10()
+        {
+        }
+
+        [Fact]
+        public void Test_146_11()
+        {
+        }
+
+        [Fact]
+        public void Test_146_12()
+        {
+        }
+
+        [Fact]
+        public void Test_146_13()
+        {
+        }
+
+        [Fact]
+        public void Test_146_14()
+        {
+        }
+
+        [Fact]
+        public void Test_146_15()
+        {
+        }
+
+        [Fact]
+        public void Test_146_16()
+        {
+        }
+
+        [Fact]
+        public void Test_146_17()
+        {
+        }
+
+        [Fact]
+        public void Test_146_18()
+        {
+        }
+
+        [Fact]
+        public void Test_146_19()
+        {
+        }
+
+        [Fact]
+        public void Test_146_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_147
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_147_01()
+        {
+        }
+
+        [Fact]
+        public void Test_147_02()
+        {
+        }
+
+        [Fact]
+        public void Test_147_03()
+        {
+        }
+
+        [Fact]
+        public void Test_147_04()
+        {
+        }
+
+        [Fact]
+        public void Test_147_05()
+        {
+        }
+
+        [Fact]
+        public void Test_147_06()
+        {
+        }
+
+        [Fact]
+        public void Test_147_07()
+        {
+        }
+
+        [Fact]
+        public void Test_147_08()
+        {
+        }
+
+        [Fact]
+        public void Test_147_09()
+        {
+        }
+
+        [Fact]
+        public void Test_147_10()
+        {
+        }
+
+        [Fact]
+        public void Test_147_11()
+        {
+        }
+
+        [Fact]
+        public void Test_147_12()
+        {
+        }
+
+        [Fact]
+        public void Test_147_13()
+        {
+        }
+
+        [Fact]
+        public void Test_147_14()
+        {
+        }
+
+        [Fact]
+        public void Test_147_15()
+        {
+        }
+
+        [Fact]
+        public void Test_147_16()
+        {
+        }
+
+        [Fact]
+        public void Test_147_17()
+        {
+        }
+
+        [Fact]
+        public void Test_147_18()
+        {
+        }
+
+        [Fact]
+        public void Test_147_19()
+        {
+        }
+
+        [Fact]
+        public void Test_147_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_148
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_148_01()
+        {
+        }
+
+        [Fact]
+        public void Test_148_02()
+        {
+        }
+
+        [Fact]
+        public void Test_148_03()
+        {
+        }
+
+        [Fact]
+        public void Test_148_04()
+        {
+        }
+
+        [Fact]
+        public void Test_148_05()
+        {
+        }
+
+        [Fact]
+        public void Test_148_06()
+        {
+        }
+
+        [Fact]
+        public void Test_148_07()
+        {
+        }
+
+        [Fact]
+        public void Test_148_08()
+        {
+        }
+
+        [Fact]
+        public void Test_148_09()
+        {
+        }
+
+        [Fact]
+        public void Test_148_10()
+        {
+        }
+
+        [Fact]
+        public void Test_148_11()
+        {
+        }
+
+        [Fact]
+        public void Test_148_12()
+        {
+        }
+
+        [Fact]
+        public void Test_148_13()
+        {
+        }
+
+        [Fact]
+        public void Test_148_14()
+        {
+        }
+
+        [Fact]
+        public void Test_148_15()
+        {
+        }
+
+        [Fact]
+        public void Test_148_16()
+        {
+        }
+
+        [Fact]
+        public void Test_148_17()
+        {
+        }
+
+        [Fact]
+        public void Test_148_18()
+        {
+        }
+
+        [Fact]
+        public void Test_148_19()
+        {
+        }
+
+        [Fact]
+        public void Test_148_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_149
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_149_01()
+        {
+        }
+
+        [Fact]
+        public void Test_149_02()
+        {
+        }
+
+        [Fact]
+        public void Test_149_03()
+        {
+        }
+
+        [Fact]
+        public void Test_149_04()
+        {
+        }
+
+        [Fact]
+        public void Test_149_05()
+        {
+        }
+
+        [Fact]
+        public void Test_149_06()
+        {
+        }
+
+        [Fact]
+        public void Test_149_07()
+        {
+        }
+
+        [Fact]
+        public void Test_149_08()
+        {
+        }
+
+        [Fact]
+        public void Test_149_09()
+        {
+        }
+
+        [Fact]
+        public void Test_149_10()
+        {
+        }
+
+        [Fact]
+        public void Test_149_11()
+        {
+        }
+
+        [Fact]
+        public void Test_149_12()
+        {
+        }
+
+        [Fact]
+        public void Test_149_13()
+        {
+        }
+
+        [Fact]
+        public void Test_149_14()
+        {
+        }
+
+        [Fact]
+        public void Test_149_15()
+        {
+        }
+
+        [Fact]
+        public void Test_149_16()
+        {
+        }
+
+        [Fact]
+        public void Test_149_17()
+        {
+        }
+
+        [Fact]
+        public void Test_149_18()
+        {
+        }
+
+        [Fact]
+        public void Test_149_19()
+        {
+        }
+
+        [Fact]
+        public void Test_149_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_150
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_150_01()
+        {
+        }
+
+        [Fact]
+        public void Test_150_02()
+        {
+        }
+
+        [Fact]
+        public void Test_150_03()
+        {
+        }
+
+        [Fact]
+        public void Test_150_04()
+        {
+        }
+
+        [Fact]
+        public void Test_150_05()
+        {
+        }
+
+        [Fact]
+        public void Test_150_06()
+        {
+        }
+
+        [Fact]
+        public void Test_150_07()
+        {
+        }
+
+        [Fact]
+        public void Test_150_08()
+        {
+        }
+
+        [Fact]
+        public void Test_150_09()
+        {
+        }
+
+        [Fact]
+        public void Test_150_10()
+        {
+        }
+
+        [Fact]
+        public void Test_150_11()
+        {
+        }
+
+        [Fact]
+        public void Test_150_12()
+        {
+        }
+
+        [Fact]
+        public void Test_150_13()
+        {
+        }
+
+        [Fact]
+        public void Test_150_14()
+        {
+        }
+
+        [Fact]
+        public void Test_150_15()
+        {
+        }
+
+        [Fact]
+        public void Test_150_16()
+        {
+        }
+
+        [Fact]
+        public void Test_150_17()
+        {
+        }
+
+        [Fact]
+        public void Test_150_18()
+        {
+        }
+
+        [Fact]
+        public void Test_150_19()
+        {
+        }
+
+        [Fact]
+        public void Test_150_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_151
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_151_01()
+        {
+        }
+
+        [Fact]
+        public void Test_151_02()
+        {
+        }
+
+        [Fact]
+        public void Test_151_03()
+        {
+        }
+
+        [Fact]
+        public void Test_151_04()
+        {
+        }
+
+        [Fact]
+        public void Test_151_05()
+        {
+        }
+
+        [Fact]
+        public void Test_151_06()
+        {
+        }
+
+        [Fact]
+        public void Test_151_07()
+        {
+        }
+
+        [Fact]
+        public void Test_151_08()
+        {
+        }
+
+        [Fact]
+        public void Test_151_09()
+        {
+        }
+
+        [Fact]
+        public void Test_151_10()
+        {
+        }
+
+        [Fact]
+        public void Test_151_11()
+        {
+        }
+
+        [Fact]
+        public void Test_151_12()
+        {
+        }
+
+        [Fact]
+        public void Test_151_13()
+        {
+        }
+
+        [Fact]
+        public void Test_151_14()
+        {
+        }
+
+        [Fact]
+        public void Test_151_15()
+        {
+        }
+
+        [Fact]
+        public void Test_151_16()
+        {
+        }
+
+        [Fact]
+        public void Test_151_17()
+        {
+        }
+
+        [Fact]
+        public void Test_151_18()
+        {
+        }
+
+        [Fact]
+        public void Test_151_19()
+        {
+        }
+
+        [Fact]
+        public void Test_151_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_152
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_152_01()
+        {
+        }
+
+        [Fact]
+        public void Test_152_02()
+        {
+        }
+
+        [Fact]
+        public void Test_152_03()
+        {
+        }
+
+        [Fact]
+        public void Test_152_04()
+        {
+        }
+
+        [Fact]
+        public void Test_152_05()
+        {
+        }
+
+        [Fact]
+        public void Test_152_06()
+        {
+        }
+
+        [Fact]
+        public void Test_152_07()
+        {
+        }
+
+        [Fact]
+        public void Test_152_08()
+        {
+        }
+
+        [Fact]
+        public void Test_152_09()
+        {
+        }
+
+        [Fact]
+        public void Test_152_10()
+        {
+        }
+
+        [Fact]
+        public void Test_152_11()
+        {
+        }
+
+        [Fact]
+        public void Test_152_12()
+        {
+        }
+
+        [Fact]
+        public void Test_152_13()
+        {
+        }
+
+        [Fact]
+        public void Test_152_14()
+        {
+        }
+
+        [Fact]
+        public void Test_152_15()
+        {
+        }
+
+        [Fact]
+        public void Test_152_16()
+        {
+        }
+
+        [Fact]
+        public void Test_152_17()
+        {
+        }
+
+        [Fact]
+        public void Test_152_18()
+        {
+        }
+
+        [Fact]
+        public void Test_152_19()
+        {
+        }
+
+        [Fact]
+        public void Test_152_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_153
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_153_01()
+        {
+        }
+
+        [Fact]
+        public void Test_153_02()
+        {
+        }
+
+        [Fact]
+        public void Test_153_03()
+        {
+        }
+
+        [Fact]
+        public void Test_153_04()
+        {
+        }
+
+        [Fact]
+        public void Test_153_05()
+        {
+        }
+
+        [Fact]
+        public void Test_153_06()
+        {
+        }
+
+        [Fact]
+        public void Test_153_07()
+        {
+        }
+
+        [Fact]
+        public void Test_153_08()
+        {
+        }
+
+        [Fact]
+        public void Test_153_09()
+        {
+        }
+
+        [Fact]
+        public void Test_153_10()
+        {
+        }
+
+        [Fact]
+        public void Test_153_11()
+        {
+        }
+
+        [Fact]
+        public void Test_153_12()
+        {
+        }
+
+        [Fact]
+        public void Test_153_13()
+        {
+        }
+
+        [Fact]
+        public void Test_153_14()
+        {
+        }
+
+        [Fact]
+        public void Test_153_15()
+        {
+        }
+
+        [Fact]
+        public void Test_153_16()
+        {
+        }
+
+        [Fact]
+        public void Test_153_17()
+        {
+        }
+
+        [Fact]
+        public void Test_153_18()
+        {
+        }
+
+        [Fact]
+        public void Test_153_19()
+        {
+        }
+
+        [Fact]
+        public void Test_153_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_154
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_154_01()
+        {
+        }
+
+        [Fact]
+        public void Test_154_02()
+        {
+        }
+
+        [Fact]
+        public void Test_154_03()
+        {
+        }
+
+        [Fact]
+        public void Test_154_04()
+        {
+        }
+
+        [Fact]
+        public void Test_154_05()
+        {
+        }
+
+        [Fact]
+        public void Test_154_06()
+        {
+        }
+
+        [Fact]
+        public void Test_154_07()
+        {
+        }
+
+        [Fact]
+        public void Test_154_08()
+        {
+        }
+
+        [Fact]
+        public void Test_154_09()
+        {
+        }
+
+        [Fact]
+        public void Test_154_10()
+        {
+        }
+
+        [Fact]
+        public void Test_154_11()
+        {
+        }
+
+        [Fact]
+        public void Test_154_12()
+        {
+        }
+
+        [Fact]
+        public void Test_154_13()
+        {
+        }
+
+        [Fact]
+        public void Test_154_14()
+        {
+        }
+
+        [Fact]
+        public void Test_154_15()
+        {
+        }
+
+        [Fact]
+        public void Test_154_16()
+        {
+        }
+
+        [Fact]
+        public void Test_154_17()
+        {
+        }
+
+        [Fact]
+        public void Test_154_18()
+        {
+        }
+
+        [Fact]
+        public void Test_154_19()
+        {
+        }
+
+        [Fact]
+        public void Test_154_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_155
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_155_01()
+        {
+        }
+
+        [Fact]
+        public void Test_155_02()
+        {
+        }
+
+        [Fact]
+        public void Test_155_03()
+        {
+        }
+
+        [Fact]
+        public void Test_155_04()
+        {
+        }
+
+        [Fact]
+        public void Test_155_05()
+        {
+        }
+
+        [Fact]
+        public void Test_155_06()
+        {
+        }
+
+        [Fact]
+        public void Test_155_07()
+        {
+        }
+
+        [Fact]
+        public void Test_155_08()
+        {
+        }
+
+        [Fact]
+        public void Test_155_09()
+        {
+        }
+
+        [Fact]
+        public void Test_155_10()
+        {
+        }
+
+        [Fact]
+        public void Test_155_11()
+        {
+        }
+
+        [Fact]
+        public void Test_155_12()
+        {
+        }
+
+        [Fact]
+        public void Test_155_13()
+        {
+        }
+
+        [Fact]
+        public void Test_155_14()
+        {
+        }
+
+        [Fact]
+        public void Test_155_15()
+        {
+        }
+
+        [Fact]
+        public void Test_155_16()
+        {
+        }
+
+        [Fact]
+        public void Test_155_17()
+        {
+        }
+
+        [Fact]
+        public void Test_155_18()
+        {
+        }
+
+        [Fact]
+        public void Test_155_19()
+        {
+        }
+
+        [Fact]
+        public void Test_155_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_156
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_156_01()
+        {
+        }
+
+        [Fact]
+        public void Test_156_02()
+        {
+        }
+
+        [Fact]
+        public void Test_156_03()
+        {
+        }
+
+        [Fact]
+        public void Test_156_04()
+        {
+        }
+
+        [Fact]
+        public void Test_156_05()
+        {
+        }
+
+        [Fact]
+        public void Test_156_06()
+        {
+        }
+
+        [Fact]
+        public void Test_156_07()
+        {
+        }
+
+        [Fact]
+        public void Test_156_08()
+        {
+        }
+
+        [Fact]
+        public void Test_156_09()
+        {
+        }
+
+        [Fact]
+        public void Test_156_10()
+        {
+        }
+
+        [Fact]
+        public void Test_156_11()
+        {
+        }
+
+        [Fact]
+        public void Test_156_12()
+        {
+        }
+
+        [Fact]
+        public void Test_156_13()
+        {
+        }
+
+        [Fact]
+        public void Test_156_14()
+        {
+        }
+
+        [Fact]
+        public void Test_156_15()
+        {
+        }
+
+        [Fact]
+        public void Test_156_16()
+        {
+        }
+
+        [Fact]
+        public void Test_156_17()
+        {
+        }
+
+        [Fact]
+        public void Test_156_18()
+        {
+        }
+
+        [Fact]
+        public void Test_156_19()
+        {
+        }
+
+        [Fact]
+        public void Test_156_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_157
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_157_01()
+        {
+        }
+
+        [Fact]
+        public void Test_157_02()
+        {
+        }
+
+        [Fact]
+        public void Test_157_03()
+        {
+        }
+
+        [Fact]
+        public void Test_157_04()
+        {
+        }
+
+        [Fact]
+        public void Test_157_05()
+        {
+        }
+
+        [Fact]
+        public void Test_157_06()
+        {
+        }
+
+        [Fact]
+        public void Test_157_07()
+        {
+        }
+
+        [Fact]
+        public void Test_157_08()
+        {
+        }
+
+        [Fact]
+        public void Test_157_09()
+        {
+        }
+
+        [Fact]
+        public void Test_157_10()
+        {
+        }
+
+        [Fact]
+        public void Test_157_11()
+        {
+        }
+
+        [Fact]
+        public void Test_157_12()
+        {
+        }
+
+        [Fact]
+        public void Test_157_13()
+        {
+        }
+
+        [Fact]
+        public void Test_157_14()
+        {
+        }
+
+        [Fact]
+        public void Test_157_15()
+        {
+        }
+
+        [Fact]
+        public void Test_157_16()
+        {
+        }
+
+        [Fact]
+        public void Test_157_17()
+        {
+        }
+
+        [Fact]
+        public void Test_157_18()
+        {
+        }
+
+        [Fact]
+        public void Test_157_19()
+        {
+        }
+
+        [Fact]
+        public void Test_157_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_158
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_158_01()
+        {
+        }
+
+        [Fact]
+        public void Test_158_02()
+        {
+        }
+
+        [Fact]
+        public void Test_158_03()
+        {
+        }
+
+        [Fact]
+        public void Test_158_04()
+        {
+        }
+
+        [Fact]
+        public void Test_158_05()
+        {
+        }
+
+        [Fact]
+        public void Test_158_06()
+        {
+        }
+
+        [Fact]
+        public void Test_158_07()
+        {
+        }
+
+        [Fact]
+        public void Test_158_08()
+        {
+        }
+
+        [Fact]
+        public void Test_158_09()
+        {
+        }
+
+        [Fact]
+        public void Test_158_10()
+        {
+        }
+
+        [Fact]
+        public void Test_158_11()
+        {
+        }
+
+        [Fact]
+        public void Test_158_12()
+        {
+        }
+
+        [Fact]
+        public void Test_158_13()
+        {
+        }
+
+        [Fact]
+        public void Test_158_14()
+        {
+        }
+
+        [Fact]
+        public void Test_158_15()
+        {
+        }
+
+        [Fact]
+        public void Test_158_16()
+        {
+        }
+
+        [Fact]
+        public void Test_158_17()
+        {
+        }
+
+        [Fact]
+        public void Test_158_18()
+        {
+        }
+
+        [Fact]
+        public void Test_158_19()
+        {
+        }
+
+        [Fact]
+        public void Test_158_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_159
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_159_01()
+        {
+        }
+
+        [Fact]
+        public void Test_159_02()
+        {
+        }
+
+        [Fact]
+        public void Test_159_03()
+        {
+        }
+
+        [Fact]
+        public void Test_159_04()
+        {
+        }
+
+        [Fact]
+        public void Test_159_05()
+        {
+        }
+
+        [Fact]
+        public void Test_159_06()
+        {
+        }
+
+        [Fact]
+        public void Test_159_07()
+        {
+        }
+
+        [Fact]
+        public void Test_159_08()
+        {
+        }
+
+        [Fact]
+        public void Test_159_09()
+        {
+        }
+
+        [Fact]
+        public void Test_159_10()
+        {
+        }
+
+        [Fact]
+        public void Test_159_11()
+        {
+        }
+
+        [Fact]
+        public void Test_159_12()
+        {
+        }
+
+        [Fact]
+        public void Test_159_13()
+        {
+        }
+
+        [Fact]
+        public void Test_159_14()
+        {
+        }
+
+        [Fact]
+        public void Test_159_15()
+        {
+        }
+
+        [Fact]
+        public void Test_159_16()
+        {
+        }
+
+        [Fact]
+        public void Test_159_17()
+        {
+        }
+
+        [Fact]
+        public void Test_159_18()
+        {
+        }
+
+        [Fact]
+        public void Test_159_19()
+        {
+        }
+
+        [Fact]
+        public void Test_159_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_160
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_160_01()
+        {
+        }
+
+        [Fact]
+        public void Test_160_02()
+        {
+        }
+
+        [Fact]
+        public void Test_160_03()
+        {
+        }
+
+        [Fact]
+        public void Test_160_04()
+        {
+        }
+
+        [Fact]
+        public void Test_160_05()
+        {
+        }
+
+        [Fact]
+        public void Test_160_06()
+        {
+        }
+
+        [Fact]
+        public void Test_160_07()
+        {
+        }
+
+        [Fact]
+        public void Test_160_08()
+        {
+        }
+
+        [Fact]
+        public void Test_160_09()
+        {
+        }
+
+        [Fact]
+        public void Test_160_10()
+        {
+        }
+
+        [Fact]
+        public void Test_160_11()
+        {
+        }
+
+        [Fact]
+        public void Test_160_12()
+        {
+        }
+
+        [Fact]
+        public void Test_160_13()
+        {
+        }
+
+        [Fact]
+        public void Test_160_14()
+        {
+        }
+
+        [Fact]
+        public void Test_160_15()
+        {
+        }
+
+        [Fact]
+        public void Test_160_16()
+        {
+        }
+
+        [Fact]
+        public void Test_160_17()
+        {
+        }
+
+        [Fact]
+        public void Test_160_18()
+        {
+        }
+
+        [Fact]
+        public void Test_160_19()
+        {
+        }
+
+        [Fact]
+        public void Test_160_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_161
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_161_01()
+        {
+        }
+
+        [Fact]
+        public void Test_161_02()
+        {
+        }
+
+        [Fact]
+        public void Test_161_03()
+        {
+        }
+
+        [Fact]
+        public void Test_161_04()
+        {
+        }
+
+        [Fact]
+        public void Test_161_05()
+        {
+        }
+
+        [Fact]
+        public void Test_161_06()
+        {
+        }
+
+        [Fact]
+        public void Test_161_07()
+        {
+        }
+
+        [Fact]
+        public void Test_161_08()
+        {
+        }
+
+        [Fact]
+        public void Test_161_09()
+        {
+        }
+
+        [Fact]
+        public void Test_161_10()
+        {
+        }
+
+        [Fact]
+        public void Test_161_11()
+        {
+        }
+
+        [Fact]
+        public void Test_161_12()
+        {
+        }
+
+        [Fact]
+        public void Test_161_13()
+        {
+        }
+
+        [Fact]
+        public void Test_161_14()
+        {
+        }
+
+        [Fact]
+        public void Test_161_15()
+        {
+        }
+
+        [Fact]
+        public void Test_161_16()
+        {
+        }
+
+        [Fact]
+        public void Test_161_17()
+        {
+        }
+
+        [Fact]
+        public void Test_161_18()
+        {
+        }
+
+        [Fact]
+        public void Test_161_19()
+        {
+        }
+
+        [Fact]
+        public void Test_161_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_162
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_162_01()
+        {
+        }
+
+        [Fact]
+        public void Test_162_02()
+        {
+        }
+
+        [Fact]
+        public void Test_162_03()
+        {
+        }
+
+        [Fact]
+        public void Test_162_04()
+        {
+        }
+
+        [Fact]
+        public void Test_162_05()
+        {
+        }
+
+        [Fact]
+        public void Test_162_06()
+        {
+        }
+
+        [Fact]
+        public void Test_162_07()
+        {
+        }
+
+        [Fact]
+        public void Test_162_08()
+        {
+        }
+
+        [Fact]
+        public void Test_162_09()
+        {
+        }
+
+        [Fact]
+        public void Test_162_10()
+        {
+        }
+
+        [Fact]
+        public void Test_162_11()
+        {
+        }
+
+        [Fact]
+        public void Test_162_12()
+        {
+        }
+
+        [Fact]
+        public void Test_162_13()
+        {
+        }
+
+        [Fact]
+        public void Test_162_14()
+        {
+        }
+
+        [Fact]
+        public void Test_162_15()
+        {
+        }
+
+        [Fact]
+        public void Test_162_16()
+        {
+        }
+
+        [Fact]
+        public void Test_162_17()
+        {
+        }
+
+        [Fact]
+        public void Test_162_18()
+        {
+        }
+
+        [Fact]
+        public void Test_162_19()
+        {
+        }
+
+        [Fact]
+        public void Test_162_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_163
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_163_01()
+        {
+        }
+
+        [Fact]
+        public void Test_163_02()
+        {
+        }
+
+        [Fact]
+        public void Test_163_03()
+        {
+        }
+
+        [Fact]
+        public void Test_163_04()
+        {
+        }
+
+        [Fact]
+        public void Test_163_05()
+        {
+        }
+
+        [Fact]
+        public void Test_163_06()
+        {
+        }
+
+        [Fact]
+        public void Test_163_07()
+        {
+        }
+
+        [Fact]
+        public void Test_163_08()
+        {
+        }
+
+        [Fact]
+        public void Test_163_09()
+        {
+        }
+
+        [Fact]
+        public void Test_163_10()
+        {
+        }
+
+        [Fact]
+        public void Test_163_11()
+        {
+        }
+
+        [Fact]
+        public void Test_163_12()
+        {
+        }
+
+        [Fact]
+        public void Test_163_13()
+        {
+        }
+
+        [Fact]
+        public void Test_163_14()
+        {
+        }
+
+        [Fact]
+        public void Test_163_15()
+        {
+        }
+
+        [Fact]
+        public void Test_163_16()
+        {
+        }
+
+        [Fact]
+        public void Test_163_17()
+        {
+        }
+
+        [Fact]
+        public void Test_163_18()
+        {
+        }
+
+        [Fact]
+        public void Test_163_19()
+        {
+        }
+
+        [Fact]
+        public void Test_163_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_164
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_164_01()
+        {
+        }
+
+        [Fact]
+        public void Test_164_02()
+        {
+        }
+
+        [Fact]
+        public void Test_164_03()
+        {
+        }
+
+        [Fact]
+        public void Test_164_04()
+        {
+        }
+
+        [Fact]
+        public void Test_164_05()
+        {
+        }
+
+        [Fact]
+        public void Test_164_06()
+        {
+        }
+
+        [Fact]
+        public void Test_164_07()
+        {
+        }
+
+        [Fact]
+        public void Test_164_08()
+        {
+        }
+
+        [Fact]
+        public void Test_164_09()
+        {
+        }
+
+        [Fact]
+        public void Test_164_10()
+        {
+        }
+
+        [Fact]
+        public void Test_164_11()
+        {
+        }
+
+        [Fact]
+        public void Test_164_12()
+        {
+        }
+
+        [Fact]
+        public void Test_164_13()
+        {
+        }
+
+        [Fact]
+        public void Test_164_14()
+        {
+        }
+
+        [Fact]
+        public void Test_164_15()
+        {
+        }
+
+        [Fact]
+        public void Test_164_16()
+        {
+        }
+
+        [Fact]
+        public void Test_164_17()
+        {
+        }
+
+        [Fact]
+        public void Test_164_18()
+        {
+        }
+
+        [Fact]
+        public void Test_164_19()
+        {
+        }
+
+        [Fact]
+        public void Test_164_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_165
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_165_01()
+        {
+        }
+
+        [Fact]
+        public void Test_165_02()
+        {
+        }
+
+        [Fact]
+        public void Test_165_03()
+        {
+        }
+
+        [Fact]
+        public void Test_165_04()
+        {
+        }
+
+        [Fact]
+        public void Test_165_05()
+        {
+        }
+
+        [Fact]
+        public void Test_165_06()
+        {
+        }
+
+        [Fact]
+        public void Test_165_07()
+        {
+        }
+
+        [Fact]
+        public void Test_165_08()
+        {
+        }
+
+        [Fact]
+        public void Test_165_09()
+        {
+        }
+
+        [Fact]
+        public void Test_165_10()
+        {
+        }
+
+        [Fact]
+        public void Test_165_11()
+        {
+        }
+
+        [Fact]
+        public void Test_165_12()
+        {
+        }
+
+        [Fact]
+        public void Test_165_13()
+        {
+        }
+
+        [Fact]
+        public void Test_165_14()
+        {
+        }
+
+        [Fact]
+        public void Test_165_15()
+        {
+        }
+
+        [Fact]
+        public void Test_165_16()
+        {
+        }
+
+        [Fact]
+        public void Test_165_17()
+        {
+        }
+
+        [Fact]
+        public void Test_165_18()
+        {
+        }
+
+        [Fact]
+        public void Test_165_19()
+        {
+        }
+
+        [Fact]
+        public void Test_165_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_166
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_166_01()
+        {
+        }
+
+        [Fact]
+        public void Test_166_02()
+        {
+        }
+
+        [Fact]
+        public void Test_166_03()
+        {
+        }
+
+        [Fact]
+        public void Test_166_04()
+        {
+        }
+
+        [Fact]
+        public void Test_166_05()
+        {
+        }
+
+        [Fact]
+        public void Test_166_06()
+        {
+        }
+
+        [Fact]
+        public void Test_166_07()
+        {
+        }
+
+        [Fact]
+        public void Test_166_08()
+        {
+        }
+
+        [Fact]
+        public void Test_166_09()
+        {
+        }
+
+        [Fact]
+        public void Test_166_10()
+        {
+        }
+
+        [Fact]
+        public void Test_166_11()
+        {
+        }
+
+        [Fact]
+        public void Test_166_12()
+        {
+        }
+
+        [Fact]
+        public void Test_166_13()
+        {
+        }
+
+        [Fact]
+        public void Test_166_14()
+        {
+        }
+
+        [Fact]
+        public void Test_166_15()
+        {
+        }
+
+        [Fact]
+        public void Test_166_16()
+        {
+        }
+
+        [Fact]
+        public void Test_166_17()
+        {
+        }
+
+        [Fact]
+        public void Test_166_18()
+        {
+        }
+
+        [Fact]
+        public void Test_166_19()
+        {
+        }
+
+        [Fact]
+        public void Test_166_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_167
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_167_01()
+        {
+        }
+
+        [Fact]
+        public void Test_167_02()
+        {
+        }
+
+        [Fact]
+        public void Test_167_03()
+        {
+        }
+
+        [Fact]
+        public void Test_167_04()
+        {
+        }
+
+        [Fact]
+        public void Test_167_05()
+        {
+        }
+
+        [Fact]
+        public void Test_167_06()
+        {
+        }
+
+        [Fact]
+        public void Test_167_07()
+        {
+        }
+
+        [Fact]
+        public void Test_167_08()
+        {
+        }
+
+        [Fact]
+        public void Test_167_09()
+        {
+        }
+
+        [Fact]
+        public void Test_167_10()
+        {
+        }
+
+        [Fact]
+        public void Test_167_11()
+        {
+        }
+
+        [Fact]
+        public void Test_167_12()
+        {
+        }
+
+        [Fact]
+        public void Test_167_13()
+        {
+        }
+
+        [Fact]
+        public void Test_167_14()
+        {
+        }
+
+        [Fact]
+        public void Test_167_15()
+        {
+        }
+
+        [Fact]
+        public void Test_167_16()
+        {
+        }
+
+        [Fact]
+        public void Test_167_17()
+        {
+        }
+
+        [Fact]
+        public void Test_167_18()
+        {
+        }
+
+        [Fact]
+        public void Test_167_19()
+        {
+        }
+
+        [Fact]
+        public void Test_167_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_168
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_168_01()
+        {
+        }
+
+        [Fact]
+        public void Test_168_02()
+        {
+        }
+
+        [Fact]
+        public void Test_168_03()
+        {
+        }
+
+        [Fact]
+        public void Test_168_04()
+        {
+        }
+
+        [Fact]
+        public void Test_168_05()
+        {
+        }
+
+        [Fact]
+        public void Test_168_06()
+        {
+        }
+
+        [Fact]
+        public void Test_168_07()
+        {
+        }
+
+        [Fact]
+        public void Test_168_08()
+        {
+        }
+
+        [Fact]
+        public void Test_168_09()
+        {
+        }
+
+        [Fact]
+        public void Test_168_10()
+        {
+        }
+
+        [Fact]
+        public void Test_168_11()
+        {
+        }
+
+        [Fact]
+        public void Test_168_12()
+        {
+        }
+
+        [Fact]
+        public void Test_168_13()
+        {
+        }
+
+        [Fact]
+        public void Test_168_14()
+        {
+        }
+
+        [Fact]
+        public void Test_168_15()
+        {
+        }
+
+        [Fact]
+        public void Test_168_16()
+        {
+        }
+
+        [Fact]
+        public void Test_168_17()
+        {
+        }
+
+        [Fact]
+        public void Test_168_18()
+        {
+        }
+
+        [Fact]
+        public void Test_168_19()
+        {
+        }
+
+        [Fact]
+        public void Test_168_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_169
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_169_01()
+        {
+        }
+
+        [Fact]
+        public void Test_169_02()
+        {
+        }
+
+        [Fact]
+        public void Test_169_03()
+        {
+        }
+
+        [Fact]
+        public void Test_169_04()
+        {
+        }
+
+        [Fact]
+        public void Test_169_05()
+        {
+        }
+
+        [Fact]
+        public void Test_169_06()
+        {
+        }
+
+        [Fact]
+        public void Test_169_07()
+        {
+        }
+
+        [Fact]
+        public void Test_169_08()
+        {
+        }
+
+        [Fact]
+        public void Test_169_09()
+        {
+        }
+
+        [Fact]
+        public void Test_169_10()
+        {
+        }
+
+        [Fact]
+        public void Test_169_11()
+        {
+        }
+
+        [Fact]
+        public void Test_169_12()
+        {
+        }
+
+        [Fact]
+        public void Test_169_13()
+        {
+        }
+
+        [Fact]
+        public void Test_169_14()
+        {
+        }
+
+        [Fact]
+        public void Test_169_15()
+        {
+        }
+
+        [Fact]
+        public void Test_169_16()
+        {
+        }
+
+        [Fact]
+        public void Test_169_17()
+        {
+        }
+
+        [Fact]
+        public void Test_169_18()
+        {
+        }
+
+        [Fact]
+        public void Test_169_19()
+        {
+        }
+
+        [Fact]
+        public void Test_169_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_170
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_170_01()
+        {
+        }
+
+        [Fact]
+        public void Test_170_02()
+        {
+        }
+
+        [Fact]
+        public void Test_170_03()
+        {
+        }
+
+        [Fact]
+        public void Test_170_04()
+        {
+        }
+
+        [Fact]
+        public void Test_170_05()
+        {
+        }
+
+        [Fact]
+        public void Test_170_06()
+        {
+        }
+
+        [Fact]
+        public void Test_170_07()
+        {
+        }
+
+        [Fact]
+        public void Test_170_08()
+        {
+        }
+
+        [Fact]
+        public void Test_170_09()
+        {
+        }
+
+        [Fact]
+        public void Test_170_10()
+        {
+        }
+
+        [Fact]
+        public void Test_170_11()
+        {
+        }
+
+        [Fact]
+        public void Test_170_12()
+        {
+        }
+
+        [Fact]
+        public void Test_170_13()
+        {
+        }
+
+        [Fact]
+        public void Test_170_14()
+        {
+        }
+
+        [Fact]
+        public void Test_170_15()
+        {
+        }
+
+        [Fact]
+        public void Test_170_16()
+        {
+        }
+
+        [Fact]
+        public void Test_170_17()
+        {
+        }
+
+        [Fact]
+        public void Test_170_18()
+        {
+        }
+
+        [Fact]
+        public void Test_170_19()
+        {
+        }
+
+        [Fact]
+        public void Test_170_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_171
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_171_01()
+        {
+        }
+
+        [Fact]
+        public void Test_171_02()
+        {
+        }
+
+        [Fact]
+        public void Test_171_03()
+        {
+        }
+
+        [Fact]
+        public void Test_171_04()
+        {
+        }
+
+        [Fact]
+        public void Test_171_05()
+        {
+        }
+
+        [Fact]
+        public void Test_171_06()
+        {
+        }
+
+        [Fact]
+        public void Test_171_07()
+        {
+        }
+
+        [Fact]
+        public void Test_171_08()
+        {
+        }
+
+        [Fact]
+        public void Test_171_09()
+        {
+        }
+
+        [Fact]
+        public void Test_171_10()
+        {
+        }
+
+        [Fact]
+        public void Test_171_11()
+        {
+        }
+
+        [Fact]
+        public void Test_171_12()
+        {
+        }
+
+        [Fact]
+        public void Test_171_13()
+        {
+        }
+
+        [Fact]
+        public void Test_171_14()
+        {
+        }
+
+        [Fact]
+        public void Test_171_15()
+        {
+        }
+
+        [Fact]
+        public void Test_171_16()
+        {
+        }
+
+        [Fact]
+        public void Test_171_17()
+        {
+        }
+
+        [Fact]
+        public void Test_171_18()
+        {
+        }
+
+        [Fact]
+        public void Test_171_19()
+        {
+        }
+
+        [Fact]
+        public void Test_171_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_172
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_172_01()
+        {
+        }
+
+        [Fact]
+        public void Test_172_02()
+        {
+        }
+
+        [Fact]
+        public void Test_172_03()
+        {
+        }
+
+        [Fact]
+        public void Test_172_04()
+        {
+        }
+
+        [Fact]
+        public void Test_172_05()
+        {
+        }
+
+        [Fact]
+        public void Test_172_06()
+        {
+        }
+
+        [Fact]
+        public void Test_172_07()
+        {
+        }
+
+        [Fact]
+        public void Test_172_08()
+        {
+        }
+
+        [Fact]
+        public void Test_172_09()
+        {
+        }
+
+        [Fact]
+        public void Test_172_10()
+        {
+        }
+
+        [Fact]
+        public void Test_172_11()
+        {
+        }
+
+        [Fact]
+        public void Test_172_12()
+        {
+        }
+
+        [Fact]
+        public void Test_172_13()
+        {
+        }
+
+        [Fact]
+        public void Test_172_14()
+        {
+        }
+
+        [Fact]
+        public void Test_172_15()
+        {
+        }
+
+        [Fact]
+        public void Test_172_16()
+        {
+        }
+
+        [Fact]
+        public void Test_172_17()
+        {
+        }
+
+        [Fact]
+        public void Test_172_18()
+        {
+        }
+
+        [Fact]
+        public void Test_172_19()
+        {
+        }
+
+        [Fact]
+        public void Test_172_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_173
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_173_01()
+        {
+        }
+
+        [Fact]
+        public void Test_173_02()
+        {
+        }
+
+        [Fact]
+        public void Test_173_03()
+        {
+        }
+
+        [Fact]
+        public void Test_173_04()
+        {
+        }
+
+        [Fact]
+        public void Test_173_05()
+        {
+        }
+
+        [Fact]
+        public void Test_173_06()
+        {
+        }
+
+        [Fact]
+        public void Test_173_07()
+        {
+        }
+
+        [Fact]
+        public void Test_173_08()
+        {
+        }
+
+        [Fact]
+        public void Test_173_09()
+        {
+        }
+
+        [Fact]
+        public void Test_173_10()
+        {
+        }
+
+        [Fact]
+        public void Test_173_11()
+        {
+        }
+
+        [Fact]
+        public void Test_173_12()
+        {
+        }
+
+        [Fact]
+        public void Test_173_13()
+        {
+        }
+
+        [Fact]
+        public void Test_173_14()
+        {
+        }
+
+        [Fact]
+        public void Test_173_15()
+        {
+        }
+
+        [Fact]
+        public void Test_173_16()
+        {
+        }
+
+        [Fact]
+        public void Test_173_17()
+        {
+        }
+
+        [Fact]
+        public void Test_173_18()
+        {
+        }
+
+        [Fact]
+        public void Test_173_19()
+        {
+        }
+
+        [Fact]
+        public void Test_173_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_174
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_174_01()
+        {
+        }
+
+        [Fact]
+        public void Test_174_02()
+        {
+        }
+
+        [Fact]
+        public void Test_174_03()
+        {
+        }
+
+        [Fact]
+        public void Test_174_04()
+        {
+        }
+
+        [Fact]
+        public void Test_174_05()
+        {
+        }
+
+        [Fact]
+        public void Test_174_06()
+        {
+        }
+
+        [Fact]
+        public void Test_174_07()
+        {
+        }
+
+        [Fact]
+        public void Test_174_08()
+        {
+        }
+
+        [Fact]
+        public void Test_174_09()
+        {
+        }
+
+        [Fact]
+        public void Test_174_10()
+        {
+        }
+
+        [Fact]
+        public void Test_174_11()
+        {
+        }
+
+        [Fact]
+        public void Test_174_12()
+        {
+        }
+
+        [Fact]
+        public void Test_174_13()
+        {
+        }
+
+        [Fact]
+        public void Test_174_14()
+        {
+        }
+
+        [Fact]
+        public void Test_174_15()
+        {
+        }
+
+        [Fact]
+        public void Test_174_16()
+        {
+        }
+
+        [Fact]
+        public void Test_174_17()
+        {
+        }
+
+        [Fact]
+        public void Test_174_18()
+        {
+        }
+
+        [Fact]
+        public void Test_174_19()
+        {
+        }
+
+        [Fact]
+        public void Test_174_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_175
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_175_01()
+        {
+        }
+
+        [Fact]
+        public void Test_175_02()
+        {
+        }
+
+        [Fact]
+        public void Test_175_03()
+        {
+        }
+
+        [Fact]
+        public void Test_175_04()
+        {
+        }
+
+        [Fact]
+        public void Test_175_05()
+        {
+        }
+
+        [Fact]
+        public void Test_175_06()
+        {
+        }
+
+        [Fact]
+        public void Test_175_07()
+        {
+        }
+
+        [Fact]
+        public void Test_175_08()
+        {
+        }
+
+        [Fact]
+        public void Test_175_09()
+        {
+        }
+
+        [Fact]
+        public void Test_175_10()
+        {
+        }
+
+        [Fact]
+        public void Test_175_11()
+        {
+        }
+
+        [Fact]
+        public void Test_175_12()
+        {
+        }
+
+        [Fact]
+        public void Test_175_13()
+        {
+        }
+
+        [Fact]
+        public void Test_175_14()
+        {
+        }
+
+        [Fact]
+        public void Test_175_15()
+        {
+        }
+
+        [Fact]
+        public void Test_175_16()
+        {
+        }
+
+        [Fact]
+        public void Test_175_17()
+        {
+        }
+
+        [Fact]
+        public void Test_175_18()
+        {
+        }
+
+        [Fact]
+        public void Test_175_19()
+        {
+        }
+
+        [Fact]
+        public void Test_175_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_176
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_176_01()
+        {
+        }
+
+        [Fact]
+        public void Test_176_02()
+        {
+        }
+
+        [Fact]
+        public void Test_176_03()
+        {
+        }
+
+        [Fact]
+        public void Test_176_04()
+        {
+        }
+
+        [Fact]
+        public void Test_176_05()
+        {
+        }
+
+        [Fact]
+        public void Test_176_06()
+        {
+        }
+
+        [Fact]
+        public void Test_176_07()
+        {
+        }
+
+        [Fact]
+        public void Test_176_08()
+        {
+        }
+
+        [Fact]
+        public void Test_176_09()
+        {
+        }
+
+        [Fact]
+        public void Test_176_10()
+        {
+        }
+
+        [Fact]
+        public void Test_176_11()
+        {
+        }
+
+        [Fact]
+        public void Test_176_12()
+        {
+        }
+
+        [Fact]
+        public void Test_176_13()
+        {
+        }
+
+        [Fact]
+        public void Test_176_14()
+        {
+        }
+
+        [Fact]
+        public void Test_176_15()
+        {
+        }
+
+        [Fact]
+        public void Test_176_16()
+        {
+        }
+
+        [Fact]
+        public void Test_176_17()
+        {
+        }
+
+        [Fact]
+        public void Test_176_18()
+        {
+        }
+
+        [Fact]
+        public void Test_176_19()
+        {
+        }
+
+        [Fact]
+        public void Test_176_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_177
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_177_01()
+        {
+        }
+
+        [Fact]
+        public void Test_177_02()
+        {
+        }
+
+        [Fact]
+        public void Test_177_03()
+        {
+        }
+
+        [Fact]
+        public void Test_177_04()
+        {
+        }
+
+        [Fact]
+        public void Test_177_05()
+        {
+        }
+
+        [Fact]
+        public void Test_177_06()
+        {
+        }
+
+        [Fact]
+        public void Test_177_07()
+        {
+        }
+
+        [Fact]
+        public void Test_177_08()
+        {
+        }
+
+        [Fact]
+        public void Test_177_09()
+        {
+        }
+
+        [Fact]
+        public void Test_177_10()
+        {
+        }
+
+        [Fact]
+        public void Test_177_11()
+        {
+        }
+
+        [Fact]
+        public void Test_177_12()
+        {
+        }
+
+        [Fact]
+        public void Test_177_13()
+        {
+        }
+
+        [Fact]
+        public void Test_177_14()
+        {
+        }
+
+        [Fact]
+        public void Test_177_15()
+        {
+        }
+
+        [Fact]
+        public void Test_177_16()
+        {
+        }
+
+        [Fact]
+        public void Test_177_17()
+        {
+        }
+
+        [Fact]
+        public void Test_177_18()
+        {
+        }
+
+        [Fact]
+        public void Test_177_19()
+        {
+        }
+
+        [Fact]
+        public void Test_177_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_178
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_178_01()
+        {
+        }
+
+        [Fact]
+        public void Test_178_02()
+        {
+        }
+
+        [Fact]
+        public void Test_178_03()
+        {
+        }
+
+        [Fact]
+        public void Test_178_04()
+        {
+        }
+
+        [Fact]
+        public void Test_178_05()
+        {
+        }
+
+        [Fact]
+        public void Test_178_06()
+        {
+        }
+
+        [Fact]
+        public void Test_178_07()
+        {
+        }
+
+        [Fact]
+        public void Test_178_08()
+        {
+        }
+
+        [Fact]
+        public void Test_178_09()
+        {
+        }
+
+        [Fact]
+        public void Test_178_10()
+        {
+        }
+
+        [Fact]
+        public void Test_178_11()
+        {
+        }
+
+        [Fact]
+        public void Test_178_12()
+        {
+        }
+
+        [Fact]
+        public void Test_178_13()
+        {
+        }
+
+        [Fact]
+        public void Test_178_14()
+        {
+        }
+
+        [Fact]
+        public void Test_178_15()
+        {
+        }
+
+        [Fact]
+        public void Test_178_16()
+        {
+        }
+
+        [Fact]
+        public void Test_178_17()
+        {
+        }
+
+        [Fact]
+        public void Test_178_18()
+        {
+        }
+
+        [Fact]
+        public void Test_178_19()
+        {
+        }
+
+        [Fact]
+        public void Test_178_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_179
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_179_01()
+        {
+        }
+
+        [Fact]
+        public void Test_179_02()
+        {
+        }
+
+        [Fact]
+        public void Test_179_03()
+        {
+        }
+
+        [Fact]
+        public void Test_179_04()
+        {
+        }
+
+        [Fact]
+        public void Test_179_05()
+        {
+        }
+
+        [Fact]
+        public void Test_179_06()
+        {
+        }
+
+        [Fact]
+        public void Test_179_07()
+        {
+        }
+
+        [Fact]
+        public void Test_179_08()
+        {
+        }
+
+        [Fact]
+        public void Test_179_09()
+        {
+        }
+
+        [Fact]
+        public void Test_179_10()
+        {
+        }
+
+        [Fact]
+        public void Test_179_11()
+        {
+        }
+
+        [Fact]
+        public void Test_179_12()
+        {
+        }
+
+        [Fact]
+        public void Test_179_13()
+        {
+        }
+
+        [Fact]
+        public void Test_179_14()
+        {
+        }
+
+        [Fact]
+        public void Test_179_15()
+        {
+        }
+
+        [Fact]
+        public void Test_179_16()
+        {
+        }
+
+        [Fact]
+        public void Test_179_17()
+        {
+        }
+
+        [Fact]
+        public void Test_179_18()
+        {
+        }
+
+        [Fact]
+        public void Test_179_19()
+        {
+        }
+
+        [Fact]
+        public void Test_179_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_180
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_180_01()
+        {
+        }
+
+        [Fact]
+        public void Test_180_02()
+        {
+        }
+
+        [Fact]
+        public void Test_180_03()
+        {
+        }
+
+        [Fact]
+        public void Test_180_04()
+        {
+        }
+
+        [Fact]
+        public void Test_180_05()
+        {
+        }
+
+        [Fact]
+        public void Test_180_06()
+        {
+        }
+
+        [Fact]
+        public void Test_180_07()
+        {
+        }
+
+        [Fact]
+        public void Test_180_08()
+        {
+        }
+
+        [Fact]
+        public void Test_180_09()
+        {
+        }
+
+        [Fact]
+        public void Test_180_10()
+        {
+        }
+
+        [Fact]
+        public void Test_180_11()
+        {
+        }
+
+        [Fact]
+        public void Test_180_12()
+        {
+        }
+
+        [Fact]
+        public void Test_180_13()
+        {
+        }
+
+        [Fact]
+        public void Test_180_14()
+        {
+        }
+
+        [Fact]
+        public void Test_180_15()
+        {
+        }
+
+        [Fact]
+        public void Test_180_16()
+        {
+        }
+
+        [Fact]
+        public void Test_180_17()
+        {
+        }
+
+        [Fact]
+        public void Test_180_18()
+        {
+        }
+
+        [Fact]
+        public void Test_180_19()
+        {
+        }
+
+        [Fact]
+        public void Test_180_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_181
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_181_01()
+        {
+        }
+
+        [Fact]
+        public void Test_181_02()
+        {
+        }
+
+        [Fact]
+        public void Test_181_03()
+        {
+        }
+
+        [Fact]
+        public void Test_181_04()
+        {
+        }
+
+        [Fact]
+        public void Test_181_05()
+        {
+        }
+
+        [Fact]
+        public void Test_181_06()
+        {
+        }
+
+        [Fact]
+        public void Test_181_07()
+        {
+        }
+
+        [Fact]
+        public void Test_181_08()
+        {
+        }
+
+        [Fact]
+        public void Test_181_09()
+        {
+        }
+
+        [Fact]
+        public void Test_181_10()
+        {
+        }
+
+        [Fact]
+        public void Test_181_11()
+        {
+        }
+
+        [Fact]
+        public void Test_181_12()
+        {
+        }
+
+        [Fact]
+        public void Test_181_13()
+        {
+        }
+
+        [Fact]
+        public void Test_181_14()
+        {
+        }
+
+        [Fact]
+        public void Test_181_15()
+        {
+        }
+
+        [Fact]
+        public void Test_181_16()
+        {
+        }
+
+        [Fact]
+        public void Test_181_17()
+        {
+        }
+
+        [Fact]
+        public void Test_181_18()
+        {
+        }
+
+        [Fact]
+        public void Test_181_19()
+        {
+        }
+
+        [Fact]
+        public void Test_181_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_182
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_182_01()
+        {
+        }
+
+        [Fact]
+        public void Test_182_02()
+        {
+        }
+
+        [Fact]
+        public void Test_182_03()
+        {
+        }
+
+        [Fact]
+        public void Test_182_04()
+        {
+        }
+
+        [Fact]
+        public void Test_182_05()
+        {
+        }
+
+        [Fact]
+        public void Test_182_06()
+        {
+        }
+
+        [Fact]
+        public void Test_182_07()
+        {
+        }
+
+        [Fact]
+        public void Test_182_08()
+        {
+        }
+
+        [Fact]
+        public void Test_182_09()
+        {
+        }
+
+        [Fact]
+        public void Test_182_10()
+        {
+        }
+
+        [Fact]
+        public void Test_182_11()
+        {
+        }
+
+        [Fact]
+        public void Test_182_12()
+        {
+        }
+
+        [Fact]
+        public void Test_182_13()
+        {
+        }
+
+        [Fact]
+        public void Test_182_14()
+        {
+        }
+
+        [Fact]
+        public void Test_182_15()
+        {
+        }
+
+        [Fact]
+        public void Test_182_16()
+        {
+        }
+
+        [Fact]
+        public void Test_182_17()
+        {
+        }
+
+        [Fact]
+        public void Test_182_18()
+        {
+        }
+
+        [Fact]
+        public void Test_182_19()
+        {
+        }
+
+        [Fact]
+        public void Test_182_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_183
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_183_01()
+        {
+        }
+
+        [Fact]
+        public void Test_183_02()
+        {
+        }
+
+        [Fact]
+        public void Test_183_03()
+        {
+        }
+
+        [Fact]
+        public void Test_183_04()
+        {
+        }
+
+        [Fact]
+        public void Test_183_05()
+        {
+        }
+
+        [Fact]
+        public void Test_183_06()
+        {
+        }
+
+        [Fact]
+        public void Test_183_07()
+        {
+        }
+
+        [Fact]
+        public void Test_183_08()
+        {
+        }
+
+        [Fact]
+        public void Test_183_09()
+        {
+        }
+
+        [Fact]
+        public void Test_183_10()
+        {
+        }
+
+        [Fact]
+        public void Test_183_11()
+        {
+        }
+
+        [Fact]
+        public void Test_183_12()
+        {
+        }
+
+        [Fact]
+        public void Test_183_13()
+        {
+        }
+
+        [Fact]
+        public void Test_183_14()
+        {
+        }
+
+        [Fact]
+        public void Test_183_15()
+        {
+        }
+
+        [Fact]
+        public void Test_183_16()
+        {
+        }
+
+        [Fact]
+        public void Test_183_17()
+        {
+        }
+
+        [Fact]
+        public void Test_183_18()
+        {
+        }
+
+        [Fact]
+        public void Test_183_19()
+        {
+        }
+
+        [Fact]
+        public void Test_183_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_184
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_184_01()
+        {
+        }
+
+        [Fact]
+        public void Test_184_02()
+        {
+        }
+
+        [Fact]
+        public void Test_184_03()
+        {
+        }
+
+        [Fact]
+        public void Test_184_04()
+        {
+        }
+
+        [Fact]
+        public void Test_184_05()
+        {
+        }
+
+        [Fact]
+        public void Test_184_06()
+        {
+        }
+
+        [Fact]
+        public void Test_184_07()
+        {
+        }
+
+        [Fact]
+        public void Test_184_08()
+        {
+        }
+
+        [Fact]
+        public void Test_184_09()
+        {
+        }
+
+        [Fact]
+        public void Test_184_10()
+        {
+        }
+
+        [Fact]
+        public void Test_184_11()
+        {
+        }
+
+        [Fact]
+        public void Test_184_12()
+        {
+        }
+
+        [Fact]
+        public void Test_184_13()
+        {
+        }
+
+        [Fact]
+        public void Test_184_14()
+        {
+        }
+
+        [Fact]
+        public void Test_184_15()
+        {
+        }
+
+        [Fact]
+        public void Test_184_16()
+        {
+        }
+
+        [Fact]
+        public void Test_184_17()
+        {
+        }
+
+        [Fact]
+        public void Test_184_18()
+        {
+        }
+
+        [Fact]
+        public void Test_184_19()
+        {
+        }
+
+        [Fact]
+        public void Test_184_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_185
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_185_01()
+        {
+        }
+
+        [Fact]
+        public void Test_185_02()
+        {
+        }
+
+        [Fact]
+        public void Test_185_03()
+        {
+        }
+
+        [Fact]
+        public void Test_185_04()
+        {
+        }
+
+        [Fact]
+        public void Test_185_05()
+        {
+        }
+
+        [Fact]
+        public void Test_185_06()
+        {
+        }
+
+        [Fact]
+        public void Test_185_07()
+        {
+        }
+
+        [Fact]
+        public void Test_185_08()
+        {
+        }
+
+        [Fact]
+        public void Test_185_09()
+        {
+        }
+
+        [Fact]
+        public void Test_185_10()
+        {
+        }
+
+        [Fact]
+        public void Test_185_11()
+        {
+        }
+
+        [Fact]
+        public void Test_185_12()
+        {
+        }
+
+        [Fact]
+        public void Test_185_13()
+        {
+        }
+
+        [Fact]
+        public void Test_185_14()
+        {
+        }
+
+        [Fact]
+        public void Test_185_15()
+        {
+        }
+
+        [Fact]
+        public void Test_185_16()
+        {
+        }
+
+        [Fact]
+        public void Test_185_17()
+        {
+        }
+
+        [Fact]
+        public void Test_185_18()
+        {
+        }
+
+        [Fact]
+        public void Test_185_19()
+        {
+        }
+
+        [Fact]
+        public void Test_185_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_186
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_186_01()
+        {
+        }
+
+        [Fact]
+        public void Test_186_02()
+        {
+        }
+
+        [Fact]
+        public void Test_186_03()
+        {
+        }
+
+        [Fact]
+        public void Test_186_04()
+        {
+        }
+
+        [Fact]
+        public void Test_186_05()
+        {
+        }
+
+        [Fact]
+        public void Test_186_06()
+        {
+        }
+
+        [Fact]
+        public void Test_186_07()
+        {
+        }
+
+        [Fact]
+        public void Test_186_08()
+        {
+        }
+
+        [Fact]
+        public void Test_186_09()
+        {
+        }
+
+        [Fact]
+        public void Test_186_10()
+        {
+        }
+
+        [Fact]
+        public void Test_186_11()
+        {
+        }
+
+        [Fact]
+        public void Test_186_12()
+        {
+        }
+
+        [Fact]
+        public void Test_186_13()
+        {
+        }
+
+        [Fact]
+        public void Test_186_14()
+        {
+        }
+
+        [Fact]
+        public void Test_186_15()
+        {
+        }
+
+        [Fact]
+        public void Test_186_16()
+        {
+        }
+
+        [Fact]
+        public void Test_186_17()
+        {
+        }
+
+        [Fact]
+        public void Test_186_18()
+        {
+        }
+
+        [Fact]
+        public void Test_186_19()
+        {
+        }
+
+        [Fact]
+        public void Test_186_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_187
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_187_01()
+        {
+        }
+
+        [Fact]
+        public void Test_187_02()
+        {
+        }
+
+        [Fact]
+        public void Test_187_03()
+        {
+        }
+
+        [Fact]
+        public void Test_187_04()
+        {
+        }
+
+        [Fact]
+        public void Test_187_05()
+        {
+        }
+
+        [Fact]
+        public void Test_187_06()
+        {
+        }
+
+        [Fact]
+        public void Test_187_07()
+        {
+        }
+
+        [Fact]
+        public void Test_187_08()
+        {
+        }
+
+        [Fact]
+        public void Test_187_09()
+        {
+        }
+
+        [Fact]
+        public void Test_187_10()
+        {
+        }
+
+        [Fact]
+        public void Test_187_11()
+        {
+        }
+
+        [Fact]
+        public void Test_187_12()
+        {
+        }
+
+        [Fact]
+        public void Test_187_13()
+        {
+        }
+
+        [Fact]
+        public void Test_187_14()
+        {
+        }
+
+        [Fact]
+        public void Test_187_15()
+        {
+        }
+
+        [Fact]
+        public void Test_187_16()
+        {
+        }
+
+        [Fact]
+        public void Test_187_17()
+        {
+        }
+
+        [Fact]
+        public void Test_187_18()
+        {
+        }
+
+        [Fact]
+        public void Test_187_19()
+        {
+        }
+
+        [Fact]
+        public void Test_187_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_188
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_188_01()
+        {
+        }
+
+        [Fact]
+        public void Test_188_02()
+        {
+        }
+
+        [Fact]
+        public void Test_188_03()
+        {
+        }
+
+        [Fact]
+        public void Test_188_04()
+        {
+        }
+
+        [Fact]
+        public void Test_188_05()
+        {
+        }
+
+        [Fact]
+        public void Test_188_06()
+        {
+        }
+
+        [Fact]
+        public void Test_188_07()
+        {
+        }
+
+        [Fact]
+        public void Test_188_08()
+        {
+        }
+
+        [Fact]
+        public void Test_188_09()
+        {
+        }
+
+        [Fact]
+        public void Test_188_10()
+        {
+        }
+
+        [Fact]
+        public void Test_188_11()
+        {
+        }
+
+        [Fact]
+        public void Test_188_12()
+        {
+        }
+
+        [Fact]
+        public void Test_188_13()
+        {
+        }
+
+        [Fact]
+        public void Test_188_14()
+        {
+        }
+
+        [Fact]
+        public void Test_188_15()
+        {
+        }
+
+        [Fact]
+        public void Test_188_16()
+        {
+        }
+
+        [Fact]
+        public void Test_188_17()
+        {
+        }
+
+        [Fact]
+        public void Test_188_18()
+        {
+        }
+
+        [Fact]
+        public void Test_188_19()
+        {
+        }
+
+        [Fact]
+        public void Test_188_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_189
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_189_01()
+        {
+        }
+
+        [Fact]
+        public void Test_189_02()
+        {
+        }
+
+        [Fact]
+        public void Test_189_03()
+        {
+        }
+
+        [Fact]
+        public void Test_189_04()
+        {
+        }
+
+        [Fact]
+        public void Test_189_05()
+        {
+        }
+
+        [Fact]
+        public void Test_189_06()
+        {
+        }
+
+        [Fact]
+        public void Test_189_07()
+        {
+        }
+
+        [Fact]
+        public void Test_189_08()
+        {
+        }
+
+        [Fact]
+        public void Test_189_09()
+        {
+        }
+
+        [Fact]
+        public void Test_189_10()
+        {
+        }
+
+        [Fact]
+        public void Test_189_11()
+        {
+        }
+
+        [Fact]
+        public void Test_189_12()
+        {
+        }
+
+        [Fact]
+        public void Test_189_13()
+        {
+        }
+
+        [Fact]
+        public void Test_189_14()
+        {
+        }
+
+        [Fact]
+        public void Test_189_15()
+        {
+        }
+
+        [Fact]
+        public void Test_189_16()
+        {
+        }
+
+        [Fact]
+        public void Test_189_17()
+        {
+        }
+
+        [Fact]
+        public void Test_189_18()
+        {
+        }
+
+        [Fact]
+        public void Test_189_19()
+        {
+        }
+
+        [Fact]
+        public void Test_189_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_190
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_190_01()
+        {
+        }
+
+        [Fact]
+        public void Test_190_02()
+        {
+        }
+
+        [Fact]
+        public void Test_190_03()
+        {
+        }
+
+        [Fact]
+        public void Test_190_04()
+        {
+        }
+
+        [Fact]
+        public void Test_190_05()
+        {
+        }
+
+        [Fact]
+        public void Test_190_06()
+        {
+        }
+
+        [Fact]
+        public void Test_190_07()
+        {
+        }
+
+        [Fact]
+        public void Test_190_08()
+        {
+        }
+
+        [Fact]
+        public void Test_190_09()
+        {
+        }
+
+        [Fact]
+        public void Test_190_10()
+        {
+        }
+
+        [Fact]
+        public void Test_190_11()
+        {
+        }
+
+        [Fact]
+        public void Test_190_12()
+        {
+        }
+
+        [Fact]
+        public void Test_190_13()
+        {
+        }
+
+        [Fact]
+        public void Test_190_14()
+        {
+        }
+
+        [Fact]
+        public void Test_190_15()
+        {
+        }
+
+        [Fact]
+        public void Test_190_16()
+        {
+        }
+
+        [Fact]
+        public void Test_190_17()
+        {
+        }
+
+        [Fact]
+        public void Test_190_18()
+        {
+        }
+
+        [Fact]
+        public void Test_190_19()
+        {
+        }
+
+        [Fact]
+        public void Test_190_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_191
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_191_01()
+        {
+        }
+
+        [Fact]
+        public void Test_191_02()
+        {
+        }
+
+        [Fact]
+        public void Test_191_03()
+        {
+        }
+
+        [Fact]
+        public void Test_191_04()
+        {
+        }
+
+        [Fact]
+        public void Test_191_05()
+        {
+        }
+
+        [Fact]
+        public void Test_191_06()
+        {
+        }
+
+        [Fact]
+        public void Test_191_07()
+        {
+        }
+
+        [Fact]
+        public void Test_191_08()
+        {
+        }
+
+        [Fact]
+        public void Test_191_09()
+        {
+        }
+
+        [Fact]
+        public void Test_191_10()
+        {
+        }
+
+        [Fact]
+        public void Test_191_11()
+        {
+        }
+
+        [Fact]
+        public void Test_191_12()
+        {
+        }
+
+        [Fact]
+        public void Test_191_13()
+        {
+        }
+
+        [Fact]
+        public void Test_191_14()
+        {
+        }
+
+        [Fact]
+        public void Test_191_15()
+        {
+        }
+
+        [Fact]
+        public void Test_191_16()
+        {
+        }
+
+        [Fact]
+        public void Test_191_17()
+        {
+        }
+
+        [Fact]
+        public void Test_191_18()
+        {
+        }
+
+        [Fact]
+        public void Test_191_19()
+        {
+        }
+
+        [Fact]
+        public void Test_191_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_192
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_192_01()
+        {
+        }
+
+        [Fact]
+        public void Test_192_02()
+        {
+        }
+
+        [Fact]
+        public void Test_192_03()
+        {
+        }
+
+        [Fact]
+        public void Test_192_04()
+        {
+        }
+
+        [Fact]
+        public void Test_192_05()
+        {
+        }
+
+        [Fact]
+        public void Test_192_06()
+        {
+        }
+
+        [Fact]
+        public void Test_192_07()
+        {
+        }
+
+        [Fact]
+        public void Test_192_08()
+        {
+        }
+
+        [Fact]
+        public void Test_192_09()
+        {
+        }
+
+        [Fact]
+        public void Test_192_10()
+        {
+        }
+
+        [Fact]
+        public void Test_192_11()
+        {
+        }
+
+        [Fact]
+        public void Test_192_12()
+        {
+        }
+
+        [Fact]
+        public void Test_192_13()
+        {
+        }
+
+        [Fact]
+        public void Test_192_14()
+        {
+        }
+
+        [Fact]
+        public void Test_192_15()
+        {
+        }
+
+        [Fact]
+        public void Test_192_16()
+        {
+        }
+
+        [Fact]
+        public void Test_192_17()
+        {
+        }
+
+        [Fact]
+        public void Test_192_18()
+        {
+        }
+
+        [Fact]
+        public void Test_192_19()
+        {
+        }
+
+        [Fact]
+        public void Test_192_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_193
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_193_01()
+        {
+        }
+
+        [Fact]
+        public void Test_193_02()
+        {
+        }
+
+        [Fact]
+        public void Test_193_03()
+        {
+        }
+
+        [Fact]
+        public void Test_193_04()
+        {
+        }
+
+        [Fact]
+        public void Test_193_05()
+        {
+        }
+
+        [Fact]
+        public void Test_193_06()
+        {
+        }
+
+        [Fact]
+        public void Test_193_07()
+        {
+        }
+
+        [Fact]
+        public void Test_193_08()
+        {
+        }
+
+        [Fact]
+        public void Test_193_09()
+        {
+        }
+
+        [Fact]
+        public void Test_193_10()
+        {
+        }
+
+        [Fact]
+        public void Test_193_11()
+        {
+        }
+
+        [Fact]
+        public void Test_193_12()
+        {
+        }
+
+        [Fact]
+        public void Test_193_13()
+        {
+        }
+
+        [Fact]
+        public void Test_193_14()
+        {
+        }
+
+        [Fact]
+        public void Test_193_15()
+        {
+        }
+
+        [Fact]
+        public void Test_193_16()
+        {
+        }
+
+        [Fact]
+        public void Test_193_17()
+        {
+        }
+
+        [Fact]
+        public void Test_193_18()
+        {
+        }
+
+        [Fact]
+        public void Test_193_19()
+        {
+        }
+
+        [Fact]
+        public void Test_193_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_194
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_194_01()
+        {
+        }
+
+        [Fact]
+        public void Test_194_02()
+        {
+        }
+
+        [Fact]
+        public void Test_194_03()
+        {
+        }
+
+        [Fact]
+        public void Test_194_04()
+        {
+        }
+
+        [Fact]
+        public void Test_194_05()
+        {
+        }
+
+        [Fact]
+        public void Test_194_06()
+        {
+        }
+
+        [Fact]
+        public void Test_194_07()
+        {
+        }
+
+        [Fact]
+        public void Test_194_08()
+        {
+        }
+
+        [Fact]
+        public void Test_194_09()
+        {
+        }
+
+        [Fact]
+        public void Test_194_10()
+        {
+        }
+
+        [Fact]
+        public void Test_194_11()
+        {
+        }
+
+        [Fact]
+        public void Test_194_12()
+        {
+        }
+
+        [Fact]
+        public void Test_194_13()
+        {
+        }
+
+        [Fact]
+        public void Test_194_14()
+        {
+        }
+
+        [Fact]
+        public void Test_194_15()
+        {
+        }
+
+        [Fact]
+        public void Test_194_16()
+        {
+        }
+
+        [Fact]
+        public void Test_194_17()
+        {
+        }
+
+        [Fact]
+        public void Test_194_18()
+        {
+        }
+
+        [Fact]
+        public void Test_194_19()
+        {
+        }
+
+        [Fact]
+        public void Test_194_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_195
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_195_01()
+        {
+        }
+
+        [Fact]
+        public void Test_195_02()
+        {
+        }
+
+        [Fact]
+        public void Test_195_03()
+        {
+        }
+
+        [Fact]
+        public void Test_195_04()
+        {
+        }
+
+        [Fact]
+        public void Test_195_05()
+        {
+        }
+
+        [Fact]
+        public void Test_195_06()
+        {
+        }
+
+        [Fact]
+        public void Test_195_07()
+        {
+        }
+
+        [Fact]
+        public void Test_195_08()
+        {
+        }
+
+        [Fact]
+        public void Test_195_09()
+        {
+        }
+
+        [Fact]
+        public void Test_195_10()
+        {
+        }
+
+        [Fact]
+        public void Test_195_11()
+        {
+        }
+
+        [Fact]
+        public void Test_195_12()
+        {
+        }
+
+        [Fact]
+        public void Test_195_13()
+        {
+        }
+
+        [Fact]
+        public void Test_195_14()
+        {
+        }
+
+        [Fact]
+        public void Test_195_15()
+        {
+        }
+
+        [Fact]
+        public void Test_195_16()
+        {
+        }
+
+        [Fact]
+        public void Test_195_17()
+        {
+        }
+
+        [Fact]
+        public void Test_195_18()
+        {
+        }
+
+        [Fact]
+        public void Test_195_19()
+        {
+        }
+
+        [Fact]
+        public void Test_195_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_196
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_196_01()
+        {
+        }
+
+        [Fact]
+        public void Test_196_02()
+        {
+        }
+
+        [Fact]
+        public void Test_196_03()
+        {
+        }
+
+        [Fact]
+        public void Test_196_04()
+        {
+        }
+
+        [Fact]
+        public void Test_196_05()
+        {
+        }
+
+        [Fact]
+        public void Test_196_06()
+        {
+        }
+
+        [Fact]
+        public void Test_196_07()
+        {
+        }
+
+        [Fact]
+        public void Test_196_08()
+        {
+        }
+
+        [Fact]
+        public void Test_196_09()
+        {
+        }
+
+        [Fact]
+        public void Test_196_10()
+        {
+        }
+
+        [Fact]
+        public void Test_196_11()
+        {
+        }
+
+        [Fact]
+        public void Test_196_12()
+        {
+        }
+
+        [Fact]
+        public void Test_196_13()
+        {
+        }
+
+        [Fact]
+        public void Test_196_14()
+        {
+        }
+
+        [Fact]
+        public void Test_196_15()
+        {
+        }
+
+        [Fact]
+        public void Test_196_16()
+        {
+        }
+
+        [Fact]
+        public void Test_196_17()
+        {
+        }
+
+        [Fact]
+        public void Test_196_18()
+        {
+        }
+
+        [Fact]
+        public void Test_196_19()
+        {
+        }
+
+        [Fact]
+        public void Test_196_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_197
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_197_01()
+        {
+        }
+
+        [Fact]
+        public void Test_197_02()
+        {
+        }
+
+        [Fact]
+        public void Test_197_03()
+        {
+        }
+
+        [Fact]
+        public void Test_197_04()
+        {
+        }
+
+        [Fact]
+        public void Test_197_05()
+        {
+        }
+
+        [Fact]
+        public void Test_197_06()
+        {
+        }
+
+        [Fact]
+        public void Test_197_07()
+        {
+        }
+
+        [Fact]
+        public void Test_197_08()
+        {
+        }
+
+        [Fact]
+        public void Test_197_09()
+        {
+        }
+
+        [Fact]
+        public void Test_197_10()
+        {
+        }
+
+        [Fact]
+        public void Test_197_11()
+        {
+        }
+
+        [Fact]
+        public void Test_197_12()
+        {
+        }
+
+        [Fact]
+        public void Test_197_13()
+        {
+        }
+
+        [Fact]
+        public void Test_197_14()
+        {
+        }
+
+        [Fact]
+        public void Test_197_15()
+        {
+        }
+
+        [Fact]
+        public void Test_197_16()
+        {
+        }
+
+        [Fact]
+        public void Test_197_17()
+        {
+        }
+
+        [Fact]
+        public void Test_197_18()
+        {
+        }
+
+        [Fact]
+        public void Test_197_19()
+        {
+        }
+
+        [Fact]
+        public void Test_197_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_198
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_198_01()
+        {
+        }
+
+        [Fact]
+        public void Test_198_02()
+        {
+        }
+
+        [Fact]
+        public void Test_198_03()
+        {
+        }
+
+        [Fact]
+        public void Test_198_04()
+        {
+        }
+
+        [Fact]
+        public void Test_198_05()
+        {
+        }
+
+        [Fact]
+        public void Test_198_06()
+        {
+        }
+
+        [Fact]
+        public void Test_198_07()
+        {
+        }
+
+        [Fact]
+        public void Test_198_08()
+        {
+        }
+
+        [Fact]
+        public void Test_198_09()
+        {
+        }
+
+        [Fact]
+        public void Test_198_10()
+        {
+        }
+
+        [Fact]
+        public void Test_198_11()
+        {
+        }
+
+        [Fact]
+        public void Test_198_12()
+        {
+        }
+
+        [Fact]
+        public void Test_198_13()
+        {
+        }
+
+        [Fact]
+        public void Test_198_14()
+        {
+        }
+
+        [Fact]
+        public void Test_198_15()
+        {
+        }
+
+        [Fact]
+        public void Test_198_16()
+        {
+        }
+
+        [Fact]
+        public void Test_198_17()
+        {
+        }
+
+        [Fact]
+        public void Test_198_18()
+        {
+        }
+
+        [Fact]
+        public void Test_198_19()
+        {
+        }
+
+        [Fact]
+        public void Test_198_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_199
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_199_01()
+        {
+        }
+
+        [Fact]
+        public void Test_199_02()
+        {
+        }
+
+        [Fact]
+        public void Test_199_03()
+        {
+        }
+
+        [Fact]
+        public void Test_199_04()
+        {
+        }
+
+        [Fact]
+        public void Test_199_05()
+        {
+        }
+
+        [Fact]
+        public void Test_199_06()
+        {
+        }
+
+        [Fact]
+        public void Test_199_07()
+        {
+        }
+
+        [Fact]
+        public void Test_199_08()
+        {
+        }
+
+        [Fact]
+        public void Test_199_09()
+        {
+        }
+
+        [Fact]
+        public void Test_199_10()
+        {
+        }
+
+        [Fact]
+        public void Test_199_11()
+        {
+        }
+
+        [Fact]
+        public void Test_199_12()
+        {
+        }
+
+        [Fact]
+        public void Test_199_13()
+        {
+        }
+
+        [Fact]
+        public void Test_199_14()
+        {
+        }
+
+        [Fact]
+        public void Test_199_15()
+        {
+        }
+
+        [Fact]
+        public void Test_199_16()
+        {
+        }
+
+        [Fact]
+        public void Test_199_17()
+        {
+        }
+
+        [Fact]
+        public void Test_199_18()
+        {
+        }
+
+        [Fact]
+        public void Test_199_19()
+        {
+        }
+
+        [Fact]
+        public void Test_199_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_200
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_200_01()
+        {
+        }
+
+        [Fact]
+        public void Test_200_02()
+        {
+        }
+
+        [Fact]
+        public void Test_200_03()
+        {
+        }
+
+        [Fact]
+        public void Test_200_04()
+        {
+        }
+
+        [Fact]
+        public void Test_200_05()
+        {
+        }
+
+        [Fact]
+        public void Test_200_06()
+        {
+        }
+
+        [Fact]
+        public void Test_200_07()
+        {
+        }
+
+        [Fact]
+        public void Test_200_08()
+        {
+        }
+
+        [Fact]
+        public void Test_200_09()
+        {
+        }
+
+        [Fact]
+        public void Test_200_10()
+        {
+        }
+
+        [Fact]
+        public void Test_200_11()
+        {
+        }
+
+        [Fact]
+        public void Test_200_12()
+        {
+        }
+
+        [Fact]
+        public void Test_200_13()
+        {
+        }
+
+        [Fact]
+        public void Test_200_14()
+        {
+        }
+
+        [Fact]
+        public void Test_200_15()
+        {
+        }
+
+        [Fact]
+        public void Test_200_16()
+        {
+        }
+
+        [Fact]
+        public void Test_200_17()
+        {
+        }
+
+        [Fact]
+        public void Test_200_18()
+        {
+        }
+
+        [Fact]
+        public void Test_200_19()
+        {
+        }
+
+        [Fact]
+        public void Test_200_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_201
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_201_01()
+        {
+        }
+
+        [Fact]
+        public void Test_201_02()
+        {
+        }
+
+        [Fact]
+        public void Test_201_03()
+        {
+        }
+
+        [Fact]
+        public void Test_201_04()
+        {
+        }
+
+        [Fact]
+        public void Test_201_05()
+        {
+        }
+
+        [Fact]
+        public void Test_201_06()
+        {
+        }
+
+        [Fact]
+        public void Test_201_07()
+        {
+        }
+
+        [Fact]
+        public void Test_201_08()
+        {
+        }
+
+        [Fact]
+        public void Test_201_09()
+        {
+        }
+
+        [Fact]
+        public void Test_201_10()
+        {
+        }
+
+        [Fact]
+        public void Test_201_11()
+        {
+        }
+
+        [Fact]
+        public void Test_201_12()
+        {
+        }
+
+        [Fact]
+        public void Test_201_13()
+        {
+        }
+
+        [Fact]
+        public void Test_201_14()
+        {
+        }
+
+        [Fact]
+        public void Test_201_15()
+        {
+        }
+
+        [Fact]
+        public void Test_201_16()
+        {
+        }
+
+        [Fact]
+        public void Test_201_17()
+        {
+        }
+
+        [Fact]
+        public void Test_201_18()
+        {
+        }
+
+        [Fact]
+        public void Test_201_19()
+        {
+        }
+
+        [Fact]
+        public void Test_201_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_202
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_202_01()
+        {
+        }
+
+        [Fact]
+        public void Test_202_02()
+        {
+        }
+
+        [Fact]
+        public void Test_202_03()
+        {
+        }
+
+        [Fact]
+        public void Test_202_04()
+        {
+        }
+
+        [Fact]
+        public void Test_202_05()
+        {
+        }
+
+        [Fact]
+        public void Test_202_06()
+        {
+        }
+
+        [Fact]
+        public void Test_202_07()
+        {
+        }
+
+        [Fact]
+        public void Test_202_08()
+        {
+        }
+
+        [Fact]
+        public void Test_202_09()
+        {
+        }
+
+        [Fact]
+        public void Test_202_10()
+        {
+        }
+
+        [Fact]
+        public void Test_202_11()
+        {
+        }
+
+        [Fact]
+        public void Test_202_12()
+        {
+        }
+
+        [Fact]
+        public void Test_202_13()
+        {
+        }
+
+        [Fact]
+        public void Test_202_14()
+        {
+        }
+
+        [Fact]
+        public void Test_202_15()
+        {
+        }
+
+        [Fact]
+        public void Test_202_16()
+        {
+        }
+
+        [Fact]
+        public void Test_202_17()
+        {
+        }
+
+        [Fact]
+        public void Test_202_18()
+        {
+        }
+
+        [Fact]
+        public void Test_202_19()
+        {
+        }
+
+        [Fact]
+        public void Test_202_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_203
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_203_01()
+        {
+        }
+
+        [Fact]
+        public void Test_203_02()
+        {
+        }
+
+        [Fact]
+        public void Test_203_03()
+        {
+        }
+
+        [Fact]
+        public void Test_203_04()
+        {
+        }
+
+        [Fact]
+        public void Test_203_05()
+        {
+        }
+
+        [Fact]
+        public void Test_203_06()
+        {
+        }
+
+        [Fact]
+        public void Test_203_07()
+        {
+        }
+
+        [Fact]
+        public void Test_203_08()
+        {
+        }
+
+        [Fact]
+        public void Test_203_09()
+        {
+        }
+
+        [Fact]
+        public void Test_203_10()
+        {
+        }
+
+        [Fact]
+        public void Test_203_11()
+        {
+        }
+
+        [Fact]
+        public void Test_203_12()
+        {
+        }
+
+        [Fact]
+        public void Test_203_13()
+        {
+        }
+
+        [Fact]
+        public void Test_203_14()
+        {
+        }
+
+        [Fact]
+        public void Test_203_15()
+        {
+        }
+
+        [Fact]
+        public void Test_203_16()
+        {
+        }
+
+        [Fact]
+        public void Test_203_17()
+        {
+        }
+
+        [Fact]
+        public void Test_203_18()
+        {
+        }
+
+        [Fact]
+        public void Test_203_19()
+        {
+        }
+
+        [Fact]
+        public void Test_203_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_204
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_204_01()
+        {
+        }
+
+        [Fact]
+        public void Test_204_02()
+        {
+        }
+
+        [Fact]
+        public void Test_204_03()
+        {
+        }
+
+        [Fact]
+        public void Test_204_04()
+        {
+        }
+
+        [Fact]
+        public void Test_204_05()
+        {
+        }
+
+        [Fact]
+        public void Test_204_06()
+        {
+        }
+
+        [Fact]
+        public void Test_204_07()
+        {
+        }
+
+        [Fact]
+        public void Test_204_08()
+        {
+        }
+
+        [Fact]
+        public void Test_204_09()
+        {
+        }
+
+        [Fact]
+        public void Test_204_10()
+        {
+        }
+
+        [Fact]
+        public void Test_204_11()
+        {
+        }
+
+        [Fact]
+        public void Test_204_12()
+        {
+        }
+
+        [Fact]
+        public void Test_204_13()
+        {
+        }
+
+        [Fact]
+        public void Test_204_14()
+        {
+        }
+
+        [Fact]
+        public void Test_204_15()
+        {
+        }
+
+        [Fact]
+        public void Test_204_16()
+        {
+        }
+
+        [Fact]
+        public void Test_204_17()
+        {
+        }
+
+        [Fact]
+        public void Test_204_18()
+        {
+        }
+
+        [Fact]
+        public void Test_204_19()
+        {
+        }
+
+        [Fact]
+        public void Test_204_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_205
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_205_01()
+        {
+        }
+
+        [Fact]
+        public void Test_205_02()
+        {
+        }
+
+        [Fact]
+        public void Test_205_03()
+        {
+        }
+
+        [Fact]
+        public void Test_205_04()
+        {
+        }
+
+        [Fact]
+        public void Test_205_05()
+        {
+        }
+
+        [Fact]
+        public void Test_205_06()
+        {
+        }
+
+        [Fact]
+        public void Test_205_07()
+        {
+        }
+
+        [Fact]
+        public void Test_205_08()
+        {
+        }
+
+        [Fact]
+        public void Test_205_09()
+        {
+        }
+
+        [Fact]
+        public void Test_205_10()
+        {
+        }
+
+        [Fact]
+        public void Test_205_11()
+        {
+        }
+
+        [Fact]
+        public void Test_205_12()
+        {
+        }
+
+        [Fact]
+        public void Test_205_13()
+        {
+        }
+
+        [Fact]
+        public void Test_205_14()
+        {
+        }
+
+        [Fact]
+        public void Test_205_15()
+        {
+        }
+
+        [Fact]
+        public void Test_205_16()
+        {
+        }
+
+        [Fact]
+        public void Test_205_17()
+        {
+        }
+
+        [Fact]
+        public void Test_205_18()
+        {
+        }
+
+        [Fact]
+        public void Test_205_19()
+        {
+        }
+
+        [Fact]
+        public void Test_205_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_206
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_206_01()
+        {
+        }
+
+        [Fact]
+        public void Test_206_02()
+        {
+        }
+
+        [Fact]
+        public void Test_206_03()
+        {
+        }
+
+        [Fact]
+        public void Test_206_04()
+        {
+        }
+
+        [Fact]
+        public void Test_206_05()
+        {
+        }
+
+        [Fact]
+        public void Test_206_06()
+        {
+        }
+
+        [Fact]
+        public void Test_206_07()
+        {
+        }
+
+        [Fact]
+        public void Test_206_08()
+        {
+        }
+
+        [Fact]
+        public void Test_206_09()
+        {
+        }
+
+        [Fact]
+        public void Test_206_10()
+        {
+        }
+
+        [Fact]
+        public void Test_206_11()
+        {
+        }
+
+        [Fact]
+        public void Test_206_12()
+        {
+        }
+
+        [Fact]
+        public void Test_206_13()
+        {
+        }
+
+        [Fact]
+        public void Test_206_14()
+        {
+        }
+
+        [Fact]
+        public void Test_206_15()
+        {
+        }
+
+        [Fact]
+        public void Test_206_16()
+        {
+        }
+
+        [Fact]
+        public void Test_206_17()
+        {
+        }
+
+        [Fact]
+        public void Test_206_18()
+        {
+        }
+
+        [Fact]
+        public void Test_206_19()
+        {
+        }
+
+        [Fact]
+        public void Test_206_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_207
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_207_01()
+        {
+        }
+
+        [Fact]
+        public void Test_207_02()
+        {
+        }
+
+        [Fact]
+        public void Test_207_03()
+        {
+        }
+
+        [Fact]
+        public void Test_207_04()
+        {
+        }
+
+        [Fact]
+        public void Test_207_05()
+        {
+        }
+
+        [Fact]
+        public void Test_207_06()
+        {
+        }
+
+        [Fact]
+        public void Test_207_07()
+        {
+        }
+
+        [Fact]
+        public void Test_207_08()
+        {
+        }
+
+        [Fact]
+        public void Test_207_09()
+        {
+        }
+
+        [Fact]
+        public void Test_207_10()
+        {
+        }
+
+        [Fact]
+        public void Test_207_11()
+        {
+        }
+
+        [Fact]
+        public void Test_207_12()
+        {
+        }
+
+        [Fact]
+        public void Test_207_13()
+        {
+        }
+
+        [Fact]
+        public void Test_207_14()
+        {
+        }
+
+        [Fact]
+        public void Test_207_15()
+        {
+        }
+
+        [Fact]
+        public void Test_207_16()
+        {
+        }
+
+        [Fact]
+        public void Test_207_17()
+        {
+        }
+
+        [Fact]
+        public void Test_207_18()
+        {
+        }
+
+        [Fact]
+        public void Test_207_19()
+        {
+        }
+
+        [Fact]
+        public void Test_207_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_208
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_208_01()
+        {
+        }
+
+        [Fact]
+        public void Test_208_02()
+        {
+        }
+
+        [Fact]
+        public void Test_208_03()
+        {
+        }
+
+        [Fact]
+        public void Test_208_04()
+        {
+        }
+
+        [Fact]
+        public void Test_208_05()
+        {
+        }
+
+        [Fact]
+        public void Test_208_06()
+        {
+        }
+
+        [Fact]
+        public void Test_208_07()
+        {
+        }
+
+        [Fact]
+        public void Test_208_08()
+        {
+        }
+
+        [Fact]
+        public void Test_208_09()
+        {
+        }
+
+        [Fact]
+        public void Test_208_10()
+        {
+        }
+
+        [Fact]
+        public void Test_208_11()
+        {
+        }
+
+        [Fact]
+        public void Test_208_12()
+        {
+        }
+
+        [Fact]
+        public void Test_208_13()
+        {
+        }
+
+        [Fact]
+        public void Test_208_14()
+        {
+        }
+
+        [Fact]
+        public void Test_208_15()
+        {
+        }
+
+        [Fact]
+        public void Test_208_16()
+        {
+        }
+
+        [Fact]
+        public void Test_208_17()
+        {
+        }
+
+        [Fact]
+        public void Test_208_18()
+        {
+        }
+
+        [Fact]
+        public void Test_208_19()
+        {
+        }
+
+        [Fact]
+        public void Test_208_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_209
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_209_01()
+        {
+        }
+
+        [Fact]
+        public void Test_209_02()
+        {
+        }
+
+        [Fact]
+        public void Test_209_03()
+        {
+        }
+
+        [Fact]
+        public void Test_209_04()
+        {
+        }
+
+        [Fact]
+        public void Test_209_05()
+        {
+        }
+
+        [Fact]
+        public void Test_209_06()
+        {
+        }
+
+        [Fact]
+        public void Test_209_07()
+        {
+        }
+
+        [Fact]
+        public void Test_209_08()
+        {
+        }
+
+        [Fact]
+        public void Test_209_09()
+        {
+        }
+
+        [Fact]
+        public void Test_209_10()
+        {
+        }
+
+        [Fact]
+        public void Test_209_11()
+        {
+        }
+
+        [Fact]
+        public void Test_209_12()
+        {
+        }
+
+        [Fact]
+        public void Test_209_13()
+        {
+        }
+
+        [Fact]
+        public void Test_209_14()
+        {
+        }
+
+        [Fact]
+        public void Test_209_15()
+        {
+        }
+
+        [Fact]
+        public void Test_209_16()
+        {
+        }
+
+        [Fact]
+        public void Test_209_17()
+        {
+        }
+
+        [Fact]
+        public void Test_209_18()
+        {
+        }
+
+        [Fact]
+        public void Test_209_19()
+        {
+        }
+
+        [Fact]
+        public void Test_209_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_210
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_210_01()
+        {
+        }
+
+        [Fact]
+        public void Test_210_02()
+        {
+        }
+
+        [Fact]
+        public void Test_210_03()
+        {
+        }
+
+        [Fact]
+        public void Test_210_04()
+        {
+        }
+
+        [Fact]
+        public void Test_210_05()
+        {
+        }
+
+        [Fact]
+        public void Test_210_06()
+        {
+        }
+
+        [Fact]
+        public void Test_210_07()
+        {
+        }
+
+        [Fact]
+        public void Test_210_08()
+        {
+        }
+
+        [Fact]
+        public void Test_210_09()
+        {
+        }
+
+        [Fact]
+        public void Test_210_10()
+        {
+        }
+
+        [Fact]
+        public void Test_210_11()
+        {
+        }
+
+        [Fact]
+        public void Test_210_12()
+        {
+        }
+
+        [Fact]
+        public void Test_210_13()
+        {
+        }
+
+        [Fact]
+        public void Test_210_14()
+        {
+        }
+
+        [Fact]
+        public void Test_210_15()
+        {
+        }
+
+        [Fact]
+        public void Test_210_16()
+        {
+        }
+
+        [Fact]
+        public void Test_210_17()
+        {
+        }
+
+        [Fact]
+        public void Test_210_18()
+        {
+        }
+
+        [Fact]
+        public void Test_210_19()
+        {
+        }
+
+        [Fact]
+        public void Test_210_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_211
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_211_01()
+        {
+        }
+
+        [Fact]
+        public void Test_211_02()
+        {
+        }
+
+        [Fact]
+        public void Test_211_03()
+        {
+        }
+
+        [Fact]
+        public void Test_211_04()
+        {
+        }
+
+        [Fact]
+        public void Test_211_05()
+        {
+        }
+
+        [Fact]
+        public void Test_211_06()
+        {
+        }
+
+        [Fact]
+        public void Test_211_07()
+        {
+        }
+
+        [Fact]
+        public void Test_211_08()
+        {
+        }
+
+        [Fact]
+        public void Test_211_09()
+        {
+        }
+
+        [Fact]
+        public void Test_211_10()
+        {
+        }
+
+        [Fact]
+        public void Test_211_11()
+        {
+        }
+
+        [Fact]
+        public void Test_211_12()
+        {
+        }
+
+        [Fact]
+        public void Test_211_13()
+        {
+        }
+
+        [Fact]
+        public void Test_211_14()
+        {
+        }
+
+        [Fact]
+        public void Test_211_15()
+        {
+        }
+
+        [Fact]
+        public void Test_211_16()
+        {
+        }
+
+        [Fact]
+        public void Test_211_17()
+        {
+        }
+
+        [Fact]
+        public void Test_211_18()
+        {
+        }
+
+        [Fact]
+        public void Test_211_19()
+        {
+        }
+
+        [Fact]
+        public void Test_211_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_212
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_212_01()
+        {
+        }
+
+        [Fact]
+        public void Test_212_02()
+        {
+        }
+
+        [Fact]
+        public void Test_212_03()
+        {
+        }
+
+        [Fact]
+        public void Test_212_04()
+        {
+        }
+
+        [Fact]
+        public void Test_212_05()
+        {
+        }
+
+        [Fact]
+        public void Test_212_06()
+        {
+        }
+
+        [Fact]
+        public void Test_212_07()
+        {
+        }
+
+        [Fact]
+        public void Test_212_08()
+        {
+        }
+
+        [Fact]
+        public void Test_212_09()
+        {
+        }
+
+        [Fact]
+        public void Test_212_10()
+        {
+        }
+
+        [Fact]
+        public void Test_212_11()
+        {
+        }
+
+        [Fact]
+        public void Test_212_12()
+        {
+        }
+
+        [Fact]
+        public void Test_212_13()
+        {
+        }
+
+        [Fact]
+        public void Test_212_14()
+        {
+        }
+
+        [Fact]
+        public void Test_212_15()
+        {
+        }
+
+        [Fact]
+        public void Test_212_16()
+        {
+        }
+
+        [Fact]
+        public void Test_212_17()
+        {
+        }
+
+        [Fact]
+        public void Test_212_18()
+        {
+        }
+
+        [Fact]
+        public void Test_212_19()
+        {
+        }
+
+        [Fact]
+        public void Test_212_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_213
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_213_01()
+        {
+        }
+
+        [Fact]
+        public void Test_213_02()
+        {
+        }
+
+        [Fact]
+        public void Test_213_03()
+        {
+        }
+
+        [Fact]
+        public void Test_213_04()
+        {
+        }
+
+        [Fact]
+        public void Test_213_05()
+        {
+        }
+
+        [Fact]
+        public void Test_213_06()
+        {
+        }
+
+        [Fact]
+        public void Test_213_07()
+        {
+        }
+
+        [Fact]
+        public void Test_213_08()
+        {
+        }
+
+        [Fact]
+        public void Test_213_09()
+        {
+        }
+
+        [Fact]
+        public void Test_213_10()
+        {
+        }
+
+        [Fact]
+        public void Test_213_11()
+        {
+        }
+
+        [Fact]
+        public void Test_213_12()
+        {
+        }
+
+        [Fact]
+        public void Test_213_13()
+        {
+        }
+
+        [Fact]
+        public void Test_213_14()
+        {
+        }
+
+        [Fact]
+        public void Test_213_15()
+        {
+        }
+
+        [Fact]
+        public void Test_213_16()
+        {
+        }
+
+        [Fact]
+        public void Test_213_17()
+        {
+        }
+
+        [Fact]
+        public void Test_213_18()
+        {
+        }
+
+        [Fact]
+        public void Test_213_19()
+        {
+        }
+
+        [Fact]
+        public void Test_213_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_214
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_214_01()
+        {
+        }
+
+        [Fact]
+        public void Test_214_02()
+        {
+        }
+
+        [Fact]
+        public void Test_214_03()
+        {
+        }
+
+        [Fact]
+        public void Test_214_04()
+        {
+        }
+
+        [Fact]
+        public void Test_214_05()
+        {
+        }
+
+        [Fact]
+        public void Test_214_06()
+        {
+        }
+
+        [Fact]
+        public void Test_214_07()
+        {
+        }
+
+        [Fact]
+        public void Test_214_08()
+        {
+        }
+
+        [Fact]
+        public void Test_214_09()
+        {
+        }
+
+        [Fact]
+        public void Test_214_10()
+        {
+        }
+
+        [Fact]
+        public void Test_214_11()
+        {
+        }
+
+        [Fact]
+        public void Test_214_12()
+        {
+        }
+
+        [Fact]
+        public void Test_214_13()
+        {
+        }
+
+        [Fact]
+        public void Test_214_14()
+        {
+        }
+
+        [Fact]
+        public void Test_214_15()
+        {
+        }
+
+        [Fact]
+        public void Test_214_16()
+        {
+        }
+
+        [Fact]
+        public void Test_214_17()
+        {
+        }
+
+        [Fact]
+        public void Test_214_18()
+        {
+        }
+
+        [Fact]
+        public void Test_214_19()
+        {
+        }
+
+        [Fact]
+        public void Test_214_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_215
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_215_01()
+        {
+        }
+
+        [Fact]
+        public void Test_215_02()
+        {
+        }
+
+        [Fact]
+        public void Test_215_03()
+        {
+        }
+
+        [Fact]
+        public void Test_215_04()
+        {
+        }
+
+        [Fact]
+        public void Test_215_05()
+        {
+        }
+
+        [Fact]
+        public void Test_215_06()
+        {
+        }
+
+        [Fact]
+        public void Test_215_07()
+        {
+        }
+
+        [Fact]
+        public void Test_215_08()
+        {
+        }
+
+        [Fact]
+        public void Test_215_09()
+        {
+        }
+
+        [Fact]
+        public void Test_215_10()
+        {
+        }
+
+        [Fact]
+        public void Test_215_11()
+        {
+        }
+
+        [Fact]
+        public void Test_215_12()
+        {
+        }
+
+        [Fact]
+        public void Test_215_13()
+        {
+        }
+
+        [Fact]
+        public void Test_215_14()
+        {
+        }
+
+        [Fact]
+        public void Test_215_15()
+        {
+        }
+
+        [Fact]
+        public void Test_215_16()
+        {
+        }
+
+        [Fact]
+        public void Test_215_17()
+        {
+        }
+
+        [Fact]
+        public void Test_215_18()
+        {
+        }
+
+        [Fact]
+        public void Test_215_19()
+        {
+        }
+
+        [Fact]
+        public void Test_215_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_216
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_216_01()
+        {
+        }
+
+        [Fact]
+        public void Test_216_02()
+        {
+        }
+
+        [Fact]
+        public void Test_216_03()
+        {
+        }
+
+        [Fact]
+        public void Test_216_04()
+        {
+        }
+
+        [Fact]
+        public void Test_216_05()
+        {
+        }
+
+        [Fact]
+        public void Test_216_06()
+        {
+        }
+
+        [Fact]
+        public void Test_216_07()
+        {
+        }
+
+        [Fact]
+        public void Test_216_08()
+        {
+        }
+
+        [Fact]
+        public void Test_216_09()
+        {
+        }
+
+        [Fact]
+        public void Test_216_10()
+        {
+        }
+
+        [Fact]
+        public void Test_216_11()
+        {
+        }
+
+        [Fact]
+        public void Test_216_12()
+        {
+        }
+
+        [Fact]
+        public void Test_216_13()
+        {
+        }
+
+        [Fact]
+        public void Test_216_14()
+        {
+        }
+
+        [Fact]
+        public void Test_216_15()
+        {
+        }
+
+        [Fact]
+        public void Test_216_16()
+        {
+        }
+
+        [Fact]
+        public void Test_216_17()
+        {
+        }
+
+        [Fact]
+        public void Test_216_18()
+        {
+        }
+
+        [Fact]
+        public void Test_216_19()
+        {
+        }
+
+        [Fact]
+        public void Test_216_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_217
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_217_01()
+        {
+        }
+
+        [Fact]
+        public void Test_217_02()
+        {
+        }
+
+        [Fact]
+        public void Test_217_03()
+        {
+        }
+
+        [Fact]
+        public void Test_217_04()
+        {
+        }
+
+        [Fact]
+        public void Test_217_05()
+        {
+        }
+
+        [Fact]
+        public void Test_217_06()
+        {
+        }
+
+        [Fact]
+        public void Test_217_07()
+        {
+        }
+
+        [Fact]
+        public void Test_217_08()
+        {
+        }
+
+        [Fact]
+        public void Test_217_09()
+        {
+        }
+
+        [Fact]
+        public void Test_217_10()
+        {
+        }
+
+        [Fact]
+        public void Test_217_11()
+        {
+        }
+
+        [Fact]
+        public void Test_217_12()
+        {
+        }
+
+        [Fact]
+        public void Test_217_13()
+        {
+        }
+
+        [Fact]
+        public void Test_217_14()
+        {
+        }
+
+        [Fact]
+        public void Test_217_15()
+        {
+        }
+
+        [Fact]
+        public void Test_217_16()
+        {
+        }
+
+        [Fact]
+        public void Test_217_17()
+        {
+        }
+
+        [Fact]
+        public void Test_217_18()
+        {
+        }
+
+        [Fact]
+        public void Test_217_19()
+        {
+        }
+
+        [Fact]
+        public void Test_217_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_218
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_218_01()
+        {
+        }
+
+        [Fact]
+        public void Test_218_02()
+        {
+        }
+
+        [Fact]
+        public void Test_218_03()
+        {
+        }
+
+        [Fact]
+        public void Test_218_04()
+        {
+        }
+
+        [Fact]
+        public void Test_218_05()
+        {
+        }
+
+        [Fact]
+        public void Test_218_06()
+        {
+        }
+
+        [Fact]
+        public void Test_218_07()
+        {
+        }
+
+        [Fact]
+        public void Test_218_08()
+        {
+        }
+
+        [Fact]
+        public void Test_218_09()
+        {
+        }
+
+        [Fact]
+        public void Test_218_10()
+        {
+        }
+
+        [Fact]
+        public void Test_218_11()
+        {
+        }
+
+        [Fact]
+        public void Test_218_12()
+        {
+        }
+
+        [Fact]
+        public void Test_218_13()
+        {
+        }
+
+        [Fact]
+        public void Test_218_14()
+        {
+        }
+
+        [Fact]
+        public void Test_218_15()
+        {
+        }
+
+        [Fact]
+        public void Test_218_16()
+        {
+        }
+
+        [Fact]
+        public void Test_218_17()
+        {
+        }
+
+        [Fact]
+        public void Test_218_18()
+        {
+        }
+
+        [Fact]
+        public void Test_218_19()
+        {
+        }
+
+        [Fact]
+        public void Test_218_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_219
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_219_01()
+        {
+        }
+
+        [Fact]
+        public void Test_219_02()
+        {
+        }
+
+        [Fact]
+        public void Test_219_03()
+        {
+        }
+
+        [Fact]
+        public void Test_219_04()
+        {
+        }
+
+        [Fact]
+        public void Test_219_05()
+        {
+        }
+
+        [Fact]
+        public void Test_219_06()
+        {
+        }
+
+        [Fact]
+        public void Test_219_07()
+        {
+        }
+
+        [Fact]
+        public void Test_219_08()
+        {
+        }
+
+        [Fact]
+        public void Test_219_09()
+        {
+        }
+
+        [Fact]
+        public void Test_219_10()
+        {
+        }
+
+        [Fact]
+        public void Test_219_11()
+        {
+        }
+
+        [Fact]
+        public void Test_219_12()
+        {
+        }
+
+        [Fact]
+        public void Test_219_13()
+        {
+        }
+
+        [Fact]
+        public void Test_219_14()
+        {
+        }
+
+        [Fact]
+        public void Test_219_15()
+        {
+        }
+
+        [Fact]
+        public void Test_219_16()
+        {
+        }
+
+        [Fact]
+        public void Test_219_17()
+        {
+        }
+
+        [Fact]
+        public void Test_219_18()
+        {
+        }
+
+        [Fact]
+        public void Test_219_19()
+        {
+        }
+
+        [Fact]
+        public void Test_219_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_220
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_220_01()
+        {
+        }
+
+        [Fact]
+        public void Test_220_02()
+        {
+        }
+
+        [Fact]
+        public void Test_220_03()
+        {
+        }
+
+        [Fact]
+        public void Test_220_04()
+        {
+        }
+
+        [Fact]
+        public void Test_220_05()
+        {
+        }
+
+        [Fact]
+        public void Test_220_06()
+        {
+        }
+
+        [Fact]
+        public void Test_220_07()
+        {
+        }
+
+        [Fact]
+        public void Test_220_08()
+        {
+        }
+
+        [Fact]
+        public void Test_220_09()
+        {
+        }
+
+        [Fact]
+        public void Test_220_10()
+        {
+        }
+
+        [Fact]
+        public void Test_220_11()
+        {
+        }
+
+        [Fact]
+        public void Test_220_12()
+        {
+        }
+
+        [Fact]
+        public void Test_220_13()
+        {
+        }
+
+        [Fact]
+        public void Test_220_14()
+        {
+        }
+
+        [Fact]
+        public void Test_220_15()
+        {
+        }
+
+        [Fact]
+        public void Test_220_16()
+        {
+        }
+
+        [Fact]
+        public void Test_220_17()
+        {
+        }
+
+        [Fact]
+        public void Test_220_18()
+        {
+        }
+
+        [Fact]
+        public void Test_220_19()
+        {
+        }
+
+        [Fact]
+        public void Test_220_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_221
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_221_01()
+        {
+        }
+
+        [Fact]
+        public void Test_221_02()
+        {
+        }
+
+        [Fact]
+        public void Test_221_03()
+        {
+        }
+
+        [Fact]
+        public void Test_221_04()
+        {
+        }
+
+        [Fact]
+        public void Test_221_05()
+        {
+        }
+
+        [Fact]
+        public void Test_221_06()
+        {
+        }
+
+        [Fact]
+        public void Test_221_07()
+        {
+        }
+
+        [Fact]
+        public void Test_221_08()
+        {
+        }
+
+        [Fact]
+        public void Test_221_09()
+        {
+        }
+
+        [Fact]
+        public void Test_221_10()
+        {
+        }
+
+        [Fact]
+        public void Test_221_11()
+        {
+        }
+
+        [Fact]
+        public void Test_221_12()
+        {
+        }
+
+        [Fact]
+        public void Test_221_13()
+        {
+        }
+
+        [Fact]
+        public void Test_221_14()
+        {
+        }
+
+        [Fact]
+        public void Test_221_15()
+        {
+        }
+
+        [Fact]
+        public void Test_221_16()
+        {
+        }
+
+        [Fact]
+        public void Test_221_17()
+        {
+        }
+
+        [Fact]
+        public void Test_221_18()
+        {
+        }
+
+        [Fact]
+        public void Test_221_19()
+        {
+        }
+
+        [Fact]
+        public void Test_221_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_222
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_222_01()
+        {
+        }
+
+        [Fact]
+        public void Test_222_02()
+        {
+        }
+
+        [Fact]
+        public void Test_222_03()
+        {
+        }
+
+        [Fact]
+        public void Test_222_04()
+        {
+        }
+
+        [Fact]
+        public void Test_222_05()
+        {
+        }
+
+        [Fact]
+        public void Test_222_06()
+        {
+        }
+
+        [Fact]
+        public void Test_222_07()
+        {
+        }
+
+        [Fact]
+        public void Test_222_08()
+        {
+        }
+
+        [Fact]
+        public void Test_222_09()
+        {
+        }
+
+        [Fact]
+        public void Test_222_10()
+        {
+        }
+
+        [Fact]
+        public void Test_222_11()
+        {
+        }
+
+        [Fact]
+        public void Test_222_12()
+        {
+        }
+
+        [Fact]
+        public void Test_222_13()
+        {
+        }
+
+        [Fact]
+        public void Test_222_14()
+        {
+        }
+
+        [Fact]
+        public void Test_222_15()
+        {
+        }
+
+        [Fact]
+        public void Test_222_16()
+        {
+        }
+
+        [Fact]
+        public void Test_222_17()
+        {
+        }
+
+        [Fact]
+        public void Test_222_18()
+        {
+        }
+
+        [Fact]
+        public void Test_222_19()
+        {
+        }
+
+        [Fact]
+        public void Test_222_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_223
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_223_01()
+        {
+        }
+
+        [Fact]
+        public void Test_223_02()
+        {
+        }
+
+        [Fact]
+        public void Test_223_03()
+        {
+        }
+
+        [Fact]
+        public void Test_223_04()
+        {
+        }
+
+        [Fact]
+        public void Test_223_05()
+        {
+        }
+
+        [Fact]
+        public void Test_223_06()
+        {
+        }
+
+        [Fact]
+        public void Test_223_07()
+        {
+        }
+
+        [Fact]
+        public void Test_223_08()
+        {
+        }
+
+        [Fact]
+        public void Test_223_09()
+        {
+        }
+
+        [Fact]
+        public void Test_223_10()
+        {
+        }
+
+        [Fact]
+        public void Test_223_11()
+        {
+        }
+
+        [Fact]
+        public void Test_223_12()
+        {
+        }
+
+        [Fact]
+        public void Test_223_13()
+        {
+        }
+
+        [Fact]
+        public void Test_223_14()
+        {
+        }
+
+        [Fact]
+        public void Test_223_15()
+        {
+        }
+
+        [Fact]
+        public void Test_223_16()
+        {
+        }
+
+        [Fact]
+        public void Test_223_17()
+        {
+        }
+
+        [Fact]
+        public void Test_223_18()
+        {
+        }
+
+        [Fact]
+        public void Test_223_19()
+        {
+        }
+
+        [Fact]
+        public void Test_223_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_224
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_224_01()
+        {
+        }
+
+        [Fact]
+        public void Test_224_02()
+        {
+        }
+
+        [Fact]
+        public void Test_224_03()
+        {
+        }
+
+        [Fact]
+        public void Test_224_04()
+        {
+        }
+
+        [Fact]
+        public void Test_224_05()
+        {
+        }
+
+        [Fact]
+        public void Test_224_06()
+        {
+        }
+
+        [Fact]
+        public void Test_224_07()
+        {
+        }
+
+        [Fact]
+        public void Test_224_08()
+        {
+        }
+
+        [Fact]
+        public void Test_224_09()
+        {
+        }
+
+        [Fact]
+        public void Test_224_10()
+        {
+        }
+
+        [Fact]
+        public void Test_224_11()
+        {
+        }
+
+        [Fact]
+        public void Test_224_12()
+        {
+        }
+
+        [Fact]
+        public void Test_224_13()
+        {
+        }
+
+        [Fact]
+        public void Test_224_14()
+        {
+        }
+
+        [Fact]
+        public void Test_224_15()
+        {
+        }
+
+        [Fact]
+        public void Test_224_16()
+        {
+        }
+
+        [Fact]
+        public void Test_224_17()
+        {
+        }
+
+        [Fact]
+        public void Test_224_18()
+        {
+        }
+
+        [Fact]
+        public void Test_224_19()
+        {
+        }
+
+        [Fact]
+        public void Test_224_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_225
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_225_01()
+        {
+        }
+
+        [Fact]
+        public void Test_225_02()
+        {
+        }
+
+        [Fact]
+        public void Test_225_03()
+        {
+        }
+
+        [Fact]
+        public void Test_225_04()
+        {
+        }
+
+        [Fact]
+        public void Test_225_05()
+        {
+        }
+
+        [Fact]
+        public void Test_225_06()
+        {
+        }
+
+        [Fact]
+        public void Test_225_07()
+        {
+        }
+
+        [Fact]
+        public void Test_225_08()
+        {
+        }
+
+        [Fact]
+        public void Test_225_09()
+        {
+        }
+
+        [Fact]
+        public void Test_225_10()
+        {
+        }
+
+        [Fact]
+        public void Test_225_11()
+        {
+        }
+
+        [Fact]
+        public void Test_225_12()
+        {
+        }
+
+        [Fact]
+        public void Test_225_13()
+        {
+        }
+
+        [Fact]
+        public void Test_225_14()
+        {
+        }
+
+        [Fact]
+        public void Test_225_15()
+        {
+        }
+
+        [Fact]
+        public void Test_225_16()
+        {
+        }
+
+        [Fact]
+        public void Test_225_17()
+        {
+        }
+
+        [Fact]
+        public void Test_225_18()
+        {
+        }
+
+        [Fact]
+        public void Test_225_19()
+        {
+        }
+
+        [Fact]
+        public void Test_225_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_226
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_226_01()
+        {
+        }
+
+        [Fact]
+        public void Test_226_02()
+        {
+        }
+
+        [Fact]
+        public void Test_226_03()
+        {
+        }
+
+        [Fact]
+        public void Test_226_04()
+        {
+        }
+
+        [Fact]
+        public void Test_226_05()
+        {
+        }
+
+        [Fact]
+        public void Test_226_06()
+        {
+        }
+
+        [Fact]
+        public void Test_226_07()
+        {
+        }
+
+        [Fact]
+        public void Test_226_08()
+        {
+        }
+
+        [Fact]
+        public void Test_226_09()
+        {
+        }
+
+        [Fact]
+        public void Test_226_10()
+        {
+        }
+
+        [Fact]
+        public void Test_226_11()
+        {
+        }
+
+        [Fact]
+        public void Test_226_12()
+        {
+        }
+
+        [Fact]
+        public void Test_226_13()
+        {
+        }
+
+        [Fact]
+        public void Test_226_14()
+        {
+        }
+
+        [Fact]
+        public void Test_226_15()
+        {
+        }
+
+        [Fact]
+        public void Test_226_16()
+        {
+        }
+
+        [Fact]
+        public void Test_226_17()
+        {
+        }
+
+        [Fact]
+        public void Test_226_18()
+        {
+        }
+
+        [Fact]
+        public void Test_226_19()
+        {
+        }
+
+        [Fact]
+        public void Test_226_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_227
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_227_01()
+        {
+        }
+
+        [Fact]
+        public void Test_227_02()
+        {
+        }
+
+        [Fact]
+        public void Test_227_03()
+        {
+        }
+
+        [Fact]
+        public void Test_227_04()
+        {
+        }
+
+        [Fact]
+        public void Test_227_05()
+        {
+        }
+
+        [Fact]
+        public void Test_227_06()
+        {
+        }
+
+        [Fact]
+        public void Test_227_07()
+        {
+        }
+
+        [Fact]
+        public void Test_227_08()
+        {
+        }
+
+        [Fact]
+        public void Test_227_09()
+        {
+        }
+
+        [Fact]
+        public void Test_227_10()
+        {
+        }
+
+        [Fact]
+        public void Test_227_11()
+        {
+        }
+
+        [Fact]
+        public void Test_227_12()
+        {
+        }
+
+        [Fact]
+        public void Test_227_13()
+        {
+        }
+
+        [Fact]
+        public void Test_227_14()
+        {
+        }
+
+        [Fact]
+        public void Test_227_15()
+        {
+        }
+
+        [Fact]
+        public void Test_227_16()
+        {
+        }
+
+        [Fact]
+        public void Test_227_17()
+        {
+        }
+
+        [Fact]
+        public void Test_227_18()
+        {
+        }
+
+        [Fact]
+        public void Test_227_19()
+        {
+        }
+
+        [Fact]
+        public void Test_227_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_228
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_228_01()
+        {
+        }
+
+        [Fact]
+        public void Test_228_02()
+        {
+        }
+
+        [Fact]
+        public void Test_228_03()
+        {
+        }
+
+        [Fact]
+        public void Test_228_04()
+        {
+        }
+
+        [Fact]
+        public void Test_228_05()
+        {
+        }
+
+        [Fact]
+        public void Test_228_06()
+        {
+        }
+
+        [Fact]
+        public void Test_228_07()
+        {
+        }
+
+        [Fact]
+        public void Test_228_08()
+        {
+        }
+
+        [Fact]
+        public void Test_228_09()
+        {
+        }
+
+        [Fact]
+        public void Test_228_10()
+        {
+        }
+
+        [Fact]
+        public void Test_228_11()
+        {
+        }
+
+        [Fact]
+        public void Test_228_12()
+        {
+        }
+
+        [Fact]
+        public void Test_228_13()
+        {
+        }
+
+        [Fact]
+        public void Test_228_14()
+        {
+        }
+
+        [Fact]
+        public void Test_228_15()
+        {
+        }
+
+        [Fact]
+        public void Test_228_16()
+        {
+        }
+
+        [Fact]
+        public void Test_228_17()
+        {
+        }
+
+        [Fact]
+        public void Test_228_18()
+        {
+        }
+
+        [Fact]
+        public void Test_228_19()
+        {
+        }
+
+        [Fact]
+        public void Test_228_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_229
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_229_01()
+        {
+        }
+
+        [Fact]
+        public void Test_229_02()
+        {
+        }
+
+        [Fact]
+        public void Test_229_03()
+        {
+        }
+
+        [Fact]
+        public void Test_229_04()
+        {
+        }
+
+        [Fact]
+        public void Test_229_05()
+        {
+        }
+
+        [Fact]
+        public void Test_229_06()
+        {
+        }
+
+        [Fact]
+        public void Test_229_07()
+        {
+        }
+
+        [Fact]
+        public void Test_229_08()
+        {
+        }
+
+        [Fact]
+        public void Test_229_09()
+        {
+        }
+
+        [Fact]
+        public void Test_229_10()
+        {
+        }
+
+        [Fact]
+        public void Test_229_11()
+        {
+        }
+
+        [Fact]
+        public void Test_229_12()
+        {
+        }
+
+        [Fact]
+        public void Test_229_13()
+        {
+        }
+
+        [Fact]
+        public void Test_229_14()
+        {
+        }
+
+        [Fact]
+        public void Test_229_15()
+        {
+        }
+
+        [Fact]
+        public void Test_229_16()
+        {
+        }
+
+        [Fact]
+        public void Test_229_17()
+        {
+        }
+
+        [Fact]
+        public void Test_229_18()
+        {
+        }
+
+        [Fact]
+        public void Test_229_19()
+        {
+        }
+
+        [Fact]
+        public void Test_229_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_230
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_230_01()
+        {
+        }
+
+        [Fact]
+        public void Test_230_02()
+        {
+        }
+
+        [Fact]
+        public void Test_230_03()
+        {
+        }
+
+        [Fact]
+        public void Test_230_04()
+        {
+        }
+
+        [Fact]
+        public void Test_230_05()
+        {
+        }
+
+        [Fact]
+        public void Test_230_06()
+        {
+        }
+
+        [Fact]
+        public void Test_230_07()
+        {
+        }
+
+        [Fact]
+        public void Test_230_08()
+        {
+        }
+
+        [Fact]
+        public void Test_230_09()
+        {
+        }
+
+        [Fact]
+        public void Test_230_10()
+        {
+        }
+
+        [Fact]
+        public void Test_230_11()
+        {
+        }
+
+        [Fact]
+        public void Test_230_12()
+        {
+        }
+
+        [Fact]
+        public void Test_230_13()
+        {
+        }
+
+        [Fact]
+        public void Test_230_14()
+        {
+        }
+
+        [Fact]
+        public void Test_230_15()
+        {
+        }
+
+        [Fact]
+        public void Test_230_16()
+        {
+        }
+
+        [Fact]
+        public void Test_230_17()
+        {
+        }
+
+        [Fact]
+        public void Test_230_18()
+        {
+        }
+
+        [Fact]
+        public void Test_230_19()
+        {
+        }
+
+        [Fact]
+        public void Test_230_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_231
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_231_01()
+        {
+        }
+
+        [Fact]
+        public void Test_231_02()
+        {
+        }
+
+        [Fact]
+        public void Test_231_03()
+        {
+        }
+
+        [Fact]
+        public void Test_231_04()
+        {
+        }
+
+        [Fact]
+        public void Test_231_05()
+        {
+        }
+
+        [Fact]
+        public void Test_231_06()
+        {
+        }
+
+        [Fact]
+        public void Test_231_07()
+        {
+        }
+
+        [Fact]
+        public void Test_231_08()
+        {
+        }
+
+        [Fact]
+        public void Test_231_09()
+        {
+        }
+
+        [Fact]
+        public void Test_231_10()
+        {
+        }
+
+        [Fact]
+        public void Test_231_11()
+        {
+        }
+
+        [Fact]
+        public void Test_231_12()
+        {
+        }
+
+        [Fact]
+        public void Test_231_13()
+        {
+        }
+
+        [Fact]
+        public void Test_231_14()
+        {
+        }
+
+        [Fact]
+        public void Test_231_15()
+        {
+        }
+
+        [Fact]
+        public void Test_231_16()
+        {
+        }
+
+        [Fact]
+        public void Test_231_17()
+        {
+        }
+
+        [Fact]
+        public void Test_231_18()
+        {
+        }
+
+        [Fact]
+        public void Test_231_19()
+        {
+        }
+
+        [Fact]
+        public void Test_231_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_232
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_232_01()
+        {
+        }
+
+        [Fact]
+        public void Test_232_02()
+        {
+        }
+
+        [Fact]
+        public void Test_232_03()
+        {
+        }
+
+        [Fact]
+        public void Test_232_04()
+        {
+        }
+
+        [Fact]
+        public void Test_232_05()
+        {
+        }
+
+        [Fact]
+        public void Test_232_06()
+        {
+        }
+
+        [Fact]
+        public void Test_232_07()
+        {
+        }
+
+        [Fact]
+        public void Test_232_08()
+        {
+        }
+
+        [Fact]
+        public void Test_232_09()
+        {
+        }
+
+        [Fact]
+        public void Test_232_10()
+        {
+        }
+
+        [Fact]
+        public void Test_232_11()
+        {
+        }
+
+        [Fact]
+        public void Test_232_12()
+        {
+        }
+
+        [Fact]
+        public void Test_232_13()
+        {
+        }
+
+        [Fact]
+        public void Test_232_14()
+        {
+        }
+
+        [Fact]
+        public void Test_232_15()
+        {
+        }
+
+        [Fact]
+        public void Test_232_16()
+        {
+        }
+
+        [Fact]
+        public void Test_232_17()
+        {
+        }
+
+        [Fact]
+        public void Test_232_18()
+        {
+        }
+
+        [Fact]
+        public void Test_232_19()
+        {
+        }
+
+        [Fact]
+        public void Test_232_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_233
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_233_01()
+        {
+        }
+
+        [Fact]
+        public void Test_233_02()
+        {
+        }
+
+        [Fact]
+        public void Test_233_03()
+        {
+        }
+
+        [Fact]
+        public void Test_233_04()
+        {
+        }
+
+        [Fact]
+        public void Test_233_05()
+        {
+        }
+
+        [Fact]
+        public void Test_233_06()
+        {
+        }
+
+        [Fact]
+        public void Test_233_07()
+        {
+        }
+
+        [Fact]
+        public void Test_233_08()
+        {
+        }
+
+        [Fact]
+        public void Test_233_09()
+        {
+        }
+
+        [Fact]
+        public void Test_233_10()
+        {
+        }
+
+        [Fact]
+        public void Test_233_11()
+        {
+        }
+
+        [Fact]
+        public void Test_233_12()
+        {
+        }
+
+        [Fact]
+        public void Test_233_13()
+        {
+        }
+
+        [Fact]
+        public void Test_233_14()
+        {
+        }
+
+        [Fact]
+        public void Test_233_15()
+        {
+        }
+
+        [Fact]
+        public void Test_233_16()
+        {
+        }
+
+        [Fact]
+        public void Test_233_17()
+        {
+        }
+
+        [Fact]
+        public void Test_233_18()
+        {
+        }
+
+        [Fact]
+        public void Test_233_19()
+        {
+        }
+
+        [Fact]
+        public void Test_233_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_234
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_234_01()
+        {
+        }
+
+        [Fact]
+        public void Test_234_02()
+        {
+        }
+
+        [Fact]
+        public void Test_234_03()
+        {
+        }
+
+        [Fact]
+        public void Test_234_04()
+        {
+        }
+
+        [Fact]
+        public void Test_234_05()
+        {
+        }
+
+        [Fact]
+        public void Test_234_06()
+        {
+        }
+
+        [Fact]
+        public void Test_234_07()
+        {
+        }
+
+        [Fact]
+        public void Test_234_08()
+        {
+        }
+
+        [Fact]
+        public void Test_234_09()
+        {
+        }
+
+        [Fact]
+        public void Test_234_10()
+        {
+        }
+
+        [Fact]
+        public void Test_234_11()
+        {
+        }
+
+        [Fact]
+        public void Test_234_12()
+        {
+        }
+
+        [Fact]
+        public void Test_234_13()
+        {
+        }
+
+        [Fact]
+        public void Test_234_14()
+        {
+        }
+
+        [Fact]
+        public void Test_234_15()
+        {
+        }
+
+        [Fact]
+        public void Test_234_16()
+        {
+        }
+
+        [Fact]
+        public void Test_234_17()
+        {
+        }
+
+        [Fact]
+        public void Test_234_18()
+        {
+        }
+
+        [Fact]
+        public void Test_234_19()
+        {
+        }
+
+        [Fact]
+        public void Test_234_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_235
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_235_01()
+        {
+        }
+
+        [Fact]
+        public void Test_235_02()
+        {
+        }
+
+        [Fact]
+        public void Test_235_03()
+        {
+        }
+
+        [Fact]
+        public void Test_235_04()
+        {
+        }
+
+        [Fact]
+        public void Test_235_05()
+        {
+        }
+
+        [Fact]
+        public void Test_235_06()
+        {
+        }
+
+        [Fact]
+        public void Test_235_07()
+        {
+        }
+
+        [Fact]
+        public void Test_235_08()
+        {
+        }
+
+        [Fact]
+        public void Test_235_09()
+        {
+        }
+
+        [Fact]
+        public void Test_235_10()
+        {
+        }
+
+        [Fact]
+        public void Test_235_11()
+        {
+        }
+
+        [Fact]
+        public void Test_235_12()
+        {
+        }
+
+        [Fact]
+        public void Test_235_13()
+        {
+        }
+
+        [Fact]
+        public void Test_235_14()
+        {
+        }
+
+        [Fact]
+        public void Test_235_15()
+        {
+        }
+
+        [Fact]
+        public void Test_235_16()
+        {
+        }
+
+        [Fact]
+        public void Test_235_17()
+        {
+        }
+
+        [Fact]
+        public void Test_235_18()
+        {
+        }
+
+        [Fact]
+        public void Test_235_19()
+        {
+        }
+
+        [Fact]
+        public void Test_235_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_236
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_236_01()
+        {
+        }
+
+        [Fact]
+        public void Test_236_02()
+        {
+        }
+
+        [Fact]
+        public void Test_236_03()
+        {
+        }
+
+        [Fact]
+        public void Test_236_04()
+        {
+        }
+
+        [Fact]
+        public void Test_236_05()
+        {
+        }
+
+        [Fact]
+        public void Test_236_06()
+        {
+        }
+
+        [Fact]
+        public void Test_236_07()
+        {
+        }
+
+        [Fact]
+        public void Test_236_08()
+        {
+        }
+
+        [Fact]
+        public void Test_236_09()
+        {
+        }
+
+        [Fact]
+        public void Test_236_10()
+        {
+        }
+
+        [Fact]
+        public void Test_236_11()
+        {
+        }
+
+        [Fact]
+        public void Test_236_12()
+        {
+        }
+
+        [Fact]
+        public void Test_236_13()
+        {
+        }
+
+        [Fact]
+        public void Test_236_14()
+        {
+        }
+
+        [Fact]
+        public void Test_236_15()
+        {
+        }
+
+        [Fact]
+        public void Test_236_16()
+        {
+        }
+
+        [Fact]
+        public void Test_236_17()
+        {
+        }
+
+        [Fact]
+        public void Test_236_18()
+        {
+        }
+
+        [Fact]
+        public void Test_236_19()
+        {
+        }
+
+        [Fact]
+        public void Test_236_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_237
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_237_01()
+        {
+        }
+
+        [Fact]
+        public void Test_237_02()
+        {
+        }
+
+        [Fact]
+        public void Test_237_03()
+        {
+        }
+
+        [Fact]
+        public void Test_237_04()
+        {
+        }
+
+        [Fact]
+        public void Test_237_05()
+        {
+        }
+
+        [Fact]
+        public void Test_237_06()
+        {
+        }
+
+        [Fact]
+        public void Test_237_07()
+        {
+        }
+
+        [Fact]
+        public void Test_237_08()
+        {
+        }
+
+        [Fact]
+        public void Test_237_09()
+        {
+        }
+
+        [Fact]
+        public void Test_237_10()
+        {
+        }
+
+        [Fact]
+        public void Test_237_11()
+        {
+        }
+
+        [Fact]
+        public void Test_237_12()
+        {
+        }
+
+        [Fact]
+        public void Test_237_13()
+        {
+        }
+
+        [Fact]
+        public void Test_237_14()
+        {
+        }
+
+        [Fact]
+        public void Test_237_15()
+        {
+        }
+
+        [Fact]
+        public void Test_237_16()
+        {
+        }
+
+        [Fact]
+        public void Test_237_17()
+        {
+        }
+
+        [Fact]
+        public void Test_237_18()
+        {
+        }
+
+        [Fact]
+        public void Test_237_19()
+        {
+        }
+
+        [Fact]
+        public void Test_237_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_238
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_238_01()
+        {
+        }
+
+        [Fact]
+        public void Test_238_02()
+        {
+        }
+
+        [Fact]
+        public void Test_238_03()
+        {
+        }
+
+        [Fact]
+        public void Test_238_04()
+        {
+        }
+
+        [Fact]
+        public void Test_238_05()
+        {
+        }
+
+        [Fact]
+        public void Test_238_06()
+        {
+        }
+
+        [Fact]
+        public void Test_238_07()
+        {
+        }
+
+        [Fact]
+        public void Test_238_08()
+        {
+        }
+
+        [Fact]
+        public void Test_238_09()
+        {
+        }
+
+        [Fact]
+        public void Test_238_10()
+        {
+        }
+
+        [Fact]
+        public void Test_238_11()
+        {
+        }
+
+        [Fact]
+        public void Test_238_12()
+        {
+        }
+
+        [Fact]
+        public void Test_238_13()
+        {
+        }
+
+        [Fact]
+        public void Test_238_14()
+        {
+        }
+
+        [Fact]
+        public void Test_238_15()
+        {
+        }
+
+        [Fact]
+        public void Test_238_16()
+        {
+        }
+
+        [Fact]
+        public void Test_238_17()
+        {
+        }
+
+        [Fact]
+        public void Test_238_18()
+        {
+        }
+
+        [Fact]
+        public void Test_238_19()
+        {
+        }
+
+        [Fact]
+        public void Test_238_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_239
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_239_01()
+        {
+        }
+
+        [Fact]
+        public void Test_239_02()
+        {
+        }
+
+        [Fact]
+        public void Test_239_03()
+        {
+        }
+
+        [Fact]
+        public void Test_239_04()
+        {
+        }
+
+        [Fact]
+        public void Test_239_05()
+        {
+        }
+
+        [Fact]
+        public void Test_239_06()
+        {
+        }
+
+        [Fact]
+        public void Test_239_07()
+        {
+        }
+
+        [Fact]
+        public void Test_239_08()
+        {
+        }
+
+        [Fact]
+        public void Test_239_09()
+        {
+        }
+
+        [Fact]
+        public void Test_239_10()
+        {
+        }
+
+        [Fact]
+        public void Test_239_11()
+        {
+        }
+
+        [Fact]
+        public void Test_239_12()
+        {
+        }
+
+        [Fact]
+        public void Test_239_13()
+        {
+        }
+
+        [Fact]
+        public void Test_239_14()
+        {
+        }
+
+        [Fact]
+        public void Test_239_15()
+        {
+        }
+
+        [Fact]
+        public void Test_239_16()
+        {
+        }
+
+        [Fact]
+        public void Test_239_17()
+        {
+        }
+
+        [Fact]
+        public void Test_239_18()
+        {
+        }
+
+        [Fact]
+        public void Test_239_19()
+        {
+        }
+
+        [Fact]
+        public void Test_239_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_240
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_240_01()
+        {
+        }
+
+        [Fact]
+        public void Test_240_02()
+        {
+        }
+
+        [Fact]
+        public void Test_240_03()
+        {
+        }
+
+        [Fact]
+        public void Test_240_04()
+        {
+        }
+
+        [Fact]
+        public void Test_240_05()
+        {
+        }
+
+        [Fact]
+        public void Test_240_06()
+        {
+        }
+
+        [Fact]
+        public void Test_240_07()
+        {
+        }
+
+        [Fact]
+        public void Test_240_08()
+        {
+        }
+
+        [Fact]
+        public void Test_240_09()
+        {
+        }
+
+        [Fact]
+        public void Test_240_10()
+        {
+        }
+
+        [Fact]
+        public void Test_240_11()
+        {
+        }
+
+        [Fact]
+        public void Test_240_12()
+        {
+        }
+
+        [Fact]
+        public void Test_240_13()
+        {
+        }
+
+        [Fact]
+        public void Test_240_14()
+        {
+        }
+
+        [Fact]
+        public void Test_240_15()
+        {
+        }
+
+        [Fact]
+        public void Test_240_16()
+        {
+        }
+
+        [Fact]
+        public void Test_240_17()
+        {
+        }
+
+        [Fact]
+        public void Test_240_18()
+        {
+        }
+
+        [Fact]
+        public void Test_240_19()
+        {
+        }
+
+        [Fact]
+        public void Test_240_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_241
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_241_01()
+        {
+        }
+
+        [Fact]
+        public void Test_241_02()
+        {
+        }
+
+        [Fact]
+        public void Test_241_03()
+        {
+        }
+
+        [Fact]
+        public void Test_241_04()
+        {
+        }
+
+        [Fact]
+        public void Test_241_05()
+        {
+        }
+
+        [Fact]
+        public void Test_241_06()
+        {
+        }
+
+        [Fact]
+        public void Test_241_07()
+        {
+        }
+
+        [Fact]
+        public void Test_241_08()
+        {
+        }
+
+        [Fact]
+        public void Test_241_09()
+        {
+        }
+
+        [Fact]
+        public void Test_241_10()
+        {
+        }
+
+        [Fact]
+        public void Test_241_11()
+        {
+        }
+
+        [Fact]
+        public void Test_241_12()
+        {
+        }
+
+        [Fact]
+        public void Test_241_13()
+        {
+        }
+
+        [Fact]
+        public void Test_241_14()
+        {
+        }
+
+        [Fact]
+        public void Test_241_15()
+        {
+        }
+
+        [Fact]
+        public void Test_241_16()
+        {
+        }
+
+        [Fact]
+        public void Test_241_17()
+        {
+        }
+
+        [Fact]
+        public void Test_241_18()
+        {
+        }
+
+        [Fact]
+        public void Test_241_19()
+        {
+        }
+
+        [Fact]
+        public void Test_241_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_242
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_242_01()
+        {
+        }
+
+        [Fact]
+        public void Test_242_02()
+        {
+        }
+
+        [Fact]
+        public void Test_242_03()
+        {
+        }
+
+        [Fact]
+        public void Test_242_04()
+        {
+        }
+
+        [Fact]
+        public void Test_242_05()
+        {
+        }
+
+        [Fact]
+        public void Test_242_06()
+        {
+        }
+
+        [Fact]
+        public void Test_242_07()
+        {
+        }
+
+        [Fact]
+        public void Test_242_08()
+        {
+        }
+
+        [Fact]
+        public void Test_242_09()
+        {
+        }
+
+        [Fact]
+        public void Test_242_10()
+        {
+        }
+
+        [Fact]
+        public void Test_242_11()
+        {
+        }
+
+        [Fact]
+        public void Test_242_12()
+        {
+        }
+
+        [Fact]
+        public void Test_242_13()
+        {
+        }
+
+        [Fact]
+        public void Test_242_14()
+        {
+        }
+
+        [Fact]
+        public void Test_242_15()
+        {
+        }
+
+        [Fact]
+        public void Test_242_16()
+        {
+        }
+
+        [Fact]
+        public void Test_242_17()
+        {
+        }
+
+        [Fact]
+        public void Test_242_18()
+        {
+        }
+
+        [Fact]
+        public void Test_242_19()
+        {
+        }
+
+        [Fact]
+        public void Test_242_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_243
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_243_01()
+        {
+        }
+
+        [Fact]
+        public void Test_243_02()
+        {
+        }
+
+        [Fact]
+        public void Test_243_03()
+        {
+        }
+
+        [Fact]
+        public void Test_243_04()
+        {
+        }
+
+        [Fact]
+        public void Test_243_05()
+        {
+        }
+
+        [Fact]
+        public void Test_243_06()
+        {
+        }
+
+        [Fact]
+        public void Test_243_07()
+        {
+        }
+
+        [Fact]
+        public void Test_243_08()
+        {
+        }
+
+        [Fact]
+        public void Test_243_09()
+        {
+        }
+
+        [Fact]
+        public void Test_243_10()
+        {
+        }
+
+        [Fact]
+        public void Test_243_11()
+        {
+        }
+
+        [Fact]
+        public void Test_243_12()
+        {
+        }
+
+        [Fact]
+        public void Test_243_13()
+        {
+        }
+
+        [Fact]
+        public void Test_243_14()
+        {
+        }
+
+        [Fact]
+        public void Test_243_15()
+        {
+        }
+
+        [Fact]
+        public void Test_243_16()
+        {
+        }
+
+        [Fact]
+        public void Test_243_17()
+        {
+        }
+
+        [Fact]
+        public void Test_243_18()
+        {
+        }
+
+        [Fact]
+        public void Test_243_19()
+        {
+        }
+
+        [Fact]
+        public void Test_243_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_244
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_244_01()
+        {
+        }
+
+        [Fact]
+        public void Test_244_02()
+        {
+        }
+
+        [Fact]
+        public void Test_244_03()
+        {
+        }
+
+        [Fact]
+        public void Test_244_04()
+        {
+        }
+
+        [Fact]
+        public void Test_244_05()
+        {
+        }
+
+        [Fact]
+        public void Test_244_06()
+        {
+        }
+
+        [Fact]
+        public void Test_244_07()
+        {
+        }
+
+        [Fact]
+        public void Test_244_08()
+        {
+        }
+
+        [Fact]
+        public void Test_244_09()
+        {
+        }
+
+        [Fact]
+        public void Test_244_10()
+        {
+        }
+
+        [Fact]
+        public void Test_244_11()
+        {
+        }
+
+        [Fact]
+        public void Test_244_12()
+        {
+        }
+
+        [Fact]
+        public void Test_244_13()
+        {
+        }
+
+        [Fact]
+        public void Test_244_14()
+        {
+        }
+
+        [Fact]
+        public void Test_244_15()
+        {
+        }
+
+        [Fact]
+        public void Test_244_16()
+        {
+        }
+
+        [Fact]
+        public void Test_244_17()
+        {
+        }
+
+        [Fact]
+        public void Test_244_18()
+        {
+        }
+
+        [Fact]
+        public void Test_244_19()
+        {
+        }
+
+        [Fact]
+        public void Test_244_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_245
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_245_01()
+        {
+        }
+
+        [Fact]
+        public void Test_245_02()
+        {
+        }
+
+        [Fact]
+        public void Test_245_03()
+        {
+        }
+
+        [Fact]
+        public void Test_245_04()
+        {
+        }
+
+        [Fact]
+        public void Test_245_05()
+        {
+        }
+
+        [Fact]
+        public void Test_245_06()
+        {
+        }
+
+        [Fact]
+        public void Test_245_07()
+        {
+        }
+
+        [Fact]
+        public void Test_245_08()
+        {
+        }
+
+        [Fact]
+        public void Test_245_09()
+        {
+        }
+
+        [Fact]
+        public void Test_245_10()
+        {
+        }
+
+        [Fact]
+        public void Test_245_11()
+        {
+        }
+
+        [Fact]
+        public void Test_245_12()
+        {
+        }
+
+        [Fact]
+        public void Test_245_13()
+        {
+        }
+
+        [Fact]
+        public void Test_245_14()
+        {
+        }
+
+        [Fact]
+        public void Test_245_15()
+        {
+        }
+
+        [Fact]
+        public void Test_245_16()
+        {
+        }
+
+        [Fact]
+        public void Test_245_17()
+        {
+        }
+
+        [Fact]
+        public void Test_245_18()
+        {
+        }
+
+        [Fact]
+        public void Test_245_19()
+        {
+        }
+
+        [Fact]
+        public void Test_245_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_246
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_246_01()
+        {
+        }
+
+        [Fact]
+        public void Test_246_02()
+        {
+        }
+
+        [Fact]
+        public void Test_246_03()
+        {
+        }
+
+        [Fact]
+        public void Test_246_04()
+        {
+        }
+
+        [Fact]
+        public void Test_246_05()
+        {
+        }
+
+        [Fact]
+        public void Test_246_06()
+        {
+        }
+
+        [Fact]
+        public void Test_246_07()
+        {
+        }
+
+        [Fact]
+        public void Test_246_08()
+        {
+        }
+
+        [Fact]
+        public void Test_246_09()
+        {
+        }
+
+        [Fact]
+        public void Test_246_10()
+        {
+        }
+
+        [Fact]
+        public void Test_246_11()
+        {
+        }
+
+        [Fact]
+        public void Test_246_12()
+        {
+        }
+
+        [Fact]
+        public void Test_246_13()
+        {
+        }
+
+        [Fact]
+        public void Test_246_14()
+        {
+        }
+
+        [Fact]
+        public void Test_246_15()
+        {
+        }
+
+        [Fact]
+        public void Test_246_16()
+        {
+        }
+
+        [Fact]
+        public void Test_246_17()
+        {
+        }
+
+        [Fact]
+        public void Test_246_18()
+        {
+        }
+
+        [Fact]
+        public void Test_246_19()
+        {
+        }
+
+        [Fact]
+        public void Test_246_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_247
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_247_01()
+        {
+        }
+
+        [Fact]
+        public void Test_247_02()
+        {
+        }
+
+        [Fact]
+        public void Test_247_03()
+        {
+        }
+
+        [Fact]
+        public void Test_247_04()
+        {
+        }
+
+        [Fact]
+        public void Test_247_05()
+        {
+        }
+
+        [Fact]
+        public void Test_247_06()
+        {
+        }
+
+        [Fact]
+        public void Test_247_07()
+        {
+        }
+
+        [Fact]
+        public void Test_247_08()
+        {
+        }
+
+        [Fact]
+        public void Test_247_09()
+        {
+        }
+
+        [Fact]
+        public void Test_247_10()
+        {
+        }
+
+        [Fact]
+        public void Test_247_11()
+        {
+        }
+
+        [Fact]
+        public void Test_247_12()
+        {
+        }
+
+        [Fact]
+        public void Test_247_13()
+        {
+        }
+
+        [Fact]
+        public void Test_247_14()
+        {
+        }
+
+        [Fact]
+        public void Test_247_15()
+        {
+        }
+
+        [Fact]
+        public void Test_247_16()
+        {
+        }
+
+        [Fact]
+        public void Test_247_17()
+        {
+        }
+
+        [Fact]
+        public void Test_247_18()
+        {
+        }
+
+        [Fact]
+        public void Test_247_19()
+        {
+        }
+
+        [Fact]
+        public void Test_247_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_248
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_248_01()
+        {
+        }
+
+        [Fact]
+        public void Test_248_02()
+        {
+        }
+
+        [Fact]
+        public void Test_248_03()
+        {
+        }
+
+        [Fact]
+        public void Test_248_04()
+        {
+        }
+
+        [Fact]
+        public void Test_248_05()
+        {
+        }
+
+        [Fact]
+        public void Test_248_06()
+        {
+        }
+
+        [Fact]
+        public void Test_248_07()
+        {
+        }
+
+        [Fact]
+        public void Test_248_08()
+        {
+        }
+
+        [Fact]
+        public void Test_248_09()
+        {
+        }
+
+        [Fact]
+        public void Test_248_10()
+        {
+        }
+
+        [Fact]
+        public void Test_248_11()
+        {
+        }
+
+        [Fact]
+        public void Test_248_12()
+        {
+        }
+
+        [Fact]
+        public void Test_248_13()
+        {
+        }
+
+        [Fact]
+        public void Test_248_14()
+        {
+        }
+
+        [Fact]
+        public void Test_248_15()
+        {
+        }
+
+        [Fact]
+        public void Test_248_16()
+        {
+        }
+
+        [Fact]
+        public void Test_248_17()
+        {
+        }
+
+        [Fact]
+        public void Test_248_18()
+        {
+        }
+
+        [Fact]
+        public void Test_248_19()
+        {
+        }
+
+        [Fact]
+        public void Test_248_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_249
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_249_01()
+        {
+        }
+
+        [Fact]
+        public void Test_249_02()
+        {
+        }
+
+        [Fact]
+        public void Test_249_03()
+        {
+        }
+
+        [Fact]
+        public void Test_249_04()
+        {
+        }
+
+        [Fact]
+        public void Test_249_05()
+        {
+        }
+
+        [Fact]
+        public void Test_249_06()
+        {
+        }
+
+        [Fact]
+        public void Test_249_07()
+        {
+        }
+
+        [Fact]
+        public void Test_249_08()
+        {
+        }
+
+        [Fact]
+        public void Test_249_09()
+        {
+        }
+
+        [Fact]
+        public void Test_249_10()
+        {
+        }
+
+        [Fact]
+        public void Test_249_11()
+        {
+        }
+
+        [Fact]
+        public void Test_249_12()
+        {
+        }
+
+        [Fact]
+        public void Test_249_13()
+        {
+        }
+
+        [Fact]
+        public void Test_249_14()
+        {
+        }
+
+        [Fact]
+        public void Test_249_15()
+        {
+        }
+
+        [Fact]
+        public void Test_249_16()
+        {
+        }
+
+        [Fact]
+        public void Test_249_17()
+        {
+        }
+
+        [Fact]
+        public void Test_249_18()
+        {
+        }
+
+        [Fact]
+        public void Test_249_19()
+        {
+        }
+
+        [Fact]
+        public void Test_249_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_250
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_250_01()
+        {
+        }
+
+        [Fact]
+        public void Test_250_02()
+        {
+        }
+
+        [Fact]
+        public void Test_250_03()
+        {
+        }
+
+        [Fact]
+        public void Test_250_04()
+        {
+        }
+
+        [Fact]
+        public void Test_250_05()
+        {
+        }
+
+        [Fact]
+        public void Test_250_06()
+        {
+        }
+
+        [Fact]
+        public void Test_250_07()
+        {
+        }
+
+        [Fact]
+        public void Test_250_08()
+        {
+        }
+
+        [Fact]
+        public void Test_250_09()
+        {
+        }
+
+        [Fact]
+        public void Test_250_10()
+        {
+        }
+
+        [Fact]
+        public void Test_250_11()
+        {
+        }
+
+        [Fact]
+        public void Test_250_12()
+        {
+        }
+
+        [Fact]
+        public void Test_250_13()
+        {
+        }
+
+        [Fact]
+        public void Test_250_14()
+        {
+        }
+
+        [Fact]
+        public void Test_250_15()
+        {
+        }
+
+        [Fact]
+        public void Test_250_16()
+        {
+        }
+
+        [Fact]
+        public void Test_250_17()
+        {
+        }
+
+        [Fact]
+        public void Test_250_18()
+        {
+        }
+
+        [Fact]
+        public void Test_250_19()
+        {
+        }
+
+        [Fact]
+        public void Test_250_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_251
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_251_01()
+        {
+        }
+
+        [Fact]
+        public void Test_251_02()
+        {
+        }
+
+        [Fact]
+        public void Test_251_03()
+        {
+        }
+
+        [Fact]
+        public void Test_251_04()
+        {
+        }
+
+        [Fact]
+        public void Test_251_05()
+        {
+        }
+
+        [Fact]
+        public void Test_251_06()
+        {
+        }
+
+        [Fact]
+        public void Test_251_07()
+        {
+        }
+
+        [Fact]
+        public void Test_251_08()
+        {
+        }
+
+        [Fact]
+        public void Test_251_09()
+        {
+        }
+
+        [Fact]
+        public void Test_251_10()
+        {
+        }
+
+        [Fact]
+        public void Test_251_11()
+        {
+        }
+
+        [Fact]
+        public void Test_251_12()
+        {
+        }
+
+        [Fact]
+        public void Test_251_13()
+        {
+        }
+
+        [Fact]
+        public void Test_251_14()
+        {
+        }
+
+        [Fact]
+        public void Test_251_15()
+        {
+        }
+
+        [Fact]
+        public void Test_251_16()
+        {
+        }
+
+        [Fact]
+        public void Test_251_17()
+        {
+        }
+
+        [Fact]
+        public void Test_251_18()
+        {
+        }
+
+        [Fact]
+        public void Test_251_19()
+        {
+        }
+
+        [Fact]
+        public void Test_251_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_252
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_252_01()
+        {
+        }
+
+        [Fact]
+        public void Test_252_02()
+        {
+        }
+
+        [Fact]
+        public void Test_252_03()
+        {
+        }
+
+        [Fact]
+        public void Test_252_04()
+        {
+        }
+
+        [Fact]
+        public void Test_252_05()
+        {
+        }
+
+        [Fact]
+        public void Test_252_06()
+        {
+        }
+
+        [Fact]
+        public void Test_252_07()
+        {
+        }
+
+        [Fact]
+        public void Test_252_08()
+        {
+        }
+
+        [Fact]
+        public void Test_252_09()
+        {
+        }
+
+        [Fact]
+        public void Test_252_10()
+        {
+        }
+
+        [Fact]
+        public void Test_252_11()
+        {
+        }
+
+        [Fact]
+        public void Test_252_12()
+        {
+        }
+
+        [Fact]
+        public void Test_252_13()
+        {
+        }
+
+        [Fact]
+        public void Test_252_14()
+        {
+        }
+
+        [Fact]
+        public void Test_252_15()
+        {
+        }
+
+        [Fact]
+        public void Test_252_16()
+        {
+        }
+
+        [Fact]
+        public void Test_252_17()
+        {
+        }
+
+        [Fact]
+        public void Test_252_18()
+        {
+        }
+
+        [Fact]
+        public void Test_252_19()
+        {
+        }
+
+        [Fact]
+        public void Test_252_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_253
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_253_01()
+        {
+        }
+
+        [Fact]
+        public void Test_253_02()
+        {
+        }
+
+        [Fact]
+        public void Test_253_03()
+        {
+        }
+
+        [Fact]
+        public void Test_253_04()
+        {
+        }
+
+        [Fact]
+        public void Test_253_05()
+        {
+        }
+
+        [Fact]
+        public void Test_253_06()
+        {
+        }
+
+        [Fact]
+        public void Test_253_07()
+        {
+        }
+
+        [Fact]
+        public void Test_253_08()
+        {
+        }
+
+        [Fact]
+        public void Test_253_09()
+        {
+        }
+
+        [Fact]
+        public void Test_253_10()
+        {
+        }
+
+        [Fact]
+        public void Test_253_11()
+        {
+        }
+
+        [Fact]
+        public void Test_253_12()
+        {
+        }
+
+        [Fact]
+        public void Test_253_13()
+        {
+        }
+
+        [Fact]
+        public void Test_253_14()
+        {
+        }
+
+        [Fact]
+        public void Test_253_15()
+        {
+        }
+
+        [Fact]
+        public void Test_253_16()
+        {
+        }
+
+        [Fact]
+        public void Test_253_17()
+        {
+        }
+
+        [Fact]
+        public void Test_253_18()
+        {
+        }
+
+        [Fact]
+        public void Test_253_19()
+        {
+        }
+
+        [Fact]
+        public void Test_253_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_254
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_254_01()
+        {
+        }
+
+        [Fact]
+        public void Test_254_02()
+        {
+        }
+
+        [Fact]
+        public void Test_254_03()
+        {
+        }
+
+        [Fact]
+        public void Test_254_04()
+        {
+        }
+
+        [Fact]
+        public void Test_254_05()
+        {
+        }
+
+        [Fact]
+        public void Test_254_06()
+        {
+        }
+
+        [Fact]
+        public void Test_254_07()
+        {
+        }
+
+        [Fact]
+        public void Test_254_08()
+        {
+        }
+
+        [Fact]
+        public void Test_254_09()
+        {
+        }
+
+        [Fact]
+        public void Test_254_10()
+        {
+        }
+
+        [Fact]
+        public void Test_254_11()
+        {
+        }
+
+        [Fact]
+        public void Test_254_12()
+        {
+        }
+
+        [Fact]
+        public void Test_254_13()
+        {
+        }
+
+        [Fact]
+        public void Test_254_14()
+        {
+        }
+
+        [Fact]
+        public void Test_254_15()
+        {
+        }
+
+        [Fact]
+        public void Test_254_16()
+        {
+        }
+
+        [Fact]
+        public void Test_254_17()
+        {
+        }
+
+        [Fact]
+        public void Test_254_18()
+        {
+        }
+
+        [Fact]
+        public void Test_254_19()
+        {
+        }
+
+        [Fact]
+        public void Test_254_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_255
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_255_01()
+        {
+        }
+
+        [Fact]
+        public void Test_255_02()
+        {
+        }
+
+        [Fact]
+        public void Test_255_03()
+        {
+        }
+
+        [Fact]
+        public void Test_255_04()
+        {
+        }
+
+        [Fact]
+        public void Test_255_05()
+        {
+        }
+
+        [Fact]
+        public void Test_255_06()
+        {
+        }
+
+        [Fact]
+        public void Test_255_07()
+        {
+        }
+
+        [Fact]
+        public void Test_255_08()
+        {
+        }
+
+        [Fact]
+        public void Test_255_09()
+        {
+        }
+
+        [Fact]
+        public void Test_255_10()
+        {
+        }
+
+        [Fact]
+        public void Test_255_11()
+        {
+        }
+
+        [Fact]
+        public void Test_255_12()
+        {
+        }
+
+        [Fact]
+        public void Test_255_13()
+        {
+        }
+
+        [Fact]
+        public void Test_255_14()
+        {
+        }
+
+        [Fact]
+        public void Test_255_15()
+        {
+        }
+
+        [Fact]
+        public void Test_255_16()
+        {
+        }
+
+        [Fact]
+        public void Test_255_17()
+        {
+        }
+
+        [Fact]
+        public void Test_255_18()
+        {
+        }
+
+        [Fact]
+        public void Test_255_19()
+        {
+        }
+
+        [Fact]
+        public void Test_255_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_256
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_256_01()
+        {
+        }
+
+        [Fact]
+        public void Test_256_02()
+        {
+        }
+
+        [Fact]
+        public void Test_256_03()
+        {
+        }
+
+        [Fact]
+        public void Test_256_04()
+        {
+        }
+
+        [Fact]
+        public void Test_256_05()
+        {
+        }
+
+        [Fact]
+        public void Test_256_06()
+        {
+        }
+
+        [Fact]
+        public void Test_256_07()
+        {
+        }
+
+        [Fact]
+        public void Test_256_08()
+        {
+        }
+
+        [Fact]
+        public void Test_256_09()
+        {
+        }
+
+        [Fact]
+        public void Test_256_10()
+        {
+        }
+
+        [Fact]
+        public void Test_256_11()
+        {
+        }
+
+        [Fact]
+        public void Test_256_12()
+        {
+        }
+
+        [Fact]
+        public void Test_256_13()
+        {
+        }
+
+        [Fact]
+        public void Test_256_14()
+        {
+        }
+
+        [Fact]
+        public void Test_256_15()
+        {
+        }
+
+        [Fact]
+        public void Test_256_16()
+        {
+        }
+
+        [Fact]
+        public void Test_256_17()
+        {
+        }
+
+        [Fact]
+        public void Test_256_18()
+        {
+        }
+
+        [Fact]
+        public void Test_256_19()
+        {
+        }
+
+        [Fact]
+        public void Test_256_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_257
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_257_01()
+        {
+        }
+
+        [Fact]
+        public void Test_257_02()
+        {
+        }
+
+        [Fact]
+        public void Test_257_03()
+        {
+        }
+
+        [Fact]
+        public void Test_257_04()
+        {
+        }
+
+        [Fact]
+        public void Test_257_05()
+        {
+        }
+
+        [Fact]
+        public void Test_257_06()
+        {
+        }
+
+        [Fact]
+        public void Test_257_07()
+        {
+        }
+
+        [Fact]
+        public void Test_257_08()
+        {
+        }
+
+        [Fact]
+        public void Test_257_09()
+        {
+        }
+
+        [Fact]
+        public void Test_257_10()
+        {
+        }
+
+        [Fact]
+        public void Test_257_11()
+        {
+        }
+
+        [Fact]
+        public void Test_257_12()
+        {
+        }
+
+        [Fact]
+        public void Test_257_13()
+        {
+        }
+
+        [Fact]
+        public void Test_257_14()
+        {
+        }
+
+        [Fact]
+        public void Test_257_15()
+        {
+        }
+
+        [Fact]
+        public void Test_257_16()
+        {
+        }
+
+        [Fact]
+        public void Test_257_17()
+        {
+        }
+
+        [Fact]
+        public void Test_257_18()
+        {
+        }
+
+        [Fact]
+        public void Test_257_19()
+        {
+        }
+
+        [Fact]
+        public void Test_257_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_258
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_258_01()
+        {
+        }
+
+        [Fact]
+        public void Test_258_02()
+        {
+        }
+
+        [Fact]
+        public void Test_258_03()
+        {
+        }
+
+        [Fact]
+        public void Test_258_04()
+        {
+        }
+
+        [Fact]
+        public void Test_258_05()
+        {
+        }
+
+        [Fact]
+        public void Test_258_06()
+        {
+        }
+
+        [Fact]
+        public void Test_258_07()
+        {
+        }
+
+        [Fact]
+        public void Test_258_08()
+        {
+        }
+
+        [Fact]
+        public void Test_258_09()
+        {
+        }
+
+        [Fact]
+        public void Test_258_10()
+        {
+        }
+
+        [Fact]
+        public void Test_258_11()
+        {
+        }
+
+        [Fact]
+        public void Test_258_12()
+        {
+        }
+
+        [Fact]
+        public void Test_258_13()
+        {
+        }
+
+        [Fact]
+        public void Test_258_14()
+        {
+        }
+
+        [Fact]
+        public void Test_258_15()
+        {
+        }
+
+        [Fact]
+        public void Test_258_16()
+        {
+        }
+
+        [Fact]
+        public void Test_258_17()
+        {
+        }
+
+        [Fact]
+        public void Test_258_18()
+        {
+        }
+
+        [Fact]
+        public void Test_258_19()
+        {
+        }
+
+        [Fact]
+        public void Test_258_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_259
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_259_01()
+        {
+        }
+
+        [Fact]
+        public void Test_259_02()
+        {
+        }
+
+        [Fact]
+        public void Test_259_03()
+        {
+        }
+
+        [Fact]
+        public void Test_259_04()
+        {
+        }
+
+        [Fact]
+        public void Test_259_05()
+        {
+        }
+
+        [Fact]
+        public void Test_259_06()
+        {
+        }
+
+        [Fact]
+        public void Test_259_07()
+        {
+        }
+
+        [Fact]
+        public void Test_259_08()
+        {
+        }
+
+        [Fact]
+        public void Test_259_09()
+        {
+        }
+
+        [Fact]
+        public void Test_259_10()
+        {
+        }
+
+        [Fact]
+        public void Test_259_11()
+        {
+        }
+
+        [Fact]
+        public void Test_259_12()
+        {
+        }
+
+        [Fact]
+        public void Test_259_13()
+        {
+        }
+
+        [Fact]
+        public void Test_259_14()
+        {
+        }
+
+        [Fact]
+        public void Test_259_15()
+        {
+        }
+
+        [Fact]
+        public void Test_259_16()
+        {
+        }
+
+        [Fact]
+        public void Test_259_17()
+        {
+        }
+
+        [Fact]
+        public void Test_259_18()
+        {
+        }
+
+        [Fact]
+        public void Test_259_19()
+        {
+        }
+
+        [Fact]
+        public void Test_259_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_260
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_260_01()
+        {
+        }
+
+        [Fact]
+        public void Test_260_02()
+        {
+        }
+
+        [Fact]
+        public void Test_260_03()
+        {
+        }
+
+        [Fact]
+        public void Test_260_04()
+        {
+        }
+
+        [Fact]
+        public void Test_260_05()
+        {
+        }
+
+        [Fact]
+        public void Test_260_06()
+        {
+        }
+
+        [Fact]
+        public void Test_260_07()
+        {
+        }
+
+        [Fact]
+        public void Test_260_08()
+        {
+        }
+
+        [Fact]
+        public void Test_260_09()
+        {
+        }
+
+        [Fact]
+        public void Test_260_10()
+        {
+        }
+
+        [Fact]
+        public void Test_260_11()
+        {
+        }
+
+        [Fact]
+        public void Test_260_12()
+        {
+        }
+
+        [Fact]
+        public void Test_260_13()
+        {
+        }
+
+        [Fact]
+        public void Test_260_14()
+        {
+        }
+
+        [Fact]
+        public void Test_260_15()
+        {
+        }
+
+        [Fact]
+        public void Test_260_16()
+        {
+        }
+
+        [Fact]
+        public void Test_260_17()
+        {
+        }
+
+        [Fact]
+        public void Test_260_18()
+        {
+        }
+
+        [Fact]
+        public void Test_260_19()
+        {
+        }
+
+        [Fact]
+        public void Test_260_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_261
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_261_01()
+        {
+        }
+
+        [Fact]
+        public void Test_261_02()
+        {
+        }
+
+        [Fact]
+        public void Test_261_03()
+        {
+        }
+
+        [Fact]
+        public void Test_261_04()
+        {
+        }
+
+        [Fact]
+        public void Test_261_05()
+        {
+        }
+
+        [Fact]
+        public void Test_261_06()
+        {
+        }
+
+        [Fact]
+        public void Test_261_07()
+        {
+        }
+
+        [Fact]
+        public void Test_261_08()
+        {
+        }
+
+        [Fact]
+        public void Test_261_09()
+        {
+        }
+
+        [Fact]
+        public void Test_261_10()
+        {
+        }
+
+        [Fact]
+        public void Test_261_11()
+        {
+        }
+
+        [Fact]
+        public void Test_261_12()
+        {
+        }
+
+        [Fact]
+        public void Test_261_13()
+        {
+        }
+
+        [Fact]
+        public void Test_261_14()
+        {
+        }
+
+        [Fact]
+        public void Test_261_15()
+        {
+        }
+
+        [Fact]
+        public void Test_261_16()
+        {
+        }
+
+        [Fact]
+        public void Test_261_17()
+        {
+        }
+
+        [Fact]
+        public void Test_261_18()
+        {
+        }
+
+        [Fact]
+        public void Test_261_19()
+        {
+        }
+
+        [Fact]
+        public void Test_261_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_262
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_262_01()
+        {
+        }
+
+        [Fact]
+        public void Test_262_02()
+        {
+        }
+
+        [Fact]
+        public void Test_262_03()
+        {
+        }
+
+        [Fact]
+        public void Test_262_04()
+        {
+        }
+
+        [Fact]
+        public void Test_262_05()
+        {
+        }
+
+        [Fact]
+        public void Test_262_06()
+        {
+        }
+
+        [Fact]
+        public void Test_262_07()
+        {
+        }
+
+        [Fact]
+        public void Test_262_08()
+        {
+        }
+
+        [Fact]
+        public void Test_262_09()
+        {
+        }
+
+        [Fact]
+        public void Test_262_10()
+        {
+        }
+
+        [Fact]
+        public void Test_262_11()
+        {
+        }
+
+        [Fact]
+        public void Test_262_12()
+        {
+        }
+
+        [Fact]
+        public void Test_262_13()
+        {
+        }
+
+        [Fact]
+        public void Test_262_14()
+        {
+        }
+
+        [Fact]
+        public void Test_262_15()
+        {
+        }
+
+        [Fact]
+        public void Test_262_16()
+        {
+        }
+
+        [Fact]
+        public void Test_262_17()
+        {
+        }
+
+        [Fact]
+        public void Test_262_18()
+        {
+        }
+
+        [Fact]
+        public void Test_262_19()
+        {
+        }
+
+        [Fact]
+        public void Test_262_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_263
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_263_01()
+        {
+        }
+
+        [Fact]
+        public void Test_263_02()
+        {
+        }
+
+        [Fact]
+        public void Test_263_03()
+        {
+        }
+
+        [Fact]
+        public void Test_263_04()
+        {
+        }
+
+        [Fact]
+        public void Test_263_05()
+        {
+        }
+
+        [Fact]
+        public void Test_263_06()
+        {
+        }
+
+        [Fact]
+        public void Test_263_07()
+        {
+        }
+
+        [Fact]
+        public void Test_263_08()
+        {
+        }
+
+        [Fact]
+        public void Test_263_09()
+        {
+        }
+
+        [Fact]
+        public void Test_263_10()
+        {
+        }
+
+        [Fact]
+        public void Test_263_11()
+        {
+        }
+
+        [Fact]
+        public void Test_263_12()
+        {
+        }
+
+        [Fact]
+        public void Test_263_13()
+        {
+        }
+
+        [Fact]
+        public void Test_263_14()
+        {
+        }
+
+        [Fact]
+        public void Test_263_15()
+        {
+        }
+
+        [Fact]
+        public void Test_263_16()
+        {
+        }
+
+        [Fact]
+        public void Test_263_17()
+        {
+        }
+
+        [Fact]
+        public void Test_263_18()
+        {
+        }
+
+        [Fact]
+        public void Test_263_19()
+        {
+        }
+
+        [Fact]
+        public void Test_263_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_264
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_264_01()
+        {
+        }
+
+        [Fact]
+        public void Test_264_02()
+        {
+        }
+
+        [Fact]
+        public void Test_264_03()
+        {
+        }
+
+        [Fact]
+        public void Test_264_04()
+        {
+        }
+
+        [Fact]
+        public void Test_264_05()
+        {
+        }
+
+        [Fact]
+        public void Test_264_06()
+        {
+        }
+
+        [Fact]
+        public void Test_264_07()
+        {
+        }
+
+        [Fact]
+        public void Test_264_08()
+        {
+        }
+
+        [Fact]
+        public void Test_264_09()
+        {
+        }
+
+        [Fact]
+        public void Test_264_10()
+        {
+        }
+
+        [Fact]
+        public void Test_264_11()
+        {
+        }
+
+        [Fact]
+        public void Test_264_12()
+        {
+        }
+
+        [Fact]
+        public void Test_264_13()
+        {
+        }
+
+        [Fact]
+        public void Test_264_14()
+        {
+        }
+
+        [Fact]
+        public void Test_264_15()
+        {
+        }
+
+        [Fact]
+        public void Test_264_16()
+        {
+        }
+
+        [Fact]
+        public void Test_264_17()
+        {
+        }
+
+        [Fact]
+        public void Test_264_18()
+        {
+        }
+
+        [Fact]
+        public void Test_264_19()
+        {
+        }
+
+        [Fact]
+        public void Test_264_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_265
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_265_01()
+        {
+        }
+
+        [Fact]
+        public void Test_265_02()
+        {
+        }
+
+        [Fact]
+        public void Test_265_03()
+        {
+        }
+
+        [Fact]
+        public void Test_265_04()
+        {
+        }
+
+        [Fact]
+        public void Test_265_05()
+        {
+        }
+
+        [Fact]
+        public void Test_265_06()
+        {
+        }
+
+        [Fact]
+        public void Test_265_07()
+        {
+        }
+
+        [Fact]
+        public void Test_265_08()
+        {
+        }
+
+        [Fact]
+        public void Test_265_09()
+        {
+        }
+
+        [Fact]
+        public void Test_265_10()
+        {
+        }
+
+        [Fact]
+        public void Test_265_11()
+        {
+        }
+
+        [Fact]
+        public void Test_265_12()
+        {
+        }
+
+        [Fact]
+        public void Test_265_13()
+        {
+        }
+
+        [Fact]
+        public void Test_265_14()
+        {
+        }
+
+        [Fact]
+        public void Test_265_15()
+        {
+        }
+
+        [Fact]
+        public void Test_265_16()
+        {
+        }
+
+        [Fact]
+        public void Test_265_17()
+        {
+        }
+
+        [Fact]
+        public void Test_265_18()
+        {
+        }
+
+        [Fact]
+        public void Test_265_19()
+        {
+        }
+
+        [Fact]
+        public void Test_265_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_266
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_266_01()
+        {
+        }
+
+        [Fact]
+        public void Test_266_02()
+        {
+        }
+
+        [Fact]
+        public void Test_266_03()
+        {
+        }
+
+        [Fact]
+        public void Test_266_04()
+        {
+        }
+
+        [Fact]
+        public void Test_266_05()
+        {
+        }
+
+        [Fact]
+        public void Test_266_06()
+        {
+        }
+
+        [Fact]
+        public void Test_266_07()
+        {
+        }
+
+        [Fact]
+        public void Test_266_08()
+        {
+        }
+
+        [Fact]
+        public void Test_266_09()
+        {
+        }
+
+        [Fact]
+        public void Test_266_10()
+        {
+        }
+
+        [Fact]
+        public void Test_266_11()
+        {
+        }
+
+        [Fact]
+        public void Test_266_12()
+        {
+        }
+
+        [Fact]
+        public void Test_266_13()
+        {
+        }
+
+        [Fact]
+        public void Test_266_14()
+        {
+        }
+
+        [Fact]
+        public void Test_266_15()
+        {
+        }
+
+        [Fact]
+        public void Test_266_16()
+        {
+        }
+
+        [Fact]
+        public void Test_266_17()
+        {
+        }
+
+        [Fact]
+        public void Test_266_18()
+        {
+        }
+
+        [Fact]
+        public void Test_266_19()
+        {
+        }
+
+        [Fact]
+        public void Test_266_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_267
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_267_01()
+        {
+        }
+
+        [Fact]
+        public void Test_267_02()
+        {
+        }
+
+        [Fact]
+        public void Test_267_03()
+        {
+        }
+
+        [Fact]
+        public void Test_267_04()
+        {
+        }
+
+        [Fact]
+        public void Test_267_05()
+        {
+        }
+
+        [Fact]
+        public void Test_267_06()
+        {
+        }
+
+        [Fact]
+        public void Test_267_07()
+        {
+        }
+
+        [Fact]
+        public void Test_267_08()
+        {
+        }
+
+        [Fact]
+        public void Test_267_09()
+        {
+        }
+
+        [Fact]
+        public void Test_267_10()
+        {
+        }
+
+        [Fact]
+        public void Test_267_11()
+        {
+        }
+
+        [Fact]
+        public void Test_267_12()
+        {
+        }
+
+        [Fact]
+        public void Test_267_13()
+        {
+        }
+
+        [Fact]
+        public void Test_267_14()
+        {
+        }
+
+        [Fact]
+        public void Test_267_15()
+        {
+        }
+
+        [Fact]
+        public void Test_267_16()
+        {
+        }
+
+        [Fact]
+        public void Test_267_17()
+        {
+        }
+
+        [Fact]
+        public void Test_267_18()
+        {
+        }
+
+        [Fact]
+        public void Test_267_19()
+        {
+        }
+
+        [Fact]
+        public void Test_267_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_268
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_268_01()
+        {
+        }
+
+        [Fact]
+        public void Test_268_02()
+        {
+        }
+
+        [Fact]
+        public void Test_268_03()
+        {
+        }
+
+        [Fact]
+        public void Test_268_04()
+        {
+        }
+
+        [Fact]
+        public void Test_268_05()
+        {
+        }
+
+        [Fact]
+        public void Test_268_06()
+        {
+        }
+
+        [Fact]
+        public void Test_268_07()
+        {
+        }
+
+        [Fact]
+        public void Test_268_08()
+        {
+        }
+
+        [Fact]
+        public void Test_268_09()
+        {
+        }
+
+        [Fact]
+        public void Test_268_10()
+        {
+        }
+
+        [Fact]
+        public void Test_268_11()
+        {
+        }
+
+        [Fact]
+        public void Test_268_12()
+        {
+        }
+
+        [Fact]
+        public void Test_268_13()
+        {
+        }
+
+        [Fact]
+        public void Test_268_14()
+        {
+        }
+
+        [Fact]
+        public void Test_268_15()
+        {
+        }
+
+        [Fact]
+        public void Test_268_16()
+        {
+        }
+
+        [Fact]
+        public void Test_268_17()
+        {
+        }
+
+        [Fact]
+        public void Test_268_18()
+        {
+        }
+
+        [Fact]
+        public void Test_268_19()
+        {
+        }
+
+        [Fact]
+        public void Test_268_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_269
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_269_01()
+        {
+        }
+
+        [Fact]
+        public void Test_269_02()
+        {
+        }
+
+        [Fact]
+        public void Test_269_03()
+        {
+        }
+
+        [Fact]
+        public void Test_269_04()
+        {
+        }
+
+        [Fact]
+        public void Test_269_05()
+        {
+        }
+
+        [Fact]
+        public void Test_269_06()
+        {
+        }
+
+        [Fact]
+        public void Test_269_07()
+        {
+        }
+
+        [Fact]
+        public void Test_269_08()
+        {
+        }
+
+        [Fact]
+        public void Test_269_09()
+        {
+        }
+
+        [Fact]
+        public void Test_269_10()
+        {
+        }
+
+        [Fact]
+        public void Test_269_11()
+        {
+        }
+
+        [Fact]
+        public void Test_269_12()
+        {
+        }
+
+        [Fact]
+        public void Test_269_13()
+        {
+        }
+
+        [Fact]
+        public void Test_269_14()
+        {
+        }
+
+        [Fact]
+        public void Test_269_15()
+        {
+        }
+
+        [Fact]
+        public void Test_269_16()
+        {
+        }
+
+        [Fact]
+        public void Test_269_17()
+        {
+        }
+
+        [Fact]
+        public void Test_269_18()
+        {
+        }
+
+        [Fact]
+        public void Test_269_19()
+        {
+        }
+
+        [Fact]
+        public void Test_269_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_270
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_270_01()
+        {
+        }
+
+        [Fact]
+        public void Test_270_02()
+        {
+        }
+
+        [Fact]
+        public void Test_270_03()
+        {
+        }
+
+        [Fact]
+        public void Test_270_04()
+        {
+        }
+
+        [Fact]
+        public void Test_270_05()
+        {
+        }
+
+        [Fact]
+        public void Test_270_06()
+        {
+        }
+
+        [Fact]
+        public void Test_270_07()
+        {
+        }
+
+        [Fact]
+        public void Test_270_08()
+        {
+        }
+
+        [Fact]
+        public void Test_270_09()
+        {
+        }
+
+        [Fact]
+        public void Test_270_10()
+        {
+        }
+
+        [Fact]
+        public void Test_270_11()
+        {
+        }
+
+        [Fact]
+        public void Test_270_12()
+        {
+        }
+
+        [Fact]
+        public void Test_270_13()
+        {
+        }
+
+        [Fact]
+        public void Test_270_14()
+        {
+        }
+
+        [Fact]
+        public void Test_270_15()
+        {
+        }
+
+        [Fact]
+        public void Test_270_16()
+        {
+        }
+
+        [Fact]
+        public void Test_270_17()
+        {
+        }
+
+        [Fact]
+        public void Test_270_18()
+        {
+        }
+
+        [Fact]
+        public void Test_270_19()
+        {
+        }
+
+        [Fact]
+        public void Test_270_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_271
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_271_01()
+        {
+        }
+
+        [Fact]
+        public void Test_271_02()
+        {
+        }
+
+        [Fact]
+        public void Test_271_03()
+        {
+        }
+
+        [Fact]
+        public void Test_271_04()
+        {
+        }
+
+        [Fact]
+        public void Test_271_05()
+        {
+        }
+
+        [Fact]
+        public void Test_271_06()
+        {
+        }
+
+        [Fact]
+        public void Test_271_07()
+        {
+        }
+
+        [Fact]
+        public void Test_271_08()
+        {
+        }
+
+        [Fact]
+        public void Test_271_09()
+        {
+        }
+
+        [Fact]
+        public void Test_271_10()
+        {
+        }
+
+        [Fact]
+        public void Test_271_11()
+        {
+        }
+
+        [Fact]
+        public void Test_271_12()
+        {
+        }
+
+        [Fact]
+        public void Test_271_13()
+        {
+        }
+
+        [Fact]
+        public void Test_271_14()
+        {
+        }
+
+        [Fact]
+        public void Test_271_15()
+        {
+        }
+
+        [Fact]
+        public void Test_271_16()
+        {
+        }
+
+        [Fact]
+        public void Test_271_17()
+        {
+        }
+
+        [Fact]
+        public void Test_271_18()
+        {
+        }
+
+        [Fact]
+        public void Test_271_19()
+        {
+        }
+
+        [Fact]
+        public void Test_271_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_272
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_272_01()
+        {
+        }
+
+        [Fact]
+        public void Test_272_02()
+        {
+        }
+
+        [Fact]
+        public void Test_272_03()
+        {
+        }
+
+        [Fact]
+        public void Test_272_04()
+        {
+        }
+
+        [Fact]
+        public void Test_272_05()
+        {
+        }
+
+        [Fact]
+        public void Test_272_06()
+        {
+        }
+
+        [Fact]
+        public void Test_272_07()
+        {
+        }
+
+        [Fact]
+        public void Test_272_08()
+        {
+        }
+
+        [Fact]
+        public void Test_272_09()
+        {
+        }
+
+        [Fact]
+        public void Test_272_10()
+        {
+        }
+
+        [Fact]
+        public void Test_272_11()
+        {
+        }
+
+        [Fact]
+        public void Test_272_12()
+        {
+        }
+
+        [Fact]
+        public void Test_272_13()
+        {
+        }
+
+        [Fact]
+        public void Test_272_14()
+        {
+        }
+
+        [Fact]
+        public void Test_272_15()
+        {
+        }
+
+        [Fact]
+        public void Test_272_16()
+        {
+        }
+
+        [Fact]
+        public void Test_272_17()
+        {
+        }
+
+        [Fact]
+        public void Test_272_18()
+        {
+        }
+
+        [Fact]
+        public void Test_272_19()
+        {
+        }
+
+        [Fact]
+        public void Test_272_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_273
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_273_01()
+        {
+        }
+
+        [Fact]
+        public void Test_273_02()
+        {
+        }
+
+        [Fact]
+        public void Test_273_03()
+        {
+        }
+
+        [Fact]
+        public void Test_273_04()
+        {
+        }
+
+        [Fact]
+        public void Test_273_05()
+        {
+        }
+
+        [Fact]
+        public void Test_273_06()
+        {
+        }
+
+        [Fact]
+        public void Test_273_07()
+        {
+        }
+
+        [Fact]
+        public void Test_273_08()
+        {
+        }
+
+        [Fact]
+        public void Test_273_09()
+        {
+        }
+
+        [Fact]
+        public void Test_273_10()
+        {
+        }
+
+        [Fact]
+        public void Test_273_11()
+        {
+        }
+
+        [Fact]
+        public void Test_273_12()
+        {
+        }
+
+        [Fact]
+        public void Test_273_13()
+        {
+        }
+
+        [Fact]
+        public void Test_273_14()
+        {
+        }
+
+        [Fact]
+        public void Test_273_15()
+        {
+        }
+
+        [Fact]
+        public void Test_273_16()
+        {
+        }
+
+        [Fact]
+        public void Test_273_17()
+        {
+        }
+
+        [Fact]
+        public void Test_273_18()
+        {
+        }
+
+        [Fact]
+        public void Test_273_19()
+        {
+        }
+
+        [Fact]
+        public void Test_273_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_274
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_274_01()
+        {
+        }
+
+        [Fact]
+        public void Test_274_02()
+        {
+        }
+
+        [Fact]
+        public void Test_274_03()
+        {
+        }
+
+        [Fact]
+        public void Test_274_04()
+        {
+        }
+
+        [Fact]
+        public void Test_274_05()
+        {
+        }
+
+        [Fact]
+        public void Test_274_06()
+        {
+        }
+
+        [Fact]
+        public void Test_274_07()
+        {
+        }
+
+        [Fact]
+        public void Test_274_08()
+        {
+        }
+
+        [Fact]
+        public void Test_274_09()
+        {
+        }
+
+        [Fact]
+        public void Test_274_10()
+        {
+        }
+
+        [Fact]
+        public void Test_274_11()
+        {
+        }
+
+        [Fact]
+        public void Test_274_12()
+        {
+        }
+
+        [Fact]
+        public void Test_274_13()
+        {
+        }
+
+        [Fact]
+        public void Test_274_14()
+        {
+        }
+
+        [Fact]
+        public void Test_274_15()
+        {
+        }
+
+        [Fact]
+        public void Test_274_16()
+        {
+        }
+
+        [Fact]
+        public void Test_274_17()
+        {
+        }
+
+        [Fact]
+        public void Test_274_18()
+        {
+        }
+
+        [Fact]
+        public void Test_274_19()
+        {
+        }
+
+        [Fact]
+        public void Test_274_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_275
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_275_01()
+        {
+        }
+
+        [Fact]
+        public void Test_275_02()
+        {
+        }
+
+        [Fact]
+        public void Test_275_03()
+        {
+        }
+
+        [Fact]
+        public void Test_275_04()
+        {
+        }
+
+        [Fact]
+        public void Test_275_05()
+        {
+        }
+
+        [Fact]
+        public void Test_275_06()
+        {
+        }
+
+        [Fact]
+        public void Test_275_07()
+        {
+        }
+
+        [Fact]
+        public void Test_275_08()
+        {
+        }
+
+        [Fact]
+        public void Test_275_09()
+        {
+        }
+
+        [Fact]
+        public void Test_275_10()
+        {
+        }
+
+        [Fact]
+        public void Test_275_11()
+        {
+        }
+
+        [Fact]
+        public void Test_275_12()
+        {
+        }
+
+        [Fact]
+        public void Test_275_13()
+        {
+        }
+
+        [Fact]
+        public void Test_275_14()
+        {
+        }
+
+        [Fact]
+        public void Test_275_15()
+        {
+        }
+
+        [Fact]
+        public void Test_275_16()
+        {
+        }
+
+        [Fact]
+        public void Test_275_17()
+        {
+        }
+
+        [Fact]
+        public void Test_275_18()
+        {
+        }
+
+        [Fact]
+        public void Test_275_19()
+        {
+        }
+
+        [Fact]
+        public void Test_275_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_276
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_276_01()
+        {
+        }
+
+        [Fact]
+        public void Test_276_02()
+        {
+        }
+
+        [Fact]
+        public void Test_276_03()
+        {
+        }
+
+        [Fact]
+        public void Test_276_04()
+        {
+        }
+
+        [Fact]
+        public void Test_276_05()
+        {
+        }
+
+        [Fact]
+        public void Test_276_06()
+        {
+        }
+
+        [Fact]
+        public void Test_276_07()
+        {
+        }
+
+        [Fact]
+        public void Test_276_08()
+        {
+        }
+
+        [Fact]
+        public void Test_276_09()
+        {
+        }
+
+        [Fact]
+        public void Test_276_10()
+        {
+        }
+
+        [Fact]
+        public void Test_276_11()
+        {
+        }
+
+        [Fact]
+        public void Test_276_12()
+        {
+        }
+
+        [Fact]
+        public void Test_276_13()
+        {
+        }
+
+        [Fact]
+        public void Test_276_14()
+        {
+        }
+
+        [Fact]
+        public void Test_276_15()
+        {
+        }
+
+        [Fact]
+        public void Test_276_16()
+        {
+        }
+
+        [Fact]
+        public void Test_276_17()
+        {
+        }
+
+        [Fact]
+        public void Test_276_18()
+        {
+        }
+
+        [Fact]
+        public void Test_276_19()
+        {
+        }
+
+        [Fact]
+        public void Test_276_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_277
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_277_01()
+        {
+        }
+
+        [Fact]
+        public void Test_277_02()
+        {
+        }
+
+        [Fact]
+        public void Test_277_03()
+        {
+        }
+
+        [Fact]
+        public void Test_277_04()
+        {
+        }
+
+        [Fact]
+        public void Test_277_05()
+        {
+        }
+
+        [Fact]
+        public void Test_277_06()
+        {
+        }
+
+        [Fact]
+        public void Test_277_07()
+        {
+        }
+
+        [Fact]
+        public void Test_277_08()
+        {
+        }
+
+        [Fact]
+        public void Test_277_09()
+        {
+        }
+
+        [Fact]
+        public void Test_277_10()
+        {
+        }
+
+        [Fact]
+        public void Test_277_11()
+        {
+        }
+
+        [Fact]
+        public void Test_277_12()
+        {
+        }
+
+        [Fact]
+        public void Test_277_13()
+        {
+        }
+
+        [Fact]
+        public void Test_277_14()
+        {
+        }
+
+        [Fact]
+        public void Test_277_15()
+        {
+        }
+
+        [Fact]
+        public void Test_277_16()
+        {
+        }
+
+        [Fact]
+        public void Test_277_17()
+        {
+        }
+
+        [Fact]
+        public void Test_277_18()
+        {
+        }
+
+        [Fact]
+        public void Test_277_19()
+        {
+        }
+
+        [Fact]
+        public void Test_277_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_278
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_278_01()
+        {
+        }
+
+        [Fact]
+        public void Test_278_02()
+        {
+        }
+
+        [Fact]
+        public void Test_278_03()
+        {
+        }
+
+        [Fact]
+        public void Test_278_04()
+        {
+        }
+
+        [Fact]
+        public void Test_278_05()
+        {
+        }
+
+        [Fact]
+        public void Test_278_06()
+        {
+        }
+
+        [Fact]
+        public void Test_278_07()
+        {
+        }
+
+        [Fact]
+        public void Test_278_08()
+        {
+        }
+
+        [Fact]
+        public void Test_278_09()
+        {
+        }
+
+        [Fact]
+        public void Test_278_10()
+        {
+        }
+
+        [Fact]
+        public void Test_278_11()
+        {
+        }
+
+        [Fact]
+        public void Test_278_12()
+        {
+        }
+
+        [Fact]
+        public void Test_278_13()
+        {
+        }
+
+        [Fact]
+        public void Test_278_14()
+        {
+        }
+
+        [Fact]
+        public void Test_278_15()
+        {
+        }
+
+        [Fact]
+        public void Test_278_16()
+        {
+        }
+
+        [Fact]
+        public void Test_278_17()
+        {
+        }
+
+        [Fact]
+        public void Test_278_18()
+        {
+        }
+
+        [Fact]
+        public void Test_278_19()
+        {
+        }
+
+        [Fact]
+        public void Test_278_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_279
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_279_01()
+        {
+        }
+
+        [Fact]
+        public void Test_279_02()
+        {
+        }
+
+        [Fact]
+        public void Test_279_03()
+        {
+        }
+
+        [Fact]
+        public void Test_279_04()
+        {
+        }
+
+        [Fact]
+        public void Test_279_05()
+        {
+        }
+
+        [Fact]
+        public void Test_279_06()
+        {
+        }
+
+        [Fact]
+        public void Test_279_07()
+        {
+        }
+
+        [Fact]
+        public void Test_279_08()
+        {
+        }
+
+        [Fact]
+        public void Test_279_09()
+        {
+        }
+
+        [Fact]
+        public void Test_279_10()
+        {
+        }
+
+        [Fact]
+        public void Test_279_11()
+        {
+        }
+
+        [Fact]
+        public void Test_279_12()
+        {
+        }
+
+        [Fact]
+        public void Test_279_13()
+        {
+        }
+
+        [Fact]
+        public void Test_279_14()
+        {
+        }
+
+        [Fact]
+        public void Test_279_15()
+        {
+        }
+
+        [Fact]
+        public void Test_279_16()
+        {
+        }
+
+        [Fact]
+        public void Test_279_17()
+        {
+        }
+
+        [Fact]
+        public void Test_279_18()
+        {
+        }
+
+        [Fact]
+        public void Test_279_19()
+        {
+        }
+
+        [Fact]
+        public void Test_279_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_280
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_280_01()
+        {
+        }
+
+        [Fact]
+        public void Test_280_02()
+        {
+        }
+
+        [Fact]
+        public void Test_280_03()
+        {
+        }
+
+        [Fact]
+        public void Test_280_04()
+        {
+        }
+
+        [Fact]
+        public void Test_280_05()
+        {
+        }
+
+        [Fact]
+        public void Test_280_06()
+        {
+        }
+
+        [Fact]
+        public void Test_280_07()
+        {
+        }
+
+        [Fact]
+        public void Test_280_08()
+        {
+        }
+
+        [Fact]
+        public void Test_280_09()
+        {
+        }
+
+        [Fact]
+        public void Test_280_10()
+        {
+        }
+
+        [Fact]
+        public void Test_280_11()
+        {
+        }
+
+        [Fact]
+        public void Test_280_12()
+        {
+        }
+
+        [Fact]
+        public void Test_280_13()
+        {
+        }
+
+        [Fact]
+        public void Test_280_14()
+        {
+        }
+
+        [Fact]
+        public void Test_280_15()
+        {
+        }
+
+        [Fact]
+        public void Test_280_16()
+        {
+        }
+
+        [Fact]
+        public void Test_280_17()
+        {
+        }
+
+        [Fact]
+        public void Test_280_18()
+        {
+        }
+
+        [Fact]
+        public void Test_280_19()
+        {
+        }
+
+        [Fact]
+        public void Test_280_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_281
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_281_01()
+        {
+        }
+
+        [Fact]
+        public void Test_281_02()
+        {
+        }
+
+        [Fact]
+        public void Test_281_03()
+        {
+        }
+
+        [Fact]
+        public void Test_281_04()
+        {
+        }
+
+        [Fact]
+        public void Test_281_05()
+        {
+        }
+
+        [Fact]
+        public void Test_281_06()
+        {
+        }
+
+        [Fact]
+        public void Test_281_07()
+        {
+        }
+
+        [Fact]
+        public void Test_281_08()
+        {
+        }
+
+        [Fact]
+        public void Test_281_09()
+        {
+        }
+
+        [Fact]
+        public void Test_281_10()
+        {
+        }
+
+        [Fact]
+        public void Test_281_11()
+        {
+        }
+
+        [Fact]
+        public void Test_281_12()
+        {
+        }
+
+        [Fact]
+        public void Test_281_13()
+        {
+        }
+
+        [Fact]
+        public void Test_281_14()
+        {
+        }
+
+        [Fact]
+        public void Test_281_15()
+        {
+        }
+
+        [Fact]
+        public void Test_281_16()
+        {
+        }
+
+        [Fact]
+        public void Test_281_17()
+        {
+        }
+
+        [Fact]
+        public void Test_281_18()
+        {
+        }
+
+        [Fact]
+        public void Test_281_19()
+        {
+        }
+
+        [Fact]
+        public void Test_281_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_282
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_282_01()
+        {
+        }
+
+        [Fact]
+        public void Test_282_02()
+        {
+        }
+
+        [Fact]
+        public void Test_282_03()
+        {
+        }
+
+        [Fact]
+        public void Test_282_04()
+        {
+        }
+
+        [Fact]
+        public void Test_282_05()
+        {
+        }
+
+        [Fact]
+        public void Test_282_06()
+        {
+        }
+
+        [Fact]
+        public void Test_282_07()
+        {
+        }
+
+        [Fact]
+        public void Test_282_08()
+        {
+        }
+
+        [Fact]
+        public void Test_282_09()
+        {
+        }
+
+        [Fact]
+        public void Test_282_10()
+        {
+        }
+
+        [Fact]
+        public void Test_282_11()
+        {
+        }
+
+        [Fact]
+        public void Test_282_12()
+        {
+        }
+
+        [Fact]
+        public void Test_282_13()
+        {
+        }
+
+        [Fact]
+        public void Test_282_14()
+        {
+        }
+
+        [Fact]
+        public void Test_282_15()
+        {
+        }
+
+        [Fact]
+        public void Test_282_16()
+        {
+        }
+
+        [Fact]
+        public void Test_282_17()
+        {
+        }
+
+        [Fact]
+        public void Test_282_18()
+        {
+        }
+
+        [Fact]
+        public void Test_282_19()
+        {
+        }
+
+        [Fact]
+        public void Test_282_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_283
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_283_01()
+        {
+        }
+
+        [Fact]
+        public void Test_283_02()
+        {
+        }
+
+        [Fact]
+        public void Test_283_03()
+        {
+        }
+
+        [Fact]
+        public void Test_283_04()
+        {
+        }
+
+        [Fact]
+        public void Test_283_05()
+        {
+        }
+
+        [Fact]
+        public void Test_283_06()
+        {
+        }
+
+        [Fact]
+        public void Test_283_07()
+        {
+        }
+
+        [Fact]
+        public void Test_283_08()
+        {
+        }
+
+        [Fact]
+        public void Test_283_09()
+        {
+        }
+
+        [Fact]
+        public void Test_283_10()
+        {
+        }
+
+        [Fact]
+        public void Test_283_11()
+        {
+        }
+
+        [Fact]
+        public void Test_283_12()
+        {
+        }
+
+        [Fact]
+        public void Test_283_13()
+        {
+        }
+
+        [Fact]
+        public void Test_283_14()
+        {
+        }
+
+        [Fact]
+        public void Test_283_15()
+        {
+        }
+
+        [Fact]
+        public void Test_283_16()
+        {
+        }
+
+        [Fact]
+        public void Test_283_17()
+        {
+        }
+
+        [Fact]
+        public void Test_283_18()
+        {
+        }
+
+        [Fact]
+        public void Test_283_19()
+        {
+        }
+
+        [Fact]
+        public void Test_283_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_284
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_284_01()
+        {
+        }
+
+        [Fact]
+        public void Test_284_02()
+        {
+        }
+
+        [Fact]
+        public void Test_284_03()
+        {
+        }
+
+        [Fact]
+        public void Test_284_04()
+        {
+        }
+
+        [Fact]
+        public void Test_284_05()
+        {
+        }
+
+        [Fact]
+        public void Test_284_06()
+        {
+        }
+
+        [Fact]
+        public void Test_284_07()
+        {
+        }
+
+        [Fact]
+        public void Test_284_08()
+        {
+        }
+
+        [Fact]
+        public void Test_284_09()
+        {
+        }
+
+        [Fact]
+        public void Test_284_10()
+        {
+        }
+
+        [Fact]
+        public void Test_284_11()
+        {
+        }
+
+        [Fact]
+        public void Test_284_12()
+        {
+        }
+
+        [Fact]
+        public void Test_284_13()
+        {
+        }
+
+        [Fact]
+        public void Test_284_14()
+        {
+        }
+
+        [Fact]
+        public void Test_284_15()
+        {
+        }
+
+        [Fact]
+        public void Test_284_16()
+        {
+        }
+
+        [Fact]
+        public void Test_284_17()
+        {
+        }
+
+        [Fact]
+        public void Test_284_18()
+        {
+        }
+
+        [Fact]
+        public void Test_284_19()
+        {
+        }
+
+        [Fact]
+        public void Test_284_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_285
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_285_01()
+        {
+        }
+
+        [Fact]
+        public void Test_285_02()
+        {
+        }
+
+        [Fact]
+        public void Test_285_03()
+        {
+        }
+
+        [Fact]
+        public void Test_285_04()
+        {
+        }
+
+        [Fact]
+        public void Test_285_05()
+        {
+        }
+
+        [Fact]
+        public void Test_285_06()
+        {
+        }
+
+        [Fact]
+        public void Test_285_07()
+        {
+        }
+
+        [Fact]
+        public void Test_285_08()
+        {
+        }
+
+        [Fact]
+        public void Test_285_09()
+        {
+        }
+
+        [Fact]
+        public void Test_285_10()
+        {
+        }
+
+        [Fact]
+        public void Test_285_11()
+        {
+        }
+
+        [Fact]
+        public void Test_285_12()
+        {
+        }
+
+        [Fact]
+        public void Test_285_13()
+        {
+        }
+
+        [Fact]
+        public void Test_285_14()
+        {
+        }
+
+        [Fact]
+        public void Test_285_15()
+        {
+        }
+
+        [Fact]
+        public void Test_285_16()
+        {
+        }
+
+        [Fact]
+        public void Test_285_17()
+        {
+        }
+
+        [Fact]
+        public void Test_285_18()
+        {
+        }
+
+        [Fact]
+        public void Test_285_19()
+        {
+        }
+
+        [Fact]
+        public void Test_285_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_286
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_286_01()
+        {
+        }
+
+        [Fact]
+        public void Test_286_02()
+        {
+        }
+
+        [Fact]
+        public void Test_286_03()
+        {
+        }
+
+        [Fact]
+        public void Test_286_04()
+        {
+        }
+
+        [Fact]
+        public void Test_286_05()
+        {
+        }
+
+        [Fact]
+        public void Test_286_06()
+        {
+        }
+
+        [Fact]
+        public void Test_286_07()
+        {
+        }
+
+        [Fact]
+        public void Test_286_08()
+        {
+        }
+
+        [Fact]
+        public void Test_286_09()
+        {
+        }
+
+        [Fact]
+        public void Test_286_10()
+        {
+        }
+
+        [Fact]
+        public void Test_286_11()
+        {
+        }
+
+        [Fact]
+        public void Test_286_12()
+        {
+        }
+
+        [Fact]
+        public void Test_286_13()
+        {
+        }
+
+        [Fact]
+        public void Test_286_14()
+        {
+        }
+
+        [Fact]
+        public void Test_286_15()
+        {
+        }
+
+        [Fact]
+        public void Test_286_16()
+        {
+        }
+
+        [Fact]
+        public void Test_286_17()
+        {
+        }
+
+        [Fact]
+        public void Test_286_18()
+        {
+        }
+
+        [Fact]
+        public void Test_286_19()
+        {
+        }
+
+        [Fact]
+        public void Test_286_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_287
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_287_01()
+        {
+        }
+
+        [Fact]
+        public void Test_287_02()
+        {
+        }
+
+        [Fact]
+        public void Test_287_03()
+        {
+        }
+
+        [Fact]
+        public void Test_287_04()
+        {
+        }
+
+        [Fact]
+        public void Test_287_05()
+        {
+        }
+
+        [Fact]
+        public void Test_287_06()
+        {
+        }
+
+        [Fact]
+        public void Test_287_07()
+        {
+        }
+
+        [Fact]
+        public void Test_287_08()
+        {
+        }
+
+        [Fact]
+        public void Test_287_09()
+        {
+        }
+
+        [Fact]
+        public void Test_287_10()
+        {
+        }
+
+        [Fact]
+        public void Test_287_11()
+        {
+        }
+
+        [Fact]
+        public void Test_287_12()
+        {
+        }
+
+        [Fact]
+        public void Test_287_13()
+        {
+        }
+
+        [Fact]
+        public void Test_287_14()
+        {
+        }
+
+        [Fact]
+        public void Test_287_15()
+        {
+        }
+
+        [Fact]
+        public void Test_287_16()
+        {
+        }
+
+        [Fact]
+        public void Test_287_17()
+        {
+        }
+
+        [Fact]
+        public void Test_287_18()
+        {
+        }
+
+        [Fact]
+        public void Test_287_19()
+        {
+        }
+
+        [Fact]
+        public void Test_287_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_288
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_288_01()
+        {
+        }
+
+        [Fact]
+        public void Test_288_02()
+        {
+        }
+
+        [Fact]
+        public void Test_288_03()
+        {
+        }
+
+        [Fact]
+        public void Test_288_04()
+        {
+        }
+
+        [Fact]
+        public void Test_288_05()
+        {
+        }
+
+        [Fact]
+        public void Test_288_06()
+        {
+        }
+
+        [Fact]
+        public void Test_288_07()
+        {
+        }
+
+        [Fact]
+        public void Test_288_08()
+        {
+        }
+
+        [Fact]
+        public void Test_288_09()
+        {
+        }
+
+        [Fact]
+        public void Test_288_10()
+        {
+        }
+
+        [Fact]
+        public void Test_288_11()
+        {
+        }
+
+        [Fact]
+        public void Test_288_12()
+        {
+        }
+
+        [Fact]
+        public void Test_288_13()
+        {
+        }
+
+        [Fact]
+        public void Test_288_14()
+        {
+        }
+
+        [Fact]
+        public void Test_288_15()
+        {
+        }
+
+        [Fact]
+        public void Test_288_16()
+        {
+        }
+
+        [Fact]
+        public void Test_288_17()
+        {
+        }
+
+        [Fact]
+        public void Test_288_18()
+        {
+        }
+
+        [Fact]
+        public void Test_288_19()
+        {
+        }
+
+        [Fact]
+        public void Test_288_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_289
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_289_01()
+        {
+        }
+
+        [Fact]
+        public void Test_289_02()
+        {
+        }
+
+        [Fact]
+        public void Test_289_03()
+        {
+        }
+
+        [Fact]
+        public void Test_289_04()
+        {
+        }
+
+        [Fact]
+        public void Test_289_05()
+        {
+        }
+
+        [Fact]
+        public void Test_289_06()
+        {
+        }
+
+        [Fact]
+        public void Test_289_07()
+        {
+        }
+
+        [Fact]
+        public void Test_289_08()
+        {
+        }
+
+        [Fact]
+        public void Test_289_09()
+        {
+        }
+
+        [Fact]
+        public void Test_289_10()
+        {
+        }
+
+        [Fact]
+        public void Test_289_11()
+        {
+        }
+
+        [Fact]
+        public void Test_289_12()
+        {
+        }
+
+        [Fact]
+        public void Test_289_13()
+        {
+        }
+
+        [Fact]
+        public void Test_289_14()
+        {
+        }
+
+        [Fact]
+        public void Test_289_15()
+        {
+        }
+
+        [Fact]
+        public void Test_289_16()
+        {
+        }
+
+        [Fact]
+        public void Test_289_17()
+        {
+        }
+
+        [Fact]
+        public void Test_289_18()
+        {
+        }
+
+        [Fact]
+        public void Test_289_19()
+        {
+        }
+
+        [Fact]
+        public void Test_289_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_290
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_290_01()
+        {
+        }
+
+        [Fact]
+        public void Test_290_02()
+        {
+        }
+
+        [Fact]
+        public void Test_290_03()
+        {
+        }
+
+        [Fact]
+        public void Test_290_04()
+        {
+        }
+
+        [Fact]
+        public void Test_290_05()
+        {
+        }
+
+        [Fact]
+        public void Test_290_06()
+        {
+        }
+
+        [Fact]
+        public void Test_290_07()
+        {
+        }
+
+        [Fact]
+        public void Test_290_08()
+        {
+        }
+
+        [Fact]
+        public void Test_290_09()
+        {
+        }
+
+        [Fact]
+        public void Test_290_10()
+        {
+        }
+
+        [Fact]
+        public void Test_290_11()
+        {
+        }
+
+        [Fact]
+        public void Test_290_12()
+        {
+        }
+
+        [Fact]
+        public void Test_290_13()
+        {
+        }
+
+        [Fact]
+        public void Test_290_14()
+        {
+        }
+
+        [Fact]
+        public void Test_290_15()
+        {
+        }
+
+        [Fact]
+        public void Test_290_16()
+        {
+        }
+
+        [Fact]
+        public void Test_290_17()
+        {
+        }
+
+        [Fact]
+        public void Test_290_18()
+        {
+        }
+
+        [Fact]
+        public void Test_290_19()
+        {
+        }
+
+        [Fact]
+        public void Test_290_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_291
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_291_01()
+        {
+        }
+
+        [Fact]
+        public void Test_291_02()
+        {
+        }
+
+        [Fact]
+        public void Test_291_03()
+        {
+        }
+
+        [Fact]
+        public void Test_291_04()
+        {
+        }
+
+        [Fact]
+        public void Test_291_05()
+        {
+        }
+
+        [Fact]
+        public void Test_291_06()
+        {
+        }
+
+        [Fact]
+        public void Test_291_07()
+        {
+        }
+
+        [Fact]
+        public void Test_291_08()
+        {
+        }
+
+        [Fact]
+        public void Test_291_09()
+        {
+        }
+
+        [Fact]
+        public void Test_291_10()
+        {
+        }
+
+        [Fact]
+        public void Test_291_11()
+        {
+        }
+
+        [Fact]
+        public void Test_291_12()
+        {
+        }
+
+        [Fact]
+        public void Test_291_13()
+        {
+        }
+
+        [Fact]
+        public void Test_291_14()
+        {
+        }
+
+        [Fact]
+        public void Test_291_15()
+        {
+        }
+
+        [Fact]
+        public void Test_291_16()
+        {
+        }
+
+        [Fact]
+        public void Test_291_17()
+        {
+        }
+
+        [Fact]
+        public void Test_291_18()
+        {
+        }
+
+        [Fact]
+        public void Test_291_19()
+        {
+        }
+
+        [Fact]
+        public void Test_291_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_292
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_292_01()
+        {
+        }
+
+        [Fact]
+        public void Test_292_02()
+        {
+        }
+
+        [Fact]
+        public void Test_292_03()
+        {
+        }
+
+        [Fact]
+        public void Test_292_04()
+        {
+        }
+
+        [Fact]
+        public void Test_292_05()
+        {
+        }
+
+        [Fact]
+        public void Test_292_06()
+        {
+        }
+
+        [Fact]
+        public void Test_292_07()
+        {
+        }
+
+        [Fact]
+        public void Test_292_08()
+        {
+        }
+
+        [Fact]
+        public void Test_292_09()
+        {
+        }
+
+        [Fact]
+        public void Test_292_10()
+        {
+        }
+
+        [Fact]
+        public void Test_292_11()
+        {
+        }
+
+        [Fact]
+        public void Test_292_12()
+        {
+        }
+
+        [Fact]
+        public void Test_292_13()
+        {
+        }
+
+        [Fact]
+        public void Test_292_14()
+        {
+        }
+
+        [Fact]
+        public void Test_292_15()
+        {
+        }
+
+        [Fact]
+        public void Test_292_16()
+        {
+        }
+
+        [Fact]
+        public void Test_292_17()
+        {
+        }
+
+        [Fact]
+        public void Test_292_18()
+        {
+        }
+
+        [Fact]
+        public void Test_292_19()
+        {
+        }
+
+        [Fact]
+        public void Test_292_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_293
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_293_01()
+        {
+        }
+
+        [Fact]
+        public void Test_293_02()
+        {
+        }
+
+        [Fact]
+        public void Test_293_03()
+        {
+        }
+
+        [Fact]
+        public void Test_293_04()
+        {
+        }
+
+        [Fact]
+        public void Test_293_05()
+        {
+        }
+
+        [Fact]
+        public void Test_293_06()
+        {
+        }
+
+        [Fact]
+        public void Test_293_07()
+        {
+        }
+
+        [Fact]
+        public void Test_293_08()
+        {
+        }
+
+        [Fact]
+        public void Test_293_09()
+        {
+        }
+
+        [Fact]
+        public void Test_293_10()
+        {
+        }
+
+        [Fact]
+        public void Test_293_11()
+        {
+        }
+
+        [Fact]
+        public void Test_293_12()
+        {
+        }
+
+        [Fact]
+        public void Test_293_13()
+        {
+        }
+
+        [Fact]
+        public void Test_293_14()
+        {
+        }
+
+        [Fact]
+        public void Test_293_15()
+        {
+        }
+
+        [Fact]
+        public void Test_293_16()
+        {
+        }
+
+        [Fact]
+        public void Test_293_17()
+        {
+        }
+
+        [Fact]
+        public void Test_293_18()
+        {
+        }
+
+        [Fact]
+        public void Test_293_19()
+        {
+        }
+
+        [Fact]
+        public void Test_293_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_294
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_294_01()
+        {
+        }
+
+        [Fact]
+        public void Test_294_02()
+        {
+        }
+
+        [Fact]
+        public void Test_294_03()
+        {
+        }
+
+        [Fact]
+        public void Test_294_04()
+        {
+        }
+
+        [Fact]
+        public void Test_294_05()
+        {
+        }
+
+        [Fact]
+        public void Test_294_06()
+        {
+        }
+
+        [Fact]
+        public void Test_294_07()
+        {
+        }
+
+        [Fact]
+        public void Test_294_08()
+        {
+        }
+
+        [Fact]
+        public void Test_294_09()
+        {
+        }
+
+        [Fact]
+        public void Test_294_10()
+        {
+        }
+
+        [Fact]
+        public void Test_294_11()
+        {
+        }
+
+        [Fact]
+        public void Test_294_12()
+        {
+        }
+
+        [Fact]
+        public void Test_294_13()
+        {
+        }
+
+        [Fact]
+        public void Test_294_14()
+        {
+        }
+
+        [Fact]
+        public void Test_294_15()
+        {
+        }
+
+        [Fact]
+        public void Test_294_16()
+        {
+        }
+
+        [Fact]
+        public void Test_294_17()
+        {
+        }
+
+        [Fact]
+        public void Test_294_18()
+        {
+        }
+
+        [Fact]
+        public void Test_294_19()
+        {
+        }
+
+        [Fact]
+        public void Test_294_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_295
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_295_01()
+        {
+        }
+
+        [Fact]
+        public void Test_295_02()
+        {
+        }
+
+        [Fact]
+        public void Test_295_03()
+        {
+        }
+
+        [Fact]
+        public void Test_295_04()
+        {
+        }
+
+        [Fact]
+        public void Test_295_05()
+        {
+        }
+
+        [Fact]
+        public void Test_295_06()
+        {
+        }
+
+        [Fact]
+        public void Test_295_07()
+        {
+        }
+
+        [Fact]
+        public void Test_295_08()
+        {
+        }
+
+        [Fact]
+        public void Test_295_09()
+        {
+        }
+
+        [Fact]
+        public void Test_295_10()
+        {
+        }
+
+        [Fact]
+        public void Test_295_11()
+        {
+        }
+
+        [Fact]
+        public void Test_295_12()
+        {
+        }
+
+        [Fact]
+        public void Test_295_13()
+        {
+        }
+
+        [Fact]
+        public void Test_295_14()
+        {
+        }
+
+        [Fact]
+        public void Test_295_15()
+        {
+        }
+
+        [Fact]
+        public void Test_295_16()
+        {
+        }
+
+        [Fact]
+        public void Test_295_17()
+        {
+        }
+
+        [Fact]
+        public void Test_295_18()
+        {
+        }
+
+        [Fact]
+        public void Test_295_19()
+        {
+        }
+
+        [Fact]
+        public void Test_295_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_296
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_296_01()
+        {
+        }
+
+        [Fact]
+        public void Test_296_02()
+        {
+        }
+
+        [Fact]
+        public void Test_296_03()
+        {
+        }
+
+        [Fact]
+        public void Test_296_04()
+        {
+        }
+
+        [Fact]
+        public void Test_296_05()
+        {
+        }
+
+        [Fact]
+        public void Test_296_06()
+        {
+        }
+
+        [Fact]
+        public void Test_296_07()
+        {
+        }
+
+        [Fact]
+        public void Test_296_08()
+        {
+        }
+
+        [Fact]
+        public void Test_296_09()
+        {
+        }
+
+        [Fact]
+        public void Test_296_10()
+        {
+        }
+
+        [Fact]
+        public void Test_296_11()
+        {
+        }
+
+        [Fact]
+        public void Test_296_12()
+        {
+        }
+
+        [Fact]
+        public void Test_296_13()
+        {
+        }
+
+        [Fact]
+        public void Test_296_14()
+        {
+        }
+
+        [Fact]
+        public void Test_296_15()
+        {
+        }
+
+        [Fact]
+        public void Test_296_16()
+        {
+        }
+
+        [Fact]
+        public void Test_296_17()
+        {
+        }
+
+        [Fact]
+        public void Test_296_18()
+        {
+        }
+
+        [Fact]
+        public void Test_296_19()
+        {
+        }
+
+        [Fact]
+        public void Test_296_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_297
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_297_01()
+        {
+        }
+
+        [Fact]
+        public void Test_297_02()
+        {
+        }
+
+        [Fact]
+        public void Test_297_03()
+        {
+        }
+
+        [Fact]
+        public void Test_297_04()
+        {
+        }
+
+        [Fact]
+        public void Test_297_05()
+        {
+        }
+
+        [Fact]
+        public void Test_297_06()
+        {
+        }
+
+        [Fact]
+        public void Test_297_07()
+        {
+        }
+
+        [Fact]
+        public void Test_297_08()
+        {
+        }
+
+        [Fact]
+        public void Test_297_09()
+        {
+        }
+
+        [Fact]
+        public void Test_297_10()
+        {
+        }
+
+        [Fact]
+        public void Test_297_11()
+        {
+        }
+
+        [Fact]
+        public void Test_297_12()
+        {
+        }
+
+        [Fact]
+        public void Test_297_13()
+        {
+        }
+
+        [Fact]
+        public void Test_297_14()
+        {
+        }
+
+        [Fact]
+        public void Test_297_15()
+        {
+        }
+
+        [Fact]
+        public void Test_297_16()
+        {
+        }
+
+        [Fact]
+        public void Test_297_17()
+        {
+        }
+
+        [Fact]
+        public void Test_297_18()
+        {
+        }
+
+        [Fact]
+        public void Test_297_19()
+        {
+        }
+
+        [Fact]
+        public void Test_297_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_298
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_298_01()
+        {
+        }
+
+        [Fact]
+        public void Test_298_02()
+        {
+        }
+
+        [Fact]
+        public void Test_298_03()
+        {
+        }
+
+        [Fact]
+        public void Test_298_04()
+        {
+        }
+
+        [Fact]
+        public void Test_298_05()
+        {
+        }
+
+        [Fact]
+        public void Test_298_06()
+        {
+        }
+
+        [Fact]
+        public void Test_298_07()
+        {
+        }
+
+        [Fact]
+        public void Test_298_08()
+        {
+        }
+
+        [Fact]
+        public void Test_298_09()
+        {
+        }
+
+        [Fact]
+        public void Test_298_10()
+        {
+        }
+
+        [Fact]
+        public void Test_298_11()
+        {
+        }
+
+        [Fact]
+        public void Test_298_12()
+        {
+        }
+
+        [Fact]
+        public void Test_298_13()
+        {
+        }
+
+        [Fact]
+        public void Test_298_14()
+        {
+        }
+
+        [Fact]
+        public void Test_298_15()
+        {
+        }
+
+        [Fact]
+        public void Test_298_16()
+        {
+        }
+
+        [Fact]
+        public void Test_298_17()
+        {
+        }
+
+        [Fact]
+        public void Test_298_18()
+        {
+        }
+
+        [Fact]
+        public void Test_298_19()
+        {
+        }
+
+        [Fact]
+        public void Test_298_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_299
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_299_01()
+        {
+        }
+
+        [Fact]
+        public void Test_299_02()
+        {
+        }
+
+        [Fact]
+        public void Test_299_03()
+        {
+        }
+
+        [Fact]
+        public void Test_299_04()
+        {
+        }
+
+        [Fact]
+        public void Test_299_05()
+        {
+        }
+
+        [Fact]
+        public void Test_299_06()
+        {
+        }
+
+        [Fact]
+        public void Test_299_07()
+        {
+        }
+
+        [Fact]
+        public void Test_299_08()
+        {
+        }
+
+        [Fact]
+        public void Test_299_09()
+        {
+        }
+
+        [Fact]
+        public void Test_299_10()
+        {
+        }
+
+        [Fact]
+        public void Test_299_11()
+        {
+        }
+
+        [Fact]
+        public void Test_299_12()
+        {
+        }
+
+        [Fact]
+        public void Test_299_13()
+        {
+        }
+
+        [Fact]
+        public void Test_299_14()
+        {
+        }
+
+        [Fact]
+        public void Test_299_15()
+        {
+        }
+
+        [Fact]
+        public void Test_299_16()
+        {
+        }
+
+        [Fact]
+        public void Test_299_17()
+        {
+        }
+
+        [Fact]
+        public void Test_299_18()
+        {
+        }
+
+        [Fact]
+        public void Test_299_19()
+        {
+        }
+
+        [Fact]
+        public void Test_299_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_300
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_300_01()
+        {
+        }
+
+        [Fact]
+        public void Test_300_02()
+        {
+        }
+
+        [Fact]
+        public void Test_300_03()
+        {
+        }
+
+        [Fact]
+        public void Test_300_04()
+        {
+        }
+
+        [Fact]
+        public void Test_300_05()
+        {
+        }
+
+        [Fact]
+        public void Test_300_06()
+        {
+        }
+
+        [Fact]
+        public void Test_300_07()
+        {
+        }
+
+        [Fact]
+        public void Test_300_08()
+        {
+        }
+
+        [Fact]
+        public void Test_300_09()
+        {
+        }
+
+        [Fact]
+        public void Test_300_10()
+        {
+        }
+
+        [Fact]
+        public void Test_300_11()
+        {
+        }
+
+        [Fact]
+        public void Test_300_12()
+        {
+        }
+
+        [Fact]
+        public void Test_300_13()
+        {
+        }
+
+        [Fact]
+        public void Test_300_14()
+        {
+        }
+
+        [Fact]
+        public void Test_300_15()
+        {
+        }
+
+        [Fact]
+        public void Test_300_16()
+        {
+        }
+
+        [Fact]
+        public void Test_300_17()
+        {
+        }
+
+        [Fact]
+        public void Test_300_18()
+        {
+        }
+
+        [Fact]
+        public void Test_300_19()
+        {
+        }
+
+        [Fact]
+        public void Test_300_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_301
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_301_01()
+        {
+        }
+
+        [Fact]
+        public void Test_301_02()
+        {
+        }
+
+        [Fact]
+        public void Test_301_03()
+        {
+        }
+
+        [Fact]
+        public void Test_301_04()
+        {
+        }
+
+        [Fact]
+        public void Test_301_05()
+        {
+        }
+
+        [Fact]
+        public void Test_301_06()
+        {
+        }
+
+        [Fact]
+        public void Test_301_07()
+        {
+        }
+
+        [Fact]
+        public void Test_301_08()
+        {
+        }
+
+        [Fact]
+        public void Test_301_09()
+        {
+        }
+
+        [Fact]
+        public void Test_301_10()
+        {
+        }
+
+        [Fact]
+        public void Test_301_11()
+        {
+        }
+
+        [Fact]
+        public void Test_301_12()
+        {
+        }
+
+        [Fact]
+        public void Test_301_13()
+        {
+        }
+
+        [Fact]
+        public void Test_301_14()
+        {
+        }
+
+        [Fact]
+        public void Test_301_15()
+        {
+        }
+
+        [Fact]
+        public void Test_301_16()
+        {
+        }
+
+        [Fact]
+        public void Test_301_17()
+        {
+        }
+
+        [Fact]
+        public void Test_301_18()
+        {
+        }
+
+        [Fact]
+        public void Test_301_19()
+        {
+        }
+
+        [Fact]
+        public void Test_301_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_302
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_302_01()
+        {
+        }
+
+        [Fact]
+        public void Test_302_02()
+        {
+        }
+
+        [Fact]
+        public void Test_302_03()
+        {
+        }
+
+        [Fact]
+        public void Test_302_04()
+        {
+        }
+
+        [Fact]
+        public void Test_302_05()
+        {
+        }
+
+        [Fact]
+        public void Test_302_06()
+        {
+        }
+
+        [Fact]
+        public void Test_302_07()
+        {
+        }
+
+        [Fact]
+        public void Test_302_08()
+        {
+        }
+
+        [Fact]
+        public void Test_302_09()
+        {
+        }
+
+        [Fact]
+        public void Test_302_10()
+        {
+        }
+
+        [Fact]
+        public void Test_302_11()
+        {
+        }
+
+        [Fact]
+        public void Test_302_12()
+        {
+        }
+
+        [Fact]
+        public void Test_302_13()
+        {
+        }
+
+        [Fact]
+        public void Test_302_14()
+        {
+        }
+
+        [Fact]
+        public void Test_302_15()
+        {
+        }
+
+        [Fact]
+        public void Test_302_16()
+        {
+        }
+
+        [Fact]
+        public void Test_302_17()
+        {
+        }
+
+        [Fact]
+        public void Test_302_18()
+        {
+        }
+
+        [Fact]
+        public void Test_302_19()
+        {
+        }
+
+        [Fact]
+        public void Test_302_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_303
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_303_01()
+        {
+        }
+
+        [Fact]
+        public void Test_303_02()
+        {
+        }
+
+        [Fact]
+        public void Test_303_03()
+        {
+        }
+
+        [Fact]
+        public void Test_303_04()
+        {
+        }
+
+        [Fact]
+        public void Test_303_05()
+        {
+        }
+
+        [Fact]
+        public void Test_303_06()
+        {
+        }
+
+        [Fact]
+        public void Test_303_07()
+        {
+        }
+
+        [Fact]
+        public void Test_303_08()
+        {
+        }
+
+        [Fact]
+        public void Test_303_09()
+        {
+        }
+
+        [Fact]
+        public void Test_303_10()
+        {
+        }
+
+        [Fact]
+        public void Test_303_11()
+        {
+        }
+
+        [Fact]
+        public void Test_303_12()
+        {
+        }
+
+        [Fact]
+        public void Test_303_13()
+        {
+        }
+
+        [Fact]
+        public void Test_303_14()
+        {
+        }
+
+        [Fact]
+        public void Test_303_15()
+        {
+        }
+
+        [Fact]
+        public void Test_303_16()
+        {
+        }
+
+        [Fact]
+        public void Test_303_17()
+        {
+        }
+
+        [Fact]
+        public void Test_303_18()
+        {
+        }
+
+        [Fact]
+        public void Test_303_19()
+        {
+        }
+
+        [Fact]
+        public void Test_303_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_304
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_304_01()
+        {
+        }
+
+        [Fact]
+        public void Test_304_02()
+        {
+        }
+
+        [Fact]
+        public void Test_304_03()
+        {
+        }
+
+        [Fact]
+        public void Test_304_04()
+        {
+        }
+
+        [Fact]
+        public void Test_304_05()
+        {
+        }
+
+        [Fact]
+        public void Test_304_06()
+        {
+        }
+
+        [Fact]
+        public void Test_304_07()
+        {
+        }
+
+        [Fact]
+        public void Test_304_08()
+        {
+        }
+
+        [Fact]
+        public void Test_304_09()
+        {
+        }
+
+        [Fact]
+        public void Test_304_10()
+        {
+        }
+
+        [Fact]
+        public void Test_304_11()
+        {
+        }
+
+        [Fact]
+        public void Test_304_12()
+        {
+        }
+
+        [Fact]
+        public void Test_304_13()
+        {
+        }
+
+        [Fact]
+        public void Test_304_14()
+        {
+        }
+
+        [Fact]
+        public void Test_304_15()
+        {
+        }
+
+        [Fact]
+        public void Test_304_16()
+        {
+        }
+
+        [Fact]
+        public void Test_304_17()
+        {
+        }
+
+        [Fact]
+        public void Test_304_18()
+        {
+        }
+
+        [Fact]
+        public void Test_304_19()
+        {
+        }
+
+        [Fact]
+        public void Test_304_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_305
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_305_01()
+        {
+        }
+
+        [Fact]
+        public void Test_305_02()
+        {
+        }
+
+        [Fact]
+        public void Test_305_03()
+        {
+        }
+
+        [Fact]
+        public void Test_305_04()
+        {
+        }
+
+        [Fact]
+        public void Test_305_05()
+        {
+        }
+
+        [Fact]
+        public void Test_305_06()
+        {
+        }
+
+        [Fact]
+        public void Test_305_07()
+        {
+        }
+
+        [Fact]
+        public void Test_305_08()
+        {
+        }
+
+        [Fact]
+        public void Test_305_09()
+        {
+        }
+
+        [Fact]
+        public void Test_305_10()
+        {
+        }
+
+        [Fact]
+        public void Test_305_11()
+        {
+        }
+
+        [Fact]
+        public void Test_305_12()
+        {
+        }
+
+        [Fact]
+        public void Test_305_13()
+        {
+        }
+
+        [Fact]
+        public void Test_305_14()
+        {
+        }
+
+        [Fact]
+        public void Test_305_15()
+        {
+        }
+
+        [Fact]
+        public void Test_305_16()
+        {
+        }
+
+        [Fact]
+        public void Test_305_17()
+        {
+        }
+
+        [Fact]
+        public void Test_305_18()
+        {
+        }
+
+        [Fact]
+        public void Test_305_19()
+        {
+        }
+
+        [Fact]
+        public void Test_305_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_306
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_306_01()
+        {
+        }
+
+        [Fact]
+        public void Test_306_02()
+        {
+        }
+
+        [Fact]
+        public void Test_306_03()
+        {
+        }
+
+        [Fact]
+        public void Test_306_04()
+        {
+        }
+
+        [Fact]
+        public void Test_306_05()
+        {
+        }
+
+        [Fact]
+        public void Test_306_06()
+        {
+        }
+
+        [Fact]
+        public void Test_306_07()
+        {
+        }
+
+        [Fact]
+        public void Test_306_08()
+        {
+        }
+
+        [Fact]
+        public void Test_306_09()
+        {
+        }
+
+        [Fact]
+        public void Test_306_10()
+        {
+        }
+
+        [Fact]
+        public void Test_306_11()
+        {
+        }
+
+        [Fact]
+        public void Test_306_12()
+        {
+        }
+
+        [Fact]
+        public void Test_306_13()
+        {
+        }
+
+        [Fact]
+        public void Test_306_14()
+        {
+        }
+
+        [Fact]
+        public void Test_306_15()
+        {
+        }
+
+        [Fact]
+        public void Test_306_16()
+        {
+        }
+
+        [Fact]
+        public void Test_306_17()
+        {
+        }
+
+        [Fact]
+        public void Test_306_18()
+        {
+        }
+
+        [Fact]
+        public void Test_306_19()
+        {
+        }
+
+        [Fact]
+        public void Test_306_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_307
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_307_01()
+        {
+        }
+
+        [Fact]
+        public void Test_307_02()
+        {
+        }
+
+        [Fact]
+        public void Test_307_03()
+        {
+        }
+
+        [Fact]
+        public void Test_307_04()
+        {
+        }
+
+        [Fact]
+        public void Test_307_05()
+        {
+        }
+
+        [Fact]
+        public void Test_307_06()
+        {
+        }
+
+        [Fact]
+        public void Test_307_07()
+        {
+        }
+
+        [Fact]
+        public void Test_307_08()
+        {
+        }
+
+        [Fact]
+        public void Test_307_09()
+        {
+        }
+
+        [Fact]
+        public void Test_307_10()
+        {
+        }
+
+        [Fact]
+        public void Test_307_11()
+        {
+        }
+
+        [Fact]
+        public void Test_307_12()
+        {
+        }
+
+        [Fact]
+        public void Test_307_13()
+        {
+        }
+
+        [Fact]
+        public void Test_307_14()
+        {
+        }
+
+        [Fact]
+        public void Test_307_15()
+        {
+        }
+
+        [Fact]
+        public void Test_307_16()
+        {
+        }
+
+        [Fact]
+        public void Test_307_17()
+        {
+        }
+
+        [Fact]
+        public void Test_307_18()
+        {
+        }
+
+        [Fact]
+        public void Test_307_19()
+        {
+        }
+
+        [Fact]
+        public void Test_307_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_308
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_308_01()
+        {
+        }
+
+        [Fact]
+        public void Test_308_02()
+        {
+        }
+
+        [Fact]
+        public void Test_308_03()
+        {
+        }
+
+        [Fact]
+        public void Test_308_04()
+        {
+        }
+
+        [Fact]
+        public void Test_308_05()
+        {
+        }
+
+        [Fact]
+        public void Test_308_06()
+        {
+        }
+
+        [Fact]
+        public void Test_308_07()
+        {
+        }
+
+        [Fact]
+        public void Test_308_08()
+        {
+        }
+
+        [Fact]
+        public void Test_308_09()
+        {
+        }
+
+        [Fact]
+        public void Test_308_10()
+        {
+        }
+
+        [Fact]
+        public void Test_308_11()
+        {
+        }
+
+        [Fact]
+        public void Test_308_12()
+        {
+        }
+
+        [Fact]
+        public void Test_308_13()
+        {
+        }
+
+        [Fact]
+        public void Test_308_14()
+        {
+        }
+
+        [Fact]
+        public void Test_308_15()
+        {
+        }
+
+        [Fact]
+        public void Test_308_16()
+        {
+        }
+
+        [Fact]
+        public void Test_308_17()
+        {
+        }
+
+        [Fact]
+        public void Test_308_18()
+        {
+        }
+
+        [Fact]
+        public void Test_308_19()
+        {
+        }
+
+        [Fact]
+        public void Test_308_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_309
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_309_01()
+        {
+        }
+
+        [Fact]
+        public void Test_309_02()
+        {
+        }
+
+        [Fact]
+        public void Test_309_03()
+        {
+        }
+
+        [Fact]
+        public void Test_309_04()
+        {
+        }
+
+        [Fact]
+        public void Test_309_05()
+        {
+        }
+
+        [Fact]
+        public void Test_309_06()
+        {
+        }
+
+        [Fact]
+        public void Test_309_07()
+        {
+        }
+
+        [Fact]
+        public void Test_309_08()
+        {
+        }
+
+        [Fact]
+        public void Test_309_09()
+        {
+        }
+
+        [Fact]
+        public void Test_309_10()
+        {
+        }
+
+        [Fact]
+        public void Test_309_11()
+        {
+        }
+
+        [Fact]
+        public void Test_309_12()
+        {
+        }
+
+        [Fact]
+        public void Test_309_13()
+        {
+        }
+
+        [Fact]
+        public void Test_309_14()
+        {
+        }
+
+        [Fact]
+        public void Test_309_15()
+        {
+        }
+
+        [Fact]
+        public void Test_309_16()
+        {
+        }
+
+        [Fact]
+        public void Test_309_17()
+        {
+        }
+
+        [Fact]
+        public void Test_309_18()
+        {
+        }
+
+        [Fact]
+        public void Test_309_19()
+        {
+        }
+
+        [Fact]
+        public void Test_309_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_310
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_310_01()
+        {
+        }
+
+        [Fact]
+        public void Test_310_02()
+        {
+        }
+
+        [Fact]
+        public void Test_310_03()
+        {
+        }
+
+        [Fact]
+        public void Test_310_04()
+        {
+        }
+
+        [Fact]
+        public void Test_310_05()
+        {
+        }
+
+        [Fact]
+        public void Test_310_06()
+        {
+        }
+
+        [Fact]
+        public void Test_310_07()
+        {
+        }
+
+        [Fact]
+        public void Test_310_08()
+        {
+        }
+
+        [Fact]
+        public void Test_310_09()
+        {
+        }
+
+        [Fact]
+        public void Test_310_10()
+        {
+        }
+
+        [Fact]
+        public void Test_310_11()
+        {
+        }
+
+        [Fact]
+        public void Test_310_12()
+        {
+        }
+
+        [Fact]
+        public void Test_310_13()
+        {
+        }
+
+        [Fact]
+        public void Test_310_14()
+        {
+        }
+
+        [Fact]
+        public void Test_310_15()
+        {
+        }
+
+        [Fact]
+        public void Test_310_16()
+        {
+        }
+
+        [Fact]
+        public void Test_310_17()
+        {
+        }
+
+        [Fact]
+        public void Test_310_18()
+        {
+        }
+
+        [Fact]
+        public void Test_310_19()
+        {
+        }
+
+        [Fact]
+        public void Test_310_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_311
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_311_01()
+        {
+        }
+
+        [Fact]
+        public void Test_311_02()
+        {
+        }
+
+        [Fact]
+        public void Test_311_03()
+        {
+        }
+
+        [Fact]
+        public void Test_311_04()
+        {
+        }
+
+        [Fact]
+        public void Test_311_05()
+        {
+        }
+
+        [Fact]
+        public void Test_311_06()
+        {
+        }
+
+        [Fact]
+        public void Test_311_07()
+        {
+        }
+
+        [Fact]
+        public void Test_311_08()
+        {
+        }
+
+        [Fact]
+        public void Test_311_09()
+        {
+        }
+
+        [Fact]
+        public void Test_311_10()
+        {
+        }
+
+        [Fact]
+        public void Test_311_11()
+        {
+        }
+
+        [Fact]
+        public void Test_311_12()
+        {
+        }
+
+        [Fact]
+        public void Test_311_13()
+        {
+        }
+
+        [Fact]
+        public void Test_311_14()
+        {
+        }
+
+        [Fact]
+        public void Test_311_15()
+        {
+        }
+
+        [Fact]
+        public void Test_311_16()
+        {
+        }
+
+        [Fact]
+        public void Test_311_17()
+        {
+        }
+
+        [Fact]
+        public void Test_311_18()
+        {
+        }
+
+        [Fact]
+        public void Test_311_19()
+        {
+        }
+
+        [Fact]
+        public void Test_311_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_312
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_312_01()
+        {
+        }
+
+        [Fact]
+        public void Test_312_02()
+        {
+        }
+
+        [Fact]
+        public void Test_312_03()
+        {
+        }
+
+        [Fact]
+        public void Test_312_04()
+        {
+        }
+
+        [Fact]
+        public void Test_312_05()
+        {
+        }
+
+        [Fact]
+        public void Test_312_06()
+        {
+        }
+
+        [Fact]
+        public void Test_312_07()
+        {
+        }
+
+        [Fact]
+        public void Test_312_08()
+        {
+        }
+
+        [Fact]
+        public void Test_312_09()
+        {
+        }
+
+        [Fact]
+        public void Test_312_10()
+        {
+        }
+
+        [Fact]
+        public void Test_312_11()
+        {
+        }
+
+        [Fact]
+        public void Test_312_12()
+        {
+        }
+
+        [Fact]
+        public void Test_312_13()
+        {
+        }
+
+        [Fact]
+        public void Test_312_14()
+        {
+        }
+
+        [Fact]
+        public void Test_312_15()
+        {
+        }
+
+        [Fact]
+        public void Test_312_16()
+        {
+        }
+
+        [Fact]
+        public void Test_312_17()
+        {
+        }
+
+        [Fact]
+        public void Test_312_18()
+        {
+        }
+
+        [Fact]
+        public void Test_312_19()
+        {
+        }
+
+        [Fact]
+        public void Test_312_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_313
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_313_01()
+        {
+        }
+
+        [Fact]
+        public void Test_313_02()
+        {
+        }
+
+        [Fact]
+        public void Test_313_03()
+        {
+        }
+
+        [Fact]
+        public void Test_313_04()
+        {
+        }
+
+        [Fact]
+        public void Test_313_05()
+        {
+        }
+
+        [Fact]
+        public void Test_313_06()
+        {
+        }
+
+        [Fact]
+        public void Test_313_07()
+        {
+        }
+
+        [Fact]
+        public void Test_313_08()
+        {
+        }
+
+        [Fact]
+        public void Test_313_09()
+        {
+        }
+
+        [Fact]
+        public void Test_313_10()
+        {
+        }
+
+        [Fact]
+        public void Test_313_11()
+        {
+        }
+
+        [Fact]
+        public void Test_313_12()
+        {
+        }
+
+        [Fact]
+        public void Test_313_13()
+        {
+        }
+
+        [Fact]
+        public void Test_313_14()
+        {
+        }
+
+        [Fact]
+        public void Test_313_15()
+        {
+        }
+
+        [Fact]
+        public void Test_313_16()
+        {
+        }
+
+        [Fact]
+        public void Test_313_17()
+        {
+        }
+
+        [Fact]
+        public void Test_313_18()
+        {
+        }
+
+        [Fact]
+        public void Test_313_19()
+        {
+        }
+
+        [Fact]
+        public void Test_313_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_314
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_314_01()
+        {
+        }
+
+        [Fact]
+        public void Test_314_02()
+        {
+        }
+
+        [Fact]
+        public void Test_314_03()
+        {
+        }
+
+        [Fact]
+        public void Test_314_04()
+        {
+        }
+
+        [Fact]
+        public void Test_314_05()
+        {
+        }
+
+        [Fact]
+        public void Test_314_06()
+        {
+        }
+
+        [Fact]
+        public void Test_314_07()
+        {
+        }
+
+        [Fact]
+        public void Test_314_08()
+        {
+        }
+
+        [Fact]
+        public void Test_314_09()
+        {
+        }
+
+        [Fact]
+        public void Test_314_10()
+        {
+        }
+
+        [Fact]
+        public void Test_314_11()
+        {
+        }
+
+        [Fact]
+        public void Test_314_12()
+        {
+        }
+
+        [Fact]
+        public void Test_314_13()
+        {
+        }
+
+        [Fact]
+        public void Test_314_14()
+        {
+        }
+
+        [Fact]
+        public void Test_314_15()
+        {
+        }
+
+        [Fact]
+        public void Test_314_16()
+        {
+        }
+
+        [Fact]
+        public void Test_314_17()
+        {
+        }
+
+        [Fact]
+        public void Test_314_18()
+        {
+        }
+
+        [Fact]
+        public void Test_314_19()
+        {
+        }
+
+        [Fact]
+        public void Test_314_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_315
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_315_01()
+        {
+        }
+
+        [Fact]
+        public void Test_315_02()
+        {
+        }
+
+        [Fact]
+        public void Test_315_03()
+        {
+        }
+
+        [Fact]
+        public void Test_315_04()
+        {
+        }
+
+        [Fact]
+        public void Test_315_05()
+        {
+        }
+
+        [Fact]
+        public void Test_315_06()
+        {
+        }
+
+        [Fact]
+        public void Test_315_07()
+        {
+        }
+
+        [Fact]
+        public void Test_315_08()
+        {
+        }
+
+        [Fact]
+        public void Test_315_09()
+        {
+        }
+
+        [Fact]
+        public void Test_315_10()
+        {
+        }
+
+        [Fact]
+        public void Test_315_11()
+        {
+        }
+
+        [Fact]
+        public void Test_315_12()
+        {
+        }
+
+        [Fact]
+        public void Test_315_13()
+        {
+        }
+
+        [Fact]
+        public void Test_315_14()
+        {
+        }
+
+        [Fact]
+        public void Test_315_15()
+        {
+        }
+
+        [Fact]
+        public void Test_315_16()
+        {
+        }
+
+        [Fact]
+        public void Test_315_17()
+        {
+        }
+
+        [Fact]
+        public void Test_315_18()
+        {
+        }
+
+        [Fact]
+        public void Test_315_19()
+        {
+        }
+
+        [Fact]
+        public void Test_315_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_316
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_316_01()
+        {
+        }
+
+        [Fact]
+        public void Test_316_02()
+        {
+        }
+
+        [Fact]
+        public void Test_316_03()
+        {
+        }
+
+        [Fact]
+        public void Test_316_04()
+        {
+        }
+
+        [Fact]
+        public void Test_316_05()
+        {
+        }
+
+        [Fact]
+        public void Test_316_06()
+        {
+        }
+
+        [Fact]
+        public void Test_316_07()
+        {
+        }
+
+        [Fact]
+        public void Test_316_08()
+        {
+        }
+
+        [Fact]
+        public void Test_316_09()
+        {
+        }
+
+        [Fact]
+        public void Test_316_10()
+        {
+        }
+
+        [Fact]
+        public void Test_316_11()
+        {
+        }
+
+        [Fact]
+        public void Test_316_12()
+        {
+        }
+
+        [Fact]
+        public void Test_316_13()
+        {
+        }
+
+        [Fact]
+        public void Test_316_14()
+        {
+        }
+
+        [Fact]
+        public void Test_316_15()
+        {
+        }
+
+        [Fact]
+        public void Test_316_16()
+        {
+        }
+
+        [Fact]
+        public void Test_316_17()
+        {
+        }
+
+        [Fact]
+        public void Test_316_18()
+        {
+        }
+
+        [Fact]
+        public void Test_316_19()
+        {
+        }
+
+        [Fact]
+        public void Test_316_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_317
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_317_01()
+        {
+        }
+
+        [Fact]
+        public void Test_317_02()
+        {
+        }
+
+        [Fact]
+        public void Test_317_03()
+        {
+        }
+
+        [Fact]
+        public void Test_317_04()
+        {
+        }
+
+        [Fact]
+        public void Test_317_05()
+        {
+        }
+
+        [Fact]
+        public void Test_317_06()
+        {
+        }
+
+        [Fact]
+        public void Test_317_07()
+        {
+        }
+
+        [Fact]
+        public void Test_317_08()
+        {
+        }
+
+        [Fact]
+        public void Test_317_09()
+        {
+        }
+
+        [Fact]
+        public void Test_317_10()
+        {
+        }
+
+        [Fact]
+        public void Test_317_11()
+        {
+        }
+
+        [Fact]
+        public void Test_317_12()
+        {
+        }
+
+        [Fact]
+        public void Test_317_13()
+        {
+        }
+
+        [Fact]
+        public void Test_317_14()
+        {
+        }
+
+        [Fact]
+        public void Test_317_15()
+        {
+        }
+
+        [Fact]
+        public void Test_317_16()
+        {
+        }
+
+        [Fact]
+        public void Test_317_17()
+        {
+        }
+
+        [Fact]
+        public void Test_317_18()
+        {
+        }
+
+        [Fact]
+        public void Test_317_19()
+        {
+        }
+
+        [Fact]
+        public void Test_317_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_318
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_318_01()
+        {
+        }
+
+        [Fact]
+        public void Test_318_02()
+        {
+        }
+
+        [Fact]
+        public void Test_318_03()
+        {
+        }
+
+        [Fact]
+        public void Test_318_04()
+        {
+        }
+
+        [Fact]
+        public void Test_318_05()
+        {
+        }
+
+        [Fact]
+        public void Test_318_06()
+        {
+        }
+
+        [Fact]
+        public void Test_318_07()
+        {
+        }
+
+        [Fact]
+        public void Test_318_08()
+        {
+        }
+
+        [Fact]
+        public void Test_318_09()
+        {
+        }
+
+        [Fact]
+        public void Test_318_10()
+        {
+        }
+
+        [Fact]
+        public void Test_318_11()
+        {
+        }
+
+        [Fact]
+        public void Test_318_12()
+        {
+        }
+
+        [Fact]
+        public void Test_318_13()
+        {
+        }
+
+        [Fact]
+        public void Test_318_14()
+        {
+        }
+
+        [Fact]
+        public void Test_318_15()
+        {
+        }
+
+        [Fact]
+        public void Test_318_16()
+        {
+        }
+
+        [Fact]
+        public void Test_318_17()
+        {
+        }
+
+        [Fact]
+        public void Test_318_18()
+        {
+        }
+
+        [Fact]
+        public void Test_318_19()
+        {
+        }
+
+        [Fact]
+        public void Test_318_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_319
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_319_01()
+        {
+        }
+
+        [Fact]
+        public void Test_319_02()
+        {
+        }
+
+        [Fact]
+        public void Test_319_03()
+        {
+        }
+
+        [Fact]
+        public void Test_319_04()
+        {
+        }
+
+        [Fact]
+        public void Test_319_05()
+        {
+        }
+
+        [Fact]
+        public void Test_319_06()
+        {
+        }
+
+        [Fact]
+        public void Test_319_07()
+        {
+        }
+
+        [Fact]
+        public void Test_319_08()
+        {
+        }
+
+        [Fact]
+        public void Test_319_09()
+        {
+        }
+
+        [Fact]
+        public void Test_319_10()
+        {
+        }
+
+        [Fact]
+        public void Test_319_11()
+        {
+        }
+
+        [Fact]
+        public void Test_319_12()
+        {
+        }
+
+        [Fact]
+        public void Test_319_13()
+        {
+        }
+
+        [Fact]
+        public void Test_319_14()
+        {
+        }
+
+        [Fact]
+        public void Test_319_15()
+        {
+        }
+
+        [Fact]
+        public void Test_319_16()
+        {
+        }
+
+        [Fact]
+        public void Test_319_17()
+        {
+        }
+
+        [Fact]
+        public void Test_319_18()
+        {
+        }
+
+        [Fact]
+        public void Test_319_19()
+        {
+        }
+
+        [Fact]
+        public void Test_319_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_320
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_320_01()
+        {
+        }
+
+        [Fact]
+        public void Test_320_02()
+        {
+        }
+
+        [Fact]
+        public void Test_320_03()
+        {
+        }
+
+        [Fact]
+        public void Test_320_04()
+        {
+        }
+
+        [Fact]
+        public void Test_320_05()
+        {
+        }
+
+        [Fact]
+        public void Test_320_06()
+        {
+        }
+
+        [Fact]
+        public void Test_320_07()
+        {
+        }
+
+        [Fact]
+        public void Test_320_08()
+        {
+        }
+
+        [Fact]
+        public void Test_320_09()
+        {
+        }
+
+        [Fact]
+        public void Test_320_10()
+        {
+        }
+
+        [Fact]
+        public void Test_320_11()
+        {
+        }
+
+        [Fact]
+        public void Test_320_12()
+        {
+        }
+
+        [Fact]
+        public void Test_320_13()
+        {
+        }
+
+        [Fact]
+        public void Test_320_14()
+        {
+        }
+
+        [Fact]
+        public void Test_320_15()
+        {
+        }
+
+        [Fact]
+        public void Test_320_16()
+        {
+        }
+
+        [Fact]
+        public void Test_320_17()
+        {
+        }
+
+        [Fact]
+        public void Test_320_18()
+        {
+        }
+
+        [Fact]
+        public void Test_320_19()
+        {
+        }
+
+        [Fact]
+        public void Test_320_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_321
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_321_01()
+        {
+        }
+
+        [Fact]
+        public void Test_321_02()
+        {
+        }
+
+        [Fact]
+        public void Test_321_03()
+        {
+        }
+
+        [Fact]
+        public void Test_321_04()
+        {
+        }
+
+        [Fact]
+        public void Test_321_05()
+        {
+        }
+
+        [Fact]
+        public void Test_321_06()
+        {
+        }
+
+        [Fact]
+        public void Test_321_07()
+        {
+        }
+
+        [Fact]
+        public void Test_321_08()
+        {
+        }
+
+        [Fact]
+        public void Test_321_09()
+        {
+        }
+
+        [Fact]
+        public void Test_321_10()
+        {
+        }
+
+        [Fact]
+        public void Test_321_11()
+        {
+        }
+
+        [Fact]
+        public void Test_321_12()
+        {
+        }
+
+        [Fact]
+        public void Test_321_13()
+        {
+        }
+
+        [Fact]
+        public void Test_321_14()
+        {
+        }
+
+        [Fact]
+        public void Test_321_15()
+        {
+        }
+
+        [Fact]
+        public void Test_321_16()
+        {
+        }
+
+        [Fact]
+        public void Test_321_17()
+        {
+        }
+
+        [Fact]
+        public void Test_321_18()
+        {
+        }
+
+        [Fact]
+        public void Test_321_19()
+        {
+        }
+
+        [Fact]
+        public void Test_321_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_322
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_322_01()
+        {
+        }
+
+        [Fact]
+        public void Test_322_02()
+        {
+        }
+
+        [Fact]
+        public void Test_322_03()
+        {
+        }
+
+        [Fact]
+        public void Test_322_04()
+        {
+        }
+
+        [Fact]
+        public void Test_322_05()
+        {
+        }
+
+        [Fact]
+        public void Test_322_06()
+        {
+        }
+
+        [Fact]
+        public void Test_322_07()
+        {
+        }
+
+        [Fact]
+        public void Test_322_08()
+        {
+        }
+
+        [Fact]
+        public void Test_322_09()
+        {
+        }
+
+        [Fact]
+        public void Test_322_10()
+        {
+        }
+
+        [Fact]
+        public void Test_322_11()
+        {
+        }
+
+        [Fact]
+        public void Test_322_12()
+        {
+        }
+
+        [Fact]
+        public void Test_322_13()
+        {
+        }
+
+        [Fact]
+        public void Test_322_14()
+        {
+        }
+
+        [Fact]
+        public void Test_322_15()
+        {
+        }
+
+        [Fact]
+        public void Test_322_16()
+        {
+        }
+
+        [Fact]
+        public void Test_322_17()
+        {
+        }
+
+        [Fact]
+        public void Test_322_18()
+        {
+        }
+
+        [Fact]
+        public void Test_322_19()
+        {
+        }
+
+        [Fact]
+        public void Test_322_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_323
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_323_01()
+        {
+        }
+
+        [Fact]
+        public void Test_323_02()
+        {
+        }
+
+        [Fact]
+        public void Test_323_03()
+        {
+        }
+
+        [Fact]
+        public void Test_323_04()
+        {
+        }
+
+        [Fact]
+        public void Test_323_05()
+        {
+        }
+
+        [Fact]
+        public void Test_323_06()
+        {
+        }
+
+        [Fact]
+        public void Test_323_07()
+        {
+        }
+
+        [Fact]
+        public void Test_323_08()
+        {
+        }
+
+        [Fact]
+        public void Test_323_09()
+        {
+        }
+
+        [Fact]
+        public void Test_323_10()
+        {
+        }
+
+        [Fact]
+        public void Test_323_11()
+        {
+        }
+
+        [Fact]
+        public void Test_323_12()
+        {
+        }
+
+        [Fact]
+        public void Test_323_13()
+        {
+        }
+
+        [Fact]
+        public void Test_323_14()
+        {
+        }
+
+        [Fact]
+        public void Test_323_15()
+        {
+        }
+
+        [Fact]
+        public void Test_323_16()
+        {
+        }
+
+        [Fact]
+        public void Test_323_17()
+        {
+        }
+
+        [Fact]
+        public void Test_323_18()
+        {
+        }
+
+        [Fact]
+        public void Test_323_19()
+        {
+        }
+
+        [Fact]
+        public void Test_323_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_324
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_324_01()
+        {
+        }
+
+        [Fact]
+        public void Test_324_02()
+        {
+        }
+
+        [Fact]
+        public void Test_324_03()
+        {
+        }
+
+        [Fact]
+        public void Test_324_04()
+        {
+        }
+
+        [Fact]
+        public void Test_324_05()
+        {
+        }
+
+        [Fact]
+        public void Test_324_06()
+        {
+        }
+
+        [Fact]
+        public void Test_324_07()
+        {
+        }
+
+        [Fact]
+        public void Test_324_08()
+        {
+        }
+
+        [Fact]
+        public void Test_324_09()
+        {
+        }
+
+        [Fact]
+        public void Test_324_10()
+        {
+        }
+
+        [Fact]
+        public void Test_324_11()
+        {
+        }
+
+        [Fact]
+        public void Test_324_12()
+        {
+        }
+
+        [Fact]
+        public void Test_324_13()
+        {
+        }
+
+        [Fact]
+        public void Test_324_14()
+        {
+        }
+
+        [Fact]
+        public void Test_324_15()
+        {
+        }
+
+        [Fact]
+        public void Test_324_16()
+        {
+        }
+
+        [Fact]
+        public void Test_324_17()
+        {
+        }
+
+        [Fact]
+        public void Test_324_18()
+        {
+        }
+
+        [Fact]
+        public void Test_324_19()
+        {
+        }
+
+        [Fact]
+        public void Test_324_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_325
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_325_01()
+        {
+        }
+
+        [Fact]
+        public void Test_325_02()
+        {
+        }
+
+        [Fact]
+        public void Test_325_03()
+        {
+        }
+
+        [Fact]
+        public void Test_325_04()
+        {
+        }
+
+        [Fact]
+        public void Test_325_05()
+        {
+        }
+
+        [Fact]
+        public void Test_325_06()
+        {
+        }
+
+        [Fact]
+        public void Test_325_07()
+        {
+        }
+
+        [Fact]
+        public void Test_325_08()
+        {
+        }
+
+        [Fact]
+        public void Test_325_09()
+        {
+        }
+
+        [Fact]
+        public void Test_325_10()
+        {
+        }
+
+        [Fact]
+        public void Test_325_11()
+        {
+        }
+
+        [Fact]
+        public void Test_325_12()
+        {
+        }
+
+        [Fact]
+        public void Test_325_13()
+        {
+        }
+
+        [Fact]
+        public void Test_325_14()
+        {
+        }
+
+        [Fact]
+        public void Test_325_15()
+        {
+        }
+
+        [Fact]
+        public void Test_325_16()
+        {
+        }
+
+        [Fact]
+        public void Test_325_17()
+        {
+        }
+
+        [Fact]
+        public void Test_325_18()
+        {
+        }
+
+        [Fact]
+        public void Test_325_19()
+        {
+        }
+
+        [Fact]
+        public void Test_325_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_326
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_326_01()
+        {
+        }
+
+        [Fact]
+        public void Test_326_02()
+        {
+        }
+
+        [Fact]
+        public void Test_326_03()
+        {
+        }
+
+        [Fact]
+        public void Test_326_04()
+        {
+        }
+
+        [Fact]
+        public void Test_326_05()
+        {
+        }
+
+        [Fact]
+        public void Test_326_06()
+        {
+        }
+
+        [Fact]
+        public void Test_326_07()
+        {
+        }
+
+        [Fact]
+        public void Test_326_08()
+        {
+        }
+
+        [Fact]
+        public void Test_326_09()
+        {
+        }
+
+        [Fact]
+        public void Test_326_10()
+        {
+        }
+
+        [Fact]
+        public void Test_326_11()
+        {
+        }
+
+        [Fact]
+        public void Test_326_12()
+        {
+        }
+
+        [Fact]
+        public void Test_326_13()
+        {
+        }
+
+        [Fact]
+        public void Test_326_14()
+        {
+        }
+
+        [Fact]
+        public void Test_326_15()
+        {
+        }
+
+        [Fact]
+        public void Test_326_16()
+        {
+        }
+
+        [Fact]
+        public void Test_326_17()
+        {
+        }
+
+        [Fact]
+        public void Test_326_18()
+        {
+        }
+
+        [Fact]
+        public void Test_326_19()
+        {
+        }
+
+        [Fact]
+        public void Test_326_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_327
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_327_01()
+        {
+        }
+
+        [Fact]
+        public void Test_327_02()
+        {
+        }
+
+        [Fact]
+        public void Test_327_03()
+        {
+        }
+
+        [Fact]
+        public void Test_327_04()
+        {
+        }
+
+        [Fact]
+        public void Test_327_05()
+        {
+        }
+
+        [Fact]
+        public void Test_327_06()
+        {
+        }
+
+        [Fact]
+        public void Test_327_07()
+        {
+        }
+
+        [Fact]
+        public void Test_327_08()
+        {
+        }
+
+        [Fact]
+        public void Test_327_09()
+        {
+        }
+
+        [Fact]
+        public void Test_327_10()
+        {
+        }
+
+        [Fact]
+        public void Test_327_11()
+        {
+        }
+
+        [Fact]
+        public void Test_327_12()
+        {
+        }
+
+        [Fact]
+        public void Test_327_13()
+        {
+        }
+
+        [Fact]
+        public void Test_327_14()
+        {
+        }
+
+        [Fact]
+        public void Test_327_15()
+        {
+        }
+
+        [Fact]
+        public void Test_327_16()
+        {
+        }
+
+        [Fact]
+        public void Test_327_17()
+        {
+        }
+
+        [Fact]
+        public void Test_327_18()
+        {
+        }
+
+        [Fact]
+        public void Test_327_19()
+        {
+        }
+
+        [Fact]
+        public void Test_327_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_328
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_328_01()
+        {
+        }
+
+        [Fact]
+        public void Test_328_02()
+        {
+        }
+
+        [Fact]
+        public void Test_328_03()
+        {
+        }
+
+        [Fact]
+        public void Test_328_04()
+        {
+        }
+
+        [Fact]
+        public void Test_328_05()
+        {
+        }
+
+        [Fact]
+        public void Test_328_06()
+        {
+        }
+
+        [Fact]
+        public void Test_328_07()
+        {
+        }
+
+        [Fact]
+        public void Test_328_08()
+        {
+        }
+
+        [Fact]
+        public void Test_328_09()
+        {
+        }
+
+        [Fact]
+        public void Test_328_10()
+        {
+        }
+
+        [Fact]
+        public void Test_328_11()
+        {
+        }
+
+        [Fact]
+        public void Test_328_12()
+        {
+        }
+
+        [Fact]
+        public void Test_328_13()
+        {
+        }
+
+        [Fact]
+        public void Test_328_14()
+        {
+        }
+
+        [Fact]
+        public void Test_328_15()
+        {
+        }
+
+        [Fact]
+        public void Test_328_16()
+        {
+        }
+
+        [Fact]
+        public void Test_328_17()
+        {
+        }
+
+        [Fact]
+        public void Test_328_18()
+        {
+        }
+
+        [Fact]
+        public void Test_328_19()
+        {
+        }
+
+        [Fact]
+        public void Test_328_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_329
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_329_01()
+        {
+        }
+
+        [Fact]
+        public void Test_329_02()
+        {
+        }
+
+        [Fact]
+        public void Test_329_03()
+        {
+        }
+
+        [Fact]
+        public void Test_329_04()
+        {
+        }
+
+        [Fact]
+        public void Test_329_05()
+        {
+        }
+
+        [Fact]
+        public void Test_329_06()
+        {
+        }
+
+        [Fact]
+        public void Test_329_07()
+        {
+        }
+
+        [Fact]
+        public void Test_329_08()
+        {
+        }
+
+        [Fact]
+        public void Test_329_09()
+        {
+        }
+
+        [Fact]
+        public void Test_329_10()
+        {
+        }
+
+        [Fact]
+        public void Test_329_11()
+        {
+        }
+
+        [Fact]
+        public void Test_329_12()
+        {
+        }
+
+        [Fact]
+        public void Test_329_13()
+        {
+        }
+
+        [Fact]
+        public void Test_329_14()
+        {
+        }
+
+        [Fact]
+        public void Test_329_15()
+        {
+        }
+
+        [Fact]
+        public void Test_329_16()
+        {
+        }
+
+        [Fact]
+        public void Test_329_17()
+        {
+        }
+
+        [Fact]
+        public void Test_329_18()
+        {
+        }
+
+        [Fact]
+        public void Test_329_19()
+        {
+        }
+
+        [Fact]
+        public void Test_329_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_330
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_330_01()
+        {
+        }
+
+        [Fact]
+        public void Test_330_02()
+        {
+        }
+
+        [Fact]
+        public void Test_330_03()
+        {
+        }
+
+        [Fact]
+        public void Test_330_04()
+        {
+        }
+
+        [Fact]
+        public void Test_330_05()
+        {
+        }
+
+        [Fact]
+        public void Test_330_06()
+        {
+        }
+
+        [Fact]
+        public void Test_330_07()
+        {
+        }
+
+        [Fact]
+        public void Test_330_08()
+        {
+        }
+
+        [Fact]
+        public void Test_330_09()
+        {
+        }
+
+        [Fact]
+        public void Test_330_10()
+        {
+        }
+
+        [Fact]
+        public void Test_330_11()
+        {
+        }
+
+        [Fact]
+        public void Test_330_12()
+        {
+        }
+
+        [Fact]
+        public void Test_330_13()
+        {
+        }
+
+        [Fact]
+        public void Test_330_14()
+        {
+        }
+
+        [Fact]
+        public void Test_330_15()
+        {
+        }
+
+        [Fact]
+        public void Test_330_16()
+        {
+        }
+
+        [Fact]
+        public void Test_330_17()
+        {
+        }
+
+        [Fact]
+        public void Test_330_18()
+        {
+        }
+
+        [Fact]
+        public void Test_330_19()
+        {
+        }
+
+        [Fact]
+        public void Test_330_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_331
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_331_01()
+        {
+        }
+
+        [Fact]
+        public void Test_331_02()
+        {
+        }
+
+        [Fact]
+        public void Test_331_03()
+        {
+        }
+
+        [Fact]
+        public void Test_331_04()
+        {
+        }
+
+        [Fact]
+        public void Test_331_05()
+        {
+        }
+
+        [Fact]
+        public void Test_331_06()
+        {
+        }
+
+        [Fact]
+        public void Test_331_07()
+        {
+        }
+
+        [Fact]
+        public void Test_331_08()
+        {
+        }
+
+        [Fact]
+        public void Test_331_09()
+        {
+        }
+
+        [Fact]
+        public void Test_331_10()
+        {
+        }
+
+        [Fact]
+        public void Test_331_11()
+        {
+        }
+
+        [Fact]
+        public void Test_331_12()
+        {
+        }
+
+        [Fact]
+        public void Test_331_13()
+        {
+        }
+
+        [Fact]
+        public void Test_331_14()
+        {
+        }
+
+        [Fact]
+        public void Test_331_15()
+        {
+        }
+
+        [Fact]
+        public void Test_331_16()
+        {
+        }
+
+        [Fact]
+        public void Test_331_17()
+        {
+        }
+
+        [Fact]
+        public void Test_331_18()
+        {
+        }
+
+        [Fact]
+        public void Test_331_19()
+        {
+        }
+
+        [Fact]
+        public void Test_331_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_332
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_332_01()
+        {
+        }
+
+        [Fact]
+        public void Test_332_02()
+        {
+        }
+
+        [Fact]
+        public void Test_332_03()
+        {
+        }
+
+        [Fact]
+        public void Test_332_04()
+        {
+        }
+
+        [Fact]
+        public void Test_332_05()
+        {
+        }
+
+        [Fact]
+        public void Test_332_06()
+        {
+        }
+
+        [Fact]
+        public void Test_332_07()
+        {
+        }
+
+        [Fact]
+        public void Test_332_08()
+        {
+        }
+
+        [Fact]
+        public void Test_332_09()
+        {
+        }
+
+        [Fact]
+        public void Test_332_10()
+        {
+        }
+
+        [Fact]
+        public void Test_332_11()
+        {
+        }
+
+        [Fact]
+        public void Test_332_12()
+        {
+        }
+
+        [Fact]
+        public void Test_332_13()
+        {
+        }
+
+        [Fact]
+        public void Test_332_14()
+        {
+        }
+
+        [Fact]
+        public void Test_332_15()
+        {
+        }
+
+        [Fact]
+        public void Test_332_16()
+        {
+        }
+
+        [Fact]
+        public void Test_332_17()
+        {
+        }
+
+        [Fact]
+        public void Test_332_18()
+        {
+        }
+
+        [Fact]
+        public void Test_332_19()
+        {
+        }
+
+        [Fact]
+        public void Test_332_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_333
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_333_01()
+        {
+        }
+
+        [Fact]
+        public void Test_333_02()
+        {
+        }
+
+        [Fact]
+        public void Test_333_03()
+        {
+        }
+
+        [Fact]
+        public void Test_333_04()
+        {
+        }
+
+        [Fact]
+        public void Test_333_05()
+        {
+        }
+
+        [Fact]
+        public void Test_333_06()
+        {
+        }
+
+        [Fact]
+        public void Test_333_07()
+        {
+        }
+
+        [Fact]
+        public void Test_333_08()
+        {
+        }
+
+        [Fact]
+        public void Test_333_09()
+        {
+        }
+
+        [Fact]
+        public void Test_333_10()
+        {
+        }
+
+        [Fact]
+        public void Test_333_11()
+        {
+        }
+
+        [Fact]
+        public void Test_333_12()
+        {
+        }
+
+        [Fact]
+        public void Test_333_13()
+        {
+        }
+
+        [Fact]
+        public void Test_333_14()
+        {
+        }
+
+        [Fact]
+        public void Test_333_15()
+        {
+        }
+
+        [Fact]
+        public void Test_333_16()
+        {
+        }
+
+        [Fact]
+        public void Test_333_17()
+        {
+        }
+
+        [Fact]
+        public void Test_333_18()
+        {
+        }
+
+        [Fact]
+        public void Test_333_19()
+        {
+        }
+
+        [Fact]
+        public void Test_333_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_334
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_334_01()
+        {
+        }
+
+        [Fact]
+        public void Test_334_02()
+        {
+        }
+
+        [Fact]
+        public void Test_334_03()
+        {
+        }
+
+        [Fact]
+        public void Test_334_04()
+        {
+        }
+
+        [Fact]
+        public void Test_334_05()
+        {
+        }
+
+        [Fact]
+        public void Test_334_06()
+        {
+        }
+
+        [Fact]
+        public void Test_334_07()
+        {
+        }
+
+        [Fact]
+        public void Test_334_08()
+        {
+        }
+
+        [Fact]
+        public void Test_334_09()
+        {
+        }
+
+        [Fact]
+        public void Test_334_10()
+        {
+        }
+
+        [Fact]
+        public void Test_334_11()
+        {
+        }
+
+        [Fact]
+        public void Test_334_12()
+        {
+        }
+
+        [Fact]
+        public void Test_334_13()
+        {
+        }
+
+        [Fact]
+        public void Test_334_14()
+        {
+        }
+
+        [Fact]
+        public void Test_334_15()
+        {
+        }
+
+        [Fact]
+        public void Test_334_16()
+        {
+        }
+
+        [Fact]
+        public void Test_334_17()
+        {
+        }
+
+        [Fact]
+        public void Test_334_18()
+        {
+        }
+
+        [Fact]
+        public void Test_334_19()
+        {
+        }
+
+        [Fact]
+        public void Test_334_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_335
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_335_01()
+        {
+        }
+
+        [Fact]
+        public void Test_335_02()
+        {
+        }
+
+        [Fact]
+        public void Test_335_03()
+        {
+        }
+
+        [Fact]
+        public void Test_335_04()
+        {
+        }
+
+        [Fact]
+        public void Test_335_05()
+        {
+        }
+
+        [Fact]
+        public void Test_335_06()
+        {
+        }
+
+        [Fact]
+        public void Test_335_07()
+        {
+        }
+
+        [Fact]
+        public void Test_335_08()
+        {
+        }
+
+        [Fact]
+        public void Test_335_09()
+        {
+        }
+
+        [Fact]
+        public void Test_335_10()
+        {
+        }
+
+        [Fact]
+        public void Test_335_11()
+        {
+        }
+
+        [Fact]
+        public void Test_335_12()
+        {
+        }
+
+        [Fact]
+        public void Test_335_13()
+        {
+        }
+
+        [Fact]
+        public void Test_335_14()
+        {
+        }
+
+        [Fact]
+        public void Test_335_15()
+        {
+        }
+
+        [Fact]
+        public void Test_335_16()
+        {
+        }
+
+        [Fact]
+        public void Test_335_17()
+        {
+        }
+
+        [Fact]
+        public void Test_335_18()
+        {
+        }
+
+        [Fact]
+        public void Test_335_19()
+        {
+        }
+
+        [Fact]
+        public void Test_335_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_336
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_336_01()
+        {
+        }
+
+        [Fact]
+        public void Test_336_02()
+        {
+        }
+
+        [Fact]
+        public void Test_336_03()
+        {
+        }
+
+        [Fact]
+        public void Test_336_04()
+        {
+        }
+
+        [Fact]
+        public void Test_336_05()
+        {
+        }
+
+        [Fact]
+        public void Test_336_06()
+        {
+        }
+
+        [Fact]
+        public void Test_336_07()
+        {
+        }
+
+        [Fact]
+        public void Test_336_08()
+        {
+        }
+
+        [Fact]
+        public void Test_336_09()
+        {
+        }
+
+        [Fact]
+        public void Test_336_10()
+        {
+        }
+
+        [Fact]
+        public void Test_336_11()
+        {
+        }
+
+        [Fact]
+        public void Test_336_12()
+        {
+        }
+
+        [Fact]
+        public void Test_336_13()
+        {
+        }
+
+        [Fact]
+        public void Test_336_14()
+        {
+        }
+
+        [Fact]
+        public void Test_336_15()
+        {
+        }
+
+        [Fact]
+        public void Test_336_16()
+        {
+        }
+
+        [Fact]
+        public void Test_336_17()
+        {
+        }
+
+        [Fact]
+        public void Test_336_18()
+        {
+        }
+
+        [Fact]
+        public void Test_336_19()
+        {
+        }
+
+        [Fact]
+        public void Test_336_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_337
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_337_01()
+        {
+        }
+
+        [Fact]
+        public void Test_337_02()
+        {
+        }
+
+        [Fact]
+        public void Test_337_03()
+        {
+        }
+
+        [Fact]
+        public void Test_337_04()
+        {
+        }
+
+        [Fact]
+        public void Test_337_05()
+        {
+        }
+
+        [Fact]
+        public void Test_337_06()
+        {
+        }
+
+        [Fact]
+        public void Test_337_07()
+        {
+        }
+
+        [Fact]
+        public void Test_337_08()
+        {
+        }
+
+        [Fact]
+        public void Test_337_09()
+        {
+        }
+
+        [Fact]
+        public void Test_337_10()
+        {
+        }
+
+        [Fact]
+        public void Test_337_11()
+        {
+        }
+
+        [Fact]
+        public void Test_337_12()
+        {
+        }
+
+        [Fact]
+        public void Test_337_13()
+        {
+        }
+
+        [Fact]
+        public void Test_337_14()
+        {
+        }
+
+        [Fact]
+        public void Test_337_15()
+        {
+        }
+
+        [Fact]
+        public void Test_337_16()
+        {
+        }
+
+        [Fact]
+        public void Test_337_17()
+        {
+        }
+
+        [Fact]
+        public void Test_337_18()
+        {
+        }
+
+        [Fact]
+        public void Test_337_19()
+        {
+        }
+
+        [Fact]
+        public void Test_337_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_338
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_338_01()
+        {
+        }
+
+        [Fact]
+        public void Test_338_02()
+        {
+        }
+
+        [Fact]
+        public void Test_338_03()
+        {
+        }
+
+        [Fact]
+        public void Test_338_04()
+        {
+        }
+
+        [Fact]
+        public void Test_338_05()
+        {
+        }
+
+        [Fact]
+        public void Test_338_06()
+        {
+        }
+
+        [Fact]
+        public void Test_338_07()
+        {
+        }
+
+        [Fact]
+        public void Test_338_08()
+        {
+        }
+
+        [Fact]
+        public void Test_338_09()
+        {
+        }
+
+        [Fact]
+        public void Test_338_10()
+        {
+        }
+
+        [Fact]
+        public void Test_338_11()
+        {
+        }
+
+        [Fact]
+        public void Test_338_12()
+        {
+        }
+
+        [Fact]
+        public void Test_338_13()
+        {
+        }
+
+        [Fact]
+        public void Test_338_14()
+        {
+        }
+
+        [Fact]
+        public void Test_338_15()
+        {
+        }
+
+        [Fact]
+        public void Test_338_16()
+        {
+        }
+
+        [Fact]
+        public void Test_338_17()
+        {
+        }
+
+        [Fact]
+        public void Test_338_18()
+        {
+        }
+
+        [Fact]
+        public void Test_338_19()
+        {
+        }
+
+        [Fact]
+        public void Test_338_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_339
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_339_01()
+        {
+        }
+
+        [Fact]
+        public void Test_339_02()
+        {
+        }
+
+        [Fact]
+        public void Test_339_03()
+        {
+        }
+
+        [Fact]
+        public void Test_339_04()
+        {
+        }
+
+        [Fact]
+        public void Test_339_05()
+        {
+        }
+
+        [Fact]
+        public void Test_339_06()
+        {
+        }
+
+        [Fact]
+        public void Test_339_07()
+        {
+        }
+
+        [Fact]
+        public void Test_339_08()
+        {
+        }
+
+        [Fact]
+        public void Test_339_09()
+        {
+        }
+
+        [Fact]
+        public void Test_339_10()
+        {
+        }
+
+        [Fact]
+        public void Test_339_11()
+        {
+        }
+
+        [Fact]
+        public void Test_339_12()
+        {
+        }
+
+        [Fact]
+        public void Test_339_13()
+        {
+        }
+
+        [Fact]
+        public void Test_339_14()
+        {
+        }
+
+        [Fact]
+        public void Test_339_15()
+        {
+        }
+
+        [Fact]
+        public void Test_339_16()
+        {
+        }
+
+        [Fact]
+        public void Test_339_17()
+        {
+        }
+
+        [Fact]
+        public void Test_339_18()
+        {
+        }
+
+        [Fact]
+        public void Test_339_19()
+        {
+        }
+
+        [Fact]
+        public void Test_339_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_340
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_340_01()
+        {
+        }
+
+        [Fact]
+        public void Test_340_02()
+        {
+        }
+
+        [Fact]
+        public void Test_340_03()
+        {
+        }
+
+        [Fact]
+        public void Test_340_04()
+        {
+        }
+
+        [Fact]
+        public void Test_340_05()
+        {
+        }
+
+        [Fact]
+        public void Test_340_06()
+        {
+        }
+
+        [Fact]
+        public void Test_340_07()
+        {
+        }
+
+        [Fact]
+        public void Test_340_08()
+        {
+        }
+
+        [Fact]
+        public void Test_340_09()
+        {
+        }
+
+        [Fact]
+        public void Test_340_10()
+        {
+        }
+
+        [Fact]
+        public void Test_340_11()
+        {
+        }
+
+        [Fact]
+        public void Test_340_12()
+        {
+        }
+
+        [Fact]
+        public void Test_340_13()
+        {
+        }
+
+        [Fact]
+        public void Test_340_14()
+        {
+        }
+
+        [Fact]
+        public void Test_340_15()
+        {
+        }
+
+        [Fact]
+        public void Test_340_16()
+        {
+        }
+
+        [Fact]
+        public void Test_340_17()
+        {
+        }
+
+        [Fact]
+        public void Test_340_18()
+        {
+        }
+
+        [Fact]
+        public void Test_340_19()
+        {
+        }
+
+        [Fact]
+        public void Test_340_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_341
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_341_01()
+        {
+        }
+
+        [Fact]
+        public void Test_341_02()
+        {
+        }
+
+        [Fact]
+        public void Test_341_03()
+        {
+        }
+
+        [Fact]
+        public void Test_341_04()
+        {
+        }
+
+        [Fact]
+        public void Test_341_05()
+        {
+        }
+
+        [Fact]
+        public void Test_341_06()
+        {
+        }
+
+        [Fact]
+        public void Test_341_07()
+        {
+        }
+
+        [Fact]
+        public void Test_341_08()
+        {
+        }
+
+        [Fact]
+        public void Test_341_09()
+        {
+        }
+
+        [Fact]
+        public void Test_341_10()
+        {
+        }
+
+        [Fact]
+        public void Test_341_11()
+        {
+        }
+
+        [Fact]
+        public void Test_341_12()
+        {
+        }
+
+        [Fact]
+        public void Test_341_13()
+        {
+        }
+
+        [Fact]
+        public void Test_341_14()
+        {
+        }
+
+        [Fact]
+        public void Test_341_15()
+        {
+        }
+
+        [Fact]
+        public void Test_341_16()
+        {
+        }
+
+        [Fact]
+        public void Test_341_17()
+        {
+        }
+
+        [Fact]
+        public void Test_341_18()
+        {
+        }
+
+        [Fact]
+        public void Test_341_19()
+        {
+        }
+
+        [Fact]
+        public void Test_341_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_342
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_342_01()
+        {
+        }
+
+        [Fact]
+        public void Test_342_02()
+        {
+        }
+
+        [Fact]
+        public void Test_342_03()
+        {
+        }
+
+        [Fact]
+        public void Test_342_04()
+        {
+        }
+
+        [Fact]
+        public void Test_342_05()
+        {
+        }
+
+        [Fact]
+        public void Test_342_06()
+        {
+        }
+
+        [Fact]
+        public void Test_342_07()
+        {
+        }
+
+        [Fact]
+        public void Test_342_08()
+        {
+        }
+
+        [Fact]
+        public void Test_342_09()
+        {
+        }
+
+        [Fact]
+        public void Test_342_10()
+        {
+        }
+
+        [Fact]
+        public void Test_342_11()
+        {
+        }
+
+        [Fact]
+        public void Test_342_12()
+        {
+        }
+
+        [Fact]
+        public void Test_342_13()
+        {
+        }
+
+        [Fact]
+        public void Test_342_14()
+        {
+        }
+
+        [Fact]
+        public void Test_342_15()
+        {
+        }
+
+        [Fact]
+        public void Test_342_16()
+        {
+        }
+
+        [Fact]
+        public void Test_342_17()
+        {
+        }
+
+        [Fact]
+        public void Test_342_18()
+        {
+        }
+
+        [Fact]
+        public void Test_342_19()
+        {
+        }
+
+        [Fact]
+        public void Test_342_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_343
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_343_01()
+        {
+        }
+
+        [Fact]
+        public void Test_343_02()
+        {
+        }
+
+        [Fact]
+        public void Test_343_03()
+        {
+        }
+
+        [Fact]
+        public void Test_343_04()
+        {
+        }
+
+        [Fact]
+        public void Test_343_05()
+        {
+        }
+
+        [Fact]
+        public void Test_343_06()
+        {
+        }
+
+        [Fact]
+        public void Test_343_07()
+        {
+        }
+
+        [Fact]
+        public void Test_343_08()
+        {
+        }
+
+        [Fact]
+        public void Test_343_09()
+        {
+        }
+
+        [Fact]
+        public void Test_343_10()
+        {
+        }
+
+        [Fact]
+        public void Test_343_11()
+        {
+        }
+
+        [Fact]
+        public void Test_343_12()
+        {
+        }
+
+        [Fact]
+        public void Test_343_13()
+        {
+        }
+
+        [Fact]
+        public void Test_343_14()
+        {
+        }
+
+        [Fact]
+        public void Test_343_15()
+        {
+        }
+
+        [Fact]
+        public void Test_343_16()
+        {
+        }
+
+        [Fact]
+        public void Test_343_17()
+        {
+        }
+
+        [Fact]
+        public void Test_343_18()
+        {
+        }
+
+        [Fact]
+        public void Test_343_19()
+        {
+        }
+
+        [Fact]
+        public void Test_343_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_344
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_344_01()
+        {
+        }
+
+        [Fact]
+        public void Test_344_02()
+        {
+        }
+
+        [Fact]
+        public void Test_344_03()
+        {
+        }
+
+        [Fact]
+        public void Test_344_04()
+        {
+        }
+
+        [Fact]
+        public void Test_344_05()
+        {
+        }
+
+        [Fact]
+        public void Test_344_06()
+        {
+        }
+
+        [Fact]
+        public void Test_344_07()
+        {
+        }
+
+        [Fact]
+        public void Test_344_08()
+        {
+        }
+
+        [Fact]
+        public void Test_344_09()
+        {
+        }
+
+        [Fact]
+        public void Test_344_10()
+        {
+        }
+
+        [Fact]
+        public void Test_344_11()
+        {
+        }
+
+        [Fact]
+        public void Test_344_12()
+        {
+        }
+
+        [Fact]
+        public void Test_344_13()
+        {
+        }
+
+        [Fact]
+        public void Test_344_14()
+        {
+        }
+
+        [Fact]
+        public void Test_344_15()
+        {
+        }
+
+        [Fact]
+        public void Test_344_16()
+        {
+        }
+
+        [Fact]
+        public void Test_344_17()
+        {
+        }
+
+        [Fact]
+        public void Test_344_18()
+        {
+        }
+
+        [Fact]
+        public void Test_344_19()
+        {
+        }
+
+        [Fact]
+        public void Test_344_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_345
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_345_01()
+        {
+        }
+
+        [Fact]
+        public void Test_345_02()
+        {
+        }
+
+        [Fact]
+        public void Test_345_03()
+        {
+        }
+
+        [Fact]
+        public void Test_345_04()
+        {
+        }
+
+        [Fact]
+        public void Test_345_05()
+        {
+        }
+
+        [Fact]
+        public void Test_345_06()
+        {
+        }
+
+        [Fact]
+        public void Test_345_07()
+        {
+        }
+
+        [Fact]
+        public void Test_345_08()
+        {
+        }
+
+        [Fact]
+        public void Test_345_09()
+        {
+        }
+
+        [Fact]
+        public void Test_345_10()
+        {
+        }
+
+        [Fact]
+        public void Test_345_11()
+        {
+        }
+
+        [Fact]
+        public void Test_345_12()
+        {
+        }
+
+        [Fact]
+        public void Test_345_13()
+        {
+        }
+
+        [Fact]
+        public void Test_345_14()
+        {
+        }
+
+        [Fact]
+        public void Test_345_15()
+        {
+        }
+
+        [Fact]
+        public void Test_345_16()
+        {
+        }
+
+        [Fact]
+        public void Test_345_17()
+        {
+        }
+
+        [Fact]
+        public void Test_345_18()
+        {
+        }
+
+        [Fact]
+        public void Test_345_19()
+        {
+        }
+
+        [Fact]
+        public void Test_345_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_346
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_346_01()
+        {
+        }
+
+        [Fact]
+        public void Test_346_02()
+        {
+        }
+
+        [Fact]
+        public void Test_346_03()
+        {
+        }
+
+        [Fact]
+        public void Test_346_04()
+        {
+        }
+
+        [Fact]
+        public void Test_346_05()
+        {
+        }
+
+        [Fact]
+        public void Test_346_06()
+        {
+        }
+
+        [Fact]
+        public void Test_346_07()
+        {
+        }
+
+        [Fact]
+        public void Test_346_08()
+        {
+        }
+
+        [Fact]
+        public void Test_346_09()
+        {
+        }
+
+        [Fact]
+        public void Test_346_10()
+        {
+        }
+
+        [Fact]
+        public void Test_346_11()
+        {
+        }
+
+        [Fact]
+        public void Test_346_12()
+        {
+        }
+
+        [Fact]
+        public void Test_346_13()
+        {
+        }
+
+        [Fact]
+        public void Test_346_14()
+        {
+        }
+
+        [Fact]
+        public void Test_346_15()
+        {
+        }
+
+        [Fact]
+        public void Test_346_16()
+        {
+        }
+
+        [Fact]
+        public void Test_346_17()
+        {
+        }
+
+        [Fact]
+        public void Test_346_18()
+        {
+        }
+
+        [Fact]
+        public void Test_346_19()
+        {
+        }
+
+        [Fact]
+        public void Test_346_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_347
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_347_01()
+        {
+        }
+
+        [Fact]
+        public void Test_347_02()
+        {
+        }
+
+        [Fact]
+        public void Test_347_03()
+        {
+        }
+
+        [Fact]
+        public void Test_347_04()
+        {
+        }
+
+        [Fact]
+        public void Test_347_05()
+        {
+        }
+
+        [Fact]
+        public void Test_347_06()
+        {
+        }
+
+        [Fact]
+        public void Test_347_07()
+        {
+        }
+
+        [Fact]
+        public void Test_347_08()
+        {
+        }
+
+        [Fact]
+        public void Test_347_09()
+        {
+        }
+
+        [Fact]
+        public void Test_347_10()
+        {
+        }
+
+        [Fact]
+        public void Test_347_11()
+        {
+        }
+
+        [Fact]
+        public void Test_347_12()
+        {
+        }
+
+        [Fact]
+        public void Test_347_13()
+        {
+        }
+
+        [Fact]
+        public void Test_347_14()
+        {
+        }
+
+        [Fact]
+        public void Test_347_15()
+        {
+        }
+
+        [Fact]
+        public void Test_347_16()
+        {
+        }
+
+        [Fact]
+        public void Test_347_17()
+        {
+        }
+
+        [Fact]
+        public void Test_347_18()
+        {
+        }
+
+        [Fact]
+        public void Test_347_19()
+        {
+        }
+
+        [Fact]
+        public void Test_347_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_348
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_348_01()
+        {
+        }
+
+        [Fact]
+        public void Test_348_02()
+        {
+        }
+
+        [Fact]
+        public void Test_348_03()
+        {
+        }
+
+        [Fact]
+        public void Test_348_04()
+        {
+        }
+
+        [Fact]
+        public void Test_348_05()
+        {
+        }
+
+        [Fact]
+        public void Test_348_06()
+        {
+        }
+
+        [Fact]
+        public void Test_348_07()
+        {
+        }
+
+        [Fact]
+        public void Test_348_08()
+        {
+        }
+
+        [Fact]
+        public void Test_348_09()
+        {
+        }
+
+        [Fact]
+        public void Test_348_10()
+        {
+        }
+
+        [Fact]
+        public void Test_348_11()
+        {
+        }
+
+        [Fact]
+        public void Test_348_12()
+        {
+        }
+
+        [Fact]
+        public void Test_348_13()
+        {
+        }
+
+        [Fact]
+        public void Test_348_14()
+        {
+        }
+
+        [Fact]
+        public void Test_348_15()
+        {
+        }
+
+        [Fact]
+        public void Test_348_16()
+        {
+        }
+
+        [Fact]
+        public void Test_348_17()
+        {
+        }
+
+        [Fact]
+        public void Test_348_18()
+        {
+        }
+
+        [Fact]
+        public void Test_348_19()
+        {
+        }
+
+        [Fact]
+        public void Test_348_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_349
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_349_01()
+        {
+        }
+
+        [Fact]
+        public void Test_349_02()
+        {
+        }
+
+        [Fact]
+        public void Test_349_03()
+        {
+        }
+
+        [Fact]
+        public void Test_349_04()
+        {
+        }
+
+        [Fact]
+        public void Test_349_05()
+        {
+        }
+
+        [Fact]
+        public void Test_349_06()
+        {
+        }
+
+        [Fact]
+        public void Test_349_07()
+        {
+        }
+
+        [Fact]
+        public void Test_349_08()
+        {
+        }
+
+        [Fact]
+        public void Test_349_09()
+        {
+        }
+
+        [Fact]
+        public void Test_349_10()
+        {
+        }
+
+        [Fact]
+        public void Test_349_11()
+        {
+        }
+
+        [Fact]
+        public void Test_349_12()
+        {
+        }
+
+        [Fact]
+        public void Test_349_13()
+        {
+        }
+
+        [Fact]
+        public void Test_349_14()
+        {
+        }
+
+        [Fact]
+        public void Test_349_15()
+        {
+        }
+
+        [Fact]
+        public void Test_349_16()
+        {
+        }
+
+        [Fact]
+        public void Test_349_17()
+        {
+        }
+
+        [Fact]
+        public void Test_349_18()
+        {
+        }
+
+        [Fact]
+        public void Test_349_19()
+        {
+        }
+
+        [Fact]
+        public void Test_349_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_350
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_350_01()
+        {
+        }
+
+        [Fact]
+        public void Test_350_02()
+        {
+        }
+
+        [Fact]
+        public void Test_350_03()
+        {
+        }
+
+        [Fact]
+        public void Test_350_04()
+        {
+        }
+
+        [Fact]
+        public void Test_350_05()
+        {
+        }
+
+        [Fact]
+        public void Test_350_06()
+        {
+        }
+
+        [Fact]
+        public void Test_350_07()
+        {
+        }
+
+        [Fact]
+        public void Test_350_08()
+        {
+        }
+
+        [Fact]
+        public void Test_350_09()
+        {
+        }
+
+        [Fact]
+        public void Test_350_10()
+        {
+        }
+
+        [Fact]
+        public void Test_350_11()
+        {
+        }
+
+        [Fact]
+        public void Test_350_12()
+        {
+        }
+
+        [Fact]
+        public void Test_350_13()
+        {
+        }
+
+        [Fact]
+        public void Test_350_14()
+        {
+        }
+
+        [Fact]
+        public void Test_350_15()
+        {
+        }
+
+        [Fact]
+        public void Test_350_16()
+        {
+        }
+
+        [Fact]
+        public void Test_350_17()
+        {
+        }
+
+        [Fact]
+        public void Test_350_18()
+        {
+        }
+
+        [Fact]
+        public void Test_350_19()
+        {
+        }
+
+        [Fact]
+        public void Test_350_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_351
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_351_01()
+        {
+        }
+
+        [Fact]
+        public void Test_351_02()
+        {
+        }
+
+        [Fact]
+        public void Test_351_03()
+        {
+        }
+
+        [Fact]
+        public void Test_351_04()
+        {
+        }
+
+        [Fact]
+        public void Test_351_05()
+        {
+        }
+
+        [Fact]
+        public void Test_351_06()
+        {
+        }
+
+        [Fact]
+        public void Test_351_07()
+        {
+        }
+
+        [Fact]
+        public void Test_351_08()
+        {
+        }
+
+        [Fact]
+        public void Test_351_09()
+        {
+        }
+
+        [Fact]
+        public void Test_351_10()
+        {
+        }
+
+        [Fact]
+        public void Test_351_11()
+        {
+        }
+
+        [Fact]
+        public void Test_351_12()
+        {
+        }
+
+        [Fact]
+        public void Test_351_13()
+        {
+        }
+
+        [Fact]
+        public void Test_351_14()
+        {
+        }
+
+        [Fact]
+        public void Test_351_15()
+        {
+        }
+
+        [Fact]
+        public void Test_351_16()
+        {
+        }
+
+        [Fact]
+        public void Test_351_17()
+        {
+        }
+
+        [Fact]
+        public void Test_351_18()
+        {
+        }
+
+        [Fact]
+        public void Test_351_19()
+        {
+        }
+
+        [Fact]
+        public void Test_351_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_352
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_352_01()
+        {
+        }
+
+        [Fact]
+        public void Test_352_02()
+        {
+        }
+
+        [Fact]
+        public void Test_352_03()
+        {
+        }
+
+        [Fact]
+        public void Test_352_04()
+        {
+        }
+
+        [Fact]
+        public void Test_352_05()
+        {
+        }
+
+        [Fact]
+        public void Test_352_06()
+        {
+        }
+
+        [Fact]
+        public void Test_352_07()
+        {
+        }
+
+        [Fact]
+        public void Test_352_08()
+        {
+        }
+
+        [Fact]
+        public void Test_352_09()
+        {
+        }
+
+        [Fact]
+        public void Test_352_10()
+        {
+        }
+
+        [Fact]
+        public void Test_352_11()
+        {
+        }
+
+        [Fact]
+        public void Test_352_12()
+        {
+        }
+
+        [Fact]
+        public void Test_352_13()
+        {
+        }
+
+        [Fact]
+        public void Test_352_14()
+        {
+        }
+
+        [Fact]
+        public void Test_352_15()
+        {
+        }
+
+        [Fact]
+        public void Test_352_16()
+        {
+        }
+
+        [Fact]
+        public void Test_352_17()
+        {
+        }
+
+        [Fact]
+        public void Test_352_18()
+        {
+        }
+
+        [Fact]
+        public void Test_352_19()
+        {
+        }
+
+        [Fact]
+        public void Test_352_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_353
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_353_01()
+        {
+        }
+
+        [Fact]
+        public void Test_353_02()
+        {
+        }
+
+        [Fact]
+        public void Test_353_03()
+        {
+        }
+
+        [Fact]
+        public void Test_353_04()
+        {
+        }
+
+        [Fact]
+        public void Test_353_05()
+        {
+        }
+
+        [Fact]
+        public void Test_353_06()
+        {
+        }
+
+        [Fact]
+        public void Test_353_07()
+        {
+        }
+
+        [Fact]
+        public void Test_353_08()
+        {
+        }
+
+        [Fact]
+        public void Test_353_09()
+        {
+        }
+
+        [Fact]
+        public void Test_353_10()
+        {
+        }
+
+        [Fact]
+        public void Test_353_11()
+        {
+        }
+
+        [Fact]
+        public void Test_353_12()
+        {
+        }
+
+        [Fact]
+        public void Test_353_13()
+        {
+        }
+
+        [Fact]
+        public void Test_353_14()
+        {
+        }
+
+        [Fact]
+        public void Test_353_15()
+        {
+        }
+
+        [Fact]
+        public void Test_353_16()
+        {
+        }
+
+        [Fact]
+        public void Test_353_17()
+        {
+        }
+
+        [Fact]
+        public void Test_353_18()
+        {
+        }
+
+        [Fact]
+        public void Test_353_19()
+        {
+        }
+
+        [Fact]
+        public void Test_353_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_354
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_354_01()
+        {
+        }
+
+        [Fact]
+        public void Test_354_02()
+        {
+        }
+
+        [Fact]
+        public void Test_354_03()
+        {
+        }
+
+        [Fact]
+        public void Test_354_04()
+        {
+        }
+
+        [Fact]
+        public void Test_354_05()
+        {
+        }
+
+        [Fact]
+        public void Test_354_06()
+        {
+        }
+
+        [Fact]
+        public void Test_354_07()
+        {
+        }
+
+        [Fact]
+        public void Test_354_08()
+        {
+        }
+
+        [Fact]
+        public void Test_354_09()
+        {
+        }
+
+        [Fact]
+        public void Test_354_10()
+        {
+        }
+
+        [Fact]
+        public void Test_354_11()
+        {
+        }
+
+        [Fact]
+        public void Test_354_12()
+        {
+        }
+
+        [Fact]
+        public void Test_354_13()
+        {
+        }
+
+        [Fact]
+        public void Test_354_14()
+        {
+        }
+
+        [Fact]
+        public void Test_354_15()
+        {
+        }
+
+        [Fact]
+        public void Test_354_16()
+        {
+        }
+
+        [Fact]
+        public void Test_354_17()
+        {
+        }
+
+        [Fact]
+        public void Test_354_18()
+        {
+        }
+
+        [Fact]
+        public void Test_354_19()
+        {
+        }
+
+        [Fact]
+        public void Test_354_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_355
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_355_01()
+        {
+        }
+
+        [Fact]
+        public void Test_355_02()
+        {
+        }
+
+        [Fact]
+        public void Test_355_03()
+        {
+        }
+
+        [Fact]
+        public void Test_355_04()
+        {
+        }
+
+        [Fact]
+        public void Test_355_05()
+        {
+        }
+
+        [Fact]
+        public void Test_355_06()
+        {
+        }
+
+        [Fact]
+        public void Test_355_07()
+        {
+        }
+
+        [Fact]
+        public void Test_355_08()
+        {
+        }
+
+        [Fact]
+        public void Test_355_09()
+        {
+        }
+
+        [Fact]
+        public void Test_355_10()
+        {
+        }
+
+        [Fact]
+        public void Test_355_11()
+        {
+        }
+
+        [Fact]
+        public void Test_355_12()
+        {
+        }
+
+        [Fact]
+        public void Test_355_13()
+        {
+        }
+
+        [Fact]
+        public void Test_355_14()
+        {
+        }
+
+        [Fact]
+        public void Test_355_15()
+        {
+        }
+
+        [Fact]
+        public void Test_355_16()
+        {
+        }
+
+        [Fact]
+        public void Test_355_17()
+        {
+        }
+
+        [Fact]
+        public void Test_355_18()
+        {
+        }
+
+        [Fact]
+        public void Test_355_19()
+        {
+        }
+
+        [Fact]
+        public void Test_355_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_356
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_356_01()
+        {
+        }
+
+        [Fact]
+        public void Test_356_02()
+        {
+        }
+
+        [Fact]
+        public void Test_356_03()
+        {
+        }
+
+        [Fact]
+        public void Test_356_04()
+        {
+        }
+
+        [Fact]
+        public void Test_356_05()
+        {
+        }
+
+        [Fact]
+        public void Test_356_06()
+        {
+        }
+
+        [Fact]
+        public void Test_356_07()
+        {
+        }
+
+        [Fact]
+        public void Test_356_08()
+        {
+        }
+
+        [Fact]
+        public void Test_356_09()
+        {
+        }
+
+        [Fact]
+        public void Test_356_10()
+        {
+        }
+
+        [Fact]
+        public void Test_356_11()
+        {
+        }
+
+        [Fact]
+        public void Test_356_12()
+        {
+        }
+
+        [Fact]
+        public void Test_356_13()
+        {
+        }
+
+        [Fact]
+        public void Test_356_14()
+        {
+        }
+
+        [Fact]
+        public void Test_356_15()
+        {
+        }
+
+        [Fact]
+        public void Test_356_16()
+        {
+        }
+
+        [Fact]
+        public void Test_356_17()
+        {
+        }
+
+        [Fact]
+        public void Test_356_18()
+        {
+        }
+
+        [Fact]
+        public void Test_356_19()
+        {
+        }
+
+        [Fact]
+        public void Test_356_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_357
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_357_01()
+        {
+        }
+
+        [Fact]
+        public void Test_357_02()
+        {
+        }
+
+        [Fact]
+        public void Test_357_03()
+        {
+        }
+
+        [Fact]
+        public void Test_357_04()
+        {
+        }
+
+        [Fact]
+        public void Test_357_05()
+        {
+        }
+
+        [Fact]
+        public void Test_357_06()
+        {
+        }
+
+        [Fact]
+        public void Test_357_07()
+        {
+        }
+
+        [Fact]
+        public void Test_357_08()
+        {
+        }
+
+        [Fact]
+        public void Test_357_09()
+        {
+        }
+
+        [Fact]
+        public void Test_357_10()
+        {
+        }
+
+        [Fact]
+        public void Test_357_11()
+        {
+        }
+
+        [Fact]
+        public void Test_357_12()
+        {
+        }
+
+        [Fact]
+        public void Test_357_13()
+        {
+        }
+
+        [Fact]
+        public void Test_357_14()
+        {
+        }
+
+        [Fact]
+        public void Test_357_15()
+        {
+        }
+
+        [Fact]
+        public void Test_357_16()
+        {
+        }
+
+        [Fact]
+        public void Test_357_17()
+        {
+        }
+
+        [Fact]
+        public void Test_357_18()
+        {
+        }
+
+        [Fact]
+        public void Test_357_19()
+        {
+        }
+
+        [Fact]
+        public void Test_357_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_358
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_358_01()
+        {
+        }
+
+        [Fact]
+        public void Test_358_02()
+        {
+        }
+
+        [Fact]
+        public void Test_358_03()
+        {
+        }
+
+        [Fact]
+        public void Test_358_04()
+        {
+        }
+
+        [Fact]
+        public void Test_358_05()
+        {
+        }
+
+        [Fact]
+        public void Test_358_06()
+        {
+        }
+
+        [Fact]
+        public void Test_358_07()
+        {
+        }
+
+        [Fact]
+        public void Test_358_08()
+        {
+        }
+
+        [Fact]
+        public void Test_358_09()
+        {
+        }
+
+        [Fact]
+        public void Test_358_10()
+        {
+        }
+
+        [Fact]
+        public void Test_358_11()
+        {
+        }
+
+        [Fact]
+        public void Test_358_12()
+        {
+        }
+
+        [Fact]
+        public void Test_358_13()
+        {
+        }
+
+        [Fact]
+        public void Test_358_14()
+        {
+        }
+
+        [Fact]
+        public void Test_358_15()
+        {
+        }
+
+        [Fact]
+        public void Test_358_16()
+        {
+        }
+
+        [Fact]
+        public void Test_358_17()
+        {
+        }
+
+        [Fact]
+        public void Test_358_18()
+        {
+        }
+
+        [Fact]
+        public void Test_358_19()
+        {
+        }
+
+        [Fact]
+        public void Test_358_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_359
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_359_01()
+        {
+        }
+
+        [Fact]
+        public void Test_359_02()
+        {
+        }
+
+        [Fact]
+        public void Test_359_03()
+        {
+        }
+
+        [Fact]
+        public void Test_359_04()
+        {
+        }
+
+        [Fact]
+        public void Test_359_05()
+        {
+        }
+
+        [Fact]
+        public void Test_359_06()
+        {
+        }
+
+        [Fact]
+        public void Test_359_07()
+        {
+        }
+
+        [Fact]
+        public void Test_359_08()
+        {
+        }
+
+        [Fact]
+        public void Test_359_09()
+        {
+        }
+
+        [Fact]
+        public void Test_359_10()
+        {
+        }
+
+        [Fact]
+        public void Test_359_11()
+        {
+        }
+
+        [Fact]
+        public void Test_359_12()
+        {
+        }
+
+        [Fact]
+        public void Test_359_13()
+        {
+        }
+
+        [Fact]
+        public void Test_359_14()
+        {
+        }
+
+        [Fact]
+        public void Test_359_15()
+        {
+        }
+
+        [Fact]
+        public void Test_359_16()
+        {
+        }
+
+        [Fact]
+        public void Test_359_17()
+        {
+        }
+
+        [Fact]
+        public void Test_359_18()
+        {
+        }
+
+        [Fact]
+        public void Test_359_19()
+        {
+        }
+
+        [Fact]
+        public void Test_359_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_360
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_360_01()
+        {
+        }
+
+        [Fact]
+        public void Test_360_02()
+        {
+        }
+
+        [Fact]
+        public void Test_360_03()
+        {
+        }
+
+        [Fact]
+        public void Test_360_04()
+        {
+        }
+
+        [Fact]
+        public void Test_360_05()
+        {
+        }
+
+        [Fact]
+        public void Test_360_06()
+        {
+        }
+
+        [Fact]
+        public void Test_360_07()
+        {
+        }
+
+        [Fact]
+        public void Test_360_08()
+        {
+        }
+
+        [Fact]
+        public void Test_360_09()
+        {
+        }
+
+        [Fact]
+        public void Test_360_10()
+        {
+        }
+
+        [Fact]
+        public void Test_360_11()
+        {
+        }
+
+        [Fact]
+        public void Test_360_12()
+        {
+        }
+
+        [Fact]
+        public void Test_360_13()
+        {
+        }
+
+        [Fact]
+        public void Test_360_14()
+        {
+        }
+
+        [Fact]
+        public void Test_360_15()
+        {
+        }
+
+        [Fact]
+        public void Test_360_16()
+        {
+        }
+
+        [Fact]
+        public void Test_360_17()
+        {
+        }
+
+        [Fact]
+        public void Test_360_18()
+        {
+        }
+
+        [Fact]
+        public void Test_360_19()
+        {
+        }
+
+        [Fact]
+        public void Test_360_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_361
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_361_01()
+        {
+        }
+
+        [Fact]
+        public void Test_361_02()
+        {
+        }
+
+        [Fact]
+        public void Test_361_03()
+        {
+        }
+
+        [Fact]
+        public void Test_361_04()
+        {
+        }
+
+        [Fact]
+        public void Test_361_05()
+        {
+        }
+
+        [Fact]
+        public void Test_361_06()
+        {
+        }
+
+        [Fact]
+        public void Test_361_07()
+        {
+        }
+
+        [Fact]
+        public void Test_361_08()
+        {
+        }
+
+        [Fact]
+        public void Test_361_09()
+        {
+        }
+
+        [Fact]
+        public void Test_361_10()
+        {
+        }
+
+        [Fact]
+        public void Test_361_11()
+        {
+        }
+
+        [Fact]
+        public void Test_361_12()
+        {
+        }
+
+        [Fact]
+        public void Test_361_13()
+        {
+        }
+
+        [Fact]
+        public void Test_361_14()
+        {
+        }
+
+        [Fact]
+        public void Test_361_15()
+        {
+        }
+
+        [Fact]
+        public void Test_361_16()
+        {
+        }
+
+        [Fact]
+        public void Test_361_17()
+        {
+        }
+
+        [Fact]
+        public void Test_361_18()
+        {
+        }
+
+        [Fact]
+        public void Test_361_19()
+        {
+        }
+
+        [Fact]
+        public void Test_361_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_362
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_362_01()
+        {
+        }
+
+        [Fact]
+        public void Test_362_02()
+        {
+        }
+
+        [Fact]
+        public void Test_362_03()
+        {
+        }
+
+        [Fact]
+        public void Test_362_04()
+        {
+        }
+
+        [Fact]
+        public void Test_362_05()
+        {
+        }
+
+        [Fact]
+        public void Test_362_06()
+        {
+        }
+
+        [Fact]
+        public void Test_362_07()
+        {
+        }
+
+        [Fact]
+        public void Test_362_08()
+        {
+        }
+
+        [Fact]
+        public void Test_362_09()
+        {
+        }
+
+        [Fact]
+        public void Test_362_10()
+        {
+        }
+
+        [Fact]
+        public void Test_362_11()
+        {
+        }
+
+        [Fact]
+        public void Test_362_12()
+        {
+        }
+
+        [Fact]
+        public void Test_362_13()
+        {
+        }
+
+        [Fact]
+        public void Test_362_14()
+        {
+        }
+
+        [Fact]
+        public void Test_362_15()
+        {
+        }
+
+        [Fact]
+        public void Test_362_16()
+        {
+        }
+
+        [Fact]
+        public void Test_362_17()
+        {
+        }
+
+        [Fact]
+        public void Test_362_18()
+        {
+        }
+
+        [Fact]
+        public void Test_362_19()
+        {
+        }
+
+        [Fact]
+        public void Test_362_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_363
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_363_01()
+        {
+        }
+
+        [Fact]
+        public void Test_363_02()
+        {
+        }
+
+        [Fact]
+        public void Test_363_03()
+        {
+        }
+
+        [Fact]
+        public void Test_363_04()
+        {
+        }
+
+        [Fact]
+        public void Test_363_05()
+        {
+        }
+
+        [Fact]
+        public void Test_363_06()
+        {
+        }
+
+        [Fact]
+        public void Test_363_07()
+        {
+        }
+
+        [Fact]
+        public void Test_363_08()
+        {
+        }
+
+        [Fact]
+        public void Test_363_09()
+        {
+        }
+
+        [Fact]
+        public void Test_363_10()
+        {
+        }
+
+        [Fact]
+        public void Test_363_11()
+        {
+        }
+
+        [Fact]
+        public void Test_363_12()
+        {
+        }
+
+        [Fact]
+        public void Test_363_13()
+        {
+        }
+
+        [Fact]
+        public void Test_363_14()
+        {
+        }
+
+        [Fact]
+        public void Test_363_15()
+        {
+        }
+
+        [Fact]
+        public void Test_363_16()
+        {
+        }
+
+        [Fact]
+        public void Test_363_17()
+        {
+        }
+
+        [Fact]
+        public void Test_363_18()
+        {
+        }
+
+        [Fact]
+        public void Test_363_19()
+        {
+        }
+
+        [Fact]
+        public void Test_363_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_364
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_364_01()
+        {
+        }
+
+        [Fact]
+        public void Test_364_02()
+        {
+        }
+
+        [Fact]
+        public void Test_364_03()
+        {
+        }
+
+        [Fact]
+        public void Test_364_04()
+        {
+        }
+
+        [Fact]
+        public void Test_364_05()
+        {
+        }
+
+        [Fact]
+        public void Test_364_06()
+        {
+        }
+
+        [Fact]
+        public void Test_364_07()
+        {
+        }
+
+        [Fact]
+        public void Test_364_08()
+        {
+        }
+
+        [Fact]
+        public void Test_364_09()
+        {
+        }
+
+        [Fact]
+        public void Test_364_10()
+        {
+        }
+
+        [Fact]
+        public void Test_364_11()
+        {
+        }
+
+        [Fact]
+        public void Test_364_12()
+        {
+        }
+
+        [Fact]
+        public void Test_364_13()
+        {
+        }
+
+        [Fact]
+        public void Test_364_14()
+        {
+        }
+
+        [Fact]
+        public void Test_364_15()
+        {
+        }
+
+        [Fact]
+        public void Test_364_16()
+        {
+        }
+
+        [Fact]
+        public void Test_364_17()
+        {
+        }
+
+        [Fact]
+        public void Test_364_18()
+        {
+        }
+
+        [Fact]
+        public void Test_364_19()
+        {
+        }
+
+        [Fact]
+        public void Test_364_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_365
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_365_01()
+        {
+        }
+
+        [Fact]
+        public void Test_365_02()
+        {
+        }
+
+        [Fact]
+        public void Test_365_03()
+        {
+        }
+
+        [Fact]
+        public void Test_365_04()
+        {
+        }
+
+        [Fact]
+        public void Test_365_05()
+        {
+        }
+
+        [Fact]
+        public void Test_365_06()
+        {
+        }
+
+        [Fact]
+        public void Test_365_07()
+        {
+        }
+
+        [Fact]
+        public void Test_365_08()
+        {
+        }
+
+        [Fact]
+        public void Test_365_09()
+        {
+        }
+
+        [Fact]
+        public void Test_365_10()
+        {
+        }
+
+        [Fact]
+        public void Test_365_11()
+        {
+        }
+
+        [Fact]
+        public void Test_365_12()
+        {
+        }
+
+        [Fact]
+        public void Test_365_13()
+        {
+        }
+
+        [Fact]
+        public void Test_365_14()
+        {
+        }
+
+        [Fact]
+        public void Test_365_15()
+        {
+        }
+
+        [Fact]
+        public void Test_365_16()
+        {
+        }
+
+        [Fact]
+        public void Test_365_17()
+        {
+        }
+
+        [Fact]
+        public void Test_365_18()
+        {
+        }
+
+        [Fact]
+        public void Test_365_19()
+        {
+        }
+
+        [Fact]
+        public void Test_365_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_366
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_366_01()
+        {
+        }
+
+        [Fact]
+        public void Test_366_02()
+        {
+        }
+
+        [Fact]
+        public void Test_366_03()
+        {
+        }
+
+        [Fact]
+        public void Test_366_04()
+        {
+        }
+
+        [Fact]
+        public void Test_366_05()
+        {
+        }
+
+        [Fact]
+        public void Test_366_06()
+        {
+        }
+
+        [Fact]
+        public void Test_366_07()
+        {
+        }
+
+        [Fact]
+        public void Test_366_08()
+        {
+        }
+
+        [Fact]
+        public void Test_366_09()
+        {
+        }
+
+        [Fact]
+        public void Test_366_10()
+        {
+        }
+
+        [Fact]
+        public void Test_366_11()
+        {
+        }
+
+        [Fact]
+        public void Test_366_12()
+        {
+        }
+
+        [Fact]
+        public void Test_366_13()
+        {
+        }
+
+        [Fact]
+        public void Test_366_14()
+        {
+        }
+
+        [Fact]
+        public void Test_366_15()
+        {
+        }
+
+        [Fact]
+        public void Test_366_16()
+        {
+        }
+
+        [Fact]
+        public void Test_366_17()
+        {
+        }
+
+        [Fact]
+        public void Test_366_18()
+        {
+        }
+
+        [Fact]
+        public void Test_366_19()
+        {
+        }
+
+        [Fact]
+        public void Test_366_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_367
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_367_01()
+        {
+        }
+
+        [Fact]
+        public void Test_367_02()
+        {
+        }
+
+        [Fact]
+        public void Test_367_03()
+        {
+        }
+
+        [Fact]
+        public void Test_367_04()
+        {
+        }
+
+        [Fact]
+        public void Test_367_05()
+        {
+        }
+
+        [Fact]
+        public void Test_367_06()
+        {
+        }
+
+        [Fact]
+        public void Test_367_07()
+        {
+        }
+
+        [Fact]
+        public void Test_367_08()
+        {
+        }
+
+        [Fact]
+        public void Test_367_09()
+        {
+        }
+
+        [Fact]
+        public void Test_367_10()
+        {
+        }
+
+        [Fact]
+        public void Test_367_11()
+        {
+        }
+
+        [Fact]
+        public void Test_367_12()
+        {
+        }
+
+        [Fact]
+        public void Test_367_13()
+        {
+        }
+
+        [Fact]
+        public void Test_367_14()
+        {
+        }
+
+        [Fact]
+        public void Test_367_15()
+        {
+        }
+
+        [Fact]
+        public void Test_367_16()
+        {
+        }
+
+        [Fact]
+        public void Test_367_17()
+        {
+        }
+
+        [Fact]
+        public void Test_367_18()
+        {
+        }
+
+        [Fact]
+        public void Test_367_19()
+        {
+        }
+
+        [Fact]
+        public void Test_367_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_368
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_368_01()
+        {
+        }
+
+        [Fact]
+        public void Test_368_02()
+        {
+        }
+
+        [Fact]
+        public void Test_368_03()
+        {
+        }
+
+        [Fact]
+        public void Test_368_04()
+        {
+        }
+
+        [Fact]
+        public void Test_368_05()
+        {
+        }
+
+        [Fact]
+        public void Test_368_06()
+        {
+        }
+
+        [Fact]
+        public void Test_368_07()
+        {
+        }
+
+        [Fact]
+        public void Test_368_08()
+        {
+        }
+
+        [Fact]
+        public void Test_368_09()
+        {
+        }
+
+        [Fact]
+        public void Test_368_10()
+        {
+        }
+
+        [Fact]
+        public void Test_368_11()
+        {
+        }
+
+        [Fact]
+        public void Test_368_12()
+        {
+        }
+
+        [Fact]
+        public void Test_368_13()
+        {
+        }
+
+        [Fact]
+        public void Test_368_14()
+        {
+        }
+
+        [Fact]
+        public void Test_368_15()
+        {
+        }
+
+        [Fact]
+        public void Test_368_16()
+        {
+        }
+
+        [Fact]
+        public void Test_368_17()
+        {
+        }
+
+        [Fact]
+        public void Test_368_18()
+        {
+        }
+
+        [Fact]
+        public void Test_368_19()
+        {
+        }
+
+        [Fact]
+        public void Test_368_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_369
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_369_01()
+        {
+        }
+
+        [Fact]
+        public void Test_369_02()
+        {
+        }
+
+        [Fact]
+        public void Test_369_03()
+        {
+        }
+
+        [Fact]
+        public void Test_369_04()
+        {
+        }
+
+        [Fact]
+        public void Test_369_05()
+        {
+        }
+
+        [Fact]
+        public void Test_369_06()
+        {
+        }
+
+        [Fact]
+        public void Test_369_07()
+        {
+        }
+
+        [Fact]
+        public void Test_369_08()
+        {
+        }
+
+        [Fact]
+        public void Test_369_09()
+        {
+        }
+
+        [Fact]
+        public void Test_369_10()
+        {
+        }
+
+        [Fact]
+        public void Test_369_11()
+        {
+        }
+
+        [Fact]
+        public void Test_369_12()
+        {
+        }
+
+        [Fact]
+        public void Test_369_13()
+        {
+        }
+
+        [Fact]
+        public void Test_369_14()
+        {
+        }
+
+        [Fact]
+        public void Test_369_15()
+        {
+        }
+
+        [Fact]
+        public void Test_369_16()
+        {
+        }
+
+        [Fact]
+        public void Test_369_17()
+        {
+        }
+
+        [Fact]
+        public void Test_369_18()
+        {
+        }
+
+        [Fact]
+        public void Test_369_19()
+        {
+        }
+
+        [Fact]
+        public void Test_369_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_370
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_370_01()
+        {
+        }
+
+        [Fact]
+        public void Test_370_02()
+        {
+        }
+
+        [Fact]
+        public void Test_370_03()
+        {
+        }
+
+        [Fact]
+        public void Test_370_04()
+        {
+        }
+
+        [Fact]
+        public void Test_370_05()
+        {
+        }
+
+        [Fact]
+        public void Test_370_06()
+        {
+        }
+
+        [Fact]
+        public void Test_370_07()
+        {
+        }
+
+        [Fact]
+        public void Test_370_08()
+        {
+        }
+
+        [Fact]
+        public void Test_370_09()
+        {
+        }
+
+        [Fact]
+        public void Test_370_10()
+        {
+        }
+
+        [Fact]
+        public void Test_370_11()
+        {
+        }
+
+        [Fact]
+        public void Test_370_12()
+        {
+        }
+
+        [Fact]
+        public void Test_370_13()
+        {
+        }
+
+        [Fact]
+        public void Test_370_14()
+        {
+        }
+
+        [Fact]
+        public void Test_370_15()
+        {
+        }
+
+        [Fact]
+        public void Test_370_16()
+        {
+        }
+
+        [Fact]
+        public void Test_370_17()
+        {
+        }
+
+        [Fact]
+        public void Test_370_18()
+        {
+        }
+
+        [Fact]
+        public void Test_370_19()
+        {
+        }
+
+        [Fact]
+        public void Test_370_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_371
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_371_01()
+        {
+        }
+
+        [Fact]
+        public void Test_371_02()
+        {
+        }
+
+        [Fact]
+        public void Test_371_03()
+        {
+        }
+
+        [Fact]
+        public void Test_371_04()
+        {
+        }
+
+        [Fact]
+        public void Test_371_05()
+        {
+        }
+
+        [Fact]
+        public void Test_371_06()
+        {
+        }
+
+        [Fact]
+        public void Test_371_07()
+        {
+        }
+
+        [Fact]
+        public void Test_371_08()
+        {
+        }
+
+        [Fact]
+        public void Test_371_09()
+        {
+        }
+
+        [Fact]
+        public void Test_371_10()
+        {
+        }
+
+        [Fact]
+        public void Test_371_11()
+        {
+        }
+
+        [Fact]
+        public void Test_371_12()
+        {
+        }
+
+        [Fact]
+        public void Test_371_13()
+        {
+        }
+
+        [Fact]
+        public void Test_371_14()
+        {
+        }
+
+        [Fact]
+        public void Test_371_15()
+        {
+        }
+
+        [Fact]
+        public void Test_371_16()
+        {
+        }
+
+        [Fact]
+        public void Test_371_17()
+        {
+        }
+
+        [Fact]
+        public void Test_371_18()
+        {
+        }
+
+        [Fact]
+        public void Test_371_19()
+        {
+        }
+
+        [Fact]
+        public void Test_371_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_372
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_372_01()
+        {
+        }
+
+        [Fact]
+        public void Test_372_02()
+        {
+        }
+
+        [Fact]
+        public void Test_372_03()
+        {
+        }
+
+        [Fact]
+        public void Test_372_04()
+        {
+        }
+
+        [Fact]
+        public void Test_372_05()
+        {
+        }
+
+        [Fact]
+        public void Test_372_06()
+        {
+        }
+
+        [Fact]
+        public void Test_372_07()
+        {
+        }
+
+        [Fact]
+        public void Test_372_08()
+        {
+        }
+
+        [Fact]
+        public void Test_372_09()
+        {
+        }
+
+        [Fact]
+        public void Test_372_10()
+        {
+        }
+
+        [Fact]
+        public void Test_372_11()
+        {
+        }
+
+        [Fact]
+        public void Test_372_12()
+        {
+        }
+
+        [Fact]
+        public void Test_372_13()
+        {
+        }
+
+        [Fact]
+        public void Test_372_14()
+        {
+        }
+
+        [Fact]
+        public void Test_372_15()
+        {
+        }
+
+        [Fact]
+        public void Test_372_16()
+        {
+        }
+
+        [Fact]
+        public void Test_372_17()
+        {
+        }
+
+        [Fact]
+        public void Test_372_18()
+        {
+        }
+
+        [Fact]
+        public void Test_372_19()
+        {
+        }
+
+        [Fact]
+        public void Test_372_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_373
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_373_01()
+        {
+        }
+
+        [Fact]
+        public void Test_373_02()
+        {
+        }
+
+        [Fact]
+        public void Test_373_03()
+        {
+        }
+
+        [Fact]
+        public void Test_373_04()
+        {
+        }
+
+        [Fact]
+        public void Test_373_05()
+        {
+        }
+
+        [Fact]
+        public void Test_373_06()
+        {
+        }
+
+        [Fact]
+        public void Test_373_07()
+        {
+        }
+
+        [Fact]
+        public void Test_373_08()
+        {
+        }
+
+        [Fact]
+        public void Test_373_09()
+        {
+        }
+
+        [Fact]
+        public void Test_373_10()
+        {
+        }
+
+        [Fact]
+        public void Test_373_11()
+        {
+        }
+
+        [Fact]
+        public void Test_373_12()
+        {
+        }
+
+        [Fact]
+        public void Test_373_13()
+        {
+        }
+
+        [Fact]
+        public void Test_373_14()
+        {
+        }
+
+        [Fact]
+        public void Test_373_15()
+        {
+        }
+
+        [Fact]
+        public void Test_373_16()
+        {
+        }
+
+        [Fact]
+        public void Test_373_17()
+        {
+        }
+
+        [Fact]
+        public void Test_373_18()
+        {
+        }
+
+        [Fact]
+        public void Test_373_19()
+        {
+        }
+
+        [Fact]
+        public void Test_373_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_374
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_374_01()
+        {
+        }
+
+        [Fact]
+        public void Test_374_02()
+        {
+        }
+
+        [Fact]
+        public void Test_374_03()
+        {
+        }
+
+        [Fact]
+        public void Test_374_04()
+        {
+        }
+
+        [Fact]
+        public void Test_374_05()
+        {
+        }
+
+        [Fact]
+        public void Test_374_06()
+        {
+        }
+
+        [Fact]
+        public void Test_374_07()
+        {
+        }
+
+        [Fact]
+        public void Test_374_08()
+        {
+        }
+
+        [Fact]
+        public void Test_374_09()
+        {
+        }
+
+        [Fact]
+        public void Test_374_10()
+        {
+        }
+
+        [Fact]
+        public void Test_374_11()
+        {
+        }
+
+        [Fact]
+        public void Test_374_12()
+        {
+        }
+
+        [Fact]
+        public void Test_374_13()
+        {
+        }
+
+        [Fact]
+        public void Test_374_14()
+        {
+        }
+
+        [Fact]
+        public void Test_374_15()
+        {
+        }
+
+        [Fact]
+        public void Test_374_16()
+        {
+        }
+
+        [Fact]
+        public void Test_374_17()
+        {
+        }
+
+        [Fact]
+        public void Test_374_18()
+        {
+        }
+
+        [Fact]
+        public void Test_374_19()
+        {
+        }
+
+        [Fact]
+        public void Test_374_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_375
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_375_01()
+        {
+        }
+
+        [Fact]
+        public void Test_375_02()
+        {
+        }
+
+        [Fact]
+        public void Test_375_03()
+        {
+        }
+
+        [Fact]
+        public void Test_375_04()
+        {
+        }
+
+        [Fact]
+        public void Test_375_05()
+        {
+        }
+
+        [Fact]
+        public void Test_375_06()
+        {
+        }
+
+        [Fact]
+        public void Test_375_07()
+        {
+        }
+
+        [Fact]
+        public void Test_375_08()
+        {
+        }
+
+        [Fact]
+        public void Test_375_09()
+        {
+        }
+
+        [Fact]
+        public void Test_375_10()
+        {
+        }
+
+        [Fact]
+        public void Test_375_11()
+        {
+        }
+
+        [Fact]
+        public void Test_375_12()
+        {
+        }
+
+        [Fact]
+        public void Test_375_13()
+        {
+        }
+
+        [Fact]
+        public void Test_375_14()
+        {
+        }
+
+        [Fact]
+        public void Test_375_15()
+        {
+        }
+
+        [Fact]
+        public void Test_375_16()
+        {
+        }
+
+        [Fact]
+        public void Test_375_17()
+        {
+        }
+
+        [Fact]
+        public void Test_375_18()
+        {
+        }
+
+        [Fact]
+        public void Test_375_19()
+        {
+        }
+
+        [Fact]
+        public void Test_375_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_376
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_376_01()
+        {
+        }
+
+        [Fact]
+        public void Test_376_02()
+        {
+        }
+
+        [Fact]
+        public void Test_376_03()
+        {
+        }
+
+        [Fact]
+        public void Test_376_04()
+        {
+        }
+
+        [Fact]
+        public void Test_376_05()
+        {
+        }
+
+        [Fact]
+        public void Test_376_06()
+        {
+        }
+
+        [Fact]
+        public void Test_376_07()
+        {
+        }
+
+        [Fact]
+        public void Test_376_08()
+        {
+        }
+
+        [Fact]
+        public void Test_376_09()
+        {
+        }
+
+        [Fact]
+        public void Test_376_10()
+        {
+        }
+
+        [Fact]
+        public void Test_376_11()
+        {
+        }
+
+        [Fact]
+        public void Test_376_12()
+        {
+        }
+
+        [Fact]
+        public void Test_376_13()
+        {
+        }
+
+        [Fact]
+        public void Test_376_14()
+        {
+        }
+
+        [Fact]
+        public void Test_376_15()
+        {
+        }
+
+        [Fact]
+        public void Test_376_16()
+        {
+        }
+
+        [Fact]
+        public void Test_376_17()
+        {
+        }
+
+        [Fact]
+        public void Test_376_18()
+        {
+        }
+
+        [Fact]
+        public void Test_376_19()
+        {
+        }
+
+        [Fact]
+        public void Test_376_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_377
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_377_01()
+        {
+        }
+
+        [Fact]
+        public void Test_377_02()
+        {
+        }
+
+        [Fact]
+        public void Test_377_03()
+        {
+        }
+
+        [Fact]
+        public void Test_377_04()
+        {
+        }
+
+        [Fact]
+        public void Test_377_05()
+        {
+        }
+
+        [Fact]
+        public void Test_377_06()
+        {
+        }
+
+        [Fact]
+        public void Test_377_07()
+        {
+        }
+
+        [Fact]
+        public void Test_377_08()
+        {
+        }
+
+        [Fact]
+        public void Test_377_09()
+        {
+        }
+
+        [Fact]
+        public void Test_377_10()
+        {
+        }
+
+        [Fact]
+        public void Test_377_11()
+        {
+        }
+
+        [Fact]
+        public void Test_377_12()
+        {
+        }
+
+        [Fact]
+        public void Test_377_13()
+        {
+        }
+
+        [Fact]
+        public void Test_377_14()
+        {
+        }
+
+        [Fact]
+        public void Test_377_15()
+        {
+        }
+
+        [Fact]
+        public void Test_377_16()
+        {
+        }
+
+        [Fact]
+        public void Test_377_17()
+        {
+        }
+
+        [Fact]
+        public void Test_377_18()
+        {
+        }
+
+        [Fact]
+        public void Test_377_19()
+        {
+        }
+
+        [Fact]
+        public void Test_377_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_378
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_378_01()
+        {
+        }
+
+        [Fact]
+        public void Test_378_02()
+        {
+        }
+
+        [Fact]
+        public void Test_378_03()
+        {
+        }
+
+        [Fact]
+        public void Test_378_04()
+        {
+        }
+
+        [Fact]
+        public void Test_378_05()
+        {
+        }
+
+        [Fact]
+        public void Test_378_06()
+        {
+        }
+
+        [Fact]
+        public void Test_378_07()
+        {
+        }
+
+        [Fact]
+        public void Test_378_08()
+        {
+        }
+
+        [Fact]
+        public void Test_378_09()
+        {
+        }
+
+        [Fact]
+        public void Test_378_10()
+        {
+        }
+
+        [Fact]
+        public void Test_378_11()
+        {
+        }
+
+        [Fact]
+        public void Test_378_12()
+        {
+        }
+
+        [Fact]
+        public void Test_378_13()
+        {
+        }
+
+        [Fact]
+        public void Test_378_14()
+        {
+        }
+
+        [Fact]
+        public void Test_378_15()
+        {
+        }
+
+        [Fact]
+        public void Test_378_16()
+        {
+        }
+
+        [Fact]
+        public void Test_378_17()
+        {
+        }
+
+        [Fact]
+        public void Test_378_18()
+        {
+        }
+
+        [Fact]
+        public void Test_378_19()
+        {
+        }
+
+        [Fact]
+        public void Test_378_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_379
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_379_01()
+        {
+        }
+
+        [Fact]
+        public void Test_379_02()
+        {
+        }
+
+        [Fact]
+        public void Test_379_03()
+        {
+        }
+
+        [Fact]
+        public void Test_379_04()
+        {
+        }
+
+        [Fact]
+        public void Test_379_05()
+        {
+        }
+
+        [Fact]
+        public void Test_379_06()
+        {
+        }
+
+        [Fact]
+        public void Test_379_07()
+        {
+        }
+
+        [Fact]
+        public void Test_379_08()
+        {
+        }
+
+        [Fact]
+        public void Test_379_09()
+        {
+        }
+
+        [Fact]
+        public void Test_379_10()
+        {
+        }
+
+        [Fact]
+        public void Test_379_11()
+        {
+        }
+
+        [Fact]
+        public void Test_379_12()
+        {
+        }
+
+        [Fact]
+        public void Test_379_13()
+        {
+        }
+
+        [Fact]
+        public void Test_379_14()
+        {
+        }
+
+        [Fact]
+        public void Test_379_15()
+        {
+        }
+
+        [Fact]
+        public void Test_379_16()
+        {
+        }
+
+        [Fact]
+        public void Test_379_17()
+        {
+        }
+
+        [Fact]
+        public void Test_379_18()
+        {
+        }
+
+        [Fact]
+        public void Test_379_19()
+        {
+        }
+
+        [Fact]
+        public void Test_379_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_380
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_380_01()
+        {
+        }
+
+        [Fact]
+        public void Test_380_02()
+        {
+        }
+
+        [Fact]
+        public void Test_380_03()
+        {
+        }
+
+        [Fact]
+        public void Test_380_04()
+        {
+        }
+
+        [Fact]
+        public void Test_380_05()
+        {
+        }
+
+        [Fact]
+        public void Test_380_06()
+        {
+        }
+
+        [Fact]
+        public void Test_380_07()
+        {
+        }
+
+        [Fact]
+        public void Test_380_08()
+        {
+        }
+
+        [Fact]
+        public void Test_380_09()
+        {
+        }
+
+        [Fact]
+        public void Test_380_10()
+        {
+        }
+
+        [Fact]
+        public void Test_380_11()
+        {
+        }
+
+        [Fact]
+        public void Test_380_12()
+        {
+        }
+
+        [Fact]
+        public void Test_380_13()
+        {
+        }
+
+        [Fact]
+        public void Test_380_14()
+        {
+        }
+
+        [Fact]
+        public void Test_380_15()
+        {
+        }
+
+        [Fact]
+        public void Test_380_16()
+        {
+        }
+
+        [Fact]
+        public void Test_380_17()
+        {
+        }
+
+        [Fact]
+        public void Test_380_18()
+        {
+        }
+
+        [Fact]
+        public void Test_380_19()
+        {
+        }
+
+        [Fact]
+        public void Test_380_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_381
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_381_01()
+        {
+        }
+
+        [Fact]
+        public void Test_381_02()
+        {
+        }
+
+        [Fact]
+        public void Test_381_03()
+        {
+        }
+
+        [Fact]
+        public void Test_381_04()
+        {
+        }
+
+        [Fact]
+        public void Test_381_05()
+        {
+        }
+
+        [Fact]
+        public void Test_381_06()
+        {
+        }
+
+        [Fact]
+        public void Test_381_07()
+        {
+        }
+
+        [Fact]
+        public void Test_381_08()
+        {
+        }
+
+        [Fact]
+        public void Test_381_09()
+        {
+        }
+
+        [Fact]
+        public void Test_381_10()
+        {
+        }
+
+        [Fact]
+        public void Test_381_11()
+        {
+        }
+
+        [Fact]
+        public void Test_381_12()
+        {
+        }
+
+        [Fact]
+        public void Test_381_13()
+        {
+        }
+
+        [Fact]
+        public void Test_381_14()
+        {
+        }
+
+        [Fact]
+        public void Test_381_15()
+        {
+        }
+
+        [Fact]
+        public void Test_381_16()
+        {
+        }
+
+        [Fact]
+        public void Test_381_17()
+        {
+        }
+
+        [Fact]
+        public void Test_381_18()
+        {
+        }
+
+        [Fact]
+        public void Test_381_19()
+        {
+        }
+
+        [Fact]
+        public void Test_381_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_382
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_382_01()
+        {
+        }
+
+        [Fact]
+        public void Test_382_02()
+        {
+        }
+
+        [Fact]
+        public void Test_382_03()
+        {
+        }
+
+        [Fact]
+        public void Test_382_04()
+        {
+        }
+
+        [Fact]
+        public void Test_382_05()
+        {
+        }
+
+        [Fact]
+        public void Test_382_06()
+        {
+        }
+
+        [Fact]
+        public void Test_382_07()
+        {
+        }
+
+        [Fact]
+        public void Test_382_08()
+        {
+        }
+
+        [Fact]
+        public void Test_382_09()
+        {
+        }
+
+        [Fact]
+        public void Test_382_10()
+        {
+        }
+
+        [Fact]
+        public void Test_382_11()
+        {
+        }
+
+        [Fact]
+        public void Test_382_12()
+        {
+        }
+
+        [Fact]
+        public void Test_382_13()
+        {
+        }
+
+        [Fact]
+        public void Test_382_14()
+        {
+        }
+
+        [Fact]
+        public void Test_382_15()
+        {
+        }
+
+        [Fact]
+        public void Test_382_16()
+        {
+        }
+
+        [Fact]
+        public void Test_382_17()
+        {
+        }
+
+        [Fact]
+        public void Test_382_18()
+        {
+        }
+
+        [Fact]
+        public void Test_382_19()
+        {
+        }
+
+        [Fact]
+        public void Test_382_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_383
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_383_01()
+        {
+        }
+
+        [Fact]
+        public void Test_383_02()
+        {
+        }
+
+        [Fact]
+        public void Test_383_03()
+        {
+        }
+
+        [Fact]
+        public void Test_383_04()
+        {
+        }
+
+        [Fact]
+        public void Test_383_05()
+        {
+        }
+
+        [Fact]
+        public void Test_383_06()
+        {
+        }
+
+        [Fact]
+        public void Test_383_07()
+        {
+        }
+
+        [Fact]
+        public void Test_383_08()
+        {
+        }
+
+        [Fact]
+        public void Test_383_09()
+        {
+        }
+
+        [Fact]
+        public void Test_383_10()
+        {
+        }
+
+        [Fact]
+        public void Test_383_11()
+        {
+        }
+
+        [Fact]
+        public void Test_383_12()
+        {
+        }
+
+        [Fact]
+        public void Test_383_13()
+        {
+        }
+
+        [Fact]
+        public void Test_383_14()
+        {
+        }
+
+        [Fact]
+        public void Test_383_15()
+        {
+        }
+
+        [Fact]
+        public void Test_383_16()
+        {
+        }
+
+        [Fact]
+        public void Test_383_17()
+        {
+        }
+
+        [Fact]
+        public void Test_383_18()
+        {
+        }
+
+        [Fact]
+        public void Test_383_19()
+        {
+        }
+
+        [Fact]
+        public void Test_383_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_384
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_384_01()
+        {
+        }
+
+        [Fact]
+        public void Test_384_02()
+        {
+        }
+
+        [Fact]
+        public void Test_384_03()
+        {
+        }
+
+        [Fact]
+        public void Test_384_04()
+        {
+        }
+
+        [Fact]
+        public void Test_384_05()
+        {
+        }
+
+        [Fact]
+        public void Test_384_06()
+        {
+        }
+
+        [Fact]
+        public void Test_384_07()
+        {
+        }
+
+        [Fact]
+        public void Test_384_08()
+        {
+        }
+
+        [Fact]
+        public void Test_384_09()
+        {
+        }
+
+        [Fact]
+        public void Test_384_10()
+        {
+        }
+
+        [Fact]
+        public void Test_384_11()
+        {
+        }
+
+        [Fact]
+        public void Test_384_12()
+        {
+        }
+
+        [Fact]
+        public void Test_384_13()
+        {
+        }
+
+        [Fact]
+        public void Test_384_14()
+        {
+        }
+
+        [Fact]
+        public void Test_384_15()
+        {
+        }
+
+        [Fact]
+        public void Test_384_16()
+        {
+        }
+
+        [Fact]
+        public void Test_384_17()
+        {
+        }
+
+        [Fact]
+        public void Test_384_18()
+        {
+        }
+
+        [Fact]
+        public void Test_384_19()
+        {
+        }
+
+        [Fact]
+        public void Test_384_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_385
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_385_01()
+        {
+        }
+
+        [Fact]
+        public void Test_385_02()
+        {
+        }
+
+        [Fact]
+        public void Test_385_03()
+        {
+        }
+
+        [Fact]
+        public void Test_385_04()
+        {
+        }
+
+        [Fact]
+        public void Test_385_05()
+        {
+        }
+
+        [Fact]
+        public void Test_385_06()
+        {
+        }
+
+        [Fact]
+        public void Test_385_07()
+        {
+        }
+
+        [Fact]
+        public void Test_385_08()
+        {
+        }
+
+        [Fact]
+        public void Test_385_09()
+        {
+        }
+
+        [Fact]
+        public void Test_385_10()
+        {
+        }
+
+        [Fact]
+        public void Test_385_11()
+        {
+        }
+
+        [Fact]
+        public void Test_385_12()
+        {
+        }
+
+        [Fact]
+        public void Test_385_13()
+        {
+        }
+
+        [Fact]
+        public void Test_385_14()
+        {
+        }
+
+        [Fact]
+        public void Test_385_15()
+        {
+        }
+
+        [Fact]
+        public void Test_385_16()
+        {
+        }
+
+        [Fact]
+        public void Test_385_17()
+        {
+        }
+
+        [Fact]
+        public void Test_385_18()
+        {
+        }
+
+        [Fact]
+        public void Test_385_19()
+        {
+        }
+
+        [Fact]
+        public void Test_385_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_386
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_386_01()
+        {
+        }
+
+        [Fact]
+        public void Test_386_02()
+        {
+        }
+
+        [Fact]
+        public void Test_386_03()
+        {
+        }
+
+        [Fact]
+        public void Test_386_04()
+        {
+        }
+
+        [Fact]
+        public void Test_386_05()
+        {
+        }
+
+        [Fact]
+        public void Test_386_06()
+        {
+        }
+
+        [Fact]
+        public void Test_386_07()
+        {
+        }
+
+        [Fact]
+        public void Test_386_08()
+        {
+        }
+
+        [Fact]
+        public void Test_386_09()
+        {
+        }
+
+        [Fact]
+        public void Test_386_10()
+        {
+        }
+
+        [Fact]
+        public void Test_386_11()
+        {
+        }
+
+        [Fact]
+        public void Test_386_12()
+        {
+        }
+
+        [Fact]
+        public void Test_386_13()
+        {
+        }
+
+        [Fact]
+        public void Test_386_14()
+        {
+        }
+
+        [Fact]
+        public void Test_386_15()
+        {
+        }
+
+        [Fact]
+        public void Test_386_16()
+        {
+        }
+
+        [Fact]
+        public void Test_386_17()
+        {
+        }
+
+        [Fact]
+        public void Test_386_18()
+        {
+        }
+
+        [Fact]
+        public void Test_386_19()
+        {
+        }
+
+        [Fact]
+        public void Test_386_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_387
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_387_01()
+        {
+        }
+
+        [Fact]
+        public void Test_387_02()
+        {
+        }
+
+        [Fact]
+        public void Test_387_03()
+        {
+        }
+
+        [Fact]
+        public void Test_387_04()
+        {
+        }
+
+        [Fact]
+        public void Test_387_05()
+        {
+        }
+
+        [Fact]
+        public void Test_387_06()
+        {
+        }
+
+        [Fact]
+        public void Test_387_07()
+        {
+        }
+
+        [Fact]
+        public void Test_387_08()
+        {
+        }
+
+        [Fact]
+        public void Test_387_09()
+        {
+        }
+
+        [Fact]
+        public void Test_387_10()
+        {
+        }
+
+        [Fact]
+        public void Test_387_11()
+        {
+        }
+
+        [Fact]
+        public void Test_387_12()
+        {
+        }
+
+        [Fact]
+        public void Test_387_13()
+        {
+        }
+
+        [Fact]
+        public void Test_387_14()
+        {
+        }
+
+        [Fact]
+        public void Test_387_15()
+        {
+        }
+
+        [Fact]
+        public void Test_387_16()
+        {
+        }
+
+        [Fact]
+        public void Test_387_17()
+        {
+        }
+
+        [Fact]
+        public void Test_387_18()
+        {
+        }
+
+        [Fact]
+        public void Test_387_19()
+        {
+        }
+
+        [Fact]
+        public void Test_387_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_388
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_388_01()
+        {
+        }
+
+        [Fact]
+        public void Test_388_02()
+        {
+        }
+
+        [Fact]
+        public void Test_388_03()
+        {
+        }
+
+        [Fact]
+        public void Test_388_04()
+        {
+        }
+
+        [Fact]
+        public void Test_388_05()
+        {
+        }
+
+        [Fact]
+        public void Test_388_06()
+        {
+        }
+
+        [Fact]
+        public void Test_388_07()
+        {
+        }
+
+        [Fact]
+        public void Test_388_08()
+        {
+        }
+
+        [Fact]
+        public void Test_388_09()
+        {
+        }
+
+        [Fact]
+        public void Test_388_10()
+        {
+        }
+
+        [Fact]
+        public void Test_388_11()
+        {
+        }
+
+        [Fact]
+        public void Test_388_12()
+        {
+        }
+
+        [Fact]
+        public void Test_388_13()
+        {
+        }
+
+        [Fact]
+        public void Test_388_14()
+        {
+        }
+
+        [Fact]
+        public void Test_388_15()
+        {
+        }
+
+        [Fact]
+        public void Test_388_16()
+        {
+        }
+
+        [Fact]
+        public void Test_388_17()
+        {
+        }
+
+        [Fact]
+        public void Test_388_18()
+        {
+        }
+
+        [Fact]
+        public void Test_388_19()
+        {
+        }
+
+        [Fact]
+        public void Test_388_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_389
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_389_01()
+        {
+        }
+
+        [Fact]
+        public void Test_389_02()
+        {
+        }
+
+        [Fact]
+        public void Test_389_03()
+        {
+        }
+
+        [Fact]
+        public void Test_389_04()
+        {
+        }
+
+        [Fact]
+        public void Test_389_05()
+        {
+        }
+
+        [Fact]
+        public void Test_389_06()
+        {
+        }
+
+        [Fact]
+        public void Test_389_07()
+        {
+        }
+
+        [Fact]
+        public void Test_389_08()
+        {
+        }
+
+        [Fact]
+        public void Test_389_09()
+        {
+        }
+
+        [Fact]
+        public void Test_389_10()
+        {
+        }
+
+        [Fact]
+        public void Test_389_11()
+        {
+        }
+
+        [Fact]
+        public void Test_389_12()
+        {
+        }
+
+        [Fact]
+        public void Test_389_13()
+        {
+        }
+
+        [Fact]
+        public void Test_389_14()
+        {
+        }
+
+        [Fact]
+        public void Test_389_15()
+        {
+        }
+
+        [Fact]
+        public void Test_389_16()
+        {
+        }
+
+        [Fact]
+        public void Test_389_17()
+        {
+        }
+
+        [Fact]
+        public void Test_389_18()
+        {
+        }
+
+        [Fact]
+        public void Test_389_19()
+        {
+        }
+
+        [Fact]
+        public void Test_389_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_390
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_390_01()
+        {
+        }
+
+        [Fact]
+        public void Test_390_02()
+        {
+        }
+
+        [Fact]
+        public void Test_390_03()
+        {
+        }
+
+        [Fact]
+        public void Test_390_04()
+        {
+        }
+
+        [Fact]
+        public void Test_390_05()
+        {
+        }
+
+        [Fact]
+        public void Test_390_06()
+        {
+        }
+
+        [Fact]
+        public void Test_390_07()
+        {
+        }
+
+        [Fact]
+        public void Test_390_08()
+        {
+        }
+
+        [Fact]
+        public void Test_390_09()
+        {
+        }
+
+        [Fact]
+        public void Test_390_10()
+        {
+        }
+
+        [Fact]
+        public void Test_390_11()
+        {
+        }
+
+        [Fact]
+        public void Test_390_12()
+        {
+        }
+
+        [Fact]
+        public void Test_390_13()
+        {
+        }
+
+        [Fact]
+        public void Test_390_14()
+        {
+        }
+
+        [Fact]
+        public void Test_390_15()
+        {
+        }
+
+        [Fact]
+        public void Test_390_16()
+        {
+        }
+
+        [Fact]
+        public void Test_390_17()
+        {
+        }
+
+        [Fact]
+        public void Test_390_18()
+        {
+        }
+
+        [Fact]
+        public void Test_390_19()
+        {
+        }
+
+        [Fact]
+        public void Test_390_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_391
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_391_01()
+        {
+        }
+
+        [Fact]
+        public void Test_391_02()
+        {
+        }
+
+        [Fact]
+        public void Test_391_03()
+        {
+        }
+
+        [Fact]
+        public void Test_391_04()
+        {
+        }
+
+        [Fact]
+        public void Test_391_05()
+        {
+        }
+
+        [Fact]
+        public void Test_391_06()
+        {
+        }
+
+        [Fact]
+        public void Test_391_07()
+        {
+        }
+
+        [Fact]
+        public void Test_391_08()
+        {
+        }
+
+        [Fact]
+        public void Test_391_09()
+        {
+        }
+
+        [Fact]
+        public void Test_391_10()
+        {
+        }
+
+        [Fact]
+        public void Test_391_11()
+        {
+        }
+
+        [Fact]
+        public void Test_391_12()
+        {
+        }
+
+        [Fact]
+        public void Test_391_13()
+        {
+        }
+
+        [Fact]
+        public void Test_391_14()
+        {
+        }
+
+        [Fact]
+        public void Test_391_15()
+        {
+        }
+
+        [Fact]
+        public void Test_391_16()
+        {
+        }
+
+        [Fact]
+        public void Test_391_17()
+        {
+        }
+
+        [Fact]
+        public void Test_391_18()
+        {
+        }
+
+        [Fact]
+        public void Test_391_19()
+        {
+        }
+
+        [Fact]
+        public void Test_391_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_392
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_392_01()
+        {
+        }
+
+        [Fact]
+        public void Test_392_02()
+        {
+        }
+
+        [Fact]
+        public void Test_392_03()
+        {
+        }
+
+        [Fact]
+        public void Test_392_04()
+        {
+        }
+
+        [Fact]
+        public void Test_392_05()
+        {
+        }
+
+        [Fact]
+        public void Test_392_06()
+        {
+        }
+
+        [Fact]
+        public void Test_392_07()
+        {
+        }
+
+        [Fact]
+        public void Test_392_08()
+        {
+        }
+
+        [Fact]
+        public void Test_392_09()
+        {
+        }
+
+        [Fact]
+        public void Test_392_10()
+        {
+        }
+
+        [Fact]
+        public void Test_392_11()
+        {
+        }
+
+        [Fact]
+        public void Test_392_12()
+        {
+        }
+
+        [Fact]
+        public void Test_392_13()
+        {
+        }
+
+        [Fact]
+        public void Test_392_14()
+        {
+        }
+
+        [Fact]
+        public void Test_392_15()
+        {
+        }
+
+        [Fact]
+        public void Test_392_16()
+        {
+        }
+
+        [Fact]
+        public void Test_392_17()
+        {
+        }
+
+        [Fact]
+        public void Test_392_18()
+        {
+        }
+
+        [Fact]
+        public void Test_392_19()
+        {
+        }
+
+        [Fact]
+        public void Test_392_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_393
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_393_01()
+        {
+        }
+
+        [Fact]
+        public void Test_393_02()
+        {
+        }
+
+        [Fact]
+        public void Test_393_03()
+        {
+        }
+
+        [Fact]
+        public void Test_393_04()
+        {
+        }
+
+        [Fact]
+        public void Test_393_05()
+        {
+        }
+
+        [Fact]
+        public void Test_393_06()
+        {
+        }
+
+        [Fact]
+        public void Test_393_07()
+        {
+        }
+
+        [Fact]
+        public void Test_393_08()
+        {
+        }
+
+        [Fact]
+        public void Test_393_09()
+        {
+        }
+
+        [Fact]
+        public void Test_393_10()
+        {
+        }
+
+        [Fact]
+        public void Test_393_11()
+        {
+        }
+
+        [Fact]
+        public void Test_393_12()
+        {
+        }
+
+        [Fact]
+        public void Test_393_13()
+        {
+        }
+
+        [Fact]
+        public void Test_393_14()
+        {
+        }
+
+        [Fact]
+        public void Test_393_15()
+        {
+        }
+
+        [Fact]
+        public void Test_393_16()
+        {
+        }
+
+        [Fact]
+        public void Test_393_17()
+        {
+        }
+
+        [Fact]
+        public void Test_393_18()
+        {
+        }
+
+        [Fact]
+        public void Test_393_19()
+        {
+        }
+
+        [Fact]
+        public void Test_393_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_394
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_394_01()
+        {
+        }
+
+        [Fact]
+        public void Test_394_02()
+        {
+        }
+
+        [Fact]
+        public void Test_394_03()
+        {
+        }
+
+        [Fact]
+        public void Test_394_04()
+        {
+        }
+
+        [Fact]
+        public void Test_394_05()
+        {
+        }
+
+        [Fact]
+        public void Test_394_06()
+        {
+        }
+
+        [Fact]
+        public void Test_394_07()
+        {
+        }
+
+        [Fact]
+        public void Test_394_08()
+        {
+        }
+
+        [Fact]
+        public void Test_394_09()
+        {
+        }
+
+        [Fact]
+        public void Test_394_10()
+        {
+        }
+
+        [Fact]
+        public void Test_394_11()
+        {
+        }
+
+        [Fact]
+        public void Test_394_12()
+        {
+        }
+
+        [Fact]
+        public void Test_394_13()
+        {
+        }
+
+        [Fact]
+        public void Test_394_14()
+        {
+        }
+
+        [Fact]
+        public void Test_394_15()
+        {
+        }
+
+        [Fact]
+        public void Test_394_16()
+        {
+        }
+
+        [Fact]
+        public void Test_394_17()
+        {
+        }
+
+        [Fact]
+        public void Test_394_18()
+        {
+        }
+
+        [Fact]
+        public void Test_394_19()
+        {
+        }
+
+        [Fact]
+        public void Test_394_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_395
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_395_01()
+        {
+        }
+
+        [Fact]
+        public void Test_395_02()
+        {
+        }
+
+        [Fact]
+        public void Test_395_03()
+        {
+        }
+
+        [Fact]
+        public void Test_395_04()
+        {
+        }
+
+        [Fact]
+        public void Test_395_05()
+        {
+        }
+
+        [Fact]
+        public void Test_395_06()
+        {
+        }
+
+        [Fact]
+        public void Test_395_07()
+        {
+        }
+
+        [Fact]
+        public void Test_395_08()
+        {
+        }
+
+        [Fact]
+        public void Test_395_09()
+        {
+        }
+
+        [Fact]
+        public void Test_395_10()
+        {
+        }
+
+        [Fact]
+        public void Test_395_11()
+        {
+        }
+
+        [Fact]
+        public void Test_395_12()
+        {
+        }
+
+        [Fact]
+        public void Test_395_13()
+        {
+        }
+
+        [Fact]
+        public void Test_395_14()
+        {
+        }
+
+        [Fact]
+        public void Test_395_15()
+        {
+        }
+
+        [Fact]
+        public void Test_395_16()
+        {
+        }
+
+        [Fact]
+        public void Test_395_17()
+        {
+        }
+
+        [Fact]
+        public void Test_395_18()
+        {
+        }
+
+        [Fact]
+        public void Test_395_19()
+        {
+        }
+
+        [Fact]
+        public void Test_395_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_396
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_396_01()
+        {
+        }
+
+        [Fact]
+        public void Test_396_02()
+        {
+        }
+
+        [Fact]
+        public void Test_396_03()
+        {
+        }
+
+        [Fact]
+        public void Test_396_04()
+        {
+        }
+
+        [Fact]
+        public void Test_396_05()
+        {
+        }
+
+        [Fact]
+        public void Test_396_06()
+        {
+        }
+
+        [Fact]
+        public void Test_396_07()
+        {
+        }
+
+        [Fact]
+        public void Test_396_08()
+        {
+        }
+
+        [Fact]
+        public void Test_396_09()
+        {
+        }
+
+        [Fact]
+        public void Test_396_10()
+        {
+        }
+
+        [Fact]
+        public void Test_396_11()
+        {
+        }
+
+        [Fact]
+        public void Test_396_12()
+        {
+        }
+
+        [Fact]
+        public void Test_396_13()
+        {
+        }
+
+        [Fact]
+        public void Test_396_14()
+        {
+        }
+
+        [Fact]
+        public void Test_396_15()
+        {
+        }
+
+        [Fact]
+        public void Test_396_16()
+        {
+        }
+
+        [Fact]
+        public void Test_396_17()
+        {
+        }
+
+        [Fact]
+        public void Test_396_18()
+        {
+        }
+
+        [Fact]
+        public void Test_396_19()
+        {
+        }
+
+        [Fact]
+        public void Test_396_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_397
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_397_01()
+        {
+        }
+
+        [Fact]
+        public void Test_397_02()
+        {
+        }
+
+        [Fact]
+        public void Test_397_03()
+        {
+        }
+
+        [Fact]
+        public void Test_397_04()
+        {
+        }
+
+        [Fact]
+        public void Test_397_05()
+        {
+        }
+
+        [Fact]
+        public void Test_397_06()
+        {
+        }
+
+        [Fact]
+        public void Test_397_07()
+        {
+        }
+
+        [Fact]
+        public void Test_397_08()
+        {
+        }
+
+        [Fact]
+        public void Test_397_09()
+        {
+        }
+
+        [Fact]
+        public void Test_397_10()
+        {
+        }
+
+        [Fact]
+        public void Test_397_11()
+        {
+        }
+
+        [Fact]
+        public void Test_397_12()
+        {
+        }
+
+        [Fact]
+        public void Test_397_13()
+        {
+        }
+
+        [Fact]
+        public void Test_397_14()
+        {
+        }
+
+        [Fact]
+        public void Test_397_15()
+        {
+        }
+
+        [Fact]
+        public void Test_397_16()
+        {
+        }
+
+        [Fact]
+        public void Test_397_17()
+        {
+        }
+
+        [Fact]
+        public void Test_397_18()
+        {
+        }
+
+        [Fact]
+        public void Test_397_19()
+        {
+        }
+
+        [Fact]
+        public void Test_397_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_398
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_398_01()
+        {
+        }
+
+        [Fact]
+        public void Test_398_02()
+        {
+        }
+
+        [Fact]
+        public void Test_398_03()
+        {
+        }
+
+        [Fact]
+        public void Test_398_04()
+        {
+        }
+
+        [Fact]
+        public void Test_398_05()
+        {
+        }
+
+        [Fact]
+        public void Test_398_06()
+        {
+        }
+
+        [Fact]
+        public void Test_398_07()
+        {
+        }
+
+        [Fact]
+        public void Test_398_08()
+        {
+        }
+
+        [Fact]
+        public void Test_398_09()
+        {
+        }
+
+        [Fact]
+        public void Test_398_10()
+        {
+        }
+
+        [Fact]
+        public void Test_398_11()
+        {
+        }
+
+        [Fact]
+        public void Test_398_12()
+        {
+        }
+
+        [Fact]
+        public void Test_398_13()
+        {
+        }
+
+        [Fact]
+        public void Test_398_14()
+        {
+        }
+
+        [Fact]
+        public void Test_398_15()
+        {
+        }
+
+        [Fact]
+        public void Test_398_16()
+        {
+        }
+
+        [Fact]
+        public void Test_398_17()
+        {
+        }
+
+        [Fact]
+        public void Test_398_18()
+        {
+        }
+
+        [Fact]
+        public void Test_398_19()
+        {
+        }
+
+        [Fact]
+        public void Test_398_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_399
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_399_01()
+        {
+        }
+
+        [Fact]
+        public void Test_399_02()
+        {
+        }
+
+        [Fact]
+        public void Test_399_03()
+        {
+        }
+
+        [Fact]
+        public void Test_399_04()
+        {
+        }
+
+        [Fact]
+        public void Test_399_05()
+        {
+        }
+
+        [Fact]
+        public void Test_399_06()
+        {
+        }
+
+        [Fact]
+        public void Test_399_07()
+        {
+        }
+
+        [Fact]
+        public void Test_399_08()
+        {
+        }
+
+        [Fact]
+        public void Test_399_09()
+        {
+        }
+
+        [Fact]
+        public void Test_399_10()
+        {
+        }
+
+        [Fact]
+        public void Test_399_11()
+        {
+        }
+
+        [Fact]
+        public void Test_399_12()
+        {
+        }
+
+        [Fact]
+        public void Test_399_13()
+        {
+        }
+
+        [Fact]
+        public void Test_399_14()
+        {
+        }
+
+        [Fact]
+        public void Test_399_15()
+        {
+        }
+
+        [Fact]
+        public void Test_399_16()
+        {
+        }
+
+        [Fact]
+        public void Test_399_17()
+        {
+        }
+
+        [Fact]
+        public void Test_399_18()
+        {
+        }
+
+        [Fact]
+        public void Test_399_19()
+        {
+        }
+
+        [Fact]
+        public void Test_399_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_400
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_400_01()
+        {
+        }
+
+        [Fact]
+        public void Test_400_02()
+        {
+        }
+
+        [Fact]
+        public void Test_400_03()
+        {
+        }
+
+        [Fact]
+        public void Test_400_04()
+        {
+        }
+
+        [Fact]
+        public void Test_400_05()
+        {
+        }
+
+        [Fact]
+        public void Test_400_06()
+        {
+        }
+
+        [Fact]
+        public void Test_400_07()
+        {
+        }
+
+        [Fact]
+        public void Test_400_08()
+        {
+        }
+
+        [Fact]
+        public void Test_400_09()
+        {
+        }
+
+        [Fact]
+        public void Test_400_10()
+        {
+        }
+
+        [Fact]
+        public void Test_400_11()
+        {
+        }
+
+        [Fact]
+        public void Test_400_12()
+        {
+        }
+
+        [Fact]
+        public void Test_400_13()
+        {
+        }
+
+        [Fact]
+        public void Test_400_14()
+        {
+        }
+
+        [Fact]
+        public void Test_400_15()
+        {
+        }
+
+        [Fact]
+        public void Test_400_16()
+        {
+        }
+
+        [Fact]
+        public void Test_400_17()
+        {
+        }
+
+        [Fact]
+        public void Test_400_18()
+        {
+        }
+
+        [Fact]
+        public void Test_400_19()
+        {
+        }
+
+        [Fact]
+        public void Test_400_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_401
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_401_01()
+        {
+        }
+
+        [Fact]
+        public void Test_401_02()
+        {
+        }
+
+        [Fact]
+        public void Test_401_03()
+        {
+        }
+
+        [Fact]
+        public void Test_401_04()
+        {
+        }
+
+        [Fact]
+        public void Test_401_05()
+        {
+        }
+
+        [Fact]
+        public void Test_401_06()
+        {
+        }
+
+        [Fact]
+        public void Test_401_07()
+        {
+        }
+
+        [Fact]
+        public void Test_401_08()
+        {
+        }
+
+        [Fact]
+        public void Test_401_09()
+        {
+        }
+
+        [Fact]
+        public void Test_401_10()
+        {
+        }
+
+        [Fact]
+        public void Test_401_11()
+        {
+        }
+
+        [Fact]
+        public void Test_401_12()
+        {
+        }
+
+        [Fact]
+        public void Test_401_13()
+        {
+        }
+
+        [Fact]
+        public void Test_401_14()
+        {
+        }
+
+        [Fact]
+        public void Test_401_15()
+        {
+        }
+
+        [Fact]
+        public void Test_401_16()
+        {
+        }
+
+        [Fact]
+        public void Test_401_17()
+        {
+        }
+
+        [Fact]
+        public void Test_401_18()
+        {
+        }
+
+        [Fact]
+        public void Test_401_19()
+        {
+        }
+
+        [Fact]
+        public void Test_401_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_402
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_402_01()
+        {
+        }
+
+        [Fact]
+        public void Test_402_02()
+        {
+        }
+
+        [Fact]
+        public void Test_402_03()
+        {
+        }
+
+        [Fact]
+        public void Test_402_04()
+        {
+        }
+
+        [Fact]
+        public void Test_402_05()
+        {
+        }
+
+        [Fact]
+        public void Test_402_06()
+        {
+        }
+
+        [Fact]
+        public void Test_402_07()
+        {
+        }
+
+        [Fact]
+        public void Test_402_08()
+        {
+        }
+
+        [Fact]
+        public void Test_402_09()
+        {
+        }
+
+        [Fact]
+        public void Test_402_10()
+        {
+        }
+
+        [Fact]
+        public void Test_402_11()
+        {
+        }
+
+        [Fact]
+        public void Test_402_12()
+        {
+        }
+
+        [Fact]
+        public void Test_402_13()
+        {
+        }
+
+        [Fact]
+        public void Test_402_14()
+        {
+        }
+
+        [Fact]
+        public void Test_402_15()
+        {
+        }
+
+        [Fact]
+        public void Test_402_16()
+        {
+        }
+
+        [Fact]
+        public void Test_402_17()
+        {
+        }
+
+        [Fact]
+        public void Test_402_18()
+        {
+        }
+
+        [Fact]
+        public void Test_402_19()
+        {
+        }
+
+        [Fact]
+        public void Test_402_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_403
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_403_01()
+        {
+        }
+
+        [Fact]
+        public void Test_403_02()
+        {
+        }
+
+        [Fact]
+        public void Test_403_03()
+        {
+        }
+
+        [Fact]
+        public void Test_403_04()
+        {
+        }
+
+        [Fact]
+        public void Test_403_05()
+        {
+        }
+
+        [Fact]
+        public void Test_403_06()
+        {
+        }
+
+        [Fact]
+        public void Test_403_07()
+        {
+        }
+
+        [Fact]
+        public void Test_403_08()
+        {
+        }
+
+        [Fact]
+        public void Test_403_09()
+        {
+        }
+
+        [Fact]
+        public void Test_403_10()
+        {
+        }
+
+        [Fact]
+        public void Test_403_11()
+        {
+        }
+
+        [Fact]
+        public void Test_403_12()
+        {
+        }
+
+        [Fact]
+        public void Test_403_13()
+        {
+        }
+
+        [Fact]
+        public void Test_403_14()
+        {
+        }
+
+        [Fact]
+        public void Test_403_15()
+        {
+        }
+
+        [Fact]
+        public void Test_403_16()
+        {
+        }
+
+        [Fact]
+        public void Test_403_17()
+        {
+        }
+
+        [Fact]
+        public void Test_403_18()
+        {
+        }
+
+        [Fact]
+        public void Test_403_19()
+        {
+        }
+
+        [Fact]
+        public void Test_403_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_404
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_404_01()
+        {
+        }
+
+        [Fact]
+        public void Test_404_02()
+        {
+        }
+
+        [Fact]
+        public void Test_404_03()
+        {
+        }
+
+        [Fact]
+        public void Test_404_04()
+        {
+        }
+
+        [Fact]
+        public void Test_404_05()
+        {
+        }
+
+        [Fact]
+        public void Test_404_06()
+        {
+        }
+
+        [Fact]
+        public void Test_404_07()
+        {
+        }
+
+        [Fact]
+        public void Test_404_08()
+        {
+        }
+
+        [Fact]
+        public void Test_404_09()
+        {
+        }
+
+        [Fact]
+        public void Test_404_10()
+        {
+        }
+
+        [Fact]
+        public void Test_404_11()
+        {
+        }
+
+        [Fact]
+        public void Test_404_12()
+        {
+        }
+
+        [Fact]
+        public void Test_404_13()
+        {
+        }
+
+        [Fact]
+        public void Test_404_14()
+        {
+        }
+
+        [Fact]
+        public void Test_404_15()
+        {
+        }
+
+        [Fact]
+        public void Test_404_16()
+        {
+        }
+
+        [Fact]
+        public void Test_404_17()
+        {
+        }
+
+        [Fact]
+        public void Test_404_18()
+        {
+        }
+
+        [Fact]
+        public void Test_404_19()
+        {
+        }
+
+        [Fact]
+        public void Test_404_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_405
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_405_01()
+        {
+        }
+
+        [Fact]
+        public void Test_405_02()
+        {
+        }
+
+        [Fact]
+        public void Test_405_03()
+        {
+        }
+
+        [Fact]
+        public void Test_405_04()
+        {
+        }
+
+        [Fact]
+        public void Test_405_05()
+        {
+        }
+
+        [Fact]
+        public void Test_405_06()
+        {
+        }
+
+        [Fact]
+        public void Test_405_07()
+        {
+        }
+
+        [Fact]
+        public void Test_405_08()
+        {
+        }
+
+        [Fact]
+        public void Test_405_09()
+        {
+        }
+
+        [Fact]
+        public void Test_405_10()
+        {
+        }
+
+        [Fact]
+        public void Test_405_11()
+        {
+        }
+
+        [Fact]
+        public void Test_405_12()
+        {
+        }
+
+        [Fact]
+        public void Test_405_13()
+        {
+        }
+
+        [Fact]
+        public void Test_405_14()
+        {
+        }
+
+        [Fact]
+        public void Test_405_15()
+        {
+        }
+
+        [Fact]
+        public void Test_405_16()
+        {
+        }
+
+        [Fact]
+        public void Test_405_17()
+        {
+        }
+
+        [Fact]
+        public void Test_405_18()
+        {
+        }
+
+        [Fact]
+        public void Test_405_19()
+        {
+        }
+
+        [Fact]
+        public void Test_405_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_406
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_406_01()
+        {
+        }
+
+        [Fact]
+        public void Test_406_02()
+        {
+        }
+
+        [Fact]
+        public void Test_406_03()
+        {
+        }
+
+        [Fact]
+        public void Test_406_04()
+        {
+        }
+
+        [Fact]
+        public void Test_406_05()
+        {
+        }
+
+        [Fact]
+        public void Test_406_06()
+        {
+        }
+
+        [Fact]
+        public void Test_406_07()
+        {
+        }
+
+        [Fact]
+        public void Test_406_08()
+        {
+        }
+
+        [Fact]
+        public void Test_406_09()
+        {
+        }
+
+        [Fact]
+        public void Test_406_10()
+        {
+        }
+
+        [Fact]
+        public void Test_406_11()
+        {
+        }
+
+        [Fact]
+        public void Test_406_12()
+        {
+        }
+
+        [Fact]
+        public void Test_406_13()
+        {
+        }
+
+        [Fact]
+        public void Test_406_14()
+        {
+        }
+
+        [Fact]
+        public void Test_406_15()
+        {
+        }
+
+        [Fact]
+        public void Test_406_16()
+        {
+        }
+
+        [Fact]
+        public void Test_406_17()
+        {
+        }
+
+        [Fact]
+        public void Test_406_18()
+        {
+        }
+
+        [Fact]
+        public void Test_406_19()
+        {
+        }
+
+        [Fact]
+        public void Test_406_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_407
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_407_01()
+        {
+        }
+
+        [Fact]
+        public void Test_407_02()
+        {
+        }
+
+        [Fact]
+        public void Test_407_03()
+        {
+        }
+
+        [Fact]
+        public void Test_407_04()
+        {
+        }
+
+        [Fact]
+        public void Test_407_05()
+        {
+        }
+
+        [Fact]
+        public void Test_407_06()
+        {
+        }
+
+        [Fact]
+        public void Test_407_07()
+        {
+        }
+
+        [Fact]
+        public void Test_407_08()
+        {
+        }
+
+        [Fact]
+        public void Test_407_09()
+        {
+        }
+
+        [Fact]
+        public void Test_407_10()
+        {
+        }
+
+        [Fact]
+        public void Test_407_11()
+        {
+        }
+
+        [Fact]
+        public void Test_407_12()
+        {
+        }
+
+        [Fact]
+        public void Test_407_13()
+        {
+        }
+
+        [Fact]
+        public void Test_407_14()
+        {
+        }
+
+        [Fact]
+        public void Test_407_15()
+        {
+        }
+
+        [Fact]
+        public void Test_407_16()
+        {
+        }
+
+        [Fact]
+        public void Test_407_17()
+        {
+        }
+
+        [Fact]
+        public void Test_407_18()
+        {
+        }
+
+        [Fact]
+        public void Test_407_19()
+        {
+        }
+
+        [Fact]
+        public void Test_407_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_408
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_408_01()
+        {
+        }
+
+        [Fact]
+        public void Test_408_02()
+        {
+        }
+
+        [Fact]
+        public void Test_408_03()
+        {
+        }
+
+        [Fact]
+        public void Test_408_04()
+        {
+        }
+
+        [Fact]
+        public void Test_408_05()
+        {
+        }
+
+        [Fact]
+        public void Test_408_06()
+        {
+        }
+
+        [Fact]
+        public void Test_408_07()
+        {
+        }
+
+        [Fact]
+        public void Test_408_08()
+        {
+        }
+
+        [Fact]
+        public void Test_408_09()
+        {
+        }
+
+        [Fact]
+        public void Test_408_10()
+        {
+        }
+
+        [Fact]
+        public void Test_408_11()
+        {
+        }
+
+        [Fact]
+        public void Test_408_12()
+        {
+        }
+
+        [Fact]
+        public void Test_408_13()
+        {
+        }
+
+        [Fact]
+        public void Test_408_14()
+        {
+        }
+
+        [Fact]
+        public void Test_408_15()
+        {
+        }
+
+        [Fact]
+        public void Test_408_16()
+        {
+        }
+
+        [Fact]
+        public void Test_408_17()
+        {
+        }
+
+        [Fact]
+        public void Test_408_18()
+        {
+        }
+
+        [Fact]
+        public void Test_408_19()
+        {
+        }
+
+        [Fact]
+        public void Test_408_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_409
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_409_01()
+        {
+        }
+
+        [Fact]
+        public void Test_409_02()
+        {
+        }
+
+        [Fact]
+        public void Test_409_03()
+        {
+        }
+
+        [Fact]
+        public void Test_409_04()
+        {
+        }
+
+        [Fact]
+        public void Test_409_05()
+        {
+        }
+
+        [Fact]
+        public void Test_409_06()
+        {
+        }
+
+        [Fact]
+        public void Test_409_07()
+        {
+        }
+
+        [Fact]
+        public void Test_409_08()
+        {
+        }
+
+        [Fact]
+        public void Test_409_09()
+        {
+        }
+
+        [Fact]
+        public void Test_409_10()
+        {
+        }
+
+        [Fact]
+        public void Test_409_11()
+        {
+        }
+
+        [Fact]
+        public void Test_409_12()
+        {
+        }
+
+        [Fact]
+        public void Test_409_13()
+        {
+        }
+
+        [Fact]
+        public void Test_409_14()
+        {
+        }
+
+        [Fact]
+        public void Test_409_15()
+        {
+        }
+
+        [Fact]
+        public void Test_409_16()
+        {
+        }
+
+        [Fact]
+        public void Test_409_17()
+        {
+        }
+
+        [Fact]
+        public void Test_409_18()
+        {
+        }
+
+        [Fact]
+        public void Test_409_19()
+        {
+        }
+
+        [Fact]
+        public void Test_409_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_410
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_410_01()
+        {
+        }
+
+        [Fact]
+        public void Test_410_02()
+        {
+        }
+
+        [Fact]
+        public void Test_410_03()
+        {
+        }
+
+        [Fact]
+        public void Test_410_04()
+        {
+        }
+
+        [Fact]
+        public void Test_410_05()
+        {
+        }
+
+        [Fact]
+        public void Test_410_06()
+        {
+        }
+
+        [Fact]
+        public void Test_410_07()
+        {
+        }
+
+        [Fact]
+        public void Test_410_08()
+        {
+        }
+
+        [Fact]
+        public void Test_410_09()
+        {
+        }
+
+        [Fact]
+        public void Test_410_10()
+        {
+        }
+
+        [Fact]
+        public void Test_410_11()
+        {
+        }
+
+        [Fact]
+        public void Test_410_12()
+        {
+        }
+
+        [Fact]
+        public void Test_410_13()
+        {
+        }
+
+        [Fact]
+        public void Test_410_14()
+        {
+        }
+
+        [Fact]
+        public void Test_410_15()
+        {
+        }
+
+        [Fact]
+        public void Test_410_16()
+        {
+        }
+
+        [Fact]
+        public void Test_410_17()
+        {
+        }
+
+        [Fact]
+        public void Test_410_18()
+        {
+        }
+
+        [Fact]
+        public void Test_410_19()
+        {
+        }
+
+        [Fact]
+        public void Test_410_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_411
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_411_01()
+        {
+        }
+
+        [Fact]
+        public void Test_411_02()
+        {
+        }
+
+        [Fact]
+        public void Test_411_03()
+        {
+        }
+
+        [Fact]
+        public void Test_411_04()
+        {
+        }
+
+        [Fact]
+        public void Test_411_05()
+        {
+        }
+
+        [Fact]
+        public void Test_411_06()
+        {
+        }
+
+        [Fact]
+        public void Test_411_07()
+        {
+        }
+
+        [Fact]
+        public void Test_411_08()
+        {
+        }
+
+        [Fact]
+        public void Test_411_09()
+        {
+        }
+
+        [Fact]
+        public void Test_411_10()
+        {
+        }
+
+        [Fact]
+        public void Test_411_11()
+        {
+        }
+
+        [Fact]
+        public void Test_411_12()
+        {
+        }
+
+        [Fact]
+        public void Test_411_13()
+        {
+        }
+
+        [Fact]
+        public void Test_411_14()
+        {
+        }
+
+        [Fact]
+        public void Test_411_15()
+        {
+        }
+
+        [Fact]
+        public void Test_411_16()
+        {
+        }
+
+        [Fact]
+        public void Test_411_17()
+        {
+        }
+
+        [Fact]
+        public void Test_411_18()
+        {
+        }
+
+        [Fact]
+        public void Test_411_19()
+        {
+        }
+
+        [Fact]
+        public void Test_411_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_412
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_412_01()
+        {
+        }
+
+        [Fact]
+        public void Test_412_02()
+        {
+        }
+
+        [Fact]
+        public void Test_412_03()
+        {
+        }
+
+        [Fact]
+        public void Test_412_04()
+        {
+        }
+
+        [Fact]
+        public void Test_412_05()
+        {
+        }
+
+        [Fact]
+        public void Test_412_06()
+        {
+        }
+
+        [Fact]
+        public void Test_412_07()
+        {
+        }
+
+        [Fact]
+        public void Test_412_08()
+        {
+        }
+
+        [Fact]
+        public void Test_412_09()
+        {
+        }
+
+        [Fact]
+        public void Test_412_10()
+        {
+        }
+
+        [Fact]
+        public void Test_412_11()
+        {
+        }
+
+        [Fact]
+        public void Test_412_12()
+        {
+        }
+
+        [Fact]
+        public void Test_412_13()
+        {
+        }
+
+        [Fact]
+        public void Test_412_14()
+        {
+        }
+
+        [Fact]
+        public void Test_412_15()
+        {
+        }
+
+        [Fact]
+        public void Test_412_16()
+        {
+        }
+
+        [Fact]
+        public void Test_412_17()
+        {
+        }
+
+        [Fact]
+        public void Test_412_18()
+        {
+        }
+
+        [Fact]
+        public void Test_412_19()
+        {
+        }
+
+        [Fact]
+        public void Test_412_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_413
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_413_01()
+        {
+        }
+
+        [Fact]
+        public void Test_413_02()
+        {
+        }
+
+        [Fact]
+        public void Test_413_03()
+        {
+        }
+
+        [Fact]
+        public void Test_413_04()
+        {
+        }
+
+        [Fact]
+        public void Test_413_05()
+        {
+        }
+
+        [Fact]
+        public void Test_413_06()
+        {
+        }
+
+        [Fact]
+        public void Test_413_07()
+        {
+        }
+
+        [Fact]
+        public void Test_413_08()
+        {
+        }
+
+        [Fact]
+        public void Test_413_09()
+        {
+        }
+
+        [Fact]
+        public void Test_413_10()
+        {
+        }
+
+        [Fact]
+        public void Test_413_11()
+        {
+        }
+
+        [Fact]
+        public void Test_413_12()
+        {
+        }
+
+        [Fact]
+        public void Test_413_13()
+        {
+        }
+
+        [Fact]
+        public void Test_413_14()
+        {
+        }
+
+        [Fact]
+        public void Test_413_15()
+        {
+        }
+
+        [Fact]
+        public void Test_413_16()
+        {
+        }
+
+        [Fact]
+        public void Test_413_17()
+        {
+        }
+
+        [Fact]
+        public void Test_413_18()
+        {
+        }
+
+        [Fact]
+        public void Test_413_19()
+        {
+        }
+
+        [Fact]
+        public void Test_413_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_414
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_414_01()
+        {
+        }
+
+        [Fact]
+        public void Test_414_02()
+        {
+        }
+
+        [Fact]
+        public void Test_414_03()
+        {
+        }
+
+        [Fact]
+        public void Test_414_04()
+        {
+        }
+
+        [Fact]
+        public void Test_414_05()
+        {
+        }
+
+        [Fact]
+        public void Test_414_06()
+        {
+        }
+
+        [Fact]
+        public void Test_414_07()
+        {
+        }
+
+        [Fact]
+        public void Test_414_08()
+        {
+        }
+
+        [Fact]
+        public void Test_414_09()
+        {
+        }
+
+        [Fact]
+        public void Test_414_10()
+        {
+        }
+
+        [Fact]
+        public void Test_414_11()
+        {
+        }
+
+        [Fact]
+        public void Test_414_12()
+        {
+        }
+
+        [Fact]
+        public void Test_414_13()
+        {
+        }
+
+        [Fact]
+        public void Test_414_14()
+        {
+        }
+
+        [Fact]
+        public void Test_414_15()
+        {
+        }
+
+        [Fact]
+        public void Test_414_16()
+        {
+        }
+
+        [Fact]
+        public void Test_414_17()
+        {
+        }
+
+        [Fact]
+        public void Test_414_18()
+        {
+        }
+
+        [Fact]
+        public void Test_414_19()
+        {
+        }
+
+        [Fact]
+        public void Test_414_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_415
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_415_01()
+        {
+        }
+
+        [Fact]
+        public void Test_415_02()
+        {
+        }
+
+        [Fact]
+        public void Test_415_03()
+        {
+        }
+
+        [Fact]
+        public void Test_415_04()
+        {
+        }
+
+        [Fact]
+        public void Test_415_05()
+        {
+        }
+
+        [Fact]
+        public void Test_415_06()
+        {
+        }
+
+        [Fact]
+        public void Test_415_07()
+        {
+        }
+
+        [Fact]
+        public void Test_415_08()
+        {
+        }
+
+        [Fact]
+        public void Test_415_09()
+        {
+        }
+
+        [Fact]
+        public void Test_415_10()
+        {
+        }
+
+        [Fact]
+        public void Test_415_11()
+        {
+        }
+
+        [Fact]
+        public void Test_415_12()
+        {
+        }
+
+        [Fact]
+        public void Test_415_13()
+        {
+        }
+
+        [Fact]
+        public void Test_415_14()
+        {
+        }
+
+        [Fact]
+        public void Test_415_15()
+        {
+        }
+
+        [Fact]
+        public void Test_415_16()
+        {
+        }
+
+        [Fact]
+        public void Test_415_17()
+        {
+        }
+
+        [Fact]
+        public void Test_415_18()
+        {
+        }
+
+        [Fact]
+        public void Test_415_19()
+        {
+        }
+
+        [Fact]
+        public void Test_415_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_416
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_416_01()
+        {
+        }
+
+        [Fact]
+        public void Test_416_02()
+        {
+        }
+
+        [Fact]
+        public void Test_416_03()
+        {
+        }
+
+        [Fact]
+        public void Test_416_04()
+        {
+        }
+
+        [Fact]
+        public void Test_416_05()
+        {
+        }
+
+        [Fact]
+        public void Test_416_06()
+        {
+        }
+
+        [Fact]
+        public void Test_416_07()
+        {
+        }
+
+        [Fact]
+        public void Test_416_08()
+        {
+        }
+
+        [Fact]
+        public void Test_416_09()
+        {
+        }
+
+        [Fact]
+        public void Test_416_10()
+        {
+        }
+
+        [Fact]
+        public void Test_416_11()
+        {
+        }
+
+        [Fact]
+        public void Test_416_12()
+        {
+        }
+
+        [Fact]
+        public void Test_416_13()
+        {
+        }
+
+        [Fact]
+        public void Test_416_14()
+        {
+        }
+
+        [Fact]
+        public void Test_416_15()
+        {
+        }
+
+        [Fact]
+        public void Test_416_16()
+        {
+        }
+
+        [Fact]
+        public void Test_416_17()
+        {
+        }
+
+        [Fact]
+        public void Test_416_18()
+        {
+        }
+
+        [Fact]
+        public void Test_416_19()
+        {
+        }
+
+        [Fact]
+        public void Test_416_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_417
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_417_01()
+        {
+        }
+
+        [Fact]
+        public void Test_417_02()
+        {
+        }
+
+        [Fact]
+        public void Test_417_03()
+        {
+        }
+
+        [Fact]
+        public void Test_417_04()
+        {
+        }
+
+        [Fact]
+        public void Test_417_05()
+        {
+        }
+
+        [Fact]
+        public void Test_417_06()
+        {
+        }
+
+        [Fact]
+        public void Test_417_07()
+        {
+        }
+
+        [Fact]
+        public void Test_417_08()
+        {
+        }
+
+        [Fact]
+        public void Test_417_09()
+        {
+        }
+
+        [Fact]
+        public void Test_417_10()
+        {
+        }
+
+        [Fact]
+        public void Test_417_11()
+        {
+        }
+
+        [Fact]
+        public void Test_417_12()
+        {
+        }
+
+        [Fact]
+        public void Test_417_13()
+        {
+        }
+
+        [Fact]
+        public void Test_417_14()
+        {
+        }
+
+        [Fact]
+        public void Test_417_15()
+        {
+        }
+
+        [Fact]
+        public void Test_417_16()
+        {
+        }
+
+        [Fact]
+        public void Test_417_17()
+        {
+        }
+
+        [Fact]
+        public void Test_417_18()
+        {
+        }
+
+        [Fact]
+        public void Test_417_19()
+        {
+        }
+
+        [Fact]
+        public void Test_417_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_418
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_418_01()
+        {
+        }
+
+        [Fact]
+        public void Test_418_02()
+        {
+        }
+
+        [Fact]
+        public void Test_418_03()
+        {
+        }
+
+        [Fact]
+        public void Test_418_04()
+        {
+        }
+
+        [Fact]
+        public void Test_418_05()
+        {
+        }
+
+        [Fact]
+        public void Test_418_06()
+        {
+        }
+
+        [Fact]
+        public void Test_418_07()
+        {
+        }
+
+        [Fact]
+        public void Test_418_08()
+        {
+        }
+
+        [Fact]
+        public void Test_418_09()
+        {
+        }
+
+        [Fact]
+        public void Test_418_10()
+        {
+        }
+
+        [Fact]
+        public void Test_418_11()
+        {
+        }
+
+        [Fact]
+        public void Test_418_12()
+        {
+        }
+
+        [Fact]
+        public void Test_418_13()
+        {
+        }
+
+        [Fact]
+        public void Test_418_14()
+        {
+        }
+
+        [Fact]
+        public void Test_418_15()
+        {
+        }
+
+        [Fact]
+        public void Test_418_16()
+        {
+        }
+
+        [Fact]
+        public void Test_418_17()
+        {
+        }
+
+        [Fact]
+        public void Test_418_18()
+        {
+        }
+
+        [Fact]
+        public void Test_418_19()
+        {
+        }
+
+        [Fact]
+        public void Test_418_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_419
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_419_01()
+        {
+        }
+
+        [Fact]
+        public void Test_419_02()
+        {
+        }
+
+        [Fact]
+        public void Test_419_03()
+        {
+        }
+
+        [Fact]
+        public void Test_419_04()
+        {
+        }
+
+        [Fact]
+        public void Test_419_05()
+        {
+        }
+
+        [Fact]
+        public void Test_419_06()
+        {
+        }
+
+        [Fact]
+        public void Test_419_07()
+        {
+        }
+
+        [Fact]
+        public void Test_419_08()
+        {
+        }
+
+        [Fact]
+        public void Test_419_09()
+        {
+        }
+
+        [Fact]
+        public void Test_419_10()
+        {
+        }
+
+        [Fact]
+        public void Test_419_11()
+        {
+        }
+
+        [Fact]
+        public void Test_419_12()
+        {
+        }
+
+        [Fact]
+        public void Test_419_13()
+        {
+        }
+
+        [Fact]
+        public void Test_419_14()
+        {
+        }
+
+        [Fact]
+        public void Test_419_15()
+        {
+        }
+
+        [Fact]
+        public void Test_419_16()
+        {
+        }
+
+        [Fact]
+        public void Test_419_17()
+        {
+        }
+
+        [Fact]
+        public void Test_419_18()
+        {
+        }
+
+        [Fact]
+        public void Test_419_19()
+        {
+        }
+
+        [Fact]
+        public void Test_419_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_420
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_420_01()
+        {
+        }
+
+        [Fact]
+        public void Test_420_02()
+        {
+        }
+
+        [Fact]
+        public void Test_420_03()
+        {
+        }
+
+        [Fact]
+        public void Test_420_04()
+        {
+        }
+
+        [Fact]
+        public void Test_420_05()
+        {
+        }
+
+        [Fact]
+        public void Test_420_06()
+        {
+        }
+
+        [Fact]
+        public void Test_420_07()
+        {
+        }
+
+        [Fact]
+        public void Test_420_08()
+        {
+        }
+
+        [Fact]
+        public void Test_420_09()
+        {
+        }
+
+        [Fact]
+        public void Test_420_10()
+        {
+        }
+
+        [Fact]
+        public void Test_420_11()
+        {
+        }
+
+        [Fact]
+        public void Test_420_12()
+        {
+        }
+
+        [Fact]
+        public void Test_420_13()
+        {
+        }
+
+        [Fact]
+        public void Test_420_14()
+        {
+        }
+
+        [Fact]
+        public void Test_420_15()
+        {
+        }
+
+        [Fact]
+        public void Test_420_16()
+        {
+        }
+
+        [Fact]
+        public void Test_420_17()
+        {
+        }
+
+        [Fact]
+        public void Test_420_18()
+        {
+        }
+
+        [Fact]
+        public void Test_420_19()
+        {
+        }
+
+        [Fact]
+        public void Test_420_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_421
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_421_01()
+        {
+        }
+
+        [Fact]
+        public void Test_421_02()
+        {
+        }
+
+        [Fact]
+        public void Test_421_03()
+        {
+        }
+
+        [Fact]
+        public void Test_421_04()
+        {
+        }
+
+        [Fact]
+        public void Test_421_05()
+        {
+        }
+
+        [Fact]
+        public void Test_421_06()
+        {
+        }
+
+        [Fact]
+        public void Test_421_07()
+        {
+        }
+
+        [Fact]
+        public void Test_421_08()
+        {
+        }
+
+        [Fact]
+        public void Test_421_09()
+        {
+        }
+
+        [Fact]
+        public void Test_421_10()
+        {
+        }
+
+        [Fact]
+        public void Test_421_11()
+        {
+        }
+
+        [Fact]
+        public void Test_421_12()
+        {
+        }
+
+        [Fact]
+        public void Test_421_13()
+        {
+        }
+
+        [Fact]
+        public void Test_421_14()
+        {
+        }
+
+        [Fact]
+        public void Test_421_15()
+        {
+        }
+
+        [Fact]
+        public void Test_421_16()
+        {
+        }
+
+        [Fact]
+        public void Test_421_17()
+        {
+        }
+
+        [Fact]
+        public void Test_421_18()
+        {
+        }
+
+        [Fact]
+        public void Test_421_19()
+        {
+        }
+
+        [Fact]
+        public void Test_421_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_422
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_422_01()
+        {
+        }
+
+        [Fact]
+        public void Test_422_02()
+        {
+        }
+
+        [Fact]
+        public void Test_422_03()
+        {
+        }
+
+        [Fact]
+        public void Test_422_04()
+        {
+        }
+
+        [Fact]
+        public void Test_422_05()
+        {
+        }
+
+        [Fact]
+        public void Test_422_06()
+        {
+        }
+
+        [Fact]
+        public void Test_422_07()
+        {
+        }
+
+        [Fact]
+        public void Test_422_08()
+        {
+        }
+
+        [Fact]
+        public void Test_422_09()
+        {
+        }
+
+        [Fact]
+        public void Test_422_10()
+        {
+        }
+
+        [Fact]
+        public void Test_422_11()
+        {
+        }
+
+        [Fact]
+        public void Test_422_12()
+        {
+        }
+
+        [Fact]
+        public void Test_422_13()
+        {
+        }
+
+        [Fact]
+        public void Test_422_14()
+        {
+        }
+
+        [Fact]
+        public void Test_422_15()
+        {
+        }
+
+        [Fact]
+        public void Test_422_16()
+        {
+        }
+
+        [Fact]
+        public void Test_422_17()
+        {
+        }
+
+        [Fact]
+        public void Test_422_18()
+        {
+        }
+
+        [Fact]
+        public void Test_422_19()
+        {
+        }
+
+        [Fact]
+        public void Test_422_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_423
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_423_01()
+        {
+        }
+
+        [Fact]
+        public void Test_423_02()
+        {
+        }
+
+        [Fact]
+        public void Test_423_03()
+        {
+        }
+
+        [Fact]
+        public void Test_423_04()
+        {
+        }
+
+        [Fact]
+        public void Test_423_05()
+        {
+        }
+
+        [Fact]
+        public void Test_423_06()
+        {
+        }
+
+        [Fact]
+        public void Test_423_07()
+        {
+        }
+
+        [Fact]
+        public void Test_423_08()
+        {
+        }
+
+        [Fact]
+        public void Test_423_09()
+        {
+        }
+
+        [Fact]
+        public void Test_423_10()
+        {
+        }
+
+        [Fact]
+        public void Test_423_11()
+        {
+        }
+
+        [Fact]
+        public void Test_423_12()
+        {
+        }
+
+        [Fact]
+        public void Test_423_13()
+        {
+        }
+
+        [Fact]
+        public void Test_423_14()
+        {
+        }
+
+        [Fact]
+        public void Test_423_15()
+        {
+        }
+
+        [Fact]
+        public void Test_423_16()
+        {
+        }
+
+        [Fact]
+        public void Test_423_17()
+        {
+        }
+
+        [Fact]
+        public void Test_423_18()
+        {
+        }
+
+        [Fact]
+        public void Test_423_19()
+        {
+        }
+
+        [Fact]
+        public void Test_423_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_424
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_424_01()
+        {
+        }
+
+        [Fact]
+        public void Test_424_02()
+        {
+        }
+
+        [Fact]
+        public void Test_424_03()
+        {
+        }
+
+        [Fact]
+        public void Test_424_04()
+        {
+        }
+
+        [Fact]
+        public void Test_424_05()
+        {
+        }
+
+        [Fact]
+        public void Test_424_06()
+        {
+        }
+
+        [Fact]
+        public void Test_424_07()
+        {
+        }
+
+        [Fact]
+        public void Test_424_08()
+        {
+        }
+
+        [Fact]
+        public void Test_424_09()
+        {
+        }
+
+        [Fact]
+        public void Test_424_10()
+        {
+        }
+
+        [Fact]
+        public void Test_424_11()
+        {
+        }
+
+        [Fact]
+        public void Test_424_12()
+        {
+        }
+
+        [Fact]
+        public void Test_424_13()
+        {
+        }
+
+        [Fact]
+        public void Test_424_14()
+        {
+        }
+
+        [Fact]
+        public void Test_424_15()
+        {
+        }
+
+        [Fact]
+        public void Test_424_16()
+        {
+        }
+
+        [Fact]
+        public void Test_424_17()
+        {
+        }
+
+        [Fact]
+        public void Test_424_18()
+        {
+        }
+
+        [Fact]
+        public void Test_424_19()
+        {
+        }
+
+        [Fact]
+        public void Test_424_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_425
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_425_01()
+        {
+        }
+
+        [Fact]
+        public void Test_425_02()
+        {
+        }
+
+        [Fact]
+        public void Test_425_03()
+        {
+        }
+
+        [Fact]
+        public void Test_425_04()
+        {
+        }
+
+        [Fact]
+        public void Test_425_05()
+        {
+        }
+
+        [Fact]
+        public void Test_425_06()
+        {
+        }
+
+        [Fact]
+        public void Test_425_07()
+        {
+        }
+
+        [Fact]
+        public void Test_425_08()
+        {
+        }
+
+        [Fact]
+        public void Test_425_09()
+        {
+        }
+
+        [Fact]
+        public void Test_425_10()
+        {
+        }
+
+        [Fact]
+        public void Test_425_11()
+        {
+        }
+
+        [Fact]
+        public void Test_425_12()
+        {
+        }
+
+        [Fact]
+        public void Test_425_13()
+        {
+        }
+
+        [Fact]
+        public void Test_425_14()
+        {
+        }
+
+        [Fact]
+        public void Test_425_15()
+        {
+        }
+
+        [Fact]
+        public void Test_425_16()
+        {
+        }
+
+        [Fact]
+        public void Test_425_17()
+        {
+        }
+
+        [Fact]
+        public void Test_425_18()
+        {
+        }
+
+        [Fact]
+        public void Test_425_19()
+        {
+        }
+
+        [Fact]
+        public void Test_425_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_426
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_426_01()
+        {
+        }
+
+        [Fact]
+        public void Test_426_02()
+        {
+        }
+
+        [Fact]
+        public void Test_426_03()
+        {
+        }
+
+        [Fact]
+        public void Test_426_04()
+        {
+        }
+
+        [Fact]
+        public void Test_426_05()
+        {
+        }
+
+        [Fact]
+        public void Test_426_06()
+        {
+        }
+
+        [Fact]
+        public void Test_426_07()
+        {
+        }
+
+        [Fact]
+        public void Test_426_08()
+        {
+        }
+
+        [Fact]
+        public void Test_426_09()
+        {
+        }
+
+        [Fact]
+        public void Test_426_10()
+        {
+        }
+
+        [Fact]
+        public void Test_426_11()
+        {
+        }
+
+        [Fact]
+        public void Test_426_12()
+        {
+        }
+
+        [Fact]
+        public void Test_426_13()
+        {
+        }
+
+        [Fact]
+        public void Test_426_14()
+        {
+        }
+
+        [Fact]
+        public void Test_426_15()
+        {
+        }
+
+        [Fact]
+        public void Test_426_16()
+        {
+        }
+
+        [Fact]
+        public void Test_426_17()
+        {
+        }
+
+        [Fact]
+        public void Test_426_18()
+        {
+        }
+
+        [Fact]
+        public void Test_426_19()
+        {
+        }
+
+        [Fact]
+        public void Test_426_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_427
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_427_01()
+        {
+        }
+
+        [Fact]
+        public void Test_427_02()
+        {
+        }
+
+        [Fact]
+        public void Test_427_03()
+        {
+        }
+
+        [Fact]
+        public void Test_427_04()
+        {
+        }
+
+        [Fact]
+        public void Test_427_05()
+        {
+        }
+
+        [Fact]
+        public void Test_427_06()
+        {
+        }
+
+        [Fact]
+        public void Test_427_07()
+        {
+        }
+
+        [Fact]
+        public void Test_427_08()
+        {
+        }
+
+        [Fact]
+        public void Test_427_09()
+        {
+        }
+
+        [Fact]
+        public void Test_427_10()
+        {
+        }
+
+        [Fact]
+        public void Test_427_11()
+        {
+        }
+
+        [Fact]
+        public void Test_427_12()
+        {
+        }
+
+        [Fact]
+        public void Test_427_13()
+        {
+        }
+
+        [Fact]
+        public void Test_427_14()
+        {
+        }
+
+        [Fact]
+        public void Test_427_15()
+        {
+        }
+
+        [Fact]
+        public void Test_427_16()
+        {
+        }
+
+        [Fact]
+        public void Test_427_17()
+        {
+        }
+
+        [Fact]
+        public void Test_427_18()
+        {
+        }
+
+        [Fact]
+        public void Test_427_19()
+        {
+        }
+
+        [Fact]
+        public void Test_427_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_428
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_428_01()
+        {
+        }
+
+        [Fact]
+        public void Test_428_02()
+        {
+        }
+
+        [Fact]
+        public void Test_428_03()
+        {
+        }
+
+        [Fact]
+        public void Test_428_04()
+        {
+        }
+
+        [Fact]
+        public void Test_428_05()
+        {
+        }
+
+        [Fact]
+        public void Test_428_06()
+        {
+        }
+
+        [Fact]
+        public void Test_428_07()
+        {
+        }
+
+        [Fact]
+        public void Test_428_08()
+        {
+        }
+
+        [Fact]
+        public void Test_428_09()
+        {
+        }
+
+        [Fact]
+        public void Test_428_10()
+        {
+        }
+
+        [Fact]
+        public void Test_428_11()
+        {
+        }
+
+        [Fact]
+        public void Test_428_12()
+        {
+        }
+
+        [Fact]
+        public void Test_428_13()
+        {
+        }
+
+        [Fact]
+        public void Test_428_14()
+        {
+        }
+
+        [Fact]
+        public void Test_428_15()
+        {
+        }
+
+        [Fact]
+        public void Test_428_16()
+        {
+        }
+
+        [Fact]
+        public void Test_428_17()
+        {
+        }
+
+        [Fact]
+        public void Test_428_18()
+        {
+        }
+
+        [Fact]
+        public void Test_428_19()
+        {
+        }
+
+        [Fact]
+        public void Test_428_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_429
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_429_01()
+        {
+        }
+
+        [Fact]
+        public void Test_429_02()
+        {
+        }
+
+        [Fact]
+        public void Test_429_03()
+        {
+        }
+
+        [Fact]
+        public void Test_429_04()
+        {
+        }
+
+        [Fact]
+        public void Test_429_05()
+        {
+        }
+
+        [Fact]
+        public void Test_429_06()
+        {
+        }
+
+        [Fact]
+        public void Test_429_07()
+        {
+        }
+
+        [Fact]
+        public void Test_429_08()
+        {
+        }
+
+        [Fact]
+        public void Test_429_09()
+        {
+        }
+
+        [Fact]
+        public void Test_429_10()
+        {
+        }
+
+        [Fact]
+        public void Test_429_11()
+        {
+        }
+
+        [Fact]
+        public void Test_429_12()
+        {
+        }
+
+        [Fact]
+        public void Test_429_13()
+        {
+        }
+
+        [Fact]
+        public void Test_429_14()
+        {
+        }
+
+        [Fact]
+        public void Test_429_15()
+        {
+        }
+
+        [Fact]
+        public void Test_429_16()
+        {
+        }
+
+        [Fact]
+        public void Test_429_17()
+        {
+        }
+
+        [Fact]
+        public void Test_429_18()
+        {
+        }
+
+        [Fact]
+        public void Test_429_19()
+        {
+        }
+
+        [Fact]
+        public void Test_429_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_430
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_430_01()
+        {
+        }
+
+        [Fact]
+        public void Test_430_02()
+        {
+        }
+
+        [Fact]
+        public void Test_430_03()
+        {
+        }
+
+        [Fact]
+        public void Test_430_04()
+        {
+        }
+
+        [Fact]
+        public void Test_430_05()
+        {
+        }
+
+        [Fact]
+        public void Test_430_06()
+        {
+        }
+
+        [Fact]
+        public void Test_430_07()
+        {
+        }
+
+        [Fact]
+        public void Test_430_08()
+        {
+        }
+
+        [Fact]
+        public void Test_430_09()
+        {
+        }
+
+        [Fact]
+        public void Test_430_10()
+        {
+        }
+
+        [Fact]
+        public void Test_430_11()
+        {
+        }
+
+        [Fact]
+        public void Test_430_12()
+        {
+        }
+
+        [Fact]
+        public void Test_430_13()
+        {
+        }
+
+        [Fact]
+        public void Test_430_14()
+        {
+        }
+
+        [Fact]
+        public void Test_430_15()
+        {
+        }
+
+        [Fact]
+        public void Test_430_16()
+        {
+        }
+
+        [Fact]
+        public void Test_430_17()
+        {
+        }
+
+        [Fact]
+        public void Test_430_18()
+        {
+        }
+
+        [Fact]
+        public void Test_430_19()
+        {
+        }
+
+        [Fact]
+        public void Test_430_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_431
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_431_01()
+        {
+        }
+
+        [Fact]
+        public void Test_431_02()
+        {
+        }
+
+        [Fact]
+        public void Test_431_03()
+        {
+        }
+
+        [Fact]
+        public void Test_431_04()
+        {
+        }
+
+        [Fact]
+        public void Test_431_05()
+        {
+        }
+
+        [Fact]
+        public void Test_431_06()
+        {
+        }
+
+        [Fact]
+        public void Test_431_07()
+        {
+        }
+
+        [Fact]
+        public void Test_431_08()
+        {
+        }
+
+        [Fact]
+        public void Test_431_09()
+        {
+        }
+
+        [Fact]
+        public void Test_431_10()
+        {
+        }
+
+        [Fact]
+        public void Test_431_11()
+        {
+        }
+
+        [Fact]
+        public void Test_431_12()
+        {
+        }
+
+        [Fact]
+        public void Test_431_13()
+        {
+        }
+
+        [Fact]
+        public void Test_431_14()
+        {
+        }
+
+        [Fact]
+        public void Test_431_15()
+        {
+        }
+
+        [Fact]
+        public void Test_431_16()
+        {
+        }
+
+        [Fact]
+        public void Test_431_17()
+        {
+        }
+
+        [Fact]
+        public void Test_431_18()
+        {
+        }
+
+        [Fact]
+        public void Test_431_19()
+        {
+        }
+
+        [Fact]
+        public void Test_431_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_432
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_432_01()
+        {
+        }
+
+        [Fact]
+        public void Test_432_02()
+        {
+        }
+
+        [Fact]
+        public void Test_432_03()
+        {
+        }
+
+        [Fact]
+        public void Test_432_04()
+        {
+        }
+
+        [Fact]
+        public void Test_432_05()
+        {
+        }
+
+        [Fact]
+        public void Test_432_06()
+        {
+        }
+
+        [Fact]
+        public void Test_432_07()
+        {
+        }
+
+        [Fact]
+        public void Test_432_08()
+        {
+        }
+
+        [Fact]
+        public void Test_432_09()
+        {
+        }
+
+        [Fact]
+        public void Test_432_10()
+        {
+        }
+
+        [Fact]
+        public void Test_432_11()
+        {
+        }
+
+        [Fact]
+        public void Test_432_12()
+        {
+        }
+
+        [Fact]
+        public void Test_432_13()
+        {
+        }
+
+        [Fact]
+        public void Test_432_14()
+        {
+        }
+
+        [Fact]
+        public void Test_432_15()
+        {
+        }
+
+        [Fact]
+        public void Test_432_16()
+        {
+        }
+
+        [Fact]
+        public void Test_432_17()
+        {
+        }
+
+        [Fact]
+        public void Test_432_18()
+        {
+        }
+
+        [Fact]
+        public void Test_432_19()
+        {
+        }
+
+        [Fact]
+        public void Test_432_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_433
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_433_01()
+        {
+        }
+
+        [Fact]
+        public void Test_433_02()
+        {
+        }
+
+        [Fact]
+        public void Test_433_03()
+        {
+        }
+
+        [Fact]
+        public void Test_433_04()
+        {
+        }
+
+        [Fact]
+        public void Test_433_05()
+        {
+        }
+
+        [Fact]
+        public void Test_433_06()
+        {
+        }
+
+        [Fact]
+        public void Test_433_07()
+        {
+        }
+
+        [Fact]
+        public void Test_433_08()
+        {
+        }
+
+        [Fact]
+        public void Test_433_09()
+        {
+        }
+
+        [Fact]
+        public void Test_433_10()
+        {
+        }
+
+        [Fact]
+        public void Test_433_11()
+        {
+        }
+
+        [Fact]
+        public void Test_433_12()
+        {
+        }
+
+        [Fact]
+        public void Test_433_13()
+        {
+        }
+
+        [Fact]
+        public void Test_433_14()
+        {
+        }
+
+        [Fact]
+        public void Test_433_15()
+        {
+        }
+
+        [Fact]
+        public void Test_433_16()
+        {
+        }
+
+        [Fact]
+        public void Test_433_17()
+        {
+        }
+
+        [Fact]
+        public void Test_433_18()
+        {
+        }
+
+        [Fact]
+        public void Test_433_19()
+        {
+        }
+
+        [Fact]
+        public void Test_433_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_434
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_434_01()
+        {
+        }
+
+        [Fact]
+        public void Test_434_02()
+        {
+        }
+
+        [Fact]
+        public void Test_434_03()
+        {
+        }
+
+        [Fact]
+        public void Test_434_04()
+        {
+        }
+
+        [Fact]
+        public void Test_434_05()
+        {
+        }
+
+        [Fact]
+        public void Test_434_06()
+        {
+        }
+
+        [Fact]
+        public void Test_434_07()
+        {
+        }
+
+        [Fact]
+        public void Test_434_08()
+        {
+        }
+
+        [Fact]
+        public void Test_434_09()
+        {
+        }
+
+        [Fact]
+        public void Test_434_10()
+        {
+        }
+
+        [Fact]
+        public void Test_434_11()
+        {
+        }
+
+        [Fact]
+        public void Test_434_12()
+        {
+        }
+
+        [Fact]
+        public void Test_434_13()
+        {
+        }
+
+        [Fact]
+        public void Test_434_14()
+        {
+        }
+
+        [Fact]
+        public void Test_434_15()
+        {
+        }
+
+        [Fact]
+        public void Test_434_16()
+        {
+        }
+
+        [Fact]
+        public void Test_434_17()
+        {
+        }
+
+        [Fact]
+        public void Test_434_18()
+        {
+        }
+
+        [Fact]
+        public void Test_434_19()
+        {
+        }
+
+        [Fact]
+        public void Test_434_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_435
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_435_01()
+        {
+        }
+
+        [Fact]
+        public void Test_435_02()
+        {
+        }
+
+        [Fact]
+        public void Test_435_03()
+        {
+        }
+
+        [Fact]
+        public void Test_435_04()
+        {
+        }
+
+        [Fact]
+        public void Test_435_05()
+        {
+        }
+
+        [Fact]
+        public void Test_435_06()
+        {
+        }
+
+        [Fact]
+        public void Test_435_07()
+        {
+        }
+
+        [Fact]
+        public void Test_435_08()
+        {
+        }
+
+        [Fact]
+        public void Test_435_09()
+        {
+        }
+
+        [Fact]
+        public void Test_435_10()
+        {
+        }
+
+        [Fact]
+        public void Test_435_11()
+        {
+        }
+
+        [Fact]
+        public void Test_435_12()
+        {
+        }
+
+        [Fact]
+        public void Test_435_13()
+        {
+        }
+
+        [Fact]
+        public void Test_435_14()
+        {
+        }
+
+        [Fact]
+        public void Test_435_15()
+        {
+        }
+
+        [Fact]
+        public void Test_435_16()
+        {
+        }
+
+        [Fact]
+        public void Test_435_17()
+        {
+        }
+
+        [Fact]
+        public void Test_435_18()
+        {
+        }
+
+        [Fact]
+        public void Test_435_19()
+        {
+        }
+
+        [Fact]
+        public void Test_435_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_436
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_436_01()
+        {
+        }
+
+        [Fact]
+        public void Test_436_02()
+        {
+        }
+
+        [Fact]
+        public void Test_436_03()
+        {
+        }
+
+        [Fact]
+        public void Test_436_04()
+        {
+        }
+
+        [Fact]
+        public void Test_436_05()
+        {
+        }
+
+        [Fact]
+        public void Test_436_06()
+        {
+        }
+
+        [Fact]
+        public void Test_436_07()
+        {
+        }
+
+        [Fact]
+        public void Test_436_08()
+        {
+        }
+
+        [Fact]
+        public void Test_436_09()
+        {
+        }
+
+        [Fact]
+        public void Test_436_10()
+        {
+        }
+
+        [Fact]
+        public void Test_436_11()
+        {
+        }
+
+        [Fact]
+        public void Test_436_12()
+        {
+        }
+
+        [Fact]
+        public void Test_436_13()
+        {
+        }
+
+        [Fact]
+        public void Test_436_14()
+        {
+        }
+
+        [Fact]
+        public void Test_436_15()
+        {
+        }
+
+        [Fact]
+        public void Test_436_16()
+        {
+        }
+
+        [Fact]
+        public void Test_436_17()
+        {
+        }
+
+        [Fact]
+        public void Test_436_18()
+        {
+        }
+
+        [Fact]
+        public void Test_436_19()
+        {
+        }
+
+        [Fact]
+        public void Test_436_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_437
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_437_01()
+        {
+        }
+
+        [Fact]
+        public void Test_437_02()
+        {
+        }
+
+        [Fact]
+        public void Test_437_03()
+        {
+        }
+
+        [Fact]
+        public void Test_437_04()
+        {
+        }
+
+        [Fact]
+        public void Test_437_05()
+        {
+        }
+
+        [Fact]
+        public void Test_437_06()
+        {
+        }
+
+        [Fact]
+        public void Test_437_07()
+        {
+        }
+
+        [Fact]
+        public void Test_437_08()
+        {
+        }
+
+        [Fact]
+        public void Test_437_09()
+        {
+        }
+
+        [Fact]
+        public void Test_437_10()
+        {
+        }
+
+        [Fact]
+        public void Test_437_11()
+        {
+        }
+
+        [Fact]
+        public void Test_437_12()
+        {
+        }
+
+        [Fact]
+        public void Test_437_13()
+        {
+        }
+
+        [Fact]
+        public void Test_437_14()
+        {
+        }
+
+        [Fact]
+        public void Test_437_15()
+        {
+        }
+
+        [Fact]
+        public void Test_437_16()
+        {
+        }
+
+        [Fact]
+        public void Test_437_17()
+        {
+        }
+
+        [Fact]
+        public void Test_437_18()
+        {
+        }
+
+        [Fact]
+        public void Test_437_19()
+        {
+        }
+
+        [Fact]
+        public void Test_437_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_438
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_438_01()
+        {
+        }
+
+        [Fact]
+        public void Test_438_02()
+        {
+        }
+
+        [Fact]
+        public void Test_438_03()
+        {
+        }
+
+        [Fact]
+        public void Test_438_04()
+        {
+        }
+
+        [Fact]
+        public void Test_438_05()
+        {
+        }
+
+        [Fact]
+        public void Test_438_06()
+        {
+        }
+
+        [Fact]
+        public void Test_438_07()
+        {
+        }
+
+        [Fact]
+        public void Test_438_08()
+        {
+        }
+
+        [Fact]
+        public void Test_438_09()
+        {
+        }
+
+        [Fact]
+        public void Test_438_10()
+        {
+        }
+
+        [Fact]
+        public void Test_438_11()
+        {
+        }
+
+        [Fact]
+        public void Test_438_12()
+        {
+        }
+
+        [Fact]
+        public void Test_438_13()
+        {
+        }
+
+        [Fact]
+        public void Test_438_14()
+        {
+        }
+
+        [Fact]
+        public void Test_438_15()
+        {
+        }
+
+        [Fact]
+        public void Test_438_16()
+        {
+        }
+
+        [Fact]
+        public void Test_438_17()
+        {
+        }
+
+        [Fact]
+        public void Test_438_18()
+        {
+        }
+
+        [Fact]
+        public void Test_438_19()
+        {
+        }
+
+        [Fact]
+        public void Test_438_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_439
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_439_01()
+        {
+        }
+
+        [Fact]
+        public void Test_439_02()
+        {
+        }
+
+        [Fact]
+        public void Test_439_03()
+        {
+        }
+
+        [Fact]
+        public void Test_439_04()
+        {
+        }
+
+        [Fact]
+        public void Test_439_05()
+        {
+        }
+
+        [Fact]
+        public void Test_439_06()
+        {
+        }
+
+        [Fact]
+        public void Test_439_07()
+        {
+        }
+
+        [Fact]
+        public void Test_439_08()
+        {
+        }
+
+        [Fact]
+        public void Test_439_09()
+        {
+        }
+
+        [Fact]
+        public void Test_439_10()
+        {
+        }
+
+        [Fact]
+        public void Test_439_11()
+        {
+        }
+
+        [Fact]
+        public void Test_439_12()
+        {
+        }
+
+        [Fact]
+        public void Test_439_13()
+        {
+        }
+
+        [Fact]
+        public void Test_439_14()
+        {
+        }
+
+        [Fact]
+        public void Test_439_15()
+        {
+        }
+
+        [Fact]
+        public void Test_439_16()
+        {
+        }
+
+        [Fact]
+        public void Test_439_17()
+        {
+        }
+
+        [Fact]
+        public void Test_439_18()
+        {
+        }
+
+        [Fact]
+        public void Test_439_19()
+        {
+        }
+
+        [Fact]
+        public void Test_439_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_440
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_440_01()
+        {
+        }
+
+        [Fact]
+        public void Test_440_02()
+        {
+        }
+
+        [Fact]
+        public void Test_440_03()
+        {
+        }
+
+        [Fact]
+        public void Test_440_04()
+        {
+        }
+
+        [Fact]
+        public void Test_440_05()
+        {
+        }
+
+        [Fact]
+        public void Test_440_06()
+        {
+        }
+
+        [Fact]
+        public void Test_440_07()
+        {
+        }
+
+        [Fact]
+        public void Test_440_08()
+        {
+        }
+
+        [Fact]
+        public void Test_440_09()
+        {
+        }
+
+        [Fact]
+        public void Test_440_10()
+        {
+        }
+
+        [Fact]
+        public void Test_440_11()
+        {
+        }
+
+        [Fact]
+        public void Test_440_12()
+        {
+        }
+
+        [Fact]
+        public void Test_440_13()
+        {
+        }
+
+        [Fact]
+        public void Test_440_14()
+        {
+        }
+
+        [Fact]
+        public void Test_440_15()
+        {
+        }
+
+        [Fact]
+        public void Test_440_16()
+        {
+        }
+
+        [Fact]
+        public void Test_440_17()
+        {
+        }
+
+        [Fact]
+        public void Test_440_18()
+        {
+        }
+
+        [Fact]
+        public void Test_440_19()
+        {
+        }
+
+        [Fact]
+        public void Test_440_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_441
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_441_01()
+        {
+        }
+
+        [Fact]
+        public void Test_441_02()
+        {
+        }
+
+        [Fact]
+        public void Test_441_03()
+        {
+        }
+
+        [Fact]
+        public void Test_441_04()
+        {
+        }
+
+        [Fact]
+        public void Test_441_05()
+        {
+        }
+
+        [Fact]
+        public void Test_441_06()
+        {
+        }
+
+        [Fact]
+        public void Test_441_07()
+        {
+        }
+
+        [Fact]
+        public void Test_441_08()
+        {
+        }
+
+        [Fact]
+        public void Test_441_09()
+        {
+        }
+
+        [Fact]
+        public void Test_441_10()
+        {
+        }
+
+        [Fact]
+        public void Test_441_11()
+        {
+        }
+
+        [Fact]
+        public void Test_441_12()
+        {
+        }
+
+        [Fact]
+        public void Test_441_13()
+        {
+        }
+
+        [Fact]
+        public void Test_441_14()
+        {
+        }
+
+        [Fact]
+        public void Test_441_15()
+        {
+        }
+
+        [Fact]
+        public void Test_441_16()
+        {
+        }
+
+        [Fact]
+        public void Test_441_17()
+        {
+        }
+
+        [Fact]
+        public void Test_441_18()
+        {
+        }
+
+        [Fact]
+        public void Test_441_19()
+        {
+        }
+
+        [Fact]
+        public void Test_441_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_442
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_442_01()
+        {
+        }
+
+        [Fact]
+        public void Test_442_02()
+        {
+        }
+
+        [Fact]
+        public void Test_442_03()
+        {
+        }
+
+        [Fact]
+        public void Test_442_04()
+        {
+        }
+
+        [Fact]
+        public void Test_442_05()
+        {
+        }
+
+        [Fact]
+        public void Test_442_06()
+        {
+        }
+
+        [Fact]
+        public void Test_442_07()
+        {
+        }
+
+        [Fact]
+        public void Test_442_08()
+        {
+        }
+
+        [Fact]
+        public void Test_442_09()
+        {
+        }
+
+        [Fact]
+        public void Test_442_10()
+        {
+        }
+
+        [Fact]
+        public void Test_442_11()
+        {
+        }
+
+        [Fact]
+        public void Test_442_12()
+        {
+        }
+
+        [Fact]
+        public void Test_442_13()
+        {
+        }
+
+        [Fact]
+        public void Test_442_14()
+        {
+        }
+
+        [Fact]
+        public void Test_442_15()
+        {
+        }
+
+        [Fact]
+        public void Test_442_16()
+        {
+        }
+
+        [Fact]
+        public void Test_442_17()
+        {
+        }
+
+        [Fact]
+        public void Test_442_18()
+        {
+        }
+
+        [Fact]
+        public void Test_442_19()
+        {
+        }
+
+        [Fact]
+        public void Test_442_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_443
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_443_01()
+        {
+        }
+
+        [Fact]
+        public void Test_443_02()
+        {
+        }
+
+        [Fact]
+        public void Test_443_03()
+        {
+        }
+
+        [Fact]
+        public void Test_443_04()
+        {
+        }
+
+        [Fact]
+        public void Test_443_05()
+        {
+        }
+
+        [Fact]
+        public void Test_443_06()
+        {
+        }
+
+        [Fact]
+        public void Test_443_07()
+        {
+        }
+
+        [Fact]
+        public void Test_443_08()
+        {
+        }
+
+        [Fact]
+        public void Test_443_09()
+        {
+        }
+
+        [Fact]
+        public void Test_443_10()
+        {
+        }
+
+        [Fact]
+        public void Test_443_11()
+        {
+        }
+
+        [Fact]
+        public void Test_443_12()
+        {
+        }
+
+        [Fact]
+        public void Test_443_13()
+        {
+        }
+
+        [Fact]
+        public void Test_443_14()
+        {
+        }
+
+        [Fact]
+        public void Test_443_15()
+        {
+        }
+
+        [Fact]
+        public void Test_443_16()
+        {
+        }
+
+        [Fact]
+        public void Test_443_17()
+        {
+        }
+
+        [Fact]
+        public void Test_443_18()
+        {
+        }
+
+        [Fact]
+        public void Test_443_19()
+        {
+        }
+
+        [Fact]
+        public void Test_443_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_444
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_444_01()
+        {
+        }
+
+        [Fact]
+        public void Test_444_02()
+        {
+        }
+
+        [Fact]
+        public void Test_444_03()
+        {
+        }
+
+        [Fact]
+        public void Test_444_04()
+        {
+        }
+
+        [Fact]
+        public void Test_444_05()
+        {
+        }
+
+        [Fact]
+        public void Test_444_06()
+        {
+        }
+
+        [Fact]
+        public void Test_444_07()
+        {
+        }
+
+        [Fact]
+        public void Test_444_08()
+        {
+        }
+
+        [Fact]
+        public void Test_444_09()
+        {
+        }
+
+        [Fact]
+        public void Test_444_10()
+        {
+        }
+
+        [Fact]
+        public void Test_444_11()
+        {
+        }
+
+        [Fact]
+        public void Test_444_12()
+        {
+        }
+
+        [Fact]
+        public void Test_444_13()
+        {
+        }
+
+        [Fact]
+        public void Test_444_14()
+        {
+        }
+
+        [Fact]
+        public void Test_444_15()
+        {
+        }
+
+        [Fact]
+        public void Test_444_16()
+        {
+        }
+
+        [Fact]
+        public void Test_444_17()
+        {
+        }
+
+        [Fact]
+        public void Test_444_18()
+        {
+        }
+
+        [Fact]
+        public void Test_444_19()
+        {
+        }
+
+        [Fact]
+        public void Test_444_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_445
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_445_01()
+        {
+        }
+
+        [Fact]
+        public void Test_445_02()
+        {
+        }
+
+        [Fact]
+        public void Test_445_03()
+        {
+        }
+
+        [Fact]
+        public void Test_445_04()
+        {
+        }
+
+        [Fact]
+        public void Test_445_05()
+        {
+        }
+
+        [Fact]
+        public void Test_445_06()
+        {
+        }
+
+        [Fact]
+        public void Test_445_07()
+        {
+        }
+
+        [Fact]
+        public void Test_445_08()
+        {
+        }
+
+        [Fact]
+        public void Test_445_09()
+        {
+        }
+
+        [Fact]
+        public void Test_445_10()
+        {
+        }
+
+        [Fact]
+        public void Test_445_11()
+        {
+        }
+
+        [Fact]
+        public void Test_445_12()
+        {
+        }
+
+        [Fact]
+        public void Test_445_13()
+        {
+        }
+
+        [Fact]
+        public void Test_445_14()
+        {
+        }
+
+        [Fact]
+        public void Test_445_15()
+        {
+        }
+
+        [Fact]
+        public void Test_445_16()
+        {
+        }
+
+        [Fact]
+        public void Test_445_17()
+        {
+        }
+
+        [Fact]
+        public void Test_445_18()
+        {
+        }
+
+        [Fact]
+        public void Test_445_19()
+        {
+        }
+
+        [Fact]
+        public void Test_445_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_446
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_446_01()
+        {
+        }
+
+        [Fact]
+        public void Test_446_02()
+        {
+        }
+
+        [Fact]
+        public void Test_446_03()
+        {
+        }
+
+        [Fact]
+        public void Test_446_04()
+        {
+        }
+
+        [Fact]
+        public void Test_446_05()
+        {
+        }
+
+        [Fact]
+        public void Test_446_06()
+        {
+        }
+
+        [Fact]
+        public void Test_446_07()
+        {
+        }
+
+        [Fact]
+        public void Test_446_08()
+        {
+        }
+
+        [Fact]
+        public void Test_446_09()
+        {
+        }
+
+        [Fact]
+        public void Test_446_10()
+        {
+        }
+
+        [Fact]
+        public void Test_446_11()
+        {
+        }
+
+        [Fact]
+        public void Test_446_12()
+        {
+        }
+
+        [Fact]
+        public void Test_446_13()
+        {
+        }
+
+        [Fact]
+        public void Test_446_14()
+        {
+        }
+
+        [Fact]
+        public void Test_446_15()
+        {
+        }
+
+        [Fact]
+        public void Test_446_16()
+        {
+        }
+
+        [Fact]
+        public void Test_446_17()
+        {
+        }
+
+        [Fact]
+        public void Test_446_18()
+        {
+        }
+
+        [Fact]
+        public void Test_446_19()
+        {
+        }
+
+        [Fact]
+        public void Test_446_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_447
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_447_01()
+        {
+        }
+
+        [Fact]
+        public void Test_447_02()
+        {
+        }
+
+        [Fact]
+        public void Test_447_03()
+        {
+        }
+
+        [Fact]
+        public void Test_447_04()
+        {
+        }
+
+        [Fact]
+        public void Test_447_05()
+        {
+        }
+
+        [Fact]
+        public void Test_447_06()
+        {
+        }
+
+        [Fact]
+        public void Test_447_07()
+        {
+        }
+
+        [Fact]
+        public void Test_447_08()
+        {
+        }
+
+        [Fact]
+        public void Test_447_09()
+        {
+        }
+
+        [Fact]
+        public void Test_447_10()
+        {
+        }
+
+        [Fact]
+        public void Test_447_11()
+        {
+        }
+
+        [Fact]
+        public void Test_447_12()
+        {
+        }
+
+        [Fact]
+        public void Test_447_13()
+        {
+        }
+
+        [Fact]
+        public void Test_447_14()
+        {
+        }
+
+        [Fact]
+        public void Test_447_15()
+        {
+        }
+
+        [Fact]
+        public void Test_447_16()
+        {
+        }
+
+        [Fact]
+        public void Test_447_17()
+        {
+        }
+
+        [Fact]
+        public void Test_447_18()
+        {
+        }
+
+        [Fact]
+        public void Test_447_19()
+        {
+        }
+
+        [Fact]
+        public void Test_447_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_448
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_448_01()
+        {
+        }
+
+        [Fact]
+        public void Test_448_02()
+        {
+        }
+
+        [Fact]
+        public void Test_448_03()
+        {
+        }
+
+        [Fact]
+        public void Test_448_04()
+        {
+        }
+
+        [Fact]
+        public void Test_448_05()
+        {
+        }
+
+        [Fact]
+        public void Test_448_06()
+        {
+        }
+
+        [Fact]
+        public void Test_448_07()
+        {
+        }
+
+        [Fact]
+        public void Test_448_08()
+        {
+        }
+
+        [Fact]
+        public void Test_448_09()
+        {
+        }
+
+        [Fact]
+        public void Test_448_10()
+        {
+        }
+
+        [Fact]
+        public void Test_448_11()
+        {
+        }
+
+        [Fact]
+        public void Test_448_12()
+        {
+        }
+
+        [Fact]
+        public void Test_448_13()
+        {
+        }
+
+        [Fact]
+        public void Test_448_14()
+        {
+        }
+
+        [Fact]
+        public void Test_448_15()
+        {
+        }
+
+        [Fact]
+        public void Test_448_16()
+        {
+        }
+
+        [Fact]
+        public void Test_448_17()
+        {
+        }
+
+        [Fact]
+        public void Test_448_18()
+        {
+        }
+
+        [Fact]
+        public void Test_448_19()
+        {
+        }
+
+        [Fact]
+        public void Test_448_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_449
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_449_01()
+        {
+        }
+
+        [Fact]
+        public void Test_449_02()
+        {
+        }
+
+        [Fact]
+        public void Test_449_03()
+        {
+        }
+
+        [Fact]
+        public void Test_449_04()
+        {
+        }
+
+        [Fact]
+        public void Test_449_05()
+        {
+        }
+
+        [Fact]
+        public void Test_449_06()
+        {
+        }
+
+        [Fact]
+        public void Test_449_07()
+        {
+        }
+
+        [Fact]
+        public void Test_449_08()
+        {
+        }
+
+        [Fact]
+        public void Test_449_09()
+        {
+        }
+
+        [Fact]
+        public void Test_449_10()
+        {
+        }
+
+        [Fact]
+        public void Test_449_11()
+        {
+        }
+
+        [Fact]
+        public void Test_449_12()
+        {
+        }
+
+        [Fact]
+        public void Test_449_13()
+        {
+        }
+
+        [Fact]
+        public void Test_449_14()
+        {
+        }
+
+        [Fact]
+        public void Test_449_15()
+        {
+        }
+
+        [Fact]
+        public void Test_449_16()
+        {
+        }
+
+        [Fact]
+        public void Test_449_17()
+        {
+        }
+
+        [Fact]
+        public void Test_449_18()
+        {
+        }
+
+        [Fact]
+        public void Test_449_19()
+        {
+        }
+
+        [Fact]
+        public void Test_449_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_450
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_450_01()
+        {
+        }
+
+        [Fact]
+        public void Test_450_02()
+        {
+        }
+
+        [Fact]
+        public void Test_450_03()
+        {
+        }
+
+        [Fact]
+        public void Test_450_04()
+        {
+        }
+
+        [Fact]
+        public void Test_450_05()
+        {
+        }
+
+        [Fact]
+        public void Test_450_06()
+        {
+        }
+
+        [Fact]
+        public void Test_450_07()
+        {
+        }
+
+        [Fact]
+        public void Test_450_08()
+        {
+        }
+
+        [Fact]
+        public void Test_450_09()
+        {
+        }
+
+        [Fact]
+        public void Test_450_10()
+        {
+        }
+
+        [Fact]
+        public void Test_450_11()
+        {
+        }
+
+        [Fact]
+        public void Test_450_12()
+        {
+        }
+
+        [Fact]
+        public void Test_450_13()
+        {
+        }
+
+        [Fact]
+        public void Test_450_14()
+        {
+        }
+
+        [Fact]
+        public void Test_450_15()
+        {
+        }
+
+        [Fact]
+        public void Test_450_16()
+        {
+        }
+
+        [Fact]
+        public void Test_450_17()
+        {
+        }
+
+        [Fact]
+        public void Test_450_18()
+        {
+        }
+
+        [Fact]
+        public void Test_450_19()
+        {
+        }
+
+        [Fact]
+        public void Test_450_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_451
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_451_01()
+        {
+        }
+
+        [Fact]
+        public void Test_451_02()
+        {
+        }
+
+        [Fact]
+        public void Test_451_03()
+        {
+        }
+
+        [Fact]
+        public void Test_451_04()
+        {
+        }
+
+        [Fact]
+        public void Test_451_05()
+        {
+        }
+
+        [Fact]
+        public void Test_451_06()
+        {
+        }
+
+        [Fact]
+        public void Test_451_07()
+        {
+        }
+
+        [Fact]
+        public void Test_451_08()
+        {
+        }
+
+        [Fact]
+        public void Test_451_09()
+        {
+        }
+
+        [Fact]
+        public void Test_451_10()
+        {
+        }
+
+        [Fact]
+        public void Test_451_11()
+        {
+        }
+
+        [Fact]
+        public void Test_451_12()
+        {
+        }
+
+        [Fact]
+        public void Test_451_13()
+        {
+        }
+
+        [Fact]
+        public void Test_451_14()
+        {
+        }
+
+        [Fact]
+        public void Test_451_15()
+        {
+        }
+
+        [Fact]
+        public void Test_451_16()
+        {
+        }
+
+        [Fact]
+        public void Test_451_17()
+        {
+        }
+
+        [Fact]
+        public void Test_451_18()
+        {
+        }
+
+        [Fact]
+        public void Test_451_19()
+        {
+        }
+
+        [Fact]
+        public void Test_451_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_452
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_452_01()
+        {
+        }
+
+        [Fact]
+        public void Test_452_02()
+        {
+        }
+
+        [Fact]
+        public void Test_452_03()
+        {
+        }
+
+        [Fact]
+        public void Test_452_04()
+        {
+        }
+
+        [Fact]
+        public void Test_452_05()
+        {
+        }
+
+        [Fact]
+        public void Test_452_06()
+        {
+        }
+
+        [Fact]
+        public void Test_452_07()
+        {
+        }
+
+        [Fact]
+        public void Test_452_08()
+        {
+        }
+
+        [Fact]
+        public void Test_452_09()
+        {
+        }
+
+        [Fact]
+        public void Test_452_10()
+        {
+        }
+
+        [Fact]
+        public void Test_452_11()
+        {
+        }
+
+        [Fact]
+        public void Test_452_12()
+        {
+        }
+
+        [Fact]
+        public void Test_452_13()
+        {
+        }
+
+        [Fact]
+        public void Test_452_14()
+        {
+        }
+
+        [Fact]
+        public void Test_452_15()
+        {
+        }
+
+        [Fact]
+        public void Test_452_16()
+        {
+        }
+
+        [Fact]
+        public void Test_452_17()
+        {
+        }
+
+        [Fact]
+        public void Test_452_18()
+        {
+        }
+
+        [Fact]
+        public void Test_452_19()
+        {
+        }
+
+        [Fact]
+        public void Test_452_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_453
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_453_01()
+        {
+        }
+
+        [Fact]
+        public void Test_453_02()
+        {
+        }
+
+        [Fact]
+        public void Test_453_03()
+        {
+        }
+
+        [Fact]
+        public void Test_453_04()
+        {
+        }
+
+        [Fact]
+        public void Test_453_05()
+        {
+        }
+
+        [Fact]
+        public void Test_453_06()
+        {
+        }
+
+        [Fact]
+        public void Test_453_07()
+        {
+        }
+
+        [Fact]
+        public void Test_453_08()
+        {
+        }
+
+        [Fact]
+        public void Test_453_09()
+        {
+        }
+
+        [Fact]
+        public void Test_453_10()
+        {
+        }
+
+        [Fact]
+        public void Test_453_11()
+        {
+        }
+
+        [Fact]
+        public void Test_453_12()
+        {
+        }
+
+        [Fact]
+        public void Test_453_13()
+        {
+        }
+
+        [Fact]
+        public void Test_453_14()
+        {
+        }
+
+        [Fact]
+        public void Test_453_15()
+        {
+        }
+
+        [Fact]
+        public void Test_453_16()
+        {
+        }
+
+        [Fact]
+        public void Test_453_17()
+        {
+        }
+
+        [Fact]
+        public void Test_453_18()
+        {
+        }
+
+        [Fact]
+        public void Test_453_19()
+        {
+        }
+
+        [Fact]
+        public void Test_453_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_454
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_454_01()
+        {
+        }
+
+        [Fact]
+        public void Test_454_02()
+        {
+        }
+
+        [Fact]
+        public void Test_454_03()
+        {
+        }
+
+        [Fact]
+        public void Test_454_04()
+        {
+        }
+
+        [Fact]
+        public void Test_454_05()
+        {
+        }
+
+        [Fact]
+        public void Test_454_06()
+        {
+        }
+
+        [Fact]
+        public void Test_454_07()
+        {
+        }
+
+        [Fact]
+        public void Test_454_08()
+        {
+        }
+
+        [Fact]
+        public void Test_454_09()
+        {
+        }
+
+        [Fact]
+        public void Test_454_10()
+        {
+        }
+
+        [Fact]
+        public void Test_454_11()
+        {
+        }
+
+        [Fact]
+        public void Test_454_12()
+        {
+        }
+
+        [Fact]
+        public void Test_454_13()
+        {
+        }
+
+        [Fact]
+        public void Test_454_14()
+        {
+        }
+
+        [Fact]
+        public void Test_454_15()
+        {
+        }
+
+        [Fact]
+        public void Test_454_16()
+        {
+        }
+
+        [Fact]
+        public void Test_454_17()
+        {
+        }
+
+        [Fact]
+        public void Test_454_18()
+        {
+        }
+
+        [Fact]
+        public void Test_454_19()
+        {
+        }
+
+        [Fact]
+        public void Test_454_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_455
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_455_01()
+        {
+        }
+
+        [Fact]
+        public void Test_455_02()
+        {
+        }
+
+        [Fact]
+        public void Test_455_03()
+        {
+        }
+
+        [Fact]
+        public void Test_455_04()
+        {
+        }
+
+        [Fact]
+        public void Test_455_05()
+        {
+        }
+
+        [Fact]
+        public void Test_455_06()
+        {
+        }
+
+        [Fact]
+        public void Test_455_07()
+        {
+        }
+
+        [Fact]
+        public void Test_455_08()
+        {
+        }
+
+        [Fact]
+        public void Test_455_09()
+        {
+        }
+
+        [Fact]
+        public void Test_455_10()
+        {
+        }
+
+        [Fact]
+        public void Test_455_11()
+        {
+        }
+
+        [Fact]
+        public void Test_455_12()
+        {
+        }
+
+        [Fact]
+        public void Test_455_13()
+        {
+        }
+
+        [Fact]
+        public void Test_455_14()
+        {
+        }
+
+        [Fact]
+        public void Test_455_15()
+        {
+        }
+
+        [Fact]
+        public void Test_455_16()
+        {
+        }
+
+        [Fact]
+        public void Test_455_17()
+        {
+        }
+
+        [Fact]
+        public void Test_455_18()
+        {
+        }
+
+        [Fact]
+        public void Test_455_19()
+        {
+        }
+
+        [Fact]
+        public void Test_455_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_456
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_456_01()
+        {
+        }
+
+        [Fact]
+        public void Test_456_02()
+        {
+        }
+
+        [Fact]
+        public void Test_456_03()
+        {
+        }
+
+        [Fact]
+        public void Test_456_04()
+        {
+        }
+
+        [Fact]
+        public void Test_456_05()
+        {
+        }
+
+        [Fact]
+        public void Test_456_06()
+        {
+        }
+
+        [Fact]
+        public void Test_456_07()
+        {
+        }
+
+        [Fact]
+        public void Test_456_08()
+        {
+        }
+
+        [Fact]
+        public void Test_456_09()
+        {
+        }
+
+        [Fact]
+        public void Test_456_10()
+        {
+        }
+
+        [Fact]
+        public void Test_456_11()
+        {
+        }
+
+        [Fact]
+        public void Test_456_12()
+        {
+        }
+
+        [Fact]
+        public void Test_456_13()
+        {
+        }
+
+        [Fact]
+        public void Test_456_14()
+        {
+        }
+
+        [Fact]
+        public void Test_456_15()
+        {
+        }
+
+        [Fact]
+        public void Test_456_16()
+        {
+        }
+
+        [Fact]
+        public void Test_456_17()
+        {
+        }
+
+        [Fact]
+        public void Test_456_18()
+        {
+        }
+
+        [Fact]
+        public void Test_456_19()
+        {
+        }
+
+        [Fact]
+        public void Test_456_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_457
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_457_01()
+        {
+        }
+
+        [Fact]
+        public void Test_457_02()
+        {
+        }
+
+        [Fact]
+        public void Test_457_03()
+        {
+        }
+
+        [Fact]
+        public void Test_457_04()
+        {
+        }
+
+        [Fact]
+        public void Test_457_05()
+        {
+        }
+
+        [Fact]
+        public void Test_457_06()
+        {
+        }
+
+        [Fact]
+        public void Test_457_07()
+        {
+        }
+
+        [Fact]
+        public void Test_457_08()
+        {
+        }
+
+        [Fact]
+        public void Test_457_09()
+        {
+        }
+
+        [Fact]
+        public void Test_457_10()
+        {
+        }
+
+        [Fact]
+        public void Test_457_11()
+        {
+        }
+
+        [Fact]
+        public void Test_457_12()
+        {
+        }
+
+        [Fact]
+        public void Test_457_13()
+        {
+        }
+
+        [Fact]
+        public void Test_457_14()
+        {
+        }
+
+        [Fact]
+        public void Test_457_15()
+        {
+        }
+
+        [Fact]
+        public void Test_457_16()
+        {
+        }
+
+        [Fact]
+        public void Test_457_17()
+        {
+        }
+
+        [Fact]
+        public void Test_457_18()
+        {
+        }
+
+        [Fact]
+        public void Test_457_19()
+        {
+        }
+
+        [Fact]
+        public void Test_457_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_458
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_458_01()
+        {
+        }
+
+        [Fact]
+        public void Test_458_02()
+        {
+        }
+
+        [Fact]
+        public void Test_458_03()
+        {
+        }
+
+        [Fact]
+        public void Test_458_04()
+        {
+        }
+
+        [Fact]
+        public void Test_458_05()
+        {
+        }
+
+        [Fact]
+        public void Test_458_06()
+        {
+        }
+
+        [Fact]
+        public void Test_458_07()
+        {
+        }
+
+        [Fact]
+        public void Test_458_08()
+        {
+        }
+
+        [Fact]
+        public void Test_458_09()
+        {
+        }
+
+        [Fact]
+        public void Test_458_10()
+        {
+        }
+
+        [Fact]
+        public void Test_458_11()
+        {
+        }
+
+        [Fact]
+        public void Test_458_12()
+        {
+        }
+
+        [Fact]
+        public void Test_458_13()
+        {
+        }
+
+        [Fact]
+        public void Test_458_14()
+        {
+        }
+
+        [Fact]
+        public void Test_458_15()
+        {
+        }
+
+        [Fact]
+        public void Test_458_16()
+        {
+        }
+
+        [Fact]
+        public void Test_458_17()
+        {
+        }
+
+        [Fact]
+        public void Test_458_18()
+        {
+        }
+
+        [Fact]
+        public void Test_458_19()
+        {
+        }
+
+        [Fact]
+        public void Test_458_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_459
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_459_01()
+        {
+        }
+
+        [Fact]
+        public void Test_459_02()
+        {
+        }
+
+        [Fact]
+        public void Test_459_03()
+        {
+        }
+
+        [Fact]
+        public void Test_459_04()
+        {
+        }
+
+        [Fact]
+        public void Test_459_05()
+        {
+        }
+
+        [Fact]
+        public void Test_459_06()
+        {
+        }
+
+        [Fact]
+        public void Test_459_07()
+        {
+        }
+
+        [Fact]
+        public void Test_459_08()
+        {
+        }
+
+        [Fact]
+        public void Test_459_09()
+        {
+        }
+
+        [Fact]
+        public void Test_459_10()
+        {
+        }
+
+        [Fact]
+        public void Test_459_11()
+        {
+        }
+
+        [Fact]
+        public void Test_459_12()
+        {
+        }
+
+        [Fact]
+        public void Test_459_13()
+        {
+        }
+
+        [Fact]
+        public void Test_459_14()
+        {
+        }
+
+        [Fact]
+        public void Test_459_15()
+        {
+        }
+
+        [Fact]
+        public void Test_459_16()
+        {
+        }
+
+        [Fact]
+        public void Test_459_17()
+        {
+        }
+
+        [Fact]
+        public void Test_459_18()
+        {
+        }
+
+        [Fact]
+        public void Test_459_19()
+        {
+        }
+
+        [Fact]
+        public void Test_459_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_460
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_460_01()
+        {
+        }
+
+        [Fact]
+        public void Test_460_02()
+        {
+        }
+
+        [Fact]
+        public void Test_460_03()
+        {
+        }
+
+        [Fact]
+        public void Test_460_04()
+        {
+        }
+
+        [Fact]
+        public void Test_460_05()
+        {
+        }
+
+        [Fact]
+        public void Test_460_06()
+        {
+        }
+
+        [Fact]
+        public void Test_460_07()
+        {
+        }
+
+        [Fact]
+        public void Test_460_08()
+        {
+        }
+
+        [Fact]
+        public void Test_460_09()
+        {
+        }
+
+        [Fact]
+        public void Test_460_10()
+        {
+        }
+
+        [Fact]
+        public void Test_460_11()
+        {
+        }
+
+        [Fact]
+        public void Test_460_12()
+        {
+        }
+
+        [Fact]
+        public void Test_460_13()
+        {
+        }
+
+        [Fact]
+        public void Test_460_14()
+        {
+        }
+
+        [Fact]
+        public void Test_460_15()
+        {
+        }
+
+        [Fact]
+        public void Test_460_16()
+        {
+        }
+
+        [Fact]
+        public void Test_460_17()
+        {
+        }
+
+        [Fact]
+        public void Test_460_18()
+        {
+        }
+
+        [Fact]
+        public void Test_460_19()
+        {
+        }
+
+        [Fact]
+        public void Test_460_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_461
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_461_01()
+        {
+        }
+
+        [Fact]
+        public void Test_461_02()
+        {
+        }
+
+        [Fact]
+        public void Test_461_03()
+        {
+        }
+
+        [Fact]
+        public void Test_461_04()
+        {
+        }
+
+        [Fact]
+        public void Test_461_05()
+        {
+        }
+
+        [Fact]
+        public void Test_461_06()
+        {
+        }
+
+        [Fact]
+        public void Test_461_07()
+        {
+        }
+
+        [Fact]
+        public void Test_461_08()
+        {
+        }
+
+        [Fact]
+        public void Test_461_09()
+        {
+        }
+
+        [Fact]
+        public void Test_461_10()
+        {
+        }
+
+        [Fact]
+        public void Test_461_11()
+        {
+        }
+
+        [Fact]
+        public void Test_461_12()
+        {
+        }
+
+        [Fact]
+        public void Test_461_13()
+        {
+        }
+
+        [Fact]
+        public void Test_461_14()
+        {
+        }
+
+        [Fact]
+        public void Test_461_15()
+        {
+        }
+
+        [Fact]
+        public void Test_461_16()
+        {
+        }
+
+        [Fact]
+        public void Test_461_17()
+        {
+        }
+
+        [Fact]
+        public void Test_461_18()
+        {
+        }
+
+        [Fact]
+        public void Test_461_19()
+        {
+        }
+
+        [Fact]
+        public void Test_461_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_462
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_462_01()
+        {
+        }
+
+        [Fact]
+        public void Test_462_02()
+        {
+        }
+
+        [Fact]
+        public void Test_462_03()
+        {
+        }
+
+        [Fact]
+        public void Test_462_04()
+        {
+        }
+
+        [Fact]
+        public void Test_462_05()
+        {
+        }
+
+        [Fact]
+        public void Test_462_06()
+        {
+        }
+
+        [Fact]
+        public void Test_462_07()
+        {
+        }
+
+        [Fact]
+        public void Test_462_08()
+        {
+        }
+
+        [Fact]
+        public void Test_462_09()
+        {
+        }
+
+        [Fact]
+        public void Test_462_10()
+        {
+        }
+
+        [Fact]
+        public void Test_462_11()
+        {
+        }
+
+        [Fact]
+        public void Test_462_12()
+        {
+        }
+
+        [Fact]
+        public void Test_462_13()
+        {
+        }
+
+        [Fact]
+        public void Test_462_14()
+        {
+        }
+
+        [Fact]
+        public void Test_462_15()
+        {
+        }
+
+        [Fact]
+        public void Test_462_16()
+        {
+        }
+
+        [Fact]
+        public void Test_462_17()
+        {
+        }
+
+        [Fact]
+        public void Test_462_18()
+        {
+        }
+
+        [Fact]
+        public void Test_462_19()
+        {
+        }
+
+        [Fact]
+        public void Test_462_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_463
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_463_01()
+        {
+        }
+
+        [Fact]
+        public void Test_463_02()
+        {
+        }
+
+        [Fact]
+        public void Test_463_03()
+        {
+        }
+
+        [Fact]
+        public void Test_463_04()
+        {
+        }
+
+        [Fact]
+        public void Test_463_05()
+        {
+        }
+
+        [Fact]
+        public void Test_463_06()
+        {
+        }
+
+        [Fact]
+        public void Test_463_07()
+        {
+        }
+
+        [Fact]
+        public void Test_463_08()
+        {
+        }
+
+        [Fact]
+        public void Test_463_09()
+        {
+        }
+
+        [Fact]
+        public void Test_463_10()
+        {
+        }
+
+        [Fact]
+        public void Test_463_11()
+        {
+        }
+
+        [Fact]
+        public void Test_463_12()
+        {
+        }
+
+        [Fact]
+        public void Test_463_13()
+        {
+        }
+
+        [Fact]
+        public void Test_463_14()
+        {
+        }
+
+        [Fact]
+        public void Test_463_15()
+        {
+        }
+
+        [Fact]
+        public void Test_463_16()
+        {
+        }
+
+        [Fact]
+        public void Test_463_17()
+        {
+        }
+
+        [Fact]
+        public void Test_463_18()
+        {
+        }
+
+        [Fact]
+        public void Test_463_19()
+        {
+        }
+
+        [Fact]
+        public void Test_463_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_464
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_464_01()
+        {
+        }
+
+        [Fact]
+        public void Test_464_02()
+        {
+        }
+
+        [Fact]
+        public void Test_464_03()
+        {
+        }
+
+        [Fact]
+        public void Test_464_04()
+        {
+        }
+
+        [Fact]
+        public void Test_464_05()
+        {
+        }
+
+        [Fact]
+        public void Test_464_06()
+        {
+        }
+
+        [Fact]
+        public void Test_464_07()
+        {
+        }
+
+        [Fact]
+        public void Test_464_08()
+        {
+        }
+
+        [Fact]
+        public void Test_464_09()
+        {
+        }
+
+        [Fact]
+        public void Test_464_10()
+        {
+        }
+
+        [Fact]
+        public void Test_464_11()
+        {
+        }
+
+        [Fact]
+        public void Test_464_12()
+        {
+        }
+
+        [Fact]
+        public void Test_464_13()
+        {
+        }
+
+        [Fact]
+        public void Test_464_14()
+        {
+        }
+
+        [Fact]
+        public void Test_464_15()
+        {
+        }
+
+        [Fact]
+        public void Test_464_16()
+        {
+        }
+
+        [Fact]
+        public void Test_464_17()
+        {
+        }
+
+        [Fact]
+        public void Test_464_18()
+        {
+        }
+
+        [Fact]
+        public void Test_464_19()
+        {
+        }
+
+        [Fact]
+        public void Test_464_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_465
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_465_01()
+        {
+        }
+
+        [Fact]
+        public void Test_465_02()
+        {
+        }
+
+        [Fact]
+        public void Test_465_03()
+        {
+        }
+
+        [Fact]
+        public void Test_465_04()
+        {
+        }
+
+        [Fact]
+        public void Test_465_05()
+        {
+        }
+
+        [Fact]
+        public void Test_465_06()
+        {
+        }
+
+        [Fact]
+        public void Test_465_07()
+        {
+        }
+
+        [Fact]
+        public void Test_465_08()
+        {
+        }
+
+        [Fact]
+        public void Test_465_09()
+        {
+        }
+
+        [Fact]
+        public void Test_465_10()
+        {
+        }
+
+        [Fact]
+        public void Test_465_11()
+        {
+        }
+
+        [Fact]
+        public void Test_465_12()
+        {
+        }
+
+        [Fact]
+        public void Test_465_13()
+        {
+        }
+
+        [Fact]
+        public void Test_465_14()
+        {
+        }
+
+        [Fact]
+        public void Test_465_15()
+        {
+        }
+
+        [Fact]
+        public void Test_465_16()
+        {
+        }
+
+        [Fact]
+        public void Test_465_17()
+        {
+        }
+
+        [Fact]
+        public void Test_465_18()
+        {
+        }
+
+        [Fact]
+        public void Test_465_19()
+        {
+        }
+
+        [Fact]
+        public void Test_465_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_466
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_466_01()
+        {
+        }
+
+        [Fact]
+        public void Test_466_02()
+        {
+        }
+
+        [Fact]
+        public void Test_466_03()
+        {
+        }
+
+        [Fact]
+        public void Test_466_04()
+        {
+        }
+
+        [Fact]
+        public void Test_466_05()
+        {
+        }
+
+        [Fact]
+        public void Test_466_06()
+        {
+        }
+
+        [Fact]
+        public void Test_466_07()
+        {
+        }
+
+        [Fact]
+        public void Test_466_08()
+        {
+        }
+
+        [Fact]
+        public void Test_466_09()
+        {
+        }
+
+        [Fact]
+        public void Test_466_10()
+        {
+        }
+
+        [Fact]
+        public void Test_466_11()
+        {
+        }
+
+        [Fact]
+        public void Test_466_12()
+        {
+        }
+
+        [Fact]
+        public void Test_466_13()
+        {
+        }
+
+        [Fact]
+        public void Test_466_14()
+        {
+        }
+
+        [Fact]
+        public void Test_466_15()
+        {
+        }
+
+        [Fact]
+        public void Test_466_16()
+        {
+        }
+
+        [Fact]
+        public void Test_466_17()
+        {
+        }
+
+        [Fact]
+        public void Test_466_18()
+        {
+        }
+
+        [Fact]
+        public void Test_466_19()
+        {
+        }
+
+        [Fact]
+        public void Test_466_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_467
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_467_01()
+        {
+        }
+
+        [Fact]
+        public void Test_467_02()
+        {
+        }
+
+        [Fact]
+        public void Test_467_03()
+        {
+        }
+
+        [Fact]
+        public void Test_467_04()
+        {
+        }
+
+        [Fact]
+        public void Test_467_05()
+        {
+        }
+
+        [Fact]
+        public void Test_467_06()
+        {
+        }
+
+        [Fact]
+        public void Test_467_07()
+        {
+        }
+
+        [Fact]
+        public void Test_467_08()
+        {
+        }
+
+        [Fact]
+        public void Test_467_09()
+        {
+        }
+
+        [Fact]
+        public void Test_467_10()
+        {
+        }
+
+        [Fact]
+        public void Test_467_11()
+        {
+        }
+
+        [Fact]
+        public void Test_467_12()
+        {
+        }
+
+        [Fact]
+        public void Test_467_13()
+        {
+        }
+
+        [Fact]
+        public void Test_467_14()
+        {
+        }
+
+        [Fact]
+        public void Test_467_15()
+        {
+        }
+
+        [Fact]
+        public void Test_467_16()
+        {
+        }
+
+        [Fact]
+        public void Test_467_17()
+        {
+        }
+
+        [Fact]
+        public void Test_467_18()
+        {
+        }
+
+        [Fact]
+        public void Test_467_19()
+        {
+        }
+
+        [Fact]
+        public void Test_467_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_468
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_468_01()
+        {
+        }
+
+        [Fact]
+        public void Test_468_02()
+        {
+        }
+
+        [Fact]
+        public void Test_468_03()
+        {
+        }
+
+        [Fact]
+        public void Test_468_04()
+        {
+        }
+
+        [Fact]
+        public void Test_468_05()
+        {
+        }
+
+        [Fact]
+        public void Test_468_06()
+        {
+        }
+
+        [Fact]
+        public void Test_468_07()
+        {
+        }
+
+        [Fact]
+        public void Test_468_08()
+        {
+        }
+
+        [Fact]
+        public void Test_468_09()
+        {
+        }
+
+        [Fact]
+        public void Test_468_10()
+        {
+        }
+
+        [Fact]
+        public void Test_468_11()
+        {
+        }
+
+        [Fact]
+        public void Test_468_12()
+        {
+        }
+
+        [Fact]
+        public void Test_468_13()
+        {
+        }
+
+        [Fact]
+        public void Test_468_14()
+        {
+        }
+
+        [Fact]
+        public void Test_468_15()
+        {
+        }
+
+        [Fact]
+        public void Test_468_16()
+        {
+        }
+
+        [Fact]
+        public void Test_468_17()
+        {
+        }
+
+        [Fact]
+        public void Test_468_18()
+        {
+        }
+
+        [Fact]
+        public void Test_468_19()
+        {
+        }
+
+        [Fact]
+        public void Test_468_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_469
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_469_01()
+        {
+        }
+
+        [Fact]
+        public void Test_469_02()
+        {
+        }
+
+        [Fact]
+        public void Test_469_03()
+        {
+        }
+
+        [Fact]
+        public void Test_469_04()
+        {
+        }
+
+        [Fact]
+        public void Test_469_05()
+        {
+        }
+
+        [Fact]
+        public void Test_469_06()
+        {
+        }
+
+        [Fact]
+        public void Test_469_07()
+        {
+        }
+
+        [Fact]
+        public void Test_469_08()
+        {
+        }
+
+        [Fact]
+        public void Test_469_09()
+        {
+        }
+
+        [Fact]
+        public void Test_469_10()
+        {
+        }
+
+        [Fact]
+        public void Test_469_11()
+        {
+        }
+
+        [Fact]
+        public void Test_469_12()
+        {
+        }
+
+        [Fact]
+        public void Test_469_13()
+        {
+        }
+
+        [Fact]
+        public void Test_469_14()
+        {
+        }
+
+        [Fact]
+        public void Test_469_15()
+        {
+        }
+
+        [Fact]
+        public void Test_469_16()
+        {
+        }
+
+        [Fact]
+        public void Test_469_17()
+        {
+        }
+
+        [Fact]
+        public void Test_469_18()
+        {
+        }
+
+        [Fact]
+        public void Test_469_19()
+        {
+        }
+
+        [Fact]
+        public void Test_469_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_470
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_470_01()
+        {
+        }
+
+        [Fact]
+        public void Test_470_02()
+        {
+        }
+
+        [Fact]
+        public void Test_470_03()
+        {
+        }
+
+        [Fact]
+        public void Test_470_04()
+        {
+        }
+
+        [Fact]
+        public void Test_470_05()
+        {
+        }
+
+        [Fact]
+        public void Test_470_06()
+        {
+        }
+
+        [Fact]
+        public void Test_470_07()
+        {
+        }
+
+        [Fact]
+        public void Test_470_08()
+        {
+        }
+
+        [Fact]
+        public void Test_470_09()
+        {
+        }
+
+        [Fact]
+        public void Test_470_10()
+        {
+        }
+
+        [Fact]
+        public void Test_470_11()
+        {
+        }
+
+        [Fact]
+        public void Test_470_12()
+        {
+        }
+
+        [Fact]
+        public void Test_470_13()
+        {
+        }
+
+        [Fact]
+        public void Test_470_14()
+        {
+        }
+
+        [Fact]
+        public void Test_470_15()
+        {
+        }
+
+        [Fact]
+        public void Test_470_16()
+        {
+        }
+
+        [Fact]
+        public void Test_470_17()
+        {
+        }
+
+        [Fact]
+        public void Test_470_18()
+        {
+        }
+
+        [Fact]
+        public void Test_470_19()
+        {
+        }
+
+        [Fact]
+        public void Test_470_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_471
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_471_01()
+        {
+        }
+
+        [Fact]
+        public void Test_471_02()
+        {
+        }
+
+        [Fact]
+        public void Test_471_03()
+        {
+        }
+
+        [Fact]
+        public void Test_471_04()
+        {
+        }
+
+        [Fact]
+        public void Test_471_05()
+        {
+        }
+
+        [Fact]
+        public void Test_471_06()
+        {
+        }
+
+        [Fact]
+        public void Test_471_07()
+        {
+        }
+
+        [Fact]
+        public void Test_471_08()
+        {
+        }
+
+        [Fact]
+        public void Test_471_09()
+        {
+        }
+
+        [Fact]
+        public void Test_471_10()
+        {
+        }
+
+        [Fact]
+        public void Test_471_11()
+        {
+        }
+
+        [Fact]
+        public void Test_471_12()
+        {
+        }
+
+        [Fact]
+        public void Test_471_13()
+        {
+        }
+
+        [Fact]
+        public void Test_471_14()
+        {
+        }
+
+        [Fact]
+        public void Test_471_15()
+        {
+        }
+
+        [Fact]
+        public void Test_471_16()
+        {
+        }
+
+        [Fact]
+        public void Test_471_17()
+        {
+        }
+
+        [Fact]
+        public void Test_471_18()
+        {
+        }
+
+        [Fact]
+        public void Test_471_19()
+        {
+        }
+
+        [Fact]
+        public void Test_471_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_472
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_472_01()
+        {
+        }
+
+        [Fact]
+        public void Test_472_02()
+        {
+        }
+
+        [Fact]
+        public void Test_472_03()
+        {
+        }
+
+        [Fact]
+        public void Test_472_04()
+        {
+        }
+
+        [Fact]
+        public void Test_472_05()
+        {
+        }
+
+        [Fact]
+        public void Test_472_06()
+        {
+        }
+
+        [Fact]
+        public void Test_472_07()
+        {
+        }
+
+        [Fact]
+        public void Test_472_08()
+        {
+        }
+
+        [Fact]
+        public void Test_472_09()
+        {
+        }
+
+        [Fact]
+        public void Test_472_10()
+        {
+        }
+
+        [Fact]
+        public void Test_472_11()
+        {
+        }
+
+        [Fact]
+        public void Test_472_12()
+        {
+        }
+
+        [Fact]
+        public void Test_472_13()
+        {
+        }
+
+        [Fact]
+        public void Test_472_14()
+        {
+        }
+
+        [Fact]
+        public void Test_472_15()
+        {
+        }
+
+        [Fact]
+        public void Test_472_16()
+        {
+        }
+
+        [Fact]
+        public void Test_472_17()
+        {
+        }
+
+        [Fact]
+        public void Test_472_18()
+        {
+        }
+
+        [Fact]
+        public void Test_472_19()
+        {
+        }
+
+        [Fact]
+        public void Test_472_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_473
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_473_01()
+        {
+        }
+
+        [Fact]
+        public void Test_473_02()
+        {
+        }
+
+        [Fact]
+        public void Test_473_03()
+        {
+        }
+
+        [Fact]
+        public void Test_473_04()
+        {
+        }
+
+        [Fact]
+        public void Test_473_05()
+        {
+        }
+
+        [Fact]
+        public void Test_473_06()
+        {
+        }
+
+        [Fact]
+        public void Test_473_07()
+        {
+        }
+
+        [Fact]
+        public void Test_473_08()
+        {
+        }
+
+        [Fact]
+        public void Test_473_09()
+        {
+        }
+
+        [Fact]
+        public void Test_473_10()
+        {
+        }
+
+        [Fact]
+        public void Test_473_11()
+        {
+        }
+
+        [Fact]
+        public void Test_473_12()
+        {
+        }
+
+        [Fact]
+        public void Test_473_13()
+        {
+        }
+
+        [Fact]
+        public void Test_473_14()
+        {
+        }
+
+        [Fact]
+        public void Test_473_15()
+        {
+        }
+
+        [Fact]
+        public void Test_473_16()
+        {
+        }
+
+        [Fact]
+        public void Test_473_17()
+        {
+        }
+
+        [Fact]
+        public void Test_473_18()
+        {
+        }
+
+        [Fact]
+        public void Test_473_19()
+        {
+        }
+
+        [Fact]
+        public void Test_473_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_474
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_474_01()
+        {
+        }
+
+        [Fact]
+        public void Test_474_02()
+        {
+        }
+
+        [Fact]
+        public void Test_474_03()
+        {
+        }
+
+        [Fact]
+        public void Test_474_04()
+        {
+        }
+
+        [Fact]
+        public void Test_474_05()
+        {
+        }
+
+        [Fact]
+        public void Test_474_06()
+        {
+        }
+
+        [Fact]
+        public void Test_474_07()
+        {
+        }
+
+        [Fact]
+        public void Test_474_08()
+        {
+        }
+
+        [Fact]
+        public void Test_474_09()
+        {
+        }
+
+        [Fact]
+        public void Test_474_10()
+        {
+        }
+
+        [Fact]
+        public void Test_474_11()
+        {
+        }
+
+        [Fact]
+        public void Test_474_12()
+        {
+        }
+
+        [Fact]
+        public void Test_474_13()
+        {
+        }
+
+        [Fact]
+        public void Test_474_14()
+        {
+        }
+
+        [Fact]
+        public void Test_474_15()
+        {
+        }
+
+        [Fact]
+        public void Test_474_16()
+        {
+        }
+
+        [Fact]
+        public void Test_474_17()
+        {
+        }
+
+        [Fact]
+        public void Test_474_18()
+        {
+        }
+
+        [Fact]
+        public void Test_474_19()
+        {
+        }
+
+        [Fact]
+        public void Test_474_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_475
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_475_01()
+        {
+        }
+
+        [Fact]
+        public void Test_475_02()
+        {
+        }
+
+        [Fact]
+        public void Test_475_03()
+        {
+        }
+
+        [Fact]
+        public void Test_475_04()
+        {
+        }
+
+        [Fact]
+        public void Test_475_05()
+        {
+        }
+
+        [Fact]
+        public void Test_475_06()
+        {
+        }
+
+        [Fact]
+        public void Test_475_07()
+        {
+        }
+
+        [Fact]
+        public void Test_475_08()
+        {
+        }
+
+        [Fact]
+        public void Test_475_09()
+        {
+        }
+
+        [Fact]
+        public void Test_475_10()
+        {
+        }
+
+        [Fact]
+        public void Test_475_11()
+        {
+        }
+
+        [Fact]
+        public void Test_475_12()
+        {
+        }
+
+        [Fact]
+        public void Test_475_13()
+        {
+        }
+
+        [Fact]
+        public void Test_475_14()
+        {
+        }
+
+        [Fact]
+        public void Test_475_15()
+        {
+        }
+
+        [Fact]
+        public void Test_475_16()
+        {
+        }
+
+        [Fact]
+        public void Test_475_17()
+        {
+        }
+
+        [Fact]
+        public void Test_475_18()
+        {
+        }
+
+        [Fact]
+        public void Test_475_19()
+        {
+        }
+
+        [Fact]
+        public void Test_475_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_476
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_476_01()
+        {
+        }
+
+        [Fact]
+        public void Test_476_02()
+        {
+        }
+
+        [Fact]
+        public void Test_476_03()
+        {
+        }
+
+        [Fact]
+        public void Test_476_04()
+        {
+        }
+
+        [Fact]
+        public void Test_476_05()
+        {
+        }
+
+        [Fact]
+        public void Test_476_06()
+        {
+        }
+
+        [Fact]
+        public void Test_476_07()
+        {
+        }
+
+        [Fact]
+        public void Test_476_08()
+        {
+        }
+
+        [Fact]
+        public void Test_476_09()
+        {
+        }
+
+        [Fact]
+        public void Test_476_10()
+        {
+        }
+
+        [Fact]
+        public void Test_476_11()
+        {
+        }
+
+        [Fact]
+        public void Test_476_12()
+        {
+        }
+
+        [Fact]
+        public void Test_476_13()
+        {
+        }
+
+        [Fact]
+        public void Test_476_14()
+        {
+        }
+
+        [Fact]
+        public void Test_476_15()
+        {
+        }
+
+        [Fact]
+        public void Test_476_16()
+        {
+        }
+
+        [Fact]
+        public void Test_476_17()
+        {
+        }
+
+        [Fact]
+        public void Test_476_18()
+        {
+        }
+
+        [Fact]
+        public void Test_476_19()
+        {
+        }
+
+        [Fact]
+        public void Test_476_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_477
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_477_01()
+        {
+        }
+
+        [Fact]
+        public void Test_477_02()
+        {
+        }
+
+        [Fact]
+        public void Test_477_03()
+        {
+        }
+
+        [Fact]
+        public void Test_477_04()
+        {
+        }
+
+        [Fact]
+        public void Test_477_05()
+        {
+        }
+
+        [Fact]
+        public void Test_477_06()
+        {
+        }
+
+        [Fact]
+        public void Test_477_07()
+        {
+        }
+
+        [Fact]
+        public void Test_477_08()
+        {
+        }
+
+        [Fact]
+        public void Test_477_09()
+        {
+        }
+
+        [Fact]
+        public void Test_477_10()
+        {
+        }
+
+        [Fact]
+        public void Test_477_11()
+        {
+        }
+
+        [Fact]
+        public void Test_477_12()
+        {
+        }
+
+        [Fact]
+        public void Test_477_13()
+        {
+        }
+
+        [Fact]
+        public void Test_477_14()
+        {
+        }
+
+        [Fact]
+        public void Test_477_15()
+        {
+        }
+
+        [Fact]
+        public void Test_477_16()
+        {
+        }
+
+        [Fact]
+        public void Test_477_17()
+        {
+        }
+
+        [Fact]
+        public void Test_477_18()
+        {
+        }
+
+        [Fact]
+        public void Test_477_19()
+        {
+        }
+
+        [Fact]
+        public void Test_477_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_478
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_478_01()
+        {
+        }
+
+        [Fact]
+        public void Test_478_02()
+        {
+        }
+
+        [Fact]
+        public void Test_478_03()
+        {
+        }
+
+        [Fact]
+        public void Test_478_04()
+        {
+        }
+
+        [Fact]
+        public void Test_478_05()
+        {
+        }
+
+        [Fact]
+        public void Test_478_06()
+        {
+        }
+
+        [Fact]
+        public void Test_478_07()
+        {
+        }
+
+        [Fact]
+        public void Test_478_08()
+        {
+        }
+
+        [Fact]
+        public void Test_478_09()
+        {
+        }
+
+        [Fact]
+        public void Test_478_10()
+        {
+        }
+
+        [Fact]
+        public void Test_478_11()
+        {
+        }
+
+        [Fact]
+        public void Test_478_12()
+        {
+        }
+
+        [Fact]
+        public void Test_478_13()
+        {
+        }
+
+        [Fact]
+        public void Test_478_14()
+        {
+        }
+
+        [Fact]
+        public void Test_478_15()
+        {
+        }
+
+        [Fact]
+        public void Test_478_16()
+        {
+        }
+
+        [Fact]
+        public void Test_478_17()
+        {
+        }
+
+        [Fact]
+        public void Test_478_18()
+        {
+        }
+
+        [Fact]
+        public void Test_478_19()
+        {
+        }
+
+        [Fact]
+        public void Test_478_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_479
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_479_01()
+        {
+        }
+
+        [Fact]
+        public void Test_479_02()
+        {
+        }
+
+        [Fact]
+        public void Test_479_03()
+        {
+        }
+
+        [Fact]
+        public void Test_479_04()
+        {
+        }
+
+        [Fact]
+        public void Test_479_05()
+        {
+        }
+
+        [Fact]
+        public void Test_479_06()
+        {
+        }
+
+        [Fact]
+        public void Test_479_07()
+        {
+        }
+
+        [Fact]
+        public void Test_479_08()
+        {
+        }
+
+        [Fact]
+        public void Test_479_09()
+        {
+        }
+
+        [Fact]
+        public void Test_479_10()
+        {
+        }
+
+        [Fact]
+        public void Test_479_11()
+        {
+        }
+
+        [Fact]
+        public void Test_479_12()
+        {
+        }
+
+        [Fact]
+        public void Test_479_13()
+        {
+        }
+
+        [Fact]
+        public void Test_479_14()
+        {
+        }
+
+        [Fact]
+        public void Test_479_15()
+        {
+        }
+
+        [Fact]
+        public void Test_479_16()
+        {
+        }
+
+        [Fact]
+        public void Test_479_17()
+        {
+        }
+
+        [Fact]
+        public void Test_479_18()
+        {
+        }
+
+        [Fact]
+        public void Test_479_19()
+        {
+        }
+
+        [Fact]
+        public void Test_479_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_480
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_480_01()
+        {
+        }
+
+        [Fact]
+        public void Test_480_02()
+        {
+        }
+
+        [Fact]
+        public void Test_480_03()
+        {
+        }
+
+        [Fact]
+        public void Test_480_04()
+        {
+        }
+
+        [Fact]
+        public void Test_480_05()
+        {
+        }
+
+        [Fact]
+        public void Test_480_06()
+        {
+        }
+
+        [Fact]
+        public void Test_480_07()
+        {
+        }
+
+        [Fact]
+        public void Test_480_08()
+        {
+        }
+
+        [Fact]
+        public void Test_480_09()
+        {
+        }
+
+        [Fact]
+        public void Test_480_10()
+        {
+        }
+
+        [Fact]
+        public void Test_480_11()
+        {
+        }
+
+        [Fact]
+        public void Test_480_12()
+        {
+        }
+
+        [Fact]
+        public void Test_480_13()
+        {
+        }
+
+        [Fact]
+        public void Test_480_14()
+        {
+        }
+
+        [Fact]
+        public void Test_480_15()
+        {
+        }
+
+        [Fact]
+        public void Test_480_16()
+        {
+        }
+
+        [Fact]
+        public void Test_480_17()
+        {
+        }
+
+        [Fact]
+        public void Test_480_18()
+        {
+        }
+
+        [Fact]
+        public void Test_480_19()
+        {
+        }
+
+        [Fact]
+        public void Test_480_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_481
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_481_01()
+        {
+        }
+
+        [Fact]
+        public void Test_481_02()
+        {
+        }
+
+        [Fact]
+        public void Test_481_03()
+        {
+        }
+
+        [Fact]
+        public void Test_481_04()
+        {
+        }
+
+        [Fact]
+        public void Test_481_05()
+        {
+        }
+
+        [Fact]
+        public void Test_481_06()
+        {
+        }
+
+        [Fact]
+        public void Test_481_07()
+        {
+        }
+
+        [Fact]
+        public void Test_481_08()
+        {
+        }
+
+        [Fact]
+        public void Test_481_09()
+        {
+        }
+
+        [Fact]
+        public void Test_481_10()
+        {
+        }
+
+        [Fact]
+        public void Test_481_11()
+        {
+        }
+
+        [Fact]
+        public void Test_481_12()
+        {
+        }
+
+        [Fact]
+        public void Test_481_13()
+        {
+        }
+
+        [Fact]
+        public void Test_481_14()
+        {
+        }
+
+        [Fact]
+        public void Test_481_15()
+        {
+        }
+
+        [Fact]
+        public void Test_481_16()
+        {
+        }
+
+        [Fact]
+        public void Test_481_17()
+        {
+        }
+
+        [Fact]
+        public void Test_481_18()
+        {
+        }
+
+        [Fact]
+        public void Test_481_19()
+        {
+        }
+
+        [Fact]
+        public void Test_481_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_482
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_482_01()
+        {
+        }
+
+        [Fact]
+        public void Test_482_02()
+        {
+        }
+
+        [Fact]
+        public void Test_482_03()
+        {
+        }
+
+        [Fact]
+        public void Test_482_04()
+        {
+        }
+
+        [Fact]
+        public void Test_482_05()
+        {
+        }
+
+        [Fact]
+        public void Test_482_06()
+        {
+        }
+
+        [Fact]
+        public void Test_482_07()
+        {
+        }
+
+        [Fact]
+        public void Test_482_08()
+        {
+        }
+
+        [Fact]
+        public void Test_482_09()
+        {
+        }
+
+        [Fact]
+        public void Test_482_10()
+        {
+        }
+
+        [Fact]
+        public void Test_482_11()
+        {
+        }
+
+        [Fact]
+        public void Test_482_12()
+        {
+        }
+
+        [Fact]
+        public void Test_482_13()
+        {
+        }
+
+        [Fact]
+        public void Test_482_14()
+        {
+        }
+
+        [Fact]
+        public void Test_482_15()
+        {
+        }
+
+        [Fact]
+        public void Test_482_16()
+        {
+        }
+
+        [Fact]
+        public void Test_482_17()
+        {
+        }
+
+        [Fact]
+        public void Test_482_18()
+        {
+        }
+
+        [Fact]
+        public void Test_482_19()
+        {
+        }
+
+        [Fact]
+        public void Test_482_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_483
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_483_01()
+        {
+        }
+
+        [Fact]
+        public void Test_483_02()
+        {
+        }
+
+        [Fact]
+        public void Test_483_03()
+        {
+        }
+
+        [Fact]
+        public void Test_483_04()
+        {
+        }
+
+        [Fact]
+        public void Test_483_05()
+        {
+        }
+
+        [Fact]
+        public void Test_483_06()
+        {
+        }
+
+        [Fact]
+        public void Test_483_07()
+        {
+        }
+
+        [Fact]
+        public void Test_483_08()
+        {
+        }
+
+        [Fact]
+        public void Test_483_09()
+        {
+        }
+
+        [Fact]
+        public void Test_483_10()
+        {
+        }
+
+        [Fact]
+        public void Test_483_11()
+        {
+        }
+
+        [Fact]
+        public void Test_483_12()
+        {
+        }
+
+        [Fact]
+        public void Test_483_13()
+        {
+        }
+
+        [Fact]
+        public void Test_483_14()
+        {
+        }
+
+        [Fact]
+        public void Test_483_15()
+        {
+        }
+
+        [Fact]
+        public void Test_483_16()
+        {
+        }
+
+        [Fact]
+        public void Test_483_17()
+        {
+        }
+
+        [Fact]
+        public void Test_483_18()
+        {
+        }
+
+        [Fact]
+        public void Test_483_19()
+        {
+        }
+
+        [Fact]
+        public void Test_483_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_484
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_484_01()
+        {
+        }
+
+        [Fact]
+        public void Test_484_02()
+        {
+        }
+
+        [Fact]
+        public void Test_484_03()
+        {
+        }
+
+        [Fact]
+        public void Test_484_04()
+        {
+        }
+
+        [Fact]
+        public void Test_484_05()
+        {
+        }
+
+        [Fact]
+        public void Test_484_06()
+        {
+        }
+
+        [Fact]
+        public void Test_484_07()
+        {
+        }
+
+        [Fact]
+        public void Test_484_08()
+        {
+        }
+
+        [Fact]
+        public void Test_484_09()
+        {
+        }
+
+        [Fact]
+        public void Test_484_10()
+        {
+        }
+
+        [Fact]
+        public void Test_484_11()
+        {
+        }
+
+        [Fact]
+        public void Test_484_12()
+        {
+        }
+
+        [Fact]
+        public void Test_484_13()
+        {
+        }
+
+        [Fact]
+        public void Test_484_14()
+        {
+        }
+
+        [Fact]
+        public void Test_484_15()
+        {
+        }
+
+        [Fact]
+        public void Test_484_16()
+        {
+        }
+
+        [Fact]
+        public void Test_484_17()
+        {
+        }
+
+        [Fact]
+        public void Test_484_18()
+        {
+        }
+
+        [Fact]
+        public void Test_484_19()
+        {
+        }
+
+        [Fact]
+        public void Test_484_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_485
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_485_01()
+        {
+        }
+
+        [Fact]
+        public void Test_485_02()
+        {
+        }
+
+        [Fact]
+        public void Test_485_03()
+        {
+        }
+
+        [Fact]
+        public void Test_485_04()
+        {
+        }
+
+        [Fact]
+        public void Test_485_05()
+        {
+        }
+
+        [Fact]
+        public void Test_485_06()
+        {
+        }
+
+        [Fact]
+        public void Test_485_07()
+        {
+        }
+
+        [Fact]
+        public void Test_485_08()
+        {
+        }
+
+        [Fact]
+        public void Test_485_09()
+        {
+        }
+
+        [Fact]
+        public void Test_485_10()
+        {
+        }
+
+        [Fact]
+        public void Test_485_11()
+        {
+        }
+
+        [Fact]
+        public void Test_485_12()
+        {
+        }
+
+        [Fact]
+        public void Test_485_13()
+        {
+        }
+
+        [Fact]
+        public void Test_485_14()
+        {
+        }
+
+        [Fact]
+        public void Test_485_15()
+        {
+        }
+
+        [Fact]
+        public void Test_485_16()
+        {
+        }
+
+        [Fact]
+        public void Test_485_17()
+        {
+        }
+
+        [Fact]
+        public void Test_485_18()
+        {
+        }
+
+        [Fact]
+        public void Test_485_19()
+        {
+        }
+
+        [Fact]
+        public void Test_485_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_486
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_486_01()
+        {
+        }
+
+        [Fact]
+        public void Test_486_02()
+        {
+        }
+
+        [Fact]
+        public void Test_486_03()
+        {
+        }
+
+        [Fact]
+        public void Test_486_04()
+        {
+        }
+
+        [Fact]
+        public void Test_486_05()
+        {
+        }
+
+        [Fact]
+        public void Test_486_06()
+        {
+        }
+
+        [Fact]
+        public void Test_486_07()
+        {
+        }
+
+        [Fact]
+        public void Test_486_08()
+        {
+        }
+
+        [Fact]
+        public void Test_486_09()
+        {
+        }
+
+        [Fact]
+        public void Test_486_10()
+        {
+        }
+
+        [Fact]
+        public void Test_486_11()
+        {
+        }
+
+        [Fact]
+        public void Test_486_12()
+        {
+        }
+
+        [Fact]
+        public void Test_486_13()
+        {
+        }
+
+        [Fact]
+        public void Test_486_14()
+        {
+        }
+
+        [Fact]
+        public void Test_486_15()
+        {
+        }
+
+        [Fact]
+        public void Test_486_16()
+        {
+        }
+
+        [Fact]
+        public void Test_486_17()
+        {
+        }
+
+        [Fact]
+        public void Test_486_18()
+        {
+        }
+
+        [Fact]
+        public void Test_486_19()
+        {
+        }
+
+        [Fact]
+        public void Test_486_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_487
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_487_01()
+        {
+        }
+
+        [Fact]
+        public void Test_487_02()
+        {
+        }
+
+        [Fact]
+        public void Test_487_03()
+        {
+        }
+
+        [Fact]
+        public void Test_487_04()
+        {
+        }
+
+        [Fact]
+        public void Test_487_05()
+        {
+        }
+
+        [Fact]
+        public void Test_487_06()
+        {
+        }
+
+        [Fact]
+        public void Test_487_07()
+        {
+        }
+
+        [Fact]
+        public void Test_487_08()
+        {
+        }
+
+        [Fact]
+        public void Test_487_09()
+        {
+        }
+
+        [Fact]
+        public void Test_487_10()
+        {
+        }
+
+        [Fact]
+        public void Test_487_11()
+        {
+        }
+
+        [Fact]
+        public void Test_487_12()
+        {
+        }
+
+        [Fact]
+        public void Test_487_13()
+        {
+        }
+
+        [Fact]
+        public void Test_487_14()
+        {
+        }
+
+        [Fact]
+        public void Test_487_15()
+        {
+        }
+
+        [Fact]
+        public void Test_487_16()
+        {
+        }
+
+        [Fact]
+        public void Test_487_17()
+        {
+        }
+
+        [Fact]
+        public void Test_487_18()
+        {
+        }
+
+        [Fact]
+        public void Test_487_19()
+        {
+        }
+
+        [Fact]
+        public void Test_487_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_488
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_488_01()
+        {
+        }
+
+        [Fact]
+        public void Test_488_02()
+        {
+        }
+
+        [Fact]
+        public void Test_488_03()
+        {
+        }
+
+        [Fact]
+        public void Test_488_04()
+        {
+        }
+
+        [Fact]
+        public void Test_488_05()
+        {
+        }
+
+        [Fact]
+        public void Test_488_06()
+        {
+        }
+
+        [Fact]
+        public void Test_488_07()
+        {
+        }
+
+        [Fact]
+        public void Test_488_08()
+        {
+        }
+
+        [Fact]
+        public void Test_488_09()
+        {
+        }
+
+        [Fact]
+        public void Test_488_10()
+        {
+        }
+
+        [Fact]
+        public void Test_488_11()
+        {
+        }
+
+        [Fact]
+        public void Test_488_12()
+        {
+        }
+
+        [Fact]
+        public void Test_488_13()
+        {
+        }
+
+        [Fact]
+        public void Test_488_14()
+        {
+        }
+
+        [Fact]
+        public void Test_488_15()
+        {
+        }
+
+        [Fact]
+        public void Test_488_16()
+        {
+        }
+
+        [Fact]
+        public void Test_488_17()
+        {
+        }
+
+        [Fact]
+        public void Test_488_18()
+        {
+        }
+
+        [Fact]
+        public void Test_488_19()
+        {
+        }
+
+        [Fact]
+        public void Test_488_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_489
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_489_01()
+        {
+        }
+
+        [Fact]
+        public void Test_489_02()
+        {
+        }
+
+        [Fact]
+        public void Test_489_03()
+        {
+        }
+
+        [Fact]
+        public void Test_489_04()
+        {
+        }
+
+        [Fact]
+        public void Test_489_05()
+        {
+        }
+
+        [Fact]
+        public void Test_489_06()
+        {
+        }
+
+        [Fact]
+        public void Test_489_07()
+        {
+        }
+
+        [Fact]
+        public void Test_489_08()
+        {
+        }
+
+        [Fact]
+        public void Test_489_09()
+        {
+        }
+
+        [Fact]
+        public void Test_489_10()
+        {
+        }
+
+        [Fact]
+        public void Test_489_11()
+        {
+        }
+
+        [Fact]
+        public void Test_489_12()
+        {
+        }
+
+        [Fact]
+        public void Test_489_13()
+        {
+        }
+
+        [Fact]
+        public void Test_489_14()
+        {
+        }
+
+        [Fact]
+        public void Test_489_15()
+        {
+        }
+
+        [Fact]
+        public void Test_489_16()
+        {
+        }
+
+        [Fact]
+        public void Test_489_17()
+        {
+        }
+
+        [Fact]
+        public void Test_489_18()
+        {
+        }
+
+        [Fact]
+        public void Test_489_19()
+        {
+        }
+
+        [Fact]
+        public void Test_489_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_490
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_490_01()
+        {
+        }
+
+        [Fact]
+        public void Test_490_02()
+        {
+        }
+
+        [Fact]
+        public void Test_490_03()
+        {
+        }
+
+        [Fact]
+        public void Test_490_04()
+        {
+        }
+
+        [Fact]
+        public void Test_490_05()
+        {
+        }
+
+        [Fact]
+        public void Test_490_06()
+        {
+        }
+
+        [Fact]
+        public void Test_490_07()
+        {
+        }
+
+        [Fact]
+        public void Test_490_08()
+        {
+        }
+
+        [Fact]
+        public void Test_490_09()
+        {
+        }
+
+        [Fact]
+        public void Test_490_10()
+        {
+        }
+
+        [Fact]
+        public void Test_490_11()
+        {
+        }
+
+        [Fact]
+        public void Test_490_12()
+        {
+        }
+
+        [Fact]
+        public void Test_490_13()
+        {
+        }
+
+        [Fact]
+        public void Test_490_14()
+        {
+        }
+
+        [Fact]
+        public void Test_490_15()
+        {
+        }
+
+        [Fact]
+        public void Test_490_16()
+        {
+        }
+
+        [Fact]
+        public void Test_490_17()
+        {
+        }
+
+        [Fact]
+        public void Test_490_18()
+        {
+        }
+
+        [Fact]
+        public void Test_490_19()
+        {
+        }
+
+        [Fact]
+        public void Test_490_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_491
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_491_01()
+        {
+        }
+
+        [Fact]
+        public void Test_491_02()
+        {
+        }
+
+        [Fact]
+        public void Test_491_03()
+        {
+        }
+
+        [Fact]
+        public void Test_491_04()
+        {
+        }
+
+        [Fact]
+        public void Test_491_05()
+        {
+        }
+
+        [Fact]
+        public void Test_491_06()
+        {
+        }
+
+        [Fact]
+        public void Test_491_07()
+        {
+        }
+
+        [Fact]
+        public void Test_491_08()
+        {
+        }
+
+        [Fact]
+        public void Test_491_09()
+        {
+        }
+
+        [Fact]
+        public void Test_491_10()
+        {
+        }
+
+        [Fact]
+        public void Test_491_11()
+        {
+        }
+
+        [Fact]
+        public void Test_491_12()
+        {
+        }
+
+        [Fact]
+        public void Test_491_13()
+        {
+        }
+
+        [Fact]
+        public void Test_491_14()
+        {
+        }
+
+        [Fact]
+        public void Test_491_15()
+        {
+        }
+
+        [Fact]
+        public void Test_491_16()
+        {
+        }
+
+        [Fact]
+        public void Test_491_17()
+        {
+        }
+
+        [Fact]
+        public void Test_491_18()
+        {
+        }
+
+        [Fact]
+        public void Test_491_19()
+        {
+        }
+
+        [Fact]
+        public void Test_491_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_492
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_492_01()
+        {
+        }
+
+        [Fact]
+        public void Test_492_02()
+        {
+        }
+
+        [Fact]
+        public void Test_492_03()
+        {
+        }
+
+        [Fact]
+        public void Test_492_04()
+        {
+        }
+
+        [Fact]
+        public void Test_492_05()
+        {
+        }
+
+        [Fact]
+        public void Test_492_06()
+        {
+        }
+
+        [Fact]
+        public void Test_492_07()
+        {
+        }
+
+        [Fact]
+        public void Test_492_08()
+        {
+        }
+
+        [Fact]
+        public void Test_492_09()
+        {
+        }
+
+        [Fact]
+        public void Test_492_10()
+        {
+        }
+
+        [Fact]
+        public void Test_492_11()
+        {
+        }
+
+        [Fact]
+        public void Test_492_12()
+        {
+        }
+
+        [Fact]
+        public void Test_492_13()
+        {
+        }
+
+        [Fact]
+        public void Test_492_14()
+        {
+        }
+
+        [Fact]
+        public void Test_492_15()
+        {
+        }
+
+        [Fact]
+        public void Test_492_16()
+        {
+        }
+
+        [Fact]
+        public void Test_492_17()
+        {
+        }
+
+        [Fact]
+        public void Test_492_18()
+        {
+        }
+
+        [Fact]
+        public void Test_492_19()
+        {
+        }
+
+        [Fact]
+        public void Test_492_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_493
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_493_01()
+        {
+        }
+
+        [Fact]
+        public void Test_493_02()
+        {
+        }
+
+        [Fact]
+        public void Test_493_03()
+        {
+        }
+
+        [Fact]
+        public void Test_493_04()
+        {
+        }
+
+        [Fact]
+        public void Test_493_05()
+        {
+        }
+
+        [Fact]
+        public void Test_493_06()
+        {
+        }
+
+        [Fact]
+        public void Test_493_07()
+        {
+        }
+
+        [Fact]
+        public void Test_493_08()
+        {
+        }
+
+        [Fact]
+        public void Test_493_09()
+        {
+        }
+
+        [Fact]
+        public void Test_493_10()
+        {
+        }
+
+        [Fact]
+        public void Test_493_11()
+        {
+        }
+
+        [Fact]
+        public void Test_493_12()
+        {
+        }
+
+        [Fact]
+        public void Test_493_13()
+        {
+        }
+
+        [Fact]
+        public void Test_493_14()
+        {
+        }
+
+        [Fact]
+        public void Test_493_15()
+        {
+        }
+
+        [Fact]
+        public void Test_493_16()
+        {
+        }
+
+        [Fact]
+        public void Test_493_17()
+        {
+        }
+
+        [Fact]
+        public void Test_493_18()
+        {
+        }
+
+        [Fact]
+        public void Test_493_19()
+        {
+        }
+
+        [Fact]
+        public void Test_493_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_494
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_494_01()
+        {
+        }
+
+        [Fact]
+        public void Test_494_02()
+        {
+        }
+
+        [Fact]
+        public void Test_494_03()
+        {
+        }
+
+        [Fact]
+        public void Test_494_04()
+        {
+        }
+
+        [Fact]
+        public void Test_494_05()
+        {
+        }
+
+        [Fact]
+        public void Test_494_06()
+        {
+        }
+
+        [Fact]
+        public void Test_494_07()
+        {
+        }
+
+        [Fact]
+        public void Test_494_08()
+        {
+        }
+
+        [Fact]
+        public void Test_494_09()
+        {
+        }
+
+        [Fact]
+        public void Test_494_10()
+        {
+        }
+
+        [Fact]
+        public void Test_494_11()
+        {
+        }
+
+        [Fact]
+        public void Test_494_12()
+        {
+        }
+
+        [Fact]
+        public void Test_494_13()
+        {
+        }
+
+        [Fact]
+        public void Test_494_14()
+        {
+        }
+
+        [Fact]
+        public void Test_494_15()
+        {
+        }
+
+        [Fact]
+        public void Test_494_16()
+        {
+        }
+
+        [Fact]
+        public void Test_494_17()
+        {
+        }
+
+        [Fact]
+        public void Test_494_18()
+        {
+        }
+
+        [Fact]
+        public void Test_494_19()
+        {
+        }
+
+        [Fact]
+        public void Test_494_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_495
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_495_01()
+        {
+        }
+
+        [Fact]
+        public void Test_495_02()
+        {
+        }
+
+        [Fact]
+        public void Test_495_03()
+        {
+        }
+
+        [Fact]
+        public void Test_495_04()
+        {
+        }
+
+        [Fact]
+        public void Test_495_05()
+        {
+        }
+
+        [Fact]
+        public void Test_495_06()
+        {
+        }
+
+        [Fact]
+        public void Test_495_07()
+        {
+        }
+
+        [Fact]
+        public void Test_495_08()
+        {
+        }
+
+        [Fact]
+        public void Test_495_09()
+        {
+        }
+
+        [Fact]
+        public void Test_495_10()
+        {
+        }
+
+        [Fact]
+        public void Test_495_11()
+        {
+        }
+
+        [Fact]
+        public void Test_495_12()
+        {
+        }
+
+        [Fact]
+        public void Test_495_13()
+        {
+        }
+
+        [Fact]
+        public void Test_495_14()
+        {
+        }
+
+        [Fact]
+        public void Test_495_15()
+        {
+        }
+
+        [Fact]
+        public void Test_495_16()
+        {
+        }
+
+        [Fact]
+        public void Test_495_17()
+        {
+        }
+
+        [Fact]
+        public void Test_495_18()
+        {
+        }
+
+        [Fact]
+        public void Test_495_19()
+        {
+        }
+
+        [Fact]
+        public void Test_495_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_496
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_496_01()
+        {
+        }
+
+        [Fact]
+        public void Test_496_02()
+        {
+        }
+
+        [Fact]
+        public void Test_496_03()
+        {
+        }
+
+        [Fact]
+        public void Test_496_04()
+        {
+        }
+
+        [Fact]
+        public void Test_496_05()
+        {
+        }
+
+        [Fact]
+        public void Test_496_06()
+        {
+        }
+
+        [Fact]
+        public void Test_496_07()
+        {
+        }
+
+        [Fact]
+        public void Test_496_08()
+        {
+        }
+
+        [Fact]
+        public void Test_496_09()
+        {
+        }
+
+        [Fact]
+        public void Test_496_10()
+        {
+        }
+
+        [Fact]
+        public void Test_496_11()
+        {
+        }
+
+        [Fact]
+        public void Test_496_12()
+        {
+        }
+
+        [Fact]
+        public void Test_496_13()
+        {
+        }
+
+        [Fact]
+        public void Test_496_14()
+        {
+        }
+
+        [Fact]
+        public void Test_496_15()
+        {
+        }
+
+        [Fact]
+        public void Test_496_16()
+        {
+        }
+
+        [Fact]
+        public void Test_496_17()
+        {
+        }
+
+        [Fact]
+        public void Test_496_18()
+        {
+        }
+
+        [Fact]
+        public void Test_496_19()
+        {
+        }
+
+        [Fact]
+        public void Test_496_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_497
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_497_01()
+        {
+        }
+
+        [Fact]
+        public void Test_497_02()
+        {
+        }
+
+        [Fact]
+        public void Test_497_03()
+        {
+        }
+
+        [Fact]
+        public void Test_497_04()
+        {
+        }
+
+        [Fact]
+        public void Test_497_05()
+        {
+        }
+
+        [Fact]
+        public void Test_497_06()
+        {
+        }
+
+        [Fact]
+        public void Test_497_07()
+        {
+        }
+
+        [Fact]
+        public void Test_497_08()
+        {
+        }
+
+        [Fact]
+        public void Test_497_09()
+        {
+        }
+
+        [Fact]
+        public void Test_497_10()
+        {
+        }
+
+        [Fact]
+        public void Test_497_11()
+        {
+        }
+
+        [Fact]
+        public void Test_497_12()
+        {
+        }
+
+        [Fact]
+        public void Test_497_13()
+        {
+        }
+
+        [Fact]
+        public void Test_497_14()
+        {
+        }
+
+        [Fact]
+        public void Test_497_15()
+        {
+        }
+
+        [Fact]
+        public void Test_497_16()
+        {
+        }
+
+        [Fact]
+        public void Test_497_17()
+        {
+        }
+
+        [Fact]
+        public void Test_497_18()
+        {
+        }
+
+        [Fact]
+        public void Test_497_19()
+        {
+        }
+
+        [Fact]
+        public void Test_497_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_498
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_498_01()
+        {
+        }
+
+        [Fact]
+        public void Test_498_02()
+        {
+        }
+
+        [Fact]
+        public void Test_498_03()
+        {
+        }
+
+        [Fact]
+        public void Test_498_04()
+        {
+        }
+
+        [Fact]
+        public void Test_498_05()
+        {
+        }
+
+        [Fact]
+        public void Test_498_06()
+        {
+        }
+
+        [Fact]
+        public void Test_498_07()
+        {
+        }
+
+        [Fact]
+        public void Test_498_08()
+        {
+        }
+
+        [Fact]
+        public void Test_498_09()
+        {
+        }
+
+        [Fact]
+        public void Test_498_10()
+        {
+        }
+
+        [Fact]
+        public void Test_498_11()
+        {
+        }
+
+        [Fact]
+        public void Test_498_12()
+        {
+        }
+
+        [Fact]
+        public void Test_498_13()
+        {
+        }
+
+        [Fact]
+        public void Test_498_14()
+        {
+        }
+
+        [Fact]
+        public void Test_498_15()
+        {
+        }
+
+        [Fact]
+        public void Test_498_16()
+        {
+        }
+
+        [Fact]
+        public void Test_498_17()
+        {
+        }
+
+        [Fact]
+        public void Test_498_18()
+        {
+        }
+
+        [Fact]
+        public void Test_498_19()
+        {
+        }
+
+        [Fact]
+        public void Test_498_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_499
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_499_01()
+        {
+        }
+
+        [Fact]
+        public void Test_499_02()
+        {
+        }
+
+        [Fact]
+        public void Test_499_03()
+        {
+        }
+
+        [Fact]
+        public void Test_499_04()
+        {
+        }
+
+        [Fact]
+        public void Test_499_05()
+        {
+        }
+
+        [Fact]
+        public void Test_499_06()
+        {
+        }
+
+        [Fact]
+        public void Test_499_07()
+        {
+        }
+
+        [Fact]
+        public void Test_499_08()
+        {
+        }
+
+        [Fact]
+        public void Test_499_09()
+        {
+        }
+
+        [Fact]
+        public void Test_499_10()
+        {
+        }
+
+        [Fact]
+        public void Test_499_11()
+        {
+        }
+
+        [Fact]
+        public void Test_499_12()
+        {
+        }
+
+        [Fact]
+        public void Test_499_13()
+        {
+        }
+
+        [Fact]
+        public void Test_499_14()
+        {
+        }
+
+        [Fact]
+        public void Test_499_15()
+        {
+        }
+
+        [Fact]
+        public void Test_499_16()
+        {
+        }
+
+        [Fact]
+        public void Test_499_17()
+        {
+        }
+
+        [Fact]
+        public void Test_499_18()
+        {
+        }
+
+        [Fact]
+        public void Test_499_19()
+        {
+        }
+
+        [Fact]
+        public void Test_499_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+    public class TestClass_500
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_500_01()
+        {
+        }
+
+        [Fact]
+        public void Test_500_02()
+        {
+        }
+
+        [Fact]
+        public void Test_500_03()
+        {
+        }
+
+        [Fact]
+        public void Test_500_04()
+        {
+        }
+
+        [Fact]
+        public void Test_500_05()
+        {
+        }
+
+        [Fact]
+        public void Test_500_06()
+        {
+        }
+
+        [Fact]
+        public void Test_500_07()
+        {
+        }
+
+        [Fact]
+        public void Test_500_08()
+        {
+        }
+
+        [Fact]
+        public void Test_500_09()
+        {
+        }
+
+        [Fact]
+        public void Test_500_10()
+        {
+        }
+
+        [Fact]
+        public void Test_500_11()
+        {
+        }
+
+        [Fact]
+        public void Test_500_12()
+        {
+        }
+
+        [Fact]
+        public void Test_500_13()
+        {
+        }
+
+        [Fact]
+        public void Test_500_14()
+        {
+        }
+
+        [Fact]
+        public void Test_500_15()
+        {
+        }
+
+        [Fact]
+        public void Test_500_16()
+        {
+        }
+
+        [Fact]
+        public void Test_500_17()
+        {
+        }
+
+        [Fact]
+        public void Test_500_18()
+        {
+        }
+
+        [Fact]
+        public void Test_500_19()
+        {
+        }
+
+        [Fact]
+        public void Test_500_20()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/XUnit10kPassing/XunitTests.tt b/test/TestAssets/performance/XUnit10kPassing/XunitTests.tt
new file mode 100644
index 0000000000..a4fe823b4d
--- /dev/null
+++ b/test/TestAssets/performance/XUnit10kPassing/XunitTests.tt
@@ -0,0 +1,55 @@
+using Xunit;
+
+namespace Tests
+{
+<#
+    int classes = 500;
+    int passedTests = 20;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj b/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj
new file mode 100644
index 0000000000..393eb3be00
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1Passing/XUnit1Passing.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitFrameworkVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitAdapterVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="XunitTests.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>XunitTests.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="XunitTests.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>XunitTests.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/test/TestAssets/performance/XUnit1Passing/XunitTests.cs b/test/TestAssets/performance/XUnit1Passing/XunitTests.cs
new file mode 100644
index 0000000000..9bf5fb783a
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1Passing/XunitTests.cs
@@ -0,0 +1,18 @@
+using Xunit;
+
+namespace Tests
+{
+    public class TestClass_01
+    {
+        #region PassingTests
+        [Fact]
+        public void Test_01_01()
+        {
+        }
+
+        #endregion
+
+        #region FailingTests
+        #endregion
+    }
+}
diff --git a/test/TestAssets/performance/XUnit1Passing/XunitTests.tt b/test/TestAssets/performance/XUnit1Passing/XunitTests.tt
new file mode 100644
index 0000000000..97f62aefa6
--- /dev/null
+++ b/test/TestAssets/performance/XUnit1Passing/XunitTests.tt
@@ -0,0 +1,55 @@
+using Xunit;
+
+namespace Tests
+{
+<#
+    int classes = 1;
+    int passedTests = 1;
+    int failedTests = 0;
+    String padding = "00";
+
+    String testmethodprefix = "Test_";
+#>
+<#
+    for(int c=1;c<=classes;c++)
+    {
+    String className = "TestClass_" + c.ToString(padding);
+#>
+    public class <#=className#>
+    {
+        #region PassingTests
+<#
+    for(int t=1;t<=passedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+        }
+
+<#
+    }
+#>
+        #endregion
+
+        #region FailingTests
+<#
+    for(int t=1;t<=failedTests;t++)
+    {
+    String methodName= testmethodprefix + c.ToString(padding) + "_" + t.ToString(padding);
+#>
+        [Fact]
+        public void <#=methodName#>()
+        {
+            Assert.Fail();
+        }
+<#
+    }
+#>
+        #endregion
+    }
+<#
+    }
+#>
+}
diff --git a/test/TestAssets/problematic-child/Program.cs b/test/TestAssets/problematic-child/Program.cs
index 882c6972b4..9fd5fc8786 100644
--- a/test/TestAssets/problematic-child/Program.cs
+++ b/test/TestAssets/problematic-child/Program.cs
@@ -1,11 +1,16 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Threading;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace problematic_child
+#pragma warning restore IDE1006 // Naming Styles
 {
     class Program
     {
@@ -13,12 +18,12 @@ static void Main(string[] args)
         {
             if (args.Length > 0)
             {
-                var val = int.Parse(args[0]);
+                var val = int.Parse(args[0], CultureInfo.InvariantCulture);
                 if (val > 0)
                 {
                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     {
-                        Process.Start(Process.GetCurrentProcess().MainModule.FileName, (val - 1).ToString());
+                        Process.Start(Process.GetCurrentProcess().MainModule.FileName, (val - 1).ToString(CultureInfo.InvariantCulture));
                     }
                     else
                     {
diff --git a/test/TestAssets/problematic-child/problematic-child.csproj b/test/TestAssets/problematic-child/problematic-child.csproj
index 7b87f7f0c3..f00b791029 100644
--- a/test/TestAssets/problematic-child/problematic-child.csproj
+++ b/test/TestAssets/problematic-child/problematic-child.csproj
@@ -1,15 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <!-- Package dependency versions -->
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
+
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>problematic_child</RootNamespace>
   </PropertyGroup>
@@ -17,5 +14,5 @@
   <ItemGroup>
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TestAssets/timeout/UnitTest1.cs b/test/TestAssets/timeout/UnitTest1.cs
index 22cf1b532a..609ccd7e0a 100644
--- a/test/TestAssets/timeout/UnitTest1.cs
+++ b/test/TestAssets/timeout/UnitTest1.cs
@@ -1,7 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using System.Threading;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace timeout
+#pragma warning restore IDE1006 // Naming Styles
 {
     [TestClass]
     public class UnitTest1
diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj
index 2ec2b2ff9d..8af7af2b2a 100644
--- a/test/TestAssets/timeout/timeout.csproj
+++ b/test/TestAssets/timeout/timeout.csproj
@@ -1,26 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Package dependency versions -->
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <!-- Imports Common TestAssets props. -->
-  <Import Project="..\..\..\scripts\build\TestAssets.props" />
-  
-  <PropertyGroup>
-    <TargetFrameworks>net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
 
+  <PropertyGroup>
+    <TargetFrameworks>$(NetFrameworkMinimum);net472;net48;$(NetCoreAppMinimum);net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="$(NETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="$(PackageVersion)" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/TranslationLayer.UnitTests/ConsoleParametersTests.cs b/test/TranslationLayer.UnitTests/ConsoleParametersTests.cs
index f99796731c..eeb1dcc17c 100644
--- a/test/TranslationLayer.UnitTests/ConsoleParametersTests.cs
+++ b/test/TranslationLayer.UnitTests/ConsoleParametersTests.cs
@@ -1,38 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
-{
-    using System.Diagnostics;
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
 
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests;
 
-    [TestClass]
-    public class ConsoleParametersTests
+[TestClass]
+public class ConsoleParametersTests
+{
+    [TestMethod]
+    public void LogFilePathShouldEnsureDoubleQuote()
     {
-        [TestMethod]
-        public void LogFilePathShouldEnsureDoubleQuote()
-        {
-            var moqFileHelper = new Mock<IFileHelper>();
-            moqFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        var moqFileHelper = new Mock<IFileHelper>();
+        moqFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
 
-            var sut = new ConsoleParameters(moqFileHelper.Object);
+        var sut = new ConsoleParameters(moqFileHelper.Object);
 
-            sut.LogFilePath = "c:\\users\\file location\\o.txt";
+        sut.LogFilePath = "c:\\users\\file location\\o.txt";
 
-            string result = sut.LogFilePath;
+        string result = sut.LogFilePath;
 
-            Assert.IsTrue(result.StartsWith("\""));
-        }
+        Assert.IsTrue(result.StartsWith("\""));
+    }
 
-        [TestMethod]
-        public void TraceLevelShouldHaveVerboseAsDefaultValue()
-        {
-            var consoleParameters = new ConsoleParameters(new FileHelper());
-            Assert.AreEqual(consoleParameters.TraceLevel, TraceLevel.Verbose);
-        }
+    [TestMethod]
+    public void TraceLevelShouldHaveVerboseAsDefaultValue()
+    {
+        var consoleParameters = new ConsoleParameters(new FileHelper());
+        Assert.AreEqual(consoleParameters.TraceLevel, TraceLevel.Verbose);
     }
 }
diff --git a/test/TranslationLayer.UnitTests/DiscoveryEventsHandleConverterTests.cs b/test/TranslationLayer.UnitTests/DiscoveryEventsHandleConverterTests.cs
index b53aa25f89..78301f4901 100644
--- a/test/TranslationLayer.UnitTests/DiscoveryEventsHandleConverterTests.cs
+++ b/test/TranslationLayer.UnitTests/DiscoveryEventsHandleConverterTests.cs
@@ -1,70 +1,68 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System;
 
-namespace TranslationLayer.UnitTests
-{
-    using System;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 
-    using Moq;
+namespace TranslationLayer.UnitTests;
 
-    [TestClass]
-    public class DiscoveryEventsHandleConverterTests
+[TestClass]
+public class DiscoveryEventsHandleConverterTests
+{
+    private readonly Mock<ITestDiscoveryEventsHandler> _mockTestdiscoveryEventsHandler;
+    public DiscoveryEventsHandleConverterTests()
     {
-        private Mock<ITestDiscoveryEventsHandler> mockTestdiscoveryEventsHandler;
-        public DiscoveryEventsHandleConverterTests()
-        {
-            this.mockTestdiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler>();
-        }
+        _mockTestdiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler>();
+    }
 
-        [TestMethod]
-        public void ConstructorShouldThrowArgumentExceptionIfTestDiscoveryEventHandlerIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>( () => new DiscoveryEventsHandleConverter(null));
-        }
+    [TestMethod]
+    public void ConstructorShouldThrowArgumentExceptionIfTestDiscoveryEventHandlerIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => new DiscoveryEventsHandleConverter(null!));
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryCompleteShouldCallTestDiscoveryHandler1Method()
-        {
-            var discoveryEventsHandler = new DiscoveryEventsHandleConverter(this.mockTestdiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void HandleDiscoveryCompleteShouldCallTestDiscoveryHandler1Method()
+    {
+        var discoveryEventsHandler = new DiscoveryEventsHandleConverter(_mockTestdiscoveryEventsHandler.Object);
 
-            discoveryEventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(-1, false), null);
-            this.mockTestdiscoveryEventsHandler.Verify(o => o.HandleDiscoveryComplete(-1, null, false), Times.Once);
-        }
+        discoveryEventsHandler.HandleDiscoveryComplete(new DiscoveryCompleteEventArgs(-1, false), null);
+        _mockTestdiscoveryEventsHandler.Verify(o => o.HandleDiscoveryComplete(-1, null, false), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleDiscoveryTestsShouldCallTestDiscoveryHandler1Method()
-        {
-            var discoveryEventsHandler = new DiscoveryEventsHandleConverter(this.mockTestdiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void HandleDiscoveryTestsShouldCallTestDiscoveryHandler1Method()
+    {
+        var discoveryEventsHandler = new DiscoveryEventsHandleConverter(_mockTestdiscoveryEventsHandler.Object);
 
-            discoveryEventsHandler.HandleDiscoveredTests(null);
+        discoveryEventsHandler.HandleDiscoveredTests(null);
 
-            this.mockTestdiscoveryEventsHandler.Verify(o => o.HandleDiscoveredTests(null), Times.Once);
-        }
+        _mockTestdiscoveryEventsHandler.Verify(o => o.HandleDiscoveredTests(null), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleRawMessageShouldCallTestDiscoveryHandler1Method()
-        {
-            var discoveryEventsHandler = new DiscoveryEventsHandleConverter(this.mockTestdiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void HandleRawMessageShouldCallTestDiscoveryHandler1Method()
+    {
+        var discoveryEventsHandler = new DiscoveryEventsHandleConverter(_mockTestdiscoveryEventsHandler.Object);
 
-            discoveryEventsHandler.HandleRawMessage("DummyMessage");
+        discoveryEventsHandler.HandleRawMessage("DummyMessage");
 
-            this.mockTestdiscoveryEventsHandler.Verify(o => o.HandleRawMessage("DummyMessage"), Times.Once);
-        }
+        _mockTestdiscoveryEventsHandler.Verify(o => o.HandleRawMessage("DummyMessage"), Times.Once);
+    }
 
-        [TestMethod]
-        public void HandleLogMessageShouldCallTestDiscoveryHandler1Method()
-        {
-            var discoveryEventsHandler = new DiscoveryEventsHandleConverter(this.mockTestdiscoveryEventsHandler.Object);
+    [TestMethod]
+    public void HandleLogMessageShouldCallTestDiscoveryHandler1Method()
+    {
+        var discoveryEventsHandler = new DiscoveryEventsHandleConverter(_mockTestdiscoveryEventsHandler.Object);
 
-            discoveryEventsHandler.HandleLogMessage(TestMessageLevel.Warning, "DummyMessage");
+        discoveryEventsHandler.HandleLogMessage(TestMessageLevel.Warning, "DummyMessage");
 
-            this.mockTestdiscoveryEventsHandler.Verify(o => o.HandleLogMessage(TestMessageLevel.Warning, "DummyMessage"), Times.Once);
-        }
+        _mockTestdiscoveryEventsHandler.Verify(o => o.HandleLogMessage(TestMessageLevel.Warning, "DummyMessage"), Times.Once);
     }
 }
diff --git a/test/TranslationLayer.UnitTests/Program.cs b/test/TranslationLayer.UnitTests/Program.cs
deleted file mode 100644
index cb4dfb25dc..0000000000
--- a/test/TranslationLayer.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/TranslationLayer.UnitTests/Properties/AssemblyInfo.cs b/test/TranslationLayer.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index ae5b7d41b5..0000000000
--- a/test/TranslationLayer.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7da16d44-71ea-436f-a201-573861dc21ea")]
diff --git a/test/TranslationLayer.UnitTests/TestSessionTests.cs b/test/TranslationLayer.UnitTests/TestSessionTests.cs
index 01989a2f6a..5b2220d1bc 100644
--- a/test/TranslationLayer.UnitTests/TestSessionTests.cs
+++ b/test/TranslationLayer.UnitTests/TestSessionTests.cs
@@ -1,587 +1,749 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests;
+
+[TestClass]
+[Obsolete("This API is not final yet and is subject to changes.", false)]
+public class TestSessionTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    [Obsolete("This API is not final yet and is subject to changes.", false)]
-    public class TestSessionTests
-    {
-        private readonly string testSettings = "TestSettings";
-        private readonly List<string> testSources = new List<string> { "Hello", "World" };
-        private readonly List<TestCase> testCases = new List<TestCase>
-        {
-            new TestCase("a.b.c", new Uri("d://uri"), "a.dll"),
-            new TestCase("d.e.f", new Uri("g://uri"), "d.dll")
-        };
-
-        private TestSessionInfo testSessionInfo;
-        private ITestSession testSession;
-        private Mock<ITestSessionEventsHandler> mockTestSessionEventsHandler;
-        private Mock<IVsTestConsoleWrapper> mockVsTestConsoleWrapper;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.testSessionInfo = new TestSessionInfo();
-            this.mockTestSessionEventsHandler = new Mock<ITestSessionEventsHandler>();
-            this.mockVsTestConsoleWrapper = new Mock<IVsTestConsoleWrapper>();
-
-            this.testSession = new TestSession(
-                this.testSessionInfo,
-                this.mockTestSessionEventsHandler.Object,
-                this.mockVsTestConsoleWrapper.Object);
-        }
-
-        #region ITestSession
-        [TestMethod]
-        public void AbortTestRunShouldCallConsoleWrapperAbortTestRun()
-        {
-            this.testSession.AbortTestRun();
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.AbortTestRun(),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void CancelDiscoveryShouldCallConsoleWrapperCancelDiscovery()
-        {
-            this.testSession.CancelDiscovery();
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.CancelDiscovery(),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void CancelTestRunShouldCallConsoleWrapperCancelTestRun()
-        {
-            this.testSession.CancelTestRun();
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.CancelTestRun(),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments1()
-        {
-            this.testSession.DiscoverTests(
-                this.testSources,
-                this.testSettings,
-                new Mock<ITestDiscoveryEventsHandler>().Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.DiscoverTests(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    It.IsAny<ITestDiscoveryEventsHandler2>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-
-            this.testSession.DiscoverTests(
-                this.testSources,
-                this.testSettings,
+    private readonly string _testSettings = "TestSettings";
+    private readonly List<string> _testSources = ["Hello", "World"];
+    private readonly List<TestCase> _testCases =
+    [
+        new TestCase("a.b.c", new Uri("d://uri"), "a.dll"),
+        new TestCase("d.e.f", new Uri("g://uri"), "d.dll")
+    ];
+
+    private readonly TestSessionInfo _testSessionInfo;
+    private readonly ITestSession _testSession;
+    private readonly Mock<ITestSessionEventsHandler> _mockTestSessionEventsHandler;
+    private readonly Mock<IVsTestConsoleWrapper> _mockVsTestConsoleWrapper;
+
+    public TestSessionTests()
+    {
+        _testSessionInfo = new TestSessionInfo();
+        _mockTestSessionEventsHandler = new Mock<ITestSessionEventsHandler>();
+        _mockVsTestConsoleWrapper = new Mock<IVsTestConsoleWrapper>();
+
+        _testSession = new TestSession(
+            _testSessionInfo,
+            _mockTestSessionEventsHandler.Object,
+            _mockVsTestConsoleWrapper.Object);
+    }
+
+    #region ITestSession
+    [TestMethod]
+    public void AbortTestRunShouldCallConsoleWrapperAbortTestRun()
+    {
+        _testSession.AbortTestRun();
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.AbortTestRun(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void CancelDiscoveryShouldCallConsoleWrapperCancelDiscovery()
+    {
+        _testSession.CancelDiscovery();
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.CancelDiscovery(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void CancelTestRunShouldCallConsoleWrapperCancelTestRun()
+    {
+        _testSession.CancelTestRun();
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.CancelTestRun(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments1()
+    {
+        _testSession.DiscoverTests(
+            _testSources,
+            _testSettings,
+            new Mock<ITestDiscoveryEventsHandler>().Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.DiscoverTests(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                It.IsAny<ITestDiscoveryEventsHandler2>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        _testSession.DiscoverTests(
+            _testSources,
+            _testSettings,
+            testPlatformOptions,
+            mockTestDiscoveryEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.DiscoverTests(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestDiscoveryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        _testSession.RunTests(
+            _testSources,
+            _testSettings,
+            mockTestRunEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTests(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        _testSession.RunTests(
+            _testSources,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTests(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        _testSession.RunTests(
+            _testCases,
+            _testSettings,
+            mockTestRunEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTests(
+                _testCases,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        _testSession.RunTests(
+            _testCases,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTests(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArgumentsAndTelemetryHandler()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryEventsHandler = new Mock<ITelemetryEventsHandler>();
+
+        _testSession.RunTests(
+            _testCases,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object,
+            telemetryEventsHandler.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTests(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                telemetryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        _testSession.RunTestsWithCustomTestHost(
+            _testSources,
+            _testSettings,
+            mockTestRunEventsHandler.Object,
+            mockTestHostLauncher.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHost(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        _testSession.RunTestsWithCustomTestHost(
+            _testSources,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object,
+            mockTestHostLauncher.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHost(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        _testSession.RunTestsWithCustomTestHost(
+            _testCases,
+            _testSettings,
+            mockTestRunEventsHandler.Object,
+            mockTestHostLauncher.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHost(
+                _testCases,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        _testSession.RunTestsWithCustomTestHost(
+            _testCases,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object,
+            mockTestHostLauncher.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHost(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArgumentsAndTelemetryHandler()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+        var telemetryEventsHandler = new Mock<ITelemetryEventsHandler>();
+
+        _testSession.RunTestsWithCustomTestHost(
+            _testCases,
+            _testSettings,
+            testPlatformOptions,
+            mockTestRunEventsHandler.Object,
+            telemetryEventsHandler.Object,
+            mockTestHostLauncher.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHost(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                telemetryEventsHandler.Object,
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StopTestSessionWithNoArgsShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        _testSession.StopTestSession();
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSession(
+                _testSessionInfo,
+                null,
+                _mockTestSessionEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StopTestSessionWithOneArgShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
+
+        _testSession.StopTestSession(mockTestSessionEventsHandler2.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSession(
+                _testSessionInfo,
+                null,
+                mockTestSessionEventsHandler2.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StopTestSessionWithTwoArgsShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
+
+        _testSession.StopTestSession(testPlatformOptions, mockTestSessionEventsHandler2.Object);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSession(
+                _testSessionInfo,
+                testPlatformOptions,
+                mockTestSessionEventsHandler2.Object),
+            Times.Once);
+    }
+    #endregion
+
+    #region ITestSessionAsync
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments1()
+    {
+        await _testSession.DiscoverTestsAsync(
+                _testSources,
+                _testSettings,
+                new Mock<ITestDiscoveryEventsHandler>().Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.DiscoverTestsAsync(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                It.IsAny<ITestDiscoveryEventsHandler2>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        await _testSession.DiscoverTestsAsync(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                mockTestDiscoveryEventsHandler.Object)
+            .ConfigureAwait(false); ;
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.DiscoverTestsAsync(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestDiscoveryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        await _testSession.RunTestsAsync(
+                _testSources,
+                _testSettings,
+                mockTestRunEventsHandler.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsAsync(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        await _testSession.RunTestsAsync(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                mockTestRunEventsHandler.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsAsync(
+                _testSources,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        await _testSession.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                mockTestRunEventsHandler.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+
+        await _testSession.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                mockTestRunEventsHandler.Object)
+            .ConfigureAwait(false); ;
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArgumentsWithTelemetryHandler()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryEventsHandler = new Mock<ITelemetryEventsHandler>();
+
+        await _testSession.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                mockTestRunEventsHandler.Object,
+                telemetryEventsHandler.Object)
+            .ConfigureAwait(false); ;
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsAsync(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                telemetryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        await _testSession.RunTestsWithCustomTestHostAsync(
+                _testSources,
+                _testSettings,
+                mockTestRunEventsHandler.Object,
+                mockTestHostLauncher.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHostAsync(
+                _testSources,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        await _testSession.RunTestsWithCustomTestHostAsync(
+                _testSources,
+                _testSettings,
                 testPlatformOptions,
-                mockTestDiscoveryEventsHandler.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.DiscoverTests(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestDiscoveryEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            this.testSession.RunTests(
-                this.testSources,
-                this.testSettings,
-                mockTestRunEventsHandler.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTests(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            this.testSession.RunTests(
-                this.testSources,
-                this.testSettings,
+                mockTestRunEventsHandler.Object,
+                mockTestHostLauncher.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHostAsync(
+                _testSources,
+                _testSettings,
                 testPlatformOptions,
-                mockTestRunEventsHandler.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTests(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            this.testSession.RunTests(
-                this.testCases,
-                this.testSettings,
-                mockTestRunEventsHandler.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTests(
-                    this.testCases,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            this.testSession.RunTests(
-                this.testCases,
-                this.testSettings,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
+    {
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        await _testSession.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
+                mockTestRunEventsHandler.Object,
+                mockTestHostLauncher.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
+                null,
+                _testSessionInfo,
+                mockTestRunEventsHandler.Object,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+
+        await _testSession.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
                 testPlatformOptions,
-                mockTestRunEventsHandler.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTests(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            this.testSession.RunTestsWithCustomTestHost(
-                this.testSources,
-                this.testSettings,
                 mockTestRunEventsHandler.Object,
-                mockTestHostLauncher.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHost(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            this.testSession.RunTestsWithCustomTestHost(
-                this.testSources,
-                this.testSettings,
+                mockTestHostLauncher.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
                 testPlatformOptions,
+                _testSessionInfo,
                 mockTestRunEventsHandler.Object,
-                mockTestHostLauncher.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHost(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            this.testSession.RunTestsWithCustomTestHost(
-                this.testCases,
-                this.testSettings,
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task RunTestsAsyncWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArgumentsWithTelemetryHandler()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
+        var mockTestHostLauncher = new Mock<ITestHostLauncher>();
+        var telemetryEventsHandler = new Mock<ITelemetryEventsHandler>();
+
+        await _testSession.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
+                testPlatformOptions,
                 mockTestRunEventsHandler.Object,
-                mockTestHostLauncher.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHost(
-                    this.testCases,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            this.testSession.RunTestsWithCustomTestHost(
-                this.testCases,
-                this.testSettings,
+                telemetryEventsHandler.Object,
+                mockTestHostLauncher.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.RunTestsWithCustomTestHostAsync(
+                _testCases,
+                _testSettings,
                 testPlatformOptions,
+                _testSessionInfo,
                 mockTestRunEventsHandler.Object,
-                mockTestHostLauncher.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHost(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void StopTestSessionShouldCallConsoleWrapperStopTestSessionWithCorrectArguments1()
-        {
-            this.testSession.StopTestSession();
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.StopTestSession(
-                    this.testSessionInfo,
-                    this.mockTestSessionEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void StopTestSessionShouldCallConsoleWrapperStopTestSessionWithCorrectArguments2()
-        {
-            var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
-
-            this.testSession.StopTestSession(mockTestSessionEventsHandler2.Object);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.StopTestSession(
-                    this.testSessionInfo,
-                    mockTestSessionEventsHandler2.Object),
-                Times.Once);
-        }
-        #endregion
-
-        #region ITestSessionAsync
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments1()
-        {
-            await this.testSession.DiscoverTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    new Mock<ITestDiscoveryEventsHandler>().Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.DiscoverTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    It.IsAny<ITestDiscoveryEventsHandler2>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldCallConsoleWrapperDiscoverTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestDiscoveryEventsHandler = new Mock<ITestDiscoveryEventsHandler2>();
-
-            await this.testSession.DiscoverTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    mockTestDiscoveryEventsHandler.Object)
-                .ConfigureAwait(false); ;
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.DiscoverTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestDiscoveryEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            await this.testSession.RunTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    mockTestRunEventsHandler.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            await this.testSession.RunTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    mockTestRunEventsHandler.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            await this.testSession.RunTestsAsync(
-                    this.testCases,
-                    this.testSettings,
-                    mockTestRunEventsHandler.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsAsync(
-                    this.testCases,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithTestCasesShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-
-            await this.testSession.RunTestsAsync(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    mockTestRunEventsHandler.Object)
-                .ConfigureAwait(false); ;
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsAsync(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            await this.testSession.RunTestsWithCustomTestHostAsync(
-                    this.testSources,
-                    this.testSettings,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHostAsync(
-                    this.testSources,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            await this.testSession.RunTestsWithCustomTestHostAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHostAsync(
-                    this.testSources,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments1()
-        {
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            await this.testSession.RunTestsWithCustomTestHostAsync(
-                    this.testCases,
-                    this.testSettings,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHostAsync(
-                    this.testCases,
-                    this.testSettings,
-                    null,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithTestCasesAndCustomTesthostShouldCallConsoleWrapperRunTestsWithCorrectArguments2()
-        {
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockTestRunEventsHandler = new Mock<ITestRunEventsHandler>();
-            var mockTestHostLauncher = new Mock<ITestHostLauncher>();
-
-            await this.testSession.RunTestsWithCustomTestHostAsync(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.RunTestsWithCustomTestHostAsync(
-                    this.testCases,
-                    this.testSettings,
-                    testPlatformOptions,
-                    this.testSessionInfo,
-                    mockTestRunEventsHandler.Object,
-                    mockTestHostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task StopTestSessionAsyncShouldCallConsoleWrapperStopTestSessionWithCorrectArguments1()
-        {
-            await this.testSession.StopTestSessionAsync().ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.StopTestSessionAsync(
-                    this.testSessionInfo,
-                    this.mockTestSessionEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task StopTestSessionAsyncShouldCallConsoleWrapperStopTestSessionWithCorrectArguments2()
-        {
-            var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
-
-            await this.testSession.StopTestSessionAsync(
-                    mockTestSessionEventsHandler2.Object)
-                .ConfigureAwait(false);
-
-            this.mockVsTestConsoleWrapper.Verify(
-                vtcw => vtcw.StopTestSessionAsync(
-                    this.testSessionInfo,
-                    mockTestSessionEventsHandler2.Object),
-                Times.Once);
-        }
-        #endregion
+                telemetryEventsHandler.Object,
+                mockTestHostLauncher.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task StopTestSessionAsyncWithNoArgsShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        await _testSession.StopTestSessionAsync().ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSessionAsync(
+                _testSessionInfo,
+                null,
+                _mockTestSessionEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task StopTestSessionAsyncWithOneArgShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
+
+        await _testSession.StopTestSessionAsync(
+                mockTestSessionEventsHandler2.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSessionAsync(
+                _testSessionInfo,
+                null,
+                mockTestSessionEventsHandler2.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task StopTestSessionAsyncWithTwoArgsShouldCallConsoleWrapperStopTestSessionWithCorrectArguments()
+    {
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockTestSessionEventsHandler2 = new Mock<ITestSessionEventsHandler>();
+
+        await _testSession.StopTestSessionAsync(
+                testPlatformOptions,
+                mockTestSessionEventsHandler2.Object)
+            .ConfigureAwait(false);
+
+        _mockVsTestConsoleWrapper.Verify(
+            vtcw => vtcw.StopTestSessionAsync(
+                _testSessionInfo,
+                testPlatformOptions,
+                mockTestSessionEventsHandler2.Object),
+            Times.Once);
     }
+    #endregion
 }
diff --git a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
index bebc846f8b..ed7d4d359d 100644
--- a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
+++ b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj
@@ -1,27 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" '$(TargetFramework)' != 'net451' ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>TranslationLayer.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Threading.Tasks" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
   <Target Name="WorkAroundToSkipPreprocessingBinaries" BeforeTargets="RunProduceContentAssets">
     <ItemGroup>
       <FileDependencies>
diff --git a/test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs
index c07b2698b8..b2d496d208 100644
--- a/test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs
+++ b/test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs
@@ -1,2566 +1,2889 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using Newtonsoft.Json.Linq;
+
+using Payloads = Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests;
+
+[TestClass]
+public class VsTestConsoleRequestSenderTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Threading;
-    using System.Threading.Tasks;
+    private readonly ITranslationLayerRequestSender _requestSender;
+    private readonly Mock<ICommunicationManager> _mockCommunicationManager;
+    private readonly int _waitTimeout = 2000;
+    private readonly int _protocolVersion = 7;
+    private readonly IDataSerializer _serializer = JsonDataSerializer.Instance;
+    private readonly Mock<ITelemetryEventsHandler> _telemetryHandler;
+
+    public VsTestConsoleRequestSenderTests()
+    {
+        _mockCommunicationManager = new Mock<ICommunicationManager>();
+        _requestSender = new VsTestConsoleRequestSender(
+            _mockCommunicationManager.Object,
+            JsonDataSerializer.Instance,
+            new Mock<ITestPlatformEventSource>().Object);
+        _telemetryHandler = new Mock<ITelemetryEventsHandler>();
+    }
 
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    #region Communication Tests
+
+    [TestMethod]
+    public void InitializeCommunicationShouldSucceed()
+    {
+        InitializeCommunication();
 
-    using Moq;
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Exactly(2));
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-    using Newtonsoft.Json.Linq;
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldSucceed()
+    {
+        await InitializeCommunicationAsync();
 
-    using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
-    using Payloads = Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Exactly(2));
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-    [TestClass]
-    public class VsTestConsoleRequestSenderTests
+    [TestMethod]
+    public void InitializeCommunicationShouldReturnInvalidPortNumberIfHostServerFails()
     {
-        private readonly ITranslationLayerRequestSender requestSender;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws(new Exception("Fail"));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false));
 
-        private readonly Mock<ICommunicationManager> mockCommunicationManager;
+        var portOutput = _requestSender.InitializeCommunication();
+        Assert.IsTrue(portOutput < 0, "Negative port number must be returned if Hosting Server fails.");
 
-        private readonly int WaitTimeout = 2000;
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsFalse(connectionSuccess, "Connection must fail as server failed to host.");
 
-        private int protocolVersion = 5;
-        private IDataSerializer serializer = JsonDataSerializer.Instance;
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Never);
+    }
 
-        public VsTestConsoleRequestSenderTests()
-        {
-            this.mockCommunicationManager = new Mock<ICommunicationManager>();
-            this.requestSender = new VsTestConsoleRequestSender(
-                this.mockCommunicationManager.Object,
-                JsonDataSerializer.Instance,
-                new Mock<ITestPlatformEventSource>().Object);
-        }
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldReturnInvalidPortNumberIfHostServerFails()
+    {
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws(new Exception("Fail"));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false));
 
-        #region Communication Tests
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        Assert.IsTrue(portOutput < 0, "Negative port number must be returned if Hosting Server fails.");
 
-        [TestMethod]
-        public void InitializeCommunicationShouldSucceed()
-        {
-            this.InitializeCommunication();
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Never);
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Never);
+    }
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Exactly(2));
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+    [TestMethod]
+    public void InitializeCommunicationShouldFailConnectionIfMessageReceiveFailed()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
+            .Callback((int timeout) => Task.Delay(200).Wait());
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Throws(new Exception("Fail"));
+
+        var portOutput = _requestSender.InitializeCommunication();
+
+        // Hosting server didn't server, so port number should still be valid
+        Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+
+        // Connection must not succeed as handshake failed
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsFalse(connectionSuccess, "Connection must fail if handshake failed.");
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
+    }
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldSucceed()
-        {
-            await this.InitializeCommunicationAsync();
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldFailConnectionIfMessageReceiveFailed()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("Fail"));
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Exactly(2));
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
 
-        [TestMethod]
-        public void InitializeCommunicationShouldReturnInvalidPortNumberIfHostServerFails()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws(new Exception("Fail"));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false));
+        // Connection must not succeed as handshake failed
+        Assert.AreEqual(-1, portOutput, "Connection must fail if handshake failed.");
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+    }
 
-            var portOutput = this.requestSender.InitializeCommunication();
-            Assert.IsTrue(portOutput < 0, "Negative port number must be returned if Hosting Server fails.");
+    [TestMethod]
+    public void InitializeCommunicationShouldFailConnectionIfSessionConnectedDidNotComeFirst()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
+            .Callback((int timeout) => Task.Delay(200).Wait());
 
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsFalse(connectionSuccess, "Connection must fail as server failed to host.");
+        var discoveryMessage = new Message() { MessageType = MessageType.StartDiscovery };
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Never);
-        }
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(discoveryMessage);
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldReturnInvalidPortNumberIfHostServerFails()
-        {
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Throws(new Exception("Fail"));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false));
+        var portOutput = _requestSender.InitializeCommunication();
+        Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            Assert.IsTrue(portOutput < 0, "Negative port number must be returned if Hosting Server fails.");
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Never);
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Never);
-        }
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
 
-        [TestMethod]
-        public void InitializeCommunicationShouldFailConnectionIfMessageReceiveFailed()
-        {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
-                .Callback((int timeout) => Task.Delay(200).Wait());
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Throws(new Exception("Fail"));
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Never);
+    }
 
-            var portOutput = this.requestSender.InitializeCommunication();
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldFailConnectionIfSessionConnectedDidNotComeFirst()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
 
-            // Hosting server didn't server, so port number should still be valid
-            Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+        var discoveryMessage = new Message() { MessageType = MessageType.StartDiscovery };
 
-            // Connection must not succeed as handshake failed
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsFalse(connectionSuccess, "Connection must fail if handshake failed.");
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
-        }
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryMessage));
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldFailConnectionIfMessageReceiveFailed()
-        {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("Fail"));
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
 
-            // Connection must not succeed as handshake failed
-            Assert.AreEqual(-1, portOutput, "Connection must fail if handshake failed.");
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
-        }
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Never);
+    }
 
-        [TestMethod]
-        public void InitializeCommunicationShouldFailConnectionIfSessionConnectedDidNotComeFirst()
-        {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
-                .Callback((int timeout) => Task.Delay(200).Wait());
+    [TestMethod]
+    public void InitializeCommunicationShouldFailConnectionIfSendMessageFailed()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
+            .Callback((int timeout) => Task.Delay(200).Wait());
 
-            var discoveryMessage = new Message() { MessageType = MessageType.StartDiscovery };
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(discoveryMessage);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion)).Throws(new Exception("Fail"));
 
-            var portOutput = this.requestSender.InitializeCommunication();
-            Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
+        var portOutput = _requestSender.InitializeCommunication();
+        Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
 
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Never);
-        }
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldFailConnectionIfSessionConnectedDidNotComeFirst()
-        {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldFailConnectionIfSendMessageFailed()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(sessionConnected));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion)).Throws(new Exception("Fail"));
+
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
 
-            var discoveryMessage = new Message() { MessageType = MessageType.StartDiscovery };
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryMessage));
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
+    [TestMethod]
+    public void InitializeCommunicationShouldFailConnectionIfProtocolIsNotCompatible()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
+            .Callback((int timeout) => Task.Delay(200).Wait());
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Never);
-        }
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
 
-        [TestMethod]
-        public void InitializeCommunicationShouldFailConnectionIfSendMessageFailed()
+        // Give wrong version
+        var protocolError = new Message()
         {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
-                .Callback((int timeout) => Task.Delay(200).Wait());
+            MessageType = MessageType.ProtocolError,
+            Payload = null
+        };
 
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        Action changedMessage =
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(protocolError);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion)).Throws(new Exception("Fail"));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck)).Callback(changedMessage);
 
-            var portOutput = this.requestSender.InitializeCommunication();
-            Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
+        var portOutput = _requestSender.InitializeCommunication();
+        Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
 
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Exactly(2));
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldFailConnectionIfSendMessageFailed()
+    [TestMethod]
+    public async Task InitializeCommunicationAsyncShouldFailConnectionIfProtocolIsNotCompatible()
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+
+        // Give wrong version
+        var protocolError = new Message()
         {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+            MessageType = MessageType.ProtocolError,
+            Payload = null
+        };
 
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        Action changedMessage =
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(protocolError));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(sessionConnected));
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion)).Throws(new Exception("Fail"));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(sessionConnected));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck)).Callback(changedMessage);
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
+        _mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+
+        _mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Exactly(2));
+        _mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, _protocolVersion), Times.Once);
+    }
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+    #endregion
+
+    #region Discovery Tests
+
+    [TestMethod]
+    public void DiscoverTestsShouldCompleteWithZeroTests()
+    {
+        InitializeCommunication();
 
-        [TestMethod]
-        public void InitializeCommunicationShouldFailConnectionIfProtocolIsNotCompatible()
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        var payload = new DiscoveryCompletePayload() { TotalTests = 0, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = new Message()
         {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
 
-            this.mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
-                .Callback((int timeout) => Task.Delay(200).Wait());
+        _requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Never, "DiscoveredTests must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            // Give wrong version
-            var protocolError = new Message()
-            {
-                MessageType = MessageType.ProtocolError,
-                Payload = null
-            };
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldCompleteWithZeroTests()
+    {
+        await InitializeCommunicationAsync();
 
-            Action changedMessage =
-                () => { this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(protocolError); };
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck)).Callback(changedMessage);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 0, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = new Message()
+        {
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
 
-            var portOutput = this.requestSender.InitializeCommunication();
-            Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsFalse(connectionSuccess, "Connection must fail if version check failed.");
+        await _requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object);
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Never, "DiscoveredTests must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            this.mockCommunicationManager.Verify(cm => cm.WaitForClientConnection(Timeout.Infinite), Times.Once);
+    [TestMethod]
+    public void DiscoverTestsShouldCompleteWithSingleTest()
+    {
+        InitializeCommunication();
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessage(), Times.Exactly(2));
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-        [TestMethod]
-        public async Task InitializeCommunicationAsyncShouldFailConnectionIfProtocolIsNotCompatible()
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = new Message()
         {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+            MessageType = MessageType.TestCasesFound,
+            Payload = JToken.FromObject(testCaseList)
+        };
 
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = new Message()
+        {
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            // Give wrong version
-            var protocolError = new Message()
-            {
-                MessageType = MessageType.ProtocolError,
-                Payload = null
-            };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-            Action changedMessage =
-                () => { this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(protocolError)); };
+        _requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(sessionConnected));
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck)).Callback(changedMessage);
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            Assert.AreEqual(-1, portOutput, "Connection must fail if version check failed.");
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldCompleteWithSingleTest()
+    {
+        await InitializeCommunicationAsync();
 
-            this.mockCommunicationManager.Verify(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0)), Times.Once);
-            this.mockCommunicationManager.Verify(cm => cm.AcceptClientAsync(), Times.Once);
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.mockCommunicationManager.Verify(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()), Times.Exactly(2));
-            this.mockCommunicationManager.Verify(cm => cm.SendMessage(MessageType.VersionCheck, this.protocolVersion), Times.Once);
-        }
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = new Message()
+        {
+            MessageType = MessageType.TestCasesFound,
+            Payload = JToken.FromObject(testCaseList)
+        };
 
-        #endregion
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = new Message()
+        {
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-        #region Discovery Tests
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-        [TestMethod]
-        public void DiscoverTestsShouldCompleteWithZeroTests()
-        {
-            this.InitializeCommunication();
+        await _requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 0, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = new Message()
-            {
-                MessageType = MessageType.DiscoveryComplete,
-                Payload = JToken.FromObject(payload)
-            };
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete));
+    [TestMethod]
+    public void DiscoverTestsShouldCompleteWithSingleFullyDiscoveredSource()
+    {
+        InitializeCommunication();
+
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            this.requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        List<string> sources = ["1.dll"];
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Never, "DiscoveredTests must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var testCase = new TestCase("hello", new Uri("world://how"), source: sources[0]);
+        var testsFound = new Message()
+        {
+            MessageType = MessageType.TestCasesFound,
+            Payload = JToken.FromObject(new List<TestCase> { testCase })
+        };
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldCompleteWithZeroTests()
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false, FullyDiscoveredSources = sources };
+        var discoveryComplete = new Message()
         {
-            await this.InitializeCommunicationAsync();
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        DiscoveryCompleteEventArgs? receivedDiscoveryCompleteEventArgs = null;
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 0, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = new Message()
-            {
-                MessageType = MessageType.DiscoveryComplete,
-                Payload = JToken.FromObject(payload)
-            };
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-            await this.requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object);
+        mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback((DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) => receivedDiscoveryCompleteEventArgs = discoveryCompleteEventArgs);
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Never, "DiscoveredTests must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        _requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        Assert.IsNotNull(receivedDiscoveryCompleteEventArgs!.FullyDiscoveredSources);
+        Assert.AreEqual(1, receivedDiscoveryCompleteEventArgs.FullyDiscoveredSources.Count);
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldCompleteWithSingleTest()
+    [TestMethod]
+    public void DiscoverTestsShouldCompleteWithCorrectAbortedValuesIfAbortingWasRequested()
+    {
+        // Arrange
+        InitializeCommunication();
+
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        List<string> sources = ["1.dll"];
+
+        var testCase = new TestCase("hello", new Uri("world://how"), source: sources[0]);
+        var testsFound = new Message()
         {
-            this.InitializeCommunication();
+            MessageType = MessageType.TestCasesFound,
+            Payload = JToken.FromObject(new List<TestCase>() { testCase })
+        };
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var payload = new DiscoveryCompletePayload() { TotalTests = -1, LastDiscoveredTests = null, IsAborted = true, FullyDiscoveredSources = sources };
+        var discoveryComplete = new Message()
+        {
+            MessageType = MessageType.DiscoveryComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = new Message()
-            {
-                MessageType = MessageType.TestCasesFound,
-                Payload = JToken.FromObject(testCaseList)
-            };
+        DiscoveryCompleteEventArgs? receivedDiscoveryCompleteEventArgs = null;
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = new Message()
-            {
-                MessageType = MessageType.DiscoveryComplete,
-                Payload = JToken.FromObject(payload)
-            };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete)));
+        mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback((DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) => receivedDiscoveryCompleteEventArgs = discoveryCompleteEventArgs);
 
-            this.requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        // Act
+        _requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _requestSender.CancelDiscovery();
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        // Assert
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        Assert.IsNotNull(receivedDiscoveryCompleteEventArgs!.FullyDiscoveredSources);
+        Assert.AreEqual(1, receivedDiscoveryCompleteEventArgs.FullyDiscoveredSources.Count);
+        Assert.AreEqual(-1, receivedDiscoveryCompleteEventArgs.TotalCount);
+        Assert.AreEqual(true, receivedDiscoveryCompleteEventArgs.IsAborted);
+    }
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldCompleteWithSingleTest()
-        {
-            await this.InitializeCommunicationAsync();
+    [TestMethod]
+    public void DiscoverTestsShouldReportBackTestsWithTraitsInTestsFoundMessage()
+    {
+        InitializeCommunication();
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = new Message()
-            {
-                MessageType = MessageType.TestCasesFound,
-                Payload = JToken.FromObject(testCaseList)
-            };
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = new Message()
-            {
-                MessageType = MessageType.DiscoveryComplete,
-                Payload = JToken.FromObject(payload)
-            };
+        List<TestCase>? receivedTestCases = null;
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete)));
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            await this.requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(
+                (IEnumerable<TestCase> tests) =>
+                {
+                    receivedTestCases = tests?.ToList();
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
+                });
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        _requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldReportBackTestsWithTraitsInTestsFoundMessage()
-        {
-            this.InitializeCommunication();
+        Assert.IsNotNull(receivedTestCases);
+        Assert.AreEqual(1, receivedTestCases.Count);
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        // Verify that the traits are passed through properly.
+        var traits = receivedTestCases.ToArray()[0].Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldReportBackTestsWithTraitsInTestsFoundMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            List<TestCase> receivedTestCases = null;
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
-                .Callback(
-                    (IEnumerable<TestCase> tests) =>
-                    {
-                        receivedTestCases = tests?.ToList();
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult((discoveryComplete)));
-                    });
+        List<TestCase>? receivedTestCases = null;
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
 
-            this.requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            Assert.IsNotNull(receivedTestCases);
-            Assert.AreEqual(1, receivedTestCases.Count);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(
+                (IEnumerable<TestCase>? tests) =>
+                {
+                    receivedTestCases = tests?.ToList();
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
+                });
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedTestCases.ToArray()[0].Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        await _requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldReportBackTestsWithTraitsInTestsFoundMessage()
-        {
-            await this.InitializeCommunicationAsync();
+        Assert.IsNotNull(receivedTestCases);
+        Assert.AreEqual(1, receivedTestCases.Count);
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        // Verify that the traits are passed through properly.
+        var traits = receivedTestCases.ToArray()[0].Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+    [TestMethod]
+    public void DiscoverTestsShouldReportBackTestsWithTraitsInDiscoveryCompleteMessage()
+    {
+        InitializeCommunication();
 
-            List<TestCase> receivedTestCases = null;
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()))
-                .Callback(
-                    (IEnumerable<TestCase> tests) =>
-                    {
-                        receivedTestCases = tests?.ToList();
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult((discoveryComplete)));
-                    });
+        List<TestCase>? receivedTestCases = null;
+        var testCaseList = new List<TestCase>() { testCase };
 
-            await this.requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = testCaseList, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            Assert.IsNotNull(receivedTestCases);
-            Assert.AreEqual(1, receivedTestCases.Count);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
+        mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(
+                (DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) => receivedTestCases = tests?.ToList());
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedTestCases.ToArray()[0].Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        _requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldReportBackTestsWithTraitsInDiscoveryCompleteMessage()
-        {
-            this.InitializeCommunication();
+        Assert.IsNotNull(receivedTestCases);
+        Assert.AreEqual(1, receivedTestCases.Count);
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        // Verify that the traits are passed through properly.
+        var traits = receivedTestCases.ToArray()[0].Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldReportBackTestsWithTraitsInDiscoveryCompleteMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            List<TestCase> receivedTestCases = null;
-            var testCaseList = new List<TestCase>() { testCase };
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = testCaseList, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete));
-            mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
-                .Callback(
-                    (DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) =>
-                    {
-                        receivedTestCases = tests?.ToList();
-                    });
+        List<TestCase>? receivedTestCases = null;
+        var testCaseList = new List<TestCase>() { testCase };
 
-            this.requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = testCaseList, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            Assert.IsNotNull(receivedTestCases);
-            Assert.AreEqual(1, receivedTestCases.Count);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete));
+        mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
+            .Callback(
+                (DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) => receivedTestCases = tests?.ToList());
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedTestCases.ToArray()[0].Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        await _requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldReportBackTestsWithTraitsInDiscoveryCompleteMessage()
-        {
-            await this.InitializeCommunicationAsync();
+        Assert.IsNotNull(receivedTestCases);
+        Assert.AreEqual(1, receivedTestCases.Count);
+
+        // Verify that the traits are passed through properly.
+        var traits = receivedTestCases.ToArray()[0].Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+    [TestMethod]
+    public void DiscoverTestsShouldCompleteWithTestMessage()
+    {
+        InitializeCommunication();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            List<TestCase> receivedTestCases = null;
-            var testCaseList = new List<TestCase>() { testCase };
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = testCaseList, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete));
-            mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()))
-                .Callback(
-                    (DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> tests) =>
-                    {
-                        receivedTestCases = tests?.ToList();
-                    });
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            await this.requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message)));
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-            Assert.IsNotNull(receivedTestCases);
-            Assert.AreEqual(1, receivedTestCases.Count);
+        _requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedTestCases.ToArray()[0].Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
+    }
 
-        [TestMethod]
-        public void DiscoverTestsShouldCompleteWithTestMessage()
-        {
-            this.InitializeCommunication();
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldCompleteWithTestMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+        var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
+        var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message)));
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete)));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsFound));
+        mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message)));
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(discoveryComplete)));
 
-            this.requestSender.DiscoverTests(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        await _requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
-        }
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
+    }
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldCompleteWithTestMessage()
-        {
-            await this.InitializeCommunicationAsync();
+    [TestMethod]
+    public void DiscoverTestsShouldAbortOnExceptionInSendMessage()
+    {
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.StartDiscovery, payload)).Throws(new IOException());
 
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        _requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        _mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
+    }
 
-            var payload = new DiscoveryCompletePayload() { TotalTests = 1, LastDiscoveredTests = null, IsAborted = false };
-            var discoveryComplete = CreateMessage(MessageType.DiscoveryComplete, payload);
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldAbortOnExceptionInSendMessage()
+    {
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.StartDiscovery, payload)).Throws(new IOException());
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        await _requestSender.DiscoverTestsAsync(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsFound));
-            mockHandler.Setup(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message)));
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(discoveryComplete)));
+        mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        _mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
+    }
 
-            await this.requestSender.DiscoverTestsAsync(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+    [TestMethod]
+    public void DiscoverTestsShouldLogErrorWhenProcessExited()
+    {
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
+        var manualEvent = new ManualResetEvent(false);
+
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        _requestSender.InitializeCommunication();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Callback(
+            (CancellationToken c) =>
+            {
+                Task.Run(() => _requestSender.OnProcessExited(), c).Wait(c);
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleDiscoveredTests(It.IsAny<IEnumerable<TestCase>>()), Times.Once, "DiscoveredTests must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
-        }
+                Assert.IsTrue(c.IsCancellationRequested);
+            }).Returns(Task.FromResult((Message?)null));
 
-        [TestMethod]
-        public void DiscoverTestsShouldAbortOnExceptionInSendMessage()
-        {
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.StartDiscovery, payload)).Throws(new IOException());
+        mockHandler.Setup(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null)).Callback(() => manualEvent.Set());
 
-            this.requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            this.mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
-        }
+        manualEvent.WaitOne();
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldAbortOnExceptionInSendMessage()
-        {
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.StartDiscovery, payload)).Throws(new IOException());
+    [TestMethod]
+    public async Task DiscoverTestsAsyncShouldLogErrorWhenProcessExited()
+    {
+        var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
+
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testCaseList = new List<TestCase>() { testCase };
+        var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
+        await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Callback(
+            (CancellationToken c) =>
+            {
+                Task.Run(() => _requestSender.OnProcessExited(), c).Wait(c);
 
-            await this.requestSender.DiscoverTestsAsync(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+                Assert.IsTrue(c.IsCancellationRequested);
+            }).Returns(Task.FromResult((Message?)null));
 
-            mockHandler.Verify(mh => mh.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), null), Times.Once, "Discovery Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            this.mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
-        }
+        await _requestSender.DiscoverTestsAsync(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldLogErrorWhenProcessExited()
-        {
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
-            var manualEvent = new ManualResetEvent(false);
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
-            this.requestSender.InitializeCommunication();
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Callback(
-                (CancellationToken c) =>
-                {
-                    Task.Run(() => this.requestSender.OnProcessExited()).Wait();
+    #endregion
 
-                    Assert.IsTrue(c.IsCancellationRequested);
-                }).Returns(Task.FromResult((Message)null));
+    #region RunTests
 
-            mockHandler.Setup(mh => mh.HandleDiscoveryComplete( It.IsAny<DiscoveryCompleteEventArgs>(), null)).Callback(() => manualEvent.Set());
+    [TestMethod]
+    public void StartTestRunShouldCompleteWithZeroTests()
+    {
+        InitializeCommunication();
 
-            this.requestSender.DiscoverTests(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryMockHandler = new Mock<ITelemetryEventsHandler>();
 
-            manualEvent.WaitOne();
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldLogErrorWhenProcessExited()
+        var payload = new TestRunCompletePayload()
         {
-            var mockHandler = new Mock<ITestDiscoveryEventsHandler2>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new DiscoveryRequestPayload { Sources = sources, RunSettings = null };
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testCaseList = new List<TestCase>() { testCase };
-            var testsFound = CreateMessage(MessageType.TestCasesFound, testCaseList);
-            await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Callback(
-                (CancellationToken c) =>
-                {
-                    Task.Run(() => this.requestSender.OnProcessExited()).Wait();
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-                    Assert.IsTrue(c.IsCancellationRequested);
-                }).Returns(Task.FromResult((Message)null));
+        _requestSender.StartTestRun(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, telemetryMockHandler.Object);
 
-            await this.requestSender.DiscoverTestsAsync(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+    [TestMethod]
+    public async Task StartTestRunAsyncShouldCompleteWithZeroTests()
+    {
+        await InitializeCommunicationAsync();
 
-        #endregion
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryMockHandler = new Mock<ITelemetryEventsHandler>();
 
-        #region RunTests
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-        [TestMethod]
-        public void StartTestRunShouldCompleteWithZeroTests()
+        var payload = new TestRunCompletePayload()
         {
-            this.InitializeCommunication();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        await _requestSender.StartTestRunAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, telemetryMockHandler.Object);
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
+
+    [TestMethod]
+    public void StartTestRunShouldCompleteWithSingleTestAndMessage()
+    {
+        InitializeCommunication();
+
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryMockHandler = new Mock<ITelemetryEventsHandler>();
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            this.requestSender.StartTestRun(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(null,
+            new List<TestResult>() { testResult }, null);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncShouldCompleteWithZeroTests()
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+
+        var payload = new TestRunCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
 
-            var payload = new TestRunCompletePayload()
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            await this.requestSender.StartTestRunAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object);
+        _requestSender.StartTestRun(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, telemetryMockHandler.Object);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldCompleteWithSingleTestAndMessage()
-        {
-            this.InitializeCommunication();
+    [TestMethod]
+    public void StartTestRunShouldCompleteWithSingleTestAndTelemetryMessage()
+    {
+        InitializeCommunication();
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var telemetryMockHandler = new Mock<ITelemetryEventsHandler>();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null,
-                new List<TestResult>() { testResult }, null);
+        var testsChangedArgs = new TestRunChangedEventArgs(null,
+            new List<TestResult>() { testResult }, null);
 
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            var payload = new TestRunCompletePayload()
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+
+        var mpayload = new TelemetryEvent("aaa", new Dictionary<string, object>());
+        var message = CreateMessage(MessageType.TelemetryEventMessage, mpayload);
+
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
+
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        telemetryMockHandler.Setup(mh => mh.HandleTelemetryEvent(It.IsAny<TelemetryEvent>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        _requestSender.StartTestRun(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, telemetryMockHandler.Object);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload));
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        telemetryMockHandler.Verify(mh => mh.HandleTelemetryEvent(It.IsAny<TelemetryEvent>()), Times.Once, "TestMessage event must be called");
+    }
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+    [TestMethod]
+    public async Task StartTestRunAsyncShouldCompleteWithSingleTestAndMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            this.requestSender.StartTestRun(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-        }
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncShouldCompleteWithSingleTestAndMessage()
-        {
-            await this.InitializeCommunicationAsync();
+        var testsChangedArgs = new TestRunChangedEventArgs(null,
+            new List<TestResult>() { testResult }, null);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null,
-                new List<TestResult>() { testResult }, null);
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
 
-            var payload = new TestRunCompletePayload()
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        await _requestSender.StartTestRunAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, _telemetryHandler.Object);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload));
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+    }
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+    [TestMethod]
+    public async Task StartTestRunAsyncShouldCompleteWithSingleTestAndTelemetryMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
+
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            await this.requestSender.StartTestRunAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object);
+        var testsChangedArgs = new TestRunChangedEventArgs(null,
+            new List<TestResult>() { testResult }, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-        }
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public void StartTestRunShouldNotThrowIfTestPlatformOptionsIsNull()
+        var payload = new TestRunCompletePayload()
         {
-            // Arrange.
-            var sources = new List<string>() { "1.dll" };
-            TestRunRequestPayload receivedRequest = null;
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            this.SetupMockCommunicationForRunRequest(mockHandler);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
-                Callback((string msg, object requestpayload, int protocol) => { receivedRequest = (TestRunRequestPayload)requestpayload; });
+        var mpayload = new TelemetryEvent("aaa", new Dictionary<string, object>());
+        var message = CreateMessage(MessageType.TelemetryEventMessage, mpayload);
 
-            // Act.
-            this.requestSender.StartTestRun(sources, null, null, null, mockHandler.Object);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
 
-            // Assert.
-            Assert.IsNotNull(receivedRequest);
-            CollectionAssert.AreEqual(sources, receivedRequest.Sources);
-            Assert.IsNull(receivedRequest.TestPlatformOptions, "The run request message should include a null test case filter");
-        }
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
+            {
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-        [TestMethod]
-        public void StartTestRunShouldIncludeFilterInRequestPayload()
-        {
-            // Arrange.
-            var sources = new List<string>() { "1.dll" };
-            var filter = "GivingCampaign";
-            TestRunRequestPayload receivedRequest = null;
+        _telemetryHandler.Setup(mh => mh.HandleTelemetryEvent(It.IsAny<TelemetryEvent>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        await _requestSender.StartTestRunAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, _telemetryHandler.Object);
 
-            this.SetupMockCommunicationForRunRequest(mockHandler);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
-                Callback((string msg, object requestpayload, int protocol) => { receivedRequest = (TestRunRequestPayload)requestpayload; });
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        _telemetryHandler.Verify(mh => mh.HandleTelemetryEvent(It.IsAny<TelemetryEvent>()), Times.Once, "TestMessage event must be called");
+    }
 
-            // Act.
-            this.requestSender.StartTestRun(sources, null, new TestPlatformOptions() { TestCaseFilter = filter }, null, mockHandler.Object);
+    [TestMethod]
+    public void StartTestRunShouldNotThrowIfTestPlatformOptionsIsNull()
+    {
+        // Arrange.
+        var sources = new List<string>() { "1.dll" };
+        TestRunRequestPayload? receivedRequest = null;
 
-            // Assert.
-            Assert.IsNotNull(receivedRequest);
-            CollectionAssert.AreEqual(sources, receivedRequest.Sources);
-            Assert.AreEqual(filter, receivedRequest.TestPlatformOptions.TestCaseFilter, "The run request message should include test case filter");
-        }
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-        [TestMethod]
-        public void StartTestRunWithCustomHostShouldComplete()
-        {
-            this.InitializeCommunication();
+        SetupMockCommunicationForRunRequest();
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
+            Callback((string msg, object requestpayload, int protocol) => receivedRequest = (TestRunRequestPayload)requestpayload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        // Act.
+        _requestSender.StartTestRun(sources, null, null, null, mockHandler.Object, _telemetryHandler.Object);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        // Assert.
+        Assert.IsNotNull(receivedRequest);
+        CollectionAssert.AreEqual(sources, receivedRequest.Sources);
+        Assert.IsNull(receivedRequest.TestPlatformOptions, "The run request message should include a null test case filter");
+    }
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+    [TestMethod]
+    public void StartTestRunShouldIncludeFilterInRequestPayload()
+    {
+        // Arrange.
+        var sources = new List<string>() { "1.dll" };
+        var filter = "GivingCampaign";
+        TestRunRequestPayload? receivedRequest = null;
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        SetupMockCommunicationForRunRequest();
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
+            Callback((string msg, object requestpayload, int protocol) => receivedRequest = (TestRunRequestPayload)requestpayload);
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        // Act.
+        _requestSender.StartTestRun(sources, null, new TestPlatformOptions() { TestCaseFilter = filter }, null, mockHandler.Object, _telemetryHandler.Object);
 
-            var runprocessInfoPayload = new Message()
-            {
-                MessageType = MessageType.CustomTestHostLaunch,
-                Payload = JToken.FromObject(new TestProcessStartInfo())
-            };
+        // Assert.
+        Assert.IsNotNull(receivedRequest);
+        CollectionAssert.AreEqual(sources, receivedRequest.Sources);
+        Assert.AreEqual(filter, receivedRequest.TestPlatformOptions!.TestCaseFilter, "The run request message should include test case filter");
+    }
 
+    [TestMethod]
+    public void StartTestRunWithCustomHostShouldComplete()
+    {
+        InitializeCommunication();
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
-                (() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload)));
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            this.requestSender.StartTestRunWithCustomHost(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, mockLauncher.Object);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
-        }
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithCustomHostShouldComplete()
+        var runprocessInfoPayload = new Message()
         {
-            await this.InitializeCommunicationAsync();
+            MessageType = MessageType.CustomTestHostLaunch,
+            Payload = JToken.FromObject(new TestProcessStartInfo())
+        };
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
+            {
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
+            (() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload)));
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        _requestSender.StartTestRunWithCustomHost(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            var runprocessInfoPayload = new Message()
-            {
-                MessageType = MessageType.CustomTestHostLaunch,
-                Payload = JToken.FromObject(new TestProcessStartInfo())
-            };
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
+    }
 
+    [TestMethod]
+    public async Task StartTestRunAsyncWithCustomHostShouldComplete()
+    {
+        await InitializeCommunicationAsync();
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
-                (() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload)));
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            await this.requestSender.StartTestRunWithCustomHostAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, mockLauncher.Object);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
-        }
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-        [TestMethod]
-        public void StartTestRunWithCustomHostShouldNotAbortAndSendErrorToVstestConsoleInErrorScenario()
+        var runprocessInfoPayload = new Message()
         {
-            this.InitializeCommunication();
+            MessageType = MessageType.CustomTestHostLaunch,
+            Payload = JToken.FromObject(new TestProcessStartInfo())
+        };
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
+            {
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
+            (() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload)));
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        await _requestSender.StartTestRunWithCustomHostAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            Message runprocessInfoPayload = new VersionedMessage()
-            {
-                MessageType = MessageType.CustomTestHostLaunch,
-                Payload = JToken.FromObject(new TestProcessStartInfo())
-            };
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
+    }
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Throws(new Exception("BadError"));
+    [TestMethod]
+    public void StartTestRunWithCustomHostShouldNotAbortAndSendErrorToVstestConsoleInErrorScenario()
+    {
+        InitializeCommunication();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>(), this.protocolVersion)).
-                Callback(() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete)));
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            this.requestSender.StartTestRunWithCustomHost(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, mockLauncher.Object);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithCustomHostShouldNotAbortAndSendErrorToVstestConsoleInErrorScenario()
+        var payload = new TestRunCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        Message runprocessInfoPayload = new VersionedMessage()
+        {
+            MessageType = MessageType.CustomTestHostLaunch,
+            Payload = JToken.FromObject(new TestProcessStartInfo())
+        };
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Throws(new Exception("BadError"));
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>(), _protocolVersion)).
+            Callback(() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        _requestSender.StartTestRunWithCustomHost(new List<string>() { "1.dll" }, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            Message runprocessInfoPayload = new VersionedMessage()
-            {
-                MessageType = MessageType.CustomTestHostLaunch,
-                Payload = JToken.FromObject(new TestProcessStartInfo())
-            };
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+    }
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Throws(new Exception("BadError"));
+    [TestMethod]
+    public async Task StartTestRunAsyncWithCustomHostShouldNotAbortAndSendErrorToVstestConsoleInErrorScenario()
+    {
+        await InitializeCommunicationAsync();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>(), this.protocolVersion)).
-                Callback(() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete)));
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            await this.requestSender.StartTestRunWithCustomHostAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, mockLauncher.Object);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public void StartTestRunWithCustomHostShouldNotThrowIfTestPlatformOptionsIsNull()
+        var payload = new TestRunCompletePayload()
         {
-            // Arrange.
-            var sources = new List<string>() { "1.dll" };
-            TestRunRequestPayload receivedRequest = null;
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            this.SetupMockCommunicationForRunRequest(mockHandler);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.GetTestRunnerProcessStartInfoForRunAll, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
-                Callback((string msg, object requestpayload, int protocol) => { receivedRequest = (TestRunRequestPayload)requestpayload; });
+        Message runprocessInfoPayload = new VersionedMessage()
+        {
+            MessageType = MessageType.CustomTestHostLaunch,
+            Payload = JToken.FromObject(new TestProcessStartInfo())
+        };
 
-            // Act.
-            this.requestSender.StartTestRunWithCustomHost(sources, null, null, null, mockHandler.Object, new Mock<ITestHostLauncher>().Object);
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Throws(new Exception("BadError"));
 
-            // Assert.
-            Assert.IsNotNull(receivedRequest);
-            CollectionAssert.AreEqual(sources, receivedRequest.Sources);
-            Assert.IsNull(receivedRequest.TestPlatformOptions, "The run request message should include a null test case filter");
-        }
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-        [TestMethod]
-        public void StartTestRunWithCustomHostShouldIncludeFilterInRequestPayload()
-        {
-            // Arrange.
-            var sources = new List<string>() { "1.dll" };
-            var filter = "GivingCampaign";
-            TestRunRequestPayload receivedRequest = null;
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>(), _protocolVersion)).
+            Callback(() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        await _requestSender.StartTestRunWithCustomHostAsync(new List<string>() { "1.dll" }, null, null, null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            this.SetupMockCommunicationForRunRequest(mockHandler);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.GetTestRunnerProcessStartInfoForRunAll, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
-                Callback((string msg, object requestpayload, int protocol) => { receivedRequest = (TestRunRequestPayload)requestpayload; });
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+    }
 
-            // Act.
-            this.requestSender.StartTestRunWithCustomHost(sources, null, new TestPlatformOptions() { TestCaseFilter = filter }, null, mockHandler.Object, new Mock<ITestHostLauncher>().Object);
+    [TestMethod]
+    public void StartTestRunWithCustomHostShouldNotThrowIfTestPlatformOptionsIsNull()
+    {
+        // Arrange.
+        var sources = new List<string>() { "1.dll" };
+        TestRunRequestPayload? receivedRequest = null;
 
-            // Assert.
-            Assert.IsNotNull(receivedRequest);
-            CollectionAssert.AreEqual(sources, receivedRequest.Sources);
-            Assert.AreEqual(filter, receivedRequest.TestPlatformOptions.TestCaseFilter, "The run request message should include test case filter");
-        }
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-        [TestMethod]
-        public void StartTestRunWithSelectedTestsShouldCompleteWithZeroTests()
-        {
-            this.InitializeCommunication();
+        SetupMockCommunicationForRunRequest();
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.GetTestRunnerProcessStartInfoForRunAll, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
+            Callback((string msg, object requestpayload, int protocol) => receivedRequest = (TestRunRequestPayload)requestpayload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        // Act.
+        _requestSender.StartTestRunWithCustomHost(sources, null, null, null, mockHandler.Object, _telemetryHandler.Object, new Mock<ITestHostLauncher>().Object);
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+        // Assert.
+        Assert.IsNotNull(receivedRequest);
+        CollectionAssert.AreEqual(sources, receivedRequest.Sources);
+        Assert.IsNull(receivedRequest.TestPlatformOptions, "The run request message should include a null test case filter");
+    }
 
-            this.requestSender.StartTestRun(new List<TestCase>(), null, new TestPlatformOptions(), null, mockHandler.Object);
+    [TestMethod]
+    public void StartTestRunWithCustomHostShouldIncludeFilterInRequestPayload()
+    {
+        // Arrange.
+        var sources = new List<string>() { "1.dll" };
+        var filter = "GivingCampaign";
+        TestRunRequestPayload? receivedRequest = null;
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithSelectedTestsShouldCompleteWithZeroTests()
-        {
-            await this.InitializeCommunicationAsync();
+        SetupMockCommunicationForRunRequest();
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.GetTestRunnerProcessStartInfoForRunAll, It.IsAny<TestRunRequestPayload>(), It.IsAny<int>())).
+            Callback((string msg, object requestpayload, int protocol) => receivedRequest = (TestRunRequestPayload)requestpayload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        // Act.
+        _requestSender.StartTestRunWithCustomHost(sources, null, new TestPlatformOptions() { TestCaseFilter = filter }, null, mockHandler.Object, _telemetryHandler.Object, new Mock<ITestHostLauncher>().Object);
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+        // Assert.
+        Assert.IsNotNull(receivedRequest);
+        CollectionAssert.AreEqual(sources, receivedRequest.Sources);
+        Assert.AreEqual(filter, receivedRequest.TestPlatformOptions!.TestCaseFilter, "The run request message should include test case filter");
+    }
 
-            await this.requestSender.StartTestRunAsync(new List<TestCase>(), null, new TestPlatformOptions(), null, mockHandler.Object);
+    [TestMethod]
+    public void StartTestRunWithSelectedTestsShouldCompleteWithZeroTests()
+    {
+        InitializeCommunication();
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-        [TestMethod]
-        public void StartTestRunWithSelectedTestsShouldCompleteWithSingleTestAndMessage()
+        var payload = new TestRunCompletePayload()
         {
-            this.InitializeCommunication();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        _requestSender.StartTestRun(new List<TestCase>(), null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            var testCaseList = new List<TestCase>() { testCase };
+    [TestMethod]
+    public async Task StartTestRunAsyncWithSelectedTestsShouldCompleteWithZeroTests()
+    {
+        await InitializeCommunicationAsync();
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        await _requestSender.StartTestRunAsync(new List<TestCase>(), null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
+
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Never, "RunChangedArgs must not be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+    [TestMethod]
+    public void StartTestRunWithSelectedTestsShouldCompleteWithSingleTestAndMessage()
+    {
+        InitializeCommunication();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload));
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var testCaseList = new List<TestCase>() { testCase };
 
-            this.requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithSelectedTestsShouldCompleteWithSingleTestAndMessage()
+        var payload = new TestRunCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
 
-            var testCaseList = new List<TestCase>() { testCase };
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
+            {
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        _requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+    }
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+    [TestMethod]
+    public async Task StartTestRunAsyncWithSelectedTestsShouldCompleteWithSingleTestAndMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload));
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        var testCaseList = new List<TestCase>() { testCase };
 
-            await this.requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public void StartTestRunWithSelectedTestsHavingTraitsShouldReturnTestRunCompleteWithTraitsIntact()
+        var payload = new TestRunCompletePayload()
         {
-            this.InitializeCommunication();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload));
 
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
+            {
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var testCaseList = new List<TestCase>() { testCase };
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            TestRunChangedEventArgs receivedChangeEventArgs = null;
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, new List<TestResult> { testResult }, null);
+        await _requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+    }
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+    [TestMethod]
+    public void StartTestRunWithSelectedTestsHavingTraitsShouldReturnTestRunCompleteWithTraitsIntact()
+    {
+        InitializeCommunication();
+
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                    {
-                        receivedChangeEventArgs = stats;
-                    });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            this.requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            Assert.IsNotNull(receivedChangeEventArgs);
-            Assert.IsTrue(receivedChangeEventArgs.NewTestResults.Any());
+        var testCaseList = new List<TestCase>() { testCase };
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedChangeEventArgs.NewTestResults.ToArray()[0].TestCase.Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        TestRunChangedEventArgs? receivedChangeEventArgs = null;
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, new List<TestResult> { testResult }, null);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithSelectedTestsHavingTraitsShouldReturnTestRunCompleteWithTraitsIntact()
+        var payload = new TestRunCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+        mockHandler.Setup(mh => mh.HandleTestRunComplete(
+                It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()))
+            .Callback(
+                (TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedChangeEventArgs = stats);
 
-            var testResult = new TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        _requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var testCaseList = new List<TestCase>() { testCase };
+        Assert.IsNotNull(receivedChangeEventArgs);
+        Assert.IsTrue(receivedChangeEventArgs.NewTestResults!.Any());
 
-            TestRunChangedEventArgs receivedChangeEventArgs = null;
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, new List<TestResult> { testResult }, null);
+        // Verify that the traits are passed through properly.
+        var traits = receivedChangeEventArgs.NewTestResults!.ToArray()[0].TestCase.Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+    [TestMethod]
+    public async Task StartTestRunAsyncWithSelectedTestsHavingTraitsShouldReturnTestRunCompleteWithTraitsIntact()
+    {
+        await InitializeCommunicationAsync();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Setup(mh => mh.HandleTestRunComplete(
-                    It.IsAny<TestRunCompleteEventArgs>(),
-                    It.IsAny<TestRunChangedEventArgs>(),
-                    It.IsAny<ICollection<AttachmentSet>>(),
-                    It.IsAny<ICollection<string>>()))
-                .Callback(
-                    (TestRunCompleteEventArgs complete,
-                     TestRunChangedEventArgs stats,
-                     ICollection<AttachmentSet> attachments,
-                     ICollection<string> executorUris) =>
-                    {
-                        receivedChangeEventArgs = stats;
-                    });
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            await this.requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            Assert.IsNotNull(receivedChangeEventArgs);
-            Assert.IsTrue(receivedChangeEventArgs.NewTestResults.Any());
+        var testCaseList = new List<TestCase>() { testCase };
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedChangeEventArgs.NewTestResults.ToArray()[0].TestCase.Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        TestRunChangedEventArgs? receivedChangeEventArgs = null;
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, new List<TestResult> { testResult }, null);
 
-        [TestMethod]
-        public void StartTestRunWithSelectedTestsHavingTraitsShouldReturnTestRunStatsWithTraitsIntact()
+        var payload = new TestRunCompletePayload()
         {
-            this.InitializeCommunication();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+        mockHandler.Setup(mh => mh.HandleTestRunComplete(
+                It.IsAny<TestRunCompleteEventArgs>(),
+                It.IsAny<TestRunChangedEventArgs>(),
+                It.IsAny<ICollection<AttachmentSet>>(),
+                It.IsAny<ICollection<string>>()))
+            .Callback(
+                (TestRunCompleteEventArgs complete,
+                    TestRunChangedEventArgs stats,
+                    ICollection<AttachmentSet> attachments,
+                    ICollection<string> executorUris) => receivedChangeEventArgs = stats);
 
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        await _requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var testCaseList = new List<TestCase>() { testCase };
+        Assert.IsNotNull(receivedChangeEventArgs);
+        Assert.IsTrue(receivedChangeEventArgs.NewTestResults!.Any());
 
-            TestRunChangedEventArgs receivedChangeEventArgs = null;
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        // Verify that the traits are passed through properly.
+        var traits = receivedChangeEventArgs.NewTestResults!.ToArray()[0].TestCase.Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testsChangedArgs = new TestRunChangedEventArgs(
-                null,
-                new List<TestResult>() { testResult },
-                null);
-            var testsRunStatsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+    [TestMethod]
+    public void StartTestRunWithSelectedTestsHavingTraitsShouldReturnTestRunStatsWithTraitsIntact()
+    {
+        InitializeCommunication();
 
-            var testRunCompletepayload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, testRunCompletepayload);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsRunStatsPayload));
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(
-                    It.IsAny<TestRunChangedEventArgs>()))
-                .Callback(
-                    (TestRunChangedEventArgs stats) =>
-                    {
-                        receivedChangeEventArgs = stats;
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                    });
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            this.requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var testCaseList = new List<TestCase>() { testCase };
 
-            Assert.IsNotNull(receivedChangeEventArgs);
-            Assert.IsTrue(receivedChangeEventArgs.NewTestResults.Any());
+        TestRunChangedEventArgs? receivedChangeEventArgs = null;
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedChangeEventArgs.NewTestResults.ToArray()[0].TestCase.Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(
+            null,
+            new List<TestResult>() { testResult },
+            null);
+        var testsRunStatsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public async Task StartTestRunAsyncWithSelectedTestsHavingTraitsShouldReturnTestRunStatsWithTraitsIntact()
+        var testRunCompletePayload = new TestRunCompletePayload
         {
-            await this.InitializeCommunicationAsync();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, testRunCompletePayload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsRunStatsPayload));
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            testCase.Traits.Add(new Trait("a", "b"));
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(
+                It.IsAny<TestRunChangedEventArgs>()))
+            .Callback(
+                (TestRunChangedEventArgs stats) =>
+                {
+                    receivedChangeEventArgs = stats;
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
+                });
 
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        _requestSender.StartTestRun(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var testCaseList = new List<TestCase>() { testCase };
+        Assert.IsNotNull(receivedChangeEventArgs);
+        Assert.IsTrue(receivedChangeEventArgs.NewTestResults!.Any());
 
-            TestRunChangedEventArgs receivedChangeEventArgs = null;
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        // Verify that the traits are passed through properly.
+        var traits = receivedChangeEventArgs.NewTestResults!.ToArray()[0].TestCase.Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testsChangedArgs = new TestRunChangedEventArgs(
-                null,
-                new List<TestResult>() { testResult },
-                null);
-            var testsRunStatsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+    [TestMethod]
+    public async Task StartTestRunAsyncWithSelectedTestsHavingTraitsShouldReturnTestRunStatsWithTraitsIntact()
+    {
+        await InitializeCommunicationAsync();
 
-            var testRunCompletepayload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, testRunCompletepayload);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsRunStatsPayload));
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        testCase.Traits.Add(new Trait("a", "b"));
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(
-                    It.IsAny<TestRunChangedEventArgs>()))
-                .Callback(
-                    (TestRunChangedEventArgs stats) =>
-                    {
-                        receivedChangeEventArgs = stats;
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                    });
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-            await this.requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object);
+        var testCaseList = new List<TestCase>() { testCase };
 
-            Assert.IsNotNull(receivedChangeEventArgs);
-            Assert.IsTrue(receivedChangeEventArgs.NewTestResults.Any());
+        TestRunChangedEventArgs? receivedChangeEventArgs = null;
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            // Verify that the traits are passed through properly.
-            var traits = receivedChangeEventArgs.NewTestResults.ToArray()[0].TestCase.Traits;
-            Assert.IsNotNull(traits);
-            Assert.AreEqual("a", traits.ToArray()[0].Name);
-            Assert.AreEqual("b", traits.ToArray()[0].Value);
-        }
+        var testsChangedArgs = new TestRunChangedEventArgs(
+            null,
+            new List<TestResult>() { testResult },
+            null);
+        var testsRunStatsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-        [TestMethod]
-        public void StartTestRunWithCustomHostWithSelectedTestsComplete()
+        var testRunCompletePayload = new TestRunCompletePayload()
         {
-            this.InitializeCommunication();
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, testRunCompletePayload);
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsRunStatsPayload));
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(
+                It.IsAny<TestRunChangedEventArgs>()))
+            .Callback(
+                (TestRunChangedEventArgs stats) =>
+                {
+                    receivedChangeEventArgs = stats;
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
+                });
 
-            var testCaseList = new List<TestCase>() { testCase };
+        await _requestSender.StartTestRunAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        Assert.IsNotNull(receivedChangeEventArgs);
+        Assert.IsTrue(receivedChangeEventArgs.NewTestResults!.Any());
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        // Verify that the traits are passed through properly.
+        var traits = receivedChangeEventArgs.NewTestResults!.ToArray()[0].TestCase.Traits;
+        Assert.IsNotNull(traits);
+        Assert.AreEqual("a", traits.ToArray()[0].Name);
+        Assert.AreEqual("b", traits.ToArray()[0].Value);
+    }
 
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+    [TestMethod]
+    public void StartTestRunWithCustomHostWithSelectedTestsComplete()
+    {
+        InitializeCommunication();
+
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
+
+        var testCaseList = new List<TestCase>() { testCase };
+
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            var payload = new TestRunCompletePayload()
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
+        var runprocessInfoPayload = CreateMessage(MessageType.CustomTestHostLaunch, new TestProcessStartInfo());
+
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
-            var runprocessInfoPayload = CreateMessage(MessageType.CustomTestHostLaunch, new TestProcessStartInfo());
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
+            (() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload)));
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        _requestSender.StartTestRunWithCustomHost(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
-                (() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload)));
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
+    }
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
+    [TestMethod]
+    public async Task StartTestRunWithCustomHostAsyncWithSelectedTestsShouldComplete()
+    {
+        await InitializeCommunicationAsync();
 
-            this.requestSender.StartTestRunWithCustomHost(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, mockLauncher.Object);
+        var mockHandler = new Mock<ITestRunEventsHandler>();
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
-        }
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-        [TestMethod]
-        public async Task StartTestRunWithCustomHostAsyncWithSelectedTestsShouldComplete()
-        {
-            await this.InitializeCommunicationAsync();
+        var testCaseList = new List<TestCase>() { testCase };
 
-            var mockHandler = new Mock<ITestRunEventsHandler>();
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
 
-            var testCaseList = new List<TestCase>() { testCase };
+        var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var testsChangedArgs = new TestRunChangedEventArgs(null, new List<TestResult>() { testResult }, null);
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            var testsPayload = CreateMessage(MessageType.TestRunStatsChange, testsChangedArgs);
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
+        var runprocessInfoPayload = CreateMessage(MessageType.CustomTestHostLaunch, new TestProcessStartInfo());
 
-            var payload = new TestRunCompletePayload()
+        mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
+            (testRunChangedArgs) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+                Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults!.Any(), "TestResults must be passed properly");
+                _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+            });
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
-            var runprocessInfoPayload = CreateMessage(MessageType.CustomTestHostLaunch, new TestProcessStartInfo());
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
+            (() => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(testsPayload)));
 
-            mockHandler.Setup(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>())).Callback<TestRunChangedEventArgs>(
-                (testRunChangedArgs) =>
-                {
-                    Assert.IsTrue(testRunChangedArgs.NewTestResults != null && testsChangedArgs.NewTestResults.Any(), "TestResults must be passed properly");
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-                });
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runprocessInfoPayload));
 
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () =>
-                {
-                    this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                });
+        await _requestSender.StartTestRunWithCustomHostAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Callback
-                (() => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(testsPayload)));
-
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runprocessInfoPayload));
-
-            await this.requestSender.StartTestRunWithCustomHostAsync(testCaseList, null, new TestPlatformOptions(), null, mockHandler.Object, mockLauncher.Object);
-
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
-                It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
-        }
-
-        [TestMethod]
-        public void StartTestRunWithCustomHostInParallelShouldCallCustomHostMultipleTimes()
-        {
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            IEnumerable<string> sources = new List<string> { "1.dll" };
-            var p1 = new TestProcessStartInfo() { FileName = "X" };
-            var p2 = new TestProcessStartInfo() { FileName = "Y" };
-            var message1 = CreateMessage(MessageType.CustomTestHostLaunch, p1);
-            var message2 = CreateMessage(MessageType.CustomTestHostLaunch, p2);
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var completepayload = new TestRunCompletePayload()
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(),
+            It.IsAny<TestRunChangedEventArgs>(), null, null), Times.Once, "Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunStatsChange(It.IsAny<TestRunChangedEventArgs>()), Times.Once, "RunChangedArgs must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once, "Custom TestHostLauncher must be called");
+    }
+
+    [TestMethod]
+    public void StartTestRunWithCustomHostInParallelShouldCallCustomHostMultipleTimes()
+    {
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        IEnumerable<string> sources = new List<string> { "1.dll" };
+        var p1 = new TestProcessStartInfo() { FileName = "X" };
+        var p2 = new TestProcessStartInfo() { FileName = "Y" };
+        var message1 = CreateMessage(MessageType.CustomTestHostLaunch, p1);
+        var message2 = CreateMessage(MessageType.CustomTestHostLaunch, p2);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var completePayload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = null,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, completePayload);
+
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message1));
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
+            .Callback<TestProcessStartInfo>((startInfo) =>
             {
-                ExecutorUris = null,
-                LastRunTests = null,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, completepayload);
-
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message1));
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
-                .Callback<TestProcessStartInfo>((startInfo) =>
+                if (startInfo.FileName!.Equals(p1.FileName))
                 {
-                    if (startInfo.FileName.Equals(p1.FileName))
-                    {
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message2));
-                    }
-                    else if (startInfo.FileName.Equals(p2.FileName))
-                    {
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                    }
-                });
-            this.requestSender.InitializeCommunication();
-            this.requestSender.StartTestRunWithCustomHost(sources, null, new TestPlatformOptions(), null, mockHandler.Object, mockLauncher.Object);
-
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Exactly(2));
-        }
-
-        [TestMethod]
-        public async Task StartTestRunWithCustomHostAsyncInParallelShouldCallCustomHostMultipleTimes()
-        {
-            var mockLauncher = new Mock<ITestHostLauncher>();
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            IEnumerable<string> sources = new List<string> { "1.dll" };
-            var p1 = new TestProcessStartInfo() { FileName = "X" };
-            var p2 = new TestProcessStartInfo() { FileName = "Y" };
-            var message1 = CreateMessage(MessageType.CustomTestHostLaunch, p1);
-            var message2 = CreateMessage(MessageType.CustomTestHostLaunch, p2);
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var completepayload = new TestRunCompletePayload()
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message2));
+                }
+                else if (startInfo.FileName.Equals(p2.FileName))
+                {
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
+                }
+            });
+        _requestSender.InitializeCommunication();
+        _requestSender.StartTestRunWithCustomHost(sources, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
+
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Exactly(2));
+    }
+
+    [TestMethod]
+    public async Task StartTestRunWithCustomHostAsyncInParallelShouldCallCustomHostMultipleTimes()
+    {
+        var mockLauncher = new Mock<ITestHostLauncher>();
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        IEnumerable<string> sources = new List<string> { "1.dll" };
+        var p1 = new TestProcessStartInfo() { FileName = "X" };
+        var p2 = new TestProcessStartInfo() { FileName = "Y" };
+        var message1 = CreateMessage(MessageType.CustomTestHostLaunch, p1);
+        var message2 = CreateMessage(MessageType.CustomTestHostLaunch, p2);
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var completePayload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = null,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, completePayload);
+
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message1));
+        mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
+            .Callback<TestProcessStartInfo>((startInfo) =>
             {
-                ExecutorUris = null,
-                LastRunTests = null,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, completepayload);
-
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message1));
-            mockLauncher.Setup(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()))
-                .Callback<TestProcessStartInfo>((startInfo) =>
+                if (startInfo.FileName!.Equals(p1.FileName))
                 {
-                    if (startInfo.FileName.Equals(p1.FileName))
-                    {
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message2));
-                    }
-                    else if (startInfo.FileName.Equals(p2.FileName))
-                    {
-                        this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-                    }
-                });
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message2));
+                }
+                else if (startInfo.FileName.Equals(p2.FileName))
+                {
+                    _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
+                }
+            });
 
-            await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            await this.requestSender.StartTestRunWithCustomHostAsync(sources, null, null, null, mockHandler.Object, mockLauncher.Object);
+        await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        await _requestSender.StartTestRunWithCustomHostAsync(sources, null, null, null, mockHandler.Object, _telemetryHandler.Object, mockLauncher.Object);
 
-            mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Exactly(2));
-        }
+        mockLauncher.Verify(ml => ml.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Exactly(2));
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldAbortOnExceptionInSendMessage()
-        {
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new TestRunRequestPayload { Sources = sources, RunSettings = null };
-            var exception = new IOException();
+    [TestMethod]
+    public void StartTestRunShouldAbortOnExceptionInSendMessage()
+    {
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new TestRunRequestPayload { Sources = sources, RunSettings = null };
+        var exception = new IOException();
 
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, payload, this.protocolVersion)).Throws(exception);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, payload, _protocolVersion)).Throws(exception);
 
-            this.requestSender.StartTestRun(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _requestSender.StartTestRun(sources, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once, "Test Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            this.mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
-        }
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once, "Test Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        _mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
+    }
 
-        [TestMethod]
-        public async Task StartTestRunAsyncShouldAbortOnExceptionInSendMessage()
-        {
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var sources = new List<string> { "1.dll" };
-            var payload = new TestRunRequestPayload { Sources = sources, RunSettings = null };
-            var exception = new IOException();
+    [TestMethod]
+    public async Task StartTestRunAsyncShouldAbortOnExceptionInSendMessage()
+    {
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var sources = new List<string> { "1.dll" };
+        var payload = new TestRunRequestPayload { Sources = sources, RunSettings = null };
+        var exception = new IOException();
 
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, payload, this.protocolVersion)).Throws(exception);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAllSourcesWithDefaultHost, payload, _protocolVersion)).Throws(exception);
 
-            await this.requestSender.StartTestRunAsync(sources, null, null, null, mockHandler.Object);
+        await _requestSender.StartTestRunAsync(sources, null, null, null, mockHandler.Object, _telemetryHandler.Object);
 
-            mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once, "Test Run Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            this.mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
-        }
+        mockHandler.Verify(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once, "Test Run Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        _mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
+    }
 
-        [TestMethod]
-        public void StartTestRunShouldLogErrorOnProcessExited()
-        {
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var manualEvent = new ManualResetEvent(false);
-            var sources = new List<string> { "1.dll" };
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
-            var payload = new TestRunCompletePayload()
+    [TestMethod]
+    public void StartTestRunShouldLogErrorOnProcessExited()
+    {
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var manualEvent = new ManualResetEvent(false);
+        var sources = new List<string> { "1.dll" };
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        _requestSender.InitializeCommunication();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Callback((CancellationToken c) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            this.requestSender.InitializeCommunication();
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Callback((CancellationToken c) =>
-                {
-                    Task.Run(() => this.requestSender.OnProcessExited()).Wait();
+                Task.Run(() => _requestSender.OnProcessExited(), c).Wait(c);
 
-                    Assert.IsTrue(c.IsCancellationRequested);
-                }).Returns(Task.FromResult((Message)null));
+                Assert.IsTrue(c.IsCancellationRequested);
+            }).Returns(Task.FromResult((Message?)null));
 
-            mockHandler.Setup(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null)).Callback(() => manualEvent.Set());
+        mockHandler.Setup(mh => mh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null)).Callback(() => manualEvent.Set());
 
-            this.requestSender.StartTestRun(sources, null, new TestPlatformOptions(), null, mockHandler.Object);
+        _requestSender.StartTestRun(sources, null, new TestPlatformOptions(), null, mockHandler.Object, _telemetryHandler.Object);
 
-            manualEvent.WaitOne();
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+        manualEvent.WaitOne();
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-        [TestMethod]
-        public async Task StartTestRunAsyncShouldLogErrorOnProcessExited()
-        {
-            var mockHandler = new Mock<ITestRunEventsHandler>();
-            var sources = new List<string> { "1.dll" };
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
-            var payload = new TestRunCompletePayload()
+    [TestMethod]
+    public async Task StartTestRunAsyncShouldLogErrorOnProcessExited()
+    {
+        var mockHandler = new Mock<ITestRunEventsHandler>();
+        var sources = new List<string> { "1.dll" };
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var payload = new TestRunCompletePayload()
+        {
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
+        await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Callback((CancellationToken c) =>
             {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
-            await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Callback((CancellationToken c) =>
-                {
-                    Task.Run(() => this.requestSender.OnProcessExited()).Wait();
+                Task.Run(() => _requestSender.OnProcessExited(), c).Wait(c);
+
+                Assert.IsTrue(c.IsCancellationRequested);
+            }).Returns(Task.FromResult((Message?)null));
 
-                    Assert.IsTrue(c.IsCancellationRequested);
-                }).Returns(Task.FromResult((Message)null));
+        await _requestSender.StartTestRunAsync(sources, null, null, null, mockHandler.Object, _telemetryHandler.Object);
 
-            await this.requestSender.StartTestRunAsync(sources, null, null, null, mockHandler.Object);
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
+    }
 
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
-        }
+    #endregion
 
-        #endregion
+    #region Attachments Processing Tests
 
-        #region Attachments Processing Tests
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithZeroAttachments()
+    {
+        await InitializeCommunicationAsync();
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithZeroAttachments()
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        var payload = new TestRunAttachmentsProcessingCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
+            Attachments = Array.Empty<AttachmentSet>()
+        };
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        var attachmentsProcessingComplete = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(payload)
+        };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
+        {
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
 
-            var payload = new TestRunAttachmentsProcessingCompletePayload()
-            { 
-                AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
-                Attachments = new AttachmentSet[0] 
-            };
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            true,
+            mockHandler.Object,
+            CancellationToken.None);
 
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(payload)
-            };
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled && a.Error == null), It.Is<ICollection<AttachmentSet>>(a => a.Count == 0)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, true, mockHandler.Object, CancellationToken.None);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachment()
+    {
+        await InitializeCommunicationAsync();
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled && a.Error == null), It.Is<ICollection<AttachmentSet>>(a => a.Count == 0)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachment()
+        var payload = new TestRunAttachmentsProcessingCompletePayload()
+        {
+            AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(true, new Exception("msg")),
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }
+        };
+        var attachmentsProcessingComplete = new Message()
         {
-            await this.InitializeCommunicationAsync();
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
+        {
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
 
-            var payload = new TestRunAttachmentsProcessingCompletePayload() 
-            {
-                AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(true, new Exception("msg")),
-                Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") } 
-            };
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(payload)
-            };
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete));
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            true,
+            mockHandler.Object,
+            CancellationToken.None);
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, true, mockHandler.Object, CancellationToken.None);
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => a.IsCanceled && a.Error != null), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachmentAndTestMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => a.IsCanceled && a.Error != null), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>()), Times.Never, "TestMessage event must not be called");
-        }
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachmentAndTestMessage()
+        var payload = new TestRunAttachmentsProcessingCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }
+        };
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        var attachmentsProcessingComplete = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            var payload = new TestRunAttachmentsProcessingCompletePayload()
-            {
-                AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
-                Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") }
-            };
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(payload)
-            };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
+        {
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete)));
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            false,
+            mockHandler.Object,
+            CancellationToken.None);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete)));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
+    }
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, false, mockHandler.Object, CancellationToken.None);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachmentAndProgressMessage()
+    {
+        await InitializeCommunicationAsync();
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
-        }
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldCompleteWithOneAttachmentAndProgressMessage()
+        var completePayload = new TestRunAttachmentsProcessingCompletePayload()
         {
-            await this.InitializeCommunicationAsync();
+            AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }
+        };
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        var attachmentsProcessingComplete = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(completePayload)
+        };
 
-            var completePayload = new TestRunAttachmentsProcessingCompletePayload()
-            {
-                AttachmentsProcessingCompleteEventArgs = new TestRunAttachmentsProcessingCompleteEventArgs(false, null),
-                Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") }
-            };
+        var progressPayload = new TestRunAttachmentsProcessingProgressPayload()
+        {
+            AttachmentsProcessingProgressEventArgs = new TestRunAttachmentsProcessingProgressEventArgs(1, new[] { new Uri("http://www.bing.com/") }, 50, 2)
+        };
 
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(completePayload)
-            };
+        var attachmentsProcessingProgress = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingProgress,
+            Payload = JToken.FromObject(progressPayload)
+        };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingProgress));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
+        {
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
 
-            var progressPayload = new TestRunAttachmentsProcessingProgressPayload()
-            {
-                AttachmentsProcessingProgressEventArgs = new TestRunAttachmentsProcessingProgressEventArgs(1, new[] { new Uri("http://www.bing.com/") }, 50, 2)
-            };
+        mockHandler.Setup(mh => mh.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>())).Callback(
+            () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete)));
 
-            var attachmentsProcessingProgress = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingProgress,
-                Payload = JToken.FromObject(progressPayload)
-            };
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingProgress));
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            false,
+            mockHandler.Object,
+            CancellationToken.None);
 
-            mockHandler.Setup(mh => mh.HandleTestRunAttachmentsProcessingProgress(It.IsAny<TestRunAttachmentsProcessingProgressEventArgs>())).Callback(
-                () => this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete)));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => a.CurrentAttachmentProcessorIndex == 1 && a.CurrentAttachmentProcessorUris.First() == new Uri("http://www.bing.com/") && a.CurrentAttachmentProcessorProgress == 50 && a.AttachmentProcessorsCount == 2)), Times.Once, "Attachments processing Progress must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Never);
+    }
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, false, mockHandler.Object, CancellationToken.None);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldSendCancelMessageIfCancellationTokenCancelled()
+    {
+        await InitializeCommunicationAsync();
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel), Times.Never);
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingProgress(It.Is<TestRunAttachmentsProcessingProgressEventArgs>(a => a.CurrentAttachmentProcessorIndex == 1 && a.CurrentAttachmentProcessorUris.First() == new Uri("http://www.bing.com/") && a.CurrentAttachmentProcessorProgress == 50 && a.AttachmentProcessorsCount == 2)), Times.Once, "Attachments processing Progress must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Never);
-        }
+        var cts = new CancellationTokenSource();
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldSendCancelMessageIfCancellationTokenCancelled()
-        {
-            await this.InitializeCommunicationAsync();
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
 
-            var cts = new CancellationTokenSource();
+        var payload = new TestRunAttachmentsProcessingCompletePayload()
+        {
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }
+        };
+        var attachmentsProcessingComplete = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
+        var message = CreateMessage(MessageType.TestMessage, mpayload);
 
-            var payload = new TestRunAttachmentsProcessingCompletePayload()
-            {
-                Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") }
-            };
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(payload)
-            };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(message));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
+        {
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
+        mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(() =>
+        {
+            cts.Cancel();
+            _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete));
+        });
+
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            false,
+            mockHandler.Object,
+            cts.Token);
+
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel));
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
+    }
 
-            var mpayload = new TestMessagePayload() { MessageLevel = TestMessageLevel.Informational, Message = "Hello" };
-            var message = CreateMessage(MessageType.TestMessage, mpayload);
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldSendCancelMessageIfCancellationTokenCancelledAtTheBeginning()
+    {
+        await InitializeCommunicationAsync();
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(message));
-            mockHandler.Setup(mh => mh.HandleLogMessage(It.IsAny<TestMessageLevel>(), It.IsAny<string>())).Callback(() =>
-            {
-                cts.Cancel();
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete));
-            });
+        var cts = new CancellationTokenSource();
+        cts.Cancel();
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, false, mockHandler.Object, cts.Token);
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel));
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Once, "TestMessage event must be called");
-        }
+        var payload = new TestRunAttachmentsProcessingCompletePayload()
+        {
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }
+        };
+        var attachmentsProcessingComplete = new Message()
+        {
+            MessageType = MessageType.TestRunAttachmentsProcessingComplete,
+            Payload = JToken.FromObject(payload)
+        };
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldSendCancelMessageIfCancellationTokenCancelledAtTheBeginning()
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(attachmentsProcessingComplete));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(It.IsAny<string>(), It.IsAny<object>())).Callback((string _, object o) =>
         {
-            await this.InitializeCommunicationAsync();
+            Assert.AreEqual(Constants.EmptyRunSettings, ((TestRunAttachmentsProcessingPayload)o).RunSettings);
+            Assert.AreEqual(1, ((TestRunAttachmentsProcessingPayload)o).InvokedDataCollectors!.Count());
+        });
 
-            var cts = new CancellationTokenSource();
-            cts.Cancel();
+        await _requestSender.ProcessTestRunAttachmentsAsync(
+            new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "a") },
+            new List<InvokedDataCollector>() { new(new Uri("datacollector://sample"), "sample", typeof(string).AssemblyQualifiedName!, typeof(string).Assembly.Location, false) },
+            Constants.EmptyRunSettings,
+            true,
+            mockHandler.Object,
+            cts.Token);
 
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
+        _mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel));
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Never, "TestMessage event must be called");
+    }
 
-            var payload = new TestRunAttachmentsProcessingCompletePayload()
-            {
-                Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") }
-            };
-            var attachmentsProcessingComplete = new Message()
-            {
-                MessageType = MessageType.TestRunAttachmentsProcessingComplete,
-                Payload = JToken.FromObject(payload)
-            };
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldAbortOnExceptionInSendMessage()
+    {
+        var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>())).Throws(new IOException());
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(attachmentsProcessingComplete));
+        await _requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") }, new List<InvokedDataCollector>(), Constants.EmptyRunSettings, false, mockHandler.Object, CancellationToken.None);
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "a") }, true, mockHandler.Object, cts.Token);
+        mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled && a.Error is IOException), null), Times.Once, "Attachments Processing Complete must be called");
+        mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
+        _mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
+    }
 
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>()));
-            mockCommunicationManager.Verify(c => c.SendMessage(MessageType.TestRunAttachmentsProcessingCancel));
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.IsAny<TestRunAttachmentsProcessingCompleteEventArgs>(), It.Is<ICollection<AttachmentSet>>(a => a.Count == 1)), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Informational, "Hello"), Times.Never, "TestMessage event must be called");
-        }
+    #endregion
 
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldAbortOnExceptionInSendMessage()
-        {
-            var mockHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.TestRunAttachmentsProcessingStart, It.IsAny<object>())).Throws(new IOException());
+    #region Sessions API
+    private const int MinimumProtocolVersionWithTestSessionSupport = 5;
+    private const int TesthostPid = 5000;
 
-            await this.requestSender.ProcessTestRunAttachmentsAsync(new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") }, false, mockHandler.Object, CancellationToken.None);
+    [TestMethod]
+    public void StartTestSessionShouldFailIfWrongProtocolVersionIsNegotiated()
+    {
+        InitializeCommunication(MinimumProtocolVersionWithTestSessionSupport - 1);
 
-            mockHandler.Verify(mh => mh.HandleTestRunAttachmentsProcessingComplete(It.Is<TestRunAttachmentsProcessingCompleteEventArgs>(a => !a.IsCanceled && a.Error is IOException), null), Times.Once, "Attachments Processing Complete must be called");
-            mockHandler.Verify(mh => mh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once, "TestMessage event must be called");
-            this.mockCommunicationManager.Verify(cm => cm.StopServer(), Times.Never);
-        }
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(
+            mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNull(eventArgs.TestSessionInfo);
+                Assert.IsNull(eventArgs.Metrics);
+            });
 
-        #endregion
+        Assert.IsNull(_requestSender.StartTestSession(
+            new List<string>() { "DummyTestAssembly.dll" },
+            string.Empty,
+            null,
+            mockHandler.Object,
+            null));
 
-        #region Sessions API
-        private const int MinimumProtocolVersionWithTestSessionSupport = 5;
-        private const int TesthostPid = 5000;
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
 
-        [TestMethod]
-        public void StartTestSessionShouldFailIfWrongProtocolVersionIsNegotiated()
-        {
-            this.InitializeCommunication(MinimumProtocolVersionWithTestSessionSupport - 1);
+    [TestMethod]
+    public async Task StartTestSessionAsyncShouldFailIfWrongProtocolVersionIsNegotiated()
+    {
+        await InitializeCommunicationAsync(MinimumProtocolVersionWithTestSessionSupport - 1).ConfigureAwait(false);
 
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(
+            mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNull(eventArgs.TestSessionInfo);
+                Assert.IsNull(eventArgs.Metrics);
+            });
+
+        Assert.IsNull(await _requestSender.StartTestSessionAsync(
+            new List<string>() { "DummyTestAssembly.dll" },
+            string.Empty,
+            null,
+            mockHandler.Object,
+            null).ConfigureAwait(false));
 
-            Assert.IsNull(this.requestSender.StartTestSession(
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldSucceed()
+    {
+        InitializeCommunication();
+
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
+
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
+
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
+            {
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var message = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(message));
+
+        Assert.AreEqual(
+            testSessionInfo,
+            _requestSender.StartTestSession(
                 new List<string>() { "DummyTestAssembly.dll" },
                 string.Empty,
                 null,
                 mockHandler.Object,
                 null));
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
 
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(null), Times.Once);
-        }
+    [TestMethod]
+    public async Task StartTestSessionAsyncShouldSucceed()
+    {
+        await InitializeCommunicationAsync().ConfigureAwait(false);
 
-        [TestMethod]
-        public async Task StartTestSessionAsyncShouldFailIfWrongProtocolVersionIsNegotiated()
-        {
-            await this.InitializeCommunicationAsync(MinimumProtocolVersionWithTestSessionSupport - 1).ConfigureAwait(false);
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
 
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
 
-            Assert.IsNull(await this.requestSender.StartTestSessionAsync(
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
+            {
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var message = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(message));
+
+        Assert.AreEqual(
+            testSessionInfo,
+            await _requestSender.StartTestSessionAsync(
                 new List<string>() { "DummyTestAssembly.dll" },
                 string.Empty,
                 null,
                 mockHandler.Object,
                 null).ConfigureAwait(false));
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
 
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(null), Times.Once);
-        }
-
-        [TestMethod]
-        public void StartTestSessionShouldSucceed()
-        {
-            this.InitializeCommunication();
+    [TestMethod]
+    public void StartTestSessionWithTesthostLauncherShouldSucceed()
+    {
+        InitializeCommunication();
 
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
+        // Setup
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
 
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
-            {
-                TestSessionInfo = testSessionInfo
-            };
-            var message = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(message));
-
-            Assert.AreEqual(
-                testSessionInfo,
-                this.requestSender.StartTestSession(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    null));
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(testSessionInfo), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task StartTestSessionAsyncShouldSucceed()
-        {
-            await this.InitializeCommunicationAsync().ConfigureAwait(false);
-
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
-
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
             {
-                TestSessionInfo = testSessionInfo
-            };
-            var message = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(message));
-
-            Assert.AreEqual(
-                testSessionInfo,
-                await this.requestSender.StartTestSessionAsync(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    null).ConfigureAwait(false));
-        }
-
-        [TestMethod]
-        public void StartTestSessionWithTesthostLauncherShouldSucceed()
-        {
-            this.InitializeCommunication();
-
-            // Setup
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
-            var mockTesthostLauncher = new Mock<ITestHostLauncher>();
-            mockTesthostLauncher.Setup(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(TesthostPid);
-
-            var launchInfo = new TestProcessStartInfo();
-            var launchMessage = this.CreateMessage<TestProcessStartInfo>(
-                MessageType.CustomTestHostLaunch,
-                launchInfo);
-
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
-            {
-                TestSessionInfo = testSessionInfo
-            };
-            var ackMessage = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
+        var mockTesthostLauncher = new Mock<ITestHostLauncher>();
+        mockTesthostLauncher.Setup(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(TesthostPid);
 
-            Action reconfigureAction = () =>
-            {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                    .Returns(Task.FromResult(ackMessage));
-            };
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.CustomTestHostLaunchCallback,
-                    It.IsAny<CustomHostLaunchAckPayload>(),
-                    this.protocolVersion))
-                .Callback((string messageType, object payload, int version) =>
-                {
-                    Assert.AreEqual(((CustomHostLaunchAckPayload)payload).HostProcessId, TesthostPid);
-                });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(launchMessage))
-                .Callback(reconfigureAction);
-
-            // Act
-            Assert.AreEqual(
-                testSessionInfo,
-                this.requestSender.StartTestSession(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    mockTesthostLauncher.Object));
-
-            // Verify
-            mockTesthostLauncher.Verify(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once);
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(testSessionInfo), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task StartTestSessionAsyncWithTesthostLauncherShouldSucceed()
-        {
-            await this.InitializeCommunicationAsync().ConfigureAwait(false);
-
-            // Setup
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
-            var mockTesthostLauncher = new Mock<ITestHostLauncher>();
-            mockTesthostLauncher.Setup(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(TesthostPid);
-
-            var launchInfo = new TestProcessStartInfo();
-            var launchMessage = this.CreateMessage<TestProcessStartInfo>(
-                MessageType.CustomTestHostLaunch,
-                launchInfo);
-
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
+        var launchInfo = new TestProcessStartInfo();
+        var launchMessage = CreateMessage(
+            MessageType.CustomTestHostLaunch,
+            launchInfo);
+
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
             {
-                TestSessionInfo = testSessionInfo
-            };
-            var ackMessage = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var ackMessage = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        Action reconfigureAction = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(ackMessage));
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.CustomTestHostLaunchCallback,
+                It.IsAny<CustomHostLaunchAckPayload>(),
+                _protocolVersion))
+            .Callback((string messageType, object payload, int version) => Assert.AreEqual(((CustomHostLaunchAckPayload)payload).HostProcessId, TesthostPid));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(launchMessage))
+            .Callback(reconfigureAction);
+
+        // Act
+        Assert.AreEqual(
+            testSessionInfo,
+            _requestSender.StartTestSession(
+                new List<string>() { "DummyTestAssembly.dll" },
+                string.Empty,
+                null,
+                mockHandler.Object,
+                mockTesthostLauncher.Object));
+
+        // Verify
+        mockTesthostLauncher.Verify(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once);
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task StartTestSessionAsyncWithTesthostLauncherShouldSucceed()
+    {
+        await InitializeCommunicationAsync().ConfigureAwait(false);
+
+        // Setup
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
 
-            Action reconfigureAction = () =>
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
             {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                    .Returns(Task.FromResult(ackMessage));
-            };
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.CustomTestHostLaunchCallback,
-                    It.IsAny<CustomHostLaunchAckPayload>(),
-                    this.protocolVersion))
-                .Callback((string messageType, object payload, int version) =>
-                {
-                    Assert.AreEqual(((CustomHostLaunchAckPayload)payload).HostProcessId, TesthostPid);
-                });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(launchMessage))
-                .Callback(reconfigureAction);
-
-            // Act
-            Assert.AreEqual(
-                testSessionInfo,
-                await this.requestSender.StartTestSessionAsync(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    mockTesthostLauncher.Object).ConfigureAwait(false));
-
-            // Verify
-            mockTesthostLauncher.Verify(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once);
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(testSessionInfo), Times.Once);
-        }
-
-        [TestMethod]
-        public void StartTestSessionWithTesthostLauncherAttachingToProcessShouldSucceed()
-        {
-            this.InitializeCommunication();
-
-            // Setup
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
-            var mockTesthostLauncher = new Mock<ITestHostLauncher2>();
-            mockTesthostLauncher.Setup(tl => tl.AttachDebuggerToProcess(TesthostPid)).Returns(true);
-
-            var launchMessage = this.CreateMessage<int>(
-                MessageType.EditorAttachDebugger,
-                TesthostPid);
-
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
+        var mockTesthostLauncher = new Mock<ITestHostLauncher>();
+        mockTesthostLauncher.Setup(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>())).Returns(TesthostPid);
+
+        var launchInfo = new TestProcessStartInfo();
+        var launchMessage = CreateMessage(
+            MessageType.CustomTestHostLaunch,
+            launchInfo);
+
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
             {
-                TestSessionInfo = testSessionInfo
-            };
-            var ackMessage = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var ackMessage = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        Action reconfigureAction = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(ackMessage));
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.CustomTestHostLaunchCallback,
+                It.IsAny<CustomHostLaunchAckPayload>(),
+                _protocolVersion))
+            .Callback((string messageType, object payload, int version) => Assert.AreEqual(((CustomHostLaunchAckPayload)payload).HostProcessId, TesthostPid));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(launchMessage))
+            .Callback(reconfigureAction);
+
+        // Act
+        Assert.AreEqual(
+            testSessionInfo,
+            await _requestSender.StartTestSessionAsync(
+                new List<string>() { "DummyTestAssembly.dll" },
+                string.Empty,
+                null,
+                mockHandler.Object,
+                mockTesthostLauncher.Object).ConfigureAwait(false));
+
+        // Verify
+        mockTesthostLauncher.Verify(tl => tl.LaunchTestHost(It.IsAny<TestProcessStartInfo>()), Times.Once);
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
 
-            Action reconfigureAction = () =>
+    [TestMethod]
+    public void StartTestSessionWithTesthostLauncherAttachingToProcessShouldSucceed()
+    {
+        InitializeCommunication();
+
+        // Setup
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
+
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
             {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                    .Returns(Task.FromResult(ackMessage));
-            };
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.EditorAttachDebuggerCallback,
-                    It.IsAny<EditorAttachDebuggerAckPayload>(),
-                    this.protocolVersion))
-                .Callback((string messageType, object payload, int version) =>
-                {
-                    Assert.IsTrue(((EditorAttachDebuggerAckPayload)payload).Attached);
-                });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(launchMessage))
-                .Callback(reconfigureAction);
-
-            // Act
-            Assert.AreEqual(
-                testSessionInfo,
-                this.requestSender.StartTestSession(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    mockTesthostLauncher.Object));
-
-            // Verify
-            mockTesthostLauncher.Verify(tl => tl.AttachDebuggerToProcess(TesthostPid), Times.Once);
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(testSessionInfo), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task StartTestSessionAsyncWithTesthostLauncherAttachingToProcessShouldSucceed()
-        {
-            await this.InitializeCommunicationAsync().ConfigureAwait(false);
-
-            // Setup
-            var mockHandler = new Mock<ITestSessionEventsHandler>();
-            mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(It.IsAny<TestSessionInfo>())).Callback(() => { });
-            var mockTesthostLauncher = new Mock<ITestHostLauncher2>();
-            mockTesthostLauncher.Setup(tl => tl.AttachDebuggerToProcess(TesthostPid)).Returns(true);
-
-            var launchMessage = this.CreateMessage<int>(
-                MessageType.EditorAttachDebugger,
-                TesthostPid);
-
-            var testSessionInfo = new TestSessionInfo();
-            var ackPayload = new Payloads.StartTestSessionAckPayload()
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
+        var mockTesthostLauncher = new Mock<ITestHostLauncher2>();
+        mockTesthostLauncher.Setup(tl => tl.AttachDebuggerToProcess(TesthostPid)).Returns(true);
+
+        var launchMessage = CreateMessage(
+            MessageType.EditorAttachDebugger,
+            TesthostPid);
+
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
             {
-                TestSessionInfo = testSessionInfo
-            };
-            var ackMessage = this.CreateMessage<Payloads.StartTestSessionAckPayload>(
-                MessageType.StartTestSessionCallback,
-                ackPayload);
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var ackMessage = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        Action reconfigureAction = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(ackMessage));
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.EditorAttachDebuggerCallback,
+                It.IsAny<EditorAttachDebuggerAckPayload>(),
+                _protocolVersion))
+            .Callback((string messageType, object payload, int version) => Assert.IsTrue(((EditorAttachDebuggerAckPayload)payload).Attached));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(launchMessage))
+            .Callback(reconfigureAction);
+
+        // Act
+        Assert.AreEqual(
+            testSessionInfo,
+            _requestSender.StartTestSession(
+                new List<string>() { "DummyTestAssembly.dll" },
+                string.Empty,
+                null,
+                mockHandler.Object,
+                mockTesthostLauncher.Object));
+
+        // Verify
+        mockTesthostLauncher.Verify(tl => tl.AttachDebuggerToProcess(TesthostPid), Times.Once);
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()),
+            Times.Once);
+    }
 
-            Action reconfigureAction = () =>
+    [TestMethod]
+    public async Task StartTestSessionAsyncWithTesthostLauncherAttachingToProcessShouldSucceed()
+    {
+        await InitializeCommunicationAsync().ConfigureAwait(false);
+
+        // Setup
+        var testSessionInfo = new TestSessionInfo();
+        var metrics = new Dictionary<string, object>();
+        metrics.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
+
+        var mockHandler = new Mock<ITestSessionEventsHandler>();
+        mockHandler.Setup(mh => mh.HandleStartTestSessionComplete(
+                It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback((StartTestSessionCompleteEventArgs eventArgs) =>
             {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                    .Returns(Task.FromResult(ackMessage));
-            };
-
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                MessageType.StartTestSession,
-                It.IsAny<Payloads.StartTestSessionPayload>(),
-                this.protocolVersion)).Callback(() => { });
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(
-                    MessageType.EditorAttachDebuggerCallback,
-                    It.IsAny<EditorAttachDebuggerAckPayload>(),
-                    this.protocolVersion))
-                .Callback((string messageType, object payload, int version) =>
-                {
-                    Assert.IsTrue(((EditorAttachDebuggerAckPayload)payload).Attached);
-                });
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(launchMessage))
-                .Callback(reconfigureAction);
-
-            // Act
-            Assert.AreEqual(
-                testSessionInfo,
-                await this.requestSender.StartTestSessionAsync(
-                    new List<string>() { "DummyTestAssembly.dll" },
-                    string.Empty,
-                    null,
-                    mockHandler.Object,
-                    mockTesthostLauncher.Object).ConfigureAwait(false));
-
-            // Verify
-            mockTesthostLauncher.Verify(tl => tl.AttachDebuggerToProcess(TesthostPid), Times.Once);
-            mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(testSessionInfo), Times.Once);
-        }
-        #endregion
-
-        #region Private Methods
-
-        /// <summary>
-        /// Serialize and Deserialize message as it would happen for real.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="messageType"></param>
-        /// <param name="payload"></param>
-        /// <returns></returns>
-        private Message CreateMessage<T>(string messageType, T payload)
-        {
-            return this.serializer.DeserializeMessage(this.serializer.SerializePayload(messageType, payload, this.protocolVersion));
-        }
-
-        private void InitializeCommunication()
-        {
-            this.InitializeCommunication(this.protocolVersion);
-        }
-
-        private void InitializeCommunication(int protocolVersion)
-        {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
-
-            this.mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
-                .Callback((int timeout) => Task.Delay(200).Wait());
-
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
-            var versionCheck = new Message() { MessageType = MessageType.VersionCheck, Payload = protocolVersion };
-
-            Action changedMessage = () =>
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+            });
+        var mockTesthostLauncher = new Mock<ITestHostLauncher3>();
+        mockTesthostLauncher.Setup(tl => tl.AttachDebuggerToProcess(It.IsAny<AttachDebuggerInfo>(), It.IsAny<CancellationToken>())).Returns(true);
+
+        var launchMessage = CreateMessage(
+            MessageType.EditorAttachDebugger,
+            TesthostPid);
+
+        var ackPayload = new Payloads.StartTestSessionAckPayload()
+        {
+            EventArgs = new()
             {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(versionCheck);
-            };
+                TestSessionInfo = testSessionInfo,
+                Metrics = metrics
+            }
+        };
+        var ackMessage = CreateMessage(
+            MessageType.StartTestSessionCallback,
+            ackPayload);
+
+        Action reconfigureAction = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(ackMessage));
+
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+            MessageType.StartTestSession,
+            It.IsAny<Payloads.StartTestSessionPayload>(),
+            _protocolVersion)).Callback(() => { });
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(
+                MessageType.EditorAttachDebuggerCallback,
+                It.IsAny<EditorAttachDebuggerAckPayload>(),
+                _protocolVersion))
+            .Callback((string messageType, object payload, int version) => Assert.IsTrue(((EditorAttachDebuggerAckPayload)payload).Attached));
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult<Message?>(launchMessage))
+            .Callback(reconfigureAction);
+
+        // Act
+        Assert.AreEqual(
+            testSessionInfo,
+            await _requestSender.StartTestSessionAsync(
+                new List<string>() { "DummyTestAssembly.dll" },
+                string.Empty,
+                null,
+                mockHandler.Object,
+                mockTesthostLauncher.Object).ConfigureAwait(false));
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>())).Callback(changedMessage);
+        // Verify
+        mockTesthostLauncher.Verify(tl => tl.AttachDebuggerToProcess(It.Is<AttachDebuggerInfo>(i => i.ProcessId == TesthostPid), It.IsAny<CancellationToken>()), Times.Once);
+        mockHandler.Verify(mh => mh.HandleStartTestSessionComplete(It.IsAny<StartTestSessionCompleteEventArgs>()), Times.Once);
+    }
+    #endregion
+
+    #region Private Methods
+
+    /// <summary>
+    /// Serialize and Deserialize message as it would happen for real.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="messageType"></param>
+    /// <param name="payload"></param>
+    /// <returns></returns>
+    private Message CreateMessage<T>(string messageType, T payload)
+    {
+        return _serializer.DeserializeMessage(_serializer.SerializePayload(messageType, payload, _protocolVersion));
+    }
 
-            var portOutput = this.requestSender.InitializeCommunication();
-            Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
-            var connectionSuccess = this.requestSender.WaitForRequestHandlerConnection(this.WaitTimeout);
-            Assert.IsTrue(connectionSuccess, "Connection must succeed.");
-        }
+    private void InitializeCommunication()
+    {
+        InitializeCommunication(_protocolVersion);
+    }
 
-        private void SetupMockCommunicationForRunRequest(Mock<ITestRunEventsHandler> mockHandler)
-        {
-            this.InitializeCommunication();
+    private void InitializeCommunication(int protocolVersion)
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
 
-            var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
-            var testResult = new VisualStudio.TestPlatform.ObjectModel.TestResult(testCase);
-            testResult.Outcome = TestOutcome.Passed;
+        _mockCommunicationManager.Setup(cm => cm.WaitForClientConnection(Timeout.Infinite))
+            .Callback((int timeout) => Task.Delay(200).Wait());
 
-            var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.FromMilliseconds(1));
-            var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        var versionCheck = new Message() { MessageType = MessageType.VersionCheck, Payload = protocolVersion };
 
-            var payload = new TestRunCompletePayload()
-            {
-                ExecutorUris = null,
-                LastRunTests = dummyLastRunArgs,
-                RunAttachments = null,
-                TestRunCompleteArgs = dummyCompleteArgs
-            };
+        Action changedMessage = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(versionCheck);
 
-            var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessage()).Returns(sessionConnected);
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>())).Callback(changedMessage);
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(runComplete));
-        }
+        var portOutput = _requestSender.InitializeCommunication();
+        Assert.AreEqual(dummyPortInput, portOutput, "Port number must return without changes.");
+        var connectionSuccess = _requestSender.WaitForRequestHandlerConnection(_waitTimeout);
+        Assert.IsTrue(connectionSuccess, "Connection must succeed.");
+    }
 
-        private async Task InitializeCommunicationAsync()
-        {
-            await this.InitializeCommunicationAsync(this.protocolVersion);
-        }
+    private void SetupMockCommunicationForRunRequest()
+    {
+        InitializeCommunication();
+
+        var testCase = new TestCase("hello", new Uri("world://how"), "1.dll");
+        var testResult = new TestResult(testCase);
+        testResult.Outcome = TestOutcome.Passed;
 
-        private async Task InitializeCommunicationAsync(int protocolVersion)
+        var dummyCompleteArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, TimeSpan.FromMilliseconds(1));
+        var dummyLastRunArgs = new TestRunChangedEventArgs(null, null, null);
+
+        var payload = new TestRunCompletePayload()
         {
-            var dummyPortInput = 123;
-            this.mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
-            this.mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
+            ExecutorUris = null,
+            LastRunTests = dummyLastRunArgs,
+            RunAttachments = null,
+            TestRunCompleteArgs = dummyCompleteArgs
+        };
 
-            var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
-            var versionCheck = new Message() { MessageType = MessageType.VersionCheck, Payload = protocolVersion };
+        var runComplete = CreateMessage(MessageType.ExecutionComplete, payload);
 
-            Action changedMessage = () =>
-            {
-                this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(versionCheck));
-            };
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(runComplete));
+    }
 
-            this.mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(sessionConnected));
-            this.mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>())).Callback(changedMessage);
+    private async Task InitializeCommunicationAsync()
+    {
+        await InitializeCommunicationAsync(_protocolVersion);
+    }
+
+    private async Task InitializeCommunicationAsync(int protocolVersion)
+    {
+        var dummyPortInput = 123;
+        _mockCommunicationManager.Setup(cm => cm.HostServer(new IPEndPoint(IPAddress.Loopback, 0))).Returns(new IPEndPoint(IPAddress.Loopback, dummyPortInput));
+        _mockCommunicationManager.Setup(cm => cm.AcceptClientAsync()).Returns(Task.FromResult(false)).Callback(() => { });
 
-            var portOutput = await this.requestSender.InitializeCommunicationAsync(this.WaitTimeout);
-            Assert.AreEqual(dummyPortInput, portOutput, "Connection must succeed.");
-        }
+        var sessionConnected = new Message() { MessageType = MessageType.SessionConnected };
+        var versionCheck = new Message() { MessageType = MessageType.VersionCheck, Payload = protocolVersion };
 
-        #endregion
+        Action changedMessage = () => _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(versionCheck));
+
+        _mockCommunicationManager.Setup(cm => cm.ReceiveMessageAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult<Message?>(sessionConnected));
+        _mockCommunicationManager.Setup(cm => cm.SendMessage(MessageType.VersionCheck, It.IsAny<int>())).Callback(changedMessage);
+
+        var portOutput = await _requestSender.InitializeCommunicationAsync(_waitTimeout);
+        Assert.AreEqual(dummyPortInput, portOutput, "Connection must succeed.");
     }
+
+    #endregion
 }
diff --git a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperAsyncTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperAsyncTests.cs
deleted file mode 100644
index a4a85627f9..0000000000
--- a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperAsyncTests.cs
+++ /dev/null
@@ -1,589 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class VsTestConsoleWrapperAsyncTests
-    {
-        private IVsTestConsoleWrapper consoleWrapper;
-
-        private Mock<IProcessManager> mockProcessManager;
-
-        private Mock<ITranslationLayerRequestSender> mockRequestSender;
-
-        private Mock<IProcessHelper> mockProcessHelper;
-
-        private readonly List<string> testSources = new List<string> { "Hello", "World" };
-
-        private readonly List<TestCase> testCases = new List<TestCase>
-                                                      {
-                                                          new TestCase("a.b.c", new Uri("d://uri"), "a.dll"),
-                                                          new TestCase("d.e.f", new Uri("g://uri"), "d.dll")
-                                                      };
-
-        private ConsoleParameters consoleParameters;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.consoleParameters = new ConsoleParameters();
-
-            this.mockRequestSender = new Mock<ITranslationLayerRequestSender>();
-            this.mockProcessManager = new Mock<IProcessManager>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.consoleWrapper = new VsTestConsoleWrapper(
-                this.mockRequestSender.Object,
-                this.mockProcessManager.Object,
-                this.consoleParameters,
-                new Mock<ITestPlatformEventSource>().Object,
-                this.mockProcessHelper.Object);
-
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(100);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(100));
-        }
-
-        [TestMethod]
-        public async Task StartSessionAsyncShouldStartVsTestConsoleWithCorrectArguments()
-        {
-            var inputPort = 123;
-            int expectedParentProcessId = System.Diagnostics.Process.GetCurrentProcess().Id;
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(inputPort));
-
-            await this.consoleWrapper.StartSessionAsync();
-
-            Assert.AreEqual(expectedParentProcessId, this.consoleParameters.ParentProcessId, "Parent process Id must be set");
-            Assert.AreEqual(inputPort, this.consoleParameters.PortNumber, "Port number must be set");
-
-            this.mockProcessManager.Verify(pm => pm.StartProcess(this.consoleParameters), Times.Once);
-        }
-
-        [TestMethod]
-        public void StartSessionAsyncShouldThrowExceptionOnBadPort()
-        {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(-1));
-
-            Assert.ThrowsExceptionAsync<TransationLayerException>(async () => await this.consoleWrapper.StartSessionAsync());
-        }
-
-        [TestMethod]
-        public async Task StartSessionShouldCallWhenProcessNotInitializedAsync()
-        {
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
-
-            // To call private method EnsureInitialize call InitializeExtensions
-            await this.consoleWrapper.InitializeExtensionsAsync(new[] { "path/to/adapter" });
-
-            this.mockProcessManager.Verify(pm => pm.StartProcess(It.IsAny<ConsoleParameters>()));
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task StartTestSessionAsyncShouldCallRequestSenderWithCorrectArguments1()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    null,
-                    mockEventsHandler.Object,
-                    null))
-                .Returns(Task.FromResult(testSessionInfo));
-
-            Assert.AreEqual(
-                (await this.consoleWrapper.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    mockEventsHandler.Object).ConfigureAwait(false)).TestSessionInfo,
-                testSessionInfo);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    null,
-                    mockEventsHandler.Object,
-                    null),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task StartTestSessionAsyncShouldCallRequestSenderWithCorrectArguments2()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    null))
-                .Returns(Task.FromResult(testSessionInfo));
-
-            Assert.AreEqual(
-                (await this.consoleWrapper.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object).ConfigureAwait(false)).TestSessionInfo,
-                testSessionInfo);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    null),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task StartTestSessionAsyncShouldCallRequestSenderWithCorrectArguments3()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-            var mockTesthostLauncher = new Mock<ITestHostLauncher>();
-
-            this.mockRequestSender.Setup(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    mockTesthostLauncher.Object))
-                .Returns(Task.FromResult(testSessionInfo));
-
-            Assert.AreEqual(
-                (await this.consoleWrapper.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    mockTesthostLauncher.Object).ConfigureAwait(false)).TestSessionInfo,
-                testSessionInfo);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSessionAsync(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    mockTesthostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public async Task StopTestSessionAsyncShouldCallRequestSenderWithCorrectArguments()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
-                rs => rs.StopTestSessionAsync(
-                    It.IsAny<TestSessionInfo>(),
-                    It.IsAny<ITestSessionEventsHandler>()))
-                .Returns(Task.FromResult(true));
-
-            Assert.IsTrue(
-                await this.consoleWrapper.StopTestSessionAsync(
-                    testSessionInfo,
-                    mockEventsHandler.Object).ConfigureAwait(false));
-
-            this.mockRequestSender.Verify(
-                rs => rs.StopTestSessionAsync(
-                    testSessionInfo,
-                    mockEventsHandler.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task InitializeExtensionsAsyncShouldCachePathToExtensions()
-        {
-            var pathToExtensions = new[] { "path/to/adapter" };
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(true);
-
-            await this.consoleWrapper.InitializeExtensionsAsync(pathToExtensions);
-
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(100));
-
-            await this.consoleWrapper.InitializeExtensionsAsync(pathToExtensions);
-
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToExtensions), Times.Exactly(3));
-        }
-
-        [TestMethod]
-        public void ProcessExitedEventShouldSetOnProcessExit()
-        {
-            this.mockProcessManager.Raise(pm => pm.ProcessExited += null, EventArgs.Empty);
-
-            this.mockRequestSender.Verify(rs => rs.OnProcessExited(), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task InitializeExtensionsAsyncShouldSucceed()
-        {
-            var pathToAdditionalExtensions = new List<string> { "Hello", "World" };
-
-            await this.consoleWrapper.InitializeExtensionsAsync(pathToAdditionalExtensions);
-
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToAdditionalExtensions), Times.Once);
-        }
-
-        [TestMethod]
-        public void InitializeExtensionsAsyncShouldThrowExceptionOnBadConnection()
-        {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(-1));
-
-            Assert.ThrowsExceptionAsync<TransationLayerException>(async () => await this.consoleWrapper.InitializeExtensionsAsync(new List<string> { "Hello", "World" }));
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldSucceed()
-        {
-            await this.consoleWrapper.DiscoverTestsAsync(this.testSources, null, new TestPlatformOptions(), new Mock<ITestDiscoveryEventsHandler2>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.DiscoverTestsAsync(this.testSources, null, It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsAsyncShouldPassTestDiscoveryHandler2IfTestDiscoveryHandler1IsInput()
-        {
-            await this.consoleWrapper.DiscoverTestsAsync(this.testSources, null, new TestPlatformOptions(), new Mock<ITestDiscoveryEventsHandler2>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.DiscoverTestsAsync(this.testSources, null, It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsAndNullOptionsAsyncShouldSucceedOnNullOptions()
-        {
-            await this.consoleWrapper.DiscoverTestsAsync(this.testSources, null, null, new Mock<ITestDiscoveryEventsHandler2>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.DiscoverTestsAsync(this.testSources, null, null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsAndOptionsAsyncShouldSucceedOnOptions()
-        {
-            var options = new TestPlatformOptions();
-            await this.consoleWrapper.DiscoverTestsAsync(this.testSources, null, options, new Mock<ITestDiscoveryEventsHandler2>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.DiscoverTestsAsync(this.testSources, null, options, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void DiscoverTestsAsyncShouldThrowExceptionOnBadConnection()
-        {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(-1));
-
-            Assert.ThrowsExceptionAsync<TransationLayerException>(async () => await this.consoleWrapper.DiscoverTestsAsync(new List<string> { "Hello", "World" }, null, new TestPlatformOptions(), new Mock<ITestDiscoveryEventsHandler2>().Object));
-            this.mockRequestSender.Verify(rs => rs.DiscoverTestsAsync(It.IsAny<IEnumerable<string>>(), It.IsAny<string>(), It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Never);
-        }
-
-        [TestMethod]
-        public async Task DiscoverTestsShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-
-            await this.consoleWrapper.DiscoverTestsAsync(
-                    this.testSources,
-                    null,
-                    null,
-                    testSessionInfo,
-                    new Mock<ITestDiscoveryEventsHandler2>().Object)
-                .ConfigureAwait(false);
-
-            this.mockRequestSender.Verify(
-                rs => rs.DiscoverTestsAsync(
-                    this.testSources,
-                    null,
-                    null,
-                    testSessionInfo,
-                    It.IsAny<ITestDiscoveryEventsHandler2>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesShouldSucceed()
-        {
-            await this.consoleWrapper.RunTestsAsync(this.testSources, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndNullOptionsShouldSucceedOnNullOptions()
-        {
-            await this.consoleWrapper.RunTestsAsync(this.testSources, "RunSettings", null, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndOptionsShouldSucceedOnOptions()
-        {
-            var options = new TestPlatformOptions();
-            await this.consoleWrapper.RunTestsAsync(this.testSources, "RunSettings", options, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testSources, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            await this.consoleWrapper.RunTestsAsync(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    new Mock<ITestRunEventsHandler>().Object)
-                .ConfigureAwait(false);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunAsync(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndCustomHostShouldSucceed()
-        {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testSources,
-                "RunSettings",
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndOptionsUsingCustomHostShouldSucceedOnNullOptions()
-        {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testSources,
-                "RunSettings",
-                null,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesOnOptionsUsingCustomHostShouldSucceedOnOptions()
-        {
-            var options = new TestPlatformOptions();
-
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testSources,
-                "RunSettings",
-                options,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testSources, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSourcesAndACustomHostShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    new Mock<ITestRunEventsHandler>().Object,
-                    new Mock<ITestHostLauncher>().Object)
-                .ConfigureAwait(false);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunWithCustomHostAsync(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>(),
-                    It.IsAny<ITestHostLauncher>()),
-                    Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsShouldSucceed()
-        {
-            await this.consoleWrapper.RunTestsAsync(this.testCases, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndOptionsShouldSucceedOnNullOptions()
-        {
-            await this.consoleWrapper.RunTestsAsync(this.testCases, "RunSettings", null, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndOptionsShouldSucceedOnOptions()
-        {
-            var options = new TestPlatformOptions();
-
-            await this.consoleWrapper.RunTestsAsync(this.testCases, "RunSettings", options, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunAsync(this.testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-
-            await this.consoleWrapper.RunTestsAsync(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    new Mock<ITestRunEventsHandler>().Object)
-                .ConfigureAwait(false);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunAsync(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndCustomLauncherShouldSucceed()
-        {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testCases,
-                "RunSettings",
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndOptionsUsingCustomLauncherShouldSucceedOnNullOptions()
-        {
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testCases,
-                "RunSettings",
-                null,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndOptionsUsingCustomLauncherShouldSucceedOnOptions()
-        {
-            var options = new TestPlatformOptions();
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                this.testCases,
-                "RunSettings",
-                options,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public async Task RunTestsAsyncWithSelectedTestsAndACustomHostShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-
-            await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    new Mock<ITestRunEventsHandler>().Object,
-                    new Mock<ITestHostLauncher>().Object)
-                .ConfigureAwait(false);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunWithCustomHostAsync(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>(),
-                    It.IsAny<ITestHostLauncher>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldSucceed()
-        {
-            var attachments = new Collection<AttachmentSet>();
-            var cancellationToken = new CancellationToken();
-
-            await this.consoleWrapper.ProcessTestRunAttachmentsAsync(
-                attachments,
-                null,
-                true,
-                true,
-                new Mock<ITestRunAttachmentsProcessingEventsHandler>().Object,
-                cancellationToken);
-
-            this.mockRequestSender.Verify(rs => rs.ProcessTestRunAttachmentsAsync(attachments, true, It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), cancellationToken));
-        }
-
-        [TestMethod]
-        public void EndSessionShouldSucceed()
-        {
-            this.consoleWrapper.EndSession();
-
-            this.mockRequestSender.Verify(rs => rs.EndSession(), Times.Once);
-            this.mockRequestSender.Verify(rs => rs.Close(), Times.Once);
-        }
-    }
-}
diff --git a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs
index 2c4f86e188..e3ba446662 100644
--- a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs
+++ b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs
@@ -1,584 +1,701 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests;
+
+[TestClass]
+public class VsTestConsoleWrapperTests
 {
-    using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Diagnostics;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    [TestClass]
-    public class VsTestConsoleWrapperTests
-    {
-        private IVsTestConsoleWrapper consoleWrapper;
-
-        private Mock<IProcessManager> mockProcessManager;
-
-        private Mock<IProcessHelper> mockProcessHelper;
-
-        private Mock<ITranslationLayerRequestSender> mockRequestSender;
-
-        private readonly List<string> testSources = new List<string> { "Hello", "World" };
-
-        private readonly List<TestCase> testCases = new List<TestCase>
-                                                      {
-                                                          new TestCase("a.b.c", new Uri("d://uri"), "a.dll"),
-                                                          new TestCase("d.e.f", new Uri("g://uri"), "d.dll")
-                                                      };
-
-        private ConsoleParameters consoleParameters;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.consoleParameters = new ConsoleParameters();
-
-            this.mockRequestSender = new Mock<ITranslationLayerRequestSender>();
-            this.mockProcessManager = new Mock<IProcessManager>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.consoleWrapper = new VsTestConsoleWrapper(
-                this.mockRequestSender.Object,
-                this.mockProcessManager.Object,
-                this.consoleParameters,
-                new Mock<ITestPlatformEventSource>().Object,
-                this.mockProcessHelper.Object);
-
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(100);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(100));
-        }
-
-        [TestMethod]
-        public void StartSessionShouldStartVsTestConsoleWithCorrectArguments()
-        {
-            var inputPort = 123;
-            int expectedParentProcessId = System.Diagnostics.Process.GetCurrentProcess().Id;
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(inputPort);
-
-            this.consoleWrapper.StartSession();
-
-            Assert.AreEqual(expectedParentProcessId, this.consoleParameters.ParentProcessId, "Parent process Id must be set");
-            Assert.AreEqual(inputPort, this.consoleParameters.PortNumber, "Port number must be set");
-            Assert.AreEqual(TraceLevel.Verbose, this.consoleParameters.TraceLevel, "Default value of trace level should be verbose.");
-
-            this.mockProcessManager.Verify(pm => pm.StartProcess(this.consoleParameters), Times.Once);
-        }
-
-        [TestMethod]
-        public void StartSessionShouldThrowExceptionOnBadPort()
-        {
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(-1);
-
-            Assert.ThrowsException<TransationLayerException>(() => this.consoleWrapper.StartSession());
-        }
-
-        [TestMethod]
-        public void StartSessionShouldCallWhenProcessNotInitialized()
-        {
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
-
-            // To call private method EnsureInitialize call InitializeExtensions
-            this.consoleWrapper.InitializeExtensions(new[] { "path/to/adapter" });
-
-            this.mockProcessManager.Verify(pm => pm.StartProcess(It.IsAny<ConsoleParameters>()));
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void StartTestSessionShouldCallRequestSenderWithCorrectArguments1()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
+    private readonly IVsTestConsoleWrapper _consoleWrapper;
+    private readonly Mock<IProcessManager> _mockProcessManager;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITranslationLayerRequestSender> _mockRequestSender;
+    private readonly List<string> _testSources = ["Hello", "World"];
+    private readonly List<TestCase> _testCases =
+    [
+        new TestCase("a.b.c", new Uri("d://uri"), "a.dll"),
+        new TestCase("d.e.f", new Uri("g://uri"), "d.dll")
+    ];
+    private readonly ConsoleParameters _consoleParameters;
+    private readonly Mock<ITelemetryEventsHandler> _telemetryEventsHandler;
+
+    public VsTestConsoleWrapperTests()
+    {
+        _consoleParameters = new ConsoleParameters();
+
+        _mockRequestSender = new Mock<ITranslationLayerRequestSender>();
+        _mockProcessManager = new Mock<IProcessManager>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _consoleWrapper = new VsTestConsoleWrapper(
+            _mockRequestSender.Object,
+            _mockProcessManager.Object,
+            _consoleParameters,
+            new Mock<ITestPlatformEventSource>().Object,
+            _mockProcessHelper.Object);
+        _telemetryEventsHandler = new Mock<ITelemetryEventsHandler>();
+
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(100);
+        _mockRequestSender.Setup(rs => rs.InitializeCommunicationAsync(It.IsAny<int>())).Returns(Task.FromResult(100));
+    }
+
+    [TestMethod]
+    public void StartSessionShouldStartVsTestConsoleWithCorrectArguments()
+    {
+        var inputPort = 123;
+#if NET5_0_OR_GREATER
+        var expectedParentProcessId = Environment.ProcessId;
+#else
+        int expectedParentProcessId;
+        using (var p = Process.GetCurrentProcess())
+            expectedParentProcessId = p.Id;
+#endif
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(inputPort);
+
+        _consoleWrapper.StartSession();
+
+        Assert.AreEqual(expectedParentProcessId, _consoleParameters.ParentProcessId, "Parent process Id must be set");
+        Assert.AreEqual(inputPort, _consoleParameters.PortNumber, "Port number must be set");
+        Assert.AreEqual(TraceLevel.Verbose, _consoleParameters.TraceLevel, "Default value of trace level should be verbose.");
+
+        _mockProcessManager.Verify(pm => pm.StartProcess(_consoleParameters), Times.Once);
+    }
+
+    [TestMethod]
+    public void StartSessionShouldThrowExceptionOnBadPort()
+    {
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(-1);
+
+        Assert.ThrowsException<TransationLayerException>(() => _consoleWrapper.StartSession());
+    }
+
+    [TestMethod]
+    public void StartSessionShouldCallWhenProcessNotInitialized()
+    {
+        _mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
+
+        // To call private method EnsureInitialize call InitializeExtensions
+        _consoleWrapper.InitializeExtensions(new[] { "path/to/adapter" });
+
+        _mockProcessManager.Verify(pm => pm.StartProcess(It.IsAny<ConsoleParameters>()));
+    }
+
+    [TestMethod]
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void StartTestSessionShouldCallRequestSenderWithCorrectArguments1()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        _mockRequestSender.Setup(
                 rs => rs.StartTestSession(
-                    this.testSources,
+                    _testSources,
                     null,
                     null,
                     mockEventsHandler.Object,
                     null))
-                .Returns(testSessionInfo);
+            .Returns(testSessionInfo);
 
-            Assert.AreEqual(
-                this.consoleWrapper.StartTestSession(
-                    this.testSources,
-                    null,
-                    mockEventsHandler.Object).TestSessionInfo,
-                testSessionInfo);
+        Assert.AreEqual(
+            _consoleWrapper.StartTestSession(
+                _testSources,
+                null,
+                mockEventsHandler.Object)?.TestSessionInfo,
+            testSessionInfo);
 
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSession(
-                    this.testSources,
-                    null,
-                    null,
-                    mockEventsHandler.Object,
-                    null),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void StartTestSessionShouldCallRequestSenderWithCorrectArguments2()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
+        _mockRequestSender.Verify(
+            rs => rs.StartTestSession(
+                _testSources,
+                null,
+                null,
+                mockEventsHandler.Object,
+                null),
+            Times.Once);
+    }
+
+    [TestMethod]
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void StartTestSessionShouldCallRequestSenderWithCorrectArguments2()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        _mockRequestSender.Setup(
                 rs => rs.StartTestSession(
-                    this.testSources,
+                    _testSources,
                     null,
                     testPlatformOptions,
                     mockEventsHandler.Object,
                     null))
-                .Returns(testSessionInfo);
+            .Returns(testSessionInfo);
 
-            Assert.AreEqual(
-                this.consoleWrapper.StartTestSession(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object).TestSessionInfo,
-                testSessionInfo);
+        Assert.AreEqual(
+            _consoleWrapper.StartTestSession(
+                _testSources,
+                null,
+                testPlatformOptions,
+                mockEventsHandler.Object)?.TestSessionInfo,
+            testSessionInfo);
 
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSession(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    null),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void StartTestSessionShouldCallRequestSenderWithCorrectArguments3()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var testPlatformOptions = new TestPlatformOptions();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-            var mockTesthostLauncher = new Mock<ITestHostLauncher>();
-
-            this.mockRequestSender.Setup(
+        _mockRequestSender.Verify(
+            rs => rs.StartTestSession(
+                _testSources,
+                null,
+                testPlatformOptions,
+                mockEventsHandler.Object,
+                null),
+            Times.Once);
+    }
+
+    [TestMethod]
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void StartTestSessionShouldCallRequestSenderWithCorrectArguments3()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+        var mockTesthostLauncher = new Mock<ITestHostLauncher>();
+
+        _mockRequestSender.Setup(
                 rs => rs.StartTestSession(
-                    this.testSources,
+                    _testSources,
                     null,
                     testPlatformOptions,
                     mockEventsHandler.Object,
                     mockTesthostLauncher.Object))
-                .Returns(testSessionInfo);
+            .Returns(testSessionInfo);
 
-            Assert.AreEqual(
-                this.consoleWrapper.StartTestSession(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    mockTesthostLauncher.Object).TestSessionInfo,
-                testSessionInfo);
+        Assert.AreEqual(
+            _consoleWrapper.StartTestSession(
+                _testSources,
+                null,
+                testPlatformOptions,
+                mockEventsHandler.Object,
+                mockTesthostLauncher.Object)?.TestSessionInfo,
+            testSessionInfo);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestSession(
+                _testSources,
+                null,
+                testPlatformOptions,
+                mockEventsHandler.Object,
+                mockTesthostLauncher.Object),
+            Times.Once);
+    }
 
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestSession(
-                    this.testSources,
-                    null,
-                    testPlatformOptions,
-                    mockEventsHandler.Object,
-                    mockTesthostLauncher.Object),
-                Times.Once);
-        }
-
-        [TestMethod]
-        [Obsolete("This API is not final yet and is subject to changes.", false)]
-        public void StopTestSessionShouldCallRequestSenderWithCorrectArguments()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
-
-            this.mockRequestSender.Setup(
+    [TestMethod]
+    [Obsolete("This API is not final yet and is subject to changes.", false)]
+    public void StopTestSessionShouldCallRequestSenderWithCorrectArguments()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var testPlatformOptions = new TestPlatformOptions();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        _mockRequestSender.Setup(
                 rs => rs.StopTestSession(
                     It.IsAny<TestSessionInfo>(),
+                    It.IsAny<TestPlatformOptions>(),
                     It.IsAny<ITestSessionEventsHandler>()))
-                .Returns(true);
-
-            Assert.IsTrue(
-                this.consoleWrapper.StopTestSession(
-                    testSessionInfo,
-                    mockEventsHandler.Object));
+            .Returns(true);
 
-            this.mockRequestSender.Verify(
-                rs => rs.StopTestSession(
-                    testSessionInfo,
-                    mockEventsHandler.Object),
-                Times.Once);
-        }
+        Assert.IsTrue(
+            _consoleWrapper.StopTestSession(
+                testSessionInfo,
+                testPlatformOptions,
+                mockEventsHandler.Object));
 
-        [TestMethod]
-        public void InitializeExtensionsShouldCachePathToExtensions()
-        {
-            var pathToExtensions = new[] { "path/to/adapter" };
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(true);
+        _mockRequestSender.Verify(
+            rs => rs.StopTestSession(
+                testSessionInfo,
+                testPlatformOptions,
+                mockEventsHandler.Object),
+            Times.Once);
+    }
 
-            this.consoleWrapper.InitializeExtensions(pathToExtensions);
+    [TestMethod]
+    public void InitializeExtensionsShouldCachePathToExtensions()
+    {
+        var pathToExtensions = new[] { "path/to/adapter" };
+        _mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(true);
 
-            this.mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
-            this.mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(100);
+        _consoleWrapper.InitializeExtensions(pathToExtensions);
 
-            this.consoleWrapper.InitializeExtensions(pathToExtensions);
+        _mockProcessManager.Setup(pm => pm.IsProcessInitialized()).Returns(false);
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(100);
 
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToExtensions), Times.Exactly(3));
-        }
+        _consoleWrapper.InitializeExtensions(pathToExtensions);
 
-        [TestMethod]
-        public void ProcessExitedEventShouldSetOnProcessExit()
-        {
-            this.mockProcessManager.Raise(pm => pm.ProcessExited += null, EventArgs.Empty);
+        _mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToExtensions), Times.Exactly(3));
+    }
 
-            this.mockRequestSender.Verify(rs => rs.OnProcessExited(), Times.Once);
-        }
+    [TestMethod]
+    public void ProcessExitedEventShouldSetOnProcessExit()
+    {
+        _mockProcessManager.Raise(pm => pm.ProcessExited += null, EventArgs.Empty);
 
-        [TestMethod]
-        public void InitializeExtensionsShouldSucceed()
-        {
-            var pathToAdditionalExtensions = new List<string> { "Hello", "World" };
+        _mockRequestSender.Verify(rs => rs.OnProcessExited(), Times.Once);
+    }
 
-            this.consoleWrapper.InitializeExtensions(pathToAdditionalExtensions);
+    [TestMethod]
+    public void InitializeExtensionsShouldSucceed()
+    {
+        var pathToAdditionalExtensions = new List<string> { "Hello", "World" };
 
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToAdditionalExtensions), Times.Once);
-        }
+        _consoleWrapper.InitializeExtensions(pathToAdditionalExtensions);
 
-        [TestMethod]
-        public void InitializeExtensionsShouldThrowExceptionOnBadConnection()
-        {
-            this.mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DummyProcess");
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
+        _mockRequestSender.Verify(rs => rs.InitializeExtensions(pathToAdditionalExtensions), Times.Once);
+    }
 
-            var exception = Assert.ThrowsException<TransationLayerException>(() => this.consoleWrapper.InitializeExtensions(new List<string> { "Hello", "World" }));
-            Assert.AreEqual("DummyProcess process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", exception.Message);
-            this.mockRequestSender.Verify(rs => rs.InitializeExtensions(It.IsAny<IEnumerable<string>>()), Times.Never);
-        }
+    [TestMethod]
+    public void InitializeExtensionsShouldThrowExceptionOnBadConnection()
+    {
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DummyProcess");
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
 
-        [TestMethod]
-        public void DiscoverTestsShouldSucceed()
-        {
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            this.consoleWrapper.DiscoverTests(this.testSources, null, options, new Mock<ITestDiscoveryEventsHandler2>().Object);
+        var exception = Assert.ThrowsException<TransationLayerException>(() => _consoleWrapper.InitializeExtensions(new List<string> { "Hello", "World" }));
+        Assert.AreEqual("DummyProcess process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", exception.Message);
+        _mockRequestSender.Verify(rs => rs.InitializeExtensions(It.IsAny<IEnumerable<string>>()), Times.Never);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.DiscoverTests(this.testSources, null, options, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldSucceed()
+    {
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.DiscoverTests(_testSources, null, options, new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldPassOnNullOptions()
-        {
-            this.consoleWrapper.DiscoverTests(this.testSources, null, null, new Mock<ITestDiscoveryEventsHandler2>().Object);
+        _mockRequestSender.Verify(rs => rs.DiscoverTests(_testSources, null, options, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.DiscoverTests(this.testSources, null, null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldPassOnNullOptions()
+    {
+        _consoleWrapper.DiscoverTests(_testSources, null, null, new Mock<ITestDiscoveryEventsHandler2>().Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldCallTestDiscoveryHandler2IfTestDiscoveryHandler1IsUsed()
-        {
-            this.consoleWrapper.DiscoverTests(this.testSources, null, new Mock<ITestDiscoveryEventsHandler>().Object);
+        _mockRequestSender.Verify(rs => rs.DiscoverTests(_testSources, null, null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.DiscoverTests(this.testSources, null, null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
-        }
+    [TestMethod]
+    public void DiscoverTestsShouldCallTestDiscoveryHandler2IfTestDiscoveryHandler1IsUsed()
+    {
+        _consoleWrapper.DiscoverTests(_testSources, null, new Mock<ITestDiscoveryEventsHandler>().Object);
 
-        [TestMethod]
-        public void DiscoverTestsShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
+        _mockRequestSender.Verify(rs => rs.DiscoverTests(_testSources, null, null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Once);
+    }
 
-            this.consoleWrapper.DiscoverTests(
-                this.testSources,
+    [TestMethod]
+    public void DiscoverTestsShouldSucceedWhenUsingSessions()
+    {
+        var testSessionInfo = new TestSessionInfo();
+
+        _consoleWrapper.DiscoverTests(
+            _testSources,
+            null,
+            null,
+            testSessionInfo,
+            new Mock<ITestDiscoveryEventsHandler2>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.DiscoverTests(
+                _testSources,
                 null,
                 null,
                 testSessionInfo,
-                new Mock<ITestDiscoveryEventsHandler2>().Object);
+                It.IsAny<ITestDiscoveryEventsHandler2>()),
+            Times.Once);
+    }
 
-            this.mockRequestSender.Verify(
-                rs => rs.DiscoverTests(
-                    this.testSources,
-                    null,
-                    null,
-                    testSessionInfo,
-                    It.IsAny<ITestDiscoveryEventsHandler2>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void DiscoverTestsShouldThrowExceptionOnBadConnection()
-        {
-            this.mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DummyProcess");
-            this.mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
-
-            var exception = Assert.ThrowsException<TransationLayerException>(() => this.consoleWrapper.DiscoverTests(new List<string> { "Hello", "World" }, null, null, new Mock<ITestDiscoveryEventsHandler2>().Object));
-            Assert.AreEqual("DummyProcess process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", exception.Message);
-            this.mockRequestSender.Verify(rs => rs.DiscoverTests(It.IsAny<IEnumerable<string>>(), It.IsAny<string>(), null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Never);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesShouldSucceed()
-        {
-            this.consoleWrapper.RunTests(this.testSources, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testSources, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndNullOptionsShouldPassOnNullOptions()
-        {
-            this.consoleWrapper.RunTests(
-                            this.testSources,
-                            "RunSettings",
-                            null,
-                            new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndOptionsShouldPassOnOptions()
-        {
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            this.consoleWrapper.RunTests(
-                            this.testSources,
-                            "RunSettings",
-                            options,
-                            new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testSources, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            this.consoleWrapper.RunTests(
-                this.testSources,
+    [TestMethod]
+    public void DiscoverTestsShouldThrowExceptionOnBadConnection()
+    {
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessFileName()).Returns("DummyProcess");
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(false);
+
+        var exception = Assert.ThrowsException<TransationLayerException>(() => _consoleWrapper.DiscoverTests(new List<string> { "Hello", "World" }, null, null, new Mock<ITestDiscoveryEventsHandler2>().Object));
+        Assert.AreEqual("DummyProcess process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.", exception.Message);
+        _mockRequestSender.Verify(rs => rs.DiscoverTests(It.IsAny<IEnumerable<string>>(), It.IsAny<string>(), null, null, It.IsAny<ITestDiscoveryEventsHandler2>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldSucceed()
+    {
+        _consoleWrapper.RunTests(_testSources, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testSources, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndNullOptionsShouldPassOnNullOptions()
+    {
+        _consoleWrapper.RunTests(
+            _testSources,
+            "RunSettings",
+            null,
+            new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testSources, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndOptionsShouldPassOnOptions()
+    {
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTests(
+            _testSources,
+            "RunSettings",
+            options,
+            new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testSources, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldSucceedWhenUsingSessions()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTests(
+            _testSources,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRun(
+                _testSources,
                 "RunSettings",
                 options,
                 testSessionInfo,
-                new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRun(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndCustomHostShouldSucceed()
-        {
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testSources,
-                "RunSettings",
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(this.testSources, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndOptionsUsingACustomHostShouldPassOnOptions()
-        {
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                            this.testSources,
-                            "RunSettings",
-                            options,
-                            new Mock<ITestRunEventsHandler>().Object,
-                            new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunWithCustomHost(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    null,
-                    It.IsAny<ITestRunEventsHandler>(),
-                    It.IsAny<ITestHostLauncher>()),
-                    Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSourcesAndACustomHostShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testSources,
+                It.IsAny<ITestRunEventsHandler>(),
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldSucceedWhenUsingSessionsAndTelemetryHandler()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+
+        _consoleWrapper.RunTests(
+            _testSources,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            _telemetryEventsHandler.Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRun(
+                _testSources,
                 "RunSettings",
                 options,
                 testSessionInfo,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunWithCustomHost(
-                    this.testSources,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>(),
-                    It.IsAny<ITestHostLauncher>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSelectedTestsShouldSucceed()
-        {
-            this.consoleWrapper.RunTests(this.testCases, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndNullOptionsShouldPassOnNullOptions()
-        {
-            this.consoleWrapper.RunTests(this.testCases, "RunSettings", null, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndOptionsShouldPassOnOptions()
-        {
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-
-            this.consoleWrapper.RunTests(this.testCases, "RunSettings", options, new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(rs => rs.StartTestRun(this.testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSelectedTestsShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
-
-            this.consoleWrapper.RunTests(
-                this.testCases,
+                It.IsAny<ITestRunEventsHandler>(),
+                _telemetryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndCustomHostShouldSucceed()
+    {
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testSources,
+            "RunSettings",
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(_testSources, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndOptionsUsingACustomHostShouldPassOnOptions()
+    {
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testSources,
+            "RunSettings",
+            options,
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRunWithCustomHost(
+                _testSources,
+                "RunSettings",
+                options,
+                null,
+                It.IsAny<ITestRunEventsHandler>(),
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                It.IsAny<ITestHostLauncher>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndACustomHostShouldSucceedWhenUsingSessions()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testSources,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRunWithCustomHost(
+                _testSources,
                 "RunSettings",
                 options,
                 testSessionInfo,
-                new Mock<ITestRunEventsHandler>().Object);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRun(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndCustomLauncherShouldSucceed()
-        {
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testCases,
+                It.IsAny<ITestRunEventsHandler>(),
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                It.IsAny<ITestHostLauncher>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesAndACustomHostShouldSucceedWhenUsingSessionsWithTelemetryHandler()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testSources,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            _telemetryEventsHandler.Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRunWithCustomHost(
+                _testSources,
                 "RunSettings",
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
+                options,
+                testSessionInfo,
+                It.IsAny<ITestRunEventsHandler>(),
+                _telemetryEventsHandler.Object,
+                It.IsAny<ITestHostLauncher>()),
+            Times.Once);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(this.testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
+    [TestMethod]
+    public void RunTestsWithSelectedTestsShouldSucceed()
+    {
+        _consoleWrapper.RunTests(_testCases, "RunSettings", new Mock<ITestRunEventsHandler>().Object);
 
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndNullOptionsUsingACustomHostShouldPassOnNullOptions()
-        {
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testCases,
-                "RunSettings",
-                null,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndNullOptionsShouldPassOnNullOptions()
+    {
+        _consoleWrapper.RunTests(_testCases, "RunSettings", null, new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndOptionsShouldPassOnOptions()
+    {
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
 
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(this.testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
+        _consoleWrapper.RunTests(_testCases, "RunSettings", options, new Mock<ITestRunEventsHandler>().Object);
 
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndOptionsUsingACustomHostShouldPassOnOptions()
-        {
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _mockRequestSender.Verify(rs => rs.StartTestRun(_testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsShouldSucceedWhenUsingSessions()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+
+        _consoleWrapper.RunTests(
+            _testCases,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRun(
+                _testCases,
+                "RunSettings",
+                options,
+                testSessionInfo,
+                It.IsAny<ITestRunEventsHandler>(),
+                It.IsAny<NoOpTelemetryEventsHandler>()),
+            Times.Once);
+    }
 
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testCases,
+    [TestMethod]
+    public void RunTestsWithSelectedTestsShouldSucceedWhenUsingSessionsWithTelemetryHandler()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+
+        _consoleWrapper.RunTests(
+            _testCases,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            _telemetryEventsHandler.Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRun(
+                _testCases,
                 "RunSettings",
                 options,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
+                testSessionInfo,
+                It.IsAny<ITestRunEventsHandler>(),
+                _telemetryEventsHandler.Object),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndCustomLauncherShouldSucceed()
+    {
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testCases,
+            "RunSettings",
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(_testCases, "RunSettings", It.IsAny<TestPlatformOptions>(), null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndNullOptionsUsingACustomHostShouldPassOnNullOptions()
+    {
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testCases,
+            "RunSettings",
+            null,
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(_testCases, "RunSettings", null, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
+    }
 
-            this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(this.testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
-        }
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndOptionsUsingACustomHostShouldPassOnOptions()
+    {
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
 
-        [TestMethod]
-        public void RunTestsWithSelectedTestsAndACustomHostShouldSucceedWhenUsingSessions()
-        {
-            var testSessionInfo = new TestSessionInfo();
-            var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testCases,
+            "RunSettings",
+            options,
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(_testCases, "RunSettings", options, null, It.IsAny<ITestRunEventsHandler>(), It.IsAny<NoOpTelemetryEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
+    }
 
-            this.consoleWrapper.RunTestsWithCustomTestHost(
-                this.testCases,
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndACustomHostShouldSucceedWhenUsingSessions()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testCases,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRunWithCustomHost(
+                _testCases,
                 "RunSettings",
                 options,
                 testSessionInfo,
-                new Mock<ITestRunEventsHandler>().Object,
-                new Mock<ITestHostLauncher>().Object);
-
-            this.mockRequestSender.Verify(
-                rs => rs.StartTestRunWithCustomHost(
-                    this.testCases,
-                    "RunSettings",
-                    options,
-                    testSessionInfo,
-                    It.IsAny<ITestRunEventsHandler>(),
-                    It.IsAny<ITestHostLauncher>()),
-                Times.Once);
-        }
-
-        [TestMethod]
-        public async Task ProcessTestRunAttachmentsAsyncShouldSucceed()
-        {
-            var attachments = new Collection<AttachmentSet>();
-            var cancellationToken = new CancellationToken();
-
-            await this.consoleWrapper.ProcessTestRunAttachmentsAsync(
-                attachments,
-                null,
-                true,
-                true,
-                new Mock<ITestRunAttachmentsProcessingEventsHandler>().Object,
-                cancellationToken);
-
-            this.mockRequestSender.Verify(rs => rs.ProcessTestRunAttachmentsAsync(attachments, true, It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), cancellationToken));
-        }
-
-        [TestMethod]
-        public void EndSessionShouldSucceed()
-        {
-            this.consoleWrapper.EndSession();
-
-            this.mockRequestSender.Verify(rs => rs.EndSession(), Times.Once);
-            this.mockRequestSender.Verify(rs => rs.Close(), Times.Once);
-            this.mockProcessManager.Verify(x => x.ShutdownProcess(), Times.Once);
-        }
+                It.IsAny<ITestRunEventsHandler>(),
+                It.IsAny<NoOpTelemetryEventsHandler>(),
+                It.IsAny<ITestHostLauncher>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSelectedTestsAndACustomHostShouldSucceedWhenUsingSessionsWithTelemetryHandler()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var options = new TestPlatformOptions() { TestCaseFilter = "PacMan" };
+
+        _consoleWrapper.RunTestsWithCustomTestHost(
+            _testCases,
+            "RunSettings",
+            options,
+            testSessionInfo,
+            new Mock<ITestRunEventsHandler>().Object,
+            _telemetryEventsHandler.Object,
+            new Mock<ITestHostLauncher>().Object);
+
+        _mockRequestSender.Verify(
+            rs => rs.StartTestRunWithCustomHost(
+                _testCases,
+                "RunSettings",
+                options,
+                testSessionInfo,
+                It.IsAny<ITestRunEventsHandler>(),
+                _telemetryEventsHandler.Object,
+                It.IsAny<ITestHostLauncher>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task ProcessTestRunAttachmentsAsyncShouldSucceed()
+    {
+        var attachments = new Collection<AttachmentSet>();
+        var invokedDataCollectors = new Collection<InvokedDataCollector>();
+        var cancellationToken = new CancellationToken();
+
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            attachments,
+            invokedDataCollectors,
+            Constants.EmptyRunSettings,
+            true,
+            true,
+            new Mock<ITestRunAttachmentsProcessingEventsHandler>().Object,
+            cancellationToken);
+
+        _mockRequestSender.Verify(rs => rs.ProcessTestRunAttachmentsAsync(attachments, invokedDataCollectors, Constants.EmptyRunSettings, true, It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), cancellationToken));
+    }
+
+    [TestMethod]
+    public void EndSessionShouldSucceed()
+    {
+        _consoleWrapper.EndSession();
+
+        _mockRequestSender.Verify(rs => rs.EndSession(), Times.Once);
+        _mockRequestSender.Verify(rs => rs.Close(), Times.Once);
+        _mockProcessManager.Verify(x => x.ShutdownProcess(), Times.Once);
     }
 }
diff --git a/test/coverlet.collector/CoverletInProcDataCollector.cs b/test/coverlet.collector/CoverletInProcDataCollector.cs
index 191acf0fe2..e7d60b76e1 100644
--- a/test/coverlet.collector/CoverletInProcDataCollector.cs
+++ b/test/coverlet.collector/CoverletInProcDataCollector.cs
@@ -1,46 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Reflection;
 using System;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollector.InProcDataCollector;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.InProcDataCollector;
 
-[assembly: AssemblyKeyFile("key.snk")]
-[assembly: AssemblyVersion("9.9.9.9")]
+namespace Coverlet.Collector.DataCollection;
 
-namespace Coverlet.Collector.DataCollection
+// This class MUST have the same full name as
+// https://github.com/tonerdo/coverlet/blob/master/src/coverlet.collector/InProcDataCollection/CoverletInProcDataCollector.cs
+// to mimic real behavior
+public class CoverletInProcDataCollector : InProcDataCollection
 {
-    // This class MUST have the same full name as
-    // https://github.com/tonerdo/coverlet/blob/master/src/coverlet.collector/InProcDataCollection/CoverletInProcDataCollector.cs
-    // to mimic real behavior
-    public class CoverletInProcDataCollector : InProcDataCollection
+    public void Initialize(IDataCollectionSink dataCollectionSink)
     {
-        public void Initialize(IDataCollectionSink dataCollectionSink)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void TestSessionStart(TestSessionStartArgs testSessionStartArgs)
-        {
-            throw new NotImplementedException();
-        }
+        throw new NotImplementedException();
+    }
+
+    public void TestCaseEnd(TestCaseEndArgs testCaseEndArgs)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void TestCaseStart(TestCaseStartArgs testCaseStartArgs)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void TestSessionEnd(TestSessionEndArgs testSessionEndArgs)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void TestSessionStart(TestSessionStartArgs testSessionStartArgs)
+    {
+        throw new NotImplementedException();
     }
 }
diff --git a/test/coverlet.collector/coverlet.collector.csproj b/test/coverlet.collector/coverlet.collector.csproj
index 97574d9587..169286672b 100644
--- a/test/coverlet.collector/coverlet.collector.csproj
+++ b/test/coverlet.collector/coverlet.collector.csproj
@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
+    <!-- Don't change the version from 9.9.9.9 it is used in tests to recognize this "mock" library. -->
+    <AssemblyVersion>9.9.9.9</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/coverlet.collector/key.snk b/test/coverlet.collector/key.snk
deleted file mode 100644
index 16bbaafe56..0000000000
Binary files a/test/coverlet.collector/key.snk and /dev/null differ
diff --git a/test/datacollector.PlatformTests/CommunicationLayerIntegrationTests.cs b/test/datacollector.PlatformTests/CommunicationLayerIntegrationTests.cs
index 974ab32c6f..27b26d83c5 100644
--- a/test/datacollector.PlatformTests/CommunicationLayerIntegrationTests.cs
+++ b/test/datacollector.PlatformTests/CommunicationLayerIntegrationTests.cs
@@ -1,107 +1,100 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests;
+
+[TestClass]
+[Ignore]    // Tests are flaky
+public class CommunicationLayerIntegrationTests
 {
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    [Ignore]    // Tests are flaky
-    public class CommunicationLayerIntegrationTests
+    private readonly string _defaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    private readonly Mock<ITestMessageEventHandler> _mockTestMessageEventHandler;
+    private readonly string _dataCollectorSettings, _runSettings;
+    private readonly IDataCollectionLauncher _dataCollectionLauncher;
+    private readonly IProcessHelper _processHelper;
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly List<string> _testSources;
+
+    public CommunicationLayerIntegrationTests()
     {
-        private string defaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
-        private Mock<ObjectModel.Client.ITestMessageEventHandler> mockTestMessageEventHandler;
-        private string dataCollectorSettings, runSettings;
-        private IDataCollectionLauncher dataCollectionLauncher;
-        private IProcessHelper processHelper;
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private List<string> testSources;
-
-        public CommunicationLayerIntegrationTests()
-        {
-            this.mockTestMessageEventHandler = new Mock<ObjectModel.Client.ITestMessageEventHandler>();
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-            this.dataCollectorSettings = string.Format("<DataCollector friendlyName=\"CustomDataCollector\" uri=\"my://custom/datacollector\" assemblyQualifiedName=\"{0}\" codebase=\"{1}\" />", typeof(CustomDataCollector).AssemblyQualifiedName, typeof(CustomDataCollector).GetTypeInfo().Assembly.Location);
-            this.runSettings = string.Format(this.defaultRunSettings, this.dataCollectorSettings);
-            this.testSources = new List<string>() { "testsource1.dll" };
-            this.processHelper = new ProcessHelper();
-            this.dataCollectionLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(this.processHelper, this.runSettings);
-        }
-
-        [TestMethod]
-        public void BeforeTestRunStartShouldGetEnviornmentVariables()
-        {
-            var dataCollectionRequestSender = new DataCollectionRequestSender();
-
-            using (var proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, this.runSettings, this.testSources, dataCollectionRequestSender, this.processHelper, this.dataCollectionLauncher))
-            {
-                proxyDataCollectionManager.Initialize();
-
-                var result = proxyDataCollectionManager.BeforeTestRunStart(true, true, this.mockTestMessageEventHandler.Object);
-
-                Assert.AreEqual(1, result.EnvironmentVariables.Count);
-            }
-        }
-
-        [TestMethod]
-        public void AfterTestRunShouldSendGetAttachments()
-        {
-            var dataCollectionRequestSender = new DataCollectionRequestSender();
-
-            using (var proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, this.runSettings, this.testSources, dataCollectionRequestSender, this.processHelper, this.dataCollectionLauncher))
-            {
-                proxyDataCollectionManager.Initialize();
-
-                proxyDataCollectionManager.BeforeTestRunStart(true, true, this.mockTestMessageEventHandler.Object);
-
-                var attachments = proxyDataCollectionManager.AfterTestRunEnd(false, this.mockTestMessageEventHandler.Object);
-
-                Assert.AreEqual("CustomDataCollector", attachments[0].DisplayName);
-                Assert.AreEqual("my://custom/datacollector", attachments[0].Uri.ToString());
-                Assert.IsTrue(attachments[0].Attachments[0].Uri.ToString().Contains("filename.txt"));
-            }
-        }
-
-        [TestMethod]
-        public void AfterTestRunShouldHandleSocketFailureGracefully()
-        {
-            var socketCommManager = new SocketCommunicationManager();
-            var dataCollectionRequestSender = new DataCollectionRequestSender(socketCommManager, JsonDataSerializer.Instance);
-            var dataCollectionLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(this.processHelper, this.runSettings);
-
-            using (var proxyDataCollectionManager = new ProxyDataCollectionManager(this.mockRequestData.Object, this.runSettings, this.testSources, dataCollectionRequestSender, this.processHelper, dataCollectionLauncher))
-            {
-                proxyDataCollectionManager.Initialize();
-                proxyDataCollectionManager.BeforeTestRunStart(true, true, this.mockTestMessageEventHandler.Object);
-
-                var result = Process.GetProcessById(dataCollectionLauncher.DataCollectorProcessId);
-                Assert.IsNotNull(result);
-
-                socketCommManager.StopClient();
-
-                var attachments = proxyDataCollectionManager.AfterTestRunEnd(false, this.mockTestMessageEventHandler.Object);
-
-                Assert.IsNull(attachments);
-
-                // Give time to datacollector process to exit.
-                Assert.IsTrue(result.WaitForExit(500));
-            }
-        }
+        _mockTestMessageEventHandler = new Mock<ITestMessageEventHandler>();
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
+        _dataCollectorSettings = string.Format(CultureInfo.InvariantCulture, "<DataCollector friendlyName=\"CustomDataCollector\" uri=\"my://custom/datacollector\" assemblyQualifiedName=\"{0}\" codebase=\"{1}\" />", typeof(CustomDataCollector).AssemblyQualifiedName, typeof(CustomDataCollector).Assembly.Location);
+        _runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, _dataCollectorSettings);
+        _testSources = new List<string>() { "testsource1.dll" };
+        _processHelper = new ProcessHelper();
+        _dataCollectionLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(_processHelper, _runSettings);
     }
-}
\ No newline at end of file
+
+    [TestMethod]
+    public void BeforeTestRunStartShouldGetEnvironmentVariables()
+    {
+        var dataCollectionRequestSender = new DataCollectionRequestSender();
+
+        using var proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, _runSettings, _testSources, dataCollectionRequestSender, _processHelper, _dataCollectionLauncher);
+        proxyDataCollectionManager.Initialize();
+
+        var result = proxyDataCollectionManager.BeforeTestRunStart(true, true, _mockTestMessageEventHandler.Object);
+
+        Assert.AreEqual(1, result.EnvironmentVariables?.Count);
+    }
+
+    [TestMethod]
+    public void AfterTestRunShouldSendGetAttachments()
+    {
+        var dataCollectionRequestSender = new DataCollectionRequestSender();
+
+        using var proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, _runSettings, _testSources, dataCollectionRequestSender, _processHelper, _dataCollectionLauncher);
+        proxyDataCollectionManager.Initialize();
+
+        proxyDataCollectionManager.BeforeTestRunStart(true, true, _mockTestMessageEventHandler.Object);
+
+        var dataCollectionResult = proxyDataCollectionManager.AfterTestRunEnd(false, _mockTestMessageEventHandler.Object);
+
+        Assert.AreEqual("CustomDataCollector", dataCollectionResult.Attachments![0].DisplayName);
+        Assert.AreEqual("my://custom/datacollector", dataCollectionResult.Attachments[0].Uri.ToString());
+        Assert.IsTrue(dataCollectionResult.Attachments[0].Attachments[0].Uri.ToString().Contains("filename.txt"));
+    }
+
+    [TestMethod]
+    public void AfterTestRunShouldHandleSocketFailureGracefully()
+    {
+        var socketCommManager = new SocketCommunicationManager();
+        var dataCollectionRequestSender = new DataCollectionRequestSender(socketCommManager, JsonDataSerializer.Instance);
+        var dataCollectionLauncher = DataCollectionLauncherFactory.GetDataCollectorLauncher(_processHelper, _runSettings);
+
+        using var proxyDataCollectionManager = new ProxyDataCollectionManager(_mockRequestData.Object, _runSettings, _testSources, dataCollectionRequestSender, _processHelper, dataCollectionLauncher);
+        proxyDataCollectionManager.Initialize();
+        proxyDataCollectionManager.BeforeTestRunStart(true, true, _mockTestMessageEventHandler.Object);
+
+        var result = Process.GetProcessById(dataCollectionLauncher.DataCollectorProcessId);
+        Assert.IsNotNull(result);
+
+        socketCommManager.StopClient();
+
+        var attachments = proxyDataCollectionManager.AfterTestRunEnd(false, _mockTestMessageEventHandler.Object);
+
+        Assert.IsNull(attachments);
+
+        // Give time to datacollector process to exit.
+        Assert.IsTrue(result.WaitForExit(500));
+    }
+}
diff --git a/test/datacollector.PlatformTests/CustomDataCollector.cs b/test/datacollector.PlatformTests/CustomDataCollector.cs
index 4a335e363c..ba92b75b62 100644
--- a/test/datacollector.PlatformTests/CustomDataCollector.cs
+++ b/test/datacollector.PlatformTests/CustomDataCollector.cs
@@ -1,57 +1,55 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests;
+
+[DataCollectorFriendlyName("CustomDataCollector")]
+[DataCollectorTypeUri("my://custom/datacollector")]
+public class CustomDataCollector : ObjectModel.DataCollection.DataCollector, ITestExecutionEnvironmentSpecifier
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Xml;
+    private DataCollectionSink? _dataCollectionSink;
+    private DataCollectionEnvironmentContext? _context;
+    private DataCollectionLogger? _logger;
+
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
+    {
+        _dataCollectionSink = dataSink;
+        _context = environmentContext;
+        _logger = logger;
+        events.SessionStart += SessionStarted_Handler;
+        events.SessionEnd += SessionEnded_Handler;
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    private void SessionStarted_Handler(object? sender, SessionStartEventArgs args)
+    {
+        var filename = Path.Combine(Path.GetTempPath(), "filename.txt");
+        File.WriteAllText(filename, string.Empty);
+        _dataCollectionSink!.SendFileAsync(_context!.SessionDataCollectionContext, filename, true);
+        _logger!.LogWarning(_context.SessionDataCollectionContext, "SessionEnded");
+    }
+
+    private void SessionEnded_Handler(object? sender, SessionEndEventArgs args)
+    {
+        //logger.LogError(this.context.SessionDataCollectionContext, new Exception("my exception"));
+        //logger.LogWarning(this.context.SessionDataCollectionContext, "my arning");
+        //logger.LogException(context.SessionDataCollectionContext, new Exception("abc"), DataCollectorMessageLevel.Error);
+
+        _logger!.LogWarning(_context!.SessionDataCollectionContext, "SessionEnded");
+    }
 
-    [DataCollectorFriendlyName("CustomDataCollector")]
-    [DataCollectorTypeUri("my://custom/datacollector")]
-    public class CustomDataCollector : DataCollector, ITestExecutionEnvironmentSpecifier
+    public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
     {
-        private DataCollectionSink dataCollectionSink;
-        private DataCollectionEnvironmentContext context;
-        private DataCollectionLogger logger;
-
-        public override void Initialize(
-            System.Xml.XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
-        {
-            events.SessionStart += new EventHandler<SessionStartEventArgs>(this.SessionStarted_Handler);
-            events.SessionEnd += new EventHandler<SessionEndEventArgs>(this.SessionEnded_Handler);
-            this.dataCollectionSink = dataSink;
-            this.context = environmentContext;
-            this.logger = logger;
-        }
-
-        private void SessionStarted_Handler(object sender, SessionStartEventArgs args)
-        {
-            var filename = Path.Combine(Path.GetTempPath(), "filename.txt");
-            File.WriteAllText(filename, string.Empty);
-            this.dataCollectionSink.SendFileAsync(context.SessionDataCollectionContext, filename, true);
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "SessionEnded");
-        }
-
-        private void SessionEnded_Handler(object sender, SessionEndEventArgs args)
-        {
-            //logger.LogError(this.context.SessionDataCollectionContext, new Exception("my exception"));
-            //logger.LogWarning(this.context.SessionDataCollectionContext, "my arning");
-            //logger.LogException(context.SessionDataCollectionContext, new Exception("abc"), DataCollectorMessageLevel.Error);
-
-            this.logger.LogWarning(this.context.SessionDataCollectionContext, "SessionEnded");
-        }
-
-        public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
-        {
-            return new List<KeyValuePair<string, string>> { new KeyValuePair<string, string>("key", "value") };
-        }
+        return new List<KeyValuePair<string, string>> { new("key", "value") };
     }
 }
diff --git a/test/datacollector.PlatformTests/Program.cs b/test/datacollector.PlatformTests/Program.cs
deleted file mode 100644
index 2ff9995413..0000000000
--- a/test/datacollector.PlatformTests/Program.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector.ComponentTests
-{
-    /// <summary>
-    /// Main entry point for the command line runner.
-    /// </summary>
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
diff --git a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
index 025c98867e..c55879c711 100644
--- a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
+++ b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj
@@ -1,31 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector.PlatformTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)')) ">Exe</OutputType>
     <AssemblyName>datacollector.PlatformTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\datacollector\datacollector.csproj" />
 
-    <Content Include="$(TestPlatformRoot)src\datacollector\bin\$(Configuration)\$(TargetFramework)\datacollector*.json">
+    <Content Include="$(RepoRoot)src\datacollector\bin\$(Configuration)\$(TargetFramework)\datacollector*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/datacollector.UnitTests/DataCollectionAttachmentManagerTests.cs b/test/datacollector.UnitTests/DataCollectionAttachmentManagerTests.cs
index 3a5ead9182..76f16762b3 100644
--- a/test/datacollector.UnitTests/DataCollectionAttachmentManagerTests.cs
+++ b/test/datacollector.UnitTests/DataCollectionAttachmentManagerTests.cs
@@ -1,296 +1,339 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectionAttachmentManagerTests
 {
-    using System;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Threading;
+    private const int Timeout = 10 * 60 * 1000;
+    private readonly DataCollectionAttachmentManager _attachmentManager;
+    private readonly Mock<IMessageSink> _messageSink;
+    private readonly SessionId _sessionId;
+    private static readonly string TempDirectoryPath = Path.GetTempPath();
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    public DataCollectionAttachmentManagerTests()
+    {
+        _attachmentManager = new DataCollectionAttachmentManager();
+        _messageSink = new Mock<IMessageSink>();
+        var guid = Guid.NewGuid();
+        _sessionId = new SessionId(guid);
+    }
 
-    using Moq;
+    [TestCleanup]
+    public void Cleanup()
+    {
+        File.Delete(Path.Combine(TempDirectoryPath, "filename.txt"));
+        File.Delete(Path.Combine(TempDirectoryPath, "filename1.txt"));
+    }
 
-    [TestClass]
-    public class DataCollectionAttachmentManagerTests
+    [TestMethod]
+    public void ParallelAccessShouldNotBreak()
     {
-        private const int Timeout = 10 * 60 * 1000;
-        private DataCollectionAttachmentManager attachmentManager;
-        private Mock<IMessageSink> messageSink;
-        private SessionId sessionId;
-        private static readonly string TempDirectoryPath = Path.GetTempPath();
+        string outputDirectory = Path.Combine(TempDirectoryPath, Guid.NewGuid().ToString());
+        var dataCollectorSessionId = new SessionId(Guid.NewGuid());
 
-        public DataCollectionAttachmentManagerTests()
+        try
         {
-            this.attachmentManager = new DataCollectionAttachmentManager();
-            this.messageSink = new Mock<IMessageSink>();
-            var guid = Guid.NewGuid();
-            this.sessionId = new SessionId(guid);
-        }
+            _attachmentManager.Initialize(dataCollectorSessionId, outputDirectory, _messageSink.Object);
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            File.Delete(Path.Combine(TempDirectoryPath, "filename.txt"));
-            File.Delete(Path.Combine(TempDirectoryPath, "filename1.txt"));
-        }
+            CancellationTokenSource cts = new(TimeSpan.FromSeconds(3));
+            List<Task> parallelTasks = new();
+            int totalTasks = 3;
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfSessionIdIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
+            // 3 tasks are enough to break bugged code
+            for (int i = 0; i < totalTasks; i++)
             {
-                this.attachmentManager.Initialize((SessionId)null, string.Empty, this.messageSink.Object);
-            });
-        }
+                parallelTasks.Add(Task.Run(() =>
+                {
+                    while (true)
+                    {
+                        if (cts.IsCancellationRequested)
+                        {
+                            break;
+                        }
+                        _ = TestCaseEvent($"test_{Guid.NewGuid()}");
+                    }
+                }));
+            }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfMessageSinkIsNull()
+            Task.WaitAll(parallelTasks.ToArray());
+        }
+        finally
         {
-            Assert.ThrowsException<ArgumentNullException>(() =>
+            if (Directory.Exists(outputDirectory))
             {
-                this.attachmentManager.Initialize(this.sessionId, string.Empty, null);
-            });
+                Directory.Delete(outputDirectory, true);
+            }
         }
 
-        [TestMethod]
-        public void InitializeShouldSetDefaultPathIfOutputDirectoryPathIsNull()
+        List<AttachmentSet> TestCaseEvent(string uri)
         {
-            this.attachmentManager.Initialize(this.sessionId, string.Empty, this.messageSink.Object);
-
-            Assert.AreEqual(this.attachmentManager.SessionOutputDirectory, Path.Combine(Path.GetTempPath(), "TestResults", this.sessionId.Id.ToString()));
+            var testCaseCtx = new DataCollectionContext(dataCollectorSessionId, new TestExecId(Guid.NewGuid()));
+            string path = Path.Combine(outputDirectory, Guid.NewGuid().ToString());
+            File.WriteAllText(path, "test");
+            _attachmentManager.AddAttachment(new FileTransferInformation(testCaseCtx, path, true), null, new Uri($"//{uri}"), $"{uri}");
+            return _attachmentManager.GetAttachments(testCaseCtx);
         }
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetCorrectGuidAndOutputPath()
-        {
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfSessionIdIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _attachmentManager.Initialize(null!, string.Empty, _messageSink.Object));
+    }
 
-            Assert.AreEqual(Path.Combine(TempDirectoryPath, this.sessionId.Id.ToString()), this.attachmentManager.SessionOutputDirectory);
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfMessageSinkIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _attachmentManager.Initialize(_sessionId, string.Empty, null!));
+    }
 
-        [TestMethod]
-        public void AddAttachmentShouldNotAddNewFileTransferIfSessionIsNotConfigured()
-        {
-            var filename = "filename.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+    [TestMethod]
+    public void InitializeShouldSetDefaultPathIfOutputDirectoryPathIsNull()
+    {
+        _attachmentManager.Initialize(_sessionId, string.Empty, _messageSink.Object);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
+        Assert.AreEqual(_attachmentManager.SessionOutputDirectory, Path.Combine(Path.GetTempPath(), "TestResults", _sessionId.Id.ToString()));
+    }
 
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
+    [TestMethod]
+    public void InitializeShouldSetCorrectGuidAndOutputPath()
+    {
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, null, uri, friendlyName);
+        Assert.AreEqual(Path.Combine(TempDirectoryPath, _sessionId.Id.ToString()), _attachmentManager.SessionOutputDirectory);
+    }
 
-            Assert.AreEqual(0, this.attachmentManager.AttachmentSets.Count);
-        }
+    [TestMethod]
+    public void AddAttachmentShouldNotAddNewFileTransferIfSessionIsNotConfigured()
+    {
+        var filename = "filename.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
 
-        [TestMethod]
-        public void AddAttachmentShouldAddNewFileTransferAndCopyFileToOutputDirectoryIfDeleteFileIsFalse()
-        {
-            var filename = "filename.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
 
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
 
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, null, uri, friendlyName);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
+        Assert.AreEqual(0, _attachmentManager.AttachmentSets.Count);
+    }
 
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-            var handler = new AsyncCompletedEventHandler((a, e) => { waitHandle.Set(); });
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
+    [TestMethod]
+    public void AddAttachmentShouldAddNewFileTransferAndCopyFileToOutputDirectoryIfDeleteFileIsFalse()
+    {
+        var filename = "filename.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
 
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
 
-            Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, filename)));
-            Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, this.sessionId.Id.ToString(), filename)));
-            Assert.AreEqual(1, this.attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
-        }
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+        var handler = new AsyncCompletedEventHandler((a, e) => waitHandle.Set());
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
 
-        [TestMethod]
-        public void AddAttachmentsShouldAddFilesCorrespondingToDifferentDataCollectors()
-        {
-            var filename = "filename.txt";
-            var filename1 = "filename1.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename1), string.Empty);
 
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
-            var uri1 = new Uri("datacollector://Company/Product/Version1");
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
 
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-            var handler = new AsyncCompletedEventHandler((a, e) => { waitHandle.Set(); });
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
+        Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, filename)));
+        Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, _sessionId.Id.ToString(), filename)));
+        Assert.AreEqual(1, _attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
+    }
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
+    [TestMethod]
+    public void AddAttachmentsShouldAddFilesCorrespondingToDifferentDataCollectors()
+    {
+        var filename = "filename.txt";
+        var filename1 = "filename1.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename1), string.Empty);
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            waitHandle.Reset();
-            dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename1), false);
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri1, friendlyName);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
+        var uri1 = new Uri("datacollector://Company/Product/Version1");
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+        var handler = new AsyncCompletedEventHandler((a, e) => waitHandle.Set());
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
 
-            Assert.AreEqual(1, this.attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
-            Assert.AreEqual(1, this.attachmentManager.AttachmentSets[datacollectioncontext][uri1].Attachments.Count);
-        }
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-        [TestMethod]
-        public void AddAttachmentShouldAddNewFileTransferAndMoveFileToOutputDirectoryIfDeleteFileIsTrue()
-        {
-            var filename = "filename1.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
 
+        waitHandle.Reset();
+        dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename1), false);
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri1, friendlyName);
 
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
+        Assert.AreEqual(1, _attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
+        Assert.AreEqual(1, _attachmentManager.AttachmentSets[datacollectioncontext][uri1].Attachments.Count);
+    }
 
-            var waitHandle = new AutoResetEvent(false);
-            var handler = new AsyncCompletedEventHandler((a, e) => { waitHandle.Set(); });
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), true);
+    [TestMethod]
+    public void AddAttachmentShouldAddNewFileTransferAndMoveFileToOutputDirectoryIfDeleteFileIsTrue()
+    {
+        var filename = "filename1.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            Assert.AreEqual(1, this.attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
-            Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, this.sessionId.Id.ToString(), filename)));
-            Assert.IsFalse(File.Exists(Path.Combine(TempDirectoryPath, filename)));
-        }
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
 
-        [TestMethod]
-        public void AddAttachmentShouldAddMultipleAttachmentsForSameDC()
-        {
-            var filename = "filename.txt";
-            var filename1 = "filename1.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename1), string.Empty);
+        var waitHandle = new AutoResetEvent(false);
+        var handler = new AsyncCompletedEventHandler((a, e) => waitHandle.Set());
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), true);
+
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
+        Assert.AreEqual(1, _attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
+        Assert.IsTrue(File.Exists(Path.Combine(TempDirectoryPath, _sessionId.Id.ToString(), filename)));
+        Assert.IsFalse(File.Exists(Path.Combine(TempDirectoryPath, filename)));
+    }
 
-            EventWaitHandle waitHandle = new AutoResetEvent(false);
-            var handler = new AsyncCompletedEventHandler((a, e) => { waitHandle.Set(); });
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
+    [TestMethod]
+    public void AddAttachmentShouldAddMultipleAttachmentsForSameDc()
+    {
+        var filename = "filename.txt";
+        var filename1 = "filename1.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename1), string.Empty);
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
 
-            waitHandle.Reset();
-            dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename1), false);
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
+        EventWaitHandle waitHandle = new AutoResetEvent(false);
+        var handler = new AsyncCompletedEventHandler((a, e) => waitHandle.Set());
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), false);
 
-            // Wait for file operations to complete
-            waitHandle.WaitOne(Timeout);
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-            Assert.AreEqual(2, this.attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
-        }
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
 
-        [TestMethod]
-        public void AddAttachmentShouldNotAddNewFileTransferIfNullIsPassed()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.attachmentManager.AddAttachment(null, null, null, null);
-            });
-        }
+        waitHandle.Reset();
+        dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename1), false);
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
 
-        [TestMethod]
-        public void GetAttachmentsShouldReturnAllAttachmets()
-        {
-            var filename = "filename1.txt";
-            File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
+        // Wait for file operations to complete
+        waitHandle.WaitOne(Timeout);
+
+        Assert.AreEqual(2, _attachmentManager.AttachmentSets[datacollectioncontext][uri].Attachments.Count);
+    }
 
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+    [TestMethod]
+    public void AddAttachmentShouldNotAddNewFileTransferIfNullIsPassed()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _attachmentManager.AddAttachment(null!, null, null!, null!));
+    }
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
+    [TestMethod]
+    public void GetAttachmentsShouldReturnAllAttachments()
+    {
+        var filename = "filename1.txt";
+        File.WriteAllText(Path.Combine(TempDirectoryPath, filename), string.Empty);
 
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), true);
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-            this.attachmentManager.AddAttachment(dataCollectorDataMessage, null, uri, friendlyName);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
 
-            Assert.AreEqual(1, this.attachmentManager.AttachmentSets.Count);
-            var result = this.attachmentManager.GetAttachments(datacollectioncontext);
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, Path.Combine(TempDirectoryPath, filename), true);
 
-            Assert.AreEqual(0, this.attachmentManager.AttachmentSets.Count);
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual(friendlyName, result[0].DisplayName);
-            Assert.AreEqual(uri, result[0].Uri);
-            Assert.AreEqual(1, result[0].Attachments.Count);
-        }
+        _attachmentManager.AddAttachment(dataCollectorDataMessage, null, uri, friendlyName);
 
-        [TestMethod]
-        public void GetAttachmentsShouldNotReutrnAnyDataWhenActiveFileTransferAreNotPresent()
-        {
-            this.attachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
+        Assert.AreEqual(1, _attachmentManager.AttachmentSets.Count);
+        var result = _attachmentManager.GetAttachments(datacollectioncontext);
 
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
+        Assert.AreEqual(0, _attachmentManager.AttachmentSets.Count);
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual(friendlyName, result[0].DisplayName);
+        Assert.AreEqual(uri, result[0].Uri);
+        Assert.AreEqual(1, result[0].Attachments.Count);
+    }
 
-            var result = this.attachmentManager.GetAttachments(datacollectioncontext);
-            Assert.AreEqual(0, result.Count);
-        }
+    [TestMethod]
+    public void GetAttachmentsShouldNotReturnAnyDataWhenActiveFileTransferAreNotPresent()
+    {
+        _attachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
 
-        [TestMethod]
-        public void GetAttachmentsShouldNotReturnAttachmentsAfterCancelled()
-        {
-            var fileHelper = new Mock<IFileHelper>();
-            var testableAttachmentManager = new TestableDataCollectionAttachmentManager(fileHelper.Object);
-            var attachmentPath = Path.Combine(TempDirectoryPath, "filename.txt");
-            File.WriteAllText(attachmentPath, string.Empty);
-            var datacollectioncontext = new DataCollectionContext(this.sessionId);
-            var friendlyName = "TestDataCollector";
-            var uri = new Uri("datacollector://Company/Product/Version");
-            var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, attachmentPath, true);
-            var waitHandle = new AutoResetEvent(false);
-            var handler = new AsyncCompletedEventHandler((a, e) => { Assert.Fail("Handler shouldn't be called since operation is canceled."); });
-
-            // We cancel the operation in the actual operation. This ensures the follow up task to is never called, attachments
-            // are not added.
-            Action cancelAddAttachment = () => testableAttachmentManager.Cancel();
-            fileHelper.Setup(fh => fh.MoveFile(It.IsAny<string>(), It.IsAny<string>())).Callback(cancelAddAttachment);
-            testableAttachmentManager.Initialize(this.sessionId, TempDirectoryPath, this.messageSink.Object);
-            testableAttachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
-
-            // Wait for the attachment transfer tasks to complete
-            var result = testableAttachmentManager.GetAttachments(datacollectioncontext);
-            Assert.AreEqual(0, result[0].Attachments.Count);
-        }
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+
+        var result = _attachmentManager.GetAttachments(datacollectioncontext);
+        Assert.AreEqual(0, result.Count);
+    }
 
-        private class TestableDataCollectionAttachmentManager : DataCollectionAttachmentManager
+    [TestMethod]
+    public void GetAttachmentsShouldNotReturnAttachmentsAfterCancelled()
+    {
+        var fileHelper = new Mock<IFileHelper>();
+        var testableAttachmentManager = new TestableDataCollectionAttachmentManager(fileHelper.Object);
+        var attachmentPath = Path.Combine(TempDirectoryPath, "filename.txt");
+        File.WriteAllText(attachmentPath, string.Empty);
+        var datacollectioncontext = new DataCollectionContext(_sessionId);
+        var friendlyName = "TestDataCollector";
+        var uri = new Uri("datacollector://Company/Product/Version");
+        var dataCollectorDataMessage = new FileTransferInformation(datacollectioncontext, attachmentPath, true);
+        var waitHandle = new AutoResetEvent(false);
+        var handler = new AsyncCompletedEventHandler((a, e) => Assert.Fail("Handler shouldn't be called since operation is canceled."));
+
+        // We cancel the operation in the actual operation. This ensures the follow up task to is never called, attachments
+        // are not added.
+        Action cancelAddAttachment = () => testableAttachmentManager.Cancel();
+        fileHelper.Setup(fh => fh.MoveFile(It.IsAny<string>(), It.IsAny<string>())).Callback(cancelAddAttachment);
+        testableAttachmentManager.Initialize(_sessionId, TempDirectoryPath, _messageSink.Object);
+        testableAttachmentManager.AddAttachment(dataCollectorDataMessage, handler, uri, friendlyName);
+
+        // Wait for the attachment transfer tasks to complete
+        var result = testableAttachmentManager.GetAttachments(datacollectioncontext);
+        Assert.AreEqual(0, result[0].Attachments.Count);
+    }
+
+    private class TestableDataCollectionAttachmentManager : DataCollectionAttachmentManager
+    {
+        public TestableDataCollectionAttachmentManager(IFileHelper fileHelper)
+            : base(fileHelper)
         {
-            public TestableDataCollectionAttachmentManager(IFileHelper fileHelper)
-                : base(fileHelper)
-            {
-            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/datacollector.UnitTests/DataCollectionEnvironmentVariableTests.cs b/test/datacollector.UnitTests/DataCollectionEnvironmentVariableTests.cs
index baece1333a..9f3a0c881d 100644
--- a/test/datacollector.UnitTests/DataCollectionEnvironmentVariableTests.cs
+++ b/test/datacollector.UnitTests/DataCollectionEnvironmentVariableTests.cs
@@ -1,45 +1,44 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectionEnvironmentVariableTests
 {
-    using System;
-    using System.Collections.Generic;
+    [TestMethod]
+    public void ConstructorShouldThrowExceptionIfKeyValueIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () =>
+            {
+                var envvariable = new DataCollectionEnvironmentVariable(default, null!);
+            });
+    }
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void FirstDataCollectorThatRequestedShouldReturnTheFirstdataCollectorRequestingThatEnvVariable()
+    {
+        var envValPair = new KeyValuePair<string, string>("key", "value");
+        var envvariable = new DataCollectionEnvironmentVariable(envValPair, "datacollector");
+        envvariable.AddRequestingDataCollector("datacollector1");
+
+        Assert.AreEqual("datacollector", envvariable.FirstDataCollectorThatRequested);
+    }
 
-    [TestClass]
-    public class DataCollectionEnvironmentVariableTests
+    [TestMethod]
+    public void FirstDataCollectorThatRequestedShouldSetNameAndValue()
     {
-        [TestMethod]
-        public void ConstructorShouldThrowExceptionIfKeyValueIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        var envvariable = new DataCollectionEnvironmentVariable(default, null);
-                    });
-        }
-
-        [TestMethod]
-        public void FirstDataCollectorThatRequestedShouldReturnTheFirstdataCollectorRequestingThatEnvVariable()
-        {
-            var envValPair = new KeyValuePair<string, string>("key", "value");
-            var envvariable = new DataCollectionEnvironmentVariable(envValPair, "datacollector");
-            envvariable.AddRequestingDataCollector("datacollector1");
-
-            Assert.AreEqual("datacollector", envvariable.FirstDataCollectorThatRequested);
-        }
-
-        [TestMethod]
-        public void FirstDataCollectorThatRequestedShouldSetNameAndValue()
-        {
-            var envValPair = new KeyValuePair<string, string>("key", "value");
-            var envvariable = new DataCollectionEnvironmentVariable(envValPair, "datacollector");
-            envvariable.AddRequestingDataCollector("datacollector1");
-
-            Assert.AreEqual("key", envvariable.Name);
-            Assert.AreEqual("value", envvariable.Value);
-        }
+        var envValPair = new KeyValuePair<string, string>("key", "value");
+        var envvariable = new DataCollectionEnvironmentVariable(envValPair, "datacollector");
+        envvariable.AddRequestingDataCollector("datacollector1");
+
+        Assert.AreEqual("key", envvariable.Name);
+        Assert.AreEqual("value", envvariable.Value);
     }
 }
diff --git a/test/datacollector.UnitTests/DataCollectionManagerTests.cs b/test/datacollector.UnitTests/DataCollectionManagerTests.cs
index 26828281eb..7cf8a2a93a 100644
--- a/test/datacollector.UnitTests/DataCollectionManagerTests.cs
+++ b/test/datacollector.UnitTests/DataCollectionManagerTests.cs
@@ -1,570 +1,593 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectionManagerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using System.Xml;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class DataCollectionManagerTests
-    {
-        private DataCollectionManager dataCollectionManager;
-        private string defaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
-        private string defaultDataCollectionSettings = "<DataCollector friendlyName=\"{0}\" uri=\"{1}\" assemblyQualifiedName=\"{2}\" codebase=\"{3}\" {4} />";
-        private string dataCollectorSettings;
-        private string friendlyName;
-        private string uri;
-        private Mock<IMessageSink> mockMessageSink;
-        private Mock<DataCollector2> mockDataCollector;
-        private Mock<CodeCoverageDataCollector> mockCodeCoverageDataCollector;
-        private List<KeyValuePair<string, string>> envVarList;
-        private List<KeyValuePair<string, string>> codeCoverageEnvVarList;
-        private Mock<IDataCollectionAttachmentManager> mockDataCollectionAttachmentManager;
-        private Mock<IDataCollectionTelemetryManager> mockDataCollectionTelemetryManager;
-
-        public DataCollectionManagerTests()
-        {
-            this.friendlyName = "CustomDataCollector";
-            this.uri = "my://custom/datacollector";
-            this.envVarList = new List<KeyValuePair<string, string>>();
-            this.codeCoverageEnvVarList = new List<KeyValuePair<string, string>>();
-            this.mockDataCollector = new Mock<DataCollector2>();
-            this.mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(this.envVarList);
-            this.mockCodeCoverageDataCollector = new Mock<CodeCoverageDataCollector>();
-            this.mockCodeCoverageDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(this.codeCoverageEnvVarList);
-            this.dataCollectorSettings = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, this.friendlyName, this.uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            this.mockMessageSink = new Mock<IMessageSink>();
-            this.mockDataCollectionAttachmentManager = new Mock<IDataCollectionAttachmentManager>();
-            this.mockDataCollectionAttachmentManager.SetReturnsDefault<List<AttachmentSet>>(new List<AttachmentSet>());
-            this.mockDataCollectionTelemetryManager = new Mock<IDataCollectionTelemetryManager>();
-
-            this.dataCollectionManager = new TestableDataCollectionManager(this.mockDataCollectionAttachmentManager.Object, this.mockMessageSink.Object, this.mockDataCollector.Object, this.mockCodeCoverageDataCollector.Object, this.mockDataCollectionTelemetryManager.Object);
-        }
+    private readonly DataCollectionManager _dataCollectionManager;
+    private readonly string _defaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
+    private readonly string _defaultDataCollectionSettings = "<DataCollector friendlyName=\"{0}\" uri=\"{1}\" assemblyQualifiedName=\"{2}\" codebase=\"{3}\" {4} />";
+    private string _dataCollectorSettings;
+    private readonly string _friendlyName;
+    private readonly string _uri;
+    private readonly Mock<IMessageSink> _mockMessageSink;
+    private readonly Mock<DataCollector2> _mockDataCollector;
+    private readonly Mock<CodeCoverageDataCollector> _mockCodeCoverageDataCollector;
+    private readonly List<KeyValuePair<string, string>> _envVarList;
+    private readonly List<KeyValuePair<string, string>> _codeCoverageEnvVarList;
+    private readonly Mock<IDataCollectionAttachmentManager> _mockDataCollectionAttachmentManager;
+    private readonly Mock<IDataCollectionTelemetryManager> _mockDataCollectionTelemetryManager;
+    private readonly Mock<ITelemetryReporter> _mockTelemetryReporter;
+
+    public DataCollectionManagerTests()
+    {
+        _friendlyName = "CustomDataCollector";
+        _uri = "my://custom/datacollector";
+        _envVarList = new List<KeyValuePair<string, string>>();
+        _codeCoverageEnvVarList = new List<KeyValuePair<string, string>>();
+        _mockDataCollector = new Mock<DataCollector2>();
+        _mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(_envVarList);
+        _mockCodeCoverageDataCollector = new Mock<CodeCoverageDataCollector>();
+        _mockCodeCoverageDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(_codeCoverageEnvVarList);
+        _dataCollectorSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        _mockMessageSink = new Mock<IMessageSink>();
+        _mockDataCollectionAttachmentManager = new Mock<IDataCollectionAttachmentManager>();
+        _mockDataCollectionAttachmentManager.SetReturnsDefault(new List<AttachmentSet>());
+        _mockDataCollectionTelemetryManager = new Mock<IDataCollectionTelemetryManager>();
+        _mockTelemetryReporter = new Mock<ITelemetryReporter>();
+
+        _dataCollectionManager = new TestableDataCollectionManager(_mockDataCollectionAttachmentManager.Object, _mockMessageSink.Object, _mockDataCollector.Object, _mockCodeCoverageDataCollector.Object, _mockDataCollectionTelemetryManager.Object, _mockTelemetryReporter.Object);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldThrowExceptionIfSettingsXmlIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.dataCollectionManager.InitializeDataCollectors(null);
-            });
-        }
+    [TestMethod]
+    public void InitializeDataCollectorsShouldThrowExceptionIfSettingsXmlIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _dataCollectionManager.InitializeDataCollectors(null!));
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldReturnEmptyDictionaryIfDataCollectorsAreNotConfigured()
-        {
-            var runSettings = string.Format(this.defaultRunSettings, string.Empty);
-            this.dataCollectionManager.InitializeDataCollectors(runSettings);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldReturnEmptyDictionaryIfDataCollectorsAreNotConfigured()
+    {
+        var runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Empty);
+        _dataCollectionManager.InitializeDataCollectors(runSettings);
 
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-        }
+        Assert.AreEqual(0, _dataCollectionManager.RunDataCollectors.Count);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollector()
-        {
-            var dataCollectorSettings = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettings);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollector()
+    {
+        var dataCollectorSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettings);
 
-            Assert.IsTrue(this.dataCollectionManager.RunDataCollectors.ContainsKey(this.mockDataCollector.Object.GetType()));
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+        Assert.IsTrue(_dataCollectionManager.RunDataCollectors.ContainsKey(_mockDataCollector.Object.GetType()));
+        Assert.AreEqual(typeof(AttachmentProcessorDataCollector2), _dataCollectionManager.RunDataCollectors[_mockDataCollector.Object.GetType()].DataCollectorConfig.AttachmentsProcessorType);
+        Assert.IsTrue(_dataCollectionManager.RunDataCollectors[_mockDataCollector.Object.GetType()].DataCollectorConfig.Metadata.Contains(true));
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotAddDataCollectorIfItIsDisabled()
-        {
-            var dataCollectorSettingsDisabled = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, "enabled=\"false\""));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsDisabled);
+    [TestMethod]
+    public void InitializeShouldNotAddDataCollectorIfItIsDisabled()
+    {
+        var dataCollectorSettingsDisabled = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, "enabled=\"false\""));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsDisabled);
 
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Never);
-        }
+        Assert.AreEqual(0, _dataCollectionManager.RunDataCollectors.Count);
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void InitializeShouldAddDataCollectorIfItIsEnabled()
-        {
-            var dataCollectorSettingsEnabled = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, "enabled=\"true\""));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsEnabled);
+    [TestMethod]
+    public void InitializeShouldAddDataCollectorIfItIsEnabled()
+    {
+        var dataCollectorSettingsEnabled = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, "enabled=\"true\""));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsEnabled);
 
-            Assert.IsTrue(this.dataCollectionManager.RunDataCollectors.ContainsKey(this.mockDataCollector.Object.GetType()));
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+        Assert.IsTrue(_dataCollectionManager.RunDataCollectors.ContainsKey(_mockDataCollector.Object.GetType()));
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+        _mockDataCollector.Verify(x => x.Initialize(_mockTelemetryReporter.Object), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsNotCorrectAndUriIsCorrect()
-        {
-            var dataCollectorSettingsWithWrongFriendlyName = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, "anyFriendlyName", uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongFriendlyName);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsNotCorrectAndUriIsCorrect()
+    {
+        var dataCollectorSettingsWithWrongFriendlyName = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, "anyFriendlyName", _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongFriendlyName);
 
-            Assert.AreEqual(1, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+        Assert.AreEqual(1, _dataCollectionManager.RunDataCollectors.Count);
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+        _mockDataCollector.Verify(x => x.Initialize(_mockTelemetryReporter.Object), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsCorrectAndUriIsNotCorrect()
-        {
-            var dataCollectorSettingsWithWrongUri = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, "my://custom/WrongDatacollector", this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongUri);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsCorrectAndUriIsNotCorrect()
+    {
+        var dataCollectorSettingsWithWrongUri = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, "my://custom/WrongDatacollector", _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongUri);
 
-            Assert.AreEqual(1, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+        Assert.AreEqual(1, _dataCollectionManager.RunDataCollectors.Count);
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+        _mockDataCollector.Verify(x => x.Initialize(_mockTelemetryReporter.Object), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsCorrectAndUriIsNull()
-        {
-            var dataCollectorSettingsWithNullUri = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, string.Empty, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty).Replace("uri=\"\"", string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithNullUri);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsNullAndUriIsCorrect()
+    {
+        var dataCollectorSettingsWithNullFriendlyName = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, string.Empty, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty).Replace("friendlyName=\"\"", string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithNullFriendlyName);
 
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Never);
-        }
+        Assert.AreEqual(1, _dataCollectionManager.RunDataCollectors.Count);
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+        _mockDataCollector.Verify(x => x.Initialize(_mockTelemetryReporter.Object), Times.Once);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsNullAndUriIsCorrect()
-        {
-            var dataCollectorSettingsWithNullFriendlyName = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, string.Empty, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty).Replace("friendlyName=\"\"", string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithNullFriendlyName);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsCorrectAndUriIsEmpty()
+    {
+        var dataCollectorSettingsWithEmptyUri = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, string.Empty, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        Assert.ThrowsException<ArgumentNullException>(() => _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithEmptyUri));
+    }
 
-            Assert.AreEqual(1, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsEmptyAndUriIsCorrect()
+    {
+        var dataCollectorSettingsWithEmptyFriendlyName = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, string.Empty, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        Assert.ThrowsException<ArgumentNullException>(() => _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithEmptyFriendlyName));
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsCorrectAndUriIsEmpty()
-        {
-            var dataCollectorSettingsWithEmptyUri = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, string.Empty, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            Assert.ThrowsException<ArgumentNullException>(() => this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithEmptyUri));
-        }
+    [TestMethod]
+    public void InitializeDataCollectorsShouldNotLoadDataCollectorIfFriendlyNameIsNotCorrectAndUriIsNotCorrect()
+    {
+        var dataCollectorSettingsWithWrongFriendlyNameAndWrongUri = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, "anyFriendlyName", "datacollector://data", _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongFriendlyNameAndWrongUri);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorIfFriendlyNameIsEmptyAndUriIsCorrect()
-        {
-            var dataCollectorSettingsWithEmptyFriendlyName = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, string.Empty, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            Assert.ThrowsException<ArgumentNullException>(() => this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithEmptyFriendlyName));
-        }
+        Assert.AreEqual(0, _dataCollectionManager.RunDataCollectors.Count);
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldNotLoadDataCollectorIfFriendlyNameIsNotCorrectAndUriIsNotCorrect()
-        {
-            var dataCollectorSettingsWithWrongFriendlyNameAndWrongUri = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, "anyFriendlyName", "datacollector://data", this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-            this.dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithWrongFriendlyNameAndWrongUri);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldNotAddSameDataCollectorMoreThanOnce()
+    {
+        var datacollecterSettings = string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, "CustomDataCollector", "my://custom/datacollector", _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, "enabled =\"true\"");
+        var runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, datacollecterSettings + datacollecterSettings);
 
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Never);
-        }
+        _dataCollectionManager.InitializeDataCollectors(runSettings);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldNotAddSameDataCollectorMoreThanOnce()
-        {
-            var datacollecterSettings = string.Format(this.defaultDataCollectionSettings, "CustomDataCollector", "my://custom/datacollector", this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, "enabled =\"true\"");
-            var runSettings = string.Format(this.defaultRunSettings, datacollecterSettings + datacollecterSettings);
+        Assert.IsTrue(_dataCollectionManager.RunDataCollectors.ContainsKey(_mockDataCollector.Object.GetType()));
+        _mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
+    }
 
-            this.dataCollectionManager.InitializeDataCollectors(runSettings);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLoadDataCollectorAndReturnEnvironmentVariables()
+    {
+        _envVarList.Add(new KeyValuePair<string, string>("key", "value"));
 
-            Assert.IsTrue(this.dataCollectionManager.RunDataCollectors.ContainsKey(this.mockDataCollector.Object.GetType()));
-            this.mockDataCollector.Verify(x => x.Initialize(It.IsAny<XmlElement>(), It.IsAny<DataCollectionEvents>(), It.IsAny<DataCollectionSink>(), It.IsAny<DataCollectionLogger>(), It.IsAny<DataCollectionEnvironmentContext>()), Times.Once);
-        }
+        var result = _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLoadDataCollectorAndReturnEnvironmentVariables()
-        {
-            this.envVarList.Add(new KeyValuePair<string, string>("key", "value"));
+        Assert.AreEqual("value", result["key"]);
 
-            var result = this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.IsAny<DataCollectorInformation>(), "key", "value"));
+    }
 
-            Assert.AreEqual("value", result["key"]);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLogExceptionToMessageSinkIfInitializationFails()
+    {
+        _mockDataCollector.Setup(
+            x =>
+                x.Initialize(
+                    It.IsAny<XmlElement>(),
+                    It.IsAny<DataCollectionEvents>(),
+                    It.IsAny<DataCollectionSink>(),
+                    It.IsAny<DataCollectionLogger>(),
+                    It.IsAny<DataCollectionEnvironmentContext>())).Throws<Exception>();
+
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+
+        Assert.AreEqual(0, _dataCollectionManager.RunDataCollectors.Count);
+        _mockMessageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once);
+    }
 
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.IsAny<DataCollectorInformation>(), "key", "value"));
-        }
+    [TestMethod]
+    public void InitializeDataCollectorsShouldLogExceptionToMessageSinkIfSetEnvironmentVariableFails()
+    {
+        _mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Throws<Exception>();
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLogExceptionToMessageSinkIfInitializationFails()
-        {
-            this.mockDataCollector.Setup(
-                x =>
-                    x.Initialize(
-                        It.IsAny<XmlElement>(),
-                        It.IsAny<DataCollectionEvents>(),
-                        It.IsAny<DataCollectionSink>(),
-                        It.IsAny<DataCollectionLogger>(),
-                        It.IsAny<DataCollectionEnvironmentContext>())).Throws<Exception>();
-
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockMessageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once);
-        }
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldLogExceptionToMessageSinkIfSetEnvironmentVariableFails()
-        {
-            this.mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Throws<Exception>();
+        Assert.AreEqual(0, _dataCollectionManager.RunDataCollectors.Count);
+        _mockMessageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once);
+    }
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldReturnFirstEnvironmentVariableIfMoreThanOneVariablesWithSameKeyIsSpecified()
+    {
+        _envVarList.Add(new KeyValuePair<string, string>("key", "value"));
+        _envVarList.Add(new KeyValuePair<string, string>("key", "value1"));
 
-            Assert.AreEqual(0, this.dataCollectionManager.RunDataCollectors.Count);
-            this.mockMessageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once);
-        }
+        var result = _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldReturnFirstEnvironmentVariableIfMoreThanOneVariablesWithSameKeyIsSpecified()
-        {
-            this.envVarList.Add(new KeyValuePair<string, string>("key", "value"));
-            this.envVarList.Add(new KeyValuePair<string, string>("key", "value1"));
+        Assert.AreEqual("value", result["key"]);
 
-            var result = this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.IsAny<DataCollectorInformation>(), "key", "value"));
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.IsAny<DataCollectorInformation>(), "key", "value1", "value"));
+    }
 
-            Assert.AreEqual("value", result["key"]);
+    [TestMethod]
+    public void InitializeDataCollectorsShouldReturnOtherThanCodeCoverageEnvironmentVariableIfMoreThanOneVariablesWithSameKeyIsSpecified()
+    {
+        _envVarList.Add(new KeyValuePair<string, string>("cor_profiler", "clrie"));
+        _envVarList.Add(new KeyValuePair<string, string>("same_key", "same_value"));
+        _codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("cor_profiler", "direct"));
+        _codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("clrie_profiler_vanguard", "path"));
+        _codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("same_key", "same_value"));
+
+        _dataCollectorSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings,
+            string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, "Code Coverage", "my://custom/ccdatacollector", _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty) +
+            string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, _friendlyName, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty));
+
+        var result = _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+
+        Assert.AreEqual(3, result.Count);
+        Assert.AreEqual("clrie", result["cor_profiler"]);
+        Assert.AreEqual("path", result["clrie_profiler_vanguard"]);
+        Assert.AreEqual("same_value", result["same_key"]);
+
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == _friendlyName), "cor_profiler", "clrie"));
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "cor_profiler", "direct", "clrie"));
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "clrie_profiler_vanguard", "path"));
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == _friendlyName), "same_key", "same_value"));
+        _mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "same_key", "same_value", "same_value"));
+    }
 
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.IsAny<DataCollectorInformation>(), "key", "value"));
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.IsAny<DataCollectorInformation>(), "key", "value1", "value"));
-        }
+    [TestMethod]
+    public void SessionStartedShouldReturnFalseIfDataCollectionIsNotConfiguredInRunSettings()
+    {
+        var runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Empty);
+        _dataCollectionManager.InitializeDataCollectors(runSettings);
 
-        [TestMethod]
-        public void InitializeDataCollectorsShouldReturnOtherThanCodeCoverageEnvironmentVariableIfMoreThanOneVariablesWithSameKeyIsSpecified()
-        {
-            this.envVarList.Add(new KeyValuePair<string, string>("cor_profiler", "clrie"));
-            this.envVarList.Add(new KeyValuePair<string, string>("same_key", "same_value"));
-            this.codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("cor_profiler", "direct"));
-            this.codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("clrie_profiler_vanguard", "path"));
-            this.codeCoverageEnvVarList.Add(new KeyValuePair<string, string>("same_key", "same_value"));
-
-            this.dataCollectorSettings = string.Format(this.defaultRunSettings,
-                string.Format(this.defaultDataCollectionSettings, "Code Coverage", "my://custom/ccdatacollector", this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty) +
-                string.Format(this.defaultDataCollectionSettings, this.friendlyName, this.uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
-           
-            var result = this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);           
-
-            Assert.AreEqual(3, result.Count);
-            Assert.AreEqual("clrie", result["cor_profiler"]);
-            Assert.AreEqual("path", result["clrie_profiler_vanguard"]);
-            Assert.AreEqual("same_value", result["same_key"]);
-
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == this.friendlyName), "cor_profiler", "clrie"));
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "cor_profiler", "direct", "clrie"));
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "clrie_profiler_vanguard", "path"));
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableAddition(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == this.friendlyName), "same_key", "same_value"));
-            this.mockDataCollectionTelemetryManager.Verify(tm => tm.RecordEnvironmentVariableConflict(It.Is<DataCollectorInformation>(i => i.DataCollectorConfig.FriendlyName == "Code Coverage"), "same_key", "same_value", "same_value"));
-        }
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        var result = _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-        [TestMethod]
-        public void SessionStartedShouldReturnFalseIfDataCollectionIsNotConfiguredInRunSettings()
-        {
-            var runSettings = string.Format(this.defaultRunSettings, string.Empty);
-            this.dataCollectionManager.InitializeDataCollectors(runSettings);
+        Assert.IsFalse(result);
+    }
 
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            var result = this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+    [TestMethod]
+    public void SessionStartedShouldSendEventToDataCollector()
+    {
+        var isStartInvoked = false;
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.SessionStart += (sender, eventArgs) => isStartInvoked = true);
 
-            Assert.IsFalse(result);
-        }
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void SessionStartedShouldSendEventToDataCollector()
-        {
-            var isStartInvoked = false;
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) =>
-            {
-                b.SessionStart += (sender, eventArgs) => isStartInvoked = true;
-            });
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        var areTestCaseEventsSubscribed = _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        Assert.IsTrue(isStartInvoked);
+        Assert.IsFalse(areTestCaseEventsSubscribed);
+    }
 
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            var areTestCaseEventsSubscribed = this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+    [TestMethod]
+    public void SessionStartedShouldReturnTrueIfTestCaseStartIsSubscribed()
+    {
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.TestCaseStart += (sender, eventArgs) => { });
 
-            Assert.IsTrue(isStartInvoked);
-            Assert.IsFalse(areTestCaseEventsSubscribed);
-        }
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void SessionStartedShouldReturnTrueIfTestCaseStartIsSubscribed()
-        {
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) =>
-            {
-                b.TestCaseStart += (sender, eventArgs) => { };
-            });
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        var areTestCaseEventsSubscribed = _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        Assert.IsTrue(areTestCaseEventsSubscribed);
+    }
 
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            var areTestCaseEventsSubscribed = this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+    [TestMethod]
+    public void SessionStartedShouldContinueDataCollectionIfExceptionIsThrownWhileSendingEventsToDataCollector()
+    {
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.SessionStart += (sender, eventArgs) => throw new Exception());
 
-            Assert.IsTrue(areTestCaseEventsSubscribed);
-        }
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void SessionStaretedShouldContinueDataCollectionIfExceptionIsThrownWhileSendingEventsToDataCollector()
-        {
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) =>
-            {
-                b.SessionStart += (sender, eventArgs) => throw new Exception();
-            });
-
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        var result = _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            var result = this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+        Assert.IsFalse(result);
+    }
 
-            Assert.IsFalse(result);
-        }
+    [TestMethod]
+    public void SessionStartedShouldReturnFalseIfDataCollectorsAreNotInitialized()
+    {
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        var result = _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-        [TestMethod]
-        public void SessionStartedShouldReturnFalseIfDataCollectorsAreNotInitialized()
-        {
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            var result = this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+        Assert.IsFalse(result);
+    }
 
-            Assert.IsFalse(result);
-        }
+    [TestMethod]
+    public void SessionStartedShouldHaveCorrectSessionContext()
+    {
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-        [TestMethod]
-        public void SessionStartedShouldHaveCorrectSessionContext()
-        {
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+        var sessionStartEventArgs = new SessionStartEventArgs();
 
-            var sessionStartEventArgs = new SessionStartEventArgs();
+        Assert.AreEqual(new SessionId(Guid.Empty), sessionStartEventArgs.Context.SessionId);
 
-            Assert.AreEqual(new SessionId(Guid.Empty), sessionStartEventArgs.Context.SessionId);
+        _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+        Assert.AreNotEqual(new SessionId(Guid.Empty), sessionStartEventArgs.Context.SessionId);
+    }
 
-            Assert.AreNotEqual(new SessionId(Guid.Empty), sessionStartEventArgs.Context.SessionId);
-        }
+    [TestMethod]
+    public void SessionEndedShouldReturnEmptyCollectionIfDataCollectionIsNotEnabled()
+    {
+        var runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Empty);
+        _dataCollectionManager.InitializeDataCollectors(runSettings);
 
-        [TestMethod]
-        public void SessionEndedShouldReturnEmptyCollectionIfDataCollectionIsNotEnabled()
-        {
-            var runSettings = string.Format(this.defaultRunSettings, string.Empty);
-            this.dataCollectionManager.InitializeDataCollectors(runSettings);
+        var result = _dataCollectionManager.SessionEnded();
 
-            var result = this.dataCollectionManager.SessionEnded();
+        Assert.AreEqual(0, result.Count);
+    }
 
-            Assert.AreEqual(0, result.Count);
-        }
+    [TestMethod]
+    public void GetInvokedDataCollectorsShouldReturnDataCollector()
+    {
+        var dataCollectorSettingsWithNullFriendlyName = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, string.Format(CultureInfo.InvariantCulture, _defaultDataCollectionSettings, string.Empty, _uri, _mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).Assembly.Location, string.Empty).Replace("friendlyName=\"\"", string.Empty));
+        _dataCollectionManager.InitializeDataCollectors(dataCollectorSettingsWithNullFriendlyName);
+        var invokedDataCollector = _dataCollectionManager.GetInvokedDataCollectors();
+        Assert.AreEqual(1, invokedDataCollector.Count);
+        Assert.IsTrue(invokedDataCollector[0].HasAttachmentProcessor);
+    }
 
-        [TestMethod]
-        public void SessionEndedShouldReturnAttachments()
-        {
-            var attachment = new AttachmentSet(new Uri("my://custom/datacollector"), "CustomDataCollector");
-            attachment.Attachments.Add(new UriDataAttachment(new Uri("my://filename.txt"), "filename.txt"));
+    [TestMethod]
+    public void SessionEndedShouldReturnAttachments()
+    {
+        var attachment = new AttachmentSet(new Uri("my://custom/datacollector"), "CustomDataCollector");
+        attachment.Attachments.Add(new UriDataAttachment(new Uri("my://filename.txt"), "filename.txt"));
 
-            this.mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Returns(new List<AttachmentSet>() { attachment });
+        _mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Returns([attachment]);
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            var result = this.dataCollectionManager.SessionEnded();
+        var result = _dataCollectionManager.SessionEnded();
 
-            Assert.IsTrue(result[0].Attachments[0].Uri.ToString().Contains("filename.txt"));
-        }
+        Assert.IsTrue(result[0].Attachments[0].Uri.ToString().Contains("filename.txt"));
+    }
 
-        [TestMethod]
-        public void SessionEndedShouldNotReturnAttachmentsIfExceptionIsThrownWhileGettingAttachments()
-        {
-            this.mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Throws<Exception>();
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
+    [TestMethod]
+    public void SessionEndedShouldNotReturnAttachmentsIfExceptionIsThrownWhileGettingAttachments()
+    {
+        _mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Throws<Exception>();
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
 
-            var result = this.dataCollectionManager.SessionEnded();
+        var result = _dataCollectionManager.SessionEnded();
 
-            Assert.AreEqual(0, result.Count);
-        }
+        Assert.AreEqual(0, result.Count);
+    }
 
-        [TestMethod]
-        public void SessionEndedShouldContinueDataCollectionIfExceptionIsThrownWhileSendingSessionEndEventToDataCollector()
-        {
-            var attachment = new AttachmentSet(new Uri("my://custom/datacollector"), "CustomDataCollector");
-            attachment.Attachments.Add(new UriDataAttachment(new Uri("my://filename.txt"), "filename.txt"));
+    [TestMethod]
+    public void SessionEndedShouldContinueDataCollectionIfExceptionIsThrownWhileSendingSessionEndEventToDataCollector()
+    {
+        var attachment = new AttachmentSet(new Uri("my://custom/datacollector"), "CustomDataCollector");
+        attachment.Attachments.Add(new UriDataAttachment(new Uri("my://filename.txt"), "filename.txt"));
 
-            this.mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Returns(new List<AttachmentSet>() { attachment });
+        _mockDataCollectionAttachmentManager.Setup(x => x.GetAttachments(It.IsAny<DataCollectionContext>())).Returns([attachment]);
 
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) =>
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e)
+            => b.SessionEnd += (sender, ev) =>
             {
-                b.SessionEnd += (sender, ev) =>
-                    {
-                        c.SendFileAsync(e.SessionDataCollectionContext, "filename.txt", true);
-                        throw new Exception();
-                    };
+                c.SendFileAsync(e.SessionDataCollectionContext, "filename.txt", true);
+                throw new Exception();
             });
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            var result = this.dataCollectionManager.SessionEnded();
+        var result = _dataCollectionManager.SessionEnded();
 
-            Assert.AreEqual(1, result.Count);
-        }
+        Assert.AreEqual(1, result.Count);
+    }
 
-        [TestMethod]
-        public void SessionEndedShouldCancelProcessingAttachmentRequestsIfSessionIsCancelled()
-        {
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-            var sessionStartEventArgs = new SessionStartEventArgs();
-            this.dataCollectionManager.SessionStarted(sessionStartEventArgs);
+    [TestMethod]
+    public void SessionEndedShouldCancelProcessingAttachmentRequestsIfSessionIsCancelled()
+    {
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+        var sessionStartEventArgs = new SessionStartEventArgs();
+        _dataCollectionManager.SessionStarted(sessionStartEventArgs);
 
-            var result = this.dataCollectionManager.SessionEnded(true);
+        var result = _dataCollectionManager.SessionEnded(true);
 
-            this.mockDataCollectionAttachmentManager.Verify(x => x.Cancel(), Times.Once);
-        }
+        _mockDataCollectionAttachmentManager.Verify(x => x.Cancel(), Times.Once);
+    }
 
-        #region TestCaseEventsTest
+    #region TestCaseEventsTest
 
-        [TestMethod]
-        public void TestCaseStartedShouldSendEventToDataCollector()
-        {
-            var isStartInvoked = false;
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => { b.TestCaseStart += (sender, eventArgs) => isStartInvoked = true; });
+    [TestMethod]
+    public void TestCaseStartedShouldSendEventToDataCollector()
+    {
+        var isStartInvoked = false;
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.TestCaseStart += (sender, eventArgs) => isStartInvoked = true);
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-            var args = new TestCaseStartEventArgs(new TestCase());
-            this.dataCollectionManager.TestCaseStarted(args);
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+        var args = new TestCaseStartEventArgs(new TestCase());
+        _dataCollectionManager.TestCaseStarted(args);
 
-            Assert.IsTrue(isStartInvoked);
-        }
+        Assert.IsTrue(isStartInvoked);
+    }
 
-        [TestMethod]
-        public void TestCaseStartedShouldNotSendEventToDataCollectorIfDataColletionIsNotEnbled()
-        {
-            var isStartInvoked = false;
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => { b.TestCaseStart += (sender, eventArgs) => isStartInvoked = true; });
+    [TestMethod]
+    public void TestCaseStartedShouldNotSendEventToDataCollectorIfDataColletionIsNotEnbled()
+    {
+        var isStartInvoked = false;
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.TestCaseStart += (sender, eventArgs) => isStartInvoked = true);
 
-            var args = new TestCaseStartEventArgs(new TestCase());
-            this.dataCollectionManager.TestCaseStarted(args);
+        var args = new TestCaseStartEventArgs(new TestCase());
+        _dataCollectionManager.TestCaseStarted(args);
 
-            Assert.IsFalse(isStartInvoked);
-        }
+        Assert.IsFalse(isStartInvoked);
+    }
 
-        [TestMethod]
-        public void TestCaseEndedShouldSendEventToDataCollector()
-        {
-            var isEndInvoked = false;
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => { b.TestCaseEnd += (sender, eventArgs) => isEndInvoked = true; });
+    [TestMethod]
+    public void TestCaseEndedShouldSendEventToDataCollector()
+    {
+        var isEndInvoked = false;
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.TestCaseEnd += (sender, eventArgs) => isEndInvoked = true);
 
-            this.dataCollectionManager.InitializeDataCollectors(this.dataCollectorSettings);
-            var args = new TestCaseEndEventArgs();
-            args.TestElement = new TestCase();
-            this.dataCollectionManager.TestCaseEnded(args);
+        _dataCollectionManager.InitializeDataCollectors(_dataCollectorSettings);
+        var args = new TestCaseEndEventArgs();
+        args.TestElement = new TestCase();
+        _dataCollectionManager.TestCaseEnded(args);
 
-            Assert.IsTrue(isEndInvoked);
-        }
+        Assert.IsTrue(isEndInvoked);
+    }
 
-        [TestMethod]
-        public void TestCaseEndedShouldNotSendEventToDataCollectorIfDataColletionIsNotEnbled()
-        {
-            var isEndInvoked = false;
-            var runSettings = string.Format(this.defaultRunSettings, this.dataCollectorSettings);
-            this.SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) =>
-            {
-                b.TestCaseEnd += (sender, eventArgs) => isEndInvoked = true;
-            });
+    [TestMethod]
+    public void TestCaseEndedShouldNotSendEventToDataCollectorIfDataCollectionIsNotEnbled()
+    {
+        var isEndInvoked = false;
+        var runSettings = string.Format(CultureInfo.InvariantCulture, _defaultRunSettings, _dataCollectorSettings);
+        SetupMockDataCollector((XmlElement a, DataCollectionEvents b, DataCollectionSink c, DataCollectionLogger d, DataCollectionEnvironmentContext e) => b.TestCaseEnd += (sender, eventArgs) => isEndInvoked = true);
 
-            var args = new TestCaseEndEventArgs();
-            Assert.IsFalse(isEndInvoked);
-        }
+        var args = new TestCaseEndEventArgs();
+        Assert.IsFalse(isEndInvoked);
+    }
 
-        private void SetupMockDataCollector(Action<XmlElement, DataCollectionEvents, DataCollectionSink, DataCollectionLogger, DataCollectionEnvironmentContext> callback)
-        {
-            this.mockDataCollector.Setup(
-                x =>
-                    x.Initialize(
-                        It.IsAny<XmlElement>(),
-                        It.IsAny<DataCollectionEvents>(),
-                        It.IsAny<DataCollectionSink>(),
-                        It.IsAny<DataCollectionLogger>(),
-                        It.IsAny<DataCollectionEnvironmentContext>())).Callback<XmlElement, DataCollectionEvents, DataCollectionSink, DataCollectionLogger, DataCollectionEnvironmentContext>((a, b, c, d, e) =>
-                        {
-                            callback.Invoke(a, b, c, d, e);
-                        });
-        }
+    private void SetupMockDataCollector(Action<XmlElement, DataCollectionEvents, DataCollectionSink, DataCollectionLogger, DataCollectionEnvironmentContext> callback)
+    {
+        _mockDataCollector.Setup(
+            x =>
+                x.Initialize(
+                    It.IsAny<XmlElement>(),
+                    It.IsAny<DataCollectionEvents>(),
+                    It.IsAny<DataCollectionSink>(),
+                    It.IsAny<DataCollectionLogger>(),
+                    It.IsAny<DataCollectionEnvironmentContext>())).Callback<XmlElement, DataCollectionEvents, DataCollectionSink, DataCollectionLogger, DataCollectionEnvironmentContext>(callback.Invoke);
+    }
+
+    #endregion
+}
+
+internal class TestableDataCollectionManager : DataCollectionManager
+{
+    private readonly ObjectModel.DataCollection.DataCollector? _dataCollector;
+    private readonly ObjectModel.DataCollection.DataCollector? _ccDataCollector;
 
-        #endregion
+    public TestableDataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink,
+        ObjectModel.DataCollection.DataCollector dataCollector, ObjectModel.DataCollection.DataCollector ccDataCollector,
+        IDataCollectionTelemetryManager dataCollectionTelemetryManager, ITelemetryReporter telemetryReporter) : this(datacollectionAttachmentManager, messageSink, dataCollectionTelemetryManager, telemetryReporter)
+    {
+        _dataCollector = dataCollector;
+        _ccDataCollector = ccDataCollector;
     }
 
-    internal class TestableDataCollectionManager : DataCollectionManager
+    internal TestableDataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink,
+        IDataCollectionTelemetryManager dataCollectionTelemetryManager, ITelemetryReporter telemetryReporter) : base(datacollectionAttachmentManager, messageSink, dataCollectionTelemetryManager, telemetryReporter)
     {
-        DataCollector dataCollector;
-        DataCollector ccDataCollector;
+    }
 
-        public TestableDataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink, DataCollector dataCollector, DataCollector ccDataCollector, IDataCollectionTelemetryManager dataCollectionTelemetryManager) : this(datacollectionAttachmentManager, messageSink, dataCollectionTelemetryManager)
+    protected override bool TryGetUriFromFriendlyName(string? friendlyName, out string dataCollectorUri)
+    {
+        if (friendlyName!.Equals("CustomDataCollector"))
+        {
+            dataCollectorUri = "my://custom/datacollector";
+            return true;
+        }
+        else if (friendlyName.Equals("Code Coverage"))
         {
-            this.dataCollector = dataCollector;
-            this.ccDataCollector = ccDataCollector;
+            dataCollectorUri = "my://custom/ccdatacollector";
+            return true;
         }
+        else
+        {
+            dataCollectorUri = string.Empty;
+            return false;
+        }
+    }
+
+    protected override bool IsUriValid(string? uri)
+    {
+        return string.Equals(uri, "my://custom/datacollector") || string.Equals(uri, "my://custom/ccdatacollector");
+    }
 
-        internal TestableDataCollectionManager(IDataCollectionAttachmentManager datacollectionAttachmentManager, IMessageSink messageSink, IDataCollectionTelemetryManager dataCollectionTelemetryManager) : base(datacollectionAttachmentManager, messageSink, dataCollectionTelemetryManager)
+    protected override ObjectModel.DataCollection.DataCollector TryGetTestExtension(string extensionUri)
+    {
+        if (extensionUri.Equals("my://custom/datacollector"))
         {
+            return _dataCollector!;
         }
 
-        protected override bool TryGetUriFromFriendlyName(string friendlyName, out string dataCollectorUri)
+        if (extensionUri.Equals("my://custom/ccdatacollector"))
         {
-            if (friendlyName.Equals("CustomDataCollector"))
-            {
-                dataCollectorUri = "my://custom/datacollector";
-                return true;
-            }
-            else if (friendlyName.Equals("Code Coverage"))
-            {
-                dataCollectorUri = "my://custom/ccdatacollector";
-                return true;
-            }
-            else
-            {
-                dataCollectorUri = string.Empty;
-                return false;
-            }
+            return _ccDataCollector!;
         }
 
-        protected override bool IsUriValid(string uri)
+        return null!;
+    }
+
+    protected override DataCollectorConfig? TryGetDataCollectorConfig(string extensionUri)
+    {
+        if (extensionUri.Equals("my://custom/datacollector"))
         {
-            if (uri.Equals("my://custom/datacollector") || uri.Equals("my://custom/ccdatacollector"))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            var dc = new DataCollectorConfig(_dataCollector!.GetType());
+            dc.FilePath = Path.GetTempFileName();
+            return dc;
         }
 
-        protected override DataCollector TryGetTestExtension(string extensionUri)
+        if (extensionUri.Equals("my://custom/ccdatacollector"))
         {
-            if (extensionUri.Equals("my://custom/datacollector"))
-            {
-                return dataCollector;
-            }
+            var dc = new DataCollectorConfig(_ccDataCollector!.GetType());
+            dc.FilePath = Path.GetTempFileName();
+            return dc;
+        }
 
-            if (extensionUri.Equals("my://custom/ccdatacollector"))
-            {
-                return ccDataCollector;
-            }
+        return null;
+    }
+}
 
-            return null;
-        }
+[DataCollectorFriendlyName("CustomDataCollector")]
+[DataCollectorTypeUri("my://custom/datacollector")]
+[DataCollectorAttachmentProcessor(typeof(AttachmentProcessorDataCollector2))]
+public abstract class DataCollector2 : ObjectModel.DataCollection.DataCollector, ITelemetryInitializer
+{
+    public virtual void Initialize(ITelemetryReporter telemetryReporter)
+    {
     }
+}
+
+[DataCollectorFriendlyName("Code Coverage")]
+[DataCollectorTypeUri("my://custom/ccdatacollector")]
+public abstract class CodeCoverageDataCollector : ObjectModel.DataCollection.DataCollector
+{
+}
+
+public class AttachmentProcessorDataCollector2 : IDataCollectorAttachmentProcessor
+{
+    public bool SupportsIncrementalProcessing => throw new NotImplementedException();
 
-    [DataCollectorFriendlyName("CustomDataCollector")]
-    [DataCollectorTypeUri("my://custom/datacollector")]
-    public abstract class DataCollector2 : DataCollector
+    public IEnumerable<Uri> GetExtensionUris()
     {
+        throw new NotImplementedException();
     }
 
-    [DataCollectorFriendlyName("Code Coverage")]
-    [DataCollectorTypeUri("my://custom/ccdatacollector")]
-    public abstract class CodeCoverageDataCollector : DataCollector
+    public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
     {
+        throw new NotImplementedException();
     }
 }
diff --git a/test/datacollector.UnitTests/DataCollectionTelemetryManagerTests.cs b/test/datacollector.UnitTests/DataCollectionTelemetryManagerTests.cs
index a0fbdb3bd2..580284b8a2 100644
--- a/test/datacollector.UnitTests/DataCollectionTelemetryManagerTests.cs
+++ b/test/datacollector.UnitTests/DataCollectionTelemetryManagerTests.cs
@@ -1,228 +1,234 @@
-using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector;
 using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using Moq;
-using System;
-using System.Collections.Generic;
 
-namespace Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests
+namespace Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectionTelemetryManagerTests
 {
-    [TestClass]
-    public class DataCollectionTelemetryManagerTests
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly DataCollectionTelemetryManager _telemetryManager;
+    private readonly DataCollectorInformation _dataCollectorInformation;
+
+    public DataCollectionTelemetryManagerTests()
     {
-        private readonly Mock<IRequestData> mockRequestData;
-        private readonly Mock<IMetricsCollection> mockMetricsCollection;
-        private readonly DataCollectionTelemetryManager telemetryManager;
-        private readonly DataCollectorInformation dataCollectorInformation;
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockRequestData.Setup(m => m.MetricsCollection).Returns(_mockMetricsCollection.Object);
 
-        public DataCollectionTelemetryManagerTests()
-        {
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            this.mockRequestData.Setup(m => m.MetricsCollection).Returns(this.mockMetricsCollection.Object);
-
-            var dataCollectorMock = new Mock<CodeCoverageDataCollector>();
-            var evnVariablesMock = dataCollectorMock.As<ITestExecutionEnvironmentSpecifier>();
-            evnVariablesMock.Setup(a => a.GetTestExecutionEnvironmentVariables()).Returns(new KeyValuePair<string, string>[] 
-            {
-                new KeyValuePair<string, string>("MicrosoftInstrumentationEngine_ConfigPath32_VanguardInstrumentationProfiler", "path1"),
-                new KeyValuePair<string, string>("MicrosoftInstrumentationEngine_ConfigPath64_VanguardInstrumentationProfiler", "path2")
-            });
-
-            this.dataCollectorInformation = new DataCollectorInformation(
-                dataCollectorMock.Object,
-                null,
-                new DataCollectorConfig(typeof(CustomDataCollector)),
-                null,
-                new Mock<IDataCollectionAttachmentManager>().Object,
-                new TestPlatformDataCollectionEvents(),
-                new Mock<IMessageSink>().Object,
-                string.Empty);
-
-            this.telemetryManager = new DataCollectionTelemetryManager(this.mockRequestData.Object);
-        }
-
-        [TestMethod]
-        public void RecordEnvironmentVariableAddition_ShouldDoNothing_IfNotProfilerVariable()
+        var dataCollectorMock = new Mock<CodeCoverageDataCollector>();
+        var evnVariablesMock = dataCollectorMock.As<ITestExecutionEnvironmentSpecifier>();
+        evnVariablesMock.Setup(a => a.GetTestExecutionEnvironmentVariables()).Returns(new KeyValuePair<string, string>[]
         {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableAddition(this.dataCollectorInformation, "key", "value");
+            new("MicrosoftInstrumentationEngine_ConfigPath32_VanguardInstrumentationProfiler", "path1"),
+            new("MicrosoftInstrumentationEngine_ConfigPath64_VanguardInstrumentationProfiler", "path2")
+        });
+
+        _dataCollectorInformation = new DataCollectorInformation(
+            dataCollectorMock.Object,
+            null,
+            new DataCollectorConfig(typeof(CustomDataCollector)),
+            null,
+            new Mock<IDataCollectionAttachmentManager>().Object,
+            new TestPlatformDataCollectionEvents(),
+            new Mock<IMessageSink>().Object,
+            string.Empty);
+
+        _telemetryManager = new DataCollectionTelemetryManager(_mockRequestData.Object);
+    }
 
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
-        }
+    [TestMethod]
+    public void RecordEnvironmentVariableAddition_ShouldDoNothing_IfNotProfilerVariable()
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableAddition(_dataCollectorInformation, "key", "value");
 
-        [TestMethod]
-        public void RecordEnvironmentVariableConflict_ShouldDoNothing_IfNotProfilerVariable_ValuesSame()
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "key", "value", "value");
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
+    }
 
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
-        }
+    [TestMethod]
+    public void RecordEnvironmentVariableConflict_ShouldDoNothing_IfNotProfilerVariable_ValuesSame()
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "key", "value", "value");
 
-        [TestMethod]
-        public void RecordEnvironmentVariableConflict_ShouldDoNothing_IfNotProfilerVariable_ValuesDifferent()
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "key", "value", "othervalue");
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableAddition_ShouldCollectTelemetry_IfCorProfilerVariable(string profilerGuid, string profilerName)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableAddition(this.dataCollectorInformation, "COR_PROFILER", profilerGuid);
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableAddition_ShouldCollectTelemetry_IfCoreClrProfilerVariable(string profilerGuid, string profilerName)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableAddition(this.dataCollectorInformation, "CORECLR_PROFILER", profilerGuid);
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectOverwrittenTelemetry_IfCorProfilerVariable(string existingProfilerGuid, string profilerGuid, string expectedOverwrittenProfiler)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "COR_PROFILER", profilerGuid, existingProfilerGuid);
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", $"{Guid.Parse(existingProfilerGuid)}(overwritten:{expectedOverwrittenProfiler})"), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectOverwrittenTelemetry_IfCoreClrProfilerVariable(string existingProfilerGuid, string profilerGuid, string expectedOverwrittenProfiler)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, existingProfilerGuid);
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", $"{Guid.Parse(existingProfilerGuid)}(overwritten:{expectedOverwrittenProfiler})"), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}")]
-        [DataRow("AAAAAAAAAAAAA")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectClrIeTelemetry_IfCorProfilerVariableAndCollectorSpecifiesClrIeProfile(string profilerGuid)
-        {
-            // arrange
-            this.dataCollectorInformation.SetTestExecutionEnvironmentVariables();
-
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "COR_PROFILER", profilerGuid, "{324F817A-7420-4E6D-B3C1-143FBED6D855}");
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", "324f817a-7420-4e6d-b3c1-143fbed6d855"), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}")]
-        [DataRow("AAAAAAAAAAAAA")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectClrIeTelemetry_IfCoreClrProfilerVariableAndCollectorSpecifiesClrIeProfile(string profilerGuid)
-        {
-            // arrange
-            this.dataCollectorInformation.SetTestExecutionEnvironmentVariables();
-
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, "{324F817A-7420-4E6D-B3C1-143FBED6D855}");
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", "324f817a-7420-4e6d-b3c1-143fbed6d855"), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectTelemetry_IfCorProfilerVariableAndBothValuesSame(string profilerGuid, string profilerName)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "COR_PROFILER", profilerGuid, profilerGuid.ToLower());
-
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
-        }
-
-        [TestMethod]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
-        [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
-        [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
-        [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
-        public void RecordEnvironmentVariableConflict_ShouldCollectTelemetry_IfCoreClrProfilerVariableAndBothValuesSame(string profilerGuid, string profilerName)
-        {
-            // act
-            this.telemetryManager.RecordEnvironmentVariableConflict(this.dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, profilerGuid.ToUpper());
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
+    }
+
+    [TestMethod]
+    public void RecordEnvironmentVariableConflict_ShouldDoNothing_IfNotProfilerVariable_ValuesDifferent()
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "key", "value", "othervalue");
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add(It.IsAny<string>(), It.IsAny<object>()), Times.Never);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableAddition_ShouldCollectTelemetry_IfCorProfilerVariable(string profilerGuid, string profilerName)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableAddition(_dataCollectorInformation, "COR_PROFILER", profilerGuid);
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableAddition_ShouldCollectTelemetry_IfCoreClrProfilerVariable(string profilerGuid, string profilerName)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableAddition(_dataCollectorInformation, "CORECLR_PROFILER", profilerGuid);
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectOverwrittenTelemetry_IfCorProfilerVariable(string existingProfilerGuid, string profilerGuid, string expectedOverwrittenProfiler)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "COR_PROFILER", profilerGuid, existingProfilerGuid);
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", $"{Guid.Parse(existingProfilerGuid)}(overwritten:{expectedOverwrittenProfiler})"), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{0f8fad5b-d9cb-469f-a165-70867728950e}", "{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectOverwrittenTelemetry_IfCoreClrProfilerVariable(string existingProfilerGuid, string profilerGuid, string expectedOverwrittenProfiler)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, existingProfilerGuid);
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", $"{Guid.Parse(existingProfilerGuid)}(overwritten:{expectedOverwrittenProfiler})"), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}")]
+    [DataRow("AAAAAAAAAAAAA")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectClrIeTelemetry_IfCorProfilerVariableAndCollectorSpecifiesClrIeProfile(string profilerGuid)
+    {
+        // arrange
+        _dataCollectorInformation.SetTestExecutionEnvironmentVariables();
+
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "COR_PROFILER", profilerGuid, "{324F817A-7420-4E6D-B3C1-143FBED6D855}");
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", "324f817a-7420-4e6d-b3c1-143fbed6d855"), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}")]
+    [DataRow("AAAAAAAAAAAAA")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectClrIeTelemetry_IfCoreClrProfilerVariableAndCollectorSpecifiesClrIeProfile(string profilerGuid)
+    {
+        // arrange
+        _dataCollectorInformation.SetTestExecutionEnvironmentVariables();
+
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, "{324F817A-7420-4E6D-B3C1-143FBED6D855}");
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", "324f817a-7420-4e6d-b3c1-143fbed6d855"), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectTelemetry_IfCorProfilerVariableAndBothValuesSame(string profilerGuid, string profilerName)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "COR_PROFILER", profilerGuid, profilerGuid.ToLower(CultureInfo.InvariantCulture));
+
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CorProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-C11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324F817A-7420-4E6D-B3C1-143FBED6D855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317ae81-bcd8-47b7-aaa1-a28062e41c71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71}", "aaaaaaaa-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("{E5F256DC-7959-4DD6-8E4F-c11150AB28E0}", "e5f256dc-7959-4dd6-8e4f-c11150ab28e0")]
+    [DataRow("{324f817a-7420-4e6d-b3c1-143fbEd6d855}", "324f817a-7420-4e6d-b3c1-143fbed6d855")]
+    [DataRow("{9317AE81-bcd8-47b7-AAA1-A28062E41C71}", "9317ae81-bcd8-47b7-aaa1-a28062e41c71")]
+    [DataRow("AAAAAAAAAAAAA", "00000000-0000-0000-0000-000000000000")]
+    public void RecordEnvironmentVariableConflict_ShouldCollectTelemetry_IfCoreClrProfilerVariableAndBothValuesSame(string profilerGuid, string profilerName)
+    {
+        // act
+        _telemetryManager.RecordEnvironmentVariableConflict(_dataCollectorInformation, "CORECLR_PROFILER", profilerGuid, profilerGuid.ToUpper(CultureInfo.InvariantCulture));
 
-            // assert
-            this.mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
-        }
+        // assert
+        _mockMetricsCollection.Verify(c => c.Add($"VS.TestPlatform.DataCollector.CoreClrProfiler.{_dataCollectorInformation.DataCollectorConfig.TypeUri}", profilerName), Times.Once);
     }
 }
diff --git a/test/datacollector.UnitTests/DataCollectorConfigTests.cs b/test/datacollector.UnitTests/DataCollectorConfigTests.cs
index 17b6e466df..05ff4fdbfe 100644
--- a/test/datacollector.UnitTests/DataCollectorConfigTests.cs
+++ b/test/datacollector.UnitTests/DataCollectorConfigTests.cs
@@ -1,56 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectorConfigTests
 {
-    using System;
+    [TestMethod]
+    public void ConstructorShouldSetCorrectFriendlyNameAndUri()
+    {
+        var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
+
+        Assert.AreEqual("CustomDataCollector", dataCollectorConfig.FriendlyName);
+        Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri!.ToString());
+    }
+
+    [TestMethod]
+    public void ConstructorShouldThrowExceptionIfTypeIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(
+            () => new DataCollectorConfig(null!));
+    }
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void ConstructorShouldNotThrowExceptionIfUriIsNotSpecifiedInDataCollector()
+    {
+        var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithoutUri));
+        Assert.AreEqual("CustomDataCollector", dataCollectorConfig.FriendlyName);
+        Assert.IsNull(dataCollectorConfig.TypeUri);
+    }
+
+    [TestMethod]
+    public void ConstructorShouldNotThrowExceptionIfFriendlyNameIsEmpty()
+    {
+        var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithEmptyFriendlyName));
+        Assert.AreEqual("", dataCollectorConfig.FriendlyName);
+        Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri!.ToString());
+    }
 
-    [TestClass]
-    public class DataCollectorConfigTests
+    [TestMethod]
+    public void ConstructorShouldNotThrowExceptionIfFriendlyNameIsNotSpecified()
     {
-        [TestMethod]
-        public void ConstructorShouldSetCorrectFriendlyNameAndUri()
-        {
-            var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
-
-            Assert.AreEqual("CustomDataCollector", dataCollectorConfig.FriendlyName);
-            Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri.ToString());
-        }
-
-        [TestMethod]
-        public void ConstructorShouldThrowExceptionIfTypeIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(
-                () =>
-                    {
-                        new DataCollectorConfig(null);
-                    });
-        }
-
-        [TestMethod]
-        public void ConstructorShouldNotThrowExceptionIfUriIsNotSpecifiedInDataCollector()
-        {
-            var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithoutUri));
-            Assert.AreEqual("CustomDataCollector", dataCollectorConfig.FriendlyName);
-            Assert.IsNull(dataCollectorConfig.TypeUri);
-        }
-
-        [TestMethod]
-        public void ConstructorShouldNotThrowExceptionIfFriendlyNameIsEmpty()
-        {
-            var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithEmptyFriendlyName));
-            Assert.AreEqual("", dataCollectorConfig.FriendlyName);
-            Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri.ToString());
-        }
-
-        [TestMethod]
-        public void ConstructorShouldNotThrowExceptionIfFriendlyNameIsNotSpecified()
-        {
-            var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithoutFriendlyName));
-            Assert.AreEqual("", dataCollectorConfig.FriendlyName);
-            Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri.ToString());
-        }
+        var dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollectorWithoutFriendlyName));
+        Assert.AreEqual("", dataCollectorConfig.FriendlyName);
+        Assert.AreEqual("my://custom/datacollector", dataCollectorConfig.TypeUri!.ToString());
     }
 }
diff --git a/test/datacollector.UnitTests/DataCollectorInformationTests.cs b/test/datacollector.UnitTests/DataCollectorInformationTests.cs
index f79b91a1b4..0d9101dea9 100644
--- a/test/datacollector.UnitTests/DataCollectorInformationTests.cs
+++ b/test/datacollector.UnitTests/DataCollectorInformationTests.cs
@@ -1,64 +1,67 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Moq;
-    using Moq.Protected;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Moq;
+using Moq.Protected;
 
-    [TestClass]
-    public class DataCollectorInformationTests
-    {
-        private DataCollectorInformation dataCollectorInfo;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectorInformationTests
+{
+    private readonly DataCollectorInformation _dataCollectorInfo;
+
+    private readonly List<KeyValuePair<string, string>> _envVarList;
 
-        private List<KeyValuePair<string, string>> envVarList;
+    private readonly Mock<DataCollector2> _mockDataCollector;
 
-        private Mock<DataCollector2> mockDataCollector;
+    private readonly Mock<ITelemetryReporter> _telemetryReporter;
 
-        public DataCollectorInformationTests()
-        {
-            this.envVarList = new List<KeyValuePair<string, string>>();
-            this.mockDataCollector = new Mock<DataCollector2>();
-            this.mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(this.envVarList);
-            this.mockDataCollector.Protected().Setup("Dispose", true);
-            var mockMessageSink = new Mock<IMessageSink>();
-            this.dataCollectorInfo = new DataCollectorInformation(
-                this.mockDataCollector.Object,
-                null,
-                new DataCollectorConfig(typeof(CustomDataCollector)),
-                null,
-                new Mock<IDataCollectionAttachmentManager>().Object,
-                new TestPlatformDataCollectionEvents(),
-                mockMessageSink.Object,
-                string.Empty);
-        }
+    public DataCollectorInformationTests()
+    {
+        _envVarList = new List<KeyValuePair<string, string>>();
+        _mockDataCollector = new Mock<DataCollector2>();
+        _mockDataCollector.As<ITestExecutionEnvironmentSpecifier>().Setup(x => x.GetTestExecutionEnvironmentVariables()).Returns(_envVarList);
+        _mockDataCollector.Protected().Setup("Dispose", false, true);
+        var mockMessageSink = new Mock<IMessageSink>();
+        _dataCollectorInfo = new DataCollectorInformation(
+            _mockDataCollector.Object,
+            null,
+            new DataCollectorConfig(typeof(CustomDataCollector)),
+            null,
+            new Mock<IDataCollectionAttachmentManager>().Object,
+            new TestPlatformDataCollectionEvents(),
+            mockMessageSink.Object,
+            string.Empty);
+        _telemetryReporter = new Mock<ITelemetryReporter>();
+    }
 
-        [TestMethod]
-        public void InitializeDataCollectorShouldInitializeDataCollector()
-        {
-            this.envVarList.Add(new KeyValuePair<string, string>("key", "value"));
+    [TestMethod]
+    public void InitializeDataCollectorShouldInitializeDataCollector()
+    {
+        _envVarList.Add(new KeyValuePair<string, string>("key", "value"));
 
-            this.dataCollectorInfo.InitializeDataCollector();
-            this.dataCollectorInfo.SetTestExecutionEnvironmentVariables();
+        _dataCollectorInfo.InitializeDataCollector(_telemetryReporter.Object);
+        _dataCollectorInfo.SetTestExecutionEnvironmentVariables();
 
-            CollectionAssert.AreEqual(this.envVarList, this.dataCollectorInfo.TestExecutionEnvironmentVariables.ToList());
-        }
+        CollectionAssert.AreEqual(_envVarList, _dataCollectorInfo.TestExecutionEnvironmentVariables!.ToList());
+    }
 
-        [TestMethod]
-        public void DisposeShouldInvokeDisposeOfDatacollector()
-        {
-            this.dataCollectorInfo.InitializeDataCollector();
-            this.dataCollectorInfo.DisposeDataCollector();
+    [TestMethod]
+    public void DisposeShouldInvokeDisposeOfDatacollector()
+    {
+        _dataCollectorInfo.InitializeDataCollector(_telemetryReporter.Object);
+        _dataCollectorInfo.DisposeDataCollector();
 
-            this.mockDataCollector.Protected().Verify("Dispose", Times.Once(), true);
-        }
+        _mockDataCollector.Protected().Verify("Dispose", Times.Once(), false, true);
     }
 }
diff --git a/test/datacollector.UnitTests/DataCollectorMainTests.cs b/test/datacollector.UnitTests/DataCollectorMainTests.cs
index f25a3b8c05..59103a2949 100644
--- a/test/datacollector.UnitTests/DataCollectorMainTests.cs
+++ b/test/datacollector.UnitTests/DataCollectorMainTests.cs
@@ -1,118 +1,192 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.DataCollector;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+using Moq;
+using System.Globalization;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class DataCollectorMainTests
 {
-    using System;
-    using System.Diagnostics;
-
-    using CommunicationUtilities.DataCollection.Interfaces;
-    using CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using PlatformAbstractions.Interfaces;
-    using TestPlatform.DataCollector;
-
-    [TestClass]
-    public class DataCollectorMainTests
+    private readonly string[] _args = ["--port", "1025", "--parentprocessid", "100", "--diag", "abc.txt", "--tracelevel", "3"];
+    private readonly string[] _argsWithEmptyDiagArg = ["--port", "1025", "--parentprocessid", "100", "--diag", "", "--tracelevel", "3"];
+    private readonly string[] _argsWithInvalidTraceLevel = ["--port", "1025", "--parentprocessid", "100", "--diag", "abc.txt", "--tracelevel", "5"];
+
+    private static readonly string TimeoutErrorMessage =
+        "datacollector process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IDataCollectionRequestHandler> _mockDataCollectionRequestHandler;
+    private readonly DataCollectorMain _dataCollectorMain;
+
+    public DataCollectorMainTests()
+    {
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockDataCollectionRequestHandler = new Mock<IDataCollectionRequestHandler>();
+        _dataCollectorMain = new DataCollectorMain(_mockProcessHelper.Object, _mockEnvironment.Object, _mockDataCollectionRequestHandler.Object, new());
+        _mockDataCollectionRequestHandler.Setup(rh => rh.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
+    }
+
+    [TestCleanup]
+    public void CleanUp()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "");
+    }
+
+    [TestMethod]
+    public void RunShouldTimeoutBasedOnEnvVariable()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "10");
+        _dataCollectorMain.Run(_args);
+        _mockDataCollectionRequestHandler.Verify(rh => rh.WaitForRequestSenderConnection(10 * 1000));
+    }
+
+    [TestMethod]
+    public void RunShouldTimeoutBasedDefaultValueIfEnvVariableNotSet()
+    {
+        _dataCollectorMain.Run(_args);
+
+        _mockDataCollectionRequestHandler.Verify(rh => rh.WaitForRequestSenderConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
+    }
+
+    [TestMethod]
+    public void RunShouldInitializeTraceWithTraceLevelOffIfDiagArgIsEmpty()
     {
-        private readonly string[] args = {"--port", "1025", "--parentprocessid", "100", "--diag", "abc.txt",  "--tracelevel", "3" };
-        private readonly string[] argsWithEmptyDiagArg = { "--port", "1025", "--parentprocessid", "100", "--diag", "", "--tracelevel", "3" };
-        private readonly string[] argsWithInvalidTraceLevel = { "--port", "1025", "--parentprocessid", "100", "--diag", "abc.txt", "--tracelevel", "5" };
-
-        private static readonly string TimoutErrorMessage =
-            "datacollector process failed to connect to vstest.console process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<IEnvironment> mockEnvironment;
-        private Mock<IDataCollectionRequestHandler> mockDataCollectionRequestHandler;
-        private DataCollectorMain dataCollectorMain;
-
-        public DataCollectorMainTests()
-        {
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockEnvironment = new Mock<IEnvironment>();
-            this.mockDataCollectionRequestHandler = new Mock<IDataCollectionRequestHandler>();
-            this.dataCollectorMain = new DataCollectorMain(this.mockProcessHelper.Object, this.mockEnvironment.Object, this.mockDataCollectionRequestHandler.Object);
-            this.mockDataCollectionRequestHandler.Setup(rh => rh.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
-        }
-
-        [TestCleanup]
-        public void CleanUp()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "");
-        }
-
-        [TestMethod]
-        public void RunShouldTimeoutBasedOnEnvVariable()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, "10");
-            this.dataCollectorMain.Run(args);
-            this.mockDataCollectionRequestHandler.Verify(rh => rh.WaitForRequestSenderConnection(10 * 1000));
-        }
-
-        [TestMethod]
-        public void RunShouldTimeoutBasedDefaulValueIfEnvVariableNotSet()
-        {
-            this.dataCollectorMain.Run(args);
-
-            this.mockDataCollectionRequestHandler.Verify(rh => rh.WaitForRequestSenderConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
-        }
-
-        [TestMethod]
-        public void RunShouldInitializeTraceWithTraceLevelOffIfDiagArgIsEmpty()
-        {
-            // Setting EqtTrace.TraceLevel to a value other than info.
+        // Setting EqtTrace.TraceLevel to a value other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
-            // Action
-            this.dataCollectorMain.Run(argsWithEmptyDiagArg); // Passing tracelevel as info and diag file path is empty.
+        // Action
+        _dataCollectorMain.Run(_argsWithEmptyDiagArg); // Passing tracelevel as info and diag file path is empty.
 
-            // Verify
-            Assert.AreEqual(TraceLevel.Off, (TraceLevel)EqtTrace.TraceLevel);
-        }
+        // Verify
+        Assert.AreEqual(TraceLevel.Off, (TraceLevel)EqtTrace.TraceLevel);
+    }
 
-        [TestMethod]
-        public void RunShouldInitializeTraceWithVerboseTraceLevelIfInvalidTraceLevelPassed()
-        {
-            // Setting EqtTrace.TraceLevel to a value other than info.
+    [TestMethod]
+    public void RunShouldInitializeTraceWithVerboseTraceLevelIfInvalidTraceLevelPassed()
+    {
+        // Setting EqtTrace.TraceLevel to a value other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Info;
+        EqtTrace.TraceLevel = TraceLevel.Info;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Info;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Info;
 #endif
-            // Action
-            this.dataCollectorMain.Run(argsWithInvalidTraceLevel);
+        // Action
+        _dataCollectorMain.Run(_argsWithInvalidTraceLevel);
 
-            // Verify
-            Assert.AreEqual(TraceLevel.Verbose, (TraceLevel)EqtTrace.TraceLevel);
-        }
+        // Verify
+        Assert.AreEqual(TraceLevel.Verbose, (TraceLevel)EqtTrace.TraceLevel);
+    }
 
-        [TestMethod]
-        public void RunShouldInitializeTraceWithCorrectVerboseTraceLevel()
-        {
-            // Setting EqtTrace.TraceLevel to a value other than info.
+    [TestMethod]
+    public void RunShouldInitializeTraceWithCorrectVerboseTraceLevel()
+    {
+        // Setting EqtTrace.TraceLevel to a value other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
-            // Action
-            this.dataCollectorMain.Run(args); // Trace level is set as info in args.
-
-            // Verify
-            Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
-        }
-
-        [TestMethod]
-        public void RunShouldThrowIfTimeoutOccured()
-        {
-            this.mockDataCollectionRequestHandler.Setup(rh => rh.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(false);
-            var message = Assert.ThrowsException<TestPlatformException>(() => this.dataCollectorMain.Run(args)).Message;
-            Assert.AreEqual(DataCollectorMainTests.TimoutErrorMessage, message);
-        }
+        // Action
+        _dataCollectorMain.Run(_args); // Trace level is set as info in args.
+
+        // Verify
+        Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
+    }
+
+    [TestMethod]
+    public void RunShouldThrowIfTimeoutOccured()
+    {
+        _mockDataCollectionRequestHandler.Setup(rh => rh.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(false);
+        var message = Assert.ThrowsException<TestPlatformException>(() => _dataCollectorMain.Run(_args)).Message;
+        Assert.AreEqual(TimeoutErrorMessage, message);
+    }
+
+    [TestMethod]
+    public void RunWhenCliUiLanguageIsSetChangesCultureAndFlowsOverride()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE")).Returns(culture.Name);
+
+        bool threadCultureWasSet = false;
+        var dataCollectorMain = new DataCollectorMain(_mockProcessHelper.Object, _mockEnvironment.Object, _mockDataCollectionRequestHandler.Object,
+            new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture)));
+
+        // Act
+        dataCollectorMain.Run(_args);
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", culture.LCID.ToString(CultureInfo.InvariantCulture)), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenVsLangIsSetChangesCultureAndFlowsOverride()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("VSLANG")).Returns(culture.LCID.ToString(CultureInfo.InvariantCulture));
+
+        bool threadCultureWasSet = false;
+        var dataCollectorMain = new DataCollectorMain(_mockProcessHelper.Object, _mockEnvironment.Object, _mockDataCollectionRequestHandler.Object,
+            new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture)));
+
+        // Act
+        dataCollectorMain.Run(_args);
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", culture.Name), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenNoCultureEnvVarSetDoesNotChangeCultureNorFlowsOverride()
+    {
+        // Arrange
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable(It.IsAny<string>())).Returns(default(string));
+
+        bool threadCultureWasSet = false;
+        var dataCollectorMain = new DataCollectorMain(_mockProcessHelper.Object, _mockEnvironment.Object, _mockDataCollectionRequestHandler.Object,
+            new(envVarMock.Object, lang => threadCultureWasSet = true));
+
+        // Act
+        dataCollectorMain.Run(_args);
+
+        // Assert
+        Assert.IsFalse(threadCultureWasSet, "DefaultThreadCurrentUICulture was set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Never);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", It.IsAny<string>()), Times.Never);
     }
 }
diff --git a/test/datacollector.UnitTests/DummyDataCollectors.cs b/test/datacollector.UnitTests/DummyDataCollectors.cs
index 3b8e7858b5..614631d156 100644
--- a/test/datacollector.UnitTests/DummyDataCollectors.cs
+++ b/test/datacollector.UnitTests/DummyDataCollectors.cs
@@ -1,77 +1,72 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
-{
-    using System.Collections.Generic;
-    using System.Xml;
+using System.Collections.Generic;
+using System.Xml;
 
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
-    [DataCollectorFriendlyName("CustomDataCollector")]
-    [DataCollectorTypeUri("my://custom/datacollector")]
-    public class CustomDataCollector : DataCollector, ITestExecutionEnvironmentSpecifier
-    {
-        public DataCollectionEnvironmentContext DataCollectionEnvironmentContext { get; set; }
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
 
-        public DataCollectionSink DataSink { get; set; }
+[DataCollectorFriendlyName("CustomDataCollector")]
+[DataCollectorTypeUri("my://custom/datacollector")]
+public class CustomDataCollector : ObjectModel.DataCollection.DataCollector, ITestExecutionEnvironmentSpecifier
+{
+    public DataCollectionEnvironmentContext? DataCollectionEnvironmentContext { get; set; }
 
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
-        {
-        }
+    public DataCollectionSink? DataSink { get; set; }
 
-        public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
-        {
-            return default;
-        }
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
+    {
+    }
 
-        protected override void Dispose(bool disposing)
-        {
-        }
+    public IEnumerable<KeyValuePair<string, string>> GetTestExecutionEnvironmentVariables()
+    {
+        return default!;
     }
+}
 
-    [DataCollectorFriendlyName("CustomDataCollector")]
-    public class CustomDataCollectorWithoutUri : DataCollector
+[DataCollectorFriendlyName("CustomDataCollector")]
+public class CustomDataCollectorWithoutUri : ObjectModel.DataCollection.DataCollector
+{
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
     {
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
-        {
-        }
     }
+}
 
-    [DataCollectorTypeUri("my://custom/datacollector")]
-    public class CustomDataCollectorWithoutFriendlyName : DataCollector
+[DataCollectorTypeUri("my://custom/datacollector")]
+public class CustomDataCollectorWithoutFriendlyName : ObjectModel.DataCollection.DataCollector
+{
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
     {
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
-        {
-        }
     }
+}
 
-    [DataCollectorFriendlyName("")]
-    [DataCollectorTypeUri("my://custom/datacollector")]
-    public class CustomDataCollectorWithEmptyFriendlyName : DataCollector
+[DataCollectorFriendlyName("")]
+[DataCollectorTypeUri("my://custom/datacollector")]
+public class CustomDataCollectorWithEmptyFriendlyName : ObjectModel.DataCollection.DataCollector
+{
+    public override void Initialize(
+        XmlElement? configurationElement,
+        DataCollectionEvents events,
+        DataCollectionSink dataSink,
+        DataCollectionLogger logger,
+        DataCollectionEnvironmentContext? environmentContext)
     {
-        public override void Initialize(
-            XmlElement configurationElement,
-            DataCollectionEvents events,
-            DataCollectionSink dataSink,
-            DataCollectionLogger logger,
-            DataCollectionEnvironmentContext environmentContext)
-        {
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/test/datacollector.UnitTests/Program.cs b/test/datacollector.UnitTests/Program.cs
deleted file mode 100644
index 7f39953476..0000000000
--- a/test/datacollector.UnitTests/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
-{
-    /// <summary>
-    /// Main entry point for the command line runner.
-    /// </summary>
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/datacollector.UnitTests/Properties/AssemblyInfo.cs b/test/datacollector.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index fb892d21e1..0000000000
--- a/test/datacollector.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("datacollector.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("00aa21f3-31e4-4748-ac0b-c4eadb41ca24")]
diff --git a/test/datacollector.UnitTests/TestPlatformDataCollectionEventsTests.cs b/test/datacollector.UnitTests/TestPlatformDataCollectionEventsTests.cs
index 1ee6ba7980..13b56f7cf5 100644
--- a/test/datacollector.UnitTests/TestPlatformDataCollectionEventsTests.cs
+++ b/test/datacollector.UnitTests/TestPlatformDataCollectionEventsTests.cs
@@ -1,161 +1,157 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class TestPlatformDataCollectionEventsTests
 {
-    using System;
-    using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    [TestClass]
-    public class TestPlatformDataCollectionEventsTests
+    private readonly TestPlatformDataCollectionEvents _events;
+
+    private DataCollectionContext? _context;
+    private bool _isEventRaised;
+
+    public TestPlatformDataCollectionEventsTests()
+    {
+        _events = new TestPlatformDataCollectionEvents();
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldThrowExceptionIfEventArgsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _events.RaiseEvent(null!));
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldRaiseEventsIfSessionStartEventArgsIsPassed()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        _events.SessionStart += SessionStartMessageHandler;
+        var eventArgs = new SessionStartEventArgs(_context, new Dictionary<string, object?>());
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsTrue(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldNotRaiseEventsIfEventIsNotRegistered()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        var eventArgs = new SessionStartEventArgs(_context, new Dictionary<string, object?>());
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsFalse(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldNotRaiseEventsIfEventIsUnRegistered()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        _events.SessionStart += SessionStartMessageHandler;
+        _events.SessionStart -= SessionStartMessageHandler;
+        var eventArgs = new SessionStartEventArgs(_context, new Dictionary<string, object?>());
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsFalse(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldRaiseEventsIfSessionEndEventArgsIsPassed()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        _events.SessionEnd += SessionEndMessageHandler;
+        var eventArgs = new SessionEndEventArgs(_context);
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsTrue(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldRaiseEventsIfTestCaseStartEventArgsIsPassed()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        _events.TestCaseStart += TestCaseStartMessageHandler;
+        var eventArgs = new TestCaseStartEventArgs(_context, testCase);
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsTrue(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void RaiseEventsShouldRaiseEventsIfTestCaseEndEventArgsIsPassed()
+    {
+        _isEventRaised = false;
+        var testCase = new TestCase();
+        _context = new DataCollectionContext(testCase);
+
+        _events.TestCaseEnd += TestCaseEndMessageHandler;
+        var eventArgs = new TestCaseEndEventArgs(_context, testCase, TestOutcome.Passed);
+        _events.RaiseEvent(eventArgs);
+
+        Assert.IsTrue(_isEventRaised);
+    }
+
+    [TestMethod]
+    public void AreTestCaseEventsSubscribedShouldReturnTrueIfTestCaseStartIsSubscribed()
+    {
+        _events.TestCaseStart += TestCaseStartMessageHandler;
+
+        Assert.IsTrue(_events.AreTestCaseEventsSubscribed());
+    }
+
+    [TestMethod]
+    public void AreTestCaseEventsSubscribedShouldReturnTrueIfTestCaseEndIsSubscribed()
+    {
+        _events.TestCaseEnd += TestCaseEndMessageHandler;
+
+        Assert.IsTrue(_events.AreTestCaseEventsSubscribed());
+    }
+
+    [TestMethod]
+    public void AreTestCaseEventsSubscribedShouldFalseIfTestCaseEventsAreNotSubscribed()
+    {
+        Assert.IsFalse(_events.AreTestCaseEventsSubscribed());
+    }
+
+    private void SessionStartMessageHandler(object? sender, SessionStartEventArgs e)
+    {
+        _isEventRaised = true;
+    }
+
+    private void SessionEndMessageHandler(object? sender, SessionEndEventArgs e)
+    {
+        _isEventRaised = true;
+    }
+
+    private void TestCaseStartMessageHandler(object? sender, TestCaseStartEventArgs e)
+    {
+        _isEventRaised = true;
+    }
+
+    private void TestCaseEndMessageHandler(object? sender, TestCaseEndEventArgs e)
     {
-        private TestPlatformDataCollectionEvents events;
-
-        private DataCollectionContext context;
-
-        private bool isEventRaised;
-
-        public TestPlatformDataCollectionEventsTests()
-        {
-            this.events = new TestPlatformDataCollectionEvents();
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldThrowExceptionIfEventArgsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.events.RaiseEvent(null);
-            });
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldRaiseEventsIfSessionStartEventArgsIsPassed()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            this.events.SessionStart += this.SessionStartMessageHandler;
-            var eventArgs = new SessionStartEventArgs(this.context, new Dictionary<string, object>());
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsTrue(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldNotRaiseEventsIfEventIsNotRegisterd()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            var eventArgs = new SessionStartEventArgs(this.context, new Dictionary<string, object>());
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsFalse(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldNotRaiseEventsIfEventIsUnRegisterd()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            this.events.SessionStart += this.SessionStartMessageHandler;
-            this.events.SessionStart -= this.SessionStartMessageHandler;
-            var eventArgs = new SessionStartEventArgs(this.context, new Dictionary<string, object>());
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsFalse(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldRaiseEventsIfSessionEndEventArgsIsPassed()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            this.events.SessionEnd += this.SessionEndMessageHandler;
-            var eventArgs = new SessionEndEventArgs(this.context);
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsTrue(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldRaiseEventsIfTestCaseStartEventArgsIsPassed()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            this.events.TestCaseStart += this.TestCaseStartMessageHandler;
-            var eventArgs = new TestCaseStartEventArgs(this.context, testCase);
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsTrue(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void RaiseEventsShouldRaiseEventsIfTestCaseEndEventArgsIsPassed()
-        {
-            this.isEventRaised = false;
-            var testCase = new TestCase();
-            this.context = new DataCollectionContext(testCase);
-
-            this.events.TestCaseEnd += this.TestCaseEndMessageHandler;
-            var eventArgs = new TestCaseEndEventArgs(this.context, testCase, TestOutcome.Passed);
-            this.events.RaiseEvent(eventArgs);
-
-            Assert.IsTrue(this.isEventRaised);
-        }
-
-        [TestMethod]
-        public void AreTestCaseEventsSubscribedShouldReturnTrueIfTestCaseStartIsSubscribed()
-        {
-            this.events.TestCaseStart += this.TestCaseStartMessageHandler;
-
-            Assert.IsTrue(this.events.AreTestCaseEventsSubscribed());
-        }
-
-        [TestMethod]
-        public void AreTestCaseEventsSubscribedShouldReturnTrueIfTestCaseEndIsSubscribed()
-        {
-            this.events.TestCaseEnd += this.TestCaseEndMessageHandler;
-
-            Assert.IsTrue(this.events.AreTestCaseEventsSubscribed());
-        }
-
-        [TestMethod]
-        public void AreTestCaseEventsSubscribedShouldFalseIfTestCaseEventsAreNotSubscribed()
-        {
-            Assert.IsFalse(this.events.AreTestCaseEventsSubscribed());
-        }
-
-        private void SessionStartMessageHandler(object sender, SessionStartEventArgs e)
-        {
-            this.isEventRaised = true;
-        }
-
-        private void SessionEndMessageHandler(object sender, SessionEndEventArgs e)
-        {
-            this.isEventRaised = true;
-        }
-
-        private void TestCaseStartMessageHandler(object sender, TestCaseStartEventArgs e)
-        {
-            this.isEventRaised = true;
-        }
-
-        private void TestCaseEndMessageHandler(object sender, TestCaseEndEventArgs e)
-        {
-            this.isEventRaised = true;
-        }
+        _isEventRaised = true;
     }
 }
diff --git a/test/datacollector.UnitTests/TestPlatformDataCollectionLoggerTests.cs b/test/datacollector.UnitTests/TestPlatformDataCollectionLoggerTests.cs
index 7c744c1b54..dd6e706cd5 100644
--- a/test/datacollector.UnitTests/TestPlatformDataCollectionLoggerTests.cs
+++ b/test/datacollector.UnitTests/TestPlatformDataCollectionLoggerTests.cs
@@ -1,105 +1,84 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
+
+[TestClass]
+public class TestPlatformDataCollectionLoggerTests
 {
-    using System;
+    private readonly TestPlatformDataCollectionLogger _logger;
+    private readonly Mock<IMessageSink> _messageSink;
+    private readonly DataCollectorConfig _dataCollectorConfig;
+    private readonly DataCollectionContext _context;
+
+    public TestPlatformDataCollectionLoggerTests()
+    {
+        _messageSink = new Mock<IMessageSink>();
+        _dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
+        _logger = new TestPlatformDataCollectionLogger(_messageSink.Object, _dataCollectorConfig);
+
+        var guid = Guid.NewGuid();
+        var sessionId = new SessionId(guid);
+        _context = new DataCollectionContext(sessionId);
+    }
+
+    [TestMethod]
+    public void LogErrorShouldThrowExceptionIfContextIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(null!, string.Empty));
+
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(null!, new Exception()));
+
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(null!, string.Empty, new Exception()));
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void LogErrorShouldThrowExceptionIfTextIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(_context, (string)null!));
 
-    using Moq;
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(_context, null!, new Exception()));
+    }
 
-    [TestClass]
-    public class TestPlatformDataCollectionLoggerTests
+    [TestMethod]
+    public void LogErrorShouldThrowExceptionIfExceptionIsNull()
     {
-        private TestPlatformDataCollectionLogger logger;
-        private Mock<IMessageSink> messageSink;
-        private DataCollectorConfig dataCollectorConfig;
-        private DataCollectionContext context;
-
-        public TestPlatformDataCollectionLoggerTests()
-        {
-            this.messageSink = new Mock<IMessageSink>();
-            this.dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
-            this.logger = new TestPlatformDataCollectionLogger(this.messageSink.Object, this.dataCollectorConfig);
-
-            var guid = Guid.NewGuid();
-            var sessionId = new SessionId(guid);
-            this.context = new DataCollectionContext(sessionId);
-        }
-
-        [TestMethod]
-        public void LogErrorShouldThrowExceptionIfContextIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(null, string.Empty);
-            });
-
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(null, new Exception());
-            });
-
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(null, string.Empty, new Exception());
-            });
-        }
-
-        [TestMethod]
-        public void LogErrorShouldThrowExceptionIfTextIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(this.context, (string)null);
-            });
-
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(this.context, null, new Exception());
-            });
-        }
-
-        [TestMethod]
-        public void LogErrorShouldThrowExceptionIfExceptionIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(this.context, (Exception)null);
-            });
-
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.logger.LogError(this.context, string.Empty, (Exception)null);
-            });
-        }
-
-        [TestMethod]
-        public void LogErrorShouldSendMessageToMessageSink()
-        {
-            var text = "customtext";
-            this.logger.LogError(this.context, text);
-
-            this.messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once());
-
-            this.logger.LogError(this.context, new Exception(text));
-            this.messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Exactly(2));
-
-            this.logger.LogError(this.context, text, new Exception(text));
-            this.messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Exactly(3));
-        }
-
-        [TestMethod]
-        public void LogWarningShouldSendMessageToMessageSink()
-        {
-            var text = "customtext";
-            this.logger.LogWarning(this.context, text);
-
-            this.messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once());
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(_context, (Exception?)null!));
+
+        Assert.ThrowsException<ArgumentNullException>(() => _logger.LogError(_context, string.Empty, null!));
+    }
+
+    [TestMethod]
+    public void LogErrorShouldSendMessageToMessageSink()
+    {
+        var text = "customtext";
+        _logger.LogError(_context, text);
+
+        _messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once());
+
+        _logger.LogError(_context, new Exception(text));
+        _messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Exactly(2));
+
+        _logger.LogError(_context, text, new Exception(text));
+        _messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Exactly(3));
+    }
+
+    [TestMethod]
+    public void LogWarningShouldSendMessageToMessageSink()
+    {
+        var text = "customtext";
+        _logger.LogWarning(_context, text);
+
+        _messageSink.Verify(x => x.SendMessage(It.IsAny<DataCollectionMessageEventArgs>()), Times.Once());
     }
 }
diff --git a/test/datacollector.UnitTests/TestPlatformDataCollectionSinkTests.cs b/test/datacollector.UnitTests/TestPlatformDataCollectionSinkTests.cs
index 9522d1b4bd..11f6c3fe23 100644
--- a/test/datacollector.UnitTests/TestPlatformDataCollectionSinkTests.cs
+++ b/test/datacollector.UnitTests/TestPlatformDataCollectionSinkTests.cs
@@ -1,128 +1,123 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests
-{
-    using System;
-    using System.ComponentModel;
-    using System.IO;
-
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.ComponentModel;
+using System.IO;
 
-    using Moq;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollector.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.DataCollectorUnitTests;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class TestPlatformDataCollectionSinkTests
-    {
-        private Mock<IDataCollectionAttachmentManager> attachmentManager;
+using Moq;
 
-        private DataCollectorConfig dataCollectorConfig;
+namespace Microsoft.VisualStudio.TestPlatform.Common.DataCollector.UnitTests;
 
-        private TestPlatformDataCollectionSink dataCollectionSink;
+[TestClass]
+public class TestPlatformDataCollectionSinkTests
+{
+    private readonly Mock<IDataCollectionAttachmentManager> _attachmentManager;
+    private readonly DataCollectorConfig _dataCollectorConfig;
+    private static readonly string TempDirectoryPath = Path.GetTempPath();
 
-        private bool isEventHandlerInvoked = false;
-        private static readonly string TempDirectoryPath = Path.GetTempPath();
+    private TestPlatformDataCollectionSink _dataCollectionSink;
+    private bool _isEventHandlerInvoked;
 
-        public TestPlatformDataCollectionSinkTests()
-        {
-            this.attachmentManager = new Mock<IDataCollectionAttachmentManager>();
-            this.dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
-            this.dataCollectionSink = new TestPlatformDataCollectionSink(this.attachmentManager.Object, this.dataCollectorConfig);
-            this.isEventHandlerInvoked = false;
-        }
+    public TestPlatformDataCollectionSinkTests()
+    {
+        _attachmentManager = new Mock<IDataCollectionAttachmentManager>();
+        _dataCollectorConfig = new DataCollectorConfig(typeof(CustomDataCollector));
+        _dataCollectionSink = new TestPlatformDataCollectionSink(_attachmentManager.Object, _dataCollectorConfig);
+        _isEventHandlerInvoked = false;
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            File.Delete(Path.Combine(TempDirectoryPath, "filename.txt"));
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        File.Delete(Path.Combine(TempDirectoryPath, "filename.txt"));
+    }
 
-        [TestMethod]
-        public void SendFileAsyncShouldThrowExceptionIfFileTransferInformationIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.dataCollectionSink.SendFileAsync(default);
-            });
-        }
+    [TestMethod]
+    public void SendFileAsyncShouldThrowExceptionIfFileTransferInformationIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _dataCollectionSink.SendFileAsync(default!));
+    }
 
-        [TestMethod]
-        public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfo()
-        {
-            var filename = Path.Combine(TempDirectoryPath, "filename.txt");
-            File.WriteAllText(filename, string.Empty);
+    [TestMethod]
+    public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfo()
+    {
+        var filename = Path.Combine(TempDirectoryPath, "filename.txt");
+        File.WriteAllText(filename, string.Empty);
 
-            var guid = Guid.NewGuid();
-            var sessionId = new SessionId(guid);
-            var context = new DataCollectionContext(sessionId);
+        var guid = Guid.NewGuid();
+        var sessionId = new SessionId(guid);
+        var context = new DataCollectionContext(sessionId);
 
-            var fileTransferInfo = new FileTransferInformation(context, filename, false);
+        var fileTransferInfo = new FileTransferInformation(context, filename, false);
 
-            this.dataCollectionSink.SendFileAsync(fileTransferInfo);
+        _dataCollectionSink.SendFileAsync(fileTransferInfo);
 
-            this.attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
-        }
+        _attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void SendFileAsyncShouldInvokeSendFileCompletedIfRegistered()
-        {
-            var filename = Path.Combine(TempDirectoryPath, "filename.txt");
-            File.WriteAllText(filename, string.Empty);
+    [TestMethod]
+    public void SendFileAsyncShouldInvokeSendFileCompletedIfRegistered()
+    {
+        var filename = Path.Combine(TempDirectoryPath, "filename.txt");
+        File.WriteAllText(filename, string.Empty);
 
-            var guid = Guid.NewGuid();
-            var sessionId = new SessionId(guid);
-            var context = new DataCollectionContext(sessionId);
+        var guid = Guid.NewGuid();
+        var sessionId = new SessionId(guid);
+        var context = new DataCollectionContext(sessionId);
 
-            var fileTransferInfo = new FileTransferInformation(context, filename, false);
+        var fileTransferInfo = new FileTransferInformation(context, filename, false);
 
-            var attachmentManager = new DataCollectionAttachmentManager();
-            attachmentManager.Initialize(sessionId, TempDirectoryPath, new Mock<IMessageSink>().Object);
+        var attachmentManager = new DataCollectionAttachmentManager();
+        attachmentManager.Initialize(sessionId, TempDirectoryPath, new Mock<IMessageSink>().Object);
 
-            this.dataCollectionSink = new TestPlatformDataCollectionSink(attachmentManager, this.dataCollectorConfig);
-            this.dataCollectionSink.SendFileCompleted += SendFileCompleted_Handler;
-            this.dataCollectionSink.SendFileAsync(fileTransferInfo);
+        _dataCollectionSink = new TestPlatformDataCollectionSink(attachmentManager, _dataCollectorConfig);
+        _dataCollectionSink.SendFileCompleted += SendFileCompleted_Handler;
+        _dataCollectionSink.SendFileAsync(fileTransferInfo);
 
-            var result = attachmentManager.GetAttachments(context);
+        var result = attachmentManager.GetAttachments(context);
 
-            Assert.IsNotNull(result);
-            Assert.IsTrue(this.isEventHandlerInvoked);
-        }
+        Assert.IsNotNull(result);
+        Assert.IsTrue(_isEventHandlerInvoked);
+    }
 
-        [TestMethod]
-        public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfoOverLoaded1()
-        {
-            var filename = Path.Combine(TempDirectoryPath, "filename.txt");
-            File.WriteAllText(filename, string.Empty);
+    [TestMethod]
+    public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfoOverLoaded1()
+    {
+        var filename = Path.Combine(TempDirectoryPath, "filename.txt");
+        File.WriteAllText(filename, string.Empty);
 
-            var guid = Guid.NewGuid();
-            var sessionId = new SessionId(guid);
-            var context = new DataCollectionContext(sessionId);
+        var guid = Guid.NewGuid();
+        var sessionId = new SessionId(guid);
+        var context = new DataCollectionContext(sessionId);
 
-            this.dataCollectionSink.SendFileAsync(context, filename, false);
+        _dataCollectionSink.SendFileAsync(context, filename, false);
 
-            this.attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
-        }
+        _attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
+    }
 
-        [TestMethod]
-        public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfoOverLoaded2()
-        {
-            var filename = Path.Combine(TempDirectoryPath, "filename.txt");
-            File.WriteAllText(filename, string.Empty);
+    [TestMethod]
+    public void SendFileAsyncShouldInvokeAttachmentManagerWithValidFileTransferInfoOverLoaded2()
+    {
+        var filename = Path.Combine(TempDirectoryPath, "filename.txt");
+        File.WriteAllText(filename, string.Empty);
 
-            var guid = Guid.NewGuid();
-            var sessionId = new SessionId(guid);
-            var context = new DataCollectionContext(sessionId);
+        var guid = Guid.NewGuid();
+        var sessionId = new SessionId(guid);
+        var context = new DataCollectionContext(sessionId);
 
-            this.dataCollectionSink.SendFileAsync(context, filename, string.Empty, false);
+        _dataCollectionSink.SendFileAsync(context, filename, string.Empty, false);
 
-            this.attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
-        }
+        _attachmentManager.Verify(x => x.AddAttachment(It.IsAny<FileTransferInformation>(), It.IsAny<AsyncCompletedEventHandler>(), It.IsAny<Uri>(), It.IsAny<string>()), Times.Once());
+    }
 
-        void SendFileCompleted_Handler(object sender, AsyncCompletedEventArgs e)
-        {
-            this.isEventHandlerInvoked = true;
-        }
+    void SendFileCompleted_Handler(object? sender, AsyncCompletedEventArgs e)
+    {
+        _isEventHandlerInvoked = true;
     }
-}
\ No newline at end of file
+}
diff --git a/test/datacollector.UnitTests/datacollector.UnitTests.csproj b/test/datacollector.UnitTests/datacollector.UnitTests.csproj
index 8837003249..1d8cc619ae 100644
--- a/test/datacollector.UnitTests/datacollector.UnitTests.csproj
+++ b/test/datacollector.UnitTests/datacollector.UnitTests.csproj
@@ -1,28 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup Label="Configuration">
     <RootNamespace>Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests</RootNamespace>
   </PropertyGroup>
   <PropertyGroup>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
     <AssemblyName>datacollector.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\datacollector\datacollector.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/test/testhost.UnitTests/AppDomainEngineInvokerTests.cs b/test/testhost.UnitTests/AppDomainEngineInvokerTests.cs
index 4d75b7ec9c..81b1b9da2c 100644
--- a/test/testhost.UnitTests/AppDomainEngineInvokerTests.cs
+++ b/test/testhost.UnitTests/AppDomainEngineInvokerTests.cs
@@ -1,24 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace testhost.UnitTests
-{
 #if NETFRAMEWORK
-    using Microsoft.VisualStudio.TestPlatform.TestHost;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using System.IO;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-    using System.Xml.Linq;
-    using System.Text;
-
-    [TestClass]
-    public class AppDomainEngineInvokerTests
-    {
-        private const string XmlNamespace = "urn:schemas-microsoft-com:asm.v1";
-        private const string testHostConfigXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace testhost.UnitTests;
+
+[TestClass]
+public class AppDomainEngineInvokerTests
+{
+    private const string XmlNamespace = "urn:schemas-microsoft-com:asm.v1";
+    private const string TestHostConfigXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy=""true"">
     <supportedRuntime version=""v4.0"" sku="".NETFramework,Version=v4.0""/>
@@ -43,86 +44,86 @@ public class AppDomainEngineInvokerTests
   </appSettings>
 </configuration>
     ";
-        [TestMethod]
-        public void AppDomainEngineInvokerShouldCreateNewAppDomain()
-        {
-            var tempFile = Path.GetTempFileName();
-            var appDomainInvoker = new TestableEngineInvoker(tempFile);
+    [TestMethod]
+    public void AppDomainEngineInvokerShouldCreateNewAppDomain()
+    {
+        var tempFile = Path.GetTempFileName();
+        var appDomainInvoker = new TestableEngineInvoker(tempFile);
 
-            Assert.IsNotNull(appDomainInvoker.NewAppDomain, "New AppDomain must be created.");
-            Assert.IsNotNull(appDomainInvoker.ActualInvoker, "Invoker must be created.");
-            Assert.AreNotEqual(AppDomain.CurrentDomain.FriendlyName, appDomainInvoker.NewAppDomain.FriendlyName,
-                "New AppDomain must be different from default one.");
-        }
+        Assert.IsNotNull(appDomainInvoker.NewAppDomain, "New AppDomain must be created.");
+        Assert.IsNotNull(appDomainInvoker.ActualInvoker, "Invoker must be created.");
+        Assert.AreNotEqual(AppDomain.CurrentDomain.FriendlyName, appDomainInvoker.NewAppDomain.FriendlyName,
+            "New AppDomain must be different from default one.");
+    }
 
-        [TestMethod]
-        public void AppDomainEngineInvokerShouldInvokeEngineInNewDomainAndUseTestHostConfigFile()
-        {
-            var tempFile = Path.GetTempFileName();
-            var appDomainInvoker = new TestableEngineInvoker(tempFile);
+    [TestMethod]
+    public void AppDomainEngineInvokerShouldInvokeEngineInNewDomainAndUseTestHostConfigFile()
+    {
+        var tempFile = Path.GetTempFileName();
+        var appDomainInvoker = new TestableEngineInvoker(tempFile);
 
-            var newAppDomain = appDomainInvoker.NewAppDomain;
+        var newAppDomain = appDomainInvoker.NewAppDomain;
 
-            Assert.IsNotNull(newAppDomain, "New AppDomain must be created.");
-            Assert.IsNotNull(appDomainInvoker.ActualInvoker, "Invoker must be created.");
-            Assert.AreNotEqual(AppDomain.CurrentDomain.FriendlyName,
-                (appDomainInvoker.ActualInvoker as MockEngineInvoker).DomainFriendlyName,
-                "Engine must be invoked in new domain.");
+        Assert.IsNotNull(newAppDomain, "New AppDomain must be created.");
+        Assert.IsNotNull(appDomainInvoker.ActualInvoker, "Invoker must be created.");
+        Assert.AreNotEqual(AppDomain.CurrentDomain.FriendlyName,
+            (appDomainInvoker.ActualInvoker as MockEngineInvoker)?.DomainFriendlyName,
+            "Engine must be invoked in new domain.");
 
-            Assert.AreEqual(newAppDomain.SetupInformation.ConfigurationFile, AppDomain.CurrentDomain.SetupInformation.ConfigurationFile,
-                "TestHost config file must be used in the absence of user config file.");
-        }
+        Assert.AreEqual(newAppDomain.SetupInformation.ConfigurationFile, AppDomain.CurrentDomain.SetupInformation.ConfigurationFile,
+            "TestHost config file must be used in the absence of user config file.");
+    }
 
-        [TestMethod]
-        public void AppDomainEngineInvokerShouldUseTestHostStartupConfigAndRuntimeAfterMerging()
-        {
-            string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void AppDomainEngineInvokerShouldUseTestHostStartupConfigAndRuntimeAfterMerging()
+    {
+        string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
                                 <configuration>
                                     <startup>
                                         <supportedRuntime version=""v4.0"" sku="".NETFramework,Version=v4.5.2"" />
                                     </startup>
                                 </configuration>";
 
-            var doc = TestableEngineInvoker.MergeConfigXmls(appConfig, testHostConfigXml);
+        var doc = TestableEngineInvoker.MergeConfigXmls(appConfig, TestHostConfigXml);
 
-            var startupElements = doc.Descendants("startup");
+        var startupElements = doc.Descendants("startup");
 
-            Assert.AreEqual(1, startupElements.Count(), "Merged config must have only one 'startup' element");
+        Assert.AreEqual(1, startupElements.Count(), "Merged config must have only one 'startup' element");
 
-            var supportedRuntimeXml = startupElements.First().Descendants("supportedRuntime").FirstOrDefault()?.ToString();
-            Assert.AreEqual(@"<supportedRuntime version=""v4.0"" sku="".NETFramework,Version=v4.0"" />", supportedRuntimeXml,
-                "TestHost Supported Runtime must be used on merging");
+        var supportedRuntimeXml = startupElements.First().Descendants("supportedRuntime").FirstOrDefault()?.ToString();
+        Assert.AreEqual(@"<supportedRuntime version=""v4.0"" sku="".NETFramework,Version=v4.0"" />", supportedRuntimeXml,
+            "TestHost Supported Runtime must be used on merging");
 
-            var runtimeEle = doc.Descendants("runtime").FirstOrDefault();
-            Assert.IsNotNull(runtimeEle, "Runtime element must be present");
+        var runtimeEle = doc.Descendants("runtime").FirstOrDefault();
+        Assert.IsNotNull(runtimeEle, "Runtime element must be present");
 
-            var legacyUnhandledEleExpectedXml = @"<legacyUnhandledExceptionPolicy enabled=""1"" />";
+        var legacyUnhandledEleExpectedXml = @"<legacyUnhandledExceptionPolicy enabled=""1"" />";
 
-            Assert.AreEqual(legacyUnhandledEleExpectedXml, runtimeEle.Descendants("legacyUnhandledExceptionPolicy").First()?.ToString(),
-                "legacyUnhandledExceptionPolicy element must be of the TestHost one.");
+        Assert.AreEqual(legacyUnhandledEleExpectedXml, runtimeEle.Descendants("legacyUnhandledExceptionPolicy").First()?.ToString(),
+            "legacyUnhandledExceptionPolicy element must be of the TestHost one.");
 
-            Assert.IsFalse(runtimeEle.ToString().Contains("probing"), "Probing element of TestHost must not be present.");
+        Assert.IsFalse(runtimeEle.ToString().Contains("probing"), "Probing element of TestHost must not be present.");
 
-            var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
-            var mergedDocAssemblyBindingNodes = runtimeEle.Descendants(assemblyBindingXName);
-            Assert.AreEqual(1, mergedDocAssemblyBindingNodes.Count(), "AssemblyRedirect of TestHost must be present.");
+        var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
+        var mergedDocAssemblyBindingNodes = runtimeEle.Descendants(assemblyBindingXName);
+        Assert.AreEqual(1, mergedDocAssemblyBindingNodes.Count(), "AssemblyRedirect of TestHost must be present.");
 
-            var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
-            var dependentAssemblyNodes = mergedDocAssemblyBindingNodes.First().Descendants(dependentAssemblyXName);
-            Assert.AreEqual(1, dependentAssemblyNodes.Count(), "AssemblyRedirect of TestHost must be present.");
-            Assert.IsTrue(dependentAssemblyNodes.First().ToString().Contains("Microsoft.VisualStudio.TestPlatform.ObjectModel"), "Correct AssemblyRedirect must be present.");
+        var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
+        var dependentAssemblyNodes = mergedDocAssemblyBindingNodes.First().Descendants(dependentAssemblyXName);
+        Assert.AreEqual(1, dependentAssemblyNodes.Count(), "AssemblyRedirect of TestHost must be present.");
+        Assert.IsTrue(dependentAssemblyNodes.First().ToString().Contains("Microsoft.VisualStudio.TestPlatform.ObjectModel"), "Correct AssemblyRedirect must be present.");
 
-            var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
-            var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
+        var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
+        var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
 
-            Assert.IsNull(diagEle, "No Diagnostics element must be present as user config does not have it.");
-            Assert.IsNull(appSettingsEle, "No AppSettings element must be present as user config does not have it.");
-        }
+        Assert.IsNull(diagEle, "No Diagnostics element must be present as user config does not have it.");
+        Assert.IsNull(appSettingsEle, "No AppSettings element must be present as user config does not have it.");
+    }
 
-        [TestMethod]
-        public void AppDomainEngineInvokerShouldOnlyMergeAssemblyRedirectionsFromTestHost()
-        {
-            string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void AppDomainEngineInvokerShouldOnlyMergeAssemblyRedirectionsFromTestHost()
+    {
+        string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
                                 <configuration>
                                   <runtime>
                                      <assemblyBinding xmlns=""urn:schemas-microsoft-com:asm.v1"">
@@ -135,39 +136,39 @@ public void AppDomainEngineInvokerShouldOnlyMergeAssemblyRedirectionsFromTestHos
                                   </runtime>
                                 </configuration>";
 
-            var doc = TestableEngineInvoker.MergeConfigXmls(appConfig, testHostConfigXml);
+        var doc = TestableEngineInvoker.MergeConfigXmls(appConfig, TestHostConfigXml);
 
-            var runtimeEle = doc.Descendants("runtime").FirstOrDefault();
+        var runtimeEle = doc.Descendants("runtime").FirstOrDefault();
 
-            Assert.AreEqual(0, runtimeEle.Descendants("legacyUnhandledExceptionPolicy").Count(), "legacyUnhandledExceptionPolicy element must NOT be present.");
+        Assert.AreEqual(0, runtimeEle.Descendants("legacyUnhandledExceptionPolicy").Count(), "legacyUnhandledExceptionPolicy element must NOT be present.");
 
-            var probingXName = XName.Get("probing", XmlNamespace);
-            var probingEleNodes = runtimeEle.Descendants(probingXName);
-            Assert.AreEqual(1, probingEleNodes.Count(), "Only one Probing element of UserConfig must be present.");
-            Assert.AreEqual(@"<probing privatePath=""TestProbing"" xmlns=""urn:schemas-microsoft-com:asm.v1"" />", probingEleNodes.First().ToString(), "Probing element must be correct.");
+        var probingXName = XName.Get("probing", XmlNamespace);
+        var probingEleNodes = runtimeEle.Descendants(probingXName);
+        Assert.AreEqual(1, probingEleNodes.Count(), "Only one Probing element of UserConfig must be present.");
+        Assert.AreEqual(@"<probing privatePath=""TestProbing"" xmlns=""urn:schemas-microsoft-com:asm.v1"" />", probingEleNodes.First().ToString(), "Probing element must be correct.");
 
-            var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
-            var mergedDocAssemblyBindingNodes = runtimeEle.Descendants(assemblyBindingXName);
-            Assert.AreEqual(1, mergedDocAssemblyBindingNodes.Count(), "AssemblyBinding Ele must be present.");
+        var assemblyBindingXName = XName.Get("assemblyBinding", XmlNamespace);
+        var mergedDocAssemblyBindingNodes = runtimeEle.Descendants(assemblyBindingXName);
+        Assert.AreEqual(1, mergedDocAssemblyBindingNodes.Count(), "AssemblyBinding Ele must be present.");
 
-            var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
-            var dependentAssemblyNodes = mergedDocAssemblyBindingNodes.First().Descendants(dependentAssemblyXName);
-            Assert.AreEqual(2, dependentAssemblyNodes.Count(), "AssemblyBinding of TestHost must be present.");
+        var dependentAssemblyXName = XName.Get("dependentAssembly", XmlNamespace);
+        var dependentAssemblyNodes = mergedDocAssemblyBindingNodes.First().Descendants(dependentAssemblyXName);
+        Assert.AreEqual(2, dependentAssemblyNodes.Count(), "AssemblyBinding of TestHost must be present.");
 
-            Assert.IsTrue(dependentAssemblyNodes.ElementAt(0).ToString().Contains("Microsoft.VisualStudio.UnitTests"), "First AssemblyRedirect must be of UserConfig.");
-            Assert.IsTrue(dependentAssemblyNodes.ElementAt(1).ToString().Contains("Microsoft.VisualStudio.TestPlatform.ObjectModel"), "Second AssemblyRedirect must be from TestHost Node.");
+        Assert.IsTrue(dependentAssemblyNodes.ElementAt(0).ToString().Contains("Microsoft.VisualStudio.UnitTests"), "First AssemblyRedirect must be of UserConfig.");
+        Assert.IsTrue(dependentAssemblyNodes.ElementAt(1).ToString().Contains("Microsoft.VisualStudio.TestPlatform.ObjectModel"), "Second AssemblyRedirect must be from TestHost Node.");
 
-            var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
-            var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
+        var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
+        var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
 
-            Assert.IsNull(diagEle, "No Diagnostics element must be present as user config does not have it.");
-            Assert.IsNull(appSettingsEle, "No AppSettings element must be present as user config does not have it.");
-        }
+        Assert.IsNull(diagEle, "No Diagnostics element must be present as user config does not have it.");
+        Assert.IsNull(appSettingsEle, "No AppSettings element must be present as user config does not have it.");
+    }
 
-        [TestMethod]
-        public void AppDomainEngineInvokerShouldUseDiagAndAppSettingsElementsUnMergedFromUserConfig()
-        {
-            string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void AppDomainEngineInvokerShouldUseDiagAndAppSettingsElementsUnMergedFromUserConfig()
+    {
+        string appConfig = @"<?xml version=""1.0"" encoding=""utf-8""?>
                                 <configuration>
                                   <system.diagnostics>
                                     <switches>
@@ -179,52 +180,51 @@ public void AppDomainEngineInvokerShouldUseDiagAndAppSettingsElementsUnMergedFro
                                   </appSettings>
                                 </configuration>";
 
-            var doc = TestableEngineInvoker.MergeConfigXmls(appConfig,testHostConfigXml);
+        var doc = TestableEngineInvoker.MergeConfigXmls(appConfig, TestHostConfigXml);
 
-            var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
-            var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
+        var diagEle = doc.Descendants("system.diagnostics").FirstOrDefault();
+        var appSettingsEle = doc.Descendants("appSettings").FirstOrDefault();
 
-            Assert.IsNotNull(diagEle, "Diagnostics element must be retained from user config.");
-            Assert.IsNotNull(appSettingsEle, "AppSettings element must be retained from user config.");
+        Assert.IsNotNull(diagEle, "Diagnostics element must be retained from user config.");
+        Assert.IsNotNull(appSettingsEle, "AppSettings element must be retained from user config.");
 
-            var diagAddNodes = diagEle.Descendants("add");
-            Assert.AreEqual(1, diagAddNodes.Count(), "Only switches from user config should be present.");
-            Assert.AreEqual(@"<add name=""SampleSwitch"" value=""1"" />", diagAddNodes.First().ToString(),
-                "Correct Switch must be merged.");
+        var diagAddNodes = diagEle.Descendants("add");
+        Assert.AreEqual(1, diagAddNodes.Count(), "Only switches from user config should be present.");
+        Assert.AreEqual(@"<add name=""SampleSwitch"" value=""1"" />", diagAddNodes.First().ToString(),
+            "Correct Switch must be merged.");
 
-            var appSettingsAddNodes = appSettingsEle.Descendants("add");
-            Assert.AreEqual(1, appSettingsAddNodes.Count(), "Only switches from user config should be present.");
-            Assert.AreEqual(@"<add key=""SampleKey"" value=""SampleValue"" />", appSettingsAddNodes.First().ToString(),
-                "Correct Switch must be merged.");
+        var appSettingsAddNodes = appSettingsEle.Descendants("add");
+        Assert.AreEqual(1, appSettingsAddNodes.Count(), "Only switches from user config should be present.");
+        Assert.AreEqual(@"<add key=""SampleKey"" value=""SampleValue"" />", appSettingsAddNodes.First().ToString(),
+            "Correct Switch must be merged.");
+    }
+
+    private class TestableEngineInvoker : AppDomainEngineInvoker<MockEngineInvoker>
+    {
+        public TestableEngineInvoker(string testSourcePath) : base(testSourcePath)
+        {
         }
 
-        private class TestableEngineInvoker : AppDomainEngineInvoker<MockEngineInvoker>
+        public static XDocument MergeConfigXmls(string userConfigText, string testHostConfigText)
         {
-            public TestableEngineInvoker(string testSourcePath) : base(testSourcePath)
-            {
-            }
+            return MergeApplicationConfigFiles(
+                XDocument.Load(new MemoryStream(Encoding.UTF8.GetBytes(userConfigText))),
+                XDocument.Load(new MemoryStream(Encoding.UTF8.GetBytes(testHostConfigText))));
+        }
 
-            public static XDocument MergeConfigXmls(string userConfigText, string testHostConfigText)
-            {
-                return MergeApplicationConfigFiles(
-                    XDocument.Load(new MemoryStream(Encoding.UTF8.GetBytes(userConfigText))),
-                    XDocument.Load(new MemoryStream(Encoding.UTF8.GetBytes(testHostConfigText))));
-            }
+        public AppDomain NewAppDomain => _appDomain;
 
-            public AppDomain NewAppDomain => this.appDomain;
+        public IEngineInvoker ActualInvoker => _actualInvoker;
+    }
 
-            public IEngineInvoker ActualInvoker => this.actualInvoker;
-        }
+    private class MockEngineInvoker : MarshalByRefObject, IEngineInvoker
+    {
+        public string DomainFriendlyName { get; private set; } = "";
 
-        private class MockEngineInvoker : MarshalByRefObject, IEngineInvoker
+        public void Invoke(IDictionary<string, string?> argsDictionary)
         {
-            public string DomainFriendlyName { get; private set; }
-
-            public void Invoke(IDictionary<string, string> argsDictionary)
-            {
-                this.DomainFriendlyName = AppDomain.CurrentDomain.FriendlyName;
-            }
+            DomainFriendlyName = AppDomain.CurrentDomain.FriendlyName;
         }
     }
+}
 #endif
-}
\ No newline at end of file
diff --git a/test/testhost.UnitTests/DefaultEngineInvokerTests.cs b/test/testhost.UnitTests/DefaultEngineInvokerTests.cs
index 34fb8c9a31..ce72b43937 100644
--- a/test/testhost.UnitTests/DefaultEngineInvokerTests.cs
+++ b/test/testhost.UnitTests/DefaultEngineInvokerTests.cs
@@ -1,137 +1,136 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace testhost.UnitTests
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace testhost.UnitTests;
+
+[TestClass]
+public class DefaultEngineInvokerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.TestHost;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    using CommunicationUtilitiesResources =
-        Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
-    using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
-
-    [TestClass]
-    public class DefaultEngineInvokerTests
+    private const int ParentProcessId = 27524;
+    private static readonly IDictionary<string, string?> ArgsDictionary = new Dictionary<string, string?>
     {
-        private const int ParentProcessId = 27524;
-        private static readonly IDictionary<string, string> argsDictionary = new Dictionary<string, string>
-        {
-            { "--port", "21291" },
-            { "--endpoint", "127.0.0.1:021291"  },
-            { "--role", "client"},
-            { "--parentprocessid", ParentProcessId.ToString() },
-            { "--diag", "temp.txt"},
-            { "--tracelevel", "3"},
-            { "--telemetryoptedin", "false"},
-            { "--datacollectionport", "21290"}
-        };
-        private static readonly string TimoutErrorMessage =
-            "testhost process failed to connect to datacollector process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
-
-        private Mock<ITestRequestHandler> mockTestRequestHandler;
-        private Mock<IDataCollectionTestCaseEventSender> mockDataCollectionTestCaseEventSender;
-        private Mock<IProcessHelper> mockProcssHelper;
-        private DefaultEngineInvoker engineInvoker;
-
-        public DefaultEngineInvokerTests()
-        {
-            this.mockDataCollectionTestCaseEventSender = new Mock<IDataCollectionTestCaseEventSender>();
-            this.mockTestRequestHandler = new Mock<ITestRequestHandler>();
-            this.mockProcssHelper = new Mock<IProcessHelper>();
-            this.engineInvoker = new DefaultEngineInvoker(
-                this.mockTestRequestHandler.Object,
-                this.mockDataCollectionTestCaseEventSender.Object,
-                this.mockProcssHelper.Object);
-            this.mockTestRequestHandler.Setup(h => h.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
-            this.mockDataCollectionTestCaseEventSender.Setup(s => s.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
-        }
+        { "--port", "21291" },
+        { "--endpoint", "127.0.0.1:021291"  },
+        { "--role", "client"},
+        { "--parentprocessid", ParentProcessId.ToString(CultureInfo.InvariantCulture) },
+        { "--diag", "temp.txt"},
+        { "--tracelevel", "3"},
+        { "--telemetryoptedin", "false"},
+        { "--datacollectionport", "21290"}
+    };
+    private static readonly string TimeoutErrorMessage =
+        "testhost process failed to connect to datacollector process after 90 seconds. This may occur due to machine slowness, please set environment variable VSTEST_CONNECTION_TIMEOUT to increase timeout.";
+
+    private readonly Mock<ITestRequestHandler> _mockTestRequestHandler;
+    private readonly Mock<IDataCollectionTestCaseEventSender> _mockDataCollectionTestCaseEventSender;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly DefaultEngineInvoker _engineInvoker;
+
+    public DefaultEngineInvokerTests()
+    {
+        _mockDataCollectionTestCaseEventSender = new Mock<IDataCollectionTestCaseEventSender>();
+        _mockTestRequestHandler = new Mock<ITestRequestHandler>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _engineInvoker = new DefaultEngineInvoker(
+            _mockTestRequestHandler.Object,
+            _mockDataCollectionTestCaseEventSender.Object,
+            _mockProcessHelper.Object);
+        _mockTestRequestHandler.Setup(h => h.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
+        _mockDataCollectionTestCaseEventSender.Setup(s => s.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(true);
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, string.Empty);
+    }
 
-        [TestMethod]
-        public void InvokeShouldWaitForDefaultTimeoutIfNoEnvVariableSetDuringDataCollectorConnection()
-        {
-            this.engineInvoker.Invoke(argsDictionary);
+    [TestMethod]
+    public void InvokeShouldWaitForDefaultTimeoutIfNoEnvVariableSetDuringDataCollectorConnection()
+    {
+        _engineInvoker.Invoke(ArgsDictionary);
 
-            this.mockDataCollectionTestCaseEventSender.Verify(s => s.WaitForRequestSenderConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
-        }
+        _mockDataCollectionTestCaseEventSender.Verify(s => s.WaitForRequestSenderConnection(EnvironmentHelper.DefaultConnectionTimeout * 1000));
+    }
 
-        [TestMethod]
-        public void InvokeShouldWaitBasedOnTimeoutEnvVariableDuringDataCollectorConnection()
-        {
-            var timeout = 10;
-            Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString());
-            this.engineInvoker.Invoke(argsDictionary);
+    [TestMethod]
+    public void InvokeShouldWaitBasedOnTimeoutEnvVariableDuringDataCollectorConnection()
+    {
+        var timeout = 10;
+        Environment.SetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout, timeout.ToString(CultureInfo.InvariantCulture));
+        _engineInvoker.Invoke(ArgsDictionary);
 
-            this.mockDataCollectionTestCaseEventSender.Verify(s => s.WaitForRequestSenderConnection(timeout * 1000));
-        }
+        _mockDataCollectionTestCaseEventSender.Verify(s => s.WaitForRequestSenderConnection(timeout * 1000));
+    }
 
-        [TestMethod]
-        public void InvokeShouldThrowExceptionIfDataCollectorConnection()
-        {
-            this.mockDataCollectionTestCaseEventSender.Setup(s => s.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(false);
-            var message = Assert.ThrowsException<TestPlatformException>(() => this.engineInvoker.Invoke(argsDictionary)).Message;
+    [TestMethod]
+    public void InvokeShouldThrowExceptionIfDataCollectorConnection()
+    {
+        _mockDataCollectionTestCaseEventSender.Setup(s => s.WaitForRequestSenderConnection(It.IsAny<int>())).Returns(false);
+        var message = Assert.ThrowsException<TestPlatformException>(() => _engineInvoker.Invoke(ArgsDictionary)).Message;
 
-            Assert.AreEqual(message, DefaultEngineInvokerTests.TimoutErrorMessage);
-        }
+        Assert.AreEqual(message, TimeoutErrorMessage);
+    }
 
-        [TestMethod]
-        public void InvokeShouldSetParentProcessExistCallback()
-        {
-            this.engineInvoker.Invoke(argsDictionary);
+    [TestMethod]
+    public void InvokeShouldSetParentProcessExistCallback()
+    {
+        _engineInvoker.Invoke(ArgsDictionary);
 
-            this.mockProcssHelper.Verify(h => h.SetExitCallback(ParentProcessId, It.IsAny<Action<object>>()));
-        }
+        _mockProcessHelper.Verify(h => h.SetExitCallback(ParentProcessId, It.IsAny<Action<object?>>()));
+    }
 
-        [TestMethod]
-        public void InvokeShouldInitializeTraceWithCorrectTraceLevel()
-        {
-            // Setting EqtTrace.TraceLevel to a value other than info.
+    [TestMethod]
+    public void InvokeShouldInitializeTraceWithCorrectTraceLevel()
+    {
+        // Setting EqtTrace.TraceLevel to a value other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
 
-            this.engineInvoker.Invoke(argsDictionary);
+        _engineInvoker.Invoke(ArgsDictionary);
 
-            // Verify
-            Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
-        }
+        // Verify
+        Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
+    }
 
-        [TestMethod]
-        public void InvokeShouldInitializeTraceWithVerboseTraceLevelIfInvalidTraceLevelPassed()
-        {
-            // Setting EqtTrace.TraceLevel to a value other than info.
+    [TestMethod]
+    public void InvokeShouldInitializeTraceWithVerboseTraceLevelIfInvalidTraceLevelPassed()
+    {
+        // Setting EqtTrace.TraceLevel to a value other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Warning;
+        EqtTrace.TraceLevel = TraceLevel.Warning;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Warning;
 #endif
 
-            try
-            {
-                argsDictionary["--tracelevel"] = "5"; // int value which is not defined in TraceLevel.
-                this.engineInvoker.Invoke(argsDictionary);
-            }
-            finally{
-                argsDictionary["--tracelevel"] = "3"; // Setting to default value of 3.
-            }
-
-            // Verify
-            Assert.AreEqual(TraceLevel.Verbose, (TraceLevel)EqtTrace.TraceLevel);
+        try
+        {
+            ArgsDictionary["--tracelevel"] = "5"; // int value which is not defined in TraceLevel.
+            _engineInvoker.Invoke(ArgsDictionary);
+        }
+        finally
+        {
+            ArgsDictionary["--tracelevel"] = "3"; // Setting to default value of 3.
         }
+
+        // Verify
+        Assert.AreEqual(TraceLevel.Verbose, (TraceLevel)EqtTrace.TraceLevel);
     }
 }
diff --git a/test/testhost.UnitTests/DummyTests.cs b/test/testhost.UnitTests/DummyTests.cs
index d7d43bd873..e241f2c1f4 100644
--- a/test/testhost.UnitTests/DummyTests.cs
+++ b/test/testhost.UnitTests/DummyTests.cs
@@ -1,19 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace testhost.UnitTests
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace testhost.UnitTests;
 
-    [TestClass]
-    public class DummyTests
+[TestClass]
+public class DummyTests
+{
+    /// <summary>
+    /// This test is added as at least one test is required for dotnet core tfm for test scripts to succeed.
+    /// </summary>
+    [TestMethod]
+    public void DummyUnitTest()
     {
-        /// <summary>
-        /// This test is added as at least one test is required for dotnet core tfm for test scripts to succeed.
-        /// </summary>
-        [TestMethod]
-        public void DummyUnitTest()
-        {
-        }
     }
 }
diff --git a/test/testhost.UnitTests/GlobalSuppressions.cs b/test/testhost.UnitTests/GlobalSuppressions.cs
new file mode 100644
index 0000000000..3294d71d53
--- /dev/null
+++ b/test/testhost.UnitTests/GlobalSuppressions.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>", Scope = "namespace", Target = "~N:testhost.UnitTests")]
diff --git a/test/testhost.UnitTests/Program.cs b/test/testhost.UnitTests/Program.cs
deleted file mode 100644
index f51a7b7fe2..0000000000
--- a/test/testhost.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace testhost.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/testhost.UnitTests/Properties/AssemblyInfo.cs b/test/testhost.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index d62a61680b..0000000000
--- a/test/testhost.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("testhost.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("124dd88e-5283-4737-8395-d7c1facbfbb9")]
diff --git a/test/testhost.UnitTests/TestHostTraceListenerTests.cs b/test/testhost.UnitTests/TestHostTraceListenerTests.cs
index fa070f1e59..ef2624f54a 100644
--- a/test/testhost.UnitTests/TestHostTraceListenerTests.cs
+++ b/test/testhost.UnitTests/TestHostTraceListenerTests.cs
@@ -1,159 +1,161 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-// define trace and debug to trigger the Debug.Assert calls even when we build in Release
+// define trace and debug to trigger the TPDebug.Assert calls even when we build in Release
 #define DEBUG
 
-namespace testhost.UnitTests
-{
 #if NETCOREAPP
-    using Microsoft.VisualStudio.TestPlatform.TestHost;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System.Collections.Generic;
-    using System.Diagnostics;
 
-    [TestClass]
-    public class TestHostTraceListenerTests
-    {
-        TraceListener[] listeners;
+using System.Collections.Generic;
+using System.Diagnostics;
 
-        [TestInitialize()]
-        public void Initialize()
-        {
-            this.listeners = new TraceListener[Trace.Listeners.Count];
-            Trace.Listeners.CopyTo(this.listeners, 0);
-            // not using the TestHostTraceListener.Setup method here
-            // because that detects only default trace listeners and there won't
-            // be any when this is in production, so this would end up testing against
-            // an older version of the trace listener
-            Trace.Listeners.Clear();
-            Trace.Listeners.Add(new TestHostTraceListener());
-        }
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        [TestCleanup()]
-        public void Cleanup() {
-            Trace.Listeners.Clear();
-            foreach(var listener in this.listeners)
-            {
-                Trace.Listeners.Add(listener);
-            }
-        }
+namespace testhost.UnitTests;
 
-        [TestMethod]
-        [ExpectedException(typeof(DebugAssertException))]
-        public void DebugAssertThrowsDebugAssertException()
-        {
-            Debug.Assert(false);
-        }
+[TestClass]
+public class TestHostTraceListenerTests
+{
+    private readonly TraceListener[] _listeners;
 
-        [TestMethod]
-        [ExpectedException(typeof(DebugAssertException))]
-        public void DebugFailThrowsDebugAssertException()
-        {
-            Debug.Fail("fail");
-        }
+    public TestHostTraceListenerTests()
+    {
+        _listeners = new TraceListener[Trace.Listeners.Count];
+        Trace.Listeners.CopyTo(_listeners, 0);
+        // not using the TestHostTraceListener.Setup method here
+        // because that detects only default trace listeners and there won't
+        // be any when this is in production, so this would end up testing against
+        // an older version of the trace listener
+        Trace.Listeners.Clear();
+        Trace.Listeners.Add(new TestHostTraceListener());
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(DebugAssertException))]
-        public void TraceAssertThrowsDebugAssertException()
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Trace.Listeners.Clear();
+        foreach (var listener in _listeners)
         {
-            Trace.Assert(false);
+            Trace.Listeners.Add(listener);
         }
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(DebugAssertException))]
-        public void TraceFailThrowsDebugAssertException()
-        {
-            Trace.Fail("fail");
-        }
+    [TestMethod]
+    [ExpectedException(typeof(DebugAssertException))]
+    public void DebugAssertThrowsDebugAssertException()
+    {
+        Debug.Assert(false);
+    }
 
-        [TestMethod]
-        public void TraceWriteDoesNotFailTheTest()
-        {
-            Trace.Write("hello");
-        }
+    [TestMethod]
+    [ExpectedException(typeof(DebugAssertException))]
+    public void DebugFailThrowsDebugAssertException()
+    {
+        Debug.Fail("fail");
+    }
 
-        [TestMethod]
-        public void TraceWriteLineDoesNotFailTheTest()
-        {
-            Trace.WriteLine("hello");
-        }
+    [TestMethod]
+    [ExpectedException(typeof(DebugAssertException))]
+    public void TraceAssertThrowsDebugAssertException()
+    {
+        Trace.Assert(false);
+    }
 
-        [TestMethod]
-        public void DebugWriteDoesNotFailTheTest()
-        {
-            Debug.Write("hello");
-        }
+    [TestMethod]
+    [ExpectedException(typeof(DebugAssertException))]
+    public void TraceFailThrowsDebugAssertException()
+    {
+        Trace.Fail("fail");
+    }
 
-        [TestMethod]
-        public void DebugWriteLineDoesNotFailTheTest()
-        {
-            Debug.WriteLine("hello");
-        }
+    [TestMethod]
+    public void TraceWriteDoesNotFailTheTest()
+    {
+        Trace.Write("hello");
     }
 
-    [TestClass]
-    public class TestHostTraceListenerRegistrationTests
+    [TestMethod]
+    public void TraceWriteLineDoesNotFailTheTest()
     {
-        TraceListener[] listeners;
+        Trace.WriteLine("hello");
+    }
 
-        [TestInitialize()]
-        public void Initialize()
-        {
-            this.listeners = new TraceListener[Trace.Listeners.Count];
-            Trace.Listeners.CopyTo(this.listeners, 0);
-        }
+    [TestMethod]
+    public void DebugWriteDoesNotFailTheTest()
+    {
+        Debug.Write("hello");
+    }
 
-        [TestCleanup()]
-        public void Cleanup()
-        {
-            Trace.Listeners.Clear();
-            foreach (var listener in this.listeners)
-            {
-                Trace.Listeners.Add(listener);
-            }
-        }
+    [TestMethod]
+    public void DebugWriteLineDoesNotFailTheTest()
+    {
+        Debug.WriteLine("hello");
+    }
+}
+
+[TestClass]
+public class TestHostTraceListenerRegistrationTests
+{
+    private readonly TraceListener[] _listeners;
+
+    public TestHostTraceListenerRegistrationTests()
+    {
+        _listeners = new TraceListener[Trace.Listeners.Count];
+        Trace.Listeners.CopyTo(_listeners, 0);
+    }
 
-        [TestMethod]
-        public void SetupReplacesDefaultTraceListener()
+    [TestCleanup]
+    public void Cleanup()
+    {
+        Trace.Listeners.Clear();
+        foreach (var listener in _listeners)
         {
-            Trace.Listeners.Clear();
-            Trace.Listeners.Add(new DefaultTraceListener());
-            TestHostTraceListener.Setup();
-
-            // this is what will happen in the majority of cases, there will be a single
-            // trace listener that will be the default trace listener and we will replace it
-            // with ours
-            Assert.IsInstanceOfType(Trace.Listeners[0], typeof(TestHostTraceListener));
+            Trace.Listeners.Add(listener);
         }
+    }
 
-        [TestMethod]
-        public void SetupKeepsNonDefaultTraceListeners()
+    [TestMethod]
+    public void SetupReplacesDefaultTraceListener()
+    {
+        Trace.Listeners.Clear();
+        Trace.Listeners.Add(new DefaultTraceListener());
+        TestHostTraceListener.Setup();
+
+        // this is what will happen in the majority of cases, there will be a single
+        // trace listener that will be the default trace listener and we will replace it
+        // with ours
+        Assert.IsInstanceOfType(Trace.Listeners[0], typeof(TestHostTraceListener));
+    }
+
+    [TestMethod]
+    public void SetupKeepsNonDefaultTraceListeners()
+    {
+        Trace.Listeners.Clear();
+        Trace.Listeners.Add(new DummyTraceListener());
+        Trace.Listeners.Add(new DefaultTraceListener());
+        Trace.Listeners.Add(new DummyTraceListener());
+        TestHostTraceListener.Setup();
+
+        Assert.IsInstanceOfType(Trace.Listeners[0], typeof(DummyTraceListener));
+        Assert.IsInstanceOfType(Trace.Listeners[1], typeof(TestHostTraceListener));
+        Assert.IsInstanceOfType(Trace.Listeners[2], typeof(DummyTraceListener));
+    }
+
+    private class DummyTraceListener : TraceListener
+    {
+        public List<string?> Lines { get; } = new();
+
+        public override void Write(string? message)
         {
-            Trace.Listeners.Clear();
-            Trace.Listeners.Add(new DummyTraceListener());
-            Trace.Listeners.Add(new DefaultTraceListener());
-            Trace.Listeners.Add(new DummyTraceListener());
-            TestHostTraceListener.Setup();
-
-            Assert.IsInstanceOfType(Trace.Listeners[0], typeof(DummyTraceListener));
-            Assert.IsInstanceOfType(Trace.Listeners[1], typeof(TestHostTraceListener));
-            Assert.IsInstanceOfType(Trace.Listeners[2], typeof(DummyTraceListener));
+            Lines.Add(message);
         }
 
-        private class DummyTraceListener : TraceListener
+        public override void WriteLine(string? message)
         {
-            public List<string> Lines { get; } = new List<string>();
-            public override void Write(string message)
-            {
-                Lines.Add(message);
-            }
-
-            public override void WriteLine(string message)
-            {
-                Lines.Add(message);
-            }
+            Lines.Add(message);
         }
     }
-#endif
 }
+
+#endif
diff --git a/test/testhost.UnitTests/UnitTestClientTests.cs b/test/testhost.UnitTests/UnitTestClientTests.cs
index 840e526daa..e3c43ac440 100644
--- a/test/testhost.UnitTests/UnitTestClientTests.cs
+++ b/test/testhost.UnitTests/UnitTestClientTests.cs
@@ -1,44 +1,116 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.TestExecutor.Tests
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.TestHost;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.TestExecutor.Tests;
+
+[TestClass]
+public class UnitTestClientTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    [TestMethod]
+    public void SplitArgumentsShouldHonorDoubleQuotes()
+    {
+        var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "\"abc txt\"" };
+        var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag \"abc txt\"";
+        string[] argsArr = UnitTestClient.SplitArguments(argument);
+
+        Assert.AreEqual(6, argsArr.Length);
+        CollectionAssert.AreEqual(argsArr, expected);
+    }
+
+    [TestMethod]
+    public void SplitArgumentsShouldHonorSingleQuotes()
+    {
+        var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "\'abc txt\'" };
+        var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag \'abc txt\'";
+        string[] argsArr = UnitTestClient.SplitArguments(argument);
+
+        Assert.AreEqual(6, argsArr.Length);
+        CollectionAssert.AreEqual(expected, argsArr);
+    }
+
+    [TestMethod]
+    public void SplitArgumentsShouldSplitAtSpacesOutsideOfQuotes()
+    {
+        var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "abc", "txt" };
+        var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag abc txt";
+        string[] argsArr = UnitTestClient.SplitArguments(argument);
+
+        Assert.AreEqual(7, argsArr.Length);
+        CollectionAssert.AreEqual(expected, argsArr);
+    }
 
-    [TestClass]
-    public class UnitTestClientTests
+    [TestMethod]
+    public void RunWhenCliUiLanguageIsSetChangesCultureAndFlowsOverride()
     {
-        [TestMethod]
-        public void SplitArgumentsShouldHonorDoubleQuotes()
-        {
-            var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "\"abc txt\"" };
-            var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag \"abc txt\"";
-            string[] argsArr = UnitTestClient.SplitArguments(argument);
-
-            Assert.AreEqual(6, argsArr.Length);
-            CollectionAssert.AreEqual(argsArr, expected);
-        }
-
-        [TestMethod]
-        public void SplitArgumentsShouldHonorSingleQuotes()
-        {
-            var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "\'abc txt\'" };
-            var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag \'abc txt\'";
-            string[] argsArr = UnitTestClient.SplitArguments(argument);
-
-            Assert.AreEqual(6, argsArr.Length);
-            CollectionAssert.AreEqual(expected, argsArr);
-        }
-
-        [TestMethod]
-        public void SplitArgumentsShouldSplitAtSpacesOutsideOfQuotes()
-        {
-            var expected = new string[] { "--port", "8080", "--endpoint", "127.0.0.1:8020", "--diag", "abc", "txt" };
-            var argument = "--port 8080 --endpoint 127.0.0.1:8020 --diag abc txt";
-            string[] argsArr = UnitTestClient.SplitArguments(argument);
-
-            Assert.AreEqual(7, argsArr.Length);
-            CollectionAssert.AreEqual(expected, argsArr);
-        }
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE")).Returns(culture.Name);
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        Assert.ThrowsException<ArgumentException>(() => Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture))));
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", culture.LCID.ToString(CultureInfo.InvariantCulture)), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenVsLangIsSetChangesCultureAndFlowsOverride()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("VSLANG")).Returns(culture.LCID.ToString(CultureInfo.InvariantCulture));
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        Assert.ThrowsException<ArgumentException>(() => Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture))));
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", culture.Name), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenNoCultureEnvVarSetDoesNotChangeCultureNorFlowsOverride()
+    {
+        // Arrange
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable(It.IsAny<string>())).Returns(default(string));
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        Assert.ThrowsException<ArgumentException>(() => Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = true)));
+
+        // Assert
+        Assert.IsFalse(threadCultureWasSet, "DefaultThreadCurrentUICulture was set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Never);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", It.IsAny<string>()), Times.Never);
     }
 }
diff --git a/test/testhost.UnitTests/testhost.UnitTests.csproj b/test/testhost.UnitTests/testhost.UnitTests.csproj
index 48525ba029..fd26e4ce51 100644
--- a/test/testhost.UnitTests/testhost.UnitTests.csproj
+++ b/test/testhost.UnitTests/testhost.UnitTests.csproj
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>testhost.UnitTests</AssemblyName>
-    <PlatformTarget Condition="'$(TargetFramework)' == 'net451'">x64</PlatformTarget>
+    <PlatformTarget Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)'))">x64</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
+
 </Project>
diff --git a/test/vstest.ProgrammerTests/BasicRunAndDiscovery.cs b/test/vstest.ProgrammerTests/BasicRunAndDiscovery.cs
new file mode 100644
index 0000000000..79f3926154
--- /dev/null
+++ b/test/vstest.ProgrammerTests/BasicRunAndDiscovery.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using FluentAssertions;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+using vstest.ProgrammerTests.Fakes;
+using Intent;
+using System.Diagnostics.CodeAnalysis;
+
+#pragma warning disable IDE1006 // Naming Styles
+namespace vstest.ProgrammerTests;
+#pragma warning restore IDE1006 // Naming Styles
+
+// Tests are run by Intent library that is executed from our Program.Main. To debug press F5 in VS, and maybe mark just a single test with [Only].
+// To just run, press Ctrl+F5 to run without debugging. It will use short timeout for abort in case something is wrong with your test.
+
+public class BasicRunAndDiscovery
+{
+    [Test(@"
+        Given a test assembly with 108 tests.
+
+        When we run tests.
+
+        Then all 108 tests are executed.
+    ")]
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+    public async Task A()
+    {
+        // -- arrange
+        using var fixture = new Fixture();
+
+        var mstest1Dll = new FakeTestDllBuilder()
+            .WithPath(@"X:\fake\mstest1.dll")
+            .WithFramework(KnownFrameworkNames.Net5)
+            .WithArchitecture(Architecture.X64)
+            .WithTestCount(108, 10)
+            .Build();
+
+        var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+        var runTests1 = new FakeTestHostResponsesBuilder()
+            .VersionCheck(5)
+            .ExecutionInitialize(FakeMessage.NoResponse)
+            .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+            .SessionEnd(FakeMessage.NoResponse, _ => testhost1Process.Exit())
+            .SessionEnd(FakeMessage.NoResponse)
+            .Build();
+
+        var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+            .WithTestDll(mstest1Dll)
+            .WithProcess(testhost1Process)
+            .WithResponses(runTests1)
+            .Build();
+
+        fixture.AddTestHostFixtures(testhost1);
+
+        var testRequestManager = fixture.BuildTestRequestManager();
+
+        // -- act
+        var testRunRequestPayload = new TestRunRequestPayload
+        {
+            Sources = new List<string> { mstest1Dll.Path },
+
+            RunSettings = $"<RunSettings></RunSettings>"
+        };
+
+        await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+        // -- assert
+        fixture.AssertNoErrors();
+        fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount);
+    }
+
+    [Test(@"
+        Given multple test assemblies that use the same target framework.
+
+        When we run tests.
+
+        Then all tests from all assemblies are run.
+    ")]
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+    public async Task B()
+    {
+        // -- arrange
+        using var fixture = new Fixture();
+
+        var mstest1Dll = new FakeTestDllBuilder()
+            .WithPath(@"X:\fake\mstest1.dll")
+            .WithFramework(KnownFrameworkNames.Net5)
+            .WithArchitecture(Architecture.X64)
+            .WithTestCount(108, 10)
+            .Build();
+
+        var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+        var runTests1 = new FakeTestHostResponsesBuilder()
+            .VersionCheck(5)
+            .ExecutionInitialize(FakeMessage.NoResponse)
+            .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+            .SessionEnd(FakeMessage.NoResponse, _ => testhost1Process.Exit())
+            .SessionEnd(FakeMessage.NoResponse)
+            .Build();
+
+        var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+            .WithTestDll(mstest1Dll)
+            .WithProcess(testhost1Process)
+            .WithResponses(runTests1)
+            .Build();
+
+        var mstest2Dll = new FakeTestDllBuilder()
+            .WithPath(@"X:\fake\mstest2.dll")
+            .WithFramework(KnownFrameworkNames.Net5)
+            .WithArchitecture(Architecture.X64)
+            .WithTestCount(50, 8)
+            .Build();
+
+        var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+        var runTests2 = new FakeTestHostResponsesBuilder()
+            .VersionCheck(5)
+            .ExecutionInitialize(FakeMessage.NoResponse)
+            .StartTestExecutionWithSources(mstest2Dll.TestResultBatches)
+            .SessionEnd(FakeMessage.NoResponse, f => f.Process.Exit())
+            .SessionEnd(FakeMessage.NoResponse)
+            .Build();
+
+        var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+            .WithTestDll(mstest2Dll)
+            .WithProcess(testhost2Process)
+            .WithResponses(runTests2)
+            .Build();
+
+        fixture.AddTestHostFixtures(testhost1, testhost2);
+
+        var testRequestManager = fixture.BuildTestRequestManager();
+
+        // -- act
+        var testRunRequestPayload = new TestRunRequestPayload
+        {
+            Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+
+            RunSettings = $"<RunSettings></RunSettings>"
+        };
+
+        await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+        // -- assert
+        fixture.AssertNoErrors();
+        fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+    }
+}
+
+// Test and improvmement ideas:
+// TODO: passing null runsettings does not fail fast, instead it fails in Fakes settings code
+// TODO: passing empty string fails in the xml parser code
+// TODO: passing null sources and null testcases does not fail fast
+// TODO: Just calling Exit, Close won't stop the run, we will keep waiting for test run to complete, I think in real life when we exit then Disconnected will be called on the vstest.console side, leading to abort flow.
+//.StartTestExecutionWithSources(new FakeMessage<TestMessagePayload>(MessageType.TestMessage, new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Loading type failed." }), afterAction: f => { /*f.Process.Exit();*/ f.FakeCommunicationEndpoint.Disconnect(); })
diff --git a/test/vstest.ProgrammerTests/Fakes/ActionRecord.cs b/test/vstest.ProgrammerTests/Fakes/ActionRecord.cs
new file mode 100644
index 0000000000..dede5a031a
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/ActionRecord.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+/// <summary>
+/// Contains information about something that happened, e.g. when a runtime provider resolve was called.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+internal class ActionRecord<T>
+{
+    public T Value { get; }
+    public string StackTrace { get; }
+    public ActionRecord(T value)
+    {
+        StackTrace = Environment.StackTrace;
+        Value = value;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/DebugOptions.cs b/test/vstest.ProgrammerTests/Fakes/DebugOptions.cs
new file mode 100644
index 0000000000..9e461e0093
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/DebugOptions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#pragma warning disable IDE1006 // Naming Styles
+// For some reason only this occurence of vstest is flagged in build, and no other.
+namespace vstest.ProgrammerTests.Fakes;
+#pragma warning restore IDE1006 // Naming Styles
+
+internal class DebugOptions
+{
+    public const int DefaultTimeout = 5;
+    // TODO: This setting is actually quite pointless, because I cannot come up with
+    // a useful way to abort quickly enough when debugger is attached and I am just running my tests (pressing F5)
+    // but at the same time not abort when I am in the middle of debugging some behavior. Maybe looking at debugger,
+    // and asking it if any breakpoints were hit / are set. But that is difficult.
+    //
+    // So normally I press F5 to investigate, but Ctrl+F5 (run without debugger), to run tests.
+    public const int DefaultDebugTimeout = 30 * 60;
+    public const bool DefaultBreakOnAbort = true;
+    public int Timeout { get; init; } = DefaultTimeout;
+    public int DebugTimeout { get; init; } = DefaultDebugTimeout;
+    public bool BreakOnAbort { get; init; } = DefaultBreakOnAbort;
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/EventRecord.cs b/test/vstest.ProgrammerTests/Fakes/EventRecord.cs
new file mode 100644
index 0000000000..0bfcd03776
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/EventRecord.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class EventRecord<T>
+{
+    public object? Sender { get; }
+
+    public T Data { get; }
+
+    public EventRecord(object? sender, T data)
+    {
+        Sender = sender;
+        Data = data;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs b/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs
new file mode 100644
index 0000000000..cf1c4dfbb3
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.Versioning;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeAssemblyMetadataProvider : IAssemblyMetadataProvider
+{
+    public FakeFileHelper FakeFileHelper { get; }
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public FakeAssemblyMetadataProvider(FakeFileHelper fakeFileHelper, FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeFileHelper = fakeFileHelper;
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public Architecture GetArchitecture(string filePath)
+    {
+        var file = FakeFileHelper.GetFakeFile<FakeTestDllFile>(filePath);
+        return file.Architecture;
+    }
+
+    public FrameworkName GetFrameworkName(string filePath)
+    {
+        var file = FakeFileHelper.GetFakeFile<FakeTestDllFile>(filePath);
+        return file.FrameworkName;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs
new file mode 100644
index 0000000000..5c2ad3c86a
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs
@@ -0,0 +1,222 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Concurrent;
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal abstract class FakeCommunicationChannel : ICommunicationChannel
+{
+    public FakeCommunicationChannel(int id)
+    {
+        Id = id;
+    }
+
+    public int Id { get; }
+    public CancellationTokenSource CancellationTokenSource { get; } = new();
+    public BlockingCollection<string> InQueue { get; } = new();
+    public BlockingCollection<FakeMessage> OutQueue { get; } = new();
+
+    /// <summary>
+    /// True if we encountered unexpected message (e.g. unknown message, message out of order) or when we sent all our prepared responses, and there were still more requests coming.
+    /// </summary>
+    public bool Faulted { get; protected set; }
+
+    TrackableEvent<MessageReceivedEventArgs> ICommunicationChannel.MessageReceived => throw new NotImplementedException();
+
+    #region ICommunicationChannel
+    // The naming for ICommunicationChannel is a bit confusing when this is implemented in-process.
+    // Normally one side in one process would have one end of the communication channel,
+    // and would use Send to pass message to another process. The other side would get notified
+    // about new data by NotifyDataAvailable, read the data there, and send them to other consumers
+    // using MessageReceived event. These consumers would then call Send, the channel and post the data
+    // to the other process. The other process would recieve the data and be notified by MessageReceived.
+    //
+    // But when we are in the same process, one side sends data using Send. We recieve them here by reading
+    // them from the queue (NotifyDataAvailable is not used, because we monitor the queue directly here, instead of
+    // in communication manager). And then we reply back to the sender, by invoking MessageReceived.
+
+    public event EventHandler<MessageReceivedEventArgs>? MessageReceived;
+
+    public void Dispose()
+    {
+        CancellationTokenSource.Cancel();
+        InQueue.CompleteAdding();
+        OutQueue.CompleteAdding();
+    }
+
+    public Task NotifyDataAvailable()
+    {
+        // This is used only by communication manager. vstest.console does not use communication manager.
+        throw new NotImplementedException();
+    }
+
+    public Task Send(string data)
+    {
+        InQueue.Add(data);
+        return Task.CompletedTask;
+    }
+    #endregion
+
+    public void OnMessageReceived(object sender, MessageReceivedEventArgs eventArgs)
+    {
+        // This is still a race condition. In real code we solve this via SafeInvoke that does null check
+        // and catches the exception. In this code I prefer doing it this way, to see if it is fragile.
+        MessageReceived?.Invoke(this, eventArgs);
+    }
+
+    public Task NotifyDataAvailable(CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+}
+
+internal class FakeCommunicationChannel<TContext> : FakeCommunicationChannel, ICommunicationChannel
+{
+
+    /// <summary>
+    /// Queue of MessageType of the incoming request, and the response that will be sent back.
+    /// </summary>
+    public Queue<RequestResponsePair<string, FakeMessage, TContext>> NextResponses { get; } = new();
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+    public FakeMessage? PendingMessage { get; private set; }
+    public TContext? Context { get; private set; }
+    public List<RequestResponsePair<Message, FakeMessage, TContext>> ProcessedMessages { get; } = new();
+    public Task? ProcessIncomingMessagesTask { get; private set; }
+    public Task? ProcessOutgoingMessagesTask { get; private set; }
+
+    public FakeCommunicationChannel(List<RequestResponsePair<string, FakeMessage, TContext>> responses, FakeErrorAggregator fakeErrorAggregator, int id) : base(id)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+        responses.ForEach(NextResponses.Enqueue);
+    }
+
+    public void Start(TContext context)
+    {
+        Context = context;
+        ProcessIncomingMessagesTask = Task.Run(() => ProcessIncomingMessages(context), CancellationTokenSource.Token);
+        ProcessOutgoingMessagesTask = Task.Run(ProcessOutgoingMessages, CancellationTokenSource.Token);
+    }
+
+    private void ProcessOutgoingMessages()
+    {
+        var token = CancellationTokenSource.Token;
+        while (!token.IsCancellationRequested)
+        {
+            try
+            {
+                // TODO: better name for the property? This is message that we are currently trying to send.
+                PendingMessage = OutQueue.Take(token);
+                OnMessageReceived(this, new MessageReceivedEventArgs { Data = PendingMessage.SerializedMessage });
+                PendingMessage = null;
+            }
+            catch (OperationCanceledException) { }
+            catch (Exception ex)
+            {
+                FakeErrorAggregator.Add(ex);
+            }
+        }
+    }
+
+    private void ProcessIncomingMessages(TContext context)
+    {
+        var token = CancellationTokenSource.Token;
+        while (!token.IsCancellationRequested)
+        {
+            try
+            {
+                var rawMessage = InQueue.Take(token);
+                var requestMessage = JsonDataSerializer.Instance.DeserializeMessage(rawMessage);
+
+                if (Faulted)
+                {
+                    // We already failed, when there are more requests coming, just save them and respond with error. We want to avoid
+                    // a situation where server ignores our error message and responds with another request, for which we accidentally
+                    // have the right answer in queue.
+                    //
+                    // E.g. We have VersionCheck, TestRunStart prepared, and server sends: VersionCheck, TestInitialize, TestRunStart.
+                    // The first request has a valid response. The next TestInitialize does not have a valid response and errors out,
+                    // but the server ignores it, and sends TestRunStart, which would normally have a prepared response, and lead to
+                    // possibly overlooking the error response to TestInitialize.
+                    //
+                    // With this check in place we will not respond to TestRunStart with success, but with error.
+                    // TODO: Better way to map MessageType and the payload type.
+                    // TODO: simpler way to report error, and add it to the error aggregator
+                    var errorMessage = $"FakeCommunicationChannel: FakeCommunicationChannel: Got message {requestMessage.MessageType}. But a message that was unexptected was received previously and the channel is now faulted. Review {nameof(ProcessedMessages)}, and {nameof(NextResponses)}.";
+                    var exception = new Exception(errorMessage);
+                    FakeErrorAggregator.Add(exception);
+                    var errorResponse = new FakeMessage<TestMessagePayload>(MessageType.TestMessage, new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = errorMessage });
+                    ProcessedMessages.Add(new RequestResponsePair<Message, FakeMessage, TContext>(requestMessage, errorResponse));
+                    Faulted = true;
+                    OutQueue.Add(errorResponse);
+                }
+
+                // Just peek at it so we can keep the message on the the queue in case of error.
+                if (!NextResponses.TryPeek(out var nextResponsePair))
+                {
+                    // If there are no more prepared responses then return protocol error.
+                    var errorMessage = $"FakeCommunicationChannel: Got message {requestMessage.MessageType}, but no more requests were expected, because there are no more responses in {nameof(NextResponses)}.";
+                    var exception = new Exception(errorMessage);
+                    FakeErrorAggregator.Add(exception);
+                    var errorResponse = new FakeMessage<TestMessagePayload>(MessageType.ProtocolError, new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = errorMessage });
+                    ProcessedMessages.Add(new RequestResponsePair<Message, FakeMessage, TContext>(requestMessage, errorResponse));
+                    Faulted = true;
+                    OutQueue.Add(errorResponse);
+                }
+                else if (nextResponsePair.Request != requestMessage.MessageType)
+                {
+                    // If the incoming message does not match what we expected return protocol error. The lsat message will remain in the
+                    // NextResponses queue.
+                    var errorMessage = $"FakeCommunicationChannel: Excpected message {nextResponsePair.Request} but got {requestMessage.MessageType}.";
+                    var exception = new Exception(errorMessage);
+                    FakeErrorAggregator.Add(exception);
+                    var errorResponse = new FakeMessage<TestMessagePayload>(MessageType.ProtocolError, new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = errorMessage });
+                    ProcessedMessages.Add(new RequestResponsePair<Message, FakeMessage, TContext>(requestMessage, errorResponse));
+                    Faulted = true;
+                    OutQueue.Add(errorResponse);
+                }
+                else
+                {
+                    var responsePair = NextResponses.Dequeue();
+                    if (responsePair.Debug && Debugger.IsAttached)
+                    {
+                        // We are about to send an interesting message
+                        Debugger.Break();
+                    }
+
+                    responsePair.BeforeAction?.Invoke(context);
+                    var responses = responsePair.Responses;
+                    ProcessedMessages.Add(new RequestResponsePair<Message, FakeMessage, TContext>(requestMessage, responses, false));
+
+                    foreach (var response in responses)
+                    {
+                        // If we created a pair with NoResponse message, we won't send that back to the server.
+                        if (response != FakeMessage.NoResponse)
+                        {
+                            OutQueue.Add(response);
+                        }
+                    }
+
+                    responsePair.AfterAction?.Invoke(context);
+                }
+            }
+            catch (OperationCanceledException) { }
+            catch (Exception ex)
+            {
+                FakeErrorAggregator.Add(ex);
+            }
+        }
+    }
+
+    public override string? ToString()
+    {
+        return NextResponses.Peek()?.ToString();
+    }
+}
+
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeCommunicationEndpoint.cs b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationEndpoint.cs
new file mode 100644
index 0000000000..5ad2ec958c
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationEndpoint.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeCommunicationEndpoint : ICommunicationEndPoint
+{
+    private bool _stopped;
+
+    public FakeCommunicationEndpoint(FakeCommunicationChannel fakeCommunicationChannel, FakeErrorAggregator fakeErrorAggregator)
+    {
+        Channel = fakeCommunicationChannel;
+        FakeErrorAggregator = fakeErrorAggregator;
+        TestHostConnectionInfo = new TestHostConnectionInfo
+        {
+            Endpoint = $"127.0.0.1:{fakeCommunicationChannel.Id}",
+            Role = ConnectionRole.Client,
+            Transport = Transport.Sockets,
+        };
+    }
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+    public FakeCommunicationChannel Channel { get; }
+    public TestHostConnectionInfo TestHostConnectionInfo { get; }
+
+    /// <summary>
+    /// Notify the caller that we disconnected, this happens if process exits unexpectedly and leads to abort flow.
+    /// In success case use Stop instead, to just "close" the channel, because the other side already disconnected from us
+    /// and told us to tear down.
+    /// </summary>
+    public void Disconnect()
+    {
+        Disconnected?.Invoke(this, new DisconnectedEventArgs());
+        _stopped = true;
+    }
+
+    #region ICommunicationEndPoint
+
+    public event EventHandler<ConnectedEventArgs>? Connected;
+    public event EventHandler<DisconnectedEventArgs>? Disconnected;
+
+    public string Start(string endPoint)
+    {
+        // In normal run this endpoint can be a client or a server. When we are a client we will get an address and a port and
+        // we will try to connect to it.
+        // If we are a server, we will get an address and port 0, which means we should figure out a port that is free
+        // and return the address and port back to the caller.
+        //
+        // In our fake scenario we know the "port" from the get go, we set it to an id that was given to the testhost
+        // because that is currently the only way for us to check if we are connecting to the expected fake testhost
+        // that has a list of canned responses, which must correlate with the requests. So e.g. if we get request for mstest1.dll
+        // we should return the responses we have prepared for mstest1.dll, and not for mstest2.dll.
+        //
+        // We use the port number because the rest of the IP address is validated. We force sockets and IP usage in multiple places,
+        // so we cannot just past the dll path (or something similar) as the endpoint name, because the other side will check if that is
+        // a valid IP address and port.
+        if (endPoint != TestHostConnectionInfo.Endpoint)
+        {
+            throw new InvalidOperationException($"Expected to connect to {endPoint} but instead got channel with {TestHostConnectionInfo.Endpoint}.");
+        }
+        Connected?.SafeInvoke(this, new ConnectedEventArgs(Channel), "FakeCommunicationEndpoint.Start");
+        return endPoint;
+    }
+
+    public void Stop()
+    {
+        if (!_stopped)
+        {
+            // Do not allow stop to be called multiple times, because it will end up calling us back and stack overflows.
+            _stopped = true;
+        }
+    }
+
+    #endregion
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeDataCollectorAttachmentsProcessorsFactory.cs b/test/vstest.ProgrammerTests/Fakes/FakeDataCollectorAttachmentsProcessorsFactory.cs
new file mode 100644
index 0000000000..8a5f923382
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeDataCollectorAttachmentsProcessorsFactory.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeDataCollectorAttachmentsProcessorsFactory : IDataCollectorAttachmentsProcessorsFactory
+{
+    public FakeDataCollectorAttachmentsProcessorsFactory(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public DataCollectorAttachmentProcessor[] Create(InvokedDataCollector[]? invokedDataCollectors, IMessageLogger logger)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeDiscoveryEventsRegistrar.cs b/test/vstest.ProgrammerTests/Fakes/FakeDiscoveryEventsRegistrar.cs
new file mode 100644
index 0000000000..2b22bf9b40
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeDiscoveryEventsRegistrar.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestDiscoveryEventsRegistrar : ITestDiscoveryEventsRegistrar
+{
+    private readonly FakeErrorAggregator _fakeErrorAggregator;
+
+    public List<object> AllEvents { get; } = new();
+    public List<string> LoggedWarnings { get; } = new();
+    public List<EventRecord<DiscoveryCompleteEventArgs>> DiscoveryCompleteEvents { get; } = new();
+    public List<EventRecord<DiscoveredTestsEventArgs>> DiscoveredTestsEvents { get; } = new();
+    public List<EventRecord<DiscoveryStartEventArgs>> DiscoveryStartEvents { get; } = new();
+    public List<EventRecord<TestRunMessageEventArgs>> DiscoveryMessageEvents { get; } = new();
+
+    public FakeTestDiscoveryEventsRegistrar(FakeErrorAggregator fakeErrorAggregator)
+    {
+        _fakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public void LogWarning(string message)
+    {
+        AllEvents.Add(message);
+        LoggedWarnings.Add(message);
+    }
+
+    public void RegisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnDiscoveryMessage += OnDiscoveryMessage;
+        discoveryRequest.OnDiscoveryStart += OnDiscoveryStart;
+        discoveryRequest.OnDiscoveredTests += OnDiscoveredTests;
+        discoveryRequest.OnDiscoveryComplete += OnDiscoveryComplete;
+    }
+
+    public void UnregisterDiscoveryEvents(IDiscoveryRequest discoveryRequest)
+    {
+        discoveryRequest.OnDiscoveryMessage -= OnDiscoveryMessage;
+        discoveryRequest.OnDiscoveryStart -= OnDiscoveryStart;
+        discoveryRequest.OnDiscoveredTests -= OnDiscoveredTests;
+        discoveryRequest.OnDiscoveryComplete -= OnDiscoveryComplete;
+    }
+
+    private void OnDiscoveryComplete(object? sender, DiscoveryCompleteEventArgs e)
+    {
+        var eventRecord = new EventRecord<DiscoveryCompleteEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        DiscoveryCompleteEvents.Add(eventRecord);
+    }
+
+    private void OnDiscoveredTests(object? sender, DiscoveredTestsEventArgs e)
+    {
+        var eventRecord = new EventRecord<DiscoveredTestsEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        DiscoveredTestsEvents.Add(eventRecord);
+    }
+
+    private void OnDiscoveryStart(object? sender, DiscoveryStartEventArgs e)
+    {
+        var eventRecord = new EventRecord<DiscoveryStartEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        DiscoveryStartEvents.Add(eventRecord);
+    }
+
+    private void OnDiscoveryMessage(object? sender, TestRunMessageEventArgs e)
+    {
+        var eventRecord = new EventRecord<TestRunMessageEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        DiscoveryMessageEvents.Add(eventRecord);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeEnvironment.cs b/test/vstest.ProgrammerTests/Fakes/FakeEnvironment.cs
new file mode 100644
index 0000000000..415c42f5b9
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeEnvironment.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeEnvironment : IEnvironment
+{
+    private readonly IEnvironment _environment = new PlatformEnvironment();
+
+    public PlatformArchitecture Architecture => _environment.Architecture;
+
+    public PlatformOperatingSystem OperatingSystem => _environment.OperatingSystem;
+
+    public string OperatingSystemVersion => _environment.OperatingSystemVersion;
+
+    public int ProcessorCount => _environment.ProcessorCount;
+
+    public void Exit(int exitcode) => _environment.Exit(exitcode);
+
+    public int GetCurrentManagedThreadId() => _environment.GetCurrentManagedThreadId();
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeErrorAggregator.cs b/test/vstest.ProgrammerTests/Fakes/FakeErrorAggregator.cs
new file mode 100644
index 0000000000..25d04fc094
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeErrorAggregator.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeErrorAggregator
+{
+    public List<object> Errors { get; } = new();
+
+    public void Add(object error)
+    {
+        Errors.Add(error);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeFile.cs b/test/vstest.ProgrammerTests/Fakes/FakeFile.cs
new file mode 100644
index 0000000000..e9764eab4b
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeFile.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeFile
+{
+    public string Path { get; }
+
+    public FakeFile(string path)
+    {
+        Path = path;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeFileHelper.cs b/test/vstest.ProgrammerTests/Fakes/FakeFileHelper.cs
new file mode 100644
index 0000000000..5629c248ab
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeFileHelper.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeFileHelper : IFileHelper
+{
+    public FakeFileHelper(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public List<FakeFile> Files { get; } = new();
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public void CopyFile(string sourcePath, string destinationPath)
+    {
+        throw new NotImplementedException();
+    }
+
+    public DirectoryInfo CreateDirectory(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void Delete(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void DeleteDirectory(string directoryPath, bool recursive)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void DeleteEmptyDirectroy(string directoryPath)
+    {
+        throw new NotImplementedException();
+    }
+
+    public bool DirectoryExists(string? path)
+    {
+        TPDebug.Assert(path is not null, "path is null");
+        // TODO: Check if any file has the directory in name. This will improve.
+        var directoryExists = Files.Select(f => Path.GetDirectoryName(f.Path)).Any(p => p != null && p.StartsWith(path!));
+        return directoryExists;
+    }
+
+    public IEnumerable<string> EnumerateFiles(string directory, SearchOption searchOption, params string[]? endsWithSearchPatterns)
+    {
+        Func<FakeFile, string, bool> predicate = searchOption == SearchOption.TopDirectoryOnly
+            ? (f, dir) => Path.GetDirectoryName(f.Path) == dir
+            : (f, dir) => Path.GetDirectoryName(f.Path)!.Contains(dir);
+
+        var files = Files.Where(f => predicate(f, directory)).Select(f => f.Path).ToList();
+        return files;
+    }
+
+    public bool Exists(string? path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public string GetCurrentDirectory()
+    {
+        throw new NotImplementedException();
+    }
+
+    public FileAttributes GetFileAttributes(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public long GetFileLength(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public string[] GetFiles(string path, string searchPattern, SearchOption searchOption)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Version GetFileVersion(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public string GetFullPath(string path)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Stream GetStream(string filePath, FileMode mode, FileAccess access = FileAccess.ReadWrite)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Stream GetStream(string filePath, FileMode mode, FileAccess access, FileShare share)
+    {
+        throw new NotImplementedException();
+    }
+
+    public string GetTempPath()
+    {
+        throw new NotImplementedException();
+    }
+
+    public void MoveFile(string sourcePath, string destinationPath)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void WriteAllTextToFile(string filePath, string content)
+    {
+        throw new NotImplementedException();
+    }
+
+    internal void AddFakeFile<T>(T file) where T : FakeFile
+    {
+        if (Files.Any(f => f.Path.Equals(file.Path, StringComparison.OrdinalIgnoreCase)))
+        {
+            throw new InvalidOperationException($"Fake file '{file.Path}' already exists.");
+        }
+
+        Files.Add(file);
+    }
+
+    internal T GetFakeFile<T>(string path) where T : FakeFile
+    {
+        var matchingFiles = Files.Where(f => f.Path == path).ToList();
+        if (matchingFiles.Count == 0)
+            throw new FileNotFoundException($"Fake file {path}, was not found. Check if file was previously added to FakeFileHelper.");
+
+        // TODO: The public collection of files should probably be made readonly / immutable, and internally be made a concurrent dictionary, because it does not make
+        // sense to have more than 1 file object with the same name, and we check for that in AddFakeFile anyway.
+        if (matchingFiles.Count > 1)
+            throw new InvalidOperationException($"Fake file {path}, exists more than once. Are you modifying the Files collection in FakeFileHelper manually?");
+
+        var file = matchingFiles.Single();
+        if (file is not T result)
+            throw new InvalidOperationException($"Fake file {path}, was supposed to be a {typeof(T)}, but was {file.GetType()}.");
+
+        return result;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeMessage.cs b/test/vstest.ProgrammerTests/Fakes/FakeMessage.cs
new file mode 100644
index 0000000000..03a0d9c077
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeMessage.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+/// <summary>
+/// Marker for Fake message so we can put put all FakeMessages into one collection, without making it too wide.
+/// </summary>
+internal abstract class FakeMessage
+{
+    /// <summary>
+    /// The message serialized using the default JsonDataSerializer.
+    /// </summary>
+    // TODO: Is there a better way to ensure that is is not null, we will always set it in the inherited types, but it would be nice to have warning if we did not.
+    // And adding constructor makes it difficult to use the serializer, especially if we wanted to the serializer dynamic and not a static instance.
+    public string SerializedMessage { get; init; } = string.Empty;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static FakeMessage NoResponse { get; } = new FakeMessage<int>("NoResponse", 0);
+}
+
+/// <summary>
+/// A class like Message / VersionedMessage that is easier to create and review during debugging.
+/// </summary>
+internal sealed class FakeMessage<T> : FakeMessage
+{
+    public FakeMessage(string messageType, T payload, int version = 0)
+    {
+        MessageType = messageType;
+        Payload = payload;
+        Version = version;
+        SerializedMessage = JsonDataSerializer.Instance.SerializePayload(MessageType, payload, version);
+    }
+
+    /// <summary>
+    /// Message identifier, usually coming from the MessageType class.
+    /// </summary>
+    public string MessageType { get; }
+
+    /// <summary>
+    /// The payload that this message is holding.
+    /// </summary>
+    public T Payload { get; }
+
+    /// <summary>
+    /// Version of the message to allow the internal serializer to choose the correct serialization strategy.
+    /// </summary>
+    public int Version { get; }
+
+    public override string ToString()
+    {
+        return $"{MessageType} {{{Payload}}}";
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeMetricsPublisher.cs b/test/vstest.ProgrammerTests/Fakes/FakeMetricsPublisher.cs
new file mode 100644
index 0000000000..373c9cbc97
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeMetricsPublisher.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeMetricsPublisher : IMetricsPublisher
+{
+    public FakeMetricsPublisher(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public void Dispose()
+    {
+        // do nothing
+    }
+
+    public void PublishMetrics(string eventName, IDictionary<string, object?> metrics)
+    {
+        // TODO: does nothing but probably should
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeOutput.cs b/test/vstest.ProgrammerTests/Fakes/FakeOutput.cs
new file mode 100644
index 0000000000..cfbbb41b2f
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeOutput.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Text;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeOutput : IOutput
+{
+    public List<OutputMessage> Messages { get; } = new();
+    public StringBuilder CurrentLine { get; } = new();
+    public List<string> Lines { get; } = new();
+
+    public void Write(string? message, OutputLevel level)
+    {
+        Messages.Add(new OutputMessage(message, level, isNewLine: false));
+        CurrentLine.Append(message);
+    }
+
+    public void WriteLine(string? message, OutputLevel level)
+    {
+        Lines.Add(CurrentLine + message);
+        CurrentLine.Clear();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeProcess.cs b/test/vstest.ProgrammerTests/Fakes/FakeProcess.cs
new file mode 100644
index 0000000000..adce51bfc4
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeProcess.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeProcess
+{
+    public int Id { get; internal set; }
+    public string Name { get; init; }
+    public string Path { get; }
+    public string? Arguments { get; set; }
+    public string WorkingDirectory { get; }
+    public IDictionary<string, string?> EnvironmentVariables { get; }
+    // TODO: Throw if already set
+    public Action<object, string>? ErrorCallback { get; set; }
+    // TODO: Throw if already set
+    public Action<object>? ExitCallback { get; set; }
+    // TODO: Throw if already set
+    public Action<object, string>? OutputCallback { get; set; }
+    public PlatformArchitecture Architecture { get; init; } = PlatformArchitecture.X64;
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+    public string? ErrorOutput { get; init; }
+    public int ExitCode { get; init; } = -1;
+    public bool Started { get; private set; }
+    public bool Exited { get; private set; }
+    public TestProcessStartInfo TestProcessStartInfo { get; internal set; }
+
+    public FakeProcess(FakeErrorAggregator fakeErrorAggregator, string path, string? arguments = null, string? workingDirectory = null, IDictionary<string, string?>? environmentVariables = null, Action<object, string>? errorCallback = null, Action<object>? exitCallBack = null, Action<object, string>? outputCallback = null)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+        Path = path;
+        Name = System.IO.Path.GetFileName(path);
+        Arguments = arguments;
+        WorkingDirectory = workingDirectory ?? System.IO.Path.GetDirectoryName(path) ?? throw new InvalidOperationException($"Path {path} does not have a parent directory.");
+        EnvironmentVariables = environmentVariables ?? new Dictionary<string, string?>();
+        ErrorCallback = errorCallback;
+        ExitCallback = exitCallBack;
+        OutputCallback = outputCallback;
+
+        TestProcessStartInfo = new TestProcessStartInfo()
+        {
+            FileName = Path,
+            Arguments = Arguments,
+            WorkingDirectory = WorkingDirectory,
+            EnvironmentVariables = EnvironmentVariables,
+            // TODO: is this even used anywhere
+            CustomProperties = new Dictionary<string, string>(),
+        };
+    }
+
+    internal static FakeProcess? EnsureFakeProcess(object? process)
+    {
+        return process as FakeProcess;
+    }
+
+    internal void SetId(int id)
+    {
+        if (Id != 0)
+            throw new InvalidOperationException($"Cannot set Id to {id} for fake process {Name}, {Id}, because it was already set.");
+
+        Id = id;
+    }
+
+    internal void Start()
+    {
+        if (Started)
+            throw new InvalidOperationException($"Cannot start process {Name} - {Id} because it was already started before.");
+
+        Started = true;
+    }
+
+    internal void Exit()
+    {
+        if (!Started)
+            throw new InvalidOperationException($"Cannot exit process {Name} - {Id} because it was not started before.");
+
+        // We want to call the exit callback just once. This is behavior inherent to being a real process,
+        // that also exits only once.
+        var exited = Exited;
+        Exited = true;
+        if (!exited && ExitCallback != null)
+        {
+            ExitCallback(this);
+        }
+    }
+
+    public override string ToString()
+    {
+        var state = !Started
+            ? "not started"
+            : !Exited
+                ? "running"
+                : "exited";
+        return $"{(Id != default ? Id : "<no id>")} {Name ?? "<no name>"} {state}";
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeProcessHelper.cs b/test/vstest.ProgrammerTests/Fakes/FakeProcessHelper.cs
new file mode 100644
index 0000000000..4729970c96
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeProcessHelper.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeProcessHelper : IProcessHelper
+{
+    // starting from 100 for no particular reason
+    // I want to avoid processId 0 and 1 as they are
+    // "reserved" on Windows (0) and Linux (both 0 and 1)
+    private static readonly SequentialId IdSource = new(100);
+
+    public FakeProcess CurrentProcess { get; }
+    public List<FakeProcess> Processes { get; } = new();
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public FakeProcessHelper(FakeErrorAggregator fakeErrorAggregator, FakeProcess currentProcess)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+        CurrentProcess = currentProcess;
+        AddFakeProcess(currentProcess);
+    }
+
+    public void AddFakeProcess(FakeProcess process)
+    {
+        var id = IdSource.Next();
+        process.SetId(id);
+        Processes.Add(process);
+    }
+
+    public PlatformArchitecture GetCurrentProcessArchitecture()
+    {
+        return CurrentProcess.Architecture;
+    }
+
+    public string GetCurrentProcessFileName()
+    {
+        return CurrentProcess.Path;
+    }
+
+    public int GetCurrentProcessId()
+    {
+        return CurrentProcess.Id;
+    }
+
+    public string GetCurrentProcessLocation()
+    {
+        // TODO: how is this different from Path
+        throw new NotImplementedException();
+    }
+
+    public string GetNativeDllDirectory()
+    {
+        throw new NotImplementedException();
+    }
+
+    public IntPtr GetProcessHandle(int processId)
+    {
+        throw new NotImplementedException();
+    }
+
+    public int GetProcessId(object? process)
+    {
+        var fakeProcess = FakeProcess.EnsureFakeProcess(process);
+        return fakeProcess?.Id ?? -1;
+    }
+
+    public string GetProcessName(int processId)
+    {
+        var process = Processes.Single(p => p.Id == processId);
+        return process.Name;
+    }
+
+    public string GetTestEngineDirectory()
+    {
+        throw new NotImplementedException();
+    }
+
+    public object LaunchProcess(string processPath, string? arguments, string? workingDirectory, IDictionary<string, string?>? environmentVariables, Action<object?, string>? errorCallback, Action<object>? exitCallBack, Action<object?, string>? outputCallback)
+    {
+        // TODO: Throw if setting says we can't start new processes;
+        var process = new FakeProcess(FakeErrorAggregator, processPath, arguments, workingDirectory, environmentVariables, errorCallback, exitCallBack, outputCallback);
+        Processes.Add(process);
+        process.Start();
+
+        return process;
+    }
+
+    public void SetExitCallback(int processId, Action<object?>? callbackAction)
+    {
+        // TODO: implement?
+    }
+
+    public void TerminateProcess(object? process)
+    {
+        if (process is FakeProcess fakeProcess)
+            fakeProcess.Exit();
+    }
+
+    public bool TryGetExitCode(object? process, out int exitCode)
+    {
+        exitCode = (process as FakeProcess)?.ExitCode ?? -1;
+        return true;
+    }
+
+    public void WaitForProcessExit(object? process)
+    {
+        // todo: implement for timeouts?
+    }
+
+    internal void StartFakeProcess(FakeProcess process)
+    {
+        // TODO: mark the process as started. Do not add a new process if it did not exist.
+        if (!Processes.Contains(process))
+            throw new InvalidOperationException($"Cannot start process {process.Name} - {process.Id} because it was not found in the list of known fake processes.");
+
+        process.Start();
+    }
+
+    public PlatformArchitecture GetProcessArchitecture(int processId)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestBatchBuilder.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestBatchBuilder.cs
new file mode 100644
index 0000000000..e3c40d179a
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestBatchBuilder.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestBatchBuilder
+{
+    public int TotalCount { get; private set; }
+    public TimeSpan Duration { get; private set; }
+    public int BatchSize { get; private set; }
+    public static List<List<TestResult>> Empty => new();
+    public string? Source { get; private set; }
+
+    public FakeTestBatchBuilder()
+    {
+    }
+
+    /// <summary>
+    /// Total test count in all batches.
+    /// </summary>
+    internal FakeTestBatchBuilder WithTotalCount(int count)
+    {
+        TotalCount = count;
+        return this;
+    }
+
+    internal FakeTestBatchBuilder WithDuration(TimeSpan duration)
+    {
+
+        // TODO: add min duration and max duration, and distribution, if timing becomes relevant
+        // TODO: and replay rate, if we actually want to simulate stuff like really executing the tests
+        Duration = duration;
+        return this;
+    }
+
+    /// <summary>
+    /// Splits the tests to batches of this size when reporting them back.
+    /// </summary>
+    /// <param name="batchSize"></param>
+    /// <returns></returns>
+    internal FakeTestBatchBuilder WithBatchSize(int batchSize)
+    {
+        BatchSize = batchSize;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the dll path (source) to be the provided value.
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    internal FakeTestBatchBuilder WithDllPath(string path)
+    {
+        Source = path;
+        return this;
+    }
+
+    internal List<List<TestResult>> Build()
+    {
+        if (BatchSize == 0 && TotalCount != 0)
+            throw new InvalidOperationException("Batch size cannot be 0, unless TotalCount is also 0. Splitting non-zero amount of tests into 0 sized batches does not make sense.");
+
+        if (TotalCount == 0)
+            return Empty;
+
+        var numberOfBatches = Math.DivRem(TotalCount, BatchSize, out int remainder);
+
+        var source = Source ?? "DummySourceFileName";
+        // TODO: Add adapter uri
+        // TODO: set duration
+        var batches = Enumerable.Range(0, numberOfBatches)
+            .Select(batchNumber => Enumerable.Range(0, BatchSize)
+                .Select((index) => new TestResult(new TestCase($"Test{batchNumber}-{index}", new Uri("some://uri"), source))).ToList()).ToList();
+
+        if (remainder > 0)
+        {
+            var reminderBatch = Enumerable.Range(0, remainder)
+                .Select((index) => new TestResult(new TestCase($"Test{numberOfBatches + 1}-{index}", new Uri("some://uri"), source))).ToList();
+
+            batches.Add(reminderBatch);
+        }
+
+        return batches;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestDllBuilder.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestDllBuilder.cs
new file mode 100644
index 0000000000..a8703938ec
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestDllBuilder.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.Versioning;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestDllBuilder
+{
+    private string _path = @$"X:\fake\mstest_{Guid.NewGuid()}.dll";
+    private FrameworkName _framework = KnownFrameworkNames.Net5;
+    private Architecture _architecture = Architecture.X64;
+    private List<List<TestResult>>? _testBatches;
+
+    internal FakeTestDllBuilder WithFramework(FrameworkName framework)
+    {
+        _framework = framework;
+        return this;
+    }
+
+    internal FakeTestDllBuilder WithPath(string path)
+    {
+        _path = path;
+        return this;
+    }
+
+    internal FakeTestDllBuilder WithArchitecture(Architecture architecture)
+    {
+        _architecture = architecture;
+        return this;
+    }
+
+    /// <summary>
+    /// Use this together with TestBatchBuilder, or use WithTestCount to get basic test batch.
+    /// </summary>
+    /// <param name="testBatches"></param>
+    /// <returns></returns>
+    internal FakeTestDllBuilder WithTestBatches(List<List<TestResult>> testBatches)
+    {
+        _testBatches = testBatches;
+        return this;
+    }
+
+    /// <summary>
+    /// Use this to get basic test batch, or use WithTestBatches together with TestBatchBuilder, to get a custom batch.
+    /// </summary>
+    /// <returns></returns>
+    internal FakeTestDllBuilder WithTestCount(int totalCount, int? batchSize = null)
+    {
+        _testBatches = new FakeTestBatchBuilder()
+            .WithDllPath(_path)
+            .WithTotalCount(totalCount)
+            .WithBatchSize(batchSize ?? totalCount)
+            .Build();
+
+        return this;
+    }
+
+    internal FakeTestDllFile Build()
+    {
+        _testBatches ??= new FakeTestBatchBuilder()
+            .WithDllPath(_path)
+            .WithTotalCount(10)
+            .WithBatchSize(5)
+            .Build();
+        return new FakeTestDllFile(_path, _framework, _architecture, _testBatches);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestDllFile.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestDllFile.cs
new file mode 100644
index 0000000000..34379cfbe7
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestDllFile.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.Versioning;
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestDllFile : FakeFile
+{
+    public FrameworkName FrameworkName { get; }
+    public Architecture Architecture { get; }
+    public List<List<TestResult>> TestResultBatches { get; }
+    public int TestCount { get; }
+    public int BatchCount { get; }
+
+    public FakeTestDllFile(string path, FrameworkName frameworkName, Architecture architecture, List<List<TestResult>> testResultBatches) : base(path)
+    {
+        FrameworkName = frameworkName;
+        Architecture = architecture;
+        TestResultBatches = testResultBatches;
+
+        TestCount = testResultBatches.SelectMany(tr => tr).Count();
+        BatchCount = testResultBatches.Count;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestExtensionManager.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestExtensionManager.cs
new file mode 100644
index 0000000000..812522fe74
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestExtensionManager.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestExtensionManager : ITestExtensionManager
+{
+    public void ClearExtensions()
+    {
+        throw new NotImplementedException();
+    }
+
+    public void UseAdditionalExtensions(IEnumerable<string>? pathToAdditionalExtensions, bool skipExtensionFilters)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
new file mode 100644
index 0000000000..5be76c1006
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestHostFixture : IDisposable
+{
+    public int Id { get; }
+    public List<FakeTestDllFile> Dlls { get; }
+    public FakeTestRuntimeProvider FakeTestRuntimeProvider { get; }
+    public FakeCommunicationEndpoint FakeCommunicationEndpoint { get; }
+    public FakeCommunicationChannel<FakeTestHostFixture> FakeCommunicationChannel { get; }
+    public List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>> Responses { get; }
+    public FakeProcess Process { get; internal set; }
+
+    public FakeTestHostFixture(
+        int id, List<FakeTestDllFile> dlls,
+        FakeTestRuntimeProvider fakeTestRuntimeProvider,
+        FakeCommunicationEndpoint fakeCommunicationEndpoint,
+        FakeCommunicationChannel<FakeTestHostFixture> fakeCommunicationChannel,
+        FakeProcess process,
+        List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>> responses)
+    {
+        Id = id;
+        Dlls = dlls;
+        FakeTestRuntimeProvider = fakeTestRuntimeProvider;
+        FakeCommunicationEndpoint = fakeCommunicationEndpoint;
+        FakeCommunicationChannel = fakeCommunicationChannel;
+        Process = process;
+        Responses = responses;
+
+        // The channel will pass back this whole fixture as context for every processed request so we can
+        // refer back to any part of testhost in message responses. E.g. to abort the channel, or exit
+        // testhost before or after answering.
+        fakeCommunicationChannel.Start(this);
+    }
+
+    public void Dispose()
+    {
+        try { FakeCommunicationChannel.Dispose(); } catch (ObjectDisposedException) { }
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHostBuilder.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHostBuilder.cs
new file mode 100644
index 0000000000..bd7c8c525b
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHostBuilder.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+# if DEBUG
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+# endif
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestHostFixtureBuilder
+{
+    // This will be also used as a port number, don't start from 0
+    // it skips some paths in the real code, because port 0 has special meaning.
+    private static readonly SequentialId Id = new(1000);
+
+    private readonly Fixture _fixture;
+
+    // TODO: this would correctly be any test holding container, but let's not get ahead of myself.
+    private readonly List<FakeTestDllFile> _dlls = new();
+    private FakeProcess? _process;
+    private List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>>? _responses;
+
+    public FakeTestHostFixtureBuilder(Fixture fixture)
+    {
+        _fixture = fixture;
+    }
+
+    internal FakeTestHostFixtureBuilder WithTestDll(FakeTestDllFile dll)
+    {
+        _dlls.Add(dll);
+        return this;
+    }
+
+    internal FakeTestHostFixture Build()
+    {
+
+        if (_responses == null)
+            throw new InvalidOperationException("Add some reponses to the testhost by using WithResponses.");
+
+        if (_process == null)
+            throw new InvalidOperationException("Add some process to the testhost by using WithProcess.");
+
+        var id = Id.Next();
+        var fakeCommunicationChannel = new FakeCommunicationChannel<FakeTestHostFixture>(_responses, _fixture.ErrorAggregator, id);
+        var fakeCommunicationEndpoint = new FakeCommunicationEndpoint(fakeCommunicationChannel, _fixture.ErrorAggregator);
+        var fakeTestRuntimeProvider = new FakeTestRuntimeProvider(_fixture.ProcessHelper, _process, _fixture.FileHelper, _dlls, fakeCommunicationEndpoint, _fixture.ErrorAggregator);
+
+#if DEBUG
+        // This registers the endpoint so we can look it up later using the address, the Id from here is propagated to
+        // testhost connection info, and is used as port in 127.0.0.1:<id>, address so we can lookup the correct channel.
+        TestServiceLocator.Register<ICommunicationEndPoint>(fakeCommunicationEndpoint.TestHostConnectionInfo.Endpoint, fakeCommunicationEndpoint);
+# endif
+
+        return new FakeTestHostFixture(id, _dlls, fakeTestRuntimeProvider, fakeCommunicationEndpoint, fakeCommunicationChannel, _process, _responses);
+    }
+
+    internal FakeTestHostFixtureBuilder WithProcess(FakeProcess process)
+    {
+        _process = process;
+        return this;
+    }
+
+    internal FakeTestHostFixtureBuilder WithResponses(List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>> responses)
+    {
+        _responses = responses;
+        return this;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHostLauncher.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHostLauncher.cs
new file mode 100644
index 0000000000..d2277612e7
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHostLauncher.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestHostLauncher : ITestHostLauncher
+{
+    private readonly FakeProcessHelper _fakeProcessHelper;
+
+    public FakeTestHostLauncher(FakeProcessHelper fakeProcessHelper, bool isDebug = false)
+    {
+        IsDebug = isDebug;
+        _fakeProcessHelper = fakeProcessHelper;
+    }
+
+    public bool IsDebug { get; }
+
+    public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo)
+    {
+        throw new NotImplementedException();
+    }
+
+    public int LaunchTestHost(TestProcessStartInfo defaultTestHostStartInfo, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHostResponsesBuilder.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHostResponsesBuilder.cs
new file mode 100644
index 0000000000..bfb459fc84
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHostResponsesBuilder.cs
@@ -0,0 +1,181 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+/// <summary>
+/// Builds a list of RequestResponse pairs, with the provided values. Each method is a name of incoming message type.
+/// The order in which the builder methods are called determines the order or responses.
+/// </summary>
+internal class FakeTestHostResponsesBuilder
+{
+    private readonly List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>> _responses = new();
+
+    /// <summary>
+    /// For VersionCheck message it responds with VersionCheck response that has the given version.
+    /// </summary>
+    /// <param name="version"></param>
+    /// <returns></returns>
+    internal FakeTestHostResponsesBuilder VersionCheck(int version)
+    {
+        AddPairWithValue(MessageType.VersionCheck, version);
+        return this;
+    }
+
+    /// <summary>
+    /// For VersionCheck message it responds with the given FakeMessage.
+    /// </summary>
+    /// <param name="message">Message to respond with, or FakeMessage.NoResponse to not respond.</param>
+    /// <returns></returns>
+    internal FakeTestHostResponsesBuilder VersionCheck(FakeMessage message)
+    {
+        AddPairWithFakeMessage(MessageType.VersionCheck, message);
+        return this;
+    }
+
+    /// <summary>
+    /// For VersionCheck message it does the given before action and responds with the given FakeMessage and then does the given after action.
+    /// Use FakeMessage.NoResponse to not respond.
+    /// </summary>
+    /// <returns></returns>
+    internal FakeTestHostResponsesBuilder VersionCheck(FakeMessage message, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        AddPairWithFakeMessage(MessageType.VersionCheck, message, beforeAction, afterAction);
+        return this;
+    }
+
+    internal FakeTestHostResponsesBuilder ExecutionInitialize(FakeMessage message)
+    {
+        AddPairWithFakeMessage(MessageType.ExecutionInitialize, message);
+        return this;
+    }
+
+    internal FakeTestHostResponsesBuilder StartTestExecutionWithSources(FakeMessage message, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        AddPairWithFakeMessage(MessageType.StartTestExecutionWithSources, message, beforeAction, afterAction);
+        return this;
+    }
+
+    internal FakeTestHostResponsesBuilder StartTestExecutionWithSources(List<List<TestResult>> testResultBatches)
+    {
+        ValidateArg.NotNull(testResultBatches, nameof(testResultBatches));
+
+        List<FakeMessage> messages;
+        if (testResultBatches.Count != 0)
+        {
+            // this will create as many test stats changes messages, as there are batches -1
+            // the last batch will be sent as test run complete event
+
+            // TODO: make the stats agree with the tests below
+            List<FakeMessage> changeMessages = testResultBatches.Take(testResultBatches.Count - 1).Select(batch =>
+                new FakeMessage<TestRunChangedEventArgs>(MessageType.TestRunStatsChange,
+                      new TestRunChangedEventArgs(new TestRunStatistics(new Dictionary<TestOutcome, long> { [TestOutcome.Passed] = batch.Count }), batch, new List<TestCase>())
+                     )).ToList<FakeMessage>();
+
+            // TODO: This is finicky because the statistics processor expects the dictionary to not be null
+            FakeMessage completedMessage = new FakeMessage<TestRunCompletePayload>(MessageType.ExecutionComplete, new TestRunCompletePayload
+            {
+                // TODO: make the stats agree with the tests below
+                TestRunCompleteArgs = new TestRunCompleteEventArgs(new TestRunStatistics(new Dictionary<TestOutcome, long> { [TestOutcome.Passed] = 1 }), false, false, null, new System.Collections.ObjectModel.Collection<AttachmentSet>(), TimeSpan.Zero),
+                LastRunTests = new TestRunChangedEventArgs(new TestRunStatistics(new Dictionary<TestOutcome, long> { [TestOutcome.Passed] = 1 }), testResultBatches.Last(), new List<TestCase>()),
+            });
+            messages = changeMessages.Concat(new[] { completedMessage }).ToList();
+        }
+        else
+        {
+            var completedMessage = new FakeMessage<TestRunCompletePayload>(MessageType.ExecutionComplete, new TestRunCompletePayload
+            {
+                TestRunCompleteArgs = new TestRunCompleteEventArgs(new TestRunStatistics(new Dictionary<TestOutcome, long> { [TestOutcome.Passed] = 0 }), false, false, null, new System.Collections.ObjectModel.Collection<AttachmentSet>(), TimeSpan.Zero),
+                LastRunTests = new TestRunChangedEventArgs(new TestRunStatistics(new Dictionary<TestOutcome, long> { [TestOutcome.Passed] = 0 }), new List<TestResult>(), new List<TestCase>()),
+            });
+
+            messages = completedMessage.AsList<FakeMessage>();
+        }
+
+
+        AddPairWithMultipleFakeMessages(MessageType.StartTestExecutionWithSources, messages);
+        return this;
+    }
+
+
+    internal FakeTestHostResponsesBuilder SessionEnd(FakeMessage fakeMessage)
+    {
+        AddPairWithFakeMessage(MessageType.SessionEnd, fakeMessage);
+        return this;
+    }
+
+    internal FakeTestHostResponsesBuilder SessionEnd(FakeMessage message, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        AddPairWithFakeMessage(MessageType.SessionEnd, message, beforeAction, afterAction);
+        return this;
+    }
+
+    private void AddPairWithValue<T>(string messageType, T value, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        AddPairWithFakeMessage(messageType, new FakeMessage<T>(messageType, value), beforeAction, afterAction);
+    }
+
+    private void AddPairWithFakeMessage(string messageType, FakeMessage message, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        AddPairWithMultipleFakeMessages(messageType, new[] { message }, beforeAction, afterAction);
+    }
+
+    private void AddPairWithMultipleFakeMessages(string messageType, IEnumerable<FakeMessage> messages, Action<FakeTestHostFixture>? beforeAction = null, Action<FakeTestHostFixture>? afterAction = null)
+    {
+        _responses.Add(new RequestResponsePair<string, FakeMessage, FakeTestHostFixture>(messageType, messages, beforeAction, afterAction));
+    }
+
+    internal List<RequestResponsePair<string, FakeMessage, FakeTestHostFixture>> Build()
+    {
+        return _responses;
+    }
+
+    internal FakeTestHostResponsesBuilder DiscoveryInitialize(FakeMessage fakeMessage)
+    {
+        AddPairWithFakeMessage(MessageType.DiscoveryInitialize, fakeMessage);
+        return this;
+    }
+
+    internal FakeTestHostResponsesBuilder StartDiscovery(List<List<TestResult>> testResultBatches)
+    {
+        // Discovery returns back test cases, not test results, but it is easier to take test results, because
+        // we have a builder that can be re-used for both test run and test discovery.
+
+        List<FakeMessage> messages;
+        if (testResultBatches.Count != 0)
+        {
+            // this will create as many test stats changes messages, as there are batches -1
+            // the last batch will be sent as test run complete event
+
+            // see TestRequestSender.OnDiscoveryMessageReceived to see how the vstest.console receives the data
+            List<FakeMessage> changeMessages = testResultBatches.Take(testResultBatches.Count - 1)
+                .Select(batch => new FakeMessage<IEnumerable<TestCase>>(MessageType.TestCasesFound, batch.Select(testResult => testResult.TestCase).ToList()))
+                .ToList<FakeMessage>();
+
+            // TODO: if we send this incorrectly the handler just continues, check logs if we can understand it from there. We should at least write a warning.
+            // because otherwise it hangs.
+            FakeMessage completedMessage = new FakeMessage<DiscoveryCompletePayload>(MessageType.DiscoveryComplete, new DiscoveryCompletePayload
+            {
+                LastDiscoveredTests = testResultBatches.Last().Select(testResult => testResult.TestCase).ToList(),
+            });
+            messages = changeMessages.Concat(new[] { completedMessage }).ToList();
+        }
+        else
+        {
+            FakeMessage completedMessage = new FakeMessage<DiscoveryCompletePayload>(MessageType.DiscoveryComplete, new DiscoveryCompletePayload
+            {
+                LastDiscoveredTests = new List<TestCase>(),
+            });
+
+            messages = completedMessage.AsList();
+        }
+
+        AddPairWithMultipleFakeMessages(MessageType.StartDiscovery, messages);
+
+        return this;
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestPlatformEventSource.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestPlatformEventSource.cs
new file mode 100644
index 0000000000..62c3ff8580
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestPlatformEventSource.cs
@@ -0,0 +1,236 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestPlatformEventSource : ITestPlatformEventSource
+{
+    public FakeTestPlatformEventSource(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public void AdapterDiscoveryStart(string executorUri)
+    {
+        // do nothing
+    }
+
+    public void AdapterDiscoveryStop(long numberOfTests)
+    {
+        // do nothing
+    }
+
+    public void AdapterExecutionStart(string executorUri)
+    {
+        // do nothing
+    }
+
+    public void AdapterExecutionStop(long numberOfTests)
+    {
+        // do nothing
+    }
+
+    public void AdapterSearchStart()
+    {
+        // do nothing
+    }
+
+    public void AdapterSearchStop()
+    {
+        // do nothing
+    }
+
+    public void DataCollectionStart(string dataCollectorUri)
+    {
+        // do nothing
+    }
+
+    public void DataCollectionStop()
+    {
+        // do nothing
+    }
+
+    public void DiscoveryRequestStart()
+    {
+        // do nothing
+    }
+
+    public void DiscoveryRequestStop()
+    {
+        // do nothing
+    }
+
+    public void DiscoveryStart()
+    {
+        // do nothing
+    }
+
+    public void DiscoveryStop(long numberOfTests)
+    {
+        // do nothing
+    }
+
+    public void ExecutionRequestStart()
+    {
+        // do nothing
+    }
+
+    public void ExecutionRequestStop()
+    {
+        // do nothing
+    }
+
+    public void ExecutionStart()
+    {
+        // do nothing
+    }
+
+    public void ExecutionStop(long numberOfTests)
+    {
+        // do nothing
+    }
+
+    public void MetricsDisposeStart()
+    {
+        // do nothing
+    }
+
+    public void MetricsDisposeStop()
+    {
+        // do nothing
+    }
+
+    public void StartTestSessionStart()
+    {
+        // do nothing
+    }
+
+    public void StartTestSessionStop()
+    {
+        // do nothing
+    }
+
+    public void StopTestSessionStart()
+    {
+        // do nothing
+    }
+
+    public void StopTestSessionStop()
+    {
+        // do nothing
+    }
+
+    public void TestHostAppDomainCreationStart()
+    {
+        // do nothing
+    }
+
+    public void TestHostAppDomainCreationStop()
+    {
+        // do nothing
+    }
+
+    public void TestHostStart()
+    {
+        // do nothing
+    }
+
+    public void TestHostStop()
+    {
+        // do nothing
+    }
+
+    public void TestRunAttachmentsProcessingRequestStart()
+    {
+        // do nothing
+    }
+
+    public void TestRunAttachmentsProcessingRequestStop()
+    {
+        // do nothing
+    }
+
+    public void TestRunAttachmentsProcessingStart(long numberOfAttachments)
+    {
+        // do nothing
+    }
+
+    public void TestRunAttachmentsProcessingStop(long numberOfAttachments)
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerDiscoveryStart()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerDiscoveryStop()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerExecutionStart(long customTestHost, long sourcesCount, long testCasesCount, string runSettings)
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerExecutionStop()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerInitializeStart()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerInitializeStop()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerStartTestSessionStart()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerStartTestSessionStop()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerStopTestSessionStart()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerStopTestSessionStop()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerTestRunAttachmentsProcessingStart()
+    {
+        // do nothing
+    }
+
+    public void TranslationLayerTestRunAttachmentsProcessingStop()
+    {
+        // do nothing
+    }
+
+    public void VsTestConsoleStart()
+    {
+        // do nothing
+    }
+
+    public void VsTestConsoleStop()
+    {
+        // do nothing
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestRunEventsRegistrar.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestRunEventsRegistrar.cs
new file mode 100644
index 0000000000..b6d7571b79
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestRunEventsRegistrar.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestRunEventsRegistrar : ITestRunEventsRegistrar
+{
+    public Guid Id { get; } = Guid.NewGuid();
+    public FakeTestRunEventsRegistrar(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public List<object> AllEvents { get; } = new();
+    public List<string> LoggedWarnings { get; } = new();
+    public List<EventRecord<TestRunCompleteEventArgs>> RunCompleteEvents { get; } = new();
+    public List<EventRecord<TestRunStartEventArgs>> RunStartEvents { get; } = new();
+    public List<EventRecord<TestRunChangedEventArgs>> RunChangedEvents { get; } = new();
+    public List<EventRecord<string>> RawMessageEvents { get; } = new();
+    public List<EventRecord<TestRunMessageEventArgs>> RunMessageEvents { get; } = new();
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public void LogWarning(string message)
+    {
+        AllEvents.Add(message);
+        LoggedWarnings.Add(message);
+    }
+
+    public void RegisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.TestRunMessage += OnTestRunMessage;
+        testRunRequest.OnRawMessageReceived += OnRawMessage;
+        testRunRequest.OnRunStart += OnRunStart;
+        testRunRequest.OnRunStatsChange += OnRunStatsChange;
+        testRunRequest.OnRunCompletion += OnRunCompletion;
+    }
+
+    public void UnregisterTestRunEvents(ITestRunRequest testRunRequest)
+    {
+        testRunRequest.TestRunMessage -= OnTestRunMessage;
+        testRunRequest.OnRawMessageReceived -= OnRawMessage;
+        testRunRequest.OnRunStart -= OnRunStart;
+        testRunRequest.OnRunStatsChange -= OnRunStatsChange;
+        testRunRequest.OnRunCompletion -= OnRunCompletion;
+    }
+
+    private void OnRunCompletion(object? sender, TestRunCompleteEventArgs e)
+    {
+        var eventRecord = new EventRecord<TestRunCompleteEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        RunCompleteEvents.Add(eventRecord);
+    }
+
+    private void OnRunStart(object? sender, TestRunStartEventArgs e)
+    {
+        var eventRecord = new EventRecord<TestRunStartEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        RunStartEvents.Add(eventRecord);
+    }
+
+    private void OnRunStatsChange(object? sender, TestRunChangedEventArgs e)
+    {
+        var eventRecord = new EventRecord<TestRunChangedEventArgs>(sender, e);
+        AllEvents.Add(eventRecord);
+        RunChangedEvents.Add(eventRecord);
+    }
+
+    private void OnRawMessage(object? sender, string e)
+    {
+        var eventRecord = new EventRecord<string>(sender, e);
+        AllEvents.Add(eventRecord);
+        RawMessageEvents.Add(eventRecord);
+    }
+
+    private void OnTestRunMessage(object? sender, TestRunMessageEventArgs e)
+    {
+        var eventRecord = new EventRecord<TestRunMessageEventArgs>(sender, e);
+        if (e.Level == TestMessageLevel.Error)
+        {
+            FakeErrorAggregator.Errors.Add(eventRecord);
+        }
+        AllEvents.Add(eventRecord);
+        RunMessageEvents.Add(eventRecord);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProvider.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProvider.cs
new file mode 100644
index 0000000000..266095e8f9
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProvider.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestRuntimeProvider : ITestRuntimeProvider
+{
+    public FakeProcessHelper FakeProcessHelper { get; }
+    public FakeCommunicationEndpoint FakeCommunicationEndpoint { get; }
+    public FakeCommunicationChannel FakeCommunicationChannel { get; }
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+    public FakeProcess TestHostProcess { get; private set; }
+    public FakeFileHelper FileHelper { get; }
+    public List<FakeTestDllFile> TestDlls { get; }
+
+    // TODO: make this configurable?
+    public bool Shared => false;
+
+    public event EventHandler<HostProviderEventArgs>? HostLaunched;
+    public event EventHandler<HostProviderEventArgs>? HostExited;
+
+    public FakeTestRuntimeProvider(FakeProcessHelper fakeProcessHelper, FakeProcess fakeTestHostProcess, FakeFileHelper fakeFileHelper, List<FakeTestDllFile> fakeTestDlls, FakeCommunicationEndpoint fakeCommunicationEndpoint, FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeProcessHelper = fakeProcessHelper;
+        TestHostProcess = fakeTestHostProcess;
+        FileHelper = fakeFileHelper;
+        TestDlls = fakeTestDlls;
+        FakeCommunicationEndpoint = fakeCommunicationEndpoint;
+        FakeCommunicationChannel = fakeCommunicationEndpoint.Channel;
+        FakeErrorAggregator = fakeErrorAggregator;
+
+        var architectures = fakeTestDlls.Select(dll => dll.Architecture).Distinct().ToList();
+        var frameworks = fakeTestDlls.Select(dll => dll.FrameworkName).Distinct().ToList();
+
+        if (architectures.Count > 1)
+            throw new InvalidOperationException($"The provided dlls have more than 1 architecture {architectures.JoinByComma()}. Fake TestRuntimeProvider cannot have dlls with mulitple architectures, because real testhost process can also run just with a single architecture.");
+
+        if (frameworks.Count > 1)
+            throw new InvalidOperationException($"The provided dlls have more than 1 target framework {frameworks.JoinByComma()}. Fake TestRuntimeProvider cannot have dlls with mulitple target framework, because real testhost process can also run just a single target framework.");
+
+        fakeTestDlls.ForEach(FileHelper.AddFakeFile);
+
+        fakeProcessHelper.AddFakeProcess(fakeTestHostProcess);
+        TestHostProcess.ExitCallback = p =>
+        {
+            // TODO: Validate the process we are passed is actually the same as TestHostProcess
+            // TODO: Validate we already started the process.
+            var process = (FakeProcess)p;
+            // TODO: When we exit, eventually there are no subscribers, maybe we should review if we don't lose the error output sometimes, in unnecessary way
+            HostExited?.Invoke(this, new HostProviderEventArgs(process.ErrorOutput!, process.ExitCode, process.Id));
+        };
+    }
+
+    public bool CanExecuteCurrentRunConfiguration(string? runsettingsXml)
+    {
+        // <TargetPlatform>x86</TargetPlatform>
+        // <TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
+
+        return true;
+    }
+
+    public Task CleanTestHostAsync(CancellationToken cancellationToken)
+    {
+        if (TestHostProcess == null)
+            throw new InvalidOperationException("Cannot clean testhost, no testhost process was started");
+        FakeProcessHelper.TerminateProcess(TestHostProcess);
+        return Task.CompletedTask;
+    }
+
+    public TestHostConnectionInfo GetTestHostConnectionInfo()
+    {
+        return FakeCommunicationEndpoint.TestHostConnectionInfo;
+    }
+
+    public TestProcessStartInfo GetTestHostProcessStartInfo(IEnumerable<string> sources, IDictionary<string, string?>? environmentVariables, TestRunnerConnectionInfo connectionInfo)
+    {
+        // TODO: do we need to do more here? How to link testhost to the fake one we "start"?
+        return TestHostProcess.TestProcessStartInfo;
+    }
+
+    public IEnumerable<string> GetTestPlatformExtensions(IEnumerable<string> sources, IEnumerable<string> extensions)
+    {
+        // send extensions so we send InitializeExecutionMessage
+        return new[] { @"c:\temp\extension.dll" };
+    }
+
+    public IEnumerable<string> GetTestSources(IEnumerable<string> sources)
+    {
+        // gives testhost opportunity to translate sources to something else,
+        // e.g. in uwp the main exe is returned, rather than the dlls that dlls that are tested
+        return sources;
+    }
+
+    public void Initialize(IMessageLogger? logger, string runsettingsXml)
+    {
+        // TODO: this is called twice, is that okay?
+        // TODO: and also by HandlePartialRunComplete after the test run has completed and we aborted because the client disconnected
+
+        // do nothing
+    }
+
+    public Task<bool> LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
+    {
+        if (TestHostProcess.TestProcessStartInfo.FileName != testHostStartInfo.FileName)
+            throw new InvalidOperationException($"Tried to start a different process than the one associated with this provider: File name is {testHostStartInfo.FileName} is not the same as the fake process associated with this provider {TestHostProcess.TestProcessStartInfo.FileName}.");
+
+        FakeProcessHelper.StartFakeProcess(TestHostProcess);
+        HostLaunched?.Invoke(this, new HostProviderEventArgs("Fake testhost launched", 0, TestHostProcess.Id));
+
+        return Task.FromResult(true);
+    }
+
+    public void SetCustomLauncher(ITestHostLauncher customLauncher)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override string ToString()
+    {
+        return $"{nameof(FakeTestRuntimeProvider)} - ({TestHostProcess.ToString() ?? "<no process>"}) - {FakeCommunicationChannel}";
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProviderManager.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProviderManager.cs
new file mode 100644
index 0000000000..acf11b261f
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestRuntimeProviderManager.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Common.Hosting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestRuntimeProviderManager : ITestRuntimeProviderManager
+{
+    public FakeTestRuntimeProviderManager(FakeErrorAggregator fakeErrorAggregator)
+    {
+        FakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public List<FakeTestRuntimeProvider> TestRuntimeProviders { get; } = new();
+    public Queue<FakeTestRuntimeProvider> TestRuntimeProvidersByOrder { get; } = new();
+    public List<ActionRecord<FakeTestRuntimeProvider>> UsedTestRuntimeProviders { get; } = new();
+
+    public FakeErrorAggregator FakeErrorAggregator { get; }
+
+    public void AddTestRuntimeProviders(params FakeTestRuntimeProvider[] runtimeProviders)
+    {
+        TestRuntimeProviders.AddRange(runtimeProviders);
+
+        // In cases where we don't have multi tfm run, we will be asked for
+        // a provider with multiple sources. In that case we don't know exactly which one to provide
+        // so we need to go by order. We also do this resolve twice for each source in parallel run
+        // because we first need to know if the provider is shared. So we add to the queue twice.
+        // This is brittle, but there is no way around this :(
+        foreach (var provider in runtimeProviders)
+        {
+            TestRuntimeProvidersByOrder.Enqueue(provider);
+            TestRuntimeProvidersByOrder.Enqueue(provider);
+        }
+    }
+
+    public ITestRuntimeProvider? GetTestHostManagerByRunConfiguration(string? _, List<string>? sources)
+    {
+        var allMatchingProviders = TestRuntimeProviders
+            .Where(r => r.TestDlls.Select(dll => dll.Path)
+            .Any(path => sources?.Contains(path) == true))
+            .ToList();
+
+        if (allMatchingProviders.Count == 0)
+        {
+            throw new InvalidOperationException($"There are no FakeTestRuntimeProviders associated with any of the incoming sources, make sure your testhost fixture has at least one dll: {sources?.JoinByComma()}");
+        }
+
+        if (allMatchingProviders.Count > 1)
+        {
+            // This is a single tfm run, or multiple dlls in the run have the same tfm. We need to provide
+            // providers by order.
+            if (!TestRuntimeProvidersByOrder.TryDequeue(out var provider))
+            {
+                throw new InvalidOperationException("There are no more FakeTestRuntimeProviders to be provided.");
+            }
+
+            UsedTestRuntimeProviders.Add(new ActionRecord<FakeTestRuntimeProvider>(provider));
+            return provider;
+        }
+
+        var single = allMatchingProviders.Single();
+        UsedTestRuntimeProviders.Add(new ActionRecord<FakeTestRuntimeProvider>(single));
+        return single;
+    }
+
+    public ITestRuntimeProvider GetTestHostManagerByUri(string hostUri)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestSessionEventsHandler.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestSessionEventsHandler.cs
new file mode 100644
index 0000000000..616c6aa966
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestSessionEventsHandler.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FakeTestSessionEventsHandler : ITestSessionEventsHandler
+{
+    private readonly FakeErrorAggregator _fakeErrorAggregator;
+
+    public FakeTestSessionEventsHandler(FakeErrorAggregator fakeErrorAggregator)
+    {
+        _fakeErrorAggregator = fakeErrorAggregator;
+    }
+
+    public List<object?> AllEvents { get; } = new();
+    public List<TestMessage> LoggedMessages { get; } = new();
+    public List<string> RawMessages { get; } = new();
+    public List<StartTestSessionCompleteEventArgs?> StartTestSessionCompleteEvents { get; } = new();
+    public List<StopTestSessionCompleteEventArgs?> StopTestSessionCompleteEvents { get; } = new();
+
+    public void HandleLogMessage(TestMessageLevel level, string? message)
+    {
+        var msg = new TestMessage(level, message);
+        AllEvents.Add(msg);
+        LoggedMessages.Add(msg);
+    }
+
+    public void HandleRawMessage(string rawMessage)
+    {
+        AllEvents.Add(rawMessage);
+        RawMessages.Add(rawMessage);
+    }
+
+    public void HandleStartTestSessionComplete(StartTestSessionCompleteEventArgs? eventArgs)
+    {
+        AllEvents.Add(eventArgs);
+        StartTestSessionCompleteEvents.Add(eventArgs);
+    }
+
+    public void HandleStopTestSessionComplete(StopTestSessionCompleteEventArgs? eventArgs)
+    {
+        AllEvents.Add(eventArgs);
+        StopTestSessionCompleteEvents.Add(eventArgs);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/Fixture.cs b/test/vstest.ProgrammerTests/Fakes/Fixture.cs
new file mode 100644
index 0000000000..15ad1213f5
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/Fixture.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using FluentAssertions;
+
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.TestRunAttachmentsProcessing;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class Fixture : IDisposable
+{
+    private readonly List<IDisposable> _disposables = new();
+
+    public FakeErrorAggregator ErrorAggregator { get; } = new();
+    public FakeProcessHelper ProcessHelper { get; }
+    public string LogName { get; }
+    public FakeProcess CurrentProcess { get; }
+    public FakeFileHelper FileHelper { get; }
+    public FakeTestRuntimeProviderManager TestRuntimeProviderManager { get; }
+    public FakeTestRunEventsRegistrar TestRunEventsRegistrar { get; }
+    public FakeEnvironment Environment { get; }
+    public FakeTestDiscoveryEventsRegistrar TestDiscoveryEventsRegistrar { get; }
+    public TestEngine? TestEngine { get; private set; }
+    public TestPlatform? TestPlatform { get; private set; }
+    public TestRunResultAggregator? TestRunResultAggregator { get; private set; }
+    public FakeTestPlatformEventSource? TestPlatformEventSource { get; private set; }
+    public FakeAssemblyMetadataProvider? AssemblyMetadataProvider { get; private set; }
+    public InferHelper? InferHelper { get; private set; }
+    public FakeDataCollectorAttachmentsProcessorsFactory? DataCollectorAttachmentsProcessorsFactory { get; private set; }
+    public TestRunAttachmentsProcessingManager? TestRunAttachmentsProcessingManager { get; private set; }
+    public TestRequestManager? TestRequestManager { get; private set; }
+    public ProtocolConfig ProtocolConfig { get; internal set; }
+
+    public List<TestResult> ExecutedTests => TestRunEventsRegistrar.RunChangedEvents.SelectMany(er => er.Data.NewTestResults!).ToList();
+    public List<TestCase> DiscoveredTests => TestDiscoveryEventsRegistrar.DiscoveredTestsEvents.SelectMany(er => er.Data.DiscoveredTestCases!).ToList();
+
+    public List<string> LoggedWarnings => TestRunEventsRegistrar.LoggedWarnings.Concat(TestDiscoveryEventsRegistrar.LoggedWarnings).ToList();
+
+    public FakeTestSessionEventsHandler TestSessionEventsHandler { get; }
+
+    public Fixture(FixtureOptions? fixtureOptions = null)
+    {
+        // This type is compiled only in DEBUG, and won't exist otherwise.
+#if DEBUG
+        // We need to use static class to find the communication endpoint, this clears all the registrations of previous tests.
+        TestServiceLocator.Clear();
+#else
+        // This fools compiler into not being able to tell that the the rest of the code is unreachable.
+        var a = true;
+        if (a)
+        {
+            throw new InvalidOperationException("Tests cannot run in Release mode, because TestServiceLocator is compiled only for Debug, and so the tests will fail to setup channel and will hang.");
+        }
+#endif
+
+#pragma warning disable CS0618 // Type or member is obsolete (to prevent use outside of test context)
+        FeatureFlag.Reset();
+        fixtureOptions?.FeatureFlags?.ToList().ForEach(flag => ((FeatureFlag)FeatureFlag.Instance).SetFlag(flag.Key, flag.Value));
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        // This makes the run a bit slower, but at least we get info in the output window. We probably should add a mode where we don't
+        // use a file to write the output. Just trace listener. That would also be useful for UWP I think.
+        LogName = Path.GetTempPath() + $"/log_{Guid.NewGuid()}.txt";
+        //EqtTrace.InitializeVerboseTrace(LogName);
+
+        CurrentProcess = new FakeProcess(ErrorAggregator, @"X:\fake\vstest.console.exe");
+        ProcessHelper = new FakeProcessHelper(ErrorAggregator, CurrentProcess);
+        FileHelper = new FakeFileHelper(ErrorAggregator);
+        TestRuntimeProviderManager = new FakeTestRuntimeProviderManager(ErrorAggregator);
+        TestRunEventsRegistrar = new FakeTestRunEventsRegistrar(ErrorAggregator);
+        Environment = new FakeEnvironment();
+        TestDiscoveryEventsRegistrar = new FakeTestDiscoveryEventsRegistrar(ErrorAggregator);
+        TestSessionEventsHandler = new FakeTestSessionEventsHandler(ErrorAggregator);
+        ProtocolConfig = new ProtocolConfig();
+    }
+
+    public void Dispose()
+    {
+        foreach (var disposable in _disposables)
+        {
+            try { disposable.Dispose(); } catch (ObjectDisposedException) { }
+        }
+    }
+
+    internal void AddTestHostFixtures(params FakeTestHostFixture[] testhosts)
+    {
+        _disposables.AddRange(testhosts);
+        var providers = testhosts.Select(t => t.FakeTestRuntimeProvider).ToArray();
+        TestRuntimeProviderManager.AddTestRuntimeProviders(providers);
+    }
+
+    internal TestRequestManagerTestHelper BuildTestRequestManager(
+        int? timeout = DebugOptions.DefaultTimeout,
+        int? debugTimeout = DebugOptions.DefaultDebugTimeout,
+        bool? breakOnAbort = DebugOptions.DefaultBreakOnAbort)
+    {
+        if (!TestRuntimeProviderManager.TestRuntimeProviders.Any())
+            throw new InvalidOperationException("There are runtime providers registered for FakeTestRuntimeProviderManager.");
+
+
+        TestEngine = new TestEngine(TestRuntimeProviderManager, ProcessHelper, Environment);
+        TestPlatform = new TestPlatform(TestEngine, FileHelper, TestRuntimeProviderManager);
+
+        TestRunResultAggregator = new TestRunResultAggregator();
+        TestPlatformEventSource = new FakeTestPlatformEventSource(ErrorAggregator);
+
+        AssemblyMetadataProvider = new FakeAssemblyMetadataProvider(FileHelper, ErrorAggregator);
+        InferHelper = new InferHelper(AssemblyMetadataProvider);
+
+        // This is most likely not the correctl place where to cut this off, plugin cache is probably the better place,
+        // but it is not injected, and I don't want to investigate this now.
+        DataCollectorAttachmentsProcessorsFactory = new FakeDataCollectorAttachmentsProcessorsFactory(ErrorAggregator);
+        TestRunAttachmentsProcessingManager = new TestRunAttachmentsProcessingManager(TestPlatformEventSource, DataCollectorAttachmentsProcessorsFactory);
+
+        Task<IMetricsPublisher> fakeMetricsPublisherTask = Task.FromResult<IMetricsPublisher>(new FakeMetricsPublisher(ErrorAggregator));
+
+        var commandLineOptions = new CommandLineOptions
+        {
+            // We are acting like we are running under IDE. This is done because some settings are trying to grab the
+            // value from the pre-parsed settings in command line options. And some are looking at the actual run settings.
+            // Ultimately we should have a single point of truth for both scenarios, but now it is easier to just provide
+            // runsettings to the request.
+            IsDesignMode = true,
+        };
+        TestRequestManager testRequestManager = new(
+            commandLineOptions,
+            TestPlatform,
+            TestRunResultAggregator,
+            TestPlatformEventSource,
+            InferHelper,
+            fakeMetricsPublisherTask,
+            ProcessHelper,
+            TestRunAttachmentsProcessingManager,
+            Environment,
+            new EnvironmentVariableHelper());
+
+        TestRequestManager = testRequestManager;
+
+        return new TestRequestManagerTestHelper(ErrorAggregator, testRequestManager, new DebugOptions
+        {
+            Timeout = timeout ?? DebugOptions.DefaultTimeout,
+            DebugTimeout = debugTimeout ?? DebugOptions.DefaultDebugTimeout,
+            BreakOnAbort = breakOnAbort ?? DebugOptions.DefaultBreakOnAbort,
+        });
+    }
+
+    internal void AssertNoErrors()
+    {
+        ErrorAggregator.Errors.Should().BeEmpty();
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/FixtureOptions.cs b/test/vstest.ProgrammerTests/Fakes/FixtureOptions.cs
new file mode 100644
index 0000000000..215c3649a6
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/FixtureOptions.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class FixtureOptions
+{
+    public Dictionary<string, bool>? FeatureFlags { get; init; }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs
new file mode 100644
index 0000000000..c600193212
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.Versioning;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal static class KnownFrameworkNames
+{
+    public static FrameworkName Netcoreapp1 = new(KnownFrameworkStrings.Netcoreapp1);
+    public static FrameworkName Netcoreapp2 = new(KnownFrameworkStrings.Netcoreapp2);
+    public static FrameworkName Netcoreapp21 = new(KnownFrameworkStrings.Netcoreapp21);
+    public static FrameworkName Netcoreapp3 = new(KnownFrameworkStrings.Netcoreapp3);
+    public static FrameworkName Netcoreapp31 = new(KnownFrameworkStrings.Netcoreapp31);
+    public static FrameworkName Net5 = new(KnownFrameworkStrings.Net5);
+    public static FrameworkName Net6 = new(KnownFrameworkStrings.Net6);
+    public static FrameworkName Net7 = new(KnownFrameworkStrings.Net7);
+    public static FrameworkName Net462 = new(KnownFrameworkStrings.Net462);
+    public static FrameworkName Net47 = new(KnownFrameworkStrings.Net47);
+    public static FrameworkName Net471 = new(KnownFrameworkStrings.Net471);
+    public static FrameworkName Net472 = new(KnownFrameworkStrings.Net472);
+    public static FrameworkName Net48 = new(KnownFrameworkStrings.Net48);
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs
new file mode 100644
index 0000000000..cece400c9b
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal static class KnownFrameworkStrings
+{
+    public static string NetCore(int major, int minor = 0) => $".NETCoreApp,Version=v{major}.{minor}";
+    private static string NetFramework(int major, int minor, int patch = 0) => $".NETFramework,Version=v{major}.{minor}{(patch != 0 ? $".{patch}" : null)}";
+
+    public static string Netcoreapp1 = NetCore(1);
+    public static string Netcoreapp2 = NetCore(2);
+    public static string Netcoreapp21 = NetCore(2, 1);
+    public static string Netcoreapp3 = NetCore(3);
+    public static string Netcoreapp31 = NetCore(3, 1);
+    public static string Net5 = NetCore(5);
+    public static string Net6 = NetCore(6);
+    public static string Net7 = NetCore(7);
+
+    public static string Net462 = NetFramework(4, 6, 2);
+    public static string Net47 = NetFramework(4, 7);
+    public static string Net471 = NetFramework(4, 7, 1);
+    public static string Net472 = NetFramework(4, 7, 2);
+    public static string Net48 = NetFramework(4, 8);
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/OutputMessage.cs b/test/vstest.ProgrammerTests/Fakes/OutputMessage.cs
new file mode 100644
index 0000000000..694539e202
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/OutputMessage.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class OutputMessage
+{
+    public OutputMessage(string? message, OutputLevel level, bool isNewLine)
+    {
+        Message = message;
+        Level = level;
+        IsNewLine = isNewLine;
+    }
+
+    public string? Message { get; }
+    public OutputLevel Level { get; }
+    public bool IsNewLine { get; }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/RequestResponsePair.cs b/test/vstest.ProgrammerTests/Fakes/RequestResponsePair.cs
new file mode 100644
index 0000000000..a62e514130
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/RequestResponsePair.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class RequestResponsePair<TRequest, TResponse, TContext> where TRequest : class
+{
+    public RequestResponsePair(TRequest request, TResponse response, bool debug = false)
+    {
+        Request = request;
+        Responses = new List<TResponse> { response };
+        Debug = debug;
+    }
+
+    public RequestResponsePair(TRequest request, IEnumerable<TResponse> responses, bool debug = false)
+    {
+        Request = request;
+        Responses = responses.ToList();
+        Debug = debug;
+    }
+
+    public RequestResponsePair(TRequest request, IEnumerable<TResponse> responses, Action<TContext>? beforeAction = null, Action<TContext>? afterAction = null, bool debug = false)
+    {
+        Request = request;
+        Responses = responses.ToList();
+        BeforeAction = beforeAction;
+        AfterAction = afterAction;
+        Debug = debug;
+    }
+
+    public TRequest Request { get; }
+
+    // TODO: make this Expression< so we can get some info about what this is doing when looking directly at this instance
+    public Action<TContext>? BeforeAction { get; }
+    public Action<TContext>? AfterAction { get; }
+    public List<TResponse> Responses { get; }
+    public bool Debug { get; }
+
+    public override string ToString()
+    {
+        return $"\u2193{Request} \u2191{Responses.FirstOrDefault()}";
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/SequentialId.cs b/test/vstest.ProgrammerTests/Fakes/SequentialId.cs
new file mode 100644
index 0000000000..815245110b
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/SequentialId.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+/// <summary>
+/// A sequential Id that starts from 0 or a given number. Put this in a static field in your class, and call Next to get the next Id.
+/// </summary>
+internal class SequentialId
+{
+    private int _id;
+
+    public SequentialId() : this(0)
+    {
+    }
+
+    public SequentialId(int firstId)
+    {
+        _id = firstId;
+    }
+
+    public int Next()
+    {
+        return Interlocked.Increment(ref _id);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/StringExtensions.cs b/test/vstest.ProgrammerTests/Fakes/StringExtensions.cs
new file mode 100644
index 0000000000..8d33f23acb
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/StringExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal static class EnumerableExtensions
+{
+    public static string JoinByComma<T>(this IEnumerable<T> value)
+    {
+        return value.JoinBy(", ");
+    }
+
+    public static string JoinBy<T>(this IEnumerable<T> value, string delimiter)
+    {
+        return string.Join(delimiter, value.Select(v => v?.ToString()));
+    }
+
+    public static List<T> AsList<T>(this T value)
+    {
+        return [value];
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/TestMessage.cs b/test/vstest.ProgrammerTests/Fakes/TestMessage.cs
new file mode 100644
index 0000000000..926fbfb485
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/TestMessage.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.ProgrammerTests.Fakes;
+
+internal class TestMessage
+{
+    public TestMessage(TestMessageLevel level, string? message)
+    {
+        Level = level;
+        Message = message;
+    }
+
+    public TestMessageLevel Level { get; }
+    public string? Message { get; }
+}
diff --git a/test/vstest.ProgrammerTests/Fakes/TestRequestManagerHelper.cs b/test/vstest.ProgrammerTests/Fakes/TestRequestManagerHelper.cs
new file mode 100644
index 0000000000..76e5d165fb
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Fakes/TestRequestManagerHelper.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+
+#pragma warning disable IDE1006 // Naming Styles
+namespace vstest.ProgrammerTests.Fakes;
+#pragma warning restore IDE1006 // Naming Styles
+
+internal class TestRequestManagerTestHelper
+{
+    private readonly FakeErrorAggregator _errorAggregator;
+    private readonly TestRequestManager _testRequestManager;
+    private readonly DebugOptions _debugOptions;
+
+    public TestRequestManagerTestHelper(FakeErrorAggregator errorAggregator, TestRequestManager testRequestManager, DebugOptions debugOptions)
+    {
+        _errorAggregator = errorAggregator;
+        _testRequestManager = testRequestManager;
+        _debugOptions = debugOptions;
+    }
+
+    public async Task ExecuteWithAbort(Action<TestRequestManager> testRequestManagerAction)
+    {
+        // We make sure the test is running for the timeout time at max and then we try to abort
+        // if we aborted we write the error to aggregator
+
+        // Start tasks that waits until it is the right time to call abort
+        // and continue to starting the method. If that method finishes running on time we cancel this
+        // wait and don't abort. Otherwise we call abort to start our abort flow.
+        //
+        // This abort does not guarantee that we won't hang. If our abort flow is broken then we will
+        // remain hanging. To have that guarantee it needs to be handled by failfast, or something else that will hang dump us.
+        // Or a simple timer that kill the process after a given timeout, like a simplified blame hang dumper.
+        var cancelAbort = new CancellationTokenSource();
+        var abortOnTimeout = Task.Run(async () =>
+        {
+            // Wait until timeout or until we are cancelled.
+            try
+            {
+                await Task.Delay(TimeSpan.FromSeconds(Debugger.IsAttached ? _debugOptions.DebugTimeout : _debugOptions.Timeout), cancelAbort.Token);
+
+                if (Debugger.IsAttached && _debugOptions.BreakOnAbort)
+                {
+                    var errors = _errorAggregator.Errors;
+                    // we will abort because we are hanging, look at errors and at concurrent stacks to see where we are hanging.
+                    Debugger.Break();
+                }
+                _errorAggregator.Add(new Exception("errr we aborted"));
+                _testRequestManager.AbortTestRun();
+            }
+            catch (TaskCanceledException)
+            {
+            }
+        });
+
+        testRequestManagerAction(_testRequestManager);
+
+        cancelAbort.Cancel();
+        if (!abortOnTimeout.IsCanceled)
+        {
+            await abortOnTimeout;
+        }
+    }
+}
diff --git a/test/vstest.ProgrammerTests/GlobalSuppressions.cs b/test/vstest.ProgrammerTests/GlobalSuppressions.cs
new file mode 100644
index 0000000000..6d786bba6c
--- /dev/null
+++ b/test/vstest.ProgrammerTests/GlobalSuppressions.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Consider changing namespaces later", Scope = "namespace", Target = "~N:vstest.ProgrammerTests")]
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Consider changing namespaces later", Scope = "namespace", Target = "~N:vstest.ProgrammerTests.Fakes")]
diff --git a/test/vstest.ProgrammerTests/MultiTFMRunAndDiscovery.cs b/test/vstest.ProgrammerTests/MultiTFMRunAndDiscovery.cs
new file mode 100644
index 0000000000..36c9822d57
--- /dev/null
+++ b/test/vstest.ProgrammerTests/MultiTFMRunAndDiscovery.cs
@@ -0,0 +1,680 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Intent;
+using FluentAssertions;
+using vstest.ProgrammerTests.Fakes;
+
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+using System.Reflection;
+using System.Diagnostics.CodeAnalysis;
+
+namespace vstest.ProgrammerTests;
+
+public class MultiTFM
+{
+    public class MultiTFMDiscovery
+    {
+        [Test(@"
+            Given two test assemblies that have the same architecture
+            but have different target frameworks.
+
+            When we run test discovery.
+
+            Then two testhosts should be started that target the same framework as each assembly.
+        ")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+        public async Task A()
+        {
+            // -- arrange
+            using var fixture = new Fixture();
+
+            var mstest1Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest1.dll")
+                .WithFramework(KnownFrameworkNames.Net5) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(11, 5)
+                .Build();
+
+            var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+            var runTests1 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .DiscoveryInitialize(FakeMessage.NoResponse)
+                .StartDiscovery(mstest1Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+                .Build();
+
+            var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest1Dll)
+                .WithProcess(testhost1Process)
+                .WithResponses(runTests1)
+                .Build();
+
+            // --
+
+            var mstest2Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest2.dll")
+                .WithFramework(KnownFrameworkNames.Net48) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(21, 5)
+                .Build();
+
+            var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+            var runTests2 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .DiscoveryInitialize(FakeMessage.NoResponse)
+                .StartDiscovery(mstest2Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+                // We actually do get asked to terminate multiple times. In the second host only.
+                .SessionEnd(FakeMessage.NoResponse)
+                .Build();
+
+            var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest2Dll)
+                .WithProcess(testhost2Process)
+                .WithResponses(runTests2)
+                .Build();
+
+            fixture.AddTestHostFixtures(testhost1, testhost2);
+
+            var testRequestManager = fixture.BuildTestRequestManager();
+
+            mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+            // -- act
+            var testDiscoveryPayload = new DiscoveryRequestPayload
+            {
+                Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+                RunSettings = $"<RunSettings></RunSettings>"
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.DiscoverTests(testDiscoveryPayload, fixture.TestDiscoveryEventsRegistrar, fixture.ProtocolConfig));
+
+            // -- assert
+            fixture.AssertNoErrors();
+            // We figure out the framework for each assembly so there should be no incompatibility warnings
+            fixture.LoggedWarnings.Should().NotContainMatch("Test run detected DLL(s) which would use different framework*");
+
+            fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+            var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartDiscovery);
+            var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+            // We sent mstest1.dll.
+            startWithSources1Text.Should().Contain("mstest1.dll");
+            // And we sent net5 as the target framework, because that is the framework of mstest1.dll.
+            startWithSources1Text.Should().Contain(KnownFrameworkStrings.Net5);
+
+            var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartDiscovery);
+            var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+            // We sent mstest2.dll.
+            startWithSources2Text.Should().Contain("mstest2.dll");
+            // And we sent net48 as the target framework, because that is the framework of mstest2.dll.
+            startWithSources2Text.Should().Contain(mstest2Dll.FrameworkName.ToString());
+
+            fixture.DiscoveredTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+        }
+
+        [Test(@"
+            Given two test assemblies that have the same architecture
+            but have different target frameworks.
+
+            When we run test discovery
+            and provide runsettings that define the desired target framework.
+
+            Then two testhosts should be started that target the framework chosen by runsettings.
+        ")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+        public async Task B()
+        {
+            // -- arrange
+            using var fixture = new Fixture();
+
+            var mstest1Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest1.dll")
+                .WithFramework(KnownFrameworkNames.Net5) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(11, 5)
+                .Build();
+
+            var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+            var runTests1 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .DiscoveryInitialize(FakeMessage.NoResponse)
+                .StartDiscovery(mstest1Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+                .Build();
+
+            var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest1Dll)
+                .WithProcess(testhost1Process)
+                .WithResponses(runTests1)
+                .Build();
+
+            // --
+
+            var mstest2Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest2.dll")
+                .WithFramework(KnownFrameworkNames.Net6) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(21, 5)
+                .Build();
+
+            var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+            var runTests2 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .DiscoveryInitialize(FakeMessage.NoResponse)
+                .StartDiscovery(mstest2Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+                // We actually do get asked to terminate multiple times. In the second host only.
+                .SessionEnd(FakeMessage.NoResponse)
+                .Build();
+
+            var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest2Dll)
+                .WithProcess(testhost2Process)
+                .WithResponses(runTests2)
+                .Build();
+
+            fixture.AddTestHostFixtures(testhost1, testhost2);
+
+            var testRequestManager = fixture.BuildTestRequestManager();
+
+            mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+            // -- act
+            var testDiscoveryPayload = new DiscoveryRequestPayload
+            {
+                Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+                RunSettings = $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{KnownFrameworkStrings.Net7}</TargetFrameworkVersion></RunConfiguration></RunSettings>"
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.DiscoverTests(testDiscoveryPayload, fixture.TestDiscoveryEventsRegistrar, fixture.ProtocolConfig));
+
+            // -- assert
+            fixture.AssertNoErrors();
+            // Runsettings will force NET7, so we should get a warning.
+            fixture.LoggedWarnings.Should().ContainMatch("Test run detected DLL(s) which would use different framework*");
+
+            fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+            var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartDiscovery);
+            var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+            // We sent mstest1.dll and net7 because that is what we have in settings.
+            startWithSources1Text.Should().Contain("mstest1.dll");
+            startWithSources1Text.Should().Contain(KnownFrameworkStrings.Net7);
+
+            var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartDiscovery);
+            var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+            // We sent mstest2.dll and net7 because that is what we have in settings.
+            startWithSources2Text.Should().Contain("mstest2.dll");
+            startWithSources2Text.Should().Contain(KnownFrameworkStrings.Net7);
+
+            fixture.DiscoveredTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+        }
+    }
+
+    public class MultiTFMExecution
+    {
+        [Test(@"
+            Given two test assemblies that have the same architecture
+            but have different target frameworks.
+
+            When we execute tests.
+
+            Then two testhosts should be started that target the same framework as each assembly.
+        ")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+        public async Task C()
+        {
+            // -- arrange
+            using var fixture = new Fixture();
+
+            var mstest1Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest1.dll")
+                .WithFramework(KnownFrameworkNames.Net5) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(11, 5)
+                .Build();
+
+            var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+            var runTests1 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+                .Build();
+
+            var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest1Dll)
+                .WithProcess(testhost1Process)
+                .WithResponses(runTests1)
+                .Build();
+
+            // --
+
+            var mstest2Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest2.dll")
+                .WithFramework(KnownFrameworkNames.Net6) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(21, 5)
+                .Build();
+
+            var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+            var runTests2 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest2Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+                // We actually do get asked to terminate multiple times. In the second host only.
+                .SessionEnd(FakeMessage.NoResponse)
+                .Build();
+
+            var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest2Dll)
+                .WithProcess(testhost2Process)
+                .WithResponses(runTests2)
+                .Build();
+
+            fixture.AddTestHostFixtures(testhost1, testhost2);
+
+            var testRequestManager = fixture.BuildTestRequestManager();
+
+            mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+            // -- act
+            var testRunRequestPayload = new TestRunRequestPayload
+            {
+                Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+                RunSettings = $"<RunSettings></RunSettings>"
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+            // -- assert
+            fixture.AssertNoErrors();
+            // We figure out the framework for each assembly so there should be no incompatibility warnings
+            fixture.LoggedWarnings.Should().NotContainMatch("Test run detected DLL(s) which would use different framework*");
+
+            fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+            var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+            // We sent mstest1.dll.
+            startWithSources1Text.Should().Contain("mstest1.dll");
+            // And we sent net5 as the target framework, because that is the framework of mstest1.dll.
+            startWithSources1Text.Should().Contain(KnownFrameworkStrings.Net5);
+
+            var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+            // We sent mstest2.dll.
+            startWithSources2Text.Should().Contain("mstest2.dll");
+            // And we sent net48 as the target framework, because that is the framework of mstest2.dll.
+            startWithSources2Text.Should().Contain(KnownFrameworkStrings.Net6);
+
+            fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+        }
+
+        [Test(@"
+            Given two test assemblies that have the same architecture
+            but have different target frameworks.
+
+            When we execute tests
+            and provide runsettings that define the desired target framework.
+
+            Then two testhosts should be started that target the framework chosen by runsettings.
+        ")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+        public async Task D()
+        {
+            // -- arrange
+            using var fixture = new Fixture();
+
+            var mstest1Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest1.dll")
+                .WithFramework(KnownFrameworkNames.Net5) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(11, 5)
+                .Build();
+
+            var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+            var runTests1 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+                .Build();
+
+            var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest1Dll)
+                .WithProcess(testhost1Process)
+                .WithResponses(runTests1)
+                .Build();
+
+            // --
+
+            var mstest2Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest2.dll")
+                .WithFramework(KnownFrameworkNames.Net6) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(21, 5)
+                .Build();
+
+            var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+            var runTests2 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest2Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+                // We actually do get asked to terminate multiple times. In the second host only.
+                .SessionEnd(FakeMessage.NoResponse)
+                .Build();
+
+            var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest2Dll)
+                .WithProcess(testhost2Process)
+                .WithResponses(runTests2)
+                .Build();
+
+            fixture.AddTestHostFixtures(testhost1, testhost2);
+
+            var testRequestManager = fixture.BuildTestRequestManager();
+
+            mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+            // -- act
+            var testRunRequestPayload = new TestRunRequestPayload
+            {
+                Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+                RunSettings = $"<RunSettings><RunConfiguration><TargetFrameworkVersion>{KnownFrameworkStrings.Net7}</TargetFrameworkVersion></RunConfiguration></RunSettings>"
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+            // -- assert
+            fixture.AssertNoErrors();
+            // We specify net7 which is not compatible with either, so we should get warnings
+            fixture.LoggedWarnings.Should().ContainMatch("Test run detected DLL(s) which would use different framework*");
+
+            fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+            var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+            // We sent mstest1.dll.
+            startWithSources1Text.Should().Contain("mstest1.dll");
+            startWithSources1Text.Should().Contain(KnownFrameworkStrings.Net7);
+
+            var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+            // We sent mstest2.dll.
+            startWithSources2Text.Should().Contain("mstest2.dll");
+            startWithSources2Text.Should().Contain(KnownFrameworkStrings.Net7);
+
+            fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+        }
+    }
+
+    public class MultiTFMTestSessions
+    {
+
+        [Test(@"
+            Given two test assemblies that have the same architecture
+            but have different target frameworks.
+
+            When we execute tests
+            and provide runsettings that define the desired target framework.
+
+            Then two testhosts should be started that target the framework chosen by runsettings.
+        ")]
+        [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+        public async Task E()
+        {
+            // -- arrange
+            using var fixture = new Fixture();
+
+            var mstest1Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest1.dll")
+                .WithFramework(KnownFrameworkNames.Net5) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(11, 5)
+                .Build();
+
+            var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+            var runTests1 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+                .Build();
+
+            var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest1Dll)
+                .WithProcess(testhost1Process)
+                .WithResponses(runTests1)
+                .Build();
+
+            // --
+
+            var mstest2Dll = new FakeTestDllBuilder()
+                .WithPath(@"X:\fake\mstest2.dll")
+                .WithFramework(KnownFrameworkNames.Net6) // <---
+                .WithArchitecture(Architecture.X64)
+                .WithTestCount(21, 5)
+                .Build();
+
+            var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+            var runTests2 = new FakeTestHostResponsesBuilder()
+                .VersionCheck(5)
+                .ExecutionInitialize(FakeMessage.NoResponse)
+                .StartTestExecutionWithSources(mstest2Dll.TestResultBatches)
+                .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+                // We actually do get asked to terminate multiple times. In the second host only.
+                .SessionEnd(FakeMessage.NoResponse)
+                .Build();
+
+            var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+                .WithTestDll(mstest2Dll)
+                .WithProcess(testhost2Process)
+                .WithResponses(runTests2)
+                .Build();
+
+            fixture.AddTestHostFixtures(testhost1, testhost2);
+
+            var testRequestManager = fixture.BuildTestRequestManager();
+
+            mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+            // -- act
+
+            var startTestSessionPayload = new StartTestSessionPayload
+            {
+                // We need to have a parallel run, otherwise we will create just a single proxy,
+                // because 1 is the maximum number of proxies to start for non-parallel run.
+                RunSettings = "<RunSettings><RunConfiguration><MaxCpuCount>0</MaxCpuCount></RunConfiguration></RunSettings>",
+                Sources = new[] { mstest1Dll.Path, mstest2Dll.Path }
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.StartTestSession(startTestSessionPayload, testHostLauncher: null, fixture.TestSessionEventsHandler, fixture.ProtocolConfig));
+
+            // You need to pass this on, otherwise it will ignore the test session that you just started. This is a by product of being able to start multiple test sessions.
+            var testSessionInfo = fixture.TestSessionEventsHandler.StartTestSessionCompleteEvents.Single()!.TestSessionInfo;
+
+            var testRunRequestPayload = new TestRunRequestPayload
+            {
+                Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+                RunSettings = $"<RunSettings><RunConfiguration><MaxCpuCount>0</MaxCpuCount></RunConfiguration></RunSettings>",
+                TestSessionInfo = testSessionInfo,
+            };
+
+            await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+            // -- assert
+            fixture.AssertNoErrors();
+            // We figure out the framework for each assembly so there should be no incompatibility warnings
+            fixture.LoggedWarnings.Should().NotContainMatch("Test run detected DLL(s) which would use different framework*");
+
+            fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+            var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+            // We sent mstest1.dll.
+            startWithSources1Text.Should().Contain("mstest1.dll");
+            startWithSources1Text.Should().Contain(mstest1Dll.FrameworkName.ToString());
+
+            var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+            var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+            // We sent mstest2.dll.
+            startWithSources2Text.Should().Contain("mstest2.dll");
+            startWithSources2Text.Should().Contain(mstest2Dll.FrameworkName.ToString());
+
+            fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount + mstest2Dll.TestCount);
+        }
+    }
+}
+
+public class MultiTFMRunAndDiscoveryCompatibilityMode
+{
+    [Test(@"
+        Given two test assemblies that have the same architecture
+        but have different target frameworks.
+
+        When DISABLE_MULTI_TFM_RUN is set
+        and we execute tests.
+
+        Then two testhosts are both started for the same TFM.
+    ")]
+    [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Specific test needs to be non-static")]
+    public async Task E()
+    {
+        // -- arrange
+        using var fixture = new Fixture(
+            new FixtureOptions
+            {
+                FeatureFlags = new Dictionary<string, bool>
+                {
+                    [FeatureFlag.VSTEST_DISABLE_MULTI_TFM_RUN] = true
+                }
+            }
+        );
+
+        var mstest1Dll = new FakeTestDllBuilder()
+            .WithPath(@"X:\fake\mstest1.dll")
+            .WithFramework(KnownFrameworkNames.Net5) // <---
+            .WithArchitecture(Architecture.X64)
+            .WithTestCount(2)
+            .Build();
+
+        var testhost1Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost1.exe");
+
+        var runTests1 = new FakeTestHostResponsesBuilder()
+            .VersionCheck(5)
+            .ExecutionInitialize(FakeMessage.NoResponse)
+            .StartTestExecutionWithSources(mstest1Dll.TestResultBatches)
+            .SessionEnd(FakeMessage.NoResponse, afterAction: _ => testhost1Process.Exit())
+            .SessionEnd(FakeMessage.NoResponse)
+            .Build();
+
+        var testhost1 = new FakeTestHostFixtureBuilder(fixture)
+            .WithTestDll(mstest1Dll)
+            .WithProcess(testhost1Process)
+            .WithResponses(runTests1)
+            .Build();
+
+        // --
+
+        var mstest2Dll = new FakeTestDllBuilder()
+            .WithPath(@"X:\fake\mstest2.dll")
+            .WithFramework(KnownFrameworkNames.Net48) // <---
+            .WithArchitecture(Architecture.X64)
+            // In reality, the dll would fail to load, and no tests would run from this dll,
+            // we simulate that by making it have 0 tests.
+            .WithTestCount(0)
+            .Build();
+
+        var testhost2Process = new FakeProcess(fixture.ErrorAggregator, @"X:\fake\testhost2.exe");
+
+        var runTests2 = new FakeTestHostResponsesBuilder()
+            .VersionCheck(5)
+            .ExecutionInitialize(FakeMessage.NoResponse)
+            .StartTestExecutionWithSources(mstest2Dll.TestResultBatches)
+            .SessionEnd(FakeMessage.NoResponse, _ => testhost2Process.Exit())
+            .SessionEnd(FakeMessage.NoResponse)
+            .Build();
+
+        var testhost2 = new FakeTestHostFixtureBuilder(fixture)
+            .WithTestDll(mstest2Dll)
+            .WithProcess(testhost2Process)
+            .WithResponses(runTests2)
+            .Build();
+
+        fixture.AddTestHostFixtures(testhost1, testhost2);
+
+        var testRequestManager = fixture.BuildTestRequestManager();
+
+        mstest1Dll.FrameworkName.Should().NotBe(mstest2Dll.FrameworkName);
+
+        // -- act
+        var testRunRequestPayload = new TestRunRequestPayload
+        {
+            Sources = new List<string> { mstest1Dll.Path, mstest2Dll.Path },
+            RunSettings = $"<RunSettings></RunSettings>",
+        };
+
+        await testRequestManager.ExecuteWithAbort(tm => tm.RunTests(testRunRequestPayload, testHostLauncher: null, fixture.TestRunEventsRegistrar, fixture.ProtocolConfig));
+
+        // -- assert
+        fixture.AssertNoErrors();
+        // We unify the frameworks to netcoreapp1.0 (because the vstest.console dll we are loading is built for netcoreapp and prefers netcoreapp), and because the
+        // behavior is to choose the common oldest framework. We then log warning about incompatible sources.
+        fixture.LoggedWarnings.Should().ContainMatch($"Test run detected DLL(s) which would use different framework and platform versions*{KnownFrameworkNames.Netcoreapp1}*");
+
+        // We started both testhosts, even thought we know one of them is incompatible.
+        fixture.ProcessHelper.Processes.Where(p => p.Started).Should().HaveCount(2);
+        var startWithSources1 = testhost1.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+        var startWithSources1Text = startWithSources1.Request.GetRawMessage();
+        // We sent mstest1.dll
+        startWithSources1Text.Should().Contain("mstest1.dll");
+        // And we sent netcoreapp1.0 as the target framework, because that is the common fallback
+        startWithSources1Text.Should().Contain(KnownFrameworkStrings.Netcoreapp1);
+
+        var startWithSources2 = testhost2.FakeCommunicationChannel.ProcessedMessages.Single(m => m.Request.MessageType == MessageType.StartTestExecutionWithSources);
+        var startWithSources2Text = startWithSources2.Request.GetRawMessage();
+        // We sent mstest2.dll
+        startWithSources2Text.Should().Contain("mstest2.dll");
+        // And we sent netcoreapp1.0 as the target framework, because that is the common fallback, even though the source is not compatible with it
+        startWithSources2Text.Should().Contain(KnownFrameworkStrings.Netcoreapp1);
+
+        fixture.ExecutedTests.Should().HaveCount(mstest1Dll.TestCount);
+    }
+}
+
+internal static class MessageExtensions
+{
+    private static MethodInfo? s_messageProperty;
+
+    internal static string GetRawMessage(this Message request)
+    {
+        if (s_messageProperty == null)
+        {
+            s_messageProperty = request.GetType().GetProperty("RawMessage")!.GetGetMethod();
+        }
+
+        return (string)s_messageProperty!.Invoke(request, [])!;
+    }
+}
+
+// Test and improvmement ideas:
+// TODO: passing null runsettings does not fail fast, instead it fails in Fakes settings code
+// TODO: passing empty string fails in the xml parser code
+// TODO: passing null sources and null testcases does not fail fast
+// TODO: Just calling Exit, Close won't stop the run, we will keep waiting for test run to complete, I think in real life when we exit then Disconnected will be called on the vstest.console side, leading to abort flow.
+//.StartTestExecutionWithSources(new FakeMessage<TestMessagePayload>(MessageType.TestMessage, new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = "Loading type failed." }), afterAction: f => { /*f.Process.Exit();*/ f.FakeCommunicationEndpoint.Disconnect(); })
diff --git a/test/vstest.ProgrammerTests/Program.cs b/test/vstest.ProgrammerTests/Program.cs
new file mode 100644
index 0000000000..f6d0f025be
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Program.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Reflection;
+
+namespace vstest.ProgrammerTests;
+
+internal class Program
+{
+    static void Main()
+    {
+        Intent.Console.Program.Main([Assembly.GetExecutingAssembly().Location]);
+    }
+}
diff --git a/test/vstest.ProgrammerTests/Properties/launchSettings.json b/test/vstest.ProgrammerTests/Properties/launchSettings.json
new file mode 100644
index 0000000000..7425c62a46
--- /dev/null
+++ b/test/vstest.ProgrammerTests/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    },
+    "vstest.ProgrammerTests": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
new file mode 100644
index 0000000000..8239cfe76f
--- /dev/null
+++ b/test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TestProject>false</TestProject>
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
+    <ProjectReference Include="..\..\src\vstest.console\vstest.console.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj">
+      <FromP2P>true</FromP2P>
+    </ProjectReference>
+    <ProjectReference Include="..\Intent\Intent.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetFrameworkMinimum)')) ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Runtime.Serialization" />
+  </ItemGroup>
+</Project>
diff --git a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs b/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs
deleted file mode 100644
index e479237fa8..0000000000
--- a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.PlatformTests
-{
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using Microsoft.TestPlatform.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using Utilities.Helpers;
-    using Utilities.Helpers.Interfaces;
-
-    [TestClass]
-    public class AssemblyMetadataProviderTests : IntegrationTestBase
-    {
-        private const int ExpectedTimeForFindingArchForDotNetAssembly = 15; // In milliseconds.
-        private const string PerfAssertMessageFormat = "Expected Elapsed Time: {0} ms, Actual Elapsed Time: {1} ms";
-
-        private IAssemblyMetadataProvider assemblyMetadataProvider;
-
-        private Mock<IFileHelper> fileHelperMock;
-
-        private FileHelper fileHelper;
-
-        private bool isManagedAssemblyArchitectureTest;
-
-        public AssemblyMetadataProviderTests()
-        {
-            this.fileHelper = new FileHelper();
-            this.fileHelperMock = new Mock<IFileHelper>();
-            this.isManagedAssemblyArchitectureTest = false;
-            this.assemblyMetadataProvider = new AssemblyMetadataProvider(this.fileHelperMock.Object);
-
-            this.fileHelperMock.Setup(f =>
-                    f.GetStream(It.IsAny<string>(), FileMode.Open, FileAccess.Read))
-                .Returns<string, FileMode, FileAccess>((filePath, mode, access) => this.fileHelper.GetStream(filePath, mode, access));
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            if (!this.isManagedAssemblyArchitectureTest)
-            {
-                this.fileHelperMock.Verify(
-                    f => f.GetStream(It.IsAny<string>(), FileMode.Open, FileAccess.Read), Times.Once);
-            }
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framework)
-        {
-            this.TestDotnetAssemblyArch("SimpleTestProject3", framework, Architecture.X64, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framework)
-        {
-            this.TestDotnetAssemblyArch("SimpleTestProjectx86", framework, Architecture.X86, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetArchitectureShouldReturnCorrentArchForAnyCPUAssembly(string framework)
-        {
-            this.TestDotnetAssemblyArch("SimpleTestProject", framework, Architecture.AnyCPU, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetArchitectureShouldReturnCorrentArchForARMAssembly(string framework)
-        {
-            this.TestDotnetAssemblyArch("SimpleTestProjectARM", framework, Architecture.ARM, expectedElapsedTime: ExpectedTimeForFindingArchForDotNetAssembly);
-        }
-
-        [TestMethod]
-        [DataRow("x86")]
-        [DataRow("x64")]
-        public void GetArchitectureForNativeDll(string platform)
-        {
-            var expectedElapsedTime = 5;
-            var platformPath = platform.Equals("x64") ? platform : string.Empty;
-            var assemblyPath = $@"{this.testEnvironment.PackageDirectory}\microsoft.testplatform.testasset.nativecpp\2.0.0\"
-                + $@"contentFiles\any\any\{platformPath}\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
-            this.LoadAssemblyIntoMemory(assemblyPath);
-            var stopWatch = Stopwatch.StartNew();
-            var arch = this.assemblyMetadataProvider.GetArchitecture(assemblyPath);
-            stopWatch.Stop();
-
-            Console.WriteLine("Platform:{0}, {1}", platform, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-            Assert.AreEqual(Enum.Parse(typeof(Architecture), platform, ignoreCase: true), arch);
-
-            // We should not assert on time elapsed, it will vary depending on machine, & their state, commenting below assert
-            // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-        }
-
-        [TestMethod]
-        [DataRow("net451")]
-        [DataRow("netcoreapp2.1")]
-        public void GetFrameWorkForDotNetAssembly(string framework)
-        {
-            var expectedElapsedTime = 5;
-            var assemblyPath = this.testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
-            this.LoadAssemblyIntoMemory(assemblyPath);
-            var stopWatch = Stopwatch.StartNew();
-            var actualFx = this.assemblyMetadataProvider.GetFrameWork(assemblyPath);
-            stopWatch.Stop();
-
-            if (framework.Equals("net451"))
-            {
-                // Reason is unknown for why full framework it is taking more time. Need to investigate.
-                expectedElapsedTime = 100;
-                Assert.AreEqual(Constants.DotNetFramework451, actualFx.FullName);
-            }
-            else
-            {
-                Assert.AreEqual(".NETCoreApp,Version=v2.1", actualFx.FullName);
-            }
-
-            Console.WriteLine("Framework:{0}, {1}", framework, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-
-            // We should not assert on time elapsed, it will vary depending on machine, & their state.
-            // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-        }
-
-        [TestMethod]
-        public void GetFrameWorkForNativeDll()
-        {
-            var expectedElapsedTime = 5;
-            var assemblyPath = $@"{this.testEnvironment.PackageDirectory}\microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
-            this.LoadAssemblyIntoMemory(assemblyPath);
-            var stopWatch = Stopwatch.StartNew();
-            var fx = this.assemblyMetadataProvider.GetFrameWork(assemblyPath);
-            stopWatch.Stop();
-
-            Console.WriteLine(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds);
-            Assert.AreEqual(Framework.DefaultFramework.Name, fx.FullName);
-
-            // We should not assert on time elapsed, it will vary depending on machine, & their state.
-            // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-        }
-
-        private void TestDotnetAssemblyArch(string projectName, string framework, Architecture expectedArch, long expectedElapsedTime)
-        {
-            this.isManagedAssemblyArchitectureTest = true;
-            var assemblyPath = this.testEnvironment.GetTestAsset(projectName + ".dll", framework);
-            this.LoadAssemblyIntoMemory(assemblyPath);
-            var stopWatch = Stopwatch.StartNew();
-            var arch = this.assemblyMetadataProvider.GetArchitecture(assemblyPath);
-            stopWatch.Stop();
-
-            Console.WriteLine("Framework:{0}, {1}", framework, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-            Assert.AreEqual(expectedArch, arch, $"Expected: {expectedArch} Actual: {arch}");
-
-            // We should not assert on time elapsed, it will vary depending on machine, & their state.
-            // Assert.IsTrue(stopWatch.ElapsedMilliseconds < expectedElapsedTime, string.Format(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds));
-        }
-
-        private void LoadAssemblyIntoMemory(string assemblyPath)
-        {
-            // Load the file into RAM in ahead to avoid performance number(expectedElapsedTime) dependence on disk read time.
-            File.ReadAllBytes(assemblyPath);
-        }
-    }
-}
diff --git a/test/vstest.console.PlatformTests/Program.cs b/test/vstest.console.PlatformTests/Program.cs
deleted file mode 100644
index c4dbddbd90..0000000000
--- a/test/vstest.console.PlatformTests/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.PlatformTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
diff --git a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj b/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj
deleted file mode 100644
index e2dd910ffa..0000000000
--- a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
-    <TestProject>true</TestProject>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
-    <AssemblyName>vstest.console.PlatformTests</AssemblyName>
-    <EnableCodeAnalysis>true</EnableCodeAnalysis>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\vstest.console\vstest.console.csproj" />
-    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
-</Project>
diff --git a/test/vstest.console.UnitTests/CommandLine/CommandLineOptionsTests.cs b/test/vstest.console.UnitTests/CommandLine/CommandLineOptionsTests.cs
index b4dc8ff3a5..a45cdeebc6 100644
--- a/test/vstest.console.UnitTests/CommandLine/CommandLineOptionsTests.cs
+++ b/test/vstest.console.UnitTests/CommandLine/CommandLineOptionsTests.cs
@@ -1,98 +1,105 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine;
+
+[TestClass]
+public class CommandLineOptionsTests
 {
-    using System;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System.IO;
-    using vstest.console.Internal;
-    using Microsoft.Extensions.FileSystemGlobbing;
-
-    [TestClass]
-    public class CommandLineOptionsTests
+    private readonly Mock<IFileHelper> _fileHelper;
+    private readonly FilePatternParser _filePatternParser;
+    private readonly string _currentDirectory = @"C:\\Temp";
+
+    public CommandLineOptionsTests()
     {
-        private readonly Mock<IFileHelper> fileHelper;
-        private FilePatternParser filePatternParser;
-        private readonly string currentDirectory = @"C:\\Temp";
-
-        public CommandLineOptionsTests()
-        {
-            this.fileHelper = new Mock<IFileHelper>();
-            this.filePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.fileHelper.Object);
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.FileHelper = this.fileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = this.filePatternParser;
-            this.fileHelper.Setup(fh => fh.GetCurrentDirectory()).Returns(currentDirectory);
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsDefaultBatchSizeIsTen()
-        {
-            Assert.AreEqual(10, CommandLineOptions.Instance.BatchSize);
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsDefaultTestRunStatsEventTimeoutIsOnePointFiveSec()
-        {
-            var timeout = new TimeSpan(0, 0, 0, 1, 500);
-            Assert.AreEqual(timeout, CommandLineOptions.Instance.TestStatsEventTimeout);
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsGetForSourcesPropertyShouldReturnReadonlySourcesEnumerable()
-        {
-            Assert.IsTrue(CommandLineOptions.Instance.Sources is ReadOnlyCollection<string>);
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsGetForHasPhoneContextPropertyIfTargetDeviceIsSetReturnsTrue()
-        {
-            Assert.IsFalse(CommandLineOptions.Instance.HasPhoneContext);
-
-            // Set some not null value
-            CommandLineOptions.Instance.TargetDevice = "TargetDevice";
-            Assert.IsTrue(CommandLineOptions.Instance.HasPhoneContext);
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsAddSourceShouldThrowCommandLineExceptionForNullSource()
-        {
-            Assert.ThrowsException<TestSourceException>(() => CommandLineOptions.Instance.AddSource(null));
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsAddSourceShouldConvertRelativePathToAbsolutePath()
-        {
-            string relativeTestFilePath = "DummyTestFile.txt";
-            var absolutePath = Path.Combine(currentDirectory, relativeTestFilePath);
-            this.fileHelper.Setup(fh => fh.Exists(absolutePath)).Returns(true);
-
-            // Pass relative path
-            CommandLineOptions.Instance.AddSource(relativeTestFilePath);
-            Assert.IsTrue(CommandLineOptions.Instance.Sources.Contains(absolutePath));
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsAddSourceShouldThrowCommandLineExceptionForInvalidSource()
-        {
-            Assert.ThrowsException<TestSourceException>(() => CommandLineOptions.Instance.AddSource("DummySource"));
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsAddSourceShouldAddSourceForValidSource()
-        {
-            string testFilePath = Path.Combine(Path.GetTempPath(), "DummyTestFile.txt");
-            this.fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
-
-            CommandLineOptions.Instance.AddSource(testFilePath);
-
-            Assert.IsTrue(CommandLineOptions.Instance.Sources.Contains(testFilePath));
-        }
+        _fileHelper = new Mock<IFileHelper>();
+        _filePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _fileHelper.Object);
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.FileHelper = _fileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = _filePatternParser;
+        _fileHelper.Setup(fh => fh.GetCurrentDirectory()).Returns(_currentDirectory);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsDefaultBatchSizeIsTen()
+    {
+        Assert.AreEqual(10, CommandLineOptions.Instance.BatchSize);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsDiscoveryDefaultBatchSizeIsThousand()
+    {
+        Assert.AreEqual(1000, CommandLineOptions.DefaultDiscoveryBatchSize);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsDefaultTestRunStatsEventTimeoutIsOnePointFiveSec()
+    {
+        var timeout = new TimeSpan(0, 0, 0, 1, 500);
+        Assert.AreEqual(timeout, CommandLineOptions.Instance.TestStatsEventTimeout);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsGetForSourcesPropertyShouldReturnReadonlySourcesEnumerable()
+    {
+        Assert.IsTrue(CommandLineOptions.Instance.Sources is ReadOnlyCollection<string>);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsGetForHasPhoneContextPropertyIfTargetDeviceIsSetReturnsTrue()
+    {
+        Assert.IsFalse(CommandLineOptions.Instance.HasPhoneContext);
+
+        // Set some not null value
+        CommandLineOptions.Instance.TargetDevice = "TargetDevice";
+        Assert.IsTrue(CommandLineOptions.Instance.HasPhoneContext);
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsAddSourceShouldThrowCommandLineExceptionForNullSource()
+    {
+        Assert.ThrowsException<TestSourceException>(() => CommandLineOptions.Instance.AddSource(null!));
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsAddSourceShouldConvertRelativePathToAbsolutePath()
+    {
+        string relativeTestFilePath = "DummyTestFile.txt";
+        var absolutePath = Path.Combine(_currentDirectory, relativeTestFilePath);
+        _fileHelper.Setup(fh => fh.Exists(absolutePath)).Returns(true);
+
+        // Pass relative path
+        CommandLineOptions.Instance.AddSource(relativeTestFilePath);
+        Assert.IsTrue(CommandLineOptions.Instance.Sources.Contains(absolutePath));
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsAddSourceShouldThrowCommandLineExceptionForInvalidSource()
+    {
+        Assert.ThrowsException<TestSourceException>(() => CommandLineOptions.Instance.AddSource("DummySource"));
+    }
+
+    [TestMethod]
+    public void CommandLineOptionsAddSourceShouldAddSourceForValidSource()
+    {
+        string testFilePath = Path.Combine(Path.GetTempPath(), "DummyTestFile.txt");
+        _fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
+
+        CommandLineOptions.Instance.AddSource(testFilePath);
+
+        Assert.IsTrue(CommandLineOptions.Instance.Sources.Contains(testFilePath));
     }
 }
diff --git a/test/vstest.console.UnitTests/CommandLine/GenerateFakesUtilitiesTests.cs b/test/vstest.console.UnitTests/CommandLine/GenerateFakesUtilitiesTests.cs
index 11fd95ee4a..201ee8312c 100644
--- a/test/vstest.console.UnitTests/CommandLine/GenerateFakesUtilitiesTests.cs
+++ b/test/vstest.console.UnitTests/CommandLine/GenerateFakesUtilitiesTests.cs
@@ -1,44 +1,44 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine;
+
+[TestClass]
+public class GenerateFakesUtilitiesTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
+    private readonly Mock<IFileHelper> _fileHelper;
+    private readonly string _currentDirectory = @"C:\\Temp";
+    private readonly string _runSettings = string.Empty;
+
+    public GenerateFakesUtilitiesTests()
+    {
+        _fileHelper = new Mock<IFileHelper>();
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.FileHelper = _fileHelper.Object;
+        _fileHelper.Setup(fh => fh.GetCurrentDirectory()).Returns(_currentDirectory);
+        _runSettings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
+    }
 
-    [TestClass]
-    public class GenerateFakesUtilitiesTests
+    [TestMethod]
+    public void CommandLineOptionsDefaultDisableAutoFakesIsFalse()
     {
-        private readonly Mock<IFileHelper> fileHelper;
-        private readonly string currentDirectory = @"C:\\Temp";
-        private string runSettings = string.Empty;
-
-        public GenerateFakesUtilitiesTests()
-        {
-            this.fileHelper = new Mock<IFileHelper>();
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.FileHelper = this.fileHelper.Object;
-            this.fileHelper.Setup(fh => fh.GetCurrentDirectory()).Returns(currentDirectory);
-            this.runSettings = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
-        }
-
-        [TestMethod]
-        public void CommandLineOptionsDefaultDisableAutoFakesIsFalse()
-        {
-            Assert.IsFalse(CommandLineOptions.Instance.DisableAutoFakes);
-        }
-
-        [TestMethod]
-        public void FakesShouldNotBeGeneratedIfDisableAutoFakesSetToTrue()
-        {
-            CommandLineOptions.Instance.DisableAutoFakes = true;
-            string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
-
-            GenerateFakesUtilities.GenerateFakesSettings(CommandLineOptions.Instance, new string[] { }, ref runSettingsXml);
-            Assert.AreEqual(runSettingsXml, this.runSettings);
-        }
+        Assert.IsFalse(CommandLineOptions.Instance.DisableAutoFakes);
+    }
 
+    [TestMethod]
+    public void FakesShouldNotBeGeneratedIfDisableAutoFakesSetToTrue()
+    {
+        CommandLineOptions.Instance.DisableAutoFakes = true;
+        string runSettingsXml = @"<RunSettings><RunConfiguration><TargetFrameworkVersion>.netstandard,Version=5.0</TargetFrameworkVersion></RunConfiguration ></RunSettings>";
+
+        runSettingsXml = GenerateFakesUtilities.GenerateFakesSettings(CommandLineOptions.Instance, [], runSettingsXml);
+        Assert.AreEqual(runSettingsXml, _runSettings);
     }
+
 }
diff --git a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
index 720986a29e..c03e9bc02a 100644
--- a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
+++ b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
@@ -3,273 +3,269 @@
 
 using System.Collections.Generic;
 using System.Runtime.Versioning;
+
 using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
+using Moq;
 
-    [TestClass]
-    public class InferHelperTests
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine;
+
+[TestClass]
+public class InferHelperTests
+{
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyHelper;
+    private readonly InferHelper _inferHelper;
+    private readonly Framework _defaultFramework = Framework.DefaultFramework;
+    private readonly Architecture _defaultArchitecture = Architecture.X64;
+    private readonly Framework _frameworkNet45 = Framework.FromString(".NETFramework,Version=4.5")!;
+    private readonly Framework _frameworkNet46 = Framework.FromString(".NETFramework,Version=4.6")!;
+    private readonly Framework _frameworkNet47 = Framework.FromString(".NETFramework,Version=4.7")!;
+    private readonly Framework _frameworkCore10 = Framework.FromString(".NETCoreApp,Version=1.0")!;
+    private readonly Framework _frameworkCore11 = Framework.FromString(".NETCoreApp,Version=1.1")!;
+
+    public InferHelperTests()
     {
-        private readonly Mock<IAssemblyMetadataProvider> mockAssemblyHelper;
-        private InferHelper inferHelper;
-        private readonly Framework defaultFramework = Framework.DefaultFramework;
-        private readonly Architecture DefaultArchitecture = Architecture.X64;
-        private readonly Framework frameworkNet45 = Framework.FromString(".NETFramework,Version=4.5");
-        private readonly Framework frameworkNet46 = Framework.FromString(".NETFramework,Version=4.6");
-        private readonly Framework frameworkNet47 = Framework.FromString(".NETFramework,Version=4.7");
-        private readonly Framework frameworkCore10 = Framework.FromString(".NETCoreApp,Version=1.0");
-        private readonly Framework frameworkCore11 = Framework.FromString(".NETCoreApp,Version=1.1");
-        private IDictionary<string, Framework> sourceFrameworks;
-        private IDictionary<string, Architecture> sourceArchitectures;
-
-        public InferHelperTests()
-        {
-            this.mockAssemblyHelper  = new Mock<IAssemblyMetadataProvider>();
-            inferHelper = new InferHelper(this.mockAssemblyHelper.Object);
-            sourceFrameworks = new Dictionary<string, Framework>();
-            sourceArchitectures = new Dictionary<string, Architecture>();
-        }
+        _mockAssemblyHelper = new Mock<IAssemblyMetadataProvider>();
+        _inferHelper = new InferHelper(_mockAssemblyHelper.Object);
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnNullSources()
-        {
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(null, sourceArchitectures, DefaultArchitecture));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnNullSources()
+    {
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(null, _defaultArchitecture, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnEmptySources()
-        {
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>(0), sourceArchitectures, DefaultArchitecture));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnEmptySources()
+    {
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>(0), _defaultArchitecture, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnNullItemInSources()
-        {
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>(){null}, sourceArchitectures, DefaultArchitecture));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnNullItemInSources()
+    {
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { null! }, _defaultArchitecture, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnWhiteSpaceItemInSources()
-        {
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { " "}, sourceArchitectures, DefaultArchitecture));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchitectureOnWhiteSpaceItemInSources()
+    {
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { " " }, _defaultArchitecture, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnCorrectArchForOneSource()
-        {
-            this.mockAssemblyHelper.Setup(ah => ah.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X86);
-            Assert.AreEqual(Architecture.X86, inferHelper.AutoDetectArchitecture(new List<string>(){"1.dll"}, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnCorrectArchForOneSource()
+    {
+        _mockAssemblyHelper.Setup(ah => ah.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X86);
+        Assert.AreEqual(Architecture.X86, _inferHelper.AutoDetectArchitecture(new List<string>() { "1.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnCorrectDefaultArchForNotDotNetAssembly()
-        {
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { "NotDotNetAssebly.appx" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Never);
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnCorrectDefaultArchForNotDotNetAssembly()
+    {
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { "NotDotNetAssebly.appx" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Never);
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldSetAnyCpuArchForNotDotNetAssembly()
-        {
-            inferHelper.AutoDetectArchitecture(new List<string>() { "NotDotNetAssebly.appx" }, sourceArchitectures, DefaultArchitecture);
-            Assert.AreEqual(Architecture.AnyCPU, sourceArchitectures["NotDotNetAssebly.appx"]);
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldSetDefaultArchForNotDotNetAssembly()
+    {
+        _inferHelper.AutoDetectArchitecture(new List<string>() { "NotDotNetAssebly.appx" }, _defaultArchitecture, out var sourceArchitectures);
+        Assert.AreEqual(_defaultArchitecture, sourceArchitectures["NotDotNetAssebly.appx"]);
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchForAllAnyCpuAssemblies()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU);
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "AnyCPU2.exe", "AnyCPU3.dll" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchForAllAnyCpuAssemblies()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU);
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "AnyCPU2.exe", "AnyCPU3.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnX86ArchIfOneX86AssemblyAndRestAnyCPU()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.X86);
-            Assert.AreEqual(Architecture.X86, inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "AnyCPU2.exe", "x86.dll" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnX86ArchIfOneX86AssemblyAndRestAnyCPU()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.X86);
+        Assert.AreEqual(Architecture.X86, _inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "AnyCPU2.exe", "x86.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnARMArchIfOneARMAssemblyAndRestAnyCPU()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.ARM).Returns(Architecture.ARM).Returns(Architecture.ARM);
-            Assert.AreEqual(Architecture.ARM, inferHelper.AutoDetectArchitecture(new List<string>() { "ARM1.dll", "ARM2.dll", "ARM3.dll" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnARMArchIfOneARMAssemblyAndRestAnyCPU()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM).Returns(Architecture.ARM).Returns(Architecture.ARM);
+        Assert.AreEqual(Architecture.ARM, _inferHelper.AutoDetectArchitecture(new List<string>() { "ARM1.dll", "ARM2.dll", "ARM3.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnX64ArchIfOneX64AssemblyAndRestAnyCPU()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.X64);
-            Assert.AreEqual(Architecture.X64, inferHelper.AutoDetectArchitecture(new List<string>() { "x64.dll", "AnyCPU2.exe", "x64.dll" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnX64ArchIfOneX64AssemblyAndRestAnyCPU()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU).Returns(Architecture.AnyCPU).Returns(Architecture.X64);
+        Assert.AreEqual(Architecture.X64, _inferHelper.AutoDetectArchitecture(new List<string>() { "x64.dll", "AnyCPU2.exe", "x64-2.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchOnConflictArches()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU).Returns(Architecture.X64).Returns(Architecture.X86);
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "x64.exe", "x86.dll" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchOnConflictArches()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU).Returns(Architecture.X64).Returns(Architecture.X86);
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "x64.exe", "x86.dll" }, _defaultArchitecture, out _));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldPoulateSourceArchitectureDictionary()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU).Returns(Architecture.X64).Returns(Architecture.X86);
+    [TestMethod]
+    public void AutoDetectArchitectureShouldPopulateSourceArchitectureDictionary()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU).Returns(Architecture.X64).Returns(Architecture.X86);
 
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "x64.exe", "x86.dll" }, sourceArchitectures, DefaultArchitecture));
-            Assert.AreEqual(3, sourceArchitectures.Count);
-            Assert.AreEqual(Architecture.AnyCPU, sourceArchitectures["AnyCPU1.dll"]);
-            Assert.AreEqual(Architecture.X64, sourceArchitectures["x64.exe"]);
-            Assert.AreEqual(Architecture.X86, sourceArchitectures["x86.dll"]);
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "x64.exe", "x86.dll" }, _defaultArchitecture, out var sourceArchitectures));
+        Assert.AreEqual(3, sourceArchitectures.Count);
+        Assert.AreEqual(_defaultArchitecture, sourceArchitectures["AnyCPU1.dll"]);
+        Assert.AreEqual(Architecture.X64, sourceArchitectures["x64.exe"]);
+        Assert.AreEqual(Architecture.X86, sourceArchitectures["x86.dll"]);
 
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
-        }
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectArchitectureShouldReturnDefaultArchIfthereIsNotDotNetAssemblyInSources()
-        {
-            this.mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.AnyCPU);
-            Assert.AreEqual(DefaultArchitecture, inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "NotDotNetAssebly.appx" }, sourceArchitectures, DefaultArchitecture));
-            this.mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(1));
-        }
+    [TestMethod]
+    public void AutoDetectArchitectureShouldReturnDefaultArchIfthereIsNotDotNetAssemblyInSources()
+    {
+        _mockAssemblyHelper.SetupSequence(ah => ah.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.AnyCPU);
+        Assert.AreEqual(_defaultArchitecture, _inferHelper.AutoDetectArchitecture(new List<string>() { "AnyCPU1.dll", "NotDotNetAssebly.appx" }, _defaultArchitecture, out var sourceArchitectures));
+        _mockAssemblyHelper.Verify(ah => ah.GetArchitecture(It.IsAny<string>()), Times.Exactly(1));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnNullSources()
-        {
-            Assert.AreEqual(defaultFramework, inferHelper.AutoDetectFramework(null, sourceFrameworks));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnNullSources()
+    {
+        Assert.AreEqual(_defaultFramework, _inferHelper.AutoDetectFramework(null, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnEmptySources()
-        {
-            Assert.AreEqual(defaultFramework, inferHelper.AutoDetectFramework(new List<string>(0), sourceFrameworks));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnEmptySources()
+    {
+        Assert.AreEqual(_defaultFramework, _inferHelper.AutoDetectFramework(new List<string?>(0), out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnNullItemInSources()
-        {
-            Assert.AreEqual(defaultFramework, inferHelper.AutoDetectFramework(new List<string>(){null}, sourceFrameworks));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnNullItemInSources()
+    {
+        Assert.AreEqual(_defaultFramework, _inferHelper.AutoDetectFramework(new List<string?>() { null! }, out _));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnEmptyItemInSources()
-        {
-            Assert.AreEqual(defaultFramework.Name, inferHelper.AutoDetectFramework(new List<string>() { string.Empty }, sourceFrameworks).Name);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnDefaultFrameworkOnEmptyItemInSources()
+    {
+        Assert.AreEqual(_defaultFramework.Name, _inferHelper.AutoDetectFramework(new List<string?>() { string.Empty }, out _).Name);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnFrameworkCore10OnCore10Sources()
-        {
-            var fx = frameworkCore10;
-            var assemblyName = "netcoreapp.dll";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, true);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnFrameworkCore10OnCore10Sources()
+    {
+        var fx = _frameworkCore10;
+        var assemblyName = "netcoreapp.dll";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, true);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnFramework46On46Sources()
-        {
-            var fx = frameworkNet46;
-            var assemblyName = "net46.dll";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, true);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnFramework46On46Sources()
+    {
+        var fx = _frameworkNet46;
+        var assemblyName = "net46.dll";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, true);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxFiles()
-        {
-            var fx = Framework.FromString(Constants.DotNetFrameworkUap10);
-            var assemblyName = "uwp10.appx";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, false);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxFiles()
+    {
+        var fx = Framework.FromString(Constants.DotNetFrameworkUap10)!;
+        var assemblyName = "uwp10.appx";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, false);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnFrameworkUap10ForMsixFiles()
-        {
-            var fx = Framework.FromString(Constants.DotNetFrameworkUap10);
-            var assemblyName = "uwp10.msix";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, false);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnFrameworkUap10ForMsixFiles()
+    {
+        var fx = Framework.FromString(Constants.DotNetFrameworkUap10)!;
+        var assemblyName = "uwp10.msix";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, false);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxrecipeFiles()
-        {
-            var fx = Framework.FromString(Constants.DotNetFrameworkUap10);
-            var assemblyName = "uwp10.appxrecipe";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, false);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxrecipeFiles()
+    {
+        var fx = Framework.FromString(Constants.DotNetFrameworkUap10)!;
+        var assemblyName = "uwp10.appxrecipe";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, false);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnDefaultFullFrameworkForJsFiles()
-        {
-            var fx = Framework.FromString(Constants.DotNetFramework40);
-            var assemblyName = "vstests.js";
-            SetupAndValidateForSingleAssembly(assemblyName, fx, false);
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnDefaultFullFrameworkForJsFiles()
+    {
+        var fx = Framework.FromString(Constants.DotNetFramework40)!;
+        var assemblyName = "vstests.js";
+        SetupAndValidateForSingleAssembly(assemblyName, fx, false);
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnHighestVersionFxOnSameFxName()
-        {
-            this.mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny<string>()))
-                .Returns(new FrameworkName(frameworkNet46.Name))
-                .Returns(new FrameworkName(frameworkNet47.Name))
-                .Returns(new FrameworkName(frameworkNet45.Name));
-            Assert.AreEqual(frameworkNet47.Name, inferHelper.AutoDetectFramework(new List<string>() { "net46.dll", "net47.exe", "net45.dll" }, sourceFrameworks).Name);
-            this.mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny<string>()),Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnHighestVersionFxOnSameFxName()
+    {
+        _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(_frameworkNet46.Name))
+            .Returns(new FrameworkName(_frameworkNet47.Name))
+            .Returns(new FrameworkName(_frameworkNet45.Name));
+        Assert.AreEqual(_frameworkNet47.Name, _inferHelper.AutoDetectFramework(new List<string?>() { "net46.dll", "net47.exe", "net45.dll" }, out _).Name);
+        _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldPopulatetheDictionaryForAllTheSources()
-        {
-            this.mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny<string>()))
-                .Returns(new FrameworkName(frameworkNet46.Name))
-                .Returns(new FrameworkName(frameworkNet47.Name))
-                .Returns(new FrameworkName(frameworkNet45.Name));
-
-            Assert.AreEqual(frameworkNet47.Name, inferHelper.AutoDetectFramework(new List<string>() { "net46.dll", "net47.exe", "net45.dll" }, sourceFrameworks).Name);
-
-            Assert.AreEqual(3, sourceFrameworks.Count);
-            Assert.AreEqual(frameworkNet46.Name, sourceFrameworks["net46.dll"].Name);
-            Assert.AreEqual(frameworkNet47.Name, sourceFrameworks["net47.exe"].Name);
-            Assert.AreEqual(frameworkNet45.Name, sourceFrameworks["net45.dll"].Name);
-            this.mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldPopulatetheDictionaryForAllTheSources()
+    {
+        _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(_frameworkNet46.Name))
+            .Returns(new FrameworkName(_frameworkNet47.Name))
+            .Returns(new FrameworkName(_frameworkNet45.Name));
+
+        Assert.AreEqual(_frameworkNet47.Name, _inferHelper.AutoDetectFramework(new List<string?>() { "net46.dll", "net47.exe", "net45.dll" }, out var sourceFrameworks).Name);
+
+        Assert.AreEqual(3, sourceFrameworks.Count);
+        Assert.AreEqual(_frameworkNet46.Name, sourceFrameworks["net46.dll"].Name);
+        Assert.AreEqual(_frameworkNet47.Name, sourceFrameworks["net47.exe"].Name);
+        Assert.AreEqual(_frameworkNet45.Name, sourceFrameworks["net45.dll"].Name);
+        _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        public void AutoDetectFrameworkShouldReturnHighestVersionFxOnEvenManyLowerVersionFxNameExists()
-        {
-            this.mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny<string>()))
-                .Returns(new FrameworkName(frameworkCore10.Name))
-                .Returns(new FrameworkName(frameworkCore11.Name))
-                .Returns(new FrameworkName(frameworkCore10.Name));
-            Assert.AreEqual(frameworkCore11.Name, inferHelper.AutoDetectFramework(new List<string>() { "netcore10_1.dll", "netcore11.dll", "netcore10_2.dll" }, sourceFrameworks).Name);
-            this.mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny<string>()), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void AutoDetectFrameworkShouldReturnHighestVersionFxOnEvenManyLowerVersionFxNameExists()
+    {
+        _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(_frameworkCore10.Name))
+            .Returns(new FrameworkName(_frameworkCore11.Name))
+            .Returns(new FrameworkName(_frameworkCore10.Name));
+        Assert.AreEqual(_frameworkCore11.Name, _inferHelper.AutoDetectFramework(new List<string?>() { "netcore10_1.dll", "netcore11.dll", "netcore10_2.dll" }, out _).Name);
+        _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny<string>()), Times.Exactly(3));
+    }
 
-        private void SetupAndValidateForSingleAssembly(string assemblyName, Framework fx, bool verify)
+    private void SetupAndValidateForSingleAssembly(string assemblyName, Framework fx, bool verify)
+    {
+        _mockAssemblyHelper.Setup(sh => sh.GetFrameworkName(assemblyName))
+            .Returns(new FrameworkName(fx.Name));
+        Assert.AreEqual(fx.Name, _inferHelper.AutoDetectFramework(new List<string?>() { assemblyName }, out _).Name);
+        if (verify)
         {
-            this.mockAssemblyHelper.Setup(sh => sh.GetFrameWork(assemblyName))
-                .Returns(new FrameworkName(fx.Name));
-            Assert.AreEqual(fx.Name, inferHelper.AutoDetectFramework(new List<string>() { assemblyName }, sourceFrameworks).Name);
-            if (verify)
-            {
-                this.mockAssemblyHelper.Verify(ah => ah.GetFrameWork(assemblyName));
-            }
+            _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(assemblyName));
         }
     }
 }
diff --git a/test/vstest.console.UnitTests/CommandLine/TestRunResultAggregatorTests.cs b/test/vstest.console.UnitTests/CommandLine/TestRunResultAggregatorTests.cs
index ffd898b325..b00db755b2 100644
--- a/test/vstest.console.UnitTests/CommandLine/TestRunResultAggregatorTests.cs
+++ b/test/vstest.console.UnitTests/CommandLine/TestRunResultAggregatorTests.cs
@@ -1,141 +1,139 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Moq;
+using Moq;
 
-    using ObjectModel;
-    using ObjectModel.Client;
-    using ObjectModel.Logging;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.CommandLine;
 
-    [TestClass]
-    public class TestRunResultAggregatorTests
-    {
-        TestRunResultAggregator resultAggregator = TestRunResultAggregator.Instance;
-        Mock<ITestRunRequest> mockTestRunRequest;
+[TestClass]
+public class TestRunResultAggregatorTests
+{
+    private readonly TestRunResultAggregator _resultAggregator = TestRunResultAggregator.Instance;
+    private readonly Mock<ITestRunRequest> _mockTestRunRequest;
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            resultAggregator.Reset();
-            mockTestRunRequest = new Mock<ITestRunRequest>();
-            resultAggregator.RegisterTestRunEvents(mockTestRunRequest.Object);
-        }
+    public TestRunResultAggregatorTests()
+    {
+        _resultAggregator.Reset();
+        _mockTestRunRequest = new Mock<ITestRunRequest>();
+        _resultAggregator.RegisterTestRunEvents(_mockTestRunRequest.Object);
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            resultAggregator.UnregisterTestRunEvents(mockTestRunRequest.Object);
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        _resultAggregator.UnregisterTestRunEvents(_mockTestRunRequest.Object);
+    }
 
-        [TestMethod]
-        public void DefaultOutcomeIsPassed()
-        {
-            Assert.AreEqual(TestOutcome.Passed, resultAggregator.Outcome);
-        }
+    [TestMethod]
+    public void DefaultOutcomeIsPassed()
+    {
+        Assert.AreEqual(TestOutcome.Passed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void MarkTestRunFailedSetsOutcomeToFailed()
-        {
-            resultAggregator.MarkTestRunFailed();
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+    [TestMethod]
+    public void MarkTestRunFailedSetsOutcomeToFailed()
+    {
+        _resultAggregator.MarkTestRunFailed();
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void TestRunMessageHandlerForMessageLevelErrorSetsOutcomeToFailed()
-        {
-            var messageArgs = new TestRunMessageEventArgs(TestMessageLevel.Error, "bad stuff");
-            mockTestRunRequest.Raise(tr => tr.TestRunMessage += null, messageArgs);
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+    [TestMethod]
+    public void TestRunMessageHandlerForMessageLevelErrorSetsOutcomeToFailed()
+    {
+        var messageArgs = new TestRunMessageEventArgs(TestMessageLevel.Error, "bad stuff");
+        _mockTestRunRequest.Raise(tr => tr.TestRunMessage += null, messageArgs);
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void TestRunCompletionHandlerForTestRunStatisticsNullSetsOutcomeToFailed()
-        {
-            var messageArgs = new TestRunCompleteEventArgs(null, false, false, null, null, new TimeSpan());
-            mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+    [TestMethod]
+    public void TestRunCompletionHandlerForTestRunStatisticsNullSetsOutcomeToFailed()
+    {
+        var messageArgs = new TestRunCompleteEventArgs(null, false, false, null, null, null, new TimeSpan());
+        _mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void TestRunCompletionHandlerForTestRunStatsWithOneOrMoreFailingTestsSetsOutcomeToFailed()
+    [TestMethod]
+    public void TestRunCompletionHandlerForTestRunStatsWithOneOrMoreFailingTestsSetsOutcomeToFailed()
+    {
+        var testOutcomeDict = new Dictionary<TestOutcome, long>
         {
-            var testOutcomeDict = new System.Collections.Generic.Dictionary<TestOutcome, long>();
-            testOutcomeDict.Add(TestOutcome.Failed, 1);
-            var stats = new TestableTestRunStats(testOutcomeDict);
+            { TestOutcome.Failed, 1 }
+        };
+        var stats = new TestableTestRunStats(testOutcomeDict);
 
-            var messageArgs = new TestRunCompleteEventArgs(stats, false, false, null, null, new TimeSpan());
-            this.mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+        var messageArgs = new TestRunCompleteEventArgs(stats, false, false, null, null, null, new TimeSpan());
+        _mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void TestRunCompletionHandlerForCanceledRunShouldSetsOutcomeToFailed()
+    [TestMethod]
+    public void TestRunCompletionHandlerForCanceledRunShouldSetsOutcomeToFailed()
+    {
+        var testOutcomeDict = new Dictionary<TestOutcome, long>
         {
-            var testOutcomeDict = new System.Collections.Generic.Dictionary<TestOutcome, long>();
-            testOutcomeDict.Add(TestOutcome.Passed, 1);
-            var stats = new TestableTestRunStats(testOutcomeDict);
+            { TestOutcome.Passed, 1 }
+        };
+        var stats = new TestableTestRunStats(testOutcomeDict);
 
-            var messageArgs = new TestRunCompleteEventArgs(stats, true, false, null, null, new TimeSpan());
-            this.mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+        var messageArgs = new TestRunCompleteEventArgs(stats, true, false, null, null, null, new TimeSpan());
+        _mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        [TestMethod]
-        public void TestRunCompletionHandlerForAbortedRunShouldSetsOutcomeToFailed()
+    [TestMethod]
+    public void TestRunCompletionHandlerForAbortedRunShouldSetsOutcomeToFailed()
+    {
+        var testOutcomeDict = new Dictionary<TestOutcome, long>
         {
-            var testOutcomeDict = new System.Collections.Generic.Dictionary<TestOutcome, long>();
-            testOutcomeDict.Add(TestOutcome.Passed, 1);
-            var stats = new TestableTestRunStats(testOutcomeDict);
+            { TestOutcome.Passed, 1 }
+        };
+        var stats = new TestableTestRunStats(testOutcomeDict);
 
-            var messageArgs = new TestRunCompleteEventArgs(stats, false, true, null, null, new TimeSpan());
-            this.mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
-            Assert.AreEqual(TestOutcome.Failed, resultAggregator.Outcome);
-        }
+        var messageArgs = new TestRunCompleteEventArgs(stats, false, true, null, null, null, new TimeSpan());
+        _mockTestRunRequest.Raise(tr => tr.OnRunCompletion += null, messageArgs);
+        Assert.AreEqual(TestOutcome.Failed, _resultAggregator.Outcome);
+    }
 
-        #region Implementation
+    #region Implementation
 
-        private class TestableTestRunStats : ITestRunStatistics
+    private class TestableTestRunStats : ITestRunStatistics
+    {
+        public TestableTestRunStats(Dictionary<TestOutcome, long> stats)
         {
-            public TestableTestRunStats(Dictionary<TestOutcome, long> stats)
-            {
-                this.Stats = stats;
-            }
+            Stats = stats;
+        }
 
-            public long ExecutedTests { get; set; }
+        public long ExecutedTests { get; set; }
 
-            /// <summary>
-            /// Gets the test stats which is the test outcome versus its state.
-            /// </summary>
-            [DataMember]
-            public IDictionary<TestOutcome, long> Stats { get; private set; }
+        /// <summary>
+        /// Gets the test stats which is the test outcome versus its state.
+        /// </summary>
+        [DataMember]
+        public IDictionary<TestOutcome, long> Stats { get; private set; }
 
-            /// <summary>
-            /// Gets the number of tests with a specified outcome.
-            /// </summary>
-            /// <param name="testOutcome"> The test outcome. </param>
-            /// <returns> The number of tests with this outcome. </returns>
-            public long this[TestOutcome testOutcome]
+        /// <summary>
+        /// Gets the number of tests with a specified outcome.
+        /// </summary>
+        /// <param name="testOutcome"> The test outcome. </param>
+        /// <returns> The number of tests with this outcome. </returns>
+        public long this[TestOutcome testOutcome]
+        {
+            get
             {
-                get
-                {
-                    if (this.Stats.TryGetValue(testOutcome, out var count))
-                    {
-                        return count;
-                    }
-
-                    return 0;
-                }
+                return Stats.TryGetValue(testOutcome, out var count) ? count : 0;
             }
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/ExceptionUtilities.cs b/test/vstest.console.UnitTests/ExceptionUtilities.cs
index e9e6839bea..196abb3c4f 100644
--- a/test/vstest.console.UnitTests/ExceptionUtilities.cs
+++ b/test/vstest.console.UnitTests/ExceptionUtilities.cs
@@ -1,35 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
-{
-    using System;
+using System;
+using System.Globalization;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    /// <summary>
-    /// This only exists because there is an issue with MSTest v2 and ThrowsException with a message API.
-    /// Move to Assert.ThrowException() with a message once the bug is fixed.
-    /// </summary>
-    public static class ExceptionUtilities
-    {
-        public static void ThrowsException<T>(Action action , string format, params string[] args)
-        {
-            var isExceptionThrown = false;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
 
-            try
-            {
-                action();
-            }
-            catch (Exception ex)
-            {
-                Assert.AreEqual(typeof(T), ex.GetType());
-                isExceptionThrown = true;
-                var message = string.Format(format, args);
-                StringAssert.Contains(ex.Message, message);
-            }
+/// <summary>
+/// This only exists because there is an issue with MSTest v2 and ThrowsException with a message API.
+/// Move to Assert.ThrowException() with a message once the bug is fixed.
+/// </summary>
+public static class ExceptionUtilities
+{
+    public static void ThrowsException<T>(Action action, string format, params string[] args)
+    {
+        var isExceptionThrown = false;
 
-            Assert.IsTrue(isExceptionThrown, "No Exception Thrown");
+        try
+        {
+            action();
+        }
+        catch (Exception ex)
+        {
+            Assert.AreEqual(typeof(T), ex.GetType());
+            isExceptionThrown = true;
+            var message = string.Format(CultureInfo.CurrentCulture, format, args);
+            StringAssert.Contains(ex.Message, message);
         }
+
+        Assert.IsTrue(isExceptionThrown, "No Exception Thrown");
     }
 }
diff --git a/test/vstest.console.UnitTests/ExecutorUnitTests.cs b/test/vstest.console.UnitTests/ExecutorUnitTests.cs
index f5748b8c49..313ec26a25 100644
--- a/test/vstest.console.UnitTests/ExecutorUnitTests.cs
+++ b/test/vstest.console.UnitTests/ExecutorUnitTests.cs
@@ -1,205 +1,221 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+
+[TestClass]
+public class ExecutorUnitTests
 {
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
 
-    using CoreUtilities.Tracing.Interfaces;
-
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-
-    using Moq;
-
-    using Utilities;
-
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-    using System;
+    public ExecutorUnitTests()
+    {
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+    }
 
-    [TestClass]
-    public class ExecutorUnitTests
+    /// <summary>
+    /// Executor should Print splash screen first
+    /// </summary>
+    [TestMethod]
+    public void ExecutorPrintsSplashScreenTest()
     {
-        private Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute("/badArgument");
+        var assemblyVersion = typeof(Executor).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion;
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One for bad arguments");
 
-        /// <summary>
-        /// Executor should Print splash screen first
-        /// </summary>
-        [TestMethod]
-        public void ExecutorPrintsSplashScreenTest()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute("/badArgument");
-            var assemblyVersion = typeof(Executor).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
+        // Verify that messages exist
+        Assert.IsTrue(mockOutput.Messages.Count > 0, "Executor must print at least copyright info");
+        Assert.IsNotNull(mockOutput.Messages.First().Message, "First Printed Message cannot be null or empty");
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One for bad arguments");
+        StringAssert.Contains(mockOutput.Messages.First().Message,
+            CommandLineResources.MicrosoftCommandLineTitle.Split(['{'], 2)[0]);
 
-            // Verify that messages exist
-            Assert.IsTrue(mockOutput.Messages.Count > 0, "Executor must print at least copyright info");
-            Assert.IsNotNull(mockOutput.Messages.First().Message, "First Printed Message cannot be null or empty");
+        var suffixIndex = assemblyVersion.IndexOf("-");
+        var version = suffixIndex == -1 ? assemblyVersion : assemblyVersion.Substring(0, suffixIndex);
+        StringAssert.Contains(mockOutput.Messages.First().Message,
+            version);
+    }
 
-            // Just check first 20 characters - don't need to check whole thing as assembly version is variable
-            // "First Printed message must be Microsoft Copyright");
-            StringAssert.Contains(mockOutput.Messages.First().Message, 
-                CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20));
+    [TestMethod]
+    public void ExecutorShouldNotPrintsSplashScreenIfNoLogoPassed()
+    {
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute("--nologo");
 
-            var suffixIndex = assemblyVersion.IndexOf("-");
-            var version = suffixIndex == -1 ? assemblyVersion : assemblyVersion.Substring(0, suffixIndex);
-            StringAssert.Contains(mockOutput.Messages.First().Message, 
-                version);
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One for bad arguments");
 
-        [TestMethod]
-        public void ExecutorShouldNotPrintsSplashScreenIfNoLogoPassed()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute("--nologo");
+        // Verify that messages exist
+        Assert.IsTrue(mockOutput.Messages.Count == 1, "Executor should not print no valid arguments provided");
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One for bad arguments");
+        // Check the part of message before the actual version because that is variable.
+        Assert.IsFalse(
+            mockOutput.Messages.First()
+                .Message!.Contains(CommandLineResources.MicrosoftCommandLineTitle.Split(['{'], 2)[0]));
+    }
 
-            // Verify that messages exist
-            Assert.IsTrue(mockOutput.Messages.Count == 1, "Executor should not print no valid arguments provided");
+    [TestMethod]
+    public void ExecutorShouldSanitizeNoLogoInput()
+    {
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute("--nologo");
 
-            // Just check first 20 characters - don't need to check whole thing as assembly version is variable
-            Assert.IsFalse(
-                mockOutput.Messages.First()
-                    .Message.Contains(CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20)),
-                "First Printed message must be Microsoft Copyright");
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
 
-        [TestMethod]
-        public void ExecutorShouldSanitizeNoLogoInput()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute("--nologo");
+        Assert.IsTrue(mockOutput.Messages.Any(message => message.Message!.Contains(CommandLineResources.NoArgumentsProvided)));
+    }
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
+    /// <summary>
+    /// Executor should Print Error message and Help contents when no arguments are provided.
+    /// </summary>
+    [TestMethod]
+    public void ExecutorEmptyArgsPrintsErrorAndHelpMessage()
+    {
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(null);
 
-            Assert.IsTrue(mockOutput.Messages.Any(message => message.Message.Contains(CommandLineResources.NoArgumentsProvided)));
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
 
-        /// <summary>
-        /// Executor should Print Error message and Help contents when no arguments are provided.
-        /// </summary>
-        [TestMethod]
-        public void ExecutorEmptyArgsPrintsErrorAndHelpMessage()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(null);
+        Assert.IsTrue(mockOutput.Messages.Any(message => message.Message!.Contains(CommandLineResources.NoArgumentsProvided)));
+    }
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
+    [TestMethod]
+    public void ExecutorWithInvalidArgsShouldPrintErrorMessage()
+    {
+        var mockOutput = new MockOutput();
+        string badArg = "/badArgument";
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(badArg);
 
-            Assert.IsTrue(mockOutput.Messages.Any(message => message.Message.Contains(CommandLineResources.NoArgumentsProvided)));
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
 
-        [TestMethod]
-        public void ExecutorWithInvalidArgsShouldPrintErrorMessage()
-        {
-            var mockOutput = new MockOutput();
-            string badArg = "/badArgument";
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(badArg);
+        Assert.IsTrue(mockOutput.Messages.Any(message => message.Message!.Contains(string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidArgument, badArg))));
+    }
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
+    [TestMethod]
+    public void ExecutorWithInvalidArgsShouldPrintHowToUseHelpOption()
+    {
+        var mockOutput = new MockOutput();
+        string badArg = "--invalidArg";
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(badArg);
 
-            Assert.IsTrue(mockOutput.Messages.Any(message => message.Message.Contains(string.Format(CommandLineResources.InvalidArgument, badArg))));
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
 
-        [TestMethod]
-        public void ExecutorWithInvalidArgsShouldPrintHowToUseHelpOption()
-        {
-            var mockOutput = new MockOutput();
-            string badArg = "--invalidArg";
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(badArg);
+        Assert.IsTrue(mockOutput.Messages.Any(message => message.Message!.Contains(string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidArgument, badArg))));
+    }
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
+    [TestMethod]
+    public void ExecutorWithInvalidArgsAndValueShouldPrintErrorMessage()
+    {
+        var mockOutput = new MockOutput();
+        string badArg = "--invalidArg:xyz";
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(badArg);
 
-            Assert.IsTrue(mockOutput.Messages.Any(message => message.Message.Contains(string.Format(CommandLineResources.InvalidArgument, badArg))));
-        }
+        Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
 
-        [TestMethod]
-        public void ExecutorWithInvalidArgsAndValueShouldPrintErrorMessage()
-        {
-            var mockOutput = new MockOutput();
-            string badArg = "--invalidArg:xyz";
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(badArg);
+        Assert.IsTrue(mockOutput.Messages.Any(message => message.Message!.Contains(string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidArgument, badArg))));
+    }
 
-            Assert.AreEqual(1, exitCode, "Exit code must be One when no arguments are provided.");
+    /// <summary>
+    /// Executor should set default runsettings value even there is no processor
+    /// </summary>
+    [TestMethod]
+    public void ExecuteShouldInitializeDefaultRunsettings()
+    {
+        var mockOutput = new MockOutput();
+        _ = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(null);
+        RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+        Assert.AreEqual(Constants.DefaultResultsDirectory, runConfiguration.ResultsDirectory);
+        Assert.AreEqual(Framework.DefaultFramework.ToString(), runConfiguration.TargetFramework!.ToString());
+        Assert.AreEqual(Constants.DefaultPlatform, runConfiguration.TargetPlatform);
+    }
 
-            Assert.IsTrue(mockOutput.Messages.Any(message => message.Message.Contains(string.Format(CommandLineResources.InvalidArgument, badArg))));
-        }
+    [TestMethod]
+    public void ExecuteShouldInstrumentVsTestConsoleStart()
+    {
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(It.IsAny<string[]>());
 
-        /// <summary>
-        /// Executor should set default runsettings value even there is no processor
-        /// </summary>
-        [TestMethod]
-        public void ExecuteShouldInitializeDefaultRunsettings()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(null);
-            RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(Constants.DefaultResultsDirectory, runConfiguration.ResultsDirectory);
-            Assert.AreEqual(Framework.DefaultFramework.ToString(), runConfiguration.TargetFramework.ToString());
-            Assert.AreEqual(Constants.DefaultPlatform, runConfiguration.TargetPlatform);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.VsTestConsoleStart(), Times.Once);
+    }
 
-        [TestMethod]
-        public void ExecuteShouldInstrumentVsTestConsoleStart()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(It.IsAny<string[]>());
+    [TestMethod]
+    public void ExecuteShouldInstrumentVsTestConsoleStop()
+    {
+        var mockOutput = new MockOutput();
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(It.IsAny<string[]>());
 
-            this.mockTestPlatformEventSource.Verify(x => x.VsTestConsoleStart(), Times.Once);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.VsTestConsoleStop(), Times.Once);
+    }
 
-        [TestMethod]
-        public void ExecuteShouldInstrumentVsTestConsoleStop()
-        {
-            var mockOutput = new MockOutput();
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(It.IsAny<string[]>());
+    [TestMethod]
+    public void ExecuteShouldExitWithErrorOnResponseFileException()
+    {
+        string[] args = ["@FileDoesNotExist.rsp"];
+        var mockOutput = new MockOutput();
 
-            this.mockTestPlatformEventSource.Verify(x => x.VsTestConsoleStop(), Times.Once);
-        }
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(args);
 
-        [TestMethod]
-        public void ExecuteShouldExitWithErrorOnResponseFileException()
-        {
-            string[] args = { "@FileDoesNotExist.rsp" };
-            var mockOutput = new MockOutput();
+        var errorMessageCount = mockOutput.Messages.Count(msg => msg.Level == OutputLevel.Error && msg.Message!.Contains(
+            string.Format(CultureInfo.CurrentCulture, CommandLineResources.OpenResponseFileError, args[0].Substring(1))));
+        Assert.AreEqual(1, errorMessageCount, "Response File Exception should display error.");
+        Assert.AreEqual(1, exitCode, "Response File Exception execution should exit with error.");
+    }
 
-            var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(args);
+    [TestMethod]
+    [Ignore("TODO: gets stuck when running with other tests in ExecutorUnitTests")]
+    [DataRow("--ShowDeprecateDotnetVSTestMessage")]
+    [DataRow("--showdeprecateDotnetvsTestMessage")]
+    public void ExecutorShouldPrintDotnetVSTestDeprecationMessage(string commandLine)
+    {
+        var mockOutput = new MockOutput();
+        Mock<IProcessHelper> processHelper = new();
+        processHelper.Setup(x => x.GetCurrentProcessArchitecture()).Returns(PlatformArchitecture.X64);
+        processHelper.Setup(x => x.GetCurrentProcessId()).Returns(0);
+        Mock<IEnvironment> environment = new();
+        environment.Setup(x => x.Architecture).Returns(PlatformArchitecture.X64);
+
+        new Executor(mockOutput, _mockTestPlatformEventSource.Object, processHelper.Object, environment.Object).Execute(commandLine);
+
+        Assert.AreEqual(5, mockOutput.Messages.Count);
+        Assert.AreEqual(OutputLevel.Warning, mockOutput.Messages[2].Level);
+        Assert.AreEqual("The dotnet vstest command is superseded by dotnet test, which can now be used to run assemblies. See https://aka.ms/dotnet-test.", mockOutput.Messages[2].Message);
+    }
 
-            var errorMessageCount = mockOutput.Messages.Count(msg => msg.Level == OutputLevel.Error && msg.Message.Contains(
-            string.Format(CultureInfo.CurrentCulture, CommandLineResources.OpenResponseFileError, args[0].Substring(1))));
-            Assert.AreEqual(1, errorMessageCount, "Response File Exception should display error.");
-            Assert.AreEqual(1, exitCode, "Response File Exception execution should exit with error.");
-        }
+    [TestMethod]
+    public void ExecuteShouldNotThrowSettingsExceptionButLogOutput()
+    {
+        var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
+        var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
 
-        [TestMethod]
-        public void ExecuteShouldNotThrowSettingsExceptionButLogOutput()
+        try
         {
-            var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
-            var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
-
-            try
+            if (File.Exists(runSettingsFile))
             {
-                if (File.Exists(runSettingsFile))
-                {
-                    File.Delete(runSettingsFile);
-                }
+                File.Delete(runSettingsFile);
+            }
 
-                var fileContents = @"<RunSettings>
+            var fileContents = @"<RunSettings>
                                     <LoggerRunSettings>
                                         <Loggers>
                                             <Logger invalidName=""trx"" />
@@ -207,38 +223,38 @@ public void ExecuteShouldNotThrowSettingsExceptionButLogOutput()
                                     </LoggerRunSettings>
                                 </RunSettings>";
 
-                File.WriteAllText(runSettingsFile, fileContents);
+            File.WriteAllText(runSettingsFile, fileContents);
 
-                var testSourceDllPath = Path.GetTempFileName();
-                string[] args = { testSourceDllPath, "/settings:" + runSettingsFile };
-                var mockOutput = new MockOutput();
+            var testSourceDllPath = Path.GetTempFileName();
+            string[] args = [testSourceDllPath, "/settings:" + runSettingsFile];
+            var mockOutput = new MockOutput();
 
-                var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(args);
+            var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(args);
 
-                var result = mockOutput.Messages.Any(o => o.Level == OutputLevel.Error && o.Message.Contains("Invalid settings 'Logger'. Unexpected XmlAttribute: 'invalidName'."));
-                Assert.IsTrue(result, "expecting error message : Invalid settings 'Logger'.Unexpected XmlAttribute: 'invalidName'.");
-            }
-            finally
-            {
-                File.Delete(runSettingsFile);
-                RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
-            }
+            var result = mockOutput.Messages.Any(o => o.Level == OutputLevel.Error && o.Message!.Contains("Invalid settings 'Logger'. Unexpected XmlAttribute: 'invalidName'."));
+            Assert.IsTrue(result, "expecting error message : Invalid settings 'Logger'.Unexpected XmlAttribute: 'invalidName'.");
         }
-
-        [TestMethod]
-        public void ExecuteShouldReturnNonZeroExitCodeIfSettingsException()
+        finally
         {
-            var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
-            var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
+            File.Delete(runSettingsFile);
+            RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
+        }
+    }
+
+    [TestMethod]
+    public void ExecuteShouldReturnNonZeroExitCodeIfSettingsException()
+    {
+        var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
+        var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
 
-            try
+        try
+        {
+            if (File.Exists(runSettingsFile))
             {
-                if (File.Exists(runSettingsFile))
-                {
-                    File.Delete(runSettingsFile);
-                }
+                File.Delete(runSettingsFile);
+            }
 
-                var fileContents = @"<RunSettings>
+            var fileContents = @"<RunSettings>
                                     <LoggerRunSettings>
                                         <Loggers>
                                             <Logger invalidName=""trx"" />
@@ -246,78 +262,117 @@ public void ExecuteShouldReturnNonZeroExitCodeIfSettingsException()
                                     </LoggerRunSettings>
                                 </RunSettings>";
 
-                File.WriteAllText(runSettingsFile, fileContents);
+            File.WriteAllText(runSettingsFile, fileContents);
 
-                string[] args = { "/settings:" + runSettingsFile };
-                var mockOutput = new MockOutput();
+            string[] args = ["/settings:" + runSettingsFile];
+            var mockOutput = new MockOutput();
 
-                var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(args);
+            var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(args);
 
-                Assert.AreEqual(1, exitCode, "Exit code should be one because it throws exception");
-            }
-            finally
-            {
-                File.Delete(runSettingsFile);
-                RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
-            }
+            Assert.AreEqual(1, exitCode, "Exit code should be one because it throws exception");
         }
-
-        [TestMethod]
-        public void ExecutorShouldShowRightErrorMessage()
+        finally
         {
-            var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
-            var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
+            File.Delete(runSettingsFile);
+            RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
+        }
+    }
+
+    [TestMethod]
+    public void ExecutorShouldShowRightErrorMessage()
+    {
+        var activeRunSetting = RunSettingsManager.Instance.ActiveRunSettings;
+        var runSettingsFile = Path.Combine(Path.GetTempPath(), "ExecutorShouldShowRightErrorMessage.runsettings");
 
-            try
+        try
+        {
+            if (File.Exists(runSettingsFile))
             {
-                if (File.Exists(runSettingsFile))
-                {
-                    File.Delete(runSettingsFile);
-                }
+                File.Delete(runSettingsFile);
+            }
 
-                var fileContents = @"<RunSettings>
+            var fileContents = @"<RunSettings>
                                     <RunConfiguration>
                                         <TargetPlatform>Invalid</TargetPlatform>
                                     </RunConfiguration>
                                 </RunSettings>";
 
-                File.WriteAllText(runSettingsFile, fileContents);
+            File.WriteAllText(runSettingsFile, fileContents);
 
-                string[] args = { "/settings:" + runSettingsFile };
-                var mockOutput = new MockOutput();
+            string[] args = ["/settings:" + runSettingsFile];
+            var mockOutput = new MockOutput();
 
-                var exitCode = new Executor(mockOutput, this.mockTestPlatformEventSource.Object).Execute(args);
+            var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, new ProcessHelper(), new PlatformEnvironment()).Execute(args);
 
-                var result = mockOutput.Messages.Any(o => o.Level == OutputLevel.Error && o.Message.Contains("Invalid setting 'RunConfiguration'. Invalid value 'Invalid' specified for 'TargetPlatform'."));
-                Assert.AreEqual(1, exitCode, "Exit code should be one because it throws exception");
-                Assert.IsTrue(result, "expecting error message : Invalid setting 'RunConfiguration'. Invalid value 'Invalid' specified for 'TargetPlatform'.");
-            }
-            finally
-            {
-                File.Delete(runSettingsFile);
-                RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
-            }
+            var result = mockOutput.Messages.Any(o => o.Level == OutputLevel.Error && o.Message!.Contains("Invalid setting 'RunConfiguration'. Invalid value 'Invalid' specified for 'TargetPlatform'."));
+            Assert.AreEqual(1, exitCode, "Exit code should be one because it throws exception");
+            Assert.IsTrue(result, "expecting error message : Invalid setting 'RunConfiguration'. Invalid value 'Invalid' specified for 'TargetPlatform'.");
         }
-
-        private class MockOutput : IOutput
+        finally
         {
-            public List<OutputMessage> Messages { get; set; } = new List<OutputMessage>();
+            File.Delete(runSettingsFile);
+            RunSettingsManager.Instance.SetActiveRunSettings(activeRunSetting);
+        }
+    }
 
-            public void Write(string message, OutputLevel level)
-            {
-                Messages.Add(new OutputMessage() { Message = message, Level = level });
-            }
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void ExecutorShouldPrintWarningIfRunningEmulatedOnARM64()
+    {
+        var mockOutput = new MockOutput();
+        Mock<IProcessHelper> processHelper = new();
+        processHelper.Setup(x => x.GetCurrentProcessArchitecture()).Returns(PlatformArchitecture.X64);
+        processHelper.Setup(x => x.GetCurrentProcessId()).Returns(0);
+        processHelper.Setup(x => x.GetCurrentProcessFileName()).Returns(@"X:\vstest.console.exe");
+        Mock<IEnvironment> environment = new();
+        environment.Setup(x => x.Architecture).Returns(PlatformArchitecture.ARM64);
+
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, processHelper.Object, environment.Object).Execute();
+        var assemblyVersion = typeof(Executor).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion;
+
+        Assert.AreEqual(4, mockOutput.Messages.Count);
+        Assert.AreEqual("vstest.console.exe is running in emulated mode as x64. For better performance, please consider using the native runner vstest.console.arm64.exe.",
+            mockOutput.Messages[1].Message);
+        Assert.AreEqual(OutputLevel.Warning,
+            mockOutput.Messages[1].Level);
+    }
 
-            public void WriteLine(string message, OutputLevel level)
-            {
-                Messages.Add(new OutputMessage() { Message = message, Level = level });
-            }
+    [TestMethod]
+    public void ExecutorShouldPrintRunnerArchitecture()
+    {
+        var mockOutput = new MockOutput();
+        Mock<IProcessHelper> processHelper = new();
+        processHelper.Setup(x => x.GetCurrentProcessArchitecture()).Returns(PlatformArchitecture.X64);
+        processHelper.Setup(x => x.GetCurrentProcessId()).Returns(0);
+        Mock<IEnvironment> environment = new();
+        environment.Setup(x => x.Architecture).Returns(PlatformArchitecture.X64);
+
+        var exitCode = new Executor(mockOutput, _mockTestPlatformEventSource.Object, processHelper.Object, environment.Object).Execute();
+        var assemblyVersion = typeof(Executor).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion;
+
+        Assert.AreEqual(3, mockOutput.Messages.Count);
+        Assert.IsTrue(Regex.IsMatch(mockOutput.Messages[0].Message!, @"VSTest version .* \(x64\)"));
+        Assert.IsFalse(mockOutput.Messages.Any(message => message.Message!.Contains("vstest.console.exe is running in emulated mode")));
+    }
+
+    private class MockOutput : IOutput
+    {
+        public List<OutputMessage> Messages { get; set; } = new List<OutputMessage>();
+
+        public void Write(string? message, OutputLevel level)
+        {
+            Messages.Add(new OutputMessage() { Message = message, Level = level });
         }
 
-        private class OutputMessage
+        public void WriteLine(string? message, OutputLevel level)
         {
-            public string Message { get; set; }
-            public OutputLevel Level { get; set; }
+            Messages.Add(new OutputMessage() { Message = message, Level = level });
         }
     }
+
+    private class OutputMessage
+    {
+        public string? Message { get; set; } = "";
+        public OutputLevel Level { get; set; }
+    }
 }
diff --git a/test/vstest.console.UnitTests/GlobalSuppressions.cs b/test/vstest.console.UnitTests/GlobalSuppressions.cs
new file mode 100644
index 0000000000..1eb087e831
--- /dev/null
+++ b/test/vstest.console.UnitTests/GlobalSuppressions.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Tool name is using lower-case.", Scope = "namespace", Target = "~N:vstest.console.UnitTests.Internal")]
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Tool name is using lower-case.", Scope = "namespace", Target = "~N:vstest.console.UnitTests.Processors")]
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Tool name is using lower-case.", Scope = "namespace", Target = "~N:vstest.console.UnitTests.Publisher")]
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Tool name is using lower-case.", Scope = "namespace", Target = "~N:vstest.console.UnitTests.TestDoubles")]
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Tool name is using lower-case.", Scope = "namespace", Target = "~N:vstest.console.UnitTests.TestPlatformHelpers")]
diff --git a/test/vstest.console.UnitTests/InProcessVsTestConsoleWrapperTests.cs b/test/vstest.console.UnitTests/InProcessVsTestConsoleWrapperTests.cs
new file mode 100644
index 0000000000..ec0f6f778b
--- /dev/null
+++ b/test/vstest.console.UnitTests/InProcessVsTestConsoleWrapperTests.cs
@@ -0,0 +1,1114 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer;
+using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Execution;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+
+[TestClass]
+public class InProcessVsTestConsoleWrapperTests
+{
+    private readonly InProcessVsTestConsoleWrapper _consoleWrapper;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariableHelper;
+    private readonly Mock<ITranslationLayerRequestSender> _mockRequestSender;
+    private readonly Mock<ITestRequestManager> _mockTestRequestManager;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly Executor _executor;
+    private readonly Mock<ITestPlatformEventSource> _mockEventSource;
+
+    private readonly IList<string> _testSources = new List<String>() { "test1", "test2" };
+    private readonly IList<TestCase> _testCases = new List<TestCase>() { new(), new() };
+    private readonly IList<AttachmentSet> _attachmentSets = new List<AttachmentSet>()
+    {
+        new(new Uri("datacollector://AttachmentSetDataCollector1"), "AttachmentSet1"),
+        new(new Uri("datacollector://AttachmentSetDataCollector2"), "AttachmentSet2"),
+    };
+    private readonly IList<InvokedDataCollector> _invokedDataCollectors = new List<InvokedDataCollector>()
+    {
+        new(new Uri("datacollector://InvokedDataCollector1"), "InvokedDataCollector1", "DummyAssemblyName1", "DummyFilePath1", true),
+        new(new Uri("datacollector://InvokedDataCollector2"), "InvokedDataCollector2", "DummyAssemblyName2", "DummyFilePath2", false),
+    };
+
+    private readonly string _runSettings = "dummy runsettings";
+
+    public InProcessVsTestConsoleWrapperTests()
+    {
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+        _mockEnvironmentVariableHelper.Setup(evh => evh.GetEnvironmentVariables()).Returns(new Hashtable());
+
+        _mockRequestSender = new Mock<ITranslationLayerRequestSender>();
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(1234);
+        _mockRequestSender.Setup(rs => rs.WaitForRequestHandlerConnection(It.IsAny<int>())).Returns(true);
+
+        _mockTestRequestManager = new Mock<ITestRequestManager>();
+        _mockTestRequestManager.Setup(trm => trm.ResetOptions()).Callback(() => { });
+
+        _mockOutput = new Mock<IOutput>();
+        _executor = new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment());
+        _mockEventSource = new Mock<ITestPlatformEventSource>();
+
+        _consoleWrapper = new InProcessVsTestConsoleWrapper(
+            new ConsoleParameters(),
+            _mockEnvironmentVariableHelper.Object,
+            _mockRequestSender.Object,
+            _mockTestRequestManager.Object,
+            _executor,
+            _mockEventSource.Object,
+            new());
+    }
+
+    [TestMethod]
+    public void InProcessWrapperConstructorShouldThrowIfPortIsInvalid()
+    {
+        _mockRequestSender.Setup(rs => rs.InitializeCommunication()).Returns(-1);
+
+        Assert.ThrowsException<TransationLayerException>(() =>
+            new InProcessVsTestConsoleWrapper(
+                new ConsoleParameters(),
+                _mockEnvironmentVariableHelper.Object,
+                _mockRequestSender.Object,
+                _mockTestRequestManager.Object,
+                new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment()),
+                new Mock<ITestPlatformEventSource>().Object,
+                new()));
+    }
+
+    [TestMethod]
+    public void InProcessWrapperConstructorShouldSetEnvironmentVariablesReceivedAsConsoleParametersForProcessHelperNoInherit()
+    {
+        const string environmentVariableName = "AAAAA";
+
+        var consoleParams = new ConsoleParameters();
+        consoleParams.EnvironmentVariables.Add(environmentVariableName, "1");
+        consoleParams.InheritEnvironmentVariables = false;
+
+        var _ = new InProcessVsTestConsoleWrapper(
+            consoleParams,
+            _mockEnvironmentVariableHelper.Object,
+            _mockRequestSender.Object,
+            _mockTestRequestManager.Object,
+            new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment()),
+            new Mock<ITestPlatformEventSource>().Object,
+            new());
+
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.Count == 1);
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.ContainsKey(environmentVariableName));
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?[environmentVariableName] == "1");
+    }
+
+    [TestMethod]
+    public void InProcessWrapperConstructorShouldSetEnvironmentVariablesReceivedAsConsoleParametersForProcessHelper()
+    {
+        const string environmentVariableName1 = "AAAAA";
+        const string environmentVariableName2 = "BBBBB";
+        const string environmentVariableName3 = "CCCCC";
+
+        var consoleParams = new ConsoleParameters();
+        consoleParams.EnvironmentVariables.Add(environmentVariableName1, "1");
+        consoleParams.InheritEnvironmentVariables = true;
+
+        IDictionary defaultEnvironmentVariables = new Hashtable();
+        defaultEnvironmentVariables.Add(environmentVariableName2, "1");
+        defaultEnvironmentVariables.Add(environmentVariableName3, "1");
+
+        _mockEnvironmentVariableHelper.Setup(evh => evh.GetEnvironmentVariables()).Returns(defaultEnvironmentVariables);
+
+        var _ = new InProcessVsTestConsoleWrapper(
+            consoleParams,
+            _mockEnvironmentVariableHelper.Object,
+            _mockRequestSender.Object,
+            _mockTestRequestManager.Object,
+            new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment()),
+            new Mock<ITestPlatformEventSource>().Object,
+            new());
+
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.Count == 3);
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.ContainsKey(environmentVariableName1));
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?[environmentVariableName1] == "1");
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.ContainsKey(environmentVariableName2));
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?[environmentVariableName2] == "1");
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?.ContainsKey(environmentVariableName3));
+        Assert.IsTrue(ProcessHelper.ExternalEnvironmentVariables?[environmentVariableName3] == "1");
+    }
+
+    [TestMethod]
+    public void InProcessWrapperConstructorShouldSetTheCultureSpecifiedByTheUser()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        _mockEnvironmentVariableHelper.Setup(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE")).Returns(culture.Name);
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        var consoleParams = new ConsoleParameters();
+        var _ = new InProcessVsTestConsoleWrapper(
+            consoleParams,
+            _mockEnvironmentVariableHelper.Object,
+            _mockRequestSender.Object,
+            _mockTestRequestManager.Object,
+            new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment()),
+            new Mock<ITestPlatformEventSource>().Object,
+            new UiLanguageOverride(_mockEnvironmentVariableHelper.Object, lang => threadCultureWasSet = lang.Equals(culture)));
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        _mockEnvironmentVariableHelper.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        _mockEnvironmentVariableHelper.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        _mockEnvironmentVariableHelper.Verify(x => x.SetEnvironmentVariable("VSLANG", culture.LCID.ToString(CultureInfo.InvariantCulture)), Times.Once);
+        _mockEnvironmentVariableHelper.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        _mockEnvironmentVariableHelper.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperDiscoverTestsWithThreeParamsIsSuccessfullyInvoked()
+    {
+        var discoveryEventHandler = new Mock<ITestDiscoveryEventsHandler>();
+
+        DiscoveryRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                DiscoveryRequestPayload p,
+                ITestDiscoveryEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.DiscoverTests(_testSources, _runSettings, discoveryEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsNull(payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo);
+
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperDiscoverTestsWithFourParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var discoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        DiscoveryRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                DiscoveryRequestPayload p,
+                ITestDiscoveryEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.DiscoverTests(_testSources, _runSettings, options, discoveryEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo);
+
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperDiscoverTestsWithFiveParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var testSessionInfo = new TestSessionInfo();
+
+        var discoveryEventHandler = new Mock<ITestDiscoveryEventsHandler2>();
+
+        DiscoveryRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                DiscoveryRequestPayload p,
+                ITestDiscoveryEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.DiscoverTests(_testSources, _runSettings, options, testSessionInfo, discoveryEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.AreEqual(testSessionInfo.Id, payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerDiscoveryStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.DiscoverTests(
+                It.IsAny<DiscoveryRequestPayload>(),
+                It.IsAny<ITestDiscoveryEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithSourcesWithThreeParamsIsSuccessfullyInvoked()
+    {
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testSources, _runSettings, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsNull(payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testSources.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithSourcesWithFourParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testSources, _runSettings, options, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testSources.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithSourcesWithFiveParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var testSessionInfo = new TestSessionInfo();
+
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testSources, _runSettings, options, testSessionInfo, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.AreEqual(testSessionInfo.Id, payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testSources.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithTestsWithThreeParamsIsSuccessfullyInvoked()
+    {
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testCases, _runSettings, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsNull(payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithTestsWithFourParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testCases, _runSettings, options, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithTestsWithFiveParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var testSessionInfo = new TestSessionInfo();
+
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 _,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) => payload = p);
+
+        _consoleWrapper.RunTests(_testCases, _runSettings, options, testSessionInfo, runEventHandler.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.AreEqual(testSessionInfo.Id, payload.TestSessionInfo?.Id);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                0,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithSourcesWithThreeParamsIsSuccessfullyInvoked()
+    {
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testSources, _runSettings, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsNull(payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.AreEqual(testHostLauncher.Object, launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                _testSources.Count,
+                0,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                testHostLauncher.Object,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithSourcesWithFourParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testSources, _runSettings, options, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.AreEqual(testHostLauncher.Object, launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                _testSources.Count,
+                0,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                testHostLauncher.Object,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithSourcesWithFiveParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var testSessionInfo = new TestSessionInfo();
+
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testSources, _runSettings, options, testSessionInfo, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testSources.SequenceEqual(payload.Sources!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.AreEqual(testSessionInfo.Id, payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.IsNull(launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                _testSources.Count,
+                0,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                null,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithTestsWithThreeParamsIsSuccessfullyInvoked()
+    {
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testCases, _runSettings, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsNull(payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.AreEqual(testHostLauncher.Object, launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                testHostLauncher.Object,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithTestsWithFourParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testCases, _runSettings, options, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.IsNull(payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.AreEqual(testHostLauncher.Object, launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                testHostLauncher.Object,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void InProcessWrapperRunTestsWithCustomTestHostWithTestsWithFiveParamsIsSuccessfullyInvoked()
+    {
+        var options = new TestPlatformOptions();
+        var testSessionInfo = new TestSessionInfo();
+
+        var testHostLauncher = new Mock<ITestHostLauncher3>();
+        var runEventHandler = new Mock<ITestRunEventsHandler>();
+
+        TestRunRequestPayload? payload = null;
+        ITestHostLauncher3? launcher = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunRequestPayload p,
+                ITestHostLauncher3 l,
+                ITestRunEventsRegistrar _,
+                ProtocolConfig _) =>
+            {
+                payload = p;
+                launcher = l;
+            });
+
+        _consoleWrapper.RunTestsWithCustomTestHost(_testCases, _runSettings, options, testSessionInfo, runEventHandler.Object, testHostLauncher.Object);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_testCases.SequenceEqual(payload.TestCases!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.AreEqual(options, payload.TestPlatformOptions);
+        Assert.AreEqual(testSessionInfo.Id, payload.TestSessionInfo?.Id);
+        Assert.AreEqual(testHostLauncher.Object.IsDebug, payload.DebuggingEnabled);
+        Assert.IsNull(launcher);
+
+        _mockEventSource.Verify(es =>
+            es.TranslationLayerExecutionStart(
+                1,
+                0,
+                _testCases.Count,
+                _runSettings),
+            Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerExecutionStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.RunTests(
+                It.IsAny<TestRunRequestPayload>(),
+                null,
+                It.IsAny<ITestRunEventsRegistrar>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    [Obsolete("Test uses obsolete API")]
+    public void InProcessWrapperStartTestSessionSucceedsWhenNoExceptionIsThrown()
+    {
+        var mockTestSessionEventsHandler = new Mock<ITestSessionEventsHandler>();
+        mockTestSessionEventsHandler
+            .Setup(eh => eh.HandleStartTestSessionComplete(It.IsAny<StartTestSessionCompleteEventArgs>()))
+            .Callback(() => { });
+
+        var testSessionInfo = new TestSessionInfo();
+        var startTestSessionCompleteArgs = new StartTestSessionCompleteEventArgs()
+        {
+            TestSessionInfo = testSessionInfo
+        };
+
+        var stopTestSessionCompleteArgs = new StopTestSessionCompleteEventArgs()
+        {
+            IsStopped = true,
+            TestSessionInfo = testSessionInfo
+        };
+
+        _mockTestRequestManager.Setup(trm =>
+            trm.StartTestSession(
+                It.IsAny<StartTestSessionPayload>(),
+                It.IsAny<ITestHostLauncher3>(),
+                It.IsAny<InProcessTestSessionEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback<StartTestSessionPayload, ITestHostLauncher3, ITestSessionEventsHandler, ProtocolConfig>((
+                StartTestSessionPayload _,
+                ITestHostLauncher3 _,
+                ITestSessionEventsHandler eventsHandler,
+                ProtocolConfig _) =>
+                    eventsHandler.HandleStartTestSessionComplete(startTestSessionCompleteArgs));
+
+        _mockTestRequestManager.Setup(trm =>
+            trm.StopTestSession(
+                It.IsAny<StopTestSessionPayload>(),
+                It.IsAny<InProcessTestSessionEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback<StopTestSessionPayload, ITestSessionEventsHandler, ProtocolConfig>((
+                StopTestSessionPayload _,
+                ITestSessionEventsHandler eventsHandler,
+                ProtocolConfig _) =>
+                    eventsHandler.HandleStopTestSessionComplete(stopTestSessionCompleteArgs));
+
+        var consoleWrapper = new InProcessVsTestConsoleWrapper(
+            new ConsoleParameters(),
+            _mockEnvironmentVariableHelper.Object,
+            _mockRequestSender.Object,
+            _mockTestRequestManager.Object,
+            new Executor(_mockOutput.Object, new Mock<ITestPlatformEventSource>().Object, new ProcessHelper(), new PlatformEnvironment()),
+            new Mock<ITestPlatformEventSource>().Object,
+            new());
+
+        using (var testSession = consoleWrapper?.StartTestSession(_testSources, _runSettings, mockTestSessionEventsHandler.Object))
+        {
+            Assert.AreEqual(
+                testSession?.TestSessionInfo,
+                testSessionInfo);
+        }
+
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Exactly(2));
+        _mockTestRequestManager.Verify(trm => trm.StartTestSession(
+             It.IsAny<StartTestSessionPayload>(),
+             It.IsAny<ITestHostLauncher3>(),
+             It.IsAny<InProcessTestSessionEventsHandler>(),
+             It.IsAny<ProtocolConfig>()), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.StopTestSession(
+             It.IsAny<StopTestSessionPayload>(),
+             It.IsAny<InProcessTestSessionEventsHandler>(),
+             It.IsAny<ProtocolConfig>()), Times.Once);
+
+        mockTestSessionEventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(startTestSessionCompleteArgs), Times.Once);
+        mockTestSessionEventsHandler.Verify(eh => eh.HandleStopTestSessionComplete(stopTestSessionCompleteArgs), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task InProcessWrapperProcessTestRunAttachmentsAsyncWithSevenParamsIsSuccessfullyInvoked()
+    {
+        var attachmentsEventHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        TestRunAttachmentsProcessingPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunAttachmentsProcessingPayload p,
+                ITestRunAttachmentsProcessingEventsHandler _,
+                ProtocolConfig _) => payload = p);
+
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            _attachmentSets,
+            _invokedDataCollectors,
+            _runSettings,
+            true,
+            false,
+            attachmentsEventHandler.Object,
+            CancellationToken.None).ConfigureAwait(false);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_attachmentSets.SequenceEqual(payload.Attachments!));
+        Assert.IsTrue(_invokedDataCollectors.SequenceEqual(payload.InvokedDataCollectors!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsFalse(payload.CollectMetrics);
+
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Never);
+        _mockTestRequestManager.Verify(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task InProcessWrapperProcessTestRunAttachmentsAsyncWithSevenParamsSuccessfullyHandlesCancellation()
+    {
+        var attachmentsEventHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        TestRunAttachmentsProcessingPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunAttachmentsProcessingPayload p,
+                ITestRunAttachmentsProcessingEventsHandler _,
+                ProtocolConfig _) => payload = p);
+        _mockTestRequestManager.Setup(trm => trm.CancelTestRunAttachmentsProcessing())
+            .Callback(() => { });
+
+        var cancellationTokenSource = new CancellationTokenSource();
+
+        cancellationTokenSource.Cancel();
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            _attachmentSets,
+            _invokedDataCollectors,
+            _runSettings,
+            true,
+            false,
+            attachmentsEventHandler.Object,
+            cancellationTokenSource.Token).ConfigureAwait(false);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_attachmentSets.SequenceEqual(payload.Attachments!));
+        Assert.IsTrue(_invokedDataCollectors.SequenceEqual(payload.InvokedDataCollectors!));
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsFalse(payload.CollectMetrics);
+
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Never);
+        _mockTestRequestManager.Verify(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.CancelTestRunAttachmentsProcessing(), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task InProcessWrapperProcessTestRunAttachmentsAsyncWithSevenParamsSuccessfullyHandlesExceptions()
+    {
+        var attachmentsEventHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        _mockTestRequestManager
+            .Setup(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Throws(new Exception("Dummy exception"));
+
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            _attachmentSets,
+            _invokedDataCollectors,
+            _runSettings,
+            true,
+            false,
+            attachmentsEventHandler.Object,
+            CancellationToken.None).ConfigureAwait(false);
+
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Never);
+        _mockTestRequestManager.Verify(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+        attachmentsEventHandler.Verify(eh => eh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()));
+    }
+
+    [TestMethod]
+    public async Task InProcessWrapperProcessTestRunAttachmentsAsyncWithSevenParamsSuccessfullyHandlesNullTestRequestManager()
+    {
+        var attachmentsEventHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        _consoleWrapper.TestRequestManager = null;
+
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            _attachmentSets,
+            _invokedDataCollectors,
+            _runSettings,
+            true,
+            false,
+            attachmentsEventHandler.Object,
+            CancellationToken.None).ConfigureAwait(false);
+
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStop(), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task InProcessWrapperProcessTestRunAttachmentsAsyncWithSixParamsIsSuccessfullyInvoked()
+    {
+        var attachmentsEventHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+
+        TestRunAttachmentsProcessingPayload? payload = null;
+        _mockTestRequestManager
+            .Setup(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()))
+            .Callback((
+                TestRunAttachmentsProcessingPayload p,
+                ITestRunAttachmentsProcessingEventsHandler _,
+                ProtocolConfig _) => payload = p);
+
+        await _consoleWrapper.ProcessTestRunAttachmentsAsync(
+            _attachmentSets,
+            _runSettings,
+            true,
+            false,
+            attachmentsEventHandler.Object,
+            CancellationToken.None);
+
+        Assert.IsNotNull(payload);
+        Assert.IsTrue(_attachmentSets.SequenceEqual(payload.Attachments!));
+        Assert.IsNull(payload.InvokedDataCollectors);
+        Assert.AreEqual(_runSettings, payload.RunSettings);
+        Assert.IsFalse(payload.CollectMetrics);
+
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStart(), Times.Once);
+        _mockEventSource.Verify(es => es.TranslationLayerTestRunAttachmentsProcessingStop(), Times.Once);
+        _mockTestRequestManager.Verify(trm => trm.ResetOptions(), Times.Never);
+        _mockTestRequestManager.Verify(trm => trm.ProcessTestRunAttachments(
+                It.IsAny<TestRunAttachmentsProcessingPayload>(),
+                It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(),
+                It.IsAny<ProtocolConfig>()), Times.Once);
+    }
+}
diff --git a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
index 811877fb09..946160b845 100644
--- a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
+++ b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
@@ -1,1297 +1,1371 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Internal
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.TestPlatform.TestUtilities;
+
+using Moq;
+
+using vstest.console.Internal;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Internal;
+
+[TestClass]
+public class ConsoleLoggerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Threading;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using vstest.console.Internal;
-    using CommandLineResources = Resources.Resources;
-
-    [TestClass]
-    public class ConsoleLoggerTests
+    private readonly Mock<IRequestData> _mockRequestData;
+    private readonly Mock<IMetricsCollection> _mockMetricsCollection;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly ConsoleLogger _consoleLogger;
+    private readonly Mock<IProgressIndicator> _mockProgressIndicator;
+    private readonly Mock<IFeatureFlag> _mockFeatureFlag;
+
+    private const string PassedTestIndicator = "  Passed ";
+    private const string FailedTestIndicator = "  Failed ";
+    private const string SkippedTestIndicator = "  Skipped ";
+
+    public ConsoleLoggerTests()
     {
-        private Mock<IRequestData> mockRequestData;
-        private Mock<IMetricsCollection> mockMetricsCollection;
-        private Mock<IOutput> mockOutput;
-        private ConsoleLogger consoleLogger;
-        private Mock<IProgressIndicator> mockProgressIndicator;
+        _mockRequestData = new Mock<IRequestData>();
+        _mockMetricsCollection = new Mock<IMetricsCollection>();
+        _mockFeatureFlag = new Mock<IFeatureFlag>();
+        _mockFeatureFlag.Setup(x => x.IsSet(It.IsAny<string>())).Returns(false);
+        _mockRequestData.Setup(rd => rd.MetricsCollection).Returns(_mockMetricsCollection.Object);
 
-        private const string PassedTestIndicator = "  Passed ";
-        private const string FailedTestIndicator = "  Failed ";
-        private const string SkippedTestIndicator = "  Skipped ";
+        _mockOutput = new Mock<IOutput>();
+        _mockProgressIndicator = new Mock<IProgressIndicator>();
+        _consoleLogger = new ConsoleLogger(_mockOutput.Object, _mockProgressIndicator.Object, _mockFeatureFlag.Object);
 
-        [TestInitialize]
-        public void Initialize()
-        {
-            RunTestsArgumentProcessorTests.SetupMockExtensions();
-
-            // Setup Mocks and other dependencies
-            this.Setup();
-        }
+        RunTestsArgumentProcessorTests.SetupMockExtensions();
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfEventsIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.consoleLogger.Initialize(null, string.Empty);
-            });
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfEventsIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _consoleLogger.Initialize(null!, string.Empty));
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotThrowExceptionIfEventsIsNotNull()
-        {
-            this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, string.Empty);
-        }
+    [TestMethod]
+    public void InitializeShouldNotThrowExceptionIfEventsIsNotNull()
+    {
+        _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, string.Empty);
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldThrowExceptionIfEventsIsNull()
+    [TestMethod]
+    public void InitializeWithParametersShouldThrowExceptionIfEventsIsNull()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>
-            {
-                { "param1", "value" },
-            };
+            { "param1", "value" },
+        };
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.consoleLogger.Initialize(null, parameters);
-            });
-        }
+        Assert.ThrowsException<ArgumentNullException>(() => _consoleLogger.Initialize(null!, parameters));
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldThrowExceptionIfParametersIsEmpty()
-        {
-            Assert.ThrowsException<ArgumentException>(() =>
-            {
-                this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, new Dictionary<string, string>());
-            });
-        }
+    [TestMethod]
+    public void InitializeWithParametersShouldThrowExceptionIfParametersIsEmpty()
+    {
+        Assert.ThrowsException<ArgumentException>(() => _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, new Dictionary<string, string?>()));
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldThrowExceptionIfParametersIsNull()
-        {
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, (Dictionary<string, string>)null);
-            });
-        }
+    [TestMethod]
+    public void InitializeWithParametersShouldThrowExceptionIfParametersIsNull()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, (Dictionary<string, string?>)null!));
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldSetVerbosityLevel()
+    [TestMethod]
+    public void InitializeWithParametersShouldSetVerbosityLevel()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "minimal" },
-                { DefaultLoggerParameterNames.TargetFramework , "net451"}
-            };
-            this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+            { "verbosity", "minimal" },
+            { DefaultLoggerParameterNames.TargetFramework , "net462"}
+        };
+        _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
 
-            Assert.AreEqual(ConsoleLogger.Verbosity.Minimal, this.consoleLogger.VerbosityLevel);
-        }
+        Assert.AreEqual(ConsoleLogger.Verbosity.Minimal, _consoleLogger.VerbosityLevel);
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldDefaultToNormalVerbosityLevelForInvalidVerbosity()
+    [TestMethod]
+    public void InitializeWithParametersShouldDefaultToNormalVerbosityLevelForInvalidVerbosity()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "" },
-            };
+            { "verbosity", "" },
+        };
 
-            this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
 
 #if NETFRAMEWORK
-            Assert.AreEqual(ConsoleLogger.Verbosity.Normal, this.consoleLogger.VerbosityLevel);
+        Assert.AreEqual(ConsoleLogger.Verbosity.Normal, _consoleLogger.VerbosityLevel);
 #else
-            Assert.AreEqual(ConsoleLogger.Verbosity.Minimal, this.consoleLogger.VerbosityLevel);
+        Assert.AreEqual(ConsoleLogger.Verbosity.Minimal, _consoleLogger.VerbosityLevel);
 #endif
-        }
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldSetPrefixValue()
+    [TestMethod]
+    public void InitializeWithParametersShouldSetPrefixValue()
+    {
+        var parameters = new Dictionary<string, string?>
         {
-            var parameters = new Dictionary<string, string>
-            {
-                { "prefix", "true" },
-            };
-            Assert.IsFalse(ConsoleLogger.AppendPrefix);
+            { "prefix", "true" },
+        };
+        Assert.IsFalse(ConsoleLogger.AppendPrefix);
 
-            this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
 
-            Assert.IsTrue(ConsoleLogger.AppendPrefix);
-            ConsoleLogger.AppendPrefix = false;
-        }
+        Assert.IsTrue(ConsoleLogger.AppendPrefix);
+        ConsoleLogger.AppendPrefix = false;
+    }
 
-        [TestMethod]
-        public void InitializeWithParametersShouldSetNoProgress()
-        {
-            var parameters = new Dictionary<string, string>();
+    [TestMethod]
+    public void InitializeWithParametersShouldSetNoProgress()
+    {
+        var parameters = new Dictionary<string, string?>();
 
-            Assert.IsFalse(ConsoleLogger.EnableProgress);
+        Assert.IsFalse(ConsoleLogger.EnableProgress);
 
-            parameters.Add("progress", "true");
-            this.consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
+        parameters.Add("progress", "true");
+        _consoleLogger.Initialize(new Mock<TestLoggerEvents>().Object, parameters);
 
-            Assert.IsTrue(ConsoleLogger.EnableProgress);
+        Assert.IsTrue(ConsoleLogger.EnableProgress);
 
-            ConsoleLogger.EnableProgress = false;
-        }
+        ConsoleLogger.EnableProgress = false;
+    }
+
+    [TestMethod]
+    public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+
+        Assert.ThrowsException<ArgumentNullException>(() => loggerEvents.RaiseTestRunMessage(default!));
+    }
+
+    [TestMethod]
+    public void TestMessageHandlerShouldWriteToConsoleWhenTestRunMessageIsRaised()
+    {
+        var count = 0;
+        _mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
+            (s, o) => count++);
+
+        SetupForTestMessageHandler(out var loggerEvents);
+
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "Informational123"));
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "Error123"));
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, "Warning123"));
+        loggerEvents.WaitForEventCompletion();
+
+        // Added this for synchronization
+        SpinWait.SpinUntil(() => count == 3, 300);
+
+        AssertsForTestMessageHandler();
+        _mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(3));
+        _mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(3));
+    }
+
+    [TestMethod]
+    public void TestMessageHandlerShouldWriteToConsoleWhenTestDiscoveryMessageIsRaised()
+    {
+        var count = 0;
+        _mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
+            (s, o) => count++);
+
+        SetupForTestMessageHandler(out var loggerEvents);
+
+        loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "Informational123"));
+        loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "Error123"));
+        loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, "Warning123"));
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull()
+        // Added this for synchronization
+        SpinWait.SpinUntil(() => count == 3, 300);
+
+        AssertsForTestMessageHandler();
+        _mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(3));
+        _mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(3));
+    }
+
+    private void AssertsForTestMessageHandler()
+    {
+        _mockOutput.Verify(o => o.WriteLine("Informational123", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("Warning123", OutputLevel.Warning), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("Error123", OutputLevel.Error), Times.Once());
+    }
+
+    private void SetupForTestMessageHandler(out InternalTestLoggerEvents loggerEvents)
+    {
+        loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+    }
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-           {
-               loggerEvents.RaiseTestRunMessage(default);
-           });
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldThowExceptionIfEventArgsIsNull()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+
+        Assert.ThrowsException<ArgumentNullException>(() => loggerEvents.RaiseTestResult(default!));
+    }
 
-        [TestMethod]
-        public void TestMessageHandlerShouldWriteToConsoleWhenTestRunMessageIsRaised()
+    [TestMethod]
+    public void TestResultHandlerShouldShowStdOutMessagesBannerIfStdOutIsNotEmpty()
+    {
+        var count = 0;
+        _mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
+            (s, o) => count++);
+
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var count = 0;
-            this.mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
-                (s, o) => { count++; });
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        string message = "Dummy message";
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardOutCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            this.SetupForTestMessageHandler(out var loggerEvents);
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "Informational123"));
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "Error123"));
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, "Warning123"));
-            loggerEvents.WaitForEventCompletion();
+        // Added this for synchronization
+        SpinWait.SpinUntil(() => count == 2, 300);
 
-            // Added this for synchronization
-            SpinWait.SpinUntil(() => count == 3, 300);
+        _mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+    }
 
-            this.AssertsForTestMessageHandler();
-            this.mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(3));
-            this.mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(3));
-        }
+    [TestMethod]
+    public void NormalVerbosityShowNotStdOutMessagesForPassedTests()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardOutCategory, message);
+
+        var testresult = new ObjectModel.TestResult(testcase);
+        testresult.Outcome = TestOutcome.Passed;
+        testresult.Messages.Add(testResultMessage);
 
-        [TestMethod]
-        public void TestMessageHandlerShouldWriteToConsoleWhenTestDiscoveryMessageIsRaised()
+        // Raise an event on mock object
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
+
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdOutMessagesBanner, OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
+    }
+
+    [TestMethod]
+    public void DetailedVerbosityShowStdOutMessagesForPassedTests()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var count = 0;
-            this.mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
-                (s, o) => { count++; });
+            { "verbosity", "detailed" }
+        };
 
-            this.SetupForTestMessageHandler(out var loggerEvents);
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
 
-            loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Informational, "Informational123"));
-            loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, "Error123"));
-            loggerEvents.RaiseDiscoveryMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, "Warning123"));
-            loggerEvents.WaitForEventCompletion();
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardOutCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Passed
+        };
 
-            // Added this for synchronization
-            SpinWait.SpinUntil(() => count == 3, 300);
+        testresult.Messages.Add(testResultMessage);
 
-            this.AssertsForTestMessageHandler();
-            this.mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(3));
-            this.mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(3));
-        }
+        // Act. Raise an event on mock object
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
+
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+    }
 
-        private void AssertsForTestMessageHandler()
+    [TestMethod]
+    public void TestRunErrorMessageShowShouldTestRunFailed()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            this.mockOutput.Verify(o => o.WriteLine("Informational123", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("Warning123", OutputLevel.Warning), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("Error123", OutputLevel.Error), Times.Once());
-        }
+            { "verbosity", "detailed" }
+        };
+
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        string message = "Adapter Error";
+
+        // Act. Raise an event on mock object
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, message));
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
 
-        private void SetupForTestMessageHandler(out InternalTestLoggerEvents loggerEvents)
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Error), Times.Once());
+    }
+
+    [TestMethod]
+    public void InQuietModeTestErrorMessageShouldShowTestRunFailed()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-        }
+            { "verbosity", "quiet" },
+            { DefaultLoggerParameterNames.TargetFramework , "abc" }
+        };
+
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        string message = "Adapter Error";
+
+        // Act. Raise an event on mock object
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, message));
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
+
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldThowExceptionIfEventArgsIsNull()
+    [TestMethod]
+    public void InQuietModeTestWarningMessageShouldNotShow()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
+            { "verbosity", "quiet" },
+            { DefaultLoggerParameterNames.TargetFramework , "abc" }
+        };
 
-            Assert.ThrowsException<ArgumentNullException>(() =>
-            {
-                loggerEvents.RaiseTestResult(default);
-            });
-        }
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        string message = "Adapter Warning";
 
-        [TestMethod]
-        public void TestResultHandlerShouldShowStdOutMessagesBannerIfStdOutIsNotEmpty()
-        {
-            var count = 0;
-            this.mockOutput.Setup(o => o.WriteLine(It.IsAny<string>(), It.IsAny<OutputLevel>())).Callback<string, OutputLevel>(
-                (s, o) => { count++; });
-
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            string message = "Dummy message";
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardOutCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            // Added this for synchronization
-            SpinWait.SpinUntil(() => count == 2, 300);
-
-            this.mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
-        }
+        // Act. Raise an event on mock object
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, message));
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void NormalVerbosityShowNotStdOutMessagesForPassedTests()
-        {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardOutCategory, message);
-
-            var testresult = new ObjectModel.TestResult(testcase);
-            testresult.Outcome = TestOutcome.Passed;
-            testresult.Messages.Add(testResultMessage);
-
-            // Raise an event on mock object
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdOutMessagesBanner, OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
-        }
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Warning), Times.Never());
+    }
+
+    [TestMethod]
+    public void InNormalModeTestWarningAndErrorMessagesShouldShow()
+    {
+        // Setup
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        string message = "Adapter Warning";
+        string errorMessage = "Adapter Error";
+
+        // Act. Raise an event on mock object
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, message));
+        loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, errorMessage));
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
+
+        // Verify
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Warning), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(errorMessage, OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void DetailedVerbosityShowStdOutMessagesForPassedTests()
+    [TestMethod]
+    public void TestResultHandlerShouldNotShowStdOutMessagesBannerIfStdOutIsEmpty()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "detailed" }
-            };
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardOutCategory, null);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardOutCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Passed
-            };
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            testresult.Messages.Add(testResultMessage);
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdOutMessagesBanner, OutputLevel.Information), Times.Never());
+    }
 
-            // Act. Raise an event on mock object
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
+    [TestMethod]
+    public void TestResultHandlerShouldShowStdErrMessagesBannerIfStdErrIsNotEmpty()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardErrorCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
-        }
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void TestRunErrorMessageShowShouldTestRunFailed()
+        _mockOutput.Verify(o => o.WriteLine("  Standard Error Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+    }
+
+    [TestMethod]
+    public void TestResultHandlerShouldNotShowStdErrMessagesBannerIfStdErrIsEmpty()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "detailed" }
-            };
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            string message = "Adapter Error";
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardErrorCategory, null);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            // Act. Raise an event on mock object
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, message));
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Error), Times.Once());
-        }
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdErrMessagesBanner, OutputLevel.Information), Times.Never());
+    }
 
-        [TestMethod]
-        public void InQuietModeTestErrorMessageShouldShowTestRunFailed()
+    [TestMethod]
+    public void TestResultHandlerShouldShowAdditionalInfoBannerIfAdditionalInfoIsNotEmpty()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "quiet" },
-                { DefaultLoggerParameterNames.TargetFramework , "abc" }
-            };
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
+        TestResultMessage testResultMessage = new(TestResultMessage.AdditionalInfoCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            string message = "Adapter Error";
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            // Act. Raise an event on mock object
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, message));
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
+        _mockOutput.Verify(o => o.WriteLine("  Additional Information Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+    }
 
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Error), Times.Once());
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldNotShowAdditionalInfoBannerIfAdditionalInfoIsEmpty()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
 
-        [TestMethod]
-        public void InQuietModeTestWarningMessageShouldNotShow()
+        TestResultMessage testResultMessage = new(TestResultMessage.AdditionalInfoCategory, null);
+
+        var testresult = new ObjectModel.TestResult(testcase)
         {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "quiet" },
-                { DefaultLoggerParameterNames.TargetFramework , "abc" }
-            };
+            Outcome = TestOutcome.Failed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            string message = "Adapter Warning";
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            // Act. Raise an event on mock object
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, message));
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.AddnlInfoMessagesBanner, OutputLevel.Information), Times.Never());
+    }
 
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Warning), Times.Never());
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldShowPassedTestsForNormalVebosity()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [TestMethod]
-        public void InNormalModeTestWarningAndErrorMessagesShouldShow()
-        {
-            // Setup
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            string message = "Adapter Warning";
-            string errorMessage = "Adapter Error";
-
-            // Act. Raise an event on mock object
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Warning, message));
-            loggerEvents.RaiseTestRunMessage(new TestRunMessageEventArgs(TestMessageLevel.Error, errorMessage));
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
-
-            // Verify
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(message, OutputLevel.Warning), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(errorMessage, OutputLevel.Error), Times.Once());
+        foreach (var testResult in GetTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.WaitForEventCompletion();
+
+        _mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine("TestName [1 h 2 m]", OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.Write(FailedTestIndicator, OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine("TestName [4 m 5 s]", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.Write(SkippedTestIndicator, OutputLevel.Information), Times.Exactly(3));
+        _mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Exactly(3));
+        _mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(5));
+        _mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(5));
+    }
+
+    [DataRow(".NETFramework,version=v4.6.2", "(net462)", "quiet")]
+    [DataRow(".NETFramework,version=v4.6.2", "(net462)", "minimal")]
+    [DataRow(null, null, "quiet")]
+    [DataRow(null, null, "minimal")]
+    [TestMethod]
+    public void TestResultHandlerShouldShowFailedTestsAndPassedTestsForQuietVerbosity(string framework, string expectedFramework, string verbosityLevel)
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", verbosityLevel },
+            { DefaultLoggerParameterNames.TargetFramework , framework}
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotShowStdOutMessagesBannerIfStdOutIsEmpty()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardOutCategory, null);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdOutMessagesBanner, OutputLevel.Information), Times.Never());
+        foreach (var testResult in GetTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
 
-        [TestMethod]
-        public void TestResultHandlerShouldShowStdErrMessagesBannerIfStdErrIsNotEmpty()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardErrorCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine("  Standard Error Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+        foreach (var testResult in GetPassedTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotShowStdErrMessagesBannerIfStdErrIsEmpty()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardErrorCategory, null);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.StdErrMessagesBanner, OutputLevel.Information), Times.Never());
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
+
+        _mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
+            new[] { (CommandLineResources.PassedTestIndicator + "!").PadRight(8),
+            0.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            2.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            "1 m 2 s"}), OutputLevel.Information), Times.Once);
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
+            "TestSourcePassed",
+            expectedFramework), OutputLevel.Information), Times.Once);
+
+        _mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
+            new[] { (CommandLineResources.FailedTestIndicator + "!").PadRight(8),
+            1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            1.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            3.ToString(CultureInfo.InvariantCulture).PadLeft(5),
+            "1 h 2 m" }), OutputLevel.Information), Times.Once);
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
+            "TestSource",
+            expectedFramework), OutputLevel.Information), Times.Once);
+    }
+
+    [TestMethod]
+    [DataRow("normal")]
+    [DataRow("detailed")]
+    public void TestResultHandlerShouldNotShowformattedFailedTestsAndPassedTestsForOtherThanQuietVerbosity(string verbosityLevel)
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", verbosityLevel },
+            { DefaultLoggerParameterNames.TargetFramework , "net462"}
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        foreach (var testResult in GetTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
 
-        [TestMethod]
-        public void TestResultHandlerShouldShowAdditionalInfoBannerIfAdditionalInfoIsNotEmpty()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.AdditionalInfoCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine("  Additional Information Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Once());
+        foreach (var testResult in GetPassedTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotShowAdditionalInfoBannerIfAdditionalInfoIsEmpty()
+        loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), new Collection<InvokedDataCollector>(), TimeSpan.FromSeconds(1)));
+        loggerEvents.WaitForEventCompletion();
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, new object[] { CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net462)" }), OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, new object[] { CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net462)" }), OutputLevel.Information), Times.Never);
+    }
+
+    [TestMethod]
+    public void TestResultHandlerShouldNotShowNotStdOutMsgOfPassedTestIfVerbosityIsNormal()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
+        TestResultMessage testResultMessage = new(TestResultMessage.StandardOutCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Passed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.AdditionalInfoCategory, null);
+        _mockOutput.Verify(o => o.WriteLine("", OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
+    }
 
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed
-            };
-            testresult.Messages.Add(testResultMessage);
+    [TestMethod]
+    public void TestResultHandlerShouldNotShowDbgTrcMsg()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        string message = "Dummy message";
+        TestResultMessage testResultMessage = new(TestResultMessage.DebugTraceCategory, message);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Passed
+        };
+        testresult.Messages.Add(testResultMessage);
 
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
+        loggerEvents.WaitForEventCompletion();
 
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.AddnlInfoMessagesBanner, OutputLevel.Information), Times.Never());
-        }
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.DbgTrcMessagesBanner, OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldShowPassedTestsForNormalVebosity()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine("TestName [1 h 2 m]", OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.Write(FailedTestIndicator, OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine("TestName [4 m 5 s]", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.Write(SkippedTestIndicator, OutputLevel.Information), Times.Exactly(3));
-            this.mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Exactly(3));
-            this.mockProgressIndicator.Verify(pi => pi.Pause(), Times.Exactly(5));
-            this.mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(5));
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldWriteToConsoleButSkipPassedTestsForMinimalVerbosity()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "minimal" },
+            { DefaultLoggerParameterNames.TargetFramework , "net462"}
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [DataRow(".NETFramework,version=v4.5.1", "(net451)", "quiet")]
-        [DataRow(".NETFramework,version=v4.5.1", "(net451)", "minimal")]
-        [DataRow(null, null, "quiet")]
-        [DataRow(null, null, "minimal")]
-        [TestMethod]
-        public void TestResultHandlerShouldShowFailedTestsAndPassedTestsForQuietVebosity(string framework, string expectedFramework, string verbosityLevel)
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", verbosityLevel },
-                { DefaultLoggerParameterNames.TargetFramework , framework}
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-
-            foreach (var testResult in this.GetPassedTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
-                (CommandLineResources.PassedTestIndicator + "!").PadRight(8),
-                0.ToString().PadLeft(5),
-                1.ToString().PadLeft(5),
-                1.ToString().PadLeft(5), 2
-                .ToString().PadLeft(5),
-                "1 m 2 s"), OutputLevel.Information), Times.Once);
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
-                "TestSourcePassed",
-                expectedFramework), OutputLevel.Information), Times.Once);
-
-            this.mockOutput.Verify(o => o.Write(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary,
-                (CommandLineResources.FailedTestIndicator + "!").PadRight(8),
-                1.ToString().PadLeft(5),
-                1.ToString().PadLeft(5),
-                1.ToString().PadLeft(5),
-                3.ToString().PadLeft(5),
-                "1 h 2 m"), OutputLevel.Information), Times.Once);
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework,
-                "TestSource",
-                expectedFramework), OutputLevel.Information), Times.Once);
+        foreach (var testResult in GetTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.WaitForEventCompletion();
+
+        _mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine("TestName [1 h 2 m]", OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.Write(FailedTestIndicator, OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine("TestName [4 m 5 s]", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.Write(SkippedTestIndicator, OutputLevel.Information), Times.Exactly(3));
+        _mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Exactly(3));
+    }
 
-        [TestMethod]
-        [DataRow("normal")]
-        [DataRow("detailed")]
-        public void TestResultHandlerShouldNotShowformattedFailedTestsAndPassedTestsForOtherThanQuietVebosity(string verbosityLevel)
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", verbosityLevel },
-                { DefaultLoggerParameterNames.TargetFramework , "net451"}
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-
-            foreach (var testResult in this.GetPassedTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-
-            loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock<ITestRunStatistics>().Object, false, false, null, new Collection<AttachmentSet>(), TimeSpan.FromSeconds(1)));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net451)"), OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net451)"), OutputLevel.Information), Times.Never);
-        }
+    [TestMethod]
+    public void TestResultHandlerShouldWriteToNoTestResultForQuietVerbosity()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "quiet" },
+            { DefaultLoggerParameterNames.TargetFramework , "net462"}
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotShowNotStdOutMsgOfPassedTestIfVerbosityIsNormal()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.StandardOutCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Passed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine("", OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
+        foreach (var testResult in GetTestResultsObject())
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void TestResultHandlerShouldNotShowDbgTrcMsg()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            string message = "Dummy message";
-            TestResultMessage testResultMessage = new TestResultMessage(TestResultMessage.DebugTraceCategory, message);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Passed
-            };
-            testresult.Messages.Add(testResultMessage);
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(testresult));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.DbgTrcMessagesBanner, OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(" " + message, OutputLevel.Information), Times.Never());
-        }
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.PassedTestIndicator, "TestName [1 h 2 m]"), OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.FailedTestIndicator, "TestName [4 m 5 s]"), OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Warning), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NotRunTestIndicator, "TestName"), OutputLevel.Information), Times.Never);
+    }
 
-        [TestMethod]
-        public void TestResultHandlerShouldWriteToConsoleButSkipPassedTestsForMinimalVerbosity()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "minimal" },
-                { DefaultLoggerParameterNames.TargetFramework , "net451"}
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine("TestName [1 h 2 m]", OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.Write(FailedTestIndicator, OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine("TestName [4 m 5 s]", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.Write(SkippedTestIndicator, OutputLevel.Information), Times.Exactly(3));
-            this.mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Exactly(3));
-        }
+    [DataRow("[1 h 2 m]", new int[5] { 0, 1, 2, 3, 78 })]
+    [DataRow("[4 m 3 s]", new int[5] { 0, 0, 4, 3, 78 })]
+    [DataRow("[3 s]", new int[5] { 0, 0, 0, 3, 78 })]
+    [DataRow("[78 ms]", new int[5] { 0, 0, 0, 0, 78 })]
+    [DataRow("[1 h]", new int[5] { 0, 1, 0, 5, 78 })]
+    [DataRow("[5 m]", new int[5] { 0, 0, 5, 0, 78 })]
+    [DataRow("[4 s]", new int[5] { 0, 0, 0, 4, 0 })]
+    [DataTestMethod]
+    public void TestResultHandlerForTestResultWithDurationShouldPrintDurationInfo(string expectedDuration, int[] timeSpanArgs)
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        var testResultWithHrMinSecMs = new ObjectModel.TestResult(new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource") { DisplayName = "TestName" })
+        {
+            Outcome = TestOutcome.Passed,
+            Duration = new TimeSpan(timeSpanArgs[0], timeSpanArgs[1], timeSpanArgs[2], timeSpanArgs[3], timeSpanArgs[4])
+        };
 
-        [TestMethod]
-        public void TestResultHandlerShouldWriteToNoTestResultForQuietVerbosity()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "quiet" },
-                { DefaultLoggerParameterNames.TargetFramework , "net451"}
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultsObject())
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.PassedTestIndicator, "TestName [1 h 2 m]"), OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.FailedTestIndicator, "TestName [4 m 5 s]"), OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Warning), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NotRunTestIndicator, "TestName"), OutputLevel.Information), Times.Never);
-        }
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testResultWithHrMinSecMs));
+        loggerEvents.WaitForEventCompletion();
 
-        [DataRow("[1 h 2 m]", new int[5] { 0, 1, 2, 3, 78 })]
-        [DataRow("[4 m 3 s]", new int[5] { 0, 0, 4, 3, 78 })]
-        [DataRow("[3 s]", new int[5] { 0, 0, 0, 3, 78 })]
-        [DataRow("[78 ms]", new int[5] { 0, 0, 0, 0, 78 })]
-        [DataRow("[1 h]", new int[5] { 0, 1, 0, 5, 78 })]
-        [DataRow("[5 m]", new int[5] { 0, 0, 5, 0, 78 })]
-        [DataRow("[4 s]", new int[5] { 0, 0, 0, 4, 0 })]
-        [DataTestMethod]
-        public void TestResultHandlerForTestResultWithDurationShouldPrintDurationInfo(string expectedDuration, int[] timeSpanArgs)
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            var TestResultWithHrMinSecMs = new ObjectModel.TestResult(new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource") { DisplayName = "TestName" })
-            {
-                Outcome = TestOutcome.Passed,
-                Duration = new TimeSpan(timeSpanArgs[0], timeSpanArgs[1], timeSpanArgs[2], timeSpanArgs[3], timeSpanArgs[4])
-            };
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(TestResultWithHrMinSecMs));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("TestName " + expectedDuration, OutputLevel.Information), Times.Once());
-        }
+        _mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("TestName " + expectedDuration, OutputLevel.Information), Times.Once());
+    }
 
-        [DataTestMethod]
-        public void TestResultHandlerForTestResultWithDurationLessThanOneMsShouldPrintDurationInfo()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-            var TestResultWithHrMinSecMs = new ObjectModel.TestResult(new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource") { DisplayName = "TestName" })
-            {
-                Outcome = TestOutcome.Passed,
-                Duration = TimeSpan.FromTicks(50)
-            };
-
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(TestResultWithHrMinSecMs));
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("TestName [< 1 ms]", OutputLevel.Information), Times.Once());
-        }
+    [DataTestMethod]
+    public void TestResultHandlerForTestResultWithDurationLessThanOneMsShouldPrintDurationInfo()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+        var testResultWithHrMinSecMs = new ObjectModel.TestResult(new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource") { DisplayName = "TestName" })
+        {
+            Outcome = TestOutcome.Passed,
+            Duration = TimeSpan.FromTicks(50)
+        };
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsPass()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultObject(TestOutcome.Passed))
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(1, 0, 0, 0));
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunSuccessful, OutputLevel.Information), Times.Once());
-            this.mockProgressIndicator.Verify(pi => pi.Stop(), Times.Once);
-        }
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(testResultWithHrMinSecMs));
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsFail()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultObject(TestOutcome.Failed))
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(1, 0, 0, 0));
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
-        }
+        _mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("TestName [< 1 ms]", OutputLevel.Information), Times.Once());
+    }
+
+    [TestMethod]
+    public void TestRunCompleteHandlerCorrectlySplitPathsForSourceName()
+    {
+        // Arrange
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "minimal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        // Linux-like path
+        loggerEvents.RaiseTestResult(new(new(new("FQN1", new Uri("some://uri"), "/home/MyApp1/Tests/MyApp1.Tests/MyApp1.Tests.dll"))));
+        // Double forward slashes path
+        loggerEvents.RaiseTestResult(new(new(new("FQN2", new Uri("some://uri"), "/home//MyApp2//Tests//MyApp2.Tests//MyApp2.Tests.dll"))));
+        // Backslashes path
+        loggerEvents.RaiseTestResult(new(new(new("FQN3", new Uri("some://uri"), @"C:\MyApp3/Tests/MyApp3.Tests\MyApp3.Tests.dll"))));
+        // Multiple Backslashes path
+        loggerEvents.RaiseTestResult(new(new(new("FQN4", new Uri("some://uri"), "C:\\\\MyApp4\\\\Tests\\\\MyApp4.Tests\\\\MyApp4.Tests.dll"))));
+        // Mix backslashes and forward slashes path
+        loggerEvents.RaiseTestResult(new(new(new("FQN5", new Uri("some://uri"), "C:\\MyApp5/Tests\\\\MyApp5.Tests///MyApp5.Tests.dll"))));
+        // UNC path
+        loggerEvents.RaiseTestResult(new(new(new("FQN6", new Uri("some://uri"), @"\\MyApp6\Tests\MyApp6.Tests\MyApp6.Tests.dll"))));
+
+        // Act
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
+
+        // Assert
+        VerifyCall("MyApp1.Tests.dll");
+        VerifyCall("MyApp2.Tests.dll");
+        // On Linux and MAC we don't support backslash for path so source name will contain backslashes.
+        VerifyCall(OSUtils.IsWindows ? "MyApp3.Tests.dll" : "MyApp3.Tests\\MyApp3.Tests.dll");
+        // On Linux and MAC we don't support backslash for path so source name will contain backslashes.
+        VerifyCall(OSUtils.IsWindows ? "MyApp4.Tests.dll" : @"C:\\MyApp4\\Tests\\MyApp4.Tests\\MyApp4.Tests.dll");
+        VerifyCall("MyApp5.Tests.dll");
+        VerifyCall(OSUtils.IsWindows ? "MyApp6.Tests.dll" : @"\\MyApp6\Tests\MyApp6.Tests\MyApp6.Tests.dll");
+
+        // Local functions
+        void VerifyCall(string testName)
+            => _mockOutput.Verify(
+                o => o.WriteLine(
+                    string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryAssemblyAndFramework, testName, ""),
+                    OutputLevel.Information),
+                Times.Once());
+    }
+
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsPass()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceled()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>
-            {
-                { "verbosity", "normal" }
-            };
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultObject(TestOutcome.Failed))
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.CompleteTestRun(null, true, false, null, null, new TimeSpan(1, 0, 0, 0));
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
+        foreach (var testResult in GetTestResultObject(TestOutcome.Passed))
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunSuccessful, OutputLevel.Information), Times.Once());
+        _mockProgressIndicator.Verify(pi => pi.Stop(), Times.Once);
+    }
+
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsFail()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceledWithoutRunningAnyTest()
+        foreach (var testResult in GetTestResultObject(TestOutcome.Failed))
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
+        }
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunFailed, OutputLevel.Error), Times.Once());
+    }
 
-            loggerEvents.CompleteTestRun(null, true, false, null, null, new TimeSpan(1, 0, 0, 0));
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceled()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
+        foreach (var testResult in GetTestResultObject(TestOutcome.Failed))
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.CompleteTestRun(null, true, false, null, null, null, new TimeSpan(1, 0, 0, 0));
+
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, Array.Empty<string>()), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummarySkippedTests, 0), OutputLevel.Information), Times.Never());
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceledWithoutRunningAnyTest()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            foreach (var testResult in this.GetTestResultObject(TestOutcome.Failed))
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.CompleteTestRun(null, false, true, null, null, new TimeSpan(1, 0, 0, 0));
+        loggerEvents.CompleteTestRun(null, true, false, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
-        }
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
+    }
 
-        [TestMethod]
-        public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAbortedWithoutRunningAnyTest()
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            { "verbosity", "normal" }
+        };
 
-            loggerEvents.CompleteTestRun(null, false, true, null, null, new TimeSpan(1, 0, 0, 0));
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
+        foreach (var testResult in GetTestResultObject(TestOutcome.Failed))
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.CompleteTestRun(null, false, true, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-        [TestMethod]
-        public void TestRunStartHandlerShouldWriteNumberOfTestSourcesDiscoveredOnConsole()
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, Array.Empty<string>()), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
+    }
+
+    [TestMethod]
+    public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAbortedWithoutRunningAnyTest()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            var fileHelper = new Mock<IFileHelper>();
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.FileHelper = fileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
-            string testFilePath = Path.Combine(Path.GetTempPath(), "DmmyTestFile.dll");
-            fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
+        loggerEvents.CompleteTestRun(null, false, true, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-            CommandLineOptions.Instance.AddSource(testFilePath);
+        _mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
+    }
 
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+    [TestMethod]
+    public void TestRunStartHandlerShouldWriteNumberOfTestSourcesDiscoveredOnConsole()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
 
-            var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
-            loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
-            loggerEvents.WaitForEventCompletion();
+        var fileHelper = new Mock<IFileHelper>();
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.FileHelper = fileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
+        string testFilePath = Path.Combine(Path.GetTempPath(), "DmmyTestFile.dll");
+        fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
 
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
-        }
+        CommandLineOptions.Instance.AddSource(testFilePath);
 
-        [TestMethod]
-        public void TestRunStartHandlerShouldWriteTestSourcesDiscoveredOnConsoleIfVerbosityDetailed()
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            var fileHelper = new Mock<IFileHelper>();
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.FileHelper = fileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
-            var temp = Path.GetTempPath();
-            string testFilePath = Path.Combine(temp, "DummyTestFile.dll");
-            fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
-            string testFilePath2 = Path.Combine(temp, "DummyTestFile2.dll");
-            fileHelper.Setup(fh => fh.Exists(testFilePath2)).Returns(true);
+        var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
+        loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
+        loggerEvents.WaitForEventCompletion();
 
-            CommandLineOptions.Instance.AddSource(testFilePath);
-            CommandLineOptions.Instance.AddSource(testFilePath2);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
+    }
 
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "detailed");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+    [TestMethod]
+    public void TestRunStartHandlerShouldWriteTestSourcesDiscoveredOnConsoleIfVerbosityDetailed()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+
+        var fileHelper = new Mock<IFileHelper>();
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.FileHelper = fileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
+        var temp = Path.GetTempPath();
+        string testFilePath = Path.Combine(temp, "DummyTestFile.dll");
+        fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
+        string testFilePath2 = Path.Combine(temp, "DummyTestFile2.dll");
+        fileHelper.Setup(fh => fh.Exists(testFilePath2)).Returns(true);
+
+        CommandLineOptions.Instance.AddSource(testFilePath);
+        CommandLineOptions.Instance.AddSource(testFilePath2);
+
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "detailed" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
-            loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
-            loggerEvents.WaitForEventCompletion();
+        var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
+        loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
+        loggerEvents.WaitForEventCompletion();
 
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Once);
-        }
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Once);
+    }
 
-        [TestMethod]
-        public void TestRunStartHandlerShouldNotWriteTestSourcesDiscoveredOnConsoleIfVerbosityNotDetailed()
+    [TestMethod]
+    public void TestRunStartHandlerShouldNotWriteTestSourcesDiscoveredOnConsoleIfVerbosityNotDetailed()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+
+        var fileHelper = new Mock<IFileHelper>();
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.FileHelper = fileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
+        var temp = Path.GetTempPath();
+        string testFilePath = Path.Combine(temp, "DummyTestFile.dll");
+        fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
+        string testFilePath2 = Path.Combine(temp, "DummyTestFile2.dll");
+        fileHelper.Setup(fh => fh.Exists(testFilePath2)).Returns(true);
+
+        CommandLineOptions.Instance.AddSource(testFilePath);
+        CommandLineOptions.Instance.AddSource(testFilePath2);
+
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-
-            var fileHelper = new Mock<IFileHelper>();
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.FileHelper = fileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, fileHelper.Object);
-            var temp = Path.GetTempPath();
-            string testFilePath = Path.Combine(temp, "DummyTestFile.dll");
-            fileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
-            string testFilePath2 = Path.Combine(temp, "DummyTestFile2.dll");
-            fileHelper.Setup(fh => fh.Exists(testFilePath2)).Returns(true);
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            CommandLineOptions.Instance.AddSource(testFilePath);
-            CommandLineOptions.Instance.AddSource(testFilePath2);
+        var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
+        loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
+        loggerEvents.WaitForEventCompletion();
 
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Never);
+        _mockOutput.Verify(o => o.WriteLine(testFilePath2, OutputLevel.Information), Times.Never);
+    }
 
-            var testRunStartEventArgs = new TestRunStartEventArgs(new TestRunCriteria(new List<string> { testFilePath }, 1));
-            loggerEvents.RaiseTestRunStart(testRunStartEventArgs);
-            loggerEvents.WaitForEventCompletion();
+    [TestMethod]
+    public void PrintTimeHandlerShouldPrintElapsedTimeOnConsole()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestSourcesDiscovered, CommandLineOptions.Instance.Sources.Count()), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(testFilePath, OutputLevel.Information), Times.Never);
-            this.mockOutput.Verify(o => o.WriteLine(testFilePath2, OutputLevel.Information), Times.Never);
+        foreach (var testResult in GetTestResultObject(TestOutcome.Passed))
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(0, 1, 0, 0));
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(0, 0, 1, 0));
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(0, 0, 0, 1));
+
+        // Verify PrintTimeSpan with different formats
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Days), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Hours), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Minutes), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Seconds), OutputLevel.Information), Times.Once());
+    }
 
-        [TestMethod]
-        public void PrintTimeHandlerShouldPrintElapsedTimeOnConsole()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            foreach (var testResult in this.GetTestResultObject(TestOutcome.Passed))
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(1, 0, 0, 0));
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(0, 1, 0, 0));
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(0, 0, 1, 0));
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(0, 0, 0, 1));
-
-            // Verify PrintTimeSpan with different formats
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Days), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Hours), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Minutes), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.ExecutionTimeFormatString, 1, CommandLineResources.Seconds), OutputLevel.Information), Times.Once());
+    [TestMethod]
+    public void DisplayFullInformationShouldWriteErrorMessageAndStackTraceToConsole()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var testresults = GetTestResultObject(TestOutcome.Failed);
+        testresults[0].ErrorMessage = "ErrorMessage";
+        testresults[0].ErrorStackTrace = "ErrorStackTrace";
+        foreach (var testResult in testresults)
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.WaitForEventCompletion();
 
-        [TestMethod]
-        public void DisplayFullInformationShouldWriteErrorMessageAndStackTraceToConsole()
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testresults = this.GetTestResultObject(TestOutcome.Failed);
-            testresults[0].ErrorMessage = "ErrorMessage";
-            testresults[0].ErrorStackTrace = "ErrorStackTrace";
-            foreach (var testResult in testresults)
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, "{0}", "   ErrorMessage"), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, "{0}", "  ErrorStackTrace"), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("  Error Message:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("  Stack Trace:", OutputLevel.Information), Times.Once());
-        }
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, "{0}", "   ErrorMessage"), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, "{0}", "  ErrorStackTrace"), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("  Error Message:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("  Stack Trace:", OutputLevel.Information), Times.Once());
+    }
 
-        [TestMethod]
-        public void DisplayFullInformationShouldWriteStdMessageWithNewLine()
+    [TestMethod]
+    public void DisplayFullInformationShouldWriteStdMessageWithNewLine()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "detailed");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var testresults = this.GetTestResultObject(TestOutcome.Passed);
-            testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardOutCategory, "Hello"));
+            { "verbosity", "detailed" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            foreach (var testResult in testresults)
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
+        var testresults = GetTestResultObject(TestOutcome.Passed);
+        testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardOutCategory, "Hello"));
 
-            this.mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" Hello", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(String.Empty, OutputLevel.Information), Times.AtLeastOnce);
+        foreach (var testResult in testresults)
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
         }
+        loggerEvents.WaitForEventCompletion();
+
+        _mockOutput.Verify(o => o.Write(PassedTestIndicator, OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("TestName", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" Hello", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Empty, OutputLevel.Information), Times.AtLeastOnce);
+    }
 
-        [TestMethod]
-        public void GetTestMessagesShouldWriteMessageAndStackTraceToConsole()
+    [TestMethod]
+    public void GetTestMessagesShouldWriteMessageAndStackTraceToConsole()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            var testresults = this.GetTestResultObject(TestOutcome.Failed);
-            testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardOutCategory, "StandardOutCategory"));
-            testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardErrorCategory, "StandardErrorCategory"));
-            testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.AdditionalInfoCategory, "AdditionalInfoCategory"));
-            testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.AdditionalInfoCategory, "AnotherAdditionalInfoCategory"));
+        var testresults = GetTestResultObject(TestOutcome.Failed);
+        testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardOutCategory, "StandardOutCategory"));
+        testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.StandardErrorCategory, "StandardErrorCategory"));
+        testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.AdditionalInfoCategory, "AdditionalInfoCategory"));
+        testresults[0].Messages.Add(new TestResultMessage(TestResultMessage.AdditionalInfoCategory, "AnotherAdditionalInfoCategory"));
+
+        foreach (var testResult in testresults)
+        {
+            loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
+        }
+        loggerEvents.WaitForEventCompletion();
 
-            foreach (var testResult in testresults)
-            {
-                loggerEvents.RaiseTestResult(new TestResultEventArgs(testResult));
-            }
-            loggerEvents.WaitForEventCompletion();
+        _mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" StandardOutCategory", OutputLevel.Information), Times.Once());
 
-            this.mockOutput.Verify(o => o.WriteLine("  Standard Output Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" StandardOutCategory", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("  Standard Error Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" StandardErrorCategory", OutputLevel.Information), Times.Once());
 
-            this.mockOutput.Verify(o => o.WriteLine("  Standard Error Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" StandardErrorCategory", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine("  Additional Information Messages:", OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(" AdditionalInfoCategory AnotherAdditionalInfoCategory", OutputLevel.Information), Times.Once());
+    }
 
-            this.mockOutput.Verify(o => o.WriteLine("  Additional Information Messages:", OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(" AdditionalInfoCategory AnotherAdditionalInfoCategory", OutputLevel.Information), Times.Once());
-        }
+    [DataRow("quiet")]
+    [DataRow("Normal")]
+    [DataRow("minimal")]
+    [DataRow("detailed")]
+    [TestMethod]
+    public void AttachmentInformationShouldBeWrittenToConsoleIfAttachmentsArePresent(string verbosityLevel)
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
+        {
+            { "verbosity", verbosityLevel }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
+
+        var attachmentSet = new AttachmentSet(new Uri("test://uri"), "myattachmentset");
+        var uriDataAttachment = new UriDataAttachment(new Uri("file://server/filename.ext"), "description");
+        attachmentSet.Attachments.Add(uriDataAttachment);
+        var uriDataAttachment1 = new UriDataAttachment(new Uri("file://server/filename1.ext"), "description");
+        attachmentSet.Attachments.Add(uriDataAttachment1);
+        var attachmentSetList = new List<AttachmentSet>
+        {
+            attachmentSet
+        };
+        loggerEvents.CompleteTestRun(null, false, false, null, new Collection<AttachmentSet>(attachmentSetList), new Collection<InvokedDataCollector>(), new TimeSpan(1, 0, 0, 0));
 
-        [DataRow("quiet")]
-        [DataRow("Normal")]
-        [DataRow("minimal")]
-        [DataRow("detailed")]
-        [TestMethod]
-        public void AttachmentInformationShouldBeWrittenToConsoleIfAttachmentsArePresent(string verbosityLevel)
-        {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", verbosityLevel);
-            this.consoleLogger.Initialize(loggerEvents, parameters);
-
-            var attachmentSet = new AttachmentSet(new Uri("test://uri"), "myattachmentset");
-            var uriDataAttachment = new UriDataAttachment(new Uri("file://server/filename.ext"), "description");
-            attachmentSet.Attachments.Add(uriDataAttachment);
-            var uriDataAttachment1 = new UriDataAttachment(new Uri("file://server/filename1.ext"), "description");
-            attachmentSet.Attachments.Add(uriDataAttachment1);
-            var attachmentSetList = new List<AttachmentSet>
-            {
-                attachmentSet
-            };
-            loggerEvents.CompleteTestRun(null, false, false, null, new Collection<AttachmentSet>(attachmentSetList), new TimeSpan(1, 0, 0, 0));
-
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AttachmentOutputFormat, uriDataAttachment.Uri.LocalPath), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AttachmentOutputFormat, uriDataAttachment1.Uri.LocalPath), OutputLevel.Information), Times.Once());
-        }
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AttachmentOutputFormat, uriDataAttachment.Uri.LocalPath), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.AttachmentOutputFormat, uriDataAttachment1.Uri.LocalPath), OutputLevel.Information), Times.Once());
+    }
 
-        [TestMethod]
-        public void ResultsInHeirarchichalOrderShouldReportCorrectCount()
+    [TestMethod]
+    public void ResultsInHeirarchichalOrderShouldReportCorrectCount()
+    {
+        var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
+        loggerEvents.EnableEvents();
+        var parameters = new Dictionary<string, string?>
         {
-            var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance);
-            loggerEvents.EnableEvents();
-            var parameters = new Dictionary<string, string>();
-            parameters.Add("verbosity", "normal");
-            this.consoleLogger.Initialize(loggerEvents, parameters);
+            { "verbosity", "normal" }
+        };
+        _consoleLogger.Initialize(loggerEvents, parameters);
 
-            TestCase testCase1 = CreateTestCase("TestCase1");
-            TestCase testCase2 = CreateTestCase("TestCase2");
-            TestCase testCase3 = CreateTestCase("TestCase3");
+        TestCase testCase1 = CreateTestCase("TestCase1");
+        TestCase testCase2 = CreateTestCase("TestCase2");
+        TestCase testCase3 = CreateTestCase("TestCase3");
 
-            Guid parentExecutionId = Guid.NewGuid();
-            TestProperty ParentExecIdProperty = TestProperty.Register("ParentExecId", "ParentExecId", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
-            TestProperty ExecutionIdProperty = TestProperty.Register("ExecutionId", "ExecutionId", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
-            TestProperty TestTypeProperty = TestProperty.Register("TestType", "TestType", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
+        Guid parentExecutionId = Guid.NewGuid();
+        TestProperty parentExecIdProperty = TestProperty.Register("ParentExecId", "ParentExecId", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
+        TestProperty executionIdProperty = TestProperty.Register("ExecutionId", "ExecutionId", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
+        TestProperty testTypeProperty = TestProperty.Register("TestType", "TestType", typeof(Guid), TestPropertyAttributes.Hidden, typeof(ObjectModel.TestResult));
 
-            var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
-            result1.SetPropertyValue(ExecutionIdProperty, parentExecutionId);
+        var result1 = new ObjectModel.TestResult(testCase1) { Outcome = TestOutcome.Failed };
+        result1.SetPropertyValue(executionIdProperty, parentExecutionId);
 
-            var result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
-            result2.SetPropertyValue(ExecutionIdProperty, Guid.NewGuid());
-            result2.SetPropertyValue(ParentExecIdProperty, parentExecutionId);
+        var result2 = new ObjectModel.TestResult(testCase2) { Outcome = TestOutcome.Passed };
+        result2.SetPropertyValue(executionIdProperty, Guid.NewGuid());
+        result2.SetPropertyValue(parentExecIdProperty, parentExecutionId);
 
-            var result3 = new ObjectModel.TestResult(testCase3) { Outcome = TestOutcome.Failed };
-            result3.SetPropertyValue(ExecutionIdProperty, Guid.NewGuid());
-            result3.SetPropertyValue(ParentExecIdProperty, parentExecutionId);
+        var result3 = new ObjectModel.TestResult(testCase3) { Outcome = TestOutcome.Failed };
+        result3.SetPropertyValue(executionIdProperty, Guid.NewGuid());
+        result3.SetPropertyValue(parentExecIdProperty, parentExecutionId);
 
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(result1));
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(result2));
-            loggerEvents.RaiseTestResult(new TestResultEventArgs(result3));
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(result1));
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(result2));
+        loggerEvents.RaiseTestResult(new TestResultEventArgs(result3));
 
-            loggerEvents.CompleteTestRun(null, false, false, null, null, new TimeSpan(1, 0, 0, 0));
+        loggerEvents.CompleteTestRun(null, false, false, null, null, null, new TimeSpan(1, 0, 0, 0));
 
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 1), OutputLevel.Information), Times.Once());
-            this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 2), OutputLevel.Information), Times.Once());
-        }
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryFailedTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryPassedTests, 1), OutputLevel.Information), Times.Once());
+        _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryTotalTests, 2), OutputLevel.Information), Times.Once());
+    }
+
+    private static TestCase CreateTestCase(string testCaseName)
+    {
+        return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
+    }
 
-        private TestCase CreateTestCase(string testCaseName)
+    private static List<ObjectModel.TestResult> GetTestResultsObject()
+    {
+        var testcase = new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource")
         {
-            return new TestCase(testCaseName, new Uri("some://uri"), "DummySourceFileName");
-        }
+            DisplayName = "TestName"
+        };
 
-        private void Setup()
+        var duration = new TimeSpan(1, 2, 3);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Passed,
+            Duration = duration,
+            StartTime = DateTime.Now - duration,
+            EndTime = DateTime.Now
+        };
+
+        var duration1 = new TimeSpan(0, 0, 4, 5, 60);
+        var testresult1 = new ObjectModel.TestResult(testcase)
         {
-            this.mockRequestData = new Mock<IRequestData>();
-            this.mockMetricsCollection = new Mock<IMetricsCollection>();
-            mockRequestData.Setup(rd => rd.MetricsCollection).Returns(mockMetricsCollection.Object);
+            Outcome = TestOutcome.Failed,
+            Duration = duration1,
+            StartTime = DateTime.Now - duration1,
+            EndTime = DateTime.Now
+        };
 
-            this.mockOutput = new Mock<IOutput>();
-            this.mockProgressIndicator = new Mock<IProgressIndicator>();
-            this.consoleLogger = new ConsoleLogger(this.mockOutput.Object, this.mockProgressIndicator.Object);
-        }
+        var testresult2 = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.None
+        };
 
-        private List<ObjectModel.TestResult> GetTestResultsObject()
-        {
-            var testcase = new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSource")
-            {
-                DisplayName = "TestName"
-            };
-
-            var duration = new TimeSpan(1, 2, 3);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Passed,
-                Duration = duration,
-                StartTime = DateTime.Now - duration,
-                EndTime = DateTime.Now
-            };
-
-            var duration1 = new TimeSpan(0, 0, 4, 5, 60);
-            var testresult1 = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Failed,
-                Duration = duration1, 
-                StartTime = DateTime.Now - duration1, 
-                EndTime = DateTime.Now
-            };
-
-            var testresult2 = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.None
-            };
-
-            var testresult3 = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.NotFound
-            };
-
-            var testresult4 = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Skipped
-            };
-
-            var testresultList = new List<ObjectModel.TestResult> { testresult, testresult1, testresult2, testresult3, testresult4 };
-
-            return testresultList;
-        }
+        var testresult3 = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.NotFound
+        };
 
-        private List<ObjectModel.TestResult> GetPassedTestResultsObject()
+        var testresult4 = new ObjectModel.TestResult(testcase)
         {
-            var testcase = new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSourcePassed")
-            {
-                DisplayName = "TestName"
-            };
+            Outcome = TestOutcome.Skipped
+        };
 
-            var duration = new TimeSpan(0, 0, 1, 2, 3);
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Passed,
-                Duration = duration,
-                StartTime = DateTime.Now - duration,
-                EndTime = DateTime.Now
-            };
+        var testresultList = new List<ObjectModel.TestResult> { testresult, testresult1, testresult2, testresult3, testresult4 };
 
-            var testresult1 = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = TestOutcome.Skipped
-            };
+        return testresultList;
+    }
 
-            var testresultList = new List<ObjectModel.TestResult> { testresult, testresult1 };
+    private static List<ObjectModel.TestResult> GetPassedTestResultsObject()
+    {
+        var testcase = new TestCase("DymmyNamespace.DummyClass.TestName", new Uri("some://uri"), "TestSourcePassed")
+        {
+            DisplayName = "TestName"
+        };
 
-            return testresultList;
-        }
+        var duration = new TimeSpan(0, 0, 1, 2, 3);
+        var testresult = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Passed,
+            Duration = duration,
+            StartTime = DateTime.Now - duration,
+            EndTime = DateTime.Now
+        };
+
+        var testresult1 = new ObjectModel.TestResult(testcase)
+        {
+            Outcome = TestOutcome.Skipped
+        };
+
+        var testresultList = new List<ObjectModel.TestResult> { testresult, testresult1 };
+
+        return testresultList;
+    }
 
 
-        private List<ObjectModel.TestResult> GetTestResultObject(TestOutcome outcome)
+    private static List<ObjectModel.TestResult> GetTestResultObject(TestOutcome outcome)
+    {
+        var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
+        var testresult = new ObjectModel.TestResult(testcase)
         {
-            var testcase = new TestCase("TestName", new Uri("some://uri"), "TestSource");
-            var testresult = new ObjectModel.TestResult(testcase)
-            {
-                Outcome = outcome
-            };
-            var testresultList = new List<ObjectModel.TestResult> { testresult };
-            return testresultList;
-        }
+            Outcome = outcome
+        };
+        var testresultList = new List<ObjectModel.TestResult> { testresult };
+        return testresultList;
     }
 }
diff --git a/test/vstest.console.UnitTests/Internal/FilePatternParserTests.cs b/test/vstest.console.UnitTests/Internal/FilePatternParserTests.cs
index 13ae7d8fb8..4c7e7e0f29 100644
--- a/test/vstest.console.UnitTests/Internal/FilePatternParserTests.cs
+++ b/test/vstest.console.UnitTests/Internal/FilePatternParserTests.cs
@@ -1,125 +1,179 @@
-// Copyright(c) Microsoft Corporation.All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace vstest.console.UnitTests.Internal
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+
+namespace vstest.console.UnitTests.Internal;
+
+[TestClass]
+public class FilePatternParserTests
 {
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System.Collections.Generic;
-    using vstest.console.Internal;
-
-    [TestClass]
-    public class FilePatternParserTests
+    private readonly FilePatternParser _filePatternParser;
+    private readonly Mock<Matcher> _mockMatcherHelper;
+    private readonly Mock<IFileHelper> _mockFileHelper;
+
+    public FilePatternParserTests()
+    {
+        _mockMatcherHelper = new Mock<Matcher>();
+        _mockFileHelper = new Mock<IFileHelper>();
+        _filePatternParser = new FilePatternParser(_mockMatcherHelper.Object, _mockFileHelper.Object);
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCorrectlySplitPatternAndDirectory()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        _filePatternParser.GetMatchingFiles(TranslatePath(@"C:\Users\vanidhi\Desktop\a\c\*bc.dll"));
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"*bc.dll")));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"C:\Users\vanidhi\Desktop\a\c")))));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCorrectlySplitWithArbitraryDirectoryDepth()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        _filePatternParser.GetMatchingFiles(TranslatePath(@"C:\Users\vanidhi\**\c\*bc.txt"));
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"**\c\*bc.txt")));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"C:\Users\vanidhi")))));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCorrectlySplitWithWildCardInMultipleDirectory()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        _filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\**.Tests\**\*.Tests.dll"));
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"**.Tests\**\*.Tests.dll")));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project\tests")))));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCorrectlySplitWithMultipleWildCardInPattern()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        _filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Tests*.Blame*.dll"));
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"Tests*.Blame*.dll")));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project\tests")))));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCorrectlySplitWithMultipleWildCardInMultipleDirectory()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        _filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\*tests\Tests*.Blame*.dll"));
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"*tests\Tests*.Blame*.dll")));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project")))));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldCheckIfFileExistsIfFullPathGiven()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockFileHelper.Setup(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"))).Returns(true);
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+        var matchingFiles = _filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"));
+
+        // Assert
+        _mockFileHelper.Verify(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
+        Assert.IsTrue(matchingFiles.Contains(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
+    }
+
+    [TestMethod]
+    public void FilePatternParserShouldThrowCommandLineExceptionIfFileDoesNotExist()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockFileHelper.Setup(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"))).Returns(false);
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+
+        Assert.ThrowsException<TestSourceException>(() => _filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
+    }
+
+    [TestMethod]
+    // only on windows because we don't translate the path to be valid linux / mac path
+    [OSCondition(OperatingSystems.Windows)]
+    public void FilePatternParserShouldCorrectlySplitPatternAndDirectoryWithForwardSlashes()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+
+        // Test with forward slashes - this should work on all platforms
+        // This specifically tests the fix for issue #14993
+        _filePatternParser.GetMatchingFiles("C:/Users/someUser/Desktop/a/c/*bc.dll");
+
+        // Assert that the pattern is parsed correctly
+        _mockMatcherHelper.Verify(x => x.AddInclude("*bc.dll"));
+        // On Windows, the path may be normalized, so we verify the key components are present
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y =>
+            y.FullName.Contains("someUser") && y.FullName.Contains("Desktop") &&
+            y.FullName.Contains("a") && y.FullName.EndsWith("c"))));
+    }
+
+    [TestMethod]
+    // only on windows because we don't translate the path to be valid linux / mac path
+    [OSCondition(OperatingSystems.Windows)]
+    public void FilePatternParserShouldCorrectlySplitWithArbitraryDirectoryDepthWithForwardSlashes()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+
+        // Test with forward slashes and recursive patterns
+        _filePatternParser.GetMatchingFiles("C:/Users/someUser/**/c/*bc.txt");
+
+        // Assert
+        _mockMatcherHelper.Verify(x => x.AddInclude("**/c/*bc.txt"));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y =>
+            y.FullName.Contains("someUser"))));
+    }
+
+    [TestMethod]
+    // only on windows because we don't translate the path to be valid linux / mac path
+    [OSCondition(OperatingSystems.Windows)]
+    public void FilePatternParserShouldHandleForwardSlashesWithoutThrowingException()
+    {
+        var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
+        _mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
+
+        // This is the specific case from the original bug report that was throwing ArgumentOutOfRangeException
+        // Before the fix: System.ArgumentOutOfRangeException: length ('-1') must be a non-negative value
+        _filePatternParser.GetMatchingFiles("C:/path/to/my/tests/*_Tests.dll");
+
+        // Assert that we successfully parse without throwing and get the expected pattern
+        _mockMatcherHelper.Verify(x => x.AddInclude("*_Tests.dll"));
+        _mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y =>
+            y.FullName.Contains("path") && y.FullName.Contains("tests"))));
+    }
+
+    private static string TranslatePath(string path)
     {
-        private FilePatternParser filePatternParser;
-        private Mock<Matcher> mockMatcherHelper;
-        private Mock<IFileHelper> mockFileHelper;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            this.mockMatcherHelper = new Mock<Matcher>();
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.filePatternParser = new FilePatternParser(this.mockMatcherHelper.Object, this.mockFileHelper.Object);
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCorrectlySplitPatternAndDirectory()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            this.filePatternParser.GetMatchingFiles(TranslatePath(@"C:\Users\vanidhi\Desktop\a\c\*bc.dll"));
-
-            // Assert
-            this.mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"*bc.dll")));
-            this.mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"C:\Users\vanidhi\Desktop\a\c")))));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCorrectlySplitWithArbitraryDirectoryDepth()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            this.filePatternParser.GetMatchingFiles(TranslatePath(@"C:\Users\vanidhi\**\c\*bc.txt"));
-
-            // Assert
-            this.mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"**\c\*bc.txt")));
-            this.mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"C:\Users\vanidhi")))));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCorrectlySplitWithWildCardInMultipleDirectory()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            this.filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\**.Tests\**\*.Tests.dll"));
-
-            // Assert
-            this.mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"**.Tests\**\*.Tests.dll")));
-            this.mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project\tests")))));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCorrectlySplitWithMultpleWildCardInPattern()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            this.filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Tests*.Blame*.dll"));
-
-            // Assert
-            this.mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"Tests*.Blame*.dll")));
-            this.mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project\tests")))));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCorrectlySplitWithMultpleWildCardInMultipleDirectory()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            this.filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\*tests\Tests*.Blame*.dll"));
-
-            // Assert
-            this.mockMatcherHelper.Verify(x => x.AddInclude(TranslatePath(@"*tests\Tests*.Blame*.dll")));
-            this.mockMatcherHelper.Verify(x => x.Execute(It.Is<DirectoryInfoWrapper>(y => y.FullName.Equals(TranslatePath(@"E:\path\to\project")))));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldCheckIfFileExistsIfFullPathGiven()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockFileHelper.Setup(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"))).Returns(true);
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-            var matchingFiles = this.filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"));
-
-            // Assert
-            this.mockFileHelper.Verify(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
-            Assert.IsTrue(matchingFiles.Contains(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
-        }
-
-        [TestMethod]
-        public void FilePatternParserShouldThrowCommandLineExceptionIfFileDoesNotExist()
-        {
-            var patternMatchingResult = new PatternMatchingResult(new List<FilePatternMatch>());
-            this.mockFileHelper.Setup(x => x.Exists(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll"))).Returns(false);
-            this.mockMatcherHelper.Setup(x => x.Execute(It.IsAny<DirectoryInfoWrapper>())).Returns(patternMatchingResult);
-
-            Assert.ThrowsException<TestSourceException>(() => this.filePatternParser.GetMatchingFiles(TranslatePath(@"E:\path\to\project\tests\Blame.Tests\\abc.Tests.dll")));
-        }
-
-        private string TranslatePath(string path)
-        {
-            // RuntimeInformation has conflict when used
-            if (Environment.OSVersion.Platform.ToString().StartsWith("Win"))
-                return path;
-            
-            return Regex.Replace(path.Replace("\\", "/"), @"(\w)\:/", @"/mnt/$1/");
-        }
+        // RuntimeInformation has conflict when used
+        return Environment.OSVersion.Platform.ToString().StartsWith("Win")
+            ? path
+            : Regex.Replace(path.Replace("\\", "/"), @"(\w)\:/", @"/mnt/$1/");
     }
 }
diff --git a/test/vstest.console.UnitTests/Internal/ProgressIndicatorTests.cs b/test/vstest.console.UnitTests/Internal/ProgressIndicatorTests.cs
index 9097d0ee5c..e4dc72df7e 100644
--- a/test/vstest.console.UnitTests/Internal/ProgressIndicatorTests.cs
+++ b/test/vstest.console.UnitTests/Internal/ProgressIndicatorTests.cs
@@ -1,97 +1,96 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Internal
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Internal;
+
+[TestClass]
+public class ProgressIndicatorTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
+    private readonly ProgressIndicator _indicator;
+    private readonly Mock<IOutput> _consoleOutput;
+    private readonly Mock<IConsoleHelper> _consoleHelper;
+
+    public ProgressIndicatorTests()
+    {
+        _consoleOutput = new Mock<IOutput>();
+        _consoleHelper = new Mock<IConsoleHelper>();
+        _consoleHelper.Setup(c => c.WindowWidth).Returns(100);
+        _consoleHelper.Setup(c => c.CursorTop).Returns(20);
+        _indicator = new ProgressIndicator(_consoleOutput.Object, _consoleHelper.Object);
+    }
+
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        _indicator.Stop();
+    }
 
-    [TestClass]
-    public class ProgressIndicatorTests
+    [TestMethod]
+    public void StartShouldStartPrintingProgressMessage()
     {
-        ProgressIndicator indicator;
-        Mock<IOutput> consoleOutput;
-        Mock<IConsoleHelper> consoleHelper;
-
-        [TestInitialize]
-        public void TestInit()
-        {
-            consoleOutput = new Mock<IOutput>();
-            consoleHelper = new Mock<IConsoleHelper>();
-            consoleHelper.Setup(c => c.WindowWidth).Returns(100);
-            consoleHelper.Setup(c => c.CursorTop).Returns(20);
-            indicator = new ProgressIndicator(consoleOutput.Object, consoleHelper.Object);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            indicator.Stop();
-        }
-
-        [TestMethod]
-        public void StartShouldStartPrintingProgressMessage()
-        {
-            indicator.Start();
-            consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
-            Assert.IsTrue(indicator.IsRunning);
-        }
-
-        [TestMethod]
-        public void StartShouldShowProgressMessage()
-        {
-            indicator.Start();
-
-            consoleHelper.Setup(c => c.CursorLeft).Returns(30);
-            System.Threading.Thread.Sleep(1500);
-
-            Assert.IsTrue(indicator.IsRunning);
-            consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
-            consoleOutput.Verify(m => m.Write(".", OutputLevel.Information), Times.Once);
-        }
-
-        [TestMethod]
-        public void PauseShouldClearTheStdOutMessage()
-        {
-            indicator.Start();
-            indicator.Pause();
-
-            Assert.IsFalse(indicator.IsRunning);
-            string clearMessage = new string(' ', consoleHelper.Object.WindowWidth);
-            consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
-            consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Once);
-
-            consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(2));
-        }
-
-        [TestMethod]
-        public void PauseStartAndStopShouldClearPrintProgressAndThenClearTheStdOutMessage()
-        {
-            indicator.Start();
-            indicator.Pause();
-            indicator.Start();
-            indicator.Stop();
-
-            Assert.IsFalse(indicator.IsRunning);
-            string clearMessage = new string(' ', consoleHelper.Object.WindowWidth);
-            consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Exactly(2));
-            consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Exactly(2));
-            consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(4));
-        }
-
-        [TestMethod]
-        public void StopShouldClearTheStdOutMessage()
-        {
-            indicator.Start();
-            indicator.Stop();
-
-            Assert.IsFalse(indicator.IsRunning);
-            string clearMessage = new string(' ', consoleHelper.Object.WindowWidth);
-            consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
-            consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Once);
-            consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(2));
-        }
+        _indicator.Start();
+        _consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
+        Assert.IsTrue(_indicator.IsRunning);
+    }
+
+    [TestMethod]
+    public void StartShouldShowProgressMessage()
+    {
+        _indicator.Start();
+
+        _consoleHelper.Setup(c => c.CursorLeft).Returns(30);
+        System.Threading.Thread.Sleep(1500);
+
+        Assert.IsTrue(_indicator.IsRunning);
+        _consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
+        _consoleOutput.Verify(m => m.Write(".", OutputLevel.Information), Times.Once);
+    }
+
+    [TestMethod]
+    public void PauseShouldClearTheStdOutMessage()
+    {
+        _indicator.Start();
+        _indicator.Pause();
+
+        Assert.IsFalse(_indicator.IsRunning);
+        string clearMessage = new(' ', _consoleHelper.Object.WindowWidth);
+        _consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
+        _consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Once);
+
+        _consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(2));
+    }
+
+    [TestMethod]
+    public void PauseStartAndStopShouldClearPrintProgressAndThenClearTheStdOutMessage()
+    {
+        _indicator.Start();
+        _indicator.Pause();
+        _indicator.Start();
+        _indicator.Stop();
+
+        Assert.IsFalse(_indicator.IsRunning);
+        string clearMessage = new(' ', _consoleHelper.Object.WindowWidth);
+        _consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Exactly(2));
+        _consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Exactly(2));
+        _consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(4));
+    }
+
+    [TestMethod]
+    public void StopShouldClearTheStdOutMessage()
+    {
+        _indicator.Start();
+        _indicator.Stop();
+
+        Assert.IsFalse(_indicator.IsRunning);
+        string clearMessage = new(' ', _consoleHelper.Object.WindowWidth);
+        _consoleOutput.Verify(m => m.Write("Test run in progress.", OutputLevel.Information), Times.Once);
+        _consoleOutput.Verify(m => m.Write(clearMessage, OutputLevel.Information), Times.Once);
+        _consoleHelper.Verify(ch => ch.SetCursorPosition(0, 20), Times.Exactly(2));
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/MainTests.cs b/test/vstest.console.UnitTests/MainTests.cs
new file mode 100644
index 0000000000..50a5b9baf6
--- /dev/null
+++ b/test/vstest.console.UnitTests/MainTests.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+
+[TestClass]
+public class MainTests
+{
+    [TestMethod]
+    public void RunWhenCliUiLanguageIsSetChangesCultureAndFlowsOverride()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE")).Returns(culture.Name);
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        TestPlatform.CommandLine.Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture)));
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", culture.LCID.ToString(CultureInfo.InvariantCulture)), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenVsLangIsSetChangesCultureAndFlowsOverride()
+    {
+        // Arrange
+        var culture = new CultureInfo("fr-fr");
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable("VSLANG")).Returns(culture.LCID.ToString(CultureInfo.InvariantCulture));
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        TestPlatform.CommandLine.Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = lang.Equals(culture)));
+
+        // Assert
+        Assert.IsTrue(threadCultureWasSet, "DefaultThreadCurrentUICulture was not set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Exactly(2));
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Exactly(2));
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", culture.Name), Times.Once);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", culture.Name), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunWhenNoCultureEnvVarSetDoesNotChangeCultureNorFlowsOverride()
+    {
+        // Arrange
+        var envVarMock = new Mock<IEnvironmentVariableHelper>();
+        envVarMock.Setup(x => x.GetEnvironmentVariable(It.IsAny<string>())).Returns(default(string));
+
+        bool threadCultureWasSet = false;
+
+        // Act - We have an exception because we are not passing the right args but that's ok for our test
+        TestPlatform.CommandLine.Program.Run(null, new(envVarMock.Object, lang => threadCultureWasSet = true));
+
+        // Assert
+        Assert.IsFalse(threadCultureWasSet, "DefaultThreadCurrentUICulture was set");
+        envVarMock.Verify(x => x.GetEnvironmentVariable("VSLANG"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("VSLANG", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"), Times.Once);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", It.IsAny<string>()), Times.Never);
+        envVarMock.Verify(x => x.GetEnvironmentVariable("PreferredUILang"), Times.Never);
+        envVarMock.Verify(x => x.SetEnvironmentVariable("PreferredUILang", It.IsAny<string>()), Times.Never);
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/AeDebuggerArgumentProcessorTest.cs b/test/vstest.console.UnitTests/Processors/AeDebuggerArgumentProcessorTest.cs
new file mode 100644
index 0000000000..bca0bd8f0f
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/AeDebuggerArgumentProcessorTest.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class AeDebuggerArgumentProcessorTest
+{
+    private readonly Mock<IEnvironment> _environment = new();
+    private readonly Mock<IFileHelper> _fileHelper = new();
+    private readonly Mock<IProcessHelper> _processHelper = new();
+    private readonly Mock<IOutput> _output = new();
+    private readonly Mock<IEnvironmentVariableHelper> _environmentVariableHelper = new();
+    private readonly AeDebuggerArgumentExecutor _executor;
+
+    public AeDebuggerArgumentProcessorTest()
+    {
+        _executor = new AeDebuggerArgumentExecutor(_environment.Object, _fileHelper.Object, _processHelper.Object, _output.Object, _environmentVariableHelper.Object);
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentProcessorCommandName()
+    {
+        Assert.AreEqual("/AeDebugger", AeDebuggerArgumentProcessor.CommandName);
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentProcessorCapabilities()
+    {
+        AeDebuggerArgumentProcessorCapabilities aeDebuggerArgumentProcessor = new();
+        Assert.IsNull(aeDebuggerArgumentProcessor.HelpContentResourceName);
+        Assert.IsTrue(aeDebuggerArgumentProcessor.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, aeDebuggerArgumentProcessor.Priority);
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentProcessorReturnsCorrectTypes()
+    {
+        AeDebuggerArgumentProcessor aeDebuggerArgumentProcessor = new();
+        Assert.IsInstanceOfType(aeDebuggerArgumentProcessor.Executor!.Value, typeof(AeDebuggerArgumentExecutor));
+        Assert.IsInstanceOfType(aeDebuggerArgumentProcessor.Metadata!.Value, typeof(AeDebuggerArgumentProcessorCapabilities));
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentExecutor_InvalidCtor()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => new AeDebuggerArgumentExecutor(_environment.Object, _fileHelper.Object, _processHelper.Object, _output.Object, null!));
+        Assert.ThrowsException<ArgumentNullException>(() => new AeDebuggerArgumentExecutor(_environment.Object, _fileHelper.Object, _processHelper.Object, null!, _environmentVariableHelper.Object));
+        Assert.ThrowsException<ArgumentNullException>(() => new AeDebuggerArgumentExecutor(_environment.Object, _fileHelper.Object, null!, _output.Object, _environmentVariableHelper.Object));
+        Assert.ThrowsException<ArgumentNullException>(() => new AeDebuggerArgumentExecutor(_environment.Object, null!, _processHelper.Object, _output.Object, _environmentVariableHelper.Object));
+        Assert.ThrowsException<ArgumentNullException>(() => new AeDebuggerArgumentExecutor(null!, _fileHelper.Object, _processHelper.Object, _output.Object, _environmentVariableHelper.Object));
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentExecutor_NullArgument()
+    {
+        _executor.Initialize(null);
+        Assert.AreEqual(ArgumentProcessorResult.Fail, _executor.Execute());
+        _output.Verify(x => x.WriteLine(It.IsAny<string>(), OutputLevel.Error), Times.Once());
+    }
+
+    [TestMethod]
+    [DataRow("Instal;ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath;DumpDirectoryPath=c:\\DumpDirectoryPath")]
+    [DataRow("Uninstal;ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath;DumpDirectoryPath=c:\\DumpDirectoryPath")]
+    public void AeDebuggerArgumentExecutor_WrongInstallUnistallCommand(string wrongCommand)
+    {
+        _executor.Initialize(wrongCommand);
+        Assert.ThrowsException<CommandLineException>(() => _executor.Execute());
+    }
+
+    [TestMethod]
+    public void AeDebuggerArgumentExecutor_NonWindowsOS()
+    {
+        _environment.Setup(x => x.OperatingSystem).Returns(PlatformOperatingSystem.Unix);
+        _executor.Initialize("Install;ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath;DumpDirectoryPath=c:\\DumpDirectoryPath");
+        Assert.AreEqual(ArgumentProcessorResult.Fail, _executor.Execute());
+    }
+
+    [TestMethod]
+    [DataRow("Install;{0};DumpDirectoryPath=c:\\DumpDirectoryPath", null)]
+    [DataRow("Install;{0};DumpDirectoryPath=c:\\DumpDirectoryPath", "ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPat")]
+    [DataRow("Install;{0};ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath", null)]
+    [DataRow("Install;{0};ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath", "DumpDirectoryPath=c:\\DumpDirectoryPat")]
+
+    public void AeDebuggerArgumentExecutor_WrongDirectoryPaths(string command, string? directoryPath)
+    {
+        _fileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>()))
+            .Returns((string path) => directoryPath is null || !directoryPath.EndsWith(path));
+        _fileHelper.Setup(x => x.Exists(It.IsAny<string>()))
+            .Returns((string path) => path.EndsWith("procdump.exe") && path != "procdump.exe");
+        _executor.Initialize(string.Format(CultureInfo.InvariantCulture, command, directoryPath));
+        Assert.AreEqual(ArgumentProcessorResult.Fail, _executor.Execute());
+    }
+
+    [TestMethod]
+    [DataRow("Install;DumpDirectoryPath=c:\\DumpDirectoryPath", "PROCDUMP_PATH", "c:\\procDump")]
+    [DataRow("Install;DumpDirectoryPath=c:\\DumpDirectoryPath", "PATH", "c:\\procDump;")]
+
+    public void AeDebuggerArgumentExecutor_ShouldUseEnvironmentVariables(string command, string environmentVariablesKey, string environmentVariableValue)
+    {
+        _environmentVariableHelper.Setup(x => x.GetEnvironmentVariable(environmentVariablesKey)).Returns(environmentVariableValue);
+        _fileHelper.Setup(x => x.DirectoryExists("c:\\procDump")).Returns(true);
+        _fileHelper.Setup(x => x.DirectoryExists("c:\\DumpDirectoryPath")).Returns(true);
+        _fileHelper.Setup(x => x.Exists(It.IsAny<string>())).Returns((string fileName) => fileName == "c:\\procDump\\procdump.exe");
+        _executor.Initialize(command);
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
+
+    [TestMethod]
+    [DataRow("Install;ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath;DumpDirectoryPath=c:\\DumpDirectoryPath", true)]
+    [DataRow("Uninstall;ProcDumpToolDirectoryPath=c:\\ProcDumpToolDirectoryPath;DumpDirectoryPath=c:\\DumpDirectoryPath", false)]
+    public void AeDebuggerArgumentExecutor_ProcdumpArgument(string command, bool install)
+    {
+        _fileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        _fileHelper.Setup(x => x.Exists(It.IsAny<string>())).Returns(true);
+        _processHelper.Setup(x => x.LaunchProcess(
+            It.IsAny<string>(),
+            It.IsAny<string>(),
+            It.IsAny<string>(),
+            null,
+            It.IsAny<Action<object?, string?>>(),
+            It.IsAny<Action<object?>>(),
+            It.IsAny<Action<object?, string?>>()))
+         .Returns((string processPath, string? arguments, string? workingDirectory, IDictionary<string, string?>? envVariables, Action<object?, string?>? errorCallback, Action<object?>? exitCallBack, Action<object?, string?>? outputCallBack) =>
+         {
+             Assert.IsTrue(install ? arguments == "-ma -i" : arguments == "-u");
+             return new object();
+         });
+        _executor.Initialize(command);
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/ArtifactProcessingCollectModeProcessorTest.cs b/test/vstest.console.UnitTests/Processors/ArtifactProcessingCollectModeProcessorTest.cs
new file mode 100644
index 0000000000..0c730b207d
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/ArtifactProcessingCollectModeProcessorTest.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ArtifactProcessingCollectModeProcessorTest
+{
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldFailIfNullCommandOption() =>
+        Assert.ThrowsException<ArgumentNullException>(() => new ArtifactProcessingCollectModeProcessorExecutor(null!));
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldNotFailIfNullArg()
+    {
+        ArtifactProcessingCollectModeProcessorExecutor artifactProcessingCollectModeProcessorExecutor = new(new CommandLineOptions());
+        artifactProcessingCollectModeProcessorExecutor.Initialize(null);
+    }
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldSetCommandOption()
+    {
+        var commandOptions = new CommandLineOptions();
+        ArtifactProcessingCollectModeProcessorExecutor artifactProcessingCollectModeProcessorExecutor = new(commandOptions);
+        artifactProcessingCollectModeProcessorExecutor.Initialize(null);
+        Assert.AreEqual(ArtifactProcessingMode.Collect, commandOptions.ArtifactProcessingMode);
+    }
+
+    [TestMethod]
+    public void ProcessorCapabilities()
+    {
+        ArtifactProcessingCollectModeProcessorCapabilities processorCapabilities = new();
+        Assert.IsNull(processorCapabilities.HelpContentResourceName);
+        Assert.AreEqual(ArgumentProcessorPriority.CliRunSettings, processorCapabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.None, processorCapabilities.HelpPriority);
+        Assert.AreEqual("/ArtifactsProcessingMode-Collect", processorCapabilities.CommandName);
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/ArtifactProcessingPostProcessModeProcessorTest.cs b/test/vstest.console.UnitTests/Processors/ArtifactProcessingPostProcessModeProcessorTest.cs
new file mode 100644
index 0000000000..78fea1b91f
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/ArtifactProcessingPostProcessModeProcessorTest.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ArtifactProcessingPostProcessModeProcessorTest
+{
+    private readonly Mock<IArtifactProcessingManager> _artifactProcessingManagerMock = new();
+    private readonly Mock<IFeatureFlag> _featureFlagMock = new();
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldFailIfNullCtor()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => new ArtifactProcessingPostProcessModeProcessorExecutor(null!, _artifactProcessingManagerMock.Object));
+        Assert.ThrowsException<ArgumentNullException>(() => new ArtifactProcessingPostProcessModeProcessorExecutor(new CommandLineOptions(), null!));
+    }
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldNotFailIfNullArg()
+    {
+        ArtifactProcessingPostProcessModeProcessorExecutor artifactProcessingPostProcessModeProcessorExecutor = new(new CommandLineOptions(), _artifactProcessingManagerMock.Object);
+        artifactProcessingPostProcessModeProcessorExecutor.Initialize(null);
+    }
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldSetCommandOption()
+    {
+        var commandOptions = new CommandLineOptions();
+        ArtifactProcessingPostProcessModeProcessorExecutor artifactProcessingPostProcessModeProcessorExecutor = new(commandOptions, _artifactProcessingManagerMock.Object);
+        artifactProcessingPostProcessModeProcessorExecutor.Initialize(null);
+        Assert.AreEqual(ArtifactProcessingMode.PostProcess, commandOptions.ArtifactProcessingMode);
+    }
+
+    [TestMethod]
+    public void ProcessorCapabilities()
+    {
+        ArtifactProcessingPostProcessModeProcessorCapabilities processorCapabilities = new();
+        Assert.IsNull(processorCapabilities.HelpContentResourceName);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, processorCapabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.None, processorCapabilities.HelpPriority);
+        Assert.AreEqual("/ArtifactsProcessingMode-PostProcess", processorCapabilities.CommandName);
+    }
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ExceptionShouldNotBubbleUp()
+    {
+        _artifactProcessingManagerMock.Setup(x => x.PostProcessArtifactsAsync()).Callback(() => throw new Exception());
+        ArtifactProcessingPostProcessModeProcessorExecutor artifactProcessingPostProcessModeProcessorExecutor = new(new CommandLineOptions(), _artifactProcessingManagerMock.Object);
+        artifactProcessingPostProcessModeProcessorExecutor.Initialize(null);
+        Assert.AreEqual(ArgumentProcessorResult.Fail, artifactProcessingPostProcessModeProcessorExecutor.Execute());
+    }
+
+    [TestMethod]
+    public void ArtifactProcessingPostProcessMode_ContainsPostProcessCommand()
+    {
+        _featureFlagMock.Setup(x => x.IsSet(It.IsAny<string>())).Returns(false);
+        Assert.IsTrue(ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(["--artifactsProcessingMode-postprocess"], _featureFlagMock.Object));
+        Assert.IsTrue(ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(["--ARTIfactsProcessingMode-postprocess"], _featureFlagMock.Object));
+        Assert.IsFalse(ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(["-ARTIfactsProcessingMode-postprocess"], _featureFlagMock.Object));
+        Assert.IsFalse(ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(["--ARTIfactsProcessingMode-postproces"], _featureFlagMock.Object));
+        Assert.IsFalse(ArtifactProcessingPostProcessModeProcessor.ContainsPostProcessCommand(null, _featureFlagMock.Object));
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/CLIRunSettingsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/CLIRunSettingsArgumentProcessorTests.cs
index d12f1d3b86..3a40e52bfb 100644
--- a/test/vstest.console.UnitTests/Processors/CLIRunSettingsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/CLIRunSettingsArgumentProcessorTests.cs
@@ -1,479 +1,484 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+public class CliRunSettingsArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    [TestClass]
-    public class CLIRunSettingsArgumentProcessorTests
-    {
-        private TestableRunSettingsProvider settingsProvider;
-        private CLIRunSettingsArgumentExecutor executor;
-        private CommandLineOptions commandLineOptions;
-        private readonly string DefaultRunSettings = string.Join(Environment.NewLine, 
+    private readonly TestableRunSettingsProvider _settingsProvider;
+    private readonly CliRunSettingsArgumentExecutor _executor;
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly string _defaultRunSettings = string.Join(Environment.NewLine,
         "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"</RunSettings>");
+        "<RunSettings>",
+        "  <DataCollectionRunSettings>",
+        "    <DataCollectors />",
+        "  </DataCollectionRunSettings>",
+        "</RunSettings>");
 
-        private readonly string RunSettingsWithDeploymentDisabled = string.Join(Environment.NewLine,
-            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+    private readonly string _runSettingsWithDeploymentDisabled = string.Join(Environment.NewLine,
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+        "<RunSettings>",
+        "  <DataCollectionRunSettings>",
+        "    <DataCollectors />",
+        "  </DataCollectionRunSettings>",
+        "  <MSTest>",
+        "    <DeploymentEnabled>False</DeploymentEnabled>",
+        "  </MSTest>",
+        "</RunSettings>");
+
+    private readonly string _runSettingsWithDeploymentEnabled = string.Join(Environment.NewLine,
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+        "<RunSettings>",
+        "  <DataCollectionRunSettings>",
+        "    <DataCollectors />",
+        "  </DataCollectionRunSettings>",
+        "  <MSTest>",
+        "    <DeploymentEnabled>True</DeploymentEnabled>",
+        "  </MSTest>",
+        "</RunSettings>");
+
+    public CliRunSettingsArgumentProcessorTests()
+    {
+        _commandLineOptions = CommandLineOptions.Instance;
+        _settingsProvider = new TestableRunSettingsProvider();
+        _executor = new CliRunSettingsArgumentExecutor(_settingsProvider, _commandLineOptions);
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        CommandLineOptions.Reset();
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnRunSettingsArgumentProcessorCapabilities()
+    {
+        var processor = new CliRunSettingsArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is CliRunSettingsArgumentProcessorCapabilities);
+    }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnRunSettingsArgumentProcessorCapabilities()
+    {
+        var processor = new CliRunSettingsArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is CliRunSettingsArgumentExecutor);
+    }
+
+    #region CLIRunSettingsArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new CliRunSettingsArgumentProcessorCapabilities();
+
+        Assert.AreEqual("--", capabilities.CommandName);
+        var expected = "RunSettings arguments:\r\n      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after \"-- \". Note the space after --. \r\n      Use a space to separate multiple [name]=[value].\r\n      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.CliRunSettingsArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.CliRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region CLIRunSettingsArgumentExecutor tests
+
+    [TestMethod]
+    public void InitializeShouldNotThrowExceptionIfArgumentIsNull()
+    {
+        _executor.Initialize((string[]?)null);
+
+        Assert.IsNull(_settingsProvider.ActiveRunSettings);
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotThrowExceptionIfArgumentIsEmpty()
+    {
+        _executor.Initialize([]);
+
+        Assert.IsNull(_settingsProvider.ActiveRunSettings);
+    }
+
+    [TestMethod]
+    public void InitializeShouldCreateEmptyRunSettingsIfArgumentsHasOnlyWhiteSpace()
+    {
+        _executor.Initialize([" "]);
+
+        Assert.IsNull(_settingsProvider.ActiveRunSettings);
+    }
+
+    [TestMethod]
+    public void InitializeShouldSetValueInRunSettings()
+    {
+        var args = new string[] { "MSTest.DeploymentEnabled=False" };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_runSettingsWithDeploymentDisabled, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldIgnoreKeyIfValueIsNotPassed()
+    {
+        var args = new string[] { "MSTest.DeploymentEnabled=False", "MSTest1" };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_runSettingsWithDeploymentDisabled, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [DataRow("Testameter.Parameter(name=\"asf\",value=\"rgq\")")]
+    [DataRow("TestRunParameter.Parameter(name=\"asf\",value=\"rgq\")")]
+    [TestMethod]
+    public void InitializeShouldThrowErrorIfArgumentIsInValid(string arg)
+    {
+        var args = new string[] { arg };
+        var str = CommandLineResources.MalformedRunSettingsKey;
+
+        CommandLineException ex = Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(args));
+
+        Assert.AreEqual(str, ex.Message);
+    }
+
+    [TestMethod]
+    public void InitializeShouldIgnoreWhiteSpaceInBeginningOrEndOfKey()
+    {
+        var args = new string[] { " MSTest.DeploymentEnabled =False" };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_runSettingsWithDeploymentDisabled, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldIgnoreThrowExceptionIfKeyHasWhiteSpace()
+    {
+        var args = new string[] { "MST est.DeploymentEnabled=False" };
+
+        Action action = () => _executor.Initialize(args);
+
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            action,
+            "One or more runsettings provided contain invalid token");
+    }
+
+    [TestMethod]
+    public void InitializeShouldEncodeXmlIfInvalidXmlCharsArePresent()
+    {
+        var args = new string[] { "MSTest.DeploymentEnabled=F>a><l<se" };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
             "<RunSettings>",
             "  <DataCollectionRunSettings>",
             "    <DataCollectors />",
             "  </DataCollectionRunSettings>",
             "  <MSTest>",
-            "    <DeploymentEnabled>False</DeploymentEnabled>",
+            "    <DeploymentEnabled>F&gt;a&gt;&lt;l&lt;se</DeploymentEnabled>",
             "  </MSTest>",
-            "</RunSettings>");
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        private readonly string RunSettingsWithDeploymentEnabled = string.Join(Environment.NewLine,
-            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+    [TestMethod]
+    public void InitializeShouldIgnoreIfKeyIsNotPassed()
+    {
+        var args = new string[] { "MSTest.DeploymentEnabled=False", "=value" };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_runSettingsWithDeploymentDisabled, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldIgnoreIfEmptyValueIsPassed()
+    {
+
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
+
+        var args = new string[] { "MSTest.DeploymentEnabled=" };
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_defaultRunSettings, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldOverwriteValueIfNodeAlreadyExists()
+    {
+
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
+
+        var args = new string[] { "MSTest.DeploymentEnabled=True" };
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(_runSettingsWithDeploymentEnabled, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+
+    [TestMethod]
+    public void InitializeShouldOverwriteValueIfWhitSpaceIsPassedAndNodeAlreadyExists()
+    {
+
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
+
+        var args = new string[] { "MSTest.DeploymentEnabled= " };
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
             "<RunSettings>",
             "  <DataCollectionRunSettings>",
             "    <DataCollectors />",
             "  </DataCollectionRunSettings>",
             "  <MSTest>",
-            "    <DeploymentEnabled>True</DeploymentEnabled>",
+            "    <DeploymentEnabled>",
+            "    </DeploymentEnabled>",
             "  </MSTest>",
-            "</RunSettings>");
-
-        [TestInitialize]
-        public void Init()
-        {
-            this.commandLineOptions = CommandLineOptions.Instance;
-            this.settingsProvider = new TestableRunSettingsProvider();
-            this.executor = new CLIRunSettingsArgumentExecutor(this.settingsProvider, this.commandLineOptions);
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.commandLineOptions.Reset();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnRunSettingsArgumentProcessorCapabilities()
-        {
-            var processor = new CLIRunSettingsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is CLIRunSettingsArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnRunSettingsArgumentProcessorCapabilities()
-        {
-            var processor = new CLIRunSettingsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is CLIRunSettingsArgumentExecutor);
-        }
-
-        #region CLIRunSettingsArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new CLIRunSettingsArgumentProcessorCapabilities();
-
-            Assert.AreEqual("--", capabilities.CommandName);
-            var expected = "RunSettings arguments:\r\n      Arguments to pass runsettings configurations through commandline. Arguments may be specified as name-value pair of the form [name]=[value] after \"-- \". Note the space after --. \r\n      Use a space to separate multiple [name]=[value].\r\n      More info on RunSettings arguments support: https://aka.ms/vstest-runsettings-arguments";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.CLIRunSettingsArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.CLIRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region CLIRunSettingsArgumentExecutor tests
-
-        [TestMethod]
-        public void InitializeShouldNotThrowExceptionIfArgumentIsNull()
-        {
-            this.executor.Initialize((string[])null);
-
-            Assert.IsNull(this.settingsProvider.ActiveRunSettings);
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotThrowExceptionIfArgumentIsEmpty()
-        {
-            this.executor.Initialize(new string[0]);
-
-            Assert.IsNull(this.settingsProvider.ActiveRunSettings);
-        }
-
-        [TestMethod]
-        public void InitializeShouldCreateEmptyRunSettingsIfArgumentsHasOnlyWhiteSpace()
-        {
-            this.executor.Initialize(new string[] { " " });
-
-            Assert.IsNull(this.settingsProvider.ActiveRunSettings);
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetValueInRunSettings()
-        {
-            var args = new string[] { "MSTest.DeploymentEnabled=False" };
-
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(RunSettingsWithDeploymentDisabled, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldIgnoreKeyIfValueIsNotPassed()
-        {
-            var args = new string[] { "MSTest.DeploymentEnabled=False", "MSTest1" };
-
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(RunSettingsWithDeploymentDisabled, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [DataRow("Testameter.Parameter(name=\"asf\",value=\"rgq\")")]
-        [DataRow("TestRunParameter.Parameter(name=\"asf\",value=\"rgq\")")]
-        [TestMethod]
-        public void InitializeShouldThrowErrorIfArgumentIsInValid(string arg)
-        {
-            var args = new string[] { arg };
-            var str = string.Format(CommandLineResources.MalformedRunSettingsKey);
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-            CommandLineException ex = Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize(args));
+    [TestMethod]
+    public void InitializeShouldUpdateCommandLineOptionsFrameworkIfProvided()
+    {
 
-            Assert.AreEqual(str, ex.Message);
-        }
-
-        [TestMethod]
-        public void InitializeShouldIgnoreWhiteSpaceInBeginningOrEndOfKey()
-        {
-            var args = new string[] { " MSTest.DeploymentEnabled =False" };
-
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(RunSettingsWithDeploymentDisabled, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldIgnoreThrowExceptionIfKeyHasWhiteSpace()
-        {
-            var args = new string[] { "MST est.DeploymentEnabled=False" };
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
 
-            Action action = () => this.executor.Initialize(args);
-
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                action,
-                "One or more runsettings provided contain invalid token");
-        }
+        var args = new string[] { $"RunConfiguration.TargetFrameworkVersion={Constants.DotNetFramework46}" };
+        _executor.Initialize(args);
 
-        [TestMethod]
-        public void InitializeShouldEncodeXMLIfInvalidXMLCharsArePresent()
-        {
-            var args = new string[] { "MSTest.DeploymentEnabled=F>a><l<se" };
+        Assert.IsTrue(_commandLineOptions.FrameworkVersionSpecified);
+        Assert.AreEqual(Constants.DotNetFramework46, _commandLineOptions.TargetFrameworkVersion.Name);
+    }
 
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <MSTest>",
-"    <DeploymentEnabled>F&gt;a&gt;&lt;l&lt;se</DeploymentEnabled>",
-"  </MSTest>",
-"</RunSettings>"), settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldIgnoreIfKeyIsNotPassed()
-        {
-            var args = new string[] { "MSTest.DeploymentEnabled=False", "=value" };
-
-            this.executor.Initialize(args);
+    [TestMethod]
+    public void InitializeShouldUpdateCommandLineOptionsArchitectureIfProvided()
+    {
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(RunSettingsWithDeploymentDisabled, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
 
-        [TestMethod]
-        public void InitializeShouldIgnoreIfEmptyValueIsPassed()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runSettings);
+        var args = new string[] { $"RunConfiguration.TargetPlatform={nameof(Architecture.ARM)}" };
+        _executor.Initialize(args);
 
-            var args = new string[] { "MSTest.DeploymentEnabled=" };
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(DefaultRunSettings, this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldOverwriteValueIfNodeAlreadyExists()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            settingsProvider.SetActiveRunSettings(runSettings);
-
-            var args = new string[] { "MSTest.DeploymentEnabled=True" };
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(RunSettingsWithDeploymentEnabled, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-
-        [TestMethod]
-        public void InitializeShouldOverwriteValueIfWhitSpaceIsPassedAndNodeAlreadyExists()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            settingsProvider.SetActiveRunSettings(runSettings);
-
-            var args = new string[] { "MSTest.DeploymentEnabled= " };
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <MSTest>",
-"    <DeploymentEnabled>",
-"    </DeploymentEnabled>",
-"  </MSTest>",
-"</RunSettings>"), settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldUpdateCommandLineOptionsFrameworkIfProvided()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            settingsProvider.SetActiveRunSettings(runSettings);
-
-            var args = new string[] { $"RunConfiguration.TargetFrameworkVersion={Constants.DotNetFramework46}" };
-            this.executor.Initialize(args);
-
-            Assert.IsTrue(this.commandLineOptions.FrameworkVersionSpecified);
-            Assert.AreEqual(Constants.DotNetFramework46, this.commandLineOptions.TargetFrameworkVersion.Name);
-        }
-
-        [TestMethod]
-        public void InitializeShouldUpdateCommandLineOptionsArchitectureIfProvided()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            settingsProvider.SetActiveRunSettings(runSettings);
-
-            var args = new string[] { $"RunConfiguration.TargetPlatform={nameof(Architecture.ARM)}" };
-            this.executor.Initialize(args);
-
-            Assert.IsTrue(this.commandLineOptions.ArchitectureSpecified);
-            Assert.AreEqual(Architecture.ARM, this.commandLineOptions.TargetArchitecture);
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotUpdateCommandLineOptionsArchitectureAndFxIfNotProvided()
-        {
-
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(DefaultRunSettings);
-            settingsProvider.SetActiveRunSettings(runSettings);
-
-            var args = new string[] { };
-            this.executor.Initialize(args);
-
-            Assert.IsFalse(this.commandLineOptions.ArchitectureSpecified);
-            Assert.IsFalse(this.commandLineOptions.FrameworkVersionSpecified);
-        }
-
-        [DynamicData(nameof(TestRunParameterArgValidTestCases), DynamicDataSourceType.Method)]
-        [DataTestMethod]
-        public void InitializeShouldValidateTestRunParameter(string arg, string runSettingsWithTestRunParameters)
-        {
-            var args = new string[] { arg };
-
-            this.executor.Initialize(args);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(runSettingsWithTestRunParameters, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [DynamicData(nameof(TestRunParameterArgInvalidTestCases), DynamicDataSourceType.Method)]
-        [DataTestMethod]
-        public void InitializeShouldThrowErrorIfTestRunParameterNodeIsInValid(string arg)
-        {
-            var args = new string[] { arg };
-            var str = string.Format(CommandLineResources.InvalidTestRunParameterArgument, arg);
-
-            CommandLineException ex = Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize(args));
-
-            Assert.AreEqual(str, ex.Message);
-        }
-
-        public static IEnumerable<object[]> TestRunParameterArgInvalidTestCases()
-        {
-            return invalidTestCases;
-        }
-
-        private static readonly List<object[]> invalidTestCases = new List<object[]>
-        {
-            new object[] { "TestRunParameters.Parameter(name=asf,value=rgq)" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=\"rgq\" )"},
-            new object[] { "TestRunParameters.Parameter( name=\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParametersParameter(name=\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Paramete(name=\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parametername=\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(ame=\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name\"asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\" value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",alue=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=\"rgq\"" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=\"rgq\")wfds" },
-            new object[] { "TestRunParameters.Parameter(name=\"\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=\"\")" },
-            new object[] { "TestRunParameters.Parameter(name=asf\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf,value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf\",value=\"rgq)" },
-            new object[] { "TestRunParameters.Parameter(name=\"asf@#!\",value=\"rgq\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"\",value=\"fgf\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"gag\",value=\"\")" },
-            new object[] { "TestRunParameters.Parameter(name=\"gag\")" }
-        };
+        Assert.IsTrue(_commandLineOptions.ArchitectureSpecified);
+        Assert.AreEqual(Architecture.ARM, _commandLineOptions.TargetArchitecture);
+    }
 
-        public static IEnumerable<object[]> TestRunParameterArgValidTestCases()
-        {
-            return validTestCases;
-        }
-
-        private static readonly List<object[]> validTestCases = new List<object[]>
-        {
-            new object[] { "TestRunParameters.Parameter(name=\"weburl\",value=\"&><\")" ,
-             string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <TestRunParameters>",
-"    <Parameter name=\"weburl\" value=\"&amp;&gt;&lt;\" />",
-"  </TestRunParameters>",
-"</RunSettings>")
-            },
-            new object[] { "TestRunParameters.Parameter(name=\"weburl\",value=\"http://localhost//abc\")" ,
-             string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <TestRunParameters>",
-"    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
-"  </TestRunParameters>",
-"</RunSettings>")
-            },
-            new object[] { "TestRunParameters.Parameter(name= \"a_sf123_12\",value= \"2324346a!@#$%^*()_+-=':;.,/?{}[]|\")" ,
-             string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <TestRunParameters>",
-"    <Parameter name=\"a_sf123_12\" value=\"2324346a!@#$%^*()_+-=':;.,/?{}[]|\" />",
-"  </TestRunParameters>",
-"</RunSettings>")
-            },
-            new object[] { "TestRunParameters.Parameter(name = \"weburl\" , value = \"http://localhost//abc\")" ,
-             string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-"<RunSettings>",
-"  <DataCollectionRunSettings>",
-"    <DataCollectors />",
-"  </DataCollectionRunSettings>",
-"  <TestRunParameters>",
-"    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
-"  </TestRunParameters>",
-"</RunSettings>")
-            },
-        };
-        #endregion
-
-        [TestMethod]
-        public void InitializeShouldMergeTestRunParametersWithSpaces()
-        {
-            // in powershell call: ConsoleApp1.exe --% --TestRunParameters.Parameter(name =\"myParam\", value=\"myValue\")
-            // args:
-            //--
-            //TestRunParameters.Parameter(name = "myParam",
-            //value = "myValue")
-
-            // in cmd: ConsoleApp1.exe -- TestRunParameters.Parameter(name=\"myParam\", value=\"myValue\")
-            // args:
-            //--
-            //TestRunParameters.Parameter(name = "myParam",
-            //value = "myValue")
-
-            // in ubuntu wsl without escaping the space: ConsoleApp1.exe-- TestRunParameters.Parameter\(name =\"myParam\", value=\"myValue\"\)
-            // args:
-            //--
-            //TestRunParameters.Parameter(name = "myParam",
-            //value = "myValue")
-
-            // in ubuntu wsl with escaping the space: ConsoleApp1.exe-- TestRunParameters.Parameter\(name =\"myParam\",\ value=\"myValue\"\)
-            // args:
-            //--
-            //TestRunParameters.Parameter(name = "myParam", value = "myValue")
-
-            var args = new string[] {
-                "--",
-                "TestRunParameters.Parameter(name=\"myParam\",",
-                "value=\"myValue\")",
-                "TestRunParameters.Parameter(name=\"myParam2\",",
-                "value=\"myValue 2\")",
-            };
-
-            var runsettings = string.Join(Environment.NewLine, new[]{
+    [TestMethod]
+    public void InitializeShouldNotUpdateCommandLineOptionsArchitectureAndFxIfNotProvided()
+    {
+
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runSettings);
+
+        var args = Array.Empty<string>();
+        _executor.Initialize(args);
+
+        Assert.IsFalse(_commandLineOptions.ArchitectureSpecified);
+        Assert.IsFalse(_commandLineOptions.FrameworkVersionSpecified);
+    }
+
+    [DynamicData(nameof(TestRunParameterArgValidTestCases), DynamicDataSourceType.Method)]
+    [DataTestMethod]
+    public void InitializeShouldValidateTestRunParameter(string arg, string runSettingsWithTestRunParameters)
+    {
+        var args = new string[] { arg };
+
+        _executor.Initialize(args);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(runSettingsWithTestRunParameters, _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
+
+    [DynamicData(nameof(TestRunParameterArgInvalidTestCases), DynamicDataSourceType.Method)]
+    [DataTestMethod]
+    public void InitializeShouldThrowErrorIfTestRunParameterNodeIsInValid(string arg)
+    {
+        var args = new string[] { arg };
+        var str = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidTestRunParameterArgument, arg);
+
+        CommandLineException ex = Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(args));
+
+        Assert.AreEqual(str, ex.Message);
+    }
+
+    public static IEnumerable<object[]> TestRunParameterArgInvalidTestCases()
+    {
+        return InvalidTestCases;
+    }
+
+    private static readonly List<object[]> InvalidTestCases =
+    [
+        ["TestRunParameters.Parameter(name=asf,value=rgq)"],
+        ["TestRunParameters.Parameter(name=\"asf\",value=\"rgq\" )"],
+        ["TestRunParameters.Parameter( name=\"asf\",value=\"rgq\")"],
+        ["TestRunParametersParameter(name=\"asf\",value=\"rgq\")"],
+        ["TestRunParameters.Paramete(name=\"asf\",value=\"rgq\")"],
+        ["TestRunParameters.Parametername=\"asf\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(ame=\"asf\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name\"asf\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\" value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",alue=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",value\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",value=\"rgq\""],
+        ["TestRunParameters.Parameter(name=\"asf\",value=\"rgq\")wfds"],
+        ["TestRunParameters.Parameter(name=\"\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",value=\"\")"],
+        ["TestRunParameters.Parameter(name=asf\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf,value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",value=rgq\")"],
+        ["TestRunParameters.Parameter(name=\"asf\",value=\"rgq)"],
+        ["TestRunParameters.Parameter(name=\"asf@#!\",value=\"rgq\")"],
+        ["TestRunParameters.Parameter(name=\"\",value=\"fgf\")"],
+        ["TestRunParameters.Parameter(name=\"gag\",value=\"\")"],
+        ["TestRunParameters.Parameter(name=\"gag\")"]
+    ];
+
+    public static IEnumerable<object[]> TestRunParameterArgValidTestCases()
+    {
+        return ValidTestCases;
+    }
+
+    private static readonly List<object[]> ValidTestCases =
+    [
+        [
+            "TestRunParameters.Parameter(name=\"weburl\",value=\"&><\")", string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
                 "    <DataCollectors />",
                 "  </DataCollectionRunSettings>",
                 "  <TestRunParameters>",
-                "    <Parameter name=\"myParam\" value=\"myValue\" />",
-                "    <Parameter name=\"myParam2\" value=\"myValue 2\" />",
+                "    <Parameter name=\"weburl\" value=\"&amp;&gt;&lt;\" />",
                 "  </TestRunParameters>",
-                "</RunSettings>"});
+                "</RunSettings>")
+        ],
+        [
+            "TestRunParameters.Parameter(name=\"weburl\",value=\"http://localhost//abc\")", string.Join(
+                Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<RunSettings>",
+                "  <DataCollectionRunSettings>",
+                "    <DataCollectors />",
+                "  </DataCollectionRunSettings>",
+                "  <TestRunParameters>",
+                "    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
+                "  </TestRunParameters>",
+                "</RunSettings>")
+        ],
+        [
+            "TestRunParameters.Parameter(name= \"a_sf123_12\",value= \"2324346a!@#$%^*()_+-=':;.,/?{}[]|\")",
+            string.Join(Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<RunSettings>",
+                "  <DataCollectionRunSettings>",
+                "    <DataCollectors />",
+                "  </DataCollectionRunSettings>",
+                "  <TestRunParameters>",
+                "    <Parameter name=\"a_sf123_12\" value=\"2324346a!@#$%^*()_+-=':;.,/?{}[]|\" />",
+                "  </TestRunParameters>",
+                "</RunSettings>")
+        ],
+        [
+            "TestRunParameters.Parameter(name = \"weburl\" , value = \"http://localhost//abc\")", string.Join(
+                Environment.NewLine, "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<RunSettings>",
+                "  <DataCollectionRunSettings>",
+                "    <DataCollectors />",
+                "  </DataCollectionRunSettings>",
+                "  <TestRunParameters>",
+                "    <Parameter name=\"weburl\" value=\"http://localhost//abc\" />",
+                "  </TestRunParameters>",
+                "</RunSettings>")
+        ]
+    ];
+    #endregion
+
+    [TestMethod]
+    public void InitializeShouldMergeTestRunParametersWithSpaces()
+    {
+        // in powershell call: ConsoleApp1.exe --% --TestRunParameters.Parameter(name =\"myParam\", value=\"myValue\")
+        // args:
+        //--
+        //TestRunParameters.Parameter(name = "myParam",
+        //value = "myValue")
+
+        // in cmd: ConsoleApp1.exe -- TestRunParameters.Parameter(name=\"myParam\", value=\"myValue\")
+        // args:
+        //--
+        //TestRunParameters.Parameter(name = "myParam",
+        //value = "myValue")
+
+        // in ubuntu wsl without escaping the space: ConsoleApp1.exe-- TestRunParameters.Parameter\(name =\"myParam\", value=\"myValue\"\)
+        // args:
+        //--
+        //TestRunParameters.Parameter(name = "myParam",
+        //value = "myValue")
+
+        // in ubuntu wsl with escaping the space: ConsoleApp1.exe-- TestRunParameters.Parameter\(name =\"myParam\",\ value=\"myValue\"\)
+        // args:
+        //--
+        //TestRunParameters.Parameter(name = "myParam", value = "myValue")
+
+        var args = new string[] {
+            "--",
+            "TestRunParameters.Parameter(name=\"myParam\",",
+            "value=\"myValue\")",
+            "TestRunParameters.Parameter(name=\"myParam2\",",
+            "value=\"myValue 2\")",
+        };
+
+        var runsettings = string.Join(Environment.NewLine, [
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors />",
+            "  </DataCollectionRunSettings>",
+            "  <TestRunParameters>",
+            "    <Parameter name=\"myParam\" value=\"myValue\" />",
+            "    <Parameter name=\"myParam2\" value=\"myValue 2\" />",
+            "  </TestRunParameters>",
+            "</RunSettings>"
+        ]);
 
-            this.executor.Initialize(args);
+        _executor.Initialize(args);
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(runsettings, settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(runsettings, _settingsProvider.ActiveRunSettings.SettingsXml);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/CollectArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/CollectArgumentProcessorTests.cs
index 3afcc9f8d7..09613d6c82 100644
--- a/test/vstest.console.UnitTests/Processors/CollectArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/CollectArgumentProcessorTests.cs
@@ -1,708 +1,711 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
-{
-    using System;
-    using System.IO;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using static Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.CollectArgumentExecutor;
-
-    [TestClass]
-    public class CollectArgumentProcessorTests
-    {
-        private readonly TestableRunSettingsProvider settingsProvider;
-        private readonly CollectArgumentExecutor executor;
+using System;
+using System.Globalization;
+using System.IO;
 
-        private readonly string DefaultRunSettings = string.Join(Environment.NewLine,
-            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-            "<RunSettings>",
-            " <RunConfiguration>",
-            " <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-            " </RunConfiguration>",
-            " <DataCollectionRunSettings>",
-            "    <DataCollectors >{0}</DataCollectors>",
-            "  </DataCollectionRunSettings>",
-            "</RunSettings>");
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-        public CollectArgumentProcessorTests()
-        {
-            this.settingsProvider = new TestableRunSettingsProvider();
-            this.executor = new CollectArgumentExecutor(this.settingsProvider, new Mock<IFileHelper>().Object);
-            CollectArgumentExecutor.EnabledDataCollectors.Clear();
-        }
+using Moq;
 
-        [TestMethod]
-        public void GetMetadataShouldReturnCollectArgumentProcessorCapabilities()
-        {
-            var processor = new CollectArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is CollectArgumentProcessorCapabilities);
-        }
+using static Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.CollectArgumentExecutor;
 
-        [TestMethod]
-        public void GetExecuterShouldReturnCollectArgumentProcessorCapabilities()
-        {
-            var processor = new CollectArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is CollectArgumentExecutor);
-        }
+namespace vstest.console.UnitTests.Processors;
 
-        #region CollectArgumentProcessorCapabilities tests
+[TestClass]
+public class CollectArgumentProcessorTests
+{
+    private readonly TestableRunSettingsProvider _settingsProvider;
+    private readonly CollectArgumentExecutor _executor;
+
+    private readonly string _defaultRunSettings = string.Join(Environment.NewLine,
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+        "<RunSettings>",
+        " <RunConfiguration>",
+        " <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+        " </RunConfiguration>",
+        " <DataCollectionRunSettings>",
+        "    <DataCollectors >{0}</DataCollectors>",
+        "  </DataCollectionRunSettings>",
+        "</RunSettings>");
+
+    public CollectArgumentProcessorTests()
+    {
+        _settingsProvider = new TestableRunSettingsProvider();
+        _executor = new CollectArgumentExecutor(_settingsProvider, new Mock<IFileHelper>().Object);
+        EnabledDataCollectors.Clear();
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new CollectArgumentProcessorCapabilities();
+    [TestMethod]
+    public void GetMetadataShouldReturnCollectArgumentProcessorCapabilities()
+    {
+        var processor = new CollectArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is CollectArgumentProcessorCapabilities);
+    }
 
-            Assert.AreEqual("/Collect", capabilities.CommandName);
-            var expected =
-                $"--Collect|/Collect:<DataCollector FriendlyName>{Environment.NewLine}      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(),
-                capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+    [TestMethod]
+    public void GetExecuterShouldReturnCollectArgumentProcessorCapabilities()
+    {
+        var processor = new CollectArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is CollectArgumentExecutor);
+    }
 
-            Assert.AreEqual(HelpContentPriority.CollectArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+    #region CollectArgumentProcessorCapabilities tests
 
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new CollectArgumentProcessorCapabilities();
 
-        #endregion
+        Assert.AreEqual("/Collect", capabilities.CommandName);
+        var expected =
+            $"--Collect|/Collect:<DataCollector FriendlyName>{Environment.NewLine}      Enables data collector for the test run. More info here : https://aka.ms/vstest-collect";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(),
+            capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
 
-        #region CollectArgumentExecutor tests
+        Assert.AreEqual(HelpContentPriority.CollectArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
 
-        [TestMethod]
-        public void InitializeShouldThrowIfArguemntIsNull()
-        {
-            Assert.ThrowsException<CommandLineException>(() => { this.executor.Initialize(null); });
-        }
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotThrowIfArgumentIsEmpty()
-        {
-            Assert.ThrowsException<CommandLineException>(() => { this.executor.Initialize(String.Empty); });
-        }
+    #endregion
 
-        [TestMethod]
-        public void InitializeShouldNotThrowIfArgumentIsWhiteSpace()
-        {
-            Assert.ThrowsException<CommandLineException>(() => { this.executor.Initialize(" "); });
-        }
+    #region CollectArgumentExecutor tests
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionWhenTestSettingsIsEnabled()
-        {
-            string runsettingsString = @"<RunSettings>
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
+    {
+        Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(null));
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotThrowIfArgumentIsEmpty()
+    {
+        Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(string.Empty));
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotThrowIfArgumentIsWhiteSpace()
+    {
+        Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(" "));
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionWhenTestSettingsIsEnabled()
+    {
+        string runsettingsString = @"<RunSettings>
                                         <MSTest>
                                             <SettingsFile>C:\temp.testsettings</SettingsFile>
                                             <ForcedLegacyMode>true</ForcedLegacyMode>
                                         </MSTest>
                                     </RunSettings>";
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            bool exceptionThrown = false;
-
-            try
-            {
-                this.executor.Initialize("MyDataCollector");
-            }
-            catch (SettingsException ex)
-            {
-                exceptionThrown = true;
-                Assert.AreEqual(
-                    "--Collect|/Collect:\"MyDataCollector\" is not supported if test run is configured using testsettings.",
-                    ex.Message);
-            }
-
-            Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
-        }
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-        [TestMethod]
-        public void InitializeShouldCreateEntryForDataCollectorInRunSettingsIfNotAlreadyPresent()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector");
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        bool exceptionThrown = false;
 
-        [TestMethod]
-        public void InitializeShouldEnableDataCollectorIfDisabledInRunSettings()
+        try
         {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
+            _executor.Initialize("MyDataCollector");
         }
-
-        [TestMethod]
-        public void InitializeShouldNotDisableOtherDataCollectorsIfEnabled()
+        catch (SettingsException ex)
         {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector");
-            this.executor.Initialize("MyDataCollector2");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
+            exceptionThrown = true;
+            Assert.AreEqual(
+                "--Collect|/Collect:\"MyDataCollector\" is not supported if test run is configured using testsettings.",
+                ex.Message);
         }
 
-        [TestMethod]
-        public void InitializeShouldNotEnableOtherDataCollectorsIfDisabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector");
-            this.executor.Initialize("MyDataCollector2");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
+    }
 
-        [TestMethod]
-        public void InitializeShouldEnableMultipleCollectorsWhenCalledMoreThanOnce()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("MyDataCollector");
-            this.executor.Initialize("MyDataCollector1");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void InitializeShouldCreateEntryForDataCollectorInRunSettingsIfNotAlreadyPresent()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-        [TestMethod]
-        public void InitializeShouldAddOutProcAndInprocCollectorWhenXPlatCodeCoverageIsEnabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                "      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"coverlet.collector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        _executor.Initialize("MyDataCollector");
 
-        [TestMethod]
-        public void UpdageXPlatCodeCoverageCodebaseWithFullPathFromTestAdaptersPaths_Found()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
-            fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
-            CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
-            executor.Initialize("XPlat Code Coverage");
-            executor.Execute();
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                $"      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"c:\\AdapterFolderPath{Path.DirectorySeparatorChar}coverlet.collector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>").ShowWhiteSpace(), this.settingsProvider.ActiveRunSettings.SettingsXml.ShowWhiteSpace());
-        }
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void UpdageXPlatCodeCoverageCodebaseWithFullPathFromTestAdaptersPaths_NotFound()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
-            fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(false);
-            CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
-            executor.Initialize("XPlat Code Coverage");
-            executor.Execute();
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                "      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"coverlet.collector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void InitializeShouldEnableDataCollectorIfDisabledInRunSettings()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldNotChangeExistingDataCollectors()
-        {
-            var runsettingsString = string.Join(Environment.NewLine,
-                "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>");
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        _executor.Initialize("MyDataCollector");
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldNotChangeExistingXPlatDataCollectorSetting()
-        {
-            var runsettingsString = string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  </RunSettings>");
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldNotChangeExistingXPlatInProcDataCollectorSetting()
-        {
-            var runsettingsString = string.Join(Environment.NewLine,
-                "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                "      <InProcDataCollector assemblyQualifiedName=\"Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector.CoverletCoverageDataCollector, Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"XPlat Code Coverage\" enabled=\"False\" codebase=\"inprocdatacollector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>");
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                "      <InProcDataCollector assemblyQualifiedName=\"Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector.CoverletCoverageDataCollector, Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void InitializeShouldNotDisableOtherDataCollectorsIfEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldAddXPlatOutProcProcDataCollectorSetting()
-        {
-            var runsettingsString = string.Join(Environment.NewLine,
-                "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-                $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" codebase=\"inprocdatacollector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>");
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            this.executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-               $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-               $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        _executor.Initialize("MyDataCollector");
+        _executor.Initialize("MyDataCollector2");
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent()
-        {
-            var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n <DataCollectionRunSettings>\r\n    <DataCollectors>\r\n      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n    </DataCollectors>\r\n  </DataCollectionRunSettings>\r\n  <InProcDataCollectionRunSettings>\r\n    <InProcDataCollectors>\r\n      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n    </InProcDataCollectors>\r\n  </InProcDataCollectionRunSettings>\r\n</RunSettings>";
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
-            fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
-            CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
-            executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-               $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-               $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent_NoTestAdaptersPaths()
-        {
-            var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <RunConfiguration>\r\n </RunConfiguration>\r\n <DataCollectionRunSettings>\r\n    <DataCollectors>\r\n      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n    </DataCollectors>\r\n  </DataCollectionRunSettings>\r\n  <InProcDataCollectionRunSettings>\r\n    <InProcDataCollectors>\r\n      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n    </InProcDataCollectors>\r\n  </InProcDataCollectionRunSettings>\r\n</RunSettings>";
-            runsettingsString = string.Format(runsettingsString, string.Empty);
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-            Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
-            // Suppose file exists to be sure that we won't find adapter path on runsettings config
-            fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
-            CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
-            executor.Initialize("XPlat Code Coverage");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
-               $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <InProcDataCollectionRunSettings>",
-                "    <InProcDataCollectors>",
-               $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
-                "    </InProcDataCollectors>",
-                "  </InProcDataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void InitializeShouldNotEnableOtherDataCollectorsIfDisabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionWhenInvalidCollectorNameProvided()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("MyDataCollector");
+        _executor.Initialize("MyDataCollector2");
 
-            Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize("MyDataCollector=SomeSetting"));
-        }
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionWhenInvalidConfigurationsProvided()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
+    [TestMethod]
+    public void InitializeShouldEnableMultipleCollectorsWhenCalledMoreThanOnce()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("MyDataCollector");
+        _executor.Initialize("MyDataCollector1");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-            Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize("MyDataCollector;SomeSetting"));
-        }
+    [TestMethod]
+    public void InitializeShouldAddOutProcAndInprocCollectorWhenXPlatCodeCoverageIsEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("XPlat Code Coverage");
 
-        [TestMethod]
-        public void InitializeShouldCreateConfigurationsForNewDataCollectorInRunSettings()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector;SomeSetting=SomeValue;AnotherSetting=AnotherValue");
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
-                "        <Configuration>",
-                "          <SomeSetting>SomeValue</SomeSetting>",
-                "          <AnotherSetting>AnotherValue</AnotherSetting>",
-                "        </Configuration>",
-                "      </DataCollector>",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            "      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"coverlet.collector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCreateConfigurationsForExistingDataCollectorInRunSettings()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\">" +
-                "  <Configuration>" +
-                "    <SomeSetting>SomeValue</SomeSetting>" +
-                "  </Configuration>" +
-                "</DataCollector>");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector;AnotherSetting=AnotherValue");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
-                "        <Configuration>",
-                "          <SomeSetting>SomeValue</SomeSetting>",
-                "          <AnotherSetting>AnotherValue</AnotherSetting>",
-                "        </Configuration>",
-                "      </DataCollector>",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+    [TestMethod]
+    public void UpdateXPlatCodeCoverageCodebaseWithFullPathFromTestAdaptersPaths_Found()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        Mock<IFileHelper> fileHelper = new();
+        fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
+        CollectArgumentExecutor executor = new(_settingsProvider, fileHelper.Object);
+        executor.Initialize("XPlat Code Coverage");
+        executor.Execute();
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"c:\\AdapterFolderPath{Path.DirectorySeparatorChar}coverlet.collector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>").ShowWhiteSpace(), _settingsProvider.ActiveRunSettings!.SettingsXml!.ShowWhiteSpace());
+    }
 
-        [TestMethod]
-        public void InitializeShouldUpdateConfigurationsForExistingDataCollectorInRunSettings()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\">" +
-                "  <Configuration>" +
-                "    <SomeSetting>SomeValue</SomeSetting>" +
-                "  </Configuration>" +
-                "</DataCollector>");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("MyDataCollector;SomeSetting=AnotherValue");
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <RunConfiguration>",
-                "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
-                "  </RunConfiguration>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
-                "        <Configuration>",
-                "          <SomeSetting>AnotherValue</SomeSetting>",
-                "        </Configuration>",
-                "      </DataCollector>",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-        #endregion
+    [TestMethod]
+    public void UpdageXPlatCodeCoverageCodebaseWithFullPathFromTestAdaptersPaths_NotFound()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        Mock<IFileHelper> fileHelper = new();
+        fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(false);
+        CollectArgumentExecutor executor = new(_settingsProvider, fileHelper.Object);
+        executor.Initialize("XPlat Code Coverage");
+        executor.Execute();
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            "      <InProcDataCollector assemblyQualifiedName=\"Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"coverlet.collector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldNotChangeExistingDataCollectors()
+    {
+        var runsettingsString = string.Join(Environment.NewLine,
+            "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>");
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldNotChangeExistingXPlatDataCollectorSetting()
+    {
+        var runsettingsString = string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  </RunSettings>");
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldNotChangeExistingXPlatInProcDataCollectorSetting()
+    {
+        var runsettingsString = string.Join(Environment.NewLine,
+            "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            "      <InProcDataCollector assemblyQualifiedName=\"Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector.CoverletCoverageDataCollector, Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"XPlat Code Coverage\" enabled=\"False\" codebase=\"inprocdatacollector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>");
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"XPlat Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            "      <InProcDataCollector assemblyQualifiedName=\"Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector.CoverletCoverageDataCollector, Microsoft.TestPlatform.Extensions.CoverletCoverageDataCollector, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\" friendlyName=\"XPlat Code Coverage\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldAddXPlatOutProcProcDataCollectorSetting()
+    {
+        var runsettingsString = string.Join(Environment.NewLine,
+            "<?xml version =\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" codebase=\"inprocdatacollector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>");
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        _executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent()
+    {
+        var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n <DataCollectionRunSettings>\r\n    <DataCollectors>\r\n      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n    </DataCollectors>\r\n  </DataCollectionRunSettings>\r\n  <InProcDataCollectionRunSettings>\r\n    <InProcDataCollectors>\r\n      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n    </InProcDataCollectors>\r\n  </InProcDataCollectionRunSettings>\r\n</RunSettings>";
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        Mock<IFileHelper> fileHelper = new();
+        fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
+        CollectArgumentExecutor executor = new(_settingsProvider, fileHelper.Object);
+        executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent_NoTestAdaptersPaths()
+    {
+        var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <RunConfiguration>\r\n </RunConfiguration>\r\n <DataCollectionRunSettings>\r\n    <DataCollectors>\r\n      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n    </DataCollectors>\r\n  </DataCollectionRunSettings>\r\n  <InProcDataCollectionRunSettings>\r\n    <InProcDataCollectors>\r\n      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n    </InProcDataCollectors>\r\n  </InProcDataCollectionRunSettings>\r\n</RunSettings>";
+        runsettingsString = string.Format(CultureInfo.CurrentCulture, runsettingsString, string.Empty);
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+        Mock<IFileHelper> fileHelper = new();
+        // Suppose file exists to be sure that we won't find adapter path on runsettings config
+        fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
+        CollectArgumentExecutor executor = new(_settingsProvider, fileHelper.Object);
+        executor.Initialize("XPlat Code Coverage");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
+            $"      <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <InProcDataCollectionRunSettings>",
+            "    <InProcDataCollectors>",
+            $"      <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
+            "    </InProcDataCollectors>",
+            "  </InProcDataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionWhenInvalidCollectorNameProvided()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        Assert.ThrowsException<CommandLineException>(() => _executor.Initialize("MyDataCollector=SomeSetting"));
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionWhenInvalidConfigurationsProvided()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        Assert.ThrowsException<CommandLineException>(() => _executor.Initialize("MyDataCollector;SomeSetting"));
+    }
+
+    [TestMethod]
+    public void InitializeShouldCreateConfigurationsForNewDataCollectorInRunSettings()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize("MyDataCollector;SomeSetting=SomeValue;AnotherSetting=AnotherValue");
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
+            "        <Configuration>",
+            "          <SomeSetting>SomeValue</SomeSetting>",
+            "          <AnotherSetting>AnotherValue</AnotherSetting>",
+            "        </Configuration>",
+            "      </DataCollector>",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldCreateConfigurationsForExistingDataCollectorInRunSettings()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\">" +
+            "  <Configuration>" +
+            "    <SomeSetting>SomeValue</SomeSetting>" +
+            "  </Configuration>" +
+            "</DataCollector>");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize("MyDataCollector;AnotherSetting=AnotherValue");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
+            "        <Configuration>",
+            "          <SomeSetting>SomeValue</SomeSetting>",
+            "          <AnotherSetting>AnotherValue</AnotherSetting>",
+            "        </Configuration>",
+            "      </DataCollector>",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldUpdateConfigurationsForExistingDataCollectorInRunSettings()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"MyDataCollector\" enabled=\"False\">" +
+            "  <Configuration>" +
+            "    <SomeSetting>SomeValue</SomeSetting>" +
+            "  </Configuration>" +
+            "</DataCollector>");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize("MyDataCollector;SomeSetting=AnotherValue");
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <RunConfiguration>",
+            "    <TestAdaptersPaths>c:\\AdapterFolderPath</TestAdaptersPaths>",
+            "  </RunConfiguration>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\">",
+            "        <Configuration>",
+            "          <SomeSetting>AnotherValue</SomeSetting>",
+            "        </Configuration>",
+            "      </DataCollector>",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
     }
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/DisableAutoFakesArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/DisableAutoFakesArgumentProcessorTests.cs
index 584f8fd50b..ca33ec99fe 100644
--- a/test/vstest.console.UnitTests/Processors/DisableAutoFakesArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/DisableAutoFakesArgumentProcessorTests.cs
@@ -1,53 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class DisableAutoFakesArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    private readonly DisableAutoFakesArgumentProcessor _disableAutoFakesArgumentProcessor;
+
+    public DisableAutoFakesArgumentProcessorTests()
+    {
+        _disableAutoFakesArgumentProcessor = new DisableAutoFakesArgumentProcessor();
+    }
+
+    [TestMethod]
+    public void DisableAutoFakesArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
+    {
+        Assert.IsFalse(_disableAutoFakesArgumentProcessor.Metadata.Value.AllowMultiple);
+        Assert.IsFalse(_disableAutoFakesArgumentProcessor.Metadata.Value.AlwaysExecute);
+        Assert.IsFalse(_disableAutoFakesArgumentProcessor.Metadata.Value.IsAction);
+        Assert.IsFalse(_disableAutoFakesArgumentProcessor.Metadata.Value.IsSpecialCommand);
+        Assert.AreEqual(DisableAutoFakesArgumentProcessor.CommandName, _disableAutoFakesArgumentProcessor.Metadata.Value.CommandName);
+        Assert.IsNull(_disableAutoFakesArgumentProcessor.Metadata.Value.ShortCommandName);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, _disableAutoFakesArgumentProcessor.Metadata.Value.Priority);
+        Assert.AreEqual(HelpContentPriority.DisableAutoFakesArgumentProcessorHelpPriority, _disableAutoFakesArgumentProcessor.Metadata.Value.HelpPriority);
+    }
+
+
+    [TestMethod]
+    public void DisableAutoFakesArgumentProcessorExecutorShouldThrowIfArgumentIsNullOrEmpty()
+    {
+        Assert.ThrowsException<CommandLineException>(() => _disableAutoFakesArgumentProcessor.Executor!.Value.Initialize(string.Empty));
+        Assert.ThrowsException<CommandLineException>(() => _disableAutoFakesArgumentProcessor.Executor!.Value.Initialize(" "));
+    }
+
+    [TestMethod]
+    public void DisableAutoFakesArgumentProcessorExecutorShouldThrowIfArgumentIsNotBooleanString()
+    {
+        Assert.ThrowsException<CommandLineException>(() => _disableAutoFakesArgumentProcessor.Executor!.Value.Initialize("DisableAutoFakes"));
+    }
 
-    [TestClass]
-    public class DisableAutoFakesArgumentProcessorTests
+    [TestMethod]
+    public void DisableAutoFakesArgumentProcessorExecutorShouldSetCommandLineDisableAutoFakeValueAsPerArgumentProvided()
     {
-        private readonly DisableAutoFakesArgumentProcessor disableAutoFakesArgumentProcessor;
-
-        public DisableAutoFakesArgumentProcessorTests()
-        {
-            this.disableAutoFakesArgumentProcessor = new DisableAutoFakesArgumentProcessor();
-        }
-
-        [TestMethod]
-        public void DisableAutoFakesArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
-        {
-            Assert.IsFalse(this.disableAutoFakesArgumentProcessor.Metadata.Value.AllowMultiple);
-            Assert.IsFalse(this.disableAutoFakesArgumentProcessor.Metadata.Value.AlwaysExecute);
-            Assert.IsFalse(this.disableAutoFakesArgumentProcessor.Metadata.Value.IsAction);
-            Assert.IsFalse(this.disableAutoFakesArgumentProcessor.Metadata.Value.IsSpecialCommand);
-            Assert.AreEqual(DisableAutoFakesArgumentProcessor.CommandName, this.disableAutoFakesArgumentProcessor.Metadata.Value.CommandName);
-            Assert.IsNull(this.disableAutoFakesArgumentProcessor.Metadata.Value.ShortCommandName);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, this.disableAutoFakesArgumentProcessor.Metadata.Value.Priority);
-            Assert.AreEqual(HelpContentPriority.DisableAutoFakesArgumentProcessorHelpPriority, this.disableAutoFakesArgumentProcessor.Metadata.Value.HelpPriority);
-        }
-
-
-        [TestMethod]
-        public void DisableAutoFakesArgumentProcessorExecutorShouldThrowIfArgumentIsNullOrEmpty()
-        {
-            Assert.ThrowsException<CommandLineException>(() => this.disableAutoFakesArgumentProcessor.Executor.Value.Initialize(string.Empty));
-            Assert.ThrowsException<CommandLineException>(() => this.disableAutoFakesArgumentProcessor.Executor.Value.Initialize(" "));
-        }
-
-        [TestMethod]
-        public void DisableAutoFakesArgumentProcessorExecutorShouldThrowIfArgumentIsNotBooleanString()
-        {
-            Assert.ThrowsException<CommandLineException>(() => this.disableAutoFakesArgumentProcessor.Executor.Value.Initialize("DisableAutoFakes"));
-        }
-
-        [TestMethod]
-        public void DisableAutoFakesArgumentProcessorExecutorShouldSetCommandLineDisableAutoFakeValueAsPerArgumentProvided()
-        {
-            this.disableAutoFakesArgumentProcessor.Executor.Value.Initialize("true");
-            Assert.IsTrue(CommandLineOptions.Instance.DisableAutoFakes);
-        }
+        _disableAutoFakesArgumentProcessor.Executor!.Value.Initialize("true");
+        Assert.IsTrue(CommandLineOptions.Instance.DisableAutoFakes);
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/Processors/EnableBlameArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableBlameArgumentProcessorTests.cs
index 24566e7ab1..2a09e0145b 100644
--- a/test/vstest.console.UnitTests/Processors/EnableBlameArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableBlameArgumentProcessorTests.cs
@@ -1,120 +1,149 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+public class EnableBlameArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    [TestClass]
-    public class EnableBlameArgumentProcessorTests
+    private readonly Mock<IEnvironment> _mockEnvronment;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly TestableRunSettingsProvider _settingsProvider;
+    private readonly EnableBlameArgumentExecutor _executor;
+    private readonly string _defaultRunSettings = string.Join(Environment.NewLine,
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+        "<RunSettings>",
+        "  <DataCollectionRunSettings>",
+        "    <DataCollectors ></DataCollectors>",
+        "  </DataCollectionRunSettings>",
+        "  <RunConfiguration><ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory></RunConfiguration>",
+        "  </RunSettings>");
+
+    public EnableBlameArgumentProcessorTests()
     {
-        private Mock<IEnvironment> mockEnvronment;
-        private Mock<IOutput> mockOutput;
-        private TestableRunSettingsProvider settingsProvider;
-        private EnableBlameArgumentExecutor executor;
-        private string DefaultRunSettings = string.Join(Environment.NewLine,
-            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-            "<RunSettings>",
-            "  <DataCollectionRunSettings>",
-            "    <DataCollectors ></DataCollectors>",
-            "  </DataCollectionRunSettings>",
-            "  <RunConfiguration><ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory></RunConfiguration>",
-            "  </RunSettings>");
-
-        public EnableBlameArgumentProcessorTests()
-        {
-            this.settingsProvider = new TestableRunSettingsProvider();
-            this.mockEnvronment = new Mock<IEnvironment>();
-            this.mockOutput = new Mock<IOutput>();
+        _settingsProvider = new TestableRunSettingsProvider();
+        _mockEnvronment = new Mock<IEnvironment>();
+        _mockOutput = new Mock<IOutput>();
 
-            this.executor = new TestableEnableBlameArgumentExecutor(this.settingsProvider, this.mockEnvronment.Object, this.mockOutput.Object);
-            CollectArgumentExecutor.EnabledDataCollectors.Clear();
-        }
+        _executor = new TestableEnableBlameArgumentExecutor(_settingsProvider, _mockEnvronment.Object, _mockOutput.Object);
+        CollectArgumentExecutor.EnabledDataCollectors.Clear();
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnEnableBlameArgumentProcessorCapabilities()
-        {
-            var processor = new EnableBlameArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is EnableBlameArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnEnableBlameArgumentProcessorCapabilities()
+    {
+        var processor = new EnableBlameArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is EnableBlameArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnEnableBlameArgumentProcessorCapabilities()
-        {
-            var processor = new EnableBlameArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is EnableBlameArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnEnableBlameArgumentProcessorCapabilities()
+    {
+        var processor = new EnableBlameArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is EnableBlameArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new EnableBlameArgumentProcessorCapabilities();
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new EnableBlameArgumentProcessorCapabilities();
 
-            Assert.AreEqual("/Blame", capabilities.CommandName);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Logging, capabilities.Priority);
-            Assert.AreEqual(HelpContentPriority.EnableDiagArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.AreEqual(CommandLineResources.EnableBlameUsage, capabilities.HelpContentResourceName);
+        Assert.AreEqual("/Blame", capabilities.CommandName);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Logging, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.EnableDiagArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.AreEqual(CommandLineResources.EnableBlameUsage, capabilities.HelpContentResourceName);
 
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCreateEntryForBlameInRunSettingsIfNotAlreadyPresent()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
+    [TestMethod]
+    public void InitializeShouldCreateEntryForBlameInRunSettingsIfNotAlreadyPresent()
+    {
+        _ = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-            this.executor.Initialize("");
+        _executor.Initialize("");
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
-                "        <Configuration>",
-                "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "        </Configuration>",
-                "      </DataCollector>",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "  <RunConfiguration>",
-                "    <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "  </RunConfiguration>",
-                "  <LoggerRunSettings>",
-                "    <Loggers>",
-                "      <Logger friendlyName=\"blame\" enabled=\"True\" />",
-                "    </Loggers>",
-                "  </LoggerRunSettings>",
-                "</RunSettings>"
-                ), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
+            "        <Configuration>",
+            "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+            "        </Configuration>",
+            "      </DataCollector>",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <RunConfiguration>",
+            "    <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+            "  </RunConfiguration>",
+            "  <LoggerRunSettings>",
+            "    <Loggers>",
+            "      <Logger friendlyName=\"blame\" enabled=\"True\" />",
+            "    </Loggers>",
+            "  </LoggerRunSettings>",
+            "</RunSettings>"
+        ), _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(string.Join(Environment.NewLine,
+    [TestMethod]
+    public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent()
+    {
+        _ = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
+            "        <Configuration>",
+            "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+            "          <CollectDump DumpType=\"mini\" CollectAlways=\"false\" />",
+            "        </Configuration>",
+            "      </DataCollector>",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "  <RunConfiguration>",
+            "    <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+            "  </RunConfiguration>",
+            "  <LoggerRunSettings>",
+            "    <Loggers>",
+            "      <Logger friendlyName=\"blame\" enabled=\"True\" />",
+            "    </Loggers>",
+            "  </LoggerRunSettings>",
+            "</RunSettings>"));
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize("CollectDump;DumpType=full;CollectAlways=true");
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -122,7 +151,7 @@ public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent(
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDump DumpType=\"mini\" CollectAlways=\"false\" />",
+                "          <CollectDump DumpType=\"full\" CollectAlways=\"true\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -135,13 +164,29 @@ public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent(
                 "      <Logger friendlyName=\"blame\" enabled=\"True\" />",
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
-                "</RunSettings>"));
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize("CollectDump;DumpType=full;CollectAlways=true");
+                "</RunSettings>"),
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+    [TestMethod]
+    public void InitializeShouldWarnIfIncorrectParameterIsSpecifiedForCollectDumpOption()
+    {
+        var invalidParameter = "CollectDumpXX";
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize(invalidParameter);
+        _mockOutput.Verify(x => x.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.BlameIncorrectOption, invalidParameter), OutputLevel.Warning));
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -149,7 +194,6 @@ public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent(
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDump DumpType=\"full\" CollectAlways=\"true\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -163,33 +207,29 @@ public void InitializeShouldOverwriteEntryForBlameInRunSettingsIfAlreadyPresent(
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldWarnIfPlatformNotSupportedForCollectDumpOption()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            var unsupportedPlatforms = new List<Tuple<PlatformOperatingSystem, PlatformArchitecture>>()
-            {
-                Tuple.Create(PlatformOperatingSystem.Windows, PlatformArchitecture.ARM),
-                Tuple.Create(PlatformOperatingSystem.Windows, PlatformArchitecture.ARM64)
-            };
-
-            foreach (var tuple in unsupportedPlatforms)
-            {
-                this.mockEnvronment.SetupGet(s => s.OperatingSystem).Returns(tuple.Item1);
-                this.mockEnvronment.SetupGet(s => s.Architecture).Returns(tuple.Item2);
-
-                this.executor.Initialize("collectdump");
-                this.mockOutput.Verify(x => x.WriteLine(CommandLineResources.BlameCollectDumpNotSupportedForPlatform, OutputLevel.Warning));
-
-                Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-                Assert.AreEqual(string.Join(Environment.NewLine,
+    [TestMethod]
+    [ExpectedException(typeof(CommandLineException))]
+    public void InitializeShouldThrowIfInvalidParameterFormatIsSpecifiedForCollectDumpOption()
+    {
+        var invalidString = "CollectDump;sdf=sdg;;as;a=";
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize(invalidString);
+        _mockOutput.Verify(x => x.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidBlameArgument, invalidString), OutputLevel.Warning));
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -210,29 +250,26 @@ public void InitializeShouldWarnIfPlatformNotSupportedForCollectDumpOption()
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-            }
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldWarnIfIncorrectParameterIsSpecifiedForCollectDumpOption()
-        {
-            var invalidParameter = "CollectDumpXX";
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
-
-            this.executor.Initialize(invalidParameter);
-            this.mockOutput.Verify(x => x.WriteLine(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.BlameIncorrectOption, invalidParameter), OutputLevel.Warning));
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+    [TestMethod]
+    public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpEntryIfEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize("CollectDump");
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -240,6 +277,7 @@ public void InitializeShouldWarnIfIncorrectParameterIsSpecifiedForCollectDumpOpt
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+                "          <CollectDump DumpType=\"Full\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -253,29 +291,26 @@ public void InitializeShouldWarnIfIncorrectParameterIsSpecifiedForCollectDumpOpt
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        [ExpectedException(typeof(CommandLineException))]
-        public void InitializeShouldThrowIfInvalidParameterFormatIsSpecifiedForCollectDumpOption()
-        {
-            var invalidString = "CollectDump;sdf=sdg;;as;a=";
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
-
-            this.executor.Initialize(invalidString);
-            this.mockOutput.Verify(x => x.WriteLine(string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidBlameArgument, invalidString), OutputLevel.Warning));
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+    [TestMethod]
+    public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpParametersIfEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize("CollectDump;DumpType=full;CollectAlways=true");
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -283,6 +318,7 @@ public void InitializeShouldThrowIfInvalidParameterFormatIsSpecifiedForCollectDu
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
+                "          <CollectDump DumpType=\"full\" CollectAlways=\"true\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -296,26 +332,27 @@ public void InitializeShouldThrowIfInvalidParameterFormatIsSpecifiedForCollectDu
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpEntryIfEnabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
+    [TestMethod]
+    public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpEntryIfEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
 
-            this.executor.Initialize("CollectDump");
+        _executor.Initialize("CollectHangDump");
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(
+            string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -323,7 +360,7 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpEntryIfEnable
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDump DumpType=\"Full\" />",
+                "          <CollectDumpOnTestSessionHang TestTimeout=\"3600000\" HangDumpType=\"Full\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -337,26 +374,26 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpEntryIfEnable
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        [TestMethod]
-        public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpParametersIfEnabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
+    [TestMethod]
+    public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpParametersIfEnabled()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
 
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
 
-            this.executor.Initialize("CollectDump;DumpType=full;CollectAlways=true");
+        _executor.Initialize("CollectHangDump;TestTimeout=10min;HangDumpType=Mini");
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -364,7 +401,7 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpParametersIfE
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDump DumpType=\"full\" CollectAlways=\"true\" />",
+                "          <CollectDumpOnTestSessionHang TestTimeout=\"10min\" HangDumpType=\"Mini\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -378,27 +415,26 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectDumpParametersIfE
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpEntryIfEnabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
-
-            this.executor.Initialize("CollectHangDump");
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(
-                string.Join(Environment.NewLine,
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    public void InitializeMonitorPostmortemDebuggerShouldGenerateCorrectConfiguration()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize("MonitorPostmortemDebugger;DumpDirectoryPath=c:\\DumpDirectoryPath");
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -406,7 +442,7 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpEntryIfEn
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDumpOnTestSessionHang TestTimeout=\"3600000\" HangDumpType=\"Full\" />",
+                "          <MonitorPostmortemDebugger DumpDirectoryPath=\"c:\\DumpDirectoryPath\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -420,26 +456,26 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpEntryIfEn
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpParametersIfEnabled()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(DefaultRunSettings);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.mockEnvronment.Setup(x => x.OperatingSystem)
-                               .Returns(PlatformOperatingSystem.Windows);
-            this.mockEnvronment.Setup(x => x.Architecture)
-                               .Returns(PlatformArchitecture.X64);
-
-            this.executor.Initialize("CollectHangDump;TestTimeout=10min;HangDumpType=Mini");
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(string.Join(Environment.NewLine,
+    [TestMethod]
+    [TestCategory("Windows-Review")]
+    public void InitializeMonitorPostmortemDebuggerShouldGenerateCorrectConfigurationAlsoIfIncomplete()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(_defaultRunSettings);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _mockEnvronment.Setup(x => x.OperatingSystem)
+            .Returns(PlatformOperatingSystem.Windows);
+        _mockEnvronment.Setup(x => x.Architecture)
+            .Returns(PlatformArchitecture.X64);
+
+        _executor.Initialize("MonitorPostmortemDebugger;");
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(string.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<RunSettings>",
                 "  <DataCollectionRunSettings>",
@@ -447,7 +483,7 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpParameter
                 "      <DataCollector friendlyName=\"blame\" enabled=\"True\">",
                 "        <Configuration>",
                 "          <ResultsDirectory>C:\\dir\\TestResults</ResultsDirectory>",
-                "          <CollectDumpOnTestSessionHang TestTimeout=\"10min\" HangDumpType=\"Mini\" />",
+                "          <MonitorPostmortemDebugger DumpDirectoryPath=\"\" />",
                 "        </Configuration>",
                 "      </DataCollector>",
                 "    </DataCollectors>",
@@ -461,16 +497,15 @@ public void InitializeShouldCreateEntryForBlameAlongWithCollectHangDumpParameter
                 "    </Loggers>",
                 "  </LoggerRunSettings>",
                 "</RunSettings>"),
-                this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
+            _settingsProvider.ActiveRunSettings.SettingsXml);
+    }
 
-        internal class TestableEnableBlameArgumentExecutor : EnableBlameArgumentExecutor
+    internal class TestableEnableBlameArgumentExecutor : EnableBlameArgumentExecutor
+    {
+        internal TestableEnableBlameArgumentExecutor(IRunSettingsProvider runSettingsManager, IEnvironment environment, IOutput output)
+            : base(runSettingsManager, environment, new Mock<IFileHelper>().Object)
         {
-            internal TestableEnableBlameArgumentExecutor(IRunSettingsProvider runSettingsManager, IEnvironment environment, IOutput output)
-                : base(runSettingsManager, environment, new Mock<IFileHelper>().Object)
-            {
-                this.Output = output;
-            }
+            Output = output;
         }
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/EnableCodeCoverageArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableCodeCoverageArgumentProcessorTests.cs
index 95737ecd53..405fee6e19 100644
--- a/test/vstest.console.UnitTests/Processors/EnableCodeCoverageArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableCodeCoverageArgumentProcessorTests.cs
@@ -1,176 +1,178 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+public class EnableCodeCoverageArgumentProcessorTests
 {
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-
-    [TestClass]
-    public class EnableCodeCoverageArgumentProcessorTests
+    private readonly TestableRunSettingsProvider _settingsProvider;
+    private readonly EnableCodeCoverageArgumentExecutor _executor;
+
+    private readonly string _defaultRunSettings = string.Join(Environment.NewLine,
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+        "<RunSettings>",
+        "  <DataCollectionRunSettings>",
+        "    <DataCollectors >{0}</DataCollectors>",
+        "  </DataCollectionRunSettings>",
+        "</RunSettings>");
+
+    public EnableCodeCoverageArgumentProcessorTests()
+    {
+        _settingsProvider = new TestableRunSettingsProvider();
+        _executor = new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, _settingsProvider,
+            new Mock<IFileHelper>().Object);
+        CollectArgumentExecutor.EnabledDataCollectors.Clear();
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnEnableCodeCoverageArgumentProcessorCapabilities()
+    {
+        var processor = new EnableCodeCoverageArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is EnableCodeCoverageArgumentProcessorCapabilities);
+    }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnEnableCodeCoverageArgumentProcessorCapabilities()
+    {
+        var processor = new EnableCodeCoverageArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is EnableCodeCoverageArgumentExecutor);
+    }
+
+    #region EnableCodeCoverageArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new EnableCodeCoverageArgumentProcessorCapabilities();
+
+        Assert.AreEqual("/EnableCodeCoverage", capabilities.CommandName);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region EnableCodeCoverageArgumentExecutor tests
+
+    [TestMethod]
+    public void InitializeShouldSetEnableCodeCoverageOfCommandLineOption()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        CommandLineOptions.Instance.EnableCodeCoverage = false;
+
+        _executor.Initialize(string.Empty);
+
+        Assert.IsTrue(CommandLineOptions.Instance.EnableCodeCoverage,
+            "/EnableCoverage should set CommandLineOption.EnableCodeCoverage to true");
+    }
+
+    [TestMethod]
+    public void InitializeShouldCreateEntryForCodeCoverageInRunSettingsIfNotAlreadyPresent()
     {
-        private TestableRunSettingsProvider settingsProvider;
-        private EnableCodeCoverageArgumentExecutor executor;
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings, "");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize(string.Empty);
+
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        var dataCollectorsFriendlyNames =
+            XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(_settingsProvider.ActiveRunSettings
+                .SettingsXml!);
+        Assert.IsTrue(dataCollectorsFriendlyNames.Contains("Code Coverage"),
+            "Code coverage setting in not available in runsettings");
+    }
 
-        private readonly string DefaultRunSettings = string.Join(Environment.NewLine,
+    [TestMethod]
+    public void InitializeShouldEnableCodeCoverageIfDisabledInRunSettings()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize(string.Empty);
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
             "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
             "<RunSettings>",
             "  <DataCollectionRunSettings>",
-            "    <DataCollectors >{0}</DataCollectors>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
+            "    </DataCollectors>",
             "  </DataCollectionRunSettings>",
-            "</RunSettings>");
-
-        public EnableCodeCoverageArgumentProcessorTests()
-        {
-            this.settingsProvider = new TestableRunSettingsProvider();
-            this.executor = new EnableCodeCoverageArgumentExecutor(CommandLineOptions.Instance, this.settingsProvider,
-                new Mock<IFileHelper>().Object);
-            CollectArgumentExecutor.EnabledDataCollectors.Clear();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnEnableCodeCoverageArgumentProcessorCapabilities()
-        {
-            var processor = new EnableCodeCoverageArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is EnableCodeCoverageArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnEnableCodeCoverageArgumentProcessorCapabilities()
-        {
-            var processor = new EnableCodeCoverageArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is EnableCodeCoverageArgumentExecutor);
-        }
-
-        #region EnableCodeCoverageArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new EnableCodeCoverageArgumentProcessorCapabilities();
-
-            Assert.AreEqual("/EnableCodeCoverage", capabilities.CommandName);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region EnableCodeCoverageArgumentExecutor tests
-
-        [TestMethod]
-        public void InitializeShouldSetEnableCodeCoverageOfCommandLineOption()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            CommandLineOptions.Instance.EnableCodeCoverage = false;
-
-            this.executor.Initialize(string.Empty);
-
-            Assert.IsTrue(CommandLineOptions.Instance.EnableCodeCoverage,
-                "/EnableCoverage should set CommandLineOption.EnableCodeCoverage to true");
-        }
-
-        [TestMethod]
-        public void InitializeShouldCreateEntryForCodeCoverageInRunSettingsIfNotAlreadyPresent()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings, "");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize(string.Empty);
-
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            var dataCollectorsFriendlyNames =
-                XmlRunSettingsUtilities.GetDataCollectorsFriendlyName(this.settingsProvider.ActiveRunSettings
-                    .SettingsXml);
-            Assert.IsTrue(dataCollectorsFriendlyNames.Contains("Code Coverage"),
-                "Code coverage setting in not available in runsettings");
-        }
-
-        [TestMethod]
-        public void InitializeShouldEnableCodeCoverageIfDisabledInRunSettings()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize(string.Empty);
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotDisableOtherDataCollectors()
-        {
-            CollectArgumentExecutor.EnabledDataCollectors.Add("mydatacollector1");
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize(string.Empty);
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotEnableOtherDataCollectors()
-        {
-            var runsettingsString = string.Format(DefaultRunSettings,
-                "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />");
-            var runsettings = new RunSettings();
-            runsettings.LoadSettingsXml(runsettingsString);
-            this.settingsProvider.SetActiveRunSettings(runsettings);
-
-            this.executor.Initialize(string.Empty);
-
-            Assert.AreEqual(string.Join(Environment.NewLine,
-                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                "<RunSettings>",
-                "  <DataCollectionRunSettings>",
-                "    <DataCollectors>",
-                "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
-                "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />",
-                "    </DataCollectors>",
-                "  </DataCollectionRunSettings>",
-                "</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
-        }
-
-        #endregion
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
     }
-}
\ No newline at end of file
+
+    [TestMethod]
+    public void InitializeShouldNotDisableOtherDataCollectors()
+    {
+        CollectArgumentExecutor.EnabledDataCollectors.Add("mydatacollector1");
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize(string.Empty);
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotEnableOtherDataCollectors()
+    {
+        var runsettingsString = string.Format(CultureInfo.CurrentCulture, _defaultRunSettings,
+            "<DataCollector friendlyName=\"Code Coverage\" enabled=\"False\" /><DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />");
+        var runsettings = new RunSettings();
+        runsettings.LoadSettingsXml(runsettingsString);
+        _settingsProvider.SetActiveRunSettings(runsettings);
+
+        _executor.Initialize(string.Empty);
+
+        Assert.AreEqual(string.Join(Environment.NewLine,
+            "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            "<RunSettings>",
+            "  <DataCollectionRunSettings>",
+            "    <DataCollectors>",
+            "      <DataCollector friendlyName=\"Code Coverage\" enabled=\"True\" />",
+            "      <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"False\" />",
+            "    </DataCollectors>",
+            "  </DataCollectionRunSettings>",
+            "</RunSettings>"), _settingsProvider.ActiveRunSettings!.SettingsXml);
+    }
+
+    #endregion
+}
diff --git a/test/vstest.console.UnitTests/Processors/EnableDiagArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableDiagArgumentProcessorTests.cs
index d944b752fc..52f1bce87b 100644
--- a/test/vstest.console.UnitTests/Processors/EnableDiagArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableDiagArgumentProcessorTests.cs
@@ -1,199 +1,184 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using System;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Moq;
+using Moq;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    [TestClass]
-    public class EnableDiagArgumentProcessorTests
-    {
-        private string dummyFilePath = Path.Combine(Path.DirectorySeparatorChar.ToString(), $"{System.Guid.NewGuid()}", $"{System.Guid.NewGuid()}.txt");
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
 
-        private readonly EnableDiagArgumentProcessor diagProcessor;
+[TestClass]
+public class EnableDiagArgumentProcessorTests
+{
+    private readonly string _dummyFilePath = Path.Combine(Path.DirectorySeparatorChar.ToString(), $"{Guid.NewGuid()}", $"{Guid.NewGuid()}.txt");
 
-        private readonly Mock<IFileHelper> mockFileHelper;
+    private readonly EnableDiagArgumentProcessor _diagProcessor;
 
-        private TraceLevel traceLevel;
-        private string traceFileName;
+    private readonly Mock<IFileHelper> _mockFileHelper;
 
-        public EnableDiagArgumentProcessorTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.diagProcessor = new TestableEnableDiagArgumentProcessor(this.mockFileHelper.Object);
+    private readonly TraceLevel _traceLevel;
+    private readonly string? _traceFileName;
 
-            // Saving the EqtTrace state
+    public EnableDiagArgumentProcessorTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _diagProcessor = new TestableEnableDiagArgumentProcessor(_mockFileHelper.Object);
+
+        // Saving the EqtTrace state
 #if NETFRAMEWORK
-            traceLevel = EqtTrace.TraceLevel;
-            EqtTrace.TraceLevel = TraceLevel.Off;
+        _traceLevel = EqtTrace.TraceLevel;
+        EqtTrace.TraceLevel = TraceLevel.Off;
 #else
-            traceLevel = (TraceLevel)EqtTrace.TraceLevel;
-            EqtTrace.TraceLevel = (PlatformTraceLevel)TraceLevel.Off;
+        _traceLevel = (TraceLevel)EqtTrace.TraceLevel;
+        EqtTrace.TraceLevel = (PlatformTraceLevel)TraceLevel.Off;
 #endif
 
-            traceFileName = EqtTrace.LogFile;
-        }
+        _traceFileName = EqtTrace.LogFile;
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            // Restoring to initial state for EqtTrace
-            EqtTrace.InitializeTrace(traceFileName, PlatformTraceLevel.Verbose);
+    [TestCleanup]
+    public void Cleanup()
+    {
+        // Restoring to initial state for EqtTrace
+        EqtTrace.InitializeTrace(_traceFileName, PlatformTraceLevel.Verbose);
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = traceLevel;
+        EqtTrace.TraceLevel = _traceLevel;
 #else
-            EqtTrace.TraceLevel = (PlatformTraceLevel)traceLevel;
+        EqtTrace.TraceLevel = (PlatformTraceLevel)_traceLevel;
 #endif
-        }
+    }
 
-        [TestMethod]
-        public void EnableDiagArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
-        {
-            Assert.IsFalse(this.diagProcessor.Metadata.Value.AllowMultiple);
-            Assert.IsFalse(this.diagProcessor.Metadata.Value.AlwaysExecute);
-            Assert.IsFalse(this.diagProcessor.Metadata.Value.IsAction);
-            Assert.IsFalse(this.diagProcessor.Metadata.Value.IsSpecialCommand);
-            Assert.AreEqual(EnableDiagArgumentProcessor.CommandName, this.diagProcessor.Metadata.Value.CommandName);
-            Assert.IsNull(this.diagProcessor.Metadata.Value.ShortCommandName);
-            Assert.AreEqual(ArgumentProcessorPriority.Diag, this.diagProcessor.Metadata.Value.Priority);
-            Assert.AreEqual(HelpContentPriority.EnableDiagArgumentProcessorHelpPriority, this.diagProcessor.Metadata.Value.HelpPriority);
-            Assert.AreEqual(CommandLineResources.EnableDiagUsage, this.diagProcessor.Metadata.Value.HelpContentResourceName);
-        }
+    [TestMethod]
+    public void EnableDiagArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
+    {
+        Assert.IsFalse(_diagProcessor.Metadata.Value.AllowMultiple);
+        Assert.IsFalse(_diagProcessor.Metadata.Value.AlwaysExecute);
+        Assert.IsFalse(_diagProcessor.Metadata.Value.IsAction);
+        Assert.IsFalse(_diagProcessor.Metadata.Value.IsSpecialCommand);
+        Assert.AreEqual(EnableDiagArgumentProcessor.CommandName, _diagProcessor.Metadata.Value.CommandName);
+        Assert.IsNull(_diagProcessor.Metadata.Value.ShortCommandName);
+        Assert.AreEqual(ArgumentProcessorPriority.Diag, _diagProcessor.Metadata.Value.Priority);
+        Assert.AreEqual(HelpContentPriority.EnableDiagArgumentProcessorHelpPriority, _diagProcessor.Metadata.Value.HelpPriority);
+        Assert.AreEqual(CommandLineResources.EnableDiagUsage, _diagProcessor.Metadata.Value.HelpContentResourceName);
+    }
 
-        [TestMethod]
-        [DataRow(null)]
-        [DataRow("  ")]
-        [DataRow("")]
-        public void EnableDiagArgumentProcessorExecutorThrowsIfDiagArgumentIsNullOrEmpty(string argument)
-        {
-            string exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidDiagArgument, argument);
-            EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(argument, exceptionMessage);
-        }
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("  ")]
+    [DataRow("")]
+    public void EnableDiagArgumentProcessorExecutorThrowsIfDiagArgumentIsNullOrEmpty(string argument)
+    {
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidDiagArgument, argument);
+        EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(argument, exceptionMessage);
+    }
 
-        [TestMethod]
-        public void EnableDiagArgumentProcessorExecutorDoesNotThrowsIfFileDotOpenThrow()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(Path.GetDirectoryName(this.dummyFilePath))).Returns(true);
+    [TestMethod]
+    public void EnableDiagArgumentProcessorExecutorDoesNotThrowsIfFileDotOpenThrow()
+    {
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(Path.GetDirectoryName(_dummyFilePath)!)).Returns(true);
 
-            this.diagProcessor.Executor.Value.Initialize(this.dummyFilePath);
-        }
+        _diagProcessor.Executor!.Value.Initialize(_dummyFilePath);
+    }
+
+    [TestMethod]
+    [DataRow("abc.txt;verbosity=normal=verbose")] // Multiple '=' in parameter
+    [DataRow("abc.txt;verbosity;key1=value1")] // No '=' in parameter
+    [DataRow("\"abst;dfsdc.txt\";verbosity=normal")] // Too many parameters
+    [DataRow("abs;dfsdc.txt;verbosity=normal")] // Too many parameters
+    public void EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(string argument)
+    {
+        string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidDiagArgument, argument);
+        EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(argument, exceptionMessage);
+    }
 
-        [TestMethod]
-        [DataRow("abc.txt;verbosity=normal=verbose")] // Multiple '=' in parameter
-        [DataRow("abc.txt;verbosity;key1=value1")] // No '=' in parameter
-        [DataRow("\"abst;dfsdc.txt\";verbosity=normal")] // Too many parameters
-        [DataRow("abs;dfsdc.txt;verbosity=normal")] // Too many parameters
-        public void EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(string argument)
+    [TestMethod]
+    [DataRow("abc.txt")]
+    [DataRow("abc.txt;verbosity=normal")]
+    [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
+    [DataRow("\"abc.txt\";verbosity=normal;newkey=newvalue")] //escaped double quotes are allowed for file path.
+    [DataRow(";;abc.txt;;;;verbosity=normal;;;;")]
+    // Files with no extension are totally valid files.
+    // When we delegate to host or datacollector we change the name in GetTimestampedLogFile
+    // Path.ChangeExtension replaces the curent extension with our new one that is timestamp and
+    // the name of the target (e.g. host). When there is no extension it just adds it, so we do either:
+    // log.txt -> log.host.21-09-10_12-25-41_68765_5.txt
+    // log.my.txt -> log.my.host.21-09-10_12-25-50_55183_5.txt
+    // log -> log.host.21-09-10_12-25-27_94286_5
+    [DataRow("log")]
+    [DataRow("log.log")]
+    public void EnableDiagArgumentProcessorExecutorShouldNotThrowIfValidArgument(string argument)
+    {
+        try
         {
-            string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.InvalidDiagArgument, argument);
-            EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(argument, exceptionMessage);
+            _diagProcessor.Executor!.Value.Initialize(argument);
         }
-
-        [TestMethod]
-        [DataRow("abc.txt")]
-        [DataRow("abc.txt;verbosity=normal")]
-        [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
-        [DataRow("\"abc.txt\";verbosity=normal;newkey=newvalue")] //escaped double quotes are allowed for file path.
-        [DataRow(";;abc.txt;;;;verbosity=normal;;;;")]
-        // Files with no extension are totally valid files.
-        // When we delegate to host or datacollector we change the name in GetTimestampedLogFile
-        // Path.ChangeExtension replaces the curent extension with our new one that is timestamp and 
-        // the name of the target (e.g. host). When there is no extension it just adds it, so we do either: 
-        // log.txt -> log.host.21-09-10_12-25-41_68765_5.txt
-        // log.my.txt -> log.my.host.21-09-10_12-25-50_55183_5.txt
-        // log -> log.host.21-09-10_12-25-27_94286_5
-        [DataRow("log")]
-        [DataRow("log.log")]
-        public void EnableDiagArgumentProcessorExecutorShouldNotThrowIfValidArgument(string argument)
+        catch (Exception ex)
         {
-            try
-            {
-                this.diagProcessor.Executor.Value.Initialize(argument);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail("Expected no exception, but got: " + ex.Message);
-            }
+            Assert.Fail("Expected no exception, but got: " + ex.Message);
         }
+    }
 
-        [TestMethod]
-        [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
-        [DataRow("abc.txt;tracelevel=info;")]
-        [DataRow("abc.txt;tracelevel=INfO")]
-        [DataRow("abc.txt;traCELevel=info")]
-        [DataRow("abc.txt;traCELevel=INfO")]
-        public void EnableDiagArgumentProcessorExecutorShouldInitializeTraceWithCorrectTraceLevel(string argument)
-        {
-            // Setting any trace level  other than info.
+    [TestMethod]
+    [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
+    [DataRow("abc.txt;tracelevel=info;")]
+    [DataRow("abc.txt;tracelevel=INfO")]
+    [DataRow("abc.txt;traCELevel=info")]
+    [DataRow("abc.txt;traCELevel=INfO")]
+    public void EnableDiagArgumentProcessorExecutorShouldInitializeTraceWithCorrectTraceLevel(string argument)
+    {
+        // Setting any trace level  other than info.
 #if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Verbose;
+        EqtTrace.TraceLevel = TraceLevel.Verbose;
 #else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
+        EqtTrace.TraceLevel = PlatformTraceLevel.Verbose;
 #endif
 
-            this.diagProcessor.Executor.Value.Initialize(argument);
-
-            Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
-            Assert.IsTrue(EqtTrace.LogFile.Contains("abc.txt"));
-        }
-
-        [TestMethod]
-        public void EnableDiagArgumentProcessorExecutorShouldCreateDirectoryOfLogFileIfNotExists()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(Path.GetDirectoryName(this.dummyFilePath))).Returns(false);
+        _diagProcessor.Executor!.Value.Initialize(argument);
 
-            this.diagProcessor.Executor.Value.Initialize(this.dummyFilePath);
+        Assert.AreEqual(TraceLevel.Info, (TraceLevel)EqtTrace.TraceLevel);
+        Assert.IsTrue(EqtTrace.LogFile?.Contains("abc.txt"));
+    }
 
-            this.mockFileHelper.Verify(fh => fh.CreateDirectory(Path.GetDirectoryName(this.dummyFilePath)), Times.Once);
-        }
+    [TestMethod]
+    public void EnableDiagArgumentProcessorExecutorShouldCreateDirectoryOfLogFileIfNotExists()
+    {
+        _mockFileHelper.Setup(fh => fh.DirectoryExists(Path.GetDirectoryName(_dummyFilePath)!)).Returns(false);
 
-        [TestMethod]
-        public void EnableDiagArgumentProcessorExecutorShouldNotCreateDirectoryIfAFileIsProvided()
-        {
-            this.diagProcessor.Executor.Value.Initialize("log.txt");
+        _diagProcessor.Executor!.Value.Initialize(_dummyFilePath);
 
-            this.mockFileHelper.Verify(fh => fh.CreateDirectory(It.IsAny<string>()), Times.Never);
-        }
+        _mockFileHelper.Verify(fh => fh.CreateDirectory(Path.GetDirectoryName(_dummyFilePath)!), Times.Once);
+    }
 
-        [TestMethod]
-        public void EnableDiagArgumentProcessorExecutorShouldDisableVerboseLoggingIfEqtTraceThowException()
-        {
-            this.mockFileHelper.Setup(fh => fh.DirectoryExists(Path.GetDirectoryName(this.dummyFilePath))).Returns(true);
-            this.diagProcessor.Executor.Value.Initialize(this.dummyFilePath);
+    [TestMethod]
+    public void EnableDiagArgumentProcessorExecutorShouldNotCreateDirectoryIfAFileIsProvided()
+    {
+        _diagProcessor.Executor!.Value.Initialize("log.txt");
 
-            Assert.IsFalse(EqtTrace.IsVerboseEnabled);
-#if NETFRAMEWORK
-            EqtTrace.TraceLevel = TraceLevel.Off;
-#else
-            EqtTrace.TraceLevel = PlatformTraceLevel.Off;
-#endif
-        }
+        _mockFileHelper.Verify(fh => fh.CreateDirectory(It.IsAny<string>()), Times.Never);
+    }
 
-        private class TestableEnableDiagArgumentProcessor : EnableDiagArgumentProcessor
+    private class TestableEnableDiagArgumentProcessor : EnableDiagArgumentProcessor
+    {
+        /// <inheritdoc/>
+        public TestableEnableDiagArgumentProcessor(IFileHelper fileHelper)
+            : base(fileHelper)
         {
-            /// <inheritdoc/>
-            public TestableEnableDiagArgumentProcessor(IFileHelper fileHelper)
-                : base(fileHelper)
-            {
-            }
         }
+    }
 
-        private void EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(string argument, string exceptionMessage)
-        {
-            var e = Assert.ThrowsException<CommandLineException>(() => this.diagProcessor.Executor.Value.Initialize(argument));
-            StringAssert.Contains(e.Message, exceptionMessage);
-        }
+    private void EnableDiagArgumentProcessorExecutorShouldThrowIfInvalidArgument(string argument, string exceptionMessage)
+    {
+        var e = Assert.ThrowsException<CommandLineException>(() => _diagProcessor.Executor!.Value.Initialize(argument));
+        StringAssert.Contains(e.Message, exceptionMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
index c7c7d367b2..40ef827514 100644
--- a/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnableLoggersArgumentProcessorTests.cs
@@ -1,92 +1,92 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using System;
-    using System.Globalization;
+using System;
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
 
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
 
-    [TestClass]
-    public class EnableLoggersArgumentProcessorTests
+[TestClass]
+public class EnableLoggersArgumentProcessorTests
+{
+    [TestInitialize]
+    public void Initialize()
     {
-        [TestInitialize]
-        public void Initialize()
-        {
-            RunTestsArgumentProcessorTests.SetupMockExtensions();
-        }
+        RunTestsArgumentProcessorTests.SetupMockExtensions();
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnEnableLoggerArgumentProcessorCapabilities()
-        {
-            EnableLoggerArgumentProcessor processor = new EnableLoggerArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is EnableLoggerArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnEnableLoggerArgumentProcessorCapabilities()
+    {
+        EnableLoggerArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is EnableLoggerArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnEnableLoggerArgumentExecutor()
-        {
-            EnableLoggerArgumentProcessor processor = new EnableLoggerArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is EnableLoggerArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnEnableLoggerArgumentExecutor()
+    {
+        EnableLoggerArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is EnableLoggerArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldAppropriateProperties()
-        {
-            EnableLoggerArgumentProcessorCapabilities capabilities = new EnableLoggerArgumentProcessorCapabilities();
-            Assert.AreEqual("/Logger", capabilities.CommandName);
+    [TestMethod]
+    public void CapabilitiesShouldAppropriateProperties()
+    {
+        EnableLoggerArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/Logger", capabilities.CommandName);
 #if NETFRAMEWORK
-            Assert.AreEqual("--logger|/logger:<Logger Uri/FriendlyName>" + Environment.NewLine + "      Specify a logger for test results. For example, to log results into a " + Environment.NewLine + "      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]" + Environment.NewLine + "      Creates file in TestResults directory with given LogFileName." + Environment.NewLine + "" + Environment.NewLine + "      Change the verbosity level in log messages for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;verbosity=<Defaults to \"normal\">" + Environment.NewLine + "      Allowed values for verbosity: quiet, minimal, normal and detailed." + Environment.NewLine + "" + Environment.NewLine + "      Change the diagnostic level prefix for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;prefix=<Defaults to \"false\">" + Environment.NewLine + "      More info on Console Logger here : https://aka.ms/console-logger", capabilities.HelpContentResourceName);
+        Assert.AreEqual("--logger|/logger:<Logger Uri/FriendlyName>" + Environment.NewLine + "      Specify a logger for test results. For example, to log results into a " + Environment.NewLine + "      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]" + Environment.NewLine + "      Creates file in TestResults directory with given LogFileName." + Environment.NewLine + "" + Environment.NewLine + "      Change the verbosity level in log messages for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;verbosity=<Defaults to \"normal\">" + Environment.NewLine + "      Allowed values for verbosity: quiet, minimal, normal and detailed." + Environment.NewLine + "" + Environment.NewLine + "      Change the diagnostic level prefix for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;prefix=<Defaults to \"false\">" + Environment.NewLine + "      More info on Console Logger here : https://aka.ms/console-logger", capabilities.HelpContentResourceName);
 #else
-            Assert.AreEqual("--logger|/logger:<Logger Uri/FriendlyName>" + Environment.NewLine + "      Specify a logger for test results. For example, to log results into a " + Environment.NewLine + "      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]" + Environment.NewLine + "      Creates file in TestResults directory with given LogFileName." + Environment.NewLine + "" + Environment.NewLine + "      Change the verbosity level in log messages for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;verbosity=<Defaults to \"minimal\">" + Environment.NewLine + "      Allowed values for verbosity: quiet, minimal, normal and detailed." + Environment.NewLine + "" + Environment.NewLine + "      Change the diagnostic level prefix for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;prefix=<Defaults to \"false\">" + Environment.NewLine + "      More info on Console Logger here : https://aka.ms/console-logger", capabilities.HelpContentResourceName);
+        Assert.AreEqual("--logger|/logger:<Logger Uri/FriendlyName>" + Environment.NewLine + "      Specify a logger for test results. For example, to log results into a " + Environment.NewLine + "      Visual Studio Test Results File (TRX) use /logger:trx[;LogFileName=<Defaults to unique file name>]" + Environment.NewLine + "      Creates file in TestResults directory with given LogFileName." + Environment.NewLine + "" + Environment.NewLine + "      Change the verbosity level in log messages for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;verbosity=<Defaults to \"minimal\">" + Environment.NewLine + "      Allowed values for verbosity: quiet, minimal, normal and detailed." + Environment.NewLine + "" + Environment.NewLine + "      Change the diagnostic level prefix for console logger as shown below" + Environment.NewLine + "      Example: /logger:console;prefix=<Defaults to \"false\">" + Environment.NewLine + "      More info on Console Logger here : https://aka.ms/console-logger", capabilities.HelpContentResourceName);
 #endif
 
-            Assert.AreEqual(HelpContentPriority.EnableLoggerArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Logging, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.EnableLoggerArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Logging, capabilities.Priority);
 
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        [DataRow("  ")]
-        [DataRow(null)]
-        [DataRow("TestLoggerExtension;==;;;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1")]
-        public void ExectorInitializeShouldThrowExceptionIfInvalidArgumentIsPassed(string argument)
+    [TestMethod]
+    [DataRow("  ")]
+    [DataRow(null)]
+    [DataRow("TestLoggerExtension;==;;;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1")]
+    public void ExectorInitializeShouldThrowExceptionIfInvalidArgumentIsPassed(string argument)
+    {
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        try
         {
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            try
-            {
-                executor.Initialize(argument);
-            }
-            catch (Exception e)
-            {
-                string exceptionMessage = string.Format(CultureInfo.CurrentUICulture, CommandLineResources.LoggerUriInvalid, argument);
-                Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
-                Assert.IsTrue(e.Message.Contains(exceptionMessage));
-            }
+            executor.Initialize(argument);
         }
-
-        [TestMethod]
-        public void ExecutorExecuteShouldReturnArgumentProcessorResultSuccess()
+        catch (Exception e)
         {
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            var result = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
+            string exceptionMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.LoggerUriInvalid, argument);
+            Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
+            Assert.IsTrue(e.Message.Contains(exceptionMessage));
         }
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldAddLoggerWithFriendlyNameInRunSettingsIfNamePresentInArg()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorExecuteShouldReturnArgumentProcessorResultSuccess()
+    {
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        var result = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
+    }
+
+    [TestMethod]
+    public void ExecutorInitializeShouldAddLoggerWithFriendlyNameInRunSettingsIfNamePresentInArg()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -98,15 +98,15 @@ public void ExecutorInitializeShouldAddLoggerWithFriendlyNameInRunSettingsIfName
                   </DataCollectionRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("DummyLoggerExtension");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("DummyLoggerExtension");
 
-            string expectedSettingsXml =
-@"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -123,14 +123,14 @@ public void ExecutorInitializeShouldAddLoggerWithFriendlyNameInRunSettingsIfName
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldAddLoggerWithUriInRunSettingsIfUriPresentInArg()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldAddLoggerWithUriInRunSettingsIfUriPresentInArg()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -142,15 +142,15 @@ public void ExecutorInitializeShouldAddLoggerWithUriInRunSettingsIfUriPresentInA
                   </DataCollectionRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("logger://DummyLoggerUri");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("logger://DummyLoggerUri");
 
-            string expectedSettingsXml =
-@"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -167,14 +167,14 @@ public void ExecutorInitializeShouldAddLoggerWithUriInRunSettingsIfUriPresentInA
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldCorrectlyAddLoggerParametersInRunSettings()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldCorrectlyAddLoggerParametersInRunSettings()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -186,15 +186,15 @@ public void ExecutorInitializeShouldCorrectlyAddLoggerParametersInRunSettings()
                   </DataCollectionRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
 
-            string expectedSettingsXml =
-@"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -217,19 +217,19 @@ public void ExecutorInitializeShouldCorrectlyAddLoggerParametersInRunSettings()
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldCorrectlyAddLoggerWhenRunSettingsNotPassed()
-        {
-            RunSettingsManager.Instance.SetActiveRunSettings(new RunSettings());
+    [TestMethod]
+    public void ExecutorInitializeShouldCorrectlyAddLoggerWhenRunSettingsNotPassed()
+    {
+        RunSettingsManager.Instance.SetActiveRunSettings(new RunSettings());
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
 
-            string expectedSettingsXml =
-                @"
+        string expectedSettingsXml =
+            @"
   <LoggerRunSettings>
     <Loggers>
       <Logger uri=""logger://dummyloggeruri/"" enabled=""True"">
@@ -241,14 +241,14 @@ public void ExecutorInitializeShouldCorrectlyAddLoggerWhenRunSettingsNotPassed()
       </Logger>
     </Loggers>
   </LoggerRunSettings>";
-            Assert.IsTrue(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml.Contains(expectedSettingsXml));
-        }
+        Assert.IsTrue(RunSettingsManager.Instance.ActiveRunSettings!.SettingsXml!.Contains(expectedSettingsXml));
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldCorrectlyAddLoggerInRunSettingsWhenOtherLoggersAlreadyPresent()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldCorrectlyAddLoggerInRunSettingsWhenOtherLoggersAlreadyPresent()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -274,15 +274,15 @@ public void ExecutorInitializeShouldCorrectlyAddLoggerInRunSettingsWhenOtherLogg
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollection;TeamProject=MyProject;BuildName=DailyBuild_20121130.1");
 
-            string expectedSettingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -314,14 +314,14 @@ public void ExecutorInitializeShouldCorrectlyAddLoggerInRunSettingsWhenOtherLogg
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLoggerIfSame()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLoggerIfSame()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -347,15 +347,15 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLogger
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("tempLogger2");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("tempLogger2");
 
-            string expectedSettingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -380,14 +380,14 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLogger
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLoggerEvenIfCaseMismatch()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLoggerEvenIfCaseMismatch()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -413,15 +413,15 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLogger
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("tempLoggER2");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("tempLoggER2");
 
-            string expectedSettingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -446,14 +446,14 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerOverRunSettingsLogger
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeShouldPreferCommandLineLoggerWithParamsOverRunSettingsLoggerIfSame()
-        {
-            string settingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-8""?>
+    [TestMethod]
+    public void ExecutorInitializeShouldPreferCommandLineLoggerWithParamsOverRunSettingsLoggerIfSame()
+    {
+        string settingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-8""?>
                 <RunSettings>
                   <RunConfiguration>
                   </RunConfiguration>
@@ -487,15 +487,15 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerWithParamsOverRunSett
                   </LoggerRunSettings>
                 </RunSettings>";
 
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(settingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(settingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
 
-            var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
-            executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollectionOverride;TeamProjectOverride=MyProject;BuildName=DailyBuild_20121130.1Override;NewAttr=value");
+        var executor = new EnableLoggerArgumentExecutor(RunSettingsManager.Instance);
+        executor.Initialize("logger://DummyLoggerUri;Collection=http://localhost:8080/tfs/DefaultCollectionOverride;TeamProjectOverride=MyProject;BuildName=DailyBuild_20121130.1Override;NewAttr=value");
 
-            string expectedSettingsXml =
-                @"<?xml version=""1.0"" encoding=""utf-16""?>
+        string expectedSettingsXml =
+            @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RunSettings>
   <RunConfiguration>
   </RunConfiguration>
@@ -528,7 +528,6 @@ public void ExecutorInitializeShouldPreferCommandLineLoggerWithParamsOverRunSett
   </LoggerRunSettings>
 </RunSettings>";
 
-            Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
-        }
+        Assert.AreEqual(expectedSettingsXml, RunSettingsManager.Instance.ActiveRunSettings?.SettingsXml);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/EnvironmentArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/EnvironmentArgumentProcessorTests.cs
index 524a9cb0d4..dd19bc886f 100644
--- a/test/vstest.console.UnitTests/Processors/EnvironmentArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/EnvironmentArgumentProcessorTests.cs
@@ -1,205 +1,207 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System.Globalization;
+using System.Linq;
+using System.Xml.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.UnitTests.Processors;
+
+using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class EnvironmentArgumentProcessorTests
 {
-    using System;
-    using System.Linq;
-    using System.Xml.Linq;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using vstest.console.UnitTests.Processors;
-    using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources;
-
-    [TestClass]
-    public class EnvironmentArgumentProcessorTests
+    private const string DefaultRunSettings =
+        "<?xml version=\"1.0\" encoding=\"utf-16\"?><RunSettings></RunSettings>";
+
+    private readonly TestableRunSettingsProvider _settingsProvider;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly CommandLineOptions _commandLineOptions;
+
+    public EnvironmentArgumentProcessorTests()
     {
-        private const string DefaultRunSettings =
-            "<?xml version=\"1.0\" encoding=\"utf-16\"?><RunSettings></RunSettings>";
+        _commandLineOptions = CommandLineOptions.Instance;
+        _settingsProvider = new TestableRunSettingsProvider();
+        _settingsProvider.UpdateRunSettings(DefaultRunSettings);
+        _mockOutput = new Mock<IOutput>();
+    }
 
-        private TestableRunSettingsProvider settingsProvider;
-        private Mock<IOutput> mockOutput;
-        private CommandLineOptions commandLineOptions;
+    [TestCleanup]
+    public void Cleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        [TestInitialize]
-        public void Initialize()
-        {
-            this.commandLineOptions = CommandLineOptions.Instance;
-            this.settingsProvider = new TestableRunSettingsProvider();
-            this.settingsProvider.UpdateRunSettings(DefaultRunSettings);
-            this.mockOutput = new Mock<IOutput>();
-        }
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateValues()
+    {
+        // Arrange & Act
+        var capabilities = new EnvironmentArgumentProcessor.ArgumentProcessorCapabilities();
+
+        // Assert
+        Assert.AreEqual("/Environment", capabilities.CommandName);
+        Assert.AreEqual("/e", capabilities.ShortCommandName);
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.EnvironmentArgumentProcessorHelpPriority, capabilities.HelpPriority);
+    }
 
-        [TestCleanup]
-        public void Cleanup()
-        {
-            this.commandLineOptions.Reset();
-        }
+    [TestMethod]
+    public void AppendsEnvironmentVariableToRunSettings()
+    {
+        // Arrange
+        var executor = GetExecutor();
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateValues()
-        {
-            // Arrange & Act
-            var capabilities = new EnvironmentArgumentProcessor.ArgumentProcessorCapabilities();
-
-            // Assert
-            Assert.AreEqual("/Environment", capabilities.CommandName);
-            Assert.AreEqual("/e", capabilities.ShortCommandName);
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
-            Assert.AreEqual(HelpContentPriority.EnvironmentArgumentProcessorHelpPriority, capabilities.HelpPriority);
-        }
+        // Act
+        executor.Initialize("VARIABLE=VALUE");
 
-        [TestMethod]
-        public void AppendsEnvironmentVariableToRunSettings()
-        {
-            // Arrange
-            var executor = GetExecutor();
+        // Assert
+        var result = ParseSettingsXml(_settingsProvider);
+        var environmentVariables = result.Variables;
+        var inIsolation = result.InIsolation;
 
-            // Act
-            executor.Initialize("VARIABLE=VALUE");
+        Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
+        Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
 
-            // Assert
-            var result = ParseSettingsXML(this.settingsProvider);
-            var environmentVariables = result.variables;
-            var inIsolation = result.inIsolation;
-            var variables = environmentVariables?.Elements()?.ToArray();
+        var variables = environmentVariables.Elements().ToArray();
+        Assert.AreEqual(1, variables.Length, "Environment variable count mismatched!");
 
-            Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
-            Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
-            Assert.AreEqual(1, variables?.Length ?? 0, "Environment variable count mismatched!");
+        Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is not set to true.");
+        Assert.AreEqual("VARIABLE", variables[0].Name.LocalName);
+        Assert.AreEqual("VALUE", variables[0].Value);
 
-            Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is not set to true.");
-            Assert.AreEqual("VARIABLE", variables[0].Name.LocalName);
-            Assert.AreEqual("VALUE", variables[0].Value);
+    }
 
-        }
+    [TestMethod]
+    public void AppendsMultipleEnvironmentVariablesToRunSettings()
+    {
+        // Arrange
+        var executor1 = GetExecutor();
+        var executor2 = GetExecutor();
+        var executor3 = GetExecutor();
 
-        [TestMethod]
-        public void AppendsMultipleEnvironmentVariablesToRunSettings()
-        {
-            // Arrange
-            var executor1 = GetExecutor(); 
-            var executor2 = GetExecutor(); 
-            var executor3 = GetExecutor(); 
+        // Act
+        executor1.Initialize("VARIABLE_ONE=VALUE");
+        executor2.Initialize("VARIABLE_TWO=VALUE WITH SPACE");
+        executor3.Initialize("VARIABLE_THREE=VALUE WITH SPACE;AND SEMICOLON");
 
-            // Act
-            executor1.Initialize("VARIABLE_ONE=VALUE");
-            executor2.Initialize("VARIABLE_TWO=VALUE WITH SPACE");
-            executor3.Initialize("VARIABLE_THREE=VALUE WITH SPACE;AND SEMICOLON");
+        // Assert
+        var result = ParseSettingsXml(_settingsProvider);
+        var environmentVariables = result.Variables;
+        var inIsolation = result.InIsolation;
 
-            // Assert
-            var result = ParseSettingsXML(this.settingsProvider);
-            var environmentVariables = result.variables;
-            var inIsolation = result.inIsolation;
-            var variables = environmentVariables?.Elements()?.ToArray();
+        Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
+        Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
 
-            Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
-            Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
+        Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is not set to true.");
+        var variables = environmentVariables.Elements().ToArray();
+        Assert.AreEqual(3, variables.Length, "Environment variable count mismatched!");
 
-            Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is not set to true.");
-            Assert.AreEqual(3, variables?.Length ?? 0, "Environment variable count mismatched!");
+        Assert.AreEqual("VARIABLE_ONE", variables[0].Name.LocalName);
+        Assert.AreEqual("VALUE", variables[0].Value);
 
-            Assert.AreEqual("VARIABLE_ONE", variables[0].Name.LocalName);
-            Assert.AreEqual("VALUE", variables[0].Value);
+        Assert.AreEqual("VARIABLE_TWO", variables[1].Name.LocalName);
+        Assert.AreEqual("VALUE WITH SPACE", variables[1].Value);
 
-            Assert.AreEqual("VARIABLE_TWO", variables[1].Name.LocalName);
-            Assert.AreEqual("VALUE WITH SPACE", variables[1].Value);
+        Assert.AreEqual("VARIABLE_THREE", variables[2].Name.LocalName);
+        Assert.AreEqual("VALUE WITH SPACE;AND SEMICOLON", variables[2].Value);
+    }
 
-            Assert.AreEqual("VARIABLE_THREE", variables[2].Name.LocalName);
-            Assert.AreEqual("VALUE WITH SPACE;AND SEMICOLON", variables[2].Value);
-        }
+    [TestMethod]
+    public void InIsolationValueShouldBeOverriden()
+    {
+        // Arrange
+        _commandLineOptions.InIsolation = false;
+        _settingsProvider.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "false");
+        var executor = GetExecutor();
 
-        [TestMethod]
-        public void InIsolationValueShouldBeOverriden()
-        {
-            // Arrange
-            this.commandLineOptions.InIsolation = false;
-            this.settingsProvider.UpdateRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath, "false");
-            var executor = GetExecutor();
+        // Act
+        executor.Initialize("VARIABLE=VALUE");
 
-            // Act
-            executor.Initialize("VARIABLE=VALUE");
+        // Assert
+        var result = ParseSettingsXml(_settingsProvider);
+        var environmentVariables = result.Variables;
+        var inIsolation = result.InIsolation;
 
-            // Assert
-            var result = ParseSettingsXML(this.settingsProvider);
-            var environmentVariables = result.variables;
-            var inIsolation = result.inIsolation;
-            var variables = environmentVariables?.Elements()?.ToArray();
+        Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
+        Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
 
-            Assert.IsNotNull(environmentVariables, "Environment variable cannot found in RunSettings.xml.");
-            Assert.IsNotNull(inIsolation, "Isolation must be forced, an InIsolation entry was missing!");
+        Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is overriden to true.");
+        var variables = environmentVariables.Elements().ToArray();
+        Assert.AreEqual(1, variables.Length, "Environment variable count mismatched!");
 
-            Assert.AreEqual("true", inIsolation.Value, "Isolation must be forced, InIsolation is overriden to true.");
-            Assert.AreEqual(1, variables?.Length ?? 0, "Environment variable count mismatched!");
+        Assert.AreEqual("VARIABLE", variables[0].Name.LocalName);
+        Assert.AreEqual("VALUE", variables[0].Value);
+    }
 
-            Assert.AreEqual("VARIABLE", variables[0].Name.LocalName);
-            Assert.AreEqual("VALUE", variables[0].Value);
-        }
+    [TestMethod]
+    public void ShouldWarnWhenAValueIsOverriden()
+    {
+        // Arrange
+        _settingsProvider.UpdateRunSettingsNode("RunConfiguration.EnvironmentVariables.VARIABLE",
+            "Initial value");
+        var warningMessage = string.Format(CultureInfo.CurrentCulture, CommandLineResources.CommandLineWarning,
+            string.Format(CultureInfo.CurrentCulture, CommandLineResources.EnvironmentVariableXIsOverriden, "VARIABLE")
+        );
+        _mockOutput.Setup(mock =>
+            mock.WriteLine(
+                It.Is<string>(message => message == warningMessage),
+                It.Is<OutputLevel>(level => level == OutputLevel.Warning)
+            )
+        ).Verifiable();
+        var executor = GetExecutor();
+
+        // Act
+        executor.Initialize("VARIABLE=New value");
+
+        // Assert
+        _mockOutput.VerifyAll();
+    }
 
-        [TestMethod]
-        public void ShoudWarnWhenAValueIsOverriden()
-        {
-            // Arrange
-            this.settingsProvider.UpdateRunSettingsNode("RunConfiguration.EnvironmentVariables.VARIABLE",
-                "Initial value");
-            var warningMessage = String.Format(CommandLineResources.CommandLineWarning,
-                    String.Format(CommandLineResources.EnvironmentVariableXIsOverriden, "VARIABLE")
-                );
-            this.mockOutput.Setup(mock =>
-                mock.WriteLine(
-                    It.Is<string>(message => message == warningMessage),
-                    It.Is<OutputLevel>(level => level == OutputLevel.Warning)
-                )
-            ).Verifiable();
-            var executor = GetExecutor();
-            
-            // Act
-            executor.Initialize("VARIABLE=New value");
-
-            // Assert
-            this.mockOutput.VerifyAll();
-        }
+    private static XmlParseResult ParseSettingsXml(IRunSettingsProvider provider)
+    {
+        var document = XDocument.Parse(provider.ActiveRunSettings!.SettingsXml!);
 
-        private XmlParseResult ParseSettingsXML(IRunSettingsProvider provider)
-        {
-            var document = XDocument.Parse(provider.ActiveRunSettings.SettingsXml);
+        var runConfiguration = document
+            ?.Root
+            ?.Element("RunConfiguration");
 
-            var runConfiguration = document
-                                ?.Root
-                                ?.Element("RunConfiguration");
+        var variables = runConfiguration?.Element("EnvironmentVariables");
+        var inIsolation = runConfiguration?.Element("InIsolation");
 
-            var variables = runConfiguration?.Element("EnvironmentVariables");
-            var inIsolation = runConfiguration?.Element("InIsolation");
+        return new XmlParseResult(variables, inIsolation);
+    }
 
-            return new XmlParseResult(variables, inIsolation);
-        }
+    private IArgumentExecutor GetExecutor()
+    {
+        return new EnvironmentArgumentProcessor.ArgumentExecutor(
+            _commandLineOptions,
+            _settingsProvider,
+            _mockOutput.Object
+        );
+    }
 
-        private IArgumentExecutor GetExecutor()
+    private class XmlParseResult
+    {
+        public XmlParseResult(XElement? variables, XElement? inIsolation)
         {
-            return new EnvironmentArgumentProcessor.ArgumentExecutor(
-               this.commandLineOptions,
-               this.settingsProvider,
-               mockOutput.Object
-            );
+            Variables = variables;
+            InIsolation = inIsolation;
         }
 
-        private class XmlParseResult
-        {
-            public XmlParseResult(XElement variables, XElement inIsolation)
-            {
-                this.variables = variables;
-                this.inIsolation = inIsolation;
-            }
-
-            internal XElement variables;
-            internal XElement inIsolation;
-        }
+        internal readonly XElement? Variables;
+        internal readonly XElement? InIsolation;
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs
index 018638fd23..69d8e91974 100644
--- a/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs
@@ -1,141 +1,138 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class FrameworkArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using TestPlatform.CommandLine.Processors;
-    using vstest.console.UnitTests.Processors;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+    private readonly FrameworkArgumentExecutor _executor;
+    private readonly TestableRunSettingsProvider _runSettingsProvider;
+
+    public FrameworkArgumentProcessorTests()
+    {
+        _runSettingsProvider = new TestableRunSettingsProvider();
+        _executor = new FrameworkArgumentExecutor(CommandLineOptions.Instance, _runSettingsProvider);
+    }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnFrameworkArgumentProcessorCapabilities()
+    {
+        var processor = new FrameworkArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is FrameworkArgumentProcessorCapabilities);
+    }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnFrameworkArgumentExecutor()
+    {
+        var processor = new FrameworkArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is FrameworkArgumentExecutor);
+    }
+
+    #region FrameworkArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new FrameworkArgumentProcessorCapabilities();
+        Assert.AreEqual("/Framework", capabilities.CommandName);
+        StringAssert.Contains(capabilities.HelpContentResourceName, "Valid values are \".NETFramework,Version=v4.5.1\", \".NETCoreApp,Version=v1.0\"");
+
+        Assert.AreEqual(HelpContentPriority.FrameworkArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region FrameworkArgumentExecutor Initialize tests
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
+    {
+
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize(null),
+            "The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:\".NETFramework,Version=v4.5.1\"");
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsEmpty()
+    {
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("  "),
+            "The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:\".NETFramework,Version=v4.5.1\"");
+    }
 
-    using ExceptionUtilities = Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.ExceptionUtilities;
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsInvalid()
+    {
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("foo"),
+            "Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.",
+            "foo");
+    }
 
-    [TestClass]
-    public class FrameworkArgumentProcessorTests
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsAndRunSettingsFramework()
     {
-        private FrameworkArgumentExecutor executor;
-        private TestableRunSettingsProvider runSettingsProvider;
-
-        [TestInitialize]
-        public void Init()
-        {
-            this.runSettingsProvider = new TestableRunSettingsProvider();
-            this.executor = new FrameworkArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider);
-        }
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnFrameworkArgumentProcessorCapabilities()
-        {
-            var processor = new FrameworkArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is FrameworkArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnFrameworkArgumentExecutor()
-        {
-            var processor = new FrameworkArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is FrameworkArgumentExecutor);
-        }
-
-        #region FrameworkArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new FrameworkArgumentProcessorCapabilities();
-            Assert.AreEqual("/Framework", capabilities.CommandName);
-            StringAssert.Contains(capabilities.HelpContentResourceName, "Valid values are \".NETFramework,Version=v4.5.1\", \".NETCoreApp,Version=v1.0\"");
-
-            Assert.AreEqual(HelpContentPriority.FrameworkArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region FrameworkArgumentExecutor Initialize tests
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNull()
-        {
-
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize(null),
-                "The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:\".NETFramework,Version=v4.5.1\"");
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsEmpty()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => executor.Initialize("  "),
-                "The /Framework argument requires the target .Net Framework version for the test run.   Example:  /Framework:\".NETFramework,Version=v4.5.1\"");
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsInvalid()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("foo"),
-                "Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework(Example: .NETCoreApp,Version=v2.0). Other supported .Net Framework versions are Framework40, Framework45, FrameworkCore10 and FrameworkUap10.",
-                "foo");
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsAndRunSettingsFramework()
-        {
-            this.executor.Initialize(".NETCoreApp,Version=v1.0");
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", CommandLineOptions.Instance.TargetFrameworkVersion.Name);
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", this.runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsFrameworkForOlderFrameworks()
-        {
-            this.executor.Initialize("Framework35");
-            Assert.AreEqual(".NETFramework,Version=v3.5", CommandLineOptions.Instance.TargetFrameworkVersion.Name);
-            Assert.AreEqual(".NETFramework,Version=v3.5", this.runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsFrameworkForCaseInsensitiveFramework()
-        {
-            this.executor.Initialize(".netcoreApp,Version=v1.0");
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", CommandLineOptions.Instance.TargetFrameworkVersion.Name);
-            Assert.AreEqual(".NETCoreApp,Version=v1.0", this.runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotSetFrameworkIfSettingsFileIsLegacy()
-        {
-            this.runSettingsProvider.UpdateRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath, nameof(FrameworkVersion.Framework45));
-            CommandLineOptions.Instance.SettingsFile = @"c:\tmp\settings.testsettings";
-            this.executor.Initialize(".NETFramework,Version=v3.5");
-            Assert.AreEqual(".NETFramework,Version=v3.5", CommandLineOptions.Instance.TargetFrameworkVersion.Name);
-            Assert.AreEqual(nameof(FrameworkVersion.Framework45), this.runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
-        }
-
-        #endregion
-
-        #region FrameworkArgumentExecutor Execute tests
-
-        [TestMethod]
-        public void ExecuteShouldReturnSuccess()
-        {
-            Assert.AreEqual(ArgumentProcessorResult.Success, this.executor.Execute());
-        }
-
-        #endregion
+        _executor.Initialize(".NETCoreApp,Version=v1.0");
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", CommandLineOptions.Instance.TargetFrameworkVersion!.Name);
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", _runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
+    }
 
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsFrameworkForOlderFrameworks()
+    {
+        _executor.Initialize("Framework35");
+        Assert.AreEqual(".NETFramework,Version=v3.5", CommandLineOptions.Instance.TargetFrameworkVersion!.Name);
+        Assert.AreEqual(".NETFramework,Version=v3.5", _runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
     }
+
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsFrameworkForCaseInsensitiveFramework()
+    {
+        _executor.Initialize(".netcoreApp,Version=v1.0");
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", CommandLineOptions.Instance.TargetFrameworkVersion!.Name);
+        Assert.AreEqual(".NETCoreApp,Version=v1.0", _runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotSetFrameworkIfSettingsFileIsLegacy()
+    {
+        _runSettingsProvider.UpdateRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath, nameof(FrameworkVersion.Framework45));
+        CommandLineOptions.Instance.SettingsFile = @"c:\tmp\settings.testsettings";
+        _executor.Initialize(".NETFramework,Version=v3.5");
+        Assert.AreEqual(".NETFramework,Version=v3.5", CommandLineOptions.Instance.TargetFrameworkVersion!.Name);
+        Assert.AreEqual(nameof(FrameworkVersion.Framework45), _runSettingsProvider.QueryRunSettingsNode(FrameworkArgumentExecutor.RunSettingsPath));
+    }
+
+    #endregion
+
+    #region FrameworkArgumentExecutor Execute tests
+
+    [TestMethod]
+    public void ExecuteShouldReturnSuccess()
+    {
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
+
+    #endregion
+
 }
diff --git a/test/vstest.console.UnitTests/Processors/HelpArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/HelpArgumentProcessorTests.cs
index 9dd22f9691..333d6ece1c 100644
--- a/test/vstest.console.UnitTests/Processors/HelpArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/HelpArgumentProcessorTests.cs
@@ -1,101 +1,101 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class HelpArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
+    /// <summary>
+    /// The help argument processor get metadata should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetMetadataShouldReturnHelpArgumentProcessorCapabilities()
+    {
+        HelpArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is HelpArgumentProcessorCapabilities);
+    }
+
+    /// <summary>
+    /// The help argument processor get executer should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetExecuterShouldReturnHelpArgumentProcessorCapabilities()
+    {
+        HelpArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is HelpArgumentExecutor);
+    }
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    #region HelpArgumentProcessorCapabilitiesTests
+
+    [TestMethod]
+    public void CapabilitiesShouldAppropriateProperties()
+    {
+        HelpArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/Help", capabilities.CommandName);
+        Assert.AreEqual("-?|--Help|/?|/Help" + Environment.NewLine + "      Display this usage message.", capabilities.HelpContentResourceName);
+
+        Assert.AreEqual(HelpContentPriority.HelpArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Help, capabilities.Priority);
+
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    [TestMethod]
+    public void ExecuterExecuteReturnArgumentProcessorResultAbort()
+    {
+        HelpArgumentExecutor executor = new();
+        var result = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Abort, result);
+    }
+
+    [TestMethod]
+    public void ExecuterExecuteWritesAppropriateDataToConsole()
+    {
+        HelpArgumentExecutor executor = new();
+        var output = new DummyConsoleOutput();
+        executor.Output = output;
+        _ = executor.Execute();
+        Assert.IsTrue(output.Lines.Contains("Usage: vstest.console.exe [Arguments] [Options] [[--] <RunSettings arguments>...]]"));
+        Assert.IsTrue(output.Lines.Contains("Arguments:"));
+        Assert.IsTrue(output.Lines.Contains("Options:"));
+        Assert.IsTrue(output.Lines.Contains("Description: Runs tests from the specified files."));
+        Assert.IsTrue(output.Lines.Contains("  To run tests:" + Environment.NewLine + "    >vstest.console.exe tests.dll " + Environment.NewLine + "  To run tests with additional settings such as  data collectors:" + Environment.NewLine + "    >vstest.console.exe  tests.dll /Settings:Local.RunSettings"));
+    }
+}
+
+internal class DummyConsoleOutput : IOutput
+{
+    /// <summary>
+    /// The lines.
+    /// </summary>
+    internal List<string?> Lines;
+
+    public DummyConsoleOutput()
+    {
+        Lines = new List<string?>();
+    }
 
-    [TestClass]
-    public class HelpArgumentProcessorTests
+    public void WriteLine(string? message, OutputLevel level)
     {
-        /// <summary>
-        /// The help argument processor get metadata should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetMetadataShouldReturnHelpArgumentProcessorCapabilities()
-        {
-            HelpArgumentProcessor processor = new HelpArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is HelpArgumentProcessorCapabilities);
-        }
-
-        /// <summary>
-        /// The help argument processor get executer should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetExecuterShouldReturnHelpArgumentProcessorCapabilities()
-        {
-            HelpArgumentProcessor processor = new HelpArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is HelpArgumentExecutor);
-        }
-
-        #region HelpArgumentProcessorCapabilitiesTests
-
-        [TestMethod]
-        public void CapabilitiesShouldAppropriateProperties()
-        {
-            HelpArgumentProcessorCapabilities capabilities = new HelpArgumentProcessorCapabilities();
-            Assert.AreEqual("/Help", capabilities.CommandName);
-            Assert.AreEqual("-?|--Help|/?|/Help" + Environment.NewLine + "      Display this usage message.", capabilities.HelpContentResourceName);
-
-            Assert.AreEqual(HelpContentPriority.HelpArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Help, capabilities.Priority);
-
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        [TestMethod]
-        public void ExecuterExecuteReturnArgumentProcessorResultAbort()
-        {
-            HelpArgumentExecutor executor = new HelpArgumentExecutor();
-            var result = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Abort, result);
-        }
-
-        [TestMethod]
-        public void ExecuterExecuteWritesAppropriateDataToConsole()
-        {
-            HelpArgumentExecutor executor = new HelpArgumentExecutor();
-            var output = new DummyConsoleOutput();
-            executor.Output = output;
-            var result = executor.Execute();
-            Assert.IsTrue(output.Lines.Contains("Usage: vstest.console.exe [Arguments] [Options] [[--] <RunSettings arguments>...]]"));
-            Assert.IsTrue(output.Lines.Contains("Arguments:"));
-            Assert.IsTrue(output.Lines.Contains("Options:"));
-            Assert.IsTrue(output.Lines.Contains("Description: Runs tests from the specified files."));
-            Assert.IsTrue(output.Lines.Contains("  To run tests:" + Environment.NewLine + "    >vstest.console.exe tests.dll " + Environment.NewLine + "  To run tests with additional settings such as  data collectors:" + Environment.NewLine + "    >vstest.console.exe  tests.dll /Settings:Local.RunSettings"));
-        }
+        Lines.Add(message);
     }
 
-    internal class DummyConsoleOutput : IOutput
+    public void Write(string? message, OutputLevel level)
     {
-        /// <summary>
-        /// The lines.
-        /// </summary>
-        internal List<string> Lines;
-
-        public DummyConsoleOutput()
-        {
-            this.Lines = new List<string>();
-        }
-
-        public void WriteLine(string message, OutputLevel level)
-        {
-            this.Lines.Add(message);
-        }
-
-        public void Write(string message, OutputLevel level)
-        {
-            throw new System.NotImplementedException();
-        }
+        throw new NotImplementedException();
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/InIsolationArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/InIsolationArgumentProcessorTests.cs
index 59632690eb..2889fe8e0f 100644
--- a/test/vstest.console.UnitTests/Processors/InIsolationArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/InIsolationArgumentProcessorTests.cs
@@ -1,85 +1,83 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using System;
-    using vstest.console.UnitTests.Processors;
+using System;
 
-    using ExceptionUtilities = Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.ExceptionUtilities;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class InIsolationArgumentProcessorTests
-    {
-        private InIsolationArgumentExecutor executor;
-        private TestableRunSettingsProvider runSettingsProvider;
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class InIsolationArgumentProcessorTests
+{
+    private readonly InIsolationArgumentExecutor _executor;
+    private readonly TestableRunSettingsProvider _runSettingsProvider;
 
-        [TestInitialize]
-        public void Init()
-        {
-            this.runSettingsProvider = new TestableRunSettingsProvider();
-            this.executor = new InIsolationArgumentExecutor(CommandLineOptions.Instance, this.runSettingsProvider);
-        }
+    public InIsolationArgumentProcessorTests()
+    {
+        _runSettingsProvider = new TestableRunSettingsProvider();
+        _executor = new InIsolationArgumentExecutor(CommandLineOptions.Instance, _runSettingsProvider);
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnInProcessArgumentProcessorCapabilities()
-        {
-            var processor = new InIsolationArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is InIsolationArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnInProcessArgumentProcessorCapabilities()
+    {
+        var processor = new InIsolationArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is InIsolationArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnInProcessArgumentExecutor()
-        {
-            var processor = new InIsolationArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is InIsolationArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnInProcessArgumentExecutor()
+    {
+        var processor = new InIsolationArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is InIsolationArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void InIsolationArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
-        {
-            var isolationProcessor = new InIsolationArgumentProcessor();
-            Assert.IsFalse(isolationProcessor.Metadata.Value.AllowMultiple);
-            Assert.IsFalse(isolationProcessor.Metadata.Value.AlwaysExecute);
-            Assert.IsFalse(isolationProcessor.Metadata.Value.IsAction);
-            Assert.IsFalse(isolationProcessor.Metadata.Value.IsSpecialCommand);
-            Assert.AreEqual(InIsolationArgumentProcessor.CommandName, isolationProcessor.Metadata.Value.CommandName);
-            Assert.IsNull(isolationProcessor.Metadata.Value.ShortCommandName);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, isolationProcessor.Metadata.Value.Priority);
-            Assert.AreEqual(HelpContentPriority.InIsolationArgumentProcessorHelpPriority, isolationProcessor.Metadata.Value.HelpPriority);
-            Assert.AreEqual("--InIsolation|/InIsolation" + Environment.NewLine + "      Runs the tests in an isolated process. This makes vstest.console.exe " + Environment.NewLine + "      process less likely to be stopped on an error in the tests, but tests " + Environment.NewLine + "      may run slower.", isolationProcessor.Metadata.Value.HelpContentResourceName);
-        }
+    [TestMethod]
+    public void InIsolationArgumentProcessorMetadataShouldProvideAppropriateCapabilities()
+    {
+        var isolationProcessor = new InIsolationArgumentProcessor();
+        Assert.IsFalse(isolationProcessor.Metadata.Value.AllowMultiple);
+        Assert.IsFalse(isolationProcessor.Metadata.Value.AlwaysExecute);
+        Assert.IsFalse(isolationProcessor.Metadata.Value.IsAction);
+        Assert.IsFalse(isolationProcessor.Metadata.Value.IsSpecialCommand);
+        Assert.AreEqual(InIsolationArgumentProcessor.CommandName, isolationProcessor.Metadata.Value.CommandName);
+        Assert.IsNull(isolationProcessor.Metadata.Value.ShortCommandName);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, isolationProcessor.Metadata.Value.Priority);
+        Assert.AreEqual(HelpContentPriority.InIsolationArgumentProcessorHelpPriority, isolationProcessor.Metadata.Value.HelpPriority);
+        Assert.AreEqual("--InIsolation|/InIsolation" + Environment.NewLine + "      Runs the tests in an isolated process. This makes vstest.console.exe " + Environment.NewLine + "      process less likely to be stopped on an error in the tests, but tests " + Environment.NewLine + "      may run slower.", isolationProcessor.Metadata.Value.HelpContentResourceName);
+    }
 
-        [TestMethod]
-        public void InIsolationArgumentProcessorExecutorShouldThrowIfArgumentIsProvided()
-        {
-            // InProcess should not have any values or arguments
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("true"),
-                "Argument true is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.");
-        }
+    [TestMethod]
+    public void InIsolationArgumentProcessorExecutorShouldThrowIfArgumentIsProvided()
+    {
+        // InProcess should not have any values or arguments
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("true"),
+            "Argument true is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.");
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetInIsolationValue()
-        {
-            this.executor.Initialize(null);
-            Assert.IsTrue(CommandLineOptions.Instance.InIsolation, "InProcess option must be set to true.");
-            Assert.AreEqual("true", this.runSettingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
-        }
+    [TestMethod]
+    public void InitializeShouldSetInIsolationValue()
+    {
+        _executor.Initialize(null);
+        Assert.IsTrue(CommandLineOptions.Instance.InIsolation, "InProcess option must be set to true.");
+        Assert.AreEqual("true", _runSettingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
+    }
 
-        [TestMethod]
-        public void ExecuteShouldReturnSuccess()
-        {
-            Assert.AreEqual(ArgumentProcessorResult.Success, this.executor.Execute());
-        }
+    [TestMethod]
+    public void ExecuteShouldReturnSuccess()
+    {
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
index 63309d5341..810aad5463 100644
--- a/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
@@ -1,343 +1,343 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+// <summary>
+// Tests for ListFullyQualifiedTestsArgumentProcessor
+// </summary>
+[TestClass]
+public class ListFullyQualifiedTestsArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Runtime.Versioning;
-    using System.Threading.Tasks;
-
-    using CoreUtilities.Tracing.Interfaces;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using ObjectModel;
-    using ObjectModel.Client;
-    using TestPlatform.Utilities;
-    using TestPlatformHelpers;
-    using vstest.console.Internal;
-    using vstest.console.UnitTests.Processors;
-
-    // <summary>
-    // Tests for ListFullyQualifiedTestsArgumentProcessor
-    // </summary>
-    [TestClass]
-    public class ListFullyQualifiedTestsArgumentProcessorTests
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyMetadataProvider;
+    private readonly InferHelper _inferHelper;
+    private readonly string _dummyTestFilePath = "DummyTest.dll";
+    private readonly string _dummyFilePath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid()}.txt");
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly Task<IMetricsPublisher> _mockMetricsPublisherTask;
+    private readonly Mock<IMetricsPublisher> _mockMetricsPublisher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockAttachmentsProcessingManager;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariableHelper;
+
+    private static ListFullyQualifiedTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager, IOutput? output)
     {
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private Mock<IAssemblyMetadataProvider> mockAssemblyMetadataProvider;
-        private InferHelper inferHelper;
-        private string dummyTestFilePath = "DummyTest.dll";
-        private string dummyFilePath = Path.Combine(Path.GetTempPath(), $"{System.Guid.NewGuid()}.txt");
-        private readonly Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private Task<IMetricsPublisher> mockMetricsPublisherTask;
-        private Mock<IMetricsPublisher> mockMetricsPublisher;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<ITestRunAttachmentsProcessingManager> mockAttachmentsProcessingManager;
-
-        private static ListFullyQualifiedTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager, IOutput output)
-        {
-            var runSettingsProvider = new TestableRunSettingsProvider();
-            runSettingsProvider.AddDefaultRunSettings();
-            var listFullyQualifiedTestsArgumentExecutor =
-                new ListFullyQualifiedTestsArgumentExecutor(
-                    CommandLineOptions.Instance,
-                    runSettingsProvider,
-                    testRequestManager,
-                    output ?? ConsoleOutput.Instance);
-            return listFullyQualifiedTestsArgumentExecutor;
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            File.Delete(dummyFilePath);
-            CommandLineOptions.Instance.Reset();
-        }
+        var runSettingsProvider = new TestableRunSettingsProvider();
+        runSettingsProvider.AddDefaultRunSettings();
+        var listFullyQualifiedTestsArgumentExecutor =
+            new ListFullyQualifiedTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                runSettingsProvider,
+                testRequestManager,
+                output ?? ConsoleOutput.Instance);
+        return listFullyQualifiedTestsArgumentExecutor;
+    }
 
-        public ListFullyQualifiedTestsArgumentProcessorTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockFileHelper.Setup(fh => fh.Exists(this.dummyTestFilePath)).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
-            this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
-            this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-            this.mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
-            this.inferHelper = new InferHelper(this.mockAssemblyMetadataProvider.Object);
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-        }
-
-        /// <summary>
-        /// The help argument processor get metadata should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetMetadataShouldReturnListFullyQualifiedTestsArgumentProcessorCapabilities()
-        {
-            var processor = new ListTestsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ListTestsArgumentProcessorCapabilities);
-        }
-
-        /// <summary>
-        /// The help argument processor get executer should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetExecuterShouldReturnListFullyQualifiedTestsArgumentProcessorCapabilities()
-        {
-            var processor = new ListFullyQualifiedTestsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ListFullyQualifiedTestsArgumentExecutor);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        File.Delete(_dummyFilePath);
+        CommandLineOptions.Reset();
+    }
 
-        #region ListTestsArgumentProcessorCapabilitiesTests
+    public ListFullyQualifiedTestsArgumentProcessorTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockFileHelper.Setup(fh => fh.Exists(_dummyTestFilePath)).Returns(true);
+        _mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+        _mockMetricsPublisher = new Mock<IMetricsPublisher>();
+        _mockMetricsPublisherTask = Task.FromResult(_mockMetricsPublisher.Object);
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
+        _mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
+        _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
+        _inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new ListFullyQualifiedTestsArgumentProcessorCapabilities();
-            Assert.AreEqual("/ListFullyQualifiedTests", capabilities.CommandName);
+    /// <summary>
+    /// The help argument processor get metadata should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetMetadataShouldReturnListFullyQualifiedTestsArgumentProcessorCapabilities()
+    {
+        var processor = new ListTestsArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ListTestsArgumentProcessorCapabilities);
+    }
 
-            Assert.IsTrue(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+    /// <summary>
+    /// The help argument processor get executer should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetExecuterShouldReturnListFullyQualifiedTestsArgumentProcessorCapabilities()
+    {
+        var processor = new ListFullyQualifiedTestsArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is ListFullyQualifiedTestsArgumentExecutor);
+    }
 
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-        #endregion
+    #region ListTestsArgumentProcessorCapabilitiesTests
 
-        #region ListTestsArgumentExecutorTests
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ListFullyQualifiedTestsArgumentProcessorCapabilities();
+        Assert.AreEqual("/ListFullyQualifiedTests", capabilities.CommandName);
 
-        [TestMethod]
-        public void ExecutorInitializeWithValidSourceShouldAddItToTestSources()
-        {
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+        Assert.IsTrue(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
 
-            executor.Initialize(this.dummyTestFilePath);
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+    #endregion
 
-            Assert.IsTrue(Enumerable.Contains<string>(CommandLineOptions.Instance.Sources, this.dummyTestFilePath));
-        }
+    #region ListTestsArgumentExecutorTests
 
-        [TestMethod]
-        public void ExecutorExecuteForNoSourcesShouldReturnFail()
-        {
-            CommandLineOptions.Instance.Reset();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+    [TestMethod]
+    public void ExecutorInitializeWithValidSourceShouldAddItToTestSources()
+    {
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
-        }
+        executor.Initialize(_dummyTestFilePath);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowTestPlatformException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        Assert.IsTrue(Enumerable.Contains(CommandLineOptions.Instance.Sources, _dummyTestFilePath));
+    }
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    [TestMethod]
+    public void ExecutorExecuteForNoSourcesShouldReturnFail()
+    {
+        CommandLineOptions.Reset();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-            this.ResetAndAddSourceToCommandLineOptions(true);
+        Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+    }
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowTestPlatformException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var executor = GetExecutor(testRequestManager, null);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
-        }
+        ResetAndAddSourceToCommandLineOptions(true);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowSettingsException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-            this.ResetAndAddSourceToCommandLineOptions(true);
+        var executor = GetExecutor(testRequestManager, null);
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+        Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
+    }
 
-            var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowSettingsException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            Assert.ThrowsException<SettingsException>(() => listTestsArgumentExecutor.Execute());
-        }
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+        ResetAndAddSourceToCommandLineOptions(true);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowInvalidOperationException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
 
-            this.ResetAndAddSourceToCommandLineOptions(true);
+        Assert.ThrowsException<SettingsException>(() => listTestsArgumentExecutor.Execute());
+    }
 
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowInvalidOperationException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
+        ResetAndAddSourceToCommandLineOptions(true);
 
-            Assert.ThrowsException<InvalidOperationException>(() => listTestsArgumentExecutor.Execute());
-        }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowOtherExceptions()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new Exception("DummyException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
 
-            this.ResetAndAddSourceToCommandLineOptions(true);
+        Assert.ThrowsException<InvalidOperationException>(() => listTestsArgumentExecutor.Execute());
+    }
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowOtherExceptions()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var executor = GetExecutor(testRequestManager, null);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new Exception("DummyException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            Assert.ThrowsException<Exception>(() => executor.Execute());
-        }
+        ResetAndAddSourceToCommandLineOptions(true);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldOutputDiscoveredTestsAndReturnSuccess()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-            this.RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+        var executor = GetExecutor(testRequestManager, null);
 
-            mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
+        Assert.ThrowsException<Exception>(() => executor.Execute());
+    }
 
-            var fileOutput = File.ReadAllLines(this.dummyFilePath);
-            Assert.IsTrue(fileOutput.Length == 2);
-            Assert.IsTrue(fileOutput.Contains("Test1"));
-            Assert.IsTrue(fileOutput.Contains("Test2"));
-        }
+    [TestMethod]
+    public void ExecutorExecuteShouldOutputDiscoveredTestsAndReturnSuccess()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-        [TestMethod]
-        public void DiscoveryShouldFilterCategoryTestsAndReturnSuccess()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
 
-            this.RunListFullyQualifiedTestArgumentProcessorWithTraits(mockDiscoveryRequest, mockConsoleOutput);
+        mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
 
-            mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
+        var fileOutput = File.ReadAllLines(_dummyFilePath);
+        Assert.IsTrue(fileOutput.Length == 2);
+        Assert.IsTrue(fileOutput.Contains("Test1"));
+        Assert.IsTrue(fileOutput.Contains("Test2"));
+    }
 
-            var fileOutput = File.ReadAllLines(this.dummyFilePath);
-            Assert.IsTrue(fileOutput.Length == 1);
-            Assert.IsTrue(fileOutput.Contains("Test1"));
-            Assert.IsFalse(fileOutput.Contains("Test2"));
-        }
+    [TestMethod]
+    public void DiscoveryShouldFilterCategoryTestsAndReturnSuccess()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-        [ExpectedException(typeof(CommandLineException))]
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowWhenListFullyQualifiedTestsTargetPathIsEmpty()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        RunListFullyQualifiedTestArgumentProcessorWithTraits(mockDiscoveryRequest, mockConsoleOutput);
 
-            this.RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput, false);
-        }
+        mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
 
-        [TestMethod]
-        public void ListFullyQualifiedTestsArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStart()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        var fileOutput = File.ReadAllLines(_dummyFilePath);
+        Assert.IsTrue(fileOutput.Length == 1);
+        Assert.IsTrue(fileOutput.Contains("Test1"));
+        Assert.IsFalse(fileOutput.Contains("Test2"));
+    }
 
-            this.RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+    [ExpectedException(typeof(CommandLineException))]
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowWhenListFullyQualifiedTestsTargetPathIsEmpty()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStart(), Times.Once);
-        }
+        RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput, false);
+    }
 
-        [TestMethod]
-        public void ListFullyQualifiedTestsArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStop()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+    [TestMethod]
+    public void ListFullyQualifiedTestsArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStart()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            this.RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+        RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
 
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStop(), Times.Once);
-        }
-        #endregion
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStart(), Times.Once);
+    }
 
-        private void RunListFullyQualifiedTestArgumentProcessorWithTraits(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput, bool legitPath = true)
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var list = new List<TestCase>();
+    [TestMethod]
+    public void ListFullyQualifiedTestsArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStop()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            var t1 = new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1");
-            t1.Traits.Add(new Trait("Category", "MyCat"));
-            list.Add(t1);
+        RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStop(), Times.Once);
+    }
+    #endregion
+
+    private void RunListFullyQualifiedTestArgumentProcessorWithTraits(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput, bool legitPath = true)
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var list = new List<TestCase>();
 
-            var t2 = new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2");
-            t2.Traits.Add(new Trait("Category", "MyBat"));
-            list.Add(t2);
+        var t1 = new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1");
+        t1.Traits.Add(new Trait("Category", "MyCat"));
+        list.Add(t1);
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        var t2 = new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2");
+        t2.Traits.Add(new Trait("Category", "MyBat"));
+        list.Add(t2);
 
-            this.ResetAndAddSourceToCommandLineOptions(legitPath);
-            var cmdOptions = CommandLineOptions.Instance;
-            cmdOptions.TestCaseFilterValue = "TestCategory=MyCat";
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            var testRequestManager = new TestRequestManager(cmdOptions, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+        ResetAndAddSourceToCommandLineOptions(legitPath);
+        var cmdOptions = CommandLineOptions.Instance;
+        cmdOptions.TestCaseFilterValue = "TestCategory=MyCat";
 
-            GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
-        }
+        var testRequestManager = new TestRequestManager(cmdOptions, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-        private void RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput, bool legitPath = true)
+        GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
+    }
+
+    private void RunListFullyQualifiedTestArgumentProcessorExecuteWithMockSetup(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput, bool legitPath = true)
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var list = new List<TestCase>
         {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+            new("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new("Test2", new Uri("http://FooTestUri2"), "Source2")
+        };
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions(legitPath);
+        ResetAndAddSourceToCommandLineOptions(legitPath);
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
 
-            GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
-        }
+        GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
+    }
 
-        private void ResetAndAddSourceToCommandLineOptions(bool legitPath)
-        {
-            CommandLineOptions.Instance.Reset();
-
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            CommandLineOptions.Instance.AddSource(this.dummyTestFilePath);
-            if (legitPath)
-            {
-                CommandLineOptions.Instance.ListTestsTargetPath = this.dummyFilePath;
-            }
-            else
-            {
-                CommandLineOptions.Instance.ListTestsTargetPath = string.Empty;
-            }
-        }
+    private void ResetAndAddSourceToCommandLineOptions(bool legitPath)
+    {
+        CommandLineOptions.Reset();
+
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        CommandLineOptions.Instance.AddSource(_dummyTestFilePath);
+        CommandLineOptions.Instance.ListTestsTargetPath = legitPath ? _dummyFilePath : string.Empty;
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
index 8c00ed0477..381095ee58 100644
--- a/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
@@ -1,283 +1,290 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+// <summary>
+// Tests for ListTestsArgumentProcessor
+// </summary>
+[TestClass]
+public class ListTestsArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Runtime.Versioning;
-    using System.Threading.Tasks;
-
-    using CoreUtilities.Tracing.Interfaces;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using ObjectModel;
-    using ObjectModel.Client;
-    using TestPlatform.Utilities;
-    using TestPlatformHelpers;
-    using vstest.console.Internal;
-    using vstest.console.UnitTests.Processors;
-
-    // <summary>
-    // Tests for ListTestsArgumentProcessor
-    // </summary>
-    [TestClass]
-    public class ListTestsArgumentProcessorTests
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyMetadataProvider;
+    private readonly InferHelper _inferHelper;
+    private readonly string _dummyTestFilePath = "DummyTest.dll";
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly Task<IMetricsPublisher> _mockMetricsPublisherTask;
+    private readonly Mock<IMetricsPublisher> _mockMetricsPublisher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockAttachmentsProcessingManager;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariableHelper;
+
+    private static ListTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager, IOutput? output)
     {
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private Mock<IAssemblyMetadataProvider> mockAssemblyMetadataProvider;
-        private InferHelper inferHelper;
-        private string dummyTestFilePath = "DummyTest.dll";
-        private readonly Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private Task<IMetricsPublisher> mockMetricsPublisherTask;
-        private Mock<IMetricsPublisher> mockMetricsPublisher;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<ITestRunAttachmentsProcessingManager> mockAttachmentsProcessingManager;
-
-        private static ListTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager, IOutput output)
-        {
-            var runSettingsProvider = new TestableRunSettingsProvider();
-
-            runSettingsProvider.AddDefaultRunSettings();
-            var listTestsArgumentExecutor =
-                new ListTestsArgumentExecutor(
-                    CommandLineOptions.Instance,
-                    runSettingsProvider,
-                    testRequestManager,
-                    output ?? ConsoleOutput.Instance);
-            return listTestsArgumentExecutor;
-        }
-
-        [TestCleanup]
-        public void Cleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
+        var runSettingsProvider = new TestableRunSettingsProvider();
+
+        runSettingsProvider.AddDefaultRunSettings();
+        var listTestsArgumentExecutor =
+            new ListTestsArgumentExecutor(
+                CommandLineOptions.Instance,
+                runSettingsProvider,
+                testRequestManager,
+                output ?? ConsoleOutput.Instance);
+        return listTestsArgumentExecutor;
+    }
 
-        public ListTestsArgumentProcessorTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockFileHelper.Setup(fh => fh.Exists(this.dummyTestFilePath)).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
-            this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
-            this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-            this.mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
-            this.inferHelper = new InferHelper(this.mockAssemblyMetadataProvider.Object);
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-        }
-
-        /// <summary>
-        /// The help argument processor get metadata should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetMetadataShouldReturnListTestsArgumentProcessorCapabilities()
-        {
-            var processor = new ListTestsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ListTestsArgumentProcessorCapabilities);
-        }
-
-        /// <summary>
-        /// The help argument processor get executer should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetExecuterShouldReturnListTestsArgumentProcessorCapabilities()
-        {
-            var processor = new ListTestsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ListTestsArgumentExecutor);
-        }
+    [TestCleanup]
+    public void Cleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        #region ListTestsArgumentProcessorCapabilitiesTests
+    public ListTestsArgumentProcessorTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockFileHelper.Setup(fh => fh.Exists(_dummyTestFilePath)).Returns(true);
+        _mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+        _mockMetricsPublisher = new Mock<IMetricsPublisher>();
+        _mockMetricsPublisherTask = Task.FromResult(_mockMetricsPublisher.Object);
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
+        _mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
+        _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
+        _inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new ListTestsArgumentProcessorCapabilities();
-            Assert.AreEqual("/ListTests", capabilities.CommandName);
-            Assert.AreEqual("/lt", capabilities.ShortCommandName);
-            var expected = "-lt|--ListTests|/lt|/ListTests:<File Name>\r\n      Lists all discovered tests from the given test container.";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.ListTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsTrue(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-        #endregion
-
-        #region ListTestsArgumentExecutorTests
-
-        [TestMethod]
-        public void ExecutorInitializeWithValidSourceShouldAddItToTestSources()
-        {
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+    /// <summary>
+    /// The help argument processor get metadata should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetMetadataShouldReturnListTestsArgumentProcessorCapabilities()
+    {
+        var processor = new ListTestsArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ListTestsArgumentProcessorCapabilities);
+    }
 
-            executor.Initialize(this.dummyTestFilePath);
+    /// <summary>
+    /// The help argument processor get executer should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetExecuterShouldReturnListTestsArgumentProcessorCapabilities()
+    {
+        var processor = new ListTestsArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is ListTestsArgumentExecutor);
+    }
 
-            Assert.IsTrue(Enumerable.Contains<string>(CommandLineOptions.Instance.Sources, this.dummyTestFilePath));
-        }
+    #region ListTestsArgumentProcessorCapabilitiesTests
 
-        [TestMethod]
-        public void ExecutorExecuteForNoSourcesShouldReturnFail()
-        {
-            CommandLineOptions.Instance.Reset();
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ListTestsArgumentProcessorCapabilities();
+        Assert.AreEqual("/ListTests", capabilities.CommandName);
+        Assert.AreEqual("/lt", capabilities.ShortCommandName);
+        var expected = "-lt|--ListTests|/lt|/ListTests:<File Name>\r\n      Lists all discovered tests from the given test container.";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.ListTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsTrue(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+    #endregion
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+    #region ListTestsArgumentExecutorTests
 
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
-        }
+    [TestMethod]
+    public void ExecutorInitializeWithValidSourceShouldAddItToTestSources()
+    {
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowTestPlatformException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        executor.Initialize(_dummyTestFilePath);
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        Assert.IsTrue(Enumerable.Contains(CommandLineOptions.Instance.Sources, _dummyTestFilePath));
+    }
 
-            this.ResetAndAddSourceToCommandLineOptions();
+    [TestMethod]
+    public void ExecutorExecuteForNoSourcesShouldReturnFail()
+    {
+        CommandLineOptions.Reset();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-            Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
-        }
+        Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowSettingsException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowTestPlatformException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-            Assert.ThrowsException<SettingsException>(() => listTestsArgumentExecutor.Execute());
-        }
+        Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowInvalidOperationException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowSettingsException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
 
-            Assert.ThrowsException<InvalidOperationException>(() => listTestsArgumentExecutor.Execute());
-        }
+        Assert.ThrowsException<SettingsException>(() => listTestsArgumentExecutor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowOtherExceptions()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowInvalidOperationException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new Exception("DummyException"));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager, null);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var listTestsArgumentExecutor = GetExecutor(testRequestManager, null);
 
-            Assert.ThrowsException<Exception>(() => executor.Execute());
-        }
+        Assert.ThrowsException<InvalidOperationException>(() => listTestsArgumentExecutor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldOutputDiscoveredTestsAndReturnSuccess()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowOtherExceptions()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            this.RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new Exception("DummyException"));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            // Assert
-            mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
+        ResetAndAddSourceToCommandLineOptions();
 
-            mockConsoleOutput.Verify((IOutput co) => co.WriteLine("    Test1", OutputLevel.Information));
-            mockConsoleOutput.Verify((IOutput co) => co.WriteLine("    Test2", OutputLevel.Information));
-        }
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager, null);
 
-        [TestMethod]
-        public void ListTestArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStart()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        Assert.ThrowsException<Exception>(() => executor.Execute());
+    }
 
-            this.RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+    [TestMethod]
+    public void ExecutorExecuteShouldOutputDiscoveredTestsAndReturnSuccess()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStart(), Times.Once);
-        }
+        RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
 
-        [TestMethod]
-        public void ListTestArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStop()
-        {
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockConsoleOutput = new Mock<IOutput>();
+        // Assert
+        mockDiscoveryRequest.Verify(dr => dr.DiscoverAsync(), Times.Once);
+
+        mockConsoleOutput.Verify((IOutput co) => co.WriteLine("    Test1", OutputLevel.Information));
+        mockConsoleOutput.Verify((IOutput co) => co.WriteLine("    Test2", OutputLevel.Information));
+    }
+
+    [TestMethod]
+    public void ListTestArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStart()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
+
+        RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
 
-            this.RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStart(), Times.Once);
+    }
+
+    [TestMethod]
+    public void ListTestArgumentProcessorExecuteShouldInstrumentDiscoveryRequestStop()
+    {
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            this.mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStop(), Times.Once);
-        }
-        #endregion
+        RunListTestArgumentProcessorExecuteWithMockSetup(mockDiscoveryRequest, mockConsoleOutput);
 
-        private void RunListTestArgumentProcessorExecuteWithMockSetup(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput)
+        _mockTestPlatformEventSource.Verify(x => x.DiscoveryRequestStop(), Times.Once);
+    }
+    #endregion
+
+    private void RunListTestArgumentProcessorExecuteWithMockSetup(Mock<IDiscoveryRequest> mockDiscoveryRequest, Mock<IOutput> mockConsoleOutput)
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var list = new List<TestCase>
         {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+            new("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new("Test2", new Uri("http://FooTestUri2"), "Source2")
+        };
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
-        }
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        GetExecutor(testRequestManager, mockConsoleOutput.Object).Execute();
+    }
 
-        private void ResetAndAddSourceToCommandLineOptions()
-        {
-            CommandLineOptions.Instance.Reset();
+    private void ResetAndAddSourceToCommandLineOptions()
+    {
+        CommandLineOptions.Reset();
 
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            CommandLineOptions.Instance.AddSource(this.dummyTestFilePath);
-        }
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        CommandLineOptions.Instance.AddSource(_dummyTestFilePath);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/ListTestsTargetPathArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ListTestsTargetPathArgumentProcessorTests.cs
index 272aa54763..b98f2db49c 100644
--- a/test/vstest.console.UnitTests/Processors/ListTestsTargetPathArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ListTestsTargetPathArgumentProcessorTests.cs
@@ -1,82 +1,80 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using TestPlatform.CommandLine.Processors;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
 
-    [TestClass]
-    public class ListTestsTargetPathArgumentProcessorTests
+[TestClass]
+public class ListTestsTargetPathArgumentProcessorTests
+{
+    [TestMethod]
+    public void GetMetadataShouldReturnListTestsTargetPathArgumentProcessorCapabilities()
     {
-        [TestMethod]
-        public void GetMetadataShouldReturnListTestsTargetPathArgumentProcessorCapabilities()
-        {
-            ListTestsTargetPathArgumentProcessor processor = new ListTestsTargetPathArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ListTestsTargetPathArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecutorShouldReturnListTestsTargetPathArgumentProcessorCapabilities()
-        {
-            ListTestsTargetPathArgumentProcessor processor = new ListTestsTargetPathArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ListTestsTargetPathArgumentExecutor);
-        }
+        ListTestsTargetPathArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is ListTestsTargetPathArgumentProcessorCapabilities);
+    }
 
-        #region TestCaseFilterArgumentProcessorCapabilitiesTests
+    [TestMethod]
+    public void GetExecutorShouldReturnListTestsTargetPathArgumentProcessorCapabilities()
+    {
+        ListTestsTargetPathArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is ListTestsTargetPathArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldAppropriateProperties()
-        {
-            ListTestsTargetPathArgumentProcessorCapabilities capabilities = new ListTestsTargetPathArgumentProcessorCapabilities();
-            Assert.AreEqual("/ListTestsTargetPath", capabilities.CommandName);
+    #region TestCaseFilterArgumentProcessorCapabilitiesTests
 
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+    [TestMethod]
+    public void CapabilitiesShouldAppropriateProperties()
+    {
+        ListTestsTargetPathArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/ListTestsTargetPath", capabilities.CommandName);
 
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
 
-        #endregion
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeWithNullOrEmptyListTestsTargetPathShouldThrowCommandLineException()
-        {
-            var options = CommandLineOptions.Instance;
-            ListTestsTargetPathArgumentExecutor executor = new ListTestsTargetPathArgumentExecutor(options);
+    #endregion
 
-            try
-            {
-                executor.Initialize(null);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                StringAssert.Contains(ex.Message, "ListTestsTargetPath is required with ListFullyQualifiedTests!");
-            }
-        }
+    [TestMethod]
+    public void ExecutorInitializeWithNullOrEmptyListTestsTargetPathShouldThrowCommandLineException()
+    {
+        var options = CommandLineOptions.Instance;
+        ListTestsTargetPathArgumentExecutor executor = new(options);
 
-        [TestMethod]
-        public void ExecutorInitializeWithValidListTestsTargetPathShouldAddListTestsTargetPathToCommandLineOptions()
+        try
         {
-            var options = CommandLineOptions.Instance;
-            ListTestsTargetPathArgumentExecutor executor = new ListTestsTargetPathArgumentExecutor(options);
-
-            executor.Initialize(@"C:\sample.txt");
-            Assert.AreEqual(@"C:\sample.txt", options.ListTestsTargetPath);
+            executor.Initialize(null);
         }
-
-        [TestMethod]
-        public void ExecutorListTestsTargetPathArgumentProcessorResultSuccess()
+        catch (Exception ex)
         {
-            var executor = new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance);
-            var result = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
+            Assert.IsTrue(ex is CommandLineException);
+            StringAssert.Contains(ex.Message, "ListTestsTargetPath is required with ListFullyQualifiedTests!");
         }
     }
+
+    [TestMethod]
+    public void ExecutorInitializeWithValidListTestsTargetPathShouldAddListTestsTargetPathToCommandLineOptions()
+    {
+        var options = CommandLineOptions.Instance;
+        ListTestsTargetPathArgumentExecutor executor = new(options);
+
+        executor.Initialize(@"C:\sample.txt");
+        Assert.AreEqual(@"C:\sample.txt", options.ListTestsTargetPath);
+    }
+
+    [TestMethod]
+    public void ExecutorListTestsTargetPathArgumentProcessorResultSuccess()
+    {
+        var executor = new ListTestsTargetPathArgumentExecutor(CommandLineOptions.Instance);
+        var result = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
+    }
 }
diff --git a/test/vstest.console.UnitTests/Processors/ParallelArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ParallelArgumentProcessorTests.cs
index e6d9147018..9e0580aa63 100644
--- a/test/vstest.console.UnitTests/Processors/ParallelArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ParallelArgumentProcessorTests.cs
@@ -1,99 +1,95 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ParallelArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using TestPlatform.CommandLine.Processors;
-    using vstest.console.UnitTests.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+    private readonly ParallelArgumentExecutor _executor;
+    private readonly TestableRunSettingsProvider _runSettingsProvider;
 
-    using ExceptionUtilities = Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.ExceptionUtilities;
-    using System;
+    public ParallelArgumentProcessorTests()
+    {
+        _runSettingsProvider = new TestableRunSettingsProvider();
+        _executor = new ParallelArgumentExecutor(CommandLineOptions.Instance, _runSettingsProvider);
+    }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-    [TestClass]
-    public class ParallelArgumentProcessorTests
+    [TestMethod]
+    public void GetMetadataShouldReturnParallelArgumentProcessorCapabilities()
     {
-        private ParallelArgumentExecutor executor;
-        private TestableRunSettingsProvider runSettingsProvider;
-
-        [TestInitialize]
-        public void Init()
-        {
-            this.runSettingsProvider = new TestableRunSettingsProvider();
-            this.executor = new ParallelArgumentExecutor(CommandLineOptions.Instance, this.runSettingsProvider);
-        }
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnParallelArgumentProcessorCapabilities()
-        {
-            var processor = new ParallelArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ParallelArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnParallelArgumentExecutor()
-        {
-            var processor = new ParallelArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ParallelArgumentExecutor);
-        }
-
-        #region ParallelArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new ParallelArgumentProcessorCapabilities();
-            Assert.AreEqual("/Parallel", capabilities.CommandName);
-            var expected = "--Parallel|/Parallel\r\n      Specifies that the tests be executed in parallel. By default up\r\n      to all available cores on the machine may be used.\r\n      The number of cores to use may be configured using a settings file.";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.ParallelArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region ParallelArgumentExecutor Initialize tests
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNonNull()
-        {
-
-            // Parallel should not have any values or arguments
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("123"),
-                "Argument " + 123 + " is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.");
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetParallelValue()
-        {
-            this.executor.Initialize(null);
-            Assert.IsTrue(CommandLineOptions.Instance.Parallel, "Parallel option must be set to true.");
-            Assert.AreEqual("0", this.runSettingsProvider.QueryRunSettingsNode(ParallelArgumentExecutor.RunSettingsPath));
-        }
-
-        #endregion
-
-        #region ParallelArgumentExecutor Execute tests
-
-        [TestMethod]
-        public void ExecuteShouldReturnSuccess()
-        {
-            Assert.AreEqual(ArgumentProcessorResult.Success, this.executor.Execute());
-        }
-
-        #endregion
+        var processor = new ParallelArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ParallelArgumentProcessorCapabilities);
     }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnParallelArgumentExecutor()
+    {
+        var processor = new ParallelArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is ParallelArgumentExecutor);
+    }
+
+    #region ParallelArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ParallelArgumentProcessorCapabilities();
+        Assert.AreEqual("/Parallel", capabilities.CommandName);
+        var expected = "--Parallel|/Parallel\r\n      Specifies that the tests be executed in parallel. By default up\r\n      to all available cores on the machine may be used.\r\n      The number of cores to use may be configured using a settings file.";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.ParallelArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region ParallelArgumentExecutor Initialize tests
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNonNull()
+    {
+
+        // Parallel should not have any values or arguments
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("123"),
+            "Argument " + 123 + " is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.");
+    }
+
+    [TestMethod]
+    public void InitializeShouldSetParallelValue()
+    {
+        _executor.Initialize(null);
+        Assert.IsTrue(CommandLineOptions.Instance.Parallel, "Parallel option must be set to true.");
+        Assert.AreEqual("0", _runSettingsProvider.QueryRunSettingsNode(ParallelArgumentExecutor.RunSettingsPath));
+    }
+
+    #endregion
+
+    #region ParallelArgumentExecutor Execute tests
+
+    [TestMethod]
+    public void ExecuteShouldReturnSuccess()
+    {
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/ParentProcessIdArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ParentProcessIdArgumentProcessorTests.cs
index a8bb3f1e7d..7624740e17 100644
--- a/test/vstest.console.UnitTests/Processors/ParentProcessIdArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ParentProcessIdArgumentProcessorTests.cs
@@ -1,105 +1,106 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Globalization;
+
 using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ParentProcessIdArgumentProcessorTests
 {
-    [TestClass]
-    public class ParentProcessIdArgumentProcessorTests
+    [TestMethod]
+    public void GetMetadataShouldReturnParentProcessIdArgumentProcessorCapabilities()
     {
-        [TestMethod]
-        public void GetMetadataShouldReturnParentProcessIdArgumentProcessorCapabilities()
-        {
-            var processor = new ParentProcessIdArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ParentProcessIdArgumentProcessorCapabilities);
-        }
+        var processor = new ParentProcessIdArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ParentProcessIdArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecutorShouldReturnParentProcessIdArgumentProcessorCapabilities()
-        {
-            var processor = new ParentProcessIdArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ParentProcessIdArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecutorShouldReturnParentProcessIdArgumentProcessorCapabilities()
+    {
+        var processor = new ParentProcessIdArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is ParentProcessIdArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldHaveHigherPriorityThanPortCapabilities()
-        {
-            var parentProcessIdCapabilities = new ParentProcessIdArgumentProcessorCapabilities();
-            var portCapabilities = new PortArgumentProcessorCapabilities();
+    [TestMethod]
+    public void CapabilitiesShouldHaveHigherPriorityThanPortCapabilities()
+    {
+        var parentProcessIdCapabilities = new ParentProcessIdArgumentProcessorCapabilities();
+        var portCapabilities = new PortArgumentProcessorCapabilities();
 
-            // Less the number, high the priority
-            Assert.IsTrue(parentProcessIdCapabilities.Priority == portCapabilities.Priority, "ParentProcessId must have higher priority than Port.");
-        }
+        // Less the number, high the priority
+        Assert.IsTrue(parentProcessIdCapabilities.Priority == portCapabilities.Priority, "ParentProcessId must have higher priority than Port.");
+    }
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ParentProcessIdArgumentProcessorCapabilities();
+        Assert.AreEqual("/ParentProcessId", capabilities.CommandName);
+        var expected = "--ParentProcessId|/ParentProcessId:<ParentProcessId>\r\n      Process Id of the Parent Process responsible for launching current process.";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.ParentProcessIdArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.DesignMode, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
+    [TestMethod]
+    public void ExecutorInitializeWithNullOrEmptyParentProcessIdShouldThrowCommandLineException()
+    {
+        var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
+        try
         {
-            var capabilities = new ParentProcessIdArgumentProcessorCapabilities();
-            Assert.AreEqual("/ParentProcessId", capabilities.CommandName);
-            var expected = "--ParentProcessId|/ParentProcessId:<ParentProcessId>\r\n      Process Id of the Parent Process responsible for launching current process.";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.ParentProcessIdArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.DesignMode, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
+            executor.Initialize(null);
         }
-
-        [TestMethod]
-        public void ExecutorInitializeWithNullOrEmptyParentProcessIdShouldThrowCommandLineException()
+        catch (Exception ex)
         {
-            var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
-            try
-            {
-                executor.Initialize(null);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual("The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.", ex.Message);
-            }
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual("The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.", ex.Message);
         }
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeWithInvalidParentProcessIdShouldThrowCommandLineException()
+    [TestMethod]
+    public void ExecutorInitializeWithInvalidParentProcessIdShouldThrowCommandLineException()
+    {
+        var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
+        try
         {
-            var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
-            try
-            {
-                executor.Initialize("Foo");
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual("The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.", ex.Message);
-            }
+            executor.Initialize("Foo");
         }
-
-        [TestMethod]
-        public void ExecutorInitializeWithValidPortShouldAddParentProcessIdToCommandLineOptions()
+        catch (Exception ex)
         {
-            var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
-            int parentProcessId = 2345;
-            executor.Initialize(parentProcessId.ToString());
-            Assert.AreEqual(parentProcessId, CommandLineOptions.Instance.ParentProcessId);
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual("The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.", ex.Message);
         }
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteReturnsArgumentProcessorResultSuccess()
-        {
-            var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
+    [TestMethod]
+    public void ExecutorInitializeWithValidPortShouldAddParentProcessIdToCommandLineOptions()
+    {
+        var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
+        int parentProcessId = 2345;
+        executor.Initialize(parentProcessId.ToString(CultureInfo.InvariantCulture));
+        Assert.AreEqual(parentProcessId, CommandLineOptions.Instance.ParentProcessId);
+    }
+
+    [TestMethod]
+    public void ExecutorExecuteReturnsArgumentProcessorResultSuccess()
+    {
+        var executor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
 
-            int parentProcessId = 2345;
-            executor.Initialize(parentProcessId.ToString());
-            var result = executor.Execute();
+        int parentProcessId = 2345;
+        executor.Initialize(parentProcessId.ToString(CultureInfo.InvariantCulture));
+        var result = executor.Execute();
 
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
index 84092f3741..a0119490ac 100644
--- a/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs
@@ -1,131 +1,128 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class PlatformArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using TestPlatform.CommandLine.Processors;
-    using vstest.console.UnitTests.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using ExceptionUtilities = Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.ExceptionUtilities;
-    using System;
-
-    [TestClass]
-    public class PlatformArgumentProcessorTests
+    private readonly PlatformArgumentExecutor _executor;
+    private readonly TestableRunSettingsProvider _runSettingsProvider;
+
+    public PlatformArgumentProcessorTests()
+    {
+        _runSettingsProvider = new TestableRunSettingsProvider();
+        _executor = new PlatformArgumentExecutor(CommandLineOptions.Instance, _runSettingsProvider);
+    }
+
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnPlatformArgumentProcessorCapabilities()
+    {
+        var processor = new PlatformArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is PlatformArgumentProcessorCapabilities);
+    }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnPlatformArgumentExecutor()
+    {
+        var processor = new PlatformArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is PlatformArgumentExecutor);
+    }
+
+    #region PlatformArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new PlatformArgumentProcessorCapabilities();
+        Assert.AreEqual("/Platform", capabilities.CommandName);
+        var expected = "--Platform|/Platform:<Platform type>\r\n      Target platform architecture to be used for test execution. \r\n      Valid values are x86, x64 and ARM.";
+        Assert.AreEqual(expected: expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.PlatformArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region PlatformArgumentExecutor Initialize tests
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
     {
-        private PlatformArgumentExecutor executor;
-        private TestableRunSettingsProvider runSettingsProvider;
-
-        [TestInitialize]
-        public void Init()
-        {
-            this.runSettingsProvider = new TestableRunSettingsProvider();
-            this.executor = new PlatformArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnPlatformArgumentProcessorCapabilities()
-        {
-            var processor = new PlatformArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is PlatformArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnPlatformArgumentExecutor()
-        {
-            var processor = new PlatformArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is PlatformArgumentExecutor);
-        }
-
-        #region PlatformArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new PlatformArgumentProcessorCapabilities();
-            Assert.AreEqual("/Platform", capabilities.CommandName);
-            var expected = "--Platform|/Platform:<Platform type>\r\n      Target platform architecture to be used for test execution. \r\n      Valid values are x86, x64 and ARM.";
-            Assert.AreEqual(expected: expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.PlatformArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region PlatformArgumentExecutor Initialize tests
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNull()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize(null),
-                "The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86");
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsEmpty()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("  "),
-                "The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86");
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNotAnArchitecture()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("foo"),
-                "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64.",
-                "foo");
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture()
-        {
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => this.executor.Initialize("AnyCPU"),
-                "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64.",
-                "AnyCPU");
-        }
-
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsArchitecture()
-        {
-            this.executor.Initialize("x64");
-            Assert.AreEqual(ObjectModel.Architecture.X64, CommandLineOptions.Instance.TargetArchitecture);
-            Assert.AreEqual(nameof(ObjectModel.Architecture.X64), this.runSettingsProvider.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath));
-        }
-
-        [TestMethod]
-        public void InitializeShouldNotConsiderCaseSensitivityOfTheArgumentPassed()
-        {
-            executor.Initialize("ArM");
-            Assert.AreEqual(ObjectModel.Architecture.ARM, CommandLineOptions.Instance.TargetArchitecture);
-            Assert.AreEqual(nameof(ObjectModel.Architecture.ARM), this.runSettingsProvider.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath));
-        }
-
-        #endregion
-
-        #region PlatformArgumentExecutor Execute tests
-
-        [TestMethod]
-        public void ExecuteShouldReturnSuccess()
-        {
-            Assert.AreEqual(ArgumentProcessorResult.Success, this.executor.Execute());
-        }
-
-        #endregion
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize(null),
+            "The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86");
     }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsEmpty()
+    {
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("  "),
+            "The /Platform argument requires the target platform type for the test run to be provided.   Example:  /Platform:x86");
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNotAnArchitecture()
+    {
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("foo"),
+            "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le, RiscV64.",
+            "foo");
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture()
+    {
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => _executor.Initialize("AnyCPU"),
+            "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le, RiscV64.",
+            "AnyCPU");
+    }
+
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsArchitecture()
+    {
+        _executor.Initialize("x64");
+        Assert.AreEqual(ObjectModel.Architecture.X64, CommandLineOptions.Instance.TargetArchitecture);
+        Assert.AreEqual(nameof(ObjectModel.Architecture.X64), _runSettingsProvider.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath));
+    }
+
+    [TestMethod]
+    public void InitializeShouldNotConsiderCaseSensitivityOfTheArgumentPassed()
+    {
+        _executor.Initialize("ArM");
+        Assert.AreEqual(ObjectModel.Architecture.ARM, CommandLineOptions.Instance.TargetArchitecture);
+        Assert.AreEqual(nameof(ObjectModel.Architecture.ARM), _runSettingsProvider.QueryRunSettingsNode(PlatformArgumentExecutor.RunSettingsPath));
+    }
+
+    #endregion
+
+    #region PlatformArgumentExecutor Execute tests
+
+    [TestMethod]
+    public void ExecuteShouldReturnSuccess()
+    {
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/PortArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/PortArgumentProcessorTests.cs
index 50181f7e6d..d7a4db5a34 100644
--- a/test/vstest.console.UnitTests/Processors/PortArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/PortArgumentProcessorTests.cs
@@ -1,192 +1,202 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+#if !NET5_0_OR_GREATER
+using System.Diagnostics;
+#endif
+using System.Globalization;
+
+using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class PortArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestPlatform.Client.DesignMode;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Moq;
-    using System;
-    using System.Diagnostics;
-
-    [TestClass]
-    public class PortArgumentProcessorTests
-    {
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<IDesignModeClient> testDesignModeClient;
-        private Mock<ITestRequestManager> testRequestManager;
-        private PortArgumentExecutor executor;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<IDesignModeClient> _testDesignModeClient;
+    private readonly Mock<ITestRequestManager> _testRequestManager;
+    private PortArgumentExecutor _executor;
 
-        public PortArgumentProcessorTests()
-        {
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.testDesignModeClient = new Mock<IDesignModeClient>();
-            this.testRequestManager = new Mock<ITestRequestManager>();
-            this.executor = new PortArgumentExecutor(CommandLineOptions.Instance, this.testRequestManager.Object);
-        }
+    public PortArgumentProcessorTests()
+    {
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _testDesignModeClient = new Mock<IDesignModeClient>();
+        _testRequestManager = new Mock<ITestRequestManager>();
+        _executor = new PortArgumentExecutor(CommandLineOptions.Instance, _testRequestManager.Object);
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnPortArgumentProcessorCapabilities()
-        {
-            var processor = new PortArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is PortArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnPortArgumentProcessorCapabilities()
+    {
+        var processor = new PortArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is PortArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecutorShouldReturnPortArgumentProcessorCapabilities()
-        {
-            var processor = new PortArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is PortArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecutorShouldReturnPortArgumentProcessorCapabilities()
+    {
+        var processor = new PortArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is PortArgumentExecutor);
+    }
 
-        #region PortArgumentProcessorCapabilitiesTests
+    #region PortArgumentProcessorCapabilitiesTests
 
-        [TestMethod]
-        public void CapabilitiesShouldAppropriateProperties()
-        {
-            var capabilities = new PortArgumentProcessorCapabilities();
-            Assert.AreEqual("/Port", capabilities.CommandName);
-            Assert.AreEqual("--Port|/Port:<Port>" + Environment.NewLine + "      The Port for socket connection and receiving the event messages.", capabilities.HelpContentResourceName);
+    [TestMethod]
+    public void CapabilitiesShouldAppropriateProperties()
+    {
+        var capabilities = new PortArgumentProcessorCapabilities();
+        Assert.AreEqual("/Port", capabilities.CommandName);
+        Assert.AreEqual("--Port|/Port:<Port>" + Environment.NewLine + "      The Port for socket connection and receiving the event messages.", capabilities.HelpContentResourceName);
 
-            Assert.AreEqual(HelpContentPriority.PortArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.DesignMode, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.PortArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.DesignMode, capabilities.Priority);
 
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        #endregion
+    #endregion
 
-        [TestMethod]
-        public void ExecutorInitializeWithNullOrEmptyPortShouldThrowCommandLineException()
+    [TestMethod]
+    public void ExecutorInitializeWithNullOrEmptyPortShouldThrowCommandLineException()
+    {
+        try
         {
-            try
-            {
-                executor.Initialize(null);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual("The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.", ex.Message);
-            }
+            _executor.Initialize(null);
         }
-
-        [TestMethod]
-        public void ExecutorInitializeWithInvalidPortShouldThrowCommandLineException()
+        catch (Exception ex)
         {
-            try
-            {
-                this.executor.Initialize("Foo");
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual("The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.", ex.Message);
-            }
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual("The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.", ex.Message);
         }
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeWithValidPortShouldAddPortToCommandLineOptionsAndInitializeDesignModeManager()
+    [TestMethod]
+    public void ExecutorInitializeWithInvalidPortShouldThrowCommandLineException()
+    {
+        try
         {
-            int port = 2345;
-            CommandLineOptions.Instance.ParentProcessId = 0;
+            _executor.Initialize("Foo");
+        }
+        catch (Exception ex)
+        {
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual("The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.", ex.Message);
+        }
+    }
 
-            this.executor.Initialize(port.ToString());
+    [TestMethod]
+    public void ExecutorInitializeWithValidPortShouldAddPortToCommandLineOptionsAndInitializeDesignModeManager()
+    {
+        int port = 2345;
+        CommandLineOptions.Instance.ParentProcessId = 0;
 
-            Assert.AreEqual(port, CommandLineOptions.Instance.Port);
-            Assert.IsNotNull(DesignModeClient.Instance);
-        }
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
 
-        [TestMethod]
-        public void ExecutorInitializeShouldSetDesignMode()
-        {
-            int port = 2345;
-            CommandLineOptions.Instance.ParentProcessId = 0;
+        Assert.AreEqual(port, CommandLineOptions.Instance.Port);
+        Assert.IsNotNull(DesignModeClient.Instance);
+    }
 
-            this.executor.Initialize(port.ToString());
+    [TestMethod]
+    public void ExecutorInitializeShouldSetDesignMode()
+    {
+        int port = 2345;
+        CommandLineOptions.Instance.ParentProcessId = 0;
 
-            Assert.IsTrue(CommandLineOptions.Instance.IsDesignMode);
-        }
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
 
-        [TestMethod]
-        public void ExecutorInitializeShouldSetProcessExitCallback()
-        {
-            this.executor = new PortArgumentExecutor(CommandLineOptions.Instance, this.testRequestManager.Object, this.mockProcessHelper.Object);
-            int port = 2345;
-            int processId = Process.GetCurrentProcess().Id;
-            CommandLineOptions.Instance.ParentProcessId = processId;
+        Assert.IsTrue(CommandLineOptions.Instance.IsDesignMode);
+    }
 
-            this.executor.Initialize(port.ToString());
+    [TestMethod]
+    public void ExecutorInitializeShouldSetProcessExitCallback()
+    {
+        _executor = new PortArgumentExecutor(CommandLineOptions.Instance, _testRequestManager.Object, _mockProcessHelper.Object);
+        int port = 2345;
+#if NET5_0_OR_GREATER
+        var pid = Environment.ProcessId;
+#else
+        int pid;
+        using (var p = Process.GetCurrentProcess())
+            pid = p.Id;
+#endif
+        CommandLineOptions.Instance.ParentProcessId = pid;
+
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
+
+        _mockProcessHelper.Verify(ph => ph.SetExitCallback(pid, It.IsAny<Action<object?>>()), Times.Once);
+    }
 
-            this.mockProcessHelper.Verify(ph => ph.SetExitCallback(processId, It.IsAny<Action<object>>()), Times.Once);
-        }
+    [TestMethod]
+    public void ExecutorExecuteForValidConnectionReturnsArgumentProcessorResultSuccess()
+    {
+        _executor = new PortArgumentExecutor(CommandLineOptions.Instance, _testRequestManager.Object,
+            (parentProcessId, ph) => _testDesignModeClient.Object, _mockProcessHelper.Object);
 
-        [TestMethod]
-        public void ExecutorExecuteForValidConnectionReturnsArgumentProcessorResultSuccess()
-        {
-            this.executor = new PortArgumentExecutor(CommandLineOptions.Instance, this.testRequestManager.Object,
-                (parentProcessId, ph) => this.testDesignModeClient.Object, this.mockProcessHelper.Object);
+        int port = 2345;
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
+        var result = _executor.Execute();
 
-            int port = 2345;
-            this.executor.Initialize(port.ToString());
-            var result = executor.Execute();
+        _testDesignModeClient.Verify(td =>
+            td.ConnectToClientAndProcessRequests(port, _testRequestManager.Object), Times.Once);
 
-            this.testDesignModeClient.Verify(td =>
-                td.ConnectToClientAndProcessRequests(port, this.testRequestManager.Object), Times.Once);
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
+    }
 
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+    [TestMethod]
+    public void ExecutorExecuteForFailedConnectionShouldThrowCommandLineException()
+    {
+        _executor = new PortArgumentExecutor(CommandLineOptions.Instance, _testRequestManager.Object,
+            (parentProcessId, ph) => _testDesignModeClient.Object, _mockProcessHelper.Object);
 
-        [TestMethod]
-        public void ExecutorExecuteForFailedConnectionShouldThrowCommandLineException()
-        {
-            this.executor = new PortArgumentExecutor(CommandLineOptions.Instance, this.testRequestManager.Object,
-                (parentProcessId, ph) => testDesignModeClient.Object, this.mockProcessHelper.Object);
+        _testDesignModeClient.Setup(td => td.ConnectToClientAndProcessRequests(It.IsAny<int>(),
+            It.IsAny<ITestRequestManager>())).Callback(() => throw new TimeoutException());
 
-            testDesignModeClient.Setup(td => td.ConnectToClientAndProcessRequests(It.IsAny<int>(),
-                It.IsAny<ITestRequestManager>())).Callback(() => { throw new TimeoutException(); });
+        int port = 2345;
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
+        Assert.ThrowsException<CommandLineException>(() => _executor.Execute());
 
-            int port = 2345;
-            this.executor.Initialize(port.ToString());
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+        _testDesignModeClient.Verify(td => td.ConnectToClientAndProcessRequests(port, _testRequestManager.Object), Times.Once);
+    }
 
-            testDesignModeClient.Verify(td => td.ConnectToClientAndProcessRequests(port, this.testRequestManager.Object), Times.Once);
-        }
 
+    [TestMethod]
+    public void ExecutorExecuteSetsParentProcessIdOnDesignModeInitializer()
+    {
+        var parentProcessId = 2346;
+        var parentProcessIdArgumentExecutor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
+        parentProcessIdArgumentExecutor.Initialize(parentProcessId.ToString(CultureInfo.InvariantCulture));
+
+        int actualParentProcessId = -1;
+        _executor = new PortArgumentExecutor(CommandLineOptions.Instance,
+            _testRequestManager.Object,
+            (ppid, ph) =>
+            {
+                actualParentProcessId = ppid;
+                return _testDesignModeClient.Object;
+            },
+            _mockProcessHelper.Object
+        );
 
-        [TestMethod]
-        public void ExecutorExecuteSetsParentProcessIdOnDesignModeInitializer()
-        {
-            var parentProcessId = 2346;
-            var parentProcessIdArgumentExecutor = new ParentProcessIdArgumentExecutor(CommandLineOptions.Instance);
-            parentProcessIdArgumentExecutor.Initialize(parentProcessId.ToString());
-
-            int actualParentProcessId = -1;
-            this.executor = new PortArgumentExecutor(CommandLineOptions.Instance,
-                this.testRequestManager.Object,
-                (ppid, ph) =>
-                {
-                    actualParentProcessId = ppid;
-                    return testDesignModeClient.Object;
-                },
-                this.mockProcessHelper.Object
-                );
-
-            int port = 2345;
-            this.executor.Initialize(port.ToString());
-            var result = executor.Execute();
-
-            testDesignModeClient.Verify(td =>
-                td.ConnectToClientAndProcessRequests(port, testRequestManager.Object), Times.Once);
-
-            Assert.AreEqual(parentProcessId, actualParentProcessId, "Parent process Id must be set correctly on design mode initializer");
-
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+        int port = 2345;
+        _executor.Initialize(port.ToString(CultureInfo.InvariantCulture));
+        var result = _executor.Execute();
+
+        _testDesignModeClient.Verify(td =>
+            td.ConnectToClientAndProcessRequests(port, _testRequestManager.Object), Times.Once);
+
+        Assert.AreEqual(parentProcessId, actualParentProcessId, "Parent process Id must be set correctly on design mode initializer");
+
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/Processors/ResponseFileArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ResponseFileArgumentProcessorTests.cs
index 5e9e53c617..3c433aefe7 100644
--- a/test/vstest.console.UnitTests/Processors/ResponseFileArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ResponseFileArgumentProcessorTests.cs
@@ -1,52 +1,51 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ResponseFileArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using TestPlatform.CommandLine.Processors;
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnResponseFileArgumentProcessorCapabilities()
+    {
+        var processor = new ResponseFileArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ResponseFileArgumentProcessorCapabilities);
+    }
 
-    [TestClass]
-    public class ResponseFileArgumentProcessorTests
+    [TestMethod]
+    public void GetExecuterShouldReturnNull()
     {
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnResponseFileArgumentProcessorCapabilities()
-        {
-            var processor = new ResponseFileArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ResponseFileArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnNull()
-        {
-            var processor = new ResponseFileArgumentProcessor();
-            Assert.IsNull(processor.Executor);
-        }
-
-        #region ResponseFileArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new ResponseFileArgumentProcessorCapabilities();
-            Assert.AreEqual("@", capabilities.CommandName);
-            StringAssert.Contains(capabilities.HelpContentResourceName, "Read response file for more options");
-
-            Assert.AreEqual(HelpContentPriority.ResponseFileArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
-
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsTrue(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
+        var processor = new ResponseFileArgumentProcessor();
+        Assert.IsNull(processor.Executor);
     }
+
+    #region ResponseFileArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ResponseFileArgumentProcessorCapabilities();
+        Assert.AreEqual("@", capabilities.CommandName);
+        StringAssert.Contains(capabilities.HelpContentResourceName, "Read response file for more options");
+
+        Assert.AreEqual(HelpContentPriority.ResponseFileArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsTrue(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/ResultsDirectoryArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ResultsDirectoryArgumentProcessorTests.cs
index 1982257d91..bc5d345804 100644
--- a/test/vstest.console.UnitTests/Processors/ResultsDirectoryArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ResultsDirectoryArgumentProcessorTests.cs
@@ -1,169 +1,168 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.IO;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class ResultsDirectoryArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using TestPlatform.CommandLine.Processors;
-    using System;
-    using System.IO;
-    using vstest.console.UnitTests.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-
-    [TestClass]
-    public class ResultsDirectoryArgumentProcessorTests
+    private readonly ResultsDirectoryArgumentExecutor _executor;
+    private readonly TestableRunSettingsProvider _runSettingsProvider;
+
+    public ResultsDirectoryArgumentProcessorTests()
     {
-        private ResultsDirectoryArgumentExecutor executor;
-        private TestableRunSettingsProvider runSettingsProvider;
+        _runSettingsProvider = new TestableRunSettingsProvider();
+        _executor = new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, _runSettingsProvider);
+    }
 
-        [TestInitialize]
-        public void Init()
-        {
-            this.runSettingsProvider = new TestableRunSettingsProvider();
-            this.executor = new ResultsDirectoryArgumentExecutor(CommandLineOptions.Instance, this.runSettingsProvider);
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnResultsDirectoryArgumentProcessorCapabilities()
+    {
+        var processor = new ResultsDirectoryArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is ResultsDirectoryArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnResultsDirectoryArgumentProcessorCapabilities()
-        {
-            var processor = new ResultsDirectoryArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is ResultsDirectoryArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnResultsDirectoryArgumentExecutor()
+    {
+        var processor = new ResultsDirectoryArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is ResultsDirectoryArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnResultsDirectoryArgumentExecutor()
-        {
-            var processor = new ResultsDirectoryArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is ResultsDirectoryArgumentExecutor);
-        }
+    #region ResultsDirectoryArgumentProcessorCapabilities tests
 
-        #region ResultsDirectoryArgumentProcessorCapabilities tests
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new ResultsDirectoryArgumentProcessorCapabilities();
+        Assert.AreEqual("/ResultsDirectory", capabilities.CommandName);
+        var expected = "--ResultsDirectory|/ResultsDirectory\r\n      Test results directory will be created in specified path if not exists.\r\n      Example  /ResultsDirectory:<pathToResultsDirectory>";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.ResultsDirectoryArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new ResultsDirectoryArgumentProcessorCapabilities();
-            Assert.AreEqual("/ResultsDirectory", capabilities.CommandName);
-            var expected = "--ResultsDirectory|/ResultsDirectory\r\n      Test results directory will be created in specified path if not exists.\r\n      Example  /ResultsDirectory:<pathToResultsDirectory>";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.ResultsDirectoryArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+    #endregion
 
-        #endregion
+    #region ResultsDirectoryArgumentExecutor Initialize tests
 
-        #region ResultsDirectoryArgumentExecutor Initialize tests
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
+    {
+        string? folder = null;
+        var message =
+            @"The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory";
+        InitializeExceptionTestTemplate(folder, message);
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNull()
-        {
-            string folder = null;
-            var message =
-                @"The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory";
-            this.InitializeExceptionTestTemplate(folder, message);
-        }
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsAWhiteSpace()
+    {
+        var folder = " ";
+        var message =
+            @"The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory";
+        InitializeExceptionTestTemplate(folder, message);
+    }
 
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsAWhiteSpace()
-        {
-            var folder = " ";
-            var message =
-                @"The /ResultsDirectory parameter requires a value, where the test results should be saved. Example:  /ResultsDirectory:c:\MyTestResultsDirectory";
-            this.InitializeExceptionTestTemplate(folder, message);
-        }
+    [TestMethod]
+    public void InitializeShouldThrowIfGivenPathIsIllegal()
+    {
+        // the internal code uses IsPathRooted which does not consider this rooted on Linux
+        // so we need to convert the path, and use char that is invalid on the current platform
+        var invalidChar = Path.GetInvalidPathChars()[0];
 
-        [TestMethod]
-        public void InitializeShouldThrowIfGivenPathIsIllegal()
-        {
-            // the internal code uses IsPathRooted which does not consider this rooted on Linux
-            // so we need to convert the path, and use char that is invalid on the current platform
-            var invalidChar = Path.GetInvalidPathChars()[0];
-            
-            var folder = TranslatePath($@"c:\som{invalidChar}\illegal\path\");
-            // The error varies based on the runtime and OS, just checking that we detect 
-            // incorrect path should be enough and not so flaky
-            // you might get
-            // - The filename, directory name, or volume label syntax is incorrect
-            // - Illegal characters in path.
-            // - etc.
-            
-            var message = $"The path '{folder}' specified in the 'ResultsDirectory' is invalid. Error:";
-            
-            this.InitializeExceptionTestTemplate(folder, message);
-        }
+        var folder = TranslatePath($@"c:\som{invalidChar}\illegal\path\");
+        // The error varies based on the runtime and OS, just checking that we detect
+        // incorrect path should be enough and not so flaky
+        // you might get
+        // - The filename, directory name, or volume label syntax is incorrect
+        // - Illegal characters in path.
+        // - etc.
 
-        private void InitializeExceptionTestTemplate(string folder, string message)
-        {
-            var isExceptionThrown = false;
-
-            try
-            {
-                this.executor.Initialize(folder);
-            }
-            catch (Exception ex)
-            {
-                isExceptionThrown = true;
-                Assert.IsTrue(ex is CommandLineException, "ex is CommandLineException");
-                StringAssert.StartsWith( ex.Message, message);
-            }
-
-            Assert.IsTrue(isExceptionThrown, "isExceptionThrown");
-        }
+        var message = $"The path '{folder}' specified in the 'ResultsDirectory' is invalid. Error:";
 
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsAndRunSettingsForRelativePathValue()
+        InitializeExceptionTestTemplate(folder, message);
+    }
+
+    private void InitializeExceptionTestTemplate(string? folder, string message)
+    {
+        var isExceptionThrown = false;
+
+        try
         {
-            var relativePath = TranslatePath(@".\relative\path");
-            var absolutePath = Path.GetFullPath(relativePath);
-            this.executor.Initialize(relativePath);
-            Assert.AreEqual(absolutePath, CommandLineOptions.Instance.ResultsDirectory);
-            Assert.AreEqual(absolutePath, this.runSettingsProvider.QueryRunSettingsNode(ResultsDirectoryArgumentExecutor.RunSettingsPath));
+            _executor.Initialize(folder);
         }
-
-        [TestMethod]
-        public void InitializeShouldSetCommandLineOptionsAndRunSettingsForAbsolutePathValue()
+        catch (Exception ex)
         {
-            var absolutePath = TranslatePath(@"c:\random\someone\testresults");
-            this.executor.Initialize(absolutePath);
-            Assert.AreEqual(absolutePath, CommandLineOptions.Instance.ResultsDirectory);
-            Assert.AreEqual(absolutePath, this.runSettingsProvider.QueryRunSettingsNode(ResultsDirectoryArgumentExecutor.RunSettingsPath));
+            isExceptionThrown = true;
+            Assert.IsTrue(ex is CommandLineException, "ex is CommandLineException");
+            StringAssert.StartsWith(ex.Message, message);
         }
 
-        #endregion
+        Assert.IsTrue(isExceptionThrown, "isExceptionThrown");
+    }
+
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsAndRunSettingsForRelativePathValue()
+    {
+        var relativePath = TranslatePath(@".\relative\path");
+        var absolutePath = Path.GetFullPath(relativePath);
+        _executor.Initialize(relativePath);
+        Assert.AreEqual(absolutePath, CommandLineOptions.Instance.ResultsDirectory);
+        Assert.AreEqual(absolutePath, _runSettingsProvider.QueryRunSettingsNode(ResultsDirectoryArgumentExecutor.RunSettingsPath));
+    }
 
-        #region ResultsDirectoryArgumentExecutor Execute tests
+    [TestMethod]
+    public void InitializeShouldSetCommandLineOptionsAndRunSettingsForAbsolutePathValue()
+    {
+        var absolutePath = TranslatePath(@"c:\random\someone\testresults");
+        _executor.Initialize(absolutePath);
+        Assert.AreEqual(absolutePath, CommandLineOptions.Instance.ResultsDirectory);
+        Assert.AreEqual(absolutePath, _runSettingsProvider.QueryRunSettingsNode(ResultsDirectoryArgumentExecutor.RunSettingsPath));
+    }
 
-        [TestMethod]
-        public void ExecuteShouldReturnSuccess()
-        {
-            Assert.AreEqual(ArgumentProcessorResult.Success, executor.Execute());
-        }
+    #endregion
 
-        #endregion
-        
-        private string TranslatePath(string path)
-        {
-            // RuntimeInformation has conflict when used
-            if (Environment.OSVersion.Platform.ToString().StartsWith("Win"))
-                return path;
+    #region ResultsDirectoryArgumentExecutor Execute tests
 
-            var prefix = Path.GetTempPath();
+    [TestMethod]
+    public void ExecuteShouldReturnSuccess()
+    {
+        Assert.AreEqual(ArgumentProcessorResult.Success, _executor.Execute());
+    }
 
-            return Regex.Replace(path.Replace("\\", "/"), @"(\w)\:/", $@"{prefix}$1/");
-        }
+    #endregion
+
+    private static string TranslatePath(string path)
+    {
+        // RuntimeInformation has conflict when used
+        if (Environment.OSVersion.Platform.ToString().StartsWith("Win"))
+            return path;
+
+        var prefix = Path.GetTempPath();
+
+        return Regex.Replace(path.Replace("\\", "/"), @"(\w)\:/", $@"{prefix}$1/");
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/RunSettingsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/RunSettingsArgumentProcessorTests.cs
index 199ae59c7e..d32df8d4c1 100644
--- a/test/vstest.console.UnitTests/Processors/RunSettingsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/RunSettingsArgumentProcessorTests.cs
@@ -1,443 +1,439 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using System;
-    using System.IO;
-    using System.Xml;
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using vstest.console.UnitTests.Processors;
+using vstest.console.UnitTests.Processors;
 
-    using Moq;
-    using System.Text;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
 
-    using ExceptionUtilities = Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.ExceptionUtilities;
+[TestClass]
+public class RunSettingsArgumentProcessorTests
+{
+    private readonly TestableRunSettingsProvider _settingsProvider;
 
-    [TestClass]
-    public class RunSettingsArgumentProcessorTests
+    public RunSettingsArgumentProcessorTests()
     {
-        private TestableRunSettingsProvider settingsProvider;
+        _settingsProvider = new TestableRunSettingsProvider();
+    }
 
-        [TestInitialize]
-        public void Init()
-        {
-            this.settingsProvider = new TestableRunSettingsProvider();
-        }
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        CommandLineOptions.Reset();
+    }
 
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            CommandLineOptions.Instance.Reset();
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnRunSettingsArgumentProcessorCapabilities()
+    {
+        var processor = new RunSettingsArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is RunSettingsArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnRunSettingsArgumentProcessorCapabilities()
-        {
-            var processor = new RunSettingsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is RunSettingsArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnRunSettingsArgumentExecutor()
+    {
+        var processor = new RunSettingsArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is RunSettingsArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnRunSettingsArgumentExecutor()
-        {
-            var processor = new RunSettingsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is RunSettingsArgumentExecutor);
-        }
+    #region RunSettingsArgumentProcessorCapabilities tests
 
-        #region RunSettingsArgumentProcessorCapabilities tests
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new RunSettingsArgumentProcessorCapabilities();
+        Assert.AreEqual("/Settings", capabilities.CommandName);
+        var expected = "--Settings|/Settings:<Settings File>\r\n      Settings to use when running tests.";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.RunSettingsArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.RunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new RunSettingsArgumentProcessorCapabilities();
-            Assert.AreEqual("/Settings", capabilities.CommandName);
-            var expected = "--Settings|/Settings:<Settings File>\r\n      Settings to use when running tests.";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.RunSettingsArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.RunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+    #endregion
 
-        #endregion
+    #region RunSettingsArgumentExecutor tests
 
-        #region RunSettingsArgumentExecutor tests
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfArgumentIsNull()
+    {
+        Action action = () => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null!).Initialize(null);
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfArgumentIsNull()
-        {
-            Action action = () => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null).Initialize(null);
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            action,
+            "The /Settings parameter requires a settings file to be provided.");
+    }
 
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                action,
-                "The /Settings parameter requires a settings file to be provided.");
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfArgumentIsWhiteSpace()
+    {
+        Action action = () => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null!).Initialize("  ");
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfArgumentIsWhiteSpace()
-        {
-            Action action = () => new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null).Initialize("  ");
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            action,
+            "The /Settings parameter requires a settings file to be provided.");
+    }
 
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                action,
-                "The /Settings parameter requires a settings file to be provided.");
-        }
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfFileDoesNotExist()
+    {
+        var fileName = "C:\\Imaginary\\nonExistentFile.txt";
 
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfFileDoesNotExist()
-        {
-            var fileName = "C:\\Imaginary\\nonExistentFile.txt";
+        var executor = new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null!);
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(false);
 
-            var executor = new RunSettingsArgumentExecutor(CommandLineOptions.Instance, null);
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(false);
+        executor.FileHelper = mockFileHelper.Object;
 
-            executor.FileHelper = mockFileHelper.Object;
+        ExceptionUtilities.ThrowsException<CommandLineException>(
+            () => executor.Initialize(fileName),
+            "The Settings file '{0}' could not be found.",
+            fileName);
+    }
 
-            ExceptionUtilities.ThrowsException<CommandLineException>(
-                () => executor.Initialize(fileName),
-                "The Settings file '{0}' could not be found.",
-                fileName);
-        }
+    [TestMethod]
+    public void InitializeShouldThrowIfRunSettingsSchemaDoesNotMatch()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = "<BadRunSettings></BadRunSettings>";
 
-        [TestMethod]
-        public void InitializeShouldThrowIfRunSettingsSchemaDoesNotMatch()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = "<BadRunSettings></BadRunSettings>";
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
 
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
 
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
 
-            executor.FileHelper = mockFileHelper.Object;
+        // Act and Assert.
+        ExceptionUtilities.ThrowsException<SettingsException>(
+            () => executor.Initialize(fileName),
+            "Settings file provided does not conform to required format.");
+    }
 
-            // Act and Assert.
-            ExceptionUtilities.ThrowsException<SettingsException>(
-                () => executor.Initialize(fileName),
-                "Settings file provided does not conform to required format.");
-        }
+    [TestMethod]
+    public void InitializeShouldSetActiveRunSettings()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = "<RunSettings></RunSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+        // Assert.
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        Assert.AreEqual(fileName, CommandLineOptions.Instance.SettingsFile);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetActiveRunSettings()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = "<RunSettings></RunSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-            // Assert.
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            Assert.AreEqual(fileName, CommandLineOptions.Instance.SettingsFile);
-        }
+    [TestMethod]
+    public void InitializeShouldSetSettingsFileForCommandLineOptions()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = "<RunSettings></RunSettings>";
 
-        [TestMethod]
-        public void InitializeShouldSetSettingsFileForCommandLineOptions()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = "<RunSettings></RunSettings>";
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
 
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
 
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
+        // Act.
+        executor.Initialize(fileName);
 
-            // Act.
-            executor.Initialize(fileName);
+        // Assert.
+        Assert.AreEqual(fileName, CommandLineOptions.Instance.SettingsFile);
+    }
 
-            // Assert.
-            Assert.AreEqual(fileName, CommandLineOptions.Instance.SettingsFile);
-        }
+    [TestMethod]
+    public void InitializeShouldAddDefaultSettingsIfNotPresent()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = "<RunSettings></RunSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+        // Assert.
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+        RunConfiguration runConfiguration =
+            XmlRunSettingsUtilities.GetRunConfigurationNode(_settingsProvider.ActiveRunSettings.SettingsXml);
+        Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
+        Assert.AreEqual(runConfiguration.TargetFramework!.ToString(), Framework.DefaultFramework.ToString());
+        Assert.AreEqual(runConfiguration.TargetPlatform, Constants.DefaultPlatform);
 
-        [TestMethod]
-        public void InitializeShouldAddDefaultSettingsIfNotPresent()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = "<RunSettings></RunSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-            // Assert.
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-            RunConfiguration runConfiguration =
-                XmlRunSettingsUtilities.GetRunConfigurationNode(this.settingsProvider.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(runConfiguration.ResultsDirectory, Constants.DefaultResultsDirectory);
-            Assert.AreEqual(runConfiguration.TargetFramework.ToString(), Framework.DefaultFramework.ToString());
-            Assert.AreEqual(runConfiguration.TargetPlatform, Constants.DefaultPlatform);
+    }
 
-        }
+    [TestMethod]
+    public void InitializeShouldSetActiveRunSettingsForTestSettingsFiles()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.testsettings";
+        var settingsXml = "<TestSettings></TestSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+
+        // Assert.
+        Assert.IsNotNull(_settingsProvider.ActiveRunSettings);
+
+        var expected = string.Join(Environment.NewLine,
+            $"<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+            $"<RunSettings>",
+            $"  <RunConfiguration>",
+            $"    <ResultsDirectory>{Constants.DefaultResultsDirectory}</ResultsDirectory>",
+            $"    <TargetPlatform>{Constants.DefaultPlatform}</TargetPlatform>",
+            $"    <TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>",
+            $"  </RunConfiguration>",
+            $"  <MSTest>",
+            $"    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
+            $"    <ForcedLegacyMode>true</ForcedLegacyMode>",
+            $"  </MSTest>",
+            $"  <DataCollectionRunSettings>",
+            $"    <DataCollectors />",
+            $"  </DataCollectionRunSettings>",
+            $"</RunSettings>");
+        StringAssert.Contains(_settingsProvider.ActiveRunSettings.SettingsXml, expected);
+    }
 
-        [TestMethod]
-        public void InitializeShouldSetActiveRunSettingsForTestSettingsFiles()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.testsettings";
-            var settingsXml = "<TestSettings></TestSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-
-            // Assert.
-            Assert.IsNotNull(this.settingsProvider.ActiveRunSettings);
-
-            var expected = string.Join(Environment.NewLine,
-                $"<?xml version=\"1.0\" encoding=\"utf-16\"?>",
-                $"<RunSettings>",
-                $"  <RunConfiguration>",
-                $"    <ResultsDirectory>{Constants.DefaultResultsDirectory}</ResultsDirectory>",
-                $"    <TargetPlatform>{Constants.DefaultPlatform}</TargetPlatform>",
-                $"    <TargetFrameworkVersion>{Framework.DefaultFramework.Name}</TargetFrameworkVersion>",
-                $"  </RunConfiguration>",
-                $"  <MSTest>",
-                $"    <SettingsFile>C:\\temp\\r.testsettings</SettingsFile>",
-                $"    <ForcedLegacyMode>true</ForcedLegacyMode>",
-                $"  </MSTest>",
-                $"  <DataCollectionRunSettings>",
-                $"    <DataCollectors />",
-                $"  </DataCollectionRunSettings>",
-                $"</RunSettings>");
-            StringAssert.Contains(this.settingsProvider.ActiveRunSettings.SettingsXml, expected);
-        }
 
+    [TestMethod]
+    public void InitializeShouldUpdateCommandLineOptionsArchitectureAndFxIfProvided()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = $"<RunSettings><RunConfiguration><TargetPlatform>{nameof(Architecture.X64)}</TargetPlatform><TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+        // Assert.
+        Assert.IsTrue(CommandLineOptions.Instance.ArchitectureSpecified);
+        Assert.IsTrue(CommandLineOptions.Instance.FrameworkVersionSpecified);
+        Assert.AreEqual(Architecture.X64, CommandLineOptions.Instance.TargetArchitecture);
+        Assert.AreEqual(Constants.DotNetFramework46, CommandLineOptions.Instance.TargetFrameworkVersion.Name);
+    }
 
-        [TestMethod]
-        public void InitializeShouldUpdateCommandLineOptionsArchitectureAndFxIfProvided()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = $"<RunSettings><RunConfiguration><TargetPlatform>{nameof(Architecture.X64)}</TargetPlatform><TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-            // Assert.
-            Assert.IsTrue(CommandLineOptions.Instance.ArchitectureSpecified);
-            Assert.IsTrue(CommandLineOptions.Instance.FrameworkVersionSpecified);
-            Assert.AreEqual(Architecture.X64, CommandLineOptions.Instance.TargetArchitecture);
-            Assert.AreEqual(Constants.DotNetFramework46, CommandLineOptions.Instance.TargetFrameworkVersion.Name);
-        }
+    [TestMethod]
+    public void InitializeShouldNotUpdateCommandLineOptionsArchitectureAndFxIfNotProvided()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var settingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+        // Assert.
+        Assert.IsFalse(CommandLineOptions.Instance.ArchitectureSpecified);
+        Assert.IsFalse(CommandLineOptions.Instance.FrameworkVersionSpecified);
+    }
 
-        [TestMethod]
-        public void InitializeShouldNotUpdateCommandLineOptionsArchitectureAndFxIfNotProvided()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var settingsXml = "<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-            // Assert.
-            Assert.IsFalse(CommandLineOptions.Instance.ArchitectureSpecified);
-            Assert.IsFalse(CommandLineOptions.Instance.FrameworkVersionSpecified);
-        }
+    [TestMethod]
+    public void InitializeShouldPreserveActualJapaneseString()
+    {
+        var runsettingsFile = Path.Combine(Path.GetTempPath(), "InitializeShouldPreserveActualJapaneseString.runsettings");
+        var settingsXml = @"<RunSettings><RunConfiguration><ResultsDirectory>C:\新しいフォルダー</ResultsDirectory></RunConfiguration></RunSettings>";
 
-        [TestMethod]
-        public void InitializeShouldPreserveActualJapaneseString()
-        {
-            var runsettingsFile = Path.Combine(Path.GetTempPath(), "InitializeShouldPreserveActualJapaneseString.runsettings");
-            var settingsXml = @"<RunSettings><RunConfiguration><ResultsDirectory>C:\新しいフォルダー</ResultsDirectory></RunConfiguration></RunSettings>";
+        File.WriteAllText(runsettingsFile, settingsXml, Encoding.UTF8);
 
-            File.WriteAllText(runsettingsFile, settingsXml, Encoding.UTF8);
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            null);
 
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                null);
+        executor.Initialize(runsettingsFile);
+        Assert.IsTrue(_settingsProvider.ActiveRunSettings!.SettingsXml!.Contains(@"C:\新しいフォルダー"));
+        File.Delete(runsettingsFile);
+    }
 
-            executor.Initialize(runsettingsFile);
-            Assert.IsTrue(this.settingsProvider.ActiveRunSettings.SettingsXml.Contains(@"C:\新しいフォルダー"));
-            File.Delete(runsettingsFile);
-        }
+    [TestMethod]
+    public void InitializeShouldSetInIsolationToTrueIfEnvironmentVariablesSpecified()
+    {
+        var settingsXml = @"<RunSettings><RunConfiguration><EnvironmentVariables><RANDOM_PATH>C:\temp</RANDOM_PATH></EnvironmentVariables></RunConfiguration></RunSettings>";
 
-        [TestMethod]
-        public void InitializeShouldSetInIsolataionToTrueIfEnvironmentVariablesSpecified()
-        {
-            var settingsXml = @"<RunSettings><RunConfiguration><EnvironmentVariables><RANDOM_PATH>C:\temp</RANDOM_PATH></EnvironmentVariables></RunConfiguration></RunSettings>";
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
 
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
 
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
 
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
+        // Act.
+        executor.Initialize(fileName);
 
-            // Act.
-            executor.Initialize(fileName);
+        // Assert.
+        Assert.IsTrue(CommandLineOptions.Instance.InIsolation);
+        Assert.AreEqual("true", _settingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
+    }
 
-            // Assert.
-            Assert.IsTrue(CommandLineOptions.Instance.InIsolation);
-            Assert.AreEqual("true", this.settingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
-        }
+    [TestMethod]
+    public void InitializeShouldNotSetInIsolationToTrueIfEnvironmentVariablesNotSpecified()
+    {
+        var settingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
 
-        [TestMethod]
-        public void InitializeShouldNotSetInIsolataionToTrueIfEnvironmentVariablesNotSpecified()
-        {
-            var settingsXml = @"<RunSettings><RunConfiguration></RunConfiguration></RunSettings>";
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
 
-            /// Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
 
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
 
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
+        // Act.
+        executor.Initialize(fileName);
 
-            // Act.
-            executor.Initialize(fileName);
+        // Assert.
+        Assert.IsFalse(CommandLineOptions.Instance.InIsolation);
+        Assert.IsNull(_settingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
+    }
 
-            // Assert.
-            Assert.IsFalse(CommandLineOptions.Instance.InIsolation);
-            Assert.IsNull(this.settingsProvider.QueryRunSettingsNode(InIsolationArgumentExecutor.RunSettingsPath));
-        }
+    [TestMethod]
+    public void InitializeShouldUpdateTestCaseFilterIfProvided()
+    {
+        // Arrange.
+        var fileName = "C:\\temp\\r.runsettings";
+        var filter = "TestCategory=Included";
+        var settingsXml = $"<RunSettings><RunConfiguration><TestCaseFilter>{filter}</TestCaseFilter></RunConfiguration></RunSettings>";
+
+        var executor = new TestableRunSettingsArgumentExecutor(
+            CommandLineOptions.Instance,
+            _settingsProvider,
+            settingsXml);
+
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
+        executor.FileHelper = mockFileHelper.Object;
+
+        // Act.
+        executor.Initialize(fileName);
+
+        // Assert.
+        Assert.AreEqual(filter, CommandLineOptions.Instance.TestCaseFilterValue);
+    }
+    #endregion
 
-        [TestMethod]
-        public void InitializeShouldUpdateTestCaseFilterIfProvided()
-        {
-            // Arrange.
-            var fileName = "C:\\temp\\r.runsettings";
-            var filter = "TestCategory=Included";
-            var settingsXml = $"<RunSettings><RunConfiguration><TestCaseFilter>{filter}</TestCaseFilter></RunConfiguration></RunSettings>";
-
-            var executor = new TestableRunSettingsArgumentExecutor(
-                CommandLineOptions.Instance,
-                this.settingsProvider,
-                settingsXml);
-
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(It.IsAny<string>())).Returns(true);
-            executor.FileHelper = mockFileHelper.Object;
-
-            // Act.
-            executor.Initialize(fileName);
-
-            // Assert.
-            Assert.AreEqual(filter, CommandLineOptions.Instance.TestCaseFilterValue);
-        }
-        #endregion
+    #region Testable Implementations
 
-        #region Testable Implementations
+    private class TestableRunSettingsArgumentExecutor : RunSettingsArgumentExecutor
+    {
+        private readonly string? _runSettingsString;
 
-        private class TestableRunSettingsArgumentExecutor : RunSettingsArgumentExecutor
-        {
-            private string runSettingsString;
+        internal TestableRunSettingsArgumentExecutor(
+            CommandLineOptions commandLineOptions,
+            IRunSettingsProvider runSettingsManager,
+            string? runSettings)
+            : base(commandLineOptions, runSettingsManager)
 
-            internal TestableRunSettingsArgumentExecutor(
-                CommandLineOptions commandLineOptions,
-                IRunSettingsProvider runSettingsManager,
-                string runSettings)
-                : base(commandLineOptions, runSettingsManager)
+        {
+            _runSettingsString = runSettings;
+        }
 
+        protected override XmlReader GetReaderForFile(string runSettingsFile)
+        {
+            if (_runSettingsString == null)
             {
-                this.runSettingsString = runSettings;
+                return base.GetReaderForFile(runSettingsFile);
             }
 
-            protected override XmlReader GetReaderForFile(string runSettingsFile)
-            {
-                if (this.runSettingsString == null)
-                {
-                    return base.GetReaderForFile(runSettingsFile);
-                }
-
-                var reader = new StringReader(this.runSettingsString);
-                var xmlReader = XmlReader.Create(reader, XmlRunSettingsUtilities.ReaderSettings);
+            var reader = new StringReader(_runSettingsString);
+            var xmlReader = XmlReader.Create(reader, XmlRunSettingsUtilities.ReaderSettings);
 
-                return xmlReader;
-            }
+            return xmlReader;
         }
-
-        #endregion
     }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
index 3a79cd4301..eaffa017fc 100644
--- a/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
@@ -1,585 +1,606 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class RunSpecificTestsArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Runtime.Versioning;
-    using System.Threading.Tasks;
-
-    using CommandLineUtilities;
-    using CoreUtilities.Tracing.Interfaces;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using vstest.console.Internal;
-    using vstest.console.UnitTests.Processors;
-
-    [TestClass]
-    public class RunSpecificTestsArgumentProcessorTests
+    private const string NoDiscoveredTestsWarning = @"No test is available in DummyTest.dll. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.";
+    private const string TestAdapterPathSuggestion = @"Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.";
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly InferHelper _inferHelper;
+    private readonly string _dummyTestFilePath = "DummyTest.dll";
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyMetadataProvider;
+    private readonly Task<IMetricsPublisher> _mockMetricsPublisherTask;
+    private readonly Mock<IMetricsPublisher> _mockMetricsPublisher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockAttachmentsProcessingManager;
+    private readonly Mock<IArtifactProcessingManager> _mockArtifactProcessingManager;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariableHelper;
+
+    private RunSpecificTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager)
     {
-        private const string NoDiscoveredTestsWarning = @"No test is available in DummyTest.dll. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.";
-        private const string TestAdapterPathSuggestion = @"Additionally, path to test adapters can be specified using /TestAdapterPath command. Example  /TestAdapterPath:<pathToCustomAdapters>.";
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private readonly Mock<IOutput> mockOutput;
-        private readonly InferHelper inferHelper;
-        private string dummyTestFilePath = "DummyTest.dll";
-        private Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private Mock<IAssemblyMetadataProvider> mockAssemblyMetadataProvider;
-        private Task<IMetricsPublisher> mockMetricsPublisherTask;
-        private Mock<IMetricsPublisher> mockMetricsPublisher;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<ITestRunAttachmentsProcessingManager> mockAttachmentsProcessingManager;
-
-        private RunSpecificTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager)
-        {
-            var runSettingsProvider = new TestableRunSettingsProvider();
-            runSettingsProvider.AddDefaultRunSettings();
-            return new RunSpecificTestsArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider, testRequestManager, this.mockOutput.Object);
-        }
-
-        public RunSpecificTestsArgumentProcessorTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockOutput = new Mock<IOutput>();
-            this.mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
-            this.inferHelper = new InferHelper(this.mockAssemblyMetadataProvider.Object);
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
-            this.mockFileHelper.Setup(fh => fh.Exists(this.dummyTestFilePath)).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
-            this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
-            this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
-            this.mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");
-            this.mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnRunSpecificTestsArgumentProcessorCapabilities()
-        {
-            RunSpecificTestsArgumentProcessor processor = new RunSpecificTestsArgumentProcessor();
-
-            Assert.IsTrue(processor.Metadata.Value is RunSpecificTestsArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecutorShouldReturnRunSpecificTestsArgumentExecutor()
-        {
-            RunSpecificTestsArgumentProcessor processor = new RunSpecificTestsArgumentProcessor();
-
-            Assert.IsTrue(processor.Executor.Value is RunSpecificTestsArgumentExecutor);
-        }
-
-        #region RunSpecificTestsArgumentProcessorCapabilitiesTests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            RunSpecificTestsArgumentProcessorCapabilities capabilities = new RunSpecificTestsArgumentProcessorCapabilities();
-            Assert.AreEqual("/Tests", capabilities.CommandName);
-            StringAssert.Contains(capabilities.HelpContentResourceName.NormalizeLineEndings(),
-                "/Tests:<Test Names>\r\n      Run tests with names that match the provided values.".NormalizeLineEndings());
-
-            Assert.AreEqual(HelpContentPriority.RunSpecificTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsTrue(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-        #endregion
-
-        #region RunSpecificTestsArgumentExecutorTests
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNull()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => { executor.Initialize(null); });
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsEmpty()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => { executor.Initialize(String.Empty); });
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsWhiteSpace()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => { executor.Initialize(" "); });
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentsAreEmpty()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => { executor.Initialize(" , "); });
-        }
-
-        [TestMethod]
-        public void ExecutorShouldSplitTestsSeparatedByComma()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
-        }
-
-        [TestMethod]
-        public void ExecutorExecuteForNoSourcesShouldThrowCommandLineException()
-        {
-            CommandLineOptions.Instance.Reset();
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
-        }
+        var runSettingsProvider = new TestableRunSettingsProvider();
+        runSettingsProvider.AddDefaultRunSettings();
+        return new RunSpecificTestsArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider, testRequestManager, _mockArtifactProcessingManager.Object, _mockOutput.Object);
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteForValidSourceWithTestCaseFilterShouldRunTests()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+    public RunSpecificTestsArgumentProcessorTests()
+    {
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockOutput = new Mock<IOutput>();
+        _mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
+        _inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
+        _mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny<string>())).Returns(Architecture.X64);
+        _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
+        _mockFileHelper.Setup(fh => fh.Exists(_dummyTestFilePath)).Returns(true);
+        _mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+        _mockMetricsPublisher = new Mock<IMetricsPublisher>();
+        _mockMetricsPublisherTask = Task.FromResult(_mockMetricsPublisher.Object);
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
+        _mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");
+        _mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _mockArtifactProcessingManager = new Mock<IArtifactProcessingManager>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+    }
 
-            this.ResetAndAddSourceToCommandLineOptions();
+    [TestMethod]
+    public void GetMetadataShouldReturnRunSpecificTestsArgumentProcessorCapabilities()
+    {
+        RunSpecificTestsArgumentProcessor processor = new();
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            CommandLineOptions.Instance.TestCaseFilterValue = "Filter";
-            executor.Initialize("Test1");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
-
-            mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
-            mockTestPlatform.Verify(o => o.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(c => c.TestCaseFilter == "Filter"), It.IsAny<TestPlatformOptions>()), Times.Once());
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        Assert.IsTrue(processor.Metadata.Value is RunSpecificTestsArgumentProcessorCapabilities);
+    }
 
+    [TestMethod]
+    public void GetExecutorShouldReturnRunSpecificTestsArgumentExecutor()
+    {
+        RunSpecificTestsArgumentProcessor processor = new();
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowTestPlatformExceptionThrownDuringDiscovery()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        Assert.IsTrue(processor.Executor!.Value is RunSpecificTestsArgumentExecutor);
+    }
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    #region RunSpecificTestsArgumentProcessorCapabilitiesTests
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
-        }
-
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowInvalidOperationExceptionThrownDuringDiscovery()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        RunSpecificTestsArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/Tests", capabilities.CommandName);
+        StringAssert.Contains(capabilities.HelpContentResourceName.NormalizeLineEndings(),
+            "/Tests:<Test Names>\r\n      Run tests with names that match the provided values.".NormalizeLineEndings());
+
+        Assert.AreEqual(HelpContentPriority.RunSpecificTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsTrue(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+    #endregion
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    #region RunSpecificTestsArgumentExecutorTests
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
+    {
+        CommandLineOptions.Reset();
 
-            Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
-        }
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowSettingsExceptionThrownDuringDiscovery()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        Assert.ThrowsException<CommandLineException>(() => executor.Initialize(null));
+    }
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsEmpty()
+    {
+        CommandLineOptions.Reset();
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        Assert.ThrowsException<CommandLineException>(() => executor.Initialize(string.Empty));
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsWhiteSpace()
+    {
+        CommandLineOptions.Reset();
+
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        Assert.ThrowsException<CommandLineException>(() => executor.Initialize(" "));
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentsAreEmpty()
+    {
+        CommandLineOptions.Reset();
+
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        Assert.ThrowsException<CommandLineException>(() => executor.Initialize(" , "));
+    }
 
-            Assert.ThrowsException<SettingsException>(() => executor.Execute());
-        }
+    [TestMethod]
+    public void ExecutorShouldSplitTestsSeparatedByComma()
+    {
+        CommandLineOptions.Reset();
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowTestPlatformExceptionThrownDuringExecution()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-
-            mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
-
-            executor.Initialize("Test1");
+        Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+    }
 
-            Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
-        }
-
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowSettingsExceptionThrownDuringExecution()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-
-            mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new SettingsException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+    [TestMethod]
+    public void ExecutorExecuteForNoSourcesShouldThrowCommandLineException()
+    {
+        CommandLineOptions.Reset();
 
-            executor.Initialize("Test1");
-
-            Assert.ThrowsException<SettingsException>(() => executor.Execute());
-        }
-
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowInvalidOperationExceptionThrownDuringExecution()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
-
-            mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new InvalidOperationException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+    }
 
-            this.ResetAndAddSourceToCommandLineOptions();
+    [TestMethod]
+    public void ExecutorExecuteForValidSourceWithTestCaseFilterShouldRunTests()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
 
-            executor.Initialize("Test1");
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
-        }
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldForValidSourcesAndNoTestsDiscoveredShouldLogWarningAndReturnSuccess()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        CommandLineOptions.Instance.TestCaseFilterValue = "Filter";
+        executor.Initialize("Test1");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
 
-            // Setting some test adapter path
-            CommandLineOptions.Instance.TestAdapterPath = @"C:\Foo";
+        _mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
+        mockTestPlatform.Verify(o => o.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(c => c.TestCaseFilter == "Filter"), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()), Times.Once());
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(new List<TestCase>()));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
 
-            executor.Initialize("Test1");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowTestPlatformExceptionThrownDuringDiscovery()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            this.mockOutput.Verify(o => o.WriteLine("Starting test discovery, please wait...", OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine(NoDiscoveredTestsWarning, OutputLevel.Warning), Times.Once);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldForValidSourcesAndNoTestsDiscoveredShouldLogAppropriateWarningIfTestAdapterPathIsNotSetAndReturnSuccess()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
+    }
 
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(new List<TestCase>()));
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowInvalidOperationExceptionThrownDuringDiscovery()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            executor.Initialize("Test1");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.mockOutput.Verify(o => o.WriteLine("Starting test discovery, please wait...", OutputLevel.Information), Times.Once);
-            this.mockOutput.Verify(o => o.WriteLine(NoDiscoveredTestsWarning + " " + TestAdapterPathSuggestion, OutputLevel.Warning), Times.Once);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-        [TestMethod]
-        public void ExecutorExecuteShouldForValidSourcesAndValidSelectedTestsRunsTestsAndReturnSuccess()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
+    }
 
-            this.ResetAndAddSourceToCommandLineOptions();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowSettingsExceptionThrownDuringDiscovery()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Throws(new SettingsException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        Assert.ThrowsException<SettingsException>(() => executor.Execute());
+    }
 
-            executor.Initialize("Test1");
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowTestPlatformExceptionThrownDuringExecution()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-        [TestMethod]
-        public void ExecutorShouldRunTestsWhenTestsAreCommaSeparated()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        executor.Initialize("Test1");
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
+    }
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowSettingsExceptionThrownDuringExecution()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            executor.Initialize("Test1, Test2");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new SettingsException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-        [TestMethod]
-        public void ExecutorShouldRunTestsWhenTestsAreFiltered()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            ResetAndAddSourceToCommandLineOptions();
+        executor.Initialize("Test1");
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        Assert.ThrowsException<SettingsException>(() => executor.Execute());
+    }
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowInvalidOperationExceptionThrownDuringExecution()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            executor.Initialize("Test1");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        mockTestRunRequest.Setup(dr => dr.ExecuteAsync()).Throws(new InvalidOperationException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        ResetAndAddSourceToCommandLineOptions();
 
-        [TestMethod]
-        public void ExecutorShouldWarnWhenTestsAreNotAvailable()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            ResetAndAddSourceToCommandLineOptions();
+        executor.Initialize("Test1");
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
+    }
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+    [TestMethod]
+    public void ExecutorExecuteShouldForValidSourcesAndNoTestsDiscoveredShouldLogWarningAndReturnSuccess()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
 
-            executor.Initialize("Test1, Test2");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        // Setting some test adapter path
+        CommandLineOptions.Instance.TestAdapterPath = [@"C:\Foo"];
 
-            mockOutput.Verify(o => o.WriteLine("A total of 1 tests were discovered but some tests do not match the specified selection criteria(Test1). Use right value(s) and try again.", OutputLevel.Warning), Times.Once);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(new List<TestCase>()));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-        [TestMethod]
-        public void ExecutorShouldRunTestsWhenTestsAreCommaSeparatedWithEscape()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        executor.Initialize("Test1");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
 
-            ResetAndAddSourceToCommandLineOptions();
+        _mockOutput.Verify(o => o.WriteLine("Starting test discovery, please wait...", OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine(NoDiscoveredTestsWarning, OutputLevel.Warning), Times.Once);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1(a,b)", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2(c,d)", new Uri("http://FooTestUri1"), "Source1"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+    [TestMethod]
+    public void ExecutorExecuteShouldForValidSourcesAndNoTestsDiscoveredShouldLogAppropriateWarningIfTestAdapterPathIsNotSetAndReturnSuccess()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(new List<TestCase>()));
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            executor.Initialize("Test1(a\\,b), Test2(c\\,d)");
-            ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        executor.Initialize("Test1");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
 
-            mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
-            Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
-        }
+        _mockOutput.Verify(o => o.WriteLine("Starting test discovery, please wait...", OutputLevel.Information), Times.Once);
+        _mockOutput.Verify(o => o.WriteLine(NoDiscoveredTestsWarning + " " + TestAdapterPathSuggestion, OutputLevel.Warning), Times.Once);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
 
-        [TestMethod]
-        public void ExecutorShouldDisplayWarningIfNoTestsAreExecuted()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var mockTestRunStats = new Mock<ITestRunStatistics>();
+    [TestMethod]
+    public void ExecutorExecuteShouldForValidSourcesAndValidSelectedTestsRunsTestsAndReturnSuccess()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        ResetAndAddSourceToCommandLineOptions();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Returns(1).Raises(tr => tr.OnRunCompletion += null,
-                new TestRunCompleteEventArgs(mockTestRunStats.Object, false, false, null, null, new TimeSpan()));
+        List<TestCase> list = [new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1")];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            executor.Initialize("Test1");
-            executor.Execute();
+        executor.Initialize("Test1");
 
-            this.mockOutput.Verify(op => op.WriteLine(It.Is<string>(st => st.Contains("Additionally, path to test adapters can be specified using /TestAdapterPath command.")), OutputLevel.Warning), Times.Once);
-        }
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
 
-        [TestMethod]
-        public void ExecutorShouldNotDisplayWarningIfTestsAreExecuted()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
-            var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-            var testRunStats = new TestRunStatistics(1, new Dictionary<TestOutcome, long> { { TestOutcome.Passed, 1 } });
+    [TestMethod]
+    public void ExecutorShouldRunTestsWhenTestsAreCommaSeparated()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+        ResetAndAddSourceToCommandLineOptions();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Returns(1).Raises(tr => tr.OnRunCompletion += null,
-                new TestRunCompleteEventArgs(testRunStats, false, false, null, null, new TimeSpan()));
-
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
-            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockDiscoveryRequest.Object);
-
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
 
-            executor.Initialize("Test1");
-            executor.Execute();
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
 
-            this.mockOutput.Verify(op => op.WriteLine(It.Is<string>(st => st.Contains("Additionally, path to test adapters can be specified using /TestAdapterPath command.")), OutputLevel.Warning), Times.Never);
-        }
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-        #endregion
+        executor.Initialize("Test1, Test2");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
 
-        private void ResetAndAddSourceToCommandLineOptions()
-        {
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.TestCaseFilterValue = null;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.AddSource(this.dummyTestFilePath);
-        }
+        _mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
+
+    [TestMethod]
+    public void ExecutorShouldRunTestsWhenTestsAreFiltered()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+
+        ResetAndAddSourceToCommandLineOptions();
+
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        executor.Initialize("Test1");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+
+        _mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
+
+    [TestMethod]
+    public void ExecutorShouldWarnWhenTestsAreNotAvailable()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+
+        ResetAndAddSourceToCommandLineOptions();
+
+        List<TestCase> list = [new TestCase("Test2", new Uri("http://FooTestUri1"), "Source1")];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        executor.Initialize("Test1, Test2");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+
+        _mockOutput.Verify(o => o.WriteLine("A total of 1 tests were discovered but some tests do not match the specified selection criteria(Test1). Use right value(s) and try again.", OutputLevel.Warning), Times.Once);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
+
+    [TestMethod]
+    public void ExecutorShouldRunTestsWhenTestsAreCommaSeparatedWithEscape()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+
+        ResetAndAddSourceToCommandLineOptions();
+
+        List<TestCase> list =
+        [
+            new TestCase("Test1(a,b)", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2(c,d)", new Uri("http://FooTestUri1"), "Source1")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        executor.Initialize("Test1(a\\,b), Test2(c\\,d)");
+        ArgumentProcessorResult argumentProcessorResult = executor.Execute();
+
+        _mockOutput.Verify(o => o.WriteLine(It.IsAny<string>(), OutputLevel.Warning), Times.Never);
+        Assert.AreEqual(ArgumentProcessorResult.Success, argumentProcessorResult);
+    }
+
+    [TestMethod]
+    public void ExecutorShouldDisplayWarningIfNoTestsAreExecuted()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var mockTestRunStats = new Mock<ITestRunStatistics>();
+
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Returns(1).Raises(tr => tr.OnRunCompletion += null,
+            new TestRunCompleteEventArgs(mockTestRunStats.Object, false, false, null, null, null, new TimeSpan()));
+
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        executor.Initialize("Test1");
+        executor.Execute();
+
+        _mockOutput.Verify(op => op.WriteLine(It.Is<string>(st => st.Contains("Additionally, path to test adapters can be specified using /TestAdapterPath command.")), OutputLevel.Warning), Times.Once);
+    }
+
+    [TestMethod]
+    public void ExecutorShouldNotDisplayWarningIfTestsAreExecuted()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        var testRunStats = new TestRunStatistics(1, new Dictionary<TestOutcome, long> { { TestOutcome.Passed, 1 } });
+
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        mockDiscoveryRequest.Setup(dr => dr.DiscoverAsync()).Raises(dr => dr.OnDiscoveredTests += null, new DiscoveredTestsEventArgs(list));
+
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Returns(1).Raises(tr => tr.OnRunCompletion += null,
+            new TestRunCompleteEventArgs(testRunStats, false, false, null, null, null, new TimeSpan()));
+
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
+        mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockDiscoveryRequest.Object);
+
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _mockEnvironment.Object, _mockEnvironmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
+
+        executor.Initialize("Test1");
+        executor.Execute();
+
+        _mockOutput.Verify(op => op.WriteLine(It.Is<string>(st => st.Contains("Additionally, path to test adapters can be specified using /TestAdapterPath command.")), OutputLevel.Warning), Times.Never);
+    }
+
+    #endregion
+
+    private void ResetAndAddSourceToCommandLineOptions()
+    {
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.TestCaseFilterValue = null;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.AddSource(_dummyTestFilePath);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
index f838cd183f..0c31c47d9d 100644
--- a/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
@@ -1,332 +1,330 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.Client;
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
 using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+using vstest.console.UnitTests.Processors;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+/// <summary>
+/// Tests for RunTestsArgumentProcessor
+/// </summary>
+[TestClass]
+public class RunTestsArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-    using System.Runtime.Versioning;
-    using System.Threading.Tasks;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.Client;
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Internal;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-    using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using vstest.console.Internal;
-    using vstest.console.UnitTests.Processors;
-
-    /// <summary>
-    /// Tests for RunTestsArgumentProcessor
-    /// </summary>
-    [TestClass]
-    public class RunTestsArgumentProcessorTests
+    private readonly Mock<IFileHelper> _mockFileHelper;
+    private readonly Mock<IOutput> _mockOutput;
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyMetadataProvider;
+    private readonly InferHelper _inferHelper;
+    private readonly string _dummyTestFilePath = "DummyTest.dll";
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly Task<IMetricsPublisher> _mockMetricsPublisherTask;
+    private readonly Mock<IMetricsPublisher> _mockMetricsPublisher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockAttachmentsProcessingManager;
+    private readonly Mock<IArtifactProcessingManager> _artifactProcessingManager;
+    private readonly Mock<IEnvironment> _environment;
+    private readonly Mock<IEnvironmentVariableHelper> _environmentVariableHelper;
+
+    public RunTestsArgumentProcessorTests()
     {
-        private readonly Mock<IFileHelper> mockFileHelper;
-        private readonly Mock<IOutput> mockOutput;
-        private Mock<IAssemblyMetadataProvider> mockAssemblyMetadataProvider;
-        private InferHelper inferHelper;
-        private string dummyTestFilePath = "DummyTest.dll";
-        private Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-        private Task<IMetricsPublisher> mockMetricsPublisherTask;
-        private Mock<IMetricsPublisher> mockMetricsPublisher;
-        private Mock<IProcessHelper> mockProcessHelper;
-        private Mock<ITestRunAttachmentsProcessingManager> mockAttachmentsProcessingManager;
-
-        public RunTestsArgumentProcessorTests()
-        {
-            this.mockFileHelper = new Mock<IFileHelper>();
-            this.mockOutput = new Mock<IOutput>();
-            this.mockFileHelper.Setup(fh => fh.Exists(this.dummyTestFilePath)).Returns(true);
-            this.mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
-            this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
-            this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
-            this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-            this.mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
-            this.inferHelper = new InferHelper(this.mockAssemblyMetadataProvider.Object);
-            SetupMockExtensions();
-            this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-                .Returns(Architecture.X86);
-            this.mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
-            this.mockProcessHelper = new Mock<IProcessHelper>();
-            this.mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-        }
+        _mockFileHelper = new Mock<IFileHelper>();
+        _mockOutput = new Mock<IOutput>();
+        _mockFileHelper.Setup(fh => fh.Exists(_dummyTestFilePath)).Returns(true);
+        _mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+        _mockMetricsPublisher = new Mock<IMetricsPublisher>();
+        _mockMetricsPublisherTask = Task.FromResult(_mockMetricsPublisher.Object);
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
+        _artifactProcessingManager = new Mock<IArtifactProcessingManager>();
+        _inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
+        SetupMockExtensions();
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.X86);
+        _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework40));
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _environment = new Mock<IEnvironment>();
+        _environmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnRunTestsArgumentProcessorCapabilities()
-        {
-            RunTestsArgumentProcessor processor = new RunTestsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is RunTestsArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetMetadataShouldReturnRunTestsArgumentProcessorCapabilities()
+    {
+        RunTestsArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is RunTestsArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnRunTestsArgumentProcessorCapabilities()
-        {
-            RunTestsArgumentProcessor processor = new RunTestsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is RunTestsArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnRunTestsArgumentProcessorCapabilities()
+    {
+        RunTestsArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is RunTestsArgumentExecutor);
+    }
 
-        #region RunTestsArgumentProcessorCapabilitiesTests
+    #region RunTestsArgumentProcessorCapabilitiesTests
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            RunTestsArgumentProcessorCapabilities capabilities = new RunTestsArgumentProcessorCapabilities();
-            Assert.AreEqual("/RunTests", capabilities.CommandName);
-            var expected = "[TestFileNames]\r\n      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern\r\n      by spaces. Set console logger verbosity to detailed to view matched test files.\r\n      Examples: mytestproject.dll\r\n                mytestproject.dll myothertestproject.exe\r\n                testproject*.dll my*project.dll";
-            Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.RunTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsTrue(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsTrue(capabilities.IsSpecialCommand);
-        }
-        #endregion
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        RunTestsArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/RunTests", capabilities.CommandName);
+        var expected = "[TestFileNames]\r\n      Run tests from the specified files or wild card pattern. Separate multiple test file names or pattern\r\n      by spaces. Set console logger verbosity to detailed to view matched test files.\r\n      Examples: mytestproject.dll\r\n                mytestproject.dll myothertestproject.exe\r\n                testproject*.dll my*project.dll";
+        Assert.AreEqual(expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.RunTestsArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsTrue(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsTrue(capabilities.IsSpecialCommand);
+    }
+    #endregion
 
-        #region RunTestsArgumentExecutorTests
+    #region RunTestsArgumentExecutorTests
 
-        [TestMethod]
-        public void ExecutorExecuteShouldReturnSuccessWithoutExecutionInDesignMode()
-        {
-            var runSettingsProvider = new TestableRunSettingsProvider();
-            runSettingsProvider.UpdateRunSettings("<RunSettings/>");
+    [TestMethod]
+    public void ExecutorExecuteShouldReturnSuccessWithoutExecutionInDesignMode()
+    {
+        var runSettingsProvider = new TestableRunSettingsProvider();
+        runSettingsProvider.UpdateRunSettings("<RunSettings/>");
 
-            CommandLineOptions.Instance.Reset();
-            CommandLineOptions.Instance.IsDesignMode = true;
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = new RunTestsArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider, testRequestManager, this.mockOutput.Object);
+        CommandLineOptions.Reset();
+        CommandLineOptions.Instance.IsDesignMode = true;
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = new RunTestsArgumentExecutor(CommandLineOptions.Instance, runSettingsProvider, testRequestManager, _artifactProcessingManager.Object, _mockOutput.Object);
 
-            Assert.AreEqual(ArgumentProcessorResult.Success, executor.Execute());
-        }
+        Assert.AreEqual(ArgumentProcessorResult.Success, executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteForNoSourcesShouldThrowCommandLineException()
-        {
-            CommandLineOptions.Instance.Reset();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+    [TestMethod]
+    public void ExecutorExecuteForNoSourcesShouldThrowCommandLineException()
+    {
+        CommandLineOptions.Reset();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, TestPlatformFactory.GetTestPlatform(), TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            Assert.ThrowsException<CommandLineException>(() => executor.Execute());
-        }
+        Assert.ThrowsException<CommandLineException>(() => executor.Execute());
+    }
 
-        private RunTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager)
-        {
-            var runSettingsProvider = new TestableRunSettingsProvider();
-            runSettingsProvider.AddDefaultRunSettings();
-            var executor = new RunTestsArgumentExecutor(
-                CommandLineOptions.Instance,
-                runSettingsProvider,
-                testRequestManager,
-                this.mockOutput.Object
-                );
-            return executor;
-        }
+    private RunTestsArgumentExecutor GetExecutor(ITestRequestManager testRequestManager)
+    {
+        var runSettingsProvider = new TestableRunSettingsProvider();
+        runSettingsProvider.AddDefaultRunSettings();
+        var executor = new RunTestsArgumentExecutor(
+            CommandLineOptions.Instance,
+            runSettingsProvider,
+            testRequestManager,
+            _artifactProcessingManager.Object,
+            _mockOutput.Object
+        );
+        return executor;
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowTestPlatformException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowTestPlatformException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new TestPlatformException("DummyTestPlatformException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
-        }
+        Assert.ThrowsException<TestPlatformException>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowSettingsException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowSettingsException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new SettingsException("DummySettingsException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new SettingsException("DummySettingsException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            Assert.ThrowsException<SettingsException>(() => executor.Execute());
-        }
+        Assert.ThrowsException<SettingsException>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowInvalidOperationException()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowInvalidOperationException()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new InvalidOperationException("DummyInvalidOperationException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
-        }
+        Assert.ThrowsException<InvalidOperationException>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldThrowOtherExceptions()
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldThrowOtherExceptions()
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new Exception("DummyException"));
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(mockTestRunRequest.Object);
+        mockTestRunRequest.Setup(tr => tr.ExecuteAsync()).Throws(new Exception("DummyException"));
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(mockTestRunRequest.Object);
 
-            this.ResetAndAddSourceToCommandLineOptions();
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        ResetAndAddSourceToCommandLineOptions();
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            Assert.ThrowsException<Exception>(() => executor.Execute());
-        }
+        Assert.ThrowsException<Exception>(() => executor.Execute());
+    }
 
-        [TestMethod]
-        public void ExecutorExecuteShouldForListOfTestsReturnSuccess()
-        {
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void ExecutorExecuteShouldForListOfTestsReturnSuccess()
+    {
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            var result = this.RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
+        var result = RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
 
-            mockTestRunRequest.Verify(tr => tr.ExecuteAsync(), Times.Once);
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+        mockTestRunRequest.Verify(tr => tr.ExecuteAsync(), Times.Once);
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
+    }
 
-        [TestMethod]
-        public void TestRunRequestManagerShouldInstrumentExecutionRequestStart()
-        {
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void TestRunRequestManagerShouldInstrumentExecutionRequestStart()
+    {
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            var result = this.RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
+        var result = RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
 
-            this.mockTestPlatformEventSource.Verify(x => x.ExecutionRequestStart(), Times.Once);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.ExecutionRequestStart(), Times.Once);
+    }
 
-        [TestMethod]
-        public void TestRunRequestManagerShouldInstrumentExecutionRequestStop()
-        {
-            var mockTestRunRequest = new Mock<ITestRunRequest>();
+    [TestMethod]
+    public void TestRunRequestManagerShouldInstrumentExecutionRequestStop()
+    {
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
 
-            var result = this.RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
+        var result = RunRunArgumentProcessorExecuteWithMockSetup(mockTestRunRequest.Object);
 
-            this.mockTestPlatformEventSource.Verify(x => x.ExecutionRequestStop(), Times.Once);
-        }
+        _mockTestPlatformEventSource.Verify(x => x.ExecutionRequestStop(), Times.Once);
+    }
 
-        #endregion
+    #endregion
 
-        private ArgumentProcessorResult RunRunArgumentProcessorExecuteWithMockSetup(ITestRunRequest testRunRequest)
-        {
-            var mockTestPlatform = new Mock<ITestPlatform>();
-            var mockConsoleOutput = new Mock<IOutput>();
+    private ArgumentProcessorResult RunRunArgumentProcessorExecuteWithMockSetup(ITestRunRequest testRunRequest)
+    {
+        var mockTestPlatform = new Mock<ITestPlatform>();
+        var mockConsoleOutput = new Mock<IOutput>();
 
-            List<TestCase> list = new List<TestCase>();
-            list.Add(new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"));
-            list.Add(new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2"));
-            var mockTestRunStats = new Mock<ITestRunStatistics>();
+        List<TestCase> list =
+        [
+            new TestCase("Test1", new Uri("http://FooTestUri1"), "Source1"),
+            new TestCase("Test2", new Uri("http://FooTestUri2"), "Source2")
+        ];
+        var mockTestRunStats = new Mock<ITestRunStatistics>();
 
-            var args = new TestRunCompleteEventArgs(mockTestRunStats.Object, false, false, null, null, new TimeSpan());
+        var args = new TestRunCompleteEventArgs(mockTestRunStats.Object, false, false, null, null, null, new TimeSpan());
 
-            mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Returns(testRunRequest);
+        mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Returns(testRunRequest);
 
-            this.ResetAndAddSourceToCommandLineOptions();
+        ResetAndAddSourceToCommandLineOptions();
 
-            var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, this.mockTestPlatformEventSource.Object, this.inferHelper, this.mockMetricsPublisherTask, this.mockProcessHelper.Object, this.mockAttachmentsProcessingManager.Object);
-            var executor = GetExecutor(testRequestManager);
+        var testRequestManager = new TestRequestManager(CommandLineOptions.Instance, mockTestPlatform.Object, TestRunResultAggregator.Instance, _mockTestPlatformEventSource.Object, _inferHelper, _mockMetricsPublisherTask, _mockProcessHelper.Object, _mockAttachmentsProcessingManager.Object, _environment.Object, _environmentVariableHelper.Object);
+        var executor = GetExecutor(testRequestManager);
 
-            return executor.Execute();
-        }
+        return executor.Execute();
+    }
 
-        private void ResetAndAddSourceToCommandLineOptions()
-        {
-            CommandLineOptions.Instance.Reset();
+    private void ResetAndAddSourceToCommandLineOptions()
+    {
+        CommandLineOptions.Reset();
 
-            CommandLineOptions.Instance.FileHelper = this.mockFileHelper.Object;
-            CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, this.mockFileHelper.Object);
-            CommandLineOptions.Instance.AddSource(this.dummyTestFilePath);
-        }
+        CommandLineOptions.Instance.FileHelper = _mockFileHelper.Object;
+        CommandLineOptions.Instance.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, _mockFileHelper.Object);
+        CommandLineOptions.Instance.AddSource(_dummyTestFilePath);
+    }
+
+    public static void SetupMockExtensions()
+    {
+        // Setup mocks.
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
+        mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, new[] { ".dll" }))
+            .Callback(() => { })
+            .Returns(new string[] { typeof(RunTestsArgumentProcessorTests).Assembly.Location, typeof(ConsoleLogger).Assembly.Location });
+
+        var testableTestPluginCache = new TestableTestPluginCache();
 
-        public static void SetupMockExtensions()
+        // Setup the testable instance.
+        TestPluginCache.Instance = testableTestPluginCache;
+    }
+
+    [ExtensionUri("testlogger://logger")]
+    [FriendlyName("TestLoggerExtension")]
+    private class ValidLogger3 : ITestLogger
+    {
+        public void Initialize(TestLoggerEvents events, string testRunDirectory)
         {
-            SetupMockExtensions(() => { });
+            events.TestRunMessage += TestMessageHandler;
+            events.TestRunComplete += Events_TestRunComplete;
+            events.TestResult += Events_TestResult;
         }
 
-        public static void SetupMockExtensions(Action callback)
+        private void Events_TestResult(object? sender, TestResultEventArgs e)
         {
-            SetupMockExtensions(new string[] { typeof(RunTestsArgumentProcessorTests).GetTypeInfo().Assembly.Location, typeof(ConsoleLogger).GetTypeInfo().Assembly.Location }, callback);
         }
 
-        public static void SetupMockExtensions(string[] extensions, Action callback)
+        private void Events_TestRunComplete(object? sender, TestRunCompleteEventArgs e)
         {
-            // Setup mocks.
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(true);
-            mockFileHelper.Setup(fh => fh.EnumerateFiles(It.IsAny<string>(), SearchOption.TopDirectoryOnly, new[] { ".dll" }))
-                .Callback(callback)
-                .Returns(extensions);
 
-            var testableTestPluginCache = new TestableTestPluginCache();
-
-            // Setup the testable instance.
-            TestPluginCache.Instance = testableTestPluginCache;
         }
 
-        [ExtensionUri("testlogger://logger")]
-        [FriendlyName("TestLoggerExtension")]
-        private class ValidLogger3 : ITestLogger
+        private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
         {
-            public void Initialize(TestLoggerEvents events, string testRunDirectory)
-            {
-                events.TestRunMessage += TestMessageHandler;
-                events.TestRunComplete += Events_TestRunComplete;
-                events.TestResult += Events_TestResult;
-            }
-
-            private void Events_TestResult(object sender, TestResultEventArgs e)
-            {
-            }
-
-            private void Events_TestRunComplete(object sender, TestRunCompleteEventArgs e)
-            {
-
-            }
-
-            private void TestMessageHandler(object sender, TestRunMessageEventArgs e)
-            {
-            }
         }
     }
+}
 
-    #region Testable implementation
+#region Testable implementation
 
-    public class TestableTestPluginCache : TestPluginCache
-    {
-    }
-
-    #endregion
+public class TestableTestPluginCache : TestPluginCache
+{
+}
 
-}
\ No newline at end of file
+#endregion
diff --git a/test/vstest.console.UnitTests/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessorTests.cs
new file mode 100644
index 0000000000..ce33c73f8a
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessorTests.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+[TestCategory("Windows-Review")]
+public class ShowDeprecateDotnetVStestMessageArgumentProcessorTests
+{
+    [TestMethod]
+    public void ShowDeprecateDotnetVStestMessageProcessorCommandName()
+    {
+        Assert.AreEqual("/ShowDeprecateDotnetVSTestMessage", ShowDeprecateDotnetVStestMessageArgumentProcessor.CommandName);
+    }
+
+    [TestMethod]
+    public void ShowDeprecateDotnetVStestMessageProcessorCapabilities()
+    {
+        ShowDeprecateDotnetVStestMessageProcessorCapabilities showDeprecateDotnetVStestMessageProcessorCapabilities = new();
+        Assert.IsNull(showDeprecateDotnetVStestMessageProcessorCapabilities.HelpContentResourceName);
+        Assert.IsFalse(showDeprecateDotnetVStestMessageProcessorCapabilities.IsAction);
+        Assert.IsFalse(showDeprecateDotnetVStestMessageProcessorCapabilities.AllowMultiple);
+        Assert.AreEqual(ArgumentProcessorPriority.CliRunSettings, showDeprecateDotnetVStestMessageProcessorCapabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.None, showDeprecateDotnetVStestMessageProcessorCapabilities.HelpPriority);
+    }
+
+    [TestMethod]
+    public void ShowDeprecateDotnetVStestMessageArgumentProcessorReturnsCorrectTypes()
+    {
+        ShowDeprecateDotnetVStestMessageArgumentProcessor showDeprecateDotnetVStestMessageArgumentProcessor = new();
+        Assert.IsInstanceOfType(showDeprecateDotnetVStestMessageArgumentProcessor.Executor!.Value, typeof(ShowDeprecateDotnetVStestMessageProcessorExecutor));
+        Assert.IsInstanceOfType(showDeprecateDotnetVStestMessageArgumentProcessor.Metadata!.Value, typeof(ShowDeprecateDotnetVStestMessageProcessorCapabilities));
+    }
+
+
+    [TestMethod]
+    public void ShowDeprecateDotnetVStestMessageProcessorExecutor_Succeeded()
+    {
+        ShowDeprecateDotnetVStestMessageProcessorExecutor showDeprecateDotnetVStestMessageProcessorExecutor = new();
+        showDeprecateDotnetVStestMessageProcessorExecutor.Initialize("we will ignore the param");
+        Assert.AreEqual(ArgumentProcessorResult.Success, showDeprecateDotnetVStestMessageProcessorExecutor.Execute());
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/TestAdapterLoadingStrategyArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/TestAdapterLoadingStrategyArgumentProcessorTests.cs
new file mode 100644
index 0000000000..f60d0ffb8d
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/TestAdapterLoadingStrategyArgumentProcessorTests.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class TestAdapterLoadingStrategyArgumentProcessorTests
+{
+    private readonly RunSettings _currentActiveSetting;
+
+    public TestAdapterLoadingStrategyArgumentProcessorTests()
+    {
+        _currentActiveSetting = RunSettingsManager.Instance.ActiveRunSettings;
+    }
+
+    [TestCleanup]
+    public void TestClean()
+    {
+        RunSettingsManager.Instance.SetActiveRunSettings(_currentActiveSetting);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void InitializeShouldHonorEnvironmentVariablesInTestAdapterPaths()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>%temp%\\adapters1;%temp%\\adapters2</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(runSettingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var mockFileHelper = new Mock<IFileHelper>();
+        var mockOutput = new Mock<IOutput>();
+
+        mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        mockFileHelper.Setup(x => x.GetFullPath(It.IsAny<string>())).Returns((Func<string, string>)(s => Path.GetFullPath(s)));
+
+        var executor = new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
+
+        executor.Initialize(nameof(TestAdapterLoadingStrategy.Default));
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+
+        var tempPath = Path.GetFullPath(Environment.ExpandEnvironmentVariables("%temp%"));
+        Assert.AreEqual($"{tempPath}\\adapters1;{tempPath}\\adapters2", runConfiguration.TestAdaptersPaths);
+    }
+
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void InitializeShouldAddRightAdapterPathInErrorMessage()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(runSettingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var mockFileHelper = new Mock<IFileHelper>();
+        var mockOutput = new Mock<IOutput>();
+
+        mockFileHelper.Setup(x => x.DirectoryExists("d:\\users")).Returns(false);
+        mockFileHelper.Setup(x => x.DirectoryExists("c:\\users")).Returns(true);
+        var executor = new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
+
+        var message = "The path 'd:\\users' specified in the 'TestAdapterPath' is invalid. Error: The custom test adapter search path provided was not found, provide a valid path and try again.";
+
+        var isExceptionThrown = false;
+        try
+        {
+            executor.Initialize(nameof(TestAdapterLoadingStrategy.Default));
+        }
+        catch (Exception ex)
+        {
+            isExceptionThrown = true;
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual(message, ex.Message);
+        }
+
+        Assert.IsTrue(isExceptionThrown);
+    }
+
+
+    [TestMethod]
+    public void InitializeShouldThrowIfPathDoesNotExist()
+    {
+        var folder = "C:\\temp\\thisfolderdoesnotexist";
+        var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>" + folder + "</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        var runSettings = new RunSettings();
+
+        runSettings.LoadSettingsXml(runSettingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+
+        var mockOutput = new Mock<IOutput>();
+        var executor = new TestAdapterLoadingStrategyArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, new FileHelper());
+
+        var message = $"The path '{folder}' specified in the 'TestAdapterPath' is invalid. Error: The custom test adapter search path provided was not found, provide a valid path and try again.";
+
+        var isExceptionThrown = false;
+
+        try
+        {
+            executor.Initialize(nameof(TestAdapterLoadingStrategy.Default));
+        }
+        catch (Exception ex)
+        {
+            isExceptionThrown = true;
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual(message, ex.Message);
+        }
+
+        Assert.IsTrue(isExceptionThrown);
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/TestAdapterPathArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/TestAdapterPathArgumentProcessorTests.cs
index 7069c4a4b4..8dd96a60ad 100644
--- a/test/vstest.console.UnitTests/Processors/TestAdapterPathArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/TestAdapterPathArgumentProcessorTests.cs
@@ -1,325 +1,198 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class TestAdapterPathArgumentProcessorTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-
-    [TestClass]
-    public class TestAdapterPathArgumentProcessorTests
+    private readonly RunSettings _currentActiveSetting;
+
+    public TestAdapterPathArgumentProcessorTests()
     {
-        RunSettings currentActiveSetting;
+        _currentActiveSetting = RunSettingsManager.Instance.ActiveRunSettings;
+    }
 
-        [TestInitialize]
-        public void TestInit()
-        {
-            currentActiveSetting = RunSettingsManager.Instance.ActiveRunSettings;
-        }
+    [TestCleanup]
+    public void TestClean()
+    {
+        RunSettingsManager.Instance.SetActiveRunSettings(_currentActiveSetting);
+    }
 
-        [TestCleanup]
-        public void TestClean()
-        {
-            RunSettingsManager.Instance.SetActiveRunSettings(currentActiveSetting);
-        }
 
+    [TestMethod]
+    public void GetMetadataShouldReturnTestAdapterPathArgumentProcessorCapabilities()
+    {
+        var processor = new TestAdapterPathArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is TestAdapterPathArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetMetadataShouldReturnTestAdapterPathArgumentProcessorCapabilities()
-        {
-            var processor = new TestAdapterPathArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is TestAdapterPathArgumentProcessorCapabilities);
-        }
+    [TestMethod]
+    public void GetExecuterShouldReturnTestAdapterPathArgumentProcessorCapabilities()
+    {
+        var processor = new TestAdapterPathArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is TestAdapterPathArgumentExecutor);
+    }
 
-        [TestMethod]
-        public void GetExecuterShouldReturnTestAdapterPathArgumentProcessorCapabilities()
-        {
-            var processor = new TestAdapterPathArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is TestAdapterPathArgumentExecutor);
-        }
+    #region TestAdapterPathArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new TestAdapterPathArgumentProcessorCapabilities();
+        Assert.AreEqual("/TestAdapterPath", capabilities.CommandName);
+        var expected = "--TestAdapterPath|/TestAdapterPath\r\n      This makes vstest.console.exe process use custom test adapters\r\n      from a given path (if any) in the test run. \r\n      Example  /TestAdapterPath:<pathToCustomAdapters>";
+        Assert.AreEqual(expected: expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
+
+        Assert.AreEqual(HelpContentPriority.TestAdapterPathArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.TestAdapterPath, capabilities.Priority);
+
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
 
-        #region TestAdapterPathArgumentProcessorCapabilities tests
+    #endregion
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new TestAdapterPathArgumentProcessorCapabilities();
-            Assert.AreEqual("/TestAdapterPath", capabilities.CommandName);
-            var expected = "--TestAdapterPath|/TestAdapterPath\r\n      This makes vstest.console.exe process use custom test adapters\r\n      from a given path (if any) in the test run. \r\n      Example  /TestAdapterPath:<pathToCustomAdapters>";
-            Assert.AreEqual(expected: expected.NormalizeLineEndings().ShowWhiteSpace(), capabilities.HelpContentResourceName.NormalizeLineEndings().ShowWhiteSpace());
-
-            Assert.AreEqual(HelpContentPriority.TestAdapterPathArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.TestAdapterPath, capabilities.Priority);
-
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+    #region TestAdapterPathArgumentExecutor tests
 
-        #endregion
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsNull()
+    {
+        var mockRunSettingsProvider = new Mock<IRunSettingsProvider>();
+        var mockOutput = new Mock<IOutput>();
+        var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, mockRunSettingsProvider.Object, mockOutput.Object, new FileHelper());
 
-        #region TestAdapterPathArgumentExecutor tests
+        var message =
+            @"The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters";
 
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsNull()
-        {
-            var mockRunSettingsProvider = new Mock<IRunSettingsProvider>();
-            var mockOutput = new Mock<IOutput>();
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, mockRunSettingsProvider.Object, mockOutput.Object, new FileHelper());
-
-            var message =
-                @"The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters";
-
-            var isExceptionThrown = false;
-
-            try
-            {
-                executor.Initialize(null);
-            }
-            catch (Exception ex)
-            {
-                isExceptionThrown = true;
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual(message, ex.Message);
-            }
-
-            Assert.IsTrue(isExceptionThrown);
-        }
+        var isExceptionThrown = false;
 
-        [TestMethod]
-        public void InitializeShouldThrowIfArgumentIsAWhiteSpace()
+        try
         {
-            var mockRunSettingsProvider = new Mock<IRunSettingsProvider>();
-            var mockOutput = new Mock<IOutput>();
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, mockRunSettingsProvider.Object, mockOutput.Object, new FileHelper());
-
-            var message =
-                @"The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters";
-
-            var isExceptionThrown = false;
-
-            try
-            {
-                executor.Initialize("  ");
-            }
-            catch (Exception ex)
-            {
-                isExceptionThrown = true;
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual(message, ex.Message);
-            }
-
-            Assert.IsTrue(isExceptionThrown);
+            executor.Initialize(null);
         }
-
-        [TestMethod]
-        public void InitializeShouldThrowIfPathDoesNotExist()
+        catch (Exception ex)
         {
-            var mockRunSettingsProvider = new Mock<IRunSettingsProvider>();
-            var mockOutput = new Mock<IOutput>();
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, mockRunSettingsProvider.Object, mockOutput.Object, new FileHelper());
-
-            var folder = "C:\\temp\\thisfolderdoesnotexist";
-
-            var message = string.Format(
-                @"The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}",
-                folder,
-                "The custom test adapter search path provided was not found, provide a valid path and try again.");
-
-            var isExceptionThrown = false;
-
-            try
-            {
-                executor.Initialize(folder);
-            }
-            catch (Exception ex)
-            {
-                isExceptionThrown = true;
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual(message, ex.Message);
-            }
-
-            Assert.IsTrue(isExceptionThrown);
+            isExceptionThrown = true;
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual(message, ex.Message);
         }
 
-        [TestMethod]
-        public void InitializeShouldUpdateTestAdapterPathInRunSettings()
-        {
-            RunSettingsManager.Instance.AddDefaultRunSettings();
+        Assert.IsTrue(isExceptionThrown);
+    }
 
-            var mockOutput = new Mock<IOutput>();
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, new FileHelper());
+    [TestMethod]
+    public void InitializeShouldThrowIfArgumentIsAWhiteSpace()
+    {
+        var mockRunSettingsProvider = new Mock<IRunSettingsProvider>();
+        var mockOutput = new Mock<IOutput>();
+        var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, mockRunSettingsProvider.Object, mockOutput.Object, new FileHelper());
 
-            var currentAssemblyPath = typeof(TestAdapterPathArgumentExecutor).GetTypeInfo().Assembly.Location;
-            var currentFolder = Path.GetDirectoryName(currentAssemblyPath);
+        var message =
+            @"The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example:  /TestAdapterPath:c:\MyCustomAdapters";
 
-            executor.Initialize(currentFolder);
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual(currentFolder, runConfiguration.TestAdaptersPaths);
-        }
+        var isExceptionThrown = false;
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldMergeTestAdapterPathsInRunSettings()
+        try
         {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users;f:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
-
-            mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
-
-            executor.Initialize("c:\\users");
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual("d:\\users;f:\\users;c:\\users", runConfiguration.TestAdaptersPaths);
+            executor.Initialize("  ");
         }
-
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldMergeTestAdapterPathsInRunSettingsIgnoringDuplicatePaths()
+        catch (Exception ex)
         {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users;c:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
-
-            mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
-
-            executor.Initialize("c:\\users");
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual("d:\\users;c:\\users", runConfiguration.TestAdaptersPaths);
+            isExceptionThrown = true;
+            Assert.IsTrue(ex is CommandLineException);
+            Assert.AreEqual(message, ex.Message);
         }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldMergeMultipleTestAdapterPathsWithPathsInRunSettings()
-        {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users;f:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
-
-            mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
-
-            executor.Initialize("c:\\users;e:\\users");
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual("d:\\users;f:\\users;c:\\users;e:\\users", runConfiguration.TestAdaptersPaths);
-        }
+        Assert.IsTrue(isExceptionThrown);
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldHonorEnvironmentVariablesInTestAdapterPaths()
-        {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>%temp%\\adapters1</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
+    [TestMethod]
+    public void InitializeShouldUpdateTestAdapterPathInRunSettings()
+    {
+        RunSettingsManager.Instance.AddDefaultRunSettings();
 
-            mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
+        var mockOutput = new Mock<IOutput>();
+        var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, new FileHelper());
 
-            executor.Initialize("%temp%\\adapters2");
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+        var currentAssemblyPath = typeof(TestAdapterPathArgumentExecutor).Assembly.Location;
+        var currentFolder = Path.GetDirectoryName(currentAssemblyPath);
 
-            var tempPath = Path.GetFullPath(Environment.ExpandEnvironmentVariables("%temp%"));
-            Assert.AreEqual(string.Format("{0}\\adapters1;{0}\\adapters2", tempPath), runConfiguration.TestAdaptersPaths);
-        }
+        executor.Initialize(currentFolder);
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+        Assert.AreEqual(currentFolder, runConfiguration.TestAdaptersPaths);
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldAddRightAdapterPathInErrorMessage()
-        {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
-
-            mockFileHelper.Setup(x => x.DirectoryExists("d:\\users")).Returns(false);
-            mockFileHelper.Setup(x => x.DirectoryExists("c:\\users")).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
-
-            var message = string.Format(
-                @"The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}",
-                "d:\\users",
-                "The custom test adapter search path provided was not found, provide a valid path and try again.");
-
-            var isExceptionThrown = false;
-            try
-            {
-                executor.Initialize("c:\\users");
-            }
-            catch (Exception ex)
-            {
-                isExceptionThrown = true;
-                Assert.IsTrue(ex is CommandLineException);
-                Assert.AreEqual(message, ex.Message);
-            }
-
-            Assert.IsTrue(isExceptionThrown);
-        }
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void InitializeShouldMergeTestAdapterPathsInRunSettings()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users;f:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(runSettingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var mockFileHelper = new Mock<IFileHelper>();
+        var mockOutput = new Mock<IOutput>();
+
+        mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
+
+        executor.Initialize("c:\\users");
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+        Assert.AreEqual("d:\\users;f:\\users;c:\\users", runConfiguration.TestAdaptersPaths);
+    }
 
-        [TestMethod]
-        [TestCategory("Windows")]
-        public void InitializeShouldTrimTrailingAndLeadingDoubleQuotes()
-        {
-            var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
-            var runSettings = new RunSettings();
-            runSettings.LoadSettingsXml(runSettingsXml);
-            RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
-            var mockFileHelper = new Mock<IFileHelper>();
-            var mockOutput = new Mock<IOutput>();
+    [TestMethod]
+    [TestCategory("Windows")]
+    public void InitializeShouldTrimTrailingAndLeadingDoubleQuotes()
+    {
+        var runSettingsXml = "<RunSettings><RunConfiguration><TestAdaptersPaths>d:\\users</TestAdaptersPaths></RunConfiguration></RunSettings>";
+        var runSettings = new RunSettings();
+        runSettings.LoadSettingsXml(runSettingsXml);
+        RunSettingsManager.Instance.SetActiveRunSettings(runSettings);
+        var mockFileHelper = new Mock<IFileHelper>();
+        var mockOutput = new Mock<IOutput>();
 
-            mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
-            var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
+        mockFileHelper.Setup(x => x.DirectoryExists(It.IsAny<string>())).Returns(true);
+        var executor = new TestAdapterPathArgumentExecutor(CommandLineOptions.Instance, RunSettingsManager.Instance, mockOutput.Object, mockFileHelper.Object);
 
-            executor.Initialize("\"c:\\users\"");
-            var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
-            Assert.AreEqual("d:\\users;c:\\users", runConfiguration.TestAdaptersPaths);
+        executor.Initialize("\"c:\\users\"");
+        var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(RunSettingsManager.Instance.ActiveRunSettings.SettingsXml);
+        Assert.AreEqual("d:\\users;c:\\users", runConfiguration.TestAdaptersPaths);
 
-        }
+    }
 
-        #endregion
+    #endregion
 
-        #region Testable implementations
+    #region Testable implementations
 
-        private class TestableTestAdapterPathArgumentExecutor : TestAdapterPathArgumentExecutor
+    private class TestableTestAdapterPathArgumentExecutor : TestAdapterPathArgumentExecutor
+    {
+        internal TestableTestAdapterPathArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsProvider, IOutput output, IFileHelper fileHelper)
+            : base(options, runSettingsProvider, output, fileHelper)
         {
-            internal TestableTestAdapterPathArgumentExecutor(CommandLineOptions options, IRunSettingsProvider runSettingsProvider, IOutput output, IFileHelper fileHelper)
-                : base(options, runSettingsProvider, output, fileHelper)
-            {
-            }
-
-            internal Func<string, IEnumerable<string>> TestAdapters { get; set; }
         }
 
-        #endregion
+        internal Func<string, IEnumerable<string>>? TestAdapters { get; set; }
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/test/vstest.console.UnitTests/Processors/TestCaseFilterArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/TestCaseFilterArgumentProcessorTests.cs
index 7bd0c9292d..f16d22e52c 100644
--- a/test/vstest.console.UnitTests/Processors/TestCaseFilterArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/TestCaseFilterArgumentProcessorTests.cs
@@ -1,100 +1,98 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
-{
-    using System;
+using System;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using TestPlatform.CommandLine.Processors;
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
 
-    [TestClass]
-    public class TestCaseFilterArgumentProcessorTests
+[TestClass]
+public class TestCaseFilterArgumentProcessorTests
+{
+    [TestMethod]
+    public void GetMetadataShouldReturnTestCaseFilterArgumentProcessorCapabilities()
     {
-        [TestMethod]
-        public void GetMetadataShouldReturnTestCaseFilterArgumentProcessorCapabilities()
-        {
-            TestCaseFilterArgumentProcessor processor = new TestCaseFilterArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is TestCaseFilterArgumentProcessorCapabilities);
-        }
+        TestCaseFilterArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is TestCaseFilterArgumentProcessorCapabilities);
+    }
 
-        [TestMethod]
-        public void GetExecutorShouldReturnTestCaseFilterArgumentProcessorCapabilities()
-        {
-            TestCaseFilterArgumentProcessor processor = new TestCaseFilterArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is TestCaseFilterArgumentExecutor);
-        }
+    [TestMethod]
+    public void GetExecutorShouldReturnTestCaseFilterArgumentProcessorCapabilities()
+    {
+        TestCaseFilterArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is TestCaseFilterArgumentExecutor);
+    }
 
-        #region TestCaseFilterArgumentProcessorCapabilitiesTests
+    #region TestCaseFilterArgumentProcessorCapabilitiesTests
 
-        [TestMethod]
-        public void CapabilitiesShouldAppropriateProperties()
-        {
-            TestCaseFilterArgumentProcessorCapabilities capabilities = new TestCaseFilterArgumentProcessorCapabilities();
-            Assert.AreEqual("/TestCaseFilter", capabilities.CommandName);
-            StringAssert.Contains(capabilities.HelpContentResourceName, "/TestCaseFilter:<Expression>" + Environment.NewLine + "      Run tests that match the given expression." + Environment.NewLine + "      <Expression> is of the format <property>Operator<value>[|&<Expression>]");
+    [TestMethod]
+    public void CapabilitiesShouldAppropriateProperties()
+    {
+        TestCaseFilterArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/TestCaseFilter", capabilities.CommandName);
+        StringAssert.Contains(capabilities.HelpContentResourceName, "/TestCaseFilter:<Expression>" + Environment.NewLine + "      Run tests that match the given expression." + Environment.NewLine + "      <Expression> is of the format <property>Operator<value>[|&<Expression>]");
 
-            Assert.AreEqual(HelpContentPriority.TestCaseFilterArgumentProcessorHelpPriority, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.TestCaseFilterArgumentProcessorHelpPriority, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
 
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
 
-        #endregion
+    [TestMethod]
+    public void ExecutorInitializeWithNullOrEmptyTestCaseFilterShouldThrowCommandLineException()
+    {
+        var options = CommandLineOptions.Instance;
+        TestCaseFilterArgumentExecutor executor = new(options);
 
-        [TestMethod]
-        public void ExecutorInitializeWithNullOrEmptyTestCaseFilterShouldThrowCommandLineException()
+        try
         {
-            var options = CommandLineOptions.Instance;
-            TestCaseFilterArgumentExecutor executor = new TestCaseFilterArgumentExecutor(options);
-
-            try
-            {
-                executor.Initialize(null);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is CommandLineException);
-                StringAssert.Contains(ex.Message, @"The /TestCaseFilter argument requires the filter value.");
-            }
+            executor.Initialize(null);
+        }
+        catch (Exception ex)
+        {
+            Assert.IsTrue(ex is CommandLineException);
+            StringAssert.Contains(ex.Message, @"The /TestCaseFilter argument requires the filter value.");
         }
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeWithNullOrEmptyTestCaseFilterShouldNotThrowWhenTestFilterWasSpecifiedByPreviousStep()
-        {            
-            var options = CommandLineOptions.Instance;
-            options.TestCaseFilterValue = "Test=FilterFromPreviousStep";
-            TestCaseFilterArgumentExecutor executor = new TestCaseFilterArgumentExecutor(options);
+    [TestMethod]
+    public void ExecutorInitializeWithNullOrEmptyTestCaseFilterShouldNotThrowWhenTestFilterWasSpecifiedByPreviousStep()
+    {
+        var options = CommandLineOptions.Instance;
+        options.TestCaseFilterValue = "Test=FilterFromPreviousStep";
+        TestCaseFilterArgumentExecutor executor = new(options);
 
-            executor.Initialize(null);
-        }
+        executor.Initialize(null);
+    }
 
-        [TestMethod]
-        public void ExecutorInitializeWithTestCaseFilterShouldMergeWithTheValueProvidedByPreviousStep()
-        {
-            var options = CommandLineOptions.Instance;
-            var defaultValue = "Test=FilterFromPreviousStep";
-            options.TestCaseFilterValue = defaultValue;
-            Assert.AreEqual(defaultValue, options.TestCaseFilterValue);
-            TestCaseFilterArgumentExecutor executor = new TestCaseFilterArgumentExecutor(options);
+    [TestMethod]
+    public void ExecutorInitializeWithTestCaseFilterShouldMergeWithTheValueProvidedByPreviousStep()
+    {
+        var options = CommandLineOptions.Instance;
+        var defaultValue = "Test=FilterFromPreviousStep";
+        options.TestCaseFilterValue = defaultValue;
+        Assert.AreEqual(defaultValue, options.TestCaseFilterValue);
+        TestCaseFilterArgumentExecutor executor = new(options);
 
-            var value = "Test=NewFilter";
-            executor.Initialize(value);
+        var value = "Test=NewFilter";
+        executor.Initialize(value);
 
-            var expectedValue = $"({defaultValue})&({value})";
-            Assert.AreEqual(expectedValue, options.TestCaseFilterValue);
-        }
+        var expectedValue = $"({defaultValue})&({value})";
+        Assert.AreEqual(expectedValue, options.TestCaseFilterValue);
+    }
 
-        [TestMethod]
-        public void ExecutorExecutoreturnArgumentProcessorResultSuccess()
-        {
-            var executor = new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance);
-            var result = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+    [TestMethod]
+    public void ExecutorExecutoreturnArgumentProcessorResultSuccess()
+    {
+        var executor = new TestCaseFilterArgumentExecutor(CommandLineOptions.Instance);
+        var result = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/TestSessionCorrelationIdProcessorTests.cs b/test/vstest.console.UnitTests/Processors/TestSessionCorrelationIdProcessorTests.cs
new file mode 100644
index 0000000000..89d57df89b
--- /dev/null
+++ b/test/vstest.console.UnitTests/Processors/TestSessionCorrelationIdProcessorTests.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+
+[TestClass]
+public class TestSessionCorrelationIdProcessorTests
+{
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldFailIfNullCommandOption() =>
+        Assert.ThrowsException<ArgumentNullException>(() => new TestSessionCorrelationIdProcessorModeProcessorExecutor(null!));
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldFailIfNullSession()
+    {
+        TestSessionCorrelationIdProcessorModeProcessorExecutor testSessionCorrelationIdProcessor = new(new CommandLineOptions());
+        Assert.ThrowsException<CommandLineException>(() => testSessionCorrelationIdProcessor.Initialize(null));
+    }
+
+    [TestMethod]
+    public void ProcessorExecutorInitialize_ShouldSetCommandOption()
+    {
+        var commandOptions = new CommandLineOptions();
+        TestSessionCorrelationIdProcessorModeProcessorExecutor testSessionCorrelationIdProcessor = new(commandOptions);
+        testSessionCorrelationIdProcessor.Initialize("sessionId");
+        Assert.IsNotNull(commandOptions.TestSessionCorrelationId);
+    }
+
+    [TestMethod]
+    public void ProcessorCapabilities()
+    {
+        TestSessionCorrelationIdProcessorCapabilities processorCapabilities = new();
+        Assert.IsNull(processorCapabilities.HelpContentResourceName);
+        Assert.AreEqual(ArgumentProcessorPriority.CliRunSettings, processorCapabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.None, processorCapabilities.HelpPriority);
+        Assert.AreEqual("/TestSessionCorrelationId", processorCapabilities.CommandName);
+    }
+}
diff --git a/test/vstest.console.UnitTests/Processors/TestSourceArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/TestSourceArgumentProcessorTests.cs
index 4ee6fe35ab..9f4533c153 100644
--- a/test/vstest.console.UnitTests/Processors/TestSourceArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/TestSourceArgumentProcessorTests.cs
@@ -1,118 +1,119 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors
+using System;
+using System.Linq;
+
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.Internal;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors;
+// <summary>
+// Tests for TestSourceArgumentProcessor
+// </summary>
+[TestClass]
+public class TestSourceArgumentProcessorTests
 {
-    using System;
-    using System.Linq;
-    using Microsoft.Extensions.FileSystemGlobbing;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-    using Moq;
-    using vstest.console.Internal;
-
-    // <summary>
-    // Tests for TestSourceArgumentProcessor
-    // </summary>
-    [TestClass]
-    public class TestSourceArgumentProcessorTests
+    /// <summary>
+    /// The help argument processor get metadata should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetMetadataShouldReturnTestSourceArgumentProcessorCapabilities()
     {
-        /// <summary>
-        /// The help argument processor get metadata should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetMetadataShouldReturnTestSourceArgumentProcessorCapabilities()
-        {
-            TestSourceArgumentProcessor processor = new TestSourceArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is TestSourceArgumentProcessorCapabilities);
-        }
+        TestSourceArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Metadata.Value is TestSourceArgumentProcessorCapabilities);
+    }
 
-        /// <summary>
-        /// The help argument processor get executer should return help argument processor capabilities.
-        /// </summary>
-        [TestMethod]
-        public void GetExecuterShouldReturnTestSourceArgumentProcessorCapabilities()
-        {
-            TestSourceArgumentProcessor processor = new TestSourceArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is TestSourceArgumentExecutor);
-        }
+    /// <summary>
+    /// The help argument processor get executer should return help argument processor capabilities.
+    /// </summary>
+    [TestMethod]
+    public void GetExecuterShouldReturnTestSourceArgumentProcessorCapabilities()
+    {
+        TestSourceArgumentProcessor processor = new();
+        Assert.IsTrue(processor.Executor!.Value is TestSourceArgumentExecutor);
+    }
 
-        #region TestSourceArgumentProcessorCapabilitiesTests
+    #region TestSourceArgumentProcessorCapabilitiesTests
 
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            TestSourceArgumentProcessorCapabilities capabilities = new TestSourceArgumentProcessorCapabilities();
-            Assert.AreEqual("/TestSource", capabilities.CommandName);
-            Assert.IsNull(capabilities.HelpContentResourceName);
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        TestSourceArgumentProcessorCapabilities capabilities = new();
+        Assert.AreEqual("/TestSource", capabilities.CommandName);
+        Assert.IsNull(capabilities.HelpContentResourceName);
 
-            Assert.AreEqual(HelpContentPriority.None, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
+        Assert.AreEqual(HelpContentPriority.None, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.Normal, capabilities.Priority);
 
-            Assert.IsTrue(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsTrue(capabilities.IsSpecialCommand);
-        }
+        Assert.IsTrue(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsTrue(capabilities.IsSpecialCommand);
+    }
 
-        #endregion
+    #endregion
 
-        #region TestSourceArgumentExecutorTests
+    #region TestSourceArgumentExecutorTests
 
-        [TestMethod]
-        public void ExecuterInitializeWithInvalidSourceShouldThrowCommandLineException()
+    [TestMethod]
+    public void ExecuterInitializeWithInvalidSourceShouldThrowCommandLineException()
+    {
+        var options = CommandLineOptions.Instance;
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+        options.FileHelper = mockFileHelper.Object;
+        TestSourceArgumentExecutor executor = new(options);
+
+        // This path is invalid
+        string testFilePath = "TestFile.txt";
+
+        try
         {
-            var options = CommandLineOptions.Instance;
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
-            options.FileHelper = mockFileHelper.Object;
-            TestSourceArgumentExecutor executor = new TestSourceArgumentExecutor(options);
-
-            // This path is invalid
-            string testFilePath = "TestFile.txt";
-
-            try
-            {
-                executor.Initialize(testFilePath);
-            }
-            catch (Exception ex)
-            {
-                Assert.IsTrue(ex is TestSourceException);
-                Assert.AreEqual("The test source file \"" + testFilePath + "\" provided was not found.", ex.Message);
-            }
+            executor.Initialize(testFilePath);
         }
-
-        [TestMethod]
-        public void ExecuterInitializeWithValidSourceShouldAddItToTestSources()
+        catch (Exception ex)
         {
-            var testFilePath = "DummyTestFile.txt";
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
-            mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
+            Assert.IsTrue(ex is TestSourceException);
+            StringAssert.StartsWith(ex.Message, "The test source file \"");
+            StringAssert.EndsWith(ex.Message, testFilePath + "\" provided was not found.");
+        }
+    }
 
-            var options = CommandLineOptions.Instance;
-            options.Reset();
-            options.FileHelper = mockFileHelper.Object;
-            options.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, mockFileHelper.Object);
-            var executor = new TestSourceArgumentExecutor(options);
+    [TestMethod]
+    public void ExecuterInitializeWithValidSourceShouldAddItToTestSources()
+    {
+        var testFilePath = "DummyTestFile.txt";
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.Exists(testFilePath)).Returns(true);
+        mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
 
-            executor.Initialize(testFilePath);
+        var options = CommandLineOptions.Instance;
+        CommandLineOptions.Reset();
+        options.FileHelper = mockFileHelper.Object;
+        options.FilePatternParser = new FilePatternParser(new Mock<Matcher>().Object, mockFileHelper.Object);
+        var executor = new TestSourceArgumentExecutor(options);
 
-            // Check if the testsource is present in the TestSources
-            Assert.IsTrue(options.Sources.Contains(testFilePath));
-        }
+        executor.Initialize(testFilePath);
 
-        [TestMethod]
-        public void ExecutorExecuteReturnArgumentProcessorResultSuccess()
-        {
-            var options = CommandLineOptions.Instance;
-            var executor = new TestSourceArgumentExecutor(options);
-            var result = executor.Execute();
-            Assert.AreEqual(ArgumentProcessorResult.Success, result);
-        }
+        // Check if the testsource is present in the TestSources
+        Assert.IsTrue(options.Sources.Contains(testFilePath));
+    }
 
-        #endregion
+    [TestMethod]
+    public void ExecutorExecuteReturnArgumentProcessorResultSuccess()
+    {
+        var options = CommandLineOptions.Instance;
+        var executor = new TestSourceArgumentExecutor(options);
+        var result = executor.Execute();
+        Assert.AreEqual(ArgumentProcessorResult.Success, result);
     }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/TestableRunSettingsProvider.cs b/test/vstest.console.UnitTests/Processors/TestableRunSettingsProvider.cs
index 169443da7d..28877d5476 100644
--- a/test/vstest.console.UnitTests/Processors/TestableRunSettingsProvider.cs
+++ b/test/vstest.console.UnitTests/Processors/TestableRunSettingsProvider.cs
@@ -1,22 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
+using Microsoft.VisualStudio.TestPlatform.Common;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+
+namespace vstest.console.UnitTests.Processors;
+
+internal class TestableRunSettingsProvider : IRunSettingsProvider
 {
-    using Microsoft.VisualStudio.TestPlatform.Common;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+    public RunSettings? ActiveRunSettings { get; set; }
 
-    internal class TestableRunSettingsProvider : IRunSettingsProvider
+    public void SetActiveRunSettings(RunSettings runSettings)
     {
-        public RunSettings ActiveRunSettings
-        {
-            get;
-            set;
-        }
-
-        public void SetActiveRunSettings(RunSettings runSettings)
-        {
-            this.ActiveRunSettings = runSettings;
-        }
+        ActiveRunSettings = runSettings;
     }
 }
diff --git a/test/vstest.console.UnitTests/Processors/UseVsixExtensionsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/UseVsixExtensionsArgumentProcessorTests.cs
index d0b31cdcc3..2813d6a157 100644
--- a/test/vstest.console.UnitTests/Processors/UseVsixExtensionsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/UseVsixExtensionsArgumentProcessorTests.cs
@@ -1,110 +1,110 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Processors
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace vstest.console.UnitTests.Processors;
+
+[TestClass]
+public class UseVsixExtensionsArgumentProcessorTests
 {
-    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Utilities;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Moq;
-    using System.Collections.Generic;
-
-    [TestClass]
-    public class UseVsixExtensionsArgumentProcessorTests
+    private const string DeprecationMessage = @"/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.";
+    private readonly Mock<ITestRequestManager> _testRequestManager;
+    private readonly Mock<IVSExtensionManager> _extensionManager;
+    private readonly Mock<IOutput> _output;
+    private readonly UseVsixExtensionsArgumentExecutor _executor;
+
+    public UseVsixExtensionsArgumentProcessorTests()
+    {
+        _testRequestManager = new Mock<ITestRequestManager>();
+        _extensionManager = new Mock<IVSExtensionManager>();
+        _output = new Mock<IOutput>();
+        _executor = new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, _testRequestManager.Object, _extensionManager.Object, _output.Object);
+    }
+
+    [TestMethod]
+    public void GetMetadataShouldReturnUseVsixExtensionsArgumentProcessorCapabilities()
+    {
+        var processor = new UseVsixExtensionsArgumentProcessor();
+        Assert.IsTrue(processor.Metadata.Value is UseVsixExtensionsArgumentProcessorCapabilities);
+    }
+
+    [TestMethod]
+    public void GetExecuterShouldReturnUseVsixExtensionsArgumentProcessorCapabilities()
+    {
+        var processor = new UseVsixExtensionsArgumentProcessor();
+        Assert.IsTrue(processor.Executor!.Value is UseVsixExtensionsArgumentExecutor);
+    }
+
+    #region UseVsixExtensionsArgumentProcessorCapabilities tests
+
+    [TestMethod]
+    public void CapabilitiesShouldReturnAppropriateProperties()
+    {
+        var capabilities = new UseVsixExtensionsArgumentProcessorCapabilities();
+
+        Assert.AreEqual("/UseVsixExtensions", capabilities.CommandName);
+        Assert.IsNull(capabilities.HelpContentResourceName);
+        Assert.AreEqual(HelpContentPriority.None, capabilities.HelpPriority);
+        Assert.IsFalse(capabilities.IsAction);
+        Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
+
+        Assert.IsFalse(capabilities.AllowMultiple);
+        Assert.IsFalse(capabilities.AlwaysExecute);
+        Assert.IsFalse(capabilities.IsSpecialCommand);
+    }
+
+    #endregion
+
+    #region UseVsixExtensionsArgumentExecutor tests
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfArgumentIsNull()
+    {
+        var message = Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(null)).Message;
+        Assert.AreEqual(@"The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true", message);
+    }
+
+    [TestMethod]
+    public void InitializeShouldThrowExceptionIfArgumentIsInvalid()
+    {
+        var invalidArg = "Foo";
+
+        var message = Assert.ThrowsException<CommandLineException>(() => _executor.Initialize(invalidArg)).Message;
+        Assert.AreEqual(@"Argument Foo is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.", message);
+    }
+
+    [TestMethod]
+    public void InitializeForArgumentEqualTrueShouldCallTestRequestManagerInitializeExtensions()
     {
-        private const string DefaultRunSettings = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n  <DataCollectionRunSettings>\r\n    <DataCollectors >{0}</DataCollectors>\r\n  </DataCollectionRunSettings>\r\n</RunSettings>";
-        private const string DeprecationMessage = @"/UseVsixExtensions is getting deprecated. Please use /TestAdapterPath instead.";
-        private Mock<ITestRequestManager> testRequestManager;
-        private Mock<IVSExtensionManager> extensionManager;
-        private Mock<IOutput> output;
-        private UseVsixExtensionsArgumentExecutor executor;
-
-        public UseVsixExtensionsArgumentProcessorTests()
-        {
-            this.testRequestManager = new Mock<ITestRequestManager>();
-            this.extensionManager = new Mock<IVSExtensionManager>();
-            this.output = new Mock<IOutput>();
-            this.executor = new UseVsixExtensionsArgumentExecutor(CommandLineOptions.Instance, this.testRequestManager.Object, this.extensionManager.Object, this.output.Object);
-        }
-
-        [TestMethod]
-        public void GetMetadataShouldReturnUseVsixExtensionsArgumentProcessorCapabilities()
-        {
-            var processor = new UseVsixExtensionsArgumentProcessor();
-            Assert.IsTrue(processor.Metadata.Value is UseVsixExtensionsArgumentProcessorCapabilities);
-        }
-
-        [TestMethod]
-        public void GetExecuterShouldReturnUseVsixExtensionsArgumentProcessorCapabilities()
-        {
-            var processor = new UseVsixExtensionsArgumentProcessor();
-            Assert.IsTrue(processor.Executor.Value is UseVsixExtensionsArgumentExecutor);
-        }
-
-        #region UseVsixExtensionsArgumentProcessorCapabilities tests
-
-        [TestMethod]
-        public void CapabilitiesShouldReturnAppropriateProperties()
-        {
-            var capabilities = new UseVsixExtensionsArgumentProcessorCapabilities();
-
-            Assert.AreEqual("/UseVsixExtensions", capabilities.CommandName);
-            Assert.IsNull(capabilities.HelpContentResourceName);
-            Assert.AreEqual(HelpContentPriority.None, capabilities.HelpPriority);
-            Assert.IsFalse(capabilities.IsAction);
-            Assert.AreEqual(ArgumentProcessorPriority.AutoUpdateRunSettings, capabilities.Priority);
-
-            Assert.IsFalse(capabilities.AllowMultiple);
-            Assert.IsFalse(capabilities.AlwaysExecute);
-            Assert.IsFalse(capabilities.IsSpecialCommand);
-        }
-
-        #endregion
-
-        #region UseVsixExtensionsArgumentExecutor tests
-
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfArgumentIsNull()
-        {
-            var message = Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize(null)).Message;
-            Assert.AreEqual(@"The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored.   Example:  /UseVsixExtensions:true", message);
-        }
-
-        [TestMethod]
-        public void InitializeShouldThrowExceptionIfArgumentIsInvalid()
-        {
-            var invalidArg = "Foo";
-
-            var message = Assert.ThrowsException<CommandLineException>(() => this.executor.Initialize(invalidArg)).Message;
-            Assert.AreEqual(@"Argument Foo is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.", message);
-        }
-
-        [TestMethod]
-        public void InitializeForArgumentEqualTrueShouldCallTestRequestManagerInitializeExtensions()
-        {
-            var extensions = new List<string> { "T1.dll", "T2.dll" };
-            this.extensionManager.Setup(em => em.GetUnitTestExtensions()).Returns(extensions);
-
-            this.executor.Initialize("true");
-
-            this.output.Verify(o => o.WriteLine(DeprecationMessage, OutputLevel.Warning), Times.Once);
-            this.extensionManager.Verify(em => em.GetUnitTestExtensions(), Times.Once);
-            this.testRequestManager.Verify(trm => trm.InitializeExtensions(extensions, true), Times.Once);
-        }
-
-        [TestMethod]
-        public void InitializeForArgumentEqualfalseShouldNotCallTestRequestManagerInitializeExtensions()
-        {
-            this.executor.Initialize("false");
-
-            this.output.Verify(o => o.WriteLine(DeprecationMessage, OutputLevel.Warning), Times.Once);
-            this.extensionManager.Verify(em => em.GetUnitTestExtensions(), Times.Never);
-            this.testRequestManager.Verify(trm => trm.InitializeExtensions(It.IsAny<IEnumerable<string>>(), true), Times.Never);
-        }
-
-        #endregion
+        var extensions = new List<string> { "T1.dll", "T2.dll" };
+        _extensionManager.Setup(em => em.GetUnitTestExtensions()).Returns(extensions);
+
+        _executor.Initialize("true");
+
+        _output.Verify(o => o.WriteLine(DeprecationMessage, OutputLevel.Warning), Times.Once);
+        _extensionManager.Verify(em => em.GetUnitTestExtensions(), Times.Once);
+        _testRequestManager.Verify(trm => trm.InitializeExtensions(extensions, true), Times.Once);
     }
+
+    [TestMethod]
+    public void InitializeForArgumentEqualfalseShouldNotCallTestRequestManagerInitializeExtensions()
+    {
+        _executor.Initialize("false");
+
+        _output.Verify(o => o.WriteLine(DeprecationMessage, OutputLevel.Warning), Times.Once);
+        _extensionManager.Verify(em => em.GetUnitTestExtensions(), Times.Never);
+        _testRequestManager.Verify(trm => trm.InitializeExtensions(It.IsAny<IEnumerable<string>>(), true), Times.Never);
+    }
+
+    #endregion
 }
diff --git a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorFactoryTests.cs b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorFactoryTests.cs
index 1698ad51be..01f9acf5f0 100644
--- a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorFactoryTests.cs
+++ b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorFactoryTests.cs
@@ -1,177 +1,180 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    using TestPlatform.CommandLine.Processors;
-    using TestTools.UnitTesting;
+using Moq;
 
-    [TestClass]
-    public class ArgumentProcessorFactoryTests
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities;
+
+[TestClass]
+public class ArgumentProcessorFactoryTests
+{
+    [TestMethod]
+    public void CreateArgumentProcessorIsTreatingNonArgumentAsSource()
     {
-        [TestMethod]
-        public void CreateArgumentProcessorIsTreatingNonArgumentAsSource()
-        {
-            string argument = "--NonArgumet:Dummy";
+        string argument = "--NonArgumet:Dummy";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(argument);
+        IArgumentProcessor result = factory.CreateArgumentProcessor(argument)!;
 
-            Assert.AreEqual(typeof(TestSourceArgumentProcessor), result.GetType());
-        }
+        Assert.AreEqual(typeof(TestSourceArgumentProcessor), result.GetType());
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorIsTreatingNonArgumentAsSourceEvenItIsStratingFromForwardSlash()
-        {
-            string argument = "/foo/foo.dll";
+    [TestMethod]
+    public void CreateArgumentProcessorIsTreatingNonArgumentAsSourceEvenItIsStratingFromForwardSlash()
+    {
+        string argument = "/foo/foo.dll";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(argument);
+        IArgumentProcessor result = factory.CreateArgumentProcessor(argument)!;
 
-            Assert.AreEqual(typeof(TestSourceArgumentProcessor), result.GetType());
-        }
+        Assert.AreEqual(typeof(TestSourceArgumentProcessor), result.GetType());
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorShouldReturnPlatformArgumentProcessorWhenArgumentIsPlatform()
-        {
-            string argument = "/Platform:x64";
+    [TestMethod]
+    public void CreateArgumentProcessorShouldReturnPlatformArgumentProcessorWhenArgumentIsPlatform()
+    {
+        string argument = "/Platform:x64";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(argument);
+        IArgumentProcessor result = factory.CreateArgumentProcessor(argument)!;
 
-            Assert.AreEqual(typeof(PlatformArgumentProcessor), result.GetType());
-        }
+        Assert.AreEqual(typeof(PlatformArgumentProcessor), result.GetType());
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorShouldReturnPlatformArgumentProcessorWhenArgumentIsPlatformInXplat()
-        {
-            string argument = "--Platform:x64";
+    [TestMethod]
+    public void CreateArgumentProcessorShouldReturnPlatformArgumentProcessorWhenArgumentIsPlatformInXplat()
+    {
+        string argument = "--Platform:x64";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(argument);
+        IArgumentProcessor result = factory.CreateArgumentProcessor(argument)!;
 
-            Assert.AreEqual(typeof(PlatformArgumentProcessor), result.GetType());
-        }
+        Assert.AreEqual(typeof(PlatformArgumentProcessor), result.GetType());
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorShouldReturnThrowExceptionIfArgumentsIsNull()
-        {
-            var command = "--";
+    [TestMethod]
+    public void CreateArgumentProcessorShouldReturnThrowExceptionIfArgumentsIsNull()
+    {
+        var command = "--";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
-            Action action = () => factory.CreateArgumentProcessor(command, null);
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        Action action = () => factory.CreateArgumentProcessor(command, null!);
 
-            ExceptionUtilities.ThrowsException<ArgumentException>(
-           action,
-                "Cannot be null or empty", "argument");
-        }
+        ExceptionUtilities.ThrowsException<ArgumentException>(
+            action,
+            "Cannot be null or empty", "argument");
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorShouldReturnNullIfInvalidCommandIsPassed()
-        {
-            var command = "/-";
+    [TestMethod]
+    public void CreateArgumentProcessorShouldReturnNullIfInvalidCommandIsPassed()
+    {
+        var command = "/-";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(command, new string[] { "" });
+        IArgumentProcessor result = factory.CreateArgumentProcessor(command, [""])!;
 
-            Assert.IsNull(result);
-        }
+        Assert.IsNull(result);
+    }
 
-        [TestMethod]
-        public void CreateArgumentProcessorShouldReturnCLIRunSettingsArgumentProcessorIfCommandIsGiven()
-        {
-            var command = "--";
+    [TestMethod]
+    public void CreateArgumentProcessorShouldReturnCliRunSettingsArgumentProcessorIfCommandIsGiven()
+    {
+        var command = "--";
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
 
-            IArgumentProcessor result = factory.CreateArgumentProcessor(command, new string[] { "" });
+        IArgumentProcessor result = factory.CreateArgumentProcessor(command, [""])!;
 
-            Assert.AreEqual(typeof(CLIRunSettingsArgumentProcessor), result.GetType());
-        }
+        Assert.AreEqual(typeof(CliRunSettingsArgumentProcessor), result.GetType());
+    }
 
-        [TestMethod]
-        public void BuildCommadMapsForProcessorWithIsSpecialCommandSetAddsProcessorToSpecialMap()
-        {
-            var specialCommands = GetArgumentProcessors(specialCommandFilter: true);
+    [TestMethod]
+    public void BuildCommandMapsForProcessorWithIsSpecialCommandSetAddsProcessorToSpecialMap()
+    {
+        var specialCommands = GetArgumentProcessors(specialCommandFilter: true);
 
-            List<string> xplatspecialCommandNames = new List<string>();
-            List<string> specialCommandNames = new List<string>();
+        List<string> xplatspecialCommandNames = new();
+        List<string> specialCommandNames = new();
 
-            // for each command add there xplat version
-            foreach (var specialCommand in specialCommands)
+        // for each command add there xplat version
+        foreach (var specialCommand in specialCommands)
+        {
+            specialCommandNames.Add(specialCommand.Metadata.Value.CommandName);
+            if (!specialCommand.Metadata.Value.AlwaysExecute)
             {
-                specialCommandNames.Add(specialCommand.Metadata.Value.CommandName);
-                if (!specialCommand.Metadata.Value.AlwaysExecute)
-                {
-                    xplatspecialCommandNames.Add(string.Concat("--", specialCommand.Metadata.Value.CommandName.Remove(0, 1)));
-                }
+                xplatspecialCommandNames.Add(string.Concat("--", specialCommand.Metadata.Value.CommandName.Remove(0, 1)));
             }
-            var factory = ArgumentProcessorFactory.Create();
-
-            CollectionAssert.AreEquivalent(
-                specialCommandNames.Concat(xplatspecialCommandNames).ToList(),
-                factory.SpecialCommandToProcessorMap.Keys.ToList());
         }
+        var factory = ArgumentProcessorFactory.Create();
+
+        CollectionAssert.AreEquivalent(
+            specialCommandNames.Concat(xplatspecialCommandNames).ToList(),
+            factory.SpecialCommandToProcessorMap.Keys.ToList());
+    }
 
-        [TestMethod]
-        public void BuildCommadMapsForMultipleProcessorAddsProcessorToAppropriateMaps()
+    [TestMethod]
+    public void BuildCommandMapsForMultipleProcessorAddsProcessorToAppropriateMaps()
+    {
+        var commandProcessors = GetArgumentProcessors(specialCommandFilter: false);
+        var commands = commandProcessors.Select(a => a.Metadata.Value.CommandName);
+        List<string> xplatCommandName = new();
+
+        // for each command add there xplat version
+        foreach (string name in commands)
         {
-            var commandProcessors = GetArgumentProcessors(specialCommandFilter: false);
-            var commands = commandProcessors.Select(a => a.Metadata.Value.CommandName);
-            List<string> xplatCommandName = new List<string>();
+            xplatCommandName.Add(string.Concat("--", name.Remove(0, 1)));
+        }
 
-            // for each command add there xplat version
-            foreach (string name in commands)
-            {
-                xplatCommandName.Add(string.Concat("--", name.Remove(0, 1)));
-            }
+        var shortCommands = commandProcessors.Where(a => !string.IsNullOrEmpty(a.Metadata.Value.ShortCommandName))
+            .Select(a => a.Metadata.Value.ShortCommandName);
 
-            var shortCommands = commandProcessors.Where(a => !string.IsNullOrEmpty(a.Metadata.Value.ShortCommandName))
-                                    .Select(a => a.Metadata.Value.ShortCommandName);
+        List<string> xplatShortCommandName = new();
 
-            List<string> xplatShortCommandName = new List<string>();
+        // for each short command add there xplat version
+        foreach (var name in shortCommands)
+        {
+            xplatShortCommandName.Add(name!.Replace('/', '-'));
+        }
 
-            // for each short command add there xplat version
-            foreach (string name in shortCommands)
-            {
-                xplatShortCommandName.Add(name.Replace('/', '-'));
-            }
+        Mock<IFeatureFlag> featureFlag = new();
+        featureFlag.Setup(x => x.IsSet(It.IsAny<string>())).Returns(false);
+        ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create(featureFlag.Object);
 
-            ArgumentProcessorFactory factory = ArgumentProcessorFactory.Create();
+        // Expect command processors to contain both long and short commands.
+        CollectionAssert.AreEquivalent(
+            commands.Concat(xplatCommandName).Concat(shortCommands).Concat(xplatShortCommandName).ToList(),
+            factory.CommandToProcessorMap.Keys.ToList());
+    }
 
-            // Expect command processors to contain both long and short commands.
-            CollectionAssert.AreEquivalent(
-                commands.Concat(xplatCommandName).Concat(shortCommands).Concat(xplatShortCommandName).ToList(),
-                factory.CommandToProcessorMap.Keys.ToList());
-        }
+    private static IEnumerable<IArgumentProcessor> GetArgumentProcessors(bool specialCommandFilter)
+    {
+        var allProcessors = typeof(ArgumentProcessorFactory)
+            .Assembly.GetTypes()
+            .Where(t => !t.IsAbstract && !t.Name.Equals("IArgumentProcessor") && typeof(IArgumentProcessor).IsAssignableFrom(t));
 
-        private static IEnumerable<IArgumentProcessor> GetArgumentProcessors(bool specialCommandFilter)
+        foreach (var processor in allProcessors)
         {
-            var allProcessors = typeof(ArgumentProcessorFactory).GetTypeInfo()
-                                    .Assembly.GetTypes()
-                                    .Where(t => !t.GetTypeInfo().IsAbstract && !t.Name.Equals("IArgumentProcessor") && typeof(IArgumentProcessor).IsAssignableFrom(t));
+            var instance = Activator.CreateInstance(processor) as IArgumentProcessor;
+            Assert.IsNotNull(instance, "Unable to instantiate processor: {0}", processor);
 
-            foreach (var processor in allProcessors)
+            var specialProcessor = instance.Metadata.Value.IsSpecialCommand;
+            if ((specialCommandFilter && specialProcessor) || (!specialCommandFilter && !specialProcessor))
             {
-                var instance = Activator.CreateInstance(processor) as IArgumentProcessor;
-                Assert.IsNotNull(instance, "Unable to instantiate processor: {0}", processor);
-
-                var specialProcessor = instance.Metadata.Value.IsSpecialCommand;
-                if ((specialCommandFilter && specialProcessor) || (!specialCommandFilter && !specialProcessor))
-                {
-                    yield return instance;
-                }
+                yield return instance;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs
index c966df482d..a597af523d 100644
--- a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs
+++ b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs
@@ -1,65 +1,65 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors.Utilities;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-    [TestClass]
-    public class ArgumentProcessorUtilitiesTests
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests.Processors.Utilities;
+
+[TestClass]
+public class ArgumentProcessorUtilitiesTests
+{
+    [TestMethod]
+    [DataRow("")]
+    [DataRow(" ")]
+    [DataRow(";;;;")]
+    public void GetArgumentListShouldThrowErrorOnInvalidArgument(string argument)
     {
-        [TestMethod]
-        [DataRow("")]
-        [DataRow(" ")]
-        [DataRow(";;;;")]
-        public void GetArgumentListShouldThrowErrorOnInvalidArgument(string argument)
+        try
         {
-            try
-            {
-                ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, "test exception.");
-            }
-            catch (Exception e)
-            {
-                Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
-                Assert.IsTrue(e.Message.Contains("test exception."));
-            }
+            ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, "test exception.");
         }
-
-        [TestMethod]
-        [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
-        [DataRow(";;;abc.txt;;;tracelevel=info;;;newkey=newvalue;;;;")]
-        public void GetArgumentListShouldReturnCorrectArgumentList(string argument)
+        catch (Exception e)
         {
-            var argumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, "test exception.");
-            argumentList.SequenceEqual(new string[] { "abc.txt", "tracelevel=info", "newkey=newvalue" });
+            Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
+            Assert.IsTrue(e.Message.Contains("test exception."));
         }
+    }
+
+    [TestMethod]
+    [DataRow("abc.txt;tracelevel=info;newkey=newvalue")]
+    [DataRow(";;;abc.txt;;;tracelevel=info;;;newkey=newvalue;;;;")]
+    public void GetArgumentListShouldReturnCorrectArgumentList(string argument)
+    {
+        var argumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, "test exception.");
+        Assert.IsTrue(argumentList.SequenceEqual(new string[] { "abc.txt", "tracelevel=info", "newkey=newvalue" }));
+    }
 
-        [TestMethod]
-        [DataRow(new string[] { "key1=value1", "invalidPair", "key2=value2"})]
-        public void GetArgumentParametersShouldThrowErrorOnInvalidParameters(string[] parameterArgs)
+    [TestMethod]
+    [DataRow(["key1=value1", "invalidPair", "key2=value2"])]
+    public void GetArgumentParametersShouldThrowErrorOnInvalidParameters(string[] parameterArgs)
+    {
+        try
         {
-            try
-            {
-                ArgumentProcessorUtilities.GetArgumentParameters(parameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, "test exception.");
-            }
-            catch (Exception e)
-            {
-                Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
-                Assert.IsTrue(e.Message.Contains("test exception."));
-            }
+            ArgumentProcessorUtilities.GetArgumentParameters(parameterArgs, ArgumentProcessorUtilities.EqualNameValueSeparator, "test exception.");
         }
-
-        [TestMethod]
-        public void GetArgumentParametersShouldReturnCorrectParameterDictionary()
+        catch (Exception e)
         {
-            var parameterDict = ArgumentProcessorUtilities.GetArgumentParameters(new string[] { "key1=value1", "key2=value2", "key3=value3" }, ArgumentProcessorUtilities.EqualNameValueSeparator, "test exception.");
-
-            var expectedDict = new Dictionary<string, string> { { "key1", "value1"}, { "key2", "value2"}, { "key3", "value3"} };
-            CollectionAssert.AreEqual(parameterDict.OrderBy(kv => kv.Key).ToList(), expectedDict.OrderBy(kv => kv.Key).ToList());
+            Assert.IsTrue(e.GetType().Equals(typeof(CommandLineException)));
+            Assert.IsTrue(e.Message.Contains("test exception."));
         }
     }
-}
\ No newline at end of file
+
+    [TestMethod]
+    public void GetArgumentParametersShouldReturnCorrectParameterDictionary()
+    {
+        var parameterDict = ArgumentProcessorUtilities.GetArgumentParameters(new string[] { "key1=value1", "key2=value2", "key3=value3" }, ArgumentProcessorUtilities.EqualNameValueSeparator, "test exception.");
+
+        var expectedDict = new Dictionary<string, string> { { "key1", "value1" }, { "key2", "value2" }, { "key3", "value3" } };
+        CollectionAssert.AreEqual(parameterDict.OrderBy(kv => kv.Key).ToList(), expectedDict.OrderBy(kv => kv.Key).ToList());
+    }
+}
diff --git a/test/vstest.console.UnitTests/Program.cs b/test/vstest.console.UnitTests/Program.cs
deleted file mode 100644
index 845923d3c9..0000000000
--- a/test/vstest.console.UnitTests/Program.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/vstest.console.UnitTests/Properties/AssemblyInfo.cs b/test/vstest.console.UnitTests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 283c5da113..0000000000
--- a/test/vstest.console.UnitTests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("vstest.console.UnitTests")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("6deb7dc1-c8df-465e-8b31-96248d3ffad0")]
diff --git a/test/vstest.console.UnitTests/Publisher/MetricsPublisherFactoryTests.cs b/test/vstest.console.UnitTests/Publisher/MetricsPublisherFactoryTests.cs
index 0ba4da07d1..748bf25339 100644
--- a/test/vstest.console.UnitTests/Publisher/MetricsPublisherFactoryTests.cs
+++ b/test/vstest.console.UnitTests/Publisher/MetricsPublisherFactoryTests.cs
@@ -1,36 +1,35 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Publisher
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace vstest.console.UnitTests.Publisher;
 
-    [TestClass]
-    public class MetricsPublisherFactoryTests
+[TestClass]
+public class MetricsPublisherFactoryTests
+{
+    [TestMethod]
+    public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedOutAndNotInDesignMode()
     {
-        [TestMethod]
-        public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedOutAndNotInDesignMode()
-        {
-            var result = MetricsPublisherFactory.GetMetricsPublisher(false, false);
+        var result = MetricsPublisherFactory.GetMetricsPublisher(false, false);
 
-            Assert.IsTrue(result.Result is NoOpMetricsPublisher);
-        }
+        Assert.IsTrue(result.Result is NoOpMetricsPublisher);
+    }
 
-        [TestMethod]
-        public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedInAndInDesignMode()
-        {
-            var result = MetricsPublisherFactory.GetMetricsPublisher(true, true);
+    [TestMethod]
+    public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedInAndInDesignMode()
+    {
+        var result = MetricsPublisherFactory.GetMetricsPublisher(true, true);
 
-            Assert.IsTrue(result.Result is NoOpMetricsPublisher);
-        }
+        Assert.IsTrue(result.Result is NoOpMetricsPublisher);
+    }
 
-        [TestMethod]
-        public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedOutAndInDesignMode()
-        {
-            var result = MetricsPublisherFactory.GetMetricsPublisher(false, true);
+    [TestMethod]
+    public void GetMetricsPublisherShouldReturnNoOpMetricsPublisherIfTelemetryOptedOutAndInDesignMode()
+    {
+        var result = MetricsPublisherFactory.GetMetricsPublisher(false, true);
 
-            Assert.IsTrue(result.Result is NoOpMetricsPublisher);
-        }
+        Assert.IsTrue(result.Result is NoOpMetricsPublisher);
     }
 }
diff --git a/test/vstest.console.UnitTests/Publisher/TextFileTelemetryPublisherTests.cs b/test/vstest.console.UnitTests/Publisher/TextFileTelemetryPublisherTests.cs
index 39fb8027eb..f37e996488 100644
--- a/test/vstest.console.UnitTests/Publisher/TextFileTelemetryPublisherTests.cs
+++ b/test/vstest.console.UnitTests/Publisher/TextFileTelemetryPublisherTests.cs
@@ -1,50 +1,47 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.Publisher
+using System.Collections.Generic;
+
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+namespace vstest.console.UnitTests.Publisher;
+
+[TestClass]
+public class TextFileTelemetryPublisherTests
 {
-    using System.Collections.Generic;
+    [TestMethod]
+    public void LogToFileShouldCreateDirectoryIfNotExists()
+    {
+        var dummyDictionary = new Dictionary<string, object?>();
+        var mockFileHelper = new Mock<IFileHelper>();
+        mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
+        dummyDictionary.Add("DummyMessage://", "DummyValue");
+        dummyDictionary.Add("Dummy2", "DummyValue2");
 
-    using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-    using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
+        // Act.
+        TextFileTelemetryPublisher.LogToFile("dummyevent", dummyDictionary, mockFileHelper.Object);
 
-    using Moq;
+        // Verify.
+        mockFileHelper.Verify(fh => fh.CreateDirectory(It.IsAny<string>()), Times.Once);
+    }
 
-    [TestClass]
-    public class TextFileTelemetryPublisherTests
+    [TestMethod]
+    public void LogToFileShouldWriteAllText()
     {
-        [TestMethod]
-        public void LogToFileShouldCreateDirectoryIfNotExists()
-        {
-            var publishMetrics = new TextFileTelemetryPublisher();
-            var dummyDictionary = new Dictionary<string, object>();
-            var mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.DirectoryExists(It.IsAny<string>())).Returns(false);
-            dummyDictionary.Add("DummyMessage://", "DummyValue");
-            dummyDictionary.Add("Dummy2", "DummyValue2");
-
-            // Act.
-            publishMetrics.LogToFile("dummyevent", dummyDictionary, mockFileHelper.Object);
-
-            // Verify.
-            mockFileHelper.Verify(fh => fh.CreateDirectory(It.IsAny<string>()), Times.Once);
-        }
-
-        [TestMethod]
-        public void LogToFileShouldWriteAllText()
-        {
-            var publishMetrics = new TextFileTelemetryPublisher();
-            var dummyDictionary = new Dictionary<string, object>();
-            var mockFileHelper = new Mock<IFileHelper>();
-            dummyDictionary.Add("DummyMessage://", "DummyValue");
-            dummyDictionary.Add("Dummy2", "DummyValue2");
-
-            // Act.
-            publishMetrics.LogToFile("dummyevent", dummyDictionary, mockFileHelper.Object);
-
-            // Verify.
-            mockFileHelper.Verify(fh => fh.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-        }
+        var dummyDictionary = new Dictionary<string, object?>();
+        var mockFileHelper = new Mock<IFileHelper>();
+        dummyDictionary.Add("DummyMessage://", "DummyValue");
+        dummyDictionary.Add("Dummy2", "DummyValue2");
+
+        // Act.
+        TextFileTelemetryPublisher.LogToFile("dummyevent", dummyDictionary, mockFileHelper.Object);
+
+        // Verify.
+        mockFileHelper.Verify(fh => fh.WriteAllTextToFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/StringExtensions.cs b/test/vstest.console.UnitTests/StringExtensions.cs
index 718f6e4610..49eb309f3b 100644
--- a/test/vstest.console.UnitTests/StringExtensions.cs
+++ b/test/vstest.console.UnitTests/StringExtensions.cs
@@ -1,47 +1,46 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
+using System;
+
+namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests;
+
+public static class StringExtensions
 {
-    using System;
+    /// <summary>
+    /// Replace all \r\n with \n to get Unix line endings to make strings easy to compare while still
+    /// keeping the formatting in mind.
+    /// </summary>
+    /// <returns></returns>
+    public static string NormalizeLineEndings(this string text)
+    {
+        return text.Replace("\r\n", "\n");
+    }
 
-    public static class StringExtensions
+    /// <summary>
+    /// Replace whitespace with printable characters (and still keep \r newlines for easy readability)
+    /// </summary>
+    /// <returns></returns>
+    public static string ShowWhiteSpace(this string text)
     {
-        /// <summary>
-        /// Replace all \r\n with \n to get Unix line endings to make strings easy to compare while still
-        /// keeping the formatting in mind.
-        /// </summary>
-        /// <returns></returns>
-        public static string NormalizeLineEndings(this string text)
+        // use mongolian vowel separator as placeholder for the newline that we add for formatting
+        var placeholder = "\u180E";
+        if (text.Contains(placeholder))
         {
-            return text.Replace("\r\n", "\n");
+            throw new InvalidOperationException(
+                "The text contains mongolian vowel separator character that we use as a placeholder.");
         }
 
-        /// <summary>
-        /// Replace whitespace with printable characters (and still keep \r newlines for easy readability)
-        /// </summary>
-        /// <returns></returns>
-        public static string ShowWhiteSpace(this string text)
-        {
-            // use mongolian vowel separator as placeholder for the newline that we add for formatting
-            var placeholder = "\u180E";
-            if (text.Contains(placeholder))
-            {
-                throw new InvalidOperationException(
-                    "The text contains mongolian vowel separator character that we use as a placeholder.");
-            }
-
-            var whiteSpaced = text
-                .Replace("\r\n", "\\r\\n\u180E")
-                .Replace("\r", "\\r")
-                .Replace("\n", "\\n\u180E")
-                .Replace("\t", "\\t")
-                .Replace(" ", "␣")
-                .Replace("\u180E", "\n");
+        var whiteSpaced = text
+            .Replace("\r\n", "\\r\\n\u180E")
+            .Replace("\r", "\\r")
+            .Replace("\n", "\\n\u180E")
+            .Replace("\t", "\\t")
+            .Replace(" ", "␣")
+            .Replace("\u180E", "\n");
 
-            // prepend one newline to get better output from assertion where both expected
-            // and actual output start on the same position
-            return "\n" + whiteSpaced;
-        }
+        // prepend one newline to get better output from assertion where both expected
+        // and actual output start on the same position
+        return "\n" + whiteSpaced;
     }
-}
\ No newline at end of file
+}
diff --git a/test/vstest.console.UnitTests/TestDoubles/DummyCommandLineOptions.cs b/test/vstest.console.UnitTests/TestDoubles/DummyCommandLineOptions.cs
index 9c62b4679e..cf55f21255 100644
--- a/test/vstest.console.UnitTests/TestDoubles/DummyCommandLineOptions.cs
+++ b/test/vstest.console.UnitTests/TestDoubles/DummyCommandLineOptions.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.TestDoubles
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+namespace vstest.console.UnitTests.TestDoubles;
 
-    internal class DummyCommandLineOptions : CommandLineOptions
-    {
-    }
+internal class DummyCommandLineOptions : CommandLineOptions
+{
 }
diff --git a/test/vstest.console.UnitTests/TestDoubles/DummyLoggerEvents.cs b/test/vstest.console.UnitTests/TestDoubles/DummyLoggerEvents.cs
index 6c5a0f9bd3..88f6c135c2 100644
--- a/test/vstest.console.UnitTests/TestDoubles/DummyLoggerEvents.cs
+++ b/test/vstest.console.UnitTests/TestDoubles/DummyLoggerEvents.cs
@@ -1,26 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.TestDoubles
-{
-    using System;
-    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace vstest.console.UnitTests.TestDoubles;
 
-    internal class DummyLoggerEvents : InternalTestLoggerEvents
+internal class DummyLoggerEvents : InternalTestLoggerEvents
+{
+    public DummyLoggerEvents(TestSessionMessageLogger testSessionMessageLogger)
+        : base(testSessionMessageLogger)
     {
-        public DummyLoggerEvents(TestSessionMessageLogger testSessionMessageLogger) : base(testSessionMessageLogger)
-        {
-        }
+    }
 
-        public override event EventHandler<TestResultEventArgs> TestResult;
-        public override event EventHandler<TestRunCompleteEventArgs> TestRunComplete;
-        public override event EventHandler<TestRunMessageEventArgs> TestRunMessage;
+    public override event EventHandler<TestResultEventArgs>? TestResult;
+    public override event EventHandler<TestRunCompleteEventArgs>? TestRunComplete;
+    public override event EventHandler<TestRunMessageEventArgs>? TestRunMessage;
 
-        public bool EventsSubscribed()
-        {
-            return TestResult != null && TestRunComplete != null && TestRunMessage != null;
-        }
+    public bool EventsSubscribed()
+    {
+        return TestResult != null && TestRunComplete != null && TestRunMessage != null;
     }
 }
diff --git a/test/vstest.console.UnitTests/TestDoubles/DummyTestRunResultAggregator.cs b/test/vstest.console.UnitTests/TestDoubles/DummyTestRunResultAggregator.cs
index 1aafeeaf4f..6d91b8719c 100644
--- a/test/vstest.console.UnitTests/TestDoubles/DummyTestRunResultAggregator.cs
+++ b/test/vstest.console.UnitTests/TestDoubles/DummyTestRunResultAggregator.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.TestDoubles
-{
-    using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+
+namespace vstest.console.UnitTests.TestDoubles;
 
-    internal class DummyTestRunResultAggregator : TestRunResultAggregator
-    {
-    }
-}
\ No newline at end of file
+internal class DummyTestRunResultAggregator : TestRunResultAggregator
+{
+}
diff --git a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
index d8440633b5..964692c18c 100644
--- a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
+++ b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
@@ -1,2476 +1,2936 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace vstest.console.UnitTests.TestPlatformHelpers
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+using FluentAssertions;
+
+using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
+using Microsoft.VisualStudio.TestPlatform.CommandLine;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
+using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
+using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Common.Logging;
+using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
+using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
+using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Moq;
+
+using vstest.console.UnitTests.TestDoubles;
+
+using Constants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
+
+namespace vstest.console.UnitTests.TestPlatformHelpers;
+
+[TestClass]
+public class TestRequestManagerTests
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Diagnostics;
-	using System.Linq;
-	using System.Threading;
-	using System.Threading.Tasks;
-
-	using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
-	using Microsoft.VisualStudio.TestPlatform.CommandLine;
-	using Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
-	using Microsoft.VisualStudio.TestPlatform.CommandLine.Publisher;
-	using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
-	using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
-	using Microsoft.VisualStudio.TestPlatform.Common.Logging;
-	using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
-	using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Payloads;
-	using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-	using System.Runtime.Versioning;
-	using Microsoft.VisualStudio.TestPlatform.CommandLineUtilities;
-
-	using Moq;
-
-	using vstest.console.UnitTests.TestDoubles;
-	using Microsoft.VisualStudio.TestPlatform.Utilities;
-	using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
-
-    [TestClass]
-	public class TestRequestManagerTests
-	{
-		private DummyLoggerEvents mockLoggerEvents;
-		private CommandLineOptions commandLineOptions;
-		private Mock<ITestPlatform> mockTestPlatform;
-		private Mock<IOutput> mockOutput;
-		private Mock<IDiscoveryRequest> mockDiscoveryRequest;
-		private Mock<ITestRunRequest> mockRunRequest;
-		private Mock<IAssemblyMetadataProvider> mockAssemblyMetadataProvider;
-		private InferHelper inferHelper;
-		private ITestRequestManager testRequestManager;
-		private Mock<ITestPlatformEventSource> mockTestPlatformEventSource;
-		private ProtocolConfig protocolConfig;
-		private Task<IMetricsPublisher> mockMetricsPublisherTask;
-		private Mock<IMetricsPublisher> mockMetricsPublisher;
-		private Mock<IProcessHelper> mockProcessHelper;
-		private Mock<ITestRunAttachmentsProcessingManager> mockAttachmentsProcessingManager;
-
-		private const string DefaultRunsettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>";
-
-		public TestRequestManagerTests()
-		{
-			this.mockLoggerEvents = new DummyLoggerEvents(TestSessionMessageLogger.Instance);
-			this.commandLineOptions = new DummyCommandLineOptions();
-			this.mockOutput = new Mock<IOutput>();
-			this.mockTestPlatform = new Mock<ITestPlatform>();
-			this.mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
-			this.protocolConfig = new ProtocolConfig();
-			this.mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
-			this.inferHelper = new InferHelper(this.mockAssemblyMetadataProvider.Object);
-			var testRunResultAggregator = new DummyTestRunResultAggregator();
-			this.mockProcessHelper = new Mock<IProcessHelper>();
-
-			this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
-			this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
-			this.mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
-			this.testRequestManager = new TestRequestManager(
-				this.commandLineOptions,
-				this.mockTestPlatform.Object,
-				testRunResultAggregator,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-			this.mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Returns(this.mockDiscoveryRequest.Object);
-			this.mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Returns(this.mockRunRequest.Object);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.X86);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework40));
-			this.mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
-			this.mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");
-		}
-
-		[TestCleanup]
-		public void Cleanup()
-		{
-			CommandLineOptions.Instance.Reset();
-
-            // Opt out the Telemetry
-            Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "0");
+    private DummyLoggerEvents _mockLoggerEvents;
+    private readonly CommandLineOptions _commandLineOptions;
+    private readonly Mock<ITestPlatform> _mockTestPlatform;
+    private readonly Mock<IDiscoveryRequest> _mockDiscoveryRequest;
+    private readonly Mock<ITestRunRequest> _mockRunRequest;
+    private readonly Mock<IAssemblyMetadataProvider> _mockAssemblyMetadataProvider;
+    private readonly InferHelper _inferHelper;
+    private ITestRequestManager _testRequestManager;
+    private readonly Mock<ITestPlatformEventSource> _mockTestPlatformEventSource;
+    private readonly ProtocolConfig _protocolConfig;
+    private readonly Task<IMetricsPublisher> _mockMetricsPublisherTask;
+    private readonly Mock<IMetricsPublisher> _mockMetricsPublisher;
+    private readonly Mock<IProcessHelper> _mockProcessHelper;
+    private readonly Mock<ITestRunAttachmentsProcessingManager> _mockAttachmentsProcessingManager;
+    private readonly Mock<IEnvironment> _mockEnvironment;
+    private readonly Mock<IEnvironmentVariableHelper> _mockEnvironmentVariableHelper;
+
+    private const string DefaultRunsettings = @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>";
+
+    public TestRequestManagerTests()
+    {
+        _mockLoggerEvents = new DummyLoggerEvents(TestSessionMessageLogger.Instance);
+        _commandLineOptions = new DummyCommandLineOptions();
+        _mockTestPlatform = new Mock<ITestPlatform>();
+        _mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatformEventSource = new Mock<ITestPlatformEventSource>();
+        _protocolConfig = new ProtocolConfig();
+        _mockAssemblyMetadataProvider = new Mock<IAssemblyMetadataProvider>();
+        _inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
+        var testRunResultAggregator = new DummyTestRunResultAggregator();
+        _mockProcessHelper = new Mock<IProcessHelper>();
+        _mockEnvironment = new Mock<IEnvironment>();
+        _mockEnvironmentVariableHelper = new Mock<IEnvironmentVariableHelper>();
+
+        _mockMetricsPublisher = new Mock<IMetricsPublisher>();
+        _mockMetricsPublisherTask = Task.FromResult(_mockMetricsPublisher.Object);
+        _mockAttachmentsProcessingManager = new Mock<ITestRunAttachmentsProcessingManager>();
+        _testRequestManager = new TestRequestManager(
+            _commandLineOptions,
+            _mockTestPlatform.Object,
+            testRunResultAggregator,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+        _mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(_mockDiscoveryRequest.Object);
+        _mockTestPlatform.Setup(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(_mockRunRequest.Object);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.X86);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework40));
+        _mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
+        _mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");
+    }
+
+    [TestCleanup]
+    public void Cleanup()
+    {
+        CommandLineOptions.Reset();
+
+        // Opt out the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "0");
+    }
+
+    [TestMethod]
+    public void TestRequestManagerShouldNotInitializeConsoleLoggerIfDesignModeIsSet()
+    {
+        CommandLineOptions.Instance.IsDesignMode = true;
+        _mockLoggerEvents = new DummyLoggerEvents(TestSessionMessageLogger.Instance);
+        _ = new TestRequestManager(CommandLineOptions.Instance,
+            new Mock<ITestPlatform>().Object,
+            TestRunResultAggregator.Instance,
+            new Mock<ITestPlatformEventSource>().Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        Assert.IsFalse(_mockLoggerEvents.EventsSubscribed());
+    }
+
+    [TestMethod]
+    public void InitializeExtensionsShouldCallTestPlatformToClearAndUpdateExtensions()
+    {
+        var paths = new List<string>() { "a", "b" };
+        _testRequestManager.InitializeExtensions(paths, false);
+
+        _mockTestPlatform.Verify(mt => mt.ClearExtensions(), Times.Once);
+        _mockTestPlatform.Verify(mt => mt.UpdateExtensions(paths, false), Times.Once);
+    }
+
+    [TestMethod]
+    public void ResetShouldResetCommandLineOptionsInstance()
+    {
+        var oldInstance = CommandLineOptions.Instance;
+        _testRequestManager.ResetOptions();
+
+        var newInstance = CommandLineOptions.Instance;
+
+        Assert.AreNotEqual(oldInstance, newInstance, "CommandLineOptions must be cleaned up");
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldReadTheBatchSizeFromSettingsAndSetItForDiscoveryCriteria()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <BatchSize>15</BatchSize>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+        Assert.AreEqual(15, actualDiscoveryCriteria!.FrequencyOfDiscoveredTestsEvent);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCallTestPlatformAndSucceed()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var createDiscoveryRequestCalled = 0;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) =>
+            {
+                createDiscoveryRequestCalled++;
+                actualDiscoveryCriteria = discoveryCriteria;
+            }).Returns(mockDiscoveryRequest.Object);
+
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        string testCaseFilterValue = "TestFilter";
+        CommandLineOptions.Instance.TestCaseFilterValue = testCaseFilterValue;
+        _testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, _protocolConfig);
+
+        Assert.AreEqual(testCaseFilterValue, actualDiscoveryCriteria!.TestCaseFilter, "TestCaseFilter must be set");
+
+        Assert.AreEqual(1, createDiscoveryRequestCalled, "CreateDiscoveryRequest must be invoked only once.");
+        Assert.AreEqual(2, actualDiscoveryCriteria.Sources.Count(), "All Sources must be used for discovery request");
+        Assert.AreEqual("a", actualDiscoveryCriteria.Sources.First(), "First Source in list is incorrect");
+        Assert.AreEqual("b", actualDiscoveryCriteria.Sources.ElementAt(1), "Second Source in list is incorrect");
+
+        // Default frequency is set to BatchSize (which is set to 1000).
+        Assert.AreEqual(1000, actualDiscoveryCriteria.FrequencyOfDiscoveredTestsEvent);
+
+        mockDiscoveryRegistrar.Verify(md => md.RegisterDiscoveryEvents(It.IsAny<IDiscoveryRequest>()), Times.Once);
+        mockDiscoveryRegistrar.Verify(md => md.UnregisterDiscoveryEvents(It.IsAny<IDiscoveryRequest>()), Times.Once);
+
+        mockDiscoveryRequest.Verify(md => md.DiscoverAsync(), Times.Once);
+
+        _mockTestPlatformEventSource.Verify(mt => mt.DiscoveryRequestStart(), Times.Once);
+        _mockTestPlatformEventSource.Verify(mt => mt.DiscoveryRequestStop(), Times.Once);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldPassSameProtocolConfigInRequestData()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        string testCaseFilterValue = "TestFilter";
+        CommandLineOptions.Instance.TestCaseFilterValue = testCaseFilterValue;
+        _testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.AreEqual(6, actualRequestData!.ProtocolConfig!.Version);
+    }
+
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectMetrics()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll", "b.dll" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <MaxCpuCount>2</MaxCpuCount>
+                                    <TargetPlatform>x86</TargetPlatform>
+                                    <TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
+                                    <DisableAppDomain>True</DisableAppDomain>
+                                </RunConfiguration>
+                                <MSPhoneTest>
+                                  <TargetDevice>169.254.193.190</TargetDevice>
+                                </MSPhoneTest>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out var maxcount));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out var targetPlatform));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out var disableAppDomain));
+        Assert.AreEqual("Other", targetDevice);
+        Assert.AreEqual(2, maxcount);
+        Assert.AreEqual("X86", targetPlatform.ToString());
+        Assert.AreEqual(true, disableAppDomain);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectTargetDeviceLocalMachineIfTargetDeviceStringisEmpty()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice></TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
+        Assert.AreEqual("Local Machine", targetDevice);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectTargetDeviceIfTargetDeviceIsDevice()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Device</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
+        Assert.AreEqual("Device", targetDevice);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectTargetDeviceIfTargetDeviceIsEmulator()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Emulator 8.1 U1 WVGA 4 inch 512MB</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
+        Assert.AreEqual("Emulator 8.1 U1 WVGA 4 inch 512MB", targetDevice);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectCommands()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Device</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        CommandLineOptions.Instance.Parallel = true;
+        CommandLineOptions.Instance.EnableCodeCoverage = true;
+        CommandLineOptions.Instance.InIsolation = true;
+        CommandLineOptions.Instance.UseVsixExtensions = true;
+        CommandLineOptions.Instance.SettingsFile = @"c://temp/.runsettings";
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
+
+        var commandLineArray = commandLineSwitches.ToString();
+
+        Assert.IsTrue(commandLineArray!.Contains("/Parallel"));
+        Assert.IsTrue(commandLineArray.Contains("/EnableCodeCoverage"));
+        Assert.IsTrue(commandLineArray.Contains("/InIsolation"));
+        Assert.IsTrue(commandLineArray.Contains("/UseVsixExtensions"));
+        Assert.IsTrue(commandLineArray.Contains("/settings//.RunSettings"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectTestSettings()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Device</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        CommandLineOptions.Instance.SettingsFile = @"c://temp/.testsettings";
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
+
+        var commandLineArray = commandLineSwitches.ToString();
+        Assert.IsTrue(commandLineArray!.Contains("/settings//.TestSettings"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectVsmdiFile()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Device</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        CommandLineOptions.Instance.SettingsFile = @"c://temp/.vsmdi";
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
+
+        var commandLineArray = commandLineSwitches.ToString();
+        Assert.IsTrue(commandLineArray!.Contains("/settings//.vsmdi"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldCollectTestRunConfigFile()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <TargetDevice>Device</TargetDevice>
+                                </RunConfiguration>
+                            </RunSettings>"
+        };
+
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        CommandLineOptions.Instance.SettingsFile = @"c://temp/.testrunConfig";
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
+
+        var commandLineArray = commandLineSwitches.ToString();
+        Assert.IsTrue(commandLineArray!.Contains("/settings//.testrunConfig"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+
+        Assert.IsTrue(actualDiscoveryCriteria!.RunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings =
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     <TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion>
+                     <TargetPlatform>{Architecture.ARM}</TargetPlatform>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.X86);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework451));
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Never);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()), Times.Never);
+
+        Assert.IsTrue(actualDiscoveryCriteria!.RunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldUpdateFrameworkAndPlatformInCommandLineScenariosIfNotSpecified()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+
+        Assert.IsTrue(actualDiscoveryCriteria!.RunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldNotInferAndUpdateFrameworkAndPlatformInCommandLineScenariosIfSpecified()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+
+        // specified architecture
+        _commandLineOptions.TargetFrameworkVersion = Framework.DefaultFramework;
+        _commandLineOptions.TargetArchitecture = Architecture.X86;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        // we infer the architecture and framework, so we can print warning when they don't match settings.
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()), Times.Once);
+
+        // but we don't update the settings, to keep what user specified
+        Assert.IsFalse(actualDiscoveryCriteria!.RunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsFalse(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldPublishMetrics()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" }
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 2 };
+        var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+
+        // Act
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
+
+        // Verify.
+        _mockMetricsPublisher.Verify(mp => mp.PublishMetrics(TelemetryDataConstants.TestDiscoveryCompleteEvent, It.IsAny<IDictionary<string, object?>>()), Times.Once);
+    }
+
+    [TestMethod]
+    public void CancelShouldNotThrowExceptionIfTestRunRequestHasBeenDisposed()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+        _testRequestManager.CancelTestRun();
+    }
+
+    [TestMethod]
+    public void AbortShouldNotThrowExceptionIfTestRunRequestHasBeenDisposed()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+        _testRequestManager.AbortTestRun();
+    }
+
+    [TestMethod]
+    public void RunTestsShouldReadTheBatchSizeFromSettingsAndSetItForTestRunCriteria()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <BatchSize>15</BatchSize>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+        Assert.AreEqual(15, actualTestRunCriteria!.FrequencyOfRunStatsChangeEvent);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldNotThrowForFramework35()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockDiscoveryRequest.Object);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework35));
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+
+        mockRunEventsRegistrar.Verify(lw => lw.LogWarning("Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 \"compatibility mode\"."), Times.Once);
+        _mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStart(), Times.Once);
+        _mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStop(), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldPassSameProtocolConfigInRequestData()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings = DefaultRunsettings
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        // Act.
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
+
+        // Verify.
+        Assert.AreEqual(6, actualRequestData!.ProtocolConfig!.Version);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldCollectCommands()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings = DefaultRunsettings
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        CommandLineOptions.Instance.Parallel = true;
+        CommandLineOptions.Instance.EnableCodeCoverage = true;
+        CommandLineOptions.Instance.InIsolation = true;
+        CommandLineOptions.Instance.UseVsixExtensions = true;
+        CommandLineOptions.Instance.SettingsFile = @"c://temp/.runsettings";
+
+        // Act.
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
+
+        var commandLineArray = commandLineSwitches.ToString();
+
+        Assert.IsTrue(commandLineArray!.Contains("/Parallel"));
+        Assert.IsTrue(commandLineArray.Contains("/EnableCodeCoverage"));
+        Assert.IsTrue(commandLineArray.Contains("/InIsolation"));
+        Assert.IsTrue(commandLineArray.Contains("/UseVsixExtensions"));
+        Assert.IsTrue(commandLineArray.Contains("/settings//.RunSettings"));
+    }
+
+    [TestMethod]
+    public void RunTestsShouldCollectTelemetryForLegacySettings()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings = @"<RunSettings>
+                                    <LegacySettings>
+                                        <Deployment enabled=""true"" deploySatelliteAssemblies=""true"" >
+                                            <DeploymentItem filename="".\test.txt"" />
+                                        </Deployment>
+                                        <Scripts setupScript="".\setup.bat"" cleanupScript="".\cleanup.bat"" />
+                                        <Execution hostProcessPlatform=""MSIL"" parallelTestCount=""4"">
+                                            <Timeouts testTimeout=""120"" />
+                                            <TestTypeSpecific>
+                                                <UnitTestRunConfig>
+                                                    <AssemblyResolution />
+                                                </UnitTestRunConfig>
+                                            </TestTypeSpecific>
+                                            <Hosts />
+                                        </Execution>
+                                    </LegacySettings>
+                               </RunSettings>"
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        // Act.
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.Elements", out var legacySettingsNodes));
+        Equals("Deployment, Scripts, Execution, AssemblyResolution, Timeouts, Hosts", legacySettingsNodes);
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.DeploymentAttributes", out var deploymentAttributes));
+        Equals("enabled, deploySatelliteAssemblies", deploymentAttributes);
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.ExecutionAttributes", out var executionAttributes));
+        Equals("hostProcessPlatform, parallelTestCount", executionAttributes);
+
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TestSettingsUsed, out var testSettingsUsed));
+        Assert.IsFalse((bool)testSettingsUsed);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldCollectTelemetryForTestSettingsEmbeddedInsideRunSettings()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings = @"<RunSettings>
+                                       <MSTest>
+                                            <ForcedLegacyMode>true</ForcedLegacyMode>
+                                            <SettingsFile>..\..\Foo.testsettings</SettingsFile>
+                                       </MSTest>
+                               </RunSettings>"
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        // Act.
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TestSettingsUsed, out var testSettingsUsed));
+        Assert.IsTrue((bool)testSettingsUsed);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldCollectMetrics()
+    {
+        // Opt in the Telemetry
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = @"<RunSettings>
+                                <RunConfiguration>
+                                    <MaxCpuCount>2</MaxCpuCount>
+                                    <TargetPlatform>x86</TargetPlatform>
+                                    <TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
+                                    <DisableAppDomain>True</DisableAppDomain>
+                                </RunConfiguration>
+                                <MSPhoneTest>
+                                  <TargetDevice>169.254.193.190</TargetDevice>
+                                </MSPhoneTest>
+                            </RunSettings>"
+        };
+        var mockProtocolConfig = new ProtocolConfig { Version = 6 };
+        IRequestData? actualRequestData = null;
+        var mockDiscoveryRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualRequestData = requestData).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager = new TestRequestManager(
+            CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        // Act.
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
+
+        // Verify
+        Assert.IsTrue(actualRequestData!.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out var maxcount));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out var targetPlatform));
+        Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out var disableAppDomain));
+        Assert.AreEqual("Other", targetDevice);
+        Assert.AreEqual(2, maxcount);
+        Assert.AreEqual("X86", targetPlatform.ToString());
+        Assert.AreEqual(true, disableAppDomain);
+    }
+
+    [TestMethod]
+    public void RunTestsWithSourcesShouldCallTestPlatformAndSucceed()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var createRunRequestCalled = 0;
+        TestRunCriteria? observedCriteria = null;
+        var mockRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) =>
+            {
+                createRunRequestCalled++;
+                observedCriteria = runCriteria;
+            }).Returns(mockRunRequest.Object);
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        string testCaseFilterValue = "TestFilter";
+        payload.TestPlatformOptions = new TestPlatformOptions { TestCaseFilter = testCaseFilterValue };
+        _testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
+            _mockTestPlatform.Object,
+            TestRunResultAggregator.Instance,
+            _mockTestPlatformEventSource.Object,
+            _inferHelper,
+            _mockMetricsPublisherTask,
+            _mockProcessHelper.Object,
+            _mockAttachmentsProcessingManager.Object,
+            _mockEnvironment.Object,
+            _mockEnvironmentVariableHelper.Object);
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+
+        Assert.AreEqual(testCaseFilterValue, observedCriteria!.TestCaseFilter, "TestCaseFilter must be set");
+
+        Assert.AreEqual(1, createRunRequestCalled, "CreateRunRequest must be invoked only once.");
+        Assert.AreEqual(2, observedCriteria.Sources!.Count(), "All Sources must be used for discovery request");
+        Assert.AreEqual("a", observedCriteria.Sources!.First(), "First Source in list is incorrect");
+        Assert.AreEqual("b", observedCriteria.Sources!.ElementAt(1), "Second Source in list is incorrect");
+
+        // Check for the default value for the frequency
+        Assert.AreEqual(10, observedCriteria.FrequencyOfRunStatsChangeEvent);
+        mockRunEventsRegistrar.Verify(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>()), Times.Once);
+        mockRunEventsRegistrar.Verify(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>()), Times.Once);
+
+        mockRunRequest.Verify(md => md.ExecuteAsync(), Times.Once);
+
+        _mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStart(), Times.Once);
+        _mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStop(), Times.Once);
+    }
+
+    [TestMethod]
+    public void RunTestsMultipleCallsShouldNotRunInParallel()
+    {
+        var payload1 = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var payload2 = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var mockRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(mockRunRequest.Object);
+
+        var mockRunEventsRegistrar1 = new Mock<ITestRunEventsRegistrar>();
+        var mockRunEventsRegistrar2 = new Mock<ITestRunEventsRegistrar>();
+
+        // Setup the second one to wait
+        var sw = new Stopwatch();
+        sw.Start();
+
+        long run1Start = 0;
+        long run1Stop = 0;
+        long run2Start = 0;
+        long run2Stop = 0;
+        mockRunEventsRegistrar1.Setup(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
+        {
+            Thread.Sleep(10);
+            run1Start = sw.ElapsedMilliseconds;
+            Thread.Sleep(1);
+        });
+        mockRunEventsRegistrar1.Setup(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
+        {
+            Thread.Sleep(10);
+            run1Stop = sw.ElapsedMilliseconds;
+            Thread.Sleep(10);
+        });
+
+        mockRunEventsRegistrar2.Setup(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
+        {
+            Thread.Sleep(10);
+            run2Start = sw.ElapsedMilliseconds;
+            Thread.Sleep(10);
+        });
+        mockRunEventsRegistrar2.Setup(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
+        {
+            Thread.Sleep(10);
+            run2Stop = sw.ElapsedMilliseconds;
+        });
+
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+        var task1 = Task.Run(() => _testRequestManager.RunTests(payload1, mockCustomlauncher.Object, mockRunEventsRegistrar1.Object, _protocolConfig));
+        var task2 = Task.Run(() => _testRequestManager.RunTests(payload2, mockCustomlauncher.Object, mockRunEventsRegistrar2.Object, _protocolConfig));
+
+        Task.WaitAll(task1, task2);
+
+        if (run1Start < run2Start)
+        {
+            Assert.IsTrue((run2Stop > run2Start)
+                          && (run2Start > run1Stop)
+                          && (run1Stop > run1Start));
+        }
+        else
+        {
+            Assert.IsTrue((run1Stop > run1Start)
+                          && (run1Start > run2Stop)
+                          && (run2Stop > run2Start));
+        }
+    }
+
+    [TestMethod]
+    public void RunTestsShouldPublishMetrics()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+
+        _mockMetricsPublisher.Verify(mp => mp.PublishMetrics(TelemetryDataConstants.TestExecutionCompleteEvent, It.IsAny<IDictionary<string, object?>>()), Times.Once);
+    }
+
+    // TODO: add tests in design mode and executor that they are handling all the exceptions properly including printing inner exception.
+
+    [TestMethod]
+    public void RunTestsIfThrowsTestPlatformExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<TestPlatformException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new TestPlatformException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void RunTestsIfThrowsSettingsExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<SettingsException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new SettingsException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void RunTestsIfThrowsInvalidOperationExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new InvalidOperationException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void RunTestsIfThrowsExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<NotImplementedException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new NotImplementedException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsIfThrowsTestPlatformExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<TestPlatformException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new TestPlatformException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsIfThrowsSettingsExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<SettingsException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new SettingsException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsIfThrowsInvalidOperationExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<InvalidOperationException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new InvalidOperationException("HelloWorld")));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsIfThrowsExceptionShouldThrowOut()
+    {
+        Assert.ThrowsException<NotImplementedException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new NotImplementedException("HelloWorld")));
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void DiscoverTestsShouldUpdateDesignModeAndCollectSourceInformation(bool designModeValue)
+    {
+        var runsettings = "<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var discoveryPayload = CreateDiscoveryPayload(runsettings);
+        _commandLineOptions.IsDesignMode = designModeValue;
+
+        _testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var designmode = $"<DesignMode>{designModeValue}</DesignMode>";
+        _mockTestPlatform.Verify(
+            tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings!.Contains(designmode)), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+
+        var collectSourceInformation = $"<CollectSourceInformation>{designModeValue}</CollectSourceInformation>";
+        _mockTestPlatform.Verify(
+            tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings!.Contains(collectSourceInformation)), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldNotUpdateDesignModeIfUserHasSetDesignModeInRunSettings()
+    {
+        var runsettings = "<RunSettings><RunConfiguration><DesignMode>False</DesignMode><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var discoveryPayload = CreateDiscoveryPayload(runsettings);
+        _commandLineOptions.IsDesignMode = true;
+
+        _testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var designmode = "<DesignMode>False</DesignMode>";
+        _mockTestPlatform.Verify(
+            tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings!.Contains(designmode)), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void RunTestsShouldUpdateDesignModeIfRunnerIsInDesignMode(bool designModeValue)
+    {
+        var runsettings =
+            "<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
+        var payload = new TestRunRequestPayload
+        {
+            RunSettings = runsettings,
+            Sources = new List<string> { "c:\\testproject.dll" }
+        };
+        _commandLineOptions.IsDesignMode = designModeValue;
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        var designmode = $"<DesignMode>{designModeValue}</DesignMode>";
+        _mockTestPlatform.Verify(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.Is<TestRunCriteria>(rc => rc.TestRunSettings!.Contains(designmode)), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
+
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void DiscoverTestsShouldNotUpdateCollectSourceInformationIfUserHasSetItInRunSettings(bool val)
+    {
+        var runsettings = $"<RunSettings><RunConfiguration><CollectSourceInformation>{val}</CollectSourceInformation></RunConfiguration></RunSettings>";
+        var discoveryPayload = CreateDiscoveryPayload(runsettings);
+
+        _testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var collectSourceInformation = $"<CollectSourceInformation>{val}</CollectSourceInformation>";
+        _mockTestPlatform.Verify(
+            tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings!.Contains(collectSourceInformation)), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()));
+    }
+
+    [TestMethod]
+    public void RunTestsShouldShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
+
+    }
+
+    [TestMethod]
+    public void RunTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            // specify architecture and framework
+            RunSettings =
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                         <TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion>
+                         <TargetPlatform>{Architecture.ARM}</TargetPlatform>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.X86);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework451));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        // infer them so we can print warning when dlls are not compatible with runsettings
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()), Times.Once);
+
+        // but don't update runsettings because we want to keep what user specified
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    [DataRow("x86")]
+    [DataRow("X86")]
+    [DataRow("ARM")]
+    [DataRow("aRm")]
+    public void RunTestsShouldNotUpdatePlatformIfSpecifiedInDesignMode(string targetPlatform)
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            // Specify platform
+            RunSettings =
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                         <TargetPlatform>{targetPlatform}</TargetPlatform>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.X86);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework451));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        // infer platform and framework so we can print warnings when dlls are not compatible with runsettings
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()), Times.Once);
+
+        // don't update it in runsettings to keep what user provided
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings!.Contains(targetPlatform));
+    }
+
+    [TestMethod]
+    public void RunTestsShouldUpdateFrameworkAndPlatformInCommandLineScenarios()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void RunTestsShouldNotpdateFrameworkAndPlatformInRunsettingsIfSpecifiedByCommandLine()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+
+        // specify architecture and framework
+        _commandLineOptions.TargetArchitecture = Architecture.X86;
+        _commandLineOptions.TargetFrameworkVersion = Framework.DefaultFramework;
+
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        // infer them so we can print warnings when the assemblies are not compatible
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()), Times.Once);
+
+        // but don't update them in runsettings so we keep what user specified
+        Assert.IsFalse(actualTestRunCriteria!.TestRunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsFalse(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
+    }
+
+    [TestMethod]
+    public void RunTestsWithTestCasesShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
+    {
+        var actualSources = new List<string>() { "1.dll", "2.dll" };
+        var payload = new TestRunRequestPayload()
+        {
+            TestCases = new List<TestCase>()
+            {
+                new() { Source = actualSources[0] },
+                new() { Source = actualSources[0] },
+                new() { Source = actualSources[1] }
+            },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        List<string> archSources = new(), fxSources = new();
+
+        _commandLineOptions.IsDesignMode = true;
+        _mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>())).Callback<string>(archSources.Add)
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny<string>())).Callback<string>(fxSources.Add)
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+
+        Assert.IsTrue(actualTestRunCriteria!.TestRunSettings!.Contains(Constants.DotNetFramework46));
+        Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
+        CollectionAssert.AreEqual(actualSources, archSources);
+        CollectionAssert.AreEqual(actualSources, fxSources);
+    }
+
+    [TestMethod]
+    public void RunTestShouldThrowExceptionIfRunSettingWithDcHasTestSettingsInIt()
+    {
+        var settingXml = @"<RunSettings>
+                                    <MSTest>
+                                        <SettingsFile>C:\temp.testsettings</SettingsFile>
+                                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <DataCollectionRunSettings>
+                                        <DataCollectors>
+                                            <DataCollector friendlyName=""DummyDataCollector1"">
+                                            </DataCollector>
+                                            <DataCollector friendlyName=""DummyDataCollector2"">
+                                            </DataCollector>
+                                        </DataCollectors>
+                                    </DataCollectionRunSettings>
+                                </RunSettings>";
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = settingXml
+        };
+
+        _commandLineOptions.EnableCodeCoverage = false;
+        bool exceptionThrown = false;
+
+        try
+        {
+            _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+        }
+        catch (SettingsException ex)
+        {
+            exceptionThrown = true;
+            Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
+        }
+
+        Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
+    }
+
+    [TestMethod]
+    public void RunTestShouldThrowExceptionIfRunSettingWithDcHasTestSettingsAndEnableCodeCoverageTrue()
+    {
+        var settingXml = @"<RunSettings>
+                                    <MSTest>
+                                        <SettingsFile>C:\temp.testsettings</SettingsFile>
+                                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <DataCollectionRunSettings>
+                                        <DataCollectors>
+                                            <DataCollector friendlyName=""DummyDataCollector1"">
+                                            </DataCollector>
+                                            <DataCollector friendlyName=""DummyDataCollector2"">
+                                            </DataCollector>
+                                        </DataCollectors>
+                                    </DataCollectionRunSettings>
+                                </RunSettings>";
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = settingXml
+        };
+
+        _commandLineOptions.EnableCodeCoverage = true;
+        bool exceptionThrown = false;
+
+        try
+        {
+            _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+        }
+        catch (SettingsException ex)
+        {
+            exceptionThrown = true;
+            Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
+        }
+
+        Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
+    }
+
+    [TestMethod]
+    public void RunTestShouldNotThrowExceptionIfRunSettingHasCodeCoverageDcAndTestSettingsInItWithEnableCoverageTrue()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = @"<RunSettings>
+                                    <MSTest>
+                                        <SettingsFile>C:\temp.testsettings</SettingsFile>
+                                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <DataCollectionRunSettings>
+                                        <DataCollectors>
+                                            <DataCollector friendlyName=""Code Coverage"">
+                                            </DataCollector>
+                                        </DataCollectors>
+                                    </DataCollectionRunSettings>
+                                </RunSettings>"
+        };
+
+        _commandLineOptions.EnableCodeCoverage = true;
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldAddConsoleLoggerInRunSettingsInNonDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria!.TestRunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(1, loggerSettingsList.Count);
+        Assert.AreEqual("Console", loggerSettingsList[0].FriendlyName);
+        Assert.IsNotNull(loggerSettingsList[0].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[0].CodeBase);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldAddConsoleLoggerInRunSettingsIfDesignModeSetFalseInRunSettings()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>False</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = true;
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria!.TestRunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("Console", loggerSettingsList[1].FriendlyName);
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldAddConsoleLoggerInRunSettingsIfDesignModeSetFalseInRunSettings()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>False</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = true;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria!.RunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("Console", loggerSettingsList[1].FriendlyName);
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldNotAddConsoleLoggerInRunSettingsInDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>True</DesignMode>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        Assert.IsFalse(actualTestRunCriteria!.TestRunSettings!.Contains("LoggerRunSettings"));
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldAddConsoleLoggerInRunSettingsInNonDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria!.RunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(1, loggerSettingsList.Count);
+        Assert.AreEqual("Console", loggerSettingsList[0].FriendlyName);
+        Assert.IsNotNull(loggerSettingsList[0].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[0].CodeBase);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldNotAddConsoleLoggerInRunSettingsInDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>True</DesignMode>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        Assert.IsFalse(actualDiscoveryCriteria!.RunSettings!.Contains("LoggerRunSettings"));
+    }
+
+    [TestMethod]
+    public void RunTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInNonDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>False</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                         <Logger friendlyName=""console"" uri=""logger://tempconsoleUri"" assemblyQualifiedName=""tempAssemblyName"" codeBase=""tempCodeBase"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria!.TestRunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("console", loggerSettingsList[1].FriendlyName);
+        Assert.AreEqual(new Uri("logger://tempconsoleUri").ToString(), loggerSettingsList[1].Uri!.ToString());
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.AreNotEqual("tempCodeBase", loggerSettingsList[1].CodeBase);
+        Assert.IsTrue(loggerSettingsList[1].Configuration!.InnerXml.Contains("Value1"));
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInNonDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>False</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                         <Logger friendlyName=""consoleTemp"" uri=""logger://Microsoft/TestPlatform/ConsoleLogger/v1"" assemblyQualifiedName=""tempAssemblyName"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria!.RunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("consoleTemp", loggerSettingsList[1].FriendlyName);
+        Assert.AreEqual(new Uri("logger://Microsoft/TestPlatform/ConsoleLogger/v1").ToString(), loggerSettingsList[1].Uri!.ToString());
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].CodeBase);
+        Assert.IsTrue(loggerSettingsList[1].Configuration!.InnerXml.Contains("Value1"));
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void RunTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInDesignMode()
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>True</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                         <Logger friendlyName=""console"" uri=""logger://tempconsoleUri"" assemblyQualifiedName=""tempAssemblyName"" codeBase=""tempCodeBase"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+
+        _commandLineOptions.IsDesignMode = false;
+        TestRunCriteria? actualTestRunCriteria = null;
+        var mockTestRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualTestRunCriteria = runCriteria).Returns(mockTestRunRequest.Object);
+        _testRequestManager.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria!.TestRunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("console", loggerSettingsList[1].FriendlyName);
+        Assert.AreEqual(new Uri("logger://tempconsoleUri").ToString(), loggerSettingsList[1].Uri!.ToString());
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.AreNotEqual("tempCodeBase", loggerSettingsList[1].CodeBase);
+        Assert.IsTrue(loggerSettingsList[1].Configuration!.InnerXml.Contains("Value1"));
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void DiscoverTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInDesignMode()
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DesignMode>True</DesignMode>
+                     </RunConfiguration>
+                     <LoggerRunSettings>
+                       <Loggers>
+                         <Logger friendlyName=""blabla"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                         <Logger friendlyName=""consoleTemp"" uri=""logger://Microsoft/TestPlatform/ConsoleLogger/v1"" assemblyQualifiedName=""tempAssemblyName"">
+                           <Configuration>
+                             <Key1>Value1</Key1>
+                           </Configuration>
+                         </Logger>
+                       </Loggers>
+                     </LoggerRunSettings>
+                </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = false;
+        DiscoveryCriteria? actualDiscoveryCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform
+            .Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback(
+                (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => actualDiscoveryCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        _testRequestManager.DiscoverTests(payload,
+            new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria!.RunSettings)!.LoggerSettingsList;
+        Assert.AreEqual(2, loggerSettingsList.Count);
+        Assert.IsNotNull(loggerSettingsList[0].Configuration);
+        Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
+        Assert.AreEqual("consoleTemp", loggerSettingsList[1].FriendlyName);
+        Assert.AreEqual(new Uri("logger://Microsoft/TestPlatform/ConsoleLogger/v1").ToString(), loggerSettingsList[1].Uri!.ToString());
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].CodeBase);
+        Assert.IsTrue(loggerSettingsList[1].Configuration!.InnerXml.Contains("Value1"));
+        Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
+        Assert.IsNotNull(loggerSettingsList[1].CodeBase);
+    }
+
+    [TestMethod]
+    public void ProcessTestRunAttachmentsShouldSucceedWithTelemetryEnabled()
+    {
+        var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockAttachmentsProcessingManager
+            .Setup(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<InvokedDataCollector>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
+            .Returns((string runSettingsXml, IRequestData r, ICollection<AttachmentSet> a, ICollection<InvokedDataCollector> b, ITestRunAttachmentsProcessingEventsHandler h, CancellationToken token) => Task.Run(() =>
+            {
+                r.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, 5);
+                r.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, 1);
+            }, token));
+
+        var payload = new TestRunAttachmentsProcessingPayload()
+        {
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") },
+            InvokedDataCollectors = new List<InvokedDataCollector>(),
+            RunSettings = Constants.EmptyRunSettings,
+            CollectMetrics = true
+        };
+
+        _testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, _protocolConfig);
+
+        _mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.Is<IRequestData>(r => r.IsTelemetryOptedIn), payload.Attachments, payload.InvokedDataCollectors, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
+
+        _mockMetricsPublisher.Verify(p => p.PublishMetrics(TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
+            It.Is<Dictionary<string, object?>>(m =>
+                m.Count == 2
+                && m.ContainsKey(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing)
+                && (int)m[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing]! == 5
+                && m.ContainsKey(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing)
+                && (int)m[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing]! == 1)));
+    }
+
+    [TestMethod]
+    public void ProcessTestRunAttachmentsShouldSucceedWithTelemetryDisabled()
+    {
+        var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockAttachmentsProcessingManager
+            .Setup(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<InvokedDataCollector>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult(true));
+
+        var payload = new TestRunAttachmentsProcessingPayload()
+        {
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") },
+            InvokedDataCollectors = new List<InvokedDataCollector>(),
+            RunSettings = Constants.EmptyRunSettings,
+            CollectMetrics = false
+        };
+
+        _testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, _protocolConfig);
+
+        _mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.Is<IRequestData>(r => !r.IsTelemetryOptedIn), payload.Attachments, payload.InvokedDataCollectors, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
+    }
+
+    [TestMethod]
+    public async Task CancelTestRunAttachmentsProcessingShouldSucceedIfRequestInProgress()
+    {
+        var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
+        _mockAttachmentsProcessingManager
+            .Setup(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ICollection<InvokedDataCollector>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
+            .Returns((string runSettingsXml, IRequestData r, ICollection<AttachmentSet> a, ICollection<InvokedDataCollector> b, ITestRunAttachmentsProcessingEventsHandler h, CancellationToken token) => Task.Run(() =>
+            {
+                int i = 0;
+                while (!token.IsCancellationRequested)
+                {
+                    i++;
+                    Console.WriteLine($"Iteration {i}");
+                    Task.Delay(5).Wait();
+                }
+
+                r.MetricsCollection.Add(TelemetryDataConstants.AttachmentsProcessingState, "Canceled");
+            }, token));
+
+        var payload = new TestRunAttachmentsProcessingPayload()
+        {
+            Attachments = new List<AttachmentSet> { new(new Uri("http://www.bing.com"), "out") },
+            InvokedDataCollectors = new List<InvokedDataCollector>(),
+            RunSettings = Constants.EmptyRunSettings,
+            CollectMetrics = true
+        };
+
+        Task task = Task.Run(() => _testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, _protocolConfig));
+        await Task.Delay(50);
+        _testRequestManager.CancelTestRunAttachmentsProcessing();
+
+        await task;
+
+        _mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(Constants.EmptyRunSettings, It.IsAny<IRequestData>(), payload.Attachments, payload.InvokedDataCollectors, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
+        _mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
+
+        _mockMetricsPublisher.Verify(p => p.PublishMetrics(TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
+            It.Is<Dictionary<string, object?>>(m =>
+                m.Count == 1
+                && m.ContainsKey(TelemetryDataConstants.AttachmentsProcessingState)
+                && (string?)m[TelemetryDataConstants.AttachmentsProcessingState] == "Canceled")));
+    }
+
+    [TestMethod]
+    public void CancelTestRunAttachmentsProcessingShouldSucceedIfNoRequest()
+    {
+        _testRequestManager.CancelTestRunAttachmentsProcessing();
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldPassCorrectTelemetryOptedInOptionToTestPlatform()
+    {
+        _mockTestPlatform.Setup(
+                tp => tp.StartTestSession(
+                    It.IsAny<IRequestData>(),
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(true)
+            .Callback(
+                (IRequestData rd, StartTestSessionCriteria _, ITestSessionEventsHandler _, Dictionary<string, SourceDetail> _, IWarningLogger _) => Assert.IsTrue(rd.IsTelemetryOptedIn));
+
+        Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
+
+        _testRequestManager.StartTestSession(
+            new StartTestSessionPayload()
+            {
+                TestPlatformOptions = new TestPlatformOptions()
+                {
+                    CollectMetrics = true
+                }
+            },
+            new Mock<ITestHostLauncher3>().Object,
+            new Mock<ITestSessionEventsHandler>().Object,
+            _protocolConfig);
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldUpdateSettings()
+    {
+        var payload = new StartTestSessionPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                    <RunSettings>
+                        <RunConfiguration>
+                        </RunConfiguration>
+                    </RunSettings>"
+        };
+        _commandLineOptions.IsDesignMode = true;
+
+        _mockAssemblyMetadataProvider.Setup(
+                a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(
+                a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+
+        _mockTestPlatform.Setup(
+                tp => tp.StartTestSession(
+                    It.IsAny<IRequestData>(),
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(),
+                    It.IsAny<IWarningLogger>()))
+            .Returns(true)
+            .Callback(
+                (IRequestData _, StartTestSessionCriteria criteria, ITestSessionEventsHandler _, Dictionary<string, SourceDetail> _, IWarningLogger _) =>
+                {
+                    Assert.IsTrue(criteria.RunSettings!.Contains(Constants.DotNetFramework46));
+                    Assert.IsTrue(criteria.RunSettings.Contains(nameof(Architecture.ARM)));
+                });
+
+        _testRequestManager.StartTestSession(
+            payload,
+            new Mock<ITestHostLauncher3>().Object,
+            new Mock<ITestSessionEventsHandler>().Object,
+            _protocolConfig);
+
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldSendCompletedEventIfTestPlatformReturnsFalse()
+    {
+        var payload = new StartTestSessionPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings =
+                @"<?xml version=""1.0"" encoding=""utf-8""?>
+                    <RunSettings>
+                        <RunConfiguration>
+                        </RunConfiguration>
+                    </RunSettings>"
+        };
+
+        var eventsHandler = new Mock<ITestSessionEventsHandler>();
+        _commandLineOptions.IsDesignMode = true;
+
+        _mockAssemblyMetadataProvider.Setup(
+                a => a.GetArchitecture(It.IsAny<string>()))
+            .Returns(Architecture.ARM);
+        _mockAssemblyMetadataProvider.Setup(
+                a => a.GetFrameworkName(It.IsAny<string>()))
+            .Returns(new FrameworkName(Constants.DotNetFramework46));
+
+        _mockTestPlatform.Setup(
+                tp => tp.StartTestSession(
+                    It.IsAny<IRequestData>(),
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(),
+                    It.IsAny<IWarningLogger>()))
+            .Returns(false)
+            .Callback(
+                (IRequestData _, StartTestSessionCriteria criteria, ITestSessionEventsHandler _, Dictionary<string, SourceDetail> _, IWarningLogger _) =>
+                {
+                    Assert.IsTrue(criteria.RunSettings!.Contains(Constants.DotNetFramework46));
+                    Assert.IsTrue(criteria.RunSettings.Contains(nameof(Architecture.ARM)));
+                });
+
+        _testRequestManager.StartTestSession(
+            payload,
+            new Mock<ITestHostLauncher3>().Object,
+            eventsHandler.Object,
+            _protocolConfig);
+
+        eventsHandler.Verify(eh => eh.HandleStartTestSessionComplete(It.IsAny<StartTestSessionCompleteEventArgs>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
+        _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny<string>()));
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldThrowSettingsExceptionWhenFindingIncompatibleDataCollectorsInTestSettings()
+    {
+        var settingXml = @"<RunSettings>
+                                    <MSTest>
+                                        <SettingsFile>C:\temp.testsettings</SettingsFile>
+                                        <ForcedLegacyMode>true</ForcedLegacyMode>
+                                    </MSTest>
+                                    <DataCollectionRunSettings>
+                                        <DataCollectors>
+                                            <DataCollector friendlyName=""DummyDataCollector1"">
+                                            </DataCollector>
+                                            <DataCollector friendlyName=""DummyDataCollector2"">
+                                            </DataCollector>
+                                        </DataCollectors>
+                                    </DataCollectionRunSettings>
+                                </RunSettings>";
+
+        var payload = new StartTestSessionPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = settingXml
+        };
+
+        _commandLineOptions.EnableCodeCoverage = false;
+        bool exceptionThrown = false;
+
+        try
+        {
+            _testRequestManager.StartTestSession(
+                payload,
+                new Mock<ITestHostLauncher3>().Object,
+                new Mock<ITestSessionEventsHandler>().Object,
+                _protocolConfig);
+        }
+        catch (SettingsException ex)
+        {
+            exceptionThrown = true;
+            Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
         }
 
-        [TestMethod]
-        public void TestRequestManagerShouldNotInitializeConsoleLoggerIfDesignModeIsSet()
-        {
-            CommandLineOptions.Instance.IsDesignMode = true;
-            this.mockLoggerEvents = new DummyLoggerEvents(TestSessionMessageLogger.Instance);
-            var requestManager = new TestRequestManager(CommandLineOptions.Instance,
-                new Mock<ITestPlatform>().Object,
-                TestRunResultAggregator.Instance,
-                new Mock<ITestPlatformEventSource>().Object,
-                this.inferHelper,
-                this.mockMetricsPublisherTask,
-                this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			Assert.IsFalse(this.mockLoggerEvents.EventsSubscribed());
-		}
-
-		[TestMethod]
-		public void InitializeExtensionsShouldCallTestPlatformToClearAndUpdateExtensions()
-		{
-			var paths = new List<string>() { "a", "b" };
-			this.testRequestManager.InitializeExtensions(paths, false);
-
-			this.mockTestPlatform.Verify(mt => mt.ClearExtensions(), Times.Once);
-			this.mockTestPlatform.Verify(mt => mt.UpdateExtensions(paths, false), Times.Once);
-		}
-
-		[TestMethod]
-		public void ResetShouldResetCommandLineOptionsInstance()
-		{
-			var oldInstance = CommandLineOptions.Instance;
-			this.testRequestManager.ResetOptions();
-
-			var newInstance = CommandLineOptions.Instance;
-
-			Assert.AreNotEqual(oldInstance, newInstance, "CommandLineOptions must be cleaned up");
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldReadTheBatchSizeFromSettingsAndSetItForDiscoveryCriteria()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings =
-				 @"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <BatchSize>15</BatchSize>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					actualDiscoveryCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-			Assert.AreEqual(15, actualDiscoveryCriteria.FrequencyOfDiscoveredTestsEvent);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCallTestPlatformAndSucceed()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var createDiscoveryRequestCalled = 0;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					createDiscoveryRequestCalled++;
-					actualDiscoveryCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			string testCaseFilterValue = "TestFilter";
-			CommandLineOptions.Instance.TestCaseFilterValue = testCaseFilterValue;
-			this.testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, this.protocolConfig);
-
-			Assert.AreEqual(testCaseFilterValue, actualDiscoveryCriteria.TestCaseFilter, "TestCaseFilter must be set");
-
-            Assert.AreEqual(1, createDiscoveryRequestCalled, "CreateDiscoveryRequest must be invoked only once.");
-            Assert.AreEqual(2, actualDiscoveryCriteria.Sources.Count(), "All Sources must be used for discovery request");
-            Assert.AreEqual("a", actualDiscoveryCriteria.Sources.First(), "First Source in list is incorrect");
-            Assert.AreEqual("b", actualDiscoveryCriteria.Sources.ElementAt(1), "Second Source in list is incorrect");
-
-			// Default frequency is set to 10, unless specified in runsettings.
-			Assert.AreEqual(10, actualDiscoveryCriteria.FrequencyOfDiscoveredTestsEvent);
-
-			mockDiscoveryRegistrar.Verify(md => md.RegisterDiscoveryEvents(It.IsAny<IDiscoveryRequest>()), Times.Once);
-			mockDiscoveryRegistrar.Verify(md => md.UnregisterDiscoveryEvents(It.IsAny<IDiscoveryRequest>()), Times.Once);
-
-			mockDiscoveryRequest.Verify(md => md.DiscoverAsync(), Times.Once);
-
-			mockTestPlatformEventSource.Verify(mt => mt.DiscoveryRequestStart(), Times.Once);
-			mockTestPlatformEventSource.Verify(mt => mt.DiscoveryRequestStop(), Times.Once);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldPassSameProtocolConfigInRequestData()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			string testCaseFilterValue = "TestFilter";
-			CommandLineOptions.Instance.TestCaseFilterValue = testCaseFilterValue;
-			this.testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify.
-			Assert.AreEqual(5, actualRequestData.ProtocolConfig.Version);
-		}
-
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectMetrics()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-							  {
-								  Sources = new List<string>() { "a.dll", "b.dll" },
-								  RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<MaxCpuCount>2</MaxCpuCount>
-									<TargetPlatform>x86</TargetPlatform>
-									<TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
-									<DisableAppDomain>True</DisableAppDomain>
-								</RunConfiguration>
-								<MSPhoneTest>
-								  <TargetDevice>169.254.193.190</TargetDevice>
-								</MSPhoneTest>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-            // Verify.
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out var maxcount));
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out var targetPlatform));
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out var disableAppDomain));
-			Assert.AreEqual("Other", targetDevice);
-			Assert.AreEqual(2, maxcount);
-			Assert.AreEqual("X86", targetPlatform.ToString());
-			Assert.AreEqual(true, disableAppDomain);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectTargetDeviceLocalMachineIfTargetDeviceStringisEmpty()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice></TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify.
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
-			Assert.AreEqual("Local Machine", targetDevice);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectTargetDeviceIfTargetDeviceIsDevice()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Device</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify.
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out object targetDevice));
-			Assert.AreEqual("Device", targetDevice);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectTargetDeviceIfTargetDeviceIsEmulator()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Emulator 8.1 U1 WVGA 4 inch 512MB</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify.
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
-			Assert.AreEqual("Emulator 8.1 U1 WVGA 4 inch 512MB", targetDevice);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectCommands()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Device</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			CommandLineOptions.Instance.Parallel = true;
-			CommandLineOptions.Instance.EnableCodeCoverage = true;
-			CommandLineOptions.Instance.InIsolation = true;
-			CommandLineOptions.Instance.UseVsixExtensions = true;
-			CommandLineOptions.Instance.SettingsFile = @"c://temp/.runsettings";
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
-
-			var commandLineArray = commandLineSwitches.ToString();
-
-			Assert.IsTrue(commandLineArray.Contains("/Parallel"));
-			Assert.IsTrue(commandLineArray.Contains("/EnableCodeCoverage"));
-			Assert.IsTrue(commandLineArray.Contains("/InIsolation"));
-			Assert.IsTrue(commandLineArray.Contains("/UseVsixExtensions"));
-			Assert.IsTrue(commandLineArray.Contains("/settings//.RunSettings"));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectTestSettings()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Device</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			CommandLineOptions.Instance.SettingsFile = @"c://temp/.testsettings";
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-            // Verify
-            Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
-
-            var commandLineArray = commandLineSwitches.ToString();
-
-			Assert.IsTrue(commandLineArray.Contains("/settings//.TestSettings"));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectVsmdiFile()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Device</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			CommandLineOptions.Instance.SettingsFile = @"c://temp/.vsmdi";
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-            // Verify
-            Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
-
-            var commandLineArray = commandLineSwitches.ToString();
-
-			Assert.IsTrue(commandLineArray.Contains("/settings//.vsmdi"));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldCollectTestRunConfigFile()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<TargetDevice>Device</TargetDevice>
-								</RunConfiguration>
-							</RunSettings>"
-			};
-
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) => { actualRequestData = requestData; }).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			CommandLineOptions.Instance.SettingsFile = @"c://temp/.testrunConfig";
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
-
-			var commandLineArray = commandLineSwitches.ToString();
-
-			Assert.IsTrue(commandLineArray.Contains("/settings//.testrunConfig"));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					actualDiscoveryCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings =
-					$@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 <TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion>
-					 <TargetPlatform>{Architecture.ARM}</TargetPlatform>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.X86);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework451));
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					actualDiscoveryCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Never);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()), Times.Never);
-
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldUpdateFrameworkAndPlatformInCommandLineScenariosIfNotSpecified()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					actualDiscoveryCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldNotUpdateFrameworkAndPlatformInCommandLineScenariosIfSpecifiedButInferred()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			this.commandLineOptions.TargetFrameworkVersion = Framework.DefaultFramework;
-			this.commandLineOptions.TargetArchitecture = Architecture.X86;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()), Times.Once);
-
-			Assert.IsFalse(actualDiscoveryCriteria.RunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsFalse(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldPublishMetrics()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" }
-			};
-			var mockProtocolConfig = new ProtocolConfig { Version = 2 };
-			var mockDiscoveryRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-
-			// Act
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
-
-			// Verify.
-			this.mockMetricsPublisher.Verify(mp => mp.PublishMetrics(TelemetryDataConstants.TestDiscoveryCompleteEvent, It.IsAny<IDictionary<string, object>>()), Times.Once);
-		}
-
-		[TestMethod]
-		public void CancelShouldNotThrowExceptionIfTestRunRequestHasBeenDisposed()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-			this.testRequestManager.CancelTestRun();
-		}
-
-		[TestMethod]
-		public void AbortShouldNotThrowExceptionIfTestRunRequestHasBeenDisposed()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-			this.testRequestManager.AbortTestRun();
-		}
-
-		[TestMethod]
-		public void RunTestsShouldReadTheBatchSizeFromSettingsAndSetItForTestRunCriteria()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings =
-				 @"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <BatchSize>15</BatchSize>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-			Assert.AreEqual(15, actualTestRunCriteria.FrequencyOfRunStatsChangeEvent);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldNotThrowForFramework35()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>())).Returns(new FrameworkName(Constants.DotNetFramework35));
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-
-			mockRunEventsRegistrar.Verify(lw => lw.LogWarning("Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 \"compatibility mode\"."), Times.Once);
-			mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStart(), Times.Once);
-			mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStop(), Times.Once);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldPassSameProtocolConfigInRequestData()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings = DefaultRunsettings
-			};
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-					{
-						actualRequestData = requestData;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			// Act.
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
-
-			// Verify.
-			Assert.AreEqual(5, actualRequestData.ProtocolConfig.Version);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldCollectCommands()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new TestRunRequestPayload()
-							  {
-								  Sources = new List<string>() { "a" },
-								  RunSettings = DefaultRunsettings
-							  };
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-					{
-						actualRequestData = requestData;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			CommandLineOptions.Instance.Parallel = true;
-			CommandLineOptions.Instance.EnableCodeCoverage = true;
-			CommandLineOptions.Instance.InIsolation = true;
-			CommandLineOptions.Instance.UseVsixExtensions = true;
-			CommandLineOptions.Instance.SettingsFile = @"c://temp/.runsettings";
-
-			// Act.
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
-
-			// Verify
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.CommandLineSwitches, out var commandLineSwitches));
-
-			var commandLineArray = commandLineSwitches.ToString();
-
-			Assert.IsTrue(commandLineArray.Contains("/Parallel"));
-			Assert.IsTrue(commandLineArray.Contains("/EnableCodeCoverage"));
-			Assert.IsTrue(commandLineArray.Contains("/InIsolation"));
-			Assert.IsTrue(commandLineArray.Contains("/UseVsixExtensions"));
-			Assert.IsTrue(commandLineArray.Contains("/settings//.RunSettings"));
-		}
-
-		[TestMethod]
-		public void RunTestsShouldCollectTelemetryForLegacySettings()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings = @"<RunSettings>
-									<LegacySettings>
-										<Deployment enabled=""true"" deploySatelliteAssemblies=""true"" >
-											<DeploymentItem filename="".\test.txt"" />
-										</Deployment>
-										<Scripts setupScript="".\setup.bat"" cleanupScript="".\cleanup.bat"" />
-										<Execution hostProcessPlatform=""MSIL"" parallelTestCount=""4"">
-											<Timeouts testTimeout=""120"" />
-											<TestTypeSpecific>
-												<UnitTestRunConfig>
-													<AssemblyResolution />
-												</UnitTestRunConfig>
-											</TestTypeSpecific>
-											<Hosts />
-										</Execution>
-									</LegacySettings>
-							   </RunSettings>"
-			};
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualRequestData = requestData;
-				}).Returns(mockDiscoveryRequest.Object);
-
-            this.testRequestManager = new TestRequestManager(
-                CommandLineOptions.Instance,
-                this.mockTestPlatform.Object,
-                TestRunResultAggregator.Instance,
-                this.mockTestPlatformEventSource.Object,
-                this.inferHelper,
-                this.mockMetricsPublisherTask,
-                this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-            // Act.
-            this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
-
-			// Verify
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.Elements", out var legacySettingsNodes));
-			StringAssert.Equals("Deployment, Scripts, Execution, AssemblyResolution, Timeouts, Hosts", legacySettingsNodes);
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.DeploymentAttributes", out var deploymentAttributes));
-			StringAssert.Equals("enabled, deploySatelliteAssemblies", deploymentAttributes);
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue("VS.TestRun.LegacySettings.ExecutionAttributes", out var executionAttributes));
-			StringAssert.Equals("hostProcessPlatform, parallelTestCount", executionAttributes);
-
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TestSettingsUsed, out var testSettingsUsed));
-			Assert.IsFalse((bool)testSettingsUsed);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldCollectTelemetryForTestSettingsEmbeddedInsideRunSettings()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings = @"<RunSettings>
-									   <MSTest>
-											<ForcedLegacyMode>true</ForcedLegacyMode>
-											<SettingsFile>..\..\Foo.testsettings</SettingsFile>
-									   </MSTest>
-							   </RunSettings>"
-			};
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualRequestData = requestData;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			// Act.
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
-
-			// Verify
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TestSettingsUsed, out var testSettingsUsed));
-			Assert.IsTrue((bool)testSettingsUsed);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldCollectMetrics()
-		{
-			// Opt in the Telemetry
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings = @"<RunSettings>
-								<RunConfiguration>
-									<MaxCpuCount>2</MaxCpuCount>
-									<TargetPlatform>x86</TargetPlatform>
-									<TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
-									<DisableAppDomain>True</DisableAppDomain>
-								</RunConfiguration>
-								<MSPhoneTest>
-								  <TargetDevice>169.254.193.190</TargetDevice>
-								</MSPhoneTest>
-							</RunSettings>"
-			};
-			var mockProtocolConfig = new ProtocolConfig { Version = 5 };
-			IRequestData actualRequestData = null;
-			var mockDiscoveryRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualRequestData = requestData;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager = new TestRequestManager(
-				CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			// Act.
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
-
-            // Verify
-            Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out var targetDevice));
-            Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out var maxcount));
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out var targetPlatform));
-			Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out var disableAppDomain));
-			Assert.AreEqual("Other", targetDevice);
-			Assert.AreEqual(2, maxcount);
-			Assert.AreEqual("X86", targetPlatform.ToString());
-			Assert.AreEqual(true, disableAppDomain);
-		}
-
-		[TestMethod]
-		public void RunTestsWithSourcesShouldCallTestPlatformAndSucceed()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var createRunRequestCalled = 0;
-			TestRunCriteria observedCriteria = null;
-			var mockRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					createRunRequestCalled++;
-					observedCriteria = runCriteria;
-				}).Returns(mockRunRequest.Object);
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			string testCaseFilterValue = "TestFilter";
-			payload.TestPlatformOptions = new TestPlatformOptions { TestCaseFilter = testCaseFilterValue };
-			this.testRequestManager = new TestRequestManager(CommandLineOptions.Instance,
-				this.mockTestPlatform.Object,
-				TestRunResultAggregator.Instance,
-				this.mockTestPlatformEventSource.Object,
-				this.inferHelper,
-				this.mockMetricsPublisherTask,
-				this.mockProcessHelper.Object,
-				this.mockAttachmentsProcessingManager.Object);
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-
-			Assert.AreEqual(testCaseFilterValue, observedCriteria.TestCaseFilter, "TestCaseFilter must be set");
-
-            Assert.AreEqual(1, createRunRequestCalled, "CreateRunRequest must be invoked only once.");
-            Assert.AreEqual(2, observedCriteria.Sources.Count(), "All Sources must be used for discovery request");
-            Assert.AreEqual("a", observedCriteria.Sources.First(), "First Source in list is incorrect");
-            Assert.AreEqual("b", observedCriteria.Sources.ElementAt(1), "Second Source in list is incorrect");
-
-			// Check for the default value for the frequency
-			Assert.AreEqual(10, observedCriteria.FrequencyOfRunStatsChangeEvent);
-			mockRunEventsRegistrar.Verify(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>()), Times.Once);
-			mockRunEventsRegistrar.Verify(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>()), Times.Once);
-
-			mockRunRequest.Verify(md => md.ExecuteAsync(), Times.Once);
-
-			mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStart(), Times.Once);
-			mockTestPlatformEventSource.Verify(mt => mt.ExecutionRequestStop(), Times.Once);
-		}
-
-		[TestMethod]
-		public void RunTestsMultipleCallsShouldNotRunInParallel()
-		{
-			var payload1 = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var payload2 = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var mockRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Returns(mockRunRequest.Object);
-
-			var mockRunEventsRegistrar1 = new Mock<ITestRunEventsRegistrar>();
-			var mockRunEventsRegistrar2 = new Mock<ITestRunEventsRegistrar>();
-
-			// Setup the second one to wait
-			var sw = new Stopwatch();
-			sw.Start();
-
-			long run1Start = 0;
-			long run1Stop = 0;
-			long run2Start = 0;
-			long run2Stop = 0;
-			mockRunEventsRegistrar1.Setup(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
-			{
-				Thread.Sleep(10);
-				run1Start = sw.ElapsedMilliseconds;
-				Thread.Sleep(1);
-			});
-			mockRunEventsRegistrar1.Setup(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
-			{
-				Thread.Sleep(10);
-				run1Stop = sw.ElapsedMilliseconds;
-				Thread.Sleep(10);
-			});
-
-			mockRunEventsRegistrar2.Setup(md => md.RegisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
-			{
-				Thread.Sleep(10);
-				run2Start = sw.ElapsedMilliseconds;
-				Thread.Sleep(10);
-			});
-			mockRunEventsRegistrar2.Setup(md => md.UnregisterTestRunEvents(It.IsAny<ITestRunRequest>())).Callback(() =>
-			{
-				Thread.Sleep(10);
-				run2Stop = sw.ElapsedMilliseconds;
-			});
-
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-			var task1 = Task.Run(() =>
-			{
-				this.testRequestManager.RunTests(payload1, mockCustomlauncher.Object, mockRunEventsRegistrar1.Object, this.protocolConfig);
-			});
-			var task2 = Task.Run(() =>
-			{
-				this.testRequestManager.RunTests(payload2, mockCustomlauncher.Object, mockRunEventsRegistrar2.Object, this.protocolConfig);
-			});
-
-			Task.WaitAll(task1, task2);
-
-			if (run1Start < run2Start)
-			{
-				Assert.IsTrue((run2Stop > run2Start)
-					&& (run2Start > run1Stop)
-					&& (run1Stop > run1Start));
-			}
-			else
-			{
-				Assert.IsTrue((run1Stop > run1Start)
-					&& (run1Start > run2Stop)
-					&& (run2Stop > run2Start));
-			}
-		}
-
-		[TestMethod]
-		public void RunTestsShouldPublishMetrics()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-
-			this.mockMetricsPublisher.Verify(mp => mp.PublishMetrics(TelemetryDataConstants.TestExecutionCompleteEvent, It.IsAny<IDictionary<string, object>>()), Times.Once);
-		}
-
-		// TODO: add tests in design mode and executor that they are handling all the exceptions properly including printing inner exception.
-
-		[TestMethod]
-		public void RunTestsIfThrowsTestPlatformExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<TestPlatformException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new TestPlatformException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void RunTestsIfThrowsSettingsExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<SettingsException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new SettingsException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void RunTestsIfThrowsInvalidOperationExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<InvalidOperationException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new InvalidOperationException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void RunTestsIfThrowsExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<NotImplementedException>(() => RunTestsIfThrowsExceptionShouldThrowOut(new NotImplementedException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsIfThrowsTestPlatformExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<TestPlatformException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new TestPlatformException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsIfThrowsSettingsExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<SettingsException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new SettingsException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsIfThrowsInvalidOperationExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<InvalidOperationException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new InvalidOperationException("HelloWorld")));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsIfThrowsExceptionShouldThrowOut()
-		{
-			Assert.ThrowsException<NotImplementedException>(() => DiscoverTestsIfThrowsExceptionShouldThrowOut(new NotImplementedException("HelloWorld")));
-		}
-
-		[DataTestMethod]
-		[DataRow(true)]
-		[DataRow(false)]
-		public void DiscoverTestsShouldUpdateDesignModeAndCollectSourceInformation(bool designModeValue)
-		{
-			var runsettings = "<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var discoveryPayload = CreateDiscoveryPayload(runsettings);
-			this.commandLineOptions.IsDesignMode = designModeValue;
-
-			this.testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var designmode = $"<DesignMode>{designModeValue}</DesignMode>";
-			this.mockTestPlatform.Verify(
-				tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings.Contains(designmode)), It.IsAny<TestPlatformOptions>()));
-
-			var collectSourceInformation = $"<CollectSourceInformation>{designModeValue}</CollectSourceInformation>";
-			this.mockTestPlatform.Verify(
-				tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings.Contains(collectSourceInformation)), It.IsAny<TestPlatformOptions>()));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldNotUpdateDesignModeIfUserHasSetDesignModeInRunSettings()
-		{
-			var runsettings = "<RunSettings><RunConfiguration><DesignMode>False</DesignMode><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var discoveryPayload = CreateDiscoveryPayload(runsettings);
-			this.commandLineOptions.IsDesignMode = true;
-
-			this.testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var designmode = "<DesignMode>False</DesignMode>";
-			this.mockTestPlatform.Verify(
-				tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings.Contains(designmode)), It.IsAny<TestPlatformOptions>()));
-		}
-
-		[DataTestMethod]
-		[DataRow(true)]
-		[DataRow(false)]
-		public void RunTestsShouldUpdateDesignModeIfRunnerIsInDesignMode(bool designModeValue)
-		{
-			var runsettings =
-				"<RunSettings><RunConfiguration><TargetFrameworkVersion>.NETFramework,Version=v4.5</TargetFrameworkVersion></RunConfiguration></RunSettings>";
-			var payload = new TestRunRequestPayload
-			{
-				RunSettings = runsettings,
-				Sources = new List<string> { "c:\\testproject.dll" }
-			};
-			this.commandLineOptions.IsDesignMode = designModeValue;
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			var designmode = $"<DesignMode>{designModeValue}</DesignMode>";
-			this.mockTestPlatform.Verify(tp => tp.CreateTestRunRequest(It.IsAny<IRequestData>(), It.Is<TestRunCriteria>(rc => rc.TestRunSettings.Contains(designmode)), It.IsAny<TestPlatformOptions>()));
-		}
-
-		[DataTestMethod]
-		[DataRow(true)]
-		[DataRow(false)]
-		public void DiscoverTestsShouldNotUpdateCollectSourceInformationIfUserHasSetItInRunSettings(bool val)
-		{
-			var runsettings = $"<RunSettings><RunConfiguration><CollectSourceInformation>{val}</CollectSourceInformation></RunConfiguration></RunSettings>";
-			var discoveryPayload = CreateDiscoveryPayload(runsettings);
-
-			this.testRequestManager.DiscoverTests(discoveryPayload, new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var collectSourceInformation = $"<CollectSourceInformation>{val}</CollectSourceInformation>";
-			this.mockTestPlatform.Verify(
-				tp => tp.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.Is<DiscoveryCriteria>(dc => dc.RunSettings.Contains(collectSourceInformation)), It.IsAny<TestPlatformOptions>()));
-		}
-
-		[TestMethod]
-		public void RunTestsShouldShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-								.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-								.Returns(new FrameworkName(Constants.DotNetFramework46));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
-
-		}
-
-		[TestMethod]
-		public void RunTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignModeButInferred()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					$@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-						 <TargetFrameworkVersion>{Constants.DotNetFramework46}</TargetFrameworkVersion>
-						 <TargetPlatform>{Architecture.ARM}</TargetPlatform>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.X86);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework451));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()), Times.Once);
-
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		[DataRow("x86")]
-		[DataRow("X86")]
-		[DataRow("ARM")]
-		[DataRow("aRm")]
-		public void RunTestsShouldNotUpdatePlatformIfSpecifiedInDesignModeButInferred(string targetPlatform)
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					$@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-						 <TargetPlatform>{targetPlatform}</TargetPlatform>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.X86);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework451));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()), Times.Once);
-
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(targetPlatform));
-		}
-
-		[TestMethod]
-		public void RunTestsShouldUpdateFrameworkAndPlatformInCommandLineScenarios()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void RunTestsShouldNotpdateFrameworkAndPlatformInCommandLineScenariosIfSpecifiedButInferred()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			this.commandLineOptions.TargetArchitecture = Architecture.X86;
-			this.commandLineOptions.TargetFrameworkVersion = Framework.DefaultFramework;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()), Times.Once);
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()), Times.Once);
-
-			Assert.IsFalse(actualTestRunCriteria.TestRunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsFalse(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
-		}
-
-		[TestMethod]
-		public void RunTestsWithTestCasesShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignMode()
-		{
-			var actualSources = new List<string>() { "1.dll", "2.dll" };
-			var payload = new TestRunRequestPayload()
-			{
-				TestCases = new List<TestCase>() {
-					new TestCase(){Source = actualSources[0]},
-					new TestCase() { Source = actualSources[0]},
-					new TestCase() { Source = actualSources[1] }
-				},
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			List<string> archSources = new List<string>(), fxSources = new List<string>();
-
-			this.commandLineOptions.IsDesignMode = true;
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny<string>())).Callback<string>(source => archSources.Add(source))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>())).Callback<string>(source => fxSources.Add(source))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(Constants.DotNetFramework46));
-			Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
-			CollectionAssert.AreEqual(actualSources, archSources);
-			CollectionAssert.AreEqual(actualSources, fxSources);
-		}
-
-		[TestMethod]
-		public void RunTestShouldThrowExceptionIfRunSettingWithDCHasTestSettingsInIt()
-		{
-			var settingXml = @"<RunSettings>
-									<MSTest>
-										<SettingsFile>C:\temp.testsettings</SettingsFile>
-										<ForcedLegacyMode>true</ForcedLegacyMode>
-									</MSTest>
-									<DataCollectionRunSettings>
-										<DataCollectors>
-											<DataCollector friendlyName=""DummyDataCollector1"">
-											</DataCollector>
-											<DataCollector friendlyName=""DummyDataCollector2"">
-											</DataCollector>
-										</DataCollectors>
-									</DataCollectionRunSettings>
-								</RunSettings>";
-
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings = settingXml
-			};
-
-			this.commandLineOptions.EnableCodeCoverage = false;
-			bool exceptionThrown = false;
-
-			try
-			{
-				this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-			}
-			catch (SettingsException ex)
-			{
-				exceptionThrown = true;
-				Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
-			}
-
-			Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
-		}
-
-		[TestMethod]
-		public void RunTestShouldThrowExceptionIfRunSettingWithDCHasTestSettingsAndEnableCodeCoverageTrue()
-		{
-			var settingXml = @"<RunSettings>
-									<MSTest>
-										<SettingsFile>C:\temp.testsettings</SettingsFile>
-										<ForcedLegacyMode>true</ForcedLegacyMode>
-									</MSTest>
-									<DataCollectionRunSettings>
-										<DataCollectors>
-											<DataCollector friendlyName=""DummyDataCollector1"">
-											</DataCollector>
-											<DataCollector friendlyName=""DummyDataCollector2"">
-											</DataCollector>
-										</DataCollectors>
-									</DataCollectionRunSettings>
-								</RunSettings>";
-
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings = settingXml
-			};
-
-			this.commandLineOptions.EnableCodeCoverage = true;
-			bool exceptionThrown = false;
-
-			try
-			{
-				this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-			}
-			catch (SettingsException ex)
-			{
-				exceptionThrown = true;
-				Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
-			}
-
-			Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
-		}
-
-		[TestMethod]
-		public void RunTestShouldNotThrowExceptionIfRunSettingHasCodeCoverageDCAndTestSettingsInItWithEnableCoverageTrue()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings = @"<RunSettings>
-									<MSTest>
-										<SettingsFile>C:\temp.testsettings</SettingsFile>
-										<ForcedLegacyMode>true</ForcedLegacyMode>
-									</MSTest>
-									<DataCollectionRunSettings>
-										<DataCollectors>
-											<DataCollector friendlyName=""Code Coverage"">
-											</DataCollector>
-										</DataCollectors>
-									</DataCollectionRunSettings>
-								</RunSettings>"
-			};
-
-			this.commandLineOptions.EnableCodeCoverage = true;
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldAddConsoleLoggerInRunSettingsInNonDesignMode()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria.TestRunSettings).LoggerSettingsList;
-			Assert.AreEqual(1, loggerSettingsList.Count);
-			Assert.AreEqual("Console", loggerSettingsList[0].FriendlyName);
-			Assert.IsNotNull(loggerSettingsList[0].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[0].CodeBase);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldAddConsoleLoggerInRunSettingsIfDesignModeSetFalseInRunSettings()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>False</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = true;
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria.TestRunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("Console", loggerSettingsList[1].FriendlyName);
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldAddConsoleLoggerInRunSettingsIfDesignModeSetFalseInRunSettings()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>False</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = true;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria.RunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("Console", loggerSettingsList[1].FriendlyName);
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldNotAddConsoleLoggerInRunSettingsInDesignMode()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>True</DesignMode>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			Assert.IsFalse(actualTestRunCriteria.TestRunSettings.Contains("LoggerRunSettings"));
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldAddConsoleLoggerInRunSettingsInNonDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria.RunSettings).LoggerSettingsList;
-			Assert.AreEqual(1, loggerSettingsList.Count);
-			Assert.AreEqual("Console", loggerSettingsList[0].FriendlyName);
-			Assert.IsNotNull(loggerSettingsList[0].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[0].CodeBase);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldNotAddConsoleLoggerInRunSettingsInDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>True</DesignMode>
-					 </RunConfiguration>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			Assert.IsFalse(actualDiscoveryCriteria.RunSettings.Contains("LoggerRunSettings"));
-		}
-
-		[TestMethod]
-		public void RunTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInNonDesignMode()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>False</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-						 <Logger friendlyName=""console"" uri=""logger://tempconsoleUri"" assemblyQualifiedName=""tempAssemblyName"" codeBase=""tempCodeBase"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria.TestRunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("console", loggerSettingsList[1].FriendlyName);
-			Assert.AreEqual(new Uri("logger://tempconsoleUri").ToString(), loggerSettingsList[1].Uri.ToString());
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.AreNotEqual("tempCodeBase", loggerSettingsList[1].CodeBase);
-			Assert.IsTrue(loggerSettingsList[1].Configuration.InnerXml.Contains("Value1"));
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInNonDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>False</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-						 <Logger friendlyName=""consoleTemp"" uri=""logger://Microsoft/TestPlatform/ConsoleLogger/v1"" assemblyQualifiedName=""tempAssemblyName"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria.RunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("consoleTemp", loggerSettingsList[1].FriendlyName);
-			Assert.AreEqual(new Uri("logger://Microsoft/TestPlatform/ConsoleLogger/v1").ToString(), loggerSettingsList[1].Uri.ToString());
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].CodeBase);
-			Assert.IsTrue(loggerSettingsList[1].Configuration.InnerXml.Contains("Value1"));
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void RunTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInDesignMode()
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>True</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-						 <Logger friendlyName=""console"" uri=""logger://tempconsoleUri"" assemblyQualifiedName=""tempAssemblyName"" codeBase=""tempCodeBase"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-
-			this.commandLineOptions.IsDesignMode = false;
-			TestRunCriteria actualTestRunCriteria = null;
-			var mockTestRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					actualTestRunCriteria = runCriteria;
-				}).Returns(mockTestRunRequest.Object);
-			this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualTestRunCriteria.TestRunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("console", loggerSettingsList[1].FriendlyName);
-			Assert.AreEqual(new Uri("logger://tempconsoleUri").ToString(), loggerSettingsList[1].Uri.ToString());
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.AreNotEqual("tempCodeBase", loggerSettingsList[1].CodeBase);
-			Assert.IsTrue(loggerSettingsList[1].Configuration.InnerXml.Contains("Value1"));
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void DiscoverTestsShouldOverrideOnlyAssemblyNameIfConsoleLoggerAlreadyPresentInDesignMode()
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-				<RunSettings>
-					 <RunConfiguration>
-					   <DesignMode>True</DesignMode>
-					 </RunConfiguration>
-					 <LoggerRunSettings>
-					   <Loggers>
-						 <Logger friendlyName=""blabla"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-						 <Logger friendlyName=""consoleTemp"" uri=""logger://Microsoft/TestPlatform/ConsoleLogger/v1"" assemblyQualifiedName=""tempAssemblyName"">
-						   <Configuration>
-							 <Key1>Value1</Key1>
-						   </Configuration>
-						 </Logger>
-					   </Loggers>
-					 </LoggerRunSettings>
-				</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = false;
-			DiscoveryCriteria actualDiscoveryCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform
-				.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>()))
-				.Callback(
-					(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-					{
-						actualDiscoveryCriteria = discoveryCriteria;
-					}).Returns(mockDiscoveryRequest.Object);
-
-			this.testRequestManager.DiscoverTests(payload,
-				new Mock<ITestDiscoveryEventsRegistrar>().Object, this.protocolConfig);
-
-			var loggerSettingsList = XmlRunSettingsUtilities.GetLoggerRunSettings(actualDiscoveryCriteria.RunSettings).LoggerSettingsList;
-			Assert.AreEqual(2, loggerSettingsList.Count);
-			Assert.IsNotNull(loggerSettingsList[0].Configuration);
-			Assert.AreEqual("blabla", loggerSettingsList[0].FriendlyName);
-			Assert.AreEqual("consoleTemp", loggerSettingsList[1].FriendlyName);
-			Assert.AreEqual(new Uri("logger://Microsoft/TestPlatform/ConsoleLogger/v1").ToString(), loggerSettingsList[1].Uri.ToString());
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.AreNotEqual("tempAssemblyName", loggerSettingsList[1].CodeBase);
-			Assert.IsTrue(loggerSettingsList[1].Configuration.InnerXml.Contains("Value1"));
-			Assert.IsNotNull(loggerSettingsList[1].AssemblyQualifiedName);
-			Assert.IsNotNull(loggerSettingsList[1].CodeBase);
-		}
-
-		[TestMethod]
-		public void ProcessTestRunAttachmentsShouldSucceedWithTelemetryEnabled()
-        {
-			var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
-			mockAttachmentsProcessingManager
-				.Setup(m => m.ProcessTestRunAttachmentsAsync(It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
-				.Returns((IRequestData r, ICollection<AttachmentSet> a, ITestRunAttachmentsProcessingEventsHandler h, CancellationToken token) => Task.Run(() =>
-				{
-					r.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing, 5);
-					r.MetricsCollection.Add(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing, 1);
-				}));
-
-			var payload = new TestRunAttachmentsProcessingPayload()
-			{
-				Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") },
-				CollectMetrics = true
-			};
-
-			testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, this.protocolConfig);
-
-			mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(It.Is<IRequestData>(r => r.IsTelemetryOptedIn), payload.Attachments, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
-
-			mockMetricsPublisher.Verify(p => p.PublishMetrics(TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
-				It.Is<Dictionary<string, object>>(m => m.Count == 2 &&
-					m.ContainsKey(TelemetryDataConstants.NumberOfAttachmentsSentForProcessing) && (int)m[TelemetryDataConstants.NumberOfAttachmentsSentForProcessing] == 5 &&
-					m.ContainsKey(TelemetryDataConstants.NumberOfAttachmentsAfterProcessing) && (int)m[TelemetryDataConstants.NumberOfAttachmentsAfterProcessing] == 1)));
-		}
-
-		[TestMethod]
-		public void ProcessTestRunAttachmentsShouldSucceedWithTelemetryDisabled()
-		{
-			var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
-			mockAttachmentsProcessingManager
-				.Setup(m => m.ProcessTestRunAttachmentsAsync(It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
-				.Returns(Task.FromResult(true));
-
-			var payload = new TestRunAttachmentsProcessingPayload()
-			{
-				Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") },
-				CollectMetrics = false
-			};
-
-			testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, this.protocolConfig);
-
-			mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(It.Is<IRequestData>(r => !r.IsTelemetryOptedIn), payload.Attachments, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
-		}
-
-		[TestMethod]
-		public async Task CancelTestRunAttachmentsProcessingShouldSucceedIfRequestInProgress()
-		{
-			var mockEventsHandler = new Mock<ITestRunAttachmentsProcessingEventsHandler>();
-			mockAttachmentsProcessingManager
-				.Setup(m => m.ProcessTestRunAttachmentsAsync(It.IsAny<IRequestData>(), It.IsAny<ICollection<AttachmentSet>>(), It.IsAny<ITestRunAttachmentsProcessingEventsHandler>(), It.IsAny<CancellationToken>()))
-				.Returns((IRequestData r, ICollection<AttachmentSet> a, ITestRunAttachmentsProcessingEventsHandler h, CancellationToken token) => Task.Run(() =>
-				{
-					int i = 0;
-					while (!token.IsCancellationRequested)
-                    {
-						i++;
-						Console.WriteLine($"Iteration {i}");
-						Task.Delay(5).Wait();
-                    }
-
-					r.MetricsCollection.Add(TelemetryDataConstants.AttachmentsProcessingState, "Canceled");
-				}));
-
-			var payload = new TestRunAttachmentsProcessingPayload()
-			{
-				Attachments = new List<AttachmentSet> { new AttachmentSet(new Uri("http://www.bing.com"), "out") },
-				CollectMetrics = true
-			};
-
-			Task task = Task.Run(() => testRequestManager.ProcessTestRunAttachments(payload, mockEventsHandler.Object, this.protocolConfig));
-			await Task.Delay(50);
-			testRequestManager.CancelTestRunAttachmentsProcessing();
-
-			await task;
-
-			mockAttachmentsProcessingManager.Verify(m => m.ProcessTestRunAttachmentsAsync(It.IsAny<IRequestData>(), payload.Attachments, mockEventsHandler.Object, It.IsAny<CancellationToken>()));
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStart());
-			mockTestPlatformEventSource.Verify(es => es.TestRunAttachmentsProcessingRequestStop());
-
-			mockMetricsPublisher.Verify(p => p.PublishMetrics(TelemetryDataConstants.TestAttachmentsProcessingCompleteEvent,
-				It.Is<Dictionary<string, object>>(m => m.Count == 1 && m.ContainsKey(TelemetryDataConstants.AttachmentsProcessingState) && (string)m[TelemetryDataConstants.AttachmentsProcessingState] == "Canceled")));
-		}
-
-		[TestMethod]
-		public void CancelTestRunAttachmentsProcessingShouldSucceedIfNoRequest()
-		{
-			testRequestManager.CancelTestRunAttachmentsProcessing();
-		}
-
-		[TestMethod]
-		public void StartTestSessionShouldPassCorrectTelemetryOptedInOptionToTestPlatform()
-        {
-			this.mockTestPlatform.Setup(
-				tp => tp.StartTestSession(
-					It.IsAny<IRequestData>(),
-					It.IsAny<StartTestSessionCriteria>(),
-					It.IsAny<ITestSessionEventsHandler>()))
-				.Returns(true)
-				.Callback(
-					(IRequestData rd, StartTestSessionCriteria _, ITestSessionEventsHandler __) =>
-					{
-						Assert.IsTrue(rd.IsTelemetryOptedIn);
-					});
-
-			Environment.SetEnvironmentVariable("VSTEST_TELEMETRY_OPTEDIN", "1");
-
-			this.testRequestManager.StartTestSession(
-				new StartTestSessionPayload()
-				{
-					TestPlatformOptions = new TestPlatformOptions()
-					{
-						CollectMetrics = true
-					}
-				},
-				new Mock<ITestHostLauncher>().Object,
-				new Mock<ITestSessionEventsHandler>().Object,
-				this.protocolConfig);
-		}
-
-		[TestMethod]
-		public void StartTestSessionShouldUpdateSettings()
-        {
-			var payload = new StartTestSessionPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings =
-					@"<?xml version=""1.0"" encoding=""utf-8""?>
-					<RunSettings>
-						<RunConfiguration>
-						</RunConfiguration>
-					</RunSettings>"
-			};
-			this.commandLineOptions.IsDesignMode = true;
-
-			this.mockAssemblyMetadataProvider.Setup(
-				a => a.GetArchitecture(It.IsAny<string>()))
-				.Returns(Architecture.ARM);
-			this.mockAssemblyMetadataProvider.Setup(
-				a => a.GetFrameWork(It.IsAny<string>()))
-				.Returns(new FrameworkName(Constants.DotNetFramework46));
-
-			this.mockTestPlatform.Setup(
-				tp => tp.StartTestSession(
-					It.IsAny<IRequestData>(),
-					It.IsAny<StartTestSessionCriteria>(),
-					It.IsAny<ITestSessionEventsHandler>()))
-				.Returns(true)
-				.Callback(
-					(IRequestData _, StartTestSessionCriteria criteria, ITestSessionEventsHandler __) =>
-					{
-						Assert.IsTrue(criteria.RunSettings.Contains(Constants.DotNetFramework46));
-						Assert.IsTrue(criteria.RunSettings.Contains(nameof(Architecture.ARM)));
-					});
-
-			this.testRequestManager.StartTestSession(
-				payload,
-				new Mock<ITestHostLauncher>().Object,
-				new Mock<ITestSessionEventsHandler>().Object,
-				this.protocolConfig);
-
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny<string>()));
-			this.mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny<string>()));
-		}
-
-		[TestMethod]
-		public void StartTestSessionShouldThrowSettingsExceptionWhenFindingIncompatibleDataCollectorsInTestSettings()
-        {
-			var settingXml = @"<RunSettings>
-									<MSTest>
-										<SettingsFile>C:\temp.testsettings</SettingsFile>
-										<ForcedLegacyMode>true</ForcedLegacyMode>
-									</MSTest>
-									<DataCollectionRunSettings>
-										<DataCollectors>
-											<DataCollector friendlyName=""DummyDataCollector1"">
-											</DataCollector>
-											<DataCollector friendlyName=""DummyDataCollector2"">
-											</DataCollector>
-										</DataCollectors>
-									</DataCollectionRunSettings>
-								</RunSettings>";
-
-			var payload = new StartTestSessionPayload()
-			{
-				Sources = new List<string>() { "a.dll" },
-				RunSettings = settingXml
-			};
-
-			this.commandLineOptions.EnableCodeCoverage = false;
-			bool exceptionThrown = false;
-
-			try
-			{
-				this.testRequestManager.StartTestSession(
-					payload,
-					new Mock<ITestHostLauncher>().Object,
-					new Mock<ITestSessionEventsHandler>().Object,
-					this.protocolConfig);
-			}
-			catch (SettingsException ex)
-			{
-				exceptionThrown = true;
-				Assert.IsTrue(ex.Message.Contains(@"<SettingsFile>C:\temp.testsettings</SettingsFile>"), ex.Message);
-			}
-
-			Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
-		}
-
-		[TestMethod]
-		public void StartTestSessionShouldBeSuccessful()
-        {
-			this.mockTestPlatform.Setup(
-				tp => tp.StartTestSession(
-					It.IsAny<IRequestData>(),
-					It.IsAny<StartTestSessionCriteria>(),
-					It.IsAny<ITestSessionEventsHandler>()))
-				.Returns(true);
-
-			this.testRequestManager.StartTestSession(
-				new StartTestSessionPayload()
-				{
-					TestPlatformOptions = new TestPlatformOptions()
-					{
-						CollectMetrics = true
-					}
-				},
-				new Mock<ITestHostLauncher>().Object,
-				new Mock<ITestSessionEventsHandler>().Object,
-				this.protocolConfig);
-
-			this.mockTestPlatformEventSource.Verify(
-				tpes => tpes.StartTestSessionStart(),
-				Times.Once());
-			this.mockTestPlatformEventSource.Verify(
-				tpes => tpes.StartTestSessionStop(),
-				Times.Once());
-		}
-
-		private static DiscoveryRequestPayload CreateDiscoveryPayload(string runsettings)
-		{
-			var discoveryPayload = new DiscoveryRequestPayload
-			{
-				RunSettings = runsettings,
-				Sources = new[] { "c:\\testproject.dll" }
-			};
-			return discoveryPayload;
-		}
-
-		private void RunTestsIfThrowsExceptionShouldThrowOut(Exception exception)
-		{
-			var payload = new TestRunRequestPayload()
-			{
-				Sources = new List<string>() { "a", "b" },
-				RunSettings = DefaultRunsettings
-			};
-
-			var createRunRequestCalled = 0;
-			TestRunCriteria observedCriteria = null;
-			var mockRunRequest = new Mock<ITestRunRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options) =>
-				{
-					createRunRequestCalled++;
-					observedCriteria = runCriteria;
-				}).Returns(mockRunRequest.Object);
-
-			mockRunRequest.Setup(mr => mr.ExecuteAsync()).Throws(exception);
-
-			var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, this.protocolConfig);
-		}
-
-		private void DiscoverTestsIfThrowsExceptionShouldThrowOut(Exception exception)
-		{
-			var payload = new DiscoveryRequestPayload()
-			{
-				Sources = new List<string>() { "a.dll", "b.dll" },
-				RunSettings = DefaultRunsettings
-			};
-
-			DiscoveryCriteria observedCriteria = null;
-			var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
-			this.mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>())).Callback(
-				(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options) =>
-				{
-					observedCriteria = discoveryCriteria;
-				}).Returns(mockDiscoveryRequest.Object);
-
-			mockDiscoveryRequest.Setup(mr => mr.DiscoverAsync()).Throws(exception);
-
-			var mockDiscoveryEventsRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
-			var mockCustomlauncher = new Mock<ITestHostLauncher>();
-
-			this.testRequestManager.DiscoverTests(payload, mockDiscoveryEventsRegistrar.Object, this.protocolConfig);
-		}
-	}
-}
\ No newline at end of file
+        Assert.IsTrue(exceptionThrown, "Initialize should throw exception");
+    }
+
+    [TestMethod]
+    public void StartTestSessionShouldBeSuccessful()
+    {
+        _mockTestPlatform.Setup(
+                tp => tp.StartTestSession(
+                    It.IsAny<IRequestData>(),
+                    It.IsAny<StartTestSessionCriteria>(),
+                    It.IsAny<ITestSessionEventsHandler>(),
+                    It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Returns(true);
+
+        _testRequestManager.StartTestSession(
+            new StartTestSessionPayload()
+            {
+                TestPlatformOptions = new TestPlatformOptions()
+                {
+                    CollectMetrics = true
+                }
+            },
+            new Mock<ITestHostLauncher3>().Object,
+            new Mock<ITestSessionEventsHandler>().Object,
+            _protocolConfig);
+
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StartTestSessionStart(),
+            Times.Once());
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StartTestSessionStop(),
+            Times.Once());
+    }
+
+    [TestMethod]
+    public void StopTestSessionShouldBeSuccessful()
+    {
+        var result = true;
+        var testSessionInfo = new TestSessionInfo();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        var mockTestPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestPool.Object;
+
+        mockTestPool.Setup(tp => tp.KillSession(testSessionInfo, It.IsAny<IRequestData>()))
+            .Returns((TestSessionInfo _, IRequestData rd) =>
+            {
+                rd.MetricsCollection.Add(TelemetryDataConstants.TestSessionId, testSessionInfo.Id.ToString());
+                return result;
+            });
+        mockEventsHandler.Setup(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()))
+            .Callback((StopTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(
+                    eventArgs.Metrics[TelemetryDataConstants.TestSessionId],
+                    testSessionInfo.Id.ToString());
+                Assert.AreEqual(eventArgs.IsStopped, result);
+            });
+
+        _testRequestManager.StopTestSession(
+            new()
+            {
+                TestSessionInfo = testSessionInfo,
+                CollectMetrics = true
+            },
+            mockEventsHandler.Object,
+            _protocolConfig);
+
+        mockTestPool.Verify(tp => tp.KillSession(
+                testSessionInfo,
+                It.IsAny<IRequestData>()),
+            Times.Once);
+        mockEventsHandler.Verify(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStart(),
+            Times.Once);
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStop(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StopTestSessionShouldFail()
+    {
+        var result = false;
+        var testSessionInfo = new TestSessionInfo();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        var mockTestPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestPool.Object;
+
+        mockTestPool.Setup(tp => tp.KillSession(testSessionInfo, It.IsAny<IRequestData>()))
+            .Returns(result);
+        mockEventsHandler.Setup(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()))
+            .Callback((StopTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(eventArgs.IsStopped, result);
+            });
+
+        _testRequestManager.StopTestSession(
+            new()
+            {
+                TestSessionInfo = testSessionInfo,
+                CollectMetrics = true
+            },
+            mockEventsHandler.Object,
+            _protocolConfig);
+
+        mockTestPool.Verify(tp => tp.KillSession(
+                testSessionInfo,
+                It.IsAny<IRequestData>()),
+            Times.Once);
+        mockEventsHandler.Verify(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()),
+            Times.Once);
+
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStart(),
+            Times.Once);
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStop(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void StopTestSessionShouldPropagateExceptionWhenKillSessionThrows()
+    {
+        var testSessionInfo = new TestSessionInfo();
+        var mockEventsHandler = new Mock<ITestSessionEventsHandler>();
+
+        var mockTestPool = new Mock<TestSessionPool>();
+        TestSessionPool.Instance = mockTestPool.Object;
+
+        mockTestPool.Setup(tp => tp.KillSession(testSessionInfo, It.IsAny<IRequestData>()))
+            .Throws(new Exception("DummyException"));
+        mockEventsHandler.Setup(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()))
+            .Callback((StopTestSessionCompleteEventArgs eventArgs) =>
+            {
+                Assert.IsNotNull(eventArgs.TestSessionInfo);
+                Assert.IsNotNull(eventArgs.Metrics);
+                Assert.AreEqual(eventArgs.TestSessionInfo, testSessionInfo);
+                Assert.AreEqual(eventArgs.IsStopped, false);
+            });
+
+        Assert.ThrowsException<Exception>(() =>
+            _testRequestManager.StopTestSession(
+                new()
+                {
+                    TestSessionInfo = testSessionInfo,
+                    CollectMetrics = true
+                },
+                mockEventsHandler.Object,
+                _protocolConfig));
+
+        mockTestPool.Verify(tp => tp.KillSession(
+                testSessionInfo,
+                It.IsAny<IRequestData>()),
+            Times.Once);
+        mockEventsHandler.Verify(eh => eh.HandleStopTestSessionComplete(
+                It.IsAny<StopTestSessionCompleteEventArgs>()),
+            Times.Never);
+
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStart(),
+            Times.Once);
+        _mockTestPlatformEventSource.Verify(
+            tpes => tpes.StopTestSessionStop(),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void AddOrUpdateBatchSizeWhenNotDiscoveryReturnsFalseAndDoesNotUpdateXmlDocument()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.AddOrUpdateBatchSize(xmlDocument, configuration, false);
+
+        // Assert
+        Assert.IsFalse(result);
+        Assert.AreEqual("", xmlDocument.OuterXml);
+    }
+
+    [TestMethod]
+    public void AddOrUpdateBatchSizeWhenBatchSizeSetReturnsFalse()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        var configuration = new RunConfiguration { BatchSize = 10 };
+
+        // Sanity check
+        Assert.IsTrue(configuration.BatchSizeSet);
+
+        // Act
+        var result = TestRequestManager.AddOrUpdateBatchSize(xmlDocument, configuration, true);
+
+        // Assert
+        Assert.IsFalse(result);
+        Assert.AreEqual("", xmlDocument.OuterXml);
+    }
+
+    [TestMethod]
+    public void AddOrUpdateBatchSizeSetsBatchSize()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml("""
+            <RunSettings>
+                <RunConfiguration>
+                </RunConfiguration>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.AddOrUpdateBatchSize(xmlDocument, configuration, true);
+
+        // Assert
+        Assert.IsTrue(result);
+        Assert.AreEqual("<RunSettings><RunConfiguration><BatchSize>1000</BatchSize></RunConfiguration></RunSettings>", xmlDocument.OuterXml);
+    }
+
+    [TestMethod]
+    public void AddOrUpdateBatchSizeSetsRunConfigurationAndBatchSize()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml("""
+            <RunSettings>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.AddOrUpdateBatchSize(xmlDocument, configuration, true);
+
+        // Assert
+        Assert.IsTrue(result);
+        Assert.AreEqual("<RunSettings><RunConfiguration><BatchSize>1000</BatchSize></RunConfiguration></RunSettings>", xmlDocument.OuterXml);
+    }
+
+    [TestMethod]
+    public void UpdateCodeCoverageSettings_SetEnableDynamicNativeInstrumentationToFalse_WhenNotPresent()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml("""
+            <?xml version="1.0" encoding="utf-8"?>
+            <RunSettings>
+              <DataCollectionRunSettings>
+                <DataCollectors>
+                  <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+                    <Configuration>
+                      <CoverageLogLevel>All</CoverageLogLevel>
+                      <InstrumentationLogLevel>All</InstrumentationLogLevel>
+                      <ManagedVanguardLogLevel>Verbose</ManagedVanguardLogLevel>
+                      <CoverageFileLogPath>%LOGS_DIR%</CoverageFileLogPath>
+                      <CodeCoverage>
+                        <FileLogPath>%LOGS_DIR%</FileLogPath>
+                        <LogLevel>All</LogLevel>
+                        <UseVerifiableInstrumentation>False</UseVerifiableInstrumentation>
+                        <EnableStaticNativeInstrumentation>False</EnableStaticNativeInstrumentation>
+                      </CodeCoverage>
+                    </Configuration>
+                  </DataCollector>
+                </DataCollectors>
+              </DataCollectionRunSettings>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.UpdateCollectCoverageSettings(xmlDocument, configuration);
+
+        // Assert
+        Assert.IsTrue(result);
+        StringAssert.Contains(xmlDocument.OuterXml, "<EnableStaticNativeInstrumentation>False</EnableStaticNativeInstrumentation><EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation></CodeCoverage>");
+    }
+
+    [TestMethod]
+    public void UpdateCodeCoverageSettings_SetEnableDynamicNativeInstrumentationToFalse_WhenNotPresentAndParentDetailsOfConfigurationAreAlsoNotPresent()
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml("""
+            <?xml version="1.0" encoding="utf-8"?>
+            <RunSettings>
+              <DataCollectionRunSettings>
+                <DataCollectors>
+                  <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+                  </DataCollector>
+                </DataCollectors>
+              </DataCollectionRunSettings>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.UpdateCollectCoverageSettings(xmlDocument, configuration);
+
+        // Assert
+        Assert.IsTrue(result);
+        StringAssert.Contains(xmlDocument.OuterXml, $"<Configuration><CodeCoverage><EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation></CodeCoverage></Configuration></DataCollector>");
+    }
+
+    [TestMethod]
+    [DataRow("True")]
+    [DataRow("False")]
+    public void UpdateCodeCoverageSettings_DontSetEnableDynamicNativeInstrumentationToFalse_WhenAlreadyPresent(string setting)
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml($"""
+            <?xml version="1.0" encoding="utf-8"?>
+            <RunSettings>
+              <DataCollectionRunSettings>
+                <DataCollectors>
+                  <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+                    <Configuration>
+                      <CoverageLogLevel>All</CoverageLogLevel>
+                      <InstrumentationLogLevel>All</InstrumentationLogLevel>
+                      <ManagedVanguardLogLevel>Verbose</ManagedVanguardLogLevel>
+                      <CoverageFileLogPath>%LOGS_DIR%</CoverageFileLogPath>
+                      <CodeCoverage>
+                        <EnableDynamicNativeInstrumentation>{setting}</EnableDynamicNativeInstrumentation>
+                      </CodeCoverage>
+                    </Configuration>
+                  </DataCollector>
+                </DataCollectors>
+              </DataCollectionRunSettings>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.UpdateCollectCoverageSettings(xmlDocument, configuration);
+
+        // Assert
+        // No matter what user has set, we don't override it.
+        Assert.IsFalse(result);
+        StringAssert.Contains(xmlDocument.OuterXml, $"<CodeCoverage><EnableDynamicNativeInstrumentation>{setting}</EnableDynamicNativeInstrumentation></CodeCoverage>");
+    }
+
+    [TestMethod]
+    [DataRow("friendlyName=\"Code Coverage\"")]
+    [DataRow("friendlyName=\"code coverage\"")]
+    [DataRow("uri=\"datacollector://Microsoft/CodeCoverage/2.0\"")]
+    [DataRow("uri=\"datacollector://microsoft/codecoverage/2.0\"")]
+    [DataRow("assemblyQualifiedName=\"Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"")]
+    public void UpdateCodeCoverageSettings_SetEnableDynamicNativeInstrumentationToFalse_WhenUserUsesImperfectNamesForCollector(string collector)
+    {
+        // Arrange
+        var xmlDocument = new XmlDocument();
+        xmlDocument.LoadXml($"""
+            <?xml version="1.0" encoding="utf-8"?>
+            <RunSettings>
+              <DataCollectionRunSettings>
+                <DataCollectors>
+                  <DataCollector {collector}>
+                    <Configuration>
+                      <CoverageLogLevel>All</CoverageLogLevel>
+                      <InstrumentationLogLevel>All</InstrumentationLogLevel>
+                      <ManagedVanguardLogLevel>Verbose</ManagedVanguardLogLevel>
+                      <CoverageFileLogPath>%LOGS_DIR%</CoverageFileLogPath>
+                      <CodeCoverage>
+                      </CodeCoverage>
+                    </Configuration>
+                  </DataCollector>
+                </DataCollectors>
+              </DataCollectionRunSettings>
+            </RunSettings>
+            """);
+        var configuration = new RunConfiguration();
+
+        // Act
+        var result = TestRequestManager.UpdateCollectCoverageSettings(xmlDocument, configuration);
+
+        // Assert
+        Assert.IsTrue(result);
+        StringAssert.Contains(xmlDocument.OuterXml, $"<CodeCoverage><EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation></CodeCoverage>");
+    }
+
+    private static DiscoveryRequestPayload CreateDiscoveryPayload(string runsettings)
+    {
+        var discoveryPayload = new DiscoveryRequestPayload
+        {
+            RunSettings = runsettings,
+            Sources = new[] { "c:\\testproject.dll" }
+        };
+        return discoveryPayload;
+    }
+
+    private void RunTestsIfThrowsExceptionShouldThrowOut(Exception exception)
+    {
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a", "b" },
+            RunSettings = DefaultRunsettings
+        };
+
+        var createRunRequestCalled = 0;
+        TestRunCriteria? observedCriteria = null;
+        var mockRunRequest = new Mock<ITestRunRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny<IRequestData>(), It.IsAny<TestRunCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) =>
+            {
+                createRunRequestCalled++;
+                observedCriteria = runCriteria;
+            }).Returns(mockRunRequest.Object);
+
+        mockRunRequest.Setup(mr => mr.ExecuteAsync()).Throws(exception);
+
+        var mockRunEventsRegistrar = new Mock<ITestRunEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.RunTests(payload, mockCustomlauncher.Object, mockRunEventsRegistrar.Object, _protocolConfig);
+    }
+
+    private void DiscoverTestsIfThrowsExceptionShouldThrowOut(Exception exception)
+    {
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll", "b.dll" },
+            RunSettings = DefaultRunsettings
+        };
+
+        DiscoveryCriteria? observedCriteria = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>())).Callback(
+            (IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) => observedCriteria = discoveryCriteria).Returns(mockDiscoveryRequest.Object);
+
+        mockDiscoveryRequest.Setup(mr => mr.DiscoverAsync()).Throws(exception);
+
+        var mockDiscoveryEventsRegistrar = new Mock<ITestDiscoveryEventsRegistrar>();
+        var mockCustomlauncher = new Mock<ITestHostLauncher3>();
+
+        _testRequestManager.DiscoverTests(payload, mockDiscoveryEventsRegistrar.Object, _protocolConfig);
+    }
+
+    [TestMethod]
+    [DataRow("x86")]
+    [DataRow("x64")]
+    [DataRow("arm64")]
+    // Don't parallelize because we can run into conflict with GetDefaultArchitecture -> RunSettingsHelper.Instance.IsDefaultTargetArchitecture
+    // which is set by some other test.
+    [DoNotParallelize]
+    public void SettingDefaultPlatformUsesItForAnyCPUSourceButNotForNonAnyCPUSource(string defaultPlatform)
+    {
+        // -- Arrange
+
+        RunSettingsHelper.Instance.IsDefaultTargetArchitecture = true;
+        var payload = new DiscoveryRequestPayload()
+        {
+            Sources = new List<string>() { "AnyCPU.dll", "x64.dll" },
+            RunSettings =
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+                <RunSettings>
+                     <RunConfiguration>
+                       <DefaultPlatform>{defaultPlatform}</DefaultPlatform>
+                     </RunConfiguration>
+                </RunSettings>"
+        };
+
+        Architecture expectedPlatform = (Architecture)Enum.Parse(typeof(Architecture), defaultPlatform, ignoreCase: true);
+
+        Dictionary<string, SourceDetail>? actualSourceToSourceDetailMap = null;
+        var mockDiscoveryRequest = new Mock<IDiscoveryRequest>();
+
+        _mockAssemblyMetadataProvider.Setup(m => m.GetArchitecture("AnyCPU.dll")).Returns(Architecture.AnyCPU);
+        _mockAssemblyMetadataProvider.Setup(m => m.GetArchitecture("x64.dll")).Returns(Architecture.X64);
+
+        _mockTestPlatform.Setup(mt => mt.CreateDiscoveryRequest(It.IsAny<IRequestData>(), It.IsAny<DiscoveryCriteria>(), It.IsAny<TestPlatformOptions>(), It.IsAny<Dictionary<string, SourceDetail>>(), It.IsAny<IWarningLogger>()))
+            .Callback((IRequestData _, DiscoveryCriteria _, TestPlatformOptions _, Dictionary<string, SourceDetail> sourceToSourceDetailMap, IWarningLogger _) =>
+                // output the incoming sourceToSourceDetailMap to the variable above so we can inspect it.
+                actualSourceToSourceDetailMap = sourceToSourceDetailMap
+            ).Returns(mockDiscoveryRequest.Object);
+
+        // -- Act
+        // The substitution of architecture happens in runsettings patching which is shared for discovery and run
+        // so we can safely just test discovery.
+        _testRequestManager.DiscoverTests(payload, new Mock<ITestDiscoveryEventsRegistrar>().Object, _protocolConfig);
+
+        actualSourceToSourceDetailMap.Should().NotBeNull();
+        // The AnyCPU dll is the architecture we provide in the default setting, rather than being determined from the
+        // current process architecture.
+        actualSourceToSourceDetailMap!["AnyCPU.dll"].Architecture.Should().Be(expectedPlatform);
+        // The dll that has a specific architecture always remains that specific architecture.
+        actualSourceToSourceDetailMap!["x64.dll"].Architecture.Should().Be(Architecture.X64);
+    }
+
+    [TestMethod]
+    public void UsingInvalidValueForDefaultPlatformSettingThrowsSettingsException()
+    {
+        var settingXml = @"
+            <RunSettings>
+                <RunConfiguration>
+                    <DefaultPlatform>WRONGPlatform</DefaultPlatform>
+                </RunConfiguration>
+            </RunSettings>";
+
+        var payload = new TestRunRequestPayload()
+        {
+            Sources = new List<string>() { "a.dll" },
+            RunSettings = settingXml
+        };
+
+        _testRequestManager
+            .Invoking(m => m.RunTests(payload, new Mock<ITestHostLauncher3>().Object, new Mock<ITestRunEventsRegistrar>().Object, _protocolConfig))
+            .Should().Throw<SettingsException>()
+            .And.Message.Should().Contain("Invalid value 'WRONGPlatform' specified for 'DefaultPlatform'.");
+    }
+}
diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
index 307a79b2fd..1d5e926f41 100644
--- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
+++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
@@ -1,32 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
-  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp3.1</TargetFrameworks>
-    <OutputType Condition=" $(TargetFramework.StartsWith('netcoreapp')) ">Exe</OutputType>
+    <TargetFrameworks>net9.0;net48</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <AssemblyName>vstest.console.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\vstest.console\vstest.console.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj">
       <FromP2P>true</FromP2P>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj">
       <FromP2P>true</FromP2P>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime.Serialization" />
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
   </ItemGroup>
-  <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>